From f8f8306c55f29a4782ac880aebd4c271bc0c0679 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Thu, 1 Feb 2018 15:39:36 +0000
Subject: [PATCH 001/648] Add target to collect the js and golang dependencies
 for upload to OBS (#1427)

* Add target to collect the js and golang dependencies for upload to OBS

* Fix lint issue

* Replace use of fs with fsx
---
 .gitignore                                    |   1 +
 build/bk-build.js                             |   5 +-
 build/deps.gulp.js                            | 116 ++++++++++++++++++
 build/main.gulp.js                            |   1 +
 .../gogo/protobuf/.stratos-dependency         |   3 +
 .../cli/.stratos-dependency                   |   3 +
 .../gofileutils/.stratos-dependency           |   3 +
 package.json                                  |   1 +
 8 files changed, 131 insertions(+), 2 deletions(-)
 create mode 100644 build/deps.gulp.js
 create mode 100644 components/app-core/backend/__vendor/github.com/gogo/protobuf/.stratos-dependency
 create mode 100644 components/cf-app-push/backend/__vendor/code.cloudfoundry.org/cli/.stratos-dependency
 create mode 100644 components/cf-app-push/backend/__vendor/code.cloudfoundry.org/gofileutils/.stratos-dependency

diff --git a/.gitignore b/.gitignore
index d7f917f554..f9bdab9104 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@ vendor/
 **/vendor
 **/*.so
 .glide
+.deps/
 tools/ssl
 build/secrets.json
 
diff --git a/build/bk-build.js b/build/bk-build.js
index c940f5b0ba..c387dac012 100644
--- a/build/bk-build.js
+++ b/build/bk-build.js
@@ -350,10 +350,11 @@
       'delete-temp'
     );
   });
-  gulp.task('cf-get-backend-deps', function () {
+  gulp.task('cf-get-backend-deps', function (cb) {
     return runSequence(
       'init-build',
-      'dedup-vendor'
+      'dedup-vendor',
+      cb
     );
   });
 
diff --git a/build/deps.gulp.js b/build/deps.gulp.js
new file mode 100644
index 0000000000..677b776161
--- /dev/null
+++ b/build/deps.gulp.js
@@ -0,0 +1,116 @@
+/* eslint-disable angular/json-functions,angular/log,no-console,no-process-env,no-process-exit,no-sync */
+(function () {
+  'use strict';
+
+  // Gulp tasks for dumping the dependencies
+  var _ = require('lodash');
+  var gulp = require('gulp');
+  var path = require('path');
+  var runSequence = require('run-sequence');
+  var fsx = require('fs-extra');
+
+  var components;
+  var depsFolder = path.resolve('./.deps');
+
+  gulp.task('dump-deps-backend-prep', function (cb) {
+    process.env.STRATOS_TEMP = path.resolve(__dirname, '../tmp');
+    fsx.mkdirpSync(process.env.STRATOS_TEMP);
+    return cb();
+  });
+
+  gulp.task('dump-deps', function () {
+    components = require('./components');
+    components.initialize();
+    fsx.ensureDirSync(depsFolder);
+    fsx.emptyDirSync(depsFolder);
+    return runSequence(
+      'dump-deps-frontend',
+      'dump-deps-backend-prep',
+      'cf-get-backend-deps',
+      'dump-deps-backend'
+    );
+  });
+
+  gulp.task('dump-deps-frontend', function (cb) {
+    console.log('Dumping front-end dependencies');
+    var folders = fsx.readdirSync(components.getBowerFolder());
+    var localFolders = _.keys(components.findLocalPathComponentFolders());
+
+    // Exclude local components
+    var deps = _.difference(folders, localFolders);
+    _.each(deps, function (name) {
+      var folder = path.join(components.getBowerFolder(), name);
+      if (fsx.lstatSync(folder).isDirectory()) {
+        console.log('Storing dependency: ' + name);
+        var cmpBower = JSON.parse(fsx.readFileSync(path.join(folder, '.bower.json'), 'utf8'));
+        var depName = 'js-' + cmpBower.name;
+        fsx.copySync(folder, path.join(depsFolder, depName));
+
+        var version = cmpBower.version;
+        var commit = cmpBower._resolution ? cmpBower._resolution.commit || version : version;
+        // Write the version and name to a file
+        fsx.writeFileSync(path.join(depsFolder, depName, '.stratos-dependency'), cmpBower.name + '\n' + commit + '\n' + version);
+      }
+    });
+
+    return cb();
+  });
+
+  function replaceAll(target, search, replacement) {
+    return target.split(search).join(replacement);
+  }
+
+  function findStratosDepFiles(results, folder) {
+    var strat = path.join(folder, '.stratos-dependency');
+    if (fsx.existsSync(strat)) {
+      var res = {
+        depFile: strat,
+        folder: folder
+      };
+      results.push(res);
+    }
+
+    var items = fsx.readdirSync(folder);
+    _.each(items, function (f) {
+      if (fsx.lstatSync(path.join(folder, f)).isDirectory()) {
+        findStratosDepFiles(results, path.join(folder, f));
+      }
+    });
+  }
+
+  gulp.task('dump-deps-backend', function (cb) {
+    var yaml = require('js-yaml');
+    var imports = {};
+    _.each(components.findLocalPathComponentFolders(), function (folder) {
+      var glideLockFile = path.join(folder, 'backend', 'glide.lock');
+      if (fsx.existsSync(glideLockFile)) {
+        // Read the lock file
+        var doc = yaml.safeLoad(fsx.readFileSync(glideLockFile, 'utf8'));
+        _.each(doc.imports, function (obj) {
+          imports[obj.name] = obj.version;
+        });
+      }
+
+      // Look for local __vendor packages checked in
+      var vendorFolder = path.join(folder, 'backend', '__vendor');
+      if (fsx.existsSync(vendorFolder)) {
+        var deps = [];
+        findStratosDepFiles(deps, vendorFolder);
+        _.each(deps, function (dep) {
+          var lines = fsx.readFileSync(dep.depFile, 'utf-8').split('\n').filter(Boolean);
+          imports[lines[0]] = lines[1];
+        });
+      }
+    });
+
+    _.each(imports, function (v, n) {
+      console.log('Storing dependency: ' + n);
+      var srcFolder = './tmp/src/' + n;
+      var depName = 'golang-' + replaceAll(n, '/', '-');
+      fsx.copySync(srcFolder, path.join(depsFolder, depName));
+      // Write the version and name to a file
+      fsx.writeFileSync(path.join(depsFolder, depName, '.stratos-dependency'), n + '\n' + v + '\n' + v.substr(0, 8));
+    });
+    return cb();
+  });
+})();
diff --git a/build/main.gulp.js b/build/main.gulp.js
index eda90b17e3..f4796faebe 100644
--- a/build/main.gulp.js
+++ b/build/main.gulp.js
@@ -33,6 +33,7 @@
   var devDeps = require('./dev-dependencies');
   // Pull in the gulp tasks for e2e tests
   require('./e2e.gulp');
+  require('./deps.gulp');
 
   var paths = config.paths;
   var localComponents, assetFiles, i18nFiles, jsSourceFiles, pluginFiles,
diff --git a/components/app-core/backend/__vendor/github.com/gogo/protobuf/.stratos-dependency b/components/app-core/backend/__vendor/github.com/gogo/protobuf/.stratos-dependency
new file mode 100644
index 0000000000..775f1857df
--- /dev/null
+++ b/components/app-core/backend/__vendor/github.com/gogo/protobuf/.stratos-dependency
@@ -0,0 +1,3 @@
+github.com/gogo/protobuf
+30433562cfbf487fe1df7cd26c7bab168d2f14d0
+30433562
\ No newline at end of file
diff --git a/components/cf-app-push/backend/__vendor/code.cloudfoundry.org/cli/.stratos-dependency b/components/cf-app-push/backend/__vendor/code.cloudfoundry.org/cli/.stratos-dependency
new file mode 100644
index 0000000000..ad72a1f51e
--- /dev/null
+++ b/components/cf-app-push/backend/__vendor/code.cloudfoundry.org/cli/.stratos-dependency
@@ -0,0 +1,3 @@
+code.cloudfoundry.org/cli
+96e853b95d5a3b1c0afb79e61d9918a35037d041
+96e853b9
\ No newline at end of file
diff --git a/components/cf-app-push/backend/__vendor/code.cloudfoundry.org/gofileutils/.stratos-dependency b/components/cf-app-push/backend/__vendor/code.cloudfoundry.org/gofileutils/.stratos-dependency
new file mode 100644
index 0000000000..92abb898ad
--- /dev/null
+++ b/components/cf-app-push/backend/__vendor/code.cloudfoundry.org/gofileutils/.stratos-dependency
@@ -0,0 +1,3 @@
+code.cloudfoundry.org/gofileutils
+4d0c80011a0f37da1711c184028bc40137cd45af
+4d0c8001
\ No newline at end of file
diff --git a/package.json b/package.json
index 10e62dbbea..cdea7a23c4 100644
--- a/package.json
+++ b/package.json
@@ -85,6 +85,7 @@
     "jasmine-jquery": "^2.1.1",
     "jasmine-reporters": "^2.2.1",
     "jasmine-spec-reporter": "^4.2.1",
+    "js-yaml": "^3.10.0",
     "karma": "^1.7.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-cli": "^1.0.1",

From 826de09bdf9611718f57ce889c9fa22fca9560db Mon Sep 17 00:00:00 2001
From: concourse <concourse@paas.ui>
Date: Mon, 25 Jun 2018 16:51:51 +0000
Subject: [PATCH 002/648] Dev releases Helm repository updated for tag:

---
 index.yaml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/index.yaml b/index.yaml
index e43cdf3e54..95fc9c6698 100755
--- a/index.yaml
+++ b/index.yaml
@@ -1,6 +1,14 @@
 apiVersion: v1
 entries:
   console:
+  - apiVersion: v1
+    created: 2018-06-25T16:51:47.597748002Z
+    description: A Helm chart for deploying Stratos UI Console
+    digest: 6f828e10f100bb479842b7aa3b393d8036bb664a8f3d96bd656201e45ff52206
+    name: console
+    urls:
+    - https://github.com/SUSE/stratos/releases/download/2.0.0-cap-test/console-helm-chart-2.0.0-cap-test.tgz
+    version: 2.0.0-cap-test
   - apiVersion: v1
     created: 2018-01-09T11:48:55.233833731Z
     description: A Helm chart for deploying Stratos UI Console
@@ -73,4 +81,4 @@ entries:
     urls:
     - https://github.com/suse/stratos-ui/releases/download/0.9.0/console-helm-chart-0.9.0.tgz
     version: 0.9.0
-generated: 2018-01-09T11:48:55.232685995Z
+generated: 2018-06-25T16:51:47.597023767Z

From 709b82726538b7bd2cfd54d37bab659fce5c014f Mon Sep 17 00:00:00 2001
From: Irfan Habib <irfan@irfanhabib.com>
Date: Tue, 26 Jun 2018 12:24:29 +0100
Subject: [PATCH 003/648] Update index.yaml

---
 index.yaml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/index.yaml b/index.yaml
index 95fc9c6698..41c198a48f 100755
--- a/index.yaml
+++ b/index.yaml
@@ -1,14 +1,6 @@
 apiVersion: v1
 entries:
   console:
-  - apiVersion: v1
-    created: 2018-06-25T16:51:47.597748002Z
-    description: A Helm chart for deploying Stratos UI Console
-    digest: 6f828e10f100bb479842b7aa3b393d8036bb664a8f3d96bd656201e45ff52206
-    name: console
-    urls:
-    - https://github.com/SUSE/stratos/releases/download/2.0.0-cap-test/console-helm-chart-2.0.0-cap-test.tgz
-    version: 2.0.0-cap-test
   - apiVersion: v1
     created: 2018-01-09T11:48:55.233833731Z
     description: A Helm chart for deploying Stratos UI Console

From cf964dbc7f903a55837e6ca2f5aa33f4b49bfd78 Mon Sep 17 00:00:00 2001
From: concourse <concourse@paas.ui>
Date: Thu, 4 Oct 2018 13:13:53 +0000
Subject: [PATCH 004/648] Dev releases Helm repository updated for tag:
 2.1.0-dev-kube-integration

---
 index.yaml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/index.yaml b/index.yaml
index 41c198a48f..29a07d75aa 100755
--- a/index.yaml
+++ b/index.yaml
@@ -1,6 +1,14 @@
 apiVersion: v1
 entries:
   console:
+  - apiVersion: v1
+    created: 2018-10-04T13:13:48.554358996Z
+    description: A Helm chart for deploying Stratos UI Console
+    digest: 15f9439f35301ab42a2990c06845259db975dee0b11335f5db83708b8a0c1b51
+    name: console
+    urls:
+    - https://github.com/SUSE/stratos/releases/download/2.1.0-dev-kube-integration/console-helm-chart-v2.1.0-dev-kube-integration.tgz
+    version: 2.1.0-dev-kube-integration
   - apiVersion: v1
     created: 2018-01-09T11:48:55.233833731Z
     description: A Helm chart for deploying Stratos UI Console
@@ -73,4 +81,4 @@ entries:
     urls:
     - https://github.com/suse/stratos-ui/releases/download/0.9.0/console-helm-chart-0.9.0.tgz
     version: 0.9.0
-generated: 2018-06-25T16:51:47.597023767Z
+generated: 2018-10-04T13:13:48.553077364Z

From ba80fc1d282db49a080750c424d6e721045a60e3 Mon Sep 17 00:00:00 2001
From: concourse <concourse@paas.ui>
Date: Fri, 5 Oct 2018 16:33:10 +0000
Subject: [PATCH 005/648] Dev releases Helm repository updated for tag:
 2.1.0-dev-kube-integration

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

diff --git a/index.yaml b/index.yaml
index 29a07d75aa..74c3da60be 100755
--- a/index.yaml
+++ b/index.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 entries:
   console:
   - apiVersion: v1
-    created: 2018-10-04T13:13:48.554358996Z
+    created: 2018-10-05T16:33:04.933450440Z
     description: A Helm chart for deploying Stratos UI Console
     digest: 15f9439f35301ab42a2990c06845259db975dee0b11335f5db83708b8a0c1b51
     name: console

From 6995dfe419e9146c3b89b4ac2dbc6146151c5f10 Mon Sep 17 00:00:00 2001
From: concourse <concourse@paas.ui>
Date: Mon, 8 Oct 2018 11:56:08 +0000
Subject: [PATCH 006/648] Dev releases Helm repository updated for tag:
 2.1.0-dev-kube-integration

---
 index.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.yaml b/index.yaml
index 74c3da60be..88dfa0d14a 100755
--- a/index.yaml
+++ b/index.yaml
@@ -2,9 +2,9 @@ apiVersion: v1
 entries:
   console:
   - apiVersion: v1
-    created: 2018-10-05T16:33:04.933450440Z
+    created: 2018-10-08T11:56:03.675982355Z
     description: A Helm chart for deploying Stratos UI Console
-    digest: 15f9439f35301ab42a2990c06845259db975dee0b11335f5db83708b8a0c1b51
+    digest: f8b7126da3fe9cd358447912f4c0d7785437bcf5462f4a548487f943159ef13b
     name: console
     urls:
     - https://github.com/SUSE/stratos/releases/download/2.1.0-dev-kube-integration/console-helm-chart-v2.1.0-dev-kube-integration.tgz

From cff41a030703ea2e23601398f845880b010ce144 Mon Sep 17 00:00:00 2001
From: concourse <concourse@paas.ui>
Date: Tue, 9 Oct 2018 19:20:13 +0000
Subject: [PATCH 007/648] Dev releases Helm repository updated for tag:
 2.1.0-dev-kube-integration

---
 index.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.yaml b/index.yaml
index 88dfa0d14a..5d6a6c98c3 100755
--- a/index.yaml
+++ b/index.yaml
@@ -2,9 +2,9 @@ apiVersion: v1
 entries:
   console:
   - apiVersion: v1
-    created: 2018-10-08T11:56:03.675982355Z
+    created: 2018-10-09T19:20:08.808206182Z
     description: A Helm chart for deploying Stratos UI Console
-    digest: f8b7126da3fe9cd358447912f4c0d7785437bcf5462f4a548487f943159ef13b
+    digest: e10528c7b1764137bc1588db5c630fe78b8bf61e8c7f14617024eee64dac0dff
     name: console
     urls:
     - https://github.com/SUSE/stratos/releases/download/2.1.0-dev-kube-integration/console-helm-chart-v2.1.0-dev-kube-integration.tgz

From f7c431c913e219f8d2f4ae9a7f6433f24dce377a Mon Sep 17 00:00:00 2001
From: concourse <concourse@paas.ui>
Date: Mon, 22 Oct 2018 10:31:35 +0000
Subject: [PATCH 008/648] Dev releases Helm repository updated for tag:
 2.0.0-dev

---
 index.yaml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/index.yaml b/index.yaml
index 5d6a6c98c3..c8f2a7cb86 100755
--- a/index.yaml
+++ b/index.yaml
@@ -9,6 +9,15 @@ entries:
     urls:
     - https://github.com/SUSE/stratos/releases/download/2.1.0-dev-kube-integration/console-helm-chart-v2.1.0-dev-kube-integration.tgz
     version: 2.1.0-dev-kube-integration
+  - apiVersion: v1
+    appVersion: 2.1.1
+    created: 2018-10-22T10:31:32.486999738Z
+    description: A Helm chart for deploying Stratos UI Console
+    digest: a599d45c14b3ea51525d580976686f3980696b9a1238eb9946ab29a7c79298f3
+    name: console
+    urls:
+    - https://github.com/SUSE/stratos/releases/download/2.0.0-dev/console-helm-chart-v2.0.0-dev.tgz
+    version: 2.0.0-dev
   - apiVersion: v1
     created: 2018-01-09T11:48:55.233833731Z
     description: A Helm chart for deploying Stratos UI Console
@@ -81,4 +90,4 @@ entries:
     urls:
     - https://github.com/suse/stratos-ui/releases/download/0.9.0/console-helm-chart-0.9.0.tgz
     version: 0.9.0
-generated: 2018-10-04T13:13:48.553077364Z
+generated: 2018-10-22T10:31:32.48601894Z

From 5e65cd77107f72f1bdc775b707aeffb6a77769ec Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Sun, 31 Mar 2019 17:43:31 +0100
Subject: [PATCH 009/648] Minor updates

---
 .../helm-release-service-card.component.html  |  10 +++
 .../helm-release-service-card.component.ts    |  73 +++++++++++++++++-
 .../tabs/helm-release-helper.service.ts       |   2 -
 .../helm-release-summary-tab.component.html   |   9 +--
 .../helm-release-summary-tab.component.scss   |   7 ++
 .../helm-release-summary-tab.component.ts     |  59 +++++++++++---
 .../helm-release-values-tab.component.ts      |  10 +--
 custom-src/frontend/assets/nav-logo-icon.png  | Bin 862 -> 1226 bytes
 custom-src/frontend/assets/nav-logo.png       | Bin 1421 -> 3778 bytes
 .../ring-chart/ring-chart.component.scss      |   3 +-
 10 files changed, 147 insertions(+), 26 deletions(-)

diff --git a/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.html b/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.html
index 4a62aabc41..8daf5f9d9f 100644
--- a/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.html
+++ b/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.html
@@ -2,6 +2,7 @@
   <app-meta-card-title class=" card__title">
     <app-multiline-title class="card__title-link">{{ row.name }}</app-multiline-title>
   </app-meta-card-title>
+  <!--
   <app-meta-card-item>
     <app-meta-card-key>Cluster IP</app-meta-card-key>
     <app-meta-card-value>{{kubeService.spec.clusterIP}}</app-meta-card-value>
@@ -16,4 +17,13 @@
       <app-kubernetes-service-ports [row]="row"></app-kubernetes-service-ports>
     </app-meta-card-value>
   </app-meta-card-item>
+  -->
+  <app-meta-card-item>
+    <app-meta-card-key>Ports</app-meta-card-key>
+    <app-meta-card-value>
+      <div *ngFor="let port of ports">
+        <div>{{ port.name }}</div>
+      </div>
+    </app-meta-card-value>
+  </app-meta-card-item>
 </app-meta-card>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.ts b/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.ts
index d60751bf79..6ad2f27516 100644
--- a/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.ts
@@ -1,11 +1,78 @@
-import { Component } from '@angular/core';
+import { Component, Input, OnDestroy } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Subscription } from 'rxjs';
+import { filter, map, switchMap } from 'rxjs/operators';
 
+import { AppState } from '../../../../../../store/src/app-state';
+import { entityFactory } from '../../../../../../store/src/helpers/entity-factory';
+import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
+import { EntityServiceFactory } from '../../../../core/entity-service-factory.service';
 import { CardCell } from '../../../../shared/components/list/list.types';
-import { HelmReleaseService } from '../../store/helm.types';
+import { PaginationMonitor } from '../../../../shared/monitors/pagination-monitor';
+import { KubeService } from '../../../kubernetes/store/kube.types';
+import { GetKubernetesServicesInNamespace } from '../../../kubernetes/store/kubernetes.actions';
+import { GetHelmReleases } from '../../store/helm.actions';
+import { helmReleasesSchemaKey } from '../../store/helm.entities';
+import { HelmRelease, HelmReleaseService } from '../../store/helm.types';
 
 @Component({
   selector: 'app-release-service-card',
   templateUrl: './helm-release-service-card.component.html',
   styleUrls: ['./helm-release-service-card.component.scss']
 })
-export class HelmReleaseServiceCardComponent extends CardCell<HelmReleaseService> { }
+export class HelmReleaseServiceCardComponent extends CardCell<HelmReleaseService> implements OnDestroy {
+
+  private pRow: HelmReleaseService;
+  private svcSub: Subscription;
+
+  private ports = [];
+
+  @Input() set row(row: HelmReleaseService) {
+    this.pRow = row;
+    if (!this.svcSub && row) {
+      this.svcSub = this.fetchRelease(row.endpointGuid, row.releaseTitle).pipe(
+        switchMap((release: any) => {
+          const action = new GetKubernetesServicesInNamespace(row.endpointGuid, release.namespace);
+          const paginationMonitor = new PaginationMonitor<KubeService>(this.store, action.paginationKey, entityFactory(action.entityKey));
+          return getPaginationObservables<KubeService>({ store: this.store, action, paginationMonitor }).entities$;
+        }),
+        filter(entities => !!entities),
+        map((services: any) => services.find(service => service.metadata.name === row.name))
+      ).subscribe(service => {
+        console.log('SERVICE: ', service);
+        this.ports = service.spec.ports;
+      });
+    }
+
+
+  }
+  get row() {
+    return this.pRow;
+  }
+
+
+  constructor(
+    private store: Store<AppState>,
+    private esf: EntityServiceFactory
+  ) {
+    super();
+  }
+
+  ngOnDestroy() {
+    if (this.svcSub) {
+      this.svcSub.unsubscribe();
+    }
+  }
+
+  private fetchRelease(endpointGuid: string, releaseTitle: string) {
+    const action = new GetHelmReleases();
+    const paginationMonitor = new PaginationMonitor(this.store, action.paginationKey, entityFactory(helmReleasesSchemaKey));
+    const svc = getPaginationObservables({ store: this.store, action, paginationMonitor });
+
+
+    return svc.entities$.pipe(
+      map((items: HelmRelease[]) => items.find(item => item.guid === `${endpointGuid}:${releaseTitle}`))
+    );
+  }
+
+}
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
index ad0215fa28..5b62b9191b 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
@@ -65,8 +65,6 @@ export const parseHelmReleaseStatus = (res: string): HelmReleaseStatus => {
     }
   };
 
-  console.log(res);
-
   // Process
   let i = 0;
   while (i < lines.length) {
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
index 8fa2b7eb05..4a9a5f39f0 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
@@ -39,15 +39,14 @@
         </app-tile>
       </app-tile-group>
 
-      <!-- Release statud charts -->
-
+      <!-- Release status charts -->
       <app-tile-group>
-        <app-tile>
+        <app-tile class="helm-release-summary__chart-tile">
           <mat-card class="full-card">
-            <app-ring-chart [data]="podsChartData" label="Pods"></app-ring-chart>
+            <app-ring-chart [customColors]="podsChartColors" [data]="podsChartData" label="Pods"></app-ring-chart>
           </mat-card>
         </app-tile>      
-        <app-tile>
+        <app-tile class="helm-release-summary__chart-tile">
           <mat-card class="full-card">
             <app-ring-chart [customColors]="containersChartColors" [data]="containersChartData" label="Containers"></app-ring-chart>
           </mat-card>
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
index 952b0aaac5..c759665b86 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
@@ -8,4 +8,11 @@
       margin-top: 0;
     }
   }
+}
+
+.helm-release-summary {
+
+  &__chart-tile {
+    width: 50%;
+  }
 }
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index bc07fe1050..8052ca25f4 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { Component } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { Observable, of as observableOf } from 'rxjs';
+import { Observable, of as observableOf, combineLatest } from 'rxjs';
 import { map, startWith, tap } from 'rxjs/operators';
 
 import { ClearPaginationOfType } from '../../../../../../../store/src/actions/pagination.actions';
@@ -12,6 +12,12 @@ import { ConfirmationDialogService } from '../../../../../shared/components/conf
 import { helmReleasesSchemaKey } from '../../../store/helm.entities';
 import { HelmReleaseHelperService } from '../helm-release-helper.service';
 
+const podErrorStatus = {
+  Failed: true,
+  CrashLoopBackOff: true,
+  ErrImgPull: true,
+};
+
 @Component({
   selector: 'app-helm-release-summary-tab',
   templateUrl: './helm-release-summary-tab.component.html',
@@ -44,8 +50,16 @@ export class HelmReleaseSummaryTabComponent {
     }
   ];
 
-  // Blue: #00B2E2
-  // Yellow: #FFC107
+  public podsChartColors = [
+    {
+      name: 'OK',
+      value: '#4DD3A7'
+    },
+    {
+      name: 'Error',
+      value: '#E7727D'
+    }
+  ];
 
   constructor(
     public helmReleaseHelper: HelmReleaseHelperService,
@@ -53,19 +67,23 @@ export class HelmReleaseSummaryTabComponent {
     private confirmDialog: ConfirmationDialogService,
     private httpClient: HttpClient,
   ) {
-    this.isBusy$ = this.helmReleaseHelper.isFetching$;
 
     // Async fetch release status
-    this.helmReleaseHelper.fetchReleaseStatus().subscribe(data => {
+    const fetchStatus = this.helmReleaseHelper.fetchReleaseStatus();
+    const isStatusBusy$ = fetchStatus.pipe(map(d => false));
+    this.isBusy$ = combineLatest(this.helmReleaseHelper.isFetching$, isStatusBusy$).pipe(
+      map(([a, b]) => a || b)
+    );
+
+    fetchStatus.subscribe(data => {
       const chart = [];
-      console.log(data);
       Object.keys(data.pods.status).forEach(status => {
         chart.push({
           name: status,
           value: data.pods.status[status]
         });
       });
-      this.podsChartData = chart;
+      this.podsChartData = this.collatePodStatus(data);
 
       this.containersChartData = [
         {
@@ -80,6 +98,30 @@ export class HelmReleaseSummaryTabComponent {
     });
   }
 
+  private collatePodStatus(data: any): any {
+    let okay = 0;
+    let error = 0;
+
+    Object.keys(data.pods.status).forEach(status => {
+      if (podErrorStatus[status]) {
+        error++;
+      } else {
+        okay++;
+      }
+    });
+
+    return [
+      {
+        name: 'OK',
+        value: okay
+      },
+      {
+        name: 'Error',
+        value: error
+      }
+    ];
+  }
+
   public deleteRelease() {
     this.confirmDialog.open(this.deleteReleaseConfirmation, () => {
       // Make the http request to delete the release
@@ -87,9 +129,6 @@ export class HelmReleaseSummaryTabComponent {
       const deleting$ = this.httpClient.delete(`/pp/v1/helm/releases/${endpointAndName}`);
       this.loadingMessage = 'Deleting Release';
       this.isBusy$ = deleting$.pipe(
-        tap(d => {
-          console.log(d);
-        }),
         map(d => false),
         startWith(true),
       );
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
index 3759231456..2d28e1e570 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
@@ -16,7 +16,7 @@ export class HelmReleaseValuesTabComponent {
   constructor(public helmReleaseHelper: HelmReleaseHelperService) {
 
     this.values$ = helmReleaseHelper.release$.pipe(
-      map(release => {
+      map((release: any) => {
         if (release.config.raw) {
           return this.hidePasswords(release.config.raw);
         } else {
@@ -27,10 +27,10 @@ export class HelmReleaseValuesTabComponent {
   }
 
   private hidePasswords(values: string): string {
-    let mask = values.replace(new RegExp('(PASSWORD: [a-zA-Z0-9_\-]*)', 'gm'), 'PASSWORD: **********');
-    mask = mask.replace(new RegExp('(password: [a-zA-Z0-9_\-]*)', 'gm'), 'password: **********');
-    mask = mask.replace(new RegExp('(SECRET: [a-zA-Z0-9_\-]*)', 'gm'), 'SECRET: **********');
-    mask = mask.replace(new RegExp('(secret: [a-zA-Z0-9_\-]*)', 'gm'), 'secret: **********');
+    let mask = values.replace(new RegExp('(PASSWORD: [\.a-zA-Z0-9_\-]*)', 'gm'), 'PASSWORD: **********');
+    mask = mask.replace(new RegExp('(password: [\.a-zA-Z0-9_\-]*)', 'gm'), 'password: **********');
+    mask = mask.replace(new RegExp('(SECRET: [\.a-zA-Z0-9_\-]*)', 'gm'), 'SECRET: **********');
+    mask = mask.replace(new RegExp('(secret: [\.a-zA-Z0-9_\-]*)', 'gm'), 'secret: **********');
     return mask;
   }
 }
diff --git a/custom-src/frontend/assets/nav-logo-icon.png b/custom-src/frontend/assets/nav-logo-icon.png
index fbcc1430b83ed6341448aba4d3c7e779cead6c17..bcff369d203474cb98c628062e0d5b7776b8600a 100644
GIT binary patch
delta 1206
zcmV;n1WEhe2FeMLB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id
z000id0mpBsWB>pF8FWQhbW?9;ba!ELWdLwtX>N2bZe?^JG%heMF*h@ApJM<31UgAX
zK~z{r-Ir}>m1P*m=M0uFDTQRDhW2r=K+)Bt7bRa}A|<j46MqABLXZ#&(~THtM4uGj
z2GIwhLQr(A5h|PJ2V+8tVp}SLPA2GZqJ@}}+D^a!z3Uv#{ha$e=Q&g8&>wzW_kG>h
z%gyutl%-Osk|*daC7ePFrNsYhlSwo<IQR-QLOYy?>u?RuK^rtcrG>|;n7)ZbvG-_x
z3Y$p8o`70Q4}XfVC$mu+O@dA}mKdLe4e%zs2%~U6jhzhh;VbAJigxioVP3Fup71Bz
zXj~8tYG8mhH9L)Y-IiiSTshQ{bJ=qHVWus6V%hJX?Ff-Aiq3|+_|>EZ^AffSDlDX+
z$Qe!iZmV$zVmF!@#E}-obn0&6Q}M0lTW0fz&;#GXr++XVcezW<BVsmNZa*e?>YZ3D
zh{cVd*ioz#<IAuEcA6_kto;E$Kt0poCRqE%Vh@@tSF9Jr;_6`7ViS*`0~RwK;ff;0
zy16b`%p!C9Vyz$&1<o)oTI6+u?)rN88t%g{EKP8Q5%XG$J)t>6zkk#bg5(+4qD9{K
z@C?H>*ncnKHPA!<794RqM6Byl`rUFWF<yUfk`EG_u|<iT8<?@!V>UkndIK$m)#iKK
z_Ng9C=4-%s{k=&(NIZ-!O62T;SvEdy8>xg}VWRnebUQ?hUo~GF#_R7*@<HMyY*8ZT
zyL4lT@hQ-elzq;84>0c9#EvzePP^CNo8*JU+ke<t5pxy>ZL0ZIsDLhWIWb=WAJ|m$
zRqjwC#`oYFZm+*L$v7h-G07(PV&-7Ghdj==6{G8NJ#2?}K=1s%p$He#YHif#FSw4|
z-%n-`BNE-aHcrGmfJqETVpoFun7|%|<**Q%z`gS&#(H)(TaPj3JBRT%nM5RZ5L{5i
z>3@#i2;<=?=I_HH_*?5~G1unw-8tP_sK-oOYsVDcWHgAxP1wXDULOrDFhljQW8e*z
z^wyfkST~M7GCqONEJlwW<u+ox{)t3lHNnFYxffv@=!SV0*1`d}W9tj7$8R>T!W6$r
ziR2y<o}~VyX8I^DlmmNGbB6vVy-AEH@P838k1guxpJyG6v$}drrC*6l<YVaXE9wYg
ziF&{4!@!C0G1v^vpwqb@x<IG*3S0pFQnbPr_?WbpU9l|T-(~eW&6V3f>Ijh*g{Faf
zW?J#gC)aR94c#QFH2{;%o!dX^2$3y{=|}56eih#b?z9yna&(II>!BKVp~jY+)PFOZ
z97l+#DEbzpk7yr!$T0R-K_W(%Of8(Z+?z1lmNR0>?;mx92nqjG8XU(uG46#gU@kn5
z%UufCXPN8g?Q_uE#EJ3GFvS&%h-Hr)M~Hl4O-E)K<UF46{R59|nh`#I;p?HE_j+c{
z?;mx9NFth7!zR#wjDFH?8<*fP=r1YY-av(v(?9AcMS{*!Bj_wO@+uVk-;gT%7iBg2
UpRD~DrT_o{07*qoM6N<$g6O0_r2qf`

delta 839
zcmV-N1GxOk3El>fB!32COGiWi000000Qp0^e*gdg32;bRa{vGf6951U69E94oEQKA
z00(qQO+^Re0~`-60>l$7g#Z8o>q$gGR9M69m|KXIRTRg6dmMGt%rRwjz!a6jv>H$f
zLlIx{AqYgo=P*&i2Mh7hC+&hyN|dN?MLk;i;CKlIFD0UuLVt>v%qVY}*Gxr6e!eVW
zGmf6~&H2teodpNJefD1e_1|mnwb$Ak8q$!46qZy5h&l<F0n7n9fHpwj5^xmQ0qjpH
zo$m7)s$<pD>H{mw1NAp`WM2~eG9&P<I!_(fZA_CoNnNP!&c?5)H@QLK5!Jud_5!+Z
zsaHeypgN#lB!7>Gkss9l>PB^?I<rdsA?mik__-bg*Jt}{syaYD+imZiQa7jz)XC4l
z>WuN9mPv5@Qv%{)g@C!MexkPY;L*oR-&z*Qv-VDYQV+!UR&`j0`9}PIqzr<S)vki%
zPO5{|Hnlwh?r3;EC;DS-p9xR1-&7^fSwO#nb9)Wg27g=zE&zLgX<>7DHtuVnIr?hy
z<aY(V_>DRxzCX_}7R0IWFvFf0<2Kdm$&P~ax&aK1)cAqA1(*wr1TF$i>iYmGrQdsL
z;|WjRuHd<Uy0!ley&K)qVzYWZ+J`gzF7?k^Jy~%cKs(SG?GftQlu|3O3iu2d1bhTM
zK5izc&wp0~UM<PX75dwNH&aUQ0HdSwS*D%`ZpIRy0`i>Q3H%@5{i?80ak)2F88Exl
zxuG*fU7h85)hp^(>a?r?c`5of)=F|o!RWrJE>cJIfYqw5P%lL8e=l_A*Glr0Dr?4`
zQsN(Rh#ynWsrRDq!@%AZ*yGE{I%h0L_NZ@XrGK01p|W!Ki!~6t7DYy$4xh^kjG@o6
z-CXr$D5byDFMy@MePB#PZVNCxe#3x)Ko@WaxDH%QDc$M;@_XO~V0B9Azp`t}V=?;!
z>hNCZ4^?*t#@>2W<}DEjMn-wJfbQ&Adewbu|9anb)@6I{u)0+3$cx*k++S4}tNXL@
zA3*ozjd7HEqQI5*m)=z2WjzkO3`~#5f!Bdi+2g>kz;@tZR`E2XAq}awJOW|*K;j$d
R#ccop002ovPDHLkV1i+%mz@9r

diff --git a/custom-src/frontend/assets/nav-logo.png b/custom-src/frontend/assets/nav-logo.png
index 6d860e7023e527a5c93235aafac1fde1cdf33b23..9f4b0afb8425f6e8056f39350d995f28abcd58e7 100644
GIT binary patch
literal 3778
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

literal 1421
zcmcJP*;f(>7{yUi8k5lDIwg}*DQVK8iBeiByNG30uDMl;xRl~p?v$t8VgdpcHA`V~
zIpi`}NoM1cj+t3xZn@@4WVjWHro(?QPjk<?_xE<cm+#!HlVluNYljv9000y4XipVI
zD(~3}RHae;xT^|DCrMry6*vC}Eq(v*QiH*6UDbIw&69i@5Nv8VZWreFHfGJM<d*ge
zx0eSx6YA4h)hCv}-qxHwY9X%7HyP>^kVy7*0Kk?40@~TjyLCP<r;dG4=LGU3Pks8G
zVL07W`TOSPwh>URItqn43w4~_3NGxX??<X__@aLFq%}Fe7(Q1E3Cg|VP9L=R{yMDb
zkOTBsXyQVoNeBJ-=Sbm)GJiMem)BwSpz*^^jPpe%^8sXe`{mS0e8B5IbDUl{lA3a6
zpv71YJbasOP%7tTWWR}Pb5zU*y6NA;D8#`^>r{}wQ+kegxY>0WP*(8FlEri}jn3Q)
zeLFF~=TstkVn+572n}h|!SW%rRtG7K4x}=jDrplmTTU#dVIQXtfrvnI`v%GdkMFjJ
zd(#jp&dx_+wd<@EUY!D9w(1~-^zH@JOhtR6PD$^?bBlM$e>mxv*y@0!0HvXk$r*Ye
zs};}dh>isP<WS*l@Evvg%OPeGjZZL8xfE9_d1u5w9g(0h$>053Af~HAG*KG0phm=;
zTg@iMW#jo5l{acvFhGt4ckkm7G!G~|3q`{2;e!!S(@O`rPP@MjgNtV*ZJLKP)O6`f
zRV%e{iZ(;+U!6J6Kjz!-Hl|PA_t6X0qL~3w+>f;Na$^5^6QU>OZDTWoH7RQiE6v@E
zX<`pt{*V{lQxY-65TvAT(ZV4E`o}N9+z(j=*;61ig&K@ku~N`tE^*ramwd6_7vzMZ
z6n~t1zl^VhWESA%ubvZ}`3GbzH&)r-ofl!lzq<08rwAqf+Qop&pE6=|1@-Bn6?*PM
zXm8XXSAiZm)7W4#iiS`_B?~E7Dleay*SaPH7Q&xoiE@019;-2Qdp6=n!&H}c962B(
z*xN6{QdZQ((hM&@GKR}Myh!znnu`UK2w_&&H8(41`0^FI(y!N2b4mRng}Pv@)EhOv
zvr|^4{XnwlulxpjEa-Jnr<&9#wIXa}aORZ*m3KS2ye62CkGiE{>25YCnrW9Hus|BC
zT8{$dPot4n39kFC$aalU7Ef}sR`yllgWx643x6&g<(myGLc_$2xozKy@UAbI7$nGL
z3>nA|8(y{{EyzqYZp}X0w590K#uybTsuxc+b}bz9AALHS?{U#&XO%S(f@OwOwfY%6
zJUEE*qYAn`jn_k97s#A1ipG9a7F`6F0XX@0Z5*h13qz<Rv8MjIXIW%(s<p1=Oq|p)
zC)G!c!!=7@-4Mi2dNmRf2kf5n-y81ET@Ox*pf!&sWURY4MVnoGk}eP?V<Ry;lF~aq
z@>AM!*nQm?=S_1-^s_6UZ+4cWeeFKf6L&pDJ&Iv&XWujklvpJ%ppJ0QU)bUu7WhmU
z7khsV@58HG0DHw$Nwv{KtNM+)T{ww)UgR8i?qQYm44_8GPb<(OhB<1&m{PEsSfU3H
zx)#}pU;Y`vxsnr?_%?{`%)Xv7rK9A&y)-F<IMq#6GFsa+{crb*lHXL&%nM&8xEZzQ
zTZ6@=ODQn(ILg`V7U9TcOqQ(&sZ?Tk4U(2zExJ=wL-<B75jWUgC@)gya5-}b$=e$F
z1`>aKBq6F38%Npd=M$4`%pZ)!NWgzH6&*<K#`4qIw9*f08}Ux+v9dl=s7+{xYS;h-
L3>p2%CFuIUFr4Lw

diff --git a/src/frontend/packages/core/src/shared/components/ring-chart/ring-chart.component.scss b/src/frontend/packages/core/src/shared/components/ring-chart/ring-chart.component.scss
index f847591977..b52e50489e 100644
--- a/src/frontend/packages/core/src/shared/components/ring-chart/ring-chart.component.scss
+++ b/src/frontend/packages/core/src/shared/components/ring-chart/ring-chart.component.scss
@@ -10,7 +10,7 @@
   .advanced-pie-legend {
     display: flex;
     flex-direction: column;
-    margin-right: 36px;
+    margin-right: 24px;
     top: 0;
     transform: none;
 
@@ -19,6 +19,7 @@
     }
 
     .total-label {
+      font-size: 18px;
       margin: -8px 0 0;
     }
 

From 9c9898a493f28f485d20d0eff50cb858ab03053e Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 2 Apr 2019 07:08:59 -0500
Subject: [PATCH 010/648] Neil's fixes

---
 .../helm-release-service-card.component.ts    |   4 +-
 .../kubernetes-svcproxy.component.html        |   8 +
 .../kubernetes-svcproxy.component.scss        |  15 ++
 .../kubernetes-svcproxy.component.spec.ts     |  25 +++
 .../kubernetes-svcproxy.component.ts          |  93 ++++++++++
 .../plugins/kubernetes/kube_svc_proxy.go      | 160 ++++++++++++++++++
 6 files changed, 303 insertions(+), 2 deletions(-)
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-svcproxy/kubernetes-svcproxy.component.html
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-svcproxy/kubernetes-svcproxy.component.scss
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-svcproxy/kubernetes-svcproxy.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-svcproxy/kubernetes-svcproxy.component.ts
 create mode 100644 src/jetstream/plugins/kubernetes/kube_svc_proxy.go

diff --git a/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.ts b/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.ts
index 6ad2f27516..7de422b085 100644
--- a/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.ts
@@ -30,9 +30,9 @@ export class HelmReleaseServiceCardComponent extends CardCell<HelmReleaseService
   @Input() set row(row: HelmReleaseService) {
     this.pRow = row;
     if (!this.svcSub && row) {
-      this.svcSub = this.fetchRelease(row.endpointGuid, row.releaseTitle).pipe(
+      this.svcSub = this.fetchRelease(row.endpointId, row.releaseTitle).pipe(
         switchMap((release: any) => {
-          const action = new GetKubernetesServicesInNamespace(row.endpointGuid, release.namespace);
+          const action = new GetKubernetesServicesInNamespace(row.endpointId, release.namespace);
           const paginationMonitor = new PaginationMonitor<KubeService>(this.store, action.paginationKey, entityFactory(action.entityKey));
           return getPaginationObservables<KubeService>({ store: this.store, action, paginationMonitor }).entities$;
         }),
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-svcproxy/kubernetes-svcproxy.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes-svcproxy/kubernetes-svcproxy.component.html
new file mode 100644
index 0000000000..ca33850770
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-svcproxy/kubernetes-svcproxy.component.html
@@ -0,0 +1,8 @@
+<app-page-header [breadcrumbs]="breadcrumbs$ | async">
+  <h1>Service Proxy</h1>
+</app-page-header>
+
+<app-loading-page [isLoading]="isLoading$" [text]="'Proxying Kubernetes Service'">
+  <iframe #kubeDash (load)="iframeLoaded()" id="kubedash" [src]="source" class="kube-dashboard"></iframe>
+</app-loading-page>
+
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-svcproxy/kubernetes-svcproxy.component.scss b/custom-src/frontend/app/custom/kubernetes/kubernetes-svcproxy/kubernetes-svcproxy.component.scss
new file mode 100644
index 0000000000..ff32c05101
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-svcproxy/kubernetes-svcproxy.component.scss
@@ -0,0 +1,15 @@
+.kube-dashboard {
+  border: 0;
+  display: flex;
+  height: 100%;
+  width: 100%;
+}
+
+.kube-dashboard__hidden {
+  visibility: hidden;
+}
+
+.kube-dashboard__search {
+  display: inline;
+  font-size: 16px;
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-svcproxy/kubernetes-svcproxy.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-svcproxy/kubernetes-svcproxy.component.spec.ts
new file mode 100644
index 0000000000..78671a16f0
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-svcproxy/kubernetes-svcproxy.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { KubernetesServiceProxyComponent } from './kubernetes-svcproxy.component';
+
+describe('KubernetesServiceProxyComponent', () => {
+  let component: KubernetesServiceProxyComponent;
+  let fixture: ComponentFixture<KubernetesServiceProxyComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ KubernetesServiceProxyComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubernetesServiceProxyComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-svcproxy/kubernetes-svcproxy.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-svcproxy/kubernetes-svcproxy.component.ts
new file mode 100644
index 0000000000..6d12f4f83b
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-svcproxy/kubernetes-svcproxy.component.ts
@@ -0,0 +1,93 @@
+import { BehaviorSubject, Observable } from 'rxjs';
+import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
+import { Component, OnInit, ViewChild, ElementRef, Renderer2 } from '@angular/core';
+import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
+import { BaseKubeGuid } from '../kubernetes-page.types';
+import { ActivatedRoute } from '@angular/router';
+import { KubernetesService } from '../services/kubernetes.service';
+import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types';
+import { map } from 'rxjs/operators';
+
+@Component({
+  selector: 'app-kubernetes-svcproxy',
+  templateUrl: './kubernetes-svcproxy.component.html',
+  styleUrls: ['./kubernetes-svcproxy.component.scss'],
+  providers: [
+    {
+      provide: BaseKubeGuid,
+      useFactory: (activatedRoute: ActivatedRoute) => {
+        return {
+          guid: activatedRoute.snapshot.params.endpointId
+        };
+      },
+      deps: [
+        ActivatedRoute
+      ]
+    },
+    KubernetesService,
+    KubernetesEndpointService,
+  ]
+})
+export class KubernetesServiceProxyComponent implements OnInit {
+
+  @ViewChild('kubeDash', {read: ElementRef}) kubeDash: ElementRef;
+
+  source: SafeResourceUrl;
+  isLoading$ = new BehaviorSubject<boolean>(true);
+
+  href = '';
+
+  public breadcrumbs$: Observable<IHeaderBreadcrumb[]>;
+
+  constructor(public kubeEndpointService: KubernetesEndpointService, private sanitizer: DomSanitizer, public renderer: Renderer2) { }
+
+  ngOnInit() {
+    const guid = this.kubeEndpointService.baseKube.guid;
+
+    let href = window.location.href;
+    const index = href.indexOf('svcproxy');
+    href = href.substr(index + 9);
+    console.log(href);
+    this.href = href;
+    const url = `/pp/v1/kubesvc/${guid}/${href}/`;
+    console.log(url);
+    this.source = this.sanitizer.bypassSecurityTrustResourceUrl(url);
+    console.log(window.location);
+
+    this.breadcrumbs$ = this.kubeEndpointService.endpoint$.pipe(
+      map(endpoint => ([{
+        breadcrumbs: [
+          { value: endpoint.entity.name, routerLink: `/kubernetes/${endpoint.entity.guid}` },
+        ]
+      }])
+      )
+    );
+  }
+
+  iframeLoaded() {
+    const iframeWindow = this.kubeDash.nativeElement.contentWindow;
+    console.log('iframe loaded');
+    this.isLoading$.next(false);
+
+    iframeWindow.addEventListener('hashchange', () => {
+      console.log('iframe hashchange');
+      console.log(iframeWindow.location);
+      console.log(this.href);
+
+      if (this.href) {
+        let h2 = decodeURI(this.href);
+        h2 = decodeURI(h2);
+
+        h2 = h2.replace('%3F', '?');
+        h2 = h2.replace('%3D', '=');
+        console.log(h2);
+        h2 = '#!' + h2;
+        console.log('Changing location hash');
+        iframeWindow.location.hash = h2;
+        this.href = '';
+      }
+    });
+
+  }
+
+}
diff --git a/src/jetstream/plugins/kubernetes/kube_svc_proxy.go b/src/jetstream/plugins/kubernetes/kube_svc_proxy.go
new file mode 100644
index 0000000000..d62154a6fb
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/kube_svc_proxy.go
@@ -0,0 +1,160 @@
+package kubernetes
+
+import (
+	"errors"
+	"fmt"
+	"net/http"
+	"net/http/httputil"
+	"net/url"
+	"strings"
+
+	"github.com/labstack/echo"
+	log "github.com/sirupsen/logrus"
+
+	utilnet "k8s.io/apimachinery/pkg/util/net"
+	"k8s.io/client-go/rest"
+)
+
+// GET /api/v1/namespaces/{namespace}/pods/{name}/proxy
+
+// http://localhost:8001/api/v1/namespaces/kube-system/services/https:kubernetes-dashboard:/proxy/.
+
+//GET /api/v1/namespaces/{namespace}/services/{name}/proxy
+
+func (k *KubernetesSpecification) kubeServiceProxy(c echo.Context) error {
+	log.Info("kubeServiceProxy request")
+
+	//	c.Response().Header().Set("X-FRAME-OPTIONS", "sameorigin")
+
+	cnsiGUID := c.Param("guid")
+	namespace := c.Param("ns")
+	serviceName := c.Param("svc")
+	servicePortName := c.Param("port")
+	userGUID := c.Get("user_id").(string)
+
+	var p = k.portalProxy
+
+	log.Debug(c.Request().RequestURI)
+
+	var prefix = "/pp/v1/kubesvc/" + cnsiGUID + "/" + namespace + "/" + serviceName + "/" + servicePortName + "/"
+
+	path := c.Request().RequestURI[len(prefix):]
+
+	log.Info(path)
+
+	cnsiRecord, err := p.GetCNSIRecord(cnsiGUID)
+	if err != nil {
+		//return sendSSHError("Could not get endpoint information")
+		return errors.New("Could not get endpoint information")
+	}
+
+	// Get token for this users
+	tokenRec, ok := p.GetCNSITokenRecord(cnsiGUID, userGUID)
+	if !ok {
+		//return sendSSHError("Could not get endpoint information")
+		return errors.New("Could not get token")
+	}
+
+	// Make the info call to the SSH endpoint info
+	// Currently this is not cached, so we must get it each time
+	apiEndpoint := cnsiRecord.APIEndpoint
+	log.Debug(apiEndpoint)
+	target := fmt.Sprintf("%s/api/v1/namespaces/%s/services/%s:%s/proxy/%s", apiEndpoint, namespace, serviceName, servicePortName, path)
+	targetURL, _ := url.Parse(target)
+	targetURL = normalizeLocation(targetURL)
+
+	log.Infof("Target URL: %s", targetURL)
+
+	config, err := getConfig(&cnsiRecord, &tokenRec)
+	if err != nil {
+		return errors.New("Could not get config for this auth type")
+	}
+
+	log.Info("Config")
+	log.Info(config.Host)
+	log.Info("Making request")
+	req := c.Request()
+	w := c.Response().Writer
+	log.Info("%v+", req)
+
+	loc := targetURL
+	loc.RawQuery = req.URL.RawQuery
+
+	// If original request URL ended in '/', append a '/' at the end of the
+	// of the proxy URL
+	if !strings.HasSuffix(loc.Path, "/") && strings.HasSuffix(req.URL.Path, "/") {
+		loc.Path += "/"
+	}
+
+	log.Info(loc)
+
+	// From pkg/genericapiserver/endpoints/handlers/proxy.go#ServeHTTP:
+	// Redirect requests with an empty path to a location that ends with a '/'
+	// This is essentially a hack for http://issue.k8s.io/4958.
+	// Note: Keep this code after tryUpgrade to not break that flow.
+	if len(loc.Path) == 0 {
+		log.Info("Redirecting")
+		var queryPart string
+		if len(req.URL.RawQuery) > 0 {
+			queryPart = "?" + req.URL.RawQuery
+		}
+		w.Header().Set("Location", req.URL.Path+"/"+queryPart)
+		w.WriteHeader(http.StatusMovedPermanently)
+		return nil
+	}
+
+	// if transport == nil || wrapTransport {
+	// 	h.Transport = h.defaultProxyTransport(req.URL, h.Transport)
+	// }
+
+	transport, err := rest.TransportFor(config)
+	if err != nil {
+		log.Info("Could not get transport")
+		return err
+	}
+
+	log.Info(transport)
+
+	// WithContext creates a shallow clone of the request with the new context.
+	newReq := req.WithContext(req.Context())
+	//newReq := req.WithContext(context.Background())
+	newReq.Header = utilnet.CloneHeader(req.Header)
+	newReq.URL = loc
+
+	// Set auth header so we log in if needed
+	if len(tokenRec.AuthToken) > 0 {
+		newReq.Header.Add("Authorization", "Bearer "+tokenRec.AuthToken)
+		log.Info("Setting auth header")
+	}
+
+	proxy := httputil.NewSingleHostReverseProxy(&url.URL{Scheme: loc.Scheme, Host: loc.Host})
+	proxy.Transport = transport
+	proxy.FlushInterval = defaultFlushInterval
+	proxy.ModifyResponse = func(response *http.Response) error {
+		log.Debugf("GOT PROXY RESPONSE: %s", loc.String())
+		log.Debugf("%d", response.StatusCode)
+		log.Debug(response.Header.Get("Content-Type"))
+
+		log.Debugf("%v+", response.Header)
+		response.Header.Del("X-FRAME-OPTIONS")
+		response.Header.Set("X-FRAME-OPTIONS", "sameorigin")
+		log.Debug("%v+", response)
+		return nil
+	}
+
+	log.Errorf("Proxy: %s", target)
+
+	// Note that ServeHttp is non blocking and uses a go routine under the hood
+	proxy.ServeHTTP(w, newReq)
+
+	// We need this to be blocking
+
+	// select {
+	// case <-newReq.Context().Done():
+	// 	return newReq.Context().Err()
+	// }
+
+	log.Errorf("Finished proxying request: %s", target)
+
+	return nil
+}

From 998f5c6f06cd63f366c9c15bcc8d39ce3d1a9724 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 2 Apr 2019 12:10:50 -0500
Subject: [PATCH 011/648] FIXES

---
 .../demo-helper/demo-helper.component.html    |  9 +++
 .../frontend/app/custom/helm/helm.module.ts   |  2 +-
 .../helm-release-service-card.component.html  | 10 ---
 .../helm-release-service-card.component.ts    | 73 +------------------
 .../custom/kubernetes/kubernetes.module.ts    |  2 +
 5 files changed, 15 insertions(+), 81 deletions(-)

diff --git a/custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.html b/custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.html
index 4f7f70ff90..4a8cae66cf 100644
--- a/custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.html
+++ b/custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.html
@@ -3,6 +3,15 @@ <h1>SUSECON '19 Demo</h1>
 </app-page-header>
 
 <img src="https://127.0.0.1:4200/core/assets/custom/susecon-logo.svg" />
+
+<h1>Cloud Foundry</h1>
+
+<ul>
+  <li>https://api.10.86.2.125.xip.io</li>
+</ul>
+
+<br>
+
 <h1>Helm Repositories</h1>
 
 <ul>
diff --git a/custom-src/frontend/app/custom/helm/helm.module.ts b/custom-src/frontend/app/custom/helm/helm.module.ts
index ca818ffc25..af13987c32 100644
--- a/custom-src/frontend/app/custom/helm/helm.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm.module.ts
@@ -82,7 +82,7 @@ import { RepositoryTabComponent } from './tabs/repository-tab/repository-tab.com
     HelmReleaseValuesTabComponent,
     HelmReleasePodsTabComponent,
     HelmReleaseServicesTabComponent,
-    KubernetesServicePortsComponent
+    KubernetesServicePortsComponent,
   ],
   providers: [
     ChartsService,
diff --git a/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.html b/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.html
index 547294936e..3f71b45e59 100644
--- a/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.html
+++ b/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.html
@@ -2,7 +2,6 @@
   <app-meta-card-title class=" card__title">
     <app-multiline-title class="card__title-link">{{ row.name }}</app-multiline-title>
   </app-meta-card-title>
-  <!--
   <app-meta-card-item>
     <app-meta-card-key>Cluster IP</app-meta-card-key>
     <app-meta-card-value>{{(row?.kubeService$ | async)?.spec.clusterIP}}</app-meta-card-value>
@@ -17,13 +16,4 @@
       <app-kubernetes-service-ports [row]="row"></app-kubernetes-service-ports>
     </app-meta-card-value>
   </app-meta-card-item>
-  -->
-  <app-meta-card-item>
-    <app-meta-card-key>Ports</app-meta-card-key>
-    <app-meta-card-value>
-      <div *ngFor="let port of ports">
-        <div>{{ port.name }}</div>
-      </div>
-    </app-meta-card-value>
-  </app-meta-card-item>
 </app-meta-card>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.ts b/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.ts
index 7de422b085..d60751bf79 100644
--- a/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.ts
@@ -1,78 +1,11 @@
-import { Component, Input, OnDestroy } from '@angular/core';
-import { Store } from '@ngrx/store';
-import { Subscription } from 'rxjs';
-import { filter, map, switchMap } from 'rxjs/operators';
+import { Component } from '@angular/core';
 
-import { AppState } from '../../../../../../store/src/app-state';
-import { entityFactory } from '../../../../../../store/src/helpers/entity-factory';
-import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
-import { EntityServiceFactory } from '../../../../core/entity-service-factory.service';
 import { CardCell } from '../../../../shared/components/list/list.types';
-import { PaginationMonitor } from '../../../../shared/monitors/pagination-monitor';
-import { KubeService } from '../../../kubernetes/store/kube.types';
-import { GetKubernetesServicesInNamespace } from '../../../kubernetes/store/kubernetes.actions';
-import { GetHelmReleases } from '../../store/helm.actions';
-import { helmReleasesSchemaKey } from '../../store/helm.entities';
-import { HelmRelease, HelmReleaseService } from '../../store/helm.types';
+import { HelmReleaseService } from '../../store/helm.types';
 
 @Component({
   selector: 'app-release-service-card',
   templateUrl: './helm-release-service-card.component.html',
   styleUrls: ['./helm-release-service-card.component.scss']
 })
-export class HelmReleaseServiceCardComponent extends CardCell<HelmReleaseService> implements OnDestroy {
-
-  private pRow: HelmReleaseService;
-  private svcSub: Subscription;
-
-  private ports = [];
-
-  @Input() set row(row: HelmReleaseService) {
-    this.pRow = row;
-    if (!this.svcSub && row) {
-      this.svcSub = this.fetchRelease(row.endpointId, row.releaseTitle).pipe(
-        switchMap((release: any) => {
-          const action = new GetKubernetesServicesInNamespace(row.endpointId, release.namespace);
-          const paginationMonitor = new PaginationMonitor<KubeService>(this.store, action.paginationKey, entityFactory(action.entityKey));
-          return getPaginationObservables<KubeService>({ store: this.store, action, paginationMonitor }).entities$;
-        }),
-        filter(entities => !!entities),
-        map((services: any) => services.find(service => service.metadata.name === row.name))
-      ).subscribe(service => {
-        console.log('SERVICE: ', service);
-        this.ports = service.spec.ports;
-      });
-    }
-
-
-  }
-  get row() {
-    return this.pRow;
-  }
-
-
-  constructor(
-    private store: Store<AppState>,
-    private esf: EntityServiceFactory
-  ) {
-    super();
-  }
-
-  ngOnDestroy() {
-    if (this.svcSub) {
-      this.svcSub.unsubscribe();
-    }
-  }
-
-  private fetchRelease(endpointGuid: string, releaseTitle: string) {
-    const action = new GetHelmReleases();
-    const paginationMonitor = new PaginationMonitor(this.store, action.paginationKey, entityFactory(helmReleasesSchemaKey));
-    const svc = getPaginationObservables({ store: this.store, action, paginationMonitor });
-
-
-    return svc.entities$.pipe(
-      map((items: HelmRelease[]) => items.find(item => item.guid === `${endpointGuid}:${releaseTitle}`))
-    );
-  }
-
-}
+export class HelmReleaseServiceCardComponent extends CardCell<HelmReleaseService> { }
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
index 63012671aa..1915af3b1c 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
@@ -86,6 +86,7 @@ import { KubernetesNamespacesTabComponent } from './tabs/kubernetes-namespaces-t
 import { KubernetesNodesTabComponent } from './tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component';
 import { KubernetesPodsTabComponent } from './tabs/kubernetes-pods-tab/kubernetes-pods-tab.component';
 import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kubernetes-summary.component';
+import { KubernetesServiceProxyComponent } from './kubernetes-svcproxy/kubernetes-svcproxy.component';
 
 /* tslint:disable:max-line-length */
 /* tslint:enable */
@@ -139,6 +140,7 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     KubeNamespacePodCountComponent,
     PodNameLinkComponent,
     NodePodCountComponent,
+    KubernetesServiceProxyComponent,
   ],
   providers: [
     KubernetesService,

From 29a15e9b7e5cec05a168f05eedfac96c92853bcc Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 2 Apr 2019 15:58:54 -0500
Subject: [PATCH 012/648] Fixes, docker AIO build fix

---
 .../app/custom/kubernetes/kubernetes.routing.ts | 17 +++++++++++++++++
 .../app/custom/kubernetes/store/kube.types.ts   |  4 ++++
 deploy/Dockerfile.all-in-one                    |  2 +-
 .../Dockerfile.stratos-go-build-base.tmpl       |  4 ++--
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts
index 77d1c9d821..0a1fb0341d 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts
@@ -1,3 +1,4 @@
+import { KubernetesServiceProxyComponent } from './kubernetes-svcproxy/kubernetes-svcproxy.component';
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
@@ -167,6 +168,22 @@ const kubernetes: Routes = [{
       }
     }
   ]
+},
+{
+  path: ':endpointId/svcproxy',
+  component: KubernetesServiceProxyComponent,
+  data: {
+    uiNoMargin: true
+  },
+  children: [
+    {
+      path: '**',
+      component: KubernetesServiceProxyComponent,
+      data: {
+        uiNoMargin: true
+      }
+    }
+  ]
 }
 ];
 
diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
index 9c78513045..b0817e880e 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
@@ -1,3 +1,5 @@
+import { Observable } from "rxjs";
+
 export interface KubernetesInfo {
   nodes: {};
   pods: {};
@@ -18,7 +20,9 @@ export interface KubeService {
   metadata: KubeServiceMetadata;
   status: ServiceStatus;
   spec: DeploymentSpec;
+  kubeService$?: Observable<KubeService>;
 }
+
 export interface KubernetesStatefulSet {
   metadata: KubeServiceMetadata;
   status: ServiceStatus;
diff --git a/deploy/Dockerfile.all-in-one b/deploy/Dockerfile.all-in-one
index 3f23b62a95..ee5a82601a 100644
--- a/deploy/Dockerfile.all-in-one
+++ b/deploy/Dockerfile.all-in-one
@@ -3,7 +3,7 @@ FROM splatform/stratos-aio-base:opensuse as builder
 
 COPY --chown=stratos:users *.json ./
 COPY --chown=stratos:users gulpfile.js ./
-COPY --chown=stratos:users Gopkg.* ./
+#COPY --chown=stratos:users Gopkg.* ./
 COPY --chown=stratos:users src ./src
 COPY --chown=stratos:users build ./build/
 COPY --chown=stratos:users deploy/tools/generate_cert.sh generate_cert.sh
diff --git a/deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl
index 8b156d27e3..b26bfd694e 100644
--- a/deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl
+++ b/deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl
@@ -11,8 +11,8 @@ RUN zypper ref
 RUN zypper -n ref && \
 zypper -n up && \
 zypper in -y which tar git gcc curl wget
-RUN wget https://storage.googleapis.com/golang/go1.9.7.linux-amd64.tar.gz && \
-    tar -xzf go1.9.7.linux-amd64.tar.gz -C /usr/local/ && \
+RUN wget https://dl.google.com/go/go1.12.1.linux-amd64.tar.gz && \
+    tar -xzf go1.12.1.linux-amd64.tar.gz -C /usr/local/ && \
     mkdir -p /home/stratos/go/bin && \
     mkdir -p /home/stratos/go/src
     

From 8df21b7e21d07b80f9c0394232abac82e481b473 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 3 Apr 2019 21:58:09 -0500
Subject: [PATCH 013/648] Refinements

---
 .../create-release.component.html             |  2 +-
 .../create-release.component.scss             |  1 +
 .../kubernetes-service-ports.component.html   |  2 +-
 src/jetstream/datastore/datastore.go          | 13 +++++--
 .../plugins/kubernetes/endpoint_config.go     | 39 ++++++++++++++-----
 .../plugins/kubernetes/helm_client.go         |  2 +-
 .../plugins/kubernetes/kube_dashboard.go      |  6 +--
 .../plugins/kubernetes/kube_svc_proxy.go      | 12 +++++-
 src/jetstream/plugins/kubernetes/main.go      |  2 +
 9 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.html b/custom-src/frontend/app/custom/helm/create-release/create-release.component.html
index 3d8f081b1f..e009d50e47 100644
--- a/custom-src/frontend/app/custom/helm/create-release/create-release.component.html
+++ b/custom-src/frontend/app/custom/helm/create-release/create-release.component.html
@@ -32,7 +32,7 @@ <h3 class="helm-create-release">Enter YAML Value Overrides</h3>
       <mat-form-field [floatLabel]="'always'">
         <mat-label>Values</mat-label>
         <textarea #overridesYamlTextArea class="overrides__yaml" matInput formControlName="values" name="Values"
-          [matTextareaAutosize]="true" cdkAutosizeMinRows="6" cdkAutosizeMaxRows="8"></textarea>
+          [matTextareaAutosize]="true" cdkAutosizeMinRows="12" cdkAutosizeMaxRows="16"></textarea>
       </mat-form-field>
     </form>
   </app-step>
diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.scss b/custom-src/frontend/app/custom/helm/create-release/create-release.component.scss
index b1b37d0268..1d498faabe 100644
--- a/custom-src/frontend/app/custom/helm/create-release/create-release.component.scss
+++ b/custom-src/frontend/app/custom/helm/create-release/create-release.component.scss
@@ -14,5 +14,6 @@ form {
   &__yaml {
     background-color: rgba(0, 0, 0, .1);
     font-family: 'Source Code Pro', monospace;
+    font-size: 14px;
   }
 }
diff --git a/custom-src/frontend/app/custom/helm/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html b/custom-src/frontend/app/custom/helm/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html
index 35187acf75..94a0dfa883 100644
--- a/custom-src/frontend/app/custom/helm/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html
+++ b/custom-src/frontend/app/custom/helm/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html
@@ -8,7 +8,7 @@
     </tr>
     <tr *ngFor="let port of kubeService.spec?.ports">
       <td>
-        <a *ngIf="endpointId; else noLink" href="{{getServiceLink(kubeService, port)}}" target="_blank">
+        <a *ngIf="endpointId; else noLink" [routerLink]="getServiceLink(kubeService, port)">
           {{ port.name}}
         </a>
         <ng-template #noLink>{{port.name}}</ng-template>
diff --git a/src/jetstream/datastore/datastore.go b/src/jetstream/datastore/datastore.go
index 1b8110f8e0..1a1cf3997e 100644
--- a/src/jetstream/datastore/datastore.go
+++ b/src/jetstream/datastore/datastore.go
@@ -4,6 +4,7 @@ import (
 	"database/sql"
 	"fmt"
 	"os"
+	"path"
 	"regexp"
 	"strings"
 	"time"
@@ -64,7 +65,7 @@ const (
 	// SQLiteSchemaFile - SQLite schema file
 	SQLiteSchemaFile = "./deploy/db/sqlite_schema.sql"
 	// SQLiteDatabaseFile - SQLite database file
-	SQLiteDatabaseFile = "./console-database.db"
+	SQLiteDatabaseFile = "console-database.db"
 	// Default database provider when not specified
 	DefaultDatabaseProvider = MYSQL
 )
@@ -147,16 +148,20 @@ func GetConnection(dc DatabaseConfig, env *env.VarSet) (*sql.DB, error) {
 	}
 
 	// SQL Lite
-	return GetSQLLiteConnection(env.MustBool("SQLITE_KEEP_DB"))
+	return GetSQLLiteConnection(env.MustBool("SQLITE_KEEP_DB"), env.String("SQLITE_DB_DIR", "."))
 }
 
 // GetSQLLiteConnection returns an SQLite DB Connection
-func GetSQLLiteConnection(sqliteKeepDB bool) (*sql.DB, error) {
+func GetSQLLiteConnection(sqliteKeepDB bool, sqlDbDir string) (*sql.DB, error) {
 	if !sqliteKeepDB {
 		os.Remove(SQLiteDatabaseFile)
 	}
 
-	db, err := sql.Open("sqlite3", SQLiteDatabaseFile)
+	dbFilePath := path.Join(sqlDbDir, SQLiteDatabaseFile)
+
+	log.Infof("SQLite Database file: %s", dbFilePath)
+
+	db, err := sql.Open("sqlite3", dbFilePath)
 	if err != nil {
 		return nil, err
 	}
diff --git a/src/jetstream/plugins/kubernetes/endpoint_config.go b/src/jetstream/plugins/kubernetes/endpoint_config.go
index cf2fbe79a2..06893ebe52 100644
--- a/src/jetstream/plugins/kubernetes/endpoint_config.go
+++ b/src/jetstream/plugins/kubernetes/endpoint_config.go
@@ -3,6 +3,7 @@ package kubernetes
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"strings"
 
 	log "github.com/sirupsen/logrus"
@@ -15,7 +16,7 @@ import (
 )
 
 // GetConfigForEndpoint gets a config for the Kubernetes go-client for the specified endpoint
-func GetConfigForEndpoint(masterURL string, token interfaces.TokenRecord) (*restclient.Config, error) {
+func (c *KubernetesSpecification) GetConfigForEndpoint(masterURL string, token interfaces.TokenRecord) (*restclient.Config, error) {
 	return clientcmd.BuildConfigFromKubeconfigGetter(masterURL, func() (*clientcmdapi.Config, error) {
 
 		log.Debug("GetConfigForEndpoint")
@@ -36,7 +37,7 @@ func GetConfigForEndpoint(masterURL string, token interfaces.TokenRecord) (*rest
 
 		// Configure auth information
 		authInfo := clientcmdapi.NewAuthInfo()
-		err := addAuthInfoForEndpoint(authInfo, token)
+		err := c.addAuthInfoForEndpoint(authInfo, token)
 
 		config := clientcmdapi.NewConfig()
 		config.Clusters[name] = cluster
@@ -49,7 +50,7 @@ func GetConfigForEndpoint(masterURL string, token interfaces.TokenRecord) (*rest
 
 }
 
-func addAuthInfoForEndpoint(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
+func (c *KubernetesSpecification) addAuthInfoForEndpoint(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
 
 	log.Debug("addAuthInfoForEndpoint")
 	log.Warn(tokenRec.AuthType)
@@ -57,16 +58,18 @@ func addAuthInfoForEndpoint(info *clientcmdapi.AuthInfo, tokenRec interfaces.Tok
 	switch {
 	case tokenRec.AuthType == "gke-auth":
 		log.Warn("GKE AUTH")
-		return addGKEAuth(info, tokenRec)
+		return c.addGKEAuth(info, tokenRec)
 	case tokenRec.AuthType == AuthConnectTypeCertAuth, tokenRec.AuthType == AuthConnectTypeKubeConfigAz:
-		return addCertAuth(info, tokenRec)
+		return c.addCertAuth(info, tokenRec)
+	case tokenRec.AuthType == AuthConnectTypeAWSIAM:
+		return c.addAWSAuth(info, tokenRec)
 	default:
 		log.Error("Unsupported auth type")
 	}
 	return errors.New("Unsupported auth type")
 }
 
-func addCertAuth(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
+func (c *KubernetesSpecification) addCertAuth(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
 	kubeAuthToken := &KubeCertAuth{}
 	err := json.NewDecoder(strings.NewReader(tokenRec.AuthToken)).Decode(kubeAuthToken)
 	if err != nil {
@@ -80,15 +83,33 @@ func addCertAuth(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) e
 	return nil
 }
 
-func addGKEAuth(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
+func (c *KubernetesSpecification) addGKEAuth(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
 	gkeInfo := &GKEConfig{}
 	err := json.Unmarshal([]byte(tokenRec.RefreshToken), &gkeInfo)
 	if err != nil {
 		return err
 	}
 
-	log.Warn("HERE")
-
 	info.Token = tokenRec.AuthToken
 	return nil
 }
+
+func (c *KubernetesSpecification) addAWSAuth(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
+
+	awsInfo := &AWSIAMUserInfo{}
+	err := json.Unmarshal([]byte(tokenRec.RefreshToken), &awsInfo)
+	if err != nil {
+		return err
+	}
+
+	// NOTE: We really should check first to see if the token has expired before we try and get another
+
+	// Get an access token
+	token, err := c.getTokenIAM(*awsInfo)
+	if err != nil {
+		return fmt.Errorf("Could not get new token using the IAM info: %v+", err)
+	}
+
+	info.Token = token
+	return nil
+}
diff --git a/src/jetstream/plugins/kubernetes/helm_client.go b/src/jetstream/plugins/kubernetes/helm_client.go
index 305da7a13f..2bbb9e8148 100644
--- a/src/jetstream/plugins/kubernetes/helm_client.go
+++ b/src/jetstream/plugins/kubernetes/helm_client.go
@@ -46,7 +46,7 @@ func (c *KubernetesSpecification) GetHelmClient(endpointGUID, userID string) (he
 		return nil, nil, nil, errors.New("Can not get user token for endpoint")
 	}
 
-	config, err := GetConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRecord)
+	config, err := c.GetConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRecord)
 	if err != nil {
 		return nil, nil, nil, errors.New("Can not get Kubernetes config for specified endpoint")
 	}
diff --git a/src/jetstream/plugins/kubernetes/kube_dashboard.go b/src/jetstream/plugins/kubernetes/kube_dashboard.go
index d24d596380..afcbb0b078 100644
--- a/src/jetstream/plugins/kubernetes/kube_dashboard.go
+++ b/src/jetstream/plugins/kubernetes/kube_dashboard.go
@@ -51,9 +51,9 @@ func (r *responder) Error(w http.ResponseWriter, req *http.Request, err error) {
 }
 
 // Get the config for the certificate authentication
-func getConfig(cnsiRecord *interfaces.CNSIRecord, tokenRecord *interfaces.TokenRecord) (*rest.Config, error) {
+func (k *KubernetesSpecification) getConfig(cnsiRecord *interfaces.CNSIRecord, tokenRecord *interfaces.TokenRecord) (*rest.Config, error) {
 	masterURL := cnsiRecord.APIEndpoint.String()
-	return GetConfigForEndpoint(masterURL, *tokenRecord)
+	return k.GetConfigForEndpoint(masterURL, *tokenRecord)
 }
 
 // Get the config for the certificate authentication
@@ -159,7 +159,7 @@ func (k *KubernetesSpecification) kubeDashboardProxy(c echo.Context) error {
 	targetURL, _ := url.Parse(target)
 	targetURL = normalizeLocation(targetURL)
 
-	config, err := getConfig(&cnsiRecord, &tokenRec)
+	config, err := k.getConfig(&cnsiRecord, &tokenRec)
 	if err != nil {
 		return errors.New("Could not get config for this auth type")
 	}
diff --git a/src/jetstream/plugins/kubernetes/kube_svc_proxy.go b/src/jetstream/plugins/kubernetes/kube_svc_proxy.go
index d62154a6fb..f4035a6500 100644
--- a/src/jetstream/plugins/kubernetes/kube_svc_proxy.go
+++ b/src/jetstream/plugins/kubernetes/kube_svc_proxy.go
@@ -59,13 +59,14 @@ func (k *KubernetesSpecification) kubeServiceProxy(c echo.Context) error {
 	// Currently this is not cached, so we must get it each time
 	apiEndpoint := cnsiRecord.APIEndpoint
 	log.Debug(apiEndpoint)
+	absTarget := fmt.Sprintf("/api/v1/namespaces/%s/services/%s:%s/proxy/", namespace, serviceName, servicePortName)
 	target := fmt.Sprintf("%s/api/v1/namespaces/%s/services/%s:%s/proxy/%s", apiEndpoint, namespace, serviceName, servicePortName, path)
 	targetURL, _ := url.Parse(target)
 	targetURL = normalizeLocation(targetURL)
 
 	log.Infof("Target URL: %s", targetURL)
 
-	config, err := getConfig(&cnsiRecord, &tokenRec)
+	config, err := k.getConfig(&cnsiRecord, &tokenRec)
 	if err != nil {
 		return errors.New("Could not get config for this auth type")
 	}
@@ -139,6 +140,15 @@ func (k *KubernetesSpecification) kubeServiceProxy(c echo.Context) error {
 		response.Header.Del("X-FRAME-OPTIONS")
 		response.Header.Set("X-FRAME-OPTIONS", "sameorigin")
 		log.Debug("%v+", response)
+
+		if response.StatusCode == 302 {
+			redirect := response.Header.Get("Location")
+			if strings.Index(redirect, absTarget) == 0 {
+				redirect = redirect[len(absTarget):]
+				response.Header.Set("Location", redirect)
+			}
+
+		}
 		return nil
 	}
 
diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index c8b1f1553a..b4d004f945 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -152,6 +152,8 @@ func (c *KubernetesSpecification) AddSessionGroupRoutes(echoGroup *echo.Group) {
 	// Kubernetes Dashboard Proxy
 	echoGroup.GET("/kubedash/ui/:guid/*", c.kubeDashboardProxy)
 	echoGroup.GET("/kubedash/:guid/status", c.kubeDashboardStatus)
+	echoGroup.GET("/kubesvc/:guid/:ns/:svc/:port/*", c.kubeServiceProxy)
+	echoGroup.GET("/kubesvc/:guid/:ns/:svc/:port", c.kubeServiceProxy)
 
 	// Helm Routes
 	echoGroup.GET("/helm/releases", c.ListReleases)

From 91ad7f5d40faa18cb6bccaae51058fb73c068050 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 4 Apr 2019 06:25:55 -0500
Subject: [PATCH 014/648] Tweaks

---
 .../kubernetes-service-ports.component.ts           |  2 +-
 .../helm-release-summary-tab.component.ts           | 13 +++----------
 .../simple-usage-chart.component.ts                 |  2 +-
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/custom-src/frontend/app/custom/helm/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts b/custom-src/frontend/app/custom/helm/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
index 4910d35619..e38ab70603 100644
--- a/custom-src/frontend/app/custom/helm/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
@@ -36,6 +36,6 @@ export class KubernetesServicePortsComponent extends CardCell<HelmReleaseService
 
 
   getServiceLink(service: KubeService, port: { name: string }): string {
-    return `/kubernetes/svcproxy/${this.endpointId}/${service.metadata.namespace}/${service.metadata.name}/${port.name}`;
+    return `/kubernetes/${this.endpointId}/svcproxy/${service.metadata.namespace}/${service.metadata.name}/${port.name}`;
   }
 }
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index e8ed0592ee..ff7a39ceee 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -87,18 +87,11 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
 
     // Async fetch release status
     this.subs.push(releaseStatus$.subscribe(data => {
-    const isStatusBusy$ = fetchStatus.pipe(map(d => false));
-    this.isBusy$ = combineLatest(this.helmReleaseHelper.isFetching$, isStatusBusy$).pipe(
-      map(([a, b]) => a || b)
-    );
 
-    fetchStatus.subscribe(data => {
-
-      this.podsChartData = Object.keys(data.pods.status).map(status => ({
-        name: status,
-        value: data.pods.status[status]
-      }));
+      // Pods status (grouped)
+      this.podsChartData = this.collatePodStatus(data);
 
+      // Container Readiness
       this.containersChartData = [
         {
           name: 'Ready',
diff --git a/src/frontend/packages/core/src/shared/components/simple-usage-chart/simple-usage-chart.component.ts b/src/frontend/packages/core/src/shared/components/simple-usage-chart/simple-usage-chart.component.ts
index b0d68ba8c8..d39e7d6217 100644
--- a/src/frontend/packages/core/src/shared/components/simple-usage-chart/simple-usage-chart.component.ts
+++ b/src/frontend/packages/core/src/shared/components/simple-usage-chart/simple-usage-chart.component.ts
@@ -30,7 +30,7 @@ export class SimpleUsageChartComponent {
 
   @Input() title = 'Usage';
 
-  @Input() height = '250px';
+  @Input() height = '160px';
 
   @Input() thresholds: IChartThresholds = {
     danger: 85,

From a255c19e54ce3f534e7c478a327b906128964eed Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 30 Apr 2019 13:46:58 +0100
Subject: [PATCH 015/648] WIP: Build and gtag AIO image

---
 deploy/ci/build-images-stable.yml             | 104 +++++++++---------
 .../tasks/dev-releases/check-docker-image.yml |  36 ++++++
 .../tasks/dev-releases/generate-tag-files.yml |   5 +-
 3 files changed, 92 insertions(+), 53 deletions(-)
 create mode 100644 deploy/ci/tasks/dev-releases/check-docker-image.yml

diff --git a/deploy/ci/build-images-stable.yml b/deploy/ci/build-images-stable.yml
index 716824e395..c87c42eb10 100644
--- a/deploy/ci/build-images-stable.yml
+++ b/deploy/ci/build-images-stable.yml
@@ -1,5 +1,7 @@
 # Stable image build pipeline
-# This pipeline builds the stable Docker images for Docker Compose and AIO when the stable tag is updated
+# This pipeline builds the stable Docker image for the AIO when the stable tag is updated
+# It also tags this stable image with the tag of the release version - e.g. 2.3.0
+# The latest tag is also updated as this track 'stable'
 ---
 resource_types:
 - name: docker-image
@@ -24,6 +26,18 @@ resources:
     private_key: ((github-private-key))
     # Match stable tag
     tag_filter: "stable"
+
+# Artifacts
+- name: image-tag
+  type: s3
+  source:
+    bucket: ((minio-bucket))
+    endpoint: ((minio-server-endpoint))
+    regexp: temp-artifacts/release-(.*).tar
+    access_key_id: ((minio-access-key))
+    secret_access_key: ((minio-secret-access-key))
+    region_name: eu-central-1
+
 - name: aio-docker-image
   type: docker-image
   source:
@@ -31,76 +45,62 @@ resources:
     password: ((docker-password))
     repository: splatform/stratos
 # Docker Images
-- name: jetstream-dc-image
-  type: docker-image
-  source:
-    username: ((docker-username))
-    password: ((docker-password))
-    repository: ((docker-organization))/stratos-dc-jetstream
-- name: dc-db-migrator-image
-  type: docker-image
-  source:
-    username: ((docker-username))
-    password: ((docker-password))
-    repository: ((docker-organization))/stratos-dc-db-migrator
-- name: mariadb-dc-image
-  type: docker-image
-  source:
-    username: ((docker-username))
-    password: ((docker-password))
-    repository: ((docker-organization))/stratos-dc-mariadb
 - name: ui-dc-image
   type: docker-image
   source:
     username: ((docker-username))
     password: ((docker-password))
     repository: ((docker-organization))/stratos-dc-console
-groups:
-- name: tests
-  jobs:
-  - build-dc-images
-  - build-aio-image
 
 jobs:
-- name: build-dc-images
+- name: generate-tag-files
   plan:
   - get: stratos
     trigger: true
-  - aggregate:
-    - do:
-      - put: jetstream-dc-image
-        params:
-          dockerfile: stratos/deploy/Dockerfile.bk
-          build: stratos/
-          target_name:  dev-build
-          tag: stratos/deploy/ci/tasks/build-images/stable-tag
-      - put: dc-db-migrator-image
-        params:
-          dockerfile: stratos/deploy/Dockerfile.bk
-          build: stratos/
-          target_name:  db-migrator
-          tag: stratos/deploy/ci/tasks/build-images/stable-tag
-      - put: mariadb-dc-image
-        params:
-          dockerfile: stratos/deploy/db/Dockerfile.mariadb
-          build: stratos/deploy/db
-          tag: stratos/deploy/ci/tasks/build-images/stable-tag
-      - put: ui-dc-image
-        params:
-          dockerfile: stratos/deploy/Dockerfile.ui
-          build: stratos/
-          target_name: prod-build
-          tag: stratos/deploy/ci/tasks/build-images/stable-tag
-      timeout: 2h30m
-
+  - do:
+    - task: generate-tag
+      file: stratos/deploy/ci/tasks/dev-releases/generate-tag-files.yml
+      params:
+        TAG_SUFFIX: ((tag-suffix))
+    - put: image-tag
+      params:
+        file: image-tag/*.tar
+        acl: public-read
+- name: check-github
+  plan:
+  - get: stratos
+    passed: [generate-tag-files]
+    trigger: true
+  - get: image-tag
+    passed: [generate-tag-files] 
+    params:
+     unpack: true
+  - do:
+    - task: build
+      privileged: true
+      timeout: 30m
+      file: stratos/deploy/ci/tasks/dev-releases/check-docker-image.yml
+      params:
+        DOCKER_REGISTRY: ((docker-registry))
+        DOCKER_ORG: ((docker-organization))
+        DOCKER_USERNAME: ((docker-username))
+        DOCKER_PASSWORD: ((docker-password))
+        IMAGE_NAME: stratos
 - name: build-aio-image
   public: true
   serial: true
   plan:
   - get: stratos
+    passed: [check-github]
     trigger: true
+  - get: image-tag
+    passed: [check-github]
+    params:
+     unpack: true
   - put: aio-docker-image
     params:
       build: stratos
       dockerfile: stratos/deploy/Dockerfile.all-in-one
       tag: stratos/deploy/ci/tasks/build-images/stable-tag
+      tas_as_latest: true
+      labels_file: image-tag/image-labels
diff --git a/deploy/ci/tasks/dev-releases/check-docker-image.yml b/deploy/ci/tasks/dev-releases/check-docker-image.yml
new file mode 100644
index 0000000000..b5577bde56
--- /dev/null
+++ b/deploy/ci/tasks/dev-releases/check-docker-image.yml
@@ -0,0 +1,36 @@
+---
+platform: linux
+inputs:
+- name: stratos
+- name: image-tag
+image_resource:
+  type: docker-image
+  source:
+   # Generated using scripts/Dockerfile.stratos-ci
+   repository: splatform/stratos-ci-concourse
+   tag: "latest"
+
+run:
+  path: sh
+  args:
+    - -exc
+    - |
+      # Check that an image with the same Commit DOES NOT exist
+      ROOT_DIR=${PWD}
+      VERSION=$(cat image-tag/v2-version)
+      FULL_VERSION=$(cat image-tag/v2-alpha-tag) 
+      GIT_TAG=$(cat image-tag/v2-tag) 
+      STRATOS=${ROOT_DIR}/stratos
+
+      # Make the Docker Auth token
+      AUTH="${DOCKER_USERNAME}:${DOCKER_PASSWORD}"
+      TOKEN=`echo ${AUTH} | base64"
+
+      URL=https://${DOCKER_REGISTRY}/v2/${DOCKER_ORG}/${IMAGE_NAME}/tags/list
+
+      # Fetch the image tags
+      curl -s -H "Authorization: Basic ${TOKEN}" ${URL}
+
+      echo "okay"
+
+
diff --git a/deploy/ci/tasks/dev-releases/generate-tag-files.yml b/deploy/ci/tasks/dev-releases/generate-tag-files.yml
index 7e3876cc8e..aa28250ffe 100644
--- a/deploy/ci/tasks/dev-releases/generate-tag-files.yml
+++ b/deploy/ci/tasks/dev-releases/generate-tag-files.yml
@@ -60,6 +60,9 @@ run:
       cat > build-args << EOF
       { "stratos_version": "${LATEST_TAG}" }
       EOF
+      cat > image-labels << EOF
+      { "commit": "${COMMIT_HASH}" }
+      EOF
 
       echo "Created v2-alpha-tag, v2-version and build-args."
 
@@ -73,7 +76,7 @@ run:
       cat v2-alpha-tag
       
       echo "Creating tag file tar..."
-      tar -cf ${FILENAME}.tar v2-alpha-tag v2-version v2-tag v2-commit build-args ui-build-args
+      tar -cf ${FILENAME}.tar v2-alpha-tag v2-version v2-tag v2-commit build-args ui-build-args image-labels
 
       echo "Created tag file tar as ${FILENAME}.tar"
       echo "Generate tag files complete!"

From a6a4f3aa984098f81aca3f9d8fbd11d8c06c1a17 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 30 Apr 2019 13:51:55 +0100
Subject: [PATCH 016/648] Remove unused DC image

---
 deploy/ci/build-images-stable.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/deploy/ci/build-images-stable.yml b/deploy/ci/build-images-stable.yml
index c87c42eb10..0f842fb7d5 100644
--- a/deploy/ci/build-images-stable.yml
+++ b/deploy/ci/build-images-stable.yml
@@ -38,19 +38,13 @@ resources:
     secret_access_key: ((minio-secret-access-key))
     region_name: eu-central-1
 
+# Docker Images
 - name: aio-docker-image
   type: docker-image
   source:
     username: ((docker-username))
     password: ((docker-password))
     repository: splatform/stratos
-# Docker Images
-- name: ui-dc-image
-  type: docker-image
-  source:
-    username: ((docker-username))
-    password: ((docker-password))
-    repository: ((docker-organization))/stratos-dc-console
 
 jobs:
 - name: generate-tag-files

From 1fc5d9bc53600cbae18a68e2093db81ce76e8e68 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 30 Apr 2019 13:59:18 +0100
Subject: [PATCH 017/648] Remove logging

---
 deploy/ci/build-images-stable.yml                   | 6 +++---
 deploy/ci/tasks/dev-releases/check-docker-image.yml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/deploy/ci/build-images-stable.yml b/deploy/ci/build-images-stable.yml
index 0f842fb7d5..9485aa1493 100644
--- a/deploy/ci/build-images-stable.yml
+++ b/deploy/ci/build-images-stable.yml
@@ -60,7 +60,7 @@ jobs:
       params:
         file: image-tag/*.tar
         acl: public-read
-- name: check-github
+- name: check-docker-image
   plan:
   - get: stratos
     passed: [generate-tag-files]
@@ -85,10 +85,10 @@ jobs:
   serial: true
   plan:
   - get: stratos
-    passed: [check-github]
+    passed: [check-docker-image]
     trigger: true
   - get: image-tag
-    passed: [check-github]
+    passed: [check-docker-image]
     params:
      unpack: true
   - put: aio-docker-image
diff --git a/deploy/ci/tasks/dev-releases/check-docker-image.yml b/deploy/ci/tasks/dev-releases/check-docker-image.yml
index b5577bde56..436cdd1cc1 100644
--- a/deploy/ci/tasks/dev-releases/check-docker-image.yml
+++ b/deploy/ci/tasks/dev-releases/check-docker-image.yml
@@ -13,7 +13,7 @@ image_resource:
 run:
   path: sh
   args:
-    - -exc
+    - -ec
     - |
       # Check that an image with the same Commit DOES NOT exist
       ROOT_DIR=${PWD}
@@ -24,7 +24,7 @@ run:
 
       # Make the Docker Auth token
       AUTH="${DOCKER_USERNAME}:${DOCKER_PASSWORD}"
-      TOKEN=`echo ${AUTH} | base64"
+      TOKEN=`echo "${AUTH}" | base64`
 
       URL=https://${DOCKER_REGISTRY}/v2/${DOCKER_ORG}/${IMAGE_NAME}/tags/list
 

From 0f60f2e3efcf6076c840b22b5574721c168b838e Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 30 Apr 2019 14:34:24 +0100
Subject: [PATCH 018/648] Fix docker org

---
 deploy/ci/build-images-stable.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/ci/build-images-stable.yml b/deploy/ci/build-images-stable.yml
index 9485aa1493..da3b200aa7 100644
--- a/deploy/ci/build-images-stable.yml
+++ b/deploy/ci/build-images-stable.yml
@@ -44,7 +44,7 @@ resources:
   source:
     username: ((docker-username))
     password: ((docker-password))
-    repository: splatform/stratos
+    repository: ((docker-organization))/stratos
 
 jobs:
 - name: generate-tag-files

From 8d87a2a770598b0b45cd7ac586d87ac550312160 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 30 Apr 2019 15:15:17 +0100
Subject: [PATCH 019/648] Debug

---
 deploy/ci/build-images-stable.yml                   | 7 +++++++
 deploy/ci/tasks/dev-releases/check-docker-image.yml | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/deploy/ci/build-images-stable.yml b/deploy/ci/build-images-stable.yml
index da3b200aa7..d65888db0b 100644
--- a/deploy/ci/build-images-stable.yml
+++ b/deploy/ci/build-images-stable.yml
@@ -45,6 +45,7 @@ resources:
     username: ((docker-username))
     password: ((docker-password))
     repository: ((docker-organization))/stratos
+    tag: stable
 
 jobs:
 - name: generate-tag-files
@@ -60,6 +61,10 @@ jobs:
       params:
         file: image-tag/*.tar
         acl: public-read
+- name: get-image-metadata
+  plan:
+  - get: stratos
+    trigger: true
 - name: check-docker-image
   plan:
   - get: stratos
@@ -69,6 +74,8 @@ jobs:
     passed: [generate-tag-files] 
     params:
      unpack: true
+  - get: aio-docker-image
+    passed: [generate-tag-files] 
   - do:
     - task: build
       privileged: true
diff --git a/deploy/ci/tasks/dev-releases/check-docker-image.yml b/deploy/ci/tasks/dev-releases/check-docker-image.yml
index 436cdd1cc1..f8de49c5db 100644
--- a/deploy/ci/tasks/dev-releases/check-docker-image.yml
+++ b/deploy/ci/tasks/dev-releases/check-docker-image.yml
@@ -13,7 +13,7 @@ image_resource:
 run:
   path: sh
   args:
-    - -ec
+    - -c
     - |
       # Check that an image with the same Commit DOES NOT exist
       ROOT_DIR=${PWD}
@@ -22,6 +22,10 @@ run:
       GIT_TAG=$(cat image-tag/v2-tag) 
       STRATOS=${ROOT_DIR}/stratos
 
+      ls ${ROOT_DIR}
+      ls /aio-docker-image
+      cat /aio-docker-image/docker_inspect.json
+
       # Make the Docker Auth token
       AUTH="${DOCKER_USERNAME}:${DOCKER_PASSWORD}"
       TOKEN=`echo "${AUTH}" | base64`

From 8d5cea555a0b3c694223ac0f613aafb02c928766 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 30 Apr 2019 15:29:13 +0100
Subject: [PATCH 020/648] Add missing input

---
 deploy/ci/build-images-stable.yml                 | 5 -----
 deploy/ci/tasks/dev-releases/check-gh-release.yml | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/deploy/ci/build-images-stable.yml b/deploy/ci/build-images-stable.yml
index d65888db0b..1838762a0c 100644
--- a/deploy/ci/build-images-stable.yml
+++ b/deploy/ci/build-images-stable.yml
@@ -61,10 +61,6 @@ jobs:
       params:
         file: image-tag/*.tar
         acl: public-read
-- name: get-image-metadata
-  plan:
-  - get: stratos
-    trigger: true
 - name: check-docker-image
   plan:
   - get: stratos
@@ -75,7 +71,6 @@ jobs:
     params:
      unpack: true
   - get: aio-docker-image
-    passed: [generate-tag-files] 
   - do:
     - task: build
       privileged: true
diff --git a/deploy/ci/tasks/dev-releases/check-gh-release.yml b/deploy/ci/tasks/dev-releases/check-gh-release.yml
index 84529c8419..55ad3f92f3 100644
--- a/deploy/ci/tasks/dev-releases/check-gh-release.yml
+++ b/deploy/ci/tasks/dev-releases/check-gh-release.yml
@@ -3,6 +3,7 @@ platform: linux
 inputs:
 - name: stratos
 - name: image-tag
+- name: aio-docker-image
 image_resource:
   type: docker-image
   source:

From 9ac8250347228012c179e7f4825acf5b34bb2e69 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 1 May 2019 14:31:58 +0100
Subject: [PATCH 021/648] Add missing input

---
 deploy/ci/tasks/dev-releases/check-docker-image.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/deploy/ci/tasks/dev-releases/check-docker-image.yml b/deploy/ci/tasks/dev-releases/check-docker-image.yml
index f8de49c5db..a5075db328 100644
--- a/deploy/ci/tasks/dev-releases/check-docker-image.yml
+++ b/deploy/ci/tasks/dev-releases/check-docker-image.yml
@@ -3,6 +3,7 @@ platform: linux
 inputs:
 - name: stratos
 - name: image-tag
+- name: aio-docker-image
 image_resource:
   type: docker-image
   source:

From 2f27d40aad09d3196c02f07f6c7a25547abf37d6 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 1 May 2019 14:42:57 +0100
Subject: [PATCH 022/648] Fix docker image check

---
 .../tasks/dev-releases/check-docker-image.yml | 21 ++++----
 .../tasks/dev-releases/docker-image-helper.sh | 52 +++++++++++++++++++
 2 files changed, 62 insertions(+), 11 deletions(-)
 create mode 100755 deploy/ci/tasks/dev-releases/docker-image-helper.sh

diff --git a/deploy/ci/tasks/dev-releases/check-docker-image.yml b/deploy/ci/tasks/dev-releases/check-docker-image.yml
index a5075db328..ca0cc1783f 100644
--- a/deploy/ci/tasks/dev-releases/check-docker-image.yml
+++ b/deploy/ci/tasks/dev-releases/check-docker-image.yml
@@ -3,7 +3,6 @@ platform: linux
 inputs:
 - name: stratos
 - name: image-tag
-- name: aio-docker-image
 image_resource:
   type: docker-image
   source:
@@ -22,20 +21,20 @@ run:
       FULL_VERSION=$(cat image-tag/v2-alpha-tag) 
       GIT_TAG=$(cat image-tag/v2-tag) 
       STRATOS=${ROOT_DIR}/stratos
+      COMMIT_HASH=$(cat image-tag/v2-commit)
 
       ls ${ROOT_DIR}
-      ls /aio-docker-image
-      cat /aio-docker-image/docker_inspect.json
+      
+      source ${STRATOS}/deploy/ci/tasks/dev-releases/docker-image-helper.sh
 
-      # Make the Docker Auth token
-      AUTH="${DOCKER_USERNAME}:${DOCKER_PASSWORD}"
-      TOKEN=`echo "${AUTH}" | base64`
+      # Get the Commit Label for the image
+      COMMIT=`getDockerImageCommitLabel $DOCKER_REGISTRY $DOCKER_USERNAME $DOCKER_PASSWORD $DOCKER_ORG $IMAGE $TAG_NAME`
 
-      URL=https://${DOCKER_REGISTRY}/v2/${DOCKER_ORG}/${IMAGE_NAME}/tags/list
+      echo "Current Docker Image has Commit $COMMIT"
 
-      # Fetch the image tags
-      curl -s -H "Authorization: Basic ${TOKEN}" ${URL}
+      cat $GIT_TAG
+      cat $FULL_VERSION
+      cat $VERSION
+      cat $COMMIT_HASH
 
       echo "okay"
-
-
diff --git a/deploy/ci/tasks/dev-releases/docker-image-helper.sh b/deploy/ci/tasks/dev-releases/docker-image-helper.sh
new file mode 100755
index 0000000000..c961844c36
--- /dev/null
+++ b/deploy/ci/tasks/dev-releases/docker-image-helper.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Get commit label for a docker image
+
+function dockerMakeCurl() {
+  local URL=$1
+  local MANIFEST=$2
+
+  if [ "$MANIFEST" == "true" ]; then
+
+    if [ "$TOKEN" != "" ]; then
+      curl --location -s -H "Accept: application/vnd.docker.distribution.manifest.v2+json" -H "Authorization: Bearer $TOKEN"  $URL
+    else
+      curl --location -s -H "Accept: application/vnd.docker.distribution.manifest.v2+json" $USER_AUTH $URL
+    fi
+  else
+    if [ "$TOKEN" != "" ]; then
+      curl --location -s -H "Authorization: Bearer $TOKEN"  $URL
+    else
+      curl --location -s $USER_AUTH $URL
+    fi
+  fi
+}
+
+function getDockerImageCommitLabel() {
+
+  local REG=$1
+  local USER=$2
+  local PASS=$3
+  local ORG=$4
+  local IMAGE=$5
+  local TAG=$6
+
+  local USER_AUTH=""
+
+  if [ "$REG" == "docker.io" ]; then
+    echo "Getting TOKEN for docker.io access"
+    TOKEN=`curl -s "https://auth.docker.io/token?service=registry.docker.io&scope=repository:$ORG/$IMAGE:pull" | jq -r .token`
+    AUTH_TYPE="Bearer"
+    REGISTRY_ADDRESS=https://registry.hub.docker.com
+  else
+    USER_AUTH="-u $USER:$PASS"
+    REGISTRY_ADDRESS=https://$REG
+    TOKEN=""
+  fi
+
+  URL=$REGISTRY_ADDRESS/v2/$ORG/$IMAGE/manifests/$TAG
+  DIGEST=`dockerMakeCurl $URL "true" | jq -r '.config.digest'`
+  
+  COMMIT=`dockerMakeCurl "$REGISTRY_ADDRESS/v2/$ORG/$IMAGE/blobs/$DIGEST" "false" | jq -r .container_config.Labels.commit`
+  echo "$COMMIT"
+}

From 12fc0055882f381df5b35ae4e3ee0f06edf6b0ff Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 1 May 2019 15:25:08 +0100
Subject: [PATCH 023/648] Fix helper

---
 deploy/ci/tasks/dev-releases/docker-image-helper.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/deploy/ci/tasks/dev-releases/docker-image-helper.sh b/deploy/ci/tasks/dev-releases/docker-image-helper.sh
index c961844c36..3f64598821 100755
--- a/deploy/ci/tasks/dev-releases/docker-image-helper.sh
+++ b/deploy/ci/tasks/dev-releases/docker-image-helper.sh
@@ -34,7 +34,6 @@ function getDockerImageCommitLabel() {
   local USER_AUTH=""
 
   if [ "$REG" == "docker.io" ]; then
-    echo "Getting TOKEN for docker.io access"
     TOKEN=`curl -s "https://auth.docker.io/token?service=registry.docker.io&scope=repository:$ORG/$IMAGE:pull" | jq -r .token`
     AUTH_TYPE="Bearer"
     REGISTRY_ADDRESS=https://registry.hub.docker.com

From d7ce1b16ceb72842a257e1a19a5fc38fc74bd8c8 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 1 May 2019 15:41:43 +0100
Subject: [PATCH 024/648] Debugging

---
 deploy/ci/tasks/dev-releases/check-docker-image.yml | 11 +++++------
 deploy/ci/tasks/dev-releases/docker-image-helper.sh |  9 +++++++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/deploy/ci/tasks/dev-releases/check-docker-image.yml b/deploy/ci/tasks/dev-releases/check-docker-image.yml
index ca0cc1783f..ab5610d942 100644
--- a/deploy/ci/tasks/dev-releases/check-docker-image.yml
+++ b/deploy/ci/tasks/dev-releases/check-docker-image.yml
@@ -23,18 +23,17 @@ run:
       STRATOS=${ROOT_DIR}/stratos
       COMMIT_HASH=$(cat image-tag/v2-commit)
 
-      ls ${ROOT_DIR}
-      
       source ${STRATOS}/deploy/ci/tasks/dev-releases/docker-image-helper.sh
 
+      cat $GIT_TAG
+      cat $FULL_VERSION
+      cat $VERSION
+      cat $COMMIT_HASH
+
       # Get the Commit Label for the image
       COMMIT=`getDockerImageCommitLabel $DOCKER_REGISTRY $DOCKER_USERNAME $DOCKER_PASSWORD $DOCKER_ORG $IMAGE $TAG_NAME`
 
       echo "Current Docker Image has Commit $COMMIT"
 
-      cat $GIT_TAG
-      cat $FULL_VERSION
-      cat $VERSION
-      cat $COMMIT_HASH
 
       echo "okay"
diff --git a/deploy/ci/tasks/dev-releases/docker-image-helper.sh b/deploy/ci/tasks/dev-releases/docker-image-helper.sh
index 3f64598821..3598b2f2db 100755
--- a/deploy/ci/tasks/dev-releases/docker-image-helper.sh
+++ b/deploy/ci/tasks/dev-releases/docker-image-helper.sh
@@ -43,7 +43,16 @@ function getDockerImageCommitLabel() {
     TOKEN=""
   fi
 
+  echo $TOKEN
+  echo $REG
+  echo $ORG
+  echo $IMAGE
+  echo $TAG
+
   URL=$REGISTRY_ADDRESS/v2/$ORG/$IMAGE/manifests/$TAG
+
+  dockerMakeCurl $URL "true" | jq .
+
   DIGEST=`dockerMakeCurl $URL "true" | jq -r '.config.digest'`
   
   COMMIT=`dockerMakeCurl "$REGISTRY_ADDRESS/v2/$ORG/$IMAGE/blobs/$DIGEST" "false" | jq -r .container_config.Labels.commit`

From 10b1b72077265c4ae1afd90d3c456cd310d2ae43 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 1 May 2019 15:48:11 +0100
Subject: [PATCH 025/648] Fix

---
 deploy/ci/tasks/dev-releases/check-docker-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/ci/tasks/dev-releases/check-docker-image.yml b/deploy/ci/tasks/dev-releases/check-docker-image.yml
index ab5610d942..b2709892d7 100644
--- a/deploy/ci/tasks/dev-releases/check-docker-image.yml
+++ b/deploy/ci/tasks/dev-releases/check-docker-image.yml
@@ -31,7 +31,7 @@ run:
       cat $COMMIT_HASH
 
       # Get the Commit Label for the image
-      COMMIT=`getDockerImageCommitLabel $DOCKER_REGISTRY $DOCKER_USERNAME $DOCKER_PASSWORD $DOCKER_ORG $IMAGE $TAG_NAME`
+      getDockerImageCommitLabel $DOCKER_REGISTRY $DOCKER_USERNAME $DOCKER_PASSWORD $DOCKER_ORG $IMAGE $TAG_NAME
 
       echo "Current Docker Image has Commit $COMMIT"
 

From 9176e46d4e01a85ba3d6d5808da59c8e2e0d8709 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 1 May 2019 16:05:31 +0100
Subject: [PATCH 026/648] Fix

---
 deploy/ci/tasks/dev-releases/docker-image-helper.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/deploy/ci/tasks/dev-releases/docker-image-helper.sh b/deploy/ci/tasks/dev-releases/docker-image-helper.sh
index 3598b2f2db..061cb0bc0b 100755
--- a/deploy/ci/tasks/dev-releases/docker-image-helper.sh
+++ b/deploy/ci/tasks/dev-releases/docker-image-helper.sh
@@ -6,10 +6,14 @@ function dockerMakeCurl() {
   local URL=$1
   local MANIFEST=$2
 
+  echo $URL
+  echo $MANIFEST
+  echo $TOKEN
+
   if [ "$MANIFEST" == "true" ]; then
 
     if [ "$TOKEN" != "" ]; then
-      curl --location -s -H "Accept: application/vnd.docker.distribution.manifest.v2+json" -H "Authorization: Bearer $TOKEN"  $URL
+      curl --location -s -H "Accept: application/vnd.docker.distribution.manifest.v2+json" -H "Authorization: Bearer $TOKEN" $URL
     else
       curl --location -s -H "Accept: application/vnd.docker.distribution.manifest.v2+json" $USER_AUTH $URL
     fi
@@ -49,7 +53,8 @@ function getDockerImageCommitLabel() {
   echo $IMAGE
   echo $TAG
 
-  URL=$REGISTRY_ADDRESS/v2/$ORG/$IMAGE/manifests/$TAG
+  local URL="$REGISTRY_ADDRESS/v2/$ORG/$IMAGE/manifests/$TAG"
+  echo "URL: $URL"
 
   dockerMakeCurl $URL "true" | jq .
 

From 715f18109be50cb4a83c9021f6f279902652696d Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 1 May 2019 16:08:38 +0100
Subject: [PATCH 027/648] Fix

---
 deploy/ci/tasks/dev-releases/check-docker-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/ci/tasks/dev-releases/check-docker-image.yml b/deploy/ci/tasks/dev-releases/check-docker-image.yml
index b2709892d7..fb1a5735bc 100644
--- a/deploy/ci/tasks/dev-releases/check-docker-image.yml
+++ b/deploy/ci/tasks/dev-releases/check-docker-image.yml
@@ -31,7 +31,7 @@ run:
       cat $COMMIT_HASH
 
       # Get the Commit Label for the image
-      getDockerImageCommitLabel $DOCKER_REGISTRY $DOCKER_USERNAME $DOCKER_PASSWORD $DOCKER_ORG $IMAGE $TAG_NAME
+      getDockerImageCommitLabel $DOCKER_REGISTRY $DOCKER_USERNAME $DOCKER_PASSWORD $DOCKER_ORG $IMAGE_NAME $TAG_NAME
 
       echo "Current Docker Image has Commit $COMMIT"
 

From ca16246d1c8dda777b680c3698d37ff9ffcff09a Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 1 May 2019 16:12:37 +0100
Subject: [PATCH 028/648] Fix

---
 deploy/ci/tasks/dev-releases/docker-image-helper.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/deploy/ci/tasks/dev-releases/docker-image-helper.sh b/deploy/ci/tasks/dev-releases/docker-image-helper.sh
index 061cb0bc0b..096a9d045d 100755
--- a/deploy/ci/tasks/dev-releases/docker-image-helper.sh
+++ b/deploy/ci/tasks/dev-releases/docker-image-helper.sh
@@ -6,10 +6,6 @@ function dockerMakeCurl() {
   local URL=$1
   local MANIFEST=$2
 
-  echo $URL
-  echo $MANIFEST
-  echo $TOKEN
-
   if [ "$MANIFEST" == "true" ]; then
 
     if [ "$TOKEN" != "" ]; then

From 207feb2b6fef5914e109fd4616ec60ad7fa4b5ca Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 1 May 2019 16:17:06 +0100
Subject: [PATCH 029/648] Fix

---
 deploy/ci/tasks/dev-releases/check-docker-image.yml | 4 ++++
 deploy/ci/tasks/dev-releases/docker-image-helper.sh | 7 -------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/deploy/ci/tasks/dev-releases/check-docker-image.yml b/deploy/ci/tasks/dev-releases/check-docker-image.yml
index fb1a5735bc..2b29ff9be4 100644
--- a/deploy/ci/tasks/dev-releases/check-docker-image.yml
+++ b/deploy/ci/tasks/dev-releases/check-docker-image.yml
@@ -35,5 +35,9 @@ run:
 
       echo "Current Docker Image has Commit $COMMIT"
 
+      if [ "$COMMIT" == "$COMMIT_HASH" ]; then
+        echo "Image has already been built and published for commit ${COMMIT_HASH}"
+        exit 1
+      fi
 
       echo "okay"
diff --git a/deploy/ci/tasks/dev-releases/docker-image-helper.sh b/deploy/ci/tasks/dev-releases/docker-image-helper.sh
index 096a9d045d..66c62ba8de 100755
--- a/deploy/ci/tasks/dev-releases/docker-image-helper.sh
+++ b/deploy/ci/tasks/dev-releases/docker-image-helper.sh
@@ -43,14 +43,7 @@ function getDockerImageCommitLabel() {
     TOKEN=""
   fi
 
-  echo $TOKEN
-  echo $REG
-  echo $ORG
-  echo $IMAGE
-  echo $TAG
-
   local URL="$REGISTRY_ADDRESS/v2/$ORG/$IMAGE/manifests/$TAG"
-  echo "URL: $URL"
 
   dockerMakeCurl $URL "true" | jq .
 

From c6f1f8c404427225735303bb411d9b63aac82d63 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 1 May 2019 16:25:56 +0100
Subject: [PATCH 030/648] Final fixes

---
 deploy/ci/build-images-stable.yml                   | 6 ++++--
 deploy/ci/tasks/dev-releases/check-docker-image.yml | 6 ++++--
 deploy/ci/tasks/dev-releases/docker-image-helper.sh | 2 --
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/deploy/ci/build-images-stable.yml b/deploy/ci/build-images-stable.yml
index 1838762a0c..26b9c99bd7 100644
--- a/deploy/ci/build-images-stable.yml
+++ b/deploy/ci/build-images-stable.yml
@@ -1,7 +1,7 @@
 # Stable image build pipeline
 # This pipeline builds the stable Docker image for the AIO when the stable tag is updated
 # It also tags this stable image with the tag of the release version - e.g. 2.3.0
-# The latest tag is also updated as this track 'stable'
+# The latest tag is also updated as this tracks 'stable'
 ---
 resource_types:
 - name: docker-image
@@ -45,7 +45,7 @@ resources:
     username: ((docker-username))
     password: ((docker-password))
     repository: ((docker-organization))/stratos
-    tag: stable
+    tag: "stable"
 
 jobs:
 - name: generate-tag-files
@@ -82,6 +82,7 @@ jobs:
         DOCKER_USERNAME: ((docker-username))
         DOCKER_PASSWORD: ((docker-password))
         IMAGE_NAME: stratos
+        TAG_NAME: stable
 - name: build-aio-image
   public: true
   serial: true
@@ -100,3 +101,4 @@ jobs:
       tag: stratos/deploy/ci/tasks/build-images/stable-tag
       tas_as_latest: true
       labels_file: image-tag/image-labels
+      additional_tags: image-tag/v2-version      
diff --git a/deploy/ci/tasks/dev-releases/check-docker-image.yml b/deploy/ci/tasks/dev-releases/check-docker-image.yml
index 2b29ff9be4..9d93035a43 100644
--- a/deploy/ci/tasks/dev-releases/check-docker-image.yml
+++ b/deploy/ci/tasks/dev-releases/check-docker-image.yml
@@ -31,7 +31,7 @@ run:
       cat $COMMIT_HASH
 
       # Get the Commit Label for the image
-      getDockerImageCommitLabel $DOCKER_REGISTRY $DOCKER_USERNAME $DOCKER_PASSWORD $DOCKER_ORG $IMAGE_NAME $TAG_NAME
+      COMMIT=`getDockerImageCommitLabel $DOCKER_REGISTRY $DOCKER_USERNAME $DOCKER_PASSWORD $DOCKER_ORG $IMAGE_NAME $TAG_NAME`
 
       echo "Current Docker Image has Commit $COMMIT"
 
@@ -40,4 +40,6 @@ run:
         exit 1
       fi
 
-      echo "okay"
+      echo "Docker Image has not been build from this commit"
+
+      echo "OK"
diff --git a/deploy/ci/tasks/dev-releases/docker-image-helper.sh b/deploy/ci/tasks/dev-releases/docker-image-helper.sh
index 66c62ba8de..12fb25a36b 100755
--- a/deploy/ci/tasks/dev-releases/docker-image-helper.sh
+++ b/deploy/ci/tasks/dev-releases/docker-image-helper.sh
@@ -45,8 +45,6 @@ function getDockerImageCommitLabel() {
 
   local URL="$REGISTRY_ADDRESS/v2/$ORG/$IMAGE/manifests/$TAG"
 
-  dockerMakeCurl $URL "true" | jq .
-
   DIGEST=`dockerMakeCurl $URL "true" | jq -r '.config.digest'`
   
   COMMIT=`dockerMakeCurl "$REGISTRY_ADDRESS/v2/$ORG/$IMAGE/blobs/$DIGEST" "false" | jq -r .container_config.Labels.commit`

From e19eae2504d2a4cb2d08f996ef02b3915341fafe Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 1 May 2019 17:03:27 +0100
Subject: [PATCH 031/648] Fix typo

---
 deploy/ci/build-images-stable.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/ci/build-images-stable.yml b/deploy/ci/build-images-stable.yml
index 26b9c99bd7..e1db43fd95 100644
--- a/deploy/ci/build-images-stable.yml
+++ b/deploy/ci/build-images-stable.yml
@@ -99,6 +99,6 @@ jobs:
       build: stratos
       dockerfile: stratos/deploy/Dockerfile.all-in-one
       tag: stratos/deploy/ci/tasks/build-images/stable-tag
-      tas_as_latest: true
+      tag_as_latest: true
       labels_file: image-tag/image-labels
       additional_tags: image-tag/v2-version      

From d5dccf134a964efa5c9af1499b6c765c0bfa94cc Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 2 May 2019 10:00:51 +0100
Subject: [PATCH 032/648] Add canary tag

---
 deploy/ci/tasks/build-images/canary-tag | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 deploy/ci/tasks/build-images/canary-tag

diff --git a/deploy/ci/tasks/build-images/canary-tag b/deploy/ci/tasks/build-images/canary-tag
new file mode 100644
index 0000000000..be1bd41848
--- /dev/null
+++ b/deploy/ci/tasks/build-images/canary-tag
@@ -0,0 +1 @@
+canary

From 7df2a64f3bf495a66b3234c4f1e398d719ae07c2 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 2 May 2019 14:49:48 +0100
Subject: [PATCH 033/648] Re-enable Helm feature

---
 .../frontend/app/custom/custom.module.ts       |  9 ++++-----
 src/jetstream/plugins/monocular/main.go        | 18 +++++-------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/custom-src/frontend/app/custom/custom.module.ts b/custom-src/frontend/app/custom/custom.module.ts
index cbcc12110c..e0dfea55d4 100644
--- a/custom-src/frontend/app/custom/custom.module.ts
+++ b/custom-src/frontend/app/custom/custom.module.ts
@@ -14,6 +14,8 @@ import { KubernetesSetupModule } from './kubernetes/kubernetes.setup.module';
 import { KubeHealthCheck } from './kubernetes/store/kubernetes.actions';
 import { SuseAboutInfoComponent } from './suse-about-info/suse-about-info.component';
 import { SuseLoginComponent } from './suse-login/suse-login.component';
+import { HelmModule } from './helm/helm.module';
+import { HelmSetupModule } from './helm/helm.setup.module';
 
 const SuseCustomizations: CustomizationsMetadata = {
   copyright: '&copy; 2019 SUSE',
@@ -27,11 +29,8 @@ const SuseCustomizations: CustomizationsMetadata = {
     SharedModule,
     MDAppModule,
     KubernetesSetupModule,
-    // #150 - Uncomment to enable helm plugin
-    // ---------------------------------------
-    // HelmModule,
-    // HelmSetupModule
-    // ---------------------------------------
+    HelmModule,
+    HelmSetupModule
   ],
   declarations: [
     SuseLoginComponent,
diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index a834164206..260c80ff9d 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -45,19 +45,11 @@ func (m *Monocular) GetChartStore() chartsvc.ChartSvcDatastore {
 // Init performs plugin initialization
 func (m *Monocular) Init() error {
 
-	return errors.New("Manually disabled")
-	// #150 - Uncomment to enable helm plugin
-	// ---------------------------------------
-	// m.ConfigureSQL()
-
-	// m.chartSvcRoutes = chartsvc.GetRoutes()
-
-	// m.InitSync()
-
-	// m.syncOnStartup()
-
-	// return nil
-	// ---------------------------------------
+	m.ConfigureSQL()
+	m.chartSvcRoutes = chartsvc.GetRoutes()
+	m.InitSync()
+	m.syncOnStartup()
+	return nil
 }
 
 func (m *Monocular) syncOnStartup() {

From 6313b3d15f90036998e4f5db8c6c29374d935564 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 2 May 2019 15:45:51 +0100
Subject: [PATCH 034/648] Add logging during customization

---
 build/customize-build.js | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/build/customize-build.js b/build/customize-build.js
index 35cfaf5a3d..3c78d51476 100644
--- a/build/customize-build.js
+++ b/build/customize-build.js
@@ -26,6 +26,7 @@
     doShowVersions()
     doCustomize(false);
     doGenerateIndexHtml(true);
+    console.log('Finished applying customizations')
     cb();
   });
 
@@ -33,6 +34,7 @@
   gulp.task('customize-default', function (cb) {
     doCustomize(true);
     doGenerateIndexHtml(false);
+    console.log('Finished applying default customizations')
     cb();
   });
 
@@ -40,6 +42,7 @@
   gulp.task('customize-reset', function (cb) {
     doCustomize(true, true);
     doGenerateIndexHtml(false);
+    console.log('Finished resetting customizations')
     cb();
   });
 
@@ -112,6 +115,7 @@
 
       if (!reset) {
         fs.symlinkSync(srcFile, destFile);
+        console.log('  + Linking file   : ' + srcFile + ' ==> ' + destFile);
       }
     })
 
@@ -133,6 +137,7 @@
       }
       if (!reset && fs.existsSync(srcFolder)) {
         fs.symlinkSync(srcFolder, destFolder);
+        console.log('  + Linking folder : ' + srcFolder + ' ==> ' + destFolder);
       }
     });
   }
@@ -140,13 +145,10 @@
   // Copy the correct custom module to either import the supplied custom module or provide an empty module
   function doCustomizeCreateModule(forceDefaults, reset, customConfig, baseFolder, customBaseFolder) {
     const defaultSrcFolder = path.resolve(__dirname, '../src/frontend/packages/core/misc/custom');
-    console.log(baseFolder);
     const destFile = path.join(baseFolder, 'src/custom-import.module.ts');
     const customModuleFile = path.join(baseFolder, 'src/custom/custom.module.ts');
     const customRoutingModuleFile = path.join(baseFolder, 'src/custom/custom-routing.module.ts');
 
-    console.log(customModuleFile);
-
     // Delete the existing file if it exists
     if (fs.existsSync(destFile)) {
       fs.unlinkSync(destFile)
@@ -158,9 +160,15 @@
         srcFile = 'custom-src.module.ts_';
         if (fs.existsSync(customRoutingModuleFile)) {
           srcFile = 'custom-src-routing.module.ts_';
+          console.log('  + Found custom module with routing');
+        } else {
+          console.log('  + Found custom module without routing');
         }
+        } else {
+        console.log('  + No custom module found - linking empty custom module');
       }
       fs.copySync(path.join(defaultSrcFolder, srcFile), destFile);
+      console.log('  + Copying file   : ' + path.join(defaultSrcFolder, srcFile) + ' ==> ' + destFile);
     }
   }
 
@@ -208,6 +216,8 @@
 
   // Generate index.html from template
   function doGenerateIndexHtml(customize) {
+
+    console.log('  + Generating index.html');
     // Copy the default
     fs.copySync(INDEX_TEMPLATE, INDEX_HTML);
 
@@ -223,6 +233,10 @@
       }
     }
 
+    if (metadata.title) {
+      console.log('  + Overridding title to: "' + metadata.title + '"');
+    }
+
     // Patch different page title if there is one
     var title = metadata.title || 'Stratos';
     replace.sync({ files: INDEX_HTML, from: /@@TITLE@@/g, to: title });
@@ -236,6 +250,7 @@
 
     if (fs.existsSync(GIT_METADATA)) {
       gitMetadata = JSON.parse(fs.readFileSync(GIT_METADATA));
+      console.log("  + Project Metadata: " + JSON.stringify(gitMetadata));
     }
 
     // Git Information

From 6663e2e951ef9ed75e5c53fada8cbf69dd7f50f4 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 3 May 2019 06:52:38 +0100
Subject: [PATCH 035/648] Fix typo

---
 .../kubernetes-gke-auth-form.component.html                     | 2 +-
 custom-src/frontend/assets/custom/help/en/connecting_gke.md     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.html b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.html
index ba7671b329..4d023829ec 100644
--- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.html
@@ -1,6 +1,6 @@
 <div [formGroup]="formGroup" class="kube-gke-auth">
   <div formGroupName="authValues" class="kube-gke-auth__form">
-    <span>Select an `Application Default Credentails' file:</span>
+    <span>Select an `Application Default Credentials' file:</span>
     <app-file-input placeholder="gkeconfig" fileFormControlName="gkeconfig">
     </app-file-input>
     <input matInput formControlName="gkeconfig" hidden=true>
diff --git a/custom-src/frontend/assets/custom/help/en/connecting_gke.md b/custom-src/frontend/assets/custom/help/en/connecting_gke.md
index dcdffdcf78..6940477366 100644
--- a/custom-src/frontend/assets/custom/help/en/connecting_gke.md
+++ b/custom-src/frontend/assets/custom/help/en/connecting_gke.md
@@ -18,4 +18,4 @@ This is the file that you should use when connecting in the endpoint connection
 
 > Note: You may need to copy this file to a non-hidden folder in order to be able to browse to it in the UI (or enable hidden files in your OS's file browser)
 
-> Note: For more information on obtaining Application Default Credentails, refer to https://cloud.google.com/sdk/gcloud/reference/auth/application-default/login
\ No newline at end of file
+> Note: For more information on obtaining Application Default Credentials, refer to https://cloud.google.com/sdk/gcloud/reference/auth/application-default/login
\ No newline at end of file

From 807fc0c84ec5e4f9696d2c42cd5abacf5f00526f Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 3 May 2019 08:23:19 +0100
Subject: [PATCH 036/648] Docker AIO does not build with custom-src folder

---
 deploy/Dockerfile.all-in-one | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/deploy/Dockerfile.all-in-one b/deploy/Dockerfile.all-in-one
index 5ee557343f..dbd4f0720e 100644
--- a/deploy/Dockerfile.all-in-one
+++ b/deploy/Dockerfile.all-in-one
@@ -1,12 +1,9 @@
 # Docker build for all-in-one Stratos
 FROM splatform/stratos-aio-base:opensuse as builder
 
-COPY --chown=stratos:users *.json ./
-COPY --chown=stratos:users gulpfile.js ./
-COPY --chown=stratos:users src ./src
-COPY --chown=stratos:users build ./build/
+# Ensure that we copy the custom-src folder as well
+COPY --chown=stratos:users . ./
 COPY --chown=stratos:users deploy/tools/generate_cert.sh generate_cert.sh
-COPY --chown=stratos:users deploy/db deploy/db
 COPY --chown=stratos:users deploy/all-in-one/config.all-in-one.properties config.properties
 
 RUN npm install \

From f2997df87e2f16f0a6405c38625ee358ef052647 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 3 May 2019 11:25:32 +0100
Subject: [PATCH 037/648] Allow database path to be set - support persistent DB
 with AIO

---
 deploy/all-in-one/config.all-in-one.properties |  1 +
 src/jetstream/datastore/datastore.go           | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/deploy/all-in-one/config.all-in-one.properties b/deploy/all-in-one/config.all-in-one.properties
index 0720f40f1f..31db270dc0 100644
--- a/deploy/all-in-one/config.all-in-one.properties
+++ b/deploy/all-in-one/config.all-in-one.properties
@@ -11,3 +11,4 @@ SESSION_STORE_SECRET=wheeee!
 ENCRYPTION_KEY=B374A26A71490437AA024E4FADD5B497FDFF1A8EA6FF12F6FB65AF2720B59CCF
 STRATOS_DEPLOYMENT_DOCKER_AIO=true
 SKIP_SSL_VALIDATION=true
+SQLITE_KEEP_DB=true
\ No newline at end of file
diff --git a/src/jetstream/datastore/datastore.go b/src/jetstream/datastore/datastore.go
index 1b8110f8e0..5da7fb49fd 100644
--- a/src/jetstream/datastore/datastore.go
+++ b/src/jetstream/datastore/datastore.go
@@ -4,6 +4,7 @@ import (
 	"database/sql"
 	"fmt"
 	"os"
+	"path"
 	"regexp"
 	"strings"
 	"time"
@@ -64,8 +65,8 @@ const (
 	// SQLiteSchemaFile - SQLite schema file
 	SQLiteSchemaFile = "./deploy/db/sqlite_schema.sql"
 	// SQLiteDatabaseFile - SQLite database file
-	SQLiteDatabaseFile = "./console-database.db"
-	// Default database provider when not specified
+	SQLiteDatabaseFile = "console-database.db"
+	// DefaultDatabaseProvider is the efault database provider when not specified
 	DefaultDatabaseProvider = MYSQL
 )
 
@@ -147,16 +148,18 @@ func GetConnection(dc DatabaseConfig, env *env.VarSet) (*sql.DB, error) {
 	}
 
 	// SQL Lite
-	return GetSQLLiteConnection(env.MustBool("SQLITE_KEEP_DB"))
+	return GetSQLLiteConnection(env.MustBool("SQLITE_KEEP_DB"), env.String("SQLITE_DB_DIR", "."))
 }
 
 // GetSQLLiteConnection returns an SQLite DB Connection
-func GetSQLLiteConnection(sqliteKeepDB bool) (*sql.DB, error) {
+func GetSQLLiteConnection(sqliteKeepDB bool, sqlDbDir string) (*sql.DB, error) {
 	if !sqliteKeepDB {
 		os.Remove(SQLiteDatabaseFile)
 	}
 
-	db, err := sql.Open("sqlite3", SQLiteDatabaseFile)
+	dbFilePath := path.Join(sqlDbDir, SQLiteDatabaseFile)
+	log.Infof("SQLite Database file: %s", dbFilePath)
+	db, err := sql.Open("sqlite3", dbFilePath)
 	if err != nil {
 		return nil, err
 	}

From fbea80e96fb61a7576591fe5c982551745fdda0b Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 3 May 2019 14:43:02 +0100
Subject: [PATCH 038/648] Update readme with extra docs

---
 deploy/all-in-one/README.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/deploy/all-in-one/README.md b/deploy/all-in-one/README.md
index 53b4ffdceb..58671b6d82 100644
--- a/deploy/all-in-one/README.md
+++ b/deploy/all-in-one/README.md
@@ -45,6 +45,29 @@ https://localhost:4443
 
 You will be presented with the Stratos Setup welcome screen - you will need to enter your UAA information to configure Stratos. Once complete, you will be able to login with your credentials.
 
+## Persisting the Database
+
+Each time you start and stop the Docker All-In-One container, you will lose any your UAA configuration, endpoints and connections that you have made in Stratos.
+
+In order to persist the Stratos database file between runs of the Docker container you can store the database file outside of the docker container.
+
+Create a folder where the database folder will be stored, e.g.
+
+```
+mkdir -p ~/stratos-db
+```
+
+When starting the Docker container, mount a volume for this folder and pass this via the `SQLITE_DB_DIR` environment variable, e.g.
+
+```
+docker run -p 4443:443 -v ~/stratos-db:/var/stratos-db -e SQLITE_DB_DIR=/var/stratos-db stratos-aio
+```
+
+Now each time you stop and start the container, Stratos will maintain the database file.
+
+> Note: You can validate that the environment variable has been correctly set and check the database file location by observing the log file
+of the Docker container. You should see a log message similar to: `SQLite Database file: /var/stratos-db/console-database.db`
+
 ## Pushing the All-In-One Docker Image to Cloud Foundry
 
 > Note: We recommend setting the session store secret - please use a manifest file for this and set the `SESSION_STORE_SECRET` environment variable.

From 295c38cd37664ba7f795ce74955386a6ae9d9ab4 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Thu, 16 May 2019 16:43:54 +0100
Subject: [PATCH 039/648] Tidy up auth providers for Kubernetes, add OIDC
 support for Helm

---
 src/jetstream/oauth_requests.go               |   4 +-
 src/jetstream/oauth_requests_test.go          |  12 +-
 src/jetstream/passthrough.go                  |   2 +-
 .../{awsiam_requests.go => auth/awsiam.go}    |  48 ++-
 .../plugins/kubernetes/auth/azure.go          | 102 ++++++
 .../{cert_requests.go => auth/cert.go}        |  54 +--
 .../kubernetes/{gke_auth.go => auth/gke.go}   |  48 ++-
 .../plugins/kubernetes/auth/kubeconfig.go     |  21 ++
 src/jetstream/plugins/kubernetes/auth/oidc.go | 154 +++++++++
 .../plugins/kubernetes/auth/types.go          |  50 +++
 .../plugins/kubernetes/auth_providers.go      |  49 +++
 .../plugins/kubernetes/config/kube_config.go  | 154 +++++++++
 .../plugins/kubernetes/endpoint_config.go     |  64 +---
 src/jetstream/plugins/kubernetes/go.mod       |   2 +-
 src/jetstream/plugins/kubernetes/go.sum       |   5 +-
 .../plugins/kubernetes/kube_config.go         | 323 ------------------
 .../plugins/kubernetes/kube_dashboard.go      |  20 --
 src/jetstream/plugins/kubernetes/main.go      |  76 +----
 .../repository/interfaces/portal_proxy.go     |   5 +-
 19 files changed, 682 insertions(+), 511 deletions(-)
 rename src/jetstream/plugins/kubernetes/{awsiam_requests.go => auth/awsiam.go} (68%)
 create mode 100644 src/jetstream/plugins/kubernetes/auth/azure.go
 rename src/jetstream/plugins/kubernetes/{cert_requests.go => auth/cert.go} (68%)
 rename src/jetstream/plugins/kubernetes/{gke_auth.go => auth/gke.go} (72%)
 create mode 100644 src/jetstream/plugins/kubernetes/auth/kubeconfig.go
 create mode 100644 src/jetstream/plugins/kubernetes/auth/oidc.go
 create mode 100644 src/jetstream/plugins/kubernetes/auth/types.go
 create mode 100644 src/jetstream/plugins/kubernetes/auth_providers.go
 create mode 100644 src/jetstream/plugins/kubernetes/config/kube_config.go
 delete mode 100644 src/jetstream/plugins/kubernetes/kube_config.go

diff --git a/src/jetstream/oauth_requests.go b/src/jetstream/oauth_requests.go
index f95970567a..b315e15a0e 100644
--- a/src/jetstream/oauth_requests.go
+++ b/src/jetstream/oauth_requests.go
@@ -47,8 +47,8 @@ func (p *portalProxy) OAuthHandlerFunc(cnsiRequest *interfaces.CNSIRequest, req
 	}
 }
 
-func (p *portalProxy) doOauthFlowRequest(cnsiRequest *interfaces.CNSIRequest, req *http.Request) (*http.Response, error) {
-	log.Debug("doOauthFlowRequest")
+func (p *portalProxy) DoOAuthFlowRequest(cnsiRequest *interfaces.CNSIRequest, req *http.Request) (*http.Response, error) {
+	log.Debug("DoOAuthFlowRequest")
 	authHandler := p.OAuthHandlerFunc(cnsiRequest, req, p.RefreshOAuthToken)
 	return p.DoAuthFlowRequest(cnsiRequest, req, authHandler)
 
diff --git a/src/jetstream/oauth_requests_test.go b/src/jetstream/oauth_requests_test.go
index 926cf00c9b..caacf39751 100644
--- a/src/jetstream/oauth_requests_test.go
+++ b/src/jetstream/oauth_requests_test.go
@@ -113,7 +113,7 @@ func TestDoOauthFlowRequestWithValidToken(t *testing.T) {
 			WithArgs(mockCNSIGUID).
 			WillReturnRows(expectedCNSIRecordRow)
 
-		res, err := pp.doOauthFlowRequest(&interfaces.CNSIRequest{
+		res, err := pp.DoOAuthFlowRequest(&interfaces.CNSIRequest{
 			GUID:     mockCNSIGUID,
 			UserGUID: mockUserGUID,
 		}, req)
@@ -255,7 +255,7 @@ func TestDoOauthFlowRequestWithExpiredToken(t *testing.T) {
 			WillReturnResult(sqlmock.NewResult(1, 1))
 
 		//
-		res, err := pp.doOauthFlowRequest(&interfaces.CNSIRequest{
+		res, err := pp.DoOAuthFlowRequest(&interfaces.CNSIRequest{
 			GUID:     mockCNSIGUID,
 			UserGUID: mockUserGUID,
 		}, req)
@@ -386,7 +386,7 @@ func TestDoOauthFlowRequestWithFailedRefreshMethod(t *testing.T) {
 			WillReturnError(errors.New("Unknown Database Error"))
 
 		//
-		_, err := pp.doOauthFlowRequest(&interfaces.CNSIRequest{
+		_, err := pp.DoOAuthFlowRequest(&interfaces.CNSIRequest{
 			GUID:     mockCNSIGUID,
 			UserGUID: mockUserGUID,
 		}, req)
@@ -430,7 +430,7 @@ func TestDoOauthFlowRequestWithMissingCNSITokenRecord(t *testing.T) {
 	}
 	pp.setCNSITokenRecord("not-the-right-guid", mockUserGUID, mockTokenRecord)
 
-	_, err := pp.doOauthFlowRequest(&interfaces.CNSIRequest{
+	_, err := pp.DoOAuthFlowRequest(&interfaces.CNSIRequest{
 		GUID:     mockCNSIGUID,
 		UserGUID: mockUserGUID,
 	}, req)
@@ -476,7 +476,7 @@ func TestDoOauthFlowRequestWithInvalidCNSIRequest(t *testing.T) {
 			UserGUID: "",
 		}
 
-		_, err := pp.doOauthFlowRequest(invalidCNSIRequest, req)
+		_, err := pp.DoOAuthFlowRequest(invalidCNSIRequest, req)
 
 		Convey("Oauth flow request erroneously succeeded", func() {
 			So(err, ShouldNotBeNil)
@@ -642,7 +642,7 @@ func TestRefreshTokenWithDatabaseErrorOnSave(t *testing.T) {
 		mock.ExpectExec(updateTokens).
 			WillReturnError(errors.New("Unknown Database Error"))
 		//
-		_, err := pp.doOauthFlowRequest(&interfaces.CNSIRequest{
+		_, err := pp.DoOAuthFlowRequest(&interfaces.CNSIRequest{
 			GUID:     mockCNSIGUID,
 			UserGUID: mockUserGUID,
 		}, req)
diff --git a/src/jetstream/passthrough.go b/src/jetstream/passthrough.go
index 604817f08d..604e034989 100644
--- a/src/jetstream/passthrough.go
+++ b/src/jetstream/passthrough.go
@@ -403,7 +403,7 @@ func (p *portalProxy) doRequest(cnsiRequest *interfaces.CNSIRequest, done chan<-
 	if authHandler.Handler != nil {
 		res, err = authHandler.Handler(cnsiRequest, req)
 	} else {
-		res, err = p.doOauthFlowRequest(cnsiRequest, req)
+		res, err = p.DoOAuthFlowRequest(cnsiRequest, req)
 	}
 
 	if err != nil {
diff --git a/src/jetstream/plugins/kubernetes/awsiam_requests.go b/src/jetstream/plugins/kubernetes/auth/awsiam.go
similarity index 68%
rename from src/jetstream/plugins/kubernetes/awsiam_requests.go
rename to src/jetstream/plugins/kubernetes/auth/awsiam.go
index 58c96ade4e..9c8e950605 100644
--- a/src/jetstream/plugins/kubernetes/awsiam_requests.go
+++ b/src/jetstream/plugins/kubernetes/auth/awsiam.go
@@ -1,4 +1,4 @@
-package kubernetes
+package auth
 
 import (
 	"encoding/json"
@@ -11,6 +11,7 @@ import (
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
+	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/credentials"
@@ -25,6 +26,41 @@ type AWSIAMUserInfo struct {
 	SecretKey string `json:"secretKey"`
 }
 
+// AWSKubeAuth is AWS IAM Authentication for Kubernetes
+type AWSKubeAuth struct {
+	portalProxy interfaces.PortalProxy
+}
+
+const AuthConnectTypeAWSIAM = "aws-iam"
+
+// InitAWSKubeAuth creates a GKEKubeAuth
+func InitAWSKubeAuth(portalProxy interfaces.PortalProxy) KubeAuthProvider {
+	return &AWSKubeAuth{portalProxy: portalProxy}
+}
+
+func (c *AWSKubeAuth) GetName() string {
+	return AuthConnectTypeAWSIAM
+}
+
+func (c *AWSKubeAuth) AddAuthInfo(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
+	awsInfo := &AWSIAMUserInfo{}
+	err := json.Unmarshal([]byte(tokenRec.RefreshToken), &awsInfo)
+	if err != nil {
+		return err
+	}
+
+	// NOTE: We really should check first to see if the token has expired before we try and get another
+
+	// Get an access token
+	token, err := c.getTokenIAM(*awsInfo)
+	if err != nil {
+		return fmt.Errorf("Could not get new token using the IAM info: %v+", err)
+	}
+
+	info.Token = token
+	return nil
+}
+
 func (c *AWSIAMUserInfo) Retrieve() (credentials.Value, error) {
 	return credentials.Value{
 		AccessKeyID:     c.AccessKey,
@@ -36,7 +72,7 @@ func (c *AWSIAMUserInfo) IsExpired() bool {
 	return true
 }
 
-func (c *KubernetesSpecification) FetchIAMToken(cnsiRecord interfaces.CNSIRecord, ec echo.Context) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error) {
+func (c *AWSKubeAuth) FetchToken(cnsiRecord interfaces.CNSIRecord, ec echo.Context) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error) {
 	log.Debug("FetchIAMToken")
 
 	// Place the IAM properties into a JSON Struct and store that in the Refresh Token
@@ -73,14 +109,14 @@ func (c *KubernetesSpecification) FetchIAMToken(cnsiRecord interfaces.CNSIRecord
 	return &tokenRecord, &cnsiRecord, nil
 }
 
-func (c *KubernetesSpecification) GetCNSIUserFromIAMToken(cnsiGUID string, cfTokenRecord *interfaces.TokenRecord) (*interfaces.ConnectedUser, bool) {
+func (c *AWSKubeAuth) GetUserFromToken(cnsiGUID string, cfTokenRecord *interfaces.TokenRecord) (*interfaces.ConnectedUser, bool) {
 	return &interfaces.ConnectedUser{
 		GUID: "AWS IAM",
 		Name: "IAM",
 	}, true
 }
 
-func (c *KubernetesSpecification) getTokenIAM(info AWSIAMUserInfo) (string, error) {
+func (c *AWSKubeAuth) getTokenIAM(info AWSIAMUserInfo) (string, error) {
 	generator, err := token.NewGenerator(false)
 	if err != nil {
 		return "", fmt.Errorf("AWS IAM: Failed to create generator due to %+v", err)
@@ -105,14 +141,14 @@ func (c *KubernetesSpecification) getTokenIAM(info AWSIAMUserInfo) (string, erro
 	return tok.Token, nil
 }
 
-func (c *KubernetesSpecification) doAWSIAMFlowRequest(cnsiRequest *interfaces.CNSIRequest, req *http.Request) (*http.Response, error) {
+func (c *AWSKubeAuth) DoFlowRequest(cnsiRequest *interfaces.CNSIRequest, req *http.Request) (*http.Response, error) {
 	log.Debug("doAWSIAMFlowRequest")
 
 	authHandler := c.portalProxy.OAuthHandlerFunc(cnsiRequest, req, c.RefreshIAMToken)
 	return c.portalProxy.DoAuthFlowRequest(cnsiRequest, req, authHandler)
 }
 
-func (c *KubernetesSpecification) RefreshIAMToken(skipSSLValidation bool, cnsiGUID, userGUID, client, clientSecret, tokenEndpoint string) (t interfaces.TokenRecord, err error) {
+func (c *AWSKubeAuth) RefreshIAMToken(skipSSLValidation bool, cnsiGUID, userGUID, client, clientSecret, tokenEndpoint string) (t interfaces.TokenRecord, err error) {
 	log.Debug("RefreshIAMToken")
 
 	userToken, ok := c.portalProxy.GetCNSITokenRecordWithDisconnected(cnsiGUID, userGUID)
diff --git a/src/jetstream/plugins/kubernetes/auth/azure.go b/src/jetstream/plugins/kubernetes/auth/azure.go
new file mode 100644
index 0000000000..4f0f0ab41b
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/auth/azure.go
@@ -0,0 +1,102 @@
+package auth
+
+import (
+	"encoding/base64"
+	"errors"
+	"io/ioutil"
+	"time"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/config"
+
+	"github.com/labstack/echo"
+)
+
+const AuthConnectTypeKubeConfigAz = "kubeconfig-az"
+
+
+// AzureKubeAuth is Azure Authentication with Certificates
+type AzureKubeAuth struct {
+	CertKubeAuth
+}
+
+// InitAzureKubeAuth creates a AzureKubeAuth
+func InitAzureKubeAuth(portalProxy interfaces.PortalProxy) KubeAuthProvider {
+	return &AzureKubeAuth{*InitCertKubeAuth(portalProxy)}
+}
+
+// GetName returns the provider name
+func (c *AzureKubeAuth) GetName() string {
+	return AuthConnectTypeKubeConfigAz
+}
+
+func (p *AzureKubeAuth) FetchToken(cnsiRecord interfaces.CNSIRecord, ec echo.Context) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error) {
+	req := ec.Request()
+
+	// Need to extract the parameters from the request body
+	defer req.Body.Close()
+	body, err := ioutil.ReadAll(req.Body)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	kubeConfig, err := config.ParseKubeConfig(body)
+
+	kubeConfigUser, err := kubeConfig.GetUserForCluster(cnsiRecord.APIEndpoint.String())
+	if err != nil {
+		return nil, nil, errors.New("Unable to find cluster in kubeconfig")
+	}
+
+	authConfig, err := p.getAKSAuthConfig(kubeConfigUser)
+	if err != nil {
+		return nil, nil, errors.New("User doesn't use AKS auth")
+	}
+
+	jsonString, err := authConfig.GetJSON()
+	if err != nil {
+		return nil, nil, err
+	}
+	// Refresh token isn't required since the AccessToken will never expire
+	refreshToken := jsonString
+
+	accessToken := jsonString
+	// Indefinite expiry
+	expiry := time.Now().Local().Add(time.Hour * time.Duration(100000))
+
+	tokenRecord := p.portalProxy.InitEndpointTokenRecord(expiry.Unix(), accessToken, refreshToken, false)
+	tokenRecord.AuthType = AuthConnectTypeKubeConfigAz
+
+	return &tokenRecord, &cnsiRecord, nil
+}
+
+
+func (p *AzureKubeAuth) getAKSAuthConfig(k *config.KubeConfigUser) (*KubeCertificate, error) {
+
+	if !isAKSAuth(k) {
+		return nil, errors.New("User doesn't use AKS")
+	}
+
+	cert, err := base64.StdEncoding.DecodeString(k.User.ClientCertificate)
+	if err != nil {
+		return nil, errors.New("Unable to decode certificate")
+	}
+	certKey, err := base64.StdEncoding.DecodeString(k.User.ClientKeyData)
+	if err != nil {
+		return nil, errors.New("Unable to decode certificate key")
+	}
+	kubeCertAuth := &KubeCertificate{
+		Certificate:    string(cert),
+		CertificateKey: string(certKey),
+		Token:          k.User.Token,
+	}
+	return kubeCertAuth, nil
+}
+
+func isAKSAuth(k *config.KubeConfigUser) bool {
+	if k.User.ClientCertificate == "" ||
+		k.User.ClientKeyData == "" ||
+		k.User.Token == "" {
+		return false
+	}
+	return true
+}
diff --git a/src/jetstream/plugins/kubernetes/cert_requests.go b/src/jetstream/plugins/kubernetes/auth/cert.go
similarity index 68%
rename from src/jetstream/plugins/kubernetes/cert_requests.go
rename to src/jetstream/plugins/kubernetes/auth/cert.go
index de552389ea..9e7569587b 100644
--- a/src/jetstream/plugins/kubernetes/cert_requests.go
+++ b/src/jetstream/plugins/kubernetes/auth/cert.go
@@ -1,4 +1,4 @@
-package kubernetes
+package auth
 
 import (
 	"bytes"
@@ -16,33 +16,43 @@ import (
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
+	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 )
 
-type KubeCertAuth struct {
-	Certificate    string `json:"cert"`
-	CertificateKey string `json:"certKey"`
-	Token          string `json:"token,omitempty"`
+const AuthConnectTypeCertAuth = "kube-cert-auth"
+
+
+// CertKubeAuth is GKE Authentication with Certificates
+type CertKubeAuth struct {
+	portalProxy interfaces.PortalProxy
 }
 
-func (k *KubeCertAuth) GetJSON() (string, error) {
-	jsonString, err := json.Marshal(k)
-	if err != nil {
-		return "", err
-	}
-	return string(jsonString), nil
+// InitCertKubeAuth creates a GKEKubeAuth
+func InitCertKubeAuth(portalProxy interfaces.PortalProxy) *CertKubeAuth {
+	return &CertKubeAuth{portalProxy: portalProxy}
 }
 
-func (k *KubeCertAuth) GetCerticate() (tls.Certificate, error) {
-	cert, err := tls.X509KeyPair([]byte(k.Certificate), []byte(k.CertificateKey))
+func (c *CertKubeAuth) GetName() string {
+	return AuthConnectTypeCertAuth
+}
+
+func (c *CertKubeAuth) AddAuthInfo(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
+	kubeAuthToken := &KubeCertificate{}
+	err := json.NewDecoder(strings.NewReader(tokenRec.AuthToken)).Decode(kubeAuthToken)
 	if err != nil {
-		return tls.Certificate{}, err
+		return err
 	}
-	return cert, nil
+
+	info.ClientCertificateData = []byte(kubeAuthToken.Certificate)
+	info.ClientKeyData = []byte(kubeAuthToken.CertificateKey)
+	info.Token = kubeAuthToken.Token
+
+	return nil
 }
 
-func (c *KubernetesSpecification) extractCerts(ec echo.Context) (*KubeCertAuth, error) {
+func (c *CertKubeAuth) extractCerts(ec echo.Context) (*KubeCertificate, error) {
 
-	kubeCertAuth := &KubeCertAuth{}
+	kubeCertAuth := &KubeCertificate{}
 
 	bodyReader := ec.Request().Body
 	defer bodyReader.Close()
@@ -66,7 +76,7 @@ func (c *KubernetesSpecification) extractCerts(ec echo.Context) (*KubeCertAuth,
 
 }
 
-func (c *KubernetesSpecification) FetchCertAuth(cnsiRecord interfaces.CNSIRecord, ec echo.Context) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error) {
+func (c *CertKubeAuth) FetchToken(cnsiRecord interfaces.CNSIRecord, ec echo.Context) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error) {
 	log.Info("FetchCerts")
 
 	kubeCertAuth, err := c.extractCerts(ec)
@@ -92,19 +102,19 @@ func (c *KubernetesSpecification) FetchCertAuth(cnsiRecord interfaces.CNSIRecord
 	return &tokenRecord, &cnsiRecord, nil
 }
 
-func (c *KubernetesSpecification) GetCNSIUserFromCertAuth(cnsiGUID string, cfTokenRecord *interfaces.TokenRecord) (*interfaces.ConnectedUser, bool) {
+func (c *CertKubeAuth) GetUserFromToken(cnsiGUID string, cfTokenRecord *interfaces.TokenRecord) (*interfaces.ConnectedUser, bool) {
 	return &interfaces.ConnectedUser{
 		GUID: "Kube Cert Auth",
 		Name: "Cert Auth",
 	}, true
 }
 
-func (c *KubernetesSpecification) doCertAuthFlowRequest(cnsiRequest *interfaces.CNSIRequest, req *http.Request) (*http.Response, error) {
+func (c *CertKubeAuth) DoFlowRequest(cnsiRequest *interfaces.CNSIRequest, req *http.Request) (*http.Response, error) {
 	log.Debug("doCertAuthFlowRequest")
 
 	authHandler := func(tokenRec interfaces.TokenRecord, cnsi interfaces.CNSIRecord) (*http.Response, error) {
 
-		kubeAuthToken := &KubeCertAuth{}
+		kubeAuthToken := &KubeCertificate{}
 		err := json.NewDecoder(strings.NewReader(tokenRec.AuthToken)).Decode(kubeAuthToken)
 		if err != nil {
 			return nil, err
@@ -154,7 +164,7 @@ func (c *KubernetesSpecification) doCertAuthFlowRequest(cnsiRequest *interfaces.
 	return c.portalProxy.DoAuthFlowRequest(cnsiRequest, req, authHandler)
 }
 
-func (c *KubernetesSpecification) RefreshCertAuth(skipSSLValidation bool, cnsiGUID, userGUID, client, clientSecret, tokenEndpoint string) (t interfaces.TokenRecord, err error) {
+func (c *CertKubeAuth) RefreshCertAuth(skipSSLValidation bool, cnsiGUID, userGUID, client, clientSecret, tokenEndpoint string) (t interfaces.TokenRecord, err error) {
 	log.Debug("RefreshCertAuth")
 	// This shouldn't be called since cert-auth K8S shouldn't expire
 
diff --git a/src/jetstream/plugins/kubernetes/gke_auth.go b/src/jetstream/plugins/kubernetes/auth/gke.go
similarity index 72%
rename from src/jetstream/plugins/kubernetes/gke_auth.go
rename to src/jetstream/plugins/kubernetes/auth/gke.go
index c25d8631da..3bdeced3b4 100644
--- a/src/jetstream/plugins/kubernetes/gke_auth.go
+++ b/src/jetstream/plugins/kubernetes/auth/gke.go
@@ -1,4 +1,4 @@
-package kubernetes
+package auth
 
 import (
 	"encoding/json"
@@ -13,6 +13,7 @@ import (
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
+	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 
 	"github.com/SermoDigital/jose/jws"
 )
@@ -31,9 +32,36 @@ type GKEConfig struct {
 	Email        string `json:"email"`
 }
 
-// FetchGKEToken will create a token for the GKE Authentication using the POSTed data
-func (c *KubernetesSpecification) FetchGKEToken(cnsiRecord interfaces.CNSIRecord, ec echo.Context) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error) {
-	log.Debug("FetchGKEToken")
+// GKEKubeAuth is GKE Authentication for Kubernetes
+type GKEKubeAuth struct {
+	portalProxy interfaces.PortalProxy
+}
+
+const AuthConnectTypeGKE = "gke-auth"
+
+// InitGKEKubeAuth creates a GKEKubeAuth
+func InitGKEKubeAuth(portalProxy interfaces.PortalProxy) KubeAuthProvider {
+	return &GKEKubeAuth{portalProxy: portalProxy}
+}
+
+func (c *GKEKubeAuth) GetName() string {
+	return AuthConnectTypeGKE
+}
+
+func (c *GKEKubeAuth) AddAuthInfo(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
+	gkeInfo := &GKEConfig{}
+	err := json.Unmarshal([]byte(tokenRec.RefreshToken), &gkeInfo)
+	if err != nil {
+		return err
+	}
+
+	info.Token = tokenRec.AuthToken
+	return nil
+}
+
+// FetchToken will create a token for the GKE Authentication using the POSTed data
+func (c *GKEKubeAuth) FetchToken(cnsiRecord interfaces.CNSIRecord, ec echo.Context) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error) {
+	log.Debug("FetchToken (GKE)")
 
 	// We should already have the refresh token in the body sent to us
 	req := ec.Request()
@@ -83,9 +111,9 @@ func (c *KubernetesSpecification) FetchGKEToken(cnsiRecord interfaces.CNSIRecord
 	return &tokenRecord, &cnsiRecord, nil
 }
 
-// GetGKEUserFromToken gets the username from the GKE Token
-func (c *KubernetesSpecification) GetGKEUserFromToken(cnsiGUID string, tokenRecord *interfaces.TokenRecord) (*interfaces.ConnectedUser, bool) {
-	log.Debug("GetGKEUserFromToken")
+// GetUserFromToken gets the username from the GKE Token
+func (c *GKEKubeAuth) GetUserFromToken(cnsiGUID string, tokenRecord *interfaces.TokenRecord) (*interfaces.ConnectedUser, bool) {
+	log.Debug("GetUserFromToken (GKE)")
 
 	gkeInfo := &GKEConfig{}
 	err := json.Unmarshal([]byte(tokenRecord.RefreshToken), &gkeInfo)
@@ -99,7 +127,7 @@ func (c *KubernetesSpecification) GetGKEUserFromToken(cnsiGUID string, tokenReco
 	}, true
 }
 
-func (c *KubernetesSpecification) doGKEFlowRequest(cnsiRequest *interfaces.CNSIRequest, req *http.Request) (*http.Response, error) {
+func (c *GKEKubeAuth) DoFlowRequest(cnsiRequest *interfaces.CNSIRequest, req *http.Request) (*http.Response, error) {
 	log.Debug("doGKEFlowRequest")
 
 	authHandler := c.portalProxy.OAuthHandlerFunc(cnsiRequest, req, c.RefreshGKEToken)
@@ -107,7 +135,7 @@ func (c *KubernetesSpecification) doGKEFlowRequest(cnsiRequest *interfaces.CNSIR
 }
 
 // RefreshGKEToken will refresh a GKE token
-func (c *KubernetesSpecification) RefreshGKEToken(skipSSLValidation bool, cnsiGUID, userGUID, client, clientSecret, tokenEndpoint string) (t interfaces.TokenRecord, err error) {
+func (c *GKEKubeAuth) RefreshGKEToken(skipSSLValidation bool, cnsiGUID, userGUID, client, clientSecret, tokenEndpoint string) (t interfaces.TokenRecord, err error) {
 	log.Debug("RefreshGKEToken")
 	now := time.Now()
 
@@ -137,7 +165,7 @@ func (c *KubernetesSpecification) RefreshGKEToken(skipSSLValidation bool, cnsiGU
 	return userToken, nil
 }
 
-func (c *KubernetesSpecification) refreshGKEToken(skipSSLValidation bool, clientID, clientSecret, refreshToken string) (u interfaces.UAAResponse, err error) {
+func (c *GKEKubeAuth) refreshGKEToken(skipSSLValidation bool, clientID, clientSecret, refreshToken string) (u interfaces.UAAResponse, err error) {
 	log.Debug("refreshGKEToken")
 	tokenInfo := interfaces.UAAResponse{}
 
diff --git a/src/jetstream/plugins/kubernetes/auth/kubeconfig.go b/src/jetstream/plugins/kubernetes/auth/kubeconfig.go
new file mode 100644
index 0000000000..085a9d82ac
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/auth/kubeconfig.go
@@ -0,0 +1,21 @@
+package auth
+
+import (
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+)
+
+const AuthConnectTypeKubeConfig   = "KubeConfig"
+
+// KubeConfigAuth is same as OIDC with different name
+type KubeConfigAuth struct {
+	OIDCKubeAuth
+}
+
+// InitKubeConfigAuth
+func InitKubeConfigAuth(portalProxy interfaces.PortalProxy) KubeAuthProvider {
+	return &KubeConfigAuth{*InitOIDCKubeAuth(portalProxy)}
+}
+
+func (c *KubeConfigAuth) GetName() string {
+	return AuthConnectTypeKubeConfig
+}
diff --git a/src/jetstream/plugins/kubernetes/auth/oidc.go b/src/jetstream/plugins/kubernetes/auth/oidc.go
new file mode 100644
index 0000000000..80ce00dda0
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/auth/oidc.go
@@ -0,0 +1,154 @@
+package auth
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/http"
+	"io/ioutil"
+	"time"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/config"
+
+	log "github.com/sirupsen/logrus"
+	"github.com/labstack/echo"
+	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
+	"github.com/SermoDigital/jose/jws"	
+)
+
+type KubeConfigAuthProviderOIDC struct {
+	ClientID     string `yaml:"client-id"`
+	ClientSecret string `yaml:"client-secret"`
+	IDToken      string `yaml:"id-token"`
+	IdpIssuerURL string `yaml:"idp-issuer-url"`
+	RefreshToken string `yaml:"refresh-token"`
+	Expiry       time.Time
+}
+
+const AuthConnectTypeOIDC   = "OIDC"
+
+// OIDCKubeAuth
+type OIDCKubeAuth struct {
+	portalProxy interfaces.PortalProxy
+}
+
+// InitOIDCKubeAuth
+func InitOIDCKubeAuth(portalProxy interfaces.PortalProxy) *OIDCKubeAuth {
+	return &OIDCKubeAuth{portalProxy: portalProxy}
+}
+
+func (c *OIDCKubeAuth) GetName() string {
+	return AuthConnectTypeOIDC
+}
+
+func (c *OIDCKubeAuth) AddAuthInfo(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
+	log.Info("AddAuthInfo")
+
+	authInfo := &interfaces.OAuth2Metadata{}
+	err := json.Unmarshal([]byte(tokenRec.Metadata), &authInfo)
+	if err != nil {
+		return err
+	}
+
+	info.AuthProvider = &clientcmdapi.AuthProviderConfig{}
+	info.AuthProvider.Name = "oidc"
+	info.AuthProvider.Config = make(map[string]string)
+	info.AuthProvider.Config["client-id"] = authInfo.ClientID
+	info.AuthProvider.Config["client-secret"] = authInfo.ClientSecret
+	info.AuthProvider.Config["idp-issuer-url"] = authInfo.IssuerURL
+
+	info.AuthProvider.Config["id-token"] = tokenRec.AuthToken
+	info.AuthProvider.Config["refresh-token"] = tokenRec.RefreshToken
+	info.AuthProvider.Config["extra-scopes"] = "groups"
+
+	return nil
+}
+
+func (c *OIDCKubeAuth) FetchToken(cnsiRecord interfaces.CNSIRecord, ec echo.Context) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error) {
+	log.Debug("FetchToken (OIDC)")
+
+	req := ec.Request()
+
+	// Need to extract the parameters from the request body
+	defer req.Body.Close()
+	body, err := ioutil.ReadAll(req.Body)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	kubeConfig, err := config.ParseKubeConfig(body)
+
+	kubeConfigUser, err := kubeConfig.GetUserForCluster(cnsiRecord.APIEndpoint.String())
+
+	if err != nil {
+		return nil, nil, fmt.Errorf("Unable to find cluster in kubeconfig")
+	}
+
+	// We only support OIDC auth provider at the moment
+	if kubeConfigUser.User.AuthProvider.Name != "oidc" {
+		return nil, nil, errors.New("Unsupported authentication provider")
+	}
+
+	oidcConfig, err := c.GetOIDCConfig(kubeConfigUser)
+	if err != nil {
+		log.Info(err)
+		return nil, nil, errors.New("Can not unmarshal OIDC Auth Provider configuration")
+	}
+	tokenRecord := c.portalProxy.InitEndpointTokenRecord(oidcConfig.Expiry.Unix(), oidcConfig.IDToken, oidcConfig.RefreshToken, false)
+	tokenRecord.AuthType = interfaces.AuthTypeOIDC
+
+	oauthMetadata := &interfaces.OAuth2Metadata{}
+	oauthMetadata.ClientID = oidcConfig.ClientID
+	oauthMetadata.ClientSecret = oidcConfig.ClientSecret
+	oauthMetadata.IssuerURL = oidcConfig.IdpIssuerURL
+
+	jsonString, err := json.Marshal(oauthMetadata)
+	if err == nil {
+		tokenRecord.Metadata = string(jsonString)
+	}
+
+	// Could try and make a K8S Api call to validate the token
+	// Or, maybe we can verify the access token with the auth URL ?
+
+	return &tokenRecord, &cnsiRecord, nil
+}
+
+// GetUserFromToken gets the username from the GKE Token
+func (c *OIDCKubeAuth) GetUserFromToken(cnsiGUID string, tokenRecord *interfaces.TokenRecord) (*interfaces.ConnectedUser, bool) {
+	log.Debug("GetUserFromToken (OIDC)")
+	return c.portalProxy.GetCNSIUserFromOAuthToken(cnsiGUID, tokenRecord)
+}
+
+func (c *OIDCKubeAuth) GetOIDCConfig(k *config.KubeConfigUser) (*KubeConfigAuthProviderOIDC, error) {
+
+	if k.User.AuthProvider.Name != "oidc" {
+		return nil, errors.New("User doesn't use OIDC")
+	}
+
+	OIDCConfig := &KubeConfigAuthProviderOIDC{}
+	err := config.UnMarshalHelper(k.User.AuthProvider.Config, OIDCConfig)
+	if err != nil {
+		log.Info(err)
+		return nil, errors.New("Can not unmarshal OIDC Auth Provider configuration")
+	}
+
+	token, err := jws.ParseJWT([]byte(OIDCConfig.IDToken))
+	if err != nil {
+		log.Info(err)
+		return nil, errors.New("Can not parse JWT Access token")
+	}
+
+	expiry, ok := token.Claims().Expiration()
+	if !ok {
+		return nil, errors.New("Can not get Acces Token expiry time")
+	}
+	OIDCConfig.Expiry = expiry
+
+	return OIDCConfig, nil
+}
+
+func (c *OIDCKubeAuth) DoFlowRequest(cnsiRequest *interfaces.CNSIRequest, req *http.Request) (*http.Response, error) {
+	log.Debug("DoFlowRequest (OIDC)")
+	return c.portalProxy.DoOAuthFlowRequest(cnsiRequest, req)
+}
diff --git a/src/jetstream/plugins/kubernetes/auth/types.go b/src/jetstream/plugins/kubernetes/auth/types.go
new file mode 100644
index 0000000000..127ac705b1
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/auth/types.go
@@ -0,0 +1,50 @@
+package auth
+
+import (
+	"crypto/tls"
+	"encoding/json"
+	"net/http"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
+
+	"github.com/labstack/echo"
+)
+
+// KubeAuthProvider is the interface for Kubernetes Authentication Providers
+type KubeAuthProvider interface {
+	GetName() string
+	AddAuthInfo(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error
+	FetchToken(cnsiRecord interfaces.CNSIRecord, ec echo.Context) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error)
+
+	DoFlowRequest(cnsiRequest *interfaces.CNSIRequest, req *http.Request) (*http.Response, error)
+	GetUserFromToken(cnsiGUID string, tokenRecord *interfaces.TokenRecord) (*interfaces.ConnectedUser, bool)
+}
+
+
+// -------------------------------
+
+// KubeCertificate represents certificate infor for Kube Authentication
+type KubeCertificate struct {
+	Certificate    string `json:"cert"`
+	CertificateKey string `json:"certKey"`
+	Token          string `json:"token,omitempty"`
+}
+
+// GetJSON persists the config to JSON
+func (k *KubeCertificate) GetJSON() (string, error) {
+	jsonString, err := json.Marshal(k)
+	if err != nil {
+		return "", err
+	}
+	return string(jsonString), nil
+}
+
+// GetCerticate gets a certiciate from the info available
+func (k *KubeCertificate) GetCerticate() (tls.Certificate, error) {
+	cert, err := tls.X509KeyPair([]byte(k.Certificate), []byte(k.CertificateKey))
+	if err != nil {
+		return tls.Certificate{}, err
+	}
+	return cert, nil
+}
\ No newline at end of file
diff --git a/src/jetstream/plugins/kubernetes/auth_providers.go b/src/jetstream/plugins/kubernetes/auth_providers.go
new file mode 100644
index 0000000000..c078f0f61a
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/auth_providers.go
@@ -0,0 +1,49 @@
+package kubernetes
+
+import (
+	"strings"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/auth"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+)
+
+// Interface for Kubernetes Authentication Providers
+
+var kubeAuthProviders map[string]auth.KubeAuthProvider
+
+// AddAuthProvider adds a Kubernetes auth provider
+func (c *KubernetesSpecification) AddAuthProvider(provider auth.KubeAuthProvider) {
+	if provider == nil {
+		return
+	}
+
+	var name = provider.GetName()
+	if kubeAuthProviders == nil {
+		kubeAuthProviders = make(map[string]auth.KubeAuthProvider)
+	}
+
+	kubeAuthProviders[name] = provider
+
+	// Register auth type with Jetstream
+	c.portalProxy.AddAuthProvider(name, interfaces.AuthProvider{
+		Handler:  provider.DoFlowRequest,
+		UserInfo: provider.GetUserFromToken,
+	})
+
+}
+
+// GetAuthProvider gets a Kubernetes auth provider by key
+func (c *KubernetesSpecification) GetAuthProvider(name string) auth.KubeAuthProvider {
+	return kubeAuthProviders[name]
+}
+
+// FindAuthProvider finds auth provider - case insensitive
+func (c *KubernetesSpecification) FindAuthProvider(name string) auth.KubeAuthProvider {
+	for k, v := range kubeAuthProviders {
+		if strings.EqualFold(name, k) {
+			return v
+		}
+	}
+
+	return nil
+}
diff --git a/src/jetstream/plugins/kubernetes/config/kube_config.go b/src/jetstream/plugins/kubernetes/config/kube_config.go
new file mode 100644
index 0000000000..3a9ab7419b
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/config/kube_config.go
@@ -0,0 +1,154 @@
+package config
+
+import (
+	"errors"
+	"fmt"
+	"reflect"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces/config"
+
+	"gopkg.in/yaml.v2"
+
+)
+
+type KubeConfigClusterDetail struct {
+	Server string `yaml:"server"`
+}
+
+type KubeConfigCluster struct {
+	Name    string `yaml:"name"`
+	Cluster struct {
+		Server string
+	}
+}
+
+type KubeConfigUser struct {
+	Name string `yaml:"name"`
+	User struct {
+		AuthProvider struct {
+			Name   string                 `yaml:"name"`
+			Config map[string]interface{} `yaml:"config"`
+		} `yaml:"auth-provider,omitempty"`
+		ClientCertificate string `yaml:"client-certificate-data,omitempty"`
+		ClientKeyData     string `yaml:"client-key-data,omitempty"`
+		Token             string `yaml:"token,omitempty"`
+	}
+}
+
+//ExtraScopes string `yaml:"extra-scopes"`
+
+type KubeConfigContexts struct {
+	Context struct {
+		Cluster string
+		User    string
+	} `yaml:"context"`
+}
+
+type KubeConfigFile struct {
+	ApiVersion string               `yaml:"apiVersion"`
+	Kind       string               `yaml:"kind"`
+	Clusters   []KubeConfigCluster  `yaml:"clusters"`
+	Users      []KubeConfigUser     `yaml:"users"`
+	Contexts   []KubeConfigContexts `yaml:"contexts"`
+}
+
+func (k *KubeConfigFile) GetClusterByAPIEndpoint(endpoint string) (*KubeConfigCluster, error) {
+	for _, cluster := range k.Clusters {
+		if cluster.Cluster.Server == endpoint {
+			return &cluster, nil
+		}
+	}
+	return nil, fmt.Errorf("Unable to find cluster")
+}
+
+func (k *KubeConfigFile) GetClusterContext(clusterName string) (*KubeConfigContexts, error) {
+	for _, context := range k.Contexts {
+		if context.Context.Cluster == clusterName {
+			return &context, nil
+		}
+	}
+	return nil, fmt.Errorf("Unable to find context")
+}
+
+func (k *KubeConfigFile) GetUser(userName string) (*KubeConfigUser, error) {
+	for _, user := range k.Users {
+		if user.Name == userName {
+			return &user, nil
+		}
+	}
+	return nil, fmt.Errorf("Unable to find user")
+}
+
+func (k *KubeConfigFile) GetUserForCluster(clusterEndpoint string) (*KubeConfigUser, error) {
+	cluster, err := k.GetClusterByAPIEndpoint(clusterEndpoint)
+
+	if err != nil {
+		return nil, errors.New("Unable to find cluster in kubeconfig")
+	}
+
+	clusterName := cluster.Name
+
+	if clusterName == "" {
+		return nil, errors.New("Unable to find cluster")
+	}
+
+	context, err := k.GetClusterContext(clusterName)
+	if err != nil {
+		return nil, errors.New("Unable to find cluster context")
+	}
+
+	kubeConfigUser, err := k.GetUser(context.Context.User)
+	if err != nil {
+		return nil, errors.New("Can not find config for Kubernetes cluster")
+	}
+
+	return kubeConfigUser, nil
+}
+
+func ParseKubeConfig(kubeConfigData []byte) (*KubeConfigFile, error) {
+
+	kubeConfig := &KubeConfigFile{}
+	err := yaml.Unmarshal(kubeConfigData, &kubeConfig)
+	if err != nil {
+		return nil, err
+	}
+	if kubeConfig.ApiVersion != "v1" || kubeConfig.Kind != "Config" {
+		return nil, errors.New("Not a valid Kubernetes Config file")
+	}
+
+	return kubeConfig, nil
+}
+
+func UnMarshalHelper(values map[string]interface{}, intf interface{}) error {
+
+	value := reflect.ValueOf(intf)
+
+	if value.Kind() != reflect.Ptr {
+		return errors.New("config: must provide pointer to struct value")
+	}
+
+	value = value.Elem()
+	if value.Kind() != reflect.Struct {
+		return errors.New("config: must provide pointer to struct value")
+	}
+
+	nFields := value.NumField()
+	typ := value.Type()
+
+	for i := 0; i < nFields; i++ {
+		field := value.Field(i)
+		strField := typ.Field(i)
+		tag := strField.Tag.Get("yaml")
+		if tag == "" {
+			continue
+		}
+
+		if tagValue, ok := values[tag].(string); ok {
+			if err := config.SetStructFieldValue(value, field, tagValue); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
diff --git a/src/jetstream/plugins/kubernetes/endpoint_config.go b/src/jetstream/plugins/kubernetes/endpoint_config.go
index 06893ebe52..f047d86898 100644
--- a/src/jetstream/plugins/kubernetes/endpoint_config.go
+++ b/src/jetstream/plugins/kubernetes/endpoint_config.go
@@ -1,10 +1,7 @@
 package kubernetes
 
 import (
-	"encoding/json"
 	"errors"
-	"fmt"
-	"strings"
 
 	log "github.com/sirupsen/logrus"
 
@@ -19,7 +16,7 @@ import (
 func (c *KubernetesSpecification) GetConfigForEndpoint(masterURL string, token interfaces.TokenRecord) (*restclient.Config, error) {
 	return clientcmd.BuildConfigFromKubeconfigGetter(masterURL, func() (*clientcmdapi.Config, error) {
 
-		log.Debug("GetConfigForEndpoint")
+		log.Info("GetConfigForEndpoint")
 
 		name := "cluster-0"
 
@@ -55,61 +52,10 @@ func (c *KubernetesSpecification) addAuthInfoForEndpoint(info *clientcmdapi.Auth
 	log.Debug("addAuthInfoForEndpoint")
 	log.Warn(tokenRec.AuthType)
 
-	switch {
-	case tokenRec.AuthType == "gke-auth":
-		log.Warn("GKE AUTH")
-		return c.addGKEAuth(info, tokenRec)
-	case tokenRec.AuthType == AuthConnectTypeCertAuth, tokenRec.AuthType == AuthConnectTypeKubeConfigAz:
-		return c.addCertAuth(info, tokenRec)
-	case tokenRec.AuthType == AuthConnectTypeAWSIAM:
-		return c.addAWSAuth(info, tokenRec)
-	default:
-		log.Error("Unsupported auth type")
-	}
-	return errors.New("Unsupported auth type")
-}
-
-func (c *KubernetesSpecification) addCertAuth(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
-	kubeAuthToken := &KubeCertAuth{}
-	err := json.NewDecoder(strings.NewReader(tokenRec.AuthToken)).Decode(kubeAuthToken)
-	if err != nil {
-		return err
-	}
-
-	info.ClientCertificateData = []byte(kubeAuthToken.Certificate)
-	info.ClientKeyData = []byte(kubeAuthToken.CertificateKey)
-	info.Token = kubeAuthToken.Token
-
-	return nil
-}
-
-func (c *KubernetesSpecification) addGKEAuth(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
-	gkeInfo := &GKEConfig{}
-	err := json.Unmarshal([]byte(tokenRec.RefreshToken), &gkeInfo)
-	if err != nil {
-		return err
-	}
-
-	info.Token = tokenRec.AuthToken
-	return nil
-}
-
-func (c *KubernetesSpecification) addAWSAuth(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
-
-	awsInfo := &AWSIAMUserInfo{}
-	err := json.Unmarshal([]byte(tokenRec.RefreshToken), &awsInfo)
-	if err != nil {
-		return err
-	}
-
-	// NOTE: We really should check first to see if the token has expired before we try and get another
-
-	// Get an access token
-	token, err := c.getTokenIAM(*awsInfo)
-	if err != nil {
-		return fmt.Errorf("Could not get new token using the IAM info: %v+", err)
+	var authProvider = c.GetAuthProvider(tokenRec.AuthType)
+	if authProvider == nil {
+		return errors.New("Unsupported auth type")
 	}
 
-	info.Token = token
-	return nil
+	return authProvider.AddAuthInfo(info, tokenRec)
 }
diff --git a/src/jetstream/plugins/kubernetes/go.mod b/src/jetstream/plugins/kubernetes/go.mod
index 172fbd9788..b9056ff45a 100644
--- a/src/jetstream/plugins/kubernetes/go.mod
+++ b/src/jetstream/plugins/kubernetes/go.mod
@@ -1,4 +1,4 @@
-module github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetetes
+module github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes
 
 go 1.12
 
diff --git a/src/jetstream/plugins/kubernetes/go.sum b/src/jetstream/plugins/kubernetes/go.sum
index 71244c83a1..836c47b4bc 100644
--- a/src/jetstream/plugins/kubernetes/go.sum
+++ b/src/jetstream/plugins/kubernetes/go.sum
@@ -27,6 +27,8 @@ github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1/go.mod h1:/iP1
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudfoundry-community/go-cfenv v1.17.0 h1:qfxEfn8qKkaHY3ZEk/Y2noY79HBASvNgmtHK9x4+6GY=
 github.com/cloudfoundry-community/go-cfenv v1.17.0/go.mod h1:2UgWvQTRXUuIZ/x3KnW6fk6CgPBhcV4UQb/UGIrUyyI=
+github.com/cloudfoundry-incubator/stratos v2.0.0-beta-001+incompatible h1:UUxNbLjhv2cfymub5yNN1tjjqYkteHBBagb4jcbXEIQ=
+github.com/cloudfoundry-incubator/stratos/src/jetstream v0.0.0-20190516104506-727fa3589a90 h1:IeIyBIgh2xEQm1CxHN2yFSBU7Ap+HQZleOs3TlAymI0=
 github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -91,6 +93,7 @@ github.com/helm/monocular v1.4.0 h1:g0sOpuMe+9u+aPfd9ZO8mWV+c8W0dfGyBG9Wl23nwec=
 github.com/helm/monocular v1.4.0/go.mod h1:PpkCN0v4zVVigsIHnsQdJytKFmaUkwfhxB7z33a9/gE=
 github.com/helm/monocular v1.5.0 h1:y8anOb2XLsCluYNOPx01G6EPqyBZ9fxDi+9BKbesULE=
 github.com/helm/monocular v1.6.0 h1:zE8OggduPEtnF2x1XgrQnMwnKFUGCvk/RNs0NX8hgjg=
+github.com/helm/monocular v1.7.0 h1:SW2xr6KoVJtZT6ZAtON8jJVLqcRE3C8pBb9kyo8Icxw=
 github.com/heptio/authenticator v0.3.0 h1:Xh6XWkLZ+CksGuky+vsr77mHnI9C4L3nwj+xuZu28J0=
 github.com/heptio/authenticator v0.3.0/go.mod h1:Q86X8hc61JXhE5XxYLKmrSRWby/Oe8IIYZIBgmGVkTA=
 github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0=
@@ -151,9 +154,9 @@ github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nL
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/russross/blackfriday v2.0.0/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday v2.0.0+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday v2.0.0 h1:L7Oc72h7rDqGkbUorN/ncJ4N/y220/YRezHvBoKLOFA=
-github.com/russross/blackfriday v2.0.0/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
diff --git a/src/jetstream/plugins/kubernetes/kube_config.go b/src/jetstream/plugins/kubernetes/kube_config.go
deleted file mode 100644
index 8d5c530883..0000000000
--- a/src/jetstream/plugins/kubernetes/kube_config.go
+++ /dev/null
@@ -1,323 +0,0 @@
-package kubernetes
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"reflect"
-	"time"
-
-	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
-	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces/config"
-	"github.com/labstack/echo"
-	log "github.com/sirupsen/logrus"
-
-	"gopkg.in/yaml.v2"
-
-	"github.com/SermoDigital/jose/jws"
-)
-
-type KubeConfigClusterDetail struct {
-	Server string `yaml:"server"`
-}
-
-type KubeConfigCluster struct {
-	Name    string `yaml:"name"`
-	Cluster struct {
-		Server string
-	}
-}
-
-type KubeConfigAuthProviderOIDC struct {
-	ClientID     string `yaml:"client-id"`
-	ClientSecret string `yaml:"client-secret"`
-	IDToken      string `yaml:"id-token"`
-	IdpIssuerURL string `yaml:"idp-issuer-url"`
-	RefreshToken string `yaml:"refresh-token"`
-	Expiry       time.Time
-}
-
-type KubeConfigUser struct {
-	Name string `yaml:"name"`
-	User struct {
-		AuthProvider struct {
-			Name   string                 `yaml:"name"`
-			Config map[string]interface{} `yaml:"config"`
-		} `yaml:"auth-provider,omitempty"`
-		ClientCertificate string `yaml:"client-certificate-data,omitempty"`
-		ClientKeyData     string `yaml:"client-key-data,omitempty"`
-		Token             string `yaml:"token,omitempty"`
-	}
-}
-
-func (k *KubeConfigUser) isOIDCAuth() bool {
-	if k.User.AuthProvider.Name != "oidc" {
-		return false
-	}
-	return true
-}
-func (k *KubeConfigUser) isAKSAuth() bool {
-	if k.User.ClientCertificate == "" ||
-		k.User.ClientKeyData == "" ||
-		k.User.Token == "" {
-		return false
-	}
-	return true
-}
-
-func (k *KubeConfigUser) getOIDCConfig() (*KubeConfigAuthProviderOIDC, error) {
-
-	if !k.isOIDCAuth() {
-		return nil, errors.New("User doesn't use OIDC")
-	}
-	OIDCConfig := &KubeConfigAuthProviderOIDC{}
-	err := unMarshalHelper(k.User.AuthProvider.Config, OIDCConfig)
-	if err != nil {
-		log.Info(err)
-		return nil, errors.New("Can not unmarshal OIDC Auth Provider configuration")
-	}
-
-	token, err := jws.ParseJWT([]byte(OIDCConfig.IDToken))
-	if err != nil {
-		log.Info(err)
-		return nil, errors.New("Can not parse JWT Access token")
-	}
-
-	expiry, ok := token.Claims().Expiration()
-	if !ok {
-		return nil, errors.New("Can not get Acces Token expiry time")
-	}
-	OIDCConfig.Expiry = expiry
-
-	return OIDCConfig, nil
-}
-
-func (k *KubeConfigUser) getAKSAuthConfig() (*KubeCertAuth, error) {
-
-	if !k.isAKSAuth() {
-		return nil, errors.New("User doesn't use AKS")
-	}
-
-	cert, err := base64.StdEncoding.DecodeString(k.User.ClientCertificate)
-	if err != nil {
-		return nil, errors.New("Unable to decode certificate")
-	}
-	certKey, err := base64.StdEncoding.DecodeString(k.User.ClientKeyData)
-	if err != nil {
-		return nil, errors.New("Unable to decode certificate key")
-	}
-	kubeCertAuth := &KubeCertAuth{
-		Certificate:    string(cert),
-		CertificateKey: string(certKey),
-		Token:          k.User.Token,
-	}
-	return kubeCertAuth, nil
-}
-
-//ExtraScopes string `yaml:"extra-scopes"`
-
-type KubeConfigContexts struct {
-	Context struct {
-		Cluster string
-		User    string
-	} `yaml:"context"`
-}
-
-type KubeConfigFile struct {
-	ApiVersion string               `yaml:"apiVersion"`
-	Kind       string               `yaml:"kind"`
-	Clusters   []KubeConfigCluster  `yaml:"clusters"`
-	Users      []KubeConfigUser     `yaml:"users"`
-	Contexts   []KubeConfigContexts `yaml:"contexts"`
-}
-
-func (k *KubeConfigFile) GetClusterByAPIEndpoint(endpoint string) (*KubeConfigCluster, error) {
-	for _, cluster := range k.Clusters {
-		if cluster.Cluster.Server == endpoint {
-			return &cluster, nil
-		}
-	}
-	return nil, fmt.Errorf("Unable to find cluster")
-}
-
-func (k *KubeConfigFile) GetClusterContext(clusterName string) (*KubeConfigContexts, error) {
-	for _, context := range k.Contexts {
-		if context.Context.Cluster == clusterName {
-			return &context, nil
-		}
-	}
-	return nil, fmt.Errorf("Unable to find context")
-}
-
-func (k *KubeConfigFile) GetUser(userName string) (*KubeConfigUser, error) {
-	for _, user := range k.Users {
-		if user.Name == userName {
-			return &user, nil
-		}
-	}
-	return nil, fmt.Errorf("Unable to find user")
-}
-
-func (k *KubeConfigFile) GetUserForCluster(clusterEndpoint string) (*KubeConfigUser, error) {
-	cluster, err := k.GetClusterByAPIEndpoint(clusterEndpoint)
-
-	if err != nil {
-		return nil, errors.New("Unable to find cluster in kubeconfig")
-	}
-
-	clusterName := cluster.Name
-
-	if clusterName == "" {
-		return nil, errors.New("Unable to find cluster")
-	}
-
-	context, err := k.GetClusterContext(clusterName)
-	if err != nil {
-		return nil, errors.New("Unable to find cluster context")
-	}
-
-	kubeConfigUser, err := k.GetUser(context.Context.User)
-	if err != nil {
-		return nil, errors.New("Can not find config for Kubernetes cluster")
-	}
-
-	return kubeConfigUser, nil
-}
-
-func (p *KubernetesSpecification) parseKubeConfig(kubeConfigData []byte) (*KubeConfigFile, error) {
-
-	kubeConfig := &KubeConfigFile{}
-	err := yaml.Unmarshal(kubeConfigData, &kubeConfig)
-	if err != nil {
-		return nil, err
-	}
-	if kubeConfig.ApiVersion != "v1" || kubeConfig.Kind != "Config" {
-		return nil, errors.New("Not a valid Kubernetes Config file")
-	}
-
-	return kubeConfig, nil
-}
-
-func (p *KubernetesSpecification) FetchKubeConfigTokenOIDC(cnsiRecord interfaces.CNSIRecord, c echo.Context) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error) {
-
-	req := c.Request()
-
-	// Need to extract the parameters from the request body
-	defer req.Body.Close()
-	body, err := ioutil.ReadAll(req.Body)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	kubeConfig, err := p.parseKubeConfig(body)
-
-	kubeConfigUser, err := kubeConfig.GetUserForCluster(cnsiRecord.APIEndpoint.String())
-
-	if err != nil {
-		return nil, nil, fmt.Errorf("Unable to find cluster in kubeconfig")
-	}
-
-	// We only support OIDC auth provider at the moment
-	if kubeConfigUser.User.AuthProvider.Name != "oidc" {
-		return nil, nil, errors.New("Unsupported authentication provider")
-	}
-
-	oidcConfig, err := kubeConfigUser.getOIDCConfig()
-	if err != nil {
-		log.Info(err)
-		return nil, nil, errors.New("Can not unmarshal OIDC Auth Provider configuration")
-	}
-	tokenRecord := p.portalProxy.InitEndpointTokenRecord(oidcConfig.Expiry.Unix(), oidcConfig.IDToken, oidcConfig.RefreshToken, false)
-	tokenRecord.AuthType = interfaces.AuthTypeOIDC
-
-	oauthMetadata := &interfaces.OAuth2Metadata{}
-	oauthMetadata.ClientID = oidcConfig.ClientID
-	oauthMetadata.ClientSecret = oidcConfig.ClientSecret
-	oauthMetadata.IssuerURL = oidcConfig.IdpIssuerURL
-
-	jsonString, err := json.Marshal(oauthMetadata)
-	if err == nil {
-		tokenRecord.Metadata = string(jsonString)
-	}
-
-	// Could try and make a K8S Api call to validate the token
-	// Or, maybe we can verify the access token with the auth URL ?
-
-	return &tokenRecord, &cnsiRecord, nil
-}
-
-func (p *KubernetesSpecification) FetchKubeConfigTokenAKS(cnsiRecord interfaces.CNSIRecord, c echo.Context) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error) {
-
-	req := c.Request()
-
-	// Need to extract the parameters from the request body
-	defer req.Body.Close()
-	body, err := ioutil.ReadAll(req.Body)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	kubeConfig, err := p.parseKubeConfig(body)
-
-	kubeConfigUser, err := kubeConfig.GetUserForCluster(cnsiRecord.APIEndpoint.String())
-	if err != nil {
-		return nil, nil, errors.New("Unable to find cluster in kubeconfig")
-	}
-
-	authConfig, err := kubeConfigUser.getAKSAuthConfig()
-	if err != nil {
-		return nil, nil, errors.New("User doesn't use AKS auth")
-	}
-
-	jsonString, err := authConfig.GetJSON()
-	if err != nil {
-		return nil, nil, err
-	}
-	// Refresh token isn't required since the AccessToken will never expire
-	refreshToken := jsonString
-
-	accessToken := jsonString
-	// Indefinite expiry
-	expiry := time.Now().Local().Add(time.Hour * time.Duration(100000))
-
-	tokenRecord := p.portalProxy.InitEndpointTokenRecord(expiry.Unix(), accessToken, refreshToken, false)
-	tokenRecord.AuthType = AuthConnectTypeKubeConfigAz
-
-	return &tokenRecord, &cnsiRecord, nil
-}
-
-func unMarshalHelper(values map[string]interface{}, intf interface{}) error {
-
-	value := reflect.ValueOf(intf)
-
-	if value.Kind() != reflect.Ptr {
-		return errors.New("config: must provide pointer to struct value")
-	}
-
-	value = value.Elem()
-	if value.Kind() != reflect.Struct {
-		return errors.New("config: must provide pointer to struct value")
-	}
-
-	nFields := value.NumField()
-	typ := value.Type()
-
-	for i := 0; i < nFields; i++ {
-		field := value.Field(i)
-		strField := typ.Field(i)
-		tag := strField.Tag.Get("yaml")
-		if tag == "" {
-			continue
-		}
-
-		if tagValue, ok := values[tag].(string); ok {
-			if err := config.SetStructFieldValue(value, field, tagValue); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
diff --git a/src/jetstream/plugins/kubernetes/kube_dashboard.go b/src/jetstream/plugins/kubernetes/kube_dashboard.go
index afcbb0b078..f2d37a4b65 100644
--- a/src/jetstream/plugins/kubernetes/kube_dashboard.go
+++ b/src/jetstream/plugins/kubernetes/kube_dashboard.go
@@ -56,26 +56,6 @@ func (k *KubernetesSpecification) getConfig(cnsiRecord *interfaces.CNSIRecord, t
 	return k.GetConfigForEndpoint(masterURL, *tokenRecord)
 }
 
-// Get the config for the certificate authentication
-func __getConfig(cnsiRecord *interfaces.CNSIRecord, tokenRecord *interfaces.TokenRecord) (*rest.Config, error) {
-
-	config := rest.Config{}
-	config.Host = cnsiRecord.APIEndpoint.String()
-
-	// Only support certs for now
-	kubeAuthToken := &KubeCertAuth{}
-	err := json.NewDecoder(strings.NewReader(tokenRecord.AuthToken)).Decode(kubeAuthToken)
-	if err != nil {
-		return nil, err
-	}
-
-	config.TLSClientConfig = rest.TLSClientConfig{}
-	config.TLSClientConfig.CertData = []byte(kubeAuthToken.Certificate)
-	config.TLSClientConfig.KeyData = []byte(kubeAuthToken.CertificateKey)
-	config.TLSClientConfig.Insecure = true
-	return &config, nil
-}
-
 // makeUpgradeTransport creates a transport that explicitly bypasses HTTP2 support
 // for proxy connections that must upgrade.
 func makeUpgradeTransport(config *rest.Config, keepalive time.Duration) (proxy.UpgradeRequestRoundTripper, error) {
diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index b8b0598ed5..26a36b433d 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -2,13 +2,14 @@ package kubernetes
 
 import (
 	"net/url"
-	"strings"
 
 	"errors"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/auth"
 )
 
 type KubernetesSpecification struct {
@@ -76,73 +77,30 @@ func (c *KubernetesSpecification) Connect(ec echo.Context, cnsiRecord interfaces
 
 	connectType := ec.FormValue("connect_type")
 
-	// OIDC ?
-	if strings.EqualFold(connectType, AuthConnectTypeKubeConfig) {
-		tokenRecord, _, err := c.FetchKubeConfigTokenOIDC(cnsiRecord, ec)
-		if err != nil {
-			return nil, false, err
-		}
-		return tokenRecord, false, nil
-	}
-
-	// AKS ?
-	if strings.EqualFold(connectType, AuthConnectTypeKubeConfigAz) {
-		tokenRecord, _, err := c.FetchKubeConfigTokenAKS(cnsiRecord, ec)
-		if err != nil {
-			return nil, false, err
-		}
-		return tokenRecord, false, nil
-	}
-
-	// IAM Creds?
-	if strings.EqualFold(connectType, AuthConnectTypeAWSIAM) {
-		tokenRecord, _, err := c.FetchIAMToken(cnsiRecord, ec)
-		if err != nil {
-			return nil, false, err
-		}
-		return tokenRecord, false, nil
-	}
-
-	// Cert Auth?
-	if strings.EqualFold(connectType, AuthConnectTypeCertAuth) {
-		tokenRecord, _, err := c.FetchCertAuth(cnsiRecord, ec)
-		if err != nil {
-			return nil, false, err
-		}
-		return tokenRecord, false, nil
+	var authProvider = c.FindAuthProvider(connectType)
+	if authProvider == nil {
+		return nil, false, errors.New("Unsupported Auth connection type for Kubernetes endpoint")
 	}
 
-	// GKE ?
-	if strings.EqualFold(connectType, AuthConnectTypeGKE) {
-		tokenRecord, _, err := c.FetchGKEToken(cnsiRecord, ec)
-		if err != nil {
-			return nil, false, err
-		}
-		return tokenRecord, false, nil
+	tokenRecord, _, err := authProvider.FetchToken(cnsiRecord, ec)
+	if err != nil {
+		return nil, false, err
 	}
 
-	return nil, false, errors.New("Unsupported Auth connection type for Kubernetes endpoint")
+	return tokenRecord, false, nil
 }
 
 // Init the Kubernetes Jetstream plugin
 func (c *KubernetesSpecification) Init() error {
-	c.portalProxy.AddAuthProvider(AuthConnectTypeAWSIAM, interfaces.AuthProvider{
-		Handler:  c.doAWSIAMFlowRequest,
-		UserInfo: c.GetCNSIUserFromIAMToken,
-	})
-	c.portalProxy.AddAuthProvider(AuthConnectTypeCertAuth, interfaces.AuthProvider{
-		Handler:  c.doCertAuthFlowRequest,
-		UserInfo: c.GetCNSIUserFromCertAuth,
-	})
-	c.portalProxy.AddAuthProvider(AuthConnectTypeKubeConfigAz, interfaces.AuthProvider{
-		Handler:  c.doCertAuthFlowRequest,
-		UserInfo: c.GetCNSIUserFromCertAuth,
-	})
-	c.portalProxy.AddAuthProvider(AuthConnectTypeGKE, interfaces.AuthProvider{
-		Handler:  c.doGKEFlowRequest,
-		UserInfo: c.GetGKEUserFromToken,
-	})
 
+	// Register all of the providers
+	c.AddAuthProvider(auth.InitGKEKubeAuth(c.portalProxy))
+	c.AddAuthProvider(auth.InitAWSKubeAuth(c.portalProxy))
+	c.AddAuthProvider(auth.InitCertKubeAuth(c.portalProxy))
+	c.AddAuthProvider(auth.InitAzureKubeAuth(c.portalProxy))
+	c.AddAuthProvider(auth.InitOIDCKubeAuth(c.portalProxy))
+	c.AddAuthProvider(auth.InitKubeConfigAuth(c.portalProxy))
+	
 	c.portalProxy.GetConfig().PluginConfig[KubeDashboardPluginConfigSetting] = "false"
 
 	return nil
diff --git a/src/jetstream/repository/interfaces/portal_proxy.go b/src/jetstream/repository/interfaces/portal_proxy.go
index cfde40db4f..f8ce8d86b4 100644
--- a/src/jetstream/repository/interfaces/portal_proxy.go
+++ b/src/jetstream/repository/interfaces/portal_proxy.go
@@ -56,7 +56,7 @@ type PortalProxy interface {
 	RefreshUAALogin(username, password string, store bool) error
 	GetUserTokenInfo(tok string) (u *JWTUserTokenInfo, err error)
 	GetUAAUser(userGUID string) (*ConnectedUser, error)
-
+	
 	// Proxy API requests
 	ProxyRequest(c echo.Context, uri *url.URL) (map[string]*CNSIRequest, error)
 	DoProxyRequest(requests []ProxyRequestInfo) (map[string]*CNSIRequest, error)
@@ -65,10 +65,13 @@ type PortalProxy interface {
 
 	// Database Connection
 	GetDatabaseConnection() *sql.DB
+
 	AddAuthProvider(name string, provider AuthProvider)
 	GetAuthProvider(name string) AuthProvider
 	DoAuthFlowRequest(cnsiRequest *CNSIRequest, req *http.Request, authHandler AuthHandlerFunc) (*http.Response, error)
 	OAuthHandlerFunc(cnsiRequest *CNSIRequest, req *http.Request, refreshOAuthTokenFunc RefreshOAuthTokenFunc) AuthHandlerFunc
+	DoOAuthFlowRequest(cnsiRequest *CNSIRequest, req *http.Request) (*http.Response, error)
+	GetCNSIUserFromOAuthToken(cnsiGUID string, cfTokenRecord *TokenRecord) (*ConnectedUser, bool)
 
 	// Tokens - lower-level access
 	SaveEndpointToken(cnsiGUID string, userGUID string, tokenRecord TokenRecord) error

From c22658384641b386c62377a0eb313e7c544c9dc5 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 17 May 2019 09:01:47 +0100
Subject: [PATCH 040/648] Moer tidy ups

---
 src/jetstream/plugins/kubernetes/api_proxy.go | 66 +++++++++++++++
 .../plugins/kubernetes/auth/awsiam.go         |  8 +-
 .../plugins/kubernetes/auth/azure.go          | 10 +--
 src/jetstream/plugins/kubernetes/auth/cert.go |  8 +-
 .../cert_tests.go}                            |  6 +-
 src/jetstream/plugins/kubernetes/auth/gke.go  |  7 +-
 src/jetstream/plugins/kubernetes/auth/oidc.go | 13 +--
 .../plugins/kubernetes/auth/types.go          |  5 +-
 .../plugins/kubernetes/auth_providers.go      |  2 -
 .../plugins/kubernetes/endpoint_config.go     |  4 -
 src/jetstream/plugins/kubernetes/go.mod       |  5 +-
 src/jetstream/plugins/kubernetes/go.sum       | 10 ++-
 .../plugins/kubernetes/helm_client.go         | 80 +------------------
 .../plugins/kubernetes/helm_versions.go       | 10 ++-
 .../plugins/kubernetes/install_release.go     | 15 ++--
 .../plugins/kubernetes/kube_dashboard.go      |  4 +-
 .../plugins/kubernetes/list_releases.go       | 10 +--
 src/jetstream/plugins/kubernetes/main.go      | 30 +++----
 .../monocular/20190307115300_ChartStore.go    |  8 +-
 src/jetstream/plugins/monocular/endpoint.go   |  4 +-
 src/jetstream/plugins/monocular/main.go       |  8 +-
 src/jetstream/plugins/monocular/repository.go |  2 +-
 src/jetstream/plugins/monocular/sync.go       | 11 +--
 23 files changed, 161 insertions(+), 165 deletions(-)
 create mode 100644 src/jetstream/plugins/kubernetes/api_proxy.go
 rename src/jetstream/plugins/kubernetes/{cert_requests_test.go => auth/cert_tests.go} (98%)

diff --git a/src/jetstream/plugins/kubernetes/api_proxy.go b/src/jetstream/plugins/kubernetes/api_proxy.go
new file mode 100644
index 0000000000..bcd14dd99b
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/api_proxy.go
@@ -0,0 +1,66 @@
+package kubernetes
+
+import (
+	"fmt"
+
+	//	"k8s.io/client-go/rest"
+
+	// Import the OIDC auth plugin
+	_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+)
+
+// KubeProxyError represents error when a proxied request to the Kube API failes
+type KubeProxyError struct {
+	Name string
+}
+
+// KubeProxyFunc represents a function to proxy to the Kube API
+type KubeProxyFunc func(*interfaces.ConnectedEndpoint, chan KubeProxyResponse)
+
+// KubeProxyResponse represents a response from a proxy request to the Kube API
+type KubeProxyResponse struct {
+	Endpoint string
+	Result   interface{}
+	Error    *KubeProxyError
+}
+
+// KubeProxyResponses represents response from multiple proxy requests to the Kube API
+type KubeProxyResponses map[string]interface{}
+
+// ProxyKubernetesAPI proxies an API request to all of the user's connected Kubernetes endpoints
+func (c *KubernetesSpecification) ProxyKubernetesAPI(userID string, f KubeProxyFunc) (KubeProxyResponses, error) {
+
+	var p = c.portalProxy
+	k8sList := make([]*interfaces.ConnectedEndpoint, 0)
+	eps, err := p.ListEndpointsByUser(userID)
+	if err != nil {
+		return nil, fmt.Errorf("Could not get endpints Client for endpoint: %v+", err)
+	}
+
+	for _, endpoint := range eps {
+		if endpoint.CNSIType == "k8s" {
+			k8sList = append(k8sList, endpoint)
+		}
+	}
+
+	// Check that we actually have some
+	// TODO
+	done := make(chan KubeProxyResponse)
+	for _, endpoint := range k8sList {
+		go f(endpoint, done)
+	}
+
+	responses := make(KubeProxyResponses)
+	for range k8sList {
+		res := <-done
+		if res.Error == nil {
+			responses[res.Endpoint] = res.Result
+		} else {
+			responses[res.Endpoint] = res.Error
+		}
+	}
+
+	return responses, nil
+}
diff --git a/src/jetstream/plugins/kubernetes/auth/awsiam.go b/src/jetstream/plugins/kubernetes/auth/awsiam.go
index 9c8e950605..5bdc813264 100644
--- a/src/jetstream/plugins/kubernetes/auth/awsiam.go
+++ b/src/jetstream/plugins/kubernetes/auth/awsiam.go
@@ -20,6 +20,7 @@ import (
 	"github.com/kubernetes-sigs/aws-iam-authenticator/pkg/token"
 )
 
+// AWSIAMUserInfo is the user info needed to connect to AWS Kubernetes
 type AWSIAMUserInfo struct {
 	Cluster   string `json:"cluster"`
 	AccessKey string `json:"accessKey"`
@@ -31,15 +32,16 @@ type AWSKubeAuth struct {
 	portalProxy interfaces.PortalProxy
 }
 
-const AuthConnectTypeAWSIAM = "aws-iam"
+const authConnectTypeAWSIAM = "aws-iam"
 
 // InitAWSKubeAuth creates a GKEKubeAuth
 func InitAWSKubeAuth(portalProxy interfaces.PortalProxy) KubeAuthProvider {
 	return &AWSKubeAuth{portalProxy: portalProxy}
 }
 
+// GetName returns the Auth Provider name
 func (c *AWSKubeAuth) GetName() string {
-	return AuthConnectTypeAWSIAM
+	return authConnectTypeAWSIAM
 }
 
 func (c *AWSKubeAuth) AddAuthInfo(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
@@ -105,7 +107,7 @@ func (c *AWSKubeAuth) FetchToken(cnsiRecord interfaces.CNSIRecord, ec echo.Conte
 	expiry := time.Now().Local().Add(time.Minute * time.Duration(15))
 
 	tokenRecord := c.portalProxy.InitEndpointTokenRecord(expiry.Unix(), accessToken, refreshToken, false)
-	tokenRecord.AuthType = AuthConnectTypeAWSIAM
+	tokenRecord.AuthType = authConnectTypeAWSIAM
 	return &tokenRecord, &cnsiRecord, nil
 }
 
diff --git a/src/jetstream/plugins/kubernetes/auth/azure.go b/src/jetstream/plugins/kubernetes/auth/azure.go
index 4f0f0ab41b..0447b2e528 100644
--- a/src/jetstream/plugins/kubernetes/auth/azure.go
+++ b/src/jetstream/plugins/kubernetes/auth/azure.go
@@ -6,14 +6,13 @@ import (
 	"io/ioutil"
 	"time"
 
-	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/config"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 
 	"github.com/labstack/echo"
 )
 
-const AuthConnectTypeKubeConfigAz = "kubeconfig-az"
-
+const authConnectTypeKubeConfigAz = "kubeconfig-az"
 
 // AzureKubeAuth is Azure Authentication with Certificates
 type AzureKubeAuth struct {
@@ -27,7 +26,7 @@ func InitAzureKubeAuth(portalProxy interfaces.PortalProxy) KubeAuthProvider {
 
 // GetName returns the provider name
 func (c *AzureKubeAuth) GetName() string {
-	return AuthConnectTypeKubeConfigAz
+	return authConnectTypeKubeConfigAz
 }
 
 func (p *AzureKubeAuth) FetchToken(cnsiRecord interfaces.CNSIRecord, ec echo.Context) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error) {
@@ -64,12 +63,11 @@ func (p *AzureKubeAuth) FetchToken(cnsiRecord interfaces.CNSIRecord, ec echo.Con
 	expiry := time.Now().Local().Add(time.Hour * time.Duration(100000))
 
 	tokenRecord := p.portalProxy.InitEndpointTokenRecord(expiry.Unix(), accessToken, refreshToken, false)
-	tokenRecord.AuthType = AuthConnectTypeKubeConfigAz
+	tokenRecord.AuthType = authConnectTypeKubeConfigAz
 
 	return &tokenRecord, &cnsiRecord, nil
 }
 
-
 func (p *AzureKubeAuth) getAKSAuthConfig(k *config.KubeConfigUser) (*KubeCertificate, error) {
 
 	if !isAKSAuth(k) {
diff --git a/src/jetstream/plugins/kubernetes/auth/cert.go b/src/jetstream/plugins/kubernetes/auth/cert.go
index 9e7569587b..517ef8a780 100644
--- a/src/jetstream/plugins/kubernetes/auth/cert.go
+++ b/src/jetstream/plugins/kubernetes/auth/cert.go
@@ -19,8 +19,7 @@ import (
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 )
 
-const AuthConnectTypeCertAuth = "kube-cert-auth"
-
+const authConnectTypeCertAuth = "kube-cert-auth"
 
 // CertKubeAuth is GKE Authentication with Certificates
 type CertKubeAuth struct {
@@ -32,8 +31,9 @@ func InitCertKubeAuth(portalProxy interfaces.PortalProxy) *CertKubeAuth {
 	return &CertKubeAuth{portalProxy: portalProxy}
 }
 
+// GetName returns the provider name
 func (c *CertKubeAuth) GetName() string {
-	return AuthConnectTypeCertAuth
+	return authConnectTypeCertAuth
 }
 
 func (c *CertKubeAuth) AddAuthInfo(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
@@ -98,7 +98,7 @@ func (c *CertKubeAuth) FetchToken(cnsiRecord interfaces.CNSIRecord, ec echo.Cont
 	expiry := time.Now().Local().Add(time.Hour * time.Duration(100000))
 	disconnected := false
 	tokenRecord := c.portalProxy.InitEndpointTokenRecord(expiry.Unix(), accessToken, refreshToken, disconnected)
-	tokenRecord.AuthType = AuthConnectTypeCertAuth
+	tokenRecord.AuthType = authConnectTypeCertAuth
 	return &tokenRecord, &cnsiRecord, nil
 }
 
diff --git a/src/jetstream/plugins/kubernetes/cert_requests_test.go b/src/jetstream/plugins/kubernetes/auth/cert_tests.go
similarity index 98%
rename from src/jetstream/plugins/kubernetes/cert_requests_test.go
rename to src/jetstream/plugins/kubernetes/auth/cert_tests.go
index 223a08df53..9c1616fd10 100644
--- a/src/jetstream/plugins/kubernetes/cert_requests_test.go
+++ b/src/jetstream/plugins/kubernetes/auth/cert_tests.go
@@ -1,4 +1,4 @@
-package kubernetes
+package auth
 
 import (
 	"encoding/json"
@@ -11,7 +11,7 @@ import (
 
 func TestFetchCertAuth(t *testing.T) {
 
-	kubeSpec := &KubernetesSpecification{}
+	kubeSpec := &CertKubeAuth{}
 
 	mockConnectRequet := "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURBRENDQWVpZ0F3SUJBZ0lCQWpBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwdGFXNXAKYTNWaVpVTkJNQjRYRFRFNE1UQXhNakUyTlRnMU1Wb1hEVEU1TVRBeE16RTJOVGcxTVZvd01URVhNQlVHQTFVRQpDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGakFVQmdOVkJBTVREVzFwYm1scmRXSmxMWFZ6WlhJd2dnRWlNQTBHCkNTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFEeFNtT2dORmV5VjkyRE5Sa0RmNVNSZlk5WHhGRVkKbFF2Z3lEcmFnVVpCcXFTaFBaZGdFdnBFWlVObkVoa1ZaYnc5WGUxelFMdVFuZnJEaERzOHlqTk8xWTV4ZUt2cwpIQlVBZEsxa2FQMlBXMVhSN3hxREh2SFdhQ3dRWVdHK1Bsa0NXMzg1YzBsNktXRUc5SVlFWFdkT1VDbEZuT3ZoCnJBN2RTNWR5eFViU3FCd0RSSDljMlhDVjQ4c1dLZnJhdmQvMTg5bWJENStQRk9ZditnRFFycHBTYnUzQytjTmYKbC93NDl0L0NQWlQ4bHFWU2FBUHhzOXFKbStKSFVFWHk3a1p2bGRZbG83NjJ3V1B6c0JoaXNkNU5ua2hmbGhrUApKSWNrWjN5eWF5bkdkOWJlKzdva2hwVEt1STNReGh5MTBrMWsxc1dyYmJTWVJDbmQ1akdVN3N2REFnTUJBQUdqClB6QTlNQTRHQTFVZER3RUIvd1FFQXdJRm9EQWRCZ05WSFNVRUZqQVVCZ2dyQmdFRkJRY0RBUVlJS3dZQkJRVUgKQXdJd0RBWURWUjBUQVFIL0JBSXdBREFOQmdrcWhraUc5dzBCQVFzRkFBT0NBUUVBQ2NNS2IreVNOeG9wYmRGNwpqcTBTN1EvQmFUbWhzWnVUWDRPL2V4ZllkZFpwK0didDc2VEVqYWdmUmQvbXFFazlheFAxWDVzWkRhQ283blkzCitDdnpMb1h2Y3NHdnVnRTJSWStsSjdBbTdLS0lTdGVGTFdsRnBDTXJBWXF6TG1Wb3NyeDlWM0ZTbWY2REdWRk4KSmVVVFBnYTFrNTltMUNFSjZDYTAzM2hEYmp6aWsxd0xtR3pLVmRDR29HT1N0Vm1tbTZFWWMza1hheGVXTUtuMQpoRDhmREV5R3p1Z2hhTkQyYjZGdnlha28yUVQ3dFd3L09yMXNhQWQ1S2N5Wk4xdDVtUHI1RHh0SmFKNHN2dzh4Ck01R0MySFVUM2pzK3dQdDVSUlpSRXd2MkNCUVNHUWtxcDFrWTNLV1pXTDB2WEQvbjJqYlZGUUtacHQ2dDZKT3EKaVQ2bnlRPT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=:LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcFFJQkFBS0NBUUVBOFVwam9EUlhzbGZkZ3pVWkEzK1VrWDJQVjhSUkdKVUw0TWc2Mm9GR1FhcWtvVDJYCllCTDZSR1ZEWnhJWkZXVzhQVjN0YzBDN2tKMzZ3NFE3UE1velR0V09jWGlyN0J3VkFIU3RaR2o5ajF0VjBlOGEKZ3g3eDFtZ3NFR0Zodmo1WkFsdC9PWE5KZWlsaEJ2U0dCRjFuVGxBcFJaenI0YXdPM1V1WGNzVkcwcWdjQTBSLwpYTmx3bGVQTEZpbjYycjNmOWZQWm13K2ZqeFRtTC9vQTBLNmFVbTd0d3ZuRFg1ZjhPUGJmd2oyVS9KYWxVbWdECjhiUGFpWnZpUjFCRjh1NUdiNVhXSmFPK3RzRmo4N0FZWXJIZVRaNUlYNVlaRHlTSEpHZDhzbXNweG5mVzN2dTYKSklhVXlyaU4wTVljdGRKTlpOYkZxMjIwbUVRcDNlWXhsTzdMd3dJREFRQUJBb0lCQVFESEVJd291NFl1U0hjagpyRWE2c0NLdDlWeXhGL0dmeWpkR2QycTJvamlJTEhRdDRsWmttTU9JY2RLdDBpeUhqcXRDSlora21oOGtMSEdaCnBCb0xDUFpUYjdSWXdTbDFYYVdsL3B5ZVhrL3lXWFB3QXNkb3JicnZISHBkK1RsZWJxbVlYRXdWNVpzVkFkWmUKbXBXR1BGamlMeGdkcWx5Z2pnYWxZNXZLd0I2eDR3MHZTczdaUVBoQkFqTSs3a2Q3ZUpBRUJHZUxRL1lRTEIvVgo1Qmtrci9mT2d6K1A3V2t5QUovRk1iRzY4K0E3Z1FHeTJvWGdnbHVsOXg5YjlkcXJDSm5NVHFkNENvbU5qTmFjCkpValhjMEVGeFJqTjdOR0djenhXREVnc1dicGMxeFpYK20zcEQrQnRDd3BSeXJ4Q3NDWGwrTllnT01Jb1FZaWIKaUxQZzhsM0JBb0dCQVBQa3BMdTM0U1NhQVJNOE1YMWxCckdMa0k2cjlLZW5MaVZNYU55bG9CMWtyM29DaEJueApiek5kMkdxaXNBbEJFb3JVWEdkOVBadVNqYmRGMnVxTGgvdVMvdlBBMUpmR3drakZERmNyTVlXeDExWGVMcy9RCmYrdjF2dmQ5RUp5b0w2ekIxQkhaelZuenFIQ2w4OWlvNEY3Wkl3MmlKQ0NjWlJiN2JlOUdzbkdiQW9HQkFQMUUKckR3bldQNG5XN00wdlJYcFVkY3Q1UE96dHZIVFpoNTFJaC93NklOQzladXl3eFJoMi9XTEs0ZlZBRDYxeFloTgpVR0FvU2FUQzRrZWdoYlUvTWY5aWtBS3c3MWRPdk5HSzBSdjROTlZwbEJWbFhhcnF5OEpTeGJIcnNNU25rSTI4CjhNZ21YdlYvNkYwZTUxWFl1bHlYUXNqVWpCbVRXUTUzZnRWcXRhVDVBb0dCQU9vRkpod0pJRHNpbW8xK1lHNVYKbGNxZWhDS2gxS3RadXVtSEc4YzhGUnFmRmRFWXdQQ3p2V09vVkpSZGJsUXk0RHZkOEp4TWkrVFBCclFvanhvbQpzR0F3ZC9vanVObTVtWXFCcUltcnBHVUljL3FzcW5ZMU5jbVBqNkdobTJMMTdtanh3eTh0c2VEeDcxbkhvdWJ0CmcveitsS2ZzUUlZYUN0VzJnNUhvWUNpcEFvR0JBTTNtcHAvQTNYakNScXJLbFc3YTRNNHZZWk0rNTl4eUlQTmkKQnZ3d3Z0YjMrUFU3djUweWNjQ09CRFhKMVFrbWZoRHh5Z1ppdW54WWM5NEhncXgzVkE1cjh1ZzlNRmVxaTVkUApZL0Y1T0hySCtydnFUTnhIUnFBVTZ1UmEyTHNILzEwNzNnVGFMUmtwZzU4eElLR0tNUGhWZ05ZRTltRlVpWEpaCmM2UE52UjhCQW9HQU0zNTlZSUNUalNNYlYvSjJUbUx1Zjh2ejh0WVJDeXlla0h6Z2tTcmpqWUZWNmoxUTllWGQKa1ZFWitaYW1xYkZvUmxqK1lHS21XQ0w0OXJTWkYxNmVYL1V3OW5haEErcmtYL21aaERkOXIrVE90enpycUVYSQpUQVlld3R5ZGEzUzkyaytOWU8zZE5kbWZLQVdYV2JzdjZUKzBBTXR6VTFkMlNaaDlsTU5aVkUwPQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo="
 	e := echo.New()
@@ -41,7 +41,7 @@ func TestFetchCertAuth(t *testing.T) {
 		t.Fail()
 	}
 
-	testKubeCertAuth := &KubeCertAuth{}
+	testKubeCertAuth := &KubeCertificate{}
 	err = json.NewDecoder(strings.NewReader(jsonString)).Decode(testKubeCertAuth)
 	if err != nil {
 		t.Fail()
diff --git a/src/jetstream/plugins/kubernetes/auth/gke.go b/src/jetstream/plugins/kubernetes/auth/gke.go
index 3bdeced3b4..9a1193d4ad 100644
--- a/src/jetstream/plugins/kubernetes/auth/gke.go
+++ b/src/jetstream/plugins/kubernetes/auth/gke.go
@@ -37,15 +37,16 @@ type GKEKubeAuth struct {
 	portalProxy interfaces.PortalProxy
 }
 
-const AuthConnectTypeGKE = "gke-auth"
+const authConnectTypeGKE = "gke-auth"
 
 // InitGKEKubeAuth creates a GKEKubeAuth
 func InitGKEKubeAuth(portalProxy interfaces.PortalProxy) KubeAuthProvider {
 	return &GKEKubeAuth{portalProxy: portalProxy}
 }
 
+// GetName returns the provider name
 func (c *GKEKubeAuth) GetName() string {
-	return AuthConnectTypeGKE
+	return authConnectTypeGKE
 }
 
 func (c *GKEKubeAuth) AddAuthInfo(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
@@ -107,7 +108,7 @@ func (c *GKEKubeAuth) FetchToken(cnsiRecord interfaces.CNSIRecord, ec echo.Conte
 
 	// Create a new token record - we need to store the client ID and secret as well, so cheekily use the refresh token for this
 	tokenRecord := c.portalProxy.InitEndpointTokenRecord(0, oauthToken.AccessToken, string(tokenInfo), false)
-	tokenRecord.AuthType = AuthConnectTypeGKE
+	tokenRecord.AuthType = authConnectTypeGKE
 	return &tokenRecord, &cnsiRecord, nil
 }
 
diff --git a/src/jetstream/plugins/kubernetes/auth/oidc.go b/src/jetstream/plugins/kubernetes/auth/oidc.go
index 80ce00dda0..199deee5ca 100644
--- a/src/jetstream/plugins/kubernetes/auth/oidc.go
+++ b/src/jetstream/plugins/kubernetes/auth/oidc.go
@@ -4,17 +4,17 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"net/http"
 	"io/ioutil"
+	"net/http"
 	"time"
 
-	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/config"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 
-	log "github.com/sirupsen/logrus"
+	"github.com/SermoDigital/jose/jws"
 	"github.com/labstack/echo"
+	log "github.com/sirupsen/logrus"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
-	"github.com/SermoDigital/jose/jws"	
 )
 
 type KubeConfigAuthProviderOIDC struct {
@@ -26,7 +26,7 @@ type KubeConfigAuthProviderOIDC struct {
 	Expiry       time.Time
 }
 
-const AuthConnectTypeOIDC   = "OIDC"
+const authConnectTypeOIDC = "OIDC"
 
 // OIDCKubeAuth
 type OIDCKubeAuth struct {
@@ -38,8 +38,9 @@ func InitOIDCKubeAuth(portalProxy interfaces.PortalProxy) *OIDCKubeAuth {
 	return &OIDCKubeAuth{portalProxy: portalProxy}
 }
 
+// GetName returns the provider name
 func (c *OIDCKubeAuth) GetName() string {
-	return AuthConnectTypeOIDC
+	return authConnectTypeOIDC
 }
 
 func (c *OIDCKubeAuth) AddAuthInfo(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
diff --git a/src/jetstream/plugins/kubernetes/auth/types.go b/src/jetstream/plugins/kubernetes/auth/types.go
index 127ac705b1..9a32914bc9 100644
--- a/src/jetstream/plugins/kubernetes/auth/types.go
+++ b/src/jetstream/plugins/kubernetes/auth/types.go
@@ -21,9 +21,6 @@ type KubeAuthProvider interface {
 	GetUserFromToken(cnsiGUID string, tokenRecord *interfaces.TokenRecord) (*interfaces.ConnectedUser, bool)
 }
 
-
-// -------------------------------
-
 // KubeCertificate represents certificate infor for Kube Authentication
 type KubeCertificate struct {
 	Certificate    string `json:"cert"`
@@ -47,4 +44,4 @@ func (k *KubeCertificate) GetCerticate() (tls.Certificate, error) {
 		return tls.Certificate{}, err
 	}
 	return cert, nil
-}
\ No newline at end of file
+}
diff --git a/src/jetstream/plugins/kubernetes/auth_providers.go b/src/jetstream/plugins/kubernetes/auth_providers.go
index c078f0f61a..dcd73d2ca3 100644
--- a/src/jetstream/plugins/kubernetes/auth_providers.go
+++ b/src/jetstream/plugins/kubernetes/auth_providers.go
@@ -7,8 +7,6 @@ import (
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 )
 
-// Interface for Kubernetes Authentication Providers
-
 var kubeAuthProviders map[string]auth.KubeAuthProvider
 
 // AddAuthProvider adds a Kubernetes auth provider
diff --git a/src/jetstream/plugins/kubernetes/endpoint_config.go b/src/jetstream/plugins/kubernetes/endpoint_config.go
index f047d86898..22f3521f10 100644
--- a/src/jetstream/plugins/kubernetes/endpoint_config.go
+++ b/src/jetstream/plugins/kubernetes/endpoint_config.go
@@ -16,8 +16,6 @@ import (
 func (c *KubernetesSpecification) GetConfigForEndpoint(masterURL string, token interfaces.TokenRecord) (*restclient.Config, error) {
 	return clientcmd.BuildConfigFromKubeconfigGetter(masterURL, func() (*clientcmdapi.Config, error) {
 
-		log.Info("GetConfigForEndpoint")
-
 		name := "cluster-0"
 
 		// Create a config
@@ -50,8 +48,6 @@ func (c *KubernetesSpecification) GetConfigForEndpoint(masterURL string, token i
 func (c *KubernetesSpecification) addAuthInfoForEndpoint(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
 
 	log.Debug("addAuthInfoForEndpoint")
-	log.Warn(tokenRec.AuthType)
-
 	var authProvider = c.GetAuthProvider(tokenRec.AuthType)
 	if authProvider == nil {
 		return errors.New("Unsupported auth type")
diff --git a/src/jetstream/plugins/kubernetes/go.mod b/src/jetstream/plugins/kubernetes/go.mod
index b9056ff45a..5393fae8ef 100644
--- a/src/jetstream/plugins/kubernetes/go.mod
+++ b/src/jetstream/plugins/kubernetes/go.mod
@@ -18,7 +18,6 @@ require (
 	github.com/evanphx/json-patch v4.1.0+incompatible // indirect
 	github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
-	github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 // indirect
 	github.com/go-openapi/spec v0.18.0 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/gogo/protobuf v1.2.1 // indirect
@@ -31,6 +30,7 @@ require (
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
 	github.com/hashicorp/golang-lru v0.5.0 // indirect
 	github.com/helm/monocular v1.4.0
+	github.com/helm/monocular/chartsvc v0.0.0-00010101000000-000000000000
 	github.com/heptio/authenticator v0.3.0 // indirect
 	github.com/huandu/xstrings v1.2.0 // indirect
 	github.com/imdario/mergo v0.3.7 // indirect
@@ -45,14 +45,12 @@ require (
 	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pkg/errors v0.8.1 // indirect
-	github.com/prometheus/client_golang v0.9.2 // indirect
 	github.com/russross/blackfriday v2.0.0+incompatible // indirect
 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
 	github.com/sirupsen/logrus v1.3.0
 	github.com/spf13/cobra v0.0.3 // indirect
 	github.com/spf13/pflag v1.0.3 // indirect
 	github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245 // indirect
-	github.com/unrolled/render v1.0.0 // indirect
 	golang.org/x/net v0.0.0-20190225153610-fe579d43d832 // indirect
 	golang.org/x/oauth2 v0.0.0-20190226191147-529b322ea346 // indirect
 	golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect
@@ -78,6 +76,7 @@ require (
 replace (
 	github.com/SermoDigital/jose => github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc
 	github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces => ../../repository/interfaces
+	github.com/helm/monocular/chartsvc => ../monocular/chartsvc
 	github.com/kubernetes-sigs/aws-iam-authenticator => github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc
 	github.com/russross/blackfriday v2.0.0+incompatible => github.com/russross/blackfriday v1.5.2
 	github.com/sergi/go-diff => github.com/sergi/go-diff v1.0.0
diff --git a/src/jetstream/plugins/kubernetes/go.sum b/src/jetstream/plugins/kubernetes/go.sum
index 836c47b4bc..69a959d32c 100644
--- a/src/jetstream/plugins/kubernetes/go.sum
+++ b/src/jetstream/plugins/kubernetes/go.sum
@@ -33,6 +33,7 @@ github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrP
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ=
 github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker v1.13.1 h1:IkZjBSIc8hBjLpqeAbeE5mca5mNgeatLHBy3GO78BWo=
@@ -75,6 +76,8 @@ github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhp
 github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U=
+github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/sessions v1.1.3 h1:uXoZdcdA5XdXF3QzuSlheVRUvjl+1rKY7zBXL68L9RU=
@@ -96,6 +99,8 @@ github.com/helm/monocular v1.6.0 h1:zE8OggduPEtnF2x1XgrQnMwnKFUGCvk/RNs0NX8hgjg=
 github.com/helm/monocular v1.7.0 h1:SW2xr6KoVJtZT6ZAtON8jJVLqcRE3C8pBb9kyo8Icxw=
 github.com/heptio/authenticator v0.3.0 h1:Xh6XWkLZ+CksGuky+vsr77mHnI9C4L3nwj+xuZu28J0=
 github.com/heptio/authenticator v0.3.0/go.mod h1:Q86X8hc61JXhE5XxYLKmrSRWby/Oe8IIYZIBgmGVkTA=
+github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40 h1:GT4RsKmHh1uZyhmTkWJTDALRjSHYQp6FRKrotf0zhAs=
+github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40/go.mod h1:NtmN9h8vrTveVQRLHcX2HQ5wIPBDCsZ351TGbZWgg38=
 github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0=
 github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4=
 github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI=
@@ -154,9 +159,9 @@ github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nL
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/russross/blackfriday v2.0.0/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday v2.0.0+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday v2.0.0 h1:L7Oc72h7rDqGkbUorN/ncJ4N/y220/YRezHvBoKLOFA=
+github.com/russross/blackfriday v2.0.0/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
@@ -172,12 +177,15 @@ github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245 h1:DNVk+NIkGS
 github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245/go.mod h1:O1c8HleITsZqzNZDjSNzirUGsMT0oGu9LhHKoJrqO+A=
 github.com/unrolled/render v1.0.0 h1:XYtvhA3UkpB7PqkvhUFYmpKD55OudoIeygcfus4vcd4=
 github.com/unrolled/render v1.0.0/go.mod h1:tu82oB5W2ykJRVioYsB+IQKcft7ryBr7w12qMBUPyXg=
+github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
+github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4 h1:gKMu1Bf6QINDnvyZuTaACm9ofY+PRh+5vFz4oxBZeF8=
 github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4/go.mod h1:50wTf68f99/Zt14pr046Tgt3Lp2vLyFZKzbFXTOabXw=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
diff --git a/src/jetstream/plugins/kubernetes/helm_client.go b/src/jetstream/plugins/kubernetes/helm_client.go
index 2bbb9e8148..7c04053da1 100644
--- a/src/jetstream/plugins/kubernetes/helm_client.go
+++ b/src/jetstream/plugins/kubernetes/helm_client.go
@@ -7,31 +7,15 @@ import (
 	log "github.com/sirupsen/logrus"
 
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/rest"
 	"k8s.io/helm/pkg/helm"
 	"k8s.io/helm/pkg/helm/portforwarder"
 	"k8s.io/helm/pkg/kube"
 
 	// Import the OIDC auth plugin
 	_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
-
-	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 )
 
-type KubeProxyError struct {
-	Name string
-}
-
-type KubeProxyFunc func(*interfaces.ConnectedEndpoint, chan KubeProxyResponse)
-
-type KubeProxyResponse struct {
-	Endpoint string
-	Result   interface{}
-	Error    *KubeProxyError
-}
-
-type KubeProxyResponses map[string]interface{}
-
+// GetHelmClient gets a client that can be used to talk to Tiller
 func (c *KubernetesSpecification) GetHelmClient(endpointGUID, userID string) (helm.Interface, *kubernetes.Clientset, *kube.Tunnel, error) {
 	// Need to get a config object for the target endpoint
 	var p = c.portalProxy
@@ -64,73 +48,13 @@ func (c *KubernetesSpecification) GetHelmClient(endpointGUID, userID string) (he
 		return nil, nil, nil, err
 	}
 
-	log.Warnf("Tiller tunnel is using Port: %d", tillerTunnel.Local)
-
-	// TODO: Concurrency?
+	log.Debugf("Tiller tunnel is using Port: %d", tillerTunnel.Local)
 	tillerHost := fmt.Sprintf("127.0.0.1:%d", tillerTunnel.Local)
-
 	client := newClient(tillerHost)
 
 	return client, kubeClient, tillerTunnel, nil
 }
 
-func (c *KubernetesSpecification) ProxyKubernetesAPI(userID string, f KubeProxyFunc) (KubeProxyResponses, error) {
-
-	var p = c.portalProxy
-	k8sList := make([]*interfaces.ConnectedEndpoint, 0)
-	eps, err := p.ListEndpointsByUser(userID)
-	if err != nil {
-		return nil, fmt.Errorf("Could not get endpints Client for endpoint: %v+", err)
-	}
-
-	for _, endpoint := range eps {
-		if endpoint.CNSIType == "k8s" {
-			k8sList = append(k8sList, endpoint)
-		}
-	}
-
-	// Check that we actually have some
-	// TODO
-	done := make(chan KubeProxyResponse)
-	for _, endpoint := range k8sList {
-		go f(endpoint, done)
-	}
-
-	responses := make(KubeProxyResponses)
-	for range k8sList {
-		res := <-done
-		if res.Error == nil {
-			responses[res.Endpoint] = res.Result
-		} else {
-			responses[res.Endpoint] = res.Error
-		}
-	}
-
-	return responses, nil
-}
-
-// configForContext creates a Kubernetes REST client configuration for a given kubeconfig context.
-func configForContext(context string, kubeconfig string) (*rest.Config, error) {
-	config, err := kube.GetConfig(context, kubeconfig).ClientConfig()
-	if err != nil {
-		return nil, fmt.Errorf("could not get Kubernetes config for context %q: %s", context, err)
-	}
-	return config, nil
-}
-
-// getKubeClient creates a Kubernetes config and client for a given kubeconfig context.
-func getKubeClient(context string, kubeconfig string) (*rest.Config, kubernetes.Interface, error) {
-	config, err := configForContext(context, kubeconfig)
-	if err != nil {
-		return nil, nil, err
-	}
-	client, err := kubernetes.NewForConfig(config)
-	if err != nil {
-		return nil, nil, fmt.Errorf("could not get Kubernetes client: %s", err)
-	}
-	return config, client, nil
-}
-
 func newClient(tillerHost string) helm.Interface {
 	options := []helm.Option{helm.Host(tillerHost), helm.ConnectTimeout(20)}
 	return helm.NewClient(options...)
diff --git a/src/jetstream/plugins/kubernetes/helm_versions.go b/src/jetstream/plugins/kubernetes/helm_versions.go
index c3bc1ae91f..1a21f5dbae 100644
--- a/src/jetstream/plugins/kubernetes/helm_versions.go
+++ b/src/jetstream/plugins/kubernetes/helm_versions.go
@@ -1,6 +1,8 @@
 package kubernetes
 
 import (
+	"net/http"
+
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
 
@@ -23,7 +25,13 @@ func (c *KubernetesSpecification) GetHelmVersions(ec echo.Context) error {
 	userID := ec.Get("user_id").(string)
 
 	resp, err := c.ProxyKubernetesAPI(userID, c.fetchHelmVersion)
-	log.Warn(err)
+	if err != nil {
+		return interfaces.NewHTTPShadowError(
+			http.StatusInternalServerError,
+			"Error fetching Helm Tiller Versions",
+			"Error fetching Helm Tiller Versions: %v", err,
+		)
+	}
 	return ec.JSON(200, resp)
 }
 
diff --git a/src/jetstream/plugins/kubernetes/install_release.go b/src/jetstream/plugins/kubernetes/install_release.go
index 1625e5600e..b6fc1ff755 100644
--- a/src/jetstream/plugins/kubernetes/install_release.go
+++ b/src/jetstream/plugins/kubernetes/install_release.go
@@ -51,24 +51,19 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 	log.Info("Installing release")
 	log.Info(chartID)
 
-	downloadURL, err := c.GetChart(chartID, params.Chart.Version)
+	downloadURL, err := c.getChart(chartID, params.Chart.Version)
 	if err != nil {
 		return fmt.Errorf("Could not get the Download URL")
 	}
 
 	log.Debugf("Chart Download URL: %s", downloadURL)
 
-	// Get IO reader for the Chart
-
 	// Should we ignore SSL certs?
 	// TODO: Look up Helm Repository endpoiint and use the value from that
 	http := c.portalProxy.GetHttpClient(true)
 
 	resp, err := http.Get(downloadURL)
 
-	// // Check StatusCode is 200
-	// // Body is a io.ReadCloser
-
 	if resp.StatusCode != 200 {
 		return fmt.Errorf("Could not download Chart Archive: %s", resp.Status)
 	}
@@ -79,7 +74,7 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 		return fmt.Errorf("Could not load chart from archive: %v+", err)
 	}
 
-	log.Debug("Loaded chart")
+	log.Debug("Loaded helm chart")
 
 	endpointGUID := params.Endpoint
 	userGUID := ec.Get("user_id").(string)
@@ -94,7 +89,7 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 	if _, err := chartutil.LoadRequirements(chart); err == nil {
 		log.Debug("Chart requirements loaded")
 	} else if err != chartutil.ErrRequirementsNotFound {
-		log.Error("Can not load requirements")
+		log.Error("Can not load requirements for helm chart")
 	} else {
 		log.Error(err)
 	}
@@ -120,7 +115,7 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 	return ec.JSON(200, installResponse)
 }
 
-func (c *KubernetesSpecification) GetChart(chartID, version string) (string, error) {
+func (c *KubernetesSpecification) getChart(chartID, version string) (string, error) {
 
 	helm := c.portalProxy.GetPlugin("monocular")
 	if helm == nil {
@@ -167,7 +162,7 @@ func (c *KubernetesSpecification) DeleteRelease(ec echo.Context) error {
 	deleteResponse, err := client.DeleteRelease(releaseName, helm.DeletePurge(true))
 	if err != nil {
 		return fmt.Errorf("Could not delete Helm Release: %v+", err)
-
 	}
+
 	return ec.JSON(200, deleteResponse)
 }
diff --git a/src/jetstream/plugins/kubernetes/kube_dashboard.go b/src/jetstream/plugins/kubernetes/kube_dashboard.go
index f2d37a4b65..76e9dc4c69 100644
--- a/src/jetstream/plugins/kubernetes/kube_dashboard.go
+++ b/src/jetstream/plugins/kubernetes/kube_dashboard.go
@@ -149,7 +149,7 @@ func (k *KubernetesSpecification) kubeDashboardProxy(c echo.Context) error {
 	log.Info("Making request")
 	req := c.Request()
 	w := c.Response().Writer
-	log.Info("%v+", req)
+	log.Infof("%v+", req)
 
 	// if h.tryUpgrade(w, req) {
 	// 	return
@@ -220,7 +220,7 @@ func (k *KubernetesSpecification) kubeDashboardProxy(c echo.Context) error {
 		log.Debugf("%v+", response.Header)
 		response.Header.Del("X-FRAME-OPTIONS")
 		response.Header.Set("X-FRAME-OPTIONS", "sameorigin")
-		log.Debug("%v+", response)
+		log.Debugf("%v+", response)
 		return nil
 	}
 
diff --git a/src/jetstream/plugins/kubernetes/list_releases.go b/src/jetstream/plugins/kubernetes/list_releases.go
index ef0f45e250..c920c888a5 100644
--- a/src/jetstream/plugins/kubernetes/list_releases.go
+++ b/src/jetstream/plugins/kubernetes/list_releases.go
@@ -52,30 +52,30 @@ func (c *KubernetesSpecification) listReleases(ep *interfaces.ConnectedEndpoint,
 		Result:   nil,
 	}
 
-	log.Warnf("listReleases: START: %s", ep.GUID)
+	log.Debugf("listReleases: START: %s", ep.GUID)
 	client, _, tiller, err := c.GetHelmClient(ep.GUID, ep.Account)
 	if err != nil {
-		log.Warnf("listReleases: CLIENT_ERROR: %s", ep.GUID)
+		log.Debugf("listReleases: CLIENT_ERROR: %s", ep.GUID)
 		done <- response
 		return
 	}
 
 	defer tiller.Close()
 
-	log.Warnf("listReleases: REQUEST: %s", ep.GUID)
+	log.Debugf("listReleases: REQUEST: %s", ep.GUID)
 
 	res, err := client.ListReleases(
 		helm.ReleaseListStatuses(nil),
 	)
 	if err != nil {
-		log.Warnf("listReleases: ERROR: %s", ep.GUID)
+		log.Debugf("listReleases: ERROR: %s", ep.GUID)
 		log.Error(err)
 
 		done <- response
 		return
 	}
 
-	log.Warnf("listReleases: OK: %s", ep.GUID)
+	log.Debugf("listReleases: OK: %s", ep.GUID)
 	response.Result = res
 	done <- response
 }
diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index 26a36b433d..736ddfa35d 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -12,26 +12,22 @@ import (
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/auth"
 )
 
+// KubernetesSpecification is the endpoint that adds Kubernetes support to the backend
 type KubernetesSpecification struct {
 	portalProxy  interfaces.PortalProxy
 	endpointType string
 }
 
-// KubeDashboardPluginConfigSetting is config value send back to the client to indicate if the kube dashboard can be navigated to
-const KubeDashboardPluginConfigSetting = "kubeDashboardEnabled"
-
 const (
-	EndpointType                = "k8s"
-	CLIENT_ID_KEY               = "K8S_CLIENT"
-	AuthConnectTypeKubeConfig   = "KubeConfig"
-	AuthConnectTypeKubeConfigAz = "kubeconfig-az"
-	AuthConnectTypeAWSIAM       = "aws-iam"
-	AuthConnectTypeCertAuth     = "kube-cert-auth"
-	AuthConnectTypeGKE          = "gke-auth"
+	kubeEndpointType    = "k8s"
+	defaultKubeClientID = "K8S_CLIENT"
+
+	// kubeDashboardPluginConfigSetting is config value send back to the client to indicate if the kube dashboard can be navigated to
+	kubeDashboardPluginConfigSetting = "kubeDashboardEnabled"
 )
 
 func Init(portalProxy interfaces.PortalProxy) (interfaces.StratosPlugin, error) {
-	return &KubernetesSpecification{portalProxy: portalProxy, endpointType: EndpointType}, nil
+	return &KubernetesSpecification{portalProxy: portalProxy, endpointType: kubeEndpointType}, nil
 }
 
 func (c *KubernetesSpecification) GetEndpointPlugin() (interfaces.EndpointPlugin, error) {
@@ -47,11 +43,11 @@ func (c *KubernetesSpecification) GetMiddlewarePlugin() (interfaces.MiddlewarePl
 }
 
 func (c *KubernetesSpecification) GetType() string {
-	return EndpointType
+	return kubeEndpointType
 }
 
 func (c *KubernetesSpecification) GetClientId() string {
-	return c.portalProxy.Env().String(CLIENT_ID_KEY, "k8s")
+	return c.portalProxy.Env().String(defaultKubeClientID, "k8s")
 }
 
 func (c *KubernetesSpecification) Register(echoContext echo.Context) error {
@@ -72,7 +68,7 @@ func (c *KubernetesSpecification) Validate(userGUID string, cnsiRecord interface
 	return nil
 }
 
-func (c *KubernetesSpecification) Connect(ec echo.Context, cnsiRecord interfaces.CNSIRecord, userId string) (*interfaces.TokenRecord, bool, error) {
+func (c *KubernetesSpecification) Connect(ec echo.Context, cnsiRecord interfaces.CNSIRecord, userID string) (*interfaces.TokenRecord, bool, error) {
 	log.Debug("Kubernetes Connect...")
 
 	connectType := ec.FormValue("connect_type")
@@ -100,8 +96,8 @@ func (c *KubernetesSpecification) Init() error {
 	c.AddAuthProvider(auth.InitAzureKubeAuth(c.portalProxy))
 	c.AddAuthProvider(auth.InitOIDCKubeAuth(c.portalProxy))
 	c.AddAuthProvider(auth.InitKubeConfigAuth(c.portalProxy))
-	
-	c.portalProxy.GetConfig().PluginConfig[KubeDashboardPluginConfigSetting] = "false"
+
+	c.portalProxy.GetConfig().PluginConfig[kubeDashboardPluginConfigSetting] = "false"
 
 	return nil
 }
@@ -129,7 +125,7 @@ func (c *KubernetesSpecification) Info(apiEndpoint string, skipSSLValidation boo
 	var v2InfoResponse interfaces.V2Info
 	var newCNSI interfaces.CNSIRecord
 
-	newCNSI.CNSIType = EndpointType
+	newCNSI.CNSIType = kubeEndpointType
 
 	_, err := url.Parse(apiEndpoint)
 	if err != nil {
diff --git a/src/jetstream/plugins/monocular/20190307115300_ChartStore.go b/src/jetstream/plugins/monocular/20190307115300_ChartStore.go
index 9eed7d37d7..409fb3691b 100644
--- a/src/jetstream/plugins/monocular/20190307115300_ChartStore.go
+++ b/src/jetstream/plugins/monocular/20190307115300_ChartStore.go
@@ -2,6 +2,7 @@ package monocular
 
 import (
 	"database/sql"
+	"strings"
 
 	"bitbucket.org/liamstask/goose/lib/goose"
 
@@ -31,6 +32,11 @@ func init() {
 			return err
 		}
 
+		binaryDataType := "BYTEA"
+		if strings.Contains(conf.Driver.Name, "mysql") {
+			binaryDataType = "BLOB"
+		}
+
 		createChartFilesTable := "CREATE TABLE IF NOT EXISTS chart_files ("
 		createChartFilesTable += "id                  VARCHAR(255) NOT NULL,"
 		createChartFilesTable += "filename            VARCHAR(64)  NOT NULL,"
@@ -38,7 +44,7 @@ func init() {
 		createChartFilesTable += "name                VARCHAR(255) NOT NULL,"
 		createChartFilesTable += "repo_name           VARCHAR(255) NOT NULL,"
 		createChartFilesTable += "digest              VARCHAR(255) NOT NULL,"
-		createChartFilesTable += "content             BLOB,"
+		createChartFilesTable += "content             " + binaryDataType + ","
 		createChartFilesTable += "PRIMARY KEY (id, filename) );"
 
 		_, err = txn.Exec(createChartFilesTable)
diff --git a/src/jetstream/plugins/monocular/endpoint.go b/src/jetstream/plugins/monocular/endpoint.go
index 66ef809295..8bf5ca906a 100644
--- a/src/jetstream/plugins/monocular/endpoint.go
+++ b/src/jetstream/plugins/monocular/endpoint.go
@@ -10,7 +10,7 @@ import (
 )
 
 func (m *Monocular) GetType() string {
-	return EndpointType
+	return helmEndpointType
 }
 
 func (m *Monocular) GetClientId() string {
@@ -37,7 +37,7 @@ func (m *Monocular) Info(apiEndpoint string, skipSSLValidation bool) (interfaces
 	var v2InfoResponse interfaces.V2Info
 	var newCNSI interfaces.CNSIRecord
 
-	newCNSI.CNSIType = EndpointType
+	newCNSI.CNSIType = helmEndpointType
 
 	_, err := url.Parse(apiEndpoint)
 	if err != nil {
diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index 260c80ff9d..2336033fa0 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -15,7 +15,7 @@ import (
 )
 
 const (
-	EndpointType = "helm"
+	helmEndpointType = "helm"
 )
 
 const prefix = "/pp/v1/chartsvc/"
@@ -70,7 +70,7 @@ func (m *Monocular) syncOnStartup() {
 
 	helmRepos := make([]string, 0)
 	for _, ep := range endpoints {
-		if ep.CNSIType == "helm" {
+		if ep.CNSIType == helmEndpointType {
 			helmRepos = append(helmRepos, ep.Name)
 
 			// Is this an endpoint that we don't have charts for ?
@@ -88,7 +88,7 @@ func (m *Monocular) syncOnStartup() {
 			endpoint := &interfaces.CNSIRecord{
 				GUID:     repo,
 				Name:     repo,
-				CNSIType: "helm",
+				CNSIType: helmEndpointType,
 			}
 			m.Sync(interfaces.EndpointUnregisterAction, endpoint)
 		}
@@ -155,7 +155,7 @@ func (m *Monocular) ConfigureSQL() error {
 }
 
 func (m *Monocular) OnEndpointNotification(action interfaces.EndpointAction, endpoint *interfaces.CNSIRecord) {
-	if endpoint.CNSIType == EndpointType {
+	if endpoint.CNSIType == helmEndpointType {
 		m.Sync(action, endpoint)
 	}
 }
diff --git a/src/jetstream/plugins/monocular/repository.go b/src/jetstream/plugins/monocular/repository.go
index c1d3424fba..3bb93d5f04 100644
--- a/src/jetstream/plugins/monocular/repository.go
+++ b/src/jetstream/plugins/monocular/repository.go
@@ -26,7 +26,7 @@ func (m *Monocular) ListRepos(c echo.Context) error {
 
 	repos := make([]HelmRepoInfo, 0)
 	for _, ep := range endpoints {
-		if ep.CNSIType == EndpointType {
+		if ep.CNSIType == helmEndpointType {
 			// Helm endpoint
 			repo := HelmRepoInfo{
 				ID:   ep.Name,
diff --git a/src/jetstream/plugins/monocular/sync.go b/src/jetstream/plugins/monocular/sync.go
index 29f93525f5..9513c243e4 100644
--- a/src/jetstream/plugins/monocular/sync.go
+++ b/src/jetstream/plugins/monocular/sync.go
@@ -2,6 +2,7 @@ package monocular
 
 import (
 	"encoding/json"
+
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	"github.com/helm/monocular/chartrepo"
 	log "github.com/sirupsen/logrus"
@@ -20,10 +21,12 @@ type SyncMetadata struct {
 // Sync Chanel
 var syncChan = make(chan SyncJob, 100)
 
+// InitSync starts the go routine that will sync repositories in the background
 func (m *Monocular) InitSync() {
 	go m.processSyncRequests()
 }
 
+// Sync shceudles a sync action for the given endpoint
 func (m *Monocular) Sync(action interfaces.EndpointAction, endpoint *interfaces.CNSIRecord) {
 
 	job := SyncJob{
@@ -31,19 +34,17 @@ func (m *Monocular) Sync(action interfaces.EndpointAction, endpoint *interfaces.
 		Endpoint: endpoint,
 	}
 
-	log.Warn("Scheduling Sync job")
 	syncChan <- job
 }
 
 func (m *Monocular) processSyncRequests() {
 	log.Info("Helm Repository Sync init")
 	for job := range syncChan {
-		log.Info("Processing Job")
-		log.Info(job.Endpoint.Name)
+		log.Debugf("Processing Helm Repository Sync Job: %s", job.Endpoint.Name)
 
 		// Could be delete or sync
 		if job.Action == 0 {
-			log.Info("Syncing new repository")
+			log.Debug("Syncing new repository")
 			metadata := SyncMetadata{
 				Status: "Synchronizing",
 				Busy:   true,
@@ -66,7 +67,7 @@ func (m *Monocular) processSyncRequests() {
 		}
 	}
 
-	log.Info("processSyncRequests finished")
+	log.Debug("processSyncRequests finished")
 }
 
 func marshalSyncMetadata(metadata SyncMetadata) string {

From 9c9722d7efca8592cfaa5df1a758488b78c92131 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 17 May 2019 15:29:37 +0100
Subject: [PATCH 041/648] Fix helm sql datastore to return values.yaml

---
 .../plugins/monocular/chartsvc/datastore.go   |  1 +
 .../plugins/monocular/chartsvc/handler.go     | 20 +++++++++++--------
 .../plugins/monocular/chartsvc/mongodb.go     |  6 ++++++
 .../plugins/monocular/sql_datastore.go        | 11 ++++++++++
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/jetstream/plugins/monocular/chartsvc/datastore.go b/src/jetstream/plugins/monocular/chartsvc/datastore.go
index 98e0306e71..63cb377fe5 100644
--- a/src/jetstream/plugins/monocular/chartsvc/datastore.go
+++ b/src/jetstream/plugins/monocular/chartsvc/datastore.go
@@ -12,4 +12,5 @@ type ChartSvcDatastore interface {
 	GetChartVersion(chartID, version string) (models.Chart, error)
 	GetChartIcon(chartID string) ([]byte, error)
 	GetChartVersionReadme(chartID, version string) ([]byte, error)
+	GetChartVersionValuesYaml(chartID, version string) ([]byte, error)
 }
diff --git a/src/jetstream/plugins/monocular/chartsvc/handler.go b/src/jetstream/plugins/monocular/chartsvc/handler.go
index 96ce07bf2e..402bd12588 100644
--- a/src/jetstream/plugins/monocular/chartsvc/handler.go
+++ b/src/jetstream/plugins/monocular/chartsvc/handler.go
@@ -173,17 +173,21 @@ func getChartVersionReadme(w http.ResponseWriter, req *http.Request, params Para
 
 // getChartVersionValues returns the values.yaml for a given chart
 func getChartVersionValues(w http.ResponseWriter, req *http.Request, params Params) {
-	db, closer := dbSession.DB()
-	defer closer()
-	var files models.ChartFiles
-	fileID := fmt.Sprintf("%s/%s-%s", params["repo"], params["chartName"], params["version"])
-	if err := db.C(filesCollection).FindId(fileID).One(&files); err != nil {
-		log.WithError(err).Errorf("could not find values.yaml with id %s", fileID)
+	chartID := fmt.Sprintf("%s/%s", params["repo"], params["chartName"])
+	version := params["version"]
+	fileID := fmt.Sprintf("%s-%s", chartID, version)
+	values, err := dataStore.GetChartVersionValuesYaml(chartID, version)
+	if err != nil {
+		log.WithError(err).Errorf("could not find files with id %s", fileID)
 		http.NotFound(w, req)
 		return
 	}
-
-	w.Write([]byte(files.Values))
+	if len(values) == 0 {
+		log.Errorf("could not find a values.yaml for id %s", fileID)
+		http.NotFound(w, req)
+		return
+	}
+	w.Write(values)
 }
 
 // listChartsWithFilters returns the list of repos that contains the given chart and the latest version found
diff --git a/src/jetstream/plugins/monocular/chartsvc/mongodb.go b/src/jetstream/plugins/monocular/chartsvc/mongodb.go
index bcb0aac1d9..b9b2f70388 100644
--- a/src/jetstream/plugins/monocular/chartsvc/mongodb.go
+++ b/src/jetstream/plugins/monocular/chartsvc/mongodb.go
@@ -2,7 +2,9 @@ package chartsvc
 
 import (
 	//"bytes"
+	"errors"
 	"fmt"
+
 	"github.com/globalsign/mgo/bson"
 	"github.com/helm/monocular/chartsvc/models"
 	"github.com/kubeapps/common/datastore"
@@ -86,3 +88,7 @@ func (m *MongoDBChartSvcDatastore) GetChartVersionReadme(chartID, version string
 	readme := []byte(files.Readme)
 	return readme, nil
 }
+
+func (m *MongoDBChartSvcDatastore) GetChartVersionValuesYaml(chartID, version string) ([]byte, error) {
+	return nil, errors.New("Not implemented")
+}
diff --git a/src/jetstream/plugins/monocular/sql_datastore.go b/src/jetstream/plugins/monocular/sql_datastore.go
index ccb09dc339..9fdf161069 100644
--- a/src/jetstream/plugins/monocular/sql_datastore.go
+++ b/src/jetstream/plugins/monocular/sql_datastore.go
@@ -322,6 +322,17 @@ func (s *SQLDBCMonocularDatastore) GetChartVersionReadme(chartID, version string
 	return content, nil
 }
 
+func (s *SQLDBCMonocularDatastore) GetChartVersionValuesYaml(chartID, version string) ([]byte, error) {
+	var content []byte
+	fileID := fmt.Sprintf("%s-%s", chartID, version)
+	err := s.db.QueryRow(getChartFileByID, fileID, "values").Scan(&content)
+	if err != nil {
+		return nil, fmt.Errorf("Unable to scan chart file record: %v", err)
+	}
+
+	return content, nil
+}
+
 // ListRepositories gets all repository names
 func (s *SQLDBCMonocularDatastore) ListRepositories() ([]string, error) {
 	rows, err := s.db.Query(getRepositories)

From 764bd8627a086e30922926963a869b385f43d4ad Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 17 May 2019 16:33:11 +0100
Subject: [PATCH 042/648] Minor bug fixes and improvements

---
 .../create-release.component.html             | 14 +++--
 .../create-release.component.scss             | 28 ++++++++-
 .../create-release.component.ts               | 63 +++++++++++++++++--
 .../chart-details-readme.component.ts         |  6 +-
 .../chart-details.component.html              |  2 +-
 5 files changed, 97 insertions(+), 16 deletions(-)

diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.html b/custom-src/frontend/app/custom/helm/create-release/create-release.component.html
index c4c3d50c9f..7171022700 100644
--- a/custom-src/frontend/app/custom/helm/create-release/create-release.component.html
+++ b/custom-src/frontend/app/custom/helm/create-release/create-release.component.html
@@ -15,7 +15,7 @@
       <br>
       <b>Specify name and namespace for the installation</b>
       <mat-form-field>
-        <input matInput placeholder="Name" name="releaseName" formControlName="releaseName" autocomplete="off">
+        <input #releaseNameInputField matInput placeholder="Name" name="releaseName" formControlName="releaseName" autocomplete="off">
       </mat-form-field>
 
       <mat-form-field>
@@ -25,12 +25,14 @@
     </form>
   </app-step>
   <app-step [title]="'Overrides'" [onNext]="submit" [finishButtonText]="'Install'" [onEnter]="onEnterOverrides">
-    <form [formGroup]="overrides" class="stepper-form">
-      <h3 class="helm-create-release">Enter YAML Value Overrides</h3>
-      <mat-form-field [floatLabel]="'always'">
+    <form [formGroup]="overrides" class="stepper-form overrides_form">
+      <div class="helm-create-release__heading">
+        <h3 class="helm-create-release__title">Enter YAML Value Overrides</h3>
+        <button (click)="useValuesYaml()" [disabled]="!valuesYaml" class="helm-create-release__button" mat-button color="primary">Copy from values.yaml</button>
+      </div>
+      <mat-form-field [floatLabel]="'always'" class="overrides_form-field">
         <mat-label>Values</mat-label>
-        <textarea #overridesYamlTextArea class="overrides__yaml" matInput formControlName="values" name="Values"
-          [matTextareaAutosize]="true" cdkAutosizeMinRows="6" cdkAutosizeMaxRows="8"></textarea>
+        <textarea #overridesYamlTextArea class="overrides__yaml" matInput formControlName="values" name="Values"  spellcheck="false"></textarea>
       </mat-form-field>
     </form>
   </app-step>
diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.scss b/custom-src/frontend/app/custom/helm/create-release/create-release.component.scss
index b1b37d0268..03ca214f4e 100644
--- a/custom-src/frontend/app/custom/helm/create-release/create-release.component.scss
+++ b/custom-src/frontend/app/custom/helm/create-release/create-release.component.scss
@@ -3,7 +3,18 @@
 }
 
 .helm-create-release {
-  font-size: 14px;
+  &__heading {
+    align-items: center;
+    display: flex;
+  }
+
+  &__title {
+    flex: 1;
+    font-size: 14px;
+  }
+  &__button {
+    height: 36px;
+  }
 }
 
 form {
@@ -14,5 +25,20 @@ form {
   &__yaml {
     background-color: rgba(0, 0, 0, .1);
     font-family: 'Source Code Pro', monospace;
+    height: 400px;
+  }
+
+  &_form {
+    max-width: 100%;
+  }
+
+  &_form-field {
+    flex: 1;
+    height: 100%;
+    width: 100%;
   }
 }
+
+form.overrides_form {
+  max-width: 100%;
+}
\ No newline at end of file
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 d4c84f53d1..ba1999cdef 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,11 +1,11 @@
 import { HttpClient } from '@angular/common/http';
-import { Component, ElementRef, ViewChild } from '@angular/core';
+import { Component, ElementRef, ViewChild, OnInit } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { MatTextareaAutosize } from '@angular/material';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { Observable, of, Subscription } from 'rxjs';
-import { delay, filter, map, pairwise, switchMap } from 'rxjs/operators';
+import { delay, filter, map, pairwise, switchMap, first, tap } from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
 import { selectUpdateInfo } from '../../../../../store/src/selectors/api.selectors';
@@ -14,13 +14,22 @@ import { StepOnNextFunction } from '../../../shared/components/stepper/step/step
 import { HelmInstall } from '../store/helm.actions';
 import { helmReleaseSchemaKey } from '../store/helm.entities';
 import { HELM_INSTALLING_KEY, HelmInstallValues } from '../store/helm.types';
+import { ConfirmationDialogConfig } from '../../../shared/components/confirmation-dialog.config';
+import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service';
 
 @Component({
   selector: 'app-create-release',
   templateUrl: './create-release.component.html',
   styleUrls: ['./create-release.component.scss'],
 })
-export class CreateReleaseComponent {
+export class CreateReleaseComponent implements OnInit {
+
+  // Confirmation dialog
+  overwriteValuesConfirmation = new ConfirmationDialogConfig(
+    'Overwrite Values?',
+    'Are you sure you want to replace your values with those from valuyes.yaml?',
+    'Overwrite'
+  );
 
   // isLoading$ = observableOf(false);
   paginationStateSub: Subscription;
@@ -32,14 +41,18 @@ export class CreateReleaseComponent {
   details: FormGroup;
   overrides: FormGroup;
 
+  @ViewChild('releaseNameInputField') releaseNameInputField: ElementRef;
   @ViewChild('overridesYamlTextArea') overridesYamlTextArea: ElementRef;
   @ViewChild(MatTextareaAutosize) overridesYamlAutosize: MatTextareaAutosize;
 
+  private valuesYaml = '';
+
   constructor(
     private route: ActivatedRoute,
     public endpointsService: EndpointsService,
     private store: Store<AppState>,
-    private httpClient: HttpClient
+    private httpClient: HttpClient,
+    private confirmDialog: ConfirmationDialogService,
   ) {
     const chart = this.route.snapshot.params;
     this.cancelUrl = `/monocular/charts/${chart.repo}/${chart.chartName}/${chart.version}`;
@@ -59,11 +72,51 @@ export class CreateReleaseComponent {
     this.validate$ = this.details.statusChanges.pipe(
       map(() => this.details.valid)
     );
+
+    // Fetch the values.yaml for the Chart
+    const valuesYamlUrl = `/pp/v1/chartsvc/v1/assets/${chart.repo}/${chart.chartName}/versions/${chart.version}/values.yaml`;
+
+    this.httpClient.get(valuesYamlUrl, { responseType: 'text' }).subscribe(response => {
+      this.valuesYaml = response;
+    });
+  }
+
+  public useValuesYaml() {
+
+
+    if (this.overrides.value.values.length !== 0) {
+      this.confirmDialog.open(this.overwriteValuesConfirmation, () => {
+        this.replaceWithValuesYaml();
+      });
+
+    } else {
+      this.replaceWithValuesYaml();
+    }
+  }
+
+  private replaceWithValuesYaml() {
+    this.overrides.controls.values.setValue(this.valuesYaml, {onlySelf: true});
+  }
+
+  ngOnInit() {
+    // Auto select endpoint if there is only one
+    this.kubeEndpoints$.pipe(
+      first(),
+      tap(ep => {
+        console.log(ep);
+        if (ep.length === 1) {
+          this.details.controls.endpoint.setValue(ep[0].guid, {onlySelf: true});
+          setTimeout(() => {
+            this.releaseNameInputField.nativeElement.focus();
+          }, 1);
+        }
+      })
+    ).subscribe();
   }
 
   onEnterOverrides = () => {
     setTimeout(() => {
-      this.overridesYamlAutosize.resizeToFitContent(true);
+      // this.overridesYamlAutosize.resizeToFitContent(true);
       this.overridesYamlTextArea.nativeElement.focus();
     }, 1);
   }
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts
index a323bef157..eb62b9eff1 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 import * as markdown from 'marked';
-import { Observable } from 'rxjs';
+import { Observable, of as observableOf } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 
 import { ChartVersion } from '../../shared/models/chart-version';
@@ -40,9 +40,9 @@ export class ChartDetailsReadmeComponent {
       catchError((error) => {
         this.loading = false;
         if (error.status === 404) {
-          return '<h1>No Readme available for this chart</h1>';
+          return observableOf('<h1>No Readme available for this chart</h1>');
         } else {
-          return '<h1>An error occurred retrieving Readme</h1>';
+          return observableOf('<h1>An error occurred retrieving Readme</h1>');
         }
       }));
   }
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.html b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.html
index 77c63c4118..499d896079 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.html
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.html
@@ -5,7 +5,7 @@ <h2>Sorry, we couldn't find the chart</h2>
   <app-loader [loading]="loading">
     <div class="chart-details__wrapper">
       <app-entity-summary-title class="summary-title" *ngIf="chart" [title]="chart.attributes.name"
-        subTitle="{{ chart.attributes.repo.name }} {{ chart.attributes.repo.name }}"
+        subTitle="{{ chart.attributes.repo.name }}"
         [subText]="chart.attributes.description" [inlineImagePath]="iconUrl">
         <div class="chart-details__content">
           <article class="chart-details__content__docs">

From ad64cc3365581e9b79f8ecf39ecd2de32dc7853a Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Mon, 20 May 2019 15:46:09 +0100
Subject: [PATCH 043/648] Fix OIDC Token refresh

---
 src/jetstream/auth_providers.go                  |  6 ++++++
 src/jetstream/main.go                            |  2 +-
 src/jetstream/oidc_requests.go                   |  6 +++---
 src/jetstream/passthrough.go                     |  2 +-
 src/jetstream/plugins/kubernetes/auth/awsiam.go  |  8 ++++++++
 src/jetstream/plugins/kubernetes/auth/azure.go   | 10 ++++++++++
 src/jetstream/plugins/kubernetes/auth/cert.go    |  8 ++++++++
 src/jetstream/plugins/kubernetes/auth/gke.go     |  8 ++++++++
 .../plugins/kubernetes/auth/kubeconfig.go        | 10 +++++++++-
 src/jetstream/plugins/kubernetes/auth/oidc.go    | 16 +++++++++++++++-
 src/jetstream/plugins/kubernetes/auth/types.go   |  5 +++++
 .../plugins/kubernetes/auth_providers.go         |  9 ++-------
 .../repository/interfaces/portal_proxy.go        |  7 ++++---
 src/jetstream/repository/interfaces/structs.go   |  4 +---
 14 files changed, 81 insertions(+), 20 deletions(-)

diff --git a/src/jetstream/auth_providers.go b/src/jetstream/auth_providers.go
index 77a33e30b1..83de6a3ce8 100644
--- a/src/jetstream/auth_providers.go
+++ b/src/jetstream/auth_providers.go
@@ -13,3 +13,9 @@ func (p *portalProxy) AddAuthProvider(name string, provider interfaces.AuthProvi
 func (p *portalProxy) GetAuthProvider(name string) interfaces.AuthProvider {
 	return p.AuthProviders[name]
 }
+
+func (p *portalProxy) HasAuthProvider(name string) bool {
+	_, ok := p.AuthProviders[name]
+	return ok
+}
+
diff --git a/src/jetstream/main.go b/src/jetstream/main.go
index 47bd7dccb6..f31b701aef 100644
--- a/src/jetstream/main.go
+++ b/src/jetstream/main.go
@@ -586,7 +586,7 @@ func newPortalProxy(pc interfaces.PortalConfig, dcp *sql.DB, ss HttpSessionStore
 
 	// OIDC
 	pp.AddAuthProvider(interfaces.AuthTypeOIDC, interfaces.AuthProvider{
-		Handler: pp.doOidcFlowRequest,
+		Handler: pp.DoOidcFlowRequest,
 	})
 
 	return pp
diff --git a/src/jetstream/oidc_requests.go b/src/jetstream/oidc_requests.go
index cff3a76a80..67615548a7 100644
--- a/src/jetstream/oidc_requests.go
+++ b/src/jetstream/oidc_requests.go
@@ -9,15 +9,15 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-func (p *portalProxy) doOidcFlowRequest(cnsiRequest *interfaces.CNSIRequest, req *http.Request) (*http.Response, error) {
-	log.Debug("doOidcFlowRequest")
+func (p *portalProxy) DoOidcFlowRequest(cnsiRequest *interfaces.CNSIRequest, req *http.Request) (*http.Response, error) {
+	log.Debug("DoOidcFlowRequest")
 
 	authHandler := p.OAuthHandlerFunc(cnsiRequest, req, p.RefreshOidcToken)
 	return p.DoAuthFlowRequest(cnsiRequest, req, authHandler)
 }
 
 func (p *portalProxy) RefreshOidcToken(skipSSLValidation bool, cnsiGUID, userGUID, client, clientSecret, tokenEndpoint string) (t interfaces.TokenRecord, err error) {
-	log.Debug("refreshToken")
+	log.Debug("RefreshOidcToken")
 	userToken, ok := p.GetCNSITokenRecordWithDisconnected(cnsiGUID, userGUID)
 	if !ok {
 		return t, fmt.Errorf("Info could not be found for user with GUID %s", userGUID)
diff --git a/src/jetstream/passthrough.go b/src/jetstream/passthrough.go
index 604e034989..ea6499475f 100644
--- a/src/jetstream/passthrough.go
+++ b/src/jetstream/passthrough.go
@@ -398,7 +398,7 @@ func (p *portalProxy) doRequest(cnsiRequest *interfaces.CNSIRequest, done chan<-
 	// Copy original headers through, except custom portal-proxy Headers
 	fwdCNSIStandardHeaders(cnsiRequest, req)
 
-	// Find the auth provider for the auth type - default ot oauthflow
+	// Find the auth provider for the auth type - default to oauthflow
 	authHandler := p.GetAuthProvider(tokenRec.AuthType)
 	if authHandler.Handler != nil {
 		res, err = authHandler.Handler(cnsiRequest, req)
diff --git a/src/jetstream/plugins/kubernetes/auth/awsiam.go b/src/jetstream/plugins/kubernetes/auth/awsiam.go
index 5bdc813264..8ff7f6f862 100644
--- a/src/jetstream/plugins/kubernetes/auth/awsiam.go
+++ b/src/jetstream/plugins/kubernetes/auth/awsiam.go
@@ -143,6 +143,14 @@ func (c *AWSKubeAuth) getTokenIAM(info AWSIAMUserInfo) (string, error) {
 	return tok.Token, nil
 }
 
+func (c *AWSKubeAuth) RegisterJetstreamAuthType(portal interfaces.PortalProxy) {
+		// Register auth type with Jetstream
+		c.portalProxy.AddAuthProvider(c.GetName(), interfaces.AuthProvider{
+			Handler:  c.DoFlowRequest,
+			UserInfo: c.GetUserFromToken,
+		})
+}
+
 func (c *AWSKubeAuth) DoFlowRequest(cnsiRequest *interfaces.CNSIRequest, req *http.Request) (*http.Response, error) {
 	log.Debug("doAWSIAMFlowRequest")
 
diff --git a/src/jetstream/plugins/kubernetes/auth/azure.go b/src/jetstream/plugins/kubernetes/auth/azure.go
index 0447b2e528..88f239d1f4 100644
--- a/src/jetstream/plugins/kubernetes/auth/azure.go
+++ b/src/jetstream/plugins/kubernetes/auth/azure.go
@@ -98,3 +98,13 @@ func isAKSAuth(k *config.KubeConfigUser) bool {
 	}
 	return true
 }
+
+
+func (c *AzureKubeAuth) RegisterJetstreamAuthType(portal interfaces.PortalProxy) {
+	// Register auth type with Jetstream
+	c.portalProxy.AddAuthProvider(c.GetName(), interfaces.AuthProvider{
+		Handler:  c.DoFlowRequest,
+		UserInfo: c.GetUserFromToken,
+	})
+}
+
diff --git a/src/jetstream/plugins/kubernetes/auth/cert.go b/src/jetstream/plugins/kubernetes/auth/cert.go
index 517ef8a780..9a067a755d 100644
--- a/src/jetstream/plugins/kubernetes/auth/cert.go
+++ b/src/jetstream/plugins/kubernetes/auth/cert.go
@@ -175,3 +175,11 @@ func (c *CertKubeAuth) RefreshCertAuth(skipSSLValidation bool, cnsiGUID, userGUI
 
 	return userToken, nil
 }
+
+func (c *CertKubeAuth) RegisterJetstreamAuthType(portal interfaces.PortalProxy) {
+	// Register auth type with Jetstream
+	c.portalProxy.AddAuthProvider(c.GetName(), interfaces.AuthProvider{
+		Handler:  c.DoFlowRequest,
+		UserInfo: c.GetUserFromToken,
+	})
+}
diff --git a/src/jetstream/plugins/kubernetes/auth/gke.go b/src/jetstream/plugins/kubernetes/auth/gke.go
index 9a1193d4ad..a05a794365 100644
--- a/src/jetstream/plugins/kubernetes/auth/gke.go
+++ b/src/jetstream/plugins/kubernetes/auth/gke.go
@@ -193,3 +193,11 @@ func (c *GKEKubeAuth) refreshGKEToken(skipSSLValidation bool, clientID, clientSe
 	err = json.Unmarshal(respBody, &tokenInfo)
 	return tokenInfo, err
 }
+
+func (c *GKEKubeAuth) RegisterJetstreamAuthType(portal interfaces.PortalProxy) {
+	// Register auth type with Jetstream
+	c.portalProxy.AddAuthProvider(c.GetName(), interfaces.AuthProvider{
+		Handler:  c.DoFlowRequest,
+		UserInfo: c.GetUserFromToken,
+	})
+}
diff --git a/src/jetstream/plugins/kubernetes/auth/kubeconfig.go b/src/jetstream/plugins/kubernetes/auth/kubeconfig.go
index 085a9d82ac..0af53ac0b5 100644
--- a/src/jetstream/plugins/kubernetes/auth/kubeconfig.go
+++ b/src/jetstream/plugins/kubernetes/auth/kubeconfig.go
@@ -4,7 +4,7 @@ import (
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 )
 
-const AuthConnectTypeKubeConfig   = "KubeConfig"
+const AuthConnectTypeKubeConfig = "KubeConfig"
 
 // KubeConfigAuth is same as OIDC with different name
 type KubeConfigAuth struct {
@@ -19,3 +19,11 @@ func InitKubeConfigAuth(portalProxy interfaces.PortalProxy) KubeAuthProvider {
 func (c *KubeConfigAuth) GetName() string {
 	return AuthConnectTypeKubeConfig
 }
+
+func (c *KubeConfigAuth) RegisterJetstreamAuthType(portal interfaces.PortalProxy) {
+	// Register auth type with Jetstream
+	c.portalProxy.AddAuthProvider(c.GetName(), interfaces.AuthProvider{
+		Handler:  c.portalProxy.DoOidcFlowRequest,
+		UserInfo: nil,
+	})
+}
diff --git a/src/jetstream/plugins/kubernetes/auth/oidc.go b/src/jetstream/plugins/kubernetes/auth/oidc.go
index 199deee5ca..c61dd0ae16 100644
--- a/src/jetstream/plugins/kubernetes/auth/oidc.go
+++ b/src/jetstream/plugins/kubernetes/auth/oidc.go
@@ -151,5 +151,19 @@ func (c *OIDCKubeAuth) GetOIDCConfig(k *config.KubeConfigUser) (*KubeConfigAuthP
 
 func (c *OIDCKubeAuth) DoFlowRequest(cnsiRequest *interfaces.CNSIRequest, req *http.Request) (*http.Response, error) {
 	log.Debug("DoFlowRequest (OIDC)")
-	return c.portalProxy.DoOAuthFlowRequest(cnsiRequest, req)
+	return c.portalProxy.DoOidcFlowRequest(cnsiRequest, req)
+}
+
+func (c *OIDCKubeAuth) RegisterJetstreamAuthType(portal interfaces.PortalProxy) {
+	// No need to register OIDC, as its already built in
+	existing := c.portalProxy.HasAuthProvider(c.GetName())
+	if existing {
+		log.Errorf("Auth Provider: %s already registered", c.GetName())
+	} else {
+		// Register auth type with Jetstream
+		c.portalProxy.AddAuthProvider(c.GetName(), interfaces.AuthProvider{
+			Handler:  c.portalProxy.DoOidcFlowRequest,
+			UserInfo: nil,
+		})
+	}
 }
diff --git a/src/jetstream/plugins/kubernetes/auth/types.go b/src/jetstream/plugins/kubernetes/auth/types.go
index 9a32914bc9..e459d270c4 100644
--- a/src/jetstream/plugins/kubernetes/auth/types.go
+++ b/src/jetstream/plugins/kubernetes/auth/types.go
@@ -17,6 +17,11 @@ type KubeAuthProvider interface {
 	AddAuthInfo(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error
 	FetchToken(cnsiRecord interfaces.CNSIRecord, ec echo.Context) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error)
 
+	RegisterJetstreamAuthType(portal interfaces.PortalProxy)
+}
+
+// KubeJetstreamAuthProvider is the optional interface that can be implemented if you want to control Jetstream Auth Registration
+type KubeJetstreamAuthProvider interface {
 	DoFlowRequest(cnsiRequest *interfaces.CNSIRequest, req *http.Request) (*http.Response, error)
 	GetUserFromToken(cnsiGUID string, tokenRecord *interfaces.TokenRecord) (*interfaces.ConnectedUser, bool)
 }
diff --git a/src/jetstream/plugins/kubernetes/auth_providers.go b/src/jetstream/plugins/kubernetes/auth_providers.go
index dcd73d2ca3..eaaf6c8a83 100644
--- a/src/jetstream/plugins/kubernetes/auth_providers.go
+++ b/src/jetstream/plugins/kubernetes/auth_providers.go
@@ -4,7 +4,6 @@ import (
 	"strings"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/auth"
-	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 )
 
 var kubeAuthProviders map[string]auth.KubeAuthProvider
@@ -22,12 +21,8 @@ func (c *KubernetesSpecification) AddAuthProvider(provider auth.KubeAuthProvider
 
 	kubeAuthProviders[name] = provider
 
-	// Register auth type with Jetstream
-	c.portalProxy.AddAuthProvider(name, interfaces.AuthProvider{
-		Handler:  provider.DoFlowRequest,
-		UserInfo: provider.GetUserFromToken,
-	})
-
+	// Get the auth provider to register itself with Stratos, if needed
+	provider.RegisterJetstreamAuthType(c.portalProxy)
 }
 
 // GetAuthProvider gets a Kubernetes auth provider by key
diff --git a/src/jetstream/repository/interfaces/portal_proxy.go b/src/jetstream/repository/interfaces/portal_proxy.go
index f8ce8d86b4..9815f8f610 100644
--- a/src/jetstream/repository/interfaces/portal_proxy.go
+++ b/src/jetstream/repository/interfaces/portal_proxy.go
@@ -56,7 +56,7 @@ type PortalProxy interface {
 	RefreshUAALogin(username, password string, store bool) error
 	GetUserTokenInfo(tok string) (u *JWTUserTokenInfo, err error)
 	GetUAAUser(userGUID string) (*ConnectedUser, error)
-	
+
 	// Proxy API requests
 	ProxyRequest(c echo.Context, uri *url.URL) (map[string]*CNSIRequest, error)
 	DoProxyRequest(requests []ProxyRequestInfo) (map[string]*CNSIRequest, error)
@@ -68,9 +68,11 @@ type PortalProxy interface {
 
 	AddAuthProvider(name string, provider AuthProvider)
 	GetAuthProvider(name string) AuthProvider
+	HasAuthProvider(name string) bool
 	DoAuthFlowRequest(cnsiRequest *CNSIRequest, req *http.Request, authHandler AuthHandlerFunc) (*http.Response, error)
 	OAuthHandlerFunc(cnsiRequest *CNSIRequest, req *http.Request, refreshOAuthTokenFunc RefreshOAuthTokenFunc) AuthHandlerFunc
 	DoOAuthFlowRequest(cnsiRequest *CNSIRequest, req *http.Request) (*http.Response, error)
+	DoOidcFlowRequest(cnsiRequest *CNSIRequest, req *http.Request) (*http.Response, error)
 	GetCNSIUserFromOAuthToken(cnsiGUID string, cfTokenRecord *TokenRecord) (*ConnectedUser, bool)
 
 	// Tokens - lower-level access
@@ -79,8 +81,7 @@ type PortalProxy interface {
 
 	AddLoginHook(priority int, function LoginHookFunc) error
 	ExecuteLoginHooks(c echo.Context) error
-	
+
 	// Plugins
 	GetPlugin(name string) interface{}
-	
 }
diff --git a/src/jetstream/repository/interfaces/structs.go b/src/jetstream/repository/interfaces/structs.go
index c3ba4fecfb..65783024e5 100644
--- a/src/jetstream/repository/interfaces/structs.go
+++ b/src/jetstream/repository/interfaces/structs.go
@@ -67,12 +67,10 @@ type ConnectedEndpoint struct {
 const (
 	// AuthTypeOAuth2 means OAuth2
 	AuthTypeOAuth2 = "OAuth2"
-	// AuthTypeOIDC means no OIDC
+	// AuthTypeOIDC means OIDC
 	AuthTypeOIDC = "OIDC"
 	// AuthTypeHttpBasic means HTTP Basic auth
 	AuthTypeHttpBasic = "HttpBasic"
-	// AuthTypeAKS means AKS
-	AuthTypeAKS = "AKS"
 )
 
 const (

From 8d256ce36d5226ff791c8cd58aa2fb9983589b9b Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Mon, 20 May 2019 15:48:56 +0100
Subject: [PATCH 044/648] Fix logging msg

---
 src/jetstream/plugins/kubernetes/auth/oidc.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/auth/oidc.go b/src/jetstream/plugins/kubernetes/auth/oidc.go
index c61dd0ae16..70518c16b0 100644
--- a/src/jetstream/plugins/kubernetes/auth/oidc.go
+++ b/src/jetstream/plugins/kubernetes/auth/oidc.go
@@ -157,9 +157,7 @@ func (c *OIDCKubeAuth) DoFlowRequest(cnsiRequest *interfaces.CNSIRequest, req *h
 func (c *OIDCKubeAuth) RegisterJetstreamAuthType(portal interfaces.PortalProxy) {
 	// No need to register OIDC, as its already built in
 	existing := c.portalProxy.HasAuthProvider(c.GetName())
-	if existing {
-		log.Errorf("Auth Provider: %s already registered", c.GetName())
-	} else {
+	if !existing {
 		// Register auth type with Jetstream
 		c.portalProxy.AddAuthProvider(c.GetName(), interfaces.AuthProvider{
 			Handler:  c.portalProxy.DoOidcFlowRequest,

From 27e508223a56a8dafbd431900b2651e525df3be5 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Thu, 6 Jun 2019 13:33:31 +0100
Subject: [PATCH 045/648] Add product version metadata (used in Helm Chart)

---
 custom-src/stratos.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/custom-src/stratos.yaml b/custom-src/stratos.yaml
index 7bd90a7fce..91aded8cec 100644
--- a/custom-src/stratos.yaml
+++ b/custom-src/stratos.yaml
@@ -1 +1,2 @@
-title: SUSE CAP
\ No newline at end of file
+title: SUSE CAP
+productVersion: 1.4

From b795ca8443c8784312e939a8967933df4c5a4b6f Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 15 Jul 2019 14:45:47 +0100
Subject: [PATCH 046/648] Cloud Console WIP

---
 .../kube-console/kube-console.component.html  |  18 +
 .../kube-console/kube-console.component.scss  |   0
 .../kube-console.component.spec.ts            |  41 ++
 .../kube-console/kube-console.component.ts    | 125 ++++
 .../custom/kubernetes/kubernetes.module.ts    |   4 +-
 .../custom/kubernetes/kubernetes.routing.ts   |   8 +
 .../kubernetes-summary.component.html         |   4 +
 .../kubernetes-summary.component.ts           |   3 +
 deploy/Dockerfile.kubeconsole.yml             |  18 +
 deploy/ci/build-aio-image-canary.yml          |   1 +
 deploy/kubeconsole.bashrc                     |  42 ++
 .../ssh-viewer/ssh-viewer.component.html      |   9 +-
 .../ssh-viewer/ssh-viewer.component.scss      |   2 +
 .../ssh-viewer/ssh-viewer.component.ts        |  25 +-
 .../plugins/kubernetes/endpoint_config.go     |  68 ++
 src/jetstream/plugins/kubernetes/go.mod       |   1 +
 src/jetstream/plugins/kubernetes/go.sum       |   4 +-
 .../plugins/kubernetes/kube_console.go        | 582 ++++++++++++++++++
 src/jetstream/plugins/kubernetes/main.go      |   3 +
 19 files changed, 952 insertions(+), 6 deletions(-)
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.html
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.scss
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts
 create mode 100644 deploy/Dockerfile.kubeconsole.yml
 create mode 100644 deploy/kubeconsole.bashrc
 create mode 100644 src/jetstream/plugins/kubernetes/kube_console.go

diff --git a/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.html b/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.html
new file mode 100644
index 0000000000..e8cfda74c0
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.html
@@ -0,0 +1,18 @@
+<app-page-header [breadcrumbs]="breadcrumbs$ | async">
+  <h1>Kubernetes Console</h1>
+  <div class="page-header-right">
+    <span>
+      <button mat-icon-button matTooltip="Disconnect" name="stop" *ngIf="sshViewer.isConnected" (click)="sshViewer.disconnect()" [disabled]="sshViewer.attemptingConnection">
+        <mat-icon>stop</mat-icon>
+      </button>
+      <button mat-icon-button matTooltip="Connect" name="start" *ngIf="!sshViewer.isConnected" (click)="sshViewer.reconnect()" [disabled]="sshViewer.attemptingConnection">
+        <mat-icon>play_arrow</mat-icon>
+      </button>
+      <button mat-icon-button matTooltip="Back" [routerLink]="kubeSummaryLink">
+        <mat-icon>close</mat-icon>
+      </button>
+    </span>
+  </div>
+</app-page-header>
+
+<app-ssh-viewer #sshViewer [errorMessage]="errorMessage" [sshStream]="messages" [sshInput]="sshInput" [connectionStatus]="connectionStatus"></app-ssh-viewer>
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.scss b/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.spec.ts
new file mode 100644
index 0000000000..030ec22e95
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.spec.ts
@@ -0,0 +1,41 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+
+import { TabNavService } from '../../../../tab-nav.service';
+import { ApplicationServiceMock } from '../../../../test-framework/application-service-helper';
+import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
+import { CoreModule } from '../../../core/core.module';
+import { SharedModule } from '../../../shared/shared.module';
+import { KubeConsoleComponent } from './kube-console.component';
+
+describe('KubeConsoleComponent', () => {
+  let component: KubeConsoleComponent;
+  let fixture: ComponentFixture<KubeConsoleComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [KubeConsoleComponent],
+      imports: [
+        CoreModule,
+        SharedModule,
+        RouterTestingModule,
+        createBasicStoreModule()
+      ],
+      providers: [
+        { provide: ApplicationService, useClass: ApplicationServiceMock },
+        TabNavService
+      ],
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubeConsoleComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts b/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts
new file mode 100644
index 0000000000..32481eb139
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts
@@ -0,0 +1,125 @@
+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 websocketConnect from 'rxjs-websockets';
+import { catchError, first, map } from 'rxjs/operators';
+
+import { AppState } from '../../../../../store/src/app-state';
+import { IApp } from '../../../core/cf-api.types';
+import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types';
+import { SshViewerComponent } from '../../../shared/components/ssh-viewer/ssh-viewer.component';
+import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
+import { BaseKubeGuid } from '../kubernetes-page.types';
+import { KubernetesService } from '../services/kubernetes.service';
+
+
+@Component({
+  selector: 'app-kube-console',
+  templateUrl: './kube-console.component.html',
+  styleUrls: ['./kube-console.component.scss'],
+  providers: [
+    {
+      provide: BaseKubeGuid,
+      useFactory: (activatedRoute: ActivatedRoute) => {
+        return {
+          guid: activatedRoute.snapshot.params.endpointId
+        };
+      },
+      deps: [
+        ActivatedRoute
+      ]
+    },
+    KubernetesService,
+    KubernetesEndpointService,
+  ]
+})
+export class KubeConsoleComponent implements OnInit {
+
+  public messages: Observable<string>;
+
+  public connectionStatus: Observable<number>;
+
+  public sshInput: Subject<string>;
+
+  public errorMessage: string;
+
+  public sshRoute: string;
+
+  public connected: boolean;
+
+  public kubeSummaryLink: string;
+
+  private connection: Subscription;
+
+  public instanceId: string;
+
+  public breadcrumbs$: Observable<IHeaderBreadcrumb[]>;
+
+  @ViewChild('sshViewer') sshViewer: SshViewerComponent;
+
+  private getBreadcrumbs(
+    application: IApp,
+  ) {
+    return [
+      {
+        breadcrumbs: [
+          { value: application.name, routerLink: `/kubernetes/${application.cfGuid}/${application.guid}/instances` }
+        ]
+      },
+    ];
+  }
+
+  constructor(
+    public kubeEndpointService: KubernetesEndpointService,
+    // private activatedRoute: ActivatedRoute,
+    // private store: Store<AppState>,
+  ) { }
+
+  ngOnInit() {
+
+    const guid = this.kubeEndpointService.baseKube.guid;
+
+    console.log('HERE');
+    console.log(guid);
+    // const routeParams = this.activatedRoute.snapshot.params;
+    // this.instanceId = routeParams.index;
+
+    this.kubeSummaryLink = (
+      `/kubernetes/${guid}/summary`
+    );
+
+    if (!guid) {
+      this.messages = NEVER;
+      this.connectionStatus = NEVER;
+    } else {
+      const host = window.location.host;
+      const protocol = window.location.protocol === 'https:' ? 'wss' : 'ws';
+      const streamUrl = (
+        `${protocol}://${host}/pp/v1/kubeconsole/${guid}`
+      );
+      this.sshInput = new Subject<string>();
+      const connection = websocketConnect(
+        streamUrl,
+        this.sshInput
+      );
+
+      console.log(streamUrl);
+
+      this.messages = connection.messages.pipe(
+        catchError(e => {
+          if (e.type === 'error') {
+            this.errorMessage = 'Error connecting to web socket';
+          }
+          return [];
+        }));
+
+      this.connectionStatus = connection.connectionStatus;
+
+      // this.breadcrumbs$ = this.applicationService.waitForAppEntity$.pipe(
+      //   map(app => this.getBreadcrumbs(app.entity.entity)),
+      //   first()
+      // );
+    }
+  }
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
index 5eb62e9208..13a2ac8495 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
@@ -91,6 +91,7 @@ import { KubernetesNamespacesTabComponent } from './tabs/kubernetes-namespaces-t
 import { KubernetesNodesTabComponent } from './tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component';
 import { KubernetesPodsTabComponent } from './tabs/kubernetes-pods-tab/kubernetes-pods-tab.component';
 import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kubernetes-summary.component';
+import { KubeConsoleComponent } from './kube-console/kube-console.component';
 
 
 /* tslint:enable */
@@ -145,7 +146,8 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     KubeNamespacePodCountComponent,
     PodNameLinkComponent,
     NodePodCountComponent,
-    KubernetesServicePortsComponent
+    KubernetesServicePortsComponent,
+    KubeConsoleComponent,
   ],
   exports: [
     KubernetesServicePortsComponent
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts
index f2d3839458..1ab7fe2376 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts
@@ -1,3 +1,4 @@
+import { KubeConsoleComponent } from './kube-console/kube-console.component';
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
@@ -155,6 +156,13 @@ const kubernetes: Routes = [{
       }
     }
   ]
+},
+{
+  path: ':endpointId/console',
+  component: KubeConsoleComponent,
+  data: {
+    uiNoMargin: true
+  }
 }
 ];
 
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
index 7198ba3c46..dc35b490cb 100644
--- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
@@ -4,6 +4,10 @@
       <mat-icon>dashboard</mat-icon>
       <span class="kube-details__button">View Dashboard</span>
     </button>
+    <button [routerLink]="kubeConsoleLink" mat-button>
+      <mat-icon>dashboard</mat-icon>
+      <span class="kube-details__button">Open Console</span>
+    </button>
   </app-page-sub-nav>
 
   <app-loading-page [isLoading]="isLoading$" [text]="'Retrieving Kubernetes details'">
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 d542073359..c1575fd95c 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
@@ -60,6 +60,8 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
   source: SafeResourceUrl;
 
   dashboardLink: string;
+  kubeConsoleLink: string;
+
   public podCapacity$: Observable<ISimpleUsageChartData>;
   public diskPressure$: Observable<ISimpleUsageChartData>;
   public memoryPressure$: Observable<ISimpleUsageChartData>;
@@ -240,6 +242,7 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
       warningText: `Nodes with unknown ready status found`
     });
     this.dashboardLink = `/kubernetes/${guid}/dashboard`;
+    this.kubeConsoleLink = `/kubernetes/${guid}/console`;
 
     this.kubeNodeVersions$ = this.getNodeKubeVersions(nodes$).pipe(startWith('-'));
 
diff --git a/deploy/Dockerfile.kubeconsole.yml b/deploy/Dockerfile.kubeconsole.yml
new file mode 100644
index 0000000000..48c3f21443
--- /dev/null
+++ b/deploy/Dockerfile.kubeconsole.yml
@@ -0,0 +1,18 @@
+FROM splatform/stratos-bk-base:opensuse as prod-build
+USER root
+RUN zypper in -y wget tar unzip nano vim curl
+
+RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl && \
+    chmod +x ./kubectl && \
+    mv ./kubectl /usr/local/bin/kubectl
+
+# Install Helm
+
+RUN curl -LO https://git.io/get_helm.sh && \
+    chmod 700 get_helm.sh && \
+    ./get_helm.sh
+
+ADD ./kubeconsole.bashrc /root/.bashrc
+WORKDIR /root
+
+CMD exec /bin/bash -c "trap : TERM INT; sleep infinity & wait"
diff --git a/deploy/ci/build-aio-image-canary.yml b/deploy/ci/build-aio-image-canary.yml
index 83df27b500..c8bc0485a7 100644
--- a/deploy/ci/build-aio-image-canary.yml
+++ b/deploy/ci/build-aio-image-canary.yml
@@ -75,3 +75,4 @@ jobs:
       tag: "stratos/deploy/ci/tasks/build-images/canary-tag"
       tag_as_latest: false
       labels_file: image-tag/image-labels
+      squash: true
diff --git a/deploy/kubeconsole.bashrc b/deploy/kubeconsole.bashrc
new file mode 100644
index 0000000000..2ac7e17679
--- /dev/null
+++ b/deploy/kubeconsole.bashrc
@@ -0,0 +1,42 @@
+
+CYAN="\033[96m"
+YELLOW="\033[93m"
+GREEN="\033[92m"
+RESET="\033[0m"
+BOLD="\033[1m"
+DIM="\033[2m"
+
+echo -e "${BOLD}${GREEN}SUSE Cloud Application Platform${RESET}"
+echo ""
+echo -e "${CYAN}Kubernetes Console${RESET}"
+echo ""
+
+export KUBECONFIG=/root/.stratos/kubeconfig
+export PS1="\033[92mstratos>\033[0m"
+alias k=kubectl
+
+helm init --client-only > /dev/null
+helm repo remove local > /dev/null
+helm repo remove stable > /dev/null
+
+if [ -f "/root/.stratos/helm-setup" ]; then
+  echo "Setting up Helm repositories ..."
+  source  "/root/.stratos/helm-setup" > /dev/null
+  helm repo update 2>&1 > /dev/null
+  echo ""
+fi
+
+
+if [ -f "/root/.stratos/history" ]; then
+  cat /root/.stratos/history > /root/.bash_history
+fi
+
+# Make Bash append rather than overwrite the history on disk:
+shopt -s histappend
+# A new shell gets the history lines from all previous shells
+PROMPT_COMMAND='history -a'
+# Don't put duplicate lines in the history.
+export HISTCONTROL=ignoredups
+
+echo "Ready"
+echo ""
diff --git a/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.html b/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.html
index 3d71c6e1a8..44cac219ee 100644
--- a/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.html
+++ b/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.html
@@ -1,12 +1,17 @@
 <div class="ssh-viewer">
-  <div class="ssh-viewer__overlay" *ngIf="errorMessage || !isConnected">
+  <div class="ssh-viewer__overlay" *ngIf="!message && (errorMessage || !isConnected)">
     <div class="ssh-viewer__error" *ngIf="errorMessage">
       Error occurred establishing SSH connection
     </div>
     <div class="ssh-viewer__disconnected" *ngIf="!errorMessage && !isConnected && !isConnecting">
         Disconnected
-      </div>
     </div>
+  </div>
+  <div class="ssh-viewer__overlay" *ngIf="message">
+    <div class="ssh-viewer__disconnected">
+      {{ message }}
+    </div>
+  </div>
   <mat-progress-bar *ngIf="isConnecting" mode="indeterminate"></mat-progress-bar>
   <div class="ssh-terminal" #container [ngClass]="{'ssh-terminal-disconnected': !isConnected}">
     <div id="terminal" #terminal></div>
diff --git a/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.scss b/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.scss
index 000e0340e2..3adb5a5af4 100644
--- a/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.scss
+++ b/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.scss
@@ -19,6 +19,8 @@
       display: flex;
       flex: 1;
       flex-direction: column;
+      max-height: 100%;
+      overflow: hidden;      
     }
   }
 
diff --git a/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.ts b/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.ts
index f3c9382c26..911c75c9d3 100644
--- a/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.ts
+++ b/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.ts
@@ -38,6 +38,8 @@ export class SshViewerComponent implements OnInit, OnDestroy, AfterViewChecked {
   public isConnecting = false;
   private isDestroying = false;
 
+  public message = '';
+
   @ViewChild('terminal') container: ElementRef;
   private xterm: Terminal;
 
@@ -111,8 +113,11 @@ export class SshViewerComponent implements OnInit, OnDestroy, AfterViewChecked {
     this.msgSubscription = this.sshStream
       .subscribe(
         (data: string) => {
-          for (const c of data.split(' ')) {
-            this.xterm.write(String.fromCharCode(parseInt(c, 16)));
+          // Check for a window title message
+          if (!this.isWindowTitle(data)) {
+            for (const c of data.split(' ')) {
+              this.xterm.write(String.fromCharCode(parseInt(c, 16)));
+            }
           }
         },
         (err) => {
@@ -138,4 +143,20 @@ export class SshViewerComponent implements OnInit, OnDestroy, AfterViewChecked {
       this.sshInput.next(JSON.stringify({ cols: size.cols, rows: size.rows }));
     }
   }
+
+  private isWindowTitle(data: string): boolean {
+    const chars = data.split(' ');
+    if (chars.length > 4 &&
+      parseInt(chars[0], 16) === 27 &&
+      parseInt(chars[1], 16) === 93 &&
+      parseInt(chars[2], 16) === 50 &&
+      parseInt(chars[3], 16) === 59) {
+        let title = '';
+        for (let i = 4; i < chars.length - 1; i++) {
+          title += String.fromCharCode(parseInt(chars[i], 16));
+        }
+        this.message = title;
+      }
+    return false;
+  }
 }
diff --git a/src/jetstream/plugins/kubernetes/endpoint_config.go b/src/jetstream/plugins/kubernetes/endpoint_config.go
index 22f3521f10..0a1329234d 100644
--- a/src/jetstream/plugins/kubernetes/endpoint_config.go
+++ b/src/jetstream/plugins/kubernetes/endpoint_config.go
@@ -1,7 +1,10 @@
 package kubernetes
 
 import (
+	"encoding/base64"
 	"errors"
+	"fmt"
+	"regexp"
 
 	log "github.com/sirupsen/logrus"
 
@@ -45,6 +48,71 @@ func (c *KubernetesSpecification) GetConfigForEndpoint(masterURL string, token i
 
 }
 
+func (c *KubernetesSpecification) GetKubeConfigForEndpoint(masterURL string, token interfaces.TokenRecord) (string, error) {
+
+	name := "config-0"
+	clusterName := "cluster-0"
+	userName := "user-0"
+
+	// Create a config
+
+	// Initialize a new config
+	context := clientcmdapi.NewContext()
+	context.Cluster = clusterName
+	context.AuthInfo = userName
+
+	// Configure the cluster
+	cluster := clientcmdapi.NewCluster()
+	cluster.Server = masterURL
+	cluster.InsecureSkipTLSVerify = true
+
+	// Configure auth information
+	authInfo := clientcmdapi.NewAuthInfo()
+	err := c.addAuthInfoForEndpoint(authInfo, token)
+
+	config := clientcmdapi.NewConfig()
+	config.Clusters[clusterName] = cluster
+	config.Kind = "Config"
+	config.Contexts[name] = context
+	config.AuthInfos[userName] = authInfo
+	config.CurrentContext = context.Cluster
+
+	// Convert to string
+	str := `apiVersion: v1
+kind: Config
+contexts:
+- context:
+		cluster: kube
+		user: kube
+	name: kube
+clusters:
+- cluster:
+		insecure-skip-tls-verify: true
+		server: %s
+	name: kube
+current-context: kube
+preferences: {}
+users:
+- name: kube
+	user:
+`
+
+	space := regexp.MustCompile(`\t`)
+	s := space.ReplaceAllString(str, "  ")
+
+	// Now append the auth details
+	log.Infof("%+v", authInfo)
+
+	if authInfo.ClientCertificateData != nil {
+		s = fmt.Sprintf("%s    client-certificate-data: %s\n", s, base64.StdEncoding.EncodeToString(authInfo.ClientCertificateData))
+	}
+	if authInfo.ClientKeyData != nil {
+		s = fmt.Sprintf("%s    client-key-data: %s\n", s, base64.StdEncoding.EncodeToString(authInfo.ClientKeyData))
+	}
+
+	return fmt.Sprintf(s, masterURL), err
+}
+
 func (c *KubernetesSpecification) addAuthInfoForEndpoint(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
 
 	log.Debug("addAuthInfoForEndpoint")
diff --git a/src/jetstream/plugins/kubernetes/go.mod b/src/jetstream/plugins/kubernetes/go.mod
index 5393fae8ef..be7ed920b0 100644
--- a/src/jetstream/plugins/kubernetes/go.mod
+++ b/src/jetstream/plugins/kubernetes/go.mod
@@ -46,6 +46,7 @@ require (
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pkg/errors v0.8.1 // indirect
 	github.com/russross/blackfriday v2.0.0+incompatible // indirect
+	github.com/satori/go.uuid v1.2.0 // indirect
 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
 	github.com/sirupsen/logrus v1.3.0
 	github.com/spf13/cobra v0.0.3 // indirect
diff --git a/src/jetstream/plugins/kubernetes/go.sum b/src/jetstream/plugins/kubernetes/go.sum
index 69a959d32c..6243abc37b 100644
--- a/src/jetstream/plugins/kubernetes/go.sum
+++ b/src/jetstream/plugins/kubernetes/go.sum
@@ -159,9 +159,11 @@ github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nL
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/russross/blackfriday v2.0.0+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday v2.0.0 h1:L7Oc72h7rDqGkbUorN/ncJ4N/y220/YRezHvBoKLOFA=
 github.com/russross/blackfriday v2.0.0/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/russross/blackfriday v2.0.0+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
+github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
diff --git a/src/jetstream/plugins/kubernetes/kube_console.go b/src/jetstream/plugins/kubernetes/kube_console.go
new file mode 100644
index 0000000000..7f54775d01
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/kube_console.go
@@ -0,0 +1,582 @@
+package kubernetes
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"crypto/tls"
+	//"encoding/base64"
+	"encoding/json"
+	"net"
+	"net/http"
+	"time"
+	"strings"
+	//"io/ioutil"
+	//yaml "gopkg.in/yaml.v2"
+
+	uuid "github.com/satori/go.uuid"
+	"github.com/labstack/echo"
+	log "github.com/sirupsen/logrus"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/auth"
+	restclient "k8s.io/client-go/rest"
+	//"k8s.io/kubernetes/pkg/client/unversioned/remotecommand"
+	"github.com/gorilla/websocket"
+	"k8s.io/client-go/kubernetes"
+	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
+
+	"k8s.io/client-go/tools/remotecommand"	
+	scheme "k8s.io/client-go/kubernetes/scheme"
+)
+
+const (
+	consoleContainerName = "kube-console"
+)
+
+var history = ""
+
+// TTY Resize, see: https://gitlab.cncf.ci/kubernetes/kubernetes/commit/3b21a9901bcd48bb452d3bf1a0cddc90dae142c4#9691a2f9b9c30711f0397221db0b9ac55ab0e2d1
+
+// Allow connections from any Origin
+var upgrader = websocket.Upgrader{
+	CheckOrigin: func(r *http.Request) bool { return true },
+}
+
+// PodCreationData stores the clients and names used ot create pod and secret
+type PodCreationData struct {
+	ClientSet *kubernetes.Clientset
+	Config *restclient.Config
+	Namespace string
+	PodClient corev1.PodInterface
+	SecretClient corev1.SecretInterface
+	PodName string
+	SecretName string
+}
+
+// KeyCode - JSON object that is passed from the front-end to notify of a key press or a term resize
+type KeyCode struct {
+	Key  string `json:"key"`
+	Cols int    `json:"cols"`
+	Rows int    `json:"rows"`
+}
+
+type TermianlSize struct {
+	Width  uint16
+	Height uint16
+}
+
+const (
+	// Time allowed to write a message to the peer.
+	writeWait = 10 * time.Second
+)
+
+func (k *KubernetesSpecification) KubeConsole(c echo.Context) error {
+
+	c.Response().Status = 500
+
+	log.Info("Kube Console backend request")
+
+	endpointGUID := c.Param("guid")
+	userGUID := c.Get("user_id").(string)
+
+	///api/v1/namespaces/project-1/pods/pod-1-lmlzj/exec?command=/bin/bash&stdin=true&stderr=true&stdout=true&tty=true
+
+	namespace := "stratos"
+
+	// TODO: Refresh auth token
+
+	// Upgrade the web socket for the incoming request
+	ws, pingTicker, err := interfaces.UpgradeToWebSocket(c)
+	if err != nil {
+		return err
+	}
+	defer ws.Close()
+	defer pingTicker.Stop()
+
+	// Send a message to say that we are creating the pod
+	sendProgressMessage(ws, "Launching Kubernetes Console ... one moment please")
+
+	var p = k.portalProxy
+
+	cnsiRecord, err := p.GetCNSIRecord(endpointGUID)
+	if err != nil {
+		return errors.New("Could not get endpoint information")
+	}
+
+	// Get token for this users
+	tokenRec, ok := p.GetCNSITokenRecord(endpointGUID, userGUID)
+	if !ok {
+		return errors.New("Could not get token")
+	}
+
+	podData, err := k.createPod(c, cnsiRecord, tokenRec, namespace, ws)
+	// Clear progress message
+	sendProgressMessage(ws, "")
+
+	if err != nil {
+		log.Error("ERROR creating secret or pod")
+		log.Info(err)
+		k.cleanupPodAndSecret(podData)
+		return err
+	}
+
+	log.Info(podData.PodName)
+
+	log.Info(tokenRec.AuthToken)
+	log.Info(tokenRec.AuthType)
+
+	// Make the info call to the SSH endpoint info
+	// Currently this is not cached, so we must get it each time
+	apiEndpoint := cnsiRecord.APIEndpoint
+	log.Info(apiEndpoint)
+	// target := fmt.Sprintf("%s/api/v1/namespaces/kube-system/services/https:kubernetes-dashboard:/proxy/", apiEndpoint)
+	//target := fmt.Sprintf("%s/api/v1/namespaces/kube-system/services/http:kubernetes-dashboard:/proxy/", apiEndpoint)
+	// target := http://localhost:8001/api/v1/namespaces/kube-system/services/kubernetes-dashboard/proxy
+	target := fmt.Sprintf("%s/api/v1/namespaces/%s/pods/%s/exec?command=/bin/bash&stdin=true&stderr=true&stdout=true&tty=true", apiEndpoint, namespace, podData.PodName)
+	log.Info(target)
+
+	// config, err := k.getConfig(&cnsiRecord, &tokenRec)
+	// if err != nil {
+	// 	return errors.New("Could not get config for this auth type")
+	// }
+
+
+	req, err := http.NewRequest("POST", target, nil)
+	if err != nil {
+		k.cleanupPodAndSecret(podData)		
+		return errors.New("Could not create new HTTP request")
+	}
+	
+	// Set auth header so we log in if needed
+	if len(tokenRec.AuthToken) > 0 {
+		//req.Header.Add("Authorization", "Bearer "+tokenRec.AuthToken)
+		log.Info("Setting auth header")
+	}
+
+	//req.Header.Add("Accept", "*/*")
+
+	log.Info("Config")
+	log.Info("Making request")
+	log.Info(req)
+
+	// endpointRequest := &interfaces.CNSIRequest{
+	// 	GUID: endpointGUID,
+	// }
+
+	kubeAuthToken := &auth.KubeCertificate{}
+	err = json.NewDecoder(strings.NewReader(tokenRec.AuthToken)).Decode(kubeAuthToken)
+	if err != nil {
+		k.cleanupPodAndSecret(podData)		
+		return err
+	}
+	cert, err := kubeAuthToken.GetCerticate()
+	if err != nil {
+		k.cleanupPodAndSecret(podData)		
+		return err
+	}
+	dial := (&net.Dialer{
+		Timeout:   time.Duration(30) * time.Second,
+		KeepAlive: 30 * time.Second,
+	}).Dial
+
+	sslTransport := &http.Transport{
+		Proxy:               http.ProxyFromEnvironment,
+		Dial:                dial,
+		TLSHandshakeTimeout: 10 * time.Second, // 10 seconds is a sound default value (default is 0)
+		TLSClientConfig: &tls.Config{
+			InsecureSkipVerify: true,
+			Certificates:       []tls.Certificate{cert},
+		},
+		MaxIdleConnsPerHost: 6, // (default is 2)
+	}
+
+	kubeCertClient := http.Client{}
+	kubeCertClient.Transport = sslTransport
+	kubeCertClient.Timeout = time.Duration(30) * time.Second
+
+	dialer := &websocket.Dialer{
+		TLSClientConfig: &tls.Config{
+			InsecureSkipVerify: true,
+			Certificates:       []tls.Certificate{cert},
+		},
+	}
+
+	if strings.HasPrefix(target ,"https://") {
+		target = "wss://" + target[8:]
+	} else {
+		target = "ws://" + target[7:]
+	}
+
+	header := &http.Header{}
+	wsConn, res, err := dialer.Dial(target, *header)
+
+	if err == nil {
+		defer wsConn.Close()
+	}
+
+	// log.Info(err)
+	// log.Info(res)
+	// log.Info(wsConn)
+
+	// if kubeAuthToken.Token != "" {
+	// 	req.Header.Set("Authorization", "bearer "+kubeAuthToken.Token)
+	// }
+
+	//res, err := kubeCertClient.Do(req)
+
+
+	kubeCertClient.CloseIdleConnections()
+
+	//var res *http.Response
+
+	// var client http.Client
+	// client = p.GetHttpClientForRequest(req, cnsiRecord.SkipSSLValidation)
+	// res, err = client.Do(req)
+
+	// Find the auth provider for the auth type - default to oauthflow
+	// authHandler := p.GetAuthProvider(tokenRec.AuthType)
+	// if authHandler.Handler != nil {
+	// 	res, err = authHandler.Handler(endpointRequest, req)
+	// } else {
+	// 	res, err = p.DoOAuthFlowRequest(endpointRequest, req)
+	// }
+	log.Error(err)
+//	log.Error(res)
+
+	if err != nil {
+		log.Error("Failed to make request")
+		k.cleanupPodAndSecret(podData)
+		return errors.New("Could not make request")
+	}
+
+	log.Error("=== Made request to exec endpoint OK")
+	log.Error(res)
+
+	// Websockets next
+	//log.Info(wsConn)
+
+	//done := make(chan struct{})
+	stdoutDone := make(chan struct{})
+	go pumpStdout(ws, wsConn, stdoutDone)
+
+	// Read the input from the web socket and pipe it to the SSH client
+	for {
+		_, r, err := ws.ReadMessage()
+		if err != nil {
+			log.Error("Error reading message from web socket")
+			log.Warnf("%v+", err)
+			k.cleanupPodAndSecret(podData)			
+			return err
+		}
+
+		res := KeyCode{}
+		json.Unmarshal(r, &res)
+
+		if res.Cols == 0 {
+
+
+			slice := make([]byte, 1)
+			slice[0] = 0
+			slice = append(slice, []byte(res.Key)...)
+			wsConn.WriteMessage(websocket.TextMessage, slice)
+		} else {
+			// Terminal resize request
+			// if err := windowChange(session, res.Rows, res.Cols); err != nil {
+			// 	log.Error("Can not resize the PTY")
+			// }
+			log.Error("Terminal resize receieved")
+
+			size := TermianlSize{
+				Width: uint16(res.Cols),
+				Height: uint16(res.Rows),
+			}
+			j, _ := json.Marshal(size)
+			log.Info(j)
+
+			resizeStream := []byte{4}
+			slice := append(resizeStream, j...)
+			log.Info(slice)
+			wsConn.WriteMessage(websocket.TextMessage, slice)
+		}
+	}
+
+	// Cleanup
+	log.Info("*** Cleaning up.... ***")
+
+	return k.cleanupPodAndSecret(podData)
+}
+
+func pumpStdout(ws *websocket.Conn, source *websocket.Conn, done chan struct{}) {
+	//buffer := make([]byte, 32768)
+	for {
+		_, r, err := source.ReadMessage()
+		if err != nil {
+			log.Info(err)
+			ws.Close()
+			break
+		}
+		ws.SetWriteDeadline(time.Now().Add(writeWait))
+		bytes := fmt.Sprintf("% x\n", r[1:])
+		if err := ws.WriteMessage(websocket.TextMessage, []byte(bytes)); err != nil {
+			log.Error("App SSH Failed to write nessage")
+			ws.Close()
+			break
+		}
+	}
+}
+
+func (k *KubernetesSpecification) createPod(c echo.Context, cnsiRecord interfaces.CNSIRecord, tokenRecord interfaces.TokenRecord, namespace string, ws *websocket.Conn) (*PodCreationData, error) {
+
+	id := uuid.NewV4().String()
+	secretName := fmt.Sprintf("k8s-s-console-%s", id)
+	podName := fmt.Sprintf("k8s-p-console-%s", id)
+
+	result := &PodCreationData{}
+
+	config, err := k.GetConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRecord)
+	if err != nil {
+		return result, errors.New("Can not get Kubernetes config for specified endpoint")
+	}
+
+	result.Config = config
+
+	kubeConfig, err := k.GetKubeConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRecord)
+	if err != nil {
+		return result, errors.New("Can not get Kubernetes config for specified endpoint")
+	}
+
+	kubeClient, err := kubernetes.NewForConfig(config)
+	if err != nil {
+		log.Error("Could not get kube client")
+		return result, err
+	}
+
+	result.Namespace = namespace
+	result.ClientSet = kubeClient
+
+	// Create the secret
+	secretSpec := &v1.Secret{
+		TypeMeta: metav1.TypeMeta{
+			Kind: "secret",
+			APIVersion: "v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name: secretName,
+			Namespace: namespace,
+		},
+		Type: "Opaque",
+	}
+
+	secretSpec.Data = make(map[string][]byte)
+	secretSpec.Data["kubeconfig"] = []byte(kubeConfig)
+	secretSpec.Data["history"] = []byte(history)
+	
+	// Get Helm repository script if we have Helm repositories
+	helmSetup := getHelmRepoSetupScript(k.portalProxy)
+	if len(helmSetup) > 0 {
+		secretSpec.Data["helm-setup"] = []byte(helmSetup)
+	}
+
+	secretsClient := kubeClient.CoreV1().Secrets(namespace)
+	_, err = secretsClient.Create(secretSpec)
+
+	if err != nil {
+		log.Warn("Unable to create Secret")
+		return result, err
+	}
+
+	result.SecretClient = secretsClient
+	result.SecretName = secretName
+
+	podClient := kubeClient.CoreV1().Pods(namespace)
+
+	podSpec := &v1.Pod{
+		TypeMeta: metav1.TypeMeta{
+			Kind: "pod",
+			APIVersion: "v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name: podName,
+			Namespace: namespace,
+		},
+	}
+
+	podSpec.ObjectMeta.Annotations = make(map[string]string)
+
+	// Record the session ID
+	session, err :=k.portalProxy.GetSession(c)
+	if err == nil {
+		podSpec.ObjectMeta.Annotations["stratos-session"] = session.ID
+		log.Infof("Session ID: %s", session.ID)
+	}
+
+	automount := false
+
+	podSpec.Spec.AutomountServiceAccountToken = &automount
+	podSpec.Spec.RestartPolicy = "Never"
+
+	volumeMountsSpec := make([]v1.VolumeMount, 1)
+	volumeMountsSpec[0].Name = "kubeconfig"
+	volumeMountsSpec[0].MountPath = "/root/.stratos"
+	volumeMountsSpec[0].ReadOnly = true
+
+	containerSpec := make([]v1.Container, 1)
+	containerSpec[0].Name = consoleContainerName
+	containerSpec[0].Image = "nwmac/kubeconsole"
+	containerSpec[0].ImagePullPolicy = "Always"
+	containerSpec[0].VolumeMounts = volumeMountsSpec
+	podSpec.Spec.Containers = containerSpec
+
+	volumesSpec := make([]v1.Volume, 1)
+	volumesSpec[0].Name = "kubeconfig"
+	volumesSpec[0].Secret = &v1.SecretVolumeSource{
+		SecretName: secretName,
+	}
+	podSpec.Spec.Volumes = volumesSpec	
+
+	// Create a new pod
+	pod, err := podClient.Create(podSpec)
+	if err != nil {
+		return result, err
+	}
+
+	result.PodClient = podClient
+	result.PodName = podName
+
+	sendProgressMessage(ws, "Waiting for Kubernetes Console to start up ...")
+
+	statusOptions := metav1.GetOptions{}
+
+	// Wait for the pod to be running
+	ready := false
+	for {
+		status, err := podClient.Get(pod.Name, statusOptions)
+
+		if err != nil {
+			break
+		}
+
+		//log.Info(status.Status.Phase)
+		if status.Status.Phase == "Running" {
+			ready = true
+		}
+
+		if ready {
+			break
+		}
+
+		// Sleep
+		time.Sleep(2500 * time.Millisecond)
+	}
+
+	return result, err
+}
+
+func (k *KubernetesSpecification) cleanupPodAndSecret(podData *PodCreationData) error {
+
+	if len(podData.PodName) > 0 {
+		captureBashHistory(podData)
+		podData.PodClient.Delete(podData.PodName, nil)
+	}
+
+	if len(podData.SecretName) > 0 {
+		podData.SecretClient.Delete(podData.SecretName, nil)
+	}
+
+	return nil
+}
+
+func getHelmRepoSetupScript(portalProxy interfaces.PortalProxy) string {
+
+	str := ""
+
+	// Get all of the helm endpoints
+	endpoints, err := portalProxy.ListEndpoints()
+	if err != nil {
+		log.Error("Can not list Helm Repository endpoints")
+		return str
+	}
+
+	for _, ep := range endpoints {
+		if ep.CNSIType == "helm" {
+			str += fmt.Sprintf("helm repo add %s %s > /dev/null\n", ep.Name, ep.APIEndpoint)
+		}
+	}
+
+	return str
+}
+
+func sendProgressMessage(ws *websocket.Conn, progressMsg string) {
+	// Send a message to say that we are creating the pod
+	msg := fmt.Sprintf("\033]2;%s\007", progressMsg)
+	bytes := fmt.Sprintf("% x\n", []byte(msg))
+	if err := ws.WriteMessage(websocket.TextMessage, []byte(bytes)); err != nil {
+		log.Error("Could not send message to client to indicate console is starting")
+	}
+}
+
+func captureBashHistory(podData *PodCreationData) error {
+
+	log.Warn("**** Trying to capture bash history from pod ****")
+
+	// Can we capture the history?
+
+	// returning stdout, stderr and error. `options` allowed for
+	// additional parameters to be passed.
+
+	//cmd := []string{"bash", "-c", "\"cat $HISTFILE\""}
+	cmd := []string{"cat", "/root/.bash_history"}
+
+
+	req := podData.ClientSet.Core().RESTClient().Post().
+		Resource("pods").
+		Name(podData.PodName).
+		Namespace(podData.Namespace).
+		SubResource("exec").
+		Param("container", consoleContainerName)
+			
+	req.VersionedParams(&v1.PodExecOptions{
+		Container: consoleContainerName,
+		Command:   cmd,
+		Stdin:     false,
+		Stdout:    true,
+		Stderr:    false,
+		TTY:       true,
+	}, scheme.ParameterCodec)
+	
+	var stdout bytes.Buffer
+	//err := execute("POST", req.URL(), nil, nil, &stdout, nil, false)
+
+	exec, err := remotecommand.NewSPDYExecutor(podData.Config, "POST", req.URL())
+	if err != nil {
+		log.Error("Could not exec")
+		log.Error(err)
+		return err
+	}
+
+	log.Warn("Attempting stream ......")
+
+	err = exec.Stream(remotecommand.StreamOptions{
+		//SupportedProtocols: remotecommandserver.SupportedStreamingProtocols,
+		Stdin:              nil,
+		Stdout:             &stdout,
+		Stderr:             nil,
+		Tty:                true,
+	})
+
+	log.Error("Get Bash History")
+	log.Error(err)
+	log.Error(stdout.String())
+
+	history = stdout.String()
+	
+		// if options.PreserveWhitespace {
+		// 	return stdout.String(), stderr.String(), err
+		// }
+		// return strings.TrimSpace(stdout.String()), strings.TrimSpace(stderr.String()), err	
+
+	return nil
+}
\ No newline at end of file
diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index 736ddfa35d..a61c0e7548 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -112,6 +112,9 @@ func (c *KubernetesSpecification) AddSessionGroupRoutes(echoGroup *echo.Group) {
 	echoGroup.GET("/kubedash/ui/:guid/*", c.kubeDashboardProxy)
 	echoGroup.GET("/kubedash/:guid/status", c.kubeDashboardStatus)
 
+	// Kube Console
+	echoGroup.GET("/kubeconsole/:guid", c.KubeConsole)
+
 	// Helm Routes
 	echoGroup.GET("/helm/releases", c.ListReleases)
 	echoGroup.POST("/helm/install", c.InstallRelease)

From a697fbef2f9193fe534af0863af4fa1c4cb14beb Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Wed, 17 Jul 2019 08:49:42 +0100
Subject: [PATCH 047/648] Update eksdeployment.md

---
 docs/eksdeployment.md | 75 ++-----------------------------------------
 1 file changed, 2 insertions(+), 73 deletions(-)

diff --git a/docs/eksdeployment.md b/docs/eksdeployment.md
index cbf1eccf4e..74399f12d9 100644
--- a/docs/eksdeployment.md
+++ b/docs/eksdeployment.md
@@ -1,4 +1,4 @@
-# Stratos, SCF and metrics on EKS
+# Stratos on EKS
 
 ## EKS Setup
 
@@ -46,27 +46,7 @@ $ helm init --service-account tiller
 
 ## Storage Classes 
 
-Two storage classes are required, one general storage class that will be marked as the `default` storage class in the cluster, and a storage class that is scoped to a single `AZ`. This scoped storage class will be used to deploy Stratos and Metrics, that make use of shared storage volumes.
-
-To setup the `default` storage class save the following to a file `default_storage_class.yaml`
-```
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: gp2
-  annotations:
-    storageclass.kubernetes.io/is-default-class: "true"
-  labels:
-    kubernetes.io/cluster-service: "true"
-provisioner: kubernetes.io/aws-ebs
-parameters:
-  type: gp2
-```
-
-To create the storage class, execute the following:
-```
-$ kubectl apply -f default_storage_class.yaml
-```
+Stratos requires a storage class that is scoped to a single `AZ`.
 
 To setup the scoped storage class, save the following to `scoped_storage_class.yaml`.
 ```
@@ -88,57 +68,6 @@ $ kubectl apply -f scoped_storage_class.yaml
 ```
 
 In this guide, the scoped storage class will be referred to as `gp2scoped`.
-## SCF Installation
-
-To deploy SCF, follow instructions detailed in https://github.com/SUSE/scf/wiki/Deployment-on-Amazon-EKS, starting from the [Deploy Cloud Foundry](https://github.com/SUSE/scf/wiki/Deployment-on-Amazon-EKS#deploy-cloud-foundry) section.
-
-The initial steps can be skipped, (changing storage volume size, helm and storage class configuration). 
-
-The SCF config values file, will be referred to as `scf-config-values.yaml` in the guide.
-
-
-## Metrics Installation
-
-Download the latest metrics chart from [here](). Or use the latest published `devel` release.
-
-Save the following configuration overrides to a file named `metrics-values.yaml`. 
-
-```
-useLb: true
-kubernetes:
-  authEndpoint: < EKS Cluster endpoint >
-prometheus:
-  kubeStateMetrics:    
-    enabled: true
-  server:
-    persistentVolume:
-      storageClass: gp2scoped
-kube:
-    external_metrics_port: 443
-    storage_class:
-        persistent: "gp2scoped"
-        shared: "gp2scoped"
-```
-Deploy `metrics` to your cluster:
-
-```
-
-$ helm install stratos/metrics --namespace metrics --name metrics -f metrics-values.yaml -f scf-config-values.yaml
-```
-
-Once all pods are `Ready`, retrieve the load balancer address for the `metrics` Endpoint.
-
-```
-$ kubectl get services --namespace metrics
-NAME                                    TYPE           CLUSTER-IP       EXTERNAL-IP                                                                            PORT(S)         AGE
-metrics-f-exp-service                   ClusterIP      10.100.219.223   <none>                                                                                 9186/TCP        43m
-metrics-metrics-nginx                   LoadBalancer   10.100.31.139    a98a9c6f3d5e111e8b51d0eeeba70c15-724925591.us-east-1.elb.amazonaws.com,172.31.34.100   443:30943/TCP   43m
-metrics-prometheus-kube-state-metrics   ClusterIP      None             <none>                                                                                 80/TCP          43m
-prometheus-service                      ClusterIP      10.100.32.254    <none>                                                                                 9090/TCP        43m
-
-```
-
-The address in this example is `https://a98a9c6f3d5e111e8b51d0eeeofba70c15-724925591.us-east-1.elb.amazonaws.com`. Make a note it.
 
 ## Stratos Deployment
 

From c8d6667253494d7743fd3f97fad50f81e467a0ff Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 16 Aug 2019 15:10:29 +0100
Subject: [PATCH 048/648] Fix merge issue, update go.mod

---
 src/jetstream/datastore/datastore.go | 8 ++++----
 src/jetstream/go.mod                 | 5 -----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/jetstream/datastore/datastore.go b/src/jetstream/datastore/datastore.go
index ba8ed35199..26c2917bcc 100644
--- a/src/jetstream/datastore/datastore.go
+++ b/src/jetstream/datastore/datastore.go
@@ -4,6 +4,7 @@ import (
 	"database/sql"
 	"fmt"
 	"os"
+	"path"
 	"regexp"
 	"strings"
 	"time"
@@ -147,16 +148,15 @@ func GetConnection(dc DatabaseConfig, env *env.VarSet) (*sql.DB, error) {
 	}
 
 	// SQL Lite
-	return GetSQLLiteConnection(env.MustBool("SQLITE_KEEP_DB"))
+	return GetSQLLiteConnection(env.MustBool("SQLITE_KEEP_DB"), env.String("SQLITE_DB_DIR", "."))
 }
 
 // GetSQLLiteConnection returns an SQLite DB Connection
-func GetSQLLiteConnection(sqliteKeepDB bool) (*sql.DB, error) {
+func GetSQLLiteConnection(sqliteKeepDB bool, sqlDbDir string) (*sql.DB, error) {
 
-	sqlDbDir := env.String("SQLITE_DB_DIR", ".")
 	dbFilePath := path.Join(sqlDbDir, SQLiteDatabaseFile)
 	log.Infof("SQLite Database file: %s", dbFilePath)
-	
+
 	return GetSQLLiteConnectionWithPath(SQLiteDatabaseFile, sqliteKeepDB)
 }
 
diff --git a/src/jetstream/go.mod b/src/jetstream/go.mod
index 35963b7546..991aaba261 100644
--- a/src/jetstream/go.mod
+++ b/src/jetstream/go.mod
@@ -25,13 +25,11 @@ require (
 	github.com/cloudfoundry/noaa v2.1.0+incompatible
 	github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4
 	github.com/cppforlife/go-patch v0.2.0 // indirect
-	github.com/cyphar/filepath-securejoin v0.2.2 // indirect
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
 	github.com/domodwyer/mailyak v3.1.1+incompatible
 	github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 // indirect
 	github.com/fatih/color v1.7.0 // indirect
 	github.com/go-sql-driver/mysql v1.4.1
-	github.com/gogo/protobuf v1.2.1 // indirect
 	github.com/golang/snappy v0.0.1 // indirect
 	github.com/google/go-querystring v1.0.0 // indirect
 	github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e // indirect
@@ -44,7 +42,6 @@ require (
 	github.com/jtolds/gls v4.20.0+incompatible // indirect
 	github.com/kat-co/vala v0.0.0-20170210184112-42e1d8b61f12
 	github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4
-	github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28 // indirect
 	github.com/labstack/echo v3.3.10+incompatible
 	github.com/lib/pq v1.1.0 // indirect
 	github.com/lunixbochs/vtclean v1.0.0 // indirect
@@ -56,7 +53,6 @@ require (
 	github.com/nwaples/rardecode v1.0.0 // indirect
 	github.com/nwmac/sqlitestore v0.0.0-20180824125213-7d2ab221fb3f
 	github.com/pierrec/lz4 v2.0.5+incompatible // indirect
-	github.com/pkg/errors v0.8.1 // indirect
 	github.com/satori/go.uuid v1.2.0
 	github.com/sirupsen/logrus v1.3.0
 	github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 // indirect
@@ -64,7 +60,6 @@ require (
 	github.com/ulikunitz/xz v0.5.6 // indirect
 	github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec // indirect
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
-	github.com/ziutek/mymysql v1.5.4 // indirect
 	golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f
 	golang.org/x/net v0.0.0-20190420063019-afa5a82059c6 // indirect
 	google.golang.org/appengine v1.5.0 // indirect

From e4981be13f2e40f5be08f2ad133d0fec53e670e7 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Sat, 17 Aug 2019 17:57:59 +0100
Subject: [PATCH 049/648] Unit test fix

---
 .../chart-details-usage.component.spec.ts                 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts
index abf3851288..fd707c5964 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts
@@ -1,8 +1,10 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
-
 import { BaseTestModulesNoShared } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ChartDetailsUsageComponent } from './chart-details-usage.component';
+import { EndpointsService } from '../../../../../core/endpoints.service';
+import { UtilsService } from '../../../../../core/utils.service';
+import { PaginationMonitorFactory } from '../../../../../shared/monitors/pagination-monitor.factory';
 
 describe('Component: ChartDetailsUsage', () => {
   beforeEach(() => {
@@ -10,7 +12,9 @@ describe('Component: ChartDetailsUsage', () => {
       imports: [...BaseTestModulesNoShared],
       declarations: [ChartDetailsUsageComponent],
       providers: [
-
+        EndpointsService,
+        UtilsService,
+        PaginationMonitorFactory
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();

From 8c2e316c9705418c3c24cc0e7409a3f90bd0760d Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 19 Aug 2019 10:33:51 +0100
Subject: [PATCH 050/648] Fix test imports so they run with customizations

---
 .../edit-autoscaler-policy-service.spec.ts      |  4 ++--
 ...app-autoscaler-events-config.service.spec.ts | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 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 a2ce67df14..fd3f67b2ef 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,7 +1,7 @@
 import { inject, TestBed } from '@angular/core/testing';
 
 import { EntityServiceFactory } from '../../../../core/src/core/entity-service-factory.service';
-import { ApplicationsModule } from '../../../../core/src/features/applications/applications.module';
+import { SharedModule } from '../../../../core/src/shared/shared.module';
 import { createBasicStoreModule } from '../../../../core/test-framework/store-test-helper';
 import { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module';
 import { EditAutoscalerPolicyService } from './edit-autoscaler-policy-service';
@@ -14,7 +14,7 @@ describe('EditAutoscalerPolicyService', () => {
         EntityServiceFactory,
       ],
       imports: [
-        ApplicationsModule,
+        SharedModule,
         createBasicStoreModule(),
         CfAutoscalerTestingModule
       ]
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 651ce2e852..79b0826927 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
@@ -1,21 +1,22 @@
-import { CommonModule } from '@angular/common';
 import { inject, TestBed } from '@angular/core/testing';
 import { ConnectionBackend, Http } from '@angular/http';
 import { MockBackend } from '@angular/http/testing';
-import { RouterTestingModule } from '@angular/router/testing';
 
-import { CoreModule } from '../../../../../core/src/core/core.module';
 import { EntityServiceFactory } from '../../../../../core/src/core/entity-service-factory.service';
-import { ApplicationsModule } from '../../../../../core/src/features/applications/applications.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 { createBasicStoreModule, getInitialTestStoreState } from '../../../../../core/test-framework/store-test-helper';
+import { getInitialTestStoreState, createBasicStoreModule } from '../../../../../core/test-framework/store-test-helper';
 import { GetApplication } from '../../../../../store/src/actions/application.actions';
 import { applicationSchemaKey, entityFactory } from '../../../../../store/src/helpers/entity-factory';
 import { endpointStoreNames } from '../../../../../store/src/types/endpoint.types';
 import { CfAutoscalerTestingModule } from '../../../cf-autoscaler-testing.module';
 import { CfAppAutoscalerEventsConfigService } from './cf-app-autoscaler-events-config.service';
+import { CommonModule, DatePipe } from '@angular/common';
+import { CoreModule } from '../../../../../core/src/core/core.module';
+import { SharedModule } from '../../../../../core/src/shared/shared.module';
+import {
+  ApplicationEnvVarsHelper
+} from '../../../../../core/src/features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service';
 
 describe('CfAppAutoscalerEventsConfigService', () => {
   const initialState = getInitialTestStoreState();
@@ -25,6 +26,8 @@ describe('CfAppAutoscalerEventsConfigService', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       providers: [
+        ApplicationEnvVarsHelper,
+        DatePipe,
         CfAppAutoscalerEventsConfigService,
         EntityServiceFactory,
         generateTestEntityServiceProvider(
@@ -40,9 +43,7 @@ describe('CfAppAutoscalerEventsConfigService', () => {
         CommonModule,
         CoreModule,
         SharedModule,
-        ApplicationsModule,
         createBasicStoreModule(),
-        RouterTestingModule,
         CfAutoscalerTestingModule
       ]
     });

From f846a3def0b39373dbcb8d525f16935d55b46e6d Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 19 Aug 2019 22:15:55 +0100
Subject: [PATCH 051/648] Bump product version to 1.5

---
 custom-src/stratos.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom-src/stratos.yaml b/custom-src/stratos.yaml
index 91aded8cec..f24554a8d5 100644
--- a/custom-src/stratos.yaml
+++ b/custom-src/stratos.yaml
@@ -1,2 +1,2 @@
 title: SUSE CAP
-productVersion: 1.4
+productVersion: 1.5

From 19ac7493dd730d18efd5121e4226feec9fee849a Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 20 Aug 2019 11:09:50 +0100
Subject: [PATCH 052/648] Fix intermittent unit test

---
 .../chart-index/chart-index.component.spec.ts         | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts
index 418098dd09..d881c083f6 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts
@@ -2,6 +2,7 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
+import { of as observableOf } from 'rxjs';
 
 import { ChartItemComponent } from '../chart-item/chart-item.component';
 import { ChartListComponent } from '../chart-list/chart-list.component';
@@ -11,11 +12,19 @@ import { ChartsService } from '../shared/services/charts.service';
 import { ConfigService } from '../shared/services/config.service';
 import { MenuService } from '../shared/services/menu.service';
 import { ChartIndexComponent } from './chart-index.component';
+import { GetMonocularCharts } from '../../store/helm.actions';
 
 // import { HeaderBarComponent } from '../header-bar/header-bar.component';
 // import { MainHeaderComponent } from '../main-header/main-header.component';
 // import { SeoService } from '../shared/services/seo.service';
 
+export class MockChartService {
+
+  public getCharts(){
+    return observableOf([]);
+  }
+}
+
 describe('Component: ChartIndex', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -32,7 +41,7 @@ describe('Component: ChartIndex', () => {
       providers: [
         ConfigService,
         MenuService,
-        { provide: ChartsService },
+        { provide: ChartsService, useValue: new MockChartService()},
         // { provide: SeoService },
         { provide: Router }
       ],

From 9e493c396b9cfd40665bc35f53c5d3b4ffc6f350 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 20 Aug 2019 12:43:33 +0100
Subject: [PATCH 053/648] Fix lint issue

---
 .../helm/monocular/chart-index/chart-index.component.spec.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts
index d881c083f6..60db292697 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts
@@ -20,7 +20,7 @@ import { GetMonocularCharts } from '../../store/helm.actions';
 
 export class MockChartService {
 
-  public getCharts(){
+  public getCharts() {
     return observableOf([]);
   }
 }

From 2049fe89b665a52671f2ab2d72ee206308874bd7 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 20 Aug 2019 13:11:18 +0100
Subject: [PATCH 054/648] Fix missing icons on Kubernetes

---
 .../monocular-tab-base/monocular-tab-base.component.ts |  8 ++++----
 .../helm-release-tab-base.component.ts                 | 10 +++++-----
 .../kubernetes/helm-release/helm-release.component.ts  |  4 ++--
 .../kubernetes-namespace.component.ts                  |  4 ++--
 .../kubernetes-node/kubernetes-node.component.ts       |  6 +++---
 .../kubernetes-tab-base.component.ts                   | 10 +++++-----
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.ts b/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.ts
index 16c7bee04a..67993ea19f 100644
--- a/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.ts
+++ b/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.ts
@@ -8,10 +8,10 @@ import { Component } from '@angular/core';
 export class MonocularTabBaseComponent {
 
   tabLinks = [
-    { link: 'charts', label: 'Charts', matIcon: 'folder_open' },
-    { link: 'repos', label: 'Repositories', matIcon: 'products', matIconFont: 'stratos-icons' },
-    { link: 'releases', label: 'Releases', matIcon: 'apps' },
-    { link: 'config', label: 'Config', matIcon: 'build' },
+    { link: 'charts', label: 'Charts', icon: 'folder_open' },
+    { link: 'repos', label: 'Repositories', icon: 'products', iconFont: 'stratos-icons' },
+    { link: 'releases', label: 'Releases', icon: 'apps' },
+    { link: 'config', label: 'Config', icon: 'build' },
   ];
 
 }
diff --git a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts b/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
index 1f62b30a07..e5063a381f 100644
--- a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
@@ -36,11 +36,11 @@ export class HelmReleaseTabBaseComponent {
   public title = '';
 
   tabLinks = [
-    { link: 'summary', label: 'Summary', matIcon: 'helm', matIconFont: 'stratos-icons' },
-    { link: 'notes', label: 'Notes', matIcon: 'subject' },
-    { link: 'values', label: 'Values', matIcon: 'list' },
-    { link: 'pods', label: 'Pods', matIcon: 'adjust' },
-    { link: 'services', label: 'Services', matIcon: 'service', matIconFont: 'stratos-icons' }
+    { link: 'summary', label: 'Summary', icon: 'helm', iconFont: 'stratos-icons' },
+    { link: 'notes', label: 'Notes', icon: 'subject' },
+    { link: 'values', label: 'Values', icon: 'list' },
+    { link: 'pods', label: 'Pods', icon: 'adjust' },
+    { link: 'services', label: 'Services', icon: 'service', iconFont: 'stratos-icons' }
   ];
   constructor(
     private helmRelease: HelmReleaseGuid,
diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.ts b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.ts
index d7a20e8472..b0734a0099 100644
--- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.ts
@@ -32,8 +32,8 @@ import { map } from 'rxjs/operators';
 export class HelmReleaseComponent implements OnInit {
 
   public tabLinks = [
-    { link: 'pods', label: 'Pods', matIcon: 'adjust' },
-    { link: 'services', label: 'Services', matIcon: 'service', matIconFont: 'stratos-icons' },
+    { link: 'pods', label: 'Pods', icon: 'adjust' },
+    { link: 'services', label: 'Services', icon: 'service', iconFont: 'stratos-icons' },
   ];
 
   public breadcrumbs$: Observable<IHeaderBreadcrumb[]>;
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts
index c5556dd390..ebe43a1a09 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts
@@ -33,8 +33,8 @@ import { KubernetesService } from '../services/kubernetes.service';
 export class KubernetesNamespaceComponent {
 
   tabLinks = [
-    { link: 'pods', label: 'Pods', matIcon: 'adjust' },
-    { link: 'services', label: 'Services', matIcon: 'service', matIconFont: 'stratos-icons' }
+    { link: 'pods', label: 'Pods', icon: 'adjust' },
+    { link: 'services', label: 'Services', icon: 'service', iconFont: 'stratos-icons' }
   ];
 
   public breadcrumbs$: Observable<IHeaderBreadcrumb[]>;
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts
index 46fa48f6fa..572a86da86 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts
@@ -34,9 +34,9 @@ import { KubernetesService } from '../services/kubernetes.service';
 export class KubernetesNodeComponent {
 
   tabLinks = [
-    { link: 'summary', label: 'Summary', matIcon: 'kubernetes', matIconFont: 'stratos-icons' },
-    { link: 'metrics', label: 'Metrics', matIcon: 'equalizer' },
-    { link: 'pods', label: 'Pods', matIcon: 'adjust' },
+    { link: 'summary', label: 'Summary', icon: 'kubernetes', iconFont: 'stratos-icons' },
+    { link: 'metrics', label: 'Metrics', icon: 'equalizer' },
+    { link: 'pods', label: 'Pods', icon: 'adjust' },
   ];
 
   public breadcrumbs$: Observable<IHeaderBreadcrumb[]>;
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
index fc2bb549de..c954603b71 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
@@ -30,11 +30,11 @@ import { UserFavoriteEndpoint } from '../../../../../store/src/types/user-favori
 export class KubernetesTabBaseComponent implements OnInit {
 
   tabLinks = [
-    { link: 'summary', label: 'Summary', matIcon: 'kubernetes', matIconFont: 'stratos-icons' },
-    { link: 'nodes', label: 'Nodes', matIcon: 'developer_board' },
-    { link: 'namespaces', label: 'Namespaces', matIcon: 'language' },
-    { link: 'pods', label: 'Pods', matIcon: 'adjust' },
-    { link: 'apps', label: 'Applications', matIcon: 'apps' }
+    { link: 'summary', label: 'Summary', icon: 'kubernetes', iconFont: 'stratos-icons' },
+    { link: 'nodes', label: 'Nodes', icon: 'developer_board' },
+    { link: 'namespaces', label: 'Namespaces', icon: 'language' },
+    { link: 'pods', label: 'Pods', icon: 'adjust' },
+    { link: 'apps', label: 'Applications', icon: 'apps' }
   ];
 
   isFetching$: Observable<boolean>;

From 0444983631f423d1aab47a14a567a7981a191658 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 20 Aug 2019 13:55:33 +0100
Subject: [PATCH 055/648] Unit test fix

---
 .../chart-index/chart-index.component.spec.ts         | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts
index 418098dd09..60db292697 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts
@@ -2,6 +2,7 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
+import { of as observableOf } from 'rxjs';
 
 import { ChartItemComponent } from '../chart-item/chart-item.component';
 import { ChartListComponent } from '../chart-list/chart-list.component';
@@ -11,11 +12,19 @@ import { ChartsService } from '../shared/services/charts.service';
 import { ConfigService } from '../shared/services/config.service';
 import { MenuService } from '../shared/services/menu.service';
 import { ChartIndexComponent } from './chart-index.component';
+import { GetMonocularCharts } from '../../store/helm.actions';
 
 // import { HeaderBarComponent } from '../header-bar/header-bar.component';
 // import { MainHeaderComponent } from '../main-header/main-header.component';
 // import { SeoService } from '../shared/services/seo.service';
 
+export class MockChartService {
+
+  public getCharts() {
+    return observableOf([]);
+  }
+}
+
 describe('Component: ChartIndex', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -32,7 +41,7 @@ describe('Component: ChartIndex', () => {
       providers: [
         ConfigService,
         MenuService,
-        { provide: ChartsService },
+        { provide: ChartsService, useValue: new MockChartService()},
         // { provide: SeoService },
         { provide: Router }
       ],

From bdf750adc1a7e144a923186ac6d53b1e65df7c9e Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 21 Aug 2019 12:42:55 +0100
Subject: [PATCH 056/648] Make unit test more reliable

---
 .../chart-details-info.component.spec.ts      |   5 +-
 .../chart-details-readme.component.spec.ts    |   6 +-
 .../chart-details.component.spec.ts           |   8 +-
 .../chart-details/chart-details.component.ts  |  27 +++--
 .../chart-index/chart-index.component.spec.ts |  10 +-
 .../monocular/charts/charts.component.spec.ts |   3 +-
 .../shared/services/chart.service.mock.ts     | 114 ++++++++++++++++++
 7 files changed, 146 insertions(+), 27 deletions(-)
 create mode 100644 custom-src/frontend/app/custom/helm/monocular/shared/services/chart.service.mock.ts

diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.spec.ts
index debefd2f28..ee32fad538 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.spec.ts
@@ -3,6 +3,7 @@ import { async, TestBed } from '@angular/core/testing';
 
 import { ChartsService } from '../../shared/services/charts.service';
 import { ChartDetailsInfoComponent } from './chart-details-info.component';
+import { MockChartService } from '../../shared/services/chart.service.mock';
 
 
 describe('Component: ChartDetailsInfo', () => {
@@ -11,7 +12,9 @@ describe('Component: ChartDetailsInfo', () => {
       TestBed.configureTestingModule({
         declarations: [ChartDetailsInfoComponent],
         imports: [],
-        providers: [{ provide: ChartsService }],
+        providers: [
+          { provide: ChartsService, useValue: new MockChartService()},
+        ],
         schemas: [NO_ERRORS_SCHEMA]
       }).compileComponents();
     })
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.spec.ts
index d0a4a1abdb..132e3f1d9c 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.spec.ts
@@ -3,14 +3,16 @@ import { TestBed } from '@angular/core/testing';
 
 import { ChartsService } from '../../shared/services/charts.service';
 import { ChartDetailsReadmeComponent } from './chart-details-readme.component';
-
+import { MockChartService } from '../../shared/services/chart.service.mock';
 
 describe('Component: ChartDetailsReadme', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [],
       declarations: [ChartDetailsReadmeComponent],
-      providers: [{ provide: ChartsService }],
+      providers: [
+        { provide: ChartsService, useValue: new MockChartService()},
+      ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
   });
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 ba98324bf2..2d834a6316 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
@@ -9,6 +9,7 @@ import { BaseTestModulesNoShared } from '../../../../../test-framework/cloud-fou
 import {
   EntitySummaryTitleComponent,
 } from '../../../../shared/components/entity-summary-title/entity-summary-title.component';
+import { PaginationMonitorFactory } from '../../../../shared/monitors/pagination-monitor.factory';
 import { ChartItemComponent } from '../chart-item/chart-item.component';
 import { ListItemComponent } from '../list-item/list-item.component';
 import { LoaderComponent } from '../loader/loader.component';
@@ -21,6 +22,8 @@ import { ChartDetailsReadmeComponent } from './chart-details-readme/chart-detail
 import { ChartDetailsUsageComponent } from './chart-details-usage/chart-details-usage.component';
 import { ChartDetailsVersionsComponent } from './chart-details-versions/chart-details-versions.component';
 import { ChartDetailsComponent } from './chart-details.component';
+import { MockChartService } from '../shared/services/chart.service.mock';
+import { HttpClientModule } from '@angular/common/http';
 
 /* tslint:disable:no-unused-variable */
 // import { Angulartics2Module } from 'angulartics2';
@@ -89,6 +92,7 @@ describe('ChartDetailsComponent', () => {
           // Angulartics2Module,
           RouterTestingModule,
           HttpModule,
+          HttpClientModule,
           ...BaseTestModulesNoShared
         ],
         declarations: [
@@ -106,11 +110,11 @@ describe('ChartDetailsComponent', () => {
           EntitySummaryTitleComponent
         ],
         providers: [
-          { provide: ChartsService },
+          { provide: ChartsService, useValue: new MockChartService()},
           { provide: ConfigService, useValue: { appName: 'appName' } },
           // { provide: SeoService },
           { provide: MenuService },
-          ChartsService
+          PaginationMonitorFactory,
         ]
       }).compileComponents();
     })
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.ts b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.ts
index 6d705ff79b..6e0d22df33 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.ts
@@ -30,18 +30,21 @@ export class ChartDetailsComponent implements OnInit {
     this.route.params.forEach((params: Params) => {
       const repo = params.repo;
       const chartName = params.chartName;
-      this.chartsService.getChart(repo, chartName).pipe(first()).subscribe(chart => {
-        this.loading = false;
-        this.chart = chart;
-        const version = params.version || this.chart.relationships.latestChartVersion.data.version;
-        this.chartsService.getVersion(repo, chartName, version).pipe(first())
-          .subscribe(chartVersion => {
-            this.currentVersion = chartVersion;
-            this.titleVersion = this.currentVersion.attributes.app_version || '';
-            this.updateMetaTags();
-          });
-        this.iconUrl = this.chartsService.getChartIconURL(this.chart);
-      });
+
+      if (!!chartName) {
+        this.chartsService.getChart(repo, chartName).pipe(first()).subscribe(chart => {
+          this.loading = false;
+          this.chart = chart;
+          const version = params.version || this.chart.relationships.latestChartVersion.data.version;
+          this.chartsService.getVersion(repo, chartName, version).pipe(first())
+            .subscribe(chartVersion => {
+              this.currentVersion = chartVersion;
+              this.titleVersion = this.currentVersion.attributes.app_version || '';
+              this.updateMetaTags();
+            });
+          this.iconUrl = this.chartsService.getChartIconURL(this.chart);
+        });
+      }
     });
   }
 
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts
index 60db292697..e19b0089eb 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts
@@ -2,7 +2,6 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
-import { of as observableOf } from 'rxjs';
 
 import { ChartItemComponent } from '../chart-item/chart-item.component';
 import { ChartListComponent } from '../chart-list/chart-list.component';
@@ -12,19 +11,12 @@ import { ChartsService } from '../shared/services/charts.service';
 import { ConfigService } from '../shared/services/config.service';
 import { MenuService } from '../shared/services/menu.service';
 import { ChartIndexComponent } from './chart-index.component';
-import { GetMonocularCharts } from '../../store/helm.actions';
+import { MockChartService } from '../shared/services/chart.service.mock';
 
 // import { HeaderBarComponent } from '../header-bar/header-bar.component';
 // import { MainHeaderComponent } from '../main-header/main-header.component';
 // import { SeoService } from '../shared/services/seo.service';
 
-export class MockChartService {
-
-  public getCharts() {
-    return observableOf([]);
-  }
-}
-
 describe('Component: ChartIndex', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
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 f90e98215a..ae3fcdd923 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
@@ -14,6 +14,7 @@ import { ConfigService } from '../shared/services/config.service';
 import { MenuService } from '../shared/services/menu.service';
 import { ReposService } from '../shared/services/repos.service';
 import { ChartsComponent } from './charts.component';
+import { MockChartService } from '../shared/services/chart.service.mock';
 
 // import { HeaderBarComponent } from '../header-bar/header-bar.component';
 // import { SeoService } from '../shared/services/seo.service';
@@ -35,7 +36,7 @@ describe('Component: Charts', () => {
       providers: [
         ConfigService,
         MenuService,
-        { provide: ChartsService },
+        { provide: ChartsService, useValue: new MockChartService()},
         // { provide: SeoService },
         { provide: ActivatedRoute },
         { provide: Router },
diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/services/chart.service.mock.ts b/custom-src/frontend/app/custom/helm/monocular/shared/services/chart.service.mock.ts
new file mode 100644
index 0000000000..09e1a7f191
--- /dev/null
+++ b/custom-src/frontend/app/custom/helm/monocular/shared/services/chart.service.mock.ts
@@ -0,0 +1,114 @@
+import { Observable, of as observableOf } from 'rxjs';
+import { Chart } from '../models/chart';
+import { ChartVersion } from '../models/chart-version';
+
+
+const mockChart: Chart = {
+  id: 'incubator/test',
+  type: 'chart',
+  links: [],
+  attributes: {
+    description: 'Testing the chart',
+    home: 'helm.sh',
+    keywords: ['artifactory'],
+    maintainers: [
+      {
+        email: 'test@example.com',
+        name: 'Test'
+      }
+    ],
+    name: 'test',
+    repo: {
+      name: 'incubator',
+      url: 'test'
+    },
+    icon: 'icon',
+    sources: ['https://github.com/']
+  },
+  relationships: {
+    latestChartVersion: {
+      data: {
+        app_version: '1.0',
+        created: new Date('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'
+      }
+    }
+  }
+};
+
+const mockChartVersion: ChartVersion = {
+  id: 'incubator/test',
+  type: 'chart',
+  attributes: {
+    app_version: '1.0',
+    created: new Date('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'
+  },
+  relationships: {
+    chart: {
+      data: mockChart.attributes,
+      links: {
+        self: '/v1/charts/incubator/test/versions/4.16.0'
+      }
+    }
+  }
+};
+
+export class MockChartService {
+
+  public getCharts() {
+    return observableOf([]);
+  }
+
+  public getChart(): Observable<Chart> {
+    return observableOf(mockChart);
+  }
+
+  public getChartReadme(): Observable<Response> {
+    return observableOf({} as Response);
+  }
+
+  public getVersions(): Observable<ChartVersion[]> {
+    return observableOf([]);
+  }
+
+  public getVersion(): Observable<ChartVersion> {
+    return observableOf(mockChartVersion);
+  }
+
+  public searchCharts(): Observable<Chart[]> {
+    return observableOf([]);
+  }
+
+  public getChartIconURL() {
+    return null;
+  }
+
+}

From bb72b416e5b97a3cce2c8f0afe53f672576a6a8a Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 22 Aug 2019 11:52:14 +0100
Subject: [PATCH 057/648] Disable Helm feature

---
 custom-src/frontend/app/custom/custom.module.ts   | 11 +++++++----
 deploy/ci/tasks/dev-releases/check-gh-release.yml |  1 -
 src/jetstream/plugins/monocular/main.go           | 14 ++++++++------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/custom-src/frontend/app/custom/custom.module.ts b/custom-src/frontend/app/custom/custom.module.ts
index e0dfea55d4..ca20c1a326 100644
--- a/custom-src/frontend/app/custom/custom.module.ts
+++ b/custom-src/frontend/app/custom/custom.module.ts
@@ -14,8 +14,8 @@ import { KubernetesSetupModule } from './kubernetes/kubernetes.setup.module';
 import { KubeHealthCheck } from './kubernetes/store/kubernetes.actions';
 import { SuseAboutInfoComponent } from './suse-about-info/suse-about-info.component';
 import { SuseLoginComponent } from './suse-login/suse-login.component';
-import { HelmModule } from './helm/helm.module';
-import { HelmSetupModule } from './helm/helm.setup.module';
+// import { HelmModule } from './helm/helm.module';
+// import { HelmSetupModule } from './helm/helm.setup.module';
 
 const SuseCustomizations: CustomizationsMetadata = {
   copyright: '&copy; 2019 SUSE',
@@ -29,8 +29,11 @@ const SuseCustomizations: CustomizationsMetadata = {
     SharedModule,
     MDAppModule,
     KubernetesSetupModule,
-    HelmModule,
-    HelmSetupModule
+    // #150 - Uncomment to enable helm plugin
+    // ---------------------------------------
+    // HelmModule,
+    // HelmSetupModule
+    // ---------------------------------------
   ],
   declarations: [
     SuseLoginComponent,
diff --git a/deploy/ci/tasks/dev-releases/check-gh-release.yml b/deploy/ci/tasks/dev-releases/check-gh-release.yml
index 55ad3f92f3..84529c8419 100644
--- a/deploy/ci/tasks/dev-releases/check-gh-release.yml
+++ b/deploy/ci/tasks/dev-releases/check-gh-release.yml
@@ -3,7 +3,6 @@ platform: linux
 inputs:
 - name: stratos
 - name: image-tag
-- name: aio-docker-image
 image_resource:
   type: docker-image
   source:
diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index 2336033fa0..6035925740 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -44,12 +44,14 @@ func (m *Monocular) GetChartStore() chartsvc.ChartSvcDatastore {
 
 // Init performs plugin initialization
 func (m *Monocular) Init() error {
-
-	m.ConfigureSQL()
-	m.chartSvcRoutes = chartsvc.GetRoutes()
-	m.InitSync()
-	m.syncOnStartup()
-	return nil
+	return errors.New("Manually disabled")
+	// #150 - Uncomment to enable helm plugin
+	// ---------------------------------------
+	// m.ConfigureSQL()
+	// m.chartSvcRoutes = chartsvc.GetRoutes()
+	// m.InitSync()
+	// m.syncOnStartup()
+	// return nil
 }
 
 func (m *Monocular) syncOnStartup() {

From d3f798dab53a27a8f9414245efa1d4b7cd519dcf Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 22 Aug 2019 21:40:19 +0100
Subject: [PATCH 058/648] Gate Helm feature on tech preview and always hide CF
 nav items

---
 .../frontend/app/custom/custom.module.ts      | 12 +++++------
 .../app/custom/helm/helm.store.module.ts      |  3 ++-
 src/jetstream/plugins/monocular/main.go       | 20 ++++++++-----------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/custom-src/frontend/app/custom/custom.module.ts b/custom-src/frontend/app/custom/custom.module.ts
index cbcc12110c..bc74c5f846 100644
--- a/custom-src/frontend/app/custom/custom.module.ts
+++ b/custom-src/frontend/app/custom/custom.module.ts
@@ -14,11 +14,14 @@ import { KubernetesSetupModule } from './kubernetes/kubernetes.setup.module';
 import { KubeHealthCheck } from './kubernetes/store/kubernetes.actions';
 import { SuseAboutInfoComponent } from './suse-about-info/suse-about-info.component';
 import { SuseLoginComponent } from './suse-login/suse-login.component';
+import { HelmModule } from './helm/helm.module';
+import { HelmSetupModule } from './helm/helm.setup.module';
 
 const SuseCustomizations: CustomizationsMetadata = {
   copyright: '&copy; 2019 SUSE',
   hasEula: true,
-  aboutInfoComponent: SuseAboutInfoComponent
+  aboutInfoComponent: SuseAboutInfoComponent,
+  alwaysShowNavForEndpointTypes: (typ) => false,
 };
 
 @NgModule({
@@ -27,11 +30,8 @@ const SuseCustomizations: CustomizationsMetadata = {
     SharedModule,
     MDAppModule,
     KubernetesSetupModule,
-    // #150 - Uncomment to enable helm plugin
-    // ---------------------------------------
-    // HelmModule,
-    // HelmSetupModule
-    // ---------------------------------------
+    HelmModule,
+    HelmSetupModule
   ],
   declarations: [
     SuseLoginComponent,
diff --git a/custom-src/frontend/app/custom/helm/helm.store.module.ts b/custom-src/frontend/app/custom/helm/helm.store.module.ts
index 0453fb0a20..520d8577d8 100644
--- a/custom-src/frontend/app/custom/helm/helm.store.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm.store.module.ts
@@ -14,7 +14,8 @@ const helmEndpointTypes: EndpointTypeExtensionConfig[] = [{
   imagePath: '/core/assets/custom/helm.svg',
   homeLink: (guid) => ['/monocular/repos', guid],
   entitySchemaKeys: monocularEntityKeys,
-  doesNotSupportConnect: true
+  doesNotSupportConnect: true,
+  techPreview: true,
 }];
 
 @StratosExtension({
diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index a834164206..20913e5b25 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -45,19 +45,15 @@ func (m *Monocular) GetChartStore() chartsvc.ChartSvcDatastore {
 // Init performs plugin initialization
 func (m *Monocular) Init() error {
 
-	return errors.New("Manually disabled")
-	// #150 - Uncomment to enable helm plugin
-	// ---------------------------------------
-	// m.ConfigureSQL()
-
-	// m.chartSvcRoutes = chartsvc.GetRoutes()
-
-	// m.InitSync()
-
-	// m.syncOnStartup()
+	if !m.portalProxy.GetConfig().EnableTechPreview {
+		return errors.New("Feature is in Tech Preview")
+	}
 
-	// return nil
-	// ---------------------------------------
+	m.ConfigureSQL()
+	m.chartSvcRoutes = chartsvc.GetRoutes()
+	m.InitSync()
+	m.syncOnStartup()
+	return nil
 }
 
 func (m *Monocular) syncOnStartup() {

From c69960e82ab5a4fb54862af5a87a68a3dc8bc3b2 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 22 Aug 2019 21:42:39 +0100
Subject: [PATCH 059/648] force a change

---
 src/jetstream/plugins/monocular/main.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index 6035925740..f07a4175c4 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -45,6 +45,7 @@ func (m *Monocular) GetChartStore() chartsvc.ChartSvcDatastore {
 // Init performs plugin initialization
 func (m *Monocular) Init() error {
 	return errors.New("Manually disabled")
+
 	// #150 - Uncomment to enable helm plugin
 	// ---------------------------------------
 	// m.ConfigureSQL()

From 75ec74f585db6f026f8544057ac2fe071754abc0 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 22 Aug 2019 21:47:52 +0100
Subject: [PATCH 060/648] Enable kube dashboard with tech preview mode

---
 src/jetstream/plugins/kubernetes/main.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index b8b0598ed5..5588b3b172 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -2,6 +2,7 @@ package kubernetes
 
 import (
 	"net/url"
+	"strconv"
 	"strings"
 
 	"errors"
@@ -143,7 +144,8 @@ func (c *KubernetesSpecification) Init() error {
 		UserInfo: c.GetGKEUserFromToken,
 	})
 
-	c.portalProxy.GetConfig().PluginConfig[KubeDashboardPluginConfigSetting] = "false"
+	// Kube dashboard is enabled by Tech Preview mode
+	c.portalProxy.GetConfig().PluginConfig[KubeDashboardPluginConfigSetting] = strconv.FormatBool(c.portalProxy.GetConfig().EnableTechPreview)
 
 	return nil
 }

From c6789b6bd8a6422483f1b7c2e7283a5d2e93713f Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Fri, 23 Aug 2019 10:07:26 +0100
Subject: [PATCH 061/648] Fix casing of auth name for Kube Config file

---
 src/jetstream/plugins/kubernetes/auth/kubeconfig.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jetstream/plugins/kubernetes/auth/kubeconfig.go b/src/jetstream/plugins/kubernetes/auth/kubeconfig.go
index 0af53ac0b5..da607b926c 100644
--- a/src/jetstream/plugins/kubernetes/auth/kubeconfig.go
+++ b/src/jetstream/plugins/kubernetes/auth/kubeconfig.go
@@ -4,7 +4,7 @@ import (
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 )
 
-const AuthConnectTypeKubeConfig = "KubeConfig"
+const AuthConnectTypeKubeConfig = "kubeconfig"
 
 // KubeConfigAuth is same as OIDC with different name
 type KubeConfigAuth struct {

From b2fc9c399bcaa8143add8517a2dee5372d80ff6f Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 23 Aug 2019 22:05:54 +0100
Subject: [PATCH 062/648] Add support for connecting CaaSP V4

---
 src/jetstream/auth.go                         |  7 +-
 src/jetstream/passthrough.go                  |  2 +-
 .../plugins/kubernetes/auth/kubeconfig.go     | 98 ++++++++++++++++++-
 src/jetstream/plugins/kubernetes/auth/oidc.go |  9 +-
 .../plugins/kubernetes/config/kube_config.go  | 57 +++++++++--
 src/jetstream/plugins/kubernetes/main.go      |  1 +
 6 files changed, 156 insertions(+), 18 deletions(-)

diff --git a/src/jetstream/auth.go b/src/jetstream/auth.go
index 71c7f63e11..46ab9e47c7 100644
--- a/src/jetstream/auth.go
+++ b/src/jetstream/auth.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-
 	"crypto/rand"
 	"encoding/base64"
 	"encoding/json"
@@ -20,8 +19,8 @@ import (
 	"github.com/labstack/echo"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
-	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/tokens"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/localusers"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/tokens"
 
 	"golang.org/x/crypto/bcrypt"
 )
@@ -343,7 +342,7 @@ func (p *portalProxy) doLocalLogin(c echo.Context) (string, string, error) {
 
 	username := c.FormValue("username")
 	password := c.FormValue("password")
-	guid     := c.FormValue("guid")
+	guid := c.FormValue("guid")
 
 	if len(username) == 0 || len(password) == 0 || len(guid) == 0 {
 		return guid, username, errors.New("Needs username, password and guid")
@@ -1249,7 +1248,7 @@ func (p *portalProxy) GetCNSIUserFromOAuthToken(cnsiGUID string, cfTokenRecord *
 }
 
 func (p *portalProxy) DoAuthFlowRequest(cnsiRequest *interfaces.CNSIRequest, req *http.Request, authHandler interfaces.AuthHandlerFunc) (*http.Response, error) {
-
+	log.Debug("DoAuthFlowRequest")
 	// get a cnsi token record and a cnsi record
 	tokenRec, cnsi, err := p.getCNSIRequestRecords(cnsiRequest)
 	if err != nil {
diff --git a/src/jetstream/passthrough.go b/src/jetstream/passthrough.go
index ea6499475f..dde1df041c 100644
--- a/src/jetstream/passthrough.go
+++ b/src/jetstream/passthrough.go
@@ -365,7 +365,7 @@ func (p *portalProxy) SendProxiedResponse(c echo.Context, responses map[string]*
 }
 
 func (p *portalProxy) doRequest(cnsiRequest *interfaces.CNSIRequest, done chan<- *interfaces.CNSIRequest) {
-	log.Debug("doRequest")
+	log.Debugf("doRequest for URL: %s", cnsiRequest.URL.String())
 	var body io.Reader
 	var res *http.Response
 	var req *http.Request
diff --git a/src/jetstream/plugins/kubernetes/auth/kubeconfig.go b/src/jetstream/plugins/kubernetes/auth/kubeconfig.go
index 0af53ac0b5..2adce58f80 100644
--- a/src/jetstream/plugins/kubernetes/auth/kubeconfig.go
+++ b/src/jetstream/plugins/kubernetes/auth/kubeconfig.go
@@ -1,10 +1,21 @@
 package auth
 
 import (
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"time"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/config"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	"github.com/labstack/echo"
+	log "github.com/sirupsen/logrus"
 )
 
-const AuthConnectTypeKubeConfig = "KubeConfig"
+const AuthConnectTypeKubeConfig = "kubeconfig"
+
+// KubeConfigAuth will look at the kube config file and use the appropriate auth provider
 
 // KubeConfigAuth is same as OIDC with different name
 type KubeConfigAuth struct {
@@ -20,6 +31,86 @@ func (c *KubeConfigAuth) GetName() string {
 	return AuthConnectTypeKubeConfig
 }
 
+func (c *KubeConfigAuth) FetchToken(cnsiRecord interfaces.CNSIRecord, ec echo.Context) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error) {
+	log.Debug("FetchToken (KubeConfigAuth)")
+
+	req := ec.Request()
+
+	// Need to extract the parameters from the request body
+	defer req.Body.Close()
+	body, err := ioutil.ReadAll(req.Body)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	kubeConfig, err := config.ParseKubeConfig(body)
+	kubeConfigUser, err := kubeConfig.GetUserForCluster(cnsiRecord.APIEndpoint.String())
+	if err != nil {
+		return nil, nil, fmt.Errorf("Unable to find cluster in kubeconfig")
+	}
+
+	// OIDC ? == CaaSP V3
+	if kubeConfigUser.User.AuthProvider.Name == "oidc" {
+		return c.GetTokenFromKubeConfigUser(cnsiRecord, kubeConfigUser)
+	}
+
+	// Check for Certificate == CaaSP V4
+	if len(kubeConfigUser.User.ClientCertificate) > 0 && len(kubeConfigUser.User.ClientKeyData) > 0 {
+		return c.GetCertAuth(cnsiRecord, kubeConfigUser)
+	}
+
+	// Check for Token == CaaSP V4
+	if len(kubeConfigUser.User.Token) > 0 {
+		tokenRecord := c.portalProxy.InitEndpointTokenRecord(getLargeExpiryTime(), kubeConfigUser.User.Token, "__NONE__", false)
+		tokenRecord.AuthType = interfaces.AuthTypeOIDC
+
+		oauthMetadata := &interfaces.OAuth2Metadata{}
+		jsonString, err := json.Marshal(oauthMetadata)
+		if err == nil {
+			tokenRecord.Metadata = string(jsonString)
+		}
+
+		// Could try and make a K8S Api call to validate the token
+		// Or, maybe we can verify the access token with the auth URL ?
+		return &tokenRecord, &cnsiRecord, nil
+	}
+
+	return nil, nil, fmt.Errorf("OIDC: Unsupported authentication provider for user: %s", kubeConfigUser.User.AuthProvider.Name)
+}
+
+func (c *KubeConfigAuth) GetCertAuth(cnsiRecord interfaces.CNSIRecord, user *config.KubeConfigUser) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error) {
+
+	kubeCertAuth := &KubeCertificate{}
+
+	cert, err := base64.StdEncoding.DecodeString(user.User.ClientCertificate)
+	if err != nil {
+		return nil, nil, err
+	}
+	certKey, err := base64.StdEncoding.DecodeString(user.User.ClientKeyData)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	kubeCertAuth.Certificate = string(cert)
+	kubeCertAuth.CertificateKey = string(certKey)
+
+	jsonString, err := kubeCertAuth.GetJSON()
+	if err != nil {
+		return nil, nil, err
+	}
+
+	// Refresh token isn't required since the AccessToken will never expire
+	refreshToken := jsonString
+
+	accessToken := jsonString
+
+	// Tokens lasts forever
+	disconnected := false
+	tokenRecord := c.portalProxy.InitEndpointTokenRecord(getLargeExpiryTime(), accessToken, refreshToken, disconnected)
+	tokenRecord.AuthType = authConnectTypeCertAuth
+	return &tokenRecord, &cnsiRecord, nil
+}
+
 func (c *KubeConfigAuth) RegisterJetstreamAuthType(portal interfaces.PortalProxy) {
 	// Register auth type with Jetstream
 	c.portalProxy.AddAuthProvider(c.GetName(), interfaces.AuthProvider{
@@ -27,3 +118,8 @@ func (c *KubeConfigAuth) RegisterJetstreamAuthType(portal interfaces.PortalProxy
 		UserInfo: nil,
 	})
 }
+
+func getLargeExpiryTime() int64 {
+	expiry := time.Now().Local().Add(time.Hour * time.Duration(100000))
+	return expiry.Unix()
+}
diff --git a/src/jetstream/plugins/kubernetes/auth/oidc.go b/src/jetstream/plugins/kubernetes/auth/oidc.go
index 70518c16b0..81bdf0000b 100644
--- a/src/jetstream/plugins/kubernetes/auth/oidc.go
+++ b/src/jetstream/plugins/kubernetes/auth/oidc.go
@@ -88,9 +88,14 @@ func (c *OIDCKubeAuth) FetchToken(cnsiRecord interfaces.CNSIRecord, ec echo.Cont
 
 	// We only support OIDC auth provider at the moment
 	if kubeConfigUser.User.AuthProvider.Name != "oidc" {
-		return nil, nil, errors.New("Unsupported authentication provider")
+		return nil, nil, fmt.Errorf("OIDC: Unsupported authentication provider for user: %s", kubeConfigUser.User.AuthProvider.Name)
 	}
 
+	return c.GetTokenFromKubeConfigUser(cnsiRecord, kubeConfigUser)
+}
+
+func (c *OIDCKubeAuth) GetTokenFromKubeConfigUser(cnsiRecord interfaces.CNSIRecord, kubeConfigUser *config.KubeConfigUser) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error) {
+
 	oidcConfig, err := c.GetOIDCConfig(kubeConfigUser)
 	if err != nil {
 		log.Info(err)
@@ -142,7 +147,7 @@ func (c *OIDCKubeAuth) GetOIDCConfig(k *config.KubeConfigUser) (*KubeConfigAuthP
 
 	expiry, ok := token.Claims().Expiration()
 	if !ok {
-		return nil, errors.New("Can not get Acces Token expiry time")
+		return nil, errors.New("Can not get Access Token expiry time")
 	}
 	OIDCConfig.Expiry = expiry
 
diff --git a/src/jetstream/plugins/kubernetes/config/kube_config.go b/src/jetstream/plugins/kubernetes/config/kube_config.go
index 3a9ab7419b..e86de033cc 100644
--- a/src/jetstream/plugins/kubernetes/config/kube_config.go
+++ b/src/jetstream/plugins/kubernetes/config/kube_config.go
@@ -8,7 +8,6 @@ import (
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces/config"
 
 	"gopkg.in/yaml.v2"
-
 )
 
 type KubeConfigClusterDetail struct {
@@ -38,6 +37,7 @@ type KubeConfigUser struct {
 //ExtraScopes string `yaml:"extra-scopes"`
 
 type KubeConfigContexts struct {
+	Name    string `yaml:"name"`
 	Context struct {
 		Cluster string
 		User    string
@@ -45,11 +45,12 @@ type KubeConfigContexts struct {
 }
 
 type KubeConfigFile struct {
-	ApiVersion string               `yaml:"apiVersion"`
-	Kind       string               `yaml:"kind"`
-	Clusters   []KubeConfigCluster  `yaml:"clusters"`
-	Users      []KubeConfigUser     `yaml:"users"`
-	Contexts   []KubeConfigContexts `yaml:"contexts"`
+	ApiVersion     string               `yaml:"apiVersion"`
+	Kind           string               `yaml:"kind"`
+	Clusters       []KubeConfigCluster  `yaml:"clusters"`
+	Users          []KubeConfigUser     `yaml:"users"`
+	Contexts       []KubeConfigContexts `yaml:"contexts"`
+	CurrentContext string               `yaml:"current-context"`
 }
 
 func (k *KubeConfigFile) GetClusterByAPIEndpoint(endpoint string) (*KubeConfigCluster, error) {
@@ -61,6 +62,15 @@ func (k *KubeConfigFile) GetClusterByAPIEndpoint(endpoint string) (*KubeConfigCl
 	return nil, fmt.Errorf("Unable to find cluster")
 }
 
+func (k *KubeConfigFile) GetClusterByName(name string) (*KubeConfigCluster, error) {
+	for _, cluster := range k.Clusters {
+		if cluster.Name == name {
+			return &cluster, nil
+		}
+	}
+	return nil, fmt.Errorf("Unable to find cluster")
+}
+
 func (k *KubeConfigFile) GetClusterContext(clusterName string) (*KubeConfigContexts, error) {
 	for _, context := range k.Contexts {
 		if context.Context.Cluster == clusterName {
@@ -70,6 +80,15 @@ func (k *KubeConfigFile) GetClusterContext(clusterName string) (*KubeConfigConte
 	return nil, fmt.Errorf("Unable to find context")
 }
 
+func (k *KubeConfigFile) GetContext(contextName string) (*KubeConfigContexts, error) {
+	for _, context := range k.Contexts {
+		if context.Name == contextName {
+			return &context, nil
+		}
+	}
+	return nil, fmt.Errorf("Unable to find context")
+}
+
 func (k *KubeConfigFile) GetUser(userName string) (*KubeConfigUser, error) {
 	for _, user := range k.Users {
 		if user.Name == userName {
@@ -80,14 +99,32 @@ func (k *KubeConfigFile) GetUser(userName string) (*KubeConfigUser, error) {
 }
 
 func (k *KubeConfigFile) GetUserForCluster(clusterEndpoint string) (*KubeConfigUser, error) {
-	cluster, err := k.GetClusterByAPIEndpoint(clusterEndpoint)
 
-	if err != nil {
-		return nil, errors.New("Unable to find cluster in kubeconfig")
+	var cluster *KubeConfigCluster
+	var err error
+
+	// Check to see if the current-context is for this endpoint, before going a search through all contexts
+	if len(k.CurrentContext) > 0 {
+		currentContext, err := k.GetContext(k.CurrentContext)
+		if err == nil {
+			c, err := k.GetClusterByName(currentContext.Context.Cluster)
+			if err == nil {
+				if c.Cluster.Server == clusterEndpoint {
+					// Cluster refrences the same Kube API Server
+					cluster = c
+				}
+			}
+		}
 	}
 
-	clusterName := cluster.Name
+	if cluster == nil {
+		cluster, err = k.GetClusterByAPIEndpoint(clusterEndpoint)
+		if err != nil {
+			return nil, errors.New("Unable to find cluster in kubeconfig")
+		}
+	}
 
+	clusterName := cluster.Name
 	if clusterName == "" {
 		return nil, errors.New("Unable to find cluster")
 	}
diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index 736ddfa35d..a52b77630d 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -56,6 +56,7 @@ func (c *KubernetesSpecification) Register(echoContext echo.Context) error {
 }
 
 func (c *KubernetesSpecification) Validate(userGUID string, cnsiRecord interfaces.CNSIRecord, tokenRecord interfaces.TokenRecord) error {
+	log.Debugf("Validating Kubernetes endpoint connection for user: %s", userGUID)
 	response, err := c.portalProxy.DoProxySingleRequest(cnsiRecord.GUID, userGUID, "GET", "api/v1/pods?limit=1", nil, nil)
 	if err != nil {
 		return err

From 82cf2c5e92ece2ff0290d90c9725dcac33d9c79c Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Tue, 27 Aug 2019 16:10:23 +0100
Subject: [PATCH 063/648] Fix typo

---
 .../app/custom/helm/create-release/create-release.component.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ba1999cdef..b9eb3b0f49 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
@@ -27,7 +27,7 @@ export class CreateReleaseComponent implements OnInit {
   // Confirmation dialog
   overwriteValuesConfirmation = new ConfirmationDialogConfig(
     'Overwrite Values?',
-    'Are you sure you want to replace your values with those from valuyes.yaml?',
+    'Are you sure you want to replace your values with those from values.yaml?',
     'Overwrite'
   );
 

From c55f6fb44374dd6190887fe7aae9d225150b1065 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Tue, 27 Aug 2019 16:11:34 +0100
Subject: [PATCH 064/648] Remove console.log

---
 .../app/custom/helm/create-release/create-release.component.ts   | 1 -
 1 file changed, 1 deletion(-)

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 b9eb3b0f49..2f00845e97 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
@@ -103,7 +103,6 @@ export class CreateReleaseComponent implements OnInit {
     this.kubeEndpoints$.pipe(
       first(),
       tap(ep => {
-        console.log(ep);
         if (ep.length === 1) {
           this.details.controls.endpoint.setValue(ep[0].guid, {onlySelf: true});
           setTimeout(() => {

From c78dfdef3cf280b44c1f089356f6304963980b6f Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 28 Aug 2019 10:11:49 +0100
Subject: [PATCH 065/648] Fix bad merge issue

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

diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index ed4bb07e60..ab12bfe713 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -97,8 +97,8 @@ func (c *KubernetesSpecification) Init() error {
 	c.AddAuthProvider(auth.InitKubeConfigAuth(c.portalProxy))
 
 	// Kube dashboard is enabled by Tech Preview mode
-	c.portalProxy.GetConfig().PluginConfig[KubeDashboardPluginConfigSetting] = strconv.FormatBool(c.portalProxy.GetConfig().EnableTechPreview
-	
+	c.portalProxy.GetConfig().PluginConfig[KubeDashboardPluginConfigSetting] = strconv.FormatBool(c.portalProxy.GetConfig().EnableTechPreview)
+
 	return nil
 }
 

From fdf2ba3f87b31d0e54ddb8a15059dfffd5a94ec2 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 28 Aug 2019 10:12:25 +0100
Subject: [PATCH 066/648] Fix bad merge issue

---
 src/jetstream/plugins/kubernetes/main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index ab12bfe713..a6d7f13716 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -97,7 +97,7 @@ func (c *KubernetesSpecification) Init() error {
 	c.AddAuthProvider(auth.InitKubeConfigAuth(c.portalProxy))
 
 	// Kube dashboard is enabled by Tech Preview mode
-	c.portalProxy.GetConfig().PluginConfig[KubeDashboardPluginConfigSetting] = strconv.FormatBool(c.portalProxy.GetConfig().EnableTechPreview)
+	c.portalProxy.GetConfig().PluginConfig[kubeDashboardPluginConfigSetting] = strconv.FormatBool(c.portalProxy.GetConfig().EnableTechPreview)
 
 	return nil
 }

From eaf9f1c87b2d8a3a3e5de04daa4bd35766545e31 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Wed, 28 Aug 2019 10:54:16 +0100
Subject: [PATCH 067/648] Fix test & compile

---
 .../create-release/create-release.component.ts     | 14 +++++++-------
 .../chart-index/chart-index.component.spec.ts      |  5 +++--
 2 files changed, 10 insertions(+), 9 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 2f00845e97..5d5ee711ea 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,21 +1,21 @@
 import { HttpClient } from '@angular/common/http';
-import { Component, ElementRef, ViewChild, OnInit } from '@angular/core';
+import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { MatTextareaAutosize } from '@angular/material';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { Observable, of, Subscription } from 'rxjs';
-import { delay, filter, map, pairwise, switchMap, first, tap } from 'rxjs/operators';
+import { delay, filter, first, map, pairwise, switchMap, tap } from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
 import { selectUpdateInfo } from '../../../../../store/src/selectors/api.selectors';
 import { EndpointsService } from '../../../core/endpoints.service';
+import { ConfirmationDialogConfig } from '../../../shared/components/confirmation-dialog.config';
+import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service';
 import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component';
 import { HelmInstall } from '../store/helm.actions';
 import { helmReleaseSchemaKey } from '../store/helm.entities';
 import { HELM_INSTALLING_KEY, HelmInstallValues } from '../store/helm.types';
-import { ConfirmationDialogConfig } from '../../../shared/components/confirmation-dialog.config';
-import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service';
 
 @Component({
   selector: 'app-create-release',
@@ -45,7 +45,7 @@ export class CreateReleaseComponent implements OnInit {
   @ViewChild('overridesYamlTextArea') overridesYamlTextArea: ElementRef;
   @ViewChild(MatTextareaAutosize) overridesYamlAutosize: MatTextareaAutosize;
 
-  private valuesYaml = '';
+  public valuesYaml = '';
 
   constructor(
     private route: ActivatedRoute,
@@ -95,7 +95,7 @@ export class CreateReleaseComponent implements OnInit {
   }
 
   private replaceWithValuesYaml() {
-    this.overrides.controls.values.setValue(this.valuesYaml, {onlySelf: true});
+    this.overrides.controls.values.setValue(this.valuesYaml, { onlySelf: true });
   }
 
   ngOnInit() {
@@ -104,7 +104,7 @@ export class CreateReleaseComponent implements OnInit {
       first(),
       tap(ep => {
         if (ep.length === 1) {
-          this.details.controls.endpoint.setValue(ep[0].guid, {onlySelf: true});
+          this.details.controls.endpoint.setValue(ep[0].guid, { onlySelf: true });
           setTimeout(() => {
             this.releaseNameInputField.nativeElement.focus();
           }, 1);
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts
index 37e7a65aba..4561de7fbc 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts
@@ -2,6 +2,7 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
+import { of } from 'rxjs';
 
 import { ChartItemComponent } from '../chart-item/chart-item.component';
 import { ChartListComponent } from '../chart-list/chart-list.component';
@@ -19,7 +20,7 @@ import { ChartIndexComponent } from './chart-index.component';
 export class MockChartService {
 
   public getCharts() {
-    return observableOf([]);
+    return of([]);
   }
 }
 
@@ -39,7 +40,7 @@ describe('Component: ChartIndex', () => {
       providers: [
         ConfigService,
         MenuService,
-        { provide: ChartsService, useValue: new MockChartService()},
+        { provide: ChartsService, useValue: new MockChartService() },
         // { provide: SeoService },
         { provide: Router }
       ],

From 30165526586fe761f50735c7f9d8a886225d24b8 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Wed, 28 Aug 2019 10:56:57 +0100
Subject: [PATCH 068/648] Ensure helm endpoint cards have no opacity

---
 .../endpoint/endpoint-card/endpoint-card.component.html      | 5 ++---
 .../endpoint/endpoint-card/endpoint-card.component.ts        | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.html b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.html
index fff7475385..c0fdab6721 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.html
@@ -1,9 +1,8 @@
 <app-page-header-events class="endpoint-warning" [endpointIds$]="endpointIds$" [simpleErrorMessage]="true">
 </app-page-header-events>
 <app-meta-card class="endpoint-card" [routerLink]="endpointLink" [appDisableRouterLink]="!endpointLink"
-  [ngClass]="{'endpoint-card--no-link': !endpointLink, 'endpoint-card--disconnected': row.connectionStatus === 'disconnected', 'endpoint-card--checking': row.connectionStatus === 'checking'}" 
-  [favorite]="favorite" [actionMenu]="cardMenu" [status$]="cardStatus$"
-  [statusIcon]="false" [statusBackground]="true">
+  [ngClass]="{'endpoint-card--no-link': !endpointLink, 'endpoint-card--disconnected': connectionStatus === 'disconnected', 'endpoint-card--checking': connectionStatus === 'checking'}"
+  [favorite]="favorite" [actionMenu]="cardMenu" [status$]="cardStatus$" [statusIcon]="false" [statusBackground]="true">
   <app-meta-card-title>
     <div class="endpoint-card__title">
       <div *ngIf="!!endpointConfig && endpointConfig.imagePath" class="endpoint-card__image-wrapper">
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 6359365f51..093ec05bc5 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
@@ -52,6 +52,7 @@ export class EndpointCardComponent extends CardCell<EndpointModel> implements On
   public endpointIds$: Observable<string[]>;
   public cardStatus$: Observable<StratosStatus>;
   private subs: Subscription[] = [];
+  public connectionStatus: string;
 
   private componentRef: ComponentRef<EndpointListDetailsComponent>;
 
@@ -76,7 +77,7 @@ export class EndpointCardComponent extends CardCell<EndpointModel> implements On
     this.endpointLink = row.connectionStatus === 'connected' || this.endpointConfig.doesNotSupportConnect ?
       EndpointsService.getLinkForEndpoint(row) : null;
     this.updateInnerComponent();
-
+    this.connectionStatus = this.endpointConfig.doesNotSupportConnect ? 'connected' : row.connectionStatus;
   }
   get row(): EndpointModel {
     return this.pRow;

From d8a590f500583bf03b9a7e97126ccc20c25d2250 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Wed, 28 Aug 2019 13:21:38 +0100
Subject: [PATCH 069/648] Add health check for helm endpoint type When endpoint
 is syncing fetch endpoint data until sycing has finished

---
 custom-src/frontend/app/custom/custom.module.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/custom-src/frontend/app/custom/custom.module.ts b/custom-src/frontend/app/custom/custom.module.ts
index ca20c1a326..f73017222f 100644
--- a/custom-src/frontend/app/custom/custom.module.ts
+++ b/custom-src/frontend/app/custom/custom.module.ts
@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
 import { Router } from '@angular/router';
 import { Store } from '@ngrx/store';
 
+import { GetSystemInfo } from '../../../store/src/actions/system.actions';
 import { AppState } from '../../../store/src/app-state';
 import { EndpointHealthCheck } from '../../endpoints-health-checks';
 import { CoreModule } from '../core/core.module';
@@ -14,8 +15,6 @@ import { KubernetesSetupModule } from './kubernetes/kubernetes.setup.module';
 import { KubeHealthCheck } from './kubernetes/store/kubernetes.actions';
 import { SuseAboutInfoComponent } from './suse-about-info/suse-about-info.component';
 import { SuseLoginComponent } from './suse-login/suse-login.component';
-// import { HelmModule } from './helm/helm.module';
-// import { HelmSetupModule } from './helm/helm.setup.module';
 
 const SuseCustomizations: CustomizationsMetadata = {
   copyright: '&copy; 2019 SUSE',
@@ -57,6 +56,13 @@ export class CustomModule {
     endpointService.registerHealthCheck(
       new EndpointHealthCheck('k8s', (endpoint) => store.dispatch(new KubeHealthCheck(endpoint.guid)))
     );
+    endpointService.registerHealthCheck(
+      new EndpointHealthCheck('helm', (endpoint) => {
+        if (endpoint.endpoint_metadata && endpoint.endpoint_metadata.status === 'Synchronizing') {
+          store.dispatch(new GetSystemInfo());
+        }
+      })
+    );
     // Only update the routes once
     if (!CustomModule.init) {
       // Override the component used for the login route

From 64d772aefde060c652646809563eca6062117586 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Wed, 28 Aug 2019 14:31:10 +0100
Subject: [PATCH 070/648] Fix e2e tests

---
 .../cloud-foundry-list-cf-e2e.spec.ts         | 13 ++--------
 src/test-e2e/endpoints/endpoints-e2e.spec.ts  | 25 +++----------------
 src/test-e2e/po/side-nav.po.ts                | 12 +++++++--
 3 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/src/test-e2e/cloud-foundry/cloud-foundry-list-cf-e2e.spec.ts b/src/test-e2e/cloud-foundry/cloud-foundry-list-cf-e2e.spec.ts
index 68fb0bcc78..2d193d6eb6 100644
--- a/src/test-e2e/cloud-foundry/cloud-foundry-list-cf-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/cloud-foundry-list-cf-e2e.spec.ts
@@ -15,17 +15,8 @@ describe('CF Endpoints Dashboard - ', () => {
         .clearAllEndpoints();
     });
 
-    beforeEach(() => {
-      nav.goto(SideNavMenuItem.CloudFoundry);
-      cloudFoundry.loadingIndicator.waitUntilNotShown();
-    });
-
-    it('should be the Endpoints page', () => {
-      expect(cloudFoundry.isActivePage()).toBeTruthy();
-    });
-
-    it('should show the `no registered endpoints` message', () => {
-      expect(cloudFoundry.hasNoCloudFoundryMessage).toBeTruthy();
+    it('No CF side nav when no CF connected', () => {
+      expect(nav.isMenuItemPresent(SideNavMenuItem.CloudFoundry)).toBeFalsy();
     });
   });
 
diff --git a/src/test-e2e/endpoints/endpoints-e2e.spec.ts b/src/test-e2e/endpoints/endpoints-e2e.spec.ts
index 486018cad5..4aa2dfbaff 100644
--- a/src/test-e2e/endpoints/endpoints-e2e.spec.ts
+++ b/src/test-e2e/endpoints/endpoints-e2e.spec.ts
@@ -1,18 +1,12 @@
-import { ApplicationsPage } from '../applications/applications.po';
-import { CfTopLevelPage } from '../cloud-foundry/cf-level/cf-top-level-page.po';
 import { e2e } from '../e2e';
 import { ConsoleUserType } from '../helpers/e2e-helpers';
 import { MenuComponent } from '../po/menu.po';
 import { SideNavMenuItem } from '../po/side-nav.po';
 import { SnackBarPo } from '../po/snackbar.po';
-import { ServicesPage } from '../services/services.po';
 import { EndpointsPage } from './endpoints.po';
 
 describe('Endpoints', () => {
   const endpointsPage = new EndpointsPage();
-  const applications = new ApplicationsPage();
-  const services = new ServicesPage();
-  const cloudFoundry = new CfTopLevelPage();
 
   describe('Workflow on log in (admin/non-admin + no endpoints/some endpoints) -', () => {
     describe('As Admin -', () => {
@@ -46,19 +40,8 @@ describe('Endpoints', () => {
           expect(endpointsPage.isActivePage()).toBeTruthy();
         });
 
-        it('Should show application wall with \'no clusters\' message', () => {
-          endpointsPage.sideNav.goto(SideNavMenuItem.Applications);
-          expect(applications.hasNoCloudFoundryMessage()).toBeTruthy();
-        });
-
-        it('Should show services view with \'no clusters\' message', () => {
-          endpointsPage.sideNav.goto(SideNavMenuItem.Services);
-          expect(services.hasNoCloudFoundryMessage()).toBeTruthy();
-        });
-
-        it('Should show Cloud Foundry view with \'no clusters\' message', () => {
-          endpointsPage.sideNav.goto(SideNavMenuItem.CloudFoundry);
-          expect(cloudFoundry.hasNoCloudFoundryMessage()).toBeTruthy();
+        it('No CF side nav when no CF connected', () => {
+          expect(endpointsPage.sideNav.isMenuItemPresent(SideNavMenuItem.CloudFoundry)).toBeFalsy();
         });
 
         it('Welcome snackbar message should be displayed', () => {
@@ -121,8 +104,8 @@ describe('Endpoints', () => {
                 const menu = new MenuComponent();
                 menu.waitUntilShown();
                 menu.getItemMap().then(items => {
-                  expect(items['connect']).toBeDefined();
-                  expect(items['disconnect']).not.toBeDefined();
+                  expect(items.connect).toBeDefined();
+                  expect(items.disconnect).not.toBeDefined();
                 });
                 return menu.close();
               });
diff --git a/src/test-e2e/po/side-nav.po.ts b/src/test-e2e/po/side-nav.po.ts
index 92ea249ebc..1e258f5509 100644
--- a/src/test-e2e/po/side-nav.po.ts
+++ b/src/test-e2e/po/side-nav.po.ts
@@ -1,4 +1,4 @@
-import { browser, by, element, promise } from 'protractor';
+import { browser, by, element, ElementFinder, promise } from 'protractor';
 
 import { E2EHelpers } from '../helpers/e2e-helpers';
 import { Component } from './component.po';
@@ -23,9 +23,17 @@ export class SideNavigation extends Component {
 
   // Goto the specified menu item
   goto(menuItem: SideNavMenuItem): promise.Promise<void> {
-    return this.helpers.waitForElementAndClick(element(by.cssContainingText('.side-nav__item', menuItem)))
+    return this.helpers.waitForElementAndClick(this.getMenuItem(menuItem))
       .then(() => browser.actions().mouseMove({ x: 500, y: 0 }).perform())
       .then(() => browser.sleep(500));
   }
 
+  isMenuItemPresent(menuItem: SideNavMenuItem) {
+    return this.getMenuItem(menuItem).isPresent();
+  }
+
+  getMenuItem(menuItem: SideNavMenuItem): ElementFinder {
+    return this.locator.element(by.cssContainingText('.side-nav__item', menuItem));
+  }
+
 }

From 70c576994e8ab730b5786dd08fc208cc800bcabd Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Wed, 28 Aug 2019 15:00:48 +0100
Subject: [PATCH 071/648] Fix unit tests

---
 .../create-release.component.spec.ts          | 19 ++++++++++++++++---
 .../chart-details-info.component.spec.ts      |  4 ++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.spec.ts b/custom-src/frontend/app/custom/helm/create-release/create-release.component.spec.ts
index 2d0492460b..c0e7e1b359 100644
--- a/custom-src/frontend/app/custom/helm/create-release/create-release.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/create-release/create-release.component.spec.ts
@@ -1,7 +1,8 @@
 import { CommonModule } from '@angular/common';
 import { HttpClientModule } from '@angular/common/http';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ConnectionBackend, Http, HttpModule } from '@angular/http';
+import { ConnectionBackend, Http } from '@angular/http';
 import { MockBackend } from '@angular/http/testing';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
@@ -10,6 +11,7 @@ import { StoreModule } from '@ngrx/store';
 import { appReducers } from '../../../../../store/src/reducers.module';
 import { TabNavService } from '../../../../tab-nav.service';
 import { CoreModule } from '../../../core/core.module';
+import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service';
 import {
   CreateApplicationStep1Component,
 } from '../../../shared/components/create-application/create-application-step1/create-application-step1.component';
@@ -25,6 +27,7 @@ import { CreateReleaseComponent } from './create-release.component';
 describe('CreateReleaseComponent', () => {
   let component: CreateReleaseComponent;
   let fixture: ComponentFixture<CreateReleaseComponent>;
+  let httpMock: HttpTestingController;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
@@ -36,7 +39,7 @@ describe('CreateReleaseComponent', () => {
       imports: [
         CommonModule,
         CoreModule,
-        HttpModule,
+        HttpClientTestingModule,
         RouterTestingModule,
         BrowserAnimationsModule,
         PageHeaderModule,
@@ -56,10 +59,14 @@ describe('CreateReleaseComponent', () => {
         EntityMonitorFactory,
         InternalEventMonitorFactory,
         CloudFoundryService,
-        TabNavService
+        TabNavService,
+        ConfirmationDialogService
       ]
     })
       .compileComponents();
+
+    httpMock = TestBed.get(HttpTestingController);
+
   }));
 
   beforeEach(() => {
@@ -69,6 +76,12 @@ describe('CreateReleaseComponent', () => {
   });
 
   it('should be created', () => {
+    httpMock.expectOne('/pp/v1/chartsvc/v1/assets/undefined/undefined/versions/undefined/values.yaml');
+
     expect(component).toBeTruthy();
   });
+
+  afterEach(() => {
+    httpMock.verify();
+  });
 });
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.spec.ts
index ee32fad538..74d65fd3c7 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.spec.ts
@@ -1,9 +1,9 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { async, TestBed } from '@angular/core/testing';
 
+import { MockChartService } from '../../shared/services/chart.service.mock';
 import { ChartsService } from '../../shared/services/charts.service';
 import { ChartDetailsInfoComponent } from './chart-details-info.component';
-import { MockChartService } from '../../shared/services/chart.service.mock';
 
 
 describe('Component: ChartDetailsInfo', () => {
@@ -13,7 +13,7 @@ describe('Component: ChartDetailsInfo', () => {
         declarations: [ChartDetailsInfoComponent],
         imports: [],
         providers: [
-          { provide: ChartsService, useValue: new MockChartService()},
+          { provide: ChartsService, useValue: new MockChartService() },
         ],
         schemas: [NO_ERRORS_SCHEMA]
       }).compileComponents();

From a86fee33b7d3a8ef2b9a7029c6ac882ff3cd0d5c Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 28 Aug 2019 11:25:14 +0100
Subject: [PATCH 072/648] Allow DB directory to be specified for SQLite

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

diff --git a/src/jetstream/datastore/datastore.go b/src/jetstream/datastore/datastore.go
index 26c2917bcc..d377039b88 100644
--- a/src/jetstream/datastore/datastore.go
+++ b/src/jetstream/datastore/datastore.go
@@ -147,7 +147,7 @@ func GetConnection(dc DatabaseConfig, env *env.VarSet) (*sql.DB, error) {
 
 	}
 
-	// SQL Lite
+	// SQL Lite - SQLITE_DB_DIR env var allows directory for console db to be changed
 	return GetSQLLiteConnection(env.MustBool("SQLITE_KEEP_DB"), env.String("SQLITE_DB_DIR", "."))
 }
 
@@ -157,7 +157,7 @@ func GetSQLLiteConnection(sqliteKeepDB bool, sqlDbDir string) (*sql.DB, error) {
 	dbFilePath := path.Join(sqlDbDir, SQLiteDatabaseFile)
 	log.Infof("SQLite Database file: %s", dbFilePath)
 
-	return GetSQLLiteConnectionWithPath(SQLiteDatabaseFile, sqliteKeepDB)
+	return GetSQLLiteConnectionWithPath(dbFilePath, sqliteKeepDB)
 }
 
 // GetSQLLiteConnectionWithPath returns an SQLite DB Connection

From 9dd0511f97134ed57652ab8639abf7b91a77c1bc Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 29 Aug 2019 11:25:18 +0100
Subject: [PATCH 073/648] Add a custom welcome page for no endpoints

---
 .../frontend/app/custom/custom.module.ts      |  4 ++
 .../suse-welcome/suse-welcome.component.html  | 31 +++++++++++++
 .../suse-welcome/suse-welcome.component.scss  | 45 +++++++++++++++++++
 .../suse-welcome/suse-welcome.component.ts    |  8 ++++
 .../features/endpoints/endpoints.module.ts    |  4 +-
 5 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.html
 create mode 100644 custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.scss
 create mode 100644 custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.ts

diff --git a/custom-src/frontend/app/custom/custom.module.ts b/custom-src/frontend/app/custom/custom.module.ts
index a8d8ef9586..6f83726f5b 100644
--- a/custom-src/frontend/app/custom/custom.module.ts
+++ b/custom-src/frontend/app/custom/custom.module.ts
@@ -17,11 +17,13 @@ import { SuseAboutInfoComponent } from './suse-about-info/suse-about-info.compon
 import { SuseLoginComponent } from './suse-login/suse-login.component';
 import { HelmModule } from './helm/helm.module';
 import { HelmSetupModule } from './helm/helm.setup.module';
+import { SuseWelcomeComponent } from './suse-welcome/suse-welcome.component';
 
 const SuseCustomizations: CustomizationsMetadata = {
   copyright: '&copy; 2019 SUSE',
   hasEula: true,
   aboutInfoComponent: SuseAboutInfoComponent,
+  noEndpointsComponent: SuseWelcomeComponent,
   alwaysShowNavForEndpointTypes: (typ) => false,
 };
 
@@ -37,11 +39,13 @@ const SuseCustomizations: CustomizationsMetadata = {
   declarations: [
     SuseLoginComponent,
     SuseAboutInfoComponent,
+    SuseWelcomeComponent,
     DemoHelperComponent
   ],
   entryComponents: [
     SuseLoginComponent,
     SuseAboutInfoComponent,
+    SuseWelcomeComponent,
     DemoHelperComponent,
   ],
   providers: [
diff --git a/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.html b/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.html
new file mode 100644
index 0000000000..b2a52c6faa
--- /dev/null
+++ b/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.html
@@ -0,0 +1,31 @@
+<app-stratos-title title="Cloud Application Platform Console"></app-stratos-title>
+
+<div class="no-endpoints-message">
+  <mat-icon class="no-endpoints-message__icon">settings_ethernet</mat-icon>
+  <div class="no-endpoints-message__text">There are no registered endpoints</div>
+</div>
+
+<app-tile-grid>
+  <app-tile-group>
+    <app-tile>
+      <mat-card class="full-card">
+        <h2 class="messages__title">Getting Started</h2>
+        <ul>
+          <li><div class="messages__item">Start by registering endpoints, such as a Kubernetes Cluster or a Cloud Foundry. Use the <mat-icon>add</mat-icon> icon in the top-right</div></li>
+          <li><div class="messages__item">Once you have registered one or more endpoints, connect to them with your credentials</div></li>
+          <li><div class="messages__item">As you register and connect endpoints the side navigation bar will update to show the features appropriate to your endpoints</div></li>
+          <li><div class="messages__item">You can register and connect to multiple endpoints of any type</div></li>
+        </ul>
+      </mat-card>
+    </app-tile>
+    <app-tile>
+      <mat-card class="full-card">
+        <h2 class="messages__title">Tips</h2>
+        <ul>
+          <li><div class="messages__item">You can collapse and expand the side navigation bar using the <mat-icon>menu</mat-icon> icon in the top-left. This setting is stored in your browser and will persist across application reloads</div></li>
+          <li><div class="messages__item">You can favorite endpoints and entities within an endpoint using the <mat-icon>star_border</mat-icon> icon. These will appear for quick access on the Home page</div></li>
+        </ul>
+      </mat-card>
+    </app-tile>
+  </app-tile-group>
+</app-tile-grid>
diff --git a/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.scss b/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.scss
new file mode 100644
index 0000000000..ee42a17333
--- /dev/null
+++ b/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.scss
@@ -0,0 +1,45 @@
+@import '../../../sass/custom/suse-colors';
+
+.no-endpoints-message {
+  color: $suse-button-gray;
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  margin: 40px 0;
+
+  &__icon {
+    font-size: 32px;
+    height: 32px;
+    width: 32px;
+  }
+
+  &__text {
+    font-size: 24px;
+    margin-left: 12px;
+  }
+}
+
+.messages {
+
+  &__title {
+    color: $suse-primary;
+    font-size: 20px;
+    font-weight: normal;
+    margin: 20px 0;
+  }
+
+  &__item {
+    font-size: 16px;
+    line-height: 22px;
+    margin-bottom: 12px;
+
+    mat-icon {
+      background-color: $suse-text-gray;
+      font-size: 16px;
+      height: 16px;
+      margin: 0 4px;
+      vertical-align: middle;
+      width: 16px;
+    }
+  }
+}
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.ts b/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.ts
new file mode 100644
index 0000000000..dc04e71d03
--- /dev/null
+++ b/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-suse-welcome',
+  templateUrl: './suse-welcome.component.html',
+  styleUrls: ['./suse-welcome.component.scss'],
+})
+export class SuseWelcomeComponent {}
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 3fafb30c7a..bf87b9653e 100644
--- a/src/frontend/packages/core/src/features/endpoints/endpoints.module.ts
+++ b/src/frontend/packages/core/src/features/endpoints/endpoints.module.ts
@@ -9,13 +9,15 @@ import { ConnectEndpointDialogComponent } from './connect-endpoint-dialog/connec
 import { CreateEndpointModule } from './create-endpoint/create-endpoint.module';
 import { EndpointsPageComponent } from './endpoints-page/endpoints-page.component';
 import { EndpointsRoutingModule } from './endpoints.routing';
+import { CustomImportModule } from '../../custom-import.module';
 
 @NgModule({
   imports: [
     CoreModule,
     SharedModule,
     EndpointsRoutingModule,
-    CreateEndpointModule
+    CreateEndpointModule,
+    CustomImportModule
   ],
   declarations: [
     EndpointsPageComponent,

From f95c4cfe1c44029c066538b0647fe94edc56751a Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Thu, 29 Aug 2019 15:06:41 +0100
Subject: [PATCH 074/648] Don't include `Use the Endpoints view to register`
 hint in endpoints view

---
 .../endpoints/endpoints-page/endpoints-page.component.html   | 5 +++--
 .../endpoints-missing/endpoints-missing.component.html       | 3 ++-
 .../endpoints-missing/endpoints-missing.component.ts         | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

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 580ba39c65..6a80270ca3 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
@@ -9,6 +9,7 @@ <h1>Endpoints</h1>
 
 <app-list *ngIf="(endpointsService.haveRegistered$ | async); else noEndpointsContainer"></app-list>
 <ng-template #noEndpointsContainer>
-  <app-endpoints-missing *ngIf="!customizations.noEndpointsComponent; else customNoEndpoints"></app-endpoints-missing>
+  <app-endpoints-missing *ngIf="!customizations.noEndpointsComponent; else customNoEndpoints"
+    [showDirectToEndpointMessage]="false"></app-endpoints-missing>
 </ng-template>
-<ng-template #customNoEndpoints></ng-template>
+<ng-template #customNoEndpoints></ng-template>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/endpoints-missing/endpoints-missing.component.html b/src/frontend/packages/core/src/shared/components/endpoints-missing/endpoints-missing.component.html
index 057ce86b12..05e5bd6c48 100644
--- a/src/frontend/packages/core/src/shared/components/endpoints-missing/endpoints-missing.component.html
+++ b/src/frontend/packages/core/src/shared/components/endpoints-missing/endpoints-missing.component.html
@@ -1,3 +1,4 @@
 <app-no-content-message *ngIf="noContent$ | async as message" [icon]="'settings_ethernet'" [hidden]="!message"
-  [firstLine]="message.firstLine" [secondLine]="message.secondLine" [toolbarLink]="message.toolbarLink">
+  [firstLine]="message.firstLine" [secondLine]="showDirectToEndpointMessage ? message.secondLine : null"
+  [toolbarLink]="message.toolbarLink">
 </app-no-content-message>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/endpoints-missing/endpoints-missing.component.ts b/src/frontend/packages/core/src/shared/components/endpoints-missing/endpoints-missing.component.ts
index ae53fd4bb0..b8625eff53 100644
--- a/src/frontend/packages/core/src/shared/components/endpoints-missing/endpoints-missing.component.ts
+++ b/src/frontend/packages/core/src/shared/components/endpoints-missing/endpoints-missing.component.ts
@@ -23,6 +23,7 @@ export interface EndpointMissingMessageParts {
 export class EndpointsMissingComponent implements AfterViewInit, OnDestroy, OnInit {
 
   @Input() showToolbarHint = true;
+  @Input() showDirectToEndpointMessage = true;
 
   noContent$: Observable<EndpointMissingMessageParts>;
   snackBarText = {

From 2e416c5c75ad4cdf5504b0aadd09af201bb83635 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Thu, 29 Aug 2019 15:35:35 +0100
Subject: [PATCH 075/648] Fix case where we have registered/registered &
 connected endpoints

---
 .../endpoints-page.component.ts               | 50 ++++++-------------
 1 file changed, 16 insertions(+), 34 deletions(-)

diff --git a/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.ts b/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.ts
index d9e111b29d..2e36019a86 100644
--- a/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.ts
@@ -1,14 +1,14 @@
 import {
   Component,
+  ComponentFactory,
+  ComponentFactoryResolver,
+  ComponentRef,
+  Inject,
   NgZone,
   OnDestroy,
   OnInit,
   ViewChild,
   ViewContainerRef,
-  ComponentRef,
-  ComponentFactoryResolver,
-  Inject,
-  ComponentFactory
 } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Subscription } from 'rxjs';
@@ -18,18 +18,19 @@ import { RouterNav } from '../../../../../store/src/actions/router.actions';
 import { AppState } from '../../../../../store/src/app-state';
 import { selectDashboardState } from '../../../../../store/src/selectors/dashboard.selectors';
 import { CurrentUserPermissions } from '../../../core/current-user-permissions.config';
+import { Customizations, CustomizationsMetadata } from '../../../core/customizations.types';
 import { EndpointsService } from '../../../core/endpoints.service';
 import {
   getActionsFromExtensions,
   StratosActionMetadata,
   StratosActionType,
 } from '../../../core/extension/extension-service';
+import { safeUnsubscribe } from '../../../core/utils.service';
 import { EndpointListHelper } from '../../../shared/components/list/list-types/endpoint/endpoint-list.helpers';
 import {
   EndpointsListConfigService,
 } from '../../../shared/components/list/list-types/endpoint/endpoints-list-config.service';
 import { ListConfig } from '../../../shared/components/list/list.component.types';
-import { Customizations, CustomizationsMetadata } from '../../../core/customizations.types';
 
 @Component({
   selector: 'app-endpoints-page',
@@ -71,7 +72,7 @@ export class EndpointsPageComponent implements OnDestroy, OnInit {
     ).subscribe();
   }
 
-  sub: Subscription;
+  sub: Subscription[] = [];
 
   public extensionActions: StratosActionMetadata[] = getActionsFromExtensions(StratosActionType.Endpoints);
 
@@ -90,12 +91,14 @@ export class EndpointsPageComponent implements OnDestroy, OnInit {
   }
 
   ngOnInit() {
-    // Use custom component if specified
-    this.customNoEndpointsContainer.clear();
-    if (this.customizations.noEndpointsComponent) {
-      const factory: ComponentFactory<any> = this.resolver.resolveComponentFactory(this.customizations.noEndpointsComponent);
-      this.customContentComponentRef = this.customNoEndpointsContainer.createComponent(factory);
-    }
+    this.sub.push(this.endpointsService.haveRegistered$.subscribe(haveRegistered => {
+      // Use custom component if specified
+      this.customNoEndpointsContainer.clear();
+      if (!haveRegistered && this.customizations.noEndpointsComponent) {
+        const factory: ComponentFactory<any> = this.resolver.resolveComponentFactory(this.customizations.noEndpointsComponent);
+        this.customContentComponentRef = this.customNoEndpointsContainer.createComponent(factory);
+      }
+    }));
 
     this.endpointsService.checkAllEndpoints();
     this.store.select(selectDashboardState).pipe(
@@ -105,32 +108,11 @@ export class EndpointsPageComponent implements OnDestroy, OnInit {
         this.startEndpointHealthCheckPulse();
       }
     });
-    // Doesn't look like this is used (see connect-endpoint-dialog.component for actual handler)
-    // const params = queryParamMap();
-    // if (params.cnsi_guid) {
-    //   const guid = params.cnsi_guid;
-    //   window.history.pushState({}, '', '/endpoints');
-    //   this.sub = this.endpointsService.endpoints$.pipe(
-    //     delay(0),
-    //     filter(ep => !!ep[guid]),
-    //     map(ep => {
-    //       const endpoint = ep[guid];
-    //       if (endpoint.connectionStatus === 'connected') {
-    //         this.store.dispatch(new ShowSnackBar(`Connected endpoint '${endpoint.name}'`));
-    //       } else {
-    //         this.store.dispatch(new ShowSnackBar(`A problem occurred connecting endpoint ${endpoint.name}`));
-    //       }
-    //     }),
-    //     first(),
-    //   ).subscribe();
-    // }
   }
 
   ngOnDestroy() {
     this.stopEndpointHealthCheckPulse();
-    if (this.sub) {
-      this.sub.unsubscribe();
-    }
+    safeUnsubscribe(...this.sub);
     if (this.customContentComponentRef) {
       this.customContentComponentRef.destroy();
     }

From 1bdb00015e8a13bbf825f21959aba2d10c531bfc Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 29 Aug 2019 16:15:34 +0100
Subject: [PATCH 076/648] Add CaaSP V4 support for Helm Client

---
 .../kubernetes/store/kubernetes.effects.ts    |  7 ++-
 .../plugins/kubernetes/auth/kubeconfig.go     | 19 +++----
 src/jetstream/plugins/kubernetes/auth/oidc.go |  2 -
 .../plugins/kubernetes/auth/token.go          | 55 +++++++++++++++++++
 .../plugins/kubernetes/endpoint_config.go     |  4 +-
 .../plugins/kubernetes/helm_client.go         | 14 +++--
 .../plugins/kubernetes/list_releases.go       |  3 +-
 src/jetstream/plugins/kubernetes/main.go      |  1 +
 8 files changed, 82 insertions(+), 23 deletions(-)
 create mode 100644 src/jetstream/plugins/kubernetes/auth/token.go

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 37e453ae14..0f351a0660 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
@@ -286,8 +286,11 @@ export class KubernetesEffects {
             const statefulSets = statefulesetResponse[kubeId].items as Array<any>;
 
             const getChartName = (name: string, labelName: string): string => {
-              const releaseDeployment = deployments.filter(d => d.metadata.labels['app.kubernetes.io/instance'] === name);
-              const releaseStatefulSets = statefulSets.filter(d => d.metadata.labels['app.kubernetes.io/instance'] === name);
+              // Might not have a label (e.g. Dex)
+              const releaseDeployment = deployments.filter(d =>
+                d.metadata.labels && d.metadata.labels['app.kubernetes.io/instance'] === name);
+              const releaseStatefulSets = statefulSets.filter(d =>
+                d.metadata.labels && d.metadata.labels['app.kubernetes.io/instance'] === name);
 
               if (releaseDeployment.length !== 0) {
                 return releaseDeployment[0].metadata.labels[labelName];
diff --git a/src/jetstream/plugins/kubernetes/auth/kubeconfig.go b/src/jetstream/plugins/kubernetes/auth/kubeconfig.go
index 2adce58f80..f5f6a56436 100644
--- a/src/jetstream/plugins/kubernetes/auth/kubeconfig.go
+++ b/src/jetstream/plugins/kubernetes/auth/kubeconfig.go
@@ -2,7 +2,6 @@ package auth
 
 import (
 	"encoding/base64"
-	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"time"
@@ -11,6 +10,7 @@ import (
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
+	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 )
 
 const AuthConnectTypeKubeConfig = "kubeconfig"
@@ -31,6 +31,11 @@ func (c *KubeConfigAuth) GetName() string {
 	return AuthConnectTypeKubeConfig
 }
 
+func (c *KubeConfigAuth) AddAuthInfo(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
+	log.Error("KubeConfigAuth: AddAuthInfo: Not supported")
+	return fmt.Errorf("Not supported: %s", tokenRec.AuthType)
+}
+
 func (c *KubeConfigAuth) FetchToken(cnsiRecord interfaces.CNSIRecord, ec echo.Context) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error) {
 	log.Debug("FetchToken (KubeConfigAuth)")
 
@@ -61,18 +66,11 @@ func (c *KubeConfigAuth) FetchToken(cnsiRecord interfaces.CNSIRecord, ec echo.Co
 
 	// Check for Token == CaaSP V4
 	if len(kubeConfigUser.User.Token) > 0 {
-		tokenRecord := c.portalProxy.InitEndpointTokenRecord(getLargeExpiryTime(), kubeConfigUser.User.Token, "__NONE__", false)
-		tokenRecord.AuthType = interfaces.AuthTypeOIDC
-
-		oauthMetadata := &interfaces.OAuth2Metadata{}
-		jsonString, err := json.Marshal(oauthMetadata)
-		if err == nil {
-			tokenRecord.Metadata = string(jsonString)
-		}
+		tokenRecord := NewKubeTokenAuthTokenRecord(c.portalProxy, kubeConfigUser.User.Token)
 
 		// Could try and make a K8S Api call to validate the token
 		// Or, maybe we can verify the access token with the auth URL ?
-		return &tokenRecord, &cnsiRecord, nil
+		return tokenRecord, &cnsiRecord, nil
 	}
 
 	return nil, nil, fmt.Errorf("OIDC: Unsupported authentication provider for user: %s", kubeConfigUser.User.AuthProvider.Name)
@@ -106,6 +104,7 @@ func (c *KubeConfigAuth) GetCertAuth(cnsiRecord interfaces.CNSIRecord, user *con
 
 	// Tokens lasts forever
 	disconnected := false
+
 	tokenRecord := c.portalProxy.InitEndpointTokenRecord(getLargeExpiryTime(), accessToken, refreshToken, disconnected)
 	tokenRecord.AuthType = authConnectTypeCertAuth
 	return &tokenRecord, &cnsiRecord, nil
diff --git a/src/jetstream/plugins/kubernetes/auth/oidc.go b/src/jetstream/plugins/kubernetes/auth/oidc.go
index 81bdf0000b..e48f29f958 100644
--- a/src/jetstream/plugins/kubernetes/auth/oidc.go
+++ b/src/jetstream/plugins/kubernetes/auth/oidc.go
@@ -44,8 +44,6 @@ func (c *OIDCKubeAuth) GetName() string {
 }
 
 func (c *OIDCKubeAuth) AddAuthInfo(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
-	log.Info("AddAuthInfo")
-
 	authInfo := &interfaces.OAuth2Metadata{}
 	err := json.Unmarshal([]byte(tokenRec.Metadata), &authInfo)
 	if err != nil {
diff --git a/src/jetstream/plugins/kubernetes/auth/token.go b/src/jetstream/plugins/kubernetes/auth/token.go
new file mode 100644
index 0000000000..4df2445ca6
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/auth/token.go
@@ -0,0 +1,55 @@
+package auth
+
+import (
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	"github.com/labstack/echo"
+	log "github.com/sirupsen/logrus"
+	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
+)
+
+const AuthConnectTypeKubeToken = "k8sToken"
+
+// KubeTokenAuth uses a token (e.g. service account token)
+type KubeTokenAuth struct {
+	portalProxy interfaces.PortalProxy
+}
+
+// InitKubeTokenAuth
+func InitKubeTokenAuth(portalProxy interfaces.PortalProxy) KubeAuthProvider {
+	return &KubeTokenAuth{portalProxy}
+}
+
+func (c *KubeTokenAuth) GetName() string {
+	return AuthConnectTypeKubeToken
+}
+
+func (c *KubeTokenAuth) AddAuthInfo(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
+	log.Debug("AddAuthInfo: KubeTokenAuth")
+	// Just add the token in
+	info.Token = tokenRec.AuthToken
+	return nil
+}
+
+func (c *KubeTokenAuth) FetchToken(cnsiRecord interfaces.CNSIRecord, ec echo.Context) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error) {
+	log.Debug("FetchToken (KubeTokenAuth)")
+
+	token := ec.FormValue("token")
+
+	tokenRecord := NewKubeTokenAuthTokenRecord(c.portalProxy, token)
+	return tokenRecord, &cnsiRecord, nil
+}
+
+func NewKubeTokenAuthTokenRecord(portalProxy interfaces.PortalProxy, token string) *interfaces.TokenRecord {
+	tokenRecord := portalProxy.InitEndpointTokenRecord(getLargeExpiryTime(), token, "__NONE__", false)
+	tokenRecord.AuthType = AuthConnectTypeKubeToken
+
+	return &tokenRecord
+}
+
+func (c *KubeTokenAuth) RegisterJetstreamAuthType(portal interfaces.PortalProxy) {
+	// Register auth type with Jetstream
+	c.portalProxy.AddAuthProvider(c.GetName(), interfaces.AuthProvider{
+		Handler:  c.portalProxy.DoOidcFlowRequest,
+		UserInfo: nil,
+	})
+}
diff --git a/src/jetstream/plugins/kubernetes/endpoint_config.go b/src/jetstream/plugins/kubernetes/endpoint_config.go
index 22f3521f10..161460ce06 100644
--- a/src/jetstream/plugins/kubernetes/endpoint_config.go
+++ b/src/jetstream/plugins/kubernetes/endpoint_config.go
@@ -1,7 +1,7 @@
 package kubernetes
 
 import (
-	"errors"
+	"fmt"
 
 	log "github.com/sirupsen/logrus"
 
@@ -50,7 +50,7 @@ func (c *KubernetesSpecification) addAuthInfoForEndpoint(info *clientcmdapi.Auth
 	log.Debug("addAuthInfoForEndpoint")
 	var authProvider = c.GetAuthProvider(tokenRec.AuthType)
 	if authProvider == nil {
-		return errors.New("Unsupported auth type")
+		return fmt.Errorf("Unsupported auth type: %s", tokenRec.AuthType)
 	}
 
 	return authProvider.AddAuthInfo(info, tokenRec)
diff --git a/src/jetstream/plugins/kubernetes/helm_client.go b/src/jetstream/plugins/kubernetes/helm_client.go
index 7c04053da1..154c71a140 100644
--- a/src/jetstream/plugins/kubernetes/helm_client.go
+++ b/src/jetstream/plugins/kubernetes/helm_client.go
@@ -22,33 +22,35 @@ func (c *KubernetesSpecification) GetHelmClient(endpointGUID, userID string) (he
 
 	cnsiRecord, err := p.GetCNSIRecord(endpointGUID)
 	if err != nil {
-		return nil, nil, nil, errors.New("Can not get endpoint record")
+		return nil, nil, nil, errors.New("Helm: Can not get endpoint record")
 	}
 
 	tokenRecord, ok := p.GetCNSITokenRecord(endpointGUID, userID)
 	if !ok {
-		return nil, nil, nil, errors.New("Can not get user token for endpoint")
+		return nil, nil, nil, errors.New("Helm: Can not get user token for endpoint")
 	}
 
+	log.Error("GetHelmClient (2)")
+
 	config, err := c.GetConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRecord)
 	if err != nil {
+		log.Errorf("Helm: Could not get config for endpoint: %s", err)
 		return nil, nil, nil, errors.New("Can not get Kubernetes config for specified endpoint")
 	}
 
 	kubeClient, err := kubernetes.NewForConfig(config)
 	if err != nil {
-		log.Error("Could not get kube client")
+		log.Errorf("Helm: Could not get kube client: %s", err)
 		return nil, nil, nil, err
 	}
 
 	tillerTunnel, err := portforwarder.New("kube-system", kubeClient, config)
 	if err != nil {
-		log.Error("Could not establish port forwarding for Tiller")
-		log.Error(err)
+		log.Error("Helm: Could not establish port forwarding for Tiller")
 		return nil, nil, nil, err
 	}
 
-	log.Debugf("Tiller tunnel is using Port: %d", tillerTunnel.Local)
+	log.Debugf("Helm: Tiller tunnel is using Port: %d", tillerTunnel.Local)
 	tillerHost := fmt.Sprintf("127.0.0.1:%d", tillerTunnel.Local)
 	client := newClient(tillerHost)
 
diff --git a/src/jetstream/plugins/kubernetes/list_releases.go b/src/jetstream/plugins/kubernetes/list_releases.go
index c920c888a5..5e7e920a83 100644
--- a/src/jetstream/plugins/kubernetes/list_releases.go
+++ b/src/jetstream/plugins/kubernetes/list_releases.go
@@ -55,7 +55,7 @@ func (c *KubernetesSpecification) listReleases(ep *interfaces.ConnectedEndpoint,
 	log.Debugf("listReleases: START: %s", ep.GUID)
 	client, _, tiller, err := c.GetHelmClient(ep.GUID, ep.Account)
 	if err != nil {
-		log.Debugf("listReleases: CLIENT_ERROR: %s", ep.GUID)
+		log.Errorf("Helm: ListReleases could not get a Helm Client: %s", err)
 		done <- response
 		return
 	}
@@ -90,6 +90,7 @@ func (c *KubernetesSpecification) GetRelease(ec echo.Context) error {
 
 	client, _, tiller, err := c.GetHelmClient(endpointGUID, userID)
 	if err != nil {
+		log.Errorf("Helm: GetRelease could not get a Helm Client: %s", err)
 		return err
 	}
 
diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index f439dee54e..cafcbca15d 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -96,6 +96,7 @@ func (c *KubernetesSpecification) Init() error {
 	c.AddAuthProvider(auth.InitAzureKubeAuth(c.portalProxy))
 	c.AddAuthProvider(auth.InitOIDCKubeAuth(c.portalProxy))
 	c.AddAuthProvider(auth.InitKubeConfigAuth(c.portalProxy))
+	c.AddAuthProvider(auth.InitKubeTokenAuth(c.portalProxy))
 
 	// Kube dashboard is enabled by Tech Preview mode
 	c.portalProxy.GetConfig().PluginConfig[kubeDashboardPluginConfigSetting] = strconv.FormatBool(c.portalProxy.GetConfig().EnableTechPreview)

From e657799147cc64977d580e5814aef5f71d5622b8 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Thu, 29 Aug 2019 16:38:02 +0100
Subject: [PATCH 077/648] Move 'disconnected' snackbar from endpoint missing
 component into endpoints page

---
 .../endpoints-page.component.ts               | 43 ++++++++++++++++---
 .../cf-endpoints-missing.component.ts         |  5 +--
 .../endpoints-missing.component.ts            | 30 ++-----------
 3 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.ts b/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.ts
index 2e36019a86..9e323de169 100644
--- a/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.ts
@@ -1,4 +1,5 @@
 import {
+  AfterViewInit,
   Component,
   ComponentFactory,
   ComponentFactoryResolver,
@@ -10,9 +11,10 @@ import {
   ViewChild,
   ViewContainerRef,
 } from '@angular/core';
+import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material';
 import { Store } from '@ngrx/store';
-import { Subscription } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import { combineLatest, Subscription } from 'rxjs';
+import { delay, first, map, tap } from 'rxjs/operators';
 
 import { RouterNav } from '../../../../../store/src/actions/router.actions';
 import { AppState } from '../../../../../store/src/app-state';
@@ -41,18 +43,25 @@ import { ListConfig } from '../../../shared/components/list/list.component.types
     useClass: EndpointsListConfigService,
   }, EndpointListHelper]
 })
-export class EndpointsPageComponent implements OnDestroy, OnInit {
+export class EndpointsPageComponent implements AfterViewInit, OnDestroy, OnInit {
   public canRegisterEndpoint = CurrentUserPermissions.ENDPOINT_REGISTER;
   private healthCheckTimeout: number;
 
   @ViewChild('customNoEndpoints', { read: ViewContainerRef }) customNoEndpointsContainer;
   customContentComponentRef: ComponentRef<any>;
 
+  private snackBarRef: MatSnackBarRef<SimpleSnackBar>;
+  private snackBarText = {
+    message: `There are no connected endpoints, connect with your personal credentials to get started.`,
+    action: 'Got it'
+  };
+
   constructor(
     public endpointsService: EndpointsService,
     public store: Store<AppState>,
     private ngZone: NgZone,
     private resolver: ComponentFactoryResolver,
+    private snackBar: MatSnackBar,
     @Inject(Customizations) public customizations: CustomizationsMetadata
   ) {
     // Redirect to /applications if not enabled.
@@ -72,7 +81,7 @@ export class EndpointsPageComponent implements OnDestroy, OnInit {
     ).subscribe();
   }
 
-  sub: Subscription[] = [];
+  subs: Subscription[] = [];
 
   public extensionActions: StratosActionMetadata[] = getActionsFromExtensions(StratosActionType.Endpoints);
 
@@ -90,8 +99,16 @@ export class EndpointsPageComponent implements OnDestroy, OnInit {
     clearInterval(this.healthCheckTimeout);
   }
 
+  private showSnackBar(show: boolean) {
+    if (!this.snackBarRef && show) {
+      this.snackBarRef = this.snackBar.open(this.snackBarText.message, this.snackBarText.action, {});
+    } else if (this.snackBarRef && !show) {
+      this.snackBarRef.dismiss();
+    }
+  }
+
   ngOnInit() {
-    this.sub.push(this.endpointsService.haveRegistered$.subscribe(haveRegistered => {
+    this.subs.push(this.endpointsService.haveRegistered$.subscribe(haveRegistered => {
       // Use custom component if specified
       this.customNoEndpointsContainer.clear();
       if (!haveRegistered && this.customizations.noEndpointsComponent) {
@@ -110,13 +127,25 @@ export class EndpointsPageComponent implements OnDestroy, OnInit {
     });
   }
 
+  ngAfterViewInit() {
+    this.subs.push(combineLatest(
+      this.endpointsService.haveRegistered$,
+      this.endpointsService.haveConnected$,
+    ).pipe(
+      delay(1),
+      tap(([hasRegistered, hasConnected]) => {
+        this.showSnackBar(hasRegistered && !hasConnected);
+      }),
+    ).subscribe());
+  }
+
   ngOnDestroy() {
     this.stopEndpointHealthCheckPulse();
-    safeUnsubscribe(...this.sub);
+    safeUnsubscribe(...this.subs);
     if (this.customContentComponentRef) {
       this.customContentComponentRef.destroy();
     }
-
+    this.showSnackBar(false);
   }
 }
 
diff --git a/src/frontend/packages/core/src/shared/components/cf-endpoints-missing/cf-endpoints-missing.component.ts b/src/frontend/packages/core/src/shared/components/cf-endpoints-missing/cf-endpoints-missing.component.ts
index 6ca1978eec..d798611ea4 100644
--- a/src/frontend/packages/core/src/shared/components/cf-endpoints-missing/cf-endpoints-missing.component.ts
+++ b/src/frontend/packages/core/src/shared/components/cf-endpoints-missing/cf-endpoints-missing.component.ts
@@ -1,5 +1,4 @@
 import { Component } from '@angular/core';
-import { MatSnackBar } from '@angular/material';
 
 import { EndpointsService } from '../../../core/endpoints.service';
 import { CloudFoundryService } from '../../data-services/cloud-foundry.service';
@@ -30,8 +29,8 @@ export class CfEndpointsMissingComponent extends EndpointsMissingComponent {
   showToolbarHint = false;
   showNoConnected = true;
 
-  constructor(snackBar: MatSnackBar, cloudFoundryService: CloudFoundryService, endpointsService: EndpointsService) {
-    super(snackBar, endpointsService);
+  constructor(cloudFoundryService: CloudFoundryService, endpointsService: EndpointsService) {
+    super(endpointsService);
     this.haveConnected$ = cloudFoundryService.hasConnectedCFEndpoints$;
     this.haveRegistered$ = cloudFoundryService.hasRegisteredCFEndpoints$;
   }
diff --git a/src/frontend/packages/core/src/shared/components/endpoints-missing/endpoints-missing.component.ts b/src/frontend/packages/core/src/shared/components/endpoints-missing/endpoints-missing.component.ts
index b8625eff53..92bffd84e1 100644
--- a/src/frontend/packages/core/src/shared/components/endpoints-missing/endpoints-missing.component.ts
+++ b/src/frontend/packages/core/src/shared/components/endpoints-missing/endpoints-missing.component.ts
@@ -1,7 +1,6 @@
-import { AfterViewInit, Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material';
+import { AfterViewInit, Component, Input, OnInit } from '@angular/core';
 import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { delay, map, startWith, tap } from 'rxjs/operators';
+import { delay, map, startWith } from 'rxjs/operators';
 
 import { EndpointsService } from '../../../core/endpoints.service';
 
@@ -20,16 +19,12 @@ export interface EndpointMissingMessageParts {
   templateUrl: './endpoints-missing.component.html',
   styleUrls: ['./endpoints-missing.component.scss']
 })
-export class EndpointsMissingComponent implements AfterViewInit, OnDestroy, OnInit {
+export class EndpointsMissingComponent implements AfterViewInit, OnInit {
 
   @Input() showToolbarHint = true;
   @Input() showDirectToEndpointMessage = true;
 
   noContent$: Observable<EndpointMissingMessageParts>;
-  snackBarText = {
-    message: `There are no connected endpoints, connect with your personal credentials to get started.`,
-    action: 'Got it'
-  };
 
   protected noneRegisteredText: EndpointMissingMessageParts = {
     firstLine: 'There are no registered endpoints',
@@ -46,12 +41,11 @@ export class EndpointsMissingComponent implements AfterViewInit, OnDestroy, OnIn
     },
   };
 
-  private snackBarRef: MatSnackBarRef<SimpleSnackBar>;
   protected showNoConnected = false;
   protected haveRegistered$: Observable<boolean>;
   protected haveConnected$: Observable<boolean>;
 
-  constructor(private snackBar: MatSnackBar, public endpointsService: EndpointsService) {
+  constructor(public endpointsService: EndpointsService) {
     this.haveRegistered$ = this.endpointsService.haveRegistered$;
     this.haveConnected$ = this.endpointsService.haveConnected$;
   }
@@ -69,9 +63,6 @@ export class EndpointsMissingComponent implements AfterViewInit, OnDestroy, OnIn
       this.endpointsService.disablePersistenceFeatures$
     ).pipe(
       delay(1),
-      tap(([hasRegistered, hasConnected]) => {
-        this.showSnackBar(hasRegistered && !hasConnected);
-      }),
       map(([hasRegistered, hasConnected, disablePersistenceFeatures]) => {
         if (!hasRegistered) {
           return this.removeAdvice(this.noneRegisteredText, disablePersistenceFeatures);
@@ -96,17 +87,4 @@ export class EndpointsMissingComponent implements AfterViewInit, OnDestroy, OnIn
       }
     };
   }
-
-  ngOnDestroy() {
-    this.showSnackBar(false);
-  }
-
-  private showSnackBar(show: boolean) {
-    if (!this.snackBarRef && show) {
-      this.snackBarRef = this.snackBar.open(this.snackBarText.message, this.snackBarText.action, {});
-    } else if (this.snackBarRef && !show) {
-      this.snackBarRef.dismiss();
-    }
-  }
-
 }

From 1ca0174d8ae432c8feeee67aba436a90af96efc3 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Thu, 29 Aug 2019 18:17:27 +0100
Subject: [PATCH 078/648] Fix failing e2e tests

---
 src/frontend/packages/core/src/app.component.spec.ts       | 2 +-
 .../cf-endpoints-missing.component.spec.ts                 | 7 +++----
 src/test-e2e/endpoints/endpoints-e2e.spec.ts               | 2 +-
 src/test-e2e/endpoints/endpoints-unregister-e2e.spec.ts    | 2 +-
 src/test-e2e/endpoints/endpoints.po.ts                     | 7 +++++--
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/frontend/packages/core/src/app.component.spec.ts b/src/frontend/packages/core/src/app.component.spec.ts
index 1a13ecd2c7..d34174a375 100644
--- a/src/frontend/packages/core/src/app.component.spec.ts
+++ b/src/frontend/packages/core/src/app.component.spec.ts
@@ -1,10 +1,10 @@
 import { async, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
+import { createBasicStoreModule } from '../test-framework/store-test-helper';
 import { AppComponent } from './app.component';
 import { LoggedInService } from './logged-in.service';
 import { SharedModule } from './shared/shared.module';
-import { createBasicStoreModule } from '../test-framework/store-test-helper';
 
 describe('AppComponent', () => {
 
diff --git a/src/frontend/packages/core/src/shared/components/cf-endpoints-missing/cf-endpoints-missing.component.spec.ts b/src/frontend/packages/core/src/shared/components/cf-endpoints-missing/cf-endpoints-missing.component.spec.ts
index 350b310ac5..81bbf4652a 100644
--- a/src/frontend/packages/core/src/shared/components/cf-endpoints-missing/cf-endpoints-missing.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/cf-endpoints-missing/cf-endpoints-missing.component.spec.ts
@@ -1,11 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CfEndpointsMissingComponent } from './cf-endpoints-missing.component';
-import { CoreModule } from '../../../core/core.module';
-
 import { RouterTestingModule } from '@angular/router/testing';
+
 import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
+import { CoreModule } from '../../../core/core.module';
 import { SharedModule } from '../../shared.module';
+import { CfEndpointsMissingComponent } from './cf-endpoints-missing.component';
 
 
 describe('CfEndpointsMissingComponent', () => {
diff --git a/src/test-e2e/endpoints/endpoints-e2e.spec.ts b/src/test-e2e/endpoints/endpoints-e2e.spec.ts
index 4aa2dfbaff..720839d523 100644
--- a/src/test-e2e/endpoints/endpoints-e2e.spec.ts
+++ b/src/test-e2e/endpoints/endpoints-e2e.spec.ts
@@ -19,7 +19,7 @@ describe('Endpoints', () => {
 
         it('Should reach endpoints dashboard after log in', () => {
           expect(endpointsPage.isActivePage()).toBeTruthy();
-          expect(endpointsPage.isWelcomeMessageAdmin()).toBeTruthy();
+          expect(endpointsPage.isWelcomeMessageAdmin(false)).toBeTruthy();
           expect(endpointsPage.list.isPresent()).toBeFalsy();
         });
 
diff --git a/src/test-e2e/endpoints/endpoints-unregister-e2e.spec.ts b/src/test-e2e/endpoints/endpoints-unregister-e2e.spec.ts
index 2362f6773f..f9a647b0c0 100644
--- a/src/test-e2e/endpoints/endpoints-unregister-e2e.spec.ts
+++ b/src/test-e2e/endpoints/endpoints-unregister-e2e.spec.ts
@@ -37,7 +37,7 @@ describe('Endpoints', () => {
             ConfirmDialogComponent.expectDialogAndConfirm('Unregister', 'Unregister Endpoint');
             endpointsPage.list.waitForNoLoadingIndicator();
             // Should have removed the only row, so we should see welcome message again
-            expect(endpointsPage.isWelcomeMessageAdmin()).toBeTruthy();
+            expect(endpointsPage.isWelcomeMessageAdmin(false)).toBeTruthy();
           });
         });
       });
diff --git a/src/test-e2e/endpoints/endpoints.po.ts b/src/test-e2e/endpoints/endpoints.po.ts
index 5a39f89adc..9f01d61af3 100644
--- a/src/test-e2e/endpoints/endpoints.po.ts
+++ b/src/test-e2e/endpoints/endpoints.po.ts
@@ -122,9 +122,12 @@ export class EndpointsPage extends Page {
     });
   }
 
-  isWelcomeMessageAdmin() {
+  isWelcomeMessageAdmin(shouldHavePrompt = true) {
     return this.isWelcomeMessageNonAdmin().then(okay => {
-      return okay ? this.isWelcomePromptAdmin() : false;
+      if (okay) {
+        return shouldHavePrompt ? this.isWelcomePromptAdmin() : true;
+      }
+      return false;
     });
   }
 

From 9f14b7bddf0abea8ac3fceb25eed806599c9b781 Mon Sep 17 00:00:00 2001
From: Jordan Jensen <jojensen@suse.com>
Date: Wed, 7 Aug 2019 02:21:28 -0700
Subject: [PATCH 079/648] Expand ListConfig to get/set filters (SOC-9450)

---
 .../monocular-charts-list-config.service.ts   |  2 +
 ...ocular-release-pods-list-config.service.ts |  2 +
 ...ar-release-services-list-config.service.ts |  2 +
 .../monocular-releases-list-config.service.ts |  2 +
 ...onocular-repository-list-config.service.ts |  2 +
 .../monocular-versions-list-config.service.ts |  2 +
 .../kubernetes-apps-list-config.service.ts    |  2 +
 ...ubernetes-endpoints-list-config.service.ts |  2 +
 ...bernetes-namespaces-list-config.service.ts |  2 +
 .../kubernetes-nodes-data-source.ts           | 79 ++++++++++++++++++-
 .../kubernetes-nodes-list-config.service.ts   | 43 ++++++++--
 .../kubernetes-pods-list-config.service.ts    |  2 +
 .../kubernetes-service-list-config.service.ts |  3 +-
 .../app-event/cf-app-events-config.service.ts |  3 +-
 .../cf-app-instances-config.service.ts        |  2 +
 .../cf-app-variables-list-config.service.ts   |  2 +
 .../list-types/app/cf-app-config.service.ts   |  3 +-
 .../list-types/base-cf/base-cf-list-config.ts |  2 +
 .../cf-endpoints-list-config.service.ts       |  2 +
 .../cf-routes/cf-routes-list-config-base.ts   |  2 +
 .../cf-routes-list-config.service.ts          |  2 +
 .../cf-select-users-list-config.service.ts    |  2 +
 .../cf-service-instances-list-config.base.ts  |  2 +
 .../cf-services-list-config.service.ts        |  2 +
 .../cf-user-service-instances-list-config.ts  |  2 +
 .../cf-space-apps-list-config.service.ts      |  2 +
 .../cf-spaces-list-config.service.ts          |  2 +
 ...f-users-space-roles-list-config.service.ts |  2 +
 .../detach-apps-list-config.service.ts        |  2 +
 .../endpoint/endpoints-list-config.service.ts |  2 +
 ...github-commits-list-config-base.service.ts |  2 +
 .../service-plans-list-config.service.ts      |  2 +
 .../components/list/list.component.types.ts   | 15 ++++
 33 files changed, 187 insertions(+), 13 deletions(-)

diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-charts-list-config.service.ts
index 551fff9625..30c24847b8 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-list-config.service.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-charts-list-config.service.ts
@@ -84,6 +84,8 @@ export class MonocularChartsListConfig implements IListConfig<MonocularChart> {
   getColumns = () => this.columns;
   getDataSource = () => this.AppsDataSource;
   getMultiFiltersConfigs = () => [this.createRepositoryFilterConfig()];
+  getFilters = () => [];
+  setFilter = (id: string) => null;
 
   private createRepositoryFilterConfig(): IListMultiFilterConfig {
     return {
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts
index 22d21f4dc0..069659dfa7 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts
@@ -98,5 +98,7 @@ export class HelmReleasePodsListConfig implements IListConfig<HelmReleasePod> {
   public getMultiActions = () => [];
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
+  public getFilters = () => [];
+  public setFilter = (id: string) => null;
   public getDataSource = () => this.dataSource;
 }
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-config.service.ts
index b1b46b43cb..b8309ab0b6 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-config.service.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-config.service.ts
@@ -80,5 +80,7 @@ export class HelmReleaseServicesListConfig implements IListConfig<HelmReleaseSer
   public getMultiActions = () => [];
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
+  public getFilters = () => [];
+  public setFilter = (id: string) => null;
   public getDataSource = () => this.dataSource;
 }
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-config.service.ts
index 9512498e97..b6ab797c79 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-config.service.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-config.service.ts
@@ -117,5 +117,7 @@ export class HelmReleasesListConfig implements IListConfig<HelmRelease> {
   public getMultiActions = () => [];
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
+  public getFilters = () => [];
+  public setFilter = (id: string) => null;
   public getDataSource = () => this.dataSource;
 }
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 0e99e7dd86..d6d38b928b 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
@@ -96,5 +96,7 @@ export class MonocularRepositoryListConfig implements IListConfig<EndpointModel>
   public getMultiActions = () => [];
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
+  public getFilters = () => [];
+  public setFilter = (id: string) => null;
   public getDataSource = () => this.dataSource;
 }
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-config.service.ts
index 4da8970655..55b487e6e7 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-config.service.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-config.service.ts
@@ -52,5 +52,7 @@ export class HelmVersionsListConfig implements IListConfig<HelmVersion> {
   public getMultiActions = () => [];
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
+  public getFilters = () => [];
+  public setFilter = (id: string) => null;
   public getDataSource = () => this.dataSource;
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-list-config.service.ts
index e984169e53..1e83b450bf 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-list-config.service.ts
@@ -89,6 +89,8 @@ export class KubernetesAppsListConfigService implements IListConfig<KubernetesAp
   getColumns = () => this.columns;
   getDataSource = () => this.AppsDataSource;
   getMultiFiltersConfigs = () => [];
+  getFilters = () => [];
+  setFilter = (id: string) => null;
 
   constructor(
     store: Store<AppState>,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
index 73f0cdd19f..409262d03c 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
@@ -53,5 +53,7 @@ export class KubernetesEndpointsListConfigService implements IListConfig<Endpoin
   public getMultiActions = () => [];
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
+  public getFilters = () => [];
+  public setFilter = (id: string) => null;
   public getDataSource = () => this.dataSource;
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
index f4093d2b7c..fc4881c1a4 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
@@ -74,6 +74,8 @@ export class KubernetesNamespacesListConfigService implements IListConfig<Kubern
   getColumns = () => this.columns;
   getDataSource = () => this.podsDataSource;
   getMultiFiltersConfigs = () => [];
+  getFilters = () => [];
+  setFilter = (id: string) => null;
   getInitialised = () => this.initialised$;
 
   constructor(
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
index a64f8b5d5a..a1ba148334 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
@@ -3,20 +3,26 @@ import { Store } from '@ngrx/store';
 import { getPaginationKey } from '../../../../../../store/src/actions/pagination.actions';
 import { AppState } from '../../../../../../store/src/app-state';
 import { entityFactory } from '../../../../../../store/src/helpers/entity-factory';
-import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
+import {
+  DataFunction,
+  DataFunctionDefinition,
+  ListDataSource
+} from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { KubernetesNode } from '../../store/kube.types';
 import { GetKubernetesNodes } from '../../store/kubernetes.actions';
 import { kubernetesNodesSchemaKey } from '../../store/kubernetes.entities';
+import { PaginationEntityState } from '../../../../../../store/src/types/pagination.types';
 
 export class KubernetesNodesDataSource extends ListDataSource<KubernetesNode> {
 
   constructor(
     store: Store<AppState>,
     kubeGuid: BaseKubeGuid,
-    listConfig: IListConfig<KubernetesNode>
+    listConfig: IListConfig<KubernetesNode>,
+    transformEntities: (DataFunction<KubernetesNode> | DataFunctionDefinition)[]
   ) {
     super({
       store,
@@ -26,8 +32,75 @@ export class KubernetesNodesDataSource extends ListDataSource<KubernetesNode> {
       paginationKey: getPaginationKey(kubernetesNodesSchemaKey, kubeGuid.guid),
       isLocal: true,
       listConfig,
-      transformEntities: [{ type: 'filter', field: 'metadata.name' }]
+      transformEntities
     });
   }
+}
+
+export class LabelsKubernetesNodesDataSource extends KubernetesNodesDataSource {
 
+  constructor(
+    store: Store<AppState>,
+    kubeGuid: BaseKubeGuid,
+    listConfig: IListConfig<KubernetesNode>
+  ) {
+    super(
+      store,
+      kubeGuid,
+      listConfig,
+      [
+        (entities: KubernetesNode[], paginationStore: PaginationEntityState) => {
+          const filterString = paginationStore.clientPagination.filter.string.toUpperCase();
+          return entities.filter(node => {
+            return Object.entries(node.metadata.labels).some(([label, value]) => {
+              label = label.toUpperCase();
+              value = value.toUpperCase();
+              return label.includes(filterString) || value.includes(filterString);
+            });
+          });
+        }
+      ]
+    );
+  }
+}
+
+export class NameKubernetesNodesDataSource extends KubernetesNodesDataSource {
+
+  constructor(
+    store: Store<AppState>,
+    kubeGuid: BaseKubeGuid,
+    listConfig: IListConfig<KubernetesNode>
+  ) {
+    super(
+      store,
+      kubeGuid,
+      listConfig,
+      [{ type: 'filter', field: 'metadata.name' }]
+    );
+  }
+}
+
+export class IPAddressKubernetesNodesDataSource extends KubernetesNodesDataSource {
+
+  constructor(
+    store: Store<AppState>,
+    kubeGuid: BaseKubeGuid,
+    listConfig: IListConfig<KubernetesNode>
+  ) {
+    super(
+      store,
+      kubeGuid,
+      listConfig,
+      [
+        (entities: KubernetesNode[], paginationState: PaginationEntityState) => {
+          return entities.filter(node => {
+            const internalIP: string = node.status.addresses.find(address => {
+              return address.type === 'InternalIP';
+            }).address;
+            return internalIP.toUpperCase().includes(paginationState.clientPagination.filter.string.toUpperCase());
+          });
+        }
+      ]
+    );
+  }
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
index 97033b1eaa..b4b496ae2c 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
@@ -3,7 +3,7 @@ import { Store } from '@ngrx/store';
 
 import { AppState } from '../../../../../../store/src/app-state';
 import { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
-import { IListConfig, ListViewTypes } from '../../../../shared/components/list/list.component.types';
+import { IListConfig, IListFilter, ListViewTypes } from '../../../../shared/components/list/list.component.types';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { ConditionType, KubernetesNode } from '../../store/kube.types';
 import { defaultHelmKubeListPageSize } from '../kube-helm-list-types';
@@ -11,13 +11,15 @@ import { getConditionSort } from '../kube-sort.helper';
 import { ConditionCellComponent, SubtleConditionCellComponent } from './condition-cell/condition-cell.component';
 import { KubernetesNodeCapacityComponent } from './kubernetes-node-capacity/kubernetes-node-capacity.component';
 import { KubernetesNodeLinkComponent } from './kubernetes-node-link/kubernetes-node-link.component';
-import { KubernetesNodesDataSource } from './kubernetes-nodes-data-source';
+import {
+  LabelsKubernetesNodesDataSource,
+  NameKubernetesNodesDataSource,
+  IPAddressKubernetesNodesDataSource
+} from './kubernetes-nodes-data-source';
 import { NodePodCountComponent } from './node-pod-count/node-pod-count.component';
 
 @Injectable()
 export class KubernetesNodesListConfigService implements IListConfig<KubernetesNode> {
-  nodesDataSource: KubernetesNodesDataSource;
-
   columns: Array<ITableColumn<KubernetesNode>> = [
     {
       columnId: 'name', headerCell: () => 'Name',
@@ -68,6 +70,8 @@ export class KubernetesNodesListConfigService implements IListConfig<KubernetesN
       cellFlex: '5',
     },
   ];
+  filters: IListFilter<KubernetesNode>[];
+  filterSelected: IListFilter<KubernetesNode>;
 
   pageSizeOptions = defaultHelmKubeListPageSize;
   viewType = ListViewTypes.TABLE_ONLY;
@@ -82,14 +86,39 @@ export class KubernetesNodesListConfigService implements IListConfig<KubernetesN
   getMultiActions = () => [];
   getSingleActions = () => [];
   getColumns = () => this.columns;
-  getDataSource = () => this.nodesDataSource;
+  getDataSource = () => this.filterSelected.dataSource;
   getMultiFiltersConfigs = () => [];
+  getFilters = (): IListFilter<KubernetesNode>[] => this.filters;
+  setFilter = (id: string) => {
+    this.filterSelected = this.filters.find(filter => filter.id === id);
+  }
 
   constructor(
     store: Store<AppState>,
     kubeId: BaseKubeGuid,
   ) {
-    this.nodesDataSource = new KubernetesNodesDataSource(store, kubeId, this);
-  }
+    this.filters = [
+      {
+        dataSource: new NameKubernetesNodesDataSource(store, kubeId, this),
+        default: true,
+        id: 'name',
+        label: 'Name',
+        placeholder: 'Filter by Name'
+      },
+      {
+        dataSource: new LabelsKubernetesNodesDataSource(store, kubeId, this),
+        id: 'labels',
+        label: 'Labels',
+        placeholder: 'Filter by Labels'
+      },
+      {
+        dataSource: new IPAddressKubernetesNodesDataSource(store, kubeId, this),
+        id: 'ip-address',
+        label: 'IP Address',
+        placeholder: 'Filter by IP Address'
+      }
+    ];
 
+    this.filterSelected = this.filters.find(filter => filter.default === true);
+  }
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
index 3c097b2cbd..629af156ed 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
@@ -103,6 +103,8 @@ export class KubernetesPodsListConfigService implements IListConfig<KubernetesPo
   getColumns = () => this.columns;
   getDataSource = () => this.podsDataSource;
   getMultiFiltersConfigs = () => [];
+  getFilters = () => [];
+  setFilter = (id: string) => null;
 
   constructor(
     store: Store<AppState>,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-list-config.service.ts
index b2dc99e0a6..6da50d7cb7 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-list-config.service.ts
@@ -60,5 +60,6 @@ export abstract class BaseKubernetesServicesListConfig implements IListConfig<Ku
   getSingleActions = () => [];
   getColumns = () => this.columns;
   getMultiFiltersConfigs = () => [];
-
+  getFilters = () => [];
+  setFilter = (id: string) => null;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-config.service.ts
index a4fc8ce123..9146ab9467 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-config.service.ts
@@ -52,5 +52,6 @@ export class CfAppEventsConfigService extends ListConfig<APIResource> implements
   getColumns = () => this.columns;
   getDataSource = () => this.eventSource;
   getMultiFiltersConfigs = () => [];
-
+  getFilters = () => [];
+  setFilter = (id: string) => null;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts
index ba3a782089..54dad54486 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts
@@ -220,6 +220,8 @@ export class CfAppInstancesConfigService implements IListConfig<ListAppInstance>
   getColumns = () => this.columns;
   getDataSource = () => this.instancesSource;
   getMultiFiltersConfigs = () => [];
+  getFilters = () => [];
+  setFilter = (id: string) => null;
   getInitialised = () => this.initialised$;
 
   private createMetricsResults(entityServiceFactory: EntityServiceFactory) {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.ts
index 63c03ed470..1c288d4be0 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.ts
@@ -131,6 +131,8 @@ export class CfAppVariablesListConfigService implements IListConfig<ListAppEnvVa
   getColumns = () => this.columns;
   getDataSource = () => this.envVarsDataSource;
   getMultiFiltersConfigs = () => [];
+  getFilters = () => [];
+  setFilter = (id: string) => null;
 
   constructor(
     private store: Store<AppState>,
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app/cf-app-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app/cf-app-config.service.ts
index d7cd8565c7..9abc1afdcf 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/app/cf-app-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/app/cf-app-config.service.ts
@@ -144,6 +144,7 @@ export class CfAppConfigService extends ListConfig<APIResource> implements IList
   getColumns = () => this.columns;
   getDataSource = () => this.appsDataSource;
   getMultiFiltersConfigs = () => this.multiFilterConfigs;
+  getFilters = () => [];
+  setFilter = (id: string) => null;
   getInitialised = () => this.initialised$;
-
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/base-cf/base-cf-list-config.ts b/src/frontend/packages/core/src/shared/components/list/list-types/base-cf/base-cf-list-config.ts
index a2156d434d..5f0844b271 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/base-cf/base-cf-list-config.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/base-cf/base-cf-list-config.ts
@@ -17,4 +17,6 @@ export class BaseCfListConfig<T> implements IListConfig<T> {
   getMultiActions = () => [];
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => [];
+  getFilters = () => [];
+  setFilter = (id: string) => null;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service.ts
index f351d6db32..cd617b7535 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service.ts
@@ -49,5 +49,7 @@ export class CFEndpointsListConfigService implements IListConfig<EndpointModel>
   public getMultiActions = () => [];
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
+  public getFilters = () => [];
+  public setFilter = (id: string) => null;
   public getDataSource = () => this.dataSource;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-routes/cf-routes-list-config-base.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-routes/cf-routes-list-config-base.ts
index bbc1f804df..459a476e3a 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-routes/cf-routes-list-config-base.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-routes/cf-routes-list-config-base.ts
@@ -205,6 +205,8 @@ export abstract class CfRoutesListConfigBase implements IListConfig<APIResource>
 
   getColumns = () => this.columns;
   getMultiFiltersConfigs = () => [];
+  getFilters = () => [];
+  setFilter = (id: string) => null;
 
   /**
    * Creates an instance of CfRoutesListConfigBase.
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-routes/cf-routes-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-routes/cf-routes-list-config.service.ts
index 0a2cce34e2..9b96a62922 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-routes/cf-routes-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-routes/cf-routes-list-config.service.ts
@@ -69,6 +69,8 @@ export class CfRoutesListConfigService extends CfRoutesListConfigBase implements
       createCfOrgSpaceFilterConfig('space', 'Space', cfOrgSpaceService.space),
     ];
     this.getMultiFiltersConfigs = () => multiFilterConfigs;
+    this.getFilters = () => [];
+    this.setFilter = (id: string) => null;
     initCfOrgSpaceService(store, cfOrgSpaceService,
       this.dataSource.masterAction.entityKey,
       this.dataSource.masterAction.paginationKey).subscribe();
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-select-users/cf-select-users-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-select-users/cf-select-users-list-config.service.ts
index 1717819c40..5b4173600f 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-select-users/cf-select-users-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-select-users/cf-select-users-list-config.service.ts
@@ -132,6 +132,8 @@ export class CfSelectUsersListConfigService implements IListConfig<APIResource<C
   getMultiActions = (): IMultiListAction<APIResource<CfUser>>[] => [];
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => [];
+  getFilters = () => [];
+  setFilter = (id: string) => null;
   getDataSource = () => this.dataSource;
   getInitialised = () => this.initialised;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts
index a16964b67b..1890f455ad 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts
@@ -193,6 +193,8 @@ export class CfServiceInstancesListConfigBase implements IListConfig<APIResource
   getMultiActions = () => [];
   getSingleActions = () => [this.listActionEdit, this.listActionDetach, this.listActionDelete];
   getMultiFiltersConfigs = () => [];
+  getFilters = () => [];
+  setFilter = (id: string) => null;
   getColumns = () => this.serviceInstanceColumns;
   getDataSource = () => null;
 
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts
index c28b53a669..8abe831628 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts
@@ -84,5 +84,7 @@ export class CfServicesListConfigService implements IListConfig<APIResource> {
   getMultiActions = () => [];
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => this.multiFilterConfigs;
+  getFilters = () => [];
+  setFilter = (id: string) => null;
   getDataSource = () => this.dataSource;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts
index c0053902e0..e8ef1501f2 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts
@@ -197,6 +197,8 @@ export class CfUserServiceInstancesListConfigBase implements IListConfig<APIReso
   getMultiActions = () => [];
   getSingleActions = () => [this.listActionEdit, this.listActionDetach, this.listActionDelete];
   getMultiFiltersConfigs = () => [];
+  getFilters = () => [];
+  setFilter = (id: string) => null;
   getColumns = () => this.serviceInstanceColumns;
   getDataSource = () => this.dataSource;
 
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.ts
index bbb6c860de..ed82576976 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.ts
@@ -88,5 +88,7 @@ export class CfSpaceAppsListConfigService implements IListConfig<APIResource> {
   getMultiActions = () => [];
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => [];
+  getFilters = () => [];
+  setFilter = (id: string) => null;
   getDataSource = () => this.dataSource;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces/cf-spaces-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces/cf-spaces-list-config.service.ts
index 27ff550d79..6935a22986 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces/cf-spaces-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces/cf-spaces-list-config.service.ts
@@ -55,5 +55,7 @@ export class CfSpacesListConfigService implements IListConfig<APIResource<ISpace
   getMultiActions = () => [];
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => [];
+  getFilters = () => [];
+  setFilter = (id: string) => null;
   getDataSource = () => this.dataSource;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-list-config.service.ts
index ca630bca18..70517de420 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-list-config.service.ts
@@ -85,6 +85,8 @@ export class CfUsersSpaceRolesListConfigService implements IListConfig<APIResour
   getMultiActions = () => [];
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => [];
+  getFilters = () => [];
+  setFilter = (id: string) => null;
   getDataSource = () => this.dataSource;
   public getInitialised = () => this.initialised;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts
index b37519b820..394ea1be37 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts
@@ -57,5 +57,7 @@ export class DetachAppsListConfigService implements IListConfig<APIResource> {
   getMultiActions = () => [];
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => [];
+  getFilters = () => [];
+  setFilter = (id: string) => null;
   getDataSource = () => this.dataSource;
 }
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 88ea39eef8..d8d6cb9fa4 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
@@ -134,4 +134,6 @@ export class EndpointsListConfigService implements IListConfig<EndpointModel> {
   public getColumns = () => this.columns;
   public getDataSource = () => this.dataSource;
   public getMultiFiltersConfigs = () => [];
+  public getFilters = () => [];
+  public setFilter = (id: string) => null;
 }
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/core/src/shared/components/list/list-types/github-commits/github-commits-list-config-base.service.ts
index c24b228713..585b8a8171 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/core/src/shared/components/list/list-types/github-commits/github-commits-list-config-base.service.ts
@@ -92,6 +92,8 @@ export abstract class GithubCommitsListConfigServiceBase implements IListConfig<
   public getMultiActions = () => [];
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
+  public getFilters = () => [];
+  public setFilter = (id: string) => null;
   public getDataSource = () => this.dataSource;
   public getInitialised = () => this.initialised;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/service-plans/service-plans-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/service-plans/service-plans-list-config.service.ts
index 5892db9199..8da99f93f3 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/service-plans/service-plans-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/service-plans/service-plans-list-config.service.ts
@@ -107,6 +107,8 @@ export class ServicePlansListConfigService implements IListConfig<APIResource<IS
   getMultiActions = () => [];
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => [];
+  getFilters = () => [];
+  setFilter = (id: string) => null;
   getColumns = () => this.columns;
   getDataSource = () => this.dataSource;
 }
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 8c0775fb64..97114515cb 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
@@ -47,6 +47,11 @@ export interface IListConfig<T> {
    * to the data sources transformEntities collection should be used to apply these custom settings to the data.
    */
   getMultiFiltersConfigs: () => IListMultiFilterConfig[];
+  /**
+   * Collection of filters
+   */
+  getFilters: () => IListFilter<T>[];
+  setFilter: (id: string) => void;
   /**
    * Fetch an observable that will emit once the underlying config components have been created. For instance if the data source requires
    * something from the store which requires an async call
@@ -120,6 +125,14 @@ export interface IListMultiFilterConfig {
   select: BehaviorSubject<any>;
 }
 
+export interface IListFilter<T> {
+  dataSource: ListDataSource<T>;
+  default?: boolean;
+  id: string;
+  label: string;
+  placeholder: string;
+}
+
 export interface IListMultiFilterConfigItem {
   label: string;
   item: any;
@@ -144,6 +157,8 @@ export class ListConfig<T> implements IListConfig<T> {
   getColumns = (): ITableColumn<T>[] => null;
   getDataSource = (): ListDataSource<T> => null;
   getMultiFiltersConfigs = (): IListMultiFilterConfig[] => [];
+  getFilters = (): IListFilter<T>[] => [];
+  setFilter = (id: string) => null;
   getInitialised = () => observableOf(true);
 }
 

From f9ff28fbe58123621368e606ae979a608eb5459d Mon Sep 17 00:00:00 2001
From: Jordan Jensen <jojensen@suse.com>
Date: Wed, 7 Aug 2019 02:24:56 -0700
Subject: [PATCH 080/648] Show and select filters from ListConfig (SOC-9450)

---
 .../components/list/list.component.html       | 25 +++++++++++++++++--
 .../shared/components/list/list.component.ts  | 19 ++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/frontend/packages/core/src/shared/components/list/list.component.html b/src/frontend/packages/core/src/shared/components/list/list.component.html
index 01ffbfc939..9f6d4a7f8b 100644
--- a/src/frontend/packages/core/src/shared/components/list/list.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list.component.html
@@ -69,12 +69,26 @@
             </mat-form-field>
           </div>
           <!-- Filter by text input -->
+          <div class="filter" id="listFilterSelect"
+            [hidden]="filterColumns.length < 1 || !config.enableTextFilter || (!(hasRows$ | async) && !filter) || (dataSource.isAdding$ | async) || (dataSource.maxedResults$ | async)">
+            <mat-form-field>
+              <mat-label>Filter Selection</mat-label>
+              <mat-select
+                [(value)]="filterSelected"
+                (selectionChange)="updateListFilter($event.value, filterString)"
+              >
+                <mat-option *ngFor="let filter of filterColumns" [value]="filter">
+                  {{ filter.label }}
+                </mat-option>
+              </mat-select>
+            </mat-form-field>
+          </div>
           <div class="filter" id="listSearchFilter"
             [hidden]="!config.enableTextFilter || (!(hasRows$ | async) && !filter) || (dataSource.isAdding$ | async) || (dataSource.maxedResults$ | async)">
             <mat-form-field floatLabel="never" class="list-component__header__right-filter">
               <input matInput [ngModel]="filterString" #filter="ngModel"
                 [disabled]="(dataSource.isLoadingPage$ | async)" name="filter"
-                placeholder="{{config.text?.filter || 'Filter'}}">
+                placeholder="{{ filterSelected?.placeholder || config.text?.filter || 'Filter'}}">
             </mat-form-field>
           </div>
           <!-- Sort Button & Drop down -->
@@ -201,4 +215,11 @@
       </ng-container>
     </div>
   </ng-container>
-</div>
\ No newline at end of file
+</div>
+
+<ng-template #refreshButton>
+  <button mat-mini-fab *ngIf="!(isAddingOrSelecting$ | async)" [disabled]="dataSource.isLoadingPage$ | async"
+    (click)="refresh()">
+    <mat-icon aria-label="Refresh list data">refresh</mat-icon>
+  </button>
+</ng-template>
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 c822bbd1ff..f56c4b241d 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
@@ -69,6 +69,7 @@ import {
   defaultPaginationPageSizeOptionsTable,
   IGlobalListAction,
   IListConfig,
+  IListFilter,
   IMultiListAction,
   IOptionalAction,
   ListConfig,
@@ -176,6 +177,9 @@ export class ListComponent<T> implements OnInit, OnChanges, OnDestroy, AfterView
     };
   private filterString = '';
   private sortColumns: ITableColumn<T>[];
+  // private filterColumns: ITableColumn<T>[];
+  private filterColumns: IListFilter<T>[];
+  private filterSelected: IListFilter<T>;
 
   private paginationWidgetToStore: Subscription;
   private filterWidgetToStore: Subscription;
@@ -392,6 +396,13 @@ export class ListComponent<T> implements OnInit, OnChanges, OnDestroy, AfterView
       return column.sort;
     });
 
+    this.filterColumns = this.config.getFilters();
+    if (!this.filterSelected) {
+      this.filterSelected = this.filterColumns.find(filterConfig => {
+        return filterConfig.default === true;
+      });
+    }
+
     const sortStoreToWidget = this.paginationController.sort$.pipe(tap((sort: ListSort) => {
       this.headerSort.value = sort.field;
       this.headerSort.direction = sort.direction;
@@ -561,6 +572,9 @@ export class ListComponent<T> implements OnInit, OnChanges, OnDestroy, AfterView
       this.uberSub,
       this.multiFilterChangesSub
     );
+    if (this.filterColumns) {
+      this.filterColumns.forEach(filterConfig => filterConfig.dataSource.destroy());
+    }
     if (this.dataSource) {
       this.dataSource.destroy();
     }
@@ -591,6 +605,11 @@ export class ListComponent<T> implements OnInit, OnChanges, OnDestroy, AfterView
     });
   }
 
+  updateListFilter(filterSelected: IListFilter<T>, filterString: string) {
+    this.config.setFilter(filterSelected.id);
+    this.initialise();
+  }
+
   executeActionMultiple(listActionConfig: IMultiListAction<T>) {
     const result = listActionConfig.action(Array.from(this.dataSource.selectedRows.values()));
     if (isObservable(result)) {

From bc111215002407168c69701a378d91ee3a8ea0f4 Mon Sep 17 00:00:00 2001
From: Jordan Jensen <jojensen@suse.com>
Date: Fri, 9 Aug 2019 17:59:38 -0700
Subject: [PATCH 081/648] Reduce filters to single data source (SOC-9450)

- Use action to set the filterKey
- if the filterKey is not set use the default filter
---
 .../monocular-charts-list-config.service.ts   |  1 -
 ...ocular-release-pods-list-config.service.ts |  1 -
 ...ar-release-services-list-config.service.ts |  1 -
 .../monocular-releases-list-config.service.ts |  1 -
 ...onocular-repository-list-config.service.ts |  1 -
 .../monocular-versions-list-config.service.ts |  1 -
 .../kubernetes-apps-list-config.service.ts    |  1 -
 ...ubernetes-endpoints-list-config.service.ts |  1 -
 ...bernetes-namespaces-list-config.service.ts |  1 -
 .../kubernetes-nodes-data-source.ts           | 69 --------------
 .../kubernetes-nodes-list-config.service.ts   | 93 ++++++++++++-------
 .../kubernetes-pods-list-config.service.ts    |  1 -
 .../kubernetes-service-list-config.service.ts |  1 -
 .../list-data-source.ts                       |  3 +-
 .../local-list-controller.ts                  |  1 +
 .../app-event/cf-app-events-config.service.ts |  1 -
 .../cf-app-instances-config.service.ts        |  1 -
 .../cf-app-variables-list-config.service.ts   |  1 -
 .../list-types/app/cf-app-config.service.ts   |  1 -
 .../list-types/base-cf/base-cf-list-config.ts |  1 -
 .../cf-endpoints-list-config.service.ts       |  1 -
 .../cf-routes/cf-routes-list-config-base.ts   |  1 -
 .../cf-routes-list-config.service.ts          |  1 -
 .../cf-select-users-list-config.service.ts    |  1 -
 .../cf-service-instances-list-config.base.ts  |  1 -
 .../cf-services-list-config.service.ts        |  1 -
 .../cf-user-service-instances-list-config.ts  |  1 -
 .../cf-space-apps-list-config.service.ts      |  1 -
 .../cf-spaces-list-config.service.ts          |  1 -
 ...f-users-space-roles-list-config.service.ts |  1 -
 .../detach-apps-list-config.service.ts        |  1 -
 .../endpoint/endpoints-list-config.service.ts |  1 -
 ...github-commits-list-config-base.service.ts |  1 -
 .../service-plans-list-config.service.ts      |  1 -
 .../shared/components/list/list.component.ts  | 38 ++++----
 .../components/list/list.component.types.ts   | 11 +--
 .../store/src/actions/list.actions.ts         |  1 +
 .../store/src/actions/pagination.actions.ts   | 10 ++
 ...agination-reducer-set-client-filter-key.ts | 22 +++++
 .../pagination-reducer/pagination.reducer.ts  |  4 +
 .../store/src/types/pagination.types.ts       |  1 +
 41 files changed, 127 insertions(+), 156 deletions(-)
 create mode 100644 src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-set-client-filter-key.ts

diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-charts-list-config.service.ts
index 30c24847b8..e87a82a970 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-list-config.service.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-charts-list-config.service.ts
@@ -85,7 +85,6 @@ export class MonocularChartsListConfig implements IListConfig<MonocularChart> {
   getDataSource = () => this.AppsDataSource;
   getMultiFiltersConfigs = () => [this.createRepositoryFilterConfig()];
   getFilters = () => [];
-  setFilter = (id: string) => null;
 
   private createRepositoryFilterConfig(): IListMultiFilterConfig {
     return {
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts
index 069659dfa7..476e89492b 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts
@@ -99,6 +99,5 @@ export class HelmReleasePodsListConfig implements IListConfig<HelmReleasePod> {
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
   public getFilters = () => [];
-  public setFilter = (id: string) => null;
   public getDataSource = () => this.dataSource;
 }
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-config.service.ts
index b8309ab0b6..5e6b9e6237 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-config.service.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-config.service.ts
@@ -81,6 +81,5 @@ export class HelmReleaseServicesListConfig implements IListConfig<HelmReleaseSer
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
   public getFilters = () => [];
-  public setFilter = (id: string) => null;
   public getDataSource = () => this.dataSource;
 }
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-config.service.ts
index b6ab797c79..7f55c74e42 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-config.service.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-config.service.ts
@@ -118,6 +118,5 @@ export class HelmReleasesListConfig implements IListConfig<HelmRelease> {
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
   public getFilters = () => [];
-  public setFilter = (id: string) => null;
   public getDataSource = () => this.dataSource;
 }
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 d6d38b928b..ab9eeb5447 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
@@ -97,6 +97,5 @@ export class MonocularRepositoryListConfig implements IListConfig<EndpointModel>
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
   public getFilters = () => [];
-  public setFilter = (id: string) => null;
   public getDataSource = () => this.dataSource;
 }
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-config.service.ts
index 55b487e6e7..9084ee4b17 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-config.service.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-config.service.ts
@@ -53,6 +53,5 @@ export class HelmVersionsListConfig implements IListConfig<HelmVersion> {
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
   public getFilters = () => [];
-  public setFilter = (id: string) => null;
   public getDataSource = () => this.dataSource;
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-list-config.service.ts
index 1e83b450bf..28080d06f6 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-list-config.service.ts
@@ -90,7 +90,6 @@ export class KubernetesAppsListConfigService implements IListConfig<KubernetesAp
   getDataSource = () => this.AppsDataSource;
   getMultiFiltersConfigs = () => [];
   getFilters = () => [];
-  setFilter = (id: string) => null;
 
   constructor(
     store: Store<AppState>,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
index 409262d03c..84904843f9 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
@@ -54,6 +54,5 @@ export class KubernetesEndpointsListConfigService implements IListConfig<Endpoin
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
   public getFilters = () => [];
-  public setFilter = (id: string) => null;
   public getDataSource = () => this.dataSource;
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
index fc4881c1a4..84344a31c0 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
@@ -75,7 +75,6 @@ export class KubernetesNamespacesListConfigService implements IListConfig<Kubern
   getDataSource = () => this.podsDataSource;
   getMultiFiltersConfigs = () => [];
   getFilters = () => [];
-  setFilter = (id: string) => null;
   getInitialised = () => this.initialised$;
 
   constructor(
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
index a1ba148334..1c9a075977 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
@@ -14,7 +14,6 @@ import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { KubernetesNode } from '../../store/kube.types';
 import { GetKubernetesNodes } from '../../store/kubernetes.actions';
 import { kubernetesNodesSchemaKey } from '../../store/kubernetes.entities';
-import { PaginationEntityState } from '../../../../../../store/src/types/pagination.types';
 
 export class KubernetesNodesDataSource extends ListDataSource<KubernetesNode> {
 
@@ -36,71 +35,3 @@ export class KubernetesNodesDataSource extends ListDataSource<KubernetesNode> {
     });
   }
 }
-
-export class LabelsKubernetesNodesDataSource extends KubernetesNodesDataSource {
-
-  constructor(
-    store: Store<AppState>,
-    kubeGuid: BaseKubeGuid,
-    listConfig: IListConfig<KubernetesNode>
-  ) {
-    super(
-      store,
-      kubeGuid,
-      listConfig,
-      [
-        (entities: KubernetesNode[], paginationStore: PaginationEntityState) => {
-          const filterString = paginationStore.clientPagination.filter.string.toUpperCase();
-          return entities.filter(node => {
-            return Object.entries(node.metadata.labels).some(([label, value]) => {
-              label = label.toUpperCase();
-              value = value.toUpperCase();
-              return label.includes(filterString) || value.includes(filterString);
-            });
-          });
-        }
-      ]
-    );
-  }
-}
-
-export class NameKubernetesNodesDataSource extends KubernetesNodesDataSource {
-
-  constructor(
-    store: Store<AppState>,
-    kubeGuid: BaseKubeGuid,
-    listConfig: IListConfig<KubernetesNode>
-  ) {
-    super(
-      store,
-      kubeGuid,
-      listConfig,
-      [{ type: 'filter', field: 'metadata.name' }]
-    );
-  }
-}
-
-export class IPAddressKubernetesNodesDataSource extends KubernetesNodesDataSource {
-
-  constructor(
-    store: Store<AppState>,
-    kubeGuid: BaseKubeGuid,
-    listConfig: IListConfig<KubernetesNode>
-  ) {
-    super(
-      store,
-      kubeGuid,
-      listConfig,
-      [
-        (entities: KubernetesNode[], paginationState: PaginationEntityState) => {
-          return entities.filter(node => {
-            const internalIP: string = node.status.addresses.find(address => {
-              return address.type === 'InternalIP';
-            }).address;
-            return internalIP.toUpperCase().includes(paginationState.clientPagination.filter.string.toUpperCase());
-          });
-        }
-      ]
-    );
-  }
-}
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
index b4b496ae2c..fa0fb9aebc 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
@@ -3,6 +3,8 @@ import { Store } from '@ngrx/store';
 
 import { AppState } from '../../../../../../store/src/app-state';
 import { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
+import { DataFunction } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
+import { PaginationEntityState } from '../../../../../../store/src/types/pagination.types';
 import { IListConfig, IListFilter, ListViewTypes } from '../../../../shared/components/list/list.component.types';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { ConditionType, KubernetesNode } from '../../store/kube.types';
@@ -11,15 +13,19 @@ import { getConditionSort } from '../kube-sort.helper';
 import { ConditionCellComponent, SubtleConditionCellComponent } from './condition-cell/condition-cell.component';
 import { KubernetesNodeCapacityComponent } from './kubernetes-node-capacity/kubernetes-node-capacity.component';
 import { KubernetesNodeLinkComponent } from './kubernetes-node-link/kubernetes-node-link.component';
-import {
-  LabelsKubernetesNodesDataSource,
-  NameKubernetesNodesDataSource,
-  IPAddressKubernetesNodesDataSource
-} from './kubernetes-nodes-data-source';
+import { KubernetesNodesDataSource } from './kubernetes-nodes-data-source';
 import { NodePodCountComponent } from './node-pod-count/node-pod-count.component';
 
+export enum KubernetesNodesListFilterKeys {
+  NAME = 'name',
+  IP_ADDRESS = 'ip-address',
+  LABELS = 'labels'
+}
+
 @Injectable()
 export class KubernetesNodesListConfigService implements IListConfig<KubernetesNode> {
+  dataSource: KubernetesNodesDataSource;
+
   columns: Array<ITableColumn<KubernetesNode>> = [
     {
       columnId: 'name', headerCell: () => 'Name',
@@ -70,8 +76,24 @@ export class KubernetesNodesListConfigService implements IListConfig<KubernetesN
       cellFlex: '5',
     },
   ];
-  filters: IListFilter<KubernetesNode>[];
-  filterSelected: IListFilter<KubernetesNode>;
+  filters: IListFilter[] = [
+    {
+      default: true,
+      key: KubernetesNodesListFilterKeys.NAME,
+      label: 'Name',
+      placeholder: 'Filter by Name'
+    },
+    {
+      key: KubernetesNodesListFilterKeys.LABELS,
+      label: 'Labels',
+      placeholder: 'Filter by Labels'
+    },
+    {
+      key: KubernetesNodesListFilterKeys.IP_ADDRESS,
+      label: 'IP Address',
+      placeholder: 'Filter by IP Address'
+    }
+  ];
 
   pageSizeOptions = defaultHelmKubeListPageSize;
   viewType = ListViewTypes.TABLE_ONLY;
@@ -86,39 +108,46 @@ export class KubernetesNodesListConfigService implements IListConfig<KubernetesN
   getMultiActions = () => [];
   getSingleActions = () => [];
   getColumns = () => this.columns;
-  getDataSource = () => this.filterSelected.dataSource;
+  getDataSource = () => this.dataSource;
   getMultiFiltersConfigs = () => [];
-  getFilters = (): IListFilter<KubernetesNode>[] => this.filters;
-  setFilter = (id: string) => {
-    this.filterSelected = this.filters.find(filter => filter.id === id);
-  }
+  getFilters = (): IListFilter[] => this.filters;
 
   constructor(
     store: Store<AppState>,
     kubeId: BaseKubeGuid,
   ) {
-    this.filters = [
-      {
-        dataSource: new NameKubernetesNodesDataSource(store, kubeId, this),
-        default: true,
-        id: 'name',
-        label: 'Name',
-        placeholder: 'Filter by Name'
-      },
-      {
-        dataSource: new LabelsKubernetesNodesDataSource(store, kubeId, this),
-        id: 'labels',
-        label: 'Labels',
-        placeholder: 'Filter by Labels'
-      },
-      {
-        dataSource: new IPAddressKubernetesNodesDataSource(store, kubeId, this),
-        id: 'ip-address',
-        label: 'IP Address',
-        placeholder: 'Filter by IP Address'
+    const transformEntities: DataFunction<KubernetesNode>[] = [
+      (entities: KubernetesNode[], paginationState: PaginationEntityState) => {
+        const filterKey = paginationState.clientPagination.filter.filterKey;
+        const filterString = paginationState.clientPagination.filter.string.toUpperCase();
+
+        switch (filterKey) {
+          case KubernetesNodesListFilterKeys.IP_ADDRESS:
+            return entities.filter(node => {
+              const internalIP: string = node.status.addresses.find(address => {
+                return address.type === 'InternalIP';
+              }).address;
+              return internalIP.toUpperCase().includes(filterString);
+            });
+
+          case KubernetesNodesListFilterKeys.LABELS:
+            return entities.filter(node => {
+              return Object.entries(node.metadata.labels).some(([label, value]) => {
+                label = label.toUpperCase();
+                value = value.toUpperCase();
+                return label.includes(filterString) || value.includes(filterString);
+              });
+            });
+
+          case KubernetesNodesListFilterKeys.NAME:
+          default:
+            return entities.filter(node => {
+              return node.metadata.name.toUpperCase().includes(filterString);
+            });
+        }
       }
     ];
 
-    this.filterSelected = this.filters.find(filter => filter.default === true);
+    this.dataSource = new KubernetesNodesDataSource(store, kubeId, this, transformEntities);
   }
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
index 629af156ed..a389753548 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
@@ -104,7 +104,6 @@ export class KubernetesPodsListConfigService implements IListConfig<KubernetesPo
   getDataSource = () => this.podsDataSource;
   getMultiFiltersConfigs = () => [];
   getFilters = () => [];
-  setFilter = (id: string) => null;
 
   constructor(
     store: Store<AppState>,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-list-config.service.ts
index 6da50d7cb7..2579b31e86 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-list-config.service.ts
@@ -61,5 +61,4 @@ export abstract class BaseKubernetesServicesListConfig implements IListConfig<Ku
   getColumns = () => this.columns;
   getMultiFiltersConfigs = () => [];
   getFilters = () => [];
-  setFilter = (id: string) => null;
 }
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 eda6983908..1365cf3d45 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
@@ -471,7 +471,8 @@ export abstract class ListDataSource<T, A = T> extends DataSource<T> implements
     return this.pagination$.pipe(
       map(pag => ({
         string: this.isLocal ? pag.clientPagination.filter.string : this.getFilterFromParams(pag),
-        items: { ...pag.clientPagination.filter.items }
+        items: { ...pag.clientPagination.filter.items },
+        filterKey: pag.clientPagination.filter.filterKey,
       })),
       tag('list-filter')
     );
diff --git a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts
index 21cb9b6085..84888c0ce9 100644
--- a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts
+++ b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts
@@ -136,6 +136,7 @@ export class LocalListController<T = any> {
       + (paginationEntity.params['order-direction-field'] || '') + ','
       + (paginationEntity.params['order-direction'] || '') + ','
       + paginationEntity.clientPagination.filter.string + ','
+      + paginationEntity.clientPagination.filter.filterKey + ','
       + paginationEntity.forcedLocalPage
       + Object.values(paginationEntity.clientPagination.filter.items);
     // Some outlier cases actually fetch independently from this list (looking at you app variables)
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-config.service.ts
index 9146ab9467..2c23cde46c 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-config.service.ts
@@ -53,5 +53,4 @@ export class CfAppEventsConfigService extends ListConfig<APIResource> implements
   getDataSource = () => this.eventSource;
   getMultiFiltersConfigs = () => [];
   getFilters = () => [];
-  setFilter = (id: string) => null;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts
index 54dad54486..82c3f8b737 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts
@@ -221,7 +221,6 @@ export class CfAppInstancesConfigService implements IListConfig<ListAppInstance>
   getDataSource = () => this.instancesSource;
   getMultiFiltersConfigs = () => [];
   getFilters = () => [];
-  setFilter = (id: string) => null;
   getInitialised = () => this.initialised$;
 
   private createMetricsResults(entityServiceFactory: EntityServiceFactory) {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.ts
index 1c288d4be0..1e6cc952ae 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.ts
@@ -132,7 +132,6 @@ export class CfAppVariablesListConfigService implements IListConfig<ListAppEnvVa
   getDataSource = () => this.envVarsDataSource;
   getMultiFiltersConfigs = () => [];
   getFilters = () => [];
-  setFilter = (id: string) => null;
 
   constructor(
     private store: Store<AppState>,
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app/cf-app-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app/cf-app-config.service.ts
index 9abc1afdcf..d311bf322f 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/app/cf-app-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/app/cf-app-config.service.ts
@@ -145,6 +145,5 @@ export class CfAppConfigService extends ListConfig<APIResource> implements IList
   getDataSource = () => this.appsDataSource;
   getMultiFiltersConfigs = () => this.multiFilterConfigs;
   getFilters = () => [];
-  setFilter = (id: string) => null;
   getInitialised = () => this.initialised$;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/base-cf/base-cf-list-config.ts b/src/frontend/packages/core/src/shared/components/list/list-types/base-cf/base-cf-list-config.ts
index 5f0844b271..97edb4b016 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/base-cf/base-cf-list-config.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/base-cf/base-cf-list-config.ts
@@ -18,5 +18,4 @@ export class BaseCfListConfig<T> implements IListConfig<T> {
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => [];
   getFilters = () => [];
-  setFilter = (id: string) => null;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service.ts
index cd617b7535..91fd7eba14 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service.ts
@@ -50,6 +50,5 @@ export class CFEndpointsListConfigService implements IListConfig<EndpointModel>
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
   public getFilters = () => [];
-  public setFilter = (id: string) => null;
   public getDataSource = () => this.dataSource;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-routes/cf-routes-list-config-base.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-routes/cf-routes-list-config-base.ts
index 459a476e3a..40bcf2a8be 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-routes/cf-routes-list-config-base.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-routes/cf-routes-list-config-base.ts
@@ -206,7 +206,6 @@ export abstract class CfRoutesListConfigBase implements IListConfig<APIResource>
   getColumns = () => this.columns;
   getMultiFiltersConfigs = () => [];
   getFilters = () => [];
-  setFilter = (id: string) => null;
 
   /**
    * Creates an instance of CfRoutesListConfigBase.
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-routes/cf-routes-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-routes/cf-routes-list-config.service.ts
index 9b96a62922..dfd9b266b0 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-routes/cf-routes-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-routes/cf-routes-list-config.service.ts
@@ -70,7 +70,6 @@ export class CfRoutesListConfigService extends CfRoutesListConfigBase implements
     ];
     this.getMultiFiltersConfigs = () => multiFilterConfigs;
     this.getFilters = () => [];
-    this.setFilter = (id: string) => null;
     initCfOrgSpaceService(store, cfOrgSpaceService,
       this.dataSource.masterAction.entityKey,
       this.dataSource.masterAction.paginationKey).subscribe();
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-select-users/cf-select-users-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-select-users/cf-select-users-list-config.service.ts
index 5b4173600f..8c2be47670 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-select-users/cf-select-users-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-select-users/cf-select-users-list-config.service.ts
@@ -133,7 +133,6 @@ export class CfSelectUsersListConfigService implements IListConfig<APIResource<C
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => [];
   getFilters = () => [];
-  setFilter = (id: string) => null;
   getDataSource = () => this.dataSource;
   getInitialised = () => this.initialised;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts
index 1890f455ad..3d2d967356 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts
@@ -194,7 +194,6 @@ export class CfServiceInstancesListConfigBase implements IListConfig<APIResource
   getSingleActions = () => [this.listActionEdit, this.listActionDetach, this.listActionDelete];
   getMultiFiltersConfigs = () => [];
   getFilters = () => [];
-  setFilter = (id: string) => null;
   getColumns = () => this.serviceInstanceColumns;
   getDataSource = () => null;
 
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts
index 8abe831628..bc171f066d 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts
@@ -85,6 +85,5 @@ export class CfServicesListConfigService implements IListConfig<APIResource> {
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => this.multiFilterConfigs;
   getFilters = () => [];
-  setFilter = (id: string) => null;
   getDataSource = () => this.dataSource;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts
index e8ef1501f2..80e7f86a52 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts
@@ -198,7 +198,6 @@ export class CfUserServiceInstancesListConfigBase implements IListConfig<APIReso
   getSingleActions = () => [this.listActionEdit, this.listActionDetach, this.listActionDelete];
   getMultiFiltersConfigs = () => [];
   getFilters = () => [];
-  setFilter = (id: string) => null;
   getColumns = () => this.serviceInstanceColumns;
   getDataSource = () => this.dataSource;
 
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.ts
index ed82576976..90c7061031 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.ts
@@ -89,6 +89,5 @@ export class CfSpaceAppsListConfigService implements IListConfig<APIResource> {
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => [];
   getFilters = () => [];
-  setFilter = (id: string) => null;
   getDataSource = () => this.dataSource;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces/cf-spaces-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces/cf-spaces-list-config.service.ts
index 6935a22986..463195a0f5 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces/cf-spaces-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces/cf-spaces-list-config.service.ts
@@ -56,6 +56,5 @@ export class CfSpacesListConfigService implements IListConfig<APIResource<ISpace
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => [];
   getFilters = () => [];
-  setFilter = (id: string) => null;
   getDataSource = () => this.dataSource;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-list-config.service.ts
index 70517de420..d0332b6954 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-list-config.service.ts
@@ -86,7 +86,6 @@ export class CfUsersSpaceRolesListConfigService implements IListConfig<APIResour
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => [];
   getFilters = () => [];
-  setFilter = (id: string) => null;
   getDataSource = () => this.dataSource;
   public getInitialised = () => this.initialised;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts
index 394ea1be37..50fc128462 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts
@@ -58,6 +58,5 @@ export class DetachAppsListConfigService implements IListConfig<APIResource> {
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => [];
   getFilters = () => [];
-  setFilter = (id: string) => null;
   getDataSource = () => this.dataSource;
 }
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 d8d6cb9fa4..e7b3158731 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
@@ -135,5 +135,4 @@ export class EndpointsListConfigService implements IListConfig<EndpointModel> {
   public getDataSource = () => this.dataSource;
   public getMultiFiltersConfigs = () => [];
   public getFilters = () => [];
-  public setFilter = (id: string) => null;
 }
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/core/src/shared/components/list/list-types/github-commits/github-commits-list-config-base.service.ts
index 585b8a8171..8684e94c7d 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/core/src/shared/components/list/list-types/github-commits/github-commits-list-config-base.service.ts
@@ -93,7 +93,6 @@ export abstract class GithubCommitsListConfigServiceBase implements IListConfig<
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
   public getFilters = () => [];
-  public setFilter = (id: string) => null;
   public getDataSource = () => this.dataSource;
   public getInitialised = () => this.initialised;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/service-plans/service-plans-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/service-plans/service-plans-list-config.service.ts
index 8da99f93f3..729fb7cbd1 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/service-plans/service-plans-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/service-plans/service-plans-list-config.service.ts
@@ -108,7 +108,6 @@ export class ServicePlansListConfigService implements IListConfig<APIResource<IS
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => [];
   getFilters = () => [];
-  setFilter = (id: string) => null;
   getColumns = () => this.columns;
   getDataSource = () => this.dataSource;
 }
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 f56c4b241d..68b48dfcc4 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
@@ -49,7 +49,7 @@ import {
   ListView,
   SetListViewAction,
 } from '../../../../../store/src/actions/list.actions';
-import { SetPage } from '../../../../../store/src/actions/pagination.actions';
+import { SetPage, SetClientFilterKey } from '../../../../../store/src/actions/pagination.actions';
 import { AppState } from '../../../../../store/src/app-state';
 import { entityFactory } from '../../../../../store/src/helpers/entity-factory';
 import { ActionState } from '../../../../../store/src/reducers/api-request-reducer/types';
@@ -177,9 +177,8 @@ export class ListComponent<T> implements OnInit, OnChanges, OnDestroy, AfterView
     };
   private filterString = '';
   private sortColumns: ITableColumn<T>[];
-  // private filterColumns: ITableColumn<T>[];
-  private filterColumns: IListFilter<T>[];
-  private filterSelected: IListFilter<T>;
+  private filterColumns: IListFilter[];
+  private filterSelected: IListFilter;
 
   private paginationWidgetToStore: Subscription;
   private filterWidgetToStore: Subscription;
@@ -396,20 +395,25 @@ export class ListComponent<T> implements OnInit, OnChanges, OnDestroy, AfterView
       return column.sort;
     });
 
-    this.filterColumns = this.config.getFilters();
-    if (!this.filterSelected) {
-      this.filterSelected = this.filterColumns.find(filterConfig => {
-        return filterConfig.default === true;
-      });
-    }
-
     const sortStoreToWidget = this.paginationController.sort$.pipe(tap((sort: ListSort) => {
       this.headerSort.value = sort.field;
       this.headerSort.direction = sort.direction;
     }));
 
+    this.filterColumns = this.config.getFilters();
+
     const filterStoreToWidget = this.paginationController.filter$.pipe(tap((paginationFilter: ListFilter) => {
       this.filterString = paginationFilter.string;
+
+      const filterKey = paginationFilter.filterKey;
+      if (filterKey) {
+        this.filterSelected = this.filterColumns.find(filterConfig => {
+          return filterConfig.key === filterKey;
+        });
+      } else if (this.filterColumns) {
+        this.filterSelected = this.filterColumns.find(filterConfig => filterConfig.default);
+      }
+
       // Pipe store values to filter managers. This ensures any changes such as automatically selected orgs/spaces are shown in the drop
       // downs (change org to one with one space results in that space being selected)
       Object.values(this.multiFilterManagers).forEach((filterManager: MultiFilterManager<T>, index: number) => {
@@ -572,9 +576,6 @@ export class ListComponent<T> implements OnInit, OnChanges, OnDestroy, AfterView
       this.uberSub,
       this.multiFilterChangesSub
     );
-    if (this.filterColumns) {
-      this.filterColumns.forEach(filterConfig => filterConfig.dataSource.destroy());
-    }
     if (this.dataSource) {
       this.dataSource.destroy();
     }
@@ -605,9 +606,12 @@ export class ListComponent<T> implements OnInit, OnChanges, OnDestroy, AfterView
     });
   }
 
-  updateListFilter(filterSelected: IListFilter<T>, filterString: string) {
-    this.config.setFilter(filterSelected.id);
-    this.initialise();
+  updateListFilter(filterSelected: IListFilter, filterString: string) {
+    this.store.dispatch(new SetClientFilterKey(
+      this.dataSource.entityKey,
+      this.dataSource.paginationKey,
+      filterSelected.key
+    ));
   }
 
   executeActionMultiple(listActionConfig: IMultiListAction<T>) {
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 97114515cb..b6032c5922 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
@@ -50,8 +50,7 @@ export interface IListConfig<T> {
   /**
    * Collection of filters
    */
-  getFilters: () => IListFilter<T>[];
-  setFilter: (id: string) => void;
+  getFilters: () => IListFilter[];
   /**
    * Fetch an observable that will emit once the underlying config components have been created. For instance if the data source requires
    * something from the store which requires an async call
@@ -125,10 +124,9 @@ export interface IListMultiFilterConfig {
   select: BehaviorSubject<any>;
 }
 
-export interface IListFilter<T> {
-  dataSource: ListDataSource<T>;
+export interface IListFilter {
   default?: boolean;
-  id: string;
+  key: string;
   label: string;
   placeholder: string;
 }
@@ -157,8 +155,7 @@ export class ListConfig<T> implements IListConfig<T> {
   getColumns = (): ITableColumn<T>[] => null;
   getDataSource = (): ListDataSource<T> => null;
   getMultiFiltersConfigs = (): IListMultiFilterConfig[] => [];
-  getFilters = (): IListFilter<T>[] => [];
-  setFilter = (id: string) => null;
+  getFilters = (): IListFilter[] => [];
   getInitialised = () => observableOf(true);
 }
 
diff --git a/src/frontend/packages/store/src/actions/list.actions.ts b/src/frontend/packages/store/src/actions/list.actions.ts
index 5291cba081..adccb7c3f9 100644
--- a/src/frontend/packages/store/src/actions/list.actions.ts
+++ b/src/frontend/packages/store/src/actions/list.actions.ts
@@ -20,6 +20,7 @@ export class ListFilter {
   items: {
     [key: string]: any;
   };
+  filterKey?: string;
 }
 
 export const ListStateActionTypes = {
diff --git a/src/frontend/packages/store/src/actions/pagination.actions.ts b/src/frontend/packages/store/src/actions/pagination.actions.ts
index 0d2e20c2e0..4d1d99287c 100644
--- a/src/frontend/packages/store/src/actions/pagination.actions.ts
+++ b/src/frontend/packages/store/src/actions/pagination.actions.ts
@@ -12,6 +12,7 @@ export const SET_RESULT_COUNT = '[Pagination] Set result count';
 export const SET_CLIENT_PAGE_SIZE = '[Pagination] Set client page size';
 export const SET_CLIENT_PAGE = '[Pagination] Set client page';
 export const SET_CLIENT_FILTER = '[Pagination] Set client filter';
+export const SET_CLIENT_FILTER_KEY = '[Pagination] Set client filter key';
 export const SET_PARAMS = '[Pagination] Set Params';
 export const SET_INITIAL_PARAMS = '[Pagination] Set initial params';
 export const ADD_PARAMS = '[Pagination] Add Params';
@@ -114,6 +115,15 @@ export class SetClientFilter implements BasePaginatedAction {
   type = SET_CLIENT_FILTER;
 }
 
+export class SetClientFilterKey implements BasePaginatedAction {
+  constructor(
+    public entityKey: string,
+    public paginationKey: string,
+    public filterKey: string,
+  ) {}
+  type = SET_CLIENT_FILTER_KEY;
+}
+
 export class SetParams implements BasePaginatedAction {
   constructor(
     public entityKey: string,
diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-set-client-filter-key.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-set-client-filter-key.ts
new file mode 100644
index 0000000000..9e88445cc7
--- /dev/null
+++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-set-client-filter-key.ts
@@ -0,0 +1,22 @@
+import { PaginationEntityState } from '../../types/pagination.types';
+import { SetClientFilterKey } from '../../actions/pagination.actions';
+import { spreadClientPagination } from './pagination-reducer.helper';
+
+export function paginationSetClientFilterKey(state: PaginationEntityState, action: SetClientFilterKey) {
+    const clientPagination = spreadClientPagination(state.clientPagination);
+
+    return {
+        ...state,
+        error: false,
+        clientPagination: {
+            ...clientPagination,
+            filter: {
+                ...clientPagination.filter,
+                items: {
+                    ...clientPagination.filter.items,
+                },
+                filterKey: action.filterKey,
+            }
+        }
+    };
+}
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 d5fffcd8fd..59d5ed5763 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
@@ -12,6 +12,7 @@ import {
   REMOVE_PARAMS,
   RESET_PAGINATION,
   SET_CLIENT_FILTER,
+  SET_CLIENT_FILTER_KEY,
   SET_CLIENT_PAGE,
   SET_CLIENT_PAGE_SIZE,
   SET_INITIAL_PARAMS,
@@ -34,6 +35,7 @@ import { paginationMaxReached } from './pagination-reducer-max-reached';
 import { paginationRemoveParams } from './pagination-reducer-remove-params';
 import { getDefaultPaginationEntityState, paginationResetPagination } from './pagination-reducer-reset-pagination';
 import { paginationSetClientFilter } from './pagination-reducer-set-client-filter';
+import { paginationSetClientFilterKey } from './pagination-reducer-set-client-filter-key';
 import { paginationSetClientPage } from './pagination-reducer-set-client-page';
 import { paginationSetClientPageSize } from './pagination-reducer-set-client-page-size';
 import { paginationSetPage } from './pagination-reducer-set-page';
@@ -79,6 +81,8 @@ const getPaginationUpdater = (types: [string, string, string]) => {
         return paginationSetClientPage(state, action);
       case SET_CLIENT_FILTER:
         return paginationSetClientFilter(state, action);
+      case SET_CLIENT_FILTER_KEY:
+        return paginationSetClientFilterKey(state, action);
       case SET_PAGE_BUSY:
         return paginationPageBusy(state, action);
       default:
diff --git a/src/frontend/packages/store/src/types/pagination.types.ts b/src/frontend/packages/store/src/types/pagination.types.ts
index 0f3fa22b30..65d70caf42 100644
--- a/src/frontend/packages/store/src/types/pagination.types.ts
+++ b/src/frontend/packages/store/src/types/pagination.types.ts
@@ -24,6 +24,7 @@ export interface PaginationClientFilter {
   items: {
     [key: string]: any;
   };
+  filterKey?: string;
 }
 
 export interface PaginationClientPagination {

From 0c91cf5c235febe931b84820e10a44f2ca2b6eac Mon Sep 17 00:00:00 2001
From: Jordan Jensen <jojensen@suse.com>
Date: Fri, 9 Aug 2019 18:07:50 -0700
Subject: [PATCH 082/648] Expand IListConfig getFilters comment (SOC-9450)

---
 .../core/src/shared/components/list/list.component.types.ts   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 b6032c5922..f7fa22a8d9 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
@@ -48,7 +48,9 @@ export interface IListConfig<T> {
    */
   getMultiFiltersConfigs: () => IListMultiFilterConfig[];
   /**
-   * Collection of filters
+   * Collection of filter definitions to support filtering across multiple fields in a list.
+   * When the filter is selected in a dropdown the filterString filters results using the chosen field.
+   * Combined with a transformEntities DataFunction that consumes the filterKey.
    */
   getFilters: () => IListFilter[];
   /**

From f1d83c4e722c9d5320855861f0e30c7f2b3509a3 Mon Sep 17 00:00:00 2001
From: Jordan Jensen <jojensen@suse.com>
Date: Mon, 12 Aug 2019 17:14:19 -0700
Subject: [PATCH 083/648] Update list component tests (SOC-9450)

---
 .../shared/components/list/list.component.spec.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

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 939407b770..148e5d9ce0 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
@@ -42,6 +42,7 @@ describe('ListComponent', () => {
         getInitialised: () => null,
         getMultiActions: () => null,
         getMultiFiltersConfigs: () => null,
+        getFilters: () => null,
         getSingleActions: () => null,
         isLocal: false,
         pageSizeOptions: [1],
@@ -149,6 +150,7 @@ describe('ListComponent', () => {
     describe('Header', () => {
       it('Nothing enabled', () => {
         component.config.getMultiFiltersConfigs = () => [];
+        component.config.getFilters = () => [];
         component.config.enableTextFilter = false;
         component.config.viewType = ListViewTypes.CARD_ONLY;
         component.config.defaultView = 'card' as ListView;
@@ -206,6 +208,19 @@ describe('ListComponent', () => {
             }
           ];
         };
+        component.config.getFilters = () => ([
+          {
+            default: true,
+            key: 'a',
+            label: 'A',
+            placeholder: 'Filter by A'
+          },
+          {
+            key: 'b',
+            label: 'B',
+            placeholder: 'Filter by B'
+          }
+        ]);
         component.config.enableTextFilter = true;
         component.config.viewType = ListViewTypes.CARD_ONLY;
         component.config.defaultView = 'card' as ListView;

From d0bd4f37ab8a7adc35e909b0d77b22d9625f9edb Mon Sep 17 00:00:00 2001
From: Jordan Jensen <jojensen@suse.com>
Date: Fri, 23 Aug 2019 16:36:08 -0700
Subject: [PATCH 084/648] Handle no default filter selection better (SOC-9450)

- Disable filter string if no default filter is selected
---
 .../kubernetes-nodes/kubernetes-nodes-list-config.service.ts | 5 +++--
 .../core/src/shared/components/list/list.component.html      | 4 ++--
 .../core/src/shared/components/list/list.component.ts        | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
index fa0fb9aebc..97a30a84e8 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
@@ -100,7 +100,7 @@ export class KubernetesNodesListConfigService implements IListConfig<KubernetesN
 
   enableTextFilter = true;
   text = {
-    filter: 'Filter by Name',
+    filter: '',
     noEntries: 'There are no nodes'
   };
 
@@ -140,10 +140,11 @@ export class KubernetesNodesListConfigService implements IListConfig<KubernetesN
             });
 
           case KubernetesNodesListFilterKeys.NAME:
-          default:
             return entities.filter(node => {
               return node.metadata.name.toUpperCase().includes(filterString);
             });
+          default:
+            return entities;
         }
       }
     ];
diff --git a/src/frontend/packages/core/src/shared/components/list/list.component.html b/src/frontend/packages/core/src/shared/components/list/list.component.html
index 9f6d4a7f8b..ea7ecb4e46 100644
--- a/src/frontend/packages/core/src/shared/components/list/list.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list.component.html
@@ -75,7 +75,7 @@
               <mat-label>Filter Selection</mat-label>
               <mat-select
                 [(value)]="filterSelected"
-                (selectionChange)="updateListFilter($event.value, filterString)"
+                (selectionChange)="updateListFilter($event.value)"
               >
                 <mat-option *ngFor="let filter of filterColumns" [value]="filter">
                   {{ filter.label }}
@@ -87,7 +87,7 @@
             [hidden]="!config.enableTextFilter || (!(hasRows$ | async) && !filter) || (dataSource.isAdding$ | async) || (dataSource.maxedResults$ | async)">
             <mat-form-field floatLabel="never" class="list-component__header__right-filter">
               <input matInput [ngModel]="filterString" #filter="ngModel"
-                [disabled]="(dataSource.isLoadingPage$ | async)" name="filter"
+                [disabled]="(filterColumns.length > 1 && filterSelected === undefined) || (dataSource.isLoadingPage$ | async)" name="filter"
                 placeholder="{{ filterSelected?.placeholder || config.text?.filter || 'Filter'}}">
             </mat-form-field>
           </div>
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 68b48dfcc4..4533e67732 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
@@ -412,6 +412,7 @@ export class ListComponent<T> implements OnInit, OnChanges, OnDestroy, AfterView
         });
       } else if (this.filterColumns) {
         this.filterSelected = this.filterColumns.find(filterConfig => filterConfig.default);
+        this.updateListFilter(this.filterSelected);
       }
 
       // Pipe store values to filter managers. This ensures any changes such as automatically selected orgs/spaces are shown in the drop
@@ -606,7 +607,7 @@ export class ListComponent<T> implements OnInit, OnChanges, OnDestroy, AfterView
     });
   }
 
-  updateListFilter(filterSelected: IListFilter, filterString: string) {
+  updateListFilter(filterSelected: IListFilter) {
     this.store.dispatch(new SetClientFilterKey(
       this.dataSource.entityKey,
       this.dataSource.paginationKey,

From aef717614fd7216ddbe1ce125604cc0f1dc9f600 Mon Sep 17 00:00:00 2001
From: Jordan Jensen <jojensen@suse.com>
Date: Fri, 23 Aug 2019 16:46:18 -0700
Subject: [PATCH 085/648] Only update list filter if a default is found
 (SOC-9450)

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

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 4533e67732..2d1e26df65 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
@@ -412,7 +412,9 @@ export class ListComponent<T> implements OnInit, OnChanges, OnDestroy, AfterView
         });
       } else if (this.filterColumns) {
         this.filterSelected = this.filterColumns.find(filterConfig => filterConfig.default);
-        this.updateListFilter(this.filterSelected);
+        if (this.filterSelected) {
+          this.updateListFilter(this.filterSelected);
+        }
       }
 
       // Pipe store values to filter managers. This ensures any changes such as automatically selected orgs/spaces are shown in the drop

From 24cfeccf267d7ded87c50510796b80c9f5c5673c Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 30 Aug 2019 08:32:46 +0100
Subject: [PATCH 086/648] Add classes so that e2e tests still work

---
 .../app/custom/suse-welcome/suse-welcome.component.html       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.html b/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.html
index b2a52c6faa..77b4aa744f 100644
--- a/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.html
+++ b/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.html
@@ -1,8 +1,8 @@
 <app-stratos-title title="Cloud Application Platform Console"></app-stratos-title>
 
-<div class="no-endpoints-message">
+<div class="no-endpoints-message app-no-content-container">
   <mat-icon class="no-endpoints-message__icon">settings_ethernet</mat-icon>
-  <div class="no-endpoints-message__text">There are no registered endpoints</div>
+  <div class="no-endpoints-message__text first-line">There are no registered endpoints</div>
 </div>
 
 <app-tile-grid>

From e2ce7e2e61aa8dd01c5386d35101627e2fd93d37 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Fri, 30 Aug 2019 11:58:42 +0100
Subject: [PATCH 087/648] Remove debug logging message

---
 src/jetstream/plugins/kubernetes/helm_client.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/helm_client.go b/src/jetstream/plugins/kubernetes/helm_client.go
index 154c71a140..8cfeef9cb0 100644
--- a/src/jetstream/plugins/kubernetes/helm_client.go
+++ b/src/jetstream/plugins/kubernetes/helm_client.go
@@ -30,8 +30,6 @@ func (c *KubernetesSpecification) GetHelmClient(endpointGUID, userID string) (he
 		return nil, nil, nil, errors.New("Helm: Can not get user token for endpoint")
 	}
 
-	log.Error("GetHelmClient (2)")
-
 	config, err := c.GetConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRecord)
 	if err != nil {
 		log.Errorf("Helm: Could not get config for endpoint: %s", err)

From 3376e76716565fad18c6f2cc971ad4304e7e66bf Mon Sep 17 00:00:00 2001
From: Jordan Jensen <jojensen@suse.com>
Date: Fri, 30 Aug 2019 16:26:31 -0700
Subject: [PATCH 088/648] Remove unnecessary additions (SOC-9450)

---
 .../core/src/shared/components/list/list.component.html    | 7 -------
 .../pagination-reducer-set-client-filter-key.ts            | 3 ---
 2 files changed, 10 deletions(-)

diff --git a/src/frontend/packages/core/src/shared/components/list/list.component.html b/src/frontend/packages/core/src/shared/components/list/list.component.html
index ea7ecb4e46..6447c2150e 100644
--- a/src/frontend/packages/core/src/shared/components/list/list.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list.component.html
@@ -216,10 +216,3 @@
     </div>
   </ng-container>
 </div>
-
-<ng-template #refreshButton>
-  <button mat-mini-fab *ngIf="!(isAddingOrSelecting$ | async)" [disabled]="dataSource.isLoadingPage$ | async"
-    (click)="refresh()">
-    <mat-icon aria-label="Refresh list data">refresh</mat-icon>
-  </button>
-</ng-template>
diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-set-client-filter-key.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-set-client-filter-key.ts
index 9e88445cc7..5db751052d 100644
--- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-set-client-filter-key.ts
+++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-set-client-filter-key.ts
@@ -12,9 +12,6 @@ export function paginationSetClientFilterKey(state: PaginationEntityState, actio
             ...clientPagination,
             filter: {
                 ...clientPagination.filter,
-                items: {
-                    ...clientPagination.filter.items,
-                },
                 filterKey: action.filterKey,
             }
         }

From 24727d3932a93f197bf8e2fed0c60568519ad52e Mon Sep 17 00:00:00 2001
From: Jordan Jensen <jojensen@suse.com>
Date: Fri, 30 Aug 2019 16:39:23 -0700
Subject: [PATCH 089/648] Return entities if no filter string (SOC-9450)

---
 .../kubernetes-nodes-list-config.service.ts                | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
index 97a30a84e8..bb7438bbdd 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
@@ -118,8 +118,13 @@ export class KubernetesNodesListConfigService implements IListConfig<KubernetesN
   ) {
     const transformEntities: DataFunction<KubernetesNode>[] = [
       (entities: KubernetesNode[], paginationState: PaginationEntityState) => {
+        const filterString = paginationState.clientPagination.filter.string;
+
+        if (!filterString) {
+          return entities;
+        }
+
         const filterKey = paginationState.clientPagination.filter.filterKey;
-        const filterString = paginationState.clientPagination.filter.string.toUpperCase();
 
         switch (filterKey) {
           case KubernetesNodesListFilterKeys.IP_ADDRESS:

From ad904b558cd9910d5969fd66a9eec3313198d73f Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 3 Sep 2019 12:09:23 +0100
Subject: [PATCH 090/648] 2.5.1 version bump and changelog

---
 CHANGELOG.md      | 18 ++++++++++++++++++
 package-lock.json |  2 +-
 package.json      |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c061df0859..42e05420c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Change Log
 
+## 2.5.1
+
+[Full Changelog](https://github.com/cloudfoundry-incubator/stratos/compare/2.5.0...2.5.1)
+
+This release contains a number of fixes and improvements:
+
+**Fixes:**
+
+- Allow DB directory to be specified for SQLite [\#194](https://github.com/SUSE/stratos/pull/193)
+
+**Improvements:**
+
+- Tech preview for helm feature [\#190](https://github.com/SUSE/stratos/pull/190)
+- Add custom welcome message on endpoints page [\#194](https://github.com/SUSE/stratos/pull/194)
+- Add support for connecting CaaSP V4 endpoints [\#191](https://github.com/SUSE/stratos/pull/191)
+
+> Note: Tech preview features can be enabled when deploying via Helm by setting the Helm chart value `console.techPreview` to `true` - e.g. add `--set console.techPreview=true` when installing.
+
 ## 2.5.0
 
 [Full Changelog](https://github.com/cloudfoundry-incubator/stratos/compare/2.4.0...2.5.0)
diff --git a/package-lock.json b/package-lock.json
index 0bd98c85ce..47d82c0c4b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "stratos",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0b136f7d32..0a2c43eda8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stratos",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "Stratos Console",
   "main": "index.js",
   "scripts": {

From 1560dde5a2a1b83ba4c6281ab5a4289eb6758d03 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Tue, 3 Sep 2019 13:48:50 +0100
Subject: [PATCH 091/648] Autoscaler Tweaks

---
 .../autoscaler-available.ts                   | 30 +++++++
 .../autoscaler-helpers/autoscaler-util.ts     | 22 ++---
 .../autoscaler-tab-extension.component.html   | 88 +++++++------------
 .../autoscaler-tab-extension.component.scss   | 24 ++++-
 .../autoscaler-tab-extension.component.ts     | 75 ++++++++--------
 .../edit-autoscaler-policy-service.ts         |  6 +-
 ...dit-autoscaler-policy-step1.component.html |  2 +
 ...dit-autoscaler-policy-step2.component.html |  9 +-
 ...dit-autoscaler-policy-step2.component.scss |  4 +
 .../edit-autoscaler-policy-step2.component.ts | 28 +++++-
 ...dit-autoscaler-policy-step3.component.html |  2 +
 ...dit-autoscaler-policy-step4.component.html |  2 +
 .../edit-autoscaler-policy-step4.component.ts | 14 +--
 .../edit-autoscaler-policy.component.html     |  9 +-
 .../edit-autoscaler-policy.component.scss     | 13 ---
 .../edit-autoscaler-policy.component.ts       |  6 +-
 .../card-autoscaler-default.component.html    | 67 +++++---------
 .../card-autoscaler-default.component.scss    | 52 ++---------
 .../src/store/app-autoscaler.actions.ts       | 17 +++-
 .../src/store/app-autoscaler.types.ts         |  7 ++
 .../src/store/autoscaler.effects.ts           | 51 ++++++++---
 .../src/store/autoscaler.store.module.ts      |  6 ++
 .../card-cf-info/card-cf-info.component.html  | 18 ++--
 .../card-cf-info/card-cf-info.component.ts    | 14 ++-
 .../plugins/autoscaler/autoscaler.go          |  9 ++
 src/jetstream/plugins/autoscaler/main.go      |  1 +
 26 files changed, 325 insertions(+), 251 deletions(-)
 create mode 100644 src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-available.ts

diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-available.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-available.ts
new file mode 100644
index 0000000000..c5f16c883b
--- /dev/null
+++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-available.ts
@@ -0,0 +1,30 @@
+import { Observable } from 'rxjs';
+import { filter, map, publishReplay, refCount, startWith } from 'rxjs/operators';
+
+import { EntityServiceFactory } from '../../../../core/src/core/entity-service-factory.service';
+import { APIResource, EntityInfo } from '../../../../store/src/types/api.types';
+import { GetAppAutoscalerInfoAction } from '../../store/app-autoscaler.actions';
+import { AutoscalerInfo } from '../../store/app-autoscaler.types';
+
+export const fetchAutoscalerInfo = (
+  endpointGuid: string,
+  esf: EntityServiceFactory): Observable<EntityInfo<APIResource<AutoscalerInfo>>> => {
+  const action = new GetAppAutoscalerInfoAction(endpointGuid);
+  const entityService = esf.create<APIResource<AutoscalerInfo>>(action.entityKey, action.entity, endpointGuid, action);
+  return entityService.entityObs$.pipe(
+    filter(entityInfo =>
+      !!entityInfo &&
+      !!entityInfo.entityRequestInfo &&
+      !entityInfo.entityRequestInfo.fetching
+    ),
+    publishReplay(1),
+    refCount()
+  );
+};
+
+export const isAutoscalerEnabled = (endpointGuid: string, esf: EntityServiceFactory): Observable<boolean> => {
+  return fetchAutoscalerInfo(endpointGuid, esf).pipe(
+    map(entityInfo => !entityInfo.entityRequestInfo.error),
+    startWith(false)
+  );
+};
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 46fd4b6d21..a1b84d299c 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
@@ -106,28 +106,28 @@ export class AutoscalerConstants {
 }
 
 export const PolicyAlert = {
-  alertInvalidPolicyMinimumRange: 'The Minimum Instance Count must be a integer less than the Maximum Instance Count.',
-  alertInvalidPolicyMaximumRange: 'The Maximum Instance Count must be a integer greater than the Minimum Instance Count.',
+  alertInvalidPolicyMinimumRange: 'The Minimum Instance Count must be an integer less than the Maximum Instance Count.',
+  alertInvalidPolicyMaximumRange: 'The Maximum Instance Count must be an integer greater than the Minimum Instance Count.',
   alertInvalidPolicyInitialMaximumRange:
-    'The Initial Minimum Instance Count must be a integer in the range of Minimum Instance Count to Maximum Instance Count.',
+    'The Initial Minimum Instance Count must be an integer between Minimum Instance Count and Maximum Instance Count.',
   alertInvalidPolicyTriggerUpperThresholdRange: 'The Upper Threshold value must be an integer greater than the Lower Threshold value.',
-  alertInvalidPolicyTriggerLowerThresholdRange: 'The Lower Threshold value must be an integer in the range of 1 to (Upper Threshold-1).',
+  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.',
-  alertInvalidPolicyTriggerStepPercentageRange: 'The Instance Step Up/Down percentage must be a integer greater than 1.',
-  alertInvalidPolicyTriggerStepRange: 'The Instance Step Up/Down value must be a integer in the range of 1 to (Maximum Instance-1).',
+  alertInvalidPolicyTriggerStepPercentageRange: 'The Instance Step Up/Down percentage must be an integer greater than 1.',
+  alertInvalidPolicyTriggerStepRange: 'The Instance Step Up/Down value must be an integer between 1 and (Maximum Instance-1).',
   alertInvalidPolicyTriggerBreachDurationRange:
-    `The breach duration value must be an integer in the range of ${AutoscalerConstants.PolicyDefaultSetting.breach_duration_secs_min} to
+    `The breach duration value must be an integer between ${AutoscalerConstants.PolicyDefaultSetting.breach_duration_secs_min} and
     ${AutoscalerConstants.PolicyDefaultSetting.breach_duration_secs_max} seconds.`,
   alertInvalidPolicyTriggerCooldownRange:
-    `The cooldown period value must be an integer in the range of ${AutoscalerConstants.PolicyDefaultSetting.cool_down_secs_min} to
+    `The cooldown period value must be an integer between ${AutoscalerConstants.PolicyDefaultSetting.cool_down_secs_min} and
     ${AutoscalerConstants.PolicyDefaultSetting.breach_duration_secs_max} seconds.`,
-  alertInvalidPolicyScheduleDateBeforeNow: 'Start/End date should be after or equal to current date.',
+  alertInvalidPolicyScheduleDateBeforeNow: 'Start/End date should be after or equal to the current date.',
   alertInvalidPolicyScheduleEndDateBeforeStartDate: 'Start date must be earlier than the end date.',
   alertInvalidPolicyScheduleEndTimeBeforeStartTime: 'Start time must be earlier than the end time.',
   alertInvalidPolicyScheduleRepeatOn: 'Please select at least one "Repeat On" day.',
   alertInvalidPolicyScheduleEndDateTimeBeforeStartDateTime: 'Start date and time must be earlier than the end date and time.',
-  alertInvalidPolicyScheduleStartDateTimeBeforeNow: 'Start date and time must be after or equal to current date time.',
-  alertInvalidPolicyScheduleEndDateTimeBeforeNow: 'End date and time must be after or equal the current date and time.',
+  alertInvalidPolicyScheduleStartDateTimeBeforeNow: 'Start date and time must be after or equal to the current date time.',
+  alertInvalidPolicyScheduleEndDateTimeBeforeNow: 'End date and time must be after or equal to the current date and time.',
   alertInvalidPolicyScheduleRecurringConflict: 'Recurring schedule configuration conflict occurs.',
   alertInvalidPolicyScheduleSpecificConflict: 'Specific date configuration conflict occurs.',
   alertInvalidPolicyTriggerScheduleEmpty: 'At least one Scaling Rule or Schedule should be defined.',
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 1ea6e15f7a..413228ea3d 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
@@ -1,52 +1,29 @@
+<app-page-sub-nav>
+  <ng-container *ngIf="appAutoscalerPolicy$ | async as policy; else noPolicy">
+    <button mat-button name="edit" (click)="updatePolicyPage()" class="nav-button-with-text">
+      <span class="nav-button-with-text__span">
+        <mat-icon class="nav-button-with-text__icon">edit</mat-icon> Edit Policy
+      </span>
+    </button>
+    <button mat-button name="delete" (click)="disableAutoscaler()" class="nav-button-with-text">
+      <span class="nav-button-with-text__span">
+        <mat-icon class="nav-button-with-text__icon">delete</mat-icon> Delete Policy
+      </span>
+    </button>
+  </ng-container>
+  <ng-template #noPolicy>
+    <button mat-button name="add" (click)="updatePolicyPage(true)" class="nav-button-with-text">
+      <span class="nav-button-with-text__span">
+        <mat-icon class="nav-button-with-text__icon">add</mat-icon> Create Policy
+      </span>
+    </button>
+  </ng-template>
+</app-page-sub-nav>
 <div class="autoscaler-tab">
   <app-tile-grid class="app-autoscaler-tile-grid-100">
-    <app-tile-group *ngIf="!(appAutoscalerPolicy$ | async)">
-      <app-tile>
-        <mat-card>
-          <mat-card-header>
-            <mat-card-title>Status</mat-card-title>
-          </mat-card-header>
-          <mat-card-content>
-            <div class="app-metadata">
-              <div class="app-metadata__two-cols">
-                <mat-slide-toggle checked="false" (click)="updatePolicyPage()">Disabled</mat-slide-toggle>
-              </div>
-            </div>
-          </mat-card-content>
-        </mat-card>
-      </app-tile>
-      <app-tile>
-        <app-card-app-instances></app-card-app-instances>
-      </app-tile>
-    </app-tile-group>
     <app-tile-group *ngIf="appAutoscalerPolicy$ | async as policy">
-
-      <app-tile>
-        <mat-card>
-          <mat-card-header>
-            <mat-card-title>Status</mat-card-title>
-          </mat-card-header>
-          <mat-card-content>
-            <div class="app-metadata">
-              <div class="app-metadata__two-cols">
-                <mat-slide-toggle *ngIf="policy.enabled && detachConfirmOk == 0" checked="true"
-                  (click)="disableAutoscaler()">Enabled</mat-slide-toggle>
-                <mat-slide-toggle *ngIf="policy.enabled && detachConfirmOk == 1" checked="true"
-                  (click)="disableAutoscaler()">Enabled</mat-slide-toggle>
-                <mat-slide-toggle *ngIf="policy.enabled && detachConfirmOk == 2" checked="false"
-                  (click)="updatePolicyPage()">Disabled</mat-slide-toggle>
-                <mat-slide-toggle *ngIf="!policy.enabled" checked="false" (click)="updatePolicyPage()">Disabled
-                </mat-slide-toggle>
-              </div>
-            </div>
-          </mat-card-content>
-        </mat-card>
-      </app-tile>
-      <app-tile *ngIf="!policy.enabled">
-        <app-card-app-instances></app-card-app-instances>
-      </app-tile>
       <app-tile *ngIf="policy.enabled">
-        <app-card-autoscaler-default [onUpdate]="updatePolicyPage"></app-card-autoscaler-default>
+        <app-card-autoscaler-default></app-card-autoscaler-default>
       </app-tile>
       <app-tile *ngIf="policy.enabled" class="autoscaler-tab__latest-metrics">
         <app-card-app-usage *ngIf="policy.scaling_rules.length == 0"></app-card-app-usage>
@@ -59,7 +36,6 @@
               <div class="app-metadata__two-cols" *ngFor="let metricName of appAutoscalerAppMetricNames$ | async">
                 <app-metadata-item *ngIf="appAutoscalerAppMetrics[metricName] | async as metricData"
                   label={{metricName}}>
-                  <!-- {{ metricData[0].entity.latest.length > 0 && metricData[0].entity.latest[0].value ? metricData[0].entity.latest[0].value + " " + metricData[0].entity.unit : "NaN"}} -->
                   <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]=""
@@ -113,11 +89,6 @@
                 </div>
               </div>
             </mat-card-content>
-            <mat-card-actions class="autoscaler-tab__actions">
-              <button (click)="updatePolicyPage()" mat-icon-button>
-                <mat-icon>edit</mat-icon>
-              </button>
-            </mat-card-actions>
           </mat-card>
         </app-tile>
         <app-tile>
@@ -204,17 +175,15 @@
                   No recurring schedule.</div>
               </div>
             </mat-card-content>
-            <mat-card-actions class="autoscaler-tab__actions">
-              <button (click)="updatePolicyPage()" mat-icon-button>
-                <mat-icon>edit</mat-icon>
-              </button>
-            </mat-card-actions>
           </mat-card>
         </app-tile>
       </app-tile-group>
     </div>
-    <app-tile-group class="autoscaler-tile-events" *ngIf="appAutoscalerScalingHistory$ | async as scalingHistory">
-      <app-tile>
+    <app-tile-group class="autoscaler-tile-events" *ngIf="showAutoscalerHistory$ | async">
+      <span *ngIf="!(appAutoscalerPolicy$ | async)" class="autoscaler-tile-events__no-policy">
+        {{noPolicyMessageFirstLine}}. {{noPolicyMessageSecondLine.text}}
+      </span>
+      <app-tile *ngIf="appAutoscalerScalingHistory$ | async as scalingHistory">
         <mat-card>
           <mat-card-header class="autoscaler-tile-events__header">
             <mat-card-title>Latest Events </mat-card-title>
@@ -259,5 +228,8 @@
         </mat-card>
       </app-tile>
     </app-tile-group>
+    <app-no-content-message *ngIf="showNoPolicyMessage$ | async" [icon]="'meter'" [iconFont]="'stratos-icons'"
+      [firstLine]="noPolicyMessageFirstLine" [secondLine]="noPolicyMessageSecondLine">
+    </app-no-content-message>
   </app-tile-grid>
 </div>
\ No newline at end of file
diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.scss b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.scss
index 2388c6fd13..b0f618d8fa 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.scss
+++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.scss
@@ -17,15 +17,17 @@
   }
 
   &__latest-metrics {
+    flex: 2;
     min-height: 200px;
   }
 }
 
+
 .app-metadata {
   display: flex;
   flex-direction: row;
   &__two-cols {
-    flex: 1;
+    padding-right: 40px;
     app-metadata-item:first-child {
       margin-top: 0;
     }
@@ -52,6 +54,13 @@ table {
 }
 
 .autoscaler-tile-events {
+  &__no-policy {
+    align-items: center;
+    display: flex;
+    margin-bottom: 12px;
+    padding: 14px;
+  }
+
   &__header {
     display: flex;
     flex: 1;
@@ -69,3 +78,16 @@ table {
     }
   }
 }
+.nav-button-with-text {
+  margin: 0 10px 0 0;
+  padding: 0 5px;
+
+  &__span {
+    align-items: center;
+    display: flex;
+  }
+
+  &__icon {
+    margin-right: 5px;
+  }
+}
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 b011679585..6b65ae93db 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
@@ -2,8 +2,8 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
-import { Observable, Subscription } from 'rxjs';
-import { distinctUntilChanged, filter, first, map, publishReplay, refCount, startWith } from 'rxjs/operators';
+import { combineLatest, Observable, Subscription } from 'rxjs';
+import { distinctUntilChanged, filter, first, map, publishReplay, refCount } from 'rxjs/operators';
 
 import { EntityService } from '../../../../core/src/core/entity-service';
 import { EntityServiceFactory } from '../../../../core/src/core/entity-service-factory.service';
@@ -23,6 +23,7 @@ import { ActionState } from '../../../../store/src/reducers/api-request-reducer/
 import { getPaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { selectUpdateInfo } from '../../../../store/src/selectors/api.selectors';
 import { APIResource } from '../../../../store/src/types/api.types';
+import { isAutoscalerEnabled } from '../../core/autoscaler-helpers/autoscaler-available';
 import { AutoscalerConstants } from '../../core/autoscaler-helpers/autoscaler-util';
 import {
   AutoscalerPaginationParams,
@@ -33,9 +34,7 @@ import {
   UpdateAppAutoscalerPolicyAction,
 } from '../../store/app-autoscaler.actions';
 import {
-  AppAutoscalerFetchPolicyFailedResponse,
   AppAutoscalerMetricData,
-  AppAutoscalerPolicy,
   AppAutoscalerPolicyLocal,
   AppAutoscalerScalingHistory,
   AppScalingTrigger,
@@ -46,25 +45,6 @@ import {
   appAutoscalerScalingHistorySchemaKey,
 } from '../../store/autoscaler.store.module';
 
-const enableAutoscaler = (appGuid: string, endpointGuid: string, esf: EntityServiceFactory): Observable<boolean> => {
-  // This will eventual be moved out into a service and made generic to the cf (one call per cf, rather than one call per app - See #3583)
-  const action = new GetAppAutoscalerPolicyAction(appGuid, endpointGuid);
-  const entityService = esf.create<AppAutoscalerPolicy>(action.entityKey, action.entity, action.guid, action);
-  return entityService.entityObs$.pipe(
-    filter(entityInfo =>
-      !!entityInfo && !!entityInfo.entityRequestInfo && !!entityInfo.entityRequestInfo.response &&
-      !entityInfo.entityRequestInfo.fetching),
-    map(entityInfo => {
-      // Autoscaler feature should be enabled if either ..
-      // 1) There's an autoscaler policy
-      // 2) There's a 404 no policy error (as opposed to a 404 url not found error)
-      const noPolicySet = (entityInfo.entityRequestInfo.response as AppAutoscalerFetchPolicyFailedResponse).noPolicy;
-      return !!entityInfo.entity || noPolicySet;
-    }),
-    startWith(true)
-  );
-};
-
 @StratosTab({
   type: StratosTabType.Application,
   label: 'Autoscale',
@@ -73,8 +53,7 @@ const enableAutoscaler = (appGuid: string, endpointGuid: string, esf: EntityServ
   iconFont: 'stratos-icons',
   hidden: (store: Store<AppState>, esf: EntityServiceFactory, activatedRoute: ActivatedRoute) => {
     const endpointGuid = getGuids('cf')(activatedRoute) || window.location.pathname.split('/')[2];
-    const appGuid = getGuids()(activatedRoute) || window.location.pathname.split('/')[3];
-    return enableAutoscaler(appGuid, endpointGuid, esf).pipe(map(enabled => !enabled));
+    return isAutoscalerEnabled(endpointGuid, esf).pipe(map(enabled => !enabled));
   }
 })
 @Component({
@@ -100,14 +79,20 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
   appAutoscalerScalingHistory$: Observable<AppAutoscalerScalingHistory>;
   appAutoscalerAppMetricNames$: Observable<string[]>;
 
+  public showNoPolicyMessage$: Observable<boolean>;
+  public showAutoscalerHistory$: Observable<boolean>;
+
+  public noPolicyMessageFirstLine = 'This application has no Autoscaler Policy';
+  public noPolicyMessageSecondLine = {
+    text: 'To create a policy click the + icon above'
+  };
+
   private appAutoscalerPolicyErrorSub: Subscription;
   private appAutoscalerScalingHistoryErrorSub: Subscription;
   private appAutoscalerPolicySnackBarRef: MatSnackBarRef<SimpleSnackBar>;
   private appAutoscalerScalingHistorySnackBarRef: MatSnackBarRef<SimpleSnackBar>;
   private scalingHistoryAction: GetAppAutoscalerScalingHistoryAction;
 
-  private detachConfirmOk = 0;
-
   appAutoscalerAppMetrics = {};
 
   paramsMetrics: AutoscalerPaginationParams = {
@@ -190,6 +175,24 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
       refCount()
     );
     this.initErrorSub();
+
+    this.showAutoscalerHistory$ = combineLatest([
+      this.appAutoscalerPolicy$,
+      this.appAutoscalerScalingHistory$
+    ]).pipe(
+      map(([policy, history]) => !!policy || (!!history && history.total_results > 0)),
+      publishReplay(1),
+      refCount()
+    );
+
+    this.showNoPolicyMessage$ = combineLatest([
+      this.appAutoscalerPolicy$,
+      this.appAutoscalerScalingHistory$
+    ]).pipe(
+      map(([policy, history]) => !policy && (!history || history.total_results === 0)),
+      publishReplay(1),
+      refCount()
+    );
   }
 
   getAppMetric(metricName: string, trigger: AppScalingTrigger, params: AutoscalerPaginationParams) {
@@ -227,7 +230,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
     }
 
     this.appAutoscalerPolicyErrorSub = this.appAutoscalerPolicyService.entityMonitor.entityRequest$.pipe(
-      filter(request => !!request.error),
+      filter(request => !!request.error && !request.response.noPolicy),
       map(request => {
         const msg = request.message;
         request.error = false;
@@ -259,14 +262,12 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
 
   disableAutoscaler() {
     const confirmation = new ConfirmationDialogConfig(
-      'Detach And Delete Policy',
-      'Are you sure you want to detach and delete the policy?',
-      'Detach and Delete',
+      'Delete Policy',
+      'Are you sure you want to delete the policy?',
+      'Delete',
       true
     );
-    this.detachConfirmOk = this.detachConfirmOk === 1 ? 0 : 1;
     this.confirmDialog.open(confirmation, () => {
-      this.detachConfirmOk = 2;
       const doUpdate = () => this.detachPolicy();
       doUpdate().pipe(
         first(),
@@ -289,14 +290,18 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
     return this.store.select(actionState).pipe(filter(item => !!item));
   }
 
-  updatePolicyPage = () => {
+  updatePolicyPage = (isCreate = false) => {
+    const query = isCreate ? {
+      create: isCreate
+    } : {};
     this.store.dispatch(new RouterNav({
       path: [
         'autoscaler',
         this.applicationService.cfGuid,
         this.applicationService.appGuid,
         'edit-autoscaler-policy'
-      ]
+      ],
+      query
     }));
   }
 
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.ts
index 4d5752f7b2..c7a8dcad17 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.ts
@@ -8,7 +8,7 @@ import { entityFactory } from '../../../../store/src/helpers/entity-factory';
 import { EntityInfo } from '../../../../store/src/types/api.types';
 import { autoscalerTransformArrayToMap } from '../../core/autoscaler-helpers/autoscaler-transform-policy';
 import { GetAppAutoscalerPolicyAction } from '../../store/app-autoscaler.actions';
-import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../../store/app-autoscaler.types';
+import { AppAutoscalerPolicyLocal } from '../../store/app-autoscaler.types';
 import { appAutoscalerPolicySchemaKey } from '../../store/autoscaler.store.module';
 
 @Injectable()
@@ -47,13 +47,13 @@ export class EditAutoscalerPolicyService {
       first(),
     ).subscribe((({ entity }) => {
       if (entity && entity.entity) {
-        this.stateSubject.next(entity.entity);
+        this.setState(entity.entity);
       }
     }));
   }
 
   setState(state: AppAutoscalerPolicyLocal) {
-    const {...newState} = state;
+    const newState = JSON.parse(JSON.stringify(state));
     this.stateSubject.next(newState);
   }
 
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.html b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.html
index eab22c9e5a..a05d996466 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.html
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.html
@@ -1,4 +1,6 @@
 <div *ngIf="appAutoscalerPolicy$ | async as policy">
+  Use minimum and maximum instance counts to provide default values for your policy.
+  <!-- Instance counts are used to define the default minimal and maximal instance number of your application. -->
   <form [formGroup]="editLimitForm" validate class="stepper-form">
     <mat-form-field>
       <input matInput placeholder="Minimum Instance Count" formControlName="instance_min_count" type="number" required>
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 5f15c5934d..aa6cb4f718 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
@@ -1,4 +1,6 @@
 <div *ngIf="appAutoscalerPolicy$ | async as policy">
+  <p>Add scaling rules that work with built-in metrics to scale your application. Metrics are averaged over all the
+    instances of your application.</p>
   <app-tile-grid class="app-autoscaler-tile-grid-100">
     <app-tile-group *ngFor="let rule of policy.scaling_rules_form; let index = index">
       <app-tile>
@@ -34,11 +36,14 @@
                 <mat-form-field>
                   <input matInput placeholder="Threshold" type="number" formControlName="threshold" required>
                 </mat-form-field>
-                {{getMetricUnit(rule.metric_type)}} for
+                <span class="autoscaler-policy-edit-trigger-item__unit">
+                  {{metricUnit$ | async}}
+                </span>
+                for
                 <mat-form-field>
                   <input matInput placeholder="Breach Duration" type="number" formControlName="breach_duration_secs">
                 </mat-form-field>
-                seconsds, then {{editScaleType=='upper'?'add':'remove'}}
+                seconds, then {{editScaleType=='upper'?'add':'remove'}}
                 <mat-form-field>
                   <input matInput placeholder="Adjustment" type="number" formControlName="adjustment" required>
                 </mat-form-field>
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 2e060b8936..3ed560932a 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
@@ -19,6 +19,10 @@
   .autoscaler-policy-edit-trigger-item-desc {
     margin-bottom: .5em;
   }
+  .autoscaler-policy-edit-trigger-item__unit {
+    display: inline-block;
+    width: 23px;
+  }
   mat-error {
     font-size: 85%;
   }
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 29165b0c00..ff2306b454 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
@@ -1,8 +1,10 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators } from '@angular/forms';
 import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material';
-import { Observable } from 'rxjs';
+import { BehaviorSubject, Observable, Subscription } from 'rxjs';
+import { map } from 'rxjs/operators';
 
+import { safeUnsubscribe } from '../../../../../core/src/core/utils.service';
 import { ApplicationService } from '../../../../../core/src/features/applications/application.service';
 import {
   AutoscalerConstants,
@@ -15,7 +17,11 @@ import {
   getThresholdMin,
   numberWithFractionOrExceedRange,
 } from '../../../core/autoscaler-helpers/autoscaler-validation';
-import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal, AppAutoscalerInvalidPolicyError } from '../../../store/app-autoscaler.types';
+import {
+  AppAutoscalerInvalidPolicyError,
+  AppAutoscalerPolicy,
+  AppAutoscalerPolicyLocal,
+} from '../../../store/app-autoscaler.types';
 import { EditAutoscalerPolicy } from '../edit-autoscaler-policy-base-step';
 import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service';
 
@@ -27,10 +33,12 @@ import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service';
     { provide: ErrorStateMatcher, useClass: ShowOnDirtyErrorStateMatcher }
   ]
 })
-export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy implements OnInit {
+export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy implements OnInit, OnDestroy {
 
   policyAlert = PolicyAlert;
   metricTypes = AutoscalerConstants.MetricTypes;
+  private metricUnitSubject = new BehaviorSubject(this.metricTypes[0]);
+  metricUnit$: Observable<string>;
   operatorTypes = AutoscalerConstants.UpperOperators.concat(AutoscalerConstants.LowerOperators);
   editTriggerForm: FormGroup;
   appAutoscalerPolicy$: Observable<AppAutoscalerPolicy>;
@@ -41,6 +49,7 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp
   private editMetricType = '';
   private editScaleType = 'upper';
   private editAdjustmentType = 'value';
+  private subs: Subscription[] = [];
 
   constructor(
     public applicationService: ApplicationService,
@@ -63,6 +72,12 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp
       ]],
       adjustment_type: [0, this.validateTriggerAdjustmentType()]
     });
+
+    this.metricUnit$ = this.metricUnitSubject.asObservable();
+
+    this.subs.push(this.editTriggerForm.get('metric_type').valueChanges.pipe(
+      map(value => this.getMetricUnit(value)),
+    ).subscribe(unit => this.metricUnitSubject.next(unit)));
   }
 
   addTrigger = () => {
@@ -92,6 +107,7 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp
       cool_down_secs: this.currentPolicy.scaling_rules_form[index].cool_down_secs,
       adjustment_type: this.editAdjustmentType
     });
+    this.metricUnitSubject.next(this.getMetricUnit(this.editMetricType));
   }
 
   finishTrigger() {
@@ -185,4 +201,8 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp
   getMetricUnit(metricType: string) {
     return AutoscalerConstants.getMetricUnit(metricType);
   }
+
+  ngOnDestroy() {
+    safeUnsubscribe(...this.subs);
+  }
 }
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html
index 4ed111d0e6..f5c4e8f174 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html
@@ -1,4 +1,6 @@
 <div *ngIf="appAutoscalerPolicy$ | async as policy">
+  <p>Add schedules that reoccur to overwrite the default instance limits for specific time periods. During these time
+    periods, all dynamic scaling rules are still effective.</p>
   <app-tile-grid class="app-autoscaler-tile-grid-100">
     <app-tile-group *ngFor="let rule of policy.schedules && policy.schedules.recurring_schedule; let index = index">
       <app-tile>
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html
index 948cf3574a..91654b3744 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html
@@ -1,4 +1,6 @@
 <div *ngIf="appAutoscalerPolicy$ | async as policy">
+  <p>Add schedules for specific dates and times that overwrite the default instance limits. Like reoccuring schedules,
+    during these time periods all dynamic scaling rules are still effective.</p>
   <app-tile-grid class="app-autoscaler-tile-grid-100">
     <app-tile-group *ngFor="let rule of policy.schedules && policy.schedules.specific_date; let index = index">
       <app-tile>
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts
index f43e297500..4c7c246c40 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts
@@ -20,10 +20,11 @@ import {
 } from '../../../core/autoscaler-helpers/autoscaler-validation';
 import { UpdateAppAutoscalerPolicyAction } from '../../../store/app-autoscaler.actions';
 import {
+  AppAutoscalerInvalidPolicyError,
   AppAutoscalerPolicy,
   AppAutoscalerPolicyLocal,
   AppSpecificDate,
-  AppAutoscalerInvalidPolicyError } from '../../../store/app-autoscaler.types';
+} from '../../../store/app-autoscaler.types';
 import { appAutoscalerPolicySchemaKey } from '../../../store/autoscaler.store.module';
 import { EditAutoscalerPolicy } from '../edit-autoscaler-policy-base-step';
 import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service';
@@ -91,19 +92,12 @@ export class EditAutoscalerPolicyStep4Component extends EditAutoscalerPolicy imp
     const waitForAppAutoscalerUpdateStatus$ = this.updateAppAutoscalerPolicyService.entityMonitor.entityRequest$.pipe(
       filter(request => {
         if (request.message && request.message.indexOf('fetch policy') >= 0) {
-          request.message = '';
           return false;
         } else {
           return !!request.error || !!request.response;
         }
       }),
-      map(request => {
-        const msg = request.message;
-        request.error = false;
-        request.response = null;
-        request.message = '';
-        return msg;
-      }),
+      map(request => request.message),
       distinctUntilChanged(),
     ).pipe(map(
       errorMessage => {
@@ -127,7 +121,7 @@ export class EditAutoscalerPolicyStep4Component extends EditAutoscalerPolicy imp
   }
 
   addSpecificDate = () => {
-    const {...newSchedule} = AutoscalerConstants.PolicyDefaultSpecificDate;
+    const { ...newSchedule } = AutoscalerConstants.PolicyDefaultSpecificDate;
     this.currentPolicy.schedules.specific_date.push(newSchedule);
     this.editSpecificDate(this.currentPolicy.schedules.specific_date.length - 1);
   }
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.html b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.html
index adc4db13ee..09913641f6 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.html
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.html
@@ -1,6 +1,7 @@
 <div class="autoscaler-policy-edit-steppers">
   <app-page-header>
-    <h1>Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.entity.name }} </h1>
+    <h1>{{isCreate ? 'Create' : 'Edit' }} AutoScaler Policy:
+      {{ (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>
@@ -11,10 +12,12 @@ <h1>Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.en
     <app-step [title]="'Default Instance Limits'" [valid]="step1.editLimitForm.valid" [onNext]="step1.onNext">
       <app-edit-autoscaler-policy-step1 #step1></app-edit-autoscaler-policy-step1>
     </app-step>
-    <app-step [title]="'Scaling Rules'" [disablePrevious]="step2.editIndex!=-1" [valid]="step2.editIndex==-1" [onNext]="step2.onNext">
+    <app-step [title]="'Scaling Rules'" [disablePrevious]="step2.editIndex!=-1" [valid]="step2.editIndex==-1"
+      [onNext]="step2.onNext">
       <app-edit-autoscaler-policy-step2 #step2></app-edit-autoscaler-policy-step2>
     </app-step>
-    <app-step [title]="'Recurring Schedules'" [disablePrevious]="step3.editIndex!=-1" [valid]="step3.editIndex==-1" [onNext]="step3.onNext">
+    <app-step [title]="'Recurring Schedules'" [disablePrevious]="step3.editIndex!=-1" [valid]="step3.editIndex==-1"
+      [onNext]="step3.onNext">
       <app-edit-autoscaler-policy-step3 #step3></app-edit-autoscaler-policy-step3>
     </app-step>
     <app-step [title]="'Specific Dates'" [disablePrevious]="step4.editIndex!=-1" [onNext]="step4.updatePolicy"
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.scss b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.scss
index 7b687f60c5..d1d4e3e07b 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.scss
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.scss
@@ -1,16 +1,3 @@
 .autoscaler-policy-edit-steppers {
   height: 100%;
-  app-edit-autoscaler-policy-step1 {
-    width: 50%;
-  }
-  app-edit-autoscaler-policy-step2 {
-    width: 100%;
-  }
-  app-edit-autoscaler-policy-step3 {
-    width: 100%;
-  }
-  app-edit-autoscaler-policy-step4 {
-    width: 100%;
-  }
 }
-
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.ts
index 1af999f6b9..f59484346f 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.ts
@@ -1,7 +1,8 @@
 import { Component, OnInit } from '@angular/core';
+import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material';
+import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
 import { map, publishReplay, refCount } from 'rxjs/operators';
-import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material';
 
 import { ApplicationService } from '../../../../core/src/features/applications/application.service';
 import { EditAutoscalerPolicyService } from './edit-autoscaler-policy-service';
@@ -19,9 +20,11 @@ export class EditAutoscalerPolicyComponent implements OnInit {
 
   parentUrl = `/applications/${this.applicationService.cfGuid}/${this.applicationService.appGuid}/autoscale`;
   applicationName$: Observable<string>;
+  isCreate = false;
 
   constructor(
     public applicationService: ApplicationService,
+    private route: ActivatedRoute
   ) {
   }
 
@@ -31,6 +34,7 @@ export class EditAutoscalerPolicyComponent implements OnInit {
       publishReplay(1),
       refCount()
     );
+    this.isCreate = this.route.snapshot.queryParams.create;
   }
 
 }
diff --git a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.html b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.html
index 0dc89a73d4..ae47baff36 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.html
+++ b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.html
@@ -1,48 +1,27 @@
 <mat-card class="card-autoscaler-default">
-  <div class="card-autoscaler-default__left">
-    <mat-card-header>
-      <mat-card-title>Instances</mat-card-title>
-    </mat-card-header>
-    <mat-card-content>
-      <div class="app-metadata">
-        <div class="app-metadata__two-cols">
-          <app-metadata-item label="Current">
-            <app-running-instances [instances]="applicationInstances$ | async" [cfGuid]="appService.cfGuid"
-              [appGuid]="this.appService.appGuid">
-            </app-running-instances>
-          </app-metadata-item>
+  <mat-card-header>
+    <mat-card-title>Instances</mat-card-title>
+  </mat-card-header>
+  <mat-card-content>
+    <app-metadata-item label="Current">
+      <app-running-instances [instances]="applicationInstances$ | async" [cfGuid]="appService.cfGuid"
+        [appGuid]="this.appService.appGuid">
+      </app-running-instances>
+    </app-metadata-item>
+    <div class="card-autoscaler-default__min-max">
+      <app-metadata-item label="Minimum">
+        <div *ngIf="appAutoscalerPolicy$ | async as policy">
+          <div>{{ policy.instance_min_count }}</div>
         </div>
-      </div>
-    </mat-card-content>
-  </div>
-  <div class="card-autoscaler-default__right">
-    <mat-card-header>
-      <mat-card-title>Limits</mat-card-title>
-    </mat-card-header>
-    <mat-card-content>
-      <div class="app-metadata">
-        <div class="app-metadata__two-cols">
-          <app-metadata-item label="Minimum">
-            <div *ngIf="appAutoscalerPolicy$ | async as policy">
-              <div>{{ policy.instance_min_count }}</div>
-            </div>
-            <div *ngIf="!(appAutoscalerPolicy$ | async)">-</div>
-          </app-metadata-item>
+        <div *ngIf="!(appAutoscalerPolicy$ | async)">-</div>
+      </app-metadata-item>
+      <app-metadata-item label="Maximum">
+        <div *ngIf="appAutoscalerPolicy$ | async as policy">
+          <div>{{ policy.instance_max_count }}</div>
         </div>
-        <div class="app-metadata__two-cols">
-          <app-metadata-item label="Maximum">
-            <div *ngIf="appAutoscalerPolicy$ | async as policy">
-              <div>{{ policy.instance_max_count }}</div>
-            </div>
-            <div *ngIf="!(appAutoscalerPolicy$ | async)">-</div>
-          </app-metadata-item>
-        </div>
-      </div>
-    </mat-card-content>
-  </div>
-  <mat-card-actions *ngIf="(appAutoscalerPolicy$ | async)" class="card-autoscaler-default__actions">
-    <button (click)="onUpdate()" mat-icon-button>
-      <mat-icon>edit</mat-icon>
-    </button>
-  </mat-card-actions>
+        <div *ngIf="!(appAutoscalerPolicy$ | async)">-</div>
+      </app-metadata-item>
+    </div>
+  </mat-card-content>
+
 </mat-card>
\ No newline at end of file
diff --git a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.scss b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.scss
index 03cff2642b..96e3d7bc25 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.scss
+++ b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.scss
@@ -1,52 +1,10 @@
 .card-autoscaler-default {
-  &__left {
-    border-right: 1px solid #808080;
-    display: inline-block;
-    padding-right: 1em;
-  }
-
-  &__right {
-    display: inline-block;
-    padding-left: 1em;
-  }
-
-  &__actions {
-    bottom: 24px;
-    padding-top: 0;
-    position: absolute;
-    right: 24px;
-    text-align: right;
-  }
-
-  app-metadata-item {
-    .metadata-item__content {
-      flex-direction: row;
-    }
-  }
-
-  .metadata-item__content {
-    display: inline;
-  }
-
-  .metadata-item__value {
-    display: inline;
-    margin-right: 10px;
-  }
-
-  .metadata-item__label {
-    display: inline;
-    margin-right: 10px;
-  }
-}
+  &__min-max {
+    display: flex;
+    flex-direction: row;
 
-.app-metadata {
-  display: flex;
-  flex-direction: row;
-  &__two-cols {
-    flex: 1;
-    margin-right: 1em;
-    app-metadata-item:first-child {
-      margin-top: 0;
+    app-metadata-item {
+      padding-right: 10px;
     }
   }
 }
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 0fa992e75b..954eaf467f 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
@@ -9,6 +9,7 @@ import { AppAutoscalerPolicyLocal, AppScalingTrigger } from './app-autoscaler.ty
 import {
   appAutoscalerAppMetricSchemaKey,
   appAutoscalerHealthSchemaKey,
+  appAutoscalerInfoSchemaKey,
   appAutoscalerPolicySchemaKey,
   appAutoscalerPolicyTriggerSchemaKey,
   appAutoscalerScalingHistorySchemaKey,
@@ -45,14 +46,28 @@ export const DETACH_APP_AUTOSCALER_POLICY = '[New App Autoscaler] Detach policy'
 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';
+export const AUTOSCALER_INFO = '[Autoscaler] Fetch Info';
 
 export const UPDATE_APP_AUTOSCALER_POLICY_STEP = '[Edit Autoscaler Policy] Step';
 
+export class GetAppAutoscalerInfoAction implements IRequestAction {
+  public guid: string;
+  constructor(
+    public endpointGuid: string,
+  ) {
+    this.guid = endpointGuid;
+  }
+  type = AUTOSCALER_INFO;
+  entity = entityFactory(appAutoscalerInfoSchemaKey);
+  entityKey = appAutoscalerInfoSchemaKey;
+}
+
 export class GetAppAutoscalerHealthAction implements IRequestAction {
+  public guid: string;
   constructor(
-    public guid: string,
     public endpointGuid: string,
   ) {
+    this.guid = endpointGuid;
   }
   type = APP_AUTOSCALER_HEALTH;
   entity = entityFactory(appAutoscalerHealthSchemaKey);
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 d7cb19c63d..541d124d38 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
@@ -1,5 +1,12 @@
 import { AutoscalerQuery } from './app-autoscaler.actions';
 
+export interface AutoscalerInfo {
+  name: string;
+  build: string;
+  support: string;
+  description: string;
+}
+
 export interface AppAutoscalerPolicy {
   instance_min_count: number;
   instance_max_count: number;
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 03e76301f8..218ec8c126 100644
--- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts
+++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts
@@ -12,7 +12,7 @@ import {
   resultPerPageParamDefault,
 } from '../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
 import { selectPaginationState } from '../../../store/src/selectors/pagination.selectors';
-import { APIResource, NormalizedResponse } from '../../../store/src/types/api.types';
+import { APIResource, NormalizedResponse, PaginationResponse } from '../../../store/src/types/api.types';
 import { PaginatedAction, PaginationEntityState, PaginationParam } from '../../../store/src/types/pagination.types';
 import {
   StartRequestAction,
@@ -30,28 +30,29 @@ import {
   APP_AUTOSCALER_POLICY,
   APP_AUTOSCALER_POLICY_TRIGGER,
   APP_AUTOSCALER_SCALING_HISTORY,
+  AUTOSCALER_INFO,
+  AutoscalerPaginationParams,
   AutoscalerQuery,
   DETACH_APP_AUTOSCALER_POLICY,
   DetachAppAutoscalerPolicyAction,
   FETCH_APP_AUTOSCALER_METRIC,
   GetAppAutoscalerHealthAction,
+  GetAppAutoscalerInfoAction,
   GetAppAutoscalerMetricAction,
   GetAppAutoscalerPolicyAction,
   GetAppAutoscalerPolicyTriggerAction,
   GetAppAutoscalerScalingHistoryAction,
   UPDATE_APP_AUTOSCALER_POLICY,
   UpdateAppAutoscalerPolicyAction,
-  AutoscalerPaginationParams,
 } from './app-autoscaler.actions';
 import {
+  AppAutoscalerEvent,
   AppAutoscalerFetchPolicyFailedResponse,
-  AppAutoscalerMetricDataLocal,
-  AppScalingTrigger,
   AppAutoscalerMetricData,
+  AppAutoscalerMetricDataLocal,
   AppAutoscalerPolicyLocal,
-  AppAutoscalerEvent,
+  AppScalingTrigger,
 } from './app-autoscaler.types';
-import { PaginationResponse } from '../../../store/src/types/api.types';
 
 const { proxyAPIVersion } = environment;
 const commonPrefix = `/pp/${proxyAPIVersion}/autoscaler`;
@@ -68,6 +69,34 @@ export class AutoscalerEffects {
     private store: Store<AppState>,
   ) { }
 
+  @Effect()
+  fetchAutoscalerInfo$ = this.actions$.pipe(
+    ofType<GetAppAutoscalerInfoAction>(AUTOSCALER_INFO),
+    mergeMap(action => {
+      const actionType = 'fetch';
+      this.store.dispatch(new StartRequestAction(action, actionType));
+      const options = new RequestOptions();
+      options.url = `${commonPrefix}/info`;
+      options.method = 'get';
+      options.headers = this.addHeaders(action.endpointGuid);
+      return this.http
+        .request(new Request(options)).pipe(
+          mergeMap(response => {
+            const autoscalerInfo = response.json();
+            const mappedData = {
+              entities: { [action.entityKey]: {} },
+              result: []
+            } as NormalizedResponse;
+            this.transformData(action.entityKey, mappedData, action.endpointGuid, autoscalerInfo);
+            return [
+              new WrapperRequestActionSuccess(mappedData, action, actionType)
+            ];
+          }),
+          catchError(err => [
+            new WrapperRequestActionFailed(createAutoscalerRequestMessage('fetch autoscaler info', err), action, actionType)
+          ]));
+    }));
+
   @Effect()
   fetchAppAutoscalerHealth$ = this.actions$.pipe(
     ofType<GetAppAutoscalerHealthAction>(APP_AUTOSCALER_HEALTH),
@@ -86,7 +115,7 @@ export class AutoscalerEffects {
               entities: { [action.entityKey]: {} },
               result: []
             } as NormalizedResponse;
-            this.transformData(action.entityKey, mappedData, action.guid, healthInfo);
+            this.transformData(action.entityKey, mappedData, action.endpointGuid, healthInfo);
             return [
               new WrapperRequestActionSuccess(mappedData, action, actionType)
             ];
@@ -348,14 +377,14 @@ export class AutoscalerEffects {
     mappedData.result.push(id);
   }
 
-  transformData(key: string, mappedData: NormalizedResponse, appGuid: string, data: any) {
-    mappedData.entities[key][appGuid] = {
+  transformData(key: string, mappedData: NormalizedResponse, guid: string, data: any) {
+    mappedData.entities[key][guid] = {
       entity: data,
       metadata: {
-        guid: appGuid
+        guid
       }
     };
-    mappedData.result.push(appGuid);
+    mappedData.result.push(guid);
   }
 
   transformEventData(key: string, mappedData: NormalizedResponse, appGuid: string, data: PaginationResponse<AppAutoscalerEvent>) {
diff --git a/src/frontend/packages/cf-autoscaler/src/store/autoscaler.store.module.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.store.module.ts
index 702c816075..725050dc18 100644
--- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler.store.module.ts
+++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.store.module.ts
@@ -6,12 +6,18 @@ import { ExtensionEntitySchema } from '../../../core/src/core/extension/extensio
 import { getAPIResourceGuid } from '../../../store/src/selectors/api.selectors';
 
 export const appAutoscalerHealthSchemaKey = 'autoscalerHealth';
+export const appAutoscalerInfoSchemaKey = 'autoscalerInfo';
 export const appAutoscalerPolicySchemaKey = 'autoscalerPolicy';
 export const appAutoscalerPolicyTriggerSchemaKey = 'autoscalerPolicyTrigger';
 export const appAutoscalerScalingHistorySchemaKey = 'autoscalerScalingHistory';
 export const appAutoscalerAppMetricSchemaKey = 'autoscalerAppMetric';
 
 export const autoscalerEntities: ExtensionEntitySchema[] = [
+  {
+    entityKey: appAutoscalerInfoSchemaKey,
+    definition: {},
+    options: { idAttribute: getAPIResourceGuid }
+  },
   {
     entityKey: appAutoscalerPolicySchemaKey,
     definition: {},
diff --git a/src/frontend/packages/core/src/shared/components/cards/card-cf-info/card-cf-info.component.html b/src/frontend/packages/core/src/shared/components/cards/card-cf-info/card-cf-info.component.html
index 4a9d17d0d3..9ce13dc103 100644
--- a/src/frontend/packages/core/src/shared/components/cards/card-cf-info/card-cf-info.component.html
+++ b/src/frontend/packages/core/src/shared/components/cards/card-cf-info/card-cf-info.component.html
@@ -8,21 +8,29 @@
         <div class="app-metadata__two-cols">
           <app-metadata-item icon="title" label="Description">{{ (description$ | async) }}</app-metadata-item>
           <app-metadata-item icon="link" label="Instance Address">{{ apiUrl }}</app-metadata-item>
-          <app-metadata-item icon="info_outline" label="CF API Version">{{ (cfEndpointService.info$ | async)?.entity.entity.api_version }}</app-metadata-item>
+          <app-metadata-item icon="info_outline" label="CF API Version">
+            {{ (cfEndpointService.info$ | async)?.entity.entity.api_version }}</app-metadata-item>
+          <app-metadata-item *ngIf="autoscalerVersion$ | async as autoscalerVersion" icon="meter"
+            iconFont="stratos-icons" label="Autoscaler Version">
+            {{ autoscalerVersion }}</app-metadata-item>
         </div>
         <div class="app-metadata__two-cols">
-          <app-metadata-item icon="person" label="Account Username">{{ (cfEndpointService.endpoint$ | async )?.entity.user.name }}
+          <app-metadata-item icon="person" label="Account Username">
+            {{ (cfEndpointService.endpoint$ | async )?.entity.user.name }}
             <span *ngIf="(cfEndpointService.endpoint$ | async )?.entity.user.admin"> (Administrator)</span>
           </app-metadata-item>
-          <app-metadata-item icon="developer_mode" label="SSH Access">{{ (cfEndpointService.hasSSHAccess$ | async) ? 'Available' : 'Not available'}}</app-metadata-item>
+          <app-metadata-item icon="developer_mode" label="SSH Access">
+            {{ (cfEndpointService.hasSSHAccess$ | async) ? 'Available' : 'Not available'}}</app-metadata-item>
           <app-metadata-item icon="email" label="User Invitation Support">
             <div class="user-invites">
               <ng-container *ngIf="(userInviteService.canConfigure$ | async) else cannotConfigure">
                 <ng-container *ngIf="(userInviteService.configured$ | async); else inviteNotConfigured">
-                  Configured - <button color="primary" mat-button (click)="deConfigureUserInvites()" [disabled]="userInviteBusy">Disable</button>
+                  Configured - <button color="primary" mat-button (click)="deConfigureUserInvites()"
+                    [disabled]="userInviteBusy">Disable</button>
                 </ng-container>
                 <ng-template #inviteNotConfigured>
-                  Not Configured - <button color="primary" mat-button (click)="configureUserInvites()">Configure</button>
+                  Not Configured - <button color="primary" mat-button
+                    (click)="configureUserInvites()">Configure</button>
                 </ng-template>
               </ng-container>
               <ng-template #cannotConfigure>
diff --git a/src/frontend/packages/core/src/shared/components/cards/card-cf-info/card-cf-info.component.ts b/src/frontend/packages/core/src/shared/components/cards/card-cf-info/card-cf-info.component.ts
index 6ebb1d4036..a5c91bafe7 100644
--- a/src/frontend/packages/core/src/shared/components/cards/card-cf-info/card-cf-info.component.ts
+++ b/src/frontend/packages/core/src/shared/components/cards/card-cf-info/card-cf-info.component.ts
@@ -3,8 +3,10 @@ import { MatDialog } from '@angular/material';
 import { Observable, Subscription } from 'rxjs';
 import { map, tap } from 'rxjs/operators';
 
+import { fetchAutoscalerInfo } from '../../../../../../cf-autoscaler/src/core/autoscaler-helpers/autoscaler-available';
 import { APIResource, EntityInfo } from '../../../../../../store/src/types/api.types';
 import { ICfV2Info } from '../../../../core/cf-api.types';
+import { EntityServiceFactory } from '../../../../core/entity-service-factory.service';
 import { CloudFoundryEndpointService } from '../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
 import {
   UserInviteConfigurationDialogComponent,
@@ -17,13 +19,15 @@ import { UserInviteService } from '../../../../features/cloud-foundry/user-invit
   styleUrls: ['./card-cf-info.component.scss']
 })
 export class CardCfInfoComponent implements OnInit, OnDestroy {
-  apiUrl: string;
-  subs: Subscription[] = [];
+  public apiUrl: string;
+  private subs: Subscription[] = [];
+  public autoscalerVersion$: Observable<string>;
 
   constructor(
     public cfEndpointService: CloudFoundryEndpointService,
     public userInviteService: UserInviteService,
     private dialog: MatDialog,
+    private esf: EntityServiceFactory
   ) { }
 
   description$: Observable<string>;
@@ -39,6 +43,12 @@ export class CardCfInfoComponent implements OnInit, OnDestroy {
     this.description$ = this.cfEndpointService.info$.pipe(
       map(entity => this.getDescription(entity))
     );
+
+    this.autoscalerVersion$ = fetchAutoscalerInfo(this.cfEndpointService.cfGuid, this.esf).pipe(
+      map(e => e.entityRequestInfo.error ?
+        null :
+        e.entity ? e.entity.entity.build : ''),
+    );
   }
 
   getApiEndpointUrl(apiEndpoint) {
diff --git a/src/jetstream/plugins/autoscaler/autoscaler.go b/src/jetstream/plugins/autoscaler/autoscaler.go
index 8bb14dfb72..d0e99f20b1 100644
--- a/src/jetstream/plugins/autoscaler/autoscaler.go
+++ b/src/jetstream/plugins/autoscaler/autoscaler.go
@@ -7,6 +7,15 @@ import (
 	"github.com/labstack/echo"
 )
 
+func (a *Autoscaler) getAutoscalerInfo(echoContext echo.Context) error {
+	healthURL, _ := url.Parse("/v1/info")
+	responses, err := a.portalProxy.ProxyRequest(echoContext, healthURL)
+	if err != nil {
+		return err
+	}
+	return a.portalProxy.SendProxiedResponse(echoContext, responses)
+}
+
 func (a *Autoscaler) getAutoscalerHealth(echoContext echo.Context) error {
 	healthURL, _ := url.Parse("/health")
 	responses, err := a.portalProxy.ProxyRequest(echoContext, healthURL)
diff --git a/src/jetstream/plugins/autoscaler/main.go b/src/jetstream/plugins/autoscaler/main.go
index 28e7cba8d8..ccfd9570d4 100644
--- a/src/jetstream/plugins/autoscaler/main.go
+++ b/src/jetstream/plugins/autoscaler/main.go
@@ -39,6 +39,7 @@ func (a *Autoscaler) AddAdminGroupRoutes(echoGroup *echo.Group) {
 
 // AddSessionGroupRoutes adds the session routes for this plugin to the Echo server
 func (a *Autoscaler) AddSessionGroupRoutes(echoGroup *echo.Group) {
+	echoGroup.GET("/autoscaler/info", a.getAutoscalerInfo)
 	echoGroup.GET("/autoscaler/health", a.getAutoscalerHealth)
 	echoGroup.GET("/autoscaler/apps/:appId/policy", a.getAutoscalerPolicy)
 	echoGroup.PUT("/autoscaler/apps/:appId/policy", a.attachAutoscalerPolicy)

From 695271d41a735c1e64b1edd9d9ec0a6badf540cb Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Tue, 3 Sep 2019 15:34:02 +0100
Subject: [PATCH 092/648] Handle errors better - Remove another place where
 content from store is edited - Handle errors when there are no response
 (don't check for noPolicy) - Correctly wire in error handler for
 detach/delete policy - Clean & fix update policy handler

---
 .../autoscaler-tab-extension.component.scss   |  2 +
 .../autoscaler-tab-extension.component.ts     | 26 ++++------
 .../edit-autoscaler-policy-step4.component.ts | 47 +++++++------------
 .../src/store/app-autoscaler.actions.ts       |  1 +
 4 files changed, 30 insertions(+), 46 deletions(-)

diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.scss b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.scss
index b0f618d8fa..34a7885005 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.scss
+++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.scss
@@ -54,6 +54,8 @@ table {
 }
 
 .autoscaler-tile-events {
+  flex-direction: column;
+
   &__no-policy {
     align-items: center;
     display: flex;
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 6b65ae93db..7f739c0c47 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
@@ -3,7 +3,7 @@ import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { combineLatest, Observable, Subscription } from 'rxjs';
-import { distinctUntilChanged, filter, first, map, publishReplay, refCount } from 'rxjs/operators';
+import { distinctUntilChanged, filter, first, map, pairwise, publishReplay, refCount } from 'rxjs/operators';
 
 import { EntityService } from '../../../../core/src/core/entity-service';
 import { EntityServiceFactory } from '../../../../core/src/core/entity-service-factory.service';
@@ -21,7 +21,7 @@ import { applicationSchemaKey, entityFactory } from '../../../../store/src/helpe
 import { createEntityRelationPaginationKey } from '../../../../store/src/helpers/entity-relations/entity-relations.types';
 import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
 import { getPaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
-import { selectUpdateInfo } from '../../../../store/src/selectors/api.selectors';
+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 { AutoscalerConstants } from '../../core/autoscaler-helpers/autoscaler-util';
@@ -31,7 +31,6 @@ import {
   GetAppAutoscalerAppMetricAction,
   GetAppAutoscalerPolicyAction,
   GetAppAutoscalerScalingHistoryAction,
-  UpdateAppAutoscalerPolicyAction,
 } from '../../store/app-autoscaler.actions';
 import {
   AppAutoscalerMetricData,
@@ -230,13 +229,8 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
     }
 
     this.appAutoscalerPolicyErrorSub = this.appAutoscalerPolicyService.entityMonitor.entityRequest$.pipe(
-      filter(request => !!request.error && !request.response.noPolicy),
-      map(request => {
-        const msg = request.message;
-        request.error = false;
-        request.message = '';
-        return msg;
-      }),
+      filter(response => !!response.error && (!response.response || !response.response.noPolicy)),
+      map(response => response.message),
       distinctUntilChanged(),
     ).subscribe(errorMessage => {
       if (this.appAutoscalerPolicySnackBarRef) {
@@ -268,8 +262,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
       true
     );
     this.confirmDialog.open(confirmation, () => {
-      const doUpdate = () => this.detachPolicy();
-      doUpdate().pipe(
+      this.detachPolicy().pipe(
         first(),
       ).subscribe(actionState => {
         if (actionState.error) {
@@ -284,10 +277,11 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
     this.store.dispatch(
       new DetachAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid)
     );
-    const actionState = selectUpdateInfo(appAutoscalerPolicySchemaKey,
-      this.applicationService.appGuid,
-      UpdateAppAutoscalerPolicyAction.updateKey);
-    return this.store.select(actionState).pipe(filter(item => !!item));
+    return this.store.select(selectDeletionInfo(appAutoscalerPolicySchemaKey, this.applicationService.appGuid)).pipe(
+      pairwise(),
+      filter(([oldV, newV]) => oldV.busy && !newV.busy),
+      map(([, newV]) => newV)
+    );
   }
 
   updatePolicyPage = (isCreate = false) => {
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts
index 4c7c246c40..930cc00ac5 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts
@@ -4,7 +4,7 @@ import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/materi
 import { Store } from '@ngrx/store';
 import * as moment from 'moment-timezone';
 import { Observable, of as observableOf } from 'rxjs';
-import { distinctUntilChanged, filter, map, take } from 'rxjs/operators';
+import { filter, first, map, pairwise } from 'rxjs/operators';
 
 import { EntityService } from '../../../../../core/src/core/entity-service';
 import { EntityServiceFactory } from '../../../../../core/src/core/entity-service-factory.service';
@@ -89,35 +89,22 @@ export class EditAutoscalerPolicyStep4Component extends EditAutoscalerPolicy imp
     this.store.dispatch(
       new UpdateAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid, this.currentPolicy)
     );
-    const waitForAppAutoscalerUpdateStatus$ = this.updateAppAutoscalerPolicyService.entityMonitor.entityRequest$.pipe(
-      filter(request => {
-        if (request.message && request.message.indexOf('fetch policy') >= 0) {
-          return false;
-        } else {
-          return !!request.error || !!request.response;
-        }
-      }),
-      map(request => request.message),
-      distinctUntilChanged(),
-    ).pipe(map(
-      errorMessage => {
-        if (errorMessage) {
-          return {
-            success: false,
-            message: `Could not update policy: ${errorMessage}`,
-          };
-        } else {
-          return {
-            success: true,
-            redirect: true
-          };
-        }
-      }));
-    return waitForAppAutoscalerUpdateStatus$.pipe(take(1), map(res => {
-      return {
-        ...res,
-      };
-    }));
+    return this.updateAppAutoscalerPolicyService.entityMonitor.entityRequest$.pipe(
+      pairwise(),
+      filter(([oldV, newV]) => (
+        oldV.updating[UpdateAppAutoscalerPolicyAction.updateKey] && oldV.updating[UpdateAppAutoscalerPolicyAction.updateKey].busy
+      ) && (
+          newV.updating[UpdateAppAutoscalerPolicyAction.updateKey] && !newV.updating[UpdateAppAutoscalerPolicyAction.updateKey].busy
+        )
+      ),
+      map(([, newV]) => newV.updating[UpdateAppAutoscalerPolicyAction.updateKey]),
+      map(request => ({
+        success: !request.error,
+        redirect: !request.error,
+        message: request.error ? `Could not update policy${request.message ? `: ${request.message}` : ''}` : null
+      })),
+      first(),
+    );
   }
 
   addSpecificDate = () => {
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 954eaf467f..ba27b3cbc3 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
@@ -93,6 +93,7 @@ export class UpdateAppAutoscalerPolicyAction implements IRequestAction {
   ) { }
   type = UPDATE_APP_AUTOSCALER_POLICY;
   entityKey = appAutoscalerPolicySchemaKey;
+  updatingKey = UpdateAppAutoscalerPolicyAction.updateKey;
 }
 
 export class DetachAppAutoscalerPolicyAction implements IRequestAction {

From 43d554f45066ae9a55e542cd94f8e7fd31576eaa Mon Sep 17 00:00:00 2001
From: Jordan Jensen <jojensen@suse.com>
Date: Tue, 3 Sep 2019 16:57:20 -0700
Subject: [PATCH 093/648] Adjust test mat-select number

Adding an additional mat-select created an off-by-one issue
---
 src/test-e2e/applications/application-wall-e2e.spec.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test-e2e/applications/application-wall-e2e.spec.ts b/src/test-e2e/applications/application-wall-e2e.spec.ts
index 669d247931..906316e2f5 100644
--- a/src/test-e2e/applications/application-wall-e2e.spec.ts
+++ b/src/test-e2e/applications/application-wall-e2e.spec.ts
@@ -125,7 +125,7 @@ describe('Application Wall Tests -', () => {
 
   function createPageSizeSelectId(): string {
     // The ctrl is hidden inside a mat-paginator, the id will change depending on other selects on page
-    return hasCfFilter ? 'mat-select-4' : 'mat-select-3';
+    return hasCfFilter ? 'mat-select-5' : 'mat-select-4';
   }
 
   function tearDown(orgName: string) {
@@ -265,7 +265,7 @@ describe('Application Wall Tests -', () => {
 
   });
 
-  describe('Multi Page -', () => {
+  fdescribe('Multi Page -', () => {
     const orgName = E2EHelpers.createCustomName(customOrgSpacesLabel) + '-multi-page';
 
     let appNames;

From c034c67e00221e9fe131f73291c2790c69d56a1f Mon Sep 17 00:00:00 2001
From: Jordan Jensen <jojensen@suse.com>
Date: Tue, 3 Sep 2019 17:05:18 -0700
Subject: [PATCH 094/648] Remove unintended fdescribe

---
 src/test-e2e/applications/application-wall-e2e.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test-e2e/applications/application-wall-e2e.spec.ts b/src/test-e2e/applications/application-wall-e2e.spec.ts
index 906316e2f5..e28265cf62 100644
--- a/src/test-e2e/applications/application-wall-e2e.spec.ts
+++ b/src/test-e2e/applications/application-wall-e2e.spec.ts
@@ -265,7 +265,7 @@ describe('Application Wall Tests -', () => {
 
   });
 
-  fdescribe('Multi Page -', () => {
+  describe('Multi Page -', () => {
     const orgName = E2EHelpers.createCustomName(customOrgSpacesLabel) + '-multi-page';
 
     let appNames;

From 52be7a7e3d65ed1b82a1fc797968b3abd84cb9e4 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Wed, 4 Sep 2019 07:14:52 +0100
Subject: [PATCH 095/648] Add autoscaler refinements to the 2.5.1 change log

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42e05420c1..dee36318dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,7 @@ This release contains a number of fixes and improvements:
 - Tech preview for helm feature [\#190](https://github.com/SUSE/stratos/pull/190)
 - Add custom welcome message on endpoints page [\#194](https://github.com/SUSE/stratos/pull/194)
 - Add support for connecting CaaSP V4 endpoints [\#191](https://github.com/SUSE/stratos/pull/191)
-
+- Refinements to the Autoscaler UI [\#196](https://github.com/SUSE/stratos/pull/196)
 > Note: Tech preview features can be enabled when deploying via Helm by setting the Helm chart value `console.techPreview` to `true` - e.g. add `--set console.techPreview=true` when installing.
 
 ## 2.5.0

From 1736e7ff6960d1bb7549212e27ff0f6ff532cb8b Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 4 Sep 2019 09:37:57 +0100
Subject: [PATCH 096/648] Fall back on `ExternalIP` if `InternalIP` is not
 found, make result null safe

---
 .../kubernetes-nodes-list-config.service.ts          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
index bb7438bbdd..f86799211d 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
@@ -2,9 +2,9 @@ import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 
 import { AppState } from '../../../../../../store/src/app-state';
-import { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
-import { DataFunction } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { PaginationEntityState } from '../../../../../../store/src/types/pagination.types';
+import { DataFunction } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
+import { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
 import { IListConfig, IListFilter, ListViewTypes } from '../../../../shared/components/list/list.component.types';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { ConditionType, KubernetesNode } from '../../store/kube.types';
@@ -129,10 +129,10 @@ export class KubernetesNodesListConfigService implements IListConfig<KubernetesN
         switch (filterKey) {
           case KubernetesNodesListFilterKeys.IP_ADDRESS:
             return entities.filter(node => {
-              const internalIP: string = node.status.addresses.find(address => {
-                return address.type === 'InternalIP';
-              }).address;
-              return internalIP.toUpperCase().includes(filterString);
+              const ipAddress =
+                node.status.addresses.find(address => address.type === 'InternalIP') ||
+                node.status.addresses.find(address => address.type === 'ExternalIP');
+              return ipAddress ? ipAddress.address.toUpperCase().includes(filterString) : false;
             });
 
           case KubernetesNodesListFilterKeys.LABELS:

From b8bfeb4a929ab5dfced2bb15a10a634f072ea3a5 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 4 Sep 2019 10:29:20 +0100
Subject: [PATCH 097/648] Make getFilters optional - make optional in interface
 - check for optional function in list component, even though in class it's
 not optional - fixed unrelated typing for getMultiActions and
 getSingleActions

---
 .../monocular-charts-list-config.service.ts         |  1 -
 .../monocular-release-pods-list-config.service.ts   |  1 -
 ...onocular-release-services-list-config.service.ts |  1 -
 .../monocular-releases-list-config.service.ts       |  1 -
 .../monocular-repository-list-config.service.ts     |  1 -
 .../monocular-versions-list-config.service.ts       |  1 -
 .../kubernetes-apps-list-config.service.ts          |  1 -
 .../kubernetes-endpoints-list-config.service.ts     |  1 -
 .../kubernetes-namespaces-list-config.service.ts    |  1 -
 .../kubernetes-pods-list-config.service.ts          |  1 -
 .../kubernetes-service-list-config.service.ts       |  5 +----
 .../app-event/cf-app-events-config.service.ts       |  1 -
 .../app-instance/cf-app-instances-config.service.ts |  1 -
 .../cf-app-variables-list-config.service.ts         |  1 -
 .../list/list-types/app/cf-app-config.service.ts    |  1 -
 .../list/list-types/base-cf/base-cf-list-config.ts  |  1 -
 .../cf-endpoints-list-config.service.ts             |  1 -
 .../cf-routes/cf-routes-list-config-base.ts         |  1 -
 .../cf-routes/cf-routes-list-config.service.ts      |  1 -
 .../cf-select-users-list-config.service.ts          |  1 -
 .../cf-service-instances-list-config.base.ts        |  1 -
 .../cf-services/cf-services-list-config.service.ts  | 13 ++++++-------
 .../cf-user-service-instances-list-config.ts        |  1 -
 .../cf-space-apps-list-config.service.ts            |  1 -
 .../cf-spaces/cf-spaces-list-config.service.ts      |  1 -
 .../cf-users-space-roles-list-config.service.ts     | 11 +++++------
 .../detach-apps/detach-apps-list-config.service.ts  |  7 +++----
 .../endpoint/endpoints-list-config.service.ts       |  1 -
 .../github-commits-list-config-base.service.ts      |  7 +++----
 .../service-plans-list-config.service.ts            |  1 -
 .../src/shared/components/list/list.component.ts    |  4 ++--
 .../shared/components/list/list.component.types.ts  |  6 +++---
 32 files changed, 23 insertions(+), 55 deletions(-)

diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-charts-list-config.service.ts
index e87a82a970..551fff9625 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-list-config.service.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-charts-list-config.service.ts
@@ -84,7 +84,6 @@ export class MonocularChartsListConfig implements IListConfig<MonocularChart> {
   getColumns = () => this.columns;
   getDataSource = () => this.AppsDataSource;
   getMultiFiltersConfigs = () => [this.createRepositoryFilterConfig()];
-  getFilters = () => [];
 
   private createRepositoryFilterConfig(): IListMultiFilterConfig {
     return {
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts
index 476e89492b..22d21f4dc0 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts
@@ -98,6 +98,5 @@ export class HelmReleasePodsListConfig implements IListConfig<HelmReleasePod> {
   public getMultiActions = () => [];
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
-  public getFilters = () => [];
   public getDataSource = () => this.dataSource;
 }
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-config.service.ts
index 5e6b9e6237..b1b46b43cb 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-config.service.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-config.service.ts
@@ -80,6 +80,5 @@ export class HelmReleaseServicesListConfig implements IListConfig<HelmReleaseSer
   public getMultiActions = () => [];
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
-  public getFilters = () => [];
   public getDataSource = () => this.dataSource;
 }
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-config.service.ts
index 7f55c74e42..9512498e97 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-config.service.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-config.service.ts
@@ -117,6 +117,5 @@ export class HelmReleasesListConfig implements IListConfig<HelmRelease> {
   public getMultiActions = () => [];
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
-  public getFilters = () => [];
   public getDataSource = () => this.dataSource;
 }
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 ab9eeb5447..0e99e7dd86 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
@@ -96,6 +96,5 @@ export class MonocularRepositoryListConfig implements IListConfig<EndpointModel>
   public getMultiActions = () => [];
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
-  public getFilters = () => [];
   public getDataSource = () => this.dataSource;
 }
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-config.service.ts
index 9084ee4b17..4da8970655 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-config.service.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-config.service.ts
@@ -52,6 +52,5 @@ export class HelmVersionsListConfig implements IListConfig<HelmVersion> {
   public getMultiActions = () => [];
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
-  public getFilters = () => [];
   public getDataSource = () => this.dataSource;
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-list-config.service.ts
index 28080d06f6..e984169e53 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-list-config.service.ts
@@ -89,7 +89,6 @@ export class KubernetesAppsListConfigService implements IListConfig<KubernetesAp
   getColumns = () => this.columns;
   getDataSource = () => this.AppsDataSource;
   getMultiFiltersConfigs = () => [];
-  getFilters = () => [];
 
   constructor(
     store: Store<AppState>,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
index 84904843f9..73f0cdd19f 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
@@ -53,6 +53,5 @@ export class KubernetesEndpointsListConfigService implements IListConfig<Endpoin
   public getMultiActions = () => [];
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
-  public getFilters = () => [];
   public getDataSource = () => this.dataSource;
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
index 84344a31c0..f4093d2b7c 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
@@ -74,7 +74,6 @@ export class KubernetesNamespacesListConfigService implements IListConfig<Kubern
   getColumns = () => this.columns;
   getDataSource = () => this.podsDataSource;
   getMultiFiltersConfigs = () => [];
-  getFilters = () => [];
   getInitialised = () => this.initialised$;
 
   constructor(
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
index a389753548..3c097b2cbd 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
@@ -103,7 +103,6 @@ export class KubernetesPodsListConfigService implements IListConfig<KubernetesPo
   getColumns = () => this.columns;
   getDataSource = () => this.podsDataSource;
   getMultiFiltersConfigs = () => [];
-  getFilters = () => [];
 
   constructor(
     store: Store<AppState>,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-list-config.service.ts
index 2579b31e86..01ab7ecc46 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-list-config.service.ts
@@ -1,11 +1,9 @@
 import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
 import { ITableColumn } from '../../../shared/components/list/list-table/table.types';
 import { IListConfig, ListViewTypes } from '../../../shared/components/list/list.component.types';
-import {
-  KubernetesServicePortsComponent,
-} from './kubernetes-service-ports/kubernetes-service-ports.component';
 import { KubeService } from '../store/kube.types';
 import { defaultHelmKubeListPageSize } from './kube-helm-list-types';
+import { KubernetesServicePortsComponent } from './kubernetes-service-ports/kubernetes-service-ports.component';
 
 
 export abstract class BaseKubernetesServicesListConfig implements IListConfig<KubeService> {
@@ -60,5 +58,4 @@ export abstract class BaseKubernetesServicesListConfig implements IListConfig<Ku
   getSingleActions = () => [];
   getColumns = () => this.columns;
   getMultiFiltersConfigs = () => [];
-  getFilters = () => [];
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-config.service.ts
index 2c23cde46c..868ebee323 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-config.service.ts
@@ -52,5 +52,4 @@ export class CfAppEventsConfigService extends ListConfig<APIResource> implements
   getColumns = () => this.columns;
   getDataSource = () => this.eventSource;
   getMultiFiltersConfigs = () => [];
-  getFilters = () => [];
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts
index 82c3f8b737..ba3a782089 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts
@@ -220,7 +220,6 @@ export class CfAppInstancesConfigService implements IListConfig<ListAppInstance>
   getColumns = () => this.columns;
   getDataSource = () => this.instancesSource;
   getMultiFiltersConfigs = () => [];
-  getFilters = () => [];
   getInitialised = () => this.initialised$;
 
   private createMetricsResults(entityServiceFactory: EntityServiceFactory) {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.ts
index 1e6cc952ae..63c03ed470 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.ts
@@ -131,7 +131,6 @@ export class CfAppVariablesListConfigService implements IListConfig<ListAppEnvVa
   getColumns = () => this.columns;
   getDataSource = () => this.envVarsDataSource;
   getMultiFiltersConfigs = () => [];
-  getFilters = () => [];
 
   constructor(
     private store: Store<AppState>,
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app/cf-app-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app/cf-app-config.service.ts
index d311bf322f..91ecc40e12 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/app/cf-app-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/app/cf-app-config.service.ts
@@ -144,6 +144,5 @@ export class CfAppConfigService extends ListConfig<APIResource> implements IList
   getColumns = () => this.columns;
   getDataSource = () => this.appsDataSource;
   getMultiFiltersConfigs = () => this.multiFilterConfigs;
-  getFilters = () => [];
   getInitialised = () => this.initialised$;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/base-cf/base-cf-list-config.ts b/src/frontend/packages/core/src/shared/components/list/list-types/base-cf/base-cf-list-config.ts
index 97edb4b016..a2156d434d 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/base-cf/base-cf-list-config.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/base-cf/base-cf-list-config.ts
@@ -17,5 +17,4 @@ export class BaseCfListConfig<T> implements IListConfig<T> {
   getMultiActions = () => [];
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => [];
-  getFilters = () => [];
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service.ts
index 91fd7eba14..f351d6db32 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service.ts
@@ -49,6 +49,5 @@ export class CFEndpointsListConfigService implements IListConfig<EndpointModel>
   public getMultiActions = () => [];
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
-  public getFilters = () => [];
   public getDataSource = () => this.dataSource;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-routes/cf-routes-list-config-base.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-routes/cf-routes-list-config-base.ts
index 40bcf2a8be..bbc1f804df 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-routes/cf-routes-list-config-base.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-routes/cf-routes-list-config-base.ts
@@ -205,7 +205,6 @@ export abstract class CfRoutesListConfigBase implements IListConfig<APIResource>
 
   getColumns = () => this.columns;
   getMultiFiltersConfigs = () => [];
-  getFilters = () => [];
 
   /**
    * Creates an instance of CfRoutesListConfigBase.
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-routes/cf-routes-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-routes/cf-routes-list-config.service.ts
index dfd9b266b0..0a2cce34e2 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-routes/cf-routes-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-routes/cf-routes-list-config.service.ts
@@ -69,7 +69,6 @@ export class CfRoutesListConfigService extends CfRoutesListConfigBase implements
       createCfOrgSpaceFilterConfig('space', 'Space', cfOrgSpaceService.space),
     ];
     this.getMultiFiltersConfigs = () => multiFilterConfigs;
-    this.getFilters = () => [];
     initCfOrgSpaceService(store, cfOrgSpaceService,
       this.dataSource.masterAction.entityKey,
       this.dataSource.masterAction.paginationKey).subscribe();
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-select-users/cf-select-users-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-select-users/cf-select-users-list-config.service.ts
index 8c2be47670..1717819c40 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-select-users/cf-select-users-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-select-users/cf-select-users-list-config.service.ts
@@ -132,7 +132,6 @@ export class CfSelectUsersListConfigService implements IListConfig<APIResource<C
   getMultiActions = (): IMultiListAction<APIResource<CfUser>>[] => [];
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => [];
-  getFilters = () => [];
   getDataSource = () => this.dataSource;
   getInitialised = () => this.initialised;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts
index 3d2d967356..a16964b67b 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts
@@ -193,7 +193,6 @@ export class CfServiceInstancesListConfigBase implements IListConfig<APIResource
   getMultiActions = () => [];
   getSingleActions = () => [this.listActionEdit, this.listActionDetach, this.listActionDelete];
   getMultiFiltersConfigs = () => [];
-  getFilters = () => [];
   getColumns = () => this.serviceInstanceColumns;
   getDataSource = () => null;
 
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts
index bc171f066d..bbd0719651 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts
@@ -3,18 +3,18 @@ import { Store } from '@ngrx/store';
 import { BehaviorSubject, of as observableOf } from 'rxjs';
 import { first, map } from 'rxjs/operators';
 
+import { ListView } from '../../../../../../../store/src/actions/list.actions';
+import { AppState } from '../../../../../../../store/src/app-state';
+import { endpointsRegisteredEntitiesSelector } from '../../../../../../../store/src/selectors/endpoint.selectors';
+import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
 import { EndpointsService } from '../../../../../core/endpoints.service';
 import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
 import { CfOrgSpaceItem, createCfOrgSpaceFilterConfig } from '../../../../data-services/cf-org-space-service.service';
+import { ITableColumn } from '../../list-table/table.types';
 import { IListConfig, IListMultiFilterConfig, ListViewTypes } from '../../list.component.types';
 import { CfServiceCardComponent } from './cf-service-card/cf-service-card.component';
 import { CfServicesDataSource } from './cf-services-data-source';
-import { ITableColumn } from '../../list-table/table.types';
-import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { ListView } from '../../../../../../../store/src/actions/list.actions';
-import { AppState } from '../../../../../../../store/src/app-state';
-import { endpointsRegisteredEntitiesSelector } from '../../../../../../../store/src/selectors/endpoint.selectors';
-import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
 
 @Injectable()
 export class CfServicesListConfigService implements IListConfig<APIResource> {
@@ -84,6 +84,5 @@ export class CfServicesListConfigService implements IListConfig<APIResource> {
   getMultiActions = () => [];
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => this.multiFilterConfigs;
-  getFilters = () => [];
   getDataSource = () => this.dataSource;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts
index 80e7f86a52..c0053902e0 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts
@@ -197,7 +197,6 @@ export class CfUserServiceInstancesListConfigBase implements IListConfig<APIReso
   getMultiActions = () => [];
   getSingleActions = () => [this.listActionEdit, this.listActionDetach, this.listActionDelete];
   getMultiFiltersConfigs = () => [];
-  getFilters = () => [];
   getColumns = () => this.serviceInstanceColumns;
   getDataSource = () => this.dataSource;
 
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.ts
index 90c7061031..bbb6c860de 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.ts
@@ -88,6 +88,5 @@ export class CfSpaceAppsListConfigService implements IListConfig<APIResource> {
   getMultiActions = () => [];
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => [];
-  getFilters = () => [];
   getDataSource = () => this.dataSource;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces/cf-spaces-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces/cf-spaces-list-config.service.ts
index 463195a0f5..27ff550d79 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces/cf-spaces-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces/cf-spaces-list-config.service.ts
@@ -55,6 +55,5 @@ export class CfSpacesListConfigService implements IListConfig<APIResource<ISpace
   getMultiActions = () => [];
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => [];
-  getFilters = () => [];
   getDataSource = () => this.dataSource;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-list-config.service.ts
index d0332b6954..00a45738d6 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-list-config.service.ts
@@ -2,17 +2,17 @@ import { Store } from '@ngrx/store';
 import { BehaviorSubject } from 'rxjs';
 import { first } from 'rxjs/operators';
 
+import { ListView } from '../../../../../../../store/src/actions/list.actions';
+import { AppState } from '../../../../../../../store/src/app-state';
+import { selectUsersRolesRoles } from '../../../../../../../store/src/selectors/users-roles.selector';
+import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { SpaceUserRoleNames } from '../../../../../../../store/src/types/user.types';
 import { ISpace } from '../../../../../core/cf-api.types';
 import { CurrentUserPermissionsService } from '../../../../../core/current-user-permissions.service';
 import { ITableColumn } from '../../list-table/table.types';
 import { IListConfig, ListViewTypes } from '../../list.component.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';
-import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { ListView } from '../../../../../../../store/src/actions/list.actions';
-import { SpaceUserRoleNames } from '../../../../../../../store/src/types/user.types';
-import { AppState } from '../../../../../../../store/src/app-state';
-import { selectUsersRolesRoles } from '../../../../../../../store/src/selectors/users-roles.selector';
 
 
 export class CfUsersSpaceRolesListConfigService implements IListConfig<APIResource<ISpace>> {
@@ -85,7 +85,6 @@ export class CfUsersSpaceRolesListConfigService implements IListConfig<APIResour
   getMultiActions = () => [];
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => [];
-  getFilters = () => [];
   getDataSource = () => this.dataSource;
   public getInitialised = () => this.initialised;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts
index 50fc128462..046588991b 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts
@@ -3,13 +3,13 @@ import { Injectable } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 
+import { ListView } from '../../../../../../../store/src/actions/list.actions';
+import { AppState } from '../../../../../../../store/src/app-state';
+import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { IServiceBinding } from '../../../../../core/cf-api-svc.types';
 import { ITableColumn } from '../../list-table/table.types';
 import { IListConfig, ListViewTypes } from '../../list.component.types';
 import { DetachAppsDataSource } from './detach-apps-data-source';
-import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { ListView } from '../../../../../../../store/src/actions/list.actions';
-import { AppState } from '../../../../../../../store/src/app-state';
 
 @Injectable()
 export class DetachAppsListConfigService implements IListConfig<APIResource> {
@@ -57,6 +57,5 @@ export class DetachAppsListConfigService implements IListConfig<APIResource> {
   getMultiActions = () => [];
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => [];
-  getFilters = () => [];
   getDataSource = () => this.dataSource;
 }
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 e7b3158731..88ea39eef8 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
@@ -134,5 +134,4 @@ export class EndpointsListConfigService implements IListConfig<EndpointModel> {
   public getColumns = () => this.columns;
   public getDataSource = () => this.dataSource;
   public getMultiFiltersConfigs = () => [];
-  public getFilters = () => [];
 }
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/core/src/shared/components/list/list-types/github-commits/github-commits-list-config-base.service.ts
index 8684e94c7d..7192124ef3 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/core/src/shared/components/list/list-types/github-commits/github-commits-list-config-base.service.ts
@@ -3,13 +3,13 @@ import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { BehaviorSubject } from 'rxjs';
 
+import { AppState } from '../../../../../../../store/src/app-state';
+import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { GitCommit } from '../../../../../../../store/src/types/git.types';
 import { ITableColumn } from '../../list-table/table.types';
 import { IListConfig, ListViewTypes } from '../../list.component.types';
 import { GithubCommitsDataSource } from './github-commits-data-source';
 import { TableCellCommitAuthorComponent } from './table-cell-commit-author/table-cell-commit-author.component';
-import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { AppState } from '../../../../../../../store/src/app-state';
-import { GitCommit } from '../../../../../../../store/src/types/git.types';
 
 @Injectable()
 export abstract class GithubCommitsListConfigServiceBase implements IListConfig<APIResource<GitCommit>> {
@@ -92,7 +92,6 @@ export abstract class GithubCommitsListConfigServiceBase implements IListConfig<
   public getMultiActions = () => [];
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
-  public getFilters = () => [];
   public getDataSource = () => this.dataSource;
   public getInitialised = () => this.initialised;
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/service-plans/service-plans-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/service-plans/service-plans-list-config.service.ts
index 729fb7cbd1..5892db9199 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/service-plans/service-plans-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/service-plans/service-plans-list-config.service.ts
@@ -107,7 +107,6 @@ export class ServicePlansListConfigService implements IListConfig<APIResource<IS
   getMultiActions = () => [];
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => [];
-  getFilters = () => [];
   getColumns = () => this.columns;
   getDataSource = () => this.dataSource;
 }
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 2d1e26df65..a06173f2a2 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
@@ -49,7 +49,7 @@ import {
   ListView,
   SetListViewAction,
 } from '../../../../../store/src/actions/list.actions';
-import { SetPage, SetClientFilterKey } from '../../../../../store/src/actions/pagination.actions';
+import { SetClientFilterKey, SetPage } from '../../../../../store/src/actions/pagination.actions';
 import { AppState } from '../../../../../store/src/app-state';
 import { entityFactory } from '../../../../../store/src/helpers/entity-factory';
 import { ActionState } from '../../../../../store/src/reducers/api-request-reducer/types';
@@ -400,7 +400,7 @@ export class ListComponent<T> implements OnInit, OnChanges, OnDestroy, AfterView
       this.headerSort.direction = sort.direction;
     }));
 
-    this.filterColumns = this.config.getFilters();
+    this.filterColumns = this.config.getFilters ? this.config.getFilters() : [];
 
     const filterStoreToWidget = this.paginationController.filter$.pipe(tap((paginationFilter: ListFilter) => {
       this.filterString = paginationFilter.string;
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 f7fa22a8d9..f2faed44aa 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
@@ -28,11 +28,11 @@ export interface IListConfig<T> {
   /**
    * List of actions that are presented as individual buttons when one or more rows are selected. For example `Delete` of selected rows.
    */
-  getMultiActions: (schemaKey: string) => IMultiListAction<T>[];
+  getMultiActions: () => IMultiListAction<T>[];
   /**
    * List of actions that are presented in a mat-menu for an individual entity. For example `unmap` an application route
    */
-  getSingleActions: (schemaKey: string) => IListAction<T>[];
+  getSingleActions: () => IListAction<T>[];
   /**
    * Collection of column definitions to show when the list is in table mode
    */
@@ -52,7 +52,7 @@ export interface IListConfig<T> {
    * When the filter is selected in a dropdown the filterString filters results using the chosen field.
    * Combined with a transformEntities DataFunction that consumes the filterKey.
    */
-  getFilters: () => IListFilter[];
+  getFilters?: () => IListFilter[];
   /**
    * Fetch an observable that will emit once the underlying config components have been created. For instance if the data source requires
    * something from the store which requires an async call

From 454f20b7948cbf022403b4b8100f8a7664920db5 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 9 Sep 2019 10:21:59 +0100
Subject: [PATCH 098/648] Fixes for SQL layer for mysql

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

diff --git a/src/jetstream/plugins/monocular/sql_datastore.go b/src/jetstream/plugins/monocular/sql_datastore.go
index 9fdf161069..02f8e9e74f 100644
--- a/src/jetstream/plugins/monocular/sql_datastore.go
+++ b/src/jetstream/plugins/monocular/sql_datastore.go
@@ -31,7 +31,7 @@ var updateChart = `UPDATE charts
 
 var insertChartFile = `INSERT INTO chart_files (id, filename, chart_id, name, repo_name, digest, content) VALUES ($1, $2, $3, $4, $5, $6, $7)`
 var updateChartFile = `UPDATE chart_files SET chart_id = $1, name = $2, repo_name = $3, digest = $4, content = $5 WHERE id = $6 AND filename = $7`
-var countChartFile = `SELECT COUNT(*) FROM chart_Files WHERE id = $1 AND filename = $2`
+var countChartFile = `SELECT COUNT(*) FROM chart_files WHERE id = $1 AND filename = $2`
 
 var deleteChartFiles = `DELETE FROM chart_files WHERE (name, repo_name) IN (SELECT name, repo_name FROM charts WHERE repo_name = $1 AND update_batch != $2)`
 var deleteCharts = `DELETE FROM charts WHERE repo_name = $1 AND update_batch != $2`
@@ -151,7 +151,7 @@ func (s *SQLDBCMonocularDatastore) ImportCharts(charts []chartrepo.Chart) error
 		return fmt.Errorf("Unable to delete chart files: %v", err)
 	}
 
-	if _, err := s.db.Exec(deleteChart, repoName, updateBatchID); err != nil {
+	if _, err := s.db.Exec(deleteChart, repoName); err != nil {
 		return fmt.Errorf("Unable to delete charts: %v", err)
 	}
 

From 08256e1b55363f283b5118a7b5812cfea07dcf65 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 9 Sep 2019 13:49:48 +0100
Subject: [PATCH 099/648] Better URL comparison for metrics

---
 src/jetstream/plugins/metrics/main.go      | 40 ++++++++++++++++++++--
 src/jetstream/plugins/metrics/main_test.go | 28 +++++++++++++++
 2 files changed, 65 insertions(+), 3 deletions(-)
 create mode 100644 src/jetstream/plugins/metrics/main_test.go

diff --git a/src/jetstream/plugins/metrics/main.go b/src/jetstream/plugins/metrics/main.go
index ed495973ef..725799302d 100644
--- a/src/jetstream/plugins/metrics/main.go
+++ b/src/jetstream/plugins/metrics/main.go
@@ -368,13 +368,47 @@ func (m *MetricsSpecification) UpdateMetadata(info *interfaces.Info, userGUID st
 
 func hasMetricsProvider(providers []MetricsMetadata, url string) (*MetricsMetadata, bool) {
 	for _, provider := range providers {
-		if provider.URL == url {
+		if compareURL(provider.URL, url) {
 			return &provider, true
 		}
 	}
 	return nil, false
 }
 
+// Compare two URLs, taking into account default HTTP/HTTPS ports and ignoring query string
+func compareURL(a, b string) bool {
+
+	ua, err := url.Parse(a)
+	if err != nil {
+		return false
+	}
+
+	ub, err := url.Parse(b)
+	if err != nil {
+		return false
+	}
+
+	aPort := getPort(ua)
+	bPort := getPort(ub)
+	return ua.Scheme == ub.Scheme && ua.Hostname() == ub.Hostname() && aPort == bPort && ua.Path == ub.Path
+}
+
+func getPort(u *url.URL) string {
+	port := u.Port()
+	if len(port) == 0 {
+		switch u.Scheme {
+		case "http":
+			port = "80"
+		case "https":
+			port = "443"
+		default:
+			port = ""
+		}
+	}
+
+	return port
+}
+
 func (m *MetricsSpecification) getMetricsEndpoints(userGUID string, cnsiList []string) (map[string]EndpointMetricsRelation, error) {
 
 	metricsProviders := make([]MetricsMetadata, 0)
@@ -429,7 +463,7 @@ func (m *MetricsSpecification) getMetricsEndpoints(userGUID string, cnsiList []s
 	for _, metricProviderInfo := range metricsProviders {
 		for guid, info := range endpointsMap {
 			// Depends on the type
-			if info.CNSIType == metricProviderInfo.Type && info.DopplerLoggingEndpoint == metricProviderInfo.URL {
+			if info.CNSIType == metricProviderInfo.Type && compareURL(info.DopplerLoggingEndpoint, metricProviderInfo.URL) {
 				relate := EndpointMetricsRelation{}
 				relate.endpoint = info
 				// Make a copy
@@ -442,7 +476,7 @@ func (m *MetricsSpecification) getMetricsEndpoints(userGUID string, cnsiList []s
 			// K8s
 			log.Debugf("Processing endpoint: %+v", info)
 			log.Debugf("Processing endpoint Metrics provider: %+v", metricProviderInfo)
-			if info.APIEndpoint.String() == metricProviderInfo.URL {
+			if compareURL(info.APIEndpoint.String(), metricProviderInfo.URL) {
 				relate := EndpointMetricsRelation{}
 				relate.endpoint = info
 				relate.metrics = &metricProviderInfo
diff --git a/src/jetstream/plugins/metrics/main_test.go b/src/jetstream/plugins/metrics/main_test.go
new file mode 100644
index 0000000000..7b57d89cab
--- /dev/null
+++ b/src/jetstream/plugins/metrics/main_test.go
@@ -0,0 +1,28 @@
+package metrics
+
+import (
+	"testing"
+
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestUrlComparision(t *testing.T) {
+	t.Parallel()
+
+	Convey("URL Comparision", t, func() {
+
+		So(compareURL("https://test.com", "https://test.com"), ShouldBeTrue)
+		So(compareURL("http://test.com", "http://test.com"), ShouldBeTrue)
+		So(compareURL("http://test3.com", "http://test.com"), ShouldBeFalse)
+		So(compareURL("https://test.com", "https://test.com:443"), ShouldBeTrue)
+		So(compareURL("http://test.com", "https://test.com:443"), ShouldBeFalse)
+		So(compareURL("http://test.com", "http://test.com:80"), ShouldBeTrue)
+		So(compareURL("http://test.com:80", "http://test.com:80"), ShouldBeTrue)
+		So(compareURL("http://test.com:80", "http://test.com"), ShouldBeTrue)
+		So(compareURL("http://test.com", "http://test2.com"), ShouldBeFalse)
+		So(compareURL("http://test.com/a", "http://test.com/a"), ShouldBeTrue)
+		So(compareURL("http://test.com/a?one=two", "http://test.com/a?two=one"), ShouldBeTrue)
+
+	})
+
+}

From 0f52cb1272b3d8134ab933e94b38c01736f5a4ee Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 17 Sep 2019 09:05:01 +0100
Subject: [PATCH 100/648] Use better URL comparison

---
 .../plugins/kubernetes/config/kube_config.go  | 39 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/config/kube_config.go b/src/jetstream/plugins/kubernetes/config/kube_config.go
index e86de033cc..7bb67f5b6e 100644
--- a/src/jetstream/plugins/kubernetes/config/kube_config.go
+++ b/src/jetstream/plugins/kubernetes/config/kube_config.go
@@ -3,6 +3,7 @@ package config
 import (
 	"errors"
 	"fmt"
+	"net/url"
 	"reflect"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces/config"
@@ -55,7 +56,7 @@ type KubeConfigFile struct {
 
 func (k *KubeConfigFile) GetClusterByAPIEndpoint(endpoint string) (*KubeConfigCluster, error) {
 	for _, cluster := range k.Clusters {
-		if cluster.Cluster.Server == endpoint {
+		if compareURL(cluster.Cluster.Server, endpoint) {
 			return &cluster, nil
 		}
 	}
@@ -109,7 +110,7 @@ func (k *KubeConfigFile) GetUserForCluster(clusterEndpoint string) (*KubeConfigU
 		if err == nil {
 			c, err := k.GetClusterByName(currentContext.Context.Cluster)
 			if err == nil {
-				if c.Cluster.Server == clusterEndpoint {
+				if compareURL(c.Cluster.Server, clusterEndpoint) {
 					// Cluster refrences the same Kube API Server
 					cluster = c
 				}
@@ -189,3 +190,37 @@ func UnMarshalHelper(values map[string]interface{}, intf interface{}) error {
 
 	return nil
 }
+
+// Compare two URLs, taking into account default HTTP/HTTPS ports and ignoring query string
+func compareURL(a, b string) bool {
+
+	ua, err := url.Parse(a)
+	if err != nil {
+		return false
+	}
+
+	ub, err := url.Parse(b)
+	if err != nil {
+		return false
+	}
+
+	aPort := getPort(ua)
+	bPort := getPort(ub)
+	return ua.Scheme == ub.Scheme && ua.Hostname() == ub.Hostname() && aPort == bPort && ua.Path == ub.Path
+}
+
+func getPort(u *url.URL) string {
+	port := u.Port()
+	if len(port) == 0 {
+		switch u.Scheme {
+		case "http":
+			port = "80"
+		case "https":
+			port = "443"
+		default:
+			port = ""
+		}
+	}
+
+	return port
+}

From 6affb45fe28bf10f3a2d2b32d06481786a45e76c Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 19 Sep 2019 11:36:34 +0100
Subject: [PATCH 101/648] Fix freeze on metrics endpoint view

---
 src/frontend/packages/core/src/app.routing.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/frontend/packages/core/src/app.routing.ts b/src/frontend/packages/core/src/app.routing.ts
index 11ab21fc80..68583a2271 100644
--- a/src/frontend/packages/core/src/app.routing.ts
+++ b/src/frontend/packages/core/src/app.routing.ts
@@ -65,14 +65,14 @@ const appRoutes: Routes = [
           }
         },
         children: [{
-          path: '',
-          loadChildren: './features/endpoints/endpoints.module#EndpointsModule',
-        },
-        {
           path: 'metrics',
           loadChildren: './features/metrics/metrics.module#MetricsModule',
-        }]
-      },
+        },
+        {
+          path: '',
+          loadChildren: './features/endpoints/endpoints.module#EndpointsModule',
+        }
+]      },
       {
         path: 'marketplace', loadChildren: './features/service-catalog/service-catalog.module#ServiceCatalogModule',
         data: {

From a88807a4915c35a7c683754d4d761d275b5c6328 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 19 Sep 2019 11:41:56 +0100
Subject: [PATCH 102/648] update

---
 package-lock.json | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e44ec6becc..1c1e923d01 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10510,6 +10510,7 @@
         "array-slice": "1.1.0",
         "for-own": "1.0.0",
         "isobject": "3.0.1"
+<<<<<<< Updated upstream
       }
     },
     "object.getownpropertydescriptors": {
@@ -10520,6 +10521,8 @@
       "requires": {
         "define-properties": "1.1.2",
         "es-abstract": "1.12.0"
+=======
+>>>>>>> Stashed changes
       }
     },
     "object.map": {
@@ -10582,7 +10585,7 @@
     },
     "onetime": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
       "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
       "dev": true
     },
@@ -11421,7 +11424,11 @@
         "@types/q": "0.0.32",
         "@types/selenium-webdriver": "3.0.16",
         "blocking-proxy": "1.0.1",
+<<<<<<< Updated upstream
         "browserstack": "1.5.3",
+=======
+        "browserstack": "1.5.2",
+>>>>>>> Stashed changes
         "chalk": "1.1.3",
         "glob": "7.1.2",
         "jasmine": "2.8.0",
@@ -11532,7 +11539,11 @@
             "request": "2.88.0",
             "rimraf": "2.6.2",
             "semver": "5.5.0",
+<<<<<<< Updated upstream
             "xml2js": "0.4.22"
+=======
+            "xml2js": "0.4.19"
+>>>>>>> Stashed changes
           }
         }
       }
@@ -12588,7 +12599,7 @@
     },
     "samsam": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz",
+      "resolved": "http://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz",
       "integrity": "sha1-vsEf3IOp/aBjQBIQ5AF2wwJNFWc=",
       "dev": true
     },
@@ -12754,7 +12765,11 @@
         "jszip": "3.2.2",
         "rimraf": "2.6.2",
         "tmp": "0.0.30",
+<<<<<<< Updated upstream
         "xml2js": "0.4.22"
+=======
+        "xml2js": "0.4.19"
+>>>>>>> Stashed changes
       },
       "dependencies": {
         "tmp": {
@@ -14605,7 +14620,7 @@
       "dependencies": {
         "minimist": {
           "version": "1.2.0",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
         },
@@ -15864,8 +15879,12 @@
       "dev": true,
       "requires": {
         "sax": "1.2.4",
+<<<<<<< Updated upstream
         "util.promisify": "1.0.0",
         "xmlbuilder": "11.0.1"
+=======
+        "xmlbuilder": "9.0.7"
+>>>>>>> Stashed changes
       },
       "dependencies": {
         "sax": {

From 1a84f47345663b5fbc27eed381eda6f702be6416 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 19 Sep 2019 11:48:26 +0100
Subject: [PATCH 103/648] 2.5.2 Release Notes and version bump

---
 CHANGELOG.md      | 21 ++++++++++++++++++++-
 package-lock.json |  2 +-
 package.json      |  2 +-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dee36318dc..2a77f84c71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Change Log
 
+## 2.5.2
+
+[Full Changelog](https://github.com/cloudfoundry-incubator/stratos/compare/2.5.1...2.5.2)
+
+This release contains a number of fixes and improvements:
+
+**Fixes:**
+
+- Clicking on a metrics endpoint to view details freezes the UI [\#212](https://github.com/SUSE/stratos/pull/212)
+
+**Improvements:**
+
+- Add support for local user account [\#3632](https://github.com/cloudfoundry-incubator/stratos/pull/3632)
+- Add support for viewing and editing profile for local user account [\#3883](https://github.com/cloudfoundry-incubator/stratos/pull/3883)
+- Better metrics endpoint comparison [\#206](https://github.com/SUSE/stratos/pull/206)
+- Better Kubernetes endpoint comparison [\#209](https://github.com/SUSE/stratos/pull/209)
+
+> Note: To enable the local user account, configure the password for the local user ('admin') when deploying via Helm by setting the Helm chart value `console.localAdminPassword` when installing. Once the user has been created, the user profile and password can be edited subsequently from the user profile view in the UI.
+
 ## 2.5.1
 
 [Full Changelog](https://github.com/cloudfoundry-incubator/stratos/compare/2.5.0...2.5.1)
@@ -8,7 +27,7 @@ This release contains a number of fixes and improvements:
 
 **Fixes:**
 
-- Allow DB directory to be specified for SQLite [\#194](https://github.com/SUSE/stratos/pull/193)
+- Allow DB directory to be specified for SQLite [\#193](https://github.com/SUSE/stratos/pull/193)
 
 **Improvements:**
 
diff --git a/package-lock.json b/package-lock.json
index 1c1e923d01..f0dbe562ff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "stratos",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0a2c43eda8..b7490f53d8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stratos",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "Stratos Console",
   "main": "index.js",
   "scripts": {

From 526137abd7fcd0817c19dcfefa8d5a43af87bfd8 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 19 Sep 2019 13:21:43 +0100
Subject: [PATCH 104/648] Fix package lock file

---
 package-lock.json | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f0dbe562ff..7310f12759 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10510,7 +10510,6 @@
         "array-slice": "1.1.0",
         "for-own": "1.0.0",
         "isobject": "3.0.1"
-<<<<<<< Updated upstream
       }
     },
     "object.getownpropertydescriptors": {
@@ -10521,8 +10520,6 @@
       "requires": {
         "define-properties": "1.1.2",
         "es-abstract": "1.12.0"
-=======
->>>>>>> Stashed changes
       }
     },
     "object.map": {
@@ -10585,7 +10582,7 @@
     },
     "onetime": {
       "version": "1.1.0",
-      "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
       "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
       "dev": true
     },
@@ -11424,11 +11421,7 @@
         "@types/q": "0.0.32",
         "@types/selenium-webdriver": "3.0.16",
         "blocking-proxy": "1.0.1",
-<<<<<<< Updated upstream
         "browserstack": "1.5.3",
-=======
-        "browserstack": "1.5.2",
->>>>>>> Stashed changes
         "chalk": "1.1.3",
         "glob": "7.1.2",
         "jasmine": "2.8.0",
@@ -11539,11 +11532,7 @@
             "request": "2.88.0",
             "rimraf": "2.6.2",
             "semver": "5.5.0",
-<<<<<<< Updated upstream
             "xml2js": "0.4.22"
-=======
-            "xml2js": "0.4.19"
->>>>>>> Stashed changes
           }
         }
       }
@@ -12599,7 +12588,7 @@
     },
     "samsam": {
       "version": "1.1.2",
-      "resolved": "http://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz",
       "integrity": "sha1-vsEf3IOp/aBjQBIQ5AF2wwJNFWc=",
       "dev": true
     },
@@ -12765,11 +12754,7 @@
         "jszip": "3.2.2",
         "rimraf": "2.6.2",
         "tmp": "0.0.30",
-<<<<<<< Updated upstream
         "xml2js": "0.4.22"
-=======
-        "xml2js": "0.4.19"
->>>>>>> Stashed changes
       },
       "dependencies": {
         "tmp": {
@@ -14620,7 +14605,7 @@
       "dependencies": {
         "minimist": {
           "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
         },
@@ -15879,12 +15864,8 @@
       "dev": true,
       "requires": {
         "sax": "1.2.4",
-<<<<<<< Updated upstream
         "util.promisify": "1.0.0",
         "xmlbuilder": "11.0.1"
-=======
-        "xmlbuilder": "9.0.7"
->>>>>>> Stashed changes
       },
       "dependencies": {
         "sax": {

From a2df7a01d3ae0219b0e54089659aa2c1e27dbea0 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 19 Sep 2019 11:41:37 +0100
Subject: [PATCH 105/648] update

---
 package-lock.json    | 19 +++++++++++++++++++
 src/jetstream/go.sum |  5 +++++
 2 files changed, 24 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index e44ec6becc..4164396e92 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10510,6 +10510,7 @@
         "array-slice": "1.1.0",
         "for-own": "1.0.0",
         "isobject": "3.0.1"
+<<<<<<< Updated upstream
       }
     },
     "object.getownpropertydescriptors": {
@@ -10520,6 +10521,8 @@
       "requires": {
         "define-properties": "1.1.2",
         "es-abstract": "1.12.0"
+=======
+>>>>>>> Stashed changes
       }
     },
     "object.map": {
@@ -11421,7 +11424,11 @@
         "@types/q": "0.0.32",
         "@types/selenium-webdriver": "3.0.16",
         "blocking-proxy": "1.0.1",
+<<<<<<< Updated upstream
         "browserstack": "1.5.3",
+=======
+        "browserstack": "1.5.2",
+>>>>>>> Stashed changes
         "chalk": "1.1.3",
         "glob": "7.1.2",
         "jasmine": "2.8.0",
@@ -11532,7 +11539,11 @@
             "request": "2.88.0",
             "rimraf": "2.6.2",
             "semver": "5.5.0",
+<<<<<<< Updated upstream
             "xml2js": "0.4.22"
+=======
+            "xml2js": "0.4.19"
+>>>>>>> Stashed changes
           }
         }
       }
@@ -12754,7 +12765,11 @@
         "jszip": "3.2.2",
         "rimraf": "2.6.2",
         "tmp": "0.0.30",
+<<<<<<< Updated upstream
         "xml2js": "0.4.22"
+=======
+        "xml2js": "0.4.19"
+>>>>>>> Stashed changes
       },
       "dependencies": {
         "tmp": {
@@ -15864,8 +15879,12 @@
       "dev": true,
       "requires": {
         "sax": "1.2.4",
+<<<<<<< Updated upstream
         "util.promisify": "1.0.0",
         "xmlbuilder": "11.0.1"
+=======
+        "xmlbuilder": "9.0.7"
+>>>>>>> Stashed changes
       },
       "dependencies": {
         "sax": {
diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index 1a52ba1467..b642659041 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -32,6 +32,7 @@ github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc h1:MhBvG7RLaLq
 github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA=
 github.com/antonlindstrom/pgstore v0.0.0-20170604072116-a407030ba6d0 h1:e6PEaXbztY0ViaKotCICNnBQDUeNEJgrQ5UAHWlloh4=
 github.com/antonlindstrom/pgstore v0.0.0-20170604072116-a407030ba6d0/go.mod h1:2Ti6VUHVxpC0VSmTZzEvpzysnaGAfGBOoMIz5ykPyyw=
+github.com/arschles/assert v1.0.0 h1:NofQbRhtxcLgP+XoKunA7J6UMJNTqX7xR/19tej8UsA=
 github.com/arschles/assert v1.0.0/go.mod h1:m/u69zW43x0h8dTHcv3JJZljINyEYgBuf5fYJP6WikI=
 github.com/aws/aws-sdk-go v1.17.5 h1:WW9Hm3KYo48iZHpmBc+b7sgyS0h32zgCvya28SLW4BU=
 github.com/aws/aws-sdk-go v1.17.5/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
@@ -226,6 +227,7 @@ github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=
 github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
@@ -256,7 +258,9 @@ github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245/go.mod h1:O1c8HleITsZqzNZDjSNzirUGsMT0oGu9LhHKoJrqO+A=
 github.com/ulikunitz/xz v0.5.6 h1:jGHAfXawEGZQ3blwU5wnWKQJvAraT7Ftq9EXjnXYgt8=
@@ -321,6 +325,7 @@ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/grpc v1.19.0 h1:cfg4PD8YEdSFnm7qLV4++93WcmhH2nIUhMjhdCvl3j8=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/cheggaaa/pb.v1 v1.0.27 h1:kJdccidYzt3CaHD1crCFTS1hxyhSi059NhOFUf03YFo=
 gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=

From 535f76a1362a9014015fe2448066a15b24e05a2c Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 23 Sep 2019 15:34:31 +0100
Subject: [PATCH 106/648] Resolve merge issues

---
 package-lock.json | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4164396e92..e44ec6becc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10510,7 +10510,6 @@
         "array-slice": "1.1.0",
         "for-own": "1.0.0",
         "isobject": "3.0.1"
-<<<<<<< Updated upstream
       }
     },
     "object.getownpropertydescriptors": {
@@ -10521,8 +10520,6 @@
       "requires": {
         "define-properties": "1.1.2",
         "es-abstract": "1.12.0"
-=======
->>>>>>> Stashed changes
       }
     },
     "object.map": {
@@ -11424,11 +11421,7 @@
         "@types/q": "0.0.32",
         "@types/selenium-webdriver": "3.0.16",
         "blocking-proxy": "1.0.1",
-<<<<<<< Updated upstream
         "browserstack": "1.5.3",
-=======
-        "browserstack": "1.5.2",
->>>>>>> Stashed changes
         "chalk": "1.1.3",
         "glob": "7.1.2",
         "jasmine": "2.8.0",
@@ -11539,11 +11532,7 @@
             "request": "2.88.0",
             "rimraf": "2.6.2",
             "semver": "5.5.0",
-<<<<<<< Updated upstream
             "xml2js": "0.4.22"
-=======
-            "xml2js": "0.4.19"
->>>>>>> Stashed changes
           }
         }
       }
@@ -12765,11 +12754,7 @@
         "jszip": "3.2.2",
         "rimraf": "2.6.2",
         "tmp": "0.0.30",
-<<<<<<< Updated upstream
         "xml2js": "0.4.22"
-=======
-        "xml2js": "0.4.19"
->>>>>>> Stashed changes
       },
       "dependencies": {
         "tmp": {
@@ -15879,12 +15864,8 @@
       "dev": true,
       "requires": {
         "sax": "1.2.4",
-<<<<<<< Updated upstream
         "util.promisify": "1.0.0",
         "xmlbuilder": "11.0.1"
-=======
-        "xmlbuilder": "9.0.7"
->>>>>>> Stashed changes
       },
       "dependencies": {
         "sax": {

From d0394aa34f32f4c3b4b4ac4e18714f315920777c Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 24 Sep 2019 11:43:14 +0100
Subject: [PATCH 107/648] Update changelog for all 2.5.2 fixes

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a77f84c71..e1462864b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ This release contains a number of fixes and improvements:
 **Fixes:**
 
 - Clicking on a metrics endpoint to view details freezes the UI [\#212](https://github.com/SUSE/stratos/pull/212)
+- Ensure MB is only shown for memory based quota values in edit quota forms [\#3892](https://github.com/cloudfoundry-incubator/stratos/pull/3892)
+- Ensure stepper buttons are always visible and content scrolls [\#3890](https://github.com/cloudfoundry-incubator/stratos/pull/3890)
+- Fix autoscaler issue related to editing a newly created policy[\#3886](https://github.com/cloudfoundry-incubator/stratos/pull/3886)
 
 **Improvements:**
 

From e83f9d3a751eddfd410c0b5e6d5078f817238fb4 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 24 Sep 2019 17:41:46 +0100
Subject: [PATCH 108/648] SUSE quick start document

---
 docs/suse/quickstart.md | 95 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 docs/suse/quickstart.md

diff --git a/docs/suse/quickstart.md b/docs/suse/quickstart.md
new file mode 100644
index 0000000000..5c2631e7a3
--- /dev/null
+++ b/docs/suse/quickstart.md
@@ -0,0 +1,95 @@
+# Quick Start
+
+This quick start will take you through installing Stratos using Helm to a Kubernetes cluster.
+
+In this guide, we deploy Stratos with the Technology Preview features enabled and using the built-in Administrator account instead of the Cloud Foundry UAA - thus there is no dependency on any other components.
+
+# Install
+
+You'll need the Helm client installed and Tiller deployed into your Kubernetes cluster.
+
+Add the SUSE Helm repository:
+
+```
+helm repo add suse https://kubernetes-charts.suse.com
+helm repo update
+```
+
+Check that Stratos is available:
+
+```
+helm search suse/console
+```
+
+You should see output similar to:
+
+```
+NAME       	    CHART VERSION	  APP VERSION	  DESCRIPTION                                  
+suse/console    2.5.2        	  1.5        	  A Helm chart for deploying Stratos UI Console
+```
+
+> Stratos exposes the UI through a Kubernetes service. Before installing, you'll need to decide (for your environment) how to make this service accessible (e.g. NodePort, Load Balancer etc) and add the appropriate configuration when deploying.
+
+Install with the following command:
+
+```
+helm install suse/console \
+             --name stratos \
+             --namespace stratos \
+             --set console.techPreview=true \
+             --set console.localAdminPassword=changeme \
+             --set console.service.type=NodePort
+```
+
+You can obviously change the name, namespace and local admin password to suit.
+
+In this example we expose Stratos as a NodePort service.
+
+You can list the services exposed by Stratos with:
+
+```
+kubectl get services -n stratos
+```
+
+(replacing `stratos` with the namespace you used when installing, if different)
+
+You'll see output similir to this:
+
+```
+NAME              TYPE        CLUSTER-IP     EXTERNAL-IP   PORT(S)         AGE
+stratos-mariadb   ClusterIP   10.96.23.192   <none>        3306/TCP        20s
+stratos-ui-ext    NodePort    10.108.70.55   <none>        443:31091/TCP   20s
+```
+
+> Note: The service `[RELEASE-NAME]-ui-ext` is the external https service for Stratos and you access Stratos via https on this service.
+
+# Getting Started
+
+Open a web browser and navigate to the Stratos https service.
+
+Login with the username `admin` and the password you set when installing (the default used about was `changeme`. When you first login, you'll see a welcome screen.
+
+You'll want to register and connect endpoints into Stratos in order to be able to view them.
+
+## Connecting a CaaSP V4 Kubernetes cluster
+
+To connect a CaaSP cluster, you'll need your Kubeconfig file available.
+
+From your Kubeconfig file, make a note of the server URL for your cluster.
+
+In the Stratos Endpoints view, click the + icon in the top-right and select `SUSE CaaS Platform`. Enter a name for your CaaSP endpoint and then enter the Kubernetes URL from your Kubeconfig file.
+
+Click `Register` and on the next screen, click the checkbox to connect now and browse to your Kubeconfig file and click `Finish`.
+
+Stratos should connect to the Kubernetes Cluster and you should see the Kubernetes functionality appear on the left-hand side navigation. From here you can explore the Kubernetes functionality in Stratos.
+
+# Adding a Helm Repository
+
+To add a Helm Repository, click the + icon from the Stratos Endpoints view.
+
+Select `Helm Repository` and enter a name for the endpoint and the URl of a Helm Repository.
+
+For example, to add the stable charts repository, enter the name `stable` and the URL `https://kubernetes-charts.storage.googleapis.com`.
+
+Click `Finish` and the Helm repository will be synchronized into Stratos and the Helm functionality will appear in the left-hand side navigation. rom here you can explore the Helm functionality in Stratos.
+

From 0c75549b8677e26a326f69d6c742bb33d9558f0b Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Tue, 24 Sep 2019 17:51:07 +0100
Subject: [PATCH 109/648] Typo fixes

---
 docs/suse/quickstart.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/suse/quickstart.md b/docs/suse/quickstart.md
index 5c2631e7a3..509f592147 100644
--- a/docs/suse/quickstart.md
+++ b/docs/suse/quickstart.md
@@ -67,7 +67,7 @@ stratos-ui-ext    NodePort    10.108.70.55   <none>        443:31091/TCP   20s
 
 Open a web browser and navigate to the Stratos https service.
 
-Login with the username `admin` and the password you set when installing (the default used about was `changeme`. When you first login, you'll see a welcome screen.
+Login with the username `admin` and the password you set when installing (the default used about was `changeme`). When you first login, you'll see a welcome screen.
 
 You'll want to register and connect endpoints into Stratos in order to be able to view them.
 
@@ -91,5 +91,5 @@ Select `Helm Repository` and enter a name for the endpoint and the URl of a Helm
 
 For example, to add the stable charts repository, enter the name `stable` and the URL `https://kubernetes-charts.storage.googleapis.com`.
 
-Click `Finish` and the Helm repository will be synchronized into Stratos and the Helm functionality will appear in the left-hand side navigation. rom here you can explore the Helm functionality in Stratos.
+Click `Finish` and the Helm repository will be synchronized into Stratos and the Helm functionality will appear in the left-hand side navigation. From here you can explore the Helm functionality in Stratos.
 

From aecb997a7ab58336262bdc98cb5ba032c641fa24 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Tue, 24 Sep 2019 17:52:28 +0100
Subject: [PATCH 110/648] Typo fix

---
 docs/suse/quickstart.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/suse/quickstart.md b/docs/suse/quickstart.md
index 509f592147..6ee62dd469 100644
--- a/docs/suse/quickstart.md
+++ b/docs/suse/quickstart.md
@@ -67,7 +67,7 @@ stratos-ui-ext    NodePort    10.108.70.55   <none>        443:31091/TCP   20s
 
 Open a web browser and navigate to the Stratos https service.
 
-Login with the username `admin` and the password you set when installing (the default used about was `changeme`). When you first login, you'll see a welcome screen.
+Login with the username `admin` and the password you set when installing (the default used above was `changeme`). When you first login, you'll see a welcome screen.
 
 You'll want to register and connect endpoints into Stratos in order to be able to view them.
 

From 8d93f8c31bab94e68001596d186f97d22f62c0ee Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Sun, 29 Sep 2019 11:01:25 +0100
Subject: [PATCH 111/648] Helm Chart: Add ingress support

---
 .../console/templates/__helpers.tpl           |  21 +-
 .../kubernetes/console/templates/ingress.yaml |  76 ++++++
 .../console/tests/ingress_test.yaml           | 253 ++++++++++++++++++
 deploy/kubernetes/console/values.yaml         |  22 ++
 4 files changed, 371 insertions(+), 1 deletion(-)
 create mode 100644 deploy/kubernetes/console/templates/ingress.yaml
 create mode 100644 deploy/kubernetes/console/tests/ingress_test.yaml

diff --git a/deploy/kubernetes/console/templates/__helpers.tpl b/deploy/kubernetes/console/templates/__helpers.tpl
index f1b18918ca..0050379482 100644
--- a/deploy/kubernetes/console/templates/__helpers.tpl
+++ b/deploy/kubernetes/console/templates/__helpers.tpl
@@ -104,4 +104,23 @@ Generate self-signed certificate
 {{- $cert := genSignedCert ( include "console.certName" . ) nil $altNames 365 $ca -}}
 tls.crt: {{ $cert.Cert | b64enc }}
 tls.key: {{ $cert.Key | b64enc }}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
+
+
+{{/*
+Ingress Host:
+*/}}
+{{- define "ingress.host" -}}
+{{$host := ""}}
+{{- if .Values.console.service -}}
+{{- if .Values.console.service.ingress -}}
+{{- if .Values.console.service.ingress.host -}}
+{{$host = .Values.console.service.ingress.host }}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+{{- if and .Values.env.DOMAIN (not $host) -}}
+{{$host = print "console." .Values.env.DOMAIN }}
+{{- end -}}
+{{ required "Host name is required" $host | quote }}
+{{- end -}}
diff --git a/deploy/kubernetes/console/templates/ingress.yaml b/deploy/kubernetes/console/templates/ingress.yaml
new file mode 100644
index 0000000000..2578b52df5
--- /dev/null
+++ b/deploy/kubernetes/console/templates/ingress.yaml
@@ -0,0 +1,76 @@
+{{- if .Values.console.service -}}
+{{- if .Values.console.service.ingress -}}
+{{- if .Values.console.service.ingress.enabled -}}
+
+{{- if not .Values.console.service.ingress.secretName -}}
+---
+# The certificate and key for the TLS secret are passed through ingress.tls.crt and ingress.tls.key
+# respectively. If the operator does not provide these values at installation time, the TLS secret
+# will contain empty values. The standard behaviour for NGINX ingress controller is to provide a
+# fake certificate instead. It is useful only for testing and development. It is expected that for
+# production use the operator will provide these values.
+apiVersion: "v1"
+kind: "Secret"
+type: kubernetes.io/tls
+metadata:
+  name: "{{ .Release.Name }}-ingress-tls"
+  labels:
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "console-ingress-tls"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+data:
+  tls.crt: {{ .Values.console.service.ingress.tls.crt | default "" | b64enc | quote }}
+  tls.key: {{ .Values.console.service.ingress.tls.key | default "" | b64enc | quote }}
+{{- end }}
+
+---
+# Ingress for the Console UI service
+apiVersion: "extensions/v1beta1"
+kind: "Ingress"
+metadata:
+  name: "{{ .Release.Name }}-ingress"
+  annotations:
+    {{- if hasKey .Values.console.service.ingress.annotations "kubernetes.io/ingress.class" | not -}}
+      {{ $_ := set .Values.console.service.ingress.annotations "kubernetes.io/ingress.class" "nginx" }}
+    {{- end }}
+    {{- if hasKey .Values.console.service.ingress.annotations "nginx.ingress.kubernetes.io/secure-backends" | not -}}
+      {{ $_ := set .Values.console.service.ingress.annotations "nginx.ingress.kubernetes.io/secure-backends" "true" }}
+    {{- end }}
+    {{- if hasKey .Values.console.service.ingress.annotations "nginx.ingress.kubernetes.io/backend-protocol" | not -}}
+      {{ $_ := set .Values.console.service.ingress.annotations "nginx.ingress.kubernetes.io/backend-protocol" "HTTPS" }}
+    {{- end }}
+    {{- if hasKey .Values.console.service.ingress.annotations "nginx.ingress.kubernetes.io/ssl-redirect" | not -}}
+      {{ $_ := set .Values.console.service.ingress.annotations "nginx.ingress.kubernetes.io/ssl-redirect" "false" }}
+    {{- end }}
+    {{- if hasKey .Values.console.service.ingress.annotations "nginx.ingress.kubernetes.io/proxy-body-size" | not -}}
+      {{ $_ := set .Values.console.service.ingress.annotations "nginx.ingress.kubernetes.io/proxy-body-size" "200m" }}
+    {{- end }}
+    {{ $_ := set .Values.console.service.ingress.annotations "nginx.org/websocket-services" (print .Release.Name "-ui-ext") }}
+{{ toYaml .Values.console.service.ingress.annotations | indent 4 }}
+  labels:
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/component: "console-ingress"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+{{- range $key, $value := .Values.console.service.ingress.extraLabels }}
+    {{ $key }}: {{ $value }}
+{{- end }}    
+spec:
+  tls:
+  - secretName: {{ default "{{ .Release.Name }}-ingress-tls" .Values.console.service.ingress.secretName | quote }}
+    hosts:
+    - {{ template "ingress.host" . }}
+  rules:
+    - host: {{ template "ingress.host" . }}
+      http:
+        paths:
+          - path: "/"
+            backend:
+              serviceName: "{{ .Release.Name }}-ui-ext"
+              servicePort: 443
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/deploy/kubernetes/console/tests/ingress_test.yaml b/deploy/kubernetes/console/tests/ingress_test.yaml
new file mode 100644
index 0000000000..d275098c9b
--- /dev/null
+++ b/deploy/kubernetes/console/tests/ingress_test.yaml
@@ -0,0 +1,253 @@
+suite: test ingress
+templates:
+  - ingress.yaml
+
+tests:
+  - it: should not have ingress when not configured
+    asserts:
+      - hasDocuments:
+          count: 0
+  - it: should not have ingress when not configured (.ingress)
+    set:
+      console.service.ingress: {}
+    asserts:
+      - hasDocuments:
+          count: 0
+  - it: should not have ingress when configured false
+    set:
+      console.service.ingress.enabled: false
+    asserts:
+      - hasDocuments:
+          count: 0
+  - it: should have ingress when configured true
+    set:
+      console.service.ingress.enabled: true
+      console.service.ingress.host: "hostname"
+    asserts:
+      - hasDocuments:
+          count: 2
+  - it: should allow existing tls secret to be used
+    set:
+      console.service.ingress.enabled: true
+      console.service.ingress.secretName: "existingTestSecret"
+      console.service.ingress.host: "hostname"
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: spec.tls[0].secretName
+          value: "existingTestSecret"
+  - it: should create empty secret by default
+    set:
+      console.service.ingress.enabled: true
+      console.service.ingress.host: "hostname"
+    asserts:
+      - hasDocuments:
+          count: 2
+      - equal:
+          path: kind
+          value: "Secret"
+      - equal:
+          path: data.tls\.crt
+          value: ""
+      - equal:
+          path: data.tls\.key
+          value: ""
+  - it: should create secret with specified values
+    set:
+      console.service.ingress.enabled: true
+      console.service.ingress.tls.crt: "CRT_TEST"
+      console.service.ingress.tls.key: "KEY_TEST"
+      console.service.ingress.host: "hostname"
+    asserts:
+      - hasDocuments:
+          count: 2
+      - equal:
+          path: kind
+          value: "Secret"
+      - equal:
+          path: data.tls\.crt
+          value: "Q1JUX1RFU1Q="
+      - equal:
+          path: data.tls\.key
+          value: "S0VZX1RFU1Q="
+  - it: should have correct metadata
+    release:
+      name: test-release
+    set:
+      console.service.ingress.enabled: true
+      console.service.ingress.secretName: "existingTestSecret"
+      console.service.ingress.host: "hostname"
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: kind
+          value: "Ingress"
+      - equal:
+          path: metadata.name
+          value: "test-release-ingress"
+      - equal:
+          path: metadata.labels.app\.kubernetes\.io\/instance
+          value: "test-release"
+      - equal:
+          path: spec.rules[0].http.paths[0].backend.serviceName
+          value: "test-release-ui-ext"
+  - it: should use host name provided
+    release:
+      name: test-release
+    set:
+      console.service.ingress.enabled: true
+      console.service.ingress.secretName: "existingTestSecret"
+      console.service.ingress.host: "hostname"
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: kind
+          value: "Ingress"
+      - equal:
+          path: spec.rules[0].host
+          value: "hostname"
+      - equal:
+          path: spec.tls[0].hosts[0]
+          value: "hostname"
+  - it: should use console.DOMAIN if configured
+    release:
+      name: test-release
+    set:
+      console.service.ingress.enabled: true
+      console.service.ingress.secretName: "existingTestSecret"
+      env.DOMAIN: "domain.com"
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: kind
+          value: "Ingress"
+      - equal:
+          path: spec.rules[0].host
+          value: "console.domain.com"
+      - equal:
+          path: spec.tls[0].hosts[0]
+          value: "console.domain.com"
+  - it: should apply default annotation if not overriden
+    release:
+      name: test-release
+    set:
+      console.service.ingress.enabled: true
+      console.service.ingress.secretName: "existingTestSecret"
+      env.DOMAIN: "domain.com"
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: kind
+          value: "Ingress"
+      - equal:
+          path: metadata.annotations
+          value:
+            kubernetes.io/ingress.class: "nginx"
+            nginx.ingress.kubernetes.io/secure-backends: "true"
+            nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
+            nginx.ingress.kubernetes.io/ssl-redirect: "false"
+            nginx.ingress.kubernetes.io/proxy-body-size: "200m"
+            nginx.org/websocket-services: "test-release-ui-ext"
+  - it: should overide default annotation when provided
+    release:
+      name: test-release
+    set:
+      console.service.ingress.enabled: true
+      console.service.ingress.secretName: "existingTestSecret"
+      env.DOMAIN: "domain.com"
+      console.service.ingress.annotations:
+        nginx.ingress.kubernetes.io/proxy-body-size: "500m"
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: kind
+          value: "Ingress"
+      - equal:
+          path: metadata.annotations
+          value:
+            kubernetes.io/ingress.class: "nginx"
+            nginx.ingress.kubernetes.io/secure-backends: "true"
+            nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
+            nginx.ingress.kubernetes.io/ssl-redirect: "false"
+            nginx.ingress.kubernetes.io/proxy-body-size: "500m"
+            nginx.org/websocket-services: "test-release-ui-ext"
+  - it: should allow additional annotations to be specified
+    release:
+      name: test-release
+    set:
+      console.service.ingress.enabled: true
+      console.service.ingress.secretName: "existingTestSecret"
+      env.DOMAIN: "domain.com"
+      console.service.ingress.annotations:
+        test-annotation: "test"
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: kind
+          value: "Ingress"
+      - equal:
+          path: metadata.annotations
+          value:
+            test-annotation: "test"
+            kubernetes.io/ingress.class: "nginx"
+            nginx.ingress.kubernetes.io/secure-backends: "true"
+            nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
+            nginx.ingress.kubernetes.io/ssl-redirect: "false"
+            nginx.ingress.kubernetes.io/proxy-body-size: "200m"
+            nginx.org/websocket-services: "test-release-ui-ext"
+  - it: should have default labels
+    release:
+      name: test-release
+    set:
+      console.service.ingress.enabled: true
+      console.service.ingress.secretName: "existingTestSecret"
+      env.DOMAIN: "domain.com"
+      console.service.ingress.annotations:
+        test-annotation: "test"
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: kind
+          value: "Ingress"
+      - equal:
+          path: metadata.labels
+          value:
+            app.kubernetes.io/name: "stratos"
+            app.kubernetes.io/component: "console-ingress"
+            app.kubernetes.io/instance: "test-release"
+            app.kubernetes.io/version: "0.1.0"
+            helm.sh/chart: "console-0.1.0"
+  - it: should allow extra labels to be set
+    release:
+      name: test-release
+    set:
+      console.service.ingress.enabled: true
+      console.service.ingress.secretName: "existingTestSecret"
+      console.service.ingress.extraLabels:
+        label1: "testLabel"
+        label2: "testLabel2"
+      env.DOMAIN: "domain.com"
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: kind
+          value: "Ingress"
+      - equal:
+          path: metadata.labels
+          value:
+            app.kubernetes.io/name: "stratos"
+            app.kubernetes.io/component: "console-ingress"
+            app.kubernetes.io/instance: "test-release"
+            app.kubernetes.io/version: "0.1.0"
+            helm.sh/chart: "console-0.1.0"
+            label1: "testLabel"
+            label2: "testLabel2"
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index 67b8c91c02..9503103673 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -32,6 +32,28 @@ console:
     # nodePort: 30000
     type: ClusterIP
     externalName:
+    ingress:
+      ## If true, Ingress will be created
+      enabled: false
+
+      ## Additional annotations
+      annotations: {}
+
+      ## Additional labels
+      extraLabels: {}
+
+      ## Host for the ingress
+      # Defaults to console.[env.Domain] if env.Domain is set and host is not
+      host:
+
+      # Name of secret containing TLS certificate
+      secretName:
+
+      # crt and key for TLS Certificate (this chart will create the secret based on these)
+      tls:
+        crt:
+        key:
+
     http:
       enabled: false
       servicePort: 80

From a9d354ae1343975bd02d8d31c5ac1b5fd27092c3 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 1 Oct 2019 11:50:03 +0100
Subject: [PATCH 112/648] Fix for local user update profile

---
 .gitignore                                    |  1 +
 build/tools/mysqldb-dev.sh                    | 46 +++++++++++++++++++
 build/tools/postgres-dev.sh                   | 27 +++++++++++
 deploy/db/dbconf.yml                          |  6 +++
 .../20190930092500_LocalUsersTriggerFix.go    | 31 +++++++++++++
 src/jetstream/default.config.properties       | 18 +++++++-
 .../repository/localusers/psql_localusers.go  |  8 ++--
 7 files changed, 132 insertions(+), 5 deletions(-)
 create mode 100755 build/tools/mysqldb-dev.sh
 create mode 100755 build/tools/postgres-dev.sh
 create mode 100644 src/jetstream/datastore/20190930092500_LocalUsersTriggerFix.go

diff --git a/.gitignore b/.gitignore
index ada922f429..409ad5df8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,6 +90,7 @@ e2e-reports/
 src/jetstream/jetstream
 src/jetstream/console-database.db
 src/jetstream/config.properties
+src/jetstream/db/dbconf.yml
 
 # Customisations
 
diff --git a/build/tools/mysqldb-dev.sh b/build/tools/mysqldb-dev.sh
new file mode 100755
index 0000000000..47d8164b0c
--- /dev/null
+++ b/build/tools/mysqldb-dev.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+
+echo "Startind MariaDB database for development"
+
+STRATOS_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && cd ../.. && pwd)"
+echo $STRATOS_PATH
+
+docker stop stratos-db
+docker rm stratos-db
+
+ID=$(docker run --name stratos-db -d -e MYSQL_ROOT_PASSWORD=dbroot -p 3306:3306 splatform/stratos-mariadb)
+echo $ID
+
+rm -f dbsetup.sql init.sh
+cat <<EOF > dbsetup.sql
+CREATE DATABASE stratosdb;
+CREATE USER stratos IDENTIFIED BY 'strat0s';
+GRANT ALL PRIVILEGES ON stratosdb.* to 'stratos'@'%';
+EOF
+
+cat <<EOF > init.sh
+#!/usr/bin/env bash
+mysql -uroot -pdbroot < /dbsetup.sql
+EOF
+
+chmod +x init.sh
+docker cp ./dbsetup.sql ${ID}:/dbsetup.sql
+docker cp ./init.sh ${ID}:/init.sh
+rm dbsetup.sql init.sh
+
+echo "Just waiting a few seconds for the DB to come online ..."
+sleep 20
+
+docker exec -t ${ID} /init.sh
+
+echo "Database ready"
+
+mkdir -p ${STRATOS_PATH}/src/jetstream/db
+cp ${STRATOS_PATH}/deploy/db/dbconf.yml ${STRATOS_PATH}/src/jetstream/db
+
+if [ -f ${STRATOS_PATH}/src/jetstream/jetstream ]; then
+  ${STRATOS_PATH}/src/jetstream/jetstream --env=mariadb-dev up
+else
+  echo "Build the Stratos backend and run db migrations with:"
+  echo "  ./jetstream --env=mariadb-local up"
+fi
diff --git a/build/tools/postgres-dev.sh b/build/tools/postgres-dev.sh
new file mode 100755
index 0000000000..304fbe8b8e
--- /dev/null
+++ b/build/tools/postgres-dev.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+echo "Startind Postgres database for development"
+
+STRATOS_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && cd ../.. && pwd)"
+echo $STRATOS_PATH
+
+docker stop stratos-db
+docker rm stratos-db
+
+ID=$(docker run --name stratos-db -d -e POSTGRES_DB=stratosdb -e POSTGRES_USER=stratos -e POSTGRES_PASSWORD=strat0s -p 5432:5432 postgres)
+echo $ID
+
+echo "Just waiting a few seconds for the DB to come online ..."
+sleep 5
+
+echo "Database ready"
+
+mkdir -p ${STRATOS_PATH}/src/jetstream/db
+cp ${STRATOS_PATH}/deploy/db/dbconf.yml ${STRATOS_PATH}/src/jetstream/db
+
+if [ -f ${STRATOS_PATH}/src/jetstream/jetstream ]; then
+  ${STRATOS_PATH}/src/jetstream/jetstream --env=postgres-dev up
+else
+  echo "Build the Stratos backend and run db migrations with:"
+  echo "  ./jetstream --env=postgres-local up"
+fi
diff --git a/deploy/db/dbconf.yml b/deploy/db/dbconf.yml
index 4c81fbb1a2..557d40e44e 100644
--- a/deploy/db/dbconf.yml
+++ b/deploy/db/dbconf.yml
@@ -10,3 +10,9 @@ mariadb-development:
 mariadb-k8s:
     driver: mysql
     open: $DB_USER:$DB_PASSWORD@tcp($DB_HOST:$DB_PORT)/$DB_DATABASE_NAME?parseTime=true
+mariadb-dev:
+    driver: mysql
+    open: stratos:strat0s@tcp(127.0.0.1:3306)/stratosdb?parseTime=true
+postgres-dev:
+    driver: postgres
+    open: host='127.0.0.1' port=5432 user='stratos' password='strat0s' dbname='stratosdb' sslmode='disable'
\ No newline at end of file
diff --git a/src/jetstream/datastore/20190930092500_LocalUsersTriggerFix.go b/src/jetstream/datastore/20190930092500_LocalUsersTriggerFix.go
new file mode 100644
index 0000000000..9fb6dccd0b
--- /dev/null
+++ b/src/jetstream/datastore/20190930092500_LocalUsersTriggerFix.go
@@ -0,0 +1,31 @@
+package datastore
+
+import (
+	"database/sql"
+	"strings"
+
+	"bitbucket.org/liamstask/goose/lib/goose"
+)
+
+func init() {
+	RegisterMigration(20190930092500, "LocalUsersTriggerFix", func(txn *sql.Tx, conf *goose.DBConf) error {
+
+		var dropTrigger string
+
+		if strings.Contains(conf.Driver.Name, "postgres") {
+			// POSTGRESQL
+			dropTrigger = "DROP TRIGGER update_trigger ON local_users;"
+		} else if strings.Contains(conf.Driver.Name, "mysql") {
+			// MYSQL
+			dropTrigger = "DROP TRIGGER update_last_updated;"
+		}
+
+		if len(dropTrigger) > 0 {
+			// Remove the trigger
+			_, err := txn.Exec(dropTrigger)
+			return err
+		}
+
+		return nil
+	})
+}
diff --git a/src/jetstream/default.config.properties b/src/jetstream/default.config.properties
index a7cb4f5a64..acac268bfb 100644
--- a/src/jetstream/default.config.properties
+++ b/src/jetstream/default.config.properties
@@ -37,4 +37,20 @@ INVITE_USER_CLIENT_SECRET=
 # AUTH_ENDPOINT_TYPE=local
 # LOCAL_USER=localuser
 # LOCAL_USER_PASSWORD=localuserpass
-# LOCAL_USER_SCOPE=stratos.admin
\ No newline at end of file
+# LOCAL_USER_SCOPE=stratos.admin
+
+# MariaDB database for local dev
+# DATABASE_PROVIDER=mysql
+# DB_HOST=127.0.0.1
+# DB_PORT=3306
+# DB_USER=stratos
+# DB_PASSWORD=strat0s
+# DB_DATABASE_NAME=stratosdb
+
+# Postgresql database for local dev
+# DATABASE_PROVIDER=pgsql
+# DB_HOST=127.0.0.1
+# DB_PORT=5432
+# DB_USER=stratos
+# DB_PASSWORD=strat0s
+# DB_DATABASE_NAME=stratosdb
diff --git a/src/jetstream/repository/localusers/psql_localusers.go b/src/jetstream/repository/localusers/psql_localusers.go
index 956e7c68ad..cb3cf0668e 100644
--- a/src/jetstream/repository/localusers/psql_localusers.go
+++ b/src/jetstream/repository/localusers/psql_localusers.go
@@ -17,7 +17,7 @@ var findPasswordHash = `SELECT password_hash
 var findUserGUID = `SELECT user_guid FROM local_users WHERE user_name = $1`
 var findUserScope = `SELECT user_scope FROM local_users WHERE user_guid = $1`
 var insertLocalUser = `INSERT INTO local_users (user_guid, password_hash, user_name, user_email, user_scope, given_name, family_name) VALUES ($1, $2, $3, $4, $5, $6, $7)`
-var updateLocalUser = `UPDATE local_users SET password_hash=$1, user_name=$2, user_email=$3, user_scope=$4, given_name=$5, family_name=$6 WHERE user_guid=$7`
+var updateLocalUser = `UPDATE local_users SET password_hash=$1, user_name=$2, user_email=$3, user_scope=$4, given_name=$5, family_name=$6, last_updated=now() WHERE user_guid=$7`
 var updateLastLoginTime = `UPDATE local_users SET last_login=$1 WHERE user_guid = $2`
 var findLastLoginTime = `SELECT last_login FROM local_users WHERE user_guid = $1`
 var getTableCount = `SELECT count(user_guid) FROM local_users`
@@ -112,9 +112,9 @@ func (p *PgsqlLocalUsersRepository) FindUser(userGUID string) (interfaces.LocalU
 
 	// temp vars to retrieve db data
 	var (
-		email sql.NullString
-		scope sql.NullString
-		givenName sql.NullString
+		email      sql.NullString
+		scope      sql.NullString
+		givenName  sql.NullString
 		familyName sql.NullString
 	)
 

From 26d079dd79c56fa304afe98673746ed02e69db5b Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 1 Oct 2019 16:31:27 +0100
Subject: [PATCH 113/648] Initial kube v3 migration

---
 .../kubernetes/kubernetes-entity-factory.ts   |  106 +
 .../kubernetes/kubernetes-entity-generator.ts |  228 ++
 .../kubernetes-tab-base.component.ts          |   18 +-
 .../custom/kubernetes/kubernetes.module.ts    |    9 +-
 .../kubernetes/kubernetes.setup.module.ts     |   64 +-
 .../kubernetes/kubernetes.store.module.ts     |  229 +-
 .../helm-release-pods-data-source.ts          |    2 +-
 .../kubernetes-apps-data-source.ts            |    2 +-
 ...ubernetes-endpoints-list-config.service.ts |    7 +-
 .../kubernetes-namespace-pods-data-source.ts  |    6 +-
 .../kubernetes-namespaces-data-source.ts      |    2 +-
 .../kubernetes-node-pods-data-source.ts       |    2 +-
 .../kubernetes-nodes-data-source.ts           |    2 +-
 .../kubernetes-pods-data-source.ts            |    2 +-
 .../pod-name-link/pod-name-link.component.ts  |   11 +-
 .../kubernetes-services-data-source.ts        |    2 +-
 .../pod-metrics/pod-metrics.component.ts      |    7 +-
 .../services/helm-release.service.ts          |    8 +-
 .../services/kubernetes-endpoint.service.ts   |   24 +-
 .../services/kubernetes-namespace.service.ts  |   11 +-
 .../services/kubernetes-node.service.ts       |   17 +-
 .../kubernetes/services/kubernetes.service.ts |   15 +-
 .../kubernetes/store/kubernetes.actions.ts    |   55 +-
 .../kubernetes/store/kubernetes.effects.ts    |   73 +-
 .../kubernetes/store/kubernetes.entities.ts   |  145 +-
 .../kubernetes-summary.component.ts           |   16 +-
 package-lock.json                             | 3468 ++++++++---------
 package.json                                  |    2 +-
 .../src/features/cloud-foundry/cf.helpers.ts  |   11 +-
 .../service-catalog/services-helper.ts        |    4 +-
 .../service-catalog/services.service.ts       |    2 +-
 .../add-service-instance.component.ts         |    2 +-
 .../add-service-instance/csi-mode.service.ts  |    2 +-
 .../packages/core/src/core/utils.service.ts   |   12 +
 .../create-endpoint-cf-step-1.component.ts    |    2 +-
 .../create-endpoint.component.ts              |    2 +-
 .../metrics/metrics/metrics.component.ts      |    2 +-
 .../list-data-source-config.ts                |    4 +-
 .../list-data-source.ts                       |    4 +-
 .../endpoint-card/endpoint-card.component.ts  |    3 +-
 40 files changed, 2459 insertions(+), 2124 deletions(-)
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts

diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts
new file mode 100644
index 0000000000..4e387b6534
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts
@@ -0,0 +1,106 @@
+import { Schema, schema } from 'normalizr';
+
+import { getAPIResourceGuid } from '../../../../cloud-foundry/src/store/selectors/api.selectors';
+import { EntitySchema } from '../../../../store/src/helpers/entity-schema';
+import { getKubeAPIResourceGuid } from './store/kube.selectors';
+import { KubernetesApp } from './store/kube.types';
+
+export const kubernetesSchemaKey = 'kubernetesInfo';
+export const kubernetesNodesSchemaKey = 'kubernetesNode';
+export const kubernetesPodsSchemaKey = 'kubernetesPod';
+export const kubernetesNamespacesSchemaKey = 'kubernetesNamespace';
+export const kubernetesServicesSchemaKey = 'kubernetesService';
+export const kubernetesStatefulSetsSchemaKey = 'kubernetesStatefulSet';
+export const kubernetesDeploymentsSchemaKey = 'kubernetesDeployment';
+export const kubernetesAppsSchemaKey = 'kubernetesApp';
+export const kubernetesDashboardSchemaKey = 'kubernetesDashboard';
+
+export const getKubeAppId = (object: KubernetesApp) => object.name;
+
+export const KUBERNETES_ENDPOINT_TYPE = 'k8s';
+
+const entityCache: {
+  [key: string]: EntitySchema
+} = {};
+
+export class KubernetesEntitySchema extends EntitySchema {
+  /**
+   * @param entityKey As per schema.Entity ctor
+   * @param [definition] As per schema.Entity ctor
+   * @param [options] As per schema.Entity ctor
+   * @param [relationKey] Allows multiple children of the same type within a single parent entity. For instance user with developer
+   * spaces, manager spaces, auditor space, etc
+   */
+  constructor(
+    entityKey: string,
+    definition?: Schema,
+    options?: schema.EntityOptions,
+    relationKey?: string
+  ) {
+    super(entityKey, KUBERNETES_ENDPOINT_TYPE, definition, options, relationKey);
+  }
+}
+
+
+entityCache[kubernetesSchemaKey] = new KubernetesEntitySchema(
+  kubernetesSchemaKey,
+  {},
+  { idAttribute: getAPIResourceGuid }
+);
+
+entityCache[kubernetesAppsSchemaKey] = new KubernetesEntitySchema(
+  kubernetesAppsSchemaKey,
+  {},
+  { idAttribute: getKubeAppId }
+);
+
+entityCache[kubernetesStatefulSetsSchemaKey] = new KubernetesEntitySchema(
+  kubernetesStatefulSetsSchemaKey,
+  {},
+  { idAttribute: getKubeAPIResourceGuid }
+);
+
+entityCache[kubernetesPodsSchemaKey] = new KubernetesEntitySchema(
+  kubernetesPodsSchemaKey,
+  {},
+  { idAttribute: getKubeAPIResourceGuid }
+);
+
+entityCache[kubernetesDeploymentsSchemaKey] = new KubernetesEntitySchema(
+  kubernetesDeploymentsSchemaKey,
+  {},
+  { idAttribute: getKubeAPIResourceGuid }
+);
+
+entityCache[kubernetesNodesSchemaKey] = new KubernetesEntitySchema(
+  kubernetesNodesSchemaKey,
+  {},
+  { idAttribute: getKubeAPIResourceGuid }
+);
+
+entityCache[kubernetesNamespacesSchemaKey] = new KubernetesEntitySchema(
+  kubernetesNamespacesSchemaKey,
+  {},
+  { idAttribute: getKubeAPIResourceGuid }
+);
+
+entityCache[kubernetesServicesSchemaKey] = new KubernetesEntitySchema(
+  kubernetesServicesSchemaKey,
+  {},
+  { idAttribute: getKubeAPIResourceGuid }
+);
+
+entityCache[kubernetesDashboardSchemaKey] = new KubernetesEntitySchema(
+  kubernetesDashboardSchemaKey,
+  {},
+  { idAttribute: getKubeAPIResourceGuid }
+);
+
+
+export function kubernetesEntityFactory(key: string): EntitySchema {
+  const entity = entityCache[key];
+  if (!entity) {
+    throw new Error(`Unknown entity schema type: ${key}`);
+  }
+  return entity;
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
new file mode 100644
index 0000000000..fa1d785a48
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
@@ -0,0 +1,228 @@
+import { Validators } from '@angular/forms';
+
+import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types';
+import {
+  StratosBaseCatalogueEntity,
+  StratosCatalogueEndpointEntity,
+  StratosCatalogueEntity,
+} from '../../core/entity-catalogue/entity-catalogue-entity';
+import { StratosEndpointExtensionDefinition } from '../../core/entity-catalogue/entity-catalogue.types';
+import { EndpointAuthTypeConfig, EndpointType } from '../../core/extension/extension-types';
+import { KubernetesAWSAuthFormComponent } from './auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component';
+import {
+  KubernetesCertsAuthFormComponent,
+} from './auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component';
+import {
+  KubernetesConfigAuthFormComponent,
+} from './auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component';
+import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component';
+import {
+  KUBERNETES_ENDPOINT_TYPE,
+  kubernetesDashboardSchemaKey,
+  kubernetesDeploymentsSchemaKey,
+  kubernetesEntityFactory,
+  kubernetesNamespacesSchemaKey,
+  kubernetesNodesSchemaKey,
+  kubernetesPodsSchemaKey,
+  kubernetesSchemaKey,
+  kubernetesServicesSchemaKey,
+  kubernetesStatefulSetsSchemaKey,
+} from './kubernetes-entity-factory';
+import { KubernetesApp } from './store/kube.types';
+
+const enum KubeEndpointAuthTypes {
+  CERT_AUTH = 'kube-cert-auth',
+  CONFIG = 'kubeconfig',
+  CONFIG_AZ = 'kubeconfig-az',
+  AWS_IAM = 'aws-iam',
+  GKE = 'gke-auth'
+}
+
+const kubeAuthTypeMap: { [type: string]: EndpointAuthTypeConfig } = {
+  [KubeEndpointAuthTypes.CERT_AUTH]: {
+    value: KubeEndpointAuthTypes.CERT_AUTH,
+    name: 'Kubernetes Cert Auth',
+    form: {
+      cert: ['', Validators.required],
+      certKey: ['', Validators.required],
+    },
+    types: new Array<EndpointType>(),
+    component: KubernetesCertsAuthFormComponent
+  },
+  [KubeEndpointAuthTypes.CONFIG]: {
+    value: KubeEndpointAuthTypes.CONFIG,
+    name: 'CAASP (OIDC)',
+    form: {
+      kubeconfig: ['', Validators.required],
+    },
+    types: new Array<EndpointType>(),
+    component: KubernetesConfigAuthFormComponent
+  },
+  [KubeEndpointAuthTypes.CONFIG_AZ]: {
+    value: KubeEndpointAuthTypes.CONFIG_AZ,
+    name: 'Azure AKS',
+    form: {
+      kubeconfig: ['', Validators.required],
+    },
+    types: new Array<EndpointType>(),
+    component: KubernetesConfigAuthFormComponent
+  },
+  [KubeEndpointAuthTypes.AWS_IAM]: {
+    value: KubeEndpointAuthTypes.AWS_IAM,
+    name: 'AWS IAM (EKS)',
+    form: {
+      cluster: ['', Validators.required],
+      access_key: ['', Validators.required],
+      secret_key: ['', Validators.required],
+    },
+    types: new Array<EndpointType>(),
+    component: KubernetesAWSAuthFormComponent
+  },
+  [KubeEndpointAuthTypes.GKE]: {
+    value: KubeEndpointAuthTypes.GKE,
+    name: 'GKE',
+    form: {
+      gkeconfig: ['', Validators.required],
+    },
+    types: new Array<EndpointType>(),
+    component: KubernetesGKEAuthFormComponent,
+    help: '/core/assets/custom/help/en/connecting_gke.md'
+  }
+};
+
+
+// export interface EndpointAuthTypeConfig {
+//   name: string;
+//   value: string;
+//   formType?: string;
+//   types: Array<EndpointType>;
+//   form?: any;
+//   data?: any;
+//   component: Type<IAuthForm>;
+//   help?: string;
+// }
+
+export function generateKubernetesEntities(): StratosBaseCatalogueEntity[] {
+  const endpointDefinition: StratosEndpointExtensionDefinition = {
+    type: KUBERNETES_ENDPOINT_TYPE,
+    label: 'Kubernetes',
+    labelPlural: 'Kubernetes',
+    icon: 'kubernetes',
+    iconFont: 'stratos-icons',
+    logoUrl: '/core/assets/custom/kubernetes.svg',
+    urlValidation: undefined,
+    authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.CERT_AUTH]],
+    renderPriority: 4,
+    subTypes: [{
+      type: 'caasp',
+      label: 'SUSE CaaS Platform',
+      authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.CONFIG]],
+      logoUrl: '/core/assets/custom/caasp.png'
+    }, {
+      type: 'aks',
+      label: 'Azure AKS',
+      authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.CONFIG_AZ]],
+      logoUrl: '/core/assets/custom/aks.svg'
+    }, {
+      type: 'eks',
+      label: 'Amazon EKS',
+      authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.AWS_IAM]],
+      logoUrl: '/core/assets/custom/eks.svg'
+    }, {
+      type: 'gke',
+      label: 'Google Kubernetes Engine',
+      authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.GKE]],
+      logoUrl: '/core/assets/custom/gke.svg'
+    }],
+  };
+  return [
+    generateEndpointEntity(endpointDefinition),
+    generateAppEntity(endpointDefinition),
+    generateStatefulSetsEntity(endpointDefinition),
+    generatePodsEntity(endpointDefinition),
+    generateDeploymentsEntity(endpointDefinition),
+    generateNodesEntity(endpointDefinition),
+    generateNamespacesEntity(endpointDefinition),
+    generateServicesEntity(endpointDefinition),
+    generateDashboardEntity(endpointDefinition),
+  ];
+}
+
+function generateEndpointEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  return new StratosCatalogueEndpointEntity(
+    endpointDefinition,
+    metadata => `/cloud-foundry/${metadata.guid}`, // TODO: RC
+  );
+}
+
+function generateAppEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: kubernetesSchemaKey,
+    schema: kubernetesEntityFactory(kubernetesSchemaKey),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesApp>(definition);
+}
+
+function generateStatefulSetsEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: kubernetesStatefulSetsSchemaKey,
+    schema: kubernetesEntityFactory(kubernetesStatefulSetsSchemaKey),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesApp>(definition);
+}
+
+function generatePodsEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: kubernetesPodsSchemaKey,
+    schema: kubernetesEntityFactory(kubernetesPodsSchemaKey),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesApp>(definition);
+}
+
+function generateDeploymentsEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: kubernetesDeploymentsSchemaKey,
+    schema: kubernetesEntityFactory(kubernetesDeploymentsSchemaKey),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesApp>(definition);
+}
+
+function generateNodesEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: kubernetesNodesSchemaKey,
+    schema: kubernetesEntityFactory(kubernetesNodesSchemaKey),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesApp>(definition);
+}
+
+function generateNamespacesEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: kubernetesNamespacesSchemaKey,
+    schema: kubernetesEntityFactory(kubernetesNamespacesSchemaKey),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesApp>(definition);
+}
+
+function generateServicesEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: kubernetesServicesSchemaKey,
+    schema: kubernetesEntityFactory(kubernetesServicesSchemaKey),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesApp>(definition);
+}
+
+function generateDashboardEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: kubernetesDashboardSchemaKey,
+    schema: kubernetesEntityFactory(kubernetesDashboardSchemaKey),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesApp>(definition);
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
index c954603b71..3e4f043918 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
@@ -1,11 +1,13 @@
-import { Component, OnInit, Injectable } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Observable, of as ObservableOf } from 'rxjs';
-import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
-import { BaseKubeGuid } from '../kubernetes-page.types';
-import { KubernetesService } from '../services/kubernetes.service';
 import { first, map } from 'rxjs/operators';
+
 import { UserFavoriteEndpoint } from '../../../../../store/src/types/user-favorites.types';
+import { FavoritesConfigMapper } from '../../../shared/components/favorites-meta-card/favorite-config-mapper';
+import { BaseKubeGuid } from '../kubernetes-page.types';
+import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
+import { KubernetesService } from '../services/kubernetes.service';
 
 @Component({
   selector: 'app-kubernetes-tab-base',
@@ -40,15 +42,15 @@ export class KubernetesTabBaseComponent implements OnInit {
   isFetching$: Observable<boolean>;
   public favorite$: Observable<UserFavoriteEndpoint>;
 
-  constructor(public kubeEndpointService: KubernetesEndpointService) { }
+  constructor(
+    public kubeEndpointService: KubernetesEndpointService,
+    public favoritesConfigMapper: FavoritesConfigMapper) { }
 
   ngOnInit() {
     this.isFetching$ = ObservableOf(false);
     this.favorite$ = this.kubeEndpointService.endpoint$.pipe(
       first(),
-      map(endpoint => new UserFavoriteEndpoint(
-        endpoint.entity
-      ))
+      map(endpoint => this.favoritesConfigMapper.getFavoriteEndpointFromEntity(endpoint.entity))
     );
   }
 
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
index 5eb62e9208..2554398cc0 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
@@ -4,10 +4,8 @@ import { NgModule } from '@angular/core';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
 import { CoreModule } from '../../core/core.module';
+import { EntityCatalogueModule } from '../../core/entity-catalogue.module';
 import { SharedModule } from '../../shared/shared.module';
-import {
-  KubernetesServicePortsComponent,
-} from './list-types/kubernetes-service-ports/kubernetes-service-ports.component';
 import { KubernetesReleasePodsTabComponent } from './helm-release/helm-release-pods-tab/helm-release-pods-tab.component';
 import { HelmReleaseServicesComponent } from './helm-release/helm-release-services/helm-release-services.component';
 import {
@@ -16,6 +14,7 @@ import {
 import { HelmReleaseSummaryComponent } from './helm-release/helm-release-summary/helm-release-summary.component';
 import { HelmReleaseComponent } from './helm-release/helm-release.component';
 import { KubernetesDashboardTabComponent } from './kubernetes-dashboard/kubernetes-dashboard.component';
+import { generateKubernetesEntities } from './kubernetes-entity-generator';
 import {
   KubernetesNamespacePodsComponent,
 } from './kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component';
@@ -52,7 +51,7 @@ import {
 import {
   ConditionCellComponent,
   InverseConditionCellComponent,
-  SubtleConditionCellComponent
+  SubtleConditionCellComponent,
 } from './list-types/kubernetes-nodes/condition-cell/condition-cell.component';
 import {
   KubernetesNodeCapacityComponent,
@@ -81,6 +80,7 @@ import {
 import { NodePodCountComponent } from './list-types/kubernetes-nodes/node-pod-count/node-pod-count.component';
 import { KubernetesPodTagsComponent } from './list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component';
 import { PodNameLinkComponent } from './list-types/kubernetes-pods/pod-name-link/pod-name-link.component';
+import { KubernetesServicePortsComponent } from './list-types/kubernetes-service-ports/kubernetes-service-ports.component';
 import { PodMetricsComponent } from './pod-metrics/pod-metrics.component';
 import { HelmReleaseService } from './services/helm-release.service';
 import { KubernetesEndpointService } from './services/kubernetes-endpoint.service';
@@ -101,6 +101,7 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     SharedModule,
     NgxChartsModule,
     KubernetesRoutingModule,
+    EntityCatalogueModule.forFeature(generateKubernetesEntities),
   ],
   declarations: [
     KubernetesComponent,
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
index 3c71951b2e..565ed70742 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
@@ -1,20 +1,19 @@
-import { favoritesConfigMapper, FavoriteConfig } from './../../shared/components/favorites-meta-card/favorite-config-mapper';
+import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
+import { EffectsModule } from '@ngrx/effects';
 
+import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types';
 import { CoreModule } from '../../core/core.module';
-import { CommonModule } from '@angular/common';
 import { SharedModule } from '../../shared/shared.module';
-import { KubernetesCertsAuthFormComponent } from './auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component';
 import { KubernetesAWSAuthFormComponent } from './auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component';
-import { KubernetesConfigAuthFormComponent } from './auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component';
+import {
+  KubernetesCertsAuthFormComponent,
+} from './auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component';
+import {
+  KubernetesConfigAuthFormComponent,
+} from './auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component';
 import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component';
-import { EffectsModule } from '@ngrx/effects';
 import { KubernetesEffects } from './store/kubernetes.effects';
-import { KubernetesStoreModule } from './kubernetes.store.module';
-import { EndpointModel } from '../../../../store/src/types/endpoint.types';
-import { IEndpointFavMetadata, IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types';
-import { endpointSchemaKey } from '../../../../store/src/helpers/entity-factory';
-import { getFullEndpointApiUrl } from '../../features/endpoints/endpoint-helpers';
 
 export interface IK8FavMetadata extends IFavoriteMetadata {
   guid: string;
@@ -27,7 +26,7 @@ export interface IK8FavMetadata extends IFavoriteMetadata {
     CoreModule,
     CommonModule,
     SharedModule,
-    KubernetesStoreModule,
+    // KubernetesStoreModule,
     EffectsModule.forFeature([
       KubernetesEffects
     ])
@@ -48,27 +47,28 @@ export interface IK8FavMetadata extends IFavoriteMetadata {
 export class KubernetesSetupModule {
   constructor() {
     const endpointType = 'k8s';
-    favoritesConfigMapper.registerFavoriteConfig<EndpointModel, IK8FavMetadata>(
-      new FavoriteConfig({
-        endpointType,
-        entityType: endpointSchemaKey
-      },
-        'Kubernetes',
-        (endpoint: IK8FavMetadata) => ({
-          type: endpointType,
-          routerLink: `/kubernetes/${endpoint.guid}`,
-          lines: [
-            ['Address', endpoint.address]
-          ],
-          name: endpoint.name,
-        }),
-        endpoint => ({
-          guid: endpoint.guid,
-          name: endpoint.name,
-          address: getFullEndpointApiUrl(endpoint),
-        })
-      )
-    );
+    // TODO: RC
+    // favoritesConfigMapper.registerFavoriteConfig<EndpointModel, IK8FavMetadata>(
+    //   new FavoriteConfig({
+    //     endpointType,
+    //     entityType: endpointSchemaKey
+    //   },
+    //     'Kubernetes',
+    //     (endpoint: IK8FavMetadata) => ({
+    //       type: endpointType,
+    //       routerLink: `/kubernetes/${endpoint.guid}`,
+    //       lines: [
+    //         ['Address', endpoint.address]
+    //       ],
+    //       name: endpoint.name,
+    //     }),
+    //     endpoint => ({
+    //       guid: endpoint.guid,
+    //       name: endpoint.name,
+    //       address: getFullEndpointApiUrl(endpoint),
+    //     })
+    //   )
+    // );
   }
 
 
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.store.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.store.module.ts
index 2b8b07f2f4..f15bb4c66f 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.store.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.store.module.ts
@@ -1,120 +1,121 @@
-import { NgModule } from '@angular/core';
-import { Validators } from '@angular/forms';
+// TODO: RC DELETE ME
+// import { NgModule } from '@angular/core';
+// import { Validators } from '@angular/forms';
 
-import { CoreModule } from '../../core/core.module';
-import { StratosExtension } from '../../core/extension/extension-service';
-import { EndpointAuthTypeConfig, EndpointType, EndpointTypeExtensionConfig } from '../../core/extension/extension-types';
-import { KubernetesAWSAuthFormComponent } from './auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component';
-import {
-  KubernetesCertsAuthFormComponent,
-} from './auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component';
-import {
-  KubernetesConfigAuthFormComponent,
-} from './auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component';
-import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component';
-import { kubernetesEntities, kubernetesEntityKeys } from './store/kubernetes.entities';
+// import { CoreModule } from '../../core/core.module';
+// import { StratosExtension } from '../../core/extension/extension-service';
+// import { EndpointAuthTypeConfig, EndpointType, EndpointTypeExtensionConfig } from '../../core/extension/extension-types';
+// import { KubernetesAWSAuthFormComponent } from './auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component';
+// import {
+//   KubernetesCertsAuthFormComponent,
+// } from './auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component';
+// import {
+//   KubernetesConfigAuthFormComponent,
+// } from './auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component';
+// import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component';
+// import { kubernetesEntities, kubernetesEntityKeys } from './store/kubernetes.entities';
 
-const enum KubeEndpointAuthTypes {
-  CERT_AUTH = 'kube-cert-auth',
-  CONFIG = 'kubeconfig',
-  CONFIG_AZ = 'kubeconfig-az',
-  AWS_IAM = 'aws-iam',
-  GKE = 'gke-auth'
-}
+// const enum KubeEndpointAuthTypes {
+//   CERT_AUTH = 'kube-cert-auth',
+//   CONFIG = 'kubeconfig',
+//   CONFIG_AZ = 'kubeconfig-az',
+//   AWS_IAM = 'aws-iam',
+//   GKE = 'gke-auth'
+// }
 
-const kubernetesEndpointTypes: EndpointTypeExtensionConfig[] = [{
-  type: 'k8s',
-  label: 'Kubernetes',
-  subTypes: [{
-    subType: 'caasp',
-    label: 'SUSE CaaS Platform',
-    authTypes: [KubeEndpointAuthTypes.CONFIG],
-    imagePath: '/core/assets/custom/caasp.png'
-  }, {
-    subType: 'aks',
-    label: 'Azure AKS',
-    authTypes: [KubeEndpointAuthTypes.CONFIG_AZ],
-    imagePath: '/core/assets/custom/aks.svg'
-  }, {
-    subType: 'eks',
-    label: 'Amazon EKS',
-    authTypes: [KubeEndpointAuthTypes.AWS_IAM],
-    imagePath: '/core/assets/custom/eks.svg'
-  }, {
-    subType: 'gke',
-    label: 'Google Kubernetes Engine',
-    authTypes: [KubeEndpointAuthTypes.GKE],
-    imagePath: '/core/assets/custom/gke.svg'
-  }],
-  authTypes: [KubeEndpointAuthTypes.CERT_AUTH],
-  icon: 'kubernetes',
-  iconFont: 'stratos-icons',
-  imagePath: '/core/assets/custom/kubernetes.svg',
-  homeLink: (guid) => ['/kubernetes', guid],
-  entitySchemaKeys: kubernetesEntityKeys,
-  order: 4
-}];
+// const kubernetesEndpointTypes: EndpointTypeExtensionConfig[] = [{
+//   type: 'k8s',
+//   label: 'Kubernetes',
+//   subTypes: [{
+//     subType: 'caasp',
+//     label: 'SUSE CaaS Platform',
+//     authTypes: [KubeEndpointAuthTypes.CONFIG],
+//     imagePath: '/core/assets/custom/caasp.png'
+//   }, {
+//     subType: 'aks',
+//     label: 'Azure AKS',
+//     authTypes: [KubeEndpointAuthTypes.CONFIG_AZ],
+//     imagePath: '/core/assets/custom/aks.svg'
+//   }, {
+//     subType: 'eks',
+//     label: 'Amazon EKS',
+//     authTypes: [KubeEndpointAuthTypes.AWS_IAM],
+//     imagePath: '/core/assets/custom/eks.svg'
+//   }, {
+//     subType: 'gke',
+//     label: 'Google Kubernetes Engine',
+//     authTypes: [KubeEndpointAuthTypes.GKE],
+//     imagePath: '/core/assets/custom/gke.svg'
+//   }],
+//   authTypes: [KubeEndpointAuthTypes.CERT_AUTH],
+//   icon: 'kubernetes',
+//   iconFont: 'stratos-icons',
+//   imagePath: '/core/assets/custom/kubernetes.svg',
+//   homeLink: (guid) => ['/kubernetes', guid],
+//   entitySchemaKeys: kubernetesEntityKeys,
+//   order: 4
+// }];
 
 
-const kubernetesAuthTypes: EndpointAuthTypeConfig[] = [{
-  value: KubeEndpointAuthTypes.CONFIG,
-  name: 'CAASP (OIDC)',
-  form: {
-    kubeconfig: ['', Validators.required],
-  },
-  types: new Array<EndpointType>(),
-  component: KubernetesConfigAuthFormComponent
-},
-{
-  value: KubeEndpointAuthTypes.CONFIG_AZ,
-  name: 'Azure AKS',
-  form: {
-    kubeconfig: ['', Validators.required],
-  },
-  types: new Array<EndpointType>(),
-  component: KubernetesConfigAuthFormComponent
-},
-{
-  value: KubeEndpointAuthTypes.AWS_IAM,
-  name: 'AWS IAM (EKS)',
-  form: {
-    cluster: ['', Validators.required],
-    access_key: ['', Validators.required],
-    secret_key: ['', Validators.required],
-  },
-  types: new Array<EndpointType>(),
-  component: KubernetesAWSAuthFormComponent
-},
-{
-  value: KubeEndpointAuthTypes.CERT_AUTH,
-  name: 'Kubernetes Cert Auth',
-  form: {
-    cert: ['', Validators.required],
-    certKey: ['', Validators.required],
-  },
-  types: new Array<EndpointType>(),
-  component: KubernetesCertsAuthFormComponent
-},
-{
-  value: KubeEndpointAuthTypes.GKE,
-  name: 'GKE',
-  form: {
-    gkeconfig: ['', Validators.required],
-  },
-  types: new Array<EndpointType>(),
-  component: KubernetesGKEAuthFormComponent,
-  help: '/core/assets/custom/help/en/connecting_gke.md'
-}
-];
+// const kubernetesAuthTypes: EndpointAuthTypeConfig[] = [{
+//   value: KubeEndpointAuthTypes.CONFIG,
+//   name: 'CAASP (OIDC)',
+//   form: {
+//     kubeconfig: ['', Validators.required],
+//   },
+//   types: new Array<EndpointType>(),
+//   component: KubernetesConfigAuthFormComponent
+// },
+// {
+//   value: KubeEndpointAuthTypes.CONFIG_AZ,
+//   name: 'Azure AKS',
+//   form: {
+//     kubeconfig: ['', Validators.required],
+//   },
+//   types: new Array<EndpointType>(),
+//   component: KubernetesConfigAuthFormComponent
+// },
+// {
+//   value: KubeEndpointAuthTypes.AWS_IAM,
+//   name: 'AWS IAM (EKS)',
+//   form: {
+//     cluster: ['', Validators.required],
+//     access_key: ['', Validators.required],
+//     secret_key: ['', Validators.required],
+//   },
+//   types: new Array<EndpointType>(),
+//   component: KubernetesAWSAuthFormComponent
+// },
+// {
+//   value: KubeEndpointAuthTypes.CERT_AUTH,
+//   name: 'Kubernetes Cert Auth',
+//   form: {
+//     cert: ['', Validators.required],
+//     certKey: ['', Validators.required],
+//   },
+//   types: new Array<EndpointType>(),
+//   component: KubernetesCertsAuthFormComponent
+// },
+// {
+//   value: KubeEndpointAuthTypes.GKE,
+//   name: 'GKE',
+//   form: {
+//     gkeconfig: ['', Validators.required],
+//   },
+//   types: new Array<EndpointType>(),
+//   component: KubernetesGKEAuthFormComponent,
+//   help: '/core/assets/custom/help/en/connecting_gke.md'
+// }
+// ];
 
-@StratosExtension({
-  endpointTypes: kubernetesEndpointTypes,
-  authTypes: kubernetesAuthTypes,
-  entities: kubernetesEntities,
-})
-@NgModule({
-  imports: [
-    CoreModule
-  ]
-})
-export class KubernetesStoreModule { }
+// @StratosExtension({
+//   endpointTypes: kubernetesEndpointTypes,
+//   authTypes: kubernetesAuthTypes,
+//   entities: kubernetesEntities,
+// })
+// @NgModule({
+//   imports: [
+//     CoreModule
+//   ]
+// })
+// export class KubernetesStoreModule { }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts
index 815fff05f7..12cf4eb6cc 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts
@@ -5,11 +5,11 @@ import { AppState } from '../../../../../../store/src/app-state';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
 import { getHelmReleaseServiceId } from '../../../helm/store/helm.entities';
+import { kubernetesPodsSchemaKey } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { HelmReleaseService } from '../../services/helm-release.service';
 import { KubernetesPod } from '../../store/kube.types';
 import { GetKubernetesReleasePods } from '../../store/kubernetes.actions';
-import { kubernetesPodsSchemaKey } from '../../store/kubernetes.entities';
 
 
 
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-data-source.ts
index 80973983a4..b452e3620b 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-data-source.ts
@@ -5,10 +5,10 @@ import { AppState } from '../../../../../../store/src/app-state';
 import { entityFactory } from '../../../../../../store/src/helpers/entity-factory';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
+import { getKubeAppId, kubernetesAppsSchemaKey } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesApp } from '../../store/kube.types';
 import { GetKubernetesApps } from '../../store/kubernetes.actions';
-import { getKubeAppId, kubernetesAppsSchemaKey } from '../../store/kubernetes.entities';
 
 
 export class KubernetesAppsDataSource extends ListDataSource<KubernetesApp> {
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
index 73f0cdd19f..7e5576ac06 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
@@ -8,7 +8,9 @@ import { BaseEndpointsDataSource } from '../../../../shared/components/list/list
 import {
   EndpointCardComponent,
 } from '../../../../shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component';
-import { endpointColumns } from '../../../../shared/components/list/list-types/endpoint/endpoints-list-config.service';
+import {
+  EndpointsListConfigService,
+} from '../../../../shared/components/list/list-types/endpoint/endpoints-list-config.service';
 import { IListConfig, ListViewTypes } from '../../../../shared/components/list/list.component.types';
 import { EntityMonitorFactory } from '../../../../shared/monitors/entity-monitor.factory.service';
 import { InternalEventMonitorFactory } from '../../../../shared/monitors/internal-event-monitor.factory';
@@ -36,8 +38,9 @@ export class KubernetesEndpointsListConfigService implements IListConfig<Endpoin
     paginationMonitorFactory: PaginationMonitorFactory,
     entityMonitorFactory: EntityMonitorFactory,
     internalEventMonitorFactory: InternalEventMonitorFactory,
+    endpointsListConfigService: EndpointsListConfigService
   ) {
-    this.columns = endpointColumns.filter(column => {
+    this.columns = endpointsListConfigService.columns.filter(column => {
       return column.columnId !== 'type';
     });
     this.dataSource = new KubernetesEndpointsDataSource(
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
index 76d5d10dfc..76eda77ea9 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
@@ -1,14 +1,14 @@
 import { Store } from '@ngrx/store';
 
-import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
-import { IListConfig } from '../../../../shared/components/list/list.component.types';
 import { AppState } from '../../../../../../store/src/app-state';
 import { entityFactory } from '../../../../../../store/src/helpers/entity-factory';
+import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
+import { IListConfig } from '../../../../shared/components/list/list.component.types';
+import { kubernetesPodsSchemaKey } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesNamespaceService } from '../../services/kubernetes-namespace.service';
 import { KubernetesPod } from '../../store/kube.types';
 import { GetKubernetesPodsInNamespace } from '../../store/kubernetes.actions';
-import { kubernetesPodsSchemaKey } from '../../store/kubernetes.entities';
 
 export class KubernetesNamespacePodsDataSource extends ListDataSource<KubernetesPod, any> {
 
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
index 82ea2b2d36..095f9d9596 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
@@ -5,11 +5,11 @@ import { AppState } from '../../../../../../store/src/app-state';
 import { entityFactory } from '../../../../../../store/src/helpers/entity-factory';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
+import { kubernetesNamespacesSchemaKey } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { KubernetesNamespace } from '../../store/kube.types';
 import { GetKubernetesNamespaces } from '../../store/kubernetes.actions';
-import { kubernetesNamespacesSchemaKey } from '../../store/kubernetes.entities';
 
 
 export class KubernetesNamespacesDataSource extends ListDataSource<KubernetesNamespace> {
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
index 3ae663f15b..41053ab8dc 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
@@ -4,12 +4,12 @@ import { AppState } from '../../../../../../store/src/app-state';
 import { entityFactory } from '../../../../../../store/src/helpers/entity-factory';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
+import { kubernetesPodsSchemaKey } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesNodeService } from '../../services/kubernetes-node.service';
 import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { KubernetesPod } from '../../store/kube.types';
 import { GetKubernetesPodsOnNode } from '../../store/kubernetes.actions';
-import { kubernetesPodsSchemaKey } from '../../store/kubernetes.entities';
 
 export class KubernetesNodePodsDataSource extends ListDataSource<KubernetesPod> {
 
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
index a64f8b5d5a..c721d7850a 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
@@ -5,11 +5,11 @@ import { AppState } from '../../../../../../store/src/app-state';
 import { entityFactory } from '../../../../../../store/src/helpers/entity-factory';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
+import { kubernetesNodesSchemaKey } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { KubernetesNode } from '../../store/kube.types';
 import { GetKubernetesNodes } from '../../store/kubernetes.actions';
-import { kubernetesNodesSchemaKey } from '../../store/kubernetes.entities';
 
 export class KubernetesNodesDataSource extends ListDataSource<KubernetesNode> {
 
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
index dd0d9a350c..139325afea 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
@@ -4,11 +4,11 @@ import { AppState } from '../../../../../../store/src/app-state';
 import { entityFactory } from '../../../../../../store/src/helpers/entity-factory';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
+import { kubernetesPodsSchemaKey } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { KubernetesPod } from '../../store/kube.types';
 import { GetKubernetesPods } from '../../store/kubernetes.actions';
-import { kubernetesPodsSchemaKey } from '../../store/kubernetes.entities';
 
 export class KubernetesPodsDataSource extends ListDataSource<KubernetesPod> {
 
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.ts
index 636b87ed1a..0b7495c562 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.ts
@@ -1,12 +1,13 @@
 import { Component, OnInit } from '@angular/core';
-import { KubernetesPod } from '../../../store/kube.types';
-import { TableCellCustom } from '../../../../../shared/components/list/list.types';
 import { ActivatedRoute } from '@angular/router';
-import { getIdFromRoute } from '../../../../../features/cloud-foundry/cf.helpers';
+import { Observable } from 'rxjs';
+import { first } from 'rxjs/operators';
+
 import { EndpointsService } from '../../../../../core/endpoints.service';
+import { getIdFromRoute } from '../../../../../core/utils.service';
+import { TableCellCustom } from '../../../../../shared/components/list/list.types';
 import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
-import { first } from 'rxjs/operators';
-import { Observable } from 'rxjs';
+import { KubernetesPod } from '../../../store/kube.types';
 
 @Component({
   selector: 'app-pod-name-link',
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services-data-source.ts
index 34f82af00d..6c3c6bd8e5 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services-data-source.ts
@@ -6,9 +6,9 @@ import { entityFactory } from '../../../../../store/src/helpers/entity-factory';
 import { PaginatedAction } from '../../../../../store/src/types/pagination.types';
 import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../shared/components/list/list.component.types';
+import { kubernetesServicesSchemaKey } from '../kubernetes-entity-factory';
 import { getKubeAPIResourceGuid } from '../store/kube.selectors';
 import { KubeService } from '../store/kube.types';
-import { kubernetesServicesSchemaKey } from '../store/kubernetes.entities';
 
 export class BaseKubernetesServicesDataSource extends ListDataSource<KubeService> {
 
diff --git a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts b/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
index 7712fb4e15..4d99a2de1b 100644
--- a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
@@ -6,12 +6,11 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
-import { entityFactory } from '../../../../../store/src/helpers/entity-factory';
 import { EntityInfo } from '../../../../../store/src/types/api.types';
 import { ChartSeries, IMetricMatrixResult } from '../../../../../store/src/types/base-metric.types';
 import { IMetricApplication } from '../../../../../store/src/types/metric.types';
 import { EntityServiceFactory } from '../../../core/entity-service-factory.service';
-import { getIdFromRoute } from '../../../features/cloud-foundry/cf.helpers';
+import { getIdFromRoute } from '../../../core/utils.service';
 import { MetricsConfig } from '../../../shared/components/metrics-chart/metrics-chart.component';
 import { MetricsLineChartConfig } from '../../../shared/components/metrics-chart/metrics-chart.types';
 import {
@@ -25,7 +24,6 @@ import { KubernetesEndpointService } from '../services/kubernetes-endpoint.servi
 import { KubernetesService } from '../services/kubernetes.service';
 import { KubernetesPod } from '../store/kube.types';
 import { FetchKubernetesMetricsAction, GetKubernetesPod } from '../store/kubernetes.actions';
-import { kubernetesPodsSchemaKey } from '../store/kubernetes.entities';
 
 @Component({
   selector: 'app-pod-metrics',
@@ -179,11 +177,8 @@ export class PodMetricsComponent {
       })
     );
     this.podEntity$ = this.entityServiceFactory.create<KubernetesPod>(
-      kubernetesPodsSchemaKey,
-      entityFactory(kubernetesPodsSchemaKey),
       this.podName,
       new GetKubernetesPod(this.podName, this.namespaceName, this.helmReleaseService.kubeGuid),
-      false
     ).entityObs$;
   }
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/services/helm-release.service.ts b/custom-src/frontend/app/custom/kubernetes/services/helm-release.service.ts
index a40b7a9944..c837dc80f7 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/helm-release.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/helm-release.service.ts
@@ -5,13 +5,11 @@ import { combineLatest, Observable } from 'rxjs';
 import { filter, first, map, share } from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
-import { entityFactory } from '../../../../../store/src/helpers/entity-factory';
 import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
-import { getIdFromRoute } from '../../../features/cloud-foundry/cf.helpers';
+import { getIdFromRoute } from '../../../core/utils.service';
 import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory';
 import { KubernetesApp, KubernetesDeployment, KubernetesPod, KubernetesStatefulSet, KubeService } from '../store/kube.types';
 import { GetKubernetesApps, GetKubernetesServices } from '../store/kubernetes.actions';
-import { kubernetesAppsSchemaKey, kubernetesServicesSchemaKey } from '../store/kubernetes.entities';
 import { KubernetesEndpointService } from './kubernetes-endpoint.service';
 
 @Injectable()
@@ -40,7 +38,7 @@ export class HelmReleaseService {
       action,
       paginationMonitor: this.paginationMonitorFactory.create(
         action.paginationKey,
-        entityFactory(kubernetesAppsSchemaKey)
+        action
       )
     }, true).entities$.pipe(
       filter(p => !!p),
@@ -65,7 +63,7 @@ export class HelmReleaseService {
       action: servicesAction,
       paginationMonitor: this.paginationMonitorFactory.create(
         servicesAction.paginationKey,
-        entityFactory(kubernetesServicesSchemaKey)
+        servicesAction
       )
     }, true).entities$.pipe(
       filter(p => !!p),
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
index ef3390f4fb..a799687219 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
@@ -5,13 +5,18 @@ import { filter, first, map, shareReplay, startWith, switchMap } from 'rxjs/oper
 
 import { GetAllEndpoints } from '../../../../../store/src/actions/endpoint.actions';
 import { AppState } from '../../../../../store/src/app-state';
-import { endpointSchemaKey, entityFactory } from '../../../../../store/src/helpers/entity-factory';
 import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { EntityInfo } from '../../../../../store/src/types/api.types';
 import { EndpointModel, EndpointUser } from '../../../../../store/src/types/endpoint.types';
 import { EntityService } from '../../../core/entity-service';
 import { EntityServiceFactory } from '../../../core/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory';
+import {
+  kubernetesDeploymentsSchemaKey,
+  kubernetesPodsSchemaKey,
+  kubernetesServicesSchemaKey,
+  kubernetesStatefulSetsSchemaKey,
+} from '../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../kubernetes-page.types';
 import { KubernetesDeployment, KubernetesPod, KubernetesStatefulSet, KubeService } from '../store/kube.types';
 import {
@@ -23,13 +28,6 @@ import {
   KubePaginationAction,
 } from '../store/kubernetes.actions';
 import { KubeDashboardStatus } from '../store/kubernetes.effects';
-import {
-  kubernetesDashboardSchemaKey,
-  kubernetesDeploymentsSchemaKey,
-  kubernetesPodsSchemaKey,
-  kubernetesServicesSchemaKey,
-  kubernetesStatefulSetsSchemaKey,
-} from '../store/kubernetes.entities';
 
 @Injectable()
 export class KubernetesEndpointService {
@@ -54,11 +52,8 @@ export class KubernetesEndpointService {
   ) {
     this.kubeGuid = baseKube.guid;
     this.kubeEndpointEntityService = this.entityServiceFactory.create(
-      endpointSchemaKey,
-      entityFactory(endpointSchemaKey),
       this.kubeGuid,
-      new GetAllEndpoints(),
-      false
+      new GetAllEndpoints()
     );
 
     this.constructCoreObservables();
@@ -102,11 +97,8 @@ export class KubernetesEndpointService {
     this.kubeDashboardEnabled$ = kubeDashboardEnabled$.pipe(
       filter(enabled => enabled),
       switchMap(() => this.entityServiceFactory.create<KubeDashboardStatus>(
-        kubernetesDashboardSchemaKey,
-        entityFactory(kubernetesDashboardSchemaKey),
         this.kubeGuid,
         new GetKubernetesDashboard(this.kubeGuid),
-        false
       ).waitForEntity$.pipe(map(status => status.entity.installed))
       ),
       startWith(false),
@@ -117,7 +109,7 @@ export class KubernetesEndpointService {
     return getPaginationObservables<T>({
       store: this.store,
       action: paginationAction,
-      paginationMonitor: this.paginationMonitorFactory.create(paginationAction.paginationKey, entityFactory(schemaKey))
+      paginationMonitor: this.paginationMonitorFactory.create(paginationAction.paginationKey, paginationAction)
     }, true).entities$.pipe(filter(p => !!p), first());
   }
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts
index d027bd0215..52bd7934c9 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts
@@ -4,15 +4,13 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, first, map, publishReplay } from 'rxjs/operators';
 
+import { AppState } from '../../../../../store/src/app-state';
 import { EntityServiceFactory } from '../../../core/entity-service-factory.service';
-import { getIdFromRoute } from '../../../features/cloud-foundry/cf.helpers';
+import { getIdFromRoute } from '../../../core/utils.service';
 import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory';
-import { AppState } from '../../../../../store/src/app-state';
-import { entityFactory } from '../../../../../store/src/helpers/entity-factory';
 import { KubernetesNamespace } from '../store/kube.types';
 import { GetKubernetesNamespace } from '../store/kubernetes.actions';
 import { KubernetesEndpointService } from './kubernetes-endpoint.service';
-import { kubernetesNamespacesSchemaKey } from '../store/kubernetes.entities';
 
 @Injectable()
 export class KubernetesNamespaceService {
@@ -32,16 +30,13 @@ export class KubernetesNamespaceService {
     this.kubeGuid = kubeEndpointService.kubeGuid;
 
     const namespaceEntity = this.entityServiceFactory.create<KubernetesNamespace>(
-      kubernetesNamespacesSchemaKey,
-      entityFactory(kubernetesNamespacesSchemaKey),
       this.namespaceName,
       new GetKubernetesNamespace(this.namespaceName, this.kubeGuid),
-      false
     );
 
     this.namespace$ = namespaceEntity.entityObs$.pipe(
       filter(p => !!p),
-      map(p => p.entity ),
+      map(p => p.entity),
       publishReplay(1),
       first()
     );
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts
index 1ee52988e1..7d8a349294 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts
@@ -4,19 +4,17 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, first, map, shareReplay } from 'rxjs/operators';
 
-import { EntityServiceFactory } from '../../../core/entity-service-factory.service';
-import { getIdFromRoute } from '../../../features/cloud-foundry/cf.helpers';
-import { EntityMonitorFactory } from '../../../shared/monitors/entity-monitor.factory.service';
-import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory';
 import { MetricQueryConfig, MetricsAction } from '../../../../../store/src/actions/metrics.actions';
 import { AppState } from '../../../../../store/src/app-state';
-import { entityFactory, metricSchemaKey } from '../../../../../store/src/helpers/entity-factory';
 import { EntityInfo } from '../../../../../store/src/types/api.types';
+import { EntityServiceFactory } from '../../../core/entity-service-factory.service';
+import { getIdFromRoute } from '../../../core/utils.service';
+import { EntityMonitorFactory } from '../../../shared/monitors/entity-monitor.factory.service';
+import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory';
+import { MetricQueryType } from '../../../shared/services/metrics-range-selector.types';
 import { KubernetesNode, MetricStatistic } from '../store/kube.types';
 import { FetchKubernetesMetricsAction, GetKubernetesNode } from '../store/kubernetes.actions';
 import { KubernetesEndpointService } from './kubernetes-endpoint.service';
-import { MetricQueryType } from '../../../shared/services/metrics-range-selector.types';
-import { kubernetesNodesSchemaKey } from '../store/kubernetes.entities';
 
 
 export enum KubeNodeMetric {
@@ -43,11 +41,8 @@ export class KubernetesNodeService {
     this.kubeGuid = kubeEndpointService.kubeGuid;
 
     const nodeEntityService = this.entityServiceFactory.create<KubernetesNode>(
-      kubernetesNodesSchemaKey,
-      entityFactory(kubernetesNodesSchemaKey),
       this.nodeName,
       new GetKubernetesNode(this.nodeName, this.kubeGuid),
-      false
     );
 
     this.node$ = nodeEntityService.entityObs$.pipe(
@@ -68,7 +63,7 @@ export class KubernetesNodeService {
     const query = `${metricStatistic}(${metricStatistic}_over_time(${metric}{kubernetes_io_hostname="${this.nodeName}"}[1h]))`;
     const metricsAction = new FetchKubernetesMetricsAction(this.nodeName, this.kubeGuid, query);
     const metricsId = MetricsAction.buildMetricKey(this.nodeName, new MetricQueryConfig(query), true, MetricQueryType.QUERY);
-    const metricsMonitor = this.entityMonitorFactory.create<any>(metricsId, metricSchemaKey, entityFactory(metricSchemaKey));
+    const metricsMonitor = this.entityMonitorFactory.create<any>(metricsId, metricsAction);
     this.store.dispatch(metricsAction);
     const pollSub = metricsMonitor.poll(30000, () => this.store.dispatch(metricsAction),
       request => ({ busy: request.fetching, error: request.error, message: request.message }))
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts
index 25226f09c8..70c3011074 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts
@@ -1,16 +1,12 @@
 import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { map, shareReplay } from 'rxjs/operators';
 
-import { Store } from '@ngrx/store';
-
-import { PaginationMonitor } from '../../../shared/monitors/pagination-monitor';
-import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory';
-import { AppState } from '../../../../../store/src/app-state';
 import { endpointSchemaKey, entityFactory } from '../../../../../store/src/helpers/entity-factory';
 import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
-
-import { map, shareReplay, tap } from 'rxjs/operators';
-import { Observable } from 'rxjs';
+import { PaginationMonitor } from '../../../shared/monitors/pagination-monitor';
+import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory';
 
 @Injectable()
 export class KubernetesService {
@@ -19,11 +15,10 @@ export class KubernetesService {
   waitForAppEntity$: Observable<EntityInfo<APIResource>>;
 
   constructor(
-    private store: Store<AppState>,
     private paginationMonitorFactory: PaginationMonitorFactory
   ) {
     this.kubeEndpointsMonitor = this.paginationMonitorFactory.create(
-      'endpoint-list',
+      'endpoint-list', //TODO: RC check
       entityFactory(endpointSchemaKey)
     );
 
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 128792277c..a2aa366ce3 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
@@ -4,8 +4,9 @@ import { MetricQueryConfig, MetricsAction, MetricsChartAction } from '../../../.
 import { getPaginationKey } from '../../../../../store/src/actions/pagination.actions';
 import { entityFactory } from '../../../../../store/src/helpers/entity-factory';
 import { PaginatedAction, PaginationParam } from '../../../../../store/src/types/pagination.types';
-import { IRequestAction } from '../../../../../store/src/types/request.types';
+import { EntityRequestAction } from '../../../../../store/src/types/request.types';
 import {
+  KUBERNETES_ENDPOINT_TYPE,
   kubernetesAppsSchemaKey,
   kubernetesDashboardSchemaKey,
   kubernetesDeploymentsSchemaKey,
@@ -14,7 +15,7 @@ import {
   kubernetesPodsSchemaKey,
   kubernetesServicesSchemaKey,
   kubernetesStatefulSetsSchemaKey,
-} from './kubernetes.entities';
+} from '../kubernetes-entity-factory';
 
 export const GET_RELEASE_POD_INFO = '[KUBERNETES Endpoint] Get Release Pods Info';
 export const GET_RELEASE_POD_INFO_SUCCESS = '[KUBERNETES Endpoint] Get Release Pods Info Success';
@@ -82,7 +83,7 @@ const sortPodsByName = {
   'order-direction-field': 'name'
 };
 
-export interface KubeAction extends IRequestAction {
+export interface KubeAction extends EntityRequestAction {
   kubeGuid: string;
 }
 export interface KubePaginationAction extends PaginatedAction, KubeAction { }
@@ -98,7 +99,8 @@ export class GetKubernetesReleasePods implements KubePaginationAction {
   }
   initialParams: PaginationParam;
   type = GET_RELEASE_POD_INFO;
-  entityKey = kubernetesPodsSchemaKey;
+  entityType = kubernetesPodsSchemaKey;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = [entityFactory(kubernetesPodsSchemaKey)];
   params: { labelSelector: string; };
   actions = [
@@ -117,7 +119,8 @@ export class KubeHealthCheck implements KubePaginationAction {
     limit: 1
   };
   type = GET_NODES_INFO;
-  entityKey = kubernetesNodesSchemaKey;
+  entityType = kubernetesNodesSchemaKey;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = [entityFactory(kubernetesNodesSchemaKey)];
   actions = [
     GET_NODES_INFO,
@@ -132,7 +135,8 @@ export class GetKubernetesNodes implements KubePaginationAction {
     this.paginationKey = getPaginationKey(kubernetesNodesSchemaKey, kubeGuid);
   }
   type = GET_NODES_INFO;
-  entityKey = kubernetesNodesSchemaKey;
+  entityType = kubernetesNodesSchemaKey;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = [entityFactory(kubernetesNodesSchemaKey)];
   actions = [
     GET_NODES_INFO,
@@ -150,7 +154,8 @@ export class GetKubernetesNode implements KubeAction {
   constructor(public nodeName: string, public kubeGuid: string) {
   }
   type = GET_NODE_INFO;
-  entityKey = kubernetesNodesSchemaKey;
+  entityType = kubernetesNodesSchemaKey;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = [entityFactory(kubernetesNodesSchemaKey)];
 
   actions = [
@@ -164,7 +169,8 @@ export class GetKubernetesNamespace implements KubeAction {
   constructor(public namespaceName: string, public kubeGuid: string) {
   }
   type = GET_NAMESPACE_INFO;
-  entityKey = kubernetesNamespacesSchemaKey;
+  entityType = kubernetesNamespacesSchemaKey;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = [entityFactory(kubernetesNamespacesSchemaKey)];
 
   actions = [
@@ -179,7 +185,8 @@ export class GetKubernetesPods implements KubePaginationAction {
     this.paginationKey = getPaginationKey(kubernetesPodsSchemaKey, 'k8', kubeGuid);
   }
   type = GET_POD_INFO;
-  entityKey = kubernetesPodsSchemaKey;
+  entityType = kubernetesPodsSchemaKey;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = [entityFactory(kubernetesPodsSchemaKey)];
   actions = [
     GET_POD_INFO,
@@ -201,7 +208,8 @@ export class GetKubernetesPodsOnNode implements PaginatedAction, KubeAction {
     };
   }
   type = GET_PODS_ON_NODE_INFO;
-  entityKey = kubernetesPodsSchemaKey;
+  entityType = kubernetesPodsSchemaKey;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = [entityFactory(kubernetesPodsSchemaKey)];
   actions = [
     GET_PODS_ON_NODE_INFO,
@@ -217,7 +225,8 @@ export class GetKubernetesServicesInNamespace implements PaginatedAction, KubeAc
     this.paginationKey = getPaginationKey(kubernetesPodsSchemaKey, `ns-${namespaceName}`, kubeGuid);
   }
   type = GET_SERVICES_IN_NAMESPACE_INFO;
-  entityKey = kubernetesServicesSchemaKey;
+  entityType = kubernetesServicesSchemaKey;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = [entityFactory(kubernetesServicesSchemaKey)];
   actions = [
     GET_SERVICES_IN_NAMESPACE_INFO,
@@ -235,7 +244,8 @@ export class GetKubernetesPodsInNamespace implements PaginatedAction, KubeAction
     this.paginationKey = getPaginationKey(kubernetesPodsSchemaKey, `ns-${namespaceName}`, kubeGuid);
   }
   type = GET_PODS_IN_NAMESPACE_INFO;
-  entityKey = kubernetesPodsSchemaKey;
+  entityType = kubernetesPodsSchemaKey;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = [entityFactory(kubernetesPodsSchemaKey)];
   actions = [
     GET_PODS_IN_NAMESPACE_INFO,
@@ -253,7 +263,8 @@ export class GetKubernetesNamespaces implements KubePaginationAction {
     this.paginationKey = getPaginationKey(kubernetesNamespacesSchemaKey, kubeGuid);
   }
   type = GET_NAMESPACES_INFO;
-  entityKey = kubernetesNamespacesSchemaKey;
+  entityType = kubernetesNamespacesSchemaKey;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = [entityFactory(kubernetesNamespacesSchemaKey)];
   actions = [
     GET_NAMESPACES_INFO,
@@ -272,7 +283,8 @@ export class GetKubernetesApps implements KubePaginationAction {
     this.paginationKey = getPaginationKey(kubernetesAppsSchemaKey, kubeGuid);
   }
   type = GET_KUBERNETES_APP_INFO;
-  entityKey = kubernetesAppsSchemaKey;
+  entityType = kubernetesAppsSchemaKey;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = [entityFactory(kubernetesAppsSchemaKey)];
   actions = [
     GET_KUBERNETES_APP_INFO,
@@ -291,7 +303,8 @@ export class GetKubernetesServices implements KubePaginationAction {
     this.paginationKey = getPaginationKey(kubernetesServicesSchemaKey, kubeGuid);
   }
   type = GET_SERVICE_INFO;
-  entityKey = kubernetesServicesSchemaKey;
+  entityType = kubernetesServicesSchemaKey;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = [entityFactory(kubernetesServicesSchemaKey)];
   actions = [
     GET_SERVICE_INFO,
@@ -309,7 +322,8 @@ export class GetKubernetesPod implements KubeAction {
   constructor(public podName, public namespaceName, public kubeGuid) {
   }
   type = GET_KUBE_POD;
-  entityKey = kubernetesPodsSchemaKey;
+  entityType = kubernetesPodsSchemaKey;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = [entityFactory(kubernetesPodsSchemaKey)];
   actions = [
     GET_KUBE_POD,
@@ -323,7 +337,8 @@ export class GetKubernetesStatefulSets implements KubePaginationAction {
     this.paginationKey = getPaginationKey(kubernetesStatefulSetsSchemaKey, kubeGuid);
   }
   type = GET_KUBE_STATEFULSETS;
-  entityKey = kubernetesStatefulSetsSchemaKey;
+  entityType = kubernetesStatefulSetsSchemaKey;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = [entityFactory(kubernetesStatefulSetsSchemaKey)];
   actions = [
     GET_KUBE_STATEFULSETS,
@@ -338,7 +353,8 @@ export class GeKubernetesDeployments implements KubePaginationAction {
     this.paginationKey = getPaginationKey(kubernetesDeploymentsSchemaKey, kubeGuid);
   }
   type = GET_KUBE_DEPLOYMENT;
-  entityKey = kubernetesDeploymentsSchemaKey;
+  entityType = kubernetesDeploymentsSchemaKey;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = [entityFactory(kubernetesDeploymentsSchemaKey)];
   actions = [
     GET_KUBE_DEPLOYMENT,
@@ -352,7 +368,8 @@ export class GetKubernetesDashboard implements KubeAction {
   constructor(public kubeGuid: string) {
   }
   type = GET_KUBE_DASHBOARD;
-  entityKey = kubernetesDashboardSchemaKey;
+  entityType = kubernetesDashboardSchemaKey;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = [entityFactory(kubernetesDashboardSchemaKey)];
 
   actions = [
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 0f351a0660..860f529aa4 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
@@ -11,7 +11,19 @@ import {
   WrapperRequestActionFailed,
   WrapperRequestActionSuccess,
 } from '../../../../../store/src/types/request.types';
+import { entityCatalogue } from '../../../core/entity-catalogue/entity-catalogue.service';
 import { environment } from '../../../environments/environment';
+import {
+  KUBERNETES_ENDPOINT_TYPE,
+  kubernetesAppsSchemaKey,
+  kubernetesDashboardSchemaKey,
+  kubernetesDeploymentsSchemaKey,
+  kubernetesNamespacesSchemaKey,
+  kubernetesNodesSchemaKey,
+  kubernetesPodsSchemaKey,
+  kubernetesServicesSchemaKey,
+  kubernetesStatefulSetsSchemaKey,
+} from '../kubernetes-entity-factory';
 import { getKubeAPIResourceGuid } from './kube.selectors';
 import {
   ConfigMap,
@@ -57,16 +69,6 @@ import {
   KubeAction,
   KubePaginationAction,
 } from './kubernetes.actions';
-import {
-  kubernetesAppsSchemaKey,
-  kubernetesDashboardSchemaKey,
-  kubernetesDeploymentsSchemaKey,
-  kubernetesNamespacesSchemaKey,
-  kubernetesNodesSchemaKey,
-  kubernetesPodsSchemaKey,
-  kubernetesServicesSchemaKey,
-  kubernetesStatefulSetsSchemaKey,
-} from './kubernetes.entities';
 
 export interface KubeDashboardStatus {
   guid: string;
@@ -85,6 +87,16 @@ export class KubernetesEffects {
     private store: Store<AppState>
   ) { }
 
+  private dashboardEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesDashboardSchemaKey);
+  private nodeEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesSchemaKey);
+  private namespaceEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNamespacesSchemaKey);
+  private podsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsSchemaKey);
+  private servicesEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesServicesSchemaKey);
+  private statefulSetsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesStatefulSetsSchemaKey);
+  private deploymentsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesDeploymentsSchemaKey);
+  private appsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesAppsSchemaKey);
+
+
   @Effect()
   fetchDashboardInfo$ = this.actions$.pipe(
     ofType<GetKubernetesDashboard>(GET_KUBE_DASHBOARD),
@@ -99,12 +111,12 @@ export class KubernetesEffects {
         .get(url, requestArgs)
         .pipe(mergeMap(response => {
           const result = {
-            entities: { [kubernetesDashboardSchemaKey]: {} },
+            entities: { [this.dashboardEntityConfig.entityKey]: {} },
             result: []
           } as NormalizedResponse;
           const status = response as KubeDashboardStatus;
           const id = status.guid;
-          result.entities[kubernetesDashboardSchemaKey][id] = status;
+          result.entities[this.dashboardEntityConfig.entityKey][id] = status;
           result.result.push(id);
           return [
             new WrapperRequestActionSuccess(result, action)
@@ -128,7 +140,7 @@ export class KubernetesEffects {
       return this.processListAction<KubernetesPod>(
         action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`,
-        kubernetesNodesSchemaKey,
+        this.nodeEntityConfig.entityKey,
         getKubeAPIResourceGuid
       );
     })
@@ -146,7 +158,7 @@ export class KubernetesEffects {
     flatMap(action => {
       return this.processSingleItemAction<KubernetesNode>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes/${action.nodeName}`,
-        kubernetesNodesSchemaKey,
+        this.nodeEntityConfig.entityKey,
         (node) => node.metadata.name);
     })
   );
@@ -157,7 +169,7 @@ export class KubernetesEffects {
     flatMap(action => {
       return this.processSingleItemAction<KubernetesNamespace>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}`,
-        kubernetesNamespacesSchemaKey,
+        this.namespaceEntityConfig.entityKey,
         getKubeAPIResourceGuid);
     })
   );
@@ -168,7 +180,7 @@ export class KubernetesEffects {
     flatMap(action => {
       return this.processListAction<KubernetesPod>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`,
-        kubernetesPodsSchemaKey,
+        this.podsEntityConfig.entityKey,
         getKubeAPIResourceGuid);
     })
   );
@@ -179,7 +191,7 @@ export class KubernetesEffects {
     flatMap(action => {
       return this.processListAction<KubernetesPod>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`,
-        kubernetesPodsSchemaKey,
+        this.podsEntityConfig.entityKey,
         getKubeAPIResourceGuid
       );
     })
@@ -191,7 +203,7 @@ export class KubernetesEffects {
     flatMap(action => {
       return this.processListAction<KubernetesPod>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/pods`,
-        kubernetesPodsSchemaKey,
+        this.podsEntityConfig.entityKey,
         getKubeAPIResourceGuid
       );
     })
@@ -203,7 +215,7 @@ export class KubernetesEffects {
     flatMap(action => {
       return this.processListAction<KubeService>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/services`,
-        kubernetesServicesSchemaKey,
+        this.servicesEntityConfig.entityKey,
         getKubeAPIResourceGuid
       );
     })
@@ -215,7 +227,7 @@ export class KubernetesEffects {
     flatMap(action => {
       return this.processListAction<KubernetesPod>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/pods/${action.podName}`,
-        kubernetesPodsSchemaKey,
+        this.podsEntityConfig.entityKey,
         getKubeAPIResourceGuid);
     })
   );
@@ -226,7 +238,7 @@ export class KubernetesEffects {
     flatMap(action => {
       return this.processListAction<KubeService>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/services`,
-        kubernetesServicesSchemaKey,
+        this.servicesEntityConfig.entityKey,
         getKubeAPIResourceGuid);
     })
   );
@@ -237,7 +249,7 @@ export class KubernetesEffects {
     flatMap(action => {
       return this.processListAction<KubernetesNamespace>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces`,
-        kubernetesNamespacesSchemaKey,
+        this.namespaceEntityConfig.entityKey,
         getKubeAPIResourceGuid);
     })
   );
@@ -248,7 +260,7 @@ export class KubernetesEffects {
     flatMap(action => {
       return this.processListAction<KubernetesStatefulSet>(action,
         `/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/statefulsets`,
-        kubernetesStatefulSetsSchemaKey,
+        this.statefulSetsEntityConfig.entityKey,
         getKubeAPIResourceGuid);
     })
   );
@@ -259,7 +271,7 @@ export class KubernetesEffects {
     flatMap(action => {
       return this.processListAction<KubernetesDeployment>(action,
         `/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/deployments`,
-        kubernetesDeploymentsSchemaKey,
+        this.deploymentsEntityConfig.entityKey,
         getKubeAPIResourceGuid);
     })
   );
@@ -315,13 +327,13 @@ export class KubernetesEffects {
               })
               ).reduce((res, app) => {
                 const id = `${app.kubeId}-${app.name}`;
-                res.entities[kubernetesAppsSchemaKey][id] = app;
+                res.entities[this.appsEntityConfig.entityKey][id] = app;
                 if (res.result.indexOf(id) === -1) {
                   res.result.push(id);
                 }
                 return res;
               }, {
-                entities: { [kubernetesAppsSchemaKey]: {} },
+                entities: { [this.appsEntityConfig.entityKey]: {} },
                 result: []
               } as NormalizedResponse);
 
@@ -346,14 +358,15 @@ export class KubernetesEffects {
   private processNodeAction(action: GetKubernetesReleasePods | GetKubernetesNodes) {
     return this.processListAction<KubernetesNode>(action,
       `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes`,
-      kubernetesNodesSchemaKey,
+      this.nodeEntityConfig.entityKey,
       getKubeAPIResourceGuid);
   }
 
 
   private processListAction<T>(
     action: KubePaginationAction | KubeAction,
-    url: string, schemaKey: string,
+    url: string,
+    entityKey: string,
     getId: GetID<T>,
     filterResults?: Filter<T>) {
     this.store.dispatch(new StartRequestAction(action));
@@ -372,14 +385,14 @@ export class KubernetesEffects {
       .get(url, requestArgs)
       .pipe(mergeMap(response => {
         const base = {
-          entities: { [schemaKey]: {} },
+          entities: { [entityKey]: {} },
           result: []
         } as NormalizedResponse;
         const items = response[action.kubeGuid].items as Array<any>;
         const processesData = items.filter((res) => !!filterResults ? filterResults(res) : true)
           .reduce((res, data) => {
             const id = getId(data);
-            res.entities[schemaKey][id] = data;
+            res.entities[entityKey][id] = data;
             res.result.push(id);
             return res;
           }, base);
diff --git a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.entities.ts b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.entities.ts
index b6424b6dea..8652588ffa 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.entities.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.entities.ts
@@ -1,76 +1,77 @@
-import { getAPIResourceGuid } from '../../../../../store/src/selectors/api.selectors';
-import { ExtensionEntitySchema } from '../../../core/extension/extension-types';
-import { getKubeAPIResourceGuid } from './kube.selectors';
-import { KubernetesApp } from './kube.types';
+// TODO: RC DELETE ME
+// import { getAPIResourceGuid } from '../../../../../store/src/selectors/api.selectors';
+// import { ExtensionEntitySchema } from '../../../core/extension/extension-types';
+// import { getKubeAPIResourceGuid } from './kube.selectors';
+// import { KubernetesApp } from './kube.types';
 
-export const kubernetesSchemaKey = 'kubernetesInfo';
-export const kubernetesNodesSchemaKey = 'kubernetesNode';
-export const kubernetesPodsSchemaKey = 'kubernetesPod';
-export const kubernetesNamespacesSchemaKey = 'kubernetesNamespace';
-export const kubernetesServicesSchemaKey = 'kubernetesService';
-export const kubernetesStatefulSetsSchemaKey = 'kubernetesStatefulSet';
-export const kubernetesDeploymentsSchemaKey = 'kubernetesDeployment';
-export const kubernetesAppsSchemaKey = 'kubernetesApp';
-export const kubernetesDashboardSchemaKey = 'kubernetesDashboard';
+// export const kubernetesSchemaKey = 'kubernetesInfo';
+// export const kubernetesNodesSchemaKey = 'kubernetesNode';
+// export const kubernetesPodsSchemaKey = 'kubernetesPod';
+// export const kubernetesNamespacesSchemaKey = 'kubernetesNamespace';
+// export const kubernetesServicesSchemaKey = 'kubernetesService';
+// export const kubernetesStatefulSetsSchemaKey = 'kubernetesStatefulSet';
+// export const kubernetesDeploymentsSchemaKey = 'kubernetesDeployment';
+// export const kubernetesAppsSchemaKey = 'kubernetesApp';
+// export const kubernetesDashboardSchemaKey = 'kubernetesDashboard';
 
-export const getKubeAppId = (object: KubernetesApp) => object.name;
+// export const getKubeAppId = (object: KubernetesApp) => object.name;
 
-export const kubernetesEntities: ExtensionEntitySchema[] = [
-  {
-    entityKey: kubernetesSchemaKey,
-    definition: {},
-    options: { idAttribute: getAPIResourceGuid }
-  },
-  {
-    entityKey: kubernetesAppsSchemaKey,
-    definition: {},
-    options: { idAttribute: getKubeAppId }
-  },
-  {
-    entityKey: kubernetesStatefulSetsSchemaKey,
-    definition: {},
-    options: { idAttribute: getKubeAPIResourceGuid }
-  },
-  {
-    entityKey: kubernetesPodsSchemaKey,
-    definition: {},
-    options: { idAttribute: getKubeAPIResourceGuid }
-  },
-  {
-    entityKey: kubernetesDeploymentsSchemaKey,
-    definition: {},
-    options: { idAttribute: getKubeAPIResourceGuid }
-  },
-  {
-    entityKey: kubernetesNodesSchemaKey,
-    definition: {},
-    options: { idAttribute: getKubeAPIResourceGuid }
-  },
-  {
-    entityKey: kubernetesNamespacesSchemaKey,
-    definition: {},
-    options: { idAttribute: getKubeAPIResourceGuid }
-  },
-  {
-    entityKey: kubernetesServicesSchemaKey,
-    definition: {},
-    options: { idAttribute: getKubeAPIResourceGuid }
-  },
-  {
-    entityKey: kubernetesDashboardSchemaKey,
-    definition: {},
-    options: { idAttribute: getKubeAPIResourceGuid }
-  }
-];
+// export const kubernetesEntities: ExtensionEntitySchema[] = [
+//   {
+//     entityKey: kubernetesSchemaKey,
+//     definition: {},
+//     options: { idAttribute: getAPIResourceGuid }
+//   },
+//   {
+//     entityKey: kubernetesAppsSchemaKey,
+//     definition: {},
+//     options: { idAttribute: getKubeAppId }
+//   },
+//   {
+//     entityKey: kubernetesStatefulSetsSchemaKey,
+//     definition: {},
+//     options: { idAttribute: getKubeAPIResourceGuid }
+//   },
+//   {
+//     entityKey: kubernetesPodsSchemaKey,
+//     definition: {},
+//     options: { idAttribute: getKubeAPIResourceGuid }
+//   },
+//   {
+//     entityKey: kubernetesDeploymentsSchemaKey,
+//     definition: {},
+//     options: { idAttribute: getKubeAPIResourceGuid }
+//   },
+//   {
+//     entityKey: kubernetesNodesSchemaKey,
+//     definition: {},
+//     options: { idAttribute: getKubeAPIResourceGuid }
+//   },
+//   {
+//     entityKey: kubernetesNamespacesSchemaKey,
+//     definition: {},
+//     options: { idAttribute: getKubeAPIResourceGuid }
+//   },
+//   {
+//     entityKey: kubernetesServicesSchemaKey,
+//     definition: {},
+//     options: { idAttribute: getKubeAPIResourceGuid }
+//   },
+//   {
+//     entityKey: kubernetesDashboardSchemaKey,
+//     definition: {},
+//     options: { idAttribute: getKubeAPIResourceGuid }
+//   }
+// ];
 
-export const kubernetesEntityKeys: string[] = [
-  kubernetesSchemaKey,
-  kubernetesAppsSchemaKey,
-  kubernetesStatefulSetsSchemaKey,
-  kubernetesPodsSchemaKey,
-  kubernetesDeploymentsSchemaKey,
-  kubernetesNodesSchemaKey,
-  kubernetesNamespacesSchemaKey,
-  kubernetesServicesSchemaKey,
-  kubernetesDashboardSchemaKey,
-];
+// export const kubernetesEntityKeys: string[] = [
+//   kubernetesSchemaKey,
+//   kubernetesAppsSchemaKey,
+//   kubernetesStatefulSetsSchemaKey,
+//   kubernetesPodsSchemaKey,
+//   kubernetesDeploymentsSchemaKey,
+//   kubernetesNodesSchemaKey,
+//   kubernetesNamespacesSchemaKey,
+//   kubernetesServicesSchemaKey,
+//   kubernetesDashboardSchemaKey,
+// ];
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 d542073359..5b56862e8b 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
@@ -3,14 +3,13 @@ import { Component, NgZone, OnDestroy, OnInit } from '@angular/core';
 import { SafeResourceUrl } from '@angular/platform-browser';
 import { Store } from '@ngrx/store';
 import { combineLatest, interval, Observable, Subscription } from 'rxjs';
-import { map, startWith, tap } from 'rxjs/operators';
+import { map, startWith } from 'rxjs/operators';
 
 import { AppState } from '../../../../../../store/src/app-state';
-import { entityFactory } from '../../../../../../store/src/helpers/entity-factory';
 import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { PaginatedAction } from '../../../../../../store/src/types/pagination.types';
+import { entityCatalogue } from '../../../../core/entity-catalogue/entity-catalogue.service';
 import { safeUnsubscribe } from '../../../../core/utils.service';
-import { getEndpointType } from '../../../../features/endpoints/endpoint-helpers';
 import {
   IChartThresholds,
   ISimpleUsageChartData,
@@ -21,6 +20,7 @@ import { GetKubernetesNodes, GetKubernetesPods } from '../../store/kubernetes.ac
 import { KubernetesNode } from './../../../../../../../../../custom-src/frontend/app/custom/kubernetes/store/kube.types';
 import { KubernetesPod } from './../../store/kube.types';
 import { GetKubernetesApps } from './../../store/kubernetes.actions';
+
 interface IValueLabels {
   usedLabel?: string;
   remainingLabel?: string;
@@ -49,9 +49,13 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
   };
   public endpointDetails$: Observable<IEndpointDetails> = this.kubeEndpointService.endpoint$.pipe(
     map(endpoint => {
-      const { imagePath, label } = getEndpointType(endpoint.entity.cnsi_type, endpoint.entity.sub_type);
+      const endpointConfig = entityCatalogue.getEndpoint(endpoint.entity.cnsi_type, endpoint.entity.sub_type);
+      const { logoUrl, label } = endpointConfig.definition;
+      // const { imagePath, label } = entityCatalogue.getEndpoint(endpoint.entity.cnsi_type, endpoint.entity.sub_type);
+
+      // const { imagePath, label } = getEndpointType(endpoint.entity.cnsi_type, endpoint.entity.sub_type);
       return {
-        imagePath,
+        imagePath: logoUrl,
         label,
         name: endpoint.entity.name,
       };
@@ -104,7 +108,7 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
   private getPaginationObservable(action: PaginatedAction) {
     const paginationMonitor = this.paginationMonitorFactory.create(
       action.paginationKey,
-      entityFactory(action.entityKey)
+      action
     );
 
     this.ngZone.runOutsideAngular(() => {
diff --git a/package-lock.json b/package-lock.json
index a7791ffb67..b842d3bf27 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1113,8 +1113,8 @@
       "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
       "dev": true,
       "requires": {
-        "call-me-maybe": "^1.0.1",
-        "glob-to-regexp": "^0.3.0"
+        "call-me-maybe": "1.0.1",
+        "glob-to-regexp": "0.3.0"
       }
     },
     "@ngrx/effects": {
@@ -1538,18 +1538,18 @@
       "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-10.1.0.tgz",
       "integrity": "sha512-0nZ3ub5o/qQfFMz+av89u/VKqsqiVhPFBDDOOPq2qimP83i+pcb0i3MEao7PSxIbKAEkL/pwRcEJw4KDZ8B67w==",
       "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"
+        "d3": "4.13.0",
+        "d3-array": "1.2.4",
+        "d3-brush": "1.0.6",
+        "d3-color": "1.2.3",
+        "d3-force": "1.2.0",
+        "d3-format": "1.3.2",
+        "d3-hierarchy": "1.1.8",
+        "d3-interpolate": "1.3.2",
+        "d3-scale": "1.0.7",
+        "d3-selection": "1.4.0",
+        "d3-shape": "1.3.4",
+        "d3-time-format": "2.1.3"
       }
     },
     "@tweenjs/tween.js": {
@@ -1625,7 +1625,7 @@
       "resolved": "https://registry.npmjs.org/@types/moment-timezone/-/moment-timezone-0.5.12.tgz",
       "integrity": "sha512-hnHH2+Efg2vExr/dSz+IX860nSiyk9Sk4pJF2EmS11lRpMcNXeB4KBW5xcgw2QPsb9amTXdsVNEe5IoJXiT0uw==",
       "requires": {
-        "moment": ">=2.14.0"
+        "moment": "2.24.0"
       }
     },
     "@types/node": {
@@ -1681,9 +1681,9 @@
       "integrity": "sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==",
       "dev": true,
       "requires": {
-        "@types/node": "*",
-        "@types/source-list-map": "*",
-        "source-map": "^0.6.1"
+        "@types/node": "11.9.4",
+        "@types/source-list-map": "0.1.2",
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -1774,7 +1774,7 @@
       "integrity": "sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==",
       "dev": true,
       "requires": {
-        "@xtuc/ieee754": "^1.2.0"
+        "@xtuc/ieee754": "1.2.0"
       }
     },
     "@webassemblyjs/leb128": {
@@ -1896,8 +1896,8 @@
       "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
       "dev": true,
       "requires": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
+        "jsonparse": "1.3.1",
+        "through": "2.3.8"
       }
     },
     "abbrev": {
@@ -1934,7 +1934,7 @@
       "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
       "dev": true,
       "requires": {
-        "acorn": "^3.0.4"
+        "acorn": "3.3.0"
       },
       "dependencies": {
         "acorn": {
@@ -1972,7 +1972,7 @@
       "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==",
       "dev": true,
       "requires": {
-        "humanize-ms": "^1.2.1"
+        "humanize-ms": "1.2.1"
       }
     },
     "ajv": {
@@ -1981,10 +1981,10 @@
       "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
       "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"
       },
       "dependencies": {
         "fast-deep-equal": {
@@ -2033,7 +2033,7 @@
       "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=",
       "dev": true,
       "requires": {
-        "string-width": "^2.0.0"
+        "string-width": "2.1.1"
       },
       "dependencies": {
         "ansi-regex": {
@@ -2054,8 +2054,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"
           }
         },
         "strip-ansi": {
@@ -2064,7 +2064,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "3.0.0"
           }
         }
       }
@@ -2129,7 +2129,7 @@
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
       "requires": {
-        "color-convert": "^1.9.0"
+        "color-convert": "1.9.1"
       }
     },
     "ansi-wrap": {
@@ -2143,8 +2143,8 @@
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
       "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "requires": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
+        "micromatch": "3.1.10",
+        "normalize-path": "2.1.1"
       }
     },
     "app-root-path": {
@@ -2159,7 +2159,7 @@
       "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
       "dev": true,
       "requires": {
-        "buffer-equal": "^1.0.0"
+        "buffer-equal": "1.0.0"
       }
     },
     "aproba": {
@@ -2180,8 +2180,8 @@
       "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
       "dev": true,
       "requires": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
+        "delegates": "1.0.0",
+        "readable-stream": "2.3.6"
       }
     },
     "argparse": {
@@ -2190,7 +2190,7 @@
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
       "requires": {
-        "sprintf-js": "~1.0.2"
+        "sprintf-js": "1.0.3"
       }
     },
     "argv": {
@@ -2210,7 +2210,7 @@
       "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
       "dev": true,
       "requires": {
-        "make-iterator": "^1.0.0"
+        "make-iterator": "1.0.1"
       }
     },
     "arr-flatten": {
@@ -2224,7 +2224,7 @@
       "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
       "dev": true,
       "requires": {
-        "make-iterator": "^1.0.0"
+        "make-iterator": "1.0.1"
       }
     },
     "arr-union": {
@@ -2262,8 +2262,8 @@
       "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
       "dev": true,
       "requires": {
-        "array-slice": "^1.0.0",
-        "is-number": "^4.0.0"
+        "array-slice": "1.1.0",
+        "is-number": "4.0.0"
       },
       "dependencies": {
         "is-number": {
@@ -2280,7 +2280,7 @@
       "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
       "dev": true,
       "requires": {
-        "is-number": "^4.0.0"
+        "is-number": "4.0.0"
       },
       "dependencies": {
         "is-number": {
@@ -2315,9 +2315,9 @@
       "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
       "dev": true,
       "requires": {
-        "default-compare": "^1.0.0",
-        "get-value": "^2.0.6",
-        "kind-of": "^5.0.2"
+        "default-compare": "1.0.0",
+        "get-value": "2.0.6",
+        "kind-of": "5.1.0"
       },
       "dependencies": {
         "kind-of": {
@@ -2334,7 +2334,7 @@
       "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
       "dev": true,
       "requires": {
-        "array-uniq": "^1.0.1"
+        "array-uniq": "1.0.3"
       }
     },
     "array-uniq": {
@@ -2378,9 +2378,9 @@
       "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+        "bn.js": "4.11.8",
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1"
       }
     },
     "assert": {
@@ -2458,7 +2458,7 @@
       "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
       "dev": true,
       "requires": {
-        "async-done": "^1.2.2"
+        "async-done": "1.3.1"
       }
     },
     "asynckit": {
@@ -2478,12 +2478,12 @@
       "integrity": "sha512-Yp51mevbOEdxDUy5WjiKtpQaecqYq9OqZSL04rSoCiry7Tc5I9FEyo3bfxiTJc1DfHeKwSFCUYbBAiOQ2VGfiw==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.4.1",
-        "caniuse-lite": "^1.0.30000929",
-        "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "postcss": "^7.0.13",
-        "postcss-value-parser": "^3.3.1"
+        "browserslist": "4.4.1",
+        "caniuse-lite": "1.0.30000938",
+        "normalize-range": "0.1.2",
+        "num2fraction": "1.2.2",
+        "postcss": "7.0.14",
+        "postcss-value-parser": "3.3.1"
       }
     },
     "aws-sign2": {
@@ -2504,9 +2504,9 @@
       "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
       "dev": true,
       "requires": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
+        "chalk": "1.1.3",
+        "esutils": "2.0.2",
+        "js-tokens": "3.0.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -2521,11 +2521,11 @@
           "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"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "supports-color": {
@@ -2542,14 +2542,14 @@
       "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"
+        "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.10",
+        "source-map": "0.5.7",
+        "trim-right": "1.0.1"
       },
       "dependencies": {
         "lodash": {
@@ -2572,7 +2572,7 @@
       "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-runtime": {
@@ -2581,8 +2581,8 @@
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
       "dev": true,
       "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
+        "core-js": "2.6.5",
+        "regenerator-runtime": "0.11.1"
       }
     },
     "babel-template": {
@@ -2591,11 +2591,11 @@
       "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-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "lodash": "4.17.13"
       }
     },
     "babel-traverse": {
@@ -2604,15 +2604,15 @@
       "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-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.9",
+        "globals": "9.18.0",
+        "invariant": "2.2.4",
+        "lodash": "4.17.13"
       }
     },
     "babel-types": {
@@ -2621,10 +2621,10 @@
       "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"
+        "babel-runtime": "6.26.0",
+        "esutils": "2.0.2",
+        "lodash": "4.17.10",
+        "to-fast-properties": "1.0.3"
       },
       "dependencies": {
         "lodash": {
@@ -2647,15 +2647,15 @@
       "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
       "dev": true,
       "requires": {
-        "arr-filter": "^1.1.1",
-        "arr-flatten": "^1.0.1",
-        "arr-map": "^2.0.0",
-        "array-each": "^1.0.0",
-        "array-initial": "^1.0.0",
-        "array-last": "^1.1.1",
-        "async-done": "^1.2.2",
-        "async-settle": "^1.0.0",
-        "now-and-later": "^2.0.0"
+        "arr-filter": "1.1.2",
+        "arr-flatten": "1.1.0",
+        "arr-map": "2.0.2",
+        "array-each": "1.0.1",
+        "array-initial": "1.1.0",
+        "array-last": "1.3.0",
+        "async-done": "1.3.1",
+        "async-settle": "1.0.0",
+        "now-and-later": "2.0.1"
       }
     },
     "backo2": {
@@ -2674,13 +2674,13 @@
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "requires": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
+        "cache-base": "1.0.1",
+        "class-utils": "0.3.6",
+        "component-emitter": "1.2.1",
+        "define-property": "1.0.0",
+        "isobject": "3.0.1",
+        "mixin-deep": "1.3.1",
+        "pascalcase": "0.1.1"
       },
       "dependencies": {
         "define-property": {
@@ -2688,7 +2688,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "requires": {
-            "is-descriptor": "^1.0.0"
+            "is-descriptor": "1.0.2"
           }
         },
         "is-accessor-descriptor": {
@@ -2696,7 +2696,7 @@
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-data-descriptor": {
@@ -2704,7 +2704,7 @@
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-descriptor": {
@@ -2712,9 +2712,9 @@
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
           }
         }
       }
@@ -2785,7 +2785,7 @@
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
       "dev": true,
       "requires": {
-        "inherits": "~2.0.0"
+        "inherits": "2.0.3"
       }
     },
     "blocking-proxy": {
@@ -2794,7 +2794,7 @@
       "integrity": "sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==",
       "dev": true,
       "requires": {
-        "minimist": "^1.2.0"
+        "minimist": "1.2.0"
       },
       "dependencies": {
         "minimist": {
@@ -2852,12 +2852,12 @@
       "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
       "dev": true,
       "requires": {
-        "array-flatten": "^2.1.0",
-        "deep-equal": "^1.0.1",
-        "dns-equal": "^1.0.0",
-        "dns-txt": "^2.0.2",
-        "multicast-dns": "^6.0.1",
-        "multicast-dns-service-types": "^1.1.0"
+        "array-flatten": "2.1.2",
+        "deep-equal": "1.0.1",
+        "dns-equal": "1.0.0",
+        "dns-txt": "2.0.2",
+        "multicast-dns": "6.2.3",
+        "multicast-dns-service-types": "1.1.0"
       }
     },
     "boxen": {
@@ -2866,13 +2866,13 @@
       "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
       "dev": true,
       "requires": {
-        "ansi-align": "^2.0.0",
-        "camelcase": "^4.0.0",
-        "chalk": "^2.0.1",
-        "cli-boxes": "^1.0.0",
-        "string-width": "^2.0.0",
-        "term-size": "^1.2.0",
-        "widest-line": "^2.0.0"
+        "ansi-align": "2.0.0",
+        "camelcase": "4.1.0",
+        "chalk": "2.2.2",
+        "cli-boxes": "1.0.0",
+        "string-width": "2.1.1",
+        "term-size": "1.2.0",
+        "widest-line": "2.0.1"
       },
       "dependencies": {
         "ansi-regex": {
@@ -2899,8 +2899,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"
           }
         },
         "strip-ansi": {
@@ -2909,7 +2909,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "3.0.0"
           }
         }
       }
@@ -2919,7 +2919,7 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "requires": {
-        "balanced-match": "^1.0.0",
+        "balanced-match": "1.0.0",
         "concat-map": "0.0.1"
       }
     },
@@ -2928,16 +2928,16 @@
       "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
       "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "requires": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
+        "arr-flatten": "1.1.0",
+        "array-unique": "0.3.2",
+        "extend-shallow": "2.0.1",
+        "fill-range": "4.0.0",
+        "isobject": "3.0.1",
+        "repeat-element": "1.1.2",
+        "snapdragon": "0.8.2",
+        "snapdragon-node": "2.1.1",
+        "split-string": "3.1.0",
+        "to-regex": "3.0.2"
       },
       "dependencies": {
         "extend-shallow": {
@@ -2945,7 +2945,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         }
       }
@@ -2962,12 +2962,12 @@
       "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
       "dev": true,
       "requires": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "buffer-xor": "1.0.3",
+        "cipher-base": "1.0.4",
+        "create-hash": "1.2.0",
+        "evp_bytestokey": "1.0.3",
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
       }
     },
     "browserify-cipher": {
@@ -2976,9 +2976,9 @@
       "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
       "dev": true,
       "requires": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
+        "browserify-aes": "1.2.0",
+        "browserify-des": "1.0.2",
+        "evp_bytestokey": "1.0.3"
       }
     },
     "browserify-des": {
@@ -2987,10 +2987,10 @@
       "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
       "dev": true,
       "requires": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
+        "cipher-base": "1.0.4",
+        "des.js": "1.0.0",
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
       }
     },
     "browserify-rsa": {
@@ -2999,8 +2999,8 @@
       "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "randombytes": "^2.0.1"
+        "bn.js": "4.11.8",
+        "randombytes": "2.1.0"
       }
     },
     "browserify-sign": {
@@ -3009,13 +3009,13 @@
       "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"
+        "bn.js": "4.11.8",
+        "browserify-rsa": "4.0.1",
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
+        "elliptic": "6.4.1",
+        "inherits": "2.0.3",
+        "parse-asn1": "5.1.4"
       }
     },
     "browserify-zlib": {
@@ -3024,7 +3024,7 @@
       "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
       "dev": true,
       "requires": {
-        "pako": "~1.0.5"
+        "pako": "1.0.6"
       }
     },
     "browserslist": {
@@ -3044,7 +3044,7 @@
       "integrity": "sha512-AO+mECXsW4QcqC9bxwM29O7qWa7bJT94uBFzeb5brylIQwawuEziwq20dPYbins95GlWzOawgyDNdjYAo32EKg==",
       "dev": true,
       "requires": {
-        "https-proxy-agent": "^2.2.1"
+        "https-proxy-agent": "2.2.1"
       }
     },
     "browserstack-local": {
@@ -3066,9 +3066,9 @@
       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
       "dev": true,
       "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
+        "base64-js": "1.3.0",
+        "ieee754": "1.1.12",
+        "isarray": "1.0.0"
       }
     },
     "buffer-alloc": {
@@ -3077,8 +3077,8 @@
       "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
       "dev": true,
       "requires": {
-        "buffer-alloc-unsafe": "^1.1.0",
-        "buffer-fill": "^1.0.0"
+        "buffer-alloc-unsafe": "1.1.0",
+        "buffer-fill": "1.0.0"
       }
     },
     "buffer-alloc-unsafe": {
@@ -3153,19 +3153,19 @@
       "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
       "dev": true,
       "requires": {
-        "bluebird": "^3.5.1",
-        "chownr": "^1.0.1",
-        "glob": "^7.1.2",
-        "graceful-fs": "^4.1.11",
-        "lru-cache": "^4.1.1",
-        "mississippi": "^2.0.0",
-        "mkdirp": "^0.5.1",
-        "move-concurrently": "^1.0.1",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.2",
-        "ssri": "^5.2.4",
-        "unique-filename": "^1.1.0",
-        "y18n": "^4.0.0"
+        "bluebird": "3.5.1",
+        "chownr": "1.1.1",
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "lru-cache": "4.1.3",
+        "mississippi": "2.0.0",
+        "mkdirp": "0.5.1",
+        "move-concurrently": "1.0.1",
+        "promise-inflight": "1.0.1",
+        "rimraf": "2.6.2",
+        "ssri": "5.3.0",
+        "unique-filename": "1.1.1",
+        "y18n": "4.0.0"
       }
     },
     "cache-base": {
@@ -3173,15 +3173,15 @@
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "requires": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
+        "collection-visit": "1.0.0",
+        "component-emitter": "1.2.1",
+        "get-value": "2.0.6",
+        "has-value": "1.0.0",
+        "isobject": "3.0.1",
+        "set-value": "2.0.0",
+        "to-object-path": "0.3.0",
+        "union-value": "1.0.0",
+        "unset-value": "1.0.0"
       }
     },
     "call-me-maybe": {
@@ -3217,8 +3217,8 @@
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
       "dev": true,
       "requires": {
-        "camelcase": "^2.0.0",
-        "map-obj": "^1.0.0"
+        "camelcase": "2.1.1",
+        "map-obj": "1.0.1"
       },
       "dependencies": {
         "camelcase": {
@@ -3334,8 +3334,8 @@
       "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
       }
     },
     "circular-dependency-plugin": {
@@ -3354,10 +3354,10 @@
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "requires": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
+        "arr-union": "3.1.0",
+        "define-property": "0.2.5",
+        "isobject": "3.0.1",
+        "static-extend": "0.1.2"
       },
       "dependencies": {
         "define-property": {
@@ -3365,7 +3365,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         }
       }
@@ -3376,7 +3376,7 @@
       "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
       "dev": true,
       "requires": {
-        "source-map": "~0.6.0"
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -3426,10 +3426,10 @@
       "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
       "dev": true,
       "requires": {
-        "for-own": "^1.0.0",
-        "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.0",
-        "shallow-clone": "^1.0.0"
+        "for-own": "1.0.0",
+        "is-plain-object": "2.0.4",
+        "kind-of": "6.0.2",
+        "shallow-clone": "1.0.0"
       }
     },
     "clone-stats": {
@@ -3478,12 +3478,12 @@
       "integrity": "sha512-oO6vCkjqsVrEsmh58oNlnJkRXuA30hF8cdNAQV9DytEalDwyOFRvHMnlKFzmOStNerOmPGZU9GAHnBo4tGvtiQ==",
       "dev": true,
       "requires": {
-        "app-root-path": "^2.1.0",
-        "css-selector-tokenizer": "^0.7.0",
-        "cssauron": "^1.4.0",
-        "semver-dsl": "^1.0.1",
-        "source-map": "^0.5.7",
-        "sprintf-js": "^1.1.1"
+        "app-root-path": "2.1.0",
+        "css-selector-tokenizer": "0.7.1",
+        "cssauron": "1.4.0",
+        "semver-dsl": "1.0.1",
+        "source-map": "0.5.7",
+        "sprintf-js": "1.1.2"
       },
       "dependencies": {
         "source-map": {
@@ -3506,9 +3506,9 @@
       "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
       "dev": true,
       "requires": {
-        "arr-map": "^2.0.2",
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
+        "arr-map": "2.0.2",
+        "for-own": "1.0.0",
+        "make-iterator": "1.0.1"
       }
     },
     "collection-visit": {
@@ -3516,8 +3516,8 @@
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
       "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
       "requires": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
+        "map-visit": "1.0.0",
+        "object-visit": "1.0.1"
       }
     },
     "color-convert": {
@@ -3636,10 +3636,10 @@
       "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
       "dev": true,
       "requires": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
+        "buffer-from": "1.1.0",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6",
+        "typedarray": "0.0.6"
       }
     },
     "configstore": {
@@ -3648,12 +3648,12 @@
       "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
       "dev": true,
       "requires": {
-        "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"
+        "dot-prop": "4.2.0",
+        "graceful-fs": "4.1.11",
+        "make-dir": "1.3.0",
+        "unique-string": "1.0.0",
+        "write-file-atomic": "2.4.2",
+        "xdg-basedir": "3.0.0"
       }
     },
     "connect": {
@@ -3709,7 +3709,7 @@
       "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
       "dev": true,
       "requires": {
-        "date-now": "^0.1.4"
+        "date-now": "0.1.4"
       }
     },
     "console-control-strings": {
@@ -3760,12 +3760,12 @@
       "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
       "dev": true,
       "requires": {
-        "aproba": "^1.1.1",
-        "fs-write-stream-atomic": "^1.0.8",
-        "iferr": "^0.1.5",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.0"
+        "aproba": "1.2.0",
+        "fs-write-stream-atomic": "1.0.10",
+        "iferr": "0.1.5",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2",
+        "run-queue": "1.0.3"
       }
     },
     "copy-descriptor": {
@@ -3779,8 +3779,8 @@
       "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
       "dev": true,
       "requires": {
-        "each-props": "^1.3.0",
-        "is-plain-object": "^2.0.1"
+        "each-props": "1.3.2",
+        "is-plain-object": "2.0.4"
       }
     },
     "copy-webpack-plugin": {
@@ -3789,14 +3789,14 @@
       "integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==",
       "dev": true,
       "requires": {
-        "cacache": "^10.0.4",
-        "find-cache-dir": "^1.0.0",
-        "globby": "^7.1.1",
-        "is-glob": "^4.0.0",
-        "loader-utils": "^1.1.0",
-        "minimatch": "^3.0.4",
-        "p-limit": "^1.0.0",
-        "serialize-javascript": "^1.4.0"
+        "cacache": "10.0.4",
+        "find-cache-dir": "1.0.0",
+        "globby": "7.1.1",
+        "is-glob": "4.0.0",
+        "loader-utils": "1.2.3",
+        "minimatch": "3.0.4",
+        "p-limit": "1.2.0",
+        "serialize-javascript": "1.6.1"
       },
       "dependencies": {
         "globby": {
@@ -3805,12 +3805,12 @@
           "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
           "dev": true,
           "requires": {
-            "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"
+            "array-union": "1.0.2",
+            "dir-glob": "2.0.0",
+            "glob": "7.1.2",
+            "ignore": "3.3.8",
+            "pify": "3.0.0",
+            "slash": "1.0.0"
           }
         }
       }
@@ -3855,8 +3855,8 @@
       "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.0.0"
+        "bn.js": "4.11.8",
+        "elliptic": "6.4.1"
       }
     },
     "create-error-class": {
@@ -3865,7 +3865,7 @@
       "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
       "dev": true,
       "requires": {
-        "capture-stack-trace": "^1.0.0"
+        "capture-stack-trace": "1.0.1"
       }
     },
     "create-hash": {
@@ -3874,11 +3874,11 @@
       "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
       "dev": true,
       "requires": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
+        "cipher-base": "1.0.4",
+        "inherits": "2.0.3",
+        "md5.js": "1.3.5",
+        "ripemd160": "2.0.2",
+        "sha.js": "2.4.11"
       }
     },
     "create-hmac": {
@@ -3887,12 +3887,12 @@
       "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
       "dev": true,
       "requires": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
+        "cipher-base": "1.0.4",
+        "create-hash": "1.2.0",
+        "inherits": "2.0.3",
+        "ripemd160": "2.0.2",
+        "safe-buffer": "5.1.2",
+        "sha.js": "2.4.11"
       }
     },
     "cross-spawn": {
@@ -3901,8 +3901,8 @@
       "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
       "dev": true,
       "requires": {
-        "lru-cache": "^4.0.1",
-        "which": "^1.2.9"
+        "lru-cache": "4.1.3",
+        "which": "1.3.1"
       }
     },
     "crypto-browserify": {
@@ -3911,17 +3911,17 @@
       "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
       "dev": true,
       "requires": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
+        "browserify-cipher": "1.0.1",
+        "browserify-sign": "4.0.4",
+        "create-ecdh": "4.0.3",
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
+        "diffie-hellman": "5.0.3",
+        "inherits": "2.0.3",
+        "pbkdf2": "3.0.17",
+        "public-encrypt": "4.0.3",
+        "randombytes": "2.1.0",
+        "randomfill": "1.0.4"
       }
     },
     "crypto-random-string": {
@@ -3942,9 +3942,9 @@
       "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==",
       "dev": true,
       "requires": {
-        "cssesc": "^0.1.0",
-        "fastparse": "^1.1.1",
-        "regexpu-core": "^1.0.0"
+        "cssesc": "0.1.0",
+        "fastparse": "1.1.2",
+        "regexpu-core": "1.0.0"
       }
     },
     "cssauron": {
@@ -3953,7 +3953,7 @@
       "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=",
       "dev": true,
       "requires": {
-        "through": "X.X.X"
+        "through": "2.3.8"
       }
     },
     "cssesc": {
@@ -3974,7 +3974,7 @@
       "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
       "dev": true,
       "requires": {
-        "array-find-index": "^1.0.1"
+        "array-find-index": "1.0.2"
       }
     },
     "custom-event": {
@@ -4045,11 +4045,11 @@
           "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-dispatch": "1.0.3",
+            "d3-drag": "1.2.1",
+            "d3-interpolate": "1.1.6",
+            "d3-selection": "1.3.0",
+            "d3-transition": "1.1.1"
           }
         },
         "d3-color": {
@@ -4062,10 +4062,10 @@
           "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-collection": "1.0.4",
+            "d3-dispatch": "1.0.3",
+            "d3-quadtree": "1.0.3",
+            "d3-timer": "1.0.7"
           }
         },
         "d3-format": {
@@ -4083,7 +4083,7 @@
           "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-color": "1.0.3"
           }
         },
         "d3-selection": {
@@ -4096,7 +4096,7 @@
           "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.2.0.tgz",
           "integrity": "sha1-RdAVOPBkuv0F6j1tLLdI/YxB93c=",
           "requires": {
-            "d3-path": "1"
+            "d3-path": "1.0.5"
           }
         },
         "d3-time-format": {
@@ -4104,7 +4104,7 @@
           "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-time": "1.0.8"
           }
         }
       }
@@ -4136,8 +4136,8 @@
       "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-array": "1.2.4",
+        "d3-path": "1.0.5"
       }
     },
     "d3-collection": {
@@ -4160,8 +4160,8 @@
       "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-1.2.1.tgz",
       "integrity": "sha512-Cg8/K2rTtzxzrb0fmnYOUeZHvwa4PHzwXOLZZPwtEs2SKLLKLXeYwZKBB+DlOxUvFmarOnmt//cU4+3US2lyyQ==",
       "requires": {
-        "d3-dispatch": "1",
-        "d3-selection": "1"
+        "d3-dispatch": "1.0.3",
+        "d3-selection": "1.4.0"
       }
     },
     "d3-dsv": {
@@ -4169,9 +4169,9 @@
       "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"
+        "commander": "2.15.1",
+        "iconv-lite": "0.4.19",
+        "rw": "1.3.3"
       }
     },
     "d3-ease": {
@@ -4200,7 +4200,7 @@
       "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"
+        "d3-array": "1.2.4"
       }
     },
     "d3-hierarchy": {
@@ -4213,7 +4213,7 @@
       "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.3.2.tgz",
       "integrity": "sha512-NlNKGopqaz9qM1PXh9gBF1KSCVh+jSFErrSlD/4hybwoNX/gt1d8CDbDW+3i+5UOHhjC6s6nMvRxcuoMVNgL2w==",
       "requires": {
-        "d3-color": "1"
+        "d3-color": "1.2.3"
       }
     },
     "d3-path": {
@@ -4246,10 +4246,10 @@
       "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"
+        "d3-collection": "1.0.4",
+        "d3-dispatch": "1.0.3",
+        "d3-dsv": "1.0.8",
+        "xmlhttprequest": "1.8.0"
       }
     },
     "d3-scale": {
@@ -4257,13 +4257,13 @@
       "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-1.0.7.tgz",
       "integrity": "sha512-KvU92czp2/qse5tUfGms6Kjig0AhHOwkzXG0+PqIJB3ke0WUv088AHMZI0OssO9NCkXt4RP8yju9rpH8aGB7Lw==",
       "requires": {
-        "d3-array": "^1.2.0",
-        "d3-collection": "1",
-        "d3-color": "1",
-        "d3-format": "1",
-        "d3-interpolate": "1",
-        "d3-time": "1",
-        "d3-time-format": "2"
+        "d3-array": "1.2.4",
+        "d3-collection": "1.0.4",
+        "d3-color": "1.2.3",
+        "d3-format": "1.3.2",
+        "d3-interpolate": "1.3.2",
+        "d3-time": "1.0.8",
+        "d3-time-format": "2.1.3"
       }
     },
     "d3-selection": {
@@ -4289,7 +4289,7 @@
       "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.1.3.tgz",
       "integrity": "sha512-6k0a2rZryzGm5Ihx+aFMuO1GgelgIz+7HhB4PH4OEndD5q2zGn1mDfRdNrulspOfR6JXkb2sThhDK41CSK85QA==",
       "requires": {
-        "d3-time": "1"
+        "d3-time": "1.0.8"
       }
     },
     "d3-timer": {
@@ -4302,12 +4302,12 @@
       "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-1.1.1.tgz",
       "integrity": "sha512-xeg8oggyQ+y5eb4J13iDgKIjUcEfIOZs2BqV/eEmXm2twx80wTzJ4tB4vaZ5BKfz7XsI/DFmQL5me6O27/5ykQ==",
       "requires": {
-        "d3-color": "1",
-        "d3-dispatch": "1",
-        "d3-ease": "1",
-        "d3-interpolate": "1",
-        "d3-selection": "^1.1.0",
-        "d3-timer": "1"
+        "d3-color": "1.2.3",
+        "d3-dispatch": "1.0.3",
+        "d3-ease": "1.0.3",
+        "d3-interpolate": "1.3.2",
+        "d3-selection": "1.4.0",
+        "d3-timer": "1.0.7"
       }
     },
     "d3-voronoi": {
@@ -4320,11 +4320,11 @@
       "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"
+        "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"
       }
     },
     "dashdash": {
@@ -4333,7 +4333,7 @@
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0"
+        "assert-plus": "1.0.0"
       }
     },
     "date-format": {
@@ -4397,7 +4397,7 @@
       "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
       "dev": true,
       "requires": {
-        "kind-of": "^5.0.2"
+        "kind-of": "5.1.0"
       },
       "dependencies": {
         "kind-of": {
@@ -4414,8 +4414,8 @@
       "integrity": "sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==",
       "dev": true,
       "requires": {
-        "execa": "^0.10.0",
-        "ip-regex": "^2.1.0"
+        "execa": "0.10.0",
+        "ip-regex": "2.1.0"
       },
       "dependencies": {
         "cross-spawn": {
@@ -4469,8 +4469,8 @@
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "requires": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
+        "is-descriptor": "1.0.2",
+        "isobject": "3.0.1"
       },
       "dependencies": {
         "is-accessor-descriptor": {
@@ -4478,7 +4478,7 @@
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-data-descriptor": {
@@ -4486,7 +4486,7 @@
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-descriptor": {
@@ -4494,9 +4494,9 @@
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
           }
         }
       }
@@ -4507,12 +4507,12 @@
       "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
       "dev": true,
       "requires": {
-        "globby": "^6.1.0",
-        "is-path-cwd": "^1.0.0",
-        "is-path-in-cwd": "^1.0.0",
-        "p-map": "^1.1.1",
-        "pify": "^3.0.0",
-        "rimraf": "^2.2.8"
+        "globby": "6.1.0",
+        "is-path-cwd": "1.0.0",
+        "is-path-in-cwd": "1.0.1",
+        "p-map": "1.2.0",
+        "pify": "3.0.0",
+        "rimraf": "2.6.2"
       },
       "dependencies": {
         "globby": {
@@ -4521,11 +4521,11 @@
           "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
           "dev": true,
           "requires": {
-            "array-union": "^1.0.1",
-            "glob": "^7.0.3",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "array-union": "1.0.2",
+            "glob": "7.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
           },
           "dependencies": {
             "pify": {
@@ -4556,12 +4556,12 @@
       "integrity": "sha1-fP7PXvffuAL60nq49b5a5UbFt54=",
       "dev": true,
       "requires": {
-        "async": "^1.5.2",
-        "bluebird": "^3.3.5",
-        "extend-shallow": "^2.0.1",
-        "lazy-cache": "^1.0.4",
-        "matched": "^0.4.1",
-        "rimraf": "^2.5.2"
+        "async": "1.5.2",
+        "bluebird": "3.5.1",
+        "extend-shallow": "2.0.1",
+        "lazy-cache": "1.0.4",
+        "matched": "0.4.4",
+        "rimraf": "2.6.2"
       },
       "dependencies": {
         "extend-shallow": {
@@ -4570,7 +4570,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         }
       }
@@ -4593,8 +4593,8 @@
       "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1"
       }
     },
     "destroy": {
@@ -4615,7 +4615,7 @@
       "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
       "dev": true,
       "requires": {
-        "repeating": "^2.0.0"
+        "repeating": "2.0.1"
       }
     },
     "detect-node": {
@@ -4642,9 +4642,9 @@
       "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
+        "bn.js": "4.11.8",
+        "miller-rabin": "4.0.1",
+        "randombytes": "2.1.0"
       }
     },
     "dir-glob": {
@@ -4669,8 +4669,8 @@
       "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
       "dev": true,
       "requires": {
-        "ip": "^1.1.0",
-        "safe-buffer": "^5.0.1"
+        "ip": "1.1.5",
+        "safe-buffer": "5.1.2"
       }
     },
     "dns-txt": {
@@ -4679,7 +4679,7 @@
       "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
       "dev": true,
       "requires": {
-        "buffer-indexof": "^1.0.0"
+        "buffer-indexof": "1.1.1"
       }
     },
     "doctrine": {
@@ -4688,8 +4688,8 @@
       "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
       "dev": true,
       "requires": {
-        "esutils": "^2.0.2",
-        "isarray": "^1.0.0"
+        "esutils": "2.0.2",
+        "isarray": "1.0.0"
       }
     },
     "dom-serialize": {
@@ -4698,10 +4698,10 @@
       "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
       "dev": true,
       "requires": {
-        "custom-event": "~1.0.0",
-        "ent": "~2.2.0",
-        "extend": "^3.0.0",
-        "void-elements": "^2.0.0"
+        "custom-event": "1.0.1",
+        "ent": "2.2.0",
+        "extend": "3.0.1",
+        "void-elements": "2.0.1"
       }
     },
     "domain-browser": {
@@ -4721,12 +4721,12 @@
       "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
       "dev": true,
       "requires": {
-        "is-obj": "^1.0.0"
+        "is-obj": "1.0.1"
       }
     },
     "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
     },
@@ -4754,8 +4754,8 @@
       "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
       "dev": true,
       "requires": {
-        "is-plain-object": "^2.0.1",
-        "object.defaults": "^1.1.0"
+        "is-plain-object": "2.0.4",
+        "object.defaults": "1.1.0"
       }
     },
     "ecc-jsbn": {
@@ -4813,7 +4813,7 @@
       "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
       "dev": true,
       "requires": {
-        "iconv-lite": "~0.4.13"
+        "iconv-lite": "0.4.19"
       }
     },
     "end-of-stream": {
@@ -4831,12 +4831,12 @@
       "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.4",
+        "accepts": "1.3.5",
         "base64id": "1.0.0",
         "cookie": "0.3.1",
-        "debug": "~3.1.0",
-        "engine.io-parser": "~2.1.0",
-        "ws": "~3.3.1"
+        "debug": "3.1.0",
+        "engine.io-parser": "2.1.3",
+        "ws": "3.3.3"
       },
       "dependencies": {
         "debug": {
@@ -4858,14 +4858,14 @@
       "requires": {
         "component-emitter": "1.2.1",
         "component-inherit": "0.0.3",
-        "debug": "~3.1.0",
-        "engine.io-parser": "~2.1.1",
+        "debug": "3.1.0",
+        "engine.io-parser": "2.1.3",
         "has-cors": "1.1.0",
         "indexof": "0.0.1",
         "parseqs": "0.0.5",
         "parseuri": "0.0.5",
-        "ws": "~3.3.1",
-        "xmlhttprequest-ssl": "~1.5.4",
+        "ws": "3.3.3",
+        "xmlhttprequest-ssl": "1.5.5",
         "yeast": "0.1.2"
       },
       "dependencies": {
@@ -4887,10 +4887,10 @@
       "dev": true,
       "requires": {
         "after": "0.8.2",
-        "arraybuffer.slice": "~0.0.7",
+        "arraybuffer.slice": "0.0.7",
         "base64-arraybuffer": "0.1.5",
         "blob": "0.0.5",
-        "has-binary2": "~1.0.2"
+        "has-binary2": "1.0.3"
       }
     },
     "enhanced-resolve": {
@@ -4899,9 +4899,9 @@
       "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.4.0",
-        "tapable": "^1.0.0"
+        "graceful-fs": "4.1.11",
+        "memory-fs": "0.4.1",
+        "tapable": "1.1.1"
       }
     },
     "ent": {
@@ -4922,7 +4922,7 @@
       "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
       "dev": true,
       "requires": {
-        "prr": "~1.0.1"
+        "prr": "1.0.1"
       }
     },
     "error-ex": {
@@ -4983,9 +4983,9 @@
       "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
+        "d": "1.0.0",
+        "es5-ext": "0.10.44",
+        "es6-symbol": "3.1.1"
       }
     },
     "es6-map": {
@@ -4994,12 +4994,12 @@
       "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14",
-        "es6-iterator": "~2.0.1",
-        "es6-set": "~0.1.5",
-        "es6-symbol": "~3.1.1",
-        "event-emitter": "~0.3.5"
+        "d": "1.0.0",
+        "es5-ext": "0.10.44",
+        "es6-iterator": "2.0.3",
+        "es6-set": "0.1.5",
+        "es6-symbol": "3.1.1",
+        "event-emitter": "0.3.5"
       }
     },
     "es6-promise": {
@@ -5014,7 +5014,7 @@
       "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
       "dev": true,
       "requires": {
-        "es6-promise": "^4.0.3"
+        "es6-promise": "4.2.4"
       }
     },
     "es6-set": {
@@ -5023,11 +5023,11 @@
       "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14",
-        "es6-iterator": "~2.0.1",
+        "d": "1.0.0",
+        "es5-ext": "0.10.44",
+        "es6-iterator": "2.0.3",
         "es6-symbol": "3.1.1",
-        "event-emitter": "~0.3.5"
+        "event-emitter": "0.3.5"
       }
     },
     "es6-symbol": {
@@ -5070,11 +5070,11 @@
       "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
       "dev": true,
       "requires": {
-        "esprima": "^2.7.1",
-        "estraverse": "^1.9.1",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1",
-        "source-map": "~0.2.0"
+        "esprima": "2.7.3",
+        "estraverse": "1.9.3",
+        "esutils": "2.0.2",
+        "optionator": "0.8.2",
+        "source-map": "0.2.0"
       },
       "dependencies": {
         "esprima": {
@@ -5096,7 +5096,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "amdefine": "1.0.1"
           }
         }
       }
@@ -5107,10 +5107,10 @@
       "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
       "dev": true,
       "requires": {
-        "es6-map": "^0.1.3",
-        "es6-weak-map": "^2.0.1",
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
+        "es6-map": "0.1.5",
+        "es6-weak-map": "2.0.2",
+        "esrecurse": "4.2.1",
+        "estraverse": "4.2.0"
       }
     },
     "eslint": {
@@ -5119,39 +5119,39 @@
       "integrity": "sha1-5MyPoPAJ+4KaquI4VaKTYL4fbBE=",
       "dev": true,
       "requires": {
-        "chalk": "^1.1.3",
-        "concat-stream": "^1.4.6",
-        "debug": "^2.1.1",
-        "doctrine": "^1.2.2",
-        "es6-map": "^0.1.3",
-        "escope": "^3.6.0",
-        "espree": "^3.1.6",
-        "estraverse": "^4.2.0",
-        "esutils": "^2.0.2",
-        "file-entry-cache": "^1.1.1",
-        "glob": "^7.0.3",
-        "globals": "^9.2.0",
-        "ignore": "^3.1.2",
-        "imurmurhash": "^0.1.4",
-        "inquirer": "^0.12.0",
-        "is-my-json-valid": "^2.10.0",
-        "is-resolvable": "^1.0.0",
-        "js-yaml": "^3.5.1",
-        "json-stable-stringify": "^1.0.0",
-        "levn": "^0.3.0",
-        "lodash": "^4.0.0",
-        "mkdirp": "^0.5.0",
-        "optionator": "^0.8.1",
-        "path-is-absolute": "^1.0.0",
-        "path-is-inside": "^1.0.1",
-        "pluralize": "^1.2.1",
-        "progress": "^1.1.8",
-        "require-uncached": "^1.0.2",
-        "shelljs": "^0.6.0",
-        "strip-json-comments": "~1.0.1",
-        "table": "^3.7.8",
-        "text-table": "~0.2.0",
-        "user-home": "^2.0.0"
+        "chalk": "1.1.3",
+        "concat-stream": "1.6.2",
+        "debug": "2.6.9",
+        "doctrine": "1.5.0",
+        "es6-map": "0.1.5",
+        "escope": "3.6.0",
+        "espree": "3.5.4",
+        "estraverse": "4.2.0",
+        "esutils": "2.0.2",
+        "file-entry-cache": "1.3.1",
+        "glob": "7.1.2",
+        "globals": "9.18.0",
+        "ignore": "3.3.8",
+        "imurmurhash": "0.1.4",
+        "inquirer": "0.12.0",
+        "is-my-json-valid": "2.17.2",
+        "is-resolvable": "1.1.0",
+        "js-yaml": "3.13.1",
+        "json-stable-stringify": "1.0.1",
+        "levn": "0.3.0",
+        "lodash": "4.17.10",
+        "mkdirp": "0.5.1",
+        "optionator": "0.8.2",
+        "path-is-absolute": "1.0.1",
+        "path-is-inside": "1.0.2",
+        "pluralize": "1.2.1",
+        "progress": "1.1.8",
+        "require-uncached": "1.0.3",
+        "shelljs": "0.6.1",
+        "strip-json-comments": "1.0.4",
+        "table": "3.8.3",
+        "text-table": "0.2.0",
+        "user-home": "2.0.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -5166,11 +5166,11 @@
           "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"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "lodash": {
@@ -5203,8 +5203,8 @@
       "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
       "dev": true,
       "requires": {
-        "acorn": "^5.5.0",
-        "acorn-jsx": "^3.0.0"
+        "acorn": "5.7.3",
+        "acorn-jsx": "3.0.1"
       },
       "dependencies": {
         "acorn": {
@@ -5227,7 +5227,7 @@
       "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
       "dev": true,
       "requires": {
-        "estraverse": "^4.1.0"
+        "estraverse": "4.2.0"
       }
     },
     "estraverse": {
@@ -5260,23 +5260,23 @@
       "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
+        "d": "1.0.0",
+        "es5-ext": "0.10.44"
       }
     },
     "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": {
-        "duplexer": "~0.1.1",
-        "from": "~0",
-        "map-stream": "~0.1.0",
+        "duplexer": "0.1.1",
+        "from": "0.1.7",
+        "map-stream": "0.1.0",
         "pause-stream": "0.0.11",
-        "split": "0.3",
-        "stream-combiner": "~0.0.4",
-        "through": "~2.3.1"
+        "split": "0.3.3",
+        "stream-combiner": "0.0.4",
+        "through": "2.3.8"
       }
     },
     "eventemitter3": {
@@ -5297,7 +5297,7 @@
       "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
       "dev": true,
       "requires": {
-        "original": "^1.0.0"
+        "original": "1.0.2"
       }
     },
     "evp_bytestokey": {
@@ -5306,8 +5306,8 @@
       "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
       "dev": true,
       "requires": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
+        "md5.js": "1.3.5",
+        "safe-buffer": "5.1.2"
       }
     },
     "execa": {
@@ -5389,13 +5389,13 @@
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
       "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
       "requires": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "debug": "2.6.9",
+        "define-property": "0.2.5",
+        "extend-shallow": "2.0.1",
+        "posix-character-classes": "0.1.1",
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
       },
       "dependencies": {
         "define-property": {
@@ -5403,7 +5403,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         },
         "extend-shallow": {
@@ -5411,7 +5411,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         }
       }
@@ -5446,7 +5446,7 @@
       "integrity": "sha1-C4HrqJflo9MdHD0QL48BRB5VlEk=",
       "dev": true,
       "requires": {
-        "os-homedir": "^1.0.1"
+        "os-homedir": "1.0.2"
       }
     },
     "express": {
@@ -5514,8 +5514,8 @@
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
       "requires": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
+        "assign-symbols": "1.0.0",
+        "is-extendable": "1.0.1"
       },
       "dependencies": {
         "is-extendable": {
@@ -5523,7 +5523,7 @@
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "requires": {
-            "is-plain-object": "^2.0.4"
+            "is-plain-object": "2.0.4"
           }
         }
       }
@@ -5555,14 +5555,14 @@
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
       "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
       "requires": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "array-unique": "0.3.2",
+        "define-property": "1.0.0",
+        "expand-brackets": "2.1.4",
+        "extend-shallow": "2.0.1",
+        "fragment-cache": "0.2.1",
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
       },
       "dependencies": {
         "define-property": {
@@ -5570,7 +5570,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "requires": {
-            "is-descriptor": "^1.0.0"
+            "is-descriptor": "1.0.2"
           }
         },
         "extend-shallow": {
@@ -5578,7 +5578,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         },
         "is-accessor-descriptor": {
@@ -5586,7 +5586,7 @@
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-data-descriptor": {
@@ -5594,7 +5594,7 @@
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-descriptor": {
@@ -5602,9 +5602,9 @@
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
           }
         }
       }
@@ -5621,10 +5621,10 @@
       "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
       "dev": true,
       "requires": {
-        "ansi-gray": "^0.1.1",
-        "color-support": "^1.1.3",
-        "parse-node-version": "^1.0.0",
-        "time-stamp": "^1.0.0"
+        "ansi-gray": "0.1.1",
+        "color-support": "1.1.3",
+        "parse-node-version": "1.0.1",
+        "time-stamp": "1.1.0"
       }
     },
     "fast-deep-equal": {
@@ -5670,7 +5670,7 @@
       "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
       "dev": true,
       "requires": {
-        "websocket-driver": ">=0.5.1"
+        "websocket-driver": "0.7.0"
       }
     },
     "figgy-pudding": {
@@ -5695,8 +5695,8 @@
       "integrity": "sha1-RMYepgeuS+nBQC9B9EJwy/4zT/g=",
       "dev": true,
       "requires": {
-        "flat-cache": "^1.2.1",
-        "object-assign": "^4.0.1"
+        "flat-cache": "1.3.0",
+        "object-assign": "4.1.1"
       }
     },
     "file-loader": {
@@ -5705,8 +5705,8 @@
       "integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.0.2",
-        "schema-utils": "^1.0.0"
+        "loader-utils": "1.2.3",
+        "schema-utils": "1.0.0"
       }
     },
     "fileset": {
@@ -5715,8 +5715,8 @@
       "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=",
       "dev": true,
       "requires": {
-        "glob": "^7.0.3",
-        "minimatch": "^3.0.3"
+        "glob": "7.1.2",
+        "minimatch": "3.0.4"
       }
     },
     "fill-range": {
@@ -5724,10 +5724,10 @@
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
       "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
       "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
+        "extend-shallow": "2.0.1",
+        "is-number": "3.0.0",
+        "repeat-string": "1.6.1",
+        "to-regex-range": "2.1.1"
       },
       "dependencies": {
         "extend-shallow": {
@@ -5735,7 +5735,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         }
       }
@@ -5761,9 +5761,9 @@
       "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
       "dev": true,
       "requires": {
-        "commondir": "^1.0.1",
-        "make-dir": "^1.0.0",
-        "pkg-dir": "^2.0.0"
+        "commondir": "1.0.1",
+        "make-dir": "1.3.0",
+        "pkg-dir": "2.0.0"
       }
     },
     "find-parent-dir": {
@@ -5778,7 +5778,7 @@
       "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
       "dev": true,
       "requires": {
-        "locate-path": "^2.0.0"
+        "locate-path": "2.0.0"
       }
     },
     "findup-sync": {
@@ -5787,10 +5787,10 @@
       "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
       "dev": true,
       "requires": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
+        "detect-file": "1.0.0",
+        "is-glob": "4.0.0",
+        "micromatch": "3.1.10",
+        "resolve-dir": "1.0.1"
       },
       "dependencies": {
         "expand-tilde": {
@@ -5799,7 +5799,7 @@
           "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
           "dev": true,
           "requires": {
-            "homedir-polyfill": "^1.0.1"
+            "homedir-polyfill": "1.0.1"
           }
         },
         "global-modules": {
@@ -5808,9 +5808,9 @@
           "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
           "dev": true,
           "requires": {
-            "global-prefix": "^1.0.1",
-            "is-windows": "^1.0.1",
-            "resolve-dir": "^1.0.0"
+            "global-prefix": "1.0.2",
+            "is-windows": "1.0.2",
+            "resolve-dir": "1.0.1"
           }
         },
         "global-prefix": {
@@ -5819,11 +5819,11 @@
           "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
           "dev": true,
           "requires": {
-            "expand-tilde": "^2.0.2",
-            "homedir-polyfill": "^1.0.1",
-            "ini": "^1.3.4",
-            "is-windows": "^1.0.1",
-            "which": "^1.2.14"
+            "expand-tilde": "2.0.2",
+            "homedir-polyfill": "1.0.1",
+            "ini": "1.3.5",
+            "is-windows": "1.0.2",
+            "which": "1.3.1"
           }
         },
         "resolve-dir": {
@@ -5832,8 +5832,8 @@
           "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
           "dev": true,
           "requires": {
-            "expand-tilde": "^2.0.0",
-            "global-modules": "^1.0.0"
+            "expand-tilde": "2.0.2",
+            "global-modules": "1.0.0"
           }
         }
       }
@@ -5844,11 +5844,11 @@
       "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
       "dev": true,
       "requires": {
-        "expand-tilde": "^2.0.2",
-        "is-plain-object": "^2.0.3",
-        "object.defaults": "^1.1.0",
-        "object.pick": "^1.2.0",
-        "parse-filepath": "^1.0.1"
+        "expand-tilde": "2.0.2",
+        "is-plain-object": "2.0.4",
+        "object.defaults": "1.1.0",
+        "object.pick": "1.3.0",
+        "parse-filepath": "1.0.2"
       },
       "dependencies": {
         "expand-tilde": {
@@ -5857,7 +5857,7 @@
           "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
           "dev": true,
           "requires": {
-            "homedir-polyfill": "^1.0.1"
+            "homedir-polyfill": "1.0.1"
           }
         }
       }
@@ -5970,7 +5970,7 @@
       "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
       "dev": true,
       "requires": {
-        "for-in": "^1.0.1"
+        "for-in": "1.0.2"
       }
     },
     "foreach": {
@@ -6016,7 +6016,7 @@
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
       "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
       "requires": {
-        "map-cache": "^0.2.2"
+        "map-cache": "0.2.2"
       }
     },
     "fresh": {
@@ -6037,8 +6037,8 @@
       "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
       }
     },
     "front-matter": {
@@ -6047,7 +6047,7 @@
       "integrity": "sha1-91mDufL0E75ljJPf172M5AePXNs=",
       "dev": true,
       "requires": {
-        "js-yaml": "^3.4.6"
+        "js-yaml": "3.13.1"
       }
     },
     "fs-access": {
@@ -6056,7 +6056,7 @@
       "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
       "dev": true,
       "requires": {
-        "null-check": "^1.0.0"
+        "null-check": "1.0.0"
       }
     },
     "fs-exists-sync": {
@@ -6071,9 +6071,9 @@
       "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^3.0.0",
-        "universalify": "^0.1.0"
+        "graceful-fs": "4.1.11",
+        "jsonfile": "3.0.1",
+        "universalify": "0.1.1"
       }
     },
     "fs-minipass": {
@@ -6091,8 +6091,8 @@
       "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.11",
-        "through2": "^2.0.3"
+        "graceful-fs": "4.1.11",
+        "through2": "2.0.3"
       }
     },
     "fs-write-stream-atomic": {
@@ -6101,10 +6101,10 @@
       "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "iferr": "^0.1.5",
-        "imurmurhash": "^0.1.4",
-        "readable-stream": "1 || 2"
+        "graceful-fs": "4.1.11",
+        "iferr": "0.1.5",
+        "imurmurhash": "0.1.4",
+        "readable-stream": "2.3.6"
       }
     },
     "fs.realpath": {
@@ -6130,8 +6130,7 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -6149,13 +6148,11 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
-          "optional": true,
           "requires": {
             "balanced-match": "1.0.0",
             "concat-map": "0.0.1"
@@ -6168,18 +6165,15 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -6282,8 +6276,7 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "ini": {
           "version": "1.3.5",
@@ -6293,7 +6286,6 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "1.0.1"
           }
@@ -6306,20 +6298,17 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "1.1.11"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "5.1.2",
             "yallist": "3.0.3"
@@ -6336,7 +6325,6 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -6409,8 +6397,7 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -6420,7 +6407,6 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
-          "optional": true,
           "requires": {
             "wrappy": "1.0.2"
           }
@@ -6496,8 +6482,7 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -6527,7 +6512,6 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
-          "optional": true,
           "requires": {
             "code-point-at": "1.1.0",
             "is-fullwidth-code-point": "1.0.0",
@@ -6545,7 +6529,6 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "2.1.1"
           }
@@ -6584,13 +6567,11 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "yallist": {
           "version": "3.0.3",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         }
       }
     },
@@ -6618,14 +6599,14 @@
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "dev": true,
       "requires": {
-        "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"
+        "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"
       }
     },
     "gaze": {
@@ -6634,7 +6615,7 @@
       "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
       "dev": true,
       "requires": {
-        "globule": "^1.0.0"
+        "globule": "1.2.1"
       }
     },
     "generate-function": {
@@ -6649,7 +6630,7 @@
       "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
       "dev": true,
       "requires": {
-        "is-property": "^1.0.0"
+        "is-property": "1.0.2"
       }
     },
     "genfun": {
@@ -6687,7 +6668,7 @@
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0"
+        "assert-plus": "1.0.0"
       }
     },
     "glob": {
@@ -6709,8 +6690,8 @@
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
       "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
       "requires": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
+        "is-glob": "3.1.0",
+        "path-dirname": "1.0.2"
       },
       "dependencies": {
         "is-glob": {
@@ -6718,7 +6699,7 @@
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
           "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
           "requires": {
-            "is-extglob": "^2.1.0"
+            "is-extglob": "2.1.1"
           }
         }
       }
@@ -6729,16 +6710,16 @@
       "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
       "dev": true,
       "requires": {
-        "extend": "^3.0.0",
-        "glob": "^7.1.1",
-        "glob-parent": "^3.1.0",
-        "is-negated-glob": "^1.0.0",
-        "ordered-read-streams": "^1.0.0",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.1.5",
-        "remove-trailing-separator": "^1.0.1",
-        "to-absolute-glob": "^2.0.0",
-        "unique-stream": "^2.0.2"
+        "extend": "3.0.1",
+        "glob": "7.1.2",
+        "glob-parent": "3.1.0",
+        "is-negated-glob": "1.0.0",
+        "ordered-read-streams": "1.0.1",
+        "pumpify": "1.5.1",
+        "readable-stream": "2.3.6",
+        "remove-trailing-separator": "1.1.0",
+        "to-absolute-glob": "2.0.2",
+        "unique-stream": "2.3.1"
       }
     },
     "glob-to-regexp": {
@@ -6753,12 +6734,12 @@
       "integrity": "sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==",
       "dev": true,
       "requires": {
-        "anymatch": "^2.0.0",
-        "async-done": "^1.2.0",
-        "chokidar": "^2.0.0",
-        "is-negated-glob": "^1.0.0",
-        "just-debounce": "^1.0.0",
-        "object.defaults": "^1.1.0"
+        "anymatch": "2.0.0",
+        "async-done": "1.3.1",
+        "chokidar": "2.0.3",
+        "is-negated-glob": "1.0.0",
+        "just-debounce": "1.0.0",
+        "object.defaults": "1.1.0"
       }
     },
     "global-dirs": {
@@ -6767,7 +6748,7 @@
       "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
       "dev": true,
       "requires": {
-        "ini": "^1.3.4"
+        "ini": "1.3.5"
       }
     },
     "global-modules": {
@@ -6776,8 +6757,8 @@
       "integrity": "sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0=",
       "dev": true,
       "requires": {
-        "global-prefix": "^0.1.4",
-        "is-windows": "^0.2.0"
+        "global-prefix": "0.1.5",
+        "is-windows": "0.2.0"
       },
       "dependencies": {
         "is-windows": {
@@ -6794,10 +6775,10 @@
       "integrity": "sha1-jTvGuNo8qBEqFg2NSW/wRiv+948=",
       "dev": true,
       "requires": {
-        "homedir-polyfill": "^1.0.0",
-        "ini": "^1.3.4",
-        "is-windows": "^0.2.0",
-        "which": "^1.2.12"
+        "homedir-polyfill": "1.0.1",
+        "ini": "1.3.5",
+        "is-windows": "0.2.0",
+        "which": "1.3.1"
       },
       "dependencies": {
         "is-windows": {
@@ -6835,9 +6816,9 @@
       "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
       "dev": true,
       "requires": {
-        "glob": "~7.1.1",
-        "lodash": "~4.17.10",
-        "minimatch": "~3.0.2"
+        "glob": "7.1.2",
+        "lodash": "4.17.10",
+        "minimatch": "3.0.4"
       },
       "dependencies": {
         "lodash": {
@@ -6854,7 +6835,7 @@
       "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
       "dev": true,
       "requires": {
-        "sparkles": "^1.0.0"
+        "sparkles": "1.0.1"
       }
     },
     "gonzales-pe-sl": {
@@ -6863,7 +6844,7 @@
       "integrity": "sha1-aoaLw4BkXxQf7rBCxvl/zHG1n+Y=",
       "dev": true,
       "requires": {
-        "minimist": "1.1.x"
+        "minimist": "1.1.3"
       },
       "dependencies": {
         "minimist": {
@@ -6880,17 +6861,17 @@
       "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
       "dev": true,
       "requires": {
-        "create-error-class": "^3.0.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^3.0.0",
-        "is-redirect": "^1.0.0",
-        "is-retry-allowed": "^1.0.0",
-        "is-stream": "^1.0.0",
-        "lowercase-keys": "^1.0.0",
-        "safe-buffer": "^5.0.1",
-        "timed-out": "^4.0.0",
-        "unzip-response": "^2.0.1",
-        "url-parse-lax": "^1.0.0"
+        "create-error-class": "3.0.2",
+        "duplexer3": "0.1.4",
+        "get-stream": "3.0.0",
+        "is-redirect": "1.0.0",
+        "is-retry-allowed": "1.1.0",
+        "is-stream": "1.1.0",
+        "lowercase-keys": "1.0.1",
+        "safe-buffer": "5.1.2",
+        "timed-out": "4.0.1",
+        "unzip-response": "2.0.1",
+        "url-parse-lax": "1.0.0"
       }
     },
     "graceful-fs": {
@@ -6904,7 +6885,7 @@
       "integrity": "sha1-5ZnkBzPvgOFlO/6JpfAx7PKqSqo=",
       "dev": true,
       "requires": {
-        "temp": "~0.4.0"
+        "temp": "0.4.0"
       }
     },
     "gulp": {
@@ -6913,10 +6894,10 @@
       "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
       "dev": true,
       "requires": {
-        "glob-watcher": "^5.0.3",
-        "gulp-cli": "^2.2.0",
-        "undertaker": "^1.2.1",
-        "vinyl-fs": "^3.0.0"
+        "glob-watcher": "5.0.3",
+        "gulp-cli": "2.2.0",
+        "undertaker": "1.2.1",
+        "vinyl-fs": "3.0.3"
       },
       "dependencies": {
         "camelcase": {
@@ -6942,24 +6923,24 @@
           "integrity": "sha512-rGs3bVYHdyJpLqR0TUBnlcZ1O5O++Zs4bA0ajm+zr3WFCfiSLjGwoCBqFs18wzN+ZxahT9DkOK5nDf26iDsWjA==",
           "dev": true,
           "requires": {
-            "ansi-colors": "^1.0.1",
-            "archy": "^1.0.0",
-            "array-sort": "^1.0.0",
-            "color-support": "^1.1.3",
-            "concat-stream": "^1.6.0",
-            "copy-props": "^2.0.1",
-            "fancy-log": "^1.3.2",
-            "gulplog": "^1.0.0",
-            "interpret": "^1.1.0",
-            "isobject": "^3.0.1",
-            "liftoff": "^3.1.0",
-            "matchdep": "^2.0.0",
-            "mute-stdout": "^1.0.0",
-            "pretty-hrtime": "^1.0.0",
-            "replace-homedir": "^1.0.0",
-            "semver-greatest-satisfied-range": "^1.1.0",
-            "v8flags": "^3.0.1",
-            "yargs": "^7.1.0"
+            "ansi-colors": "1.1.0",
+            "archy": "1.0.0",
+            "array-sort": "1.0.0",
+            "color-support": "1.1.3",
+            "concat-stream": "1.6.2",
+            "copy-props": "2.0.4",
+            "fancy-log": "1.3.3",
+            "gulplog": "1.0.0",
+            "interpret": "1.1.0",
+            "isobject": "3.0.1",
+            "liftoff": "3.1.0",
+            "matchdep": "2.0.0",
+            "mute-stdout": "1.0.1",
+            "pretty-hrtime": "1.0.3",
+            "replace-homedir": "1.0.0",
+            "semver-greatest-satisfied-range": "1.1.0",
+            "v8flags": "3.1.0",
+            "yargs": "7.1.0"
           }
         },
         "y18n": {
@@ -6997,11 +6978,11 @@
       "integrity": "sha512-I+697f6jf+PncdTrqfuwoauxgnLG1yHRg3vlmvDgmJuEnlEHy4meBktJ/oHgfyg4tp6X25wuZqUOraVeVg97wQ==",
       "dev": true,
       "requires": {
-        "get-stream": "^3.0.0",
-        "plugin-error": "^0.1.2",
-        "through2": "^2.0.1",
-        "vinyl": "^2.1.0",
-        "yazl": "^2.1.0"
+        "get-stream": "3.0.0",
+        "plugin-error": "0.1.2",
+        "through2": "2.0.3",
+        "vinyl": "2.1.0",
+        "yazl": "2.4.3"
       }
     },
     "gulplog": {
@@ -7010,7 +6991,7 @@
       "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
       "dev": true,
       "requires": {
-        "glogg": "^1.0.0"
+        "glogg": "1.0.2"
       }
     },
     "hammerjs": {
@@ -7056,8 +7037,8 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "commander": "~2.20.0",
-            "source-map": "~0.6.1"
+            "commander": "2.20.0",
+            "source-map": "0.6.1"
           }
         }
       }
@@ -7074,8 +7055,8 @@
       "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
       "dev": true,
       "requires": {
-        "ajv": "^6.5.5",
-        "har-schema": "^2.0.0"
+        "ajv": "6.9.1",
+        "har-schema": "2.0.0"
       },
       "dependencies": {
         "ajv": {
@@ -7119,7 +7100,7 @@
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "dev": true,
       "requires": {
-        "function-bind": "^1.1.1"
+        "function-bind": "1.1.1"
       }
     },
     "has-ansi": {
@@ -7128,7 +7109,7 @@
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
       "dev": true,
       "requires": {
-        "ansi-regex": "^2.0.0"
+        "ansi-regex": "2.1.1"
       }
     },
     "has-binary2": {
@@ -7166,7 +7147,7 @@
       "integrity": "sha1-omHEwqbGZ+DHe3AKfyl8Oe86pYk=",
       "dev": true,
       "requires": {
-        "is-glob": "^2.0.1"
+        "is-glob": "2.0.1"
       },
       "dependencies": {
         "is-extglob": {
@@ -7181,7 +7162,7 @@
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
           "requires": {
-            "is-extglob": "^1.0.0"
+            "is-extglob": "1.0.0"
           }
         }
       }
@@ -7203,9 +7184,9 @@
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
       "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
       "requires": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
+        "get-value": "2.0.6",
+        "has-values": "1.0.0",
+        "isobject": "3.0.1"
       }
     },
     "has-values": {
@@ -7213,8 +7194,8 @@
       "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
       "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
       "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
+        "is-number": "3.0.0",
+        "kind-of": "4.0.0"
       },
       "dependencies": {
         "kind-of": {
@@ -7222,7 +7203,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -7233,8 +7214,8 @@
       "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
       }
     },
     "hash.js": {
@@ -7243,8 +7224,8 @@
       "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1"
       }
     },
     "hmac-drbg": {
@@ -7253,9 +7234,9 @@
       "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
       "dev": true,
       "requires": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
+        "hash.js": "1.1.7",
+        "minimalistic-assert": "1.0.1",
+        "minimalistic-crypto-utils": "1.0.1"
       }
     },
     "homedir-polyfill": {
@@ -7279,10 +7260,10 @@
       "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
+        "inherits": "2.0.3",
+        "obuf": "1.1.2",
+        "readable-stream": "2.3.6",
+        "wbuf": "1.7.3"
       }
     },
     "html-entities": {
@@ -7338,7 +7319,7 @@
       "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
       "dev": true,
       "requires": {
-        "agent-base": "4",
+        "agent-base": "4.2.0",
         "debug": "3.1.0"
       },
       "dependencies": {
@@ -7359,10 +7340,10 @@
       "integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
       "dev": true,
       "requires": {
-        "http-proxy": "^1.16.2",
-        "is-glob": "^4.0.0",
-        "lodash": "^4.17.5",
-        "micromatch": "^3.1.9"
+        "http-proxy": "1.17.0",
+        "is-glob": "4.0.0",
+        "lodash": "4.17.10",
+        "micromatch": "3.1.10"
       },
       "dependencies": {
         "lodash": {
@@ -7379,9 +7360,9 @@
       "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
+        "assert-plus": "1.0.0",
+        "jsprim": "1.4.1",
+        "sshpk": "1.14.1"
       }
     },
     "https-browserify": {
@@ -7417,7 +7398,7 @@
       "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=",
       "dev": true,
       "requires": {
-        "ms": "^2.0.0"
+        "ms": "2.0.0"
       }
     },
     "iconv-lite": {
@@ -7476,7 +7457,7 @@
       "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
       "dev": true,
       "requires": {
-        "import-from": "^2.1.0"
+        "import-from": "2.1.0"
       }
     },
     "import-from": {
@@ -7485,7 +7466,7 @@
       "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
       "dev": true,
       "requires": {
-        "resolve-from": "^3.0.0"
+        "resolve-from": "3.0.0"
       }
     },
     "import-lazy": {
@@ -7500,8 +7481,8 @@
       "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
       "dev": true,
       "requires": {
-        "pkg-dir": "^3.0.0",
-        "resolve-cwd": "^2.0.0"
+        "pkg-dir": "3.0.0",
+        "resolve-cwd": "2.0.0"
       },
       "dependencies": {
         "find-up": {
@@ -7510,7 +7491,7 @@
           "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
-            "locate-path": "^3.0.0"
+            "locate-path": "3.0.0"
           }
         },
         "locate-path": {
@@ -7519,8 +7500,8 @@
           "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"
           }
         },
         "p-limit": {
@@ -7538,7 +7519,7 @@
           "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "dev": true,
           "requires": {
-            "p-limit": "^2.0.0"
+            "p-limit": "2.1.0"
           }
         },
         "p-try": {
@@ -7553,7 +7534,7 @@
           "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
           "dev": true,
           "requires": {
-            "find-up": "^3.0.0"
+            "find-up": "3.0.0"
           }
         }
       }
@@ -7576,7 +7557,7 @@
       "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
       "dev": true,
       "requires": {
-        "repeating": "^2.0.0"
+        "repeating": "2.0.1"
       }
     },
     "indexof": {
@@ -7591,8 +7572,8 @@
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "dev": true,
       "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+        "once": "1.4.0",
+        "wrappy": "1.0.2"
       }
     },
     "inherits": {
@@ -7672,8 +7653,8 @@
       "integrity": "sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==",
       "dev": true,
       "requires": {
-        "default-gateway": "^2.6.0",
-        "ipaddr.js": "^1.5.2"
+        "default-gateway": "2.7.2",
+        "ipaddr.js": "1.8.0"
       }
     },
     "interpret": {
@@ -7693,7 +7674,7 @@
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
       "dev": true,
       "requires": {
-        "loose-envify": "^1.0.0"
+        "loose-envify": "1.3.1"
       }
     },
     "invert-kv": {
@@ -7726,8 +7707,8 @@
       "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
       "dev": true,
       "requires": {
-        "is-relative": "^1.0.0",
-        "is-windows": "^1.0.1"
+        "is-relative": "1.0.0",
+        "is-windows": "1.0.2"
       }
     },
     "is-accessor-descriptor": {
@@ -7735,7 +7716,7 @@
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "requires": {
-        "kind-of": "^3.0.2"
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "kind-of": {
@@ -7743,7 +7724,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -7759,7 +7740,7 @@
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
       "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
       "requires": {
-        "binary-extensions": "^1.0.0"
+        "binary-extensions": "1.11.0"
       }
     },
     "is-buffer": {
@@ -7788,7 +7769,7 @@
       "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
       "dev": true,
       "requires": {
-        "ci-info": "^1.5.0"
+        "ci-info": "1.6.0"
       }
     },
     "is-data-descriptor": {
@@ -7796,7 +7777,7 @@
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "requires": {
-        "kind-of": "^3.0.2"
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "kind-of": {
@@ -7804,7 +7785,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -7820,9 +7801,9 @@
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
       "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "requires": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "is-accessor-descriptor": "0.1.6",
+        "is-data-descriptor": "0.1.4",
+        "kind-of": "5.1.0"
       },
       "dependencies": {
         "kind-of": {
@@ -7854,7 +7835,7 @@
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
       "dev": true,
       "requires": {
-        "number-is-nan": "^1.0.0"
+        "number-is-nan": "1.0.1"
       }
     },
     "is-fullwidth-code-point": {
@@ -7863,7 +7844,7 @@
       "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
       "dev": true,
       "requires": {
-        "number-is-nan": "^1.0.0"
+        "number-is-nan": "1.0.1"
       }
     },
     "is-glob": {
@@ -7880,8 +7861,8 @@
       "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=",
       "dev": true,
       "requires": {
-        "global-dirs": "^0.1.0",
-        "is-path-inside": "^1.0.0"
+        "global-dirs": "0.1.1",
+        "is-path-inside": "1.0.1"
       }
     },
     "is-module": {
@@ -7926,7 +7907,7 @@
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
       "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
       "requires": {
-        "kind-of": "^3.0.2"
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "kind-of": {
@@ -7934,7 +7915,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -7972,7 +7953,7 @@
       "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
       "dev": true,
       "requires": {
-        "is-path-inside": "^1.0.0"
+        "is-path-inside": "1.0.1"
       }
     },
     "is-path-inside": {
@@ -7981,7 +7962,7 @@
       "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
       "dev": true,
       "requires": {
-        "path-is-inside": "^1.0.1"
+        "path-is-inside": "1.0.2"
       }
     },
     "is-plain-object": {
@@ -7989,7 +7970,7 @@
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "requires": {
-        "isobject": "^3.0.1"
+        "isobject": "3.0.1"
       }
     },
     "is-promise": {
@@ -8016,7 +7997,7 @@
       "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
       "dev": true,
       "requires": {
-        "has": "^1.0.1"
+        "has": "1.0.3"
       }
     },
     "is-relative": {
@@ -8025,7 +8006,7 @@
       "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
       "dev": true,
       "requires": {
-        "is-unc-path": "^1.0.0"
+        "is-unc-path": "1.0.0"
       }
     },
     "is-resolvable": {
@@ -8070,7 +8051,7 @@
       "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
       "dev": true,
       "requires": {
-        "unc-path-regex": "^0.1.2"
+        "unc-path-regex": "0.1.2"
       }
     },
     "is-utf8": {
@@ -8107,7 +8088,7 @@
       "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
       "dev": true,
       "requires": {
-        "buffer-alloc": "^1.2.0"
+        "buffer-alloc": "1.2.0"
       }
     },
     "isexe": {
@@ -8133,20 +8114,20 @@
       "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
       "dev": true,
       "requires": {
-        "abbrev": "1.0.x",
-        "async": "1.x",
-        "escodegen": "1.8.x",
-        "esprima": "2.7.x",
-        "glob": "^5.0.15",
-        "handlebars": "^4.0.1",
-        "js-yaml": "3.x",
-        "mkdirp": "0.5.x",
-        "nopt": "3.x",
-        "once": "1.x",
-        "resolve": "1.1.x",
-        "supports-color": "^3.1.0",
-        "which": "^1.1.1",
-        "wordwrap": "^1.0.0"
+        "abbrev": "1.0.9",
+        "async": "1.5.2",
+        "escodegen": "1.8.1",
+        "esprima": "2.7.3",
+        "glob": "5.0.15",
+        "handlebars": "4.1.1",
+        "js-yaml": "3.13.1",
+        "mkdirp": "0.5.1",
+        "nopt": "3.0.6",
+        "once": "1.4.0",
+        "resolve": "1.1.7",
+        "supports-color": "3.2.3",
+        "which": "1.3.1",
+        "wordwrap": "1.0.0"
       },
       "dependencies": {
         "esprima": {
@@ -8161,11 +8142,11 @@
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
           "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^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"
           }
         },
         "has-flag": {
@@ -8186,7 +8167,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "^1.0.0"
+            "has-flag": "1.0.0"
           }
         }
       }
@@ -8232,7 +8213,10 @@
           "version": "3.2.6",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
           "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
         },
         "default-require-extensions": {
           "version": "1.0.0",
@@ -8270,13 +8254,13 @@
           "integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==",
           "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-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.5.0"
           }
         },
         "istanbul-lib-report": {
@@ -8285,10 +8269,10 @@
           "integrity": "sha512-UsYfRMoi6QO/doUshYNqcKJqVmFe9w51GZz8BS3WB0lYxAllQYklka2wP9+dGZeHYaWIdcXUx8JGdbqaoXRXzw==",
           "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": "1.2.1",
+            "mkdirp": "0.5.1",
+            "path-parse": "1.0.5",
+            "supports-color": "3.2.3"
           }
         },
         "istanbul-lib-source-maps": {
@@ -8297,11 +8281,11 @@
           "integrity": "sha512-TtbsY5GIHgbMsMiRw35YBHGpZ1DVFEO19vxxeiDMYaeOFOCzfnYVxvl6pOUIZR4dtPhAGpSMup8OyF8ubsaqEg==",
           "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": "3.2.6",
+            "istanbul-lib-coverage": "1.2.1",
+            "mkdirp": "0.5.1",
+            "rimraf": "2.6.2",
+            "source-map": "0.5.6"
           }
         },
         "istanbul-reports": {
@@ -8310,13 +8294,14 @@
           "integrity": "sha512-+cfoZ0UXzWjhAdzosCPP3AN8vvef8XDkWtTfgaN+7L3YTpNYITnCaEkceo5SEYy644VkHka/P1FvkWvrG/rrJw==",
           "dev": true,
           "requires": {
-            "handlebars": "^4.0.3"
+            "handlebars": "4.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=="
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
         },
         "supports-color": {
           "version": "3.2.3",
@@ -8324,7 +8309,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "^1.0.0"
+            "has-flag": "1.0.0"
           }
         }
       }
@@ -8335,10 +8320,10 @@
       "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"
+        "convert-source-map": "1.5.1",
+        "istanbul-lib-instrument": "1.10.1",
+        "loader-utils": "1.2.3",
+        "schema-utils": "0.3.0"
       },
       "dependencies": {
         "ajv": {
@@ -8347,10 +8332,10 @@
           "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
           "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"
+            "co": "4.6.0",
+            "fast-deep-equal": "1.1.0",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.3.1"
           }
         },
         "schema-utils": {
@@ -8359,7 +8344,7 @@
           "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
           "dev": true,
           "requires": {
-            "ajv": "^5.0.0"
+            "ajv": "5.5.2"
           }
         }
       }
@@ -8376,13 +8361,13 @@
       "integrity": "sha512-1dYuzkOCbuR5GRJqySuZdsmsNKPL3PTuyPevQfoCXJePT9C8y1ga75neU+Tuy9+yS3G/dgx8wgOmp2KLpgdoeQ==",
       "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.0",
-        "semver": "^5.3.0"
+        "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.0",
+        "semver": "5.5.0"
       }
     },
     "jasmine": {
@@ -8391,9 +8376,9 @@
       "integrity": "sha1-awicChFXax8W3xG4AUbZHU6Lij4=",
       "dev": true,
       "requires": {
-        "exit": "^0.1.2",
-        "glob": "^7.0.6",
-        "jasmine-core": "~2.8.0"
+        "exit": "0.1.2",
+        "glob": "7.1.2",
+        "jasmine-core": "2.8.0"
       },
       "dependencies": {
         "jasmine-core": {
@@ -8443,8 +8428,8 @@
       "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
       "dev": true,
       "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
+        "argparse": "1.0.10",
+        "esprima": "4.0.1"
       }
     },
     "jsbn": {
@@ -8484,7 +8469,7 @@
       "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
       "dev": true,
       "requires": {
-        "jsonify": "~0.0.0"
+        "jsonify": "0.0.0"
       }
     },
     "json-stable-stringify-without-jsonify": {
@@ -8511,7 +8496,7 @@
       "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
       "dev": true,
       "requires": {
-        "minimist": "^1.2.0"
+        "minimist": "1.2.0"
       },
       "dependencies": {
         "minimist": {
@@ -8567,10 +8552,10 @@
       "integrity": "sha512-NmKajvAFQpbg3taXQXr/ccS2wcucR1AZ+NtyWp2Nq7HHVsXhcJFR8p0Baf32C2yVvBylFWVeKf+WI2AnvlPhpA==",
       "dev": true,
       "requires": {
-        "lie": "~3.3.0",
-        "pako": "~1.0.2",
-        "readable-stream": "~2.3.6",
-        "set-immediate-shim": "~1.0.1"
+        "lie": "3.3.0",
+        "pako": "1.0.6",
+        "readable-stream": "2.3.6",
+        "set-immediate-shim": "1.0.1"
       }
     },
     "just-debounce": {
@@ -8730,8 +8715,8 @@
       "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==",
       "dev": true,
       "requires": {
-        "fs-access": "^1.0.0",
-        "which": "^1.2.1"
+        "fs-access": "1.0.1",
+        "which": "1.3.1"
       }
     },
     "karma-cli": {
@@ -8740,7 +8725,7 @@
       "integrity": "sha1-rmw8WKMTodALRRZMRVubhs4X+WA=",
       "dev": true,
       "requires": {
-        "resolve": "^1.1.6"
+        "resolve": "1.7.1"
       }
     },
     "karma-coverage-istanbul-reporter": {
@@ -8759,7 +8744,7 @@
       "integrity": "sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==",
       "dev": true,
       "requires": {
-        "jasmine-core": "^3.3"
+        "jasmine-core": "3.3.0"
       }
     },
     "karma-jasmine-html-reporter": {
@@ -8774,7 +8759,7 @@
       "integrity": "sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==",
       "dev": true,
       "requires": {
-        "source-map-support": "^0.5.5"
+        "source-map-support": "0.5.10"
       }
     },
     "karma-spec-reporter": {
@@ -8783,7 +8768,7 @@
       "integrity": "sha1-SDDccUihVcfXoYbmMjOaDYD63sM=",
       "dev": true,
       "requires": {
-        "colors": "^1.1.2"
+        "colors": "1.1.2"
       }
     },
     "killable": {
@@ -8803,7 +8788,7 @@
       "integrity": "sha1-PTvNhgDnv971MjHHOf8FOu1WDkQ=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.11"
+        "graceful-fs": "4.1.11"
       }
     },
     "known-css-properties": {
@@ -8818,8 +8803,8 @@
       "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
       "dev": true,
       "requires": {
-        "default-resolution": "^2.0.0",
-        "es6-weak-map": "^2.0.1"
+        "default-resolution": "2.0.0",
+        "es6-weak-map": "2.0.2"
       }
     },
     "latest-version": {
@@ -8828,7 +8813,7 @@
       "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
       "dev": true,
       "requires": {
-        "package-json": "^4.0.0"
+        "package-json": "4.0.1"
       }
     },
     "lazy-cache": {
@@ -8843,7 +8828,7 @@
       "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
       "dev": true,
       "requires": {
-        "readable-stream": "^2.0.5"
+        "readable-stream": "2.3.6"
       }
     },
     "lcid": {
@@ -8852,7 +8837,7 @@
       "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
       "dev": true,
       "requires": {
-        "invert-kv": "^1.0.0"
+        "invert-kv": "1.0.0"
       }
     },
     "lead": {
@@ -8861,7 +8846,7 @@
       "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
       "dev": true,
       "requires": {
-        "flush-write-stream": "^1.0.2"
+        "flush-write-stream": "1.0.3"
       }
     },
     "less": {
@@ -8870,15 +8855,15 @@
       "integrity": "sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==",
       "dev": true,
       "requires": {
-        "clone": "^2.1.2",
-        "errno": "^0.1.1",
-        "graceful-fs": "^4.1.2",
-        "image-size": "~0.5.0",
-        "mime": "^1.4.1",
-        "mkdirp": "^0.5.0",
-        "promise": "^7.1.1",
-        "request": "^2.83.0",
-        "source-map": "~0.6.0"
+        "clone": "2.1.2",
+        "errno": "0.1.7",
+        "graceful-fs": "4.1.11",
+        "image-size": "0.5.5",
+        "mime": "1.6.0",
+        "mkdirp": "0.5.1",
+        "promise": "7.3.1",
+        "request": "2.88.0",
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "clone": {
@@ -8902,9 +8887,9 @@
       "integrity": "sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==",
       "dev": true,
       "requires": {
-        "clone": "^2.1.1",
-        "loader-utils": "^1.1.0",
-        "pify": "^3.0.0"
+        "clone": "2.1.1",
+        "loader-utils": "1.2.3",
+        "pify": "3.0.0"
       }
     },
     "less-plugin-npm-import": {
@@ -8913,8 +8898,8 @@
       "integrity": "sha1-gj5phskzGKmBccqFiEi2vq1Vvz4=",
       "dev": true,
       "requires": {
-        "promise": "~7.0.1",
-        "resolve": "~1.1.6"
+        "promise": "7.0.4",
+        "resolve": "1.1.7"
       },
       "dependencies": {
         "promise": {
@@ -8923,7 +8908,7 @@
           "integrity": "sha1-Nj6EpMNsg1a4kP7WLJHOhdAu1Tk=",
           "dev": true,
           "requires": {
-            "asap": "~2.0.3"
+            "asap": "2.0.6"
           }
         },
         "resolve": {
@@ -8940,8 +8925,8 @@
       "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
       "dev": true,
       "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2"
       }
     },
     "license-webpack-plugin": {
@@ -8950,8 +8935,8 @@
       "integrity": "sha512-vDiBeMWxjE9n6TabQ9J4FH8urFdsRK0Nvxn1cit9biCiR9aq1zBR0X2BlAkEiIG6qPamLeU0GzvIgLkrFc398A==",
       "dev": true,
       "requires": {
-        "@types/webpack-sources": "^0.1.5",
-        "webpack-sources": "^1.2.0"
+        "@types/webpack-sources": "0.1.5",
+        "webpack-sources": "1.3.0"
       }
     },
     "lie": {
@@ -8960,7 +8945,7 @@
       "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
       "dev": true,
       "requires": {
-        "immediate": "~3.0.5"
+        "immediate": "3.0.6"
       }
     },
     "liftoff": {
@@ -8969,14 +8954,14 @@
       "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
       "dev": true,
       "requires": {
-        "extend": "^3.0.0",
-        "findup-sync": "^3.0.0",
-        "fined": "^1.0.1",
-        "flagged-respawn": "^1.0.0",
-        "is-plain-object": "^2.0.4",
-        "object.map": "^1.0.0",
-        "rechoir": "^0.6.2",
-        "resolve": "^1.1.7"
+        "extend": "3.0.1",
+        "findup-sync": "3.0.0",
+        "fined": "1.2.0",
+        "flagged-respawn": "1.0.1",
+        "is-plain-object": "2.0.4",
+        "object.map": "1.0.1",
+        "rechoir": "0.6.2",
+        "resolve": "1.7.1"
       }
     },
     "load-json-file": {
@@ -8985,11 +8970,11 @@
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
+        "graceful-fs": "4.1.11",
+        "parse-json": "2.2.0",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1",
+        "strip-bom": "2.0.0"
       },
       "dependencies": {
         "pify": {
@@ -9012,9 +8997,9 @@
       "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
       "dev": true,
       "requires": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^2.0.0",
-        "json5": "^1.0.1"
+        "big.js": "5.2.2",
+        "emojis-list": "2.1.0",
+        "json5": "1.0.1"
       }
     },
     "locate-path": {
@@ -9023,8 +9008,8 @@
       "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
       "dev": true,
       "requires": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
+        "p-locate": "2.0.0",
+        "path-exists": "3.0.0"
       }
     },
     "lodash": {
@@ -9084,10 +9069,10 @@
       "integrity": "sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==",
       "dev": true,
       "requires": {
-        "circular-json": "^0.5.5",
-        "date-format": "^1.2.0",
-        "debug": "^3.1.0",
-        "rfdc": "^1.1.2",
+        "circular-json": "0.5.9",
+        "date-format": "1.2.0",
+        "debug": "3.2.6",
+        "rfdc": "1.1.2",
         "streamroller": "0.7.0"
       },
       "dependencies": {
@@ -9103,7 +9088,7 @@
           "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.1"
           }
         },
         "ms": {
@@ -9141,8 +9126,8 @@
       "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
       "dev": true,
       "requires": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
+        "currently-unhandled": "0.4.1",
+        "signal-exit": "3.0.2"
       }
     },
     "lowercase-keys": {
@@ -9176,7 +9161,7 @@
       "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
       "dev": true,
       "requires": {
-        "pify": "^3.0.0"
+        "pify": "3.0.0"
       }
     },
     "make-error": {
@@ -9314,7 +9299,7 @@
       "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
       "dev": true,
       "requires": {
-        "kind-of": "^6.0.2"
+        "kind-of": "6.0.2"
       }
     },
     "map-age-cleaner": {
@@ -9323,7 +9308,7 @@
       "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
       "dev": true,
       "requires": {
-        "p-defer": "^1.0.0"
+        "p-defer": "1.0.0"
       }
     },
     "map-cache": {
@@ -9339,7 +9324,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
     },
@@ -9348,7 +9333,7 @@
       "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
       "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
       "requires": {
-        "object-visit": "^1.0.0"
+        "object-visit": "1.0.1"
       }
     },
     "mappy-breakpoints": {
@@ -9367,9 +9352,9 @@
       "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
       "dev": true,
       "requires": {
-        "findup-sync": "^2.0.0",
-        "micromatch": "^3.0.4",
-        "resolve": "^1.4.0",
+        "findup-sync": "2.0.0",
+        "micromatch": "3.1.10",
+        "resolve": "1.7.1",
         "stack-trace": "0.0.10"
       },
       "dependencies": {
@@ -9379,7 +9364,7 @@
           "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
           "dev": true,
           "requires": {
-            "homedir-polyfill": "^1.0.1"
+            "homedir-polyfill": "1.0.1"
           }
         },
         "findup-sync": {
@@ -9388,10 +9373,10 @@
           "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
           "dev": true,
           "requires": {
-            "detect-file": "^1.0.0",
-            "is-glob": "^3.1.0",
-            "micromatch": "^3.0.4",
-            "resolve-dir": "^1.0.1"
+            "detect-file": "1.0.0",
+            "is-glob": "3.1.0",
+            "micromatch": "3.1.10",
+            "resolve-dir": "1.0.1"
           }
         },
         "global-modules": {
@@ -9400,9 +9385,9 @@
           "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
           "dev": true,
           "requires": {
-            "global-prefix": "^1.0.1",
-            "is-windows": "^1.0.1",
-            "resolve-dir": "^1.0.0"
+            "global-prefix": "1.0.2",
+            "is-windows": "1.0.2",
+            "resolve-dir": "1.0.1"
           }
         },
         "global-prefix": {
@@ -9411,11 +9396,11 @@
           "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
           "dev": true,
           "requires": {
-            "expand-tilde": "^2.0.2",
-            "homedir-polyfill": "^1.0.1",
-            "ini": "^1.3.4",
-            "is-windows": "^1.0.1",
-            "which": "^1.2.14"
+            "expand-tilde": "2.0.2",
+            "homedir-polyfill": "1.0.1",
+            "ini": "1.3.5",
+            "is-windows": "1.0.2",
+            "which": "1.3.1"
           }
         },
         "is-glob": {
@@ -9424,7 +9409,7 @@
           "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
           "dev": true,
           "requires": {
-            "is-extglob": "^2.1.0"
+            "is-extglob": "2.1.1"
           }
         },
         "resolve-dir": {
@@ -9433,8 +9418,8 @@
           "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
           "dev": true,
           "requires": {
-            "expand-tilde": "^2.0.0",
-            "global-modules": "^1.0.0"
+            "expand-tilde": "2.0.2",
+            "global-modules": "1.0.0"
           }
         }
       }
@@ -9445,15 +9430,15 @@
       "integrity": "sha1-Vte36xgDPwz5vFLrIJD6x9weifo=",
       "dev": true,
       "requires": {
-        "arr-union": "^3.1.0",
-        "async-array-reduce": "^0.2.0",
-        "extend-shallow": "^2.0.1",
-        "fs-exists-sync": "^0.1.0",
-        "glob": "^7.0.5",
-        "has-glob": "^0.1.1",
-        "is-valid-glob": "^0.3.0",
-        "lazy-cache": "^2.0.1",
-        "resolve-dir": "^0.1.0"
+        "arr-union": "3.1.0",
+        "async-array-reduce": "0.2.1",
+        "extend-shallow": "2.0.1",
+        "fs-exists-sync": "0.1.0",
+        "glob": "7.1.2",
+        "has-glob": "0.1.1",
+        "is-valid-glob": "0.3.0",
+        "lazy-cache": "2.0.2",
+        "resolve-dir": "0.1.1"
       },
       "dependencies": {
         "extend-shallow": {
@@ -9462,7 +9447,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         },
         "lazy-cache": {
@@ -9471,7 +9456,7 @@
           "integrity": "sha1-uRkKT5EzVGlIQIWfio9whNiCImQ=",
           "dev": true,
           "requires": {
-            "set-getter": "^0.1.0"
+            "set-getter": "0.1.0"
           }
         }
       }
@@ -9482,9 +9467,9 @@
       "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
       "dev": true,
       "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
+        "hash-base": "3.0.4",
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
       }
     },
     "media-typer": {
@@ -9499,9 +9484,9 @@
       "integrity": "sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==",
       "dev": true,
       "requires": {
-        "map-age-cleaner": "^0.1.1",
-        "mimic-fn": "^1.0.0",
-        "p-is-promise": "^1.1.0"
+        "map-age-cleaner": "0.1.3",
+        "mimic-fn": "1.2.0",
+        "p-is-promise": "1.1.0"
       }
     },
     "memory-fs": {
@@ -9510,8 +9495,8 @@
       "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
       "dev": true,
       "requires": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
+        "errno": "0.1.7",
+        "readable-stream": "2.3.6"
       }
     },
     "memorystream": {
@@ -9526,16 +9511,16 @@
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
       "dev": true,
       "requires": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
-        "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
-        "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
+        "camelcase-keys": "2.1.0",
+        "decamelize": "1.2.0",
+        "loud-rejection": "1.6.0",
+        "map-obj": "1.0.1",
+        "minimist": "1.2.0",
+        "normalize-package-data": "2.4.0",
+        "object-assign": "4.1.1",
+        "read-pkg-up": "1.0.1",
+        "redent": "1.0.0",
+        "trim-newlines": "1.0.0"
       },
       "dependencies": {
         "minimist": {
@@ -9575,19 +9560,19 @@
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
       "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
+        "arr-diff": "4.0.0",
+        "array-unique": "0.3.2",
+        "braces": "2.3.2",
+        "define-property": "2.0.2",
+        "extend-shallow": "3.0.2",
+        "extglob": "2.0.4",
+        "fragment-cache": "0.2.1",
+        "kind-of": "6.0.2",
+        "nanomatch": "1.2.9",
+        "object.pick": "1.3.0",
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
       }
     },
     "miller-rabin": {
@@ -9596,8 +9581,8 @@
       "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
+        "bn.js": "4.11.8",
+        "brorand": "1.1.0"
       }
     },
     "mime": {
@@ -9634,9 +9619,9 @@
       "integrity": "sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^1.0.0",
-        "webpack-sources": "^1.1.0"
+        "loader-utils": "1.2.3",
+        "schema-utils": "1.0.0",
+        "webpack-sources": "1.3.0"
       }
     },
     "minimalistic-assert": {
@@ -9656,7 +9641,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "requires": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "1.1.11"
       }
     },
     "minimist": {
@@ -9698,16 +9683,16 @@
       "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
       "dev": true,
       "requires": {
-        "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": "^2.0.1",
-        "pumpify": "^1.3.3",
-        "stream-each": "^1.1.0",
-        "through2": "^2.0.0"
+        "concat-stream": "1.6.2",
+        "duplexify": "3.6.0",
+        "end-of-stream": "1.4.1",
+        "flush-write-stream": "1.0.3",
+        "from2": "2.3.0",
+        "parallel-transform": "1.1.0",
+        "pump": "2.0.1",
+        "pumpify": "1.5.1",
+        "stream-each": "1.2.3",
+        "through2": "2.0.3"
       }
     },
     "mixin-deep": {
@@ -9735,8 +9720,8 @@
       "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
       "dev": true,
       "requires": {
-        "for-in": "^0.1.3",
-        "is-extendable": "^0.1.1"
+        "for-in": "0.1.8",
+        "is-extendable": "0.1.1"
       },
       "dependencies": {
         "for-in": {
@@ -9781,12 +9766,12 @@
       "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
       "dev": true,
       "requires": {
-        "aproba": "^1.1.1",
-        "copy-concurrently": "^1.0.0",
-        "fs-write-stream-atomic": "^1.0.8",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.3"
+        "aproba": "1.2.0",
+        "copy-concurrently": "1.0.5",
+        "fs-write-stream-atomic": "1.0.10",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2",
+        "run-queue": "1.0.3"
       }
     },
     "ms": {
@@ -9800,8 +9785,8 @@
       "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
       "dev": true,
       "requires": {
-        "dns-packet": "^1.3.1",
-        "thunky": "^1.0.2"
+        "dns-packet": "1.3.1",
+        "thunky": "1.0.3"
       }
     },
     "multicast-dns-service-types": {
@@ -9870,34 +9855,34 @@
       "integrity": "sha512-MIPKxyrnV22fS3wSfst2XjwWOonFKujVVEnIehYJhiu8GOg37bCdbbr9plsE1jRDmDAUz6M1MvdKibUrJyRp6Q==",
       "dev": true,
       "requires": {
-        "@ngtools/json-schema": "^1.1.0",
-        "autoprefixer": "^9.0.0",
-        "browserslist": "^4.0.0",
-        "chalk": "^2.3.1",
-        "chokidar": "^2.0.3",
-        "clean-css": "^4.1.11",
-        "commander": "^2.12.0",
-        "fs-extra": "^7.0.0",
-        "glob": "^7.1.2",
-        "injection-js": "^2.2.1",
-        "less": "^3.8.0",
-        "less-plugin-npm-import": "^2.1.0",
-        "node-sass": "^4.9.3",
-        "node-sass-tilde-importer": "^1.0.0",
-        "opencollective-postinstall": "^2.0.1",
-        "postcss": "^7.0.0",
-        "postcss-url": "^8.0.0",
-        "read-pkg-up": "^4.0.0",
-        "rimraf": "^2.6.1",
-        "rollup": "^0.67.0",
-        "rollup-plugin-commonjs": "^9.1.3",
-        "rollup-plugin-json": "^3.1.0",
-        "rollup-plugin-node-resolve": "^4.0.0",
-        "rollup-plugin-sourcemaps": "^0.4.2",
-        "rxjs": "^6.0.0",
-        "stylus": "^0.54.5",
-        "uglify-js": "^3.0.7",
-        "update-notifier": "^2.3.0"
+        "@ngtools/json-schema": "1.1.0",
+        "autoprefixer": "9.4.6",
+        "browserslist": "4.4.1",
+        "chalk": "2.4.2",
+        "chokidar": "2.0.3",
+        "clean-css": "4.2.1",
+        "commander": "2.15.1",
+        "fs-extra": "7.0.1",
+        "glob": "7.1.2",
+        "injection-js": "2.2.1",
+        "less": "3.9.0",
+        "less-plugin-npm-import": "2.1.0",
+        "node-sass": "4.11.0",
+        "node-sass-tilde-importer": "1.0.2",
+        "opencollective-postinstall": "2.0.2",
+        "postcss": "7.0.14",
+        "postcss-url": "8.0.0",
+        "read-pkg-up": "4.0.0",
+        "rimraf": "2.6.2",
+        "rollup": "0.67.4",
+        "rollup-plugin-commonjs": "9.2.0",
+        "rollup-plugin-json": "3.1.0",
+        "rollup-plugin-node-resolve": "4.0.0",
+        "rollup-plugin-sourcemaps": "0.4.2",
+        "rxjs": "6.4.0",
+        "stylus": "0.54.5",
+        "uglify-js": "3.4.9",
+        "update-notifier": "2.5.0"
       },
       "dependencies": {
         "chalk": {
@@ -9917,7 +9902,7 @@
           "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
-            "locate-path": "^3.0.0"
+            "locate-path": "3.0.0"
           }
         },
         "fs-extra": {
@@ -9926,9 +9911,9 @@
           "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
+            "graceful-fs": "4.1.11",
+            "jsonfile": "4.0.0",
+            "universalify": "0.1.1"
           }
         },
         "jsonfile": {
@@ -9946,10 +9931,10 @@
           "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^4.0.0",
-            "pify": "^3.0.0",
-            "strip-bom": "^3.0.0"
+            "graceful-fs": "4.1.11",
+            "parse-json": "4.0.0",
+            "pify": "3.0.0",
+            "strip-bom": "3.0.0"
           }
         },
         "locate-path": {
@@ -9958,8 +9943,8 @@
           "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"
           }
         },
         "p-limit": {
@@ -9977,7 +9962,7 @@
           "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "dev": true,
           "requires": {
-            "p-limit": "^2.0.0"
+            "p-limit": "2.1.0"
           }
         },
         "p-try": {
@@ -9992,8 +9977,8 @@
           "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
           "dev": true,
           "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
+            "error-ex": "1.3.1",
+            "json-parse-better-errors": "1.0.2"
           }
         },
         "read-pkg": {
@@ -10002,9 +9987,9 @@
           "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
           "dev": true,
           "requires": {
-            "load-json-file": "^4.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^3.0.0"
+            "load-json-file": "4.0.0",
+            "normalize-package-data": "2.4.0",
+            "path-type": "3.0.0"
           }
         },
         "read-pkg-up": {
@@ -10013,8 +9998,8 @@
           "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==",
           "dev": true,
           "requires": {
-            "find-up": "^3.0.0",
-            "read-pkg": "^3.0.0"
+            "find-up": "3.0.0",
+            "read-pkg": "3.0.0"
           }
         },
         "strip-bom": {
@@ -10036,9 +10021,8 @@
     },
     "ngrx-store-localstorage": {
       "version": "github:cf-stratos/ngrx-store-localstorage#e722ed60861d49bec99482ac54f13e7485bb0ac9",
-      "from": "github:cf-stratos/ngrx-store-localstorage#lodash-dep-update",
       "requires": {
-        "lodash": "^4.17.11"
+        "lodash": "4.17.13"
       }
     },
     "ngx-moment": {
@@ -10061,9 +10045,9 @@
       "integrity": "sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==",
       "dev": true,
       "requires": {
-        "encoding": "^0.1.11",
-        "json-parse-better-errors": "^1.0.0",
-        "safe-buffer": "^5.1.1"
+        "encoding": "0.1.12",
+        "json-parse-better-errors": "1.0.2",
+        "safe-buffer": "5.1.2"
       }
     },
     "node-forge": {
@@ -10078,18 +10062,18 @@
       "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
       "dev": true,
       "requires": {
-        "fstream": "^1.0.0",
-        "glob": "^7.0.3",
-        "graceful-fs": "^4.1.2",
-        "mkdirp": "^0.5.0",
-        "nopt": "2 || 3",
-        "npmlog": "0 || 1 || 2 || 3 || 4",
-        "osenv": "0",
-        "request": "^2.87.0",
-        "rimraf": "2",
-        "semver": "~5.3.0",
-        "tar": "^2.0.0",
-        "which": "1"
+        "fstream": "1.0.11",
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "mkdirp": "0.5.1",
+        "nopt": "3.0.6",
+        "npmlog": "4.1.2",
+        "osenv": "0.1.5",
+        "request": "2.88.0",
+        "rimraf": "2.6.2",
+        "semver": "5.3.0",
+        "tar": "2.2.1",
+        "which": "1.3.1"
       },
       "dependencies": {
         "semver": {
@@ -10217,7 +10201,7 @@
       "integrity": "sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==",
       "dev": true,
       "requires": {
-        "find-parent-dir": "^0.3.0"
+        "find-parent-dir": "0.3.0"
       }
     },
     "nopt": {
@@ -10226,7 +10210,7 @@
       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
       "dev": true,
       "requires": {
-        "abbrev": "1"
+        "abbrev": "1.0.9"
       }
     },
     "normalize-package-data": {
@@ -10246,7 +10230,7 @@
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
       "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
       "requires": {
-        "remove-trailing-separator": "^1.0.1"
+        "remove-trailing-separator": "1.1.0"
       }
     },
     "normalize-range": {
@@ -10266,7 +10250,7 @@
       "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
       "dev": true,
       "requires": {
-        "once": "^1.3.2"
+        "once": "1.4.0"
       }
     },
     "npm-bundled": {
@@ -10281,10 +10265,10 @@
       "integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==",
       "dev": true,
       "requires": {
-        "hosted-git-info": "^2.6.0",
-        "osenv": "^0.1.5",
-        "semver": "^5.5.0",
-        "validate-npm-package-name": "^3.0.0"
+        "hosted-git-info": "2.6.0",
+        "osenv": "0.1.5",
+        "semver": "5.5.0",
+        "validate-npm-package-name": "3.0.0"
       }
     },
     "npm-packlist": {
@@ -10303,9 +10287,9 @@
       "integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==",
       "dev": true,
       "requires": {
-        "figgy-pudding": "^3.5.1",
-        "npm-package-arg": "^6.0.0",
-        "semver": "^5.4.1"
+        "figgy-pudding": "3.5.1",
+        "npm-package-arg": "6.1.0",
+        "semver": "5.5.0"
       }
     },
     "npm-registry-fetch": {
@@ -10328,15 +10312,15 @@
       "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==",
       "dev": true,
       "requires": {
-        "ansi-styles": "^3.2.1",
-        "chalk": "^2.4.1",
-        "cross-spawn": "^6.0.5",
-        "memorystream": "^0.3.1",
-        "minimatch": "^3.0.4",
-        "pidtree": "^0.3.0",
-        "read-pkg": "^3.0.0",
-        "shell-quote": "^1.6.1",
-        "string.prototype.padend": "^3.0.0"
+        "ansi-styles": "3.2.1",
+        "chalk": "2.4.2",
+        "cross-spawn": "6.0.5",
+        "memorystream": "0.3.1",
+        "minimatch": "3.0.4",
+        "pidtree": "0.3.0",
+        "read-pkg": "3.0.0",
+        "shell-quote": "1.6.1",
+        "string.prototype.padend": "3.0.0"
       },
       "dependencies": {
         "chalk": {
@@ -10356,11 +10340,11 @@
           "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "dev": true,
           "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
+            "nice-try": "1.0.5",
+            "path-key": "2.0.1",
+            "semver": "5.5.0",
+            "shebang-command": "1.2.0",
+            "which": "1.3.1"
           }
         },
         "load-json-file": {
@@ -10369,10 +10353,10 @@
           "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^4.0.0",
-            "pify": "^3.0.0",
-            "strip-bom": "^3.0.0"
+            "graceful-fs": "4.1.11",
+            "parse-json": "4.0.0",
+            "pify": "3.0.0",
+            "strip-bom": "3.0.0"
           }
         },
         "parse-json": {
@@ -10381,8 +10365,8 @@
           "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
           "dev": true,
           "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
+            "error-ex": "1.3.1",
+            "json-parse-better-errors": "1.0.2"
           }
         },
         "read-pkg": {
@@ -10391,9 +10375,9 @@
           "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
           "dev": true,
           "requires": {
-            "load-json-file": "^4.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^3.0.0"
+            "load-json-file": "4.0.0",
+            "normalize-package-data": "2.4.0",
+            "path-type": "3.0.0"
           }
         },
         "strip-bom": {
@@ -10410,7 +10394,7 @@
       "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
       "dev": true,
       "requires": {
-        "path-key": "^2.0.0"
+        "path-key": "2.0.1"
       }
     },
     "npmlog": {
@@ -10419,10 +10403,10 @@
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
       "dev": true,
       "requires": {
-        "are-we-there-yet": "~1.1.2",
-        "console-control-strings": "~1.1.0",
-        "gauge": "~2.7.3",
-        "set-blocking": "~2.0.0"
+        "are-we-there-yet": "1.1.5",
+        "console-control-strings": "1.1.0",
+        "gauge": "2.7.4",
+        "set-blocking": "2.0.0"
       }
     },
     "null-check": {
@@ -10466,9 +10450,9 @@
       "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
       "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
       "requires": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
+        "copy-descriptor": "0.1.1",
+        "define-property": "0.2.5",
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "define-property": {
@@ -10476,7 +10460,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         },
         "kind-of": {
@@ -10484,7 +10468,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -10500,7 +10484,7 @@
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
       "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
       "requires": {
-        "isobject": "^3.0.0"
+        "isobject": "3.0.1"
       }
     },
     "object.assign": {
@@ -10509,10 +10493,10 @@
       "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
+        "define-properties": "1.1.2",
+        "function-bind": "1.1.1",
+        "has-symbols": "1.0.0",
+        "object-keys": "1.0.11"
       }
     },
     "object.defaults": {
@@ -10521,10 +10505,10 @@
       "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
       "dev": true,
       "requires": {
-        "array-each": "^1.0.1",
-        "array-slice": "^1.0.0",
-        "for-own": "^1.0.0",
-        "isobject": "^3.0.0"
+        "array-each": "1.0.1",
+        "array-slice": "1.1.0",
+        "for-own": "1.0.0",
+        "isobject": "3.0.1"
       }
     },
     "object.getownpropertydescriptors": {
@@ -10533,8 +10517,8 @@
       "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.5.1"
+        "define-properties": "1.1.2",
+        "es-abstract": "1.12.0"
       }
     },
     "object.map": {
@@ -10543,8 +10527,8 @@
       "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
       "dev": true,
       "requires": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
+        "for-own": "1.0.0",
+        "make-iterator": "1.0.1"
       }
     },
     "object.pick": {
@@ -10552,7 +10536,7 @@
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
       "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
       "requires": {
-        "isobject": "^3.0.1"
+        "isobject": "3.0.1"
       }
     },
     "object.reduce": {
@@ -10561,8 +10545,8 @@
       "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
       "dev": true,
       "requires": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
+        "for-own": "1.0.0",
+        "make-iterator": "1.0.1"
       }
     },
     "obuf": {
@@ -10592,7 +10576,7 @@
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "dev": true,
       "requires": {
-        "wrappy": "1"
+        "wrappy": "1.0.2"
       }
     },
     "onetime": {
@@ -10622,8 +10606,8 @@
       "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
       "dev": true,
       "requires": {
-        "minimist": "~0.0.1",
-        "wordwrap": "~0.0.2"
+        "minimist": "0.0.8",
+        "wordwrap": "0.0.3"
       },
       "dependencies": {
         "wordwrap": {
@@ -10640,12 +10624,12 @@
       "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
       "dev": true,
       "requires": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.4",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "wordwrap": "~1.0.0"
+        "deep-is": "0.1.3",
+        "fast-levenshtein": "2.0.6",
+        "levn": "0.3.0",
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2",
+        "wordwrap": "1.0.0"
       }
     },
     "ordered-read-streams": {
@@ -10654,7 +10638,7 @@
       "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
       "dev": true,
       "requires": {
-        "readable-stream": "^2.0.1"
+        "readable-stream": "2.3.6"
       }
     },
     "original": {
@@ -10663,7 +10647,7 @@
       "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
       "dev": true,
       "requires": {
-        "url-parse": "^1.4.3"
+        "url-parse": "1.4.4"
       }
     },
     "os-browserify": {
@@ -10684,7 +10668,7 @@
       "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
       "dev": true,
       "requires": {
-        "lcid": "^1.0.0"
+        "lcid": "1.0.0"
       }
     },
     "os-tmpdir": {
@@ -10699,8 +10683,8 @@
       "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
       "dev": true,
       "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
       }
     },
     "p-defer": {
@@ -10736,7 +10720,7 @@
       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
       "dev": true,
       "requires": {
-        "p-limit": "^1.1.0"
+        "p-limit": "1.2.0"
       }
     },
     "p-map": {
@@ -10757,10 +10741,10 @@
       "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
       "dev": true,
       "requires": {
-        "got": "^6.7.1",
-        "registry-auth-token": "^3.0.1",
-        "registry-url": "^3.0.3",
-        "semver": "^5.1.0"
+        "got": "6.7.1",
+        "registry-auth-token": "3.3.2",
+        "registry-url": "3.1.0",
+        "semver": "5.5.0"
       }
     },
     "pacote": {
@@ -10769,33 +10753,33 @@
       "integrity": "sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==",
       "dev": true,
       "requires": {
-        "bluebird": "^3.5.3",
-        "cacache": "^11.3.2",
-        "figgy-pudding": "^3.5.1",
-        "get-stream": "^4.1.0",
-        "glob": "^7.1.3",
-        "lru-cache": "^5.1.1",
-        "make-fetch-happen": "^4.0.1",
-        "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": "^3.8.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"
+        "bluebird": "3.5.3",
+        "cacache": "11.3.2",
+        "figgy-pudding": "3.5.1",
+        "get-stream": "4.1.0",
+        "glob": "7.1.3",
+        "lru-cache": "5.1.1",
+        "make-fetch-happen": "4.0.1",
+        "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.4.1",
+        "npm-pick-manifest": "2.2.3",
+        "npm-registry-fetch": "3.9.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": {
         "bluebird": {
@@ -10832,7 +10816,7 @@
           "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
           "dev": true,
           "requires": {
-            "pump": "^3.0.0"
+            "pump": "3.0.0"
           }
         },
         "glob": {
@@ -10861,7 +10845,7 @@
           "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
           "dev": true,
           "requires": {
-            "yallist": "^3.0.2"
+            "yallist": "3.0.3"
           }
         },
         "mississippi": {
@@ -10870,16 +10854,16 @@
           "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
           "dev": true,
           "requires": {
-            "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"
+            "concat-stream": "1.6.2",
+            "duplexify": "3.6.0",
+            "end-of-stream": "1.4.1",
+            "flush-write-stream": "1.0.3",
+            "from2": "2.3.0",
+            "parallel-transform": "1.1.0",
+            "pump": "3.0.0",
+            "pumpify": "1.5.1",
+            "stream-each": "1.2.3",
+            "through2": "2.0.3"
           }
         },
         "pump": {
@@ -10888,8 +10872,8 @@
           "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
           "dev": true,
           "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
+            "end-of-stream": "1.4.1",
+            "once": "1.4.0"
           }
         },
         "semver": {
@@ -10904,7 +10888,7 @@
           "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
           "dev": true,
           "requires": {
-            "figgy-pudding": "^3.5.1"
+            "figgy-pudding": "3.5.1"
           }
         },
         "tar": {
@@ -10967,9 +10951,9 @@
       "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
       "dev": true,
       "requires": {
-        "is-absolute": "^1.0.0",
-        "map-cache": "^0.2.0",
-        "path-root": "^0.1.1"
+        "is-absolute": "1.0.0",
+        "map-cache": "0.2.2",
+        "path-root": "0.1.1"
       }
     },
     "parse-json": {
@@ -10978,7 +10962,7 @@
       "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
       "dev": true,
       "requires": {
-        "error-ex": "^1.2.0"
+        "error-ex": "1.3.1"
       }
     },
     "parse-node-version": {
@@ -11005,7 +10989,7 @@
       "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
       "dev": true,
       "requires": {
-        "better-assert": "~1.0.0"
+        "better-assert": "1.0.2"
       }
     },
     "parseuri": {
@@ -11014,7 +10998,7 @@
       "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
       "dev": true,
       "requires": {
-        "better-assert": "~1.0.0"
+        "better-assert": "1.0.2"
       }
     },
     "parseurl": {
@@ -11074,7 +11058,7 @@
       "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
       "dev": true,
       "requires": {
-        "path-root-regex": "^0.1.0"
+        "path-root-regex": "0.1.2"
       }
     },
     "path-root-regex": {
@@ -11095,16 +11079,16 @@
       "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
       "dev": true,
       "requires": {
-        "pify": "^3.0.0"
+        "pify": "3.0.0"
       }
     },
     "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": {
-        "through": "~2.3"
+        "through": "2.3.8"
       }
     },
     "pbkdf2": {
@@ -11113,11 +11097,11 @@
       "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
       "dev": true,
       "requires": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
+        "ripemd160": "2.0.2",
+        "safe-buffer": "5.1.2",
+        "sha.js": "2.4.11"
       }
     },
     "performance-now": {
@@ -11150,7 +11134,7 @@
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
       "dev": true,
       "requires": {
-        "pinkie": "^2.0.0"
+        "pinkie": "2.0.4"
       }
     },
     "pkg-dir": {
@@ -11159,7 +11143,7 @@
       "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
       "dev": true,
       "requires": {
-        "find-up": "^2.1.0"
+        "find-up": "2.1.0"
       }
     },
     "plugin-error": {
@@ -11168,11 +11152,11 @@
       "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
       "dev": true,
       "requires": {
-        "ansi-cyan": "^0.1.1",
-        "ansi-red": "^0.1.1",
-        "arr-diff": "^1.0.1",
-        "arr-union": "^2.0.1",
-        "extend-shallow": "^1.1.2"
+        "ansi-cyan": "0.1.1",
+        "ansi-red": "0.1.1",
+        "arr-diff": "1.1.0",
+        "arr-union": "2.1.0",
+        "extend-shallow": "1.1.4"
       },
       "dependencies": {
         "arr-diff": {
@@ -11181,8 +11165,8 @@
           "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
           "dev": true,
           "requires": {
-            "arr-flatten": "^1.0.1",
-            "array-slice": "^0.2.3"
+            "arr-flatten": "1.1.0",
+            "array-slice": "0.2.3"
           }
         },
         "arr-union": {
@@ -11203,7 +11187,7 @@
           "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
           "dev": true,
           "requires": {
-            "kind-of": "^1.1.0"
+            "kind-of": "1.1.0"
           }
         },
         "kind-of": {
@@ -11242,9 +11226,9 @@
       "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
       "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": {
         "chalk": {
@@ -11292,10 +11276,10 @@
       "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.1",
-        "postcss-value-parser": "^3.2.3",
-        "read-cache": "^1.0.0",
-        "resolve": "^1.1.7"
+        "postcss": "7.0.14",
+        "postcss-value-parser": "3.3.1",
+        "read-cache": "1.0.0",
+        "resolve": "1.7.1"
       }
     },
     "postcss-load-config": {
@@ -11314,10 +11298,10 @@
       "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "postcss": "^7.0.0",
-        "postcss-load-config": "^2.0.0",
-        "schema-utils": "^1.0.0"
+        "loader-utils": "1.2.3",
+        "postcss": "7.0.14",
+        "postcss-load-config": "2.0.0",
+        "schema-utils": "1.0.0"
       }
     },
     "postcss-url": {
@@ -11326,11 +11310,11 @@
       "integrity": "sha512-E2cbOQ5aii2zNHh8F6fk1cxls7QVFZjLPSrqvmiza8OuXLzIpErij8BDS5Y3STPfJgpIMNCPEr8JlKQWEoozUw==",
       "dev": true,
       "requires": {
-        "mime": "^2.3.1",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.0",
-        "postcss": "^7.0.2",
-        "xxhashjs": "^0.2.1"
+        "mime": "2.4.0",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "postcss": "7.0.14",
+        "xxhashjs": "0.2.2"
       },
       "dependencies": {
         "mime": {
@@ -11389,7 +11373,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "asap": "~2.0.3"
+        "asap": "2.0.6"
       }
     },
     "promise-inflight": {
@@ -11404,8 +11388,8 @@
       "integrity": "sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=",
       "dev": true,
       "requires": {
-        "err-code": "^1.0.0",
-        "retry": "^0.10.0"
+        "err-code": "1.1.2",
+        "retry": "0.10.1"
       }
     },
     "protoduck": {
@@ -11414,7 +11398,7 @@
       "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==",
       "dev": true,
       "requires": {
-        "genfun": "^5.0.0"
+        "genfun": "5.0.0"
       }
     },
     "protractor": {
@@ -11423,21 +11407,21 @@
       "integrity": "sha512-zlIj64Cr6IOWP7RwxVeD8O4UskLYPoyIcg0HboWJL9T79F1F0VWtKkGTr/9GN6BKL+/Q/GmM7C9kFVCfDbP5sA==",
       "dev": true,
       "requires": {
-        "@types/q": "^0.0.32",
-        "@types/selenium-webdriver": "^3.0.0",
-        "blocking-proxy": "^1.0.0",
-        "browserstack": "^1.5.1",
-        "chalk": "^1.1.3",
-        "glob": "^7.0.3",
+        "@types/q": "0.0.32",
+        "@types/selenium-webdriver": "3.0.16",
+        "blocking-proxy": "1.0.1",
+        "browserstack": "1.5.3",
+        "chalk": "1.1.3",
+        "glob": "7.1.2",
         "jasmine": "2.8.0",
-        "jasminewd2": "^2.1.0",
-        "optimist": "~0.6.0",
+        "jasminewd2": "2.2.0",
+        "optimist": "0.6.1",
         "q": "1.4.1",
-        "saucelabs": "^1.5.0",
+        "saucelabs": "1.5.0",
         "selenium-webdriver": "3.6.0",
-        "source-map-support": "~0.4.0",
+        "source-map-support": "0.4.18",
         "webdriver-js-extender": "2.1.0",
-        "webdriver-manager": "^12.0.6"
+        "webdriver-manager": "12.1.6"
       },
       "dependencies": {
         "ansi-styles": {
@@ -11452,11 +11436,11 @@
           "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"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "del": {
@@ -11465,13 +11449,13 @@
           "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
           "dev": true,
           "requires": {
-            "globby": "^5.0.0",
-            "is-path-cwd": "^1.0.0",
-            "is-path-in-cwd": "^1.0.0",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0",
-            "rimraf": "^2.2.8"
+            "globby": "5.0.0",
+            "is-path-cwd": "1.0.0",
+            "is-path-in-cwd": "1.0.1",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1",
+            "rimraf": "2.6.2"
           }
         },
         "globby": {
@@ -11480,12 +11464,12 @@
           "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
           "dev": true,
           "requires": {
-            "array-union": "^1.0.1",
-            "arrify": "^1.0.0",
-            "glob": "^7.0.3",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "array-union": "1.0.2",
+            "arrify": "1.0.1",
+            "glob": "7.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
           }
         },
         "minimist": {
@@ -11512,7 +11496,7 @@
           "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
           "dev": true,
           "requires": {
-            "source-map": "^0.5.6"
+            "source-map": "0.5.6"
           }
         },
         "supports-color": {
@@ -11564,7 +11548,7 @@
       "integrity": "sha1-mvZ6mdex0BMuUaUDCZ04qNKs4sM=",
       "dev": true,
       "requires": {
-        "table-parser": "^0.1.3"
+        "table-parser": "0.1.3"
       }
     },
     "ps-tree": {
@@ -11573,7 +11557,7 @@
       "integrity": "sha512-kef7fYYSKVqQffmzTMsVcUD1ObNJMp8sNSmHGlGKsZQyL/ht9MZKk86u0Rd1NhpTOAuhqwKCLLpktwkqz+MF8A==",
       "dev": true,
       "requires": {
-        "event-stream": "=3.3.4"
+        "event-stream": "3.3.4"
       }
     },
     "pseudomap": {
@@ -11594,12 +11578,12 @@
       "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
+        "bn.js": "4.11.8",
+        "browserify-rsa": "4.0.1",
+        "create-hash": "1.2.0",
+        "parse-asn1": "5.1.4",
+        "randombytes": "2.1.0",
+        "safe-buffer": "5.1.2"
       }
     },
     "pump": {
@@ -11608,8 +11592,8 @@
       "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
       "dev": true,
       "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
+        "end-of-stream": "1.4.1",
+        "once": "1.4.0"
       }
     },
     "pumpify": {
@@ -11618,9 +11602,9 @@
       "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
       "dev": true,
       "requires": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
+        "duplexify": "3.6.0",
+        "inherits": "2.0.3",
+        "pump": "2.0.1"
       }
     },
     "punycode": {
@@ -11670,7 +11654,7 @@
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
       "requires": {
-        "safe-buffer": "^5.1.0"
+        "safe-buffer": "5.1.2"
       }
     },
     "randomfill": {
@@ -11679,8 +11663,8 @@
       "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
       "dev": true,
       "requires": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
+        "randombytes": "2.1.0",
+        "safe-buffer": "5.1.2"
       }
     },
     "range-parser": {
@@ -11718,8 +11702,8 @@
       "integrity": "sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^1.0.0"
+        "loader-utils": "1.2.3",
+        "schema-utils": "1.0.0"
       }
     },
     "rc": {
@@ -11728,10 +11712,10 @@
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "dev": true,
       "requires": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
+        "deep-extend": "0.6.0",
+        "ini": "1.3.5",
+        "minimist": "1.2.0",
+        "strip-json-comments": "2.0.1"
       },
       "dependencies": {
         "minimist": {
@@ -11754,7 +11738,7 @@
       "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
       "dev": true,
       "requires": {
-        "pify": "^2.3.0"
+        "pify": "2.3.0"
       },
       "dependencies": {
         "pify": {
@@ -11771,9 +11755,9 @@
       "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
       "dev": true,
       "requires": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
+        "load-json-file": "1.1.0",
+        "normalize-package-data": "2.4.0",
+        "path-type": "1.1.0"
       },
       "dependencies": {
         "path-type": {
@@ -11782,9 +11766,9 @@
           "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "graceful-fs": "4.1.11",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
           }
         },
         "pify": {
@@ -11801,8 +11785,8 @@
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
       "dev": true,
       "requires": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
+        "find-up": "1.1.2",
+        "read-pkg": "1.1.0"
       },
       "dependencies": {
         "find-up": {
@@ -11811,8 +11795,8 @@
           "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
           "dev": true,
           "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "path-exists": "2.1.0",
+            "pinkie-promise": "2.0.1"
           }
         },
         "path-exists": {
@@ -11821,7 +11805,7 @@
           "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
           "dev": true,
           "requires": {
-            "pinkie-promise": "^2.0.0"
+            "pinkie-promise": "2.0.1"
           }
         }
       }
@@ -11831,13 +11815,13 @@
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
       "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
       "requires": {
-        "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"
+        "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"
       }
     },
     "readdirp": {
@@ -11857,8 +11841,8 @@
       "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
       "dev": true,
       "requires": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
+        "code-point-at": "1.1.0",
+        "is-fullwidth-code-point": "1.0.0",
         "mute-stream": "0.0.5"
       }
     },
@@ -11868,7 +11852,7 @@
       "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
       "dev": true,
       "requires": {
-        "resolve": "^1.1.6"
+        "resolve": "1.7.1"
       }
     },
     "redent": {
@@ -11877,8 +11861,8 @@
       "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
       "dev": true,
       "requires": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
+        "indent-string": "2.1.0",
+        "strip-indent": "1.0.1"
       }
     },
     "reflect-metadata": {
@@ -11904,8 +11888,8 @@
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "requires": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
+        "extend-shallow": "3.0.2",
+        "safe-regex": "1.1.0"
       }
     },
     "regexpu-core": {
@@ -11914,9 +11898,9 @@
       "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
       "dev": true,
       "requires": {
-        "regenerate": "^1.2.1",
-        "regjsgen": "^0.2.0",
-        "regjsparser": "^0.1.4"
+        "regenerate": "1.4.0",
+        "regjsgen": "0.2.0",
+        "regjsparser": "0.1.5"
       }
     },
     "registry-auth-token": {
@@ -11935,7 +11919,7 @@
       "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
       "dev": true,
       "requires": {
-        "rc": "^1.0.1"
+        "rc": "1.2.8"
       }
     },
     "regjsgen": {
@@ -11950,7 +11934,7 @@
       "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
       "dev": true,
       "requires": {
-        "jsesc": "~0.5.0"
+        "jsesc": "0.5.0"
       },
       "dependencies": {
         "jsesc": {
@@ -11967,8 +11951,8 @@
       "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
       "dev": true,
       "requires": {
-        "is-buffer": "^1.1.5",
-        "is-utf8": "^0.2.1"
+        "is-buffer": "1.1.6",
+        "is-utf8": "0.2.1"
       }
     },
     "remove-bom-stream": {
@@ -11977,9 +11961,9 @@
       "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
       "dev": true,
       "requires": {
-        "remove-bom-buffer": "^3.0.0",
-        "safe-buffer": "^5.1.0",
-        "through2": "^2.0.3"
+        "remove-bom-buffer": "3.0.0",
+        "safe-buffer": "5.1.2",
+        "through2": "2.0.3"
       }
     },
     "remove-trailing-separator": {
@@ -12003,7 +11987,7 @@
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
       "dev": true,
       "requires": {
-        "is-finite": "^1.0.0"
+        "is-finite": "1.0.2"
       }
     },
     "replace-ext": {
@@ -12018,9 +12002,9 @@
       "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
       "dev": true,
       "requires": {
-        "homedir-polyfill": "^1.0.1",
-        "is-absolute": "^1.0.0",
-        "remove-trailing-separator": "^1.1.0"
+        "homedir-polyfill": "1.0.1",
+        "is-absolute": "1.0.0",
+        "remove-trailing-separator": "1.1.0"
       }
     },
     "replace-in-file": {
@@ -12164,26 +12148,26 @@
       "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
       "dev": true,
       "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.0",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.4.3",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
+        "aws-sign2": "0.7.0",
+        "aws4": "1.8.0",
+        "caseless": "0.12.0",
+        "combined-stream": "1.0.6",
+        "extend": "3.0.2",
+        "forever-agent": "0.6.1",
+        "form-data": "2.3.2",
+        "har-validator": "5.1.3",
+        "http-signature": "1.2.0",
+        "is-typedarray": "1.0.0",
+        "isstream": "0.1.2",
+        "json-stringify-safe": "5.0.1",
+        "mime-types": "2.1.22",
+        "oauth-sign": "0.9.0",
+        "performance-now": "2.1.0",
+        "qs": "6.5.2",
+        "safe-buffer": "5.1.2",
+        "tough-cookie": "2.4.3",
+        "tunnel-agent": "0.6.0",
+        "uuid": "3.3.2"
       },
       "dependencies": {
         "extend": {
@@ -12221,7 +12205,7 @@
       "integrity": "sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.11"
+        "lodash": "4.17.11"
       },
       "dependencies": {
         "lodash": {
@@ -12239,8 +12223,8 @@
       "dev": true,
       "requires": {
         "request-promise-core": "1.1.2",
-        "stealthy-require": "^1.1.1",
-        "tough-cookie": "^2.3.3"
+        "stealthy-require": "1.1.1",
+        "tough-cookie": "2.4.3"
       }
     },
     "require-directory": {
@@ -12267,8 +12251,8 @@
       "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
       "dev": true,
       "requires": {
-        "caller-path": "^0.1.0",
-        "resolve-from": "^1.0.0"
+        "caller-path": "0.1.0",
+        "resolve-from": "1.0.1"
       },
       "dependencies": {
         "resolve-from": {
@@ -12305,7 +12289,7 @@
       "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
       "dev": true,
       "requires": {
-        "resolve-from": "^3.0.0"
+        "resolve-from": "3.0.0"
       }
     },
     "resolve-dir": {
@@ -12314,8 +12298,8 @@
       "integrity": "sha1-shklmlYC+sXFxJatiUpujMQwJh4=",
       "dev": true,
       "requires": {
-        "expand-tilde": "^1.2.2",
-        "global-modules": "^0.2.3"
+        "expand-tilde": "1.2.2",
+        "global-modules": "0.2.3"
       }
     },
     "resolve-from": {
@@ -12330,7 +12314,7 @@
       "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
       "dev": true,
       "requires": {
-        "value-or-function": "^3.0.0"
+        "value-or-function": "3.0.0"
       }
     },
     "resolve-url": {
@@ -12380,8 +12364,8 @@
       "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
       "dev": true,
       "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
+        "hash-base": "3.0.4",
+        "inherits": "2.0.3"
       }
     },
     "rollup": {
@@ -12391,7 +12375,7 @@
       "dev": true,
       "requires": {
         "@types/estree": "0.0.39",
-        "@types/node": "*"
+        "@types/node": "11.9.4"
       }
     },
     "rollup-plugin-commonjs": {
@@ -12429,7 +12413,7 @@
       "integrity": "sha512-BlYk5VspvGpjz7lAwArVzBXR60JK+4EKtPkCHouAWg39obk9S61hZYJDBfMK+oitPdoe11i69TlxKlMQNFC/Uw==",
       "dev": true,
       "requires": {
-        "rollup-pluginutils": "^2.3.1"
+        "rollup-pluginutils": "2.4.1"
       }
     },
     "rollup-plugin-node-resolve": {
@@ -12472,8 +12456,8 @@
       "integrity": "sha1-YhJaqUCHqt97g+9N+vYptHMTXoc=",
       "dev": true,
       "requires": {
-        "rollup-pluginutils": "^2.0.1",
-        "source-map-resolve": "^0.5.0"
+        "rollup-pluginutils": "2.4.1",
+        "source-map-resolve": "0.5.2"
       }
     },
     "rollup-pluginutils": {
@@ -12509,7 +12493,7 @@
       "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
       "dev": true,
       "requires": {
-        "aproba": "^1.1.1"
+        "aproba": "1.2.0"
       }
     },
     "rw": {
@@ -12583,7 +12567,7 @@
       "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
       "requires": {
-        "ret": "~0.1.10"
+        "ret": "0.1.15"
       }
     },
     "safer-buffer": {
@@ -12593,7 +12577,7 @@
     },
     "samsam": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz",
+      "resolved": "http://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz",
       "integrity": "sha1-vsEf3IOp/aBjQBIQ5AF2wwJNFWc=",
       "dev": true
     },
@@ -12603,10 +12587,10 @@
       "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
       "dev": true,
       "requires": {
-        "glob": "^7.0.0",
-        "lodash": "^4.0.0",
-        "scss-tokenizer": "^0.2.3",
-        "yargs": "^7.0.0"
+        "glob": "7.1.2",
+        "lodash": "4.17.10",
+        "scss-tokenizer": "0.2.3",
+        "yargs": "7.1.0"
       },
       "dependencies": {
         "camelcase": {
@@ -12689,12 +12673,12 @@
       "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==",
       "dev": true,
       "requires": {
-        "clone-deep": "^2.0.1",
-        "loader-utils": "^1.0.1",
-        "lodash.tail": "^4.1.1",
-        "neo-async": "^2.5.0",
-        "pify": "^3.0.0",
-        "semver": "^5.5.0"
+        "clone-deep": "2.0.2",
+        "loader-utils": "1.2.3",
+        "lodash.tail": "4.1.1",
+        "neo-async": "2.6.0",
+        "pify": "3.0.0",
+        "semver": "5.5.0"
       }
     },
     "saucelabs": {
@@ -12703,7 +12687,7 @@
       "integrity": "sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==",
       "dev": true,
       "requires": {
-        "https-proxy-agent": "^2.2.1"
+        "https-proxy-agent": "2.2.1"
       }
     },
     "sax": {
@@ -12718,9 +12702,9 @@
       "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
       "dev": true,
       "requires": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
+        "ajv": "6.9.1",
+        "ajv-errors": "1.0.1",
+        "ajv-keywords": "3.4.0"
       }
     },
     "scss-tokenizer": {
@@ -12729,8 +12713,8 @@
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
       "dev": true,
       "requires": {
-        "js-base64": "^2.1.8",
-        "source-map": "^0.4.2"
+        "js-base64": "2.4.8",
+        "source-map": "0.4.4"
       },
       "dependencies": {
         "source-map": {
@@ -12739,7 +12723,7 @@
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "amdefine": "1.0.1"
           }
         }
       }
@@ -12756,10 +12740,10 @@
       "integrity": "sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==",
       "dev": true,
       "requires": {
-        "jszip": "^3.1.3",
-        "rimraf": "^2.5.4",
+        "jszip": "3.2.2",
+        "rimraf": "2.6.2",
         "tmp": "0.0.30",
-        "xml2js": "^0.4.17"
+        "xml2js": "0.4.22"
       },
       "dependencies": {
         "tmp": {
@@ -12768,7 +12752,7 @@
           "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=",
           "dev": true,
           "requires": {
-            "os-tmpdir": "~1.0.1"
+            "os-tmpdir": "1.0.2"
           }
         }
       }
@@ -12794,7 +12778,7 @@
       "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
       "dev": true,
       "requires": {
-        "semver": "^5.0.3"
+        "semver": "5.5.0"
       }
     },
     "semver-dsl": {
@@ -12803,7 +12787,7 @@
       "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=",
       "dev": true,
       "requires": {
-        "semver": "^5.3.0"
+        "semver": "5.5.0"
       }
     },
     "semver-greatest-satisfied-range": {
@@ -12812,7 +12796,7 @@
       "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
       "dev": true,
       "requires": {
-        "sver-compat": "^1.5.0"
+        "sver-compat": "1.5.0"
       }
     },
     "semver-intersect": {
@@ -12821,7 +12805,7 @@
       "integrity": "sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==",
       "dev": true,
       "requires": {
-        "semver": "^5.0.0"
+        "semver": "5.5.0"
       }
     },
     "send": {
@@ -12865,13 +12849,13 @@
       "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.4",
+        "accepts": "1.3.5",
         "batch": "0.6.1",
         "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
+        "escape-html": "1.0.3",
+        "http-errors": "1.6.3",
+        "mime-types": "2.1.18",
+        "parseurl": "1.3.2"
       }
     },
     "serve-static": {
@@ -12898,7 +12882,7 @@
       "integrity": "sha1-12nBgsnVpR9AkUXy+6guXoboA3Y=",
       "dev": true,
       "requires": {
-        "to-object-path": "^0.3.0"
+        "to-object-path": "0.3.0"
       }
     },
     "set-immediate-shim": {
@@ -12945,8 +12929,8 @@
       "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
       }
     },
     "shallow-clone": {
@@ -12955,9 +12939,9 @@
       "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
       "dev": true,
       "requires": {
-        "is-extendable": "^0.1.1",
-        "kind-of": "^5.0.0",
-        "mixin-object": "^2.0.1"
+        "is-extendable": "0.1.1",
+        "kind-of": "5.1.0",
+        "mixin-object": "2.0.1"
       },
       "dependencies": {
         "kind-of": {
@@ -12974,7 +12958,7 @@
       "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
       "dev": true,
       "requires": {
-        "shebang-regex": "^1.0.0"
+        "shebang-regex": "1.0.0"
       }
     },
     "shebang-regex": {
@@ -13042,14 +13026,14 @@
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "requires": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
+        "base": "0.11.2",
+        "debug": "2.6.9",
+        "define-property": "0.2.5",
+        "extend-shallow": "2.0.1",
+        "map-cache": "0.2.2",
+        "source-map": "0.5.6",
+        "source-map-resolve": "0.5.2",
+        "use": "3.1.0"
       },
       "dependencies": {
         "define-property": {
@@ -13057,7 +13041,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         },
         "extend-shallow": {
@@ -13065,7 +13049,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         }
       }
@@ -13075,9 +13059,9 @@
       "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "requires": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
+        "define-property": "1.0.0",
+        "isobject": "3.0.1",
+        "snapdragon-util": "3.0.1"
       },
       "dependencies": {
         "define-property": {
@@ -13085,7 +13069,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "requires": {
-            "is-descriptor": "^1.0.0"
+            "is-descriptor": "1.0.2"
           }
         },
         "is-accessor-descriptor": {
@@ -13093,7 +13077,7 @@
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-data-descriptor": {
@@ -13101,7 +13085,7 @@
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-descriptor": {
@@ -13109,9 +13093,9 @@
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
           }
         }
       }
@@ -13121,7 +13105,7 @@
       "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "requires": {
-        "kind-of": "^3.2.0"
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "kind-of": {
@@ -13129,7 +13113,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -13140,12 +13124,12 @@
       "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
       "dev": true,
       "requires": {
-        "debug": "~3.1.0",
-        "engine.io": "~3.2.0",
-        "has-binary2": "~1.0.2",
-        "socket.io-adapter": "~1.1.0",
+        "debug": "3.1.0",
+        "engine.io": "3.2.1",
+        "has-binary2": "1.0.3",
+        "socket.io-adapter": "1.1.1",
         "socket.io-client": "2.1.1",
-        "socket.io-parser": "~3.2.0"
+        "socket.io-parser": "3.2.0"
       },
       "dependencies": {
         "debug": {
@@ -13175,15 +13159,15 @@
         "base64-arraybuffer": "0.1.5",
         "component-bind": "1.0.0",
         "component-emitter": "1.2.1",
-        "debug": "~3.1.0",
-        "engine.io-client": "~3.2.0",
-        "has-binary2": "~1.0.2",
+        "debug": "3.1.0",
+        "engine.io-client": "3.2.1",
+        "has-binary2": "1.0.3",
         "has-cors": "1.1.0",
         "indexof": "0.0.1",
         "object-component": "0.0.3",
         "parseqs": "0.0.5",
         "parseuri": "0.0.5",
-        "socket.io-parser": "~3.2.0",
+        "socket.io-parser": "3.2.0",
         "to-array": "0.1.4"
       },
       "dependencies": {
@@ -13205,7 +13189,7 @@
       "dev": true,
       "requires": {
         "component-emitter": "1.2.1",
-        "debug": "~3.1.0",
+        "debug": "3.1.0",
         "isarray": "2.0.1"
       },
       "dependencies": {
@@ -13232,8 +13216,8 @@
       "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
       "dev": true,
       "requires": {
-        "faye-websocket": "^0.10.0",
-        "uuid": "^3.0.1"
+        "faye-websocket": "0.10.0",
+        "uuid": "3.2.1"
       }
     },
     "sockjs-client": {
@@ -13242,12 +13226,12 @@
       "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==",
       "dev": true,
       "requires": {
-        "debug": "^3.2.5",
-        "eventsource": "^1.0.7",
-        "faye-websocket": "~0.11.1",
-        "inherits": "^2.0.3",
-        "json3": "^3.3.2",
-        "url-parse": "^1.4.3"
+        "debug": "3.2.6",
+        "eventsource": "1.0.7",
+        "faye-websocket": "0.11.1",
+        "inherits": "2.0.3",
+        "json3": "3.3.2",
+        "url-parse": "1.4.4"
       },
       "dependencies": {
         "debug": {
@@ -13256,7 +13240,7 @@
           "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.1"
           }
         },
         "faye-websocket": {
@@ -13313,8 +13297,8 @@
       "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==",
       "dev": true,
       "requires": {
-        "async": "^2.5.0",
-        "loader-utils": "^1.1.0"
+        "async": "2.6.2",
+        "loader-utils": "1.2.3"
       },
       "dependencies": {
         "async": {
@@ -13339,11 +13323,11 @@
       "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
       "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
       "requires": {
-        "atob": "^2.1.1",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
+        "atob": "2.1.1",
+        "decode-uri-component": "0.2.0",
+        "resolve-url": "0.2.1",
+        "source-map-url": "0.4.0",
+        "urix": "0.1.0"
       }
     },
     "source-map-support": {
@@ -13352,8 +13336,8 @@
       "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==",
       "dev": true,
       "requires": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
+        "buffer-from": "1.1.0",
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -13403,8 +13387,8 @@
       "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
       "dev": true,
       "requires": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
+        "spdx-exceptions": "2.1.0",
+        "spdx-license-ids": "3.0.0"
       }
     },
     "spdx-license-ids": {
@@ -13449,12 +13433,12 @@
       "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
       "dev": true,
       "requires": {
-        "debug": "^4.1.0",
-        "detect-node": "^2.0.4",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.2",
-        "readable-stream": "^3.0.6",
-        "wbuf": "^1.7.3"
+        "debug": "4.1.1",
+        "detect-node": "2.0.4",
+        "hpack.js": "2.1.6",
+        "obuf": "1.1.2",
+        "readable-stream": "3.1.1",
+        "wbuf": "1.7.3"
       },
       "dependencies": {
         "debug": {
@@ -13463,7 +13447,7 @@
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.1"
           }
         },
         "ms": {
@@ -13496,11 +13480,11 @@
     },
     "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": {
-        "through": "2"
+        "through": "2.3.8"
       }
     },
     "split-string": {
@@ -13508,7 +13492,7 @@
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "requires": {
-        "extend-shallow": "^3.0.0"
+        "extend-shallow": "3.0.2"
       }
     },
     "sprintf-js": {
@@ -13539,7 +13523,7 @@
       "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
       "dev": true,
       "requires": {
-        "safe-buffer": "^5.1.1"
+        "safe-buffer": "5.1.2"
       }
     },
     "stack-trace": {
@@ -13567,8 +13551,8 @@
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
       "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
       "requires": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
+        "define-property": "0.2.5",
+        "object-copy": "0.1.0"
       },
       "dependencies": {
         "define-property": {
@@ -13576,7 +13560,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         }
       }
@@ -13587,7 +13571,7 @@
       "integrity": "sha512-NT0YGhwuQ0EOX+uPhhUcI6/+1Sq/pMzNuSCBVT4GbFl/ac6I/JZefBcjlECNfAb1t3GOx5dEj1Z7x0cAxeeVLQ==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.4"
+        "lodash": "4.17.13"
       }
     },
     "statuses": {
@@ -13616,7 +13600,7 @@
       "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"
+        "tslib": "1.9.3"
       }
     },
     "stratos-protractor-reporter": {
@@ -13625,11 +13609,11 @@
       "integrity": "sha512-e87eX4LB+KLVOfEF/TeWpNYM9aQFJTO+jsslym7zCZLYd8xlNWZUjmUf00J0DWn7YpoNGdjv0wzkKPcXJ2c5uw==",
       "dev": true,
       "requires": {
-        "circular-json": "^0.3.1",
-        "fs-extra": "^3.0.1",
-        "klaw-sync": "^2.1.0",
-        "mkdirp": "~0.3.5",
-        "underscore": "~1.6.0"
+        "circular-json": "0.3.3",
+        "fs-extra": "3.0.1",
+        "klaw-sync": "2.1.0",
+        "mkdirp": "0.3.5",
+        "underscore": "1.6.0"
       },
       "dependencies": {
         "circular-json": {
@@ -13652,17 +13636,17 @@
       "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
       "dev": true,
       "requires": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
       }
     },
     "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": {
-        "duplexer": "~0.1.1"
+        "duplexer": "0.1.1"
       }
     },
     "stream-each": {
@@ -13671,8 +13655,8 @@
       "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
       "dev": true,
       "requires": {
-        "end-of-stream": "^1.1.0",
-        "stream-shift": "^1.0.0"
+        "end-of-stream": "1.4.1",
+        "stream-shift": "1.0.0"
       }
     },
     "stream-exhaust": {
@@ -13687,11 +13671,11 @@
       "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
       "dev": true,
       "requires": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
+        "builtin-status-codes": "3.0.0",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6",
+        "to-arraybuffer": "1.0.1",
+        "xtend": "4.0.1"
       }
     },
     "stream-shift": {
@@ -13706,10 +13690,10 @@
       "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
       "dev": true,
       "requires": {
-        "date-format": "^1.2.0",
-        "debug": "^3.1.0",
-        "mkdirp": "^0.5.1",
-        "readable-stream": "^2.3.0"
+        "date-format": "1.2.0",
+        "debug": "3.2.6",
+        "mkdirp": "0.5.1",
+        "readable-stream": "2.3.6"
       },
       "dependencies": {
         "debug": {
@@ -13718,7 +13702,7 @@
           "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.1"
           }
         },
         "ms": {
@@ -13735,9 +13719,9 @@
       "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
       "dev": true,
       "requires": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
+        "code-point-at": "1.1.0",
+        "is-fullwidth-code-point": "1.0.0",
+        "strip-ansi": "3.0.1"
       }
     },
     "string.prototype.padend": {
@@ -13746,9 +13730,9 @@
       "integrity": "sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA=",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.4.3",
-        "function-bind": "^1.0.2"
+        "define-properties": "1.1.2",
+        "es-abstract": "1.12.0",
+        "function-bind": "1.1.1"
       }
     },
     "string_decoder": {
@@ -13756,7 +13740,7 @@
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "requires": {
-        "safe-buffer": "~5.1.0"
+        "safe-buffer": "5.1.2"
       }
     },
     "strip-ansi": {
@@ -13765,7 +13749,7 @@
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "dev": true,
       "requires": {
-        "ansi-regex": "^2.0.0"
+        "ansi-regex": "2.1.1"
       }
     },
     "strip-bom": {
@@ -13774,7 +13758,7 @@
       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
       "dev": true,
       "requires": {
-        "is-utf8": "^0.2.0"
+        "is-utf8": "0.2.1"
       }
     },
     "strip-eof": {
@@ -13789,7 +13773,7 @@
       "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
       "dev": true,
       "requires": {
-        "get-stdin": "^4.0.1"
+        "get-stdin": "4.0.1"
       }
     },
     "strip-json-comments": {
@@ -13804,8 +13788,8 @@
       "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^1.0.0"
+        "loader-utils": "1.2.3",
+        "schema-utils": "1.0.0"
       }
     },
     "stylus": {
@@ -13814,12 +13798,12 @@
       "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=",
       "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"
+        "css-parse": "1.7.0",
+        "debug": "2.6.9",
+        "glob": "7.0.6",
+        "mkdirp": "0.5.1",
+        "sax": "0.5.8",
+        "source-map": "0.1.43"
       },
       "dependencies": {
         "glob": {
@@ -13828,12 +13812,12 @@
           "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
           "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"
+            "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"
           }
         },
         "source-map": {
@@ -13842,7 +13826,7 @@
           "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
           "dev": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "amdefine": "1.0.1"
           }
         }
       }
@@ -13853,9 +13837,9 @@
       "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.0.2",
-        "lodash.clonedeep": "^4.5.0",
-        "when": "~3.6.x"
+        "loader-utils": "1.2.3",
+        "lodash.clonedeep": "4.5.0",
+        "when": "3.6.4"
       }
     },
     "supports-color": {
@@ -13873,8 +13857,8 @@
       "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
       "dev": true,
       "requires": {
-        "es6-iterator": "^2.0.1",
-        "es6-symbol": "^3.1.1"
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1"
       }
     },
     "symbol-observable": {
@@ -13889,12 +13873,12 @@
       "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=",
       "dev": true,
       "requires": {
-        "ajv": "^4.7.0",
-        "ajv-keywords": "^1.0.0",
-        "chalk": "^1.1.1",
-        "lodash": "^4.0.0",
+        "ajv": "4.11.8",
+        "ajv-keywords": "1.5.1",
+        "chalk": "1.1.3",
+        "lodash": "4.17.10",
         "slice-ansi": "0.0.4",
-        "string-width": "^2.0.0"
+        "string-width": "2.1.1"
       },
       "dependencies": {
         "ajv": {
@@ -13903,8 +13887,8 @@
           "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
           "dev": true,
           "requires": {
-            "co": "^4.6.0",
-            "json-stable-stringify": "^1.0.1"
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
           }
         },
         "ajv-keywords": {
@@ -13931,11 +13915,11 @@
           "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"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "is-fullwidth-code-point": {
@@ -13956,8 +13940,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": {
@@ -13966,7 +13950,7 @@
               "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
               "dev": true,
               "requires": {
-                "ansi-regex": "^3.0.0"
+                "ansi-regex": "3.0.0"
               }
             }
           }
@@ -13985,7 +13969,7 @@
       "integrity": "sha1-BEHPzhallIFoTCfRtaZ/8VpDx7A=",
       "dev": true,
       "requires": {
-        "connected-domain": "^1.0.0"
+        "connected-domain": "1.0.0"
       }
     },
     "tapable": {
@@ -14017,16 +14001,16 @@
       "integrity": "sha1-gHFzBDeHByDpQxUy/igUNk+IA9c=",
       "dev": true,
       "requires": {
-        "rimraf": "~2.5.2"
+        "rimraf": "2.5.4"
       },
       "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": {
-            "glob": "^7.0.5"
+            "glob": "7.1.2"
           }
         }
       }
@@ -14037,7 +14021,7 @@
       "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=",
       "dev": true,
       "requires": {
-        "execa": "^0.7.0"
+        "execa": "0.7.0"
       }
     },
     "terser": {
@@ -14071,14 +14055,14 @@
       "integrity": "sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==",
       "dev": true,
       "requires": {
-        "cacache": "^11.0.2",
-        "find-cache-dir": "^2.0.0",
-        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^1.4.0",
-        "source-map": "^0.6.1",
-        "terser": "^3.16.1",
-        "webpack-sources": "^1.1.0",
-        "worker-farm": "^1.5.2"
+        "cacache": "11.3.2",
+        "find-cache-dir": "2.0.0",
+        "schema-utils": "1.0.0",
+        "serialize-javascript": "1.6.1",
+        "source-map": "0.6.1",
+        "terser": "3.16.1",
+        "webpack-sources": "1.3.0",
+        "worker-farm": "1.6.0"
       },
       "dependencies": {
         "bluebird": {
@@ -14126,7 +14110,7 @@
           "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
-            "locate-path": "^3.0.0"
+            "locate-path": "3.0.0"
           }
         },
         "glob": {
@@ -14155,8 +14139,8 @@
           "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"
           }
         },
         "lru-cache": {
@@ -14165,7 +14149,7 @@
           "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
           "dev": true,
           "requires": {
-            "yallist": "^3.0.2"
+            "yallist": "3.0.3"
           }
         },
         "mississippi": {
@@ -14174,16 +14158,16 @@
           "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
           "dev": true,
           "requires": {
-            "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"
+            "concat-stream": "1.6.2",
+            "duplexify": "3.6.0",
+            "end-of-stream": "1.4.1",
+            "flush-write-stream": "1.0.3",
+            "from2": "2.3.0",
+            "parallel-transform": "1.1.0",
+            "pump": "3.0.0",
+            "pumpify": "1.5.1",
+            "stream-each": "1.2.3",
+            "through2": "2.0.3"
           }
         },
         "p-limit": {
@@ -14201,7 +14185,7 @@
           "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "dev": true,
           "requires": {
-            "p-limit": "^2.0.0"
+            "p-limit": "2.1.0"
           }
         },
         "p-try": {
@@ -14216,7 +14200,7 @@
           "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
           "dev": true,
           "requires": {
-            "find-up": "^3.0.0"
+            "find-up": "3.0.0"
           }
         },
         "pump": {
@@ -14225,8 +14209,8 @@
           "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
           "dev": true,
           "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
+            "end-of-stream": "1.4.1",
+            "once": "1.4.0"
           }
         },
         "source-map": {
@@ -14241,7 +14225,7 @@
           "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
           "dev": true,
           "requires": {
-            "figgy-pudding": "^3.5.1"
+            "figgy-pudding": "3.5.1"
           }
         },
         "yallist": {
@@ -14280,8 +14264,8 @@
       "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
       "dev": true,
       "requires": {
-        "through2": "~2.0.0",
-        "xtend": "~4.0.0"
+        "through2": "2.0.3",
+        "xtend": "4.0.1"
       }
     },
     "thunky": {
@@ -14317,7 +14301,7 @@
       "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
       "dev": true,
       "requires": {
-        "os-tmpdir": "~1.0.2"
+        "os-tmpdir": "1.0.2"
       }
     },
     "to-absolute-glob": {
@@ -14326,8 +14310,8 @@
       "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
       "dev": true,
       "requires": {
-        "is-absolute": "^1.0.0",
-        "is-negated-glob": "^1.0.0"
+        "is-absolute": "1.0.0",
+        "is-negated-glob": "1.0.0"
       }
     },
     "to-array": {
@@ -14353,7 +14337,7 @@
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
       "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
       "requires": {
-        "kind-of": "^3.0.2"
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "kind-of": {
@@ -14361,7 +14345,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -14371,10 +14355,10 @@
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "requires": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
+        "define-property": "2.0.2",
+        "extend-shallow": "3.0.2",
+        "regex-not": "1.0.2",
+        "safe-regex": "1.1.0"
       }
     },
     "to-regex-range": {
@@ -14382,8 +14366,8 @@
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
       "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
       "requires": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
+        "is-number": "3.0.0",
+        "repeat-string": "1.6.1"
       }
     },
     "to-through": {
@@ -14392,7 +14376,7 @@
       "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
       "dev": true,
       "requires": {
-        "through2": "^2.0.3"
+        "through2": "2.0.3"
       }
     },
     "tough-cookie": {
@@ -14401,8 +14385,8 @@
       "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
       "dev": true,
       "requires": {
-        "psl": "^1.1.24",
-        "punycode": "^1.4.1"
+        "psl": "1.1.31",
+        "punycode": "1.4.1"
       },
       "dependencies": {
         "punycode": {
@@ -14466,16 +14450,16 @@
       "integrity": "sha1-u9KOOK9Kqj6WB2xGbhsiAZfBo84=",
       "dev": true,
       "requires": {
-        "arrify": "^1.0.0",
-        "chalk": "^2.0.0",
-        "diff": "^3.1.0",
-        "make-error": "^1.1.1",
-        "minimist": "^1.2.0",
-        "mkdirp": "^0.5.1",
-        "source-map-support": "^0.4.0",
-        "tsconfig": "^6.0.0",
-        "v8flags": "^3.0.0",
-        "yn": "^2.0.0"
+        "arrify": "1.0.1",
+        "chalk": "2.2.2",
+        "diff": "3.5.0",
+        "make-error": "1.3.4",
+        "minimist": "1.2.0",
+        "mkdirp": "0.5.1",
+        "source-map-support": "0.4.18",
+        "tsconfig": "6.0.0",
+        "v8flags": "3.1.0",
+        "yn": "2.0.0"
       },
       "dependencies": {
         "minimist": {
@@ -14490,7 +14474,7 @@
           "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
           "dev": true,
           "requires": {
-            "source-map": "^0.5.6"
+            "source-map": "0.5.6"
           }
         }
       }
@@ -14501,8 +14485,8 @@
       "integrity": "sha1-aw6DdgA9evGGT434+J3QBZ/80DI=",
       "dev": true,
       "requires": {
-        "strip-bom": "^3.0.0",
-        "strip-json-comments": "^2.0.0"
+        "strip-bom": "3.0.0",
+        "strip-json-comments": "2.0.1"
       },
       "dependencies": {
         "strip-bom": {
@@ -14613,7 +14597,7 @@
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
       "dev": true,
       "requires": {
-        "safe-buffer": "^5.0.1"
+        "safe-buffer": "5.1.2"
       }
     },
     "tweetnacl": {
@@ -14629,7 +14613,7 @@
       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
       "dev": true,
       "requires": {
-        "prelude-ls": "~1.1.2"
+        "prelude-ls": "1.1.2"
       }
     },
     "type-is": {
@@ -14702,15 +14686,15 @@
       "integrity": "sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==",
       "dev": true,
       "requires": {
-        "arr-flatten": "^1.0.1",
-        "arr-map": "^2.0.0",
-        "bach": "^1.0.0",
-        "collection-map": "^1.0.0",
-        "es6-weak-map": "^2.0.1",
-        "last-run": "^1.1.0",
-        "object.defaults": "^1.0.0",
-        "object.reduce": "^1.0.0",
-        "undertaker-registry": "^1.0.0"
+        "arr-flatten": "1.1.0",
+        "arr-map": "2.0.2",
+        "bach": "1.2.0",
+        "collection-map": "1.0.0",
+        "es6-weak-map": "2.0.2",
+        "last-run": "1.1.1",
+        "object.defaults": "1.1.0",
+        "object.reduce": "1.0.1",
+        "undertaker-registry": "1.0.1"
       }
     },
     "undertaker-registry": {
@@ -14757,7 +14741,7 @@
       "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
       "dev": true,
       "requires": {
-        "unique-slug": "^2.0.0"
+        "unique-slug": "2.0.1"
       }
     },
     "unique-slug": {
@@ -14775,8 +14759,8 @@
       "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
       "dev": true,
       "requires": {
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "through2-filter": "^3.0.0"
+        "json-stable-stringify-without-jsonify": "1.0.1",
+        "through2-filter": "3.0.0"
       }
     },
     "unique-string": {
@@ -14785,7 +14769,7 @@
       "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
       "dev": true,
       "requires": {
-        "crypto-random-string": "^1.0.0"
+        "crypto-random-string": "1.0.0"
       }
     },
     "universalify": {
@@ -14804,8 +14788,8 @@
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
       "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
       "requires": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
+        "has-value": "0.3.1",
+        "isobject": "3.0.1"
       },
       "dependencies": {
         "has-value": {
@@ -14813,9 +14797,9 @@
           "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
           "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
           "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
+            "get-value": "2.0.6",
+            "has-values": "0.1.4",
+            "isobject": "2.1.0"
           },
           "dependencies": {
             "isobject": {
@@ -14852,16 +14836,16 @@
       "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
       "dev": true,
       "requires": {
-        "boxen": "^1.2.1",
-        "chalk": "^2.0.1",
-        "configstore": "^3.0.0",
-        "import-lazy": "^2.1.0",
-        "is-ci": "^1.0.10",
-        "is-installed-globally": "^0.1.0",
-        "is-npm": "^1.0.0",
-        "latest-version": "^3.0.0",
-        "semver-diff": "^2.0.0",
-        "xdg-basedir": "^3.0.0"
+        "boxen": "1.3.0",
+        "chalk": "2.2.2",
+        "configstore": "3.1.2",
+        "import-lazy": "2.1.0",
+        "is-ci": "1.2.1",
+        "is-installed-globally": "0.1.0",
+        "is-npm": "1.0.0",
+        "latest-version": "3.1.0",
+        "semver-diff": "2.1.0",
+        "xdg-basedir": "3.0.0"
       }
     },
     "uri-js": {
@@ -14870,7 +14854,7 @@
       "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
       "dev": true,
       "requires": {
-        "punycode": "^2.1.0"
+        "punycode": "2.1.1"
       }
     },
     "urix": {
@@ -14912,7 +14896,7 @@
       "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
       "dev": true,
       "requires": {
-        "prepend-http": "^1.0.1"
+        "prepend-http": "1.0.4"
       }
     },
     "urlgrey": {
@@ -14935,7 +14919,7 @@
       "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=",
       "dev": true,
       "requires": {
-        "os-homedir": "^1.0.0"
+        "os-homedir": "1.0.2"
       }
     },
     "useragent": {
@@ -14944,8 +14928,8 @@
       "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
       "dev": true,
       "requires": {
-        "lru-cache": "4.1.x",
-        "tmp": "0.0.x"
+        "lru-cache": "4.1.3",
+        "tmp": "0.0.33"
       }
     },
     "util": {
@@ -14976,8 +14960,8 @@
       "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "object.getownpropertydescriptors": "^2.0.3"
+        "define-properties": "1.1.2",
+        "object.getownpropertydescriptors": "2.0.3"
       }
     },
     "utils-merge": {
@@ -15017,7 +15001,7 @@
       "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
       "dev": true,
       "requires": {
-        "builtins": "^1.0.3"
+        "builtins": "1.0.3"
       }
     },
     "value-or-function": {
@@ -15038,9 +15022,9 @@
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0",
+        "assert-plus": "1.0.0",
         "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
+        "extsprintf": "1.3.0"
       }
     },
     "vinyl": {
@@ -15063,23 +15047,23 @@
       "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
       "dev": true,
       "requires": {
-        "fs-mkdirp-stream": "^1.0.0",
-        "glob-stream": "^6.1.0",
-        "graceful-fs": "^4.0.0",
-        "is-valid-glob": "^1.0.0",
-        "lazystream": "^1.0.0",
-        "lead": "^1.0.0",
-        "object.assign": "^4.0.4",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.3.3",
-        "remove-bom-buffer": "^3.0.0",
-        "remove-bom-stream": "^1.2.0",
-        "resolve-options": "^1.1.0",
-        "through2": "^2.0.0",
-        "to-through": "^2.0.0",
-        "value-or-function": "^3.0.0",
-        "vinyl": "^2.0.0",
-        "vinyl-sourcemap": "^1.1.0"
+        "fs-mkdirp-stream": "1.0.0",
+        "glob-stream": "6.1.0",
+        "graceful-fs": "4.1.11",
+        "is-valid-glob": "1.0.0",
+        "lazystream": "1.0.0",
+        "lead": "1.0.0",
+        "object.assign": "4.1.0",
+        "pumpify": "1.5.1",
+        "readable-stream": "2.3.6",
+        "remove-bom-buffer": "3.0.0",
+        "remove-bom-stream": "1.2.0",
+        "resolve-options": "1.1.0",
+        "through2": "2.0.3",
+        "to-through": "2.0.0",
+        "value-or-function": "3.0.0",
+        "vinyl": "2.1.0",
+        "vinyl-sourcemap": "1.1.0"
       },
       "dependencies": {
         "is-valid-glob": {
@@ -15096,13 +15080,13 @@
       "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
       "dev": true,
       "requires": {
-        "append-buffer": "^1.0.2",
-        "convert-source-map": "^1.5.0",
-        "graceful-fs": "^4.1.6",
-        "normalize-path": "^2.1.1",
-        "now-and-later": "^2.0.0",
-        "remove-bom-buffer": "^3.0.0",
-        "vinyl": "^2.0.0"
+        "append-buffer": "1.0.2",
+        "convert-source-map": "1.5.1",
+        "graceful-fs": "4.1.11",
+        "normalize-path": "2.1.1",
+        "now-and-later": "2.0.1",
+        "remove-bom-buffer": "3.0.0",
+        "vinyl": "2.1.0"
       }
     },
     "viz.js": {
@@ -15132,9 +15116,9 @@
       "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
       "dev": true,
       "requires": {
-        "chokidar": "^2.0.2",
-        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
+        "chokidar": "2.0.3",
+        "graceful-fs": "4.1.11",
+        "neo-async": "2.6.0"
       }
     },
     "wbuf": {
@@ -15143,7 +15127,7 @@
       "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
       "dev": true,
       "requires": {
-        "minimalistic-assert": "^1.0.0"
+        "minimalistic-assert": "1.0.1"
       }
     },
     "web-animations-js": {
@@ -15157,8 +15141,8 @@
       "integrity": "sha512-lcUKrjbBfCK6MNsh7xaY2UAUmZwe+/ib03AjVOpFobX4O7+83BUveSrLfU0Qsyb1DaKJdQRbuU+kM9aZ6QUhiQ==",
       "dev": true,
       "requires": {
-        "@types/selenium-webdriver": "^3.0.0",
-        "selenium-webdriver": "^3.0.1"
+        "@types/selenium-webdriver": "3.0.16",
+        "selenium-webdriver": "3.6.0"
       }
     },
     "webpack": {
@@ -15171,26 +15155,26 @@
         "@webassemblyjs/helper-module-context": "1.7.11",
         "@webassemblyjs/wasm-edit": "1.7.11",
         "@webassemblyjs/wasm-parser": "1.7.11",
-        "acorn": "^6.0.5",
-        "acorn-dynamic-import": "^4.0.0",
-        "ajv": "^6.1.0",
-        "ajv-keywords": "^3.1.0",
-        "chrome-trace-event": "^1.0.0",
-        "enhanced-resolve": "^4.1.0",
-        "eslint-scope": "^4.0.0",
-        "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^2.3.0",
-        "loader-utils": "^1.1.0",
-        "memory-fs": "~0.4.1",
-        "micromatch": "^3.1.8",
-        "mkdirp": "~0.5.0",
-        "neo-async": "^2.5.0",
-        "node-libs-browser": "^2.0.0",
-        "schema-utils": "^0.4.4",
-        "tapable": "^1.1.0",
-        "terser-webpack-plugin": "^1.1.0",
-        "watchpack": "^1.5.0",
-        "webpack-sources": "^1.3.0"
+        "acorn": "6.1.0",
+        "acorn-dynamic-import": "4.0.0",
+        "ajv": "6.9.1",
+        "ajv-keywords": "3.4.0",
+        "chrome-trace-event": "1.0.0",
+        "enhanced-resolve": "4.1.0",
+        "eslint-scope": "4.0.0",
+        "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.0",
+        "node-libs-browser": "2.2.0",
+        "schema-utils": "0.4.7",
+        "tapable": "1.1.1",
+        "terser-webpack-plugin": "1.2.2",
+        "watchpack": "1.6.0",
+        "webpack-sources": "1.3.0"
       },
       "dependencies": {
         "acorn": {
@@ -15205,8 +15189,8 @@
           "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
           "dev": true,
           "requires": {
-            "ajv": "^6.1.0",
-            "ajv-keywords": "^3.1.0"
+            "ajv": "6.9.1",
+            "ajv-keywords": "3.4.0"
           }
         }
       }
@@ -15217,8 +15201,8 @@
       "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
       "dev": true,
       "requires": {
-        "source-list-map": "~0.1.7",
-        "source-map": "~0.4.1"
+        "source-list-map": "0.1.8",
+        "source-map": "0.4.4"
       },
       "dependencies": {
         "source-list-map": {
@@ -15233,7 +15217,7 @@
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "amdefine": "1.0.1"
           }
         }
       }
@@ -15244,10 +15228,10 @@
       "integrity": "sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==",
       "dev": true,
       "requires": {
-        "memory-fs": "~0.4.1",
-        "mime": "^2.3.1",
-        "range-parser": "^1.0.3",
-        "webpack-log": "^2.0.0"
+        "memory-fs": "0.4.1",
+        "mime": "2.4.0",
+        "range-parser": "1.2.0",
+        "webpack-log": "2.0.0"
       },
       "dependencies": {
         "mime": {
@@ -15265,34 +15249,34 @@
       "dev": true,
       "requires": {
         "ansi-html": "0.0.7",
-        "bonjour": "^3.5.0",
-        "chokidar": "^2.0.0",
-        "compression": "^1.5.2",
-        "connect-history-api-fallback": "^1.3.0",
-        "debug": "^3.1.0",
-        "del": "^3.0.0",
-        "express": "^4.16.2",
-        "html-entities": "^1.2.0",
-        "http-proxy-middleware": "~0.18.0",
-        "import-local": "^2.0.0",
-        "internal-ip": "^3.0.1",
-        "ip": "^1.1.5",
-        "killable": "^1.0.0",
-        "loglevel": "^1.4.1",
-        "opn": "^5.1.0",
-        "portfinder": "^1.0.9",
-        "schema-utils": "^1.0.0",
-        "selfsigned": "^1.9.1",
-        "semver": "^5.6.0",
-        "serve-index": "^1.7.2",
+        "bonjour": "3.5.0",
+        "chokidar": "2.0.3",
+        "compression": "1.7.3",
+        "connect-history-api-fallback": "1.6.0",
+        "debug": "3.2.6",
+        "del": "3.0.0",
+        "express": "4.16.4",
+        "html-entities": "1.2.1",
+        "http-proxy-middleware": "0.18.0",
+        "import-local": "2.0.0",
+        "internal-ip": "3.0.1",
+        "ip": "1.1.5",
+        "killable": "1.0.1",
+        "loglevel": "1.6.1",
+        "opn": "5.3.0",
+        "portfinder": "1.0.20",
+        "schema-utils": "1.0.0",
+        "selfsigned": "1.10.4",
+        "semver": "5.6.0",
+        "serve-index": "1.9.1",
         "sockjs": "0.3.19",
         "sockjs-client": "1.3.0",
-        "spdy": "^4.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^5.1.0",
-        "url": "^0.11.0",
+        "spdy": "4.0.0",
+        "strip-ansi": "3.0.1",
+        "supports-color": "5.4.0",
+        "url": "0.11.0",
         "webpack-dev-middleware": "3.4.0",
-        "webpack-log": "^2.0.0",
+        "webpack-log": "2.0.0",
         "yargs": "12.0.2"
       },
       "dependencies": {
@@ -15319,9 +15303,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.0.0"
+            "string-width": "2.1.1",
+            "strip-ansi": "4.0.0",
+            "wrap-ansi": "2.1.0"
           },
           "dependencies": {
             "strip-ansi": {
@@ -15330,7 +15314,7 @@
               "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
               "dev": true,
               "requires": {
-                "ansi-regex": "^3.0.0"
+                "ansi-regex": "3.0.0"
               }
             }
           }
@@ -15341,11 +15325,11 @@
           "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "dev": true,
           "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
+            "nice-try": "1.0.5",
+            "path-key": "2.0.1",
+            "semver": "5.6.0",
+            "shebang-command": "1.2.0",
+            "which": "1.3.1"
           }
         },
         "debug": {
@@ -15354,7 +15338,7 @@
           "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.1"
           }
         },
         "decamelize": {
@@ -15372,13 +15356,13 @@
           "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
           "dev": true,
           "requires": {
-            "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"
+            "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"
           }
         },
         "find-up": {
@@ -15387,7 +15371,7 @@
           "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
-            "locate-path": "^3.0.0"
+            "locate-path": "3.0.0"
           }
         },
         "get-stream": {
@@ -15396,7 +15380,7 @@
           "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
           "dev": true,
           "requires": {
-            "pump": "^3.0.0"
+            "pump": "3.0.0"
           }
         },
         "invert-kv": {
@@ -15417,7 +15401,7 @@
           "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
           "dev": true,
           "requires": {
-            "invert-kv": "^2.0.0"
+            "invert-kv": "2.0.0"
           }
         },
         "locate-path": {
@@ -15426,8 +15410,8 @@
           "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"
           }
         },
         "mime": {
@@ -15448,9 +15432,9 @@
           "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
           "dev": true,
           "requires": {
-            "execa": "^1.0.0",
-            "lcid": "^2.0.0",
-            "mem": "^4.0.0"
+            "execa": "1.0.0",
+            "lcid": "2.0.0",
+            "mem": "4.0.0"
           }
         },
         "p-limit": {
@@ -15468,7 +15452,7 @@
           "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "dev": true,
           "requires": {
-            "p-limit": "^2.0.0"
+            "p-limit": "2.1.0"
           }
         },
         "p-try": {
@@ -15483,8 +15467,8 @@
           "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
           "dev": true,
           "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
+            "end-of-stream": "1.4.1",
+            "once": "1.4.0"
           }
         },
         "semver": {
@@ -15499,8 +15483,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": {
@@ -15509,7 +15493,7 @@
               "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
               "dev": true,
               "requires": {
-                "ansi-regex": "^3.0.0"
+                "ansi-regex": "3.0.0"
               }
             }
           }
@@ -15520,10 +15504,10 @@
           "integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==",
           "dev": true,
           "requires": {
-            "memory-fs": "~0.4.1",
-            "mime": "^2.3.1",
-            "range-parser": "^1.0.3",
-            "webpack-log": "^2.0.0"
+            "memory-fs": "0.4.1",
+            "mime": "2.4.0",
+            "range-parser": "1.2.0",
+            "webpack-log": "2.0.0"
           }
         },
         "which-module": {
@@ -15538,18 +15522,18 @@
           "integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
           "dev": true,
           "requires": {
-            "cliui": "^4.0.0",
-            "decamelize": "^2.0.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": "^10.1.0"
+            "cliui": "4.1.0",
+            "decamelize": "2.0.0",
+            "find-up": "3.0.0",
+            "get-caller-file": "1.0.2",
+            "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": "10.1.0"
           }
         },
         "yargs-parser": {
@@ -15558,7 +15542,7 @@
           "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
           "dev": true,
           "requires": {
-            "camelcase": "^4.1.0"
+            "camelcase": "4.1.0"
           }
         }
       }
@@ -15569,8 +15553,8 @@
       "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
       "dev": true,
       "requires": {
-        "ansi-colors": "^3.0.0",
-        "uuid": "^3.3.2"
+        "ansi-colors": "3.2.3",
+        "uuid": "3.3.2"
       },
       "dependencies": {
         "ansi-colors": {
@@ -15593,7 +15577,7 @@
       "integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.5"
+        "lodash": "4.17.13"
       }
     },
     "webpack-sources": {
@@ -15602,8 +15586,8 @@
       "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==",
       "dev": true,
       "requires": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
+        "source-list-map": "2.0.1",
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -15620,7 +15604,7 @@
       "integrity": "sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==",
       "dev": true,
       "requires": {
-        "webpack-core": "^0.6.8"
+        "webpack-core": "0.6.9"
       }
     },
     "websocket-driver": {
@@ -15651,7 +15635,7 @@
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
       "requires": {
-        "isexe": "^2.0.0"
+        "isexe": "2.0.0"
       }
     },
     "which-module": {
@@ -15666,7 +15650,7 @@
       "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
       "dev": true,
       "requires": {
-        "string-width": "^1.0.2 || 2"
+        "string-width": "1.0.2"
       }
     },
     "widest-line": {
@@ -15675,7 +15659,7 @@
       "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==",
       "dev": true,
       "requires": {
-        "string-width": "^2.1.1"
+        "string-width": "2.1.1"
       },
       "dependencies": {
         "ansi-regex": {
@@ -15696,8 +15680,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"
           }
         },
         "strip-ansi": {
@@ -15706,7 +15690,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "3.0.0"
           }
         }
       }
@@ -15732,8 +15716,8 @@
       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
       "dev": true,
       "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1"
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1"
       }
     },
     "wrappy": {
@@ -15748,7 +15732,7 @@
       "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
       "dev": true,
       "requires": {
-        "mkdirp": "^0.5.1"
+        "mkdirp": "0.5.1"
       }
     },
     "write-file-atomic": {
@@ -15768,9 +15752,9 @@
       "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
       "dev": true,
       "requires": {
-        "async-limiter": "~1.0.0",
-        "safe-buffer": "~5.1.0",
-        "ultron": "~1.1.0"
+        "async-limiter": "1.0.0",
+        "safe-buffer": "5.1.2",
+        "ultron": "1.1.1"
       }
     },
     "xdg-basedir": {
@@ -15790,9 +15774,9 @@
       "integrity": "sha512-MWTbxAQqclRSTnehWWe5nMKzI3VmJ8ltiJEco8akcC6j3miOhjjfzKum5sId+CWhfxdOs/1xauYr8/ZDBtQiRw==",
       "dev": true,
       "requires": {
-        "sax": ">=0.6.0",
-        "util.promisify": "~1.0.0",
-        "xmlbuilder": "~11.0.0"
+        "sax": "1.2.4",
+        "util.promisify": "1.0.0",
+        "xmlbuilder": "11.0.1"
       },
       "dependencies": {
         "sax": {
@@ -15843,7 +15827,7 @@
       "integrity": "sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==",
       "dev": true,
       "requires": {
-        "cuint": "^0.2.2"
+        "cuint": "0.2.2"
       }
     },
     "y18n": {
@@ -15864,7 +15848,7 @@
       "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
       "dev": true,
       "requires": {
-        "camelcase": "^3.0.0"
+        "camelcase": "3.0.0"
       },
       "dependencies": {
         "camelcase": {
diff --git a/package.json b/package.json
index c9a7c56875..59f3cf4dff 100644
--- a/package.json
+++ b/package.json
@@ -144,4 +144,4 @@
     "tslint": "~5.13.0",
     "typescript": "~3.1.6"
   }
-}
\ No newline at end of file
+}
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 57d9b79ff8..449639a0a5 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
@@ -24,7 +24,7 @@ import { IServiceInstance, IUserProvidedServiceInstance } from '../../../../core
 import { 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 { pathGet } from '../../../../core/src/core/utils.service';
+import { getIdFromRoute, pathGet } from '../../../../core/src/core/utils.service';
 import {
   extractActualListEntity,
 } from '../../../../core/src/shared/components/list/data-sources-controllers/local-filtering-sorting';
@@ -216,15 +216,6 @@ export const getRowMetadata = (entity: APIResource | MultiActionListEntity) => {
   return entity.metadata ? entity.metadata.guid : null;
 };
 
-export function getIdFromRoute(activatedRoute: ActivatedRoute, id: string) {
-  if (activatedRoute.snapshot.params[id]) {
-    return activatedRoute.snapshot.params[id];
-  } else if (activatedRoute.parent) {
-    return getIdFromRoute(activatedRoute.parent, id);
-  }
-  return null;
-}
-
 export function getActiveRouteCfOrgSpace(activatedRoute: ActivatedRoute) {
   return ({
     cfGuid: getIdFromRoute(activatedRoute, 'endpointId'),
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 79961d27fe..bea3bdd200 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,7 +15,7 @@ import {
 import { entityCatalogue } from '../../../../core/src/core/entity-catalogue/entity-catalogue.service';
 import { EntityService } from '../../../../core/src/core/entity-service';
 import { EntityServiceFactory } from '../../../../core/src/core/entity-service-factory.service';
-import { safeStringToObj } from '../../../../core/src/core/utils.service';
+import { getIdFromRoute, safeStringToObj } from '../../../../core/src/core/utils.service';
 import { PaginationMonitorFactory } from '../../../../core/src/shared/monitors/pagination-monitor.factory';
 import { StratosStatus } from '../../../../core/src/shared/shared.types';
 import { QParam, QParamJoiners } from '../../../../store/src/q-param';
@@ -34,7 +34,7 @@ import {
   servicePlanEntityType,
   spaceEntityType,
 } from '../../cf-entity-types';
-import { fetchTotalResults, getIdFromRoute } from '../cloud-foundry/cf.helpers';
+import { fetchTotalResults } from '../cloud-foundry/cf.helpers';
 import { ServicePlanAccessibility } from './services.service';
 
 export const getSvcAvailability = (
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 382a342a17..4e39440371 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
@@ -22,13 +22,13 @@ import { ISpace } from '../../../../core/src/core/cf-api.types';
 import { entityCatalogue } from '../../../../core/src/core/entity-catalogue/entity-catalogue.service';
 import { EntityService } from '../../../../core/src/core/entity-service';
 import { EntityServiceFactory } from '../../../../core/src/core/entity-service-factory.service';
+import { getIdFromRoute } from '../../../../core/src/core/utils.service';
 import { PaginationMonitorFactory } from '../../../../core/src/shared/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 { cfEntityFactory } from '../../cf-entity-factory';
 import { createEntityRelationPaginationKey } from '../../entity-relations/entity-relations.types';
-import { getIdFromRoute } from '../cloud-foundry/cf.helpers';
 import { getCfService, getServiceInstancesInCf, getServicePlans } from './services-helper';
 
 export interface ServicePlanAccessibility {
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 aa5c9f2b10..be1b2ec67b 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
@@ -36,7 +36,6 @@ import {
   createEntityRelationKey,
   createEntityRelationPaginationKey,
 } from '../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { getIdFromRoute } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
 import {
   servicesServiceFactoryProvider,
 } from '../../../../../../cloud-foundry/src/features/service-catalog/service-catalog.helpers';
@@ -51,6 +50,7 @@ import { IApp, ISpace } from '../../../../../../core/src/core/cf-api.types';
 import { entityCatalogue } from '../../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
 import { IEntityMetadata } from '../../../../../../core/src/core/entity-catalogue/entity-catalogue.types';
 import { EntityServiceFactory } from '../../../../../../core/src/core/entity-service-factory.service';
+import { getIdFromRoute } from '../../../../../../core/src/core/utils.service';
 import { PaginationMonitorFactory } from '../../../../../../core/src/shared/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { APIResource } from '../../../../../../store/src/types/api.types';
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 317a0fbfd9..875338589c 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
@@ -5,10 +5,10 @@ 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 { getIdFromRoute } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
 import { SpaceScopedService } from '../../../../../cloud-foundry/src/features/service-catalog/services.service';
 import { selectCfRequestInfo } from '../../../../../cloud-foundry/src/store/selectors/api.selectors';
 import { entityCatalogue } from '../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
+import { getIdFromRoute } from '../../../../../core/src/core/utils.service';
 import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
 
 export enum CreateServiceInstanceMode {
diff --git a/src/frontend/packages/core/src/core/utils.service.ts b/src/frontend/packages/core/src/core/utils.service.ts
index 3ced0c9386..5b4dda76bf 100644
--- a/src/frontend/packages/core/src/core/utils.service.ts
+++ b/src/frontend/packages/core/src/core/utils.service.ts
@@ -1,6 +1,18 @@
 import { Injectable } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 import { Subscription } from 'rxjs';
 
+export function getIdFromRoute(activatedRoute: ActivatedRoute, id: string) {
+  if (activatedRoute.snapshot.params[id]) {
+    return activatedRoute.snapshot.params[id];
+  } else if (activatedRoute.parent) {
+    return getIdFromRoute(activatedRoute.parent, id);
+  }
+  return null;
+}
+
+// TODO: RC types in entity generator
+
 export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 
 export const urlValidationExpression =
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 5afd00f61a..d5e4bc79db 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
@@ -6,7 +6,6 @@ import { denormalize } from 'normalizr';
 import { Observable } from 'rxjs';
 import { filter, map, pairwise, withLatestFrom } from 'rxjs/operators';
 
-import { getIdFromRoute } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
 import { GetAllEndpoints, RegisterEndpoint } from '../../../../../../store/src/actions/endpoint.actions';
 import { ShowSnackBar } from '../../../../../../store/src/actions/snackBar.actions';
 import { GeneralEntityAppState } from '../../../../../../store/src/app-state';
@@ -17,6 +16,7 @@ import { selectPaginationState } from '../../../../../../store/src/selectors/pag
 import { endpointEntitySchema, STRATOS_ENDPOINT_TYPE } from '../../../../base-entity-schemas';
 import { StratosCatalogueEndpointEntity } from '../../../../core/entity-catalogue/entity-catalogue-entity';
 import { entityCatalogue } from '../../../../core/entity-catalogue/entity-catalogue.service';
+import { getIdFromRoute } from '../../../../core/utils.service';
 import { IStepperStep, StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component';
 import { ConnectEndpointConfig } from '../../connect.service';
 import { getFullEndpointApiUrl } from '../../endpoint-helpers';
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 de4dca83c6..48d6880982 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.ts
@@ -1,8 +1,8 @@
 import { Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
-import { getIdFromRoute } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
 import { entityCatalogue } from '../../../core/entity-catalogue/entity-catalogue.service';
+import { getIdFromRoute } from '../../../core/utils.service';
 
 @Component({
   selector: 'app-create-endpoint',
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 239fe0dbf4..ae1b9e8b71 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,10 +4,10 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, first, map } from 'rxjs/operators';
 
-import { getIdFromRoute } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
 import { MetricsAPIAction, MetricsAPITargets } from '../../../../../store/src/actions/metrics-api.actions';
 import { AppState } from '../../../../../store/src/app-state';
 import { entityCatalogue } from '../../../core/entity-catalogue/entity-catalogue.service';
+import { getIdFromRoute } from '../../../core/utils.service';
 import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types';
 import { EndpointIcon } from '../../endpoints/endpoint-helpers';
 import { MetricsEndpointProvider, MetricsService } from '../services/metrics-service';
diff --git a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source-config.ts b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source-config.ts
index 6f94a1fcc8..a09b3f2282 100644
--- a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source-config.ts
+++ b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source-config.ts
@@ -1,7 +1,7 @@
 import { Action, Store } from '@ngrx/store';
 import { Observable, OperatorFunction } from 'rxjs';
 
-import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
+import { AppState } from '../../../../../../store/src/app-state';
 import { EntitySchema } from '../../../../../../store/src/helpers/entity-schema';
 import { PaginatedAction } from '../../../../../../store/src/types/pagination.types';
 import { IListConfig } from '../list.component.types';
@@ -41,7 +41,7 @@ export class ActionSchemaConfig {
 }
 
 export interface IListDataSourceConfig<A, T> {
-  store: Store<CFAppState>;
+  store: Store<AppState>;
   /**
    * An action that, when called, will populate the entries required to show the current state of the list. For example, this action will
    * be dispatched when the page number changes in a non-local list.
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 021c7c09eb..7529b86816 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
@@ -24,10 +24,10 @@ import {
   withLatestFrom,
 } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
 import { ListFilter, ListSort } from '../../../../../../store/src/actions/list.actions';
 import { MetricsAction } from '../../../../../../store/src/actions/metrics.actions';
 import { SetResultCount } from '../../../../../../store/src/actions/pagination.actions';
+import { AppState } from '../../../../../../store/src/app-state';
 import { EntitySchema } from '../../../../../../store/src/helpers/entity-schema';
 import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { PaginatedAction, PaginationEntityState, PaginationParam } from '../../../../../../store/src/types/pagination.types';
@@ -106,7 +106,7 @@ export abstract class ListDataSource<T, A = T> extends DataSource<T> implements
   // ------------- Private
   private externalDestroy: () => void;
 
-  protected store: Store<CFAppState>;
+  protected store: Store<AppState>;
   public action: PaginatedAction | PaginatedAction[];
   public masterAction: PaginatedAction;
   public sourceScheme: EntitySchema;
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 f6f9738aa1..28f3d4369f 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
@@ -76,9 +76,10 @@ export class EndpointCardComponent extends CardCell<EndpointModel> implements On
       const metadata = this.endpointCatalogueEntity.builders.entityBuilder.getMetadata(row);
       this.endpointLink = row.connectionStatus === 'connected' || this.endpointCatalogueEntity.definition.unConnectable ?
         this.endpointCatalogueEntity.builders.entityBuilder.getLink(metadata) : null;
+      this.connectionStatus = this.endpointCatalogueEntity.definition.unConnectable ? 'connected' : row.connectionStatus;
     }
     this.updateInnerComponent();
-    this.connectionStatus = this.endpointConfig.doesNotSupportConnect ? 'connected' : row.connectionStatus;
+
   }
   get row(): EndpointModel {
     return this.pRow;

From 963679b20c0ba83777d59f1608fb1c5811b4695f Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 2 Oct 2019 15:30:18 +0100
Subject: [PATCH 114/648] Running

---
 .../app/custom/custom-routing.module.ts       | 29 ++++----
 .../frontend/app/custom/custom.module.ts      | 11 +--
 .../kubernetes/kubernetes-entity-generator.ts | 10 +++
 .../custom/kubernetes/kubernetes.module.ts    |  5 +-
 .../kubernetes/kubernetes.setup.module.ts     | 12 ++--
 .../kubernetes/kubernetes.store.module.ts     | 15 +++-
 .../kubernetes/kubernetes.testing.module.ts   | 57 +++++++--------
 .../helm-release-pods-data-source.ts          |  6 +-
 .../kubernetes/store/kubernetes.actions.ts    | 19 ++++-
 .../kubernetes/store/kubernetes.effects.ts    | 71 ++++++++++---------
 .../cloud-foundry/src/cf-entity-generator.ts  |  8 +--
 .../cloud-foundry/src/cloud-foundry.module.ts |  1 -
 .../cf-org-space-service.service.ts           |  3 +-
 .../packages/core/src/core/utils.service.ts   |  2 +
 .../endpoint/base-endpoints-data-source.ts    | 12 ++--
 .../store/src/actions/metrics.actions.ts      |  1 +
 16 files changed, 154 insertions(+), 108 deletions(-)

diff --git a/custom-src/frontend/app/custom/custom-routing.module.ts b/custom-src/frontend/app/custom/custom-routing.module.ts
index d0bf7c3944..1a9862a4e6 100644
--- a/custom-src/frontend/app/custom/custom-routing.module.ts
+++ b/custom-src/frontend/app/custom/custom-routing.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
+import { RouterModule, Routes } from '@angular/router';
 
 const kubernetes: Routes = [
   {
@@ -15,19 +15,20 @@ const kubernetes: Routes = [
       }
     }
   },
-  {
-    path: 'monocular',
-    loadChildren: './helm/helm.module#HelmModule',
-    data: {
-      stratosNavigation: {
-        text: 'Helm',
-        matIcon: 'helm',
-        matIconFont: 'stratos-icons',
-        position: 65,
-        requiresEndpointType: 'helm'
-      }
-    }
-  }
+  // TODO: RC helm
+  // {
+  //   path: 'monocular',
+  //   loadChildren: './helm/helm.module#HelmModule',
+  //   data: {
+  //     stratosNavigation: {
+  //       text: 'Helm',
+  //       matIcon: 'helm',
+  //       matIconFont: 'stratos-icons',
+  //       position: 65,
+  //       requiresEndpointType: 'helm'
+  //     }
+  //   }
+  // }
 ];
 
 @NgModule({
diff --git a/custom-src/frontend/app/custom/custom.module.ts b/custom-src/frontend/app/custom/custom.module.ts
index 6f83726f5b..433ecaacd6 100644
--- a/custom-src/frontend/app/custom/custom.module.ts
+++ b/custom-src/frontend/app/custom/custom.module.ts
@@ -15,10 +15,10 @@ import { KubernetesSetupModule } from './kubernetes/kubernetes.setup.module';
 import { KubeHealthCheck } from './kubernetes/store/kubernetes.actions';
 import { SuseAboutInfoComponent } from './suse-about-info/suse-about-info.component';
 import { SuseLoginComponent } from './suse-login/suse-login.component';
-import { HelmModule } from './helm/helm.module';
-import { HelmSetupModule } from './helm/helm.setup.module';
 import { SuseWelcomeComponent } from './suse-welcome/suse-welcome.component';
 
+// import { HelmModule } from './helm/helm.module';
+// import { HelmSetupModule } from './helm/helm.setup.module';
 const SuseCustomizations: CustomizationsMetadata = {
   copyright: '&copy; 2019 SUSE',
   hasEula: true,
@@ -33,9 +33,10 @@ const SuseCustomizations: CustomizationsMetadata = {
     SharedModule,
     MDAppModule,
     KubernetesSetupModule,
-    HelmModule,
-    HelmSetupModule
+    // HelmModule, // TODO: RC Helm
+    // HelmSetupModule
   ],
+  // FIXME: Ensure that anything lazy loaded/in kube endpoint pages is not included here - #3675
   declarations: [
     SuseLoginComponent,
     SuseAboutInfoComponent,
@@ -57,6 +58,8 @@ export class CustomModule {
   static init = false;
 
   constructor(endpointService: EndpointsService, store: Store<AppState>, router: Router) {
+    // TODO: RC v3 world
+    // TODO: called multiple times
     endpointService.registerHealthCheck(
       new EndpointHealthCheck('k8s', (endpoint) => store.dispatch(new KubeHealthCheck(endpoint.guid)))
     );
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 fa1d785a48..fe0021d36c 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
@@ -102,7 +102,17 @@ const kubeAuthTypeMap: { [type: string]: EndpointAuthTypeConfig } = {
 //   help?: string;
 // }
 
+/**
+ * CustomImportModule brings in CustomModule. CustomModule brings in kube setup module. setup module brings this in multiple times
+ */
+let hack = false;
+
 export function generateKubernetesEntities(): StratosBaseCatalogueEntity[] {
+  if (hack) {
+    return [];
+  }
+  hack = true;
+
   const endpointDefinition: StratosEndpointExtensionDefinition = {
     type: KUBERNETES_ENDPOINT_TYPE,
     label: 'Kubernetes',
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
index 2554398cc0..21142826d8 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
@@ -1,10 +1,8 @@
-/* tslint:disable:max-line-length */
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
 import { CoreModule } from '../../core/core.module';
-import { EntityCatalogueModule } from '../../core/entity-catalogue.module';
 import { SharedModule } from '../../shared/shared.module';
 import { KubernetesReleasePodsTabComponent } from './helm-release/helm-release-pods-tab/helm-release-pods-tab.component';
 import { HelmReleaseServicesComponent } from './helm-release/helm-release-services/helm-release-services.component';
@@ -14,7 +12,6 @@ import {
 import { HelmReleaseSummaryComponent } from './helm-release/helm-release-summary/helm-release-summary.component';
 import { HelmReleaseComponent } from './helm-release/helm-release.component';
 import { KubernetesDashboardTabComponent } from './kubernetes-dashboard/kubernetes-dashboard.component';
-import { generateKubernetesEntities } from './kubernetes-entity-generator';
 import {
   KubernetesNamespacePodsComponent,
 } from './kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component';
@@ -92,6 +89,7 @@ import { KubernetesNodesTabComponent } from './tabs/kubernetes-nodes-tab/kuberne
 import { KubernetesPodsTabComponent } from './tabs/kubernetes-pods-tab/kubernetes-pods-tab.component';
 import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kubernetes-summary.component';
 
+/* tslint:disable:max-line-length */
 
 /* tslint:enable */
 @NgModule({
@@ -101,7 +99,6 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     SharedModule,
     NgxChartsModule,
     KubernetesRoutingModule,
-    EntityCatalogueModule.forFeature(generateKubernetesEntities),
   ],
   declarations: [
     KubernetesComponent,
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
index 565ed70742..2864a09336 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
@@ -1,9 +1,9 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { EffectsModule } from '@ngrx/effects';
 
 import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types';
 import { CoreModule } from '../../core/core.module';
+import { EntityCatalogueModule } from '../../core/entity-catalogue.module';
 import { SharedModule } from '../../shared/shared.module';
 import { KubernetesAWSAuthFormComponent } from './auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component';
 import {
@@ -13,7 +13,8 @@ import {
   KubernetesConfigAuthFormComponent,
 } from './auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component';
 import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component';
-import { KubernetesEffects } from './store/kubernetes.effects';
+import { generateKubernetesEntities } from './kubernetes-entity-generator';
+import { KubernetesStoreModule } from './kubernetes.store.module';
 
 export interface IK8FavMetadata extends IFavoriteMetadata {
   guid: string;
@@ -23,13 +24,12 @@ export interface IK8FavMetadata extends IFavoriteMetadata {
 
 @NgModule({
   imports: [
+    // TODO: RC Everytime this is imported it's executed. See note & `hack` in `generateKubernetesEntities`
+    EntityCatalogueModule.forFeature(generateKubernetesEntities),
     CoreModule,
     CommonModule,
     SharedModule,
-    // KubernetesStoreModule,
-    EffectsModule.forFeature([
-      KubernetesEffects
-    ])
+    KubernetesStoreModule,
   ],
   declarations: [
     KubernetesCertsAuthFormComponent,
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.store.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.store.module.ts
index f15bb4c66f..89934f18f7 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.store.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.store.module.ts
@@ -1,4 +1,17 @@
-// TODO: RC DELETE ME
+import { NgModule } from '@angular/core';
+import { EffectsModule } from '@ngrx/effects';
+
+import { KubernetesEffects } from './store/kubernetes.effects';
+
+@NgModule({
+  imports: [
+    EffectsModule.forFeature([
+      KubernetesEffects
+    ])
+  ]
+})
+export class KubernetesStoreModule { }
+
 // import { NgModule } from '@angular/core';
 // import { Validators } from '@angular/forms';
 
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 e71dff13bf..3f6d94a3b6 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
@@ -1,31 +1,32 @@
-import { KubernetesStoreModule } from './kubernetes.store.module';
-import { NgModule } from '@angular/core';
-import { kubernetesEntities } from './store/kubernetes.entities';
-import { registerEntitiesForTesting, createBasicStoreModule } from '../../../test-framework/store-test-helper';
-import { RouterTestingModule } from '@angular/router/testing';
-import { CoreModule } from '../../core/core.module';
-import { SharedModule } from '../../shared/shared.module';
-import { HttpModule } from '@angular/http';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+// TODO: RC this is copied over from custom-src and should be ignored
+// import { KubernetesStoreModule } from './kubernetes.store.module';
+// import { NgModule } from '@angular/core';
+// import { kubernetesEntities } from './store/kubernetes.entities';
+// import { registerEntitiesForTesting, createBasicStoreModule } from '../../../test-framework/store-test-helper';
+// import { RouterTestingModule } from '@angular/router/testing';
+// import { CoreModule } from '../../core/core.module';
+// import { SharedModule } from '../../shared/shared.module';
+// import { HttpModule } from '@angular/http';
+// import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
-@NgModule({
-  imports: [
-    KubernetesStoreModule
-  ]
-})
-export class KubernetesTestingModule {
+// @NgModule({
+//   imports: [
+//     KubernetesStoreModule
+//   ]
+// })
+// export class KubernetesTestingModule {
 
-  constructor() {
-    registerEntitiesForTesting(kubernetesEntities);
-  }
-}
+//   constructor() {
+//     registerEntitiesForTesting(kubernetesEntities);
+//   }
+// }
 
-export const KubernetesBaseTestModules = [
-  KubernetesTestingModule,
-  RouterTestingModule,
-  CoreModule,
-  createBasicStoreModule(),
-  NoopAnimationsModule,
-  HttpModule,
-  SharedModule,
-];
+// export const KubernetesBaseTestModules = [
+//   KubernetesTestingModule,
+//   RouterTestingModule,
+//   CoreModule,
+//   createBasicStoreModule(),
+//   NoopAnimationsModule,
+//   HttpModule,
+//   SharedModule,
+// ];
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts
index 12cf4eb6cc..9ed5adcbe8 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts
@@ -4,7 +4,6 @@ import { entityFactory } from '../../../../../../store/src//helpers/entity-facto
 import { AppState } from '../../../../../../store/src/app-state';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { getHelmReleaseServiceId } from '../../../helm/store/helm.entities';
 import { kubernetesPodsSchemaKey } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { HelmReleaseService } from '../../services/helm-release.service';
@@ -12,7 +11,7 @@ import { KubernetesPod } from '../../store/kube.types';
 import { GetKubernetesReleasePods } from '../../store/kubernetes.actions';
 
 
-
+// import { getHelmReleaseServiceId } from '../../../helm/store/helm.entities';
 export class KubernetesReleasePodsDataSource extends ListDataSource<KubernetesPod, any> {
 
   constructor(
@@ -26,7 +25,8 @@ export class KubernetesReleasePodsDataSource extends ListDataSource<KubernetesPo
       store,
       action,
       schema: entityFactory(kubernetesPodsSchemaKey),
-      getRowUniqueId: getHelmReleaseServiceId,
+      getRowUniqueId: a => a.name,
+      // getRowUniqueId: getHelmReleaseServiceId,  //TODO: RC
       paginationKey: action.paginationKey,
       isLocal: true,
       listConfig,
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 a2aa366ce3..f60fd9bf4c 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
@@ -385,12 +385,27 @@ function getKubeMetricsAction(guid: string) {
 
 export class FetchKubernetesMetricsAction extends MetricsAction {
   constructor(guid: string, cfGuid: string, metricQuery: string) {
-    super(guid, cfGuid, new MetricQueryConfig(metricQuery), getKubeMetricsAction(guid));
+    super(
+      guid,
+      cfGuid,
+      new MetricQueryConfig(metricQuery),
+      getKubeMetricsAction(guid),
+      undefined,
+      undefined,
+      undefined,
+      KUBERNETES_ENDPOINT_TYPE
+    );
   }
 }
 
 export class FetchKubernetesChartMetricsAction extends MetricsChartAction {
   constructor(guid: string, cfGuid: string, metricQuery: string) {
-    super(guid, cfGuid, new MetricQueryConfig(metricQuery), getKubeMetricsAction(guid));
+    super(
+      guid,
+      cfGuid,
+      new MetricQueryConfig(metricQuery),
+      getKubeMetricsAction(guid),
+      KUBERNETES_ENDPOINT_TYPE
+    );
   }
 }
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 860f529aa4..2581ae7fc1 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
@@ -75,27 +75,14 @@ export interface KubeDashboardStatus {
   installed: boolean;
 }
 
-export type GetID<T> = (p: T) => string;
-export type Filter<T> = (p: T) => boolean;
+type GetID<T> = (p: T) => string;
+type Filter<T> = (p: T) => boolean;
 
 @Injectable()
 export class KubernetesEffects {
   proxyAPIVersion = environment.proxyAPIVersion;
-  constructor(
-    private http: HttpClient,
-    private actions$: Actions,
-    private store: Store<AppState>
-  ) { }
-
-  private dashboardEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesDashboardSchemaKey);
-  private nodeEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesSchemaKey);
-  private namespaceEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNamespacesSchemaKey);
-  private podsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsSchemaKey);
-  private servicesEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesServicesSchemaKey);
-  private statefulSetsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesStatefulSetsSchemaKey);
-  private deploymentsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesDeploymentsSchemaKey);
-  private appsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesAppsSchemaKey);
 
+  constructor(private http: HttpClient, private actions$: Actions, private store: Store<AppState>) { }
 
   @Effect()
   fetchDashboardInfo$ = this.actions$.pipe(
@@ -107,16 +94,17 @@ export class KubernetesEffects {
         headers
       };
       const url = `/pp/${this.proxyAPIVersion}/kubedash/${action.kubeGuid}/status`;
+      const dashboardEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesDashboardSchemaKey);
       return this.http
         .get(url, requestArgs)
         .pipe(mergeMap(response => {
           const result = {
-            entities: { [this.dashboardEntityConfig.entityKey]: {} },
+            entities: { [dashboardEntityConfig.entityKey]: {} },
             result: []
           } as NormalizedResponse;
           const status = response as KubeDashboardStatus;
           const id = status.guid;
-          result.entities[this.dashboardEntityConfig.entityKey][id] = status;
+          result.entities[dashboardEntityConfig.entityKey][id] = status;
           result.result.push(id);
           return [
             new WrapperRequestActionSuccess(result, action)
@@ -137,10 +125,11 @@ export class KubernetesEffects {
   fetchReleasePodsInfo$ = this.actions$.pipe(
     ofType<GetKubernetesReleasePods>(GET_RELEASE_POD_INFO),
     flatMap(action => {
+      const nodeEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesSchemaKey);
       return this.processListAction<KubernetesPod>(
         action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`,
-        this.nodeEntityConfig.entityKey,
+        nodeEntityConfig.entityKey,
         getKubeAPIResourceGuid
       );
     })
@@ -156,9 +145,10 @@ export class KubernetesEffects {
   fetchNodeInfo$ = this.actions$.pipe(
     ofType<GetKubernetesNode>(GET_NODE_INFO),
     flatMap(action => {
+      const nodeEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesSchemaKey);
       return this.processSingleItemAction<KubernetesNode>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes/${action.nodeName}`,
-        this.nodeEntityConfig.entityKey,
+        nodeEntityConfig.entityKey,
         (node) => node.metadata.name);
     })
   );
@@ -167,9 +157,10 @@ export class KubernetesEffects {
   fetchNamespaceInfo$ = this.actions$.pipe(
     ofType<GetKubernetesNamespace>(GET_NAMESPACE_INFO),
     flatMap(action => {
+      const namespaceEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNamespacesSchemaKey);
       return this.processSingleItemAction<KubernetesNamespace>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}`,
-        this.namespaceEntityConfig.entityKey,
+        namespaceEntityConfig.entityKey,
         getKubeAPIResourceGuid);
     })
   );
@@ -178,9 +169,10 @@ export class KubernetesEffects {
   fetchPodsInfo$ = this.actions$.pipe(
     ofType<GetKubernetesPods>(GET_POD_INFO),
     flatMap(action => {
+      const podsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsSchemaKey);
       return this.processListAction<KubernetesPod>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`,
-        this.podsEntityConfig.entityKey,
+        podsEntityConfig.entityKey,
         getKubeAPIResourceGuid);
     })
   );
@@ -189,9 +181,10 @@ export class KubernetesEffects {
   fetchPodsOnNodeInfo$ = this.actions$.pipe(
     ofType<GetKubernetesPodsOnNode>(GET_PODS_ON_NODE_INFO),
     flatMap(action => {
+      const podsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsSchemaKey);
       return this.processListAction<KubernetesPod>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`,
-        this.podsEntityConfig.entityKey,
+        podsEntityConfig.entityKey,
         getKubeAPIResourceGuid
       );
     })
@@ -201,9 +194,10 @@ export class KubernetesEffects {
   fetchPodsInNamespaceInfo$ = this.actions$.pipe(
     ofType<GetKubernetesPodsInNamespace>(GET_PODS_IN_NAMESPACE_INFO),
     flatMap(action => {
+      const podsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsSchemaKey);
       return this.processListAction<KubernetesPod>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/pods`,
-        this.podsEntityConfig.entityKey,
+        podsEntityConfig.entityKey,
         getKubeAPIResourceGuid
       );
     })
@@ -213,9 +207,10 @@ export class KubernetesEffects {
   fetchServicesInNamespaceInfo$ = this.actions$.pipe(
     ofType<GetKubernetesServicesInNamespace>(GET_SERVICES_IN_NAMESPACE_INFO),
     flatMap(action => {
+      const servicesEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesServicesSchemaKey);
       return this.processListAction<KubeService>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/services`,
-        this.servicesEntityConfig.entityKey,
+        servicesEntityConfig.entityKey,
         getKubeAPIResourceGuid
       );
     })
@@ -225,9 +220,10 @@ export class KubernetesEffects {
   fetchPodInfo$ = this.actions$.pipe(
     ofType<GetKubernetesPod>(GET_KUBE_POD),
     flatMap(action => {
+      const podsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsSchemaKey);
       return this.processListAction<KubernetesPod>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/pods/${action.podName}`,
-        this.podsEntityConfig.entityKey,
+        podsEntityConfig.entityKey,
         getKubeAPIResourceGuid);
     })
   );
@@ -236,9 +232,10 @@ export class KubernetesEffects {
   fetchServicesInfo$ = this.actions$.pipe(
     ofType<GetKubernetesServices>(GET_SERVICE_INFO),
     flatMap(action => {
+      const servicesEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesServicesSchemaKey);
       return this.processListAction<KubeService>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/services`,
-        this.servicesEntityConfig.entityKey,
+        servicesEntityConfig.entityKey,
         getKubeAPIResourceGuid);
     })
   );
@@ -247,9 +244,10 @@ export class KubernetesEffects {
   fetchNamespacesInfo$ = this.actions$.pipe(
     ofType<GetKubernetesNamespaces>(GET_NAMESPACES_INFO),
     flatMap(action => {
+      const namespaceEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNamespacesSchemaKey);
       return this.processListAction<KubernetesNamespace>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces`,
-        this.namespaceEntityConfig.entityKey,
+        namespaceEntityConfig.entityKey,
         getKubeAPIResourceGuid);
     })
   );
@@ -258,9 +256,10 @@ export class KubernetesEffects {
   fetchStatefulSets$ = this.actions$.pipe(
     ofType<GetKubernetesStatefulSets>(GET_KUBE_STATEFULSETS),
     flatMap(action => {
+      const statefulSetsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesStatefulSetsSchemaKey);
       return this.processListAction<KubernetesStatefulSet>(action,
         `/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/statefulsets`,
-        this.statefulSetsEntityConfig.entityKey,
+        statefulSetsEntityConfig.entityKey,
         getKubeAPIResourceGuid);
     })
   );
@@ -269,9 +268,10 @@ export class KubernetesEffects {
   fetchDeployments$ = this.actions$.pipe(
     ofType<GeKubernetesDeployments>(GET_KUBE_DEPLOYMENT),
     flatMap(action => {
+      const deploymentsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesDeploymentsSchemaKey);
       return this.processListAction<KubernetesDeployment>(action,
         `/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/deployments`,
-        this.deploymentsEntityConfig.entityKey,
+        deploymentsEntityConfig.entityKey,
         getKubeAPIResourceGuid);
     })
   );
@@ -285,6 +285,7 @@ export class KubernetesEffects {
       const requestArgs = {
         headers
       };
+      const appsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesAppsSchemaKey);
       return this.http
         .get<ConfigMap>(`/pp/${this.proxyAPIVersion}/proxy/api/v1/configmaps`, requestArgs)
         .pipe(
@@ -327,13 +328,13 @@ export class KubernetesEffects {
               })
               ).reduce((res, app) => {
                 const id = `${app.kubeId}-${app.name}`;
-                res.entities[this.appsEntityConfig.entityKey][id] = app;
+                res.entities[appsEntityConfig.entityKey][id] = app;
                 if (res.result.indexOf(id) === -1) {
                   res.result.push(id);
                 }
                 return res;
               }, {
-                entities: { [this.appsEntityConfig.entityKey]: {} },
+                entities: { [appsEntityConfig.entityKey]: {} },
                 result: []
               } as NormalizedResponse);
 
@@ -356,9 +357,10 @@ export class KubernetesEffects {
 
 
   private processNodeAction(action: GetKubernetesReleasePods | GetKubernetesNodes) {
+    const nodeEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesSchemaKey);
     return this.processListAction<KubernetesNode>(action,
       `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes`,
-      this.nodeEntityConfig.entityKey,
+      nodeEntityConfig.entityKey,
       getKubeAPIResourceGuid);
   }
 
@@ -378,7 +380,8 @@ export class KubernetesEffects {
     const paginationAction = action as KubePaginationAction;
     if (paginationAction.initialParams) {
       requestArgs.params = Object.keys(paginationAction.initialParams).reduce((httpParams, initialKey: string) => {
-        return httpParams.set(initialKey, paginationAction.initialParams[initialKey]);
+        return httpParams.set(initialKey, paginationAction.initialParams[initialKey].toString()); // TODO: RC Test
+        // return httpParams.set(initialKey, paginationAction.initialParams[initialKey]);
       }, new HttpParams());
     }
     return this.http
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 9aa4933aa2..884809adca 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
@@ -27,7 +27,6 @@ import {
   StratosCatalogueEndpointEntity,
   StratosCatalogueEntity,
 } from '../../core/src/core/entity-catalogue/entity-catalogue-entity';
-import { entityCatalogue } from '../../core/src/core/entity-catalogue/entity-catalogue.service';
 import {
   IStratosEntityDefinition,
   StratosEndpointExtensionDefinition,
@@ -135,9 +134,10 @@ export interface CFBasePipelineRequestActionMeta {
   flatten?: boolean;
 }
 
-export function registerCFEntities() {
-  generateCFEntities().forEach(entity => entityCatalogue.register(entity));
-}
+// TODO: RC not used
+// export function registerCFEntities() {
+//   generateCFEntities().forEach(entity => entityCatalogue.register(entity));
+// }
 
 export function generateCFEntities(): StratosBaseCatalogueEntity[] {
   const endpointDefinition: StratosEndpointExtensionDefinition = {
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 5ce71a9005..2745f8c621 100644
--- a/src/frontend/packages/cloud-foundry/src/cloud-foundry.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/cloud-foundry.module.ts
@@ -78,7 +78,6 @@ function infoValidator(action: ICFAction, dispatcher) {
     //   PermissionEffects
     // ])
   ],
-
   providers: [
     { provide: ENTITY_INFO_HANDLER, useFactory: () => infoValidator },
     CfUserService,
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 ea6351aa40..bb9ae28c76 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
@@ -27,6 +27,7 @@ import {
 } from '../../../../core/src/shared/components/list/data-sources-controllers/list-pagination-controller';
 import { PaginationMonitorFactory } from '../../../../core/src/shared/monitors/pagination-monitor.factory';
 import { ResetPagination, SetParams } from '../../../../store/src/actions/pagination.actions';
+import { AppState } from '../../../../store/src/app-state';
 import { QParam, QParamJoiners } from '../../../../store/src/q-param';
 import {
   getCurrentPageRequestInfo,
@@ -104,7 +105,7 @@ export const initCfOrgSpaceService = (
 };
 
 export const createCfOrSpaceMultipleFilterFn = (
-  store: Store<CFAppState>,
+  store: Store<AppState>,
   action: PaginatedAction,
   setQParam: (setQ: QParam, qs: QParam[]) => boolean
 ) => {
diff --git a/src/frontend/packages/core/src/core/utils.service.ts b/src/frontend/packages/core/src/core/utils.service.ts
index 5b4dda76bf..8a45067aa5 100644
--- a/src/frontend/packages/core/src/core/utils.service.ts
+++ b/src/frontend/packages/core/src/core/utils.service.ts
@@ -12,6 +12,8 @@ export function getIdFromRoute(activatedRoute: ActivatedRoute, id: string) {
 }
 
 // TODO: RC types in entity generator
+// TODO: RC Action builders
+
 
 export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source.ts
index f6ae2f790b..945571cd12 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source.ts
@@ -2,9 +2,9 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { map, pairwise, tap, withLatestFrom } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { GetAllEndpoints } from '../../../../../../../store/src/actions/endpoint.actions';
 import { CreatePagination } from '../../../../../../../store/src/actions/pagination.actions';
+import { AppState } from '../../../../../../../store/src/app-state';
 import { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
 import { endpointEntitiesSelector } from '../../../../../../../store/src/selectors/endpoint.selectors';
 import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
@@ -20,7 +20,7 @@ import { ListRowSateHelper } from '../../list.helper';
 import { EndpointRowStateSetUpManager } from '../endpoint/endpoint-data-source.helpers';
 
 export function syncPaginationSection(
-  store: Store<CFAppState>,
+  store: Store<AppState>,
   action: GetAllEndpoints,
   paginationKey: string
 ) {
@@ -32,7 +32,7 @@ export function syncPaginationSection(
 }
 
 export class BaseEndpointsDataSource extends ListDataSource<EndpointModel> {
-  store: Store<CFAppState>;
+  store: Store<AppState>;
   /**
    * Used to distinguish between data sources providing all endpoints or those that only provide endpoints matching this value.
    * Value should match those of an endpoint's `cnsi_type`.
@@ -42,7 +42,7 @@ export class BaseEndpointsDataSource extends ListDataSource<EndpointModel> {
   dsEndpointType: string;
 
   constructor(
-    store: Store<CFAppState>,
+    store: Store<AppState>,
     listConfig: IListConfig<EndpointModel>,
     action: GetAllEndpoints,
     dsEndpointType: string = null,
@@ -92,7 +92,7 @@ export class BaseEndpointsDataSource extends ListDataSource<EndpointModel> {
   }
 
   static getEndpointConfig(
-    store: Store<CFAppState>,
+    store: Store<AppState>,
     action: GetAllEndpoints,
     listConfig: IListConfig<EndpointModel>,
     rowsState: Observable<RowsState>,
@@ -127,7 +127,7 @@ export class BaseEndpointsDataSource extends ListDataSource<EndpointModel> {
   static monitorEvents(
     internalEventMonitorFactory: InternalEventMonitorFactory,
     rowStateManager: TableRowStateManager,
-    store: Store<CFAppState>
+    store: Store<AppState>
   ) {
     const eventMonitor = internalEventMonitorFactory.getMonitor(endpointSchemaKey);
     return eventMonitor.hasErroredOverTime().pipe(
diff --git a/src/frontend/packages/store/src/actions/metrics.actions.ts b/src/frontend/packages/store/src/actions/metrics.actions.ts
index 35917ba616..62a41d43bf 100644
--- a/src/frontend/packages/store/src/actions/metrics.actions.ts
+++ b/src/frontend/packages/store/src/actions/metrics.actions.ts
@@ -40,6 +40,7 @@ export class MetricQueryConfig {
 // FIXME: Final solution for Metrics - STRAT-152
 export class MetricsAction implements EntityRequestAction {
   constructor(
+    // FIXME: This is ignored in all cases - STRAT-152
     guid: string,
     public endpointGuid: string,
     public query: MetricQueryConfig,

From eee6da52f600cbd0645e9320aac6fb5375a2afa8 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 2 Oct 2019 16:00:00 +0100
Subject: [PATCH 115/648] Register basic kube and view data works

---
 .../kubernetes/kubernetes-entity-generator.ts |  8 ++---
 .../helm-release-pods-data-source.ts          |  5 ++-
 .../kubernetes-apps-data-source.ts            |  5 ++-
 .../kubernetes-namespace-pods-data-source.ts  |  5 ++-
 .../kubernetes-namespaces-data-source.ts      |  5 ++-
 .../kubernetes-node-pods-data-source.ts       |  5 ++-
 .../kubernetes-nodes-data-source.ts           |  5 ++-
 .../kubernetes-pods-data-source.ts            |  5 ++-
 .../kubernetes-services-data-source.ts        |  5 ++-
 .../kubernetes/store/kubernetes.actions.ts    | 34 +++++++++----------
 10 files changed, 37 insertions(+), 45 deletions(-)

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 fe0021d36c..79ec2f8fdb 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
@@ -18,13 +18,13 @@ import {
 import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component';
 import {
   KUBERNETES_ENDPOINT_TYPE,
+  kubernetesAppsSchemaKey,
   kubernetesDashboardSchemaKey,
   kubernetesDeploymentsSchemaKey,
   kubernetesEntityFactory,
   kubernetesNamespacesSchemaKey,
   kubernetesNodesSchemaKey,
   kubernetesPodsSchemaKey,
-  kubernetesSchemaKey,
   kubernetesServicesSchemaKey,
   kubernetesStatefulSetsSchemaKey,
 } from './kubernetes-entity-factory';
@@ -161,14 +161,14 @@ export function generateKubernetesEntities(): StratosBaseCatalogueEntity[] {
 function generateEndpointEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   return new StratosCatalogueEndpointEntity(
     endpointDefinition,
-    metadata => `/cloud-foundry/${metadata.guid}`, // TODO: RC
+    metadata => `/kubernetes/${metadata.guid}`, // TODO: RC
   );
 }
 
 function generateAppEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   const definition = {
-    type: kubernetesSchemaKey,
-    schema: kubernetesEntityFactory(kubernetesSchemaKey),
+    type: kubernetesAppsSchemaKey,
+    schema: kubernetesEntityFactory(kubernetesAppsSchemaKey),
     endpoint: endpointDefinition
   };
   return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesApp>(definition);
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts
index 9ed5adcbe8..d90b90a001 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts
@@ -1,10 +1,9 @@
 import { Store } from '@ngrx/store';
 
-import { entityFactory } from '../../../../../../store/src//helpers/entity-factory';
 import { AppState } from '../../../../../../store/src/app-state';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { kubernetesPodsSchemaKey } from '../../kubernetes-entity-factory';
+import { kubernetesEntityFactory, kubernetesPodsSchemaKey } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { HelmReleaseService } from '../../services/helm-release.service';
 import { KubernetesPod } from '../../store/kube.types';
@@ -24,7 +23,7 @@ export class KubernetesReleasePodsDataSource extends ListDataSource<KubernetesPo
     super({
       store,
       action,
-      schema: entityFactory(kubernetesPodsSchemaKey),
+      schema: kubernetesEntityFactory(kubernetesPodsSchemaKey),
       getRowUniqueId: a => a.name,
       // getRowUniqueId: getHelmReleaseServiceId,  //TODO: RC
       paginationKey: action.paginationKey,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-data-source.ts
index b452e3620b..fcf829d38f 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-data-source.ts
@@ -2,10 +2,9 @@ import { Store } from '@ngrx/store';
 
 import { getPaginationKey } from '../../../../../../store/src/actions/pagination.actions';
 import { AppState } from '../../../../../../store/src/app-state';
-import { entityFactory } from '../../../../../../store/src/helpers/entity-factory';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { getKubeAppId, kubernetesAppsSchemaKey } from '../../kubernetes-entity-factory';
+import { getKubeAppId, kubernetesAppsSchemaKey, kubernetesEntityFactory } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesApp } from '../../store/kube.types';
 import { GetKubernetesApps } from '../../store/kubernetes.actions';
@@ -21,7 +20,7 @@ export class KubernetesAppsDataSource extends ListDataSource<KubernetesApp> {
     super({
       store,
       action: new GetKubernetesApps(kubeGuid.guid),
-      schema: entityFactory(kubernetesAppsSchemaKey),
+      schema: kubernetesEntityFactory(kubernetesAppsSchemaKey),
       getRowUniqueId: getKubeAppId,
       paginationKey: getPaginationKey(kubernetesAppsSchemaKey, kubeGuid.guid),
       isLocal: true,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
index 76eda77ea9..e145a3f7be 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
@@ -1,10 +1,9 @@
 import { Store } from '@ngrx/store';
 
 import { AppState } from '../../../../../../store/src/app-state';
-import { entityFactory } from '../../../../../../store/src/helpers/entity-factory';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { kubernetesPodsSchemaKey } from '../../kubernetes-entity-factory';
+import { kubernetesEntityFactory, kubernetesPodsSchemaKey } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesNamespaceService } from '../../services/kubernetes-namespace.service';
 import { KubernetesPod } from '../../store/kube.types';
@@ -22,7 +21,7 @@ export class KubernetesNamespacePodsDataSource extends ListDataSource<Kubernetes
     super({
       store,
       action,
-      schema: entityFactory(kubernetesPodsSchemaKey),
+      schema: kubernetesEntityFactory(kubernetesPodsSchemaKey),
       getRowUniqueId: (object: KubernetesPod) => object.metadata.name,
       paginationKey: action.paginationKey,
       isLocal: true,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
index 095f9d9596..e18d2ad5f6 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
@@ -2,10 +2,9 @@ import { Store } from '@ngrx/store';
 
 import { getPaginationKey } from '../../../../../../store/src/actions/pagination.actions';
 import { AppState } from '../../../../../../store/src/app-state';
-import { entityFactory } from '../../../../../../store/src/helpers/entity-factory';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { kubernetesNamespacesSchemaKey } from '../../kubernetes-entity-factory';
+import { kubernetesEntityFactory, kubernetesNamespacesSchemaKey } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { KubernetesNamespace } from '../../store/kube.types';
@@ -22,7 +21,7 @@ export class KubernetesNamespacesDataSource extends ListDataSource<KubernetesNam
     super({
       store,
       action: new GetKubernetesNamespaces(kubeGuid.guid),
-      schema: entityFactory(kubernetesNamespacesSchemaKey),
+      schema: kubernetesEntityFactory(kubernetesNamespacesSchemaKey),
       getRowUniqueId: getKubeAPIResourceGuid,
       paginationKey: getPaginationKey(kubernetesNamespacesSchemaKey, kubeGuid.guid),
       isLocal: true,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
index 41053ab8dc..6c8769c088 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
@@ -1,10 +1,9 @@
 import { Store } from '@ngrx/store';
 
 import { AppState } from '../../../../../../store/src/app-state';
-import { entityFactory } from '../../../../../../store/src/helpers/entity-factory';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { kubernetesPodsSchemaKey } from '../../kubernetes-entity-factory';
+import { kubernetesEntityFactory, kubernetesPodsSchemaKey } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesNodeService } from '../../services/kubernetes-node.service';
 import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
@@ -23,7 +22,7 @@ export class KubernetesNodePodsDataSource extends ListDataSource<KubernetesPod>
     super({
       store,
       action,
-      schema: entityFactory(kubernetesPodsSchemaKey),
+      schema: kubernetesEntityFactory(kubernetesPodsSchemaKey),
       getRowUniqueId: getKubeAPIResourceGuid,
       paginationKey: action.paginationKey,
       isLocal: true,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
index c721d7850a..933cbf771f 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
@@ -2,10 +2,9 @@ import { Store } from '@ngrx/store';
 
 import { getPaginationKey } from '../../../../../../store/src/actions/pagination.actions';
 import { AppState } from '../../../../../../store/src/app-state';
-import { entityFactory } from '../../../../../../store/src/helpers/entity-factory';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { kubernetesNodesSchemaKey } from '../../kubernetes-entity-factory';
+import { kubernetesEntityFactory, kubernetesNodesSchemaKey } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { KubernetesNode } from '../../store/kube.types';
@@ -21,7 +20,7 @@ export class KubernetesNodesDataSource extends ListDataSource<KubernetesNode> {
     super({
       store,
       action: new GetKubernetesNodes(kubeGuid.guid),
-      schema: entityFactory(kubernetesNodesSchemaKey),
+      schema: kubernetesEntityFactory(kubernetesNodesSchemaKey),
       getRowUniqueId: getKubeAPIResourceGuid,
       paginationKey: getPaginationKey(kubernetesNodesSchemaKey, kubeGuid.guid),
       isLocal: true,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
index 139325afea..b363035f41 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
@@ -1,10 +1,9 @@
 import { Store } from '@ngrx/store';
 
 import { AppState } from '../../../../../../store/src/app-state';
-import { entityFactory } from '../../../../../../store/src/helpers/entity-factory';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { kubernetesPodsSchemaKey } from '../../kubernetes-entity-factory';
+import { kubernetesEntityFactory, kubernetesPodsSchemaKey } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { KubernetesPod } from '../../store/kube.types';
@@ -21,7 +20,7 @@ export class KubernetesPodsDataSource extends ListDataSource<KubernetesPod> {
     super({
       store,
       action,
-      schema: entityFactory(kubernetesPodsSchemaKey),
+      schema: kubernetesEntityFactory(kubernetesPodsSchemaKey),
       getRowUniqueId: getKubeAPIResourceGuid,
       paginationKey: action.paginationKey,
       isLocal: true,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services-data-source.ts
index 6c3c6bd8e5..98861fcc2e 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services-data-source.ts
@@ -2,11 +2,10 @@ import { Store } from '@ngrx/store';
 import { OperatorFunction } from 'rxjs';
 
 import { AppState } from '../../../../../store/src/app-state';
-import { entityFactory } from '../../../../../store/src/helpers/entity-factory';
 import { PaginatedAction } from '../../../../../store/src/types/pagination.types';
 import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../shared/components/list/list.component.types';
-import { kubernetesServicesSchemaKey } from '../kubernetes-entity-factory';
+import { kubernetesEntityFactory, kubernetesServicesSchemaKey } from '../kubernetes-entity-factory';
 import { getKubeAPIResourceGuid } from '../store/kube.selectors';
 import { KubeService } from '../store/kube.types';
 
@@ -21,7 +20,7 @@ export class BaseKubernetesServicesDataSource extends ListDataSource<KubeService
     super({
       store,
       action,
-      schema: entityFactory(kubernetesServicesSchemaKey),
+      schema: kubernetesEntityFactory(kubernetesServicesSchemaKey),
       getRowUniqueId: getKubeAPIResourceGuid,
       paginationKey: action.paginationKey,
       transformEntity,
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 f60fd9bf4c..cf32883bdd 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
@@ -2,7 +2,6 @@ import { SortDirection } from '@angular/material';
 
 import { MetricQueryConfig, MetricsAction, MetricsChartAction } from '../../../../../store/src/actions/metrics.actions';
 import { getPaginationKey } from '../../../../../store/src/actions/pagination.actions';
-import { entityFactory } from '../../../../../store/src/helpers/entity-factory';
 import { PaginatedAction, PaginationParam } from '../../../../../store/src/types/pagination.types';
 import { EntityRequestAction } from '../../../../../store/src/types/request.types';
 import {
@@ -10,6 +9,7 @@ import {
   kubernetesAppsSchemaKey,
   kubernetesDashboardSchemaKey,
   kubernetesDeploymentsSchemaKey,
+  kubernetesEntityFactory,
   kubernetesNamespacesSchemaKey,
   kubernetesNodesSchemaKey,
   kubernetesPodsSchemaKey,
@@ -101,7 +101,7 @@ export class GetKubernetesReleasePods implements KubePaginationAction {
   type = GET_RELEASE_POD_INFO;
   entityType = kubernetesPodsSchemaKey;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [entityFactory(kubernetesPodsSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesPodsSchemaKey)];
   params: { labelSelector: string; };
   actions = [
     GET_RELEASE_POD_INFO,
@@ -121,7 +121,7 @@ export class KubeHealthCheck implements KubePaginationAction {
   type = GET_NODES_INFO;
   entityType = kubernetesNodesSchemaKey;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [entityFactory(kubernetesNodesSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesNodesSchemaKey)];
   actions = [
     GET_NODES_INFO,
     GET_NODES_INFO_SUCCESS,
@@ -137,7 +137,7 @@ export class GetKubernetesNodes implements KubePaginationAction {
   type = GET_NODES_INFO;
   entityType = kubernetesNodesSchemaKey;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [entityFactory(kubernetesNodesSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesNodesSchemaKey)];
   actions = [
     GET_NODES_INFO,
     GET_NODES_INFO_SUCCESS,
@@ -156,7 +156,7 @@ export class GetKubernetesNode implements KubeAction {
   type = GET_NODE_INFO;
   entityType = kubernetesNodesSchemaKey;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [entityFactory(kubernetesNodesSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesNodesSchemaKey)];
 
   actions = [
     GET_NODE_INFO,
@@ -171,7 +171,7 @@ export class GetKubernetesNamespace implements KubeAction {
   type = GET_NAMESPACE_INFO;
   entityType = kubernetesNamespacesSchemaKey;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [entityFactory(kubernetesNamespacesSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesNamespacesSchemaKey)];
 
   actions = [
     GET_NAMESPACE_INFO,
@@ -187,7 +187,7 @@ export class GetKubernetesPods implements KubePaginationAction {
   type = GET_POD_INFO;
   entityType = kubernetesPodsSchemaKey;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [entityFactory(kubernetesPodsSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesPodsSchemaKey)];
   actions = [
     GET_POD_INFO,
     GET_POD_INFO_SUCCESS,
@@ -210,7 +210,7 @@ export class GetKubernetesPodsOnNode implements PaginatedAction, KubeAction {
   type = GET_PODS_ON_NODE_INFO;
   entityType = kubernetesPodsSchemaKey;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [entityFactory(kubernetesPodsSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesPodsSchemaKey)];
   actions = [
     GET_PODS_ON_NODE_INFO,
     GET_PODS_ON_NODE_INFO_SUCCESS,
@@ -227,7 +227,7 @@ export class GetKubernetesServicesInNamespace implements PaginatedAction, KubeAc
   type = GET_SERVICES_IN_NAMESPACE_INFO;
   entityType = kubernetesServicesSchemaKey;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [entityFactory(kubernetesServicesSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesServicesSchemaKey)];
   actions = [
     GET_SERVICES_IN_NAMESPACE_INFO,
     GET_SERVICES_IN_NAMESPACE_INFO_SUCCESS,
@@ -246,7 +246,7 @@ export class GetKubernetesPodsInNamespace implements PaginatedAction, KubeAction
   type = GET_PODS_IN_NAMESPACE_INFO;
   entityType = kubernetesPodsSchemaKey;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [entityFactory(kubernetesPodsSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesPodsSchemaKey)];
   actions = [
     GET_PODS_IN_NAMESPACE_INFO,
     GET_PODS_IN_NAMEPSACE_INFO_SUCCESS,
@@ -265,7 +265,7 @@ export class GetKubernetesNamespaces implements KubePaginationAction {
   type = GET_NAMESPACES_INFO;
   entityType = kubernetesNamespacesSchemaKey;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [entityFactory(kubernetesNamespacesSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesNamespacesSchemaKey)];
   actions = [
     GET_NAMESPACES_INFO,
     GET_NAMESPACES_INFO_SUCCESS,
@@ -285,7 +285,7 @@ export class GetKubernetesApps implements KubePaginationAction {
   type = GET_KUBERNETES_APP_INFO;
   entityType = kubernetesAppsSchemaKey;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [entityFactory(kubernetesAppsSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesAppsSchemaKey)];
   actions = [
     GET_KUBERNETES_APP_INFO,
     GET_KUBERNETES_APP_INFO_SUCCESS,
@@ -305,7 +305,7 @@ export class GetKubernetesServices implements KubePaginationAction {
   type = GET_SERVICE_INFO;
   entityType = kubernetesServicesSchemaKey;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [entityFactory(kubernetesServicesSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesServicesSchemaKey)];
   actions = [
     GET_SERVICE_INFO,
     GET_SERVICE_INFO_SUCCESS,
@@ -324,7 +324,7 @@ export class GetKubernetesPod implements KubeAction {
   type = GET_KUBE_POD;
   entityType = kubernetesPodsSchemaKey;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [entityFactory(kubernetesPodsSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesPodsSchemaKey)];
   actions = [
     GET_KUBE_POD,
     GET_KUBE_POD_SUCCESS,
@@ -339,7 +339,7 @@ export class GetKubernetesStatefulSets implements KubePaginationAction {
   type = GET_KUBE_STATEFULSETS;
   entityType = kubernetesStatefulSetsSchemaKey;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [entityFactory(kubernetesStatefulSetsSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesStatefulSetsSchemaKey)];
   actions = [
     GET_KUBE_STATEFULSETS,
     GET_KUBE_STATEFULSETS_SUCCESS,
@@ -355,7 +355,7 @@ export class GeKubernetesDeployments implements KubePaginationAction {
   type = GET_KUBE_DEPLOYMENT;
   entityType = kubernetesDeploymentsSchemaKey;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [entityFactory(kubernetesDeploymentsSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesDeploymentsSchemaKey)];
   actions = [
     GET_KUBE_DEPLOYMENT,
     GET_KUBE_DEPLOYMENT_SUCCESS,
@@ -370,7 +370,7 @@ export class GetKubernetesDashboard implements KubeAction {
   type = GET_KUBE_DASHBOARD;
   entityType = kubernetesDashboardSchemaKey;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [entityFactory(kubernetesDashboardSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesDashboardSchemaKey)];
 
   actions = [
     GET_KUBE_DASHBOARD,

From fd8dce5c05d0cee28e2178407707f81b36962669 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 2 Oct 2019 16:20:25 +0100
Subject: [PATCH 116/648] Minor tweaks

---
 .../frontend/app/custom/custom.module.ts      |  4 -
 .../kubernetes/kubernetes-entity-generator.ts | 39 +++++-----
 .../kubernetes/kubernetes.setup.module.ts     | 51 ++++--------
 .../kubernetes/store/kubernetes.entities.ts   | 77 -------------------
 .../cloud-foundry/src/cf-entity-generator.ts  |  1 +
 .../packages/core/src/core/utils.service.ts   |  2 +-
 .../dashboard-base.component.ts               |  3 +-
 7 files changed, 39 insertions(+), 138 deletions(-)
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/store/kubernetes.entities.ts

diff --git a/custom-src/frontend/app/custom/custom.module.ts b/custom-src/frontend/app/custom/custom.module.ts
index 433ecaacd6..4e1dd5b5d5 100644
--- a/custom-src/frontend/app/custom/custom.module.ts
+++ b/custom-src/frontend/app/custom/custom.module.ts
@@ -12,7 +12,6 @@ import { MDAppModule } from '../core/md.module';
 import { SharedModule } from '../shared/shared.module';
 import { DemoHelperComponent } from './demo/demo-helper/demo-helper.component';
 import { KubernetesSetupModule } from './kubernetes/kubernetes.setup.module';
-import { KubeHealthCheck } from './kubernetes/store/kubernetes.actions';
 import { SuseAboutInfoComponent } from './suse-about-info/suse-about-info.component';
 import { SuseLoginComponent } from './suse-login/suse-login.component';
 import { SuseWelcomeComponent } from './suse-welcome/suse-welcome.component';
@@ -60,9 +59,6 @@ export class CustomModule {
   constructor(endpointService: EndpointsService, store: Store<AppState>, router: Router) {
     // TODO: RC v3 world
     // TODO: called multiple times
-    endpointService.registerHealthCheck(
-      new EndpointHealthCheck('k8s', (endpoint) => store.dispatch(new KubeHealthCheck(endpoint.guid)))
-    );
     endpointService.registerHealthCheck(
       new EndpointHealthCheck('helm', (endpoint) => {
         if (endpoint.endpoint_metadata && endpoint.endpoint_metadata.status === 'Synchronizing') {
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 79ec2f8fdb..97b6bae320 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
@@ -28,7 +28,15 @@ import {
   kubernetesServicesSchemaKey,
   kubernetesStatefulSetsSchemaKey,
 } from './kubernetes-entity-factory';
-import { KubernetesApp } from './store/kube.types';
+import {
+  KubernetesApp,
+  KubernetesDeployment,
+  KubernetesNamespace,
+  KubernetesNode,
+  KubernetesPod,
+  KubernetesStatefulSet,
+  KubeService,
+} from './store/kube.types';
 
 const enum KubeEndpointAuthTypes {
   CERT_AUTH = 'kube-cert-auth',
@@ -90,18 +98,7 @@ const kubeAuthTypeMap: { [type: string]: EndpointAuthTypeConfig } = {
   }
 };
 
-
-// export interface EndpointAuthTypeConfig {
-//   name: string;
-//   value: string;
-//   formType?: string;
-//   types: Array<EndpointType>;
-//   form?: any;
-//   data?: any;
-//   component: Type<IAuthForm>;
-//   help?: string;
-// }
-
+// TODO: RC hack
 /**
  * CustomImportModule brings in CustomModule. CustomModule brings in kube setup module. setup module brings this in multiple times
  */
@@ -161,7 +158,7 @@ export function generateKubernetesEntities(): StratosBaseCatalogueEntity[] {
 function generateEndpointEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   return new StratosCatalogueEndpointEntity(
     endpointDefinition,
-    metadata => `/kubernetes/${metadata.guid}`, // TODO: RC
+    metadata => `/kubernetes/${metadata.guid}`,
   );
 }
 
@@ -180,7 +177,7 @@ function generateStatefulSetsEntity(endpointDefinition: StratosEndpointExtension
     schema: kubernetesEntityFactory(kubernetesStatefulSetsSchemaKey),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesApp>(definition);
+  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesStatefulSet>(definition);
 }
 
 function generatePodsEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -189,7 +186,7 @@ function generatePodsEntity(endpointDefinition: StratosEndpointExtensionDefiniti
     schema: kubernetesEntityFactory(kubernetesPodsSchemaKey),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesApp>(definition);
+  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesPod>(definition);
 }
 
 function generateDeploymentsEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -198,7 +195,7 @@ function generateDeploymentsEntity(endpointDefinition: StratosEndpointExtensionD
     schema: kubernetesEntityFactory(kubernetesDeploymentsSchemaKey),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesApp>(definition);
+  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesDeployment>(definition);
 }
 
 function generateNodesEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -207,7 +204,7 @@ function generateNodesEntity(endpointDefinition: StratosEndpointExtensionDefinit
     schema: kubernetesEntityFactory(kubernetesNodesSchemaKey),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesApp>(definition);
+  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesNode>(definition);
 }
 
 function generateNamespacesEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -216,7 +213,7 @@ function generateNamespacesEntity(endpointDefinition: StratosEndpointExtensionDe
     schema: kubernetesEntityFactory(kubernetesNamespacesSchemaKey),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesApp>(definition);
+  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesNamespace>(definition);
 }
 
 function generateServicesEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -225,7 +222,7 @@ function generateServicesEntity(endpointDefinition: StratosEndpointExtensionDefi
     schema: kubernetesEntityFactory(kubernetesServicesSchemaKey),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesApp>(definition);
+  return new StratosCatalogueEntity<IFavoriteMetadata, KubeService>(definition);
 }
 
 function generateDashboardEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -234,5 +231,5 @@ function generateDashboardEntity(endpointDefinition: StratosEndpointExtensionDef
     schema: kubernetesEntityFactory(kubernetesDashboardSchemaKey),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesApp>(definition);
+  return new StratosCatalogueEntity<IFavoriteMetadata>(definition);
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
index 2864a09336..4de2c64feb 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
@@ -1,8 +1,11 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
+import { Store } from '@ngrx/store';
 
-import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types';
+import { AppState } from '../../../../store/src/app-state';
+import { EndpointHealthCheck } from '../../../endpoints-health-checks';
 import { CoreModule } from '../../core/core.module';
+import { EndpointsService } from '../../core/endpoints.service';
 import { EntityCatalogueModule } from '../../core/entity-catalogue.module';
 import { SharedModule } from '../../shared/shared.module';
 import { KubernetesAWSAuthFormComponent } from './auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component';
@@ -13,18 +16,21 @@ import {
   KubernetesConfigAuthFormComponent,
 } from './auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component';
 import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component';
+import { KUBERNETES_ENDPOINT_TYPE } from './kubernetes-entity-factory';
 import { generateKubernetesEntities } from './kubernetes-entity-generator';
 import { KubernetesStoreModule } from './kubernetes.store.module';
+import { KubeHealthCheck } from './store/kubernetes.actions';
 
-export interface IK8FavMetadata extends IFavoriteMetadata {
-  guid: string;
-  name: string;
-  address: string;
-}
+// TODO: RC Remove
+// export interface IK8FavMetadata extends IFavoriteMetadata {
+//   guid: string;
+//   name: string;
+//   address: string;
+// }
 
 @NgModule({
   imports: [
-    // TODO: RC Everytime this is imported it's executed. See note & `hack` in `generateKubernetesEntities`
+    // TODO: RC Every time this is imported it's executed. See note & `hack` in `generateKubernetesEntities`
     EntityCatalogueModule.forFeature(generateKubernetesEntities),
     CoreModule,
     CommonModule,
@@ -45,32 +51,9 @@ export interface IK8FavMetadata extends IFavoriteMetadata {
   ]
 })
 export class KubernetesSetupModule {
-  constructor() {
-    const endpointType = 'k8s';
-    // TODO: RC
-    // favoritesConfigMapper.registerFavoriteConfig<EndpointModel, IK8FavMetadata>(
-    //   new FavoriteConfig({
-    //     endpointType,
-    //     entityType: endpointSchemaKey
-    //   },
-    //     'Kubernetes',
-    //     (endpoint: IK8FavMetadata) => ({
-    //       type: endpointType,
-    //       routerLink: `/kubernetes/${endpoint.guid}`,
-    //       lines: [
-    //         ['Address', endpoint.address]
-    //       ],
-    //       name: endpoint.name,
-    //     }),
-    //     endpoint => ({
-    //       guid: endpoint.guid,
-    //       name: endpoint.name,
-    //       address: getFullEndpointApiUrl(endpoint),
-    //     })
-    //   )
-    // );
+  constructor(endpointService: EndpointsService, store: Store<AppState>) {
+    endpointService.registerHealthCheck(
+      new EndpointHealthCheck(KUBERNETES_ENDPOINT_TYPE, (endpoint) => store.dispatch(new KubeHealthCheck(endpoint.guid)))
+    );
   }
-
-
-
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.entities.ts b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.entities.ts
deleted file mode 100644
index 8652588ffa..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.entities.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-// TODO: RC DELETE ME
-// import { getAPIResourceGuid } from '../../../../../store/src/selectors/api.selectors';
-// import { ExtensionEntitySchema } from '../../../core/extension/extension-types';
-// import { getKubeAPIResourceGuid } from './kube.selectors';
-// import { KubernetesApp } from './kube.types';
-
-// export const kubernetesSchemaKey = 'kubernetesInfo';
-// export const kubernetesNodesSchemaKey = 'kubernetesNode';
-// export const kubernetesPodsSchemaKey = 'kubernetesPod';
-// export const kubernetesNamespacesSchemaKey = 'kubernetesNamespace';
-// export const kubernetesServicesSchemaKey = 'kubernetesService';
-// export const kubernetesStatefulSetsSchemaKey = 'kubernetesStatefulSet';
-// export const kubernetesDeploymentsSchemaKey = 'kubernetesDeployment';
-// export const kubernetesAppsSchemaKey = 'kubernetesApp';
-// export const kubernetesDashboardSchemaKey = 'kubernetesDashboard';
-
-// export const getKubeAppId = (object: KubernetesApp) => object.name;
-
-// export const kubernetesEntities: ExtensionEntitySchema[] = [
-//   {
-//     entityKey: kubernetesSchemaKey,
-//     definition: {},
-//     options: { idAttribute: getAPIResourceGuid }
-//   },
-//   {
-//     entityKey: kubernetesAppsSchemaKey,
-//     definition: {},
-//     options: { idAttribute: getKubeAppId }
-//   },
-//   {
-//     entityKey: kubernetesStatefulSetsSchemaKey,
-//     definition: {},
-//     options: { idAttribute: getKubeAPIResourceGuid }
-//   },
-//   {
-//     entityKey: kubernetesPodsSchemaKey,
-//     definition: {},
-//     options: { idAttribute: getKubeAPIResourceGuid }
-//   },
-//   {
-//     entityKey: kubernetesDeploymentsSchemaKey,
-//     definition: {},
-//     options: { idAttribute: getKubeAPIResourceGuid }
-//   },
-//   {
-//     entityKey: kubernetesNodesSchemaKey,
-//     definition: {},
-//     options: { idAttribute: getKubeAPIResourceGuid }
-//   },
-//   {
-//     entityKey: kubernetesNamespacesSchemaKey,
-//     definition: {},
-//     options: { idAttribute: getKubeAPIResourceGuid }
-//   },
-//   {
-//     entityKey: kubernetesServicesSchemaKey,
-//     definition: {},
-//     options: { idAttribute: getKubeAPIResourceGuid }
-//   },
-//   {
-//     entityKey: kubernetesDashboardSchemaKey,
-//     definition: {},
-//     options: { idAttribute: getKubeAPIResourceGuid }
-//   }
-// ];
-
-// export const kubernetesEntityKeys: string[] = [
-//   kubernetesSchemaKey,
-//   kubernetesAppsSchemaKey,
-//   kubernetesStatefulSetsSchemaKey,
-//   kubernetesPodsSchemaKey,
-//   kubernetesDeploymentsSchemaKey,
-//   kubernetesNodesSchemaKey,
-//   kubernetesNamespacesSchemaKey,
-//   kubernetesServicesSchemaKey,
-//   kubernetesDashboardSchemaKey,
-// ];
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 884809adca..f217ba5494 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
@@ -150,6 +150,7 @@ export function generateCFEntities(): StratosBaseCatalogueEntity[] {
     logoUrl: '/core/assets/endpoint-icons/cloudfoundry.png',
     authTypes: [BaseEndpointAuth.UsernamePassword, BaseEndpointAuth.SSO],
     listDetailsComponent: CfEndpointDetailsComponent,
+    renderPriority: 1,
     globalPreRequest: (request, action) => {
       return addCfRelationParams(request, action);
     },
diff --git a/src/frontend/packages/core/src/core/utils.service.ts b/src/frontend/packages/core/src/core/utils.service.ts
index 8a45067aa5..87d339dbe9 100644
--- a/src/frontend/packages/core/src/core/utils.service.ts
+++ b/src/frontend/packages/core/src/core/utils.service.ts
@@ -11,8 +11,8 @@ export function getIdFromRoute(activatedRoute: ActivatedRoute, id: string) {
   return null;
 }
 
-// TODO: RC types in entity generator
 // TODO: RC Action builders
+// TODO: RC MEtrics
 
 
 export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
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 27185d80bd..cb3234b386 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
@@ -147,8 +147,9 @@ export class DashboardBaseComponent implements OnInit, OnDestroy {
       ),
       this.tabNavService.tabSubNav$
     );
+    // TODO: Move cf code out to cf module #3849
     this.endpointsService.registerHealthCheck(
-      new EndpointHealthCheck('cf', (endpoint) => {
+      new EndpointHealthCheck(CF_ENDPOINT_TYPE, (endpoint) => {
         entityCatalogue.getEntity<IEntityMetadata, any, CfInfoDefinitionActionBuilders>(CF_ENDPOINT_TYPE, cfInfoEntityType)
           .actionDispatchManager.dispatchGet(endpoint.guid);
       })

From 223f45541eed1760654028753c8c2ec665a1579d Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 2 Oct 2019 17:23:16 +0100
Subject: [PATCH 117/648] Fix metrics

---
 custom-src/frontend/app/custom/custom.module.ts     |  2 +-
 .../custom/kubernetes/kubernetes-entity-factory.ts  |  2 ++
 .../kubernetes/kubernetes-entity-generator.ts       | 13 +++++++++++++
 .../kubernetes/services/kubernetes.service.ts       |  8 ++++----
 .../custom/kubernetes/store/kubernetes.effects.ts   |  3 +--
 .../packages/core/src/core/utils.service.ts         |  2 --
 6 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/custom-src/frontend/app/custom/custom.module.ts b/custom-src/frontend/app/custom/custom.module.ts
index 4e1dd5b5d5..ffe70edf8e 100644
--- a/custom-src/frontend/app/custom/custom.module.ts
+++ b/custom-src/frontend/app/custom/custom.module.ts
@@ -58,7 +58,7 @@ export class CustomModule {
 
   constructor(endpointService: EndpointsService, store: Store<AppState>, router: Router) {
     // TODO: RC v3 world
-    // TODO: called multiple times
+    // TODO: helm, to move. 'helm' --> helm endpoint type
     endpointService.registerHealthCheck(
       new EndpointHealthCheck('helm', (endpoint) => {
         if (endpoint.endpoint_metadata && endpoint.endpoint_metadata.status === 'Synchronizing') {
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 4e387b6534..7a86e60ee7 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts
@@ -1,5 +1,6 @@
 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 { getKubeAPIResourceGuid } from './store/kube.selectors';
@@ -96,6 +97,7 @@ entityCache[kubernetesDashboardSchemaKey] = new KubernetesEntitySchema(
   { idAttribute: getKubeAPIResourceGuid }
 );
 
+entityCache[metricEntityType] = new KubernetesEntitySchema(metricEntityType);
 
 export function kubernetesEntityFactory(key: string): EntitySchema {
   const entity = entityCache[key];
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 97b6bae320..12ab32ccdf 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
@@ -1,5 +1,6 @@
 import { Validators } from '@angular/forms';
 
+import { metricEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
 import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types';
 import {
   StratosBaseCatalogueEntity,
@@ -152,6 +153,7 @@ export function generateKubernetesEntities(): StratosBaseCatalogueEntity[] {
     generateNamespacesEntity(endpointDefinition),
     generateServicesEntity(endpointDefinition),
     generateDashboardEntity(endpointDefinition),
+    generateMetricEntity(endpointDefinition)
   ];
 }
 
@@ -233,3 +235,14 @@ function generateDashboardEntity(endpointDefinition: StratosEndpointExtensionDef
   };
   return new StratosCatalogueEntity<IFavoriteMetadata>(definition);
 }
+
+function generateMetricEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: metricEntityType,
+    schema: kubernetesEntityFactory(metricEntityType),
+    label: 'Kubernetes Metric',
+    labelPlural: 'Kubernetes Metrics',
+    endpoint: endpointDefinition,
+  };
+  return new StratosCatalogueEntity(definition);
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts
index 70c3011074..74c98459a1 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts
@@ -2,9 +2,9 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map, shareReplay } from 'rxjs/operators';
 
-import { endpointSchemaKey, entityFactory } from '../../../../../store/src/helpers/entity-factory';
 import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
-import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
+import { endpointListKey, EndpointModel } from '../../../../../store/src/types/endpoint.types';
+import { endpointEntitySchema } from '../../../base-entity-schemas';
 import { PaginationMonitor } from '../../../shared/monitors/pagination-monitor';
 import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory';
 
@@ -18,8 +18,8 @@ export class KubernetesService {
     private paginationMonitorFactory: PaginationMonitorFactory
   ) {
     this.kubeEndpointsMonitor = this.paginationMonitorFactory.create(
-      'endpoint-list', //TODO: RC check
-      entityFactory(endpointSchemaKey)
+      endpointListKey,
+      endpointEntitySchema
     );
 
     this.kubeEndpoints$ = this.kubeEndpointsMonitor.currentPage$.pipe(
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 2581ae7fc1..1e1fda6405 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
@@ -380,8 +380,7 @@ export class KubernetesEffects {
     const paginationAction = action as KubePaginationAction;
     if (paginationAction.initialParams) {
       requestArgs.params = Object.keys(paginationAction.initialParams).reduce((httpParams, initialKey: string) => {
-        return httpParams.set(initialKey, paginationAction.initialParams[initialKey].toString()); // TODO: RC Test
-        // return httpParams.set(initialKey, paginationAction.initialParams[initialKey]);
+        return httpParams.set(initialKey, paginationAction.initialParams[initialKey].toString());
       }, new HttpParams());
     }
     return this.http
diff --git a/src/frontend/packages/core/src/core/utils.service.ts b/src/frontend/packages/core/src/core/utils.service.ts
index 87d339dbe9..5a4d7aed51 100644
--- a/src/frontend/packages/core/src/core/utils.service.ts
+++ b/src/frontend/packages/core/src/core/utils.service.ts
@@ -12,8 +12,6 @@ export function getIdFromRoute(activatedRoute: ActivatedRoute, id: string) {
 }
 
 // TODO: RC Action builders
-// TODO: RC MEtrics
-
 
 export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 

From 6d0898058f1267c9325c23f9e49001489167a10a Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 3 Oct 2019 13:07:08 +0100
Subject: [PATCH 118/648] 2.5.3 Release bump and changelog

---
 CHANGELOG.md      | 18 ++++++++++++++++++
 package-lock.json |  2 +-
 package.json      |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1462864b5..81757626ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Change Log
 
+## 2.5.3
+
+[Full Changelog](https://github.com/cloudfoundry-incubator/stratos/compare/2.5.2...2.5.3)
+
+This release contains a number of fixes and improvements:
+
+**Fixes:**
+
+- Metrics only shown for most recently added k8s metrics endpoint [\#3861](https://github.com/cloudfoundry-incubator/stratos/issues/3861)
+- Can't update user profile when using local user with mysql or postgres [\#3940](https://github.com/cloudfoundry-incubator/stratos/issues/3940)
+- Ensure we remove X-Forward-* HTTP headers that can cause problems proxying API requests [\#3934](https://github.com/cloudfoundry-incubator/stratos/pull/3934)
+
+**Improvements:**
+
+- Add ingress support to Helm Chart [\#3935](https://github.com/cloudfoundry-incubator/stratos/pull/3935)
+- Gate SSO redirect on optional state whitelist [\#3933](https://github.com/cloudfoundry-incubator/stratos/pull/3933)
+- Backend update for cacheing compat for HTTP 1.0 clients [\#3931](https://github.com/cloudfoundry-incubator/stratos/pull/3931)
+
 ## 2.5.2
 
 [Full Changelog](https://github.com/cloudfoundry-incubator/stratos/compare/2.5.1...2.5.2)
diff --git a/package-lock.json b/package-lock.json
index 7310f12759..89481a577f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "stratos",
-  "version": "2.5.2",
+  "version": "2.5.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b7490f53d8..9a3904b02b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stratos",
-  "version": "2.5.2",
+  "version": "2.5.3",
   "description": "Stratos Console",
   "main": "index.js",
   "scripts": {

From 246a750e2b923afb2554d9d8c5f238ebe400eb96 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 4 Oct 2019 11:55:27 +0100
Subject: [PATCH 119/648] Initial helm migration

---
 .../app/custom/custom-routing.module.ts       |  34 ++---
 .../frontend/app/custom/custom.module.ts      |  20 +--
 .../create-release.component.ts               |  12 +-
 .../app/custom/helm/helm-entity-factory.ts    |  95 ++++++++++++++
 .../app/custom/helm/helm-entity-generator.ts  | 123 ++++++++++++++++++
 .../app/custom/helm/helm-testing.module.ts    | 113 ++++++++--------
 .../app/custom/helm/helm.setup.module.ts      |  50 +++----
 .../app/custom/helm/helm.store.module.ts      |  38 +++---
 .../monocular-charts-data-source.ts           |   5 +-
 .../monocular-release-pods-list-source.ts     |   5 +-
 .../monocular-release-services-list-source.ts |  12 +-
 .../monocular-releases-list-source.ts         |   5 +-
 .../monocular-repository-list-source.ts       |   3 +-
 .../monocular-versions-list-source.ts         |   5 +-
 .../tabs/helm-release-helper.service.ts       |   7 +-
 .../helm-release-summary-tab.component.ts     |   6 +-
 .../app/custom/helm/store/helm.actions.ts     |  43 +++---
 .../app/custom/helm/store/helm.effects.ts     |  38 +++---
 .../app/custom/helm/store/helm.entities.ts    |  66 ----------
 .../kubernetes/kubernetes.setup.module.ts     |   6 -
 .../packages/core/src/core/utils.service.ts   |   2 -
 21 files changed, 406 insertions(+), 282 deletions(-)
 create mode 100644 custom-src/frontend/app/custom/helm/helm-entity-factory.ts
 create mode 100644 custom-src/frontend/app/custom/helm/helm-entity-generator.ts
 delete mode 100644 custom-src/frontend/app/custom/helm/store/helm.entities.ts

diff --git a/custom-src/frontend/app/custom/custom-routing.module.ts b/custom-src/frontend/app/custom/custom-routing.module.ts
index 1a9862a4e6..3a6afdf3a0 100644
--- a/custom-src/frontend/app/custom/custom-routing.module.ts
+++ b/custom-src/frontend/app/custom/custom-routing.module.ts
@@ -1,6 +1,9 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
+import { HELM_ENDPOINT_TYPE } from './helm/helm-entity-factory';
+import { KUBERNETES_ENDPOINT_TYPE } from './kubernetes/kubernetes-entity-factory';
+
 const kubernetes: Routes = [
   {
     path: 'kubernetes',
@@ -9,26 +12,25 @@ const kubernetes: Routes = [
       stratosNavigation: {
         text: 'Kubernetes',
         matIcon: 'kubernetes',
-        matIconFont: 'stratos-icons',
+        matIconFont: 'stratos-icons', // TODO: get these from entity config?
         position: 60,
-        requiresEndpointType: 'k8s'
+        requiresEndpointType: KUBERNETES_ENDPOINT_TYPE
       }
     }
   },
-  // TODO: RC helm
-  // {
-  //   path: 'monocular',
-  //   loadChildren: './helm/helm.module#HelmModule',
-  //   data: {
-  //     stratosNavigation: {
-  //       text: 'Helm',
-  //       matIcon: 'helm',
-  //       matIconFont: 'stratos-icons',
-  //       position: 65,
-  //       requiresEndpointType: 'helm'
-  //     }
-  //   }
-  // }
+  {
+    path: 'monocular',
+    loadChildren: './helm/helm.module#HelmModule',
+    data: {
+      stratosNavigation: {
+        text: 'Helm',
+        matIcon: 'helm',
+        matIconFont: 'stratos-icons',
+        position: 65,
+        requiresEndpointType: HELM_ENDPOINT_TYPE
+      }
+    }
+  }
 ];
 
 @NgModule({
diff --git a/custom-src/frontend/app/custom/custom.module.ts b/custom-src/frontend/app/custom/custom.module.ts
index ffe70edf8e..4a767cfe6c 100644
--- a/custom-src/frontend/app/custom/custom.module.ts
+++ b/custom-src/frontend/app/custom/custom.module.ts
@@ -1,16 +1,12 @@
 import { NgModule } from '@angular/core';
 import { Router } from '@angular/router';
-import { Store } from '@ngrx/store';
 
-import { GetSystemInfo } from '../../../store/src/actions/system.actions';
-import { AppState } from '../../../store/src/app-state';
-import { EndpointHealthCheck } from '../../endpoints-health-checks';
 import { CoreModule } from '../core/core.module';
 import { Customizations, CustomizationsMetadata } from '../core/customizations.types';
-import { EndpointsService } from '../core/endpoints.service';
 import { MDAppModule } from '../core/md.module';
 import { SharedModule } from '../shared/shared.module';
 import { DemoHelperComponent } from './demo/demo-helper/demo-helper.component';
+import { HelmSetupModule } from './helm/helm.setup.module';
 import { KubernetesSetupModule } from './kubernetes/kubernetes.setup.module';
 import { SuseAboutInfoComponent } from './suse-about-info/suse-about-info.component';
 import { SuseLoginComponent } from './suse-login/suse-login.component';
@@ -32,8 +28,7 @@ const SuseCustomizations: CustomizationsMetadata = {
     SharedModule,
     MDAppModule,
     KubernetesSetupModule,
-    // HelmModule, // TODO: RC Helm
-    // HelmSetupModule
+    HelmSetupModule
   ],
   // FIXME: Ensure that anything lazy loaded/in kube endpoint pages is not included here - #3675
   declarations: [
@@ -56,16 +51,7 @@ export class CustomModule {
 
   static init = false;
 
-  constructor(endpointService: EndpointsService, store: Store<AppState>, router: Router) {
-    // TODO: RC v3 world
-    // TODO: helm, to move. 'helm' --> helm endpoint type
-    endpointService.registerHealthCheck(
-      new EndpointHealthCheck('helm', (endpoint) => {
-        if (endpoint.endpoint_metadata && endpoint.endpoint_metadata.status === 'Synchronizing') {
-          store.dispatch(new GetSystemInfo());
-        }
-      })
-    );
+  constructor(router: Router) {
     // Only update the routes once
     if (!CustomModule.init) {
       // Override the component used for the login route
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 5d5ee711ea..62f3a317ba 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
@@ -8,13 +8,14 @@ import { Observable, of, Subscription } from 'rxjs';
 import { delay, filter, first, map, pairwise, switchMap, tap } from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
-import { selectUpdateInfo } from '../../../../../store/src/selectors/api.selectors';
 import { EndpointsService } from '../../../core/endpoints.service';
+import { entityCatalogue } from '../../../core/entity-catalogue/entity-catalogue.service';
 import { ConfirmationDialogConfig } from '../../../shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service';
 import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component';
+import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes/kubernetes-entity-factory';
+import { HELM_ENDPOINT_TYPE, helmReleaseSchemaKey } from '../helm-entity-factory';
 import { HelmInstall } from '../store/helm.actions';
-import { helmReleaseSchemaKey } from '../store/helm.entities';
 import { HELM_INSTALLING_KEY, HelmInstallValues } from '../store/helm.types';
 
 @Component({
@@ -57,7 +58,7 @@ export class CreateReleaseComponent implements OnInit {
     const chart = this.route.snapshot.params;
     this.cancelUrl = `/monocular/charts/${chart.repo}/${chart.chartName}/${chart.version}`;
 
-    this.kubeEndpoints$ = this.endpointsService.connectedEndpointsOfTypes('k8s');
+    this.kubeEndpoints$ = this.endpointsService.connectedEndpointsOfTypes(KUBERNETES_ENDPOINT_TYPE);
 
     this.details = new FormGroup({
       endpoint: new FormControl('', Validators.required),
@@ -132,10 +133,13 @@ export class CreateReleaseComponent implements OnInit {
     const action = new HelmInstall(values);
     this.store.dispatch(action);
 
+    const releaseEntityConfig = entityCatalogue.getEntity(HELM_ENDPOINT_TYPE, helmReleaseSchemaKey);
+
     // Wait for result of request
     return of(true).pipe(
       delay(1),
-      switchMap(() => this.store.select(selectUpdateInfo(helmReleaseSchemaKey, action.guid(), HELM_INSTALLING_KEY))),
+      switchMap(() => releaseEntityConfig.getEntityMonitor(this.store, action.guid()).updatingSection$),
+      map(updatingSection => updatingSection[HELM_INSTALLING_KEY]),
       filter(update => !!update),
       pairwise(),
       filter(([oldVal, newVal]) => (oldVal.busy && !newVal.busy)),
diff --git a/custom-src/frontend/app/custom/helm/helm-entity-factory.ts b/custom-src/frontend/app/custom/helm/helm-entity-factory.ts
new file mode 100644
index 0000000000..d09939d3be
--- /dev/null
+++ b/custom-src/frontend/app/custom/helm/helm-entity-factory.ts
@@ -0,0 +1,95 @@
+import { Schema, schema } from 'normalizr';
+
+import { EntitySchema } from '../../../../store/src/helpers/entity-schema';
+import {
+  HelmRelease,
+  HelmReleasePod,
+  HelmReleaseService,
+  HelmReleaseStatus,
+  HelmVersion,
+  MonocularChart,
+} from './store/helm.types';
+
+// TODO: SchemaKey names (and kube names)
+export const monocularChartsSchemaKey = 'monocularCharts';
+
+export const helmReleaseSchemaKey = 'helmReleases';
+export const helmVersionsSchemaKey = 'helmVersions';
+export const helmReleaseStatusSchemaKey = 'helmReleaseStatus';
+export const helmReleasePodKey = 'helmReleasePod';
+export const helmReleaseServiceKey = 'helmReleaseService';
+
+export const getMonocularChartId = (entity: MonocularChart) => entity.id;
+export const getHelmReleaseId = (entity: HelmRelease) => entity.endpointId;
+export const getHelmVersionId = (entity: HelmVersion) => entity.endpointId;
+export const getHelmReleaseStatusId = (entity: HelmReleaseStatus) => entity.endpointId;
+export const getHelmReleasePodId = (entity: HelmReleasePod) => entity.name;
+export const getHelmReleaseServiceId = (entity: HelmReleaseService) => entity.name;
+
+export const HELM_ENDPOINT_TYPE = 'helm';
+
+const entityCache: {
+  [key: string]: EntitySchema
+} = {};
+
+export class HelmEntitySchema extends EntitySchema {
+  /**
+   * @param entityKey As per schema.Entity ctor
+   * @param [definition] As per schema.Entity ctor
+   * @param [options] As per schema.Entity ctor
+   * @param [relationKey] Allows multiple children of the same type within a single parent entity. For instance user with developer
+   * spaces, manager spaces, auditor space, etc
+   */
+  constructor(
+    entityKey: string,
+    definition?: Schema,
+    options?: schema.EntityOptions,
+    relationKey?: string
+  ) {
+    super(entityKey, HELM_ENDPOINT_TYPE, definition, options, relationKey);
+  }
+}
+
+entityCache[monocularChartsSchemaKey] = new HelmEntitySchema(
+  monocularChartsSchemaKey,
+  {},
+  { idAttribute: getMonocularChartId }
+);
+
+entityCache[helmReleaseSchemaKey] = new HelmEntitySchema(
+  helmReleaseSchemaKey,
+  {},
+  { idAttribute: getHelmReleaseId }
+);
+
+entityCache[helmVersionsSchemaKey] = new HelmEntitySchema(
+  helmVersionsSchemaKey,
+  {},
+  { idAttribute: getHelmVersionId }
+);
+
+entityCache[helmReleaseStatusSchemaKey] = new HelmEntitySchema(
+  helmReleaseStatusSchemaKey,
+  {},
+  { idAttribute: getHelmReleaseStatusId }
+);
+
+entityCache[helmReleasePodKey] = new HelmEntitySchema(
+  helmReleasePodKey,
+  {},
+  { idAttribute: getHelmReleasePodId }
+);
+
+entityCache[helmReleaseServiceKey] = new HelmEntitySchema(
+  helmReleaseServiceKey,
+  {},
+  { idAttribute: getHelmReleaseServiceId }
+);
+
+export function helmEntityFactory(key: string): EntitySchema {
+  const entity = entityCache[key];
+  if (!entity) {
+    throw new Error(`Unknown entity schema type: ${key}`);
+  }
+  return entity;
+}
diff --git a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts b/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
new file mode 100644
index 0000000000..64b223a05f
--- /dev/null
+++ b/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
@@ -0,0 +1,123 @@
+import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types';
+import {
+  StratosBaseCatalogueEntity,
+  StratosCatalogueEndpointEntity,
+  StratosCatalogueEntity,
+} from '../../core/entity-catalogue/entity-catalogue-entity';
+import { StratosEndpointExtensionDefinition } from '../../core/entity-catalogue/entity-catalogue.types';
+import {
+  HELM_ENDPOINT_TYPE,
+  helmEntityFactory,
+  helmReleasePodKey,
+  helmReleaseSchemaKey,
+  helmReleaseServiceKey,
+  helmReleaseStatusSchemaKey,
+  helmVersionsSchemaKey,
+  monocularChartsSchemaKey,
+} from './helm-entity-factory';
+import {
+  HelmRelease,
+  HelmReleasePod,
+  HelmReleaseService,
+  HelmReleaseStatus,
+  HelmVersion,
+  MonocularChart,
+} from './store/helm.types';
+
+// TODO: RC hack
+/**
+ * CustomImportModule brings in CustomModule. CustomModule brings in kube setup module. setup module brings this in multiple times
+ */
+let hack = false;
+
+export function generateHelmEntities(): StratosBaseCatalogueEntity[] {
+  if (hack) {
+    return [];
+  }
+  hack = true;
+
+  const endpointDefinition: StratosEndpointExtensionDefinition = {
+    type: HELM_ENDPOINT_TYPE,
+    label: 'Helm Repository',
+    labelPlural: 'Helm Repositories',
+    icon: 'helm',
+    iconFont: 'stratos-icons',
+    logoUrl: '/core/assets/custom/helm.svg',
+    urlValidation: undefined,
+    unConnectable: true,
+    techPreview: true,
+    authTypes: [],
+    renderPriority: 5,
+  };
+  return [
+    generateEndpointEntity(endpointDefinition),
+    generateChartEntity(endpointDefinition),
+    generateReleaseEntity(endpointDefinition),
+    generateVersionEntity(endpointDefinition),
+    generateReleaseStatusEntity(endpointDefinition),
+    generateReleasePodEntity(endpointDefinition),
+    generateReleaseServiceEntity(endpointDefinition),
+  ];
+}
+
+function generateEndpointEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  return new StratosCatalogueEndpointEntity(
+    endpointDefinition,
+    metadata => `/monocular/repos/${metadata.guid}`,
+  );
+}
+
+function generateChartEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: monocularChartsSchemaKey,
+    schema: helmEntityFactory(monocularChartsSchemaKey),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogueEntity<IFavoriteMetadata, MonocularChart>(definition);
+}
+
+function generateReleaseEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: helmReleaseSchemaKey,
+    schema: helmEntityFactory(helmReleaseSchemaKey),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogueEntity<IFavoriteMetadata, HelmRelease>(definition);
+}
+
+function generateVersionEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: helmVersionsSchemaKey,
+    schema: helmEntityFactory(helmVersionsSchemaKey),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogueEntity<IFavoriteMetadata, HelmVersion>(definition);
+}
+
+function generateReleaseStatusEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: helmReleaseStatusSchemaKey,
+    schema: helmEntityFactory(helmReleaseStatusSchemaKey),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogueEntity<IFavoriteMetadata, HelmReleaseStatus>(definition);
+}
+
+function generateReleasePodEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: helmReleasePodKey,
+    schema: helmEntityFactory(helmReleasePodKey),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogueEntity<IFavoriteMetadata, HelmReleasePod>(definition);
+}
+
+function generateReleaseServiceEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: helmReleaseServiceKey,
+    schema: helmEntityFactory(helmReleaseServiceKey),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogueEntity<IFavoriteMetadata, HelmReleaseService>(definition);
+}
+
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 dc3ef33532..ff2cc052ac 100644
--- a/custom-src/frontend/app/custom/helm/helm-testing.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm-testing.module.ts
@@ -1,64 +1,65 @@
-import { HttpClient, HttpHandler } from '@angular/common/http';
-import { NgModule } from '@angular/core';
-import { HttpModule } from '@angular/http';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { ActivatedRoute } from '@angular/router';
-import { RouterTestingModule } from '@angular/router/testing';
+// TODO: RC being copied over into served code
+// import { HttpClient, HttpHandler } from '@angular/common/http';
+// import { NgModule } from '@angular/core';
+// import { HttpModule } from '@angular/http';
+// import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+// import { ActivatedRoute } from '@angular/router';
+// import { RouterTestingModule } from '@angular/router/testing';
 
-import { createBasicStoreModule, registerEntitiesForTesting } from '../../../test-framework/store-test-helper';
-import { CoreModule } from '../../core/core.module';
-import { SharedModule } from '../../shared/shared.module';
-import { HelmStoreModule } from './helm.store.module';
-import { HelmReleaseHelperService } from './release/tabs/helm-release-helper.service';
-import { monocularEntities } from './store/helm.entities';
-import { HelmReleaseGuid } from './store/helm.types';
+// import { createBasicStoreModule, registerEntitiesForTesting } from '../../../test-framework/store-test-helper';
+// import { CoreModule } from '../../core/core.module';
+// import { SharedModule } from '../../shared/shared.module';
+// import { HelmStoreModule } from './helm.store.module';
+// import { HelmReleaseHelperService } from './release/tabs/helm-release-helper.service';
+// import { monocularEntities } from './store/helm.entities';
+// import { HelmReleaseGuid } from './store/helm.types';
 
-@NgModule({
-  imports: [
-    HelmStoreModule
-  ]
-})
-export class HelmTestingModule {
+// @NgModule({
+//   imports: [
+//     HelmStoreModule
+//   ]
+// })
+// export class HelmTestingModule {
 
-  constructor() {
-    registerEntitiesForTesting(monocularEntities);
-  }
-}
+//   constructor() {
+//     registerEntitiesForTesting(monocularEntities);
+//   }
+// }
 
-export const HelmReleaseActivatedRouteMock = {
-  provide: ActivatedRoute,
-  useValue: {
-    snapshot: {
-      queryParams: {},
-      params: {
-        guid: '123:4'
-      }
-    }
-  }
-};
+// export const HelmReleaseActivatedRouteMock = {
+//   provide: ActivatedRoute,
+//   useValue: {
+//     snapshot: {
+//       queryParams: {},
+//       params: {
+//         guid: '123:4'
+//       }
+//     }
+//   }
+// };
 
-export const HelmReleaseGuidMock = {
-  provide: HelmReleaseGuid,
-  useValue: {
-    guid: '123:4'
-  }
-};
+// export const HelmReleaseGuidMock = {
+//   provide: HelmReleaseGuid,
+//   useValue: {
+//     guid: '123:4'
+//   }
+// };
 
-export const HelmBaseTestModules = [
-  HelmTestingModule,
-  RouterTestingModule,
-  CoreModule,
-  createBasicStoreModule(),
-  NoopAnimationsModule,
-  HttpModule,
-  SharedModule
-];
+// export const HelmBaseTestModules = [
+//   HelmTestingModule,
+//   RouterTestingModule,
+//   CoreModule,
+//   createBasicStoreModule(),
+//   NoopAnimationsModule,
+//   HttpModule,
+//   SharedModule
+// ];
 
-export const HelmBaseTestProviders = [
-  HelmReleaseHelperService,
-  HelmReleaseActivatedRouteMock,
-  HelmReleaseGuidMock,
-  HttpClient,
-  HttpHandler
-];
+// export const HelmBaseTestProviders = [
+//   HelmReleaseHelperService,
+//   HelmReleaseActivatedRouteMock,
+//   HelmReleaseGuidMock,
+//   HttpClient,
+//   HttpHandler
+// ];
 
diff --git a/custom-src/frontend/app/custom/helm/helm.setup.module.ts b/custom-src/frontend/app/custom/helm/helm.setup.module.ts
index a6d90f33fb..419d7be414 100644
--- a/custom-src/frontend/app/custom/helm/helm.setup.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm.setup.module.ts
@@ -1,53 +1,35 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { EffectsModule } from '@ngrx/effects';
+import { Store } from '@ngrx/store';
 
-import { endpointSchemaKey } from '../../../../store/src/helpers/entity-factory';
-import { EndpointModel } from '../../../../store/src/types/endpoint.types';
+import { GetSystemInfo } from '../../../../store/src/actions/system.actions';
+import { AppState } from '../../../../store/src/app-state';
+import { EndpointHealthCheck } from '../../../endpoints-health-checks';
 import { CoreModule } from '../../core/core.module';
-import { getFullEndpointApiUrl } from '../../features/endpoints/endpoint-helpers';
-import { FavoriteConfig, favoritesConfigMapper } from '../../shared/components/favorites-meta-card/favorite-config-mapper';
+import { EndpointsService } from '../../core/endpoints.service';
+import { EntityCatalogueModule } from '../../core/entity-catalogue.module';
 import { SharedModule } from '../../shared/shared.module';
-import { IK8FavMetadata } from '../kubernetes/kubernetes.setup.module';
+import { HELM_ENDPOINT_TYPE } from './helm-entity-factory';
+import { generateHelmEntities } from './helm-entity-generator';
 import { HelmStoreModule } from './helm.store.module';
-import { HelmEffects } from './store/helm.effects';
 
 @NgModule({
   imports: [
+    EntityCatalogueModule.forFeature(generateHelmEntities),
     CoreModule,
     CommonModule,
     SharedModule,
     HelmStoreModule,
-    EffectsModule.forFeature([
-      HelmEffects
-    ])
   ]
 })
 export class HelmSetupModule {
-  constructor() {
-    const endpointType = 'helm';
-    favoritesConfigMapper.registerFavoriteConfig<EndpointModel, IK8FavMetadata>(
-      new FavoriteConfig({
-        endpointType,
-        entityType: endpointSchemaKey
-      },
-        'Helm',
-        (endpoint: IK8FavMetadata) => ({
-          type: endpointType,
-          routerLink: `/monodular/charts`,
-          lines: [
-            ['Address', endpoint.address]
-          ],
-          name: endpoint.name,
-        }),
-        endpoint => ({
-          guid: endpoint.guid,
-          name: endpoint.name,
-          address: getFullEndpointApiUrl(endpoint),
-        })
-      )
+  constructor(endpointService: EndpointsService, store: Store<AppState>) {
+    endpointService.registerHealthCheck(
+      new EndpointHealthCheck(HELM_ENDPOINT_TYPE, (endpoint) => {
+        if (endpoint.endpoint_metadata && endpoint.endpoint_metadata.status === 'Synchronizing') {
+          store.dispatch(new GetSystemInfo());
+        }
+      })
     );
   }
 }
-
-
diff --git a/custom-src/frontend/app/custom/helm/helm.store.module.ts b/custom-src/frontend/app/custom/helm/helm.store.module.ts
index 520d8577d8..a16068a2dc 100644
--- a/custom-src/frontend/app/custom/helm/helm.store.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm.store.module.ts
@@ -1,30 +1,26 @@
 import { NgModule } from '@angular/core';
+import { EffectsModule } from '@ngrx/effects';
 
-import { StratosExtension } from '../../core/extension/extension-service';
-import { CoreModule } from '../../core/core.module';
-import { monocularEntities, monocularEntityKeys } from './store/helm.entities';
-import { EndpointTypeExtensionConfig } from '../../core/extension/extension-types';
+import { HelmEffects } from './store/helm.effects';
 
-const helmEndpointTypes: EndpointTypeExtensionConfig[] = [{
-  type: 'helm',
-  label: 'Helm Repository',
-  authTypes: [],
-  icon: 'helm',
-  iconFont: 'stratos-icons',
-  imagePath: '/core/assets/custom/helm.svg',
-  homeLink: (guid) => ['/monocular/repos', guid],
-  entitySchemaKeys: monocularEntityKeys,
-  doesNotSupportConnect: true,
-  techPreview: true,
-}];
+// const helmEndpointTypes: EndpointTypeExtensionConfig[] = [{
+//   type: 'helm',
+//   label: 'Helm Repository',
+//   authTypes: [],
+//   icon: 'helm',
+//   iconFont: 'stratos-icons',
+//   imagePath: '/core/assets/custom/helm.svg',
+//   homeLink: (guid) => ['/monocular/repos', guid],
+//   entitySchemaKeys: monocularEntityKeys,
+//   doesNotSupportConnect: true,
+//   techPreview: true,
+// }];
 
-@StratosExtension({
-  endpointTypes: helmEndpointTypes,
-  entities: monocularEntities,
-})
 @NgModule({
   imports: [
-    CoreModule
+    EffectsModule.forFeature([
+      HelmEffects
+    ])
   ]
 })
 export class HelmStoreModule { }
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts
index 3df7938553..755a62a8b4 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts
@@ -1,12 +1,11 @@
 import { Store } from '@ngrx/store';
 
-import { entityFactory } from '../../../../../store/src//helpers/entity-factory';
 import { PaginationEntityState } from '../../../../../store/src//types/pagination.types';
 import { AppState } from '../../../../../store/src/app-state';
 import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../shared/components/list/list.component.types';
+import { getMonocularChartId, helmEntityFactory, monocularChartsSchemaKey } from '../helm-entity-factory';
 import { GetMonocularCharts } from '../store/helm.actions';
-import { getMonocularChartId, monocularChartsSchemaKey } from '../store/helm.entities';
 import { MonocularChart } from '../store/helm.types';
 
 export class MonocularChartsDataSource extends ListDataSource<MonocularChart> {
@@ -19,7 +18,7 @@ export class MonocularChartsDataSource extends ListDataSource<MonocularChart> {
     super({
       store,
       action,
-      schema: entityFactory(monocularChartsSchemaKey),
+      schema: helmEntityFactory(monocularChartsSchemaKey),
       getRowUniqueId: getMonocularChartId,
       paginationKey: action.paginationKey,
       isLocal: true,
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-source.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-source.ts
index a8355e39bb..14850b887a 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-source.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-source.ts
@@ -1,11 +1,10 @@
 import { Store } from '@ngrx/store';
 
 import { AppState } from '../../../../../store/src/app-state';
-import { entityFactory } from '../../../../../store/src/helpers/entity-factory';
 import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../shared/components/list/list.component.types';
+import { getHelmReleasePodId, helmEntityFactory } from '../helm-entity-factory';
 import { GetHelmReleasePods } from '../store/helm.actions';
-import { getHelmReleasePodId } from '../store/helm.entities';
 import { HelmReleasePod } from '../store/helm.types';
 
 export class HelmReleasePodsDataSource extends ListDataSource<HelmReleasePod> {
@@ -20,7 +19,7 @@ export class HelmReleasePodsDataSource extends ListDataSource<HelmReleasePod> {
     super({
       store,
       action,
-      schema: entityFactory(action.entityKey),
+      schema: helmEntityFactory(action.entityType),
       getRowUniqueId: getHelmReleasePodId,
       paginationKey: action.paginationKey,
       isLocal: true,
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-source.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-source.ts
index fa86e27b19..4bbd9490f1 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-source.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-source.ts
@@ -4,23 +4,21 @@ import { filter, map, publishReplay, refCount, switchMap } from 'rxjs/operators'
 
 import { ClearPaginationOfType } from '../../../../../store/src/actions/pagination.actions';
 import { AppState } from '../../../../../store/src/app-state';
-import { entityFactory } from '../../../../../store/src/helpers/entity-factory';
 import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../shared/components/list/list.component.types';
 import { PaginationMonitor } from '../../../shared/monitors/pagination-monitor';
 import { KubeService } from '../../kubernetes/store/kube.types';
 import { GetKubernetesServicesInNamespace } from '../../kubernetes/store/kubernetes.actions';
-import { kubernetesServicesSchemaKey } from '../../kubernetes/store/kubernetes.entities';
+import { getHelmReleaseServiceId, helmEntityFactory } from '../helm-entity-factory';
 import { GetHelmReleases, GetHelmReleaseServices } from '../store/helm.actions';
-import { getHelmReleaseServiceId, helmReleaseSchemaKey } from '../store/helm.entities';
 import { HelmRelease, HelmReleaseService } from '../store/helm.types';
 
 export const fetchHelmReleaseServiceFromKubernetes = (store: Store<AppState>, helmService: HelmReleaseService): Observable<KubeService> => {
   return fetchRelease(store, helmService.endpointId, helmService.releaseTitle).pipe(
     switchMap(release => {
       const action = new GetKubernetesServicesInNamespace(helmService.endpointId, release.namespace);
-      const paginationMonitor = new PaginationMonitor<KubeService>(store, action.paginationKey, entityFactory(action.entityKey));
+      const paginationMonitor = new PaginationMonitor<KubeService>(store, action.paginationKey, helmEntityFactory(action.entityType));
       return getPaginationObservables<KubeService>({ store, action, paginationMonitor }).entities$;
     }),
     filter(entities => !!entities),
@@ -32,7 +30,7 @@ export const fetchHelmReleaseServiceFromKubernetes = (store: Store<AppState>, he
 
 function fetchRelease(store: Store<AppState>, endpointGuid: string, releaseTitle: string) {
   const action = new GetHelmReleases();
-  const paginationMonitor = new PaginationMonitor(store, action.paginationKey, entityFactory(helmReleaseSchemaKey));
+  const paginationMonitor = new PaginationMonitor(store, action.paginationKey, action);
   const svc = getPaginationObservables({ store, action, paginationMonitor });
   return svc.entities$.pipe(
     map((items: HelmRelease[]) => items.find(item => item.guid === `${endpointGuid}:${releaseTitle}`))
@@ -51,7 +49,7 @@ export class HelmReleaseServicesDataSource extends ListDataSource<HelmReleaseSer
     super({
       store,
       action,
-      schema: entityFactory(action.entityKey),
+      schema: helmEntityFactory(action.entityType),
       getRowUniqueId: getHelmReleaseServiceId,
       paginationKey: action.paginationKey,
       isLocal: true,
@@ -66,7 +64,7 @@ export class HelmReleaseServicesDataSource extends ListDataSource<HelmReleaseSer
       }),
       refresh: () => {
         store.dispatch(action);
-        store.dispatch(new ClearPaginationOfType(kubernetesServicesSchemaKey));
+        store.dispatch(new ClearPaginationOfType(action));
       }
     });
   }
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-source.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-source.ts
index 6cfabc28ac..96678ab51c 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-source.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-source.ts
@@ -1,11 +1,10 @@
 import { Store } from '@ngrx/store';
 
 import { AppState } from '../../../../../store/src/app-state';
-import { entityFactory } from '../../../../../store/src/helpers/entity-factory';
 import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../shared/components/list/list.component.types';
+import { getHelmReleaseId, helmEntityFactory, helmReleaseSchemaKey } from '../helm-entity-factory';
 import { GetHelmReleases } from '../store/helm.actions';
-import { getHelmReleaseId, helmReleaseSchemaKey } from '../store/helm.entities';
 import { HelmRelease } from '../store/helm.types';
 
 export class HelmReleasesDataSource extends ListDataSource<HelmRelease> {
@@ -18,7 +17,7 @@ export class HelmReleasesDataSource extends ListDataSource<HelmRelease> {
     super({
       store,
       action,
-      schema: entityFactory(helmReleaseSchemaKey),
+      schema: helmEntityFactory(helmReleaseSchemaKey),
       getRowUniqueId: getHelmReleaseId,
       paginationKey: action.paginationKey,
       isLocal: true,
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-source.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-source.ts
index c5d85ada4f..23cadde039 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-source.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-source.ts
@@ -15,6 +15,7 @@ import { IListConfig } from '../../../shared/components/list/list.component.type
 import { EntityMonitorFactory } from '../../../shared/monitors/entity-monitor.factory.service';
 import { InternalEventMonitorFactory } from '../../../shared/monitors/internal-event-monitor.factory';
 import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory';
+import { HELM_ENDPOINT_TYPE } from '../helm-entity-factory';
 
 export class MonocularRepositoryDataSource extends BaseEndpointsDataSource {
 
@@ -38,7 +39,7 @@ export class MonocularRepositoryDataSource extends BaseEndpointsDataSource {
       store,
       listConfig,
       action,
-      'helm',
+      HELM_ENDPOINT_TYPE,
       paginationMonitorFactory,
       entityMonitorFactory,
       internalEventMonitorFactory,
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-source.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-source.ts
index de19ffe217..deb3181630 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-source.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-source.ts
@@ -1,11 +1,10 @@
 import { Store } from '@ngrx/store';
 
 import { AppState } from '../../../../../store/src/app-state';
-import { entityFactory } from '../../../../../store/src/helpers/entity-factory';
 import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../shared/components/list/list.component.types';
+import { getHelmVersionId, helmEntityFactory } from '../helm-entity-factory';
 import { GetHelmVersions } from '../store/helm.actions';
-import { getHelmVersionId } from '../store/helm.entities';
 import { HelmVersion } from '../store/helm.types';
 
 export class HelmVersionsDataSource extends ListDataSource<HelmVersion> {
@@ -18,7 +17,7 @@ export class HelmVersionsDataSource extends ListDataSource<HelmVersion> {
     super({
       store,
       action,
-      schema: entityFactory(action.entityKey),
+      schema: helmEntityFactory(action.entityType),
       getRowUniqueId: getHelmVersionId,
       paginationKey: action.paginationKey,
       isLocal: true,
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
index a478546582..64583d33f7 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
@@ -3,11 +3,10 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { entityFactory } from '../../../../../../store/src/helpers/entity-factory';
 import { EntityServiceFactory } from '../../../../core/entity-service-factory.service';
 import { PaginationMonitor } from '../../../../shared/monitors/pagination-monitor';
+import { helmEntityFactory, helmReleaseSchemaKey } from '../../helm-entity-factory';
 import { GetHelmReleases, GetHelmReleaseStatus } from '../../store/helm.actions';
-import { helmReleaseSchemaKey } from '../../store/helm.entities';
 import { HelmRelease, HelmReleaseGuid, HelmReleaseStatus } from '../../store/helm.types';
 import { AppState } from './../../../../../../store/src/app-state';
 import {
@@ -35,7 +34,7 @@ export class HelmReleaseHelperService {
     this.endpointGuid = this.guid.split(':')[0];
 
     const action = new GetHelmReleases();
-    const paginationMonitor = new PaginationMonitor(store, action.paginationKey, entityFactory(helmReleaseSchemaKey));
+    const paginationMonitor = new PaginationMonitor(store, action.paginationKey, helmEntityFactory(helmReleaseSchemaKey));
     const svc = getPaginationObservables({ store, action, paginationMonitor });
     this.isFetching$ = svc.fetchingEntities$;
 
@@ -48,7 +47,7 @@ export class HelmReleaseHelperService {
     // Get helm release
     const action = new GetHelmReleaseStatus(this.endpointGuid, this.releaseTitle);
 
-    return this.esf.create<HelmReleaseStatus>(action.entityKey, action.entity, action.key, action, false).waitForEntity$.pipe(
+    return this.esf.create<HelmReleaseStatus>(action.key, action).waitForEntity$.pipe(
       map(entity => entity.entity)
     );
   }
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index 9e1bd9e1d0..3630480fb0 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -8,10 +8,11 @@ import { ClearPaginationOfType } from '../../../../../../../store/src/actions/pa
 import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
 import { HideSnackBar, ShowSnackBar } from '../../../../../../../store/src/actions/snackBar.actions';
 import { AppState } from '../../../../../../../store/src/app-state';
+import { entityCatalogue } from '../../../../../core/entity-catalogue/entity-catalogue.service';
 import { LoggerService } from '../../../../../core/logger.service';
 import { ConfirmationDialogConfig } from '../../../../../shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../../shared/components/confirmation-dialog.service';
-import { helmReleaseSchemaKey } from '../../../store/helm.entities';
+import { HELM_ENDPOINT_TYPE, helmReleaseSchemaKey } from '../../../helm-entity-factory';
 import { HelmReleaseHelperService } from '../helm-release-helper.service';
 
 @Component({
@@ -122,7 +123,8 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
           this.logService.error('Failed to delete release: ', err);
         },
         complete: () => {
-          this.store.dispatch(new ClearPaginationOfType(helmReleaseSchemaKey));
+          const releaseEntityConfig = entityCatalogue.getEntity(HELM_ENDPOINT_TYPE, helmReleaseSchemaKey);
+          this.store.dispatch(new ClearPaginationOfType(releaseEntityConfig));
           this.completeDelete();
           this.store.dispatch(new RouterNav({ path: ['monocular/releases'] }));
         }
diff --git a/custom-src/frontend/app/custom/helm/store/helm.actions.ts b/custom-src/frontend/app/custom/helm/store/helm.actions.ts
index da4b8c0abe..012bce8cc6 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.actions.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.actions.ts
@@ -1,16 +1,17 @@
 import { Action } from '@ngrx/store';
 
-import { entityFactory } from '../../../../../store/src/helpers/entity-factory';
-import { PaginatedAction } from './../../../../../store/src/types/pagination.types';
-import { IRequestAction } from './../../../../../store/src/types/request.types';
+import { EntityRequestAction } from '../../../../../store/src/types/request.types';
 import {
+  HELM_ENDPOINT_TYPE,
+  helmEntityFactory,
   helmReleasePodKey,
   helmReleaseSchemaKey,
   helmReleaseServiceKey,
   helmReleaseStatusSchemaKey,
   helmVersionsSchemaKey,
   monocularChartsSchemaKey,
-} from './helm.entities';
+} from '../helm-entity-factory';
+import { PaginatedAction } from './../../../../../store/src/types/pagination.types';
 import { HelmInstallValues } from './helm.types';
 
 export const GET_MONOCULAR_CHARTS = '[Monocular] Get Charts';
@@ -41,15 +42,16 @@ export const HELM_INSTALL = '[Helm] Install';
 export const HELM_INSTALL_SUCCESS = '[Helm] Install Success';
 export const HELM_INSTALL_FAILURE = '[Helm] Install Failure';
 
-export interface MonocularPaginationAction extends PaginatedAction, IRequestAction { }
+export interface MonocularPaginationAction extends PaginatedAction, EntityRequestAction { }
 
 export class GetMonocularCharts implements MonocularPaginationAction {
   constructor() {
     this.paginationKey = 'monocular-charts';
   }
   type = GET_MONOCULAR_CHARTS;
-  entityKey = monocularChartsSchemaKey;
-  entity = [entityFactory(monocularChartsSchemaKey)];
+  endpointType = HELM_ENDPOINT_TYPE;
+  entityType = monocularChartsSchemaKey;
+  entity = [helmEntityFactory(monocularChartsSchemaKey)];
   actions = [
     GET_MONOCULAR_CHARTS,
     GET_MONOCULAR_CHARTS_SUCCESS,
@@ -68,8 +70,9 @@ export class GetHelmReleases implements MonocularPaginationAction {
     this.paginationKey = 'helm-releases';
   }
   type = GET_HELM_RELEASES;
-  entityKey = helmReleaseSchemaKey;
-  entity = [entityFactory(helmReleaseSchemaKey)];
+  endpointType = HELM_ENDPOINT_TYPE;
+  entityType = helmReleaseSchemaKey;
+  entity = [helmEntityFactory(helmReleaseSchemaKey)];
   actions = [
     GET_HELM_RELEASES,
     GET_HELM_RELEASES_SUCCESS,
@@ -87,8 +90,9 @@ export class GetHelmVersions implements MonocularPaginationAction {
     this.paginationKey = 'helm-versions';
   }
   type = GET_HELM_VERSIONS;
-  entityKey = helmVersionsSchemaKey;
-  entity = [entityFactory(helmVersionsSchemaKey)];
+  endpointType = HELM_ENDPOINT_TYPE;
+  entityType = helmVersionsSchemaKey;
+  entity = [helmEntityFactory(helmVersionsSchemaKey)];
   actions = [
     GET_HELM_VERSIONS,
     GET_HELM_VERSIONS_SUCCESS,
@@ -101,7 +105,7 @@ export class GetHelmVersions implements MonocularPaginationAction {
   };
 }
 
-export class GetHelmReleaseStatus implements IRequestAction {
+export class GetHelmReleaseStatus implements EntityRequestAction {
   key: string;
   constructor(
     public endpointGuid: string,
@@ -110,8 +114,9 @@ export class GetHelmReleaseStatus implements IRequestAction {
     this.key = `${endpointGuid}/${releaseTitle}`;
   }
   type = GET_HELM_RELEASE_STATUS;
-  entity = entityFactory(helmReleaseStatusSchemaKey);
-  entityKey = helmReleaseStatusSchemaKey;
+  endpointType = HELM_ENDPOINT_TYPE;
+  entity = helmEntityFactory(helmReleaseStatusSchemaKey);
+  entityType = helmReleaseStatusSchemaKey;
   actions = [
     GET_HELM_RELEASE_STATUS,
     GET_HELM_RELEASE_STATUS_SUCCESS,
@@ -127,8 +132,9 @@ export class GetHelmReleasePods implements MonocularPaginationAction {
     this.paginationKey = `${endpointGuid}/${releaseTitle}/pods`;
   }
   type = GET_HELM_RELEASE_PODS;
-  entityKey = helmReleasePodKey;
-  entity = [entityFactory(helmReleasePodKey)];
+  endpointType = HELM_ENDPOINT_TYPE;
+  entityType = helmReleasePodKey;
+  entity = [helmEntityFactory(helmReleasePodKey)];
   actions = [
     GET_HELM_RELEASE_PODS,
     GET_HELM_RELEASE_PODS_SUCCESS,
@@ -152,8 +158,9 @@ export class GetHelmReleaseServices implements MonocularPaginationAction {
     this.paginationKey = `${endpointGuid}/${releaseTitle}/services`;
   }
   type = GET_HELM_RELEASE_SERVICES;
-  entityKey = helmReleaseServiceKey;
-  entity = [entityFactory(helmReleaseServiceKey)];
+  endpointType = HELM_ENDPOINT_TYPE;
+  entityType = helmReleaseServiceKey;
+  entity = [helmEntityFactory(helmReleaseServiceKey)];
   actions = [
     GET_HELM_RELEASE_SERVICES,
     GET_HELM_RELEASE_SERVICES_SUCCESS,
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 3eb7488707..9f3e5a00d6 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.effects.ts
@@ -9,12 +9,14 @@ import { ClearPaginationOfType } from '../../../../../store/src/actions/paginati
 import { AppState } from '../../../../../store/src/app-state';
 import { NormalizedResponse } from '../../../../../store/src/types/api.types';
 import {
-  IRequestAction,
+  EntityRequestAction,
   StartRequestAction,
   WrapperRequestActionFailed,
   WrapperRequestActionSuccess,
 } from '../../../../../store/src/types/request.types';
+import { entityCatalogue } from '../../../core/entity-catalogue/entity-catalogue.service';
 import { environment } from '../../../environments/environment';
+import { HELM_ENDPOINT_TYPE, helmReleaseSchemaKey } from '../helm-entity-factory';
 import { parseHelmReleaseStatus } from '../release/tabs/helm-release-helper.service';
 import {
   GET_HELM_RELEASE_PODS,
@@ -32,7 +34,6 @@ import {
   HELM_INSTALL,
   HelmInstall,
 } from './helm.actions';
-import { helmReleaseSchemaKey, monocularChartsSchemaKey } from './helm.entities';
 import {
   HELM_INSTALLING_KEY,
   HelmRelease,
@@ -58,16 +59,17 @@ export class HelmEffects {
   fetchCharts$ = this.actions$.pipe(
     ofType<GetMonocularCharts>(GET_MONOCULAR_CHARTS),
     flatMap(action => {
+      const entityKey = entityCatalogue.getEntityKey(action);
       return this.makeRequest(action, `/pp/${this.proxyAPIVersion}/chartsvc/v1/charts`, (response) => {
         const base = {
-          entities: { [monocularChartsSchemaKey]: {} },
+          entities: { [entityKey]: {} },
           result: []
         } as NormalizedResponse;
 
         const items = response.data as Array<any>;
         const processedData = items.reduce((res, data) => {
           const id = data.id;
-          res.entities[monocularChartsSchemaKey][id] = data;
+          res.entities[entityKey][id] = data;
           // Promote the name to the top-level object for simplicity
           data.name = data.attributes.name;
           res.result.push(id);
@@ -83,9 +85,10 @@ export class HelmEffects {
   fetchReleases$ = this.actions$.pipe(
     ofType<GetHelmReleases>(GET_HELM_RELEASES),
     flatMap(action => {
+      const entityKey = entityCatalogue.getEntityKey(action);
       return this.makeRequest(action, `/pp/${this.proxyAPIVersion}/helm/releases`, (response) => {
         const processedData = {
-          entities: { [action.entityKey]: {} },
+          entities: { [entityKey]: {} },
           result: []
         } as NormalizedResponse;
 
@@ -108,7 +111,7 @@ export class HelmEffects {
             helmRelease.lastDeployed = mapHelmModifiedDate(data.info.last_deployed);
             helmRelease.firstDeployed = mapHelmModifiedDate(data.info.first_deployed);
             // data.info =
-            processedData.entities[helmReleaseSchemaKey][id] = helmRelease;
+            processedData.entities[entityKey][id] = helmRelease;
             processedData.result.push(id);
           });
         });
@@ -121,10 +124,11 @@ export class HelmEffects {
   fetchVersions$ = this.actions$.pipe(
     ofType<GetHelmVersions>(GET_HELM_VERSIONS),
     flatMap(action => {
+      const entityKey = entityCatalogue.getEntityKey(action);
       return this.makeRequest(action, `/pp/${this.proxyAPIVersion}/helm/versions`, (response) => {
         // const a: HelmVersion = {};
         const processedData = {
-          entities: { [action.entityKey]: {} },
+          entities: { [entityKey]: {} },
           result: []
         } as NormalizedResponse;
 
@@ -136,7 +140,7 @@ export class HelmEffects {
             endpointId: endpoint,
             ...endpointData
           };
-          processedData.entities[action.entityKey][endpoint] = version;
+          processedData.entities[entityKey][endpoint] = version;
           processedData.result.push(endpoint);
         });
         return processedData;
@@ -148,12 +152,13 @@ export class HelmEffects {
   fetchHelmReleaseStatus$ = this.actions$.pipe(
     ofType<GetHelmReleaseStatus>(GET_HELM_RELEASE_STATUS),
     flatMap(action => {
+      const entityKey = entityCatalogue.getEntityKey(action);
       return this.makeRequest(
         action,
         `/pp/${this.proxyAPIVersion}/helm/releases/${action.endpointGuid}/${action.releaseTitle}`,
         (response) => {
           const processedData = {
-            entities: { [action.entityKey]: {} },
+            entities: { [entityKey]: {} },
             result: []
           } as NormalizedResponse;
 
@@ -169,7 +174,7 @@ export class HelmEffects {
             releaseTitle: action.releaseTitle,
             ...status
           };
-          processedData.entities[action.entityKey][action.key] = newStatus;
+          processedData.entities[entityKey][action.key] = newStatus;
           processedData.result.push(action.key);
           return processedData;
         }, [action.endpointGuid]);
@@ -199,7 +204,7 @@ export class HelmEffects {
       return this.httpClient.post(url, action.values).pipe(
         mergeMap(() => {
           return [
-            new ClearPaginationOfType(helmReleaseSchemaKey),
+            new ClearPaginationOfType(apiAction),
             new WrapperRequestActionSuccess(null, apiAction)
           ];
         }),
@@ -222,15 +227,16 @@ export class HelmEffects {
 
   private getHelmUpdateAction(guid: string, type: string, updatingKey: string) {
     return {
-      entityKey: helmReleaseSchemaKey,
+      endpointType: HELM_ENDPOINT_TYPE,
+      entityType: helmReleaseSchemaKey,
       guid,
       type,
       updatingKey,
-    } as IRequestAction;
+    } as EntityRequestAction;
   }
 
   private makeRequest(
-    action: IRequestAction,
+    action: EntityRequestAction,
     url: string,
     mapResult: (response: any) => NormalizedResponse,
     endpointIds: string[]
@@ -267,7 +273,7 @@ export class HelmEffects {
     }, {});
     const keys = Object.keys(pods);
     const releasePods = {
-      entities: { [releasePodsAction.entityKey]: pods },
+      entities: { [entityCatalogue.getEntityKey(releasePodsAction)]: pods },
       result: keys
     } as NormalizedResponse;
     this.store.dispatch(new WrapperRequestActionSuccess(
@@ -292,7 +298,7 @@ export class HelmEffects {
     }, {});
     const keys = Object.keys(services);
     const releaseServices = {
-      entities: { [releaseServiceAction.entityKey]: services },
+      entities: { [entityCatalogue.getEntityKey(releaseServiceAction)]: services },
       result: keys
     } as NormalizedResponse;
     this.store.dispatch(new WrapperRequestActionSuccess(
diff --git a/custom-src/frontend/app/custom/helm/store/helm.entities.ts b/custom-src/frontend/app/custom/helm/store/helm.entities.ts
deleted file mode 100644
index ed0e1e2640..0000000000
--- a/custom-src/frontend/app/custom/helm/store/helm.entities.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { ExtensionEntitySchema } from '../../../core/extension/extension-types';
-import {
-  HelmRelease,
-  HelmReleasePod,
-  HelmReleaseService,
-  HelmReleaseStatus,
-  HelmVersion,
-  MonocularChart,
-} from './helm.types';
-
-export const monocularChartsSchemaKey = 'monocularCharts';
-
-export const helmReleaseSchemaKey = 'helmReleases';
-export const helmVersionsSchemaKey = 'helmVersions';
-export const helmReleaseStatusSchemaKey = 'helmReleaseStatus';
-export const helmReleasePodKey = 'helmReleasePod';
-export const helmReleaseServiceKey = 'helmReleaseService';
-
-export const getMonocularChartId = (entity: MonocularChart) => entity.id;
-export const getHelmReleaseId = (entity: HelmRelease) => entity.endpointId;
-export const getHelmVersionId = (entity: HelmVersion) => entity.endpointId;
-export const getHelmReleaseStatusId = (entity: HelmReleaseStatus) => entity.endpointId;
-export const getHelmReleasePodId = (entity: HelmReleasePod) => entity.name;
-export const getHelmReleaseServiceId = (entity: HelmReleaseService) => entity.name;
-
-export const monocularEntities: ExtensionEntitySchema[] = [
-  {
-    entityKey: monocularChartsSchemaKey,
-    definition: {},
-    options: { idAttribute: getMonocularChartId }
-  },
-  {
-    entityKey: helmReleaseSchemaKey,
-    definition: {},
-    options: { idAttribute: getHelmReleaseId }
-  },
-  {
-    entityKey: helmVersionsSchemaKey,
-    definition: {},
-    options: { idAttribute: getHelmVersionId }
-  },
-  {
-    entityKey: helmReleaseStatusSchemaKey,
-    definition: {},
-    options: { idAttribute: getHelmReleaseStatusId }
-  },
-  {
-    entityKey: helmReleasePodKey,
-    definition: {},
-    options: { idAttribute: getHelmReleasePodId }
-  },
-  {
-    entityKey: helmReleaseServiceKey,
-    definition: {},
-    options: { idAttribute: getHelmReleaseServiceId }
-  }
-];
-
-export const monocularEntityKeys: string[] = [
-  monocularChartsSchemaKey,
-  helmReleaseSchemaKey,
-  helmVersionsSchemaKey,
-  helmReleaseStatusSchemaKey,
-  helmReleasePodKey,
-  helmReleaseServiceKey
-];
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
index 4de2c64feb..17bac1bca1 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
@@ -21,12 +21,6 @@ import { generateKubernetesEntities } from './kubernetes-entity-generator';
 import { KubernetesStoreModule } from './kubernetes.store.module';
 import { KubeHealthCheck } from './store/kubernetes.actions';
 
-// TODO: RC Remove
-// export interface IK8FavMetadata extends IFavoriteMetadata {
-//   guid: string;
-//   name: string;
-//   address: string;
-// }
 
 @NgModule({
   imports: [
diff --git a/src/frontend/packages/core/src/core/utils.service.ts b/src/frontend/packages/core/src/core/utils.service.ts
index 5a4d7aed51..dd0e5ed836 100644
--- a/src/frontend/packages/core/src/core/utils.service.ts
+++ b/src/frontend/packages/core/src/core/utils.service.ts
@@ -11,8 +11,6 @@ export function getIdFromRoute(activatedRoute: ActivatedRoute, id: string) {
   return null;
 }
 
-// TODO: RC Action builders
-
 export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 
 export const urlValidationExpression =

From 06492af1a4a609af841bd7015366ff707102920f Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 4 Oct 2019 14:41:09 +0100
Subject: [PATCH 120/648] One fix, multi load tidy up

---
 .../frontend/app/custom/custom.module.ts      | 18 +++++++++---
 .../app/custom/helm/helm-entity-generator.ts  |  5 +---
 .../app/custom/helm/helm.setup.module.ts      | 28 +++++++++++++------
 .../monocular-release-services-list-source.ts |  3 +-
 .../kubernetes/kubernetes-entity-generator.ts |  2 +-
 .../kubernetes/kubernetes.setup.module.ts     | 20 +++++++++----
 6 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/custom-src/frontend/app/custom/custom.module.ts b/custom-src/frontend/app/custom/custom.module.ts
index 4a767cfe6c..26e37acb63 100644
--- a/custom-src/frontend/app/custom/custom.module.ts
+++ b/custom-src/frontend/app/custom/custom.module.ts
@@ -12,8 +12,6 @@ import { SuseAboutInfoComponent } from './suse-about-info/suse-about-info.compon
 import { SuseLoginComponent } from './suse-login/suse-login.component';
 import { SuseWelcomeComponent } from './suse-welcome/suse-welcome.component';
 
-// import { HelmModule } from './helm/helm.module';
-// import { HelmSetupModule } from './helm/helm.setup.module';
 const SuseCustomizations: CustomizationsMetadata = {
   copyright: '&copy; 2019 SUSE',
   hasEula: true,
@@ -22,13 +20,24 @@ const SuseCustomizations: CustomizationsMetadata = {
   alwaysShowNavForEndpointTypes: (typ) => false,
 };
 
+// TODO: RC Multi load issue
+@NgModule({})
+export class MockModule {
+  constructor() {
+    console.log('WONT WORK');
+  }
+}
+
+let init = false;
+
 @NgModule({
   imports: [
     CoreModule,
     SharedModule,
     MDAppModule,
-    KubernetesSetupModule,
-    HelmSetupModule
+    // TODO: RC Multi load issue
+    init ? MockModule : KubernetesSetupModule,
+    init ? MockModule : HelmSetupModule,
   ],
   // FIXME: Ensure that anything lazy loaded/in kube endpoint pages is not included here - #3675
   declarations: [
@@ -52,6 +61,7 @@ export class CustomModule {
   static init = false;
 
   constructor(router: Router) {
+    init = true;
     // Only update the routes once
     if (!CustomModule.init) {
       // Override the component used for the login route
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 64b223a05f..6ce7b7560c 100644
--- a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
+++ b/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
@@ -24,10 +24,7 @@ import {
   MonocularChart,
 } from './store/helm.types';
 
-// TODO: RC hack
-/**
- * CustomImportModule brings in CustomModule. CustomModule brings in kube setup module. setup module brings this in multiple times
- */
+// TODO: RC Multi load issue
 let hack = false;
 
 export function generateHelmEntities(): StratosBaseCatalogueEntity[] {
diff --git a/custom-src/frontend/app/custom/helm/helm.setup.module.ts b/custom-src/frontend/app/custom/helm/helm.setup.module.ts
index 419d7be414..0f98cc1b62 100644
--- a/custom-src/frontend/app/custom/helm/helm.setup.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm.setup.module.ts
@@ -1,5 +1,5 @@
 import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
+import { NgModule, Optional, SkipSelf } from '@angular/core';
 import { Store } from '@ngrx/store';
 
 import { GetSystemInfo } from '../../../../store/src/actions/system.actions';
@@ -23,13 +23,23 @@ import { HelmStoreModule } from './helm.store.module';
   ]
 })
 export class HelmSetupModule {
-  constructor(endpointService: EndpointsService, store: Store<AppState>) {
-    endpointService.registerHealthCheck(
-      new EndpointHealthCheck(HELM_ENDPOINT_TYPE, (endpoint) => {
-        if (endpoint.endpoint_metadata && endpoint.endpoint_metadata.status === 'Synchronizing') {
-          store.dispatch(new GetSystemInfo());
-        }
-      })
-    );
+  constructor(
+    endpointService: EndpointsService,
+    store: Store<AppState>,
+    @Optional() @SkipSelf() parentModule: HelmSetupModule
+  ) {
+    // TODO: RC Multi load issue
+    if (parentModule) {
+      console.log('ALREADY IMPORTED, HELM HACK ACTIVATED');
+    } else {
+      endpointService.registerHealthCheck(
+        new EndpointHealthCheck(HELM_ENDPOINT_TYPE, (endpoint) => {
+          if (endpoint.endpoint_metadata && endpoint.endpoint_metadata.status === 'Synchronizing') {
+            store.dispatch(new GetSystemInfo());
+          }
+        })
+      );
+    }
+
   }
 }
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-source.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-source.ts
index 4bbd9490f1..5e76b11b8d 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-source.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-source.ts
@@ -8,6 +8,7 @@ import { getPaginationObservables } from '../../../../../store/src/reducers/pagi
 import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../shared/components/list/list.component.types';
 import { PaginationMonitor } from '../../../shared/monitors/pagination-monitor';
+import { kubernetesEntityFactory } from '../../kubernetes/kubernetes-entity-factory';
 import { KubeService } from '../../kubernetes/store/kube.types';
 import { GetKubernetesServicesInNamespace } from '../../kubernetes/store/kubernetes.actions';
 import { getHelmReleaseServiceId, helmEntityFactory } from '../helm-entity-factory';
@@ -18,7 +19,7 @@ export const fetchHelmReleaseServiceFromKubernetes = (store: Store<AppState>, he
   return fetchRelease(store, helmService.endpointId, helmService.releaseTitle).pipe(
     switchMap(release => {
       const action = new GetKubernetesServicesInNamespace(helmService.endpointId, release.namespace);
-      const paginationMonitor = new PaginationMonitor<KubeService>(store, action.paginationKey, helmEntityFactory(action.entityType));
+      const paginationMonitor = new PaginationMonitor<KubeService>(store, action.paginationKey, kubernetesEntityFactory(action.entityType));
       return getPaginationObservables<KubeService>({ store, action, paginationMonitor }).entities$;
     }),
     filter(entities => !!entities),
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 12ab32ccdf..e4edb4a91c 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
@@ -99,7 +99,7 @@ const kubeAuthTypeMap: { [type: string]: EndpointAuthTypeConfig } = {
   }
 };
 
-// TODO: RC hack
+// TODO: RC Multi load issue
 /**
  * CustomImportModule brings in CustomModule. CustomModule brings in kube setup module. setup module brings this in multiple times
  */
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
index 17bac1bca1..9156b6df13 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
@@ -1,5 +1,5 @@
 import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
+import { NgModule, Optional, SkipSelf } from '@angular/core';
 import { Store } from '@ngrx/store';
 
 import { AppState } from '../../../../store/src/app-state';
@@ -24,7 +24,6 @@ import { KubeHealthCheck } from './store/kubernetes.actions';
 
 @NgModule({
   imports: [
-    // TODO: RC Every time this is imported it's executed. See note & `hack` in `generateKubernetesEntities`
     EntityCatalogueModule.forFeature(generateKubernetesEntities),
     CoreModule,
     CommonModule,
@@ -45,9 +44,18 @@ import { KubeHealthCheck } from './store/kubernetes.actions';
   ]
 })
 export class KubernetesSetupModule {
-  constructor(endpointService: EndpointsService, store: Store<AppState>) {
-    endpointService.registerHealthCheck(
-      new EndpointHealthCheck(KUBERNETES_ENDPOINT_TYPE, (endpoint) => store.dispatch(new KubeHealthCheck(endpoint.guid)))
-    );
+  constructor(
+    endpointService: EndpointsService,
+    store: Store<AppState>,
+    @Optional() @SkipSelf() parentModule: KubernetesSetupModule
+  ) {
+    // TODO: RC Multi load issue
+    if (parentModule) {
+      console.log('ALREADY IMPORTED, KUBE HACK ACTIVATED');
+    } else {
+      endpointService.registerHealthCheck(
+        new EndpointHealthCheck(KUBERNETES_ENDPOINT_TYPE, (endpoint) => store.dispatch(new KubeHealthCheck(endpoint.guid)))
+      );
+    }
   }
 }

From bf88ef04b9616be41618e832b80c43764d9acf0d Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 4 Oct 2019 14:49:00 +0100
Subject: [PATCH 121/648] Lint, renamed schemeKeys

---
 .../create-release.component.ts               |   4 +-
 .../app/custom/helm/helm-entity-factory.ts    |  37 ++++---
 .../app/custom/helm/helm-entity-generator.ts  |  36 +++----
 .../monocular-charts-data-source.ts           |   4 +-
 .../monocular-releases-list-source.ts         |   4 +-
 .../tabs/helm-release-helper.service.ts       |   4 +-
 .../helm-release-summary-tab.component.ts     |   4 +-
 .../app/custom/helm/store/helm.actions.ts     |  36 +++----
 .../app/custom/helm/store/helm.effects.ts     |   4 +-
 .../kubernetes/kubernetes-entity-factory.ts   |  54 +++++-----
 .../kubernetes/kubernetes-entity-generator.ts |  48 ++++-----
 .../custom/kubernetes/kubernetes.module.ts    |   3 +-
 .../helm-release-pods-data-source.ts          |   4 +-
 .../kubernetes-apps-data-source.ts            |   6 +-
 .../kubernetes-namespace-pods-data-source.ts  |   4 +-
 .../kubernetes-namespaces-data-source.ts      |   6 +-
 .../kubernetes-node-pods-data-source.ts       |   4 +-
 .../kubernetes-nodes-data-source.ts           |   6 +-
 .../kubernetes-pods-data-source.ts            |   4 +-
 .../kubernetes-services-data-source.ts        |   4 +-
 .../services/kubernetes-endpoint.service.ts   |  16 +--
 .../kubernetes/store/kubernetes.actions.ts    | 102 +++++++++---------
 .../kubernetes/store/kubernetes.effects.ts    |  46 ++++----
 ...p-autoscaler-events-config.service.spec.ts |   4 +
 24 files changed, 224 insertions(+), 220 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 62f3a317ba..415e8b25a6 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
@@ -14,7 +14,7 @@ import { ConfirmationDialogConfig } from '../../../shared/components/confirmatio
 import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service';
 import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component';
 import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes/kubernetes-entity-factory';
-import { HELM_ENDPOINT_TYPE, helmReleaseSchemaKey } from '../helm-entity-factory';
+import { HELM_ENDPOINT_TYPE, helmReleaseEntityKey } from '../helm-entity-factory';
 import { HelmInstall } from '../store/helm.actions';
 import { HELM_INSTALLING_KEY, HelmInstallValues } from '../store/helm.types';
 
@@ -133,7 +133,7 @@ export class CreateReleaseComponent implements OnInit {
     const action = new HelmInstall(values);
     this.store.dispatch(action);
 
-    const releaseEntityConfig = entityCatalogue.getEntity(HELM_ENDPOINT_TYPE, helmReleaseSchemaKey);
+    const releaseEntityConfig = entityCatalogue.getEntity(HELM_ENDPOINT_TYPE, helmReleaseEntityKey);
 
     // Wait for result of request
     return of(true).pipe(
diff --git a/custom-src/frontend/app/custom/helm/helm-entity-factory.ts b/custom-src/frontend/app/custom/helm/helm-entity-factory.ts
index d09939d3be..6ac3ac46f4 100644
--- a/custom-src/frontend/app/custom/helm/helm-entity-factory.ts
+++ b/custom-src/frontend/app/custom/helm/helm-entity-factory.ts
@@ -10,14 +10,13 @@ import {
   MonocularChart,
 } from './store/helm.types';
 
-// TODO: SchemaKey names (and kube names)
-export const monocularChartsSchemaKey = 'monocularCharts';
+export const monocularChartsEntityType = 'monocularCharts';
 
-export const helmReleaseSchemaKey = 'helmReleases';
-export const helmVersionsSchemaKey = 'helmVersions';
-export const helmReleaseStatusSchemaKey = 'helmReleaseStatus';
-export const helmReleasePodKey = 'helmReleasePod';
-export const helmReleaseServiceKey = 'helmReleaseService';
+export const helmReleaseEntityKey = 'helmReleases';
+export const helmVersionsEntityType = 'helmVersions';
+export const helmReleaseStatusEntityType = 'helmReleaseStatus';
+export const helmReleasePodEntityType = 'helmReleasePod';
+export const helmReleaseServiceEntityType = 'helmReleaseService';
 
 export const getMonocularChartId = (entity: MonocularChart) => entity.id;
 export const getHelmReleaseId = (entity: HelmRelease) => entity.endpointId;
@@ -50,38 +49,38 @@ export class HelmEntitySchema extends EntitySchema {
   }
 }
 
-entityCache[monocularChartsSchemaKey] = new HelmEntitySchema(
-  monocularChartsSchemaKey,
+entityCache[monocularChartsEntityType] = new HelmEntitySchema(
+  monocularChartsEntityType,
   {},
   { idAttribute: getMonocularChartId }
 );
 
-entityCache[helmReleaseSchemaKey] = new HelmEntitySchema(
-  helmReleaseSchemaKey,
+entityCache[helmReleaseEntityKey] = new HelmEntitySchema(
+  helmReleaseEntityKey,
   {},
   { idAttribute: getHelmReleaseId }
 );
 
-entityCache[helmVersionsSchemaKey] = new HelmEntitySchema(
-  helmVersionsSchemaKey,
+entityCache[helmVersionsEntityType] = new HelmEntitySchema(
+  helmVersionsEntityType,
   {},
   { idAttribute: getHelmVersionId }
 );
 
-entityCache[helmReleaseStatusSchemaKey] = new HelmEntitySchema(
-  helmReleaseStatusSchemaKey,
+entityCache[helmReleaseStatusEntityType] = new HelmEntitySchema(
+  helmReleaseStatusEntityType,
   {},
   { idAttribute: getHelmReleaseStatusId }
 );
 
-entityCache[helmReleasePodKey] = new HelmEntitySchema(
-  helmReleasePodKey,
+entityCache[helmReleasePodEntityType] = new HelmEntitySchema(
+  helmReleasePodEntityType,
   {},
   { idAttribute: getHelmReleasePodId }
 );
 
-entityCache[helmReleaseServiceKey] = new HelmEntitySchema(
-  helmReleaseServiceKey,
+entityCache[helmReleaseServiceEntityType] = new HelmEntitySchema(
+  helmReleaseServiceEntityType,
   {},
   { idAttribute: getHelmReleaseServiceId }
 );
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 6ce7b7560c..6083680fdf 100644
--- a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
+++ b/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
@@ -8,12 +8,12 @@ import { StratosEndpointExtensionDefinition } from '../../core/entity-catalogue/
 import {
   HELM_ENDPOINT_TYPE,
   helmEntityFactory,
-  helmReleasePodKey,
-  helmReleaseSchemaKey,
-  helmReleaseServiceKey,
-  helmReleaseStatusSchemaKey,
-  helmVersionsSchemaKey,
-  monocularChartsSchemaKey,
+  helmReleaseEntityKey,
+  helmReleasePodEntityType,
+  helmReleaseServiceEntityType,
+  helmReleaseStatusEntityType,
+  helmVersionsEntityType,
+  monocularChartsEntityType,
 } from './helm-entity-factory';
 import {
   HelmRelease,
@@ -66,8 +66,8 @@ function generateEndpointEntity(endpointDefinition: StratosEndpointExtensionDefi
 
 function generateChartEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   const definition = {
-    type: monocularChartsSchemaKey,
-    schema: helmEntityFactory(monocularChartsSchemaKey),
+    type: monocularChartsEntityType,
+    schema: helmEntityFactory(monocularChartsEntityType),
     endpoint: endpointDefinition
   };
   return new StratosCatalogueEntity<IFavoriteMetadata, MonocularChart>(definition);
@@ -75,8 +75,8 @@ function generateChartEntity(endpointDefinition: StratosEndpointExtensionDefinit
 
 function generateReleaseEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   const definition = {
-    type: helmReleaseSchemaKey,
-    schema: helmEntityFactory(helmReleaseSchemaKey),
+    type: helmReleaseEntityKey,
+    schema: helmEntityFactory(helmReleaseEntityKey),
     endpoint: endpointDefinition
   };
   return new StratosCatalogueEntity<IFavoriteMetadata, HelmRelease>(definition);
@@ -84,8 +84,8 @@ function generateReleaseEntity(endpointDefinition: StratosEndpointExtensionDefin
 
 function generateVersionEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   const definition = {
-    type: helmVersionsSchemaKey,
-    schema: helmEntityFactory(helmVersionsSchemaKey),
+    type: helmVersionsEntityType,
+    schema: helmEntityFactory(helmVersionsEntityType),
     endpoint: endpointDefinition
   };
   return new StratosCatalogueEntity<IFavoriteMetadata, HelmVersion>(definition);
@@ -93,8 +93,8 @@ function generateVersionEntity(endpointDefinition: StratosEndpointExtensionDefin
 
 function generateReleaseStatusEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   const definition = {
-    type: helmReleaseStatusSchemaKey,
-    schema: helmEntityFactory(helmReleaseStatusSchemaKey),
+    type: helmReleaseStatusEntityType,
+    schema: helmEntityFactory(helmReleaseStatusEntityType),
     endpoint: endpointDefinition
   };
   return new StratosCatalogueEntity<IFavoriteMetadata, HelmReleaseStatus>(definition);
@@ -102,8 +102,8 @@ function generateReleaseStatusEntity(endpointDefinition: StratosEndpointExtensio
 
 function generateReleasePodEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   const definition = {
-    type: helmReleasePodKey,
-    schema: helmEntityFactory(helmReleasePodKey),
+    type: helmReleasePodEntityType,
+    schema: helmEntityFactory(helmReleasePodEntityType),
     endpoint: endpointDefinition
   };
   return new StratosCatalogueEntity<IFavoriteMetadata, HelmReleasePod>(definition);
@@ -111,8 +111,8 @@ function generateReleasePodEntity(endpointDefinition: StratosEndpointExtensionDe
 
 function generateReleaseServiceEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   const definition = {
-    type: helmReleaseServiceKey,
-    schema: helmEntityFactory(helmReleaseServiceKey),
+    type: helmReleaseServiceEntityType,
+    schema: helmEntityFactory(helmReleaseServiceEntityType),
     endpoint: endpointDefinition
   };
   return new StratosCatalogueEntity<IFavoriteMetadata, HelmReleaseService>(definition);
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts
index 755a62a8b4..2a1c005854 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts
@@ -4,7 +4,7 @@ import { PaginationEntityState } from '../../../../../store/src//types/paginatio
 import { AppState } from '../../../../../store/src/app-state';
 import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../shared/components/list/list.component.types';
-import { getMonocularChartId, helmEntityFactory, monocularChartsSchemaKey } from '../helm-entity-factory';
+import { getMonocularChartId, helmEntityFactory, monocularChartsEntityType } from '../helm-entity-factory';
 import { GetMonocularCharts } from '../store/helm.actions';
 import { MonocularChart } from '../store/helm.types';
 
@@ -18,7 +18,7 @@ export class MonocularChartsDataSource extends ListDataSource<MonocularChart> {
     super({
       store,
       action,
-      schema: helmEntityFactory(monocularChartsSchemaKey),
+      schema: helmEntityFactory(monocularChartsEntityType),
       getRowUniqueId: getMonocularChartId,
       paginationKey: action.paginationKey,
       isLocal: true,
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-source.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-source.ts
index 96678ab51c..f5b362fbd3 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-source.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-source.ts
@@ -3,7 +3,7 @@ import { Store } from '@ngrx/store';
 import { AppState } from '../../../../../store/src/app-state';
 import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../shared/components/list/list.component.types';
-import { getHelmReleaseId, helmEntityFactory, helmReleaseSchemaKey } from '../helm-entity-factory';
+import { getHelmReleaseId, helmEntityFactory, helmReleaseEntityKey } from '../helm-entity-factory';
 import { GetHelmReleases } from '../store/helm.actions';
 import { HelmRelease } from '../store/helm.types';
 
@@ -17,7 +17,7 @@ export class HelmReleasesDataSource extends ListDataSource<HelmRelease> {
     super({
       store,
       action,
-      schema: helmEntityFactory(helmReleaseSchemaKey),
+      schema: helmEntityFactory(helmReleaseEntityKey),
       getRowUniqueId: getHelmReleaseId,
       paginationKey: action.paginationKey,
       isLocal: true,
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
index 64583d33f7..320d4495d5 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
@@ -5,7 +5,7 @@ import { map } from 'rxjs/operators';
 
 import { EntityServiceFactory } from '../../../../core/entity-service-factory.service';
 import { PaginationMonitor } from '../../../../shared/monitors/pagination-monitor';
-import { helmEntityFactory, helmReleaseSchemaKey } from '../../helm-entity-factory';
+import { helmEntityFactory, helmReleaseEntityKey } from '../../helm-entity-factory';
 import { GetHelmReleases, GetHelmReleaseStatus } from '../../store/helm.actions';
 import { HelmRelease, HelmReleaseGuid, HelmReleaseStatus } from '../../store/helm.types';
 import { AppState } from './../../../../../../store/src/app-state';
@@ -34,7 +34,7 @@ export class HelmReleaseHelperService {
     this.endpointGuid = this.guid.split(':')[0];
 
     const action = new GetHelmReleases();
-    const paginationMonitor = new PaginationMonitor(store, action.paginationKey, helmEntityFactory(helmReleaseSchemaKey));
+    const paginationMonitor = new PaginationMonitor(store, action.paginationKey, helmEntityFactory(helmReleaseEntityKey));
     const svc = getPaginationObservables({ store, action, paginationMonitor });
     this.isFetching$ = svc.fetchingEntities$;
 
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index 3630480fb0..d4820f671a 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -12,7 +12,7 @@ import { entityCatalogue } from '../../../../../core/entity-catalogue/entity-cat
 import { LoggerService } from '../../../../../core/logger.service';
 import { ConfirmationDialogConfig } from '../../../../../shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../../shared/components/confirmation-dialog.service';
-import { HELM_ENDPOINT_TYPE, helmReleaseSchemaKey } from '../../../helm-entity-factory';
+import { HELM_ENDPOINT_TYPE, helmReleaseEntityKey } from '../../../helm-entity-factory';
 import { HelmReleaseHelperService } from '../helm-release-helper.service';
 
 @Component({
@@ -123,7 +123,7 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
           this.logService.error('Failed to delete release: ', err);
         },
         complete: () => {
-          const releaseEntityConfig = entityCatalogue.getEntity(HELM_ENDPOINT_TYPE, helmReleaseSchemaKey);
+          const releaseEntityConfig = entityCatalogue.getEntity(HELM_ENDPOINT_TYPE, helmReleaseEntityKey);
           this.store.dispatch(new ClearPaginationOfType(releaseEntityConfig));
           this.completeDelete();
           this.store.dispatch(new RouterNav({ path: ['monocular/releases'] }));
diff --git a/custom-src/frontend/app/custom/helm/store/helm.actions.ts b/custom-src/frontend/app/custom/helm/store/helm.actions.ts
index 012bce8cc6..b7c950b02e 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.actions.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.actions.ts
@@ -4,12 +4,12 @@ import { EntityRequestAction } from '../../../../../store/src/types/request.type
 import {
   HELM_ENDPOINT_TYPE,
   helmEntityFactory,
-  helmReleasePodKey,
-  helmReleaseSchemaKey,
-  helmReleaseServiceKey,
-  helmReleaseStatusSchemaKey,
-  helmVersionsSchemaKey,
-  monocularChartsSchemaKey,
+  helmReleaseEntityKey,
+  helmReleasePodEntityType,
+  helmReleaseServiceEntityType,
+  helmReleaseStatusEntityType,
+  helmVersionsEntityType,
+  monocularChartsEntityType,
 } from '../helm-entity-factory';
 import { PaginatedAction } from './../../../../../store/src/types/pagination.types';
 import { HelmInstallValues } from './helm.types';
@@ -50,8 +50,8 @@ export class GetMonocularCharts implements MonocularPaginationAction {
   }
   type = GET_MONOCULAR_CHARTS;
   endpointType = HELM_ENDPOINT_TYPE;
-  entityType = monocularChartsSchemaKey;
-  entity = [helmEntityFactory(monocularChartsSchemaKey)];
+  entityType = monocularChartsEntityType;
+  entity = [helmEntityFactory(monocularChartsEntityType)];
   actions = [
     GET_MONOCULAR_CHARTS,
     GET_MONOCULAR_CHARTS_SUCCESS,
@@ -71,8 +71,8 @@ export class GetHelmReleases implements MonocularPaginationAction {
   }
   type = GET_HELM_RELEASES;
   endpointType = HELM_ENDPOINT_TYPE;
-  entityType = helmReleaseSchemaKey;
-  entity = [helmEntityFactory(helmReleaseSchemaKey)];
+  entityType = helmReleaseEntityKey;
+  entity = [helmEntityFactory(helmReleaseEntityKey)];
   actions = [
     GET_HELM_RELEASES,
     GET_HELM_RELEASES_SUCCESS,
@@ -91,8 +91,8 @@ export class GetHelmVersions implements MonocularPaginationAction {
   }
   type = GET_HELM_VERSIONS;
   endpointType = HELM_ENDPOINT_TYPE;
-  entityType = helmVersionsSchemaKey;
-  entity = [helmEntityFactory(helmVersionsSchemaKey)];
+  entityType = helmVersionsEntityType;
+  entity = [helmEntityFactory(helmVersionsEntityType)];
   actions = [
     GET_HELM_VERSIONS,
     GET_HELM_VERSIONS_SUCCESS,
@@ -115,8 +115,8 @@ export class GetHelmReleaseStatus implements EntityRequestAction {
   }
   type = GET_HELM_RELEASE_STATUS;
   endpointType = HELM_ENDPOINT_TYPE;
-  entity = helmEntityFactory(helmReleaseStatusSchemaKey);
-  entityType = helmReleaseStatusSchemaKey;
+  entity = helmEntityFactory(helmReleaseStatusEntityType);
+  entityType = helmReleaseStatusEntityType;
   actions = [
     GET_HELM_RELEASE_STATUS,
     GET_HELM_RELEASE_STATUS_SUCCESS,
@@ -133,8 +133,8 @@ export class GetHelmReleasePods implements MonocularPaginationAction {
   }
   type = GET_HELM_RELEASE_PODS;
   endpointType = HELM_ENDPOINT_TYPE;
-  entityType = helmReleasePodKey;
-  entity = [helmEntityFactory(helmReleasePodKey)];
+  entityType = helmReleasePodEntityType;
+  entity = [helmEntityFactory(helmReleasePodEntityType)];
   actions = [
     GET_HELM_RELEASE_PODS,
     GET_HELM_RELEASE_PODS_SUCCESS,
@@ -159,8 +159,8 @@ export class GetHelmReleaseServices implements MonocularPaginationAction {
   }
   type = GET_HELM_RELEASE_SERVICES;
   endpointType = HELM_ENDPOINT_TYPE;
-  entityType = helmReleaseServiceKey;
-  entity = [helmEntityFactory(helmReleaseServiceKey)];
+  entityType = helmReleaseServiceEntityType;
+  entity = [helmEntityFactory(helmReleaseServiceEntityType)];
   actions = [
     GET_HELM_RELEASE_SERVICES,
     GET_HELM_RELEASE_SERVICES_SUCCESS,
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 9f3e5a00d6..017506db62 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.effects.ts
@@ -16,7 +16,7 @@ import {
 } from '../../../../../store/src/types/request.types';
 import { entityCatalogue } from '../../../core/entity-catalogue/entity-catalogue.service';
 import { environment } from '../../../environments/environment';
-import { HELM_ENDPOINT_TYPE, helmReleaseSchemaKey } from '../helm-entity-factory';
+import { HELM_ENDPOINT_TYPE, helmReleaseEntityKey } from '../helm-entity-factory';
 import { parseHelmReleaseStatus } from '../release/tabs/helm-release-helper.service';
 import {
   GET_HELM_RELEASE_PODS,
@@ -228,7 +228,7 @@ export class HelmEffects {
   private getHelmUpdateAction(guid: string, type: string, updatingKey: string) {
     return {
       endpointType: HELM_ENDPOINT_TYPE,
-      entityType: helmReleaseSchemaKey,
+      entityType: helmReleaseEntityKey,
       guid,
       type,
       updatingKey,
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 7a86e60ee7..5c12dfcdbb 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts
@@ -6,15 +6,15 @@ import { EntitySchema } from '../../../../store/src/helpers/entity-schema';
 import { getKubeAPIResourceGuid } from './store/kube.selectors';
 import { KubernetesApp } from './store/kube.types';
 
-export const kubernetesSchemaKey = 'kubernetesInfo';
-export const kubernetesNodesSchemaKey = 'kubernetesNode';
-export const kubernetesPodsSchemaKey = 'kubernetesPod';
-export const kubernetesNamespacesSchemaKey = 'kubernetesNamespace';
-export const kubernetesServicesSchemaKey = 'kubernetesService';
-export const kubernetesStatefulSetsSchemaKey = 'kubernetesStatefulSet';
-export const kubernetesDeploymentsSchemaKey = 'kubernetesDeployment';
-export const kubernetesAppsSchemaKey = 'kubernetesApp';
-export const kubernetesDashboardSchemaKey = 'kubernetesDashboard';
+export const kubernetesEntityType = 'kubernetesInfo';
+export const kubernetesNodesEntityType = 'kubernetesNode';
+export const kubernetesPodsEntityType = 'kubernetesPod';
+export const kubernetesNamespacesEntityType = 'kubernetesNamespace';
+export const kubernetesServicesEntityType = 'kubernetesService';
+export const kubernetesStatefulSetsEntityType = 'kubernetesStatefulSet';
+export const kubernetesDeploymentsEntityType = 'kubernetesDeployment';
+export const kubernetesAppsEntityType = 'kubernetesApp';
+export const kubernetesDashboardEntityType = 'kubernetesDashboard';
 
 export const getKubeAppId = (object: KubernetesApp) => object.name;
 
@@ -43,56 +43,56 @@ export class KubernetesEntitySchema extends EntitySchema {
 }
 
 
-entityCache[kubernetesSchemaKey] = new KubernetesEntitySchema(
-  kubernetesSchemaKey,
+entityCache[kubernetesEntityType] = new KubernetesEntitySchema(
+  kubernetesEntityType,
   {},
   { idAttribute: getAPIResourceGuid }
 );
 
-entityCache[kubernetesAppsSchemaKey] = new KubernetesEntitySchema(
-  kubernetesAppsSchemaKey,
+entityCache[kubernetesAppsEntityType] = new KubernetesEntitySchema(
+  kubernetesAppsEntityType,
   {},
   { idAttribute: getKubeAppId }
 );
 
-entityCache[kubernetesStatefulSetsSchemaKey] = new KubernetesEntitySchema(
-  kubernetesStatefulSetsSchemaKey,
+entityCache[kubernetesStatefulSetsEntityType] = new KubernetesEntitySchema(
+  kubernetesStatefulSetsEntityType,
   {},
   { idAttribute: getKubeAPIResourceGuid }
 );
 
-entityCache[kubernetesPodsSchemaKey] = new KubernetesEntitySchema(
-  kubernetesPodsSchemaKey,
+entityCache[kubernetesPodsEntityType] = new KubernetesEntitySchema(
+  kubernetesPodsEntityType,
   {},
   { idAttribute: getKubeAPIResourceGuid }
 );
 
-entityCache[kubernetesDeploymentsSchemaKey] = new KubernetesEntitySchema(
-  kubernetesDeploymentsSchemaKey,
+entityCache[kubernetesDeploymentsEntityType] = new KubernetesEntitySchema(
+  kubernetesDeploymentsEntityType,
   {},
   { idAttribute: getKubeAPIResourceGuid }
 );
 
-entityCache[kubernetesNodesSchemaKey] = new KubernetesEntitySchema(
-  kubernetesNodesSchemaKey,
+entityCache[kubernetesNodesEntityType] = new KubernetesEntitySchema(
+  kubernetesNodesEntityType,
   {},
   { idAttribute: getKubeAPIResourceGuid }
 );
 
-entityCache[kubernetesNamespacesSchemaKey] = new KubernetesEntitySchema(
-  kubernetesNamespacesSchemaKey,
+entityCache[kubernetesNamespacesEntityType] = new KubernetesEntitySchema(
+  kubernetesNamespacesEntityType,
   {},
   { idAttribute: getKubeAPIResourceGuid }
 );
 
-entityCache[kubernetesServicesSchemaKey] = new KubernetesEntitySchema(
-  kubernetesServicesSchemaKey,
+entityCache[kubernetesServicesEntityType] = new KubernetesEntitySchema(
+  kubernetesServicesEntityType,
   {},
   { idAttribute: getKubeAPIResourceGuid }
 );
 
-entityCache[kubernetesDashboardSchemaKey] = new KubernetesEntitySchema(
-  kubernetesDashboardSchemaKey,
+entityCache[kubernetesDashboardEntityType] = new KubernetesEntitySchema(
+  kubernetesDashboardEntityType,
   {},
   { idAttribute: getKubeAPIResourceGuid }
 );
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 e4edb4a91c..53320f759d 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
@@ -19,15 +19,15 @@ import {
 import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component';
 import {
   KUBERNETES_ENDPOINT_TYPE,
-  kubernetesAppsSchemaKey,
-  kubernetesDashboardSchemaKey,
-  kubernetesDeploymentsSchemaKey,
+  kubernetesAppsEntityType,
+  kubernetesDashboardEntityType,
+  kubernetesDeploymentsEntityType,
   kubernetesEntityFactory,
-  kubernetesNamespacesSchemaKey,
-  kubernetesNodesSchemaKey,
-  kubernetesPodsSchemaKey,
-  kubernetesServicesSchemaKey,
-  kubernetesStatefulSetsSchemaKey,
+  kubernetesNamespacesEntityType,
+  kubernetesNodesEntityType,
+  kubernetesPodsEntityType,
+  kubernetesServicesEntityType,
+  kubernetesStatefulSetsEntityType,
 } from './kubernetes-entity-factory';
 import {
   KubernetesApp,
@@ -166,8 +166,8 @@ function generateEndpointEntity(endpointDefinition: StratosEndpointExtensionDefi
 
 function generateAppEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   const definition = {
-    type: kubernetesAppsSchemaKey,
-    schema: kubernetesEntityFactory(kubernetesAppsSchemaKey),
+    type: kubernetesAppsEntityType,
+    schema: kubernetesEntityFactory(kubernetesAppsEntityType),
     endpoint: endpointDefinition
   };
   return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesApp>(definition);
@@ -175,8 +175,8 @@ function generateAppEntity(endpointDefinition: StratosEndpointExtensionDefinitio
 
 function generateStatefulSetsEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   const definition = {
-    type: kubernetesStatefulSetsSchemaKey,
-    schema: kubernetesEntityFactory(kubernetesStatefulSetsSchemaKey),
+    type: kubernetesStatefulSetsEntityType,
+    schema: kubernetesEntityFactory(kubernetesStatefulSetsEntityType),
     endpoint: endpointDefinition
   };
   return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesStatefulSet>(definition);
@@ -184,8 +184,8 @@ function generateStatefulSetsEntity(endpointDefinition: StratosEndpointExtension
 
 function generatePodsEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   const definition = {
-    type: kubernetesPodsSchemaKey,
-    schema: kubernetesEntityFactory(kubernetesPodsSchemaKey),
+    type: kubernetesPodsEntityType,
+    schema: kubernetesEntityFactory(kubernetesPodsEntityType),
     endpoint: endpointDefinition
   };
   return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesPod>(definition);
@@ -193,8 +193,8 @@ function generatePodsEntity(endpointDefinition: StratosEndpointExtensionDefiniti
 
 function generateDeploymentsEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   const definition = {
-    type: kubernetesDeploymentsSchemaKey,
-    schema: kubernetesEntityFactory(kubernetesDeploymentsSchemaKey),
+    type: kubernetesDeploymentsEntityType,
+    schema: kubernetesEntityFactory(kubernetesDeploymentsEntityType),
     endpoint: endpointDefinition
   };
   return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesDeployment>(definition);
@@ -202,8 +202,8 @@ function generateDeploymentsEntity(endpointDefinition: StratosEndpointExtensionD
 
 function generateNodesEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   const definition = {
-    type: kubernetesNodesSchemaKey,
-    schema: kubernetesEntityFactory(kubernetesNodesSchemaKey),
+    type: kubernetesNodesEntityType,
+    schema: kubernetesEntityFactory(kubernetesNodesEntityType),
     endpoint: endpointDefinition
   };
   return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesNode>(definition);
@@ -211,8 +211,8 @@ function generateNodesEntity(endpointDefinition: StratosEndpointExtensionDefinit
 
 function generateNamespacesEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   const definition = {
-    type: kubernetesNamespacesSchemaKey,
-    schema: kubernetesEntityFactory(kubernetesNamespacesSchemaKey),
+    type: kubernetesNamespacesEntityType,
+    schema: kubernetesEntityFactory(kubernetesNamespacesEntityType),
     endpoint: endpointDefinition
   };
   return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesNamespace>(definition);
@@ -220,8 +220,8 @@ function generateNamespacesEntity(endpointDefinition: StratosEndpointExtensionDe
 
 function generateServicesEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   const definition = {
-    type: kubernetesServicesSchemaKey,
-    schema: kubernetesEntityFactory(kubernetesServicesSchemaKey),
+    type: kubernetesServicesEntityType,
+    schema: kubernetesEntityFactory(kubernetesServicesEntityType),
     endpoint: endpointDefinition
   };
   return new StratosCatalogueEntity<IFavoriteMetadata, KubeService>(definition);
@@ -229,8 +229,8 @@ function generateServicesEntity(endpointDefinition: StratosEndpointExtensionDefi
 
 function generateDashboardEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   const definition = {
-    type: kubernetesDashboardSchemaKey,
-    schema: kubernetesEntityFactory(kubernetesDashboardSchemaKey),
+    type: kubernetesDashboardEntityType,
+    schema: kubernetesEntityFactory(kubernetesDashboardEntityType),
     endpoint: endpointDefinition
   };
   return new StratosCatalogueEntity<IFavoriteMetadata>(definition);
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
index 21142826d8..6cf7f688ec 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
@@ -1,3 +1,4 @@
+/* tslint:disable:max-line-length */
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
@@ -89,9 +90,9 @@ import { KubernetesNodesTabComponent } from './tabs/kubernetes-nodes-tab/kuberne
 import { KubernetesPodsTabComponent } from './tabs/kubernetes-pods-tab/kubernetes-pods-tab.component';
 import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kubernetes-summary.component';
 
-/* tslint:disable:max-line-length */
 
 /* tslint:enable */
+
 @NgModule({
   imports: [
     CoreModule,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts
index d90b90a001..79bdc9c2cd 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts
@@ -3,7 +3,7 @@ import { Store } from '@ngrx/store';
 import { AppState } from '../../../../../../store/src/app-state';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { kubernetesEntityFactory, kubernetesPodsSchemaKey } from '../../kubernetes-entity-factory';
+import { kubernetesEntityFactory, kubernetesPodsEntityType } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { HelmReleaseService } from '../../services/helm-release.service';
 import { KubernetesPod } from '../../store/kube.types';
@@ -23,7 +23,7 @@ export class KubernetesReleasePodsDataSource extends ListDataSource<KubernetesPo
     super({
       store,
       action,
-      schema: kubernetesEntityFactory(kubernetesPodsSchemaKey),
+      schema: kubernetesEntityFactory(kubernetesPodsEntityType),
       getRowUniqueId: a => a.name,
       // getRowUniqueId: getHelmReleaseServiceId,  //TODO: RC
       paginationKey: action.paginationKey,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-data-source.ts
index fcf829d38f..c461e7e100 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-data-source.ts
@@ -4,7 +4,7 @@ import { getPaginationKey } from '../../../../../../store/src/actions/pagination
 import { AppState } from '../../../../../../store/src/app-state';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { getKubeAppId, kubernetesAppsSchemaKey, kubernetesEntityFactory } from '../../kubernetes-entity-factory';
+import { getKubeAppId, kubernetesAppsEntityType, kubernetesEntityFactory } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesApp } from '../../store/kube.types';
 import { GetKubernetesApps } from '../../store/kubernetes.actions';
@@ -20,9 +20,9 @@ export class KubernetesAppsDataSource extends ListDataSource<KubernetesApp> {
     super({
       store,
       action: new GetKubernetesApps(kubeGuid.guid),
-      schema: kubernetesEntityFactory(kubernetesAppsSchemaKey),
+      schema: kubernetesEntityFactory(kubernetesAppsEntityType),
       getRowUniqueId: getKubeAppId,
-      paginationKey: getPaginationKey(kubernetesAppsSchemaKey, kubeGuid.guid),
+      paginationKey: getPaginationKey(kubernetesAppsEntityType, kubeGuid.guid),
       isLocal: true,
       listConfig,
       transformEntities: [{ type: 'filter', field: 'name' }]
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
index e145a3f7be..aef7b05503 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
@@ -3,7 +3,7 @@ import { Store } from '@ngrx/store';
 import { AppState } from '../../../../../../store/src/app-state';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { kubernetesEntityFactory, kubernetesPodsSchemaKey } from '../../kubernetes-entity-factory';
+import { kubernetesEntityFactory, kubernetesPodsEntityType } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesNamespaceService } from '../../services/kubernetes-namespace.service';
 import { KubernetesPod } from '../../store/kube.types';
@@ -21,7 +21,7 @@ export class KubernetesNamespacePodsDataSource extends ListDataSource<Kubernetes
     super({
       store,
       action,
-      schema: kubernetesEntityFactory(kubernetesPodsSchemaKey),
+      schema: kubernetesEntityFactory(kubernetesPodsEntityType),
       getRowUniqueId: (object: KubernetesPod) => object.metadata.name,
       paginationKey: action.paginationKey,
       isLocal: true,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
index e18d2ad5f6..d1fd2cc6e3 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
@@ -4,7 +4,7 @@ import { getPaginationKey } from '../../../../../../store/src/actions/pagination
 import { AppState } from '../../../../../../store/src/app-state';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { kubernetesEntityFactory, kubernetesNamespacesSchemaKey } from '../../kubernetes-entity-factory';
+import { kubernetesEntityFactory, kubernetesNamespacesEntityType } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { KubernetesNamespace } from '../../store/kube.types';
@@ -21,9 +21,9 @@ export class KubernetesNamespacesDataSource extends ListDataSource<KubernetesNam
     super({
       store,
       action: new GetKubernetesNamespaces(kubeGuid.guid),
-      schema: kubernetesEntityFactory(kubernetesNamespacesSchemaKey),
+      schema: kubernetesEntityFactory(kubernetesNamespacesEntityType),
       getRowUniqueId: getKubeAPIResourceGuid,
-      paginationKey: getPaginationKey(kubernetesNamespacesSchemaKey, kubeGuid.guid),
+      paginationKey: getPaginationKey(kubernetesNamespacesEntityType, kubeGuid.guid),
       isLocal: true,
       listConfig,
       transformEntities: [{ type: 'filter', field: 'metadata.name' }]
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
index 6c8769c088..a2c59454dd 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
@@ -3,7 +3,7 @@ import { Store } from '@ngrx/store';
 import { AppState } from '../../../../../../store/src/app-state';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { kubernetesEntityFactory, kubernetesPodsSchemaKey } from '../../kubernetes-entity-factory';
+import { kubernetesEntityFactory, kubernetesPodsEntityType } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesNodeService } from '../../services/kubernetes-node.service';
 import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
@@ -22,7 +22,7 @@ export class KubernetesNodePodsDataSource extends ListDataSource<KubernetesPod>
     super({
       store,
       action,
-      schema: kubernetesEntityFactory(kubernetesPodsSchemaKey),
+      schema: kubernetesEntityFactory(kubernetesPodsEntityType),
       getRowUniqueId: getKubeAPIResourceGuid,
       paginationKey: action.paginationKey,
       isLocal: true,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
index 933cbf771f..7003ddece6 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
@@ -4,7 +4,7 @@ import { getPaginationKey } from '../../../../../../store/src/actions/pagination
 import { AppState } from '../../../../../../store/src/app-state';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { kubernetesEntityFactory, kubernetesNodesSchemaKey } from '../../kubernetes-entity-factory';
+import { kubernetesEntityFactory, kubernetesNodesEntityType } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { KubernetesNode } from '../../store/kube.types';
@@ -20,9 +20,9 @@ export class KubernetesNodesDataSource extends ListDataSource<KubernetesNode> {
     super({
       store,
       action: new GetKubernetesNodes(kubeGuid.guid),
-      schema: kubernetesEntityFactory(kubernetesNodesSchemaKey),
+      schema: kubernetesEntityFactory(kubernetesNodesEntityType),
       getRowUniqueId: getKubeAPIResourceGuid,
-      paginationKey: getPaginationKey(kubernetesNodesSchemaKey, kubeGuid.guid),
+      paginationKey: getPaginationKey(kubernetesNodesEntityType, kubeGuid.guid),
       isLocal: true,
       listConfig,
       transformEntities: [{ type: 'filter', field: 'metadata.name' }]
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
index b363035f41..cd608a2569 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
@@ -3,7 +3,7 @@ import { Store } from '@ngrx/store';
 import { AppState } from '../../../../../../store/src/app-state';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { kubernetesEntityFactory, kubernetesPodsSchemaKey } from '../../kubernetes-entity-factory';
+import { kubernetesEntityFactory, kubernetesPodsEntityType } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { KubernetesPod } from '../../store/kube.types';
@@ -20,7 +20,7 @@ export class KubernetesPodsDataSource extends ListDataSource<KubernetesPod> {
     super({
       store,
       action,
-      schema: kubernetesEntityFactory(kubernetesPodsSchemaKey),
+      schema: kubernetesEntityFactory(kubernetesPodsEntityType),
       getRowUniqueId: getKubeAPIResourceGuid,
       paginationKey: action.paginationKey,
       isLocal: true,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services-data-source.ts
index 98861fcc2e..f5628fbfd9 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services-data-source.ts
@@ -5,7 +5,7 @@ import { AppState } from '../../../../../store/src/app-state';
 import { PaginatedAction } from '../../../../../store/src/types/pagination.types';
 import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../shared/components/list/list.component.types';
-import { kubernetesEntityFactory, kubernetesServicesSchemaKey } from '../kubernetes-entity-factory';
+import { kubernetesEntityFactory, kubernetesServicesEntityType } from '../kubernetes-entity-factory';
 import { getKubeAPIResourceGuid } from '../store/kube.selectors';
 import { KubeService } from '../store/kube.types';
 
@@ -20,7 +20,7 @@ export class BaseKubernetesServicesDataSource extends ListDataSource<KubeService
     super({
       store,
       action,
-      schema: kubernetesEntityFactory(kubernetesServicesSchemaKey),
+      schema: kubernetesEntityFactory(kubernetesServicesEntityType),
       getRowUniqueId: getKubeAPIResourceGuid,
       paginationKey: action.paginationKey,
       transformEntity,
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
index a799687219..9816a4bbea 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
@@ -12,10 +12,10 @@ import { EntityService } from '../../../core/entity-service';
 import { EntityServiceFactory } from '../../../core/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory';
 import {
-  kubernetesDeploymentsSchemaKey,
-  kubernetesPodsSchemaKey,
-  kubernetesServicesSchemaKey,
-  kubernetesStatefulSetsSchemaKey,
+  kubernetesDeploymentsEntityType,
+  kubernetesPodsEntityType,
+  kubernetesServicesEntityType,
+  kubernetesStatefulSetsEntityType,
 } from '../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../kubernetes-page.types';
 import { KubernetesDeployment, KubernetesPod, KubernetesStatefulSet, KubeService } from '../store/kube.types';
@@ -70,22 +70,22 @@ export class KubernetesEndpointService {
 
     this.deployments$ = this.getObservable<KubernetesDeployment>(
       new GeKubernetesDeployments(this.kubeGuid),
-      kubernetesDeploymentsSchemaKey
+      kubernetesDeploymentsEntityType
     );
 
     this.pods$ = this.getObservable<KubernetesPod>(
       new GetKubernetesPods(this.kubeGuid),
-      kubernetesPodsSchemaKey
+      kubernetesPodsEntityType
     );
 
     this.statefulSets$ = this.getObservable<KubernetesStatefulSet>(
       new GetKubernetesStatefulSets(this.kubeGuid),
-      kubernetesStatefulSetsSchemaKey
+      kubernetesStatefulSetsEntityType
     );
 
     this.services$ = this.getObservable<KubeService>(
       new GetKubernetesServices(this.kubeGuid),
-      kubernetesServicesSchemaKey
+      kubernetesServicesEntityType
     );
 
     const kubeDashboardEnabled$ = this.store.select('auth').pipe(
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 cf32883bdd..00bcb6e3dc 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
@@ -6,15 +6,15 @@ import { PaginatedAction, PaginationParam } from '../../../../../store/src/types
 import { EntityRequestAction } from '../../../../../store/src/types/request.types';
 import {
   KUBERNETES_ENDPOINT_TYPE,
-  kubernetesAppsSchemaKey,
-  kubernetesDashboardSchemaKey,
-  kubernetesDeploymentsSchemaKey,
+  kubernetesAppsEntityType,
+  kubernetesDashboardEntityType,
+  kubernetesDeploymentsEntityType,
   kubernetesEntityFactory,
-  kubernetesNamespacesSchemaKey,
-  kubernetesNodesSchemaKey,
-  kubernetesPodsSchemaKey,
-  kubernetesServicesSchemaKey,
-  kubernetesStatefulSetsSchemaKey,
+  kubernetesNamespacesEntityType,
+  kubernetesNodesEntityType,
+  kubernetesPodsEntityType,
+  kubernetesServicesEntityType,
+  kubernetesStatefulSetsEntityType,
 } from '../kubernetes-entity-factory';
 
 export const GET_RELEASE_POD_INFO = '[KUBERNETES Endpoint] Get Release Pods Info';
@@ -91,7 +91,7 @@ export interface KubePaginationAction extends PaginatedAction, KubeAction { }
 export class GetKubernetesReleasePods implements KubePaginationAction {
 
   constructor(public kubeGuid: string, releaseName: string) {
-    this.paginationKey = getPaginationKey(kubernetesPodsSchemaKey, `release-${releaseName}`, kubeGuid);
+    this.paginationKey = getPaginationKey(kubernetesPodsEntityType, `release-${releaseName}`, kubeGuid);
     this.initialParams = {
       labelSelector: `app.kubernetes.io/instance=${releaseName}`,
       ...sortPodsByName
@@ -99,9 +99,9 @@ export class GetKubernetesReleasePods implements KubePaginationAction {
   }
   initialParams: PaginationParam;
   type = GET_RELEASE_POD_INFO;
-  entityType = kubernetesPodsSchemaKey;
+  entityType = kubernetesPodsEntityType;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesPodsSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesPodsEntityType)];
   params: { labelSelector: string; };
   actions = [
     GET_RELEASE_POD_INFO,
@@ -119,9 +119,9 @@ export class KubeHealthCheck implements KubePaginationAction {
     limit: 1
   };
   type = GET_NODES_INFO;
-  entityType = kubernetesNodesSchemaKey;
+  entityType = kubernetesNodesEntityType;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesNodesSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesNodesEntityType)];
   actions = [
     GET_NODES_INFO,
     GET_NODES_INFO_SUCCESS,
@@ -132,12 +132,12 @@ export class KubeHealthCheck implements KubePaginationAction {
 
 export class GetKubernetesNodes implements KubePaginationAction {
   constructor(public kubeGuid) {
-    this.paginationKey = getPaginationKey(kubernetesNodesSchemaKey, kubeGuid);
+    this.paginationKey = getPaginationKey(kubernetesNodesEntityType, kubeGuid);
   }
   type = GET_NODES_INFO;
-  entityType = kubernetesNodesSchemaKey;
+  entityType = kubernetesNodesEntityType;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesNodesSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesNodesEntityType)];
   actions = [
     GET_NODES_INFO,
     GET_NODES_INFO_SUCCESS,
@@ -154,9 +154,9 @@ export class GetKubernetesNode implements KubeAction {
   constructor(public nodeName: string, public kubeGuid: string) {
   }
   type = GET_NODE_INFO;
-  entityType = kubernetesNodesSchemaKey;
+  entityType = kubernetesNodesEntityType;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesNodesSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesNodesEntityType)];
 
   actions = [
     GET_NODE_INFO,
@@ -169,9 +169,9 @@ export class GetKubernetesNamespace implements KubeAction {
   constructor(public namespaceName: string, public kubeGuid: string) {
   }
   type = GET_NAMESPACE_INFO;
-  entityType = kubernetesNamespacesSchemaKey;
+  entityType = kubernetesNamespacesEntityType;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesNamespacesSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesNamespacesEntityType)];
 
   actions = [
     GET_NAMESPACE_INFO,
@@ -182,12 +182,12 @@ export class GetKubernetesNamespace implements KubeAction {
 
 export class GetKubernetesPods implements KubePaginationAction {
   constructor(public kubeGuid) {
-    this.paginationKey = getPaginationKey(kubernetesPodsSchemaKey, 'k8', kubeGuid);
+    this.paginationKey = getPaginationKey(kubernetesPodsEntityType, 'k8', kubeGuid);
   }
   type = GET_POD_INFO;
-  entityType = kubernetesPodsSchemaKey;
+  entityType = kubernetesPodsEntityType;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesPodsSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesPodsEntityType)];
   actions = [
     GET_POD_INFO,
     GET_POD_INFO_SUCCESS,
@@ -201,16 +201,16 @@ export class GetKubernetesPods implements KubePaginationAction {
 
 export class GetKubernetesPodsOnNode implements PaginatedAction, KubeAction {
   constructor(public kubeGuid: string, public nodeName: string) {
-    this.paginationKey = getPaginationKey(kubernetesPodsSchemaKey, `node-${nodeName}`, kubeGuid);
+    this.paginationKey = getPaginationKey(kubernetesPodsEntityType, `node-${nodeName}`, kubeGuid);
     this.initialParams = {
       fieldSelector: `spec.nodeName=${nodeName}`,
       ...sortPodsByName
     };
   }
   type = GET_PODS_ON_NODE_INFO;
-  entityType = kubernetesPodsSchemaKey;
+  entityType = kubernetesPodsEntityType;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesPodsSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesPodsEntityType)];
   actions = [
     GET_PODS_ON_NODE_INFO,
     GET_PODS_ON_NODE_INFO_SUCCESS,
@@ -222,12 +222,12 @@ export class GetKubernetesPodsOnNode implements PaginatedAction, KubeAction {
 
 export class GetKubernetesServicesInNamespace implements PaginatedAction, KubeAction {
   constructor(public kubeGuid: string, public namespaceName: string) {
-    this.paginationKey = getPaginationKey(kubernetesPodsSchemaKey, `ns-${namespaceName}`, kubeGuid);
+    this.paginationKey = getPaginationKey(kubernetesPodsEntityType, `ns-${namespaceName}`, kubeGuid);
   }
   type = GET_SERVICES_IN_NAMESPACE_INFO;
-  entityType = kubernetesServicesSchemaKey;
+  entityType = kubernetesServicesEntityType;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesServicesSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesServicesEntityType)];
   actions = [
     GET_SERVICES_IN_NAMESPACE_INFO,
     GET_SERVICES_IN_NAMESPACE_INFO_SUCCESS,
@@ -241,12 +241,12 @@ export class GetKubernetesServicesInNamespace implements PaginatedAction, KubeAc
 
 export class GetKubernetesPodsInNamespace implements PaginatedAction, KubeAction {
   constructor(public kubeGuid: string, public namespaceName: string) {
-    this.paginationKey = getPaginationKey(kubernetesPodsSchemaKey, `ns-${namespaceName}`, kubeGuid);
+    this.paginationKey = getPaginationKey(kubernetesPodsEntityType, `ns-${namespaceName}`, kubeGuid);
   }
   type = GET_PODS_IN_NAMESPACE_INFO;
-  entityType = kubernetesPodsSchemaKey;
+  entityType = kubernetesPodsEntityType;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesPodsSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesPodsEntityType)];
   actions = [
     GET_PODS_IN_NAMESPACE_INFO,
     GET_PODS_IN_NAMEPSACE_INFO_SUCCESS,
@@ -260,12 +260,12 @@ export class GetKubernetesPodsInNamespace implements PaginatedAction, KubeAction
 
 export class GetKubernetesNamespaces implements KubePaginationAction {
   constructor(public kubeGuid) {
-    this.paginationKey = getPaginationKey(kubernetesNamespacesSchemaKey, kubeGuid);
+    this.paginationKey = getPaginationKey(kubernetesNamespacesEntityType, kubeGuid);
   }
   type = GET_NAMESPACES_INFO;
-  entityType = kubernetesNamespacesSchemaKey;
+  entityType = kubernetesNamespacesEntityType;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesNamespacesSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesNamespacesEntityType)];
   actions = [
     GET_NAMESPACES_INFO,
     GET_NAMESPACES_INFO_SUCCESS,
@@ -280,12 +280,12 @@ export class GetKubernetesNamespaces implements KubePaginationAction {
 
 export class GetKubernetesApps implements KubePaginationAction {
   constructor(public kubeGuid) {
-    this.paginationKey = getPaginationKey(kubernetesAppsSchemaKey, kubeGuid);
+    this.paginationKey = getPaginationKey(kubernetesAppsEntityType, kubeGuid);
   }
   type = GET_KUBERNETES_APP_INFO;
-  entityType = kubernetesAppsSchemaKey;
+  entityType = kubernetesAppsEntityType;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesAppsSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesAppsEntityType)];
   actions = [
     GET_KUBERNETES_APP_INFO,
     GET_KUBERNETES_APP_INFO_SUCCESS,
@@ -300,12 +300,12 @@ export class GetKubernetesApps implements KubePaginationAction {
 
 export class GetKubernetesServices implements KubePaginationAction {
   constructor(public kubeGuid) {
-    this.paginationKey = getPaginationKey(kubernetesServicesSchemaKey, kubeGuid);
+    this.paginationKey = getPaginationKey(kubernetesServicesEntityType, kubeGuid);
   }
   type = GET_SERVICE_INFO;
-  entityType = kubernetesServicesSchemaKey;
+  entityType = kubernetesServicesEntityType;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesServicesSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesServicesEntityType)];
   actions = [
     GET_SERVICE_INFO,
     GET_SERVICE_INFO_SUCCESS,
@@ -322,9 +322,9 @@ export class GetKubernetesPod implements KubeAction {
   constructor(public podName, public namespaceName, public kubeGuid) {
   }
   type = GET_KUBE_POD;
-  entityType = kubernetesPodsSchemaKey;
+  entityType = kubernetesPodsEntityType;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesPodsSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesPodsEntityType)];
   actions = [
     GET_KUBE_POD,
     GET_KUBE_POD_SUCCESS,
@@ -334,12 +334,12 @@ export class GetKubernetesPod implements KubeAction {
 
 export class GetKubernetesStatefulSets implements KubePaginationAction {
   constructor(public kubeGuid) {
-    this.paginationKey = getPaginationKey(kubernetesStatefulSetsSchemaKey, kubeGuid);
+    this.paginationKey = getPaginationKey(kubernetesStatefulSetsEntityType, kubeGuid);
   }
   type = GET_KUBE_STATEFULSETS;
-  entityType = kubernetesStatefulSetsSchemaKey;
+  entityType = kubernetesStatefulSetsEntityType;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesStatefulSetsSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesStatefulSetsEntityType)];
   actions = [
     GET_KUBE_STATEFULSETS,
     GET_KUBE_STATEFULSETS_SUCCESS,
@@ -350,12 +350,12 @@ export class GetKubernetesStatefulSets implements KubePaginationAction {
 
 export class GeKubernetesDeployments implements KubePaginationAction {
   constructor(public kubeGuid) {
-    this.paginationKey = getPaginationKey(kubernetesDeploymentsSchemaKey, kubeGuid);
+    this.paginationKey = getPaginationKey(kubernetesDeploymentsEntityType, kubeGuid);
   }
   type = GET_KUBE_DEPLOYMENT;
-  entityType = kubernetesDeploymentsSchemaKey;
+  entityType = kubernetesDeploymentsEntityType;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesDeploymentsSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesDeploymentsEntityType)];
   actions = [
     GET_KUBE_DEPLOYMENT,
     GET_KUBE_DEPLOYMENT_SUCCESS,
@@ -368,9 +368,9 @@ export class GetKubernetesDashboard implements KubeAction {
   constructor(public kubeGuid: string) {
   }
   type = GET_KUBE_DASHBOARD;
-  entityType = kubernetesDashboardSchemaKey;
+  entityType = kubernetesDashboardEntityType;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesDashboardSchemaKey)];
+  entity = [kubernetesEntityFactory(kubernetesDashboardEntityType)];
 
   actions = [
     GET_KUBE_DASHBOARD,
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 1e1fda6405..98021f537f 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
@@ -15,14 +15,14 @@ import { entityCatalogue } from '../../../core/entity-catalogue/entity-catalogue
 import { environment } from '../../../environments/environment';
 import {
   KUBERNETES_ENDPOINT_TYPE,
-  kubernetesAppsSchemaKey,
-  kubernetesDashboardSchemaKey,
-  kubernetesDeploymentsSchemaKey,
-  kubernetesNamespacesSchemaKey,
-  kubernetesNodesSchemaKey,
-  kubernetesPodsSchemaKey,
-  kubernetesServicesSchemaKey,
-  kubernetesStatefulSetsSchemaKey,
+  kubernetesAppsEntityType,
+  kubernetesDashboardEntityType,
+  kubernetesDeploymentsEntityType,
+  kubernetesNamespacesEntityType,
+  kubernetesNodesEntityType,
+  kubernetesPodsEntityType,
+  kubernetesServicesEntityType,
+  kubernetesStatefulSetsEntityType,
 } from '../kubernetes-entity-factory';
 import { getKubeAPIResourceGuid } from './kube.selectors';
 import {
@@ -94,7 +94,7 @@ export class KubernetesEffects {
         headers
       };
       const url = `/pp/${this.proxyAPIVersion}/kubedash/${action.kubeGuid}/status`;
-      const dashboardEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesDashboardSchemaKey);
+      const dashboardEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesDashboardEntityType);
       return this.http
         .get(url, requestArgs)
         .pipe(mergeMap(response => {
@@ -125,7 +125,7 @@ export class KubernetesEffects {
   fetchReleasePodsInfo$ = this.actions$.pipe(
     ofType<GetKubernetesReleasePods>(GET_RELEASE_POD_INFO),
     flatMap(action => {
-      const nodeEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesSchemaKey);
+      const nodeEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesEntityType);
       return this.processListAction<KubernetesPod>(
         action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`,
@@ -145,7 +145,7 @@ export class KubernetesEffects {
   fetchNodeInfo$ = this.actions$.pipe(
     ofType<GetKubernetesNode>(GET_NODE_INFO),
     flatMap(action => {
-      const nodeEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesSchemaKey);
+      const nodeEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesEntityType);
       return this.processSingleItemAction<KubernetesNode>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes/${action.nodeName}`,
         nodeEntityConfig.entityKey,
@@ -157,7 +157,7 @@ export class KubernetesEffects {
   fetchNamespaceInfo$ = this.actions$.pipe(
     ofType<GetKubernetesNamespace>(GET_NAMESPACE_INFO),
     flatMap(action => {
-      const namespaceEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNamespacesSchemaKey);
+      const namespaceEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNamespacesEntityType);
       return this.processSingleItemAction<KubernetesNamespace>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}`,
         namespaceEntityConfig.entityKey,
@@ -169,7 +169,7 @@ export class KubernetesEffects {
   fetchPodsInfo$ = this.actions$.pipe(
     ofType<GetKubernetesPods>(GET_POD_INFO),
     flatMap(action => {
-      const podsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsSchemaKey);
+      const podsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType);
       return this.processListAction<KubernetesPod>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`,
         podsEntityConfig.entityKey,
@@ -181,7 +181,7 @@ export class KubernetesEffects {
   fetchPodsOnNodeInfo$ = this.actions$.pipe(
     ofType<GetKubernetesPodsOnNode>(GET_PODS_ON_NODE_INFO),
     flatMap(action => {
-      const podsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsSchemaKey);
+      const podsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType);
       return this.processListAction<KubernetesPod>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`,
         podsEntityConfig.entityKey,
@@ -194,7 +194,7 @@ export class KubernetesEffects {
   fetchPodsInNamespaceInfo$ = this.actions$.pipe(
     ofType<GetKubernetesPodsInNamespace>(GET_PODS_IN_NAMESPACE_INFO),
     flatMap(action => {
-      const podsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsSchemaKey);
+      const podsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType);
       return this.processListAction<KubernetesPod>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/pods`,
         podsEntityConfig.entityKey,
@@ -207,7 +207,7 @@ export class KubernetesEffects {
   fetchServicesInNamespaceInfo$ = this.actions$.pipe(
     ofType<GetKubernetesServicesInNamespace>(GET_SERVICES_IN_NAMESPACE_INFO),
     flatMap(action => {
-      const servicesEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesServicesSchemaKey);
+      const servicesEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesServicesEntityType);
       return this.processListAction<KubeService>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/services`,
         servicesEntityConfig.entityKey,
@@ -220,7 +220,7 @@ export class KubernetesEffects {
   fetchPodInfo$ = this.actions$.pipe(
     ofType<GetKubernetesPod>(GET_KUBE_POD),
     flatMap(action => {
-      const podsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsSchemaKey);
+      const podsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType);
       return this.processListAction<KubernetesPod>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/pods/${action.podName}`,
         podsEntityConfig.entityKey,
@@ -232,7 +232,7 @@ export class KubernetesEffects {
   fetchServicesInfo$ = this.actions$.pipe(
     ofType<GetKubernetesServices>(GET_SERVICE_INFO),
     flatMap(action => {
-      const servicesEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesServicesSchemaKey);
+      const servicesEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesServicesEntityType);
       return this.processListAction<KubeService>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/services`,
         servicesEntityConfig.entityKey,
@@ -244,7 +244,7 @@ export class KubernetesEffects {
   fetchNamespacesInfo$ = this.actions$.pipe(
     ofType<GetKubernetesNamespaces>(GET_NAMESPACES_INFO),
     flatMap(action => {
-      const namespaceEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNamespacesSchemaKey);
+      const namespaceEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNamespacesEntityType);
       return this.processListAction<KubernetesNamespace>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces`,
         namespaceEntityConfig.entityKey,
@@ -256,7 +256,7 @@ export class KubernetesEffects {
   fetchStatefulSets$ = this.actions$.pipe(
     ofType<GetKubernetesStatefulSets>(GET_KUBE_STATEFULSETS),
     flatMap(action => {
-      const statefulSetsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesStatefulSetsSchemaKey);
+      const statefulSetsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesStatefulSetsEntityType);
       return this.processListAction<KubernetesStatefulSet>(action,
         `/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/statefulsets`,
         statefulSetsEntityConfig.entityKey,
@@ -268,7 +268,7 @@ export class KubernetesEffects {
   fetchDeployments$ = this.actions$.pipe(
     ofType<GeKubernetesDeployments>(GET_KUBE_DEPLOYMENT),
     flatMap(action => {
-      const deploymentsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesDeploymentsSchemaKey);
+      const deploymentsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesDeploymentsEntityType);
       return this.processListAction<KubernetesDeployment>(action,
         `/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/deployments`,
         deploymentsEntityConfig.entityKey,
@@ -285,7 +285,7 @@ export class KubernetesEffects {
       const requestArgs = {
         headers
       };
-      const appsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesAppsSchemaKey);
+      const appsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesAppsEntityType);
       return this.http
         .get<ConfigMap>(`/pp/${this.proxyAPIVersion}/proxy/api/v1/configmaps`, requestArgs)
         .pipe(
@@ -357,7 +357,7 @@ export class KubernetesEffects {
 
 
   private processNodeAction(action: GetKubernetesReleasePods | GetKubernetesNodes) {
-    const nodeEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesSchemaKey);
+    const nodeEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesEntityType);
     return this.processListAction<KubernetesNode>(action,
       `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes`,
       nodeEntityConfig.entityKey,
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 be7c131a46..f59b9ef3d7 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
@@ -1,3 +1,4 @@
+/* tslint:disable:max-line-length */
 import { CommonModule, DatePipe } from '@angular/common';
 import { inject, TestBed } from '@angular/core/testing';
 import { ConnectionBackend, Http } from '@angular/http';
@@ -21,6 +22,9 @@ import { AppStoreExtensionsModule } from '../../../../../store/src/store.extensi
 import { CfAutoscalerTestingModule } from '../../../cf-autoscaler-testing.module';
 import { CfAppAutoscalerEventsConfigService } from './cf-app-autoscaler-events-config.service';
 
+
+/* tslint:enable */
+
 describe('CfAppAutoscalerEventsConfigService', () => {
 
   beforeEach(() => {

From cecaef53c1928a91b81440b2f1950e134a761e5a Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 4 Oct 2019 17:08:06 +0100
Subject: [PATCH 122/648] Fix unit tests

---
 .../demo-helper/demo-helper.component.spec.ts |   2 +-
 .../create-release.component.spec.ts          |  29 +----
 .../app/custom/helm/helm-testing.module.ts    | 123 ++++++++++--------
 ...elm-release-service-card.component.spec.ts |   4 +-
 .../monocular-chart-card.component.spec.ts    |   2 +-
 .../monocular-tab-base.component.spec.ts      |   2 +-
 .../chart-details-readme.component.spec.ts    |   4 +-
 .../chart-details-usage.component.spec.ts     |   5 +-
 .../chart-details-versions.component.spec.ts  |  12 +-
 .../chart-details.component.spec.ts           |   8 +-
 .../chart-index/chart-index.component.spec.ts |   2 +-
 .../monocular/charts/charts.component.spec.ts |   4 +-
 .../list-item/list-item.component.spec.ts     |   2 +-
 ...kubernetes-aws-auth-form.component.spec.ts |   9 +-
 .../kubernetes/kubernetes.testing.module.ts   |  68 +++++-----
 .../app-link/app-link.component.spec.ts       |   2 +-
 .../kube-appcreated-date.component.spec.ts    |   2 +-
 ...kube-namespace-pod-count.component.spec.ts |   4 +-
 .../condition-cell.component.spec.ts          |   2 +-
 ...kubernetes-node-capacity.component.spec.ts |   2 +-
 ...etes-node-condition-card.component.spec.ts |  11 +-
 ...ubernetes-node-info-card.component.spec.ts |   6 +-
 ...rnetes-node-summary-card.component.spec.ts |   4 +-
 .../kubernetes-node-summary.component.spec.ts |   2 +-
 ...ubernetes-node-tags-card.component.spec.ts |   4 +-
 .../node-pod-count.component.spec.ts          |   4 +-
 .../kubernetes-pod-tags.component.spec.ts     |   4 +-
 .../pod-name-link.component.spec.ts           |   4 +-
 ...kubernetes-service-ports.component.spec.ts |   4 +-
 .../kubernetes-apps-tab.component.spec.ts     |   2 +-
 .../kubernetes-nodes-tab.component.spec.ts    |   2 +-
 31 files changed, 165 insertions(+), 170 deletions(-)

diff --git a/custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.spec.ts b/custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.spec.ts
index 14f74e9a95..2d6d578d43 100644
--- a/custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.spec.ts
+++ b/custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.spec.ts
@@ -2,7 +2,7 @@ import { HttpClientModule } from '@angular/common/http';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { TabNavService } from '../../../../tab-nav.service';
-import { BaseTestModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { BaseTestModules } from '../../../../test-framework/core-test.helper';
 import { DemoHelperComponent } from './demo-helper.component';
 
 describe('DemoHelperComponent', () => {
diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.spec.ts b/custom-src/frontend/app/custom/helm/create-release/create-release.component.spec.ts
index c0e7e1b359..552d5d7bad 100644
--- a/custom-src/frontend/app/custom/helm/create-release/create-release.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/create-release/create-release.component.spec.ts
@@ -1,27 +1,14 @@
-import { CommonModule } from '@angular/common';
-import { HttpClientModule } from '@angular/common/http';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ConnectionBackend, Http } from '@angular/http';
 import { MockBackend } from '@angular/http/testing';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { RouterTestingModule } from '@angular/router/testing';
-import { StoreModule } from '@ngrx/store';
 
-import { appReducers } from '../../../../../store/src/reducers.module';
 import { TabNavService } from '../../../../tab-nav.service';
-import { CoreModule } from '../../../core/core.module';
 import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service';
-import {
-  CreateApplicationStep1Component,
-} from '../../../shared/components/create-application/create-application-step1/create-application-step1.component';
-import { FocusDirective } from '../../../shared/components/focus.directive';
-import { PageHeaderModule } from '../../../shared/components/page-header/page-header.module';
-import { SteppersModule } from '../../../shared/components/stepper/steppers.module';
-import { CloudFoundryService } from '../../../shared/data-services/cloud-foundry.service';
 import { EntityMonitorFactory } from '../../../shared/monitors/entity-monitor.factory.service';
 import { InternalEventMonitorFactory } from '../../../shared/monitors/internal-event-monitor.factory';
 import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory';
+import { KubernetesBaseTestModules } from '../../kubernetes/kubernetes.testing.module';
 import { CreateReleaseComponent } from './create-release.component';
 
 describe('CreateReleaseComponent', () => {
@@ -33,21 +20,10 @@ describe('CreateReleaseComponent', () => {
     TestBed.configureTestingModule({
       declarations: [
         CreateReleaseComponent,
-        CreateApplicationStep1Component,
-        FocusDirective
       ],
       imports: [
-        CommonModule,
-        CoreModule,
+        KubernetesBaseTestModules,
         HttpClientTestingModule,
-        RouterTestingModule,
-        BrowserAnimationsModule,
-        PageHeaderModule,
-        SteppersModule,
-        StoreModule.forRoot(
-          appReducers
-        ),
-        HttpClientModule,
       ],
       providers: [
         Http,
@@ -58,7 +34,6 @@ describe('CreateReleaseComponent', () => {
         PaginationMonitorFactory,
         EntityMonitorFactory,
         InternalEventMonitorFactory,
-        CloudFoundryService,
         TabNavService,
         ConfirmationDialogService
       ]
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 ff2cc052ac..25b9f6cdb9 100644
--- a/custom-src/frontend/app/custom/helm/helm-testing.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm-testing.module.ts
@@ -1,65 +1,74 @@
-// TODO: RC being copied over into served code
-// import { HttpClient, HttpHandler } from '@angular/common/http';
-// import { NgModule } from '@angular/core';
-// import { HttpModule } from '@angular/http';
-// import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-// import { ActivatedRoute } from '@angular/router';
-// import { RouterTestingModule } from '@angular/router/testing';
+import { HttpClient, HttpHandler } from '@angular/common/http';
+import { NgModule } from '@angular/core';
+import { HttpModule } from '@angular/http';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 
-// import { createBasicStoreModule, registerEntitiesForTesting } from '../../../test-framework/store-test-helper';
-// import { CoreModule } from '../../core/core.module';
-// import { SharedModule } from '../../shared/shared.module';
-// import { HelmStoreModule } from './helm.store.module';
-// import { HelmReleaseHelperService } from './release/tabs/helm-release-helper.service';
-// import { monocularEntities } from './store/helm.entities';
-// import { HelmReleaseGuid } from './store/helm.types';
+import { createBasicStoreModule } from '../../../test-framework/store-test-helper';
+import { generateStratosEntities } from '../../base-entity-types';
+import { CoreModule } from '../../core/core.module';
+import { CATALOGUE_ENTITIES, EntityCatalogueFeatureModule } from '../../core/entity-catalogue.module';
+import { entityCatalogue, TestEntityCatalogue } from '../../core/entity-catalogue/entity-catalogue.service';
+import { SharedModule } from '../../shared/shared.module';
+import { generateHelmEntities } from './helm-entity-generator';
+import { HelmReleaseHelperService } from './release/tabs/helm-release-helper.service';
+import { HelmReleaseGuid } from './store/helm.types';
 
-// @NgModule({
-//   imports: [
-//     HelmStoreModule
-//   ]
-// })
-// export class HelmTestingModule {
+@NgModule({
+  imports: [{
+    ngModule: EntityCatalogueFeatureModule,
+    providers: [
+      {
+        provide: CATALOGUE_ENTITIES, useFactory: () => {
+          const testEntityCatalogue = entityCatalogue as TestEntityCatalogue;
+          testEntityCatalogue.clear();
+          return [
+            ...generateStratosEntities(),
+            ...generateHelmEntities(),
+          ];
+        }
+      }
+    ]
+  }]
+})
+export class HelmTestingModule { }
 
-//   constructor() {
-//     registerEntitiesForTesting(monocularEntities);
-//   }
-// }
 
-// export const HelmReleaseActivatedRouteMock = {
-//   provide: ActivatedRoute,
-//   useValue: {
-//     snapshot: {
-//       queryParams: {},
-//       params: {
-//         guid: '123:4'
-//       }
-//     }
-//   }
-// };
+export const HelmReleaseActivatedRouteMock = {
+  provide: ActivatedRoute,
+  useValue: {
+    snapshot: {
+      queryParams: {},
+      params: {
+        guid: '123:4'
+      }
+    }
+  }
+};
 
-// export const HelmReleaseGuidMock = {
-//   provide: HelmReleaseGuid,
-//   useValue: {
-//     guid: '123:4'
-//   }
-// };
+export const HelmReleaseGuidMock = {
+  provide: HelmReleaseGuid,
+  useValue: {
+    guid: '123:4'
+  }
+};
 
-// export const HelmBaseTestModules = [
-//   HelmTestingModule,
-//   RouterTestingModule,
-//   CoreModule,
-//   createBasicStoreModule(),
-//   NoopAnimationsModule,
-//   HttpModule,
-//   SharedModule
-// ];
+export const HelmBaseTestModules = [
+  HelmTestingModule,
+  RouterTestingModule,
+  CoreModule,
+  createBasicStoreModule(),
+  NoopAnimationsModule,
+  HttpModule,
+  SharedModule
+];
 
-// export const HelmBaseTestProviders = [
-//   HelmReleaseHelperService,
-//   HelmReleaseActivatedRouteMock,
-//   HelmReleaseGuidMock,
-//   HttpClient,
-//   HttpHandler
-// ];
+export const HelmBaseTestProviders = [
+  HelmReleaseHelperService,
+  HelmReleaseActivatedRouteMock,
+  HelmReleaseGuidMock,
+  HttpClient,
+  HttpHandler
+];
 
diff --git a/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.spec.ts b/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.spec.ts
index 0e18647561..913f7f4906 100644
--- a/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.spec.ts
@@ -1,9 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { BaseTestModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import {
   KubernetesServicePortsComponent,
 } from '../../../kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component';
+import { HelmBaseTestModules } from '../../helm-testing.module';
 import { HelmServicePortsComponent } from '../helm-service-ports/helm-service-ports.component';
 import { HelmReleaseServiceCardComponent } from './helm-release-service-card.component';
 
@@ -19,7 +19,7 @@ describe('HelmReleaseServiceCardComponent', () => {
         KubernetesServicePortsComponent,
         HelmServicePortsComponent
       ],
-      imports: [...BaseTestModules],
+      imports: [...HelmBaseTestModules],
     })
       .compileComponents();
   }));
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.spec.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.spec.ts
index 4a8a6b46d7..08de859911 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { BaseTestModulesNoShared } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { BaseTestModulesNoShared } from '../../../../../test-framework/core-test.helper';
 import { ChartItemComponent } from '../../monocular/chart-item/chart-item.component';
 import { ListItemComponent } from '../../monocular/list-item/list-item.component';
 import { ChartsService } from '../../monocular/shared/services/charts.service';
diff --git a/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.spec.ts
index b2040abca4..153b0b9cfb 100644
--- a/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { TabNavService } from '../../../../tab-nav.service';
-import { BaseTestModulesNoShared } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { BaseTestModulesNoShared } from '../../../../test-framework/core-test.helper';
 import { HelmModule } from '../helm.module';
 import { MonocularTabBaseComponent } from './monocular-tab-base.component';
 
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.spec.ts
index 132e3f1d9c..287b751c51 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.spec.ts
@@ -1,9 +1,9 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 
+import { MockChartService } from '../../shared/services/chart.service.mock';
 import { ChartsService } from '../../shared/services/charts.service';
 import { ChartDetailsReadmeComponent } from './chart-details-readme.component';
-import { MockChartService } from '../../shared/services/chart.service.mock';
 
 describe('Component: ChartDetailsReadme', () => {
   beforeEach(() => {
@@ -11,7 +11,7 @@ describe('Component: ChartDetailsReadme', () => {
       imports: [],
       declarations: [ChartDetailsReadmeComponent],
       providers: [
-        { provide: ChartsService, useValue: new MockChartService()},
+        { provide: ChartsService, useValue: new MockChartService() },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts
index fd707c5964..e54638cd29 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts
@@ -1,10 +1,11 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
-import { BaseTestModulesNoShared } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { ChartDetailsUsageComponent } from './chart-details-usage.component';
+
+import { BaseTestModulesNoShared } from '../../../../../../test-framework/core-test.helper';
 import { EndpointsService } from '../../../../../core/endpoints.service';
 import { UtilsService } from '../../../../../core/utils.service';
 import { PaginationMonitorFactory } from '../../../../../shared/monitors/pagination-monitor.factory';
+import { ChartDetailsUsageComponent } from './chart-details-usage.component';
 
 describe('Component: ChartDetailsUsage', () => {
   beforeEach(() => {
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.spec.ts
index 81fea91621..00a67df285 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.spec.ts
@@ -1,22 +1,20 @@
-/* tslint:disable:no-unused-variable */
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { By } from '@angular/platform-browser';
-import { DebugElement } from '@angular/core';
 
-import { ChartDetailsVersionsComponent } from './chart-details-versions.component';
 import { PanelComponent } from '../../panel/panel.component';
+import { ChartDetailsVersionsComponent } from './chart-details-versions.component';
 
+/* tslint:disable:no-unused-variable */
 describe('ChartDetailsVersionsComponent', () => {
   let component: ChartDetailsVersionsComponent;
   let fixture: ComponentFixture<ChartDetailsVersionsComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ ChartDetailsVersionsComponent, PanelComponent ],
-      imports: [ RouterTestingModule ]
+      declarations: [ChartDetailsVersionsComponent, PanelComponent],
+      imports: [RouterTestingModule]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
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 2d834a6316..993367ce75 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,11 +1,12 @@
 import 'hammerjs';
 
+import { HttpClientModule } from '@angular/common/http';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { HttpModule } from '@angular/http';
 import { BrowserModule } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 
-import { BaseTestModulesNoShared } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { BaseTestModulesNoShared } from '../../../../../test-framework/core-test.helper';
 import {
   EntitySummaryTitleComponent,
 } from '../../../../shared/components/entity-summary-title/entity-summary-title.component';
@@ -14,6 +15,7 @@ import { ChartItemComponent } from '../chart-item/chart-item.component';
 import { ListItemComponent } from '../list-item/list-item.component';
 import { LoaderComponent } from '../loader/loader.component';
 import { PanelComponent } from '../panel/panel.component';
+import { MockChartService } from '../shared/services/chart.service.mock';
 import { ChartsService } from '../shared/services/charts.service';
 import { ConfigService } from '../shared/services/config.service';
 import { MenuService } from '../shared/services/menu.service';
@@ -22,8 +24,6 @@ import { ChartDetailsReadmeComponent } from './chart-details-readme/chart-detail
 import { ChartDetailsUsageComponent } from './chart-details-usage/chart-details-usage.component';
 import { ChartDetailsVersionsComponent } from './chart-details-versions/chart-details-versions.component';
 import { ChartDetailsComponent } from './chart-details.component';
-import { MockChartService } from '../shared/services/chart.service.mock';
-import { HttpClientModule } from '@angular/common/http';
 
 /* tslint:disable:no-unused-variable */
 // import { Angulartics2Module } from 'angulartics2';
@@ -110,7 +110,7 @@ describe('ChartDetailsComponent', () => {
           EntitySummaryTitleComponent
         ],
         providers: [
-          { provide: ChartsService, useValue: new MockChartService()},
+          { provide: ChartsService, useValue: new MockChartService() },
           { provide: ConfigService, useValue: { appName: 'appName' } },
           // { provide: SeoService },
           { provide: MenuService },
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts
index 4561de7fbc..26a9203f0a 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts
@@ -1,4 +1,3 @@
-/* tslint:disable:no-unused-variable */
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
@@ -13,6 +12,7 @@ import { ConfigService } from '../shared/services/config.service';
 import { MenuService } from '../shared/services/menu.service';
 import { ChartIndexComponent } from './chart-index.component';
 
+/* tslint:disable:no-unused-variable */
 // import { HeaderBarComponent } from '../header-bar/header-bar.component';
 // import { MainHeaderComponent } from '../main-header/main-header.component';
 // import { SeoService } from '../shared/services/seo.service';
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 ae3fcdd923..186ad62f4b 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
@@ -9,12 +9,12 @@ import { ChartItemComponent } from '../chart-item/chart-item.component';
 import { ChartListComponent } from '../chart-list/chart-list.component';
 import { LoaderComponent } from '../loader/loader.component';
 import { PanelComponent } from '../panel/panel.component';
+import { MockChartService } from '../shared/services/chart.service.mock';
 import { ChartsService } from '../shared/services/charts.service';
 import { ConfigService } from '../shared/services/config.service';
 import { MenuService } from '../shared/services/menu.service';
 import { ReposService } from '../shared/services/repos.service';
 import { ChartsComponent } from './charts.component';
-import { MockChartService } from '../shared/services/chart.service.mock';
 
 // import { HeaderBarComponent } from '../header-bar/header-bar.component';
 // import { SeoService } from '../shared/services/seo.service';
@@ -36,7 +36,7 @@ describe('Component: Charts', () => {
       providers: [
         ConfigService,
         MenuService,
-        { provide: ChartsService, useValue: new MockChartService()},
+        { provide: ChartsService, useValue: new MockChartService() },
         // { provide: SeoService },
         { provide: ActivatedRoute },
         { provide: Router },
diff --git a/custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.spec.ts
index 41850b0af6..c200f2f498 100644
--- a/custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.spec.ts
@@ -1,6 +1,6 @@
-/* tslint:disable:no-unused-variable */
 import { ListItemComponent } from './list-item.component';
 
+/* tslint:disable:no-unused-variable */
 
 describe('Component: ListItem', () => {
   it('should create an instance', () => {
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts
index 3ae8789096..84179dbe41 100644
--- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts
@@ -1,9 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { KubernetesAWSAuthFormComponent } from './kubernetes-aws-auth-form.component';
 import { FormBuilder } from '@angular/forms';
-import { SharedModule } from '../../../../shared/shared.module';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+
 import { MDAppModule } from '../../../../core/md.module';
+import { SharedModule } from '../../../../shared/shared.module';
+import { KubernetesAWSAuthFormComponent } from './kubernetes-aws-auth-form.component';
 
 describe('KubernetesAWSAuthFormComponent', () => {
   let component: KubernetesAWSAuthFormComponent;
@@ -11,14 +12,14 @@ describe('KubernetesAWSAuthFormComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ KubernetesAWSAuthFormComponent ],
+      declarations: [KubernetesAWSAuthFormComponent],
       imports: [
         MDAppModule,
         SharedModule,
         NoopAnimationsModule
       ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
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 3f6d94a3b6..1097eddbb4 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
@@ -1,32 +1,42 @@
-// TODO: RC this is copied over from custom-src and should be ignored
-// import { KubernetesStoreModule } from './kubernetes.store.module';
-// import { NgModule } from '@angular/core';
-// import { kubernetesEntities } from './store/kubernetes.entities';
-// import { registerEntitiesForTesting, createBasicStoreModule } from '../../../test-framework/store-test-helper';
-// import { RouterTestingModule } from '@angular/router/testing';
-// import { CoreModule } from '../../core/core.module';
-// import { SharedModule } from '../../shared/shared.module';
-// import { HttpModule } from '@angular/http';
-// import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { NgModule } from '@angular/core';
+import { HttpModule } from '@angular/http';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
 
-// @NgModule({
-//   imports: [
-//     KubernetesStoreModule
-//   ]
-// })
-// export class KubernetesTestingModule {
+import { createBasicStoreModule } from '../../../test-framework/store-test-helper';
+import { generateStratosEntities } from '../../base-entity-types';
+import { CoreModule } from '../../core/core.module';
+import { CATALOGUE_ENTITIES, EntityCatalogueFeatureModule } from '../../core/entity-catalogue.module';
+import { entityCatalogue, TestEntityCatalogue } from '../../core/entity-catalogue/entity-catalogue.service';
+import { SharedModule } from '../../shared/shared.module';
+import { generateKubernetesEntities } from './kubernetes-entity-generator';
 
-//   constructor() {
-//     registerEntitiesForTesting(kubernetesEntities);
-//   }
-// }
+// TODO: RC import store as well
+@NgModule({
+  imports: [{
+    ngModule: EntityCatalogueFeatureModule,
+    providers: [
+      {
+        provide: CATALOGUE_ENTITIES, useFactory: () => {
+          const testEntityCatalogue = entityCatalogue as TestEntityCatalogue;
+          testEntityCatalogue.clear();
+          return [
+            ...generateStratosEntities(),
+            ...generateKubernetesEntities(),
+          ];
+        }
+      }
+    ]
+  }]
+})
+export class KubernetesTestingModule { }
 
-// export const KubernetesBaseTestModules = [
-//   KubernetesTestingModule,
-//   RouterTestingModule,
-//   CoreModule,
-//   createBasicStoreModule(),
-//   NoopAnimationsModule,
-//   HttpModule,
-//   SharedModule,
-// ];
+export const KubernetesBaseTestModules = [
+  KubernetesTestingModule,
+  RouterTestingModule,
+  CoreModule,
+  createBasicStoreModule(),
+  NoopAnimationsModule,
+  HttpModule,
+  SharedModule,
+];
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.spec.ts
index 41b4ab9c37..3b9b21aa8f 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { AppLinkComponent } from './app-link.component';
 import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
+import { AppLinkComponent } from './app-link.component';
 
 describe('AppLinkComponent', () => {
   let component: AppLinkComponent<any>;
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.spec.ts
index c44b47fd3d..a3a15ea926 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { KubeAppcreatedDateComponent } from './kube-appcreated-date.component';
 import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
+import { KubeAppcreatedDateComponent } from './kube-appcreated-date.component';
 
 describe('KubeAppcreatedDateComponent', () => {
   let component: KubeAppcreatedDateComponent;
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts
index 7bd74b006e..d3ad45391a 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts
@@ -1,10 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { KubeNamespacePodCountComponent } from './kube-namespace-pod-count.component';
 import { BaseKubeGuid } from '../../../kubernetes-page.types';
+import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
 import { HelmReleaseService } from '../../../services/helm-release.service';
 import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
-import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
+import { KubeNamespacePodCountComponent } from './kube-namespace-pod-count.component';
 
 describe('KubeNamespacePodCountComponent', () => {
   let component: KubeNamespacePodCountComponent;
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts
index f628082325..53a631d61d 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { BaseTestModules } from '../../../../../../test-framework/core-test.helper';
 import { ConditionCellComponent } from './condition-cell.component';
-import { BaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 
 describe('ConditionCellComponent', () => {
   let component: ConditionCellComponent;
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts
index 71250c4c10..d6d5d7d6c2 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { BaseTestModules } from '../../../../../../test-framework/core-test.helper';
 import { KubernetesNodeCapacityComponent } from './kubernetes-node-capacity.component';
-import { BaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 
 describe('KubernetesNodeCapacityComponent', () => {
   let component: KubernetesNodeCapacityComponent<any>;
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts
index eddc56d10f..5d22a63f1b 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts
@@ -1,13 +1,14 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { KubernetesNodeConditionCardComponent } from './kubernetes-node-condition-card.component';
-import { KubernetesNodeService } from '../../../../services/kubernetes-node.service';
-import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service';
 import { BaseKubeGuid } from '../../../../kubernetes-page.types';
-import { KubernetesNodeConditionComponent } from './kubernetes-node-condition/kubernetes-node-condition.component';
 import { KubernetesBaseTestModules } from '../../../../kubernetes.testing.module';
+import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service';
+import { KubernetesNodeService } from '../../../../services/kubernetes-node.service';
+import { KubernetesNodeConditionCardComponent } from './kubernetes-node-condition-card.component';
+import { KubernetesNodeConditionComponent } from './kubernetes-node-condition/kubernetes-node-condition.component';
 
-xdescribe('KubernetesNodeConditionCardComponent', () => {
+// TODO: RC xdescribed
+describe('KubernetesNodeConditionCardComponent', () => {
   let component: KubernetesNodeConditionCardComponent;
   let fixture: ComponentFixture<KubernetesNodeConditionCardComponent>;
 
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.spec.ts
index e90484e382..4b45cd03f2 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.spec.ts
@@ -1,10 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { KubernetesNodeInfoCardComponent } from './kubernetes-node-info-card.component';
-import { KubernetesNodeService } from '../../../../services/kubernetes-node.service';
-import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service';
 import { BaseKubeGuid } from '../../../../kubernetes-page.types';
 import { KubernetesBaseTestModules } from '../../../../kubernetes.testing.module';
+import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service';
+import { KubernetesNodeService } from '../../../../services/kubernetes-node.service';
+import { KubernetesNodeInfoCardComponent } from './kubernetes-node-info-card.component';
 
 describe('KubernetesNodeInfoCardComponent', () => {
   let component: KubernetesNodeInfoCardComponent;
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts
index a44786721a..c1a911eac3 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts
@@ -1,10 +1,10 @@
-import { KubernetesBaseTestModules } from './../../../../kubernetes.testing.module';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { KubernetesNodeSummaryCardComponent } from './kubernetes-node-summary-card.component';
 import { BaseKubeGuid } from '../../../../kubernetes-page.types';
 import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service';
 import { KubernetesNodeService } from '../../../../services/kubernetes-node.service';
+import { KubernetesBaseTestModules } from './../../../../kubernetes.testing.module';
+import { KubernetesNodeSummaryCardComponent } from './kubernetes-node-summary-card.component';
 
 describe('KubernetesNodeSummaryCardComponent', () => {
   let component: KubernetesNodeSummaryCardComponent;
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.spec.ts
index ee97b1cac5..629d1c742b 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.spec.ts
@@ -1,6 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { BaseKubeGuid } from '../../../kubernetes-page.types';
+import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
 import { KubernetesNodeService } from '../../../services/kubernetes-node.service';
 import {
@@ -13,7 +14,6 @@ import { KubernetesNodeInfoCardComponent } from './kubernetes-node-info-card/kub
 import { KubernetesNodeSummaryCardComponent } from './kubernetes-node-summary-card/kubernetes-node-summary-card.component';
 import { KubernetesNodeSummaryComponent } from './kubernetes-node-summary.component';
 import { KubernetesNodeTagsCardComponent } from './kubernetes-node-tags-card/kubernetes-node-tags-card.component';
-import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
 
 describe('KubernetesNodeSummaryComponent', () => {
   let component: KubernetesNodeSummaryComponent;
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.spec.ts
index 1606d9d782..95a2a45250 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.spec.ts
@@ -1,10 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { KubernetesNodeTagsCardComponent } from './kubernetes-node-tags-card.component';
 import { BaseKubeGuid } from '../../../../kubernetes-page.types';
+import { KubernetesBaseTestModules } from '../../../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service';
 import { KubernetesNodeService } from '../../../../services/kubernetes-node.service';
-import { KubernetesBaseTestModules } from '../../../../kubernetes.testing.module';
+import { KubernetesNodeTagsCardComponent } from './kubernetes-node-tags-card.component';
 
 describe('KubernetesNodeTagsCardComponent', () => {
   let component: KubernetesNodeTagsCardComponent;
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts
index d77863ac9e..671d7234ec 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts
@@ -1,9 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { NodePodCountComponent } from './node-pod-count.component';
-import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
 import { BaseKubeGuid } from '../../../kubernetes-page.types';
 import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
+import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
+import { NodePodCountComponent } from './node-pod-count.component';
 
 describe('NodePodCountComponent', () => {
   let component: NodePodCountComponent;
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.spec.ts
index cd0aaead9c..01d73f4751 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.spec.ts
@@ -1,8 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { KubernetesPodTagsComponent } from './kubernetes-pod-tags.component';
-import { KubernetesStatus } from '../../../store/kube.types';
 import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
+import { KubernetesStatus } from '../../../store/kube.types';
+import { KubernetesPodTagsComponent } from './kubernetes-pod-tags.component';
 
 describe('KubernetesPodTagsComponent', () => {
   let component: KubernetesPodTagsComponent<any>;
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.spec.ts
index 1e84e7ab51..515736cc10 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.spec.ts
@@ -1,11 +1,11 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { PodNameLinkComponent } from './pod-name-link.component';
 import { BaseKubeGuid } from '../../../kubernetes-page.types';
+import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
 import { HelmReleaseService } from '../../../services/helm-release.service';
 import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
 import { KubernetesStatus } from '../../../store/kube.types';
-import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
+import { PodNameLinkComponent } from './pod-name-link.component';
 
 describe('PodNameLinkComponent', () => {
   let component: PodNameLinkComponent;
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.spec.ts
index e04276cd96..3beaf03a86 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.spec.ts
@@ -8,9 +8,9 @@ describe('KubernetesServicePortsComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ KubernetesServicePortsComponent ]
+      declarations: [KubernetesServicePortsComponent]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.spec.ts
index 86b1ad0612..2d25616922 100644
--- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.spec.ts
@@ -1,8 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { KubernetesAppsTabComponent } from './kubernetes-apps-tab.component';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesBaseTestModules } from '../../kubernetes.testing.module';
+import { KubernetesAppsTabComponent } from './kubernetes-apps-tab.component';
 
 describe('KubernetesAppsTabComponent', () => {
   let component: KubernetesAppsTabComponent;
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.spec.ts
index 6287f2de49..139bdd8e5a 100644
--- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.spec.ts
@@ -1,8 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { KubernetesNodesTabComponent } from './kubernetes-nodes-tab.component';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesBaseTestModules } from '../../kubernetes.testing.module';
+import { KubernetesNodesTabComponent } from './kubernetes-nodes-tab.component';
 
 describe('KubernetesNodesTabComponent', () => {
   let component: KubernetesNodesTabComponent;

From c4a972b7bffb55fe0b80fa5f4f51f21ebbff8d10 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 7 Oct 2019 14:40:11 +0100
Subject: [PATCH 123/648] Fixes after merge

---
 custom-src/frontend/app/custom/custom.module.ts       |  9 ++++-----
 .../app/custom/suse-login/suse-login.component.ts     | 11 +++++++----
 .../src/features/applications/applications.module.ts  |  2 ++
 .../features/cloud-foundry/cloud-foundry.module.ts    |  2 ++
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/custom-src/frontend/app/custom/custom.module.ts b/custom-src/frontend/app/custom/custom.module.ts
index 26e37acb63..c47dad826e 100644
--- a/custom-src/frontend/app/custom/custom.module.ts
+++ b/custom-src/frontend/app/custom/custom.module.ts
@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { Router } from '@angular/router';
 
 import { CoreModule } from '../core/core.module';
-import { Customizations, CustomizationsMetadata } from '../core/customizations.types';
+import { CustomizationService, CustomizationsMetadata } from '../core/customizations.types';
 import { MDAppModule } from '../core/md.module';
 import { SharedModule } from '../shared/shared.module';
 import { DemoHelperComponent } from './demo/demo-helper/demo-helper.component';
@@ -52,15 +52,14 @@ let init = false;
     SuseWelcomeComponent,
     DemoHelperComponent,
   ],
-  providers: [
-    { provide: Customizations, useValue: SuseCustomizations }
-  ],
 })
 export class CustomModule {
 
   static init = false;
 
-  constructor(router: Router) {
+  constructor(router: Router, cs: CustomizationService) {
+    cs.set(SuseCustomizations);
+
     init = true;
     // Only update the routes once
     if (!CustomModule.init) {
diff --git a/custom-src/frontend/app/custom/suse-login/suse-login.component.ts b/custom-src/frontend/app/custom/suse-login/suse-login.component.ts
index a94ef21177..8e308820c1 100644
--- a/custom-src/frontend/app/custom/suse-login/suse-login.component.ts
+++ b/custom-src/frontend/app/custom/suse-login/suse-login.component.ts
@@ -1,10 +1,10 @@
-import { Component, Inject, ViewEncapsulation } from '@angular/core';
+import { Component, ViewEncapsulation } from '@angular/core';
 import { Store } from '@ngrx/store';
 
-import { Customizations, CustomizationsMetadata } from '../../core/customizations.types';
+import { AppState } from '../../../../store/src/app-state';
+import { CustomizationService, CustomizationsMetadata } from '../../core/customizations.types';
 import { StratosLoginComponent } from '../../core/extension/extension-service';
 import { LoginPageComponent } from '../../features/login/login-page/login-page.component';
-import { AppState } from '../../../../store/src/app-state';
 
 @StratosLoginComponent()
 @Component({
@@ -15,10 +15,13 @@ import { AppState } from '../../../../store/src/app-state';
 })
 export class SuseLoginComponent extends LoginPageComponent {
 
+  public config: CustomizationsMetadata;
+
   constructor(
     store: Store<AppState>,
-    @Inject(Customizations) public config: CustomizationsMetadata
+    cs: CustomizationService
   ) {
     super(store);
+    this.config = cs.get();
   }
 }
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 e005b86e4d..30403e8a48 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,6 +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 { ApplicationDeleteComponent } from './application-delete/application-delete.component';
 import {
   DeleteAppServiceInstancesComponent,
@@ -41,6 +42,7 @@ import { SshApplicationComponent } from './ssh-application/ssh-application.compo
     CoreModule,
     SharedModule,
     ApplicationsRoutingModule,
+    CloudFoundryComponentsModule
   ],
   declarations: [
     ApplicationWallComponent,
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 b4b7a8f6cb..340d39ebb9 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
@@ -41,6 +41,7 @@ import {
   EndpointsListConfigService,
 } from '../../../../core/src/shared/components/list/list-types/endpoint/endpoints-list-config.service';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
+import { CloudFoundryComponentsModule } from '../../shared/components/components.module';
 import {
   CFEndpointsListConfigService,
 } from '../../shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service';
@@ -151,6 +152,7 @@ import { RemoveUserComponent } from './users/remove-user/remove-user.component';
     CloudFoundryRoutingModule,
     RouterModule,
     NgxChartsModule,
+    CloudFoundryComponentsModule
   ],
   declarations: [
     CloudFoundryBaseComponent,

From 6079c359cc73c52599ce1ac7f8086309eb5b44ab Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 7 Oct 2019 14:45:21 +0100
Subject: [PATCH 124/648] Tidying up

---
 .../frontend/app/custom/custom.module.ts      |  16 +--
 .../app/custom/helm/helm-entity-generator.ts  |   7 -
 .../app/custom/helm/helm.setup.module.ts      |   3 +-
 .../app/custom/helm/helm.store.module.ts      |  13 --
 .../kubernetes/kubernetes-entity-generator.ts |  11 --
 .../kubernetes/kubernetes.setup.module.ts     |   3 +-
 .../kubernetes/kubernetes.store.module.ts     | 121 ------------------
 .../kubernetes/kubernetes.testing.module.ts   |   1 -
 package.json                                  |   3 +-
 .../cloud-foundry/src/cf-entity-generator.ts  |   5 -
 10 files changed, 6 insertions(+), 177 deletions(-)

diff --git a/custom-src/frontend/app/custom/custom.module.ts b/custom-src/frontend/app/custom/custom.module.ts
index c47dad826e..9859039cda 100644
--- a/custom-src/frontend/app/custom/custom.module.ts
+++ b/custom-src/frontend/app/custom/custom.module.ts
@@ -20,24 +20,13 @@ const SuseCustomizations: CustomizationsMetadata = {
   alwaysShowNavForEndpointTypes: (typ) => false,
 };
 
-// TODO: RC Multi load issue
-@NgModule({})
-export class MockModule {
-  constructor() {
-    console.log('WONT WORK');
-  }
-}
-
-let init = false;
-
 @NgModule({
   imports: [
     CoreModule,
     SharedModule,
     MDAppModule,
-    // TODO: RC Multi load issue
-    init ? MockModule : KubernetesSetupModule,
-    init ? MockModule : HelmSetupModule,
+    KubernetesSetupModule,
+    HelmSetupModule,
   ],
   // FIXME: Ensure that anything lazy loaded/in kube endpoint pages is not included here - #3675
   declarations: [
@@ -60,7 +49,6 @@ export class CustomModule {
   constructor(router: Router, cs: CustomizationService) {
     cs.set(SuseCustomizations);
 
-    init = true;
     // Only update the routes once
     if (!CustomModule.init) {
       // Override the component used for the login route
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 6083680fdf..fd7298090a 100644
--- a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
+++ b/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
@@ -24,15 +24,8 @@ import {
   MonocularChart,
 } from './store/helm.types';
 
-// TODO: RC Multi load issue
-let hack = false;
 
 export function generateHelmEntities(): StratosBaseCatalogueEntity[] {
-  if (hack) {
-    return [];
-  }
-  hack = true;
-
   const endpointDefinition: StratosEndpointExtensionDefinition = {
     type: HELM_ENDPOINT_TYPE,
     label: 'Helm Repository',
diff --git a/custom-src/frontend/app/custom/helm/helm.setup.module.ts b/custom-src/frontend/app/custom/helm/helm.setup.module.ts
index 0f98cc1b62..779e7becfc 100644
--- a/custom-src/frontend/app/custom/helm/helm.setup.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm.setup.module.ts
@@ -28,9 +28,8 @@ export class HelmSetupModule {
     store: Store<AppState>,
     @Optional() @SkipSelf() parentModule: HelmSetupModule
   ) {
-    // TODO: RC Multi load issue
     if (parentModule) {
-      console.log('ALREADY IMPORTED, HELM HACK ACTIVATED');
+      // Module has already been imported
     } else {
       endpointService.registerHealthCheck(
         new EndpointHealthCheck(HELM_ENDPOINT_TYPE, (endpoint) => {
diff --git a/custom-src/frontend/app/custom/helm/helm.store.module.ts b/custom-src/frontend/app/custom/helm/helm.store.module.ts
index a16068a2dc..40b8febc72 100644
--- a/custom-src/frontend/app/custom/helm/helm.store.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm.store.module.ts
@@ -3,19 +3,6 @@ import { EffectsModule } from '@ngrx/effects';
 
 import { HelmEffects } from './store/helm.effects';
 
-// const helmEndpointTypes: EndpointTypeExtensionConfig[] = [{
-//   type: 'helm',
-//   label: 'Helm Repository',
-//   authTypes: [],
-//   icon: 'helm',
-//   iconFont: 'stratos-icons',
-//   imagePath: '/core/assets/custom/helm.svg',
-//   homeLink: (guid) => ['/monocular/repos', guid],
-//   entitySchemaKeys: monocularEntityKeys,
-//   doesNotSupportConnect: true,
-//   techPreview: true,
-// }];
-
 @NgModule({
   imports: [
     EffectsModule.forFeature([
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 53320f759d..8bb6df0740 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
@@ -99,18 +99,7 @@ const kubeAuthTypeMap: { [type: string]: EndpointAuthTypeConfig } = {
   }
 };
 
-// TODO: RC Multi load issue
-/**
- * CustomImportModule brings in CustomModule. CustomModule brings in kube setup module. setup module brings this in multiple times
- */
-let hack = false;
-
 export function generateKubernetesEntities(): StratosBaseCatalogueEntity[] {
-  if (hack) {
-    return [];
-  }
-  hack = true;
-
   const endpointDefinition: StratosEndpointExtensionDefinition = {
     type: KUBERNETES_ENDPOINT_TYPE,
     label: 'Kubernetes',
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
index 9156b6df13..5ade43114c 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
@@ -49,9 +49,8 @@ export class KubernetesSetupModule {
     store: Store<AppState>,
     @Optional() @SkipSelf() parentModule: KubernetesSetupModule
   ) {
-    // TODO: RC Multi load issue
     if (parentModule) {
-      console.log('ALREADY IMPORTED, KUBE HACK ACTIVATED');
+      // Module has already been imported
     } else {
       endpointService.registerHealthCheck(
         new EndpointHealthCheck(KUBERNETES_ENDPOINT_TYPE, (endpoint) => store.dispatch(new KubeHealthCheck(endpoint.guid)))
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.store.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.store.module.ts
index 89934f18f7..f0a76a9017 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.store.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.store.module.ts
@@ -11,124 +11,3 @@ import { KubernetesEffects } from './store/kubernetes.effects';
   ]
 })
 export class KubernetesStoreModule { }
-
-// import { NgModule } from '@angular/core';
-// import { Validators } from '@angular/forms';
-
-// import { CoreModule } from '../../core/core.module';
-// import { StratosExtension } from '../../core/extension/extension-service';
-// import { EndpointAuthTypeConfig, EndpointType, EndpointTypeExtensionConfig } from '../../core/extension/extension-types';
-// import { KubernetesAWSAuthFormComponent } from './auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component';
-// import {
-//   KubernetesCertsAuthFormComponent,
-// } from './auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component';
-// import {
-//   KubernetesConfigAuthFormComponent,
-// } from './auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component';
-// import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component';
-// import { kubernetesEntities, kubernetesEntityKeys } from './store/kubernetes.entities';
-
-// const enum KubeEndpointAuthTypes {
-//   CERT_AUTH = 'kube-cert-auth',
-//   CONFIG = 'kubeconfig',
-//   CONFIG_AZ = 'kubeconfig-az',
-//   AWS_IAM = 'aws-iam',
-//   GKE = 'gke-auth'
-// }
-
-// const kubernetesEndpointTypes: EndpointTypeExtensionConfig[] = [{
-//   type: 'k8s',
-//   label: 'Kubernetes',
-//   subTypes: [{
-//     subType: 'caasp',
-//     label: 'SUSE CaaS Platform',
-//     authTypes: [KubeEndpointAuthTypes.CONFIG],
-//     imagePath: '/core/assets/custom/caasp.png'
-//   }, {
-//     subType: 'aks',
-//     label: 'Azure AKS',
-//     authTypes: [KubeEndpointAuthTypes.CONFIG_AZ],
-//     imagePath: '/core/assets/custom/aks.svg'
-//   }, {
-//     subType: 'eks',
-//     label: 'Amazon EKS',
-//     authTypes: [KubeEndpointAuthTypes.AWS_IAM],
-//     imagePath: '/core/assets/custom/eks.svg'
-//   }, {
-//     subType: 'gke',
-//     label: 'Google Kubernetes Engine',
-//     authTypes: [KubeEndpointAuthTypes.GKE],
-//     imagePath: '/core/assets/custom/gke.svg'
-//   }],
-//   authTypes: [KubeEndpointAuthTypes.CERT_AUTH],
-//   icon: 'kubernetes',
-//   iconFont: 'stratos-icons',
-//   imagePath: '/core/assets/custom/kubernetes.svg',
-//   homeLink: (guid) => ['/kubernetes', guid],
-//   entitySchemaKeys: kubernetesEntityKeys,
-//   order: 4
-// }];
-
-
-// const kubernetesAuthTypes: EndpointAuthTypeConfig[] = [{
-//   value: KubeEndpointAuthTypes.CONFIG,
-//   name: 'CAASP (OIDC)',
-//   form: {
-//     kubeconfig: ['', Validators.required],
-//   },
-//   types: new Array<EndpointType>(),
-//   component: KubernetesConfigAuthFormComponent
-// },
-// {
-//   value: KubeEndpointAuthTypes.CONFIG_AZ,
-//   name: 'Azure AKS',
-//   form: {
-//     kubeconfig: ['', Validators.required],
-//   },
-//   types: new Array<EndpointType>(),
-//   component: KubernetesConfigAuthFormComponent
-// },
-// {
-//   value: KubeEndpointAuthTypes.AWS_IAM,
-//   name: 'AWS IAM (EKS)',
-//   form: {
-//     cluster: ['', Validators.required],
-//     access_key: ['', Validators.required],
-//     secret_key: ['', Validators.required],
-//   },
-//   types: new Array<EndpointType>(),
-//   component: KubernetesAWSAuthFormComponent
-// },
-// {
-//   value: KubeEndpointAuthTypes.CERT_AUTH,
-//   name: 'Kubernetes Cert Auth',
-//   form: {
-//     cert: ['', Validators.required],
-//     certKey: ['', Validators.required],
-//   },
-//   types: new Array<EndpointType>(),
-//   component: KubernetesCertsAuthFormComponent
-// },
-// {
-//   value: KubeEndpointAuthTypes.GKE,
-//   name: 'GKE',
-//   form: {
-//     gkeconfig: ['', Validators.required],
-//   },
-//   types: new Array<EndpointType>(),
-//   component: KubernetesGKEAuthFormComponent,
-//   help: '/core/assets/custom/help/en/connecting_gke.md'
-// }
-// ];
-
-// @StratosExtension({
-//   endpointTypes: kubernetesEndpointTypes,
-//   authTypes: kubernetesAuthTypes,
-//   entities: kubernetesEntities,
-// })
-// @NgModule({
-//   imports: [
-//     CoreModule
-//   ]
-// })
-// export class KubernetesStoreModule { }
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 1097eddbb4..f3a72f9d74 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
@@ -11,7 +11,6 @@ import { entityCatalogue, TestEntityCatalogue } from '../../core/entity-catalogu
 import { SharedModule } from '../../shared/shared.module';
 import { generateKubernetesEntities } from './kubernetes-entity-generator';
 
-// TODO: RC import store as well
 @NgModule({
   imports: [{
     ngModule: EntityCatalogueFeatureModule,
diff --git a/package.json b/package.json
index e20cdc4a3d..613b3ce260 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
     "ng": "ng",
     "start": "npm run customize && ng serve",
     "start-high-mem": "npm run customize && node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng serve",
+    "start-dev-high-mem": "npm run customize && node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng serve --aot=false",
     "start-prod-high-mem": "npm run customize && node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng serve --prod",
     "start-dev": "ng serve --aot=false",
     "test": "run-s test-frontend:* --continue-on-error",
@@ -144,4 +145,4 @@
     "tslint": "~5.13.0",
     "typescript": "~3.1.6"
   }
-}
\ 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 f217ba5494..a59aaca7f7 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
@@ -134,11 +134,6 @@ export interface CFBasePipelineRequestActionMeta {
   flatten?: boolean;
 }
 
-// TODO: RC not used
-// export function registerCFEntities() {
-//   generateCFEntities().forEach(entity => entityCatalogue.register(entity));
-// }
-
 export function generateCFEntities(): StratosBaseCatalogueEntity[] {
   const endpointDefinition: StratosEndpointExtensionDefinition = {
     urlValidationRegexString: urlValidationExpression,

From 72e29b116632d7f24c7a9e635dfc97a77c5d9c9a Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 8 Oct 2019 13:08:57 +0100
Subject: [PATCH 125/648] CustomizationService fixes

---
 custom-src/frontend/app/custom/custom.module.ts   | 15 +++++++--------
 .../app/custom/suse-login/suse-login.component.ts | 11 +++++++----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/custom-src/frontend/app/custom/custom.module.ts b/custom-src/frontend/app/custom/custom.module.ts
index 6f83726f5b..55b9ebe6ae 100644
--- a/custom-src/frontend/app/custom/custom.module.ts
+++ b/custom-src/frontend/app/custom/custom.module.ts
@@ -6,17 +6,17 @@ import { GetSystemInfo } from '../../../store/src/actions/system.actions';
 import { AppState } from '../../../store/src/app-state';
 import { EndpointHealthCheck } from '../../endpoints-health-checks';
 import { CoreModule } from '../core/core.module';
-import { Customizations, CustomizationsMetadata } from '../core/customizations.types';
+import { CustomizationService, CustomizationsMetadata } from '../core/customizations.types';
 import { EndpointsService } from '../core/endpoints.service';
 import { MDAppModule } from '../core/md.module';
 import { SharedModule } from '../shared/shared.module';
 import { DemoHelperComponent } from './demo/demo-helper/demo-helper.component';
+import { HelmModule } from './helm/helm.module';
+import { HelmSetupModule } from './helm/helm.setup.module';
 import { KubernetesSetupModule } from './kubernetes/kubernetes.setup.module';
 import { KubeHealthCheck } from './kubernetes/store/kubernetes.actions';
 import { SuseAboutInfoComponent } from './suse-about-info/suse-about-info.component';
 import { SuseLoginComponent } from './suse-login/suse-login.component';
-import { HelmModule } from './helm/helm.module';
-import { HelmSetupModule } from './helm/helm.setup.module';
 import { SuseWelcomeComponent } from './suse-welcome/suse-welcome.component';
 
 const SuseCustomizations: CustomizationsMetadata = {
@@ -47,16 +47,15 @@ const SuseCustomizations: CustomizationsMetadata = {
     SuseAboutInfoComponent,
     SuseWelcomeComponent,
     DemoHelperComponent,
-  ],
-  providers: [
-    { provide: Customizations, useValue: SuseCustomizations }
-  ],
+  ]
 })
 export class CustomModule {
 
   static init = false;
 
-  constructor(endpointService: EndpointsService, store: Store<AppState>, router: Router) {
+  constructor(endpointService: EndpointsService, store: Store<AppState>, router: Router, cs: CustomizationService) {
+    cs.set(SuseCustomizations);
+
     endpointService.registerHealthCheck(
       new EndpointHealthCheck('k8s', (endpoint) => store.dispatch(new KubeHealthCheck(endpoint.guid)))
     );
diff --git a/custom-src/frontend/app/custom/suse-login/suse-login.component.ts b/custom-src/frontend/app/custom/suse-login/suse-login.component.ts
index a94ef21177..8e308820c1 100644
--- a/custom-src/frontend/app/custom/suse-login/suse-login.component.ts
+++ b/custom-src/frontend/app/custom/suse-login/suse-login.component.ts
@@ -1,10 +1,10 @@
-import { Component, Inject, ViewEncapsulation } from '@angular/core';
+import { Component, ViewEncapsulation } from '@angular/core';
 import { Store } from '@ngrx/store';
 
-import { Customizations, CustomizationsMetadata } from '../../core/customizations.types';
+import { AppState } from '../../../../store/src/app-state';
+import { CustomizationService, CustomizationsMetadata } from '../../core/customizations.types';
 import { StratosLoginComponent } from '../../core/extension/extension-service';
 import { LoginPageComponent } from '../../features/login/login-page/login-page.component';
-import { AppState } from '../../../../store/src/app-state';
 
 @StratosLoginComponent()
 @Component({
@@ -15,10 +15,13 @@ import { AppState } from '../../../../store/src/app-state';
 })
 export class SuseLoginComponent extends LoginPageComponent {
 
+  public config: CustomizationsMetadata;
+
   constructor(
     store: Store<AppState>,
-    @Inject(Customizations) public config: CustomizationsMetadata
+    cs: CustomizationService
   ) {
     super(store);
+    this.config = cs.get();
   }
 }

From 6e04bf30f5e19d408b00d1bef639f8db8e14a86d Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 8 Oct 2019 14:42:45 +0100
Subject: [PATCH 126/648] Fix connect to GKE

---
 src/jetstream/plugins/kubernetes/main.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index cafcbca15d..8e98096659 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -91,6 +91,7 @@ func (c *KubernetesSpecification) Connect(ec echo.Context, cnsiRecord interfaces
 // Init the Kubernetes Jetstream plugin
 func (c *KubernetesSpecification) Init() error {
 
+	c.AddAuthProvider(auth.InitGKEKubeAuth(c.portalProxy))
 	c.AddAuthProvider(auth.InitAWSKubeAuth(c.portalProxy))
 	c.AddAuthProvider(auth.InitCertKubeAuth(c.portalProxy))
 	c.AddAuthProvider(auth.InitAzureKubeAuth(c.portalProxy))

From 9b02fbbdb07fa477a3402598b0512b4e24a4e326 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 8 Oct 2019 14:49:34 +0100
Subject: [PATCH 127/648] Fixes following merge Also contains -
 https://github.com/cloudfoundry-incubator/stratos/pull/3972 -
 https://github.com/SUSE/stratos/pull/227

---
 .../app/custom/helm/helm-entity-generator.ts         |  2 +-
 .../custom/kubernetes/kubernetes-entity-generator.ts | 12 ++++++++----
 .../entity-catalogue/entity-catalogue.service.ts     |  3 ++-
 src/jetstream/plugins/kubernetes/main.go             |  1 +
 4 files changed, 12 insertions(+), 6 deletions(-)

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 fd7298090a..771d9cb170 100644
--- a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
+++ b/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
@@ -37,7 +37,7 @@ export function generateHelmEntities(): StratosBaseCatalogueEntity[] {
     unConnectable: true,
     techPreview: true,
     authTypes: [],
-    renderPriority: 5,
+    renderPriority: 10,
   };
   return [
     generateEndpointEntity(endpointDefinition),
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 8bb6df0740..c6e79f120b 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
@@ -114,22 +114,26 @@ export function generateKubernetesEntities(): StratosBaseCatalogueEntity[] {
       type: 'caasp',
       label: 'SUSE CaaS Platform',
       authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.CONFIG]],
-      logoUrl: '/core/assets/custom/caasp.png'
+      logoUrl: '/core/assets/custom/caasp.png',
+      renderPriority: 5
     }, {
       type: 'aks',
       label: 'Azure AKS',
       authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.CONFIG_AZ]],
-      logoUrl: '/core/assets/custom/aks.svg'
+      logoUrl: '/core/assets/custom/aks.svg',
+      renderPriority: 6
     }, {
       type: 'eks',
       label: 'Amazon EKS',
       authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.AWS_IAM]],
-      logoUrl: '/core/assets/custom/eks.svg'
+      logoUrl: '/core/assets/custom/eks.svg',
+      renderPriority: 6
     }, {
       type: 'gke',
       label: 'Google Kubernetes Engine',
       authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.GKE]],
-      logoUrl: '/core/assets/custom/gke.svg'
+      logoUrl: '/core/assets/custom/gke.svg',
+      renderPriority: 6
     }],
   };
   return [
diff --git a/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.service.ts b/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.service.ts
index 94038692ef..80fdc4a4df 100644
--- a/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.service.ts
+++ b/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.service.ts
@@ -62,7 +62,8 @@ class EntityCatalogue {
     // Ensure the subtype inherits parent
     return new StratosBaseCatalogueEntity({
       ...parent,
-      ...subtype
+      ...subtype,
+      parentType: parent.type
     }, { ...entity.builders });
   }
 
diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index cafcbca15d..8e98096659 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -91,6 +91,7 @@ func (c *KubernetesSpecification) Connect(ec echo.Context, cnsiRecord interfaces
 // Init the Kubernetes Jetstream plugin
 func (c *KubernetesSpecification) Init() error {
 
+	c.AddAuthProvider(auth.InitGKEKubeAuth(c.portalProxy))
 	c.AddAuthProvider(auth.InitAWSKubeAuth(c.portalProxy))
 	c.AddAuthProvider(auth.InitCertKubeAuth(c.portalProxy))
 	c.AddAuthProvider(auth.InitAzureKubeAuth(c.portalProxy))

From f32b8579b7000892d95a4484748b12dbb3748c1e Mon Sep 17 00:00:00 2001
From: Nathan Jones <njones@suse.com>
Date: Tue, 8 Oct 2019 15:03:49 +0100
Subject: [PATCH 128/648] Exception on the pods list with failed pods

---
 .../kubernetes-pods/kubernetes-pods-list-config.service.ts     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
index 3c097b2cbd..6b02a6e2bd 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
@@ -80,6 +80,9 @@ export class KubernetesPodsListConfigService implements IListConfig<KubernetesPo
       columnId: 'container-status', headerCell: () => `Ready Containers`,
       cellDefinition: {
         getValue: (row) => {
+          if (row.status.phase === 'Failed') {
+            return `0 / ${row.spec.containers.length}`;
+          }
           const readyPods = row.status.containerStatuses.filter(status => status.ready).length;
           const allContainers = row.status.containerStatuses.length;
           return `${readyPods} / ${allContainers}`;

From 45124c62388a1bcc3c5a65dcb8d1ad0e4cff752c Mon Sep 17 00:00:00 2001
From: Nathan Jones <njones@suse.com>
Date: Tue, 8 Oct 2019 17:07:30 +0100
Subject: [PATCH 129/648] Add 'Failed' to pod status enum

---
 custom-src/frontend/app/custom/kubernetes/store/kube.types.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
index ba05430610..bf5a26ed0a 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
@@ -192,6 +192,7 @@ export interface KubernetesPod extends BasicKubeAPIResource {
 export enum KubernetesStatus {
   ACTIVE = 'Active',
   RUNNING = 'Running',
+  FAILED = 'Failed',
 }
 export interface KubernetesNamespace extends BasicKubeAPIResource {
   metadata: Metadata;

From f8320e50059527dc9bf93f00a6a5b4e2887dab04 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 9 Oct 2019 11:00:15 +0100
Subject: [PATCH 130/648] Fix unit tests following subtype change

---
 .../entity-catalogue/entity-catalogue.service.spec.ts  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.service.spec.ts b/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.service.spec.ts
index 5ad7ec1c13..00323f77b7 100644
--- a/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.service.spec.ts
+++ b/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.service.spec.ts
@@ -1,10 +1,10 @@
 import { EntitySchema } from '../../../../store/src/helpers/entity-schema';
 import { endpointEntitySchema } from '../../base-entity-schemas';
-import { TestEntityCatalogue } from './entity-catalogue.service';
 import { BaseEndpointAuth } from '../../features/endpoints/endpoint-auth';
 import { EndpointListDetailsComponent } from '../../shared/components/list/list-types/endpoint/endpoint-list.helpers';
+import { StratosCatalogueEndpointEntity, StratosCatalogueEntity } from './entity-catalogue-entity';
+import { TestEntityCatalogue } from './entity-catalogue.service';
 import { IStratosEndpointDefinition } from './entity-catalogue.types';
-import { StratosCatalogueEntity, StratosCatalogueEndpointEntity } from './entity-catalogue-entity';
 
 describe('EntityCatalogueService', () => {
   let entityCatalogue: TestEntityCatalogue;
@@ -133,7 +133,7 @@ describe('EntityCatalogueService', () => {
       ]
     };
     entityCatalogue.register(new StratosCatalogueEndpointEntity(definition));
-    const expected = {
+    const expected: IStratosEndpointDefinition = {
       ...subtypeDefinition,
       icon: 'cloud_foundry',
       iconFont: 'stratos-icons',
@@ -141,6 +141,7 @@ describe('EntityCatalogueService', () => {
       schema: {
         default: endpointEntitySchema
       },
+      parentType: endpoint.type
     };
     const catalogueEntity = entityCatalogue.getEndpoint(endpoint.type, SUBTYPE_TYPE);
     expect(catalogueEntity).not.toBeUndefined();
@@ -175,7 +176,8 @@ describe('EntityCatalogueService', () => {
       endpoint,
       schema: {
         default: schema,
-      }
+      },
+      parentType: TYPE
     };
     const catalogueEntity = entityCatalogue.getEntity(endpoint.type, TYPE, SUBTYPE_TYPE);
     expect(catalogueEntity).not.toBeUndefined();

From 6db26b4c2f8f25a0dacd464954fe51ad95ec082e Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 9 Oct 2019 11:34:05 +0100
Subject: [PATCH 131/648] Fix e2e test import

---
 src/test-e2e/cloud-foundry/users-removal-e2e.helper.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 fd0af59581..48fd9b13c7 100644
--- a/src/test-e2e/cloud-foundry/users-removal-e2e.helper.ts
+++ b/src/test-e2e/cloud-foundry/users-removal-e2e.helper.ts
@@ -1,8 +1,8 @@
 import { browser, by, element, promise } from 'protractor';
 import { protractor } from 'protractor/built/ptor';
 
+import { CfUser } from '../../frontend/packages/cloud-foundry/src/store/types/user.types';
 import { APIResource } from '../../frontend/packages/store/src/types/api.types';
-import { CfUser } from '../../frontend/packages/store/src/types/user.types';
 import { e2e } from '../e2e';
 import { CFHelpers } from '../helpers/cf-helpers';
 import { ConsoleUserType, E2EHelpers } from '../helpers/e2e-helpers';

From a0c5789e492a8e8cf7001bbfed0ca845743bb814 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 9 Oct 2019 14:00:16 +0100
Subject: [PATCH 132/648] Fix unit test following moved merged file

---
 .../app-instance/cf-app-instances-config.service.spec.ts     | 5 -----
 1 file changed, 5 deletions(-)

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 9817c92744..f52635cbd8 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
@@ -3,7 +3,6 @@ import { inject, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
 import { CoreModule } from '../../../../../../../core/src/core/core.module';
-import { CustomImportModule } from '../../../../../../../core/src/custom-import.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';
@@ -48,10 +47,6 @@ describe('CfAppInstancesConfigService', () => {
         ApplicationsModule,
         RouterTestingModule,
       ]
-    }).overrideModule(ApplicationsModule, {
-      remove: {
-        imports: [CustomImportModule]
-      }
     });
   });
 

From 65c983f7dcb4c5dc8f7e78fa0d912ff3e96db5e9 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 11 Oct 2019 16:15:53 +0100
Subject: [PATCH 133/648] Update following design doc -
 https://xd.adobe.com/spec/dcd4203c-d334-462e-7921-ea6c3ef41151-aae5/screen/a2ea0108-1ae5-418f-8153-bc2a1fe985d5/Filter/
 - Include optional labels list component - Fix issue where search term was
 not capitalised - Improve typing

---
 .../custom/kubernetes/kubernetes.module.ts    | 27 ++++++----
 .../kubernetes-labels-cell.component.html     |  1 +
 .../kubernetes-labels-cell.component.scss     |  0
 .../kubernetes-labels-cell.component.spec.ts  | 45 ++++++++++++++++
 .../kubernetes-labels-cell.component.ts       | 26 ++++++++++
 .../condition-cell.component.ts               | 17 ------
 .../kubernetes-node-ips.component.html        |  1 +
 .../kubernetes-node-ips.component.scss        |  5 ++
 .../kubernetes-node-ips.component.spec.ts     | 46 ++++++++++++++++
 .../kubernetes-node-ips.component.ts          | 26 ++++++++++
 .../kubernetes-node-labels.component.html     |  1 +
 .../kubernetes-node-labels.component.scss     |  5 ++
 .../kubernetes-node-labels.component.spec.ts  | 46 ++++++++++++++++
 .../kubernetes-node-labels.component.ts       | 25 +++++++++
 .../kubernetes-node-link.component.spec.ts    |  8 +--
 .../kubernetes-node-link.component.ts         |  5 +-
 .../kubernetes-node-pressure.component.html   |  9 ++++
 .../kubernetes-node-pressure.component.scss   | 12 +++++
 ...kubernetes-node-pressure.component.spec.ts | 46 ++++++++++++++++
 ...ernetes-node-pressure.component.theme.scss | 13 +++++
 .../kubernetes-node-pressure.component.ts     | 26 ++++++++++
 .../kubernetes-node-condition.component.ts    | 11 ++--
 .../kubernetes-nodes-list-config.service.ts   | 52 +++++++++++--------
 .../app/custom/kubernetes/store/kube.types.ts | 27 +++++++---
 24 files changed, 409 insertions(+), 71 deletions(-)
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.html
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.scss
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.html
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.scss
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.html
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.scss
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.html
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.scss
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.theme.scss
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.ts

diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
index 6cf7f688ec..e9f7dbfad8 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
@@ -40,23 +40,27 @@ import { AppLinkComponent } from './list-types/kubernetes-apps/app-link/app-link
 import {
   KubeAppcreatedDateComponent,
 } from './list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component';
+import { KubernetesLabelsCellComponent } from './list-types/kubernetes-labels-cell/kubernetes-labels-cell.component';
 import {
   KubeNamespacePodCountComponent,
 } from './list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component';
 import {
   KubernetesNamespaceLinkComponent,
 } from './list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component';
-import {
-  ConditionCellComponent,
-  InverseConditionCellComponent,
-  SubtleConditionCellComponent,
-} from './list-types/kubernetes-nodes/condition-cell/condition-cell.component';
+import { ConditionCellComponent } from './list-types/kubernetes-nodes/condition-cell/condition-cell.component';
 import {
   KubernetesNodeCapacityComponent,
 } from './list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component';
+import { KubernetesNodeIpsComponent } from './list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component';
+import {
+  KubernetesNodeLabelsComponent,
+} from './list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component';
 import {
   KubernetesNodeLinkComponent,
 } from './list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component';
+import {
+  KubernetesNodePressureComponent,
+} from './list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component';
 import {
   KubernetesNodeConditionCardComponent,
 } from './list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component';
@@ -91,6 +95,7 @@ import { KubernetesPodsTabComponent } from './tabs/kubernetes-pods-tab/kubernete
 import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kubernetes-summary.component';
 
 
+
 /* tslint:enable */
 
 @NgModule({
@@ -120,6 +125,10 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     HelmReleaseSummaryCardComponent,
     PodMetricsComponent,
     KubernetesNodeLinkComponent,
+    KubernetesNodeIpsComponent,
+    KubernetesNodeLabelsComponent,
+    KubernetesNodePressureComponent,
+    KubernetesLabelsCellComponent,
     KubernetesNodeComponent,
     KubernetesNodeSummaryComponent,
     KubernetesNodePodsComponent,
@@ -134,8 +143,6 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     KubernetesNodeMetricStatsCardComponent,
     KubernetesNodeSimpleMetricComponent,
     ConditionCellComponent,
-    InverseConditionCellComponent,
-    SubtleConditionCellComponent,
     KubernetesNamespaceLinkComponent,
     KubernetesNamespaceComponent,
     KubernetesNamespacePodsComponent,
@@ -161,9 +168,11 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     KubernetesPodTagsComponent,
     AppLinkComponent,
     KubernetesNodeLinkComponent,
+    KubernetesNodeIpsComponent,
+    KubernetesNodeLabelsComponent,
+    KubernetesNodePressureComponent,
+    KubernetesLabelsCellComponent,
     ConditionCellComponent,
-    InverseConditionCellComponent,
-    SubtleConditionCellComponent,
     KubernetesNamespaceLinkComponent,
     KubeAppcreatedDateComponent,
     KubeNamespacePodCountComponent,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.html
new file mode 100644
index 0000000000..ba47496e44
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.html
@@ -0,0 +1 @@
+<app-chips [chips]="chipsConfig"></app-chips>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts
new file mode 100644
index 0000000000..4c332d1f29
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts
@@ -0,0 +1,45 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { KubernetesStatus } from '../../../../../../../../../custom-src/frontend/app/custom/kubernetes/store/kube.types';
+import { BaseTestModules } from '../../../../../test-framework/core-test.helper';
+import { KubernetesLabelsCellComponent } from './kubernetes-labels-cell.component';
+
+describe('KubernetesLabelsCellComponent', () => {
+  let component: KubernetesLabelsCellComponent;
+  let fixture: ComponentFixture<KubernetesLabelsCellComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [KubernetesLabelsCellComponent],
+      imports: BaseTestModules
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubernetesLabelsCellComponent);
+    component = fixture.componentInstance;
+    component.row = {
+      metadata: {
+        labels: {},
+        namespace: 'test',
+        name: 'test',
+        uid: 'test'
+      },
+      status: {
+        phase: KubernetesStatus.ACTIVE
+      },
+      spec: {
+        containers: [],
+        nodeName: 'test',
+        schedulerName: 'test',
+        initContainers: []
+      }
+    };
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.ts
new file mode 100644
index 0000000000..46a6891b28
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.ts
@@ -0,0 +1,26 @@
+import { Component, OnInit } from '@angular/core';
+
+import { AppChip } from '../../../../shared/components/chips/chips.component';
+import { TableCellCustom } from '../../../../shared/components/list/list.types';
+import { KubeAPIResource } from '../../store/kube.types';
+
+
+@Component({
+  selector: 'app-kubernetes-labels-cell',
+  templateUrl: './kubernetes-labels-cell.component.html',
+  styleUrls: ['./kubernetes-labels-cell.component.scss']
+})
+export class KubernetesLabelsCellComponent extends TableCellCustom<KubeAPIResource> implements OnInit {
+
+  chipsConfig: AppChip<KubeAPIResource>[];
+
+  constructor() {
+    super();
+  }
+
+  ngOnInit() {
+    this.chipsConfig = Object.entries(this.row.metadata.labels).map(([key, value]) => ({
+      value: `${key}:${value}`
+    }));
+  }
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts
index 4e90794278..55bb13dee8 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts
@@ -35,20 +35,3 @@ export class ConditionCellComponent extends TableCellCustom<KubernetesNode> impl
   }
 
 }
-
-export class SubtleConditionCellComponent extends ConditionCellComponent {
-
-  constructor() {
-    super();
-    this.subtle = true;
-  }
-}
-
-
-export class InverseConditionCellComponent extends ConditionCellComponent {
-
-  constructor() {
-    super();
-    this.inverse = true;
-  }
-}
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.html
new file mode 100644
index 0000000000..fb1c936c0a
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.html
@@ -0,0 +1 @@
+<mat-icon matTooltip="{{tooltip}}">language</mat-icon>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.scss
new file mode 100644
index 0000000000..03d64068f2
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.scss
@@ -0,0 +1,5 @@
+mat-icon {
+  font-size: 20px;
+  height: 20px;
+  width: 20px;
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts
new file mode 100644
index 0000000000..807f5cb307
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts
@@ -0,0 +1,46 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { BaseTestModules } from '../../../../../../test-framework/core-test.helper';
+import { KubernetesNodeIpsComponent } from './kubernetes-node-ips.component';
+
+describe('KubernetesNodeIpsComponent', () => {
+  let component: KubernetesNodeIpsComponent;
+  let fixture: ComponentFixture<KubernetesNodeIpsComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [KubernetesNodeIpsComponent],
+      imports: BaseTestModules
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubernetesNodeIpsComponent);
+    component = fixture.componentInstance;
+    component.row = {
+      metadata: {
+        labels: {},
+        namespace: 'test',
+        name: 'test',
+        uid: 'test'
+      },
+      status: {
+        conditions: [],
+        addresses: [],
+        images: []
+      },
+      spec: {
+        containers: [],
+        nodeName: 'test',
+        schedulerName: 'test',
+        initContainers: []
+      }
+    };
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.ts
new file mode 100644
index 0000000000..456cb420cc
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.ts
@@ -0,0 +1,26 @@
+import { Component, OnInit } from '@angular/core';
+
+import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { KubernetesAddressExternal, KubernetesAddressInternal, KubernetesNode } from '../../../store/kube.types';
+
+@Component({
+  selector: 'app-kubernetes-node-ips',
+  templateUrl: './kubernetes-node-ips.component.html',
+  styleUrls: ['./kubernetes-node-ips.component.scss']
+})
+export class KubernetesNodeIpsComponent extends TableCellCustom<KubernetesNode> implements OnInit {
+
+  tooltip: string;
+
+  constructor() {
+    super();
+  }
+
+  ngOnInit() {
+    this.tooltip = this.row.status.addresses
+      .filter(address => address.type === KubernetesAddressInternal || address.type === KubernetesAddressExternal)
+      .map(address => address.address)
+      .join(', ');
+  }
+
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.html
new file mode 100644
index 0000000000..e50abec150
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.html
@@ -0,0 +1 @@
+<mat-icon matTooltip="{{labels}}">info</mat-icon>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.scss
new file mode 100644
index 0000000000..03d64068f2
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.scss
@@ -0,0 +1,5 @@
+mat-icon {
+  font-size: 20px;
+  height: 20px;
+  width: 20px;
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts
new file mode 100644
index 0000000000..3ca174e16f
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts
@@ -0,0 +1,46 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { BaseTestModules } from '../../../../../../test-framework/core-test.helper';
+import { KubernetesNodeLabelsComponent } from './kubernetes-node-labels.component';
+
+describe('KubernetesNodeLabelsComponent', () => {
+  let component: KubernetesNodeLabelsComponent;
+  let fixture: ComponentFixture<KubernetesNodeLabelsComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [KubernetesNodeLabelsComponent],
+      imports: BaseTestModules
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubernetesNodeLabelsComponent);
+    component = fixture.componentInstance;
+    component.row = {
+      metadata: {
+        labels: {},
+        namespace: 'test',
+        name: 'test',
+        uid: 'test'
+      },
+      status: {
+        conditions: [],
+        addresses: [],
+        images: []
+      },
+      spec: {
+        containers: [],
+        nodeName: 'test',
+        schedulerName: 'test',
+        initContainers: []
+      }
+    };
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.ts
new file mode 100644
index 0000000000..2ee563db06
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.ts
@@ -0,0 +1,25 @@
+import { Component, OnInit } from '@angular/core';
+
+import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { KubernetesNode } from '../../../store/kube.types';
+
+@Component({
+  selector: 'app-kubernetes-node-labels',
+  templateUrl: './kubernetes-node-labels.component.html',
+  styleUrls: ['./kubernetes-node-labels.component.scss']
+})
+export class KubernetesNodeLabelsComponent extends TableCellCustom<KubernetesNode> implements OnInit {
+
+  labels: string;
+
+  constructor() {
+    super();
+  }
+
+  ngOnInit() {
+    this.labels = Object.entries(this.row.metadata.labels)
+      .map(([key, value]) => `${key}:${value}`)
+      .join(', ');
+  }
+
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts
index d84951cb45..4a6acb5d3e 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts
@@ -1,13 +1,13 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { KubernetesNodeLinkComponent } from './kubernetes-node-link.component';
 import { BaseKubeGuid } from '../../../kubernetes-page.types';
-import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
 import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
+import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
+import { KubernetesNodeLinkComponent } from './kubernetes-node-link.component';
 
 describe('KubernetesNodeLinkComponent', () => {
-  let component: KubernetesNodeLinkComponent<any>;
-  let fixture: ComponentFixture<KubernetesNodeLinkComponent<any>>;
+  let component: KubernetesNodeLinkComponent;
+  let fixture: ComponentFixture<KubernetesNodeLinkComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts
index 2d6f5059ca..21d7d00432 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts
@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core';
-import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
+
 import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
 import { KubernetesNode } from '../../../store/kube.types';
 
 @Component({
@@ -8,7 +9,7 @@ import { KubernetesNode } from '../../../store/kube.types';
   templateUrl: './kubernetes-node-link.component.html',
   styleUrls: ['./kubernetes-node-link.component.scss']
 })
-export class KubernetesNodeLinkComponent<T> extends TableCellCustom<KubernetesNode> implements OnInit {
+export class KubernetesNodeLinkComponent extends TableCellCustom<KubernetesNode> implements OnInit {
 
   public nodeLink;
   constructor(
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.html
new file mode 100644
index 0000000000..aeafa64566
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.html
@@ -0,0 +1,9 @@
+<ng-container *ngIf="errors.length; else noErrors">
+  <div *ngFor="let error of errors" class="pressure">
+    <mat-icon class="pressure__icon">info</mat-icon>
+    {{ error }}
+  </div>
+</ng-container>
+<ng-template #noErrors>
+  None
+</ng-template>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.scss
new file mode 100644
index 0000000000..38738ff61b
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.scss
@@ -0,0 +1,12 @@
+.pressure {
+  align-items: center;
+  display: flex;
+
+  &__icon {
+    color: red;
+    font-size: 20px;
+    height: 20px;
+    margin-right: 4px;
+    width: 20px;
+  }
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts
new file mode 100644
index 0000000000..4f543f9596
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts
@@ -0,0 +1,46 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { BaseTestModules } from '../../../../../../test-framework/core-test.helper';
+import { KubernetesNodePressureComponent } from './kubernetes-node-pressure.component';
+
+describe('KubernetesNodePressureComponent', () => {
+  let component: KubernetesNodePressureComponent;
+  let fixture: ComponentFixture<KubernetesNodePressureComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [KubernetesNodePressureComponent],
+      imports: BaseTestModules
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubernetesNodePressureComponent);
+    component = fixture.componentInstance;
+    component.row = {
+      metadata: {
+        labels: {},
+        namespace: 'test',
+        name: 'test',
+        uid: 'test'
+      },
+      status: {
+        conditions: [],
+        addresses: [],
+        images: []
+      },
+      spec: {
+        containers: [],
+        nodeName: 'test',
+        schedulerName: 'test',
+        initContainers: []
+      }
+    };
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.theme.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.theme.scss
new file mode 100644
index 0000000000..5508403ef1
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.theme.scss
@@ -0,0 +1,13 @@
+
+
+// Not currently used but should be - NJ
+@import '~@angular/material/theming';
+@mixin app-kubernetes-node-pressure($theme, $app-theme) {
+  $status: map-get($app-theme, status);
+  .pressure {
+    // color: map-get($status, danger);
+    &__icon {
+      color: map-get($status, danger);
+    }
+  }
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.ts
new file mode 100644
index 0000000000..09d1b10b64
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.ts
@@ -0,0 +1,26 @@
+import { Component, OnInit } from '@angular/core';
+
+import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { ConditionType, ConditionTypeLabels, KubernetesNode } from '../../../store/kube.types';
+
+@Component({
+  selector: 'app-kubernetes-node-pressure',
+  templateUrl: './kubernetes-node-pressure.component.html',
+  styleUrls: ['./kubernetes-node-pressure.component.scss']
+})
+export class KubernetesNodePressureComponent extends TableCellCustom<KubernetesNode> implements OnInit {
+
+  errors: string[] = [];
+
+  constructor() {
+    super();
+  }
+
+  ngOnInit() {
+    const conditions = this.row.status.conditions;
+    this.errors = conditions
+      .filter(c => c.type !== ConditionType.Ready)
+      .filter(c => c.status === 'True')
+      .map(condition => ConditionTypeLabels[condition.type] || condition.type);
+  }
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts
index 5f7baf1d35..6f2e961180 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts
@@ -3,7 +3,7 @@ import { Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
 import { KubernetesNodeService } from '../../../../../services/kubernetes-node.service';
-import { Condition, ConditionType } from '../../../../../store/kube.types';
+import { ConditionType, ConditionTypeLabels, KubernetesCondition } from '../../../../../store/kube.types';
 
 @Component({
   selector: 'app-kubernetes-node-condition',
@@ -23,12 +23,7 @@ export class KubernetesNodeConditionComponent implements OnInit {
   @Input()
   subtle = false;
 
-  public titles = {
-    Ready: 'Ready',
-    OutOfDisk: 'Out of Disk',
-    MemoryPressure: 'Memory Pressure',
-    DiskPressure: 'Disk Pressure'
-  };
+  public titles = ConditionTypeLabels;
 
   public icons = {
     Ready: ['done_outline', 'material-icons'],
@@ -51,7 +46,7 @@ export class KubernetesNodeConditionComponent implements OnInit {
     );
   }
 
-  shouldBeGreen(condition: Condition) {
+  shouldBeGreen(condition: KubernetesCondition) {
     if (condition.status === 'True') {
       if (condition.type === ConditionType.Ready) {
         return true;
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
index f86799211d..5d10ab5b48 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
@@ -7,12 +7,15 @@ import { DataFunction } from '../../../../shared/components/list/data-sources-co
 import { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
 import { IListConfig, IListFilter, ListViewTypes } from '../../../../shared/components/list/list.component.types';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
-import { ConditionType, KubernetesNode } from '../../store/kube.types';
+import { ConditionType, KubernetesAddressExternal, KubernetesAddressInternal, KubernetesNode } from '../../store/kube.types';
 import { defaultHelmKubeListPageSize } from '../kube-helm-list-types';
 import { getConditionSort } from '../kube-sort.helper';
-import { ConditionCellComponent, SubtleConditionCellComponent } from './condition-cell/condition-cell.component';
+import { ConditionCellComponent } from './condition-cell/condition-cell.component';
 import { KubernetesNodeCapacityComponent } from './kubernetes-node-capacity/kubernetes-node-capacity.component';
+import { KubernetesNodeIpsComponent } from './kubernetes-node-ips/kubernetes-node-ips.component';
+import { KubernetesNodeLabelsComponent } from './kubernetes-node-labels/kubernetes-node-labels.component';
 import { KubernetesNodeLinkComponent } from './kubernetes-node-link/kubernetes-node-link.component';
+import { KubernetesNodePressureComponent } from './kubernetes-node-pressure/kubernetes-node-pressure.component';
 import { KubernetesNodesDataSource } from './kubernetes-nodes-data-source';
 import { NodePodCountComponent } from './node-pod-count/node-pod-count.component';
 
@@ -37,6 +40,16 @@ export class KubernetesNodesListConfigService implements IListConfig<KubernetesN
       },
       cellFlex: '5',
     },
+    {
+      columnId: 'ips', headerCell: () => 'IPs',
+      cellComponent: KubernetesNodeIpsComponent,
+      cellFlex: '1',
+    },
+    {
+      columnId: 'labels', headerCell: () => 'Labels',
+      cellComponent: KubernetesNodeLabelsComponent,
+      cellFlex: '1',
+    },
     {
       columnId: 'ready', headerCell: () => 'Ready',
       cellConfig: {
@@ -48,21 +61,8 @@ export class KubernetesNodesListConfigService implements IListConfig<KubernetesN
       cellFlex: '2',
     },
     {
-      columnId: 'diskPressure', headerCell: () => 'Disk Pressure',
-      cellComponent: SubtleConditionCellComponent,
-      cellConfig: {
-        conditionType: ConditionType.DiskPressure
-      },
-      sort: getConditionSort(ConditionType.DiskPressure),
-      cellFlex: '2',
-    },
-    {
-      columnId: 'memPressure', headerCell: () => 'Memory Pressure',
-      cellComponent: SubtleConditionCellComponent,
-      cellConfig: {
-        conditionType: ConditionType.MemoryPressure
-      },
-      sort: getConditionSort(ConditionType.MemoryPressure),
+      columnId: 'condition', headerCell: () => 'Condition',
+      cellComponent: KubernetesNodePressureComponent,
       cellFlex: '2',
     },
     {
@@ -73,8 +73,14 @@ export class KubernetesNodesListConfigService implements IListConfig<KubernetesN
     {
       columnId: 'capacity', headerCell: () => 'Capacity',
       cellComponent: KubernetesNodeCapacityComponent,
-      cellFlex: '5',
+      cellFlex: '4',
     },
+    // Display labels as the usual chip list
+    // {
+    //   columnId: 'labels', headerCell: () => 'Labels',
+    //   cellComponent: KubernetesLabelsCellComponent,
+    //   cellFlex: '6',
+    // },
   ];
   filters: IListFilter[] = [
     {
@@ -118,20 +124,20 @@ export class KubernetesNodesListConfigService implements IListConfig<KubernetesN
   ) {
     const transformEntities: DataFunction<KubernetesNode>[] = [
       (entities: KubernetesNode[], paginationState: PaginationEntityState) => {
-        const filterString = paginationState.clientPagination.filter.string;
-
-        if (!filterString) {
+        if (!paginationState.clientPagination.filter.string) {
           return entities;
         }
 
+        const filterString = paginationState.clientPagination.filter.string.toUpperCase();
+
         const filterKey = paginationState.clientPagination.filter.filterKey;
 
         switch (filterKey) {
           case KubernetesNodesListFilterKeys.IP_ADDRESS:
             return entities.filter(node => {
               const ipAddress =
-                node.status.addresses.find(address => address.type === 'InternalIP') ||
-                node.status.addresses.find(address => address.type === 'ExternalIP');
+                node.status.addresses.find(address => address.type === KubernetesAddressInternal) ||
+                node.status.addresses.find(address => address.type === KubernetesAddressExternal);
               return ipAddress ? ipAddress.address.toUpperCase().includes(filterString) : false;
             });
 
diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
index bf5a26ed0a..db04efe87c 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
@@ -98,8 +98,8 @@ export interface KubernetesApp {
 export interface NodeStatus {
   capacity?: Capacity;
   allocatable?: Allocatable;
-  conditions: Condition[];
-  addresses: Address[];
+  conditions: KubernetesCondition[];
+  addresses: KubernetesAddress[];
   daemonEndpoints?: DaemonEndpoints;
   nodeInfo?: NodeInfo;
   images: Image[];
@@ -133,8 +133,16 @@ export enum ConditionType {
   OutOfDisk = 'OutOfDisk',
   MemoryPressure = 'MemoryPressure',
   DiskPressure = 'DiskPressure',
-  Ready = 'Ready'
-}
+  Ready = 'Ready',
+  PIDPressure = 'PIDPressure'
+}
+export const ConditionTypeLabels = {
+  [ConditionType.Ready]: 'Ready',
+  [ConditionType.OutOfDisk]: 'Out of Disk',
+  [ConditionType.MemoryPressure]: 'Memory Pressure',
+  [ConditionType.DiskPressure]: 'Disk Pressure',
+  [ConditionType.PIDPressure]: 'PID Pressure'
+};
 
 export enum ConditionStatus {
   False = 'False',
@@ -142,7 +150,7 @@ export enum ConditionStatus {
   Unknown = 'Unknown'
 }
 
-export interface Condition {
+export interface KubernetesCondition {
   type: ConditionType;
   status: ConditionStatus;
   lastHeartbeatTime: Date;
@@ -151,11 +159,14 @@ export interface Condition {
   message: string;
 }
 
-export interface Address {
+export interface KubernetesAddress {
   type: string;
   address: string;
 }
 
+export const KubernetesAddressInternal = 'InternalIP';
+export const KubernetesAddressExternal = 'ExternalIP';
+
 export interface KubeletEndpoint {
   Port: number;
 }
@@ -208,7 +219,7 @@ export interface BaseStatus {
 
 export interface PodStatus {
   phase: KubernetesStatus;
-  conditions?: Condition[];
+  conditions?: KubernetesCondition[];
   message?: string;
   reason?: string;
   hostIP?: string;
@@ -218,7 +229,7 @@ export interface PodStatus {
   qosClass?: string;
   initContainerStatuses?: ContainerStatus[];
 }
-export interface Condition {
+export interface KubernetesCondition {
   type: ConditionType;
   status: ConditionStatus;
   lastProbeTime?: any;

From f0eb1f2d5d6c707652479b71dc82e83f20cfad53 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Sat, 12 Oct 2019 13:19:58 +0100
Subject: [PATCH 134/648] Add sync scripts

---
 .../plugins/monocular/git-merge-subpath.sh    | 62 ++++++++++++++
 .../plugins/monocular/git-pull-downstream.sh  | 78 ++++++++++++++++++
 .../plugins/monocular/git-push-upstream.sh    | 80 +++++++++++++++++++
 3 files changed, 220 insertions(+)
 create mode 100755 src/jetstream/plugins/monocular/git-merge-subpath.sh
 create mode 100755 src/jetstream/plugins/monocular/git-pull-downstream.sh
 create mode 100755 src/jetstream/plugins/monocular/git-push-upstream.sh

diff --git a/src/jetstream/plugins/monocular/git-merge-subpath.sh b/src/jetstream/plugins/monocular/git-merge-subpath.sh
new file mode 100755
index 0000000000..f4b05cfc10
--- /dev/null
+++ b/src/jetstream/plugins/monocular/git-merge-subpath.sh
@@ -0,0 +1,62 @@
+#! /bin/bash
+
+#================================================
+# Attribution:
+# https://stackoverflow.com/questions/23937436/add-subdirectory-of-remote-repo-with-git-subtree/30386041#30386041
+#================================================================
+
+git-merge-subpath() {
+    local SQUASH
+    if [[ $1 == "--squash" ]]; then
+        SQUASH=1
+        shift
+    fi
+    if (( $# != 3 )); then
+        local PARAMS="[--squash] SOURCE_COMMIT SOURCE_PREFIX DEST_PREFIX"
+        echo "USAGE: ${FUNCNAME[0]} $PARAMS"
+        return 1
+    fi
+
+    # Friendly parameter names; strip any trailing slashes from prefixes.
+    local SOURCE_COMMIT="$1" SOURCE_PREFIX="${2%/}" DEST_PREFIX="${3%/}"
+
+    local SOURCE_SHA1
+    SOURCE_SHA1=$(git rev-parse --verify "$SOURCE_COMMIT^{commit}") || return 1
+
+    local OLD_SHA1
+    local GIT_ROOT=$(git rev-parse --show-toplevel)
+    if [[ -n "$(ls -A "$GIT_ROOT/$DEST_PREFIX" 2> /dev/null)" ]]; then
+        # OLD_SHA1 will remain empty if there is no match.
+        local RE="^${FUNCNAME[0]}: [0-9a-f]{40} $SOURCE_PREFIX $DEST_PREFIX\$"
+        OLD_SHA1=$(git log -1 --format=%b -E --grep="$RE" \
+                   | grep --color=never -E "$RE" | tail -1 | awk '{print $2}')
+    fi
+
+    local OLD_TREEISH
+    if [[ -n $OLD_SHA1 ]]; then
+        OLD_TREEISH="$OLD_SHA1:$SOURCE_PREFIX"
+    else
+        # This is the first time git-merge-subpath is run, so diff against the
+        # empty commit instead of the last commit created by git-merge-subpath.
+        OLD_TREEISH=$(git hash-object -t tree /dev/null)
+    fi &&
+
+    if [[ -z $SQUASH ]]; then
+        git merge -s ours --no-commit "$SOURCE_COMMIT"
+    fi &&
+
+    git diff --color=never "$OLD_TREEISH" "$SOURCE_COMMIT:$SOURCE_PREFIX" \
+        | git apply -3 --directory="$DEST_PREFIX" || git mergetool
+
+    if (( $? == 1 )); then
+        echo "Uh-oh! Try cleaning up with |git reset --merge|."
+	return 1
+    else
+        git commit -em "Merge $SOURCE_COMMIT:$SOURCE_PREFIX/ to $DEST_PREFIX/
+
+# Feel free to edit the title and body above, but make sure to keep the
+# ${FUNCNAME[0]}: line below intact, so ${FUNCNAME[0]} can find it
+# again when grepping git log.
+${FUNCNAME[0]}: $SOURCE_SHA1 $SOURCE_PREFIX $DEST_PREFIX"
+    fi
+}
diff --git a/src/jetstream/plugins/monocular/git-pull-downstream.sh b/src/jetstream/plugins/monocular/git-pull-downstream.sh
new file mode 100755
index 0000000000..27366e4560
--- /dev/null
+++ b/src/jetstream/plugins/monocular/git-pull-downstream.sh
@@ -0,0 +1,78 @@
+#!/bin/bash
+
+echo "=== Pull Monocular Code to Stratos Repo ===" >&1
+echo "Pulls the subtree under cmd from monocular repo into the src/jetstream/plugins/monocular subtree in stratos" >&1
+usage() {
+	echo    "Usage: git-pull-downstream.sh -f <MONOCULAR_FORK> [ -b <MONOCULAR_BRANCH>  | -r <MONOCULAR_REF> ]" >&1
+	echo    "  options:" >&1
+	printf  "    -f MONOCULAR_FORK         The upstream fork/repo to pull from\n" >&1
+	printf  "    ONE OF EITHER -m or -s must be set\n" >&1
+	echo    "    -m MONOCULAR_BRANCH       The upstream branch to pull from" >&1
+	echo    "    -s MONOCULAR_REF4t  The upsream ref to pull from (e.g. tag or SHA1)" >&1
+	echo    "    -h usage" >&1
+}
+
+while getopts f:b:r:h arg 
+do
+	case ${arg} in
+		f)   MONOCULAR_FORK=${OPTARG};;
+		b)   MONOCULAR_BRANCH=${OPTARG};;
+		r)   MONOCULAR_REF=${OPTARG};;
+		h)   usage;;
+		\?)  usage;;
+	esac
+done
+
+if [ -z "$MONOCULAR_FORK" ]; then
+	echo "Must specify a monocular fork to pull from" >&2
+	usage
+	exit 0
+fi
+
+if [ -n "$MONOCULAR_BRANCH" ] && [ -n "$MONOCULAR_REF" ] || [ -z "$MONOCULAR_BRANCH" ] && [ -z "$MONOCULAR_REF" ]; then
+	echo "Must specify either a monocular branch or ref to pull from" >&2
+	usage
+	exit 1
+fi
+
+echo "Monocular fork: $MONOCULAR_FORK" >&1
+echo "Monocular branch: $MONOCULAR_BRANCH" >&1
+echo "Monocular ref: $MONOCULAR_REF" >&1
+
+DIRPATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+echo "${DIRPATH}"
+
+pushd "${DIRPATH}" >& /dev/null || exit
+
+source ./git-merge-subpath.sh
+
+echo "Fetching $MONOCULAR_FORK"
+
+# Fetch and merge the monocular subtree into the Stratos repo and attempt squash commit
+git fetch "$MONOCULAR_FORK"
+
+# Set our pull ref to either "fork/branch" or [tag|commit]
+if [ -n "$MONOCULAR_REF" ]; then
+	PULL_REF="$MONOCULAR_REF"
+else
+	PULL_REF="$MONOCULAR_FORK/$MONOCULAR_BRANCH"
+fi
+
+echo "Reading subtree index from $MONOCULAR_FORK:cmd. Merging in changes from $PULL_REF into src/jetstream/plugins/monocular" >&1
+# Move to root of repo
+repo_root=$(git rev-parse --show-toplevel)
+echo "Moving to repo top level: $repo_root" >&1
+pushd "$repo_root" >&/dev/null || exit
+
+# Read in tree
+# Git diff apply from last commit (or none) to the specified commit between the given subtrees
+git-merge-subpath --squash "$PULL_REF" cmd src/jetstream/plugins/monocular
+merge_retval=$?
+
+popd >& /dev/null || exit
+popd >& /dev/null || exit
+
+if [ $merge_retval -eq 0 ]; then
+	echo "Success" >&1
+fi
+
diff --git a/src/jetstream/plugins/monocular/git-push-upstream.sh b/src/jetstream/plugins/monocular/git-push-upstream.sh
new file mode 100755
index 0000000000..df13c55f1f
--- /dev/null
+++ b/src/jetstream/plugins/monocular/git-push-upstream.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+echo "== Push Monocular Changes Upstream ==" >&1
+
+usage() {
+	echo "Usage: git-push-upstream.sh -f <MONOCULAR_FORK> -t <MONOCULAR_BRANCH> -s <STRATOS_SOURCE_BRANCH> ]" >&1
+	echo "  options:" >&1
+	echo "    -f MONOCULAR_FORK         The upstream fork/repo to push to" >&1
+	echo "    -t MONOCULAR_BRANCH       The target upstream branch to push to" >&1
+	echo "    -s STRATOS_SOURCE_BRANCH  The Stratos branch containing the changes" >&1
+	echo "    -h usage"
+}
+
+while getopts f:t:s:h arg; do
+	case ${arg} in
+		f)   MONOCULAR_FORK=${OPTARG};;
+		t)   MONOCULAR_BRANCH=${OPTARG};;
+		s)   STRATOS_BRANCH=${OPTARG};;
+		h)   usage;;
+		\?)  usage;;
+	esac
+done
+
+
+if [[ -z "$MONOCULAR_FORK"  ||  -z "$MONOCULAR_BRANCH" || -z "$STRATOS_BRANCH" ]]; then
+	usage
+	exit 1
+fi
+
+echo "Monocular fork: $MONOCULAR_FORK" >&1
+echo "Monocular branch: $MONOCULAR_BRANCH" >&1
+echo "Stratos source branch: $STRATOS_BRANCH" >&1
+
+DIRPATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+echo "${DIRPATH}"
+
+pushd "${DIRPATH}" >& /dev/null || exit
+
+source ./git-merge-subpath.sh
+
+echo "Checking out monocular target branch: $MONOCULAR_BRANCH from $MONOCULAR_FORK into temporary merge branch: temp-merge-branch" >&1
+
+##Checkout the monocular feature branch onto a temporary merge branch
+git fetch "$MONOCULAR_FORK"
+git checkout -b temp-merge-branch "$MONOCULAR_FORK"/"$MONOCULAR_BRANCH"
+
+echo "Merging Stratos branch $STRATOS_BRANCH at src/jetstream/plugins/monocular into temporary merge branch" >&1
+
+##Merge changes from our monocular subtree in Stratos v2-master to our temp-merge-branch
+##Change to top level of repo
+repo_root=$(git rev-parse --show-toplevel)
+echo "Moving to repo top level: $repo_root" >&1
+pushd "$repo_root" >&/dev/null || exit
+
+git-merge-subpath --squash origin/"$STRATOS_BRANCH" src/jetstream/plugins/monocular cmd
+if [ $? -ne 0 ]; then
+	echo "Something went wrong with the merge. Make sure to clean up." >&2
+else
+
+	echo "Pushing changes to target branch: $MONOCULAR_BRANCH on $MONOCULAR_FORK" >&1
+
+  ##Push the temporary merge branch back to the monocular feature branch
+  git push "$MONOCULAR_FORK" HEAD:"$MONOCULAR_BRANCH"
+  if [ $? -ne 0 ]; then
+	  echo "Failed to push to branch: $MONOCULAR_BRANCH on $MONOCULAR_FORK." >&2
+  else
+	  echo "Cleaning up temporary branches" >&1
+
+    ##Cleanup: remove our temporary merge branch
+    git checkout v2-master && git branch -d temp-merge-branch
+  fi
+fi
+
+popd >& /dev/null || exit
+popd >& /dev/null || exit
+
+if [ $? -eq 0 ]; then
+	echo "Success" >&1
+fi
+

From 2a444657f5d3712fa713fd97653ec815016f4a9c Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Sat, 12 Oct 2019 13:56:37 +0100
Subject: [PATCH 135/648] Exit if checkout merge branch fails

---
 src/jetstream/plugins/monocular/git-push-upstream.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jetstream/plugins/monocular/git-push-upstream.sh b/src/jetstream/plugins/monocular/git-push-upstream.sh
index df13c55f1f..e4542c71dd 100755
--- a/src/jetstream/plugins/monocular/git-push-upstream.sh
+++ b/src/jetstream/plugins/monocular/git-push-upstream.sh
@@ -42,7 +42,7 @@ echo "Checking out monocular target branch: $MONOCULAR_BRANCH from $MONOCULAR_FO
 
 ##Checkout the monocular feature branch onto a temporary merge branch
 git fetch "$MONOCULAR_FORK"
-git checkout -b temp-merge-branch "$MONOCULAR_FORK"/"$MONOCULAR_BRANCH"
+git checkout -b temp-merge-branch "$MONOCULAR_FORK"/"$MONOCULAR_BRANCH" || exit
 
 echo "Merging Stratos branch $STRATOS_BRANCH at src/jetstream/plugins/monocular into temporary merge branch" >&1
 

From d9b47994b284ca0ead0f1cb4d72b562c1d3cae67 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Sat, 12 Oct 2019 14:16:23 +0100
Subject: [PATCH 136/648] Exit if checkout merge branch fails

---
 .../plugins/monocular/git-push-upstream.sh          | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/jetstream/plugins/monocular/git-push-upstream.sh b/src/jetstream/plugins/monocular/git-push-upstream.sh
index e4542c71dd..8ba5052e85 100755
--- a/src/jetstream/plugins/monocular/git-push-upstream.sh
+++ b/src/jetstream/plugins/monocular/git-push-upstream.sh
@@ -40,17 +40,18 @@ source ./git-merge-subpath.sh
 
 echo "Checking out monocular target branch: $MONOCULAR_BRANCH from $MONOCULAR_FORK into temporary merge branch: temp-merge-branch" >&1
 
+##Change to top level of repo
+#repo_root=$(git rev-parse --show-toplevel)
+#echo "Moving to repo top level: $repo_root" >&1
+#pushd "$repo_root" >&/dev/null || exit
+
 ##Checkout the monocular feature branch onto a temporary merge branch
 git fetch "$MONOCULAR_FORK"
 git checkout -b temp-merge-branch "$MONOCULAR_FORK"/"$MONOCULAR_BRANCH" || exit
 
-echo "Merging Stratos branch $STRATOS_BRANCH at src/jetstream/plugins/monocular into temporary merge branch" >&1
-
 ##Merge changes from our monocular subtree in Stratos v2-master to our temp-merge-branch
-##Change to top level of repo
-repo_root=$(git rev-parse --show-toplevel)
-echo "Moving to repo top level: $repo_root" >&1
-pushd "$repo_root" >&/dev/null || exit
+
+echo "Merging Stratos branch $STRATOS_BRANCH at src/jetstream/plugins/monocular into temporary merge branch" >&1
 
 git-merge-subpath --squash origin/"$STRATOS_BRANCH" src/jetstream/plugins/monocular cmd
 if [ $? -ne 0 ]; then

From c9a24326682e775d38b841fbada383242c82cd43 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Sat, 12 Oct 2019 16:35:32 +0100
Subject: [PATCH 137/648] Multiple updates

---
 .../plugins/monocular/git-merge-subpath.sh    | 11 ++++---
 .../plugins/monocular/git-pull-downstream.sh  |  7 ++--
 .../plugins/monocular/git-push-upstream.sh    | 33 ++++++++++---------
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/jetstream/plugins/monocular/git-merge-subpath.sh b/src/jetstream/plugins/monocular/git-merge-subpath.sh
index f4b05cfc10..da5ecf1b8b 100755
--- a/src/jetstream/plugins/monocular/git-merge-subpath.sh
+++ b/src/jetstream/plugins/monocular/git-merge-subpath.sh
@@ -21,7 +21,7 @@ git-merge-subpath() {
     local SOURCE_COMMIT="$1" SOURCE_PREFIX="${2%/}" DEST_PREFIX="${3%/}"
 
     local SOURCE_SHA1
-    SOURCE_SHA1=$(git rev-parse --verify "$SOURCE_COMMIT^{commit}") || return 1
+    SOURCE_SHA1=$(git rev-parse --verify "$SOURCE_COMMIT^{commit}")
 
     local OLD_SHA1
     local GIT_ROOT=$(git rev-parse --show-toplevel)
@@ -42,17 +42,20 @@ git-merge-subpath() {
     fi &&
 
     if [[ -z $SQUASH ]]; then
-        git merge -s ours --no-commit "$SOURCE_COMMIT"
+        git merge -s ours --no-commit "$SOURCE_COMMIT" || return 1
     fi &&
 
+    printf "Calculating diff of changes from source and applying to destination..."
     git diff --color=never "$OLD_TREEISH" "$SOURCE_COMMIT:$SOURCE_PREFIX" \
         | git apply -3 --directory="$DEST_PREFIX" || git mergetool
-
+    echo "done."
     if (( $? == 1 )); then
         echo "Uh-oh! Try cleaning up with |git reset --merge|."
+	echo "You may be able to finish the merge manually then run the following (do not modify the commit message):"
+        echo "git commit -em \"Merge $SOURCE_COMMIT:$SOURCE_PREFIX/ to $DEST_PREFIX/ ${FUNCNAME[0]}: $SOURCE_SHA1 $SOURCE_PREFIX $DEST_PREFIX\""
 	return 1
     else
-        git commit -em "Merge $SOURCE_COMMIT:$SOURCE_PREFIX/ to $DEST_PREFIX/
+        git commit -em "Merge $SOURCE_COMMIT:$SOURCE_PREFIX/ to $DEST_PREFIX/ 
 
 # Feel free to edit the title and body above, but make sure to keep the
 # ${FUNCNAME[0]}: line below intact, so ${FUNCNAME[0]} can find it
diff --git a/src/jetstream/plugins/monocular/git-pull-downstream.sh b/src/jetstream/plugins/monocular/git-pull-downstream.sh
index 27366e4560..c7e64bb0a1 100755
--- a/src/jetstream/plugins/monocular/git-pull-downstream.sh
+++ b/src/jetstream/plugins/monocular/git-pull-downstream.sh
@@ -7,9 +7,10 @@ usage() {
 	echo    "  options:" >&1
 	printf  "    -f MONOCULAR_FORK         The upstream fork/repo to pull from\n" >&1
 	printf  "    ONE OF EITHER -m or -s must be set\n" >&1
-	echo    "    -m MONOCULAR_BRANCH       The upstream branch to pull from" >&1
-	echo    "    -s MONOCULAR_REF4t  The upsream ref to pull from (e.g. tag or SHA1)" >&1
+	echo    "    -b MONOCULAR_BRANCH       The upstream branch to pull from" >&1
+	echo    "    -r MONOCULAR_REF  The upsream ref to pull from (e.g. tag or SHA1)" >&1
 	echo    "    -h usage" >&1
+	exit 0
 }
 
 while getopts f:b:r:h arg 
@@ -26,13 +27,11 @@ done
 if [ -z "$MONOCULAR_FORK" ]; then
 	echo "Must specify a monocular fork to pull from" >&2
 	usage
-	exit 0
 fi
 
 if [ -n "$MONOCULAR_BRANCH" ] && [ -n "$MONOCULAR_REF" ] || [ -z "$MONOCULAR_BRANCH" ] && [ -z "$MONOCULAR_REF" ]; then
 	echo "Must specify either a monocular branch or ref to pull from" >&2
 	usage
-	exit 1
 fi
 
 echo "Monocular fork: $MONOCULAR_FORK" >&1
diff --git a/src/jetstream/plugins/monocular/git-push-upstream.sh b/src/jetstream/plugins/monocular/git-push-upstream.sh
index 8ba5052e85..0d0f2e2f31 100755
--- a/src/jetstream/plugins/monocular/git-push-upstream.sh
+++ b/src/jetstream/plugins/monocular/git-push-upstream.sh
@@ -41,9 +41,9 @@ source ./git-merge-subpath.sh
 echo "Checking out monocular target branch: $MONOCULAR_BRANCH from $MONOCULAR_FORK into temporary merge branch: temp-merge-branch" >&1
 
 ##Change to top level of repo
-#repo_root=$(git rev-parse --show-toplevel)
-#echo "Moving to repo top level: $repo_root" >&1
-#pushd "$repo_root" >&/dev/null || exit
+repo_root=$(git rev-parse --show-toplevel)
+echo "Moving to repo top level: $repo_root" >&1
+pushd "$repo_root" >&/dev/null || exit
 
 ##Checkout the monocular feature branch onto a temporary merge branch
 git fetch "$MONOCULAR_FORK"
@@ -51,25 +51,27 @@ git checkout -b temp-merge-branch "$MONOCULAR_FORK"/"$MONOCULAR_BRANCH" || exit
 
 ##Merge changes from our monocular subtree in Stratos v2-master to our temp-merge-branch
 
-echo "Merging Stratos branch $STRATOS_BRANCH at src/jetstream/plugins/monocular into temporary merge branch" >&1
+echo "Merging Stratos branch $STRATOS_BRANCH at src/jetstream/plugins/monocular into temp-merge-branch" >&1
 
 git-merge-subpath --squash origin/"$STRATOS_BRANCH" src/jetstream/plugins/monocular cmd
 if [ $? -ne 0 ]; then
-	echo "Something went wrong with the merge. Make sure to clean up." >&2
+	echo "Unsuccessful." >&2
+	#Move back to repo root - important in case of bail-out here.
+	popd >& /dev/null || exit
+	exit 1
 else
 
 	echo "Pushing changes to target branch: $MONOCULAR_BRANCH on $MONOCULAR_FORK" >&1
 
-  ##Push the temporary merge branch back to the monocular feature branch
-  git push "$MONOCULAR_FORK" HEAD:"$MONOCULAR_BRANCH"
-  if [ $? -ne 0 ]; then
-	  echo "Failed to push to branch: $MONOCULAR_BRANCH on $MONOCULAR_FORK." >&2
-  else
-	  echo "Cleaning up temporary branches" >&1
-
-    ##Cleanup: remove our temporary merge branch
-    git checkout v2-master && git branch -d temp-merge-branch
-  fi
+        ##Push the temporary merge branch back to the monocular feature branch
+        git push "$MONOCULAR_FORK" HEAD:"$MONOCULAR_BRANCH"
+        if [ $? -ne 0 ]; then
+	     echo "Failed to push to branch: $MONOCULAR_BRANCH on $MONOCULAR_FORK." >&2
+        else
+	     echo "Cleaning up temporary branches" >&1
+             ##Cleanup: remove our temporary merge branch
+             git checkout "$STRATOS_BRANCH" && git branch -d temp-merge-branch
+       fi
 fi
 
 popd >& /dev/null || exit
@@ -78,4 +80,3 @@ popd >& /dev/null || exit
 if [ $? -eq 0 ]; then
 	echo "Success" >&1
 fi
-

From edc9602ad8aab9d4fc0f1cd508a34e8e3d325da8 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Sun, 13 Oct 2019 11:07:15 +0100
Subject: [PATCH 138/648] Add README WIP

---
 src/jetstream/plugins/monocular/README.md | 59 +++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 src/jetstream/plugins/monocular/README.md

diff --git a/src/jetstream/plugins/monocular/README.md b/src/jetstream/plugins/monocular/README.md
new file mode 100644
index 0000000000..0f8bd6d3e2
--- /dev/null
+++ b/src/jetstream/plugins/monocular/README.md
@@ -0,0 +1,59 @@
+# Syncing this subtree with the Monocular repo
+
+## Common Prerequisites 
+
+**NOTE:**
+
+The scripts do their best to fail gracefully. To avoid problems however, make sure the following pre-requisities are done before attempting. A CTRL-C in the middle of a run will likely require some cleanup.
+
+
+1. Ensure you have the monocular fork as a remote. e.g.
+
+`git remote add -f -t master stratos-monocular-fork git@github.com:cf-stratos/monocular.git`
+
+2. With a second remote it's useful to store remote refs separately in case of branch/tag collisions:
+
+`git config --add remote.stratos-monocular-fork.fetch 'refs/tags/*:refs/rtags/stratos-monocular-fork/*'`
+
+## Before running the PULL script
+Follow these carefully. 
+
+1. Ensure you are on the branch you want to merge into.
+2. Ensure you have no unstaged or uncommitted changes
+3. `git status` should be clean
+
+## Before running the PUSH script
+1. Ensure that at least one pull haa been made already
+2. Ensure the monocular target branch exists and has been pushed to its monocular remote
+3. Ensure you have no unstaged or uncommitted changes.
+4. `git status` should be clean.
+
+## Running the scripts..
+
+Both scripts, when run either without arguments or with the -h flag, will show usage instructions.
+
+### pull script:
+
+echo "Pulls the subtree under cmd from monocular repo into the src/jetstream/plugins/monocular subtree in stratos" >&1
+usage() {
+        echo    "Usage: git-pull-downstream.sh -f <MONOCULAR_FORK> [ -b <MONOCULAR_BRANCH>  | -r <MONOCULAR_REF> ]" >&1
+        echo    "  options:" >&1
+        printf  "    -f MONOCULAR_FORK         The upstream fork/repo to pull from\n" >&1
+        printf  "    ONE OF EITHER -m or -s must be set\n" >&1
+        echo    "    -b MONOCULAR_BRANCH       The upstream branch to pull from" >&1
+        echo    "    -r MONOCULAR_REF  The upsream ref to pull from (e.g. tag or SHA1)" >&1
+        echo    "    -h usage" >&1
+        exit 0
+
+#### To pull a tag:
+The tag should be specufied as : `refs/rtags/stratos-monocular-fork/<tag>`
+e.g.
+
+
+### push script:
+        echo "Usage: git-push-upstream.sh -f <MONOCULAR_FORK> -t <MONOCULAR_BRANCH> -s <STRATOS_SOURCE_BRANCH> ]" >&1
+        echo "  options:" >&1
+        echo "    -f MONOCULAR_FORK         The upstream fork/repo to push to" >&1
+        echo "    -t MONOCULAR_BRANCH       The target upstream branch to push to" >&1
+        echo "    -s STRATOS_SOURCE_BRANCH  The Stratos branch containing the changes" >&1
+        echo "    -h usage"

From 81d2861d495fbdd58cc6e2cf74de68f254c73117 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Mon, 14 Oct 2019 12:56:01 +0100
Subject: [PATCH 139/648] README complete. Fix to param usage in pull script

---
 src/jetstream/plugins/monocular/README.md     | 65 +++++++++++++------
 .../plugins/monocular/git-pull-downstream.sh  |  2 +-
 .../plugins/monocular/git-push-upstream.sh    |  2 +-
 3 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/src/jetstream/plugins/monocular/README.md b/src/jetstream/plugins/monocular/README.md
index 0f8bd6d3e2..956b10490c 100644
--- a/src/jetstream/plugins/monocular/README.md
+++ b/src/jetstream/plugins/monocular/README.md
@@ -9,11 +9,15 @@ The scripts do their best to fail gracefully. To avoid problems however, make su
 
 1. Ensure you have the monocular fork as a remote. e.g.
 
-`git remote add -f -t master stratos-monocular-fork git@github.com:cf-stratos/monocular.git`
+```
+git remote add -f -t master stratos-monocular-fork git@github.com:cf-stratos/monocular.git
+```
 
 2. With a second remote it's useful to store remote refs separately in case of branch/tag collisions:
 
-`git config --add remote.stratos-monocular-fork.fetch 'refs/tags/*:refs/rtags/stratos-monocular-fork/*'`
+```
+git config --add remote.stratos-monocular-fork.fetch 'refs/tags/*:refs/rtags/stratos-monocular-fork/*
+```
 
 ## Before running the PULL script
 Follow these carefully. 
@@ -30,30 +34,49 @@ Follow these carefully.
 
 ## Running the scripts..
 
-Both scripts, when run either without arguments or with the -h flag, will show usage instructions.
+Both scripts, when run either without arguments or with the `-h` flag, will show usage instructions.
 
-### pull script:
+### PULL script:
 
-echo "Pulls the subtree under cmd from monocular repo into the src/jetstream/plugins/monocular subtree in stratos" >&1
-usage() {
-        echo    "Usage: git-pull-downstream.sh -f <MONOCULAR_FORK> [ -b <MONOCULAR_BRANCH>  | -r <MONOCULAR_REF> ]" >&1
-        echo    "  options:" >&1
-        printf  "    -f MONOCULAR_FORK         The upstream fork/repo to pull from\n" >&1
-        printf  "    ONE OF EITHER -m or -s must be set\n" >&1
-        echo    "    -b MONOCULAR_BRANCH       The upstream branch to pull from" >&1
-        echo    "    -r MONOCULAR_REF  The upsream ref to pull from (e.g. tag or SHA1)" >&1
-        echo    "    -h usage" >&1
-        exit 0
+This pulls the subtree from monocular repo under `/cmd` into the stratos repo under `/src/jetstream/plugins/monocular`
+
+Usage:
+
+```
+git-pull-downstream.sh -f <MONOCULAR_FORK> [ -b <MONOCULAR_BRANCH>  | -r <MONOCULAR_REF> ]
+-f MONOCULAR_FORK         The upstream (monocular) repo"
+-b MONOCULAR_BRANCH       The upstream branch to pull from" >&1
+-r MONOCULAR_REF          The upsream ref to pull from (e.g. tag or SHA1)
+```
+
+e.g.
+
+```
+./git-pull-downstream.sh -f stratos-monocular-fork -b master
+```
 
 #### To pull a tag:
 The tag should be specufied as : `refs/rtags/stratos-monocular-fork/<tag>`
+
 e.g.
 
+```
+./git-pull-downstream.sh -f stratos-monocular-fork -r refs/rtags/stratos-monocular-fork/v1.4.0
+```
+
+
+### PUSH script:
+Usage: 
+
+```
+git-push-upstream.sh -f <MONOCULAR_FORK> -t <MONOCULAR_BRANCH> -s <STRATOS_SOURCE_BRANCH> ]
+-f MONOCULAR_FORK         The upstream (monocular) repo to push to"
+-t MONOCULAR_BRANCH       The target (monocular) upstream branch to push to
+-s STRATOS_SOURCE_BRANCH  The source stratos branch containing the changes
+```
+
+e.g. 
 
-### push script:
-        echo "Usage: git-push-upstream.sh -f <MONOCULAR_FORK> -t <MONOCULAR_BRANCH> -s <STRATOS_SOURCE_BRANCH> ]" >&1
-        echo "  options:" >&1
-        echo "    -f MONOCULAR_FORK         The upstream fork/repo to push to" >&1
-        echo "    -t MONOCULAR_BRANCH       The target upstream branch to push to" >&1
-        echo "    -s STRATOS_SOURCE_BRANCH  The Stratos branch containing the changes" >&1
-        echo "    -h usage"
+```
+./git-push-upstream.sh -f stratos-monocular-fork -t feature-branch -s dummy-master
+```
\ No newline at end of file
diff --git a/src/jetstream/plugins/monocular/git-pull-downstream.sh b/src/jetstream/plugins/monocular/git-pull-downstream.sh
index c7e64bb0a1..462b3bdc0b 100755
--- a/src/jetstream/plugins/monocular/git-pull-downstream.sh
+++ b/src/jetstream/plugins/monocular/git-pull-downstream.sh
@@ -6,7 +6,7 @@ usage() {
 	echo    "Usage: git-pull-downstream.sh -f <MONOCULAR_FORK> [ -b <MONOCULAR_BRANCH>  | -r <MONOCULAR_REF> ]" >&1
 	echo    "  options:" >&1
 	printf  "    -f MONOCULAR_FORK         The upstream fork/repo to pull from\n" >&1
-	printf  "    ONE OF EITHER -m or -s must be set\n" >&1
+	printf  "    ONE OF EITHER -b or -r must be set\n" >&1
 	echo    "    -b MONOCULAR_BRANCH       The upstream branch to pull from" >&1
 	echo    "    -r MONOCULAR_REF  The upsream ref to pull from (e.g. tag or SHA1)" >&1
 	echo    "    -h usage" >&1
diff --git a/src/jetstream/plugins/monocular/git-push-upstream.sh b/src/jetstream/plugins/monocular/git-push-upstream.sh
index 0d0f2e2f31..c4e54aaed7 100755
--- a/src/jetstream/plugins/monocular/git-push-upstream.sh
+++ b/src/jetstream/plugins/monocular/git-push-upstream.sh
@@ -7,7 +7,7 @@ usage() {
 	echo "  options:" >&1
 	echo "    -f MONOCULAR_FORK         The upstream fork/repo to push to" >&1
 	echo "    -t MONOCULAR_BRANCH       The target upstream branch to push to" >&1
-	echo "    -s STRATOS_SOURCE_BRANCH  The Stratos branch containing the changes" >&1
+	echo "    -s STRATOS_SOURCE_BRANCH  The Stratos source branch containing the changes" >&1
 	echo "    -h usage"
 }
 

From f10860083a40a0a1ddfefddda511d68d3c459632 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 14 Oct 2019 17:36:16 +0100
Subject: [PATCH 140/648] E2E Fix

---
 .../cloud-foundry/cf-level/manage-quota-e2e.spec.ts         | 2 +-
 src/test-e2e/po/list.po.ts                                  | 6 +++---
 2 files changed, 4 insertions(+), 4 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 f9c62f5ce0..e09574299c 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
@@ -4,9 +4,9 @@ import { e2e } from '../../e2e';
 import { CFHelpers } from '../../helpers/cf-helpers';
 import { ConsoleUserType, E2EHelpers } from '../../helpers/e2e-helpers';
 import { extendE2ETestTime } from '../../helpers/extend-test-helpers';
+import { TableComponent } from '../../po/table.po';
 import { CfTopLevelPage } from './cf-top-level-page.po';
 import { QuotaFormPage } from './quota-form-page.po';
-import { TableComponent } from '../../po/table.po';
 
 describe('Manage Quota', () => {
   let e2eSetup;
diff --git a/src/test-e2e/po/list.po.ts b/src/test-e2e/po/list.po.ts
index 27a10e1470..4ef50b5227 100644
--- a/src/test-e2e/po/list.po.ts
+++ b/src/test-e2e/po/list.po.ts
@@ -39,7 +39,7 @@ export class ListTableComponent extends Component {
     ).first();
 
     browser.wait(until.presenceOf(cell));
-    return cell.element(by.xpath('ancestor::app-table-row'));;
+    return cell.element(by.xpath('ancestor::app-table-row'));
   }
 
   // Get the data in the table
@@ -385,11 +385,11 @@ export class ListPaginationComponent extends Component {
   }
 
   getPageSize(customCtrlName?: string): promise.Promise<string> {
-    return this.getPageSizeForm().getText(customCtrlName || 'mat-select-1');
+    return this.getPageSizeForm().getText(customCtrlName || 'mat-select-2');
   }
 
   setPageSize(pageSize, customCtrlName?: string): promise.Promise<void> {
-    const name = customCtrlName || 'mat-select-1';
+    const name = customCtrlName || 'mat-select-2';
     return this.getPageSizeForm().fill({ [name]: pageSize });
   }
 

From 691171b5bcd70205ebf5291c0fcdc2d7a7f0b568 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 18 Oct 2019 10:50:52 +0100
Subject: [PATCH 141/648] WIP: Switch to helm 3

---
 .../app/custom/helm/store/helm.effects.ts     |  13 +-
 src/jetstream/go.mod                          |  71 +-
 src/jetstream/go.sum                          | 700 ++++++++++++++++--
 .../plugins/kubernetes/endpoint_config.go     |  67 ++
 src/jetstream/plugins/kubernetes/go.mod       |  51 +-
 src/jetstream/plugins/kubernetes/go.sum       | 308 +++++++-
 .../plugins/kubernetes/helm_client.go         | 239 +++++-
 .../plugins/kubernetes/helm_versions.go       |  63 --
 .../plugins/kubernetes/install_release.go     |  76 +-
 .../plugins/kubernetes/list_releases.go       | 137 ++--
 src/jetstream/plugins/kubernetes/main.go      |   1 -
 11 files changed, 1431 insertions(+), 295 deletions(-)
 delete mode 100644 src/jetstream/plugins/kubernetes/helm_versions.go

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 3eb7488707..9cfab722f3 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.effects.ts
@@ -95,7 +95,8 @@ export class HelmEffects {
           if (!endpointData) {
             return;
           }
-          endpointData.releases.forEach((data) => {
+          endpointData.forEach((data) => {
+            console.log(data);
             const helmRelease: HelmRelease = {
               ...data,
               endpointId: endpoint
@@ -104,7 +105,7 @@ export class HelmEffects {
             const id = endpoint + ':' + data.name;
             helmRelease.guid = id;
             // Make a note of the guid of the endpoint for the release
-            helmRelease.status = mapHelmStatus(data.info.status.code);
+            helmRelease.status = mapHelmStatus(data.info.status);
             helmRelease.lastDeployed = mapHelmModifiedDate(data.info.last_deployed);
             helmRelease.firstDeployed = mapHelmModifiedDate(data.info.first_deployed);
             // data.info =
@@ -305,10 +306,16 @@ export class HelmEffects {
   }
 }
 
-function mapHelmStatus(status: number) {
+function _mapHelmStatus(status: number) {
   return HelmStatus[status].replace('_', ' ');
 }
 
+function mapHelmStatus(status: string) {
+  // TODO: Capitalize first letter
+  return status;
+  //return HelmStatus[status].replace('_', ' ');
+}
+
 function mapHelmModifiedDate(date: any) {
   let unix = date.seconds * 1000 + date.nanos / 1000;
   unix = Math.floor(unix);
diff --git a/src/jetstream/go.mod b/src/jetstream/go.mod
index 991aaba261..b51c37b674 100644
--- a/src/jetstream/go.mod
+++ b/src/jetstream/go.mod
@@ -6,13 +6,16 @@ require (
 	bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c
 	code.cloudfoundry.org/bytefmt v0.0.0-20180906201452-2aa6f33b730c // indirect
 	code.cloudfoundry.org/cli v6.43.0+incompatible
+	code.cloudfoundry.org/diego-ssh v0.0.0-20190821205424-d560480f8c18 // indirect
 	code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f // indirect
-	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
-	github.com/SermoDigital/jose v0.9.1
-	github.com/Sirupsen/logrus v0.0.0-00010101000000-000000000000 // indirect
+	code.cloudfoundry.org/inigo v0.0.0-20191009011458-4d57c5db28ee // indirect
+	code.cloudfoundry.org/lager v2.0.0+incompatible // indirect
+	code.cloudfoundry.org/ykk v0.0.0-20170424192843-e4df4ce2fd4d // indirect
 	github.com/antonlindstrom/pgstore v0.0.0-20170604072116-a407030ba6d0
+	github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77 // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
 	github.com/bmatcuk/doublestar v1.1.1 // indirect
+	github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40 // indirect
 	github.com/cf-stratos/mysqlstore v0.0.0-20170822100912-304308519d13
 	github.com/charlievieth/fs v0.0.0-20170613215519-7dc373669fa1 // indirect
 	github.com/cloudfoundry-community/go-cfenv v1.17.0
@@ -24,10 +27,16 @@ require (
 	github.com/cloudfoundry/cli-plugin-repo v0.0.0-20190220174354-ecf721ef3813 // indirect
 	github.com/cloudfoundry/noaa v2.1.0+incompatible
 	github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4
+	github.com/coreos/bbolt v1.3.3 // indirect
+	github.com/coreos/etcd v3.3.16+incompatible // indirect
+	github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
+	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
 	github.com/cppforlife/go-patch v0.2.0 // indirect
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
 	github.com/domodwyer/mailyak v3.1.1+incompatible
 	github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 // indirect
+	github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385 // indirect
+	github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484 // indirect
+	github.com/elazarl/goproxy/ext v0.0.0-20191011121108-aa519ddbe484 // indirect
 	github.com/fatih/color v1.7.0 // indirect
 	github.com/go-sql-driver/mysql v1.4.1
 	github.com/golang/snappy v0.0.1 // indirect
@@ -38,31 +47,34 @@ require (
 	github.com/gorilla/sessions v1.1.3
 	github.com/gorilla/websocket v1.4.0
 	github.com/govau/cf-common v0.0.7
+	github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
 	github.com/jessevdk/go-flags v1.4.0 // indirect
 	github.com/jtolds/gls v4.20.0+incompatible // indirect
 	github.com/kat-co/vala v0.0.0-20170210184112-42e1d8b61f12
-	github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4
 	github.com/labstack/echo v3.3.10+incompatible
-	github.com/lib/pq v1.1.0 // indirect
 	github.com/lunixbochs/vtclean v1.0.0 // indirect
-	github.com/mailru/easyjson v0.0.0-20190221075403-6243d8e04c3f // indirect
-	github.com/mattn/go-runewidth v0.0.4 // indirect
 	github.com/mattn/go-sqlite3 v1.10.0
 	github.com/mholt/archiver v3.1.1+incompatible
 	github.com/moby/moby v1.13.1 // indirect
+	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
 	github.com/nwaples/rardecode v1.0.0 // indirect
 	github.com/nwmac/sqlitestore v0.0.0-20180824125213-7d2ab221fb3f
 	github.com/pierrec/lz4 v2.0.5+incompatible // indirect
+	github.com/poy/eachers v0.0.0-20181020210610-23942921fe77 // indirect
 	github.com/satori/go.uuid v1.2.0
-	github.com/sirupsen/logrus v1.3.0
+	github.com/sirupsen/logrus v1.4.2
 	github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 // indirect
-	github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa
+	github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a
+	github.com/soheilhy/cmux v0.1.4 // indirect
+	github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect
+	github.com/tedsuo/rata v1.0.0 // indirect
+	github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
 	github.com/ulikunitz/xz v0.5.6 // indirect
 	github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec // indirect
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
-	golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f
-	golang.org/x/net v0.0.0-20190420063019-afa5a82059c6 // indirect
-	google.golang.org/appengine v1.5.0 // indirect
+	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
+	go.etcd.io/bbolt v1.3.3 // indirect
+	golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7
 	gopkg.in/DATA-DOG/go-sqlmock.v1 v1.0.0-00010101000000-000000000000
 	gopkg.in/cheggaaa/pb.v1 v1.0.27 // indirect
 	gopkg.in/yaml.v2 v2.2.2
@@ -77,6 +89,7 @@ replace github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/monocula
 replace (
 	github.com/SermoDigital/jose => github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc
 	github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.4.1
+	github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309
 	github.com/helm/monocular/chartrepo => ./plugins/monocular/chart-repo
 	github.com/helm/monocular/chartsvc => ./plugins/monocular/chartsvc
 	github.com/kubernetes-sigs/aws-iam-authenticator => github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc
@@ -85,12 +98,28 @@ replace (
 	github.com/smartystreets/goconvey => github.com/smartystreets/goconvey v0.0.0-20160503033757-d4c757aa9afd
 	github.com/spf13/cobra => github.com/spf13/cobra v0.0.3
 	gopkg.in/DATA-DOG/go-sqlmock.v1 => github.com/DATA-DOG/go-sqlmock v1.1.3
-	k8s.io/api => k8s.io/api v0.0.0-20190222213804-5cb15d344471
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190221221350-bfb440be4b87
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628
-	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190221215341-5838f549963b
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190221221947-d8fee89e76ca
-	k8s.io/client-go => k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible
-	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4
-	k8s.io/kubernetes => k8s.io/kubernetes v1.13.3
+	k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20191001043732-d647ddbd755f
+	//k8s.io/kubernetes => k8s.io/kubernetes/staging/src/k8s.io/kubernetes v1.13.3
+	k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20191001043732-d647ddbd755f
+	//k8s.io/kube-openapi => k8s.io/kubernetes/staging/src/k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4
+	k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20191001043732-d647ddbd755f
+
 )
diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index b642659041..e3755fd9a2 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -1,57 +1,137 @@
+bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690/go.mod h1:Ulb78X89vxKYgdL24HMTiXYHlyHEvruOj1ZPlqeNEZM=
 bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c h1:bkb2NMGo3/Du52wvYj9Whth5KZfMV6d3O0Vbr3nz/UE=
 bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c/go.mod h1:hSVuE3qU7grINVSwrmzHfpg9k87ALBk+XaualNyUzI4=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
 code.cloudfoundry.org/bytefmt v0.0.0-20180906201452-2aa6f33b730c h1:VzwteSWGbW9mxXTEkH+kpnao5jbgLynw3hq742juQh8=
 code.cloudfoundry.org/bytefmt v0.0.0-20180906201452-2aa6f33b730c/go.mod h1:wN/zk7mhREp/oviagqUXY3EwuHhWyOvAdsn5Y4CzOrc=
 code.cloudfoundry.org/cli v6.43.0+incompatible h1:jAaPyHN5Hb2r2sR9i8Y8ejKPiPpuBYMaHBFyKVmQ7T4=
 code.cloudfoundry.org/cli v6.43.0+incompatible/go.mod h1:e4d+EpbwevNhyTZKybrLlyTvpH+W22vMsmdmcTxs/Fo=
+code.cloudfoundry.org/diego-ssh v0.0.0-20190821205424-d560480f8c18 h1:Uf9tS67L4P92h4tzbnR+9pJqqxUU5MgxQNrvuht8L8g=
+code.cloudfoundry.org/diego-ssh v0.0.0-20190821205424-d560480f8c18/go.mod h1:L2/glHnSK+wKnsG8oZZqdV2sgYY9NDo/I1aDJGhcWaM=
 code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f h1:UrKzEwTgeiff9vxdrfdqxibzpWjxLnuXDI5m6z3GJAk=
 code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f/go.mod h1:sk5LnIjB/nIEU7yP5sDQExVm62wu0pBh3yrElngUisI=
+code.cloudfoundry.org/inigo v0.0.0-20191009011458-4d57c5db28ee h1:tZJ6H/AttVPtxGDJIWHtRYOv0lHE/ieRGpAT4ocJCoY=
+code.cloudfoundry.org/inigo v0.0.0-20191009011458-4d57c5db28ee/go.mod h1:1ZB1JCh2FAp+SqX79ve6dc8YREvbsziULEOncAilX4Q=
+code.cloudfoundry.org/lager v2.0.0+incompatible h1:WZwDKDB2PLd/oL+USK4b4aEjUymIej9My2nUQ9oWEwQ=
+code.cloudfoundry.org/lager v2.0.0+incompatible/go.mod h1:O2sS7gKP3HM2iemG+EnwvyNQK7pTSC6Foi4QiMp9sSk=
+code.cloudfoundry.org/ykk v0.0.0-20170424192843-e4df4ce2fd4d h1:M+zXqtXJqcsmpL76aU0tdl1ho23eYa4axYoM4gD62UA=
+code.cloudfoundry.org/ykk v0.0.0-20170424192843-e4df4ce2fd4d/go.mod h1:YUJiVOr5xl0N/RjMxM1tHmgSpBbi5UM+KoVR5AoejO0=
+contrib.go.opencensus.io/exporter/ocagent v0.2.0/go.mod h1:0fnkYHF+ORKj7HWzOExKkUHeFX79gXSKUQbpnAM+wzo=
+git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
+github.com/Azure/azure-sdk-for-go v32.5.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
+github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
+github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
+github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
+github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
+github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
+github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc=
+github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8=
+github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
+github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
+github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/DATA-DOG/go-sqlmock v1.1.0 h1:4Ws0QCHb0hIwOCboP/hT+msNYGbR+qmZdJMSoW4lyvM=
-github.com/DATA-DOG/go-sqlmock v1.1.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/DATA-DOG/go-sqlmock v1.1.3 h1:sVIxMSTMnnVzl9Bn6BMjW6p5lSbpjHL80mqnxMWJ/oE=
 github.com/DATA-DOG/go-sqlmock v1.1.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
+github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190822182118-27a4ced34534/go.mod h1:iroGtC8B3tQiqtds1l+mgk/BBOrxbqjH+eUfFQYRc14=
+github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod h1:3VYc5hodBMJ5+l/7J4xAyMeuM2PNuepvHlGs8yilUCA=
+github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
 github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e h1:eb0Pzkt15Bm7f2FFYv7sjY7NPFi3cPkS3tv1CcrFBWA=
 github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
 github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg=
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc=
 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/Masterminds/semver/v3 v3.0.1 h1:2kKm5lb7dKVrt5TYUiAavE6oFc1cFT0057UVGT+JqLk=
+github.com/Masterminds/semver/v3 v3.0.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/Masterminds/sprig v2.18.0+incompatible h1:QoGhlbC6pter1jxKnjMFxT8EqsLuDE6FEcNbWEpw+lI=
 github.com/Masterminds/sprig v2.18.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o=
+github.com/Masterminds/sprig/v3 v3.0.0 h1:KSQz7Nb08/3VU9E4ns29dDxcczhOD1q7O1UfM4G3t3g=
+github.com/Masterminds/sprig/v3 v3.0.0/go.mod h1:NEUY/Qq8Gdm2xgYA+NwJM6wmfdRV9xkh8h/Rld20R0U=
+github.com/Masterminds/vcs v1.13.0/go.mod h1:N09YCmOQr6RLxC6UNHzuVwAdodYbbnycGHSmwVJjcKA=
+github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
+github.com/Microsoft/go-winio v0.4.12 h1:xAfWHN1IrQ0NJ9TBC0KBZoqLjzDTr1ML+4MywiUOryc=
+github.com/Microsoft/go-winio v0.4.12/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
+github.com/Microsoft/hcsshim v0.8.6 h1:ZfF0+zZeYdzMIVMZHKtDKJvLHj76XCuVae/jNkjj0IA=
+github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
+github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
+github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk=
+github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.0 h1:rmGxhojJlM0tuKtfdvliR84CFHljx9ag64t2xmVkjK4=
 github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
+github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/Rican7/retry v0.1.0/go.mod h1:FgOROf8P5bebcC1DS0PdOQiqGUridaZvikzUmkFW6gg=
 github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc h1:MhBvG7RLaLqlyjxMR6of35vt6MVQ+eXMcgn9X/sy0FE=
 github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA=
+github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs=
+github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/antonlindstrom/pgstore v0.0.0-20170604072116-a407030ba6d0 h1:e6PEaXbztY0ViaKotCICNnBQDUeNEJgrQ5UAHWlloh4=
 github.com/antonlindstrom/pgstore v0.0.0-20170604072116-a407030ba6d0/go.mod h1:2Ti6VUHVxpC0VSmTZzEvpzysnaGAfGBOoMIz5ykPyyw=
+github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77 h1:afT88tB6u9JCKQZVAAaa9ICz/uGn5Uw9ekn6P22mYKM=
+github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77/go.mod h1:bXvGk6IkT1Agy7qzJ+DjIw/SJ1AaB3AvAuMDVV+Vkoo=
+github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
+github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/arschles/assert v1.0.0 h1:NofQbRhtxcLgP+XoKunA7J6UMJNTqX7xR/19tej8UsA=
 github.com/arschles/assert v1.0.0/go.mod h1:m/u69zW43x0h8dTHcv3JJZljINyEYgBuf5fYJP6WikI=
+github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
+github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
+github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
+github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7/go.mod h1:LWMyo4iOLWXHGdBki7NIht1kHru/0wM179h+d3g8ATM=
+github.com/aws/aws-sdk-go v1.16.26/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.17.5 h1:WW9Hm3KYo48iZHpmBc+b7sgyS0h32zgCvya28SLW4BU=
 github.com/aws/aws-sdk-go v1.17.5/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
+github.com/bazelbuild/bazel-gazelle v0.0.0-20181012220611-c728ce9f663e/go.mod h1:uHBSeeATKpVazAACZBDPL/Nk/UhQDDsJWDlqYJo8/Us=
+github.com/bazelbuild/buildtools v0.0.0-20180226164855-80c7f0d45d7e/go.mod h1:5JP0TXzWDHXv8qvxRC4InIazwdyDseBDbzESUMKk1yU=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115/go.mod h1:zVt7zX3K/aDCk9Tj+VM7YymsX66ERvzCJzw8rFCX2JU=
+github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y=
+github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
+github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/bmatcuk/doublestar v1.1.1 h1:YroD6BJCZBYx06yYFEWvUuKVWQn3vLLQAVmDmvTSaiQ=
 github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
+github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40 h1:y4B3+GPxKlrigF1ha5FFErxK+sr6sWxQovRMzwMhejo=
+github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c=
+github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
+github.com/bshuster-repo/logrus-logstash-hook v0.4.1 h1:pgAtgj+A31JBVtEHu2uHuEx0n+2ukqUJnS2vVe5pQNA=
+github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
+github.com/bugsnag/bugsnag-go v1.5.0 h1:tP8hiPv1pGGW3LA6LKy5lW6WG+y9J2xWUdPd3WC452k=
+github.com/bugsnag/bugsnag-go v1.5.0/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
+github.com/bugsnag/panicwrap v1.2.0 h1:OzrKrRvXis8qEvOkfcxNcYbOd2O7xXS2nnKMEMABFQA=
+github.com/bugsnag/panicwrap v1.2.0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
+github.com/caddyserver/caddy v1.0.3/go.mod h1:G+ouvOY32gENkJC+jhgl62TyhvqEsFaDiZ4uw0RzP1E=
+github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
+github.com/census-instrumentation/opencensus-proto v0.0.2-0.20180913191712-f303ae3f8d6a/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/census-instrumentation/opencensus-proto v0.1.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c/go.mod h1:Xe6ZsFhtM8HrDku0pxJ3/Lr51rwykrzgFwpmTzleatY=
 github.com/cf-stratos/mysqlstore v0.0.0-20170822100912-304308519d13 h1:WwIvjUUodNoZduhdhotbKnrLSFoIn5vD3QgNZv0hjvo=
 github.com/cf-stratos/mysqlstore v0.0.0-20170822100912-304308519d13/go.mod h1:GgQT0ToC+7JLnMKdDB5d434WwCLC2dpNR2AgTJj/08o=
+github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
 github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 h1:HD4PLRzjuCVW79mQ0/pdsalOLHJ+FaEoqJLxfltpb2U=
 github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
 github.com/charlievieth/fs v0.0.0-20170613215519-7dc373669fa1 h1:vTlpHKxJqykyKdW9bkrDJNWeKNuSIAJ0TP/K4lRsz/Q=
 github.com/charlievieth/fs v0.0.0-20170613215519-7dc373669fa1/go.mod h1:sAoA1zHCH4FJPE2gne5iBiiVG66U7Nyp6JqlOo+FEyg=
+github.com/checkpoint-restore/go-criu v0.0.0-20190109184317-bdb7599cd87b/go.mod h1:TrMrLQfeENAPYPRsJuq3jsqdlRh3lvi6trTZJG8+tho=
+github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cloudflare/cfssl v0.0.0-20180726162950-56268a613adf/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA=
 github.com/cloudfoundry-community/go-cfenv v1.17.0 h1:qfxEfn8qKkaHY3ZEk/Y2noY79HBASvNgmtHK9x4+6GY=
 github.com/cloudfoundry-community/go-cfenv v1.17.0/go.mod h1:2UgWvQTRXUuIZ/x3KnW6fk6CgPBhcV4UQb/UGIrUyyI=
-github.com/cloudfoundry-incubator/stratos v2.0.0-beta-001+incompatible h1:UUxNbLjhv2cfymub5yNN1tjjqYkteHBBagb4jcbXEIQ=
 github.com/cloudfoundry/bosh-cli v5.4.0+incompatible h1:KpT2PBB7nP1QnK8guXeZ/D2k7FZYAOxcveKgYTDEDBI=
 github.com/cloudfoundry/bosh-cli v5.4.0+incompatible/go.mod h1:rzIB+e1sn7wQL/TJ54bl/FemPKRhXby5BIMS3tLuWFM=
 github.com/cloudfoundry/bosh-utils v0.0.0-20190206192830-9a0affed2bf1 h1:TxcGamw+BaxXTFwZFORzkWNMCHAWjhThxnI24CLS7iE=
@@ -62,73 +142,227 @@ github.com/cloudfoundry/noaa v2.1.0+incompatible h1:hr6VnM5VlYRN3YD+NmAedQLW8686
 github.com/cloudfoundry/noaa v2.1.0+incompatible/go.mod h1:5LmacnptvxzrTvMfL9+EJhgkUfIgcwI61BVSTh47ECo=
 github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4 h1:cWfya7mo/zbnwYVio6eWGsFJHqYw4/k/uhwIJ1eqRPI=
 github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4/go.mod h1:GS0pCHd7onIsewbw8Ue9qa9pZPv2V88cUZDttK6KzgI=
+github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod h1:P1wt9Z3DP8O6W3rvwCt0REIlshg1InHImaLW0t3ObY0=
+github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0=
+github.com/container-storage-interface/spec v1.1.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4=
+github.com/containerd/console v0.0.0-20170925154832-84eeaae905fa/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
+github.com/containerd/containerd v1.0.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/containerd v1.3.0-beta.2.0.20190823190603-4a2f61c4f2b4 h1:aMyA5J7j6D07U7pf8BFEY67BKoDcz0zWleAbQj3zVng=
+github.com/containerd/containerd v1.3.0-beta.2.0.20190823190603-4a2f61c4f2b4/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 h1:4BX8f882bXEDKfWIf0wa8HRvpnBoPszJJXL+TVbBw4M=
+github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
+github.com/containerd/typeurl v0.0.0-20190228175220-2a93cfde8c20/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc=
+github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
+github.com/coredns/corefile-migration v1.0.2/go.mod h1:OFwBp/Wc9dJt5cAZzHWMNhK1r5L0p0jDwIBc6j8NC8E=
+github.com/coreos/bbolt v1.3.1-coreos.6/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
+github.com/coreos/bbolt v1.3.3 h1:n6AiVyVRKQFNb6mJlwESEvvLoDyiTzXX7ORAUlkeBdY=
+github.com/coreos/bbolt v1.3.3/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
+github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/etcd v3.3.15+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/etcd v3.3.16+incompatible h1:hQaR//OAeI1FQ3G5bGRL9VpFOCurqnEHSup4W693Tb4=
+github.com/coreos/etcd v3.3.16+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
+github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
+github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
+github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f h1:JOrtw2xFKzlg+cbHpyrpLDmnN1HqhBfnX7WDiW7eG2c=
+github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg=
+github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/coreos/rkt v1.30.0/go.mod h1:O634mlH6U7qk87poQifK6M2rsFNt+FyUTWNMnP1hF1U=
 github.com/cppforlife/go-patch v0.2.0 h1:Y14MnCQjDlbw7WXT4k+u6DPAA9XnygN4BfrSpI/19RU=
 github.com/cppforlife/go-patch v0.2.0/go.mod h1:67a7aIi94FHDZdoeGSJRRFDp66l9MhaAG1yGxpUoFD8=
+github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
+github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE=
+github.com/deislabs/oras v0.7.0 h1:RnDoFd3tQYODMiUqxgQ8JxlrlWL0/VMKIKRD01MmNYk=
+github.com/deislabs/oras v0.7.0/go.mod h1:sqMKPG3tMyIX9xwXUBRLhZ24o+uT4y6jgBD2RzUTKDM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/disintegration/imaging v1.6.0 h1:nVPXRUUQ36Z7MNf0O77UzgnOb1mkMMor7lmJMJXc/mA=
 github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ=
+github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
+github.com/docker/cli v0.0.0-20190506213505-d88565df0c2d h1:qdD+BtyCE1XXpDyhvn0yZVcZOLILdj9Cw4pKu0kQbPQ=
+github.com/docker/cli v0.0.0-20190506213505-d88565df0c2d/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v1.13.1 h1:IkZjBSIc8hBjLpqeAbeE5mca5mNgeatLHBy3GO78BWo=
-github.com/docker/docker v1.13.1/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker-credential-helpers v0.6.1 h1:Dq4iIfcM7cNtddhLVWe9h4QDjsi4OER3Z8voPu/I52g=
+github.com/docker/docker-credential-helpers v0.6.1/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
+github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
+github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
+github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
+github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82 h1:X0fj836zx99zFu83v/M79DuBn84IL/Syx1SY6Y5ZEMA=
+github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI=
+github.com/docker/go-units v0.3.3 h1:Xk8S3Xj5sLGlG5g67hJmYMmUgXv5N4PhkjJHHqrwnTk=
+github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/docker/libnetwork v0.0.0-20180830151422-a9cd636e3789/go.mod h1:93m0aTqz6z+g32wla4l4WxTrdtvBRmVzYRkYvasA5Z8=
+github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4=
+github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE=
+github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
 github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c h1:ZfSZ3P3BedhKGUhzj7BQlPSU4OvT6tfOKe3DVHzOA7s=
 github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
 github.com/domodwyer/mailyak v3.1.1+incompatible h1:oPtXn3+56LEFbdqH0bpuPRsqtijW9l2POpQe9sTUsSI=
 github.com/domodwyer/mailyak v3.1.1+incompatible/go.mod h1:5NNYkn9hxcdNEOmmMx0yultN5VLorZQ+AWQo9iya+UY=
 github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 h1:eX+pdPPlD279OWgdx7f6KqIRSONuK7egk+jDx7OM3Ac=
 github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76/go.mod h1:KjxHHirfLaw19iGT70HvVjHQsL1vq1SRQB4yOsAfy2s=
-github.com/evanphx/json-patch v4.1.0+incompatible h1:K1MDoo4AZ4wU0GIU/fPmtZg7VpzLjCxu+UwBD1FvwOc=
-github.com/evanphx/json-patch v4.1.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385 h1:clC1lXBpe2kTj2VHdaIu9ajZQe4kcEY9j0NsnDDBZ3o=
+github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
+github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
+github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484 h1:pEtiCjIXx3RvGjlUJuCNxNOw0MNblyR9Wi+vJGBFh+8=
+github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
+github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
+github.com/elazarl/goproxy/ext v0.0.0-20191011121108-aa519ddbe484 h1:aBgSK7SOjFeL1wfzfbIb/pkPpfRr6EP7b1Af4o/xkpU=
+github.com/elazarl/goproxy/ext v0.0.0-20191011121108-aa519ddbe484/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
+github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk=
+github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod h1:MhmAMZ8V4CYH4ybgdRwPr2TU5ThnS43puaKEMpja1uw=
+github.com/evanphx/json-patch v4.2.0+incompatible h1:fUDGZCv/7iAN7u0puUVhvKCcsR6vRfwrJatElLBEf0I=
+github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
+github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
+github.com/fatih/color v1.6.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
+github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/garyburd/redigo v1.6.0 h1:0VruCpn7yAIIu7pWVClQC8wxCJEcG3nyzpMSHKi1PQc=
+github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
+github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
+github.com/go-acme/lego v2.5.0+incompatible/go.mod h1:yzMNe9CasVUhkquNvti5nAtPmG94USbYxYrZfTkIn0M=
+github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo=
+github.com/go-inf/inf v0.9.1/go.mod h1:ZWwB6rTV+0pO94RdIMKue59tExzQp6/pj/BMuPQkXaA=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
+github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=
+github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
+github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
+github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk=
+github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
+github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
+github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
+github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
 github.com/go-openapi/jsonpointer v0.17.0 h1:nH6xp8XdXHx8dqveo0ZuJBluCO2qGrPbDNZ0dwoRHP0=
 github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
+github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
+github.com/go-openapi/jsonpointer v0.19.2 h1:A9+F4Dc/MCNB5jibxf6rRvOvR/iFgQdyNx9eIhnGqq0=
+github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
+github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
 github.com/go-openapi/jsonreference v0.17.0 h1:yJW3HCkTHg7NOA+gZ83IPHzUSnUzGXhGmsdiCcMexbA=
 github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
+github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
+github.com/go-openapi/jsonreference v0.19.2 h1:o20suLFB4Ri0tuzpWtyHlh7E7HnkqTNLq6aR6WVNS1w=
+github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
+github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
+github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
+github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
+github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs=
+github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA=
+github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64=
+github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
+github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
 github.com/go-openapi/spec v0.18.0 h1:aIjeyG5mo5/FrvDkpKKEGZPmF9MPHahS72mzfVqeQXQ=
 github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
+github.com/go-openapi/spec v0.19.2 h1:SStNd1jRcYtfKCN7R0laGNs80WYYvn5CbBjM2sOmCrE=
+github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
+github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
+github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
+github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY=
+github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
 github.com/go-openapi/swag v0.17.0 h1:iqrgMg7Q7SvtbWLlltPrkMs0UBJI6oTSs79JFRUi880=
 github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
+github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
+github.com/go-openapi/swag v0.19.2 h1:jvO6bCMBEilGwMfHhrd61zIID4oIFdwb76V17SM88dE=
+github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
+github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
+github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU=
+github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
+github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
+github.com/gofrs/flock v0.7.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
+github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
+github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
+github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I=
+github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef h1:veQD95Isof8w9/WXiA+pa3tz3fJXkt5B7QaRBrM62gk=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho=
+github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8=
+github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/cadvisor v0.34.0/go.mod h1:1nql6U13uTHaLYB8rLS5x9IJc2qT6Xd/Tr1sTX6NE48=
+github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
-github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf h1:+RRA9JqSOZFfKrOeqr2z77+8R2RKyh8PG66dcu1V0ck=
-github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
-github.com/google/uuid v1.1.0 h1:Jf4mxPC/ziBnoPIdpQdPJ9OeiomAUHLvxmPRSPH9m4s=
-github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
+github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhpy9g=
 github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
 github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e h1:XWcjeEtTFTOVA9Fs1w7n2XBftk5ib4oZrhzWk0B+3eA=
 github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZsA=
+github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U=
 github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
@@ -137,132 +371,302 @@ github.com/gorilla/sessions v1.1.3 h1:uXoZdcdA5XdXF3QzuSlheVRUvjl+1rKY7zBXL68L9R
 github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
 github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY=
+github.com/gosuri/uitable v0.0.1/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/govau/cf-common v0.0.7 h1:uhp1P6XM6GGzu1+A4C7LELLX/9mCmH6W5DpJZC0kWmo=
 github.com/govau/cf-common v0.0.7/go.mod h1:5xL/OfE7wxeyHlXb7iei0rAbdQ/5v6dF18BZknPv7NQ=
+github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
+github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc h1:f8eY6cV/x1x+HLjOp4r72s/31/V2aTUtg5oKRRPf8/Q=
 github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
+github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
+github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 h1:THDBEeQ9xZ8JEaCLyLQqXMMdRqNr0QAUJTIkQAUtFjg=
+github.com/grpc-ecosystem/go-grpc-middleware v1.1.0/go.mod h1:f5nM7jw/oeRSadq3xCzHAvxcr8HZnzsqU6ILg/0NiiE=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
+github.com/grpc-ecosystem/grpc-gateway v1.5.0 h1:WcmKMm43DR7RdtlkEXQJyo5ws8iTp98CyhCCbOHMvNI=
+github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
+github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
+github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/heketi/heketi v9.0.0+incompatible/go.mod h1:bB9ly3RchcQqsQ9CpyaQwvva7RS5ytVoSoholZQON6o=
+github.com/heketi/rest v0.0.0-20180404230133-aa6a65207413/go.mod h1:BeS3M108VzVlmAue3lv2WcGuPAX94/KN63MUURzbYSI=
+github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6/go.mod h1:xGMAM8JLi7UkZt1i4FQeQy0R2T8GLUwQhOP5M1gBhy4=
+github.com/heketi/utils v0.0.0-20170317161834-435bc5bdfa64/go.mod h1:RYlF4ghFZPPmk2TC5REt5OFwvfb6lzxFWrTWB+qs28s=
 github.com/helm/monocular v1.4.0 h1:g0sOpuMe+9u+aPfd9ZO8mWV+c8W0dfGyBG9Wl23nwec=
 github.com/helm/monocular v1.4.0/go.mod h1:PpkCN0v4zVVigsIHnsQdJytKFmaUkwfhxB7z33a9/gE=
 github.com/heptio/authenticator v0.3.0/go.mod h1:Q86X8hc61JXhE5XxYLKmrSRWby/Oe8IIYZIBgmGVkTA=
 github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40 h1:GT4RsKmHh1uZyhmTkWJTDALRjSHYQp6FRKrotf0zhAs=
 github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40/go.mod h1:NtmN9h8vrTveVQRLHcX2HQ5wIPBDCsZ351TGbZWgg38=
+github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0=
 github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4=
+github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI=
 github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod h1:wK6yTYYcgjHE1Z1QtXACPDjcFJyBskHEdagmnq3vsP8=
 github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3 h1:sHsPfNMAG70QAvKbddQ0uScZCHQoZsT5NykGRCeeeIs=
 github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/json-iterator/go v1.1.5 h1:gL2yXlmiIo4+t+y32d4WGwOjKGYcGOuyrg46vadswDE=
-github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE=
-github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
+github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
+github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo=
+github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 h1:PJPDf8OUfOK1bb/NeTKd4f1QXZItOX389VN3B6qC8ro=
+github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
+github.com/karrick/godirwalk v1.7.5/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34=
 github.com/kat-co/vala v0.0.0-20170210184112-42e1d8b61f12 h1:DQVOxR9qdYEybJUr/c7ku34r3PfajaMYXZwgDM7KuSk=
 github.com/kat-co/vala v0.0.0-20170210184112-42e1d8b61f12/go.mod h1:u9MdXq/QageOOSGp7qG4XAQsYUMP+V5zEel/Vrl6OOc=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/pty v1.1.5 h1:hyz3dwM5QLc1Rfoz4FuWJQG5BN7tc6K1MndAUnGpQr4=
+github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 h1:wdTBUArlqtBYGN2Dd4+zsaFxFH0m4iGCHToW10jPX0k=
 github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
 github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc h1:Ttr4Z3ZrMv4rAXn10UAqOC8ACx+F1omvcyV1a3hRArE=
 github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc/go.mod h1:ItxiN33Ho7Di8wiC4S4XqbH1NLF0DNdDWOd/5MI9gJU=
 github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28 h1:mkl3tvPHIuPaWsLtmHTybJeoVEW7cbePK73Ir8VtruA=
 github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28/go.mod h1:T/T7jsxVqf9k/zYOqbgNAsANsjxTd1Yq3htjDhQ1H0c=
+github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
 github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8bbnE7CX5OEgg=
 github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s=
 github.com/labstack/gommon v0.2.8 h1:JvRqmeZcfrHC5u6uVleB4NxxNbzx6gpbJiQknDbKQu0=
 github.com/labstack/gommon v0.2.8/go.mod h1:/tj9csK2iPSBvn+3NLM9e52usepMtrd5ilFYA+wQNJ4=
 github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.1.0 h1:/5u4a+KGJptBRqGzPvYQL9p0d/tPR4S31+Tnzj9lEO4=
-github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
+github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/libopenstorage/openstorage v1.0.0/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc=
+github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
+github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
+github.com/lpabon/godbc v0.1.1/go.mod h1:Jo9QV0cf3U6jZABgiJ2skINAXb9j8m51r07g4KI92ZA=
+github.com/lucas-clemente/aes12 v0.0.0-20171027163421-cd47fb39b79f/go.mod h1:JpH9J1c9oX6otFSgdUHwUBUizmKlrMjxWnIAjff4m04=
+github.com/lucas-clemente/quic-clients v0.1.0/go.mod h1:y5xVIEoObKqULIKivu+gD/LU90pL73bTdtQjPBvtCBk=
+github.com/lucas-clemente/quic-go v0.10.2/go.mod h1:hvaRS9IHjFLMq76puFJeWNfmn+H70QZ/CXoxqw9bzao=
+github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced/go.mod h1:NCcRLrOTZbzhZvixZLlERbJtDtYsmMw8Jc4vS8Z0g58=
 github.com/lunixbochs/vtclean v1.0.0 h1:xu2sLAri4lGiovBDQKxl5mrXyESr3gUr5m5SM5+LVb8=
 github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
+github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190221075403-6243d8e04c3f h1:B6PQkurxGG1rqEX96oE14gbj8bqvYC5dtks9r5uGmlE=
-github.com/mailru/easyjson v0.0.0-20190221075403-6243d8e04c3f/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63 h1:nTT4s92Dgz2HlrB2NaMgvlfqHH39OgMhA7z3PK7PGD4=
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/marten-seemann/qtls v0.2.3/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk=
+github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
+github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.6 h1:SrwhHcpV4nWrMGdNcC2kXpMfcBVYGDuTArqyhocJgvA=
 github.com/mattn/go-isatty v0.0.6/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
 github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mattn/go-shellwords v1.0.5/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
+github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
 github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/mesos/mesos-go v0.0.9/go.mod h1:kPYCMQ9gsOXVAle1OsoY4I1+9kPu8GHkf88aV59fDr4=
 github.com/mholt/archiver v3.1.1+incompatible h1:1dCVxuqs0dJseYEhi5pl7MYPH9zDa1wBi7mF09cbNkU=
 github.com/mholt/archiver v3.1.1+incompatible/go.mod h1:Dh2dOXnSdiLxRiPoVfIr/fI1TwETms9B8CTWfeh7ROU=
+github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2/go.mod h1:g4cOPxcjV0oFq3qwpjSA30LReKD8AoIfwAY9VvG35NY=
+github.com/miekg/dns v0.0.0-20181005163659-0d29b283ac0f/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/miekg/dns v1.1.3/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/miekg/dns v1.1.4 h1:rCMZsU2ScVSYcAsOXgmC6+AKOK+6pmQTOcw03nfwYV0=
+github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/mindprince/gonvml v0.0.0-20171110221305-fee913ce8fb2/go.mod h1:2eu9pRWp8mo84xCg6KswZ+USQHjwgRhNp06sozOdsTY=
+github.com/mistifyio/go-zfs v2.1.1+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
+github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
+github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
+github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 h1:cvy4lBOYN3gKfKj8Lzz5Q9TfviP+L7koMHY7SvkyTKs=
+github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
 github.com/moby/moby v1.13.1 h1:mC5WwQwCXt/dYxZ1cIrRsnJAWw7VdtcTZUIGr4tXzOM=
 github.com/moby/moby v1.13.1/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
+github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c h1:nXxl5PrvVm2L/wCy8dQu6DMTwH4oIuGN8GJDAlqDdVE=
+github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
+github.com/mrunalp/fileutils v0.0.0-20160930181131-4ee1cc9a8058/go.mod h1:x8F1gnqOkIEiO4rqoeEEEqQbo7HjGMTvyoq3gej4iT0=
+github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/mvdan/xurls v1.1.0/go.mod h1:tQlNn3BED8bE/15hnSL2HLkDeLWpNPAwtw7wkEq44oU=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
+github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0=
+github.com/naoina/toml v0.1.1/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E=
+github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ=
+github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U=
 github.com/nwaples/rardecode v1.0.0 h1:r7vGuS5akxOnR4JQSkko62RJ1ReCMXxQRPtxsiFMBOs=
 github.com/nwaples/rardecode v1.0.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
 github.com/nwmac/sqlitestore v0.0.0-20180824125213-7d2ab221fb3f h1:0U8+7akQEpWd5oaEgSKryzEEeI2oChQNc0ealKppMrk=
 github.com/nwmac/sqlitestore v0.0.0-20180824125213-7d2ab221fb3f/go.mod h1:GVvWHloj3TN6Mb3PH286FnNmEWPnn9VGEM8AhUUbdlw=
+github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w=
+github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
+github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
+github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
+github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI=
+github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
+github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
+github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830 h1:yvQ/2Pupw60ON8TYEIGGTAI77yZsWYkiOeHFZWkwlCk=
+github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
+github.com/opencontainers/runtime-spec v1.0.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
+github.com/opencontainers/selinux v1.2.2/go.mod h1:+BLncwf63G4dgOzykXAxcmnFlUaOlkDdmw/CqsW6pjs=
+github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
+github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
+github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=
+github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
+github.com/pelletier/go-toml v1.0.1/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/petar/GoLLRB v0.0.0-20130427215148-53be0d36a84c/go.mod h1:HUpKUBZnpzkdx0kD/+Yfuft+uD3zHGtXF/XJB14TUr4=
 github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
+github.com/phayes/freeport v0.0.0-20171002181615-b8543db493a5 h1:rZQtoozkfsiNs36c7Tdv/gyGNzD1X1XWKO8rptVNZuM=
+github.com/phayes/freeport v0.0.0-20171002181615-b8543db493a5/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE=
 github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/poy/eachers v0.0.0-20181020210610-23942921fe77 h1:SNdqPRvRsVmYR0gKqFvrUKhFizPJ6yDiGQ++VAJIoDg=
+github.com/poy/eachers v0.0.0-20181020210610-23942921fe77/go.mod h1:x1vqpbcMW9T/KRcQ4b48diSiSVtYgvwQ5xzDByEg4WE=
+github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
+github.com/pquerna/ffjson v0.0.0-20180717144149-af8b230fcd20/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M=
+github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=
 github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/common v0.2.0 h1:kUZDBDTdBVBYBj5Tmh2NZLlF60mfjA27rM34b+cVwNU=
+github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190129233650-316cf8ccfec5 h1:Etei0Wx6pooT/DeOKcGTr1M/01ggz95Ajq8BBwCOKBU=
+github.com/prometheus/procfs v0.0.0-20190129233650-316cf8ccfec5/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/quobyte/api v0.1.2/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI=
+github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
+github.com/robfig/cron v1.1.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
+github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rubenv/sql-migrate v0.0.0-20190902133344-8926f37f0bc1/go.mod h1:WS0rl9eEliYI8DPnr3TOwz4439pay+qNgzJoVya/DmY=
+github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto=
+github.com/russross/blackfriday v0.0.0-20170610170232-067529f716f4/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
+github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/sirupsen/logrus v1.0.5/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
 github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
-github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 h1:hBSHahWMEgzwRyS6dRpxY0XyjZsHyQ61s084wo5PJe0=
 github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v0.0.0-20160503033757-d4c757aa9afd h1:ZDVcuZGxvWB1ooKj1e31P/ktQK4A2WumM+LucMENpds=
 github.com/smartystreets/goconvey v0.0.0-20160503033757-d4c757aa9afd/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
-github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa h1:E+gaaifzi2xF65PbDmuKI3PhLWY6G5opMLniFq8vmXA=
-github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa/go.mod h1:2RVY1rIf+2J2o/IM9+vPq9RzmHDSseB7FoXiSNIUsoU=
+github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
+github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E=
+github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
+github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
+github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc=
+github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
+github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
+github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
+github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
+github.com/square/go-jose v2.3.0+incompatible/go.mod h1:7MxpAF/1WTVUu8Am+T5kNy+t0902CaLWM4Z745MkOa8=
+github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc/go.mod h1:ZrLn+e0ZuF3Y65PNF6dIwbJPZqfmtCXxFm9ckv0agOY=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
+github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245/go.mod h1:O1c8HleITsZqzNZDjSNzirUGsMT0oGu9LhHKoJrqO+A=
+github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 h1:mujcChM89zOHwgZBBNr5WZ77mBXP1yR+gLThGCYZgAg=
+github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0=
+github.com/tedsuo/rata v1.0.0 h1:Sf9aZrYy6ElSTncjnGkyC2yuVvz5YJetBIUKJ4CmeKE=
+github.com/tedsuo/rata v1.0.0/go.mod h1:X47ELzhOoLbfFIY0Cql9P6yo3Cdwf2CMX3FVZxRzJPc=
+github.com/thecodeteam/goscaleio v0.1.0/go.mod h1:68sdkZAsK8bvEwBlbQnlLS+xU+hvLYM/iQ8KXej1AwM=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 h1:LnC5Kc/wtumK+WB441p7ynQJzVuNRJiqddSIE3IlSEQ=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ulikunitz/xz v0.5.6 h1:jGHAfXawEGZQ3blwU5wnWKQJvAraT7Ftq9EXjnXYgt8=
 github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
 github.com/unrolled/render v1.0.0 h1:XYtvhA3UkpB7PqkvhUFYmpKD55OudoIeygcfus4vcd4=
@@ -273,93 +677,279 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4 h1:gKMu1Bf6QINDnvyZuTaACm9ofY+PRh+5vFz4oxBZeF8=
 github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4/go.mod h1:50wTf68f99/Zt14pr046Tgt3Lp2vLyFZKzbFXTOabXw=
+github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk=
+github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI=
 github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec h1:Klu98tQ9Z1t23gvC7p7sCmvxkZxLhBHLNyrUPsWsYFg=
 github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec/go.mod h1:wPlfmglZmRWMYv/qJy3P+fK/UnoQB5ISk4txfNd9tDo=
+github.com/vmware/govmomi v0.20.1/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v1.1.0 h1:ngVtJC9TY/lg0AA/1k48FYhBrhRoFlEmWzsehpNAaZg=
+github.com/xeipuuv/gojsonschema v1.1.0/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
+github.com/xenolf/lego v0.0.0-20160613233155-a9d8cec0e656/go.mod h1:fwiGnfsIjG7OHPfOvgK7Y/Qo6+2Ox0iozjNTkZICKbY=
+github.com/xenolf/lego v0.3.2-0.20160613233155-a9d8cec0e656 h1:BTvU+npm3/yjuBd53EvgiFLl5+YLikf2WvHsjRQ4KrY=
+github.com/xenolf/lego v0.3.2-0.20160613233155-a9d8cec0e656/go.mod h1:fwiGnfsIjG7OHPfOvgK7Y/Qo6+2Ox0iozjNTkZICKbY=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
+github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=
+github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8=
+github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 h1:p7OofyZ509h8DmPLh8Hn+EIIZm/xYhdZHJ9GnXHdr6U=
+github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
+github.com/yvasiyarov/gorelic v0.0.6 h1:qMJQYPNdtJ7UNYHjX38KXZtltKTqimMuoQjNnSVIuJg=
+github.com/yvasiyarov/gorelic v0.0.6/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA=
+github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f h1:ERexzlUfuTvpE74urLSbIQW0Z/6hF9t8U4NsJLaioAY=
+github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
 github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
 github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
+go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk=
+go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
+go.opencensus.io v0.17.0/go.mod h1:mp1VrMQxhlqqDpKvH4UcQUa4YwlzNmymAjPrDdfxNpI=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
+go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=
+go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM=
+go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+golang.org/x/crypto v0.0.0-20180426230345-b49d69b5da94/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190225124518-7f87c0fbb88b h1:+/WWzjwW6gidDJnMKWLKLX1gxn7irUTF1fLpQovfQ5M=
-golang.org/x/crypto v0.0.0-20190225124518-7f87c0fbb88b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f h1:R423Cnkcp5JABoeemiGEPlt9tHXFfw5kvc0yqlxRPWo=
-golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7 h1:0hQKqeLdqlt5iIwVOBErRisrHJAN57yOiPRQItI20fU=
+golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 h1:00VmoueYNlNz/aHIilyyQz/MHSqGoWJzpFv/HW8xpzI=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067 h1:KYGJGHOQy8oSi1fDlSpcZF0+juKwk/hEMv5SiwHogR0=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190225153610-fe579d43d832/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190328230028-74de082e2cca/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190420063019-afa5a82059c6 h1:HdqqaWmYAUI7/dmByKKEw+yxDksGSo+9GjkUc9Zp34E=
-golang.org/x/net v0.0.0-20190420063019-afa5a82059c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc h1:gkKoSkUmnU6bpS/VhkuO27bzQeSA51uaEfbOW5dNb68=
+golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226191147-529b322ea346 h1:zxGQKdHVCsCsJpbd7ijKsVC27CyETheUBql7Br2TGmA=
-golang.org/x/oauth2 v0.0.0-20190226191147-529b322ea346/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181004145325-8469e314837c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190124100055-b90733256f2e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f h1:25KHgbfyiSm6vwQLbM3zZIe1v9p/3ea4Rz+nnM5K/i4=
+golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20170824195420-5d2fd3ccab98/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
+gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
+gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ=
+google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/api v0.6.1-0.20190607001116-5213b8090861/go.mod h1:btoxGiFvQNVUZQ8W08zLtrVS08CNpINPEfxXxgJL1Q4=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190128161407-8ac453e89fca/go.mod h1:L3J43x8/uS+qIUoksaLKe6OS3nUKxOKuIFz1sl2/jx4=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 h1:nfPFGzJkUDX6uBmpN/pSw7MbOAWegH5QDQuoXFHedLg=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+google.golang.org/grpc v1.15.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
+google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
 google.golang.org/grpc v1.19.0 h1:cfg4PD8YEdSFnm7qLV4++93WcmhH2nIUhMjhdCvl3j8=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.23.0 h1:AzbTB6ux+okLTzP8Ru1Xs41C303zdcfEht7MQnYJt5A=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/cheggaaa/pb.v1 v1.0.27 h1:kJdccidYzt3CaHD1crCFTS1hxyhSi059NhOFUf03YFo=
 gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/gcfg.v1 v1.2.0/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
+gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
+gopkg.in/gorp.v1 v1.7.2/go.mod h1:Wo3h+DBQZIxATwftsglhdD/62zRFPhGhTiu5jUJmCaw=
+gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/mcuadros/go-syslog.v2 v2.2.1/go.mod h1:l5LPIyOOyIdQquNg+oU6Z3524YwrcqEm0aKH+5zpt2U=
+gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
+gopkg.in/square/go-jose.v1 v1.1.2 h1:/5jmADZB+RiKtZGr4HxsEFOEfbfsjTKsVnqpThUpE30=
+gopkg.in/square/go-jose.v1 v1.1.2/go.mod h1:QpYS+a4WhS+DTlyQIi6Ka7MS3SuR9a055rgXNEe6EiA=
 gopkg.in/square/go-jose.v2 v2.2.2 h1:orlkJ3myw8CN1nVQHBFfloD+L3egixIa4FvUP6RosSA=
 gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/warnings.v0 v0.1.1/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gotest.tools v2.1.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
+gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
+gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
+gotest.tools/gotestsum v0.3.5/go.mod h1:Mnf3e5FUzXbkCfynWBGOwLssY7gTQgCHObK9tMpAriY=
+helm.sh/helm v2.14.3+incompatible h1:M3xvix8x41Xjc/ZGARGpUOTjxTBrb86yZG5FmCjgIew=
+helm.sh/helm/v3 v3.0.0-beta.4 h1:gK5iJztTqr4Ai712LSS2fxqaW2b635GxunkBinEBCXY=
+helm.sh/helm/v3 v3.0.0-beta.4/go.mod h1:ZQ5l9gLmS7attkwdVKXxygj84XE4dzZIdr3frQ9H7No=
+honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-k8s.io/api v0.0.0-20190222213804-5cb15d344471 h1:MzQGt8qWQCR+39kbYRd0uQqsvSidpYqJLFeWiJ9l4OE=
-k8s.io/api v0.0.0-20190222213804-5cb15d344471/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
-k8s.io/apiextensions-apiserver v0.0.0-20190221221350-bfb440be4b87 h1:BMfPZfi3CkPd9e9Qbm+/AFgE6qXWQcbzUvC91LR3m7w=
-k8s.io/apiextensions-apiserver v0.0.0-20190221221350-bfb440be4b87/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE=
-k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628 h1:UYfHH+KEF88OTg+GojQUwFTNxbxwmoktLwutUzR0GPg=
-k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
-k8s.io/apiserver v0.0.0-20190221215341-5838f549963b h1:yFFYCR/UVj6hsYX6yRbY3CJ3917NF7tn0hwcdUil1aI=
-k8s.io/apiserver v0.0.0-20190221215341-5838f549963b/go.mod h1:6bqaTSOSJavUIXUtfaR9Os9JtTCm8ZqH2SUl2S60C4w=
-k8s.io/cli-runtime v0.0.0-20190221221947-d8fee89e76ca h1:UbXBTjFC1Yy5SDU8TPLVay3znB6yrlCo7Yq/q1VdESQ=
-k8s.io/cli-runtime v0.0.0-20190221221947-d8fee89e76ca/go.mod h1:qWnH3/b8sp/l7EvlDh7ulDU3UWA4P4N1NFbEEP791tM=
-k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible h1:xkYgpj1zwmLkSh7QASe/GUMTyjPI3hwHy7k/RcQSp2A=
-k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2019.2.2/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM=
 k8s.io/helm v2.12.3+incompatible h1:wo1cdYjOnr5Z+LFuhtwIJaeQnec6D4gcg2H5UAKzY6w=
 k8s.io/helm v2.12.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
-k8s.io/klog v0.2.0 h1:0ElL0OHzF3N+OhoJTL0uca20SxtYt4X4+bzHeqrB83c=
-k8s.io/klog v0.2.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
-k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4 h1:gW+EUB2I96nbxVenV/8ctfbACsHP+yxlT2dhMCsiy+s=
-k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
-k8s.io/kubernetes v1.13.3 h1:46t44D87wKtdKFgr/lXM60K8xPrW0wO67Woof3Vsv6E=
-k8s.io/kubernetes v1.13.3/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
-k8s.io/utils v0.0.0-20190221042446-c2654d5206da h1:ElyM7RPonbKnQqOcw7dG2IK5uvQQn3b/WPHqD5mBvP4=
-k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=
+k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v0.4.0 h1:lCJCxf/LIowc2IGS9TPjWDyXY4nOmdGdfcwwDQCOURQ=
+k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
+k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf h1:EYm5AW/UUDbnmnI+gK0TJDVK9qPLhM+sRHYanNKw0EQ=
+k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
+k8s.io/kubernetes v1.16.1 h1:5Ys1P0p+OkGMq+/RQWa3/gs2hlGfaNkVPsVY+vyZWqQ=
+k8s.io/kubernetes v1.16.1/go.mod h1:nlP2zevWKRGKuaaVbKIwozU0Rjg9leVDXkL4YTtjmVs=
+k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20191001043732-d647ddbd755f h1:qnPdWj5mRMsfvP85N8J2ogqiu8Aq1T6MPsJdxL3g6Ds=
+k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20191001043732-d647ddbd755f/go.mod h1:cHpnPcbNeE90PrTRnTu13OM+FN+ROt82odVbEh++81o=
+k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20191001043732-d647ddbd755f h1:bpyOu4+qNIFZRKRtSXGv/iJ7YzqwXrAOoaKxUaYKrV4=
+k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20191001043732-d647ddbd755f/go.mod h1:f1tFT2pOqPzfckbG1GjHIzy3G+T2LW7rchcruNoLaiM=
+k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20191001043732-d647ddbd755f h1:X3br+JCtf40mnzQsKAnHnezd1CvCENgG5uLJTbAspZ4=
+k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20191001043732-d647ddbd755f/go.mod h1:PNw+FbGH4/s3zK9V3rAeMiHTbQz2CU/yqAkfQ2UgLVs=
+k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20191001043732-d647ddbd755f h1:QIhu1g7jmiv/90qGiPiCOTHFYEcrL0HA5P/6G/pt7zM=
+k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20191001043732-d647ddbd755f/go.mod h1:WmFoxjELD2xtWb77Yj9RPibT5ACkQYEW9lPQtNkGtbE=
+k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20191001043732-d647ddbd755f h1:6CkT409OUoX4ZiP++1N3id3PCcOoktBvclNsDKPKrfc=
+k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20191001043732-d647ddbd755f/go.mod h1:nBogvbgjMgo7AeVA6CuqVO13LVIfmlQ11t6xzAJdBN8=
+k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20191001043732-d647ddbd755f h1:ksJC2cpBqkCP8bzmfDYXr65JRpt9JmANvaKIR3qggt4=
+k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20191001043732-d647ddbd755f/go.mod h1:GiGfbsjtP4tOW6zgpL8/vCUoyXAV5+9X2onLursPi08=
+k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20191001043732-d647ddbd755f/go.mod h1:77Vtl0d5SOrs6vqwqhZZQakDEovGSm2rRqtpTeteqcQ=
+k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20191001043732-d647ddbd755f/go.mod h1:Gwev4EWWC1Yfr0gBTJR0n8FYLsIdRu4ARubU6hXRadU=
+k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20191001043732-d647ddbd755f/go.mod h1:L8deZCu6NpzgKzY91TOGKJ1JtAoHd8WyJ/HdoxqZCGo=
+k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20191001043732-d647ddbd755f h1:fwZSUxpQ99UBEkIhHbzY2pE3SPU9Zn4yZkMSolEt6Jw=
+k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20191001043732-d647ddbd755f/go.mod h1:spPP+vRNS8EsnNNIhFCZTTuRO3XhV1WoF18HJySoZn8=
+k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20191001043732-d647ddbd755f/go.mod h1:FuWtYjatYStosiEepg0w/7/QrG0T/HMh/FA5T/8AIP8=
+k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20191001043732-d647ddbd755f/go.mod h1:w51XnEBJkmGEjUGylUXL1TezQIc0JYndQCsVkQMHjKA=
+k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20191001043732-d647ddbd755f/go.mod h1:ttKFRQ6/4l0mjLwPJ/Ccn9k/vc/6y5dJ98r88NLLiGw=
+k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20191001043732-d647ddbd755f/go.mod h1:Wm4X9LSXr3uszFEajh8M75iyxHdjOKSp0LCL4TIp7UQ=
+k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20191001043732-d647ddbd755f/go.mod h1:8btekvQmHgyy4XTchusVAW/mQIPE+hVLn61sZ/epsAA=
+k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20191001043732-d647ddbd755f/go.mod h1:sBq5nR6KVpfnkBsj4RjOQhw0j5yOtLHXIX2Dz5uZQmw=
+k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20191001043732-d647ddbd755f h1:vH4+rTRLDI8z9dQCZ6cJcIi3RMGZ6JwJWyLbrSNHBCE=
+k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20191001043732-d647ddbd755f/go.mod h1:ellVfoCz8MlDjTnkqsTkU5svJOIjcK3XNx/onmixgDk=
+k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20191001043732-d647ddbd755f/go.mod h1:4Sbo2Vn3tAIZpwx4YIp+SushTtzzzabVrg9Tq4rrImM=
+k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20191001043732-d647ddbd755f/go.mod h1:OpqDei2/Qdg+5YGQYPiEuQ4vlFoiAJy0Ysn8aLKP7Cs=
+k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20191001043732-d647ddbd755f/go.mod h1:vQHTmz0IaEb7/OXPSor1uga8Er0V+2M5aSdXG832NbU=
+k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20191001043732-d647ddbd755f/go.mod h1:E3i4wscD52Qj6PEcgUjvCd81Tl6Mghk1GHtEzoaaqwU=
+k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3/go.mod h1:+G1xBfZDfVFsm1Tj/HNCvg4QqWx8rJ2Fxpqr1rqp/gQ=
+k8s.io/utils v0.0.0-20190801114015-581e00157fb1 h1:+ySTxfHnfzZb9ys375PXNlLhkJPLKgHajBU0N62BDvE=
+k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
+modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
+modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
+modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
+modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
+modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
+rsc.io/letsencrypt v0.0.1 h1:DV0d09Ne9E7UUa9ZqWktZ9L2VmybgTgfq7xlfFR/bbU=
+rsc.io/letsencrypt v0.0.1/go.mod h1:buyQKZ6IXrRnB7TdkHP0RyEybLx18HHyOSoTyoOLqNY=
+sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
+sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
+sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
+sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA=
 sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
+vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI=
 vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 h1:O69FD9pJA4WUZlEwYatBEEkRWKQ5cKodWpdKTrCS/iQ=
 vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI=
diff --git a/src/jetstream/plugins/kubernetes/endpoint_config.go b/src/jetstream/plugins/kubernetes/endpoint_config.go
index 161460ce06..e1ae6e9627 100644
--- a/src/jetstream/plugins/kubernetes/endpoint_config.go
+++ b/src/jetstream/plugins/kubernetes/endpoint_config.go
@@ -1,7 +1,9 @@
 package kubernetes
 
 import (
+	"encoding/base64"
 	"fmt"
+	"regexp"
 
 	log "github.com/sirupsen/logrus"
 
@@ -45,6 +47,71 @@ func (c *KubernetesSpecification) GetConfigForEndpoint(masterURL string, token i
 
 }
 
+func (c *KubernetesSpecification) GetKubeConfigForEndpoint(masterURL string, token interfaces.TokenRecord) (string, error) {
+
+	name := "config-0"
+	clusterName := "cluster-0"
+	userName := "user-0"
+
+	// Create a config
+
+	// Initialize a new config
+	context := clientcmdapi.NewContext()
+	context.Cluster = clusterName
+	context.AuthInfo = userName
+
+	// Configure the cluster
+	cluster := clientcmdapi.NewCluster()
+	cluster.Server = masterURL
+	cluster.InsecureSkipTLSVerify = true
+
+	// Configure auth information
+	authInfo := clientcmdapi.NewAuthInfo()
+	err := c.addAuthInfoForEndpoint(authInfo, token)
+
+	config := clientcmdapi.NewConfig()
+	config.Clusters[clusterName] = cluster
+	config.Kind = "Config"
+	config.Contexts[name] = context
+	config.AuthInfos[userName] = authInfo
+	config.CurrentContext = context.Cluster
+
+	// Convert to string
+	str := `apiVersion: v1
+kind: Config
+contexts:
+- context:
+		cluster: kube
+		user: kube
+	name: kube
+clusters:
+- cluster:
+		insecure-skip-tls-verify: true
+		server: %s
+	name: kube
+current-context: kube
+preferences: {}
+users:
+- name: kube
+	user:
+`
+
+	space := regexp.MustCompile(`\t`)
+	s := space.ReplaceAllString(str, "  ")
+
+	// Now append the auth details
+	//log.Infof("%+v", authInfo)
+
+	if authInfo.ClientCertificateData != nil {
+		s = fmt.Sprintf("%s    client-certificate-data: %s\n", s, base64.StdEncoding.EncodeToString(authInfo.ClientCertificateData))
+	}
+	if authInfo.ClientKeyData != nil {
+		s = fmt.Sprintf("%s    client-key-data: %s\n", s, base64.StdEncoding.EncodeToString(authInfo.ClientKeyData))
+	}
+
+	return fmt.Sprintf(s, masterURL), err
+}
+
 func (c *KubernetesSpecification) addAuthInfoForEndpoint(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
 
 	log.Debug("addAuthInfoForEndpoint")
diff --git a/src/jetstream/plugins/kubernetes/go.mod b/src/jetstream/plugins/kubernetes/go.mod
index 5393fae8ef..b4311fa436 100644
--- a/src/jetstream/plugins/kubernetes/go.mod
+++ b/src/jetstream/plugins/kubernetes/go.mod
@@ -3,79 +3,44 @@ module github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernete
 go 1.12
 
 require (
-	github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e // indirect
-	github.com/Masterminds/goutils v1.1.0 // indirect
 	github.com/Masterminds/semver v1.4.2 // indirect
 	github.com/Masterminds/sprig v2.18.0+incompatible // indirect
 	github.com/SermoDigital/jose v0.9.1
 	github.com/aws/aws-sdk-go v1.17.5
 	github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 // indirect
 	github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces v0.0.0-00010101000000-000000000000
-	github.com/cyphar/filepath-securejoin v0.2.2 // indirect
-	github.com/docker/distribution v2.7.1+incompatible // indirect
 	github.com/docker/docker v1.13.1 // indirect
-	github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
-	github.com/evanphx/json-patch v4.1.0+incompatible // indirect
-	github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
-	github.com/ghodss/yaml v1.0.0 // indirect
-	github.com/go-openapi/spec v0.18.0 // indirect
-	github.com/gobwas/glob v0.2.3 // indirect
-	github.com/gogo/protobuf v1.2.1 // indirect
 	github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
-	github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c // indirect
-	github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
-	github.com/google/uuid v1.1.0 // indirect
-	github.com/googleapis/gnostic v0.2.0 // indirect
 	github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
-	github.com/hashicorp/golang-lru v0.5.0 // indirect
 	github.com/helm/monocular v1.4.0
 	github.com/helm/monocular/chartsvc v0.0.0-00010101000000-000000000000
 	github.com/heptio/authenticator v0.3.0 // indirect
-	github.com/huandu/xstrings v1.2.0 // indirect
-	github.com/imdario/mergo v0.3.7 // indirect
-	github.com/json-iterator/go v1.1.5 // indirect
 	github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4
 	github.com/kubernetes-sigs/aws-iam-authenticator v0.3.0
 	github.com/labstack/echo v3.3.10+incompatible
-	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.1 // indirect
 	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f
-	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
-	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
-	github.com/pkg/errors v0.8.1 // indirect
 	github.com/russross/blackfriday v2.0.0+incompatible // indirect
 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
-	github.com/sirupsen/logrus v1.3.0
-	github.com/spf13/cobra v0.0.3 // indirect
-	github.com/spf13/pflag v1.0.3 // indirect
+	github.com/sirupsen/logrus v1.4.2
 	github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245 // indirect
-	golang.org/x/net v0.0.0-20190225153610-fe579d43d832 // indirect
-	golang.org/x/oauth2 v0.0.0-20190226191147-529b322ea346 // indirect
-	golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect
-	google.golang.org/grpc v1.19.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/square/go-jose.v2 v2.2.2 // indirect
 	gopkg.in/yaml.v2 v2.2.2
-	k8s.io/api v0.0.0-20190226013409-f951fa7b8c72
-	k8s.io/apiextensions-apiserver v0.0.0-20190225215027-42f453e3c54a // indirect
-	k8s.io/apimachinery v0.0.0-20190117220443-572dfc7bdfcb
-	k8s.io/apiserver v0.0.0-20190225213950-239e48e34c98 // indirect
-	k8s.io/cli-runtime v0.0.0-20190223141024-b5efea9a9c9c // indirect
+	helm.sh/helm/v3 v3.0.0-beta.4 // indirect
+	k8s.io/api v0.0.0
+	k8s.io/apimachinery v0.0.0
 	k8s.io/client-go v10.0.0+incompatible
 	k8s.io/helm v2.12.3+incompatible
-	k8s.io/klog v0.2.0
-	k8s.io/kube-openapi v0.0.0-20190225204428-d50a959ae76a // indirect
-	k8s.io/kubernetes v1.13.3
-	k8s.io/utils v0.0.0-20190221042446-c2654d5206da // indirect
-	sigs.k8s.io/yaml v1.1.0 // indirect
+	k8s.io/klog v0.4.0
+	k8s.io/kubernetes v1.16.1
 	vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 // indirect
 )
 
 replace (
 	github.com/SermoDigital/jose => github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc
 	github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces => ../../repository/interfaces
+	github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309
 	github.com/helm/monocular/chartsvc => ../monocular/chartsvc
 	github.com/kubernetes-sigs/aws-iam-authenticator => github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc
 	github.com/russross/blackfriday v2.0.0+incompatible => github.com/russross/blackfriday v1.5.2
@@ -87,6 +52,8 @@ replace (
 	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190221215341-5838f549963b
 	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190221221947-d8fee89e76ca
 	k8s.io/client-go => k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible
+	k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20191001043732-d647ddbd755f
 	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4
+	k8s.io/kubectl => k8s.io/kubectl v0.0.0-20191003004222-1f3c0cd90ca9
 	k8s.io/kubernetes => k8s.io/kubernetes v1.13.3
 )
diff --git a/src/jetstream/plugins/kubernetes/go.sum b/src/jetstream/plugins/kubernetes/go.sum
index 69a959d32c..8ad79e5a3e 100644
--- a/src/jetstream/plugins/kubernetes/go.sum
+++ b/src/jetstream/plugins/kubernetes/go.sum
@@ -1,27 +1,65 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
+contrib.go.opencensus.io/exporter/ocagent v0.2.0/go.mod h1:0fnkYHF+ORKj7HWzOExKkUHeFX79gXSKUQbpnAM+wzo=
+git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
+github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
+github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
+github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
+github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
+github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
+github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
+github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
+github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
 github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e h1:eb0Pzkt15Bm7f2FFYv7sjY7NPFi3cPkS3tv1CcrFBWA=
 github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
 github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg=
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc=
 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/Masterminds/semver/v3 v3.0.1 h1:2kKm5lb7dKVrt5TYUiAavE6oFc1cFT0057UVGT+JqLk=
+github.com/Masterminds/semver/v3 v3.0.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/Masterminds/sprig v2.18.0+incompatible h1:QoGhlbC6pter1jxKnjMFxT8EqsLuDE6FEcNbWEpw+lI=
 github.com/Masterminds/sprig v2.18.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o=
+github.com/Masterminds/sprig/v3 v3.0.0 h1:KSQz7Nb08/3VU9E4ns29dDxcczhOD1q7O1UfM4G3t3g=
+github.com/Masterminds/sprig/v3 v3.0.0/go.mod h1:NEUY/Qq8Gdm2xgYA+NwJM6wmfdRV9xkh8h/Rld20R0U=
+github.com/Masterminds/vcs v1.13.0/go.mod h1:N09YCmOQr6RLxC6UNHzuVwAdodYbbnycGHSmwVJjcKA=
+github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
+github.com/Microsoft/go-winio v0.4.12/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
+github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
+github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk=
 github.com/PuerkitoBio/purell v1.1.0 h1:rmGxhojJlM0tuKtfdvliR84CFHljx9ag64t2xmVkjK4=
 github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
+github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/SermoDigital/jose v0.9.1 h1:atYaHPD3lPICcbK1owly3aPm0iaJGSGPi0WD4vLznv8=
 github.com/SermoDigital/jose v0.9.1/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA=
 github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc h1:MhBvG7RLaLqlyjxMR6of35vt6MVQ+eXMcgn9X/sy0FE=
 github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA=
+github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
+github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/aws/aws-sdk-go v1.17.5 h1:WW9Hm3KYo48iZHpmBc+b7sgyS0h32zgCvya28SLW4BU=
 github.com/aws/aws-sdk-go v1.17.5/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
+github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
+github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
+github.com/bugsnag/bugsnag-go v1.5.0/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
+github.com/bugsnag/panicwrap v1.2.0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
+github.com/census-instrumentation/opencensus-proto v0.0.2-0.20180913191712-f303ae3f8d6a/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/census-instrumentation/opencensus-proto v0.1.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
 github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 h1:HD4PLRzjuCVW79mQ0/pdsalOLHJ+FaEoqJLxfltpb2U=
 github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -29,53 +67,121 @@ github.com/cloudfoundry-community/go-cfenv v1.17.0 h1:qfxEfn8qKkaHY3ZEk/Y2noY79H
 github.com/cloudfoundry-community/go-cfenv v1.17.0/go.mod h1:2UgWvQTRXUuIZ/x3KnW6fk6CgPBhcV4UQb/UGIrUyyI=
 github.com/cloudfoundry-incubator/stratos v2.0.0-beta-001+incompatible h1:UUxNbLjhv2cfymub5yNN1tjjqYkteHBBagb4jcbXEIQ=
 github.com/cloudfoundry-incubator/stratos/src/jetstream v0.0.0-20190516104506-727fa3589a90 h1:IeIyBIgh2xEQm1CxHN2yFSBU7Ap+HQZleOs3TlAymI0=
+github.com/containerd/containerd v1.3.0-beta.2.0.20190823190603-4a2f61c4f2b4 h1:aMyA5J7j6D07U7pf8BFEY67BKoDcz0zWleAbQj3zVng=
+github.com/containerd/containerd v1.3.0-beta.2.0.20190823190603-4a2f61c4f2b4/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
+github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE=
+github.com/deislabs/oras v0.7.0 h1:RnDoFd3tQYODMiUqxgQ8JxlrlWL0/VMKIKRD01MmNYk=
+github.com/deislabs/oras v0.7.0/go.mod h1:sqMKPG3tMyIX9xwXUBRLhZ24o+uT4y6jgBD2RzUTKDM=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ=
+github.com/docker/cli v0.0.0-20190506213505-d88565df0c2d h1:qdD+BtyCE1XXpDyhvn0yZVcZOLILdj9Cw4pKu0kQbPQ=
+github.com/docker/cli v0.0.0-20190506213505-d88565df0c2d/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker v1.13.1 h1:IkZjBSIc8hBjLpqeAbeE5mca5mNgeatLHBy3GO78BWo=
 github.com/docker/docker v1.13.1/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker-credential-helpers v0.6.1 h1:Dq4iIfcM7cNtddhLVWe9h4QDjsi4OER3Z8voPu/I52g=
+github.com/docker/docker-credential-helpers v0.6.1/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
+github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
+github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
+github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82 h1:X0fj836zx99zFu83v/M79DuBn84IL/Syx1SY6Y5ZEMA=
+github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI=
+github.com/docker/go-units v0.3.3 h1:Xk8S3Xj5sLGlG5g67hJmYMmUgXv5N4PhkjJHHqrwnTk=
+github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE=
 github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c h1:ZfSZ3P3BedhKGUhzj7BQlPSU4OvT6tfOKe3DVHzOA7s=
 github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
+github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/evanphx/json-patch v4.1.0+incompatible h1:K1MDoo4AZ4wU0GIU/fPmtZg7VpzLjCxu+UwBD1FvwOc=
 github.com/evanphx/json-patch v4.1.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch v4.2.0+incompatible h1:fUDGZCv/7iAN7u0puUVhvKCcsR6vRfwrJatElLBEf0I=
+github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
+github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
+github.com/go-inf/inf v0.9.1/go.mod h1:ZWwB6rTV+0pO94RdIMKue59tExzQp6/pj/BMuPQkXaA=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-openapi/jsonpointer v0.17.0 h1:nH6xp8XdXHx8dqveo0ZuJBluCO2qGrPbDNZ0dwoRHP0=
 github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
+github.com/go-openapi/jsonpointer v0.19.2 h1:A9+F4Dc/MCNB5jibxf6rRvOvR/iFgQdyNx9eIhnGqq0=
+github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
 github.com/go-openapi/jsonreference v0.17.0 h1:yJW3HCkTHg7NOA+gZ83IPHzUSnUzGXhGmsdiCcMexbA=
 github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
+github.com/go-openapi/jsonreference v0.19.2 h1:o20suLFB4Ri0tuzpWtyHlh7E7HnkqTNLq6aR6WVNS1w=
+github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
 github.com/go-openapi/spec v0.18.0 h1:aIjeyG5mo5/FrvDkpKKEGZPmF9MPHahS72mzfVqeQXQ=
 github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
+github.com/go-openapi/spec v0.19.2 h1:SStNd1jRcYtfKCN7R0laGNs80WYYvn5CbBjM2sOmCrE=
+github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
 github.com/go-openapi/swag v0.17.0 h1:iqrgMg7Q7SvtbWLlltPrkMs0UBJI6oTSs79JFRUi880=
 github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
+github.com/go-openapi/swag v0.19.2 h1:jvO6bCMBEilGwMfHhrd61zIID4oIFdwb76V17SM88dE=
+github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
+github.com/gofrs/flock v0.7.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
+github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
+github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I=
+github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef h1:veQD95Isof8w9/WXiA+pa3tz3fJXkt5B7QaRBrM62gk=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho=
+github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8=
+github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf h1:+RRA9JqSOZFfKrOeqr2z77+8R2RKyh8PG66dcu1V0ck=
 github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
+github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/uuid v1.1.0 h1:Jf4mxPC/ziBnoPIdpQdPJ9OeiomAUHLvxmPRSPH9m4s=
 github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhpy9g=
 github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
+github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
 github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U=
 github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
@@ -84,14 +190,20 @@ github.com/gorilla/sessions v1.1.3 h1:uXoZdcdA5XdXF3QzuSlheVRUvjl+1rKY7zBXL68L9R
 github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
 github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY=
+github.com/gosuri/uitable v0.0.1/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/govau/cf-common v0.0.7 h1:uhp1P6XM6GGzu1+A4C7LELLX/9mCmH6W5DpJZC0kWmo=
 github.com/govau/cf-common v0.0.7/go.mod h1:5xL/OfE7wxeyHlXb7iei0rAbdQ/5v6dF18BZknPv7NQ=
+github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc h1:f8eY6cV/x1x+HLjOp4r72s/31/V2aTUtg5oKRRPf8/Q=
 github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
 github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/helm/monocular v1.4.0 h1:g0sOpuMe+9u+aPfd9ZO8mWV+c8W0dfGyBG9Wl23nwec=
 github.com/helm/monocular v1.4.0/go.mod h1:PpkCN0v4zVVigsIHnsQdJytKFmaUkwfhxB7z33a9/gE=
 github.com/helm/monocular v1.5.0 h1:y8anOb2XLsCluYNOPx01G6EPqyBZ9fxDi+9BKbesULE=
@@ -101,17 +213,32 @@ github.com/heptio/authenticator v0.3.0 h1:Xh6XWkLZ+CksGuky+vsr77mHnI9C4L3nwj+xuZ
 github.com/heptio/authenticator v0.3.0/go.mod h1:Q86X8hc61JXhE5XxYLKmrSRWby/Oe8IIYZIBgmGVkTA=
 github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40 h1:GT4RsKmHh1uZyhmTkWJTDALRjSHYQp6FRKrotf0zhAs=
 github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40/go.mod h1:NtmN9h8vrTveVQRLHcX2HQ5wIPBDCsZ351TGbZWgg38=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0=
 github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4=
 github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI=
 github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
+github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
+github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/json-iterator/go v1.1.5 h1:gL2yXlmiIo4+t+y32d4WGwOjKGYcGOuyrg46vadswDE=
 github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo=
+github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 h1:wdTBUArlqtBYGN2Dd4+zsaFxFH0m4iGCHToW10jPX0k=
 github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
 github.com/kubernetes-sigs/aws-iam-authenticator v0.3.0 h1:HOC7YpUao5F3RTIncfBfoh+7/ID1Jl97ALNgEmWIjxo=
@@ -122,57 +249,116 @@ github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8
 github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s=
 github.com/labstack/gommon v0.2.8 h1:JvRqmeZcfrHC5u6uVleB4NxxNbzx6gpbJiQknDbKQu0=
 github.com/labstack/gommon v0.2.8/go.mod h1:/tj9csK2iPSBvn+3NLM9e52usepMtrd5ilFYA+wQNJ4=
+github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
+github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
 github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 h1:2gxZ0XQIU/5z3Z3bUBu+FXuk2pFbkN6tcwi/pjyaDic=
 github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63 h1:nTT4s92Dgz2HlrB2NaMgvlfqHH39OgMhA7z3PK7PGD4=
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.6 h1:SrwhHcpV4nWrMGdNcC2kXpMfcBVYGDuTArqyhocJgvA=
 github.com/mattn/go-isatty v0.0.6/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
+github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mattn/go-shellwords v1.0.5/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
+github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/miekg/dns v0.0.0-20181005163659-0d29b283ac0f/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
+github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
+github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 h1:cvy4lBOYN3gKfKj8Lzz5Q9TfviP+L7koMHY7SvkyTKs=
+github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c h1:nXxl5PrvVm2L/wCy8dQu6DMTwH4oIuGN8GJDAlqDdVE=
+github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
+github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI=
+github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
+github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
+github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830 h1:yvQ/2Pupw60ON8TYEIGGTAI77yZsWYkiOeHFZWkwlCk=
+github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
+github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
+github.com/petar/GoLLRB v0.0.0-20130427215148-53be0d36a84c/go.mod h1:HUpKUBZnpzkdx0kD/+Yfuft+uD3zHGtXF/XJB14TUr4=
 github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
+github.com/phayes/freeport v0.0.0-20171002181615-b8543db493a5/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=
 github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/common v0.2.0 h1:kUZDBDTdBVBYBj5Tmh2NZLlF60mfjA27rM34b+cVwNU=
+github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190129233650-316cf8ccfec5 h1:Etei0Wx6pooT/DeOKcGTr1M/01ggz95Ajq8BBwCOKBU=
+github.com/prometheus/procfs v0.0.0-20190129233650-316cf8ccfec5/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
+github.com/rubenv/sql-migrate v0.0.0-20190902133344-8926f37f0bc1/go.mod h1:WS0rl9eEliYI8DPnr3TOwz4439pay+qNgzJoVya/DmY=
 github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/russross/blackfriday v2.0.0+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday v2.0.0 h1:L7Oc72h7rDqGkbUorN/ncJ4N/y220/YRezHvBoKLOFA=
 github.com/russross/blackfriday v2.0.0/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/russross/blackfriday v2.0.0+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
 github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
+github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/square/go-jose v2.3.0+incompatible/go.mod h1:7MxpAF/1WTVUu8Am+T5kNy+t0902CaLWM4Z745MkOa8=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245 h1:DNVk+NIkGS0RbLkjQOLCJb/759yfCysThkMbl7EXxyY=
 github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245/go.mod h1:O1c8HleITsZqzNZDjSNzirUGsMT0oGu9LhHKoJrqO+A=
 github.com/unrolled/render v1.0.0 h1:XYtvhA3UkpB7PqkvhUFYmpKD55OudoIeygcfus4vcd4=
@@ -183,49 +369,151 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4 h1:gKMu1Bf6QINDnvyZuTaACm9ofY+PRh+5vFz4oxBZeF8=
 github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4/go.mod h1:50wTf68f99/Zt14pr046Tgt3Lp2vLyFZKzbFXTOabXw=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v1.1.0 h1:ngVtJC9TY/lg0AA/1k48FYhBrhRoFlEmWzsehpNAaZg=
+github.com/xeipuuv/gojsonschema v1.1.0/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
+github.com/xenolf/lego v0.0.0-20160613233155-a9d8cec0e656/go.mod h1:fwiGnfsIjG7OHPfOvgK7Y/Qo6+2Ox0iozjNTkZICKbY=
+github.com/xenolf/lego v0.3.2-0.20160613233155-a9d8cec0e656/go.mod h1:fwiGnfsIjG7OHPfOvgK7Y/Qo6+2Ox0iozjNTkZICKbY=
+github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
+github.com/yvasiyarov/gorelic v0.0.6/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA=
+github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
+go.opencensus.io v0.17.0/go.mod h1:mp1VrMQxhlqqDpKvH4UcQUa4YwlzNmymAjPrDdfxNpI=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7 h1:0hQKqeLdqlt5iIwVOBErRisrHJAN57yOiPRQItI20fU=
+golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190225153610-fe579d43d832 h1:2IdId8zoI92l1bUzjAOygcAOkmCe13HY1j0rqPPPzB8=
 golang.org/x/net v0.0.0-20190225153610-fe579d43d832/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc h1:gkKoSkUmnU6bpS/VhkuO27bzQeSA51uaEfbOW5dNb68=
+golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226191147-529b322ea346 h1:zxGQKdHVCsCsJpbd7ijKsVC27CyETheUBql7Br2TGmA=
 golang.org/x/oauth2 v0.0.0-20190226191147-529b322ea346/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f h1:25KHgbfyiSm6vwQLbM3zZIe1v9p/3ea4Rz+nnM5K/i4=
+golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
+gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
+gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ=
+google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/api v0.6.1-0.20190607001116-5213b8090861/go.mod h1:btoxGiFvQNVUZQ8W08zLtrVS08CNpINPEfxXxgJL1Q4=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190128161407-8ac453e89fca/go.mod h1:L3J43x8/uS+qIUoksaLKe6OS3nUKxOKuIFz1sl2/jx4=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 h1:nfPFGzJkUDX6uBmpN/pSw7MbOAWegH5QDQuoXFHedLg=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+google.golang.org/grpc v1.15.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
+google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
 google.golang.org/grpc v1.19.0 h1:cfg4PD8YEdSFnm7qLV4++93WcmhH2nIUhMjhdCvl3j8=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.23.0 h1:AzbTB6ux+okLTzP8Ru1Xs41C303zdcfEht7MQnYJt5A=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/gorp.v1 v1.7.2/go.mod h1:Wo3h+DBQZIxATwftsglhdD/62zRFPhGhTiu5jUJmCaw=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/square/go-jose.v1 v1.1.2/go.mod h1:QpYS+a4WhS+DTlyQIi6Ka7MS3SuR9a055rgXNEe6EiA=
 gopkg.in/square/go-jose.v2 v2.2.2 h1:orlkJ3myw8CN1nVQHBFfloD+L3egixIa4FvUP6RosSA=
 gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
+helm.sh/helm v2.14.3+incompatible h1:M3xvix8x41Xjc/ZGARGpUOTjxTBrb86yZG5FmCjgIew=
+helm.sh/helm/v3 v3.0.0-beta.4 h1:gK5iJztTqr4Ai712LSS2fxqaW2b635GxunkBinEBCXY=
+helm.sh/helm/v3 v3.0.0-beta.4/go.mod h1:ZQ5l9gLmS7attkwdVKXxygj84XE4dzZIdr3frQ9H7No=
+honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 k8s.io/api v0.0.0-20190222213804-5cb15d344471 h1:MzQGt8qWQCR+39kbYRd0uQqsvSidpYqJLFeWiJ9l4OE=
 k8s.io/api v0.0.0-20190222213804-5cb15d344471/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
 k8s.io/api v0.0.0-20190226013409-f951fa7b8c72 h1:4wrH+M4Kpkbbjs4UzT7XOvuhgBczsd4eXfBn9T5WqKk=
@@ -252,18 +540,36 @@ k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible h1:xk
 k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
 k8s.io/client-go v10.0.0+incompatible h1:F1IqCqw7oMBzDkqlcBymRq1450wD0eNqLE9jzUrIi34=
 k8s.io/client-go v10.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
+k8s.io/code-generator v0.0.0-20190927045949-f81bca4f5e85/go.mod h1:V5BD6M4CyaN5m+VthcclXWsVcT1Hu+glwa1bi3MIsyE=
+k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/helm v2.12.3+incompatible h1:wo1cdYjOnr5Z+LFuhtwIJaeQnec6D4gcg2H5UAKzY6w=
 k8s.io/helm v2.12.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
 k8s.io/klog v0.2.0 h1:0ElL0OHzF3N+OhoJTL0uca20SxtYt4X4+bzHeqrB83c=
 k8s.io/klog v0.2.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v0.4.0 h1:lCJCxf/LIowc2IGS9TPjWDyXY4nOmdGdfcwwDQCOURQ=
+k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4 h1:gW+EUB2I96nbxVenV/8ctfbACsHP+yxlT2dhMCsiy+s=
 k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
 k8s.io/kube-openapi v0.0.0-20190225204428-d50a959ae76a h1:x9PsbfKs/IaYsygEYCbR58UWoyxHQTeHjUDpy4o+QoE=
 k8s.io/kube-openapi v0.0.0-20190225204428-d50a959ae76a/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
+k8s.io/kubectl v0.0.0-20191003004222-1f3c0cd90ca9 h1:fIRS0hFdUag6oW29mzbml8LOzXIFw6Pey2uRVT0vWsM=
+k8s.io/kubectl v0.0.0-20191003004222-1f3c0cd90ca9/go.mod h1:vRGcIHH2xhkOt8KjrcyJGt6tJYopGswaRENLPPG3jvQ=
 k8s.io/kubernetes v1.13.3 h1:46t44D87wKtdKFgr/lXM60K8xPrW0wO67Woof3Vsv6E=
 k8s.io/kubernetes v1.13.3/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
+k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20191001043732-d647ddbd755f/go.mod h1:spPP+vRNS8EsnNNIhFCZTTuRO3XhV1WoF18HJySoZn8=
+k8s.io/metrics v0.0.0-20191003002233-837aead57baf/go.mod h1:3nppwBBAvxwYOuLha+uf3pQfBRBUT8unkiBEU3EH7/U=
 k8s.io/utils v0.0.0-20190221042446-c2654d5206da h1:ElyM7RPonbKnQqOcw7dG2IK5uvQQn3b/WPHqD5mBvP4=
 k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=
+k8s.io/utils v0.0.0-20190801114015-581e00157fb1 h1:+ySTxfHnfzZb9ys375PXNlLhkJPLKgHajBU0N62BDvE=
+k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
+modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
+modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
+modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
+modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
+modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
+rsc.io/letsencrypt v0.0.1/go.mod h1:buyQKZ6IXrRnB7TdkHP0RyEybLx18HHyOSoTyoOLqNY=
+sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
 sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 h1:O69FD9pJA4WUZlEwYatBEEkRWKQ5cKodWpdKTrCS/iQ=
diff --git a/src/jetstream/plugins/kubernetes/helm_client.go b/src/jetstream/plugins/kubernetes/helm_client.go
index 8cfeef9cb0..ccc26b9894 100644
--- a/src/jetstream/plugins/kubernetes/helm_client.go
+++ b/src/jetstream/plugins/kubernetes/helm_client.go
@@ -2,60 +2,251 @@ package kubernetes
 
 import (
 	"errors"
-	"fmt"
+	"io/ioutil"
+	"path"
 
 	log "github.com/sirupsen/logrus"
 
+	"k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/resource"
+	"k8s.io/client-go/discovery"
+	cached "k8s.io/client-go/discovery/cached"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/helm/pkg/helm"
-	"k8s.io/helm/pkg/helm/portforwarder"
-	"k8s.io/helm/pkg/kube"
+	"k8s.io/client-go/tools/clientcmd"
+	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
+	"k8s.io/kubectl/pkg/validation"
+
+	restclient "k8s.io/client-go/rest"
+
+	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/kube"
+	"helm.sh/helm/v3/pkg/storage"
+	"helm.sh/helm/v3/pkg/storage/driver"
 
 	// Import the OIDC auth plugin
 	_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
 )
 
-// GetHelmClient gets a client that can be used to talk to Tiller
-func (c *KubernetesSpecification) GetHelmClient(endpointGUID, userID string) (helm.Interface, *kubernetes.Clientset, *kube.Tunnel, error) {
+// GetHelmConfiguration - gets a Helm V3 client for using it as a client library
+func (c *KubernetesSpecification) GetHelmConfiguration(endpointGUID, userID, namespace string) (*action.Configuration, error) {
 	// Need to get a config object for the target endpoint
 	var p = c.portalProxy
 
 	cnsiRecord, err := p.GetCNSIRecord(endpointGUID)
 	if err != nil {
-		return nil, nil, nil, errors.New("Helm: Can not get endpoint record")
+		return nil, errors.New("Helm: Can not get endpoint record")
 	}
 
 	tokenRecord, ok := p.GetCNSITokenRecord(endpointGUID, userID)
 	if !ok {
-		return nil, nil, nil, errors.New("Helm: Can not get user token for endpoint")
+		return nil, errors.New("Helm: Can not get user token for endpoint")
 	}
 
-	config, err := c.GetConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRecord)
+	kubeconfigcontents, err := c.GetKubeConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRecord)
 	if err != nil {
-		log.Errorf("Helm: Could not get config for endpoint: %s", err)
-		return nil, nil, nil, errors.New("Can not get Kubernetes config for specified endpoint")
+		log.Errorf("Helm: Could not get kubeconfig for endpoint: %s", err)
+		return nil, errors.New("Can not get Kubernetes config for specified endpoint")
 	}
 
-	kubeClient, err := kubernetes.NewForConfig(config)
+	// TODO: Some auth schemes needs to have the token refreshed - so we should do that first
+	// to ensure it is valid when we use it subsequently
+
+	// Temporary folder
+	//tempDir, err := ioutil.TempDir("", "helm-client-")
+
+	tempDir := "/Users/nwm/helm-client"
+	kubeConfigPath := path.Join(tempDir, "kubeconfig")
+
+	// Write kubeconfig to this folder
+	err = ioutil.WriteFile(kubeConfigPath, []byte(kubeconfigcontents), 0644)
 	if err != nil {
-		log.Errorf("Helm: Could not get kube client: %s", err)
-		return nil, nil, nil, err
+		log.Errorf("Helm: Could not get kubeconfig for endpoint: %s", err)
+		return nil, errors.New("Can not get Kubernetes config for specified endpoint")
+	}
+
+	var nopLogger = func(a string, b ...interface{}) {
+		log.Infof(a, b)
 	}
 
-	tillerTunnel, err := portforwarder.New("kube-system", kubeClient, config)
+	var actionConfig action.Configuration
+	kubeconfig := kube.GetConfig(kubeConfigPath, "kube", namespace)
+
+	kc := kube.New(kubeconfig)
+	kc.Log = nopLogger
+
+	clientset, err := kc.Factory.KubernetesClientSet()
 	if err != nil {
-		log.Error("Helm: Could not establish port forwarding for Tiller")
-		return nil, nil, nil, err
+		return nil, err
+	}
+
+	var store *storage.Storage
+	d := driver.NewSecrets(clientset.CoreV1().Secrets(namespace))
+	d.Log = nopLogger
+	store = storage.Init(d)
+
+	actionConfig.RESTClientGetter = kubeconfig
+	actionConfig.KubeClient = kc
+	actionConfig.Releases = store
+	actionConfig.Log = nopLogger
+
+	return &actionConfig, nil
+}
+
+//defer os.RemoveAll(tempDir)
+
+// Create a temporary folder, write out a kubeconfig and configure using that file
+
+// kubeClient is *kubernetes.Clientset
+// 	kubeClient, err := kubernetes.NewForConfig(config)
+// 	if err != nil {
+// 		log.Errorf("Helm: Could not get kube client: %s", err)
+// 		return nil, err
+// 	}
+
+// 	// What do we have?
+// 	// kubeClient is *kubernetes.Clientset
+// 	// config is *restclient.Config
+
+// 	var actionConfig action.Configuration
+
+// 	// TODO: Check this
+// 	kubeconfig := newJetStreamRCGictionFactory(config, kubeClient)
+
+// 	// We only work for Helm 3 storing info in secrets (not config maps)
+// 	var store *storage.Storage
+// 	d := driver.NewSecrets(kubeClient.CoreV1().Secrets(namespace))
+// 	store = storage.Init(d)
+
+// 	factory := newFictionFactory(kubeClient, kubeconfig, namespace)
+
+// 	var nopLogger = func(a string, b ...interface{}) {
+// 		log.Infof(a, b)
+// 	}
+
+// 	client := &kube.Client{
+// 		Factory: factory,
+// 		Log:     nopLogger,
+// 	}
+
+// 	actionConfig.RESTClientGetter = kubeconfig
+// 	actionConfig.KubeClient = client
+// 	actionConfig.Releases = store
+// 	//actionConfig.Log = log//
+
+// 	return &actionConfig, nil
+// }
+
+type fictionFactory struct {
+	kubeClient *kubernetes.Clientset
+	getter     genericclioptions.RESTClientGetter
+	namespace  string
+}
+
+func newFictionFactory(kubeClient *kubernetes.Clientset, getter genericclioptions.RESTClientGetter, namespace string) kube.Factory {
+
+	f := &fictionFactory{
+		kubeClient: kubeClient,
+		getter:     getter,
+		namespace:  namespace,
+	}
+	return f
+}
+
+// ToRawKubeConfigLoader return kubeconfig loader as-is
+func (f *fictionFactory) ToRawKubeConfigLoader() clientcmd.ClientConfig {
+	log.Warn("Was NOT expecting this to be used: ToRawKubeConfigLoader")
+	return newFictionClientConfig(f.namespace)
+}
+
+// KubernetesClientSet gives you back an external clientset
+func (f *fictionFactory) KubernetesClientSet() (*kubernetes.Clientset, error) {
+	log.Warn("KubernetesClientSet requested")
+	return f.kubeClient, nil
+}
+
+// 	// NewBuilder returns an object that assists in loading objects from both disk and the server
+// 	// and which implements the common patterns for CLI interactions with generic resources.
+// 	NewBuilder() *resource.Builder
+
+func (f *fictionFactory) NewBuilder() *resource.Builder {
+	return resource.NewBuilder(f.getter)
+}
+
+// 	// Returns a schema that can validate objects stored on disk.
+// 	Validator(validate bool) (validation.Schema, error)
+
+func (f *fictionFactory) Validator(validate bool) (validation.Schema, error) {
+	log.Fatal("Was NOT expecting this to be used: Validator")
+	return nil, nil
+}
+
+type jetStreamRCG struct {
+	config     *restclient.Config
+	kubeClient *kubernetes.Clientset
+}
+
+func newJetStreamRCGictionFactory(config *restclient.Config, kubeClient *kubernetes.Clientset) *jetStreamRCG {
+
+	f := &jetStreamRCG{
+		config:     config,
+		kubeClient: kubeClient,
+	}
+	return f
+}
+
+// ToRESTConfig returns restconfig
+func (f *jetStreamRCG) ToRESTConfig() (*restclient.Config, error) {
+	log.Warn("Was NOT expecting this to be used: ToRESTConfig")
+	return f.config, nil
+}
+
+// ToDiscoveryClient returns discovery client
+func (f *jetStreamRCG) ToDiscoveryClient() (discovery.CachedDiscoveryInterface, error) {
+	return cached.NewMemCacheClient(f.kubeClient.Discovery()), nil
+}
+
+// ToRESTMapper returns a restmapper
+func (f *jetStreamRCG) ToRESTMapper() (meta.RESTMapper, error) {
+	log.Fatal("Was NOT expecting this to be used: ToRESTMapper")
+	return nil, nil
+}
+
+// ToRawKubeConfigLoader return kubeconfig loader as-is
+func (f *jetStreamRCG) ToRawKubeConfigLoader() clientcmd.ClientConfig {
+	log.Fatal("Was NOT expecting this to be used: ToRawKubeConfigLoader")
+	return nil
+}
+
+type fictionClientConfig struct {
+	namespace string
+}
+
+func newFictionClientConfig(namespace string) *fictionClientConfig {
+
+	f := &fictionClientConfig{
+		namespace: namespace,
 	}
+	return f
+}
+
+// RawConfig returns the merged result of all overrides
+func (f *fictionClientConfig) RawConfig() (clientcmdapi.Config, error) {
+	log.Fatal("Was NOT expecting this to be used: RawConfig")
+	c := clientcmdapi.NewConfig()
+	return *c, nil
+}
 
-	log.Debugf("Helm: Tiller tunnel is using Port: %d", tillerTunnel.Local)
-	tillerHost := fmt.Sprintf("127.0.0.1:%d", tillerTunnel.Local)
-	client := newClient(tillerHost)
+// ClientConfig returns a complete client config
+func (f *fictionClientConfig) ClientConfig() (*restclient.Config, error) {
+	log.Warn("Was NOT expecting this to be used: ClientConfig")
+	return nil, nil
+}
 
-	return client, kubeClient, tillerTunnel, nil
+func (f *fictionClientConfig) Namespace() (string, bool, error) {
+	return f.namespace, false, nil
 }
 
-func newClient(tillerHost string) helm.Interface {
-	options := []helm.Option{helm.Host(tillerHost), helm.ConnectTimeout(20)}
-	return helm.NewClient(options...)
+func (f *fictionClientConfig) ConfigAccess() clientcmd.ConfigAccess {
+	return clientcmd.NewDefaultClientConfigLoadingRules()
 }
diff --git a/src/jetstream/plugins/kubernetes/helm_versions.go b/src/jetstream/plugins/kubernetes/helm_versions.go
deleted file mode 100644
index 1a21f5dbae..0000000000
--- a/src/jetstream/plugins/kubernetes/helm_versions.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package kubernetes
-
-import (
-	"net/http"
-
-	"github.com/labstack/echo"
-	log "github.com/sirupsen/logrus"
-
-	// "k8s.io/client-go/kubernetes"
-	// "k8s.io/client-go/rest"
-	// "k8s.io/helm/pkg/helm"
-	// "k8s.io/helm/pkg/helm/portforwarder"
-	// "k8s.io/helm/pkg/kube"
-	// "k8s.io/helm/pkg/kube"
-
-	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
-)
-
-// GetHelmVersions will retrieve Tiller details for all endpoints
-func (c *KubernetesSpecification) GetHelmVersions(ec echo.Context) error {
-
-	log.Debug("GetHelmVersions")
-	// Need to get a config object for the target endpoint
-	// endpointGUID := ec.Param("endpoint")
-	userID := ec.Get("user_id").(string)
-
-	resp, err := c.ProxyKubernetesAPI(userID, c.fetchHelmVersion)
-	if err != nil {
-		return interfaces.NewHTTPShadowError(
-			http.StatusInternalServerError,
-			"Error fetching Helm Tiller Versions",
-			"Error fetching Helm Tiller Versions: %v", err,
-		)
-	}
-	return ec.JSON(200, resp)
-}
-
-func (c *KubernetesSpecification) fetchHelmVersion(ep *interfaces.ConnectedEndpoint, done chan KubeProxyResponse) {
-
-	respone := KubeProxyResponse{
-		Endpoint: ep.GUID,
-		Result:   nil,
-	}
-
-	client, kubeClient, tiller, err := c.GetHelmClient(ep.GUID, ep.Account)
-	if err != nil {
-		done <- respone
-		return
-	}
-
-	defer tiller.Close()
-
-	resp, err := client.GetVersion()
-	if err != nil {
-		done <- respone
-		return
-	}
-
-	_, _ = kubeClient.Discovery().ServerVersion()
-
-	respone.Result = resp
-	done <- respone
-}
diff --git a/src/jetstream/plugins/kubernetes/install_release.go b/src/jetstream/plugins/kubernetes/install_release.go
index b6fc1ff755..5f5f793822 100644
--- a/src/jetstream/plugins/kubernetes/install_release.go
+++ b/src/jetstream/plugins/kubernetes/install_release.go
@@ -10,8 +10,8 @@ import (
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
 
-	"k8s.io/helm/pkg/chartutil"
-	"k8s.io/helm/pkg/helm"
+	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/chart/loader"
 )
 
 const chartCollection = "charts"
@@ -59,7 +59,7 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 	log.Debugf("Chart Download URL: %s", downloadURL)
 
 	// Should we ignore SSL certs?
-	// TODO: Look up Helm Repository endpoiint and use the value from that
+	// TODO: Look up Helm Repository endpoint and use the value from that
 	http := c.portalProxy.GetHttpClient(true)
 
 	resp, err := http.Get(downloadURL)
@@ -69,50 +69,54 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 	}
 
 	defer resp.Body.Close()
-	chart, err := chartutil.LoadArchive(resp.Body)
+
+	chart, err := loader.LoadArchive(resp.Body)
 	if err != nil {
 		return fmt.Errorf("Could not load chart from archive: %v+", err)
 	}
 
-	log.Debug("Loaded helm chart")
+	log.Warn("Loaded helm chart")
+	log.Warn(chart.Name())
 
 	endpointGUID := params.Endpoint
 	userGUID := ec.Get("user_id").(string)
 
-	client, _, tiller, err := c.GetHelmClient(endpointGUID, userGUID)
+	config, err := c.GetHelmConfiguration(endpointGUID, userGUID, params.Namespace)
 	if err != nil {
-		return fmt.Errorf("Could not get Helm Client for endpoint: %v+", err)
+		return fmt.Errorf("Could not get Helm Configuration for endpoint: %v+", err)
 	}
 
-	defer tiller.Close()
+	// if _, err := chartutil.LoadRequirements(chart); err == nil {
+	// 	log.Debug("Chart requirements loaded")
+	// } else if err != chartutil.ErrRequirementsNotFound {
+	// 	log.Error("Can not load requirements for helm chart")
+	// } else {
+	// 	log.Error(err)
+	// }
 
-	if _, err := chartutil.LoadRequirements(chart); err == nil {
-		log.Debug("Chart requirements loaded")
-	} else if err != chartutil.ErrRequirementsNotFound {
-		log.Error("Can not load requirements for helm chart")
-	} else {
-		log.Error(err)
-	}
+	log.Warn("Got values")
 
-	installResponse, err := client.InstallReleaseFromChart(
-		chart,
-		params.Namespace,
-		helm.ValueOverrides([]byte(params.Values)),
-		helm.ReleaseName(params.Name),
-		helm.InstallDryRun(false),
-		helm.InstallReuseName(false),
-		helm.InstallDisableHooks(false),
-		helm.InstallDisableCRDHook(false),
-		helm.InstallTimeout(300),
-		helm.InstallWait(false),
-		helm.InstallDescription(""),
-	)
+	n := make(map[string]interface{})
 
+	log.Warn(params.Values)
+
+	install := action.NewInstall(config)
+	install.ReleaseName = params.Name
+	install.Namespace = params.Namespace
+	// Set timeout
+	// Wait?
+	// Generate Name ?
+	// Atomic?
+
+	release, err := install.Run(chart, n)
 	if err != nil {
+		log.Error(err)
 		return fmt.Errorf("Could not install Helm Chart: %v+", err)
-
 	}
-	return ec.JSON(200, installResponse)
+
+	log.Warn("All okay")
+
+	return ec.JSON(200, release)
 }
 
 func (c *KubernetesSpecification) getChart(chartID, version string) (string, error) {
@@ -151,15 +155,19 @@ func (c *KubernetesSpecification) DeleteRelease(ec echo.Context) error {
 	endpointGUID := ec.Param("endpoint")
 	releaseName := ec.Param("name")
 
+	// I think we're going to need the namespace
+
 	userGUID := ec.Get("user_id").(string)
-	client, _, tiller, err := c.GetHelmClient(endpointGUID, userGUID)
+
+	config, err := c.GetHelmConfiguration(endpointGUID, userGUID, "")
 	if err != nil {
-		return fmt.Errorf("Could not get Helm Client for endpoint: %v+", err)
+		log.Errorf("Helm: ListReleases could not get a Helm Configuration: %s", err)
+		return err
 	}
 
-	defer tiller.Close()
+	uninstall := action.NewUninstall(config)
 
-	deleteResponse, err := client.DeleteRelease(releaseName, helm.DeletePurge(true))
+	deleteResponse, err := uninstall.Run(releaseName)
 	if err != nil {
 		return fmt.Errorf("Could not delete Helm Release: %v+", err)
 	}
diff --git a/src/jetstream/plugins/kubernetes/list_releases.go b/src/jetstream/plugins/kubernetes/list_releases.go
index 5e7e920a83..0b06148b2e 100644
--- a/src/jetstream/plugins/kubernetes/list_releases.go
+++ b/src/jetstream/plugins/kubernetes/list_releases.go
@@ -3,16 +3,19 @@ package kubernetes
 import (
 	//"encoding/json"
 	//"fmt"
-	"net/url"
+
+	"bytes"
 
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
 
 	// "k8s.io/client-go/kubernetes"
 	// "k8s.io/client-go/rest"
-	"k8s.io/helm/pkg/helm"
+	"helm.sh/helm/v3/pkg/action"
 	// "k8s.io/helm/pkg/kube"
 
+	yaml "gopkg.in/yaml.v2"
+
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 )
 
@@ -27,6 +30,25 @@ type kubeReleasesData struct {
 	} `json:"chart"`
 }
 
+// type helmReleasesData struct {
+// 	Manifest  string `json:"endpoint"`
+// 	Name      string `json:"releaseName"`
+// 	Namespace string `json:"releaseNamespace"`
+// 	Chart     struct {
+// 		Name       string `json:"chartName"`
+// 		Repository string `json:"repo"`
+// 		Version    string `json:"version"`
+// 	} `json:"chart"`
+// }
+
+type KubeResource struct {
+	Kind       string `yaml:"kind"`
+	ApiVersion string `yaml:"apiVersion"`
+	Metadata   struct {
+		Name string `yaml:"name"`
+	} `yaml:"metadata"`
+}
+
 type kubeReleasesResponse map[string]kubeReleasesData
 
 // ListReleases will list the helm releases for all endpoints
@@ -53,20 +75,19 @@ func (c *KubernetesSpecification) listReleases(ep *interfaces.ConnectedEndpoint,
 	}
 
 	log.Debugf("listReleases: START: %s", ep.GUID)
-	client, _, tiller, err := c.GetHelmClient(ep.GUID, ep.Account)
+
+	config, err := c.GetHelmConfiguration(ep.GUID, ep.Account, "")
 	if err != nil {
-		log.Errorf("Helm: ListReleases could not get a Helm Client: %s", err)
+		log.Errorf("Helm: ListReleases could not get a Helm Configuration: %s", err)
 		done <- response
 		return
 	}
 
-	defer tiller.Close()
+	list := action.NewList(config)
 
 	log.Debugf("listReleases: REQUEST: %s", ep.GUID)
 
-	res, err := client.ListReleases(
-		helm.ReleaseListStatuses(nil),
-	)
+	res, err := list.Run()
 	if err != nil {
 		log.Debugf("listReleases: ERROR: %s", ep.GUID)
 		log.Error(err)
@@ -77,71 +98,85 @@ func (c *KubernetesSpecification) listReleases(ep *interfaces.ConnectedEndpoint,
 
 	log.Debugf("listReleases: OK: %s", ep.GUID)
 	response.Result = res
+
 	done <- response
 }
 
 // GetRelease will get release status for the given release
 func (c *KubernetesSpecification) GetRelease(ec echo.Context) error {
 
+	// TODO: I think this needs to know the namespace that the release is in ?!
+
 	// Need to get a config object for the target endpoint
 	endpointGUID := ec.Param("endpoint")
 	release := ec.Param("name")
 	userID := ec.Get("user_id").(string)
 
-	client, _, tiller, err := c.GetHelmClient(endpointGUID, userID)
+	config, err := c.GetHelmConfiguration(endpointGUID, userID, "")
 	if err != nil {
-		log.Errorf("Helm: GetRelease could not get a Helm Client: %s", err)
+		log.Errorf("Helm: GetRelease could not get a Helm Configuration: %s", err)
 		return err
 	}
 
-	defer tiller.Close()
-
-	res, err := client.ReleaseStatus(release, helm.StatusReleaseVersion(0))
+	status := action.NewStatus(config)
+	res, err := status.Run(release)
 	if err != nil {
 		log.Error(err)
 		return err
 	}
 
-	return ec.JSON(200, res)
-}
-
-// ListReleases will list the helm releases for all endpoints
-func (c *KubernetesSpecification) aListReleases(ec echo.Context) error {
-
-	// Need to get a config object for the target endpoint
-	// endpointGUID := ec.Param("endpoint")
-	userID := ec.Get("user_id").(string)
-
-	// Get the config maps directly - don't go via Tiller
-
-	requests := c.makeKubeProxyRequest(userID, "GET", "/api/v1/configmaps?labelSelector=OWNER%3DTILLER")
-	responses, _ := c.portalProxy.DoProxyRequest(requests)
-	return c.portalProxy.SendProxiedResponse(ec, responses)
-}
-
-func (c *KubernetesSpecification) makeKubeProxyRequest(userID, method, uri string) []interfaces.ProxyRequestInfo {
+	// Parse the manifest
+	log.Info("Got release")
+	log.Infof("%s", res.Manifest)
 
-	var p = c.portalProxy
-	eps, err := p.ListEndpointsByUser(userID)
-	if err != nil {
-		return nil
-	}
+	r := bytes.NewReader([]byte(res.Manifest))
 
-	// Construct the metadata for proxying
-	requests := make([]interfaces.ProxyRequestInfo, 0)
-	for _, endpoint := range eps {
-		if endpoint.CNSIType == "k8s" {
-			req := interfaces.ProxyRequestInfo{}
-			req.UserGUID = userID
-			req.ResultGUID = endpoint.GUID
-			req.EndpointGUID = endpoint.GUID
-			req.Method = method
-
-			uri, _ := url.Parse(uri)
-			req.URI = uri
-			requests = append(requests, req)
-		}
+	dec := yaml.NewDecoder(r)
+	var t KubeResource
+	for dec.Decode(&t) == nil {
+		log.Infof("Resource: %s - %s", t.Kind, t.Metadata.Name)
 	}
 
-	return requests
+	return ec.JSON(200, res)
 }
+
+// // ListReleases will list the helm releases for all endpoints
+// func (c *KubernetesSpecification) aListReleases(ec echo.Context) error {
+
+// 	// Need to get a config object for the target endpoint
+// 	// endpointGUID := ec.Param("endpoint")
+// 	userID := ec.Get("user_id").(string)
+
+// 	// Get the config maps directly - don't go via Tiller
+
+// 	requests := c.makeKubeProxyRequest(userID, "GET", "/api/v1/configmaps?labelSelector=OWNER%3DTILLER")
+// 	responses, _ := c.portalProxy.DoProxyRequest(requests)
+// 	return c.portalProxy.SendProxiedResponse(ec, responses)
+// }
+
+// func (c *KubernetesSpecification) makeKubeProxyRequest(userID, method, uri string) []interfaces.ProxyRequestInfo {
+
+// 	var p = c.portalProxy
+// 	eps, err := p.ListEndpointsByUser(userID)
+// 	if err != nil {
+// 		return nil
+// 	}
+
+// 	// Construct the metadata for proxying
+// 	requests := make([]interfaces.ProxyRequestInfo, 0)
+// 	for _, endpoint := range eps {
+// 		if endpoint.CNSIType == "k8s" {
+// 			req := interfaces.ProxyRequestInfo{}
+// 			req.UserGUID = userID
+// 			req.ResultGUID = endpoint.GUID
+// 			req.EndpointGUID = endpoint.GUID
+// 			req.Method = method
+
+// 			uri, _ := url.Parse(uri)
+// 			req.URI = uri
+// 			requests = append(requests, req)
+// 		}
+// 	}
+
+// 	return requests
+// }
diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index 8e98096659..2490a5d493 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -118,7 +118,6 @@ func (c *KubernetesSpecification) AddSessionGroupRoutes(echoGroup *echo.Group) {
 	// Helm Routes
 	echoGroup.GET("/helm/releases", c.ListReleases)
 	echoGroup.POST("/helm/install", c.InstallRelease)
-	echoGroup.GET("/helm/versions", c.GetHelmVersions)
 	echoGroup.DELETE("/helm/releases/:endpoint/:name", c.DeleteRelease)
 	echoGroup.GET("/helm/releases/:endpoint/:name", c.GetRelease)
 }

From ce0c2ee9d6d898451902401b5aaad58c50820e04 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Thu, 24 Oct 2019 13:48:03 +0100
Subject: [PATCH 142/648] WIP Dark theme

---
 .../packages/core/sass/_all-theme.scss        |  2 +-
 .../packages/core/sass/dark-theme.scss        | 30 +++++++++++++++++++
 src/frontend/packages/core/sass/theme.scss    | 30 ++++++++++++-------
 .../packages/core/src/app.component.html      |  7 +++--
 .../page-side-nav.component.theme.scss        |  2 +-
 .../meta-card-item.component.scss             |  6 ++--
 6 files changed, 59 insertions(+), 18 deletions(-)
 create mode 100644 src/frontend/packages/core/sass/dark-theme.scss

diff --git a/src/frontend/packages/core/sass/_all-theme.scss b/src/frontend/packages/core/sass/_all-theme.scss
index da0a2c95be..f1664a99df 100644
--- a/src/frontend/packages/core/sass/_all-theme.scss
+++ b/src/frontend/packages/core/sass/_all-theme.scss
@@ -84,7 +84,7 @@ $side-nav-light-active: #484848;
 
   @if $is-dark==true {
     $app-background-color: lighten(mat-color($background-colors, background), 10%);
-    $subdued: darken($subdued, 50);
+    $subdued: lighten($subdued, 90);
   }
 
   @else {
diff --git a/src/frontend/packages/core/sass/dark-theme.scss b/src/frontend/packages/core/sass/dark-theme.scss
new file mode 100644
index 0000000000..0216630729
--- /dev/null
+++ b/src/frontend/packages/core/sass/dark-theme.scss
@@ -0,0 +1,30 @@
+.dark-theme {
+  // @import '@angular/material/prebuilt-themes/deeppurple-amber.css';
+  // color: $light-primary-text;
+
+  // .mat-drawer-container {
+  //   background-color: black;
+  //   color: unset;
+  // }
+
+  // .mat-app-background {
+  //   background-color: yellow;
+  //   color: yellow;
+  // }
+  
+  // $dark-primary: mat-palette($mat-yellow);
+  $dark-primary: mat-palette($mat-blue);
+
+  $dark-accent: mat-palette($mat-amber, A400, A100, A700);
+  $dark-warn: mat-palette($mat-red);
+  // $dark-theme: mat-dark-theme($oss-theme-primary, $oss-theme-accent, $oss-theme-warn);
+  $dark-theme: mat-dark-theme($dark-primary, $dark-accent, $dark-warn);
+
+  $stratos-theme: $dark-theme !default;
+  $stratos-nav-theme: null !default;
+  $stratos-status-theme: null !default;
+
+  @include angular-material-theme($dark-theme);
+  @include app-theme($stratos-theme, $stratos-nav-theme, $stratos-status-theme);
+  
+}
\ No newline at end of file
diff --git a/src/frontend/packages/core/sass/theme.scss b/src/frontend/packages/core/sass/theme.scss
index eb3e41787c..43606078f7 100644
--- a/src/frontend/packages/core/sass/theme.scss
+++ b/src/frontend/packages/core/sass/theme.scss
@@ -5,19 +5,27 @@
 
 // Custom theme support
 @import './custom';
+@import './dark-theme.scss';
 
-// Themes palettes and colors
-$oss-theme-primary: mat-palette($mat-blue);
-$oss-theme-accent: mat-palette($mat-blue);
-$oss-theme-warn: mat-palette($mat-red);
-$oss-theme: mat-light-theme($oss-theme-primary, $oss-theme-accent, $oss-theme-warn);
 
-// Default to using the open source theme
-$stratos-theme: $oss-theme !default;
-$stratos-nav-theme: null !default;
-$stratos-status-theme: null !default;
+
+.default {
+  // Themes palettes and colors
+  $oss-theme-primary: mat-palette($mat-blue);
+  $oss-theme-accent: mat-palette($mat-blue);
+  $oss-theme-warn: mat-palette($mat-red);
+  $oss-theme: mat-light-theme($oss-theme-primary, $oss-theme-accent, $oss-theme-warn);
+
+  // Default to using the open source theme
+  $stratos-theme: $oss-theme !default;
+  $stratos-nav-theme: null !default;
+  $stratos-status-theme: null !default;
+
+  @include angular-material-theme($stratos-theme);
+  @include app-theme($stratos-theme, $stratos-nav-theme, $stratos-status-theme);
+}
+
 
 // Create the theme
 @include mat-core();
-@include angular-material-theme($stratos-theme);
-@include app-theme($stratos-theme, $stratos-nav-theme, $stratos-status-theme);
+
diff --git a/src/frontend/packages/core/src/app.component.html b/src/frontend/packages/core/src/app.component.html
index 192fe40149..3b86dc60a0 100644
--- a/src/frontend/packages/core/src/app.component.html
+++ b/src/frontend/packages/core/src/app.component.html
@@ -1,2 +1,5 @@
-<router-outlet></router-outlet>
-<div class="user-id" *ngIf="userId$ | async as userId" id="__stratos-userid__">{{userId}}</div>
\ No newline at end of file
+<span class="dark-theme">
+
+  <router-outlet></router-outlet>
+  <div class="user-id" *ngIf="userId$ | async as userId" id="__stratos-userid__">{{userId}}</div>
+</span>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.theme.scss b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.theme.scss
index a05435ff5a..293e52286c 100644
--- a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.theme.scss
+++ b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.theme.scss
@@ -23,7 +23,7 @@
       }
     }
     &__item {
-      color: rgba(0, 0, 0, .6);
+      color: map-get($app-theme, subdued-color);// mat-contrast($background-color, 500);
       &--active {
         background-color: transparentize($primary-color, .9);
         color: $primary-color;
diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.scss b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.scss
index ab1ec9abec..eefbc889df 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.scss
+++ b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.scss
@@ -1,6 +1,6 @@
 .meta-card-item-row,
 .meta-card-item-row-top {
-  $text-color: rgba(0, 0, 0, .6);
+  // $text-color: rgba(0, 0, 0, .6);
   align-items: center;
   display: flex;
   justify-content: space-between;
@@ -20,8 +20,8 @@
 }
 
 .meta-card-item__key {
-  $text-color: rgba(0, 0, 0, .6);
-  color: $text-color;
+  // $text-color: rgba(0, 0, 0, .6);
+  // color: $text-color;
   flex: none;
   font-weight: 300;
   padding-right: 10px;

From 650150a60f44cfb78c986cc566ac05b0801cb58b Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 30 Oct 2019 14:57:17 +0000
Subject: [PATCH 143/648] Helm Chart: Improvements

---
 .dockerignore                                 |   5 +
 .gitignore                                    |   1 -
 build/tools/mysqldb-dev.sh                    |  10 -
 build/tools/postgres-dev.sh                   |  10 -
 deploy/Dockerfile.bk                          |  20 --
 deploy/Dockerfile.init                        |   4 +
 deploy/cloud-foundry/start.sh                 |  28 +-
 deploy/containers/proxy/entrypoint.sh         |   4 -
 deploy/db/dbconf.yml                          |  18 --
 deploy/db/mariadb-entrypoint.sh               |   6 +
 deploy/db/scripts/config-init.sh              | 147 +++++++++++
 deploy/db/scripts/run-postflight-job.k8s.sh   |  91 -------
 deploy/db/scripts/run-preflight-job.sh        |   7 +-
 deploy/kubernetes/build.sh                    |  34 ++-
 ...volume-migration.yaml => config-init.yaml} | 119 ++++++---
 .../console/templates/database.yaml           |  87 +++++++
 .../console/templates/deployment.yaml         | 224 +++-------------
 .../kubernetes/console/templates/secrets.yaml |  50 ++--
 .../{pre-install.yaml => volumes.yaml}        |  27 +-
 deploy/kubernetes/console/values.yaml         |  48 ++--
 deploy/kubernetes/ingress/README.md           |  39 ---
 deploy/kubernetes/ingress/ingress.yml         |  21 --
 deploy/stratos-ui-release/jobs/backend/spec   |   1 -
 .../jobs/backend/templates/backend_ctl.erb    |   4 -
 src/jetstream/datastore/datastore.go          |  97 +++++--
 src/jetstream/default.config.properties       |   1 +
 src/jetstream/main.go                         |  44 ++--
 src/jetstream/migrator.go                     | 241 ------------------
 .../plugins/cloudfoundryhosting/main.go       |  21 +-
 src/jetstream/repository/crypto/aes.go        |   4 +-
 .../repository/interfaces/structs.go          |   1 +
 31 files changed, 550 insertions(+), 864 deletions(-)
 create mode 100644 deploy/Dockerfile.init
 delete mode 100644 deploy/db/dbconf.yml
 create mode 100755 deploy/db/scripts/config-init.sh
 delete mode 100755 deploy/db/scripts/run-postflight-job.k8s.sh
 rename deploy/kubernetes/console/templates/{volume-migration.yaml => config-init.yaml} (50%)
 create mode 100644 deploy/kubernetes/console/templates/database.yaml
 rename deploy/kubernetes/console/templates/{pre-install.yaml => volumes.yaml} (67%)
 delete mode 100644 deploy/kubernetes/ingress/README.md
 delete mode 100644 deploy/kubernetes/ingress/ingress.yml
 delete mode 100644 src/jetstream/migrator.go

diff --git a/.dockerignore b/.dockerignore
index 3b0c34be19..c5265d690b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -7,3 +7,8 @@ docs
 coverage
 dist
 .dist
+tmp
+outputs
+coverage
+e2e-reports
+vendor
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 409ad5df8e..ada922f429 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,7 +90,6 @@ e2e-reports/
 src/jetstream/jetstream
 src/jetstream/console-database.db
 src/jetstream/config.properties
-src/jetstream/db/dbconf.yml
 
 # Customisations
 
diff --git a/build/tools/mysqldb-dev.sh b/build/tools/mysqldb-dev.sh
index 47d8164b0c..0772c015da 100755
--- a/build/tools/mysqldb-dev.sh
+++ b/build/tools/mysqldb-dev.sh
@@ -34,13 +34,3 @@ sleep 20
 docker exec -t ${ID} /init.sh
 
 echo "Database ready"
-
-mkdir -p ${STRATOS_PATH}/src/jetstream/db
-cp ${STRATOS_PATH}/deploy/db/dbconf.yml ${STRATOS_PATH}/src/jetstream/db
-
-if [ -f ${STRATOS_PATH}/src/jetstream/jetstream ]; then
-  ${STRATOS_PATH}/src/jetstream/jetstream --env=mariadb-dev up
-else
-  echo "Build the Stratos backend and run db migrations with:"
-  echo "  ./jetstream --env=mariadb-local up"
-fi
diff --git a/build/tools/postgres-dev.sh b/build/tools/postgres-dev.sh
index 304fbe8b8e..448a48b800 100755
--- a/build/tools/postgres-dev.sh
+++ b/build/tools/postgres-dev.sh
@@ -15,13 +15,3 @@ echo "Just waiting a few seconds for the DB to come online ..."
 sleep 5
 
 echo "Database ready"
-
-mkdir -p ${STRATOS_PATH}/src/jetstream/db
-cp ${STRATOS_PATH}/deploy/db/dbconf.yml ${STRATOS_PATH}/src/jetstream/db
-
-if [ -f ${STRATOS_PATH}/src/jetstream/jetstream ]; then
-  ${STRATOS_PATH}/src/jetstream/jetstream --env=postgres-dev up
-else
-  echo "Build the Stratos backend and run db migrations with:"
-  echo "  ./jetstream --env=postgres-local up"
-fi
diff --git a/deploy/Dockerfile.bk b/deploy/Dockerfile.bk
index 41ec20f1fb..93e6e13a1a 100644
--- a/deploy/Dockerfile.bk
+++ b/deploy/Dockerfile.bk
@@ -11,31 +11,11 @@ FROM splatform/stratos-bk-base:opensuse as common-build
 COPY --from=builder /home/stratos/src/jetstream/jetstream /srv/
 RUN chmod +x /srv/jetstream
 
-# use --target=db-migrator to build db-migrator image
-FROM splatform/stratos-bk-base:opensuse as db-migrator
-WORKDIR /src
-COPY deploy/db/dbconf.yml db/dbconf.yml
-COPY deploy/db/scripts/development.sh .
-COPY deploy/db/scripts/wait-for-it.sh .
-COPY --from=common-build /srv/jetstream .
-RUN chmod +x wait-for-it.sh
-RUN chmod +x development.sh
-CMD bash /src/wait-for-it.sh -t 90 mariadb:3306 && bash /src/development.sh
-
-# use --target=postflight-job to build prod postflight-job
-FROM splatform/stratos-bk-base:opensuse as postflight-job
-RUN zypper -n in mariadb-client
-COPY --from=common-build /srv/jetstream /usr/local/bin/jetstream
-COPY deploy/db/dbconf.yml db/dbconf.yml
-COPY deploy/db/scripts/run-postflight-job.k8s.sh /run-postflight-job.sh
-CMD ["/run-postflight-job.sh"]
-
 # use --target=prod-build to build a backend image for Kubernetes
 FROM splatform/stratos-bk-base:opensuse as prod-build
 RUN zypper in -y curl
 COPY deploy/containers/proxy/entrypoint.sh /entrypoint.sh
 COPY /deploy/db/scripts/run-preflight-job.sh /run-preflight-job.sh
-COPY /deploy/db/scripts/migrate-volumes.sh /migrate-volumes.sh
 COPY /deploy/tools/generate_cert.sh /generate_cert.sh
 COPY --from=common-build /srv /srv
 RUN mkdir /srv/templates
diff --git a/deploy/Dockerfile.init b/deploy/Dockerfile.init
new file mode 100644
index 0000000000..f19e3ef5f1
--- /dev/null
+++ b/deploy/Dockerfile.init
@@ -0,0 +1,4 @@
+FROM splatform/stratos-bk-base:opensuse
+RUN zypper in -y curl openssh jq
+COPY /deploy/db/scripts/config-init.sh /config-init.sh
+COPY /deploy/tools/generate_cert.sh /generate_cert.sh
diff --git a/deploy/cloud-foundry/start.sh b/deploy/cloud-foundry/start.sh
index ba55a097f8..3785ef454c 100755
--- a/deploy/cloud-foundry/start.sh
+++ b/deploy/cloud-foundry/start.sh
@@ -2,31 +2,5 @@
 
 set -e
 
-echo "Starting Stratos"
-
-CF_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-TOP_LEVEL=${CF_DIR}/../../
-DB_CONF_DIR=./deploy/db
-
-# DB Migration
-
-function handleGooseResult {
-  if [ $? -eq 0 ]; then
-    echo "Database successfully migrated"
-  else
-    echo "Database migration failed"
-    exit 1
-  fi
-}
-
-# Only migrate on instance index 0
-if [ "$CF_INSTANCE_INDEX" -eq "0" ]; then
-  echo "Attempting to migrate database"
-  ./jetstream -cf --path ${DB_CONF_DIR} up
-  handleGooseResult
-else
-  echo "Skipping DB migration => not index 0 ($CF_INSTANCE_INDEX)"  
-fi
-
-echo "Starting..."
+echo "Starting Stratos ..."
 ./jetstream
diff --git a/deploy/containers/proxy/entrypoint.sh b/deploy/containers/proxy/entrypoint.sh
index 9637ccd036..04d62d1c64 100755
--- a/deploy/containers/proxy/entrypoint.sh
+++ b/deploy/containers/proxy/entrypoint.sh
@@ -1,8 +1,4 @@
 #!/bin/bash
 set -e
 
-if [ "${NO_SHARED_MODE}" = "true" ]; then
-  /run-preflight-job.sh
-fi
-
 /srv/jetstream
diff --git a/deploy/db/dbconf.yml b/deploy/db/dbconf.yml
deleted file mode 100644
index 557d40e44e..0000000000
--- a/deploy/db/dbconf.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-cf_postgres:
-    driver: postgres
-    open: host='$DB_HOST' port=$DB_PORT user='$DB_USER' password='$DB_PASSWORD' dbname='$DB_DATABASE_NAME' sslmode='disable'
-cf_mysql:
-    driver: mysql
-    open: $DB_USER:$DB_PASSWORD@tcp($DB_HOST:$DB_PORT)/$DB_DATABASE_NAME?parseTime=true
-mariadb-development:
-    driver: mysql
-    open: stratos:strat0s@tcp(mariadb:3306)/stratos-db?parseTime=true
-mariadb-k8s:
-    driver: mysql
-    open: $DB_USER:$DB_PASSWORD@tcp($DB_HOST:$DB_PORT)/$DB_DATABASE_NAME?parseTime=true
-mariadb-dev:
-    driver: mysql
-    open: stratos:strat0s@tcp(127.0.0.1:3306)/stratosdb?parseTime=true
-postgres-dev:
-    driver: postgres
-    open: host='127.0.0.1' port=5432 user='stratos' password='strat0s' dbname='stratosdb' sslmode='disable'
\ No newline at end of file
diff --git a/deploy/db/mariadb-entrypoint.sh b/deploy/db/mariadb-entrypoint.sh
index 45e0471437..af43923849 100755
--- a/deploy/db/mariadb-entrypoint.sh
+++ b/deploy/db/mariadb-entrypoint.sh
@@ -38,6 +38,12 @@ EOSQL
     fi
   fi
 
+  if [ "$DB_DATABASE_NAME" ]; then
+    echo "CREATE DATABASE IF NOT EXISTS \`$DB_DATABASE_NAME\` ;" >> "$tempSqlFile"
+    echo "CREATE USER $DB_USER IDENTIFIED BY '$DB_PASSWORD' ;" >> "$tempSqlFile"
+    echo "GRANT ALL ON \`$DB_DATABASE_NAME\`.* TO '$DB_USER'@'%' ;" >> "$tempSqlFile"
+  fi
+
   echo 'FLUSH PRIVILEGES ;' >> "$tempSqlFile"
   set -- "$@" --init-file="$tempSqlFile"
 fi
diff --git a/deploy/db/scripts/config-init.sh b/deploy/db/scripts/config-init.sh
new file mode 100755
index 0000000000..ca8db7d4a2
--- /dev/null
+++ b/deploy/db/scripts/config-init.sh
@@ -0,0 +1,147 @@
+#!/bin/bash
+
+echo "============================================"
+echo "Stratos Configuration Init Job"
+echo "============================================"
+echo ""
+echo "Generating/Rotating Secrets"
+echo ""
+
+env
+
+# Kubernetes token
+KUBE_TOKEN=$(</var/run/secrets/kubernetes.io/serviceaccount/token)
+KUBE_API_SERVER=https://$KUBERNETES_SERVICE_HOST:$KUBERNETES_PORT_443_TCP_PORT
+
+function deleteSecret {
+  PREFIX=$1
+  REVISION=$2
+
+  # Delete the old secret
+  curl -k -s \
+       --fail \
+      -X DELETE \
+      -d @- \
+      -H "Authorization: Bearer $KUBE_TOKEN" \
+      -H 'Accept: application/json' \
+      -H 'Content-Type: application/json' \
+      ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets/${RELEASE_NAME}-${PREFIX}-${REVISION} > /dev/null 2>&1 <<'EOF' 
+  {}
+EOF
+  DELETED=$?
+  if [ $DELETED -ne 0 ]; then
+    echo "Unable to delete secret: ${RELEASE_NAME}-${PREFIX}-${REVISION} - error code: ${DELETED}"
+  fi
+}
+
+###
+# --delete flag is used in the cleanup hook to remove the secret
+###
+if [ "$1" == "--delete" ]; then
+  echo "Cleanup up - delete hook"
+  # Delete the old secret
+  deleteSecret "key" ${RELEASE_REVISION}
+  deleteSecret "cert" ${RELEASE_REVISION}
+  exit 0
+fi
+
+###############################################################################################################################
+# Encryption key
+###############################################################################################################################
+
+KEY=""
+
+# If RELEASE_REVISION is 1 then this is a new install
+# Otherwise it is an upgrade and we need to read the previous secret and
+# migrate it to a new secret and change the values if needed
+
+if [ ${RELEASE_REVISION} -eq 1 ]; then
+  echo "Fresh installation - generating a new Encryption Key"
+
+  # Generate a random encryption key
+  KEY=$(openssl enc -aes-256-cbc -k secret -P -md sha1 | grep key | cut -d '=' -f2 | base64 -w 0)
+else
+  echo "Upgrade - Looking for previous secret to migrate"
+
+  PREVIOUS_REVISION=$(($RELEASE_REVISION - 1))
+
+  # Check whether the secret already exists
+  curl -k -s \
+      --fail \
+      -H "Authorization: Bearer $KUBE_TOKEN" \
+      -H 'Content-Type: application/json' \
+      ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets/${RELEASE_NAME}-key-${PREVIOUS_REVISION} > ./key.json 2>&1
+
+  EXISTS=$?
+  if [ $EXISTS -ne 0 ]; then
+    # This could be an upgrade from a version that did NOT have the config-init job
+    # Look for the encryption key volume
+
+    echo "Could not find existing Encryption Key Secret - checking volume"
+    if [ ${ENCRYPTION_KEY_VOLUME} -a ${ENCRYPTION_KEY_FILENAME} ]; then
+      ekFile="${ENCRYPTION_KEY_VOLUME}/${ENCRYPTION_KEY_FILENAME}"
+      if [ -f "${ekFile}" ]; then
+        echo "Found encryption key file on the legacy encryption key volume"
+        KEY=$(cat ${ekFile} | base64 -w 0)
+      else
+        echo "Could not read encrpytion key file from legacy encryption key volume"
+        exit 1
+      fi
+    else
+      echo "Encryption Key secret does not exist - this should have been created by a previous installation or upgrade"
+      echo "Generating a new one - this may result in existing tokens not being usable"
+      KEY=$(openssl enc -aes-256-cbc -k secret -P -md sha1 | grep key | cut -d '=' -f2 | base64 -w 0)
+    fi
+  else
+    KEY=$(cat key.json | jq -r .data.key)
+    echo "Read Encryption Key from previous secret"
+
+    # Only delete the previous secret if it already exists
+    deleteSecret "key" ${PREVIOUS_REVISION}
+  fi
+
+  rm -f key.json
+fi
+
+# We will create a new secret for the encryption key
+cat << EOF > create-key-secret.yaml
+{
+  "kind": "Secret",
+  "apiVersion": "v1",
+  "type": "Opaque",
+  "metadata": {
+    "name": "@@NAME@@"
+  },
+  "data": {
+    "key": "@@KEY@@"
+  }
+}
+EOF
+
+NAME="${RELEASE_NAME}-key-${RELEASE_REVISION}"
+
+sed -i.bak "s/@@NAME@@/${NAME}/g" create-key-secret.yaml
+sed -i.bak "s/@@KEY@@/${KEY}/g" create-key-secret.yaml
+
+echo "Creating secret for the Encryption Key: ${RELEASE_NAME}-key-${RELEASE_REVISION}"
+
+# Patch secret for the Encryption Key
+curl -k -s \
+    --fail \
+    -X POST \
+    -d @create-key-secret.yaml \
+    -H "Authorization: Bearer $KUBE_TOKEN" \
+    -H 'Accept: application/json' \
+    -H 'Content-Type: application/json' \
+    ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets > /dev/null 2>&1
+
+RET_CREATE=$?
+echo "Create Encryption Key secret exit code: $RET_CREATE"
+rm -rf create-key-secret.yaml
+if [ $RET_CREATE -ne 0 ]; then
+  echo "Error creating Encryption Key secret"
+  exit $RET_CREATE
+fi
+
+echo ""
+echo "Stratos init job complete"
diff --git a/deploy/db/scripts/run-postflight-job.k8s.sh b/deploy/db/scripts/run-postflight-job.k8s.sh
deleted file mode 100755
index 81ac7c9e6b..0000000000
--- a/deploy/db/scripts/run-postflight-job.k8s.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/bash
-echo "=== Stratos Postflight Job ==="
-echo "Running postflight job"
-
-# mysql commands will timeout after 5 seconds
-MYSQL_CMD="mysql -u $DB_ADMIN_USER -h $DB_HOST -P $DB_PORT -p$DB_ADMIN_PASSWORD --connect_timeout 5 -e"
-
-echo "Checking if DB Server is ready"
-dbServerVersion=$(${MYSQL_CMD} "SELECT VERSION();" --skip-column-names)
-if [ $? -eq 1 ]; then
-  echo "Failed to connect to database server - it is not ready yet .. bailing for now..."
-  exit 1
-fi
-
-echo "Database Server is ready"
-echo $dbServerVersion
-
-set -e
-
-echo "Checking if DB exists..."
-stratosDbExists=$(${MYSQL_CMD}  "SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '$DB_DATABASE_NAME';")
-DBCONF_KEY=mariadb-k8s
-
-# Create DB if neccessary
-if [ -z "$stratosDbExists" ] ; then
-    echo "Creating database $DB_DATABASE_NAME"
-    ${MYSQL_CMD} "CREATE DATABASE \"$DB_DATABASE_NAME\";"
-    echo "Creating user $DB_USER"
-    ${MYSQL_CMD} "CREATE USER $DB_USER IDENTIFIED BY '$DB_PASSWORD';"
-    echo "Granting privs for $DB_DATABASE_NAME to $DB_USER"
-    ${MYSQL_CMD} "GRANT ALL PRIVILEGES ON DATABASE \"$DB_DATABASE_NAME\" TO $DB_USER;"
-else
-    echo "$DB_DATABASE_NAME already exists"
-fi
-
-# Migrate the database if necessary
-echo "Checking database to see if migration is necessary."
-
-echo "DBCONFIG: $DBCONF_KEY"
-echo "Connection string: $DB_USER:********@tcp($DB_HOST:$DB_PORT)/$DB_DATABASE_NAME?parseTime=true"
-# Check the version
-echo "Checking database version."
-jetstream --env=$DBCONF_KEY dbversion
-
-# Check the status
-echo "Checking database status."
-jetstream --env=$DBCONF_KEY status
-
-# Run migrations
-echo "Attempting database migrations."
-jetstream --env=$DBCONF_KEY up
-
-# CHeck the status
-echo "Checking database status."
-jetstream --env=$DBCONF_KEY status
-
-# Check the version
-echo "Checking database version."
-jetstream --env=$DBCONF_KEY dbversion
-
-echo "Database operation(s) complete."
-
-
-TEMP_SCRIPT=$(mktemp)
-cat << EOF >> $TEMP_SCRIPT
-#!/bin/sh
-# Check if Upgrade Lock file exists
-while [ ! -f "/$UPGRADE_VOLUME/$UPGRADE_LOCK_FILENAME" ];
-do 
-    echo "Upgrade lock file does not exist yet! Sleeping..."
-    sleep 5; 
-done   
-EOF
-chmod +x $TEMP_SCRIPT
-
-timeout 5m ${TEMP_SCRIPT}
-# Remove the lock file on the shared volume
-echo "Removing the $UPGRADE_LOCK_FILENAME file from the shared upgrade volume $UPGRADE_VOLUME."
-rm /$UPGRADE_VOLUME/$UPGRADE_LOCK_FILENAME || true
-
-echo "Removed the upgrade lock file."
-
-# If DO_NOT_QUIT is set, don't quit script
-# This is only used in toy kubernetes deployments with no shared volume 
-if [ "${DO_NOT_QUIT:-false}" = "false" ]; then
-    echo "Running in shared volume mode, exiting..."
-    exit 0
-else
-    echo "Running in 'DO NOT QUIT' mode"
-    while true; do sleep 5; done   
-fi
diff --git a/deploy/db/scripts/run-preflight-job.sh b/deploy/db/scripts/run-preflight-job.sh
index 64bdc75c97..ed54af72ee 100755
--- a/deploy/db/scripts/run-preflight-job.sh
+++ b/deploy/db/scripts/run-preflight-job.sh
@@ -1,12 +1,9 @@
 #!/bin/bash
 set -e
 
-# Step 1 - Set the lock file on the shared volume
-echo "Adding $UPGRADE_LOCK_FILENAME file to the shared upgrade volume $UPGRADE_VOLUME."
-touch /$UPGRADE_VOLUME/$UPGRADE_LOCK_FILENAME
-chmod 440 /$UPGRADE_VOLUME/$UPGRADE_LOCK_FILENAME
+exit 1
 
-echo "Created the upgrade lock file."
+# Step 1 - No longer needed
 
 # Step 2 - Create an AES-256 compliant encryption key
 # in a file on a shared volume.
diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
index 0fcf535154..e2fd3b3c4f 100755
--- a/deploy/kubernetes/build.sh
+++ b/deploy/kubernetes/build.sh
@@ -26,8 +26,9 @@ ADD_OFFICIAL_TAG="false"
 TAG_LATEST="false"
 NO_PUSH="true"
 DOCKER_REG_DEFAULTS="true"
+CHART_ONLY="false"
 
-while getopts ":ho:r:t:Tclb:On" opt; do
+while getopts ":ho:r:t:Tclb:Opc" opt; do
   case $opt in
     h)
       echo
@@ -64,6 +65,9 @@ while getopts ":ho:r:t:Tclb:On" opt; do
     p)
       NO_PUSH="false"
       ;;      
+    c)
+      CHART_ONLY="true"
+      ;;      
     \?)
       echo "Invalid option: -${OPTARG}" >&2
       exit 1
@@ -175,22 +179,26 @@ cleanup
 
 updateTagForRelease
 
-# Build all of the components that make up the Console
 
-log "-- Build & publish the runtime container image for Jetstream (backend)"
-patchAndPushImage stratos-jetstream deploy/Dockerfile.bk "${STRATOS_PATH}" prod-build
+if [ "${CHART_ONLY}" == "false" ]; then
+
+  # Build all of the components that make up the Console
+
+  log "-- Build & publish the runtime container image for Jetstream (backend)"
+  patchAndPushImage stratos-jetstream deploy/Dockerfile.bk "${STRATOS_PATH}" prod-build
 
-# Build the postflight container
-log "-- Build & publish the runtime container image for the postflight job"
-patchAndPushImage stratos-postflight-job deploy/Dockerfile.bk "${STRATOS_PATH}" postflight-job
+  log "-- Build & publish the runtime container image for Install Config Job"
+  patchAndPushImage stratos-config-init deploy/Dockerfile.init "${STRATOS_PATH}"
 
-# Build and push an image based on the mariab db container
-log "-- Building/publishing MariaDB"
-patchAndPushImage stratos-mariadb Dockerfile.mariadb "${STRATOS_PATH}/deploy/db"
+  # Build and push an image based on the mariab db container
+  log "-- Building/publishing MariaDB"
+  patchAndPushImage stratos-mariadb Dockerfile.mariadb "${STRATOS_PATH}/deploy/db"
 
-# Build and push an image based on the nginx container (Front-end)
-log "-- Building/publishing the runtime container image for the Console web server (frontend)"
-patchAndPushImage stratos-console deploy/Dockerfile.ui "${STRATOS_PATH}" prod-build
+  # Build and push an image based on the nginx container (Front-end)
+  log "-- Building/publishing the runtime container image for the Console web server (frontend)"
+  patchAndPushImage stratos-console deploy/Dockerfile.ui "${STRATOS_PATH}" prod-build
+
+fi
 
 log "-- Building Helm Chart"
 
diff --git a/deploy/kubernetes/console/templates/volume-migration.yaml b/deploy/kubernetes/console/templates/config-init.yaml
similarity index 50%
rename from deploy/kubernetes/console/templates/volume-migration.yaml
rename to deploy/kubernetes/console/templates/config-init.yaml
index 8d97c3ccd0..cb0bc0ada6 100644
--- a/deploy/kubernetes/console/templates/volume-migration.yaml
+++ b/deploy/kubernetes/console/templates/config-init.yaml
@@ -1,27 +1,26 @@
-{{- if .Values.console.migrateVolumes }}
 ---
-# Service account "volume-migration"
+# Service account "config-init"
 {{- if and (eq (printf "%s" .Values.kube.auth) "rbac") (.Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1") }}
 apiVersion: "v1"
 kind: "ServiceAccount"
 metadata:
-  name: "volume-migration"
+  name: "config-init"
   labels:
-    app.kubernetes.io/component: "volume-migration"
+    app.kubernetes.io/component: "config-init"
     app.kubernetes.io/instance: "{{ .Release.Name }}"
     app.kubernetes.io/name: "stratos"
     app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
     helm.sh/chart:  "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 {{- end }}
 ---
-# Role "volume-migration-role" only used by account "[- volume-migration]"
+# Role "config-init-role" only used by account "[- config-init]"
 {{- if and (eq (printf "%s" .Values.kube.auth) "rbac") (.Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1") }}
 apiVersion: "rbac.authorization.k8s.io/v1"
 kind: "Role"
 metadata:
-  name: "volume-migration-role"
+  name: "config-init-role"
   labels:
-    app.kubernetes.io/component: "volume-migration-role"
+    app.kubernetes.io/component: "config-init-role"
     app.kubernetes.io/instance: "{{ .Release.Name }}"
     app.kubernetes.io/name: "stratos"
     app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
@@ -42,34 +41,34 @@ rules:
   - "delete"
 {{- end }}
 ---
-# Role binding for service account "volume-migration" and role "volume-migration-role"
+# Role binding for service account "config-init" and role "config-init-role"
 {{- if and (eq (printf "%s" .Values.kube.auth) "rbac") (.Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1") }}
 apiVersion: "rbac.authorization.k8s.io/v1"
 kind: "RoleBinding"
 metadata:
-  name: "volume-migration-secrets-role-binding"
+  name: "config-init-secrets-role-binding"
   labels:
-    app.kubernetes.io/component: "volume-migration-secrets-role-binding"
+    app.kubernetes.io/component: "config-init-secrets-role-binding"
     app.kubernetes.io/instance: "{{ .Release.Name }}"
     app.kubernetes.io/name: "stratos"
     app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
     helm.sh/chart:  "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 subjects:
 - kind: "ServiceAccount"
-  name: "volume-migration"
+  name: "config-init"
 roleRef:
   apiGroup: "rbac.authorization.k8s.io"
   kind: "Role"
-  name: "volume-migration-role"
+  name: "config-init-role"
 {{- end }}
 ---
-# Volume Migration job will create secrets for the Encryption Key and Certificate so that we can remove them later
+# Config init job will create a secrets for the Encryption Key and Certificate (auto-generated)
 apiVersion: "batch/v1"
 kind: "Job"
 metadata:
-  name: "volume-migration-{{ .Release.Revision }}"
+  name: "stratos-config-init-{{ .Release.Revision }}"
   labels:
-    app.kubernetes.io/component: "volume-migration-{{ .Release.Revision }}"
+    app.kubernetes.io/component: "stratos-config-init-{{ .Release.Revision }}"
     app.kubernetes.io/instance: "{{ .Release.Name }}"
     app.kubernetes.io/name: "stratos"
     app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
@@ -77,9 +76,9 @@ metadata:
 spec:
   template:
     metadata:
-      name: "volume-migration"
+      name: "stratos-config-init"
       labels:
-        app.kubernetes.io/component: "volume-migration"
+        app.kubernetes.io/component: "stratos-config-init"
         app.kubernetes.io/instance: "{{ .Release.Name }}"
         app.kubernetes.io/name: "stratos"
         app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
@@ -105,39 +104,91 @@ spec:
           value: "/{{ .Release.Name }}-encryption-key-volume"
         - name: ENCRYPTION_KEY_FILENAME
           value: key
-        image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.proxy}}:{{.Values.consoleVersion}}
-        command: ["/migrate-volumes.sh"]
+        {{- if .Values.consoleCert }}
+        - name: CONSOLE_CERT
+          value: | 
+{{ .Values.consoleCert | indent 12 }}
+        {{- end }}
+        {{- if .Values.consoleCertKey }}
+        - name: CONSOLE_CERT_KEY
+          value: |
+{{ .Values.consoleCertKey | indent 12 }}
+        {{- end }}
+        - name: CONSOLE_PROXY_CERT_PATH
+          value: "/{{ .Release.Name }}-encryption-key-volume/console.crt" 
+        - name: CONSOLE_PROXY_CERT_KEY_PATH
+          value: "/{{ .Release.Name }}-encryption-key-volume/console.key" 
+        image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{default "stratos-config-init" .Values.images.configInit}}:{{.Values.consoleVersion}}
+        command: ["/config-init.sh"]
         imagePullPolicy: {{.Values.imagePullPolicy}}
         livenessProbe: ~
-        name: "volume-migration"
+        name: "config-init"
         readinessProbe: ~
         volumeMounts:
           - mountPath: "/{{ .Release.Name }}-encryption-key-volume"
             name: "{{ .Release.Name }}-encryption-key-volume"
             readOnly: true
-          - mountPath: /etc/secrets/key
-            name: "{{ .Release.Name }}-key-secret"
-            readOnly: true
-          - mountPath: /etc/secrets/cert
-            name: "{{ .Release.Name }}-cert-secret"
-            readOnly: true
       {{- if and .Values.kube.registry.username .Values.kube.registry.password }}
       imagePullSecrets:
       - name: {{.Values.dockerRegistrySecret}}
       {{- end }}
       restartPolicy: "OnFailure"
       {{- if and (eq (printf "%s" .Values.kube.auth) "rbac") (.Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1") }}
-      serviceAccountName: "volume-migration"
+      serviceAccountName: "config-init"
       {{- end }}
       terminationGracePeriodSeconds: 600
       volumes:
       - name: "{{ .Release.Name }}-encryption-key-volume"
         persistentVolumeClaim:
           claimName: "{{ .Release.Name }}-encryption-key-volume"
-      - name: "{{ .Release.Name }}-key-secret"
-        secret:
-          secretName: "{{ .Release.Name }}-key-secret"
-      - name: "{{ .Release.Name }}-cert-secret"
-        secret:
-          secretName: "{{ .Release.Name }}-cert-secret"
-{{- end -}}
+---
+# Cleanup job will delete the created secret when the release is deleted
+apiVersion: "batch/v1"
+kind: "Job"
+metadata:
+  name: "stratos-cleanup-{{ .Release.Revision }}"
+  annotations:
+    "helm.sh/hook": "pre-delete"
+    "helm.sh/hook-delete-policy": "hook-succeeded, hook-failed, before-hook-creation"
+  labels:
+    app.kubernetes.io/component: "stratos-cleanup-{{ .Release.Revision }}"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    helm.sh/chart:  "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+spec:
+  template:
+    metadata:
+      name: "stratos-cleanup"
+      labels:
+        app.kubernetes.io/component: "stratos-config-init"
+        app.kubernetes.io/instance: "{{ .Release.Name }}"
+        app.kubernetes.io/name: "stratos"
+        app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+        helm.sh/chart:  "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    spec:
+      containers:
+      - env:
+        - name: "NAMESPACE"
+          value: "{{ .Release.Namespace }}"
+        - name: "RELEASE_NAME"
+          value: "{{ .Release.Name }}"
+        - name: "RELEASE_REVISION"
+          value: "{{ .Release.Revision }}"
+        - name: "RELEASE_VERSION"
+          value: "{{ .Chart.AppVersion }}"
+        image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{default "stratos-config-init" .Values.images.configInit}}:{{.Values.consoleVersion}}
+        command: ["/config-init.sh", "--delete"]
+        imagePullPolicy: {{.Values.imagePullPolicy}}
+        livenessProbe: ~
+        name: "cleanup"
+        readinessProbe: ~
+      {{- if and .Values.kube.registry.username .Values.kube.registry.password }}
+      imagePullSecrets:
+      - name: {{.Values.dockerRegistrySecret}}
+      {{- end }}
+      restartPolicy: "OnFailure"
+      {{- if and (eq (printf "%s" .Values.kube.auth) "rbac") (.Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1") }}
+      serviceAccountName: "config-init"
+      {{- end }}
+      terminationGracePeriodSeconds: 600
diff --git a/deploy/kubernetes/console/templates/database.yaml b/deploy/kubernetes/console/templates/database.yaml
new file mode 100644
index 0000000000..844006e412
--- /dev/null
+++ b/deploy/kubernetes/console/templates/database.yaml
@@ -0,0 +1,87 @@
+{{- if not .Values.mariadb.external }}
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: stratos-db
+  labels:
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "stratos-db"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: "stratos"
+      app.kubernetes.io/component: "stratos-db"
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: "stratos"
+        app.kubernetes.io/instance: "{{ .Release.Name }}"
+        app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+        app.kubernetes.io/component: "stratos-db"
+        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+        app: "{{ .Release.Name }}"
+    spec:
+      containers:
+      - name: mariadb
+        image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.mariadb}}:{{.Values.consoleVersion}}
+        imagePullPolicy: {{.Values.imagePullPolicy}}
+        env:
+        - name: MYSQL_ROOT_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: "{{ .Release.Name }}-db-secret"
+              key: rootPassword
+        - name: MYSQL_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: "{{ .Release.Name }}-db-secret"
+              key: password
+        - name: MYSQL_USER
+          valueFrom:
+            secretKeyRef:
+              name: "{{ .Release.Name }}-db-secret"
+              key: user
+        - name: MYSQL_DATABASE
+          valueFrom:
+            secretKeyRef:
+              name: "{{ .Release.Name }}-db-secret"
+              key: database
+        ports:
+        - name: mysql
+          containerPort: 3306
+        livenessProbe:
+          exec:
+            command:
+            - mysqladmin
+            - ping
+          initialDelaySeconds: 30
+          timeoutSeconds: 5
+        readinessProbe:
+          exec:
+            command:
+            - mysqladmin
+            - ping
+          initialDelaySeconds: 5
+          timeoutSeconds: 1
+        resources:
+{{ toYaml .Values.mariadb.resources | indent 10 }}
+        volumeMounts:
+        - name: data
+          mountPath: /var/lib/mysql
+      {{- if and .Values.kube.registry.username .Values.kube.registry.password }}
+      imagePullSecrets:
+      - name: {{.Values.dockerRegistrySecret}}
+      {{- end }}
+      volumes:
+      - name: data
+      {{- if .Values.mariadb.persistence.enabled }}
+        persistentVolumeClaim:
+          claimName: {{ .Values.mariadb.persistence.existingClaim | default "console-mariadb" }}
+      {{- else }}
+        emptyDir: {}
+      {{- end -}}
+{{- end -}}
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 74e04b3454..cc6edc591e 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -25,16 +25,6 @@ spec:
       - image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.console}}:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         name: ui
-        env:
-        - name: ENCRYPTION_KEY_VOLUME
-          value: "{{ .Release.Name }}-encryption-key-volume"
-        volumeMounts:
-        - mountPath: /etc/secrets/
-          name: "{{ .Release.Name }}-secret"
-          readOnly: true
-        - mountPath: "/{{ .Release.Name }}-encryption-key-volume"
-          name: "{{ .Release.Name }}-encryption-key-volume"
-          readOnly: true
         ports:
         - containerPort: 80
           name: http
@@ -42,77 +32,31 @@ spec:
         - containerPort: 443
           name: https
           protocol: TCP
-      - image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.postflight}}:{{.Values.consoleVersion}}
-        imagePullPolicy: {{.Values.imagePullPolicy}}
-        name: "postflight"
-        env:
-        - name: DB_HOST
-          value: "{{ .Release.Name }}-mariadb"
-        - name: DB_PORT
-          value: "3306"
-        - name: DB_ADMIN_USER
-          value:  "{{ .Values.mariadb.adminUser }}"
-        - name: DB_ADMIN_PASSWORD
-          value:  "{{ .Values.mariadb.mariadbRootPassword }}"
-        - name: DATABASE_PROVIDER
-          value: "{{ .Values.dbProvider }}"
-        - name: DB_PASSWORD
-          value: "{{ .Values.mariadb.mariadbPassword }}"
-        - name: DB_USER
-          value: "{{ .Values.mariadb.mariadbUser }}"
-        - name: DB_DATABASE_NAME
-          value: "{{ .Values.mariadb.mariadbDatabase }}"
-        - name: DO_NOT_QUIT
-          value: "true"
-        - name: UPGRADE_VOLUME
-          value: "{{ .Release.Name }}-upgrade-volume"
-        - name: UPGRADE_LOCK_FILENAME
-          value: upgrade.lock
-        - name: HTTP_PROXY
-        {{- if .Values.httpProxy }}
-          value: {{.Values.httpProxy}}
-        {{- end }}
-        - name: HTTPS_PROXY
-        {{- if .Values.httpsProxy }}
-          value: {{.Values.httpsProxy}}
-        {{- end }}
-        - name: NO_PROXY
-        {{- if .Values.noProxy }}
-          value: {{.Values.noProxy}}
-        {{- end }}
-        - name: FTP_PROXY
-        {{- if .Values.ftpProxy }}
-          value: {{.Values.ftpProxy}}
-        {{- end }}
-        - name: SOCKS_PROXY
-        {{- if .Values.socksProxy }}  
-          value: {{.Values.socksProxy}}
-        {{- end }}
-        volumeMounts:
-          - mountPath: "/{{ .Release.Name }}-upgrade-volume"
-            name: "{{ .Release.Name }}-upgrade-volume"
-          - mountPath: /etc/secrets/
-            name: "{{ .Release.Name }}-secret"
       - image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.proxy}}:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         name: proxy
         env:
         - name: DB_USER
-          value: "{{ .Values.mariadb.mariadbUser }}"
+          valueFrom:
+            secretKeyRef:
+              name: "{{ .Release.Name }}-db-secret"
+              key: user
         - name: DB_PASSWORD
-          value: "{{ .Values.mariadb.mariadbPassword }}"
+          valueFrom:
+            secretKeyRef:
+              name: "{{ .Release.Name }}-db-secret"
+              key: password
         - name: DB_DATABASE_NAME
-          value: "{{ .Values.mariadb.mariadbDatabase }}"
+          valueFrom:
+            secretKeyRef:
+              name: "{{ .Release.Name }}-db-secret"
+              key: database
         - name: DB_HOST
           value: "{{ .Release.Name }}-mariadb"
         - name: DB_PORT
           value: "3306"
         - name: DATABASE_PROVIDER
-          value: "{{ .Values.dbProvider }}"
-        - name: DB_ADMIN_USER
-          value:  "{{ .Values.mariadb.adminUser }}"
-        - name: DB_ADMIN_PASSWORD
-          value:  "{{ .Values.mariadb.mariadbRootPassword }}"
+          value: "mysql"
         - name: HTTP_CONNECTION_TIMEOUT_IN_SECS
           value: "10"
         - name: HTTP_CLIENT_TIMEOUT_IN_SECS
@@ -125,10 +69,6 @@ spec:
           value: :3003
         - name: CF_CLIENT
           value: cf
-        - name: UPGRADE_VOLUME
-          value: "{{ .Release.Name }}-upgrade-volume"
-        - name: UPGRADE_LOCK_FILENAME
-          value: upgrade.lock
         - name: ALLOWED_ORIGINS
           value: https://localhost
         - name: ENCRYPTION_KEY_VOLUME
@@ -136,27 +76,14 @@ spec:
         - name: ENCRYPTION_KEY_FILENAME
           value: key
         - name: SESSION_STORE_SECRET
-          {{- if .Values.console.sessionStoreSecret }}
-          value: {{ .Values.console.sessionStoreSecret | quote }}
-          {{- else }}
-          value: {{ randAlphaNum 64 | quote }}
-          {{- end }}          
-        {{- if .Values.consoleCert }}
-        - name: CONSOLE_CERT
-          value: | 
-{{ .Values.consoleCert | indent 12 }}
-        {{- end }}
-        {{- if .Values.consoleCertKey }}
-        - name: CONSOLE_CERT_KEY
-          value: |
-{{ .Values.consoleCertKey | indent 12 }}
-        {{- end }}
+          valueFrom:
+            secretKeyRef:
+              name: "{{ .Release.Name }}-db-secret"
+              key: sessionStoreSecret
         - name: CONSOLE_PROXY_CERT_PATH
-          value: "/{{ .Release.Name }}-encryption-key-volume/console.crt" 
+          value: "/{{ .Release.Name }}-cert-volume/tls.crt"
         - name: CONSOLE_PROXY_CERT_KEY_PATH
-          value: "/{{ .Release.Name }}-encryption-key-volume/console.key" 
-        - name: NO_SHARED_MODE
-          value: "true"
+          value: "/{{ .Release.Name }}-cert-volume/tls.key"
         - name: HTTP_PROXY
         {{- if .Values.httpProxy }}
           value: {{.Values.httpProxy}}
@@ -194,7 +121,10 @@ spec:
         - name: LOCAL_USER 
           value: admin
         - name: LOCAL_USER_PASSWORD 
-          value: "{{.Values.console.localAdminPassword}}"
+          valueFrom:
+            secretKeyRef:
+              name: "{{ .Release.Name }}-db-secret"
+              key: localAdminPassword
         - name: LOCAL_USER_SCOPE 
           value: stratos.admin
         {{- else }}
@@ -275,12 +205,14 @@ spec:
           name: proxy
           protocol: TCP
         volumeMounts:
-        - mountPath: "/{{ .Release.Name }}-upgrade-volume"
-          name: "{{ .Release.Name }}-upgrade-volume"
         - mountPath: "/{{ .Release.Name }}-encryption-key-volume"
           name: "{{ .Release.Name }}-encryption-key-volume"
+          readOnly: true
+        - mountPath: "/{{ .Release.Name }}-cert-volume"
+          name: "{{ .Release.Name }}-cert-volume"
+          readOnly: true
         - mountPath: /etc/secrets/
-          name: "{{ .Release.Name }}-secret"
+          name: "{{ .Release.Name }}-db-secret"
           readOnly: true
         {{- if .Values.console.templatesConfigMapName }}
         - mountPath: /etc/templates/
@@ -292,103 +224,17 @@ spec:
       - name: {{.Values.dockerRegistrySecret}}
       {{- end }}
       volumes:
-      - name: "{{ .Release.Name }}-upgrade-volume"
-        persistentVolumeClaim:
-          claimName: "{{ .Release.Name }}-upgrade-volume"
       - name: "{{ .Release.Name }}-encryption-key-volume"
-        persistentVolumeClaim:
-          claimName: "{{ .Release.Name }}-encryption-key-volume"
-      - name: "{{ .Release.Name }}-secret"
         secret:
-          secretName: "{{ .Release.Name }}-secret"
+          secretName: "{{ .Release.Name }}-key-{{ .Release.Revision }}"
+      - name: "{{ .Release.Name }}-cert-volume"
+        secret:
+          secretName: "{{ .Release.Name }}-cert-secret"
+      - name: "{{ .Release.Name }}-db-secret"
+        secret:
+          secretName: "{{ .Release.Name }}-db-secret"
       {{- if .Values.console.templatesConfigMapName }}
       - name: {{ .Release.Name }}-templates
         configMap:
           name: {{ .Values.console.templatesConfigMapName }}
       {{- end }}
----
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: stratos-db
-  labels:
-    app.kubernetes.io/name: "stratos"
-    app.kubernetes.io/instance: "{{ .Release.Name }}"
-    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "stratos-db"
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-spec:
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: "stratos"
-      app.kubernetes.io/component: "stratos-db"
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: "stratos"
-        app.kubernetes.io/instance: "{{ .Release.Name }}"
-        app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-        app.kubernetes.io/component: "stratos-db"
-        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-        app: "{{ .Release.Name }}"
-    spec:
-      containers:
-      - name: mariadb
-        image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.mariadb}}:{{.Values.consoleVersion}}
-        imagePullPolicy: {{.Values.imagePullPolicy}}
-        env:
-        {{- if .Values.mariadb.usePassword }}
-        - name: MYSQL_ROOT_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: "{{ .Release.Name }}-mariadb-secret"
-              key: mariadb-root-password
-        {{- if .Values.mariadb.mariadbUser }}
-        - name: MYSQL_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: "{{ .Release.Name }}-mariadb-secret"
-              key: mariadb-password
-        {{- end }}
-        {{- else }}
-        - name: ALLOW_EMPTY_PASSWORD
-          value: "yes"
-        {{- end }}
-        - name: MYSQL_USER
-          value: {{ default "" .Values.mariadb.mariadbUser | quote }}
-        - name: MYSQL_DATABASE
-          value: {{ default "" .Values.mariadb.mariadbDatabase | quote }}
-        ports:
-        - name: mysql
-          containerPort: 3306
-        livenessProbe:
-          exec:
-            command:
-            - mysqladmin
-            - ping
-          initialDelaySeconds: 30
-          timeoutSeconds: 5
-        readinessProbe:
-          exec:
-            command:
-            - mysqladmin
-            - ping
-          initialDelaySeconds: 5
-          timeoutSeconds: 1
-        resources:
-{{ toYaml .Values.mariadb.resources | indent 10 }}
-        volumeMounts:
-        - name: data
-          mountPath: /var/lib/mysql
-      {{- if and .Values.kube.registry.username .Values.kube.registry.password }}
-      imagePullSecrets:
-      - name: {{.Values.dockerRegistrySecret}}
-      {{- end }}
-      volumes:
-      - name: data
-      {{- if .Values.mariadb.persistence.enabled }}
-        persistentVolumeClaim:
-          claimName: {{ .Values.mariadb.persistence.existingClaim | default "console-mariadb" }}
-      {{- else }}
-        emptyDir: {}
-      {{- end -}}
diff --git a/deploy/kubernetes/console/templates/secrets.yaml b/deploy/kubernetes/console/templates/secrets.yaml
index 2c3b9debf2..abf8790c61 100644
--- a/deploy/kubernetes/console/templates/secrets.yaml
+++ b/deploy/kubernetes/console/templates/secrets.yaml
@@ -11,33 +11,40 @@ metadata:
     app.kubernetes.io/component: "console-secret"
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 data:
-  stolon: {{ .Values.dbPassword | b64enc }}
-  db-password: {{  .Values.mariadb.mariadbPassword | b64enc }}
+  client: {{ default "" .Values.uaa.consoleClient | b64enc | quote }}
+  clientSecret: {{  default "" .Values.uaa.consoleClientSecret | b64enc | quote }}
 ---
-{{- if .Values.mariadb.usePassword }}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: "{{ .Release.Name }}-mariadb-secret"
+  name: "{{ .Release.Name }}-db-secret"
   labels:
     app.kubernetes.io/name: "stratos"
     app.kubernetes.io/instance: "{{ .Release.Name }}"
     app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "console-mariadb-secret"
+    app.kubernetes.io/component: "console-db-secret"
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 type: Opaque
 data:
-  {{- if .Values.mariadb.mariadbRootPassword }}
-  mariadb-root-password: {{ .Values.mariadb.mariadbRootPassword | b64enc | quote }}
+  {{- if .Values.mariadb.rootPassword }}
+  rootPassword: {{ .Values.mariadb.rootPassword | b64enc | quote }}
   {{- else }}
-  mariadb-root-password: {{ randAlphaNum 10 | b64enc | quote }}
+  rootPassword: {{ randAlphaNum 32 | b64enc | quote }}
   {{- end }}
-  {{- if .Values.mariadb.mariadbPassword }}
-  mariadb-password: {{ .Values.mariadb.mariadbPassword | b64enc | quote }}
+  {{- if .Values.mariadb.userPassword }}
+  password: {{ .Values.mariadb.userPassword | b64enc | quote }}
   {{- else }}
-  mariadb-password: {{ randAlphaNum 10 | b64enc | quote }}
+  password: {{ randAlphaNum 32 | b64enc | quote }}
   {{- end }}
-{{- end}}
+  user: {{ .Values.mariadb.user | b64enc | quote }}
+  database: {{ .Values.mariadb.database | b64enc | quote }}
+  {{- if .Values.console.sessionStoreSecret }}
+  sessionStoreSecret: {{ .Values.console.sessionStoreSecret | b64enc | quote }}
+  {{- else }}
+  sessionStoreSecret: {{ randAlphaNum 64 | b64enc | quote }}
+  {{- end }}
+  localAdminPasword: {{ default "" .Values.console.localAdminPassword | b64enc | quote }}
+
 {{- if and .Values.kube.registry.username .Values.kube.registry.password }}
 ---
 apiVersion: v1
@@ -54,22 +61,9 @@ metadata:
 data:
   .dockercfg: {{ template "imagePullSecret" . }}
 {{- end}}
-{{- if .Values.console.migrateVolumes }}
----
-apiVersion: v1
-kind: Secret
-type: Opaque
-metadata:
-  name: "{{ .Release.Name }}-key-secret"
-  labels:
-    app.kubernetes.io/name: "stratos"
-    app.kubernetes.io/instance: "{{ .Release.Name }}"
-    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "console-key-secret"
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-data:
-  key: {{ randAlphaNum 64 | b64enc }}
+{{- if not .Release.IsUpgrade }}
 ---
+# TODO - Only do this if not an upgrade AND the user did not specify a secret to use for the certs
 apiVersion: v1
 kind: Secret
 type: kubernetes.io/tls
@@ -83,4 +77,4 @@ metadata:
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 data:
 {{ ( include "console.generateCertificate" . ) | indent 2 }}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
diff --git a/deploy/kubernetes/console/templates/pre-install.yaml b/deploy/kubernetes/console/templates/volumes.yaml
similarity index 67%
rename from deploy/kubernetes/console/templates/pre-install.yaml
rename to deploy/kubernetes/console/templates/volumes.yaml
index b17c8ee0a6..05077f0019 100644
--- a/deploy/kubernetes/console/templates/pre-install.yaml
+++ b/deploy/kubernetes/console/templates/volumes.yaml
@@ -24,7 +24,7 @@ spec:
     requests:
       storage: 20Mi
 ---
-{{- if and .Values.mariadb.persistence.enabled (not .Values.mariadb.persistence.existingClaim) }}
+{{- if and not .Values.mariadb.external and (.Values.mariadb.persistence.enabled (not .Values.mariadb.persistence.existingClaim)) }}
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
@@ -52,28 +52,3 @@ spec:
     requests:
       storage: {{ .Values.mariadb.persistence.size | quote }}
 {{- end }}
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: "{{ .Release.Name }}-upgrade-volume"
-  labels:
-    app.kubernetes.io/name: "stratos"
-    app.kubernetes.io/instance: "{{ .Release.Name }}"
-    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "console-upgrade-volume"
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-  annotations:
-  {{- if .Values.storageClass }}
-    volume.beta.kubernetes.io/storage-class: {{ .Values.storageClass | quote }}
-  {{- else if .Values.kube.storage_class.persistent }}
-    volume.beta.kubernetes.io/storage-class: {{ .Values.kube.storage_class.persistent | quote }}
-  {{- else }}
-    volume.alpha.kubernetes.io/storage-class: default
-  {{- end }}
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 20Mi
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index 67b8c91c02..ad956e9897 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -1,9 +1,7 @@
 # Tag for images - do not edit
 consoleVersion: latest
 dockerRegistrySecret: regsecret
-# Specify default DB password
-dbPassword: changeme
-dbProvider: mysql
+
 # Provide Proxy settings if required
 #httpProxy: proxy.corp.net
 #httpsProxy: proxy.corp.net
@@ -11,8 +9,7 @@ dbProvider: mysql
 #ftpProxy: proxy.corp.net
 #socksProxy: sock-proxy.corp.net
 imagePullPolicy: IfNotPresent
-# useLb is deprecated - use console.service.type
-useLb: false
+
 console:
   cookieDomain:
   # externalIP deprecated - use console.service.externalIPs
@@ -52,34 +49,29 @@ console:
   # Use local admin user instead of UAA - set to a password to enable
   localAdminPassword: ~
 
+  # Secret containing certificate for the Console
+  tlsSecretName:
+
 images:
   console: stratos-console
   proxy: stratos-jetstream
   postflight: stratos-postflight-job
   mariadb: stratos-mariadb
+  configInit: stratos-config-init
 
 # Specify which storage class should be used for PVCs
 #storageClass: default
-#consoleCert: |
-#    -----BEGIN CERTIFICATE-----
-#   MIIDXTCCAkWgAwIBAgIJAJooOiQWl1v1MA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
-#   ...
-#    -----END CERTIFICATE-----
-#consoleCertKey: |
-#    -----BEGIN PRIVATE KEY-----
-#    MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkdgEAAoIBAQDV9+ySh0xZzM41
-#    ...
-#    -----END PRIVATE KEYE-----
-# MariaDB chart configuration
+
+# Database configuration
 mariadb:
-  # Only required for creating the databases
-  mariadbRootPassword: changeme
-  adminUser: root
-  # Credentials for user
-  mariadbUser: console
-  mariadbPassword: changeme
-  mariadbDatabase: console
-  usePassword: true
+  external: false
+  database: console
+  user: console
+  # Leave password blank to auto-generate
+  userPassword:
+  # Leave password blank to auto-generate (not needed for external database)
+  rootPassword:
+
   resources:
     requests:
       memory: 256Mi
@@ -97,12 +89,13 @@ uaa:
   consoleClientSecret: 
   consoleAdminIdentifier: 
   skipSSLValidation: false
+
 # SCF values compatability 
 env:
   DOMAIN:
   UAA_HOST: 
   UAA_PORT: 2793
-  # UAA Zone (namespace cf ias deployed to when deployed to Kubernetes)
+  # UAA Zone (namespace cf is deployed to when deployed to Kubernetes)
   UAA_ZONE: scf
 
   # SMTP Settings for Email Sending (User Invites)
@@ -138,5 +131,6 @@ kube:
     email: default
 services:
   loadbalanced: false
-metrics:
-  enabled: false
+
+# useLb is deprecated - use console.service.type
+useLb: false
diff --git a/deploy/kubernetes/ingress/README.md b/deploy/kubernetes/ingress/README.md
deleted file mode 100644
index f0e7b5602f..0000000000
--- a/deploy/kubernetes/ingress/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Configuring Ingress
-
-You can make Stratos available via Ingress by following the instructions below.
-
-Ensure that you have Ingress deployed in your Kubernetes environment.
-
-To do this using Helm follow the instructions here: https://github.com/nginxinc/kubernetes-ingress/tree/master/helm-chart.
-
-If you want to use your own certificate, follow the link above for how to do this along with more advanced configuring options.
-
-Briefly, this involves running:
-
-```
-git clone git@github.com:nginxinc/kubernetes-ingress.git
-cd kubernetes-ingress/helm-chart
-helm install --name ingress .
-```
-
-Wait for the Ingress controller pod to be in the Running state.
-
-Now, edit the `ingress.xml` in this folder to suit your needs - most likely you will want to change:
-
-- metadata.namespace to the namespace that you using when deploying Stratos
-
-- spec.rules.host and spec.tls.hosts to change the host from stratos.127.0.0.1.xip.io to suit your deployment
-
-Finally, deploy the Ingress configuraation with:
-
-```
-kubectl apply -f ./ingress.yml
-```
-
-You should now be able to access Stratos via the URL:
-
-```
-https://stratos.127.0.0.1.xip.io
-```
-
-Note if you changed the host in the ingress.yml file, this URL will of course need to be adjusted.
\ No newline at end of file
diff --git a/deploy/kubernetes/ingress/ingress.yml b/deploy/kubernetes/ingress/ingress.yml
deleted file mode 100644
index 801f103e3b..0000000000
--- a/deploy/kubernetes/ingress/ingress.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: stratos
-  namespace: stratos
-  annotations:
-    nginx.org/ssl-services: "stratos-ui-ext"
-    nginx.org/websocket-services: "stratos-ui-ext"
-spec:
-  rules:
-  - host: stratos.127.0.0.1.xip.io
-    http:
-      paths:
-      - path: /
-        backend:
-          serviceName: stratos-ui-ext
-          servicePort: 443
-  tls:
-  - hosts:
-    - stratos.127.0.0.1.xip.io
-    secretName: stratos-tls
diff --git a/deploy/stratos-ui-release/jobs/backend/spec b/deploy/stratos-ui-release/jobs/backend/spec
index a16cea61bd..7fd5ba396c 100644
--- a/deploy/stratos-ui-release/jobs/backend/spec
+++ b/deploy/stratos-ui-release/jobs/backend/spec
@@ -4,7 +4,6 @@ templates:
     config.properties.erb: config/config.properties
     ssl_cert.erb: config/dev-certs/pproxy.crt
     ssl_cert_key.erb: config/dev-certs/pproxy.key
-    dbconf.yml.erb: /config/dbconf.yml
     backend_ctl.erb: bin/backend_ctl
     pre-start.erb: bin/pre-start
     post-deploy.erb: bin/post-deploy
diff --git a/deploy/stratos-ui-release/jobs/backend/templates/backend_ctl.erb b/deploy/stratos-ui-release/jobs/backend/templates/backend_ctl.erb
index 4a97861cca..61375f2773 100644
--- a/deploy/stratos-ui-release/jobs/backend/templates/backend_ctl.erb
+++ b/deploy/stratos-ui-release/jobs/backend/templates/backend_ctl.erb
@@ -33,10 +33,6 @@ case $1 in
 
     cp -r $CONFIG_DIR/* /var/vcap/packages/backend/
 
-    <% if p('stratos_ui.backend.use_mysql') == true %>
-    cp -f $CONFIG_DIR/dbconf.yml /var/vcap/packages/backend/deploy/db/dbconf.yml
-    <% end %>
-
     cd /var/vcap/packages/backend/
     
     chmod +x portal-proxy
diff --git a/src/jetstream/datastore/datastore.go b/src/jetstream/datastore/datastore.go
index 8e9c38fae5..0fe90584bc 100644
--- a/src/jetstream/datastore/datastore.go
+++ b/src/jetstream/datastore/datastore.go
@@ -134,50 +134,40 @@ func validateRequiredDatabaseParams(username, password, database, host string, p
 	return nil
 }
 
-// GetConnection returns a database connection to either PostgreSQL or SQLite
-func GetConnection(dc DatabaseConfig, env *env.VarSet) (*sql.DB, error) {
+// GetConnection returns a database connection to either MySQL, PostgreSQL or SQLite
+func GetConnection(dc DatabaseConfig, env *env.VarSet) (*sql.DB, *goose.DBConf, error) {
 	log.Debug("GetConnection")
 
-	if dc.DatabaseProvider == PGSQL {
-		return sql.Open("postgres", buildConnectionString(dc))
-	}
-
-	if dc.DatabaseProvider == MYSQL {
-		return sql.Open("mysql", buildConnectionStringForMysql(dc))
-
+	// Get a Goose Configuration so that we can pass that to the schema migrator
+	conf, err := NewGooseDBConf(dc, env)
+	if err != nil {
+		return nil, nil, err
 	}
 
-	// SQL Lite - SQLITE_DB_DIR env var allows directory for console db to be changed
-	return GetSQLLiteConnection(env.MustBool("SQLITE_KEEP_DB"), env.String("SQLITE_DB_DIR", "."))
-}
-
-// GetSQLLiteConnection returns an SQLite DB Connection
-func GetSQLLiteConnection(sqliteKeepDB bool, sqlDbDir string) (*sql.DB, error) {
+	log.Infof("%+v", conf)
 
-	dbFilePath := path.Join(sqlDbDir, SQLiteDatabaseFile)
-	log.Infof("SQLite Database file: %s", dbFilePath)
-
-	return GetSQLLiteConnectionWithPath(dbFilePath, sqliteKeepDB)
+	db, err := sql.Open(conf.Driver.Name, conf.Driver.OpenStr)
+	return db, conf, err
 }
 
 // GetSQLLiteConnectionWithPath returns an SQLite DB Connection
-func GetSQLLiteConnectionWithPath(databaseFile string, sqliteKeepDB bool) (*sql.DB, error) {
+func GetSQLLiteConnectionWithPath(databaseFile string, sqliteKeepDB bool) (*sql.DB, *goose.DBConf, error) {
 	if !sqliteKeepDB {
 		os.Remove(databaseFile)
 	}
 
 	db, err := sql.Open("sqlite3", databaseFile)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	conf := CreateFakeSQLiteGooseDriver()
 	err = ApplyMigrations(conf, db)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
-	return db, nil
+	return db, conf, nil
 }
 
 // CreateFakeSQLiteGooseDriver creates a fake Goose Driver for SQLite
@@ -195,6 +185,65 @@ func CreateFakeSQLiteGooseDriver() *goose.DBConf {
 	return conf
 }
 
+func NewGooseDBConf(dc DatabaseConfig, env *env.VarSet) (*goose.DBConf, error) {
+
+	var openStr, name string
+
+	log.Info(dc.DatabaseProvider)
+
+	if dc.DatabaseProvider == PGSQL {
+		name = "postgres"
+		openStr = buildConnectionString(dc)
+	} else if dc.DatabaseProvider == MYSQL {
+		name = "mysql"
+		openStr = buildConnectionStringForMysql(dc)
+	} else {
+		name = "sqlite3"
+		sqlDbDir := env.String("SQLITE_DB_DIR", ".")
+		openStr = path.Join(sqlDbDir, SQLiteDatabaseFile)
+		sqliteKeepDB := env.MustBool("SQLITE_KEEP_DB")
+
+		if !sqliteKeepDB {
+			os.Remove(openStr)
+		}
+	}
+
+	driver := newDBDriver(name, openStr)
+	return &goose.DBConf{
+		MigrationsDir: ".",
+		Env:           fmt.Sprintf("%s_dbenv", name),
+		Driver:        driver,
+		PgSchema:      "",
+	}, nil
+}
+
+// Create a new DBDriver and populate driver specific
+// fields for drivers that we know about.
+// Further customization may be done in NewDBConf
+func newDBDriver(name, open string) goose.DBDriver {
+
+	d := goose.DBDriver{
+		Name:    name,
+		OpenStr: open,
+	}
+
+	switch name {
+	case "postgres":
+		d.Import = "github.com/lib/pq"
+		d.Dialect = &goose.PostgresDialect{}
+
+	case "mysql":
+		d.Import = "github.com/go-sql-driver/mysql"
+		d.Dialect = &goose.MySqlDialect{}
+
+	case "sqlite3":
+		d.Import = "github.com/mattn/go-sqlite3"
+		d.Dialect = &goose.Sqlite3Dialect{}
+	}
+
+	return d
+}
+
 func buildConnectionString(dc DatabaseConfig) string {
 	log.Debug("buildConnectionString")
 	escapeStr := func(in string) string {
@@ -300,7 +349,7 @@ func WaitForMigrations(db *sql.DB) error {
 			}
 			log.Infof("Database schema check: %s", errorMsg)
 		} else if databaseVersionRec.VersionID == targetVersion.Version {
-			log.Info("Database schema is up to date")
+			log.Infof("Database schema is up to date (%d)", databaseVersionRec.VersionID)
 			break
 		} else {
 			log.Info("Waiting for database schema to be initialized")
diff --git a/src/jetstream/default.config.properties b/src/jetstream/default.config.properties
index acac268bfb..34892b03b1 100644
--- a/src/jetstream/default.config.properties
+++ b/src/jetstream/default.config.properties
@@ -54,3 +54,4 @@ INVITE_USER_CLIENT_SECRET=
 # DB_USER=stratos
 # DB_PASSWORD=strat0s
 # DB_DATABASE_NAME=stratosdb
+# DB_SSL_MODE=disable
diff --git a/src/jetstream/main.go b/src/jetstream/main.go
index 730ccc58e9..fbee483d89 100644
--- a/src/jetstream/main.go
+++ b/src/jetstream/main.go
@@ -22,6 +22,7 @@ import (
 	"syscall"
 	"time"
 
+	"bitbucket.org/liamstask/goose/lib/goose"
 	"github.com/antonlindstrom/pgstore"
 	"github.com/cf-stratos/mysqlstore"
 	cfenv "github.com/cloudfoundry-community/go-cfenv"
@@ -123,12 +124,6 @@ func main() {
 	// Create common method for looking up config
 	envLookup := getEnvironmentLookup()
 
-	// Check to see if we are running as the database migrator
-	if migrateDatabase(envLookup) {
-		// End execution
-		return
-	}
-
 	// Load the portal configuration from env vars
 	var portalConfig interfaces.PortalConfig
 	portalConfig, err := loadPortalConfig(portalConfig, envLookup)
@@ -175,6 +170,7 @@ func main() {
 
 	// Store database provider name for diagnostics
 	portalConfig.DatabaseProviderName = dc.DatabaseProvider
+	portalConfig.CanMigrateDatabaseSchema = true
 
 	cnsis.InitRepositoryProvider(dc.DatabaseProvider)
 	tokens.InitRepositoryProvider(dc.DatabaseProvider)
@@ -182,8 +178,8 @@ func main() {
 	localusers.InitRepositoryProvider(dc.DatabaseProvider)
 
 	// Establish a Postgresql connection pool
-	var databaseConnectionPool *sql.DB
-	databaseConnectionPool, err = initConnPool(dc, envLookup)
+	// var databaseConnectionPool *sql.DB
+	databaseConnectionPool, migratorConf, err := initConnPool(dc, envLookup)
 	if err != nil {
 		log.Fatal(err.Error())
 	}
@@ -193,11 +189,6 @@ func main() {
 	}()
 	log.Info("Database connection pool created.")
 
-	// Wait for Database Schema to be initialized (or exit if this times out)
-	if err = datastore.WaitForMigrations(databaseConnectionPool); err != nil {
-		log.Fatal(err)
-	}
-
 	// Before any changes it, log that we detected a non-default session store secret, so we can tell it has been set from the log
 	if portalConfig.SessionStoreSecret != defaultSessionSecret {
 		log.Info("Session Store Secret detected okay")
@@ -215,6 +206,21 @@ func main() {
 		portalConfig.SessionStoreSecret = uuid.NewV4().String()
 	}
 
+	// Config plugins get to determine if we should run migrations on this instance
+	if portalConfig.CanMigrateDatabaseSchema {
+		// Create the database schema otherwise wait for the datbase schema
+		err = datastore.ApplyMigrations(migratorConf, databaseConnectionPool)
+		if err != nil {
+			log.Fatal(err)
+		}
+	} else {
+		log.Warn("Waiting for migrations ...")
+		// Wait for Database Schema to be initialized (or exit if this times out)
+		if err = datastore.WaitForMigrations(databaseConnectionPool); err != nil {
+			log.Fatal(err)
+		}
+	}
+
 	// Initialize session store for Gorilla sessions
 	sessionStore, sessionStoreOptions, err := initSessionStore(databaseConnectionPool, dc.DatabaseProvider, portalConfig, SessionExpiry, envLookup)
 	if err != nil {
@@ -273,6 +279,8 @@ func main() {
 	portalProxy.Plugins = initedPlugins
 	log.Info("Plugins initialized")
 
+	portalProxy.SetCanPerformMigrations(portalConfig.CanMigrateDatabaseSchema)
+
 	var needSetupMiddleware bool
 
 	// At this stage, all plugins have had a chance to modify configurtion based on hosting environment
@@ -399,13 +407,13 @@ func getEncryptionKey(pc interfaces.PortalConfig) ([]byte, error) {
 	return key, nil
 }
 
-func initConnPool(dc datastore.DatabaseConfig, env *env.VarSet) (*sql.DB, error) {
+func initConnPool(dc datastore.DatabaseConfig, env *env.VarSet) (*sql.DB, *goose.DBConf, error) {
 	log.Debug("initConnPool")
 
 	// initialize the database connection pool
-	pool, err := datastore.GetConnection(dc, env)
+	pool, conf, err := datastore.GetConnection(dc, env)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	// Ensure that the database is responsive
@@ -423,7 +431,7 @@ func initConnPool(dc datastore.DatabaseConfig, env *env.VarSet) (*sql.DB, error)
 
 		// If our timeout boundary has been exceeded, bail out
 		if timeout.Sub(time.Now()) < 0 {
-			return nil, fmt.Errorf("timeout boundary of %d minutes has been exceeded. Exiting", TimeoutBoundary)
+			return nil, nil, fmt.Errorf("timeout boundary of %d minutes has been exceeded. Exiting", TimeoutBoundary)
 		}
 
 		// Circle back and try again
@@ -431,7 +439,7 @@ func initConnPool(dc datastore.DatabaseConfig, env *env.VarSet) (*sql.DB, error)
 		time.Sleep(time.Second)
 	}
 
-	return pool, nil
+	return pool, conf, nil
 }
 
 func initSessionStore(db *sql.DB, databaseProvider string, pc interfaces.PortalConfig, sessionExpiry int, env *env.VarSet) (HttpSessionStore, *sessions.Options, error) {
diff --git a/src/jetstream/migrator.go b/src/jetstream/migrator.go
deleted file mode 100644
index 94371d9260..0000000000
--- a/src/jetstream/migrator.go
+++ /dev/null
@@ -1,241 +0,0 @@
-package main
-
-import (
-	"database/sql"
-	"errors"
-	"flag"
-	"fmt"
-	"os"
-	"path/filepath"
-	"time"
-
-	"bitbucket.org/liamstask/goose/lib/goose"
-	"github.com/govau/cf-common/env"
-	log "github.com/sirupsen/logrus"
-
-	"github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore"
-)
-
-const (
-	TYPE_POSTGRES     = "postgresql"
-	TYPE_MYSQL        = "mysql"
-	DATABASE_PROVIDER = "DATABASE_PROVIDER"
-	DB_TYPE           = "DB_TYPE"
-	DB_HOST           = "DB_HOST"
-	DB_PORT           = "DB_PORT"
-	DB_USER           = "DB_USER"
-	DB_PASSWORD       = "DB_PASSWORD"
-	DB_DATABASE_NAME  = "DB_DATABASE_NAME"
-)
-
-// global options. available to any subcommands.
-var flagPath = flag.String("path", "db", "folder containing db info")
-var flagEnv = flag.String("env", "development", "which DB environment to use")
-var flagPgSchema = flag.String("pgschema", "", "which postgres-schema to migrate (default = none)")
-var flagCloudFoundry = flag.Bool("cf", false, "detect and parse Cloud Foundry database configuration from VCAP_SERVICES")
-
-// helper to create a DBConf from the given flags
-func dbConfFromFlags() (dbconf *goose.DBConf, err error) {
-	return goose.NewDBConf(*flagPath, *flagEnv, *flagPgSchema)
-}
-
-func migrateDatabase(env *env.VarSet) bool {
-	flag.Usage = usage
-	flag.Parse()
-
-	args := flag.Args()
-	if len(args) < 1 {
-		return false
-	}
-
-	if args[0] == "-h" {
-		flag.Usage()
-		return true
-	}
-
-	if !parseCloudFoundry(env) {
-		return false
-	}
-
-	switch args[0] {
-	case "up":
-		upRun(args[1:])
-	case "status":
-		statusRun()
-	case "dbversion":
-		dbVersionRun()
-	default:
-		log.Fatal("Command not supported")
-	}
-
-	// This function returns true if the migrator was called, false otherwise
-	return true
-}
-
-func parseCloudFoundry(env *env.VarSet) bool {
-
-	if *flagCloudFoundry {
-		dbEnv, err := parseCloudFoundryEnv(env)
-		if err != nil {
-			log.Fatal("Failed to parse Cloud Foundry Environment Variables")
-		}
-		flag.Set("env", dbEnv)
-
-		// If there is no dbEnv, then we are using SQLite, so don't run migrations
-		if len(dbEnv) == 0 {
-			log.Println("No DB Environment detected - skipping migrations")
-			return false
-		}
-	}
-
-	return true
-}
-
-// Perform the migrations
-
-func upRun(args []string) {
-
-	conf, err := dbConfFromFlags()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	db, err := goose.OpenDBFromDBConf(conf)
-	if err != nil {
-		log.Fatal("Failed to open database connection")
-	}
-	defer db.Close()
-
-	err = datastore.ApplyMigrations(conf, db)
-	if err != nil {
-		log.Fatal("Migration failed! ", err)
-	}
-}
-
-func dbVersionRun() {
-	conf, err := dbConfFromFlags()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	current, err := goose.GetDBVersion(conf)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	log.Printf("goose: dbversion %v\n", current)
-}
-
-func statusRun() {
-
-	conf, err := dbConfFromFlags()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// collect all migrations
-	min := int64(0)
-	max := int64((1 << 63) - 1)
-	migrations, e := goose.CollectMigrations(conf.MigrationsDir, min, max)
-	if e != nil {
-		log.Fatal(e)
-	}
-
-	db, e := goose.OpenDBFromDBConf(conf)
-	if e != nil {
-		log.Fatal("couldn't open DB:", e)
-	}
-	defer db.Close()
-
-	// must ensure that the version table exists if we're running on a pristine DB
-	if _, e := goose.EnsureDBVersion(conf, db); e != nil {
-		log.Fatal(e)
-	}
-
-	log.Printf("goose: status for environment '%v'\n", conf.Env)
-	log.Println("    Applied At                  Migration")
-	log.Println("    =======================================")
-	for _, m := range migrations {
-		printMigrationStatus(db, m.Version, filepath.Base(m.Source))
-	}
-}
-
-func printMigrationStatus(db *sql.DB, version int64, script string) {
-	var row goose.MigrationRecord
-	q := fmt.Sprintf("SELECT tstamp, is_applied FROM goose_db_version WHERE version_id=%d ORDER BY tstamp DESC LIMIT 1", version)
-	e := db.QueryRow(q).Scan(&row.TStamp, &row.IsApplied)
-
-	if e != nil && e != sql.ErrNoRows {
-		log.Fatal(e)
-	}
-
-	var appliedAt string
-
-	if row.IsApplied {
-		appliedAt = row.TStamp.Format(time.ANSIC)
-	} else {
-		appliedAt = "Pending"
-	}
-
-	log.Printf("    %-24s -- %v\n", appliedAt, script)
-}
-
-func usage() {
-	fmt.Print(usagePrefix)
-	flag.PrintDefaults()
-}
-
-var usagePrefix = `
-stratos db migration cli
-`
-
-func parseCloudFoundryEnv(env *env.VarSet) (string, error) {
-	var dbEnv string
-
-	log.Info("Attempting to parse VCAP_SERVICES")
-
-	var dbConfig datastore.DatabaseConfig
-
-	parsedDBConfig, err := datastore.ParseCFEnvs(&dbConfig, env)
-	if err != nil {
-		return "", errors.New("Could not parse Cloud Foundry Services environment")
-	}
-
-	if parsedDBConfig {
-		exportDatabaseConfig(dbConfig)
-
-		switch dbType := env.String(DB_TYPE, "unknown"); dbType {
-		case TYPE_POSTGRES:
-			dbEnv = "cf_postgres"
-			log.Infof("Migrating postgresql instance on %s\n", env.String(DB_HOST, ""))
-		case TYPE_MYSQL:
-			dbEnv = "cf_mysql"
-			log.Infof("Migrating mysql instance on %s\n", env.String(DB_HOST, ""))
-		default:
-			// Database service not found or type not recognized
-			return "", nil
-		}
-		return dbEnv, nil
-	}
-
-	return "", nil
-}
-
-func exportDatabaseConfig(dbConfig datastore.DatabaseConfig) {
-	exportString(DATABASE_PROVIDER, dbConfig.DatabaseProvider)
-	exportString(DB_HOST, dbConfig.Host)
-	exportString(DB_PORT, dbConfig.Port)
-	exportString(DB_USER, dbConfig.Username)
-	exportString(DB_PASSWORD, dbConfig.Password)
-	exportString(DB_DATABASE_NAME, dbConfig.Database)
-
-	if dbConfig.DatabaseProvider == "pgsql" {
-		exportString(DB_TYPE, TYPE_POSTGRES)
-	} else if dbConfig.DatabaseProvider == "mysql" {
-		exportString(DB_TYPE, TYPE_MYSQL)
-	}
-}
-
-func exportString(name string, value interface{}) {
-	os.Setenv(name, fmt.Sprintf("%v", value))
-}
diff --git a/src/jetstream/plugins/cloudfoundryhosting/main.go b/src/jetstream/plugins/cloudfoundryhosting/main.go
index 34679db1db..6d074bae88 100644
--- a/src/jetstream/plugins/cloudfoundryhosting/main.go
+++ b/src/jetstream/plugins/cloudfoundryhosting/main.go
@@ -74,22 +74,19 @@ func ConfigInit(envLookup *env.VarSet, jetstreamConfig *interfaces.PortalConfig)
 		}
 	}
 
-}
-
-// Init creates a new CFHosting plugin
-func Init(portalProxy interfaces.PortalProxy) (interfaces.StratosPlugin, error) {
-
 	// Update Database migration status depending on app instance index and SQLite
-	if portalProxy.Env().IsSet(VCapApplication) {
-		isSQLite := portalProxy.GetConfig().DatabaseProviderName == SQLiteProviderName
-		if !isSQLite && portalProxy.Env().IsSet("CF_INSTANCE_INDEX") {
-			if appInstanceIndex, ok := portalProxy.Env().Lookup("CF_INSTANCE_INDEX"); ok {
-				if index, err := strconv.Atoi(appInstanceIndex); err == nil {
-					portalProxy.SetCanPerformMigrations(index == 0)
-				}
+	if !isSQLite && envLookup.IsSet("CF_INSTANCE_INDEX") {
+		if appInstanceIndex, ok := envLookup.Lookup("CF_INSTANCE_INDEX"); ok {
+			if index, err := strconv.Atoi(appInstanceIndex); err == nil {
+				jetstreamConfig.CanMigrateDatabaseSchema = (index == 0)
+				log.Infof("Skipping DB migration => not index 0 (%d)", index)
 			}
 		}
 	}
+}
+
+// Init creates a new CFHosting plugin
+func Init(portalProxy interfaces.PortalProxy) (interfaces.StratosPlugin, error) {
 
 	return &CFHosting{portalProxy: portalProxy}, nil
 }
diff --git a/src/jetstream/repository/crypto/aes.go b/src/jetstream/repository/crypto/aes.go
index 0267ed5282..16a35269f8 100644
--- a/src/jetstream/repository/crypto/aes.go
+++ b/src/jetstream/repository/crypto/aes.go
@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"strings"
 
 	log "github.com/sirupsen/logrus"
 )
@@ -84,7 +85,8 @@ func ReadEncryptionKey(v, f string) ([]byte, error) {
 		return nil, err
 	}
 
-	key32bytes, err := hex.DecodeString(string(key64chars))
+	ekStr := strings.TrimSpace(string(key64chars))
+	key32bytes, err := hex.DecodeString(ekStr)
 	if err != nil {
 		fmt.Println(err)
 	}
diff --git a/src/jetstream/repository/interfaces/structs.go b/src/jetstream/repository/interfaces/structs.go
index 70082958ba..34c3ddf44b 100644
--- a/src/jetstream/repository/interfaces/structs.go
+++ b/src/jetstream/repository/interfaces/structs.go
@@ -350,4 +350,5 @@ type PortalConfig struct {
 	PluginConfig                    map[string]string
 	DatabaseProviderName            string
 	EnableTechPreview               bool `configName:"ENABLE_TECH_PREVIEW"`
+	CanMigrateDatabaseSchema        bool
 }

From 804d5490e18b0143b22c85da4939f99ed3db4b8a Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 30 Oct 2019 15:36:06 +0000
Subject: [PATCH 144/648] Backend test fix

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

diff --git a/src/jetstream/setup_console_test.go b/src/jetstream/setup_console_test.go
index a37ad96803..b0def646ef 100644
--- a/src/jetstream/setup_console_test.go
+++ b/src/jetstream/setup_console_test.go
@@ -14,7 +14,7 @@ func TestConsoleSetup(t *testing.T) {
 
 	Convey("Check that we can migrate data from the old console_config table", t, func() {
 
-		db, err := datastore.GetSQLLiteConnectionWithPath("file::memory:?cache=shared", true)
+		db, _, err := datastore.GetSQLLiteConnectionWithPath("file::memory:?cache=shared", true)
 		if err != nil {
 			t.Errorf("can not open sqlite database for testing: %v", err)
 		}
@@ -60,7 +60,7 @@ func TestConsoleSetup(t *testing.T) {
 			t.Errorf("Could not get new config: %v", err)
 		}
 
-		// New config should be 
+		// New config should be
 
 		So(newConfig.UAAEndpoint.String(), ShouldEqual, "TEST_UAA")
 		So(newConfig.AuthorizationEndpoint.String(), ShouldEqual, "TEST_UAA")

From f7512939f8cc87b9f42dccbf9cbe44dee6173b78 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 31 Oct 2019 13:49:38 +0000
Subject: [PATCH 145/648] Don't need to create custom db like this

---
 deploy/db/mariadb-entrypoint.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/deploy/db/mariadb-entrypoint.sh b/deploy/db/mariadb-entrypoint.sh
index af43923849..45e0471437 100755
--- a/deploy/db/mariadb-entrypoint.sh
+++ b/deploy/db/mariadb-entrypoint.sh
@@ -38,12 +38,6 @@ EOSQL
     fi
   fi
 
-  if [ "$DB_DATABASE_NAME" ]; then
-    echo "CREATE DATABASE IF NOT EXISTS \`$DB_DATABASE_NAME\` ;" >> "$tempSqlFile"
-    echo "CREATE USER $DB_USER IDENTIFIED BY '$DB_PASSWORD' ;" >> "$tempSqlFile"
-    echo "GRANT ALL ON \`$DB_DATABASE_NAME\`.* TO '$DB_USER'@'%' ;" >> "$tempSqlFile"
-  fi
-
   echo 'FLUSH PRIVILEGES ;' >> "$tempSqlFile"
   set -- "$@" --init-file="$tempSqlFile"
 fi

From 28182b73025c86a38b3ba00fd609d1f7a29b42dd Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 31 Oct 2019 14:01:03 +0000
Subject: [PATCH 146/648] Clean ups

---
 src/jetstream/datastore/datastore.go | 37 +++++++++-------------------
 src/jetstream/setup_console_test.go  |  2 +-
 2 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/src/jetstream/datastore/datastore.go b/src/jetstream/datastore/datastore.go
index 0fe90584bc..24130a4f8f 100644
--- a/src/jetstream/datastore/datastore.go
+++ b/src/jetstream/datastore/datastore.go
@@ -144,24 +144,25 @@ func GetConnection(dc DatabaseConfig, env *env.VarSet) (*sql.DB, *goose.DBConf,
 		return nil, nil, err
 	}
 
-	log.Infof("%+v", conf)
-
 	db, err := sql.Open(conf.Driver.Name, conf.Driver.OpenStr)
 	return db, conf, err
 }
 
-// GetSQLLiteConnectionWithPath returns an SQLite DB Connection
-func GetSQLLiteConnectionWithPath(databaseFile string, sqliteKeepDB bool) (*sql.DB, *goose.DBConf, error) {
-	if !sqliteKeepDB {
-		os.Remove(databaseFile)
-	}
+// GetInMemorySQLLiteConnection returns an SQLite DB Connection
+func GetInMemorySQLLiteConnection() (*sql.DB, *goose.DBConf, error) {
 
+	databaseFile := "file::memory:?cache=shared"
+	log.Info("Using In Memory Database file")
 	db, err := sql.Open("sqlite3", databaseFile)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	conf := CreateFakeSQLiteGooseDriver()
+	driver := newDBDriver("sqlite3", databaseFile)
+	conf := &goose.DBConf{
+		Driver: driver,
+	}
+
 	err = ApplyMigrations(conf, db)
 	if err != nil {
 		return nil, nil, err
@@ -170,27 +171,11 @@ func GetSQLLiteConnectionWithPath(databaseFile string, sqliteKeepDB bool) (*sql.
 	return db, conf, nil
 }
 
-// CreateFakeSQLiteGooseDriver creates a fake Goose Driver for SQLite
-func CreateFakeSQLiteGooseDriver() *goose.DBConf {
-	// Create fake goose db conf object for SQLite
-	d := goose.DBDriver{
-		Name:    "sqlite3",
-		Import:  "github.com/mattn/go-sqlite3",
-		Dialect: &goose.Sqlite3Dialect{},
-	}
-
-	conf := &goose.DBConf{
-		Driver: d,
-	}
-	return conf
-}
-
+// NewGooseDBConf creates a new Goose config for database migrations
 func NewGooseDBConf(dc DatabaseConfig, env *env.VarSet) (*goose.DBConf, error) {
 
 	var openStr, name string
 
-	log.Info(dc.DatabaseProvider)
-
 	if dc.DatabaseProvider == PGSQL {
 		name = "postgres"
 		openStr = buildConnectionString(dc)
@@ -202,6 +187,7 @@ func NewGooseDBConf(dc DatabaseConfig, env *env.VarSet) (*goose.DBConf, error) {
 		sqlDbDir := env.String("SQLITE_DB_DIR", ".")
 		openStr = path.Join(sqlDbDir, SQLiteDatabaseFile)
 		sqliteKeepDB := env.MustBool("SQLITE_KEEP_DB")
+		log.Infof("SQLite Database file: %s", openStr)
 
 		if !sqliteKeepDB {
 			os.Remove(openStr)
@@ -219,7 +205,6 @@ func NewGooseDBConf(dc DatabaseConfig, env *env.VarSet) (*goose.DBConf, error) {
 
 // Create a new DBDriver and populate driver specific
 // fields for drivers that we know about.
-// Further customization may be done in NewDBConf
 func newDBDriver(name, open string) goose.DBDriver {
 
 	d := goose.DBDriver{
diff --git a/src/jetstream/setup_console_test.go b/src/jetstream/setup_console_test.go
index b0def646ef..94d138a47a 100644
--- a/src/jetstream/setup_console_test.go
+++ b/src/jetstream/setup_console_test.go
@@ -14,7 +14,7 @@ func TestConsoleSetup(t *testing.T) {
 
 	Convey("Check that we can migrate data from the old console_config table", t, func() {
 
-		db, _, err := datastore.GetSQLLiteConnectionWithPath("file::memory:?cache=shared", true)
+		db, _, err := datastore.GetInMemorySQLLiteConnection()
 		if err != nil {
 			t.Errorf("can not open sqlite database for testing: %v", err)
 		}

From 678bc1f437c20ad229a6751685d176093fba0f96 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 31 Oct 2019 15:12:15 +0000
Subject: [PATCH 147/648] Add toggle, fix some of the theme glitches

---
 .../packages/core/sass/_all-theme.scss        |  6 ++----
 .../packages/core/sass/dark-theme.scss        | 13 +++++++++++-
 src/frontend/packages/core/sass/theme.scss    |  6 ++----
 .../packages/core/src/app.component.html      |  2 +-
 .../packages/core/src/app.component.ts        |  9 ++++++--
 .../dashboard-base.component.scss             |  2 +-
 .../profile-info/profile-info.component.html  | 15 +++++++++++++
 .../profile-info/profile-info.component.ts    |  4 +++-
 .../no-content-message.component.theme.scss   |  2 +-
 .../store/src/actions/dashboard-actions.ts    |  6 ++++++
 .../store/src/reducers/dashboard-reducer.ts   | 21 +++++++++++++------
 11 files changed, 65 insertions(+), 21 deletions(-)

diff --git a/src/frontend/packages/core/sass/_all-theme.scss b/src/frontend/packages/core/sass/_all-theme.scss
index f1664a99df..f04d29af12 100644
--- a/src/frontend/packages/core/sass/_all-theme.scss
+++ b/src/frontend/packages/core/sass/_all-theme.scss
@@ -82,12 +82,10 @@ $side-nav-light-active: #484848;
   $warn: map-get($theme, warn);
   $subdued: mat-contrast($primary, 50);
 
-  @if $is-dark==true {
+  @if $is-dark == true {
     $app-background-color: lighten(mat-color($background-colors, background), 10%);
     $subdued: lighten($subdued, 90);
-  }
-
-  @else {
+  } @else {
     $app-background-color: darken(mat-color($background-colors, background), 2%);
     $subdued: lighten($subdued, 50);
   }
diff --git a/src/frontend/packages/core/sass/dark-theme.scss b/src/frontend/packages/core/sass/dark-theme.scss
index 0216630729..22c5e81f64 100644
--- a/src/frontend/packages/core/sass/dark-theme.scss
+++ b/src/frontend/packages/core/sass/dark-theme.scss
@@ -11,11 +11,22 @@
   //   background-color: yellow;
   //   color: yellow;
   // }
+
+  .dashboard {
+    // background-color: yellow;
+  }
   
   // $dark-primary: mat-palette($mat-yellow);
+  // Base
   $dark-primary: mat-palette($mat-blue);
-
   $dark-accent: mat-palette($mat-amber, A400, A100, A700);
+
+  // darker blue, links too dark
+  // $dark-primary: mat-palette($mat-indigo);
+  // $dark-accent: mat-palette($mat-blue, A400, A100, A700);
+
+
+
   $dark-warn: mat-palette($mat-red);
   // $dark-theme: mat-dark-theme($oss-theme-primary, $oss-theme-accent, $oss-theme-warn);
   $dark-theme: mat-dark-theme($dark-primary, $dark-accent, $dark-warn);
diff --git a/src/frontend/packages/core/sass/theme.scss b/src/frontend/packages/core/sass/theme.scss
index 43606078f7..e7bdedec37 100644
--- a/src/frontend/packages/core/sass/theme.scss
+++ b/src/frontend/packages/core/sass/theme.scss
@@ -5,8 +5,7 @@
 
 // Custom theme support
 @import './custom';
-@import './dark-theme.scss';
-
+@import './dark-theme';
 
 
 .default {
@@ -27,5 +26,4 @@
 
 
 // Create the theme
-@include mat-core();
-
+@include mat-core;
diff --git a/src/frontend/packages/core/src/app.component.html b/src/frontend/packages/core/src/app.component.html
index 3b86dc60a0..fb3c6ff6b1 100644
--- a/src/frontend/packages/core/src/app.component.html
+++ b/src/frontend/packages/core/src/app.component.html
@@ -1,4 +1,4 @@
-<span class="dark-theme">
+<span class="dark-theme" [ngClass]="(themeService.getTheme() | async).styleName">
 
   <router-outlet></router-outlet>
   <div class="user-id" *ngIf="userId$ | async as userId" id="__stratos-userid__">{{userId}}</div>
diff --git a/src/frontend/packages/core/src/app.component.ts b/src/frontend/packages/core/src/app.component.ts
index 62df36b02f..154fb8b2b0 100644
--- a/src/frontend/packages/core/src/app.component.ts
+++ b/src/frontend/packages/core/src/app.component.ts
@@ -4,13 +4,17 @@ import { Observable } from 'rxjs';
 import { create } from 'rxjs-spy';
 
 import { AuthOnlyAppState } from '../../store/src/app-state';
+import { ThemeService } from './core/theme.service';
 import { environment } from './environments/environment';
 import { LoggedInService } from './logged-in.service';
 
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
-  styleUrls: ['./app.component.scss']
+  styleUrls: ['./app.component.scss'],
+  providers: [
+    ThemeService
+  ]
 })
 export class AppComponent implements OnInit, OnDestroy, AfterContentInit {
 
@@ -20,7 +24,8 @@ export class AppComponent implements OnInit, OnDestroy, AfterContentInit {
 
   constructor(
     private loggedInService: LoggedInService,
-    store: Store<AuthOnlyAppState>
+    store: Store<AuthOnlyAppState>,
+    public themeService: ThemeService
   ) {
     // We use the username to key the session storage. We could replace this with the users id?
     this.userId$ = store.select(state => state.auth.sessionData && state.auth.sessionData.user ? state.auth.sessionData.user.name : null);
diff --git a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
index 0884263a2b..2a7eadbf3a 100644
--- a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
+++ b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
@@ -3,7 +3,7 @@
 
 $app-sub-header-height: 48px;
 .dashboard {
-  background-color: transparent;
+  // background-color: transparent;
   display: flex;
   flex-direction: column;
   height: 100%;
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 93feabd5f5..bfa8e45225 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
@@ -92,6 +92,21 @@ <h1>User Profile</h1>
                 polling may result in some pages showing out-of-date information.</div>
             </div>
           </div>
+          <div class="user-profile__option">
+            <div class="user-profile__option-inner">
+              <div class="user-profile__option-header">
+                Theme
+              </div>
+              <mat-form-field>
+                <mat-select [value]="themeService.getTheme() | async"
+                  (selectionChange)="themeService.setTheme($event.value)">
+                  <mat-option *ngFor="let theme of themeService.getThemes()" [value]="theme">
+                    {{ theme.label }}
+                  </mat-option>
+                </mat-select>
+              </mat-form-field>
+            </div>
+          </div>
         </div>
       </mat-card>
       <mat-card *ngIf="profile.origin === 'uaa'">
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 fda5d8da05..9bb9288676 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
@@ -7,10 +7,11 @@ import { SetPollingEnabledAction, SetSessionTimeoutAction } from '../../../../..
 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 { ConfirmationDialogConfig } from '../../../shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service';
 import { UserProfileService } from '../user-profile.service';
-import { UserService } from '../../../core/user.service';
 
 @Component({
   selector: 'app-profile-info',
@@ -60,6 +61,7 @@ export class ProfileInfoComponent implements OnInit {
     private store: Store<DashboardOnlyAppState>,
     private confirmDialog: ConfirmationDialogService,
     public userService: UserService,
+    public themeService: ThemeService
   ) {
     this.isError$ = userProfileService.isError$;
     this.userProfile$ = userProfileService.userProfile$;
diff --git a/src/frontend/packages/core/src/shared/components/no-content-message/no-content-message.component.theme.scss b/src/frontend/packages/core/src/shared/components/no-content-message/no-content-message.component.theme.scss
index 502ecae635..9e52da867e 100644
--- a/src/frontend/packages/core/src/shared/components/no-content-message/no-content-message.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/no-content-message/no-content-message.component.theme.scss
@@ -3,6 +3,6 @@
   $subdued: map-get($app-theme, subdued-color);
 
   .app-no-content-container {
-    color: $subdued;
+    color: $subdued; // TODO: RC $subdued contrast(?)
   }
 }
diff --git a/src/frontend/packages/store/src/actions/dashboard-actions.ts b/src/frontend/packages/store/src/actions/dashboard-actions.ts
index 5eb18cd3fa..c3f3c180cf 100644
--- a/src/frontend/packages/store/src/actions/dashboard-actions.ts
+++ b/src/frontend/packages/store/src/actions/dashboard-actions.ts
@@ -1,5 +1,6 @@
 import { Action } from '@ngrx/store';
 
+import { StratosTheme } from '../../../core/src/core/theme.service';
 import { DashboardState } from '../reducers/dashboard-reducer';
 
 export const OPEN_SIDE_NAV = '[Dashboard] Open side nav';
@@ -17,6 +18,7 @@ export const CLOSE_SIDE_HELP = '[Dashboard] Close side help';
 
 export const TIMEOUT_SESSION = '[Dashboard] Timeout Session';
 export const ENABLE_POLLING = '[Dashboard] Enable Polling';
+export const SET_STRATOS_THEME = '[Dashboard] Set Theme';
 
 export const HYDRATE_DASHBOARD_STATE = '[Dashboard] Hydrate dashboard state';
 
@@ -78,3 +80,7 @@ export class HydrateDashboardStateAction implements Action {
   type = HYDRATE_DASHBOARD_STATE;
 }
 
+export class SetThemeAction implements Action {
+  constructor(public theme: StratosTheme) { }
+  type = SET_STRATOS_THEME;
+}
diff --git a/src/frontend/packages/store/src/reducers/dashboard-reducer.ts b/src/frontend/packages/store/src/reducers/dashboard-reducer.ts
index e3ec5194de..dc0841e78e 100644
--- a/src/frontend/packages/store/src/reducers/dashboard-reducer.ts
+++ b/src/frontend/packages/store/src/reducers/dashboard-reducer.ts
@@ -1,23 +1,24 @@
+import { ThemeService } from '../../../core/src/core/theme.service';
 import {
   CLOSE_SIDE_HELP,
   CLOSE_SIDE_NAV,
   DISABLE_SIDE_NAV_MOBILE_MODE,
   ENABLE_POLLING,
   ENABLE_SIDE_NAV_MOBILE_MODE,
+  HYDRATE_DASHBOARD_STATE,
+  HydrateDashboardStateAction,
   OPEN_SIDE_NAV,
   SET_HEADER_EVENT,
+  SET_STRATOS_THEME,
   SetHeaderEvent,
   SetPollingEnabledAction,
+  SetSessionTimeoutAction,
+  SetThemeAction,
   SHOW_SIDE_HELP,
+  TIMEOUT_SESSION,
   TOGGLE_HEADER_EVENT,
   TOGGLE_SIDE_NAV,
 } from '../actions/dashboard-actions';
-import {
-  HYDRATE_DASHBOARD_STATE,
-  HydrateDashboardStateAction,
-  SetSessionTimeoutAction,
-  TIMEOUT_SESSION,
-} from '../actions/dashboard-actions';
 
 export interface DashboardState {
   timeoutSession: boolean;
@@ -29,6 +30,7 @@ export interface DashboardState {
   headerEventMinimized: boolean;
   sideHelpOpen: boolean;
   sideHelpDocument: string;
+  theme: string;
 }
 
 export const defaultDashboardState: DashboardState = {
@@ -41,6 +43,7 @@ export const defaultDashboardState: DashboardState = {
   headerEventMinimized: false,
   sideHelpOpen: false,
   sideHelpDocument: null,
+  theme: ThemeService.themes[0].key
 };
 
 export function dashboardReducer(state: DashboardState = defaultDashboardState, action): DashboardState {
@@ -93,6 +96,12 @@ export function dashboardReducer(state: DashboardState = defaultDashboardState,
         ...state,
         ...hydrateDashboardStateAction.dashboardState
       };
+    case SET_STRATOS_THEME:
+      const setThemeAction = action as SetThemeAction;
+      return {
+        ...state,
+        theme: setThemeAction.theme.key
+      };
     default:
       return state;
   }

From 3a16e7b4afbda8761a640f62c2641707a077f11d Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 31 Oct 2019 17:37:07 +0000
Subject: [PATCH 148/648] WIP

---
 .../core/sass/components/mat-tabs.theme.scss  |  2 +-
 .../packages/core/src/app.component.html      |  2 +-
 .../packages/core/src/app.component.ts        |  3 -
 .../packages/core/src/core/core.module.ts     |  4 +-
 .../packages/core/src/core/theme.service.ts   | 72 +++++++++++++++++++
 .../page-header.component.theme.scss          |  3 +
 .../packages/core/src/shared/shared.module.ts |  8 +--
 .../store/src/effects/dashboard.effects.ts    | 24 +++++++
 .../store/src/reducers/dashboard-reducer.ts   |  7 +-
 .../packages/store/src/store.module.ts        |  4 +-
 10 files changed, 114 insertions(+), 15 deletions(-)
 create mode 100644 src/frontend/packages/core/src/core/theme.service.ts
 create mode 100644 src/frontend/packages/store/src/effects/dashboard.effects.ts

diff --git a/src/frontend/packages/core/sass/components/mat-tabs.theme.scss b/src/frontend/packages/core/sass/components/mat-tabs.theme.scss
index 29f7023533..90bc38cd86 100644
--- a/src/frontend/packages/core/sass/components/mat-tabs.theme.scss
+++ b/src/frontend/packages/core/sass/components/mat-tabs.theme.scss
@@ -13,7 +13,7 @@
 
   .mat-tab-nav-bar.mat-primary.mat-background-primary {
     .mat-ink-bar {
-      //background-color: $tabs-ink-color;
+      //background-color: $tabs-ink-color; // TODO: RC
     }
 
   }
diff --git a/src/frontend/packages/core/src/app.component.html b/src/frontend/packages/core/src/app.component.html
index fb3c6ff6b1..16017c9762 100644
--- a/src/frontend/packages/core/src/app.component.html
+++ b/src/frontend/packages/core/src/app.component.html
@@ -1,4 +1,4 @@
-<span class="dark-theme" [ngClass]="(themeService.getTheme() | async).styleName">
+<span [ngClass]="(themeService.getTheme() | async).styleName">
 
   <router-outlet></router-outlet>
   <div class="user-id" *ngIf="userId$ | async as userId" id="__stratos-userid__">{{userId}}</div>
diff --git a/src/frontend/packages/core/src/app.component.ts b/src/frontend/packages/core/src/app.component.ts
index 154fb8b2b0..f011cfd52b 100644
--- a/src/frontend/packages/core/src/app.component.ts
+++ b/src/frontend/packages/core/src/app.component.ts
@@ -12,9 +12,6 @@ import { LoggedInService } from './logged-in.service';
   selector: 'app-root',
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.scss'],
-  providers: [
-    ThemeService
-  ]
 })
 export class AppComponent implements OnInit, OnDestroy, AfterContentInit {
 
diff --git a/src/frontend/packages/core/src/core/core.module.ts b/src/frontend/packages/core/src/core/core.module.ts
index 8b43843475..00dcb21516 100644
--- a/src/frontend/packages/core/src/core/core.module.ts
+++ b/src/frontend/packages/core/src/core/core.module.ts
@@ -26,6 +26,7 @@ import { PageHeaderService } from './page-header-service/page-header.service';
 import { PageNotFoundComponentComponent } from './page-not-found-component/page-not-found-component.component';
 import { SafeImgPipe } from './safe-img.pipe';
 import { StatefulIconComponent } from './stateful-icon/stateful-icon.component';
+import { ThemeService } from './theme.service';
 import { TruncatePipe } from './truncate.pipe';
 import { UserService } from './user.service';
 import { UtilsService } from './utils.service';
@@ -72,7 +73,8 @@ import { WindowRef } from './window-ref/window-ref.service';
     EndpointsService,
     UserService,
     EntityServiceFactory,
-    CurrentUserPermissionsService
+    CurrentUserPermissionsService,
+    ThemeService
   ],
   declarations: [
     StatefulIconComponent,
diff --git a/src/frontend/packages/core/src/core/theme.service.ts b/src/frontend/packages/core/src/core/theme.service.ts
new file mode 100644
index 0000000000..450460f7cd
--- /dev/null
+++ b/src/frontend/packages/core/src/core/theme.service.ts
@@ -0,0 +1,72 @@
+import { OverlayContainer } from '@angular/cdk/overlay';
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { SetThemeAction } from '../../../store/src/actions/dashboard-actions';
+import { DashboardOnlyAppState } from '../../../store/src/app-state';
+import { selectDashboardState } from '../../../store/src/selectors/dashboard.selectors';
+
+export interface StratosTheme {
+  key: string;
+  label: string;
+  styleName: string;
+}
+
+const coreThemes: StratosTheme[] = [{
+  key: 'default',
+  label: 'Light',
+  styleName: 'default'
+}, {
+  key: 'dark',
+  label: 'Dark',
+  styleName: 'dark-theme'
+}];
+
+@Injectable()
+export class ThemeService {
+
+  constructor(private store: Store<DashboardOnlyAppState>, private overlayContainer: OverlayContainer) { }
+
+  getThemes(): StratosTheme[] {
+    return coreThemes;
+  }
+
+  getTheme(): Observable<StratosTheme> {
+    return this.store.select(selectDashboardState).pipe(
+      map(dashboardState => this.findTheme(dashboardState.themeKey))
+    );
+  }
+
+  setTheme(theme: StratosTheme) {
+    this.setOverlay(theme);
+    this.store.dispatch(new SetThemeAction(theme));
+  }
+
+  /**
+   * Initialize the service with a value that already exists in the store
+   */
+  initialize(themeKey: string) {
+    this.setOverlay(this.findTheme(themeKey));
+  }
+
+  private findTheme(themeKey: string): StratosTheme {
+    const themes = this.getThemes();
+    return themes.find(theme => theme.key === themeKey) || themes[0];
+  }
+
+  /**
+   * Overlays require the theme specifically set, see https://material.angular.io/guide/theming#multiple-themes
+   * `Multiple themes and overlay-based components`
+   */
+  private setOverlay(newTheme: StratosTheme) {
+    this.getThemes().forEach(theme => {
+      if (newTheme.key === theme.key) {
+        this.overlayContainer.getContainerElement().classList.add(theme.styleName);
+      } else {
+        this.overlayContainer.getContainerElement().classList.remove(theme.styleName);
+      }
+    });
+  }
+}
diff --git a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss
index 736c50de6b..e3f260264e 100644
--- a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss
@@ -18,6 +18,9 @@
     &__menu-separator {
       background-color: mat-color($foreground, divider);
     }
+    &__menu-inner {
+      color: mat-contrast($primary, 500);
+    }
     &__underflow {
       background-color: mat-color($primary);
     }
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index 58dffe7526..a6bd15ef03 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -58,8 +58,12 @@ import { TableCellStatusDirective } from './components/list/list-table/table-cel
 import { TableComponent } from './components/list/list-table/table.component';
 import { listTableComponents } from './components/list/list-table/table.types';
 import { EndpointCardComponent } from './components/list/list-types/endpoint/endpoint-card/endpoint-card.component';
+import { EndpointListHelper } from './components/list/list-types/endpoint/endpoint-list.helpers';
+import { EndpointsListConfigService } from './components/list/list-types/endpoint/endpoints-list-config.service';
 import { ListComponent } from './components/list/list.component';
 import { ListConfig } from './components/list/list.component.types';
+import { ListHostDirective } from './components/list/simple-list/list-host.directive';
+import { SimpleListComponent } from './components/list/simple-list/simple-list.component';
 import { LoadingPageComponent } from './components/loading-page/loading-page.component';
 import { LogViewerComponent } from './components/log-viewer/log-viewer.component';
 import { MarkdownContentObserverDirective } from './components/markdown-preview/markdown-content-observer.directive';
@@ -112,10 +116,6 @@ import { ValuesPipe } from './pipes/values.pipe';
 import { CloudFoundryUserProvidedServicesService } from './services/cloud-foundry-user-provided-services.service';
 import { MetricsRangeSelectorService } from './services/metrics-range-selector.service';
 import { UserPermissionDirective } from './user-permission.directive';
-import { SimpleListComponent } from './components/list/simple-list/simple-list.component';
-import { ListHostDirective } from './components/list/simple-list/list-host.directive';
-import { EndpointListHelper } from './components/list/list-types/endpoint/endpoint-list.helpers';
-import { EndpointsListConfigService } from './components/list/list-types/endpoint/endpoints-list-config.service';
 
 /* tslint:disable:max-line-length */
 
diff --git a/src/frontend/packages/store/src/effects/dashboard.effects.ts b/src/frontend/packages/store/src/effects/dashboard.effects.ts
new file mode 100644
index 0000000000..a5f138677d
--- /dev/null
+++ b/src/frontend/packages/store/src/effects/dashboard.effects.ts
@@ -0,0 +1,24 @@
+import { Injectable } from '@angular/core';
+import { Actions, Effect, ofType } from '@ngrx/effects';
+import { map } from 'rxjs/operators';
+
+import { ThemeService } from '../../../core/src/core/theme.service';
+import { HYDRATE_DASHBOARD_STATE, HydrateDashboardStateAction } from '../actions/dashboard-actions';
+
+
+@Injectable()
+export class DashboardEffect {
+
+  constructor(
+    private actions$: Actions,
+    private themeService: ThemeService
+  ) { }
+
+  @Effect({ dispatch: false }) hydrate$ = this.actions$.pipe(
+    ofType<HydrateDashboardStateAction>(HYDRATE_DASHBOARD_STATE),
+    map(({ dashboardState }) => {
+      // Ensure the previous theme is applied
+      this.themeService.initialize(dashboardState.themeKey);
+    })
+  );
+}
diff --git a/src/frontend/packages/store/src/reducers/dashboard-reducer.ts b/src/frontend/packages/store/src/reducers/dashboard-reducer.ts
index dc0841e78e..4d6705b343 100644
--- a/src/frontend/packages/store/src/reducers/dashboard-reducer.ts
+++ b/src/frontend/packages/store/src/reducers/dashboard-reducer.ts
@@ -1,4 +1,3 @@
-import { ThemeService } from '../../../core/src/core/theme.service';
 import {
   CLOSE_SIDE_HELP,
   CLOSE_SIDE_NAV,
@@ -30,7 +29,7 @@ export interface DashboardState {
   headerEventMinimized: boolean;
   sideHelpOpen: boolean;
   sideHelpDocument: string;
-  theme: string;
+  themeKey: string;
 }
 
 export const defaultDashboardState: DashboardState = {
@@ -43,7 +42,7 @@ export const defaultDashboardState: DashboardState = {
   headerEventMinimized: false,
   sideHelpOpen: false,
   sideHelpDocument: null,
-  theme: ThemeService.themes[0].key
+  themeKey: null
 };
 
 export function dashboardReducer(state: DashboardState = defaultDashboardState, action): DashboardState {
@@ -100,7 +99,7 @@ export function dashboardReducer(state: DashboardState = defaultDashboardState,
       const setThemeAction = action as SetThemeAction;
       return {
         ...state,
-        theme: setThemeAction.theme.key
+        themeKey: setThemeAction.theme.key
       };
     default:
       return state;
diff --git a/src/frontend/packages/store/src/store.module.ts b/src/frontend/packages/store/src/store.module.ts
index fb81148945..2cb41036b4 100644
--- a/src/frontend/packages/store/src/store.module.ts
+++ b/src/frontend/packages/store/src/store.module.ts
@@ -7,6 +7,7 @@ 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';
 import { EndpointsEffect } from './effects/endpoint.effects';
 import { MetricsEffect } from './effects/metrics.effects';
@@ -22,8 +23,8 @@ 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';
-import { AppReducersModule } from './reducers.module';
 import { PipelineHttpClient } from './entity-request-pipeline/pipline-http-client.service';
+import { AppReducersModule } from './reducers.module';
 
 
 @NgModule({
@@ -35,6 +36,7 @@ import { PipelineHttpClient } from './entity-request-pipeline/pipline-http-clien
     HttpModule,
     HttpClientModule,
     EffectsModule.forRoot([
+      DashboardEffect,
       APIEffect,
       EndpointApiError,
       AuthEffect,

From 275fcc8acd0f38948cc9262c419cb25a23ccbfb4 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 1 Nov 2019 09:30:55 +0000
Subject: [PATCH 149/648] WIP

---
 .../shared/components/list/list.component.theme.scss | 12 +++++++++++-
 .../page-header/page-header.component.theme.scss     |  3 +++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/frontend/packages/core/src/shared/components/list/list.component.theme.scss b/src/frontend/packages/core/src/shared/components/list/list.component.theme.scss
index 6c51012b83..fd7ed26cbf 100644
--- a/src/frontend/packages/core/src/shared/components/list/list.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/list/list.component.theme.scss
@@ -4,10 +4,20 @@
   $primary: map-get($theme, primary);
   $foreground-colors: map-get($theme, foreground);
   $background-colors: map-get($theme, background);
+  $is-dark: map-get($theme, is-dark);
+
+  @if $is-dark == true {
+    $header-selected-color: lighten(mat-color($background-colors, background), 20%);
+  } @else {
+    $header-selected-color: darken(mat-color($background-colors, background), 20%);
+  }
+
+
   .list-component {
     &__header {
       &--selected {
-        background-color: mat-color($primary, 50);
+        // background-color: mat-color($app-background-color, 50);
+        background-color: $header-selected-color;
       }
       &__right,
       &__left--multi-filters {
diff --git a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss
index e3f260264e..89d558be42 100644
--- a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss
@@ -21,6 +21,9 @@
     &__menu-inner {
       color: mat-contrast($primary, 500);
     }
+    &__history {
+      color: mat-contrast($primary, 500);
+    }
     &__underflow {
       background-color: mat-color($primary);
     }

From 0908ed2560bd56619ec9c993b0531cd9e1c75533 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 1 Nov 2019 15:48:20 +0000
Subject: [PATCH 150/648] Fixes

---
 .../packages/core/sass/_all-theme.scss         |  2 ++
 .../profile-info/profile-info.component.html   |  9 +++++++--
 .../code-block/code-block.component.theme.scss | 18 ++++++++++++------
 .../meta-card-item.component.scss              |  1 -
 .../meta-card-item.component.theme.scss        | 12 ++++++++++++
 .../components/list/list.component.theme.scss  |  5 ++---
 .../page-header.component.theme.scss           |  3 ++-
 7 files changed, 37 insertions(+), 13 deletions(-)
 create mode 100644 src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.theme.scss

diff --git a/src/frontend/packages/core/sass/_all-theme.scss b/src/frontend/packages/core/sass/_all-theme.scss
index f04d29af12..878cd20149 100644
--- a/src/frontend/packages/core/sass/_all-theme.scss
+++ b/src/frontend/packages/core/sass/_all-theme.scss
@@ -33,6 +33,7 @@
 @import '../src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component.theme';
 @import '../src/shared/components/upload-progress-indicator/upload-progress-indicator.component.theme';
 @import '../src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.theme';
+@import '../src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.theme';
 @import '../src/shared/components/start-end-date/start-end-date.component.theme';
 @import '../src/shared/components/metrics-chart/metrics-chart.component.theme';
 @import '../src/shared/components/metrics-range-selector/metrics-range-selector.component.theme';
@@ -148,6 +149,7 @@ $side-nav-light-active: #484848;
   @include page-side-nav-theme($theme, $app-theme);
   @include cf-admin-add-user-warning($theme, $app-theme);
   @include entity-summary-title-theme($theme, $app-theme);
+  @include app-meta-card-item-theme($theme, $app-theme)
 }
 
 @function app-generate-nav-theme($theme, $nav-theme: null) {
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 bfa8e45225..0a4c2df935 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
@@ -97,14 +97,19 @@ <h1>User Profile</h1>
               <div class="user-profile__option-header">
                 Theme
               </div>
-              <mat-form-field>
+              <mat-button-toggle-group [value]="themeService.getTheme() | async"
+                (change)="themeService.setTheme($event.value)" name="theme" aria-label="Theme">
+                <mat-button-toggle *ngFor="let theme of themeService.getThemes()" [value]="theme"> {{ theme.label }}
+                </mat-button-toggle>
+              </mat-button-toggle-group>
+              <!-- <mat-form-field>
                 <mat-select [value]="themeService.getTheme() | async"
                   (selectionChange)="themeService.setTheme($event.value)">
                   <mat-option *ngFor="let theme of themeService.getThemes()" [value]="theme">
                     {{ theme.label }}
                   </mat-option>
                 </mat-select>
-              </mat-form-field>
+              </mat-form-field> -->
             </div>
           </div>
         </div>
diff --git a/src/frontend/packages/core/src/shared/components/code-block/code-block.component.theme.scss b/src/frontend/packages/core/src/shared/components/code-block/code-block.component.theme.scss
index 1010773073..bfac5a8b6e 100644
--- a/src/frontend/packages/core/src/shared/components/code-block/code-block.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/code-block/code-block.component.theme.scss
@@ -1,16 +1,22 @@
 @import '~@angular/material/theming';
 @mixin display-value-theme($theme, $app-theme) {
+  $is-dark: map-get($theme, is-dark);
   $primary: map-get($theme, primary);
   $background-colors: map-get($theme, background);
   $foreground-colors: map-get($theme, foreground);
   .app-code-block {
-    background-color: mat-color($foreground-colors, text);
-    color: darken(mat-color($background-colors, background), 2%);
-    &___copied-icon {
-      color: mat-color($primary);
+    $background-color: mat-color($foreground-colors, text);
+    $color: darken(mat-color($background-colors, background), 2%);
+    @if $is-dark == true {
+      // See the app variable and cf cli pages
+      $background-color: lighten(mat-color($background-colors, background), 5%);
+      $color: mat-color($foreground-colors, text);
     }
-    &__copied-div {
-      background-color: mat-color($foreground-colors, text);
+
+    background-color: $background-color;
+    color: $color;
+    &__copied-icon {
+      color: mat-color($primary);
     }
   }
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.scss b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.scss
index eefbc889df..397814ab33 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.scss
+++ b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.scss
@@ -51,7 +51,6 @@
     line-height: 18px;
     position: relative;
     &::after {
-      background: linear-gradient(to right, rgba(255, 255, 255, 0), rgba(255, 255, 255, 1) 75%);
       bottom: 0;
       content: '';
       height: 1.2em;
diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.theme.scss b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.theme.scss
new file mode 100644
index 0000000000..890951c936
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.theme.scss
@@ -0,0 +1,12 @@
+@mixin app-meta-card-item-theme($theme, $app-theme) {
+  $backgrounds: map-get($theme, background);
+  $background: mat-color($backgrounds, card);
+
+  .meta-card-item-long-text-fixed {
+    .meta-card-item__value {
+      &::after {
+        background: linear-gradient(to right, rgba(255, 255, 255, 0), $background 50%);
+      }
+    }
+  }
+}
diff --git a/src/frontend/packages/core/src/shared/components/list/list.component.theme.scss b/src/frontend/packages/core/src/shared/components/list/list.component.theme.scss
index fd7ed26cbf..c7e86ff821 100644
--- a/src/frontend/packages/core/src/shared/components/list/list.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/list/list.component.theme.scss
@@ -6,17 +6,16 @@
   $background-colors: map-get($theme, background);
   $is-dark: map-get($theme, is-dark);
 
+  $header-selected-color: #fff;
   @if $is-dark == true {
     $header-selected-color: lighten(mat-color($background-colors, background), 20%);
   } @else {
-    $header-selected-color: darken(mat-color($background-colors, background), 20%);
+    $header-selected-color: mat-color($primary, 50);
   }
 
-
   .list-component {
     &__header {
       &--selected {
-        // background-color: mat-color($app-background-color, 50);
         background-color: $header-selected-color;
       }
       &__right,
diff --git a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss
index 89d558be42..65ed55245f 100644
--- a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss
@@ -7,6 +7,7 @@
   $error: map-get($status-colors, danger);
   $warning: map-get($status-colors, warning);
   $info: lighten($primmary-color, 20%);
+  $subdued: map-get($app-theme, subdued-color);
   .page-header {
     &__warning-count {
       background-color: mat-color($primary);
@@ -22,7 +23,7 @@
       color: mat-contrast($primary, 500);
     }
     &__history {
-      color: mat-contrast($primary, 500);
+      color: $subdued;
     }
     &__underflow {
       background-color: mat-color($primary);

From d0f8bc8fd7e8473b9617ba0eea50426eab6c61f5 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 1 Nov 2019 16:15:13 +0000
Subject: [PATCH 151/648] Working version resets db passwords

---
 deploy/Dockerfile.bk                          |   1 -
 deploy/Dockerfile.init                        |   2 +-
 deploy/containers/config-init/config-init.sh  | 316 ++++++++++++++++++
 deploy/containers/nginx/conf/nginx.k8s.conf   |   4 +-
 deploy/containers/nginx/run-nginx.sh          |  18 +-
 deploy/db/mariadb-entrypoint.sh               |  10 +
 deploy/db/scripts/README.md                   |   3 +
 deploy/db/scripts/config-init.sh              | 147 --------
 .../console/templates/config-init.yaml        |  10 +-
 .../console/templates/deployment.yaml         |  13 +-
 .../kubernetes/console/templates/secrets.yaml |  19 +-
 .../kubernetes/console/templates/volumes.yaml |   4 +-
 package-lock.json                             |   2 +-
 package.json                                  |   2 +-
 14 files changed, 369 insertions(+), 182 deletions(-)
 create mode 100755 deploy/containers/config-init/config-init.sh
 create mode 100644 deploy/db/scripts/README.md
 delete mode 100755 deploy/db/scripts/config-init.sh

diff --git a/deploy/Dockerfile.bk b/deploy/Dockerfile.bk
index 93e6e13a1a..a4cc1706b6 100644
--- a/deploy/Dockerfile.bk
+++ b/deploy/Dockerfile.bk
@@ -15,7 +15,6 @@ RUN chmod +x /srv/jetstream
 FROM splatform/stratos-bk-base:opensuse as prod-build
 RUN zypper in -y curl
 COPY deploy/containers/proxy/entrypoint.sh /entrypoint.sh
-COPY /deploy/db/scripts/run-preflight-job.sh /run-preflight-job.sh
 COPY /deploy/tools/generate_cert.sh /generate_cert.sh
 COPY --from=common-build /srv /srv
 RUN mkdir /srv/templates
diff --git a/deploy/Dockerfile.init b/deploy/Dockerfile.init
index f19e3ef5f1..5a653516f0 100644
--- a/deploy/Dockerfile.init
+++ b/deploy/Dockerfile.init
@@ -1,4 +1,4 @@
 FROM splatform/stratos-bk-base:opensuse
 RUN zypper in -y curl openssh jq
-COPY /deploy/db/scripts/config-init.sh /config-init.sh
+COPY /deploy/containers/config-init/config-init.sh /config-init.sh
 COPY /deploy/tools/generate_cert.sh /generate_cert.sh
diff --git a/deploy/containers/config-init/config-init.sh b/deploy/containers/config-init/config-init.sh
new file mode 100755
index 0000000000..f14d8fa382
--- /dev/null
+++ b/deploy/containers/config-init/config-init.sh
@@ -0,0 +1,316 @@
+#!/bin/bash
+
+echo "============================================"
+echo "Stratos Configuration Init Job"
+echo "============================================"
+echo ""
+echo "Generating/Rotating Secrets"
+echo ""
+echo "NAMESPACE                   : ${NAMESPACE}"
+echo "RELEASE_NAME                : ${RELEASE_NAME}"
+echo "RELEASE_REVISION            : ${RELEASE_REVISION}"
+echo "IS_UPGRADE                  : ${IS_UPGRADE}"
+echo "CONSOLE_TLS_SECRET_NAME     : ${CONSOLE_TLS_SECRET_NAME}"
+echo "ENCRYPTION_KEY_VOLUME       : ${ENCRYPTION_KEY_VOLUME}"
+echo "ENCRYPTION_KEY_FILENAME     : ${ENCRYPTION_KEY_FILENAME}"
+echo "CONSOLE_PROXY_CERT_PATH     : ${CONSOLE_PROXY_CERT_PATH}"
+echo "CONSOLE_PROXY_CERT_KEY_PATH : ${CONSOLE_PROXY_CERT_KEY_PATH}"
+echo ""
+
+# Kubernetes token
+KUBE_TOKEN=$(</var/run/secrets/kubernetes.io/serviceaccount/token)
+KUBE_API_SERVER=https://$KUBERNETES_SERVICE_HOST:$KUBERNETES_PORT_443_TCP_PORT
+
+function deleteSecret {
+  PREFIX=$1
+  REVISION=$2
+
+  # Delete the old secret
+  curl -k -s \
+       --fail \
+      -X DELETE \
+      -d @- \
+      -H "Authorization: Bearer $KUBE_TOKEN" \
+      -H 'Accept: application/json' \
+      -H 'Content-Type: application/json' \
+      ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets/${RELEASE_NAME}-${PREFIX}-${REVISION} > /dev/null 2>&1 <<'EOF' 
+  {}
+EOF
+  DELETED=$?
+  if [ $DELETED -ne 0 ]; then
+    echo "Unable to delete secret: ${RELEASE_NAME}-${PREFIX}-${REVISION} - error code: ${DELETED}"
+  fi
+}
+
+function generateCert {
+  if [ -n "${CONSOLE_PROXY_CERT_PATH}" ] && [ -n "${CONSOLE_PROXY_CERT_KEY_PATH}" ]; then
+    if [ -f "${CONSOLE_PROXY_CERT_PATH}" ] && [ -f "${CONSOLE_PROXY_CERT_KEY_PATH}" ]; then
+      echo "Found existing certificate on encryption key volume - going to use it"
+      CERT_CRT=$(cat ${CONSOLE_PROXY_CERT_PATH} | base64 -w 0)
+      CERT_KEY=$(cat ${CONSOLE_PROXY_CERT_KEY_PATH} | base64 -w 0)
+      return
+    fi
+  fi
+
+  # Not going to support this going forward
+  if [ -n "${CONSOLE_CERT}" ] && [ -n "${CONSOLE_CERT_KEY}" ]; then
+    echo "Got a certificate in the vars CONSOLE_CERT and CONSOLE_CERT_KEY - going to use it"
+  fi
+
+  echo "Using cert generator to generate a self-signed certificate ..."
+  export CERTS_PATH=./certs
+  export DEV_CERTS_DOMAIN=tls
+  mkdir -p ${CERTS_PATH}
+  /generate_cert.sh
+  CERT_CRT=$(cat ${CERTS_PATH}/tls.crt | base64 -w 0)
+  CERT_KEY=$(cat ${CERTS_PATH}/tls.key | base64 -w 0)
+  rm -rf ${CERTS_PATH}
+}
+
+###
+# --delete flag is used in the cleanup hook to remove the secret
+###
+if [ "$1" == "--delete" ]; then
+  echo "Cleanup up - delete hook"
+  # Delete the old secret
+  deleteSecret "key" ${RELEASE_REVISION}
+  deleteSecret "cert" ${RELEASE_REVISION}
+  exit 0
+fi
+
+###############################################################################################################################
+# Encryption key
+###############################################################################################################################
+
+KEY=""
+
+# If RELEASE_REVISION is 1 then this is a new install
+# Otherwise it is an upgrade and we need to read the previous secret and
+# migrate it to a new secret and change the values if needed
+
+if [ ${RELEASE_REVISION} -eq 1 ]; then
+  # Check whether the secret already exists
+  echo "Fresh installation - checking encryption key secret does not already exist ..."
+  curl -k -s \
+      --fail \
+      -H "Authorization: Bearer $KUBE_TOKEN" \
+      -H 'Content-Type: application/json' \
+      ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets/${RELEASE_NAME}-key-${RELEASE_REVISION} > ./key.json 2>&1
+
+  EXISTS=$?
+  if [ $EXISTS -eq 0 ]; then
+    KEY=$(cat key.json | jq -r .data.key)
+    echo "Read Encryption Key from previous secret (although was not expecting this secret to be present)"    
+    deleteSecret "key" ${RELEASE_REVISION}
+  else
+    echo "Fresh installation - generating a new Encryption Key"
+    # Generate a random encryption key
+    KEY=$(openssl enc -aes-256-cbc -k secret -P -md sha1 | grep key | cut -d '=' -f2 | base64 -w 0)
+  fi
+  rm -f key.json
+else
+  echo "Upgrade - Looking for previous secret to migrate"
+  PREVIOUS_REVISION=$(($RELEASE_REVISION - 1))
+
+  # Check whether the secret already exists
+  curl -k -s \
+      --fail \
+      -H "Authorization: Bearer $KUBE_TOKEN" \
+      -H 'Content-Type: application/json' \
+      ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets/${RELEASE_NAME}-key-${PREVIOUS_REVISION} > ./key.json 2>&1
+
+  EXISTS=$?
+  if [ $EXISTS -ne 0 ]; then
+    # This could be an upgrade from a version that did NOT have the config-init job
+    # Look for the encryption key volume
+
+    echo "Could not find existing Encryption Key Secret - checking volume"
+    if [ ${ENCRYPTION_KEY_VOLUME} -a ${ENCRYPTION_KEY_FILENAME} ]; then
+      ekFile="${ENCRYPTION_KEY_VOLUME}/${ENCRYPTION_KEY_FILENAME}"
+      if [ -f "${ekFile}" ]; then
+        echo "Found encryption key file on the legacy encryption key volume"
+        KEY=$(cat ${ekFile} | base64 -w 0)
+      else
+        echo "Could not read encryption key file from legacy encryption key volume"
+        exit 1
+      fi
+    else
+      echo "Encryption Key secret does not exist - this should have been created by a previous installation or upgrade"
+      echo "Generating a new one - this may result in existing tokens not being usable"
+      KEY=$(openssl enc -aes-256-cbc -k secret -P -md sha1 | grep key | cut -d '=' -f2 | base64 -w 0)
+    fi
+  else
+    KEY=$(cat key.json | jq -r .data.key)
+    echo "Read Encryption Key from previous secret"
+
+    # Only delete the previous secret if it already exists
+    deleteSecret "key" ${PREVIOUS_REVISION}
+  fi
+
+  rm -f key.json
+fi
+
+# We will create a new secret for the encryption key
+cat << EOF > create-key-secret.yaml
+{
+  "kind": "Secret",
+  "apiVersion": "v1",
+  "type": "Opaque",
+  "metadata": {
+    "name": "@@NAME@@"
+  },
+  "data": {
+    "key": "@@KEY@@"
+  }
+}
+EOF
+
+NAME="${RELEASE_NAME}-key-${RELEASE_REVISION}"
+
+sed -i.bak "s/@@NAME@@/${NAME}/g" create-key-secret.yaml
+sed -i.bak "s/@@KEY@@/${KEY}/g" create-key-secret.yaml
+
+echo "Creating secret for the Encryption Key: ${RELEASE_NAME}-key-${RELEASE_REVISION}"
+
+# Create secret for the Encryption Key
+curl -k -s \
+    --fail \
+    -X POST \
+    -d @create-key-secret.yaml \
+    -H "Authorization: Bearer $KUBE_TOKEN" \
+    -H 'Accept: application/json' \
+    -H 'Content-Type: application/json' \
+    ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets > /dev/null 2>&1
+
+RET_CREATE=$?
+echo "Create Encryption Key secret exit code: $RET_CREATE"
+rm -rf create-key-secret.yaml
+if [ $RET_CREATE -ne 0 ]; then
+  echo "Error creating Encryption Key secret"
+  exit $RET_CREATE
+fi
+
+echo "Encryption key init complete"
+
+###############################################################################################################################
+# TLS Certificate
+###############################################################################################################################
+
+echo "Checking TLS Certificate ..."
+
+# Start with these empty to indicate we won't create a secret for the TLS certificate
+CERT_CRT=""
+CERT_KEY=""
+
+if [ ${RELEASE_REVISION} -eq 1 ]; then
+  echo "Fresh installation - checking whether we need to generate a certificate"
+
+  # If CONSOLE_TLS_SECRET_NAME is set, then we don't need to create a certificate
+  if [ -n "${CONSOLE_TLS_SECRET_NAME}" ]; then
+    echo "Console is using secret ${CONSOLE_TLS_SECRET_NAME} to provide TLS certificate - nothing to do"
+  else
+    # Need a new certificate
+    echo "New certificate needed ..."
+    generateCert
+    echo "${CERT_CRT}"
+    echo "${CERT_KEY}"
+  fi
+else
+  echo "Upgrade - checking whether we need to generate a certificate"
+
+  # If we have a TLS Secret name, then we don't need the generated cert - so delete the previous one, if there was one
+  if [ -n "${CONSOLE_TLS_SECRET_NAME}" ]; then
+    echo "Console is using secret ${CONSOLE_TLS_SECRET_NAME} to provide TLS certificate - removing previous generated certificate (if any)"
+    PREVIOUS_REVISION=$(($RELEASE_REVISION - 1))
+
+    # Note: This will log an error if the certificate was not previously created - we just safely ignore this
+    echo "Trying to delete previous generated secret if there was one ..."
+    deleteSecret "cert" ${PREVIOUS_REVISION}
+  else
+    # Try and get the previous cert secret - if there isn't one, then possibly the user switched from providing us one
+    # to wanting us to generate one
+    curl -k -s \
+        --fail \
+        -H "Authorization: Bearer $KUBE_TOKEN" \
+        -H 'Content-Type: application/json' \
+        ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets/${RELEASE_NAME}-cert-${PREVIOUS_REVISION} > ./cert.json 2>&1
+
+    EXISTS=$?
+    if [ $EXISTS -ne 0 ]; then
+      echo "Could not find previous cert secret - will create a new one"
+      # Need a new certificate
+      generateCert
+      echo "${CERT_CRT}"
+      echo "${CERT_KEY}"
+    else
+      echo "Found previous secret ... going to use it"
+
+      cat cert.json
+      # Just copy the secret over with a new name
+      CERT_CRT=$(cat cert.json | jq -r '.data["tls.crt"]')
+      CERT_KEY=$(cat cert.json | jq -r '.data["tls.key"]')
+
+      echo "Read Certificate from previous secret"
+      echo ${CERT_CRT}
+      echo ${CERT_KEY}
+      rm -rf cert.json
+
+      # Only delete the previous secret if it already exists
+      deleteSecret "cert" ${PREVIOUS_REVISION}
+    fi
+  fi
+fi
+
+# If we have CERT_CRT and CERT_KEY then we need to create a new certificate
+if [ -z "${CERT_CRT}" ] && [ -z "${CERT_KEY}" ]; then
+  echo "CERT_CRT and CERT_KEY are empty - nothing to do"
+else
+  echo "CERT_CRT and CERT_KEY are NOT empty - going to create secret"
+
+  # We will create a new secret for the certificate
+  cat << EOF > create-cert-secret.yaml
+  {
+    "kind": "Secret",
+    "apiVersion": "v1",
+    "type": "kubernetes.io/tls",
+    "metadata": {
+      "name": "@@NAME@@"
+    },
+    "data": {
+      "tls.crt": "@@CRT@@",
+      "tls.key": "@@KEY@@"
+    }
+  }
+EOF
+
+  NAME="${RELEASE_NAME}-cert-${RELEASE_REVISION}"
+
+  sed -i.bak "s/@@NAME@@/${NAME}/g" create-cert-secret.yaml
+  sed -i.bak "s/@@CRT@@/${CERT_CRT}/g" create-cert-secret.yaml
+  sed -i.bak "s/@@KEY@@/${CERT_KEY}/g" create-cert-secret.yaml
+
+  # Create secret for the Certificate
+  echo "Creating secret for the Certificate: ${RELEASE_NAME}-cert-${RELEASE_REVISION}"
+  curl -k -s \
+      --fail \
+      -X POST \
+      -d @create-cert-secret.yaml \
+      -H "Authorization: Bearer $KUBE_TOKEN" \
+      -H 'Accept: application/json' \
+      -H 'Content-Type: application/json' \
+      ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets > /dev/null 2>&1
+
+  RET_CREATE=$?
+  echo ""
+  echo "Create Certificate secret exit code: $RET_CREATE"
+  rm -rf create-cert-secret.yaml
+  if [ $RET_CREATE -ne 0 ]; then
+    echo "Error creating Certificate secret"
+    exit $RET_CREATE
+  fi  
+fi
+
+echo ""
+echo "============================================"
+echo "Stratos init job complete"
+echo "============================================"
diff --git a/deploy/containers/nginx/conf/nginx.k8s.conf b/deploy/containers/nginx/conf/nginx.k8s.conf
index 7deaa27595..2d15a1c960 100644
--- a/deploy/containers/nginx/conf/nginx.k8s.conf
+++ b/deploy/containers/nginx/conf/nginx.k8s.conf
@@ -45,8 +45,8 @@ http {
     server {
         listen                      443 ssl;
 
-        ssl_certificate             /ENCRYPTION_KEY_VOLUME/console.crt;
-        ssl_certificate_key         /ENCRYPTION_KEY_VOLUME/console.key;
+        ssl_certificate             /CONSOLE_CERT_PATH/tls.crt;
+        ssl_certificate_key         /CONSOLE_CERT_PATH/tls.key;
         ssl_protocols               TLSv1 TLSv1.1 TLSv1.2;
         ssl_ciphers                 HIGH:!aNULL:!MD5;
 
diff --git a/deploy/containers/nginx/run-nginx.sh b/deploy/containers/nginx/run-nginx.sh
index 2fc3c9ca4f..295b66688e 100755
--- a/deploy/containers/nginx/run-nginx.sh
+++ b/deploy/containers/nginx/run-nginx.sh
@@ -1,12 +1,20 @@
 #!/bin/bash
-sed -i -e 's@ENCRYPTION_KEY_VOLUME@'"${ENCRYPTION_KEY_VOLUME}"'@g' /etc/nginx/nginx.conf
-echo "Checking if certificate has been written to the encryption volume!"
+
+echo "============================================"
+echo "Stratos UI Container (nginx)"
+echo "============================================"
+echo ""
+
+sed -i -e 's@CONSOLE_CERT_PATH@'"${CONSOLE_CERT_PATH}"'@g' /etc/nginx/nginx.conf
+echo "Checking for certificate at ${CONSOLE_CERT_PATH} ..."
+
 while : 
 do 
-    if [ -f /${ENCRYPTION_KEY_VOLUME}/console.crt ]; then
+    if [ -f /${CONSOLE_CERT_PATH}/tls.crt ]; then
         break;
     fi
     sleep 1; 
 done
-echo "TLS certificate detected continuing, starting nginx."
-nginx -g "daemon off;"
\ No newline at end of file
+
+echo "TLS certificate detected ... starting nginx."
+nginx -g "daemon off;"
diff --git a/deploy/db/mariadb-entrypoint.sh b/deploy/db/mariadb-entrypoint.sh
index 45e0471437..5f717f83ba 100755
--- a/deploy/db/mariadb-entrypoint.sh
+++ b/deploy/db/mariadb-entrypoint.sh
@@ -40,6 +40,16 @@ EOSQL
 
   echo 'FLUSH PRIVILEGES ;' >> "$tempSqlFile"
   set -- "$@" --init-file="$tempSqlFile"
+else
+  echo "Updating passwords - writing to init-file"
+  tempSqlFile='/tmp/mysql-first-time.sql'
+  cat > "$tempSqlFile" <<-EOSQL
+  use mysql;
+  update user SET PASSWORD=PASSWORD("${MYSQL_ROOT_PASSWORD}") WHERE USER='root';
+  update user SET PASSWORD=PASSWORD("${MYSQL_PASSWORD}") WHERE USER='${MYSQL_USER}';
+  FLUSH PRIVILEGES;
+EOSQL
+  set -- "$@" --init-file="$tempSqlFile"
 fi
 
 chown -R mysql:mysql "$MYSQL_DATADIR"
diff --git a/deploy/db/scripts/README.md b/deploy/db/scripts/README.md
new file mode 100644
index 0000000000..7050fecf94
--- /dev/null
+++ b/deploy/db/scripts/README.md
@@ -0,0 +1,3 @@
+# Deprecated
+
+This folder can be removed
\ No newline at end of file
diff --git a/deploy/db/scripts/config-init.sh b/deploy/db/scripts/config-init.sh
deleted file mode 100755
index ca8db7d4a2..0000000000
--- a/deploy/db/scripts/config-init.sh
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/bash
-
-echo "============================================"
-echo "Stratos Configuration Init Job"
-echo "============================================"
-echo ""
-echo "Generating/Rotating Secrets"
-echo ""
-
-env
-
-# Kubernetes token
-KUBE_TOKEN=$(</var/run/secrets/kubernetes.io/serviceaccount/token)
-KUBE_API_SERVER=https://$KUBERNETES_SERVICE_HOST:$KUBERNETES_PORT_443_TCP_PORT
-
-function deleteSecret {
-  PREFIX=$1
-  REVISION=$2
-
-  # Delete the old secret
-  curl -k -s \
-       --fail \
-      -X DELETE \
-      -d @- \
-      -H "Authorization: Bearer $KUBE_TOKEN" \
-      -H 'Accept: application/json' \
-      -H 'Content-Type: application/json' \
-      ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets/${RELEASE_NAME}-${PREFIX}-${REVISION} > /dev/null 2>&1 <<'EOF' 
-  {}
-EOF
-  DELETED=$?
-  if [ $DELETED -ne 0 ]; then
-    echo "Unable to delete secret: ${RELEASE_NAME}-${PREFIX}-${REVISION} - error code: ${DELETED}"
-  fi
-}
-
-###
-# --delete flag is used in the cleanup hook to remove the secret
-###
-if [ "$1" == "--delete" ]; then
-  echo "Cleanup up - delete hook"
-  # Delete the old secret
-  deleteSecret "key" ${RELEASE_REVISION}
-  deleteSecret "cert" ${RELEASE_REVISION}
-  exit 0
-fi
-
-###############################################################################################################################
-# Encryption key
-###############################################################################################################################
-
-KEY=""
-
-# If RELEASE_REVISION is 1 then this is a new install
-# Otherwise it is an upgrade and we need to read the previous secret and
-# migrate it to a new secret and change the values if needed
-
-if [ ${RELEASE_REVISION} -eq 1 ]; then
-  echo "Fresh installation - generating a new Encryption Key"
-
-  # Generate a random encryption key
-  KEY=$(openssl enc -aes-256-cbc -k secret -P -md sha1 | grep key | cut -d '=' -f2 | base64 -w 0)
-else
-  echo "Upgrade - Looking for previous secret to migrate"
-
-  PREVIOUS_REVISION=$(($RELEASE_REVISION - 1))
-
-  # Check whether the secret already exists
-  curl -k -s \
-      --fail \
-      -H "Authorization: Bearer $KUBE_TOKEN" \
-      -H 'Content-Type: application/json' \
-      ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets/${RELEASE_NAME}-key-${PREVIOUS_REVISION} > ./key.json 2>&1
-
-  EXISTS=$?
-  if [ $EXISTS -ne 0 ]; then
-    # This could be an upgrade from a version that did NOT have the config-init job
-    # Look for the encryption key volume
-
-    echo "Could not find existing Encryption Key Secret - checking volume"
-    if [ ${ENCRYPTION_KEY_VOLUME} -a ${ENCRYPTION_KEY_FILENAME} ]; then
-      ekFile="${ENCRYPTION_KEY_VOLUME}/${ENCRYPTION_KEY_FILENAME}"
-      if [ -f "${ekFile}" ]; then
-        echo "Found encryption key file on the legacy encryption key volume"
-        KEY=$(cat ${ekFile} | base64 -w 0)
-      else
-        echo "Could not read encrpytion key file from legacy encryption key volume"
-        exit 1
-      fi
-    else
-      echo "Encryption Key secret does not exist - this should have been created by a previous installation or upgrade"
-      echo "Generating a new one - this may result in existing tokens not being usable"
-      KEY=$(openssl enc -aes-256-cbc -k secret -P -md sha1 | grep key | cut -d '=' -f2 | base64 -w 0)
-    fi
-  else
-    KEY=$(cat key.json | jq -r .data.key)
-    echo "Read Encryption Key from previous secret"
-
-    # Only delete the previous secret if it already exists
-    deleteSecret "key" ${PREVIOUS_REVISION}
-  fi
-
-  rm -f key.json
-fi
-
-# We will create a new secret for the encryption key
-cat << EOF > create-key-secret.yaml
-{
-  "kind": "Secret",
-  "apiVersion": "v1",
-  "type": "Opaque",
-  "metadata": {
-    "name": "@@NAME@@"
-  },
-  "data": {
-    "key": "@@KEY@@"
-  }
-}
-EOF
-
-NAME="${RELEASE_NAME}-key-${RELEASE_REVISION}"
-
-sed -i.bak "s/@@NAME@@/${NAME}/g" create-key-secret.yaml
-sed -i.bak "s/@@KEY@@/${KEY}/g" create-key-secret.yaml
-
-echo "Creating secret for the Encryption Key: ${RELEASE_NAME}-key-${RELEASE_REVISION}"
-
-# Patch secret for the Encryption Key
-curl -k -s \
-    --fail \
-    -X POST \
-    -d @create-key-secret.yaml \
-    -H "Authorization: Bearer $KUBE_TOKEN" \
-    -H 'Accept: application/json' \
-    -H 'Content-Type: application/json' \
-    ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets > /dev/null 2>&1
-
-RET_CREATE=$?
-echo "Create Encryption Key secret exit code: $RET_CREATE"
-rm -rf create-key-secret.yaml
-if [ $RET_CREATE -ne 0 ]; then
-  echo "Error creating Encryption Key secret"
-  exit $RET_CREATE
-fi
-
-echo ""
-echo "Stratos init job complete"
diff --git a/deploy/kubernetes/console/templates/config-init.yaml b/deploy/kubernetes/console/templates/config-init.yaml
index cb0bc0ada6..1659199f12 100644
--- a/deploy/kubernetes/console/templates/config-init.yaml
+++ b/deploy/kubernetes/console/templates/config-init.yaml
@@ -114,10 +114,12 @@ spec:
           value: |
 {{ .Values.consoleCertKey | indent 12 }}
         {{- end }}
+        - name: CONSOLE_TLS_SECRET_NAME
+          value: "{{ default "" .Values.console.tlsSecretName }}"
         - name: CONSOLE_PROXY_CERT_PATH
-          value: "/{{ .Release.Name }}-encryption-key-volume/console.crt" 
+          value: "/{{ .Release.Name }}-encryption-key-volume/console.crt"
         - name: CONSOLE_PROXY_CERT_KEY_PATH
-          value: "/{{ .Release.Name }}-encryption-key-volume/console.key" 
+          value: "/{{ .Release.Name }}-encryption-key-volume/console.key"
         image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{default "stratos-config-init" .Values.images.configInit}}:{{.Values.consoleVersion}}
         command: ["/config-init.sh"]
         imagePullPolicy: {{.Values.imagePullPolicy}}
@@ -187,8 +189,8 @@ spec:
       imagePullSecrets:
       - name: {{.Values.dockerRegistrySecret}}
       {{- end }}
-      restartPolicy: "OnFailure"
+      restartPolicy: "Never"
       {{- if and (eq (printf "%s" .Values.kube.auth) "rbac") (.Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1") }}
       serviceAccountName: "config-init"
       {{- end }}
-      terminationGracePeriodSeconds: 600
+      terminationGracePeriodSeconds: 30
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 7f58f41c15..d5988f80af 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -32,6 +32,13 @@ spec:
         - containerPort: 443
           name: https
           protocol: TCP
+        env:
+        - name: CONSOLE_CERT_PATH
+          value: "/{{ .Release.Name }}-cert-volume"
+        volumeMounts:
+        - mountPath: "/{{ .Release.Name }}-cert-volume"
+          name: "{{ .Release.Name }}-cert-volume"
+          readOnly: true
       - image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.proxy}}:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         name: proxy
@@ -231,7 +238,11 @@ spec:
           secretName: "{{ .Release.Name }}-key-{{ .Release.Revision }}"
       - name: "{{ .Release.Name }}-cert-volume"
         secret:
-          secretName: "{{ .Release.Name }}-cert-secret"
+          {{- if .Values.console.tlsSecretName }}
+          secretName: "{{ .values.console.tlsSecretName }}"
+          {{- else }}
+          secretName: "{{ .Release.Name }}-cert-{{ .Release.Revision }}"
+          {{- end }}
       - name: "{{ .Release.Name }}-db-secret"
         secret:
           secretName: "{{ .Release.Name }}-db-secret"
diff --git a/deploy/kubernetes/console/templates/secrets.yaml b/deploy/kubernetes/console/templates/secrets.yaml
index abf8790c61..a74c11bca0 100644
--- a/deploy/kubernetes/console/templates/secrets.yaml
+++ b/deploy/kubernetes/console/templates/secrets.yaml
@@ -43,7 +43,7 @@ data:
   {{- else }}
   sessionStoreSecret: {{ randAlphaNum 64 | b64enc | quote }}
   {{- end }}
-  localAdminPasword: {{ default "" .Values.console.localAdminPassword | b64enc | quote }}
+  localAdminPassword: {{ default "" .Values.console.localAdminPassword | b64enc | quote }}
 
 {{- if and .Values.kube.registry.username .Values.kube.registry.password }}
 ---
@@ -61,20 +61,3 @@ metadata:
 data:
   .dockercfg: {{ template "imagePullSecret" . }}
 {{- end}}
-{{- if not .Release.IsUpgrade }}
----
-# TODO - Only do this if not an upgrade AND the user did not specify a secret to use for the certs
-apiVersion: v1
-kind: Secret
-type: kubernetes.io/tls
-metadata:
-  name: "{{ .Release.Name }}-cert-secret"
-  labels:
-    app.kubernetes.io/name: "stratos"
-    app.kubernetes.io/instance: "{{ .Release.Name }}"
-    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "console-cert-secret"
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-data:
-{{ ( include "console.generateCertificate" . ) | indent 2 }}
-{{- end -}}
diff --git a/deploy/kubernetes/console/templates/volumes.yaml b/deploy/kubernetes/console/templates/volumes.yaml
index 05077f0019..9e0c9b3500 100644
--- a/deploy/kubernetes/console/templates/volumes.yaml
+++ b/deploy/kubernetes/console/templates/volumes.yaml
@@ -24,7 +24,8 @@ spec:
     requests:
       storage: 20Mi
 ---
-{{- if and not .Values.mariadb.external and (.Values.mariadb.persistence.enabled (not .Values.mariadb.persistence.existingClaim)) }}
+{{- if (not .Values.mariadb.external) }}
+{{- if and .Values.mariadb.persistence.enabled (not .Values.mariadb.persistence.existingClaim) }}
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
@@ -52,3 +53,4 @@ spec:
     requests:
       storage: {{ .Values.mariadb.persistence.size | quote }}
 {{- end }}
+{{- end }}
diff --git a/package-lock.json b/package-lock.json
index dac9c5a318..030ab2feaf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "stratos",
-  "version": "2.5.0",
+  "version": "3.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index cdce3fd811..4bb2ac5eaa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stratos",
-  "version": "2.5.0",
+  "version": "3.0.0",
   "description": "Stratos Console",
   "main": "index.js",
   "scripts": {

From 03fe12d193dd8af42ff17e78a00d86fba1d2640a Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 1 Nov 2019 16:24:45 +0000
Subject: [PATCH 152/648] More fixes

---
 package.json                                                | 1 +
 .../app-autoscaler-metric-chart-card.component.scss         | 1 -
 src/frontend/packages/core/sass/_all-theme.scss             | 2 ++
 .../core/sass/components/ngx-charts-gauge.theme.scss        | 6 ++++++
 4 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 src/frontend/packages/core/sass/components/ngx-charts-gauge.theme.scss

diff --git a/package.json b/package.json
index cdce3fd811..cd6fa00eeb 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
     "ng": "ng",
     "start": "npm run customize && ng serve",
     "start-high-mem": "npm run customize && node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng serve",
+    "start-dev-high-mem": "npm run customize && node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng serve --aot=false",
     "start-prod-high-mem": "npm run customize && node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng serve --prod",
     "start-dev": "ng serve --aot=false",
     "test": "run-s test-frontend:* --continue-on-error",
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.scss 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.scss
index 002bddcdbd..de27bc5c5e 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.scss
+++ 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.scss
@@ -1,6 +1,5 @@
 mat-card-header {
   .autoscaler-metric-subtitle {
-    color: rgba(0, 0, 0, .54);
     font-size: .9em;
     margin-top: .3em;
   }
diff --git a/src/frontend/packages/core/sass/_all-theme.scss b/src/frontend/packages/core/sass/_all-theme.scss
index 878cd20149..9e0e214311 100644
--- a/src/frontend/packages/core/sass/_all-theme.scss
+++ b/src/frontend/packages/core/sass/_all-theme.scss
@@ -44,6 +44,7 @@
 @import '../src/core/stateful-icon/stateful-icon.component.theme';
 @import '../src/shared/components/markdown-preview/markdown-preview.component.theme';
 @import './components/mat-tabs.theme';
+@import './components/ngx-charts-gauge.theme';
 @import './components/text-status.theme';
 @import './components/hyperlinks.theme';
 @import './mat-themes';
@@ -107,6 +108,7 @@ $side-nav-light-active: #484848;
   @include app-base-page-theme($theme, $app-theme);
   @include app-page-subheader-theme($theme, $app-theme);
   @include app-mat-tabs-theme($theme, $app-theme);
+  @include ngx-charts-gauge($theme, $app-theme);
   @include app-text-status-theme($theme, $app-theme);
   @include app-card-status-theme($theme, $app-theme);
   @include app-usage-gauge-theme($theme, $app-theme);
diff --git a/src/frontend/packages/core/sass/components/ngx-charts-gauge.theme.scss b/src/frontend/packages/core/sass/components/ngx-charts-gauge.theme.scss
new file mode 100644
index 0000000000..406a49f950
--- /dev/null
+++ b/src/frontend/packages/core/sass/components/ngx-charts-gauge.theme.scss
@@ -0,0 +1,6 @@
+@mixin ngx-charts-gauge($theme, $app-theme) {
+  $foreground-colors: map-get($theme, foreground);
+  ngx-charts-chart text {
+    fill: mat-color($foreground-colors, text);
+  }
+}

From 026e06c4637396bb280995d4cab3f20e3eea37f9 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 4 Nov 2019 09:08:59 +0000
Subject: [PATCH 153/648] Update CI pipelines for postflight and init job
 changes

---
 deploy/ci/build-images.yml         | 57 ------------------------------
 deploy/ci/console-dev-releases.yml |  8 ++---
 2 files changed, 4 insertions(+), 61 deletions(-)

diff --git a/deploy/ci/build-images.yml b/deploy/ci/build-images.yml
index d865fd61e5..287af0aed5 100644
--- a/deploy/ci/build-images.yml
+++ b/deploy/ci/build-images.yml
@@ -28,30 +28,6 @@ resources:
     stop: 2:00 AM
     location: UTC
     # Docker Images
-- name: jetstream-dc-image
-  type: docker-image
-  source:
-    username: ((docker-username))
-    password: ((docker-password))
-    repository: ((docker-organization))/stratos-dc-jetstream
-- name: dc-db-migrator-image
-  type: docker-image
-  source:
-    username: ((docker-username))
-    password: ((docker-password))
-    repository: ((docker-organization))/stratos-dc-db-migrator
-- name: mariadb-dc-image
-  type: docker-image
-  source:
-    username: ((docker-username))
-    password: ((docker-password))
-    repository: ((docker-organization))/stratos-dc-mariadb
-- name: ui-dc-image
-  type: docker-image
-  source:
-    username: ((docker-username))
-    password: ((docker-password))
-    repository: ((docker-organization))/stratos-dc-console
 - name: jetstream-helm-image
   type: docker-image
   source:
@@ -81,7 +57,6 @@ groups:
 - name: tests
   jobs:
   - build-helm-images
-  - build-dc-images
   - build-aio-image
 
 jobs:
@@ -117,38 +92,6 @@ jobs:
           tag_as_latest: true
       timeout: 2h30m
 
-- name: build-dc-images
-  plan:
-  - get: stratos
-  - get: after-midnight
-    trigger: true
-  - aggregate:
-    - do:
-      - put: jetstream-dc-image
-        params:
-          dockerfile: stratos/deploy/Dockerfile.bk
-          build: stratos/
-          target_name:  dev-build
-          tag_as_latest: true
-      - put: dc-db-migrator-image
-        params:
-          dockerfile: stratos/deploy/Dockerfile.bk
-          build: stratos/
-          target_name:  db-migrator
-          tag_as_latest: true
-      - put: mariadb-dc-image
-        params:
-          dockerfile: stratos/deploy/db/Dockerfile.mariadb
-          build: stratos/deploy/db
-          tag_as_latest: true
-      - put: ui-dc-image
-        params:
-          dockerfile: stratos/deploy/Dockerfile.ui
-          build: stratos/
-          target_name: prod-build
-          tag_as_latest: true
-      timeout: 2h30m
-
 - name: build-aio-image
   public: true
   serial: true
diff --git a/deploy/ci/console-dev-releases.yml b/deploy/ci/console-dev-releases.yml
index ef7e39e757..707ffd6e0b 100644
--- a/deploy/ci/console-dev-releases.yml
+++ b/deploy/ci/console-dev-releases.yml
@@ -29,12 +29,12 @@ resources:
     username: ((docker-username))
     password: ((docker-password))
     repository: ((docker-repository))/stratos-jetstream
-- name: postflight-image
+- name: config-init-image
   type: docker-image
   source:
     username: ((docker-username))
     password: ((docker-password))
-    repository: ((docker-repository))/stratos-postflight-job
+    repository: ((docker-repository))/stratos-config-init
 - name: mariadb-image
   type: docker-image
   source:
@@ -122,9 +122,9 @@ jobs:
           build_args_file: image-tag/build-args
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))
-      - put: postflight-image
+      - put: config-init-image
         params:
-          dockerfile: stratos/deploy/Dockerfile.bk
+          dockerfile: stratos/deploy/Dockerfile.init
           build: stratos/
           target_name:  postflight-job
           tag: image-tag/v2-alpha-tag

From 6e2e5e077461999932d0a235ad0402f1327c1852 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 4 Nov 2019 09:38:04 +0000
Subject: [PATCH 154/648] Fix helm unit tests

---
 .../console/tests/deployment_test.yaml        |  6 +--
 .../console/tests/user_invite_test.yaml       | 32 ++++++------
 .../kubernetes/console/tests/user_test.yaml   | 49 ++++++++++++++-----
 3 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/deploy/kubernetes/console/tests/deployment_test.yaml b/deploy/kubernetes/console/tests/deployment_test.yaml
index 7f64dba2cf..a817f56477 100644
--- a/deploy/kubernetes/console/tests/deployment_test.yaml
+++ b/deploy/kubernetes/console/tests/deployment_test.yaml
@@ -8,7 +8,7 @@ tests:
       env.DOMAIN: test.com
     asserts:
       - contains:
-          path: spec.template.spec.containers[2].env
+          path: spec.template.spec.containers[1].env
           content:
             name: AUTO_REG_CF_URL
             value: https://api.test.com
@@ -17,12 +17,12 @@ tests:
       env.UAA_HOST: scf.test.com
     asserts:
       - contains:
-          path: spec.template.spec.containers[2].env
+          path: spec.template.spec.containers[1].env
           content:
             name: UAA_ENDPOINT
             value: https://scf.scf.test.com:2793
       - notContains:
-          path: spec.template.spec.containers[2].env
+          path: spec.template.spec.containers[1].env
           content:
             name: AUTO_REG_CF_URL
             value: https://api.test.com
diff --git a/deploy/kubernetes/console/tests/user_invite_test.yaml b/deploy/kubernetes/console/tests/user_invite_test.yaml
index d510c141b5..6df0d7eb1f 100644
--- a/deploy/kubernetes/console/tests/user_invite_test.yaml
+++ b/deploy/kubernetes/console/tests/user_invite_test.yaml
@@ -6,15 +6,15 @@ tests:
   - it: should have default SMTP configuration
     asserts:
       - equal:
-          path: spec.template.spec.containers[2].name
+          path: spec.template.spec.containers[1].name
           value: proxy
       - contains:
-          path: spec.template.spec.containers[2].env
+          path: spec.template.spec.containers[1].env
           content:
             name: SMTP_AUTH
             value: "false"
       - contains:
-          path: spec.template.spec.containers[2].env
+          path: spec.template.spec.containers[1].env
           content:
             name: SMTP_HOST
             value: ""
@@ -25,15 +25,15 @@ tests:
       env.SMTP_FROM_ADDRESS: "test@email.com"
     asserts:
       - equal:
-          path: spec.template.spec.containers[2].name
+          path: spec.template.spec.containers[1].name
           value: proxy
       - contains:
-          path: spec.template.spec.containers[2].env
+          path: spec.template.spec.containers[1].env
           content:
             name: SMTP_AUTH
             value: "true"
       - contains:
-          path: spec.template.spec.containers[2].env
+          path: spec.template.spec.containers[1].env
           content:
             name: SMTP_FROM_ADDRESS
             value: "test@email.com"
@@ -43,15 +43,15 @@ tests:
       env.SMTP_PORT: "4567"
     asserts:
       - equal:
-          path: spec.template.spec.containers[2].name
+          path: spec.template.spec.containers[1].name
           value: proxy
       - contains:
-          path: spec.template.spec.containers[2].env
+          path: spec.template.spec.containers[1].env
           content:
             name: SMTP_HOST
             value: "test_host"
       - contains:
-          path: spec.template.spec.containers[2].env
+          path: spec.template.spec.containers[1].env
           content:
             name: SMTP_PORT
             value: "4567"
@@ -61,15 +61,15 @@ tests:
       env.SMTP_PASSWORD: "test_password"
     asserts:
       - equal:
-          path: spec.template.spec.containers[2].name
+          path: spec.template.spec.containers[1].name
           value: proxy
       - contains:
-          path: spec.template.spec.containers[2].env
+          path: spec.template.spec.containers[1].env
           content:
             name: SMTP_USER
             value: "test_user"
       - contains:
-          path: spec.template.spec.containers[2].env
+          path: spec.template.spec.containers[1].env
           content:
             name: SMTP_PASSWORD
             value: "test_password"
@@ -78,10 +78,10 @@ tests:
       console.userInviteSubject: "test subject"
     asserts:
       - equal:
-          path: spec.template.spec.containers[2].name
+          path: spec.template.spec.containers[1].name
           value: proxy
       - contains:
-          path: spec.template.spec.containers[2].env
+          path: spec.template.spec.containers[1].env
           content:
             name: INVITE_USER_SUBJECT
             value: "test subject"
@@ -90,10 +90,10 @@ tests:
       console.templatesConfigMapName: "templateCMName"
     asserts:
       - equal:
-          path: spec.template.spec.containers[2].name
+          path: spec.template.spec.containers[1].name
           value: proxy
       - contains:
-          path: spec.template.spec.containers[2].volumeMounts
+          path: spec.template.spec.containers[1].volumeMounts
           content:
             mountPath: /etc/templates/
             name: "RELEASE-NAME-templates"
diff --git a/deploy/kubernetes/console/tests/user_test.yaml b/deploy/kubernetes/console/tests/user_test.yaml
index 07fd4e0293..ec7b472936 100644
--- a/deploy/kubernetes/console/tests/user_test.yaml
+++ b/deploy/kubernetes/console/tests/user_test.yaml
@@ -1,6 +1,7 @@
 suite: test stratos user configuration
 templates:
   - deployment.yaml
+  - secrets.yaml
 tests:
   - it: should use default UAA zone
     set:
@@ -8,7 +9,7 @@ tests:
       env.DOMAIN: test.com
     asserts:
       - contains:
-          path: spec.template.spec.containers[2].env
+          path: spec.template.spec.containers[1].env
           content:
             name: UAA_ENDPOINT
             value: https://scf.test.com:2793
@@ -19,7 +20,7 @@ tests:
       env.UAA_ZONE: testzone
     asserts:
       - contains:
-          path: spec.template.spec.containers[2].env
+          path: spec.template.spec.containers[1].env
           content:
             name: UAA_ENDPOINT
             value: https://testzone.test.com:2793
@@ -30,46 +31,70 @@ tests:
       env.DOMAIN: test.com
     asserts:
       - contains:
-          path: spec.template.spec.containers[2].env
+          path: spec.template.spec.containers[1].env
           content:
             name: UAA_ENDPOINT
             value: https://scf.test.com:2793
       - contains:
-          path: spec.template.spec.containers[2].env
+          path: spec.template.spec.containers[1].env
           content:
             name: CONSOLE_CLIENT
             value: cf
-  - it: should use local user when configured
+  - it: should use local admin password in secret when specified
     set:
       console.localAdminPassword: TEST_PASSWORD
     asserts:
       - contains:
-          path: spec.template.spec.containers[2].env
+          path: spec.template.spec.containers[1].env
           content:
             name: CONSOLE_ADMIN_SCOPE
             value: stratos.admin
       - contains:
-          path: spec.template.spec.containers[2].env
+          path: spec.template.spec.containers[1].env
           content:
             name: CONSOLE_CLIENT
             value: cf
       - contains:
-          path: spec.template.spec.containers[2].env
+          path: spec.template.spec.containers[1].env
           content:
             name: AUTH_ENDPOINT_TYPE
             value: local
       - contains:
-          path: spec.template.spec.containers[2].env
+          path: spec.template.spec.containers[1].env
           content:
             name: LOCAL_USER
             value: admin
       - contains:
-          path: spec.template.spec.containers[2].env
+          path: spec.template.spec.containers[1].env
           content:
             name: LOCAL_USER_PASSWORD
-            value: TEST_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                key: localAdminPassword
+                name: RELEASE-NAME-db-secret
+      - contains:
+          path: spec.template.spec.containers[1].env
+          content:
+            name: LOCAL_USER_SCOPE
+            value: stratos.admin
       - contains:
-          path: spec.template.spec.containers[2].env
+          path: spec.template.spec.containers[1].env
           content:
             name: LOCAL_USER_SCOPE
             value: stratos.admin
+  - it: should use local user when configured
+    set:
+      console.localAdminPassword: TEST_PASSWORD
+    asserts:
+      - equal:
+          path: data.localAdminPassword
+          value: VEVTVF9QQVNTV09SRA==
+        template: secrets.yaml
+        documentIndex: 1
+
+
+
+
+
+
+

From eb707e32ad75bce428145a1482dfc3f9e20f2456 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 5 Nov 2019 10:56:18 +0000
Subject: [PATCH 155/648] Move a few more values to secrets. Tidy ups

---
 .../console/templates/deployment.yaml         | 43 ++++++++++++-------
 .../kubernetes/console/templates/secrets.yaml |  8 ++--
 deploy/kubernetes/console/values.yaml         | 20 ++++++---
 3 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index d5988f80af..cf9dd2cc40 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -59,11 +59,15 @@ spec:
               name: "{{ .Release.Name }}-db-secret"
               key: database
         - name: DB_HOST
+          {{- if not .Values.mariadb.external }}
           value: "{{ .Release.Name }}-mariadb"
+          {{- else }}
+          value: {{ .Values.mariadb.host | quote }}
+          {{- end }}
         - name: DB_PORT
-          value: "3306"
+          value: {{ default "3306" .Values.mariadb.port | quote }}
         - name: DATABASE_PROVIDER
-          value: "mysql"
+          value: {{ default "mysql" .Values.mariadb.type | quote }}
         - name: HTTP_CONNECTION_TIMEOUT_IN_SECS
           value: "10"
         - name: HTTP_CLIENT_TIMEOUT_IN_SECS
@@ -115,10 +119,18 @@ spec:
         - name: LOG_LEVEL
           value: {{.Values.console.backendLogLevel}}
         {{- end }}
+        - name: CONSOLE_CLIENT 
+          valueFrom:
+            secretKeyRef:
+              name: "{{ .Release.Name }}-secret"
+              key: client
+        - name: CONSOLE_CLIENT_SECRET
+          valueFrom:
+            secretKeyRef:
+              name: "{{ .Release.Name }}-secret"
+              key: clientSecret
         # Local admin user
         {{- if .Values.console.localAdminPassword }}
-        - name: CONSOLE_CLIENT 
-          value: cf
         - name: CONSOLE_ADMIN_SCOPE 
           value: stratos.admin
         - name: SKIP_SSL_VALIDATION 
@@ -130,7 +142,7 @@ spec:
         - name: LOCAL_USER_PASSWORD 
           valueFrom:
             secretKeyRef:
-              name: "{{ .Release.Name }}-db-secret"
+              name: "{{ .Release.Name }}-secret"
               key: localAdminPassword
         - name: LOCAL_USER_SCOPE 
           value: stratos.admin
@@ -139,10 +151,6 @@ spec:
         {{- if or .Values.env.UAA_HOST .Values.env.DOMAIN }}  
         - name: UAA_ENDPOINT 
           value: {{ template "scfUaaEndpoint" . }}
-        - name: CONSOLE_CLIENT 
-          value: cf
-        - name: CONSOLE_CLIENT_SECRET
-          value:
         {{- if .Values.env.DOMAIN }}  
         - name: AUTO_REG_CF_URL
           value: https://api.{{.Values.env.DOMAIN}}
@@ -154,10 +162,6 @@ spec:
         {{- else if .Values.uaa.host }}  
         - name: UAA_ENDPOINT 
           value: {{default "https://" .Values.uaa.protocol}}{{.Values.uaa.host}}:{{.Values.uaa.port}}
-        - name: CONSOLE_CLIENT 
-          value: {{.Values.uaa.consoleClient}}
-        - name: CONSOLE_CLIENT_SECRET 
-          value: {{.Values.uaa.consoleClientSecret}}
         - name: CONSOLE_ADMIN_SCOPE 
           value: {{.Values.uaa.consoleAdminIdentifier}}
         - name: SKIP_SSL_VALIDATION 
@@ -202,9 +206,15 @@ spec:
         - name: SMTP_PORT
           value: {{ default "" .Values.env.SMTP_PORT | quote }}
         - name: SMTP_USER
-          value: {{ default "" .Values.env.SMTP_USER | quote }}
+          valueFrom:
+          secretKeyRef:
+            name: "{{ .Release.Name }}-secret"
+            key: smtpUser
         - name: SMTP_PASSWORD
-          value: {{ default "" .Values.env.SMTP_PASSWORD | quote }}
+          valueFrom:
+            secretKeyRef:
+              name: "{{ .Release.Name }}-secret"
+              key: smtpPassword
         - name: INVITE_USER_SUBJECT
           value: {{ default "" .Values.console.userInviteSubject | quote }}
         - name: ENABLE_TECH_PREVIEW
@@ -246,6 +256,9 @@ spec:
       - name: "{{ .Release.Name }}-db-secret"
         secret:
           secretName: "{{ .Release.Name }}-db-secret"
+      - name: "{{ .Release.Name }}-secret"
+        secret:
+          secretName: "{{ .Release.Name }}-secret"
       {{- if .Values.console.templatesConfigMapName }}
       - name: {{ .Release.Name }}-templates
         configMap:
diff --git a/deploy/kubernetes/console/templates/secrets.yaml b/deploy/kubernetes/console/templates/secrets.yaml
index a74c11bca0..450533d27e 100644
--- a/deploy/kubernetes/console/templates/secrets.yaml
+++ b/deploy/kubernetes/console/templates/secrets.yaml
@@ -11,8 +11,11 @@ metadata:
     app.kubernetes.io/component: "console-secret"
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 data:
-  client: {{ default "" .Values.uaa.consoleClient | b64enc | quote }}
+  client: {{ default "cf" .Values.uaa.consoleClient | b64enc | quote }}
   clientSecret: {{  default "" .Values.uaa.consoleClientSecret | b64enc | quote }}
+  localAdminPassword: {{ default "" .Values.console.localAdminPassword | b64enc | quote }}
+  smtpUser: {{ default "" .Values.env.SMTP_USER | b64enc | quote }}
+  smtpPassword: {{ default "" .Values.env.SMTP_PASSWORD | b64enc | quote }}
 ---
 apiVersion: v1
 kind: Secret
@@ -37,13 +40,12 @@ data:
   password: {{ randAlphaNum 32 | b64enc | quote }}
   {{- end }}
   user: {{ .Values.mariadb.user | b64enc | quote }}
-  database: {{ .Values.mariadb.database | b64enc | quote }}
+  database: {{ .Values.mariadb.mariadb | b64enc | quote }}
   {{- if .Values.console.sessionStoreSecret }}
   sessionStoreSecret: {{ .Values.console.sessionStoreSecret | b64enc | quote }}
   {{- else }}
   sessionStoreSecret: {{ randAlphaNum 64 | b64enc | quote }}
   {{- end }}
-  localAdminPassword: {{ default "" .Values.console.localAdminPassword | b64enc | quote }}
 
 {{- if and .Values.kube.registry.username .Values.kube.registry.password }}
 ---
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index 0a3f50111e..81abf159bd 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -62,9 +62,6 @@ console:
   # Email subject of the user invitation message 
   userInviteSubject: ~
 
-  # Whether to perform the volume migration job on install/upgrade (migrate to secrets)
-  migrateVolumes: true
-  
   # Enable/disable Tech Preview
   techPreview: false
 
@@ -77,7 +74,6 @@ console:
 images:
   console: stratos-console
   proxy: stratos-jetstream
-  postflight: stratos-postflight-job
   mariadb: stratos-mariadb
   configInit: stratos-config-init
 
@@ -85,7 +81,7 @@ images:
 #storageClass: default
 
 # Database configuration
-mariadb:
+database:
   external: false
   database: console
   user: console
@@ -94,6 +90,15 @@ mariadb:
   # Leave password blank to auto-generate (not needed for external database)
   rootPassword:
 
+  # DB Host
+  host:
+
+  # Override port (default 3306)
+  port:
+
+  # Override DB type - default is mysql
+  type:
+
   resources:
     requests:
       memory: 256Mi
@@ -151,6 +156,11 @@ kube:
     username:
     password:
     email: default
+
+# ================================================================================
+# Values below are for internal use only for SCF compatability - subject to change
+# ================================================================================
+
 services:
   loadbalanced: false
 

From dfa14ea446cd0d5a5238191e33457aa29fc771bb Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 6 Nov 2019 11:50:10 +0000
Subject: [PATCH 156/648] Fix issues due to broken tidy ups

---
 .../console/templates/deployment.yaml         |  6 +--
 .../kubernetes/console/templates/secrets.yaml |  3 +-
 .../console/tests/user_invite_test.yaml       | 53 ++++++++++++-------
 .../kubernetes/console/tests/user_test.yaml   | 14 +----
 deploy/kubernetes/console/values.yaml         |  4 +-
 5 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index cf9dd2cc40..56573be788 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -207,9 +207,9 @@ spec:
           value: {{ default "" .Values.env.SMTP_PORT | quote }}
         - name: SMTP_USER
           valueFrom:
-          secretKeyRef:
-            name: "{{ .Release.Name }}-secret"
-            key: smtpUser
+            secretKeyRef:
+              name: "{{ .Release.Name }}-secret"
+              key: smtpUser
         - name: SMTP_PASSWORD
           valueFrom:
             secretKeyRef:
diff --git a/deploy/kubernetes/console/templates/secrets.yaml b/deploy/kubernetes/console/templates/secrets.yaml
index 450533d27e..544108e376 100644
--- a/deploy/kubernetes/console/templates/secrets.yaml
+++ b/deploy/kubernetes/console/templates/secrets.yaml
@@ -40,13 +40,12 @@ data:
   password: {{ randAlphaNum 32 | b64enc | quote }}
   {{- end }}
   user: {{ .Values.mariadb.user | b64enc | quote }}
-  database: {{ .Values.mariadb.mariadb | b64enc | quote }}
+  database: {{ .Values.mariadb.database | b64enc | quote }}
   {{- if .Values.console.sessionStoreSecret }}
   sessionStoreSecret: {{ .Values.console.sessionStoreSecret | b64enc | quote }}
   {{- else }}
   sessionStoreSecret: {{ randAlphaNum 64 | b64enc | quote }}
   {{- end }}
-
 {{- if and .Values.kube.registry.username .Values.kube.registry.password }}
 ---
 apiVersion: v1
diff --git a/deploy/kubernetes/console/tests/user_invite_test.yaml b/deploy/kubernetes/console/tests/user_invite_test.yaml
index 6df0d7eb1f..b2309e8233 100644
--- a/deploy/kubernetes/console/tests/user_invite_test.yaml
+++ b/deploy/kubernetes/console/tests/user_invite_test.yaml
@@ -1,6 +1,7 @@
 suite: test stratos user invite configuration
 templates:
   - deployment.yaml
+  - secrets.yaml
 
 tests:
   - it: should have default SMTP configuration
@@ -55,24 +56,6 @@ tests:
           content:
             name: SMTP_PORT
             value: "4567"
-  - it: should allow SMTP configuration to be set for username/password
-    set:
-      env.SMTP_USER: "test_user"
-      env.SMTP_PASSWORD: "test_password"
-    asserts:
-      - equal:
-          path: spec.template.spec.containers[1].name
-          value: proxy
-      - contains:
-          path: spec.template.spec.containers[1].env
-          content:
-            name: SMTP_USER
-            value: "test_user"
-      - contains:
-          path: spec.template.spec.containers[1].env
-          content:
-            name: SMTP_PASSWORD
-            value: "test_password"
   - it: should allow SMTP configuration to be set for email sibject
     set:
       console.userInviteSubject: "test subject"
@@ -108,3 +91,37 @@ tests:
             name: "RELEASE-NAME-templates"
             configMap:
               name: templateCMName
+  - it: should allow SMTP configuration to be set for username/password
+    set:
+      env.SMTP_USER: "test_user"
+      env.SMTP_PASSWORD: "test_password"
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[1].name
+          value: proxy
+      - contains:
+          path: spec.template.spec.containers[1].env
+          content:
+            name: SMTP_USER
+            valueFrom:
+              secretKeyRef:
+                key: smtpUser
+                name: RELEASE-NAME-secret
+      - contains:
+          path: spec.template.spec.containers[1].env
+          content:
+            name: SMTP_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                key: smtpPassword
+                name: RELEASE-NAME-secret
+      - equal:
+          path: data.smtpUser
+          value: dGVzdF91c2Vy
+        template: secrets.yaml
+        documentIndex: 0
+      - equal:
+          path: data.smtpPassword
+          value: dGVzdF9wYXNzd29yZA==
+        template: secrets.yaml
+        documentIndex: 0
diff --git a/deploy/kubernetes/console/tests/user_test.yaml b/deploy/kubernetes/console/tests/user_test.yaml
index ec7b472936..09adfdb541 100644
--- a/deploy/kubernetes/console/tests/user_test.yaml
+++ b/deploy/kubernetes/console/tests/user_test.yaml
@@ -35,11 +35,6 @@ tests:
           content:
             name: UAA_ENDPOINT
             value: https://scf.test.com:2793
-      - contains:
-          path: spec.template.spec.containers[1].env
-          content:
-            name: CONSOLE_CLIENT
-            value: cf
   - it: should use local admin password in secret when specified
     set:
       console.localAdminPassword: TEST_PASSWORD
@@ -49,11 +44,6 @@ tests:
           content:
             name: CONSOLE_ADMIN_SCOPE
             value: stratos.admin
-      - contains:
-          path: spec.template.spec.containers[1].env
-          content:
-            name: CONSOLE_CLIENT
-            value: cf
       - contains:
           path: spec.template.spec.containers[1].env
           content:
@@ -71,7 +61,7 @@ tests:
             valueFrom:
               secretKeyRef:
                 key: localAdminPassword
-                name: RELEASE-NAME-db-secret
+                name: RELEASE-NAME-secret
       - contains:
           path: spec.template.spec.containers[1].env
           content:
@@ -90,7 +80,7 @@ tests:
           path: data.localAdminPassword
           value: VEVTVF9QQVNTV09SRA==
         template: secrets.yaml
-        documentIndex: 1
+        documentIndex: 0
 
 
 
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index 81abf159bd..135813c4cc 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -81,7 +81,7 @@ images:
 #storageClass: default
 
 # Database configuration
-database:
+mariadb:
   external: false
   database: console
   user: console
@@ -112,7 +112,7 @@ uaa:
   protocol: https://
   port: 
   host: 
-  consoleClient:  
+  consoleClient: 
   consoleClientSecret: 
   consoleAdminIdentifier: 
   skipSSLValidation: false

From c70eef40093c132ebb251542f69a8f40f63e8827 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 7 Nov 2019 11:28:02 +0000
Subject: [PATCH 157/648] Add Helm chart icon and readme

---
 deploy/kubernetes/console/Chart.yaml |   3 +
 deploy/kubernetes/console/README.md  | 323 +++++++++++++++++++++++++++
 deploy/kubernetes/console/icon.png   | Bin 0 -> 13121 bytes
 3 files changed, 326 insertions(+)
 create mode 100644 deploy/kubernetes/console/README.md
 create mode 100644 deploy/kubernetes/console/icon.png

diff --git a/deploy/kubernetes/console/Chart.yaml b/deploy/kubernetes/console/Chart.yaml
index a167c169be..fcf011b8c0 100644
--- a/deploy/kubernetes/console/Chart.yaml
+++ b/deploy/kubernetes/console/Chart.yaml
@@ -3,3 +3,6 @@ description: A Helm chart for deploying Stratos UI Console
 name: console
 version: 0.1.0
 appVersion: 0.1.0
+sources:
+  - https://github.com/cloudfoundry/stratos
+icon: https://raw.githubusercontent.com/cloudfoundry/stratos/master/deploy/kubernetes/icon.png
\ No newline at end of file
diff --git a/deploy/kubernetes/console/README.md b/deploy/kubernetes/console/README.md
new file mode 100644
index 0000000000..53e0dad639
--- /dev/null
+++ b/deploy/kubernetes/console/README.md
@@ -0,0 +1,323 @@
+# Stratos
+
+Stratos is an Open Source Web-based UI (Console) for managing Cloud Foundry. It allows users and administrators to both manage applications running in the Cloud Foundry cluster and perform cluster management tasks.
+
+## Installation
+
+The Helm chart is published to the Stratos Helm repository.
+
+You will need to have the Stratos Helm repository added to your Helm setup, if you do not, run:
+
+```
+helm repo add stratos https://cloudfoundry.github.io/stratos
+```
+Check the repository was successfully added by searching for the `console`
+```
+helm search console
+NAME               	CHART VERSION   APP VERSION	DESCRIPTION                                  
+stratos/console    	2.6.0           2.6.0      	A Helm chart for deploying Stratos UI Console
+```
+To install Stratos:
+
+```
+helm install stratos/console --namespace=console --name my-console
+```
+> **Note**: This assumes that a storage class exists in the Kubernetes cluster that has been marked as `default`. If no such storage class exists, a specific storage class needs to be specified, please see the following section *Specifying a custom Storage Class*. 
+
+> You can change the namespace (--namespace) and the release name (--name) to values of your choice.
+
+This will create a Console instance named `my-console` in a namespace called `console` in your Kubernetes cluster.
+
+After the install, you should be able to access the Console in a web browser by following [the instructions](#accessing-the-console) below.
+
+Advanced installation topics are covered in the the [Advanced Topics](#advanced-topics) section below.
+
+# Helm Chart Configuration
+
+The following table lists the configurable parameters of the Stratos Helm chart and their default values.
+
+|Parameter|Description|Default|
+|---|---|---|
+|imagePullPolicy|Image pull policy|IfNotPresent|
+|console.sessionStoreSecret|Secret to use when encrypting session tokens|auto-generated random value|
+|console.ssoLogin|Whether to enable SSO Login and use the UAA Login UI instead of the built-in one|false|
+|console.backendLogLevel|Log level for backend (info, debug)|info|
+|console.service.annotations|Annotations to add to the console service|[]|
+|console.service.externalIPs|External IPs to add to the console service|[]|
+|console.service.loadBalancerIP|IP address to assign to the load balancer for the metrics service (if supported)||
+|console.service.loadBalancerSourceRanges|List of IP CIDRs allowed access to load balancer (if supported)|[]|
+|console.service.type|Service type for the console (ClusterIP, NodePort, LoadBalancer, ExternalName etc)|ClusterIP|
+|console.service.servicePort|Service port for the console service|443|
+|console.service.externalName|External name for the console service when service type is ExternalName||
+|console.service.nodePort|Node port to use for the console service when service type is NodePort or LoadBalancer||
+|console.ingress.enabled|Enable ingress for the console service|false|
+|console.ingress.annotations|Annotations to add to the ingress resource|{}|
+|console.ingress.extraLabels|Extra labels to add to the ingress resource|{}|
+|console.ingress.host|Host for the ingress resource|||
+|console.ingress.secretName|Name of an existing secret containing the TLS certificate for ingress|||
+|console.service.http.enabled|Enabled HTTP access to the console service (as well as HTTPS)|false|
+|console.service.http.servicePort|Service port for HTTP access to the console service when enabled|80|
+|console.service.http.nodePort|Node port for HTTP access to the console service (as well as HTTPS)||
+|console.templatesConfigMapName|Name of config map that provides the template files for user invitation emails||
+|console.userInviteSubject|Email subject of the user invitation message||
+|console.techPreview|Enable/disable Tech Preview features|false|
+|console.localAdminPassword|Use local admin user instead of UAA - set to a password to enable||
+|console.tlsSecretName|Secret containing TLS certificate to use for the Console||
+|console.mariadb.external|Use an external database instead of the built-in MariaDB|false|
+|console.mariadb.database|Name of the database to use|console|
+|console.mariadb.user|Name of the user for accessing the database|console|
+|console.mariadb.userPassword|Password of the user for accessing the database. Leave blank for the built-in database to generate a random password||
+|console.mariadb.rootPassword|Password of the root user for accessing the database. Leave blank for the built-in database to generate a random password||
+|console.mariadb.host|Hostname of the database when using an external db||
+|console.mariadb.port|Port of the database when using an external db||
+|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|
+|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||
+|env.SMTP_PASSWORD|Password to use for authentication when Sending User Invite emails||
+|env.SMTP_HOST|Server host address to use for authentication when Sending User Invite emails||
+|env.SMTP_PORT|Server port to use for authentication when Sending User Invite emails||
+|kube.auth|Set to "rbac" if the Kubernetes cluster supports Role-based access control|"rbac"|
+|kube.organization|Registry organization to use when pulling images||
+|kube.registry.hostname|Hostname of registry to use when pulling images|docker.io|
+|kube.registry.username|Username to use when pulling images from the registry||
+|kube.registry.password|Password to use when pulling images from the registry||
+
+## Accessing the Console
+
+To check the status of the instance use the following command:
+```
+helm status my-console
+```
+
+> Note: Replace `my-console` with the value you used for the `name` parameter, or if you did not provide one, use the `helm list` command to find the release name that was automatically generated for you.
+
+The console is exposed via an HTTPS service - `RELEASE-NAME-ui-ext` (where RELEASE-NAME is the name used for the `name` parameter when installing). You can find the details of this service with:
+
+```
+$ kubectl get services -n NAMESPACE
+NAME                 TYPE        CLUSTER-IP      EXTERNAL-IP   PORT(S)         AGE
+my-console-mariadb   ClusterIP   10.105.216.25   <none>        3306/TCP        60s
+my-console-ui-ext    NodePort    10.109.207.70   <none>        443:31067/TCP   60s
+```
+
+> In this example, Stratos has been deployed withe the service configured as `NodePort`.
+
+The URL you use for accessing Stratos will depend on the service configuration and the environment that you have used.
+
+> Note: If you did not provide a certificate when installing, Stratos will use a self-signed certificate, so you will see a certificate warning which you access Stratos in a browser.
+
+# Upgrading your deployment
+
+To upgrade your instance when using the Helm repository, fetch any updates to the repository:
+
+```
+$ helm repo update
+```
+
+To update an instance, the following assumes your instance is called `my-console`:
+
+```
+$ helm upgrade my-console stratos/console --recreate-pods
+```
+
+After the upgrade, perform a `helm list` to ensure your console is the latest version.
+
+
+# Advanced Topics
+
+## Using a Load Balancer
+
+If your Kubernetes deployment supports automatic configuration of a load balancer (e.g. Google Container Engine), specify the parameters `console.service.type=LoadBalancer` when installing.
+
+```
+helm install stratos/console --namespace=console --name my-console --set console.service.type=LoadBalancer
+```
+
+### Using an Ingress Controller
+
+If your Kubernetes Cluster supports Ingress, you can expose Stratos through Ingress by supplying the appropriate ingress configuration when installing.
+
+This configuration is described below:
+
+|Parameter|Description|Default|
+|----|---|---|
+|console.service.ingress.enabled|Enables ingress|false|
+|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.service.ingress.host|The host name that will be used for the Stratos service.||
+|console.service.ingress.secretName|The existing TLS secret that contains the certificate for ingress.||
+
+You must provide `console.service.ingress.host` when enabling ingress.
+
+By default a certificate will be generated for TLS. You can provide your own certificate by creating a secret and specifying this with `console.service.ingress.secretName`.
+
+> Note: If you do not supply `console.service.ingress.host` but do supply `env.DOMAIN` then the host `console.[env.DOMAIN]` will be used.
+
+## Deploying from a Private Image Repository
+
+If the images used by the chart are hosted in a private repository, the following needs to be specified. Save the following to a file called `private_overrides.yaml`. Replace `REGISTRY USER PASSSWORD`, `REGISTRY USERNAME`, `REGISTRY URL` with the appropriate values. `USER EMAIL` can be left blank.
+
+```
+kube:
+  registry:
+    password: <REGISTRY USER PASSWORD>
+    username: <REGISTRY USERNAME>
+    hostname: <REGISTRY URL>
+    email: <USER EMAIL or leave blank>
+```
+
+Deploy with:
+
+```
+helm install stratos/console -f private_overrides.yaml --namespace=metrics
+```
+
+## Deploying with your own TLS certificates
+
+By default the console will generate self-signed certificates for demo purposes. To configure Stratos to use your provided TLS certificate, create a TLS secret in the namespace you are installing into and specify this secret name using the `` when installing.
+
+Assuming you have your certificate and key in the files `tls.crt` and `tls.key`, create the secret with:
+
+```
+kubectl create secret tls -n NAMESPACE  stratos-tls-secret --cert=tls.crt --key=tls.key
+```
+
+> Where NAMESPACE is the namespace you are installing Stratos into - you will need to manually create the namespace first if it does not already exist.
+
+You can now install Stratos with:
+
+```
+helm install stratos/console --namespace console --name my-console --set console.tlsSecretName=stratos-tls-secret
+```
+
+## Specifying UAA configuration
+
+When deploying with SCF, the `scf-config-values.yaml` (see [SCF Wiki link](https://github.com/SUSE/scf/wiki/How-to-Install-SCF#configuring-the-deployment)) can be supplied when installing Stratos.
+```
+$ helm install stratos/console  -f scf-config-values.yaml
+```
+
+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:
+  protocol: https://
+  port: 2793
+  host: uaa.cf-dev.io
+  consoleClient:  cf
+  consoleClientSecret: 
+  consoleAdminIdentifier: cloud_controller.admin 
+  skipSSLValidation: false
+```
+
+To install Stratos with the above specified configuration:
+```
+$ helm install stratos/console -f uaa-config.yaml
+```
+
+## Configuring a local user account
+
+This allows for deployment without a UAA. To enable the local user account, supply a password for the local user in the deployment command, as follows. All other steps for each deployment method should be followed as in the preceding sections above.
+
+To deploy using our Helm repository:
+
+```
+helm install stratos/console --namespace=console --name my-console --set console.localAdminPassword=<password>
+```
+
+To deploy using an archive file containing a given release of our Helm chart
+
+```
+helm install console --namespace=console --name my-console --set console.localAdminPassword=<password>
+```
+
+To deploy using the latest Helm chart directly from out GitHub repository
+
+```
+$ helm install console --namespace console --name my-console --set console.localAdminPassword=<password>
+```
+
+## Requirements
+
+### Storage Class
+
+Stratos uses persistent volumes. In order to deploy it in your Kubernetes environment, you must
+have a storage class available.
+
+Without configuration, the Stratos Helm Chart will use the default storage class. If a default storage
+class is not available, installation will fail.
+
+To check if a `default` storage class exists, you can list your configured storage classes with `kubectl get storageclass`. If no storage class has `(default)` after it, then you need to either specify a storage class override or declare a default storage class for your Kubernetes cluster.
+
+For non-production environments, you may want to use the `hostpath` storage class. See the [SCF instructions](https://github.com/SUSE/scf/wiki/How-to-Install-SCF#choosing-a-storage-class) for details on setting this up. Note that you will need to make this storage class the default storage class, e.g.
+
+```
+kubectl patch storageclass <your-class-name> -p '{"metadata": {"annotations":{"storageclass.kubernetes.io/is-default-class":"true"}}}'
+```
+Where `<your-class-name>` would be `hostpath` if you follow the SCF instructions.
+
+
+### Specifying a custom Storage Class 
+
+If no default storage class has been defined in the Kubernetes cluster. The Stratos helm chart will fail to deploy successfully. To check if a `default` storage class exists, you can list your configured storage classes with `kubectl`. If no storage class has `(default)` after it, then you need to either specify a storage class override or declare a default storage class for your Kubernetes cluster.
+
+#### Providing Storage Class override
+```
+$ kubectl get storageclass
+NAME                TYPE
+ssd                 kubernetes.io/host-path   
+persistent          kubernetes.io/host-path   
+```
+
+For instance to use the storage class `persistent` to deploy Console persistent volume claims, store the following to a file called `override.yaml`.
+
+```
+---
+storageClass: persistent
+```
+
+If you want MariaDB to use a specific storage class (which can be different to that used for the other components), then specify the following:
+```
+---
+storageClass: persistent
+mariadb:
+  persistence:
+    storageClass: persistent
+```
+
+Run Helm with the override:
+```
+helm install -f override.yaml stratos/console
+```
+
+#### Create a default Storage Class
+Alternatively, you can configure a storage class with `storageclass.kubernetes.io/is-default-class` set to `true`. For instance the following storage class will be declared as the default. If you don't have the `hostpath` provisioner available in your local cluster, please follow the instructions on [link] (https://github.com/kubernetes-incubator/external-storage/tree/master/docs/demo/hostpath-provisioner), to deploy one.
+
+If the hostpath provisioner is available, save the file to `storageclass.yaml`
+
+```
+---
+kind: StorageClass
+apiVersion: storage.k8s.io/v1beta1
+metadata:
+  name: default
+  annotations:
+    storageclass.kubernetes.io/is-default-class: "true"
+provisioner: kubernetes.io/host-path # Or whatever the local hostpath provisioner is called
+```
+
+To create it in your kubernetes cluster, execute the following.
+```
+kubectl create -f storageclass.yaml
+```
+
+See [Storage Class documentation] ( https://kubernetes.io/docs/tasks/administer-cluster/change-default-storage-class/) for more insformation.
+
diff --git a/deploy/kubernetes/console/icon.png b/deploy/kubernetes/console/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..60a70a0749758330261c93b59af8ed3e675d4bba
GIT binary patch
literal 13121
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
bOauFW`%;$Ds8^M~00000NkvXXu0mjf2mm#J

literal 0
HcmV?d00001


From 969b2818e96a87a1599bc326679a3f9a906bca43 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 7 Nov 2019 12:43:34 +0000
Subject: [PATCH 158/648] Tweaks to readme and the customization script
 invocation

---
 deploy/ci/tasks/dev-releases/create-chart.yml |  2 +-
 deploy/kubernetes/build.sh                    | 14 +++++++++++++-
 deploy/kubernetes/console/README.md           |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/deploy/ci/tasks/dev-releases/create-chart.yml b/deploy/ci/tasks/dev-releases/create-chart.yml
index ecd9006a4d..06d10e4c83 100644
--- a/deploy/ci/tasks/dev-releases/create-chart.yml
+++ b/deploy/ci/tasks/dev-releases/create-chart.yml
@@ -41,7 +41,7 @@ run:
       # Run customization script if there is one
       if [ -f "${STRATOS}/custom-src/deploy/kubernetes/customize-helm.sh" ]; then
         echo "Applying Helm Chart customizations"
-        ${STRATOS}/custom-src/deploy/kubernetes/customize-helm.sh "${STRATOS}"
+        ${STRATOS}/custom-src/deploy/kubernetes/customize-helm.sh "${STRATOS}/deploy/kubernetes/console"
       fi
 
       # Generate imagelist
diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
index e2fd3b3c4f..3ccb0c4830 100755
--- a/deploy/kubernetes/build.sh
+++ b/deploy/kubernetes/build.sh
@@ -216,7 +216,19 @@ pushd ${DEST_HELM_CHART_PATH} > /dev/null
 # Run customization script if there is one
 if [ -f "${STRATOS_PATH}/custom-src/deploy/kubernetes/customize-helm.sh" ]; then
   printf "${YELLOW}${BOLD}Applying Helm Chart customizations${RESET}\n"
-  ${STRATOS_PATH}/custom-src/deploy/kubernetes/customize-helm.sh "${STRATOS_PATH}"
+  ${STRATOS_PATH}/custom-src/deploy/kubernetes/customize-helm.sh "${DEST_HELM_CHART_PATH}"
+fi
+
+# Look for custom config metadata with product version metadata
+if [ -f "${STRATOS_PATH}/custom-src/stratos.yaml" ]; then
+  PROD_VERSION=$(cat "${STRATOS_PATH}/custom-src/stratos.yaml" | grep "productVersion")
+  if [ ! -z "${PROD_VERSION}" ]; then
+    PROD_VERSION=$(echo $PROD_VERSION | grep --extended --only-matching '[0-9\.]+')
+    if [ ! -z "${PROD_VERSION}" ]; then
+      echo "Setting appVersion to: ${PROD_VERSION}"
+      sed -i.bak -e 's/appVersion: [0-9\.]*/appVersion: '"${PROD_VERSION}"'/g' ${DEST_HELM_CHART_PATH}/Chart.yaml
+    fi
+  fi
 fi
 
 # Fetch subcharts
diff --git a/deploy/kubernetes/console/README.md b/deploy/kubernetes/console/README.md
index 53e0dad639..79bc27455d 100644
--- a/deploy/kubernetes/console/README.md
+++ b/deploy/kubernetes/console/README.md
@@ -1,6 +1,6 @@
 # Stratos
 
-Stratos is an Open Source Web-based UI (Console) for managing Cloud Foundry. It allows users and administrators to both manage applications running in the Cloud Foundry cluster and perform cluster management tasks.
+Stratos is an Open Source Web-based Management console for Cloud Foundry. It allows users and administrators to both manage applications running in the Cloud Foundry cluster and perform cluster management tasks.
 
 ## Installation
 

From dd0080d79a8234c1f869c38fe9d16d13ed700891 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 7 Nov 2019 13:50:02 +0000
Subject: [PATCH 159/648] Helm: Add customization of helm chart for SUSE

---
 .../deploy/kubernetes/customize-helm.sh       |  66 ++++++++++++++++++
 custom-src/deploy/kubernetes/icon.png         | Bin 0 -> 1542 bytes
 2 files changed, 66 insertions(+)
 create mode 100755 custom-src/deploy/kubernetes/customize-helm.sh
 create mode 100644 custom-src/deploy/kubernetes/icon.png

diff --git a/custom-src/deploy/kubernetes/customize-helm.sh b/custom-src/deploy/kubernetes/customize-helm.sh
new file mode 100755
index 0000000000..d7ef8c7cd3
--- /dev/null
+++ b/custom-src/deploy/kubernetes/customize-helm.sh
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+CHART_PATH=$1
+
+# Script folder
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+CYAN="\033[96m"
+YELLOW="\033[93m"
+RESET="\033[0m"
+BOLD="\033[1m"
+
+echo -e "${CYAN}${BOLD}Applying SUSE customizations to Helm Chart${RESET}"
+echo "Customizations folder: ${DIR}"
+echo "Chart folder         : ${CHART_PATH}"
+echo ""
+
+# ===========================================================================================
+# Chart.yaml changes
+# ===========================================================================================
+
+echo -e "${CYAN}Patching Chart.yaml${RESET}"
+
+# Change the sources git repo reference in Chart.yaml
+sed -i.bak -e 's@https://github.com/cloudfoundry/stratos@https://github.com/SUSE/stratos@g' ${CHART_PATH}/Chart.yaml
+
+# Change the URL of the icon to be the SUSE one
+ICON_URL="https://raw.githubusercontent.com/cloudfoundry/stratos/master/deploy/kubernetes/icon.png"
+SUSE_ICON_URL="https://raw.githubusercontent.com/SUSE/stratos/custom-src/deploy/kubernetes/icon.png"
+sed -i.bak -e 's@'"${ICON_URL}"'@'"${SUSE_ICON_URL}"'@g' ${CHART_PATH}/Chart.yaml
+
+SRC="A Helm chart for deploying Stratos UI Console"
+DEST="A Helm chart for deploying SUSE Stratos Console"
+sed -i.bak -e 's@'"${SRC}"'@'"${DEST}"'@g' ${CHART_PATH}/Chart.yaml
+
+# ===========================================================================================
+# README.md changes
+# ===========================================================================================
+
+# Need to apply these carefully
+
+echo -e "${CYAN}Patching README.md${RESET}"
+
+# Change all references to 'Stratos' (case sensitive)
+sed -i.bak -e 's@Stratos@SUSE Stratos Console@g' ${CHART_PATH}/README.md
+
+# Change command for helm repo addition
+HELM_ADD="helm repo add stratos https://cloudfoundry.github.io/stratos"
+SUSE_HELM_ADD="helm repo add suse https://registry.suse.com"
+sed -i.bak -e 's@'"${HELM_ADD}"'@'"${SUSE_HELM_ADD}"'@g' ${CHART_PATH}/README.md
+
+# Change command for helm install
+HELM_INSTALL="stratos/console"
+SUSE_HELM_INSTALL="suse/console  "
+sed -i.bak -e 's@'"${HELM_INSTALL}"'@'"${SUSE_HELM_INSTALL}"'@g' ${CHART_PATH}/README.md
+
+SRC="SUSE Stratos Console Helm repository"
+DEST="SUSE Helm repository"
+sed -i.bak -e 's@'"${SRC}"'@'"${DEST}"'@g' ${CHART_PATH}/README.md
+
+SRC="SUSE Stratos Console UI Console"
+DEST="SUSE Stratos Console"
+sed -i.bak -e 's@'"${SRC}"'@'"${DEST}"'@g' ${CHART_PATH}/README.md
+
+echo -e "${CYAN}${BOLD}All done applying SUSE customizations to Helm Chart${RESET}"
+echo ""
\ No newline at end of file
diff --git a/custom-src/deploy/kubernetes/icon.png b/custom-src/deploy/kubernetes/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..215597b551b681524c64fb322862527ff9db4f0f
GIT binary patch
literal 1542
zcmY*Zc{mh!7#>HZ!MaLJIdX*=LYc`m?i|awW!+38H^sQGhM9;QxtWZJkX&ixnq)%Q
zGN!TQYDLar9mQg?gSO|{=lOl_`yKE1KEJ=dBy)rTClCY#005juhI*C^4mk`q76!_O
z=ZZ5Z)7->bpTSHYU6?6O3}hNSLh2D7msID&KI0uH4E#C$$jFb%LuAPQuRNSGe2)A7
z2@YjPZpVf{wtnvZNQiWitBh|c1Y07k06Wa<CpS4d=%;`Evs%6TlHmM{po=_uaw)VA
zXUcqpiXuGhtrf>dnxU}|U9lxO2wW!~1^}?G8|i6VdrmHo4Cj<+aRVp_iQb1n3ikw;
z4qp4808Lf2_T#&vzrg1$dgQBG*jrD@@h5k=*V{o3X;9SNz1gE~LO88w8Omk?Yf{G+
zbMczK4k0NcFI#DM2(UAk5kVqUO66V$s7FdQb}xXfA9h2II2AfGZ;pqS>$JG`!QoL(
zmkrV~Vx_Acydnk3F0SFX@IJ#xwxq^z(;?63_U0l?Olp21jo(!a@{ZaIliLZ4@1vs6
zhG}vvx*$0;6Q-HT0+VH_H72zy##U~^VND+(I4MKhQ-U6tN<i?9mid5{e4qlKvK;tn
zBA{pAW${_;`&_T8E3+q^xq-!tvA}|RvcJ!cAxVv6U6=aba392&Mxqnk<V}koaA={b
zC1td5G00u4+jV7Q>$vYIKHw0)?l)4#h$Kd3kac3ktY<b=CS!L5{0)aLR{&=}rtfD7
zvly5Ug0ysNF)X-zGVcuek*I5WK^-l^uTWrC%Fb|Hcdm2u{d5p*D8(;c67FzThcw~b
zky`<KsjiM~|D;d~SsGPn;8yXzee+t$tJ!2<UlbY7;elIDEEpP(GvP^c`)n!R0({Y_
z>K-v@ZNIMHop*;8xTTFf>CbxQBLwpnS>>Mopsr0gOwq>RLdj%590qZ6Oc+tTD(#vQ
zP7xFJ48(ACbobs&cvWcLu=XfQ8hxD?m1hSOxf_ZlC_I_DOR`sPwezsSZA;fP5ipe&
ziz>RDIZG&sku={c0-4kC<<HAJi9quOI<0V2rKu@B;H~81yxAYw{`N(=<4cxaN=0&w
zCfh`+KAuHmsyLEtEbh#`vf36TG@F(`q0#4Xe_+dN!<X#HI_>?7kzZV?vX?H8B+My;
zaBHM5&&Og|9yGYa)c`fW1OBq-FH$S?!Xap7AVdY@S3OL1eu*;1ZaPYjwSMn~X<U`+
zqZs{`S#{ZBJXVwLFXJxV#wFU;EWDkS9O~@8gSIU~plo+*E|Ktisg(K&DQ_wAyM3Ke
z9m498&^+DRCPX&nDI9Dt&9}e$;e@K2+JIR+rC~W(GU|S7ty4@E`bO8^YQ%fx&FlT2
zp=#H%bJI565>nc>D-*k6!E5|)$V{fztNqr(LcUKCHZg1U6_d}wlPGc|3-4PBn4+i7
z#WG>!N3&@q66fTRNoYT)?8b0^j`Imb;f0WjRI#Q^ld!cGY(jw3fw!)mh=!oNtdu7R
zj;FDfOgN`mwSet2<;7J;7c`Lzb=r?+{}~~Pdo;Oa#e53DLV+%LnLybH)aJSD$6iXL
zhZ~XAPz^`lDzWwn7QWLU)que9P_77l(ylDn6EhWJp;69e1r&w7>GX#U7(j~}q6_6~
z1|{zI<=(OSY7to^!ueHw`Q-dq!cK7Mj6r5H%rp{20f!UG!OdqvF-;47ulP!gh|C0~
zXM!#1x0`tCg@alb<_28QlXImTW_w;5dX1!^!l^R{4oXkHQ6Zm;+eLjzQ7rG>cK=@J
zAJfi$vP&o{L1%VRZe>OL7?PB3e!=FMtyfP9>CeyxG_G^=1Q7^yKlW&2IK=g$JOW`G
zb6)55kTwBnyn4PM5iV_p-Rgm|M`z8`r?AD*Q17kQ{ix!!3p~-nYO1_n3(Zq1r&w9{
z&OsEHd?L~%mL2{0aQh-UcFDy*4;JHY#n8{;;ylAu{%SkVxSRkZeS}_(jw|M05=+)x

literal 0
HcmV?d00001


From 2406758e2ab1d4274667b1ca7c10dba877bfc9f1 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 8 Nov 2019 15:13:52 +0000
Subject: [PATCH 160/648] Final tweaks

---
 .../actions/deploy-applications.actions.ts    |  2 +-
 .../deploy-application.component.theme.scss   | 12 +++++++++-
 .../packages/core/sass/_all-theme.scss        |  4 ++--
 .../sass/components/mat-snack-bar.theme.scss  | 23 +++++++++++++++++++
 .../core/sass/components/mat-tabs.theme.scss  | 20 ----------------
 .../no-content-message.component.theme.scss   |  2 +-
 6 files changed, 38 insertions(+), 25 deletions(-)
 create mode 100644 src/frontend/packages/core/sass/components/mat-snack-bar.theme.scss
 delete mode 100644 src/frontend/packages/core/sass/components/mat-tabs.theme.scss

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 7264dee6a7..36baef9f80 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
@@ -9,7 +9,7 @@ import { GitAppDetails, OverrideAppDetails, SourceType } from '../store/types/de
 import { GitBranch, GitCommit } from '../store/types/git.types';
 
 export const SET_APP_SOURCE_DETAILS = '[Deploy App] Application Source';
-export const CHECK_PROJECT_EXISTS = '[Deploy App] Check Projet exists';
+export const CHECK_PROJECT_EXISTS = '[Deploy App] Check Project exists';
 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';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application.component.theme.scss b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application.component.theme.scss
index 0ce40249ca..d5f3293582 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application.component.theme.scss
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application.component.theme.scss
@@ -1,7 +1,17 @@
 @import '~@angular/material/theming';
 @mixin app-deploy-app-theme($theme, $app-theme) {
+  $is-dark: map-get($theme, is-dark);
+
   $ansi-colors: map-get($app-theme, ansi-colors);
+  $background-color: map-get(map-get($ansi-colors, 'white'), intense);
+
+  @if $is-dark == true {
+    $background-colors: map-get($theme, background);
+    $foreground-colors: map-get($theme, foreground);
+    $background-color: lighten(mat-color($background-colors, background), 5%);
+  }
+
   .deploy-app {
-    background-color: map-get(map-get($ansi-colors, 'white'), intense);
+    background-color: $background-color;
   }
 }
diff --git a/src/frontend/packages/core/sass/_all-theme.scss b/src/frontend/packages/core/sass/_all-theme.scss
index 9e0e214311..eebacc092f 100644
--- a/src/frontend/packages/core/sass/_all-theme.scss
+++ b/src/frontend/packages/core/sass/_all-theme.scss
@@ -43,7 +43,7 @@
 @import '../src/features/user-profile/profile-info/profile-info.component.theme';
 @import '../src/core/stateful-icon/stateful-icon.component.theme';
 @import '../src/shared/components/markdown-preview/markdown-preview.component.theme';
-@import './components/mat-tabs.theme';
+@import './components/mat-snack-bar.theme';
 @import './components/ngx-charts-gauge.theme';
 @import './components/text-status.theme';
 @import './components/hyperlinks.theme';
@@ -107,7 +107,7 @@ $side-nav-light-active: #484848;
   @include list-theme($theme, $app-theme);
   @include app-base-page-theme($theme, $app-theme);
   @include app-page-subheader-theme($theme, $app-theme);
-  @include app-mat-tabs-theme($theme, $app-theme);
+  @include app-mat-snack-bar-theme($theme, $app-theme);
   @include ngx-charts-gauge($theme, $app-theme);
   @include app-text-status-theme($theme, $app-theme);
   @include app-card-status-theme($theme, $app-theme);
diff --git a/src/frontend/packages/core/sass/components/mat-snack-bar.theme.scss b/src/frontend/packages/core/sass/components/mat-snack-bar.theme.scss
new file mode 100644
index 0000000000..a54bff5792
--- /dev/null
+++ b/src/frontend/packages/core/sass/components/mat-snack-bar.theme.scss
@@ -0,0 +1,23 @@
+// Fix the color of the underline for the active tab
+// when on a primary backgrdound
+// Need to revist this and check if this is an issue with the Angular Material library
+@mixin app-mat-snack-bar-theme($theme, $app-theme) {
+  $is-dark: map-get($theme, is-dark);
+  $background-colors: map-get($theme, background);
+  $foreground-colors: map-get($theme, foreground);
+
+  $background-color: mat-color($foreground-colors, text);
+  $color: mat-color($background-colors, text);
+
+  @if $is-dark == true {
+    $background-color: lighten(mat-color($background-colors, background), 5%);
+    $color: mat-color($foreground-colors, text);
+  }
+
+  .mat-snack-bar-container {
+    background-color: $background-color;
+    .mat-simple-snackbar {
+      color: $color;
+    }
+  }
+}
diff --git a/src/frontend/packages/core/sass/components/mat-tabs.theme.scss b/src/frontend/packages/core/sass/components/mat-tabs.theme.scss
deleted file mode 100644
index 90bc38cd86..0000000000
--- a/src/frontend/packages/core/sass/components/mat-tabs.theme.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-// Fix the color of the underline for the active tab
-// when on a primary backgrdound
-// Need to revist this and check if this is an issue with the Angular Material library
-@mixin app-mat-tabs-theme($theme, $app-theme) {
-  $is-dark: map-get($theme, is-dark);
-  $primary: map-get($theme, primary);
-  $tabs-ink-color: mat-color($primary);
-  @if $is-dark == true {
-    $tabs-ink-color: lighten($tabs-ink-color, 20%);
-  } @else {
-    $tabs-ink-color: darken($tabs-ink-color, 20%);
-  }
-
-  .mat-tab-nav-bar.mat-primary.mat-background-primary {
-    .mat-ink-bar {
-      //background-color: $tabs-ink-color; // TODO: RC
-    }
-
-  }
-}
diff --git a/src/frontend/packages/core/src/shared/components/no-content-message/no-content-message.component.theme.scss b/src/frontend/packages/core/src/shared/components/no-content-message/no-content-message.component.theme.scss
index 9e52da867e..502ecae635 100644
--- a/src/frontend/packages/core/src/shared/components/no-content-message/no-content-message.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/no-content-message/no-content-message.component.theme.scss
@@ -3,6 +3,6 @@
   $subdued: map-get($app-theme, subdued-color);
 
   .app-no-content-container {
-    color: $subdued; // TODO: RC $subdued contrast(?)
+    color: $subdued;
   }
 }

From e1243f2a1e19dafefa3d02b1d1acf8012e74b77f Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 8 Nov 2019 15:18:32 +0000
Subject: [PATCH 161/648] Tidying up

---
 .../sass/components/mat-snack-bar.theme.scss  |  3 --
 .../packages/core/sass/dark-theme.scss        | 29 +------------------
 .../packages/core/src/app.component.ts        |  2 +-
 .../dashboard-base.component.scss             |  1 -
 .../page-side-nav.component.theme.scss        |  2 +-
 .../profile-info/profile-info.component.html  |  8 -----
 .../meta-card-item.component.scss             |  3 --
 7 files changed, 3 insertions(+), 45 deletions(-)

diff --git a/src/frontend/packages/core/sass/components/mat-snack-bar.theme.scss b/src/frontend/packages/core/sass/components/mat-snack-bar.theme.scss
index a54bff5792..536d6434d7 100644
--- a/src/frontend/packages/core/sass/components/mat-snack-bar.theme.scss
+++ b/src/frontend/packages/core/sass/components/mat-snack-bar.theme.scss
@@ -1,6 +1,3 @@
-// Fix the color of the underline for the active tab
-// when on a primary backgrdound
-// Need to revist this and check if this is an issue with the Angular Material library
 @mixin app-mat-snack-bar-theme($theme, $app-theme) {
   $is-dark: map-get($theme, is-dark);
   $background-colors: map-get($theme, background);
diff --git a/src/frontend/packages/core/sass/dark-theme.scss b/src/frontend/packages/core/sass/dark-theme.scss
index 22c5e81f64..ee4ec386ba 100644
--- a/src/frontend/packages/core/sass/dark-theme.scss
+++ b/src/frontend/packages/core/sass/dark-theme.scss
@@ -1,34 +1,7 @@
 .dark-theme {
-  // @import '@angular/material/prebuilt-themes/deeppurple-amber.css';
-  // color: $light-primary-text;
-
-  // .mat-drawer-container {
-  //   background-color: black;
-  //   color: unset;
-  // }
-
-  // .mat-app-background {
-  //   background-color: yellow;
-  //   color: yellow;
-  // }
-
-  .dashboard {
-    // background-color: yellow;
-  }
-  
-  // $dark-primary: mat-palette($mat-yellow);
-  // Base
   $dark-primary: mat-palette($mat-blue);
   $dark-accent: mat-palette($mat-amber, A400, A100, A700);
-
-  // darker blue, links too dark
-  // $dark-primary: mat-palette($mat-indigo);
-  // $dark-accent: mat-palette($mat-blue, A400, A100, A700);
-
-
-
   $dark-warn: mat-palette($mat-red);
-  // $dark-theme: mat-dark-theme($oss-theme-primary, $oss-theme-accent, $oss-theme-warn);
   $dark-theme: mat-dark-theme($dark-primary, $dark-accent, $dark-warn);
 
   $stratos-theme: $dark-theme !default;
@@ -38,4 +11,4 @@
   @include angular-material-theme($dark-theme);
   @include app-theme($stratos-theme, $stratos-nav-theme, $stratos-status-theme);
   
-}
\ No newline at end of file
+}
diff --git a/src/frontend/packages/core/src/app.component.ts b/src/frontend/packages/core/src/app.component.ts
index f011cfd52b..5dce6095bc 100644
--- a/src/frontend/packages/core/src/app.component.ts
+++ b/src/frontend/packages/core/src/app.component.ts
@@ -11,7 +11,7 @@ import { LoggedInService } from './logged-in.service';
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
-  styleUrls: ['./app.component.scss'],
+  styleUrls: ['./app.component.scss']
 })
 export class AppComponent implements OnInit, OnDestroy, AfterContentInit {
 
diff --git a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
index 2a7eadbf3a..8c10e82191 100644
--- a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
+++ b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
@@ -3,7 +3,6 @@
 
 $app-sub-header-height: 48px;
 .dashboard {
-  // background-color: transparent;
   display: flex;
   flex-direction: column;
   height: 100%;
diff --git a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.theme.scss b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.theme.scss
index 293e52286c..d7c1ebb669 100644
--- a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.theme.scss
+++ b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.theme.scss
@@ -23,7 +23,7 @@
       }
     }
     &__item {
-      color: map-get($app-theme, subdued-color);// mat-contrast($background-color, 500);
+      color: map-get($app-theme, subdued-color);
       &--active {
         background-color: transparentize($primary-color, .9);
         color: $primary-color;
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 0a4c2df935..98117c306c 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
@@ -102,14 +102,6 @@ <h1>User Profile</h1>
                 <mat-button-toggle *ngFor="let theme of themeService.getThemes()" [value]="theme"> {{ theme.label }}
                 </mat-button-toggle>
               </mat-button-toggle-group>
-              <!-- <mat-form-field>
-                <mat-select [value]="themeService.getTheme() | async"
-                  (selectionChange)="themeService.setTheme($event.value)">
-                  <mat-option *ngFor="let theme of themeService.getThemes()" [value]="theme">
-                    {{ theme.label }}
-                  </mat-option>
-                </mat-select>
-              </mat-form-field> -->
             </div>
           </div>
         </div>
diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.scss b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.scss
index 397814ab33..7ad3af708e 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.scss
+++ b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.scss
@@ -1,6 +1,5 @@
 .meta-card-item-row,
 .meta-card-item-row-top {
-  // $text-color: rgba(0, 0, 0, .6);
   align-items: center;
   display: flex;
   justify-content: space-between;
@@ -20,8 +19,6 @@
 }
 
 .meta-card-item__key {
-  // $text-color: rgba(0, 0, 0, .6);
-  // color: $text-color;
   flex: none;
   font-weight: 300;
   padding-right: 10px;

From 91b2d881cb1f280b23809df52fd76f3d8f5e9566 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 8 Nov 2019 17:04:01 +0000
Subject: [PATCH 162/648] Fix tests

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

diff --git a/src/frontend/packages/core/test-framework/store-test-helper.ts b/src/frontend/packages/core/test-framework/store-test-helper.ts
index 0fbfec1027..054c18fd14 100644
--- a/src/frontend/packages/core/test-framework/store-test-helper.ts
+++ b/src/frontend/packages/core/test-framework/store-test-helper.ts
@@ -165,7 +165,8 @@ function getDefaultInitialTestStratosStoreState() {
       isMobile: false,
       isMobileNavOpen: false,
       sideNavPinned: false,
-      pollingEnabled: true
+      pollingEnabled: true,
+      themeKey: null
     },
     actionHistory: [],
     lists: {},

From af6d689b6b83bc3b04406061082ddc4d98e96820 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 18 Nov 2019 10:08:52 +0000
Subject: [PATCH 163/648] Rename to SUSE Stratos Console

---
 .../suse-about-info.component.html            |   4 ++--
 .../suse-login/suse-login.component.html      |   4 ++--
 .../suse-welcome/suse-welcome.component.html  |   2 +-
 custom-src/frontend/assets/nav-logo.png       | Bin 1421 -> 1475 bytes
 custom-src/stratos.yaml                       |   2 +-
 .../packages/core/src/core/core.module.ts     |   9 ++++++++-
 .../packages/core/src/core/core.types.ts      |   9 +++++++++
 .../console-uaa-wizard.component.html         |   2 +-
 .../console-uaa-wizard.component.ts           |   5 +++--
 9 files changed, 27 insertions(+), 10 deletions(-)
 create mode 100644 src/frontend/packages/core/src/core/core.types.ts

diff --git a/custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.html b/custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.html
index 65c2e980f1..a0d3105d47 100644
--- a/custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.html
+++ b/custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.html
@@ -1,8 +1,8 @@
 <mat-card class="suse-about-info__card">
-  <app-stratos-title title="Cloud Application Platform Console"></app-stratos-title>
+  <app-stratos-title title="SUSE Stratos Console"></app-stratos-title>
   <div class="suse-about-info">
     <div class="suse-about-info__version">{{ (versionNumber$ | async) }}</div>
-    <div class="suse-about-info__title">SUSE Cloud Application Platform Console provides an easy-to-use web-based UI that allows developers and administrators to
+    <div class="suse-about-info__title">SUSE Stratos Console provides an easy-to-use web-based UI that allows developers and administrators to
       manage and monitor Cloud Foundry and Kubernetes systems and workloads.</div>
   </div>
 </mat-card>
diff --git a/custom-src/frontend/app/custom/suse-login/suse-login.component.html b/custom-src/frontend/app/custom/suse-login/suse-login.component.html
index fd794c1b33..d8e7ee82f0 100644
--- a/custom-src/frontend/app/custom/suse-login/suse-login.component.html
+++ b/custom-src/frontend/app/custom/suse-login/suse-login.component.html
@@ -1,10 +1,10 @@
 <div class="suse-login" id="app-login-page">
   <div class="suse-login__header">
-    <div class="suse-login__title">SUSE Cloud Application Platform</div>
+    <div class="suse-login__title">SUSE Stratos Console</div>
   </div>
   <div class="suse-login__content" [ngClass]="{'suse-login-sso': ssoLogin}">
     <div class="suse-login__intro">
-      <h1 class="suse-login__headline">SUSE<br>Cloud Application<br>Platform</h1>
+      <h1 class="suse-login__headline">SUSE<br>Stratos<br>Console</h1>
       <p class="suse-login__tagline">Manage and monitor Cloud Foundry and Kubernetes systems and workloads.</p>
     </div>
     <div class="suse-login__box" [ngClass]="{'suse-login__busy': busy$ | async }">
diff --git a/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.html b/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.html
index 77b4aa744f..273b9da292 100644
--- a/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.html
+++ b/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.html
@@ -1,4 +1,4 @@
-<app-stratos-title title="Cloud Application Platform Console"></app-stratos-title>
+<app-stratos-title title="SUSE Stratos Console"></app-stratos-title>
 
 <div class="no-endpoints-message app-no-content-container">
   <mat-icon class="no-endpoints-message__icon">settings_ethernet</mat-icon>
diff --git a/custom-src/frontend/assets/nav-logo.png b/custom-src/frontend/assets/nav-logo.png
index 6d860e7023e527a5c93235aafac1fde1cdf33b23..10f43b4e05d3f34c2ab44a2afe6c19fe38ccb397 100644
GIT binary patch
delta 1331
zcmV-31<d-53&RU6iBL{Q4GJ0x0000DNk~Le0001x0000a2m=5B08zt3=>Px#t58f-
zMF0Q*kugt^KtPc|8Gp^MsF?r&0626~PE!Ew1t9r^ND~Umhu!M8t#dioyJ{E@;nL1z
zJ)oOkP4(u-L8X*$Ch)|vk1sQdR|3C#QYn5bcc^fhT2uf41dmBXK~z}7?U&h>nm`mq
zFN2ISiOQ&eLJLaNcIxy0UzRF|K!%sl56Q~PexRtnbg}WC#(!%1&wu`5&e4Y_2;O?}
zMt=j6DdUOksXtZ^r^|M<Xh#pE=-qJ^E^(HZ3p*;$%7L9$TmN1<JBD%7Xdor9K1ux6
z=jaH0`Jw#9n-^xIj2~Rn+$+qmB8HvkJ0kyCIgk^~g?Shex%xZ|@-q!W^N>%wsVhJi
z`}Mc6skn-xDu0TNR8h1wjJSlyD$~sbBO*yrbX*jLPV*vCD$i`G#5Rtj84bciBc_+Q
z6SPqD>n`SOWv;x1!;Wh#=n8?IMTmqsaV#v^F@&PgtU^i+Dz?zje#xz90`SuPnV!oV
z)S;T$dU>Fp&}~<tVQ0ELwGn?4n#!I=Y=B8OgtzO!Jb$B4X7D970sT+=WXXDY?g@nx
zGjUljWt~n)zX`dR5GTt>+M2nwpdpy(Qxve6ON)>?4(_ea(w>m@frOo0V3sy=@g?;3
zXtgS{HcF=kUOeReBcsF9rc*5dGn&W}_0SZIdqUOD%9((NIRnZ|NHYa?qy^SIaju8k
z03jbe#D5ylMU42O`!3XeyxU{`U8v)Yer*vf7K;&@mk?c07=}@dV@j2FrNbW}WTRt!
zMM?I)0Z&#+FCx#f!@&7Yh?0%7W#+t38}%h5B{?96?4o&LPfTm~$q1D#<OY6<hzL5p
z*j?CT?|Iml22aJ_Xqm@(85#E*8U_<u7-!-}m49K3_99Wle#LQV02v;P0SL4KWO2h2
z&4T$y=!B*gu%(e9I>2W3$Ar3;EomAecPf*I>CkT(Lu!?n_eb5W+&5yx?u_SWC9$8m
ztCf4;Gk3L9*?3;vFL76l_!FT%p6ELAfN|2&;SDKuxMfq+HoN7`)+gyoBr1;ltyk$0
zO@A+w<8h*r7^joaerHj-=@l^&ong`M5}{)gsl=E$xwycIx>VQsF|~D?rCDt^X5bP5
zfkgBUpB(6AIgzN<&Bm^?^^CsYofs3;w!Qt_ixHU_1alb`9eXcE&CW)w2{A2Ex1{-5
zBN8^7Qo9RTSP)4hHd&=nYvI%hDW3{aM}Mu5+mF!hwH>h^A6o#4P}o@Ag%Xsz8S5qj
zVw~{N2}RfI^s`^C5RBQ6U#@$UbSJ=l{SPPvz0D`8!-N!XQ}_}skvvulJE7osbcSs|
zRB<NlVuk$$Jv{iftHXb7A?FXFgbM{!$+wCLQJk2t)jiUOP|yjPVd&EU0u*Y0K7V6z
z?9XFZk9x!7LTZso1dpf|3??KJtv2wl@{wN@AsL#X4lTfD*-cjhYO!BebBxrfDv>YS
zk|d2_5y9jhW8N}Vo7HeA#5*fC*`5iFR8?g{dp-<e3xxhoBNDGs4UB#$`-1#&Ol6{D
z20$LiM9BH(UuHsbT7Ajc1DymJKzQ~+Oh`|XM4Mp31{%iH>;4T2XFrwqfglJWkyg$H
zp>~N#@QCSqLPQoT6%m^$?4mh;mW#ld+4q5l^0rt9<2+3E(y!Y()t>5y`yk$%dN|xm
puO|?v&yhpoWBAX1{sj&+l&^w*tk^$hZZZG>002ovPDHLkV1i8ZaUlQz

delta 1325
zcmV+|1=9M%3yljbiBL{Q4GJ0x0000DNk~Le0002A0000a2m=5B02g)OLjV8(dr(YN
zMF0Q*kug*P^7fH2B7YUx%@F_q04Q`)PE!D3AQs>@XIs#3`&6HY48KdoFUfbcfRe93
z^X`oX=Q}65s+b(w)}>5LII;i$1er-hK~z}7?U#$PlQ0lKH&B`a<<S;sfl~T*|Njf!
z2eAS=IyzPzJ>v)so6UhNHv#@yI{43jzCpj-SFsOZjB!nY*?%YY%xAtaIUPJ>dhl!<
z$ALfUY^~L!TubTf%xAR+;4;3BUYs25T~6=DaDL-RUCh=dM-yl_YkgJN!Wi!ZGL3;1
zqVJl7iq3PyJ@@BdOB9|(_qt*FEq(_SK7fn5+`&WK0Hc|^Dw2^xAZ~~y9nj(JBvE=q
z;pXeb107<-5PwFb4|Kyh>2!euYmq*xbm4R~m2yS7DV5ePE^0TH*4U_}wv@(bSadFZ
zK|wnrvHX(snzHu*A^AD!57Z?9u;gx7I#KD6b(WnU@Ay6xpEM8$=>Yl`7aUcAUy{Q}
zn#XQz2mO_6D8wilvMi_%A<_lnA_u7HN21cv7o<~acYg)rq$3_*Ma!wQ;i7Hu0ZK(z
z`HD(&ib$ko`h&6bMFW*5mL;~`M4AJwRvkAYo=9OX9Ux{fmOdly+zp-P(!>Ta1pyI(
z@~iZ*C}|9ix?Hb_?W8<f*Gu0NYbo1QI>H8o2lt?CG*mv5riKp_>6#0ZkzodD`?>VN
z&5q?t&wnWIr<!ihpK98UrG0(`3P(3x*WhL%O))EAIB5@b_W>fBsq~q`Cel6*v+wb>
zS_eKlX`S2X)ALBG4~Usa@5;SNL8LG1!h`vf_CfI?+!;ff!Q@GwTnwE6aN>k=jHR`J
zW2qBOtsT^Dk9Y%5i{(aPPC9fh0XlrGX+~?Bn14!_!~5$4n<%%5w2N6vPx)_wIFl~;
zx#Y_Xb531^VOU#gD(jrfk_Kp~HQz^wGVyC$ZRm0hOi5=ef(HMpbV#W5Hlpr%evC}l
zVw({SM(J2O;2X*7qYR<a@m%`#2ezfuLIP_Xu=)yWGwUdkaWATr$(EYFBCVu4hXpE4
zA%EGl=El-4Mgw$`uM=q<q~%06cu7MnD^51NZ6~*kiS#L}NMI<Ry_@~;JES4l@f~Nn
zj_3>ZoJd2zkwrHLLf<!Eq-WgoGfeR7AO(l#uKzS?5Om*;seSm*e|{K4o8MgCxZapg
zWgHu;ElLkYkz%XETNS4;**aTmrOi?p{C{F1WKNar_q^9SiGj2z>j0IQlruSNm+;y;
zd%6Y`{8FQA!G0|fD&}+PJ&S%>x<^OB(#nISb>mdLNqX2ey`<9?BaHlEdunvS-gkuj
zO}=g+Ww(H(t$apoMH+j6$J?ZR#EX;G%|$`~Cem)Zaq5Q2s6<*e)wN0=xH_(Hk$(=8
zh817ZD}3-eHI`mv1XyQZyRCC_p!-N!nzHZ>RBx;43`E-b6uc43N74e9Z0MHgr>p5z
z0I(2S3STF0k=`7R<oA-klC+_r%kh&g3CP_?Lr!|~q%$rKk=D<n`aRO1IO%(YO61LJ
z`i{fKh+K`-w0zE~bS9g{cS{$>m~t%*x}x%ZA|`WbR*J%{-Ec*TG*3*T(iV9Se|)dB
zkeskd^?{$dxin;`oC1}WmFO<g(6I0RH%LF-cWuc=b7=@$S#Nw8q}g&s(hb0o_s2Ju
j{`0u!f1=fY{&hYAa_iPiV>4sN00000NkvXXu0mjf12uSb

diff --git a/custom-src/stratos.yaml b/custom-src/stratos.yaml
index 18a11e7386..b45c0ea693 100644
--- a/custom-src/stratos.yaml
+++ b/custom-src/stratos.yaml
@@ -1,2 +1,2 @@
-title: SUSE CAP
+title: SUSE Stratos Console
 productVersion: 1.5.1
diff --git a/src/frontend/packages/core/src/core/core.module.ts b/src/frontend/packages/core/src/core/core.module.ts
index c331367ea5..55ee00e65f 100644
--- a/src/frontend/packages/core/src/core/core.module.ts
+++ b/src/frontend/packages/core/src/core/core.module.ts
@@ -1,3 +1,4 @@
+import { APP_TITLE, appTitleFactory } from './core.types';
 import { PortalModule } from '@angular/cdk/portal';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -30,6 +31,7 @@ import { TruncatePipe } from './truncate.pipe';
 import { UserService } from './user.service';
 import { UtilsService } from './utils.service';
 import { WindowRef } from './window-ref/window-ref.service';
+import { Title } from '@angular/platform-browser';
 
 @NgModule({
   imports: [
@@ -72,7 +74,12 @@ import { WindowRef } from './window-ref/window-ref.service';
     EndpointsService,
     UserService,
     EntityServiceFactory,
-    CurrentUserPermissionsService
+    CurrentUserPermissionsService,
+    {
+      provide: APP_TITLE,
+      useFactory: appTitleFactory,
+      deps: [Title]
+    }
   ],
   declarations: [
     StatefulIconComponent,
diff --git a/src/frontend/packages/core/src/core/core.types.ts b/src/frontend/packages/core/src/core/core.types.ts
new file mode 100644
index 0000000000..f522d660b1
--- /dev/null
+++ b/src/frontend/packages/core/src/core/core.types.ts
@@ -0,0 +1,9 @@
+import { InjectionToken } from '@angular/core';
+
+import { Title } from '@angular/platform-browser';
+
+export const APP_TITLE = new InjectionToken<string>('appTitle');
+
+export const appTitleFactory = (titleService: Title) => {
+  return titleService.getTitle();
+};
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.html b/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.html
index 13333b5ec2..aa8d76dd39 100644
--- a/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.html
+++ b/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.html
@@ -1,6 +1,6 @@
 <div class="page-container">
   <app-page-header hideMenu="true" [showHistory]="false">
-    <h1>Stratos Setup</h1>
+    <h1>{{title}} Setup</h1>
   </app-page-header>
   <app-show-page-header></app-show-page-header>
   <div class="uaa-wizard">
diff --git a/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.ts b/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.ts
index fdcccaad5a..bd8611f2ea 100644
--- a/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.ts
+++ b/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, ViewEncapsulation } from '@angular/core';
+import { Component, OnInit, ViewEncapsulation, Inject } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { Router } from '@angular/router';
 import { Store } from '@ngrx/store';
@@ -11,6 +11,7 @@ import { AppState } from '../../../../../store/src/app-state';
 import { AuthState } from '../../../../../store/src/reducers/auth.reducer';
 import { UAASetupState } from '../../../../../store/src/types/uaa-setup.types';
 import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component';
+import { APP_TITLE } from '../../../core/core.types';
 
 @Component({
   selector: 'app-console-uaa-wizard',
@@ -22,7 +23,7 @@ export class ConsoleUaaWizardComponent implements OnInit {
 
   private clientRedirectURI: string;
 
-  constructor(private store: Store<AppState>, private router: Router) {
+  constructor(private store: Store<AppState>, private router: Router, @Inject(APP_TITLE) public title: string) {
     // Client Redirect URI for SSO
     this.clientRedirectURI = window.location.protocol + '//' + window.location.hostname +
       (window.location.port ? ':' + window.location.port : '') + '/pp/v1/auth/sso_login_callback';

From 27c77f68a506964518c8fbd77505b11373e03753 Mon Sep 17 00:00:00 2001
From: Nathan Jones <njones@suse.com>
Date: Thu, 21 Nov 2019 13:25:00 +0000
Subject: [PATCH 164/648] WIP Fixes after angular migration in SUSE repo

---
 .../chart-details-readme.component.ts             |  2 +-
 .../list-filters/list-filters.component.scss      |  6 +++---
 .../monocular/shared/services/charts.service.ts   | 15 ++++++++-------
 .../monocular/shared/services/repos.service.ts    |  9 ++++-----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts
index eb62b9eff1..50ffa840a5 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts
@@ -33,7 +33,7 @@ export class ChartDetailsReadmeComponent {
     return this.chartsService.getChartReadme(currentVersion).pipe(
       map(resp => {
         this.loading = false;
-        return markdown(resp.text(), {
+        return markdown(resp, {
           renderer: this.renderer
         });
       }),
diff --git a/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.scss b/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.scss
index e6aa8db10e..4eb1198dc9 100644
--- a/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.scss
+++ b/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.scss
@@ -1,9 +1,9 @@
-@import '../../theme.scss';
+@import '../../theme';
 
 .list-filters {
-  width: 100%;
-  height: 100%;
   flex: 1;
+  height: 100%;
+  width: 100%;
 
   &_section {
     margin-bottom: 40px;
diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/services/charts.service.ts b/custom-src/frontend/app/custom/helm/monocular/shared/services/charts.service.ts
index d0ee358671..4d451ace4f 100644
--- a/custom-src/frontend/app/custom/helm/monocular/shared/services/charts.service.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/shared/services/charts.service.ts
@@ -1,5 +1,4 @@
 import { Injectable } from '@angular/core';
-import { Http, Response } from '@angular/http';
 import { Observable, throwError } from 'rxjs';
 import { catchError, map, tap } from 'rxjs/operators';
 
@@ -7,6 +6,7 @@ import { LoggerService } from '../../../../../core/logger.service';
 import { Chart } from '../models/chart';
 import { ChartVersion } from '../models/chart-version';
 import { ConfigService } from './config.service';
+import { HttpClient } from '@angular/common/http';
 
 
 
@@ -17,7 +17,7 @@ export class ChartsService {
   cacheCharts: any;
 
   constructor(
-    private http: Http,
+    private http: HttpClient,
     config: ConfigService,
     private loggerService: LoggerService
   ) {
@@ -104,8 +104,10 @@ export class ChartsService {
    * @param version Chart version
    * @return An observable that will be a chartReadme
    */
-  getChartReadme(chartVersion: ChartVersion): Observable<Response> {
-    return this.http.get(`${this.hostname}${chartVersion.attributes.readme}`);
+  getChartReadme(chartVersion: ChartVersion): Observable<string> {
+    return this.http.get(`${this.hostname}${chartVersion.attributes.readme}`, {
+      responseType: 'text'
+    });
   }
   /**
    * Get chart versions using the API
@@ -160,9 +162,8 @@ export class ChartsService {
   }
 
 
-  private extractData(res: Response) {
-    const body = res.json();
-    return body.data || {};
+  private extractData(res: { data: any }) {
+    return res.data || {};
   }
 
   private handleError(error: any) {
diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/services/repos.service.ts b/custom-src/frontend/app/custom/helm/monocular/shared/services/repos.service.ts
index aaf8bde894..05c62d4942 100644
--- a/custom-src/frontend/app/custom/helm/monocular/shared/services/repos.service.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/shared/services/repos.service.ts
@@ -1,11 +1,11 @@
 import { Injectable } from '@angular/core';
-import { Http, Response } from '@angular/http';
 import { Observable, throwError } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 
 import { LoggerService } from '../../../../../core/logger.service';
 import { RepoAttributes } from '../models/repo';
 import { ConfigService } from './config.service';
+import { HttpClient } from '@angular/common/http';
 
 
 
@@ -15,7 +15,7 @@ export class ReposService {
   hostname: string;
 
   constructor(
-    private http: Http,
+    private http: HttpClient,
     private config: ConfigService,
     private loggerService: LoggerService
   ) {
@@ -34,9 +34,8 @@ export class ReposService {
     );
   }
 
-  private extractData(res: Response) {
-    const body = res.json();
-    return body.data || {};
+  private extractData(res: { data: any }) {
+    return res.data || {};
   }
 
   private handleError(error: any) {

From d3f12b9fe0a1f962702c4918e8c20a0cb8b8863e Mon Sep 17 00:00:00 2001
From: Nathan Jones <njones@suse.com>
Date: Thu, 21 Nov 2019 13:25:41 +0000
Subject: [PATCH 165/648] Atempting to fix symlinks

---
 src/tsconfig.json     |  3 +++
 src/tsconfig.lib.json | 10 +++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/tsconfig.json b/src/tsconfig.json
index fd9d1df9b1..af80e6e50e 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -1,6 +1,9 @@
 {
   "compileOnSave": false,
   "preserveWhitespaces": "off",
+  "angularCompilerOptions": {
+    "preserveSymlinks": true
+  },
   "compilerOptions": {
     "outDir": "./dist/out-tsc",
     "sourceMap": true,
diff --git a/src/tsconfig.lib.json b/src/tsconfig.lib.json
index 40ca21db99..8a6cad0f4b 100644
--- a/src/tsconfig.lib.json
+++ b/src/tsconfig.lib.json
@@ -12,7 +12,10 @@
     "experimentalDecorators": true,
     "importHelpers": true,
     "types": [],
-    "lib": ["dom", "es2015"]
+    "lib": [
+      "dom",
+      "es2015"
+    ]
   },
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
@@ -20,6 +23,7 @@
     "strictMetadataEmit": true,
     "fullTemplateTypeCheck": true,
     "strictInjectionParameters": true,
-    "enableResourceInlining": true
+    "enableResourceInlining": true,
+    "preserveSymlinks": true,
   }
-}
+}
\ No newline at end of file

From 2db0030de0d2070ffa76ae65b8a39c4eb293f9ad Mon Sep 17 00:00:00 2001
From: Nathan Jones <njones@suse.com>
Date: Thu, 21 Nov 2019 13:39:44 +0000
Subject: [PATCH 166/648] Migrating old angular 7 code

---
 .../custom/helm/create-release/create-release.component.ts  | 6 +++---
 .../kubernetes-dashboard/kubernetes-dashboard.component.ts  | 2 +-
 2 files changed, 4 insertions(+), 4 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 415e8b25a6..cbd16ec8f1 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
@@ -42,9 +42,9 @@ export class CreateReleaseComponent implements OnInit {
   details: FormGroup;
   overrides: FormGroup;
 
-  @ViewChild('releaseNameInputField') releaseNameInputField: ElementRef;
-  @ViewChild('overridesYamlTextArea') overridesYamlTextArea: ElementRef;
-  @ViewChild(MatTextareaAutosize) overridesYamlAutosize: MatTextareaAutosize;
+  @ViewChild('releaseNameInputField', { static: true }) releaseNameInputField: ElementRef;
+  @ViewChild('overridesYamlTextArea', { static: true }) overridesYamlTextArea: ElementRef;
+  @ViewChild(MatTextareaAutosize, { static: false }) overridesYamlAutosize: MatTextareaAutosize;
 
   public valuesYaml = '';
 
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
index c6a9049a49..9ab6fd93a1 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
@@ -32,7 +32,7 @@ import { KubernetesService } from '../services/kubernetes.service';
 export class KubernetesDashboardTabComponent implements OnInit {
 
   private pKubeDash: ElementRef;
-  @ViewChild('kubeDash', { read: ElementRef }) set kubeDash(kubeDash: ElementRef) {
+  @ViewChild('kubeDash', { read: ElementRef, static: true }) set kubeDash(kubeDash: ElementRef) {
     if (!this.pKubeDash) {
       this.pKubeDash = kubeDash;
       // Need to look at this process again. In tests this is never hit, leading to null references to kubeDash

From 79418f5a51479ba4d5d70dff41a4e32c9184d445 Mon Sep 17 00:00:00 2001
From: Nathan Jones <njones@suse.com>
Date: Thu, 21 Nov 2019 15:02:49 +0000
Subject: [PATCH 167/648] Fixed merge issues

---
 custom-src/frontend/app/custom/helm/helm-testing.module.ts   | 5 ++---
 .../monocular/chart-details/chart-details.component.scss     | 4 ++--
 .../helm/monocular/chart-item/chart-item.component.scss      | 2 +-
 .../helm/monocular/list-filters/list-filters.component.scss  | 4 ++--
 .../custom/helm/monocular/shared/services/charts.service.ts  | 4 ++--
 .../app/custom/kubernetes/kubernetes.testing.module.ts       | 4 ++--
 .../frontend/app/custom/kubernetes/store/kube.types.ts       | 2 +-
 7 files changed, 12 insertions(+), 13 deletions(-)

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 25b9f6cdb9..3b1f6d3813 100644
--- a/custom-src/frontend/app/custom/helm/helm-testing.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm-testing.module.ts
@@ -1,6 +1,5 @@
-import { HttpClient, HttpHandler } from '@angular/common/http';
+import { HttpClient, HttpHandler, HttpClientModule } from '@angular/common/http';
 import { NgModule } from '@angular/core';
-import { HttpModule } from '@angular/http';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
@@ -60,7 +59,7 @@ export const HelmBaseTestModules = [
   CoreModule,
   createBasicStoreModule(),
   NoopAnimationsModule,
-  HttpModule,
+  HttpClientModule,
   SharedModule
 ];
 
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.scss b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.scss
index 5712d21a9e..918a6d6511 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.scss
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.scss
@@ -49,10 +49,10 @@ $icon-height: 150px;
       }
 
       &__repo {
-        color: md-color($monocular-app-accent);
+        color: mat-color($monocular-app-accent, 500);
 
         &.repo-incubator {
-          color: md-color($monocular-app-warn, 600);
+          color: mat-color($monocular-app-warn, 600);
         }
 
         a {
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.scss b/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.scss
index c37186d500..0c06d1a026 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.scss
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.scss
@@ -31,7 +31,7 @@ $chart-item-logo-width: 80px;
     // Remove this when chips are ready:
     // https://github.com/angular/material2/issues/120
     &__repo {
-      color: mat-color($monocular-app-accent);
+      color: mat-color($monocular-app-accent, 500);
       font-size: .8em;
       padding: 2px 4px;
       border-radius: 4px;
diff --git a/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.scss b/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.scss
index 4eb1198dc9..fab52a4a76 100644
--- a/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.scss
+++ b/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.scss
@@ -1,4 +1,4 @@
-@import '../../theme';
+@import '../../theme.scss';
 
 .list-filters {
   flex: 1;
@@ -19,7 +19,7 @@
       opacity: 0.5;
       &.active {
         opacity: 1;
-        color: md-color($monocular-app-primary);
+        color: mat-color($monocular-app-primary);
       }
     }
   }
diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/services/charts.service.ts b/custom-src/frontend/app/custom/helm/monocular/shared/services/charts.service.ts
index 4d451ace4f..28f5045b73 100644
--- a/custom-src/frontend/app/custom/helm/monocular/shared/services/charts.service.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/shared/services/charts.service.ts
@@ -48,7 +48,7 @@ export class ChartsService {
         observer.next(this.cacheCharts[repo]);
       });
     } else {
-      return this.http.get(url).pipe(
+      return this.http.get<{ data: any }>(url).pipe(
         map(r => this.extractData(r)),
         tap((data) => this.storeCache(data, repo)),
         catchError(this.handleError)
@@ -117,7 +117,7 @@ export class ChartsService {
    * @return An observable containing an array of ChartVersions
    */
   getVersions(repo: string, chartName: string): Observable<ChartVersion[]> {
-    return this.http.get(`${this.hostname}/v1/charts/${repo}/${chartName}/versions`).pipe(
+    return this.http.get<{ data: any }>(`${this.hostname}/v1/charts/${repo}/${chartName}/versions`).pipe(
       map(m => this.extractData(m)),
       catchError(this.handleError)
     );
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 f3a72f9d74..10606f0728 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
@@ -1,5 +1,4 @@
 import { NgModule } from '@angular/core';
-import { HttpModule } from '@angular/http';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 
@@ -10,6 +9,7 @@ import { CATALOGUE_ENTITIES, EntityCatalogueFeatureModule } from '../../core/ent
 import { entityCatalogue, TestEntityCatalogue } from '../../core/entity-catalogue/entity-catalogue.service';
 import { SharedModule } from '../../shared/shared.module';
 import { generateKubernetesEntities } from './kubernetes-entity-generator';
+import { HttpClientModule } from '@angular/common/http';
 
 @NgModule({
   imports: [{
@@ -36,6 +36,6 @@ export const KubernetesBaseTestModules = [
   CoreModule,
   createBasicStoreModule(),
   NoopAnimationsModule,
-  HttpModule,
+  HttpClientModule,
   SharedModule,
 ];
diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
index db04efe87c..5592eb92a0 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
@@ -268,7 +268,7 @@ export interface PodSpec {
   tolerations?: Toleration[];
   hostNetwork?: boolean;
   initContainers: InitContainer[];
-  nodeSelector?: NodeSelector;
+  // nodeSelector?: NodeSelector;
 }
 export interface InitContainer {
   name: string;

From 3bca4212b727eea97f1425779346b9292a4d57a5 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 22 Nov 2019 10:32:55 +0000
Subject: [PATCH 168/648] Fix backend build

---
 src/jetstream/plugins/kubernetes/go.mod | 3 +--
 src/jetstream/plugins/monocular/go.mod  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/go.mod b/src/jetstream/plugins/kubernetes/go.mod
index 5393fae8ef..c8bfd538e3 100644
--- a/src/jetstream/plugins/kubernetes/go.mod
+++ b/src/jetstream/plugins/kubernetes/go.mod
@@ -10,7 +10,6 @@ require (
 	github.com/SermoDigital/jose v0.9.1
 	github.com/aws/aws-sdk-go v1.17.5
 	github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 // indirect
-	github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces v0.0.0-00010101000000-000000000000
 	github.com/cyphar/filepath-securejoin v0.2.2 // indirect
 	github.com/docker/distribution v2.7.1+incompatible // indirect
 	github.com/docker/docker v1.13.1 // indirect
@@ -75,7 +74,7 @@ require (
 
 replace (
 	github.com/SermoDigital/jose => github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc
-	github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces => ../../repository/interfaces
+	github.com/cloudfoundry-incubator/stratos/src/jetstream => ../..
 	github.com/helm/monocular/chartsvc => ../monocular/chartsvc
 	github.com/kubernetes-sigs/aws-iam-authenticator => github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc
 	github.com/russross/blackfriday v2.0.0+incompatible => github.com/russross/blackfriday v1.5.2
diff --git a/src/jetstream/plugins/monocular/go.mod b/src/jetstream/plugins/monocular/go.mod
index c1ab22d72c..df993a48ac 100644
--- a/src/jetstream/plugins/monocular/go.mod
+++ b/src/jetstream/plugins/monocular/go.mod
@@ -4,7 +4,6 @@ go 1.12
 
 require (
 	bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c
-	github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces v0.0.0-00010101000000-000000000000
 	github.com/go-sql-driver/mysql v1.4.1 // indirect
 	github.com/helm/monocular v1.4.0
 	github.com/helm/monocular/chartrepo v0.0.0-00010101000000-000000000000
@@ -20,7 +19,7 @@ require (
 )
 
 replace (
-	github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces => ../../repository/interfaces
+	github.com/cloudfoundry-incubator/stratos/src/jetstream => ../..
 	github.com/helm/monocular/chartrepo => ./chart-repo
 	github.com/helm/monocular/chartsvc => ./chartsvc
 )

From 4af77eee7d9c958c1365f98767b69b90005494ee Mon Sep 17 00:00:00 2001
From: Nathan Jones <njones@suse.com>
Date: Fri, 22 Nov 2019 15:14:52 +0000
Subject: [PATCH 169/648] FE Unit test fixes

---
 .../create-release/create-release.component.spec.ts  | 12 ++++--------
 .../chart-details/chart-details.component.spec.ts    |  5 ++---
 .../chart-item/chart-item.component.spec.ts          |  6 ++++--
 .../helm/monocular/charts/charts.component.spec.ts   |  6 ++++--
 .../services/cloud-foundry-endpoint.service.ts       |  2 --
 5 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.spec.ts b/custom-src/frontend/app/custom/helm/create-release/create-release.component.spec.ts
index 552d5d7bad..a2e77432d6 100644
--- a/custom-src/frontend/app/custom/helm/create-release/create-release.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/create-release/create-release.component.spec.ts
@@ -1,7 +1,5 @@
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+// import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ConnectionBackend, Http } from '@angular/http';
-import { MockBackend } from '@angular/http/testing';
 
 import { TabNavService } from '../../../../tab-nav.service';
 import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service';
@@ -10,6 +8,8 @@ import { InternalEventMonitorFactory } from '../../../shared/monitors/internal-e
 import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory';
 import { KubernetesBaseTestModules } from '../../kubernetes/kubernetes.testing.module';
 import { CreateReleaseComponent } from './create-release.component';
+import { HttpClient } from '@angular/common/http';
+import { HttpTestingController, HttpClientTestingModule } from '@angular/common/http/testing';
 
 describe('CreateReleaseComponent', () => {
   let component: CreateReleaseComponent;
@@ -26,11 +26,7 @@ describe('CreateReleaseComponent', () => {
         HttpClientTestingModule,
       ],
       providers: [
-        Http,
-        {
-          provide: ConnectionBackend,
-          useClass: MockBackend
-        },
+        HttpClient,
         PaginationMonitorFactory,
         EntityMonitorFactory,
         InternalEventMonitorFactory,
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 993367ce75..612000add8 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,8 +1,7 @@
 import 'hammerjs';
 
-import { HttpClientModule } from '@angular/common/http';
+import { HttpClientModule, HttpClient } from '@angular/common/http';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { HttpModule } from '@angular/http';
 import { BrowserModule } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 
@@ -91,7 +90,6 @@ describe('ChartDetailsComponent', () => {
           BrowserModule,
           // Angulartics2Module,
           RouterTestingModule,
-          HttpModule,
           HttpClientModule,
           ...BaseTestModulesNoShared
         ],
@@ -110,6 +108,7 @@ describe('ChartDetailsComponent', () => {
           EntitySummaryTitleComponent
         ],
         providers: [
+          HttpClient,
           { provide: ChartsService, useValue: new MockChartService() },
           { provide: ConfigService, useValue: { appName: 'appName' } },
           // { provide: SeoService },
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.spec.ts
index 96fdb980c6..efff405e57 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.spec.ts
@@ -1,23 +1,25 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
-import { HttpModule } from '@angular/http';
 
 import { createBasicStoreModule } from '../../../../../test-framework/store-test-helper';
 import { LoggerService } from '../../../../core/logger.service';
 import { ChartsService } from '../shared/services/charts.service';
 import { ConfigService } from '../shared/services/config.service';
 import { ChartItemComponent } from './chart-item.component';
+import { HttpClient } from '@angular/common/http';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
 
 
 describe('Component: ChartItem', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [
-        HttpModule,
+        HttpClientTestingModule,
         createBasicStoreModule()
       ],
       declarations: [ChartItemComponent],
       providers: [
+        HttpClient,
         ConfigService,
         ChartsService,
         LoggerService
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 186ad62f4b..a6b61a8e65 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
@@ -1,6 +1,5 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
-import { HttpModule } from '@angular/http';
 import { ActivatedRoute, Router } from '@angular/router';
 
 import { createBasicStoreModule } from '../../../../../test-framework/store-test-helper';
@@ -15,6 +14,8 @@ import { ConfigService } from '../shared/services/config.service';
 import { MenuService } from '../shared/services/menu.service';
 import { ReposService } from '../shared/services/repos.service';
 import { ChartsComponent } from './charts.component';
+import { HttpClient } from '@angular/common/http';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
 
 // import { HeaderBarComponent } from '../header-bar/header-bar.component';
 // import { SeoService } from '../shared/services/seo.service';
@@ -22,7 +23,7 @@ describe('Component: Charts', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [
-        HttpModule,
+        HttpClientTestingModule,
         createBasicStoreModule()
       ],
       declarations: [
@@ -34,6 +35,7 @@ describe('Component: Charts', () => {
         // HeaderBarComponent
       ],
       providers: [
+        HttpClient,
         ConfigService,
         MenuService,
         { provide: ChartsService, useValue: new MockChartService() },
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 20d3bffaa7..0dc2f48391 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
@@ -59,10 +59,8 @@ export function appDataSort(app1: APIResource<IApp>, app2: APIResource<IApp>): n
   return 0;
 }
 
-
 @Injectable()
 export class CloudFoundryEndpointService {
-
   hasSSHAccess$: Observable<boolean>;
   totalMem$: Observable<number>;
   paginationSubscription: any;

From 8777f9a6a88c40fe8c0f1f932231d874ce4dca2e Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 25 Nov 2019 13:47:46 +0000
Subject: [PATCH 170/648] WIP

---
 .../app/custom/custom-routing.module.ts       |    2 +
 .../app/custom/helm/helm-entity-factory.ts    |    9 +
 .../app/custom/helm/helm-entity-generator.ts  |   13 +
 .../frontend/app/custom/helm/helm.module.ts   |   10 +-
 .../frontend/app/custom/helm/helm.routing.ts  |    7 +-
 .../app/custom/helm/helm.store.module.ts      |    5 +-
 .../helm-release-service-card.component.html  |    8 +-
 .../helm-service-ports.component.ts           |    3 +-
 ...ocular-release-pods-list-config.service.ts |   26 +-
 .../monocular-release-pods-list-source.ts     |    5 +-
 .../monocular-release-services-list-source.ts |   27 +-
 .../monocular-releases-list-config.service.ts |    2 +-
 .../helm-release-tab-base.component.ts        |  188 +-
 .../tabs/helm-release-helper.service.ts       |  116 +-
 .../helm-release-notes-tab.component.scss     |    2 +-
 .../helm-release-notes-tab.component.ts       |    4 +-
 ...helm-release-resource-graph.component.html |   20 +
 ...helm-release-resource-graph.component.scss |    5 +
 ...m-release-resource-graph.component.spec.ts |   25 +
 .../helm-release-resource-graph.component.ts  |   46 +
 .../helm-release-summary-tab.component.html   |    8 +-
 .../helm-release-summary-tab.component.ts     |   86 +-
 .../helm-release-values-tab.component.html    |    5 +-
 .../helm-release-values-tab.component.ts      |    8 +-
 .../app/custom/helm/store/helm.actions.ts     |   48 +-
 .../app/custom/helm/store/helm.effects.ts     |   27 +-
 .../app/custom/helm/store/helm.reducers.ts    |   15 +
 .../app/custom/helm/store/helm.types.ts       |   15 +-
 .../custom/kubernetes/kubernetes.module.ts    |   12 +-
 .../kubernetes-pod-readiness.component.html   |    1 +
 .../kubernetes-pod-readiness.component.scss   |    0
 ...kubernetes-pod-readiness.component.spec.ts |   25 +
 .../kubernetes-pod-readiness.component.ts     |   21 +
 .../kubernetes-pod-status.component.html      |    1 +
 .../kubernetes-pod-status.component.scss      |    7 +
 .../kubernetes-pod-status.component.spec.ts   |   25 +
 .../kubernetes-pod-status.component.ts        |   30 +
 .../app/custom/kubernetes/store/kube.types.ts |    1 +
 go.mod                                        |    6 +
 go.sum                                        |  115 +
 package-lock.json                             | 5831 +++++++++--------
 package.json                                  |    6 +-
 .../sass/components/text-status.theme.scss    |   18 +
 .../dashboard-base.component.scss             |    1 -
 .../page-side-nav.component.html              |    3 +-
 .../page-side-nav.component.scss              |   14 +
 .../packages/core/src/route-reuse-stragegy.ts |   10 +-
 .../local-list-controller.ts                  |    7 +-
 .../page-header/page-header.component.ts      |    3 +-
 .../src/shared/monitors/pagination-monitor.ts |    2 +
 src/jetstream/go.mod                          |   12 +-
 src/jetstream/go.sum                          |   85 +
 src/jetstream/plugins/kubernetes/go.mod       |   36 +-
 src/jetstream/plugins/kubernetes/go.sum       |  259 +-
 .../plugins/kubernetes/helm/release.go        |  378 ++
 .../plugins/kubernetes/helm/release_graph.go  |   77 +
 .../plugins/kubernetes/helm/release_test.go   |   29 +
 .../plugins/kubernetes/helm_client.go         |  231 +-
 .../plugins/kubernetes/install_release.go     |    8 +-
 .../plugins/kubernetes/kube_dashboard.go      |   25 +-
 .../plugins/kubernetes/list_releases.go       |  208 +-
 61 files changed, 4851 insertions(+), 3371 deletions(-)
 create mode 100644 custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
 create mode 100644 custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss
 create mode 100644 custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
 create mode 100644 custom-src/frontend/app/custom/helm/store/helm.reducers.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.html
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.scss
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.scss
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
 create mode 100644 src/jetstream/plugins/kubernetes/helm/release.go
 create mode 100644 src/jetstream/plugins/kubernetes/helm/release_graph.go
 create mode 100644 src/jetstream/plugins/kubernetes/helm/release_test.go

diff --git a/custom-src/frontend/app/custom/custom-routing.module.ts b/custom-src/frontend/app/custom/custom-routing.module.ts
index 3a6afdf3a0..42231973be 100644
--- a/custom-src/frontend/app/custom/custom-routing.module.ts
+++ b/custom-src/frontend/app/custom/custom-routing.module.ts
@@ -1,3 +1,4 @@
+import { DashboardBaseComponent } from './../features/dashboard/dashboard-base/dashboard-base.component';
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
@@ -22,6 +23,7 @@ const kubernetes: Routes = [
     path: 'monocular',
     loadChildren: './helm/helm.module#HelmModule',
     data: {
+      reuseRoute: true,
       stratosNavigation: {
         text: 'Helm',
         matIcon: 'helm',
diff --git a/custom-src/frontend/app/custom/helm/helm-entity-factory.ts b/custom-src/frontend/app/custom/helm/helm-entity-factory.ts
index 6ac3ac46f4..d3b132757a 100644
--- a/custom-src/frontend/app/custom/helm/helm-entity-factory.ts
+++ b/custom-src/frontend/app/custom/helm/helm-entity-factory.ts
@@ -8,6 +8,7 @@ import {
   HelmReleaseStatus,
   HelmVersion,
   MonocularChart,
+  HelmReleaseGraph,
 } from './store/helm.types';
 
 export const monocularChartsEntityType = 'monocularCharts';
@@ -17,6 +18,7 @@ export const helmVersionsEntityType = 'helmVersions';
 export const helmReleaseStatusEntityType = 'helmReleaseStatus';
 export const helmReleasePodEntityType = 'helmReleasePod';
 export const helmReleaseServiceEntityType = 'helmReleaseService';
+export const helmReleaseGraphEntityType = 'helmReleaseGraph';
 
 export const getMonocularChartId = (entity: MonocularChart) => entity.id;
 export const getHelmReleaseId = (entity: HelmRelease) => entity.endpointId;
@@ -24,6 +26,7 @@ export const getHelmVersionId = (entity: HelmVersion) => entity.endpointId;
 export const getHelmReleaseStatusId = (entity: HelmReleaseStatus) => entity.endpointId;
 export const getHelmReleasePodId = (entity: HelmReleasePod) => entity.name;
 export const getHelmReleaseServiceId = (entity: HelmReleaseService) => entity.name;
+export const getHelmReleaseGraphId = (entity: HelmReleaseGraph) => entity.endpointId;
 
 export const HELM_ENDPOINT_TYPE = 'helm';
 
@@ -85,6 +88,12 @@ entityCache[helmReleaseServiceEntityType] = new HelmEntitySchema(
   { idAttribute: getHelmReleaseServiceId }
 );
 
+entityCache[helmReleaseGraphEntityType] = new HelmEntitySchema(
+  helmReleaseGraphEntityType,
+  {},
+  { idAttribute: getHelmReleaseGraphId }
+);
+
 export function helmEntityFactory(key: string): EntitySchema {
   const entity = entityCache[key];
   if (!entity) {
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 771d9cb170..6efc9dcc45 100644
--- a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
+++ b/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
@@ -12,6 +12,7 @@ import {
   helmReleasePodEntityType,
   helmReleaseServiceEntityType,
   helmReleaseStatusEntityType,
+  helmReleaseGraphEntityType,
   helmVersionsEntityType,
   monocularChartsEntityType,
 } from './helm-entity-factory';
@@ -22,6 +23,7 @@ import {
   HelmReleaseStatus,
   HelmVersion,
   MonocularChart,
+  HelmReleaseGraph,
 } from './store/helm.types';
 
 
@@ -47,6 +49,7 @@ export function generateHelmEntities(): StratosBaseCatalogueEntity[] {
     generateReleaseStatusEntity(endpointDefinition),
     generateReleasePodEntity(endpointDefinition),
     generateReleaseServiceEntity(endpointDefinition),
+    generateReleaseGraphEntity(endpointDefinition),
   ];
 }
 
@@ -111,3 +114,13 @@ function generateReleaseServiceEntity(endpointDefinition: StratosEndpointExtensi
   return new StratosCatalogueEntity<IFavoriteMetadata, HelmReleaseService>(definition);
 }
 
+function generateReleaseGraphEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: helmReleaseGraphEntityType,
+    schema: helmEntityFactory(helmReleaseGraphEntityType),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogueEntity<IFavoriteMetadata, HelmReleaseGraph>(definition);
+}
+
+
diff --git a/custom-src/frontend/app/custom/helm/helm.module.ts b/custom-src/frontend/app/custom/helm/helm.module.ts
index 071fcebc91..32243d1359 100644
--- a/custom-src/frontend/app/custom/helm/helm.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm.module.ts
@@ -1,3 +1,4 @@
+import { HelmReleaseResourceGraphComponent } from './release/tabs/helm-release-resource-graph/helm-release-resource-graph.component';
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 
@@ -39,6 +40,9 @@ import { CatalogTabComponent } from './tabs/catalog-tab/catalog-tab.component';
 import { HelmConfigurationComponent } from './tabs/configuration-tab/helm-configuration.component';
 import { HelmReleasesTabComponent } from './tabs/releases-tab/releases-tab.component';
 import { RepositoryTabComponent } from './tabs/repository-tab/repository-tab.component';
+import { NgxJsonViewerModule } from 'ngx-json-viewer';
+import { KubernetesModule } from '../kubernetes/kubernetes.module';
+import { NgxGraphModule } from '@swimlane/ngx-graph';
 
 @NgModule({
   imports: [
@@ -47,6 +51,9 @@ import { RepositoryTabComponent } from './tabs/repository-tab/repository-tab.com
     SharedModule,
     HelmRoutingModule,
     CreateReleaseModule,
+    NgxJsonViewerModule,
+    KubernetesModule,
+    NgxGraphModule,
   ],
   declarations: [
     PanelComponent,
@@ -77,7 +84,8 @@ import { RepositoryTabComponent } from './tabs/repository-tab/repository-tab.com
     HelmReleaseValuesTabComponent,
     HelmReleasePodsTabComponent,
     HelmReleaseServicesTabComponent,
-    HelmServicePortsComponent
+    HelmServicePortsComponent,
+    HelmReleaseResourceGraphComponent,
   ],
   providers: [
     ChartsService,
diff --git a/custom-src/frontend/app/custom/helm/helm.routing.ts b/custom-src/frontend/app/custom/helm/helm.routing.ts
index 68c7b2d12e..5f86c75431 100644
--- a/custom-src/frontend/app/custom/helm/helm.routing.ts
+++ b/custom-src/frontend/app/custom/helm/helm.routing.ts
@@ -14,6 +14,7 @@ import { CatalogTabComponent } from './tabs/catalog-tab/catalog-tab.component';
 import { HelmConfigurationComponent } from './tabs/configuration-tab/helm-configuration.component';
 import { HelmReleasesTabComponent } from './tabs/releases-tab/releases-tab.component';
 import { RepositoryTabComponent } from './tabs/repository-tab/repository-tab.component';
+import { HelmReleaseResourceGraphComponent } from './release/tabs/helm-release-resource-graph/helm-release-resource-graph.component';
 
 const monocular: Routes = [
   {
@@ -33,13 +34,17 @@ const monocular: Routes = [
     // Helm Release Views
     path: 'releases/:guid',
     component: HelmReleaseTabBaseComponent,
+    data: {
+      reuseRoute: HelmReleaseTabBaseComponent,
+    },
     children: [
       { path: '', redirectTo: 'summary', pathMatch: 'full' },
       { path: 'summary', component: HelmReleaseSummaryTabComponent },
       { path: 'notes', component: HelmReleaseNotesTabComponent },
       { path: 'values', component: HelmReleaseValuesTabComponent },
       { path: 'pods', component: HelmReleasePodsTabComponent },
-      { path: 'services', component: HelmReleaseServicesTabComponent }
+      { path: 'services', component: HelmReleaseServicesTabComponent },
+      { path: 'graph', component: HelmReleaseResourceGraphComponent }
     ]
   },
   { pathMatch: 'full', path: 'charts/:repo/:chartName/:version', component: MonocularChartViewComponent },
diff --git a/custom-src/frontend/app/custom/helm/helm.store.module.ts b/custom-src/frontend/app/custom/helm/helm.store.module.ts
index 40b8febc72..c65d792a2d 100644
--- a/custom-src/frontend/app/custom/helm/helm.store.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm.store.module.ts
@@ -2,12 +2,15 @@ import { NgModule } from '@angular/core';
 import { EffectsModule } from '@ngrx/effects';
 
 import { HelmEffects } from './store/helm.effects';
+import { StoreModule } from '@ngrx/store';
+import { helmReleaseReducer } from './store/helm.reducers';
 
 @NgModule({
   imports: [
     EffectsModule.forFeature([
       HelmEffects
-    ])
+    ]),
+    StoreModule.forFeature('helmRelease', helmReleaseReducer),
   ]
 })
 export class HelmStoreModule { }
diff --git a/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.html b/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.html
index 1154ce5069..72b4959df7 100644
--- a/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.html
+++ b/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.html
@@ -1,19 +1,19 @@
 <app-meta-card class="card">
   <app-meta-card-title class=" card__title">
-    <app-multiline-title class="card__title-link">{{ row?.name }}</app-multiline-title>
+    <app-multiline-title class="card__title-link">{{ row?.metadata.name }}</app-multiline-title>
   </app-meta-card-title>
   <app-meta-card-item>
     <app-meta-card-key>Cluster IP</app-meta-card-key>
-    <app-meta-card-value>{{(row?.kubeService$ | async)?.spec.clusterIP}}</app-meta-card-value>
+    <app-meta-card-value>{{row?.spec.clusterIP}}</app-meta-card-value>
   </app-meta-card-item>
   <app-meta-card-item>
     <app-meta-card-key>Port Type</app-meta-card-key>
-    <app-meta-card-value>{{(row?.kubeService$ | async)?.spec.type}}</app-meta-card-value>
+    <app-meta-card-value>{{row?.spec.type}}</app-meta-card-value>
   </app-meta-card-item>
   <app-meta-card-item customStyle="column">
     <app-meta-card-key>Ports</app-meta-card-key>
     <app-meta-card-value>
-      <app-helm-service-ports [row]="row"></app-helm-service-ports>
+      <app-kubernetes-service-ports [row]="row"></app-kubernetes-service-ports>
     </app-meta-card-value>
   </app-meta-card-item>
 </app-meta-card>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/list-types/helm-service-ports/helm-service-ports.component.ts b/custom-src/frontend/app/custom/helm/list-types/helm-service-ports/helm-service-ports.component.ts
index 5f2fc14f79..c0a8203af3 100644
--- a/custom-src/frontend/app/custom/helm/list-types/helm-service-ports/helm-service-ports.component.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/helm-service-ports/helm-service-ports.component.ts
@@ -16,8 +16,9 @@ export class HelmServicePortsComponent extends KubernetesServicePortsComponent {
     if (!row) {
       return;
     }
+    console.log(row);
     const helmReleaseService = (row as HelmReleaseService);
-    this.kubeService$ = helmReleaseService.kubeService$;
+    // this.kubeService$ = helmReleaseService.kubeService$;
     this.endpointId = helmReleaseService.endpointId;
   }
 }
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts
index 22d21f4dc0..01ddc7936f 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts
@@ -9,6 +9,12 @@ import { IListConfig, ListViewTypes } from '../../../shared/components/list/list
 import { HelmReleaseHelperService } from '../release/tabs/helm-release-helper.service';
 import { HelmReleasePod } from '../store/helm.types';
 import { HelmReleasePodsDataSource } from './monocular-release-pods-list-source';
+import {
+  KubernetesPodStatusComponent
+} from '../../kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component';
+import {
+  KubernetesPodReadinessComponent
+} from '../../kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component';
 
 @Injectable()
 export class HelmReleasePodsListConfig implements IListConfig<HelmReleasePod> {
@@ -21,34 +27,36 @@ export class HelmReleasePodsListConfig implements IListConfig<HelmReleasePod> {
       columnId: 'name',
       headerCell: () => 'Name',
       cellDefinition: {
-        valuePath: 'name'
+        valuePath: 'metadata.name'
       },
       sort: {
         type: 'sort',
         orderKey: 'name',
-        field: 'name'
+        field: 'metadata.name'
       },
       cellFlex: '4'
     },
     {
       columnId: 'status',
       headerCell: () => 'Status',
-      cellDefinition: {
-        valuePath: 'status'
-      },
+      cellComponent: KubernetesPodStatusComponent,
+      // cellDefinition: {
+      //   valuePath: 'status.phase'
+      // },
       sort: {
         type: 'sort',
         orderKey: 'status',
-        field: 'status'
+        field: 'status.phase'
       },
       cellFlex: '1'
     },
     {
       columnId: 'ready',
       headerCell: () => 'Ready',
-      cellDefinition: {
-        valuePath: 'ready'
-      },
+      cellComponent: KubernetesPodReadinessComponent,
+      // cellDefinition: {
+      //   valuePath: 'ready'
+      // },
       sort: {
         type: 'sort',
         orderKey: 'ready',
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-source.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-source.ts
index 14850b887a..13a6808341 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-source.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-source.ts
@@ -4,7 +4,7 @@ import { AppState } from '../../../../../store/src/app-state';
 import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../shared/components/list/list.component.types';
 import { getHelmReleasePodId, helmEntityFactory } from '../helm-entity-factory';
-import { GetHelmReleasePods } from '../store/helm.actions';
+import { GetHelmReleasePods, GetHelmReleaseServices } from '../store/helm.actions';
 import { HelmReleasePod } from '../store/helm.types';
 
 export class HelmReleasePodsDataSource extends ListDataSource<HelmReleasePod> {
@@ -16,10 +16,11 @@ export class HelmReleasePodsDataSource extends ListDataSource<HelmReleasePod> {
     releaseTitle: string
   ) {
     const action = new GetHelmReleasePods(endpointGuid, releaseTitle);
+
     super({
       store,
       action,
-      schema: helmEntityFactory(action.entityType),
+      schema: action.entity[0],
       getRowUniqueId: getHelmReleasePodId,
       paginationKey: action.paginationKey,
       isLocal: true,
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-source.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-source.ts
index 5e76b11b8d..094f2a4fcd 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-source.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-source.ts
@@ -50,23 +50,24 @@ export class HelmReleaseServicesDataSource extends ListDataSource<HelmReleaseSer
     super({
       store,
       action,
-      schema: helmEntityFactory(action.entityType),
+      schema: action.entity[0],
       getRowUniqueId: getHelmReleaseServiceId,
       paginationKey: action.paginationKey,
       isLocal: true,
       listConfig,
-      transformEntity: map((helmServices: HelmReleaseService[]) => {
-        return helmServices.map(helmService => {
-          if (!helmService.kubeService$) {
-            helmService.kubeService$ = fetchHelmReleaseServiceFromKubernetes(store, helmService);
-          }
-          return helmService;
-        });
-      }),
-      refresh: () => {
-        store.dispatch(action);
-        store.dispatch(new ClearPaginationOfType(action));
-      }
     });
+    //   transformEntity: map((helmServices: HelmReleaseService[]) => {
+    //     return helmServices.map(helmService => {
+    //       if (!helmService.kubeService$) {
+    //         helmService.kubeService$ = fetchHelmReleaseServiceFromKubernetes(store, helmService);
+    //       }
+    //       return helmService;
+    //     });
+    //   }),
+    //   refresh: () => {
+    //     store.dispatch(action);
+    //     store.dispatch(new ClearPaginationOfType(action));
+    //   }
+    // });
   }
 }
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-config.service.ts
index 9512498e97..8ae5e1fd35 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-config.service.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-config.service.ts
@@ -93,7 +93,7 @@ export class HelmReleasesListConfig implements IListConfig<HelmRelease> {
       columnId: 'last_Deployed',
       headerCell: () => 'Last Deployed',
       cellDefinition: {
-        getValue: (row) => `${this.datePipe.transform(row.lastDeployed, 'medium')}`
+        getValue: (row) => `${this.datePipe.transform(row.info.last_deployed, 'medium')}`
       },
       sort: {
         type: 'sort',
diff --git a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts b/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
index e5063a381f..c91fc403ab 100644
--- a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
@@ -1,9 +1,32 @@
-import { Component } from '@angular/core';
+import { HELM_ENDPOINT_TYPE } from './../../helm-entity-factory';
+import { GetHelmReleaseServices } from './../../store/helm.actions';
+import { entityCatalogue } from './../../../../core/entity-catalogue/entity-catalogue.service';
+import { Component, OnDestroy } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Observable } from 'rxjs';
+import { Observable, Subject, Subscription } from 'rxjs';
 
-import { HelmReleaseGuid } from '../../store/helm.types';
+import { HelmReleaseGuid, HelmReleasePod } from '../../store/helm.types';
 import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service';
+import { catchError } from 'rxjs/operators';
+import websocketConnect, { Connection } from 'rxjs-websockets';
+import { Store, Action } from '@ngrx/store';
+import { AppState } from '../../../../../../store/src/app-state';
+import {
+  successEntityHandler
+} from '../../../../../../store/src/entity-request-pipeline/entity-request-base-handlers/success-entity-request.handler';
+import {
+  KUBERNETES_ENDPOINT_TYPE,
+  kubernetesPodsEntityType,
+  kubernetesServicesEntityType
+} from '../../../kubernetes/kubernetes-entity-factory';
+import { PipelineResult } from '../../../../../../store/src/entity-request-pipeline/entity-request-pipeline.types';
+import { GetHelmReleasePods } from '../../store/helm.actions';
+import { EntityCatalogueEntityConfig } from '../../../../core/entity-catalogue/entity-catalogue.types';
+import { helmReleaseGraphEntityType } from '../../helm-entity-factory';
+
+type IDGetterFunction = (data: any) => string;
+
+
 
 @Component({
   selector: 'app-helm-release-tab-base',
@@ -22,10 +45,14 @@ import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service';
     }
   ]
 })
-export class HelmReleaseTabBaseComponent {
+export class HelmReleaseTabBaseComponent implements OnDestroy {
 
   isFetching$: Observable<boolean>;
 
+  private sub: Subscription;
+
+  private connection: Connection;
+
   public breadcrumbs = [{
     breadcrumbs: [
       { value: 'Helm', routerLink: '/monocular' },
@@ -39,13 +66,166 @@ export class HelmReleaseTabBaseComponent {
     { link: 'summary', label: 'Summary', icon: 'helm', iconFont: 'stratos-icons' },
     { link: 'notes', label: 'Notes', icon: 'subject' },
     { link: 'values', label: 'Values', icon: 'list' },
+    { link: '-', label: 'Resources' },
+    { link: 'graph', label: 'Overview', icon: 'share' },
     { link: 'pods', label: 'Pods', icon: 'adjust' },
     { link: 'services', label: 'Services', icon: 'service', iconFont: 'stratos-icons' }
   ];
   constructor(
     private helmRelease: HelmReleaseGuid,
+    public helmReleaseHelper: HelmReleaseHelperService,
+    private store: Store<AppState>,
   ) {
     const guid = this.helmRelease.guid;
     this.title = guid.split(':')[1];
+
+    console.log('RELEASE BASE - CREATE NEW');
+
+    const endpointAndName = this.helmReleaseHelper.guid.replace(':', '/');
+    const host = window.location.host;
+    const protocol = window.location.protocol === 'https:' ? 'wss' : 'ws';
+    const streamUrl = (
+      `${protocol}://${host}/pp/v1/helm/releases/${endpointAndName}`
+    );
+    console.log(streamUrl);
+
+    const data = new Subject<string>();
+    const connection = websocketConnect(
+      streamUrl,
+      data
+    );
+
+    const messages = connection.messages.pipe(
+      catchError(e => {
+        console.log('WS Erorr');
+        console.log(e);
+        if (e.type === 'error') {
+          console.log(e);
+        }
+        return [];
+      }));
+
+    let prefix = '';
+    this.sub = messages.subscribe(jsonString => {
+      console.log('Got message ....');
+
+      const messageObj = JSON.parse(jsonString);
+      if (messageObj) {
+        console.log(messageObj);
+
+        // this.store.dispatch(new HelmUpdateRelease(messageObj));
+
+        if (messageObj.kind === 'ReleasePrefix') {
+          prefix = messageObj.data;
+          console.log('Got prefix: ' + prefix);
+        } else if (messageObj.kind === 'Pods') {
+          const pods = messageObj.data;
+          pods.forEach(pod => {
+            this.addResource(kubernetesPodsEntityType, pod, pod.metadata.uid);
+          });
+          const releasePodsAction = new GetHelmReleasePods(this.helmReleaseHelper.endpointGuid, this.helmReleaseHelper.releaseTitle);
+          this.populateList(releasePodsAction, pods);
+        } else if (messageObj.kind === 'Graph') {
+          console.log('GOT GRAPH');
+          const graph = messageObj.data;
+          graph.endpointId = this.helmReleaseHelper.endpointGuid;
+          graph.releaseTitle = this.helmReleaseHelper.releaseTitle;
+          console.log(graph);
+          this.addResource(helmReleaseGraphEntityType, graph, prefix, HELM_ENDPOINT_TYPE);
+        } else if (messageObj.kind === 'Manifest' ||  messageObj.kind === 'Resources') {
+          // Store all of the services
+          const manifest = messageObj.data;
+          const ep = this.helmReleaseHelper.endpointGuid;
+          const releaseServicesAction = new GetHelmReleaseServices(
+            this.helmReleaseHelper.endpointGuid,
+            this.helmReleaseHelper.releaseTitle
+          );
+          const svcs = [];
+
+          manifest.forEach(resource => {
+            if (resource.kind === 'Service' && prefix) {
+              console.log(`Service: ${prefix}-${resource.metadata.name}`);
+              this.addResource(kubernetesServicesEntityType, resource, `${prefix}-${resource.metadata.name}`);
+              svcs.push(resource);
+            }
+          });
+          if (svcs.length > 0) {
+            this.populateList(releaseServicesAction, svcs, (svc) => `${prefix}-${svc.metadata.name}`);
+          }
+        }
+      }
+    });
+  }
+
+  private addResource(entityType: string, data: any, id: string, endpointType = KUBERNETES_ENDPOINT_TYPE) {
+    const actionDispatcher = (action) => this.store.dispatch(action);
+    const catalogEntity = entityCatalogue.getEntity(endpointType, entityType);
+    const pr = {
+      success: true,
+      response: {
+        entities: {
+          [catalogEntity.entityKey]: {
+            [id]: data
+          }
+        },
+        result: [
+          id
+        ]
+      }
+    } as PipelineResult;
+    successEntityHandler(
+      actionDispatcher,
+      catalogEntity,
+      'get',
+      {
+        endpointType,
+        entityType,
+        guid: id
+      },
+      pr
+    );
+  }
+
+  private populateList(action: EntityCatalogueEntityConfig, resources: any, idGetter?: IDGetterFunction) {
+    const entityType = kubernetesPodsEntityType;
+    const releaseTitle = this.helmReleaseHelper.releaseTitle;
+    const endpointId = this.helmReleaseHelper.endpointGuid;
+
+    if (!idGetter) {
+      idGetter = (data) => data.metadata.uid;
+    }
+
+    const actionDispatcher = (a) => this.store.dispatch(a);
+    const catalogEntity = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, entityType);
+    const newResources = {};
+    resources.forEach(resource => {
+      const newResource: HelmReleasePod = {
+        endpointId,
+        releaseTitle,
+        ...resource
+      };
+      newResources[idGetter(resource)] = newResource;
+    });
+
+    const releasePods = {
+      success: true,
+      response: {
+        entities: { [entityCatalogue.getEntityKey(action)]: Object.values(newResources) },
+        result: Object.keys(newResources)
+      }
+    };
+
+    successEntityHandler(
+      actionDispatcher,
+      catalogEntity,
+      'get',
+      action,
+      releasePods,
+    );
+  }
+
+  ngOnDestroy() {
+    console.log('DESTROY RELEASE TAB BASE');
+    this.sub.unsubscribe();
   }
 }
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
index 320d4495d5..256719814d 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
@@ -6,8 +6,8 @@ import { map } from 'rxjs/operators';
 import { EntityServiceFactory } from '../../../../core/entity-service-factory.service';
 import { PaginationMonitor } from '../../../../shared/monitors/pagination-monitor';
 import { helmEntityFactory, helmReleaseEntityKey } from '../../helm-entity-factory';
-import { GetHelmReleases, GetHelmReleaseStatus } from '../../store/helm.actions';
-import { HelmRelease, HelmReleaseGuid, HelmReleaseStatus } from '../../store/helm.types';
+import { GetHelmReleases, GetHelmReleaseStatus, GetHelmReleaseGraph } from '../../store/helm.actions';
+import { HelmRelease, HelmReleaseGuid, HelmReleaseStatus, HelmReleaseGraph } from '../../store/helm.types';
 import { AppState } from './../../../../../../store/src/app-state';
 import {
   getPaginationObservables,
@@ -51,114 +51,16 @@ export class HelmReleaseHelperService {
       map(entity => entity.entity)
     );
   }
-}
-
-export const parseHelmReleaseStatus = (res: string): HelmReleaseStatus => {
-  const lines = res.split('\n');
-  const result = {
-    pods: {},
-    fields: [],
-    data: {
-      'v1/Pod': {},
-      'v1/Service': {}
-    }
-  };
-
-  // Process
-  let i = 0;
-  while (i < lines.length) {
-    if (lines[i].indexOf('==>') === 0) {
-      // Got a resource type
-      const resType = getResourceName(lines[i].substr(4));
-      // Read fields
-      i++;
-      i = readFields(result, lines, i);
-      i = readResType(result, resType, lines, i);
-    } else {
-      i++;
-    }
-  }
-
-  calculateStats(result);
-  return result;
-};
-
-function getResourceName(name: string): string {
-  const parts = name.trim().split('(');
-  return parts[0].trim();
-}
-
-function readFields(result, lines, i): number {
-  let read = result.fields.length === 0;
-  if (!read && lines[i].length === 0) {
-    i++;
-    read = true;
-  }
-
-  if (lines[i].indexOf('NAME') === 0) {
-    read = true;
-  }
 
-  if (read) {
-    const params = lines[i].replace(/  +/g, ' ');
-    result.fields = params.split(' ');
-    i++;
-  }
-  return i;
-}
-
-function readResType(result, resType, lines, i): number {
-  const data = result.data;
-  data[resType] = [];
-  while (i < lines.length) {
-    if (lines[i].length === 0) {
-      return i + 1;
-    }
-    let values = lines[i];
-    values = values.replace(/  +/g, ' ');
-    const value = {};
-    values.split(' ').forEach((v, index) => {
-      let p = result.fields[index].trim();
-      p = p.toLowerCase();
-      value[p] = v.trim();
-    });
-    data[resType].push(value);
-    i++;
-  }
+  public fetchReleaseGraph(): Observable<HelmReleaseGraph> {
+    // Get helm release
+    const action = new GetHelmReleaseGraph(this.endpointGuid, this.releaseTitle);
 
-  return i;
-}
+    console.log(action);
 
-function calculateStats(res) {
-  // Calculate Pod Stats
-  if (!!res.data['v1/Pod']) {
-    calculatePodStats(res, res.data['v1/Pod']);
+    return this.esf.create<HelmReleaseGraph>(action.key, action).waitForEntity$.pipe(
+      map(entity => entity.entity)
+    );
   }
-}
-
-function calculatePodStats(data, pods) {
-  data.pods = {
-    status: {},
-    containers: 0,
-    ready: 0,
-  };
-
-  pods.forEach(pod => {
-    let count = data.pods.status[pod.status];
-    if (!count) {
-      count = 0;
-    }
-    data.pods.status[pod.status] = count + 1;
 
-    // Parse the ready state if running
-    if (pod.status === 'Running') {
-      const readyParts = pod.ready.split('/');
-      if (readyParts.length === 2) {
-        const ready = parseInt(readyParts[0], 10);
-        const total = parseInt(readyParts[1], 10);
-        data.pods.ready += ready;
-        data.pods.containers += total;
-      }
-    }
-  });
 }
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss
index d16a37d86c..db0219cb1e 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss
@@ -2,5 +2,5 @@
   display: block;
   font-family: Source Code Pro;
   font-size: 14px;
-  white-space: pre;
+  white-space: pre-wrap;
 }
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts
index 91425115d6..5da24e9315 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts
@@ -20,8 +20,8 @@ export class HelmReleaseNotesTabComponent {
 
     this.notes$ = helmReleaseHelper.release$.pipe(
       map(release => {
-        if (release.info.status.notes) {
-          return this.colorizer.ansiColorsToHtml(release.info.status.notes);
+        if (release.info.notes) {
+          return this.colorizer.ansiColorsToHtml(release.info.notes);
         } else {
           return '';
         }
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
new file mode 100644
index 0000000000..21e6ddf947
--- /dev/null
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
@@ -0,0 +1,20 @@
+<ngx-graph
+  class="chart-container"
+  (zoomChange)="onZoomChanged($event)"
+  [links]="links"
+  [nodes]="nodes"
+  [update$]="update$"
+>
+<!--
+<ng-template #nodeTemplate let-node>
+    <svg:g class="node" xmlns="http://www.w3.org/2000/xhtml" width="150" height="100">
+    <svg:foreignObject width="150" height="100">
+      <xhtml:div class="cardContainer" xmlns="http://www.w3.org/1999/xhtml">
+        <label class="name">{{node.label}}</label>
+        <label>{{node.data.kind}}</label>
+      </xhtml:div>
+    </svg:foreignObject>
+  </svg:g>
+</ng-template>
+</ngx-graph>
+-->
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss
new file mode 100644
index 0000000000..b879f01812
--- /dev/null
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss
@@ -0,0 +1,5 @@
+:host {
+  display: flex;
+  height: 100%;
+  width: 100%;
+}
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
new file mode 100644
index 0000000000..274f69a1e3
--- /dev/null
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HelmReleaseResourceGraphComponent } from './helm-release-resource-graph.component';
+
+describe('HelmReleaseResourceGraphComponent', () => {
+  let component: HelmReleaseResourceGraphComponent;
+  let fixture: ComponentFixture<HelmReleaseResourceGraphComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ HelmReleaseResourceGraphComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(HelmReleaseResourceGraphComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
new file mode 100644
index 0000000000..e2b9746934
--- /dev/null
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
@@ -0,0 +1,46 @@
+import { Node, Edge } from '@swimlane/ngx-graph';
+import { Component, OnInit } from '@angular/core';
+import { HelmReleaseHelperService } from '../helm-release-helper.service';
+import { Subject } from 'rxjs';
+
+@Component({
+  selector: 'app-helm-release-resource-graph',
+  templateUrl: './helm-release-resource-graph.component.html',
+  styleUrls: ['./helm-release-resource-graph.component.scss']
+})
+export class HelmReleaseResourceGraphComponent implements OnInit {
+
+  // see: https://swimlane.github.io/ngx-graph/#/#quick-start
+
+  public nodes = [] as Node[];
+  public links = [] as Edge[];
+
+  update$: Subject<boolean> = new Subject();
+
+  constructor(private helper: HelmReleaseHelperService) {
+
+    console.log('GOING TO WAIT FOR RESOURCE GRAPH.....');
+
+    // Listen for the graph
+    helper.fetchReleaseGraph().subscribe((g: any) => {
+      console.log('GOT RELEASE GRAPH');
+      console.log(g);
+
+      const newNodes = [];
+      Object.values(g.nodes).forEach((node: any) => newNodes.push({
+        id: node.id,
+        label: node.label,
+        data: {...node.data},
+      }));
+      this.nodes = newNodes;
+      this.update$.next(true);
+    });
+   }
+
+  ngOnInit() { }
+
+  public onZoomChanged(e) {
+    console.log(e);
+  }
+
+}
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
index 1a1ef4f001..75141f51a7 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
@@ -21,13 +21,13 @@
           </app-metadata-item>
           <app-metadata-item class="chart-details__item" label="Status">{{ release.status }}</app-metadata-item>
           <app-metadata-item class="chart-details__item" label="First Deployed">
-            {{ release.firstDeployed | date:'medium' }}
+            {{ release.info.firstDeployed | date:'medium' }}
           </app-metadata-item>
           <app-metadata-item class="chart-details__item" label="Last Deployed">
-            {{ release.lastDeployed | date:'medium' }}
+            {{ release.info.lastDeployed | date:'medium' }}
           </app-metadata-item>
         </div>
-        <app-tile-grid>
+        <!-- <app-tile-grid>
           <app-tile-group *ngIf="chartData$ | async as chartData">
             <app-tile>
               <mat-card class="full-card">
@@ -41,7 +41,7 @@
               </mat-card>
             </app-tile>
           </app-tile-group>
-        </app-tile-grid>
+        </app-tile-grid> -->
       </div>
     </app-entity-summary-title>
 
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index d4820f671a..c402088a51 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -1,8 +1,10 @@
 import { HttpClient } from '@angular/common/http';
 import { Component, OnDestroy } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { combineLatest, Observable, ReplaySubject } from 'rxjs';
-import { map, startWith } from 'rxjs/operators';
+import { combineLatest, Observable, ReplaySubject, of as obsOf, Subject, BehaviorSubject } from 'rxjs';
+import { map, startWith, catchError, share, filter } from 'rxjs/operators';
+
+import websocketConnect from 'rxjs-websockets';
 
 import { ClearPaginationOfType } from '../../../../../../../store/src/actions/pagination.actions';
 import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
@@ -14,6 +16,7 @@ import { ConfirmationDialogConfig } from '../../../../../shared/components/confi
 import { ConfirmationDialogService } from '../../../../../shared/components/confirmation-dialog.service';
 import { HELM_ENDPOINT_TYPE, helmReleaseEntityKey } from '../../../helm-entity-factory';
 import { HelmReleaseHelperService } from '../helm-release-helper.service';
+import { HelmReleaseStatus } from '../../../store/helm.types';
 
 @Component({
   selector: 'app-helm-release-summary-tab',
@@ -61,7 +64,10 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
     private logService: LoggerService
   ) {
 
-    const releaseStatus$ = this.helmReleaseHelper.fetchReleaseStatus();
+    //const releaseStatus$ = this.helmReleaseHelper.fetchReleaseStatus();
+
+    const releaseStatus$ = new BehaviorSubject<HelmReleaseStatus>({} as HelmReleaseStatus);
+    //.helmReleaseHelper.fetchReleaseStatus();
 
     this.isBusy$ = combineLatest([
       this.helmReleaseHelper.isFetching$,
@@ -74,25 +80,63 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
       startWith(true)
     );
 
+    // console.log("Connecting to web socket");
+
+    // const endpointAndName = this.helmReleaseHelper.guid.replace(':', '/');
+    // const host = window.location.host;
+    // const protocol = window.location.protocol === 'https:' ? 'wss' : 'ws';
+    // const streamUrl = (
+    //   `${protocol}://${host}/pp/v1/helm/releases/${endpointAndName}`
+    // );
+    // console.log(streamUrl);
+
+    // const data = new Subject<string>();
+    // const connection = websocketConnect(
+    //   streamUrl,
+    //   data
+    // );
+
+    // const messages = connection.messages.pipe(
+    //   catchError(e => {
+    //     if (e.type === 'error') {
+    //       console.log(e);
+    //     }
+    //     return [];
+    //   }));
+
+    // const connectionStatus = connection.connectionStatus;
+
+    // messages.subscribe(jsonString => {
+    //   console.log('Got message ....');
+
+    //   const messageObj = JSON.parse(jsonString);
+    //   if (messageObj) {
+    //     console.log(messageObj);
+    //   }
+
+    // });
+
+
     // Async fetch release status
-    this.chartData$ = releaseStatus$.pipe(
-      map(data => ({
-        podsChartData: Object.keys(data.pods.status).map(status => ({
-          name: status,
-          value: data.pods.status[status]
-        })),
-        containersChartData: [
-          {
-            name: 'Ready',
-            value: data.pods.ready
-          },
-          {
-            name: 'Not Ready',
-            value: data.pods.containers - data.pods.ready
-          }
-        ]
-      }))
-    );
+    // this.chartData$ = obsOf({});
+    // this.chartData$ = releaseStatus$.pipe(
+    //   map(data => ({
+    //     podsChartData: Object.keys(data.pods.status).map(status => ({
+    //       name: status,
+    //       value: data.pods.status[status]
+    //     })),
+    //     containersChartData: [
+    //       {
+    //         name: 'Ready',
+    //         value: data.pods.ready
+    //       },
+    //       {
+    //         name: 'Not Ready',
+    //         value: data.pods.containers - data.pods.ready
+    //       }
+    //     ]
+    //   }))
+    // );
   }
 
   private startDelete() {
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
index 370172b3b7..2c95eb90e4 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
@@ -1,8 +1,5 @@
 <div *ngIf="values$ | async as values; else noValues">
-  <app-code-block codeBlockStyle="pre">
-    <pre [innerHtml]="values">
-      </pre>
-  </app-code-block>
+  <ngx-json-viewer [json]="values"></ngx-json-viewer>
 </div>
 <ng-template #noValues>
   <app-no-content-message [icon]="'list'" [firstLine]="'There are no release values'"></app-no-content-message>
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
index ae015b09a5..c5c7d5471f 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
@@ -16,13 +16,7 @@ export class HelmReleaseValuesTabComponent {
   constructor(public helmReleaseHelper: HelmReleaseHelperService) {
 
     this.values$ = helmReleaseHelper.release$.pipe(
-      map(release => {
-        if (release.config.raw) {
-          return this.hidePasswords(release.config.raw);
-        } else {
-          return '';
-        }
-      })
+      map(release => release.chart.values)
     );
   }
 
diff --git a/custom-src/frontend/app/custom/helm/store/helm.actions.ts b/custom-src/frontend/app/custom/helm/store/helm.actions.ts
index b7c950b02e..d3df78b09d 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.actions.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.actions.ts
@@ -1,3 +1,8 @@
+import {
+  KUBERNETES_ENDPOINT_TYPE,
+  kubernetesPodsEntityType,
+  kubernetesServicesEntityType,
+  kubernetesEntityFactory} from '../../kubernetes/kubernetes-entity-factory';
 import { Action } from '@ngrx/store';
 
 import { EntityRequestAction } from '../../../../../store/src/types/request.types';
@@ -5,12 +10,12 @@ import {
   HELM_ENDPOINT_TYPE,
   helmEntityFactory,
   helmReleaseEntityKey,
-  helmReleasePodEntityType,
-  helmReleaseServiceEntityType,
   helmReleaseStatusEntityType,
   helmVersionsEntityType,
+  helmReleaseGraphEntityType,
   monocularChartsEntityType,
 } from '../helm-entity-factory';
+
 import { PaginatedAction } from './../../../../../store/src/types/pagination.types';
 import { HelmInstallValues } from './helm.types';
 
@@ -42,6 +47,10 @@ export const HELM_INSTALL = '[Helm] Install';
 export const HELM_INSTALL_SUCCESS = '[Helm] Install Success';
 export const HELM_INSTALL_FAILURE = '[Helm] Install Failure';
 
+export const UPDATE_HELM_RELEASE_STATUS = '[Helm] Update Release Status [WS]';
+export const UPDATE_HELM_RELEASE_STATUS_SUCCESS = '[Helm] Update Release Status [WS] Success';
+export const UPDATE_HELM_RELEASE_STATUS_FAILURE  = '[Helm] Update Release Status [WS] Failure';
+
 export interface MonocularPaginationAction extends PaginatedAction, EntityRequestAction { }
 
 export class GetMonocularCharts implements MonocularPaginationAction {
@@ -124,6 +133,23 @@ export class GetHelmReleaseStatus implements EntityRequestAction {
   ];
 }
 
+// Never dispateched - just used for look-up
+// Don't know why I need an action for this rather than an entity type?
+export class GetHelmReleaseGraph implements EntityRequestAction {
+  key: string;
+  constructor(
+    public endpointGuid: string,
+    public releaseTitle: string
+  ) {
+    this.key = `${endpointGuid}-${releaseTitle}`;
+  }
+  type = this.constructor.name;
+  endpointType = HELM_ENDPOINT_TYPE;
+  entity = helmEntityFactory(helmReleaseGraphEntityType);
+  entityType = helmReleaseGraphEntityType;
+  actions = [this.type];
+}
+
 export class GetHelmReleasePods implements MonocularPaginationAction {
   constructor(
     public endpointGuid: string,
@@ -132,9 +158,9 @@ export class GetHelmReleasePods implements MonocularPaginationAction {
     this.paginationKey = `${endpointGuid}/${releaseTitle}/pods`;
   }
   type = GET_HELM_RELEASE_PODS;
-  endpointType = HELM_ENDPOINT_TYPE;
-  entityType = helmReleasePodEntityType;
-  entity = [helmEntityFactory(helmReleasePodEntityType)];
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
+  entityType = kubernetesPodsEntityType;
+  entity = [kubernetesEntityFactory(kubernetesPodsEntityType)];
   actions = [
     GET_HELM_RELEASE_PODS,
     GET_HELM_RELEASE_PODS_SUCCESS,
@@ -158,9 +184,9 @@ export class GetHelmReleaseServices implements MonocularPaginationAction {
     this.paginationKey = `${endpointGuid}/${releaseTitle}/services`;
   }
   type = GET_HELM_RELEASE_SERVICES;
-  endpointType = HELM_ENDPOINT_TYPE;
-  entityType = helmReleaseServiceEntityType;
-  entity = [helmEntityFactory(helmReleaseServiceEntityType)];
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
+  entityType = kubernetesServicesEntityType;
+  entity = [kubernetesEntityFactory(kubernetesServicesEntityType)];
   actions = [
     GET_HELM_RELEASE_SERVICES,
     GET_HELM_RELEASE_SERVICES_SUCCESS,
@@ -181,3 +207,9 @@ export class HelmInstall implements Action {
   type = HELM_INSTALL;
   public guid = () => '<New Release>' + this.values.releaseName;
 }
+
+export class HelmUpdateRelease implements Action {
+  constructor(public values: any) { }
+  type = UPDATE_HELM_RELEASE_STATUS;
+  // public guid = () => '<New Release>' + this.values.releaseName;
+}
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 f6d35c41a1..05f40e770b 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.effects.ts
@@ -17,7 +17,6 @@ import {
 import { entityCatalogue } from '../../../core/entity-catalogue/entity-catalogue.service';
 import { environment } from '../../../environments/environment';
 import { HELM_ENDPOINT_TYPE, helmReleaseEntityKey } from '../helm-entity-factory';
-import { parseHelmReleaseStatus } from '../release/tabs/helm-release-helper.service';
 import {
   GET_HELM_RELEASE_PODS,
   GET_HELM_RELEASE_SERVICES,
@@ -163,17 +162,25 @@ export class HelmEffects {
             result: []
           } as NormalizedResponse;
 
-          const status = parseHelmReleaseStatus(response.info.status.resources);
+          const status = {};
 
-          this.updateReleasePods(action, status);
+          // TODO
 
-          this.updateReleaseServices(action, status);
+          // this.updateReleasePods(action, status);
+
+          // this.updateReleaseServices(action, status);
 
           // Go through each endpoint ID
           const newStatus: HelmReleaseStatus = {
             endpointId: action.endpointGuid,
             releaseTitle: action.releaseTitle,
-            ...status
+            ...status,
+            pods: [],
+            fields: [],
+            data: {
+              'v1/Pod': {},
+              'v1/Service': {}
+            }
           };
           processedData.entities[entityKey][action.key] = newStatus;
           processedData.result.push(action.key);
@@ -182,11 +189,11 @@ export class HelmEffects {
     })
   );
 
-  @Effect()
-  fetchHelmReleasePods$ = this.actions$.pipe(
-    ofType<GetHelmReleasePods>(GET_HELM_RELEASE_PODS),
-    mergeMap(action => [new GetHelmReleaseStatus(action.endpointGuid, action.releaseTitle)])
-  );
+  // @Effect()
+  // fetchHelmReleasePods$ = this.actions$.pipe(
+  //   ofType<GetHelmReleasePods>(GET_HELM_RELEASE_PODS),
+  //   mergeMap(action => [new GetHelmReleaseStatus(action.endpointGuid, action.releaseTitle)])
+  // );
 
   @Effect()
   fetchHelmReleaseServices$ = this.actions$.pipe(
diff --git a/custom-src/frontend/app/custom/helm/store/helm.reducers.ts b/custom-src/frontend/app/custom/helm/store/helm.reducers.ts
new file mode 100644
index 0000000000..bc2b5efacf
--- /dev/null
+++ b/custom-src/frontend/app/custom/helm/store/helm.reducers.ts
@@ -0,0 +1,15 @@
+import { UPDATE_HELM_RELEASE_STATUS } from './helm.actions';
+
+const defaultState = {};
+
+export function helmReleaseReducer(state: any = defaultState, action) {
+  switch (action.type) {
+    case UPDATE_HELM_RELEASE_STATUS:
+      return {
+        ...state,
+        pods: {
+          test: '123'
+        }
+      };
+  }
+}
diff --git a/custom-src/frontend/app/custom/helm/store/helm.types.ts b/custom-src/frontend/app/custom/helm/store/helm.types.ts
index c082044078..2e0298123d 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.types.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.types.ts
@@ -44,13 +44,17 @@ export interface HelmRelease {
   lastDeployed: Date;
   firstDeployed: Date;
   info: {
-    status: {
-      notes: string;
-    }
+    last_deployed: Date;
+    first_deployed: Date;
+    notes: string;
+    status: string;
   };
   config: {
     raw: string;
   };
+  chart: {
+    values: any;
+  }
 }
 
 export interface HelmReleaseStatus {
@@ -94,6 +98,11 @@ export interface HelmReleaseService {
   kubeService$?: Observable<KubeService>;
 }
 
+export interface HelmReleaseGraph {
+  endpointId: string;
+  releaseTitle: string;
+}
+
 export function isHelmReleaseService(obj: any): HelmReleaseService {
   if (obj && obj.kubeService$) {
     return obj as HelmReleaseService;
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
index e9f7dbfad8..769375f010 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
@@ -93,8 +93,8 @@ import { KubernetesNamespacesTabComponent } from './tabs/kubernetes-namespaces-t
 import { KubernetesNodesTabComponent } from './tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component';
 import { KubernetesPodsTabComponent } from './tabs/kubernetes-pods-tab/kubernetes-pods-tab.component';
 import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kubernetes-summary.component';
-
-
+import { KubernetesPodStatusComponent } from './list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component';
+import { KubernetesPodReadinessComponent } from './list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component';
 
 /* tslint:enable */
 
@@ -151,7 +151,9 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     KubeNamespacePodCountComponent,
     PodNameLinkComponent,
     NodePodCountComponent,
-    KubernetesServicePortsComponent
+    KubernetesServicePortsComponent,
+    KubernetesPodStatusComponent,
+    KubernetesPodReadinessComponent
   ],
   exports: [
     KubernetesServicePortsComponent
@@ -178,7 +180,9 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     KubeNamespacePodCountComponent,
     PodNameLinkComponent,
     NodePodCountComponent,
-    KubernetesServicePortsComponent
+    KubernetesServicePortsComponent,
+    KubernetesPodStatusComponent,
+    KubernetesPodReadinessComponent
   ]
 })
 export class KubernetesModule { }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.html
new file mode 100644
index 0000000000..4045175bb1
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.html
@@ -0,0 +1 @@
+<div>{{ready}} / {{total}}</div>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.spec.ts
new file mode 100644
index 0000000000..5b79e614fd
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { KubernetesPodReadinessComponent } from './kubernetes-pod-readiness.component';
+
+describe('KubernetesPodReadinessComponent', () => {
+  let component: KubernetesPodReadinessComponent;
+  let fixture: ComponentFixture<KubernetesPodReadinessComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ KubernetesPodReadinessComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubernetesPodReadinessComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.ts
new file mode 100644
index 0000000000..e2da0782d2
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.ts
@@ -0,0 +1,21 @@
+import { Component, OnInit } from '@angular/core';
+import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { KubernetesPod, ContainerStatus } from '../../../store/kube.types';
+
+@Component({
+  selector: 'app-kubernetes-pod-readiness',
+  templateUrl: './kubernetes-pod-readiness.component.html',
+  styleUrls: ['./kubernetes-pod-readiness.component.scss']
+})
+export class KubernetesPodReadinessComponent extends TableCellCustom<KubernetesPod> implements OnInit {
+
+  public total = 0;
+  public ready = 0;
+
+  ngOnInit() {
+    const containers = this.row.status.containerStatuses || [];
+    this.total = containers.length;
+    this.ready = containers.reduce((r: number, cstatus: ContainerStatus) => cstatus.ready ? r + 1 : r, 0);
+  }
+
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html
new file mode 100644
index 0000000000..2afc9145e7
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html
@@ -0,0 +1 @@
+<div class="pod-status {{ style }}">{{ row.status.phase }}</div>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.scss
new file mode 100644
index 0000000000..c385ef5762
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.scss
@@ -0,0 +1,7 @@
+.pod-status {
+  display: inline;
+  border-radius: 3px;  
+  border-style: solid;
+  border-width: 1px;
+  padding: 2px 4px;
+}
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts
new file mode 100644
index 0000000000..cae15b9ce2
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { KubernetesPodStatusComponent } from './kubernetes-pod-status.component';
+
+describe('KubernetesPodStatusComponent', () => {
+  let component: KubernetesPodStatusComponent;
+  let fixture: ComponentFixture<KubernetesPodStatusComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ KubernetesPodStatusComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubernetesPodStatusComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
new file mode 100644
index 0000000000..18489515dd
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
@@ -0,0 +1,30 @@
+import { Component, OnInit } from '@angular/core';
+import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { KubernetesPod, KubernetesStatus } from '../../../store/kube.types';
+
+@Component({
+  selector: 'app-kubernetes-pod-status',
+  templateUrl: './kubernetes-pod-status.component.html',
+  styleUrls: ['./kubernetes-pod-status.component.scss']
+})
+export class KubernetesPodStatusComponent extends TableCellCustom<KubernetesPod> implements OnInit {
+
+  public style = 'border-success';
+
+  ngOnInit() {
+    let status: string;
+    switch (this.row.status.phase) {
+      case 'Running':
+        status = 'success';
+        break;
+      case KubernetesStatus.PENDING:
+        status = 'warning';
+        break;
+      default:
+        status = 'tentative';
+        break;
+    }
+
+    this.style = `border-${status} text-${status}`;
+  }
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
index db04efe87c..c46eb4b851 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
@@ -204,6 +204,7 @@ export enum KubernetesStatus {
   ACTIVE = 'Active',
   RUNNING = 'Running',
   FAILED = 'Failed',
+  PENDING = 'Pending'
 }
 export interface KubernetesNamespace extends BasicKubeAPIResource {
   metadata: Metadata;
diff --git a/go.mod b/go.mod
index 995490fafa..76f61ba047 100644
--- a/go.mod
+++ b/go.mod
@@ -5,5 +5,11 @@ go 1.12
 require (
 	github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces v0.0.0-20190904092831-041f55477654 // indirect
 	github.com/gorilla/sessions v1.2.0 // indirect
+	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
+	golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
 	golang.org/x/tools/gopls v0.1.3 // indirect
+	k8s.io/api v0.0.0-20191115135540-bbc9463b57e5 // indirect
+	k8s.io/apimachinery v0.0.0-20191116203941-08e4eafd6d11 // indirect
+	k8s.io/client-go v11.0.0+incompatible // indirect
+	k8s.io/utils v0.0.0-20191114200735-6ca3b61696b6 // indirect
 )
diff --git a/go.sum b/go.sum
index da4bae0ca1..5f8873af6b 100644
--- a/go.sum
+++ b/go.sum
@@ -1,10 +1,40 @@
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
+github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/cloudfoundry-community/go-cfenv v1.17.0 h1:qfxEfn8qKkaHY3ZEk/Y2noY79HBASvNgmtHK9x4+6GY=
 github.com/cloudfoundry-community/go-cfenv v1.17.0/go.mod h1:2UgWvQTRXUuIZ/x3KnW6fk6CgPBhcV4UQb/UGIrUyyI=
 github.com/cloudfoundry-incubator/stratos/src/jetstream v0.0.0-20190904092831-041f55477654 h1:xnny8uD+g29OPcxfFK6y42IB7eTp5JgSeDLYk19BlKE=
 github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces v0.0.0-20190904092831-041f55477654 h1:jdRROrB+78x7TTpk9OABcGpScXYlqidQYN3rXS6Amj4=
 github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces v0.0.0-20190904092831-041f55477654/go.mod h1:iHH60YxCMwZHKbsAokvNrWvvrhyrWosFpDLtQ1R1zYE=
+github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
+github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
+github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
+github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
+github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
+github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
+github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
+github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I=
+github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
+github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
@@ -15,11 +45,22 @@ github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/govau/cf-common v0.0.7 h1:uhp1P6XM6GGzu1+A4C7LELLX/9mCmH6W5DpJZC0kWmo=
 github.com/govau/cf-common v0.0.7/go.mod h1:5xL/OfE7wxeyHlXb7iei0rAbdQ/5v6dF18BZknPv7NQ=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.8 h1:QiWkFLKq0T7mpzwOTu6BzNDbfTE8OLrYhVKYMLF46Ok=
+github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8bbnE7CX5OEgg=
 github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s=
 github.com/labstack/gommon v0.2.8 h1:JvRqmeZcfrHC5u6uVleB4NxxNbzx6gpbJiQknDbKQu0=
 github.com/labstack/gommon v0.2.8/go.mod h1:/tj9csK2iPSBvn+3NLM9e52usepMtrd5ilFYA+wQNJ4=
+github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
@@ -27,13 +68,37 @@ github.com/mattn/go-isatty v0.0.6 h1:SrwhHcpV4nWrMGdNcC2kXpMfcBVYGDuTArqyhocJgvA
 github.com/mattn/go-isatty v0.0.6/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
+github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
+github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
 github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
+github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4 h1:gKMu1Bf6QINDnvyZuTaACm9ofY+PRh+5vFz4oxBZeF8=
@@ -41,15 +106,65 @@ github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4/go.mod h1:50w
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 h1:rjwSpXsdiK0dV8/Naq3kAw9ymfAeJIyd0upUIElB+lI=
+golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456 h1:ng0gs1AKnRRuEMZoTLLlbOd+C17zUDepwGQBb/n+JVg=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190710153321-831012c29e42 h1:4IOeC7p+OItq3+O5BWkcmVu2uBe3jekXau5S4QZX9DU=
 golang.org/x/tools v0.0.0-20190710153321-831012c29e42/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
 golang.org/x/tools/gopls v0.1.3 h1:CB5ECiPysqZrwxcyRjN+exyZpY0gODTZvNiqQi3lpeo=
 golang.org/x/tools/gopls v0.1.3/go.mod h1:vrCQzOKxvuiZLjCKSmbbov04oeBQQOb4VQqwYK2PWIY=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
+gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+k8s.io/api v0.0.0-20191115135540-bbc9463b57e5 h1:o1kKo74JxBOOhxPdKzTx54MJHwu+Z6Lv5/1tu8Qf9eM=
+k8s.io/api v0.0.0-20191115135540-bbc9463b57e5/go.mod h1:iA/8arsvelvo4IDqIhX4IbjTEKBGgvsf2OraTuRtLFU=
+k8s.io/apimachinery v0.0.0-20191115015347-3c7067801da2/go.mod h1:dXFS2zaQR8fyzuvRdJDHw2Aerij/yVGJSre0bZQSVJA=
+k8s.io/apimachinery v0.0.0-20191116203941-08e4eafd6d11 h1:bhkECxnKTGQNOBWeGEO2ulwvutKBKkvz4I+LAkByeIM=
+k8s.io/apimachinery v0.0.0-20191116203941-08e4eafd6d11/go.mod h1:dXFS2zaQR8fyzuvRdJDHw2Aerij/yVGJSre0bZQSVJA=
+k8s.io/client-go v11.0.0+incompatible h1:LBbX2+lOwY9flffWlJM7f1Ct8V2SRNiMRDFeiwnJo9o=
+k8s.io/client-go v11.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
+k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
+k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
+k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
+k8s.io/utils v0.0.0-20191114200735-6ca3b61696b6 h1:p0Ai3qVtkbCG/Af26dBmU0E1W58NID3hSSh7cMyylpM=
+k8s.io/utils v0.0.0-20191114200735-6ca3b61696b6/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
+sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
+sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
+sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
diff --git a/package-lock.json b/package-lock.json
index 18477c6d48..371bd48e7b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
           "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
           "dev": true,
           "requires": {
-            "tslib": "^1.9.0"
+            "tslib": "1.9.3"
           }
         }
       }
@@ -84,10 +84,10 @@
           "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
           "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"
           }
         },
         "ansi-styles": {
@@ -104,11 +104,11 @@
           "dev": true,
           "optional": 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"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "clone": {
@@ -136,12 +136,12 @@
           "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
           "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"
+            "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"
           }
         },
         "json-schema-traverse": {
@@ -156,15 +156,15 @@
           "integrity": "sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==",
           "dev": true,
           "requires": {
-            "clone": "^2.1.2",
-            "errno": "^0.1.1",
-            "graceful-fs": "^4.1.2",
-            "image-size": "~0.5.0",
-            "mime": "^1.4.1",
-            "mkdirp": "^0.5.0",
-            "promise": "^7.1.1",
-            "request": "^2.83.0",
-            "source-map": "~0.6.0"
+            "clone": "2.1.2",
+            "errno": "0.1.7",
+            "graceful-fs": "4.1.11",
+            "image-size": "0.5.5",
+            "mime": "1.6.0",
+            "mkdirp": "0.5.1",
+            "promise": "7.3.1",
+            "request": "2.88.0",
+            "source-map": "0.6.1"
           }
         },
         "mime-db": {
@@ -181,7 +181,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "mime-db": "~1.38.0"
+            "mime-db": "1.38.0"
           }
         },
         "node-sass": {
@@ -191,25 +191,25 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "async-foreach": "^0.1.3",
-            "chalk": "^1.1.1",
-            "cross-spawn": "^3.0.0",
-            "gaze": "^1.0.0",
-            "get-stdin": "^4.0.1",
-            "glob": "^7.0.3",
-            "in-publish": "^2.0.0",
-            "lodash.assign": "^4.2.0",
-            "lodash.clonedeep": "^4.3.2",
-            "lodash.mergewith": "^4.6.0",
-            "meow": "^3.7.0",
-            "mkdirp": "^0.5.1",
-            "nan": "^2.10.0",
-            "node-gyp": "^3.8.0",
-            "npmlog": "^4.0.0",
-            "request": "^2.88.0",
-            "sass-graph": "^2.2.4",
-            "stdout-stream": "^1.4.0",
-            "true-case-path": "^1.0.2"
+            "async-foreach": "0.1.3",
+            "chalk": "1.1.3",
+            "cross-spawn": "3.0.1",
+            "gaze": "1.1.3",
+            "get-stdin": "4.0.1",
+            "glob": "7.1.3",
+            "in-publish": "2.0.0",
+            "lodash.assign": "4.2.0",
+            "lodash.clonedeep": "4.5.0",
+            "lodash.mergewith": "4.6.2",
+            "meow": "3.7.0",
+            "mkdirp": "0.5.1",
+            "nan": "2.10.0",
+            "node-gyp": "3.8.0",
+            "npmlog": "4.1.2",
+            "request": "2.88.0",
+            "sass-graph": "2.2.4",
+            "stdout-stream": "1.4.0",
+            "true-case-path": "1.0.2"
           },
           "dependencies": {
             "request": {
@@ -219,26 +219,26 @@
               "dev": true,
               "optional": true,
               "requires": {
-                "aws-sign2": "~0.7.0",
-                "aws4": "^1.8.0",
-                "caseless": "~0.12.0",
-                "combined-stream": "~1.0.6",
-                "extend": "~3.0.2",
-                "forever-agent": "~0.6.1",
-                "form-data": "~2.3.2",
-                "har-validator": "~5.1.0",
-                "http-signature": "~1.2.0",
-                "is-typedarray": "~1.0.0",
-                "isstream": "~0.1.2",
-                "json-stringify-safe": "~5.0.1",
-                "mime-types": "~2.1.19",
-                "oauth-sign": "~0.9.0",
-                "performance-now": "^2.1.0",
-                "qs": "~6.5.2",
-                "safe-buffer": "^5.1.2",
-                "tough-cookie": "~2.4.3",
-                "tunnel-agent": "^0.6.0",
-                "uuid": "^3.3.2"
+                "aws-sign2": "0.7.0",
+                "aws4": "1.8.0",
+                "caseless": "0.12.0",
+                "combined-stream": "1.0.6",
+                "extend": "3.0.2",
+                "forever-agent": "0.6.1",
+                "form-data": "2.3.2",
+                "har-validator": "5.1.3",
+                "http-signature": "1.2.0",
+                "is-typedarray": "1.0.0",
+                "isstream": "0.1.2",
+                "json-stringify-safe": "5.0.1",
+                "mime-types": "2.1.22",
+                "oauth-sign": "0.9.0",
+                "performance-now": "2.1.0",
+                "qs": "6.5.2",
+                "safe-buffer": "5.1.2",
+                "tough-cookie": "2.4.3",
+                "tunnel-agent": "0.6.0",
+                "uuid": "3.3.2"
               }
             }
           }
@@ -249,7 +249,7 @@
           "integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
           "dev": true,
           "requires": {
-            "is-wsl": "^1.1.0"
+            "is-wsl": "1.1.0"
           }
         },
         "rxjs": {
@@ -258,7 +258,7 @@
           "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
           "dev": true,
           "requires": {
-            "tslib": "^1.9.0"
+            "tslib": "1.9.3"
           }
         },
         "semver": {
@@ -287,7 +287,7 @@
           "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
           "dev": true,
           "requires": {
-            "punycode": "^2.1.0"
+            "punycode": "2.1.1"
           }
         },
         "uuid": {
@@ -317,7 +317,7 @@
           "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
           "dev": true,
           "requires": {
-            "tslib": "^1.9.0"
+            "tslib": "1.9.3"
           }
         },
         "semver": {
@@ -365,7 +365,7 @@
           "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
           "dev": true,
           "requires": {
-            "tslib": "^1.9.0"
+            "tslib": "1.9.3"
           }
         }
       }
@@ -389,10 +389,10 @@
           "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
           "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"
           }
         },
         "chokidar": {
@@ -401,19 +401,19 @@
           "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
           "dev": true,
           "requires": {
-            "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"
+            "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.1",
+            "is-glob": "4.0.0",
+            "lodash.debounce": "4.0.8",
+            "normalize-path": "2.1.1",
+            "path-is-absolute": "1.0.1",
+            "readdirp": "2.1.0",
+            "upath": "1.1.0"
           }
         },
         "fast-deep-equal": {
@@ -434,7 +434,7 @@
           "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
           "dev": true,
           "requires": {
-            "tslib": "^1.9.0"
+            "tslib": "1.9.3"
           }
         },
         "source-map": {
@@ -449,7 +449,7 @@
           "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
           "dev": true,
           "requires": {
-            "punycode": "^2.1.0"
+            "punycode": "2.1.1"
           }
         }
       }
@@ -470,7 +470,7 @@
           "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
           "dev": true,
           "requires": {
-            "tslib": "^1.9.0"
+            "tslib": "1.9.3"
           }
         }
       }
@@ -480,7 +480,7 @@
       "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.2.6.tgz",
       "integrity": "sha512-ICKPS+bKabhQNqnPoVZegUAhgNPbVFlrxHoJ+ZZeVGxw5iBE8TnP3a2sRvakdMTKhykDlwVVGMKLxu2Y34uhmg==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@angular/cdk": {
@@ -488,8 +488,8 @@
       "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-7.3.3.tgz",
       "integrity": "sha512-0M3nwq+c9+d+p0XeU12I9djutlsajRrxcu7AvHQXUs/5grYFsXsX0f468qXDiKmcgqGUBNtN2fBOUhGNlispuQ==",
       "requires": {
-        "parse5": "^5.0.0",
-        "tslib": "^1.7.1"
+        "parse5": "5.1.0",
+        "tslib": "1.9.3"
       },
       "dependencies": {
         "parse5": {
@@ -526,10 +526,10 @@
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
           "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
           "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"
           }
         },
         "ansi-escapes": {
@@ -549,19 +549,19 @@
           "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
           "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
           "requires": {
-            "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"
+            "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.1",
+            "is-glob": "4.0.0",
+            "lodash.debounce": "4.0.8",
+            "normalize-path": "2.1.1",
+            "path-is-absolute": "1.0.1",
+            "readdirp": "2.1.0",
+            "upath": "1.1.0"
           }
         },
         "cli-cursor": {
@@ -570,7 +570,7 @@
           "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
           "dev": true,
           "requires": {
-            "restore-cursor": "^2.0.0"
+            "restore-cursor": "2.0.0"
           }
         },
         "fast-deep-equal": {
@@ -584,7 +584,7 @@
           "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
           "dev": true,
           "requires": {
-            "escape-string-regexp": "^1.0.5"
+            "escape-string-regexp": "1.0.5"
           }
         },
         "inquirer": {
@@ -593,19 +593,19 @@
           "integrity": "sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==",
           "dev": true,
           "requires": {
-            "ansi-escapes": "^3.0.0",
-            "chalk": "^2.0.0",
-            "cli-cursor": "^2.1.0",
-            "cli-width": "^2.0.0",
-            "external-editor": "^3.0.0",
-            "figures": "^2.0.0",
-            "lodash": "^4.17.10",
+            "ansi-escapes": "3.2.0",
+            "chalk": "2.2.2",
+            "cli-cursor": "2.1.0",
+            "cli-width": "2.2.0",
+            "external-editor": "3.0.3",
+            "figures": "2.0.0",
+            "lodash": "4.17.15",
             "mute-stream": "0.0.7",
-            "run-async": "^2.2.0",
-            "rxjs": "^6.1.0",
-            "string-width": "^2.1.0",
-            "strip-ansi": "^5.0.0",
-            "through": "^2.3.6"
+            "run-async": "2.3.0",
+            "rxjs": "6.3.3",
+            "string-width": "2.1.1",
+            "strip-ansi": "5.0.0",
+            "through": "2.3.8"
           },
           "dependencies": {
             "lodash": {
@@ -644,7 +644,7 @@
           "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
           "dev": true,
           "requires": {
-            "mimic-fn": "^1.0.0"
+            "mimic-fn": "1.2.0"
           }
         },
         "opn": {
@@ -653,7 +653,7 @@
           "integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
           "dev": true,
           "requires": {
-            "is-wsl": "^1.1.0"
+            "is-wsl": "1.1.0"
           }
         },
         "restore-cursor": {
@@ -662,8 +662,8 @@
           "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
           "dev": true,
           "requires": {
-            "onetime": "^2.0.0",
-            "signal-exit": "^3.0.2"
+            "onetime": "2.0.1",
+            "signal-exit": "3.0.2"
           }
         },
         "run-async": {
@@ -672,7 +672,7 @@
           "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
           "dev": true,
           "requires": {
-            "is-promise": "^2.1.0"
+            "is-promise": "2.1.0"
           }
         },
         "rxjs": {
@@ -681,7 +681,7 @@
           "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
           "dev": true,
           "requires": {
-            "tslib": "^1.9.0"
+            "tslib": "1.9.3"
           }
         },
         "semver": {
@@ -701,8 +701,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": {
@@ -711,7 +711,7 @@
               "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
               "dev": true,
               "requires": {
-                "ansi-regex": "^3.0.0"
+                "ansi-regex": "3.0.0"
               }
             }
           }
@@ -722,7 +722,7 @@
           "integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^4.0.0"
+            "ansi-regex": "4.0.0"
           },
           "dependencies": {
             "ansi-regex": {
@@ -738,7 +738,7 @@
           "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
           "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
           "requires": {
-            "punycode": "^2.1.0"
+            "punycode": "2.1.1"
           }
         }
       }
@@ -748,7 +748,7 @@
       "resolved": "https://registry.npmjs.org/@angular/common/-/common-7.2.6.tgz",
       "integrity": "sha512-jzWUgsgS0dmPy7yDHX4qCqVpt7ZZmHhApgkg5RkzTAlp+0cvZ/KsDpBgHXnZUIfmk/5g1/EtTbkbClgp1kCkIg==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@angular/compiler": {
@@ -756,7 +756,7 @@
       "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.6.tgz",
       "integrity": "sha512-GXdvgH8oxK8HRh/FelN3U5p0tsTUwGh8b/iuuJKaunBSSDDjIy7pPnn3zT+lN4YeEi6qN1XWudt+HpWHYHyymg==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@angular/compiler-cli": {
@@ -766,15 +766,15 @@
       "dev": true,
       "requires": {
         "canonical-path": "1.0.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",
-        "shelljs": "^0.8.1",
-        "source-map": "^0.6.1",
-        "tslib": "^1.9.0",
+        "chokidar": "2.1.2",
+        "convert-source-map": "1.5.1",
+        "dependency-graph": "0.7.2",
+        "magic-string": "0.25.2",
+        "minimist": "1.2.0",
+        "reflect-metadata": "0.1.13",
+        "shelljs": "0.8.3",
+        "source-map": "0.6.1",
+        "tslib": "1.9.3",
         "yargs": "9.0.1"
       },
       "dependencies": {
@@ -796,18 +796,18 @@
           "integrity": "sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==",
           "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.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.1",
+            "is-glob": "4.0.0",
+            "normalize-path": "3.0.0",
+            "path-is-absolute": "1.0.1",
+            "readdirp": "2.2.1",
+            "upath": "1.1.0"
           }
         },
         "cliui": {
@@ -816,9 +816,9 @@
           "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
           "dev": true,
           "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wrap-ansi": "^2.0.0"
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wrap-ansi": "2.1.0"
           },
           "dependencies": {
             "string-width": {
@@ -827,9 +827,9 @@
               "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
               "dev": true,
               "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
+                "code-point-at": "1.1.0",
+                "is-fullwidth-code-point": "1.0.0",
+                "strip-ansi": "3.0.1"
               }
             }
           }
@@ -840,10 +840,10 @@
           "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "strip-bom": "^3.0.0"
+            "graceful-fs": "4.1.11",
+            "parse-json": "2.2.0",
+            "pify": "2.3.0",
+            "strip-bom": "3.0.0"
           }
         },
         "mem": {
@@ -852,7 +852,7 @@
           "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
           "dev": true,
           "requires": {
-            "mimic-fn": "^1.0.0"
+            "mimic-fn": "1.2.0"
           }
         },
         "minimist": {
@@ -873,9 +873,9 @@
           "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
           "dev": true,
           "requires": {
-            "execa": "^0.7.0",
-            "lcid": "^1.0.0",
-            "mem": "^1.1.0"
+            "execa": "0.7.0",
+            "lcid": "1.0.0",
+            "mem": "1.1.0"
           }
         },
         "path-type": {
@@ -884,7 +884,7 @@
           "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
           "dev": true,
           "requires": {
-            "pify": "^2.0.0"
+            "pify": "2.3.0"
           }
         },
         "pify": {
@@ -899,9 +899,9 @@
           "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
           "dev": true,
           "requires": {
-            "load-json-file": "^2.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^2.0.0"
+            "load-json-file": "2.0.0",
+            "normalize-package-data": "2.4.0",
+            "path-type": "2.0.0"
           }
         },
         "read-pkg-up": {
@@ -910,8 +910,8 @@
           "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
           "dev": true,
           "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^2.0.0"
+            "find-up": "2.1.0",
+            "read-pkg": "2.0.0"
           }
         },
         "readdirp": {
@@ -920,9 +920,9 @@
           "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.11",
-            "micromatch": "^3.1.10",
-            "readable-stream": "^2.0.2"
+            "graceful-fs": "4.1.11",
+            "micromatch": "3.1.10",
+            "readable-stream": "2.3.6"
           }
         },
         "shelljs": {
@@ -931,9 +931,9 @@
           "integrity": "sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==",
           "dev": true,
           "requires": {
-            "glob": "^7.0.0",
-            "interpret": "^1.0.0",
-            "rechoir": "^0.6.2"
+            "glob": "7.1.2",
+            "interpret": "1.1.0",
+            "rechoir": "0.6.2"
           }
         },
         "source-map": {
@@ -948,8 +948,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": {
             "is-fullwidth-code-point": {
@@ -964,7 +964,7 @@
               "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
               "dev": true,
               "requires": {
-                "ansi-regex": "^3.0.0"
+                "ansi-regex": "3.0.0"
               }
             }
           }
@@ -993,19 +993,19 @@
           "integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=",
           "dev": true,
           "requires": {
-            "camelcase": "^4.1.0",
-            "cliui": "^3.2.0",
-            "decamelize": "^1.1.1",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^2.0.0",
-            "read-pkg-up": "^2.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",
-            "yargs-parser": "^7.0.0"
+            "camelcase": "4.1.0",
+            "cliui": "3.2.0",
+            "decamelize": "1.2.0",
+            "get-caller-file": "1.0.2",
+            "os-locale": "2.1.0",
+            "read-pkg-up": "2.0.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": "7.0.0"
           }
         },
         "yargs-parser": {
@@ -1014,7 +1014,7 @@
           "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
           "dev": true,
           "requires": {
-            "camelcase": "^4.1.0"
+            "camelcase": "4.1.0"
           }
         }
       }
@@ -1024,7 +1024,7 @@
       "resolved": "https://registry.npmjs.org/@angular/core/-/core-7.2.6.tgz",
       "integrity": "sha512-MZg17DWH1KUoDa9wFYK9Z+3F7DnUW2DjSwGyIi9U4cB54IWFhgt1JsA0mcuSYuRSRpvwaArCDC2AN90f+0/EFA==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@angular/flex-layout": {
@@ -1032,7 +1032,7 @@
       "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-7.0.0-beta.23.tgz",
       "integrity": "sha512-jH2i3i/M7SbK6scVlj2urVL5OhzwavbQ7KwvUjyc/UwccKnnzuOuWEGCINLja/aoaUO3I35LluCLv6a6VN0olA==",
       "requires": {
-        "tslib": "^1.7.1"
+        "tslib": "1.9.3"
       }
     },
     "@angular/forms": {
@@ -1040,7 +1040,7 @@
       "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.2.6.tgz",
       "integrity": "sha512-At72AJNGe+Zzmryb7DDIG+iws7zKdgZx/eEVjZ/Obu/yREefbZY4R7q83U90Vljtn97BwJPx9ur9ttxE9WpnlA==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@angular/http": {
@@ -1048,7 +1048,7 @@
       "resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.6.tgz",
       "integrity": "sha512-B5TC8JFW/I+ms5iJthGjf/eg1tKKqpO6yrOpDSQofHG7Dd4dozyGXGznFJTRFfNda5rku61/qnQaa8SyQyuplQ==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@angular/language-service": {
@@ -1062,7 +1062,7 @@
       "resolved": "https://registry.npmjs.org/@angular/material/-/material-7.3.3.tgz",
       "integrity": "sha512-DZdJaVpXsd5QlfpN5P871llw8AKh5QvRiyro3QRmEajYN85Xiawqpbt7O60TrwcFM6DzYLI3UeyWq8LFdmi/+Q==",
       "requires": {
-        "tslib": "^1.7.1"
+        "tslib": "1.9.3"
       }
     },
     "@angular/material-moment-adapter": {
@@ -1070,7 +1070,7 @@
       "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-7.3.3.tgz",
       "integrity": "sha512-Fp2EcFpwdwa5qWWBa7G1mJZuaQ3oD3pohyo04HD2ud8YFP5IPbeoHVc65JC7TIwQFbVKk0lojXK3b2vQXZOapw==",
       "requires": {
-        "tslib": "^1.7.1"
+        "tslib": "1.9.3"
       }
     },
     "@angular/platform-browser": {
@@ -1078,7 +1078,7 @@
       "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.2.6.tgz",
       "integrity": "sha512-VE4yS4l8Cdx6DlvrbOFOZDKmQuyz1RhVcshgSt9hKlkehvAXMtX8Sqnp6po7z0aPykTh0TZZtMtLEerkFEe+DA==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@angular/platform-browser-dynamic": {
@@ -1086,7 +1086,7 @@
       "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.6.tgz",
       "integrity": "sha512-/co/q4v11nKin2MFscCMZyixbW103I2FxbPgCAYBN5NSvfIwTrt5J6xWmDoKJ8HkZBqL3R9B+uhYdzsRN/pQxg==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@angular/platform-server": {
@@ -1094,9 +1094,9 @@
       "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-7.2.6.tgz",
       "integrity": "sha512-rtLT0BxgEGJDYGMeFNYfna3H91JITFfm4Qd86nH7EmR1mVWa563lSQle1VWwbQhRbj5fDhwt+anbVwz7SEn7ew==",
       "requires": {
-        "domino": "^2.1.0",
-        "tslib": "^1.9.0",
-        "xhr2": "^0.1.4"
+        "domino": "2.1.2",
+        "tslib": "1.9.3",
+        "xhr2": "0.1.4"
       }
     },
     "@angular/router": {
@@ -1104,7 +1104,7 @@
       "resolved": "https://registry.npmjs.org/@angular/router/-/router-7.2.6.tgz",
       "integrity": "sha512-ayMVor4Mu4wk7JKpt51UxHovnLB4munZ8ELR1CA4w+s0rJsSSwyB4WXElC+DbgCyl7BYLAaGui2c5DbTAJ9jlw==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "@mrmlnc/readdir-enhanced": {
@@ -1113,8 +1113,8 @@
       "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
       "dev": true,
       "requires": {
-        "call-me-maybe": "^1.0.1",
-        "glob-to-regexp": "^0.3.0"
+        "call-me-maybe": "1.0.1",
+        "glob-to-regexp": "0.3.0"
       }
     },
     "@ngrx/effects": {
@@ -1162,7 +1162,7 @@
           "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
           "dev": true,
           "requires": {
-            "tslib": "^1.9.0"
+            "tslib": "1.9.3"
           }
         }
       }
@@ -1179,20 +1179,20 @@
       "integrity": "sha512-rt+YzuNpmVGIt5agPM5Z61cMaSLRmEcpiI4HdVL8eOBw7HicVk2N894rHbQdU3/LHZUt592zq8Z7jOFUtbV3JQ==",
       "dev": true,
       "requires": {
-        "@types/yargs": "^11.0.0",
-        "app-root-path": "^2.0.1",
+        "@types/yargs": "11.1.2",
+        "app-root-path": "2.1.0",
         "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.3.0",
+        "opn": "5.3.0",
         "rxjs": "6.3.3",
         "semver": "5.4.1",
         "strip-json-comments": "2.0.1",
         "tmp": "0.0.33",
-        "viz.js": "^1.8.1",
-        "yargs": "^11.0.0",
+        "viz.js": "1.8.2",
+        "yargs": "11.1.0",
         "yargs-parser": "10.0.0"
       },
       "dependencies": {
@@ -1214,9 +1214,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.0.0"
+            "string-width": "2.1.1",
+            "strip-ansi": "4.0.0",
+            "wrap-ansi": "2.1.0"
           }
         },
         "fs-extra": {
@@ -1225,9 +1225,9 @@
           "integrity": "sha512-lk2cUCo8QzbiEWEbt7Cw3m27WMiRG321xsssbcIpfMhpRjrlC08WBOVQqj1/nQYYNnPtyIhP1oqLO3QwT2tPCw==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
+            "graceful-fs": "4.1.11",
+            "jsonfile": "4.0.0",
+            "universalify": "0.1.1"
           }
         },
         "ignore": {
@@ -1248,7 +1248,7 @@
           "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.6"
+            "graceful-fs": "4.1.11"
           }
         },
         "mem": {
@@ -1257,7 +1257,7 @@
           "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
           "dev": true,
           "requires": {
-            "mimic-fn": "^1.0.0"
+            "mimic-fn": "1.2.0"
           }
         },
         "os-locale": {
@@ -1266,9 +1266,9 @@
           "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
           "dev": true,
           "requires": {
-            "execa": "^0.7.0",
-            "lcid": "^1.0.0",
-            "mem": "^1.1.0"
+            "execa": "0.7.0",
+            "lcid": "1.0.0",
+            "mem": "1.1.0"
           }
         },
         "rxjs": {
@@ -1277,7 +1277,7 @@
           "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
           "dev": true,
           "requires": {
-            "tslib": "^1.9.0"
+            "tslib": "1.9.3"
           }
         },
         "semver": {
@@ -1292,8 +1292,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"
           }
         },
         "strip-ansi": {
@@ -1302,7 +1302,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "3.0.0"
           }
         },
         "strip-json-comments": {
@@ -1329,18 +1329,18 @@
           "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
           "dev": true,
           "requires": {
-            "cliui": "^4.0.0",
-            "decamelize": "^1.1.1",
-            "find-up": "^2.1.0",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^2.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",
-            "yargs-parser": "^9.0.2"
+            "cliui": "4.1.0",
+            "decamelize": "1.2.0",
+            "find-up": "2.1.0",
+            "get-caller-file": "1.0.2",
+            "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": {
@@ -1349,7 +1349,7 @@
               "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
               "dev": true,
               "requires": {
-                "camelcase": "^4.1.0"
+                "camelcase": "4.1.0"
               }
             }
           }
@@ -1360,7 +1360,7 @@
           "integrity": "sha512-+DHejWujTVYeMHLff8U96rLc4uE4Emncoftvn5AjhB1Jw1pWxLzgBUT/WYbPrHmy6YPEBTZQx5myHhVcuuu64g==",
           "dev": true,
           "requires": {
-            "camelcase": "^4.1.0"
+            "camelcase": "4.1.0"
           }
         }
       }
@@ -1381,10 +1381,10 @@
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
           "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
           "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"
           }
         },
         "chokidar": {
@@ -1392,19 +1392,19 @@
           "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
           "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
           "requires": {
-            "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"
+            "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.1",
+            "is-glob": "4.0.0",
+            "lodash.debounce": "4.0.8",
+            "normalize-path": "2.1.1",
+            "path-is-absolute": "1.0.1",
+            "readdirp": "2.1.0",
+            "upath": "1.1.0"
           }
         },
         "fast-deep-equal": {
@@ -1422,7 +1422,7 @@
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
           "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
           "requires": {
-            "tslib": "^1.9.0"
+            "tslib": "1.9.3"
           }
         },
         "source-map": {
@@ -1441,7 +1441,7 @@
           "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
           "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
           "requires": {
-            "punycode": "^2.1.0"
+            "punycode": "2.1.1"
           }
         }
       }
@@ -1467,10 +1467,10 @@
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
           "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
           "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"
           }
         },
         "chokidar": {
@@ -1478,19 +1478,19 @@
           "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
           "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
           "requires": {
-            "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"
+            "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.1",
+            "is-glob": "4.0.0",
+            "lodash.debounce": "4.0.8",
+            "normalize-path": "2.1.1",
+            "path-is-absolute": "1.0.1",
+            "readdirp": "2.1.0",
+            "upath": "1.1.0"
           }
         },
         "fast-deep-equal": {
@@ -1509,7 +1509,7 @@
           "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
           "dev": true,
           "requires": {
-            "tslib": "^1.9.0"
+            "tslib": "1.9.3"
           }
         },
         "semver": {
@@ -1528,7 +1528,7 @@
           "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
           "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
           "requires": {
-            "punycode": "^2.1.0"
+            "punycode": "2.1.1"
           }
         }
       }
@@ -1538,18 +1538,63 @@
       "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-10.1.0.tgz",
       "integrity": "sha512-0nZ3ub5o/qQfFMz+av89u/VKqsqiVhPFBDDOOPq2qimP83i+pcb0i3MEao7PSxIbKAEkL/pwRcEJw4KDZ8B67w==",
       "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"
+        "d3": "4.13.0",
+        "d3-array": "1.2.4",
+        "d3-brush": "1.0.6",
+        "d3-color": "1.2.3",
+        "d3-force": "1.2.0",
+        "d3-format": "1.3.2",
+        "d3-hierarchy": "1.1.8",
+        "d3-interpolate": "1.3.2",
+        "d3-scale": "1.0.7",
+        "d3-selection": "1.4.0",
+        "d3-shape": "1.3.4",
+        "d3-time-format": "2.1.3"
+      }
+    },
+    "@swimlane/ngx-graph": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@swimlane/ngx-graph/-/ngx-graph-6.2.0.tgz",
+      "integrity": "sha512-SiWd5iV6B1pTITlzMnbqav9XTmtaRgQJfROwqIZVEkliXzpyDC7VwTKE07C/5IK4oyWAAU5+v9fgBYGo0rud5Q==",
+      "requires": {
+        "@swimlane/ngx-charts": "12.0.1",
+        "d3-dispatch": "1.0.3",
+        "d3-ease": "1.0.6",
+        "d3-force": "1.2.0",
+        "d3-selection": "1.4.0",
+        "d3-shape": "1.3.4",
+        "d3-timer": "1.0.7",
+        "d3-transition": "1.1.1",
+        "dagre": "0.8.4",
+        "transformation-matrix": "1.15.3",
+        "tslib": "1.9.3",
+        "webcola": "3.4.0"
+      },
+      "dependencies": {
+        "@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.13.0",
+            "d3-array": "1.2.4",
+            "d3-brush": "1.0.6",
+            "d3-color": "1.2.3",
+            "d3-force": "1.2.0",
+            "d3-format": "1.3.2",
+            "d3-hierarchy": "1.1.8",
+            "d3-interpolate": "1.3.2",
+            "d3-scale": "1.0.7",
+            "d3-selection": "1.4.0",
+            "d3-shape": "1.3.4",
+            "d3-time-format": "2.1.3"
+          }
+        },
+        "d3-ease": {
+          "version": "1.0.6",
+          "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.6.tgz",
+          "integrity": "sha512-SZ/lVU7LRXafqp7XtIcBdxnWl8yyLpgOmzAk0mWBI9gXNzLDx5ybZgnRbH9dN/yY5tzVBqCQ9avltSnqVwessQ=="
+        }
       }
     },
     "@tweenjs/tween.js": {
@@ -1586,7 +1631,7 @@
       "integrity": "sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ==",
       "dev": true,
       "requires": {
-        "@types/node": "*"
+        "@types/node": "11.9.4"
       }
     },
     "@types/jasmine": {
@@ -1601,7 +1646,7 @@
       "integrity": "sha512-hYDVmQZT5VA2kigd4H4bv7vl/OhlympwREUemqBdOqtrYTo5Ytm12a5W5/nGgGYdanGVxj0x/VhZ7J3hOg/YKg==",
       "dev": true,
       "requires": {
-        "@types/jasmine": "*"
+        "@types/jasmine": "2.8.7"
       }
     },
     "@types/karma": {
@@ -1610,9 +1655,9 @@
       "integrity": "sha512-xm+iMKgLSpTPo1Z7wLKbrZt8aLzA1udb9UOb9+OSDMFIufqlbp0DXQpY75EQ3ETi6EJiaohIodBlMs+UD4NSMQ==",
       "dev": true,
       "requires": {
-        "@types/bluebird": "*",
-        "@types/node": "*",
-        "log4js": "^3.0.0"
+        "@types/bluebird": "3.5.25",
+        "@types/node": "11.9.4",
+        "log4js": "3.0.6"
       }
     },
     "@types/marked": {
@@ -1625,7 +1670,7 @@
       "resolved": "https://registry.npmjs.org/@types/moment-timezone/-/moment-timezone-0.5.12.tgz",
       "integrity": "sha512-hnHH2+Efg2vExr/dSz+IX860nSiyk9Sk4pJF2EmS11lRpMcNXeB4KBW5xcgw2QPsb9amTXdsVNEe5IoJXiT0uw==",
       "requires": {
-        "moment": ">=2.14.0"
+        "moment": "2.24.0"
       }
     },
     "@types/node": {
@@ -1646,10 +1691,10 @@
       "integrity": "sha512-ZgEZ1TiD+KGA9LiAAPPJL68Id2UWfeSO62ijSXZjFJArVV+2pKcsVHmrcu+1oiE3q6eDGiFiSolRc4JHoerBBg==",
       "dev": true,
       "requires": {
-        "@types/caseless": "*",
-        "@types/form-data": "*",
-        "@types/node": "*",
-        "@types/tough-cookie": "*"
+        "@types/caseless": "0.12.1",
+        "@types/form-data": "2.2.1",
+        "@types/node": "11.9.4",
+        "@types/tough-cookie": "2.3.5"
       }
     },
     "@types/selenium-webdriver": {
@@ -1681,9 +1726,9 @@
       "integrity": "sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==",
       "dev": true,
       "requires": {
-        "@types/node": "*",
-        "@types/source-list-map": "*",
-        "source-map": "^0.6.1"
+        "@types/node": "11.9.4",
+        "@types/source-list-map": "0.1.2",
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -1774,7 +1819,7 @@
       "integrity": "sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==",
       "dev": true,
       "requires": {
-        "@xtuc/ieee754": "^1.2.0"
+        "@xtuc/ieee754": "1.2.0"
       }
     },
     "@webassemblyjs/leb128": {
@@ -1896,8 +1941,8 @@
       "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
       "dev": true,
       "requires": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
+        "jsonparse": "1.3.1",
+        "through": "2.3.8"
       }
     },
     "abbrev": {
@@ -1912,7 +1957,7 @@
       "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
       "dev": true,
       "requires": {
-        "mime-types": "~2.1.18",
+        "mime-types": "2.1.18",
         "negotiator": "0.6.1"
       }
     },
@@ -1934,7 +1979,7 @@
       "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
       "dev": true,
       "requires": {
-        "acorn": "^3.0.4"
+        "acorn": "3.3.0"
       },
       "dependencies": {
         "acorn": {
@@ -1963,7 +2008,7 @@
       "integrity": "sha512-c+R/U5X+2zz2+UCrCFv6odQzJdoqI+YecuhnAJLa1zYaMc13zPfwMwZrr91Pd1DYNo/yPRbiM4WVf9whgwFsIg==",
       "dev": true,
       "requires": {
-        "es6-promisify": "^5.0.0"
+        "es6-promisify": "5.0.0"
       }
     },
     "agentkeepalive": {
@@ -1972,7 +2017,7 @@
       "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==",
       "dev": true,
       "requires": {
-        "humanize-ms": "^1.2.1"
+        "humanize-ms": "1.2.1"
       }
     },
     "ajv": {
@@ -1981,10 +2026,10 @@
       "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
       "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"
       },
       "dependencies": {
         "fast-deep-equal": {
@@ -2024,7 +2069,7 @@
       "resolved": "https://registry.npmjs.org/angular2-virtual-scroll/-/angular2-virtual-scroll-0.3.2.tgz",
       "integrity": "sha512-eyPb6FnaA8d4lBh3v31F3YLLblr9Nn8zv25uKVmxPkA2/te6QDg0sPMqy6o8GouwW+U9LKzcUJZZBHa0ICY/rg==",
       "requires": {
-        "@tweenjs/tween.js": "^17.1.0"
+        "@tweenjs/tween.js": "17.2.0"
       }
     },
     "ansi-align": {
@@ -2033,7 +2078,7 @@
       "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=",
       "dev": true,
       "requires": {
-        "string-width": "^2.0.0"
+        "string-width": "2.1.1"
       },
       "dependencies": {
         "ansi-regex": {
@@ -2054,8 +2099,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"
           }
         },
         "strip-ansi": {
@@ -2064,7 +2109,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "3.0.0"
           }
         }
       }
@@ -2075,7 +2120,7 @@
       "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
       "dev": true,
       "requires": {
-        "ansi-wrap": "^0.1.0"
+        "ansi-wrap": "0.1.0"
       }
     },
     "ansi-cyan": {
@@ -2129,7 +2174,7 @@
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
       "requires": {
-        "color-convert": "^1.9.0"
+        "color-convert": "1.9.1"
       }
     },
     "ansi-wrap": {
@@ -2143,8 +2188,8 @@
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
       "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "requires": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
+        "micromatch": "3.1.10",
+        "normalize-path": "2.1.1"
       }
     },
     "app-root-path": {
@@ -2159,7 +2204,7 @@
       "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
       "dev": true,
       "requires": {
-        "buffer-equal": "^1.0.0"
+        "buffer-equal": "1.0.0"
       }
     },
     "aproba": {
@@ -2180,8 +2225,8 @@
       "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
       "dev": true,
       "requires": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
+        "delegates": "1.0.0",
+        "readable-stream": "2.3.6"
       }
     },
     "argparse": {
@@ -2190,7 +2235,7 @@
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
       "requires": {
-        "sprintf-js": "~1.0.2"
+        "sprintf-js": "1.0.3"
       }
     },
     "argv": {
@@ -2210,7 +2255,7 @@
       "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
       "dev": true,
       "requires": {
-        "make-iterator": "^1.0.0"
+        "make-iterator": "1.0.1"
       }
     },
     "arr-flatten": {
@@ -2224,7 +2269,7 @@
       "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
       "dev": true,
       "requires": {
-        "make-iterator": "^1.0.0"
+        "make-iterator": "1.0.1"
       }
     },
     "arr-union": {
@@ -2262,8 +2307,8 @@
       "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
       "dev": true,
       "requires": {
-        "array-slice": "^1.0.0",
-        "is-number": "^4.0.0"
+        "array-slice": "1.1.0",
+        "is-number": "4.0.0"
       },
       "dependencies": {
         "is-number": {
@@ -2280,7 +2325,7 @@
       "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
       "dev": true,
       "requires": {
-        "is-number": "^4.0.0"
+        "is-number": "4.0.0"
       },
       "dependencies": {
         "is-number": {
@@ -2315,9 +2360,9 @@
       "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
       "dev": true,
       "requires": {
-        "default-compare": "^1.0.0",
-        "get-value": "^2.0.6",
-        "kind-of": "^5.0.2"
+        "default-compare": "1.0.0",
+        "get-value": "2.0.6",
+        "kind-of": "5.1.0"
       },
       "dependencies": {
         "kind-of": {
@@ -2334,7 +2379,7 @@
       "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
       "dev": true,
       "requires": {
-        "array-uniq": "^1.0.1"
+        "array-uniq": "1.0.3"
       }
     },
     "array-uniq": {
@@ -2378,9 +2423,9 @@
       "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+        "bn.js": "4.11.8",
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1"
       }
     },
     "assert": {
@@ -2421,10 +2466,10 @@
       "integrity": "sha512-R1BaUeJ4PMoLNJuk+0tLJgjmEqVsdN118+Z8O+alhnQDQgy0kmD5Mqi0DNEmMx2LM0Ed5yekKu+ZXYvIHceicg==",
       "dev": true,
       "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.2",
-        "process-nextick-args": "^1.0.7",
-        "stream-exhaust": "^1.0.1"
+        "end-of-stream": "1.4.1",
+        "once": "1.4.0",
+        "process-nextick-args": "1.0.7",
+        "stream-exhaust": "1.0.2"
       },
       "dependencies": {
         "process-nextick-args": {
@@ -2458,7 +2503,7 @@
       "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
       "dev": true,
       "requires": {
-        "async-done": "^1.2.2"
+        "async-done": "1.3.1"
       }
     },
     "asynckit": {
@@ -2478,12 +2523,12 @@
       "integrity": "sha512-Yp51mevbOEdxDUy5WjiKtpQaecqYq9OqZSL04rSoCiry7Tc5I9FEyo3bfxiTJc1DfHeKwSFCUYbBAiOQ2VGfiw==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.4.1",
-        "caniuse-lite": "^1.0.30000929",
-        "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "postcss": "^7.0.13",
-        "postcss-value-parser": "^3.3.1"
+        "browserslist": "4.4.1",
+        "caniuse-lite": "1.0.30000938",
+        "normalize-range": "0.1.2",
+        "num2fraction": "1.2.2",
+        "postcss": "7.0.14",
+        "postcss-value-parser": "3.3.1"
       }
     },
     "aws-sign2": {
@@ -2504,9 +2549,9 @@
       "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
       "dev": true,
       "requires": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
+        "chalk": "1.1.3",
+        "esutils": "2.0.2",
+        "js-tokens": "3.0.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -2521,11 +2566,11 @@
           "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"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "supports-color": {
@@ -2542,14 +2587,14 @@
       "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"
+        "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.15",
+        "source-map": "0.5.7",
+        "trim-right": "1.0.1"
       },
       "dependencies": {
         "lodash": {
@@ -2572,7 +2617,7 @@
       "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
       "dev": true,
       "requires": {
-        "babel-runtime": "^6.22.0"
+        "babel-runtime": "6.26.0"
       }
     },
     "babel-runtime": {
@@ -2581,8 +2626,8 @@
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
       "dev": true,
       "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
+        "core-js": "2.6.5",
+        "regenerator-runtime": "0.11.1"
       }
     },
     "babel-template": {
@@ -2591,11 +2636,11 @@
       "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-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "lodash": "4.17.13"
       }
     },
     "babel-traverse": {
@@ -2604,15 +2649,15 @@
       "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-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.9",
+        "globals": "9.18.0",
+        "invariant": "2.2.4",
+        "lodash": "4.17.13"
       }
     },
     "babel-types": {
@@ -2621,10 +2666,10 @@
       "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"
+        "babel-runtime": "6.26.0",
+        "esutils": "2.0.2",
+        "lodash": "4.17.15",
+        "to-fast-properties": "1.0.3"
       },
       "dependencies": {
         "lodash": {
@@ -2647,15 +2692,15 @@
       "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
       "dev": true,
       "requires": {
-        "arr-filter": "^1.1.1",
-        "arr-flatten": "^1.0.1",
-        "arr-map": "^2.0.0",
-        "array-each": "^1.0.0",
-        "array-initial": "^1.0.0",
-        "array-last": "^1.1.1",
-        "async-done": "^1.2.2",
-        "async-settle": "^1.0.0",
-        "now-and-later": "^2.0.0"
+        "arr-filter": "1.1.2",
+        "arr-flatten": "1.1.0",
+        "arr-map": "2.0.2",
+        "array-each": "1.0.1",
+        "array-initial": "1.1.0",
+        "array-last": "1.3.0",
+        "async-done": "1.3.1",
+        "async-settle": "1.0.0",
+        "now-and-later": "2.0.1"
       }
     },
     "backo2": {
@@ -2674,13 +2719,13 @@
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "requires": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
+        "cache-base": "1.0.1",
+        "class-utils": "0.3.6",
+        "component-emitter": "1.2.1",
+        "define-property": "1.0.0",
+        "isobject": "3.0.1",
+        "mixin-deep": "1.3.2",
+        "pascalcase": "0.1.1"
       },
       "dependencies": {
         "define-property": {
@@ -2688,7 +2733,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "requires": {
-            "is-descriptor": "^1.0.0"
+            "is-descriptor": "1.0.2"
           }
         },
         "is-accessor-descriptor": {
@@ -2696,7 +2741,7 @@
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-data-descriptor": {
@@ -2704,7 +2749,7 @@
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-descriptor": {
@@ -2712,9 +2757,9 @@
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
           }
         }
       }
@@ -2750,7 +2795,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "tweetnacl": "^0.14.3"
+        "tweetnacl": "0.14.5"
       }
     },
     "better-assert": {
@@ -2785,7 +2830,7 @@
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
       "dev": true,
       "requires": {
-        "inherits": "~2.0.0"
+        "inherits": "2.0.3"
       }
     },
     "blocking-proxy": {
@@ -2794,7 +2839,7 @@
       "integrity": "sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==",
       "dev": true,
       "requires": {
-        "minimist": "^1.2.0"
+        "minimist": "1.2.0"
       },
       "dependencies": {
         "minimist": {
@@ -2824,15 +2869,15 @@
       "dev": true,
       "requires": {
         "bytes": "3.0.0",
-        "content-type": "~1.0.4",
+        "content-type": "1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "~1.6.3",
+        "depd": "1.1.2",
+        "http-errors": "1.6.3",
         "iconv-lite": "0.4.23",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.3.0",
         "qs": "6.5.2",
         "raw-body": "2.3.3",
-        "type-is": "~1.6.16"
+        "type-is": "1.6.16"
       },
       "dependencies": {
         "iconv-lite": {
@@ -2841,7 +2886,7 @@
           "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
           "dev": true,
           "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
+            "safer-buffer": "2.1.2"
           }
         }
       }
@@ -2852,12 +2897,12 @@
       "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
       "dev": true,
       "requires": {
-        "array-flatten": "^2.1.0",
-        "deep-equal": "^1.0.1",
-        "dns-equal": "^1.0.0",
-        "dns-txt": "^2.0.2",
-        "multicast-dns": "^6.0.1",
-        "multicast-dns-service-types": "^1.1.0"
+        "array-flatten": "2.1.2",
+        "deep-equal": "1.0.1",
+        "dns-equal": "1.0.0",
+        "dns-txt": "2.0.2",
+        "multicast-dns": "6.2.3",
+        "multicast-dns-service-types": "1.1.0"
       }
     },
     "boxen": {
@@ -2866,13 +2911,13 @@
       "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
       "dev": true,
       "requires": {
-        "ansi-align": "^2.0.0",
-        "camelcase": "^4.0.0",
-        "chalk": "^2.0.1",
-        "cli-boxes": "^1.0.0",
-        "string-width": "^2.0.0",
-        "term-size": "^1.2.0",
-        "widest-line": "^2.0.0"
+        "ansi-align": "2.0.0",
+        "camelcase": "4.1.0",
+        "chalk": "2.2.2",
+        "cli-boxes": "1.0.0",
+        "string-width": "2.1.1",
+        "term-size": "1.2.0",
+        "widest-line": "2.0.1"
       },
       "dependencies": {
         "ansi-regex": {
@@ -2899,8 +2944,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"
           }
         },
         "strip-ansi": {
@@ -2909,7 +2954,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "3.0.0"
           }
         }
       }
@@ -2919,7 +2964,7 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "requires": {
-        "balanced-match": "^1.0.0",
+        "balanced-match": "1.0.0",
         "concat-map": "0.0.1"
       }
     },
@@ -2928,16 +2973,16 @@
       "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
       "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "requires": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
+        "arr-flatten": "1.1.0",
+        "array-unique": "0.3.2",
+        "extend-shallow": "2.0.1",
+        "fill-range": "4.0.0",
+        "isobject": "3.0.1",
+        "repeat-element": "1.1.2",
+        "snapdragon": "0.8.2",
+        "snapdragon-node": "2.1.1",
+        "split-string": "3.1.0",
+        "to-regex": "3.0.2"
       },
       "dependencies": {
         "extend-shallow": {
@@ -2945,7 +2990,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         }
       }
@@ -2962,12 +3007,12 @@
       "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
       "dev": true,
       "requires": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "buffer-xor": "1.0.3",
+        "cipher-base": "1.0.4",
+        "create-hash": "1.2.0",
+        "evp_bytestokey": "1.0.3",
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
       }
     },
     "browserify-cipher": {
@@ -2976,9 +3021,9 @@
       "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
       "dev": true,
       "requires": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
+        "browserify-aes": "1.2.0",
+        "browserify-des": "1.0.2",
+        "evp_bytestokey": "1.0.3"
       }
     },
     "browserify-des": {
@@ -2987,10 +3032,10 @@
       "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
       "dev": true,
       "requires": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
+        "cipher-base": "1.0.4",
+        "des.js": "1.0.0",
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
       }
     },
     "browserify-rsa": {
@@ -2999,8 +3044,8 @@
       "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "randombytes": "^2.0.1"
+        "bn.js": "4.11.8",
+        "randombytes": "2.1.0"
       }
     },
     "browserify-sign": {
@@ -3009,13 +3054,13 @@
       "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"
+        "bn.js": "4.11.8",
+        "browserify-rsa": "4.0.1",
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
+        "elliptic": "6.4.1",
+        "inherits": "2.0.3",
+        "parse-asn1": "5.1.4"
       }
     },
     "browserify-zlib": {
@@ -3024,7 +3069,7 @@
       "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
       "dev": true,
       "requires": {
-        "pako": "~1.0.5"
+        "pako": "1.0.6"
       }
     },
     "browserslist": {
@@ -3033,9 +3078,9 @@
       "integrity": "sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30000929",
-        "electron-to-chromium": "^1.3.103",
-        "node-releases": "^1.1.3"
+        "caniuse-lite": "1.0.30000938",
+        "electron-to-chromium": "1.3.113",
+        "node-releases": "1.1.8"
       }
     },
     "browserstack": {
@@ -3044,7 +3089,7 @@
       "integrity": "sha512-AO+mECXsW4QcqC9bxwM29O7qWa7bJT94uBFzeb5brylIQwawuEziwq20dPYbins95GlWzOawgyDNdjYAo32EKg==",
       "dev": true,
       "requires": {
-        "https-proxy-agent": "^2.2.1"
+        "https-proxy-agent": "2.2.1"
       }
     },
     "browserstack-local": {
@@ -3053,11 +3098,11 @@
       "integrity": "sha512-BUJWxIsJkJxqfTPJIvGWTsf+IYSqSFUeFNW9tnuyTG7va/0LkXLhIi/ErFGDle1urQkol48HlQUXj4QrliXFpg==",
       "dev": true,
       "requires": {
-        "https-proxy-agent": "^2.2.1",
-        "is-running": "^2.0.0",
-        "ps-tree": "=1.1.1",
-        "sinon": "^1.17.6",
-        "temp-fs": "^0.9.9"
+        "https-proxy-agent": "2.2.1",
+        "is-running": "2.1.0",
+        "ps-tree": "1.1.1",
+        "sinon": "1.17.7",
+        "temp-fs": "0.9.9"
       }
     },
     "buffer": {
@@ -3066,9 +3111,9 @@
       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
       "dev": true,
       "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
+        "base64-js": "1.3.0",
+        "ieee754": "1.1.12",
+        "isarray": "1.0.0"
       }
     },
     "buffer-alloc": {
@@ -3077,8 +3122,8 @@
       "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
       "dev": true,
       "requires": {
-        "buffer-alloc-unsafe": "^1.1.0",
-        "buffer-fill": "^1.0.0"
+        "buffer-alloc-unsafe": "1.1.0",
+        "buffer-fill": "1.0.0"
       }
     },
     "buffer-alloc-unsafe": {
@@ -3153,19 +3198,19 @@
       "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
       "dev": true,
       "requires": {
-        "bluebird": "^3.5.1",
-        "chownr": "^1.0.1",
-        "glob": "^7.1.2",
-        "graceful-fs": "^4.1.11",
-        "lru-cache": "^4.1.1",
-        "mississippi": "^2.0.0",
-        "mkdirp": "^0.5.1",
-        "move-concurrently": "^1.0.1",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.2",
-        "ssri": "^5.2.4",
-        "unique-filename": "^1.1.0",
-        "y18n": "^4.0.0"
+        "bluebird": "3.5.1",
+        "chownr": "1.1.1",
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "lru-cache": "4.1.3",
+        "mississippi": "2.0.0",
+        "mkdirp": "0.5.1",
+        "move-concurrently": "1.0.1",
+        "promise-inflight": "1.0.1",
+        "rimraf": "2.6.2",
+        "ssri": "5.3.0",
+        "unique-filename": "1.1.1",
+        "y18n": "4.0.0"
       }
     },
     "cache-base": {
@@ -3173,15 +3218,15 @@
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "requires": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
+        "collection-visit": "1.0.0",
+        "component-emitter": "1.2.1",
+        "get-value": "2.0.6",
+        "has-value": "1.0.0",
+        "isobject": "3.0.1",
+        "set-value": "2.0.1",
+        "to-object-path": "0.3.0",
+        "union-value": "1.0.1",
+        "unset-value": "1.0.0"
       }
     },
     "call-me-maybe": {
@@ -3196,7 +3241,7 @@
       "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
       "dev": true,
       "requires": {
-        "callsites": "^0.2.0"
+        "callsites": "0.2.0"
       }
     },
     "callsite": {
@@ -3217,8 +3262,8 @@
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
       "dev": true,
       "requires": {
-        "camelcase": "^2.0.0",
-        "map-obj": "^1.0.0"
+        "camelcase": "2.1.1",
+        "map-obj": "1.0.1"
       },
       "dependencies": {
         "camelcase": {
@@ -3259,9 +3304,9 @@
       "integrity": "sha512-LvixLAQ4MYhbf7hgL4o5PeK32gJKvVzDRiSNIApDofQvyhl8adgG2lJVXn4+ekQoK7HL9RF8lqxwerpe0x2pCw==",
       "dev": true,
       "requires": {
-        "ansi-styles": "^3.1.0",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^4.0.0"
+        "ansi-styles": "3.2.1",
+        "escape-string-regexp": "1.0.5",
+        "supports-color": "4.5.0"
       },
       "dependencies": {
         "has-flag": {
@@ -3276,7 +3321,7 @@
           "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
           "dev": true,
           "requires": {
-            "has-flag": "^2.0.0"
+            "has-flag": "2.0.0"
           }
         }
       }
@@ -3293,18 +3338,18 @@
       "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==",
       "dev": true,
       "requires": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.0",
-        "braces": "^2.3.0",
-        "fsevents": "^1.1.2",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.1",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^2.1.1",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.0.0",
-        "upath": "^1.0.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.1",
+        "is-glob": "4.0.0",
+        "normalize-path": "2.1.1",
+        "path-is-absolute": "1.0.1",
+        "readdirp": "2.1.0",
+        "upath": "1.1.0"
       }
     },
     "chownr": {
@@ -3319,7 +3364,7 @@
       "integrity": "sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==",
       "dev": true,
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "ci-info": {
@@ -3334,8 +3379,8 @@
       "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
       }
     },
     "circular-dependency-plugin": {
@@ -3354,10 +3399,10 @@
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "requires": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
+        "arr-union": "3.1.0",
+        "define-property": "0.2.5",
+        "isobject": "3.0.1",
+        "static-extend": "0.1.2"
       },
       "dependencies": {
         "define-property": {
@@ -3365,7 +3410,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         }
       }
@@ -3376,7 +3421,7 @@
       "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
       "dev": true,
       "requires": {
-        "source-map": "~0.6.0"
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -3399,7 +3444,7 @@
       "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
       "dev": true,
       "requires": {
-        "restore-cursor": "^1.0.1"
+        "restore-cursor": "1.0.1"
       }
     },
     "cli-width": {
@@ -3426,10 +3471,10 @@
       "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
       "dev": true,
       "requires": {
-        "for-own": "^1.0.0",
-        "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.0",
-        "shallow-clone": "^1.0.0"
+        "for-own": "1.0.0",
+        "is-plain-object": "2.0.4",
+        "kind-of": "6.0.2",
+        "shallow-clone": "1.0.0"
       }
     },
     "clone-stats": {
@@ -3444,9 +3489,9 @@
       "integrity": "sha512-Bq6+4t+lbM8vhTs/Bef5c5AdEMtapp/iFb6+s4/Hh9MVTt8OLKH7ZOOZSCT+Ys7hsHvqv0GuMPJ1lnQJVHvxpg==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "process-nextick-args": "^2.0.0",
-        "readable-stream": "^2.3.5"
+        "inherits": "2.0.3",
+        "process-nextick-args": "2.0.0",
+        "readable-stream": "2.3.6"
       }
     },
     "co": {
@@ -3468,7 +3513,7 @@
       "dev": true,
       "requires": {
         "argv": "0.0.2",
-        "request": "^2.81.0",
+        "request": "2.88.0",
         "urlgrey": "0.4.4"
       }
     },
@@ -3478,12 +3523,12 @@
       "integrity": "sha512-oO6vCkjqsVrEsmh58oNlnJkRXuA30hF8cdNAQV9DytEalDwyOFRvHMnlKFzmOStNerOmPGZU9GAHnBo4tGvtiQ==",
       "dev": true,
       "requires": {
-        "app-root-path": "^2.1.0",
-        "css-selector-tokenizer": "^0.7.0",
-        "cssauron": "^1.4.0",
-        "semver-dsl": "^1.0.1",
-        "source-map": "^0.5.7",
-        "sprintf-js": "^1.1.1"
+        "app-root-path": "2.1.0",
+        "css-selector-tokenizer": "0.7.1",
+        "cssauron": "1.4.0",
+        "semver-dsl": "1.0.1",
+        "source-map": "0.5.7",
+        "sprintf-js": "1.1.2"
       },
       "dependencies": {
         "source-map": {
@@ -3506,9 +3551,9 @@
       "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
       "dev": true,
       "requires": {
-        "arr-map": "^2.0.2",
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
+        "arr-map": "2.0.2",
+        "for-own": "1.0.0",
+        "make-iterator": "1.0.1"
       }
     },
     "collection-visit": {
@@ -3516,8 +3561,8 @@
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
       "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
       "requires": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
+        "map-visit": "1.0.0",
+        "object-visit": "1.0.1"
       }
     },
     "color-convert": {
@@ -3526,7 +3571,7 @@
       "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
       "dev": true,
       "requires": {
-        "color-name": "^1.1.1"
+        "color-name": "1.1.3"
       }
     },
     "color-name": {
@@ -3553,7 +3598,7 @@
       "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
       "dev": true,
       "requires": {
-        "delayed-stream": "~1.0.0"
+        "delayed-stream": "1.0.0"
       }
     },
     "commander": {
@@ -3590,7 +3635,7 @@
       "integrity": "sha512-JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA==",
       "dev": true,
       "requires": {
-        "mime-db": ">= 1.38.0 < 2"
+        "mime-db": "1.38.0"
       },
       "dependencies": {
         "mime-db": {
@@ -3607,13 +3652,13 @@
       "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.5",
+        "accepts": "1.3.5",
         "bytes": "3.0.0",
-        "compressible": "~2.0.14",
+        "compressible": "2.0.16",
         "debug": "2.6.9",
-        "on-headers": "~1.0.1",
+        "on-headers": "1.0.1",
         "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
+        "vary": "1.1.2"
       }
     },
     "concat-map": {
@@ -3627,10 +3672,10 @@
       "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
       "dev": true,
       "requires": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
+        "buffer-from": "1.1.0",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6",
+        "typedarray": "0.0.6"
       }
     },
     "configstore": {
@@ -3639,12 +3684,12 @@
       "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
       "dev": true,
       "requires": {
-        "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"
+        "dot-prop": "4.2.0",
+        "graceful-fs": "4.1.11",
+        "make-dir": "1.3.0",
+        "unique-string": "1.0.0",
+        "write-file-atomic": "2.4.2",
+        "xdg-basedir": "3.0.0"
       }
     },
     "connect": {
@@ -3655,7 +3700,7 @@
       "requires": {
         "debug": "2.6.9",
         "finalhandler": "1.1.2",
-        "parseurl": "~1.3.3",
+        "parseurl": "1.3.3",
         "utils-merge": "1.0.1"
       },
       "dependencies": {
@@ -3666,12 +3711,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"
           }
         },
         "parseurl": {
@@ -3706,7 +3751,7 @@
       "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
       "dev": true,
       "requires": {
-        "date-now": "^0.1.4"
+        "date-now": "0.1.4"
       }
     },
     "console-control-strings": {
@@ -3757,12 +3802,12 @@
       "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
       "dev": true,
       "requires": {
-        "aproba": "^1.1.1",
-        "fs-write-stream-atomic": "^1.0.8",
-        "iferr": "^0.1.5",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.0"
+        "aproba": "1.2.0",
+        "fs-write-stream-atomic": "1.0.10",
+        "iferr": "0.1.5",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2",
+        "run-queue": "1.0.3"
       }
     },
     "copy-descriptor": {
@@ -3776,8 +3821,8 @@
       "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
       "dev": true,
       "requires": {
-        "each-props": "^1.3.0",
-        "is-plain-object": "^2.0.1"
+        "each-props": "1.3.2",
+        "is-plain-object": "2.0.4"
       }
     },
     "copy-webpack-plugin": {
@@ -3786,14 +3831,14 @@
       "integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==",
       "dev": true,
       "requires": {
-        "cacache": "^10.0.4",
-        "find-cache-dir": "^1.0.0",
-        "globby": "^7.1.1",
-        "is-glob": "^4.0.0",
-        "loader-utils": "^1.1.0",
-        "minimatch": "^3.0.4",
-        "p-limit": "^1.0.0",
-        "serialize-javascript": "^1.4.0"
+        "cacache": "10.0.4",
+        "find-cache-dir": "1.0.0",
+        "globby": "7.1.1",
+        "is-glob": "4.0.0",
+        "loader-utils": "1.2.3",
+        "minimatch": "3.0.4",
+        "p-limit": "1.2.0",
+        "serialize-javascript": "1.6.1"
       },
       "dependencies": {
         "globby": {
@@ -3802,12 +3847,12 @@
           "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
           "dev": true,
           "requires": {
-            "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"
+            "array-union": "1.0.2",
+            "dir-glob": "2.0.0",
+            "glob": "7.1.2",
+            "ignore": "3.3.8",
+            "pify": "3.0.0",
+            "slash": "1.0.0"
           }
         }
       }
@@ -3828,10 +3873,10 @@
       "integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
       "dev": true,
       "requires": {
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.9.0",
-        "parse-json": "^4.0.0",
-        "require-from-string": "^2.0.1"
+        "is-directory": "0.3.1",
+        "js-yaml": "3.13.1",
+        "parse-json": "4.0.0",
+        "require-from-string": "2.0.2"
       },
       "dependencies": {
         "parse-json": {
@@ -3840,8 +3885,8 @@
           "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
           "dev": true,
           "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
+            "error-ex": "1.3.1",
+            "json-parse-better-errors": "1.0.2"
           }
         }
       }
@@ -3852,8 +3897,8 @@
       "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.0.0"
+        "bn.js": "4.11.8",
+        "elliptic": "6.4.1"
       }
     },
     "create-error-class": {
@@ -3862,7 +3907,7 @@
       "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
       "dev": true,
       "requires": {
-        "capture-stack-trace": "^1.0.0"
+        "capture-stack-trace": "1.0.1"
       }
     },
     "create-hash": {
@@ -3871,11 +3916,11 @@
       "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
       "dev": true,
       "requires": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
+        "cipher-base": "1.0.4",
+        "inherits": "2.0.3",
+        "md5.js": "1.3.5",
+        "ripemd160": "2.0.2",
+        "sha.js": "2.4.11"
       }
     },
     "create-hmac": {
@@ -3884,12 +3929,12 @@
       "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
       "dev": true,
       "requires": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
+        "cipher-base": "1.0.4",
+        "create-hash": "1.2.0",
+        "inherits": "2.0.3",
+        "ripemd160": "2.0.2",
+        "safe-buffer": "5.1.2",
+        "sha.js": "2.4.11"
       }
     },
     "cross-spawn": {
@@ -3898,8 +3943,8 @@
       "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
       "dev": true,
       "requires": {
-        "lru-cache": "^4.0.1",
-        "which": "^1.2.9"
+        "lru-cache": "4.1.3",
+        "which": "1.3.1"
       }
     },
     "crypto-browserify": {
@@ -3908,17 +3953,17 @@
       "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
       "dev": true,
       "requires": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
+        "browserify-cipher": "1.0.1",
+        "browserify-sign": "4.0.4",
+        "create-ecdh": "4.0.3",
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
+        "diffie-hellman": "5.0.3",
+        "inherits": "2.0.3",
+        "pbkdf2": "3.0.17",
+        "public-encrypt": "4.0.3",
+        "randombytes": "2.1.0",
+        "randomfill": "1.0.4"
       }
     },
     "crypto-random-string": {
@@ -3939,9 +3984,9 @@
       "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==",
       "dev": true,
       "requires": {
-        "cssesc": "^0.1.0",
-        "fastparse": "^1.1.1",
-        "regexpu-core": "^1.0.0"
+        "cssesc": "0.1.0",
+        "fastparse": "1.1.2",
+        "regexpu-core": "1.0.0"
       }
     },
     "cssauron": {
@@ -3950,7 +3995,7 @@
       "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=",
       "dev": true,
       "requires": {
-        "through": "X.X.X"
+        "through": "2.3.8"
       }
     },
     "cssesc": {
@@ -3971,7 +4016,7 @@
       "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
       "dev": true,
       "requires": {
-        "array-find-index": "^1.0.1"
+        "array-find-index": "1.0.2"
       }
     },
     "custom-event": {
@@ -3992,7 +4037,7 @@
       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
       "dev": true,
       "requires": {
-        "es5-ext": "^0.10.9"
+        "es5-ext": "0.10.44"
       }
     },
     "d3": {
@@ -4042,11 +4087,11 @@
           "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-dispatch": "1.0.3",
+            "d3-drag": "1.2.1",
+            "d3-interpolate": "1.1.6",
+            "d3-selection": "1.3.0",
+            "d3-transition": "1.1.1"
           }
         },
         "d3-color": {
@@ -4059,10 +4104,10 @@
           "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-collection": "1.0.4",
+            "d3-dispatch": "1.0.3",
+            "d3-quadtree": "1.0.3",
+            "d3-timer": "1.0.7"
           }
         },
         "d3-format": {
@@ -4080,7 +4125,7 @@
           "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-color": "1.0.3"
           }
         },
         "d3-selection": {
@@ -4093,7 +4138,7 @@
           "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.2.0.tgz",
           "integrity": "sha1-RdAVOPBkuv0F6j1tLLdI/YxB93c=",
           "requires": {
-            "d3-path": "1"
+            "d3-path": "1.0.5"
           }
         },
         "d3-time-format": {
@@ -4101,7 +4146,7 @@
           "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-time": "1.0.8"
           }
         }
       }
@@ -4121,11 +4166,11 @@
       "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.0.6.tgz",
       "integrity": "sha512-lGSiF5SoSqO5/mYGD5FAeGKKS62JdA1EV7HPrU2b5rTX4qEJJtpjaGLJngjnkewQy7UnGstnFd3168wpf5z76w==",
       "requires": {
-        "d3-dispatch": "1",
-        "d3-drag": "1",
-        "d3-interpolate": "1",
-        "d3-selection": "1",
-        "d3-transition": "1"
+        "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-chord": {
@@ -4133,8 +4178,8 @@
       "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-array": "1.2.4",
+        "d3-path": "1.0.5"
       }
     },
     "d3-collection": {
@@ -4157,8 +4202,8 @@
       "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-1.2.1.tgz",
       "integrity": "sha512-Cg8/K2rTtzxzrb0fmnYOUeZHvwa4PHzwXOLZZPwtEs2SKLLKLXeYwZKBB+DlOxUvFmarOnmt//cU4+3US2lyyQ==",
       "requires": {
-        "d3-dispatch": "1",
-        "d3-selection": "1"
+        "d3-dispatch": "1.0.3",
+        "d3-selection": "1.4.0"
       }
     },
     "d3-dsv": {
@@ -4166,9 +4211,9 @@
       "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"
+        "commander": "2.15.1",
+        "iconv-lite": "0.4.19",
+        "rw": "1.3.3"
       }
     },
     "d3-ease": {
@@ -4181,10 +4226,10 @@
       "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.2.0.tgz",
       "integrity": "sha512-PFLcDnRVANHMudbQlIB87gcfQorEsDIAvRpZ2bNddfM/WxdsEkyrEaOIPoydhH1I1V4HPjNLGOMLXCA0AuGQ9w==",
       "requires": {
-        "d3-collection": "1",
-        "d3-dispatch": "1",
-        "d3-quadtree": "1",
-        "d3-timer": "1"
+        "d3-collection": "1.0.4",
+        "d3-dispatch": "1.0.3",
+        "d3-quadtree": "1.0.3",
+        "d3-timer": "1.0.7"
       }
     },
     "d3-format": {
@@ -4197,7 +4242,7 @@
       "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"
+        "d3-array": "1.2.4"
       }
     },
     "d3-hierarchy": {
@@ -4210,7 +4255,7 @@
       "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.3.2.tgz",
       "integrity": "sha512-NlNKGopqaz9qM1PXh9gBF1KSCVh+jSFErrSlD/4hybwoNX/gt1d8CDbDW+3i+5UOHhjC6s6nMvRxcuoMVNgL2w==",
       "requires": {
-        "d3-color": "1"
+        "d3-color": "1.2.3"
       }
     },
     "d3-path": {
@@ -4243,10 +4288,10 @@
       "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"
+        "d3-collection": "1.0.4",
+        "d3-dispatch": "1.0.3",
+        "d3-dsv": "1.0.8",
+        "xmlhttprequest": "1.8.0"
       }
     },
     "d3-scale": {
@@ -4254,13 +4299,13 @@
       "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-1.0.7.tgz",
       "integrity": "sha512-KvU92czp2/qse5tUfGms6Kjig0AhHOwkzXG0+PqIJB3ke0WUv088AHMZI0OssO9NCkXt4RP8yju9rpH8aGB7Lw==",
       "requires": {
-        "d3-array": "^1.2.0",
-        "d3-collection": "1",
-        "d3-color": "1",
-        "d3-format": "1",
-        "d3-interpolate": "1",
-        "d3-time": "1",
-        "d3-time-format": "2"
+        "d3-array": "1.2.4",
+        "d3-collection": "1.0.4",
+        "d3-color": "1.2.3",
+        "d3-format": "1.3.2",
+        "d3-interpolate": "1.3.2",
+        "d3-time": "1.0.8",
+        "d3-time-format": "2.1.3"
       }
     },
     "d3-selection": {
@@ -4273,7 +4318,7 @@
       "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.4.tgz",
       "integrity": "sha512-izaz4fOpOnY3CD17hkZWNxbaN70sIGagLR/5jb6RS96Y+6VqX+q1BQf1av6QSBRdfULi3Gb8Js4CzG4+KAPjMg==",
       "requires": {
-        "d3-path": "1"
+        "d3-path": "1.0.5"
       }
     },
     "d3-time": {
@@ -4286,7 +4331,7 @@
       "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.1.3.tgz",
       "integrity": "sha512-6k0a2rZryzGm5Ihx+aFMuO1GgelgIz+7HhB4PH4OEndD5q2zGn1mDfRdNrulspOfR6JXkb2sThhDK41CSK85QA==",
       "requires": {
-        "d3-time": "1"
+        "d3-time": "1.0.8"
       }
     },
     "d3-timer": {
@@ -4299,12 +4344,12 @@
       "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-1.1.1.tgz",
       "integrity": "sha512-xeg8oggyQ+y5eb4J13iDgKIjUcEfIOZs2BqV/eEmXm2twx80wTzJ4tB4vaZ5BKfz7XsI/DFmQL5me6O27/5ykQ==",
       "requires": {
-        "d3-color": "1",
-        "d3-dispatch": "1",
-        "d3-ease": "1",
-        "d3-interpolate": "1",
-        "d3-selection": "^1.1.0",
-        "d3-timer": "1"
+        "d3-color": "1.2.3",
+        "d3-dispatch": "1.0.3",
+        "d3-ease": "1.0.3",
+        "d3-interpolate": "1.3.2",
+        "d3-selection": "1.4.0",
+        "d3-timer": "1.0.7"
       }
     },
     "d3-voronoi": {
@@ -4317,11 +4362,20 @@
       "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"
+        "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"
+      }
+    },
+    "dagre": {
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/dagre/-/dagre-0.8.4.tgz",
+      "integrity": "sha512-Dj0csFDrWYKdavwROb9FccHfTC4fJbyF/oJdL9LNZJ8WUvl968P6PAKEriGqfbdArVJEmmfA+UyumgWEwcHU6A==",
+      "requires": {
+        "graphlib": "2.1.7",
+        "lodash": "4.17.13"
       }
     },
     "dashdash": {
@@ -4330,7 +4384,7 @@
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0"
+        "assert-plus": "1.0.0"
       }
     },
     "date-format": {
@@ -4394,7 +4448,7 @@
       "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
       "dev": true,
       "requires": {
-        "kind-of": "^5.0.2"
+        "kind-of": "5.1.0"
       },
       "dependencies": {
         "kind-of": {
@@ -4411,8 +4465,8 @@
       "integrity": "sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==",
       "dev": true,
       "requires": {
-        "execa": "^0.10.0",
-        "ip-regex": "^2.1.0"
+        "execa": "0.10.0",
+        "ip-regex": "2.1.0"
       },
       "dependencies": {
         "cross-spawn": {
@@ -4421,11 +4475,11 @@
           "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "dev": true,
           "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
+            "nice-try": "1.0.5",
+            "path-key": "2.0.1",
+            "semver": "5.5.0",
+            "shebang-command": "1.2.0",
+            "which": "1.3.1"
           }
         },
         "execa": {
@@ -4434,13 +4488,13 @@
           "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
           "dev": true,
           "requires": {
-            "cross-spawn": "^6.0.0",
-            "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"
+            "cross-spawn": "6.0.5",
+            "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"
           }
         }
       }
@@ -4457,8 +4511,8 @@
       "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
       "dev": true,
       "requires": {
-        "foreach": "^2.0.5",
-        "object-keys": "^1.0.8"
+        "foreach": "2.0.5",
+        "object-keys": "1.0.11"
       }
     },
     "define-property": {
@@ -4466,8 +4520,8 @@
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "requires": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
+        "is-descriptor": "1.0.2",
+        "isobject": "3.0.1"
       },
       "dependencies": {
         "is-accessor-descriptor": {
@@ -4475,7 +4529,7 @@
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-data-descriptor": {
@@ -4483,7 +4537,7 @@
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-descriptor": {
@@ -4491,9 +4545,9 @@
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
           }
         }
       }
@@ -4504,12 +4558,12 @@
       "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
       "dev": true,
       "requires": {
-        "globby": "^6.1.0",
-        "is-path-cwd": "^1.0.0",
-        "is-path-in-cwd": "^1.0.0",
-        "p-map": "^1.1.1",
-        "pify": "^3.0.0",
-        "rimraf": "^2.2.8"
+        "globby": "6.1.0",
+        "is-path-cwd": "1.0.0",
+        "is-path-in-cwd": "1.0.1",
+        "p-map": "1.2.0",
+        "pify": "3.0.0",
+        "rimraf": "2.6.2"
       },
       "dependencies": {
         "globby": {
@@ -4518,11 +4572,11 @@
           "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
           "dev": true,
           "requires": {
-            "array-union": "^1.0.1",
-            "glob": "^7.0.3",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "array-union": "1.0.2",
+            "glob": "7.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
           },
           "dependencies": {
             "pify": {
@@ -4553,12 +4607,12 @@
       "integrity": "sha1-fP7PXvffuAL60nq49b5a5UbFt54=",
       "dev": true,
       "requires": {
-        "async": "^1.5.2",
-        "bluebird": "^3.3.5",
-        "extend-shallow": "^2.0.1",
-        "lazy-cache": "^1.0.4",
-        "matched": "^0.4.1",
-        "rimraf": "^2.5.2"
+        "async": "1.5.2",
+        "bluebird": "3.5.1",
+        "extend-shallow": "2.0.1",
+        "lazy-cache": "1.0.4",
+        "matched": "0.4.4",
+        "rimraf": "2.6.2"
       },
       "dependencies": {
         "extend-shallow": {
@@ -4567,7 +4621,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         }
       }
@@ -4590,8 +4644,8 @@
       "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1"
       }
     },
     "destroy": {
@@ -4612,7 +4666,7 @@
       "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
       "dev": true,
       "requires": {
-        "repeating": "^2.0.0"
+        "repeating": "2.0.1"
       }
     },
     "detect-node": {
@@ -4639,9 +4693,9 @@
       "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
+        "bn.js": "4.11.8",
+        "miller-rabin": "4.0.1",
+        "randombytes": "2.1.0"
       }
     },
     "dir-glob": {
@@ -4650,8 +4704,8 @@
       "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
       "dev": true,
       "requires": {
-        "arrify": "^1.0.1",
-        "path-type": "^3.0.0"
+        "arrify": "1.0.1",
+        "path-type": "3.0.0"
       }
     },
     "dns-equal": {
@@ -4666,8 +4720,8 @@
       "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
       "dev": true,
       "requires": {
-        "ip": "^1.1.0",
-        "safe-buffer": "^5.0.1"
+        "ip": "1.1.5",
+        "safe-buffer": "5.1.2"
       }
     },
     "dns-txt": {
@@ -4676,7 +4730,7 @@
       "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
       "dev": true,
       "requires": {
-        "buffer-indexof": "^1.0.0"
+        "buffer-indexof": "1.1.1"
       }
     },
     "doctrine": {
@@ -4685,8 +4739,8 @@
       "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
       "dev": true,
       "requires": {
-        "esutils": "^2.0.2",
-        "isarray": "^1.0.0"
+        "esutils": "2.0.2",
+        "isarray": "1.0.0"
       }
     },
     "dom-serialize": {
@@ -4695,10 +4749,10 @@
       "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
       "dev": true,
       "requires": {
-        "custom-event": "~1.0.0",
-        "ent": "~2.2.0",
-        "extend": "^3.0.0",
-        "void-elements": "^2.0.0"
+        "custom-event": "1.0.1",
+        "ent": "2.2.0",
+        "extend": "3.0.2",
+        "void-elements": "2.0.1"
       }
     },
     "domain-browser": {
@@ -4718,7 +4772,7 @@
       "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
       "dev": true,
       "requires": {
-        "is-obj": "^1.0.0"
+        "is-obj": "1.0.1"
       }
     },
     "duplexer": {
@@ -4739,10 +4793,10 @@
       "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==",
       "dev": true,
       "requires": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
+        "end-of-stream": "1.4.1",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6",
+        "stream-shift": "1.0.0"
       }
     },
     "each-props": {
@@ -4751,8 +4805,8 @@
       "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
       "dev": true,
       "requires": {
-        "is-plain-object": "^2.0.1",
-        "object.defaults": "^1.1.0"
+        "is-plain-object": "2.0.4",
+        "object.defaults": "1.1.0"
       }
     },
     "ecc-jsbn": {
@@ -4762,7 +4816,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "jsbn": "~0.1.0"
+        "jsbn": "0.1.1"
       }
     },
     "ee-first": {
@@ -4783,13 +4837,13 @@
       "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
       "dev": true,
       "requires": {
-        "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"
+        "bn.js": "4.11.8",
+        "brorand": "1.1.0",
+        "hash.js": "1.1.7",
+        "hmac-drbg": "1.0.1",
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1",
+        "minimalistic-crypto-utils": "1.0.1"
       }
     },
     "emojis-list": {
@@ -4810,7 +4864,7 @@
       "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
       "dev": true,
       "requires": {
-        "iconv-lite": "~0.4.13"
+        "iconv-lite": "0.4.19"
       }
     },
     "end-of-stream": {
@@ -4819,7 +4873,7 @@
       "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
       "dev": true,
       "requires": {
-        "once": "^1.4.0"
+        "once": "1.4.0"
       }
     },
     "engine.io": {
@@ -4828,12 +4882,12 @@
       "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.4",
+        "accepts": "1.3.5",
         "base64id": "1.0.0",
         "cookie": "0.3.1",
-        "debug": "~3.1.0",
-        "engine.io-parser": "~2.1.0",
-        "ws": "~3.3.1"
+        "debug": "3.1.0",
+        "engine.io-parser": "2.1.3",
+        "ws": "3.3.3"
       },
       "dependencies": {
         "debug": {
@@ -4855,14 +4909,14 @@
       "requires": {
         "component-emitter": "1.2.1",
         "component-inherit": "0.0.3",
-        "debug": "~3.1.0",
-        "engine.io-parser": "~2.1.1",
+        "debug": "3.1.0",
+        "engine.io-parser": "2.1.3",
         "has-cors": "1.1.0",
         "indexof": "0.0.1",
         "parseqs": "0.0.5",
         "parseuri": "0.0.5",
-        "ws": "~3.3.1",
-        "xmlhttprequest-ssl": "~1.5.4",
+        "ws": "3.3.3",
+        "xmlhttprequest-ssl": "1.5.5",
         "yeast": "0.1.2"
       },
       "dependencies": {
@@ -4884,10 +4938,10 @@
       "dev": true,
       "requires": {
         "after": "0.8.2",
-        "arraybuffer.slice": "~0.0.7",
+        "arraybuffer.slice": "0.0.7",
         "base64-arraybuffer": "0.1.5",
         "blob": "0.0.5",
-        "has-binary2": "~1.0.2"
+        "has-binary2": "1.0.3"
       }
     },
     "enhanced-resolve": {
@@ -4896,9 +4950,9 @@
       "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.4.0",
-        "tapable": "^1.0.0"
+        "graceful-fs": "4.1.11",
+        "memory-fs": "0.4.1",
+        "tapable": "1.1.1"
       }
     },
     "ent": {
@@ -4919,7 +4973,7 @@
       "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
       "dev": true,
       "requires": {
-        "prr": "~1.0.1"
+        "prr": "1.0.1"
       }
     },
     "error-ex": {
@@ -4928,7 +4982,7 @@
       "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
       "dev": true,
       "requires": {
-        "is-arrayish": "^0.2.1"
+        "is-arrayish": "0.2.1"
       }
     },
     "error-stack-parser": {
@@ -4936,7 +4990,7 @@
       "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.1.tgz",
       "integrity": "sha1-oyArj7AxFKqbQKDjZp5IsrZaAQo=",
       "requires": {
-        "stackframe": "^1.0.3"
+        "stackframe": "1.0.4"
       }
     },
     "es-abstract": {
@@ -4945,11 +4999,11 @@
       "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==",
       "dev": true,
       "requires": {
-        "es-to-primitive": "^1.1.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.1",
-        "is-callable": "^1.1.3",
-        "is-regex": "^1.0.4"
+        "es-to-primitive": "1.1.1",
+        "function-bind": "1.1.1",
+        "has": "1.0.3",
+        "is-callable": "1.1.4",
+        "is-regex": "1.0.4"
       }
     },
     "es-to-primitive": {
@@ -4958,9 +5012,9 @@
       "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
       "dev": true,
       "requires": {
-        "is-callable": "^1.1.1",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.1"
+        "is-callable": "1.1.4",
+        "is-date-object": "1.0.1",
+        "is-symbol": "1.0.1"
       }
     },
     "es5-ext": {
@@ -4969,9 +5023,9 @@
       "integrity": "sha512-TO4Vt9IhW3FzDKLDOpoA8VS9BCV4b9WTf6BqvMOgfoa8wX73F3Kh3y2J7yTstTaXlQ0k1vq4DH2vw6RSs42z+g==",
       "dev": true,
       "requires": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.1",
-        "next-tick": "1"
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1",
+        "next-tick": "1.0.0"
       }
     },
     "es6-iterator": {
@@ -4980,9 +5034,9 @@
       "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
+        "d": "1.0.0",
+        "es5-ext": "0.10.44",
+        "es6-symbol": "3.1.1"
       }
     },
     "es6-map": {
@@ -4991,12 +5045,12 @@
       "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14",
-        "es6-iterator": "~2.0.1",
-        "es6-set": "~0.1.5",
-        "es6-symbol": "~3.1.1",
-        "event-emitter": "~0.3.5"
+        "d": "1.0.0",
+        "es5-ext": "0.10.44",
+        "es6-iterator": "2.0.3",
+        "es6-set": "0.1.5",
+        "es6-symbol": "3.1.1",
+        "event-emitter": "0.3.5"
       }
     },
     "es6-promise": {
@@ -5011,7 +5065,7 @@
       "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
       "dev": true,
       "requires": {
-        "es6-promise": "^4.0.3"
+        "es6-promise": "4.2.4"
       }
     },
     "es6-set": {
@@ -5020,11 +5074,11 @@
       "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14",
-        "es6-iterator": "~2.0.1",
+        "d": "1.0.0",
+        "es5-ext": "0.10.44",
+        "es6-iterator": "2.0.3",
         "es6-symbol": "3.1.1",
-        "event-emitter": "~0.3.5"
+        "event-emitter": "0.3.5"
       }
     },
     "es6-symbol": {
@@ -5033,8 +5087,8 @@
       "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
+        "d": "1.0.0",
+        "es5-ext": "0.10.44"
       }
     },
     "es6-weak-map": {
@@ -5043,10 +5097,10 @@
       "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.14",
-        "es6-iterator": "^2.0.1",
-        "es6-symbol": "^3.1.1"
+        "d": "1.0.0",
+        "es5-ext": "0.10.44",
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1"
       }
     },
     "escape-html": {
@@ -5067,11 +5121,11 @@
       "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
       "dev": true,
       "requires": {
-        "esprima": "^2.7.1",
-        "estraverse": "^1.9.1",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1",
-        "source-map": "~0.2.0"
+        "esprima": "2.7.3",
+        "estraverse": "1.9.3",
+        "esutils": "2.0.2",
+        "optionator": "0.8.2",
+        "source-map": "0.2.0"
       },
       "dependencies": {
         "esprima": {
@@ -5093,7 +5147,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "amdefine": "1.0.1"
           }
         }
       }
@@ -5104,10 +5158,10 @@
       "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
       "dev": true,
       "requires": {
-        "es6-map": "^0.1.3",
-        "es6-weak-map": "^2.0.1",
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
+        "es6-map": "0.1.5",
+        "es6-weak-map": "2.0.2",
+        "esrecurse": "4.2.1",
+        "estraverse": "4.2.0"
       }
     },
     "eslint": {
@@ -5116,39 +5170,39 @@
       "integrity": "sha1-5MyPoPAJ+4KaquI4VaKTYL4fbBE=",
       "dev": true,
       "requires": {
-        "chalk": "^1.1.3",
-        "concat-stream": "^1.4.6",
-        "debug": "^2.1.1",
-        "doctrine": "^1.2.2",
-        "es6-map": "^0.1.3",
-        "escope": "^3.6.0",
-        "espree": "^3.1.6",
-        "estraverse": "^4.2.0",
-        "esutils": "^2.0.2",
-        "file-entry-cache": "^1.1.1",
-        "glob": "^7.0.3",
-        "globals": "^9.2.0",
-        "ignore": "^3.1.2",
-        "imurmurhash": "^0.1.4",
-        "inquirer": "^0.12.0",
-        "is-my-json-valid": "^2.10.0",
-        "is-resolvable": "^1.0.0",
-        "js-yaml": "^3.5.1",
-        "json-stable-stringify": "^1.0.0",
-        "levn": "^0.3.0",
-        "lodash": "^4.0.0",
-        "mkdirp": "^0.5.0",
-        "optionator": "^0.8.1",
-        "path-is-absolute": "^1.0.0",
-        "path-is-inside": "^1.0.1",
-        "pluralize": "^1.2.1",
-        "progress": "^1.1.8",
-        "require-uncached": "^1.0.2",
-        "shelljs": "^0.6.0",
-        "strip-json-comments": "~1.0.1",
-        "table": "^3.7.8",
-        "text-table": "~0.2.0",
-        "user-home": "^2.0.0"
+        "chalk": "1.1.3",
+        "concat-stream": "1.6.2",
+        "debug": "2.6.9",
+        "doctrine": "1.5.0",
+        "es6-map": "0.1.5",
+        "escope": "3.6.0",
+        "espree": "3.5.4",
+        "estraverse": "4.2.0",
+        "esutils": "2.0.2",
+        "file-entry-cache": "1.3.1",
+        "glob": "7.1.2",
+        "globals": "9.18.0",
+        "ignore": "3.3.8",
+        "imurmurhash": "0.1.4",
+        "inquirer": "0.12.0",
+        "is-my-json-valid": "2.17.2",
+        "is-resolvable": "1.1.0",
+        "js-yaml": "3.13.1",
+        "json-stable-stringify": "1.0.1",
+        "levn": "0.3.0",
+        "lodash": "4.17.15",
+        "mkdirp": "0.5.1",
+        "optionator": "0.8.2",
+        "path-is-absolute": "1.0.1",
+        "path-is-inside": "1.0.2",
+        "pluralize": "1.2.1",
+        "progress": "1.1.8",
+        "require-uncached": "1.0.3",
+        "shelljs": "0.6.1",
+        "strip-json-comments": "1.0.4",
+        "table": "3.8.3",
+        "text-table": "0.2.0",
+        "user-home": "2.0.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -5163,11 +5217,11 @@
           "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"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "lodash": {
@@ -5190,8 +5244,8 @@
       "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
       "dev": true,
       "requires": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
+        "esrecurse": "4.2.1",
+        "estraverse": "4.2.0"
       }
     },
     "espree": {
@@ -5200,8 +5254,8 @@
       "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
       "dev": true,
       "requires": {
-        "acorn": "^5.5.0",
-        "acorn-jsx": "^3.0.0"
+        "acorn": "5.7.3",
+        "acorn-jsx": "3.0.1"
       },
       "dependencies": {
         "acorn": {
@@ -5224,7 +5278,7 @@
       "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
       "dev": true,
       "requires": {
-        "estraverse": "^4.1.0"
+        "estraverse": "4.2.0"
       }
     },
     "estraverse": {
@@ -5251,8 +5305,8 @@
       "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
+        "d": "1.0.0",
+        "es5-ext": "0.10.44"
       }
     },
     "event-stream": {
@@ -5261,13 +5315,13 @@
       "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
       "dev": true,
       "requires": {
-        "duplexer": "~0.1.1",
-        "from": "~0",
-        "map-stream": "~0.1.0",
+        "duplexer": "0.1.1",
+        "from": "0.1.7",
+        "map-stream": "0.1.0",
         "pause-stream": "0.0.11",
-        "split": "0.3",
-        "stream-combiner": "~0.0.4",
-        "through": "~2.3.1"
+        "split": "0.3.3",
+        "stream-combiner": "0.0.4",
+        "through": "2.3.8"
       }
     },
     "eventemitter3": {
@@ -5288,7 +5342,7 @@
       "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
       "dev": true,
       "requires": {
-        "original": "^1.0.0"
+        "original": "1.0.2"
       }
     },
     "evp_bytestokey": {
@@ -5297,8 +5351,8 @@
       "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
       "dev": true,
       "requires": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
+        "md5.js": "1.3.5",
+        "safe-buffer": "5.1.2"
       }
     },
     "execa": {
@@ -5307,13 +5361,13 @@
       "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"
+        "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"
       },
       "dependencies": {
         "cross-spawn": {
@@ -5322,9 +5376,9 @@
           "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
           "dev": true,
           "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
+            "lru-cache": "4.1.3",
+            "shebang-command": "1.2.0",
+            "which": "1.3.1"
           }
         }
       }
@@ -5346,13 +5400,13 @@
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
       "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
       "requires": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "debug": "2.6.9",
+        "define-property": "0.2.5",
+        "extend-shallow": "2.0.1",
+        "posix-character-classes": "0.1.1",
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
       },
       "dependencies": {
         "define-property": {
@@ -5360,7 +5414,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         },
         "extend-shallow": {
@@ -5368,7 +5422,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         }
       }
@@ -5379,7 +5433,7 @@
       "integrity": "sha1-C4HrqJflo9MdHD0QL48BRB5VlEk=",
       "dev": true,
       "requires": {
-        "os-homedir": "^1.0.1"
+        "os-homedir": "1.0.2"
       }
     },
     "express": {
@@ -5388,36 +5442,36 @@
       "integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.5",
+        "accepts": "1.3.5",
         "array-flatten": "1.1.1",
         "body-parser": "1.18.3",
         "content-disposition": "0.5.2",
-        "content-type": "~1.0.4",
+        "content-type": "1.0.4",
         "cookie": "0.3.1",
         "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",
+        "depd": "1.1.2",
+        "encodeurl": "1.0.2",
+        "escape-html": "1.0.3",
+        "etag": "1.8.1",
         "finalhandler": "1.1.1",
         "fresh": "0.5.2",
         "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.2",
+        "methods": "1.1.2",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.2",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.4",
+        "proxy-addr": "2.0.4",
         "qs": "6.5.2",
-        "range-parser": "~1.2.0",
+        "range-parser": "1.2.0",
         "safe-buffer": "5.1.2",
         "send": "0.16.2",
         "serve-static": "1.13.2",
         "setprototypeof": "1.1.0",
-        "statuses": "~1.4.0",
-        "type-is": "~1.6.16",
+        "statuses": "1.4.0",
+        "type-is": "1.6.16",
         "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
+        "vary": "1.1.2"
       },
       "dependencies": {
         "array-flatten": {
@@ -5431,7 +5485,7 @@
           "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
           "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
           "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
+            "safer-buffer": "2.1.2"
           }
         }
       }
@@ -5447,8 +5501,8 @@
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
       "requires": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
+        "assign-symbols": "1.0.0",
+        "is-extendable": "1.0.1"
       },
       "dependencies": {
         "is-extendable": {
@@ -5456,7 +5510,7 @@
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "requires": {
-            "is-plain-object": "^2.0.4"
+            "is-plain-object": "2.0.4"
           }
         }
       }
@@ -5467,9 +5521,9 @@
       "integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
       "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"
       },
       "dependencies": {
         "iconv-lite": {
@@ -5478,7 +5532,7 @@
           "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
           "dev": true,
           "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
+            "safer-buffer": "2.1.2"
           }
         }
       }
@@ -5488,14 +5542,14 @@
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
       "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
       "requires": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "array-unique": "0.3.2",
+        "define-property": "1.0.0",
+        "expand-brackets": "2.1.4",
+        "extend-shallow": "2.0.1",
+        "fragment-cache": "0.2.1",
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
       },
       "dependencies": {
         "define-property": {
@@ -5503,7 +5557,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "requires": {
-            "is-descriptor": "^1.0.0"
+            "is-descriptor": "1.0.2"
           }
         },
         "extend-shallow": {
@@ -5511,7 +5565,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         },
         "is-accessor-descriptor": {
@@ -5519,7 +5573,7 @@
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-data-descriptor": {
@@ -5527,7 +5581,7 @@
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-descriptor": {
@@ -5535,9 +5589,9 @@
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
           }
         }
       }
@@ -5554,10 +5608,10 @@
       "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
       "dev": true,
       "requires": {
-        "ansi-gray": "^0.1.1",
-        "color-support": "^1.1.3",
-        "parse-node-version": "^1.0.0",
-        "time-stamp": "^1.0.0"
+        "ansi-gray": "0.1.1",
+        "color-support": "1.1.3",
+        "parse-node-version": "1.0.1",
+        "time-stamp": "1.1.0"
       }
     },
     "fast-deep-equal": {
@@ -5572,12 +5626,12 @@
       "integrity": "sha512-TR6zxCKftDQnUAPvkrCWdBgDq/gbqx8A3ApnBrR5rMvpp6+KMJI0Igw7fkWPgeVK0uhRXTXdvO3O+YP0CaUX2g==",
       "dev": true,
       "requires": {
-        "@mrmlnc/readdir-enhanced": "^2.2.1",
-        "@nodelib/fs.stat": "^1.0.1",
-        "glob-parent": "^3.1.0",
-        "is-glob": "^4.0.0",
-        "merge2": "^1.2.1",
-        "micromatch": "^3.1.10"
+        "@mrmlnc/readdir-enhanced": "2.2.1",
+        "@nodelib/fs.stat": "1.1.2",
+        "glob-parent": "3.1.0",
+        "is-glob": "4.0.0",
+        "merge2": "1.2.2",
+        "micromatch": "3.1.10"
       }
     },
     "fast-json-stable-stringify": {
@@ -5603,7 +5657,7 @@
       "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
       "dev": true,
       "requires": {
-        "websocket-driver": ">=0.5.1"
+        "websocket-driver": "0.7.0"
       }
     },
     "figgy-pudding": {
@@ -5618,8 +5672,8 @@
       "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
       "dev": true,
       "requires": {
-        "escape-string-regexp": "^1.0.5",
-        "object-assign": "^4.1.0"
+        "escape-string-regexp": "1.0.5",
+        "object-assign": "4.1.1"
       }
     },
     "file-entry-cache": {
@@ -5628,8 +5682,8 @@
       "integrity": "sha1-RMYepgeuS+nBQC9B9EJwy/4zT/g=",
       "dev": true,
       "requires": {
-        "flat-cache": "^1.2.1",
-        "object-assign": "^4.0.1"
+        "flat-cache": "1.3.0",
+        "object-assign": "4.1.1"
       }
     },
     "file-loader": {
@@ -5638,8 +5692,8 @@
       "integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.0.2",
-        "schema-utils": "^1.0.0"
+        "loader-utils": "1.2.3",
+        "schema-utils": "1.0.0"
       }
     },
     "fileset": {
@@ -5648,8 +5702,8 @@
       "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=",
       "dev": true,
       "requires": {
-        "glob": "^7.0.3",
-        "minimatch": "^3.0.3"
+        "glob": "7.1.2",
+        "minimatch": "3.0.4"
       }
     },
     "fill-range": {
@@ -5657,10 +5711,10 @@
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
       "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
       "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
+        "extend-shallow": "2.0.1",
+        "is-number": "3.0.0",
+        "repeat-string": "1.6.1",
+        "to-regex-range": "2.1.1"
       },
       "dependencies": {
         "extend-shallow": {
@@ -5668,7 +5722,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         }
       }
@@ -5680,12 +5734,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.2",
-        "statuses": "~1.4.0",
-        "unpipe": "~1.0.0"
+        "encodeurl": "1.0.2",
+        "escape-html": "1.0.3",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.2",
+        "statuses": "1.4.0",
+        "unpipe": "1.0.0"
       }
     },
     "find-cache-dir": {
@@ -5694,9 +5748,9 @@
       "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
       "dev": true,
       "requires": {
-        "commondir": "^1.0.1",
-        "make-dir": "^1.0.0",
-        "pkg-dir": "^2.0.0"
+        "commondir": "1.0.1",
+        "make-dir": "1.3.0",
+        "pkg-dir": "2.0.0"
       }
     },
     "find-parent-dir": {
@@ -5711,7 +5765,7 @@
       "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
       "dev": true,
       "requires": {
-        "locate-path": "^2.0.0"
+        "locate-path": "2.0.0"
       }
     },
     "findup-sync": {
@@ -5720,10 +5774,10 @@
       "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
       "dev": true,
       "requires": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
+        "detect-file": "1.0.0",
+        "is-glob": "4.0.0",
+        "micromatch": "3.1.10",
+        "resolve-dir": "1.0.1"
       },
       "dependencies": {
         "expand-tilde": {
@@ -5732,7 +5786,7 @@
           "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
           "dev": true,
           "requires": {
-            "homedir-polyfill": "^1.0.1"
+            "homedir-polyfill": "1.0.1"
           }
         },
         "global-modules": {
@@ -5741,9 +5795,9 @@
           "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
           "dev": true,
           "requires": {
-            "global-prefix": "^1.0.1",
-            "is-windows": "^1.0.1",
-            "resolve-dir": "^1.0.0"
+            "global-prefix": "1.0.2",
+            "is-windows": "1.0.2",
+            "resolve-dir": "1.0.1"
           }
         },
         "global-prefix": {
@@ -5752,11 +5806,11 @@
           "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
           "dev": true,
           "requires": {
-            "expand-tilde": "^2.0.2",
-            "homedir-polyfill": "^1.0.1",
-            "ini": "^1.3.4",
-            "is-windows": "^1.0.1",
-            "which": "^1.2.14"
+            "expand-tilde": "2.0.2",
+            "homedir-polyfill": "1.0.1",
+            "ini": "1.3.5",
+            "is-windows": "1.0.2",
+            "which": "1.3.1"
           }
         },
         "resolve-dir": {
@@ -5765,8 +5819,8 @@
           "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
           "dev": true,
           "requires": {
-            "expand-tilde": "^2.0.0",
-            "global-modules": "^1.0.0"
+            "expand-tilde": "2.0.2",
+            "global-modules": "1.0.0"
           }
         }
       }
@@ -5777,11 +5831,11 @@
       "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
       "dev": true,
       "requires": {
-        "expand-tilde": "^2.0.2",
-        "is-plain-object": "^2.0.3",
-        "object.defaults": "^1.1.0",
-        "object.pick": "^1.2.0",
-        "parse-filepath": "^1.0.1"
+        "expand-tilde": "2.0.2",
+        "is-plain-object": "2.0.4",
+        "object.defaults": "1.1.0",
+        "object.pick": "1.3.0",
+        "parse-filepath": "1.0.2"
       },
       "dependencies": {
         "expand-tilde": {
@@ -5790,7 +5844,7 @@
           "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
           "dev": true,
           "requires": {
-            "homedir-polyfill": "^1.0.1"
+            "homedir-polyfill": "1.0.1"
           }
         }
       }
@@ -5807,10 +5861,10 @@
       "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
       "dev": true,
       "requires": {
-        "circular-json": "^0.3.1",
-        "del": "^2.0.2",
-        "graceful-fs": "^4.1.2",
-        "write": "^0.2.1"
+        "circular-json": "0.3.3",
+        "del": "2.2.2",
+        "graceful-fs": "4.1.11",
+        "write": "0.2.1"
       },
       "dependencies": {
         "circular-json": {
@@ -5825,13 +5879,13 @@
           "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
           "dev": true,
           "requires": {
-            "globby": "^5.0.0",
-            "is-path-cwd": "^1.0.0",
-            "is-path-in-cwd": "^1.0.0",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0",
-            "rimraf": "^2.2.8"
+            "globby": "5.0.0",
+            "is-path-cwd": "1.0.0",
+            "is-path-in-cwd": "1.0.1",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1",
+            "rimraf": "2.6.2"
           }
         },
         "globby": {
@@ -5840,12 +5894,12 @@
           "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
           "dev": true,
           "requires": {
-            "array-union": "^1.0.1",
-            "arrify": "^1.0.0",
-            "glob": "^7.0.3",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "array-union": "1.0.2",
+            "arrify": "1.0.1",
+            "glob": "7.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
           }
         },
         "pify": {
@@ -5868,8 +5922,8 @@
       "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.4"
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
       }
     },
     "follow-redirects": {
@@ -5878,7 +5932,7 @@
       "integrity": "sha512-fdrt472/9qQ6Kgjvb935ig6vJCuofpBUD14f9Vb+SLlm7xIe4Qva5gey8EKtv8lp7ahE1wilg3xL1znpVGtZIA==",
       "dev": true,
       "requires": {
-        "debug": "^3.1.0"
+        "debug": "3.1.0"
       },
       "dependencies": {
         "debug": {
@@ -5903,7 +5957,7 @@
       "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
       "dev": true,
       "requires": {
-        "for-in": "^1.0.1"
+        "for-in": "1.0.2"
       }
     },
     "foreach": {
@@ -5924,9 +5978,9 @@
       "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
       "dev": true,
       "requires": {
-        "asynckit": "^0.4.0",
+        "asynckit": "0.4.0",
         "combined-stream": "1.0.6",
-        "mime-types": "^2.1.12"
+        "mime-types": "2.1.18"
       }
     },
     "formatio": {
@@ -5935,7 +5989,7 @@
       "integrity": "sha1-XtPM1jZVEJc4NGXZlhmRAOhhYek=",
       "dev": true,
       "requires": {
-        "samsam": "~1.1"
+        "samsam": "1.1.2"
       }
     },
     "forwarded": {
@@ -5949,7 +6003,7 @@
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
       "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
       "requires": {
-        "map-cache": "^0.2.2"
+        "map-cache": "0.2.2"
       }
     },
     "fresh": {
@@ -5970,8 +6024,8 @@
       "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
       }
     },
     "front-matter": {
@@ -5980,7 +6034,7 @@
       "integrity": "sha1-91mDufL0E75ljJPf172M5AePXNs=",
       "dev": true,
       "requires": {
-        "js-yaml": "^3.4.6"
+        "js-yaml": "3.13.1"
       }
     },
     "fs-access": {
@@ -5989,7 +6043,7 @@
       "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
       "dev": true,
       "requires": {
-        "null-check": "^1.0.0"
+        "null-check": "1.0.0"
       }
     },
     "fs-exists-sync": {
@@ -6004,9 +6058,9 @@
       "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^3.0.0",
-        "universalify": "^0.1.0"
+        "graceful-fs": "4.1.11",
+        "jsonfile": "3.0.1",
+        "universalify": "0.1.1"
       }
     },
     "fs-minipass": {
@@ -6015,7 +6069,7 @@
       "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
       "dev": true,
       "requires": {
-        "minipass": "^2.2.1"
+        "minipass": "2.3.5"
       }
     },
     "fs-mkdirp-stream": {
@@ -6024,8 +6078,8 @@
       "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.11",
-        "through2": "^2.0.3"
+        "graceful-fs": "4.1.11",
+        "through2": "2.0.3"
       }
     },
     "fs-write-stream-atomic": {
@@ -6034,10 +6088,10 @@
       "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "iferr": "^0.1.5",
-        "imurmurhash": "^0.1.4",
-        "readable-stream": "1 || 2"
+        "graceful-fs": "4.1.11",
+        "iferr": "0.1.5",
+        "imurmurhash": "0.1.4",
+        "readable-stream": "2.3.6"
       }
     },
     "fs.realpath": {
@@ -6052,8 +6106,8 @@
       "integrity": "sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==",
       "optional": true,
       "requires": {
-        "nan": "^2.9.2",
-        "node-pre-gyp": "^0.10.0"
+        "nan": "2.10.0",
+        "node-pre-gyp": "0.10.3"
       },
       "dependencies": {
         "abbrev": {
@@ -6075,21 +6129,19 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^2.0.6"
+            "delegates": "1.0.0",
+            "readable-stream": "2.3.6"
           }
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
-          "optional": true,
           "requires": {
-            "balanced-match": "^1.0.0",
+            "balanced-match": "1.0.0",
             "concat-map": "0.0.1"
           }
         },
@@ -6100,18 +6152,15 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -6146,7 +6195,7 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "minipass": "^2.2.1"
+            "minipass": "2.3.5"
           }
         },
         "fs.realpath": {
@@ -6159,14 +6208,14 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "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"
+            "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"
           }
         },
         "glob": {
@@ -6174,12 +6223,12 @@
           "bundled": true,
           "optional": 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"
+            "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"
           }
         },
         "has-unicode": {
@@ -6192,7 +6241,7 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
+            "safer-buffer": "2.1.2"
           }
         },
         "ignore-walk": {
@@ -6200,7 +6249,7 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "minimatch": "^3.0.4"
+            "minimatch": "3.0.4"
           }
         },
         "inflight": {
@@ -6208,14 +6257,13 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
           }
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "ini": {
           "version": "1.3.5",
@@ -6225,9 +6273,8 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
-          "optional": true,
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "number-is-nan": "1.0.1"
           }
         },
         "isarray": {
@@ -6238,9 +6285,8 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
-          "optional": true,
           "requires": {
-            "brace-expansion": "^1.1.7"
+            "brace-expansion": "1.1.11"
           }
         },
         "minimist": {
@@ -6251,8 +6297,8 @@
           "version": "2.3.5",
           "bundled": true,
           "requires": {
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.0"
+            "safe-buffer": "5.1.2",
+            "yallist": "3.0.3"
           }
         },
         "minizlib": {
@@ -6260,7 +6306,7 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "minipass": "^2.2.1"
+            "minipass": "2.3.5"
           }
         },
         "mkdirp": {
@@ -6280,9 +6326,9 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "debug": "^2.1.2",
-            "iconv-lite": "^0.4.4",
-            "sax": "^1.2.4"
+            "debug": "2.6.9",
+            "iconv-lite": "0.4.24",
+            "sax": "1.2.4"
           }
         },
         "node-pre-gyp": {
@@ -6290,16 +6336,16 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "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"
+            "detect-libc": "1.0.3",
+            "mkdirp": "0.5.1",
+            "needle": "2.2.4",
+            "nopt": "4.0.1",
+            "npm-packlist": "1.2.0",
+            "npmlog": "4.1.2",
+            "rc": "1.2.8",
+            "rimraf": "2.6.3",
+            "semver": "5.6.0",
+            "tar": "4.4.8"
           }
         },
         "nopt": {
@@ -6307,8 +6353,8 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
+            "abbrev": "1.1.1",
+            "osenv": "0.1.5"
           }
         },
         "npm-bundled": {
@@ -6321,8 +6367,8 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "ignore-walk": "^3.0.1",
-            "npm-bundled": "^1.0.1"
+            "ignore-walk": "3.0.1",
+            "npm-bundled": "1.0.5"
           }
         },
         "npmlog": {
@@ -6330,16 +6376,15 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "are-we-there-yet": "~1.1.2",
-            "console-control-strings": "~1.1.0",
-            "gauge": "~2.7.3",
-            "set-blocking": "~2.0.0"
+            "are-we-there-yet": "1.1.5",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
           }
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -6349,9 +6394,8 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
-          "optional": true,
           "requires": {
-            "wrappy": "1"
+            "wrappy": "1.0.2"
           }
         },
         "os-homedir": {
@@ -6369,8 +6413,8 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "os-homedir": "^1.0.0",
-            "os-tmpdir": "^1.0.0"
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
           }
         },
         "path-is-absolute": {
@@ -6388,10 +6432,10 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "deep-extend": "^0.6.0",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
+            "deep-extend": "0.6.0",
+            "ini": "1.3.5",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
           },
           "dependencies": {
             "minimist": {
@@ -6406,13 +6450,13 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "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"
+            "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"
           }
         },
         "rimraf": {
@@ -6420,7 +6464,7 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "glob": "^7.1.3"
+            "glob": "7.1.3"
           }
         },
         "safe-buffer": {
@@ -6455,11 +6499,10 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
-          "optional": true,
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
           }
         },
         "string_decoder": {
@@ -6467,14 +6510,14 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "safe-buffer": "5.1.2"
           }
         },
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "2.1.1"
           }
         },
         "strip-json-comments": {
@@ -6487,13 +6530,13 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "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"
+            "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"
           }
         },
         "util-deprecate": {
@@ -6506,7 +6549,7 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "string-width": "^1.0.2 || 2"
+            "string-width": "1.0.2"
           }
         },
         "wrappy": {
@@ -6525,10 +6568,10 @@
       "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "inherits": "~2.0.0",
-        "mkdirp": ">=0.5 0",
-        "rimraf": "2"
+        "graceful-fs": "4.1.11",
+        "inherits": "2.0.3",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2"
       }
     },
     "function-bind": {
@@ -6543,14 +6586,14 @@
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "dev": true,
       "requires": {
-        "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"
+        "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"
       }
     },
     "gaze": {
@@ -6559,7 +6602,7 @@
       "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
       "dev": true,
       "requires": {
-        "globule": "^1.0.0"
+        "globule": "1.2.1"
       }
     },
     "generate-function": {
@@ -6574,7 +6617,7 @@
       "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
       "dev": true,
       "requires": {
-        "is-property": "^1.0.0"
+        "is-property": "1.0.2"
       }
     },
     "genfun": {
@@ -6612,7 +6655,7 @@
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0"
+        "assert-plus": "1.0.0"
       }
     },
     "glob": {
@@ -6621,12 +6664,12 @@
       "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
       "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"
+        "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"
       }
     },
     "glob-parent": {
@@ -6634,8 +6677,8 @@
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
       "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
       "requires": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
+        "is-glob": "3.1.0",
+        "path-dirname": "1.0.2"
       },
       "dependencies": {
         "is-glob": {
@@ -6643,7 +6686,7 @@
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
           "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
           "requires": {
-            "is-extglob": "^2.1.0"
+            "is-extglob": "2.1.1"
           }
         }
       }
@@ -6654,16 +6697,16 @@
       "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
       "dev": true,
       "requires": {
-        "extend": "^3.0.0",
-        "glob": "^7.1.1",
-        "glob-parent": "^3.1.0",
-        "is-negated-glob": "^1.0.0",
-        "ordered-read-streams": "^1.0.0",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.1.5",
-        "remove-trailing-separator": "^1.0.1",
-        "to-absolute-glob": "^2.0.0",
-        "unique-stream": "^2.0.2"
+        "extend": "3.0.2",
+        "glob": "7.1.2",
+        "glob-parent": "3.1.0",
+        "is-negated-glob": "1.0.0",
+        "ordered-read-streams": "1.0.1",
+        "pumpify": "1.5.1",
+        "readable-stream": "2.3.6",
+        "remove-trailing-separator": "1.1.0",
+        "to-absolute-glob": "2.0.2",
+        "unique-stream": "2.3.1"
       }
     },
     "glob-to-regexp": {
@@ -6678,12 +6721,12 @@
       "integrity": "sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==",
       "dev": true,
       "requires": {
-        "anymatch": "^2.0.0",
-        "async-done": "^1.2.0",
-        "chokidar": "^2.0.0",
-        "is-negated-glob": "^1.0.0",
-        "just-debounce": "^1.0.0",
-        "object.defaults": "^1.1.0"
+        "anymatch": "2.0.0",
+        "async-done": "1.3.1",
+        "chokidar": "2.0.3",
+        "is-negated-glob": "1.0.0",
+        "just-debounce": "1.0.0",
+        "object.defaults": "1.1.0"
       }
     },
     "global-dirs": {
@@ -6692,7 +6735,7 @@
       "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
       "dev": true,
       "requires": {
-        "ini": "^1.3.4"
+        "ini": "1.3.5"
       }
     },
     "global-modules": {
@@ -6701,8 +6744,8 @@
       "integrity": "sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0=",
       "dev": true,
       "requires": {
-        "global-prefix": "^0.1.4",
-        "is-windows": "^0.2.0"
+        "global-prefix": "0.1.5",
+        "is-windows": "0.2.0"
       },
       "dependencies": {
         "is-windows": {
@@ -6719,10 +6762,10 @@
       "integrity": "sha1-jTvGuNo8qBEqFg2NSW/wRiv+948=",
       "dev": true,
       "requires": {
-        "homedir-polyfill": "^1.0.0",
-        "ini": "^1.3.4",
-        "is-windows": "^0.2.0",
-        "which": "^1.2.12"
+        "homedir-polyfill": "1.0.1",
+        "ini": "1.3.5",
+        "is-windows": "0.2.0",
+        "which": "1.3.1"
       },
       "dependencies": {
         "is-windows": {
@@ -6745,13 +6788,13 @@
       "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==",
       "dev": true,
       "requires": {
-        "array-union": "^1.0.1",
-        "dir-glob": "^2.0.0",
-        "fast-glob": "^2.0.2",
-        "glob": "^7.1.2",
-        "ignore": "^3.3.5",
-        "pify": "^3.0.0",
-        "slash": "^1.0.0"
+        "array-union": "1.0.2",
+        "dir-glob": "2.0.0",
+        "fast-glob": "2.2.2",
+        "glob": "7.1.2",
+        "ignore": "3.3.8",
+        "pify": "3.0.0",
+        "slash": "1.0.0"
       }
     },
     "globule": {
@@ -6760,9 +6803,9 @@
       "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
       "dev": true,
       "requires": {
-        "glob": "~7.1.1",
-        "lodash": "~4.17.10",
-        "minimatch": "~3.0.2"
+        "glob": "7.1.2",
+        "lodash": "4.17.15",
+        "minimatch": "3.0.4"
       },
       "dependencies": {
         "lodash": {
@@ -6779,7 +6822,7 @@
       "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
       "dev": true,
       "requires": {
-        "sparkles": "^1.0.0"
+        "sparkles": "1.0.1"
       }
     },
     "gonzales-pe-sl": {
@@ -6788,7 +6831,7 @@
       "integrity": "sha1-aoaLw4BkXxQf7rBCxvl/zHG1n+Y=",
       "dev": true,
       "requires": {
-        "minimist": "1.1.x"
+        "minimist": "1.1.3"
       },
       "dependencies": {
         "minimist": {
@@ -6805,17 +6848,17 @@
       "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
       "dev": true,
       "requires": {
-        "create-error-class": "^3.0.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^3.0.0",
-        "is-redirect": "^1.0.0",
-        "is-retry-allowed": "^1.0.0",
-        "is-stream": "^1.0.0",
-        "lowercase-keys": "^1.0.0",
-        "safe-buffer": "^5.0.1",
-        "timed-out": "^4.0.0",
-        "unzip-response": "^2.0.1",
-        "url-parse-lax": "^1.0.0"
+        "create-error-class": "3.0.2",
+        "duplexer3": "0.1.4",
+        "get-stream": "3.0.0",
+        "is-redirect": "1.0.0",
+        "is-retry-allowed": "1.1.0",
+        "is-stream": "1.1.0",
+        "lowercase-keys": "1.0.1",
+        "safe-buffer": "5.1.2",
+        "timed-out": "4.0.1",
+        "unzip-response": "2.0.1",
+        "url-parse-lax": "1.0.0"
       }
     },
     "graceful-fs": {
@@ -6823,13 +6866,21 @@
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
     },
+    "graphlib": {
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/graphlib/-/graphlib-2.1.7.tgz",
+      "integrity": "sha512-TyI9jIy2J4j0qgPmOOrHTCtpPqJGN/aurBwc6ZT+bRii+di1I+Wv3obRhVrmBEXet+qkMaEX67dXrwsd3QQM6w==",
+      "requires": {
+        "lodash": "4.17.13"
+      }
+    },
     "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"
+        "temp": "0.4.0"
       }
     },
     "gulp": {
@@ -6838,10 +6889,10 @@
       "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
       "dev": true,
       "requires": {
-        "glob-watcher": "^5.0.3",
-        "gulp-cli": "^2.2.0",
-        "undertaker": "^1.2.1",
-        "vinyl-fs": "^3.0.0"
+        "glob-watcher": "5.0.3",
+        "gulp-cli": "2.2.0",
+        "undertaker": "1.2.1",
+        "vinyl-fs": "3.0.3"
       },
       "dependencies": {
         "camelcase": {
@@ -6856,9 +6907,9 @@
           "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
           "dev": true,
           "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wrap-ansi": "^2.0.0"
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wrap-ansi": "2.1.0"
           }
         },
         "gulp-cli": {
@@ -6867,24 +6918,24 @@
           "integrity": "sha512-rGs3bVYHdyJpLqR0TUBnlcZ1O5O++Zs4bA0ajm+zr3WFCfiSLjGwoCBqFs18wzN+ZxahT9DkOK5nDf26iDsWjA==",
           "dev": true,
           "requires": {
-            "ansi-colors": "^1.0.1",
-            "archy": "^1.0.0",
-            "array-sort": "^1.0.0",
-            "color-support": "^1.1.3",
-            "concat-stream": "^1.6.0",
-            "copy-props": "^2.0.1",
-            "fancy-log": "^1.3.2",
-            "gulplog": "^1.0.0",
-            "interpret": "^1.1.0",
-            "isobject": "^3.0.1",
-            "liftoff": "^3.1.0",
-            "matchdep": "^2.0.0",
-            "mute-stdout": "^1.0.0",
-            "pretty-hrtime": "^1.0.0",
-            "replace-homedir": "^1.0.0",
-            "semver-greatest-satisfied-range": "^1.1.0",
-            "v8flags": "^3.0.1",
-            "yargs": "^7.1.0"
+            "ansi-colors": "1.1.0",
+            "archy": "1.0.0",
+            "array-sort": "1.0.0",
+            "color-support": "1.1.3",
+            "concat-stream": "1.6.2",
+            "copy-props": "2.0.4",
+            "fancy-log": "1.3.3",
+            "gulplog": "1.0.0",
+            "interpret": "1.1.0",
+            "isobject": "3.0.1",
+            "liftoff": "3.1.0",
+            "matchdep": "2.0.0",
+            "mute-stdout": "1.0.1",
+            "pretty-hrtime": "1.0.3",
+            "replace-homedir": "1.0.0",
+            "semver-greatest-satisfied-range": "1.1.0",
+            "v8flags": "3.1.0",
+            "yargs": "7.1.0"
           }
         },
         "y18n": {
@@ -6899,19 +6950,19 @@
           "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
           "dev": true,
           "requires": {
-            "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"
+            "camelcase": "3.0.0",
+            "cliui": "3.2.0",
+            "decamelize": "1.2.0",
+            "get-caller-file": "1.0.2",
+            "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"
           }
         }
       }
@@ -6922,11 +6973,11 @@
       "integrity": "sha512-I+697f6jf+PncdTrqfuwoauxgnLG1yHRg3vlmvDgmJuEnlEHy4meBktJ/oHgfyg4tp6X25wuZqUOraVeVg97wQ==",
       "dev": true,
       "requires": {
-        "get-stream": "^3.0.0",
-        "plugin-error": "^0.1.2",
-        "through2": "^2.0.1",
-        "vinyl": "^2.1.0",
-        "yazl": "^2.1.0"
+        "get-stream": "3.0.0",
+        "plugin-error": "0.1.2",
+        "through2": "2.0.3",
+        "vinyl": "2.1.0",
+        "yazl": "2.4.3"
       }
     },
     "gulplog": {
@@ -6935,7 +6986,7 @@
       "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
       "dev": true,
       "requires": {
-        "glogg": "^1.0.0"
+        "glogg": "1.0.2"
       }
     },
     "hammerjs": {
@@ -6955,10 +7006,10 @@
       "integrity": "sha512-Kb4xn5Qh1cxAKvQnzNWZ512DhABzyFNmsaJf3OAkWNa4NkaqWcNI8Tao8Tasi0/F4JD9oyG0YxuFyvyR57d+Gw==",
       "dev": true,
       "requires": {
-        "neo-async": "^2.6.0",
-        "optimist": "^0.6.1",
-        "source-map": "^0.6.1",
-        "uglify-js": "^3.1.4"
+        "neo-async": "2.6.0",
+        "optimist": "0.6.1",
+        "source-map": "0.6.1",
+        "uglify-js": "3.4.9"
       },
       "dependencies": {
         "source-map": {
@@ -6981,8 +7032,8 @@
       "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
       "dev": true,
       "requires": {
-        "ajv": "^6.5.5",
-        "har-schema": "^2.0.0"
+        "ajv": "6.9.1",
+        "har-schema": "2.0.0"
       },
       "dependencies": {
         "ajv": {
@@ -6991,10 +7042,10 @@
           "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
           "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"
           }
         },
         "fast-deep-equal": {
@@ -7015,7 +7066,7 @@
           "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
           "dev": true,
           "requires": {
-            "punycode": "^2.1.0"
+            "punycode": "2.1.1"
           }
         }
       }
@@ -7026,7 +7077,7 @@
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "dev": true,
       "requires": {
-        "function-bind": "^1.1.1"
+        "function-bind": "1.1.1"
       }
     },
     "has-ansi": {
@@ -7035,7 +7086,7 @@
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
       "dev": true,
       "requires": {
-        "ansi-regex": "^2.0.0"
+        "ansi-regex": "2.1.1"
       }
     },
     "has-binary2": {
@@ -7073,7 +7124,7 @@
       "integrity": "sha1-omHEwqbGZ+DHe3AKfyl8Oe86pYk=",
       "dev": true,
       "requires": {
-        "is-glob": "^2.0.1"
+        "is-glob": "2.0.1"
       },
       "dependencies": {
         "is-extglob": {
@@ -7088,7 +7139,7 @@
           "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
           "requires": {
-            "is-extglob": "^1.0.0"
+            "is-extglob": "1.0.0"
           }
         }
       }
@@ -7110,9 +7161,9 @@
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
       "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
       "requires": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
+        "get-value": "2.0.6",
+        "has-values": "1.0.0",
+        "isobject": "3.0.1"
       }
     },
     "has-values": {
@@ -7120,8 +7171,8 @@
       "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
       "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
       "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
+        "is-number": "3.0.0",
+        "kind-of": "4.0.0"
       },
       "dependencies": {
         "kind-of": {
@@ -7129,7 +7180,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -7140,8 +7191,8 @@
       "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
       }
     },
     "hash.js": {
@@ -7150,8 +7201,8 @@
       "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.1"
       }
     },
     "hmac-drbg": {
@@ -7160,9 +7211,9 @@
       "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
       "dev": true,
       "requires": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
+        "hash.js": "1.1.7",
+        "minimalistic-assert": "1.0.1",
+        "minimalistic-crypto-utils": "1.0.1"
       }
     },
     "homedir-polyfill": {
@@ -7171,7 +7222,7 @@
       "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=",
       "dev": true,
       "requires": {
-        "parse-passwd": "^1.0.0"
+        "parse-passwd": "1.0.0"
       }
     },
     "hosted-git-info": {
@@ -7186,10 +7237,10 @@
       "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
+        "inherits": "2.0.3",
+        "obuf": "1.1.2",
+        "readable-stream": "2.3.6",
+        "wbuf": "1.7.3"
       }
     },
     "html-entities": {
@@ -7216,10 +7267,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.4.0 < 2"
+        "statuses": "1.4.0"
       }
     },
     "http-parser-js": {
@@ -7234,9 +7285,9 @@
       "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
       "dev": true,
       "requires": {
-        "eventemitter3": "^3.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
+        "eventemitter3": "3.1.0",
+        "follow-redirects": "1.5.0",
+        "requires-port": "1.0.0"
       }
     },
     "http-proxy-agent": {
@@ -7245,7 +7296,7 @@
       "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
       "dev": true,
       "requires": {
-        "agent-base": "4",
+        "agent-base": "4.2.0",
         "debug": "3.1.0"
       },
       "dependencies": {
@@ -7266,10 +7317,10 @@
       "integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
       "dev": true,
       "requires": {
-        "http-proxy": "^1.16.2",
-        "is-glob": "^4.0.0",
-        "lodash": "^4.17.5",
-        "micromatch": "^3.1.9"
+        "http-proxy": "1.17.0",
+        "is-glob": "4.0.0",
+        "lodash": "4.17.15",
+        "micromatch": "3.1.10"
       },
       "dependencies": {
         "lodash": {
@@ -7286,9 +7337,9 @@
       "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
+        "assert-plus": "1.0.0",
+        "jsprim": "1.4.1",
+        "sshpk": "1.14.1"
       }
     },
     "https-browserify": {
@@ -7303,8 +7354,8 @@
       "integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==",
       "dev": true,
       "requires": {
-        "agent-base": "^4.1.0",
-        "debug": "^3.1.0"
+        "agent-base": "4.2.0",
+        "debug": "3.1.0"
       },
       "dependencies": {
         "debug": {
@@ -7324,7 +7375,7 @@
       "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=",
       "dev": true,
       "requires": {
-        "ms": "^2.0.0"
+        "ms": "2.0.0"
       }
     },
     "iconv-lite": {
@@ -7356,7 +7407,7 @@
       "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
       "dev": true,
       "requires": {
-        "minimatch": "^3.0.4"
+        "minimatch": "3.0.4"
       }
     },
     "image-size": {
@@ -7383,7 +7434,7 @@
       "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
       "dev": true,
       "requires": {
-        "import-from": "^2.1.0"
+        "import-from": "2.1.0"
       }
     },
     "import-from": {
@@ -7392,7 +7443,7 @@
       "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
       "dev": true,
       "requires": {
-        "resolve-from": "^3.0.0"
+        "resolve-from": "3.0.0"
       }
     },
     "import-lazy": {
@@ -7407,8 +7458,8 @@
       "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
       "dev": true,
       "requires": {
-        "pkg-dir": "^3.0.0",
-        "resolve-cwd": "^2.0.0"
+        "pkg-dir": "3.0.0",
+        "resolve-cwd": "2.0.0"
       },
       "dependencies": {
         "find-up": {
@@ -7417,7 +7468,7 @@
           "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
-            "locate-path": "^3.0.0"
+            "locate-path": "3.0.0"
           }
         },
         "locate-path": {
@@ -7426,8 +7477,8 @@
           "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"
           }
         },
         "p-limit": {
@@ -7436,7 +7487,7 @@
           "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==",
           "dev": true,
           "requires": {
-            "p-try": "^2.0.0"
+            "p-try": "2.0.0"
           }
         },
         "p-locate": {
@@ -7445,7 +7496,7 @@
           "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "dev": true,
           "requires": {
-            "p-limit": "^2.0.0"
+            "p-limit": "2.1.0"
           }
         },
         "p-try": {
@@ -7460,7 +7511,7 @@
           "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
           "dev": true,
           "requires": {
-            "find-up": "^3.0.0"
+            "find-up": "3.0.0"
           }
         }
       }
@@ -7483,7 +7534,7 @@
       "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
       "dev": true,
       "requires": {
-        "repeating": "^2.0.0"
+        "repeating": "2.0.1"
       }
     },
     "indexof": {
@@ -7498,8 +7549,8 @@
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "dev": true,
       "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+        "once": "1.4.0",
+        "wrappy": "1.0.2"
       }
     },
     "inherits": {
@@ -7525,19 +7576,19 @@
       "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
       "dev": true,
       "requires": {
-        "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"
+        "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"
       },
       "dependencies": {
         "ansi-styles": {
@@ -7552,11 +7603,11 @@
           "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"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "lodash": {
@@ -7579,8 +7630,8 @@
       "integrity": "sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==",
       "dev": true,
       "requires": {
-        "default-gateway": "^2.6.0",
-        "ipaddr.js": "^1.5.2"
+        "default-gateway": "2.7.2",
+        "ipaddr.js": "1.8.0"
       }
     },
     "interpret": {
@@ -7600,7 +7651,7 @@
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
       "dev": true,
       "requires": {
-        "loose-envify": "^1.0.0"
+        "loose-envify": "1.3.1"
       }
     },
     "invert-kv": {
@@ -7633,8 +7684,8 @@
       "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
       "dev": true,
       "requires": {
-        "is-relative": "^1.0.0",
-        "is-windows": "^1.0.1"
+        "is-relative": "1.0.0",
+        "is-windows": "1.0.2"
       }
     },
     "is-accessor-descriptor": {
@@ -7642,7 +7693,7 @@
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "requires": {
-        "kind-of": "^3.0.2"
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "kind-of": {
@@ -7650,7 +7701,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -7666,7 +7717,7 @@
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
       "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
       "requires": {
-        "binary-extensions": "^1.0.0"
+        "binary-extensions": "1.11.0"
       }
     },
     "is-buffer": {
@@ -7680,7 +7731,7 @@
       "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
       "dev": true,
       "requires": {
-        "builtin-modules": "^1.0.0"
+        "builtin-modules": "1.1.1"
       }
     },
     "is-callable": {
@@ -7695,7 +7746,7 @@
       "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
       "dev": true,
       "requires": {
-        "ci-info": "^1.5.0"
+        "ci-info": "1.6.0"
       }
     },
     "is-data-descriptor": {
@@ -7703,7 +7754,7 @@
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "requires": {
-        "kind-of": "^3.0.2"
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "kind-of": {
@@ -7711,7 +7762,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -7727,9 +7778,9 @@
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
       "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "requires": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "is-accessor-descriptor": "0.1.6",
+        "is-data-descriptor": "0.1.4",
+        "kind-of": "5.1.0"
       },
       "dependencies": {
         "kind-of": {
@@ -7761,7 +7812,7 @@
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
       "dev": true,
       "requires": {
-        "number-is-nan": "^1.0.0"
+        "number-is-nan": "1.0.1"
       }
     },
     "is-fullwidth-code-point": {
@@ -7770,7 +7821,7 @@
       "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
       "dev": true,
       "requires": {
-        "number-is-nan": "^1.0.0"
+        "number-is-nan": "1.0.1"
       }
     },
     "is-glob": {
@@ -7778,7 +7829,7 @@
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
       "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
       "requires": {
-        "is-extglob": "^2.1.1"
+        "is-extglob": "2.1.1"
       }
     },
     "is-installed-globally": {
@@ -7787,8 +7838,8 @@
       "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=",
       "dev": true,
       "requires": {
-        "global-dirs": "^0.1.0",
-        "is-path-inside": "^1.0.0"
+        "global-dirs": "0.1.1",
+        "is-path-inside": "1.0.1"
       }
     },
     "is-module": {
@@ -7809,11 +7860,11 @@
       "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==",
       "dev": true,
       "requires": {
-        "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"
+        "generate-function": "2.0.0",
+        "generate-object-property": "1.2.0",
+        "is-my-ip-valid": "1.0.0",
+        "jsonpointer": "4.0.1",
+        "xtend": "4.0.1"
       }
     },
     "is-negated-glob": {
@@ -7833,7 +7884,7 @@
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
       "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
       "requires": {
-        "kind-of": "^3.0.2"
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "kind-of": {
@@ -7841,7 +7892,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -7857,7 +7908,7 @@
       "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz",
       "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==",
       "requires": {
-        "is-number": "^4.0.0"
+        "is-number": "4.0.0"
       },
       "dependencies": {
         "is-number": {
@@ -7879,7 +7930,7 @@
       "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
       "dev": true,
       "requires": {
-        "is-path-inside": "^1.0.0"
+        "is-path-inside": "1.0.1"
       }
     },
     "is-path-inside": {
@@ -7888,7 +7939,7 @@
       "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
       "dev": true,
       "requires": {
-        "path-is-inside": "^1.0.1"
+        "path-is-inside": "1.0.2"
       }
     },
     "is-plain-object": {
@@ -7896,7 +7947,7 @@
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "requires": {
-        "isobject": "^3.0.1"
+        "isobject": "3.0.1"
       }
     },
     "is-promise": {
@@ -7923,7 +7974,7 @@
       "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
       "dev": true,
       "requires": {
-        "has": "^1.0.1"
+        "has": "1.0.3"
       }
     },
     "is-relative": {
@@ -7932,7 +7983,7 @@
       "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
       "dev": true,
       "requires": {
-        "is-unc-path": "^1.0.0"
+        "is-unc-path": "1.0.0"
       }
     },
     "is-resolvable": {
@@ -7977,7 +8028,7 @@
       "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
       "dev": true,
       "requires": {
-        "unc-path-regex": "^0.1.2"
+        "unc-path-regex": "0.1.2"
       }
     },
     "is-utf8": {
@@ -8014,7 +8065,7 @@
       "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
       "dev": true,
       "requires": {
-        "buffer-alloc": "^1.2.0"
+        "buffer-alloc": "1.2.0"
       }
     },
     "isexe": {
@@ -8040,20 +8091,20 @@
       "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
       "dev": true,
       "requires": {
-        "abbrev": "1.0.x",
-        "async": "1.x",
-        "escodegen": "1.8.x",
-        "esprima": "2.7.x",
-        "glob": "^5.0.15",
-        "handlebars": "^4.0.1",
-        "js-yaml": "3.x",
-        "mkdirp": "0.5.x",
-        "nopt": "3.x",
-        "once": "1.x",
-        "resolve": "1.1.x",
-        "supports-color": "^3.1.0",
-        "which": "^1.1.1",
-        "wordwrap": "^1.0.0"
+        "abbrev": "1.0.9",
+        "async": "1.5.2",
+        "escodegen": "1.8.1",
+        "esprima": "2.7.3",
+        "glob": "5.0.15",
+        "handlebars": "4.2.0",
+        "js-yaml": "3.13.1",
+        "mkdirp": "0.5.1",
+        "nopt": "3.0.6",
+        "once": "1.4.0",
+        "resolve": "1.1.7",
+        "supports-color": "3.2.3",
+        "which": "1.3.1",
+        "wordwrap": "1.0.0"
       },
       "dependencies": {
         "esprima": {
@@ -8068,11 +8119,11 @@
           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "dev": true,
           "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^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"
           }
         },
         "has-flag": {
@@ -8093,7 +8144,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "^1.0.0"
+            "has-flag": "1.0.0"
           }
         }
       }
@@ -8104,17 +8155,17 @@
       "integrity": "sha512-4/ApBnMVeEPG3EkSzcw25wDe4N66wxwn+KKn6b47vyek8Xb3NBAcg4xfuQbS7BqcZuTX4wxfD5lVagdggR3gyA==",
       "dev": true,
       "requires": {
-        "async": "^2.1.4",
-        "fileset": "^2.0.2",
-        "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.5.1",
-        "js-yaml": "^3.7.0",
-        "mkdirp": "^0.5.1",
-        "once": "^1.4.0"
+        "async": "2.6.2",
+        "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.5.1",
+        "js-yaml": "3.13.1",
+        "mkdirp": "0.5.1",
+        "once": "1.4.0"
       },
       "dependencies": {
         "append-transform": {
@@ -8123,7 +8174,7 @@
           "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=",
           "dev": true,
           "requires": {
-            "default-require-extensions": "^1.0.0"
+            "default-require-extensions": "1.0.0"
           }
         },
         "async": {
@@ -8132,7 +8183,7 @@
           "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
           "dev": true,
           "requires": {
-            "lodash": "^4.17.11"
+            "lodash": "4.17.13"
           }
         },
         "debug": {
@@ -8141,7 +8192,7 @@
           "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "default-require-extensions": {
@@ -8150,7 +8201,7 @@
           "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=",
           "dev": true,
           "requires": {
-            "strip-bom": "^2.0.0"
+            "strip-bom": "2.0.0"
           }
         },
         "has-flag": {
@@ -8171,7 +8222,7 @@
           "integrity": "sha512-/Jmq7Y1VeHnZEQ3TL10VHyb564mn6VrQXHchON9Jf/AEcmQ3ZIiyD1BVzNOKTZf/G3gE+kiGK6SmpF9y3qGPLw==",
           "dev": true,
           "requires": {
-            "append-transform": "^0.4.0"
+            "append-transform": "0.4.0"
           }
         },
         "istanbul-lib-instrument": {
@@ -8180,13 +8231,13 @@
           "integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==",
           "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-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.5.0"
           }
         },
         "istanbul-lib-report": {
@@ -8195,10 +8246,10 @@
           "integrity": "sha512-UsYfRMoi6QO/doUshYNqcKJqVmFe9w51GZz8BS3WB0lYxAllQYklka2wP9+dGZeHYaWIdcXUx8JGdbqaoXRXzw==",
           "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": "1.2.1",
+            "mkdirp": "0.5.1",
+            "path-parse": "1.0.5",
+            "supports-color": "3.2.3"
           }
         },
         "istanbul-lib-source-maps": {
@@ -8207,11 +8258,11 @@
           "integrity": "sha512-TtbsY5GIHgbMsMiRw35YBHGpZ1DVFEO19vxxeiDMYaeOFOCzfnYVxvl6pOUIZR4dtPhAGpSMup8OyF8ubsaqEg==",
           "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": "3.2.6",
+            "istanbul-lib-coverage": "1.2.1",
+            "mkdirp": "0.5.1",
+            "rimraf": "2.6.2",
+            "source-map": "0.5.6"
           }
         },
         "istanbul-reports": {
@@ -8220,7 +8271,7 @@
           "integrity": "sha512-+cfoZ0UXzWjhAdzosCPP3AN8vvef8XDkWtTfgaN+7L3YTpNYITnCaEkceo5SEYy644VkHka/P1FvkWvrG/rrJw==",
           "dev": true,
           "requires": {
-            "handlebars": "^4.0.3"
+            "handlebars": "4.2.0"
           }
         },
         "ms": {
@@ -8235,7 +8286,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "^1.0.0"
+            "has-flag": "1.0.0"
           }
         }
       }
@@ -8246,10 +8297,10 @@
       "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"
+        "convert-source-map": "1.5.1",
+        "istanbul-lib-instrument": "1.10.1",
+        "loader-utils": "1.2.3",
+        "schema-utils": "0.3.0"
       },
       "dependencies": {
         "ajv": {
@@ -8258,10 +8309,10 @@
           "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
           "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"
+            "co": "4.6.0",
+            "fast-deep-equal": "1.1.0",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.3.1"
           }
         },
         "schema-utils": {
@@ -8270,7 +8321,7 @@
           "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
           "dev": true,
           "requires": {
-            "ajv": "^5.0.0"
+            "ajv": "5.5.2"
           }
         }
       }
@@ -8287,13 +8338,13 @@
       "integrity": "sha512-1dYuzkOCbuR5GRJqySuZdsmsNKPL3PTuyPevQfoCXJePT9C8y1ga75neU+Tuy9+yS3G/dgx8wgOmp2KLpgdoeQ==",
       "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.0",
-        "semver": "^5.3.0"
+        "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.0",
+        "semver": "5.5.0"
       }
     },
     "jasmine": {
@@ -8302,9 +8353,9 @@
       "integrity": "sha1-awicChFXax8W3xG4AUbZHU6Lij4=",
       "dev": true,
       "requires": {
-        "exit": "^0.1.2",
-        "glob": "^7.0.6",
-        "jasmine-core": "~2.8.0"
+        "exit": "0.1.2",
+        "glob": "7.1.2",
+        "jasmine-core": "2.8.0"
       },
       "dependencies": {
         "jasmine-core": {
@@ -8354,8 +8405,8 @@
       "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
       "dev": true,
       "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
+        "argparse": "1.0.10",
+        "esprima": "4.0.1"
       }
     },
     "jsbn": {
@@ -8395,7 +8446,7 @@
       "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
       "dev": true,
       "requires": {
-        "jsonify": "~0.0.0"
+        "jsonify": "0.0.0"
       }
     },
     "json-stable-stringify-without-jsonify": {
@@ -8422,7 +8473,7 @@
       "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
       "dev": true,
       "requires": {
-        "minimist": "^1.2.0"
+        "minimist": "1.2.0"
       },
       "dependencies": {
         "minimist": {
@@ -8439,7 +8490,7 @@
       "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.6"
+        "graceful-fs": "4.1.11"
       }
     },
     "jsonify": {
@@ -8478,10 +8529,10 @@
       "integrity": "sha512-NmKajvAFQpbg3taXQXr/ccS2wcucR1AZ+NtyWp2Nq7HHVsXhcJFR8p0Baf32C2yVvBylFWVeKf+WI2AnvlPhpA==",
       "dev": true,
       "requires": {
-        "lie": "~3.3.0",
-        "pako": "~1.0.2",
-        "readable-stream": "~2.3.6",
-        "set-immediate-shim": "~1.0.1"
+        "lie": "3.3.0",
+        "pako": "1.0.6",
+        "readable-stream": "2.3.6",
+        "set-immediate-shim": "1.0.1"
       }
     },
     "just-debounce": {
@@ -8496,31 +8547,31 @@
       "integrity": "sha512-NSPViHOt+RW38oJklvYxQC4BSQsv737oQlr/r06pCM+slDOr4myuI1ivkRmp+3dVpJDfZt2DmaPJ2wkx+ZZuMQ==",
       "dev": true,
       "requires": {
-        "bluebird": "^3.3.0",
-        "body-parser": "^1.16.1",
-        "braces": "^3.0.2",
-        "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",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.1.2",
-        "http-proxy": "^1.13.0",
-        "isbinaryfile": "^3.0.0",
-        "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",
+        "bluebird": "3.5.1",
+        "body-parser": "1.18.3",
+        "braces": "3.0.2",
+        "chokidar": "3.1.1",
+        "colors": "1.1.2",
+        "connect": "3.7.0",
+        "core-js": "3.2.1",
+        "di": "0.0.1",
+        "dom-serialize": "2.2.1",
+        "flatted": "2.0.1",
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "http-proxy": "1.17.0",
+        "isbinaryfile": "3.0.3",
+        "lodash": "4.17.15",
+        "log4js": "4.5.1",
+        "mime": "2.4.4",
+        "minimatch": "3.0.4",
+        "optimist": "0.6.1",
+        "qjobs": "1.2.0",
+        "range-parser": "1.2.0",
+        "rimraf": "2.6.2",
+        "safe-buffer": "5.1.2",
         "socket.io": "2.1.1",
-        "source-map": "^0.6.1",
+        "source-map": "0.6.1",
         "tmp": "0.0.33",
         "useragent": "2.3.0"
       },
@@ -8531,8 +8582,8 @@
           "integrity": "sha512-Ozz7l4ixzI7Oxj2+cw+p0tVUt27BpaJ+1+q1TCeANWxHpvyn2+Un+YamBdfKu0uh8xLodGhoa1v7595NhKDAuA==",
           "dev": true,
           "requires": {
-            "normalize-path": "^3.0.0",
-            "picomatch": "^2.0.4"
+            "normalize-path": "3.0.0",
+            "picomatch": "2.0.7"
           }
         },
         "async": {
@@ -8541,7 +8592,7 @@
           "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
           "dev": true,
           "requires": {
-            "lodash": "^4.17.14"
+            "lodash": "4.17.15"
           }
         },
         "binary-extensions": {
@@ -8556,7 +8607,7 @@
           "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
           "dev": true,
           "requires": {
-            "fill-range": "^7.0.1"
+            "fill-range": "7.0.1"
           }
         },
         "chokidar": {
@@ -8565,14 +8616,14 @@
           "integrity": "sha512-df4o16uZmMHzVQwECZRHwfguOt5ixpuQVaZHjYMvYisgKhE+JXwcj/Tcr3+3bu/XeOJQ9ycYmzu7Mv8XrGxJDQ==",
           "dev": true,
           "requires": {
-            "anymatch": "^3.1.0",
-            "braces": "^3.0.2",
-            "fsevents": "^2.0.6",
-            "glob-parent": "^5.0.0",
-            "is-binary-path": "^2.1.0",
-            "is-glob": "^4.0.1",
-            "normalize-path": "^3.0.0",
-            "readdirp": "^3.1.1"
+            "anymatch": "3.1.0",
+            "braces": "3.0.2",
+            "fsevents": "2.0.7",
+            "glob-parent": "5.0.0",
+            "is-binary-path": "2.1.0",
+            "is-glob": "4.0.1",
+            "normalize-path": "3.0.0",
+            "readdirp": "3.1.2"
           }
         },
         "core-js": {
@@ -8593,7 +8644,7 @@
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "fill-range": {
@@ -8602,7 +8653,7 @@
           "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
           "dev": true,
           "requires": {
-            "to-regex-range": "^5.0.1"
+            "to-regex-range": "5.0.1"
           }
         },
         "fs-extra": {
@@ -8611,9 +8662,9 @@
           "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
+            "graceful-fs": "4.1.11",
+            "jsonfile": "4.0.0",
+            "universalify": "0.1.1"
           }
         },
         "fsevents": {
@@ -8629,7 +8680,7 @@
           "integrity": "sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==",
           "dev": true,
           "requires": {
-            "is-glob": "^4.0.1"
+            "is-glob": "4.0.1"
           }
         },
         "is-binary-path": {
@@ -8638,7 +8689,7 @@
           "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
           "dev": true,
           "requires": {
-            "binary-extensions": "^2.0.0"
+            "binary-extensions": "2.0.0"
           }
         },
         "is-glob": {
@@ -8647,7 +8698,7 @@
           "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
           "dev": true,
           "requires": {
-            "is-extglob": "^2.1.1"
+            "is-extglob": "2.1.1"
           }
         },
         "is-number": {
@@ -8662,7 +8713,7 @@
           "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.6"
+            "graceful-fs": "4.1.11"
           }
         },
         "lodash": {
@@ -8677,11 +8728,11 @@
           "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"
+            "date-format": "2.1.0",
+            "debug": "4.1.1",
+            "flatted": "2.0.1",
+            "rfdc": "1.1.4",
+            "streamroller": "1.0.6"
           }
         },
         "mime": {
@@ -8708,7 +8759,7 @@
           "integrity": "sha512-8rhl0xs2cxfVsqzreYCvs8EwBfn/DhVdqtoLmw19uI3SC5avYX9teCurlErfpPXGmYtMHReGaP2RsLnFvz/lnw==",
           "dev": true,
           "requires": {
-            "picomatch": "^2.0.4"
+            "picomatch": "2.0.7"
           }
         },
         "rfdc": {
@@ -8729,11 +8780,11 @@
           "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"
+            "async": "2.6.3",
+            "date-format": "2.1.0",
+            "debug": "3.2.6",
+            "fs-extra": "7.0.1",
+            "lodash": "4.17.15"
           },
           "dependencies": {
             "debug": {
@@ -8742,7 +8793,7 @@
               "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
               "dev": true,
               "requires": {
-                "ms": "^2.1.1"
+                "ms": "2.1.2"
               }
             }
           }
@@ -8753,7 +8804,7 @@
           "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
           "dev": true,
           "requires": {
-            "is-number": "^7.0.0"
+            "is-number": "7.0.0"
           }
         }
       }
@@ -8764,8 +8815,8 @@
       "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==",
       "dev": true,
       "requires": {
-        "fs-access": "^1.0.0",
-        "which": "^1.2.1"
+        "fs-access": "1.0.1",
+        "which": "1.3.1"
       }
     },
     "karma-cli": {
@@ -8774,7 +8825,7 @@
       "integrity": "sha1-rmw8WKMTodALRRZMRVubhs4X+WA=",
       "dev": true,
       "requires": {
-        "resolve": "^1.1.6"
+        "resolve": "1.7.1"
       }
     },
     "karma-coverage-istanbul-reporter": {
@@ -8783,8 +8834,8 @@
       "integrity": "sha512-UcgrHkFehI5+ivMouD8NH/UOHiX4oCAtwaANylzPFdcAuD52fnCUuelacq2gh8tZ4ydhU3+xiXofSq7j5Ehygw==",
       "dev": true,
       "requires": {
-        "istanbul-api": "^1.3.1",
-        "minimatch": "^3.0.4"
+        "istanbul-api": "1.3.7",
+        "minimatch": "3.0.4"
       }
     },
     "karma-jasmine": {
@@ -8793,7 +8844,7 @@
       "integrity": "sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==",
       "dev": true,
       "requires": {
-        "jasmine-core": "^3.3"
+        "jasmine-core": "3.3.0"
       }
     },
     "karma-jasmine-html-reporter": {
@@ -8808,7 +8859,7 @@
       "integrity": "sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==",
       "dev": true,
       "requires": {
-        "source-map-support": "^0.5.5"
+        "source-map-support": "0.5.10"
       }
     },
     "karma-spec-reporter": {
@@ -8817,7 +8868,7 @@
       "integrity": "sha1-SDDccUihVcfXoYbmMjOaDYD63sM=",
       "dev": true,
       "requires": {
-        "colors": "^1.1.2"
+        "colors": "1.1.2"
       }
     },
     "killable": {
@@ -8837,7 +8888,7 @@
       "integrity": "sha1-PTvNhgDnv971MjHHOf8FOu1WDkQ=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.11"
+        "graceful-fs": "4.1.11"
       }
     },
     "known-css-properties": {
@@ -8852,8 +8903,8 @@
       "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
       "dev": true,
       "requires": {
-        "default-resolution": "^2.0.0",
-        "es6-weak-map": "^2.0.1"
+        "default-resolution": "2.0.0",
+        "es6-weak-map": "2.0.2"
       }
     },
     "latest-version": {
@@ -8862,7 +8913,7 @@
       "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
       "dev": true,
       "requires": {
-        "package-json": "^4.0.0"
+        "package-json": "4.0.1"
       }
     },
     "lazy-cache": {
@@ -8877,7 +8928,7 @@
       "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
       "dev": true,
       "requires": {
-        "readable-stream": "^2.0.5"
+        "readable-stream": "2.3.6"
       }
     },
     "lcid": {
@@ -8886,7 +8937,7 @@
       "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
       "dev": true,
       "requires": {
-        "invert-kv": "^1.0.0"
+        "invert-kv": "1.0.0"
       }
     },
     "lead": {
@@ -8895,7 +8946,7 @@
       "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
       "dev": true,
       "requires": {
-        "flush-write-stream": "^1.0.2"
+        "flush-write-stream": "1.0.3"
       }
     },
     "less": {
@@ -8904,15 +8955,15 @@
       "integrity": "sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==",
       "dev": true,
       "requires": {
-        "clone": "^2.1.2",
-        "errno": "^0.1.1",
-        "graceful-fs": "^4.1.2",
-        "image-size": "~0.5.0",
-        "mime": "^1.4.1",
-        "mkdirp": "^0.5.0",
-        "promise": "^7.1.1",
-        "request": "^2.83.0",
-        "source-map": "~0.6.0"
+        "clone": "2.1.2",
+        "errno": "0.1.7",
+        "graceful-fs": "4.1.11",
+        "image-size": "0.5.5",
+        "mime": "1.6.0",
+        "mkdirp": "0.5.1",
+        "promise": "7.3.1",
+        "request": "2.88.0",
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "clone": {
@@ -8936,9 +8987,9 @@
       "integrity": "sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==",
       "dev": true,
       "requires": {
-        "clone": "^2.1.1",
-        "loader-utils": "^1.1.0",
-        "pify": "^3.0.0"
+        "clone": "2.1.1",
+        "loader-utils": "1.2.3",
+        "pify": "3.0.0"
       }
     },
     "less-plugin-npm-import": {
@@ -8947,8 +8998,8 @@
       "integrity": "sha1-gj5phskzGKmBccqFiEi2vq1Vvz4=",
       "dev": true,
       "requires": {
-        "promise": "~7.0.1",
-        "resolve": "~1.1.6"
+        "promise": "7.0.4",
+        "resolve": "1.1.7"
       },
       "dependencies": {
         "promise": {
@@ -8957,7 +9008,7 @@
           "integrity": "sha1-Nj6EpMNsg1a4kP7WLJHOhdAu1Tk=",
           "dev": true,
           "requires": {
-            "asap": "~2.0.3"
+            "asap": "2.0.6"
           }
         },
         "resolve": {
@@ -8974,8 +9025,8 @@
       "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
       "dev": true,
       "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2"
       }
     },
     "license-webpack-plugin": {
@@ -8984,8 +9035,8 @@
       "integrity": "sha512-vDiBeMWxjE9n6TabQ9J4FH8urFdsRK0Nvxn1cit9biCiR9aq1zBR0X2BlAkEiIG6qPamLeU0GzvIgLkrFc398A==",
       "dev": true,
       "requires": {
-        "@types/webpack-sources": "^0.1.5",
-        "webpack-sources": "^1.2.0"
+        "@types/webpack-sources": "0.1.5",
+        "webpack-sources": "1.3.0"
       }
     },
     "lie": {
@@ -8994,7 +9045,7 @@
       "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
       "dev": true,
       "requires": {
-        "immediate": "~3.0.5"
+        "immediate": "3.0.6"
       }
     },
     "liftoff": {
@@ -9003,14 +9054,14 @@
       "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
       "dev": true,
       "requires": {
-        "extend": "^3.0.0",
-        "findup-sync": "^3.0.0",
-        "fined": "^1.0.1",
-        "flagged-respawn": "^1.0.0",
-        "is-plain-object": "^2.0.4",
-        "object.map": "^1.0.0",
-        "rechoir": "^0.6.2",
-        "resolve": "^1.1.7"
+        "extend": "3.0.2",
+        "findup-sync": "3.0.0",
+        "fined": "1.2.0",
+        "flagged-respawn": "1.0.1",
+        "is-plain-object": "2.0.4",
+        "object.map": "1.0.1",
+        "rechoir": "0.6.2",
+        "resolve": "1.7.1"
       }
     },
     "load-json-file": {
@@ -9019,11 +9070,11 @@
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
+        "graceful-fs": "4.1.11",
+        "parse-json": "2.2.0",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1",
+        "strip-bom": "2.0.0"
       },
       "dependencies": {
         "pify": {
@@ -9046,9 +9097,9 @@
       "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
       "dev": true,
       "requires": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^2.0.0",
-        "json5": "^1.0.1"
+        "big.js": "5.2.2",
+        "emojis-list": "2.1.0",
+        "json5": "1.0.1"
       }
     },
     "locate-path": {
@@ -9057,8 +9108,8 @@
       "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
       "dev": true,
       "requires": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
+        "p-locate": "2.0.0",
+        "path-exists": "3.0.0"
       }
     },
     "lodash": {
@@ -9118,10 +9169,10 @@
       "integrity": "sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==",
       "dev": true,
       "requires": {
-        "circular-json": "^0.5.5",
-        "date-format": "^1.2.0",
-        "debug": "^3.1.0",
-        "rfdc": "^1.1.2",
+        "circular-json": "0.5.9",
+        "date-format": "1.2.0",
+        "debug": "3.2.6",
+        "rfdc": "1.1.2",
         "streamroller": "0.7.0"
       },
       "dependencies": {
@@ -9137,7 +9188,7 @@
           "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.1"
           }
         },
         "ms": {
@@ -9166,7 +9217,7 @@
       "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
       "dev": true,
       "requires": {
-        "js-tokens": "^3.0.0"
+        "js-tokens": "3.0.2"
       }
     },
     "loud-rejection": {
@@ -9175,8 +9226,8 @@
       "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
       "dev": true,
       "requires": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
+        "currently-unhandled": "0.4.1",
+        "signal-exit": "3.0.2"
       }
     },
     "lowercase-keys": {
@@ -9191,8 +9242,8 @@
       "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
       "dev": true,
       "requires": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
+        "pseudomap": "1.0.2",
+        "yallist": "2.1.2"
       }
     },
     "magic-string": {
@@ -9201,7 +9252,7 @@
       "integrity": "sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==",
       "dev": true,
       "requires": {
-        "sourcemap-codec": "^1.4.4"
+        "sourcemap-codec": "1.4.4"
       }
     },
     "make-dir": {
@@ -9210,7 +9261,7 @@
       "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
       "dev": true,
       "requires": {
-        "pify": "^3.0.0"
+        "pify": "3.0.0"
       }
     },
     "make-error": {
@@ -9225,17 +9276,17 @@
       "integrity": "sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==",
       "dev": true,
       "requires": {
-        "agentkeepalive": "^3.4.1",
-        "cacache": "^11.0.1",
-        "http-cache-semantics": "^3.8.1",
-        "http-proxy-agent": "^2.1.0",
-        "https-proxy-agent": "^2.2.1",
-        "lru-cache": "^4.1.2",
-        "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"
+        "agentkeepalive": "3.5.2",
+        "cacache": "11.3.2",
+        "http-cache-semantics": "3.8.1",
+        "http-proxy-agent": "2.1.0",
+        "https-proxy-agent": "2.2.1",
+        "lru-cache": "4.1.3",
+        "mississippi": "3.0.0",
+        "node-fetch-npm": "2.0.2",
+        "promise-retry": "1.1.1",
+        "socks-proxy-agent": "4.0.1",
+        "ssri": "6.0.1"
       },
       "dependencies": {
         "bluebird": {
@@ -9250,20 +9301,20 @@
           "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
           "dev": true,
           "requires": {
-            "bluebird": "^3.5.3",
-            "chownr": "^1.1.1",
-            "figgy-pudding": "^3.5.1",
-            "glob": "^7.1.3",
-            "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.2",
-            "ssri": "^6.0.1",
-            "unique-filename": "^1.1.1",
-            "y18n": "^4.0.0"
+            "bluebird": "3.5.3",
+            "chownr": "1.1.1",
+            "figgy-pudding": "3.5.1",
+            "glob": "7.1.3",
+            "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.2",
+            "ssri": "6.0.1",
+            "unique-filename": "1.1.1",
+            "y18n": "4.0.0"
           },
           "dependencies": {
             "lru-cache": {
@@ -9272,7 +9323,7 @@
               "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
               "dev": true,
               "requires": {
-                "yallist": "^3.0.2"
+                "yallist": "3.0.3"
               }
             }
           }
@@ -9283,12 +9334,12 @@
           "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
           "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"
+            "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"
           }
         },
         "graceful-fs": {
@@ -9303,16 +9354,16 @@
           "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
           "dev": true,
           "requires": {
-            "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"
+            "concat-stream": "1.6.2",
+            "duplexify": "3.6.0",
+            "end-of-stream": "1.4.1",
+            "flush-write-stream": "1.0.3",
+            "from2": "2.3.0",
+            "parallel-transform": "1.1.0",
+            "pump": "3.0.0",
+            "pumpify": "1.5.1",
+            "stream-each": "1.2.3",
+            "through2": "2.0.3"
           }
         },
         "pump": {
@@ -9321,8 +9372,8 @@
           "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
           "dev": true,
           "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
+            "end-of-stream": "1.4.1",
+            "once": "1.4.0"
           }
         },
         "ssri": {
@@ -9331,7 +9382,7 @@
           "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
           "dev": true,
           "requires": {
-            "figgy-pudding": "^3.5.1"
+            "figgy-pudding": "3.5.1"
           }
         },
         "yallist": {
@@ -9348,7 +9399,7 @@
       "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
       "dev": true,
       "requires": {
-        "kind-of": "^6.0.2"
+        "kind-of": "6.0.2"
       }
     },
     "map-age-cleaner": {
@@ -9357,7 +9408,7 @@
       "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
       "dev": true,
       "requires": {
-        "p-defer": "^1.0.0"
+        "p-defer": "1.0.0"
       }
     },
     "map-cache": {
@@ -9382,7 +9433,7 @@
       "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
       "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
       "requires": {
-        "object-visit": "^1.0.0"
+        "object-visit": "1.0.1"
       }
     },
     "mappy-breakpoints": {
@@ -9401,9 +9452,9 @@
       "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
       "dev": true,
       "requires": {
-        "findup-sync": "^2.0.0",
-        "micromatch": "^3.0.4",
-        "resolve": "^1.4.0",
+        "findup-sync": "2.0.0",
+        "micromatch": "3.1.10",
+        "resolve": "1.7.1",
         "stack-trace": "0.0.10"
       },
       "dependencies": {
@@ -9413,7 +9464,7 @@
           "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
           "dev": true,
           "requires": {
-            "homedir-polyfill": "^1.0.1"
+            "homedir-polyfill": "1.0.1"
           }
         },
         "findup-sync": {
@@ -9422,10 +9473,10 @@
           "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
           "dev": true,
           "requires": {
-            "detect-file": "^1.0.0",
-            "is-glob": "^3.1.0",
-            "micromatch": "^3.0.4",
-            "resolve-dir": "^1.0.1"
+            "detect-file": "1.0.0",
+            "is-glob": "3.1.0",
+            "micromatch": "3.1.10",
+            "resolve-dir": "1.0.1"
           }
         },
         "global-modules": {
@@ -9434,9 +9485,9 @@
           "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
           "dev": true,
           "requires": {
-            "global-prefix": "^1.0.1",
-            "is-windows": "^1.0.1",
-            "resolve-dir": "^1.0.0"
+            "global-prefix": "1.0.2",
+            "is-windows": "1.0.2",
+            "resolve-dir": "1.0.1"
           }
         },
         "global-prefix": {
@@ -9445,11 +9496,11 @@
           "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
           "dev": true,
           "requires": {
-            "expand-tilde": "^2.0.2",
-            "homedir-polyfill": "^1.0.1",
-            "ini": "^1.3.4",
-            "is-windows": "^1.0.1",
-            "which": "^1.2.14"
+            "expand-tilde": "2.0.2",
+            "homedir-polyfill": "1.0.1",
+            "ini": "1.3.5",
+            "is-windows": "1.0.2",
+            "which": "1.3.1"
           }
         },
         "is-glob": {
@@ -9458,7 +9509,7 @@
           "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
           "dev": true,
           "requires": {
-            "is-extglob": "^2.1.0"
+            "is-extglob": "2.1.1"
           }
         },
         "resolve-dir": {
@@ -9467,8 +9518,8 @@
           "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
           "dev": true,
           "requires": {
-            "expand-tilde": "^2.0.0",
-            "global-modules": "^1.0.0"
+            "expand-tilde": "2.0.2",
+            "global-modules": "1.0.0"
           }
         }
       }
@@ -9479,15 +9530,15 @@
       "integrity": "sha1-Vte36xgDPwz5vFLrIJD6x9weifo=",
       "dev": true,
       "requires": {
-        "arr-union": "^3.1.0",
-        "async-array-reduce": "^0.2.0",
-        "extend-shallow": "^2.0.1",
-        "fs-exists-sync": "^0.1.0",
-        "glob": "^7.0.5",
-        "has-glob": "^0.1.1",
-        "is-valid-glob": "^0.3.0",
-        "lazy-cache": "^2.0.1",
-        "resolve-dir": "^0.1.0"
+        "arr-union": "3.1.0",
+        "async-array-reduce": "0.2.1",
+        "extend-shallow": "2.0.1",
+        "fs-exists-sync": "0.1.0",
+        "glob": "7.1.2",
+        "has-glob": "0.1.1",
+        "is-valid-glob": "0.3.0",
+        "lazy-cache": "2.0.2",
+        "resolve-dir": "0.1.1"
       },
       "dependencies": {
         "extend-shallow": {
@@ -9496,7 +9547,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         },
         "lazy-cache": {
@@ -9505,7 +9556,7 @@
           "integrity": "sha1-uRkKT5EzVGlIQIWfio9whNiCImQ=",
           "dev": true,
           "requires": {
-            "set-getter": "^0.1.0"
+            "set-getter": "0.1.0"
           }
         }
       }
@@ -9516,9 +9567,9 @@
       "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
       "dev": true,
       "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
+        "hash-base": "3.0.4",
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
       }
     },
     "media-typer": {
@@ -9533,9 +9584,9 @@
       "integrity": "sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==",
       "dev": true,
       "requires": {
-        "map-age-cleaner": "^0.1.1",
-        "mimic-fn": "^1.0.0",
-        "p-is-promise": "^1.1.0"
+        "map-age-cleaner": "0.1.3",
+        "mimic-fn": "1.2.0",
+        "p-is-promise": "1.1.0"
       }
     },
     "memory-fs": {
@@ -9544,8 +9595,8 @@
       "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
       "dev": true,
       "requires": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
+        "errno": "0.1.7",
+        "readable-stream": "2.3.6"
       }
     },
     "memorystream": {
@@ -9560,16 +9611,16 @@
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
       "dev": true,
       "requires": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
-        "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
-        "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
+        "camelcase-keys": "2.1.0",
+        "decamelize": "1.2.0",
+        "loud-rejection": "1.6.0",
+        "map-obj": "1.0.1",
+        "minimist": "1.2.0",
+        "normalize-package-data": "2.4.0",
+        "object-assign": "4.1.1",
+        "read-pkg-up": "1.0.1",
+        "redent": "1.0.0",
+        "trim-newlines": "1.0.0"
       },
       "dependencies": {
         "minimist": {
@@ -9609,19 +9660,19 @@
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
       "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
+        "arr-diff": "4.0.0",
+        "array-unique": "0.3.2",
+        "braces": "2.3.2",
+        "define-property": "2.0.2",
+        "extend-shallow": "3.0.2",
+        "extglob": "2.0.4",
+        "fragment-cache": "0.2.1",
+        "kind-of": "6.0.2",
+        "nanomatch": "1.2.9",
+        "object.pick": "1.3.0",
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
       }
     },
     "miller-rabin": {
@@ -9630,8 +9681,8 @@
       "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
+        "bn.js": "4.11.8",
+        "brorand": "1.1.0"
       }
     },
     "mime": {
@@ -9653,7 +9704,7 @@
       "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
       "dev": true,
       "requires": {
-        "mime-db": "~1.33.0"
+        "mime-db": "1.33.0"
       }
     },
     "mimic-fn": {
@@ -9668,9 +9719,9 @@
       "integrity": "sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^1.0.0",
-        "webpack-sources": "^1.1.0"
+        "loader-utils": "1.2.3",
+        "schema-utils": "1.0.0",
+        "webpack-sources": "1.3.0"
       }
     },
     "minimalistic-assert": {
@@ -9690,7 +9741,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "requires": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "1.1.11"
       }
     },
     "minimist": {
@@ -9705,8 +9756,8 @@
       "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
       "dev": true,
       "requires": {
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.0"
+        "safe-buffer": "5.1.2",
+        "yallist": "3.0.3"
       },
       "dependencies": {
         "yallist": {
@@ -9723,7 +9774,7 @@
       "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
       "dev": true,
       "requires": {
-        "minipass": "^2.2.1"
+        "minipass": "2.3.5"
       }
     },
     "mississippi": {
@@ -9732,16 +9783,16 @@
       "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
       "dev": true,
       "requires": {
-        "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": "^2.0.1",
-        "pumpify": "^1.3.3",
-        "stream-each": "^1.1.0",
-        "through2": "^2.0.0"
+        "concat-stream": "1.6.2",
+        "duplexify": "3.6.0",
+        "end-of-stream": "1.4.1",
+        "flush-write-stream": "1.0.3",
+        "from2": "2.3.0",
+        "parallel-transform": "1.1.0",
+        "pump": "2.0.1",
+        "pumpify": "1.5.1",
+        "stream-each": "1.2.3",
+        "through2": "2.0.3"
       }
     },
     "mixin-deep": {
@@ -9749,8 +9800,8 @@
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
       "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "requires": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
+        "for-in": "1.0.2",
+        "is-extendable": "1.0.1"
       },
       "dependencies": {
         "is-extendable": {
@@ -9758,7 +9809,7 @@
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "requires": {
-            "is-plain-object": "^2.0.4"
+            "is-plain-object": "2.0.4"
           }
         }
       }
@@ -9769,8 +9820,8 @@
       "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
       "dev": true,
       "requires": {
-        "for-in": "^0.1.3",
-        "is-extendable": "^0.1.1"
+        "for-in": "0.1.8",
+        "is-extendable": "0.1.1"
       },
       "dependencies": {
         "for-in": {
@@ -9806,7 +9857,7 @@
       "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.23.tgz",
       "integrity": "sha512-WHFH85DkCfiNMDX5D3X7hpNH3/PUhjTGcD0U1SgfBGZxJ3qUmJh5FdvaFjcClxOvB3rzdfj4oRffbI38jEnC1w==",
       "requires": {
-        "moment": ">= 2.9.0"
+        "moment": "2.24.0"
       }
     },
     "move-concurrently": {
@@ -9815,12 +9866,12 @@
       "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
       "dev": true,
       "requires": {
-        "aproba": "^1.1.1",
-        "copy-concurrently": "^1.0.0",
-        "fs-write-stream-atomic": "^1.0.8",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.3"
+        "aproba": "1.2.0",
+        "copy-concurrently": "1.0.5",
+        "fs-write-stream-atomic": "1.0.10",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2",
+        "run-queue": "1.0.3"
       }
     },
     "ms": {
@@ -9834,8 +9885,8 @@
       "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
       "dev": true,
       "requires": {
-        "dns-packet": "^1.3.1",
-        "thunky": "^1.0.2"
+        "dns-packet": "1.3.1",
+        "thunky": "1.0.3"
       }
     },
     "multicast-dns-service-types": {
@@ -9866,18 +9917,18 @@
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz",
       "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==",
       "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-odd": "^2.0.0",
-        "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"
+        "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-odd": "2.0.0",
+        "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"
       }
     },
     "negotiator": {
@@ -9904,34 +9955,34 @@
       "integrity": "sha512-MIPKxyrnV22fS3wSfst2XjwWOonFKujVVEnIehYJhiu8GOg37bCdbbr9plsE1jRDmDAUz6M1MvdKibUrJyRp6Q==",
       "dev": true,
       "requires": {
-        "@ngtools/json-schema": "^1.1.0",
-        "autoprefixer": "^9.0.0",
-        "browserslist": "^4.0.0",
-        "chalk": "^2.3.1",
-        "chokidar": "^2.0.3",
-        "clean-css": "^4.1.11",
-        "commander": "^2.12.0",
-        "fs-extra": "^7.0.0",
-        "glob": "^7.1.2",
-        "injection-js": "^2.2.1",
-        "less": "^3.8.0",
-        "less-plugin-npm-import": "^2.1.0",
-        "node-sass": "^4.9.3",
-        "node-sass-tilde-importer": "^1.0.0",
-        "opencollective-postinstall": "^2.0.1",
-        "postcss": "^7.0.0",
-        "postcss-url": "^8.0.0",
-        "read-pkg-up": "^4.0.0",
-        "rimraf": "^2.6.1",
-        "rollup": "^0.67.0",
-        "rollup-plugin-commonjs": "^9.1.3",
-        "rollup-plugin-json": "^3.1.0",
-        "rollup-plugin-node-resolve": "^4.0.0",
-        "rollup-plugin-sourcemaps": "^0.4.2",
-        "rxjs": "^6.0.0",
-        "stylus": "^0.54.5",
-        "uglify-js": "^3.0.7",
-        "update-notifier": "^2.3.0"
+        "@ngtools/json-schema": "1.1.0",
+        "autoprefixer": "9.4.6",
+        "browserslist": "4.4.1",
+        "chalk": "2.4.2",
+        "chokidar": "2.0.3",
+        "clean-css": "4.2.1",
+        "commander": "2.15.1",
+        "fs-extra": "7.0.1",
+        "glob": "7.1.2",
+        "injection-js": "2.2.1",
+        "less": "3.9.0",
+        "less-plugin-npm-import": "2.1.0",
+        "node-sass": "4.11.0",
+        "node-sass-tilde-importer": "1.0.2",
+        "opencollective-postinstall": "2.0.2",
+        "postcss": "7.0.14",
+        "postcss-url": "8.0.0",
+        "read-pkg-up": "4.0.0",
+        "rimraf": "2.6.2",
+        "rollup": "0.67.4",
+        "rollup-plugin-commonjs": "9.3.4",
+        "rollup-plugin-json": "3.1.0",
+        "rollup-plugin-node-resolve": "4.0.0",
+        "rollup-plugin-sourcemaps": "0.4.2",
+        "rxjs": "6.4.0",
+        "stylus": "0.54.5",
+        "uglify-js": "3.4.9",
+        "update-notifier": "2.5.0"
       },
       "dependencies": {
         "chalk": {
@@ -9940,9 +9991,9 @@
           "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.3.0"
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
           }
         },
         "find-up": {
@@ -9951,7 +10002,7 @@
           "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
-            "locate-path": "^3.0.0"
+            "locate-path": "3.0.0"
           }
         },
         "fs-extra": {
@@ -9960,9 +10011,9 @@
           "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
+            "graceful-fs": "4.1.11",
+            "jsonfile": "4.0.0",
+            "universalify": "0.1.1"
           }
         },
         "jsonfile": {
@@ -9971,7 +10022,7 @@
           "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.6"
+            "graceful-fs": "4.1.11"
           }
         },
         "load-json-file": {
@@ -9980,10 +10031,10 @@
           "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^4.0.0",
-            "pify": "^3.0.0",
-            "strip-bom": "^3.0.0"
+            "graceful-fs": "4.1.11",
+            "parse-json": "4.0.0",
+            "pify": "3.0.0",
+            "strip-bom": "3.0.0"
           }
         },
         "locate-path": {
@@ -9992,8 +10043,8 @@
           "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"
           }
         },
         "p-limit": {
@@ -10002,7 +10053,7 @@
           "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==",
           "dev": true,
           "requires": {
-            "p-try": "^2.0.0"
+            "p-try": "2.0.0"
           }
         },
         "p-locate": {
@@ -10011,7 +10062,7 @@
           "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "dev": true,
           "requires": {
-            "p-limit": "^2.0.0"
+            "p-limit": "2.1.0"
           }
         },
         "p-try": {
@@ -10026,8 +10077,8 @@
           "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
           "dev": true,
           "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
+            "error-ex": "1.3.1",
+            "json-parse-better-errors": "1.0.2"
           }
         },
         "read-pkg": {
@@ -10036,9 +10087,9 @@
           "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
           "dev": true,
           "requires": {
-            "load-json-file": "^4.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^3.0.0"
+            "load-json-file": "4.0.0",
+            "normalize-package-data": "2.4.0",
+            "path-type": "3.0.0"
           }
         },
         "read-pkg-up": {
@@ -10047,8 +10098,8 @@
           "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==",
           "dev": true,
           "requires": {
-            "find-up": "^3.0.0",
-            "read-pkg": "^3.0.0"
+            "find-up": "3.0.0",
+            "read-pkg": "3.0.0"
           }
         },
         "strip-bom": {
@@ -10065,22 +10116,26 @@
       "integrity": "sha512-IO2zBWMAyAWZgK6zbPhmR3tNRgW+jfi/Z+Xkvaa42w6eYNQ8bEwYv7uxZo/3MQJ5RglxZ+6KsDLXPzjN+ZUEZw==",
       "dev": true,
       "requires": {
-        "deep-freeze-strict": "^1.1.1"
+        "deep-freeze-strict": "1.1.1"
       }
     },
     "ngrx-store-localstorage": {
       "version": "github:cf-stratos/ngrx-store-localstorage#e722ed60861d49bec99482ac54f13e7485bb0ac9",
-      "from": "github:cf-stratos/ngrx-store-localstorage#lodash-dep-update",
       "requires": {
-        "lodash": "^4.17.11"
+        "lodash": "4.17.13"
       }
     },
+    "ngx-json-viewer": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/ngx-json-viewer/-/ngx-json-viewer-2.4.0.tgz",
+      "integrity": "sha512-26QmLp+0ds90aFug3KbSIwqtmQgCcJYFNNNcmcZHgPRj75nhKzbo4ceKxkhWmY5auKZClVO0HTZSs5bBhgb1Bw=="
+    },
     "ngx-moment": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/ngx-moment/-/ngx-moment-3.3.0.tgz",
       "integrity": "sha512-6fpllpJqLfjRWboOhphgeEYt+rzIA9O29rG5QWCebRt2X0uNk4P93sLEb0S8lbDF0dEp2NOC3UOD+xoCVlJQhA==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "nice-try": {
@@ -10095,9 +10150,9 @@
       "integrity": "sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==",
       "dev": true,
       "requires": {
-        "encoding": "^0.1.11",
-        "json-parse-better-errors": "^1.0.0",
-        "safe-buffer": "^5.1.1"
+        "encoding": "0.1.12",
+        "json-parse-better-errors": "1.0.2",
+        "safe-buffer": "5.1.2"
       }
     },
     "node-forge": {
@@ -10112,18 +10167,18 @@
       "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
       "dev": true,
       "requires": {
-        "fstream": "^1.0.0",
-        "glob": "^7.0.3",
-        "graceful-fs": "^4.1.2",
-        "mkdirp": "^0.5.0",
-        "nopt": "2 || 3",
-        "npmlog": "0 || 1 || 2 || 3 || 4",
-        "osenv": "0",
-        "request": "^2.87.0",
-        "rimraf": "2",
-        "semver": "~5.3.0",
-        "tar": "^2.0.0",
-        "which": "1"
+        "fstream": "1.0.12",
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "mkdirp": "0.5.1",
+        "nopt": "3.0.6",
+        "npmlog": "4.1.2",
+        "osenv": "0.1.5",
+        "request": "2.88.0",
+        "rimraf": "2.6.2",
+        "semver": "5.3.0",
+        "tar": "2.2.2",
+        "which": "1.3.1"
       },
       "dependencies": {
         "semver": {
@@ -10140,28 +10195,28 @@
       "integrity": "sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==",
       "dev": true,
       "requires": {
-        "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",
+        "assert": "1.4.1",
+        "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",
         "path-browserify": "0.0.0",
-        "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",
+        "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.10",
         "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.11.0",
+        "url": "0.11.0",
+        "util": "0.11.1",
         "vm-browserify": "0.0.4"
       },
       "dependencies": {
@@ -10188,7 +10243,7 @@
       "integrity": "sha512-gQm+K9mGCiT/NXHy+V/ZZS1N/LOaGGqRAAJJs3X9Ah1g+CIbRcBgNyoNYQ+SEtcyAtB9KqDruu+fF7nWjsqRaA==",
       "dev": true,
       "requires": {
-        "semver": "^5.3.0"
+        "semver": "5.5.0"
       }
     },
     "node-sass": {
@@ -10197,25 +10252,25 @@
       "integrity": "sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==",
       "dev": true,
       "requires": {
-        "async-foreach": "^0.1.3",
-        "chalk": "^1.1.1",
-        "cross-spawn": "^3.0.0",
-        "gaze": "^1.0.0",
-        "get-stdin": "^4.0.1",
-        "glob": "^7.0.3",
-        "in-publish": "^2.0.0",
-        "lodash.assign": "^4.2.0",
-        "lodash.clonedeep": "^4.3.2",
-        "lodash.mergewith": "^4.6.0",
-        "meow": "^3.7.0",
-        "mkdirp": "^0.5.1",
-        "nan": "^2.10.0",
-        "node-gyp": "^3.8.0",
-        "npmlog": "^4.0.0",
-        "request": "^2.88.0",
-        "sass-graph": "^2.2.4",
-        "stdout-stream": "^1.4.0",
-        "true-case-path": "^1.0.2"
+        "async-foreach": "0.1.3",
+        "chalk": "1.1.3",
+        "cross-spawn": "3.0.1",
+        "gaze": "1.1.3",
+        "get-stdin": "4.0.1",
+        "glob": "7.1.2",
+        "in-publish": "2.0.0",
+        "lodash.assign": "4.2.0",
+        "lodash.clonedeep": "4.5.0",
+        "lodash.mergewith": "4.6.2",
+        "meow": "3.7.0",
+        "mkdirp": "0.5.1",
+        "nan": "2.10.0",
+        "node-gyp": "3.8.0",
+        "npmlog": "4.1.2",
+        "request": "2.88.0",
+        "sass-graph": "2.2.4",
+        "stdout-stream": "1.4.0",
+        "true-case-path": "1.0.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -10230,11 +10285,11 @@
           "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"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "supports-color": {
@@ -10251,7 +10306,7 @@
       "integrity": "sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==",
       "dev": true,
       "requires": {
-        "find-parent-dir": "^0.3.0"
+        "find-parent-dir": "0.3.0"
       }
     },
     "nopt": {
@@ -10260,7 +10315,7 @@
       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
       "dev": true,
       "requires": {
-        "abbrev": "1"
+        "abbrev": "1.0.9"
       }
     },
     "normalize-package-data": {
@@ -10269,10 +10324,10 @@
       "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
       "dev": true,
       "requires": {
-        "hosted-git-info": "^2.1.4",
-        "is-builtin-module": "^1.0.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
+        "hosted-git-info": "2.6.0",
+        "is-builtin-module": "1.0.0",
+        "semver": "5.5.0",
+        "validate-npm-package-license": "3.0.3"
       }
     },
     "normalize-path": {
@@ -10280,7 +10335,7 @@
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
       "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
       "requires": {
-        "remove-trailing-separator": "^1.0.1"
+        "remove-trailing-separator": "1.1.0"
       }
     },
     "normalize-range": {
@@ -10300,7 +10355,7 @@
       "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
       "dev": true,
       "requires": {
-        "once": "^1.3.2"
+        "once": "1.4.0"
       }
     },
     "npm-bundled": {
@@ -10315,10 +10370,10 @@
       "integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==",
       "dev": true,
       "requires": {
-        "hosted-git-info": "^2.6.0",
-        "osenv": "^0.1.5",
-        "semver": "^5.5.0",
-        "validate-npm-package-name": "^3.0.0"
+        "hosted-git-info": "2.6.0",
+        "osenv": "0.1.5",
+        "semver": "5.5.0",
+        "validate-npm-package-name": "3.0.0"
       }
     },
     "npm-packlist": {
@@ -10327,8 +10382,8 @@
       "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
       "dev": true,
       "requires": {
-        "ignore-walk": "^3.0.1",
-        "npm-bundled": "^1.0.1"
+        "ignore-walk": "3.0.1",
+        "npm-bundled": "1.0.6"
       }
     },
     "npm-pick-manifest": {
@@ -10337,9 +10392,9 @@
       "integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==",
       "dev": true,
       "requires": {
-        "figgy-pudding": "^3.5.1",
-        "npm-package-arg": "^6.0.0",
-        "semver": "^5.4.1"
+        "figgy-pudding": "3.5.1",
+        "npm-package-arg": "6.1.0",
+        "semver": "5.5.0"
       }
     },
     "npm-registry-fetch": {
@@ -10348,12 +10403,12 @@
       "integrity": "sha512-srwmt8YhNajAoSAaDWndmZgx89lJwIZ1GWxOuckH4Coek4uHv5S+o/l9FLQe/awA+JwTnj4FJHldxhlXdZEBmw==",
       "dev": true,
       "requires": {
-        "JSONStream": "^1.3.4",
-        "bluebird": "^3.5.1",
-        "figgy-pudding": "^3.4.1",
-        "lru-cache": "^4.1.3",
-        "make-fetch-happen": "^4.0.1",
-        "npm-package-arg": "^6.1.0"
+        "JSONStream": "1.3.5",
+        "bluebird": "3.5.1",
+        "figgy-pudding": "3.5.1",
+        "lru-cache": "4.1.3",
+        "make-fetch-happen": "4.0.1",
+        "npm-package-arg": "6.1.0"
       }
     },
     "npm-run-all": {
@@ -10362,15 +10417,15 @@
       "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==",
       "dev": true,
       "requires": {
-        "ansi-styles": "^3.2.1",
-        "chalk": "^2.4.1",
-        "cross-spawn": "^6.0.5",
-        "memorystream": "^0.3.1",
-        "minimatch": "^3.0.4",
-        "pidtree": "^0.3.0",
-        "read-pkg": "^3.0.0",
-        "shell-quote": "^1.6.1",
-        "string.prototype.padend": "^3.0.0"
+        "ansi-styles": "3.2.1",
+        "chalk": "2.4.2",
+        "cross-spawn": "6.0.5",
+        "memorystream": "0.3.1",
+        "minimatch": "3.0.4",
+        "pidtree": "0.3.0",
+        "read-pkg": "3.0.0",
+        "shell-quote": "1.6.1",
+        "string.prototype.padend": "3.0.0"
       },
       "dependencies": {
         "chalk": {
@@ -10379,9 +10434,9 @@
           "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.3.0"
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
           }
         },
         "cross-spawn": {
@@ -10390,11 +10445,11 @@
           "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "dev": true,
           "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
+            "nice-try": "1.0.5",
+            "path-key": "2.0.1",
+            "semver": "5.5.0",
+            "shebang-command": "1.2.0",
+            "which": "1.3.1"
           }
         },
         "load-json-file": {
@@ -10403,10 +10458,10 @@
           "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^4.0.0",
-            "pify": "^3.0.0",
-            "strip-bom": "^3.0.0"
+            "graceful-fs": "4.1.11",
+            "parse-json": "4.0.0",
+            "pify": "3.0.0",
+            "strip-bom": "3.0.0"
           }
         },
         "parse-json": {
@@ -10415,8 +10470,8 @@
           "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
           "dev": true,
           "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
+            "error-ex": "1.3.1",
+            "json-parse-better-errors": "1.0.2"
           }
         },
         "read-pkg": {
@@ -10425,9 +10480,9 @@
           "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
           "dev": true,
           "requires": {
-            "load-json-file": "^4.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^3.0.0"
+            "load-json-file": "4.0.0",
+            "normalize-package-data": "2.4.0",
+            "path-type": "3.0.0"
           }
         },
         "strip-bom": {
@@ -10444,7 +10499,7 @@
       "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
       "dev": true,
       "requires": {
-        "path-key": "^2.0.0"
+        "path-key": "2.0.1"
       }
     },
     "npmlog": {
@@ -10453,10 +10508,10 @@
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
       "dev": true,
       "requires": {
-        "are-we-there-yet": "~1.1.2",
-        "console-control-strings": "~1.1.0",
-        "gauge": "~2.7.3",
-        "set-blocking": "~2.0.0"
+        "are-we-there-yet": "1.1.5",
+        "console-control-strings": "1.1.0",
+        "gauge": "2.7.4",
+        "set-blocking": "2.0.0"
       }
     },
     "null-check": {
@@ -10500,9 +10555,9 @@
       "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
       "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
       "requires": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
+        "copy-descriptor": "0.1.1",
+        "define-property": "0.2.5",
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "define-property": {
@@ -10510,7 +10565,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         },
         "kind-of": {
@@ -10518,7 +10573,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -10534,7 +10589,7 @@
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
       "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
       "requires": {
-        "isobject": "^3.0.0"
+        "isobject": "3.0.1"
       }
     },
     "object.assign": {
@@ -10543,10 +10598,10 @@
       "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
+        "define-properties": "1.1.2",
+        "function-bind": "1.1.1",
+        "has-symbols": "1.0.0",
+        "object-keys": "1.0.11"
       }
     },
     "object.defaults": {
@@ -10555,10 +10610,10 @@
       "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
       "dev": true,
       "requires": {
-        "array-each": "^1.0.1",
-        "array-slice": "^1.0.0",
-        "for-own": "^1.0.0",
-        "isobject": "^3.0.0"
+        "array-each": "1.0.1",
+        "array-slice": "1.1.0",
+        "for-own": "1.0.0",
+        "isobject": "3.0.1"
       }
     },
     "object.getownpropertydescriptors": {
@@ -10567,8 +10622,8 @@
       "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.5.1"
+        "define-properties": "1.1.2",
+        "es-abstract": "1.12.0"
       }
     },
     "object.map": {
@@ -10577,8 +10632,8 @@
       "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
       "dev": true,
       "requires": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
+        "for-own": "1.0.0",
+        "make-iterator": "1.0.1"
       }
     },
     "object.pick": {
@@ -10586,7 +10641,7 @@
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
       "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
       "requires": {
-        "isobject": "^3.0.1"
+        "isobject": "3.0.1"
       }
     },
     "object.reduce": {
@@ -10595,8 +10650,8 @@
       "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
       "dev": true,
       "requires": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
+        "for-own": "1.0.0",
+        "make-iterator": "1.0.1"
       }
     },
     "obuf": {
@@ -10626,12 +10681,12 @@
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "dev": true,
       "requires": {
-        "wrappy": "1"
+        "wrappy": "1.0.2"
       }
     },
     "onetime": {
       "version": "1.1.0",
-      "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
       "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
       "dev": true
     },
@@ -10647,7 +10702,7 @@
       "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==",
       "dev": true,
       "requires": {
-        "is-wsl": "^1.1.0"
+        "is-wsl": "1.1.0"
       }
     },
     "optimist": {
@@ -10656,8 +10711,8 @@
       "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
       "dev": true,
       "requires": {
-        "minimist": "~0.0.1",
-        "wordwrap": "~0.0.2"
+        "minimist": "0.0.8",
+        "wordwrap": "0.0.3"
       },
       "dependencies": {
         "wordwrap": {
@@ -10674,12 +10729,12 @@
       "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
       "dev": true,
       "requires": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.4",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "wordwrap": "~1.0.0"
+        "deep-is": "0.1.3",
+        "fast-levenshtein": "2.0.6",
+        "levn": "0.3.0",
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2",
+        "wordwrap": "1.0.0"
       }
     },
     "ordered-read-streams": {
@@ -10688,7 +10743,7 @@
       "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
       "dev": true,
       "requires": {
-        "readable-stream": "^2.0.1"
+        "readable-stream": "2.3.6"
       }
     },
     "original": {
@@ -10697,7 +10752,7 @@
       "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
       "dev": true,
       "requires": {
-        "url-parse": "^1.4.3"
+        "url-parse": "1.4.4"
       }
     },
     "os-browserify": {
@@ -10718,7 +10773,7 @@
       "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
       "dev": true,
       "requires": {
-        "lcid": "^1.0.0"
+        "lcid": "1.0.0"
       }
     },
     "os-tmpdir": {
@@ -10733,8 +10788,8 @@
       "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
       "dev": true,
       "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
       }
     },
     "p-defer": {
@@ -10761,7 +10816,7 @@
       "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
       "dev": true,
       "requires": {
-        "p-try": "^1.0.0"
+        "p-try": "1.0.0"
       }
     },
     "p-locate": {
@@ -10770,7 +10825,7 @@
       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
       "dev": true,
       "requires": {
-        "p-limit": "^1.1.0"
+        "p-limit": "1.2.0"
       }
     },
     "p-map": {
@@ -10791,10 +10846,10 @@
       "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
       "dev": true,
       "requires": {
-        "got": "^6.7.1",
-        "registry-auth-token": "^3.0.1",
-        "registry-url": "^3.0.3",
-        "semver": "^5.1.0"
+        "got": "6.7.1",
+        "registry-auth-token": "3.3.2",
+        "registry-url": "3.1.0",
+        "semver": "5.5.0"
       }
     },
     "pacote": {
@@ -10803,33 +10858,33 @@
       "integrity": "sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==",
       "dev": true,
       "requires": {
-        "bluebird": "^3.5.3",
-        "cacache": "^11.3.2",
-        "figgy-pudding": "^3.5.1",
-        "get-stream": "^4.1.0",
-        "glob": "^7.1.3",
-        "lru-cache": "^5.1.1",
-        "make-fetch-happen": "^4.0.1",
-        "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": "^3.8.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"
+        "bluebird": "3.5.3",
+        "cacache": "11.3.2",
+        "figgy-pudding": "3.5.1",
+        "get-stream": "4.1.0",
+        "glob": "7.1.3",
+        "lru-cache": "5.1.1",
+        "make-fetch-happen": "4.0.1",
+        "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.4.1",
+        "npm-pick-manifest": "2.2.3",
+        "npm-registry-fetch": "3.9.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": {
         "bluebird": {
@@ -10844,20 +10899,20 @@
           "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
           "dev": true,
           "requires": {
-            "bluebird": "^3.5.3",
-            "chownr": "^1.1.1",
-            "figgy-pudding": "^3.5.1",
-            "glob": "^7.1.3",
-            "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.2",
-            "ssri": "^6.0.1",
-            "unique-filename": "^1.1.1",
-            "y18n": "^4.0.0"
+            "bluebird": "3.5.3",
+            "chownr": "1.1.1",
+            "figgy-pudding": "3.5.1",
+            "glob": "7.1.3",
+            "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.2",
+            "ssri": "6.0.1",
+            "unique-filename": "1.1.1",
+            "y18n": "4.0.0"
           }
         },
         "get-stream": {
@@ -10866,7 +10921,7 @@
           "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
           "dev": true,
           "requires": {
-            "pump": "^3.0.0"
+            "pump": "3.0.0"
           }
         },
         "glob": {
@@ -10875,12 +10930,12 @@
           "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
           "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"
+            "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"
           }
         },
         "graceful-fs": {
@@ -10895,7 +10950,7 @@
           "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
           "dev": true,
           "requires": {
-            "yallist": "^3.0.2"
+            "yallist": "3.0.3"
           }
         },
         "mississippi": {
@@ -10904,16 +10959,16 @@
           "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
           "dev": true,
           "requires": {
-            "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"
+            "concat-stream": "1.6.2",
+            "duplexify": "3.6.0",
+            "end-of-stream": "1.4.1",
+            "flush-write-stream": "1.0.3",
+            "from2": "2.3.0",
+            "parallel-transform": "1.1.0",
+            "pump": "3.0.0",
+            "pumpify": "1.5.1",
+            "stream-each": "1.2.3",
+            "through2": "2.0.3"
           }
         },
         "pump": {
@@ -10922,8 +10977,8 @@
           "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
           "dev": true,
           "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
+            "end-of-stream": "1.4.1",
+            "once": "1.4.0"
           }
         },
         "semver": {
@@ -10938,7 +10993,7 @@
           "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
           "dev": true,
           "requires": {
-            "figgy-pudding": "^3.5.1"
+            "figgy-pudding": "3.5.1"
           }
         },
         "tar": {
@@ -10947,13 +11002,13 @@
           "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
           "dev": true,
           "requires": {
-            "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"
+            "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"
           }
         },
         "yallist": {
@@ -10976,9 +11031,9 @@
       "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
       "dev": true,
       "requires": {
-        "cyclist": "~0.2.2",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.1.5"
+        "cyclist": "0.2.2",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
       }
     },
     "parse-asn1": {
@@ -10987,12 +11042,12 @@
       "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
       "dev": true,
       "requires": {
-        "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"
+        "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"
       }
     },
     "parse-filepath": {
@@ -11001,9 +11056,9 @@
       "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
       "dev": true,
       "requires": {
-        "is-absolute": "^1.0.0",
-        "map-cache": "^0.2.0",
-        "path-root": "^0.1.1"
+        "is-absolute": "1.0.0",
+        "map-cache": "0.2.2",
+        "path-root": "0.1.1"
       }
     },
     "parse-json": {
@@ -11012,7 +11067,7 @@
       "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
       "dev": true,
       "requires": {
-        "error-ex": "^1.2.0"
+        "error-ex": "1.3.1"
       }
     },
     "parse-node-version": {
@@ -11039,7 +11094,7 @@
       "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
       "dev": true,
       "requires": {
-        "better-assert": "~1.0.0"
+        "better-assert": "1.0.2"
       }
     },
     "parseuri": {
@@ -11048,7 +11103,7 @@
       "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
       "dev": true,
       "requires": {
-        "better-assert": "~1.0.0"
+        "better-assert": "1.0.2"
       }
     },
     "parseurl": {
@@ -11062,16 +11117,6 @@
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
     },
-    "path": {
-      "version": "0.12.7",
-      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
-      "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=",
-      "dev": true,
-      "requires": {
-        "process": "^0.11.1",
-        "util": "^0.10.3"
-      }
-    },
     "path-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
@@ -11118,7 +11163,7 @@
       "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
       "dev": true,
       "requires": {
-        "path-root-regex": "^0.1.0"
+        "path-root-regex": "0.1.2"
       }
     },
     "path-root-regex": {
@@ -11139,7 +11184,7 @@
       "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
       "dev": true,
       "requires": {
-        "pify": "^3.0.0"
+        "pify": "3.0.0"
       }
     },
     "pause-stream": {
@@ -11148,7 +11193,7 @@
       "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
       "dev": true,
       "requires": {
-        "through": "~2.3"
+        "through": "2.3.8"
       }
     },
     "pbkdf2": {
@@ -11157,11 +11202,11 @@
       "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
       "dev": true,
       "requires": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
+        "ripemd160": "2.0.2",
+        "safe-buffer": "5.1.2",
+        "sha.js": "2.4.11"
       }
     },
     "performance-now": {
@@ -11200,7 +11245,7 @@
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
       "dev": true,
       "requires": {
-        "pinkie": "^2.0.0"
+        "pinkie": "2.0.4"
       }
     },
     "pkg-dir": {
@@ -11209,7 +11254,7 @@
       "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
       "dev": true,
       "requires": {
-        "find-up": "^2.1.0"
+        "find-up": "2.1.0"
       }
     },
     "plugin-error": {
@@ -11218,11 +11263,11 @@
       "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
       "dev": true,
       "requires": {
-        "ansi-cyan": "^0.1.1",
-        "ansi-red": "^0.1.1",
-        "arr-diff": "^1.0.1",
-        "arr-union": "^2.0.1",
-        "extend-shallow": "^1.1.2"
+        "ansi-cyan": "0.1.1",
+        "ansi-red": "0.1.1",
+        "arr-diff": "1.1.0",
+        "arr-union": "2.1.0",
+        "extend-shallow": "1.1.4"
       },
       "dependencies": {
         "arr-diff": {
@@ -11231,8 +11276,8 @@
           "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
           "dev": true,
           "requires": {
-            "arr-flatten": "^1.0.1",
-            "array-slice": "^0.2.3"
+            "arr-flatten": "1.1.0",
+            "array-slice": "0.2.3"
           }
         },
         "arr-union": {
@@ -11253,7 +11298,7 @@
           "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
           "dev": true,
           "requires": {
-            "kind-of": "^1.1.0"
+            "kind-of": "1.1.0"
           }
         },
         "kind-of": {
@@ -11276,9 +11321,9 @@
       "integrity": "sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==",
       "dev": true,
       "requires": {
-        "async": "^1.5.2",
-        "debug": "^2.2.0",
-        "mkdirp": "0.5.x"
+        "async": "1.5.2",
+        "debug": "2.6.9",
+        "mkdirp": "0.5.1"
       }
     },
     "posix-character-classes": {
@@ -11292,9 +11337,9 @@
       "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
       "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": {
         "chalk": {
@@ -11303,9 +11348,9 @@
           "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.3.0"
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.5.0"
           },
           "dependencies": {
             "supports-color": {
@@ -11314,7 +11359,7 @@
               "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
               "dev": true,
               "requires": {
-                "has-flag": "^3.0.0"
+                "has-flag": "3.0.0"
               }
             }
           }
@@ -11331,7 +11376,7 @@
           "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -11342,10 +11387,10 @@
       "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.1",
-        "postcss-value-parser": "^3.2.3",
-        "read-cache": "^1.0.0",
-        "resolve": "^1.1.7"
+        "postcss": "7.0.14",
+        "postcss-value-parser": "3.3.1",
+        "read-cache": "1.0.0",
+        "resolve": "1.7.1"
       }
     },
     "postcss-load-config": {
@@ -11354,8 +11399,8 @@
       "integrity": "sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==",
       "dev": true,
       "requires": {
-        "cosmiconfig": "^4.0.0",
-        "import-cwd": "^2.0.0"
+        "cosmiconfig": "4.0.0",
+        "import-cwd": "2.1.0"
       }
     },
     "postcss-loader": {
@@ -11364,10 +11409,10 @@
       "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "postcss": "^7.0.0",
-        "postcss-load-config": "^2.0.0",
-        "schema-utils": "^1.0.0"
+        "loader-utils": "1.2.3",
+        "postcss": "7.0.14",
+        "postcss-load-config": "2.0.0",
+        "schema-utils": "1.0.0"
       }
     },
     "postcss-url": {
@@ -11376,11 +11421,11 @@
       "integrity": "sha512-E2cbOQ5aii2zNHh8F6fk1cxls7QVFZjLPSrqvmiza8OuXLzIpErij8BDS5Y3STPfJgpIMNCPEr8JlKQWEoozUw==",
       "dev": true,
       "requires": {
-        "mime": "^2.3.1",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.0",
-        "postcss": "^7.0.2",
-        "xxhashjs": "^0.2.1"
+        "mime": "2.4.0",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "postcss": "7.0.14",
+        "xxhashjs": "0.2.2"
       },
       "dependencies": {
         "mime": {
@@ -11439,7 +11484,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "asap": "~2.0.3"
+        "asap": "2.0.6"
       }
     },
     "promise-inflight": {
@@ -11454,8 +11499,8 @@
       "integrity": "sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=",
       "dev": true,
       "requires": {
-        "err-code": "^1.0.0",
-        "retry": "^0.10.0"
+        "err-code": "1.1.2",
+        "retry": "0.10.1"
       }
     },
     "protoduck": {
@@ -11464,7 +11509,7 @@
       "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==",
       "dev": true,
       "requires": {
-        "genfun": "^5.0.0"
+        "genfun": "5.0.0"
       }
     },
     "protractor": {
@@ -11473,21 +11518,21 @@
       "integrity": "sha512-zlIj64Cr6IOWP7RwxVeD8O4UskLYPoyIcg0HboWJL9T79F1F0VWtKkGTr/9GN6BKL+/Q/GmM7C9kFVCfDbP5sA==",
       "dev": true,
       "requires": {
-        "@types/q": "^0.0.32",
-        "@types/selenium-webdriver": "^3.0.0",
-        "blocking-proxy": "^1.0.0",
-        "browserstack": "^1.5.1",
-        "chalk": "^1.1.3",
-        "glob": "^7.0.3",
+        "@types/q": "0.0.32",
+        "@types/selenium-webdriver": "3.0.16",
+        "blocking-proxy": "1.0.1",
+        "browserstack": "1.5.3",
+        "chalk": "1.1.3",
+        "glob": "7.1.2",
         "jasmine": "2.8.0",
-        "jasminewd2": "^2.1.0",
-        "optimist": "~0.6.0",
+        "jasminewd2": "2.2.0",
+        "optimist": "0.6.1",
         "q": "1.4.1",
-        "saucelabs": "^1.5.0",
+        "saucelabs": "1.5.0",
         "selenium-webdriver": "3.6.0",
-        "source-map-support": "~0.4.0",
+        "source-map-support": "0.4.18",
         "webdriver-js-extender": "2.1.0",
-        "webdriver-manager": "^12.0.6"
+        "webdriver-manager": "12.1.6"
       },
       "dependencies": {
         "ansi-styles": {
@@ -11502,11 +11547,11 @@
           "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"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "del": {
@@ -11515,13 +11560,13 @@
           "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
           "dev": true,
           "requires": {
-            "globby": "^5.0.0",
-            "is-path-cwd": "^1.0.0",
-            "is-path-in-cwd": "^1.0.0",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0",
-            "rimraf": "^2.2.8"
+            "globby": "5.0.0",
+            "is-path-cwd": "1.0.0",
+            "is-path-in-cwd": "1.0.1",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1",
+            "rimraf": "2.6.2"
           }
         },
         "globby": {
@@ -11530,12 +11575,12 @@
           "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
           "dev": true,
           "requires": {
-            "array-union": "^1.0.1",
-            "arrify": "^1.0.0",
-            "glob": "^7.0.3",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "array-union": "1.0.2",
+            "arrify": "1.0.1",
+            "glob": "7.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
           }
         },
         "minimist": {
@@ -11562,7 +11607,7 @@
           "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
           "dev": true,
           "requires": {
-            "source-map": "^0.5.6"
+            "source-map": "0.5.6"
           }
         },
         "supports-color": {
@@ -11577,17 +11622,17 @@
           "integrity": "sha512-B1mOycNCrbk7xODw7Jgq/mdD3qzPxMaTsnKIQDy2nXlQoyjTrJTTD0vRpEZI9b8RibPEyQvh9zIZ0M1mpOxS3w==",
           "dev": true,
           "requires": {
-            "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"
+            "adm-zip": "0.4.13",
+            "chalk": "1.1.3",
+            "del": "2.2.2",
+            "glob": "7.1.2",
+            "ini": "1.3.5",
+            "minimist": "1.2.0",
+            "q": "1.4.1",
+            "request": "2.88.0",
+            "rimraf": "2.6.2",
+            "semver": "5.5.0",
+            "xml2js": "0.4.22"
           }
         }
       }
@@ -11598,7 +11643,7 @@
       "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
       "dev": true,
       "requires": {
-        "forwarded": "~0.1.2",
+        "forwarded": "0.1.2",
         "ipaddr.js": "1.8.0"
       }
     },
@@ -11614,7 +11659,7 @@
       "integrity": "sha1-mvZ6mdex0BMuUaUDCZ04qNKs4sM=",
       "dev": true,
       "requires": {
-        "table-parser": "^0.1.3"
+        "table-parser": "0.1.3"
       }
     },
     "ps-tree": {
@@ -11623,7 +11668,7 @@
       "integrity": "sha512-kef7fYYSKVqQffmzTMsVcUD1ObNJMp8sNSmHGlGKsZQyL/ht9MZKk86u0Rd1NhpTOAuhqwKCLLpktwkqz+MF8A==",
       "dev": true,
       "requires": {
-        "event-stream": "=3.3.4"
+        "event-stream": "3.3.4"
       }
     },
     "pseudomap": {
@@ -11644,12 +11689,12 @@
       "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
+        "bn.js": "4.11.8",
+        "browserify-rsa": "4.0.1",
+        "create-hash": "1.2.0",
+        "parse-asn1": "5.1.4",
+        "randombytes": "2.1.0",
+        "safe-buffer": "5.1.2"
       }
     },
     "pump": {
@@ -11658,8 +11703,8 @@
       "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
       "dev": true,
       "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
+        "end-of-stream": "1.4.1",
+        "once": "1.4.0"
       }
     },
     "pumpify": {
@@ -11668,9 +11713,9 @@
       "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
       "dev": true,
       "requires": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
+        "duplexify": "3.6.0",
+        "inherits": "2.0.3",
+        "pump": "2.0.1"
       }
     },
     "punycode": {
@@ -11720,7 +11765,7 @@
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
       "requires": {
-        "safe-buffer": "^5.1.0"
+        "safe-buffer": "5.1.2"
       }
     },
     "randomfill": {
@@ -11729,8 +11774,8 @@
       "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
       "dev": true,
       "requires": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
+        "randombytes": "2.1.0",
+        "safe-buffer": "5.1.2"
       }
     },
     "range-parser": {
@@ -11757,7 +11802,7 @@
           "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
           "dev": true,
           "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
+            "safer-buffer": "2.1.2"
           }
         }
       }
@@ -11768,8 +11813,8 @@
       "integrity": "sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^1.0.0"
+        "loader-utils": "1.2.3",
+        "schema-utils": "1.0.0"
       }
     },
     "rc": {
@@ -11778,10 +11823,10 @@
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "dev": true,
       "requires": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
+        "deep-extend": "0.6.0",
+        "ini": "1.3.5",
+        "minimist": "1.2.0",
+        "strip-json-comments": "2.0.1"
       },
       "dependencies": {
         "minimist": {
@@ -11804,7 +11849,7 @@
       "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
       "dev": true,
       "requires": {
-        "pify": "^2.3.0"
+        "pify": "2.3.0"
       },
       "dependencies": {
         "pify": {
@@ -11821,9 +11866,9 @@
       "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
       "dev": true,
       "requires": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
+        "load-json-file": "1.1.0",
+        "normalize-package-data": "2.4.0",
+        "path-type": "1.1.0"
       },
       "dependencies": {
         "path-type": {
@@ -11832,9 +11877,9 @@
           "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "graceful-fs": "4.1.11",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
           }
         },
         "pify": {
@@ -11851,8 +11896,8 @@
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
       "dev": true,
       "requires": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
+        "find-up": "1.1.2",
+        "read-pkg": "1.1.0"
       },
       "dependencies": {
         "find-up": {
@@ -11861,8 +11906,8 @@
           "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
           "dev": true,
           "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "path-exists": "2.1.0",
+            "pinkie-promise": "2.0.1"
           }
         },
         "path-exists": {
@@ -11871,7 +11916,7 @@
           "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
           "dev": true,
           "requires": {
-            "pinkie-promise": "^2.0.0"
+            "pinkie-promise": "2.0.1"
           }
         }
       }
@@ -11881,13 +11926,13 @@
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
       "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
       "requires": {
-        "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"
+        "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"
       }
     },
     "readdirp": {
@@ -11895,10 +11940,10 @@
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
       "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "minimatch": "^3.0.2",
-        "readable-stream": "^2.0.2",
-        "set-immediate-shim": "^1.0.1"
+        "graceful-fs": "4.1.11",
+        "minimatch": "3.0.4",
+        "readable-stream": "2.3.6",
+        "set-immediate-shim": "1.0.1"
       }
     },
     "readline2": {
@@ -11907,8 +11952,8 @@
       "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
       "dev": true,
       "requires": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
+        "code-point-at": "1.1.0",
+        "is-fullwidth-code-point": "1.0.0",
         "mute-stream": "0.0.5"
       }
     },
@@ -11918,7 +11963,7 @@
       "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
       "dev": true,
       "requires": {
-        "resolve": "^1.1.6"
+        "resolve": "1.7.1"
       }
     },
     "redent": {
@@ -11927,8 +11972,8 @@
       "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
       "dev": true,
       "requires": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
+        "indent-string": "2.1.0",
+        "strip-indent": "1.0.1"
       }
     },
     "reflect-metadata": {
@@ -11954,8 +11999,8 @@
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "requires": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
+        "extend-shallow": "3.0.2",
+        "safe-regex": "1.1.0"
       }
     },
     "regexpu-core": {
@@ -11964,9 +12009,9 @@
       "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
       "dev": true,
       "requires": {
-        "regenerate": "^1.2.1",
-        "regjsgen": "^0.2.0",
-        "regjsparser": "^0.1.4"
+        "regenerate": "1.4.0",
+        "regjsgen": "0.2.0",
+        "regjsparser": "0.1.5"
       }
     },
     "registry-auth-token": {
@@ -11975,8 +12020,8 @@
       "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
       "dev": true,
       "requires": {
-        "rc": "^1.1.6",
-        "safe-buffer": "^5.0.1"
+        "rc": "1.2.8",
+        "safe-buffer": "5.1.2"
       }
     },
     "registry-url": {
@@ -11985,7 +12030,7 @@
       "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
       "dev": true,
       "requires": {
-        "rc": "^1.0.1"
+        "rc": "1.2.8"
       }
     },
     "regjsgen": {
@@ -12000,7 +12045,7 @@
       "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
       "dev": true,
       "requires": {
-        "jsesc": "~0.5.0"
+        "jsesc": "0.5.0"
       },
       "dependencies": {
         "jsesc": {
@@ -12017,8 +12062,8 @@
       "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
       "dev": true,
       "requires": {
-        "is-buffer": "^1.1.5",
-        "is-utf8": "^0.2.1"
+        "is-buffer": "1.1.6",
+        "is-utf8": "0.2.1"
       }
     },
     "remove-bom-stream": {
@@ -12027,9 +12072,9 @@
       "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
       "dev": true,
       "requires": {
-        "remove-bom-buffer": "^3.0.0",
-        "safe-buffer": "^5.1.0",
-        "through2": "^2.0.3"
+        "remove-bom-buffer": "3.0.0",
+        "safe-buffer": "5.1.2",
+        "through2": "2.0.3"
       }
     },
     "remove-trailing-separator": {
@@ -12053,7 +12098,7 @@
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
       "dev": true,
       "requires": {
-        "is-finite": "^1.0.0"
+        "is-finite": "1.0.2"
       }
     },
     "replace-ext": {
@@ -12068,9 +12113,9 @@
       "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
       "dev": true,
       "requires": {
-        "homedir-polyfill": "^1.0.1",
-        "is-absolute": "^1.0.0",
-        "remove-trailing-separator": "^1.1.0"
+        "homedir-polyfill": "1.0.1",
+        "is-absolute": "1.0.0",
+        "remove-trailing-separator": "1.1.0"
       }
     },
     "replace-in-file": {
@@ -12079,9 +12124,9 @@
       "integrity": "sha512-fto9Ooab00CniGkSjRCZCamER7P5S4mZHQ4w4dLd09nwP3FtFfjUJh8/OVC/In4ki5MEy+dYO5v9r7rtq2DrYQ==",
       "dev": true,
       "requires": {
-        "chalk": "^2.3.2",
-        "glob": "^7.1.2",
-        "yargs": "^11.0.0"
+        "chalk": "2.4.1",
+        "glob": "7.1.2",
+        "yargs": "11.1.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -12102,9 +12147,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
           }
         },
         "cliui": {
@@ -12113,9 +12158,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.0.0"
+            "string-width": "2.1.1",
+            "strip-ansi": "4.0.0",
+            "wrap-ansi": "2.1.0"
           }
         },
         "is-fullwidth-code-point": {
@@ -12130,9 +12175,9 @@
           "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
           "dev": true,
           "requires": {
-            "execa": "^0.7.0",
-            "lcid": "^1.0.0",
-            "mem": "^1.1.0"
+            "execa": "0.7.0",
+            "lcid": "1.0.0",
+            "mem": "1.1.0"
           },
           "dependencies": {
             "mem": {
@@ -12141,7 +12186,7 @@
               "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
               "dev": true,
               "requires": {
-                "mimic-fn": "^1.0.0"
+                "mimic-fn": "1.2.0"
               }
             }
           }
@@ -12152,8 +12197,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"
           }
         },
         "strip-ansi": {
@@ -12162,7 +12207,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "3.0.0"
           }
         },
         "which-module": {
@@ -12183,18 +12228,18 @@
           "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
           "dev": true,
           "requires": {
-            "cliui": "^4.0.0",
-            "decamelize": "^1.1.1",
-            "find-up": "^2.1.0",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^2.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",
-            "yargs-parser": "^9.0.2"
+            "cliui": "4.1.0",
+            "decamelize": "1.2.0",
+            "find-up": "2.1.0",
+            "get-caller-file": "1.0.2",
+            "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"
           }
         },
         "yargs-parser": {
@@ -12203,7 +12248,7 @@
           "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
           "dev": true,
           "requires": {
-            "camelcase": "^4.1.0"
+            "camelcase": "4.1.0"
           }
         }
       }
@@ -12214,26 +12259,26 @@
       "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
       "dev": true,
       "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.0",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.4.3",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
+        "aws-sign2": "0.7.0",
+        "aws4": "1.8.0",
+        "caseless": "0.12.0",
+        "combined-stream": "1.0.6",
+        "extend": "3.0.2",
+        "forever-agent": "0.6.1",
+        "form-data": "2.3.2",
+        "har-validator": "5.1.3",
+        "http-signature": "1.2.0",
+        "is-typedarray": "1.0.0",
+        "isstream": "0.1.2",
+        "json-stringify-safe": "5.0.1",
+        "mime-types": "2.1.22",
+        "oauth-sign": "0.9.0",
+        "performance-now": "2.1.0",
+        "qs": "6.5.2",
+        "safe-buffer": "5.1.2",
+        "tough-cookie": "2.4.3",
+        "tunnel-agent": "0.6.0",
+        "uuid": "3.3.2"
       },
       "dependencies": {
         "extend": {
@@ -12254,7 +12299,7 @@
           "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==",
           "dev": true,
           "requires": {
-            "mime-db": "~1.38.0"
+            "mime-db": "1.38.0"
           }
         },
         "uuid": {
@@ -12271,7 +12316,7 @@
       "integrity": "sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.11"
+        "lodash": "4.17.15"
       },
       "dependencies": {
         "lodash": {
@@ -12289,8 +12334,8 @@
       "dev": true,
       "requires": {
         "request-promise-core": "1.1.2",
-        "stealthy-require": "^1.1.1",
-        "tough-cookie": "^2.3.3"
+        "stealthy-require": "1.1.1",
+        "tough-cookie": "2.4.3"
       }
     },
     "require-directory": {
@@ -12317,8 +12362,8 @@
       "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
       "dev": true,
       "requires": {
-        "caller-path": "^0.1.0",
-        "resolve-from": "^1.0.0"
+        "caller-path": "0.1.0",
+        "resolve-from": "1.0.1"
       },
       "dependencies": {
         "resolve-from": {
@@ -12346,7 +12391,7 @@
       "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==",
       "dev": true,
       "requires": {
-        "path-parse": "^1.0.5"
+        "path-parse": "1.0.5"
       }
     },
     "resolve-cwd": {
@@ -12355,7 +12400,7 @@
       "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
       "dev": true,
       "requires": {
-        "resolve-from": "^3.0.0"
+        "resolve-from": "3.0.0"
       }
     },
     "resolve-dir": {
@@ -12364,8 +12409,8 @@
       "integrity": "sha1-shklmlYC+sXFxJatiUpujMQwJh4=",
       "dev": true,
       "requires": {
-        "expand-tilde": "^1.2.2",
-        "global-modules": "^0.2.3"
+        "expand-tilde": "1.2.2",
+        "global-modules": "0.2.3"
       }
     },
     "resolve-from": {
@@ -12380,7 +12425,7 @@
       "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
       "dev": true,
       "requires": {
-        "value-or-function": "^3.0.0"
+        "value-or-function": "3.0.0"
       }
     },
     "resolve-url": {
@@ -12394,8 +12439,8 @@
       "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
       "dev": true,
       "requires": {
-        "exit-hook": "^1.0.0",
-        "onetime": "^1.0.0"
+        "exit-hook": "1.1.1",
+        "onetime": "1.1.0"
       }
     },
     "ret": {
@@ -12421,7 +12466,7 @@
       "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
       "dev": true,
       "requires": {
-        "glob": "^7.0.5"
+        "glob": "7.1.2"
       }
     },
     "ripemd160": {
@@ -12430,8 +12475,8 @@
       "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
       "dev": true,
       "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
+        "hash-base": "3.0.4",
+        "inherits": "2.0.3"
       }
     },
     "rollup": {
@@ -12441,7 +12486,7 @@
       "dev": true,
       "requires": {
         "@types/estree": "0.0.39",
-        "@types/node": "*"
+        "@types/node": "11.9.4"
       }
     },
     "rollup-plugin-commonjs": {
@@ -12450,10 +12495,10 @@
       "integrity": "sha512-DTZOvRoiVIHHLFBCL4pFxOaJt8pagxsVldEXBOn6wl3/V21wVaj17HFfyzTsQUuou3sZL3lEJZVWKPFblJfI6w==",
       "dev": true,
       "requires": {
-        "estree-walker": "^0.6.0",
-        "magic-string": "^0.25.2",
-        "resolve": "^1.10.0",
-        "rollup-pluginutils": "^2.6.0"
+        "estree-walker": "0.6.1",
+        "magic-string": "0.25.2",
+        "resolve": "1.12.0",
+        "rollup-pluginutils": "2.8.2"
       },
       "dependencies": {
         "estree-walker": {
@@ -12474,7 +12519,7 @@
           "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
           "dev": true,
           "requires": {
-            "path-parse": "^1.0.6"
+            "path-parse": "1.0.6"
           }
         }
       }
@@ -12485,7 +12530,7 @@
       "integrity": "sha512-BlYk5VspvGpjz7lAwArVzBXR60JK+4EKtPkCHouAWg39obk9S61hZYJDBfMK+oitPdoe11i69TlxKlMQNFC/Uw==",
       "dev": true,
       "requires": {
-        "rollup-pluginutils": "^2.3.1"
+        "rollup-pluginutils": "2.8.2"
       }
     },
     "rollup-plugin-node-resolve": {
@@ -12494,9 +12539,9 @@
       "integrity": "sha512-7Ni+/M5RPSUBfUaP9alwYQiIKnKeXCOHiqBpKUl9kwp3jX5ZJtgXAait1cne6pGEVUUztPD6skIKH9Kq9sNtfw==",
       "dev": true,
       "requires": {
-        "builtin-modules": "^3.0.0",
-        "is-module": "^1.0.0",
-        "resolve": "^1.8.1"
+        "builtin-modules": "3.0.0",
+        "is-module": "1.0.0",
+        "resolve": "1.10.0"
       },
       "dependencies": {
         "builtin-modules": {
@@ -12517,7 +12562,7 @@
           "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
           "dev": true,
           "requires": {
-            "path-parse": "^1.0.6"
+            "path-parse": "1.0.6"
           }
         }
       }
@@ -12528,8 +12573,8 @@
       "integrity": "sha1-YhJaqUCHqt97g+9N+vYptHMTXoc=",
       "dev": true,
       "requires": {
-        "rollup-pluginutils": "^2.0.1",
-        "source-map-resolve": "^0.5.0"
+        "rollup-pluginutils": "2.8.2",
+        "source-map-resolve": "0.5.2"
       }
     },
     "rollup-pluginutils": {
@@ -12538,7 +12583,7 @@
       "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==",
       "dev": true,
       "requires": {
-        "estree-walker": "^0.6.1"
+        "estree-walker": "0.6.1"
       },
       "dependencies": {
         "estree-walker": {
@@ -12555,7 +12600,7 @@
       "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
       "dev": true,
       "requires": {
-        "once": "^1.3.0"
+        "once": "1.4.0"
       }
     },
     "run-queue": {
@@ -12564,7 +12609,7 @@
       "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
       "dev": true,
       "requires": {
-        "aproba": "^1.1.1"
+        "aproba": "1.2.0"
       }
     },
     "rw": {
@@ -12583,7 +12628,7 @@
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
       "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "rxjs-spy": {
@@ -12591,11 +12636,11 @@
       "resolved": "https://registry.npmjs.org/rxjs-spy/-/rxjs-spy-7.0.2.tgz",
       "integrity": "sha512-rSzEEQLH07FPBqmxIC8oeI2Z7tWibvxKxybcKtcc6Cj8Tz178ySDgzgOkoct8dAz5IE/H2jrR2/l+ZYYfpuEXw==",
       "requires": {
-        "@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"
+        "@types/circular-json": "0.4.0",
+        "@types/stacktrace-js": "0.0.32",
+        "circular-json": "0.5.4",
+        "error-stack-parser": "2.0.1",
+        "stacktrace-gps": "3.0.2"
       }
     },
     "rxjs-tslint": {
@@ -12604,10 +12649,10 @@
       "integrity": "sha512-odvEAx6VoZSJs5o9gWZ7SxgTuS8ldq0mr4qnprbr6flNtIt4DtNJSYJpBK0WEy0o+f1oe92XVHrmgco1e7Cpdw==",
       "dev": true,
       "requires": {
-        "chalk": "^2.4.0",
-        "optimist": "^0.6.1",
-        "tslint": "^5.9.1",
-        "tsutils": "^2.25.0"
+        "chalk": "2.4.1",
+        "optimist": "0.6.1",
+        "tslint": "5.13.0",
+        "tsutils": "2.27.1"
       },
       "dependencies": {
         "chalk": {
@@ -12616,9 +12661,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
           }
         }
       }
@@ -12638,7 +12683,7 @@
       "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
       "requires": {
-        "ret": "~0.1.10"
+        "ret": "0.1.15"
       }
     },
     "safer-buffer": {
@@ -12648,7 +12693,7 @@
     },
     "samsam": {
       "version": "1.1.2",
-      "resolved": "http://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz",
       "integrity": "sha1-vsEf3IOp/aBjQBIQ5AF2wwJNFWc=",
       "dev": true
     },
@@ -12658,10 +12703,10 @@
       "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
       "dev": true,
       "requires": {
-        "glob": "^7.0.0",
-        "lodash": "^4.0.0",
-        "scss-tokenizer": "^0.2.3",
-        "yargs": "^7.0.0"
+        "glob": "7.1.2",
+        "lodash": "4.17.15",
+        "scss-tokenizer": "0.2.3",
+        "yargs": "7.1.0"
       },
       "dependencies": {
         "camelcase": {
@@ -12676,9 +12721,9 @@
           "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
           "dev": true,
           "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wrap-ansi": "^2.0.0"
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wrap-ansi": "2.1.0"
           }
         },
         "lodash": {
@@ -12699,19 +12744,19 @@
           "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
           "dev": true,
           "requires": {
-            "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"
+            "camelcase": "3.0.0",
+            "cliui": "3.2.0",
+            "decamelize": "1.2.0",
+            "get-caller-file": "1.0.2",
+            "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"
           }
         }
       }
@@ -12722,20 +12767,20 @@
       "integrity": "sha1-Yw9pwhaqIGuCMvsqqQe98zNrbYM=",
       "dev": true,
       "requires": {
-        "commander": "^2.8.1",
-        "eslint": "^2.7.0",
+        "commander": "2.15.1",
+        "eslint": "2.13.1",
         "front-matter": "2.1.2",
-        "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"
+        "fs-extra": "3.0.1",
+        "glob": "7.1.2",
+        "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.3"
       }
     },
     "sass-loader": {
@@ -12744,12 +12789,12 @@
       "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==",
       "dev": true,
       "requires": {
-        "clone-deep": "^2.0.1",
-        "loader-utils": "^1.0.1",
-        "lodash.tail": "^4.1.1",
-        "neo-async": "^2.5.0",
-        "pify": "^3.0.0",
-        "semver": "^5.5.0"
+        "clone-deep": "2.0.2",
+        "loader-utils": "1.2.3",
+        "lodash.tail": "4.1.1",
+        "neo-async": "2.6.0",
+        "pify": "3.0.0",
+        "semver": "5.5.0"
       }
     },
     "saucelabs": {
@@ -12758,7 +12803,7 @@
       "integrity": "sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==",
       "dev": true,
       "requires": {
-        "https-proxy-agent": "^2.2.1"
+        "https-proxy-agent": "2.2.1"
       }
     },
     "sax": {
@@ -12773,9 +12818,9 @@
       "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
       "dev": true,
       "requires": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
+        "ajv": "6.9.1",
+        "ajv-errors": "1.0.1",
+        "ajv-keywords": "3.4.0"
       }
     },
     "scss-tokenizer": {
@@ -12784,8 +12829,8 @@
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
       "dev": true,
       "requires": {
-        "js-base64": "^2.1.8",
-        "source-map": "^0.4.2"
+        "js-base64": "2.4.8",
+        "source-map": "0.4.4"
       },
       "dependencies": {
         "source-map": {
@@ -12794,7 +12839,7 @@
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "amdefine": "1.0.1"
           }
         }
       }
@@ -12811,10 +12856,10 @@
       "integrity": "sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==",
       "dev": true,
       "requires": {
-        "jszip": "^3.1.3",
-        "rimraf": "^2.5.4",
+        "jszip": "3.2.2",
+        "rimraf": "2.6.2",
         "tmp": "0.0.30",
-        "xml2js": "^0.4.17"
+        "xml2js": "0.4.22"
       },
       "dependencies": {
         "tmp": {
@@ -12823,7 +12868,7 @@
           "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=",
           "dev": true,
           "requires": {
-            "os-tmpdir": "~1.0.1"
+            "os-tmpdir": "1.0.2"
           }
         }
       }
@@ -12849,7 +12894,7 @@
       "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
       "dev": true,
       "requires": {
-        "semver": "^5.0.3"
+        "semver": "5.5.0"
       }
     },
     "semver-dsl": {
@@ -12858,7 +12903,7 @@
       "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=",
       "dev": true,
       "requires": {
-        "semver": "^5.3.0"
+        "semver": "5.5.0"
       }
     },
     "semver-greatest-satisfied-range": {
@@ -12867,7 +12912,7 @@
       "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
       "dev": true,
       "requires": {
-        "sver-compat": "^1.5.0"
+        "sver-compat": "1.5.0"
       }
     },
     "semver-intersect": {
@@ -12876,7 +12921,7 @@
       "integrity": "sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==",
       "dev": true,
       "requires": {
-        "semver": "^5.0.0"
+        "semver": "5.5.0"
       }
     },
     "send": {
@@ -12886,18 +12931,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.6.2",
+        "http-errors": "1.6.3",
         "mime": "1.4.1",
         "ms": "2.0.0",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.0",
-        "statuses": "~1.4.0"
+        "on-finished": "2.3.0",
+        "range-parser": "1.2.0",
+        "statuses": "1.4.0"
       },
       "dependencies": {
         "mime": {
@@ -12920,13 +12965,13 @@
       "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.4",
+        "accepts": "1.3.5",
         "batch": "0.6.1",
         "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
+        "escape-html": "1.0.3",
+        "http-errors": "1.6.3",
+        "mime-types": "2.1.18",
+        "parseurl": "1.3.2"
       }
     },
     "serve-static": {
@@ -12935,9 +12980,9 @@
       "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
       "dev": true,
       "requires": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.2",
+        "encodeurl": "1.0.2",
+        "escape-html": "1.0.3",
+        "parseurl": "1.3.2",
         "send": "0.16.2"
       }
     },
@@ -12953,7 +12998,7 @@
       "integrity": "sha1-12nBgsnVpR9AkUXy+6guXoboA3Y=",
       "dev": true,
       "requires": {
-        "to-object-path": "^0.3.0"
+        "to-object-path": "0.3.0"
       }
     },
     "set-immediate-shim": {
@@ -12966,10 +13011,10 @@
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
       "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
+        "extend-shallow": "2.0.1",
+        "is-extendable": "0.1.1",
+        "is-plain-object": "2.0.4",
+        "split-string": "3.1.0"
       },
       "dependencies": {
         "extend-shallow": {
@@ -12977,7 +13022,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         }
       }
@@ -13000,8 +13045,8 @@
       "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.2"
       }
     },
     "shallow-clone": {
@@ -13010,9 +13055,9 @@
       "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
       "dev": true,
       "requires": {
-        "is-extendable": "^0.1.1",
-        "kind-of": "^5.0.0",
-        "mixin-object": "^2.0.1"
+        "is-extendable": "0.1.1",
+        "kind-of": "5.1.0",
+        "mixin-object": "2.0.1"
       },
       "dependencies": {
         "kind-of": {
@@ -13029,7 +13074,7 @@
       "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
       "dev": true,
       "requires": {
-        "shebang-regex": "^1.0.0"
+        "shebang-regex": "1.0.0"
       }
     },
     "shebang-regex": {
@@ -13044,10 +13089,10 @@
       "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
       "dev": true,
       "requires": {
-        "array-filter": "~0.0.0",
-        "array-map": "~0.0.0",
-        "array-reduce": "~0.0.0",
-        "jsonify": "~0.0.0"
+        "array-filter": "0.0.1",
+        "array-map": "0.0.0",
+        "array-reduce": "0.0.0",
+        "jsonify": "0.0.0"
       }
     },
     "shelljs": {
@@ -13071,7 +13116,7 @@
         "formatio": "1.1.1",
         "lolex": "1.3.2",
         "samsam": "1.1.2",
-        "util": ">=0.10.3 <1"
+        "util": "0.10.3"
       }
     },
     "slash": {
@@ -13097,14 +13142,14 @@
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "requires": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
+        "base": "0.11.2",
+        "debug": "2.6.9",
+        "define-property": "0.2.5",
+        "extend-shallow": "2.0.1",
+        "map-cache": "0.2.2",
+        "source-map": "0.5.6",
+        "source-map-resolve": "0.5.2",
+        "use": "3.1.0"
       },
       "dependencies": {
         "define-property": {
@@ -13112,7 +13157,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         },
         "extend-shallow": {
@@ -13120,7 +13165,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "0.1.1"
           }
         }
       }
@@ -13130,9 +13175,9 @@
       "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "requires": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
+        "define-property": "1.0.0",
+        "isobject": "3.0.1",
+        "snapdragon-util": "3.0.1"
       },
       "dependencies": {
         "define-property": {
@@ -13140,7 +13185,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "requires": {
-            "is-descriptor": "^1.0.0"
+            "is-descriptor": "1.0.2"
           }
         },
         "is-accessor-descriptor": {
@@ -13148,7 +13193,7 @@
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-data-descriptor": {
@@ -13156,7 +13201,7 @@
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "requires": {
-            "kind-of": "^6.0.0"
+            "kind-of": "6.0.2"
           }
         },
         "is-descriptor": {
@@ -13164,9 +13209,9 @@
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "1.0.0",
+            "is-data-descriptor": "1.0.0",
+            "kind-of": "6.0.2"
           }
         }
       }
@@ -13176,7 +13221,7 @@
       "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "requires": {
-        "kind-of": "^3.2.0"
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "kind-of": {
@@ -13184,7 +13229,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -13195,12 +13240,12 @@
       "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
       "dev": true,
       "requires": {
-        "debug": "~3.1.0",
-        "engine.io": "~3.2.0",
-        "has-binary2": "~1.0.2",
-        "socket.io-adapter": "~1.1.0",
+        "debug": "3.1.0",
+        "engine.io": "3.2.1",
+        "has-binary2": "1.0.3",
+        "socket.io-adapter": "1.1.1",
         "socket.io-client": "2.1.1",
-        "socket.io-parser": "~3.2.0"
+        "socket.io-parser": "3.2.0"
       },
       "dependencies": {
         "debug": {
@@ -13230,15 +13275,15 @@
         "base64-arraybuffer": "0.1.5",
         "component-bind": "1.0.0",
         "component-emitter": "1.2.1",
-        "debug": "~3.1.0",
-        "engine.io-client": "~3.2.0",
-        "has-binary2": "~1.0.2",
+        "debug": "3.1.0",
+        "engine.io-client": "3.2.1",
+        "has-binary2": "1.0.3",
         "has-cors": "1.1.0",
         "indexof": "0.0.1",
         "object-component": "0.0.3",
         "parseqs": "0.0.5",
         "parseuri": "0.0.5",
-        "socket.io-parser": "~3.2.0",
+        "socket.io-parser": "3.2.0",
         "to-array": "0.1.4"
       },
       "dependencies": {
@@ -13260,7 +13305,7 @@
       "dev": true,
       "requires": {
         "component-emitter": "1.2.1",
-        "debug": "~3.1.0",
+        "debug": "3.1.0",
         "isarray": "2.0.1"
       },
       "dependencies": {
@@ -13287,8 +13332,8 @@
       "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
       "dev": true,
       "requires": {
-        "faye-websocket": "^0.10.0",
-        "uuid": "^3.0.1"
+        "faye-websocket": "0.10.0",
+        "uuid": "3.2.1"
       }
     },
     "sockjs-client": {
@@ -13297,12 +13342,12 @@
       "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==",
       "dev": true,
       "requires": {
-        "debug": "^3.2.5",
-        "eventsource": "^1.0.7",
-        "faye-websocket": "~0.11.1",
-        "inherits": "^2.0.3",
-        "json3": "^3.3.2",
-        "url-parse": "^1.4.3"
+        "debug": "3.2.6",
+        "eventsource": "1.0.7",
+        "faye-websocket": "0.11.1",
+        "inherits": "2.0.3",
+        "json3": "3.3.2",
+        "url-parse": "1.4.4"
       },
       "dependencies": {
         "debug": {
@@ -13311,7 +13356,7 @@
           "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.1"
           }
         },
         "faye-websocket": {
@@ -13320,7 +13365,7 @@
           "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
           "dev": true,
           "requires": {
-            "websocket-driver": ">=0.5.1"
+            "websocket-driver": "0.7.0"
           }
         },
         "ms": {
@@ -13337,7 +13382,7 @@
       "integrity": "sha512-+2r83WaRT3PXYoO/1z+RDEBE7Z2f9YcdQnJ0K/ncXXbV5gJ6wYfNAebYFYiiUjM6E4JyXnPY8cimwyvFYHVUUA==",
       "dev": true,
       "requires": {
-        "ip": "^1.1.5",
+        "ip": "1.1.5",
         "smart-buffer": "4.0.2"
       }
     },
@@ -13347,8 +13392,8 @@
       "integrity": "sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==",
       "dev": true,
       "requires": {
-        "agent-base": "~4.2.0",
-        "socks": "~2.2.0"
+        "agent-base": "4.2.0",
+        "socks": "2.2.3"
       }
     },
     "source-list-map": {
@@ -13368,8 +13413,8 @@
       "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==",
       "dev": true,
       "requires": {
-        "async": "^2.5.0",
-        "loader-utils": "^1.1.0"
+        "async": "2.6.2",
+        "loader-utils": "1.2.3"
       },
       "dependencies": {
         "async": {
@@ -13378,7 +13423,7 @@
           "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
           "dev": true,
           "requires": {
-            "lodash": "^4.17.11"
+            "lodash": "4.17.15"
           }
         },
         "lodash": {
@@ -13394,11 +13439,11 @@
       "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
       "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
       "requires": {
-        "atob": "^2.1.1",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
+        "atob": "2.1.1",
+        "decode-uri-component": "0.2.0",
+        "resolve-url": "0.2.1",
+        "source-map-url": "0.4.0",
+        "urix": "0.1.0"
       }
     },
     "source-map-support": {
@@ -13407,8 +13452,8 @@
       "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==",
       "dev": true,
       "requires": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
+        "buffer-from": "1.1.0",
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -13442,8 +13487,8 @@
       "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
       "dev": true,
       "requires": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
+        "spdx-expression-parse": "3.0.0",
+        "spdx-license-ids": "3.0.0"
       }
     },
     "spdx-exceptions": {
@@ -13458,8 +13503,8 @@
       "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
       "dev": true,
       "requires": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
+        "spdx-exceptions": "2.1.0",
+        "spdx-license-ids": "3.0.0"
       }
     },
     "spdx-license-ids": {
@@ -13474,11 +13519,11 @@
       "integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==",
       "dev": true,
       "requires": {
-        "debug": "^4.1.0",
-        "handle-thing": "^2.0.0",
-        "http-deceiver": "^1.2.7",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^3.0.0"
+        "debug": "4.1.1",
+        "handle-thing": "2.0.0",
+        "http-deceiver": "1.2.7",
+        "select-hose": "2.0.0",
+        "spdy-transport": "3.0.0"
       },
       "dependencies": {
         "debug": {
@@ -13487,7 +13532,7 @@
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.1"
           }
         },
         "ms": {
@@ -13504,12 +13549,12 @@
       "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
       "dev": true,
       "requires": {
-        "debug": "^4.1.0",
-        "detect-node": "^2.0.4",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.2",
-        "readable-stream": "^3.0.6",
-        "wbuf": "^1.7.3"
+        "debug": "4.1.1",
+        "detect-node": "2.0.4",
+        "hpack.js": "2.1.6",
+        "obuf": "1.1.2",
+        "readable-stream": "3.1.1",
+        "wbuf": "1.7.3"
       },
       "dependencies": {
         "debug": {
@@ -13518,7 +13563,7 @@
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.1"
           }
         },
         "ms": {
@@ -13533,9 +13578,9 @@
           "integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
           "dev": true,
           "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
+            "inherits": "2.0.3",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         }
       }
@@ -13546,7 +13591,7 @@
       "integrity": "sha512-b9Yd0TrzceMVYSbuamM1sFsGM1oVfyFTM22gOoyLhymNvBVApuYpkdFOgYkKJpN/KhTpcCYcTGHg7X+FJ33Vvw==",
       "dev": true,
       "requires": {
-        "chalk": "^2.0.1"
+        "chalk": "2.2.2"
       }
     },
     "split": {
@@ -13555,7 +13600,7 @@
       "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
       "dev": true,
       "requires": {
-        "through": "2"
+        "through": "2.3.8"
       }
     },
     "split-string": {
@@ -13563,7 +13608,7 @@
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "requires": {
-        "extend-shallow": "^3.0.0"
+        "extend-shallow": "3.0.2"
       }
     },
     "sprintf-js": {
@@ -13578,14 +13623,14 @@
       "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=",
       "dev": true,
       "requires": {
-        "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",
-        "tweetnacl": "~0.14.0"
+        "asn1": "0.2.3",
+        "assert-plus": "1.0.0",
+        "bcrypt-pbkdf": "1.0.1",
+        "dashdash": "1.14.1",
+        "ecc-jsbn": "0.1.1",
+        "getpass": "0.1.7",
+        "jsbn": "0.1.1",
+        "tweetnacl": "0.14.5"
       }
     },
     "ssri": {
@@ -13594,7 +13639,7 @@
       "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
       "dev": true,
       "requires": {
-        "safe-buffer": "^5.1.1"
+        "safe-buffer": "5.1.2"
       }
     },
     "stack-trace": {
@@ -13614,7 +13659,7 @@
       "integrity": "sha512-9o+nWhiz5wFnrB3hBHs2PTyYrS60M1vvpSzHxwxnIbtY2q9Nt51hZvhrG1+2AxD374ecwyS+IUwfkHRE/2zuGg==",
       "requires": {
         "source-map": "0.5.6",
-        "stackframe": "^1.0.4"
+        "stackframe": "1.0.4"
       }
     },
     "static-extend": {
@@ -13622,8 +13667,8 @@
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
       "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
       "requires": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
+        "define-property": "0.2.5",
+        "object-copy": "0.1.0"
       },
       "dependencies": {
         "define-property": {
@@ -13631,7 +13676,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "is-descriptor": "0.1.6"
           }
         }
       }
@@ -13642,7 +13687,7 @@
       "integrity": "sha512-NT0YGhwuQ0EOX+uPhhUcI6/+1Sq/pMzNuSCBVT4GbFl/ac6I/JZefBcjlECNfAb1t3GOx5dEj1Z7x0cAxeeVLQ==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.4"
+        "lodash": "4.17.13"
       }
     },
     "statuses": {
@@ -13657,7 +13702,7 @@
       "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=",
       "dev": true,
       "requires": {
-        "readable-stream": "^2.0.1"
+        "readable-stream": "2.3.6"
       }
     },
     "stealthy-require": {
@@ -13671,7 +13716,7 @@
       "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"
+        "tslib": "1.9.3"
       }
     },
     "stratos-protractor-reporter": {
@@ -13680,11 +13725,11 @@
       "integrity": "sha512-e87eX4LB+KLVOfEF/TeWpNYM9aQFJTO+jsslym7zCZLYd8xlNWZUjmUf00J0DWn7YpoNGdjv0wzkKPcXJ2c5uw==",
       "dev": true,
       "requires": {
-        "circular-json": "^0.3.1",
-        "fs-extra": "^3.0.1",
-        "klaw-sync": "^2.1.0",
-        "mkdirp": "~0.3.5",
-        "underscore": "~1.6.0"
+        "circular-json": "0.3.3",
+        "fs-extra": "3.0.1",
+        "klaw-sync": "2.1.0",
+        "mkdirp": "0.3.5",
+        "underscore": "1.6.0"
       },
       "dependencies": {
         "circular-json": {
@@ -13707,8 +13752,8 @@
       "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
       "dev": true,
       "requires": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6"
       }
     },
     "stream-combiner": {
@@ -13717,7 +13762,7 @@
       "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
       "dev": true,
       "requires": {
-        "duplexer": "~0.1.1"
+        "duplexer": "0.1.1"
       }
     },
     "stream-each": {
@@ -13726,8 +13771,8 @@
       "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
       "dev": true,
       "requires": {
-        "end-of-stream": "^1.1.0",
-        "stream-shift": "^1.0.0"
+        "end-of-stream": "1.4.1",
+        "stream-shift": "1.0.0"
       }
     },
     "stream-exhaust": {
@@ -13742,11 +13787,11 @@
       "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
       "dev": true,
       "requires": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
+        "builtin-status-codes": "3.0.0",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6",
+        "to-arraybuffer": "1.0.1",
+        "xtend": "4.0.1"
       }
     },
     "stream-shift": {
@@ -13761,10 +13806,10 @@
       "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
       "dev": true,
       "requires": {
-        "date-format": "^1.2.0",
-        "debug": "^3.1.0",
-        "mkdirp": "^0.5.1",
-        "readable-stream": "^2.3.0"
+        "date-format": "1.2.0",
+        "debug": "3.2.6",
+        "mkdirp": "0.5.1",
+        "readable-stream": "2.3.6"
       },
       "dependencies": {
         "debug": {
@@ -13773,7 +13818,7 @@
           "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.1"
           }
         },
         "ms": {
@@ -13790,9 +13835,9 @@
       "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
       "dev": true,
       "requires": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
+        "code-point-at": "1.1.0",
+        "is-fullwidth-code-point": "1.0.0",
+        "strip-ansi": "3.0.1"
       }
     },
     "string.prototype.padend": {
@@ -13801,9 +13846,9 @@
       "integrity": "sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA=",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.4.3",
-        "function-bind": "^1.0.2"
+        "define-properties": "1.1.2",
+        "es-abstract": "1.12.0",
+        "function-bind": "1.1.1"
       }
     },
     "string_decoder": {
@@ -13811,7 +13856,7 @@
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "requires": {
-        "safe-buffer": "~5.1.0"
+        "safe-buffer": "5.1.2"
       }
     },
     "strip-ansi": {
@@ -13820,7 +13865,7 @@
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "dev": true,
       "requires": {
-        "ansi-regex": "^2.0.0"
+        "ansi-regex": "2.1.1"
       }
     },
     "strip-bom": {
@@ -13829,7 +13874,7 @@
       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
       "dev": true,
       "requires": {
-        "is-utf8": "^0.2.0"
+        "is-utf8": "0.2.1"
       }
     },
     "strip-eof": {
@@ -13844,7 +13889,7 @@
       "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
       "dev": true,
       "requires": {
-        "get-stdin": "^4.0.1"
+        "get-stdin": "4.0.1"
       }
     },
     "strip-json-comments": {
@@ -13859,8 +13904,8 @@
       "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^1.0.0"
+        "loader-utils": "1.2.3",
+        "schema-utils": "1.0.0"
       }
     },
     "stylus": {
@@ -13869,12 +13914,12 @@
       "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=",
       "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"
+        "css-parse": "1.7.0",
+        "debug": "2.6.9",
+        "glob": "7.0.6",
+        "mkdirp": "0.5.1",
+        "sax": "0.5.8",
+        "source-map": "0.1.43"
       },
       "dependencies": {
         "glob": {
@@ -13883,12 +13928,12 @@
           "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
           "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"
+            "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"
           }
         },
         "source-map": {
@@ -13897,7 +13942,7 @@
           "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
           "dev": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "amdefine": "1.0.1"
           }
         }
       }
@@ -13908,9 +13953,9 @@
       "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.0.2",
-        "lodash.clonedeep": "^4.5.0",
-        "when": "~3.6.x"
+        "loader-utils": "1.2.3",
+        "lodash.clonedeep": "4.5.0",
+        "when": "3.6.4"
       }
     },
     "supports-color": {
@@ -13919,7 +13964,7 @@
       "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
       "dev": true,
       "requires": {
-        "has-flag": "^3.0.0"
+        "has-flag": "3.0.0"
       }
     },
     "sver-compat": {
@@ -13928,8 +13973,8 @@
       "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
       "dev": true,
       "requires": {
-        "es6-iterator": "^2.0.1",
-        "es6-symbol": "^3.1.1"
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1"
       }
     },
     "symbol-observable": {
@@ -13944,12 +13989,12 @@
       "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=",
       "dev": true,
       "requires": {
-        "ajv": "^4.7.0",
-        "ajv-keywords": "^1.0.0",
-        "chalk": "^1.1.1",
-        "lodash": "^4.0.0",
+        "ajv": "4.11.8",
+        "ajv-keywords": "1.5.1",
+        "chalk": "1.1.3",
+        "lodash": "4.17.15",
         "slice-ansi": "0.0.4",
-        "string-width": "^2.0.0"
+        "string-width": "2.1.1"
       },
       "dependencies": {
         "ajv": {
@@ -13958,8 +14003,8 @@
           "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
           "dev": true,
           "requires": {
-            "co": "^4.6.0",
-            "json-stable-stringify": "^1.0.1"
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
           }
         },
         "ajv-keywords": {
@@ -13986,11 +14031,11 @@
           "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"
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
           }
         },
         "is-fullwidth-code-point": {
@@ -14011,8 +14056,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": {
@@ -14021,7 +14066,7 @@
               "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
               "dev": true,
               "requires": {
-                "ansi-regex": "^3.0.0"
+                "ansi-regex": "3.0.0"
               }
             }
           }
@@ -14040,7 +14085,7 @@
       "integrity": "sha1-BEHPzhallIFoTCfRtaZ/8VpDx7A=",
       "dev": true,
       "requires": {
-        "connected-domain": "^1.0.0"
+        "connected-domain": "1.0.0"
       }
     },
     "tapable": {
@@ -14055,9 +14100,9 @@
       "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
       "dev": true,
       "requires": {
-        "block-stream": "*",
-        "fstream": "^1.0.12",
-        "inherits": "2"
+        "block-stream": "0.0.9",
+        "fstream": "1.0.12",
+        "inherits": "2.0.3"
       }
     },
     "temp": {
@@ -14072,7 +14117,7 @@
       "integrity": "sha1-gHFzBDeHByDpQxUy/igUNk+IA9c=",
       "dev": true,
       "requires": {
-        "rimraf": "~2.5.2"
+        "rimraf": "2.5.4"
       },
       "dependencies": {
         "rimraf": {
@@ -14081,7 +14126,7 @@
           "integrity": "sha1-loAAk8vxoMhr2VtGJUZ1NcKd+gQ=",
           "dev": true,
           "requires": {
-            "glob": "^7.0.5"
+            "glob": "7.1.2"
           }
         }
       }
@@ -14092,7 +14137,7 @@
       "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=",
       "dev": true,
       "requires": {
-        "execa": "^0.7.0"
+        "execa": "0.7.0"
       }
     },
     "terser": {
@@ -14101,9 +14146,9 @@
       "integrity": "sha512-JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow==",
       "dev": true,
       "requires": {
-        "commander": "~2.17.1",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.9"
+        "commander": "2.17.1",
+        "source-map": "0.6.1",
+        "source-map-support": "0.5.10"
       },
       "dependencies": {
         "commander": {
@@ -14126,14 +14171,14 @@
       "integrity": "sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==",
       "dev": true,
       "requires": {
-        "cacache": "^11.0.2",
-        "find-cache-dir": "^2.0.0",
-        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^1.4.0",
-        "source-map": "^0.6.1",
-        "terser": "^3.16.1",
-        "webpack-sources": "^1.1.0",
-        "worker-farm": "^1.5.2"
+        "cacache": "11.3.2",
+        "find-cache-dir": "2.0.0",
+        "schema-utils": "1.0.0",
+        "serialize-javascript": "1.6.1",
+        "source-map": "0.6.1",
+        "terser": "3.16.1",
+        "webpack-sources": "1.3.0",
+        "worker-farm": "1.6.0"
       },
       "dependencies": {
         "bluebird": {
@@ -14148,20 +14193,20 @@
           "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
           "dev": true,
           "requires": {
-            "bluebird": "^3.5.3",
-            "chownr": "^1.1.1",
-            "figgy-pudding": "^3.5.1",
-            "glob": "^7.1.3",
-            "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.2",
-            "ssri": "^6.0.1",
-            "unique-filename": "^1.1.1",
-            "y18n": "^4.0.0"
+            "bluebird": "3.5.3",
+            "chownr": "1.1.1",
+            "figgy-pudding": "3.5.1",
+            "glob": "7.1.3",
+            "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.2",
+            "ssri": "6.0.1",
+            "unique-filename": "1.1.1",
+            "y18n": "4.0.0"
           }
         },
         "find-cache-dir": {
@@ -14170,9 +14215,9 @@
           "integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==",
           "dev": true,
           "requires": {
-            "commondir": "^1.0.1",
-            "make-dir": "^1.0.0",
-            "pkg-dir": "^3.0.0"
+            "commondir": "1.0.1",
+            "make-dir": "1.3.0",
+            "pkg-dir": "3.0.0"
           }
         },
         "find-up": {
@@ -14181,7 +14226,7 @@
           "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
-            "locate-path": "^3.0.0"
+            "locate-path": "3.0.0"
           }
         },
         "glob": {
@@ -14190,12 +14235,12 @@
           "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
           "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"
+            "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"
           }
         },
         "graceful-fs": {
@@ -14210,8 +14255,8 @@
           "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"
           }
         },
         "lru-cache": {
@@ -14220,7 +14265,7 @@
           "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
           "dev": true,
           "requires": {
-            "yallist": "^3.0.2"
+            "yallist": "3.0.3"
           }
         },
         "mississippi": {
@@ -14229,16 +14274,16 @@
           "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
           "dev": true,
           "requires": {
-            "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"
+            "concat-stream": "1.6.2",
+            "duplexify": "3.6.0",
+            "end-of-stream": "1.4.1",
+            "flush-write-stream": "1.0.3",
+            "from2": "2.3.0",
+            "parallel-transform": "1.1.0",
+            "pump": "3.0.0",
+            "pumpify": "1.5.1",
+            "stream-each": "1.2.3",
+            "through2": "2.0.3"
           }
         },
         "p-limit": {
@@ -14247,7 +14292,7 @@
           "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==",
           "dev": true,
           "requires": {
-            "p-try": "^2.0.0"
+            "p-try": "2.0.0"
           }
         },
         "p-locate": {
@@ -14256,7 +14301,7 @@
           "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "dev": true,
           "requires": {
-            "p-limit": "^2.0.0"
+            "p-limit": "2.1.0"
           }
         },
         "p-try": {
@@ -14271,7 +14316,7 @@
           "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
           "dev": true,
           "requires": {
-            "find-up": "^3.0.0"
+            "find-up": "3.0.0"
           }
         },
         "pump": {
@@ -14280,8 +14325,8 @@
           "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
           "dev": true,
           "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
+            "end-of-stream": "1.4.1",
+            "once": "1.4.0"
           }
         },
         "source-map": {
@@ -14296,7 +14341,7 @@
           "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
           "dev": true,
           "requires": {
-            "figgy-pudding": "^3.5.1"
+            "figgy-pudding": "3.5.1"
           }
         },
         "yallist": {
@@ -14325,8 +14370,8 @@
       "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
       "dev": true,
       "requires": {
-        "readable-stream": "^2.1.5",
-        "xtend": "~4.0.1"
+        "readable-stream": "2.3.6",
+        "xtend": "4.0.1"
       }
     },
     "through2-filter": {
@@ -14335,8 +14380,8 @@
       "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
       "dev": true,
       "requires": {
-        "through2": "~2.0.0",
-        "xtend": "~4.0.0"
+        "through2": "2.0.3",
+        "xtend": "4.0.1"
       }
     },
     "thunky": {
@@ -14363,7 +14408,7 @@
       "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
       "dev": true,
       "requires": {
-        "setimmediate": "^1.0.4"
+        "setimmediate": "1.0.5"
       }
     },
     "tmp": {
@@ -14372,7 +14417,7 @@
       "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
       "dev": true,
       "requires": {
-        "os-tmpdir": "~1.0.2"
+        "os-tmpdir": "1.0.2"
       }
     },
     "to-absolute-glob": {
@@ -14381,8 +14426,8 @@
       "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
       "dev": true,
       "requires": {
-        "is-absolute": "^1.0.0",
-        "is-negated-glob": "^1.0.0"
+        "is-absolute": "1.0.0",
+        "is-negated-glob": "1.0.0"
       }
     },
     "to-array": {
@@ -14408,7 +14453,7 @@
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
       "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
       "requires": {
-        "kind-of": "^3.0.2"
+        "kind-of": "3.2.2"
       },
       "dependencies": {
         "kind-of": {
@@ -14416,7 +14461,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "requires": {
-            "is-buffer": "^1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -14426,10 +14471,10 @@
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "requires": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
+        "define-property": "2.0.2",
+        "extend-shallow": "3.0.2",
+        "regex-not": "1.0.2",
+        "safe-regex": "1.1.0"
       }
     },
     "to-regex-range": {
@@ -14437,8 +14482,8 @@
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
       "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
       "requires": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
+        "is-number": "3.0.0",
+        "repeat-string": "1.6.1"
       }
     },
     "to-through": {
@@ -14447,7 +14492,7 @@
       "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
       "dev": true,
       "requires": {
-        "through2": "^2.0.3"
+        "through2": "2.0.3"
       }
     },
     "tough-cookie": {
@@ -14456,8 +14501,8 @@
       "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
       "dev": true,
       "requires": {
-        "psl": "^1.1.24",
-        "punycode": "^1.4.1"
+        "psl": "1.1.31",
+        "punycode": "1.4.1"
       },
       "dependencies": {
         "punycode": {
@@ -14468,6 +14513,11 @@
         }
       }
     },
+    "transformation-matrix": {
+      "version": "1.15.3",
+      "resolved": "https://registry.npmjs.org/transformation-matrix/-/transformation-matrix-1.15.3.tgz",
+      "integrity": "sha512-ThJH58GNFKhCw3gIoOtwf3tNwuYjbyEeiGdeq4mNMYWdJctnI896KUqn6PVt7jmNVepqa1bcKQtnMB1HtjsDMA=="
+    },
     "tree-kill": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz",
@@ -14492,7 +14542,7 @@
       "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=",
       "dev": true,
       "requires": {
-        "glob": "^6.0.4"
+        "glob": "6.0.4"
       },
       "dependencies": {
         "glob": {
@@ -14501,11 +14551,11 @@
           "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
           "dev": true,
           "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^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"
           }
         }
       }
@@ -14521,16 +14571,16 @@
       "integrity": "sha1-u9KOOK9Kqj6WB2xGbhsiAZfBo84=",
       "dev": true,
       "requires": {
-        "arrify": "^1.0.0",
-        "chalk": "^2.0.0",
-        "diff": "^3.1.0",
-        "make-error": "^1.1.1",
-        "minimist": "^1.2.0",
-        "mkdirp": "^0.5.1",
-        "source-map-support": "^0.4.0",
-        "tsconfig": "^6.0.0",
-        "v8flags": "^3.0.0",
-        "yn": "^2.0.0"
+        "arrify": "1.0.1",
+        "chalk": "2.2.2",
+        "diff": "3.5.0",
+        "make-error": "1.3.4",
+        "minimist": "1.2.0",
+        "mkdirp": "0.5.1",
+        "source-map-support": "0.4.18",
+        "tsconfig": "6.0.0",
+        "v8flags": "3.1.0",
+        "yn": "2.0.0"
       },
       "dependencies": {
         "minimist": {
@@ -14545,7 +14595,7 @@
           "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
           "dev": true,
           "requires": {
-            "source-map": "^0.5.6"
+            "source-map": "0.5.6"
           }
         }
       }
@@ -14556,8 +14606,8 @@
       "integrity": "sha1-aw6DdgA9evGGT434+J3QBZ/80DI=",
       "dev": true,
       "requires": {
-        "strip-bom": "^3.0.0",
-        "strip-json-comments": "^2.0.0"
+        "strip-bom": "3.0.0",
+        "strip-json-comments": "2.0.1"
       },
       "dependencies": {
         "strip-bom": {
@@ -14580,14 +14630,14 @@
       "integrity": "sha512-mb1v3nsr6rYaZky22xj0d6qv4ogAR40Bc6r37jwWOg3bEIO/ZppEFZiEADs/NNVLcWTPgmNmPZgaX5CfAH6oXA==",
       "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": {
         "minimist": {
           "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
         },
@@ -14610,19 +14660,19 @@
       "integrity": "sha512-ECOOQRxXCYnUUePG5h/+Z1Zouobk3KFpIHA9aKBB/nnMxs97S1JJPDGt5J4cGm1y9U9VmVlfboOxA8n1kSNzGw==",
       "dev": true,
       "requires": {
-        "babel-code-frame": "^6.22.0",
-        "builtin-modules": "^1.1.1",
-        "chalk": "^2.3.0",
-        "commander": "^2.12.1",
-        "diff": "^3.2.0",
-        "glob": "^7.1.1",
-        "js-yaml": "^3.7.0",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.1",
-        "resolve": "^1.3.2",
-        "semver": "^5.3.0",
-        "tslib": "^1.8.0",
-        "tsutils": "^2.27.2"
+        "babel-code-frame": "6.26.0",
+        "builtin-modules": "1.1.1",
+        "chalk": "2.4.2",
+        "commander": "2.15.1",
+        "diff": "3.5.0",
+        "glob": "7.1.2",
+        "js-yaml": "3.13.1",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "resolve": "1.7.1",
+        "semver": "5.5.0",
+        "tslib": "1.9.3",
+        "tsutils": "2.29.0"
       },
       "dependencies": {
         "chalk": {
@@ -14631,9 +14681,9 @@
           "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.3.0"
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.4.0"
           }
         },
         "tsutils": {
@@ -14642,7 +14692,7 @@
           "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
           "dev": true,
           "requires": {
-            "tslib": "^1.8.1"
+            "tslib": "1.9.3"
           }
         }
       }
@@ -14653,7 +14703,7 @@
       "integrity": "sha512-AE/7uzp32MmaHvNNFES85hhUDHFdFZp6OAiZcd6y4ZKKIg6orJTm8keYWBhIhrJQH3a4LzNKat7ZPXZt5aTf6w==",
       "dev": true,
       "requires": {
-        "tslib": "^1.8.1"
+        "tslib": "1.9.3"
       }
     },
     "tty-browserify": {
@@ -14668,7 +14718,7 @@
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
       "dev": true,
       "requires": {
-        "safe-buffer": "^5.0.1"
+        "safe-buffer": "5.1.2"
       }
     },
     "tweetnacl": {
@@ -14684,7 +14734,7 @@
       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
       "dev": true,
       "requires": {
-        "prelude-ls": "~1.1.2"
+        "prelude-ls": "1.1.2"
       }
     },
     "type-is": {
@@ -14694,7 +14744,7 @@
       "dev": true,
       "requires": {
         "media-typer": "0.3.0",
-        "mime-types": "~2.1.18"
+        "mime-types": "2.1.18"
       }
     },
     "typedarray": {
@@ -14715,8 +14765,8 @@
       "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==",
       "dev": true,
       "requires": {
-        "commander": "~2.17.1",
-        "source-map": "~0.6.1"
+        "commander": "2.17.1",
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "commander": {
@@ -14757,15 +14807,15 @@
       "integrity": "sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==",
       "dev": true,
       "requires": {
-        "arr-flatten": "^1.0.1",
-        "arr-map": "^2.0.0",
-        "bach": "^1.0.0",
-        "collection-map": "^1.0.0",
-        "es6-weak-map": "^2.0.1",
-        "last-run": "^1.1.0",
-        "object.defaults": "^1.0.0",
-        "object.reduce": "^1.0.0",
-        "undertaker-registry": "^1.0.0"
+        "arr-flatten": "1.1.0",
+        "arr-map": "2.0.2",
+        "bach": "1.2.0",
+        "collection-map": "1.0.0",
+        "es6-weak-map": "2.0.2",
+        "last-run": "1.1.1",
+        "object.defaults": "1.1.0",
+        "object.reduce": "1.0.1",
+        "undertaker-registry": "1.0.1"
       }
     },
     "undertaker-registry": {
@@ -14779,10 +14829,10 @@
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
       "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "requires": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^2.0.1"
+        "arr-union": "3.1.0",
+        "get-value": "2.0.6",
+        "is-extendable": "0.1.1",
+        "set-value": "2.0.1"
       }
     },
     "unique-filename": {
@@ -14791,7 +14841,7 @@
       "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
       "dev": true,
       "requires": {
-        "unique-slug": "^2.0.0"
+        "unique-slug": "2.0.1"
       }
     },
     "unique-slug": {
@@ -14800,7 +14850,7 @@
       "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
       "dev": true,
       "requires": {
-        "imurmurhash": "^0.1.4"
+        "imurmurhash": "0.1.4"
       }
     },
     "unique-stream": {
@@ -14809,8 +14859,8 @@
       "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
       "dev": true,
       "requires": {
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "through2-filter": "^3.0.0"
+        "json-stable-stringify-without-jsonify": "1.0.1",
+        "through2-filter": "3.0.0"
       }
     },
     "unique-string": {
@@ -14819,7 +14869,7 @@
       "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
       "dev": true,
       "requires": {
-        "crypto-random-string": "^1.0.0"
+        "crypto-random-string": "1.0.0"
       }
     },
     "universalify": {
@@ -14839,8 +14889,8 @@
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
       "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
       "requires": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
+        "has-value": "0.3.1",
+        "isobject": "3.0.1"
       },
       "dependencies": {
         "has-value": {
@@ -14848,9 +14898,9 @@
           "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
           "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
           "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
+            "get-value": "2.0.6",
+            "has-values": "0.1.4",
+            "isobject": "2.1.0"
           },
           "dependencies": {
             "isobject": {
@@ -14887,16 +14937,16 @@
       "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
       "dev": true,
       "requires": {
-        "boxen": "^1.2.1",
-        "chalk": "^2.0.1",
-        "configstore": "^3.0.0",
-        "import-lazy": "^2.1.0",
-        "is-ci": "^1.0.10",
-        "is-installed-globally": "^0.1.0",
-        "is-npm": "^1.0.0",
-        "latest-version": "^3.0.0",
-        "semver-diff": "^2.0.0",
-        "xdg-basedir": "^3.0.0"
+        "boxen": "1.3.0",
+        "chalk": "2.2.2",
+        "configstore": "3.1.2",
+        "import-lazy": "2.1.0",
+        "is-ci": "1.2.1",
+        "is-installed-globally": "0.1.0",
+        "is-npm": "1.0.0",
+        "latest-version": "3.1.0",
+        "semver-diff": "2.1.0",
+        "xdg-basedir": "3.0.0"
       }
     },
     "uri-js": {
@@ -14905,7 +14955,7 @@
       "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
       "dev": true,
       "requires": {
-        "punycode": "^2.1.0"
+        "punycode": "2.1.1"
       }
     },
     "urix": {
@@ -14937,8 +14987,8 @@
       "integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==",
       "dev": true,
       "requires": {
-        "querystringify": "^2.0.0",
-        "requires-port": "^1.0.0"
+        "querystringify": "2.1.0",
+        "requires-port": "1.0.0"
       }
     },
     "url-parse-lax": {
@@ -14947,7 +14997,7 @@
       "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
       "dev": true,
       "requires": {
-        "prepend-http": "^1.0.1"
+        "prepend-http": "1.0.4"
       }
     },
     "urlgrey": {
@@ -14961,7 +15011,7 @@
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz",
       "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==",
       "requires": {
-        "kind-of": "^6.0.2"
+        "kind-of": "6.0.2"
       }
     },
     "user-home": {
@@ -14970,7 +15020,7 @@
       "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=",
       "dev": true,
       "requires": {
-        "os-homedir": "^1.0.0"
+        "os-homedir": "1.0.2"
       }
     },
     "useragent": {
@@ -14979,8 +15029,8 @@
       "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
       "dev": true,
       "requires": {
-        "lru-cache": "4.1.x",
-        "tmp": "0.0.x"
+        "lru-cache": "4.1.3",
+        "tmp": "0.0.33"
       }
     },
     "util": {
@@ -15011,8 +15061,8 @@
       "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "object.getownpropertydescriptors": "^2.0.3"
+        "define-properties": "1.1.2",
+        "object.getownpropertydescriptors": "2.0.3"
       }
     },
     "utils-merge": {
@@ -15033,7 +15083,7 @@
       "integrity": "sha512-0m69VIK2dudEf2Ub0xwLQhZkDZu85OmiOpTw+UGDt56ibviYICHziM/3aE+oVg7IjGPp0c83w3eSVqa+lYZ9UQ==",
       "dev": true,
       "requires": {
-        "homedir-polyfill": "^1.0.1"
+        "homedir-polyfill": "1.0.1"
       }
     },
     "validate-npm-package-license": {
@@ -15042,8 +15092,8 @@
       "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==",
       "dev": true,
       "requires": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
+        "spdx-correct": "3.0.0",
+        "spdx-expression-parse": "3.0.0"
       }
     },
     "validate-npm-package-name": {
@@ -15052,7 +15102,7 @@
       "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
       "dev": true,
       "requires": {
-        "builtins": "^1.0.3"
+        "builtins": "1.0.3"
       }
     },
     "value-or-function": {
@@ -15073,9 +15123,9 @@
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0",
+        "assert-plus": "1.0.0",
         "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
+        "extsprintf": "1.3.0"
       }
     },
     "vinyl": {
@@ -15084,12 +15134,12 @@
       "integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=",
       "dev": true,
       "requires": {
-        "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"
+        "clone": "2.1.1",
+        "clone-buffer": "1.0.0",
+        "clone-stats": "1.0.0",
+        "cloneable-readable": "1.1.2",
+        "remove-trailing-separator": "1.1.0",
+        "replace-ext": "1.0.0"
       }
     },
     "vinyl-fs": {
@@ -15098,23 +15148,23 @@
       "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
       "dev": true,
       "requires": {
-        "fs-mkdirp-stream": "^1.0.0",
-        "glob-stream": "^6.1.0",
-        "graceful-fs": "^4.0.0",
-        "is-valid-glob": "^1.0.0",
-        "lazystream": "^1.0.0",
-        "lead": "^1.0.0",
-        "object.assign": "^4.0.4",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.3.3",
-        "remove-bom-buffer": "^3.0.0",
-        "remove-bom-stream": "^1.2.0",
-        "resolve-options": "^1.1.0",
-        "through2": "^2.0.0",
-        "to-through": "^2.0.0",
-        "value-or-function": "^3.0.0",
-        "vinyl": "^2.0.0",
-        "vinyl-sourcemap": "^1.1.0"
+        "fs-mkdirp-stream": "1.0.0",
+        "glob-stream": "6.1.0",
+        "graceful-fs": "4.1.11",
+        "is-valid-glob": "1.0.0",
+        "lazystream": "1.0.0",
+        "lead": "1.0.0",
+        "object.assign": "4.1.0",
+        "pumpify": "1.5.1",
+        "readable-stream": "2.3.6",
+        "remove-bom-buffer": "3.0.0",
+        "remove-bom-stream": "1.2.0",
+        "resolve-options": "1.1.0",
+        "through2": "2.0.3",
+        "to-through": "2.0.0",
+        "value-or-function": "3.0.0",
+        "vinyl": "2.1.0",
+        "vinyl-sourcemap": "1.1.0"
       },
       "dependencies": {
         "is-valid-glob": {
@@ -15131,13 +15181,13 @@
       "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
       "dev": true,
       "requires": {
-        "append-buffer": "^1.0.2",
-        "convert-source-map": "^1.5.0",
-        "graceful-fs": "^4.1.6",
-        "normalize-path": "^2.1.1",
-        "now-and-later": "^2.0.0",
-        "remove-bom-buffer": "^3.0.0",
-        "vinyl": "^2.0.0"
+        "append-buffer": "1.0.2",
+        "convert-source-map": "1.5.1",
+        "graceful-fs": "4.1.11",
+        "normalize-path": "2.1.1",
+        "now-and-later": "2.0.1",
+        "remove-bom-buffer": "3.0.0",
+        "vinyl": "2.1.0"
       }
     },
     "viz.js": {
@@ -15167,9 +15217,9 @@
       "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
       "dev": true,
       "requires": {
-        "chokidar": "^2.0.2",
-        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
+        "chokidar": "2.0.3",
+        "graceful-fs": "4.1.11",
+        "neo-async": "2.6.0"
       }
     },
     "wbuf": {
@@ -15178,7 +15228,7 @@
       "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
       "dev": true,
       "requires": {
-        "minimalistic-assert": "^1.0.0"
+        "minimalistic-assert": "1.0.1"
       }
     },
     "web-animations-js": {
@@ -15186,14 +15236,35 @@
       "resolved": "https://registry.npmjs.org/web-animations-js/-/web-animations-js-2.3.1.tgz",
       "integrity": "sha1-Om2bwVGWN3qQ+OKAP6UmIWWwRRA="
     },
+    "webcola": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/webcola/-/webcola-3.4.0.tgz",
+      "integrity": "sha512-4BiLXjXw3SJHo3Xd+rF+7fyClT6n7I+AR6TkBqyQ4kTsePSAMDLRCXY1f3B/kXJeP9tYn4G1TblxTO+jAt0gaw==",
+      "requires": {
+        "d3-dispatch": "1.0.3",
+        "d3-drag": "1.2.1",
+        "d3-shape": "1.3.7",
+        "d3-timer": "1.0.7"
+      },
+      "dependencies": {
+        "d3-shape": {
+          "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.0.5"
+          }
+        }
+      }
+    },
     "webdriver-js-extender": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz",
       "integrity": "sha512-lcUKrjbBfCK6MNsh7xaY2UAUmZwe+/ib03AjVOpFobX4O7+83BUveSrLfU0Qsyb1DaKJdQRbuU+kM9aZ6QUhiQ==",
       "dev": true,
       "requires": {
-        "@types/selenium-webdriver": "^3.0.0",
-        "selenium-webdriver": "^3.0.1"
+        "@types/selenium-webdriver": "3.0.16",
+        "selenium-webdriver": "3.6.0"
       }
     },
     "webpack": {
@@ -15206,26 +15277,26 @@
         "@webassemblyjs/helper-module-context": "1.7.11",
         "@webassemblyjs/wasm-edit": "1.7.11",
         "@webassemblyjs/wasm-parser": "1.7.11",
-        "acorn": "^6.0.5",
-        "acorn-dynamic-import": "^4.0.0",
-        "ajv": "^6.1.0",
-        "ajv-keywords": "^3.1.0",
-        "chrome-trace-event": "^1.0.0",
-        "enhanced-resolve": "^4.1.0",
-        "eslint-scope": "^4.0.0",
-        "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^2.3.0",
-        "loader-utils": "^1.1.0",
-        "memory-fs": "~0.4.1",
-        "micromatch": "^3.1.8",
-        "mkdirp": "~0.5.0",
-        "neo-async": "^2.5.0",
-        "node-libs-browser": "^2.0.0",
-        "schema-utils": "^0.4.4",
-        "tapable": "^1.1.0",
-        "terser-webpack-plugin": "^1.1.0",
-        "watchpack": "^1.5.0",
-        "webpack-sources": "^1.3.0"
+        "acorn": "6.1.0",
+        "acorn-dynamic-import": "4.0.0",
+        "ajv": "6.9.1",
+        "ajv-keywords": "3.4.0",
+        "chrome-trace-event": "1.0.0",
+        "enhanced-resolve": "4.1.0",
+        "eslint-scope": "4.0.0",
+        "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.0",
+        "node-libs-browser": "2.2.0",
+        "schema-utils": "0.4.7",
+        "tapable": "1.1.1",
+        "terser-webpack-plugin": "1.2.2",
+        "watchpack": "1.6.0",
+        "webpack-sources": "1.3.0"
       },
       "dependencies": {
         "acorn": {
@@ -15240,8 +15311,8 @@
           "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
           "dev": true,
           "requires": {
-            "ajv": "^6.1.0",
-            "ajv-keywords": "^3.1.0"
+            "ajv": "6.9.1",
+            "ajv-keywords": "3.4.0"
           }
         }
       }
@@ -15252,8 +15323,8 @@
       "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
       "dev": true,
       "requires": {
-        "source-list-map": "~0.1.7",
-        "source-map": "~0.4.1"
+        "source-list-map": "0.1.8",
+        "source-map": "0.4.4"
       },
       "dependencies": {
         "source-list-map": {
@@ -15268,7 +15339,7 @@
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "amdefine": "1.0.1"
           }
         }
       }
@@ -15279,10 +15350,10 @@
       "integrity": "sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==",
       "dev": true,
       "requires": {
-        "memory-fs": "~0.4.1",
-        "mime": "^2.3.1",
-        "range-parser": "^1.0.3",
-        "webpack-log": "^2.0.0"
+        "memory-fs": "0.4.1",
+        "mime": "2.4.0",
+        "range-parser": "1.2.0",
+        "webpack-log": "2.0.0"
       },
       "dependencies": {
         "mime": {
@@ -15300,34 +15371,34 @@
       "dev": true,
       "requires": {
         "ansi-html": "0.0.7",
-        "bonjour": "^3.5.0",
-        "chokidar": "^2.0.0",
-        "compression": "^1.5.2",
-        "connect-history-api-fallback": "^1.3.0",
-        "debug": "^3.1.0",
-        "del": "^3.0.0",
-        "express": "^4.16.2",
-        "html-entities": "^1.2.0",
-        "http-proxy-middleware": "~0.18.0",
-        "import-local": "^2.0.0",
-        "internal-ip": "^3.0.1",
-        "ip": "^1.1.5",
-        "killable": "^1.0.0",
-        "loglevel": "^1.4.1",
-        "opn": "^5.1.0",
-        "portfinder": "^1.0.9",
-        "schema-utils": "^1.0.0",
-        "selfsigned": "^1.9.1",
-        "semver": "^5.6.0",
-        "serve-index": "^1.7.2",
+        "bonjour": "3.5.0",
+        "chokidar": "2.0.3",
+        "compression": "1.7.3",
+        "connect-history-api-fallback": "1.6.0",
+        "debug": "3.2.6",
+        "del": "3.0.0",
+        "express": "4.16.4",
+        "html-entities": "1.2.1",
+        "http-proxy-middleware": "0.18.0",
+        "import-local": "2.0.0",
+        "internal-ip": "3.0.1",
+        "ip": "1.1.5",
+        "killable": "1.0.1",
+        "loglevel": "1.6.1",
+        "opn": "5.3.0",
+        "portfinder": "1.0.20",
+        "schema-utils": "1.0.0",
+        "selfsigned": "1.10.4",
+        "semver": "5.6.0",
+        "serve-index": "1.9.1",
         "sockjs": "0.3.19",
         "sockjs-client": "1.3.0",
-        "spdy": "^4.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^5.1.0",
-        "url": "^0.11.0",
+        "spdy": "4.0.0",
+        "strip-ansi": "3.0.1",
+        "supports-color": "5.4.0",
+        "url": "0.11.0",
         "webpack-dev-middleware": "3.4.0",
-        "webpack-log": "^2.0.0",
+        "webpack-log": "2.0.0",
         "yargs": "12.0.2"
       },
       "dependencies": {
@@ -15354,9 +15425,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.0.0"
+            "string-width": "2.1.1",
+            "strip-ansi": "4.0.0",
+            "wrap-ansi": "2.1.0"
           },
           "dependencies": {
             "strip-ansi": {
@@ -15365,7 +15436,7 @@
               "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
               "dev": true,
               "requires": {
-                "ansi-regex": "^3.0.0"
+                "ansi-regex": "3.0.0"
               }
             }
           }
@@ -15376,11 +15447,11 @@
           "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "dev": true,
           "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
+            "nice-try": "1.0.5",
+            "path-key": "2.0.1",
+            "semver": "5.6.0",
+            "shebang-command": "1.2.0",
+            "which": "1.3.1"
           }
         },
         "debug": {
@@ -15389,7 +15460,7 @@
           "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.1"
           }
         },
         "decamelize": {
@@ -15407,13 +15478,13 @@
           "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
           "dev": true,
           "requires": {
-            "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"
+            "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"
           }
         },
         "find-up": {
@@ -15422,7 +15493,7 @@
           "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
-            "locate-path": "^3.0.0"
+            "locate-path": "3.0.0"
           }
         },
         "get-stream": {
@@ -15431,7 +15502,7 @@
           "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
           "dev": true,
           "requires": {
-            "pump": "^3.0.0"
+            "pump": "3.0.0"
           }
         },
         "invert-kv": {
@@ -15452,7 +15523,7 @@
           "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
           "dev": true,
           "requires": {
-            "invert-kv": "^2.0.0"
+            "invert-kv": "2.0.0"
           }
         },
         "locate-path": {
@@ -15461,8 +15532,8 @@
           "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"
           }
         },
         "mime": {
@@ -15483,9 +15554,9 @@
           "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
           "dev": true,
           "requires": {
-            "execa": "^1.0.0",
-            "lcid": "^2.0.0",
-            "mem": "^4.0.0"
+            "execa": "1.0.0",
+            "lcid": "2.0.0",
+            "mem": "4.0.0"
           }
         },
         "p-limit": {
@@ -15494,7 +15565,7 @@
           "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==",
           "dev": true,
           "requires": {
-            "p-try": "^2.0.0"
+            "p-try": "2.0.0"
           }
         },
         "p-locate": {
@@ -15503,7 +15574,7 @@
           "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "dev": true,
           "requires": {
-            "p-limit": "^2.0.0"
+            "p-limit": "2.1.0"
           }
         },
         "p-try": {
@@ -15518,8 +15589,8 @@
           "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
           "dev": true,
           "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
+            "end-of-stream": "1.4.1",
+            "once": "1.4.0"
           }
         },
         "semver": {
@@ -15534,8 +15605,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": {
@@ -15544,7 +15615,7 @@
               "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
               "dev": true,
               "requires": {
-                "ansi-regex": "^3.0.0"
+                "ansi-regex": "3.0.0"
               }
             }
           }
@@ -15555,10 +15626,10 @@
           "integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==",
           "dev": true,
           "requires": {
-            "memory-fs": "~0.4.1",
-            "mime": "^2.3.1",
-            "range-parser": "^1.0.3",
-            "webpack-log": "^2.0.0"
+            "memory-fs": "0.4.1",
+            "mime": "2.4.0",
+            "range-parser": "1.2.0",
+            "webpack-log": "2.0.0"
           }
         },
         "which-module": {
@@ -15573,18 +15644,18 @@
           "integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
           "dev": true,
           "requires": {
-            "cliui": "^4.0.0",
-            "decamelize": "^2.0.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": "^10.1.0"
+            "cliui": "4.1.0",
+            "decamelize": "2.0.0",
+            "find-up": "3.0.0",
+            "get-caller-file": "1.0.2",
+            "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": "10.1.0"
           }
         },
         "yargs-parser": {
@@ -15593,7 +15664,7 @@
           "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
           "dev": true,
           "requires": {
-            "camelcase": "^4.1.0"
+            "camelcase": "4.1.0"
           }
         }
       }
@@ -15604,8 +15675,8 @@
       "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
       "dev": true,
       "requires": {
-        "ansi-colors": "^3.0.0",
-        "uuid": "^3.3.2"
+        "ansi-colors": "3.2.3",
+        "uuid": "3.3.2"
       },
       "dependencies": {
         "ansi-colors": {
@@ -15628,7 +15699,7 @@
       "integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.5"
+        "lodash": "4.17.13"
       }
     },
     "webpack-sources": {
@@ -15637,8 +15708,8 @@
       "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==",
       "dev": true,
       "requires": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
+        "source-list-map": "2.0.1",
+        "source-map": "0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -15655,7 +15726,7 @@
       "integrity": "sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==",
       "dev": true,
       "requires": {
-        "webpack-core": "^0.6.8"
+        "webpack-core": "0.6.9"
       }
     },
     "websocket-driver": {
@@ -15664,8 +15735,8 @@
       "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
       "dev": true,
       "requires": {
-        "http-parser-js": ">=0.4.0",
-        "websocket-extensions": ">=0.1.1"
+        "http-parser-js": "0.5.0",
+        "websocket-extensions": "0.1.3"
       }
     },
     "websocket-extensions": {
@@ -15686,7 +15757,7 @@
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
       "requires": {
-        "isexe": "^2.0.0"
+        "isexe": "2.0.0"
       }
     },
     "which-module": {
@@ -15701,7 +15772,7 @@
       "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
       "dev": true,
       "requires": {
-        "string-width": "^1.0.2 || 2"
+        "string-width": "1.0.2"
       }
     },
     "widest-line": {
@@ -15710,7 +15781,7 @@
       "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==",
       "dev": true,
       "requires": {
-        "string-width": "^2.1.1"
+        "string-width": "2.1.1"
       },
       "dependencies": {
         "ansi-regex": {
@@ -15731,8 +15802,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"
           }
         },
         "strip-ansi": {
@@ -15741,7 +15812,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "3.0.0"
           }
         }
       }
@@ -15758,7 +15829,7 @@
       "integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
       "dev": true,
       "requires": {
-        "errno": "~0.1.7"
+        "errno": "0.1.7"
       }
     },
     "wrap-ansi": {
@@ -15767,8 +15838,8 @@
       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
       "dev": true,
       "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1"
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1"
       }
     },
     "wrappy": {
@@ -15783,7 +15854,7 @@
       "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
       "dev": true,
       "requires": {
-        "mkdirp": "^0.5.1"
+        "mkdirp": "0.5.1"
       }
     },
     "write-file-atomic": {
@@ -15792,9 +15863,9 @@
       "integrity": "sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.11",
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.2"
+        "graceful-fs": "4.1.11",
+        "imurmurhash": "0.1.4",
+        "signal-exit": "3.0.2"
       }
     },
     "ws": {
@@ -15803,9 +15874,9 @@
       "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
       "dev": true,
       "requires": {
-        "async-limiter": "~1.0.0",
-        "safe-buffer": "~5.1.0",
-        "ultron": "~1.1.0"
+        "async-limiter": "1.0.1",
+        "safe-buffer": "5.1.2",
+        "ultron": "1.1.1"
       }
     },
     "xdg-basedir": {
@@ -15825,9 +15896,9 @@
       "integrity": "sha512-MWTbxAQqclRSTnehWWe5nMKzI3VmJ8ltiJEco8akcC6j3miOhjjfzKum5sId+CWhfxdOs/1xauYr8/ZDBtQiRw==",
       "dev": true,
       "requires": {
-        "sax": ">=0.6.0",
-        "util.promisify": "~1.0.0",
-        "xmlbuilder": "~11.0.0"
+        "sax": "1.2.4",
+        "util.promisify": "1.0.0",
+        "xmlbuilder": "11.0.1"
       },
       "dependencies": {
         "sax": {
@@ -15878,7 +15949,7 @@
       "integrity": "sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==",
       "dev": true,
       "requires": {
-        "cuint": "^0.2.2"
+        "cuint": "0.2.2"
       }
     },
     "y18n": {
@@ -15899,7 +15970,7 @@
       "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
       "dev": true,
       "requires": {
-        "camelcase": "^3.0.0"
+        "camelcase": "3.0.0"
       },
       "dependencies": {
         "camelcase": {
@@ -15916,7 +15987,7 @@
       "integrity": "sha1-7CblzIfVYBud+EMtvdPNLlFzoHE=",
       "dev": true,
       "requires": {
-        "buffer-crc32": "~0.2.3"
+        "buffer-crc32": "0.2.13"
       }
     },
     "yeast": {
diff --git a/package.json b/package.json
index 613b3ce260..b20228f220 100644
--- a/package.json
+++ b/package.json
@@ -63,19 +63,21 @@
     "@ngrx/store": "^7.2.0",
     "@ngrx/store-devtools": "^7.2.0",
     "@swimlane/ngx-charts": "^10.1.0",
-    "@types/moment-timezone": "^0.5.12",
+    "@swimlane/ngx-graph": "^6.2.0",
     "@types/marked": "^0.6.5",
+    "@types/moment-timezone": "^0.5.12",
     "angular2-virtual-scroll": "^0.3.1",
     "core-js": "^2.6.5",
     "hammerjs": "^2.0.8",
     "immer": "^3.1.3",
+    "intersect": "^1.0.1",
     "lodash-es": "^4.17.14",
     "mappy-breakpoints": "^0.2.3",
     "marked": "^0.7.0",
-    "intersect": "^1.0.1",
     "moment": "^2.24.0",
     "moment-timezone": "^0.5.12",
     "ngrx-store-localstorage": "cf-stratos/ngrx-store-localstorage#lodash-dep-update",
+    "ngx-json-viewer": "^2.4.0",
     "ngx-moment": "^3.3.0",
     "normalizr": "^3.2.3",
     "reselect": "^3.0.1",
diff --git a/src/frontend/packages/core/sass/components/text-status.theme.scss b/src/frontend/packages/core/sass/components/text-status.theme.scss
index bfd0ec037a..f30b1de267 100644
--- a/src/frontend/packages/core/sass/components/text-status.theme.scss
+++ b/src/frontend/packages/core/sass/components/text-status.theme.scss
@@ -23,4 +23,22 @@
     color: $status-tentative;
   }
 
+  // Border colors
+
+  .border-success {
+    border-color: $status-success;
+  }
+
+  .border-warning {
+    border-color: $status-warning;
+  }
+
+  .border-danger {
+    border-color: $status-danger;
+  }
+
+  .border-tentative {
+    border-color: $status-tentative;
+  }  
+
 }
diff --git a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
index 0884263a2b..d2954fdf6d 100644
--- a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
+++ b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
@@ -75,7 +75,6 @@ $app-sub-header-height: 48px;
   height: $app-sub-header-height;
   margin-left: 200px;
   padding: 0;
-  width: 100%;
   @include breakpoint(tablet) {
     margin: 0;
     padding: 0 20px;
diff --git a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.html b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.html
index 09f01fda05..570506a80f 100644
--- a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.html
+++ b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.html
@@ -9,7 +9,8 @@
   </div>
   <ul class="page-side-nav__items">
     <li tabindex="1" *ngFor="let tab of tabs">
-      <a *ngIf="!tab.hidden$ || !(tab.hidden$ | async)" class="page-side-nav__item" [routerLink]="[tab.link]"
+      <div *ngIf="!tab.link" class="page-side-nav__item-sep">{{ tab.label }}</div>
+      <a *ngIf="tab.link && (!tab.hidden$ || !(tab.hidden$ | async))" class="page-side-nav__item" [routerLink]="[tab.link]"
         [routerLinkActive]="['page-side-nav__item--active']">
         <mat-icon class="page-side-nav__icon" *ngIf="tab.icon" [fontSet]="tab.iconFont">{{ tab.icon }}
         </mat-icon>
diff --git a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.scss b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.scss
index c1e9e75bae..4aa4b95ff6 100644
--- a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.scss
+++ b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.scss
@@ -35,6 +35,20 @@
       text-align: center;
     }
   }
+  &__item-sep {
+    align-items: center;
+    border-color: transparent;
+    cursor: default;
+    display: flex;
+    font-size: 12px;
+    letter-spacing: .01em;
+    line-height: 18px;
+    outline: 0;
+    padding: 10px;
+    padding-left: $item-header-padding;
+    text-decoration: none;
+    text-transform: uppercase;
+  }
   &__items {
     border-bottom: 1px solid $border-color;
     display: none;
diff --git a/src/frontend/packages/core/src/route-reuse-stragegy.ts b/src/frontend/packages/core/src/route-reuse-stragegy.ts
index 86846cc5af..a82b053d35 100644
--- a/src/frontend/packages/core/src/route-reuse-stragegy.ts
+++ b/src/frontend/packages/core/src/route-reuse-stragegy.ts
@@ -13,6 +13,14 @@ export class CustomReuseStrategy extends RouteReuseStrategy {
   shouldReuseRoute(future: ActivatedRouteSnapshot, curr: ActivatedRouteSnapshot): boolean {
     const isDashboard = curr.component === DashboardBaseComponent && future.component === DashboardBaseComponent;
     const isAppComp = curr.component === AppComponent && future.component === AppComponent;
-    return isDashboard || isAppComp;
+
+    let reuse = false;
+    if (curr.data.reuseRoute === true) {
+      reuse = curr.data.reuseRoute && future.data.reuseRoute && !curr.component && !future.component;
+    } else {
+      // Expect it to be a component
+      reuse = curr.component === curr.data.reuseRoute && future.component === future.data.reuseRoute;
+    }
+    return isDashboard || isAppComp || reuse;
   }
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts
index d89b4b4d34..76d10b4ec3 100644
--- a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts
+++ b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts
@@ -61,7 +61,12 @@ export class LocalListController<T = any> {
         }
         return { paginationEntity, entities };
       }),
-      tap(({ paginationEntity, entities }) => this.setResultCount(paginationEntity, entities)),
+      tap(({ paginationEntity, entities }) => {
+        console.log('------- HERE');
+        console.log(paginationEntity);
+        console.log(entities);
+        this.setResultCount(paginationEntity, entities);
+      }),
       map(({ entities }) => entities)
     );
     return cleanPagination$.pipe(
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 d9c88813b2..1286e965f6 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
@@ -49,7 +49,7 @@ export class PageHeaderComponent implements OnDestroy, AfterViewInit {
     if (tabs) {
       this.pTabs = tabs.map(tab => ({
         ...tab,
-        link: this.router.createUrlTree([tab.link], {
+        link: tab.link === '-' ? null : this.router.createUrlTree([tab.link], {
           relativeTo: this.route
         }).toString()
       }));
@@ -64,7 +64,6 @@ export class PageHeaderComponent implements OnDestroy, AfterViewInit {
     }
   }
 
-
   @Input() showUnderFlow = false;
 
   private pShowHistory = true;
diff --git a/src/frontend/packages/core/src/shared/monitors/pagination-monitor.ts b/src/frontend/packages/core/src/shared/monitors/pagination-monitor.ts
index 595356b9aa..c9ed99a898 100644
--- a/src/frontend/packages/core/src/shared/monitors/pagination-monitor.ts
+++ b/src/frontend/packages/core/src/shared/monitors/pagination-monitor.ts
@@ -228,6 +228,8 @@ export class PaginationMonitor<T = any, Y extends AppState = GeneralEntityAppSta
       schema
     );
 
+    console.log(schema);
+
     const allEntitiesObservable$ = this.store.select(getAPIRequestDataState);
 
     const entities$ = pagination$.pipe(
diff --git a/src/jetstream/go.mod b/src/jetstream/go.mod
index b51c37b674..dccff9854c 100644
--- a/src/jetstream/go.mod
+++ b/src/jetstream/go.mod
@@ -28,14 +28,11 @@ require (
 	github.com/cloudfoundry/noaa v2.1.0+incompatible
 	github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4
 	github.com/coreos/bbolt v1.3.3 // indirect
-	github.com/coreos/etcd v3.3.16+incompatible // indirect
 	github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
 	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
 	github.com/cppforlife/go-patch v0.2.0 // indirect
 	github.com/domodwyer/mailyak v3.1.1+incompatible
 	github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 // indirect
-	github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385 // indirect
-	github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484 // indirect
 	github.com/elazarl/goproxy/ext v0.0.0-20191011121108-aa519ddbe484 // indirect
 	github.com/fatih/color v1.7.0 // indirect
 	github.com/go-sql-driver/mysql v1.4.1
@@ -64,7 +61,7 @@ require (
 	github.com/satori/go.uuid v1.2.0
 	github.com/sirupsen/logrus v1.4.2
 	github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 // indirect
-	github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a
+	github.com/smartystreets/goconvey v1.6.4
 	github.com/soheilhy/cmux v0.1.4 // indirect
 	github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect
 	github.com/tedsuo/rata v1.0.0 // indirect
@@ -74,10 +71,11 @@ require (
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
 	go.etcd.io/bbolt v1.3.3 // indirect
-	golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7
-	gopkg.in/DATA-DOG/go-sqlmock.v1 v1.0.0-00010101000000-000000000000
+	golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152
+	gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0
 	gopkg.in/cheggaaa/pb.v1 v1.0.27 // indirect
-	gopkg.in/yaml.v2 v2.2.2
+	gopkg.in/yaml.v2 v2.2.4
+	k8s.io/kubernetes v1.16.3 // indirect
 )
 
 replace github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces => ./repository/interfaces
diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index e3755fd9a2..38332a5889 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -57,6 +57,7 @@ github.com/Masterminds/vcs v1.13.0/go.mod h1:N09YCmOQr6RLxC6UNHzuVwAdodYbbnycGHS
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
 github.com/Microsoft/go-winio v0.4.12 h1:xAfWHN1IrQ0NJ9TBC0KBZoqLjzDTr1ML+4MywiUOryc=
 github.com/Microsoft/go-winio v0.4.12/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
+github.com/Microsoft/hcsshim v0.0.0-20190417211021-672e52e9209d/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
 github.com/Microsoft/hcsshim v0.8.6 h1:ZfF0+zZeYdzMIVMZHKtDKJvLHj76XCuVae/jNkjj0IA=
 github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
@@ -75,7 +76,9 @@ github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc/go.mod h1:ARgC
 github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs=
 github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/antonlindstrom/pgstore v0.0.0-20170604072116-a407030ba6d0 h1:e6PEaXbztY0ViaKotCICNnBQDUeNEJgrQ5UAHWlloh4=
 github.com/antonlindstrom/pgstore v0.0.0-20170604072116-a407030ba6d0/go.mod h1:2Ti6VUHVxpC0VSmTZzEvpzysnaGAfGBOoMIz5ykPyyw=
 github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77 h1:afT88tB6u9JCKQZVAAaa9ICz/uGn5Uw9ekn6P22mYKM=
@@ -95,6 +98,9 @@ github.com/bazelbuild/bazel-gazelle v0.0.0-20181012220611-c728ce9f663e/go.mod h1
 github.com/bazelbuild/buildtools v0.0.0-20180226164855-80c7f0d45d7e/go.mod h1:5JP0TXzWDHXv8qvxRC4InIazwdyDseBDbzESUMKk1yU=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115/go.mod h1:zVt7zX3K/aDCk9Tj+VM7YymsX66ERvzCJzw8rFCX2JU=
 github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y=
 github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
@@ -119,6 +125,8 @@ github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QH
 github.com/census-instrumentation/opencensus-proto v0.0.2-0.20180913191712-f303ae3f8d6a/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/census-instrumentation/opencensus-proto v0.1.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c/go.mod h1:Xe6ZsFhtM8HrDku0pxJ3/Lr51rwykrzgFwpmTzleatY=
+github.com/cespare/xxhash/v2 v2.1.0 h1:yTUvW7Vhb89inJ+8irsUqiWjh8iT6sQPZiQzI6ReGkA=
+github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM=
 github.com/cf-stratos/mysqlstore v0.0.0-20170822100912-304308519d13 h1:WwIvjUUodNoZduhdhotbKnrLSFoIn5vD3QgNZv0hjvo=
 github.com/cf-stratos/mysqlstore v0.0.0-20170822100912-304308519d13/go.mod h1:GgQT0ToC+7JLnMKdDB5d434WwCLC2dpNR2AgTJj/08o=
 github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
@@ -149,6 +157,8 @@ github.com/containerd/console v0.0.0-20170925154832-84eeaae905fa/go.mod h1:Tj/on
 github.com/containerd/containerd v1.0.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd v1.3.0-beta.2.0.20190823190603-4a2f61c4f2b4 h1:aMyA5J7j6D07U7pf8BFEY67BKoDcz0zWleAbQj3zVng=
 github.com/containerd/containerd v1.3.0-beta.2.0.20190823190603-4a2f61c4f2b4/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/containerd v1.3.0 h1:xjvXQWABwS2uiv3TWgQt5Uth60Gu86LTGZXMJkjc7rY=
+github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 h1:4BX8f882bXEDKfWIf0wa8HRvpnBoPszJJXL+TVbBw4M=
 github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/containerd/typeurl v0.0.0-20190228175220-2a93cfde8c20/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc=
@@ -161,6 +171,7 @@ github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc
 github.com/coreos/etcd v3.3.15+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/etcd v3.3.16+incompatible h1:hQaR//OAeI1FQ3G5bGRL9VpFOCurqnEHSup4W693Tb4=
 github.com/coreos/etcd v3.3.16+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/etcd v3.3.17+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
@@ -204,12 +215,15 @@ github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82 h1:X0fj836zx99zF
 github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI=
 github.com/docker/go-units v0.3.3 h1:Xk8S3Xj5sLGlG5g67hJmYMmUgXv5N4PhkjJHHqrwnTk=
 github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
+github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/docker/libnetwork v0.0.0-20180830151422-a9cd636e3789/go.mod h1:93m0aTqz6z+g32wla4l4WxTrdtvBRmVzYRkYvasA5Z8=
 github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4=
 github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE=
 github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
 github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c h1:ZfSZ3P3BedhKGUhzj7BQlPSU4OvT6tfOKe3DVHzOA7s=
 github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
+github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
 github.com/domodwyer/mailyak v3.1.1+incompatible h1:oPtXn3+56LEFbdqH0bpuPRsqtijW9l2POpQe9sTUsSI=
 github.com/domodwyer/mailyak v3.1.1+incompatible/go.mod h1:5NNYkn9hxcdNEOmmMx0yultN5VLorZQ+AWQo9iya+UY=
 github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 h1:eX+pdPPlD279OWgdx7f6KqIRSONuK7egk+jDx7OM3Ac=
@@ -226,9 +240,13 @@ github.com/elazarl/goproxy/ext v0.0.0-20191011121108-aa519ddbe484/go.mod h1:gNh8
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk=
 github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/emicklei/go-restful v2.11.1+incompatible h1:CjKsv3uWcCMvySPQYKxO8XX3f9zD4FeZRsW4G0B4ffE=
+github.com/emicklei/go-restful v2.11.1+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod h1:MhmAMZ8V4CYH4ybgdRwPr2TU5ThnS43puaKEMpja1uw=
 github.com/evanphx/json-patch v4.2.0+incompatible h1:fUDGZCv/7iAN7u0puUVhvKCcsR6vRfwrJatElLBEf0I=
 github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M=
+github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
 github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
@@ -251,7 +269,9 @@ github.com/go-acme/lego v2.5.0+incompatible/go.mod h1:yzMNe9CasVUhkquNvti5nAtPmG
 github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo=
 github.com/go-inf/inf v0.9.1/go.mod h1:ZWwB6rTV+0pO94RdIMKue59tExzQp6/pj/BMuPQkXaA=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=
 github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
@@ -266,12 +286,16 @@ github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwds
 github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 github.com/go-openapi/jsonpointer v0.19.2 h1:A9+F4Dc/MCNB5jibxf6rRvOvR/iFgQdyNx9eIhnGqq0=
 github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
+github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
+github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
 github.com/go-openapi/jsonreference v0.17.0 h1:yJW3HCkTHg7NOA+gZ83IPHzUSnUzGXhGmsdiCcMexbA=
 github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
 github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
 github.com/go-openapi/jsonreference v0.19.2 h1:o20suLFB4Ri0tuzpWtyHlh7E7HnkqTNLq6aR6WVNS1w=
 github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
+github.com/go-openapi/jsonreference v0.19.3 h1:5cxNfTy0UVC3X8JL5ymxzyoUZmo8iZb+jeTWn7tUa8o=
+github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
 github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
 github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
 github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
@@ -284,6 +308,8 @@ github.com/go-openapi/spec v0.18.0 h1:aIjeyG5mo5/FrvDkpKKEGZPmF9MPHahS72mzfVqeQX
 github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
 github.com/go-openapi/spec v0.19.2 h1:SStNd1jRcYtfKCN7R0laGNs80WYYvn5CbBjM2sOmCrE=
 github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
+github.com/go-openapi/spec v0.19.4 h1:ixzUSnHTd6hCemgtAJgluaTSGYpLNpJY4mA2DIkdOAo=
+github.com/go-openapi/spec v0.19.4/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
 github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
 github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
 github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY=
@@ -293,6 +319,8 @@ github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/
 github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
 github.com/go-openapi/swag v0.19.2 h1:jvO6bCMBEilGwMfHhrd61zIID4oIFdwb76V17SM88dE=
 github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
 github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
 github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU=
@@ -311,12 +339,15 @@ github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
+github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef h1:veQD95Isof8w9/WXiA+pa3tz3fJXkt5B7QaRBrM62gk=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@@ -341,6 +372,8 @@ github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
@@ -356,6 +389,8 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+
 github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhpy9g=
 github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
+github.com/googleapis/gnostic v0.3.1 h1:WeAefnSUHlBb0iJKwxFDZdbfGwkd7xRNuV+IpXMJhYk=
+github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU=
 github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
 github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e h1:XWcjeEtTFTOVA9Fs1w7n2XBftk5ib4oZrhzWk0B+3eA=
 github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
@@ -393,6 +428,8 @@ github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCO
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.3 h1:YPkqC67at8FYaadspW/6uE0COsBxS2656RLEr8Bppgk=
+github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/heketi/heketi v9.0.0+incompatible/go.mod h1:bB9ly3RchcQqsQ9CpyaQwvva7RS5ytVoSoholZQON6o=
 github.com/heketi/rest v0.0.0-20180404230133-aa6a65207413/go.mod h1:BeS3M108VzVlmAue3lv2WcGuPAX94/KN63MUURzbYSI=
@@ -410,6 +447,8 @@ github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI=
 github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/imdario/mergo v0.3.8 h1:CGgOkSJeqMRmt0D9XLWExdT4m4F1vd3FV3VPt+0VxkQ=
+github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
@@ -481,6 +520,9 @@ github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN
 github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63 h1:nTT4s92Dgz2HlrB2NaMgvlfqHH39OgMhA7z3PK7PGD4=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=
+github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
 github.com/marten-seemann/qtls v0.2.3/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg=
@@ -547,10 +589,12 @@ github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w=
 github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI=
@@ -587,21 +631,32 @@ github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=
 github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.2.1 h1:JnMpQc6ppsNgw9QPAGF6Dod479itz7lvlsMzzNayLOI=
+github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.2.0 h1:kUZDBDTdBVBYBj5Tmh2NZLlF60mfjA27rM34b+cVwNU=
 github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.7.0 h1:L+1lyG48J1zAQXA3RBX/nG/B3gjlHq0zTt2tlbJLyCY=
+github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
 github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190129233650-316cf8ccfec5 h1:Etei0Wx6pooT/DeOKcGTr1M/01ggz95Ajq8BBwCOKBU=
 github.com/prometheus/procfs v0.0.0-20190129233650-316cf8ccfec5/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8=
+github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
 github.com/quobyte/api v0.1.2/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI=
 github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
 github.com/robfig/cron v1.1.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
@@ -642,6 +697,8 @@ github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzu
 github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 github.com/square/go-jose v2.3.0+incompatible/go.mod h1:7MxpAF/1WTVUu8Am+T5kNy+t0902CaLWM4Z745MkOa8=
 github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc/go.mod h1:ZrLn+e0ZuF3Y65PNF6dIwbJPZqfmtCXxFm9ckv0agOY=
@@ -732,6 +789,8 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7 h1:0hQKqeLdqlt5iIwVOBErRisrHJAN57yOiPRQItI20fU=
 golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152 h1:ZC1Xn5A1nlpSmQCIva4bZ3ob3lmhYIefc+GU+DLg1Ow=
+golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -764,9 +823,13 @@ golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190328230028-74de082e2cca/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc h1:gkKoSkUmnU6bpS/VhkuO27bzQeSA51uaEfbOW5dNb68=
 golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271 h1:N66aaryRB3Ax92gH0v3hp1QYZ3zWWCCUR/j8Ifh45Ss=
+golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
@@ -798,6 +861,9 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f h1:25KHgbfyiSm6vwQLbM3zZIe1v9p/3ea4Rz+nnM5K/i4=
 golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191028164358-195ce5e7f934 h1:u/E0NqCIWRDAo9WCFo6Ko49njPFDLSd3z+X1HgWDMpE=
+golang.org/x/sys v0.0.0-20191028164358-195ce5e7f934/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -806,6 +872,8 @@ golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20170824195420-5d2fd3ccab98/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -832,6 +900,7 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
@@ -842,6 +911,8 @@ google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 h1:nfPFGzJkUDX6uBm
 google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20191028173616-919d9bdd9fe6 h1:UXl+Zk3jqqcbEVV7ace5lrt4YdA4tXiz3f/KbmD29Vo=
+google.golang.org/genproto v0.0.0-20191028173616-919d9bdd9fe6/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.15.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
 google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
@@ -850,6 +921,8 @@ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.23.0 h1:AzbTB6ux+okLTzP8Ru1Xs41C303zdcfEht7MQnYJt5A=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.24.0 h1:vb/1TCsVn3DcJlQ0Gs1yB1pKI6Do2/QNwxdKqmc/b0s=
+google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
@@ -879,6 +952,8 @@ gopkg.in/warnings.v0 v0.1.1/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRN
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gotest.tools v2.1.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
@@ -886,6 +961,8 @@ gotest.tools/gotestsum v0.3.5/go.mod h1:Mnf3e5FUzXbkCfynWBGOwLssY7gTQgCHObK9tMpA
 helm.sh/helm v2.14.3+incompatible h1:M3xvix8x41Xjc/ZGARGpUOTjxTBrb86yZG5FmCjgIew=
 helm.sh/helm/v3 v3.0.0-beta.4 h1:gK5iJztTqr4Ai712LSS2fxqaW2b635GxunkBinEBCXY=
 helm.sh/helm/v3 v3.0.0-beta.4/go.mod h1:ZQ5l9gLmS7attkwdVKXxygj84XE4dzZIdr3frQ9H7No=
+helm.sh/helm/v3 v3.0.0 h1:or/9cs1GgfcTQeEnR2CVJNw893/rmqIG1KsNHmUiSFw=
+helm.sh/helm/v3 v3.0.0/go.mod h1:sI7B9yfvMgxtTPMWdk1jSKJ2aa59UyP9qhPydqW6mgo=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -901,10 +978,16 @@ k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUc
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.4.0 h1:lCJCxf/LIowc2IGS9TPjWDyXY4nOmdGdfcwwDQCOURQ=
 k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
+k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
+k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf h1:EYm5AW/UUDbnmnI+gK0TJDVK9qPLhM+sRHYanNKw0EQ=
 k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
+k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d h1:Xpe6sK+RY4ZgCTyZ3y273UmFmURhjtoJiwOMbQsXitY=
+k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
 k8s.io/kubernetes v1.16.1 h1:5Ys1P0p+OkGMq+/RQWa3/gs2hlGfaNkVPsVY+vyZWqQ=
 k8s.io/kubernetes v1.16.1/go.mod h1:nlP2zevWKRGKuaaVbKIwozU0Rjg9leVDXkL4YTtjmVs=
+k8s.io/kubernetes v1.16.3 h1:Bk2cKOdTtuGeod3+ytBeXxqIVHbh7Pu+aq0c+YJLX7g=
+k8s.io/kubernetes v1.16.3/go.mod h1:hJd0X6w7E/MiE7PcDp11XHhdgQBYc33vP+WtTJqG/AU=
 k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20191001043732-d647ddbd755f h1:qnPdWj5mRMsfvP85N8J2ogqiu8Aq1T6MPsJdxL3g6Ds=
 k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20191001043732-d647ddbd755f/go.mod h1:cHpnPcbNeE90PrTRnTu13OM+FN+ROt82odVbEh++81o=
 k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20191001043732-d647ddbd755f h1:bpyOu4+qNIFZRKRtSXGv/iJ7YzqwXrAOoaKxUaYKrV4=
@@ -937,6 +1020,8 @@ k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20191001043732-d647
 k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3/go.mod h1:+G1xBfZDfVFsm1Tj/HNCvg4QqWx8rJ2Fxpqr1rqp/gQ=
 k8s.io/utils v0.0.0-20190801114015-581e00157fb1 h1:+ySTxfHnfzZb9ys375PXNlLhkJPLKgHajBU0N62BDvE=
 k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
+k8s.io/utils v0.0.0-20191010214722-8d271d903fe4 h1:Gi+/O1saihwDqnlmC8Vhv1M5Sp4+rbOmK9TbsLn8ZEA=
+k8s.io/utils v0.0.0-20191010214722-8d271d903fe4/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
 modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
 modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
diff --git a/src/jetstream/plugins/kubernetes/go.mod b/src/jetstream/plugins/kubernetes/go.mod
index b4311fa436..4647567274 100644
--- a/src/jetstream/plugins/kubernetes/go.mod
+++ b/src/jetstream/plugins/kubernetes/go.mod
@@ -10,30 +10,26 @@ require (
 	github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 // indirect
 	github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces v0.0.0-00010101000000-000000000000
 	github.com/docker/docker v1.13.1 // indirect
-	github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
+	github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385 // indirect
+	github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484 // indirect
+	github.com/ghodss/yaml v1.0.0
+	github.com/gorilla/websocket v1.4.0
 	github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect
-	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
-	github.com/helm/monocular v1.4.0
 	github.com/helm/monocular/chartsvc v0.0.0-00010101000000-000000000000
 	github.com/heptio/authenticator v0.3.0 // indirect
-	github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4
 	github.com/kubernetes-sigs/aws-iam-authenticator v0.3.0
 	github.com/labstack/echo v3.3.10+incompatible
-	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f
 	github.com/russross/blackfriday v2.0.0+incompatible // indirect
 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
 	github.com/sirupsen/logrus v1.4.2
+	github.com/smartystreets/goconvey v1.6.4
 	github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245 // indirect
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/square/go-jose.v2 v2.2.2 // indirect
-	gopkg.in/yaml.v2 v2.2.2
-	helm.sh/helm/v3 v3.0.0-beta.4 // indirect
-	k8s.io/api v0.0.0
-	k8s.io/apimachinery v0.0.0
-	k8s.io/client-go v10.0.0+incompatible
-	k8s.io/helm v2.12.3+incompatible
-	k8s.io/klog v0.4.0
-	k8s.io/kubernetes v1.16.1
+	gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect
+	gopkg.in/yaml.v2 v2.2.4
+	helm.sh/helm/v3 v3.0.0
+	k8s.io/api v0.0.0-20191016110408-35e52d86657a
+	k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8
+	k8s.io/client-go v0.0.0-20191016111102-bec269661e48
 	vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 // indirect
 )
 
@@ -46,14 +42,4 @@ replace (
 	github.com/russross/blackfriday v2.0.0+incompatible => github.com/russross/blackfriday v1.5.2
 	github.com/sergi/go-diff => github.com/sergi/go-diff v1.0.0
 	github.com/spf13/cobra => github.com/spf13/cobra v0.0.3
-	k8s.io/api => k8s.io/api v0.0.0-20190222213804-5cb15d344471
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190221221350-bfb440be4b87
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628
-	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190221215341-5838f549963b
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190221221947-d8fee89e76ca
-	k8s.io/client-go => k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible
-	k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20191001043732-d647ddbd755f
-	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4
-	k8s.io/kubectl => k8s.io/kubectl v0.0.0-20191003004222-1f3c0cd90ca9
-	k8s.io/kubernetes => k8s.io/kubernetes v1.13.3
 )
diff --git a/src/jetstream/plugins/kubernetes/go.sum b/src/jetstream/plugins/kubernetes/go.sum
index 8ad79e5a3e..4af88b969f 100644
--- a/src/jetstream/plugins/kubernetes/go.sum
+++ b/src/jetstream/plugins/kubernetes/go.sum
@@ -3,6 +3,7 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
 contrib.go.opencensus.io/exporter/ocagent v0.2.0/go.mod h1:0fnkYHF+ORKj7HWzOExKkUHeFX79gXSKUQbpnAM+wzo=
 git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
+github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
 github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
 github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
@@ -29,36 +30,55 @@ github.com/Masterminds/sprig/v3 v3.0.0 h1:KSQz7Nb08/3VU9E4ns29dDxcczhOD1q7O1UfM4
 github.com/Masterminds/sprig/v3 v3.0.0/go.mod h1:NEUY/Qq8Gdm2xgYA+NwJM6wmfdRV9xkh8h/Rld20R0U=
 github.com/Masterminds/vcs v1.13.0/go.mod h1:N09YCmOQr6RLxC6UNHzuVwAdodYbbnycGHSmwVJjcKA=
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
+github.com/Microsoft/go-winio v0.4.12 h1:xAfWHN1IrQ0NJ9TBC0KBZoqLjzDTr1ML+4MywiUOryc=
 github.com/Microsoft/go-winio v0.4.12/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
+github.com/Microsoft/hcsshim v0.8.6 h1:ZfF0+zZeYdzMIVMZHKtDKJvLHj76XCuVae/jNkjj0IA=
 github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
+github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk=
+github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.0 h1:rmGxhojJlM0tuKtfdvliR84CFHljx9ag64t2xmVkjK4=
 github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/SermoDigital/jose v0.9.1 h1:atYaHPD3lPICcbK1owly3aPm0iaJGSGPi0WD4vLznv8=
 github.com/SermoDigital/jose v0.9.1/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA=
 github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc h1:MhBvG7RLaLqlyjxMR6of35vt6MVQ+eXMcgn9X/sy0FE=
 github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA=
+github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs=
 github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/aws/aws-sdk-go v1.17.5 h1:WW9Hm3KYo48iZHpmBc+b7sgyS0h32zgCvya28SLW4BU=
 github.com/aws/aws-sdk-go v1.17.5/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y=
 github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
 github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
+github.com/bshuster-repo/logrus-logstash-hook v0.4.1 h1:pgAtgj+A31JBVtEHu2uHuEx0n+2ukqUJnS2vVe5pQNA=
 github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
+github.com/bugsnag/bugsnag-go v1.5.0 h1:tP8hiPv1pGGW3LA6LKy5lW6WG+y9J2xWUdPd3WC452k=
 github.com/bugsnag/bugsnag-go v1.5.0/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
+github.com/bugsnag/panicwrap v1.2.0 h1:OzrKrRvXis8qEvOkfcxNcYbOd2O7xXS2nnKMEMABFQA=
 github.com/bugsnag/panicwrap v1.2.0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
 github.com/census-instrumentation/opencensus-proto v0.0.2-0.20180913191712-f303ae3f8d6a/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/census-instrumentation/opencensus-proto v0.1.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.1.0 h1:yTUvW7Vhb89inJ+8irsUqiWjh8iT6sQPZiQzI6ReGkA=
+github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM=
 github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
 github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 h1:HD4PLRzjuCVW79mQ0/pdsalOLHJ+FaEoqJLxfltpb2U=
 github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
@@ -69,10 +89,20 @@ github.com/cloudfoundry-incubator/stratos v2.0.0-beta-001+incompatible h1:UUxNbL
 github.com/cloudfoundry-incubator/stratos/src/jetstream v0.0.0-20190516104506-727fa3589a90 h1:IeIyBIgh2xEQm1CxHN2yFSBU7Ap+HQZleOs3TlAymI0=
 github.com/containerd/containerd v1.3.0-beta.2.0.20190823190603-4a2f61c4f2b4 h1:aMyA5J7j6D07U7pf8BFEY67BKoDcz0zWleAbQj3zVng=
 github.com/containerd/containerd v1.3.0-beta.2.0.20190823190603-4a2f61c4f2b4/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/containerd v1.3.0 h1:xjvXQWABwS2uiv3TWgQt5Uth60Gu86LTGZXMJkjc7rY=
+github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 h1:4BX8f882bXEDKfWIf0wa8HRvpnBoPszJJXL+TVbBw4M=
 github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
+github.com/coreos/bbolt v1.3.1-coreos.6/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
+github.com/coreos/etcd v3.3.15+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
+github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
+github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -80,6 +110,7 @@ github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1
 github.com/deislabs/oras v0.7.0 h1:RnDoFd3tQYODMiUqxgQ8JxlrlWL0/VMKIKRD01MmNYk=
 github.com/deislabs/oras v0.7.0/go.mod h1:sqMKPG3tMyIX9xwXUBRLhZ24o+uT4y6jgBD2RzUTKDM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/disintegration/imaging v1.6.0 h1:nVPXRUUQ36Z7MNf0O77UzgnOb1mkMMor7lmJMJXc/mA=
 github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ=
 github.com/docker/cli v0.0.0-20190506213505-d88565df0c2d h1:qdD+BtyCE1XXpDyhvn0yZVcZOLILdj9Cw4pKu0kQbPQ=
 github.com/docker/cli v0.0.0-20190506213505-d88565df0c2d/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
@@ -96,65 +127,133 @@ github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82 h1:X0fj836zx99zF
 github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI=
 github.com/docker/go-units v0.3.3 h1:Xk8S3Xj5sLGlG5g67hJmYMmUgXv5N4PhkjJHHqrwnTk=
 github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
+github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4=
 github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE=
+github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
 github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c h1:ZfSZ3P3BedhKGUhzj7BQlPSU4OvT6tfOKe3DVHzOA7s=
 github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
+github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
+github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385 h1:clC1lXBpe2kTj2VHdaIu9ajZQe4kcEY9j0NsnDDBZ3o=
+github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
+github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
+github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484 h1:pEtiCjIXx3RvGjlUJuCNxNOw0MNblyR9Wi+vJGBFh+8=
+github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
+github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2 h1:dWB6v3RcOy03t/bUadywsbyrQwCqZeNIEX6M1OtSZOM=
+github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
+github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/emicklei/go-restful v2.11.1+incompatible h1:CjKsv3uWcCMvySPQYKxO8XX3f9zD4FeZRsW4G0B4ffE=
+github.com/emicklei/go-restful v2.11.1+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/evanphx/json-patch v4.1.0+incompatible h1:K1MDoo4AZ4wU0GIU/fPmtZg7VpzLjCxu+UwBD1FvwOc=
 github.com/evanphx/json-patch v4.1.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch v4.2.0+incompatible h1:fUDGZCv/7iAN7u0puUVhvKCcsR6vRfwrJatElLBEf0I=
 github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M=
+github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
 github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
+github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/garyburd/redigo v1.6.0 h1:0VruCpn7yAIIu7pWVClQC8wxCJEcG3nyzpMSHKi1PQc=
 github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
+github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/go-inf/inf v0.9.1/go.mod h1:ZWwB6rTV+0pO94RdIMKue59tExzQp6/pj/BMuPQkXaA=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
+github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=
+github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
+github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
+github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk=
+github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
+github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
+github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
+github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
 github.com/go-openapi/jsonpointer v0.17.0 h1:nH6xp8XdXHx8dqveo0ZuJBluCO2qGrPbDNZ0dwoRHP0=
 github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
+github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 github.com/go-openapi/jsonpointer v0.19.2 h1:A9+F4Dc/MCNB5jibxf6rRvOvR/iFgQdyNx9eIhnGqq0=
 github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
+github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
+github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
 github.com/go-openapi/jsonreference v0.17.0 h1:yJW3HCkTHg7NOA+gZ83IPHzUSnUzGXhGmsdiCcMexbA=
 github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
+github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
 github.com/go-openapi/jsonreference v0.19.2 h1:o20suLFB4Ri0tuzpWtyHlh7E7HnkqTNLq6aR6WVNS1w=
 github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
+github.com/go-openapi/jsonreference v0.19.3 h1:5cxNfTy0UVC3X8JL5ymxzyoUZmo8iZb+jeTWn7tUa8o=
+github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
+github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
+github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
+github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
+github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs=
+github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA=
+github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64=
+github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
+github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
 github.com/go-openapi/spec v0.18.0 h1:aIjeyG5mo5/FrvDkpKKEGZPmF9MPHahS72mzfVqeQXQ=
 github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
 github.com/go-openapi/spec v0.19.2 h1:SStNd1jRcYtfKCN7R0laGNs80WYYvn5CbBjM2sOmCrE=
 github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
+github.com/go-openapi/spec v0.19.4 h1:ixzUSnHTd6hCemgtAJgluaTSGYpLNpJY4mA2DIkdOAo=
+github.com/go-openapi/spec v0.19.4/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
+github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
+github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
+github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY=
+github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
 github.com/go-openapi/swag v0.17.0 h1:iqrgMg7Q7SvtbWLlltPrkMs0UBJI6oTSs79JFRUi880=
 github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
+github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
 github.com/go-openapi/swag v0.19.2 h1:jvO6bCMBEilGwMfHhrd61zIID4oIFdwb76V17SM88dE=
 github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
+github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/gofrs/flock v0.7.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
+github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
 github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
+github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef h1:veQD95Isof8w9/WXiA+pa3tz3fJXkt5B7QaRBrM62gk=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 h1:uHTyIjqVhYRhLbJ8nIiOJHkEZZ+5YoOsAbD3sk82NiE=
+github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho=
 github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8=
 github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk=
@@ -164,12 +263,16 @@ github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
 github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf h1:+RRA9JqSOZFfKrOeqr2z77+8R2RKyh8PG66dcu1V0ck=
 github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
 github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.0 h1:Jf4mxPC/ziBnoPIdpQdPJ9OeiomAUHLvxmPRSPH9m4s=
 github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
@@ -178,9 +281,14 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+
 github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhpy9g=
 github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
+github.com/googleapis/gnostic v0.3.1 h1:WeAefnSUHlBb0iJKwxFDZdbfGwkd7xRNuV+IpXMJhYk=
+github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU=
 github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZsA=
 github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U=
 github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
@@ -194,16 +302,21 @@ github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY=
 github.com/gosuri/uitable v0.0.1/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/govau/cf-common v0.0.7 h1:uhp1P6XM6GGzu1+A4C7LELLX/9mCmH6W5DpJZC0kWmo=
 github.com/govau/cf-common v0.0.7/go.mod h1:5xL/OfE7wxeyHlXb7iei0rAbdQ/5v6dF18BZknPv7NQ=
+github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc h1:f8eY6cV/x1x+HLjOp4r72s/31/V2aTUtg5oKRRPf8/Q=
 github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
+github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
 github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
 github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.3 h1:YPkqC67at8FYaadspW/6uE0COsBxS2656RLEr8Bppgk=
+github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/helm/monocular v1.4.0 h1:g0sOpuMe+9u+aPfd9ZO8mWV+c8W0dfGyBG9Wl23nwec=
 github.com/helm/monocular v1.4.0/go.mod h1:PpkCN0v4zVVigsIHnsQdJytKFmaUkwfhxB7z33a9/gE=
 github.com/helm/monocular v1.5.0 h1:y8anOb2XLsCluYNOPx01G6EPqyBZ9fxDi+9BKbesULE=
@@ -213,31 +326,46 @@ github.com/heptio/authenticator v0.3.0 h1:Xh6XWkLZ+CksGuky+vsr77mHnI9C4L3nwj+xuZ
 github.com/heptio/authenticator v0.3.0/go.mod h1:Q86X8hc61JXhE5XxYLKmrSRWby/Oe8IIYZIBgmGVkTA=
 github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40 h1:GT4RsKmHh1uZyhmTkWJTDALRjSHYQp6FRKrotf0zhAs=
 github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40/go.mod h1:NtmN9h8vrTveVQRLHcX2HQ5wIPBDCsZ351TGbZWgg38=
+github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0=
 github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4=
+github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI=
 github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/imdario/mergo v0.3.8 h1:CGgOkSJeqMRmt0D9XLWExdT4m4F1vd3FV3VPt+0VxkQ=
+github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.5 h1:gL2yXlmiIo4+t+y32d4WGwOjKGYcGOuyrg46vadswDE=
 github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.8 h1:QiWkFLKq0T7mpzwOTu6BzNDbfTE8OLrYhVKYMLF46Ok=
+github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 h1:PJPDf8OUfOK1bb/NeTKd4f1QXZItOX389VN3B6qC8ro=
 github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 h1:wdTBUArlqtBYGN2Dd4+zsaFxFH0m4iGCHToW10jPX0k=
 github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
@@ -253,10 +381,15 @@ github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
 github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
+github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 h1:2gxZ0XQIU/5z3Z3bUBu+FXuk2pFbkN6tcwi/pjyaDic=
 github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63 h1:nTT4s92Dgz2HlrB2NaMgvlfqHH39OgMhA7z3PK7PGD4=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=
+github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
 github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
@@ -268,6 +401,7 @@ github.com/mattn/go-shellwords v1.0.5/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vq
 github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/miekg/dns v0.0.0-20181005163659-0d29b283ac0f h1:wVzAD6PG9MIDNQMZ6zc2YpzE/9hhJ3EN+b+a4B1thVs=
 github.com/miekg/dns v0.0.0-20181005163659-0d29b283ac0f/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
@@ -283,60 +417,85 @@ github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309/go.mod h1:fDXVQ6+S340v
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c h1:nXxl5PrvVm2L/wCy8dQu6DMTwH4oIuGN8GJDAlqDdVE=
 github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
+github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
+github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo=
+github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
+github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI=
 github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
+github.com/opencontainers/runc v0.1.1 h1:GlxAyO6x8rfZYN9Tt0Kti5a/cP41iuiO2yYT0IJGY8Y=
 github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830 h1:yvQ/2Pupw60ON8TYEIGGTAI77yZsWYkiOeHFZWkwlCk=
 github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
+github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/petar/GoLLRB v0.0.0-20130427215148-53be0d36a84c/go.mod h1:HUpKUBZnpzkdx0kD/+Yfuft+uD3zHGtXF/XJB14TUr4=
 github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
+github.com/phayes/freeport v0.0.0-20171002181615-b8543db493a5 h1:rZQtoozkfsiNs36c7Tdv/gyGNzD1X1XWKO8rptVNZuM=
 github.com/phayes/freeport v0.0.0-20171002181615-b8543db493a5/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
 github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=
 github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.2.1 h1:JnMpQc6ppsNgw9QPAGF6Dod479itz7lvlsMzzNayLOI=
+github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.2.0 h1:kUZDBDTdBVBYBj5Tmh2NZLlF60mfjA27rM34b+cVwNU=
 github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.7.0 h1:L+1lyG48J1zAQXA3RBX/nG/B3gjlHq0zTt2tlbJLyCY=
+github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
 github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190129233650-316cf8ccfec5 h1:Etei0Wx6pooT/DeOKcGTr1M/01ggz95Ajq8BBwCOKBU=
 github.com/prometheus/procfs v0.0.0-20190129233650-316cf8ccfec5/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8=
+github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
 github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
+github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
 github.com/rubenv/sql-migrate v0.0.0-20190902133344-8926f37f0bc1/go.mod h1:WS0rl9eEliYI8DPnr3TOwz4439pay+qNgzJoVya/DmY=
 github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday v2.0.0 h1:L7Oc72h7rDqGkbUorN/ncJ4N/y220/YRezHvBoKLOFA=
-github.com/russross/blackfriday v2.0.0/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday v2.0.0+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/russross/blackfriday v2.0.0/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
@@ -344,23 +503,35 @@ github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME
 github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/square/go-jose v2.3.0+incompatible/go.mod h1:7MxpAF/1WTVUu8Am+T5kNy+t0902CaLWM4Z745MkOa8=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245 h1:DNVk+NIkGS0RbLkjQOLCJb/759yfCysThkMbl7EXxyY=
 github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245/go.mod h1:O1c8HleITsZqzNZDjSNzirUGsMT0oGu9LhHKoJrqO+A=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/unrolled/render v1.0.0 h1:XYtvhA3UkpB7PqkvhUFYmpKD55OudoIeygcfus4vcd4=
 github.com/unrolled/render v1.0.0/go.mod h1:tu82oB5W2ykJRVioYsB+IQKcft7ryBr7w12qMBUPyXg=
 github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
@@ -376,23 +547,35 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:
 github.com/xeipuuv/gojsonschema v1.1.0 h1:ngVtJC9TY/lg0AA/1k48FYhBrhRoFlEmWzsehpNAaZg=
 github.com/xeipuuv/gojsonschema v1.1.0/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
 github.com/xenolf/lego v0.0.0-20160613233155-a9d8cec0e656/go.mod h1:fwiGnfsIjG7OHPfOvgK7Y/Qo6+2Ox0iozjNTkZICKbY=
+github.com/xenolf/lego v0.3.2-0.20160613233155-a9d8cec0e656 h1:BTvU+npm3/yjuBd53EvgiFLl5+YLikf2WvHsjRQ4KrY=
 github.com/xenolf/lego v0.3.2-0.20160613233155-a9d8cec0e656/go.mod h1:fwiGnfsIjG7OHPfOvgK7Y/Qo6+2Ox0iozjNTkZICKbY=
+github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 h1:p7OofyZ509h8DmPLh8Hn+EIIZm/xYhdZHJ9GnXHdr6U=
 github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
+github.com/yvasiyarov/gorelic v0.0.6 h1:qMJQYPNdtJ7UNYHjX38KXZtltKTqimMuoQjNnSVIuJg=
 github.com/yvasiyarov/gorelic v0.0.6/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA=
+github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f h1:ERexzlUfuTvpE74urLSbIQW0Z/6hF9t8U4NsJLaioAY=
 github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
 go.opencensus.io v0.17.0/go.mod h1:mp1VrMQxhlqqDpKvH4UcQUa4YwlzNmymAjPrDdfxNpI=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7 h1:0hQKqeLdqlt5iIwVOBErRisrHJAN57yOiPRQItI20fU=
 golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152 h1:ZC1Xn5A1nlpSmQCIva4bZ3ob3lmhYIefc+GU+DLg1Ow=
+golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067 h1:KYGJGHOQy8oSi1fDlSpcZF0+juKwk/hEMv5SiwHogR0=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -401,6 +584,7 @@ golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTk
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -413,11 +597,18 @@ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190225153610-fe579d43d832 h1:2IdId8zoI92l1bUzjAOygcAOkmCe13HY1j0rqPPPzB8=
 golang.org/x/net v0.0.0-20190225153610-fe579d43d832/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc h1:gkKoSkUmnU6bpS/VhkuO27bzQeSA51uaEfbOW5dNb68=
 golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271 h1:N66aaryRB3Ax92gH0v3hp1QYZ3zWWCCUR/j8Ifh45Ss=
+golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226191147-529b322ea346 h1:zxGQKdHVCsCsJpbd7ijKsVC27CyETheUBql7Br2TGmA=
 golang.org/x/oauth2 v0.0.0-20190226191147-529b322ea346/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -430,6 +621,7 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -440,11 +632,17 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f h1:25KHgbfyiSm6vwQLbM3zZIe1v9p/3ea4Rz+nnM5K/i4=
 golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191028164358-195ce5e7f934 h1:u/E0NqCIWRDAo9WCFo6Ko49njPFDLSd3z+X1HgWDMpE=
+golang.org/x/sys v0.0.0-20191028164358-195ce5e7f934/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -452,9 +650,12 @@ golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -462,6 +663,7 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
@@ -475,6 +677,8 @@ google.golang.org/api v0.6.1-0.20190607001116-5213b8090861/go.mod h1:btoxGiFvQNV
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
@@ -483,6 +687,8 @@ google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRn
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 h1:nfPFGzJkUDX6uBmpN/pSw7MbOAWegH5QDQuoXFHedLg=
 google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20191028173616-919d9bdd9fe6 h1:UXl+Zk3jqqcbEVV7ace5lrt4YdA4tXiz3f/KbmD29Vo=
+google.golang.org/genproto v0.0.0-20191028173616-919d9bdd9fe6/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.15.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
 google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
@@ -491,24 +697,39 @@ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.23.0 h1:AzbTB6ux+okLTzP8Ru1Xs41C303zdcfEht7MQnYJt5A=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.24.0 h1:vb/1TCsVn3DcJlQ0Gs1yB1pKI6Do2/QNwxdKqmc/b0s=
+google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA=
+gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 h1:FVCohIoYO7IJoDDVpV2pdq7SgrMH6wHnuTyrdrxJNoY=
+gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0/go.mod h1:OdE7CF6DbADk7lN8LIKRzRJTTZXIjtWgA5THM5lhBAw=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/gorp.v1 v1.7.2/go.mod h1:Wo3h+DBQZIxATwftsglhdD/62zRFPhGhTiu5jUJmCaw=
+gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
+gopkg.in/square/go-jose.v1 v1.1.2 h1:/5jmADZB+RiKtZGr4HxsEFOEfbfsjTKsVnqpThUpE30=
 gopkg.in/square/go-jose.v1 v1.1.2/go.mod h1:QpYS+a4WhS+DTlyQIi6Ka7MS3SuR9a055rgXNEe6EiA=
 gopkg.in/square/go-jose.v2 v2.2.2 h1:orlkJ3myw8CN1nVQHBFfloD+L3egixIa4FvUP6RosSA=
 gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 helm.sh/helm v2.14.3+incompatible h1:M3xvix8x41Xjc/ZGARGpUOTjxTBrb86yZG5FmCjgIew=
 helm.sh/helm/v3 v3.0.0-beta.4 h1:gK5iJztTqr4Ai712LSS2fxqaW2b635GxunkBinEBCXY=
 helm.sh/helm/v3 v3.0.0-beta.4/go.mod h1:ZQ5l9gLmS7attkwdVKXxygj84XE4dzZIdr3frQ9H7No=
+helm.sh/helm/v3 v3.0.0 h1:or/9cs1GgfcTQeEnR2CVJNw893/rmqIG1KsNHmUiSFw=
+helm.sh/helm/v3 v3.0.0/go.mod h1:sI7B9yfvMgxtTPMWdk1jSKJ2aa59UyP9qhPydqW6mgo=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -518,58 +739,94 @@ k8s.io/api v0.0.0-20190222213804-5cb15d344471 h1:MzQGt8qWQCR+39kbYRd0uQqsvSidpYq
 k8s.io/api v0.0.0-20190222213804-5cb15d344471/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
 k8s.io/api v0.0.0-20190226013409-f951fa7b8c72 h1:4wrH+M4Kpkbbjs4UzT7XOvuhgBczsd4eXfBn9T5WqKk=
 k8s.io/api v0.0.0-20190226013409-f951fa7b8c72/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
+k8s.io/api v0.0.0-20191016110408-35e52d86657a h1:VVUE9xTCXP6KUPMf92cQmN88orz600ebexcRRaBTepQ=
+k8s.io/api v0.0.0-20191016110408-35e52d86657a/go.mod h1:/L5qH+AD540e7Cetbui1tuJeXdmNhO8jM6VkXeDdDhQ=
+k8s.io/api v0.0.0-20191115135540-bbc9463b57e5 h1:o1kKo74JxBOOhxPdKzTx54MJHwu+Z6Lv5/1tu8Qf9eM=
+k8s.io/api v0.0.0-20191115135540-bbc9463b57e5/go.mod h1:iA/8arsvelvo4IDqIhX4IbjTEKBGgvsf2OraTuRtLFU=
 k8s.io/apiextensions-apiserver v0.0.0-20190221221350-bfb440be4b87 h1:BMfPZfi3CkPd9e9Qbm+/AFgE6qXWQcbzUvC91LR3m7w=
 k8s.io/apiextensions-apiserver v0.0.0-20190221221350-bfb440be4b87/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE=
 k8s.io/apiextensions-apiserver v0.0.0-20190225215027-42f453e3c54a h1:+yPI0R62TeitWAXHh5K5xVQrUF1JQwK+nrl5Lz6213E=
 k8s.io/apiextensions-apiserver v0.0.0-20190225215027-42f453e3c54a/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE=
+k8s.io/apiextensions-apiserver v0.0.0-20191016113550-5357c4baaf65 h1:kThoiqgMsSwBdMK/lPgjtYTsEjbUU9nXCA9DyU3feok=
+k8s.io/apiextensions-apiserver v0.0.0-20191016113550-5357c4baaf65/go.mod h1:5BINdGqggRXXKnDgpwoJ7PyQH8f+Ypp02fvVNcIFy9s=
 k8s.io/apimachinery v0.0.0-20190117220443-572dfc7bdfcb h1:+mNFBkhBgd0wFJ1K18cOYw3LVW7aMIM/pazb4i44aS0=
 k8s.io/apimachinery v0.0.0-20190117220443-572dfc7bdfcb/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
 k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628 h1:UYfHH+KEF88OTg+GojQUwFTNxbxwmoktLwutUzR0GPg=
 k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
 k8s.io/apimachinery v0.0.0-20190223094358-dcb391cde5ca h1:rOczZwIfERvL7YLSQ96uI3NUYamzdK/MmSDIfChQRBk=
 k8s.io/apimachinery v0.0.0-20190223094358-dcb391cde5ca/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
+k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8 h1:Iieh/ZEgT3BWwbLD5qEKcY06jKuPEl6zC7gPSehoLw4=
+k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8/go.mod h1:llRdnznGEAqC3DcNm6yEj472xaFVfLM7hnYofMb12tQ=
+k8s.io/apimachinery v0.0.0-20191115015347-3c7067801da2 h1:TSH6UZ+y3etc/aDbVqow1NT8o7SJXkxhLKbp3Ywhyvg=
+k8s.io/apimachinery v0.0.0-20191115015347-3c7067801da2/go.mod h1:dXFS2zaQR8fyzuvRdJDHw2Aerij/yVGJSre0bZQSVJA=
 k8s.io/apiserver v0.0.0-20190221215341-5838f549963b h1:yFFYCR/UVj6hsYX6yRbY3CJ3917NF7tn0hwcdUil1aI=
 k8s.io/apiserver v0.0.0-20190221215341-5838f549963b/go.mod h1:6bqaTSOSJavUIXUtfaR9Os9JtTCm8ZqH2SUl2S60C4w=
 k8s.io/apiserver v0.0.0-20190225213950-239e48e34c98 h1:aC93uSkvMU+AbozPRy72NtzFi7lefwzh4jKNuJZ8+ug=
 k8s.io/apiserver v0.0.0-20190225213950-239e48e34c98/go.mod h1:6bqaTSOSJavUIXUtfaR9Os9JtTCm8ZqH2SUl2S60C4w=
+k8s.io/apiserver v0.0.0-20191016112112-5190913f932d/go.mod h1:7OqfAolfWxUM/jJ/HBLyE+cdaWFBUoo5Q5pHgJVj2ws=
 k8s.io/cli-runtime v0.0.0-20190221221947-d8fee89e76ca h1:UbXBTjFC1Yy5SDU8TPLVay3znB6yrlCo7Yq/q1VdESQ=
 k8s.io/cli-runtime v0.0.0-20190221221947-d8fee89e76ca/go.mod h1:qWnH3/b8sp/l7EvlDh7ulDU3UWA4P4N1NFbEEP791tM=
 k8s.io/cli-runtime v0.0.0-20190223141024-b5efea9a9c9c h1:fOmiMKsuY198ukXcZMRhEEQGYhVFhwCHn2j/fMExtcA=
 k8s.io/cli-runtime v0.0.0-20190223141024-b5efea9a9c9c/go.mod h1:qWnH3/b8sp/l7EvlDh7ulDU3UWA4P4N1NFbEEP791tM=
+k8s.io/cli-runtime v0.0.0-20191016114015-74ad18325ed5 h1:8ZfMjkMBzcXEawLsYHg9lDM7aLEVso3NiVKfUTnN56A=
+k8s.io/cli-runtime v0.0.0-20191016114015-74ad18325ed5/go.mod h1:sDl6WKSQkDM6zS1u9F49a0VooQ3ycYFBFLqd2jf2Xfo=
+k8s.io/client-go v0.0.0-20191016111102-bec269661e48 h1:C2XVy2z0dV94q9hSSoCuTPp1KOG7IegvbdXuz9VGxoU=
+k8s.io/client-go v0.0.0-20191016111102-bec269661e48/go.mod h1:hrwktSwYGI4JK+TJA3dMaFyyvHVi/aLarVHpbs8bgCU=
 k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible h1:xkYgpj1zwmLkSh7QASe/GUMTyjPI3hwHy7k/RcQSp2A=
 k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
 k8s.io/client-go v10.0.0+incompatible h1:F1IqCqw7oMBzDkqlcBymRq1450wD0eNqLE9jzUrIi34=
 k8s.io/client-go v10.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
 k8s.io/code-generator v0.0.0-20190927045949-f81bca4f5e85/go.mod h1:V5BD6M4CyaN5m+VthcclXWsVcT1Hu+glwa1bi3MIsyE=
+k8s.io/code-generator v0.0.0-20191004115455-8e001e5d1894/go.mod h1:mJUgkl06XV4kstAnLHAIzJPVCOzVR+ZcfPIv4fUsFCY=
+k8s.io/component-base v0.0.0-20191003000551-f573d376509c/go.mod h1:VLMr8+SrOC4J3MDbbL7cjBDEPBcwLP9/kv/u8PVUEo4=
+k8s.io/component-base v0.0.0-20191016111319-039242c015a9/go.mod h1:SuWowIgd/dtU/m/iv8OD9eOxp3QZBBhTIiWMsBQvKjI=
+k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/helm v2.12.3+incompatible h1:wo1cdYjOnr5Z+LFuhtwIJaeQnec6D4gcg2H5UAKzY6w=
 k8s.io/helm v2.12.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
+k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.2.0 h1:0ElL0OHzF3N+OhoJTL0uca20SxtYt4X4+bzHeqrB83c=
 k8s.io/klog v0.2.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.4.0 h1:lCJCxf/LIowc2IGS9TPjWDyXY4nOmdGdfcwwDQCOURQ=
 k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
+k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
+k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4 h1:gW+EUB2I96nbxVenV/8ctfbACsHP+yxlT2dhMCsiy+s=
 k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
 k8s.io/kube-openapi v0.0.0-20190225204428-d50a959ae76a h1:x9PsbfKs/IaYsygEYCbR58UWoyxHQTeHjUDpy4o+QoE=
 k8s.io/kube-openapi v0.0.0-20190225204428-d50a959ae76a/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
+k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
+k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d h1:Xpe6sK+RY4ZgCTyZ3y273UmFmURhjtoJiwOMbQsXitY=
+k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
+k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a h1:UcxjrRMyNx/i/y8G7kPvLyy7rfbeuf1PYyBf973pgyU=
+k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
 k8s.io/kubectl v0.0.0-20191003004222-1f3c0cd90ca9 h1:fIRS0hFdUag6oW29mzbml8LOzXIFw6Pey2uRVT0vWsM=
 k8s.io/kubectl v0.0.0-20191003004222-1f3c0cd90ca9/go.mod h1:vRGcIHH2xhkOt8KjrcyJGt6tJYopGswaRENLPPG3jvQ=
+k8s.io/kubectl v0.0.0-20191016120415-2ed914427d51 h1:RBkTKVMF+xsNsSOVc0+HdC0B5gD1sr6s6Cu5w9qNbuQ=
+k8s.io/kubectl v0.0.0-20191016120415-2ed914427d51/go.mod h1:gL826ZTIfD4vXTGlmzgTbliCAT9NGiqpCqK2aNYv5MQ=
 k8s.io/kubernetes v1.13.3 h1:46t44D87wKtdKFgr/lXM60K8xPrW0wO67Woof3Vsv6E=
 k8s.io/kubernetes v1.13.3/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
 k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20191001043732-d647ddbd755f/go.mod h1:spPP+vRNS8EsnNNIhFCZTTuRO3XhV1WoF18HJySoZn8=
 k8s.io/metrics v0.0.0-20191003002233-837aead57baf/go.mod h1:3nppwBBAvxwYOuLha+uf3pQfBRBUT8unkiBEU3EH7/U=
+k8s.io/metrics v0.0.0-20191016113814-3b1a734dba6e/go.mod h1:ve7/vMWeY5lEBkZf6Bt5TTbGS3b8wAxwGbdXAsufjRs=
 k8s.io/utils v0.0.0-20190221042446-c2654d5206da h1:ElyM7RPonbKnQqOcw7dG2IK5uvQQn3b/WPHqD5mBvP4=
 k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=
 k8s.io/utils v0.0.0-20190801114015-581e00157fb1 h1:+ySTxfHnfzZb9ys375PXNlLhkJPLKgHajBU0N62BDvE=
 k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
+k8s.io/utils v0.0.0-20191010214722-8d271d903fe4 h1:Gi+/O1saihwDqnlmC8Vhv1M5Sp4+rbOmK9TbsLn8ZEA=
+k8s.io/utils v0.0.0-20191010214722-8d271d903fe4/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
 modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
 modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
 modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
 modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
+rsc.io/letsencrypt v0.0.1 h1:DV0d09Ne9E7UUa9ZqWktZ9L2VmybgTgfq7xlfFR/bbU=
 rsc.io/letsencrypt v0.0.1/go.mod h1:buyQKZ6IXrRnB7TdkHP0RyEybLx18HHyOSoTyoOLqNY=
+sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
 sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
+sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
+sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA=
 sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 h1:O69FD9pJA4WUZlEwYatBEEkRWKQ5cKodWpdKTrCS/iQ=
diff --git a/src/jetstream/plugins/kubernetes/helm/release.go b/src/jetstream/plugins/kubernetes/helm/release.go
new file mode 100644
index 0000000000..d6de857e31
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/helm/release.go
@@ -0,0 +1,378 @@
+package helm
+
+import (
+	"bufio"
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	//	"io"
+	"strings"
+
+	log "github.com/sirupsen/logrus"
+	"helm.sh/helm/v3/pkg/release"
+	appsv1 "k8s.io/api/apps/v1"
+	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+
+	// kyaml "k8s.io/apimachinery/pkg/util/yaml"
+	"k8s.io/client-go/kubernetes/scheme"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+)
+
+type HelmRelease struct {
+	*release.Release
+	Endpoint      string            `json:"-"`
+	User          string            `json:"-"`
+	Extra         string            `json:"extra"`
+	HelmManifest  []runtime.Object  `json:"helmManifest"`
+	Resources     []interface{}     `json:"resources"`
+	KubeResources []KubeResource    `json:"-"`
+	ResourceNames map[string]bool   `json:"-"`
+	Jobs          []KubeResourceJob `json:"-"`
+	PodJobs       []KubeResourceJob `json:"-"`
+}
+
+type KubeResource struct {
+	Kind       string `yaml:"kind" json:"kind"`
+	APIVersion string `yaml:"apiVersion" json:"apiVersion"`
+	Metadata   struct {
+		Name string `yaml:"name" json:"name"`
+	} `yaml:"metadata" json:"metadata"`
+	Spec interface{} `yaml:"spec"`
+}
+
+// type KubeLabelSelectorRequirement struct {
+// 	Key      string                       `yaml:"key"`
+// 	Operator metav1.LabelSelectorOperator `yaml:"operator"`
+// 	Values   []string                     `yaml:values"`
+// }
+
+// type KubeDeploymentResource struct {
+// 	Spec struct {
+// 		Selector struct {
+// 			MatchLabels map[string]string `yaml:"matchLabels"`
+// 			// matchExpressions is a list of label selector requirements. The requirements are ANDed.
+// 			// +optional
+// 			MatchExpressions []KubeLabelSelectorRequirement `yaml:"matchExpressions"`
+// 		} `yaml:"selector"`
+// 	} `yaml:"spec"`
+// }
+
+// KubeResourceJob = Resource(s) that we need to go and fetch
+type KubeResourceJob struct {
+	ID         string
+	Kind       string
+	APIVersion string
+	Name       string
+	Namespace  string
+	Endpoint   string
+	User       string
+	URL        string
+	Parent     string
+}
+
+// KubeResourceJobResult is the result from a job
+type KubeResourceJobResult struct {
+	KubeResourceJob
+	StatusCode int
+	Data       json.RawMessage
+}
+
+// NewHelmRelease represents extended info about a Helm Release
+func NewHelmRelease(info *release.Release, endpoint, user string) *HelmRelease {
+	r := &HelmRelease{
+		Release:  info,
+		Endpoint: endpoint,
+		User:     user,
+	}
+	r.ResourceNames = make(map[string]bool)
+	r.HelmManifest = make([]runtime.Object, 0)
+
+	r.parseManifest()
+	return r
+}
+
+func (r *HelmRelease) parseManifest() {
+	// Parse the release manifest from the Helm release
+	reader := bytes.NewReader([]byte(r.Manifest))
+	buffer := bufio.NewReader(reader)
+
+	var bufr strings.Builder
+	for {
+		line, err := buffer.ReadString('\n')
+		if err != nil || (err == nil && strings.TrimSpace(line) == "---") {
+			data := []byte(bufr.String())
+			if len(data) > 0 {
+				decode := scheme.Codecs.UniversalDeserializer().Decode
+				obj, _, err := decode([]byte(bufr.String()), nil, nil)
+
+				if err != nil {
+					log.Error(fmt.Sprintf("Error while decoding YAML object. Err was: %s", err))
+				} else {
+					r.processResource(obj)
+
+					// // TODO: Should be an easier way of doing this?
+					// j, err := json.Marshal(obj)
+					// if err != nil {
+					// 	log.Info("Can not marshal to JSON")
+					// } else {
+					// 	log.Info("CAN MARSHAL TO JSON")
+					// 	var t KubeResource
+					// 	if json.Unmarshal(j, &t) == nil {
+					// 		log.Warn("YES - GOT IT AS A KUBE RESOURCE")
+					// 		log.Warn(t.Metadata.Name)
+					// 	} else {
+					// 		log.Error("NO GO")
+					// 	}
+					// }
+				}
+
+				bufr.Reset()
+				line = ""
+			}
+		}
+
+		if err != nil {
+			break
+		}
+		bufr.WriteString(line)
+	}
+}
+
+func getResourceIdentifier(typeMeta metav1.TypeMeta, objectMeta metav1.ObjectMeta) string {
+	return fmt.Sprintf("%s-%s-%s", typeMeta.Kind, typeMeta.APIVersion, objectMeta.Name)
+}
+
+// process a yaml resource from the helm manifest
+func (r *HelmRelease) processResource(obj runtime.Object) {
+
+	r.HelmManifest = append(r.HelmManifest, obj)
+	r.Resources = append(r.Resources, obj)
+
+	// TODO: Should be an easier way of doing this?
+	j, err := json.Marshal(obj)
+	if err == nil {
+		log.Info("CAN MARSHAL TO JSON")
+		var t KubeResource
+		if json.Unmarshal(j, &t) == nil {
+			log.Infof("Got resource: %s : %s", t.Kind, t.Metadata.Name)
+
+			// Store the kube resource
+			r.KubeResources = append(r.KubeResources, t)
+
+			// Make a note of the resource name for lookup
+			//r.ResourceNames[getResourceIdentifier()] = true
+
+			// TODO: r.Resources
+
+			if t.Kind == "Deployment" || t.Kind == "StatefulSet" || t.Kind == "DaemonSet" {
+				log.Warnf("Getting selectors for %s", t.Kind)
+				r.processDeployment(t, obj)
+			}
+			r.addJobForResource(t)
+		} else {
+			log.Error("NO GO")
+		}
+	}
+}
+
+func (r *HelmRelease) addJobForResource(t KubeResource) {
+	job := KubeResourceJob{
+		ID:         fmt.Sprintf("%s-%s#Pods", t.Kind, t.Metadata.Name),
+		Endpoint:   r.Endpoint,
+		User:       r.User,
+		Namespace:  r.Namespace,
+		Name:       t.Metadata.Name,
+		URL:        getRestURL(r.Namespace, t),
+		APIVersion: t.APIVersion,
+		Kind:       t.Kind,
+	}
+	r.Jobs = append(r.Jobs, job)
+}
+
+func (r *HelmRelease) processDeployment(kres KubeResource, obj runtime.Object) {
+	switch o := obj.(type) {
+	case *appsv1.Deployment:
+		log.Warn("Deployment")
+		log.Info(o.Spec.Selector)
+		r.processPodSelector(kres, o.Spec.Selector)
+	case *appsv1.StatefulSet:
+		log.Warn("Statefulset")
+		r.processPodSelector(kres, o.Spec.Selector)
+	case *appsv1.DaemonSet:
+		log.Warn("DaemonSet")
+		r.processPodSelector(kres, o.Spec.Selector)
+	default:
+		// Ignore
+	}
+}
+
+func (r *HelmRelease) processPodSelector(kres KubeResource, selector *metav1.LabelSelector) {
+	qs := podSelectorToQueryString(selector)
+
+	// Add a job to get the pods in this deployment
+	job := KubeResourceJob{
+		ID:        fmt.Sprintf("%s-%s#Pods", kres.Kind, kres.Metadata.Name),
+		Parent:    fmt.Sprintf("%s-%s", kres.Kind, kres.Metadata.Name),
+		URL:       fmt.Sprintf("/api/v1/namespaces/%s/pods%s", r.Namespace, qs),
+		Endpoint:  r.Endpoint,
+		User:      r.User,
+		Namespace: r.Namespace,
+	}
+
+	r.PodJobs = append(r.PodJobs, job)
+
+}
+
+// See: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+func podSelectorToQueryString(selector *metav1.LabelSelector) string {
+
+	qs := "?labelSelector="
+	ml := ""
+	sep := ""
+
+	// Match labels
+	for k, v := range selector.MatchLabels {
+		fmt.Printf("key[%s] value[%s]\n", k, v)
+		if len(ml) > 0 {
+			sep = ","
+		}
+
+		ml = fmt.Sprintf("%s%s%s%%3D%s", ml, sep, k, v)
+	}
+
+	// Now add set based match expressions
+	for _, v := range selector.MatchExpressions {
+		if len(ml) > 0 {
+			sep = ","
+		}
+		ml = fmt.Sprintf("%s%s%s+%s+%%28%s%%s29", ml, sep, v.Key, v.Operator, strings.Join(v.Values, "%%2C"))
+	}
+
+	if len(ml) > 0 {
+		return fmt.Sprintf("%s%s", qs, ml)
+	}
+
+	return ""
+}
+
+func (r *HelmRelease) GetPods(jetstream interfaces.PortalProxy) []v1.Pod {
+	var podList []v1.Pod
+
+	// This will be an array of pod lists
+	res := r.runJobs(jetstream, r.PodJobs)
+	for _, j := range res {
+		var list v1.PodList
+		err := json.Unmarshal(j.Data, &list)
+		if err == nil {
+			for _, pod := range list.Items {
+				podList = append(podList, pod)
+				r.processPodOwners(pod)
+			}
+		}
+	}
+
+	return podList
+}
+
+// Pods can be owned by a ReplicaSet - these are not represented in the manifest, as they
+// are created as part of the Deployment resource
+// Look through the pod and add the ReplicaSets to the manifest
+func (r *HelmRelease) processPodOwners(pod v1.Pod) {
+	for _, owner := range pod.ObjectMeta.OwnerReferences {
+		if owner.Kind == "ReplicaSet" {
+			resource := appsv1.ReplicaSet{}
+			resource.TypeMeta = metav1.TypeMeta{
+				Kind:       owner.Kind,
+				APIVersion: owner.APIVersion,
+			}
+			resource.ObjectMeta = metav1.ObjectMeta{
+				Name:      owner.Name,
+				Namespace: r.Namespace,
+			}
+			identifier := getResourceIdentifier(resource.TypeMeta, resource.ObjectMeta)
+			if _, ok := r.ResourceNames[identifier]; !ok {
+				r.Resources = append(r.Resources, resource)
+				//r.HelmResources = append(r.HelmResources, resource)
+
+				r.ResourceNames[identifier] = true
+
+				// TODO: Need a KubrResource
+				// r.addJobForResource(resource)
+			}
+		} else {
+			log.Warn("Unexpected Pod owner kind: %s", owner.Kind)
+		}
+	}
+}
+
+func (r *HelmRelease) GetResources(jetstream interfaces.PortalProxy) []json.RawMessage {
+	var resourceList []json.RawMessage
+
+	// This will be an array of resources
+	res := r.runJobs(jetstream, r.Jobs)
+	for _, j := range res {
+		resourceList = append(resourceList, j.Data)
+	}
+
+	return resourceList
+}
+
+func (r *HelmRelease) runJobs(jetstream interfaces.PortalProxy, jobs []KubeResourceJob) []KubeResourceJobResult {
+	count := len(jobs)
+	var res []KubeResourceJobResult
+
+	kubeJobs := make(chan KubeResourceJob, count)
+	kubeResults := make(chan KubeResourceJobResult, count)
+
+	for w := 1; w <= 4; w++ {
+		go r.restWorker(jetstream, w, kubeJobs, kubeResults)
+	}
+
+	for _, j := range jobs {
+		kubeJobs <- j
+	}
+
+	close(kubeJobs)
+
+	var v KubeResourceJobResult
+
+	for a := 1; a <= count; a++ {
+		v = <-kubeResults
+		res = append(res, v)
+	}
+
+	return res
+}
+
+func (r *HelmRelease) restWorker(jetstream interfaces.PortalProxy, id int, jobs <-chan KubeResourceJob, results chan<- KubeResourceJobResult) {
+	for j := range jobs {
+		response, err := jetstream.DoProxySingleRequest(j.Endpoint, j.User, "GET", j.URL, nil, nil)
+		log.Info(response.StatusCode)
+		res := KubeResourceJobResult{
+			KubeResourceJob: j,
+			StatusCode:      response.StatusCode,
+			Data:            json.RawMessage(response.Response),
+		}
+
+		if err != nil {
+			log.Error("COULD NOT MAKE API REQUEST")
+		}
+		results <- res
+	}
+}
+
+func getRestURL(namespace string, resource KubeResource) string {
+	var restURL string
+	base := "api"
+	name := resource.Metadata.Name
+	if len(strings.Split(resource.APIVersion, "/")) > 1 {
+		base = "apis"
+		name += "/status"
+	}
+	restURL = fmt.Sprintf("/%s/%s/namespaces/%s/%ss/%s", base, resource.APIVersion, namespace, strings.ToLower(resource.Kind), name)
+	return restURL
+}
diff --git a/src/jetstream/plugins/kubernetes/helm/release_graph.go b/src/jetstream/plugins/kubernetes/helm/release_graph.go
new file mode 100644
index 0000000000..f6a5e3387e
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/helm/release_graph.go
@@ -0,0 +1,77 @@
+package helm
+
+import (
+	"encoding/json"
+	"fmt"
+
+	log "github.com/sirupsen/logrus"
+)
+
+type HelmReleaseGraph struct {
+	Release *HelmRelease           `json:"-"`
+	Nodes   map[string]ReleaseNode `json:"nodes"`
+	Links   map[string]ReleaseLink `json:"links"`
+}
+
+type ReleaseNode struct {
+	ID    string `json:"id"`
+	Label string `json:"label"`
+	Data  struct {
+		Kind   string `json:"kind"`
+		Status string `json:"status"`
+	} `json:"data"`
+}
+
+type ReleaseLink struct {
+	ID     string `json:"id"`
+	Source string `json:"source"`
+	Target string `json:"target"`
+}
+
+// NewHelmReleaseGraph represents graph of the Helm Release
+func NewHelmReleaseGraph(release *HelmRelease) *HelmReleaseGraph {
+	r := &HelmReleaseGraph{
+		Release: release,
+	}
+	r.Nodes = make(map[string]ReleaseNode)
+	r.Links = make(map[string]ReleaseLink)
+	return r
+}
+
+// ParseManifest
+func (r *HelmReleaseGraph) ParseManifest(manifest []KubeResource) {
+
+	// An array of Kubernetes resources should be passed in
+
+	log.Warn("Graph:: Parse Manifest")
+	log.Warn(len(manifest))
+
+	for _, item := range manifest {
+		log.Warn(item.Kind)
+
+		node := ReleaseNode{
+			ID:    fmt.Sprintf("%s-%s", item.Kind, item.Metadata.Name),
+			Label: item.Metadata.Name,
+		}
+
+		node.Data.Kind = item.Kind
+		node.Data.Status = "unknown"
+
+		// Add or replace the node in the map
+		r.Nodes[node.ID] = node
+
+		if item.Kind == "Deployment" {
+			log.Info("Parsing deployment")
+			log.Infof("%+v", item.Spec)
+
+			// Covnert the spec back to json
+			js, err := json.Marshal(item.Spec)
+			if err != nil {
+				log.Error("Can not marhsal deployment")
+			} else {
+				log.Warn(string(js))
+			}
+		}
+	}
+
+}
diff --git a/src/jetstream/plugins/kubernetes/helm/release_test.go b/src/jetstream/plugins/kubernetes/helm/release_test.go
new file mode 100644
index 0000000000..4b0fdbaf86
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/helm/release_test.go
@@ -0,0 +1,29 @@
+package helm
+
+import (
+	"testing"
+
+	. "github.com/smartystreets/goconvey/convey"
+
+	log "github.com/sirupsen/logrus"
+)
+
+func TestPodSelector(t *testing.T) {
+
+	Convey("TestPodSelector", t, func() {
+
+		t1 := KubeDeploymentResource{}
+		t1.Spec.Selector.MatchLabels = make(map[string]string)
+		t1.Spec.Selector.MatchLabels["environemnt"] = "dev"
+
+		res := podSelectorToQueryString(t1)
+
+		log.Info(res)
+
+		// So(ArrayContainsString(str1, "two"), ShouldBeTrue)
+		// So(ArrayContainsString(str1, "four"), ShouldBeFalse)
+		// So(ArrayContainsString(str1, ""), ShouldBeFalse)
+		// So(ArrayContainsString(nil, "test"), ShouldBeFalse)
+	})
+
+}
diff --git a/src/jetstream/plugins/kubernetes/helm_client.go b/src/jetstream/plugins/kubernetes/helm_client.go
index ccc26b9894..77cfda9ebc 100644
--- a/src/jetstream/plugins/kubernetes/helm_client.go
+++ b/src/jetstream/plugins/kubernetes/helm_client.go
@@ -3,19 +3,16 @@ package kubernetes
 import (
 	"errors"
 	"io/ioutil"
-	"path"
+	"os"
+	"time"
 
 	log "github.com/sirupsen/logrus"
 
 	"k8s.io/apimachinery/pkg/api/meta"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
-	"k8s.io/cli-runtime/pkg/resource"
 	"k8s.io/client-go/discovery"
-	cached "k8s.io/client-go/discovery/cached"
-	"k8s.io/client-go/kubernetes"
+	diskcached "k8s.io/client-go/discovery/cached/disk"
+	"k8s.io/client-go/restmapper"
 	"k8s.io/client-go/tools/clientcmd"
-	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
-	"k8s.io/kubectl/pkg/validation"
 
 	restclient "k8s.io/client-go/rest"
 
@@ -28,56 +25,64 @@ import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
 )
 
+// HelmConfiguration stores any resources that need to be cleaned up after use
+type HelmConfiguration struct {
+	Folder string
+}
+
+// Cleanup any resources associated with the Helm configuration
+func (f *HelmConfiguration) Cleanup() {
+	if len(f.Folder) > 0 {
+		os.RemoveAll(f.Folder)
+	}
+}
+
 // GetHelmConfiguration - gets a Helm V3 client for using it as a client library
-func (c *KubernetesSpecification) GetHelmConfiguration(endpointGUID, userID, namespace string) (*action.Configuration, error) {
+func (c *KubernetesSpecification) GetHelmConfiguration(endpointGUID, userID, namespace string) (*action.Configuration, *HelmConfiguration, error) {
 	// Need to get a config object for the target endpoint
 	var p = c.portalProxy
 
+	hc := &HelmConfiguration{}
+
 	cnsiRecord, err := p.GetCNSIRecord(endpointGUID)
 	if err != nil {
-		return nil, errors.New("Helm: Can not get endpoint record")
+		return nil, hc, errors.New("Helm: Can not get endpoint record")
 	}
 
 	tokenRecord, ok := p.GetCNSITokenRecord(endpointGUID, userID)
 	if !ok {
-		return nil, errors.New("Helm: Can not get user token for endpoint")
+		return nil, hc, errors.New("Helm: Can not get user token for endpoint")
 	}
 
 	kubeconfigcontents, err := c.GetKubeConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRecord)
 	if err != nil {
 		log.Errorf("Helm: Could not get kubeconfig for endpoint: %s", err)
-		return nil, errors.New("Can not get Kubernetes config for specified endpoint")
+		return nil, hc, errors.New("Can not get Kubernetes config for specified endpoint")
 	}
 
 	// TODO: Some auth schemes needs to have the token refreshed - so we should do that first
 	// to ensure it is valid when we use it subsequently
 
-	// Temporary folder
-	//tempDir, err := ioutil.TempDir("", "helm-client-")
-
-	tempDir := "/Users/nwm/helm-client"
-	kubeConfigPath := path.Join(tempDir, "kubeconfig")
-
-	// Write kubeconfig to this folder
-	err = ioutil.WriteFile(kubeConfigPath, []byte(kubeconfigcontents), 0644)
+	hc.Folder, err = ioutil.TempDir("", "helm-client-")
 	if err != nil {
-		log.Errorf("Helm: Could not get kubeconfig for endpoint: %s", err)
-		return nil, errors.New("Can not get Kubernetes config for specified endpoint")
+		log.Error("Unable to create temporary folder")
 	}
 
+	rcg := newJetStreamRCGetter([]byte(kubeconfigcontents), hc.Folder)
+
 	var nopLogger = func(a string, b ...interface{}) {
 		log.Infof(a, b)
 	}
 
 	var actionConfig action.Configuration
-	kubeconfig := kube.GetConfig(kubeConfigPath, "kube", namespace)
+	// kubeconfig := kube.GetConfig(kubeConfigPath, "kube", namespace)
 
-	kc := kube.New(kubeconfig)
+	kc := kube.New(rcg)
 	kc.Log = nopLogger
 
 	clientset, err := kc.Factory.KubernetesClientSet()
 	if err != nil {
-		return nil, err
+		return nil, hc, err
 	}
 
 	var store *storage.Storage
@@ -85,168 +90,70 @@ func (c *KubernetesSpecification) GetHelmConfiguration(endpointGUID, userID, nam
 	d.Log = nopLogger
 	store = storage.Init(d)
 
-	actionConfig.RESTClientGetter = kubeconfig
+	actionConfig.RESTClientGetter = rcg
 	actionConfig.KubeClient = kc
 	actionConfig.Releases = store
 	actionConfig.Log = nopLogger
 
-	return &actionConfig, nil
+	return &actionConfig, hc, nil
 }
 
-//defer os.RemoveAll(tempDir)
-
-// Create a temporary folder, write out a kubeconfig and configure using that file
-
-// kubeClient is *kubernetes.Clientset
-// 	kubeClient, err := kubernetes.NewForConfig(config)
-// 	if err != nil {
-// 		log.Errorf("Helm: Could not get kube client: %s", err)
-// 		return nil, err
-// 	}
-
-// 	// What do we have?
-// 	// kubeClient is *kubernetes.Clientset
-// 	// config is *restclient.Config
-
-// 	var actionConfig action.Configuration
-
-// 	// TODO: Check this
-// 	kubeconfig := newJetStreamRCGictionFactory(config, kubeClient)
-
-// 	// We only work for Helm 3 storing info in secrets (not config maps)
-// 	var store *storage.Storage
-// 	d := driver.NewSecrets(kubeClient.CoreV1().Secrets(namespace))
-// 	store = storage.Init(d)
-
-// 	factory := newFictionFactory(kubeClient, kubeconfig, namespace)
-
-// 	var nopLogger = func(a string, b ...interface{}) {
-// 		log.Infof(a, b)
-// 	}
-
-// 	client := &kube.Client{
-// 		Factory: factory,
-// 		Log:     nopLogger,
-// 	}
-
-// 	actionConfig.RESTClientGetter = kubeconfig
-// 	actionConfig.KubeClient = client
-// 	actionConfig.Releases = store
-// 	//actionConfig.Log = log//
-
-// 	return &actionConfig, nil
-// }
-
-type fictionFactory struct {
-	kubeClient *kubernetes.Clientset
-	getter     genericclioptions.RESTClientGetter
-	namespace  string
+type jetStreamRestClientGetter struct {
+	clientConfig clientcmd.ClientConfig
+	tempFolder   string
 }
 
-func newFictionFactory(kubeClient *kubernetes.Clientset, getter genericclioptions.RESTClientGetter, namespace string) kube.Factory {
+func newJetStreamRCGetter(kubeconfig []byte, tempFolder string) *jetStreamRestClientGetter {
 
-	f := &fictionFactory{
-		kubeClient: kubeClient,
-		getter:     getter,
-		namespace:  namespace,
+	clientConfig, err := clientcmd.NewClientConfigFromBytes(kubeconfig)
+	if err != nil {
+		log.Error(err)
 	}
-	return f
-}
 
-// ToRawKubeConfigLoader return kubeconfig loader as-is
-func (f *fictionFactory) ToRawKubeConfigLoader() clientcmd.ClientConfig {
-	log.Warn("Was NOT expecting this to be used: ToRawKubeConfigLoader")
-	return newFictionClientConfig(f.namespace)
-}
-
-// KubernetesClientSet gives you back an external clientset
-func (f *fictionFactory) KubernetesClientSet() (*kubernetes.Clientset, error) {
-	log.Warn("KubernetesClientSet requested")
-	return f.kubeClient, nil
-}
-
-// 	// NewBuilder returns an object that assists in loading objects from both disk and the server
-// 	// and which implements the common patterns for CLI interactions with generic resources.
-// 	NewBuilder() *resource.Builder
-
-func (f *fictionFactory) NewBuilder() *resource.Builder {
-	return resource.NewBuilder(f.getter)
-}
-
-// 	// Returns a schema that can validate objects stored on disk.
-// 	Validator(validate bool) (validation.Schema, error)
-
-func (f *fictionFactory) Validator(validate bool) (validation.Schema, error) {
-	log.Fatal("Was NOT expecting this to be used: Validator")
-	return nil, nil
-}
-
-type jetStreamRCG struct {
-	config     *restclient.Config
-	kubeClient *kubernetes.Clientset
-}
-
-func newJetStreamRCGictionFactory(config *restclient.Config, kubeClient *kubernetes.Clientset) *jetStreamRCG {
-
-	f := &jetStreamRCG{
-		config:     config,
-		kubeClient: kubeClient,
+	f := &jetStreamRestClientGetter{
+		clientConfig: clientConfig,
+		tempFolder:   tempFolder,
 	}
 	return f
 }
 
 // ToRESTConfig returns restconfig
-func (f *jetStreamRCG) ToRESTConfig() (*restclient.Config, error) {
-	log.Warn("Was NOT expecting this to be used: ToRESTConfig")
-	return f.config, nil
-}
-
-// ToDiscoveryClient returns discovery client
-func (f *jetStreamRCG) ToDiscoveryClient() (discovery.CachedDiscoveryInterface, error) {
-	return cached.NewMemCacheClient(f.kubeClient.Discovery()), nil
-}
-
-// ToRESTMapper returns a restmapper
-func (f *jetStreamRCG) ToRESTMapper() (meta.RESTMapper, error) {
-	log.Fatal("Was NOT expecting this to be used: ToRESTMapper")
-	return nil, nil
-}
-
-// ToRawKubeConfigLoader return kubeconfig loader as-is
-func (f *jetStreamRCG) ToRawKubeConfigLoader() clientcmd.ClientConfig {
-	log.Fatal("Was NOT expecting this to be used: ToRawKubeConfigLoader")
-	return nil
+func (f *jetStreamRestClientGetter) ToRESTConfig() (*restclient.Config, error) {
+	return f.clientConfig.ClientConfig()
 }
 
-type fictionClientConfig struct {
-	namespace string
+// ToRawKubeConfigLoader binds config flag values to config overrides
+// Returns an interactive clientConfig if the password flag is enabled,
+// or a non-interactive clientConfig otherwise.
+func (f *jetStreamRestClientGetter) ToRawKubeConfigLoader() clientcmd.ClientConfig {
+	return f.clientConfig
 }
 
-func newFictionClientConfig(namespace string) *fictionClientConfig {
-
-	f := &fictionClientConfig{
-		namespace: namespace,
+// ToDiscoveryClient returns discovery client
+func (f *jetStreamRestClientGetter) ToDiscoveryClient() (discovery.CachedDiscoveryInterface, error) {
+	config, err := f.ToRESTConfig()
+	if err != nil {
+		return nil, err
 	}
-	return f
-}
 
-// RawConfig returns the merged result of all overrides
-func (f *fictionClientConfig) RawConfig() (clientcmdapi.Config, error) {
-	log.Fatal("Was NOT expecting this to be used: RawConfig")
-	c := clientcmdapi.NewConfig()
-	return *c, nil
-}
+	// The more groups you have, the more discovery requests you need to make.
+	// given 25 groups (our groups + a few custom resources) with one-ish version each, discovery needs to make 50 requests
+	// double it just so we don't end up here again for a while.  This config is only used for discovery.
+	config.Burst = 100
 
-// ClientConfig returns a complete client config
-func (f *fictionClientConfig) ClientConfig() (*restclient.Config, error) {
-	log.Warn("Was NOT expecting this to be used: ClientConfig")
-	return nil, nil
+	httpCacheDir := f.tempFolder
+	discoveryCacheDir := f.tempFolder
+	return diskcached.NewCachedDiscoveryClientForConfig(config, discoveryCacheDir, httpCacheDir, time.Duration(10*time.Minute))
 }
 
-func (f *fictionClientConfig) Namespace() (string, bool, error) {
-	return f.namespace, false, nil
-}
+// ToRESTMapper returns a mapper.
+func (f *jetStreamRestClientGetter) ToRESTMapper() (meta.RESTMapper, error) {
+	discoveryClient, err := f.ToDiscoveryClient()
+	if err != nil {
+		return nil, err
+	}
 
-func (f *fictionClientConfig) ConfigAccess() clientcmd.ConfigAccess {
-	return clientcmd.NewDefaultClientConfigLoadingRules()
+	mapper := restmapper.NewDeferredDiscoveryRESTMapper(discoveryClient)
+	expander := restmapper.NewShortcutExpander(mapper, discoveryClient)
+	return expander, nil
 }
diff --git a/src/jetstream/plugins/kubernetes/install_release.go b/src/jetstream/plugins/kubernetes/install_release.go
index 5f5f793822..f2307330aa 100644
--- a/src/jetstream/plugins/kubernetes/install_release.go
+++ b/src/jetstream/plugins/kubernetes/install_release.go
@@ -81,11 +81,13 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 	endpointGUID := params.Endpoint
 	userGUID := ec.Get("user_id").(string)
 
-	config, err := c.GetHelmConfiguration(endpointGUID, userGUID, params.Namespace)
+	config, hc, err := c.GetHelmConfiguration(endpointGUID, userGUID, params.Namespace)
 	if err != nil {
 		return fmt.Errorf("Could not get Helm Configuration for endpoint: %v+", err)
 	}
 
+	defer hc.Cleanup()
+
 	// if _, err := chartutil.LoadRequirements(chart); err == nil {
 	// 	log.Debug("Chart requirements loaded")
 	// } else if err != chartutil.ErrRequirementsNotFound {
@@ -159,12 +161,14 @@ func (c *KubernetesSpecification) DeleteRelease(ec echo.Context) error {
 
 	userGUID := ec.Get("user_id").(string)
 
-	config, err := c.GetHelmConfiguration(endpointGUID, userGUID, "")
+	config, hc, err := c.GetHelmConfiguration(endpointGUID, userGUID, "")
 	if err != nil {
 		log.Errorf("Helm: ListReleases could not get a Helm Configuration: %s", err)
 		return err
 	}
 
+	defer hc.Cleanup()
+
 	uninstall := action.NewUninstall(config)
 
 	deleteResponse, err := uninstall.Run(releaseName)
diff --git a/src/jetstream/plugins/kubernetes/kube_dashboard.go b/src/jetstream/plugins/kubernetes/kube_dashboard.go
index 76e9dc4c69..ec28a7d502 100644
--- a/src/jetstream/plugins/kubernetes/kube_dashboard.go
+++ b/src/jetstream/plugins/kubernetes/kube_dashboard.go
@@ -23,10 +23,6 @@ import (
 	"k8s.io/client-go/transport"
 
 	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/kubernetes/pkg/api/legacyscheme"
-	api "k8s.io/kubernetes/pkg/apis/core"
-	k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
 )
 
 // GET /api/v1/namespaces/{namespace}/pods/{name}/proxy
@@ -324,22 +320,15 @@ func (k *KubernetesSpecification) getKubeDashboardPod(c echo.Context, labelSelec
 	return &pod, nil
 }
 
-func tryDecodePodList(data []byte) (parsed bool, pods v1.PodList, err error) {
-	obj, err := runtime.Decode(legacyscheme.Codecs.UniversalDecoder(), data)
-	if err != nil {
-		return false, pods, err
-	}
+func tryDecodePodList(data []byte) (bool, v1.PodList, error) {
 
-	newPods, ok := obj.(*api.PodList)
-	// Check whether the object could be converted to list of pods.
-	if !ok {
-		err = fmt.Errorf("invalid pods list: %#v", obj)
+	var pods v1.PodList
+	var err error
+
+	err = json.Unmarshal(data, &pods)
+	if err != nil {
 		return false, pods, err
 	}
 
-	v1Pods := &v1.PodList{}
-	if err := k8s_api_v1.Convert_core_PodList_To_v1_PodList(newPods, v1Pods, nil); err != nil {
-		return true, pods, err
-	}
-	return true, *v1Pods, err
+	return true, pods, err
 }
diff --git a/src/jetstream/plugins/kubernetes/list_releases.go b/src/jetstream/plugins/kubernetes/list_releases.go
index 0b06148b2e..ce3751a096 100644
--- a/src/jetstream/plugins/kubernetes/list_releases.go
+++ b/src/jetstream/plugins/kubernetes/list_releases.go
@@ -1,24 +1,66 @@
 package kubernetes
 
 import (
-	//"encoding/json"
-	//"fmt"
+	"encoding/json"
+	"fmt"
 
-	"bytes"
+	//"fmt"
 
+	"github.com/gorilla/websocket"
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
 
-	// "k8s.io/client-go/kubernetes"
 	// "k8s.io/client-go/rest"
 	"helm.sh/helm/v3/pkg/action"
-	// "k8s.io/helm/pkg/kube"
+	// "helm.sh/helm/v3/pkg/release"
 
-	yaml "gopkg.in/yaml.v2"
+	// "k8s.io/helm/pkg/kube"
 
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/helm"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 )
 
+// type helmReleaseInfo struct {
+// 	*release.Release
+// 	Extra     string                `json:"extra"`
+// 	Resources []helmReleaseResource `json:"resources"`
+// }
+
+// type helmReleaseResource struct {
+// 	Kind       string `json:"kind"`
+// 	APIVersion string `json:"apiVersion"`
+// 	Name       string `json:"name"`
+// }
+
+type ResourceResponse struct {
+	Kind string          `json:"kind"`
+	Data json.RawMessage `json:"data"`
+}
+
+// type KubeResource struct {
+// 	Kind       string `yaml:"kind"`
+// 	APIVersion string `yaml:"apiVersion"`
+// 	Metadata   struct {
+// 		Name string `yaml:"name"`
+// 	} `yaml:"metadata"`
+// 	Spec interface{} `yaml:"spec"`
+// }
+
+// type kubeAPIJob struct {
+// 	Kind       string
+// 	APIVersion string
+// 	Name       string
+// 	Namespace  string
+// 	Endpoint   string
+// 	User       string
+// }
+
+// type KubeAPIJobResult struct {
+// 	helm.KubeResourceJob
+// 	StatusCode int
+// 	Data       json.RawMessage
+// }
+
 type kubeReleasesData struct {
 	Endpoint  string `json:"endpoint"`
 	Name      string `json:"releaseName"`
@@ -41,14 +83,6 @@ type kubeReleasesData struct {
 // 	} `json:"chart"`
 // }
 
-type KubeResource struct {
-	Kind       string `yaml:"kind"`
-	ApiVersion string `yaml:"apiVersion"`
-	Metadata   struct {
-		Name string `yaml:"name"`
-	} `yaml:"metadata"`
-}
-
 type kubeReleasesResponse map[string]kubeReleasesData
 
 // ListReleases will list the helm releases for all endpoints
@@ -76,13 +110,15 @@ func (c *KubernetesSpecification) listReleases(ep *interfaces.ConnectedEndpoint,
 
 	log.Debugf("listReleases: START: %s", ep.GUID)
 
-	config, err := c.GetHelmConfiguration(ep.GUID, ep.Account, "")
+	config, hc, err := c.GetHelmConfiguration(ep.GUID, ep.Account, "")
 	if err != nil {
 		log.Errorf("Helm: ListReleases could not get a Helm Configuration: %s", err)
 		done <- response
 		return
 	}
 
+	defer hc.Cleanup()
+
 	list := action.NewList(config)
 
 	log.Debugf("listReleases: REQUEST: %s", ep.GUID)
@@ -103,6 +139,8 @@ func (c *KubernetesSpecification) listReleases(ep *interfaces.ConnectedEndpoint,
 }
 
 // GetRelease will get release status for the given release
+// This is a web socket request and will return info over the websocket
+// polling until disconnected
 func (c *KubernetesSpecification) GetRelease(ec echo.Context) error {
 
 	// TODO: I think this needs to know the namespace that the release is in ?!
@@ -112,12 +150,14 @@ func (c *KubernetesSpecification) GetRelease(ec echo.Context) error {
 	release := ec.Param("name")
 	userID := ec.Get("user_id").(string)
 
-	config, err := c.GetHelmConfiguration(endpointGUID, userID, "")
+	config, hc, err := c.GetHelmConfiguration(endpointGUID, userID, "")
 	if err != nil {
 		log.Errorf("Helm: GetRelease could not get a Helm Configuration: %s", err)
 		return err
 	}
 
+	defer hc.Cleanup()
+
 	status := action.NewStatus(config)
 	res, err := status.Run(release)
 	if err != nil {
@@ -125,58 +165,106 @@ func (c *KubernetesSpecification) GetRelease(ec echo.Context) error {
 		return err
 	}
 
+	// Upgrade to a web socket
+	ws, pingTicker, err := interfaces.UpgradeToWebSocket(ec)
+	if err != nil {
+		return err
+	}
+	defer ws.Close()
+	defer pingTicker.Stop()
+
+	// ws is the websocket ready for use
+
+	// Write the release info first - we will then go fetch the status of evertyhing in the release and send
+	// this back incrementally
+
 	// Parse the manifest
 	log.Info("Got release")
-	log.Infof("%s", res.Manifest)
+	rel := helm.NewHelmRelease(res, endpointGUID, userID)
+	log.Info("Done")
 
-	r := bytes.NewReader([]byte(res.Manifest))
+	graph := helm.NewHelmReleaseGraph(rel)
 
-	dec := yaml.NewDecoder(r)
-	var t KubeResource
-	for dec.Decode(&t) == nil {
-		log.Infof("Resource: %s - %s", t.Kind, t.Metadata.Name)
-	}
+	id := fmt.Sprintf("%s-%s", endpointGUID, rel.Namespace)
+
+	// Send over the namespace details of the release
+	sendResource(ws, "ReleasePrefix", id)
+
+	graph.ParseManifest(rel.KubeResources)
+
+	// Send the manifest for the release
+	sendResource(ws, "Manifest", rel.HelmManifest)
+
+	// // Send the manifest for the release
+	// sendResource(ws, "Test", rel.HelmManifest)
+
+	// Send the graph as we have it now
+	sendResource(ws, "Graph", graph)
+
+	// Loop over this until the web socket is closed
+
+	// Get the pods first and send those
+	pods := rel.GetPods(c.portalProxy)
+	sendResource(ws, "Pods", pods)
+
+	//graph.Generate(pods)
+
+	// Send the manifest for the release again (ReplicaSets will now be added)
+	sendResource(ws, "Manifest", rel.Resources)
+
+	// Send the manifest for the release again (ReplicaSets will now be added)
+	sendResource(ws, "Manifest2", rel.HelmManifest)
 
-	return ec.JSON(200, res)
+	// Now get all of the resources in the manifest
+	all := rel.GetResources(c.portalProxy)
+	sendResource(ws, "Resources", all)
+
+	// Now we have everything, so loop, polling to get status
+	// for {
+
+	// 	log.Warn("Polling for release - wait 10 seconds")
+	// 	time.Sleep(10 * time.Second)
+
+	// 	log.Warn("Polling for release ....")
+
+	// 	// Pods
+	// 	pods := rel.GetPods(c.portalProxy)
+	// 	err = sendResource(ws, "Pods", pods)
+	// 	log.Error(err)
+
+	// 	// Now get all of the resources in the manifest
+	// 	all := rel.GetResources(c.portalProxy)
+	// 	err = sendResource(ws, "Resources", all)
+	// 	log.Error(err)
+	// }
+
+	log.Error("****************************************************************************************************")
+	log.Error("RELEASE POLLER HAS FINISHED")
+	log.Error("****************************************************************************************************")
+
+	ws.Close()
+
+	return nil
 }
 
-// // ListReleases will list the helm releases for all endpoints
-// func (c *KubernetesSpecification) aListReleases(ec echo.Context) error {
+func sendResource(ws *websocket.Conn, kind string, data interface{}) error {
 
-// 	// Need to get a config object for the target endpoint
-// 	// endpointGUID := ec.Param("endpoint")
-// 	userID := ec.Get("user_id").(string)
+	var err error
+	var txt []byte
+	if txt, err = json.Marshal(data); err == nil {
+		resp := ResourceResponse{
+			Kind: kind,
+			Data: json.RawMessage(txt),
+		}
 
-// 	// Get the config maps directly - don't go via Tiller
+		if txt, err = json.Marshal(resp); err == nil {
+			if ws.WriteMessage(websocket.TextMessage, txt); err == nil {
+				return nil
+			}
 
-// 	requests := c.makeKubeProxyRequest(userID, "GET", "/api/v1/configmaps?labelSelector=OWNER%3DTILLER")
-// 	responses, _ := c.portalProxy.DoProxyRequest(requests)
-// 	return c.portalProxy.SendProxiedResponse(ec, responses)
-// }
+			log.Info(err)
+		}
+	}
 
-// func (c *KubernetesSpecification) makeKubeProxyRequest(userID, method, uri string) []interfaces.ProxyRequestInfo {
-
-// 	var p = c.portalProxy
-// 	eps, err := p.ListEndpointsByUser(userID)
-// 	if err != nil {
-// 		return nil
-// 	}
-
-// 	// Construct the metadata for proxying
-// 	requests := make([]interfaces.ProxyRequestInfo, 0)
-// 	for _, endpoint := range eps {
-// 		if endpoint.CNSIType == "k8s" {
-// 			req := interfaces.ProxyRequestInfo{}
-// 			req.UserGUID = userID
-// 			req.ResultGUID = endpoint.GUID
-// 			req.EndpointGUID = endpoint.GUID
-// 			req.Method = method
-
-// 			uri, _ := url.Parse(uri)
-// 			req.URI = uri
-// 			requests = append(requests, req)
-// 		}
-// 	}
-
-// 	return requests
-// }
+	return err
+}

From 3911ec69600dc4c9e445645fe9d1364d55791cc5 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 25 Nov 2019 15:51:53 +0000
Subject: [PATCH 171/648] Conditionally support OS theme selection

---
 .../packages/core/sass/_all-theme.scss        |   2 -
 .../packages/core/src/core/core.module.ts     |   4 +-
 .../packages/core/src/core/theme.service.ts   | 108 ++++++++++++++----
 .../profile-info/profile-info.component.html  |   4 +-
 .../store/src/effects/dashboard.effects.ts    |   4 +-
 .../store/src/reducers/dashboard-reducer.ts   |   2 +-
 6 files changed, 91 insertions(+), 33 deletions(-)

diff --git a/src/frontend/packages/core/sass/_all-theme.scss b/src/frontend/packages/core/sass/_all-theme.scss
index f9d0df1599..924e13afcf 100644
--- a/src/frontend/packages/core/sass/_all-theme.scss
+++ b/src/frontend/packages/core/sass/_all-theme.scss
@@ -106,10 +106,8 @@ $side-nav-light-active: #484848;
   @include steppers-theme($theme, $app-theme);
   @include list-theme($theme, $app-theme);
   @include app-base-page-theme($theme, $app-theme);
-  @include app-page-subheader-theme($theme, $app-theme);
   @include app-mat-snack-bar-theme($theme, $app-theme);
   @include ngx-charts-gauge($theme, $app-theme);
-  // @include app-mat-tabs-theme($theme, $app-theme);
   @include app-text-status-theme($theme, $app-theme);
   @include app-card-status-theme($theme, $app-theme);
   @include app-usage-gauge-theme($theme, $app-theme);
diff --git a/src/frontend/packages/core/src/core/core.module.ts b/src/frontend/packages/core/src/core/core.module.ts
index 00dcb21516..8b43843475 100644
--- a/src/frontend/packages/core/src/core/core.module.ts
+++ b/src/frontend/packages/core/src/core/core.module.ts
@@ -26,7 +26,6 @@ import { PageHeaderService } from './page-header-service/page-header.service';
 import { PageNotFoundComponentComponent } from './page-not-found-component/page-not-found-component.component';
 import { SafeImgPipe } from './safe-img.pipe';
 import { StatefulIconComponent } from './stateful-icon/stateful-icon.component';
-import { ThemeService } from './theme.service';
 import { TruncatePipe } from './truncate.pipe';
 import { UserService } from './user.service';
 import { UtilsService } from './utils.service';
@@ -73,8 +72,7 @@ import { WindowRef } from './window-ref/window-ref.service';
     EndpointsService,
     UserService,
     EntityServiceFactory,
-    CurrentUserPermissionsService,
-    ThemeService
+    CurrentUserPermissionsService
   ],
   declarations: [
     StatefulIconComponent,
diff --git a/src/frontend/packages/core/src/core/theme.service.ts b/src/frontend/packages/core/src/core/theme.service.ts
index 450460f7cd..169e324e52 100644
--- a/src/frontend/packages/core/src/core/theme.service.ts
+++ b/src/frontend/packages/core/src/core/theme.service.ts
@@ -2,7 +2,7 @@ import { OverlayContainer } from '@angular/cdk/overlay';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { first, map } from 'rxjs/operators';
 
 import { SetThemeAction } from '../../../store/src/actions/dashboard-actions';
 import { DashboardOnlyAppState } from '../../../store/src/app-state';
@@ -14,46 +14,95 @@ export interface StratosTheme {
   styleName: string;
 }
 
-const coreThemes: StratosTheme[] = [{
+const lightTheme: StratosTheme = {
   key: 'default',
   label: 'Light',
   styleName: 'default'
-}, {
+};
+const darkTheme: StratosTheme = {
   key: 'dark',
   label: 'Dark',
   styleName: 'dark-theme'
-}];
+};
+const osTheme: StratosTheme = {
+  key: 'os',
+  label: 'OS',
+  styleName: ''
+};
 
-@Injectable()
+@Injectable({
+  providedIn: 'root',
+})
 export class ThemeService {
 
-  constructor(private store: Store<DashboardOnlyAppState>, private overlayContainer: OverlayContainer) { }
+  private osThemeInfo = {
+    supports: false,
+    isDarkMode: window.matchMedia('(prefers-color-scheme: dark)').matches,
+    isLightMode: window.matchMedia('(prefers-color-scheme: light)').matches,
+    isNotSpecified: window.matchMedia('(prefers-color-scheme: no-preference)').matches
+  };
+  private themes: StratosTheme[] = [lightTheme, darkTheme];
+
+  constructor(private store: Store<DashboardOnlyAppState>, private overlayContainer: OverlayContainer) {
+    this.osThemeInfo.supports = this.osThemeInfo.isDarkMode || this.osThemeInfo.isLightMode || this.osThemeInfo.isNotSpecified;
+
+    if (this.osThemeInfo.supports) {
+      this.themes.push(osTheme);
+
+      // If at some point in the future we need to adjust theme on OS change at run time we should look into this. Unfortunately was unable
+      // to test (only way I could change scheme from light to dark was in FF and about:config `ui.systemUsesDarkTheme` integer 1)
+      // window.matchMedia('(prefers-color-scheme: dark)').addListener(e => e.matches && this.updateFollowingOsThemeChange());
+      // window.matchMedia('(prefers-color-scheme: light)').addListener(e => e.matches && this.updateFollowingOsThemeChange());
+      // window.matchMedia('(prefers-color-scheme: no-preference)').addListener(e => e.matches && this.updateFollowingOsThemeChange());
+    }
+  }
 
   getThemes(): StratosTheme[] {
-    return coreThemes;
+    return this.themes;
   }
 
   getTheme(): Observable<StratosTheme> {
     return this.store.select(selectDashboardState).pipe(
-      map(dashboardState => this.findTheme(dashboardState.themeKey))
+      map(dashboardState => this.findTheme(dashboardState.themeKey)),
     );
   }
 
-  setTheme(theme: StratosTheme) {
-    this.setOverlay(theme);
-    this.store.dispatch(new SetThemeAction(theme));
+  setTheme(themeKey: string) {
+    const findTheme = this.findTheme(themeKey);
+    this.setOverlay(findTheme);
+    this.store.dispatch(new SetThemeAction(findTheme));
   }
 
   /**
-   * Initialize the service with a value that already exists in the store
+   * Initialize the service with a theme that may already exists in the store
    */
-  initialize(themeKey: string) {
-    this.setOverlay(this.findTheme(themeKey));
+  initialize() {
+    this.getTheme().pipe(first()).subscribe(theme => this.setOverlay(theme));
   }
 
+  /**
+   * Find a theme in a safe way with fall backs
+   */
   private findTheme(themeKey: string): StratosTheme {
-    const themes = this.getThemes();
-    return themes.find(theme => theme.key === themeKey) || themes[0];
+    if (themeKey === osTheme.key) {
+      return this.getOsTheme() || lightTheme;
+    }
+    return this.getThemes().find(theme => theme.key === themeKey) || lightTheme;
+  }
+
+  /**
+   * Create an `OS` theme that contains the relevant style
+   */
+  private getOsTheme(): StratosTheme {
+    if (this.osThemeInfo.supports) {
+      return this.osThemeInfo.isDarkMode ? {
+        ...osTheme,
+        styleName: darkTheme.styleName
+      } : this.osThemeInfo.isLightMode || this.osThemeInfo.isNotSpecified ? {
+        ...osTheme,
+        styleName: lightTheme.styleName
+      } : null;
+    }
   }
 
   /**
@@ -61,12 +110,25 @@ export class ThemeService {
    * `Multiple themes and overlay-based components`
    */
   private setOverlay(newTheme: StratosTheme) {
-    this.getThemes().forEach(theme => {
-      if (newTheme.key === theme.key) {
-        this.overlayContainer.getContainerElement().classList.add(theme.styleName);
-      } else {
-        this.overlayContainer.getContainerElement().classList.remove(theme.styleName);
-      }
-    });
+    // Remove pre-existing styles
+    this.getThemes()
+      .filter(theme => theme.styleName)
+      .forEach(theme => this.overlayContainer.getContainerElement().classList.remove(theme.styleName));
+    // Add new style (not from getThemes list, handles OS case)
+    this.overlayContainer.getContainerElement().classList.add(newTheme.styleName);
   }
+
+  // See usages, might be needed in the future
+  /**
+   * Update theme given changes in OS theme settings
+   */
+  // private updateFollowingOsThemeChange() {
+  //   this.osThemeInfo.isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches;
+  //   this.osThemeInfo.isLightMode = window.matchMedia('(prefers-color-scheme: light)').matches;
+  //   this.osThemeInfo.isNotSpecified = window.matchMedia('(prefers-color-scheme: no-preference)').matches;
+
+  //   this.store.select(selectDashboardState).pipe(
+  //     first()
+  //   ).subscribe(dashboardState => dashboardState.themeKey === osTheme.key && this.setTheme(osTheme.key));
+  // }
 }
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 98117c306c..4580560673 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
@@ -97,9 +97,9 @@ <h1>User Profile</h1>
               <div class="user-profile__option-header">
                 Theme
               </div>
-              <mat-button-toggle-group [value]="themeService.getTheme() | async"
+              <mat-button-toggle-group [value]="(themeService.getTheme() | async).key"
                 (change)="themeService.setTheme($event.value)" name="theme" aria-label="Theme">
-                <mat-button-toggle *ngFor="let theme of themeService.getThemes()" [value]="theme"> {{ theme.label }}
+                <mat-button-toggle *ngFor="let theme of themeService.getThemes()" [value]="theme.key"> {{ theme.label }}
                 </mat-button-toggle>
               </mat-button-toggle-group>
             </div>
diff --git a/src/frontend/packages/store/src/effects/dashboard.effects.ts b/src/frontend/packages/store/src/effects/dashboard.effects.ts
index a5f138677d..0e796db044 100644
--- a/src/frontend/packages/store/src/effects/dashboard.effects.ts
+++ b/src/frontend/packages/store/src/effects/dashboard.effects.ts
@@ -16,9 +16,9 @@ export class DashboardEffect {
 
   @Effect({ dispatch: false }) hydrate$ = this.actions$.pipe(
     ofType<HydrateDashboardStateAction>(HYDRATE_DASHBOARD_STATE),
-    map(({ dashboardState }) => {
+    map(() => {
       // Ensure the previous theme is applied
-      this.themeService.initialize(dashboardState.themeKey);
+      this.themeService.initialize();
     })
   );
 }
diff --git a/src/frontend/packages/store/src/reducers/dashboard-reducer.ts b/src/frontend/packages/store/src/reducers/dashboard-reducer.ts
index 53abd01376..b5f606d521 100644
--- a/src/frontend/packages/store/src/reducers/dashboard-reducer.ts
+++ b/src/frontend/packages/store/src/reducers/dashboard-reducer.ts
@@ -87,7 +87,7 @@ export function dashboardReducer(state: DashboardState = defaultDashboardState,
       const setThemeAction = action as SetThemeAction;
       return {
         ...state,
-        themeKey: setThemeAction.theme.key
+        themeKey: setThemeAction.theme ? setThemeAction.theme.key : null
       };
     default:
       return state;

From e1d1fbf556c0b4e6652f38677919bf306d201215 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 26 Nov 2019 08:18:44 +0000
Subject: [PATCH 172/648] WIP

---
 ...helm-release-resource-graph.component.html | 18 ++--
 .../helm-release-resource-graph.component.ts  | 27 +++++-
 .../plugins/kubernetes/helm/release.go        | 80 +++++++++++-----
 .../plugins/kubernetes/helm/release_graph.go  | 96 +++++++++++++++----
 .../plugins/kubernetes/list_releases.go       |  8 +-
 5 files changed, 169 insertions(+), 60 deletions(-)

diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
index 21e6ddf947..b3b6394569 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
@@ -5,16 +5,16 @@
   [nodes]="nodes"
   [update$]="update$"
 >
-<!--
 <ng-template #nodeTemplate let-node>
-    <svg:g class="node" xmlns="http://www.w3.org/2000/xhtml" width="150" height="100">
-    <svg:foreignObject width="150" height="100">
-      <xhtml:div class="cardContainer" xmlns="http://www.w3.org/1999/xhtml">
-        <label class="name">{{node.label}}</label>
-        <label>{{node.data.kind}}</label>
-      </xhtml:div>
-    </svg:foreignObject>
+  <svg:g class="node">
+    <svg:rect
+      [attr.width]="node.dimension.width"
+      [attr.height]="node.dimension.height"
+      [attr.fill]="node.data.fill"
+    />
+    <svg:text alignment-baseline="central" [attr.x]="10" [attr.y]="node.dimension.height / 2">
+      {{node.label}}
+    </svg:text>
   </svg:g>
 </ng-template>
 </ngx-graph>
--->
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
index e2b9746934..1fb9381888 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
@@ -27,11 +27,19 @@ export class HelmReleaseResourceGraphComponent implements OnInit {
       console.log(g);
 
       const newNodes = [];
-      Object.values(g.nodes).forEach((node: any) => newNodes.push({
-        id: node.id,
-        label: node.label,
-        data: {...node.data},
-      }));
+      Object.values(g.nodes).forEach((node: any) => {
+        newNodes.push({
+          id: node.id,
+          label: node.label,
+          data: {
+            ...node.data,
+            color: this.getColor(node.data.kind),
+            fill: this.getColor(node.data.kind),
+          },
+        });
+      });
+      console.log('------------');
+      console.log(newNodes);
       this.nodes = newNodes;
       this.update$.next(true);
     });
@@ -39,6 +47,15 @@ export class HelmReleaseResourceGraphComponent implements OnInit {
 
   ngOnInit() { }
 
+  private getColor(resourceType: string): string {
+    switch (resourceType) {
+      case 'Secret':
+        return 'red';
+      default:
+        return 'blue';
+    }
+  }
+
   public onZoomChanged(e) {
     console.log(e);
   }
diff --git a/src/jetstream/plugins/kubernetes/helm/release.go b/src/jetstream/plugins/kubernetes/helm/release.go
index d6de857e31..4ec23ec6f6 100644
--- a/src/jetstream/plugins/kubernetes/helm/release.go
+++ b/src/jetstream/plugins/kubernetes/helm/release.go
@@ -6,6 +6,8 @@ import (
 	"encoding/json"
 	"fmt"
 
+	"reflect"
+
 	//	"io"
 	"strings"
 
@@ -90,6 +92,7 @@ func NewHelmRelease(info *release.Release, endpoint, user string) *HelmRelease {
 	}
 	r.ResourceNames = make(map[string]bool)
 	r.HelmManifest = make([]runtime.Object, 0)
+	r.KubeResources = make([]KubeResource, 0)
 
 	r.parseManifest()
 	return r
@@ -146,6 +149,10 @@ func getResourceIdentifier(typeMeta metav1.TypeMeta, objectMeta metav1.ObjectMet
 	return fmt.Sprintf("%s-%s-%s", typeMeta.Kind, typeMeta.APIVersion, objectMeta.Name)
 }
 
+func getResourceId(kind, apiVersion, name string) string {
+	return fmt.Sprintf("%s-%s-%s", kind, apiVersion, name)
+}
+
 // process a yaml resource from the helm manifest
 func (r *HelmRelease) processResource(obj runtime.Object) {
 
@@ -158,37 +165,44 @@ func (r *HelmRelease) processResource(obj runtime.Object) {
 		log.Info("CAN MARSHAL TO JSON")
 		var t KubeResource
 		if json.Unmarshal(j, &t) == nil {
-			log.Infof("Got resource: %s : %s", t.Kind, t.Metadata.Name)
-
-			// Store the kube resource
 			r.KubeResources = append(r.KubeResources, t)
-
-			// Make a note of the resource name for lookup
-			//r.ResourceNames[getResourceIdentifier()] = true
-
-			// TODO: r.Resources
+			log.Infof("Got resource: %s : %s", t.Kind, t.Metadata.Name)
 
 			if t.Kind == "Deployment" || t.Kind == "StatefulSet" || t.Kind == "DaemonSet" {
 				log.Warnf("Getting selectors for %s", t.Kind)
 				r.processDeployment(t, obj)
 			}
-			r.addJobForResource(t)
+			r.addJobForResource(t.Kind, t.APIVersion, t.Metadata.Name)
 		} else {
 			log.Error("NO GO")
 		}
 	}
 }
 
-func (r *HelmRelease) addJobForResource(t KubeResource) {
+// func (r *HelmRelease) addJobForResource(t KubeResource) {
+// 	job := KubeResourceJob{
+// 		ID:         fmt.Sprintf("%s-%s#Pods", t.Kind, t.Metadata.Name),
+// 		Endpoint:   r.Endpoint,
+// 		User:       r.User,
+// 		Namespace:  r.Namespace,
+// 		Name:       t.Metadata.Name,
+// 		URL:        getRestURL(r.Namespace, t),
+// 		APIVersion: t.APIVersion,
+// 		Kind:       t.Kind,
+// 	}
+// 	r.Jobs = append(r.Jobs, job)
+// }
+
+func (r *HelmRelease) addJobForResource(kind, apiVersion, name string) {
 	job := KubeResourceJob{
-		ID:         fmt.Sprintf("%s-%s#Pods", t.Kind, t.Metadata.Name),
+		ID:         fmt.Sprintf("%s-%s#Pods", kind, name),
 		Endpoint:   r.Endpoint,
 		User:       r.User,
 		Namespace:  r.Namespace,
-		Name:       t.Metadata.Name,
-		URL:        getRestURL(r.Namespace, t),
-		APIVersion: t.APIVersion,
-		Kind:       t.Kind,
+		Name:       name,
+		URL:        getRestURL(r.Namespace, kind, apiVersion, name),
+		APIVersion: apiVersion,
+		Kind:       kind,
 	}
 	r.Jobs = append(r.Jobs, job)
 }
@@ -224,7 +238,6 @@ func (r *HelmRelease) processPodSelector(kres KubeResource, selector *metav1.Lab
 	}
 
 	r.PodJobs = append(r.PodJobs, job)
-
 }
 
 // See: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
@@ -269,6 +282,17 @@ func (r *HelmRelease) GetPods(jetstream interfaces.PortalProxy) []v1.Pod {
 		err := json.Unmarshal(j.Data, &list)
 		if err == nil {
 			for _, pod := range list.Items {
+				log.Info(reflect.TypeOf(pod))
+				// Add a kube resource for the pod
+				res := KubeResource{
+					Kind: pod.Kind,
+					APIVersion: pod.APIVersion,
+				}
+				res.Metadata.Name = pod.Name
+				log.Info("POD")
+				log.Infof("%+v", res)
+				r.KubeResources = append(r.KubeResources, res)
+				r.Resources = append(r.Resources, &res)
 				podList = append(podList, pod)
 				r.processPodOwners(pod)
 			}
@@ -284,6 +308,7 @@ func (r *HelmRelease) GetPods(jetstream interfaces.PortalProxy) []v1.Pod {
 func (r *HelmRelease) processPodOwners(pod v1.Pod) {
 	for _, owner := range pod.ObjectMeta.OwnerReferences {
 		if owner.Kind == "ReplicaSet" {
+			// This is an incompelte ReplicaSet, but enough for us to use to go get more metadata
 			resource := appsv1.ReplicaSet{}
 			resource.TypeMeta = metav1.TypeMeta{
 				Kind:       owner.Kind,
@@ -295,13 +320,14 @@ func (r *HelmRelease) processPodOwners(pod v1.Pod) {
 			}
 			identifier := getResourceIdentifier(resource.TypeMeta, resource.ObjectMeta)
 			if _, ok := r.ResourceNames[identifier]; !ok {
-				r.Resources = append(r.Resources, resource)
+				r.Resources = append(r.Resources, &resource)
 				//r.HelmResources = append(r.HelmResources, resource)
 
 				r.ResourceNames[identifier] = true
+				r.KubeResources = append(r.KubeResources, r.getKubeResource(resource.TypeMeta, resource.ObjectMeta))
 
-				// TODO: Need a KubrResource
-				// r.addJobForResource(resource)
+				// TODO: Need a KubeResource
+				r.addJobForResource(owner.Kind, owner.APIVersion, owner.Name)
 			}
 		} else {
 			log.Warn("Unexpected Pod owner kind: %s", owner.Kind)
@@ -309,6 +335,15 @@ func (r *HelmRelease) processPodOwners(pod v1.Pod) {
 	}
 }
 
+func (r *HelmRelease) getKubeResource(typeMeta metav1.TypeMeta, objectMeta metav1.ObjectMeta) KubeResource {
+	kres := KubeResource{
+		Kind:       typeMeta.Kind,
+		APIVersion: typeMeta.APIVersion,
+	}
+	kres.Metadata.Name = objectMeta.Name
+	return kres
+}
+
 func (r *HelmRelease) GetResources(jetstream interfaces.PortalProxy) []json.RawMessage {
 	var resourceList []json.RawMessage
 
@@ -365,14 +400,13 @@ func (r *HelmRelease) restWorker(jetstream interfaces.PortalProxy, id int, jobs
 	}
 }
 
-func getRestURL(namespace string, resource KubeResource) string {
+func getRestURL(namespace, kind, apiVersion, name string) string {
 	var restURL string
 	base := "api"
-	name := resource.Metadata.Name
-	if len(strings.Split(resource.APIVersion, "/")) > 1 {
+	if len(strings.Split(apiVersion, "/")) > 1 {
 		base = "apis"
 		name += "/status"
 	}
-	restURL = fmt.Sprintf("/%s/%s/namespaces/%s/%ss/%s", base, resource.APIVersion, namespace, strings.ToLower(resource.Kind), name)
+	restURL = fmt.Sprintf("/%s/%s/namespaces/%s/%ss/%s", base, apiVersion, namespace, strings.ToLower(kind), name)
 	return restURL
 }
diff --git a/src/jetstream/plugins/kubernetes/helm/release_graph.go b/src/jetstream/plugins/kubernetes/helm/release_graph.go
index f6a5e3387e..0bce5cfc0d 100644
--- a/src/jetstream/plugins/kubernetes/helm/release_graph.go
+++ b/src/jetstream/plugins/kubernetes/helm/release_graph.go
@@ -1,10 +1,14 @@
 package helm
 
 import (
-	"encoding/json"
 	"fmt"
 
+	"reflect"
+
 	log "github.com/sirupsen/logrus"
+	appsv1 "k8s.io/api/apps/v1"
+	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 type HelmReleaseGraph struct {
@@ -38,15 +42,22 @@ func NewHelmReleaseGraph(release *HelmRelease) *HelmReleaseGraph {
 	return r
 }
 
-// ParseManifest
-func (r *HelmReleaseGraph) ParseManifest(manifest []KubeResource) {
+func (r *HelmReleaseGraph) AddLink(source, target string) {
+	link := ReleaseLink{
+		ID:     fmt.Sprintf("%s->%s", source, target),
+		Source: source,
+		Target: target,
+	}
+	r.Links[link.ID] = link
+	log.Warnf("Adding link %s -> %s", source, target)
+}
 
-	// An array of Kubernetes resources should be passed in
+// ParseManifest
+func (r *HelmReleaseGraph) ParseManifest(release *HelmRelease) {
 
-	log.Warn("Graph:: Parse Manifest")
-	log.Warn(len(manifest))
+	log.Warnf("Graph:: Parse ManifestL %d", len(release.KubeResources))
 
-	for _, item := range manifest {
+	for _, item := range release.KubeResources {
 		log.Warn(item.Kind)
 
 		node := ReleaseNode{
@@ -60,18 +71,67 @@ func (r *HelmReleaseGraph) ParseManifest(manifest []KubeResource) {
 		// Add or replace the node in the map
 		r.Nodes[node.ID] = node
 
-		if item.Kind == "Deployment" {
-			log.Info("Parsing deployment")
-			log.Infof("%+v", item.Spec)
-
-			// Covnert the spec back to json
-			js, err := json.Marshal(item.Spec)
-			if err != nil {
-				log.Error("Can not marhsal deployment")
-			} else {
-				log.Warn(string(js))
-			}
+		// if item.Kind == "Deployment" {
+		// 	log.Info("Parsing deployment")
+		// 	log.Infof("%+v", item.Spec)
+
+		// 	// Covnert the spec back to json
+		// 	js, err := json.Marshal(item.Spec)
+		// 	if err != nil {
+		// 		log.Error("Can not marhsal deployment")
+		// 	} else {
+		// 		log.Warn(string(js))
+		// 	}
+		// }
+	}
+
+	log.Info(len(release.Resources))
+
+	// Now go through the pods and generate relationships
+	for _, obj := range release.Resources {
+
+		switch o := obj.(type) {
+		case *appsv1.Deployment:
+			log.Warnf("Deployment %s", o.Name)
+			target := getResourceId(o.Kind, o.APIVersion, o.Name)
+			r.ParseResourceOwners(target, o.OwnerReferences)
+		case *appsv1.ReplicaSet:
+			log.Warnf("ReplicaSet %s", o.Name)
+			target := getResourceId(o.Kind, o.APIVersion, o.Name)
+			r.ParseResourceOwners(target, o.OwnerReferences)
+		case *v1.Pod:
+			log.Warnf("Pod %s", o.Name)
+			target := getResourceId(o.Kind, o.APIVersion, o.Name)
+			r.ParseResourceOwners(target, o.OwnerReferences)
+		default:
+			log.Info(reflect.TypeOf(o))
+
 		}
 	}
 
+	log.Warn("End parse graph")
+
+}
+
+func (r *HelmReleaseGraph) ParseResourceOwners(id string, owners []metav1.OwnerReference) {
+
+	// We've got a pod, so associate it with its owner(s)
+	//objMeta.OwnerReferences
+
+	for _, owner := range owners {
+		source := getResourceId(owner.Kind, owner.APIVersion, owner.Name)
+
+		r.AddLink(source, id)
+	}
+
+}
+
+func (r *HelmReleaseGraph) ParsePodSpec(spec *v1.PodSpec, objMeta *metav1.ObjectMeta) {
+
+	// We've got a pod, so associate it with its owner(s)
+	if objMeta != nil {
+		//objMeta.OwnerReferences
+
+	}
+
 }
diff --git a/src/jetstream/plugins/kubernetes/list_releases.go b/src/jetstream/plugins/kubernetes/list_releases.go
index ce3751a096..0dcba6fdc1 100644
--- a/src/jetstream/plugins/kubernetes/list_releases.go
+++ b/src/jetstream/plugins/kubernetes/list_releases.go
@@ -190,7 +190,7 @@ func (c *KubernetesSpecification) GetRelease(ec echo.Context) error {
 	// Send over the namespace details of the release
 	sendResource(ws, "ReleasePrefix", id)
 
-	graph.ParseManifest(rel.KubeResources)
+	graph.ParseManifest(rel)
 
 	// Send the manifest for the release
 	sendResource(ws, "Manifest", rel.HelmManifest)
@@ -208,12 +208,10 @@ func (c *KubernetesSpecification) GetRelease(ec echo.Context) error {
 	sendResource(ws, "Pods", pods)
 
 	//graph.Generate(pods)
+	graph.ParseManifest(rel)
 
 	// Send the manifest for the release again (ReplicaSets will now be added)
-	sendResource(ws, "Manifest", rel.Resources)
-
-	// Send the manifest for the release again (ReplicaSets will now be added)
-	sendResource(ws, "Manifest2", rel.HelmManifest)
+	sendResource(ws, "Manifest", rel.HelmManifest)
 
 	// Now get all of the resources in the manifest
 	all := rel.GetResources(c.portalProxy)

From 7ddc6e3b2c476458b370bf5b0c2ee52506daae36 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 27 Nov 2019 08:43:12 +0000
Subject: [PATCH 173/648] Code tidy ups

---
 .../helm-release-tab-base.component.ts        |   3 +-
 .../tabs/helm-release-helper.service.ts       |   7 +-
 ...helm-release-resource-graph.component.html |  21 +-
 ...helm-release-resource-graph.component.scss |   2 +-
 .../helm-release-resource-graph.component.ts  | 101 ++++--
 .../helm-release-summary-tab.component.html   |   4 +-
 .../plugins/kubernetes/helm/graph.go          | 215 ++++++++++++
 .../plugins/kubernetes/helm/graph_status.go   |  62 ++++
 src/jetstream/plugins/kubernetes/helm/job.go  |  85 +++++
 .../plugins/kubernetes/helm/release.go        | 320 ++++++------------
 .../plugins/kubernetes/helm/release_graph.go  | 137 --------
 src/jetstream/plugins/kubernetes/helm/util.go |  52 +++
 .../plugins/kubernetes/list_releases.go       |  20 +-
 13 files changed, 644 insertions(+), 385 deletions(-)
 create mode 100644 src/jetstream/plugins/kubernetes/helm/graph.go
 create mode 100644 src/jetstream/plugins/kubernetes/helm/graph_status.go
 create mode 100644 src/jetstream/plugins/kubernetes/helm/job.go
 delete mode 100644 src/jetstream/plugins/kubernetes/helm/release_graph.go
 create mode 100644 src/jetstream/plugins/kubernetes/helm/util.go

diff --git a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts b/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
index c91fc403ab..765bd7f71e 100644
--- a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
@@ -131,7 +131,8 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
           graph.endpointId = this.helmReleaseHelper.endpointGuid;
           graph.releaseTitle = this.helmReleaseHelper.releaseTitle;
           console.log(graph);
-          this.addResource(helmReleaseGraphEntityType, graph, prefix, HELM_ENDPOINT_TYPE);
+          console.log(prefix);
+          this.addResource(helmReleaseGraphEntityType, graph, `${graph.endpointId}-${graph.releaseTitle}`, HELM_ENDPOINT_TYPE);
         } else if (messageObj.kind === 'Manifest' ||  messageObj.kind === 'Resources') {
           // Store all of the services
           const manifest = messageObj.data;
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
index 256719814d..071f191c51 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map, tap } from 'rxjs/operators';
 
 import { EntityServiceFactory } from '../../../../core/entity-service-factory.service';
 import { PaginationMonitor } from '../../../../shared/monitors/pagination-monitor';
@@ -56,9 +56,14 @@ export class HelmReleaseHelperService {
     // Get helm release
     const action = new GetHelmReleaseGraph(this.endpointGuid, this.releaseTitle);
 
+    console.log('fetchReleaseGraph');
     console.log(action);
 
     return this.esf.create<HelmReleaseGraph>(action.key, action).waitForEntity$.pipe(
+      tap(e => {
+        console.log('ENTITY HELMRELEASEGRAPH');
+        console.log(e);
+      }),
       map(entity => entity.entity)
     );
   }
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
index b3b6394569..1d9607cb8e 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
@@ -1,9 +1,23 @@
+<app-page-sub-nav>
+  <button mat-button name="fit" (click)="fitGraph()" matTooltip="Fit">
+    <mat-icon>aspect_ratio</mat-icon>
+    <span>Fit</span>
+  </button>
+  <button mat-button name="toggle" (click)="toggleLayout()" matTooltip="Toggle Layout">
+    <mat-icon>aspect_ratio</mat-icon>
+    <span>Toggle</span>
+  </button>
+</app-page-sub-nav>
+
+
 <ngx-graph
   class="chart-container"
   (zoomChange)="onZoomChanged($event)"
   [links]="links"
   [nodes]="nodes"
   [update$]="update$"
+  [zoomToFit$]="fit$"
+  [layout]="layout"
 >
 <ng-template #nodeTemplate let-node>
   <svg:g class="node">
@@ -11,9 +25,12 @@
       [attr.width]="node.dimension.width"
       [attr.height]="node.dimension.height"
       [attr.fill]="node.data.fill"
+      class="node"></svg:rect>
     />
-    <svg:text alignment-baseline="central" [attr.x]="10" [attr.y]="node.dimension.height / 2">
-      {{node.label}}
+    <svg:text alignment-baseline="central"
+    [attr.fill]="node.data.text"
+    [attr.x]="10" [attr.y]="node.dimension.height / 2">
+      {{node.label}} ({{node.data.kind}})
     </svg:text>
   </svg:g>
 </ng-template>
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss
index b879f01812..ec3bfddc2f 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss
@@ -2,4 +2,4 @@
   display: flex;
   height: 100%;
   width: 100%;
-}
\ No newline at end of file
+}
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
index 1fb9381888..a672525feb 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
@@ -1,14 +1,25 @@
 import { Node, Edge } from '@swimlane/ngx-graph';
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
 import { HelmReleaseHelperService } from '../helm-release-helper.service';
-import { Subject } from 'rxjs';
+import { Subject, Subscription } from 'rxjs';
+
+interface Colors {
+  bg: string;
+  fg: string;
+}
+
+const layouts = [
+  'dagre',
+  'd3ForceDirected',
+  'colaForceDirected'
+];
 
 @Component({
   selector: 'app-helm-release-resource-graph',
   templateUrl: './helm-release-resource-graph.component.html',
   styleUrls: ['./helm-release-resource-graph.component.scss']
 })
-export class HelmReleaseResourceGraphComponent implements OnInit {
+export class HelmReleaseResourceGraphComponent implements OnInit, OnDestroy {
 
   // see: https://swimlane.github.io/ngx-graph/#/#quick-start
 
@@ -17,47 +28,97 @@ export class HelmReleaseResourceGraphComponent implements OnInit {
 
   update$: Subject<boolean> = new Subject();
 
-  constructor(private helper: HelmReleaseHelperService) {
+  fit$: Subject<boolean> = new Subject();
+
+  public layout = 'dagre';
+
+  public layoutIndex = 0;
+
+  private graph: Subscription;
+
+  constructor(private helper: HelmReleaseHelperService) { }
+
+  ngOnInit() {
 
     console.log('GOING TO WAIT FOR RESOURCE GRAPH.....');
 
     // Listen for the graph
-    helper.fetchReleaseGraph().subscribe((g: any) => {
-      console.log('GOT RELEASE GRAPH');
-      console.log(g);
-
+    this.graph = this.helper.fetchReleaseGraph().subscribe((g: any) => {
       const newNodes = [];
       Object.values(g.nodes).forEach((node: any) => {
+        const colors = this.getColor(node.data.status);
         newNodes.push({
           id: node.id,
           label: node.label,
           data: {
             ...node.data,
-            color: this.getColor(node.data.kind),
-            fill: this.getColor(node.data.kind),
+            fill: colors.bg,
+            text: colors.fg
           },
         });
       });
-      console.log('------------');
-      console.log(newNodes);
       this.nodes = newNodes;
+
+      const newLinks = [];
+      Object.values(g.links).forEach((link: any) => {
+        newLinks.push({
+          id: link.id,
+          label: link.id,
+          source: link.source,
+          target: link.target
+        });
+      });
+      this.links = newLinks;
       this.update$.next(true);
     });
-   }
+  }
+
+  ngOnDestroy() {
+    if (this.graph) {
+      this.graph.unsubscribe();
+    }
+  }
 
-  ngOnInit() { }
+  public fitGraph() {
+    this.fit$.next(true);
+  }
+
+  public toggleLayout() {
+    this.layoutIndex++;
+    if (this.layoutIndex === layouts.length) {
+      this.layoutIndex = 0;
+    }
+
+    this.layout = layouts[this.layoutIndex];
+  }
 
-  private getColor(resourceType: string): string {
-    switch (resourceType) {
-      case 'Secret':
-        return 'red';
+  private getColor(status: string): Colors {
+    switch (status) {
+      case 'error':
+        return {
+          bg: 'red',
+          fg: 'white'
+        };
+      case 'ok':
+        return {
+          bg: 'green',
+          fg: 'white'
+        };
+      case 'warn':
+        return {
+          bg: 'orange',
+          fg: 'white'
+        };
       default:
-        return 'blue';
+        return {
+          bg: 'cyan',
+          fg: 'black'
+        };
     }
   }
 
   public onZoomChanged(e) {
-    console.log(e);
+    //console.log(e);
   }
 
 }
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
index 75141f51a7..5316d836fc 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
@@ -21,10 +21,10 @@
           </app-metadata-item>
           <app-metadata-item class="chart-details__item" label="Status">{{ release.status }}</app-metadata-item>
           <app-metadata-item class="chart-details__item" label="First Deployed">
-            {{ release.info.firstDeployed | date:'medium' }}
+            {{ release.info.first_deployed | date:'medium' }}
           </app-metadata-item>
           <app-metadata-item class="chart-details__item" label="Last Deployed">
-            {{ release.info.lastDeployed | date:'medium' }}
+            {{ release.info.last_deployed | date:'medium' }}
           </app-metadata-item>
         </div>
         <!-- <app-tile-grid>
diff --git a/src/jetstream/plugins/kubernetes/helm/graph.go b/src/jetstream/plugins/kubernetes/helm/graph.go
new file mode 100644
index 0000000000..a42e37d585
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/helm/graph.go
@@ -0,0 +1,215 @@
+package helm
+
+import (
+	"fmt"
+
+	"reflect"
+	"strings"
+
+	log "github.com/sirupsen/logrus"
+	appsv1 "k8s.io/api/apps/v1"
+	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+type HelmReleaseGraph struct {
+	Release *HelmRelease           `json:"-"`
+	Nodes   map[string]ReleaseNode `json:"nodes"`
+	Links   map[string]ReleaseLink `json:"links"`
+}
+
+type ReleaseNode struct {
+	ID    string `json:"id"`
+	Label string `json:"label"`
+	Data  struct {
+		Kind   string `json:"kind"`
+		Status NodeStatus `json:"status"`
+	} `json:"data"`
+}
+
+type ReleaseLink struct {
+	ID     string `json:"id"`
+	Source string `json:"source"`
+	Target string `json:"target"`
+}
+
+// NewHelmReleaseGraph represents graph of the Helm Release
+func NewHelmReleaseGraph(release *HelmRelease) *HelmReleaseGraph {
+	r := &HelmReleaseGraph{
+		Release: release,
+	}
+	r.Nodes = make(map[string]ReleaseNode)
+	r.Links = make(map[string]ReleaseLink)
+	return r
+}
+
+func (r *HelmReleaseGraph) AddLink(source, target string) {
+	link := ReleaseLink{
+		ID:     fmt.Sprintf("%s_to_%s", source, target),
+		Source: source,
+		Target: target,
+	}
+	r.Links[link.ID] = link
+	log.Warnf("Adding link %s -> %s", source, target)
+}
+
+// ParseManifest
+func (r *HelmReleaseGraph) ParseManifest(release *HelmRelease) {
+
+	log.Warnf("Graph:: Parse ManifestL %d", len(release.Resources))
+
+	for _, item := range release.Resources {
+		log.Warn(item.Kind)
+
+		node := ReleaseNode{
+			ID:    fmt.Sprintf("%s-%s", item.Kind, item.Metadata.Name),
+			Label: item.Metadata.Name,
+		}
+
+		node.Data.Kind = item.Kind
+		node.Data.Status = "unknown"
+
+		switch o := item.Resource.(type) {
+		case *appsv1.Deployment:
+			target := getShortResourceId(o.Kind, o.Name)
+			r.ParseResourceOwners(target, o.OwnerReferences)
+		case *appsv1.ReplicaSet:
+			target := getShortResourceId(o.Kind, o.Name)
+			r.ParseResourceOwners(target, o.OwnerReferences)
+			node.Data.Status = mapReplicaSetStatus(o.Status)
+		case *v1.Pod:
+			target := getShortResourceId(item.Kind, o.Name)
+			r.ParseResourceOwners(target, o.OwnerReferences)
+			r.ProcessPod(target, item, o.Spec, o.Status)
+			node.Data.Status = mapPodStatus(o.Status.Phase)
+		case *v1.Service:
+			target := getShortResourceId(item.Kind, o.Name)
+			r.ProcessService(target, item, o.Spec)
+		default:
+			log.Info(reflect.TypeOf(o))
+		}
+
+		// Add or replace the node in the map
+		r.Nodes[node.ID] = node
+	}
+
+	// Make sure all links have nodes
+	for _, link := range r.Links {
+		if _, ok := r.Nodes[link.Source]; !ok {
+			r.generateTemporaryNode(link.Source)
+		}
+		if _, ok := r.Nodes[link.Target]; !ok {
+			r.generateTemporaryNode(link.Target)
+		}
+	}
+
+	log.Warn("End parse graph")
+}
+
+func (r *HelmReleaseGraph) generateTemporaryNode(id string) {
+	var parts = strings.Split(id, "-")
+
+	node := ReleaseNode{
+		ID:    id,
+		Label: parts[1],
+	}
+
+	node.Data.Kind = parts[0]
+	node.Data.Status = "missing"
+
+	r.Nodes[node.ID] = node
+}
+
+func getShortResourceId(kind, name string) string {
+	// // TODO: FIX
+	// if len(kind) == 0 {
+	// 	kind = "Pod"
+	// }
+	return fmt.Sprintf("%s-%s", kind, name)
+}
+
+func (r *HelmReleaseGraph) ParseResourceOwners(id string, owners []metav1.OwnerReference) {
+	// We've got a pod, so associate it with its owner(s)
+	//objMeta.OwnerReferences
+	for _, owner := range owners {
+		source := getShortResourceId(owner.Kind, owner.Name)
+		r.AddLink(source, id)
+	}
+}
+
+func (r *HelmReleaseGraph) ProcessPod(id string, res KubeResource, spec v1.PodSpec, status v1.PodStatus) {
+	// Look through volumes
+	// name and: PersistentVolumeClaim.ClaimName or Secret.SecretName
+	log.Warnf("Processing Pod Volumes for %s", id)
+	for _, volume := range spec.Volumes {
+		if volume.VolumeSource.PersistentVolumeClaim != nil {
+			ref := fmt.Sprintf("PersistentVolumeClaim-%s", volume.VolumeSource.PersistentVolumeClaim.ClaimName)
+			r.AddLink(id, ref)
+		} else if volume.VolumeSource.Secret != nil {
+			ref := fmt.Sprintf("Secret-%s", volume.VolumeSource.Secret.SecretName)
+			r.AddLink(id, ref)
+		} else if volume.VolumeSource.ConfigMap != nil {
+			ref := fmt.Sprintf("ConfigMap-%s", volume.VolumeSource.ConfigMap.Name)
+			r.AddLink(id, ref)
+		}
+	}
+
+	// Go through the pod and process each container
+	// Add a node for each container
+	for _, container := range spec.Containers {
+		node := ReleaseNode{
+			ID:    fmt.Sprintf("%s-%s", id, container.Name),
+			Label: container.Name,
+		}
+
+		node.Data.Kind = "Container"
+		node.Data.Status = mapContainerStatus(status, container.Name)
+
+		// Add a node for the container and link it to the pod
+		r.Nodes[node.ID] = node
+		r.AddLink(id, node.ID)
+
+		// Add links for ConfigMaps and Secrets used in the env_from
+		for _, envFrom := range container.EnvFrom {
+			if envFrom.ConfigMapRef != nil {
+				ref := fmt.Sprintf("ConfigMap-%s", envFrom.ConfigMapRef.Name)
+				r.AddLink(node.ID, ref)
+			} else if envFrom.SecretRef != nil {
+				ref := fmt.Sprintf("Secret-%s", envFrom.SecretRef.Name)
+				r.AddLink(node.ID, ref)
+			}
+		}
+
+		// Add links for ConfigMaps and Secrets used in the env
+		for _, env := range container.Env {
+			if env.ValueFrom != nil {
+				if env.ValueFrom.ConfigMapKeyRef != nil {
+					ref := fmt.Sprintf("ConfigMap-%s", env.ValueFrom.ConfigMapKeyRef)
+					r.AddLink(node.ID, ref)
+				} else if env.ValueFrom.SecretKeyRef != nil {
+					ref := fmt.Sprintf("Secret-%s", env.ValueFrom.SecretKeyRef.Name)
+					r.AddLink(node.ID, ref)
+				}
+			}
+		}
+	}
+}
+
+func (r *HelmReleaseGraph) ProcessService(id string, res KubeResource, spec v1.ServiceSpec) {
+	if len(spec.Selector) > 0 {
+		// Find all Pods that match this selector
+		for _, item := range r.Release.Resources {
+			switch o := item.Resource.(type) {
+			case *v1.Pod:
+				log.Warnf("Pod %s", o.Name)
+
+				if labelsMatch(spec.Selector, o.Labels) {
+					log.Error("GOT A POD FOR THE SERVICE: %s", o.Name)
+
+					podID := fmt.Sprintf("Pod-%s", o.Name)
+					r.AddLink(podID, id)
+				}
+			}
+		}
+	}
+}
diff --git a/src/jetstream/plugins/kubernetes/helm/graph_status.go b/src/jetstream/plugins/kubernetes/helm/graph_status.go
new file mode 100644
index 0000000000..f1820acc92
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/helm/graph_status.go
@@ -0,0 +1,62 @@
+package helm
+
+import (
+	log "github.com/sirupsen/logrus"
+	appsv1 "k8s.io/api/apps/v1"
+	v1 "k8s.io/api/core/v1"
+)
+
+// NodeStatus represents the status of a node in the graph
+type NodeStatus string
+
+const (
+	NodeOK      NodeStatus = "ok"
+	NodeWarn    NodeStatus = "warn"
+	NodeError   NodeStatus = "error"
+	NodeUnknown NodeStatus = "unknown"
+	NodeNone    NodeStatus = "none"
+)
+
+func mapReplicaSetStatus(status appsv1.ReplicaSetStatus) NodeStatus {
+	if status.Replicas == status.ReadyReplicas {
+		return NodeOK
+	}
+
+	if status.Replicas != status.AvailableReplicas {
+		return NodeError
+	}
+
+	return NodeWarn
+}
+
+func mapContainerStatus(status v1.PodStatus, name string) NodeStatus {
+	for _, cstat := range status.ContainerStatuses {
+		if cstat.Name == name {
+			if cstat.Ready {
+				return NodeOK
+			} else {
+				return NodeWarn
+			}
+		}
+	}
+	return NodeError
+}
+
+func mapPodStatus(phase v1.PodPhase) NodeStatus {
+
+	status := NodeUnknown
+
+	switch phase {
+	case v1.PodFailed:
+		status = NodeError
+	case v1.PodRunning:
+		status = NodeOK
+	case v1.PodSucceeded:
+		status = NodeOK
+	case v1.PodPending:
+		status = NodeWarn
+	}
+
+	log.Infof("Map Pod Status: %s => %s", phase, status)
+	return status
+}
diff --git a/src/jetstream/plugins/kubernetes/helm/job.go b/src/jetstream/plugins/kubernetes/helm/job.go
new file mode 100644
index 0000000000..18af13792e
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/helm/job.go
@@ -0,0 +1,85 @@
+package helm
+
+import (
+	log "github.com/sirupsen/logrus"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+)
+
+// KubeResourceJob = Resource(s) that we need to go and fetch
+type KubeResourceJob struct {
+	ID         string
+	Kind       string
+	APIVersion string
+	Name       string
+	Namespace  string
+	Endpoint   string
+	User       string
+	URL        string
+	Parent     string
+}
+
+// KubeResourceJobResult is the result from a job
+type KubeResourceJobResult struct {
+	KubeResourceJob
+	StatusCode int
+	Data       []byte
+}
+
+// KubeAPIJob represents a set of jobs to run against the Kube API
+type KubeAPIJob struct {
+	Jetstream interfaces.PortalProxy
+	Jobs      []KubeResourceJob
+}
+
+// NewKubeAPIJob returns a helper that can execute all jobs and return results
+func NewKubeAPIJob(jetstream interfaces.PortalProxy, jobs []KubeResourceJob) *KubeAPIJob {
+	r := &KubeAPIJob{
+		Jetstream: jetstream,
+		Jobs:      jobs,
+	}
+	return r
+}
+
+// Run will run all of the jobs
+func (j *KubeAPIJob) Run() []KubeResourceJobResult {
+	count := len(j.Jobs)
+	var res []KubeResourceJobResult
+	kubeJobs := make(chan KubeResourceJob, count)
+	kubeResults := make(chan KubeResourceJobResult, count)
+
+	for w := 1; w <= 4; w++ {
+		go j.restWorker(j.Jetstream, w, kubeJobs, kubeResults)
+	}
+
+	for _, j := range j.Jobs {
+		kubeJobs <- j
+	}
+
+	close(kubeJobs)
+
+	var v KubeResourceJobResult
+	for a := 1; a <= count; a++ {
+		v = <-kubeResults
+		res = append(res, v)
+	}
+
+	return res
+}
+
+func (j *KubeAPIJob) restWorker(jetstream interfaces.PortalProxy, id int, jobs <-chan KubeResourceJob, results chan<- KubeResourceJobResult) {
+	for job := range jobs {
+		response, err := j.Jetstream.DoProxySingleRequest(job.Endpoint, job.User, "GET", job.URL, nil, nil)
+		log.Infof("%s - %d", job.URL, response.StatusCode)
+		res := KubeResourceJobResult{
+			KubeResourceJob: job,
+			StatusCode:      response.StatusCode,
+			Data:            response.Response,
+		}
+
+		if err != nil {
+			log.Errorf("KubeAPIJob: Failed to run job: %+v", err)
+		}
+		results <- res
+	}
+}
diff --git a/src/jetstream/plugins/kubernetes/helm/release.go b/src/jetstream/plugins/kubernetes/helm/release.go
index 4ec23ec6f6..3a4119e1e6 100644
--- a/src/jetstream/plugins/kubernetes/helm/release.go
+++ b/src/jetstream/plugins/kubernetes/helm/release.go
@@ -5,7 +5,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-
 	"reflect"
 
 	//	"io"
@@ -13,74 +12,41 @@ import (
 
 	log "github.com/sirupsen/logrus"
 	"helm.sh/helm/v3/pkg/release"
-	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-
-	// kyaml "k8s.io/apimachinery/pkg/util/yaml"
+	appsv1 "k8s.io/api/apps/v1"
+	appsv1beta1 "k8s.io/api/apps/v1beta1"
+	appsv1beta2 "k8s.io/api/apps/v1beta2"
+	extv1beta1 "k8s.io/api/extensions/v1beta1"
 	"k8s.io/client-go/kubernetes/scheme"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 )
 
+// HelmRelease represents a Helm Release deployed via Helm
 type HelmRelease struct {
 	*release.Release
-	Endpoint      string            `json:"-"`
-	User          string            `json:"-"`
-	Extra         string            `json:"extra"`
-	HelmManifest  []runtime.Object  `json:"helmManifest"`
-	Resources     []interface{}     `json:"resources"`
-	KubeResources []KubeResource    `json:"-"`
-	ResourceNames map[string]bool   `json:"-"`
-	Jobs          []KubeResourceJob `json:"-"`
-	PodJobs       []KubeResourceJob `json:"-"`
+	Endpoint string `json:"-"`
+	User     string `json:"-"`
+	Resources map[string]KubeResource `json:"resources"`
+	Jobs    []KubeResourceJob `json:"-"`
+	PodJobs []KubeResourceJob `json:"-"`
 }
 
+// KubeResource is a simple struct to pull out core common metadata for a Kube resource
 type KubeResource struct {
 	Kind       string `yaml:"kind" json:"kind"`
 	APIVersion string `yaml:"apiVersion" json:"apiVersion"`
 	Metadata   struct {
 		Name string `yaml:"name" json:"name"`
 	} `yaml:"metadata" json:"metadata"`
-	Spec interface{} `yaml:"spec"`
-}
-
-// type KubeLabelSelectorRequirement struct {
-// 	Key      string                       `yaml:"key"`
-// 	Operator metav1.LabelSelectorOperator `yaml:"operator"`
-// 	Values   []string                     `yaml:values"`
-// }
-
-// type KubeDeploymentResource struct {
-// 	Spec struct {
-// 		Selector struct {
-// 			MatchLabels map[string]string `yaml:"matchLabels"`
-// 			// matchExpressions is a list of label selector requirements. The requirements are ANDed.
-// 			// +optional
-// 			MatchExpressions []KubeLabelSelectorRequirement `yaml:"matchExpressions"`
-// 		} `yaml:"selector"`
-// 	} `yaml:"spec"`
-// }
-
-// KubeResourceJob = Resource(s) that we need to go and fetch
-type KubeResourceJob struct {
-	ID         string
-	Kind       string
-	APIVersion string
-	Name       string
-	Namespace  string
-	Endpoint   string
-	User       string
-	URL        string
-	Parent     string
+	Resource interface{} `yaml:"resource"`
+	Manifest bool
 }
 
-// KubeResourceJobResult is the result from a job
-type KubeResourceJobResult struct {
-	KubeResourceJob
-	StatusCode int
-	Data       json.RawMessage
+func (r *KubeResource) getID() string {
+	return fmt.Sprintf("%s-%s-%s", r.Kind, r.APIVersion, r.Metadata.Name)
 }
 
 // NewHelmRelease represents extended info about a Helm Release
@@ -90,19 +56,15 @@ func NewHelmRelease(info *release.Release, endpoint, user string) *HelmRelease {
 		Endpoint: endpoint,
 		User:     user,
 	}
-	r.ResourceNames = make(map[string]bool)
-	r.HelmManifest = make([]runtime.Object, 0)
-	r.KubeResources = make([]KubeResource, 0)
-
+	r.Resources = make(map[string]KubeResource)
 	r.parseManifest()
 	return r
 }
 
+// Parse the release manifest from the Helm release
 func (r *HelmRelease) parseManifest() {
-	// Parse the release manifest from the Helm release
 	reader := bytes.NewReader([]byte(r.Manifest))
 	buffer := bufio.NewReader(reader)
-
 	var bufr strings.Builder
 	for {
 		line, err := buffer.ReadString('\n')
@@ -111,26 +73,10 @@ func (r *HelmRelease) parseManifest() {
 			if len(data) > 0 {
 				decode := scheme.Codecs.UniversalDeserializer().Decode
 				obj, _, err := decode([]byte(bufr.String()), nil, nil)
-
 				if err != nil {
-					log.Error(fmt.Sprintf("Error while decoding YAML object. Err was: %s", err))
+					log.Error(fmt.Sprintf("Helm Manifest Parser: Error while decoding YAML object. Err was: %s", err))
 				} else {
 					r.processResource(obj)
-
-					// // TODO: Should be an easier way of doing this?
-					// j, err := json.Marshal(obj)
-					// if err != nil {
-					// 	log.Info("Can not marshal to JSON")
-					// } else {
-					// 	log.Info("CAN MARSHAL TO JSON")
-					// 	var t KubeResource
-					// 	if json.Unmarshal(j, &t) == nil {
-					// 		log.Warn("YES - GOT IT AS A KUBE RESOURCE")
-					// 		log.Warn(t.Metadata.Name)
-					// 	} else {
-					// 		log.Error("NO GO")
-					// 	}
-					// }
 				}
 
 				bufr.Reset()
@@ -149,50 +95,50 @@ func getResourceIdentifier(typeMeta metav1.TypeMeta, objectMeta metav1.ObjectMet
 	return fmt.Sprintf("%s-%s-%s", typeMeta.Kind, typeMeta.APIVersion, objectMeta.Name)
 }
 
-func getResourceId(kind, apiVersion, name string) string {
-	return fmt.Sprintf("%s-%s-%s", kind, apiVersion, name)
+func (r *HelmRelease) setResource(res KubeResource) {
+	r.Resources[res.getID()] = res
 }
 
-// process a yaml resource from the helm manifest
-func (r *HelmRelease) processResource(obj runtime.Object) {
+// GetResources gets all fo the resources for the release
+func (r *HelmRelease) GetResources() []interface{} {
+	var resources []interface{}
+	for _, res := range r.Resources {
+		resources = append(resources, res.Resource)
+	}
+	return resources
+}
 
-	r.HelmManifest = append(r.HelmManifest, obj)
-	r.Resources = append(r.Resources, obj)
+// GetPods gets the pod resources for the release
+func (r *HelmRelease) GetPods() []interface{} {
+	var resources []interface{}
+	for _, res := range r.Resources {
+		if res.Kind == "Pod" {
+			resources = append(resources, res.Resource)
+		}
+	}
+	return resources
+}
 
-	// TODO: Should be an easier way of doing this?
+// process a yaml resource from the helm manifest
+func (r *HelmRelease) processResource(obj runtime.Object) {
 	j, err := json.Marshal(obj)
 	if err == nil {
-		log.Info("CAN MARSHAL TO JSON")
 		var t KubeResource
 		if json.Unmarshal(j, &t) == nil {
-			r.KubeResources = append(r.KubeResources, t)
+			t.Resource = obj
+			t.Manifest = true
+			r.setResource(t)
 			log.Infof("Got resource: %s : %s", t.Kind, t.Metadata.Name)
-
 			if t.Kind == "Deployment" || t.Kind == "StatefulSet" || t.Kind == "DaemonSet" {
-				log.Warnf("Getting selectors for %s", t.Kind)
-				r.processDeployment(t, obj)
+				r.processDeployment(t)
 			}
 			r.addJobForResource(t.Kind, t.APIVersion, t.Metadata.Name)
 		} else {
-			log.Error("NO GO")
+			log.Error("Helm Release Manifest: Could not parse Kubernetes resource")
 		}
 	}
 }
 
-// func (r *HelmRelease) addJobForResource(t KubeResource) {
-// 	job := KubeResourceJob{
-// 		ID:         fmt.Sprintf("%s-%s#Pods", t.Kind, t.Metadata.Name),
-// 		Endpoint:   r.Endpoint,
-// 		User:       r.User,
-// 		Namespace:  r.Namespace,
-// 		Name:       t.Metadata.Name,
-// 		URL:        getRestURL(r.Namespace, t),
-// 		APIVersion: t.APIVersion,
-// 		Kind:       t.Kind,
-// 	}
-// 	r.Jobs = append(r.Jobs, job)
-// }
-
 func (r *HelmRelease) addJobForResource(kind, apiVersion, name string) {
 	job := KubeResourceJob{
 		ID:         fmt.Sprintf("%s-%s#Pods", kind, name),
@@ -207,20 +153,25 @@ func (r *HelmRelease) addJobForResource(kind, apiVersion, name string) {
 	r.Jobs = append(r.Jobs, job)
 }
 
-func (r *HelmRelease) processDeployment(kres KubeResource, obj runtime.Object) {
-	switch o := obj.(type) {
+func (r *HelmRelease) processDeployment(kres KubeResource) {
+	switch o := kres.Resource.(type) {
 	case *appsv1.Deployment:
-		log.Warn("Deployment")
-		log.Info(o.Spec.Selector)
+		r.processPodSelector(kres, o.Spec.Selector)
+	case *appsv1beta1.Deployment:
+		r.processPodSelector(kres, o.Spec.Selector)
+	case *appsv1beta2.Deployment:
+		r.processPodSelector(kres, o.Spec.Selector)
+	case *extv1beta1.Deployment:
 		r.processPodSelector(kres, o.Spec.Selector)
 	case *appsv1.StatefulSet:
-		log.Warn("Statefulset")
+		r.processPodSelector(kres, o.Spec.Selector)
+	case *appsv1beta2.StatefulSet:
 		r.processPodSelector(kres, o.Spec.Selector)
 	case *appsv1.DaemonSet:
-		log.Warn("DaemonSet")
 		r.processPodSelector(kres, o.Spec.Selector)
 	default:
 		// Ignore
+		log.Errorf("Ignoring: deployment type: %s", reflect.TypeOf(o))
 	}
 }
 
@@ -236,70 +187,37 @@ func (r *HelmRelease) processPodSelector(kres KubeResource, selector *metav1.Lab
 		User:      r.User,
 		Namespace: r.Namespace,
 	}
-
 	r.PodJobs = append(r.PodJobs, job)
 }
 
-// See: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
-func podSelectorToQueryString(selector *metav1.LabelSelector) string {
-
-	qs := "?labelSelector="
-	ml := ""
-	sep := ""
-
-	// Match labels
-	for k, v := range selector.MatchLabels {
-		fmt.Printf("key[%s] value[%s]\n", k, v)
-		if len(ml) > 0 {
-			sep = ","
-		}
-
-		ml = fmt.Sprintf("%s%s%s%%3D%s", ml, sep, k, v)
-	}
-
-	// Now add set based match expressions
-	for _, v := range selector.MatchExpressions {
-		if len(ml) > 0 {
-			sep = ","
-		}
-		ml = fmt.Sprintf("%s%s%s+%s+%%28%s%%s29", ml, sep, v.Key, v.Operator, strings.Join(v.Values, "%%2C"))
-	}
-
-	if len(ml) > 0 {
-		return fmt.Sprintf("%s%s", qs, ml)
-	}
-
-	return ""
-}
-
-func (r *HelmRelease) GetPods(jetstream interfaces.PortalProxy) []v1.Pod {
-	var podList []v1.Pod
-
+// UpdatePods will run the jobs needed to get the pods
+// This uses the selectors to find the pods - so new pods should be picked up
+func (r *HelmRelease) UpdatePods(jetstream interfaces.PortalProxy) {
 	// This will be an array of pod lists
-	res := r.runJobs(jetstream, r.PodJobs)
+	runner := NewKubeAPIJob(jetstream, r.PodJobs)
+	res := runner.Run()
 	for _, j := range res {
 		var list v1.PodList
 		err := json.Unmarshal(j.Data, &list)
 		if err == nil {
 			for _, pod := range list.Items {
-				log.Info(reflect.TypeOf(pod))
 				// Add a kube resource for the pod
 				res := KubeResource{
-					Kind: pod.Kind,
-					APIVersion: pod.APIVersion,
+					Kind:       "Pod",
+					APIVersion: "v1",
 				}
 				res.Metadata.Name = pod.Name
-				log.Info("POD")
-				log.Infof("%+v", res)
-				r.KubeResources = append(r.KubeResources, res)
-				r.Resources = append(r.Resources, &res)
-				podList = append(podList, pod)
+				res.Manifest = false
+
+				podCopy := &v1.Pod{}
+				*podCopy = pod
+				res.Resource = podCopy
+
+				r.setResource(res)
 				r.processPodOwners(pod)
 			}
 		}
 	}
-
-	return podList
 }
 
 // Pods can be owned by a ReplicaSet - these are not represented in the manifest, as they
@@ -319,14 +237,17 @@ func (r *HelmRelease) processPodOwners(pod v1.Pod) {
 				Namespace: r.Namespace,
 			}
 			identifier := getResourceIdentifier(resource.TypeMeta, resource.ObjectMeta)
-			if _, ok := r.ResourceNames[identifier]; !ok {
-				r.Resources = append(r.Resources, &resource)
-				//r.HelmResources = append(r.HelmResources, resource)
-
-				r.ResourceNames[identifier] = true
-				r.KubeResources = append(r.KubeResources, r.getKubeResource(resource.TypeMeta, resource.ObjectMeta))
+			if _, ok := r.Resources[identifier]; !ok {
+				// Create a Kube Resource for the ReplicaSet
+				res := KubeResource{
+					Kind:       resource.Kind,
+					APIVersion: resource.APIVersion,
+				}
+				res.Metadata.Name = resource.Name
+				res.Manifest = false
+				res.Resource = &resource
+				r.setResource(res)
 
-				// TODO: Need a KubeResource
 				r.addJobForResource(owner.Kind, owner.APIVersion, owner.Name)
 			}
 		} else {
@@ -335,68 +256,41 @@ func (r *HelmRelease) processPodOwners(pod v1.Pod) {
 	}
 }
 
-func (r *HelmRelease) getKubeResource(typeMeta metav1.TypeMeta, objectMeta metav1.ObjectMeta) KubeResource {
-	kres := KubeResource{
-		Kind:       typeMeta.Kind,
-		APIVersion: typeMeta.APIVersion,
-	}
-	kres.Metadata.Name = objectMeta.Name
-	return kres
-}
-
-func (r *HelmRelease) GetResources(jetstream interfaces.PortalProxy) []json.RawMessage {
-	var resourceList []json.RawMessage
+// func (r *HelmRelease) getKubeResource(typeMeta metav1.TypeMeta, objectMeta metav1.ObjectMeta) KubeResource {
+// 	kres := KubeResource{
+// 		Kind:       typeMeta.Kind,
+// 		APIVersion: typeMeta.APIVersion,
+// 	}
+// 	kres.Metadata.Name = objectMeta.Name
+// 	return kres
+// }
 
+func (r *HelmRelease) UpdateResources(jetstream interfaces.PortalProxy) {
 	// This will be an array of resources
-	res := r.runJobs(jetstream, r.Jobs)
+	runner := NewKubeAPIJob(jetstream, r.Jobs)
+	res := runner.Run()
 	for _, j := range res {
-		resourceList = append(resourceList, j.Data)
-	}
-
-	return resourceList
-}
-
-func (r *HelmRelease) runJobs(jetstream interfaces.PortalProxy, jobs []KubeResourceJob) []KubeResourceJobResult {
-	count := len(jobs)
-	var res []KubeResourceJobResult
-
-	kubeJobs := make(chan KubeResourceJob, count)
-	kubeResults := make(chan KubeResourceJobResult, count)
-
-	for w := 1; w <= 4; w++ {
-		go r.restWorker(jetstream, w, kubeJobs, kubeResults)
-	}
-
-	for _, j := range jobs {
-		kubeJobs <- j
-	}
 
-	close(kubeJobs)
+		// TODO: If the status was 404, then we should remove the resource
 
-	var v KubeResourceJobResult
-
-	for a := 1; a <= count; a++ {
-		v = <-kubeResults
-		res = append(res, v)
-	}
-
-	return res
-}
-
-func (r *HelmRelease) restWorker(jetstream interfaces.PortalProxy, id int, jobs <-chan KubeResourceJob, results chan<- KubeResourceJobResult) {
-	for j := range jobs {
-		response, err := jetstream.DoProxySingleRequest(j.Endpoint, j.User, "GET", j.URL, nil, nil)
-		log.Info(response.StatusCode)
-		res := KubeResourceJobResult{
-			KubeResourceJob: j,
-			StatusCode:      response.StatusCode,
-			Data:            json.RawMessage(response.Response),
+		// Add a kube resource for the pod
+		res := KubeResource{
+			Kind:       j.Kind,
+			APIVersion: j.APIVersion,
 		}
+		res.Metadata.Name = j.Name
 
-		if err != nil {
-			log.Error("COULD NOT MAKE API REQUEST")
+		// TODO: This should carry over
+		res.Manifest = false
+
+		decode := scheme.Codecs.UniversalDeserializer().Decode
+		obj, _, err := decode(j.Data, nil, nil)
+		if err == nil {
+			res.Resource = obj
+			r.setResource(res)
+		} else {
+			log.Error("Could not parse resource")
 		}
-		results <- res
 	}
 }
 
diff --git a/src/jetstream/plugins/kubernetes/helm/release_graph.go b/src/jetstream/plugins/kubernetes/helm/release_graph.go
deleted file mode 100644
index 0bce5cfc0d..0000000000
--- a/src/jetstream/plugins/kubernetes/helm/release_graph.go
+++ /dev/null
@@ -1,137 +0,0 @@
-package helm
-
-import (
-	"fmt"
-
-	"reflect"
-
-	log "github.com/sirupsen/logrus"
-	appsv1 "k8s.io/api/apps/v1"
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-type HelmReleaseGraph struct {
-	Release *HelmRelease           `json:"-"`
-	Nodes   map[string]ReleaseNode `json:"nodes"`
-	Links   map[string]ReleaseLink `json:"links"`
-}
-
-type ReleaseNode struct {
-	ID    string `json:"id"`
-	Label string `json:"label"`
-	Data  struct {
-		Kind   string `json:"kind"`
-		Status string `json:"status"`
-	} `json:"data"`
-}
-
-type ReleaseLink struct {
-	ID     string `json:"id"`
-	Source string `json:"source"`
-	Target string `json:"target"`
-}
-
-// NewHelmReleaseGraph represents graph of the Helm Release
-func NewHelmReleaseGraph(release *HelmRelease) *HelmReleaseGraph {
-	r := &HelmReleaseGraph{
-		Release: release,
-	}
-	r.Nodes = make(map[string]ReleaseNode)
-	r.Links = make(map[string]ReleaseLink)
-	return r
-}
-
-func (r *HelmReleaseGraph) AddLink(source, target string) {
-	link := ReleaseLink{
-		ID:     fmt.Sprintf("%s->%s", source, target),
-		Source: source,
-		Target: target,
-	}
-	r.Links[link.ID] = link
-	log.Warnf("Adding link %s -> %s", source, target)
-}
-
-// ParseManifest
-func (r *HelmReleaseGraph) ParseManifest(release *HelmRelease) {
-
-	log.Warnf("Graph:: Parse ManifestL %d", len(release.KubeResources))
-
-	for _, item := range release.KubeResources {
-		log.Warn(item.Kind)
-
-		node := ReleaseNode{
-			ID:    fmt.Sprintf("%s-%s", item.Kind, item.Metadata.Name),
-			Label: item.Metadata.Name,
-		}
-
-		node.Data.Kind = item.Kind
-		node.Data.Status = "unknown"
-
-		// Add or replace the node in the map
-		r.Nodes[node.ID] = node
-
-		// if item.Kind == "Deployment" {
-		// 	log.Info("Parsing deployment")
-		// 	log.Infof("%+v", item.Spec)
-
-		// 	// Covnert the spec back to json
-		// 	js, err := json.Marshal(item.Spec)
-		// 	if err != nil {
-		// 		log.Error("Can not marhsal deployment")
-		// 	} else {
-		// 		log.Warn(string(js))
-		// 	}
-		// }
-	}
-
-	log.Info(len(release.Resources))
-
-	// Now go through the pods and generate relationships
-	for _, obj := range release.Resources {
-
-		switch o := obj.(type) {
-		case *appsv1.Deployment:
-			log.Warnf("Deployment %s", o.Name)
-			target := getResourceId(o.Kind, o.APIVersion, o.Name)
-			r.ParseResourceOwners(target, o.OwnerReferences)
-		case *appsv1.ReplicaSet:
-			log.Warnf("ReplicaSet %s", o.Name)
-			target := getResourceId(o.Kind, o.APIVersion, o.Name)
-			r.ParseResourceOwners(target, o.OwnerReferences)
-		case *v1.Pod:
-			log.Warnf("Pod %s", o.Name)
-			target := getResourceId(o.Kind, o.APIVersion, o.Name)
-			r.ParseResourceOwners(target, o.OwnerReferences)
-		default:
-			log.Info(reflect.TypeOf(o))
-
-		}
-	}
-
-	log.Warn("End parse graph")
-
-}
-
-func (r *HelmReleaseGraph) ParseResourceOwners(id string, owners []metav1.OwnerReference) {
-
-	// We've got a pod, so associate it with its owner(s)
-	//objMeta.OwnerReferences
-
-	for _, owner := range owners {
-		source := getResourceId(owner.Kind, owner.APIVersion, owner.Name)
-
-		r.AddLink(source, id)
-	}
-
-}
-
-func (r *HelmReleaseGraph) ParsePodSpec(spec *v1.PodSpec, objMeta *metav1.ObjectMeta) {
-
-	// We've got a pod, so associate it with its owner(s)
-	if objMeta != nil {
-		//objMeta.OwnerReferences
-
-	}
-
-}
diff --git a/src/jetstream/plugins/kubernetes/helm/util.go b/src/jetstream/plugins/kubernetes/helm/util.go
new file mode 100644
index 0000000000..7e20ec5513
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/helm/util.go
@@ -0,0 +1,52 @@
+package helm
+
+import (
+	"fmt"
+	"strings"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// See: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+func podSelectorToQueryString(selector *metav1.LabelSelector) string {
+
+	qs := "?labelSelector="
+	ml := ""
+	sep := ""
+
+	// Match labels
+	for k, v := range selector.MatchLabels {
+		fmt.Printf("key[%s] value[%s]\n", k, v)
+		if len(ml) > 0 {
+			sep = ","
+		}
+
+		ml = fmt.Sprintf("%s%s%s%%3D%s", ml, sep, k, v)
+	}
+
+	// Now add set based match expressions
+	for _, v := range selector.MatchExpressions {
+		if len(ml) > 0 {
+			sep = ","
+		}
+		ml = fmt.Sprintf("%s%s%s+%s+%%28%s%%s29", ml, sep, v.Key, v.Operator, strings.Join(v.Values, "%%2C"))
+	}
+
+	if len(ml) > 0 {
+		return fmt.Sprintf("%s%s", qs, ml)
+	}
+
+	return ""
+}
+
+// Check that the selectors maps contains everything in the find map
+func labelsMatch(find, selectors map[string]string) bool {
+	for k, v := range find {
+		if sv, ok := selectors[k]; ok {
+			if sv != v {
+				return false
+			}
+		}
+	}
+	return true
+}
diff --git a/src/jetstream/plugins/kubernetes/list_releases.go b/src/jetstream/plugins/kubernetes/list_releases.go
index 0dcba6fdc1..366dfc1eb8 100644
--- a/src/jetstream/plugins/kubernetes/list_releases.go
+++ b/src/jetstream/plugins/kubernetes/list_releases.go
@@ -190,10 +190,10 @@ func (c *KubernetesSpecification) GetRelease(ec echo.Context) error {
 	// Send over the namespace details of the release
 	sendResource(ws, "ReleasePrefix", id)
 
-	graph.ParseManifest(rel)
+	//graph.ParseManifest(rel)
 
 	// Send the manifest for the release
-	sendResource(ws, "Manifest", rel.HelmManifest)
+	sendResource(ws, "Resources", rel.GetResources())
 
 	// // Send the manifest for the release
 	// sendResource(ws, "Test", rel.HelmManifest)
@@ -204,18 +204,22 @@ func (c *KubernetesSpecification) GetRelease(ec echo.Context) error {
 	// Loop over this until the web socket is closed
 
 	// Get the pods first and send those
-	pods := rel.GetPods(c.portalProxy)
-	sendResource(ws, "Pods", pods)
+	rel.UpdatePods(c.portalProxy)
+	sendResource(ws, "Pods", rel.GetPods())
 
 	//graph.Generate(pods)
-	graph.ParseManifest(rel)
+	//graph.ParseManifest(rel)
+	sendResource(ws, "Graph", graph)
 
 	// Send the manifest for the release again (ReplicaSets will now be added)
-	sendResource(ws, "Manifest", rel.HelmManifest)
+	sendResource(ws, "Manifest", rel.GetResources())
 
 	// Now get all of the resources in the manifest
-	all := rel.GetResources(c.portalProxy)
-	sendResource(ws, "Resources", all)
+	rel.UpdateResources(c.portalProxy)
+	sendResource(ws, "Resources", rel.GetResources())
+
+	graph.ParseManifest(rel)
+	sendResource(ws, "Graph", graph)
 
 	// Now we have everything, so loop, polling to get status
 	// for {

From eca92b9f27abecd0468105c94eb2d372aff73523 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 28 Nov 2019 10:28:11 +0000
Subject: [PATCH 174/648] Fix acme theme

---
 examples/custom-src/frontend/sass/custom.scss   |  2 +-
 .../custom-src/frontend/sass/custom/acme.scss   | 17 ++++++++++++++++-
 src/frontend/packages/core/sass/theme.scss      |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/examples/custom-src/frontend/sass/custom.scss b/examples/custom-src/frontend/sass/custom.scss
index 308b1ef362..0087198f97 100644
--- a/examples/custom-src/frontend/sass/custom.scss
+++ b/examples/custom-src/frontend/sass/custom.scss
@@ -2,7 +2,7 @@
 
 // ACME Primary Material Design pallette
 // From http://mcg.mbitson.com/#!?mcgpalette0=%233f51b5
-$acme-primary: (50: #e0f7f0, 100: #b3ecd9, 200: #80e0c0, 300: #4dd3a7, 400: #26c994, 500: #00c081, 600: #00ba79, 700: #00b26e, 800: #00aa64, 900: #009c51, A100: #c7ffe0, A200: #94ffc4, A400: #61ffa8, A700: #47ff9a, contrast: (50: #000, 100: #000, 200: #000, 300: #000, 400: #000, 500: #fff, 600: #fff, 700: #fff, 800: #fff, 900: #fff, A100: #000, A200: #000, A400: #000, A700: #000));
+$acme-primary: (50: #e8eaf6, 100: #c5cbe9, 200: #9fa8da, 300: #7985cb, 400: #5c6bc0, 500: #3f51b5, 600: #394aae, 700: #3140a5, 800: #29379d, 900: #1b278d, A100: #c6cbff, A200: #939dff, A400: #606eff, A700: #4757ff, contrast: (  50: #000000,  100: #000000,  200: #000000,  300: #000000,  400: #ffffff,  500: #ffffff,  600: #ffffff,  700: #ffffff,  800: #ffffff,  900: #ffffff,  A100: #000000,  A200: #000000,  A400: #ffffff,  A700: #ffffff, ));
 $mat-red: ( 50: #ffebee, 100: #ffcdd2, 200: #ef9a9a, 300: #e57373, 400: #ef5350, 500: #f44336, 600: #e53935, 700: #d32f2f, 800: #c62828, 900: #b71c1c, A100: #ff8a80, A200: #ff5252, A400: #ff1744, A700: #d50000, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: white, A400: white, A700: white, ));
 
 $acme-theme-primary: mat-palette($acme-primary);
diff --git a/examples/custom-src/frontend/sass/custom/acme.scss b/examples/custom-src/frontend/sass/custom/acme.scss
index d153c4bc36..f68980918b 100644
--- a/examples/custom-src/frontend/sass/custom/acme.scss
+++ b/examples/custom-src/frontend/sass/custom/acme.scss
@@ -11,7 +11,7 @@ $acme-blue: #073155;
 $acme-side-nav: $acme-secondary;
 $acme-side-nav-active: #003358;
 
-.stratos {
+body.stratos {
   app-page-subheader {
     .page-subheader {
       background-color: #fff;
@@ -68,4 +68,19 @@ $acme-side-nav-active: #003358;
   .stratos-title > .stratos-title__header {
     display: inline-block;
   }
+
+  .dark-theme {
+    $dark-primary: $acme-theme-primary;
+    $dark-accent: $acme-theme-primary;
+    $dark-warn: mat-palette($mat-red);
+    $dark-theme: mat-dark-theme($dark-primary, $dark-accent, $dark-warn);
+
+    $stratos-theme: $dark-theme;
+    $stratos-nav-theme: null !default;
+    $stratos-status-theme: null !default;
+
+    @include angular-material-theme($dark-theme);
+    @include app-theme($stratos-theme, $stratos-nav-theme, $stratos-status-theme);
+
+  }
 }
diff --git a/src/frontend/packages/core/sass/theme.scss b/src/frontend/packages/core/sass/theme.scss
index e7bdedec37..a2daf93033 100644
--- a/src/frontend/packages/core/sass/theme.scss
+++ b/src/frontend/packages/core/sass/theme.scss
@@ -4,8 +4,8 @@
 @import './mat-colors';
 
 // Custom theme support
-@import './custom';
 @import './dark-theme';
+@import './custom';
 
 
 .default {

From 37ca8502c973a7c9959a46991afea80c592b4cc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Avelino?= <vavelino@suse.com>
Date: Tue, 26 Nov 2019 17:09:58 -0300
Subject: [PATCH 175/648] ui: sidepanel preview widget
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Vítor Avelino <vavelino@suse.com>
---
 .../src/actions/relation.actions.ts           |  14 ++-
 .../cloud-foundry/src/cf-entity-generator.ts  |  12 ++-
 .../applications/application.service.ts       |  39 ++++---
 .../cloud-foundry/cloud-foundry.module.ts     |   8 +-
 .../cloud-foundry-endpoint.service.ts         |  42 +++++++-
 .../cloud-foundry-organization.service.ts     |  25 +++--
 .../services/cloud-foundry-space.service.ts   |  34 +++---
 ...cloud-foundry-space-summary.component.html |   2 +-
 .../application-preview.component.html        |  68 ++++++++++++
 .../application-preview.component.scss        |   0
 .../application-preview.component.spec.ts     |  37 +++++++
 .../application-preview.component.ts          |  67 ++++++++++++
 .../card-cf-info/card-cf-info.component.html  |   4 +-
 .../card-cf-info/card-cf-info.component.ts    |  48 +--------
 .../card-cf-space-details.component.html      |   2 +-
 .../card-cf-space-details.component.ts        |   7 +-
 .../cf-endpoint-preview.component.html        |  76 +++++++++++++
 .../cf-endpoint-preview.component.scss        |   0
 .../cf-endpoint-preview.component.spec.ts     |  37 +++++++
 .../cf-endpoint-preview.component.ts          |  45 ++++++++
 .../shared/components/components.module.ts    |  23 +++-
 .../organization-preview.component.html       | 102 ++++++++++++++++++
 .../organization-preview.component.scss       |   0
 .../organization-preview.component.spec.ts    |  37 +++++++
 .../organization-preview.component.ts         |  50 +++++++++
 .../space-preview.component.html              | 101 +++++++++++++++++
 .../space-preview.component.scss              |   0
 .../space-preview.component.spec.ts           |  37 +++++++
 .../space-preview/space-preview.component.ts  |  47 ++++++++
 .../packages/core/sass/_all-theme.scss        |   5 +-
 .../entity-catalogue-entity.ts                |   9 +-
 .../entity-catalogue.types.ts                 |   5 +-
 .../dashboard-base.component.html             |   8 +-
 .../dashboard-base.component.scss             |   6 +-
 .../dashboard-base.component.ts               |  63 +++++------
 .../connect-endpoint-dialog.component.ts      |   4 +-
 .../create-endpoint-connect.component.ts      |   4 +-
 .../favorites-meta-card.component.html        |   2 +-
 .../favorites-meta-card.component.ts          |  35 +++++-
 .../markdown-preview.component.html           |   7 +-
 .../markdown-preview.component.scss           |  21 ----
 .../markdown-preview.component.ts             |  14 ++-
 .../sidepanel-preview.component.html          |   8 ++
 .../sidepanel-preview.component.scss          |  23 ++++
 .../sidepanel-preview.component.spec.ts       |  37 +++++++
 .../sidepanel-preview.component.theme.scss}   |   8 +-
 .../sidepanel-preview.component.ts            |  14 +++
 .../core/src/shared/previewable-component.ts  |   3 +
 .../shared/services/panel-preview.service.ts  |  67 ++++++++++++
 .../packages/core/src/shared/shared.module.ts |  20 ++--
 .../store/src/actions/dashboard-actions.ts    |  13 ---
 .../store/src/reducers/dashboard-reducer.ts   |  19 ++--
 52 files changed, 1130 insertions(+), 229 deletions(-)
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.html
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.scss
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.spec.ts
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.ts
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.html
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.scss
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.spec.ts
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.ts
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.html
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.scss
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.spec.ts
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.ts
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.html
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.scss
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.spec.ts
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.ts
 create mode 100644 src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.html
 create mode 100644 src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.scss
 create mode 100644 src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.spec.ts
 rename src/frontend/packages/core/src/shared/components/{markdown-preview/markdown-preview.component.theme.scss => sidepanel-preview/sidepanel-preview.component.theme.scss} (67%)
 create mode 100644 src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.ts
 create mode 100644 src/frontend/packages/core/src/shared/previewable-component.ts
 create mode 100644 src/frontend/packages/core/src/shared/services/panel-preview.service.ts

diff --git a/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts
index ade4c360b2..985214b8dd 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts
@@ -1,13 +1,11 @@
+import { HttpParams, HttpRequest } from '@angular/common/http';
+
 import { EntityCatalogueEntityConfig } from '../../../core/src/core/entity-catalogue/entity-catalogue.types';
-import {
-  EntityInlineChildAction,
-  EntityInlineParentAction,
-} from '../entity-relations/entity-relations.types';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
-import { RequestEntityLocation, RequestActionEntity } from '../../../store/src/types/request.types';
-import { CFStartAction } from './cf-action.types';
+import { RequestActionEntity, RequestEntityLocation } from '../../../store/src/types/request.types';
 import { EntityTreeRelation } from '../entity-relations/entity-relation-tree';
-import { HttpRequest } from '@angular/common/http';
+import { EntityInlineChildAction, EntityInlineParentAction } from '../entity-relations/entity-relations.types';
+import { CFStartAction } from './cf-action.types';
 
 const relationActionId = 'FetchRelationAction';
 
@@ -27,7 +25,7 @@ export abstract class FetchRelationAction extends CFStartAction implements Entit
       'GET',
       url.startsWith('/v2/') ? url.substring(4, url.length) : url,
       {
-        params: {}
+        params: new HttpParams()
       }
     );
     this.parentEntityConfig = parent.entity;
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 bd567c0332..d585f91bae 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
@@ -1,4 +1,5 @@
 import * as moment from 'moment';
+
 import {
   IService,
   IServiceBinding,
@@ -39,6 +40,7 @@ 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 { EntitySchema } from '../../store/src/helpers/entity-schema';
 import { endpointDisconnectRemoveEntitiesReducer } from '../../store/src/reducers/endpoint-disconnect-application.reducer';
 import { APIResource } from '../../store/src/types/api.types';
 import { IFavoriteMetadata } from '../../store/src/types/user-favorites.types';
@@ -117,7 +119,11 @@ import { spaceActionBuilders } from './entity-action-builders/space.action-build
 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 { ApplicationPreviewComponent } from './shared/components/application-preview/application-preview.component';
 import { CfEndpointDetailsComponent } from './shared/components/cf-endpoint-details/cf-endpoint-details.component';
+import { CfEndpointPreviewComponent } from './shared/components/cf-endpoint-preview/cf-endpoint-preview.component';
+import { OrganizationPreviewComponent } from './shared/components/organization-preview/organization-preview.component';
+import { SpacePreviewComponent } from './shared/components/space-preview/space-preview.component';
 import { updateApplicationRoutesReducer } from './store/reducers/application-route.reducer';
 import { updateOrganizationQuotaReducer } from './store/reducers/organization-quota.reducer';
 import { updateOrganizationSpaceReducer } from './store/reducers/organization-space.reducer';
@@ -129,8 +135,6 @@ import { AppStat } from './store/types/app-metadata.types';
 import { CFResponse } from './store/types/cf-api.types';
 import { GitBranch, GitCommit, GitRepo } from './store/types/git.types';
 import { CfUser } from './store/types/user.types';
-import { CfApplicationState } from './store/types/application.types';
-import { EntitySchema } from '../../store/src/helpers/entity-schema';
 
 export interface CFBasePipelineRequestActionMeta {
   includeRelations?: string[];
@@ -860,6 +864,7 @@ function generateCfEndpointEntity(endpointDefinition: StratosEndpointExtensionDe
   return new StratosCatalogueEndpointEntity(
     endpointDefinition,
     metadata => `/cloud-foundry/${metadata.guid}`,
+    () => CfEndpointPreviewComponent,
   );
 }
 
@@ -894,6 +899,7 @@ function generateCfApplicationEntity(endpointDefinition: StratosEndpointExtensio
         }),
         getLink: metadata => `/applications/${metadata.cfGuid}/${metadata.guid}/summary`,
         getGuid: metadata => metadata.guid,
+        getPreviewableComponent: () => ApplicationPreviewComponent,
         getLines: () => ([
           ['Creation  Date', (meta) => meta.createdAt]
         ])
@@ -930,6 +936,7 @@ function generateCfSpaceEntity(endpointDefinition: StratosEndpointExtensionDefin
           name: space.entity.name,
           cfGuid: space.entity.cfGuid,
         }),
+        getPreviewableComponent: () => SpacePreviewComponent,
         getLines: () => ([
           ['Name', (meta) => meta.name],
         ]),
@@ -965,6 +972,7 @@ function generateCfOrgEntity(endpointDefinition: StratosEndpointExtensionDefinit
           name: org.entity.name,
           cfGuid: org.entity.cfGuid,
         }),
+        getPreviewableComponent: () => OrganizationPreviewComponent,
         getLink: metadata => `/cloud-foundry/${metadata.cfGuid}/organizations/${metadata.guid}`,
         getGuid: metadata => 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 dd94db5dfe..ab5e375edd 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
@@ -91,21 +91,9 @@ export class ApplicationService {
     private appEnvVarsService: ApplicationEnvVarsHelper,
     private paginationMonitorFactory: PaginationMonitorFactory,
   ) {
-    this.appEntityService = this.entityServiceFactory.create<APIResource<IApp>>(
-      appGuid,
-      createGetApplicationAction(appGuid, cfGuid)
-    );
-    const appSummaryEntity = entityCatalogue.getEntity(CF_ENDPOINT_TYPE, appSummaryEntityType);
-    const actionBuilder = appSummaryEntity.actionOrchestrator.getActionBuilder('get');
-    const getAppSummaryAction = actionBuilder(appGuid, cfGuid);
-    this.appSummaryEntityService = this.entityServiceFactory.create<IAppSummary>(
-      appGuid,
-      getAppSummaryAction
-    );
-
-    this.constructCoreObservables();
-    this.constructAmalgamatedObservables();
-    this.constructStatusObservables();
+    if (cfGuid && appGuid) {
+      this.initialize(cfGuid, appGuid);
+    }
   }
 
   // NJ: This needs to be cleaned up. So much going on!
@@ -161,6 +149,27 @@ export class ApplicationService {
     ).pipe(publishReplay(1), refCount());
   }
 
+  public initialize(cfGuid, appGuid) {
+    this.cfGuid = cfGuid;
+    this.appGuid = appGuid;
+
+    this.appEntityService = this.entityServiceFactory.create<APIResource<IApp>>(
+      appGuid,
+      createGetApplicationAction(appGuid, cfGuid)
+    );
+    const appSummaryEntity = entityCatalogue.getEntity(CF_ENDPOINT_TYPE, appSummaryEntityType);
+    const actionBuilder = appSummaryEntity.actionOrchestrator.getActionBuilder('get');
+    const getAppSummaryAction = actionBuilder(appGuid, cfGuid);
+    this.appSummaryEntityService = this.entityServiceFactory.create<IAppSummary>(
+      appGuid,
+      getAppSummaryAction
+    );
+
+    this.constructCoreObservables();
+    this.constructAmalgamatedObservables();
+    this.constructStatusObservables();
+  }
+
   private constructCoreObservables() {
     // First set up all the base observables
     this.app$ = this.appEntityService.waitForEntity$;
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 3fae3aaa5a..700f7d5053 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
@@ -36,15 +36,12 @@ import {
 import {
   CloudFoundryQuotasComponent,
 } from '../../../../core/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component';
-import { EndpointListHelper } from '../../../../core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers';
-import {
-  EndpointsListConfigService,
-} from '../../../../core/src/shared/components/list/list-types/endpoint/endpoints-list-config.service';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
 import { CloudFoundryComponentsModule } from '../../shared/components/components.module';
 import {
   CFEndpointsListConfigService,
 } from '../../shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service';
+import { ApplicationService } from '../applications/application.service';
 import { AddOrganizationComponent } from './add-organization/add-organization.component';
 import {
   CreateOrganizationStepComponent,
@@ -64,6 +61,7 @@ import { EditSpaceComponent } from './edit-space/edit-space.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 { CloudFoundrySpaceService } from './services/cloud-foundry-space.service';
 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';
@@ -228,6 +226,8 @@ import { RemoveUserComponent } from './users/remove-user/remove-user.component';
       provide: ActiveRouteCfCell,
       useValue: {}
     },
+    ApplicationService,
+    CloudFoundrySpaceService,
     CloudFoundryOrganizationService,
     CloudFoundryEndpointService,
     // CfRolesService,
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 20d3bffaa7..146b48f738 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
@@ -65,6 +65,8 @@ export class CloudFoundryEndpointService {
 
   hasSSHAccess$: Observable<boolean>;
   totalMem$: Observable<number>;
+  description$: Observable<string>;
+  apiUrl$: Observable<string>;
   paginationSubscription: any;
   appsPagObs: PaginationObservables<APIResource<IApp>>;
   usersCount$: Observable<number | null>;
@@ -100,6 +102,7 @@ export class CloudFoundryEndpointService {
       }) as PaginatedAction;
     return getAllOrganizationsAction;
   }
+
   static createGetAllOrganizationsLimitedSchema(cfGuid: string) {
     const paginationKey = cfGuid ?
       createEntityRelationPaginationKey(endpointSchemaKey, cfGuid)
@@ -140,7 +143,14 @@ export class CloudFoundryEndpointService {
     private endpointService: EndpointsService,
     private paginationMonitorFactory: PaginationMonitorFactory
   ) {
-    this.cfGuid = activeRouteCfOrgSpace.cfGuid;
+    const cfGuid = activeRouteCfOrgSpace.cfGuid;
+    if (cfGuid) {
+      this.initialize(cfGuid);
+    }
+  }
+
+  public initialize(cfGuid) {
+    this.cfGuid = cfGuid;
     this.getAllOrgsAction = CloudFoundryEndpointService.createGetAllOrganizations(this.cfGuid) as GetAllOrganizations;
     this.getAllAppsAction = new GetAllApplications(createEntityRelationPaginationKey('cf', this.cfGuid), this.cfGuid);
 
@@ -199,6 +209,14 @@ export class CloudFoundryEndpointService {
     );
     this.totalMem$ = this.appsPagObs.entities$.pipe(map(apps => this.getMetricFromApps(apps, 'memory')));
 
+    this.apiUrl$ = this.endpoint$.pipe(
+      map(endpoint => this.getApiEndpointUrl(endpoint.entity.api_endpoint))
+    );
+
+    this.description$ = this.info$.pipe(
+      map(entity => this.getDescription(entity))
+    );
+
     this.connected$ = this.endpoint$.pipe(
       map(p => p.entity.connectionStatus === 'connected')
     );
@@ -258,6 +276,28 @@ export class CloudFoundryEndpointService {
     this.store.dispatch(this.getAllAppsAction);
   }
 
+  private getApiEndpointUrl(apiEndpoint) {
+    const path = apiEndpoint.Path ? `/${apiEndpoint.Path}` : '';
+    return `${apiEndpoint.Scheme}://${apiEndpoint.Host}${path}`;
+  }
+
+  private getMetadataFromInfo(entity: EntityInfo<APIResource<ICfV2Info>>) {
+    return entity && entity.entity && entity.entity.entity ? entity.entity.entity : null;
+  }
+
+  private getDescription(entity: EntityInfo<APIResource<ICfV2Info>>): string {
+    const metadata = this.getMetadataFromInfo(entity);
+    if (metadata) {
+      if (metadata.description) {
+        return metadata.description + (metadata.build ? ` (${metadata.build})` : '');
+      }
+      if (metadata.support === 'pcfdev@pivotal.io') {
+        return 'PCF Dev';
+      }
+    }
+    return '-';
+  }
+
   hasCellMetrics(endpointId: string): Observable<boolean> {
     return this.endpointService.hasMetrics(endpointId).pipe(
       switchMap(hasMetrics => {
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 a581a419d1..fe0356517e 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
@@ -24,19 +24,19 @@ import {
   ISpaceQuotaDefinition,
 } from '../../../../../core/src/core/cf-api.types';
 import { getEntityFlattenedList, getStartedAppInstanceCount } from '../../../../../core/src/core/cf.helpers';
+import { entityCatalogue } from '../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
 import { EntityServiceFactory } from '../../../../../core/src/core/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../../../../core/src/shared/monitors/pagination-monitor.factory';
 import {
   CloudFoundryUserProvidedServicesService,
 } from '../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
+import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
 import { createEntityRelationKey } from '../../../entity-relations/entity-relations.types';
 import { CfUserService } from '../../../shared/data-services/cf-user.service';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { getOrgRolesString } from '../cf.helpers';
 import { CloudFoundryEndpointService } from './cloud-foundry-endpoint.service';
-import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
-import { entityCatalogue } from '../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
 
 export const createOrgQuotaDefinition = (): IOrgQuotaDefinition => ({
   memory_limit: -1,
@@ -85,7 +85,7 @@ export class CloudFoundryOrganizationService {
   usersCount$: Observable<number | null>;
 
   constructor(
-    public activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
+    activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
     private store: Store<CFAppState>,
     private entityServiceFactory: EntityServiceFactory,
     private cfUserService: CfUserService,
@@ -93,10 +93,12 @@ export class CloudFoundryOrganizationService {
     private cfEndpointService: CloudFoundryEndpointService,
     private cfUserProvidedServicesService: CloudFoundryUserProvidedServicesService
   ) {
-    this.orgGuid = activeRouteCfOrgSpace.orgGuid;
-    this.cfGuid = activeRouteCfOrgSpace.cfGuid;
+    const orgGuid = activeRouteCfOrgSpace.orgGuid;
+    const cfGuid = activeRouteCfOrgSpace.cfGuid;
 
-    this.initialiseObservables();
+    if (cfGuid && orgGuid) {
+      this.initialize(cfGuid, orgGuid);
+    }
   }
 
   public deleteSpace(spaceGuid: string, orgGuid: string, endpointGuid: string) {
@@ -110,7 +112,10 @@ export class CloudFoundryOrganizationService {
     this.cfEndpointService.fetchApps();
   }
 
-  private initialiseObservables() {
+  public initialize(cfGuid, orgGuid) {
+    this.cfGuid = cfGuid;
+    this.orgGuid = orgGuid;
+
     this.org$ = this.cfUserService.isConnectedUserAdmin(this.cfGuid).pipe(
       switchMap(isAdmin => {
         const relations = [
@@ -133,7 +138,7 @@ export class CloudFoundryOrganizationService {
         }
         const orgEntity = entityCatalogue.getEntity(CF_ENDPOINT_TYPE, organizationEntityType);
         const getOrgActionBuilder = orgEntity.actionOrchestrator.getActionBuilder('get');
-        const getOrgAction = getOrgActionBuilder(this.orgGuid, this.cfGuid, relations);
+        const getOrgAction = getOrgActionBuilder(this.orgGuid, this.cfGuid, { includeRelations: relations });
         const orgEntityService = this.entityServiceFactory.create<APIResource<IOrganization>>(
           this.orgGuid,
           getOrgAction
@@ -194,8 +199,8 @@ export class CloudFoundryOrganizationService {
     return CloudFoundryEndpointService.fetchAppCount(
       this.store,
       this.paginationMonitorFactory,
-      this.activeRouteCfOrgSpace.cfGuid,
-      this.activeRouteCfOrgSpace.orgGuid
+      this.cfGuid,
+      this.orgGuid
     );
   }
 
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 4ba4505590..371b9874d9 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
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { combineLatest, Observable, of } from 'rxjs';
-import { filter, map, publishReplay, refCount, switchMap } from 'rxjs/operators';
+import { map, publishReplay, refCount, switchMap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import {
@@ -15,12 +15,14 @@ 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 { entityCatalogue } from '../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
 import { EntityServiceFactory } from '../../../../../core/src/core/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../../../../core/src/shared/monitors/pagination-monitor.factory';
 import {
   CloudFoundryUserProvidedServicesService,
 } from '../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
+import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
 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 { entityCatalogue } from '../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
-import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
 
 @Injectable()
 export class CloudFoundrySpaceService {
@@ -48,6 +48,7 @@ export class CloudFoundrySpaceService {
    */
   spaceQuotaDefinition$: Observable<ISpaceQuotaDefinition>;
   allowSsh$: Observable<string>;
+  allowSshStatus$: Observable<string>;
   totalMem$: Observable<number>;
   routes$: Observable<APIResource<IRoute>[]>;
   serviceInstancesCount$: Observable<number>;
@@ -71,18 +72,20 @@ export class CloudFoundrySpaceService {
     private cfOrgService: CloudFoundryOrganizationService
   ) {
 
-    this.spaceGuid = activeRouteCfOrgSpace.spaceGuid;
-    this.orgGuid = activeRouteCfOrgSpace.orgGuid;
-    this.cfGuid = activeRouteCfOrgSpace.cfGuid;
+    const spaceGuid = activeRouteCfOrgSpace.spaceGuid;
+    const orgGuid = activeRouteCfOrgSpace.orgGuid;
+    const cfGuid = activeRouteCfOrgSpace.cfGuid;
 
-    this.initialiseObservables();
+    if (cfGuid && orgGuid && spaceGuid) {
+      this.initialize(cfGuid, orgGuid, spaceGuid);
+    }
   }
 
-  public fetchApps() {
-    this.cfEndpointService.fetchApps();
-  }
+  public initialize(cfGuid: string, orgGuid: string, spaceGuid: string) {
+    this.cfGuid = cfGuid;
+    this.orgGuid = orgGuid;
+    this.spaceGuid = spaceGuid;
 
-  private initialiseObservables() {
     this.initialiseSpaceObservables();
     this.initialiseAppObservables();
 
@@ -126,7 +129,7 @@ export class CloudFoundrySpaceService {
           this.spaceGuid,
           getSpaceAction
         );
-        return spaceEntityService.entityObs$.pipe(filter(o => !!o && !!o.entity));
+        return spaceEntityService.waitForEntity$;
       }),
       publishReplay(1),
       refCount()
@@ -142,6 +145,7 @@ export class CloudFoundrySpaceService {
       this.cfUserProvidedServicesService.fetchUserProvidedServiceInstancesCount(this.cfGuid, this.orgGuid, this.spaceGuid);
     this.routes$ = this.space$.pipe(map(o => o.entity.entity.routes));
     this.allowSsh$ = this.space$.pipe(map(o => o.entity.entity.allow_ssh ? 'true' : 'false'));
+    this.allowSshStatus$ = this.allowSsh$.pipe(map(status => status === 'false' ? 'Disabled' : 'Enabled'));
     this.spaceQuotaDefinition$ = this.space$.pipe(
       map(q => q.entity.entity.space_quota_definition ? q.entity.entity.space_quota_definition.entity : null)
     );
@@ -211,9 +215,9 @@ export class CloudFoundrySpaceService {
     return CloudFoundryEndpointService.fetchAppCount(
       this.store,
       this.paginationMonitorFactory,
-      this.activeRouteCfOrgSpace.cfGuid,
-      this.activeRouteCfOrgSpace.orgGuid,
-      this.activeRouteCfOrgSpace.spaceGuid
+      this.cfGuid,
+      this.orgGuid,
+      this.spaceGuid
     );
   }
 }
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.html 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.html
index 3ec288a9fa..1f03e7bdb5 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.html
+++ 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.html
@@ -75,7 +75,7 @@
       <app-tile-group>
         <app-tile>
           <app-card-cf-recent-apps *ngIf="!(detailsLoading$ | async)" [allApps$]="cfSpaceService.apps$"
-            [loading$]="cfSpaceService.loadingApps$" (refresh)="cfSpaceService.fetchApps()"></app-card-cf-recent-apps>
+            [loading$]="cfSpaceService.loadingApps$" (refresh)="cfEndpointService.fetchApps()"></app-card-cf-recent-apps>
         </app-tile>
       </app-tile-group>
     </app-loading-page>
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.html
new file mode 100644
index 0000000000..9900b6a612
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.html
@@ -0,0 +1,68 @@
+<app-sidepanel-preview [title]="title">
+  <app-tile-grid fit="true" *ngIf="applicationService.application$ | async as appSvc">
+    <app-tile-group>
+      <app-tile>
+        <div class="cf-space-usage">
+          <mat-card>
+            <mat-card-header>
+              <mat-card-title>Summary</mat-card-title>
+            </mat-card-header>
+            <mat-card-content>
+              <app-tile-group *ngIf="applicationService.appOrg$ | async as appOrg">
+                <app-tile>
+                  <app-metadata-item label="Cloud Foundry">
+                    <a [routerLink]="['/cloud-foundry/' + appSvc.cf?.guid]"
+                      matTooltip="CF API URL: {{ getFullEndpointApiUrl(appSvc.cf) }}">{{ appSvc.cf?.name}}</a>
+                  </app-metadata-item>
+                  <app-metadata-item label="Cloud Foundry">
+                    <a [routerLink]="['/cloud-foundry/' + appSvc.cf?.guid]"
+                      matTooltip="CF API URL: {{ getFullEndpointApiUrl(appSvc.cf) }}">{{ appSvc.cf?.name}}</a>
+                  </app-metadata-item>
+                </app-tile>
+                <app-tile class="app-metadata__two-cols">
+                  <app-metadata-item label="SSH Access">
+                    {{ sshStatus$ | async }}
+                  </app-metadata-item>
+                  <app-metadata-item label="Organization">
+                    <a
+                      [routerLink]="['/cloud-foundry/' + appSvc.cf?.guid + '/organizations/' + appOrg.metadata.guid]">{{ appOrg.entity.name }}</a>
+                  </app-metadata-item>
+                </app-tile>
+                <app-tile class="app-metadata__two-cols">
+                  <app-metadata-item label="CLI Info" class="cli-link">
+                    <a [routerLink]="['/applications/' + appSvc.cf?.guid + '/' + appSvc.app?.metadata.guid + '/cli']">View</a>
+                  </app-metadata-item>
+                  <app-metadata-item *ngIf="applicationService.appSpace$ | async as appSpace" label="Space">
+                    <a
+                      [routerLink]="['/cloud-foundry/' + appSvc.cf?.guid + '/organizations/' + appOrg.metadata?.guid + '/spaces/' + appSpace.metadata?.guid]">{{ appSpace.entity.name }}</a>
+                  </app-metadata-item>
+                </app-tile>
+              </app-tile-group>
+            </mat-card-content>
+          </mat-card>
+        </div>
+      </app-tile>
+    </app-tile-group>
+
+    <app-tile-group>
+      <app-tile>
+        <app-card-number-metric icon="memory" label="Memory Usage" value="{{ appSvc.app.entity.memory | mbToHumanSize }}"></app-card-number-metric>
+      </app-tile>
+      <app-tile>
+        <app-card-number-metric icon="storage" label="Disk Quota" value="{{ appSvc.app.entity.disk_quota | mbToHumanSize }}"></app-card-number-metric>
+      </app-tile>
+    </app-tile-group>
+
+    <app-tile-group>
+      <app-tile>
+        <app-card-number-metric iconFont="stratos-icons" icon="service" label="Service Instances"
+          value="{{ (applicationService.appSummary$ | async)?.entity?.services?.length || '0' }}"></app-card-number-metric>
+      </app-tile>
+      <app-tile>
+        <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Routes"
+          value="{{ (applicationService.appSummary$ | async)?.entity?.routes?.length || '0' }}"></app-card-number-metric>
+      </app-tile>
+    </app-tile-group>
+    <app-tile-group></app-tile-group>
+  </app-tile-grid>
+</app-sidepanel-preview>
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.spec.ts
new file mode 100644
index 0000000000..2d3d25d230
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.spec.ts
@@ -0,0 +1,37 @@
+import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
+import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
+import { LoggerService } from '../../../core/logger.service';
+import { ApplicationPreviewComponent } from './application-preview.component';
+
+describe('ApplicationPreviewComponent', () => {
+  let component: ApplicationPreviewComponent;
+  let fixture: ComponentFixture<ApplicationPreviewComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ApplicationPreviewComponent],
+      providers: [LoggerService, HttpClient, HttpHandler],
+      imports: [
+        HttpClientModule,
+        HttpClientTestingModule,
+        CoreTestingModule,
+        createBasicStoreModule()
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ApplicationPreviewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.ts
new file mode 100644
index 0000000000..5aa2772e67
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.ts
@@ -0,0 +1,67 @@
+import { Component } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { Observable } from 'rxjs';
+import { combineLatest, map } from 'rxjs/operators';
+
+import { getFullEndpointApiUrl } from '../../../../../core/src/features/endpoints/endpoint-helpers';
+import { APP_GUID, CF_GUID } from '../../../../../core/src/shared/entity.tokens';
+import { PreviewableComponent } from '../../../../../core/src/shared/previewable-component';
+import { ApplicationService } from '../../../features/applications/application.service';
+import { getGuids } from '../../../features/applications/application/application-base.component';
+
+@Component({
+  selector: 'app-application-preview-component',
+  templateUrl: './application-preview.component.html',
+  styleUrls: ['./application-preview.component.scss'],
+  // useless, necessary to reuse ApplicationService
+  providers: [
+    ApplicationService,
+    {
+      provide: CF_GUID,
+      useFactory: getGuids('cf'),
+      deps: [ActivatedRoute]
+    },
+    {
+      provide: APP_GUID,
+      useFactory: getGuids(),
+      deps: [ActivatedRoute]
+    },
+  ]
+})
+export class ApplicationPreviewComponent implements PreviewableComponent {
+
+  title = null;
+  cfEndpointService: object;
+  sshStatus$: Observable<string>;
+
+  getFullEndpointApiUrl = getFullEndpointApiUrl;
+
+  constructor(public applicationService: ApplicationService) {
+  }
+
+  setProps(props: { [key: string]: any }) {
+    this.title = props.title;
+
+    this.applicationService.initialize(props.cfGuid, props.guid);
+    this.sshStatus$ = this.applicationService.application$.pipe(
+      combineLatest(this.applicationService.appSpace$),
+      map(([app, space]) => {
+        if (!space.entity.allow_ssh) {
+          return 'Disabled by the space';
+        } else {
+          return app.app.entity.enable_ssh ? 'Yes' : 'No';
+        }
+      })
+    );
+
+    // this.detailsLoading$ = combineLatest([
+    //   // Wait for the apps to have been fetched, this will determine if multiple small cards are shown or now
+    //   this.cfEndpointService.appsPagObs.fetchingEntities$.pipe(
+    //     filter(loading => !loading)
+    //   ),
+    // ]).pipe(
+    //   map(() => false),
+    //   startWith(true)
+    // );
+  }
+}
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.html
index 9ce13dc103..e8a2a95463 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.html
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.html
@@ -6,8 +6,8 @@
     <mat-card-content>
       <div class="app-metadata">
         <div class="app-metadata__two-cols">
-          <app-metadata-item icon="title" label="Description">{{ (description$ | async) }}</app-metadata-item>
-          <app-metadata-item icon="link" label="Instance Address">{{ apiUrl }}</app-metadata-item>
+          <app-metadata-item icon="title" label="Description">{{ cfEndpointService.description$ | async }}</app-metadata-item>
+          <app-metadata-item icon="link" label="Instance Address">{{ cfEndpointService.apiUrl$ | async }}</app-metadata-item>
           <app-metadata-item icon="info_outline" label="CF API Version">
             {{ (cfEndpointService.info$ | async)?.entity.entity.api_version }}</app-metadata-item>
           <app-metadata-item *ngIf="autoscalerVersion$ | async as autoscalerVersion" icon="meter"
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 dcf0c83d14..e87578524a 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,10 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import { Observable, Subscription } from 'rxjs';
-import { map, tap } from 'rxjs/operators';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 import { fetchAutoscalerInfo } from '../../../../../../cf-autoscaler/src/core/autoscaler-helpers/autoscaler-available';
-import { ICfV2Info } from '../../../../../../core/src/core/cf-api.types';
 import { EntityServiceFactory } from '../../../../../../core/src/core/entity-service-factory.service';
-import { APIResource, EntityInfo } from '../../../../../../store/src/types/api.types';
 import { CloudFoundryEndpointService } from '../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
 import {
   UserInviteConfigurationDialogComponent,
@@ -19,9 +17,8 @@ import { UserInviteService } from '../../../../features/cloud-foundry/user-invit
   templateUrl: './card-cf-info.component.html',
   styleUrls: ['./card-cf-info.component.scss']
 })
-export class CardCfInfoComponent implements OnInit, OnDestroy {
+export class CardCfInfoComponent implements OnInit {
   public apiUrl: string;
-  private subs: Subscription[] = [];
   public autoscalerVersion$: Observable<string>;
 
   constructor(
@@ -34,17 +31,6 @@ export class CardCfInfoComponent implements OnInit, OnDestroy {
   description$: Observable<string>;
 
   ngOnInit() {
-    const obs$ = this.cfEndpointService.endpoint$.pipe(
-      tap(endpoint => {
-        this.apiUrl = this.getApiEndpointUrl(endpoint.entity.api_endpoint);
-      })
-    );
-    this.subs.push(obs$.subscribe());
-
-    this.description$ = this.cfEndpointService.info$.pipe(
-      map(entity => this.getDescription(entity))
-    );
-
     // FIXME: CF should not depend on autoscaler. See #3916
     this.autoscalerVersion$ = fetchAutoscalerInfo(this.cfEndpointService.cfGuid, this.esf).pipe(
       map(e => e.entityRequestInfo.error ?
@@ -53,32 +39,6 @@ export class CardCfInfoComponent implements OnInit, OnDestroy {
     );
   }
 
-  getApiEndpointUrl(apiEndpoint) {
-    const path = apiEndpoint.Path ? `/${apiEndpoint.Path}` : '';
-    return `${apiEndpoint.Scheme}://${apiEndpoint.Host}${path}`;
-  }
-
-  ngOnDestroy(): void {
-    this.subs.forEach(s => s.unsubscribe());
-  }
-
-  private getMetadataFromInfo(entity: EntityInfo<APIResource<ICfV2Info>>) {
-    return entity && entity.entity && entity.entity.entity ? entity.entity.entity : null;
-  }
-
-  private getDescription(entity: EntityInfo<APIResource<ICfV2Info>>): string {
-    const metadata = this.getMetadataFromInfo(entity);
-    if (metadata) {
-      if (metadata.description) {
-        return metadata.description + (metadata.build ? ` (${metadata.build})` : '');
-      }
-      if (metadata.support === 'pcfdev@pivotal.io') {
-        return 'PCF Dev';
-      }
-    }
-    return '-';
-  }
-
   configureUserInvites() {
     this.dialog.open(UserInviteConfigurationDialogComponent, {
       data: {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.html
index f2b722ebda..92c2869e70 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.html
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.html
@@ -31,7 +31,7 @@
         </div>
         <div class="app-metadata__two-cols">
           <app-metadata-item label="SSH Access">
-            {{ allowSshStatus$ | async }}
+            {{ cfSpaceService.allowSshStatus$ | async }}
           </app-metadata-item>
           <app-metadata-item label="Created At">
             {{ ((cfSpaceService.space$ | async)?.entity?.metadata?.created_at) | date: 'medium' }}
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts
index 1e20e5ab65..efaf18cd79 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts
@@ -1,8 +1,7 @@
 import { Component, OnDestroy } from '@angular/core';
 import { Router } from '@angular/router';
 import { Store } from '@ngrx/store';
-import { Observable, Subscription } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { Subscription } from 'rxjs';
 
 import {
   CloudFoundrySpaceService,
@@ -18,7 +17,6 @@ import { AppState } from '../../../../../../store/src/app-state';
   styleUrls: ['./card-cf-space-details.component.scss']
 })
 export class CardCfSpaceDetailsComponent implements OnDestroy {
-  allowSshStatus$: Observable<string>;
   quotaLinkSub: Subscription;
 
   constructor(
@@ -26,9 +24,6 @@ export class CardCfSpaceDetailsComponent implements OnDestroy {
     private store: Store<AppState>,
     private router: Router
   ) {
-    this.allowSshStatus$ = cfSpaceService.allowSsh$.pipe(
-      map(status => status === 'false' ? 'Disabled' : 'Enabled')
-    );
   }
 
   goToOrgQuota() {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.html
new file mode 100644
index 0000000000..64b1fd46da
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.html
@@ -0,0 +1,76 @@
+<app-sidepanel-preview [title]="title">
+  <app-tile-grid fit="true">
+    <app-loading-page [isLoading]="detailsLoading$" text="Retrieving details">
+      <app-tile-group>
+        <app-tile>
+          <div class="cf-space-usage">
+            <mat-card>
+              <mat-card-header>
+                <mat-card-title>Summary</mat-card-title>
+              </mat-card-header>
+              <mat-card-content>
+                <app-tile-group class="app-metadata">
+                  <app-tile class="app-metadata__two-cols">
+                    <app-metadata-item label="Description">
+                      {{ cfEndpointService.description$ | async }}
+                    </app-metadata-item>
+                  </app-tile>
+                </app-tile-group>
+                <app-tile-group>
+                  <app-tile>
+                    <app-metadata-item label="Instance Address">
+                      {{ cfEndpointService.apiUrl$ | async }}
+                    </app-metadata-item>
+                    <app-metadata-item label="CF API Version">
+                      {{ (cfEndpointService.info$ | async)?.entity.entity.api_version }}
+                    </app-metadata-item>
+                  </app-tile>
+                  <app-tile class="app-metadata__two-cols">
+                    <app-metadata-item label="Account Username">
+                      {{ (cfEndpointService.endpoint$ | async )?.entity.user.name }}
+                      <span *ngIf="(cfEndpointService.endpoint$ | async )?.entity.user.admin"> (Administrator)</span>
+                    </app-metadata-item>
+                    <app-metadata-item label="SSH Access">
+                      {{ (cfEndpointService.hasSSHAccess$ | async) ? 'Available' : 'Not available' }}
+                    </app-metadata-item>
+                  </app-tile>
+                </app-tile-group>
+              </mat-card-content>
+            </mat-card>
+          </div>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile>
+          <app-card-number-metric [link]="appLink" icon="apps" label="Applications" labelSingular="Application"
+            value="{{ cfEndpointService.appsPagObs.totalEntities$ | async }}"></app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric link="/cloud-foundry/{{cfEndpointService.cfGuid}}/organizations" iconFont="stratos-icons"
+            icon="organization" label="Orgs" labelSingular="Org" value="{{ (cfEndpointService.orgs$ | async)?.length }}">
+          </app-card-number-metric>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile *ngIf="cfEndpointService.usersCount$ | async">
+          <app-card-number-metric link="/cloud-foundry/{{cfEndpointService.cfGuid}}/users" icon="person" label="Users"
+            labelSingular="User" value="{{ cfEndpointService.usersCount$ | async }}"></app-card-number-metric>
+        </app-tile>
+        <app-tile *ngIf="cfEndpointService.appsPagObs.hasEntities$ | async">
+          <app-card-number-metric icon="memory" units="mb" label="Memory Usage"
+            value="{{ cfEndpointService.totalMem$ | async }}"></app-card-number-metric>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile>
+          <app-card-cf-recent-apps *ngIf="!(detailsLoading$ | async)" [allApps$]="cfEndpointService.appsPagObs.entities$"
+            [loading$]="cfEndpointService.appsPagObs.fetchingEntities$" (refresh)="cfEndpointService.fetchApps()">
+          </app-card-cf-recent-apps>
+        </app-tile>
+      </app-tile-group>
+    </app-loading-page>
+  </app-tile-grid>
+</app-sidepanel-preview>
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.spec.ts
new file mode 100644
index 0000000000..ec7a6eb81d
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.spec.ts
@@ -0,0 +1,37 @@
+import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
+import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
+import { LoggerService } from '../../../core/logger.service';
+import { CfEndpointPreviewComponent } from './cf-endpoint-preview.component';
+
+describe('CfEndpointPreviewComponent', () => {
+  let component: CfEndpointPreviewComponent;
+  let fixture: ComponentFixture<CfEndpointPreviewComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [CfEndpointPreviewComponent],
+      providers: [LoggerService, HttpClient, HttpHandler],
+      imports: [
+        HttpClientModule,
+        HttpClientTestingModule,
+        CoreTestingModule,
+        createBasicStoreModule()
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CfEndpointPreviewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.ts
new file mode 100644
index 0000000000..e627eee112
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.ts
@@ -0,0 +1,45 @@
+import { Component } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { combineLatest, Observable } from 'rxjs';
+import { filter, map, startWith } from 'rxjs/operators';
+
+import { PreviewableComponent } from '../../../../../core/src/shared/previewable-component';
+import { CFAppState } from '../../../cf-app-state';
+import { goToAppWall } from '../../../features/cloud-foundry/cf.helpers';
+import { CloudFoundryEndpointService } from '../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
+
+@Component({
+  selector: 'app-cf-endpoint-preview-component',
+  templateUrl: './cf-endpoint-preview.component.html',
+  styleUrls: ['./cf-endpoint-preview.component.scss']
+})
+export class CfEndpointPreviewComponent implements PreviewableComponent {
+
+  title = null;
+  detailsLoading$: Observable<boolean>;
+
+  constructor(
+    public cfEndpointService: CloudFoundryEndpointService,
+    private store: Store<CFAppState>) {
+  }
+
+  appLink() {
+    goToAppWall(this.store, this.cfEndpointService.cfGuid);
+  }
+
+  setProps(props: { [key: string]: any }) {
+    this.title = props.title;
+
+    this.cfEndpointService.initialize(props.cfGuid);
+
+    this.detailsLoading$ = combineLatest([
+      // Wait for the apps to have been fetched, this will determine if multiple small cards are shown or now
+      this.cfEndpointService.appsPagObs.fetchingEntities$.pipe(
+        filter(loading => !loading)
+      ),
+    ]).pipe(
+      map(() => false),
+      startWith(true)
+    );
+  }
+}
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 769b889fa9..05738ad3f1 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
@@ -19,6 +19,7 @@ import { SpecifyDetailsStepComponent } from './add-service-instance/specify-deta
 import {
   SpecifyUserProvidedDetailsComponent,
 } from './add-service-instance/specify-user-provided-details/specify-user-provided-details.component';
+import { ApplicationPreviewComponent } from './application-preview/application-preview.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';
@@ -38,6 +39,7 @@ import {
 } 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 { CfEndpointPreviewComponent } from './cf-endpoint-preview/cf-endpoint-preview.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';
@@ -143,12 +145,14 @@ import {
 import {
   UserProvidedServiceInstanceCardComponent,
 } from './list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component';
+import { OrganizationPreviewComponent } from './organization-preview/organization-preview.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';
+import { SpacePreviewComponent } from './space-preview/space-preview.component';
 
 // tslint:enable:max-line-length
 
@@ -238,7 +242,12 @@ import { ServicePlanPublicComponent } from './service-plan-public/service-plan-p
     TableCellEventActionComponent,
     TableCellEventDetailComponent,
     TableCellUsageComponent,
-    TableCellQuotaComponent
+    TableCellQuotaComponent,
+
+    CfEndpointPreviewComponent,
+    SpacePreviewComponent,
+    OrganizationPreviewComponent,
+    ApplicationPreviewComponent,
   ],
   exports: [
     ServiceIconComponent,
@@ -275,12 +284,22 @@ import { ServicePlanPublicComponent } from './service-plan-public/service-plan-p
     RunningInstancesComponent,
     ServicePlanPublicComponent,
     ServicePlanPriceComponent,
-    CreateApplicationStep1Component
+    CreateApplicationStep1Component,
+
+    CfEndpointPreviewComponent,
+    SpacePreviewComponent,
+    OrganizationPreviewComponent,
+    ApplicationPreviewComponent,
   ],
   entryComponents: [
     CfEndpointDetailsComponent,
     NoServicePlansComponent,
 
+    CfEndpointPreviewComponent,
+    SpacePreviewComponent,
+    OrganizationPreviewComponent,
+    ApplicationPreviewComponent,
+
     AppServiceBindingCardComponent,
     CardAppComponent,
     CfOrgCardComponent,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.html
new file mode 100644
index 0000000000..94359a1d9b
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.html
@@ -0,0 +1,102 @@
+<app-sidepanel-preview [title]="title">
+  <app-tile-grid fit="true">
+    <app-loading-page [isLoading]="detailsLoading$" text="Retrieving details">
+      <app-tile-group>
+        <app-tile>
+          <div class="cf-space-usage">
+            <mat-card>
+              <mat-card-header>
+                <mat-card-title>Summary</mat-card-title>
+              </mat-card-header>
+              <mat-card-content>
+                <app-tile-group class="app-metadata">
+                  <app-tile class="app-metadata__two-cols">
+                    <app-metadata-item label="User Org Role">
+                      {{ (cfOrgService.userOrgRole$ | async) }}
+                    </app-metadata-item>
+                    <app-metadata-item label="Quota Definition">
+                      <a [routerLink]="cfOrgService.quotaLink$ | async">
+                        {{ (cfOrgService.quotaDefinition$ | async)?.name }}
+                      </a>
+                    </app-metadata-item>
+                  </app-tile>
+                  <app-tile class="app-metadata__two-cols">
+                    <app-metadata-item label="Provision Paid Services">
+                      <app-boolean-indicator
+                        [isTrue]="(cfOrgService.quotaDefinition$ | async)?.non_basic_services_allowed" type="yes-no">
+                      </app-boolean-indicator>
+                    </app-metadata-item>
+                    <app-metadata-item label="Org Status">
+                      {{ ((cfOrgService.org$ | async)?.entity?.entity?.status) | capitalizeFirst}}
+                    </app-metadata-item>
+                  </app-tile>
+                </app-tile-group>
+              </mat-card-content>
+            </mat-card>
+          </div>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile>
+          <app-card-number-metric
+            link="/cloud-foundry/{{cfOrgService.cfGuid}}/organizations/{{cfOrgService.orgGuid}}/spaces" icon="language"
+            label="Spaces" labelSingular="Space" value="{{ (cfOrgService.spaces$ | async)?.length }}">
+          </app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric [link]="appLink" icon="apps" label="Applications" labelSingular="Application"
+            value="{{ cfOrgService.appCount$ | async }}"></app-card-number-metric>
+        </app-tile>
+        <app-tile *ngIf="cfEndpointService.appsPagObs.hasEntities$ | async">
+          <app-card-number-metric icon="content_copy" label="App Instances"
+            value="{{ cfOrgService.appInstances$ | async }}"
+            limit="{{ (cfOrgService.quotaDefinition$ | async)?.app_instance_limit }}"></app-card-number-metric>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile>
+          <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Routes"
+            value="{{ (cfOrgService.routes$ | async)?.length }}"
+            limit="{{ (cfOrgService.quotaDefinition$ | async)?.total_routes}}"></app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric
+            link="/cloud-foundry/{{cfOrgService.cfGuid}}/organizations/{{cfOrgService.orgGuid}}/users" icon="person"
+            label="Users" labelSingular="User" value="{{ cfOrgService.usersCount$ | async }}">
+          </app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric icon="domain" label="Private Domains"
+            value="{{ (cfOrgService.privateDomains$ | async)?.length }}"
+            limit="{{ (cfOrgService.quotaDefinition$ | async)?.total_private_domains}}"></app-card-number-metric>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile>
+          <app-card-number-metric iconFont="stratos-icons" icon="service" label="Service Instances"
+            value="{{ cfOrgService.serviceInstancesCount$ | async }}"
+            limit="{{ (cfOrgService.quotaDefinition$ | async)?.total_services }}"></app-card-number-metric>
+        </app-tile>
+        <app-tile [hidden]="!cfEndpointService.appsPagObs.hasEntities$ | async">
+          <app-card-number-metric icon="memory" label="Memory Usage" units="mb"
+            value="{{ cfOrgService.totalMem$ | async }}"
+            limit="{{ (cfOrgService.quotaDefinition$ | async)?.memory_limit }}"></app-card-number-metric>
+        </app-tile>
+        <app-tile [hidden]="!(cfOrgService.userProvidedServiceInstancesCount$ | async) > 0">
+          <app-card-number-metric iconFont="stratos-icons" icon="service" label="User Service Instances"
+            value="{{ cfOrgService.userProvidedServiceInstancesCount$ | async }}"></app-card-number-metric>
+        </app-tile>
+      </app-tile-group>
+      <app-tile-group></app-tile-group>
+      <app-tile-group>
+        <app-tile>
+          <app-card-cf-recent-apps *ngIf="!(detailsLoading$ | async)" [allApps$]="cfOrgService.apps$"
+            [loading$]="cfOrgService.loadingApps$" (refresh)="cfEndpointService.fetchApps()"></app-card-cf-recent-apps>
+        </app-tile>
+      </app-tile-group>
+    </app-loading-page>
+  </app-tile-grid>
+</app-sidepanel-preview>
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.spec.ts
new file mode 100644
index 0000000000..f753652c8b
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.spec.ts
@@ -0,0 +1,37 @@
+import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
+import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
+import { LoggerService } from '../../../core/logger.service';
+import { OrganizationPreviewComponent } from './organization-preview.component';
+
+describe('OrganizationPreviewComponent', () => {
+  let component: OrganizationPreviewComponent;
+  let fixture: ComponentFixture<OrganizationPreviewComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [OrganizationPreviewComponent],
+      providers: [LoggerService, HttpClient, HttpHandler],
+      imports: [
+        HttpClientModule,
+        HttpClientTestingModule,
+        CoreTestingModule,
+        createBasicStoreModule()
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(OrganizationPreviewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.ts
new file mode 100644
index 0000000000..eec648002b
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.ts
@@ -0,0 +1,50 @@
+import { Component } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { combineLatest, Observable } from 'rxjs';
+import { filter, map, startWith } from 'rxjs/operators';
+
+import { PreviewableComponent } from '../../../../../core/src/shared/previewable-component';
+import { CFAppState } from '../../../cf-app-state';
+import { goToAppWall } from '../../../features/cloud-foundry/cf.helpers';
+import { CloudFoundryEndpointService } from '../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
+import {
+  CloudFoundryOrganizationService,
+} from '../../../features/cloud-foundry/services/cloud-foundry-organization.service';
+
+@Component({
+  selector: 'app-organization-preview-component',
+  templateUrl: './organization-preview.component.html',
+  styleUrls: ['./organization-preview.component.scss']
+})
+export class OrganizationPreviewComponent implements PreviewableComponent {
+
+  title = null;
+  detailsLoading$: Observable<boolean>;
+
+  constructor(
+    public cfEndpointService: CloudFoundryEndpointService,
+    public cfOrgService: CloudFoundryOrganizationService,
+    private store: Store<CFAppState>) {
+  }
+
+  appLink() {
+    goToAppWall(this.store, this.cfOrgService.cfGuid, this.cfOrgService.orgGuid);
+  }
+
+  setProps(props: { [key: string]: any }) {
+    this.title = props.title;
+
+    this.cfEndpointService.initialize(props.cfGuid);
+    this.cfOrgService.initialize(props.cfGuid, props.guid);
+
+    this.detailsLoading$ = combineLatest([
+      // Wait for the apps to have been fetched, this will determine if multiple small cards are shown or now
+      this.cfEndpointService.appsPagObs.fetchingEntities$.pipe(
+        filter(loading => !loading)
+      ),
+    ]).pipe(
+      map(() => false),
+      startWith(true)
+    );
+  }
+}
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.html
new file mode 100644
index 0000000000..a1fe099e86
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.html
@@ -0,0 +1,101 @@
+<app-sidepanel-preview [title]="title">
+  <app-tile-grid fit="true">
+    <app-loading-page [isLoading]="detailsLoading$" text="Retrieving details">
+      <app-tile-group>
+        <app-tile>
+          <div class="cf-space-usage">
+            <mat-card>
+              <mat-card-header>
+                <mat-card-title>Summary</mat-card-title>
+              </mat-card-header>
+              <mat-card-content>
+                <app-tile-group class="app-metadata">
+                  <app-tile class="app-metadata__two-cols">
+                    <app-metadata-item label="User Space Role/s">
+                      {{ (cfSpaceService.userRole$ | async) }}
+                    </app-metadata-item>
+                    <app-metadata-item label="Quota Definition">
+                      <ng-container *ngIf="(cfSpaceService.spaceQuotaDefinition$ | async) as spaceQuotaDefinition; else fallBackQuota">
+                        <a [routerLink]="cfSpaceService.quotaLink$ | async">
+                          {{ spaceQuotaDefinition.name }}
+                        </a>
+                      </ng-container>
+                      <ng-template #fallBackQuota>
+                        None assigned
+                        <span *ngIf="cfSpaceService.quotaDefinition$ | async as quotaDefinition"> - <a [routerLink]=""
+                            (click)="goToOrgQuota($event)">view organization's quota</a>
+                        </span>
+                      </ng-template>
+                    </app-metadata-item>
+                  </app-tile>
+                  <app-tile class="app-metadata__two-cols">
+                    <app-metadata-item label="SSH Access">
+                      {{ cfSpaceService.allowSshStatus$ | async }}
+                    </app-metadata-item>
+                    <app-metadata-item label="Provision Paid Services">
+                      <app-boolean-indicator [isTrue]="(cfSpaceService.quotaDefinition$ | async)?.non_basic_services_allowed" type="yes-no">
+                      </app-boolean-indicator>
+                    </app-metadata-item>
+                  </app-tile>
+                </app-tile-group>
+              </mat-card-content>
+            </mat-card>
+          </div>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile>
+          <app-card-number-metric
+            link="/cloud-foundry/{{cfSpaceService.cfGuid}}/organizations/{{cfSpaceService.orgGuid}}/spaces/{{cfSpaceService.spaceGuid}}/apps"
+            icon="apps" label="Applications" labelSingular="Application" value="{{ cfSpaceService.appCount$ | async }}">
+          </app-card-number-metric>
+        </app-tile>
+        <app-tile *ngIf="cfEndpointService.appsPagObs.hasEntities$ | async">
+          <app-card-number-metric icon="content_copy" label="App Instances"
+            value="{{ (cfSpaceService.appInstances$ | async) }}"
+            limit="{{ (cfSpaceService.quotaDefinition$ | async)?.app_instance_limit}}"></app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric
+            link="/cloud-foundry/{{cfSpaceService.cfGuid}}/organizations/{{cfSpaceService.orgGuid}}/spaces/{{cfSpaceService.spaceGuid}}/routes"
+            iconFont="stratos-icons" icon="network_route" label="Routes"
+            value="{{ (cfSpaceService.routes$ | async)?.length }}"
+            limit="{{ (cfSpaceService.quotaDefinition$ | async)?.total_routes}}"></app-card-number-metric>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile>
+          <app-card-number-metric
+            link="/cloud-foundry/{{cfSpaceService.cfGuid}}/organizations/{{cfSpaceService.orgGuid}}/spaces/{{cfSpaceService.spaceGuid}}/users"
+            icon="person" label="Users" labelSingular="User" value="{{ cfSpaceService.usersCount$ | async }}">
+          </app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric
+            link="/cloud-foundry/{{cfSpaceService.cfGuid}}/organizations/{{cfSpaceService.orgGuid}}/spaces/{{cfSpaceService.spaceGuid}}/service-instances"
+            iconFont="stratos-icons" icon="service" label="Service Instances"
+            value="{{ (cfSpaceService.serviceInstancesCount$ | async)}}"
+            limit="{{ (cfSpaceService.quotaDefinition$ | async)?.total_services }}"></app-card-number-metric>
+        </app-tile>
+        <app-tile *ngIf="(cfSpaceService.userProvidedServiceInstancesCount$ | async) > 0">
+          <app-card-number-metric iconFont="stratos-icons" icon="service" label="User Service Instances"
+            value="5"></app-card-number-metric>
+        </app-tile>
+        <app-tile *ngIf="true">
+          <app-card-number-metric icon="memory" label="Memory Usage" units="mb"
+            value="5"
+            limit="10"></app-card-number-metric>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile>
+          <app-card-cf-recent-apps *ngIf="!(detailsLoading$ | async)" [allApps$]="cfSpaceService.apps$"
+            [loading$]="cfSpaceService.loadingApps$" (refresh)="cfEndpointService.fetchApps()"></app-card-cf-recent-apps>
+        </app-tile>
+      </app-tile-group>
+    </app-loading-page>
+  </app-tile-grid>
+</app-sidepanel-preview>
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.spec.ts
new file mode 100644
index 0000000000..80a547980e
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.spec.ts
@@ -0,0 +1,37 @@
+import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
+import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
+import { LoggerService } from '../../../core/logger.service';
+import { SpacePreviewComponent } from './space-preview.component';
+
+describe('SpacePreviewComponent', () => {
+  let component: SpacePreviewComponent;
+  let fixture: ComponentFixture<SpacePreviewComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [SpacePreviewComponent],
+      providers: [LoggerService, HttpClient, HttpHandler],
+      imports: [
+        HttpClientModule,
+        HttpClientTestingModule,
+        CoreTestingModule,
+        createBasicStoreModule()
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SpacePreviewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.ts
new file mode 100644
index 0000000000..727611d5c9
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.ts
@@ -0,0 +1,47 @@
+import { Component } from '@angular/core';
+import { combineLatest, Observable } from 'rxjs';
+import { delay, filter, map, startWith } from 'rxjs/operators';
+
+import { PreviewableComponent } from '../../../../../core/src/shared/previewable-component';
+import { CloudFoundryEndpointService } from '../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
+import {
+  CloudFoundryOrganizationService,
+} from '../../../features/cloud-foundry/services/cloud-foundry-organization.service';
+import { CloudFoundrySpaceService } from '../../../features/cloud-foundry/services/cloud-foundry-space.service';
+
+@Component({
+  selector: 'app-space-preview-component',
+  templateUrl: './space-preview.component.html',
+  styleUrls: ['./space-preview.component.scss']
+})
+export class SpacePreviewComponent implements PreviewableComponent {
+
+  title = null;
+  detailsLoading$: Observable<boolean>;
+
+  constructor(
+    public cfEndpointService: CloudFoundryEndpointService,
+    private cfOrgService: CloudFoundryOrganizationService,
+    public cfSpaceService: CloudFoundrySpaceService) {
+  }
+
+  setProps(props: { [key: string]: any }) {
+    this.title = props.title;
+
+    this.cfEndpointService.initialize(props.cfGuid);
+    this.cfOrgService.initialize(props.cfGuid, props.orgGuid);
+    this.cfSpaceService.initialize(props.cfGuid, props.orgGuid, props.guid);
+
+    this.detailsLoading$ = combineLatest([
+      // Wait for the apps to have been fetched, this will determine if multiple small cards are shown or now
+      this.cfEndpointService.appsPagObs.fetchingEntities$.pipe(
+        filter(loading => !loading)
+      ),
+      this.cfSpaceService.userProvidedServiceInstancesCount$
+    ]).pipe(
+      map(() => false),
+      delay(50000),
+      startWith(true)
+    );
+  }
+}
diff --git a/src/frontend/packages/core/sass/_all-theme.scss b/src/frontend/packages/core/sass/_all-theme.scss
index 184dc594e9..2dc2d5ba00 100644
--- a/src/frontend/packages/core/sass/_all-theme.scss
+++ b/src/frontend/packages/core/sass/_all-theme.scss
@@ -40,7 +40,7 @@
 @import '../src/shared/components/multiline-title/multiline-title.component.theme';
 @import '../src/features/user-profile/profile-info/profile-info.component.theme';
 @import '../src/core/stateful-icon/stateful-icon.component.theme';
-@import '../src/shared/components/markdown-preview/markdown-preview.component.theme';
+@import '../src/shared/components/sidepanel-preview/sidepanel-preview.component.theme';
 @import './components/mat-tabs.theme';
 @import './components/text-status.theme';
 @import './components/hyperlinks.theme';
@@ -138,11 +138,10 @@ $side-nav-light-active: #484848;
   @include metrics-chart-theme($theme, $app-theme);
   @include metrics-range-selector-theme($theme, $app-theme);
   @include app-multiline-title-theme($theme, $app-theme);
-  @include app-markdown-preview-theme($theme, $app-theme);
+  @include app-sidepanel-preview-theme($theme, $app-theme);
   @include tile-selector-theme($theme, $app-theme);
   @include profile-page-theme($theme, $app-theme);
   @include stateful-icon($theme, $app-theme);
-  @include app-markdown-preview-theme($theme, $app-theme);
   @include app-simple-usage-chart($theme, $app-theme);
   @include home-page-theme($theme, $app-theme);
   @include favorites-global-list-theme($theme, $app-theme);
diff --git a/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue-entity.ts b/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue-entity.ts
index bfe12dbd77..11de55d636 100644
--- a/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue-entity.ts
+++ b/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue-entity.ts
@@ -2,6 +2,7 @@ import { ActionReducer, Store } from '@ngrx/store';
 import { normalize } from 'normalizr';
 
 import { AppState, IRequestEntityTypeState } from '../../../../store/src/app-state';
+import { EntityPipelineEntity, stratosEndpointGuidKey } from '../../../../store/src/entity-request-pipeline/pipeline.types';
 import { EntitySchema } from '../../../../store/src/helpers/entity-schema';
 import { NormalizedResponse } from '../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
@@ -28,7 +29,6 @@ import {
   IStratosEntityDefinition,
   StratosEndpointExtensionDefinition,
 } from './entity-catalogue.types';
-import { EntityPipelineEntity, stratosEndpointGuidKey } from '../../../../store/src/entity-request-pipeline/pipeline.types';
 
 export interface EntityCatalogueBuilders<
   T extends IEntityMetadata = IEntityMetadata,
@@ -263,7 +263,9 @@ export class StratosCatalogueEndpointEntity extends StratosBaseCatalogueEntity<I
   public definition: IStratosEndpointDefinition<EntityCatalogueSchemas>;
   constructor(
     entity: StratosEndpointExtensionDefinition | IStratosEndpointDefinition,
-    getLink?: (metadata: IEndpointFavMetadata) => string
+    getLink?: (metadata: IEndpointFavMetadata) => string,
+    // TODO: attach to PreviewableComponent
+    getPreviewableComponent?: () => object
   ) {
     const fullEntity = {
       ...entity,
@@ -274,7 +276,8 @@ export class StratosCatalogueEndpointEntity extends StratosBaseCatalogueEntity<I
     super(fullEntity, {
       entityBuilder: {
         ...StratosCatalogueEndpointEntity.baseEndpointRender,
-        getLink: getLink || StratosCatalogueEndpointEntity.baseEndpointRender.getLink
+        getLink: getLink || StratosCatalogueEndpointEntity.baseEndpointRender.getLink,
+        getPreviewableComponent,
       }
     });
   }
diff --git a/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.types.ts b/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.types.ts
index ebcd47166a..241c7d5643 100644
--- a/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.types.ts
+++ b/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.types.ts
@@ -1,5 +1,7 @@
+import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 
+import { GeneralEntityAppState } from '../../../../store/src/app-state';
 import {
   ApiErrorMessageHandler,
   PreApiRequest,
@@ -13,8 +15,6 @@ import { EntitySchema } from '../../../../store/src/helpers/entity-schema';
 import { StratosStatus } from '../../shared/shared.types';
 import { EndpointAuthTypeConfig } from '../extension/extension-types';
 import { Omit } from '../utils.service';
-import { GeneralEntityAppState } from '../../../../store/src/app-state';
-import { Store } from '@ngrx/store';
 
 export interface EntityCatalogueEntityConfig {
   entityType: string;
@@ -149,6 +149,7 @@ export interface IStratosEntityBuilder<T extends IEntityMetadata, Y = any> {
   getStatusObservable?(entity: Y): Observable<StratosStatus>;
   // TODO This should be used in the entities schema.
   getGuid(entityMetadata: T): string;
+  getPreviewableComponent?(): object;
   getLink?(entityMetadata: T): string;
   getLines?(): EntityRowBuilder<T>[];
   getSubTypeLabels?(entityMetadata: T): {
diff --git a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.html b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.html
index 2122da51c7..e6313f681e 100644
--- a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.html
+++ b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.html
@@ -33,13 +33,13 @@
       </div>
     </mat-drawer-content>
   </mat-drawer-container>
-  <mat-drawer class="dashboard__side-help-outer" #sideHelp *ngIf="rightNavState$ | async as rightNavState"
-    [autoFocus]="false" mode="over" position="end" [opened]="rightNavState.opened" (closedStart)="sideHelpClosed()">
+  <mat-drawer class="dashboard__side-help-outer" #sideHelp
+    [autoFocus]="false" mode="over" position="end" [opened]="panelPreviewService.opened$ | async" (closedStart)="sideHelpClosed()">
     <div class="dashboard__side-help">
-      <button class="dashboard__side-help-button" mat-icon-button (click)="rightNavState.opened = false">
+      <button class="dashboard__side-help-button" mat-icon-button (click)="panelPreviewService.hide()">
         <mat-icon>close</mat-icon>
       </button>
-      <app-markdown-preview [documentUrl]="rightNavState.documentUrl"></app-markdown-preview>
+      <template #previewPanelContainer></template>
     </div>
   </mat-drawer>
 </div>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
index 0884263a2b..82277d48cb 100644
--- a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
+++ b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
@@ -16,6 +16,10 @@ $app-sub-header-height: 48px;
   }
   &__side-help-outer {
     z-index: 9999;
+
+    @include breakpoint(mobileonly) {
+      left: 0;
+    }
   }
   &__side-help-button {
     position: absolute;
@@ -51,7 +55,7 @@ $app-sub-header-height: 48px;
     padding: 0;
   }
   &__side-help {
-    max-width: 600px;
+    min-width: 600px;
   }
 }
 
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 ad8a819158..df6b6dd0e5 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,6 +1,6 @@
 import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
 import { Portal } from '@angular/cdk/portal';
-import { Component, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, NgZone, OnDestroy, OnInit, ViewChild, ViewContainerRef } from '@angular/core';
 import { MatDrawer } from '@angular/material';
 import { ActivatedRoute, ActivatedRouteSnapshot, NavigationEnd, Route, Router } from '@angular/router';
 import { Store } from '@ngrx/store';
@@ -13,12 +13,7 @@ import { cfInfoEntityType } from '../../../../../cloud-foundry/src/cf-entity-typ
 import {
   CfInfoDefinitionActionBuilders,
 } from '../../../../../cloud-foundry/src/entity-action-builders/cf-info.action-builders';
-import {
-  CloseSideHelp,
-  CloseSideNav,
-  DisableMobileNav,
-  EnableMobileNav,
-} from '../../../../../store/src/actions/dashboard-actions';
+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';
@@ -29,6 +24,7 @@ import { CustomizationService } from '../../../core/customizations.types';
 import { EndpointsService } from '../../../core/endpoints.service';
 import { entityCatalogue } from '../../../core/entity-catalogue/entity-catalogue.service';
 import { IEntityMetadata } from '../../../core/entity-catalogue/entity-catalogue.types';
+import { PanelPreviewService } from '../../../shared/services/panel-preview.service';
 import { PageHeaderService } from './../../../core/page-header-service/page-header.service';
 import { SideNavItem } from './../side-nav/side-nav.component';
 
@@ -39,16 +35,28 @@ import { SideNavItem } from './../side-nav/side-nav.component';
   styleUrls: ['./dashboard-base.component.scss']
 })
 
-export class DashboardBaseComponent implements OnInit, OnDestroy {
+export class DashboardBaseComponent implements OnInit, OnDestroy, AfterViewInit {
   public activeTabLabel$: Observable<string>;
   public subNavData$: Observable<[string, Portal<any>]>;
   public isMobile$: Observable<boolean>;
   public sideNavMode$: Observable<string>;
   public sideNavMode: string;
   public mainNavState$: Observable<{ mode: string; opened: boolean; iconMode: boolean }>;
-  public rightNavState$: Observable<{ opened: boolean; documentUrl: string; }>;
+  public rightNavState$: Observable<{ opened: boolean, component?: object, props?: object }>;
   private dashboardState$: Observable<DashboardState>;
+  public noMargin$: Observable<boolean>;
+  private closeSub: Subscription;
+  private mobileSub: Subscription;
   private drawer: MatDrawer;
+  public iconModeOpen = false;
+  public sideNavWidth = 54;
+
+  sideNavTabs: SideNavItem[] = this.getNavigationRoutes();
+  sideNaveMode = 'side';
+
+  @ViewChild('previewPanelContainer', { read: ViewContainerRef, static: false }) previewPanelContainer: ViewContainerRef;
+
+  @ViewChild('content', { static: false }) public content;
 
   constructor(
     public pageHeaderService: PageHeaderService,
@@ -59,6 +67,7 @@ export class DashboardBaseComponent implements OnInit, OnDestroy {
     private endpointsService: EndpointsService,
     public tabNavService: TabNavService,
     private ngZone: NgZone,
+    public panelPreviewService: PanelPreviewService,
     private cs: CustomizationService
   ) {
     this.noMargin$ = this.router.events.pipe(
@@ -89,24 +98,11 @@ export class DashboardBaseComponent implements OnInit, OnDestroy {
         }
       })
     );
-    this.rightNavState$ = this.dashboardState$.pipe(
-      map(state => ({
-        opened: !!state.sideHelpDocument && state.sideHelpOpen,
-        documentUrl: state.sideHelpDocument
-      }))
-    );
+
     this.mobileSub = this.isMobile$
       .subscribe(isMobile => isMobile ? this.store.dispatch(new EnableMobileNav()) : this.store.dispatch(new DisableMobileNav()));
   }
 
-  public helpDocumentUrl: string;
-
-  private closeSub: Subscription;
-
-  public noMargin$: Observable<boolean>;
-
-  private mobileSub: Subscription;
-
   @ViewChild('sidenav', { static: false }) set sidenav(drawer: MatDrawer) {
     this.drawer = drawer;
     if (!this.closeSub) {
@@ -119,15 +115,6 @@ export class DashboardBaseComponent implements OnInit, OnDestroy {
     }
   }
 
-  @ViewChild('content', { static: true }) public content;
-
-  sideNavTabs: SideNavItem[] = this.getNavigationRoutes();
-
-  sideNaveMode = 'side';
-
-  public iconModeOpen = false;
-  public sideNavWidth = 54;
-
   public redrawSideNav() {
     // We need to do this to ensure there isn't a space left behind
     // when going from mobile to desktop
@@ -140,6 +127,14 @@ export class DashboardBaseComponent implements OnInit, OnDestroy {
     this.store.dispatch(new GetCurrentUsersRelations());
   }
 
+  sideHelpClosed() {
+    this.panelPreviewService.hide();
+  }
+
+  ngAfterViewInit() {
+    this.panelPreviewService.setContainer(this.previewPanelContainer);
+  }
+
   ngOnInit() {
     this.subNavData$ = combineLatest(
       this.tabNavService.getCurrentTabHeaderObservable().pipe(
@@ -172,10 +167,6 @@ export class DashboardBaseComponent implements OnInit, OnDestroy {
     return false;
   }
 
-  public sideHelpClosed() {
-    this.store.dispatch(new CloseSideHelp());
-  }
-
   private getNavigationRoutes(): SideNavItem[] {
     let navItems = this.collectNavigationRoutes('', this.router.config);
 
diff --git a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.ts b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.ts
index e418b05aff..b4c554eba4 100644
--- a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.ts
@@ -3,7 +3,6 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Subscription } from 'rxjs';
 
-import { ShowSideHelp } from '../../../../../store/src/actions/dashboard-actions';
 import { ShowSnackBar } from '../../../../../store/src/actions/snackBar.actions';
 import { EndpointOnlyAppState } from '../../../../../store/src/app-state';
 import { EndpointsService } from '../../../core/endpoints.service';
@@ -38,7 +37,8 @@ export class ConnectEndpointDialogComponent implements OnDestroy {
   }
 
   showHelp() {
-    this.store.dispatch(new ShowSideHelp(this.helpDocumentUrl));
+    // this.panelPreviewService.show(MarkdownPreviewComponent, { documentUrl: this.helpDocumentUrl });
+    // this.store.dispatch(new ShowSideHelp(MarkdownPreviewComponent, { setDocumentUrl: this.helpDocumentUrl }));
   }
 
   ngOnDestroy(): void {
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.ts b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.ts
index d513432c29..b2282192bb 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.ts
@@ -3,7 +3,6 @@ import { Store } from '@ngrx/store';
 import { Observable, of } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { ShowSideHelp } from '../../../../../../store/src/actions/dashboard-actions';
 import { EndpointOnlyAppState } from '../../../../../../store/src/app-state';
 import { EndpointsService } from '../../../../core/endpoints.service';
 import { IStepperStep, StepOnNextResult } from '../../../../shared/components/stepper/step/step.component';
@@ -31,7 +30,8 @@ export class CreateEndpointConnectComponent implements OnDestroy, IStepperStep {
   }
 
   showHelp() {
-    this.store.dispatch(new ShowSideHelp(this.helpDocumentUrl));
+    // this.panelPreviewService.show(MarkdownPreviewComponent, { documentUrl: this.helpDocumentUrl });
+    // this.store.dispatch(new ShowSideHelp(MarkdownPreviewComponent, { setDocumentUrl: this.helpDocumentUrl }));
   }
 
   onEnter = (data: ConnectEndpointConfig) => {
diff --git a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.html b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.html
index 53a2b5e295..9af11474b9 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.html
+++ b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.html
@@ -1,5 +1,5 @@
 <app-meta-card [favorite]="metaFavorite" [confirmFavoriteRemoval]="true" [ngClass]="{'fav-meta-card__clickable': !!(routerLink$ | async)}"
-  [actionMenu]="actions$ | async" [routerLink]="routerLink$ | async" class="fav-meta-card" *ngIf="config" [status$]="status$"
+  [actionMenu]="actions$ | async" (click)="previewPanel()" class="fav-meta-card" *ngIf="config" [status$]="status$"
   [entityConfig]="entityConfig">
   <app-meta-card-title class="fav-meta-card__header">
     <!--<div>ICON</div>-->
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 a252d8b69e..29c8e373ef 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,10 +7,15 @@ import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import {
   RemoveUserFavoriteAction,
 } from '../../../../../store/src/actions/user-favourites-actions/remove-user-favorite-action';
-import { endpointEntitiesSelector } from '../../../../../store/src/selectors/endpoint.selectors';
+import {
+  endpointEntitiesSelector,
+  endpointsEntityRequestDataSelector,
+} from '../../../../../store/src/selectors/endpoint.selectors';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../store/src/types/user-favorites.types';
 import { userFavoritesEntitySchema } from '../../../base-entity-schemas';
+import { entityCatalogue } from '../../../core/entity-catalogue/entity-catalogue.service';
 import { IFavoriteEntity } from '../../../core/user-favorite-manager';
+import { PanelPreviewService } from '../../services/panel-preview.service';
 import { ComponentEntityMonitorConfig, StratosStatus } from '../../shared.types';
 import { ConfirmationDialogConfig } from '../confirmation-dialog.config';
 import { ConfirmationDialogService } from '../confirmation-dialog.service';
@@ -97,7 +102,33 @@ export class FavoritesMetaCardComponent {
     }
   }
 
-  constructor(private store: Store<CFAppState>, private confirmDialog: ConfirmationDialogService) { }
+  constructor(
+    private store: Store<CFAppState>,
+    private confirmDialog: ConfirmationDialogService,
+    private panelPreviewService: PanelPreviewService
+  ) { }
+
+  previewPanel() {
+    const catalogueEntity = entityCatalogue.getEntity(this.favorite.endpointType, this.favorite.entityType);
+    const previewComponent = catalogueEntity.builders.entityBuilder.getPreviewableComponent();
+
+    // TODO: use 'endpoint' as constant
+    if (this.favorite.entityType === 'endpoint') {
+      const entity$ = this.store.select(endpointsEntityRequestDataSelector(this.favorite.endpointId));
+      this.panelPreviewService.show(previewComponent, {
+        title: this.favorite.metadata.name,
+        entity$,
+        cfGuid: this.favorite.endpointId
+      });
+    } else {
+      this.panelPreviewService.show(previewComponent, {
+        title: this.favorite.metadata.name,
+        cfGuid: this.favorite.metadata.cfGuid,
+        orgGuid: this.favorite.metadata.orgGuid,
+        guid: this.favorite.metadata.guid
+      });
+    }
+  }
 
   public setConfirmation(prettyName: string, favorite: UserFavorite<IFavoriteMetadata>) {
     this.confirmation = new ConfirmationDialogConfig(
diff --git a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.html b/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.html
index 4ad4077847..972ac85319 100644
--- a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.html
+++ b/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.html
@@ -1,6 +1,3 @@
-<div class="markdown-preview">
-  <div class="markdown-preview__header">
-    <h1>{{ title }}</h1>
-  </div>
+<app-sidepanel-preview [title]="title">
   <div #markdown class="markdown-preview__content" [innerHtml]="markdownHtml" appMarkdownContentObserver (innerHtmlRendered)="markdownRendered()"></div>
-</div>
\ No newline at end of file
+</app-sidepanel-preview>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.scss b/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.scss
index 2a7eaa882f..e69de29bb2 100644
--- a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.scss
+++ b/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.scss
@@ -1,21 +0,0 @@
-.markdown-preview {
-  display: flex;
-  flex-direction: column;
-  height: 100vh;
-  &__header {
-    display: flex;
-    flex: 0 0 56px;
-    height: 56px;
-
-    h1 {
-      align-self: center;
-      font-size: 20px;
-      margin-left: 24px;
-    }
-  }
-  &__content {
-    flex: 1;
-    overflow: auto;
-    padding: 10px 24px;
-  }
-}
diff --git a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.ts b/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.ts
index 97384669d0..dab1792c71 100644
--- a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.ts
+++ b/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.ts
@@ -4,13 +4,14 @@ import { DomSanitizer } from '@angular/platform-browser';
 import * as markdown from 'marked';
 
 import { LoggerService } from '../../../core/logger.service';
+import { PreviewableComponent } from '../../previewable-component';
 
 @Component({
   selector: 'app-markdown-preview',
   templateUrl: './markdown-preview.component.html',
   styleUrls: ['./markdown-preview.component.scss']
 })
-export class MarkdownPreviewComponent {
+export class MarkdownPreviewComponent implements PreviewableComponent {
 
   markdownHtml: string;
   documentUrl: string;
@@ -27,7 +28,16 @@ export class MarkdownPreviewComponent {
 
   @ViewChild('markdown', { static: true }) public markdown: ElementRef;
 
-  constructor(private httpClient: HttpClient, private logger: LoggerService, private domSanitizer: DomSanitizer) { }
+  constructor(
+    private httpClient: HttpClient,
+    private logger: LoggerService,
+    private domSanitizer: DomSanitizer
+  ) { }
+
+  setProps(props: { [key: string]: any }) {
+    console.log('props', props);
+    this.setDocumentUrl = props.documentUrl;
+  }
 
   private loadDocument() {
     this.httpClient.get(this.documentUrl, { responseType: 'text' }).subscribe(
diff --git a/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.html b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.html
new file mode 100644
index 0000000000..9e95cac0d8
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.html
@@ -0,0 +1,8 @@
+<div class="sidepanel-preview">
+  <div class="sidepanel-preview__header">
+    <h1>{{ title }}</h1>
+  </div>
+  <div class="sidepanel-preview__content">
+    <ng-content></ng-content>
+  </div>
+</div>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.scss b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.scss
new file mode 100644
index 0000000000..c3afff37d8
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.scss
@@ -0,0 +1,23 @@
+.sidepanel-preview {
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  &__header {
+    display: flex;
+    flex: 0 0 56px;
+    height: 56px;
+
+    h1 {
+      align-self: center;
+      font-size: 20px;
+      margin-left: 24px;
+    }
+  }
+  &__content {
+    flex: 1;
+    overflow-x: hidden;
+    overflow-y: auto;
+    padding: 12px 15px;
+    position: relative;
+  }
+}
diff --git a/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.spec.ts b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.spec.ts
new file mode 100644
index 0000000000..2eb1505ae2
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.spec.ts
@@ -0,0 +1,37 @@
+import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
+import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
+import { LoggerService } from '../../../core/logger.service';
+import { SidepanelPreviewComponent } from './sidepanel-preview.component';
+
+describe('SidepanelPreviewComponent', () => {
+  let component: SidepanelPreviewComponent;
+  let fixture: ComponentFixture<SidepanelPreviewComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [SidepanelPreviewComponent],
+      providers: [LoggerService, HttpClient, HttpHandler],
+      imports: [
+        HttpClientModule,
+        HttpClientTestingModule,
+        CoreTestingModule,
+        createBasicStoreModule()
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SidepanelPreviewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.theme.scss b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.theme.scss
similarity index 67%
rename from src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.theme.scss
rename to src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.theme.scss
index 926eb8127e..c84bed25dc 100644
--- a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.theme.scss
@@ -1,12 +1,14 @@
-@mixin app-markdown-preview-theme($theme, $app-theme) {
+@mixin app-sidepanel-preview-theme($theme, $app-theme) {
   $primary: map-get($theme, primary);
 
-  .markdown-preview__header {
+  .sidepanel-preview__header {
     background-color: mat-color($primary);
     color: mat-contrast($primary, 500);
   }
 
-  .markdown-preview__content {
+  .sidepanel-preview__content {
+    background-color: map-get($app-theme, app-background-color);
+
     > h1:first-child {
       height: 0;
       margin: 0;
diff --git a/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.ts b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.ts
new file mode 100644
index 0000000000..315d11c160
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.ts
@@ -0,0 +1,14 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+  selector: 'app-sidepanel-preview',
+  templateUrl: './sidepanel-preview.component.html',
+  styleUrls: ['./sidepanel-preview.component.scss']
+})
+export class SidepanelPreviewComponent {
+
+  @Input()
+  title: string;
+
+  constructor() { }
+}
diff --git a/src/frontend/packages/core/src/shared/previewable-component.ts b/src/frontend/packages/core/src/shared/previewable-component.ts
new file mode 100644
index 0000000000..40410d6f07
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/previewable-component.ts
@@ -0,0 +1,3 @@
+export interface PreviewableComponent {
+  setProps(props: { [key: string]: any }): void;
+}
diff --git a/src/frontend/packages/core/src/shared/services/panel-preview.service.ts b/src/frontend/packages/core/src/shared/services/panel-preview.service.ts
new file mode 100644
index 0000000000..dda1d3e374
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/services/panel-preview.service.ts
@@ -0,0 +1,67 @@
+import { ComponentFactory, ComponentFactoryResolver, ComponentRef, Injectable, ViewContainerRef } from '@angular/core';
+import { asapScheduler, BehaviorSubject, Observable, Subject } from 'rxjs';
+import { observeOn, publishReplay, refCount } from 'rxjs/operators';
+
+@Injectable()
+export class PanelPreviewService {
+  private openedSubject: BehaviorSubject<boolean>;
+  public opened$: Observable<boolean>;
+
+  private container: ViewContainerRef;
+
+  constructor(private componentFactoryResolver: ComponentFactoryResolver) {
+    this.openedSubject = new BehaviorSubject(false);
+    this.opened$ = this.observeSubject(this.openedSubject);
+  }
+
+  public setContainer(container: ViewContainerRef) {
+    if (this.container) {
+      throw new Error('PanelPreviewService: container already set');
+    }
+
+    this.container = container;
+  }
+
+  public show(component: object, props?: { [key: string]: any }) {
+    if (!this.container) {
+      throw new Error('PanelPreviewService: container must be set');
+    }
+
+    this.render(component, props);
+    this.openedSubject.next(true);
+  }
+
+  public hide() {
+    if (!this.container) {
+      throw new Error('PanelPreviewService: container must be set');
+    }
+
+    this.openedSubject.next(false);
+  }
+
+  render(component: object, props: { [key: string]: any }) {
+    if (this.container.length) {
+      this.container.remove(0);
+    }
+
+    const factory: ComponentFactory<any> = this.componentFactoryResolver.resolveComponentFactory(component as any);
+    const componentRef: ComponentRef<any> = this.container.createComponent(factory);
+
+    if (props) {
+      componentRef.instance.setProps(props);
+    }
+  }
+
+  public clear() {
+    this.container.clear();
+    this.openedSubject.next(false);
+  }
+
+  private observeSubject(subject: Subject<any>) {
+    return subject.asObservable().pipe(
+      publishReplay(1),
+      refCount(),
+      observeOn(asapScheduler)
+    );
+  }
+}
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index 12aae65f83..a1d52f874c 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -58,8 +58,12 @@ import { TableCellStatusDirective } from './components/list/list-table/table-cel
 import { TableComponent } from './components/list/list-table/table.component';
 import { listTableComponents } from './components/list/list-table/table.types';
 import { EndpointCardComponent } from './components/list/list-types/endpoint/endpoint-card/endpoint-card.component';
+import { EndpointListHelper } from './components/list/list-types/endpoint/endpoint-list.helpers';
+import { EndpointsListConfigService } from './components/list/list-types/endpoint/endpoints-list-config.service';
 import { ListComponent } from './components/list/list.component';
 import { ListConfig } from './components/list/list.component.types';
+import { ListHostDirective } from './components/list/simple-list/list-host.directive';
+import { SimpleListComponent } from './components/list/simple-list/simple-list.component';
 import { LoadingPageComponent } from './components/loading-page/loading-page.component';
 import { LogViewerComponent } from './components/log-viewer/log-viewer.component';
 import { MarkdownContentObserverDirective } from './components/markdown-preview/markdown-content-observer.directive';
@@ -78,6 +82,7 @@ import { PageSubNavComponent } from './components/page-sub-nav/page-sub-nav.comp
 import { PollingIndicatorComponent } from './components/polling-indicator/polling-indicator.component';
 import { RingChartComponent } from './components/ring-chart/ring-chart.component';
 import { RoutingIndicatorComponent } from './components/routing-indicator/routing-indicator.component';
+import { SidepanelPreviewComponent } from './components/sidepanel-preview/sidepanel-preview.component';
 import { SimpleUsageChartComponent } from './components/simple-usage-chart/simple-usage-chart.component';
 import { SnackBarReturnComponent } from './components/snackbar-return/snackbar-return.component';
 import { SshViewerComponent } from './components/ssh-viewer/ssh-viewer.component';
@@ -111,11 +116,8 @@ import { UsageBytesPipe } from './pipes/usage-bytes.pipe';
 import { ValuesPipe } from './pipes/values.pipe';
 import { CloudFoundryUserProvidedServicesService } from './services/cloud-foundry-user-provided-services.service';
 import { MetricsRangeSelectorService } from './services/metrics-range-selector.service';
+import { PanelPreviewService } from './services/panel-preview.service';
 import { UserPermissionDirective } from './user-permission.directive';
-import { SimpleListComponent } from './components/list/simple-list/simple-list.component';
-import { ListHostDirective } from './components/list/simple-list/list-host.directive';
-import { EndpointListHelper } from './components/list/list-types/endpoint/endpoint-list.helpers';
-import { EndpointsListConfigService } from './components/list/list-types/endpoint/endpoints-list-config.service';
 
 /* tslint:disable:max-line-length */
 
@@ -211,13 +213,13 @@ import { EndpointsListConfigService } from './components/list/list-types/endpoin
     BreadcrumbsComponent,
     PageSubNavSectionComponent,
     EntitySummaryTitleComponent,
-    MarkdownPreviewComponent,
     MarkdownContentObserverDirective,
     SnackBarReturnComponent,
     PollingIndicatorComponent,
     UnlimitedInputComponent,
     SimpleListComponent,
     ListHostDirective,
+    SidepanelPreviewComponent
   ],
   exports: [
     ApplicationStateIconPipe,
@@ -300,24 +302,26 @@ import { EndpointsListConfigService } from './components/list/list-types/endpoin
     AppNameUniqueDirective,
     SimpleUsageChartComponent,
     EntitySummaryTitleComponent,
-    MarkdownPreviewComponent,
     MarkdownContentObserverDirective,
     AppNameUniqueDirective,
     PollingIndicatorComponent,
     UnlimitedInputComponent,
     SimpleListComponent,
-    ListHostDirective
+    ListHostDirective,
+    SidepanelPreviewComponent,
   ],
   entryComponents: [
     DialogConfirmComponent,
     EnvVarViewComponent,
-    SnackBarReturnComponent
+    SnackBarReturnComponent,
+    MarkdownPreviewComponent,
   ],
   providers: [
     ListConfig,
     ApplicationStateService,
     EndpointListHelper,
     EndpointsListConfigService,
+    PanelPreviewService,
     // CfUserService,
     ConfirmationDialogService,
     EntityMonitorFactory,
diff --git a/src/frontend/packages/store/src/actions/dashboard-actions.ts b/src/frontend/packages/store/src/actions/dashboard-actions.ts
index 88c8f8019c..08e6b3fb42 100644
--- a/src/frontend/packages/store/src/actions/dashboard-actions.ts
+++ b/src/frontend/packages/store/src/actions/dashboard-actions.ts
@@ -10,10 +10,6 @@ export const SET_HEADER_EVENT = '[Dashboard] Set header event';
 export const ENABLE_SIDE_NAV_MOBILE_MODE = '[Dashboard] Enable mobile nav';
 export const DISABLE_SIDE_NAV_MOBILE_MODE = '[Dashboard] Disable mobile nav';
 
-export const SHOW_SIDE_HELP = '[Dashboard] Show side help';
-export const CLOSE_SIDE_HELP = '[Dashboard] Close side help';
-
-
 export const TIMEOUT_SESSION = '[Dashboard] Timeout Session';
 export const ENABLE_POLLING = '[Dashboard] Enable Polling';
 
@@ -36,15 +32,6 @@ export class ToggleSideNav implements Action {
   type = TOGGLE_SIDE_NAV;
 }
 
-export class ShowSideHelp implements Action {
-  constructor(public document: string) { }
-  type = SHOW_SIDE_HELP;
-}
-
-export class CloseSideHelp implements Action {
-  type = CLOSE_SIDE_HELP;
-}
-
 export class SetHeaderEvent implements Action {
   constructor(public minimised = false) { }
   type = SET_HEADER_EVENT;
diff --git a/src/frontend/packages/store/src/reducers/dashboard-reducer.ts b/src/frontend/packages/store/src/reducers/dashboard-reducer.ts
index 5963b912b9..788c8307a2 100644
--- a/src/frontend/packages/store/src/reducers/dashboard-reducer.ts
+++ b/src/frontend/packages/store/src/reducers/dashboard-reducer.ts
@@ -1,5 +1,4 @@
 import {
-  CLOSE_SIDE_HELP,
   CLOSE_SIDE_NAV,
   DISABLE_SIDE_NAV_MOBILE_MODE,
   ENABLE_POLLING,
@@ -7,9 +6,10 @@ import {
   HYDRATE_DASHBOARD_STATE,
   HydrateDashboardStateAction,
   OPEN_SIDE_NAV,
+  SET_HEADER_EVENT,
+  SetHeaderEvent,
   SetPollingEnabledAction,
   SetSessionTimeoutAction,
-  SHOW_SIDE_HELP,
   TIMEOUT_SESSION,
   TOGGLE_SIDE_NAV,
 } from '../actions/dashboard-actions';
@@ -21,8 +21,7 @@ export interface DashboardState {
   isMobile: boolean;
   isMobileNavOpen: boolean;
   sideNavPinned: boolean;
-  sideHelpOpen: boolean;
-  sideHelpDocument: string;
+  headerEventMinimized: boolean;
 }
 
 export const defaultDashboardState: DashboardState = {
@@ -32,8 +31,7 @@ export const defaultDashboardState: DashboardState = {
   isMobile: false,
   isMobileNavOpen: false,
   sideNavPinned: true,
-  sideHelpOpen: false,
-  sideHelpDocument: null,
+  headerEventMinimized: false,
 };
 
 export function dashboardReducer(state: DashboardState = defaultDashboardState, action): DashboardState {
@@ -57,10 +55,11 @@ export function dashboardReducer(state: DashboardState = defaultDashboardState,
       return { ...state, isMobile: true, isMobileNavOpen: false };
     case DISABLE_SIDE_NAV_MOBILE_MODE:
       return { ...state, isMobile: false, isMobileNavOpen: false };
-    case SHOW_SIDE_HELP:
-      return { ...state, sideHelpOpen: true, sideHelpDocument: action.document };
-    case CLOSE_SIDE_HELP:
-      return { ...state, sideHelpOpen: false, sideHelpDocument: '' };
+    case SET_HEADER_EVENT:
+      const setHeaderEvent = action as SetHeaderEvent;
+      return {
+        ...state, headerEventMinimized: setHeaderEvent.minimised
+      };
     case TIMEOUT_SESSION:
       const timeoutSessionAction = action as SetSessionTimeoutAction;
       return {

From 8ea2b10370e8c18fd3138dc2579d500373a07e25 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 29 Nov 2019 17:16:07 +0000
Subject: [PATCH 176/648] Fix issue where clicking on org and then app fav
 failed - Issue 1 (slightly unrelated)   - app service getspace action used
 space entity without an org - Issue 2   - app entity validation found it was
 missing the space   - validation process fetched space with custom action   -
 custom action did not contain schema key to use space with org schema   - org
 was not stored correctly in store (contained in space rather than seperatly)
 - Still to do   - Fix for issue 2 would need to be expanded to ALL schema's
 with inline entities   - These new schemas would need to be added to their
 entities   - All usages would have to provide the overriding schemaKey

---
 .../src/actions/relation.actions.ts           |  2 +
 .../actions/user-provided-service.actions.ts  |  6 +--
 .../cloud-foundry/src/cf-entity-factory.ts    | 38 +++++++++----------
 .../src/cf-entity-schema-types.ts             | 10 +++--
 .../applications/application.service.ts       | 29 +++++++-------
 ...aces-user-service-instances-data-source.ts | 12 +++---
 6 files changed, 50 insertions(+), 47 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts
index 985214b8dd..d686404b22 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts
@@ -21,6 +21,7 @@ export abstract class FetchRelationAction extends CFStartAction implements Entit
   ) {
     super();
     this.entityType = child.entityType;
+    this.schemaKey = child.entity.schemaKey;
     this.options = new HttpRequest(
       'GET',
       url.startsWith('/v2/') ? url.substring(4, url.length) : url,
@@ -32,6 +33,7 @@ export abstract class FetchRelationAction extends CFStartAction implements Entit
   }
   entity: RequestActionEntity;
   entityType: string;
+  schemaKey: string;
   isId = relationActionId;
   actions = [
     '[Fetch Relations] Start',
diff --git a/src/frontend/packages/cloud-foundry/src/actions/user-provided-service.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/user-provided-service.actions.ts
index 09713ee768..bdedde7d05 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/user-provided-service.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/user-provided-service.actions.ts
@@ -1,3 +1,5 @@
+import { HttpRequest } from '@angular/common/http';
+
 import { EntityCatalogueEntityConfig } from '../../../core/src/core/entity-catalogue/entity-catalogue.types';
 import { getActions } from '../../../store/src/actions/action.helper';
 import { endpointSchemaKey } from '../../../store/src/helpers/entity-factory';
@@ -10,7 +12,6 @@ import {
   organizationEntityType,
   serviceBindingEntityType,
   spaceEntityType,
-  spaceWithOrgEntityType,
   userProvidedServiceInstanceEntityType,
 } from '../cf-entity-types';
 import {
@@ -19,10 +20,9 @@ import {
   EntityInlineParentAction,
 } from '../entity-relations/entity-relations.types';
 import { CFStartAction } from './cf-action.types';
-import { HttpRequest } from '@angular/common/http';
 
 export const getUserProvidedServiceInstanceRelations = [
-  createEntityRelationKey(userProvidedServiceInstanceEntityType, spaceWithOrgEntityType),
+  createEntityRelationKey(userProvidedServiceInstanceEntityType, spaceEntityType),
   createEntityRelationKey(spaceEntityType, organizationEntityType),
   createEntityRelationKey(userProvidedServiceInstanceEntityType, serviceBindingEntityType),
   createEntityRelationKey(serviceBindingEntityType, applicationEntityType)
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 5ed43bd63c..1da855c14e 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-factory.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-factory.ts
@@ -244,7 +244,7 @@ const SpaceWithOrgsEntitySchema = new CFSpaceEntitySchema({
     apps: [ApplicationWithoutSpaceEntitySchema],
     organization: OrganizationsWithoutSpaces,
   }
-}, spaceWithOrgEntityType);
+}, null, spaceWithOrgEntityType);
 entityCache[spaceWithOrgEntityType] = SpaceWithOrgsEntitySchema;
 
 
@@ -286,7 +286,7 @@ const ApplicationEntitySchema = new CFApplicationEntitySchema(
           service_instances: [ServiceInstancesWithNoBindingsSchema],
           organization: OrganizationsWithoutSpaces,
         }
-      }),
+      }, null, spaceWithOrgEntityType),
       routes: [RouteNoAppsSchema],
       service_bindings: [ServiceBindingsSchema]
     }
@@ -328,24 +328,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;
 
 
diff --git a/src/frontend/packages/cloud-foundry/src/cf-entity-schema-types.ts b/src/frontend/packages/cloud-foundry/src/cf-entity-schema-types.ts
index 5e5ccbe303..ec7741c151 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-schema-types.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-schema-types.ts
@@ -33,9 +33,10 @@ export class CFEntitySchema extends EntitySchema {
     definition?: Schema,
     options?: schema.EntityOptions,
     relationKey?: string,
-    excludeFromRecursiveDelete?: string[]
+    excludeFromRecursiveDelete?: string[],
+    schemaKey?: string
   ) {
-    super(entityKey, CF_ENDPOINT_TYPE, definition, options, relationKey, null, excludeFromRecursiveDelete);
+    super(entityKey, CF_ENDPOINT_TYPE, definition, options, relationKey, schemaKey, excludeFromRecursiveDelete);
   }
 }
 
@@ -124,7 +125,8 @@ export class CFApplicationEntitySchema extends CFEntitySchema {
 export class CFSpaceEntitySchema extends CFEntitySchema {
   constructor(
     definition?: Schema,
-    relationKey?: string
+    relationKey?: string,
+    schemaKey?: string
   ) {
     super(spaceEntityType, definition, { idAttribute: getAPIResourceGuid }, relationKey, [
       domainEntityType,
@@ -133,6 +135,6 @@ export class CFSpaceEntitySchema extends CFEntitySchema {
       servicePlanEntityType,
       // App Related
       stackEntityType
-    ]);
+    ], schemaKey);
   }
 }
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 ab5e375edd..c854e5f873 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
@@ -22,9 +22,9 @@ import {
   routeEntityType,
   serviceBindingEntityType,
   spaceEntityType,
+  spaceWithOrgEntityType,
   stackEntityType,
 } from '../../../../cloud-foundry/src/cf-entity-types';
-import { selectCfEntity } from '../../../../cloud-foundry/src/store/selectors/api.selectors';
 import { IApp, IAppSummary, IDomain, IOrganization, ISpace } from '../../../../core/src/core/cf-api.types';
 import { entityCatalogue } from '../../../../core/src/core/entity-catalogue/entity-catalogue.service';
 import { EntityService } from '../../../../core/src/core/entity-service';
@@ -47,6 +47,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 { cfEntityFactory } from '../../cf-entity-factory';
 import { createEntityRelationKey } from '../../entity-relations/entity-relations.types';
 import { AppStat } from '../../store/types/app-metadata.types';
 import {
@@ -59,13 +60,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),
+  ]
   );
 }
 
@@ -186,6 +187,8 @@ export class ApplicationService {
           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
@@ -198,13 +201,9 @@ export class ApplicationService {
     );
     this.appOrg$ = moreWaiting$.pipe(
       first(),
-      switchMap(app => this.appSpace$.pipe(
-        map(space => space.entity.organization_guid),
-        switchMap(orgGuid => {
-          return this.store.select(selectCfEntity(organizationEntityType, orgGuid));
-        }),
-        filter(org => !!org)
-      ))
+      switchMap(() => this.appSpace$),
+      map(space => space.entity.organization),
+      filter(org => !!org)
     );
 
     this.isDeletingApp$ = this.appEntityService.isDeletingEntity$.pipe(publishReplay(1), refCount());
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 4c88d174d8..6769675f44 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,19 +1,18 @@
 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,
   organizationEntityType,
   serviceBindingEntityType,
   spaceEntityType,
-  spaceWithOrgEntityType,
   userProvidedServiceInstanceEntityType,
 } from '../../../../../../../cloud-foundry/src/cf-entity-types';
 import {
   createEntityRelationKey,
   createEntityRelationPaginationKey,
 } from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
+import { entityCatalogue } from '../../../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
 import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
@@ -22,11 +21,12 @@ 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 { cfEntityFactory } from '../../../../../cf-entity-factory';
+import {
+  UserProvidedServiceActionBuilder,
+} from '../../../../../entity-action-builders/user-provided-service.action-builders';
 import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
-import { entityCatalogue } from '../../../../../../../core/src/core/entity-catalogue/entity-catalogue.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>) {
@@ -38,7 +38,7 @@ export class CfSpacesUserServiceInstancesDataSource extends ListDataSource<APIRe
     const actionBuilder = userProvidedServiceEntity.actionOrchestrator.getActionBuilder('getAllInSpace');
     const action = actionBuilder(cfGuid, spaceGuid, paginationKey,
       [
-        createEntityRelationKey(userProvidedServiceInstanceEntityType, spaceWithOrgEntityType),
+        createEntityRelationKey(userProvidedServiceInstanceEntityType, spaceEntityType),
         createEntityRelationKey(spaceEntityType, organizationEntityType),
         createEntityRelationKey(userProvidedServiceInstanceEntityType, serviceBindingEntityType),
         createEntityRelationKey(serviceBindingEntityType, applicationEntityType)

From 0cb40f7e1d82a5d559b84fe37edf4fdab12751d9 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 29 Nov 2019 18:04:12 +0000
Subject: [PATCH 177/648] Revert "Fix issue where clicking on org and then app
 fav failed"

This reverts commit 0a16203284cc0b42d172972047f5d08cddfecc99.
---
 .../src/actions/relation.actions.ts           |  2 -
 .../actions/user-provided-service.actions.ts  |  6 +--
 .../cloud-foundry/src/cf-entity-factory.ts    | 38 +++++++++----------
 .../src/cf-entity-schema-types.ts             | 10 ++---
 .../applications/application.service.ts       | 29 +++++++-------
 ...aces-user-service-instances-data-source.ts | 12 +++---
 6 files changed, 47 insertions(+), 50 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts
index d686404b22..985214b8dd 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts
@@ -21,7 +21,6 @@ export abstract class FetchRelationAction extends CFStartAction implements Entit
   ) {
     super();
     this.entityType = child.entityType;
-    this.schemaKey = child.entity.schemaKey;
     this.options = new HttpRequest(
       'GET',
       url.startsWith('/v2/') ? url.substring(4, url.length) : url,
@@ -33,7 +32,6 @@ export abstract class FetchRelationAction extends CFStartAction implements Entit
   }
   entity: RequestActionEntity;
   entityType: string;
-  schemaKey: string;
   isId = relationActionId;
   actions = [
     '[Fetch Relations] Start',
diff --git a/src/frontend/packages/cloud-foundry/src/actions/user-provided-service.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/user-provided-service.actions.ts
index bdedde7d05..09713ee768 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/user-provided-service.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/user-provided-service.actions.ts
@@ -1,5 +1,3 @@
-import { HttpRequest } from '@angular/common/http';
-
 import { EntityCatalogueEntityConfig } from '../../../core/src/core/entity-catalogue/entity-catalogue.types';
 import { getActions } from '../../../store/src/actions/action.helper';
 import { endpointSchemaKey } from '../../../store/src/helpers/entity-factory';
@@ -12,6 +10,7 @@ import {
   organizationEntityType,
   serviceBindingEntityType,
   spaceEntityType,
+  spaceWithOrgEntityType,
   userProvidedServiceInstanceEntityType,
 } from '../cf-entity-types';
 import {
@@ -20,9 +19,10 @@ import {
   EntityInlineParentAction,
 } from '../entity-relations/entity-relations.types';
 import { CFStartAction } from './cf-action.types';
+import { HttpRequest } from '@angular/common/http';
 
 export const getUserProvidedServiceInstanceRelations = [
-  createEntityRelationKey(userProvidedServiceInstanceEntityType, spaceEntityType),
+  createEntityRelationKey(userProvidedServiceInstanceEntityType, spaceWithOrgEntityType),
   createEntityRelationKey(spaceEntityType, organizationEntityType),
   createEntityRelationKey(userProvidedServiceInstanceEntityType, serviceBindingEntityType),
   createEntityRelationKey(serviceBindingEntityType, applicationEntityType)
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 1da855c14e..5ed43bd63c 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-factory.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-factory.ts
@@ -244,7 +244,7 @@ const SpaceWithOrgsEntitySchema = new CFSpaceEntitySchema({
     apps: [ApplicationWithoutSpaceEntitySchema],
     organization: OrganizationsWithoutSpaces,
   }
-}, null, spaceWithOrgEntityType);
+}, spaceWithOrgEntityType);
 entityCache[spaceWithOrgEntityType] = SpaceWithOrgsEntitySchema;
 
 
@@ -286,7 +286,7 @@ const ApplicationEntitySchema = new CFApplicationEntitySchema(
           service_instances: [ServiceInstancesWithNoBindingsSchema],
           organization: OrganizationsWithoutSpaces,
         }
-      }, null, spaceWithOrgEntityType),
+      }),
       routes: [RouteNoAppsSchema],
       service_bindings: [ServiceBindingsSchema]
     }
@@ -328,24 +328,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;
 
 
diff --git a/src/frontend/packages/cloud-foundry/src/cf-entity-schema-types.ts b/src/frontend/packages/cloud-foundry/src/cf-entity-schema-types.ts
index ec7741c151..5e5ccbe303 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-schema-types.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-schema-types.ts
@@ -33,10 +33,9 @@ export class CFEntitySchema extends EntitySchema {
     definition?: Schema,
     options?: schema.EntityOptions,
     relationKey?: string,
-    excludeFromRecursiveDelete?: string[],
-    schemaKey?: string
+    excludeFromRecursiveDelete?: string[]
   ) {
-    super(entityKey, CF_ENDPOINT_TYPE, definition, options, relationKey, schemaKey, excludeFromRecursiveDelete);
+    super(entityKey, CF_ENDPOINT_TYPE, definition, options, relationKey, null, excludeFromRecursiveDelete);
   }
 }
 
@@ -125,8 +124,7 @@ export class CFApplicationEntitySchema extends CFEntitySchema {
 export class CFSpaceEntitySchema extends CFEntitySchema {
   constructor(
     definition?: Schema,
-    relationKey?: string,
-    schemaKey?: string
+    relationKey?: string
   ) {
     super(spaceEntityType, definition, { idAttribute: getAPIResourceGuid }, relationKey, [
       domainEntityType,
@@ -135,6 +133,6 @@ export class CFSpaceEntitySchema extends CFEntitySchema {
       servicePlanEntityType,
       // App Related
       stackEntityType
-    ], schemaKey);
+    ]);
   }
 }
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 c854e5f873..ab5e375edd 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
@@ -22,9 +22,9 @@ import {
   routeEntityType,
   serviceBindingEntityType,
   spaceEntityType,
-  spaceWithOrgEntityType,
   stackEntityType,
 } from '../../../../cloud-foundry/src/cf-entity-types';
+import { selectCfEntity } from '../../../../cloud-foundry/src/store/selectors/api.selectors';
 import { IApp, IAppSummary, IDomain, IOrganization, ISpace } from '../../../../core/src/core/cf-api.types';
 import { entityCatalogue } from '../../../../core/src/core/entity-catalogue/entity-catalogue.service';
 import { EntityService } from '../../../../core/src/core/entity-service';
@@ -47,7 +47,6 @@ 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 { createEntityRelationKey } from '../../entity-relations/entity-relations.types';
 import { AppStat } from '../../store/types/app-metadata.types';
 import {
@@ -60,13 +59,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),
+    ]
   );
 }
 
@@ -187,8 +186,6 @@ export class ApplicationService {
           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
@@ -201,9 +198,13 @@ export class ApplicationService {
     );
     this.appOrg$ = moreWaiting$.pipe(
       first(),
-      switchMap(() => this.appSpace$),
-      map(space => space.entity.organization),
-      filter(org => !!org)
+      switchMap(app => this.appSpace$.pipe(
+        map(space => space.entity.organization_guid),
+        switchMap(orgGuid => {
+          return this.store.select(selectCfEntity(organizationEntityType, orgGuid));
+        }),
+        filter(org => !!org)
+      ))
     );
 
     this.isDeletingApp$ = this.appEntityService.isDeletingEntity$.pipe(publishReplay(1), refCount());
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 6769675f44..4c88d174d8 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,18 +1,19 @@
 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,
   organizationEntityType,
   serviceBindingEntityType,
   spaceEntityType,
+  spaceWithOrgEntityType,
   userProvidedServiceInstanceEntityType,
 } from '../../../../../../../cloud-foundry/src/cf-entity-types';
 import {
   createEntityRelationKey,
   createEntityRelationPaginationKey,
 } from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { entityCatalogue } from '../../../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
 import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
@@ -21,12 +22,11 @@ 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 { cfEntityFactory } from '../../../../../cf-entity-factory';
-import {
-  UserProvidedServiceActionBuilder,
-} from '../../../../../entity-action-builders/user-provided-service.action-builders';
 import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
+import { entityCatalogue } from '../../../../../../../core/src/core/entity-catalogue/entity-catalogue.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>) {
@@ -38,7 +38,7 @@ export class CfSpacesUserServiceInstancesDataSource extends ListDataSource<APIRe
     const actionBuilder = userProvidedServiceEntity.actionOrchestrator.getActionBuilder('getAllInSpace');
     const action = actionBuilder(cfGuid, spaceGuid, paginationKey,
       [
-        createEntityRelationKey(userProvidedServiceInstanceEntityType, spaceEntityType),
+        createEntityRelationKey(userProvidedServiceInstanceEntityType, spaceWithOrgEntityType),
         createEntityRelationKey(spaceEntityType, organizationEntityType),
         createEntityRelationKey(userProvidedServiceInstanceEntityType, serviceBindingEntityType),
         createEntityRelationKey(serviceBindingEntityType, applicationEntityType)

From 75df31a3aafaf0b32fca259a64fda99175c64ad5 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 29 Nov 2019 18:16:15 +0000
Subject: [PATCH 178/648] Fix issue where clicking on org and then app fav
 failed     - Issue 1 (slightly unrelated)       - app service getspace action
 used space schema without an org     - Issue 2       - app entity validation
 found it was missing the space       - validation process fetched space with
 custom action       - custom action did not contain schema key linked to
 space schema with org       - this lead to org being not stored correctly in
 store (contained in space rather than seperatly)       - Simple fix (see
 0a16203284c for harder)          - When normalizing prioritise the action's
 schema over attempting            to fetch via entity catalogue + schemaKey  
          (avoids A LOT of plumbing)

---
 .../entity-relations/entity-relation-tree.ts  |  4 +-
 .../applications/application.service.ts       | 29 +++++----
 .../entity-catalogue-entity.ts                | 13 +---
 .../map-multi-endpoint.pipes.ts               | 62 +++++++++++--------
 .../normalize-entity-request-response.pipe.ts | 14 -----
 5 files changed, 55 insertions(+), 67 deletions(-)
 delete mode 100644 src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/normalize-entity-request-response.pipe.ts

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 a60a65894e..d758718c6c 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,5 +1,5 @@
-import { EntitySchema } from '../../../store/src/helpers/entity-schema';
 import { entityCatalogue } from '../../../core/src/core/entity-catalogue/entity-catalogue.service';
+import { EntitySchema } from '../../../store/src/helpers/entity-schema';
 
 /**
  * A structure which represents the tree like layout of entity dependencies. For example organization --> space --> routes
@@ -18,7 +18,7 @@ export class EntityTreeRelation {
 
   /**
    * Creates an instance of EntityTreeRelation.
-   * @param [isArray=false] is this a collection of entities (should be paginationed) or not
+   * @param [isArray=false] is this a collection of entities (should be paginated) or not
    * @param paramName parameter name of the entity within the schema. For example `space` may be `spaces` (entity.spaces)
    * @param [path=''] location of the entity within the parent. For example `space` entity maybe be `entity.spaces`
    */
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 ab5e375edd..c854e5f873 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
@@ -22,9 +22,9 @@ import {
   routeEntityType,
   serviceBindingEntityType,
   spaceEntityType,
+  spaceWithOrgEntityType,
   stackEntityType,
 } from '../../../../cloud-foundry/src/cf-entity-types';
-import { selectCfEntity } from '../../../../cloud-foundry/src/store/selectors/api.selectors';
 import { IApp, IAppSummary, IDomain, IOrganization, ISpace } from '../../../../core/src/core/cf-api.types';
 import { entityCatalogue } from '../../../../core/src/core/entity-catalogue/entity-catalogue.service';
 import { EntityService } from '../../../../core/src/core/entity-service';
@@ -47,6 +47,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 { cfEntityFactory } from '../../cf-entity-factory';
 import { createEntityRelationKey } from '../../entity-relations/entity-relations.types';
 import { AppStat } from '../../store/types/app-metadata.types';
 import {
@@ -59,13 +60,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),
+  ]
   );
 }
 
@@ -186,6 +187,8 @@ export class ApplicationService {
           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
@@ -198,13 +201,9 @@ export class ApplicationService {
     );
     this.appOrg$ = moreWaiting$.pipe(
       first(),
-      switchMap(app => this.appSpace$.pipe(
-        map(space => space.entity.organization_guid),
-        switchMap(orgGuid => {
-          return this.store.select(selectCfEntity(organizationEntityType, orgGuid));
-        }),
-        filter(org => !!org)
-      ))
+      switchMap(() => this.appSpace$),
+      map(space => space.entity.organization),
+      filter(org => !!org)
     );
 
     this.isDeletingApp$ = this.appEntityService.isDeletingEntity$.pipe(publishReplay(1), refCount());
diff --git a/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue-entity.ts b/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue-entity.ts
index 11de55d636..64fa92b6c6 100644
--- a/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue-entity.ts
+++ b/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue-entity.ts
@@ -1,10 +1,8 @@
 import { ActionReducer, Store } from '@ngrx/store';
-import { normalize } from 'normalizr';
 
 import { AppState, IRequestEntityTypeState } from '../../../../store/src/app-state';
 import { EntityPipelineEntity, stratosEndpointGuidKey } from '../../../../store/src/entity-request-pipeline/pipeline.types';
 import { EntitySchema } from '../../../../store/src/helpers/entity-schema';
-import { NormalizedResponse } from '../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
 import { APISuccessOrFailedAction, EntityRequestAction } from '../../../../store/src/types/request.types';
 import { IEndpointFavMetadata } from '../../../../store/src/types/user-favorites.types';
@@ -89,8 +87,8 @@ export class StratosBaseCatalogueEntity<
       }
       return newSchema;
     }, {
-        default: entitySchemas.default
-      });
+      default: entitySchemas.default
+    });
   }
 
   private getEndpointType(definition: IStratosBaseEntityDefinition) {
@@ -217,13 +215,6 @@ export class StratosBaseCatalogueEntity<
 
   }
 
-  public getNormalizedEntityData(entities: Y | Y[], schemaKey?: string): NormalizedResponse<Y> {
-    const schema = this.getSchema(schemaKey);
-    if (Array.isArray(entities)) {
-      return normalize(entities, [schema]);
-    }
-    return normalize(entities, schema);
-  }
 }
 
 export class StratosCatalogueEntity<
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 00a2a1f541..d08d04483d 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,4 +1,5 @@
 import { Action } from '@ngrx/store';
+import { normalize } from 'normalizr';
 
 import { StratosBaseCatalogueEntity } from '../../../../core/src/core/entity-catalogue/entity-catalogue-entity';
 import { entityCatalogue } from '../../../../core/src/core/entity-catalogue/entity-catalogue.service';
@@ -10,9 +11,8 @@ import { PipelineResult } from '../entity-request-pipeline.types';
 import { getSuccessMapper } from '../pipeline-helpers';
 import { endpointErrorsHandlerFactory } from './endpoint-errors.handler';
 import { patchActionWithForcedConfig } from './forced-action-type.helpers';
-import { HandledMultiEndpointResponse, JetstreamError } from './handle-multi-endpoints.pipe';
+import { HandledMultiEndpointResponse, JetstreamError, MultiEndpointResponse } from './handle-multi-endpoints.pipe';
 import { multiEndpointResponseMergePipe } from './merge-multi-endpoint-data.pipe';
-import { normalizeEntityPipeFactory } from './normalize-entity-request-response.pipe';
 
 const baseErrorHandler = () => 'Api Request Failed';
 
@@ -56,6 +56,19 @@ function getEntities(
     }, {});
 }
 
+// TODO: Type the output of this pipe. #3976
+function getNormalizedEntityData(
+  entities: any[],
+  action: EntityRequestAction,
+  catalogueEntity: StratosBaseCatalogueEntity) {
+  // Can patchActionWithForcedConfig be done outside of the pipe?
+  // This pipe shouldn't have to worry about the multi entity lists.
+  const patchedAction = patchActionWithForcedConfig(action);
+  const schema = patchedAction.entity || catalogueEntity.getSchema(patchedAction.schemaKey);
+  const arraySafeSchema = Array.isArray(schema) ? schema[0] : schema;
+  return normalize(entities, Array.isArray(entities) ? [arraySafeSchema] : arraySafeSchema);
+}
+
 export function mapMultiEndpointResponses(
   action: EntityRequestAction,
   catalogueEntity: StratosBaseCatalogueEntity,
@@ -63,12 +76,6 @@ export function mapMultiEndpointResponses(
   multiEndpointResponses: HandledMultiEndpointResponse,
   actionDispatcher: (actionToDispatch: Action) => void
 ): PipelineResult {
-  const normalizeEntityPipe = normalizeEntityPipeFactory(
-    catalogueEntity,
-    // Can this be done outside of the pipe?
-    // This pipe shouldn't have to worry about the multi entity lists.
-    patchActionWithForcedConfig(action).schemaKey
-  );
   const endpointErrorHandler = endpointErrorsHandlerFactory(actionDispatcher);
   endpointErrorHandler(
     action,
@@ -84,23 +91,28 @@ export function mapMultiEndpointResponses(
       errorMessage
     };
   } else {
-    const responses = multiEndpointResponses.successes.map(normalizeEntityPipe);
-    const mapped = responses.map(endpointResponse => {
-      const entities = getEntities(endpointResponse, action);
-      const parentEntities = entities[catalogueEntity.entityKey];
-      return {
-        response: {
-          entities,
-          // If we changed the guid of the entities then make sure this is reflected in the result array.
-          result: parentEntities ? Object.keys(parentEntities) : endpointResponse.normalizedEntities.result,
-        },
-        totalPages: endpointResponse.totalPages,
-        totalResults: endpointResponse.totalResults,
-        success: null
-      };
-    });
-    // NormalizedResponse
-    const response = multiEndpointResponseMergePipe(mapped);
+    const responses = multiEndpointResponses.successes
+      .map((responseData: MultiEndpointResponse<any>) => ({
+        normalizedEntities: getNormalizedEntityData(responseData.entities, action, catalogueEntity),
+        endpointGuid: responseData.endpointGuid,
+        totalResults: responseData.totalResults,
+        totalPages: responseData.totalPages
+      }))
+      .map(endpointResponse => {
+        const entities = getEntities(endpointResponse, action);
+        const parentEntities = entities[catalogueEntity.entityKey];
+        return {
+          response: {
+            entities,
+            // If we changed the guid of the entities then make sure this is reflected in the result array.
+            result: parentEntities ? Object.keys(parentEntities) : endpointResponse.normalizedEntities.result,
+          },
+          totalPages: endpointResponse.totalPages,
+          totalResults: endpointResponse.totalResults,
+          success: null
+        };
+      });
+    const response = multiEndpointResponseMergePipe(responses);
     return {
       ...response,
       success: true,
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/normalize-entity-request-response.pipe.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/normalize-entity-request-response.pipe.ts
deleted file mode 100644
index ee538455b8..0000000000
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/normalize-entity-request-response.pipe.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { StratosBaseCatalogueEntity } from '../../../../core/src/core/entity-catalogue/entity-catalogue-entity';
-import { MultiEndpointResponse } from './handle-multi-endpoints.pipe';
-
-// TODO: Type the output of this pipe. #3976
-export const normalizeEntityPipeFactory = (catalogueEntity: StratosBaseCatalogueEntity, schemaKey?: string) => {
-  return (responseData: MultiEndpointResponse<any>) => {
-    return {
-      normalizedEntities: catalogueEntity.getNormalizedEntityData(responseData.entities, schemaKey),
-      endpointGuid: responseData.endpointGuid,
-      totalResults: responseData.totalResults,
-      totalPages: responseData.totalPages
-    };
-  };
-};

From 4b4c6b5c3023b29a34f1258c19b53b810a9fa6f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Avelino?= <vavelino@suse.com>
Date: Mon, 2 Dec 2019 14:18:03 -0300
Subject: [PATCH 179/648] sidepanel preview: cleanup and minor improvements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Vítor Avelino <vavelino@suse.com>
---
 .../services/cloud-foundry-space.service.ts   |   4 +
 ...cloud-foundry-space-summary.component.html |   2 +-
 .../application-preview.component.html        | 126 +++++++++---------
 .../application-preview.component.ts          |  27 ++--
 .../organization-preview.component.html       |   2 +-
 .../packages/core/src/base-entity-schemas.ts  |   3 +-
 .../entity-catalogue-entity.ts                |   2 +-
 .../entity-catalogue.types.ts                 |   1 +
 .../dashboard-base.component.scss             |   5 +
 .../connect-endpoint-dialog.component.ts      |   6 +-
 .../create-endpoint-connect.component.ts      |   8 +-
 .../favorites-meta-card.component.ts          |   4 +-
 .../markdown-preview.component.ts             |   1 -
 .../shared/services/panel-preview.service.ts  |  17 ++-
 14 files changed, 121 insertions(+), 87 deletions(-)

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 371b9874d9..a3a230d5c7 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
@@ -103,6 +103,10 @@ export class CloudFoundrySpaceService {
     this.usersCount$ = this.cfUserService.fetchTotalUsers(this.cfGuid, this.orgGuid, this.spaceGuid);
   }
 
+  public fetchApps() {
+    this.cfEndpointService.fetchApps();
+  }
+
   private initialiseSpaceObservables() {
     this.space$ = this.cfUserService.isConnectedUserAdmin(this.cfGuid).pipe(
       switchMap(isAdmin => {
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.html 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.html
index 1f03e7bdb5..3ec288a9fa 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.html
+++ 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.html
@@ -75,7 +75,7 @@
       <app-tile-group>
         <app-tile>
           <app-card-cf-recent-apps *ngIf="!(detailsLoading$ | async)" [allApps$]="cfSpaceService.apps$"
-            [loading$]="cfSpaceService.loadingApps$" (refresh)="cfEndpointService.fetchApps()"></app-card-cf-recent-apps>
+            [loading$]="cfSpaceService.loadingApps$" (refresh)="cfSpaceService.fetchApps()"></app-card-cf-recent-apps>
         </app-tile>
       </app-tile-group>
     </app-loading-page>
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.html
index 9900b6a612..f47a8f18fe 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.html
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.html
@@ -1,68 +1,70 @@
 <app-sidepanel-preview [title]="title">
   <app-tile-grid fit="true" *ngIf="applicationService.application$ | async as appSvc">
-    <app-tile-group>
-      <app-tile>
-        <div class="cf-space-usage">
-          <mat-card>
-            <mat-card-header>
-              <mat-card-title>Summary</mat-card-title>
-            </mat-card-header>
-            <mat-card-content>
-              <app-tile-group *ngIf="applicationService.appOrg$ | async as appOrg">
-                <app-tile>
-                  <app-metadata-item label="Cloud Foundry">
-                    <a [routerLink]="['/cloud-foundry/' + appSvc.cf?.guid]"
-                      matTooltip="CF API URL: {{ getFullEndpointApiUrl(appSvc.cf) }}">{{ appSvc.cf?.name}}</a>
-                  </app-metadata-item>
-                  <app-metadata-item label="Cloud Foundry">
-                    <a [routerLink]="['/cloud-foundry/' + appSvc.cf?.guid]"
-                      matTooltip="CF API URL: {{ getFullEndpointApiUrl(appSvc.cf) }}">{{ appSvc.cf?.name}}</a>
-                  </app-metadata-item>
-                </app-tile>
-                <app-tile class="app-metadata__two-cols">
-                  <app-metadata-item label="SSH Access">
-                    {{ sshStatus$ | async }}
-                  </app-metadata-item>
-                  <app-metadata-item label="Organization">
-                    <a
-                      [routerLink]="['/cloud-foundry/' + appSvc.cf?.guid + '/organizations/' + appOrg.metadata.guid]">{{ appOrg.entity.name }}</a>
-                  </app-metadata-item>
-                </app-tile>
-                <app-tile class="app-metadata__two-cols">
-                  <app-metadata-item label="CLI Info" class="cli-link">
-                    <a [routerLink]="['/applications/' + appSvc.cf?.guid + '/' + appSvc.app?.metadata.guid + '/cli']">View</a>
-                  </app-metadata-item>
-                  <app-metadata-item *ngIf="applicationService.appSpace$ | async as appSpace" label="Space">
-                    <a
-                      [routerLink]="['/cloud-foundry/' + appSvc.cf?.guid + '/organizations/' + appOrg.metadata?.guid + '/spaces/' + appSpace.metadata?.guid]">{{ appSpace.entity.name }}</a>
-                  </app-metadata-item>
-                </app-tile>
-              </app-tile-group>
-            </mat-card-content>
-          </mat-card>
-        </div>
-      </app-tile>
-    </app-tile-group>
+    <app-loading-page [isLoading]="detailsLoading$" text="Retrieving details">
+      <app-tile-group>
+        <app-tile>
+          <div class="cf-space-usage">
+            <mat-card>
+              <mat-card-header>
+                <mat-card-title>Summary</mat-card-title>
+              </mat-card-header>
+              <mat-card-content>
+                <app-tile-group *ngIf="applicationService.appOrg$ | async as appOrg">
+                  <app-tile>
+                    <app-metadata-item label="Cloud Foundry">
+                      <a [routerLink]="['/cloud-foundry/' + appSvc.cf?.guid]"
+                        matTooltip="CF API URL: {{ getFullEndpointApiUrl(appSvc.cf) }}">{{ appSvc.cf?.name}}</a>
+                    </app-metadata-item>
+                    <app-metadata-item label="Cloud Foundry">
+                      <a [routerLink]="['/cloud-foundry/' + appSvc.cf?.guid]"
+                        matTooltip="CF API URL: {{ getFullEndpointApiUrl(appSvc.cf) }}">{{ appSvc.cf?.name}}</a>
+                    </app-metadata-item>
+                  </app-tile>
+                  <app-tile class="app-metadata__two-cols">
+                    <app-metadata-item label="SSH Access">
+                      {{ sshStatus$ | async }}
+                    </app-metadata-item>
+                    <app-metadata-item label="Organization">
+                      <a
+                        [routerLink]="['/cloud-foundry/' + appSvc.cf?.guid + '/organizations/' + appOrg.metadata.guid]">{{ appOrg.entity.name }}</a>
+                    </app-metadata-item>
+                  </app-tile>
+                  <app-tile class="app-metadata__two-cols">
+                    <app-metadata-item label="CLI Info" class="cli-link">
+                      <a [routerLink]="['/applications/' + appSvc.cf?.guid + '/' + appSvc.app?.metadata.guid + '/cli']">View</a>
+                    </app-metadata-item>
+                    <app-metadata-item *ngIf="applicationService.appSpace$ | async as appSpace" label="Space">
+                      <a
+                        [routerLink]="['/cloud-foundry/' + appSvc.cf?.guid + '/organizations/' + appOrg.metadata?.guid + '/spaces/' + appSpace.metadata?.guid]">{{ appSpace.entity.name }}</a>
+                    </app-metadata-item>
+                  </app-tile>
+                </app-tile-group>
+              </mat-card-content>
+            </mat-card>
+          </div>
+        </app-tile>
+      </app-tile-group>
 
-    <app-tile-group>
-      <app-tile>
-        <app-card-number-metric icon="memory" label="Memory Usage" value="{{ appSvc.app.entity.memory | mbToHumanSize }}"></app-card-number-metric>
-      </app-tile>
-      <app-tile>
-        <app-card-number-metric icon="storage" label="Disk Quota" value="{{ appSvc.app.entity.disk_quota | mbToHumanSize }}"></app-card-number-metric>
-      </app-tile>
-    </app-tile-group>
+      <app-tile-group>
+        <app-tile>
+          <app-card-number-metric icon="memory" label="Memory Usage" value="{{ appSvc.app.entity.memory | mbToHumanSize }}"></app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric icon="storage" label="Disk Quota" value="{{ appSvc.app.entity.disk_quota | mbToHumanSize }}"></app-card-number-metric>
+        </app-tile>
+      </app-tile-group>
 
-    <app-tile-group>
-      <app-tile>
-        <app-card-number-metric iconFont="stratos-icons" icon="service" label="Service Instances"
-          value="{{ (applicationService.appSummary$ | async)?.entity?.services?.length || '0' }}"></app-card-number-metric>
-      </app-tile>
-      <app-tile>
-        <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Routes"
-          value="{{ (applicationService.appSummary$ | async)?.entity?.routes?.length || '0' }}"></app-card-number-metric>
-      </app-tile>
-    </app-tile-group>
-    <app-tile-group></app-tile-group>
+      <app-tile-group>
+        <app-tile>
+          <app-card-number-metric iconFont="stratos-icons" icon="service" label="Service Instances"
+            value="{{ (applicationService.appSummary$ | async)?.entity?.services?.length || '0' }}"></app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Routes"
+            value="{{ (applicationService.appSummary$ | async)?.entity?.routes?.length || '0' }}"></app-card-number-metric>
+        </app-tile>
+      </app-tile-group>
+      <app-tile-group></app-tile-group>
+    </app-loading-page>
   </app-tile-grid>
 </app-sidepanel-preview>
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.ts
index 5aa2772e67..649e38af6f 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.ts
@@ -1,30 +1,27 @@
 import { Component } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
-import { combineLatest, map } from 'rxjs/operators';
+import { combineLatest, distinct, map } from 'rxjs/operators';
 
+import { IAppSummary } from '../../../../../core/src/core/cf-api.types';
 import { getFullEndpointApiUrl } from '../../../../../core/src/features/endpoints/endpoint-helpers';
 import { APP_GUID, CF_GUID } from '../../../../../core/src/shared/entity.tokens';
 import { PreviewableComponent } from '../../../../../core/src/shared/previewable-component';
-import { ApplicationService } from '../../../features/applications/application.service';
-import { getGuids } from '../../../features/applications/application/application-base.component';
+import { EntityInfo } from '../../../../../store/src/types/api.types';
+import { ApplicationData, ApplicationService } from '../../../features/applications/application.service';
 
 @Component({
   selector: 'app-application-preview-component',
   templateUrl: './application-preview.component.html',
   styleUrls: ['./application-preview.component.scss'],
-  // useless, necessary to reuse ApplicationService
   providers: [
     ApplicationService,
     {
       provide: CF_GUID,
-      useFactory: getGuids('cf'),
-      deps: [ActivatedRoute]
+      useValue: '',
     },
     {
       provide: APP_GUID,
-      useFactory: getGuids(),
-      deps: [ActivatedRoute]
+      useValue: '',
     },
   ]
 })
@@ -33,6 +30,7 @@ export class ApplicationPreviewComponent implements PreviewableComponent {
   title = null;
   cfEndpointService: object;
   sshStatus$: Observable<string>;
+  detailsLoading$: Observable<boolean>;
 
   getFullEndpointApiUrl = getFullEndpointApiUrl;
 
@@ -54,8 +52,15 @@ export class ApplicationPreviewComponent implements PreviewableComponent {
       })
     );
 
-    // this.detailsLoading$ = combineLatest([
-    //   // Wait for the apps to have been fetched, this will determine if multiple small cards are shown or now
+    this.detailsLoading$ = this.applicationService.application$.pipe(
+      combineLatest(
+        this.applicationService.appSummary$
+      ),
+      map(([app, appSummary]: [ApplicationData, EntityInfo<IAppSummary>]) => {
+        return app.fetching || appSummary.entityRequestInfo.fetching;
+      }), distinct());
+
+      //   // Wait for the apps to have been fetched, this will determine if multiple small cards are shown or now
     //   this.cfEndpointService.appsPagObs.fetchingEntities$.pipe(
     //     filter(loading => !loading)
     //   ),
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.html
index 94359a1d9b..6387b13274 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.html
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.html
@@ -94,7 +94,7 @@
       <app-tile-group>
         <app-tile>
           <app-card-cf-recent-apps *ngIf="!(detailsLoading$ | async)" [allApps$]="cfOrgService.apps$"
-            [loading$]="cfOrgService.loadingApps$" (refresh)="cfEndpointService.fetchApps()"></app-card-cf-recent-apps>
+            [loading$]="cfOrgService.loadingApps$" (refresh)="cfOrgService.fetchApps()"></app-card-cf-recent-apps>
         </app-tile>
       </app-tile-group>
     </app-loading-page>
diff --git a/src/frontend/packages/core/src/base-entity-schemas.ts b/src/frontend/packages/core/src/base-entity-schemas.ts
index 6a1f2c9ee8..4242afd616 100644
--- a/src/frontend/packages/core/src/base-entity-schemas.ts
+++ b/src/frontend/packages/core/src/base-entity-schemas.ts
@@ -1,13 +1,14 @@
 import {
   endpointSchemaKey,
   entityFactory,
+  systemInfoSchemaKey,
   userFavouritesSchemaKey,
   userProfileSchemaKey,
-  systemInfoSchemaKey,
 } from '../../store/src/helpers/entity-factory';
 import { EntitySchema } from '../../store/src/helpers/entity-schema';
 
 export const STRATOS_ENDPOINT_TYPE = 'stratos';
+export const ENDPOINT_TYPE = 'endpoint';
 
 class StratosEntitySchema extends EntitySchema {
   constructor(entityType: string) {
diff --git a/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue-entity.ts b/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue-entity.ts
index 64fa92b6c6..4ca21ea92d 100644
--- a/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue-entity.ts
+++ b/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue-entity.ts
@@ -255,7 +255,7 @@ export class StratosCatalogueEndpointEntity extends StratosBaseCatalogueEntity<I
   constructor(
     entity: StratosEndpointExtensionDefinition | IStratosEndpointDefinition,
     getLink?: (metadata: IEndpointFavMetadata) => string,
-    // TODO: attach to PreviewableComponent
+    // TODO find a way to attach this to PreviewableComponent
     getPreviewableComponent?: () => object
   ) {
     const fullEntity = {
diff --git a/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.types.ts b/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.types.ts
index 241c7d5643..6e948950f9 100644
--- a/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.types.ts
+++ b/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.types.ts
@@ -149,6 +149,7 @@ export interface IStratosEntityBuilder<T extends IEntityMetadata, Y = any> {
   getStatusObservable?(entity: Y): Observable<StratosStatus>;
   // TODO This should be used in the entities schema.
   getGuid(entityMetadata: T): string;
+  // TODO find a way to attach this to PreviewableComponent
   getPreviewableComponent?(): object;
   getLink?(entityMetadata: T): string;
   getLines?(): EntityRowBuilder<T>[];
diff --git a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
index 82277d48cb..41575a238a 100644
--- a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
+++ b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
@@ -55,7 +55,12 @@ $app-sub-header-height: 48px;
     padding: 0;
   }
   &__side-help {
+    max-width: 600px;
     min-width: 600px;
+
+    @include breakpoint(mobileonly) {
+      min-width: auto;
+    }
   }
 }
 
diff --git a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.ts b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.ts
index b4c554eba4..788d2bc4ae 100644
--- a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.ts
@@ -6,6 +6,8 @@ import { Subscription } from 'rxjs';
 import { ShowSnackBar } from '../../../../../store/src/actions/snackBar.actions';
 import { EndpointOnlyAppState } from '../../../../../store/src/app-state';
 import { EndpointsService } from '../../../core/endpoints.service';
+import { MarkdownPreviewComponent } from '../../../shared/components/markdown-preview/markdown-preview.component';
+import { PanelPreviewService } from '../../../shared/services/panel-preview.service';
 import { ConnectEndpointConfig, ConnectEndpointService } from '../connect.service';
 
 
@@ -27,6 +29,7 @@ export class ConnectEndpointDialogComponent implements OnDestroy {
     @Inject(MAT_DIALOG_DATA) public data: ConnectEndpointConfig,
     private store: Store<EndpointOnlyAppState>,
     endpointsService: EndpointsService,
+    private panelPreviewService: PanelPreviewService,
   ) {
     this.connectService = new ConnectEndpointService(store, endpointsService, data);
 
@@ -37,8 +40,7 @@ export class ConnectEndpointDialogComponent implements OnDestroy {
   }
 
   showHelp() {
-    // this.panelPreviewService.show(MarkdownPreviewComponent, { documentUrl: this.helpDocumentUrl });
-    // this.store.dispatch(new ShowSideHelp(MarkdownPreviewComponent, { setDocumentUrl: this.helpDocumentUrl }));
+    this.panelPreviewService.show(MarkdownPreviewComponent, { documentUrl: this.helpDocumentUrl });
   }
 
   ngOnDestroy(): void {
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.ts b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.ts
index b2282192bb..ff128ef73c 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.ts
@@ -5,7 +5,9 @@ import { map } from 'rxjs/operators';
 
 import { EndpointOnlyAppState } from '../../../../../../store/src/app-state';
 import { EndpointsService } from '../../../../core/endpoints.service';
+import { MarkdownPreviewComponent } from '../../../../shared/components/markdown-preview/markdown-preview.component';
 import { IStepperStep, StepOnNextResult } from '../../../../shared/components/stepper/step/step.component';
+import { PanelPreviewService } from '../../../../shared/services/panel-preview.service';
 import { ConnectEndpointConfig, ConnectEndpointService } from '../../connect.service';
 
 
@@ -25,13 +27,13 @@ export class CreateEndpointConnectComponent implements OnDestroy, IStepperStep {
 
   constructor(
     private store: Store<EndpointOnlyAppState>,
-    private endpointsService: EndpointsService
+    private endpointsService: EndpointsService,
+    private panelPreviewService: PanelPreviewService,
   ) {
   }
 
   showHelp() {
-    // this.panelPreviewService.show(MarkdownPreviewComponent, { documentUrl: this.helpDocumentUrl });
-    // this.store.dispatch(new ShowSideHelp(MarkdownPreviewComponent, { setDocumentUrl: this.helpDocumentUrl }));
+    this.panelPreviewService.show(MarkdownPreviewComponent, { documentUrl: this.helpDocumentUrl });
   }
 
   onEnter = (data: ConnectEndpointConfig) => {
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 29c8e373ef..5a91f03f22 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
@@ -12,7 +12,7 @@ import {
   endpointsEntityRequestDataSelector,
 } from '../../../../../store/src/selectors/endpoint.selectors';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../store/src/types/user-favorites.types';
-import { userFavoritesEntitySchema } from '../../../base-entity-schemas';
+import { ENDPOINT_TYPE, userFavoritesEntitySchema } from '../../../base-entity-schemas';
 import { entityCatalogue } from '../../../core/entity-catalogue/entity-catalogue.service';
 import { IFavoriteEntity } from '../../../core/user-favorite-manager';
 import { PanelPreviewService } from '../../services/panel-preview.service';
@@ -113,7 +113,7 @@ export class FavoritesMetaCardComponent {
     const previewComponent = catalogueEntity.builders.entityBuilder.getPreviewableComponent();
 
     // TODO: use 'endpoint' as constant
-    if (this.favorite.entityType === 'endpoint') {
+    if (this.favorite.entityType === ENDPOINT_TYPE) {
       const entity$ = this.store.select(endpointsEntityRequestDataSelector(this.favorite.endpointId));
       this.panelPreviewService.show(previewComponent, {
         title: this.favorite.metadata.name,
diff --git a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.ts b/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.ts
index dab1792c71..9dba74b1d5 100644
--- a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.ts
+++ b/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.ts
@@ -35,7 +35,6 @@ export class MarkdownPreviewComponent implements PreviewableComponent {
   ) { }
 
   setProps(props: { [key: string]: any }) {
-    console.log('props', props);
     this.setDocumentUrl = props.documentUrl;
   }
 
diff --git a/src/frontend/packages/core/src/shared/services/panel-preview.service.ts b/src/frontend/packages/core/src/shared/services/panel-preview.service.ts
index dda1d3e374..04b42e4010 100644
--- a/src/frontend/packages/core/src/shared/services/panel-preview.service.ts
+++ b/src/frontend/packages/core/src/shared/services/panel-preview.service.ts
@@ -1,6 +1,7 @@
 import { ComponentFactory, ComponentFactoryResolver, ComponentRef, Injectable, ViewContainerRef } from '@angular/core';
+import { Router } from '@angular/router';
 import { asapScheduler, BehaviorSubject, Observable, Subject } from 'rxjs';
-import { observeOn, publishReplay, refCount } from 'rxjs/operators';
+import { filter, observeOn, publishReplay, refCount, tap } from 'rxjs/operators';
 
 @Injectable()
 export class PanelPreviewService {
@@ -9,9 +10,14 @@ export class PanelPreviewService {
 
   private container: ViewContainerRef;
 
-  constructor(private componentFactoryResolver: ComponentFactoryResolver) {
+  constructor(
+    private componentFactoryResolver: ComponentFactoryResolver,
+    private router: Router,
+  ) {
     this.openedSubject = new BehaviorSubject(false);
     this.opened$ = this.observeSubject(this.openedSubject);
+
+    this.setupRouterListener();
   }
 
   public setContainer(container: ViewContainerRef) {
@@ -57,6 +63,13 @@ export class PanelPreviewService {
     this.openedSubject.next(false);
   }
 
+  private setupRouterListener() {
+    this.router.events.pipe(
+      filter(() => !!this.container),
+      tap((e) => this.hide()))
+      .subscribe();
+  }
+
   private observeSubject(subject: Subject<any>) {
     return subject.asObservable().pipe(
       publishReplay(1),

From c0cfd2da053d67c1e497b276950eee2478d3b998 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 3 Dec 2019 14:20:47 +0000
Subject: [PATCH 180/648] Tweaks following review with RC

---
 docs/customizing.md                           | 20 +++++++++++++++-
 examples/custom-src/frontend/sass/custom.scss |  6 +++++
 .../custom-src/frontend/sass/custom/acme.scss | 15 ------------
 .../packages/core/misc/custom/custom.scss     |  1 +
 .../packages/core/sass/dark-theme.scss        | 14 -----------
 src/frontend/packages/core/sass/theme.scss    | 16 ++++++++++++-
 .../packages/core/src/core/theme.service.ts   | 24 +++++++++----------
 src/frontend/packages/core/src/styles.scss    |  8 +++++++
 8 files changed, 61 insertions(+), 43 deletions(-)
 delete mode 100644 src/frontend/packages/core/sass/dark-theme.scss

diff --git a/docs/customizing.md b/docs/customizing.md
index 2171212e3c..c167a77516 100644
--- a/docs/customizing.md
+++ b/docs/customizing.md
@@ -50,7 +50,7 @@ In this file you can set any or all of the following variables:
 |---|---|
 |$stratos-theme|The main theme to use for Stratos|
 |$stratos-nav-theme|Theme to use for the side navigation panel|
-$stratos-status-theme|Theme to use for displaying status in Stratos|
+|$stratos-status-theme|Theme to use for displaying status in Stratos|
 
 Note that you do not have to specify all of these - defaults will be used if they are not set.
 
@@ -72,6 +72,24 @@ $suse-app-theme: mat-light-theme($suse-app-primary, $suse-app-primary, $suse-the
 $stratos-theme: $suse-app-theme;
 ```
 
+#### Creating or disabling the Dark theme
+
+You can also change the Dark theme, if you wish, by defining the following variables:
+
+|Variable|Purpose|
+|---|---|
+|$stratos-dark-theme|The dark theme to use for Stratos|
+|$stratos-dark-nav-theme|Dark theme to use for the side navigation panel|
+|$stratos-dark-status-theme|Dark theme to use for displaying status in Stratos|
+
+Note that minimally you must supply `stratos-dark-theme` to create a dark theme.
+
+By default a dark theme is assumed to be available and the default will be used if not overridden. You can disable dark theme support in the UI by setting the following variable in your `custom.scss`:
+
+```
+$stratos-dark-theme-supported: false;
+```
+
 ### Changing Styles
 
 We don't generally recommend modifying styles, since from version to version of Stratos, we may change the styles used slightly which can mean any modifications you made will need updating. Should you wish to do so, you can modify these in the same `custom.scss` file that is used for theming.
diff --git a/examples/custom-src/frontend/sass/custom.scss b/examples/custom-src/frontend/sass/custom.scss
index 0087198f97..e3eb84c38a 100644
--- a/examples/custom-src/frontend/sass/custom.scss
+++ b/examples/custom-src/frontend/sass/custom.scss
@@ -5,8 +5,14 @@
 $acme-primary: (50: #e8eaf6, 100: #c5cbe9, 200: #9fa8da, 300: #7985cb, 400: #5c6bc0, 500: #3f51b5, 600: #394aae, 700: #3140a5, 800: #29379d, 900: #1b278d, A100: #c6cbff, A200: #939dff, A400: #606eff, A700: #4757ff, contrast: (  50: #000000,  100: #000000,  200: #000000,  300: #000000,  400: #ffffff,  500: #ffffff,  600: #ffffff,  700: #ffffff,  800: #ffffff,  900: #ffffff,  A100: #000000,  A200: #000000,  A400: #ffffff,  A700: #ffffff, ));
 $mat-red: ( 50: #ffebee, 100: #ffcdd2, 200: #ef9a9a, 300: #e57373, 400: #ef5350, 500: #f44336, 600: #e53935, 700: #d32f2f, 800: #c62828, 900: #b71c1c, A100: #ff8a80, A200: #ff5252, A400: #ff1744, A700: #d50000, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: white, A400: white, A700: white, ));
 
+// Common
 $acme-theme-primary: mat-palette($acme-primary);
 $acme-theme-warn: mat-palette($mat-red);
+
+// Dark Theme
+$stratos-dark-theme: mat-dark-theme($acme-theme-primary, $acme-theme-primary, $acme-theme-warn);
+
+// Default Theme
 $stratos-theme: mat-light-theme($acme-theme-primary, $acme-theme-primary, $acme-theme-warn);
 
 @import 'custom/acme';
diff --git a/examples/custom-src/frontend/sass/custom/acme.scss b/examples/custom-src/frontend/sass/custom/acme.scss
index f68980918b..75794ebb6e 100644
--- a/examples/custom-src/frontend/sass/custom/acme.scss
+++ b/examples/custom-src/frontend/sass/custom/acme.scss
@@ -68,19 +68,4 @@ body.stratos {
   .stratos-title > .stratos-title__header {
     display: inline-block;
   }
-
-  .dark-theme {
-    $dark-primary: $acme-theme-primary;
-    $dark-accent: $acme-theme-primary;
-    $dark-warn: mat-palette($mat-red);
-    $dark-theme: mat-dark-theme($dark-primary, $dark-accent, $dark-warn);
-
-    $stratos-theme: $dark-theme;
-    $stratos-nav-theme: null !default;
-    $stratos-status-theme: null !default;
-
-    @include angular-material-theme($dark-theme);
-    @include app-theme($stratos-theme, $stratos-nav-theme, $stratos-status-theme);
-
-  }
 }
diff --git a/src/frontend/packages/core/misc/custom/custom.scss b/src/frontend/packages/core/misc/custom/custom.scss
index eb5d596b7e..9fa63cd29c 100644
--- a/src/frontend/packages/core/misc/custom/custom.scss
+++ b/src/frontend/packages/core/misc/custom/custom.scss
@@ -4,3 +4,4 @@
 
 // The customization build step will replace this file with the custom one if provided
 
+$stratos-dark-theme-supported: false;
diff --git a/src/frontend/packages/core/sass/dark-theme.scss b/src/frontend/packages/core/sass/dark-theme.scss
deleted file mode 100644
index ee4ec386ba..0000000000
--- a/src/frontend/packages/core/sass/dark-theme.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-.dark-theme {
-  $dark-primary: mat-palette($mat-blue);
-  $dark-accent: mat-palette($mat-amber, A400, A100, A700);
-  $dark-warn: mat-palette($mat-red);
-  $dark-theme: mat-dark-theme($dark-primary, $dark-accent, $dark-warn);
-
-  $stratos-theme: $dark-theme !default;
-  $stratos-nav-theme: null !default;
-  $stratos-status-theme: null !default;
-
-  @include angular-material-theme($dark-theme);
-  @include app-theme($stratos-theme, $stratos-nav-theme, $stratos-status-theme);
-  
-}
diff --git a/src/frontend/packages/core/sass/theme.scss b/src/frontend/packages/core/sass/theme.scss
index a2daf93033..ed6428d931 100644
--- a/src/frontend/packages/core/sass/theme.scss
+++ b/src/frontend/packages/core/sass/theme.scss
@@ -4,9 +4,22 @@
 @import './mat-colors';
 
 // Custom theme support
-@import './dark-theme';
 @import './custom';
 
+.dark-theme {
+  // Dark Theme defaults
+  $dark-primary: mat-palette($mat-blue);
+  $dark-accent: mat-palette($mat-amber, A400, A100, A700);
+  $dark-warn: mat-palette($mat-red);
+  $dark-theme: mat-dark-theme($dark-primary, $dark-accent, $dark-warn);
+
+  $stratos-dark-theme: $dark-theme !default;
+  $stratos-dark-nav-theme: null !default;
+  $stratos-dark-status-theme: null !default;
+
+  @include angular-material-theme($stratos-dark-theme);
+  @include app-theme($stratos-dark-theme, $stratos-dark-nav-theme, $stratos-dark-status-theme);
+}
 
 .default {
   // Themes palettes and colors
@@ -24,6 +37,7 @@
   @include app-theme($stratos-theme, $stratos-nav-theme, $stratos-status-theme);
 }
 
+$stratos-dark-theme-supported: true !default;
 
 // Create the theme
 @include mat-core;
diff --git a/src/frontend/packages/core/src/core/theme.service.ts b/src/frontend/packages/core/src/core/theme.service.ts
index 169e324e52..43b33ac44f 100644
--- a/src/frontend/packages/core/src/core/theme.service.ts
+++ b/src/frontend/packages/core/src/core/theme.service.ts
@@ -51,9 +51,9 @@ export class ThemeService {
 
       // If at some point in the future we need to adjust theme on OS change at run time we should look into this. Unfortunately was unable
       // to test (only way I could change scheme from light to dark was in FF and about:config `ui.systemUsesDarkTheme` integer 1)
-      // window.matchMedia('(prefers-color-scheme: dark)').addListener(e => e.matches && this.updateFollowingOsThemeChange());
-      // window.matchMedia('(prefers-color-scheme: light)').addListener(e => e.matches && this.updateFollowingOsThemeChange());
-      // window.matchMedia('(prefers-color-scheme: no-preference)').addListener(e => e.matches && this.updateFollowingOsThemeChange());
+      window.matchMedia('(prefers-color-scheme: dark)').addListener(e => e.matches && this.updateFollowingOsThemeChange());
+      window.matchMedia('(prefers-color-scheme: light)').addListener(e => e.matches && this.updateFollowingOsThemeChange());
+      window.matchMedia('(prefers-color-scheme: no-preference)').addListener(e => e.matches && this.updateFollowingOsThemeChange());
     }
   }
 
@@ -122,13 +122,13 @@ export class ThemeService {
   /**
    * Update theme given changes in OS theme settings
    */
-  // private updateFollowingOsThemeChange() {
-  //   this.osThemeInfo.isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches;
-  //   this.osThemeInfo.isLightMode = window.matchMedia('(prefers-color-scheme: light)').matches;
-  //   this.osThemeInfo.isNotSpecified = window.matchMedia('(prefers-color-scheme: no-preference)').matches;
-
-  //   this.store.select(selectDashboardState).pipe(
-  //     first()
-  //   ).subscribe(dashboardState => dashboardState.themeKey === osTheme.key && this.setTheme(osTheme.key));
-  // }
+  private updateFollowingOsThemeChange() {
+    this.osThemeInfo.isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches;
+    this.osThemeInfo.isLightMode = window.matchMedia('(prefers-color-scheme: light)').matches;
+    this.osThemeInfo.isNotSpecified = window.matchMedia('(prefers-color-scheme: no-preference)').matches;
+
+    this.store.select(selectDashboardState).pipe(
+      first()
+    ).subscribe(dashboardState => dashboardState.themeKey === osTheme.key && this.setTheme(osTheme.key));
+  }
 }
diff --git a/src/frontend/packages/core/src/styles.scss b/src/frontend/packages/core/src/styles.scss
index 1fe35bd298..f6e062111e 100644
--- a/src/frontend/packages/core/src/styles.scss
+++ b/src/frontend/packages/core/src/styles.scss
@@ -65,3 +65,11 @@ button.mat-simple-snackbar-action {
 //   flex: 1;
 //   flex-direction: column;
 // }
+
+
+// Add selector so that the UI can detect if a dark theme is available
+@if $stratos-dark-theme-supported {
+  .dark-theme-supported {
+    margin: 0;
+  }
+}

From 8308474b8f8364f07bf20d23184074bb117a2c85 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 3 Dec 2019 16:31:24 +0000
Subject: [PATCH 181/648] Final tweaks following review - wired in
 dark-theme-supported to theme options - removed test line from custom.scss

---
 .../packages/core/misc/custom/custom.scss     |  2 -
 .../packages/core/src/core/style.service.ts   | 38 +++++++++++++++
 .../packages/core/src/core/theme.service.ts   | 47 +++++++++++++------
 .../profile-info/profile-info.component.html  |  2 +-
 .../profile-info/profile-info.component.ts    |  3 ++
 5 files changed, 74 insertions(+), 18 deletions(-)
 create mode 100644 src/frontend/packages/core/src/core/style.service.ts

diff --git a/src/frontend/packages/core/misc/custom/custom.scss b/src/frontend/packages/core/misc/custom/custom.scss
index 9fa63cd29c..f6d83b743c 100644
--- a/src/frontend/packages/core/misc/custom/custom.scss
+++ b/src/frontend/packages/core/misc/custom/custom.scss
@@ -3,5 +3,3 @@
 // This file is in the .gitignore - changes will not be flagged
 
 // The customization build step will replace this file with the custom one if provided
-
-$stratos-dark-theme-supported: false;
diff --git a/src/frontend/packages/core/src/core/style.service.ts b/src/frontend/packages/core/src/core/style.service.ts
new file mode 100644
index 0000000000..f832f06c0d
--- /dev/null
+++ b/src/frontend/packages/core/src/core/style.service.ts
@@ -0,0 +1,38 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class StyleService {
+
+  private rules: string[] = [];
+  constructor() {
+    this.rules = this.getAllSelectors();
+  }
+
+  hasSelector = (selector) => {
+    return !!this.rules.find(ruleSelector => ruleSelector === selector);
+  }
+
+  private getAllSelectors = (): string[] => {
+    const ret = [];
+    // tslint:disable-next-line:prefer-for-of
+    for (let i = 0; i < document.styleSheets.length; i++) {
+      const styleSheet = document.styleSheets[i];
+      if (!(styleSheet instanceof CSSStyleSheet)) {
+        continue;
+      }
+      const rules = styleSheet.rules || styleSheet.cssRules;
+      // tslint:disable-next-line:prefer-for-of
+      for (let y = 0; y < rules.length; y++) {
+        const rule = rules[y];
+        if (!(rule instanceof CSSStyleRule)) {
+          continue;
+        }
+        if (typeof rule.selectorText === 'string') { ret.push(rule.selectorText); }
+      }
+    }
+    return ret;
+  }
+
+}
diff --git a/src/frontend/packages/core/src/core/theme.service.ts b/src/frontend/packages/core/src/core/theme.service.ts
index 43b33ac44f..f5ee16ba18 100644
--- a/src/frontend/packages/core/src/core/theme.service.ts
+++ b/src/frontend/packages/core/src/core/theme.service.ts
@@ -7,6 +7,7 @@ import { first, map } from 'rxjs/operators';
 import { SetThemeAction } from '../../../store/src/actions/dashboard-actions';
 import { DashboardOnlyAppState } from '../../../store/src/app-state';
 import { selectDashboardState } from '../../../store/src/selectors/dashboard.selectors';
+import { StyleService } from './style.service';
 
 export interface StratosTheme {
   key: string;
@@ -41,20 +42,13 @@ export class ThemeService {
     isLightMode: window.matchMedia('(prefers-color-scheme: light)').matches,
     isNotSpecified: window.matchMedia('(prefers-color-scheme: no-preference)').matches
   };
-  private themes: StratosTheme[] = [lightTheme, darkTheme];
+  private themes: StratosTheme[] = [lightTheme];
 
-  constructor(private store: Store<DashboardOnlyAppState>, private overlayContainer: OverlayContainer) {
-    this.osThemeInfo.supports = this.osThemeInfo.isDarkMode || this.osThemeInfo.isLightMode || this.osThemeInfo.isNotSpecified;
-
-    if (this.osThemeInfo.supports) {
-      this.themes.push(osTheme);
-
-      // If at some point in the future we need to adjust theme on OS change at run time we should look into this. Unfortunately was unable
-      // to test (only way I could change scheme from light to dark was in FF and about:config `ui.systemUsesDarkTheme` integer 1)
-      window.matchMedia('(prefers-color-scheme: dark)').addListener(e => e.matches && this.updateFollowingOsThemeChange());
-      window.matchMedia('(prefers-color-scheme: light)').addListener(e => e.matches && this.updateFollowingOsThemeChange());
-      window.matchMedia('(prefers-color-scheme: no-preference)').addListener(e => e.matches && this.updateFollowingOsThemeChange());
-    }
+  constructor(
+    private store: Store<DashboardOnlyAppState>,
+    private overlayContainer: OverlayContainer,
+    private styleService: StyleService) {
+    this.initialiseStratosThemeInfo();
   }
 
   getThemes(): StratosTheme[] {
@@ -80,11 +74,35 @@ export class ThemeService {
     this.getTheme().pipe(first()).subscribe(theme => this.setOverlay(theme));
   }
 
+  private initialiseStratosThemeInfo() {
+    const hasDarkTheme = this.styleService.hasSelector('.dark-theme-supported');
+
+    if (hasDarkTheme) {
+      this.themes.push(darkTheme);
+
+      this.initialiseOsThemeInfo();
+    }
+
+  }
+
+  private initialiseOsThemeInfo() {
+    this.osThemeInfo.supports = this.osThemeInfo.isDarkMode || this.osThemeInfo.isLightMode || this.osThemeInfo.isNotSpecified;
+
+    if (this.osThemeInfo.supports) {
+      this.themes.push(osTheme);
+
+      // Watch for changes at run time
+      window.matchMedia('(prefers-color-scheme: dark)').addListener(e => e.matches && this.updateFollowingOsThemeChange());
+      window.matchMedia('(prefers-color-scheme: light)').addListener(e => e.matches && this.updateFollowingOsThemeChange());
+      window.matchMedia('(prefers-color-scheme: no-preference)').addListener(e => e.matches && this.updateFollowingOsThemeChange());
+    }
+  }
+
   /**
    * Find a theme in a safe way with fall backs
    */
   private findTheme(themeKey: string): StratosTheme {
-    if (themeKey === osTheme.key) {
+    if (themeKey === osTheme.key && this.getThemes().find(theme => theme.key === osTheme.key)) {
       return this.getOsTheme() || lightTheme;
     }
     return this.getThemes().find(theme => theme.key === themeKey) || lightTheme;
@@ -118,7 +136,6 @@ export class ThemeService {
     this.overlayContainer.getContainerElement().classList.add(newTheme.styleName);
   }
 
-  // See usages, might be needed in the future
   /**
    * Update theme given changes in OS theme settings
    */
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 4580560673..7e807d5687 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
@@ -92,7 +92,7 @@ <h1>User Profile</h1>
                 polling may result in some pages showing out-of-date information.</div>
             </div>
           </div>
-          <div class="user-profile__option">
+          <div class="user-profile__option" *ngIf="hasMultipleThemes">
             <div class="user-profile__option-inner">
               <div class="user-profile__option-header">
                 Theme
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 9bb9288676..b504c6832f 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
@@ -32,6 +32,7 @@ export class ProfileInfoComponent implements OnInit {
   userProfile$: Observable<UserProfileInfo>;
 
   primaryEmailAddress$: Observable<string>;
+  hasMultipleThemes: boolean;
 
   private sessionDialogConfig = new ConfirmationDialogConfig(
     'Disable session timeout',
@@ -69,6 +70,8 @@ export class ProfileInfoComponent implements OnInit {
     this.primaryEmailAddress$ = this.userProfile$.pipe(
       map((profile: UserProfileInfo) => userProfileService.getPrimaryEmailAddress(profile))
     );
+
+    this.hasMultipleThemes = themeService.getThemes().length > 1;
   }
 
   ngOnInit() {

From 2f6a231630f6b5a4355087525d17a8d7867c8f49 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 3 Dec 2019 20:05:44 +0000
Subject: [PATCH 182/648] Merge

---
 .../frontend/app/custom/helm/helm.module.ts   |     2 -
 .../chart-details.component.html              |     2 +-
 .../helm-release-tab-base.component.ts        |    15 +-
 .../tabs/helm-release-helper.service.ts       |    10 +-
 ...helm-release-resource-graph.component.html |    37 +-
 .../helm-release-resource-graph.component.ts  |     4 +-
 .../helm-release-summary-tab.component.ts     |    41 +-
 .../helm-release-values-tab.component.html    |    18 +-
 .../app/custom/helm/store/helm.effects.ts     |     5 +-
 .../app/custom/helm/store/helm.reducers.ts    |     3 -
 package-lock.json                             | 12543 +++++++---------
 .../entity-summary-title.component.html       |     4 +-
 .../entity-summary-title.component.scss       |    15 +-
 .../entity-summary-title.component.ts         |     2 +-
 .../packages/core/src/shared/shared.module.ts |     4 +
 src/jetstream/middleware.go                   |     2 +
 .../plugins/kubernetes/helm/graph.go          |    12 +-
 .../plugins/kubernetes/helm/graph_status.go   |    16 +
 src/jetstream/plugins/kubernetes/helm/job.go  |     2 +-
 .../plugins/kubernetes/install_release.go     |    29 +-
 .../plugins/kubernetes/list_releases.go       |     7 +-
 src/jetstream/plugins/kubernetes/main.go      |     4 +-
 22 files changed, 5978 insertions(+), 6799 deletions(-)

diff --git a/custom-src/frontend/app/custom/helm/helm.module.ts b/custom-src/frontend/app/custom/helm/helm.module.ts
index 32243d1359..eb8d4d7033 100644
--- a/custom-src/frontend/app/custom/helm/helm.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm.module.ts
@@ -40,7 +40,6 @@ import { CatalogTabComponent } from './tabs/catalog-tab/catalog-tab.component';
 import { HelmConfigurationComponent } from './tabs/configuration-tab/helm-configuration.component';
 import { HelmReleasesTabComponent } from './tabs/releases-tab/releases-tab.component';
 import { RepositoryTabComponent } from './tabs/repository-tab/repository-tab.component';
-import { NgxJsonViewerModule } from 'ngx-json-viewer';
 import { KubernetesModule } from '../kubernetes/kubernetes.module';
 import { NgxGraphModule } from '@swimlane/ngx-graph';
 
@@ -51,7 +50,6 @@ import { NgxGraphModule } from '@swimlane/ngx-graph';
     SharedModule,
     HelmRoutingModule,
     CreateReleaseModule,
-    NgxJsonViewerModule,
     KubernetesModule,
     NgxGraphModule,
   ],
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.html b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.html
index 499d896079..fae3d4f7d5 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.html
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.html
@@ -6,7 +6,7 @@ <h2>Sorry, we couldn't find the chart</h2>
     <div class="chart-details__wrapper">
       <app-entity-summary-title class="summary-title" *ngIf="chart" [title]="chart.attributes.name"
         subTitle="{{ chart.attributes.repo.name }}"
-        [subText]="chart.attributes.description" [inlineImagePath]="iconUrl">
+        [subText]="chart.attributes.description" [imagePath]="iconUrl">
         <div class="chart-details__content">
           <article class="chart-details__content__docs">
             <app-chart-details-readme [currentVersion]=currentVersion></app-chart-details-readme>
diff --git a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts b/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
index 765bd7f71e..7596d436cb 100644
--- a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
@@ -72,20 +72,18 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
     { link: 'services', label: 'Services', icon: 'service', iconFont: 'stratos-icons' }
   ];
   constructor(
-    private helmRelease: HelmReleaseGuid,
     public helmReleaseHelper: HelmReleaseHelperService,
     private store: Store<AppState>,
   ) {
-    const guid = this.helmRelease.guid;
-    this.title = guid.split(':')[1];
+    this.title = this.helmReleaseHelper.releaseTitle;
 
     console.log('RELEASE BASE - CREATE NEW');
 
-    const endpointAndName = this.helmReleaseHelper.guid.replace(':', '/');
+    const releaseRef = this.helmReleaseHelper.guidAsUrlFragment();
     const host = window.location.host;
     const protocol = window.location.protocol === 'https:' ? 'wss' : 'ws';
     const streamUrl = (
-      `${protocol}://${host}/pp/v1/helm/releases/${endpointAndName}`
+      `${protocol}://${host}/pp/v1/helm/releases/${releaseRef}`
     );
     console.log(streamUrl);
 
@@ -97,7 +95,7 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
 
     const messages = connection.messages.pipe(
       catchError(e => {
-        console.log('WS Erorr');
+        console.log('WS Error');
         console.log(e);
         if (e.type === 'error') {
           console.log(e);
@@ -107,10 +105,9 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
 
     let prefix = '';
     this.sub = messages.subscribe(jsonString => {
-      console.log('Got message ....');
-
       const messageObj = JSON.parse(jsonString);
       if (messageObj) {
+        console.log('Got message .... ' + messageObj.kind);
         console.log(messageObj);
 
         // this.store.dispatch(new HelmUpdateRelease(messageObj));
@@ -130,8 +127,6 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
           const graph = messageObj.data;
           graph.endpointId = this.helmReleaseHelper.endpointGuid;
           graph.releaseTitle = this.helmReleaseHelper.releaseTitle;
-          console.log(graph);
-          console.log(prefix);
           this.addResource(helmReleaseGraphEntityType, graph, `${graph.endpointId}-${graph.releaseTitle}`, HELM_ENDPOINT_TYPE);
         } else if (messageObj.kind === 'Manifest' ||  messageObj.kind === 'Resources') {
           // Store all of the services
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
index 071f191c51..a9dfe96eb8 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
@@ -22,6 +22,7 @@ export class HelmReleaseHelperService {
 
   public guid: string;
   public endpointGuid: string;
+  public namespace: string;
   public releaseTitle: string;
 
   constructor(
@@ -30,7 +31,8 @@ export class HelmReleaseHelperService {
     private esf: EntityServiceFactory
   ) {
     this.guid = helmReleaseGuid.guid;
-    this.releaseTitle = this.guid.split(':')[1];
+    this.releaseTitle = this.guid.split(':')[2];
+    this.namespace = this.guid.split(':')[1];
     this.endpointGuid = this.guid.split(':')[0];
 
     const action = new GetHelmReleases();
@@ -43,6 +45,10 @@ export class HelmReleaseHelperService {
     );
   }
 
+  public guidAsUrlFragment(): string {
+    return this.guid.replace(':', '/').replace(':', '/');
+  }
+
   public fetchReleaseStatus(): Observable<HelmReleaseStatus> {
     // Get helm release
     const action = new GetHelmReleaseStatus(this.endpointGuid, this.releaseTitle);
@@ -61,7 +67,7 @@ export class HelmReleaseHelperService {
 
     return this.esf.create<HelmReleaseGraph>(action.key, action).waitForEntity$.pipe(
       tap(e => {
-        console.log('ENTITY HELMRELEASEGRAPH');
+        console.log('ENTITY HELM RELEASE GRAPH');
         console.log(e);
       }),
       map(entity => entity.entity)
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
index 1d9607cb8e..f6dc66a353 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
@@ -1,15 +1,14 @@
 <app-page-sub-nav>
   <button mat-button name="fit" (click)="fitGraph()" matTooltip="Fit">
-    <mat-icon>aspect_ratio</mat-icon>
+    <mat-icon>all_out</mat-icon>
     <span>Fit</span>
   </button>
   <button mat-button name="toggle" (click)="toggleLayout()" matTooltip="Toggle Layout">
-    <mat-icon>aspect_ratio</mat-icon>
-    <span>Toggle</span>
+    <mat-icon>view_quilt</mat-icon>
+    <span>Toggle Layout</span>
   </button>
 </app-page-sub-nav>
 
-
 <ngx-graph
   class="chart-container"
   (zoomChange)="onZoomChanged($event)"
@@ -19,19 +18,19 @@
   [zoomToFit$]="fit$"
   [layout]="layout"
 >
-<ng-template #nodeTemplate let-node>
-  <svg:g class="node">
-    <svg:rect
-      [attr.width]="node.dimension.width"
-      [attr.height]="node.dimension.height"
-      [attr.fill]="node.data.fill"
-      class="node"></svg:rect>
-    />
-    <svg:text alignment-baseline="central"
-    [attr.fill]="node.data.text"
-    [attr.x]="10" [attr.y]="node.dimension.height / 2">
-      {{node.label}} ({{node.data.kind}})
-    </svg:text>
-  </svg:g>
-</ng-template>
+  <ng-template #nodeTemplate let-node>
+    <svg:g class="node">
+      <svg:rect
+        [attr.width]="node.dimension.width"
+        [attr.height]="node.dimension.height"
+        [attr.fill]="node.data.fill"
+        class="node"></svg:rect>
+      />
+      <svg:text alignment-baseline="central"
+      [attr.fill]="node.data.text"
+      [attr.x]="10" [attr.y]="node.dimension.height / 2">
+        {{node.label}} ({{node.data.kind}})
+      </svg:text>
+    </svg:g>
+  </ng-template>
 </ngx-graph>
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
index a672525feb..e2625c446e 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
@@ -111,8 +111,8 @@ export class HelmReleaseResourceGraphComponent implements OnInit, OnDestroy {
         };
       default:
         return {
-          bg: 'cyan',
-          fg: 'black'
+          bg: '#5a9cb0',
+          fg: 'white'
         };
     }
   }
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index c402088a51..377ec5a750 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -80,43 +80,6 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
       startWith(true)
     );
 
-    // console.log("Connecting to web socket");
-
-    // const endpointAndName = this.helmReleaseHelper.guid.replace(':', '/');
-    // const host = window.location.host;
-    // const protocol = window.location.protocol === 'https:' ? 'wss' : 'ws';
-    // const streamUrl = (
-    //   `${protocol}://${host}/pp/v1/helm/releases/${endpointAndName}`
-    // );
-    // console.log(streamUrl);
-
-    // const data = new Subject<string>();
-    // const connection = websocketConnect(
-    //   streamUrl,
-    //   data
-    // );
-
-    // const messages = connection.messages.pipe(
-    //   catchError(e => {
-    //     if (e.type === 'error') {
-    //       console.log(e);
-    //     }
-    //     return [];
-    //   }));
-
-    // const connectionStatus = connection.connectionStatus;
-
-    // messages.subscribe(jsonString => {
-    //   console.log('Got message ....');
-
-    //   const messageObj = JSON.parse(jsonString);
-    //   if (messageObj) {
-    //     console.log(messageObj);
-    //   }
-
-    // });
-
-
     // Async fetch release status
     // this.chartData$ = obsOf({});
     // this.chartData$ = releaseStatus$.pipe(
@@ -158,9 +121,9 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
   public deleteRelease() {
     this.confirmDialog.open(this.deleteReleaseConfirmation, () => {
       // Make the http request to delete the release
-      const endpointAndName = this.helmReleaseHelper.guid.replace(':', '/');
+      const releaseRef = this.helmReleaseHelper.guidAsUrlFragment();
       this.startDelete();
-      this.httpClient.delete(`/pp/v1/helm/releases/${endpointAndName}`).subscribe({
+      this.httpClient.delete(`/pp/v1/helm/releases/${releaseRef}`).subscribe({
         error: (err: any) => {
           this.endDelete();
           this.store.dispatch(new ShowSnackBar('Failed to delete release', 'Close'));
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
index 2c95eb90e4..b4d9c2e6d8 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
@@ -1,6 +1,18 @@
-<div *ngIf="values$ | async as values; else noValues">
-  <ngx-json-viewer [json]="values"></ngx-json-viewer>
-</div>
+<app-page-sub-nav>
+  <button mat-button name="expand_all" (click)="viewer.expand()" matTooltip="Expand all">
+    <mat-icon>expand_more</mat-icon>
+    <span>Expand all</span>
+  </button>
+  <button mat-button name="collapse_all" (click)="viewer.collapse()" matTooltip="Collapse all">
+    <mat-icon>expand_less</mat-icon>
+    <span>Collapse all</span>
+  </button>
+</app-page-sub-nav>
+
+<app-json-viewer #viewer [json]="values$ | async"></app-json-viewer>
+<!-- <div *ngIf="values$ | async as values; else noValues">
+  <app-json-viewer #viewer [json]="values"></app-json-viewer>
+</div> -->
 <ng-template #noValues>
   <app-no-content-message [icon]="'list'" [firstLine]="'There are no release values'"></app-no-content-message>
 </ng-template>
\ No newline at end of file
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 05f40e770b..edfec83630 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.effects.ts
@@ -98,13 +98,14 @@ export class HelmEffects {
             return;
           }
           endpointData.forEach((data) => {
+            console.log('Got helm release');
             console.log(data);
             const helmRelease: HelmRelease = {
               ...data,
               endpointId: endpoint
             };
-            // Release name is unique for an endpoint
-            const id = endpoint + ':' + data.name;
+            // Release name is unique for an endpoint - for Helm 3, include the namespace
+            const id = endpoint + ':' + data.namespace + ':' + data.name;
             helmRelease.guid = id;
             // Make a note of the guid of the endpoint for the release
             helmRelease.status = mapHelmStatus(data.info.status);
diff --git a/custom-src/frontend/app/custom/helm/store/helm.reducers.ts b/custom-src/frontend/app/custom/helm/store/helm.reducers.ts
index bc2b5efacf..3d31b6fefc 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.reducers.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.reducers.ts
@@ -7,9 +7,6 @@ export function helmReleaseReducer(state: any = defaultState, action) {
     case UPDATE_HELM_RELEASE_STATUS:
       return {
         ...state,
-        pods: {
-          test: '123'
-        }
       };
   }
 }
diff --git a/package-lock.json b/package-lock.json
index a548d0cc34..79c27f6795 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,248 +5,436 @@
   "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.13.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.2.tgz",
+      "integrity": "sha512-wcUdMzcpsxzscEa+wrhV1SE2PsHS6FnHJlRURFOtQmKvQAq3Y8gVw28l008SMt5d0bTrRV4xLL2lgvwJJoc7LA==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "8.3.7",
-        "rxjs": "6.4.0"
+        "@angular-devkit/core": "7.3.2",
+        "rxjs": "6.3.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.3.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
           "dev": true,
           "requires": {
-            "tslib": "1.10.0"
+            "tslib": "^1.9.0"
           }
         }
       }
     },
     "@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",
-        "circular-dependency-plugin": "5.2.0",
+      "version": "0.13.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.13.2.tgz",
+      "integrity": "sha512-zRrV/dknx8891XSjXTh5JcTZnX4h+YsCHi6u8GABnIZW9JyiCl9QZpv0mRIyGTEaK2udmfMo2Yp5qZo1sd8jeQ==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/architect": "0.13.2",
+        "@angular-devkit/build-optimizer": "0.13.2",
+        "@angular-devkit/build-webpack": "0.13.2",
+        "@angular-devkit/core": "7.3.2",
+        "@ngtools/webpack": "7.3.2",
+        "ajv": "6.9.1",
+        "autoprefixer": "9.4.6",
+        "circular-dependency-plugin": "5.0.2",
         "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",
+        "copy-webpack-plugin": "4.6.0",
+        "file-loader": "3.0.1",
+        "glob": "7.1.3",
         "istanbul-instrumenter-loader": "3.0.1",
-        "jest-worker": "24.9.0",
-        "karma-source-map-support": "1.4.0",
+        "karma-source-map-support": "1.3.0",
         "less": "3.9.0",
-        "less-loader": "5.0.0",
-        "license-webpack-plugin": "2.1.2",
+        "less-loader": "4.1.0",
+        "license-webpack-plugin": "2.1.0",
         "loader-utils": "1.2.3",
-        "mini-css-extract-plugin": "0.8.0",
+        "mini-css-extract-plugin": "0.5.0",
         "minimatch": "3.0.4",
-        "open": "6.4.0",
+        "node-sass": "4.11.0",
+        "opn": "5.4.0",
         "parse5": "4.0.0",
-        "postcss": "7.0.17",
+        "postcss": "7.0.14",
         "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",
-        "source-map": "0.7.3",
+        "raw-loader": "1.0.0",
+        "rxjs": "6.3.3",
+        "sass-loader": "7.1.0",
+        "semver": "5.6.0",
         "source-map-loader": "0.2.4",
-        "source-map-support": "0.5.13",
-        "speed-measure-webpack-plugin": "1.3.1",
-        "style-loader": "1.0.0",
+        "source-map-support": "0.5.10",
+        "speed-measure-webpack-plugin": "1.3.0",
+        "stats-webpack-plugin": "0.7.0",
+        "style-loader": "0.23.1",
         "stylus": "0.54.5",
         "stylus-loader": "3.0.2",
-        "terser": "4.1.4",
-        "terser-webpack-plugin": "1.4.1",
+        "terser-webpack-plugin": "1.2.2",
         "tree-kill": "1.2.1",
-        "webpack": "4.39.2",
-        "webpack-dev-middleware": "3.7.0",
-        "webpack-dev-server": "3.8.0",
+        "webpack": "4.29.0",
+        "webpack-dev-middleware": "3.5.1",
+        "webpack-dev-server": "3.1.14",
         "webpack-merge": "4.2.1",
-        "webpack-sources": "1.4.3",
-        "webpack-subresource-integrity": "1.1.0-rc.6",
-        "worker-plugin": "3.2.0"
+        "webpack-sources": "1.3.0",
+        "webpack-subresource-integrity": "1.1.0-rc.6"
       },
       "dependencies": {
         "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+          "version": "6.9.1",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+          "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
+          "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-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true,
+          "optional": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
+          "optional": 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-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"
           }
         },
+        "clone": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+          "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+          "dev": true
+        },
+        "extend": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+          "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+          "dev": true,
+          "optional": true
+        },
+        "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
+        },
         "glob": {
-          "version": "7.1.4",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
-          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+          "version": "7.1.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+          "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"
           }
         },
-        "parse5": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
-          "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
+        "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
         },
+        "less": {
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/less/-/less-3.9.0.tgz",
+          "integrity": "sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==",
+          "dev": true,
+          "requires": {
+            "clone": "^2.1.2",
+            "errno": "^0.1.1",
+            "graceful-fs": "^4.1.2",
+            "image-size": "~0.5.0",
+            "mime": "^1.4.1",
+            "mkdirp": "^0.5.0",
+            "promise": "^7.1.1",
+            "request": "^2.83.0",
+            "source-map": "~0.6.0"
+          }
+        },
+        "mime-db": {
+          "version": "1.38.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
+          "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==",
+          "dev": true,
+          "optional": true
+        },
+        "mime-types": {
+          "version": "2.1.22",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz",
+          "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "mime-db": "~1.38.0"
+          }
+        },
+        "node-sass": {
+          "version": "4.11.0",
+          "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.11.0.tgz",
+          "integrity": "sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "async-foreach": "^0.1.3",
+            "chalk": "^1.1.1",
+            "cross-spawn": "^3.0.0",
+            "gaze": "^1.0.0",
+            "get-stdin": "^4.0.1",
+            "glob": "^7.0.3",
+            "in-publish": "^2.0.0",
+            "lodash.assign": "^4.2.0",
+            "lodash.clonedeep": "^4.3.2",
+            "lodash.mergewith": "^4.6.0",
+            "meow": "^3.7.0",
+            "mkdirp": "^0.5.1",
+            "nan": "^2.10.0",
+            "node-gyp": "^3.8.0",
+            "npmlog": "^4.0.0",
+            "request": "^2.88.0",
+            "sass-graph": "^2.2.4",
+            "stdout-stream": "^1.4.0",
+            "true-case-path": "^1.0.2"
+          },
+          "dependencies": {
+            "request": {
+              "version": "2.88.0",
+              "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+              "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "aws-sign2": "~0.7.0",
+                "aws4": "^1.8.0",
+                "caseless": "~0.12.0",
+                "combined-stream": "~1.0.6",
+                "extend": "~3.0.2",
+                "forever-agent": "~0.6.1",
+                "form-data": "~2.3.2",
+                "har-validator": "~5.1.0",
+                "http-signature": "~1.2.0",
+                "is-typedarray": "~1.0.0",
+                "isstream": "~0.1.2",
+                "json-stringify-safe": "~5.0.1",
+                "mime-types": "~2.1.19",
+                "oauth-sign": "~0.9.0",
+                "performance-now": "^2.1.0",
+                "qs": "~6.5.2",
+                "safe-buffer": "^5.1.2",
+                "tough-cookie": "~2.4.3",
+                "tunnel-agent": "^0.6.0",
+                "uuid": "^3.3.2"
+              }
+            }
+          }
+        },
+        "opn": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz",
+          "integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
+          "dev": true,
+          "requires": {
+            "is-wsl": "^1.1.0"
+          }
+        },
         "rxjs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
+          "version": "6.3.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
           "dev": true,
           "requires": {
-            "tslib": "1.10.0"
+            "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": "5.6.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
           "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
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
+          "optional": 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,
+          "optional": true
+        },
+        "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"
+          }
+        },
+        "uuid": {
+          "version": "3.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+          "dev": true,
+          "optional": true
         }
       }
     },
     "@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.13.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-ng-packagr/-/build-ng-packagr-0.13.2.tgz",
+      "integrity": "sha512-QJc4B2Q+dK++Ns17yLIo8Q/1HRn6f4AheayiskaOMEEvYqDNohaqb+6xDp30WAn4zgjRObiuH1EFb3XdTLMrCQ==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.803.7",
-        "rxjs": "6.4.0"
+        "@angular-devkit/architect": "0.13.2",
+        "@angular-devkit/core": "7.3.2",
+        "rxjs": "6.3.3",
+        "semver": "5.6.0"
       },
       "dependencies": {
         "rxjs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
+          "version": "6.3.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
           "dev": true,
           "requires": {
-            "tslib": "1.10.0"
+            "tslib": "^1.9.0"
           }
+        },
+        "semver": {
+          "version": "5.6.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+          "dev": true
         }
       }
     },
     "@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.13.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.13.2.tgz",
+      "integrity": "sha512-pM3t+6VD+gdcesgwuThR41DFdsZ9ZVQ97Hhr0JXHLbLyRt4eXxWi2+B5VL0jjAaX0RIiUIe8wgScwE6m/dxemg==",
       "dev": true,
       "requires": {
         "loader-utils": "1.2.3",
-        "source-map": "0.7.3",
-        "tslib": "1.10.0",
-        "typescript": "3.5.3",
-        "webpack-sources": "1.4.3"
+        "source-map": "0.5.6",
+        "typescript": "3.2.4",
+        "webpack-sources": "1.3.0"
       },
       "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
-        },
         "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.2.4",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz",
+          "integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==",
           "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.13.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.13.2.tgz",
+      "integrity": "sha512-Uemur2KhFu7VGU2QQmfRiMwmoSKprZrMZRZXwZdCQPN5srIcMAgGjm1PGbZuCUddhwd2XRP9dKY6zOZpMzm84Q==",
       "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.13.2",
+        "@angular-devkit/core": "7.3.2",
+        "rxjs": "6.3.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.3.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
           "dev": true,
           "requires": {
-            "tslib": "1.10.0"
+            "tslib": "^1.9.0"
           }
         }
       }
     },
     "@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": "7.3.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.2.tgz",
+      "integrity": "sha512-W5KjkHRNVBcZRUNJamAn52IAj9Gl1zUjPA2r75JJK7k199xOA8UZqcIukQOgM1N7rwKCWht08i4FsdcTDghMhQ==",
       "dev": true,
       "requires": {
-        "ajv": "6.10.2",
+        "ajv": "6.9.1",
+        "chokidar": "2.0.4",
         "fast-json-stable-stringify": "2.0.0",
-        "magic-string": "0.25.3",
-        "rxjs": "6.4.0",
+        "rxjs": "6.3.3",
         "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==",
+          "version": "6.9.1",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+          "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
           "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"
           }
         },
+        "chokidar": {
+          "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.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"
+          }
+        },
+        "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
+        },
+        "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
+        },
         "rxjs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
+          "version": "6.3.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
           "dev": true,
           "requires": {
-            "tslib": "1.10.0"
+            "tslib": "^1.9.0"
           }
         },
         "source-map": {
@@ -254,137 +442,102 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
           "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
           "dev": true
+        },
+        "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"
+          }
         }
       }
     },
     "@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": "7.3.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.2.tgz",
+      "integrity": "sha512-pxPzMfgVNFq1V6aTrBRYKGATSHfzj67IFYOqKWYt6EnUQxHuAOdFqbB6vIKfZhsYko2anp9Q0dAs6mfesBThNQ==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "8.3.7",
-        "rxjs": "6.4.0"
+        "@angular-devkit/core": "7.3.2",
+        "rxjs": "6.3.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.3.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
           "dev": true,
           "requires": {
-            "tslib": "1.10.0"
+            "tslib": "^1.9.0"
           }
         }
       }
     },
     "@angular/animations": {
-      "version": "8.2.9",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.9.tgz",
-      "integrity": "sha512-l30AF0d9P5okTPM1wieUHgcnDyGSNvyaBcxXSOkT790wAP2v5zs7VrKq9Lm+ICu4Nkx07KrOr5XLUHhqsg3VXA==",
+      "version": "7.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.2.6.tgz",
+      "integrity": "sha512-ICKPS+bKabhQNqnPoVZegUAhgNPbVFlrxHoJ+ZZeVGxw5iBE8TnP3a2sRvakdMTKhykDlwVVGMKLxu2Y34uhmg==",
       "requires": {
-        "tslib": "1.10.0"
+        "tslib": "^1.9.0"
       }
     },
     "@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": "7.3.3",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-7.3.3.tgz",
+      "integrity": "sha512-0M3nwq+c9+d+p0XeU12I9djutlsajRrxcu7AvHQXUs/5grYFsXsX0f468qXDiKmcgqGUBNtN2fBOUhGNlispuQ==",
       "requires": {
-        "parse5": "5.1.0",
-        "tslib": "1.10.0"
+        "parse5": "^5.0.0",
+        "tslib": "^1.7.1"
+      },
+      "dependencies": {
+        "parse5": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
+          "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==",
+          "optional": true
+        }
       }
     },
     "@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": "7.3.2",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-7.3.2.tgz",
+      "integrity": "sha512-M1AtkjB27XjMs+CuJNEv2v7vTu7sMJPw0e41SDPik22+ErOK6YnV6m5VG10fCZZYwCjnWOVNP5Du7Lsdyd/vNQ==",
       "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.13.2",
+        "@angular-devkit/core": "7.3.2",
+        "@angular-devkit/schematics": "7.3.2",
+        "@schematics/angular": "7.3.2",
+        "@schematics/update": "0.13.2",
         "@yarnpkg/lockfile": "1.1.0",
-        "ansi-colors": "4.1.1",
-        "debug": "4.1.1",
         "ini": "1.3.5",
-        "inquirer": "6.5.1",
+        "inquirer": "6.2.1",
         "npm-package-arg": "6.1.0",
-        "npm-pick-manifest": "3.0.2",
-        "open": "6.4.0",
-        "pacote": "9.5.5",
-        "read-package-tree": "5.3.1",
-        "semver": "6.3.0",
-        "symbol-observable": "1.2.0",
-        "universal-analytics": "0.4.20",
-        "uuid": "3.3.3"
+        "opn": "5.4.0",
+        "pacote": "9.4.0",
+        "semver": "5.6.0",
+        "symbol-observable": "1.2.0"
       },
       "dependencies": {
-        "ansi-colors": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-          "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-          "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,
+        "ajv": {
+          "version": "6.9.1",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+          "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
           "requires": {
-            "ms": "2.1.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"
           }
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+        "ansi-escapes": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+          "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
           "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
-        }
-      }
-    },
-    "@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.10.0"
-      }
-    },
-    "@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.10.0"
-      }
-    },
-    "@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==",
-      "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",
-        "yargs": "13.1.0"
-      },
-      "dependencies": {
         "ansi-regex": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
@@ -392,1225 +545,237 @@
           "dev": true
         },
         "chokidar": {
-          "version": "2.1.8",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+          "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+          "requires": {
+            "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"
+          }
+        },
+        "cli-cursor": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+          "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
           "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"
+            "restore-cursor": "^2.0.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==",
+        "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="
+        },
+        "figures": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+          "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
           "dev": true,
           "requires": {
-            "string-width": "2.1.1",
-            "strip-ansi": "4.0.0",
-            "wrap-ansi": "2.1.0"
+            "escape-string-regexp": "^1.0.5"
+          }
+        },
+        "inquirer": {
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.1.tgz",
+          "integrity": "sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==",
+          "dev": true,
+          "requires": {
+            "ansi-escapes": "^3.0.0",
+            "chalk": "^2.0.0",
+            "cli-cursor": "^2.1.0",
+            "cli-width": "^2.0.0",
+            "external-editor": "^3.0.0",
+            "figures": "^2.0.0",
+            "lodash": "^4.17.10",
+            "mute-stream": "0.0.7",
+            "run-async": "^2.2.0",
+            "rxjs": "^6.1.0",
+            "string-width": "^2.1.0",
+            "strip-ansi": "^5.0.0",
+            "through": "^2.3.6"
           },
           "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"
-              }
+            "lodash": {
+              "version": "4.17.15",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+              "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+              "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==",
-          "dev": 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
         },
-        "lcid": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+        "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=="
+        },
+        "lodash": {
+          "version": "4.17.11",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+        },
+        "mute-stream": {
+          "version": "0.0.7",
+          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+          "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+          "dev": true
+        },
+        "onetime": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+          "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
           "dev": true,
           "requires": {
-            "invert-kv": "2.0.0"
+            "mimic-fn": "^1.0.0"
           }
         },
-        "mem": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
-          "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+        "opn": {
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz",
+          "integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
           "dev": true,
           "requires": {
-            "map-age-cleaner": "0.1.3",
-            "mimic-fn": "2.1.0",
-            "p-is-promise": "2.1.0"
+            "is-wsl": "^1.1.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
+        "restore-cursor": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+          "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+          "dev": true,
+          "requires": {
+            "onetime": "^2.0.0",
+            "signal-exit": "^3.0.2"
+          }
         },
-        "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==",
+        "run-async": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+          "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
           "dev": true,
           "requires": {
-            "execa": "1.0.0",
-            "lcid": "2.0.0",
-            "mem": "4.3.0"
+            "is-promise": "^2.1.0"
           }
         },
-        "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==",
+        "rxjs": {
+          "version": "6.3.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
+        "semver": {
+          "version": "5.6.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
           "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
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
         },
         "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": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "emoji-regex": "7.0.3",
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "5.2.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.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==",
-              "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==",
+              "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": "4.1.0"
+                "ansi-regex": "^3.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
-        },
-        "yargs": {
-          "version": "13.1.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.1.0.tgz",
-          "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"
-          }
-        },
-        "yargs-parser": {
-          "version": "13.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
-          "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "5.3.1",
-            "decamelize": "1.2.0"
-          }
-        }
-      }
-    },
-    "@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.10.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"
-      }
-    },
-    "@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"
-      }
-    },
-    "@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==",
-      "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.10.0"
-      }
-    },
-    "@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.10.0"
-      }
-    },
-    "@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.10.0"
-      }
-    },
-    "@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.10.0"
-      }
-    },
-    "@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==",
-      "requires": {
-        "domino": "2.1.3",
-        "tslib": "1.10.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.10.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==",
-      "requires": {
-        "@babel/highlight": "7.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==",
-      "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"
-      },
-      "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"
-          }
-        },
-        "json5": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz",
-          "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==",
-          "requires": {
-            "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=="
-        }
-      }
-    },
-    "@babel/generator": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.6.2.tgz",
-      "integrity": "sha512-j8iHaIW4gGPnViaIHI7e9t/Hl8qLjERI6DcV9kEpAIDJsAOrcnXqRS7t+QbhL76pwbtqP+QCQLL0z1CyVmtjjQ==",
-      "requires": {
-        "@babel/types": "7.6.1",
-        "jsesc": "2.5.2",
-        "lodash": "4.17.15",
-        "source-map": "0.5.6"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-          "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
-        }
-      }
-    },
-    "@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==",
-      "requires": {
-        "@babel/types": "7.6.1"
-      }
-    },
-    "@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==",
-      "requires": {
-        "@babel/helper-explode-assignable-expression": "7.1.0",
-        "@babel/types": "7.6.1"
-      }
-    },
-    "@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==",
-      "requires": {
-        "@babel/helper-hoist-variables": "7.4.4",
-        "@babel/traverse": "7.6.2",
-        "@babel/types": "7.6.1"
-      }
-    },
-    "@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==",
-      "requires": {
-        "@babel/helper-function-name": "7.1.0",
-        "@babel/types": "7.6.1",
-        "lodash": "4.17.15"
-      }
-    },
-    "@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==",
-      "requires": {
-        "@babel/traverse": "7.6.2",
-        "@babel/types": "7.6.1"
-      }
-    },
-    "@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==",
-      "requires": {
-        "@babel/helper-get-function-arity": "7.0.0",
-        "@babel/template": "7.6.0",
-        "@babel/types": "7.6.1"
-      }
-    },
-    "@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==",
-      "requires": {
-        "@babel/types": "7.6.1"
-      }
-    },
-    "@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==",
-      "requires": {
-        "@babel/types": "7.6.1"
-      }
-    },
-    "@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==",
-      "requires": {
-        "@babel/types": "7.6.1"
-      }
-    },
-    "@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==",
-      "requires": {
-        "@babel/types": "7.6.1"
-      }
-    },
-    "@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==",
-      "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-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==",
-      "requires": {
-        "@babel/types": "7.6.1"
-      }
-    },
-    "@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=="
-    },
-    "@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==",
-      "requires": {
-        "lodash": "4.17.15"
-      }
-    },
-    "@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==",
-      "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-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==",
-      "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-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==",
-      "requires": {
-        "@babel/template": "7.6.0",
-        "@babel/types": "7.6.1"
-      }
-    },
-    "@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==",
-      "requires": {
-        "@babel/types": "7.6.1"
-      }
-    },
-    "@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==",
-      "requires": {
-        "@babel/helper-function-name": "7.1.0",
-        "@babel/template": "7.6.0",
-        "@babel/traverse": "7.6.2",
-        "@babel/types": "7.6.1"
-      }
-    },
-    "@babel/helpers": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.6.2.tgz",
-      "integrity": "sha512-3/bAUL8zZxYs1cdX2ilEE0WobqbCmKWr/889lf2SS0PpDcpEIY8pb1CCyz0pEcX3pEb+MCbks1jIokz2xLtGTA==",
-      "requires": {
-        "@babel/template": "7.6.0",
-        "@babel/traverse": "7.6.2",
-        "@babel/types": "7.6.1"
-      }
-    },
-    "@babel/highlight": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
-      "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
-      "requires": {
-        "chalk": "2.4.2",
-        "esutils": "2.0.3",
-        "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=="
-        }
-      }
-    },
-    "@babel/parser": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.6.2.tgz",
-      "integrity": "sha512-mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg=="
-    },
-    "@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==",
-      "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/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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-regex": "7.5.5",
-        "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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@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==",
-      "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/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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "lodash": "4.17.15"
-      }
-    },
-    "@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==",
-      "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"
-      },
-      "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=="
-        }
-      }
-    },
-    "@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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-regex": "7.5.5",
-        "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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@babel/helper-module-transforms": "7.5.5",
-        "@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==",
-      "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/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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@babel/helper-module-transforms": "7.5.5",
-        "@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==",
-      "requires": {
-        "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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "regenerator-transform": "0.14.1"
-      }
-    },
-    "@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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-regex": "7.5.5"
-      }
-    },
-    "@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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@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==",
-      "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-regex": "7.5.5",
-        "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==",
-      "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/template": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.6.0.tgz",
-      "integrity": "sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==",
-      "requires": {
-        "@babel/code-frame": "7.5.5",
-        "@babel/parser": "7.6.2",
-        "@babel/types": "7.6.1"
-      }
-    },
-    "@babel/traverse": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.6.2.tgz",
-      "integrity": "sha512-8fRE76xNwNttVEF2TwxJDGBLWthUkHWSldmfuBzVRmEDWOtu4XdINTgN7TDWzuLg4bbeIMLvfMFD9we5YcWkRQ==",
-      "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"
-      },
-      "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==",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
+          "integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
           "dev": true,
           "requires": {
-            "tslib": "1.10.0"
+            "ansi-regex": "^4.0.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
+              "integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
+              "dev": true
+            }
+          }
+        },
+        "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==",
+          "requires": {
+            "punycode": "^2.1.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,
+    "@angular/common": {
+      "version": "7.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-7.2.6.tgz",
+      "integrity": "sha512-jzWUgsgS0dmPy7yDHX4qCqVpt7ZZmHhApgkg5RkzTAlp+0cvZ/KsDpBgHXnZUIfmk/5g1/EtTbkbClgp1kCkIg==",
       "requires": {
-        "@nodelib/fs.scandir": "2.1.2",
-        "fastq": "1.6.0"
+        "tslib": "^1.9.0"
       }
     },
-    "@nrwl/angular": {
-      "version": "8.5.2",
-      "resolved": "https://registry.npmjs.org/@nrwl/angular/-/angular-8.5.2.tgz",
-      "integrity": "sha512-wZ8zMsSjtsFMO9XzwUgCCmYwTx+gbLyCglAIFF6EFs0c2sDYsS4MDoKBbGd4K+nHBYVB0Thu7FzPnaB3jwgWNg==",
+    "@angular/compiler": {
+      "version": "7.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.6.tgz",
+      "integrity": "sha512-GXdvgH8oxK8HRh/FelN3U5p0tsTUwGh8b/iuuJKaunBSSDDjIy7pPnn3zT+lN4YeEi6qN1XWudt+HpWHYHyymg==",
       "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=="
-        }
+        "tslib": "^1.9.0"
       }
     },
-    "@nrwl/cli": {
-      "version": "8.5.2",
-      "resolved": "https://registry.npmjs.org/@nrwl/cli/-/cli-8.5.2.tgz",
-      "integrity": "sha512-4rEnQBnyhFWC7iKCYgdKUgZUifUSPBMwmzL2PWXvW+cuWHPDq1B40jEiBECZ2nZSxTJNYOxN6UifR3/6Mu9kaA==",
+    "@angular/compiler-cli": {
+      "version": "7.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-7.2.6.tgz",
+      "integrity": "sha512-sB0Bc5hE1zoXKwK4E9pC/UblCEHi3CwLBT/1nmVMYBdGzSSUxO4FaioJi+SCeGJJ+kk85Vny2up08gnupmLKqA==",
       "dev": true,
       "requires": {
-        "@nrwl/tao": "8.5.2",
-        "tmp": "0.0.33",
-        "yargs": "11.1.0",
-        "yargs-parser": "10.0.0"
+        "canonical-path": "1.0.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",
+        "shelljs": "^0.8.1",
+        "source-map": "^0.6.1",
+        "tslib": "^1.9.0",
+        "yargs": "9.0.1"
       },
       "dependencies": {
         "ansi-regex": {
@@ -1625,132 +790,156 @@
           "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==",
+        "chokidar": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.2.tgz",
+          "integrity": "sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==",
           "dev": true,
           "requires": {
-            "string-width": "2.1.1",
-            "strip-ansi": "4.0.0",
-            "wrap-ansi": "2.1.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.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=",
+        "cliui": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
           "dev": true,
           "requires": {
-            "lru-cache": "4.1.5",
-            "shebang-command": "1.2.0",
-            "which": "1.3.1"
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wrap-ansi": "^2.0.0"
+          },
+          "dependencies": {
+            "string-width": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+              "dev": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            }
           }
         },
-        "execa": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+        "load-json-file": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
           "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"
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^2.2.0",
+            "pify": "^2.0.0",
+            "strip-bom": "^3.0.0"
           }
         },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+        "mem": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
+          "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
           "dev": true,
           "requires": {
-            "locate-path": "2.0.0"
+            "mimic-fn": "^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=",
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "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=",
+        "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
         },
-        "locate-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+        "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": {
-            "p-locate": "2.0.0",
-            "path-exists": "3.0.0"
+            "execa": "^0.7.0",
+            "lcid": "^1.0.0",
+            "mem": "^1.1.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==",
+        "path-type": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
           "dev": true,
           "requires": {
-            "pseudomap": "1.0.2",
-            "yallist": "2.1.2"
+            "pify": "^2.0.0"
           }
         },
-        "mem": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-          "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
           "dev": true,
           "requires": {
-            "mimic-fn": "1.2.0"
+            "load-json-file": "^2.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^2.0.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==",
+        "read-pkg-up": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
           "dev": true,
           "requires": {
-            "execa": "0.7.0",
-            "lcid": "1.0.0",
-            "mem": "1.1.0"
+            "find-up": "^2.0.0",
+            "read-pkg": "^2.0.0"
           }
         },
-        "p-limit": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+        "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": {
-            "p-try": "1.0.0"
+            "graceful-fs": "^4.1.11",
+            "micromatch": "^3.1.10",
+            "readable-stream": "^2.0.2"
           }
         },
-        "p-locate": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+        "shelljs": {
+          "version": "0.8.3",
+          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz",
+          "integrity": "sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==",
           "dev": true,
           "requires": {
-            "p-limit": "1.3.0"
+            "glob": "^7.0.0",
+            "interpret": "^1.0.0",
+            "rechoir": "^0.6.2"
           }
         },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+        "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": {
@@ -1759,18 +948,32 @@
           "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": {
+            "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
+            },
+            "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"
+              }
+            }
           }
         },
-        "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"
-          }
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
         },
         "which-module": {
           "version": "2.0.0",
@@ -1784,341 +987,215 @@
           "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"
-              }
-            }
+          "version": "9.0.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz",
+          "integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^4.1.0",
+            "cliui": "^3.2.0",
+            "decamelize": "^1.1.1",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^2.0.0",
+            "read-pkg-up": "^2.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",
+            "yargs-parser": "^7.0.0"
           }
         },
         "yargs-parser": {
-          "version": "10.0.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.0.0.tgz",
-          "integrity": "sha512-+DHejWujTVYeMHLff8U96rLc4uE4Emncoftvn5AjhB1Jw1pWxLzgBUT/WYbPrHmy6YPEBTZQx5myHhVcuuu64g==",
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
+          "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
           "dev": true,
           "requires": {
-            "camelcase": "4.1.0"
+            "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==",
+    "@angular/core": {
+      "version": "7.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-7.2.6.tgz",
+      "integrity": "sha512-MZg17DWH1KUoDa9wFYK9Z+3F7DnUW2DjSwGyIi9U4cB54IWFhgt1JsA0mcuSYuRSRpvwaArCDC2AN90f+0/EFA==",
       "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=="
-        }
+        "tslib": "^1.9.0"
+      }
+    },
+    "@angular/flex-layout": {
+      "version": "7.0.0-beta.23",
+      "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-7.0.0-beta.23.tgz",
+      "integrity": "sha512-jH2i3i/M7SbK6scVlj2urVL5OhzwavbQ7KwvUjyc/UwccKnnzuOuWEGCINLja/aoaUO3I35LluCLv6a6VN0olA==",
+      "requires": {
+        "tslib": "^1.7.1"
+      }
+    },
+    "@angular/forms": {
+      "version": "7.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.2.6.tgz",
+      "integrity": "sha512-At72AJNGe+Zzmryb7DDIG+iws7zKdgZx/eEVjZ/Obu/yREefbZY4R7q83U90Vljtn97BwJPx9ur9ttxE9WpnlA==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "@angular/http": {
+      "version": "7.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.6.tgz",
+      "integrity": "sha512-B5TC8JFW/I+ms5iJthGjf/eg1tKKqpO6yrOpDSQofHG7Dd4dozyGXGznFJTRFfNda5rku61/qnQaa8SyQyuplQ==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "@angular/language-service": {
+      "version": "7.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-7.2.6.tgz",
+      "integrity": "sha512-iFKgaat5MZlixsO5dqy1Km3tb4q3iAU+ZPMJCk7DN419aizF38UFnQY1gCYkw3dxZLZGIkXnwy8szGXUEhra/A==",
+      "dev": true
+    },
+    "@angular/material": {
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/@angular/material/-/material-7.3.3.tgz",
+      "integrity": "sha512-DZdJaVpXsd5QlfpN5P871llw8AKh5QvRiyro3QRmEajYN85Xiawqpbt7O60TrwcFM6DzYLI3UeyWq8LFdmi/+Q==",
+      "requires": {
+        "tslib": "^1.7.1"
+      }
+    },
+    "@angular/material-moment-adapter": {
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-7.3.3.tgz",
+      "integrity": "sha512-Fp2EcFpwdwa5qWWBa7G1mJZuaQ3oD3pohyo04HD2ud8YFP5IPbeoHVc65JC7TIwQFbVKk0lojXK3b2vQXZOapw==",
+      "requires": {
+        "tslib": "^1.7.1"
+      }
+    },
+    "@angular/platform-browser": {
+      "version": "7.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.2.6.tgz",
+      "integrity": "sha512-VE4yS4l8Cdx6DlvrbOFOZDKmQuyz1RhVcshgSt9hKlkehvAXMtX8Sqnp6po7z0aPykTh0TZZtMtLEerkFEe+DA==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "@angular/platform-browser-dynamic": {
+      "version": "7.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.6.tgz",
+      "integrity": "sha512-/co/q4v11nKin2MFscCMZyixbW103I2FxbPgCAYBN5NSvfIwTrt5J6xWmDoKJ8HkZBqL3R9B+uhYdzsRN/pQxg==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "@angular/platform-server": {
+      "version": "7.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-7.2.6.tgz",
+      "integrity": "sha512-rtLT0BxgEGJDYGMeFNYfna3H91JITFfm4Qd86nH7EmR1mVWa563lSQle1VWwbQhRbj5fDhwt+anbVwz7SEn7ew==",
+      "requires": {
+        "domino": "^2.1.0",
+        "tslib": "^1.9.0",
+        "xhr2": "^0.1.4"
+      }
+    },
+    "@angular/router": {
+      "version": "7.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-7.2.6.tgz",
+      "integrity": "sha512-ayMVor4Mu4wk7JKpt51UxHovnLB4munZ8ELR1CA4w+s0rJsSSwyB4WXElC+DbgCyl7BYLAaGui2c5DbTAJ9jlw==",
+      "requires": {
+        "tslib": "^1.9.0"
       }
     },
-    "@nrwl/jest": {
-      "version": "8.5.2",
-      "resolved": "https://registry.npmjs.org/@nrwl/jest/-/jest-8.5.2.tgz",
-      "integrity": "sha512-jLPG8dJlEXVFLFFBORB0v2JPPW5mM4bIbWj/cWMJx5iWMI+ITJoG+5lGl8zKwCqBytuXzFDoCdfsfacLuVvp7A==",
+    "@mrmlnc/readdir-enhanced": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
+      "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
+      "dev": true,
       "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=="
-        }
+        "call-me-maybe": "^1.0.1",
+        "glob-to-regexp": "^0.3.0"
       }
     },
-    "@nrwl/tao": {
-      "version": "8.5.2",
-      "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-8.5.2.tgz",
-      "integrity": "sha512-nZq9k5YPO6N7uEDEt4T0f0Ai1gI5mWIUOjt5ey8oSKCaac4p8uHloGKbqEGS0zS23hBLOMPgXg+852XSfDW/pw==",
+    "@ngrx/effects": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-7.2.0.tgz",
+      "integrity": "sha512-vymKSoubYlUWGbiclPK0N/LwB409sB9atjSTQRy2EisZfFtQ2tCDqmk4JGgDy/gV9SqZWrwPSy1xXsLqYnyN3g=="
+    },
+    "@ngrx/router-store": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-7.2.0.tgz",
+      "integrity": "sha512-deXDZg4FffuqxlFXqAaR8+lEy4yCJgTmKn2avKHltF3GP+8bxIRiD6GDCYjYJVhLFiBK8U3AFhgfoEuUUpFCag=="
+    },
+    "@ngrx/store": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-7.2.0.tgz",
+      "integrity": "sha512-E9c0cDot0HeE0mXyeqw18SwmJ2+eKnA5mMMfwvoskpMInCYGI2pq1i6/lCVQ2wrEHSH+KvObK4PQbepcA9vP+w=="
+    },
+    "@ngrx/store-devtools": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-7.2.0.tgz",
+      "integrity": "sha512-t+8K1IG8+MvFqLIuRSM+ZE1EkZIuUExJ0JsqZR4r4K3MRPRoGy1ZqlStBWYaYLumEToesiCOGxuJYQ4zyVwlZg=="
+    },
+    "@ngtools/json-schema": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@ngtools/json-schema/-/json-schema-1.1.0.tgz",
+      "integrity": "sha1-w6DFRNYjkqzCgTpCyKDcb1j4aSI=",
+      "dev": true
+    },
+    "@ngtools/webpack": {
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.3.2.tgz",
+      "integrity": "sha512-q98nt7HUTcdEtP+aJjsm5HUMDL+BXwLz80TthtFlu/f7JYdKxMSWZRHEv+q8Rs69pWMpwxj8RuHm8XiKD/8Cpg==",
       "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"
+        "@angular-devkit/core": "7.3.2",
+        "enhanced-resolve": "4.1.0",
+        "rxjs": "6.3.3",
+        "tree-kill": "1.2.1",
+        "webpack-sources": "1.3.0"
       },
       "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==",
+          "version": "6.3.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
           "dev": true,
           "requires": {
-            "tslib": "1.10.0"
+            "tslib": "^1.9.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==",
+    "@nodelib/fs.stat": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.2.tgz",
+      "integrity": "sha512-yprFYuno9FtNsSHVlSWd+nRlmGoAbqbeCwOryP6sC/zoCjhpArcRMYp19EvpSUSizJAlsXEwJv+wcWS9XaXdMw==",
+      "dev": true
+    },
+    "@nrwl/schematics": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@nrwl/schematics/-/schematics-7.6.0.tgz",
+      "integrity": "sha512-rt+YzuNpmVGIt5agPM5Z61cMaSLRmEcpiI4HdVL8eOBw7HicVk2N894rHbQdU3/LHZUt592zq8Z7jOFUtbV3JQ==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "8.3.3",
-        "@angular-devkit/schematics": "8.3.3",
-        "@nrwl/cli": "8.5.2",
-        "chalk": "2.4.2",
+        "@types/yargs": "^11.0.0",
+        "app-root-path": "^2.0.1",
         "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",
+        "opn": "^5.3.0",
+        "rxjs": "6.3.3",
         "semver": "5.4.1",
         "strip-json-comments": "2.0.1",
         "tmp": "0.0.33",
-        "viz.js": "1.8.2",
-        "yargs": "11.1.0",
+        "viz.js": "^1.8.1",
+        "yargs": "^11.0.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",
@@ -2137,56 +1214,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"
-          }
-        },
-        "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"
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
           }
         },
         "fs-extra": {
@@ -2195,17 +1225,11 @@
           "integrity": "sha512-lk2cUCo8QzbiEWEbt7Cw3m27WMiRG321xsssbcIpfMhpRjrlC08WBOVQqj1/nQYYNnPtyIhP1oqLO3QwT2tPCw==",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.2.2",
-            "jsonfile": "4.0.0",
-            "universalify": "0.1.2"
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.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
-        },
         "ignore": {
           "version": "5.0.4",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.0.4.tgz",
@@ -2218,24 +1242,13 @@
           "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==",
+        "jsonfile": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
           "dev": true,
           "requires": {
-            "pseudomap": "1.0.2",
-            "yallist": "2.1.2"
+            "graceful-fs": "^4.1.6"
           }
         },
         "mem": {
@@ -2244,58 +1257,27 @@
           "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
           "dev": true,
           "requires": {
-            "mimic-fn": "1.2.0"
+            "mimic-fn": "^1.0.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"
+            "execa": "^0.7.0",
+            "lcid": "^1.0.0",
+            "mem": "^1.1.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=",
+        "rxjs": {
+          "version": "6.3.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
           "dev": true,
           "requires": {
-            "error-ex": "1.3.2",
-            "json-parse-better-errors": "1.0.2"
+            "tslib": "^1.9.0"
           }
         },
         "semver": {
@@ -2304,20 +1286,14 @@
           "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"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
           }
         },
         "strip-ansi": {
@@ -2326,9 +1302,15 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "3.0.0"
+            "ansi-regex": "^3.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
+        },
         "which-module": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
@@ -2341,30 +1323,24 @@
           "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",
+          "resolved": "http://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"
+            "cliui": "^4.0.0",
+            "decamelize": "^1.1.1",
+            "find-up": "^2.1.0",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^2.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",
+            "yargs-parser": "^9.0.2"
           },
           "dependencies": {
             "yargs-parser": {
@@ -2373,114 +1349,269 @@
               "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
               "dev": true,
               "requires": {
-                "camelcase": "4.1.0"
+                "camelcase": "^4.1.0"
               }
             }
           }
         },
         "yargs-parser": {
           "version": "10.0.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.0.0.tgz",
+          "resolved": "http://registry.npmjs.org/yargs-parser/-/yargs-parser-10.0.0.tgz",
           "integrity": "sha512-+DHejWujTVYeMHLff8U96rLc4uE4Emncoftvn5AjhB1Jw1pWxLzgBUT/WYbPrHmy6YPEBTZQx5myHhVcuuu64g==",
           "dev": true,
           "requires": {
-            "camelcase": "4.1.0"
+            "camelcase": "^4.1.0"
           }
         }
       }
     },
     "@schematics/angular": {
-      "version": "8.3.7",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.7.tgz",
-      "integrity": "sha512-RsUZofittMe+o8AGi2wbrWb10Avurl2VgDqlINF0fAEfdxzmjvNwXkP4IdAo5wsGl2URrxnJWeRP6geBqgueZQ==",
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.2.tgz",
+      "integrity": "sha512-ClqG1qA919QqsikIXIP/jKl2Boj70lihCbpXhZgjsahLY8UJgq9oh8K1QuvYJtz4AI4GADfG1fGzPdYfy94+kg==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "8.3.7",
-        "@angular-devkit/schematics": "8.3.7"
+        "@angular-devkit/core": "7.3.2",
+        "@angular-devkit/schematics": "7.3.2",
+        "typescript": "3.2.4"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.9.1",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+          "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
+          "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"
+          }
+        },
+        "chokidar": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+          "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+          "requires": {
+            "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"
+          }
+        },
+        "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="
+        },
+        "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=="
+        },
+        "rxjs": {
+          "version": "6.3.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+          "requires": {
+            "tslib": "^1.9.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=="
+        },
+        "typescript": {
+          "version": "3.2.4",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz",
+          "integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==",
+          "dev": true
+        },
+        "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==",
+          "requires": {
+            "punycode": "^2.1.0"
+          }
+        }
       }
     },
     "@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==",
+      "version": "0.13.2",
+      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.13.2.tgz",
+      "integrity": "sha512-w3ONb59VXN/ypEvi6IlLhuHAAgmtJwrnuZ5I7hPzDJYSuajGjwO238/HZvUeh+R/ttyq9RSFi/0SQJpi7b4yvw==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "8.3.7",
-        "@angular-devkit/schematics": "8.3.7",
+        "@angular-devkit/core": "7.3.2",
+        "@angular-devkit/schematics": "7.3.2",
         "@yarnpkg/lockfile": "1.1.0",
         "ini": "1.3.5",
-        "pacote": "9.5.5",
-        "rxjs": "6.4.0",
-        "semver": "6.3.0",
+        "pacote": "9.4.0",
+        "rxjs": "6.3.3",
+        "semver": "5.6.0",
         "semver-intersect": "1.4.0"
       },
       "dependencies": {
+        "ajv": {
+          "version": "6.9.1",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+          "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
+          "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"
+          }
+        },
+        "chokidar": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+          "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+          "requires": {
+            "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"
+          }
+        },
+        "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="
+        },
+        "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=="
+        },
         "rxjs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
+          "version": "6.3.3",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
           "dev": true,
           "requires": {
-            "tslib": "1.10.0"
+            "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": "5.6.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
           "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=="
+        },
+        "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==",
+          "requires": {
+            "punycode": "^2.1.0"
+          }
         }
       }
     },
-    "@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.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"
-      }
-    },
-    "@szmarczak/http-timer": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
-      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
-      "dev": true,
-      "requires": {
-        "defer-to-connect": "1.0.2"
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-10.1.0.tgz",
+      "integrity": "sha512-0nZ3ub5o/qQfFMz+av89u/VKqsqiVhPFBDDOOPq2qimP83i+pcb0i3MEao7PSxIbKAEkL/pwRcEJw4KDZ8B67w==",
+      "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"
+      }
+    },
+    "@swimlane/ngx-graph": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@swimlane/ngx-graph/-/ngx-graph-6.2.0.tgz",
+      "integrity": "sha512-SiWd5iV6B1pTITlzMnbqav9XTmtaRgQJfROwqIZVEkliXzpyDC7VwTKE07C/5IK4oyWAAU5+v9fgBYGo0rud5Q==",
+      "requires": {
+        "@swimlane/ngx-charts": "^12.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",
+        "tslib": "^1.9.0",
+        "webcola": "^3.3.8"
+      },
+      "dependencies": {
+        "@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"
+          }
+        },
+        "d3-ease": {
+          "version": "1.0.6",
+          "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.6.tgz",
+          "integrity": "sha512-SZ/lVU7LRXafqp7XtIcBdxnWl8yyLpgOmzAk0mWBI9gXNzLDx5ybZgnRbH9dN/yY5tzVBqCQ9avltSnqVwessQ=="
+        }
       }
     },
     "@tweenjs/tween.js": {
-      "version": "17.4.0",
-      "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-17.4.0.tgz",
-      "integrity": "sha512-J3fzl1F6wvh8KXVVcIuHN12xi1ZDcPA/0Vix+ZcJYwZWVHUwfIqfvzYXXEw7ybeev6477KCTt9fKydU+ajUqcg=="
+      "version": "17.2.0",
+      "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-17.2.0.tgz",
+      "integrity": "sha1-IfibcJuvxLMDra56g7TzWg2eR5Y="
     },
     "@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.25",
+      "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.25.tgz",
+      "integrity": "sha512-yfhIBix+AIFTmYGtkC0Bi+XGjSkOINykqKvO/Wqdz/DuXlAKK7HmhLAXdPIGsV4xzKcL3ev/zYc4yLNo+OvGaw==",
       "dev": true
     },
     "@types/caseless": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz",
-      "integrity": "sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==",
+      "version": "0.12.1",
+      "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.1.tgz",
+      "integrity": "sha512-FhlMa34NHp9K5MY1Uz8yb+ZvuX0pnvn3jScRSNAb75KHGB8d3rEU6hqMs3Z2vjuytcMfRg6c5CHMc3wtYyD2/A==",
       "dev": true
     },
     "@types/circular-json": {
@@ -2494,52 +1625,39 @@
       "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
       "dev": true
     },
-    "@types/events": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
-      "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
-      "dev": true
-    },
-    "@types/glob": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
-      "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
+    "@types/form-data": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz",
+      "integrity": "sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ==",
       "dev": true,
       "requires": {
-        "@types/events": "3.0.0",
-        "@types/minimatch": "3.0.3",
-        "@types/node": "12.7.9"
+        "@types/node": "*"
       }
     },
     "@types/jasmine": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.4.2.tgz",
-      "integrity": "sha512-SaSSGOzwUnBEn64c+HTyVTJhRf8F1CXZLnxYx2ww3UrgGBmEEw38RSux2l3fYiT9brVLP67DU5omWA6V9OHI5Q==",
+      "version": "2.8.7",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.8.7.tgz",
+      "integrity": "sha512-RdbrPcW1aD78UmdLiDa9ZCKrbR5Go8PXh6GCpb4oIOkWVEusubSJJDrP4c5RYOu8m/CBz+ygZpicj6Pgms5a4Q==",
       "dev": true
     },
     "@types/jasminewd2": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.8.tgz",
-      "integrity": "sha512-d9p31r7Nxk0ZH0U39PTH0hiDlJ+qNVGjlt1ucOoTUptxb2v+Y5VMnsxfwN+i3hK4yQnqBi3FMmoMFcd1JHDxdg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.3.tgz",
+      "integrity": "sha512-hYDVmQZT5VA2kigd4H4bv7vl/OhlympwREUemqBdOqtrYTo5Ytm12a5W5/nGgGYdanGVxj0x/VhZ7J3hOg/YKg==",
       "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==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/karma/-/karma-3.0.2.tgz",
+      "integrity": "sha512-xm+iMKgLSpTPo1Z7wLKbrZt8aLzA1udb9UOb9+OSDMFIufqlbp0DXQpY75EQ3ETi6EJiaohIodBlMs+UD4NSMQ==",
       "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": {
@@ -2547,12 +1665,6 @@
       "resolved": "https://registry.npmjs.org/@types/marked/-/marked-0.6.5.tgz",
       "integrity": "sha512-6kBKf64aVfx93UJrcyEZ+OBM5nGv4RLsI6sR1Ar34bpgvGVRoyTgpxn4ZmtxOM5aDTAaaznYuYUH8bUX3Nk3YA=="
     },
-    "@types/minimatch": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
-      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
-      "dev": true
-    },
     "@types/moment-timezone": {
       "version": "0.5.12",
       "resolved": "https://registry.npmjs.org/@types/moment-timezone/-/moment-timezone-0.5.12.tgz",
@@ -2562,15 +1674,9 @@
       }
     },
     "@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==",
-      "dev": true
-    },
-    "@types/normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+      "version": "11.9.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-11.9.4.tgz",
+      "integrity": "sha512-Zl8dGvAcEmadgs1tmSPcvwzO1YRsz38bVJQvH1RvRqSR9/5n61Q1ktcDL0ht3FXWR+ZpVmXVwN1LuH4Ax23NsA==",
       "dev": true
     },
     "@types/q": {
@@ -2580,37 +1686,15 @@
       "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==",
-      "dev": true,
-      "requires": {
-        "@types/caseless": "0.12.2",
-        "@types/node": "12.7.9",
-        "@types/tough-cookie": "2.3.5",
-        "form-data": "2.5.1"
-      },
-      "dependencies": {
-        "form-data": {
-          "version": "2.5.1",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
-          "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
-          "dev": true,
-          "requires": {
-            "asynckit": "0.4.0",
-            "combined-stream": "1.0.8",
-            "mime-types": "2.1.24"
-          }
-        }
-      }
-    },
-    "@types/resolve": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz",
-      "integrity": "sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==",
+      "version": "2.48.1",
+      "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.1.tgz",
+      "integrity": "sha512-ZgEZ1TiD+KGA9LiAAPPJL68Id2UWfeSO62ijSXZjFJArVV+2pKcsVHmrcu+1oiE3q6eDGiFiSolRc4JHoerBBg==",
       "dev": true,
       "requires": {
-        "@types/node": "12.7.9"
+        "@types/caseless": "*",
+        "@types/form-data": "*",
+        "@types/node": "*",
+        "@types/tough-cookie": "*"
       }
     },
     "@types/selenium-webdriver": {
@@ -2655,180 +1739,182 @@
         }
       }
     },
+    "@types/yargs": {
+      "version": "11.1.2",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-11.1.2.tgz",
+      "integrity": "sha512-zG61PAp2OcoIBjRV44wftJj6AJgzJrOc32LCYOBqk9bdgcdzK5DCJHV9QZJ60+Fu+fOn79g8Ks3Gixm4CfkZ+w==",
+      "dev": true
+    },
     "@webassemblyjs/ast": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
-      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
+      "version": "1.7.11",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.11.tgz",
+      "integrity": "sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/helper-module-context": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/wast-parser": "1.8.5"
+        "@webassemblyjs/helper-module-context": "1.7.11",
+        "@webassemblyjs/helper-wasm-bytecode": "1.7.11",
+        "@webassemblyjs/wast-parser": "1.7.11"
       }
     },
     "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
-      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
+      "version": "1.7.11",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz",
+      "integrity": "sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==",
       "dev": true
     },
     "@webassemblyjs/helper-api-error": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
-      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
+      "version": "1.7.11",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz",
+      "integrity": "sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==",
       "dev": true
     },
     "@webassemblyjs/helper-buffer": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
-      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
+      "version": "1.7.11",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz",
+      "integrity": "sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==",
       "dev": true
     },
     "@webassemblyjs/helper-code-frame": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
-      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
+      "version": "1.7.11",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz",
+      "integrity": "sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/wast-printer": "1.8.5"
+        "@webassemblyjs/wast-printer": "1.7.11"
       }
     },
     "@webassemblyjs/helper-fsm": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
-      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
+      "version": "1.7.11",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz",
+      "integrity": "sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==",
       "dev": true
     },
     "@webassemblyjs/helper-module-context": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
-      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "mamacro": "0.0.3"
-      }
+      "version": "1.7.11",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz",
+      "integrity": "sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==",
+      "dev": true
     },
     "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
-      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
+      "version": "1.7.11",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz",
+      "integrity": "sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==",
       "dev": true
     },
     "@webassemblyjs/helper-wasm-section": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
-      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
+      "version": "1.7.11",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz",
+      "integrity": "sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5"
+        "@webassemblyjs/ast": "1.7.11",
+        "@webassemblyjs/helper-buffer": "1.7.11",
+        "@webassemblyjs/helper-wasm-bytecode": "1.7.11",
+        "@webassemblyjs/wasm-gen": "1.7.11"
       }
     },
     "@webassemblyjs/ieee754": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
-      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
+      "version": "1.7.11",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz",
+      "integrity": "sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==",
       "dev": true,
       "requires": {
-        "@xtuc/ieee754": "1.2.0"
+        "@xtuc/ieee754": "^1.2.0"
       }
     },
     "@webassemblyjs/leb128": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
-      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
+      "version": "1.7.11",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.7.11.tgz",
+      "integrity": "sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==",
       "dev": true,
       "requires": {
-        "@xtuc/long": "4.2.2"
+        "@xtuc/long": "4.2.1"
       }
     },
     "@webassemblyjs/utf8": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
-      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
+      "version": "1.7.11",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.7.11.tgz",
+      "integrity": "sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==",
       "dev": true
     },
     "@webassemblyjs/wasm-edit": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
-      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
+      "version": "1.7.11",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz",
+      "integrity": "sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/helper-wasm-section": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5",
-        "@webassemblyjs/wasm-opt": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5",
-        "@webassemblyjs/wast-printer": "1.8.5"
+        "@webassemblyjs/ast": "1.7.11",
+        "@webassemblyjs/helper-buffer": "1.7.11",
+        "@webassemblyjs/helper-wasm-bytecode": "1.7.11",
+        "@webassemblyjs/helper-wasm-section": "1.7.11",
+        "@webassemblyjs/wasm-gen": "1.7.11",
+        "@webassemblyjs/wasm-opt": "1.7.11",
+        "@webassemblyjs/wasm-parser": "1.7.11",
+        "@webassemblyjs/wast-printer": "1.7.11"
       }
     },
     "@webassemblyjs/wasm-gen": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
-      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
+      "version": "1.7.11",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz",
+      "integrity": "sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/ieee754": "1.8.5",
-        "@webassemblyjs/leb128": "1.8.5",
-        "@webassemblyjs/utf8": "1.8.5"
+        "@webassemblyjs/ast": "1.7.11",
+        "@webassemblyjs/helper-wasm-bytecode": "1.7.11",
+        "@webassemblyjs/ieee754": "1.7.11",
+        "@webassemblyjs/leb128": "1.7.11",
+        "@webassemblyjs/utf8": "1.7.11"
       }
     },
     "@webassemblyjs/wasm-opt": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
-      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
+      "version": "1.7.11",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz",
+      "integrity": "sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5"
+        "@webassemblyjs/ast": "1.7.11",
+        "@webassemblyjs/helper-buffer": "1.7.11",
+        "@webassemblyjs/wasm-gen": "1.7.11",
+        "@webassemblyjs/wasm-parser": "1.7.11"
       }
     },
     "@webassemblyjs/wasm-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
-      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
+      "version": "1.7.11",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz",
+      "integrity": "sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-api-error": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/ieee754": "1.8.5",
-        "@webassemblyjs/leb128": "1.8.5",
-        "@webassemblyjs/utf8": "1.8.5"
+        "@webassemblyjs/ast": "1.7.11",
+        "@webassemblyjs/helper-api-error": "1.7.11",
+        "@webassemblyjs/helper-wasm-bytecode": "1.7.11",
+        "@webassemblyjs/ieee754": "1.7.11",
+        "@webassemblyjs/leb128": "1.7.11",
+        "@webassemblyjs/utf8": "1.7.11"
       }
     },
     "@webassemblyjs/wast-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
-      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
+      "version": "1.7.11",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz",
+      "integrity": "sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
-        "@webassemblyjs/helper-api-error": "1.8.5",
-        "@webassemblyjs/helper-code-frame": "1.8.5",
-        "@webassemblyjs/helper-fsm": "1.8.5",
-        "@xtuc/long": "4.2.2"
+        "@webassemblyjs/ast": "1.7.11",
+        "@webassemblyjs/floating-point-hex-parser": "1.7.11",
+        "@webassemblyjs/helper-api-error": "1.7.11",
+        "@webassemblyjs/helper-code-frame": "1.7.11",
+        "@webassemblyjs/helper-fsm": "1.7.11",
+        "@xtuc/long": "4.2.1"
       }
     },
     "@webassemblyjs/wast-printer": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
-      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
+      "version": "1.7.11",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz",
+      "integrity": "sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/wast-parser": "1.8.5",
-        "@xtuc/long": "4.2.2"
+        "@webassemblyjs/ast": "1.7.11",
+        "@webassemblyjs/wast-parser": "1.7.11",
+        "@xtuc/long": "4.2.1"
       }
     },
     "@xtuc/ieee754": {
@@ -2838,9 +1924,9 @@
       "dev": true
     },
     "@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.1.tgz",
+      "integrity": "sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==",
       "dev": true
     },
     "@yarnpkg/lockfile": {
@@ -2860,25 +1946,31 @@
       }
     },
     "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": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
+      "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
       "dev": true,
       "requires": {
-        "mime-types": "2.1.24",
-        "negotiator": "0.6.2"
+        "mime-types": "~2.1.18",
+        "negotiator": "0.6.1"
       }
     },
     "acorn": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
-      "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.0.tgz",
+      "integrity": "sha512-MW/FjM+IvU9CgBzjO3UIPCE2pyEwUsoFl+VGdczOPEdxfGFjuKny/gN54mOuX7Qxmb9Rg9MCn2oKiSUeW+pjrw==",
+      "dev": true
+    },
+    "acorn-dynamic-import": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz",
+      "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==",
       "dev": true
     },
     "acorn-jsx": {
@@ -2911,12 +2003,12 @@
       "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": "4.2.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.0.tgz",
+      "integrity": "sha512-c+R/U5X+2zz2+UCrCFv6odQzJdoqI+YecuhnAJLa1zYaMc13zPfwMwZrr91Pd1DYNo/yPRbiM4WVf9whgwFsIg==",
       "dev": true,
       "requires": {
-        "es6-promisify": "5.0.0"
+        "es6-promisify": "^5.0.0"
       }
     },
     "agentkeepalive": {
@@ -2938,6 +2030,20 @@
         "fast-json-stable-stringify": "^2.0.0",
         "json-schema-traverse": "^0.4.1",
         "uri-js": "^4.2.2"
+      },
+      "dependencies": {
+        "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
+        },
+        "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
+        }
       }
     },
     "ajv-errors": {
@@ -2947,9 +2053,9 @@
       "dev": true
     },
     "ajv-keywords": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
-      "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.0.tgz",
+      "integrity": "sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==",
       "dev": true
     },
     "amdefine": {
@@ -2959,32 +2065,26 @@
       "dev": true
     },
     "angular2-virtual-scroll": {
-      "version": "0.4.16",
-      "resolved": "https://registry.npmjs.org/angular2-virtual-scroll/-/angular2-virtual-scroll-0.4.16.tgz",
-      "integrity": "sha512-6NWk0DjCh4ebU8+LgfBoKYyp3McxDA/k5vTnEiV32VpVnyhN//eThZpVpggI1D2fJBqgTAY09C8v++qXHHLP7A==",
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/angular2-virtual-scroll/-/angular2-virtual-scroll-0.3.2.tgz",
+      "integrity": "sha512-eyPb6FnaA8d4lBh3v31F3YLLblr9Nn8zv25uKVmxPkA2/te6QDg0sPMqy6o8GouwW+U9LKzcUJZZBHa0ICY/rg==",
       "requires": {
-        "@tweenjs/tween.js": "17.4.0"
+        "@tweenjs/tween.js": "^17.1.0"
       }
     },
     "ansi-align": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
-      "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
+      "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=",
       "dev": true,
       "requires": {
-        "string-width": "3.1.0"
+        "string-width": "^2.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==",
-          "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==",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
           "dev": true
         },
         "is-fullwidth-code-point": {
@@ -2994,42 +2094,50 @@
           "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": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "emoji-regex": "7.0.3",
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "5.2.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.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": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "4.1.0"
+            "ansi-regex": "^3.0.0"
           }
         }
       }
     },
     "ansi-colors": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
-      "dev": true
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+      "dev": true,
+      "requires": {
+        "ansi-wrap": "^0.1.0"
+      }
     },
-    "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==",
+    "ansi-cyan": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
+      "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=",
       "dev": true,
       "requires": {
-        "type-fest": "0.5.2"
+        "ansi-wrap": "0.1.0"
       }
     },
+    "ansi-escapes": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
+      "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=",
+      "dev": true
+    },
     "ansi-gray": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
@@ -3045,15 +2153,26 @@
       "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
       "dev": true
     },
+    "ansi-red": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
+      "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=",
+      "dev": true,
+      "requires": {
+        "ansi-wrap": "0.1.0"
+      }
+    },
     "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,9 +2193,9 @@
       }
     },
     "app-root-path": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.2.1.tgz",
-      "integrity": "sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.1.0.tgz",
+      "integrity": "sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo=",
       "dev": true
     },
     "append-buffer": {
@@ -3088,15 +2207,6 @@
         "buffer-equal": "^1.0.0"
       }
     },
-    "append-transform": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz",
-      "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=",
-      "dev": true,
-      "requires": {
-        "default-require-extensions": "1.0.0"
-      }
-    },
     "aproba": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
@@ -3109,11 +2219,15 @@
       "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
       "dev": true
     },
-    "arg": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.1.tgz",
-      "integrity": "sha512-SlmP3fEA88MBv0PypnXZ8ZfJhwmDeIE3SP71j37AiXQBXYosPV0x6uISAaHYSlSVhmHOVkomen0tbGk6Anlebw==",
-      "dev": 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,
+      "requires": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^2.0.6"
+      }
     },
     "argparse": {
       "version": "1.0.10",
@@ -3130,16 +2244,6 @@
       "integrity": "sha1-7L0W+JSbFXGDcRsb2jNPN4QBhas=",
       "dev": true
     },
-    "aria-query": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz",
-      "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=",
-      "dev": true,
-      "requires": {
-        "ast-types-flow": "0.0.7",
-        "commander": "2.20.0"
-      }
-    },
     "arr-diff": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
@@ -3179,6 +2283,18 @@
       "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
       "dev": true
     },
+    "array-filter": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz",
+      "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw=",
+      "dev": true
+    },
+    "array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+      "dev": true
+    },
     "array-flatten": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
@@ -3220,6 +2336,18 @@
         }
       }
     },
+    "array-map": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
+      "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI=",
+      "dev": true
+    },
+    "array-reduce": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz",
+      "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=",
+      "dev": true
+    },
     "array-slice": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
@@ -3284,13 +2412,10 @@
       "dev": true
     },
     "asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "dev": true,
-      "requires": {
-        "safer-buffer": "2.1.2"
-      }
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+      "dev": true
     },
     "asn1.js": {
       "version": "4.10.1",
@@ -3304,30 +2429,12 @@
       }
     },
     "assert": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
+      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
       "dev": true,
       "requires": {
-        "object-assign": "4.1.1",
         "util": "0.10.3"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-          "dev": true
-        },
-        "util": {
-          "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.1"
-          }
-        }
       }
     },
     "assert-plus": {
@@ -3341,20 +2448,11 @@
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
     },
-    "ast-types-flow": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-      "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
-      "dev": true
-    },
     "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
-      "dev": true,
-      "requires": {
-        "lodash": "4.17.15"
-      }
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+      "dev": true
     },
     "async-array-reduce": {
       "version": "0.2.1",
@@ -3363,21 +2461,35 @@
       "dev": true
     },
     "async-done": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
-      "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.1.tgz",
+      "integrity": "sha512-R1BaUeJ4PMoLNJuk+0tLJgjmEqVsdN118+Z8O+alhnQDQgy0kmD5Mqi0DNEmMx2LM0Ed5yekKu+ZXYvIHceicg==",
       "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": "^1.0.7",
+        "stream-exhaust": "^1.0.1"
+      },
+      "dependencies": {
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+          "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+          "dev": true
+        }
       }
     },
     "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=="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
+      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0="
+    },
+    "async-foreach": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
+      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
+      "dev": true
     },
     "async-limiter": {
       "version": "1.0.1",
@@ -3401,23 +2513,22 @@
       "dev": true
     },
     "atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz",
+      "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio="
     },
     "autoprefixer": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.1.tgz",
-      "integrity": "sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==",
+      "version": "9.4.6",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.4.6.tgz",
+      "integrity": "sha512-Yp51mevbOEdxDUy5WjiKtpQaecqYq9OqZSL04rSoCiry7Tc5I9FEyo3bfxiTJc1DfHeKwSFCUYbBAiOQ2VGfiw==",
       "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.4.1",
+        "caniuse-lite": "^1.0.30000929",
+        "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "postcss": "^7.0.13",
+        "postcss-value-parser": "^3.3.1"
       }
     },
     "aws-sign2": {
@@ -3432,19 +2543,11 @@
       "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
       "dev": true
     },
-    "axobject-query": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz",
-      "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==",
-      "dev": true,
-      "requires": {
-        "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=",
+      "dev": true,
       "requires": {
         "chalk": "^1.1.3",
         "esutils": "^2.0.2",
@@ -3454,12 +2557,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",
@@ -3468,15 +2573,11 @@
             "supports-color": "^2.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="
-        },
         "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
         }
       }
     },
@@ -3496,10 +2597,10 @@
         "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=",
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
           "dev": true
         },
         "source-map": {
@@ -3510,37 +2611,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",
@@ -3550,14 +2620,6 @@
         "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",
-      "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==",
-      "requires": {
-        "object.assign": "4.1.0"
-      }
-    },
     "babel-runtime": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
@@ -3566,20 +2628,6 @@
       "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": {
@@ -3622,6 +2670,14 @@
         "esutils": "^2.0.2",
         "lodash": "^4.17.4",
         "to-fast-properties": "^1.0.3"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "dev": true
+        }
       }
     },
     "babylon": {
@@ -3715,9 +2771,9 @@
       "dev": true
     },
     "base64-js": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
       "dev": true
     },
     "base64id": {
@@ -3733,12 +2789,13 @@
       "dev": true
     },
     "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
       "dev": true,
+      "optional": true,
       "requires": {
-        "tweetnacl": "0.14.5"
+        "tweetnacl": "^0.14.3"
       }
     },
     "better-assert": {
@@ -3753,12 +2810,13 @@
     "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=="
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz",
+      "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU="
     },
     "blob": {
       "version": "0.0.5",
@@ -3766,6 +2824,15 @@
       "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==",
       "dev": true
     },
+    "block-stream": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+      "dev": true,
+      "requires": {
+        "inherits": "~2.0.0"
+      }
+    },
     "blocking-proxy": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/blocking-proxy/-/blocking-proxy-1.0.1.tgz",
@@ -3773,12 +2840,20 @@
       "dev": true,
       "requires": {
         "minimist": "^1.2.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
       }
     },
     "bluebird": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.0.tgz",
-      "integrity": "sha512-aBQ1FxIa7kSWCcmKHlcHFlT2jt6J/l4FzC7KcPELkOJOsPOb/bccdhmIrKDfXhwFrmc7vDoDrrepFvGqjyXGJg==",
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
+      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
       "dev": true
     },
     "bn.js": {
@@ -3788,34 +2863,31 @@
       "dev": true
     },
     "body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "version": "1.18.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz",
+      "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=",
       "dev": true,
       "requires": {
-        "bytes": "3.1.0",
-        "content-type": "1.0.4",
+        "bytes": "3.0.0",
+        "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "1.1.2",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "on-finished": "2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "1.6.18"
+        "depd": "~1.1.2",
+        "http-errors": "~1.6.3",
+        "iconv-lite": "0.4.23",
+        "on-finished": "~2.3.0",
+        "qs": "6.5.2",
+        "raw-body": "2.3.3",
+        "type-is": "~1.6.16"
       },
       "dependencies": {
-        "bytes": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-          "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
-          "dev": true
-        },
-        "qs": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-          "dev": true
+        "iconv-lite": {
+          "version": "0.4.23",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
+          "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+          "dev": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
         }
       }
     },
@@ -3834,31 +2906,30 @@
       }
     },
     "boxen": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/boxen/-/boxen-3.2.0.tgz",
-      "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"
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz",
+      "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
+      "dev": true,
+      "requires": {
+        "ansi-align": "^2.0.0",
+        "camelcase": "^4.0.0",
+        "chalk": "^2.0.1",
+        "cli-boxes": "^1.0.0",
+        "string-width": "^2.0.0",
+        "term-size": "^1.2.0",
+        "widest-line": "^2.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==",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
           "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==",
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
           "dev": true
         },
         "is-fullwidth-code-point": {
@@ -3868,30 +2939,23 @@
           "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": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "emoji-regex": "7.0.3",
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "5.2.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.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": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "4.1.0"
+            "ansi-regex": "^3.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==",
-          "dev": true
         }
       }
     },
@@ -4009,13 +3073,14 @@
       }
     },
     "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.4.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.4.1.tgz",
+      "integrity": "sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==",
+      "dev": true,
       "requires": {
-        "caniuse-lite": "1.0.30000989",
-        "electron-to-chromium": "1.3.273",
-        "node-releases": "1.1.33"
+        "caniuse-lite": "^1.0.30000929",
+        "electron-to-chromium": "^1.3.103",
+        "node-releases": "^1.1.3"
       }
     },
     "browserstack": {
@@ -4028,15 +3093,16 @@
       }
     },
     "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.0",
+      "resolved": "https://registry.npmjs.org/browserstack-local/-/browserstack-local-1.4.0.tgz",
+      "integrity": "sha512-BUJWxIsJkJxqfTPJIvGWTsf+IYSqSFUeFNW9tnuyTG7va/0LkXLhIi/ErFGDle1urQkol48HlQUXj4QrliXFpg==",
       "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",
+        "sinon": "^1.17.6",
+        "temp-fs": "^0.9.9"
       }
     },
     "buffer": {
@@ -4085,9 +3151,9 @@
       "dev": true
     },
     "buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz",
+      "integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==",
       "dev": true
     },
     "buffer-indexof": {
@@ -4103,9 +3169,9 @@
       "dev": true
     },
     "builtin-modules": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz",
-      "integrity": "sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
       "dev": true
     },
     "builtin-status-codes": {
@@ -4127,42 +3193,24 @@
       "dev": true
     },
     "cacache": {
-      "version": "12.0.2",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.2.tgz",
-      "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"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.4",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
-          "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"
-          }
-        }
+      "version": "10.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
+      "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.5.1",
+        "chownr": "^1.0.1",
+        "glob": "^7.1.2",
+        "graceful-fs": "^4.1.11",
+        "lru-cache": "^4.1.1",
+        "mississippi": "^2.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.2",
+        "ssri": "^5.2.4",
+        "unique-filename": "^1.1.0",
+        "y18n": "^4.0.0"
       }
     },
     "cache-base": {
@@ -4181,76 +3229,19 @@
         "unset-value": "^1.0.0"
       }
     },
-    "cacheable-request": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
-      "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"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-          "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
-          "dev": true,
-          "requires": {
-            "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",
-          "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-          "dev": true
-        },
-        "normalize-url": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
-          "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
-          "dev": true
-        },
-        "pump": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "1.4.3",
-            "once": "1.4.0"
-          }
-        }
-      }
-    },
-    "caller-callsite": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
-      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
-      "dev": true,
-      "requires": {
-        "callsites": "2.0.0"
-      }
+    "call-me-maybe": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
+      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
+      "dev": true
     },
     "caller-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
+      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
       "dev": true,
       "requires": {
-        "caller-callsite": "2.0.0"
+        "callsites": "^0.2.0"
       }
     },
     "callsite": {
@@ -4260,21 +3251,34 @@
       "dev": true
     },
     "callsites": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
+      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
       "dev": true
     },
-    "camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true
+    "camelcase-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+      "dev": true,
+      "requires": {
+        "camelcase": "^2.0.0",
+        "map-obj": "^1.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+          "dev": true
+        }
+      }
     },
     "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.30000938",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000938.tgz",
+      "integrity": "sha512-ekW8NQ3/FvokviDxhdKLZZAx7PptXNwxKgXtnR5y+PR3hckwuP3yJ1Ir+4/c97dsHNqtAyfKUGdw8P4EYzBNgw==",
+      "dev": true
     },
     "canonical-path": {
       "version": "1.0.0",
@@ -4282,6 +3286,12 @@
       "integrity": "sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==",
       "dev": true
     },
+    "capture-stack-trace": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
+      "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==",
+      "dev": true
+    },
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
@@ -4289,21 +3299,29 @@
       "dev": true
     },
     "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.2.tgz",
+      "integrity": "sha512-LvixLAQ4MYhbf7hgL4o5PeK32gJKvVzDRiSNIApDofQvyhl8adgG2lJVXn4+ekQoK7HL9RF8lqxwerpe0x2pCw==",
+      "dev": true,
       "requires": {
-        "ansi-styles": "3.2.1",
-        "escape-string-regexp": "1.0.5",
-        "supports-color": "5.5.0"
+        "ansi-styles": "^3.1.0",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^4.0.0"
       },
       "dependencies": {
+        "has-flag": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "dev": true
+        },
         "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^2.0.0"
           }
         }
       }
@@ -4315,44 +3333,44 @@
       "dev": true
     },
     "chokidar": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-      "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-      "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"
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz",
+      "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==",
+      "dev": true,
+      "requires": {
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.0",
+        "braces": "^2.3.0",
+        "fsevents": "^1.1.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.1",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^2.1.1",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.0.0",
+        "upath": "^1.0.0"
       }
     },
     "chownr": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz",
-      "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
+      "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
       "dev": true
     },
     "chrome-trace-event": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
-      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz",
+      "integrity": "sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==",
       "dev": true,
       "requires": {
-        "tslib": "1.10.0"
+        "tslib": "^1.9.0"
       }
     },
     "ci-info": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
+      "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
       "dev": true
     },
     "cipher-base": {
@@ -4366,15 +3384,15 @@
       }
     },
     "circular-dependency-plugin": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz",
-      "integrity": "sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.0.2.tgz",
+      "integrity": "sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==",
       "dev": true
     },
     "circular-json": {
-      "version": "0.5.9",
-      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz",
-      "integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ=="
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.4.tgz",
+      "integrity": "sha512-vnJA8KS0BfOihugYEUkLRcnmq21FbuivbxgzDLXNs3zIk4KllV4Mx4UuTzBXht9F00C7QfD1YqMXg1zP6EXpig=="
     },
     "class-utils": {
       "version": "0.3.6",
@@ -4415,18 +3433,18 @@
       }
     },
     "cli-boxes": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.0.tgz",
-      "integrity": "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
+      "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=",
       "dev": true
     },
     "cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
+      "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
       "dev": true,
       "requires": {
-        "restore-cursor": "3.1.0"
+        "restore-cursor": "^1.0.1"
       }
     },
     "cli-width": {
@@ -4435,21 +3453,10 @@
       "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
       "dev": true
     },
-    "cliui": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-      "dev": true,
-      "requires": {
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "wrap-ansi": "2.1.0"
-      }
-    },
     "clone": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz",
+      "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=",
       "dev": true
     },
     "clone-buffer": {
@@ -4459,23 +3466,15 @@
       "dev": true
     },
     "clone-deep": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-      "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"
-      }
-    },
-    "clone-response": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz",
+      "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
       "dev": true,
       "requires": {
-        "mimic-response": "1.0.1"
+        "for-own": "^1.0.0",
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.0",
+        "shallow-clone": "^1.0.0"
       }
     },
     "clone-stats": {
@@ -4485,14 +3484,14 @@
       "dev": true
     },
     "cloneable-readable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
-      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.2.tgz",
+      "integrity": "sha512-Bq6+4t+lbM8vhTs/Bef5c5AdEMtapp/iFb6+s4/Hh9MVTt8OLKH7ZOOZSCT+Ys7hsHvqv0GuMPJ1lnQJVHvxpg==",
       "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": {
@@ -4508,33 +3507,28 @@
       "dev": true
     },
     "codecov": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.6.1.tgz",
-      "integrity": "sha512-IUJB6WG47nWK7o50etF8jBadxdMw7DmoQg05yIljstXFBGB6clOZsIj6iD4P82T2YaIU3qq+FFu8K9pxgkCJDQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.0.2.tgz",
+      "integrity": "sha512-9ljtIROIjPIUmMRqO+XuDITDoV8xRrZmA0jcEq6p2hg2+wY9wGmLfreAZGIL72IzUfdEDZaU8+Vjidg1fBQ8GQ==",
       "dev": true,
       "requires": {
         "argv": "0.0.2",
-        "ignore-walk": "3.0.2",
-        "js-yaml": "3.13.1",
-        "teeny-request": "3.11.3",
+        "request": "^2.81.0",
         "urlgrey": "0.4.4"
       }
     },
     "codelyzer": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-5.2.0.tgz",
-      "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"
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-4.5.0.tgz",
+      "integrity": "sha512-oO6vCkjqsVrEsmh58oNlnJkRXuA30hF8cdNAQV9DytEalDwyOFRvHMnlKFzmOStNerOmPGZU9GAHnBo4tGvtiQ==",
+      "dev": true,
+      "requires": {
+        "app-root-path": "^2.1.0",
+        "css-selector-tokenizer": "^0.7.0",
+        "cssauron": "^1.4.0",
+        "semver-dsl": "^1.0.1",
+        "source-map": "^0.5.7",
+        "sprintf-js": "^1.1.1"
       },
       "dependencies": {
         "source-map": {
@@ -4572,17 +3566,19 @@
       }
     },
     "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
+      "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
+      "dev": true,
       "requires": {
-        "color-name": "1.1.3"
+        "color-name": "^1.1.1"
       }
     },
     "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",
@@ -4597,28 +3593,23 @@
       "dev": true
     },
     "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
+      "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
       "dev": true,
       "requires": {
-        "delayed-stream": "1.0.0"
+        "delayed-stream": "~1.0.0"
       }
     },
     "commander": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
-      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+      "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag=="
     },
     "commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
-    },
-    "compare-versions": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.5.1.tgz",
-      "integrity": "sha512-9fGPIB7C6AyM18CJJBHt5EnCZDG3oiTJYy0NjfIAGjKpzv0tkxWko7TNQHF5ymqm7IH03tqmeuBxtvD+Izh6mg==",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
       "dev": true
     },
     "component-bind": {
@@ -4628,9 +3619,9 @@
       "dev": true
     },
     "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=="
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
     },
     "component-inherit": {
       "version": "0.0.3",
@@ -4639,27 +3630,35 @@
       "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.16",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.16.tgz",
+      "integrity": "sha512-JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA==",
       "dev": true,
       "requires": {
-        "mime-db": "1.40.0"
+        "mime-db": ">= 1.38.0 < 2"
+      },
+      "dependencies": {
+        "mime-db": {
+          "version": "1.38.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
+          "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==",
+          "dev": true
+        }
       }
     },
     "compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz",
+      "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
       "dev": true,
       "requires": {
-        "accepts": "1.3.7",
+        "accepts": "~1.3.5",
         "bytes": "3.0.0",
-        "compressible": "2.0.17",
+        "compressible": "~2.0.14",
         "debug": "2.6.9",
-        "on-headers": "1.0.2",
+        "on-headers": "~1.0.1",
         "safe-buffer": "5.1.2",
-        "vary": "1.1.2"
+        "vary": "~1.1.2"
       }
     },
     "concat-map": {
@@ -4680,28 +3679,17 @@
       }
     },
     "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": "3.1.2",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz",
+      "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
       "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"
-      },
-      "dependencies": {
-        "make-dir": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-          "dev": true,
-          "requires": {
-            "pify": "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"
       }
     },
     "connect": {
@@ -4714,6 +3702,35 @@
         "finalhandler": "1.1.2",
         "parseurl": "~1.3.3",
         "utils-merge": "1.0.1"
+      },
+      "dependencies": {
+        "finalhandler": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+          "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+          "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"
+          }
+        },
+        "parseurl": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+          "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+          "dev": true
+        },
+        "statuses": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+          "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+          "dev": true
+        }
       }
     },
     "connect-history-api-fallback": {
@@ -4737,6 +3754,12 @@
         "date-now": "^0.1.4"
       }
     },
+    "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
+    },
     "constants-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
@@ -4744,13 +3767,10 @@
       "dev": true
     },
     "content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.2"
-      }
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
+      "dev": true
     },
     "content-type": {
       "version": "1.0.4",
@@ -4759,17 +3779,15 @@
       "dev": true
     },
     "convert-source-map": {
-      "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==",
-      "requires": {
-        "safe-buffer": "5.1.2"
-      }
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz",
+      "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=",
+      "dev": true
     },
     "cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
       "dev": true
     },
     "cookie-signature": {
@@ -4808,114 +3826,41 @@
       }
     },
     "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": "4.6.0",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz",
+      "integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==",
       "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": "^10.0.4",
+        "find-cache-dir": "^1.0.0",
+        "globby": "^7.1.1",
+        "is-glob": "^4.0.0",
+        "loader-utils": "^1.1.0",
+        "minimatch": "^3.0.4",
+        "p-limit": "^1.0.0",
+        "serialize-javascript": "^1.4.0"
       },
       "dependencies": {
-        "cacache": {
-          "version": "11.3.3",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz",
-          "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"
-          }
-        },
-        "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.1.0",
-            "pkg-dir": "3.0.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.4",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
-          "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"
-          }
-        },
         "globby": {
           "version": "7.1.1",
           "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
           "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": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
         }
       }
     },
     "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=="
-    },
-    "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==",
-      "requires": {
-        "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=="
-        }
-      }
+      "version": "2.6.5",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
+      "integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A=="
     },
     "core-util-is": {
       "version": "1.0.2",
@@ -4923,15 +3868,15 @@
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cosmiconfig": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
+      "integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
       "dev": true,
       "requires": {
-        "import-fresh": "2.0.0",
-        "is-directory": "0.3.1",
-        "js-yaml": "3.13.1",
-        "parse-json": "4.0.0"
+        "is-directory": "^0.3.1",
+        "js-yaml": "^3.9.0",
+        "parse-json": "^4.0.0",
+        "require-from-string": "^2.0.1"
       },
       "dependencies": {
         "parse-json": {
@@ -4940,8 +3885,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"
           }
         }
       }
@@ -4956,6 +3901,15 @@
         "elliptic": "^6.0.0"
       }
     },
+    "create-error-class": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
+      "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
+      "dev": true,
+      "requires": {
+        "capture-stack-trace": "^1.0.0"
+      }
+    },
     "create-hash": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
@@ -4984,16 +3938,13 @@
       }
     },
     "cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
+      "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
       "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"
+        "lru-cache": "^4.0.1",
+        "which": "^1.2.9"
       }
     },
     "crypto-browserify": {
@@ -5027,43 +3978,15 @@
       "integrity": "sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=",
       "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==",
-      "dev": true,
-      "requires": {
-        "cssesc": "^0.1.0",
-        "fastparse": "^1.1.1",
-        "regexpu-core": "^1.0.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.4.0",
-            "regjsgen": "0.2.0",
-            "regjsparser": "0.1.5"
-          }
-        },
-        "regjsgen": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-          "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
-          "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"
-          }
-        }
+    "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==",
+      "dev": true,
+      "requires": {
+        "cssesc": "^0.1.0",
+        "fastparse": "^1.1.1",
+        "regexpu-core": "^1.0.0"
       }
     },
     "cssauron": {
@@ -5087,6 +4010,15 @@
       "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=",
       "dev": true
     },
+    "currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+      "dev": true,
+      "requires": {
+        "array-find-index": "^1.0.1"
+      }
+    },
     "custom-event": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
@@ -5094,19 +4026,18 @@
       "dev": true
     },
     "cyclist": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
-      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
+      "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
       "dev": true
     },
     "d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+      "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
       "dev": true,
       "requires": {
-        "es5-ext": "0.10.51",
-        "type": "1.2.0"
+        "es5-ext": "^0.10.9"
       }
     },
     "d3": {
@@ -5231,15 +4162,15 @@
       "integrity": "sha1-MacFoLU15ldZ3hQXOjGTMTfxjvo="
     },
     "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.0.6",
+      "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.0.6.tgz",
+      "integrity": "sha512-lGSiF5SoSqO5/mYGD5FAeGKKS62JdA1EV7HPrU2b5rTX4qEJJtpjaGLJngjnkewQy7UnGstnFd3168wpf5z76w==",
       "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": {
@@ -5257,9 +4188,9 @@
       "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=="
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.2.3.tgz",
+      "integrity": "sha512-x37qq3ChOTLd26hnps36lexMRhNXEtVxZ4B25rL0DVdDsGQIJGB18S7y9XDwlDD6MD/ZBzITCf4JjGMM10TZkw=="
     },
     "d3-dispatch": {
       "version": "1.0.3",
@@ -5291,20 +4222,20 @@
       "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==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.2.0.tgz",
+      "integrity": "sha512-PFLcDnRVANHMudbQlIB87gcfQorEsDIAvRpZ2bNddfM/WxdsEkyrEaOIPoydhH1I1V4HPjNLGOMLXCA0AuGQ9w==",
       "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": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.1.tgz",
-      "integrity": "sha512-TUswGe6hfguUX1CtKxyG2nymO+1lyThbkS1ifLX0Sr+dOQtAD5gkrffpHnx+yHNKUZ0Bmg5T4AjUQwugPDrm0g=="
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.3.2.tgz",
+      "integrity": "sha512-Z18Dprj96ExragQ0DeGi+SYPQ7pPfRMtUXtsg/ChVIKNBCzjO8XYJvRTC1usblx52lqge56V5ect+frYTQc8WQ=="
     },
     "d3-geo": {
       "version": "1.9.1",
@@ -5383,11 +4314,11 @@
       "integrity": "sha512-EYVwBxQGEjLCKF2pJ4+yrErskDnz5v403qvAid96cNdCMr8rmCYfY5RGzWz24mdIbxmDf6/4EAH+K9xperD5jg=="
     },
     "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.4",
+      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.4.tgz",
+      "integrity": "sha512-izaz4fOpOnY3CD17hkZWNxbaN70sIGagLR/5jb6RS96Y+6VqX+q1BQf1av6QSBRdfULi3Gb8Js4CzG4+KAPjMg==",
       "requires": {
-        "d3-path": "1.0.5"
+        "d3-path": "1"
       }
     },
     "d3-time": {
@@ -5438,11 +4369,14 @@
         "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==",
-      "dev": true
+    "dagre": {
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/dagre/-/dagre-0.8.4.tgz",
+      "integrity": "sha512-Dj0csFDrWYKdavwROb9FccHfTC4fJbyF/oJdL9LNZJ8WUvl968P6PAKEriGqfbdArVJEmmfA+UyumgWEwcHU6A==",
+      "requires": {
+        "graphlib": "^2.1.7",
+        "lodash": "^4.17.4"
+      }
     },
     "dashdash": {
       "version": "1.14.1",
@@ -5473,12 +4407,6 @@
         "ms": "2.0.0"
       }
     },
-    "debuglog": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
-      "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=",
-      "dev": true
-    },
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
@@ -5490,28 +4418,11 @@
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
     },
-    "decompress-response": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
-      "dev": true,
-      "requires": {
-        "mimic-response": "1.0.1"
-      }
-    },
     "deep-equal": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.0.tgz",
-      "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"
-      }
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
+      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
+      "dev": true
     },
     "deep-extend": {
       "version": "0.6.0",
@@ -5519,17 +4430,18 @@
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
       "dev": true
     },
+    "deep-freeze-strict": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/deep-freeze-strict/-/deep-freeze-strict-1.1.1.tgz",
+      "integrity": "sha1-d9BYPKJKab5LvZrC+uQV1VUj5bA=",
+      "dev": true
+    },
     "deep-is": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
       "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
       "dev": true
     },
-    "deepmerge": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-3.3.0.tgz",
-      "integrity": "sha512-GRQOafGHwMHpjPx9iCvTgpu9NojZ49q794EEL94JVEw6VaeA8XTUyBKvAkOOjBX9oJNiV6G3P+T+tihFjo2TqA=="
-    },
     "default-compare": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
@@ -5548,22 +4460,43 @@
       }
     },
     "default-gateway": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
-      "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
-      "dev": true,
-      "requires": {
-        "execa": "1.0.0",
-        "ip-regex": "2.1.0"
-      }
-    },
-    "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.7.2",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-2.7.2.tgz",
+      "integrity": "sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==",
       "dev": true,
       "requires": {
-        "strip-bom": "2.0.0"
+        "execa": "^0.10.0",
+        "ip-regex": "^2.1.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "dev": true,
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "execa": {
+          "version": "0.10.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
+          "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^6.0.0",
+            "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"
+          }
+        }
       }
     },
     "default-resolution": {
@@ -5572,18 +4505,14 @@
       "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
       "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==",
-      "dev": true
-    },
     "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
+      "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
+      "dev": true,
       "requires": {
-        "object-keys": "1.1.1"
+        "foreach": "^2.0.5",
+        "object-keys": "^1.0.8"
       }
     },
     "define-property": {
@@ -5624,18 +4553,17 @@
       }
     },
     "del": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
+      "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
       "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"
+        "globby": "^6.1.0",
+        "is-path-cwd": "^1.0.0",
+        "is-path-in-cwd": "^1.0.0",
+        "p-map": "^1.1.1",
+        "pify": "^3.0.0",
+        "rimraf": "^2.2.8"
       },
       "dependencies": {
         "globby": {
@@ -5644,11 +4572,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": {
@@ -5658,36 +4586,6 @@
               "dev": true
             }
           }
-        },
-        "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": {
-          "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"
-          }
-        },
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
         }
       }
     },
@@ -5697,16 +4595,24 @@
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
       "dev": true
     },
+    "delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+      "dev": true
+    },
     "delete": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/delete/-/delete-1.1.0.tgz",
-      "integrity": "sha512-bdhJatRNYsJnOhSRx9Eej3ABBtxQQw/uz2RprpYL5R3jCC2XMYVBcQWwvQLl+iNDk4LCLEKhdIP3uZSqRWi/tw==",
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/delete/-/delete-0.3.2.tgz",
+      "integrity": "sha1-fP7PXvffuAL60nq49b5a5UbFt54=",
       "dev": true,
       "requires": {
-        "async-each": "1.0.3",
-        "extend-shallow": "2.0.1",
-        "matched": "1.0.2",
-        "rimraf": "2.7.1"
+        "async": "^1.5.2",
+        "bluebird": "^3.3.5",
+        "extend-shallow": "^2.0.1",
+        "lazy-cache": "^1.0.4",
+        "matched": "^0.4.1",
+        "rimraf": "^2.5.2"
       },
       "dependencies": {
         "extend-shallow": {
@@ -5715,7 +4621,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         }
       }
@@ -5769,16 +4675,6 @@
       "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
       "dev": true
     },
-    "dezalgo": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz",
-      "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=",
-      "dev": true,
-      "requires": {
-        "asap": "2.0.6",
-        "wrappy": "1.0.2"
-      }
-    },
     "di": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
@@ -5786,9 +4682,9 @@
       "dev": true
     },
     "diff": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz",
-      "integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
       "dev": true
     },
     "diffie-hellman": {
@@ -5803,12 +4699,13 @@
       }
     },
     "dir-glob": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
-      "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
+      "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
       "dev": true,
       "requires": {
-        "path-type": "3.0.0"
+        "arrify": "^1.0.1",
+        "path-type": "^3.0.0"
       }
     },
     "dns-equal": {
@@ -5865,9 +4762,9 @@
       "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.2",
+      "resolved": "https://registry.npmjs.org/domino/-/domino-2.1.2.tgz",
+      "integrity": "sha512-nzg76s4Smji9teyLwOnqqUCdFVOho+OQFqUwp+42Wo+SEZ1FGw7uhemv6OKk2qp8YIgnGB3jVt0sJWU96wbPgA=="
     },
     "dot-prop": {
       "version": "4.2.0",
@@ -5880,7 +4777,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
     },
@@ -5891,15 +4788,15 @@
       "dev": true
     },
     "duplexify": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz",
+      "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==",
       "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": {
@@ -5913,13 +4810,13 @@
       }
     },
     "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
       "dev": true,
+      "optional": true,
       "requires": {
-        "jsbn": "0.1.1",
-        "safer-buffer": "2.1.2"
+        "jsbn": "~0.1.0"
       }
     },
     "ee-first": {
@@ -5929,35 +4826,31 @@
       "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.113",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz",
+      "integrity": "sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g==",
+      "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.4.1",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
+      "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
       "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": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
     "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",
@@ -5975,12 +4868,12 @@
       }
     },
     "end-of-stream": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.3.tgz",
-      "integrity": "sha512-cbNhPFS6MlYlWTGncSiDYbdqKhwWFy7kNeb1YSOG6K65i/wPTkLVCJQj0hXA4j0m5Da+hBWnqopEnu1FFelisQ==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
+      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
       "dev": true,
       "requires": {
-        "once": "1.4.0"
+        "once": "^1.4.0"
       }
     },
     "engine.io": {
@@ -5997,12 +4890,6 @@
         "ws": "~3.3.1"
       },
       "dependencies": {
-        "cookie": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-          "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
-          "dev": true
-        },
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
@@ -6011,17 +4898,6 @@
           "requires": {
             "ms": "2.0.0"
           }
-        },
-        "ws": {
-          "version": "3.3.3",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-          "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
-          "dev": true,
-          "requires": {
-            "async-limiter": "1.0.1",
-            "safe-buffer": "5.1.2",
-            "ultron": "1.1.1"
-          }
         }
       }
     },
@@ -6044,12 +4920,6 @@
         "yeast": "0.1.2"
       },
       "dependencies": {
-        "component-emitter": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-          "dev": true
-        },
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
@@ -6058,17 +4928,6 @@
           "requires": {
             "ms": "2.0.0"
           }
-        },
-        "ws": {
-          "version": "3.3.3",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-          "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
-          "dev": true,
-          "requires": {
-            "async-limiter": "1.0.1",
-            "safe-buffer": "5.1.2",
-            "ultron": "1.1.1"
-          }
         }
       }
     },
@@ -6089,6 +4948,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",
@@ -6111,65 +4971,61 @@
       "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"
       }
     },
     "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
+      "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
       "dev": true,
       "requires": {
-        "is-arrayish": "0.2.1"
+        "is-arrayish": "^0.2.1"
       }
     },
     "error-stack-parser": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.4.tgz",
-      "integrity": "sha512-fZ0KkoxSjLFmhW5lHbUT3tLwy3nX1qEzMYo8koY1vrsAco53CMT1djnBSeC/wUjTEZRhZl9iRw7PaMaxfJ4wzQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.1.tgz",
+      "integrity": "sha1-oyArj7AxFKqbQKDjZp5IsrZaAQo=",
       "requires": {
-        "stackframe": "1.1.0"
+        "stackframe": "^1.0.3"
       }
     },
     "es-abstract": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.14.2.tgz",
-      "integrity": "sha512-DgoQmbpFNOofkjJtKwr87Ma5EW4Dc8fWhD0R+ndq7Oc456ivUfGOOP6oAZTTKl5/CcNMP+EN+e3/iUzgE0veZg==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz",
+      "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==",
       "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.1.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.1",
+        "is-callable": "^1.1.3",
+        "is-regex": "^1.0.4"
       }
     },
     "es-to-primitive": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
-      "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
+      "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
       "dev": true,
       "requires": {
-        "is-callable": "1.1.4",
-        "is-date-object": "1.0.1",
-        "is-symbol": "1.0.2"
+        "is-callable": "^1.1.1",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.1"
       }
     },
     "es5-ext": {
-      "version": "0.10.51",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.51.tgz",
-      "integrity": "sha512-oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ==",
+      "version": "0.10.44",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.44.tgz",
+      "integrity": "sha512-TO4Vt9IhW3FzDKLDOpoA8VS9BCV4b9WTf6BqvMOgfoa8wX73F3Kh3y2J7yTstTaXlQ0k1vq4DH2vw6RSs42z+g==",
       "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"
       }
     },
     "es6-iterator": {
@@ -6198,9 +5054,9 @@
       }
     },
     "es6-promise": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz",
+      "integrity": "sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==",
       "dev": true
     },
     "es6-promisify": {
@@ -6223,40 +5079,28 @@
         "es6-iterator": "~2.0.1",
         "es6-symbol": "3.1.1",
         "event-emitter": "~0.3.5"
-      },
-      "dependencies": {
-        "es6-symbol": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
-          "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-          "dev": true,
-          "requires": {
-            "d": "1.0.1",
-            "es5-ext": "0.10.51"
-          }
-        }
       }
     },
     "es6-symbol": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.2.tgz",
-      "integrity": "sha512-/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
       "dev": true,
       "requires": {
-        "d": "1.0.1",
-        "es5-ext": "0.10.51"
+        "d": "1",
+        "es5-ext": "~0.10.14"
       }
     },
     "es6-weak-map": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
-      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz",
+      "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
       "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.14",
+        "es6-iterator": "^2.0.1",
+        "es6-symbol": "^3.1.1"
       }
     },
     "escape-html": {
@@ -6268,7 +5112,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",
@@ -6360,12 +5205,6 @@
         "user-home": "^2.0.0"
       },
       "dependencies": {
-        "ansi-escapes": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
-          "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=",
-          "dev": true
-        },
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
@@ -6385,81 +5224,10 @@
             "supports-color": "^2.0.0"
           }
         },
-        "cli-cursor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
-          "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
-          "dev": true,
-          "requires": {
-            "restore-cursor": "1.0.1"
-          }
-        },
-        "figures": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-          "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-          "dev": true,
-          "requires": {
-            "escape-string-regexp": "1.0.5",
-            "object-assign": "4.1.1"
-          }
-        },
-        "inquirer": {
-          "version": "0.12.0",
-          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
-          "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"
-          }
-        },
-        "onetime": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-          "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-          "dev": true
-        },
-        "restore-cursor": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
-          "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
-          "dev": true,
-          "requires": {
-            "exit-hook": "1.1.1",
-            "onetime": "1.1.0"
-          }
-        },
-        "run-async": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
-          "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
-          "dev": true,
-          "requires": {
-            "once": "1.4.0"
-          }
-        },
-        "shelljs": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.6.1.tgz",
-          "integrity": "sha1-7GIRvtGSBEIIj+D3Cyg3Iy7SyKg=",
-          "dev": true
-        },
-        "strip-json-comments": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
-          "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=",
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
           "dev": true
         },
         "supports-color": {
@@ -6471,13 +5239,13 @@
       }
     },
     "eslint-scope": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
+      "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
       "dev": true,
       "requires": {
-        "esrecurse": "4.2.1",
-        "estraverse": "4.3.0"
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
       }
     },
     "espree": {
@@ -6514,21 +5282,16 @@
       }
     },
     "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "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": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
       "dev": true
     },
     "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+      "dev": true
     },
     "etag": {
       "version": "1.8.1",
@@ -6548,7 +5311,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": {
@@ -6562,9 +5325,9 @@
       }
     },
     "eventemitter3": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz",
-      "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
+      "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==",
       "dev": true
     },
     "events": {
@@ -6593,18 +5356,31 @@
       }
     },
     "execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
       "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": "^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"
+      },
+      "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"
+          }
+        }
       }
     },
     "exit": {
@@ -6652,50 +5428,50 @@
       }
     },
     "expand-tilde": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz",
+      "integrity": "sha1-C4HrqJflo9MdHD0QL48BRB5VlEk=",
       "dev": true,
       "requires": {
-        "homedir-polyfill": "1.0.3"
+        "os-homedir": "^1.0.1"
       }
     },
     "express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "version": "4.16.4",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
+      "integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
       "dev": true,
       "requires": {
-        "accepts": "1.3.7",
+        "accepts": "~1.3.5",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
-        "content-type": "1.0.4",
-        "cookie": "0.4.0",
+        "body-parser": "1.18.3",
+        "content-disposition": "0.5.2",
+        "content-type": "~1.0.4",
+        "cookie": "0.3.1",
         "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.1",
         "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.2",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "2.0.5",
-        "qs": "6.7.0",
-        "range-parser": "1.2.1",
+        "proxy-addr": "~2.0.4",
+        "qs": "6.5.2",
+        "range-parser": "~1.2.0",
         "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",
+        "send": "0.16.2",
+        "serve-static": "1.13.2",
+        "setprototypeof": "1.1.0",
+        "statuses": "~1.4.0",
+        "type-is": "~1.6.16",
         "utils-merge": "1.0.1",
-        "vary": "1.1.2"
+        "vary": "~1.1.2"
       },
       "dependencies": {
         "array-flatten": {
@@ -6704,11 +5480,13 @@
           "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
           "dev": true
         },
-        "qs": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-          "dev": true
+        "iconv-lite": {
+          "version": "0.4.23",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
+          "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
         }
       }
     },
@@ -6738,14 +5516,25 @@
       }
     },
     "external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz",
+      "integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
       "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"
+      },
+      "dependencies": {
+        "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,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        }
       }
     },
     "extglob": {
@@ -6826,76 +5615,23 @@
       }
     },
     "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="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
+      "dev": true
     },
     "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": "2.2.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.2.tgz",
+      "integrity": "sha512-TR6zxCKftDQnUAPvkrCWdBgDq/gbqx8A3ApnBrR5rMvpp6+KMJI0Igw7fkWPgeVK0uhRXTXdvO3O+YP0CaUX2g==",
       "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"
-      },
-      "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"
-          }
-        },
-        "glob-parent": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
-          "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
-          "dev": true,
-          "requires": {
-            "is-glob": "4.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.2",
-            "picomatch": "2.0.7"
-          }
-        },
-        "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"
-          }
-        }
+        "@mrmlnc/readdir-enhanced": "^2.2.1",
+        "@nodelib/fs.stat": "^1.0.1",
+        "glob-parent": "^3.1.0",
+        "is-glob": "^4.0.0",
+        "merge2": "^1.2.1",
+        "micromatch": "^3.1.10"
       }
     },
     "fast-json-stable-stringify": {
@@ -6915,15 +5651,6 @@
       "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
       "dev": true
     },
-    "fastq": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.6.0.tgz",
-      "integrity": "sha512-jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA==",
-      "dev": true,
-      "requires": {
-        "reusify": "1.0.4"
-      }
-    },
     "faye-websocket": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
@@ -6940,12 +5667,13 @@
       "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": "1.7.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+      "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
       "dev": true,
       "requires": {
-        "escape-string-regexp": "1.0.5"
+        "escape-string-regexp": "^1.0.5",
+        "object-assign": "^4.1.0"
       }
     },
     "file-entry-cache": {
@@ -6959,37 +5687,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": "3.0.1",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz",
+      "integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==",
       "dev": true,
       "requires": {
-        "loader-utils": "1.2.3",
-        "schema-utils": "2.4.1"
-      },
-      "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": "^1.0.2",
+        "schema-utils": "^1.0.0"
       }
     },
     "fileset": {
@@ -7024,89 +5728,29 @@
       }
     },
     "finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
+      "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
       "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.2",
+        "statuses": "~1.4.0",
+        "unpipe": "~1.0.0"
       }
     },
     "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": "1.0.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz",
+      "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
       "dev": true,
       "requires": {
-        "commondir": "1.0.1",
-        "make-dir": "3.0.0",
-        "pkg-dir": "4.2.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"
-          }
-        },
-        "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==",
-          "dev": true,
-          "requires": {
-            "semver": "6.3.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.1"
-          }
-        },
-        "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
-        },
-        "pkg-dir": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-          "dev": true,
-          "requires": {
-            "find-up": "4.1.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
-        }
+        "commondir": "^1.0.1",
+        "make-dir": "^1.0.0",
+        "pkg-dir": "^2.0.0"
       }
     },
     "find-parent-dir": {
@@ -7116,11 +5760,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": {
@@ -7211,15 +5856,15 @@
       "dev": true
     },
     "flat-cache": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
-      "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
+      "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
       "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",
+        "del": "^2.0.2",
+        "graceful-fs": "^4.1.2",
+        "write": "^0.2.1"
       },
       "dependencies": {
         "circular-json": {
@@ -7228,14 +5873,40 @@
           "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
           "dev": true
         },
-        "rimraf": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+        "del": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
+          "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
           "dev": true,
           "requires": {
-            "glob": "7.1.3"
+            "globby": "^5.0.0",
+            "is-path-cwd": "^1.0.0",
+            "is-path-in-cwd": "^1.0.0",
+            "object-assign": "^4.0.1",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0",
+            "rimraf": "^2.2.8"
+          }
+        },
+        "globby": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+          "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
+          "dev": true,
+          "requires": {
+            "array-union": "^1.0.1",
+            "arrify": "^1.0.0",
+            "glob": "^7.0.3",
+            "object-assign": "^4.0.1",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
           }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
         }
       }
     },
@@ -7246,38 +5917,32 @@
       "dev": true
     },
     "flush-write-stream": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
+      "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.4",
-        "readable-stream": "2.3.6"
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.4"
       }
     },
     "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.5.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.0.tgz",
+      "integrity": "sha512-fdrt472/9qQ6Kgjvb935ig6vJCuofpBUD14f9Vb+SLlm7xIe4Qva5gey8EKtv8lp7ahE1wilg3xL1znpVGtZIA==",
       "dev": true,
       "requires": {
-        "debug": "3.2.6"
+        "debug": "^3.1.0"
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "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.2"
+            "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
         }
       }
     },
@@ -7295,36 +5960,36 @@
         "for-in": "^1.0.1"
       }
     },
+    "foreach": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+      "dev": true
+    },
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
       "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==",
+    "form-data": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
+      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
+      "dev": true,
       "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"
+        "asynckit": "^0.4.0",
+        "combined-stream": "1.0.6",
+        "mime-types": "^2.1.12"
       }
     },
-    "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==",
+    "formatio": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz",
+      "integrity": "sha1-XtPM1jZVEJc4NGXZlhmRAOhhYek=",
       "dev": true,
       "requires": {
-        "asynckit": "0.4.0",
-        "combined-stream": "1.0.8",
-        "mime-types": "2.1.24"
+        "samsam": "~1.1"
       }
     },
     "forwarded": {
@@ -7372,24 +6037,39 @@
         "js-yaml": "^3.4.6"
       }
     },
+    "fs-access": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
+      "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
+      "dev": true,
+      "requires": {
+        "null-check": "^1.0.0"
+      }
+    },
+    "fs-exists-sync": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz",
+      "integrity": "sha1-mC1ok6+RjnLQjeyehnP/K1qNat0=",
+      "dev": true
+    },
     "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": "3.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
+      "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.2.2",
-        "jsonfile": "4.0.0",
-        "universalify": "0.1.2"
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^3.0.0",
+        "universalify": "^0.1.0"
       }
     },
     "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": "1.2.5",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
+      "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
       "dev": true,
       "requires": {
-        "minipass": "2.9.0"
+        "minipass": "^2.2.1"
       }
     },
     "fs-mkdirp-stream": {
@@ -7421,19 +6101,18 @@
       "dev": true
     },
     "fsevents": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
-      "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.7.tgz",
+      "integrity": "sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==",
       "optional": true,
       "requires": {
-        "nan": "2.14.0",
-        "node-pre-gyp": "0.12.0"
+        "nan": "^2.9.2",
+        "node-pre-gyp": "^0.10.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==",
+          "bundled": true,
           "optional": true
         },
         "ansi-regex": {
@@ -7443,412 +6122,363 @@
         },
         "aproba": {
           "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-          "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+          "bundled": 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==",
+          "bundled": 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=",
+          "bundled": 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==",
+          "bundled": true,
           "optional": true,
           "requires": {
-            "balanced-match": "1.0.0",
+            "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
           }
         },
         "chownr": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
-          "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
+          "bundled": 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=",
+          "bundled": 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=",
+          "bundled": 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=",
+          "bundled": 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=",
+          "bundled": true,
           "optional": true
         },
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "2.6.9",
+          "bundled": true,
           "optional": true,
           "requires": {
-            "ms": "2.1.1"
+            "ms": "2.0.0"
           }
         },
         "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==",
+          "bundled": true,
           "optional": true
         },
         "delegates": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-          "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+          "bundled": 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=",
+          "bundled": 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==",
+          "bundled": 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=",
+          "bundled": true,
           "optional": true
         },
         "gauge": {
           "version": "2.7.4",
-          "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-          "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+          "bundled": 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==",
+          "bundled": 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=",
+          "bundled": 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==",
+          "bundled": 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==",
+          "bundled": 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=",
+          "bundled": 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=",
+          "bundled": true,
           "optional": true
         },
         "ini": {
           "version": "1.3.5",
-          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-          "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+          "bundled": 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=",
+          "bundled": 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=",
+          "bundled": true,
           "optional": true
         },
         "minimatch": {
           "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+          "bundled": 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=",
+          "bundled": true,
           "optional": true
         },
         "minipass": {
           "version": "2.3.5",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
-          "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
+          "bundled": 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==",
+          "bundled": 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=",
+          "bundled": true,
           "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.0.0",
+          "bundled": true,
           "optional": true
         },
         "needle": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/needle/-/needle-2.3.0.tgz",
-          "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==",
+          "version": "2.2.4",
+          "bundled": true,
           "optional": true,
           "requires": {
-            "debug": "4.1.1",
-            "iconv-lite": "0.4.24",
-            "sax": "1.2.4"
+            "debug": "^2.1.2",
+            "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==",
+          "version": "0.10.3",
+          "bundled": 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=",
+          "bundled": 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==",
+          "version": "1.0.5",
+          "bundled": 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==",
+          "version": "1.2.0",
+          "bundled": 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==",
+          "bundled": 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=",
+          "bundled": 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=",
+          "bundled": true,
           "optional": true
         },
         "once": {
           "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+          "bundled": 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=",
+          "bundled": 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=",
+          "bundled": true,
           "optional": true
         },
         "osenv": {
           "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-          "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+          "bundled": 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=",
+          "bundled": 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==",
+          "bundled": true,
           "optional": true
         },
         "rc": {
           "version": "1.2.8",
-          "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-          "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+          "bundled": 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=",
+              "bundled": true,
               "optional": true
             }
           }
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "bundled": 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==",
+          "bundled": true,
           "optional": true,
           "requires": {
-            "glob": "7.1.3"
+            "glob": "^7.1.3"
           }
         },
         "safe-buffer": {
@@ -7858,52 +6488,45 @@
         },
         "safer-buffer": {
           "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-          "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+          "bundled": true,
           "optional": true
         },
         "sax": {
           "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+          "bundled": 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==",
+          "version": "5.6.0",
+          "bundled": 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=",
+          "bundled": 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=",
+          "bundled": 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=",
+          "bundled": 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==",
+          "bundled": true,
           "optional": true,
           "requires": {
-            "safe-buffer": "5.1.2"
+            "safe-buffer": "~5.1.0"
           }
         },
         "strip-ansi": {
@@ -7911,43 +6534,39 @@
           "bundled": 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=",
+          "bundled": true,
           "optional": true
         },
         "tar": {
           "version": "4.4.8",
-          "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
-          "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
+          "bundled": 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=",
+          "bundled": 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==",
+          "bundled": true,
           "optional": true,
           "requires": {
-            "string-width": "1.0.2"
+            "string-width": "^1.0.2 || 2"
           }
         },
         "wrappy": {
@@ -7962,20 +6581,55 @@
         }
       }
     },
+    "fstream": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "inherits": "~2.0.0",
+        "mkdirp": ">=0.5 0",
+        "rimraf": "2"
+      }
+    },
     "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",
-      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz",
-      "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==",
+    "gauge": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "dev": true,
+      "requires": {
+        "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"
+      }
+    },
+    "gaze": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
+      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
       "dev": true,
       "requires": {
-        "is-property": "1.0.2"
+        "globule": "^1.0.0"
       }
     },
+    "generate-function": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
+      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
+      "dev": true
+    },
     "generate-object-property": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
@@ -7992,31 +6646,22 @@
       "dev": true
     },
     "get-caller-file": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
+      "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=",
+      "dev": true
+    },
+    "get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
       "dev": true
     },
     "get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dev": true,
-      "requires": {
-        "pump": "3.0.0"
-      },
-      "dependencies": {
-        "pump": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "1.4.3",
-            "once": "1.4.0"
-          }
-        }
-      }
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+      "dev": true
     },
     "get-value": {
       "version": "2.0.6",
@@ -8033,17 +6678,17 @@
       }
     },
     "glob": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
       "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": {
@@ -8083,6 +6728,12 @@
         "unique-stream": "^2.0.2"
       }
     },
+    "glob-to-regexp": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
+      "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
+      "dev": true
+    },
     "glob-watcher": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.3.tgz",
@@ -8107,27 +6758,41 @@
       }
     },
     "global-modules": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz",
+      "integrity": "sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0=",
       "dev": true,
       "requires": {
-        "global-prefix": "1.0.2",
-        "is-windows": "1.0.2",
-        "resolve-dir": "1.0.1"
+        "global-prefix": "^0.1.4",
+        "is-windows": "^0.2.0"
+      },
+      "dependencies": {
+        "is-windows": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
+          "integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=",
+          "dev": true
+        }
       }
     },
     "global-prefix": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz",
+      "integrity": "sha1-jTvGuNo8qBEqFg2NSW/wRiv+948=",
       "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"
+        "homedir-polyfill": "^1.0.0",
+        "ini": "^1.3.4",
+        "is-windows": "^0.2.0",
+        "which": "^1.2.12"
+      },
+      "dependencies": {
+        "is-windows": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
+          "integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=",
+          "dev": true
+        }
       }
     },
     "globals": {
@@ -8137,54 +6802,18 @@
       "dev": true
     },
     "globby": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz",
-      "integrity": "sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz",
+      "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==",
       "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"
-      },
-      "dependencies": {
-        "array-union": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-          "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-          "dev": true
-        },
-        "dir-glob": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-          "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-          "dev": true,
-          "requires": {
-            "path-type": "4.0.0"
-          }
-        },
-        "ignore": {
-          "version": "5.1.4",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz",
-          "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==",
-          "dev": true
-        },
-        "path-type": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-          "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-          "dev": true
-        },
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-          "dev": true
-        }
+        "array-union": "^1.0.1",
+        "dir-glob": "^2.0.0",
+        "fast-glob": "^2.0.2",
+        "glob": "^7.1.2",
+        "ignore": "^3.3.5",
+        "pify": "^3.0.0",
+        "slash": "^1.0.0"
       }
     },
     "globule": {
@@ -8196,6 +6825,14 @@
         "glob": "~7.1.1",
         "lodash": "~4.17.10",
         "minimatch": "~3.0.2"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "dev": true
+        }
       }
     },
     "glogg": {
@@ -8225,28 +6862,36 @@
       }
     },
     "got": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
-      "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"
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+      "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
+      "dev": true,
+      "requires": {
+        "create-error-class": "^3.0.0",
+        "duplexer3": "^0.1.4",
+        "get-stream": "^3.0.0",
+        "is-redirect": "^1.0.0",
+        "is-retry-allowed": "^1.0.0",
+        "is-stream": "^1.0.0",
+        "lowercase-keys": "^1.0.0",
+        "safe-buffer": "^5.0.1",
+        "timed-out": "^4.0.0",
+        "unzip-response": "^2.0.1",
+        "url-parse-lax": "^1.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=="
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+    },
+    "graphlib": {
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/graphlib/-/graphlib-2.1.7.tgz",
+      "integrity": "sha512-TyI9jIy2J4j0qgPmOOrHTCtpPqJGN/aurBwc6ZT+bRii+di1I+Wv3obRhVrmBEXet+qkMaEX67dXrwsd3QQM6w==",
+      "requires": {
+        "lodash": "^4.17.5"
+      }
     },
     "graphviz": {
       "version": "0.0.8",
@@ -8269,13 +6914,21 @@
         "vinyl-fs": "^3.0.0"
       },
       "dependencies": {
-        "ansi-colors": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-          "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
           "dev": true,
           "requires": {
-            "ansi-wrap": "0.1.0"
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wrap-ansi": "^2.0.0"
           }
         },
         "gulp-cli": {
@@ -8303,52 +6956,49 @@
             "v8flags": "^3.0.1",
             "yargs": "^7.1.0"
           }
-        }
-      }
-    },
-    "gulp-zip": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-zip/-/gulp-zip-5.0.0.tgz",
-      "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"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-          "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
-          "dev": true,
-          "requires": {
-            "pump": "3.0.0"
-          }
         },
-        "pump": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "1.4.3",
-            "once": "1.4.0"
-          }
+        "y18n": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+          "dev": true
         },
-        "through2": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
-          "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
+        "yargs": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
+          "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
           "dev": true,
           "requires": {
-            "readable-stream": "2.3.6"
+            "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"
           }
         }
       }
     },
+    "gulp-zip": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/gulp-zip/-/gulp-zip-4.2.0.tgz",
+      "integrity": "sha512-I+697f6jf+PncdTrqfuwoauxgnLG1yHRg3vlmvDgmJuEnlEHy4meBktJ/oHgfyg4tp6X25wuZqUOraVeVg97wQ==",
+      "dev": true,
+      "requires": {
+        "get-stream": "^3.0.0",
+        "plugin-error": "^0.1.2",
+        "through2": "^2.0.1",
+        "vinyl": "^2.1.0",
+        "yazl": "^2.1.0"
+      }
+    },
     "gulplog": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
@@ -8370,15 +7020,15 @@
       "dev": true
     },
     "handlebars": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.3.0.tgz",
-      "integrity": "sha512-7XlnO8yBXOdi7AzowjZssQr47Ctidqm7GbgARapOaqSN9HQhlClnOkR9HieGauIT3A8MBC6u9wPCXs97PCYpWg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.2.0.tgz",
+      "integrity": "sha512-Kb4xn5Qh1cxAKvQnzNWZ512DhABzyFNmsaJf3OAkWNa4NkaqWcNI8Tao8Tasi0/F4JD9oyG0YxuFyvyR57d+Gw==",
       "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": {
@@ -8403,6 +7053,41 @@
       "requires": {
         "ajv": "^6.5.5",
         "har-schema": "^2.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.9.1",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
+          "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
+          "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": {
+          "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
+        },
+        "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
+        },
+        "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"
+          }
+        }
       }
     },
     "has": {
@@ -8418,6 +7103,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"
       }
@@ -8448,24 +7134,31 @@
     "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",
-      "resolved": "https://registry.npmjs.org/has-glob/-/has-glob-1.0.0.tgz",
-      "integrity": "sha1-mqqe7b/7G6OZCnsAEPtnjuAIEgc=",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/has-glob/-/has-glob-0.1.1.tgz",
+      "integrity": "sha1-omHEwqbGZ+DHe3AKfyl8Oe86pYk=",
       "dev": true,
       "requires": {
-        "is-glob": "3.1.0"
+        "is-glob": "^2.0.1"
       },
       "dependencies": {
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+          "dev": true
+        },
         "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "dev": true,
           "requires": {
-            "is-extglob": "2.1.1"
+            "is-extglob": "^1.0.0"
           }
         }
       }
@@ -8473,7 +7166,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-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+      "dev": true
     },
     "has-value": {
       "version": "1.0.0",
@@ -8504,12 +7204,6 @@
         }
       }
     },
-    "has-yarn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
-      "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
-      "dev": true
-    },
     "hash-base": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
@@ -8542,18 +7236,18 @@
       }
     },
     "homedir-polyfill": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz",
+      "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=",
       "dev": true,
       "requires": {
-        "parse-passwd": "1.0.0"
+        "parse-passwd": "^1.0.0"
       }
     },
     "hosted-git-info": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz",
-      "integrity": "sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz",
+      "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==",
       "dev": true
     },
     "hpack.js": {
@@ -8587,41 +7281,32 @@
       "dev": true
     },
     "http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
       "dev": true,
       "requires": {
-        "depd": "1.1.2",
+        "depd": "~1.1.2",
         "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": "1.5.0",
-        "toidentifier": "1.0.0"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
-        }
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
       }
     },
     "http-parser-js": {
-      "version": "0.4.10",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz",
-      "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.0.tgz",
+      "integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==",
       "dev": true
     },
     "http-proxy": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz",
-      "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==",
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
+      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
       "dev": true,
       "requires": {
-        "eventemitter3": "4.0.0",
-        "follow-redirects": "1.9.0",
-        "requires-port": "1.0.0"
+        "eventemitter3": "^3.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
       }
     },
     "http-proxy-agent": {
@@ -8646,15 +7331,23 @@
       }
     },
     "http-proxy-middleware": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
-      "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz",
+      "integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
       "dev": true,
       "requires": {
-        "http-proxy": "1.18.0",
-        "is-glob": "4.0.1",
-        "lodash": "4.17.15",
-        "micromatch": "3.1.10"
+        "http-proxy": "^1.16.2",
+        "is-glob": "^4.0.0",
+        "lodash": "^4.17.5",
+        "micromatch": "^3.1.9"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "dev": true
+        }
       }
     },
     "http-signature": {
@@ -8675,29 +7368,23 @@
       "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": "2.2.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz",
+      "integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==",
       "dev": true,
       "requires": {
-        "agent-base": "4.3.0",
-        "debug": "3.2.6"
+        "agent-base": "^4.1.0",
+        "debug": "^3.1.0"
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "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.2"
+            "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
         }
       }
     },
@@ -8711,17 +7398,14 @@
       }
     },
     "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "requires": {
-        "safer-buffer": "2.1.2"
-      }
+      "version": "0.4.19",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
+      "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
     },
     "ieee754": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
+      "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
       "dev": true
     },
     "iferr": {
@@ -8731,18 +7415,18 @@
       "dev": true
     },
     "ignore": {
-      "version": "3.3.10",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.8.tgz",
+      "integrity": "sha512-pUh+xUQQhQzevjRHHFqqcTy0/dP/kS9I8HSrUydhihjuD09W6ldVWFtIrwhXdUJHis3i2rZNqEHpZH/cbinFbg==",
       "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.1",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
+      "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
       "dev": true,
       "requires": {
-        "minimatch": "3.0.4"
+        "minimatch": "^3.0.4"
       }
     },
     "image-size": {
@@ -8759,9 +7443,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": "3.1.3",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-3.1.3.tgz",
+      "integrity": "sha512-HG5SXTXTTVy9lGNwS075cNhQoV375jHsIJO3UtMjuUWJOuwlMr0u42FlsKTJcppt5AzsFAsmj9r4kHvsSHh3hQ=="
     },
     "import-cwd": {
       "version": "2.1.0",
@@ -8772,16 +7456,6 @@
         "import-from": "^2.1.0"
       }
     },
-    "import-fresh": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
-      "dev": true,
-      "requires": {
-        "caller-path": "2.0.0",
-        "resolve-from": "3.0.0"
-      }
-    },
     "import-from": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
@@ -8805,6 +7479,60 @@
       "requires": {
         "pkg-dir": "^3.0.0",
         "resolve-cwd": "^2.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.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz",
+          "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==",
+          "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.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
+          "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
+          "dev": true
+        },
+        "pkg-dir": {
+          "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"
+          }
+        }
       }
     },
     "imurmurhash": {
@@ -8813,18 +7541,27 @@
       "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
       "dev": true
     },
+    "in-publish": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
+      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+      "dev": true,
+      "requires": {
+        "repeating": "^2.0.0"
+      }
+    },
     "indexof": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
       "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
       "dev": true
     },
-    "infer-owner": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
-      "dev": true
-    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -8836,9 +7573,9 @@
       }
     },
     "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "ini": {
       "version": "1.3.5",
@@ -8847,80 +7584,79 @@
       "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.2.1",
+      "resolved": "https://registry.npmjs.org/injection-js/-/injection-js-2.2.1.tgz",
+      "integrity": "sha512-zHI+E+dM0PXix5FFTO1Y4/UOyAzE7zG1l/QwAn4jchTThOoBq+UYRFK4AVG7lQgFL+go62SbrzSsjXy9DFEZUg==",
       "dev": true
     },
     "inquirer": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.1.tgz",
-      "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",
-        "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"
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
+      "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
+      "dev": true,
+      "requires": {
+        "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"
       },
       "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
-        },
-        "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==",
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
           "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==",
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "emoji-regex": "8.0.0",
-            "is-fullwidth-code-point": "3.0.0",
-            "strip-ansi": "5.2.0"
+            "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"
           }
         },
-        "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"
-          }
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "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
         }
       }
     },
     "internal-ip": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
-      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-3.0.1.tgz",
+      "integrity": "sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==",
       "dev": true,
       "requires": {
-        "default-gateway": "4.2.0",
-        "ipaddr.js": "1.9.0"
+        "default-gateway": "^2.6.0",
+        "ipaddr.js": "^1.5.2"
       }
     },
     "interpret": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
-      "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
+      "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=",
       "dev": true
     },
     "intersect": {
@@ -8932,6 +7668,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"
       }
@@ -8955,9 +7692,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.8.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
+      "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4=",
       "dev": true
     },
     "is-absolute": {
@@ -8970,12 +7707,6 @@
         "is-windows": "^1.0.1"
       }
     },
-    "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-accessor-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
@@ -8994,12 +7725,6 @@
         }
       }
     },
-    "is-arguments": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
-      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
-      "dev": true
-    },
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -9019,6 +7744,15 @@
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
     },
+    "is-builtin-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+      "dev": true,
+      "requires": {
+        "builtin-modules": "^1.0.0"
+      }
+    },
     "is-callable": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
@@ -9026,12 +7760,12 @@
       "dev": true
     },
     "is-ci": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
+      "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
       "dev": true,
       "requires": {
-        "ci-info": "2.0.0"
+        "ci-info": "^1.5.0"
       }
     },
     "is-data-descriptor": {
@@ -9110,11 +7844,11 @@
       }
     },
     "is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
+      "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
       "requires": {
-        "is-extglob": "2.1.1"
+        "is-extglob": "^2.1.1"
       }
     },
     "is-installed-globally": {
@@ -9140,16 +7874,16 @@
       "dev": true
     },
     "is-my-json-valid": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.0.tgz",
-      "integrity": "sha512-XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA==",
+      "version": "2.17.2",
+      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz",
+      "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==",
       "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": {
@@ -9159,9 +7893,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": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz",
+      "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=",
       "dev": true
     },
     "is-number": {
@@ -9188,6 +7922,21 @@
       "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
       "dev": true
     },
+    "is-odd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz",
+      "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==",
+      "requires": {
+        "is-number": "^4.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="
+        }
+      }
+    },
     "is-path-cwd": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
@@ -9212,12 +7961,6 @@
         "path-is-inside": "^1.0.1"
       }
     },
-    "is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-      "dev": true
-    },
     "is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
@@ -9238,14 +7981,11 @@
       "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
       "dev": true
     },
-    "is-reference": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.1.4.tgz",
-      "integrity": "sha512-uJA/CDPO3Tao3GTrxYn6AwkM4nUPJiGGYu5+cB8qbC7WGFlrKZbiRo7SFKxUAEpFUfiHofWCXBUNhvYJMh+6zw==",
-      "dev": true,
-      "requires": {
-        "@types/estree": "0.0.39"
-      }
+    "is-redirect": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
+      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
+      "dev": true
     },
     "is-regex": {
       "version": "1.0.4",
@@ -9271,6 +8011,12 @@
       "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
       "dev": true
     },
+    "is-retry-allowed": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
+      "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
+      "dev": true
+    },
     "is-running": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-running/-/is-running-2.1.0.tgz",
@@ -9284,13 +8030,10 @@
       "dev": true
     },
     "is-symbol": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
-      "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
-      "dev": true,
-      "requires": {
-        "has-symbols": "1.0.0"
-      }
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
+      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
+      "dev": true
     },
     "is-typedarray": {
       "version": "1.0.0",
@@ -9314,9 +8057,9 @@
       "dev": true
     },
     "is-valid-glob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
-      "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz",
+      "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=",
       "dev": true
     },
     "is-windows": {
@@ -9330,12 +8073,6 @@
       "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
       "dev": true
     },
-    "is-yarn-global": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
-      "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==",
-      "dev": true
-    },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -9389,18 +8126,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
-        },
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-          "dev": true
-        },
         "esprima": {
           "version": "2.7.3",
           "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
@@ -9444,22 +8169,145 @@
       }
     },
     "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.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"
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.3.7.tgz",
+      "integrity": "sha512-4/ApBnMVeEPG3EkSzcw25wDe4N66wxwn+KKn6b47vyek8Xb3NBAcg4xfuQbS7BqcZuTX4wxfD5lVagdggR3gyA==",
+      "dev": true,
+      "requires": {
+        "async": "^2.1.4",
+        "fileset": "^2.0.2",
+        "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.5.1",
+        "js-yaml": "^3.7.0",
+        "mkdirp": "^0.5.1",
+        "once": "^1.4.0"
+      },
+      "dependencies": {
+        "append-transform": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz",
+          "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=",
+          "dev": true,
+          "requires": {
+            "default-require-extensions": "^1.0.0"
+          }
+        },
+        "async": {
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
+          "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
+          "dev": true,
+          "requires": {
+            "lodash": "^4.17.11"
+          }
+        },
+        "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"
+          }
+        },
+        "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=",
+          "dev": true,
+          "requires": {
+            "strip-bom": "^2.0.0"
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "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==",
+          "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==",
+          "dev": true,
+          "requires": {
+            "append-transform": "^0.4.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==",
+          "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"
+          }
+        },
+        "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==",
+          "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-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==",
+          "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"
+          }
+        },
+        "istanbul-reports": {
+          "version": "1.5.1",
+          "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.5.1.tgz",
+          "integrity": "sha512-+cfoZ0UXzWjhAdzosCPP3AN8vvef8XDkWtTfgaN+7L3YTpNYITnCaEkceo5SEYy644VkHka/P1FvkWvrG/rrJw==",
+          "dev": true,
+          "requires": {
+            "handlebars": "^4.0.3"
+          }
+        },
+        "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
+        },
+        "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-instrumenter-loader": {
@@ -9486,18 +8334,6 @@
             "json-schema-traverse": "^0.3.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",
@@ -9510,101 +8346,24 @@
       }
     },
     "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": "1.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz",
+      "integrity": "sha512-GvgM/uXRwm+gLlvkWHTjDAvwynZkL9ns15calTrmhGgowlwJBbWMYzWbKqE2DT6JDP1AFXKa+Zi0EkqNCUqY0A==",
       "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==",
-      "dev": true,
-      "requires": {
-        "append-transform": "0.4.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==",
-      "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"
-      }
-    },
-    "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==",
-      "dev": true,
-      "requires": {
-        "istanbul-lib-coverage": "1.2.1",
-        "mkdirp": "0.5.1",
-        "path-parse": "1.0.6",
-        "supports-color": "3.2.3"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "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==",
-      "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"
-      },
-      "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.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
-        }
-      }
-    },
-    "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": "1.10.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz",
+      "integrity": "sha512-1dYuzkOCbuR5GRJqySuZdsmsNKPL3PTuyPevQfoCXJePT9C8y1ga75neU+Tuy9+yS3G/dgx8wgOmp2KLpgdoeQ==",
       "dev": true,
       "requires": {
-        "handlebars": "4.3.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.0",
+        "semver": "^5.3.0"
       }
     },
     "jasmine": {
@@ -9627,19 +8386,11 @@
       }
     },
     "jasmine-core": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.5.0.tgz",
-      "integrity": "sha512-nCeAiw37MIMA9w9IXso7bRaLl+c/ef3wnxsoSAlYrzS+Ot0zTG6nU8G/cIfGkqpkjX2wNaIW9RFG0TwIFnG6bA==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.3.0.tgz",
+      "integrity": "sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA==",
       "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",
@@ -9655,25 +8406,17 @@
       "integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
       "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==",
-      "dev": true,
-      "requires": {
-        "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=="
+    "js-base64": {
+      "version": "2.4.8",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.8.tgz",
+      "integrity": "sha512-hm2nYpDrwoO/OzBhdcqs/XGT6XjSuSSCVEpia+Kl2J6x4CYt5hISlVL/AYU1khoDXv0AQVgxtdJySb9gjAn56Q==",
+      "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=="
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+      "dev": true
     },
     "js-yaml": {
       "version": "3.13.1",
@@ -9689,17 +8432,13 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
-    },
-    "json-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+      "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
       "dev": true
     },
     "json-parse-better-errors": {
@@ -9715,9 +8454,10 @@
       "dev": true
     },
     "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=="
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+      "dev": true
     },
     "json-stable-stringify": {
       "version": "1.0.1",
@@ -9741,26 +8481,35 @@
       "dev": true
     },
     "json3": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
-      "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
+      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
       "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"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
       }
     },
     "jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
+      "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.2.2"
+        "graceful-fs": "^4.1.6"
       }
     },
     "jsonify": {
@@ -9847,13 +8596,22 @@
       },
       "dependencies": {
         "anymatch": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-          "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.0.tgz",
+          "integrity": "sha512-Ozz7l4ixzI7Oxj2+cw+p0tVUt27BpaJ+1+q1TCeANWxHpvyn2+Un+YamBdfKu0uh8xLodGhoa1v7595NhKDAuA==",
           "dev": true,
           "requires": {
-            "normalize-path": "3.0.0",
-            "picomatch": "2.0.7"
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
+          }
+        },
+        "async": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+          "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+          "dev": true,
+          "requires": {
+            "lodash": "^4.17.14"
           }
         },
         "binary-extensions": {
@@ -9872,21 +8630,27 @@
           }
         },
         "chokidar": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.2.1.tgz",
-          "integrity": "sha512-/j5PPkb5Feyps9e+jo07jUZGvkB5Aj953NrI4s8xSVScrAo/RHeILrtdb4uzR7N6aaFFxxJ+gt8mA8HfNpw76w==",
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.1.1.tgz",
+          "integrity": "sha512-df4o16uZmMHzVQwECZRHwfguOt5ixpuQVaZHjYMvYisgKhE+JXwcj/Tcr3+3bu/XeOJQ9ycYmzu7Mv8XrGxJDQ==",
           "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.0",
+            "braces": "^3.0.2",
+            "fsevents": "^2.0.6",
+            "glob-parent": "^5.0.0",
+            "is-binary-path": "^2.1.0",
+            "is-glob": "^4.0.1",
+            "normalize-path": "^3.0.0",
+            "readdirp": "^3.1.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==",
+          "dev": true
+        },
         "date-format": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz",
@@ -9923,19 +8687,19 @@
           }
         },
         "fsevents": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.0.tgz",
-          "integrity": "sha512-+iXhW3LuDQsno8dOIrCIT/CBjeBWuP7PXe8w9shnj9Lebny/Gx1ZjVBYwexLz36Ri2jKuXMNpV6CYNh8lHHgrQ==",
+          "version": "2.0.7",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.0.7.tgz",
+          "integrity": "sha512-a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ==",
           "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.0.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz",
+          "integrity": "sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==",
           "dev": true,
           "requires": {
-            "is-glob": "4.0.1"
+            "is-glob": "^4.0.1"
           }
         },
         "is-binary-path": {
@@ -9947,12 +8711,36 @@
             "binary-extensions": "^2.0.0"
           }
         },
+        "is-glob": {
+          "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-number": {
           "version": "7.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
           "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
           "dev": true
         },
+        "jsonfile": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.6"
+          }
+        },
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "dev": true
+        },
         "log4js": {
           "version": "4.5.1",
           "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.5.1.tgz",
@@ -9985,14 +8773,20 @@
           "dev": true
         },
         "readdirp": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.1.3.tgz",
-          "integrity": "sha512-ZOsfTGkjO2kqeR5Mzr5RYDbTGYneSkdNKX2fOX2P5jF7vMrd/GNnIAUtDldeHHumHUCQ3V05YfWUdxMPAsRu9Q==",
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.1.2.tgz",
+          "integrity": "sha512-8rhl0xs2cxfVsqzreYCvs8EwBfn/DhVdqtoLmw19uI3SC5avYX9teCurlErfpPXGmYtMHReGaP2RsLnFvz/lnw==",
           "dev": true,
           "requires": {
-            "picomatch": "2.0.7"
+            "picomatch": "^2.0.4"
           }
         },
+        "rfdc": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz",
+          "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==",
+          "dev": true
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -10035,168 +8829,32 @@
       }
     },
     "karma-chrome-launcher": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.1.0.tgz",
-      "integrity": "sha512-3dPs/n7vgz1rxxtynpzZTvb9y/GIaW8xjAwcIGttLbycqoFtI7yo1NGnQi6oFTherRE+GIhCAHZC4vEqWGhNvg==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz",
+      "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==",
       "dev": true,
       "requires": {
-        "which": "1.3.1"
+        "fs-access": "^1.0.0",
+        "which": "^1.2.1"
       }
     },
     "karma-cli": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/karma-cli/-/karma-cli-2.0.0.tgz",
-      "integrity": "sha512-1Kb28UILg1ZsfqQmeELbPzuEb5C6GZJfVIk0qOr8LNYQuYWmAaqP16WpbpKEjhejDrDYyYOwwJXSZO6u7q5Pvw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/karma-cli/-/karma-cli-1.0.1.tgz",
+      "integrity": "sha1-rmw8WKMTodALRRZMRVubhs4X+WA=",
       "dev": true,
       "requires": {
-        "resolve": "1.12.0"
+        "resolve": "^1.1.6"
       }
     },
     "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.0.1",
+      "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.1.tgz",
+      "integrity": "sha512-UcgrHkFehI5+ivMouD8NH/UOHiX4oCAtwaANylzPFdcAuD52fnCUuelacq2gh8tZ4ydhU3+xiXofSq7j5Ehygw==",
       "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.2"
-          }
-        },
-        "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.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"
-          }
-        },
-        "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.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"
-          }
-        },
-        "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.7.1",
-            "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.3.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
-        },
-        "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
-        }
+        "istanbul-api": "^1.3.1",
+        "minimatch": "^3.0.4"
       }
     },
     "karma-jasmine": {
@@ -10209,36 +8867,27 @@
       }
     },
     "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.4.0",
+      "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.4.0.tgz",
+      "integrity": "sha512-0wxhwA8PLPpICZ4o2GRnPi67hf3JhfQm5WCB8nElh4qsE6wRNOTtrqooyBPNqI087Xr2SBhxLg5fU+BJ/qxRrw==",
       "dev": true
     },
     "karma-source-map-support": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz",
-      "integrity": "sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz",
+      "integrity": "sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==",
       "dev": true,
       "requires": {
-        "source-map-support": "0.5.13"
+        "source-map-support": "^0.5.5"
       }
     },
     "karma-spec-reporter": {
-      "version": "0.0.32",
-      "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.32.tgz",
-      "integrity": "sha1-LpxyB+pyZ3EmAln4K+y1QyCeRAo=",
-      "dev": true,
-      "requires": {
-        "colors": "1.1.2"
-      }
-    },
-    "keyv": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
-      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
+      "version": "0.0.31",
+      "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.31.tgz",
+      "integrity": "sha1-SDDccUihVcfXoYbmMjOaDYD63sM=",
       "dev": true,
       "requires": {
-        "json-buffer": "3.0.0"
+        "colors": "^1.1.2"
       }
     },
     "killable": {
@@ -10278,14 +8927,20 @@
       }
     },
     "latest-version": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
-      "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz",
+      "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
       "dev": true,
       "requires": {
-        "package-json": "6.5.0"
+        "package-json": "^4.0.0"
       }
     },
+    "lazy-cache": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
+      "dev": true
+    },
     "lazystream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
@@ -10330,6 +8985,12 @@
         "source-map": "~0.6.0"
       },
       "dependencies": {
+        "clone": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+          "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+          "dev": true
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -10340,22 +9001,14 @@
       }
     },
     "less-loader": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-5.0.0.tgz",
-      "integrity": "sha512-bquCU89mO/yWLaUq0Clk7qCsKhsF/TZpJUzETRvJa9KSVEL9SO3ovCvdEHISBhrC81OwC8QSVX7E0bzElZj9cg==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-4.1.0.tgz",
+      "integrity": "sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==",
       "dev": true,
       "requires": {
-        "clone": "2.1.2",
-        "loader-utils": "1.2.3",
-        "pify": "4.0.1"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
-        }
+        "clone": "^2.1.1",
+        "loader-utils": "^1.1.0",
+        "pify": "^3.0.0"
       }
     },
     "less-plugin-npm-import": {
@@ -10396,13 +9049,13 @@
       }
     },
     "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.0",
+      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.1.0.tgz",
+      "integrity": "sha512-vDiBeMWxjE9n6TabQ9J4FH8urFdsRK0Nvxn1cit9biCiR9aq1zBR0X2BlAkEiIG6qPamLeU0GzvIgLkrFc398A==",
       "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": {
@@ -10430,12 +9083,6 @@
         "resolve": "^1.1.7"
       }
     },
-    "lines-and-columns": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
-      "dev": true
-    },
     "load-json-file": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
@@ -10467,6 +9114,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",
@@ -10474,23 +9122,30 @@
       }
     },
     "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",
-        "path-exists": "3.0.0"
+        "p-locate": "^2.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=="
+      "version": "4.17.13",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.13.tgz",
+      "integrity": "sha512-vm3/XWXfWtRua0FkUyEHBZy8kCPjErNBT9fJx8Zvs+U6zjqPbTUOpkaoum3O5uiA8sm+yNMHXfYkTUHFoMxFNA=="
     },
     "lodash-es": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz",
-      "integrity": "sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ=="
+      "version": "4.17.14",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.14.tgz",
+      "integrity": "sha512-7zchRrGa8UZXjD/4ivUWP1867jDkhzTG2c/uj739utSd7O/pFFdxspCemIFKEEjErbcqRzn8nKnGsi7mvTgRPA=="
+    },
+    "lodash.assign": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
+      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
+      "dev": true
     },
     "lodash.capitalize": {
       "version": "4.2.1",
@@ -10515,6 +9170,18 @@
       "integrity": "sha1-hImxyw0p/4gZXM7KRI/21swpXDY=",
       "dev": true
     },
+    "lodash.mergewith": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz",
+      "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==",
+      "dev": true
+    },
+    "lodash.tail": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz",
+      "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=",
+      "dev": true
+    },
     "log4js": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/log4js/-/log4js-3.0.6.tgz",
@@ -10528,6 +9195,12 @@
         "streamroller": "0.7.0"
       },
       "dependencies": {
+        "circular-json": {
+          "version": "0.5.9",
+          "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz",
+          "integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==",
+          "dev": true
+        },
         "debug": {
           "version": "3.2.6",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
@@ -10538,25 +9211,42 @@
           }
         },
         "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "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
         }
       }
     },
     "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.1",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz",
+      "integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=",
+      "dev": true
+    },
+    "lolex": {
+      "version": "1.3.2",
+      "resolved": "http://registry.npmjs.org/lolex/-/lolex-1.3.2.tgz",
+      "integrity": "sha1-fD2mL/yzDw9agKJWbKJORdigHzE=",
       "dev": true
     },
     "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
+      "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
+      "dev": true,
+      "requires": {
+        "js-tokens": "^3.0.0"
+      }
+    },
+    "loud-rejection": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
+      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+      "dev": true,
       "requires": {
-        "js-tokens": "4.0.0"
+        "currently-unhandled": "^0.4.1",
+        "signal-exit": "^3.0.0"
       }
     },
     "lowercase-keys": {
@@ -10566,61 +9256,160 @@
       "dev": true
     },
     "lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
+      "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
       "dev": true,
       "requires": {
-        "yallist": "3.1.1"
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.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==",
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.2.tgz",
+      "integrity": "sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==",
+      "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==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+      "dev": true,
       "requires": {
-        "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=="
-        }
+        "pify": "^3.0.0"
       }
     },
     "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.4",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.4.tgz",
+      "integrity": "sha512-0Dab5btKVPhibSalc9QGXb559ED7G7iLjFXBaj9Wq8O3vorueR5K5jaE3hkG6ZQINyhA/JgG6Qk4qdFQjsYV6g==",
       "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": "4.0.1",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz",
+      "integrity": "sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==",
       "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": "^11.0.1",
+        "http-cache-semantics": "^3.8.1",
+        "http-proxy-agent": "^2.1.0",
+        "https-proxy-agent": "^2.2.1",
+        "lru-cache": "^4.1.2",
+        "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"
+      },
+      "dependencies": {
+        "bluebird": {
+          "version": "3.5.3",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
+          "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==",
+          "dev": true
+        },
+        "cacache": {
+          "version": "11.3.2",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+          "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.3",
+            "chownr": "^1.1.1",
+            "figgy-pudding": "^3.5.1",
+            "glob": "^7.1.3",
+            "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.2",
+            "ssri": "^6.0.1",
+            "unique-filename": "^1.1.1",
+            "y18n": "^4.0.0"
+          },
+          "dependencies": {
+            "lru-cache": {
+              "version": "5.1.1",
+              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+              "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+              "dev": true,
+              "requires": {
+                "yallist": "^3.0.2"
+              }
+            }
+          }
+        },
+        "glob": {
+          "version": "7.1.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+          "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"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.1.15",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
+          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
+          "dev": true
+        },
+        "mississippi": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+          "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+          "dev": true,
+          "requires": {
+            "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"
+          }
+        },
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.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"
+          }
+        },
+        "yallist": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+          "dev": true
+        }
       }
     },
     "make-iterator": {
@@ -10632,12 +9421,6 @@
         "kind-of": "^6.0.2"
       }
     },
-    "mamacro": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
-      "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
-      "dev": true
-    },
     "map-age-cleaner": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
@@ -10652,9 +9435,15 @@
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
       "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
     },
+    "map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+      "dev": true
+    },
     "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
     },
@@ -10755,17 +9544,40 @@
       }
     },
     "matched": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/matched/-/matched-1.0.2.tgz",
-      "integrity": "sha512-7ivM1jFZVTOOS77QsR+TtYHH0ecdLclMkqbf5qiJdX2RorqfhsL65QHySPZgDE0ZjHoh+mQUNHTanNXIlzXd0Q==",
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/matched/-/matched-0.4.4.tgz",
+      "integrity": "sha1-Vte36xgDPwz5vFLrIJD6x9weifo=",
       "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.0",
+        "extend-shallow": "^2.0.1",
+        "fs-exists-sync": "^0.1.0",
+        "glob": "^7.0.5",
+        "has-glob": "^0.1.1",
+        "is-valid-glob": "^0.3.0",
+        "lazy-cache": "^2.0.1",
+        "resolve-dir": "^0.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "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"
+          }
+        },
+        "lazy-cache": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz",
+          "integrity": "sha1-uRkKT5EzVGlIQIWfio9whNiCImQ=",
+          "dev": true,
+          "requires": {
+            "set-getter": "^0.1.0"
+          }
+        }
       }
     },
     "md5.js": {
@@ -10786,20 +9598,21 @@
       "dev": true
     },
     "mem": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-5.1.1.tgz",
-      "integrity": "sha512-qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-4.0.0.tgz",
+      "integrity": "sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==",
       "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": "^1.0.0",
+        "p-is-promise": "^1.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"
@@ -10811,6 +9624,32 @@
       "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=",
       "dev": true
     },
+    "meow": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+      "dev": true,
+      "requires": {
+        "camelcase-keys": "^2.0.0",
+        "decamelize": "^1.1.2",
+        "loud-rejection": "^1.0.0",
+        "map-obj": "^1.0.1",
+        "minimist": "^1.1.3",
+        "normalize-package-data": "^2.3.4",
+        "object-assign": "^4.0.1",
+        "read-pkg-up": "^1.0.1",
+        "redent": "^1.0.0",
+        "trim-newlines": "^1.0.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
     "merge": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
@@ -10823,16 +9662,10 @@
       "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
       "dev": true
     },
-    "merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
-    },
     "merge2": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz",
-      "integrity": "sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.2.tgz",
+      "integrity": "sha512-bgM8twH86rWni21thii6WCMQMRMmwqqdW3sGWi9IipnVAszdLXRjwDwAnyrVXo6DuP3AjRMMttZKUB48QWIFGg==",
       "dev": true
     },
     "methods": {
@@ -10875,45 +9708,39 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "dev": true
+      "dev": true,
+      "optional": 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.33.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
+      "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
       "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.18",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
+      "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
       "dev": true,
       "requires": {
-        "mime-db": "1.40.0"
+        "mime-db": "~1.33.0"
       }
     },
     "mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true
-    },
-    "mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "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
     },
     "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.5.0",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz",
+      "integrity": "sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==",
       "dev": true,
       "requires": {
-        "loader-utils": "1.2.3",
-        "normalize-url": "1.9.1",
-        "schema-utils": "1.0.0",
-        "webpack-sources": "1.4.3"
+        "loader-utils": "^1.1.0",
+        "schema-utils": "^1.0.0",
+        "webpack-sources": "^1.1.0"
       }
     },
     "minimalistic-assert": {
@@ -10937,57 +9764,54 @@
       }
     },
     "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "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": "2.3.5",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
+      "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
       "dev": true,
       "requires": {
-        "safe-buffer": "5.1.2",
-        "yallist": "3.1.1"
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.0"
+      },
+      "dependencies": {
+        "yallist": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+          "dev": true
+        }
       }
     },
     "minizlib": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
-      "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+      "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,
       "requires": {
-        "minipass": "2.9.0"
+        "minipass": "^2.2.1"
       }
     },
     "mississippi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-      "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"
-      },
-      "dependencies": {
-        "pump": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "1.4.3",
-            "once": "1.4.0"
-          }
-        }
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
+      "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
+      "dev": true,
+      "requires": {
+        "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": "^2.0.1",
+        "pumpify": "^1.3.3",
+        "stream-each": "^1.1.0",
+        "through2": "^2.0.0"
       }
     },
     "mixin-deep": {
@@ -11009,25 +9833,37 @@
         }
       }
     },
+    "mixin-object": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
+      "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
+      "dev": true,
+      "requires": {
+        "for-in": "^0.1.3",
+        "is-extendable": "^0.1.1"
+      },
+      "dependencies": {
+        "for-in": {
+          "version": "0.1.8",
+          "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
+          "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=",
+          "dev": true
+        }
+      }
+    },
     "mkdirp": {
       "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"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-        }
       }
     },
     "mktemp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/mktemp/-/mktemp-1.0.0.tgz",
-      "integrity": "sha512-2duBeS0A75x0M3sCoY0R1TiLsYfIBUtNBNWS++eo+bX/ObVqzblqnEQhlaepoBOLD14wklsV3cYxZ68o5qYO8A==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/mktemp/-/mktemp-0.4.0.tgz",
+      "integrity": "sha1-bQUVYRyKjITkhKogABKbmOmB/ws=",
       "dev": true
     },
     "moment": {
@@ -11036,11 +9872,11 @@
       "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.23",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.23.tgz",
+      "integrity": "sha512-WHFH85DkCfiNMDX5D3X7hpNH3/PUhjTGcD0U1SgfBGZxJ3qUmJh5FdvaFjcClxOvB3rzdfj4oRffbI38jEnC1w==",
       "requires": {
-        "moment": "2.24.0"
+        "moment": ">= 2.9.0"
       }
     },
     "move-concurrently": {
@@ -11085,276 +9921,241 @@
       "dev": true
     },
     "mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
+      "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=",
       "dev": true
     },
     "nan": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
-      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
-      "optional": true
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
+      "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="
     },
     "nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-      "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"
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz",
+      "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==",
+      "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-odd": "^2.0.0",
+        "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": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
+      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
       "dev": true
     },
     "neo-async": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
-      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
-      "dev": true
-    },
-    "next-tick": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-      "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==",
-      "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"
-      },
-      "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"
-          }
-        },
-        "anymatch": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-          "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-          "dev": true,
-          "requires": {
-            "normalize-path": "3.0.0",
-            "picomatch": "2.0.7"
-          }
-        },
-        "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==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.0.tgz",
+      "integrity": "sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==",
+      "dev": true
+    },
+    "next-tick": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
+      "dev": true
+    },
+    "ng-packagr": {
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/ng-packagr/-/ng-packagr-4.7.1.tgz",
+      "integrity": "sha512-MIPKxyrnV22fS3wSfst2XjwWOonFKujVVEnIehYJhiu8GOg37bCdbbr9plsE1jRDmDAUz6M1MvdKibUrJyRp6Q==",
+      "dev": true,
+      "requires": {
+        "@ngtools/json-schema": "^1.1.0",
+        "autoprefixer": "^9.0.0",
+        "browserslist": "^4.0.0",
+        "chalk": "^2.3.1",
+        "chokidar": "^2.0.3",
+        "clean-css": "^4.1.11",
+        "commander": "^2.12.0",
+        "fs-extra": "^7.0.0",
+        "glob": "^7.1.2",
+        "injection-js": "^2.2.1",
+        "less": "^3.8.0",
+        "less-plugin-npm-import": "^2.1.0",
+        "node-sass": "^4.9.3",
+        "node-sass-tilde-importer": "^1.0.0",
+        "opencollective-postinstall": "^2.0.1",
+        "postcss": "^7.0.0",
+        "postcss-url": "^8.0.0",
+        "read-pkg-up": "^4.0.0",
+        "rimraf": "^2.6.1",
+        "rollup": "^0.67.0",
+        "rollup-plugin-commonjs": "^9.1.3",
+        "rollup-plugin-json": "^3.1.0",
+        "rollup-plugin-node-resolve": "^4.0.0",
+        "rollup-plugin-sourcemaps": "^0.4.2",
+        "rxjs": "^6.0.0",
+        "stylus": "^0.54.5",
+        "uglify-js": "^3.0.7",
+        "update-notifier": "^2.3.0"
+      },
+      "dependencies": {
+        "chalk": {
+          "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": {
-            "fill-range": "7.0.1"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
-        "chokidar": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.2.1.tgz",
-          "integrity": "sha512-/j5PPkb5Feyps9e+jo07jUZGvkB5Aj953NrI4s8xSVScrAo/RHeILrtdb4uzR7N6aaFFxxJ+gt8mA8HfNpw76w==",
+        "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": {
-            "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"
+            "locate-path": "^3.0.0"
           }
         },
-        "commander": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz",
-          "integrity": "sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==",
-          "dev": true
-        },
-        "fill-range": {
+        "fs-extra": {
           "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
           "dev": true,
           "requires": {
-            "to-regex-range": "5.0.1"
+            "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==",
-          "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==",
+        "jsonfile": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
           "dev": true,
           "requires": {
-            "is-glob": "4.0.1"
+            "graceful-fs": "^4.1.6"
           }
         },
-        "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==",
+        "load-json-file": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
           "dev": true,
           "requires": {
-            "binary-extensions": "2.0.0"
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^4.0.0",
+            "pify": "^3.0.0",
+            "strip-bom": "^3.0.0"
           }
         },
-        "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
-        },
-        "normalize-path": {
+        "locate-path": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
-        },
-        "parse-json": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz",
-          "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
           "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"
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
           }
         },
-        "read-pkg": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-          "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+        "p-limit": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz",
+          "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==",
           "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"
+            "p-try": "^2.0.0"
           }
         },
-        "read-pkg-up": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-5.0.0.tgz",
-          "integrity": "sha512-XBQjqOBtTzyol2CpsQOw8LHV0XbDZVG7xMMjmXAJomlVY03WOBRmYgDJETlvcg0H63AJvPRwT7GFi5rvOzUOKg==",
+        "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": {
-            "find-up": "3.0.0",
-            "read-pkg": "5.2.0"
+            "p-limit": "^2.0.0"
           }
         },
-        "readdirp": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.1.3.tgz",
-          "integrity": "sha512-ZOsfTGkjO2kqeR5Mzr5RYDbTGYneSkdNKX2fOX2P5jF7vMrd/GNnIAUtDldeHHumHUCQ3V05YfWUdxMPAsRu9Q==",
+        "p-try": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
+          "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
+          "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": {
-            "picomatch": "2.0.7"
+            "error-ex": "^1.3.1",
+            "json-parse-better-errors": "^1.0.1"
           }
         },
-        "rimraf": {
+        "read-pkg": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.0.tgz",
-          "integrity": "sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
           "dev": true,
           "requires": {
-            "glob": "7.1.3"
+            "load-json-file": "^4.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^3.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==",
+        "read-pkg-up": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz",
+          "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==",
           "dev": true,
           "requires": {
-            "is-number": "7.0.0"
+            "find-up": "^3.0.0",
+            "read-pkg": "^3.0.0"
           }
         },
-        "type-fest": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-          "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
           "dev": true
         }
       }
     },
+    "ngrx-store-freeze": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/ngrx-store-freeze/-/ngrx-store-freeze-0.2.3.tgz",
+      "integrity": "sha512-IO2zBWMAyAWZgK6zbPhmR3tNRgW+jfi/Z+Xkvaa42w6eYNQ8bEwYv7uxZo/3MQJ5RglxZ+6KsDLXPzjN+ZUEZw==",
+      "dev": true,
+      "requires": {
+        "deep-freeze-strict": "^1.1.1"
+      }
+    },
     "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": "github:cf-stratos/ngrx-store-localstorage#e722ed60861d49bec99482ac54f13e7485bb0ac9",
+      "from": "github:cf-stratos/ngrx-store-localstorage#lodash-dep-update",
       "requires": {
-        "deepmerge": "3.3.0"
+        "lodash": "^4.17.11"
       }
     },
+    "ngx-json-viewer": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/ngx-json-viewer/-/ngx-json-viewer-2.4.0.tgz",
+      "integrity": "sha512-26QmLp+0ds90aFug3KbSIwqtmQgCcJYFNNNcmcZHgPRj75nhKzbo4ceKxkhWmY5auKZClVO0HTZSs5bBhgb1Bw=="
+    },
     "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.3.0",
+      "resolved": "https://registry.npmjs.org/ngx-moment/-/ngx-moment-3.3.0.tgz",
+      "integrity": "sha512-6fpllpJqLfjRWboOhphgeEYt+rzIA9O29rG5QWCebRt2X0uNk4P93sLEb0S8lbDF0dEp2NOC3UOD+xoCVlJQhA==",
       "requires": {
-        "tslib": "1.10.0"
+        "tslib": "^1.9.0"
       }
     },
     "nice-try": {
@@ -11363,12 +10164,6 @@
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
       "dev": true
     },
-    "node-fetch": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
-      "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",
@@ -11381,40 +10176,68 @@
       }
     },
     "node-forge": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz",
-      "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==",
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz",
+      "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==",
       "dev": true
     },
+    "node-gyp": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
+      "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
+      "dev": true,
+      "requires": {
+        "fstream": "^1.0.0",
+        "glob": "^7.0.3",
+        "graceful-fs": "^4.1.2",
+        "mkdirp": "^0.5.0",
+        "nopt": "2 || 3",
+        "npmlog": "0 || 1 || 2 || 3 || 4",
+        "osenv": "0",
+        "request": "^2.87.0",
+        "rimraf": "2",
+        "semver": "~5.3.0",
+        "tar": "^2.0.0",
+        "which": "1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+          "dev": true
+        }
+      }
+    },
     "node-libs-browser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-      "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",
-        "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",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.0.tgz",
+      "integrity": "sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==",
+      "dev": true,
+      "requires": {
+        "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.0",
+        "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": "0.0.4"
       },
       "dependencies": {
         "punycode": {
@@ -11422,15 +10245,79 @@
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
           "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
           "dev": true
+        },
+        "util": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+          "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3"
+          }
         }
       }
     },
     "node-releases": {
-      "version": "1.1.33",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.33.tgz",
-      "integrity": "sha512-I0V30bWQEoHb+10W8oedVoUrdjW5wIkYm0w7vvcrPO95pZY738m1k77GF5sO0vKg5eXYg9oGtrMAETbgZGm11A==",
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.8.tgz",
+      "integrity": "sha512-gQm+K9mGCiT/NXHy+V/ZZS1N/LOaGGqRAAJJs3X9Ah1g+CIbRcBgNyoNYQ+SEtcyAtB9KqDruu+fF7nWjsqRaA==",
+      "dev": true,
       "requires": {
-        "semver": "5.6.0"
+        "semver": "^5.3.0"
+      }
+    },
+    "node-sass": {
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.11.0.tgz",
+      "integrity": "sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==",
+      "dev": true,
+      "requires": {
+        "async-foreach": "^0.1.3",
+        "chalk": "^1.1.1",
+        "cross-spawn": "^3.0.0",
+        "gaze": "^1.0.0",
+        "get-stdin": "^4.0.1",
+        "glob": "^7.0.3",
+        "in-publish": "^2.0.0",
+        "lodash.assign": "^4.2.0",
+        "lodash.clonedeep": "^4.3.2",
+        "lodash.mergewith": "^4.6.0",
+        "meow": "^3.7.0",
+        "mkdirp": "^0.5.1",
+        "nan": "^2.10.0",
+        "node-gyp": "^3.8.0",
+        "npmlog": "^4.0.0",
+        "request": "^2.88.0",
+        "sass-graph": "^2.2.4",
+        "stdout-stream": "^1.4.0",
+        "true-case-path": "^1.0.2"
+      },
+      "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"
+          }
+        },
+        "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
+        }
       }
     },
     "node-sass-tilde-importer": {
@@ -11452,15 +10339,15 @@
       }
     },
     "normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
       "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",
+        "is-builtin-module": "^1.0.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
       }
     },
     "normalize-path": {
@@ -11477,22 +10364,10 @@
       "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
       "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.1.1",
-        "prepend-http": "1.0.4",
-        "query-string": "4.3.4",
-        "sort-keys": "1.1.2"
-      }
-    },
     "normalizr": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/normalizr/-/normalizr-3.4.1.tgz",
-      "integrity": "sha512-gei+tJucERU8vYN6TFQL2k5YMLX2Yh7nlylKMJC65+Uu/LS3xQCDJc8cies72aHouycKYyVgcnyLRbaJsigXKw=="
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/normalizr/-/normalizr-3.2.4.tgz",
+      "integrity": "sha1-Fqr8VAypncEGDOqhkzVWMi6sRCk="
     },
     "now-and-later": {
       "version": "2.0.1",
@@ -11522,47 +10397,38 @@
       }
     },
     "npm-packlist": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.4.tgz",
-      "integrity": "sha512-zTLo8UcVYtDU3gdeaFu2Xu0n0EvelfHDGuqtNIn5RO7yQj4H1TqNdBc/yZjxnWA0PVB8D3Woyp0i5B43JwQ6Vw==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz",
+      "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
       "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": {
-      "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": "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==",
       "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": {
-      "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": "3.9.0",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-3.9.0.tgz",
+      "integrity": "sha512-srwmt8YhNajAoSAaDWndmZgx89lJwIZ1GWxOuckH4Coek4uHv5S+o/l9FLQe/awA+JwTnj4FJHldxhlXdZEBmw==",
       "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"
-      },
-      "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
-        }
+        "JSONStream": "^1.3.4",
+        "bluebird": "^3.5.1",
+        "figgy-pudding": "^3.4.1",
+        "lru-cache": "^4.1.3",
+        "make-fetch-happen": "^4.0.1",
+        "npm-package-arg": "^6.1.0"
       }
     },
     "npm-run-all": {
@@ -11582,6 +10448,17 @@
         "string.prototype.padend": "^3.0.0"
       },
       "dependencies": {
+        "chalk": {
+          "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.3.0"
+          }
+        },
         "cross-spawn": {
           "version": "6.0.5",
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -11645,6 +10522,24 @@
         "path-key": "^2.0.0"
       }
     },
+    "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,
+      "requires": {
+        "are-we-there-yet": "~1.1.2",
+        "console-control-strings": "~1.1.0",
+        "gauge": "~2.7.3",
+        "set-blocking": "~2.0.0"
+      }
+    },
+    "null-check": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz",
+      "integrity": "sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=",
+      "dev": true
+    },
     "num2fraction": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
@@ -11703,22 +10598,11 @@
         }
       }
     },
-    "object-inspect": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
-      "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==",
-      "dev": true
-    },
-    "object-is": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.1.tgz",
-      "integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=",
-      "dev": true
-    },
     "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
+      "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
+      "dev": true
     },
     "object-visit": {
       "version": "1.0.1",
@@ -11732,6 +10616,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",
@@ -11805,9 +10690,9 @@
       }
     },
     "on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
+      "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=",
       "dev": true
     },
     "once": {
@@ -11820,30 +10705,24 @@
       }
     },
     "onetime": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
-      "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
-      "dev": true,
-      "requires": {
-        "mimic-fn": "2.1.0"
-      }
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+      "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
+      "dev": true
     },
-    "open": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
-      "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
-      "dev": true,
-      "requires": {
-        "is-wsl": "1.1.0"
-      }
+    "opencollective-postinstall": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz",
+      "integrity": "sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw==",
+      "dev": true
     },
     "opn": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
-      "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz",
+      "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==",
       "dev": true,
       "requires": {
-        "is-wsl": "1.1.0"
+        "is-wsl": "^1.1.0"
       }
     },
     "optimist": {
@@ -11856,12 +10735,6 @@
         "wordwrap": "~0.0.2"
       },
       "dependencies": {
-        "minimist": {
-          "version": "0.0.10",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
-          "dev": true
-        },
         "wordwrap": {
           "version": "0.0.3",
           "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
@@ -11939,12 +10812,6 @@
         "os-tmpdir": "^1.0.0"
       }
     },
-    "p-cancelable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
-      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
-      "dev": true
-    },
     "p-defer": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
@@ -11958,145 +10825,249 @@
       "dev": true
     },
     "p-is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
-      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
+      "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=",
       "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.2.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz",
+      "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
+      "dev": true,
       "requires": {
-        "p-try": "2.2.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==",
-      "requires": {
-        "p-limit": "2.2.1"
-      }
-    },
-    "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
-    },
-    "p-retry": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
-      "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
       "dev": true,
       "requires": {
-        "retry": "0.12.0"
+        "p-limit": "^1.1.0"
       }
     },
+    "p-map": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
+      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
+      "dev": true
+    },
     "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": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
-      "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
+      "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
       "dev": true,
       "requires": {
-        "got": "9.6.0",
-        "registry-auth-token": "4.0.0",
-        "registry-url": "5.1.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
-        }
+        "got": "^6.7.1",
+        "registry-auth-token": "^3.0.1",
+        "registry-url": "^3.0.3",
+        "semver": "^5.1.0"
       }
     },
     "pacote": {
-      "version": "9.5.5",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.5.tgz",
-      "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"
+      "version": "9.4.0",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.4.0.tgz",
+      "integrity": "sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.5.3",
+        "cacache": "^11.3.2",
+        "figgy-pudding": "^3.5.1",
+        "get-stream": "^4.1.0",
+        "glob": "^7.1.3",
+        "lru-cache": "^5.1.1",
+        "make-fetch-happen": "^4.0.1",
+        "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": "^3.8.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": {
-          "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==",
+        "bluebird": {
+          "version": "3.5.3",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
+          "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==",
+          "dev": true
+        },
+        "cacache": {
+          "version": "11.3.2",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+          "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.3",
+            "chownr": "^1.1.1",
+            "figgy-pudding": "^3.5.1",
+            "glob": "^7.1.3",
+            "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.2",
+            "ssri": "^6.0.1",
+            "unique-filename": "^1.1.1",
+            "y18n": "^4.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+          "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"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.1.15",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
+          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "dev": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "mississippi": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+          "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+          "dev": true,
+          "requires": {
+            "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"
+          }
+        },
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        },
+        "semver": {
+          "version": "5.6.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+          "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"
+          }
+        },
+        "tar": {
+          "version": "4.4.8",
+          "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
+          "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
           "dev": true,
           "requires": {
-            "figgy-pudding": "3.5.1",
-            "npm-package-arg": "6.1.0",
-            "semver": "5.6.0"
+            "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"
           }
+        },
+        "yallist": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+          "dev": true
         }
       }
     },
     "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.6",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
+      "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==",
       "dev": true
     },
     "parallel-transform": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
-      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
+      "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
       "dev": true,
       "requires": {
-        "cyclist": "1.0.1",
-        "inherits": "2.0.4",
-        "readable-stream": "2.3.6"
+        "cyclist": "~0.2.2",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.1.5"
       }
     },
     "parse-asn1": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
-      "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
+      "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
       "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": {
@@ -12132,10 +11103,10 @@
       "dev": true
     },
     "parse5": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
-      "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==",
-      "optional": true
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
+      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
+      "dev": true
     },
     "parseqs": {
       "version": "0.0.5",
@@ -12156,9 +11127,9 @@
       }
     },
     "parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
+      "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=",
       "dev": true
     },
     "pascalcase": {
@@ -12167,9 +11138,9 @@
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
     },
     "path-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
+      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
       "dev": true
     },
     "path-dirname": {
@@ -12180,7 +11151,8 @@
     "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",
@@ -12200,9 +11172,10 @@
       "dev": true
     },
     "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=="
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
+      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
+      "dev": true
     },
     "path-root": {
       "version": "0.1.1",
@@ -12236,7 +11209,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": {
@@ -12296,33 +11269,63 @@
       }
     },
     "pkg-dir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+      "dev": true,
       "requires": {
-        "find-up": "3.0.0"
+        "find-up": "^2.1.0"
       }
     },
     "plugin-error": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
-      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
+      "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
       "dev": true,
       "requires": {
-        "ansi-colors": "1.1.0",
-        "arr-diff": "4.0.0",
-        "arr-union": "3.1.0",
-        "extend-shallow": "3.0.2"
+        "ansi-cyan": "^0.1.1",
+        "ansi-red": "^0.1.1",
+        "arr-diff": "^1.0.1",
+        "arr-union": "^2.0.1",
+        "extend-shallow": "^1.1.2"
       },
       "dependencies": {
-        "ansi-colors": {
+        "arr-diff": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-          "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+          "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.0.1",
+            "array-slice": "^0.2.3"
+          }
+        },
+        "arr-union": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+          "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
+          "dev": true
+        },
+        "array-slice": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+          "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
+          "dev": true
+        },
+        "extend-shallow": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
+          "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
           "dev": true,
           "requires": {
-            "ansi-wrap": "0.1.0"
+            "kind-of": "^1.1.0"
           }
+        },
+        "kind-of": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+          "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
+          "dev": true
         }
       }
     },
@@ -12333,22 +11336,14 @@
       "dev": true
     },
     "portfinder": {
-      "version": "1.0.24",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.24.tgz",
-      "integrity": "sha512-ekRl7zD2qxYndYflwiryJwMioBI7LI7rVXg3EnLK3sjkouT5eOuhS3gS255XxBksa30VG8UPZYZCdgfGOfkSUg==",
+      "version": "1.0.20",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.20.tgz",
+      "integrity": "sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==",
       "dev": true,
       "requires": {
-        "async": "1.5.2",
-        "debug": "2.6.9",
-        "mkdirp": "0.5.1"
-      },
-      "dependencies": {
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-          "dev": true
-        }
+        "async": "^1.5.2",
+        "debug": "^2.2.0",
+        "mkdirp": "0.5.x"
       }
     },
     "posix-character-classes": {
@@ -12357,21 +11352,52 @@
       "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
     },
     "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.14",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
+      "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
       "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": {
+        "chalk": {
+          "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.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"
+              }
+            }
+          }
+        },
         "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
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
@@ -12385,24 +11411,16 @@
         "postcss-value-parser": "^3.2.3",
         "read-cache": "^1.0.0",
         "resolve": "^1.1.7"
-      },
-      "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-load-config": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz",
-      "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.0.0.tgz",
+      "integrity": "sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==",
       "dev": true,
       "requires": {
-        "cosmiconfig": "5.2.1",
-        "import-cwd": "2.1.0"
+        "cosmiconfig": "^4.0.0",
+        "import-cwd": "^2.0.0"
       }
     },
     "postcss-loader": {
@@ -12431,17 +11449,17 @@
       },
       "dependencies": {
         "mime": {
-          "version": "2.4.4",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
-          "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
+          "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
           "dev": true
         }
       }
     },
     "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": "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
     },
     "prelude-ls": {
@@ -12456,23 +11474,12 @@
       "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",
       "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
       "dev": true
     },
-    "private": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="
-    },
     "process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
@@ -12480,9 +11487,9 @@
       "dev": true
     },
     "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=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
     },
     "progress": {
       "version": "1.1.8",
@@ -12514,14 +11521,6 @@
       "requires": {
         "err-code": "^1.0.0",
         "retry": "^0.10.0"
-      },
-      "dependencies": {
-        "retry": {
-          "version": "0.10.1",
-          "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
-          "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=",
-          "dev": true
-        }
       }
     },
     "protoduck": {
@@ -12604,6 +11603,12 @@
             "pinkie-promise": "^2.0.0"
           }
         },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
         "pify": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
@@ -12632,40 +11637,41 @@
           "dev": true
         },
         "webdriver-manager": {
-          "version": "12.1.7",
-          "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.7.tgz",
-          "integrity": "sha512-XINj6b8CYuUYC93SG3xPkxlyUc3IJbD6Vvo75CVGuG9uzsefDzWQrhz0Lq8vbPxtb4d63CZdYophF8k8Or/YiA==",
+          "version": "12.1.6",
+          "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.6.tgz",
+          "integrity": "sha512-B1mOycNCrbk7xODw7Jgq/mdD3qzPxMaTsnKIQDy2nXlQoyjTrJTTD0vRpEZI9b8RibPEyQvh9zIZ0M1mpOxS3w==",
           "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"
           }
         }
       }
     },
     "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.4",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
+      "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
       "dev": true,
       "requires": {
-        "forwarded": "0.1.2",
-        "ipaddr.js": "1.9.0"
+        "forwarded": "~0.1.2",
+        "ipaddr.js": "1.8.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",
@@ -12692,9 +11698,9 @@
       "dev": true
     },
     "psl": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
-      "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==",
+      "version": "1.1.31",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
+      "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==",
       "dev": true
     },
     "public-encrypt": {
@@ -12755,16 +11761,6 @@
       "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
       "dev": true
     },
-    "query-string": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
-      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
-      "dev": true,
-      "requires": {
-        "object-assign": "4.1.1",
-        "strict-uri-encode": "1.1.0"
-      }
-    },
     "querystring": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
@@ -12778,9 +11774,9 @@
       "dev": true
     },
     "querystringify": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
-      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.0.tgz",
+      "integrity": "sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==",
       "dev": true
     },
     "randombytes": {
@@ -12803,63 +11799,42 @@
       }
     },
     "range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
+      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
       "dev": true
     },
     "raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz",
+      "integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==",
       "dev": true,
       "requires": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
+        "bytes": "3.0.0",
+        "http-errors": "1.6.3",
+        "iconv-lite": "0.4.23",
         "unpipe": "1.0.0"
       },
       "dependencies": {
-        "bytes": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-          "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
-          "dev": true
+        "iconv-lite": {
+          "version": "0.4.23",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
+          "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+          "dev": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
         }
       }
     },
     "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": "1.0.0",
+      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-1.0.0.tgz",
+      "integrity": "sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==",
       "dev": true,
       "requires": {
-        "loader-utils": "1.2.3",
-        "schema-utils": "2.4.1"
-      },
-      "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": "^1.1.0",
+        "schema-utils": "^1.0.0"
       }
     },
     "rc": {
@@ -12872,6 +11847,20 @@
         "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
+        },
+        "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
+        }
       }
     },
     "read-cache": {
@@ -12891,30 +11880,6 @@
         }
       }
     },
-    "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==",
-      "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"
-      }
-    },
-    "read-package-tree": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz",
-      "integrity": "sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==",
-      "dev": true,
-      "requires": {
-        "read-package-json": "2.1.0",
-        "readdir-scoped-modules": "1.1.0",
-        "util-promisify": "2.1.0"
-      }
-    },
     "read-pkg": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
@@ -12990,26 +11955,15 @@
         "util-deprecate": "~1.0.1"
       }
     },
-    "readdir-scoped-modules": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz",
-      "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==",
-      "dev": true,
-      "requires": {
-        "debuglog": "1.0.1",
-        "dezalgo": "1.0.3",
-        "graceful-fs": "4.2.2",
-        "once": "1.4.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==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
+      "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
       "requires": {
-        "graceful-fs": "4.2.2",
-        "micromatch": "3.1.10",
-        "readable-stream": "2.3.6"
+        "graceful-fs": "^4.1.2",
+        "minimatch": "^3.0.2",
+        "readable-stream": "^2.0.2",
+        "set-immediate-shim": "^1.0.1"
       }
     },
     "readline2": {
@@ -13021,14 +11975,6 @@
         "code-point-at": "^1.0.0",
         "is-fullwidth-code-point": "^1.0.0",
         "mute-stream": "0.0.5"
-      },
-      "dependencies": {
-        "mute-stream": {
-          "version": "0.0.5",
-          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
-          "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=",
-          "dev": true
-        }
       }
     },
     "rechoir": {
@@ -13037,7 +11983,17 @@
       "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
       "dev": true,
       "requires": {
-        "resolve": "^1.1.6"
+        "resolve": "^1.1.6"
+      }
+    },
+    "redent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+      "dev": true,
+      "requires": {
+        "indent-string": "^2.1.0",
+        "strip-indent": "^1.0.1"
       }
     },
     "reflect-metadata": {
@@ -13049,30 +12005,15 @@
     "regenerate": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
-      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="
-    },
-    "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==",
-      "requires": {
-        "regenerate": "1.4.0"
-      }
+      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
+      "dev": true
     },
     "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.11.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
       "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==",
-      "requires": {
-        "private": "0.1.8"
-      }
-    },
     "regex-not": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
@@ -13082,58 +12023,57 @@
         "safe-regex": "^1.1.0"
       }
     },
-    "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==",
-      "dev": true,
-      "requires": {
-        "define-properties": "1.1.3"
-      }
-    },
     "regexpu-core": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.6.0.tgz",
-      "integrity": "sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==",
+      "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.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.2.1",
+        "regjsgen": "^0.2.0",
+        "regjsparser": "^0.1.4"
       }
     },
     "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": "3.3.2",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
+      "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
       "dev": true,
       "requires": {
-        "rc": "1.2.8",
-        "safe-buffer": "5.1.2"
+        "rc": "^1.1.6",
+        "safe-buffer": "^5.0.1"
       }
     },
     "registry-url": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
-      "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
+      "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
       "dev": true,
       "requires": {
-        "rc": "1.2.8"
+        "rc": "^1.0.1"
       }
     },
     "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.2.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+      "dev": true
     },
     "regjsparser": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz",
-      "integrity": "sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==",
+      "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"
+        "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": {
@@ -13163,9 +12103,9 @@
       "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
     },
     "repeat-element": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
+      "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo="
     },
     "repeat-string": {
       "version": "1.6.1",
@@ -13199,57 +12139,48 @@
       }
     },
     "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": "3.4.0",
+      "resolved": "https://registry.npmjs.org/replace-in-file/-/replace-in-file-3.4.0.tgz",
+      "integrity": "sha512-fto9Ooab00CniGkSjRCZCamER7P5S4mZHQ4w4dLd09nwP3FtFfjUJh8/OVC/In4ki5MEy+dYO5v9r7rtq2DrYQ==",
       "dev": true,
       "requires": {
-        "chalk": "2.4.2",
-        "glob": "7.1.4",
-        "yargs": "13.3.0"
+        "chalk": "^2.3.2",
+        "glob": "^7.1.2",
+        "yargs": "^11.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/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
           "dev": true
         },
-        "cliui": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "string-width": "3.1.0",
-            "strip-ansi": "5.2.0",
-            "wrap-ansi": "5.1.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-          "dev": 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
-        },
-        "glob": {
-          "version": "7.1.4",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
-          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+        "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": {
-            "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"
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
           }
         },
         "is-fullwidth-code-point": {
@@ -13258,30 +12189,45 @@
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "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
+        "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"
+          },
+          "dependencies": {
+            "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.0.0"
+              }
+            }
+          }
         },
         "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": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "emoji-regex": "7.0.3",
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "5.2.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.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": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "4.1.0"
+            "ansi-regex": "^3.0.0"
           }
         },
         "which-module": {
@@ -13290,43 +12236,39 @@
           "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
           "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==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "3.2.1",
-            "string-width": "3.1.0",
-            "strip-ansi": "5.2.0"
-          }
+        "y18n": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+          "dev": true
         },
         "yargs": {
-          "version": "13.3.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
-          "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
+          "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": "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": "^4.0.0",
+            "decamelize": "^1.1.1",
+            "find-up": "^2.1.0",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^2.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",
+            "yargs-parser": "^9.0.2"
           }
         },
         "yargs-parser": {
-          "version": "13.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
-          "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+          "version": "9.0.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
+          "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
           "dev": true,
           "requires": {
-            "camelcase": "5.3.1",
-            "decamelize": "1.2.0"
+            "camelcase": "^4.1.0"
           }
         }
       }
@@ -13357,6 +12299,35 @@
         "tough-cookie": "~2.4.3",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "extend": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+          "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+          "dev": true
+        },
+        "mime-db": {
+          "version": "1.38.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
+          "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==",
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.22",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz",
+          "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==",
+          "dev": true,
+          "requires": {
+            "mime-db": "~1.38.0"
+          }
+        },
+        "uuid": {
+          "version": "3.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+          "dev": true
+        }
       }
     },
     "request-promise-core": {
@@ -13366,6 +12337,14 @@
       "dev": true,
       "requires": {
         "lodash": "^4.17.11"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "dev": true
+        }
       }
     },
     "request-promise-native": {
@@ -13407,21 +12386,6 @@
         "resolve-from": "^1.0.0"
       },
       "dependencies": {
-        "caller-path": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
-          "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
-          "dev": true,
-          "requires": {
-            "callsites": "0.2.0"
-          }
-        },
-        "callsites": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
-          "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
-          "dev": true
-        },
         "resolve-from": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
@@ -13437,16 +12401,17 @@
       "dev": true
     },
     "reselect": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.0.0.tgz",
-      "integrity": "sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/reselect/-/reselect-3.0.1.tgz",
+      "integrity": "sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc="
     },
     "resolve": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
-      "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz",
+      "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==",
+      "dev": true,
       "requires": {
-        "path-parse": "1.0.6"
+        "path-parse": "^1.0.5"
       }
     },
     "resolve-cwd": {
@@ -13459,13 +12424,13 @@
       }
     },
     "resolve-dir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz",
+      "integrity": "sha1-shklmlYC+sXFxJatiUpujMQwJh4=",
       "dev": true,
       "requires": {
-        "expand-tilde": "2.0.2",
-        "global-modules": "1.0.0"
+        "expand-tilde": "^1.2.2",
+        "global-modules": "^0.2.3"
       }
     },
     "resolve-from": {
@@ -13488,23 +12453,14 @@
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
     },
-    "responselike": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
-      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
-      "dev": true,
-      "requires": {
-        "lowercase-keys": "1.0.1"
-      }
-    },
     "restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
+      "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
       "dev": true,
       "requires": {
-        "onetime": "5.1.0",
-        "signal-exit": "3.0.2"
+        "exit-hook": "^1.0.0",
+        "onetime": "^1.0.0"
       }
     },
     "ret": {
@@ -13513,30 +12469,24 @@
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
     },
     "retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
-      "dev": true
-    },
-    "reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
+      "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=",
       "dev": true
     },
     "rfdc": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz",
-      "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.2.tgz",
+      "integrity": "sha512-92ktAgvZhBzYTIK0Mja9uen5q5J3NRVMoDkJL2VMwq6SXjVCgqvQeVP2XAaUY6HT+XpQYeLSjb3UoitBryKmdA==",
       "dev": true
     },
     "rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
       "dev": true,
       "requires": {
-        "glob": "7.1.3"
+        "glob": "^7.0.5"
       }
     },
     "ripemd160": {
@@ -13550,49 +12500,91 @@
       }
     },
     "rollup": {
-      "version": "1.22.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.22.0.tgz",
-      "integrity": "sha512-x4l4ZrV/Mr/x/jvFTmwROdEAhbZjx16yDRTVSKWh/i4oJDuW2dVEbECT853mybYCz7BAitU8ElGlhx7dNjw3qQ==",
+      "version": "0.67.4",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.67.4.tgz",
+      "integrity": "sha512-AVuP73mkb4BBMUmksQ3Jw0jTrBTU1i7rLiUYjFxLZGb3xiFmtVEg40oByphkZAsiL0bJC3hRAJUQos/e5EBd+w==",
       "dev": true,
       "requires": {
         "@types/estree": "0.0.39",
-        "@types/node": "12.7.9",
-        "acorn": "7.1.0"
+        "@types/node": "*"
       }
     },
     "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==",
+      "version": "9.3.4",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.3.4.tgz",
+      "integrity": "sha512-DTZOvRoiVIHHLFBCL4pFxOaJt8pagxsVldEXBOn6wl3/V21wVaj17HFfyzTsQUuou3sZL3lEJZVWKPFblJfI6w==",
       "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.0",
+        "magic-string": "^0.25.2",
+        "resolve": "^1.10.0",
+        "rollup-pluginutils": "^2.6.0"
+      },
+      "dependencies": {
+        "estree-walker": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
+          "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
+          "dev": true
+        },
+        "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==",
+          "dev": true
+        },
+        "resolve": {
+          "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"
+          }
+        }
       }
     },
     "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==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-json/-/rollup-plugin-json-3.1.0.tgz",
+      "integrity": "sha512-BlYk5VspvGpjz7lAwArVzBXR60JK+4EKtPkCHouAWg39obk9S61hZYJDBfMK+oitPdoe11i69TlxKlMQNFC/Uw==",
       "dev": true,
       "requires": {
-        "rollup-pluginutils": "2.8.2"
+        "rollup-pluginutils": "^2.3.1"
       }
     },
     "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==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.0.0.tgz",
+      "integrity": "sha512-7Ni+/M5RPSUBfUaP9alwYQiIKnKeXCOHiqBpKUl9kwp3jX5ZJtgXAait1cne6pGEVUUztPD6skIKH9Kq9sNtfw==",
       "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.0.0",
+        "is-module": "^1.0.0",
+        "resolve": "^1.8.1"
+      },
+      "dependencies": {
+        "builtin-modules": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.0.0.tgz",
+          "integrity": "sha512-hMIeU4K2ilbXV6Uv93ZZ0Avg/M91RaKXucQ+4me2Do1txxBDyDZWCBa5bJSLqoNTRpXTLwEzIk1KmloenDDjhg==",
+          "dev": true
+        },
+        "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==",
+          "dev": true
+        },
+        "resolve": {
+          "version": "1.10.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
+          "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+          "dev": true,
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        }
       }
     },
     "rollup-plugin-sourcemaps": {
@@ -13612,23 +12604,25 @@
       "dev": true,
       "requires": {
         "estree-walker": "^0.6.1"
+      },
+      "dependencies": {
+        "estree-walker": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
+          "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
+          "dev": true
+        }
       }
     },
     "run-async": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
-      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
+      "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
       "dev": true,
       "requires": {
-        "is-promise": "2.1.0"
+        "once": "^1.3.0"
       }
     },
-    "run-parallel": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
-      "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==",
-      "dev": true
-    },
     "run-queue": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
@@ -13650,42 +12644,54 @@
       "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.4.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
+      "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
       "requires": {
-        "tslib": "1.10.0"
+        "tslib": "^1.9.0"
       }
     },
     "rxjs-spy": {
-      "version": "7.5.1",
-      "resolved": "https://registry.npmjs.org/rxjs-spy/-/rxjs-spy-7.5.1.tgz",
-      "integrity": "sha512-dJ9mO4HvW2r16PsU15Qsc0RVkG7pFrfyCNTGx3vrxWje3kIgZ6QjMVnWblQxbniZ32lwLk/2x9+D2O6GhgXV/w==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/rxjs-spy/-/rxjs-spy-7.0.2.tgz",
+      "integrity": "sha512-rSzEEQLH07FPBqmxIC8oeI2Z7tWibvxKxybcKtcc6Cj8Tz178ySDgzgOkoct8dAz5IE/H2jrR2/l+ZYYfpuEXw==",
       "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": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/rxjs-tslint/-/rxjs-tslint-0.1.7.tgz",
-      "integrity": "sha512-NnOfqutNfdT7VQnQm32JLYh2gDZjc0gdWZFtrxf/czNGkLKJ1nOO6jbKAFI09W0f9lCtv6P2ozxjbQH8TSPPFQ==",
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/rxjs-tslint/-/rxjs-tslint-0.1.5.tgz",
+      "integrity": "sha512-odvEAx6VoZSJs5o9gWZ7SxgTuS8ldq0mr4qnprbr6flNtIt4DtNJSYJpBK0WEy0o+f1oe92XVHrmgco1e7Cpdw==",
       "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"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        }
       }
     },
     "rxjs-websockets": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/rxjs-websockets/-/rxjs-websockets-8.0.0.tgz",
-      "integrity": "sha512-8t3nE350u+6vPcJ5E5DCdsxXCJePQPNHWZmUFbs0tfYHTNdc4Hth4nNaEHAoxsJ4HrsRT9e5YutfMmstTl0afQ=="
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/rxjs-websockets/-/rxjs-websockets-6.0.2.tgz",
+      "integrity": "sha512-2DEl/SkJaYrXIus3YNfKpfZtaSdiK01C4DlCS5ApiA65IIyY3+TOv5EOWhGP+Agb3RRAB8MTD4af93l5ZflM7A=="
     },
     "safe-buffer": {
       "version": "5.1.2",
@@ -13705,93 +12711,110 @@
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
-    "sass": {
-      "version": "1.22.9",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.22.9.tgz",
-      "integrity": "sha512-FzU1X2V8DlnqabrL4u7OBwD2vcOzNMongEJEx3xMEhWY/v26FFR3aG0hyeu2T965sfR0E9ufJwmG+Qjz78vFPQ==",
-      "dev": true,
-      "requires": {
-        "chokidar": "2.0.4"
-      }
+    "samsam": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz",
+      "integrity": "sha1-vsEf3IOp/aBjQBIQ5AF2wwJNFWc=",
+      "dev": true
     },
-    "sass-lint": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/sass-lint/-/sass-lint-1.13.1.tgz",
-      "integrity": "sha512-DSyah8/MyjzW2BWYmQWekYEKir44BpLqrCFsgs9iaWiVTcwZfwXHF586hh3D1n+/9ihUNMfd8iHAyb9KkGgs7Q==",
+    "sass-graph": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
+      "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
       "dev": true,
       "requires": {
-        "commander": "2.20.0",
-        "eslint": "2.13.1",
-        "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"
+        "glob": "^7.0.0",
+        "lodash": "^4.0.0",
+        "scss-tokenizer": "^0.2.3",
+        "yargs": "^7.0.0"
       },
       "dependencies": {
-        "fs-extra": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
-          "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.2.2",
-            "jsonfile": "3.0.1",
-            "universalify": "0.1.2"
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wrap-ansi": "^2.0.0"
           }
         },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
           "dev": true
         },
-        "jsonfile": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
-          "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.2.2"
-          }
+        "y18n": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+          "dev": true
         },
-        "util": {
-          "version": "0.10.4",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
-          "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+        "yargs": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
+          "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
           "dev": true,
           "requires": {
-            "inherits": "2.0.3"
+            "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"
           }
         }
       }
     },
+    "sass-lint": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/sass-lint/-/sass-lint-1.12.1.tgz",
+      "integrity": "sha1-Yw9pwhaqIGuCMvsqqQe98zNrbYM=",
+      "dev": true,
+      "requires": {
+        "commander": "^2.8.1",
+        "eslint": "^2.7.0",
+        "front-matter": "2.1.2",
+        "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"
+      }
+    },
     "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": "7.1.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz",
+      "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==",
       "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"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
-        }
+        "clone-deep": "^2.0.1",
+        "loader-utils": "^1.0.1",
+        "lodash.tail": "^4.1.1",
+        "neo-async": "^2.5.0",
+        "pify": "^3.0.0",
+        "semver": "^5.5.0"
       }
     },
     "saucelabs": {
@@ -13820,6 +12843,27 @@
         "ajv-keywords": "^3.1.0"
       }
     },
+    "scss-tokenizer": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
+      "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
+      "dev": true,
+      "requires": {
+        "js-base64": "^2.1.8",
+        "source-map": "^0.4.2"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "dev": true,
+          "requires": {
+            "amdefine": ">=0.0.4"
+          }
+        }
+      }
+    },
     "select-hose": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
@@ -13850,18 +12894,19 @@
       }
     },
     "selfsigned": {
-      "version": "1.10.7",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz",
-      "integrity": "sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==",
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz",
+      "integrity": "sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==",
       "dev": true,
       "requires": {
-        "node-forge": "0.9.0"
+        "node-forge": "0.7.5"
       }
     },
     "semver": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
+      "dev": true
     },
     "semver-diff": {
       "version": "2.1.0",
@@ -13900,38 +12945,38 @@
       }
     },
     "send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
       "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",
-        "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "2.3.0",
-        "range-parser": "1.2.1",
-        "statuses": "1.5.0"
+        "http-errors": "~1.6.2",
+        "mime": "1.4.1",
+        "ms": "2.0.0",
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.0",
+        "statuses": "~1.4.0"
       },
       "dependencies": {
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+        "mime": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
           "dev": true
         }
       }
     },
     "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": "1.6.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz",
+      "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==",
       "dev": true
     },
     "serve-index": {
@@ -13947,44 +12992,18 @@
         "http-errors": "~1.6.2",
         "mime-types": "~2.1.17",
         "parseurl": "~1.3.2"
-      },
-      "dependencies": {
-        "http-errors": {
-          "version": "1.6.3",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-          "dev": true,
-          "requires": {
-            "depd": "1.1.2",
-            "inherits": "2.0.3",
-            "setprototypeof": "1.1.0",
-            "statuses": "1.5.0"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
-        },
-        "setprototypeof": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-          "dev": true
-        }
       }
     },
     "serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
+      "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
       "dev": true,
       "requires": {
-        "encodeurl": "1.0.2",
-        "escape-html": "1.0.3",
-        "parseurl": "1.3.3",
-        "send": "0.17.1"
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.2",
+        "send": "0.16.2"
       }
     },
     "set-blocking": {
@@ -13993,11 +13012,19 @@
       "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
       "dev": true
     },
+    "set-getter": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz",
+      "integrity": "sha1-12nBgsnVpR9AkUXy+6guXoboA3Y=",
+      "dev": true,
+      "requires": {
+        "to-object-path": "^0.3.0"
+      }
+    },
     "set-immediate-shim": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
-      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-      "dev": true
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E="
     },
     "set-value": {
       "version": "2.0.1",
@@ -14027,9 +13054,9 @@
       "dev": true
     },
     "setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
       "dev": true
     },
     "sha.js": {
@@ -14043,12 +13070,22 @@
       }
     },
     "shallow-clone": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz",
+      "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
       "dev": true,
       "requires": {
-        "kind-of": "6.0.2"
+        "is-extendable": "^0.1.1",
+        "kind-of": "^5.0.0",
+        "mixin-object": "^2.0.1"
+      },
+      "dependencies": {
+        "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==",
+          "dev": true
+        }
       }
     },
     "shebang-command": {
@@ -14067,9 +13104,21 @@
       "dev": true
     },
     "shell-quote": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
-      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz",
+      "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
+      "dev": true,
+      "requires": {
+        "array-filter": "~0.0.0",
+        "array-map": "~0.0.0",
+        "array-reduce": "~0.0.0",
+        "jsonify": "~0.0.0"
+      }
+    },
+    "shelljs": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.6.1.tgz",
+      "integrity": "sha1-7GIRvtGSBEIIj+D3Cyg3Iy7SyKg=",
       "dev": true
     },
     "signal-exit": {
@@ -14078,6 +13127,18 @@
       "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
       "dev": true
     },
+    "sinon": {
+      "version": "1.17.7",
+      "resolved": "http://registry.npmjs.org/sinon/-/sinon-1.17.7.tgz",
+      "integrity": "sha1-RUKk9JugxFwF6y6d2dID4rjv4L8=",
+      "dev": true,
+      "requires": {
+        "formatio": "1.1.1",
+        "lolex": "1.3.2",
+        "samsam": "1.1.2",
+        "util": ">=0.10.3 <1"
+      }
+    },
     "slash": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
@@ -14246,12 +13307,6 @@
         "to-array": "0.1.4"
       },
       "dependencies": {
-        "component-emitter": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-          "dev": true
-        },
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
@@ -14274,12 +13329,6 @@
         "isarray": "2.0.1"
       },
       "dependencies": {
-        "component-emitter": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-          "dev": true
-        },
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
@@ -14331,60 +13380,40 @@
           }
         },
         "faye-websocket": {
-          "version": "0.11.3",
-          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
-          "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
+          "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
           "dev": true,
           "requires": {
-            "websocket-driver": "0.7.3"
+            "websocket-driver": ">=0.5.1"
           }
         },
         "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "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
         }
       }
     },
     "socks": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.2.tgz",
-      "integrity": "sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.2.3.tgz",
+      "integrity": "sha512-+2r83WaRT3PXYoO/1z+RDEBE7Z2f9YcdQnJ0K/ncXXbV5gJ6wYfNAebYFYiiUjM6E4JyXnPY8cimwyvFYHVUUA==",
       "dev": true,
       "requires": {
-        "ip": "1.1.5",
+        "ip": "^1.1.5",
         "smart-buffer": "4.0.2"
       }
     },
     "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==",
-      "dev": true,
-      "requires": {
-        "agent-base": "4.2.1",
-        "socks": "2.3.2"
-      },
-      "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==",
-          "dev": true,
-          "requires": {
-            "es6-promisify": "5.0.0"
-          }
-        }
-      }
-    },
-    "sort-keys": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
-      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==",
       "dev": true,
       "requires": {
-        "is-plain-obj": "1.1.0"
+        "agent-base": "~4.2.0",
+        "socks": "~2.2.0"
       }
     },
     "source-list-map": {
@@ -14406,6 +13435,23 @@
       "requires": {
         "async": "^2.5.0",
         "loader-utils": "^1.1.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
+          "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
+          "dev": true,
+          "requires": {
+            "lodash": "^4.17.11"
+          }
+        },
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "dev": true
+        }
       }
     },
     "source-map-resolve": {
@@ -14421,13 +13467,13 @@
       }
     },
     "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.10",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz",
+      "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==",
       "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": {
@@ -14444,9 +13490,10 @@
       "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
     },
     "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.4",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz",
+      "integrity": "sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg==",
+      "dev": true
     },
     "sparkles": {
       "version": "1.0.1",
@@ -14455,19 +13502,19 @@
       "dev": true
     },
     "spdx-correct": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
-      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
+      "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
       "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": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz",
+      "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==",
       "dev": true
     },
     "spdx-expression-parse": {
@@ -14481,22 +13528,22 @@
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz",
+      "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==",
       "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.0",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz",
+      "integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==",
       "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": {
@@ -14505,13 +13552,13 @@
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "ms": "2.1.2"
+            "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==",
+          "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
         }
       }
@@ -14540,36 +13587,36 @@
           }
         },
         "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "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
         },
         "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.1.1",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
+          "integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
           "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"
           }
         }
       }
     },
     "speed-measure-webpack-plugin": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz",
-      "integrity": "sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.0.tgz",
+      "integrity": "sha512-b9Yd0TrzceMVYSbuamM1sFsGM1oVfyFTM22gOoyLhymNvBVApuYpkdFOgYkKJpN/KhTpcCYcTGHg7X+FJ33Vvw==",
       "dev": true,
       "requires": {
-        "chalk": "2.4.2"
+        "chalk": "^2.0.1"
       }
     },
     "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": {
@@ -14591,29 +13638,28 @@
       "dev": true
     },
     "sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz",
+      "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=",
       "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",
+        "tweetnacl": "~0.14.0"
       }
     },
     "ssri": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz",
+      "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
       "dev": true,
       "requires": {
-        "figgy-pudding": "3.5.1"
+        "safe-buffer": "^5.1.1"
       }
     },
     "stack-trace": {
@@ -14623,17 +13669,17 @@
       "dev": true
     },
     "stackframe": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.1.0.tgz",
-      "integrity": "sha512-Vx6W1Yvy+AM1R/ckVwcHQHV147pTPBKWCRLrXMuPrFVfvBUc3os7PR1QLIWCMhPpRg5eX9ojzbQIMLGBwyLjqg=="
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.0.4.tgz",
+      "integrity": "sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw=="
     },
     "stacktrace-gps": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-3.0.3.tgz",
-      "integrity": "sha512-51Rr7dXkyFUKNmhY/vqZWK+EvdsfFSRiQVtgHTFlAdNIYaDD7bVh21yBHXaNWAvTD+w+QSjxHg7/v6Tz4veExA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-3.0.2.tgz",
+      "integrity": "sha512-9o+nWhiz5wFnrB3hBHs2PTyYrS60M1vvpSzHxwxnIbtY2q9Nt51hZvhrG1+2AxD374ecwyS+IUwfkHRE/2zuGg==",
       "requires": {
         "source-map": "0.5.6",
-        "stackframe": "1.1.0"
+        "stackframe": "^1.0.4"
       }
     },
     "static-extend": {
@@ -14655,12 +13701,30 @@
         }
       }
     },
+    "stats-webpack-plugin": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/stats-webpack-plugin/-/stats-webpack-plugin-0.7.0.tgz",
+      "integrity": "sha512-NT0YGhwuQ0EOX+uPhhUcI6/+1Sq/pMzNuSCBVT4GbFl/ac6I/JZefBcjlECNfAb1t3GOx5dEj1Z7x0cAxeeVLQ==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.4"
+      }
+    },
     "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
+      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
       "dev": true
     },
+    "stdout-stream": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.0.tgz",
+      "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^2.0.1"
+      }
+    },
     "stealthy-require": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
@@ -14694,26 +13758,6 @@
           "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
           "dev": true
         },
-        "fs-extra": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
-          "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.2.2",
-            "jsonfile": "3.0.1",
-            "universalify": "0.1.2"
-          }
-        },
-        "jsonfile": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
-          "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.2.2"
-          }
-        },
         "mkdirp": {
           "version": "0.3.5",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
@@ -14734,7 +13778,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": {
@@ -14798,19 +13842,13 @@
           }
         },
         "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "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
         }
       }
     },
-    "strict-uri-encode": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
-      "dev": true
-    },
     "string-width": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -14833,26 +13871,6 @@
         "function-bind": "^1.0.2"
       }
     },
-    "string.prototype.trimleft": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz",
-      "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==",
-      "dev": true,
-      "requires": {
-        "define-properties": "1.1.3",
-        "function-bind": "1.1.1"
-      }
-    },
-    "string.prototype.trimright": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz",
-      "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==",
-      "dev": true,
-      "requires": {
-        "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",
@@ -14865,6 +13883,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"
       }
@@ -14884,44 +13903,29 @@
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
       "dev": true
     },
+    "strip-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
+      "dev": true,
+      "requires": {
+        "get-stdin": "^4.0.1"
+      }
+    },
     "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=",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
+      "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=",
       "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": "0.23.1",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz",
+      "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==",
       "dev": true,
       "requires": {
-        "loader-utils": "1.2.3",
-        "schema-utils": "2.4.1"
-      },
-      "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": "^1.1.0",
+        "schema-utils": "^1.0.0"
       }
     },
     "stylus": {
@@ -14975,12 +13979,12 @@
       }
     },
     "supports-color": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+      "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
       "dev": true,
       "requires": {
-        "has-flag": "3.0.0"
+        "has-flag": "^3.0.0"
       }
     },
     "sver-compat": {
@@ -15060,6 +14064,12 @@
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "dev": true
+        },
         "string-width": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -15099,34 +14109,20 @@
       }
     },
     "tapable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.1.tgz",
+      "integrity": "sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==",
+      "dev": true
     },
     "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.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"
-      }
-    },
-    "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": "2.2.2",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
+      "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
       "dev": true,
       "requires": {
-        "https-proxy-agent": "2.2.2",
-        "node-fetch": "2.6.0",
-        "uuid": "3.3.3"
+        "block-stream": "*",
+        "fstream": "^1.0.12",
+        "inherits": "2"
       }
     },
     "temp": {
@@ -15141,90 +14137,46 @@
       "integrity": "sha1-gHFzBDeHByDpQxUy/igUNk+IA9c=",
       "dev": true,
       "requires": {
-        "rimraf": "~2.5.2"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "2.5.4",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
-          "integrity": "sha1-loAAk8vxoMhr2VtGJUZ1NcKd+gQ=",
-          "dev": true,
-          "requires": {
-            "glob": "^7.0.5"
-          }
-        }
-      }
-    },
-    "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.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"
-          }
-        },
-        "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==",
+        "rimraf": "~2.5.2"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.5.4",
+          "resolved": "http://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
+          "integrity": "sha1-loAAk8vxoMhr2VtGJUZ1NcKd+gQ=",
           "dev": true,
           "requires": {
-            "pseudomap": "1.0.2",
-            "yallist": "2.1.2"
+            "glob": "^7.0.5"
           }
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-          "dev": true
         }
       }
     },
+    "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"
+      }
+    },
     "terser": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.1.4.tgz",
-      "integrity": "sha512-+ZwXJvdSwbd60jG0Illav0F06GDJF0R4ydZ21Q3wGAFKoBGyJGo34F63vzJHgvYxc1ukOtIjvwEvl9MkjzM6Pg==",
+      "version": "3.16.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-3.16.1.tgz",
+      "integrity": "sha512-JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow==",
       "dev": true,
       "requires": {
-        "commander": "2.20.0",
-        "source-map": "0.6.1",
-        "source-map-support": "0.5.13"
+        "commander": "~2.17.1",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.9"
       },
       "dependencies": {
+        "commander": {
+          "version": "2.17.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+          "dev": true
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -15234,31 +14186,167 @@
       }
     },
     "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==",
-      "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"
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz",
+      "integrity": "sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==",
+      "dev": true,
+      "requires": {
+        "cacache": "^11.0.2",
+        "find-cache-dir": "^2.0.0",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^1.4.0",
+        "source-map": "^0.6.1",
+        "terser": "^3.16.1",
+        "webpack-sources": "^1.1.0",
+        "worker-farm": "^1.5.2"
       },
       "dependencies": {
+        "bluebird": {
+          "version": "3.5.3",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
+          "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==",
+          "dev": true
+        },
+        "cacache": {
+          "version": "11.3.2",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+          "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.3",
+            "chownr": "^1.1.1",
+            "figgy-pudding": "^3.5.1",
+            "glob": "^7.1.3",
+            "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.2",
+            "ssri": "^6.0.1",
+            "unique-filename": "^1.1.1",
+            "y18n": "^4.0.0"
+          }
+        },
         "find-cache-dir": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.0.0.tgz",
+          "integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==",
+          "dev": true,
+          "requires": {
+            "commondir": "^1.0.1",
+            "make-dir": "^1.0.0",
+            "pkg-dir": "^3.0.0"
+          }
+        },
+        "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"
+          }
+        },
+        "glob": {
+          "version": "7.1.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+          "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"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.1.15",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
+          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
+          "dev": true
+        },
+        "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"
+          }
+        },
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "dev": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "mississippi": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+          "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+          "dev": true,
+          "requires": {
+            "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"
+          }
+        },
+        "p-limit": {
           "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz",
+          "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==",
+          "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.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
+          "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
+          "dev": true
+        },
+        "pkg-dir": {
+          "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"
+          }
+        },
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
           "dev": true,
           "requires": {
-            "commondir": "1.0.1",
-            "make-dir": "2.1.0",
-            "pkg-dir": "3.0.0"
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
           }
         },
         "source-map": {
@@ -15266,6 +14354,21 @@
           "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": {
+            "figgy-pudding": "^3.5.1"
+          }
+        },
+        "yallist": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+          "dev": true
         }
       }
     },
@@ -15282,13 +14385,13 @@
       "dev": true
     },
     "through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+      "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
       "dev": true,
       "requires": {
-        "readable-stream": "2.3.6",
-        "xtend": "4.0.2"
+        "readable-stream": "^2.1.5",
+        "xtend": "~4.0.1"
       }
     },
     "through2-filter": {
@@ -15313,13 +14416,19 @@
       "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
       "dev": true
     },
+    "timed-out": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
+      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
+      "dev": true
+    },
     "timers-browserify": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
-      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
+      "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
       "dev": true,
       "requires": {
-        "setimmediate": "1.0.5"
+        "setimmediate": "^1.0.4"
       }
     },
     "tmp": {
@@ -15377,12 +14486,6 @@
         }
       }
     },
-    "to-readable-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
-      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
-      "dev": true
-    },
     "to-regex": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
@@ -15412,12 +14515,6 @@
         "through2": "^2.0.3"
       }
     },
-    "toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
-      "dev": true
-    },
     "tough-cookie": {
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
@@ -15436,10 +14533,22 @@
         }
       }
     },
+    "transformation-matrix": {
+      "version": "1.15.3",
+      "resolved": "https://registry.npmjs.org/transformation-matrix/-/transformation-matrix-1.15.3.tgz",
+      "integrity": "sha512-ThJH58GNFKhCw3gIoOtwf3tNwuYjbyEeiGdeq4mNMYWdJctnI896KUqn6PVt7jmNVepqa1bcKQtnMB1HtjsDMA=="
+    },
     "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-newlines": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
+      "dev": true
     },
     "trim-right": {
       "version": "1.0.1",
@@ -15447,75 +14556,111 @@
       "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==",
+    "true-case-path": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.2.tgz",
+      "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=",
+      "dev": true,
       "requires": {
-        "chalk": "2.4.2",
-        "enhanced-resolve": "4.1.0",
-        "loader-utils": "1.2.3",
-        "micromatch": "3.1.10",
-        "semver": "5.6.0"
+        "glob": "^6.0.4"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "6.0.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+          "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
+          "dev": true,
+          "requires": {
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "2 || 3",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        }
       }
     },
     "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.4",
+      "resolved": "https://registry.npmjs.org/ts-md5/-/ts-md5-1.2.4.tgz",
+      "integrity": "sha512-oW+rNjc9CAhalPFzbPWsLqPLzdNcJ8iSm+OXO+Uv+99r3PzCJuM5sVc0bO1eS+4LD2xv+nfU7ylBdwoemUV9Yw=="
     },
     "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": "3.2.2",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-3.2.2.tgz",
+      "integrity": "sha1-u9KOOK9Kqj6WB2xGbhsiAZfBo84=",
       "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"
+        "arrify": "^1.0.0",
+        "chalk": "^2.0.0",
+        "diff": "^3.1.0",
+        "make-error": "^1.1.1",
+        "minimist": "^1.2.0",
+        "mkdirp": "^0.5.1",
+        "source-map-support": "^0.4.0",
+        "tsconfig": "^6.0.0",
+        "v8flags": "^3.0.0",
+        "yn": "^2.0.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "source-map-support": {
+          "version": "0.4.18",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+          "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+          "dev": true,
+          "requires": {
+            "source-map": "^0.5.6"
+          }
+        }
       }
     },
-    "tsconfig-paths": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
-      "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
+    "tsconfig": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-6.0.0.tgz",
+      "integrity": "sha1-aw6DdgA9evGGT434+J3QBZ/80DI=",
+      "dev": true,
       "requires": {
-        "@types/json5": "0.0.29",
-        "json5": "1.0.1",
-        "minimist": "1.2.0",
-        "strip-bom": "3.0.0"
+        "strip-bom": "^3.0.0",
+        "strip-json-comments": "^2.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="
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        },
+        "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
         }
       }
     },
-    "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"
-      }
-    },
     "tsickle": {
-      "version": "0.37.0",
-      "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.37.0.tgz",
-      "integrity": "sha512-ufUZqLUNqh+kOfr52N/hJ5JbiDO32/CO7ZCteZBX9HA2kiejwEgDaJeJe1GAj2TIu683IgTA/LPKvlns6Liw0w==",
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.34.3.tgz",
+      "integrity": "sha512-mb1v3nsr6rYaZky22xj0d6qv4ogAR40Bc6r37jwWOg3bEIO/ZppEFZiEADs/NNVLcWTPgmNmPZgaX5CfAH6oXA==",
       "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": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
         "source-map": {
           "version": "0.7.3",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
@@ -15525,46 +14670,60 @@
       }
     },
     "tslib": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
-      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
+      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
     },
     "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": "5.13.0",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.13.0.tgz",
+      "integrity": "sha512-ECOOQRxXCYnUUePG5h/+Z1Zouobk3KFpIHA9aKBB/nnMxs97S1JJPDGt5J4cGm1y9U9VmVlfboOxA8n1kSNzGw==",
       "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": "^6.22.0",
+        "builtin-modules": "^1.1.1",
+        "chalk": "^2.3.0",
+        "commander": "^2.12.1",
+        "diff": "^3.2.0",
+        "glob": "^7.1.1",
+        "js-yaml": "^3.7.0",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.1",
+        "resolve": "^1.3.2",
+        "semver": "^5.3.0",
+        "tslib": "^1.8.0",
+        "tsutils": "^2.27.2"
       },
       "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
+        "chalk": {
+          "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.3.0"
+          }
+        },
+        "tsutils": {
+          "version": "2.29.0",
+          "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
+          "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.8.1"
+          }
         }
       }
     },
     "tsutils": {
-      "version": "2.29.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
-      "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
+      "version": "2.27.1",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.27.1.tgz",
+      "integrity": "sha512-AE/7uzp32MmaHvNNFES85hhUDHFdFZp6OAiZcd6y4ZKKIg6orJTm8keYWBhIhrJQH3a4LzNKat7ZPXZt5aTf6w==",
       "dev": true,
       "requires": {
-        "tslib": "1.10.0"
+        "tslib": "^1.8.1"
       }
     },
     "tty-browserify": {
@@ -15586,13 +14745,8 @@
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true
-    },
-    "type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "type-check": {
       "version": "0.3.2",
@@ -15603,20 +14757,14 @@
         "prelude-ls": "~1.1.2"
       }
     },
-    "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==",
-      "dev": true
-    },
     "type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "version": "1.6.16",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
+      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
       "dev": true,
       "requires": {
         "media-typer": "0.3.0",
-        "mime-types": "2.1.24"
+        "mime-types": "~2.1.18"
       }
     },
     "typedarray": {
@@ -15626,28 +14774,32 @@
       "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==",
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.1.6.tgz",
+      "integrity": "sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==",
       "dev": true
     },
     "uglify-js": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz",
-      "integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==",
+      "version": "3.4.9",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz",
+      "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "commander": "2.20.0",
-        "source-map": "0.6.1"
+        "commander": "~2.17.1",
+        "source-map": "~0.6.1"
       },
       "dependencies": {
+        "commander": {
+          "version": "2.17.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+          "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,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -15692,30 +14844,6 @@
       "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
       "dev": true
     },
-    "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=="
-    },
-    "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==",
-      "requires": {
-        "unicode-canonical-property-names-ecmascript": "1.0.4",
-        "unicode-property-aliases-ecmascript": "1.0.5"
-      }
-    },
-    "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=="
-    },
-    "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=="
-    },
     "union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
@@ -15737,12 +14865,12 @@
       }
     },
     "unique-slug": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
+      "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
       "dev": true,
       "requires": {
-        "imurmurhash": "0.1.4"
+        "imurmurhash": "^0.1.4"
       }
     },
     "unique-stream": {
@@ -15759,43 +14887,15 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
       "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
-      "dev": true,
-      "requires": {
-        "crypto-random-string": "^1.0.0"
-      }
-    },
-    "universal-analytics": {
-      "version": "0.4.20",
-      "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.20.tgz",
-      "integrity": "sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==",
-      "dev": true,
-      "requires": {
-        "debug": "3.2.6",
-        "request": "2.88.0",
-        "uuid": "3.3.3"
-      },
-      "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.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
-        }
+      "dev": true,
+      "requires": {
+        "crypto-random-string": "^1.0.0"
       }
     },
     "universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
+      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=",
       "dev": true
     },
     "unpipe": {
@@ -15840,35 +14940,40 @@
         }
       }
     },
+    "unzip-response": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
+      "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
+      "dev": true
+    },
     "upath": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
+      "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw=="
     },
     "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": "2.5.0",
+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
+      "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
       "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": "^1.2.1",
+        "chalk": "^2.0.1",
+        "configstore": "^3.0.0",
+        "import-lazy": "^2.1.0",
+        "is-ci": "^1.0.10",
+        "is-installed-globally": "^0.1.0",
+        "is-npm": "^1.0.0",
+        "latest-version": "^3.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"
       }
@@ -15897,30 +15002,22 @@
       }
     },
     "url-parse": {
-      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
-      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz",
+      "integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==",
       "dev": true,
       "requires": {
-        "querystringify": "2.1.1",
-        "requires-port": "1.0.0"
+        "querystringify": "^2.0.0",
+        "requires-port": "^1.0.0"
       }
     },
     "url-parse-lax": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
-      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
       "dev": true,
       "requires": {
-        "prepend-http": "2.0.0"
-      },
-      "dependencies": {
-        "prepend-http": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-          "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
-          "dev": true
-        }
+        "prepend-http": "^1.0.1"
       }
     },
     "urlgrey": {
@@ -15930,9 +15027,12 @@
       "dev": true
     },
     "use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz",
+      "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==",
+      "requires": {
+        "kind-of": "^6.0.2"
+      }
     },
     "user-home": {
       "version": "2.0.0",
@@ -15951,39 +15051,21 @@
       "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",
-      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3"
+        "inherits": "2.0.1"
       },
       "dependencies": {
         "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
           "dev": true
         }
       }
@@ -15993,15 +15075,6 @@
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
-    "util-promisify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/util-promisify/-/util-promisify-2.1.0.tgz",
-      "integrity": "sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=",
-      "dev": true,
-      "requires": {
-        "object.getownpropertydescriptors": "2.0.3"
-      }
-    },
     "util.promisify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
@@ -16019,28 +15092,28 @@
       "dev": true
     },
     "uuid": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
-      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
+      "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==",
       "dev": true
     },
     "v8flags": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz",
-      "integrity": "sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.0.tgz",
+      "integrity": "sha512-0m69VIK2dudEf2Ub0xwLQhZkDZu85OmiOpTw+UGDt56ibviYICHziM/3aE+oVg7IjGPp0c83w3eSVqa+lYZ9UQ==",
       "dev": true,
       "requires": {
-        "homedir-polyfill": "1.0.3"
+        "homedir-polyfill": "^1.0.1"
       }
     },
     "validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz",
+      "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==",
       "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": {
@@ -16076,17 +15149,17 @@
       }
     },
     "vinyl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
-      "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz",
+      "integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=",
       "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": {
@@ -16144,10 +15217,13 @@
       "dev": true
     },
     "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==",
-      "dev": true
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+      "dev": true,
+      "requires": {
+        "indexof": "0.0.1"
+      }
     },
     "void-elements": {
       "version": "2.0.1",
@@ -16176,9 +15252,30 @@
       }
     },
     "web-animations-js": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/web-animations-js/-/web-animations-js-2.3.2.tgz",
-      "integrity": "sha512-TOMFWtQdxzjWp8qx4DAraTWTsdhxVSiWa6NkPFSaPtZ1diKUxTn4yTix73A1euG1WbSOMMPcY51cnjTIHrGtDA=="
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/web-animations-js/-/web-animations-js-2.3.1.tgz",
+      "integrity": "sha1-Om2bwVGWN3qQ+OKAP6UmIWWwRRA="
+    },
+    "webcola": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/webcola/-/webcola-3.4.0.tgz",
+      "integrity": "sha512-4BiLXjXw3SJHo3Xd+rF+7fyClT6n7I+AR6TkBqyQ4kTsePSAMDLRCXY1f3B/kXJeP9tYn4G1TblxTO+jAt0gaw==",
+      "requires": {
+        "d3-dispatch": "^1.0.3",
+        "d3-drag": "^1.0.4",
+        "d3-shape": "^1.3.5",
+        "d3-timer": "^1.0.5"
+      },
+      "dependencies": {
+        "d3-shape": {
+          "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"
+          }
+        }
+      }
     },
     "webdriver-js-extender": {
       "version": "2.1.0",
@@ -16191,52 +15288,51 @@
       }
     },
     "webpack": {
-      "version": "4.39.2",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.39.2.tgz",
-      "integrity": "sha512-AKgTfz3xPSsEibH00JfZ9sHXGUwIQ6eZ9tLN8+VLzachk1Cw2LVmy+4R7ZiwTa9cZZ15tzySjeMui/UnSCAZhA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@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"
+      "version": "4.29.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.0.tgz",
+      "integrity": "sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.7.11",
+        "@webassemblyjs/helper-module-context": "1.7.11",
+        "@webassemblyjs/wasm-edit": "1.7.11",
+        "@webassemblyjs/wasm-parser": "1.7.11",
+        "acorn": "^6.0.5",
+        "acorn-dynamic-import": "^4.0.0",
+        "ajv": "^6.1.0",
+        "ajv-keywords": "^3.1.0",
+        "chrome-trace-event": "^1.0.0",
+        "enhanced-resolve": "^4.1.0",
+        "eslint-scope": "^4.0.0",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^2.3.0",
+        "loader-utils": "^1.1.0",
+        "memory-fs": "~0.4.1",
+        "micromatch": "^3.1.8",
+        "mkdirp": "~0.5.0",
+        "neo-async": "^2.5.0",
+        "node-libs-browser": "^2.0.0",
+        "schema-utils": "^0.4.4",
+        "tapable": "^1.1.0",
+        "terser-webpack-plugin": "^1.1.0",
+        "watchpack": "^1.5.0",
+        "webpack-sources": "^1.3.0"
       },
       "dependencies": {
         "acorn": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
-          "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==",
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.0.tgz",
+          "integrity": "sha512-MW/FjM+IvU9CgBzjO3UIPCE2pyEwUsoFl+VGdczOPEdxfGFjuKny/gN54mOuX7Qxmb9Rg9MCn2oKiSUeW+pjrw==",
           "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==",
+        "schema-utils": {
+          "version": "0.4.7",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
+          "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
           "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"
+            "ajv": "^6.1.0",
+            "ajv-keywords": "^3.1.0"
           }
         }
       }
@@ -16269,91 +15365,79 @@
       }
     },
     "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.5.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.5.1.tgz",
+      "integrity": "sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==",
       "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.3.1",
+        "range-parser": "^1.0.3",
+        "webpack-log": "^2.0.0"
       },
       "dependencies": {
         "mime": {
-          "version": "2.4.4",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
-          "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
+          "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
           "dev": true
         }
       }
     },
     "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.1.14",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz",
+      "integrity": "sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==",
       "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.0.0",
+        "compression": "^1.5.2",
+        "connect-history-api-fallback": "^1.3.0",
+        "debug": "^3.1.0",
+        "del": "^3.0.0",
+        "express": "^4.16.2",
+        "html-entities": "^1.2.0",
+        "http-proxy-middleware": "~0.18.0",
+        "import-local": "^2.0.0",
+        "internal-ip": "^3.0.1",
+        "ip": "^1.1.5",
+        "killable": "^1.0.0",
+        "loglevel": "^1.4.1",
+        "opn": "^5.1.0",
+        "portfinder": "^1.0.9",
+        "schema-utils": "^1.0.0",
+        "selfsigned": "^1.9.1",
+        "semver": "^5.6.0",
+        "serve-index": "^1.7.2",
         "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",
-        "yargs": "12.0.5"
+        "spdy": "^4.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^5.1.0",
+        "url": "^0.11.0",
+        "webpack-dev-middleware": "3.4.0",
+        "webpack-log": "^2.0.0",
+        "yargs": "12.0.2"
       },
       "dependencies": {
+        "ansi-colors": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.1.tgz",
+          "integrity": "sha512-Xt+zb6nqgvV9SWAVp0EG3lRsHcbq5DDgqjPPz6pwgtj6RKz65zGXMNa82oJfOSBA/to6GmRP7Dr+6o+kbApTzQ=="
+        },
         "ansi-regex": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
           "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
           "dev": true
         },
-        "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.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"
-          }
+        "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",
@@ -16361,9 +15445,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": {
@@ -16372,18 +15456,73 @@
               "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
               "dev": true,
               "requires": {
-                "ansi-regex": "3.0.0"
+                "ansi-regex": "^3.0.0"
               }
             }
           }
         },
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "dev": true,
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
         "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"
+          }
+        },
+        "decamelize": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
+          "integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
+          "dev": true,
+          "requires": {
+            "xregexp": "4.0.0"
+          }
+        },
+        "execa": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+          "dev": true,
+          "requires": {
+            "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"
+          }
+        },
+        "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"
+          }
+        },
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
           "dev": true,
           "requires": {
-            "ms": "2.1.2"
+            "pump": "^3.0.0"
           }
         },
         "invert-kv": {
@@ -16404,30 +15543,29 @@
           "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
           "dev": true,
           "requires": {
-            "invert-kv": "2.0.0"
+            "invert-kv": "^2.0.0"
           }
         },
-        "mem": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
-          "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+        "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": {
-            "map-age-cleaner": "0.1.3",
-            "mimic-fn": "2.1.0",
-            "p-is-promise": "2.1.0"
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.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==",
+        "mime": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
+          "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
           "dev": true
         },
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+        "ms": {
+          "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
         },
         "os-locale": {
@@ -16436,15 +15574,49 @@
           "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"
+          }
+        },
+        "p-limit": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz",
+          "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==",
+          "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.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
+          "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
+          "dev": true
+        },
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
           }
         },
         "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "version": "5.6.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
           "dev": true
         },
         "string-width": {
@@ -16453,8 +15625,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": {
@@ -16463,11 +15635,23 @@
               "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
               "dev": true,
               "requires": {
-                "ansi-regex": "3.0.0"
+                "ansi-regex": "^3.0.0"
               }
             }
           }
         },
+        "webpack-dev-middleware": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz",
+          "integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==",
+          "dev": true,
+          "requires": {
+            "memory-fs": "~0.4.1",
+            "mime": "^2.3.1",
+            "range-parser": "^1.0.3",
+            "webpack-log": "^2.0.0"
+          }
+        },
         "which-module": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
@@ -16475,33 +15659,32 @@
           "dev": true
         },
         "yargs": {
-          "version": "12.0.5",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
-          "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+          "version": "12.0.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz",
+          "integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
           "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": "^2.0.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": "^10.1.0"
           }
         },
         "yargs-parser": {
-          "version": "11.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
-          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
+          "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
           "dev": true,
           "requires": {
-            "camelcase": "5.3.1",
-            "decamelize": "1.2.0"
+            "camelcase": "^4.1.0"
           }
         }
       }
@@ -16514,6 +15697,20 @@
       "requires": {
         "ansi-colors": "^3.0.0",
         "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "ansi-colors": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
+          "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
+          "dev": true
+        },
+        "uuid": {
+          "version": "3.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+          "dev": true
+        }
       }
     },
     "webpack-merge": {
@@ -16525,19 +15722,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==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.3.0.tgz",
+      "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==",
       "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": {
@@ -16558,14 +15750,13 @@
       }
     },
     "websocket-driver": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz",
-      "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
+      "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
       "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",
+        "websocket-extensions": ">=0.1.1"
       }
     },
     "websocket-extensions": {
@@ -16595,6 +15786,15 @@
       "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
       "dev": 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,
+      "requires": {
+        "string-width": "^1.0.2 || 2"
+      }
+    },
     "widest-line": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz",
@@ -16644,21 +15844,12 @@
       "dev": true
     },
     "worker-farm": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
-      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
-      "dev": true,
-      "requires": {
-        "errno": "0.1.7"
-      }
-    },
-    "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": "1.6.0",
+      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz",
+      "integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
       "dev": true,
       "requires": {
-        "loader-utils": "1.2.3"
+        "errno": "~0.1.7"
       }
     },
     "wrap-ansi": {
@@ -16687,23 +15878,25 @@
       }
     },
     "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": "2.4.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.2.tgz",
+      "integrity": "sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==",
       "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": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
-      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
       "dev": true,
       "requires": {
-        "async-limiter": "1.0.1"
+        "async-limiter": "~1.0.0",
+        "safe-buffer": "~5.1.0",
+        "ultron": "~1.1.0"
       }
     },
     "xdg-basedir": {
@@ -16753,21 +15946,22 @@
       "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=",
       "dev": true
     },
+    "xregexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz",
+      "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==",
+      "dev": true
+    },
     "xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
       "dev": true
     },
     "xterm": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xterm/-/xterm-4.0.2.tgz",
-      "integrity": "sha512-NIr11b6C782TZznU8e6K/IMfmwlWMWRI6ba9GEDG9uX25SadkpjoMnzvxOS0Z/15sfrbn0rghPiarGDmmP0uhQ=="
-    },
-    "xterm-addon-fit": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/xterm-addon-fit/-/xterm-addon-fit-0.3.0.tgz",
-      "integrity": "sha512-kvkiqHVrnMXgyCH9Xn0BOBJ7XaWC/4BgpSWQy3SueqximgW630t/QOankgqkvk11iTOCwWdAY9DTyQBXUMN3lw=="
+      "version": "3.12.2",
+      "resolved": "https://registry.npmjs.org/xterm/-/xterm-3.12.2.tgz",
+      "integrity": "sha512-FSXovDdsqIKqoayC6+zFzhaHi+A3NSceM5rgTW88DH7sS96HdwMToB2p1rW+FyNsSqfAgFwlXDRQk+fh/aHvPQ=="
     },
     "xxhashjs": {
       "version": "0.2.2",
@@ -16785,46 +15979,11 @@
       "dev": true
     },
     "yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
       "dev": true
     },
-    "yargs": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
-      "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"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true
-        },
-        "y18n": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
-          "dev": true
-        }
-      }
-    },
     "yargs-parser": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
@@ -16843,12 +16002,12 @@
       }
     },
     "yazl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
-      "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.4.3.tgz",
+      "integrity": "sha1-7CblzIfVYBud+EMtvdPNLlFzoHE=",
       "dev": true,
       "requires": {
-        "buffer-crc32": "0.2.13"
+        "buffer-crc32": "~0.2.3"
       }
     },
     "yeast": {
@@ -16858,15 +16017,15 @@
       "dev": true
     },
     "yn": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz",
+      "integrity": "sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=",
       "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.8.29",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.29.tgz",
+      "integrity": "sha512-mla2acNCMkWXBD+c+yeUrBUrzOxYMNFdQ6FGfigGGtEVBPJx07BQeJekjt9DmH1FtZek4E9rE1eRR9qQpxACOQ=="
     }
   }
 }
diff --git a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.html b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.html
index 4da34cbe74..49bbeeb353 100644
--- a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.html
+++ b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.html
@@ -1,8 +1,6 @@
 <div class="entity-summary">
-  <img *ngIf="imagePath" class="entity-summary__logo" title="{{ title }}'s image'" src="{{ imagePath }}" />
   <div class="entity-summary__header-section">
-    <img class="entity-summary__inline-logo" title="{{ title }}'s image'" *ngIf="inlineImagePath"
-      src="{{ inlineImagePath }}">
+    <img *ngIf="imagePath" class="entity-summary__logo" title="{{ title }}'s image'" src="{{ imagePath }}">
     <div class="entity-summary__header-inner">
       <div class="entity-summary__header-wrapper">
         <h1 class="entity-summary__header">{{ title }} </h1>
diff --git a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.scss b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.scss
index a96068938d..bef4b4562c 100644
--- a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.scss
+++ b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.scss
@@ -1,12 +1,11 @@
 .entity-summary {
   margin: 10px 0;
   &__logo {
-    height: 400px;
-    opacity: .2;
-    position: absolute;
-    right: -120px;
-    top: 20px;
-    z-index: -1;
+    flex: 0 0 64px;
+    max-height: 64px;
+  }
+  &__logo-large {
+    max-height: 160px;
   }
   &__inline-logo {
     max-height: 160px;
@@ -25,6 +24,10 @@
   &__header {
     margin: 0;
   }
+  &__header-inner {
+    flex: 1;
+    margin-left: 10px;
+  }
   &__header-wrapper {
     align-items: baseline;
     display: flex;
diff --git a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.ts b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.ts
index 7b049b1f96..b568df7a89 100644
--- a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.ts
+++ b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.ts
@@ -11,5 +11,5 @@ export class EntitySummaryTitleComponent {
   @Input() info: string;
   @Input() subText: string;
   @Input() imagePath: string;
-  @Input() inlineImagePath: string;
+  @Input() imageSize: string;
 }
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index 12aae65f83..768ab53a4e 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -116,6 +116,7 @@ import { SimpleListComponent } from './components/list/simple-list/simple-list.c
 import { ListHostDirective } from './components/list/simple-list/list-host.directive';
 import { EndpointListHelper } from './components/list/list-types/endpoint/endpoint-list.helpers';
 import { EndpointsListConfigService } from './components/list/list-types/endpoint/endpoints-list-config.service';
+import { JsonViewerComponent } from './components/json-viewer/json-viewer.component';
 
 /* tslint:disable:max-line-length */
 
@@ -216,6 +217,7 @@ import { EndpointsListConfigService } from './components/list/list-types/endpoin
     SnackBarReturnComponent,
     PollingIndicatorComponent,
     UnlimitedInputComponent,
+    JsonViewerComponent,
     SimpleListComponent,
     ListHostDirective,
   ],
@@ -302,9 +304,11 @@ import { EndpointsListConfigService } from './components/list/list-types/endpoin
     EntitySummaryTitleComponent,
     MarkdownPreviewComponent,
     MarkdownContentObserverDirective,
+    TileSelectorComponent,
     AppNameUniqueDirective,
     PollingIndicatorComponent,
     UnlimitedInputComponent,
+    JsonViewerComponent,
     SimpleListComponent,
     ListHostDirective
   ],
diff --git a/src/jetstream/middleware.go b/src/jetstream/middleware.go
index 0983457e66..0fafea74af 100644
--- a/src/jetstream/middleware.go
+++ b/src/jetstream/middleware.go
@@ -207,6 +207,8 @@ func errorLoggingMiddleware(h echo.HandlerFunc) echo.HandlerFunc {
 				log.Error(shadowError.LogMessage)
 			}
 			return shadowError.HTTPError
+		} else if jetstreamError, ok := err.(interfaces.JetstreamError); ok {
+			return jetstreamError.HTTPError()
 		}
 
 		return err
diff --git a/src/jetstream/plugins/kubernetes/helm/graph.go b/src/jetstream/plugins/kubernetes/helm/graph.go
index a42e37d585..e37b12ca50 100644
--- a/src/jetstream/plugins/kubernetes/helm/graph.go
+++ b/src/jetstream/plugins/kubernetes/helm/graph.go
@@ -9,6 +9,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
+	extv1beta1 "k8s.io/api/extensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -22,7 +23,7 @@ type ReleaseNode struct {
 	ID    string `json:"id"`
 	Label string `json:"label"`
 	Data  struct {
-		Kind   string `json:"kind"`
+		Kind   string     `json:"kind"`
 		Status NodeStatus `json:"status"`
 	} `json:"data"`
 }
@@ -73,6 +74,13 @@ func (r *HelmReleaseGraph) ParseManifest(release *HelmRelease) {
 		case *appsv1.Deployment:
 			target := getShortResourceId(o.Kind, o.Name)
 			r.ParseResourceOwners(target, o.OwnerReferences)
+			node.Data.Status = mapDeploymentStatus(o.Status.Replicas, o.Status.ReadyReplicas, o.Status.AvailableReplicas, o.Status.UnavailableReplicas)
+			log.Warnf("Status %s => %s", o.Name, node.Data.Status)
+		case *extv1beta1.Deployment:
+			target := getShortResourceId(o.Kind, o.Name)
+			r.ParseResourceOwners(target, o.OwnerReferences)
+			node.Data.Status = mapDeploymentStatus(o.Status.Replicas, o.Status.ReadyReplicas, o.Status.AvailableReplicas, o.Status.UnavailableReplicas)
+			log.Warnf("Status %s => %s", o.Name, node.Data.Status)
 		case *appsv1.ReplicaSet:
 			target := getShortResourceId(o.Kind, o.Name)
 			r.ParseResourceOwners(target, o.OwnerReferences)
@@ -86,7 +94,7 @@ func (r *HelmReleaseGraph) ParseManifest(release *HelmRelease) {
 			target := getShortResourceId(item.Kind, o.Name)
 			r.ProcessService(target, item, o.Spec)
 		default:
-			log.Info(reflect.TypeOf(o))
+			log.Errorf("Unknown type: %s", reflect.TypeOf(o))
 		}
 
 		// Add or replace the node in the map
diff --git a/src/jetstream/plugins/kubernetes/helm/graph_status.go b/src/jetstream/plugins/kubernetes/helm/graph_status.go
index f1820acc92..639ac37ba1 100644
--- a/src/jetstream/plugins/kubernetes/helm/graph_status.go
+++ b/src/jetstream/plugins/kubernetes/helm/graph_status.go
@@ -17,6 +17,22 @@ const (
 	NodeNone    NodeStatus = "none"
 )
 
+func mapDeploymentStatus(replicas, ready, available, unavailable int32) NodeStatus {
+	if replicas == ready {
+		return NodeOK
+	}
+
+	if unavailable > 0 {
+		return NodeError
+	}
+
+	if replicas != unavailable {
+		return NodeWarn
+	}
+
+	return NodeWarn
+}
+
 func mapReplicaSetStatus(status appsv1.ReplicaSetStatus) NodeStatus {
 	if status.Replicas == status.ReadyReplicas {
 		return NodeOK
diff --git a/src/jetstream/plugins/kubernetes/helm/job.go b/src/jetstream/plugins/kubernetes/helm/job.go
index 18af13792e..ab2385be37 100644
--- a/src/jetstream/plugins/kubernetes/helm/job.go
+++ b/src/jetstream/plugins/kubernetes/helm/job.go
@@ -70,7 +70,7 @@ func (j *KubeAPIJob) Run() []KubeResourceJobResult {
 func (j *KubeAPIJob) restWorker(jetstream interfaces.PortalProxy, id int, jobs <-chan KubeResourceJob, results chan<- KubeResourceJobResult) {
 	for job := range jobs {
 		response, err := j.Jetstream.DoProxySingleRequest(job.Endpoint, job.User, "GET", job.URL, nil, nil)
-		log.Infof("%s - %d", job.URL, response.StatusCode)
+		log.Infof("Rest Worker finished for: %s - %d", job.URL, response.StatusCode)
 		res := KubeResourceJobResult{
 			KubeResourceJob: job,
 			StatusCode:      response.StatusCode,
diff --git a/src/jetstream/plugins/kubernetes/install_release.go b/src/jetstream/plugins/kubernetes/install_release.go
index f2307330aa..9620e62f86 100644
--- a/src/jetstream/plugins/kubernetes/install_release.go
+++ b/src/jetstream/plugins/kubernetes/install_release.go
@@ -5,13 +5,17 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net/http"
 
 	"github.com/helm/monocular/chartsvc"
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
+	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/v3/pkg/action"
 	"helm.sh/helm/v3/pkg/chart/loader"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 )
 
 const chartCollection = "charts"
@@ -97,10 +101,17 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 	// }
 
 	log.Warn("Got values")
+	log.Warn(params.Values)
+
+	userSuppliedValues := map[string]interface{}{}
+	if err := yaml.Unmarshal([]byte(params.Values), &userSuppliedValues); err != nil {
+		// Could not parse the user's values
+		return err
+	}
 
-	n := make(map[string]interface{})
+	log.Infof("%+v", userSuppliedValues)
 
-	log.Warn(params.Values)
+	log.Warn("Installing.....")
 
 	install := action.NewInstall(config)
 	install.ReleaseName = params.Name
@@ -110,7 +121,7 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 	// Generate Name ?
 	// Atomic?
 
-	release, err := install.Run(chart, n)
+	release, err := install.Run(chart, userSuppliedValues)
 	if err != nil {
 		log.Error(err)
 		return fmt.Errorf("Could not install Helm Chart: %v+", err)
@@ -156,14 +167,15 @@ func (c *KubernetesSpecification) DeleteRelease(ec echo.Context) error {
 
 	endpointGUID := ec.Param("endpoint")
 	releaseName := ec.Param("name")
+	namespace := ec.Param("namespace")
 
 	// I think we're going to need the namespace
 
 	userGUID := ec.Get("user_id").(string)
 
-	config, hc, err := c.GetHelmConfiguration(endpointGUID, userGUID, "")
+	config, hc, err := c.GetHelmConfiguration(endpointGUID, userGUID, namespace)
 	if err != nil {
-		log.Errorf("Helm: ListReleases could not get a Helm Configuration: %s", err)
+		log.Errorf("Helm: DeleteRelease could not get a Helm Configuration: %s", err)
 		return err
 	}
 
@@ -171,10 +183,15 @@ func (c *KubernetesSpecification) DeleteRelease(ec echo.Context) error {
 
 	uninstall := action.NewUninstall(config)
 
+	log.Warnf("%+v", config)
+	log.Warnf("%+v", uninstall)
+
 	deleteResponse, err := uninstall.Run(releaseName)
 	if err != nil {
-		return fmt.Errorf("Could not delete Helm Release: %v+", err)
+		return interfaces.NewJetstreamError(http.StatusInternalServerError, "Could not delete Helm Release")
 	}
 
+	log.Warnf("%+v", deleteResponse)
+
 	return ec.JSON(200, deleteResponse)
 }
diff --git a/src/jetstream/plugins/kubernetes/list_releases.go b/src/jetstream/plugins/kubernetes/list_releases.go
index 366dfc1eb8..337f6e1b01 100644
--- a/src/jetstream/plugins/kubernetes/list_releases.go
+++ b/src/jetstream/plugins/kubernetes/list_releases.go
@@ -143,14 +143,15 @@ func (c *KubernetesSpecification) listReleases(ep *interfaces.ConnectedEndpoint,
 // polling until disconnected
 func (c *KubernetesSpecification) GetRelease(ec echo.Context) error {
 
-	// TODO: I think this needs to know the namespace that the release is in ?!
-
 	// Need to get a config object for the target endpoint
 	endpointGUID := ec.Param("endpoint")
 	release := ec.Param("name")
+	namespace := ec.Param("namespace")
 	userID := ec.Get("user_id").(string)
 
-	config, hc, err := c.GetHelmConfiguration(endpointGUID, userID, "")
+	log.Infof("GET RELEASE: %s %s %s", endpointGUID, namespace, release)
+
+	config, hc, err := c.GetHelmConfiguration(endpointGUID, userID, namespace)
 	if err != nil {
 		log.Errorf("Helm: GetRelease could not get a Helm Configuration: %s", err)
 		return err
diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index 2490a5d493..fc668ed6dd 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -118,8 +118,8 @@ func (c *KubernetesSpecification) AddSessionGroupRoutes(echoGroup *echo.Group) {
 	// Helm Routes
 	echoGroup.GET("/helm/releases", c.ListReleases)
 	echoGroup.POST("/helm/install", c.InstallRelease)
-	echoGroup.DELETE("/helm/releases/:endpoint/:name", c.DeleteRelease)
-	echoGroup.GET("/helm/releases/:endpoint/:name", c.GetRelease)
+	echoGroup.DELETE("/helm/releases/:endpoint/:namespace/:name", c.DeleteRelease)
+	echoGroup.GET("/helm/releases/:endpoint/:namespace/:name", c.GetRelease)
 }
 
 func (c *KubernetesSpecification) Info(apiEndpoint string, skipSSLValidation bool) (interfaces.CNSIRecord, interface{}, error) {

From 58b29ad6acc6afc9508f57abc6cfcff2fc8d6af7 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 4 Dec 2019 14:20:59 +0000
Subject: [PATCH 183/648] Disable dark theme

---
 custom-src/frontend/sass/custom.scss       |  2 +
 custom-src/frontend/sass/custom/suse.scss  | 88 ++++++++++++----------
 src/frontend/packages/core/sass/theme.scss | 28 +++----
 3 files changed, 65 insertions(+), 53 deletions(-)

diff --git a/custom-src/frontend/sass/custom.scss b/custom-src/frontend/sass/custom.scss
index 84a04680fe..e59c4bce3d 100644
--- a/custom-src/frontend/sass/custom.scss
+++ b/custom-src/frontend/sass/custom.scss
@@ -11,4 +11,6 @@ $suse-theme-primary: mat-palette($suse-primary);
 $suse-theme-warn: mat-palette($mat-red);
 $stratos-theme: mat-light-theme($suse-theme-primary, $suse-theme-primary, $suse-theme-warn);
 
+$stratos-dark-theme-supported: false;
+
 @import "custom/suse"
\ No newline at end of file
diff --git a/custom-src/frontend/sass/custom/suse.scss b/custom-src/frontend/sass/custom/suse.scss
index 4fdaa4adc8..791d61ef1e 100644
--- a/custom-src/frontend/sass/custom/suse.scss
+++ b/custom-src/frontend/sass/custom/suse.scss
@@ -18,56 +18,57 @@ $suse-blue: #073155;
 $suse-side-nav: $suse-secondary;
 $suse-side-nav-active: #003358;
 
-.stratos .page-content > .page-header {
-  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-  // Ensure kube icons don't appear above sub header
-  background-color: #f5f5f5;
-}
 
-.stratos img.stratos-title__logo {
-  width: 160px;
-}
+body.stratos {
+  .page-content > .page-header {
+    // Ensure kube icons don't appear above sub header
+    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+    color: #f5f5f5;
+  }
 
-.stratos h1.stratos-title__header {
-  display: initial;
-}
+  img.stratos-title__logo {
+    width: 160px;
+  }
 
-.stratos .page-header .mat-toolbar.mat-primary {
-  background-color: #fff;
-  color: #333;
-}
+  h1.stratos-title__header {
+    display: initial;
+  }
 
-.stratos app-page-subheader {
-  .page-subheader {
+  .page-header .mat-toolbar.mat-primary {
     background-color: #fff;
     color: #333;
   }
 
-  .mat-tab-nav-bar.mat-background-primary {
-    .mat-tab-links {
+  app-page-subheader {
+    .page-subheader {
       background-color: #fff;
       color: #333;
     }
 
-    .mat-tab-link {
-      color: #333;
-    }
+    .mat-tab-nav-bar.mat-background-primary {
+      .mat-tab-links {
+        background-color: #fff;
+        color: #333;
+      }
 
-    .mat-ink-bar {
-      background-color: $suse-primary-color;
+      .mat-tab-link {
+        color: #333;
+      }
+
+      .mat-ink-bar {
+        background-color: $suse-primary-color;
+      }
     }
   }
-}
 
-// Use SUSE Blue Side Navigation
-.stratos {
+  // Use SUSE Blue Side Navigation
   // This is themeable, we really don't need this.
   .side-nav__inner,
   .side-nav__top,
   .side-nav__item--active:hover {
     background-color: $suse-side-nav;
   }
- 
+
   .side-nav__item--active,
   .side-nav__item:hover {
     background-color: $suse-side-nav-active;
@@ -83,19 +84,26 @@ $suse-side-nav-active: #003358;
   app-about-page .page-header__underflow {
     background-color: transparent;
   }
-}
 
-// Remove background image from setup screen (e.g. upgrade screen)
-.stratos app-intro-screen > .intro {
-  background-color: $suse-blue;
-  background-image: none;
-}
+  // Remove background image from setup screen (e.g. upgrade screen)
+  app-intro-screen > .intro {
+    background-color: $suse-blue;
+    background-image: none;
+  }
 
-.stratos .page-header__divider {
-  color: #333;
-}
+  .page-header__divider {
+    color: #333;
+  }
+
+  .page-header__menu-button-icon {
+    font-size: 30;
+    background-color: $suse-primary-color;
+    color: $suse-text;
+  }
 
-.stratos .page-header__menu-button-icon {
-  background-color: $suse-primary-color;
-  color: $suse-text;
+  .dark-theme {
+    .page-content > .page-header {
+      border-bottom: solid 1px rgba(255, 255, 255, 0.12);
+    }
+  }
 }
diff --git a/src/frontend/packages/core/sass/theme.scss b/src/frontend/packages/core/sass/theme.scss
index ed6428d931..365cd4750e 100644
--- a/src/frontend/packages/core/sass/theme.scss
+++ b/src/frontend/packages/core/sass/theme.scss
@@ -6,19 +6,21 @@
 // Custom theme support
 @import './custom';
 
-.dark-theme {
-  // Dark Theme defaults
-  $dark-primary: mat-palette($mat-blue);
-  $dark-accent: mat-palette($mat-amber, A400, A100, A700);
-  $dark-warn: mat-palette($mat-red);
-  $dark-theme: mat-dark-theme($dark-primary, $dark-accent, $dark-warn);
-
-  $stratos-dark-theme: $dark-theme !default;
-  $stratos-dark-nav-theme: null !default;
-  $stratos-dark-status-theme: null !default;
-
-  @include angular-material-theme($stratos-dark-theme);
-  @include app-theme($stratos-dark-theme, $stratos-dark-nav-theme, $stratos-dark-status-theme);
+body.stratos {
+  .dark-theme {
+    // Dark Theme defaults
+    $dark-primary: mat-palette($mat-blue);
+    $dark-accent: mat-palette($mat-amber, A400, A100, A700);
+    $dark-warn: mat-palette($mat-red);
+    $dark-theme: mat-dark-theme($dark-primary, $dark-accent, $dark-warn);
+
+    $stratos-dark-theme: $dark-theme !default;
+    $stratos-dark-nav-theme: null !default;
+    $stratos-dark-status-theme: null !default;
+
+    @include angular-material-theme($stratos-dark-theme);
+    @include app-theme($stratos-dark-theme, $stratos-dark-nav-theme, $stratos-dark-status-theme);
+  }
 }
 
 .default {

From 6e2a96473a4fbddc35d3429e5bc2a65915d927ee Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 4 Dec 2019 14:41:39 +0000
Subject: [PATCH 184/648] SUSE custom initial page loading indicator

---
 custom-src/frontend/loading.css  | 35 ++++++++++++++++++++++++++++++++
 custom-src/frontend/loading.html |  3 +++
 2 files changed, 38 insertions(+)
 create mode 100644 custom-src/frontend/loading.css
 create mode 100644 custom-src/frontend/loading.html

diff --git a/custom-src/frontend/loading.css b/custom-src/frontend/loading.css
new file mode 100644
index 0000000000..034324c227
--- /dev/null
+++ b/custom-src/frontend/loading.css
@@ -0,0 +1,35 @@
+.stratos-initial-load-spinner-container {
+  align-items: center;
+  background-color: #0D2C40;
+  display: flex;
+  justify-content: center;
+  height: 100%;
+  left: 0;
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+.stratos-initial-load-spinner-logo {
+  position: absolute;
+  height: 60px;
+}
+.stratos-initial-load-spinner {
+  animation: stratos-initial-load-animate 1s infinite linear;
+  box-sizing: border-box;
+  border: 5px solid rgba(86, 107, 121,0.45);
+  border-radius: 50%;
+  border-top-color: #00B2E2;
+  display: inline-block;
+  height: 128px;
+  margin: 0 auto;
+  width: 128px;
+}
+
+@keyframes stratos-initial-load-animate {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(359deg);
+  }
+}
\ No newline at end of file
diff --git a/custom-src/frontend/loading.html b/custom-src/frontend/loading.html
new file mode 100644
index 0000000000..cf66894e7b
--- /dev/null
+++ b/custom-src/frontend/loading.html
@@ -0,0 +1,3 @@
+<div class="stratos-initial-load-spinner-container">
+  <i class="stratos-initial-load-spinner"></i>
+</div>
\ No newline at end of file

From 1ebc4a5ac72c60647350749d291f771914ea3388 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Sat, 12 Oct 2019 13:19:58 +0100
Subject: [PATCH 185/648] Add sync scripts

---
 .../plugins/monocular/git-merge-subpath.sh    | 62 ++++++++++++++
 .../plugins/monocular/git-pull-downstream.sh  | 78 ++++++++++++++++++
 .../plugins/monocular/git-push-upstream.sh    | 80 +++++++++++++++++++
 3 files changed, 220 insertions(+)
 create mode 100755 src/jetstream/plugins/monocular/git-merge-subpath.sh
 create mode 100755 src/jetstream/plugins/monocular/git-pull-downstream.sh
 create mode 100755 src/jetstream/plugins/monocular/git-push-upstream.sh

diff --git a/src/jetstream/plugins/monocular/git-merge-subpath.sh b/src/jetstream/plugins/monocular/git-merge-subpath.sh
new file mode 100755
index 0000000000..f4b05cfc10
--- /dev/null
+++ b/src/jetstream/plugins/monocular/git-merge-subpath.sh
@@ -0,0 +1,62 @@
+#! /bin/bash
+
+#================================================
+# Attribution:
+# https://stackoverflow.com/questions/23937436/add-subdirectory-of-remote-repo-with-git-subtree/30386041#30386041
+#================================================================
+
+git-merge-subpath() {
+    local SQUASH
+    if [[ $1 == "--squash" ]]; then
+        SQUASH=1
+        shift
+    fi
+    if (( $# != 3 )); then
+        local PARAMS="[--squash] SOURCE_COMMIT SOURCE_PREFIX DEST_PREFIX"
+        echo "USAGE: ${FUNCNAME[0]} $PARAMS"
+        return 1
+    fi
+
+    # Friendly parameter names; strip any trailing slashes from prefixes.
+    local SOURCE_COMMIT="$1" SOURCE_PREFIX="${2%/}" DEST_PREFIX="${3%/}"
+
+    local SOURCE_SHA1
+    SOURCE_SHA1=$(git rev-parse --verify "$SOURCE_COMMIT^{commit}") || return 1
+
+    local OLD_SHA1
+    local GIT_ROOT=$(git rev-parse --show-toplevel)
+    if [[ -n "$(ls -A "$GIT_ROOT/$DEST_PREFIX" 2> /dev/null)" ]]; then
+        # OLD_SHA1 will remain empty if there is no match.
+        local RE="^${FUNCNAME[0]}: [0-9a-f]{40} $SOURCE_PREFIX $DEST_PREFIX\$"
+        OLD_SHA1=$(git log -1 --format=%b -E --grep="$RE" \
+                   | grep --color=never -E "$RE" | tail -1 | awk '{print $2}')
+    fi
+
+    local OLD_TREEISH
+    if [[ -n $OLD_SHA1 ]]; then
+        OLD_TREEISH="$OLD_SHA1:$SOURCE_PREFIX"
+    else
+        # This is the first time git-merge-subpath is run, so diff against the
+        # empty commit instead of the last commit created by git-merge-subpath.
+        OLD_TREEISH=$(git hash-object -t tree /dev/null)
+    fi &&
+
+    if [[ -z $SQUASH ]]; then
+        git merge -s ours --no-commit "$SOURCE_COMMIT"
+    fi &&
+
+    git diff --color=never "$OLD_TREEISH" "$SOURCE_COMMIT:$SOURCE_PREFIX" \
+        | git apply -3 --directory="$DEST_PREFIX" || git mergetool
+
+    if (( $? == 1 )); then
+        echo "Uh-oh! Try cleaning up with |git reset --merge|."
+	return 1
+    else
+        git commit -em "Merge $SOURCE_COMMIT:$SOURCE_PREFIX/ to $DEST_PREFIX/
+
+# Feel free to edit the title and body above, but make sure to keep the
+# ${FUNCNAME[0]}: line below intact, so ${FUNCNAME[0]} can find it
+# again when grepping git log.
+${FUNCNAME[0]}: $SOURCE_SHA1 $SOURCE_PREFIX $DEST_PREFIX"
+    fi
+}
diff --git a/src/jetstream/plugins/monocular/git-pull-downstream.sh b/src/jetstream/plugins/monocular/git-pull-downstream.sh
new file mode 100755
index 0000000000..27366e4560
--- /dev/null
+++ b/src/jetstream/plugins/monocular/git-pull-downstream.sh
@@ -0,0 +1,78 @@
+#!/bin/bash
+
+echo "=== Pull Monocular Code to Stratos Repo ===" >&1
+echo "Pulls the subtree under cmd from monocular repo into the src/jetstream/plugins/monocular subtree in stratos" >&1
+usage() {
+	echo    "Usage: git-pull-downstream.sh -f <MONOCULAR_FORK> [ -b <MONOCULAR_BRANCH>  | -r <MONOCULAR_REF> ]" >&1
+	echo    "  options:" >&1
+	printf  "    -f MONOCULAR_FORK         The upstream fork/repo to pull from\n" >&1
+	printf  "    ONE OF EITHER -m or -s must be set\n" >&1
+	echo    "    -m MONOCULAR_BRANCH       The upstream branch to pull from" >&1
+	echo    "    -s MONOCULAR_REF4t  The upsream ref to pull from (e.g. tag or SHA1)" >&1
+	echo    "    -h usage" >&1
+}
+
+while getopts f:b:r:h arg 
+do
+	case ${arg} in
+		f)   MONOCULAR_FORK=${OPTARG};;
+		b)   MONOCULAR_BRANCH=${OPTARG};;
+		r)   MONOCULAR_REF=${OPTARG};;
+		h)   usage;;
+		\?)  usage;;
+	esac
+done
+
+if [ -z "$MONOCULAR_FORK" ]; then
+	echo "Must specify a monocular fork to pull from" >&2
+	usage
+	exit 0
+fi
+
+if [ -n "$MONOCULAR_BRANCH" ] && [ -n "$MONOCULAR_REF" ] || [ -z "$MONOCULAR_BRANCH" ] && [ -z "$MONOCULAR_REF" ]; then
+	echo "Must specify either a monocular branch or ref to pull from" >&2
+	usage
+	exit 1
+fi
+
+echo "Monocular fork: $MONOCULAR_FORK" >&1
+echo "Monocular branch: $MONOCULAR_BRANCH" >&1
+echo "Monocular ref: $MONOCULAR_REF" >&1
+
+DIRPATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+echo "${DIRPATH}"
+
+pushd "${DIRPATH}" >& /dev/null || exit
+
+source ./git-merge-subpath.sh
+
+echo "Fetching $MONOCULAR_FORK"
+
+# Fetch and merge the monocular subtree into the Stratos repo and attempt squash commit
+git fetch "$MONOCULAR_FORK"
+
+# Set our pull ref to either "fork/branch" or [tag|commit]
+if [ -n "$MONOCULAR_REF" ]; then
+	PULL_REF="$MONOCULAR_REF"
+else
+	PULL_REF="$MONOCULAR_FORK/$MONOCULAR_BRANCH"
+fi
+
+echo "Reading subtree index from $MONOCULAR_FORK:cmd. Merging in changes from $PULL_REF into src/jetstream/plugins/monocular" >&1
+# Move to root of repo
+repo_root=$(git rev-parse --show-toplevel)
+echo "Moving to repo top level: $repo_root" >&1
+pushd "$repo_root" >&/dev/null || exit
+
+# Read in tree
+# Git diff apply from last commit (or none) to the specified commit between the given subtrees
+git-merge-subpath --squash "$PULL_REF" cmd src/jetstream/plugins/monocular
+merge_retval=$?
+
+popd >& /dev/null || exit
+popd >& /dev/null || exit
+
+if [ $merge_retval -eq 0 ]; then
+	echo "Success" >&1
+fi
+
diff --git a/src/jetstream/plugins/monocular/git-push-upstream.sh b/src/jetstream/plugins/monocular/git-push-upstream.sh
new file mode 100755
index 0000000000..df13c55f1f
--- /dev/null
+++ b/src/jetstream/plugins/monocular/git-push-upstream.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+echo "== Push Monocular Changes Upstream ==" >&1
+
+usage() {
+	echo "Usage: git-push-upstream.sh -f <MONOCULAR_FORK> -t <MONOCULAR_BRANCH> -s <STRATOS_SOURCE_BRANCH> ]" >&1
+	echo "  options:" >&1
+	echo "    -f MONOCULAR_FORK         The upstream fork/repo to push to" >&1
+	echo "    -t MONOCULAR_BRANCH       The target upstream branch to push to" >&1
+	echo "    -s STRATOS_SOURCE_BRANCH  The Stratos branch containing the changes" >&1
+	echo "    -h usage"
+}
+
+while getopts f:t:s:h arg; do
+	case ${arg} in
+		f)   MONOCULAR_FORK=${OPTARG};;
+		t)   MONOCULAR_BRANCH=${OPTARG};;
+		s)   STRATOS_BRANCH=${OPTARG};;
+		h)   usage;;
+		\?)  usage;;
+	esac
+done
+
+
+if [[ -z "$MONOCULAR_FORK"  ||  -z "$MONOCULAR_BRANCH" || -z "$STRATOS_BRANCH" ]]; then
+	usage
+	exit 1
+fi
+
+echo "Monocular fork: $MONOCULAR_FORK" >&1
+echo "Monocular branch: $MONOCULAR_BRANCH" >&1
+echo "Stratos source branch: $STRATOS_BRANCH" >&1
+
+DIRPATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+echo "${DIRPATH}"
+
+pushd "${DIRPATH}" >& /dev/null || exit
+
+source ./git-merge-subpath.sh
+
+echo "Checking out monocular target branch: $MONOCULAR_BRANCH from $MONOCULAR_FORK into temporary merge branch: temp-merge-branch" >&1
+
+##Checkout the monocular feature branch onto a temporary merge branch
+git fetch "$MONOCULAR_FORK"
+git checkout -b temp-merge-branch "$MONOCULAR_FORK"/"$MONOCULAR_BRANCH"
+
+echo "Merging Stratos branch $STRATOS_BRANCH at src/jetstream/plugins/monocular into temporary merge branch" >&1
+
+##Merge changes from our monocular subtree in Stratos v2-master to our temp-merge-branch
+##Change to top level of repo
+repo_root=$(git rev-parse --show-toplevel)
+echo "Moving to repo top level: $repo_root" >&1
+pushd "$repo_root" >&/dev/null || exit
+
+git-merge-subpath --squash origin/"$STRATOS_BRANCH" src/jetstream/plugins/monocular cmd
+if [ $? -ne 0 ]; then
+	echo "Something went wrong with the merge. Make sure to clean up." >&2
+else
+
+	echo "Pushing changes to target branch: $MONOCULAR_BRANCH on $MONOCULAR_FORK" >&1
+
+  ##Push the temporary merge branch back to the monocular feature branch
+  git push "$MONOCULAR_FORK" HEAD:"$MONOCULAR_BRANCH"
+  if [ $? -ne 0 ]; then
+	  echo "Failed to push to branch: $MONOCULAR_BRANCH on $MONOCULAR_FORK." >&2
+  else
+	  echo "Cleaning up temporary branches" >&1
+
+    ##Cleanup: remove our temporary merge branch
+    git checkout v2-master && git branch -d temp-merge-branch
+  fi
+fi
+
+popd >& /dev/null || exit
+popd >& /dev/null || exit
+
+if [ $? -eq 0 ]; then
+	echo "Success" >&1
+fi
+

From 9650488778f0657bfbbc3dbbc1654e11143a9d56 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Sat, 12 Oct 2019 13:56:37 +0100
Subject: [PATCH 186/648] Exit if checkout merge branch fails

---
 src/jetstream/plugins/monocular/git-push-upstream.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jetstream/plugins/monocular/git-push-upstream.sh b/src/jetstream/plugins/monocular/git-push-upstream.sh
index df13c55f1f..e4542c71dd 100755
--- a/src/jetstream/plugins/monocular/git-push-upstream.sh
+++ b/src/jetstream/plugins/monocular/git-push-upstream.sh
@@ -42,7 +42,7 @@ echo "Checking out monocular target branch: $MONOCULAR_BRANCH from $MONOCULAR_FO
 
 ##Checkout the monocular feature branch onto a temporary merge branch
 git fetch "$MONOCULAR_FORK"
-git checkout -b temp-merge-branch "$MONOCULAR_FORK"/"$MONOCULAR_BRANCH"
+git checkout -b temp-merge-branch "$MONOCULAR_FORK"/"$MONOCULAR_BRANCH" || exit
 
 echo "Merging Stratos branch $STRATOS_BRANCH at src/jetstream/plugins/monocular into temporary merge branch" >&1
 

From da21339b41f17ed5cf932f8513a1d9c29711cce8 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Sat, 12 Oct 2019 14:16:23 +0100
Subject: [PATCH 187/648] Exit if checkout merge branch fails

---
 .../plugins/monocular/git-push-upstream.sh          | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/jetstream/plugins/monocular/git-push-upstream.sh b/src/jetstream/plugins/monocular/git-push-upstream.sh
index e4542c71dd..8ba5052e85 100755
--- a/src/jetstream/plugins/monocular/git-push-upstream.sh
+++ b/src/jetstream/plugins/monocular/git-push-upstream.sh
@@ -40,17 +40,18 @@ source ./git-merge-subpath.sh
 
 echo "Checking out monocular target branch: $MONOCULAR_BRANCH from $MONOCULAR_FORK into temporary merge branch: temp-merge-branch" >&1
 
+##Change to top level of repo
+#repo_root=$(git rev-parse --show-toplevel)
+#echo "Moving to repo top level: $repo_root" >&1
+#pushd "$repo_root" >&/dev/null || exit
+
 ##Checkout the monocular feature branch onto a temporary merge branch
 git fetch "$MONOCULAR_FORK"
 git checkout -b temp-merge-branch "$MONOCULAR_FORK"/"$MONOCULAR_BRANCH" || exit
 
-echo "Merging Stratos branch $STRATOS_BRANCH at src/jetstream/plugins/monocular into temporary merge branch" >&1
-
 ##Merge changes from our monocular subtree in Stratos v2-master to our temp-merge-branch
-##Change to top level of repo
-repo_root=$(git rev-parse --show-toplevel)
-echo "Moving to repo top level: $repo_root" >&1
-pushd "$repo_root" >&/dev/null || exit
+
+echo "Merging Stratos branch $STRATOS_BRANCH at src/jetstream/plugins/monocular into temporary merge branch" >&1
 
 git-merge-subpath --squash origin/"$STRATOS_BRANCH" src/jetstream/plugins/monocular cmd
 if [ $? -ne 0 ]; then

From 731c87f939b3efe4b74d181f9e98f452ddf466a2 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Sat, 12 Oct 2019 16:35:32 +0100
Subject: [PATCH 188/648] Multiple updates

---
 .../plugins/monocular/git-merge-subpath.sh    | 11 ++++---
 .../plugins/monocular/git-pull-downstream.sh  |  7 ++--
 .../plugins/monocular/git-push-upstream.sh    | 33 ++++++++++---------
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/jetstream/plugins/monocular/git-merge-subpath.sh b/src/jetstream/plugins/monocular/git-merge-subpath.sh
index f4b05cfc10..da5ecf1b8b 100755
--- a/src/jetstream/plugins/monocular/git-merge-subpath.sh
+++ b/src/jetstream/plugins/monocular/git-merge-subpath.sh
@@ -21,7 +21,7 @@ git-merge-subpath() {
     local SOURCE_COMMIT="$1" SOURCE_PREFIX="${2%/}" DEST_PREFIX="${3%/}"
 
     local SOURCE_SHA1
-    SOURCE_SHA1=$(git rev-parse --verify "$SOURCE_COMMIT^{commit}") || return 1
+    SOURCE_SHA1=$(git rev-parse --verify "$SOURCE_COMMIT^{commit}")
 
     local OLD_SHA1
     local GIT_ROOT=$(git rev-parse --show-toplevel)
@@ -42,17 +42,20 @@ git-merge-subpath() {
     fi &&
 
     if [[ -z $SQUASH ]]; then
-        git merge -s ours --no-commit "$SOURCE_COMMIT"
+        git merge -s ours --no-commit "$SOURCE_COMMIT" || return 1
     fi &&
 
+    printf "Calculating diff of changes from source and applying to destination..."
     git diff --color=never "$OLD_TREEISH" "$SOURCE_COMMIT:$SOURCE_PREFIX" \
         | git apply -3 --directory="$DEST_PREFIX" || git mergetool
-
+    echo "done."
     if (( $? == 1 )); then
         echo "Uh-oh! Try cleaning up with |git reset --merge|."
+	echo "You may be able to finish the merge manually then run the following (do not modify the commit message):"
+        echo "git commit -em \"Merge $SOURCE_COMMIT:$SOURCE_PREFIX/ to $DEST_PREFIX/ ${FUNCNAME[0]}: $SOURCE_SHA1 $SOURCE_PREFIX $DEST_PREFIX\""
 	return 1
     else
-        git commit -em "Merge $SOURCE_COMMIT:$SOURCE_PREFIX/ to $DEST_PREFIX/
+        git commit -em "Merge $SOURCE_COMMIT:$SOURCE_PREFIX/ to $DEST_PREFIX/ 
 
 # Feel free to edit the title and body above, but make sure to keep the
 # ${FUNCNAME[0]}: line below intact, so ${FUNCNAME[0]} can find it
diff --git a/src/jetstream/plugins/monocular/git-pull-downstream.sh b/src/jetstream/plugins/monocular/git-pull-downstream.sh
index 27366e4560..c7e64bb0a1 100755
--- a/src/jetstream/plugins/monocular/git-pull-downstream.sh
+++ b/src/jetstream/plugins/monocular/git-pull-downstream.sh
@@ -7,9 +7,10 @@ usage() {
 	echo    "  options:" >&1
 	printf  "    -f MONOCULAR_FORK         The upstream fork/repo to pull from\n" >&1
 	printf  "    ONE OF EITHER -m or -s must be set\n" >&1
-	echo    "    -m MONOCULAR_BRANCH       The upstream branch to pull from" >&1
-	echo    "    -s MONOCULAR_REF4t  The upsream ref to pull from (e.g. tag or SHA1)" >&1
+	echo    "    -b MONOCULAR_BRANCH       The upstream branch to pull from" >&1
+	echo    "    -r MONOCULAR_REF  The upsream ref to pull from (e.g. tag or SHA1)" >&1
 	echo    "    -h usage" >&1
+	exit 0
 }
 
 while getopts f:b:r:h arg 
@@ -26,13 +27,11 @@ done
 if [ -z "$MONOCULAR_FORK" ]; then
 	echo "Must specify a monocular fork to pull from" >&2
 	usage
-	exit 0
 fi
 
 if [ -n "$MONOCULAR_BRANCH" ] && [ -n "$MONOCULAR_REF" ] || [ -z "$MONOCULAR_BRANCH" ] && [ -z "$MONOCULAR_REF" ]; then
 	echo "Must specify either a monocular branch or ref to pull from" >&2
 	usage
-	exit 1
 fi
 
 echo "Monocular fork: $MONOCULAR_FORK" >&1
diff --git a/src/jetstream/plugins/monocular/git-push-upstream.sh b/src/jetstream/plugins/monocular/git-push-upstream.sh
index 8ba5052e85..0d0f2e2f31 100755
--- a/src/jetstream/plugins/monocular/git-push-upstream.sh
+++ b/src/jetstream/plugins/monocular/git-push-upstream.sh
@@ -41,9 +41,9 @@ source ./git-merge-subpath.sh
 echo "Checking out monocular target branch: $MONOCULAR_BRANCH from $MONOCULAR_FORK into temporary merge branch: temp-merge-branch" >&1
 
 ##Change to top level of repo
-#repo_root=$(git rev-parse --show-toplevel)
-#echo "Moving to repo top level: $repo_root" >&1
-#pushd "$repo_root" >&/dev/null || exit
+repo_root=$(git rev-parse --show-toplevel)
+echo "Moving to repo top level: $repo_root" >&1
+pushd "$repo_root" >&/dev/null || exit
 
 ##Checkout the monocular feature branch onto a temporary merge branch
 git fetch "$MONOCULAR_FORK"
@@ -51,25 +51,27 @@ git checkout -b temp-merge-branch "$MONOCULAR_FORK"/"$MONOCULAR_BRANCH" || exit
 
 ##Merge changes from our monocular subtree in Stratos v2-master to our temp-merge-branch
 
-echo "Merging Stratos branch $STRATOS_BRANCH at src/jetstream/plugins/monocular into temporary merge branch" >&1
+echo "Merging Stratos branch $STRATOS_BRANCH at src/jetstream/plugins/monocular into temp-merge-branch" >&1
 
 git-merge-subpath --squash origin/"$STRATOS_BRANCH" src/jetstream/plugins/monocular cmd
 if [ $? -ne 0 ]; then
-	echo "Something went wrong with the merge. Make sure to clean up." >&2
+	echo "Unsuccessful." >&2
+	#Move back to repo root - important in case of bail-out here.
+	popd >& /dev/null || exit
+	exit 1
 else
 
 	echo "Pushing changes to target branch: $MONOCULAR_BRANCH on $MONOCULAR_FORK" >&1
 
-  ##Push the temporary merge branch back to the monocular feature branch
-  git push "$MONOCULAR_FORK" HEAD:"$MONOCULAR_BRANCH"
-  if [ $? -ne 0 ]; then
-	  echo "Failed to push to branch: $MONOCULAR_BRANCH on $MONOCULAR_FORK." >&2
-  else
-	  echo "Cleaning up temporary branches" >&1
-
-    ##Cleanup: remove our temporary merge branch
-    git checkout v2-master && git branch -d temp-merge-branch
-  fi
+        ##Push the temporary merge branch back to the monocular feature branch
+        git push "$MONOCULAR_FORK" HEAD:"$MONOCULAR_BRANCH"
+        if [ $? -ne 0 ]; then
+	     echo "Failed to push to branch: $MONOCULAR_BRANCH on $MONOCULAR_FORK." >&2
+        else
+	     echo "Cleaning up temporary branches" >&1
+             ##Cleanup: remove our temporary merge branch
+             git checkout "$STRATOS_BRANCH" && git branch -d temp-merge-branch
+       fi
 fi
 
 popd >& /dev/null || exit
@@ -78,4 +80,3 @@ popd >& /dev/null || exit
 if [ $? -eq 0 ]; then
 	echo "Success" >&1
 fi
-

From b3365c1da33c355960dd01d86aebc98064e75692 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Sun, 13 Oct 2019 11:07:15 +0100
Subject: [PATCH 189/648] Add README WIP

---
 src/jetstream/plugins/monocular/README.md | 59 +++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 src/jetstream/plugins/monocular/README.md

diff --git a/src/jetstream/plugins/monocular/README.md b/src/jetstream/plugins/monocular/README.md
new file mode 100644
index 0000000000..0f8bd6d3e2
--- /dev/null
+++ b/src/jetstream/plugins/monocular/README.md
@@ -0,0 +1,59 @@
+# Syncing this subtree with the Monocular repo
+
+## Common Prerequisites 
+
+**NOTE:**
+
+The scripts do their best to fail gracefully. To avoid problems however, make sure the following pre-requisities are done before attempting. A CTRL-C in the middle of a run will likely require some cleanup.
+
+
+1. Ensure you have the monocular fork as a remote. e.g.
+
+`git remote add -f -t master stratos-monocular-fork git@github.com:cf-stratos/monocular.git`
+
+2. With a second remote it's useful to store remote refs separately in case of branch/tag collisions:
+
+`git config --add remote.stratos-monocular-fork.fetch 'refs/tags/*:refs/rtags/stratos-monocular-fork/*'`
+
+## Before running the PULL script
+Follow these carefully. 
+
+1. Ensure you are on the branch you want to merge into.
+2. Ensure you have no unstaged or uncommitted changes
+3. `git status` should be clean
+
+## Before running the PUSH script
+1. Ensure that at least one pull haa been made already
+2. Ensure the monocular target branch exists and has been pushed to its monocular remote
+3. Ensure you have no unstaged or uncommitted changes.
+4. `git status` should be clean.
+
+## Running the scripts..
+
+Both scripts, when run either without arguments or with the -h flag, will show usage instructions.
+
+### pull script:
+
+echo "Pulls the subtree under cmd from monocular repo into the src/jetstream/plugins/monocular subtree in stratos" >&1
+usage() {
+        echo    "Usage: git-pull-downstream.sh -f <MONOCULAR_FORK> [ -b <MONOCULAR_BRANCH>  | -r <MONOCULAR_REF> ]" >&1
+        echo    "  options:" >&1
+        printf  "    -f MONOCULAR_FORK         The upstream fork/repo to pull from\n" >&1
+        printf  "    ONE OF EITHER -m or -s must be set\n" >&1
+        echo    "    -b MONOCULAR_BRANCH       The upstream branch to pull from" >&1
+        echo    "    -r MONOCULAR_REF  The upsream ref to pull from (e.g. tag or SHA1)" >&1
+        echo    "    -h usage" >&1
+        exit 0
+
+#### To pull a tag:
+The tag should be specufied as : `refs/rtags/stratos-monocular-fork/<tag>`
+e.g.
+
+
+### push script:
+        echo "Usage: git-push-upstream.sh -f <MONOCULAR_FORK> -t <MONOCULAR_BRANCH> -s <STRATOS_SOURCE_BRANCH> ]" >&1
+        echo "  options:" >&1
+        echo "    -f MONOCULAR_FORK         The upstream fork/repo to push to" >&1
+        echo "    -t MONOCULAR_BRANCH       The target upstream branch to push to" >&1
+        echo "    -s STRATOS_SOURCE_BRANCH  The Stratos branch containing the changes" >&1
+        echo "    -h usage"

From 084d53a763b2973d363d4dc2255ec674573a3e69 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Mon, 14 Oct 2019 12:56:01 +0100
Subject: [PATCH 190/648] README complete. Fix to param usage in pull script

---
 src/jetstream/plugins/monocular/README.md     | 65 +++++++++++++------
 .../plugins/monocular/git-pull-downstream.sh  |  2 +-
 .../plugins/monocular/git-push-upstream.sh    |  2 +-
 3 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/src/jetstream/plugins/monocular/README.md b/src/jetstream/plugins/monocular/README.md
index 0f8bd6d3e2..956b10490c 100644
--- a/src/jetstream/plugins/monocular/README.md
+++ b/src/jetstream/plugins/monocular/README.md
@@ -9,11 +9,15 @@ The scripts do their best to fail gracefully. To avoid problems however, make su
 
 1. Ensure you have the monocular fork as a remote. e.g.
 
-`git remote add -f -t master stratos-monocular-fork git@github.com:cf-stratos/monocular.git`
+```
+git remote add -f -t master stratos-monocular-fork git@github.com:cf-stratos/monocular.git
+```
 
 2. With a second remote it's useful to store remote refs separately in case of branch/tag collisions:
 
-`git config --add remote.stratos-monocular-fork.fetch 'refs/tags/*:refs/rtags/stratos-monocular-fork/*'`
+```
+git config --add remote.stratos-monocular-fork.fetch 'refs/tags/*:refs/rtags/stratos-monocular-fork/*
+```
 
 ## Before running the PULL script
 Follow these carefully. 
@@ -30,30 +34,49 @@ Follow these carefully.
 
 ## Running the scripts..
 
-Both scripts, when run either without arguments or with the -h flag, will show usage instructions.
+Both scripts, when run either without arguments or with the `-h` flag, will show usage instructions.
 
-### pull script:
+### PULL script:
 
-echo "Pulls the subtree under cmd from monocular repo into the src/jetstream/plugins/monocular subtree in stratos" >&1
-usage() {
-        echo    "Usage: git-pull-downstream.sh -f <MONOCULAR_FORK> [ -b <MONOCULAR_BRANCH>  | -r <MONOCULAR_REF> ]" >&1
-        echo    "  options:" >&1
-        printf  "    -f MONOCULAR_FORK         The upstream fork/repo to pull from\n" >&1
-        printf  "    ONE OF EITHER -m or -s must be set\n" >&1
-        echo    "    -b MONOCULAR_BRANCH       The upstream branch to pull from" >&1
-        echo    "    -r MONOCULAR_REF  The upsream ref to pull from (e.g. tag or SHA1)" >&1
-        echo    "    -h usage" >&1
-        exit 0
+This pulls the subtree from monocular repo under `/cmd` into the stratos repo under `/src/jetstream/plugins/monocular`
+
+Usage:
+
+```
+git-pull-downstream.sh -f <MONOCULAR_FORK> [ -b <MONOCULAR_BRANCH>  | -r <MONOCULAR_REF> ]
+-f MONOCULAR_FORK         The upstream (monocular) repo"
+-b MONOCULAR_BRANCH       The upstream branch to pull from" >&1
+-r MONOCULAR_REF          The upsream ref to pull from (e.g. tag or SHA1)
+```
+
+e.g.
+
+```
+./git-pull-downstream.sh -f stratos-monocular-fork -b master
+```
 
 #### To pull a tag:
 The tag should be specufied as : `refs/rtags/stratos-monocular-fork/<tag>`
+
 e.g.
 
+```
+./git-pull-downstream.sh -f stratos-monocular-fork -r refs/rtags/stratos-monocular-fork/v1.4.0
+```
+
+
+### PUSH script:
+Usage: 
+
+```
+git-push-upstream.sh -f <MONOCULAR_FORK> -t <MONOCULAR_BRANCH> -s <STRATOS_SOURCE_BRANCH> ]
+-f MONOCULAR_FORK         The upstream (monocular) repo to push to"
+-t MONOCULAR_BRANCH       The target (monocular) upstream branch to push to
+-s STRATOS_SOURCE_BRANCH  The source stratos branch containing the changes
+```
+
+e.g. 
 
-### push script:
-        echo "Usage: git-push-upstream.sh -f <MONOCULAR_FORK> -t <MONOCULAR_BRANCH> -s <STRATOS_SOURCE_BRANCH> ]" >&1
-        echo "  options:" >&1
-        echo "    -f MONOCULAR_FORK         The upstream fork/repo to push to" >&1
-        echo "    -t MONOCULAR_BRANCH       The target upstream branch to push to" >&1
-        echo "    -s STRATOS_SOURCE_BRANCH  The Stratos branch containing the changes" >&1
-        echo "    -h usage"
+```
+./git-push-upstream.sh -f stratos-monocular-fork -t feature-branch -s dummy-master
+```
\ No newline at end of file
diff --git a/src/jetstream/plugins/monocular/git-pull-downstream.sh b/src/jetstream/plugins/monocular/git-pull-downstream.sh
index c7e64bb0a1..462b3bdc0b 100755
--- a/src/jetstream/plugins/monocular/git-pull-downstream.sh
+++ b/src/jetstream/plugins/monocular/git-pull-downstream.sh
@@ -6,7 +6,7 @@ usage() {
 	echo    "Usage: git-pull-downstream.sh -f <MONOCULAR_FORK> [ -b <MONOCULAR_BRANCH>  | -r <MONOCULAR_REF> ]" >&1
 	echo    "  options:" >&1
 	printf  "    -f MONOCULAR_FORK         The upstream fork/repo to pull from\n" >&1
-	printf  "    ONE OF EITHER -m or -s must be set\n" >&1
+	printf  "    ONE OF EITHER -b or -r must be set\n" >&1
 	echo    "    -b MONOCULAR_BRANCH       The upstream branch to pull from" >&1
 	echo    "    -r MONOCULAR_REF  The upsream ref to pull from (e.g. tag or SHA1)" >&1
 	echo    "    -h usage" >&1
diff --git a/src/jetstream/plugins/monocular/git-push-upstream.sh b/src/jetstream/plugins/monocular/git-push-upstream.sh
index 0d0f2e2f31..c4e54aaed7 100755
--- a/src/jetstream/plugins/monocular/git-push-upstream.sh
+++ b/src/jetstream/plugins/monocular/git-push-upstream.sh
@@ -7,7 +7,7 @@ usage() {
 	echo "  options:" >&1
 	echo "    -f MONOCULAR_FORK         The upstream fork/repo to push to" >&1
 	echo "    -t MONOCULAR_BRANCH       The target upstream branch to push to" >&1
-	echo "    -s STRATOS_SOURCE_BRANCH  The Stratos branch containing the changes" >&1
+	echo "    -s STRATOS_SOURCE_BRANCH  The Stratos source branch containing the changes" >&1
 	echo "    -h usage"
 }
 

From 9e9ac50524be9b158b468527f677b572a733b546 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Thu, 5 Dec 2019 14:54:26 +0000
Subject: [PATCH 191/648] Merge
 stratos-monocular-fork/suse-stratos-helm-fdb-doc-layer:cmd/ to
 src/jetstream/plugins/monocular/

git-merge-subpath: aecec6c2ca19400def7a39670774f73e66ec2622 cmd src/jetstream/plugins/monocular
---
 .../plugins/monocular/chart-repo/Dockerfile   |   6 +-
 .../plugins/monocular/chart-repo/Makefile     |   2 +-
 .../monocular/chart-repo/chart_repo.go        |  17 +-
 .../chart-repo/common/chart_utils.go          | 204 +++++
 .../monocular/chart-repo/common/types.go      |  89 ++
 .../plugins/monocular/chart-repo/delete.go    |  46 +-
 .../chart-repo/foundationdb/datastore.go      | 121 +++
 .../chart-repo/foundationdb/delete.go         |  64 ++
 .../chart-repo/foundationdb/mockstore.go      |  82 ++
 .../monocular/chart-repo/foundationdb/sync.go |  68 ++
 .../chart-repo/foundationdb/utils.go          | 463 ++++++++++
 .../chart-repo/foundationdb/utils_test.go     | 690 ++++++++++++++
 .../plugins/monocular/chart-repo/sync.go      |  50 +-
 .../chart-repo/testdata/empty-repo-index.yaml |   1 +
 .../monocular/chart-repo/utils/version.go     |  51 ++
 .../plugins/monocular/chartsvc/Dockerfile     |   5 +-
 .../plugins/monocular/chartsvc/Makefile       |   2 +-
 .../foundationdb/datastore/datastore.go       | 145 +++
 .../foundationdb/datastore/mockstore.go       |  87 ++
 .../chartsvc/foundationdb/handler.go          | 506 ++++++++++
 .../chartsvc/foundationdb/handler_test.go     | 867 ++++++++++++++++++
 .../plugins/monocular/chartsvc/main.go        |  86 +-
 .../plugins/monocular/chartsvc/main_test.go   | 165 +++-
 .../monocular/chartsvc/models/chart.go        |  30 +-
 .../monocular/chartsvc/utils/responses.go     |  59 ++
 .../monocular/chartsvc/utils/testutils.go     |  40 +
 26 files changed, 3751 insertions(+), 195 deletions(-)
 create mode 100644 src/jetstream/plugins/monocular/chart-repo/common/chart_utils.go
 create mode 100644 src/jetstream/plugins/monocular/chart-repo/common/types.go
 create mode 100644 src/jetstream/plugins/monocular/chart-repo/foundationdb/datastore.go
 create mode 100644 src/jetstream/plugins/monocular/chart-repo/foundationdb/delete.go
 create mode 100644 src/jetstream/plugins/monocular/chart-repo/foundationdb/mockstore.go
 create mode 100644 src/jetstream/plugins/monocular/chart-repo/foundationdb/sync.go
 create mode 100644 src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
 create mode 100644 src/jetstream/plugins/monocular/chart-repo/foundationdb/utils_test.go
 create mode 100644 src/jetstream/plugins/monocular/chart-repo/testdata/empty-repo-index.yaml
 create mode 100644 src/jetstream/plugins/monocular/chart-repo/utils/version.go
 create mode 100644 src/jetstream/plugins/monocular/chartsvc/foundationdb/datastore/datastore.go
 create mode 100644 src/jetstream/plugins/monocular/chartsvc/foundationdb/datastore/mockstore.go
 create mode 100644 src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go
 create mode 100644 src/jetstream/plugins/monocular/chartsvc/foundationdb/handler_test.go
 create mode 100644 src/jetstream/plugins/monocular/chartsvc/utils/responses.go
 create mode 100644 src/jetstream/plugins/monocular/chartsvc/utils/testutils.go

diff --git a/src/jetstream/plugins/monocular/chart-repo/Dockerfile b/src/jetstream/plugins/monocular/chart-repo/Dockerfile
index 7e4085c8d1..cbbb6a7d67 100644
--- a/src/jetstream/plugins/monocular/chart-repo/Dockerfile
+++ b/src/jetstream/plugins/monocular/chart-repo/Dockerfile
@@ -1,10 +1,8 @@
-FROM golang:1.11 as builder
+FROM golang:1.12 as builder
 COPY . /go/src/github.com/helm/monocular
 WORKDIR /go/src/github.com/helm/monocular
-
 ARG VERSION
-RUN CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-X main.version=$VERSION" ./cmd/chart-repo
-
+RUN GO111MODULE=on GOPROXY=https://gocenter.io CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-X main.version=$VERSION" ./cmd/chart-repo
 FROM scratch
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=builder /go/src/github.com/helm/monocular/chart-repo /chart-repo
diff --git a/src/jetstream/plugins/monocular/chart-repo/Makefile b/src/jetstream/plugins/monocular/chart-repo/Makefile
index 34ec0f9d1b..64ea4ffe4b 100644
--- a/src/jetstream/plugins/monocular/chart-repo/Makefile
+++ b/src/jetstream/plugins/monocular/chart-repo/Makefile
@@ -1,4 +1,4 @@
-IMAGE_REPO ?= quay.io/helmpack/chart-repo
+IMAGE_REPO ?= docker.io/kreinecke/suse-fdb-chart-repo
 IMAGE_TAG ?= latest
 # Version of the binary to be produced
 VERSION ?= $$(git rev-parse HEAD)
diff --git a/src/jetstream/plugins/monocular/chart-repo/chart_repo.go b/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
index dec5e2f22d..151818e099 100644
--- a/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
+++ b/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
@@ -19,6 +19,8 @@ package chartrepo
 import (
 	"os"
 
+	"github.com/helm/monocular/cmd/chart-repo/utils"
+
 	"github.com/spf13/cobra"
 )
 
@@ -38,16 +40,19 @@ func main() {
 }
 
 func init() {
-	cmds := []*cobra.Command{syncCmd, deleteCmd}
+
+	cmds := []*cobra.Command{SyncCmd, DeleteCmd}
 
 	for _, cmd := range cmds {
 		rootCmd.AddCommand(cmd)
-		cmd.Flags().String("mongo-url", "localhost", "MongoDB URL (see https://godoc.org/github.com/globalsign/mgo#Dial for format)")
-		cmd.Flags().String("mongo-database", "charts", "MongoDB database")
-		cmd.Flags().String("mongo-user", "", "MongoDB user")
+
+		//Flags for optional FoundationDB + Document Layer backend
+		cmd.Flags().String("doclayer-url", "mongodb://dev-fdbdoclayer/27016", "FoundationDB Document Layer URL")
+		cmd.Flags().String("doclayer-database", "charts", "FoundationDB Document-Layer database")
+
 		// see version.go
-		cmd.Flags().StringVarP(&userAgentComment, "user-agent-comment", "", "", "UserAgent comment used during outbound requests")
+		cmd.Flags().StringVarP(&utils.UserAgentComment, "user-agent-comment", "", "", "UserAgent comment used during outbound requests")
 		cmd.Flags().Bool("debug", false, "verbose logging")
 	}
-	rootCmd.AddCommand(versionCmd)
+	rootCmd.AddCommand(utils.VersionCmd)
 }
diff --git a/src/jetstream/plugins/monocular/chart-repo/common/chart_utils.go b/src/jetstream/plugins/monocular/chart-repo/common/chart_utils.go
new file mode 100644
index 0000000000..163b88de17
--- /dev/null
+++ b/src/jetstream/plugins/monocular/chart-repo/common/chart_utils.go
@@ -0,0 +1,204 @@
+/*
+Copyright (c) 2019 The Helm Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package common
+
+import (
+	"archive/tar"
+	"bytes"
+	"crypto/sha256"
+	"crypto/tls"
+	"crypto/x509"
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"github.com/helm/monocular/cmd/chart-repo/utils"
+	"net/http"
+	"net/url"
+	"os"
+	"path"
+	"strings"
+	"time"
+
+	"github.com/ghodss/yaml"
+	"github.com/jinzhu/copier"
+	log "github.com/sirupsen/logrus"
+	helmrepo "k8s.io/helm/pkg/repo"
+)
+
+//ParseRepoURL parses a repo URL string into a URL
+func ParseRepoURL(repoURL string) (*url.URL, error) {
+	repoURL = strings.TrimSpace(repoURL)
+	return url.ParseRequestURI(repoURL)
+}
+
+//FetchRepoIndex fetches the index.yaml for a repository
+func FetchRepoIndex(r Repo, netClient HTTPClient) ([]byte, error) {
+	indexURL, err := ParseRepoURL(r.URL)
+	if err != nil {
+		log.WithFields(log.Fields{"url": r.URL}).WithError(err).Error("failed to parse URL")
+		return nil, err
+	}
+	indexURL.Path = path.Join(indexURL.Path, "index.yaml")
+	req, err := http.NewRequest("GET", indexURL.String(), nil)
+	if err != nil {
+		log.WithFields(log.Fields{"url": req.URL.String()}).WithError(err).Error("could not build repo index request")
+		return nil, err
+	}
+
+	req.Header.Set("User-Agent", utils.UserAgent())
+	if len(r.AuthorizationHeader) > 0 {
+		req.Header.Set("Authorization", r.AuthorizationHeader)
+	}
+
+	res, err := netClient.Do(req)
+	if res != nil {
+		defer res.Body.Close()
+	}
+	if err != nil {
+		log.WithFields(log.Fields{"url": req.URL.String()}).WithError(err).Error("error requesting repo index")
+		return nil, err
+	}
+
+	if res.StatusCode != http.StatusOK {
+		log.WithFields(log.Fields{"url": req.URL.String(), "status": res.StatusCode}).Error("error requesting repo index, are you sure this is a chart repository?")
+		return nil, errors.New("repo index request failed")
+	}
+
+	body, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		return nil, err
+	}
+	return body, nil
+}
+
+//ParseRepoIndex parses a repository index into an IndexFile
+func ParseRepoIndex(body []byte) (*helmrepo.IndexFile, error) {
+	var index helmrepo.IndexFile
+	err := yaml.Unmarshal(body, &index)
+	if err != nil {
+		return nil, err
+	}
+	index.SortEntries()
+	return &index, nil
+}
+
+//ChartsFromIndex creates an array of Charts from a Repository IndexFile
+//Deprecated charts are skipped
+func ChartsFromIndex(index *helmrepo.IndexFile, r Repo) []Chart {
+	var charts []Chart
+	for _, entry := range index.Entries {
+		if entry[0].GetDeprecated() {
+			log.WithFields(log.Fields{"name": entry[0].GetName()}).Info("skipping deprecated chart")
+			continue
+		}
+		charts = append(charts, NewChart(entry, r))
+	}
+	return charts
+}
+
+// NewChart Takes an entry from the index and constructs a database representation of the
+// object.
+func NewChart(entry helmrepo.ChartVersions, r Repo) Chart {
+	var c Chart
+	copier.Copy(&c, entry[0])
+	copier.Copy(&c.ChartVersions, entry)
+	c.Repo = r
+	c.ID = fmt.Sprintf("%s/%s", r.Name, c.Name)
+	return c
+}
+
+//ExtractFilesFromTarball extracts the specified files from a tarball into a map
+func ExtractFilesFromTarball(filenames []string, tarf *tar.Reader) (map[string]string, error) {
+	ret := make(map[string]string)
+	for {
+		header, err := tarf.Next()
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			return ret, err
+		}
+
+		for _, f := range filenames {
+			if strings.EqualFold(header.Name, f) {
+				var b bytes.Buffer
+				io.Copy(&b, tarf)
+				ret[f] = string(b.Bytes())
+				break
+			}
+		}
+	}
+	return ret, nil
+}
+
+//ChartTarballURL returns the URL for a given chart version
+func ChartTarballURL(r Repo, cv ChartVersion) string {
+	source := cv.URLs[0]
+	if _, err := ParseRepoURL(source); err != nil {
+		// If the chart URL is not absolute, join with repo URL. It's fine if the
+		// URL we build here is invalid as we can catch this error when actually
+		// making the request
+		u, _ := url.Parse(r.URL)
+		u.Path = path.Join(u.Path, source)
+		return u.String()
+	}
+	return source
+}
+
+// InitNetClient configures an HTTP client for making requests to repositories
+func InitNetClient(additionalCA string, timeoutSeconds time.Duration) (*http.Client, error) {
+	// Get the SystemCertPool, continue with an empty pool on error
+	caCertPool, _ := x509.SystemCertPool()
+	if caCertPool == nil {
+		caCertPool = x509.NewCertPool()
+	}
+
+	// If additionalCA exists, load it
+	if _, err := os.Stat(additionalCA); !os.IsNotExist(err) {
+		certs, err := ioutil.ReadFile(additionalCA)
+		if err != nil {
+			return nil, fmt.Errorf("Failed to append %s to RootCAs: %v", additionalCA, err)
+		}
+
+		// Append our cert to the system pool
+		if ok := caCertPool.AppendCertsFromPEM(certs); !ok {
+			return nil, fmt.Errorf("Failed to append %s to RootCAs", additionalCA)
+		}
+	}
+
+	// Return Transport for testing purposes
+	return &http.Client{
+		Timeout: time.Second * timeoutSeconds,
+		Transport: &http.Transport{
+			TLSClientConfig: &tls.Config{
+				RootCAs: caCertPool,
+			},
+			Proxy: http.ProxyFromEnvironment,
+		},
+	}, nil
+}
+
+//GetSha256 generates a SHA 256 hash for a given byte array
+func GetSha256(src []byte) (string, error) {
+	f := bytes.NewReader(src)
+	h := sha256.New()
+	if _, err := io.Copy(h, f); err != nil {
+		return "", err
+	}
+	return fmt.Sprintf("%x", h.Sum(nil)), nil
+}
diff --git a/src/jetstream/plugins/monocular/chart-repo/common/types.go b/src/jetstream/plugins/monocular/chart-repo/common/types.go
new file mode 100644
index 0000000000..5de9e80ddc
--- /dev/null
+++ b/src/jetstream/plugins/monocular/chart-repo/common/types.go
@@ -0,0 +1,89 @@
+/*
+Copyright (c) 2019 The Helm Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package common
+
+import (
+	"net/http"
+	"time"
+)
+
+//Repo holds information to identify a repository
+type Repo struct {
+	Name                string
+	URL                 string
+	AuthorizationHeader string `bson:"-"`
+}
+
+//Maintainer describes the maintainer of a Chart
+type Maintainer struct {
+	Name  string
+	Email string
+}
+
+//Chart holds full descriptor of a Helm chart
+type Chart struct {
+	ID            string `bson:"_id"`
+	Name          string
+	Repo          Repo
+	Description   string
+	Home          string
+	Keywords      []string
+	Maintainers   []Maintainer
+	Sources       []string
+	Icon          string
+	ChartVersions []ChartVersion
+}
+
+//ChartVersion holds version information on a Chart
+type ChartVersion struct {
+	Version    string
+	AppVersion string
+	Created    time.Time
+	Digest     string
+	URLs       []string
+}
+
+//ChartFiles describes the chart values, readme, schema and digest components of a chart
+type ChartFiles struct {
+	ID     string `bson:"_id"`
+	Readme string
+	Values string
+	Schema string
+	Repo   Repo
+	Digest string
+}
+
+//RepoCheck describes the state of a repository in terms its current checksum and last update time.
+//It is used to determine whether or not to re-sync a respository.
+type RepoCheck struct {
+	ID         string    `bson:"_id"`
+	LastUpdate time.Time `bson:"last_update"`
+	Checksum   string    `bson:"checksum"`
+}
+
+//ImportChartFilesJob contains the information needed by an
+//ImportWorker when import a chart from a repository
+type ImportChartFilesJob struct {
+	Name         string
+	Repo         Repo
+	ChartVersion ChartVersion
+}
+
+//HTTPClient defines a behaviour for making HTTP requests
+type HTTPClient interface {
+	Do(req *http.Request) (*http.Response, error)
+}
diff --git a/src/jetstream/plugins/monocular/chart-repo/delete.go b/src/jetstream/plugins/monocular/chart-repo/delete.go
index abe6d6071c..2d2a37d59c 100644
--- a/src/jetstream/plugins/monocular/chart-repo/delete.go
+++ b/src/jetstream/plugins/monocular/chart-repo/delete.go
@@ -17,57 +17,23 @@ limitations under the License.
 package chartrepo
 
 import (
-	"os"
+	"github.com/helm/monocular/cmd/chart-repo/foundationdb"
 
-	"github.com/kubeapps/common/datastore"
-	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
-var deleteCmd = &cobra.Command{
+//DeleteCmd Delete a chart repository from Monocular
+var DeleteCmd = &cobra.Command{
 	Use:   "delete [REPO NAME]",
 	Short: "delete a chart repository",
 	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) != 1 {
-			logrus.Info("Need exactly one argument: [REPO NAME]")
+			log.Info("Need exactly one argument: [REPO NAME]")
 			cmd.Help()
 			return
 		}
-		mongoURL, err := cmd.Flags().GetString("mongo-url")
-		if err != nil {
-			logrus.Fatal(err)
-		}
-		mongoDB, err := cmd.Flags().GetString("mongo-database")
-		if err != nil {
-			logrus.Fatal(err)
-		}
-		mongoUser, err := cmd.Flags().GetString("mongo-user")
-		if err != nil {
-			logrus.Fatal(err)
-		}
-		mongoPW := os.Getenv("MONGO_PASSWORD")
-		debug, err := cmd.Flags().GetBool("debug")
-		if err != nil {
-			logrus.Fatal(err)
-		}
-		if debug {
-			logrus.SetLevel(logrus.DebugLevel)
-		}
-		mongoConfig := datastore.Config{URL: mongoURL, Database: mongoDB, Username: mongoUser, Password: mongoPW}
-		dbSession, err := datastore.NewSession(mongoConfig)
-		if err != nil {
-			logrus.Fatalf("Can't connect to mongoDB: %v", err)
-		}
-
-		monogoDB, err := NewMongoDBChartRepoDatastore(dbSession)
-		if err != nil {
-			logrus.Fatalf("Can't create data store for mongoDB: %v", err)
-		}
-
-		if err = monogoDB.DeleteRepo(args[0]); err != nil {
-			logrus.Fatalf("Can't delete chart repository %s from database: %v", args[0], err)
-		}
 
-		logrus.Infof("Successfully deleted the chart repository %s from database", args[0])
+		foundationdb.Delete(cmd, args)
 	},
 }
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/datastore.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/datastore.go
new file mode 100644
index 0000000000..b5eaf598c0
--- /dev/null
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/datastore.go
@@ -0,0 +1,121 @@
+/*
+Copyright (c) 2019 The Helm Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package foundationdb
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	log "github.com/sirupsen/logrus"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
+)
+
+const defaultTimeout = 30 * time.Second
+
+// Config configures the database connection
+type Config struct {
+	URL      string
+	Database string
+	Timeout  time.Duration
+}
+
+// Client is an interface for a MongoDB client
+type Client interface {
+	Database(name string) (Database, func())
+}
+
+// Database is an interface for accessing a MongoDB database
+type Database interface {
+	Collection(name string) Collection
+}
+
+// Collection is an interface for accessing a MongoDB collection
+type Collection interface {
+	BulkWrite(ctxt context.Context, operations []mongo.WriteModel, options *options.BulkWriteOptions) (*mongo.BulkWriteResult, error)
+	DeleteMany(ctxt context.Context, filter interface{}, options *options.DeleteOptions) (*mongo.DeleteResult, error)
+	FindOne(ctxt context.Context, filter interface{}, result interface{}, options *options.FindOneOptions) error
+	InsertOne(ctxt context.Context, document interface{}, options *options.InsertOneOptions) (*mongo.InsertOneResult, error)
+	UpdateOne(ctxt context.Context, filter interface{}, update interface{}, options *options.UpdateOptions) (*mongo.UpdateResult, error)
+}
+
+// mongoDatabase wraps an mongo.Database and implements Database
+type mongoDatabase struct {
+	Database *mongo.Database
+}
+
+// mongoClient wraps an mongo.Database and implements Database
+type mongoClient struct {
+	Client *mongo.Client
+}
+
+//NewDocLayerClient creates a mongoDB client using the given options
+func NewDocLayerClient(ctx context.Context, options *options.ClientOptions) (Client, error) {
+	client, err := mongo.Connect(ctx, options)
+	return &mongoClient{client}, err
+}
+
+//Database Creates a new interface for accessing the specified FDB Document-Layer database
+func (c *mongoClient) Database(dbName string) (Database, func()) {
+
+	db := &mongoDatabase{c.Client.Database(dbName)}
+
+	return db, func() {
+		err := c.Client.Disconnect(context.Background())
+
+		if err != nil {
+			log.Fatal(err)
+		}
+		fmt.Println("Connection to MongoDB closed.")
+	}
+}
+
+//Collection returns a reference to a given collection in the FDB Document-layer
+func (d *mongoDatabase) Collection(name string) Collection {
+	return &mongoCollection{d.Database.Collection(name)}
+}
+
+// mongoCollection wraps a mongo.Collection and implements Collection
+type mongoCollection struct {
+	Collection *mongo.Collection
+}
+
+func (c *mongoCollection) BulkWrite(ctxt context.Context, operations []mongo.WriteModel, options *options.BulkWriteOptions) (*mongo.BulkWriteResult, error) {
+	res, err := c.Collection.BulkWrite(ctxt, operations, options)
+	return res, err
+}
+
+func (c *mongoCollection) DeleteMany(ctxt context.Context, filter interface{}, options *options.DeleteOptions) (*mongo.DeleteResult, error) {
+	res, err := c.Collection.DeleteMany(ctxt, filter, options)
+	return res, err
+}
+
+func (c *mongoCollection) FindOne(ctxt context.Context, filter interface{}, result interface{}, options *options.FindOneOptions) error {
+	res := c.Collection.FindOne(ctxt, filter, options)
+	return res.Decode(result)
+}
+
+func (c *mongoCollection) InsertOne(ctxt context.Context, document interface{}, options *options.InsertOneOptions) (*mongo.InsertOneResult, error) {
+	res, err := c.Collection.InsertOne(ctxt, document, options)
+	return res, err
+}
+
+func (c *mongoCollection) UpdateOne(ctxt context.Context, filter interface{}, document interface{}, options *options.UpdateOptions) (*mongo.UpdateResult, error) {
+	res, err := c.Collection.UpdateOne(ctxt, filter, document, options)
+	return res, err
+}
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/delete.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/delete.go
new file mode 100644
index 0000000000..0db4219641
--- /dev/null
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/delete.go
@@ -0,0 +1,64 @@
+/*
+Copyright (c) 2019 The Helm Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package foundationdb
+
+import (
+	"context"
+	"time"
+
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+	"go.mongodb.org/mongo-driver/mongo/options"
+)
+
+//Delete Deletes a chart repository from FoundationDB Document-Layer
+func Delete(cmd *cobra.Command, args []string) {
+
+	fdbURL, err := cmd.Flags().GetString("doclayer-url")
+	if err != nil {
+		log.Fatal(err)
+	}
+	fDB, err := cmd.Flags().GetString("doclayer-database")
+	if err != nil {
+		log.Fatal(err)
+	}
+	debug, err := cmd.Flags().GetBool("debug")
+	if err != nil {
+		log.Fatal(err)
+	}
+	if debug {
+		log.SetLevel(log.DebugLevel)
+	}
+
+	log.Debugf("Creating client for FDB: %v, %v, %v", fdbURL, fDB, debug)
+	clientOptions := options.Client().ApplyURI(fdbURL).SetMinPoolSize(10).SetMaxPoolSize(100)
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+	client, err := NewDocLayerClient(ctx, clientOptions)
+	if err != nil {
+		log.Fatalf("Can't create client for FoundationDB document layer: %v", err)
+		return
+	}
+
+	log.Debugf("Client created.")
+
+	if err = deleteRepo(client, fDB, args[0]); err != nil {
+		log.Fatalf("Can't delete chart repository %s from database: %v", args[0], err)
+	}
+
+	log.Infof("Successfully deleted the chart repository %s from database", args[0])
+}
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/mockstore.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/mockstore.go
new file mode 100644
index 0000000000..eaac71db68
--- /dev/null
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/mockstore.go
@@ -0,0 +1,82 @@
+/*
+Copyright (c) 2019 The Helm Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package foundationdb
+
+import (
+	"context"
+
+	"github.com/stretchr/testify/mock"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
+)
+
+//mockDatabase acts as a mock datastore.Database
+type mockDatabase struct {
+	*mock.Mock
+}
+
+type mockClient struct {
+	*mock.Mock
+}
+
+//NewMockClient returns a mocked Document-Layer client
+func NewMockClient(m *mock.Mock) Client {
+	return mockClient{m}
+}
+
+//Database returns a mocked datastore.Database and empty closer function
+func (c mockClient) Database(dbName string) (Database, func()) {
+
+	db := mockDatabase{c.Mock}
+
+	return db, func() {
+	}
+}
+
+func (d mockDatabase) Collection(name string) Collection {
+	return mockCollection{d.Mock}
+}
+
+// mockCollection acts as a mock datastore.Collection
+type mockCollection struct {
+	*mock.Mock
+}
+
+func (c mockCollection) BulkWrite(ctxt context.Context, operations []mongo.WriteModel, options *options.BulkWriteOptions) (*mongo.BulkWriteResult, error) {
+	args := c.Called(ctxt, operations, options)
+	return args.Get(0).(*mongo.BulkWriteResult), args.Error(1)
+}
+
+func (c mockCollection) DeleteMany(ctxt context.Context, filter interface{}, options *options.DeleteOptions) (*mongo.DeleteResult, error) {
+	args := c.Called(ctxt, filter, options)
+	return args.Get(0).(*mongo.DeleteResult), args.Error(1)
+}
+
+func (c mockCollection) FindOne(ctxt context.Context, filter interface{}, result interface{}, options *options.FindOneOptions) error {
+	args := c.Called(ctxt, filter, result, options)
+	return args.Error(0)
+}
+
+func (c mockCollection) InsertOne(ctxt context.Context, document interface{}, options *options.InsertOneOptions) (*mongo.InsertOneResult, error) {
+	args := c.Called(ctxt, document, options)
+	return args.Get(0).(*mongo.InsertOneResult), args.Error(1)
+}
+
+func (c mockCollection) UpdateOne(ctxt context.Context, filter interface{}, document interface{}, options *options.UpdateOptions) (*mongo.UpdateResult, error) {
+	args := c.Called(ctxt, filter, document, options)
+	return args.Get(0).(*mongo.UpdateResult), args.Error(1)
+}
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/sync.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/sync.go
new file mode 100644
index 0000000000..5f5feab172
--- /dev/null
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/sync.go
@@ -0,0 +1,68 @@
+/*
+Copyright (c) 2018 The Helm Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package foundationdb
+
+import (
+	"context"
+	"os"
+	"time"
+
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+	"go.mongodb.org/mongo-driver/mongo/options"
+)
+
+//Sync Add a new chart repository to FoundationDB Document-Layer and periodically sync it
+func Sync(cmd *cobra.Command, args []string) {
+
+	fdbURL, err := cmd.Flags().GetString("doclayer-url")
+	if err != nil {
+		log.Fatal(err)
+	}
+	fDB, err := cmd.Flags().GetString("doclayer-database")
+	if err != nil {
+		log.Fatal(err)
+	}
+	debug, err := cmd.Flags().GetBool("debug")
+	if err != nil {
+		log.Fatal(err)
+	}
+	if debug {
+		log.SetLevel(log.DebugLevel)
+	}
+
+	log.Debugf("Creating client for FDB: %v, %v, %v", fdbURL, fDB, debug)
+	clientOptions := options.Client().ApplyURI(fdbURL).SetMinPoolSize(10).SetMaxPoolSize(100)
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+	client, err := NewDocLayerClient(ctx, clientOptions)
+	if err != nil {
+		log.Fatalf("Can't create client for FoundationDB document layer: %v", err)
+		return
+	}
+
+	log.Debugf("Client created.")
+
+	startTime := time.Now()
+	authorizationHeader := os.Getenv("AUTHORIZATION_HEADER")
+	if err = syncRepo(client, fDB, args[0], args[1], authorizationHeader); err != nil {
+		log.Fatalf("Can't add chart repository to database: %v", err)
+		return
+	}
+	timeTaken := time.Since(startTime).Seconds()
+	log.Infof("Successfully added the chart repository %s to database in %v seconds", args[0], timeTaken)
+}
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
new file mode 100644
index 0000000000..e2a67ea38d
--- /dev/null
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
@@ -0,0 +1,463 @@
+/*
+Copyright (c) 2019 The Helm Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package foundationdb
+
+import (
+	"archive/tar"
+	"bytes"
+	"compress/gzip"
+	"context"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/helm/monocular/cmd/chart-repo/common"
+	"github.com/helm/monocular/cmd/chart-repo/utils"
+
+	"github.com/disintegration/imaging"
+	log "github.com/sirupsen/logrus"
+
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
+)
+
+const (
+	chartCollection       = "charts"
+	repositoryCollection  = "repos"
+	chartFilesCollection  = "files"
+	defaultTimeoutSeconds = 10
+	additionalCAFile      = "/usr/local/share/ca-certificates/ca.crt"
+)
+
+var netClient common.HTTPClient = &http.Client{}
+
+func init() {
+	var err error
+	netClient, err = common.InitNetClient(additionalCAFile, defaultTimeoutSeconds)
+	if err != nil {
+		log.Fatal(err)
+	}
+}
+
+// SyncRepo Syncing is performed in the following steps:
+// 1. Update database to match chart metadata from index
+// 2. Concurrently process icons for charts (concurrently)
+// 3. Concurrently process the README and values.yaml for the latest chart version of each chart
+// 4. Concurrently process READMEs and values.yaml for historic chart versions
+//
+// These steps are processed in this way to ensure relevant chart data is
+// imported into the database as fast as possible. E.g. we want all icons for
+// charts before fetching readmes for each chart and version pair.
+func syncRepo(dbClient Client, dbName, repoName, repoURL string, authorizationHeader string) error {
+
+	db, closer := dbClient.Database(dbName)
+	defer closer()
+
+	url, err := common.ParseRepoURL(repoURL)
+	if err != nil {
+		log.WithFields(log.Fields{"url": repoURL}).WithError(err).Error("failed to parse URL")
+		return err
+	}
+
+	log.Debugf("Checking database connection and readiness...")
+	collection := db.Collection("numbers")
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	res, err := collection.InsertOne(ctx, bson.M{"name": "pi", "value": 3.14159}, options.InsertOne())
+	if err != nil {
+		log.Fatalf("Database readiness test failed: %v", err)
+		cancel()
+		return err
+	}
+	id := res.InsertedID
+	cancel()
+	log.Debugf("Database connection test successful.")
+	log.Debugf("Inserted a test document to test collection with ID: %v", id)
+
+	r := common.Repo{Name: repoName, URL: url.String(), AuthorizationHeader: authorizationHeader}
+	repoBytes, err := common.FetchRepoIndex(r, netClient)
+	if err != nil {
+		return err
+	}
+
+	repoChecksum, err := common.GetSha256(repoBytes)
+	if err != nil {
+		return err
+	}
+
+	// Check if the repo has been already processed
+	if repoAlreadyProcessed(db, repoName, repoChecksum) {
+		log.WithFields(log.Fields{"url": repoURL}).Info("Skipping repository since there are no updates")
+		return nil
+	}
+
+	index, err := common.ParseRepoIndex(repoBytes)
+	if err != nil {
+		return err
+	}
+
+	charts := common.ChartsFromIndex(index, r)
+	log.Debugf("%v Charts in index of repo: %v", len(charts), repoURL)
+	if len(charts) == 0 {
+		return errors.New("no charts in repository index")
+	}
+
+	err = importCharts(db, dbName, charts)
+	if err != nil {
+		return err
+	}
+
+	// Process 10 charts at a time
+	numWorkers := 10
+	iconJobs := make(chan common.Chart, numWorkers)
+	chartFilesJobs := make(chan common.ImportChartFilesJob, numWorkers)
+	var wg sync.WaitGroup
+
+	log.Debugf("starting %d workers", numWorkers)
+	for i := 0; i < numWorkers; i++ {
+		wg.Add(1)
+		go importWorker(db, &wg, iconJobs, chartFilesJobs)
+	}
+
+	// Enqueue jobs to process chart icons
+	for _, c := range charts {
+		iconJobs <- c
+	}
+	// Close the iconJobs channel to signal the worker pools to move on to the
+	// chart files jobs
+	close(iconJobs)
+
+	// Iterate through the list of charts and enqueue the latest chart version to
+	// be processed. Append the rest of the chart versions to a list to be
+	// enqueued later
+	var toEnqueue []common.ImportChartFilesJob
+	for _, c := range charts {
+		chartFilesJobs <- common.ImportChartFilesJob{Name: c.Name, Repo: c.Repo, ChartVersion: c.ChartVersions[0]}
+		for _, cv := range c.ChartVersions[1:] {
+			toEnqueue = append(toEnqueue, common.ImportChartFilesJob{Name: c.Name, Repo: c.Repo, ChartVersion: cv})
+		}
+	}
+
+	// Enqueue all the remaining chart versions
+	for _, cfj := range toEnqueue {
+		chartFilesJobs <- cfj
+	}
+	// Close the chartFilesJobs channel to signal the worker pools that there are
+	// no more jobs to process
+	close(chartFilesJobs)
+
+	// Wait for the worker pools to finish processing
+	wg.Wait()
+
+	// Update cache in the database
+	if err = updateLastCheck(db, repoName, repoChecksum, time.Now()); err != nil {
+		return err
+	}
+	log.WithFields(log.Fields{"url": repoURL}).Info("Stored repository update in cache")
+
+	return nil
+}
+
+func repoAlreadyProcessed(db Database, repoName string, checksum string) bool {
+	lastCheck := &common.RepoCheck{}
+	filter := bson.M{"_id": repoName}
+	err := db.Collection(repositoryCollection).FindOne(context.Background(), filter, lastCheck, options.FindOne())
+	return err == nil && checksum == lastCheck.Checksum
+}
+
+func updateLastCheck(db Database, repoName string, checksum string, now time.Time) error {
+	selector := bson.M{"_id": repoName}
+	update := bson.M{"$set": bson.M{"last_update": now, "checksum": checksum}}
+	_, err := db.Collection(repositoryCollection).UpdateOne(context.Background(), selector, update, options.Update())
+	return err
+}
+
+func deleteRepo(dbClient Client, dbName, repoName string) error {
+	db, closer := dbClient.Database(dbName)
+	defer closer()
+	collection := db.Collection(chartCollection)
+	filter := bson.M{
+		"repo.name": repoName,
+	}
+	deleteResult, err := collection.DeleteMany(context.Background(), filter, options.Delete())
+	if err != nil {
+		log.Debugf("Error occurred during delete repo (deleting charts from index). Err: %v, Result: %v", err, deleteResult)
+		return err
+	}
+	log.Debugf("Repo delete (delete charts from index) result: %v charts deleted", deleteResult.DeletedCount)
+
+	collection = db.Collection(chartFilesCollection)
+	deleteResult, err = collection.DeleteMany(context.Background(), filter, options.Delete())
+	if err != nil {
+		log.Debugf("Error occurred during delete repo (deleting chart files from index). Err: %v, Result: %v", err, deleteResult)
+		return err
+	}
+	log.Debugf("Repo delete (delete chart files from index) result: %v chart files deleted.", deleteResult.DeletedCount)
+	collection = db.Collection(repositoryCollection)
+	deleteResult, err = collection.DeleteMany(context.Background(), filter, options.Delete())
+	if err != nil {
+		log.Debugf("Error occurred during delete repo (deleting repositories from index). Err: %v, Result: %v", err, deleteResult)
+		return err
+	}
+	log.Debugf("Repo delete (delete chart files from index) result: %v repositories deleted.", deleteResult.DeletedCount)
+
+	return err
+}
+
+func importCharts(db Database, dbName string, charts []common.Chart) error {
+	var operations []mongo.WriteModel
+	var chartIDs []string
+	for _, c := range charts {
+		operation := mongo.NewUpdateOneModel()
+		chartIDs = append(chartIDs, c.ID)
+		// charts to upsert - pair of filter, chart
+		operation.SetFilter(bson.M{
+			"_id": c.ID,
+		})
+
+		chartBSON, err := bson.Marshal(&c)
+		var doc bson.M
+		bson.Unmarshal(chartBSON, &doc)
+		delete(doc, "_id")
+
+		if err != nil {
+			log.Debugf("Error marshalling chart to BSON: %v. Skipping this chart.", err)
+		} else {
+			update := doc
+			operation.SetUpdate(update)
+			operation.SetUpsert(true)
+			operations = append(operations, operation)
+		}
+		log.Debugf("Adding chart insert operation for chart: %v", c.ID)
+	}
+
+	//Must use bulk write for array of filters
+	collection := db.Collection(chartCollection)
+	updateResult, err := collection.BulkWrite(
+		context.Background(),
+		operations,
+		options.BulkWrite(),
+	)
+
+	//Set upsert flag and upsert the pairs here
+	//Updates our index for charts that we already have and inserts charts that are new
+	if err != nil {
+		log.Debugf("Error occurred during chart import (upsert many). Err: %v", err)
+		return err
+	}
+	log.Debugf("Upsert chart index success. %v documents inserted, %v documents upserted, %v documents modified", updateResult.InsertedCount, updateResult.UpsertedCount, updateResult.ModifiedCount)
+
+	//Remove from our index, any charts that no longer exist
+	filter := bson.M{
+		"_id": bson.M{
+			"$nin": chartIDs,
+		},
+		"repo.name": charts[0].Repo.Name,
+	}
+	deleteResult, err := collection.DeleteMany(context.Background(), filter, options.Delete())
+	if err != nil {
+		log.Debugf("Error occurred during chart import (delete many). Err: %v", err)
+		return err
+	}
+	log.Debugf("Delete stale charts from index success. %v documents deleted.", deleteResult.DeletedCount)
+
+	return err
+}
+
+func importWorker(db Database, wg *sync.WaitGroup, icons <-chan common.Chart, chartFiles <-chan common.ImportChartFilesJob) {
+	defer wg.Done()
+	for c := range icons {
+		log.WithFields(log.Fields{"name": c.Name}).Debug("importing icon")
+		if err := fetchAndImportIcon(db, c); err != nil {
+			log.WithFields(log.Fields{"name": c.Name}).WithError(err).Error("failed to import icon")
+		}
+	}
+	for j := range chartFiles {
+		log.WithFields(log.Fields{"name": j.Name, "version": j.ChartVersion.Version}).Debug("importing readme and values")
+		if err := fetchAndImportFiles(db, j.Name, j.Repo, j.ChartVersion); err != nil {
+			log.WithFields(log.Fields{"name": j.Name, "version": j.ChartVersion.Version}).WithError(err).Error("failed to import files")
+		}
+	}
+}
+
+func fetchAndImportIcon(db Database, c common.Chart) error {
+	if c.Icon == "" {
+		log.WithFields(log.Fields{"name": c.Name}).Info("icon not found")
+		return nil
+	}
+
+	req, err := http.NewRequest("GET", c.Icon, nil)
+	if err != nil {
+		return err
+	}
+	req.Header.Set("User-Agent", utils.UserAgent())
+	if len(c.Repo.AuthorizationHeader) > 0 {
+		req.Header.Set("Authorization", c.Repo.AuthorizationHeader)
+	}
+
+	res, err := netClient.Do(req)
+	if res != nil {
+		defer res.Body.Close()
+	}
+	if err != nil {
+		return err
+	}
+
+	if res.StatusCode != http.StatusOK {
+		return fmt.Errorf("%d %s", res.StatusCode, c.Icon)
+	}
+
+	b := []byte{}
+	contentType := ""
+	if strings.Contains(res.Header.Get("Content-Type"), "image/svg") {
+		// if the icon is a SVG file simply read it
+		b, err = ioutil.ReadAll(res.Body)
+		if err != nil {
+			return err
+		}
+		contentType = res.Header.Get("Content-Type")
+	} else {
+		// if the icon is in any other format try to convert it to PNG
+		orig, err := imaging.Decode(res.Body)
+		if err != nil {
+			log.WithFields(log.Fields{"name": c.Name}).WithError(err).Error("failed to decode icon")
+			return err
+		}
+
+		// TODO: make this configurable?
+		icon := imaging.Fit(orig, 160, 160, imaging.Lanczos)
+
+		var buf bytes.Buffer
+		imaging.Encode(&buf, icon, imaging.PNG)
+		b = buf.Bytes()
+		contentType = "image/png"
+	}
+
+	collection := db.Collection(chartCollection)
+	//Update single icon
+	update := bson.M{"$set": bson.M{"raw_icon": b, "icon_content_type": contentType}}
+	filter := bson.M{"_id": c.ID}
+	updateResult, err := collection.UpdateOne(context.Background(), filter, update, options.Update())
+	if err != nil {
+		log.Debugf("Error occurred during chart icon import (update one). Err: %v, Result: %v", err, updateResult)
+		return err
+	}
+	return err
+}
+
+func fetchAndImportFiles(db Database, name string, r common.Repo, cv common.ChartVersion) error {
+
+	chartFilesID := fmt.Sprintf("%s/%s-%s", r.Name, name, cv.Version)
+	//Check if we already have indexed files for this chart version and digest
+	collection := db.Collection(chartFilesCollection)
+	filter := bson.M{"_id": chartFilesID, "digest": cv.Digest}
+	findResult := collection.FindOne(context.Background(), filter, &common.ChartFiles{}, options.FindOne())
+	if findResult != mongo.ErrNoDocuments {
+		log.WithFields(log.Fields{"name": name, "version": cv.Version}).Debug("skipping existing files")
+		return nil
+	}
+	log.WithFields(log.Fields{"name": name, "version": cv.Version}).Debug("fetching files")
+
+	url := common.ChartTarballURL(r, cv)
+	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		return err
+	}
+	req.Header.Set("User-Agent", utils.UserAgent())
+	if len(r.AuthorizationHeader) > 0 {
+		req.Header.Set("Authorization", r.AuthorizationHeader)
+	}
+
+	res, err := netClient.Do(req)
+	if err != nil {
+		return err
+	}
+	defer res.Body.Close()
+
+	// We read the whole chart into memory, this should be okay since the chart
+	// tarball needs to be small enough to fit into a GRPC call (Tiller
+	// requirement)
+	gzf, err := gzip.NewReader(res.Body)
+	if err != nil {
+		return err
+	}
+	defer gzf.Close()
+
+	tarf := tar.NewReader(gzf)
+
+	readmeFileName := name + "/README.md"
+	valuesFileName := name + "/values.yaml"
+	schemaFileName := name + "/values.schema.json"
+	filenames := []string{valuesFileName, readmeFileName, schemaFileName}
+
+	files, err := common.ExtractFilesFromTarball(filenames, tarf)
+	if err != nil {
+		return err
+	}
+
+	chartFiles := common.ChartFiles{ID: chartFilesID, Repo: r, Digest: cv.Digest}
+	if v, ok := files[readmeFileName]; ok {
+		chartFiles.Readme = v
+	} else {
+		log.WithFields(log.Fields{"name": name, "version": cv.Version}).Info("README.md not found")
+	}
+	if v, ok := files[valuesFileName]; ok {
+		chartFiles.Values = v
+	} else {
+		log.WithFields(log.Fields{"name": name, "version": cv.Version}).Info("values.yaml not found")
+	}
+	if v, ok := files[schemaFileName]; ok {
+		chartFiles.Schema = v
+	} else {
+		log.WithFields(log.Fields{"name": name, "version": cv.Version}).Info("values.schema.json not found")
+	}
+
+	// inserts the chart files if not already indexed, or updates the existing
+	// entry if digest has changed
+	log.Debugf("Inserting chart files %v to collection: %v....", chartFilesID, chartFilesCollection)
+	collection = db.Collection(chartFilesCollection)
+	filter = bson.M{"_id": chartFilesID}
+	chartBSON, err := bson.Marshal(&chartFiles)
+	var doc bson.M
+	bson.Unmarshal(chartBSON, &doc)
+	delete(doc, "_id")
+	update := bson.M{"$set": doc}
+	updateResult, err := collection.UpdateOne(context.Background(), filter, update, options.Update().SetUpsert(true))
+	if err != nil {
+		log.Debugf("Error occurred during chart files import (update one). Chart files : %v doc: %v  Err: %v", chartFiles, doc, err)
+		return err
+	}
+	log.Debugf("Chart files import success. (update one) Upserted: %v Updated: %v", updateResult.UpsertedCount, updateResult.ModifiedCount)
+	return nil
+}
+
+func database(client *mongo.Client, dbName string) (*mongo.Database, func()) {
+
+	db := client.Database(dbName)
+	return db, func() {
+		err := client.Disconnect(context.Background())
+
+		if err != nil {
+			log.Fatal(err)
+		}
+		fmt.Println("Connection to MongoDB closed.")
+	}
+}
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils_test.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils_test.go
new file mode 100644
index 0000000000..d8c450b133
--- /dev/null
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils_test.go
@@ -0,0 +1,690 @@
+/*
+Copyright (c) 2018 The Helm Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package foundationdb
+
+import (
+	"archive/tar"
+	"bytes"
+	"compress/gzip"
+	"crypto/rand"
+	"fmt"
+	"image"
+	"image/color"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"path"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/helm/monocular/cmd/chart-repo/common"
+	"github.com/helm/monocular/cmd/chart-repo/utils"
+
+	"github.com/arschles/assert"
+	"github.com/disintegration/imaging"
+	log "github.com/sirupsen/logrus"
+	"github.com/stretchr/testify/mock"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo"
+)
+
+var validRepoIndexYAMLBytes, _ = ioutil.ReadFile("../testdata/valid-index.yaml")
+var validRepoIndexYAML = string(validRepoIndexYAMLBytes)
+
+var invalidRepoIndexYAML = "invalid"
+
+type badHTTPClient struct{}
+
+func (h *badHTTPClient) Do(req *http.Request) (*http.Response, error) {
+	w := httptest.NewRecorder()
+	w.WriteHeader(500)
+	return w.Result(), nil
+}
+
+type goodHTTPClient struct{}
+
+func (h *goodHTTPClient) Do(req *http.Request) (*http.Response, error) {
+	w := httptest.NewRecorder()
+	// Don't accept trailing slashes
+	if strings.HasPrefix(req.URL.Path, "//") {
+		w.WriteHeader(500)
+	}
+	// If subpath repo URL test, check that index.yaml is correctly added to the
+	// subpath
+	if req.URL.Host == "subpath.test" && req.URL.Path != "/subpath/index.yaml" {
+		w.WriteHeader(500)
+	}
+
+	w.Write([]byte(validRepoIndexYAML))
+	return w.Result(), nil
+}
+
+type badIconClient struct{}
+
+func (h *badIconClient) Do(req *http.Request) (*http.Response, error) {
+	w := httptest.NewRecorder()
+	w.Write([]byte("not-an-image"))
+	return w.Result(), nil
+}
+
+type goodIconClient struct{}
+
+func iconBytes() []byte {
+	var b bytes.Buffer
+	img := imaging.New(1, 1, color.White)
+	imaging.Encode(&b, img, imaging.PNG)
+	return b.Bytes()
+}
+
+func (h *goodIconClient) Do(req *http.Request) (*http.Response, error) {
+	w := httptest.NewRecorder()
+	w.Write(iconBytes())
+	return w.Result(), nil
+}
+
+type svgIconClient struct{}
+
+func (h *svgIconClient) Do(req *http.Request) (*http.Response, error) {
+	w := httptest.NewRecorder()
+	w.Write([]byte("foo"))
+	res := w.Result()
+	res.Header.Set("Content-Type", "image/svg")
+	return res, nil
+}
+
+type goodTarballClient struct {
+	c          common.Chart
+	skipReadme bool
+	skipValues bool
+	skipSchema bool
+}
+
+var testChartReadme = "# readme for chart\n\nBest chart in town"
+var testChartValues = "image: test"
+var testChartSchema = `{"properties": {}}`
+
+func (h *goodTarballClient) Do(req *http.Request) (*http.Response, error) {
+	w := httptest.NewRecorder()
+	gzw := gzip.NewWriter(w)
+	files := []tarballFile{{h.c.Name + "/Chart.yaml", "should be a Chart.yaml here..."}}
+	if !h.skipValues {
+		files = append(files, tarballFile{h.c.Name + "/values.yaml", testChartValues})
+	}
+	if !h.skipReadme {
+		files = append(files, tarballFile{h.c.Name + "/README.md", testChartReadme})
+	}
+	if !h.skipSchema {
+		files = append(files, tarballFile{h.c.Name + "/values.schema.json", testChartSchema})
+	}
+	createTestTarball(gzw, files)
+	gzw.Flush()
+	return w.Result(), nil
+}
+
+type authenticatedTarballClient struct {
+	c common.Chart
+}
+
+func (h *authenticatedTarballClient) Do(req *http.Request) (*http.Response, error) {
+	w := httptest.NewRecorder()
+
+	// Ensure we're sending the right Authorization header
+	if !strings.Contains(req.Header.Get("Authorization"), "Bearer ThisSecretAccessTokenAuthenticatesTheClient") {
+		w.WriteHeader(500)
+	} else {
+		gzw := gzip.NewWriter(w)
+		files := []tarballFile{{h.c.Name + "/Chart.yaml", "should be a Chart.yaml here..."}}
+		files = append(files, tarballFile{h.c.Name + "/values.yaml", testChartValues})
+		files = append(files, tarballFile{h.c.Name + "/README.md", testChartReadme})
+		files = append(files, tarballFile{h.c.Name + "/values.schema.json", testChartSchema})
+		createTestTarball(gzw, files)
+		gzw.Flush()
+	}
+	return w.Result(), nil
+}
+
+func Test_syncURLInvalidity(t *testing.T) {
+	tests := []struct {
+		name    string
+		repoURL string
+	}{
+		{"invalid URL", "not-a-url"},
+		{"invalid URL", "https//google.com"},
+	}
+	m := mock.Mock{}
+	dbClient := NewMockClient(&m)
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			err := syncRepo(dbClient, "test", "test", tt.repoURL, "")
+			assert.ExistsErr(t, err, tt.name)
+		})
+	}
+}
+
+func Test_fetchRepoIndex(t *testing.T) {
+	tests := []struct {
+		name string
+		r    common.Repo
+	}{
+		{"valid HTTP URL", common.Repo{URL: "http://my.examplerepo.com"}},
+		{"valid HTTPS URL", common.Repo{URL: "https://my.examplerepo.com"}},
+		{"valid trailing URL", common.Repo{URL: "https://my.examplerepo.com/"}},
+		{"valid subpath URL", common.Repo{URL: "https://subpath.test/subpath/"}},
+		{"valid URL with trailing spaces", common.Repo{URL: "https://subpath.test/subpath/  "}},
+		{"valid URL with leading spaces", common.Repo{URL: "  https://subpath.test/subpath/"}},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			netClient = &goodHTTPClient{}
+			_, err := common.FetchRepoIndex(tt.r, netClient)
+			assert.NoErr(t, err)
+		})
+	}
+
+	t.Run("failed request", func(t *testing.T) {
+		netClient = &badHTTPClient{}
+		_, err := common.FetchRepoIndex(common.Repo{URL: "https://my.examplerepo.com"}, netClient)
+		assert.ExistsErr(t, err, "failed request")
+	})
+}
+
+func Test_fetchRepoIndexUserAgent(t *testing.T) {
+	tests := []struct {
+		name              string
+		version           string
+		userAgentComment  string
+		expectedUserAgent string
+	}{
+		{"default user agent", "", "", "chart-repo/devel"},
+		{"custom version no app", "1.0", "", "chart-repo/1.0"},
+		{"custom version and app", "1.0", "monocular/1.2", "chart-repo/1.0 (monocular/1.2)"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Override global variables used to generate the userAgent
+			if tt.version != "" {
+				utils.Version = tt.version
+			}
+
+			if tt.userAgentComment != "" {
+				utils.UserAgentComment = tt.userAgentComment
+			}
+
+			server := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
+				assert.Equal(t, tt.expectedUserAgent, req.Header.Get("User-Agent"), "expected user agent")
+				rw.Write([]byte(validRepoIndexYAML))
+			}))
+			// Close the server when test finishes
+			defer server.Close()
+
+			netClient = server.Client()
+
+			_, err := common.FetchRepoIndex(common.Repo{URL: server.URL}, netClient)
+			assert.NoErr(t, err)
+		})
+	}
+}
+
+func Test_parseRepoIndex(t *testing.T) {
+	tests := []struct {
+		name     string
+		repoYAML string
+	}{
+		{"invalid", "invalid"},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			_, err := common.ParseRepoIndex([]byte(tt.repoYAML))
+			assert.ExistsErr(t, err, tt.name)
+		})
+	}
+
+	t.Run("valid", func(t *testing.T) {
+		index, err := common.ParseRepoIndex([]byte(validRepoIndexYAML))
+		assert.NoErr(t, err)
+		assert.Equal(t, len(index.Entries), 2, "number of charts")
+		assert.Equal(t, index.Entries["acs-engine-autoscaler"][0].GetName(), "acs-engine-autoscaler", "chart version populated")
+	})
+}
+
+func Test_chartsFromIndex(t *testing.T) {
+	r := common.Repo{Name: "test", URL: "http://testrepo.com"}
+	index, _ := common.ParseRepoIndex([]byte(validRepoIndexYAML))
+	charts := common.ChartsFromIndex(index, r)
+	assert.Equal(t, len(charts), 2, "number of charts")
+
+	indexWithDeprecated := validRepoIndexYAML + `
+  deprecated-chart:
+  - name: deprecated-chart
+    deprecated: true`
+	index2, err := common.ParseRepoIndex([]byte(indexWithDeprecated))
+	assert.NoErr(t, err)
+	charts = common.ChartsFromIndex(index2, r)
+	assert.Equal(t, len(charts), 2, "number of charts")
+}
+
+func Test_newChart(t *testing.T) {
+	r := common.Repo{Name: "test", URL: "http://testrepo.com"}
+	index, _ := common.ParseRepoIndex([]byte(validRepoIndexYAML))
+	c := common.NewChart(index.Entries["wordpress"], r)
+	assert.Equal(t, c.Name, "wordpress", "correctly built")
+	assert.Equal(t, len(c.ChartVersions), 2, "correctly built")
+	assert.Equal(t, c.Description, "new description!", "takes chart fields from latest entry")
+	assert.Equal(t, c.Repo, r, "repo set")
+	assert.Equal(t, c.ID, "test/wordpress", "id set")
+}
+
+func Test_importCharts(t *testing.T) {
+	m := &mock.Mock{}
+	// Ensure Upsert func is called with some arguments
+	m.On("BulkWrite", mock.Anything, mock.Anything, mock.Anything).Return(&mongo.BulkWriteResult{}, nil)
+	m.On("DeleteMany", mock.Anything, mock.Anything, mock.Anything).Return(&mongo.DeleteResult{}, nil)
+	dbClient := NewMockClient(m)
+	db, _ := dbClient.Database("test")
+	index, _ := common.ParseRepoIndex([]byte(validRepoIndexYAML))
+	charts := common.ChartsFromIndex(index, common.Repo{Name: "test", URL: "http://testrepo.com"})
+	importCharts(db, "test", charts)
+
+	m.AssertExpectations(t)
+	// The BulkWrite method takes an array of WriteModels.
+	// For x charts to upsert, there should be x elements.
+	// Each element has a selector (filter) and an "update" - the update document to apply
+	args := m.Calls[0].Arguments.Get(1).([]mongo.WriteModel)
+	assert.Equal(t, len(args), len(charts), "number of charts to upsert")
+	for i := 0; i < len(args); i++ {
+		updateModel := args[i].(*mongo.UpdateOneModel)
+		assert.Equal(t, updateModel.Filter, bson.M{"_id": "test/" + updateModel.Update.(bson.M)["name"].(string)}, "selector")
+	}
+}
+
+func Test_DeleteRepo(t *testing.T) {
+	m := &mock.Mock{}
+	m.On("DeleteMany", mock.Anything, bson.M{
+		"repo.name": "test",
+	}, mock.Anything).Return(&mongo.DeleteResult{}, nil)
+	dbClient := NewMockClient(m)
+
+	err := deleteRepo(dbClient, "test", "test")
+	if err != nil {
+		t.Errorf("failed to delete chart repo test: %v", err)
+	}
+	m.AssertExpectations(t)
+}
+
+func Test_fetchAndImportIcon(t *testing.T) {
+	t.Run("no icon", func(t *testing.T) {
+		m := mock.Mock{}
+		dbClient := NewMockClient(&m)
+		db, _ := dbClient.Database("test")
+		c := common.Chart{ID: "test/acs-engine-autoscaler"}
+		assert.NoErr(t, fetchAndImportIcon(db, c))
+	})
+
+	index, _ := common.ParseRepoIndex([]byte(validRepoIndexYAML))
+	charts := common.ChartsFromIndex(index, common.Repo{Name: "test", URL: "http://testrepo.com"})
+
+	t.Run("failed download", func(t *testing.T) {
+		netClient = &badHTTPClient{}
+		c := charts[0]
+		m := mock.Mock{}
+		dbClient := NewMockClient(&m)
+		db, _ := dbClient.Database("test")
+		assert.Err(t, fmt.Errorf("500 %s", c.Icon), fetchAndImportIcon(db, c))
+	})
+
+	t.Run("bad icon", func(t *testing.T) {
+		netClient = &badIconClient{}
+		c := charts[0]
+		m := mock.Mock{}
+		dbClient := NewMockClient(&m)
+		db, _ := dbClient.Database("test")
+		assert.Err(t, image.ErrFormat, fetchAndImportIcon(db, c))
+	})
+
+	t.Run("valid icon", func(t *testing.T) {
+		netClient = &goodIconClient{}
+		c := charts[0]
+		m := mock.Mock{}
+		dbClient := NewMockClient(&m)
+		db, _ := dbClient.Database("test")
+		m.On("UpdateOne", mock.Anything, bson.M{"_id": c.ID}, bson.M{"$set": bson.M{"raw_icon": iconBytes(), "icon_content_type": "image/png"}}, mock.Anything).Return(&mongo.UpdateResult{}, nil)
+		assert.NoErr(t, fetchAndImportIcon(db, c))
+		m.AssertExpectations(t)
+	})
+
+	t.Run("valid SVG icon", func(t *testing.T) {
+		netClient = &svgIconClient{}
+		c := common.Chart{
+			ID:   "foo",
+			Icon: "https://foo/bar/logo.svg",
+			Repo: common.Repo{},
+		}
+		m := mock.Mock{}
+		dbClient := NewMockClient(&m)
+		db, _ := dbClient.Database("test")
+		m.On("UpdateOne", mock.Anything, bson.M{"_id": c.ID}, bson.M{"$set": bson.M{"raw_icon": []byte("foo"), "icon_content_type": "image/svg"}}, mock.Anything).Return(&mongo.UpdateResult{}, nil)
+		assert.NoErr(t, fetchAndImportIcon(db, c))
+		m.AssertExpectations(t)
+	})
+}
+
+func Test_fetchAndImportFiles(t *testing.T) {
+	index, _ := common.ParseRepoIndex([]byte(validRepoIndexYAML))
+	charts := common.ChartsFromIndex(index, common.Repo{Name: "test", URL: "http://testrepo.com", AuthorizationHeader: "Bearer ThisSecretAccessTokenAuthenticatesTheClient1s"})
+	cv := charts[0].ChartVersions[0]
+
+	t.Run("http error", func(t *testing.T) {
+		m := mock.Mock{}
+		m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(mongo.ErrNoDocuments)
+		dbClient := NewMockClient(&m)
+		db, _ := dbClient.Database("test")
+		netClient = &badHTTPClient{}
+		assert.Err(t, io.EOF, fetchAndImportFiles(db, charts[0].Name, charts[0].Repo, cv))
+	})
+
+	t.Run("file not found", func(t *testing.T) {
+		netClient = &goodTarballClient{c: charts[0], skipValues: true, skipReadme: true, skipSchema: true}
+		m := mock.Mock{}
+		m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(mongo.ErrNoDocuments)
+		chartFilesID := fmt.Sprintf("%s/%s-%s", charts[0].Repo.Name, charts[0].Name, cv.Version)
+		chartFiles := common.ChartFiles{ID: chartFilesID, Readme: "", Values: "", Schema: "", Repo: charts[0].Repo, Digest: cv.Digest}
+		chartBSON, _ := bson.Marshal(&chartFiles)
+		var doc bson.M
+		bson.Unmarshal(chartBSON, &doc)
+		delete(doc, "_id")
+		update := bson.M{"$set": doc}
+		m.On("UpdateOne", mock.Anything, bson.M{"_id": chartFilesID}, update, mock.Anything).Return(&mongo.UpdateResult{}, nil)
+		dbClient := NewMockClient(&m)
+		db, _ := dbClient.Database("test")
+		err := fetchAndImportFiles(db, charts[0].Name, charts[0].Repo, cv)
+		assert.NoErr(t, err)
+		m.AssertExpectations(t)
+	})
+
+	t.Run("authenticated request", func(t *testing.T) {
+		netClient = &authenticatedTarballClient{c: charts[0]}
+		m := mock.Mock{}
+		m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(mongo.ErrNoDocuments)
+		chartFilesID := fmt.Sprintf("%s/%s-%s", charts[0].Repo.Name, charts[0].Name, cv.Version)
+		chartFiles := common.ChartFiles{ID: chartFilesID, Readme: testChartReadme, Values: testChartValues, Schema: testChartSchema, Repo: charts[0].Repo, Digest: cv.Digest}
+		chartBSON, _ := bson.Marshal(&chartFiles)
+		var doc bson.M
+		bson.Unmarshal(chartBSON, &doc)
+		delete(doc, "_id")
+		update := bson.M{"$set": doc}
+		m.On("UpdateOne", mock.Anything, bson.M{"_id": chartFilesID}, update, mock.Anything).Return(&mongo.UpdateResult{}, nil)
+		dbClient := NewMockClient(&m)
+		db, _ := dbClient.Database("test")
+		err := fetchAndImportFiles(db, charts[0].Name, charts[0].Repo, cv)
+		assert.NoErr(t, err)
+		m.AssertExpectations(t)
+	})
+
+	t.Run("valid tarball", func(t *testing.T) {
+		netClient = &goodTarballClient{c: charts[0]}
+		m := mock.Mock{}
+		m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(mongo.ErrNoDocuments)
+		chartFilesID := fmt.Sprintf("%s/%s-%s", charts[0].Repo.Name, charts[0].Name, cv.Version)
+		chartFiles := common.ChartFiles{ID: chartFilesID, Readme: testChartReadme, Values: testChartValues, Schema: testChartSchema, Repo: charts[0].Repo, Digest: cv.Digest}
+		chartBSON, _ := bson.Marshal(&chartFiles)
+		var doc bson.M
+		bson.Unmarshal(chartBSON, &doc)
+		delete(doc, "_id")
+		update := bson.M{"$set": doc}
+		m.On("UpdateOne", mock.Anything, bson.M{"_id": chartFilesID}, update, mock.Anything).Return(&mongo.UpdateResult{}, nil)
+		dbClient := NewMockClient(&m)
+		db, _ := dbClient.Database("test")
+		err := fetchAndImportFiles(db, charts[0].Name, charts[0].Repo, cv)
+		assert.NoErr(t, err)
+		m.AssertExpectations(t)
+	})
+
+	t.Run("file exists", func(t *testing.T) {
+		m := mock.Mock{}
+		// don't return an error when checking if files already exists
+		m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
+		dbClient := NewMockClient(&m)
+		db, _ := dbClient.Database("test")
+		err := fetchAndImportFiles(db, charts[0].Name, charts[0].Repo, cv)
+		assert.NoErr(t, err)
+		m.AssertNotCalled(t, "UpdateOne", mock.Anything, mock.Anything, mock.Anything)
+	})
+}
+
+func Test_chartTarballURL(t *testing.T) {
+	r := common.Repo{Name: "test", URL: "http://testrepo.com"}
+	tests := []struct {
+		name   string
+		cv     common.ChartVersion
+		wanted string
+	}{
+		{"absolute url", common.ChartVersion{URLs: []string{"http://testrepo.com/wordpress-0.1.0.tgz"}}, "http://testrepo.com/wordpress-0.1.0.tgz"},
+		{"relative url", common.ChartVersion{URLs: []string{"wordpress-0.1.0.tgz"}}, "http://testrepo.com/wordpress-0.1.0.tgz"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			assert.Equal(t, common.ChartTarballURL(r, tt.cv), tt.wanted, "url")
+		})
+	}
+}
+
+func Test_extractFilesFromTarball(t *testing.T) {
+	tests := []struct {
+		name     string
+		files    []tarballFile
+		filename string
+		want     string
+	}{
+		{"file", []tarballFile{{"file.txt", "best file ever"}}, "file.txt", "best file ever"},
+		{"multiple file tarball", []tarballFile{{"file.txt", "best file ever"}, {"file2.txt", "worst file ever"}}, "file2.txt", "worst file ever"},
+		{"file in dir", []tarballFile{{"file.txt", "best file ever"}, {"test/file2.txt", "worst file ever"}}, "test/file2.txt", "worst file ever"},
+		{"filename ignore case", []tarballFile{{"Readme.md", "# readme for chart"}, {"values.yaml", "key: value"}}, "README.md", "# readme for chart"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var b bytes.Buffer
+			createTestTarball(&b, tt.files)
+			r := bytes.NewReader(b.Bytes())
+			tarf := tar.NewReader(r)
+			files, err := common.ExtractFilesFromTarball([]string{tt.filename}, tarf)
+			assert.NoErr(t, err)
+			assert.Equal(t, files[tt.filename], tt.want, "file body")
+		})
+	}
+
+	t.Run("extract multiple files", func(t *testing.T) {
+		var b bytes.Buffer
+		tFiles := []tarballFile{{"file.txt", "best file ever"}, {"file2.txt", "worst file ever"}}
+		createTestTarball(&b, tFiles)
+		r := bytes.NewReader(b.Bytes())
+		tarf := tar.NewReader(r)
+		files, err := common.ExtractFilesFromTarball([]string{tFiles[0].Name, tFiles[1].Name}, tarf)
+		assert.NoErr(t, err)
+		assert.Equal(t, len(files), 2, "matches")
+		for _, f := range tFiles {
+			assert.Equal(t, files[f.Name], f.Body, "file body")
+		}
+	})
+
+	t.Run("file not found", func(t *testing.T) {
+		var b bytes.Buffer
+		createTestTarball(&b, []tarballFile{{"file.txt", "best file ever"}})
+		r := bytes.NewReader(b.Bytes())
+		tarf := tar.NewReader(r)
+		name := "file2.txt"
+		files, err := common.ExtractFilesFromTarball([]string{name}, tarf)
+		assert.NoErr(t, err)
+		assert.Equal(t, files[name], "", "file body")
+	})
+
+	t.Run("not a tarball", func(t *testing.T) {
+		b := make([]byte, 4)
+		rand.Read(b)
+		r := bytes.NewReader(b)
+		tarf := tar.NewReader(r)
+		files, err := common.ExtractFilesFromTarball([]string{"file2.txt"}, tarf)
+		assert.Err(t, io.ErrUnexpectedEOF, err)
+		assert.Equal(t, len(files), 0, "file body")
+	})
+}
+
+type tarballFile struct {
+	Name, Body string
+}
+
+func createTestTarball(w io.Writer, files []tarballFile) {
+	// Create a new tar archive.
+	tarw := tar.NewWriter(w)
+
+	// Add files to the archive.
+	for _, file := range files {
+		hdr := &tar.Header{
+			Name: file.Name,
+			Mode: 0600,
+			Size: int64(len(file.Body)),
+		}
+		if err := tarw.WriteHeader(hdr); err != nil {
+			log.Fatalln(err)
+		}
+		if _, err := tarw.Write([]byte(file.Body)); err != nil {
+			log.Fatalln(err)
+		}
+	}
+	// Make sure to check the error on Close.
+	if err := tarw.Close(); err != nil {
+		log.Fatal(err)
+	}
+}
+
+func Test_initNetClient(t *testing.T) {
+	// Test env
+	otherDir, err := ioutil.TempDir("", "ca-registry")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(otherDir)
+
+	// Create cert
+	caCert := `-----BEGIN CERTIFICATE-----
+MIIC6jCCAdKgAwIBAgIUKVfzA7lfBgSYP8enCVhlm0ql5YwwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAxMCQ0EwHhcNMTgxMjEyMTQxNzAwWhcNMjMxMjExMTQxNzAw
+WjANMQswCQYDVQQDEwJDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALZU3fsAgvoUuLSHr24apslaYyuX84wGoZQmtFtQ+A3DF9KL/2nn3yZ6qJPkH0TF
+sbObEQRNi+P6vQ3nI/dSNMX5PzMBP2CB6L7zEXzZQEHtAK0Bzva5CKEBGX7OfIKl
+aBvs+dzKVJBdb+Oh0maacMwa4QbcD6ejzF90jUbaO65lpQpcL7KQdppKOGNclRaA
+hQTV2VsxrV4hH7K9btaTTxso+8W6p8v6X9vf40Ywx72p+SKnGh+FCrOp1gYLBLwo
+4SM0OUQHRvqUlj0XhZk5pW0dMRwHcoz1S2GmE5bj4edr4j+zGzGxa2wRGKvM0OCn
+Do84AVszTFPmUf+mCl4pJNECAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFI5l5k+MEhrbOQ29dOW1qJhI0yKaMA0GCSqG
+SIb3DQEBCwUAA4IBAQByDebUOKzn6jfmXlW62vm09V+ipqId01wm21G9XMtMEqhc
+xtun6YwQeTuGPtdepWG+NXuSsiX/HNAHeaumJaaljHhdKDisnMQ0CTnNsu8NPkAl
+9iMEB3iXLWkb7+HgfPJAHZVGcMqMxNEMZYHB1Fh0G2Ne376X94+GYJ08qR2C8rUP
+BShhMSktB578h4GtPIWSjPhDUWg1fGe7sewR+GPyuL9859hOD0wGm9tUixBKloCu
+b90fhqZZ3FqZD7W1qJGKvz/8geqi0noip+uq/dokK1jarRkOVEJP+EvXkHo0tIuc
+h251U/Daz6NiQBM9AxyAw6EHm8XAZBvCuebfzyrT
+-----END CERTIFICATE-----`
+	otherCA := path.Join(otherDir, "ca.crt")
+	err = ioutil.WriteFile(otherCA, []byte(caCert), 0644)
+	if err != nil {
+		t.Error(err)
+	}
+
+	_, err = common.InitNetClient(otherCA, defaultTimeoutSeconds)
+	if err != nil {
+		t.Error(err)
+	}
+}
+
+var emptyRepoIndexYAMLBytes, _ = ioutil.ReadFile("testdata/empty-repo-index.yaml")
+var emptyRepoIndexYAML = string(emptyRepoIndexYAMLBytes)
+
+type emptyChartRepoHTTPClient struct{}
+
+func (h *emptyChartRepoHTTPClient) Do(req *http.Request) (*http.Response, error) {
+	w := httptest.NewRecorder()
+	w.Write([]byte(emptyRepoIndexYAML))
+	return w.Result(), nil
+}
+
+func Test_emptyChartRepo(t *testing.T) {
+	netClient = &emptyChartRepoHTTPClient{}
+	m := mock.Mock{}
+	dbClient := NewMockClient(&m)
+	//Expect a call to test the DB readiness
+	m.On("InsertOne", mock.Anything, mock.Anything, mock.Anything).Return(&mongo.InsertOneResult{}, nil)
+	m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
+	err := syncRepo(dbClient, "test", "testRepo", "https://my.examplerepo.com", "")
+	assert.ExistsErr(t, err, "Failed Request")
+}
+
+func Test_getSha256(t *testing.T) {
+	sha, err := common.GetSha256([]byte("this is a test"))
+	assert.Equal(t, err, nil, "Unable to get sha")
+	assert.Equal(t, sha, "2e99758548972a8e8822ad47fa1017ff72f06f3ff6a016851f45c398732bc50c", "Unable to get sha")
+}
+
+func Test_repoAlreadyProcessed(t *testing.T) {
+	tests := []struct {
+		name            string
+		checksum        string
+		mockedLastCheck common.RepoCheck
+		processed       bool
+	}{
+		{"not processed yet", "bar", common.RepoCheck{}, false},
+		{"already processed", "bar", common.RepoCheck{Checksum: "bar"}, true},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			m := mock.Mock{}
+			repo := &common.RepoCheck{}
+			m.On("FindOne", mock.Anything, mock.Anything, repo, mock.Anything).Run(func(args mock.Arguments) {
+				*args.Get(2).(*common.RepoCheck) = tt.mockedLastCheck
+			}).Return(nil)
+			dbClient := NewMockClient(&m)
+			db, _ := dbClient.Database("test")
+			res := repoAlreadyProcessed(db, "", tt.checksum)
+			if res != tt.processed {
+				t.Errorf("Expected alreadyProcessed to be %v got %v", tt.processed, res)
+			}
+		})
+	}
+}
+
+func Test_updateLastCheck(t *testing.T) {
+	m := mock.Mock{}
+	repoName := "foo"
+	checksum := "bar"
+	now := time.Now()
+	selector := bson.M{"_id": repoName}
+	m.On("UpdateOne", mock.Anything, selector, bson.M{"$set": bson.M{"last_update": now, "checksum": checksum}}, mock.Anything).Return(&mongo.UpdateResult{}, nil)
+	dbClient := NewMockClient(&m)
+	db, _ := dbClient.Database("test")
+	err := updateLastCheck(db, repoName, checksum, now)
+	if err != nil {
+		t.Errorf("Unexpected error %v", err)
+	}
+	if len(m.Calls) != 1 {
+		t.Errorf("Expected one call got %d", len(m.Calls))
+	}
+}
diff --git a/src/jetstream/plugins/monocular/chart-repo/sync.go b/src/jetstream/plugins/monocular/chart-repo/sync.go
index d4b1e8da13..8e7ee31106 100644
--- a/src/jetstream/plugins/monocular/chart-repo/sync.go
+++ b/src/jetstream/plugins/monocular/chart-repo/sync.go
@@ -17,59 +17,23 @@ limitations under the License.
 package chartrepo
 
 import (
-	"os"
+	"github.com/helm/monocular/cmd/chart-repo/foundationdb"
 
-	"github.com/kubeapps/common/datastore"
-	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
-var syncCmd = &cobra.Command{
+//SyncCmd Sync a chart repository with Monocular
+var SyncCmd = &cobra.Command{
 	Use:   "sync [REPO NAME] [REPO URL]",
 	Short: "add a new chart repository, and resync its charts periodically",
 	Run: func(cmd *cobra.Command, args []string) {
+
 		if len(args) != 2 {
-			logrus.Info("Need exactly two arguments: [REPO NAME] [REPO URL]")
+			log.Info("Need exactly two arguments: [REPO NAME] [REPO URL]")
 			cmd.Help()
 			return
 		}
-
-		mongoURL, err := cmd.Flags().GetString("mongo-url")
-		if err != nil {
-			logrus.Fatal(err)
-		}
-		mongoDB, err := cmd.Flags().GetString("mongo-database")
-		if err != nil {
-			logrus.Fatal(err)
-		}
-		mongoUser, err := cmd.Flags().GetString("mongo-user")
-		if err != nil {
-			logrus.Fatal(err)
-		}
-		mongoPW := os.Getenv("MONGO_PASSWORD")
-		debug, err := cmd.Flags().GetBool("debug")
-		if err != nil {
-			logrus.Fatal(err)
-		}
-		if debug {
-			logrus.SetLevel(logrus.DebugLevel)
-		}
-		mongoConfig := datastore.Config{URL: mongoURL, Database: mongoDB, Username: mongoUser, Password: mongoPW}
-		dbSession, err := datastore.NewSession(mongoConfig)
-		if err != nil {
-			logrus.Fatalf("Can't connect to mongoDB: %v", err)
-		}
-
-		monogoDB, err := NewMongoDBChartRepoDatastore(dbSession)
-		if err != nil {
-			logrus.Fatalf("Can't create data store for mongoDB: %v", err)
-		}
-
-		authorizationHeader := os.Getenv("AUTHORIZATION_HEADER")
-		if err = SyncRepo(monogoDB, args[0], args[1], authorizationHeader); err != nil {
-			logrus.Fatalf("Can't add chart repository to database: %v", err)
-		}
-
-		logrus.Infof("Successfully added the chart repository %s to database", args[0])
+		foundationdb.Sync(cmd, args)
 	},
 }
diff --git a/src/jetstream/plugins/monocular/chart-repo/testdata/empty-repo-index.yaml b/src/jetstream/plugins/monocular/chart-repo/testdata/empty-repo-index.yaml
new file mode 100644
index 0000000000..9e608aa034
--- /dev/null
+++ b/src/jetstream/plugins/monocular/chart-repo/testdata/empty-repo-index.yaml
@@ -0,0 +1 @@
+entries:
\ No newline at end of file
diff --git a/src/jetstream/plugins/monocular/chart-repo/utils/version.go b/src/jetstream/plugins/monocular/chart-repo/utils/version.go
new file mode 100644
index 0000000000..e30f658e8c
--- /dev/null
+++ b/src/jetstream/plugins/monocular/chart-repo/utils/version.go
@@ -0,0 +1,51 @@
+/*
+Copyright (c) 2018 The Helm Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package utils
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+)
+
+var (
+	Version          = "devel"
+	UserAgentComment string
+)
+
+// UserAgent returns the user agent to be used during calls to the chart repositories
+// Examples:
+// chart-repo/devel
+// chart-repo/1.0
+// chart-repo/1.0 (monocular v1.0-beta4)
+// More info here https://github.com/kubeapps/kubeapps/issues/767#issuecomment-436835938
+func UserAgent() string {
+	ua := "chart-repo/" + Version
+	if UserAgentComment != "" {
+		ua = fmt.Sprintf("%s (%s)", ua, UserAgentComment)
+	}
+	return ua
+}
+
+//VersionCmd returns Monocular version information
+var VersionCmd = &cobra.Command{
+	Use:   "version",
+	Short: "returns version information",
+	Run: func(cmd *cobra.Command, args []string) {
+		fmt.Println(Version)
+	},
+}
diff --git a/src/jetstream/plugins/monocular/chartsvc/Dockerfile b/src/jetstream/plugins/monocular/chartsvc/Dockerfile
index 639a9429c8..42d494ab88 100644
--- a/src/jetstream/plugins/monocular/chartsvc/Dockerfile
+++ b/src/jetstream/plugins/monocular/chartsvc/Dockerfile
@@ -1,8 +1,7 @@
-FROM golang:1.11 as builder
+FROM golang:1.12 as builder
 COPY . /go/src/github.com/helm/monocular
 WORKDIR /go/src/github.com/helm/monocular
-RUN CGO_ENABLED=0 go build -a -installsuffix cgo ./cmd/chartsvc
-
+RUN GO111MODULE=on GOPROXY=https://gocenter.io CGO_ENABLED=0 go build -a -installsuffix cgo ./cmd/chartsvc
 FROM scratch
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=builder /go/src/github.com/helm/monocular/chartsvc /chartsvc
diff --git a/src/jetstream/plugins/monocular/chartsvc/Makefile b/src/jetstream/plugins/monocular/chartsvc/Makefile
index 291d260aab..0593b8f3ac 100644
--- a/src/jetstream/plugins/monocular/chartsvc/Makefile
+++ b/src/jetstream/plugins/monocular/chartsvc/Makefile
@@ -1,4 +1,4 @@
-IMAGE_REPO ?= quay.io/helmpack/chartsvc
+IMAGE_REPO ?= docker.io/kreinecke/suse-fdb-chartsvc
 IMAGE_TAG ?= latest
 
 docker-build:
diff --git a/src/jetstream/plugins/monocular/chartsvc/foundationdb/datastore/datastore.go b/src/jetstream/plugins/monocular/chartsvc/foundationdb/datastore/datastore.go
new file mode 100644
index 0000000000..2580d1f93b
--- /dev/null
+++ b/src/jetstream/plugins/monocular/chartsvc/foundationdb/datastore/datastore.go
@@ -0,0 +1,145 @@
+/*
+Copyright (c) 2019
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package datastore implements an interface on top of the mgo mongo client
+package datastore
+
+import (
+	"context"
+	"fmt"
+	"reflect"
+	"time"
+
+	log "github.com/sirupsen/logrus"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
+)
+
+const defaultTimeout = 30 * time.Second
+
+// Config configures the database connection
+type Config struct {
+	URL      string
+	Database string
+	Timeout  time.Duration
+}
+
+// Client is an interface for a MongoDB client
+type Client interface {
+	Database(name string) (Database, func())
+}
+
+// Database is an interface for accessing a MongoDB database
+type Database interface {
+	Collection(name string) Collection
+}
+
+// Collection is an interface for accessing a MongoDB collection
+type Collection interface {
+	BulkWrite(ctxt context.Context, operations []mongo.WriteModel, options *options.BulkWriteOptions) (*mongo.BulkWriteResult, error)
+	DeleteMany(ctxt context.Context, filter interface{}, options *options.DeleteOptions) (*mongo.DeleteResult, error)
+	FindOne(ctxt context.Context, filter interface{}, result interface{}, options *options.FindOneOptions) error
+	InsertOne(ctxt context.Context, document interface{}, options *options.InsertOneOptions) (*mongo.InsertOneResult, error)
+	UpdateOne(ctxt context.Context, filter interface{}, update interface{}, options *options.UpdateOptions) (*mongo.UpdateResult, error)
+	Find(ctxt context.Context, filter interface{}, result interface{}, options *options.FindOptions) error
+}
+
+// mongoDatabase wraps a mongo.Database and implements Collection
+type mongoDatabase struct {
+	Database *mongo.Database
+}
+
+// mongoClient wraps a mongo.Client and implements Database
+type mongoClient struct {
+	Client *mongo.Client
+}
+
+// NewDocLayerClient creates a new MongoDB client for the FoundationDB document layer.
+func NewDocLayerClient(ctx context.Context, options *options.ClientOptions) (Client, error) {
+	client, err := mongo.Connect(ctx, options)
+	return &mongoClient{client}, err
+}
+
+func (c *mongoClient) Database(dbName string) (Database, func()) {
+
+	db := &mongoDatabase{c.Client.Database(dbName)}
+
+	return db, func() {
+		err := c.Client.Disconnect(context.Background())
+
+		if err != nil {
+			log.Fatal(err)
+		}
+		fmt.Println("Connection to MongoDB closed.")
+	}
+}
+
+func (d *mongoDatabase) Collection(name string) Collection {
+	return &mongoCollection{d.Database.Collection(name)}
+}
+
+// mgoCollection wraps an mgo.Collection and implements Collection
+type mongoCollection struct {
+	Collection *mongo.Collection
+}
+
+func (c *mongoCollection) BulkWrite(ctxt context.Context, operations []mongo.WriteModel, options *options.BulkWriteOptions) (*mongo.BulkWriteResult, error) {
+	res, err := c.Collection.BulkWrite(ctxt, operations, options)
+	return res, err
+}
+
+func (c *mongoCollection) DeleteMany(ctxt context.Context, filter interface{}, options *options.DeleteOptions) (*mongo.DeleteResult, error) {
+	res, err := c.Collection.DeleteMany(ctxt, filter, options)
+	return res, err
+}
+
+func (c *mongoCollection) FindOne(ctxt context.Context, filter interface{}, result interface{}, options *options.FindOneOptions) error {
+	res := c.Collection.FindOne(ctxt, filter, options)
+	return res.Decode(result)
+}
+
+func (c *mongoCollection) InsertOne(ctxt context.Context, document interface{}, options *options.InsertOneOptions) (*mongo.InsertOneResult, error) {
+	res, err := c.Collection.InsertOne(ctxt, document, options)
+	return res, err
+}
+
+func (c *mongoCollection) UpdateOne(ctxt context.Context, filter interface{}, document interface{}, options *options.UpdateOptions) (*mongo.UpdateResult, error) {
+	res, err := c.Collection.UpdateOne(ctxt, filter, document, options)
+	return res, err
+}
+
+func (c *mongoCollection) Find(ctxt context.Context, filter interface{}, result interface{}, options *options.FindOptions) error {
+	resCursor, err := c.Collection.Find(ctxt, filter, options)
+	if err != nil {
+		log.WithError(err).Errorf(
+			"Error fetching query result.")
+	} else {
+		resultType := reflect.ValueOf(result)
+		if resultType.Kind() != reflect.Ptr {
+			return fmt.Errorf("Result arg must be a pointer type. Got: %v", resultType.Kind())
+		}
+		resultSliceType := resultType.Elem()
+		if resultSliceType.Kind() != reflect.Slice {
+			return fmt.Errorf("Result arg must be a slice value. Got: %v", resultSliceType.Kind())
+		}
+		err = resCursor.All(context.Background(), result)
+		if err != nil {
+			log.WithError(err).Errorf(
+				"Error decoding query result.")
+		}
+	}
+	return err
+}
diff --git a/src/jetstream/plugins/monocular/chartsvc/foundationdb/datastore/mockstore.go b/src/jetstream/plugins/monocular/chartsvc/foundationdb/datastore/mockstore.go
new file mode 100644
index 0000000000..053ffea382
--- /dev/null
+++ b/src/jetstream/plugins/monocular/chartsvc/foundationdb/datastore/mockstore.go
@@ -0,0 +1,87 @@
+/*
+Copyright (c) 2019
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package datastore
+
+import (
+	"context"
+
+	"github.com/stretchr/testify/mock"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
+)
+
+// mockDatabase acts as a mock datastore.Database
+type mockDatabase struct {
+	*mock.Mock
+}
+
+type mockClient struct {
+	*mock.Mock
+}
+
+//NewMockClient returns a mocked FDB Document-Layer client
+func NewMockClient(m *mock.Mock) Client {
+	return mockClient{m}
+}
+
+// DB returns a mocked datastore.Database and empty closer function
+func (c mockClient) Database(dbName string) (Database, func()) {
+
+	db := mockDatabase{c.Mock}
+
+	return db, func() {
+	}
+}
+
+func (d mockDatabase) Collection(name string) Collection {
+	return mockCollection{d.Mock}
+}
+
+// mockCollection acts as a mock datastore.Collection
+type mockCollection struct {
+	*mock.Mock
+}
+
+func (c mockCollection) BulkWrite(ctxt context.Context, operations []mongo.WriteModel, options *options.BulkWriteOptions) (*mongo.BulkWriteResult, error) {
+	args := c.Called(ctxt, operations, options)
+	return args.Get(0).(*mongo.BulkWriteResult), args.Error(1)
+}
+
+func (c mockCollection) DeleteMany(ctxt context.Context, filter interface{}, options *options.DeleteOptions) (*mongo.DeleteResult, error) {
+	args := c.Called(ctxt, filter, options)
+	return args.Get(0).(*mongo.DeleteResult), args.Error(1)
+}
+
+func (c mockCollection) FindOne(ctxt context.Context, filter interface{}, result interface{}, options *options.FindOneOptions) error {
+	args := c.Called(ctxt, filter, result, options)
+	return args.Error(0)
+}
+
+func (c mockCollection) InsertOne(ctxt context.Context, document interface{}, options *options.InsertOneOptions) (*mongo.InsertOneResult, error) {
+	args := c.Called(ctxt, document, options)
+	return args.Get(0).(*mongo.InsertOneResult), args.Error(1)
+}
+
+func (c mockCollection) UpdateOne(ctxt context.Context, filter interface{}, document interface{}, options *options.UpdateOptions) (*mongo.UpdateResult, error) {
+	args := c.Called(ctxt, filter, document, options)
+	return args.Get(0).(*mongo.UpdateResult), args.Error(1)
+}
+
+func (c mockCollection) Find(ctxt context.Context, filter interface{}, result interface{}, options *options.FindOptions) error {
+	args := c.Called(ctxt, filter, result, options)
+	return args.Error(0)
+}
diff --git a/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go b/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go
new file mode 100644
index 0000000000..a28d778b95
--- /dev/null
+++ b/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go
@@ -0,0 +1,506 @@
+/*
+Copyright (c) 2019
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package foundationdb
+
+import (
+	"context"
+	"fmt"
+	"math"
+	"net/http"
+	"sort"
+	"strconv"
+
+	"github.com/helm/monocular/cmd/chartsvc/foundationdb/datastore"
+	"github.com/helm/monocular/cmd/chartsvc/models"
+	"github.com/helm/monocular/cmd/chartsvc/utils"
+
+	"github.com/gorilla/mux"
+	"github.com/kubeapps/common/response"
+	log "github.com/sirupsen/logrus"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
+)
+
+// Params a key-value map of path params
+type Params map[string]string
+
+// WithParams can be used to wrap handlers to take an extra arg for path params
+type WithParams func(http.ResponseWriter, *http.Request, Params)
+
+func (h WithParams) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	vars := mux.Vars(req)
+	h(w, req, vars)
+}
+
+const chartCollection = "charts"
+const filesCollection = "files"
+
+// count is used to parse the result of a $count operation in the database
+type count struct {
+	Count int
+}
+
+var dbClient datastore.Client
+var db datastore.Database
+var dbCloser func()
+
+//var db mongo.Database
+var dbName string
+var pathPrefix string
+
+//SetPathPrefix sets the URL prefix for the ChartSVC API endpoint
+func SetPathPrefix(prefix string) {
+	pathPrefix = prefix
+}
+
+//InitDBConfig sets FDB Document-Layer client and DB config for the ChartSVC API handler
+func InitDBConfig(client datastore.Client, name string) {
+	dbClient = client
+	db, dbCloser = dbClient.Database(name)
+	dbName = name
+}
+
+// getPageNumberAndSize extracts the page number and size of a request. Default (1, 0) if not set
+func getPageNumberAndSize(req *http.Request) (int, int) {
+	page := req.FormValue("page")
+	size := req.FormValue("size")
+	pageInt, err := strconv.ParseUint(page, 10, 64)
+	if err != nil {
+		pageInt = 1
+	}
+	// ParseUint will return 0 if size is a not positive integer
+	sizeInt, _ := strconv.ParseUint(size, 10, 64)
+	return int(pageInt), int(sizeInt)
+}
+
+// showDuplicates returns if a request wants to retrieve charts. Default false
+func showDuplicates(req *http.Request) bool {
+	return len(req.FormValue("showDuplicates")) > 0
+}
+
+// min returns the minimum of two integers.
+// We are not using math.Min since that compares float64
+// and it's unnecessarily complex.
+func min(a, b int) int {
+	if a < b {
+		return a
+	}
+	return b
+}
+
+func uniqChartList(charts []*models.Chart) []*models.Chart {
+	// We will keep track of unique digest:chart to avoid duplicates
+	chartDigests := map[string]bool{}
+	res := []*models.Chart{}
+	for _, c := range charts {
+		digest := c.ChartVersions[0].Digest
+		// Filter out the chart if we've seen the same digest before
+		if _, ok := chartDigests[digest]; !ok {
+			chartDigests[digest] = true
+			res = append(res, c)
+		}
+	}
+	return res
+}
+
+func getPaginatedChartList(repo string, pageNumber, pageSize int, showDuplicates bool) (utils.ApiListResponse, interface{}, error) {
+	log.Debugf("Request for paginated chart list..")
+
+	//Find all charts for repo name and sort by chart name
+	collection := db.Collection(chartCollection)
+	filter := bson.M{}
+	if repo != "" {
+		filter = bson.M{"repo.name": repo}
+	}
+	var charts []*models.Chart
+	err := collection.Find(context.Background(), filter, &charts, options.Find())
+	if err != nil {
+		log.WithError(err).Errorf(
+			"Error fetching charts from DB for pagination %s",
+			repo,
+		)
+		return newChartListResponse([]*models.Chart{}), utils.Meta{TotalPages: 0}, err
+	}
+	var tempChartMap map[string]*models.Chart = make(map[string]*models.Chart)
+
+	chartsToSort := make([]*models.Chart, 0, len(tempChartMap))
+
+	if !showDuplicates {
+		for _, chart := range charts {
+			log.Debugf("Chart digest: %v.", chart.ChartVersions[0].Digest)
+			tempChartMap[chart.ChartVersions[0].Digest] = chart
+		}
+		log.Debugf("Charts in map: %v", len(tempChartMap))
+		//Now just get all the values from our map
+		for _, v := range tempChartMap {
+			log.Debugf("Adding chart: %v to unique chart list.", *v)
+			chartsToSort = append(chartsToSort, v)
+		}
+	} else {
+		chartsToSort = charts
+	}
+
+	//Sort the list of paginated charts by name
+	sort.Slice(chartsToSort, func(i, j int) bool {
+		return chartsToSort[i].Name < chartsToSort[j].Name
+	})
+
+	sortedCharts := chartsToSort
+	log.Debugf("Charts in sorted list: %v", len(sortedCharts))
+	log.Debugf("Page size requested: %v", pageSize)
+	var paginatedCharts = sortedCharts
+	totalPages := 1
+	if pageSize != 0 {
+		// If a pageSize is given, returns only the the specified number of charts and
+		// the number of pages
+		cc := count{}
+		cc.Count = len(sortedCharts)
+		totalPages = int(math.Ceil(float64(cc.Count) / float64(pageSize)))
+
+		// If the page number is out of range, return the last one
+		if pageNumber > totalPages {
+			pageNumber = totalPages
+		}
+		paginatedCharts = sortedCharts[(pageNumber-1)*pageSize : pageNumber*pageSize]
+	}
+
+	log.Debugf("Returning %v charts, Done.", len(paginatedCharts))
+	return newChartListResponse(paginatedCharts), utils.Meta{TotalPages: totalPages}, nil
+}
+
+// ListCharts returns a list of charts
+func ListCharts(w http.ResponseWriter, req *http.Request) {
+	log.Debug("Request for charts..")
+	pageNumber, pageSize := getPageNumberAndSize(req)
+	cl, meta, err := getPaginatedChartList("", pageNumber, pageSize, showDuplicates(req))
+	if err != nil {
+		log.WithError(err).Error("could not fetch charts")
+		response.NewErrorResponse(http.StatusInternalServerError, "could not fetch all charts").Write(w)
+		return
+	}
+	response.NewDataResponseWithMeta(cl, meta).Write(w)
+	log.Debug("Done.")
+}
+
+// ListRepoCharts returns a list of charts in the given repo
+func ListRepoCharts(w http.ResponseWriter, req *http.Request, params Params) {
+	log.Debug("Request for charts..")
+	pageNumber, pageSize := getPageNumberAndSize(req)
+	cl, meta, err := getPaginatedChartList(params["repo"], pageNumber, pageSize, showDuplicates(req))
+	if err != nil {
+		log.WithError(err).Error("could not fetch charts")
+		response.NewErrorResponse(http.StatusInternalServerError, "could not fetch all charts").Write(w)
+		return
+	}
+	response.NewDataResponseWithMeta(cl, meta).Write(w)
+	log.Debug("Done.")
+}
+
+// GetChart returns the chart from the given repo
+func GetChart(w http.ResponseWriter, req *http.Request, params Params) {
+	var chart models.Chart
+	chartID := fmt.Sprintf("%s/%s", params["repo"], params["chartName"])
+
+	chartCollection := db.Collection(chartCollection)
+	filter := bson.M{"_id": chartID}
+	findResult := chartCollection.FindOne(context.Background(), filter, &chart, options.FindOne())
+	if findResult == mongo.ErrNoDocuments {
+		log.WithError(findResult).Errorf("could not find chart with id %s", chartID)
+		response.NewErrorResponse(http.StatusNotFound, "could not find chart").Write(w)
+		return
+	}
+
+	cr := newChartResponse(&chart)
+	response.NewDataResponse(cr).Write(w)
+}
+
+// ListChartVersions returns a list of chart versions for the given chart
+func ListChartVersions(w http.ResponseWriter, req *http.Request, params Params) {
+	var chart models.Chart
+	chartID := fmt.Sprintf("%s/%s", params["repo"], params["chartName"])
+
+	chartCollection := db.Collection(chartCollection)
+	filter := bson.M{"_id": chartID}
+	findResult := chartCollection.FindOne(context.Background(), filter, &chart, options.FindOne())
+	if findResult == mongo.ErrNoDocuments {
+		log.WithError(findResult).Errorf("could not find chart with id %s", chartID)
+		response.NewErrorResponse(http.StatusNotFound, "could not find chart").Write(w)
+		return
+	}
+
+	cvl := newChartVersionListResponse(&chart)
+	response.NewDataResponse(cvl).Write(w)
+}
+
+// GetChartVersion returns the given chart version
+func GetChartVersion(w http.ResponseWriter, req *http.Request, params Params) {
+	var chart models.Chart
+	chartID := fmt.Sprintf("%s/%s", params["repo"], params["chartName"])
+
+	chartCollection := db.Collection(chartCollection)
+	filter := bson.M{
+		"_id":           chartID,
+		"chartversions": bson.M{"$elemMatch": bson.M{"version": params["version"]}},
+	}
+	projection := bson.M{
+		"name": 1, "repo": 1, "description": 1, "home": 1, "keywords": 1, "maintainers": 1, "sources": 1,
+		"chartversions": 1,
+	}
+	findResult := chartCollection.FindOne(context.Background(), filter, &chart, options.FindOne().SetProjection(projection))
+	if findResult == mongo.ErrNoDocuments {
+		log.WithError(findResult).Errorf("could not find chart with id %s", chartID)
+		response.NewErrorResponse(http.StatusNotFound, "could not find chart").Write(w)
+		return
+	}
+
+	for i := range chart.ChartVersions {
+		if chart.ChartVersions[i].Version == params["version"] {
+			chart.ChartVersions = chart.ChartVersions[i : i+1]
+			break
+		}
+	}
+	// Cut the versions slice down to just one element
+	cvr := newChartVersionResponse(&chart, chart.ChartVersions[0])
+	response.NewDataResponse(cvr).Write(w)
+}
+
+// GetChartIcon returns the icon for a given chart
+func GetChartIcon(w http.ResponseWriter, req *http.Request, params Params) {
+	var chart models.Chart
+	chartID := fmt.Sprintf("%s/%s", params["repo"], params["chartName"])
+
+	chartCollection := db.Collection(chartCollection)
+	filter := bson.M{"_id": chartID}
+	findResult := chartCollection.FindOne(context.Background(), filter, &chart, options.FindOne())
+	if findResult == mongo.ErrNoDocuments {
+		log.WithError(findResult).Errorf("could not find chart with id %s", chartID)
+		http.NotFound(w, req)
+		return
+	}
+	if chart.RawIcon == nil {
+		http.NotFound(w, req)
+		return
+	}
+
+	if chart.IconContentType != "" {
+		// Force the Content-Type header because the autogenerated type does not work for
+		// image/svg+xml. It is detected as plain text
+		w.Header().Set("Content-Type", chart.IconContentType)
+	}
+
+	w.Write(chart.RawIcon)
+}
+
+// GetChartVersionReadme returns the README for a given chart
+func GetChartVersionReadme(w http.ResponseWriter, req *http.Request, params Params) {
+
+	var files models.ChartFiles
+	fileID := fmt.Sprintf("%s/%s-%s", params["repo"], params["chartName"], params["version"])
+
+	filesCollection := db.Collection(filesCollection)
+	filter := bson.M{"_id": fileID}
+	findResult := filesCollection.FindOne(context.Background(), filter, &files, options.FindOne())
+	if findResult == mongo.ErrNoDocuments {
+		log.WithError(findResult).Errorf("could not find files with id %s", fileID)
+		http.NotFound(w, req)
+		return
+	}
+	readme := []byte(files.Readme)
+	if len(readme) == 0 {
+		log.Errorf("could not find a README for id %s", fileID)
+		http.NotFound(w, req)
+		return
+	}
+	w.Write(readme)
+}
+
+// GetChartVersionValues returns the values.yaml for a given chart
+func GetChartVersionValues(w http.ResponseWriter, req *http.Request, params Params) {
+	var files models.ChartFiles
+
+	fileID := fmt.Sprintf("%s/%s-%s", params["repo"], params["chartName"], params["version"])
+	filesCollection := db.Collection(filesCollection)
+	filter := bson.M{"_id": fileID}
+	findResult := filesCollection.FindOne(context.Background(), filter, &files, options.FindOne())
+	if findResult == mongo.ErrNoDocuments {
+		log.WithError(findResult).Errorf("could not find values.yaml with id %s", fileID)
+		http.NotFound(w, req)
+		return
+	}
+
+	w.Write([]byte(files.Values))
+}
+
+// GetChartVersionSchema returns the values.schema.json for a given chart
+func GetChartVersionSchema(w http.ResponseWriter, req *http.Request, params Params) {
+
+	var files models.ChartFiles
+
+	fileID := fmt.Sprintf("%s/%s-%s", params["repo"], params["chartName"], params["version"])
+	filter := bson.M{"_id": fileID}
+	filesCollection := db.Collection(filesCollection)
+	findResult := filesCollection.FindOne(context.Background(), filter, &files, options.FindOne())
+	if findResult == mongo.ErrNoDocuments {
+		log.WithError(findResult).Errorf("could not find values.schema.json with id %s", fileID)
+		http.NotFound(w, req)
+		return
+	}
+
+	w.Write([]byte(files.Schema))
+}
+
+// ListChartsWithFilters returns the list of repos that contains the given chart and the latest version found
+func ListChartsWithFilters(w http.ResponseWriter, req *http.Request, params Params) {
+
+	var charts []*models.Chart
+
+	chartCollection := db.Collection(chartCollection)
+	filter := bson.M{
+		"name": params["chartName"],
+		"chartversions": bson.M{
+			"$elemMatch": bson.M{"version": req.FormValue("version"), "appversion": req.FormValue("appversion")},
+		}}
+	projection := bson.M{
+		"name": 1, "repo": 1,
+		"chartversions": bson.M{"$slice": 1},
+	}
+	err := chartCollection.Find(context.Background(), filter, &charts, options.Find().SetProjection(projection))
+	if err != nil {
+		log.WithError(err).Errorf(
+			"Error finding charts with the given name %s, version %s and appversion %s",
+			params["chartName"], req.FormValue("version"), req.FormValue("appversion"),
+		)
+		// continue to return empty list
+	}
+
+	chartResponse := charts
+	if !showDuplicates(req) {
+		chartResponse = uniqChartList(charts)
+	}
+
+	cl := newChartListResponse(chartResponse)
+	response.NewDataResponse(cl).Write(w)
+}
+
+// SearchCharts returns the list of charts that matches the query param in any of these fields:
+//  - name
+//  - description
+//  - repository name
+//  - any keyword
+//  - any source
+//  - any maintainer name
+func SearchCharts(w http.ResponseWriter, req *http.Request, params Params) {
+
+	query := req.FormValue("q")
+	var charts []*models.Chart
+
+	chartCollection := db.Collection(chartCollection)
+	filter := bson.M{
+		"$or": []bson.M{
+			{"name": bson.M{"$regex": query}},
+			{"description": bson.M{"$regex": query}},
+			{"repo.name": bson.M{"$regex": query}},
+			{"keywords": bson.M{"$elemMatch": bson.M{"$regex": query}}},
+			{"sources": bson.M{"$elemMatch": bson.M{"$regex": query}}},
+			{"maintainers": bson.M{"$elemMatch": bson.M{"name": bson.M{"$regex": query}}}},
+		},
+	}
+	if params["repo"] != "" {
+		filter["repo.name"] = params["repo"]
+	}
+	err := chartCollection.Find(context.Background(), filter, &charts, options.Find())
+	if err != nil {
+		log.WithError(err).Errorf(
+			"Error finding charts with the given name %s, version %s and appversion %s",
+			params["chartName"], req.FormValue("version"), req.FormValue("appversion"),
+		)
+		// continue to return empty list
+	}
+
+	chartResponse := charts
+	if !showDuplicates(req) {
+		chartResponse = uniqChartList(charts)
+	}
+
+	cl := newChartListResponse(uniqChartList(chartResponse))
+	response.NewDataResponse(cl).Write(w)
+}
+
+func newChartResponse(c *models.Chart) *utils.ApiResponse {
+	latestCV := c.ChartVersions[0]
+	return &utils.ApiResponse{
+		Type:       "chart",
+		ID:         c.ID,
+		Attributes: chartAttributes(*c),
+		Links:      utils.SelfLink{Self: pathPrefix + "/charts/" + c.ID},
+		Relationships: utils.RelMap{
+			"latestChartVersion": utils.Rel{
+				Data:  chartVersionAttributes(c.ID, latestCV),
+				Links: utils.SelfLink{Self: pathPrefix + "/charts/" + c.ID + "/versions/" + latestCV.Version},
+			},
+		},
+	}
+}
+
+func newChartListResponse(charts []*models.Chart) utils.ApiListResponse {
+	cl := utils.ApiListResponse{}
+	for _, c := range charts {
+		cl = append(cl, newChartResponse(c))
+	}
+	return cl
+}
+
+func chartVersionAttributes(cid string, cv models.ChartVersion) models.ChartVersion {
+	cv.Readme = pathPrefix + "/assets/" + cid + "/versions/" + cv.Version + "/README.md"
+	cv.Values = pathPrefix + "/assets/" + cid + "/versions/" + cv.Version + "/values.yaml"
+	return cv
+}
+
+func chartAttributes(c models.Chart) models.Chart {
+	if c.RawIcon != nil {
+		c.Icon = pathPrefix + "/assets/" + c.ID + "/logo"
+	} else {
+		// If the icon wasn't processed, it is either not set or invalid
+		c.Icon = ""
+	}
+	return c
+}
+
+func newChartVersionResponse(c *models.Chart, cv models.ChartVersion) *utils.ApiResponse {
+	return &utils.ApiResponse{
+		Type:       "chartVersion",
+		ID:         fmt.Sprintf("%s-%s", c.ID, cv.Version),
+		Attributes: chartVersionAttributes(c.ID, cv),
+		Links:      utils.SelfLink{Self: pathPrefix + "/charts/" + c.ID + "/versions/" + cv.Version},
+		Relationships: utils.RelMap{
+			"chart": utils.Rel{
+				Data:  chartAttributes(*c),
+				Links: utils.SelfLink{Self: pathPrefix + "/charts/" + c.ID},
+			},
+		},
+	}
+}
+
+func newChartVersionListResponse(c *models.Chart) utils.ApiListResponse {
+	var cvl utils.ApiListResponse
+	for _, cv := range c.ChartVersions {
+		cvl = append(cvl, newChartVersionResponse(c, cv))
+	}
+
+	return cvl
+}
diff --git a/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler_test.go b/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler_test.go
new file mode 100644
index 0000000000..2c8eaeedad
--- /dev/null
+++ b/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler_test.go
@@ -0,0 +1,867 @@
+/*
+Copyright (c) 2019
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package foundationdb
+
+import (
+	"bytes"
+	"encoding/json"
+	"image/color"
+	"net/http"
+	"net/http/httptest"
+	"strconv"
+	"strings"
+	"testing"
+
+	"github.com/helm/monocular/cmd/chartsvc/foundationdb/datastore"
+	"github.com/helm/monocular/cmd/chartsvc/models"
+	"github.com/helm/monocular/cmd/chartsvc/utils"
+
+	"github.com/disintegration/imaging"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo"
+)
+
+var cc count
+
+const testChartReadme = "# Quickstart\n\n```bash\nhelm install my-repo/my-chart\n```"
+const testChartValues = "image:\n  registry: docker.io\n  repository: my-repo/my-chart\n  tag: 0.1.0"
+
+const fdbURL = "mongodb://fdb-service/27016"
+const fDB = "charts"
+
+func iconBytes() []byte {
+	var b bytes.Buffer
+	img := imaging.New(1, 1, color.White)
+	imaging.Encode(&b, img, imaging.PNG)
+	return b.Bytes()
+}
+
+func Test_chartAttributes(t *testing.T) {
+	tests := []struct {
+		name  string
+		chart models.Chart
+	}{
+		{"chart has no icon", models.Chart{
+			ID: "stable/wordpress",
+		}},
+		{"chart has a icon", models.Chart{
+			ID: "repo/mychart", RawIcon: iconBytes(), IconContentType: "image/svg",
+		}},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			c := chartAttributes(tt.chart)
+			assert.Equal(t, tt.chart.ID, c.ID)
+			assert.Equal(t, tt.chart.RawIcon, c.RawIcon)
+			if len(tt.chart.RawIcon) == 0 {
+				assert.Equal(t, len(c.Icon), 0, "icon url should be undefined")
+			} else {
+				assert.Equal(t, c.Icon, pathPrefix+"/assets/"+tt.chart.ID+"/logo", "the icon url should be the same")
+				assert.Equal(t, c.IconContentType, tt.chart.IconContentType, "the icon content type should be the same")
+			}
+		})
+	}
+}
+
+func Test_chartVersionAttributes(t *testing.T) {
+	tests := []struct {
+		name  string
+		chart models.Chart
+	}{
+		{"my-chart", models.Chart{
+			ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}},
+		}},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cv := chartVersionAttributes(tt.chart.ID, tt.chart.ChartVersions[0])
+			assert.Equal(t, cv.Version, tt.chart.ChartVersions[0].Version, "version string should be the same")
+			assert.Equal(t, cv.Readme, pathPrefix+"/assets/"+tt.chart.ID+"/versions/"+tt.chart.ChartVersions[0].Version+"/README.md", "README.md resource path should be the same")
+			assert.Equal(t, cv.Values, pathPrefix+"/assets/"+tt.chart.ID+"/versions/"+tt.chart.ChartVersions[0].Version+"/values.yaml", "values.yaml resource path should be the same")
+		})
+	}
+}
+
+func Test_newChartResponse(t *testing.T) {
+	tests := []struct {
+		name  string
+		chart models.Chart
+	}{
+		{"chart has only one version", models.Chart{
+			ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "1.2.3"}}},
+		},
+		{"chart has many versions", models.Chart{
+			ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.2"}, {Version: "0.1.0"}},
+		}},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cResponse := newChartResponse(&tt.chart)
+			assert.Equal(t, cResponse.Type, "chart", "response type is chart")
+			assert.Equal(t, cResponse.ID, tt.chart.ID, "chart ID should be the same")
+			assert.Equal(t, cResponse.Relationships["latestChartVersion"].Data.(models.ChartVersion).Version, tt.chart.ChartVersions[0].Version, "latestChartVersion should match version at index 0")
+			assert.Equal(t, cResponse.Links.(utils.SelfLink).Self, pathPrefix+"/charts/"+tt.chart.ID, "self link should be the same")
+			assert.Equal(t, len(cResponse.Attributes.(models.Chart).ChartVersions), len(tt.chart.ChartVersions), "number of chart versions in the response should be the same")
+		})
+	}
+}
+
+func Test_newChartListResponse(t *testing.T) {
+	tests := []struct {
+		name   string
+		input  []*models.Chart
+		result []*models.Chart
+	}{
+		{"no charts", []*models.Chart{}, []*models.Chart{}},
+		{"has one chart", []*models.Chart{
+			{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
+		}, []*models.Chart{
+			{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
+		}},
+		{"has two charts", []*models.Chart{
+			{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
+			{ID: "stable/wordpress", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "1234"}, {Version: "1.2.2", Digest: "12345"}}},
+		}, []*models.Chart{
+			{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
+			{ID: "stable/wordpress", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "1234"}, {Version: "1.2.2", Digest: "12345"}}},
+		}},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			clResponse := newChartListResponse(tt.input)
+			assert.Equal(t, len(clResponse), len(tt.result), "number of charts in response should be the same")
+			for i := range tt.result {
+				assert.Equal(t, clResponse[i].Type, "chart", "response type is chart")
+				assert.Equal(t, clResponse[i].ID, tt.result[i].ID, "chart ID should be the same")
+				assert.Equal(t, clResponse[i].Relationships["latestChartVersion"].Data.(models.ChartVersion).Version, tt.result[i].ChartVersions[0].Version, "latestChartVersion should match version at index 0")
+				assert.Equal(t, clResponse[i].Links.(utils.SelfLink).Self, pathPrefix+"/charts/"+tt.result[i].ID, "self link should be the same")
+				assert.Equal(t, len(clResponse[i].Attributes.(models.Chart).ChartVersions), len(tt.result[i].ChartVersions), "number of chart versions in the response should be the same")
+			}
+		})
+	}
+}
+
+func Test_newChartVersionResponse(t *testing.T) {
+	tests := []struct {
+		name  string
+		chart models.Chart
+	}{
+		{"my-chart", models.Chart{
+			ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}, {Version: "0.2.3"}},
+		}},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			for i := range tt.chart.ChartVersions {
+				cvResponse := newChartVersionResponse(&tt.chart, tt.chart.ChartVersions[i])
+				assert.Equal(t, cvResponse.Type, "chartVersion", "response type is chartVersion")
+				assert.Equal(t, cvResponse.ID, tt.chart.ID+"-"+tt.chart.ChartVersions[i].Version, "reponse id should have chart version suffix")
+				assert.Equal(t, cvResponse.Links.(interface{}).(utils.SelfLink).Self, pathPrefix+"/charts/"+tt.chart.ID+"/versions/"+tt.chart.ChartVersions[i].Version, "self link should be the same")
+				assert.Equal(t, cvResponse.Attributes.(models.ChartVersion).Version, tt.chart.ChartVersions[i].Version, "chart version in the response should be the same")
+				assert.Equal(t, cvResponse.Relationships["chart"].Data.(interface{}).(models.Chart), tt.chart, "chart in relatioship matches")
+			}
+		})
+	}
+}
+
+func Test_newChartVersionListResponse(t *testing.T) {
+	tests := []struct {
+		name  string
+		chart models.Chart
+	}{
+		{"chart has no versions", models.Chart{
+			ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{},
+		}},
+		{"chart has one version", models.Chart{
+			ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1"}},
+		}},
+		{"chart has many versions", models.Chart{
+			ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1"}, {Version: "0.0.2"}},
+		}},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cvListResponse := newChartVersionListResponse(&tt.chart)
+			assert.Equal(t, len(cvListResponse), len(tt.chart.ChartVersions), "number of chart versions in response should be the same")
+			for i := range tt.chart.ChartVersions {
+				assert.Equal(t, cvListResponse[i].Type, "chartVersion", "response type is chartVersion")
+				assert.Equal(t, cvListResponse[i].ID, tt.chart.ID+"-"+tt.chart.ChartVersions[i].Version, "reponse id should have chart version suffix")
+				assert.Equal(t, cvListResponse[i].Links.(interface{}).(utils.SelfLink).Self, pathPrefix+"/charts/"+tt.chart.ID+"/versions/"+tt.chart.ChartVersions[i].Version, "self link should be the same")
+				assert.Equal(t, cvListResponse[i].Attributes.(models.ChartVersion).Version, tt.chart.ChartVersions[i].Version, "chart version in the response should be the same")
+			}
+		})
+	}
+}
+
+func Test_listCharts(t *testing.T) {
+	pageSize := 2
+	tests := []struct {
+		name            string
+		query           string
+		dbQueryResult   []*models.Chart
+		chartListResult []*models.Chart
+		meta            utils.Meta
+	}{
+		{"no charts", "", []*models.Chart{}, []*models.Chart{}, utils.Meta{TotalPages: 1}},
+		{"one chart", "", []*models.Chart{
+			{ID: "my-repo/my-chart", Name: "my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
+		}, []*models.Chart{
+			{ID: "my-repo/my-chart", Name: "my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
+		}, utils.Meta{TotalPages: 1}},
+		{"two charts", "", []*models.Chart{
+			{ID: "my-repo/my-chart", Name: "my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
+			{ID: "stable/dokuwiki", Name: "dokuwiki", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "1234"}, {Version: "1.2.2", Digest: "12345"}}},
+		}, []*models.Chart{
+			{ID: "stable/dokuwiki", Name: "dokuwiki", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "1234"}, {Version: "1.2.2", Digest: "12345"}}},
+			{ID: "my-repo/my-chart", Name: "my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
+		}, utils.Meta{TotalPages: 1}},
+		// Pagination tests
+		{"four charts with pagination", "?size=" + strconv.Itoa(pageSize), []*models.Chart{
+			{ID: "my-repo/my-chart", Name: "my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
+			{ID: "stable/dokuwiki", Name: "dokuwiki", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "1234"}}},
+			{ID: "stable/drupal", Name: "drupal", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "12345"}}},
+			{ID: "stable/wordpress", Name: "wordpress", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "123456"}}},
+		}, []*models.Chart{
+			{ID: "stable/dokuwiki", Name: "dokuwiki", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "1234"}}},
+			{ID: "stable/drupal", Name: "drupal", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "12345"}}},
+		}, utils.Meta{TotalPages: 2}},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var m mock.Mock
+			dbClient = datastore.NewMockClient(&m)
+			db, _ = dbClient.Database("test")
+			var chartsList []*models.Chart
+
+			m.On("Find", mock.Anything, mock.Anything, &chartsList, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
+				*args.Get(2).(*[]*models.Chart) = tt.dbQueryResult
+			})
+
+			w := httptest.NewRecorder()
+			req := httptest.NewRequest("GET", "/charts"+tt.query, nil)
+			ListCharts(w, req)
+
+			m.AssertExpectations(t)
+			assert.Equal(t, http.StatusOK, w.Code)
+
+			var b utils.BodyAPIListResponse
+			json.NewDecoder(w.Body).Decode(&b)
+			if b.Data == nil {
+				t.Fatal("chart list shouldn't be null")
+			}
+			data := *b.Data
+
+			assert.Len(t, data, len(tt.chartListResult))
+
+			for i, resp := range data {
+				assert.Equal(t, resp.ID, tt.chartListResult[i].ID, "chart id in the response should be the same")
+				assert.Equal(t, resp.Type, "chart", "response type is chart")
+				assert.Equal(t, resp.Links.(map[string]interface{})["self"], pathPrefix+"/charts/"+tt.chartListResult[i].ID, "self link should be the same")
+				assert.Equal(t, resp.Relationships["latestChartVersion"].Data.(map[string]interface{})["version"], tt.chartListResult[i].ChartVersions[0].Version, "latestChartVersion should match version at index 0")
+			}
+			assert.Equal(t, b.Meta, tt.meta, "response meta should be the same")
+		})
+	}
+}
+
+func Test_listRepoCharts(t *testing.T) {
+	pageSize := 2
+	tests := []struct {
+		name            string
+		repo            string
+		query           string
+		dbQueryResult   []*models.Chart
+		chartListResult []*models.Chart
+		meta            utils.Meta
+	}{
+		{"repo has no charts", "my-repo", "", []*models.Chart{}, []*models.Chart{}, utils.Meta{TotalPages: 1}},
+		{"repo has one chart", "my-repo", "", []*models.Chart{
+			{ID: "my-repo/my-chart", Name: "my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
+		}, []*models.Chart{
+			{ID: "my-repo/my-chart", Name: "my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
+		}, utils.Meta{TotalPages: 1}},
+		{"repo has many charts", "my-repo", "", []*models.Chart{
+			{ID: "my-repo/my-chart", Name: "my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
+			{ID: "my-repo/dokuwiki", Name: "dokuwiki", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "1234"}, {Version: "1.2.2", Digest: "12345"}}},
+		}, []*models.Chart{
+			{ID: "my-repo/dokuwiki", Name: "dokuwiki", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "1234"}, {Version: "1.2.2", Digest: "12345"}}},
+			{ID: "my-repo/my-chart", Name: "my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
+		}, utils.Meta{TotalPages: 1}},
+		{"repo has many charts with pagination", "my-repo", "?size=" + strconv.Itoa(pageSize), []*models.Chart{
+			{ID: "my-repo/my-chart3", Name: "my-chart3", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
+			{ID: "my-repo/my-chart1", Name: "my-chart1", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "1234"}}},
+			{ID: "my-repo/my-chart2", Name: "my-chart2", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "12345"}}},
+		}, []*models.Chart{
+			{ID: "my-repo/my-chart1", Name: "my-chart1", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "1234"}}},
+			{ID: "my-repo/my-chart2", Name: "my-chart2", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "12345"}}},
+		}, utils.Meta{TotalPages: 2}},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var m mock.Mock
+			dbClient = datastore.NewMockClient(&m)
+			db, _ = dbClient.Database("test")
+			var chartsList []*models.Chart
+			m.On("Find", mock.Anything, bson.M{"repo.name": "my-repo"}, &chartsList, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
+				*args.Get(2).(*[]*models.Chart) = tt.dbQueryResult
+			})
+
+			w := httptest.NewRecorder()
+			req := httptest.NewRequest("GET", "/charts/"+tt.repo+tt.query, nil)
+			params := Params{
+				"repo": "my-repo",
+			}
+
+			ListRepoCharts(w, req, params)
+
+			m.AssertExpectations(t)
+			assert.Equal(t, http.StatusOK, w.Code)
+
+			var b utils.BodyAPIListResponse
+			json.NewDecoder(w.Body).Decode(&b)
+			data := *b.Data
+			assert.Len(t, data, len(tt.chartListResult))
+			for i, resp := range data {
+				assert.Equal(t, resp.ID, tt.chartListResult[i].ID, "chart id in the response should be the same")
+				assert.Equal(t, resp.Type, "chart", "response type is chart")
+				assert.Equal(t, resp.Relationships["latestChartVersion"].Data.(map[string]interface{})["version"], tt.chartListResult[i].ChartVersions[0].Version, "latestChartVersion should match version at index 0")
+			}
+			assert.Equal(t, b.Meta, tt.meta, "response meta should be the same")
+		})
+	}
+}
+
+func Test_getChart(t *testing.T) {
+	tests := []struct {
+		name     string
+		err      error
+		chart    models.Chart
+		wantCode int
+	}{
+		{
+			"chart does not exist",
+			mongo.ErrNoDocuments,
+			models.Chart{ID: "my-repo/my-chart"},
+			http.StatusNotFound,
+		},
+		{
+			"chart exists",
+			nil,
+			models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}}},
+			http.StatusOK,
+		},
+		{
+			"chart has multiple versions",
+			nil,
+			models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}, {Version: "0.0.1"}}},
+			http.StatusOK,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var m mock.Mock
+			dbClient = datastore.NewMockClient(&m)
+			db, _ = dbClient.Database("test")
+
+			if tt.err != nil {
+				m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tt.err)
+			} else {
+				m.On("FindOne", mock.Anything, mock.Anything, &models.Chart{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
+					*args.Get(2).(*models.Chart) = tt.chart
+				})
+			}
+
+			w := httptest.NewRecorder()
+			req := httptest.NewRequest("GET", "/charts/"+tt.chart.ID, nil)
+			parts := strings.Split(tt.chart.ID, "/")
+			params := Params{
+				"repo":      parts[0],
+				"chartName": parts[1],
+			}
+
+			GetChart(w, req, params)
+
+			m.AssertExpectations(t)
+			assert.Equal(t, tt.wantCode, w.Code)
+			if tt.wantCode == http.StatusOK {
+				var b utils.BodyAPIResponse
+				json.NewDecoder(w.Body).Decode(&b)
+				assert.Equal(t, b.Data.ID, tt.chart.ID, "chart id in the response should be the same")
+				assert.Equal(t, b.Data.Type, "chart", "response type is chart")
+				assert.Equal(t, b.Data.Links.(map[string]interface{})["self"], pathPrefix+"/charts/"+tt.chart.ID, "self link should be the same")
+				assert.Equal(t, b.Data.Relationships["latestChartVersion"].Data.(map[string]interface{})["version"], tt.chart.ChartVersions[0].Version, "latestChartVersion should match version at index 0")
+			}
+		})
+	}
+}
+
+func Test_listChartVersions(t *testing.T) {
+	tests := []struct {
+		name     string
+		err      error
+		chart    models.Chart
+		wantCode int
+	}{
+		{
+			"chart does not exist",
+			mongo.ErrNoDocuments,
+			models.Chart{ID: "my-repo/my-chart"},
+			http.StatusNotFound,
+		},
+		{
+			"chart exists",
+			nil,
+			models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}}},
+			http.StatusOK,
+		},
+		{
+			"chart has multiple versions",
+			nil,
+			models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}, {Version: "0.0.1"}}},
+			http.StatusOK,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var m mock.Mock
+			dbClient = datastore.NewMockClient(&m)
+			db, _ = dbClient.Database("test")
+
+			if tt.err != nil {
+				m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tt.err)
+			} else {
+				m.On("FindOne", mock.Anything, mock.Anything, &models.Chart{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
+					*args.Get(2).(*models.Chart) = tt.chart
+				})
+			}
+
+			w := httptest.NewRecorder()
+			req := httptest.NewRequest("GET", "/charts/"+tt.chart.ID+"/versions", nil)
+			parts := strings.Split(tt.chart.ID, "/")
+			params := Params{
+				"repo":      parts[0],
+				"chartName": parts[1],
+			}
+
+			ListChartVersions(w, req, params)
+
+			m.AssertExpectations(t)
+			assert.Equal(t, tt.wantCode, w.Code)
+			if tt.wantCode == http.StatusOK {
+				var b utils.BodyAPIListResponse
+				json.NewDecoder(w.Body).Decode(&b)
+				data := *b.Data
+				for i, resp := range data {
+					assert.Equal(t, resp.ID, tt.chart.ID+"-"+tt.chart.ChartVersions[i].Version, "chart id in the response should be the same")
+					assert.Equal(t, resp.Type, "chartVersion", "response type is chartVersion")
+					assert.Equal(t, resp.Attributes.(map[string]interface{})["version"], tt.chart.ChartVersions[i].Version, "chart version should match")
+				}
+			}
+		})
+	}
+}
+
+func Test_getChartVersion(t *testing.T) {
+	tests := []struct {
+		name     string
+		err      error
+		chart    models.Chart
+		wantCode int
+	}{
+		{
+			"chart does not exist",
+			mongo.ErrNoDocuments,
+			models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}}},
+			http.StatusNotFound,
+		},
+		{
+			"chart exists",
+			nil,
+			models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}}},
+			http.StatusOK,
+		},
+		{
+			"chart has multiple versions",
+			nil,
+			models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}, {Version: "0.0.1"}}},
+			http.StatusOK,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var m mock.Mock
+			dbClient = datastore.NewMockClient(&m)
+			db, _ = dbClient.Database("test")
+
+			if tt.err != nil {
+				m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tt.err)
+			} else {
+				m.On("FindOne", mock.Anything, mock.Anything, &models.Chart{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
+					*args.Get(2).(*models.Chart) = tt.chart
+				})
+			}
+
+			w := httptest.NewRecorder()
+			req := httptest.NewRequest("GET", "/charts/"+tt.chart.ID+"/versions/"+tt.chart.ChartVersions[0].Version, nil)
+			parts := strings.Split(tt.chart.ID, "/")
+			params := Params{
+				"repo":      parts[0],
+				"chartName": parts[1],
+				"version":   tt.chart.ChartVersions[0].Version,
+			}
+
+			GetChartVersion(w, req, params)
+
+			m.AssertExpectations(t)
+			assert.Equal(t, tt.wantCode, w.Code)
+			if tt.wantCode == http.StatusOK {
+				var b utils.BodyAPIResponse
+				json.NewDecoder(w.Body).Decode(&b)
+				assert.Equal(t, b.Data.ID, tt.chart.ID+"-"+tt.chart.ChartVersions[0].Version, "chart id in the response should be the same")
+				assert.Equal(t, b.Data.Type, "chartVersion", "response type is chartVersion")
+				assert.Equal(t, b.Data.Attributes.(map[string]interface{})["version"], tt.chart.ChartVersions[0].Version, "chart version should match")
+			}
+		})
+	}
+}
+
+func Test_getChartIcon(t *testing.T) {
+	tests := []struct {
+		name     string
+		err      error
+		chart    models.Chart
+		wantCode int
+	}{
+		{
+			"chart does not exist",
+			mongo.ErrNoDocuments,
+			models.Chart{ID: "my-repo/my-chart"},
+			http.StatusNotFound,
+		},
+		{
+			"chart has icon",
+			nil,
+			models.Chart{ID: "my-repo/my-chart", RawIcon: iconBytes(), IconContentType: "image/png"},
+			http.StatusOK,
+		},
+		{
+			"chart does not have a icon",
+			nil,
+			models.Chart{ID: "my-repo/my-chart"},
+			http.StatusNotFound,
+		},
+		{
+			"chart has icon with custom type",
+			nil,
+			models.Chart{ID: "my-repo/my-chart", RawIcon: iconBytes(), IconContentType: "image/svg"},
+			http.StatusOK,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var m mock.Mock
+			dbClient = datastore.NewMockClient(&m)
+			db, _ = dbClient.Database("test")
+
+			if tt.err != nil {
+				m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tt.err)
+			} else {
+				m.On("FindOne", mock.Anything, mock.Anything, &models.Chart{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
+					*args.Get(2).(*models.Chart) = tt.chart
+				})
+			}
+
+			w := httptest.NewRecorder()
+			req := httptest.NewRequest("GET", "/assets/"+tt.chart.ID+"/logo", nil)
+			parts := strings.Split(tt.chart.ID, "/")
+			params := Params{
+				"repo":      parts[0],
+				"chartName": parts[1],
+			}
+
+			GetChartIcon(w, req, params)
+
+			m.AssertExpectations(t)
+			assert.Equal(t, tt.wantCode, w.Code, "http status code should match")
+			if tt.wantCode == http.StatusOK {
+				assert.Equal(t, w.Body.Bytes(), tt.chart.RawIcon, "raw icon data should match")
+				assert.Equal(t, w.Header().Get("Content-Type"), tt.chart.IconContentType, "icon content type should match")
+			}
+		})
+	}
+}
+
+func Test_getChartVersionReadme(t *testing.T) {
+	tests := []struct {
+		name     string
+		version  string
+		err      error
+		files    models.ChartFiles
+		wantCode int
+	}{
+		{
+			"chart does not exist",
+			"0.1.0",
+			mongo.ErrNoDocuments,
+			models.ChartFiles{ID: "my-repo/my-chart"},
+			http.StatusNotFound,
+		},
+		{
+			"chart exists",
+			"1.2.3",
+			nil,
+			models.ChartFiles{ID: "my-repo/my-chart", Readme: testChartReadme},
+			http.StatusOK,
+		},
+		{
+			"chart does not have a readme",
+			"1.1.1",
+			nil,
+			models.ChartFiles{ID: "my-repo/my-chart"},
+			http.StatusNotFound,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var m mock.Mock
+			dbClient = datastore.NewMockClient(&m)
+			db, _ = dbClient.Database("test")
+
+			if tt.err != nil {
+				m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tt.err)
+			} else {
+				m.On("FindOne", mock.Anything, mock.Anything, &models.ChartFiles{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
+					*args.Get(2).(*models.ChartFiles) = tt.files
+				})
+			}
+
+			w := httptest.NewRecorder()
+			req := httptest.NewRequest("GET", "/assets/"+tt.files.ID+"/versions/"+tt.version+"/README.md", nil)
+			parts := strings.Split(tt.files.ID, "/")
+			params := Params{
+				"repo":      parts[0],
+				"chartName": parts[1],
+				"version":   "0.1.0",
+			}
+
+			GetChartVersionReadme(w, req, params)
+
+			m.AssertExpectations(t)
+			assert.Equal(t, tt.wantCode, w.Code, "http status code should match")
+			if tt.wantCode == http.StatusOK {
+				assert.Equal(t, string(w.Body.Bytes()), tt.files.Readme, "content of the readme should match")
+			}
+		})
+	}
+}
+
+func Test_getChartVersionValues(t *testing.T) {
+	tests := []struct {
+		name     string
+		version  string
+		err      error
+		files    models.ChartFiles
+		wantCode int
+	}{
+		{
+			"chart does not exist",
+			"0.1.0",
+			mongo.ErrNoDocuments,
+			models.ChartFiles{ID: "my-repo/my-chart"},
+			http.StatusNotFound,
+		},
+		{
+			"chart exists",
+			"3.2.1",
+			nil,
+			models.ChartFiles{ID: "my-repo/my-chart", Values: testChartValues},
+			http.StatusOK,
+		},
+		{
+			"chart does not have values.yaml",
+			"2.2.2",
+			nil,
+			models.ChartFiles{ID: "my-repo/my-chart"},
+			http.StatusOK,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var m mock.Mock
+			dbClient = datastore.NewMockClient(&m)
+			db, _ = dbClient.Database("test")
+
+			if tt.err != nil {
+				m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tt.err)
+			} else {
+				m.On("FindOne", mock.Anything, mock.Anything, &models.ChartFiles{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
+					*args.Get(2).(*models.ChartFiles) = tt.files
+				})
+			}
+
+			w := httptest.NewRecorder()
+			req := httptest.NewRequest("GET", "/assets/"+tt.files.ID+"/versions/"+tt.version+"/values.yaml", nil)
+			parts := strings.Split(tt.files.ID, "/")
+			params := Params{
+				"repo":      parts[0],
+				"chartName": parts[1],
+				"version":   "0.1.0",
+			}
+
+			GetChartVersionValues(w, req, params)
+
+			m.AssertExpectations(t)
+			assert.Equal(t, tt.wantCode, w.Code, "http status code should match")
+			if tt.wantCode == http.StatusOK {
+				assert.Equal(t, string(w.Body.Bytes()), tt.files.Values, "content of values.yaml should match")
+			}
+		})
+	}
+}
+
+func Test_findLatestChart(t *testing.T) {
+	t.Run("returns mocked chart", func(t *testing.T) {
+		chart := &models.Chart{
+			Name: "foo",
+			ID:   "foo",
+			Repo: models.Repo{Name: "bar"},
+			ChartVersions: []models.ChartVersion{
+				models.ChartVersion{Version: "1.0.0", AppVersion: "0.1.0"},
+				models.ChartVersion{Version: "0.0.1", AppVersion: "0.1.0"},
+			},
+		}
+		charts := []*models.Chart{chart}
+		reqVersion := "1.0.0"
+		reqAppVersion := "0.1.0"
+
+		var m mock.Mock
+		dbClient = datastore.NewMockClient(&m)
+		db, _ = dbClient.Database("test")
+		var chartsList []*models.Chart
+		m.On("Find", mock.Anything, mock.Anything, &chartsList, mock.Anything).Run(func(args mock.Arguments) {
+			*args.Get(2).(*[]*models.Chart) = charts
+		}).Return(nil)
+
+		w := httptest.NewRecorder()
+		req := httptest.NewRequest("GET", "/charts?name="+chart.Name+"&version="+reqVersion+"&appversion="+reqAppVersion, nil)
+		params := Params{
+			"name":       chart.Name,
+			"version":    reqVersion,
+			"appversion": reqAppVersion,
+		}
+
+		ListChartsWithFilters(w, req, params)
+
+		var b utils.BodyAPIListResponse
+		json.NewDecoder(w.Body).Decode(&b)
+		if b.Data == nil {
+			t.Fatal("chart list shouldn't be null")
+		}
+		data := *b.Data
+
+		if data[0].ID != chart.ID {
+			t.Errorf("Expecting %v, received %v", chart, data[0].ID)
+		}
+	})
+	t.Run("ignores duplicated chart", func(t *testing.T) {
+		charts := []*models.Chart{
+			{Name: "foo", ID: "stable/foo", Repo: models.Repo{Name: "bar"}, ChartVersions: []models.ChartVersion{models.ChartVersion{Version: "1.0.0", AppVersion: "0.1.0", Digest: "123"}}},
+			{Name: "foo", ID: "bitnami/foo", Repo: models.Repo{Name: "bar"}, ChartVersions: []models.ChartVersion{models.ChartVersion{Version: "1.0.0", AppVersion: "0.1.0", Digest: "123"}}},
+		}
+		reqVersion := "1.0.0"
+		reqAppVersion := "0.1.0"
+
+		var m mock.Mock
+		dbClient = datastore.NewMockClient(&m)
+		db, _ = dbClient.Database("test")
+		var chartsList []*models.Chart
+		m.On("Find", mock.Anything, mock.Anything, &chartsList, mock.Anything).Run(func(args mock.Arguments) {
+			*args.Get(2).(*[]*models.Chart) = charts
+		}).Return(nil)
+
+		w := httptest.NewRecorder()
+		req := httptest.NewRequest("GET", "/charts?name="+charts[0].Name+"&version="+reqVersion+"&appversion="+reqAppVersion, nil)
+		params := Params{
+			"name":       charts[0].Name,
+			"version":    reqVersion,
+			"appversion": reqAppVersion,
+		}
+
+		ListChartsWithFilters(w, req, params)
+
+		var b utils.BodyAPIListResponse
+		json.NewDecoder(w.Body).Decode(&b)
+		if b.Data == nil {
+			t.Fatal("chart list shouldn't be null")
+		}
+		data := *b.Data
+
+		assert.Equal(t, len(data), 1, "it should return a single chart")
+		if data[0].ID != charts[0].ID {
+			t.Errorf("Expecting %v, received %v", charts[0], data[0].ID)
+		}
+	})
+	t.Run("includes duplicated charts when showDuplicates param set", func(t *testing.T) {
+		charts := []*models.Chart{
+			{Name: "foo", ID: "stable/foo", Repo: models.Repo{Name: "bar"}, ChartVersions: []models.ChartVersion{models.ChartVersion{Version: "1.0.0", AppVersion: "0.1.0", Digest: "123"}}},
+			{Name: "foo", ID: "bitnami/foo", Repo: models.Repo{Name: "bar"}, ChartVersions: []models.ChartVersion{models.ChartVersion{Version: "1.0.0", AppVersion: "0.1.0", Digest: "123"}}},
+		}
+		reqVersion := "1.0.0"
+		reqAppVersion := "0.1.0"
+
+		var m mock.Mock
+		dbClient = datastore.NewMockClient(&m)
+		db, _ = dbClient.Database("test")
+		var chartsList []*models.Chart
+		m.On("Find", mock.Anything, mock.Anything, &chartsList, mock.Anything).Run(func(args mock.Arguments) {
+			*args.Get(2).(*[]*models.Chart) = charts
+		}).Return(nil)
+
+		w := httptest.NewRecorder()
+		req := httptest.NewRequest("GET", "/charts?showDuplicates=true&name="+charts[0].Name+"&version="+reqVersion+"&appversion="+reqAppVersion, nil)
+		params := Params{
+			"name":       charts[0].Name,
+			"version":    reqVersion,
+			"appversion": reqAppVersion,
+		}
+
+		ListChartsWithFilters(w, req, params)
+
+		var b utils.BodyAPIListResponse
+		json.NewDecoder(w.Body).Decode(&b)
+		if b.Data == nil {
+			t.Fatal("chart list shouldn't be null")
+		}
+		data := *b.Data
+
+		assert.Equal(t, 2, len(data), "it should return both charts")
+	})
+}
diff --git a/src/jetstream/plugins/monocular/chartsvc/main.go b/src/jetstream/plugins/monocular/chartsvc/main.go
index 17791abef9..8e45e0b861 100644
--- a/src/jetstream/plugins/monocular/chartsvc/main.go
+++ b/src/jetstream/plugins/monocular/chartsvc/main.go
@@ -17,23 +17,27 @@ limitations under the License.
 package chartsvc
 
 import (
+	"context"
 	"flag"
 	"net/http"
 	"os"
 
 	"github.com/gorilla/mux"
 	"github.com/heptiolabs/healthcheck"
-	"github.com/kubeapps/common/datastore"
+	mongoDatastore "github.com/kubeapps/common/datastore"
 	log "github.com/sirupsen/logrus"
 	"github.com/urfave/negroni"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
+
+	fdb "github.com/helm/monocular/cmd/chartsvc/foundationdb"
+	fdbDatastore "github.com/helm/monocular/cmd/chartsvc/foundationdb/datastore"
 )
 
 const pathPrefix = "/v1"
 
-var dbSession datastore.Session
-
-// Data store to use (abstratcs from MongoDB)
-var dataStore ChartSvcDatastore
+var client *mongo.Client
+var dbSession mongoDatastore.Session
 
 func setupRoutes() http.Handler {
 	r := mux.NewRouter()
@@ -45,15 +49,24 @@ func setupRoutes() http.Handler {
 
 	// Routes
 	apiv1 := r.PathPrefix(pathPrefix).Subrouter()
-	apiv1.Methods("GET").Path("/charts").Queries("name", "{chartName}", "version", "{version}", "appversion", "{appversion}").Handler(WithParams(listChartsWithFilters))
-	apiv1.Methods("GET").Path("/charts").HandlerFunc(ListCharts)
-	apiv1.Methods("GET").Path("/charts/{repo}").Handler(WithParams(listRepoCharts))
-	apiv1.Methods("GET").Path("/charts/{repo}/{chartName}").Handler(WithParams(getChart))
-	apiv1.Methods("GET").Path("/charts/{repo}/{chartName}/versions").Handler(WithParams(listChartVersions))
-	apiv1.Methods("GET").Path("/charts/{repo}/{chartName}/versions/{version}").Handler(WithParams(getChartVersion))
-	apiv1.Methods("GET").Path("/assets/{repo}/{chartName}/logo-160x160-fit.png").Handler(WithParams(getChartIcon))
-	apiv1.Methods("GET").Path("/assets/{repo}/{chartName}/versions/{version}/README.md").Handler(WithParams(getChartVersionReadme))
-	apiv1.Methods("GET").Path("/assets/{repo}/{chartName}/versions/{version}/values.yaml").Handler(WithParams(getChartVersionValues))
+	apiv1.Methods("GET").Path("/charts").Queries("name", "{chartName}", "version", "{version}", "appversion", "{appversion}").Handler(fdb.WithParams(fdb.ListChartsWithFilters))
+	apiv1.Methods("GET").Path("/charts").Queries("name", "{chartName}", "version", "{version}", "appversion", "{appversion}", "showDuplicates", "{showDuplicates}").Handler(fdb.WithParams(fdb.ListChartsWithFilters))
+	apiv1.Methods("GET").Path("/charts").HandlerFunc(fdb.ListCharts)
+	apiv1.Methods("GET").Path("/charts").Queries("showDuplicates", "{showDuplicates}").HandlerFunc(fdb.ListCharts)
+	apiv1.Methods("GET").Path("/charts/search").Queries("q", "{query}").Handler(fdb.WithParams(fdb.SearchCharts))
+	apiv1.Methods("GET").Path("/charts/search").Queries("q", "{query}", "showDuplicates", "{showDuplicates}").Handler(fdb.WithParams(fdb.SearchCharts))
+	apiv1.Methods("GET").Path("/charts/{repo}").Handler(fdb.WithParams(fdb.ListRepoCharts))
+	apiv1.Methods("GET").Path("/charts/{repo}/search").Queries("q", "{query}").Handler(fdb.WithParams(fdb.SearchCharts))
+	apiv1.Methods("GET").Path("/charts/{repo}/search").Queries("q", "{query}", "showDuplicates", "{showDuplicates}").Handler(fdb.WithParams(fdb.SearchCharts))
+	apiv1.Methods("GET").Path("/charts/{repo}/{chartName}").Handler(fdb.WithParams(fdb.GetChart))
+	apiv1.Methods("GET").Path("/charts/{repo}/{chartName}/versions").Handler(fdb.WithParams(fdb.ListChartVersions))
+	apiv1.Methods("GET").Path("/charts/{repo}/{chartName}/versions/{version}").Handler(fdb.WithParams(fdb.GetChartVersion))
+	apiv1.Methods("GET").Path("/assets/{repo}/{chartName}/logo").Handler(fdb.WithParams(fdb.GetChartIcon))
+	// Maintain the logo-160x160-fit.png endpoint for backward compatibility /assets/{repo}/{chartName}/logo should be used instead
+	apiv1.Methods("GET").Path("/assets/{repo}/{chartName}/logo-160x160-fit.png").Handler(fdb.WithParams(fdb.GetChartIcon))
+	apiv1.Methods("GET").Path("/assets/{repo}/{chartName}/versions/{version}/README.md").Handler(fdb.WithParams(fdb.GetChartVersionReadme))
+	apiv1.Methods("GET").Path("/assets/{repo}/{chartName}/versions/{version}/values.yaml").Handler(fdb.WithParams(fdb.GetChartVersionValues))
+	apiv1.Methods("GET").Path("/assets/{repo}/{chartName}/versions/{version}/values.schema.json").Handler(fdb.WithParams(fdb.GetChartVersionSchema))
 
 	n := negroni.Classic()
 	n.UseHandler(r)
@@ -61,19 +74,21 @@ func setupRoutes() http.Handler {
 }
 
 func main() {
-	dbURL := flag.String("mongo-url", "localhost", "MongoDB URL (see https://godoc.org/github.com/globalsign/mgo#Dial for format)")
-	dbName := flag.String("mongo-database", "charts", "MongoDB database")
-	dbUsername := flag.String("mongo-user", "", "MongoDB user")
-	dbPassword := os.Getenv("MONGO_PASSWORD")
+
+	debug := flag.Bool("debug", false, "Debug Logging")
+
+	//Flags for optional FoundationDB + Document Layer backend
+	fdbURL := flag.String("doclayer-url", "mongodb://fdb-service/27016", "FoundationDB Document Layer URL")
+	fDB := flag.String("doclayer-database", "charts", "FoundationDB Document-Layer database")
+
 	flag.Parse()
 
-	mongoConfig := datastore.Config{URL: *dbURL, Database: *dbName, Username: *dbUsername, Password: dbPassword}
-	var err error
-	dbSession, err = datastore.NewSession(mongoConfig)
-	if err != nil {
-		log.WithFields(log.Fields{"host": *dbURL}).Fatal(err)
+	if *debug {
+		log.SetLevel(log.DebugLevel)
 	}
 
+	initFDBDocLayerConnection(fdbURL, fDB, debug)
+
 	n := setupRoutes()
 
 	port := os.Getenv("PORT")
@@ -85,21 +100,18 @@ func main() {
 	http.ListenAndServe(addr, n)
 }
 
-// Stratos addition to chartsvc main.go
+func initFDBDocLayerConnection(fdbURL *string, fDB *string, debug *bool) {
 
-// SetMongoConfig allosws Stratos plugin to configure MongoDB
-func SetMongoConfig(dbURL, dbName, dbUsername *string, dbPassword string) (datastore.Session, error) {
-	var err error
-	mongoConfig := datastore.Config{URL: *dbURL, Database: *dbName, Username: *dbUsername, Password: dbPassword}
-	dbSession, err = datastore.NewSession(mongoConfig)
-	return dbSession, err
-}
+	log.Debugf("Attempting to connect to FDB: %v, %v, debug: %v", *fdbURL, *fDB, *debug)
 
-// GetRoutes exposes the HTTP routes for the Chart Service API
-func GetRoutes() http.Handler {
-	return setupRoutes()
-}
+	clientOptions := options.Client().ApplyURI(*fdbURL)
+	client, err := fdbDatastore.NewDocLayerClient(context.Background(), clientOptions)
+	if err != nil {
+		log.Fatalf("Can't create client for FoundationDB document layer: %v", err)
+		return
+	}
+	log.Debugf("FDB Document Layer client created.")
 
-func SetStore(store ChartSvcDatastore) {
-	dataStore = store
+	fdb.InitDBConfig(client, *fDB)
+	fdb.SetPathPrefix(pathPrefix)
 }
diff --git a/src/jetstream/plugins/monocular/chartsvc/main_test.go b/src/jetstream/plugins/monocular/chartsvc/main_test.go
index 2ae0ad514d..3beeabcc82 100644
--- a/src/jetstream/plugins/monocular/chartsvc/main_test.go
+++ b/src/jetstream/plugins/monocular/chartsvc/main_test.go
@@ -23,16 +23,25 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/helm/monocular/chartsvc/models"
-	"github.com/kubeapps/common/datastore/mockstore"
+	fdb "github.com/helm/monocular/cmd/chartsvc/foundationdb"
+	datastore "github.com/helm/monocular/cmd/chartsvc/foundationdb/datastore"
+	"github.com/helm/monocular/cmd/chartsvc/models"
+	"github.com/helm/monocular/cmd/chartsvc/utils"
+	"go.mongodb.org/mongo-driver/mongo"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )
 
+var dbType string = "mongodb"
+
+const testChartSchema = `{"properties": {"type": "object"}}`
+
 // tests the GET /live endpoint
 func Test_GetLive(t *testing.T) {
 	var m mock.Mock
-	dbSession = mockstore.NewMockSession(&m)
+	dbClient := datastore.NewMockClient(&m)
+	fdb.InitDBConfig(dbClient, "test")
 
 	ts := httptest.NewServer(setupRoutes())
 	defer ts.Close()
@@ -46,7 +55,8 @@ func Test_GetLive(t *testing.T) {
 // tests the GET /ready endpoint
 func Test_GetReady(t *testing.T) {
 	var m mock.Mock
-	dbSession = mockstore.NewMockSession(&m)
+	dbClient := datastore.NewMockClient(&m)
+	fdb.InitDBConfig(dbClient, "test")
 
 	ts := httptest.NewServer(setupRoutes())
 	defer ts.Close()
@@ -79,9 +89,11 @@ func Test_GetCharts(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			var m mock.Mock
-			dbSession = mockstore.NewMockSession(&m)
-			m.On("All", &chartsList).Run(func(args mock.Arguments) {
-				*args.Get(0).(*[]*models.Chart) = tt.charts
+			dbClient := datastore.NewMockClient(&m)
+			fdb.InitDBConfig(dbClient, "test")
+
+			m.On("Find", mock.Anything, mock.Anything, &utils.ChartsList, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
+				*args.Get(2).(*[]*models.Chart) = tt.charts
 			})
 
 			res, err := http.Get(ts.URL + pathPrefix + "/charts")
@@ -91,7 +103,7 @@ func Test_GetCharts(t *testing.T) {
 			m.AssertExpectations(t)
 			assert.Equal(t, res.StatusCode, http.StatusOK, "http status code should match")
 
-			var b bodyAPIListResponse
+			var b utils.BodyAPIListResponse
 			json.NewDecoder(res.Body).Decode(&b)
 			assert.Len(t, *b.Data, len(tt.charts))
 		})
@@ -121,11 +133,12 @@ func Test_GetChartsInRepo(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			var m mock.Mock
-			dbSession = mockstore.NewMockSession(&m)
-			m.On("All", &chartsList).Run(func(args mock.Arguments) {
-				*args.Get(0).(*[]*models.Chart) = tt.charts
-			})
+			dbClient := datastore.NewMockClient(&m)
+			fdb.InitDBConfig(dbClient, "test")
 
+			m.On("Find", mock.Anything, mock.Anything, &utils.ChartsList, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
+				*args.Get(2).(*[]*models.Chart) = tt.charts
+			})
 			res, err := http.Get(ts.URL + pathPrefix + "/charts/" + tt.repo)
 			assert.NoError(t, err)
 			defer res.Body.Close()
@@ -133,7 +146,7 @@ func Test_GetChartsInRepo(t *testing.T) {
 			m.AssertExpectations(t)
 			assert.Equal(t, res.StatusCode, http.StatusOK, "http status code should match")
 
-			var b bodyAPIListResponse
+			var b utils.BodyAPIListResponse
 			json.NewDecoder(res.Body).Decode(&b)
 			assert.Len(t, *b.Data, len(tt.charts))
 		})
@@ -174,12 +187,13 @@ func Test_GetChartInRepo(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			var m mock.Mock
-			dbSession = mockstore.NewMockSession(&m)
+			dbClient := datastore.NewMockClient(&m)
+			fdb.InitDBConfig(dbClient, "test")
 			if tt.err != nil {
-				m.On("One", mock.Anything).Return(tt.err)
+				m.On("FindOne", mock.Anything, mock.Anything, &models.Chart{}, mock.Anything).Return(mongo.ErrNoDocuments)
 			} else {
-				m.On("One", &models.Chart{}).Return(nil).Run(func(args mock.Arguments) {
-					*args.Get(0).(*models.Chart) = tt.chart
+				m.On("FindOne", mock.Anything, mock.Anything, &models.Chart{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
+					*args.Get(2).(*models.Chart) = tt.chart
 				})
 			}
 
@@ -188,7 +202,7 @@ func Test_GetChartInRepo(t *testing.T) {
 			defer res.Body.Close()
 
 			m.AssertExpectations(t)
-			assert.Equal(t, res.StatusCode, tt.wantCode, "http status code should match")
+			assert.Equal(t, tt.wantCode, res.StatusCode, "http status code should match")
 		})
 	}
 }
@@ -227,12 +241,13 @@ func Test_ListChartVersions(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			var m mock.Mock
-			dbSession = mockstore.NewMockSession(&m)
+			dbClient := datastore.NewMockClient(&m)
+			fdb.InitDBConfig(dbClient, "test")
 			if tt.err != nil {
-				m.On("One", mock.Anything).Return(tt.err)
+				m.On("FindOne", mock.Anything, mock.Anything, &models.Chart{}, mock.Anything).Return(mongo.ErrNoDocuments)
 			} else {
-				m.On("One", &models.Chart{}).Return(nil).Run(func(args mock.Arguments) {
-					*args.Get(0).(*models.Chart) = tt.chart
+				m.On("FindOne", mock.Anything, mock.Anything, &models.Chart{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
+					*args.Get(2).(*models.Chart) = tt.chart
 				})
 			}
 
@@ -241,7 +256,7 @@ func Test_ListChartVersions(t *testing.T) {
 			defer res.Body.Close()
 
 			m.AssertExpectations(t)
-			assert.Equal(t, res.StatusCode, tt.wantCode, "http status code should match")
+			assert.Equal(t, tt.wantCode, res.StatusCode, "http status code should match")
 		})
 	}
 }
@@ -280,12 +295,13 @@ func Test_GetChartVersion(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			var m mock.Mock
-			dbSession = mockstore.NewMockSession(&m)
+			dbClient := datastore.NewMockClient(&m)
+			fdb.InitDBConfig(dbClient, "test")
 			if tt.err != nil {
-				m.On("One", mock.Anything).Return(tt.err)
+				m.On("FindOne", mock.Anything, mock.Anything, &models.Chart{}, mock.Anything).Return(mongo.ErrNoDocuments)
 			} else {
-				m.On("One", &models.Chart{}).Return(nil).Run(func(args mock.Arguments) {
-					*args.Get(0).(*models.Chart) = tt.chart
+				m.On("FindOne", mock.Anything, mock.Anything, &models.Chart{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
+					*args.Get(2).(*models.Chart) = tt.chart
 				})
 			}
 
@@ -319,7 +335,7 @@ func Test_GetChartIcon(t *testing.T) {
 		{
 			"chart has icon",
 			nil,
-			models.Chart{ID: "my-repo/my-chart", RawIcon: iconBytes()},
+			models.Chart{ID: "my-repo/my-chart", RawIcon: utils.IconBytes()},
 			http.StatusOK,
 		},
 		{
@@ -333,21 +349,22 @@ func Test_GetChartIcon(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			var m mock.Mock
-			dbSession = mockstore.NewMockSession(&m)
+			dbClient := datastore.NewMockClient(&m)
+			fdb.InitDBConfig(dbClient, "test")
 			if tt.err != nil {
-				m.On("One", mock.Anything).Return(tt.err)
+				m.On("FindOne", mock.Anything, mock.Anything, &models.Chart{}, mock.Anything).Return(mongo.ErrNoDocuments)
 			} else {
-				m.On("One", &models.Chart{}).Return(nil).Run(func(args mock.Arguments) {
-					*args.Get(0).(*models.Chart) = tt.chart
+				m.On("FindOne", mock.Anything, mock.Anything, &models.Chart{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
+					*args.Get(2).(*models.Chart) = tt.chart
 				})
 			}
 
-			res, err := http.Get(ts.URL + pathPrefix + "/assets/" + tt.chart.ID + "/logo-160x160-fit.png")
+			res, err := http.Get(ts.URL + pathPrefix + "/assets/" + tt.chart.ID + "/logo")
 			assert.NoError(t, err)
 			defer res.Body.Close()
 
 			m.AssertExpectations(t)
-			assert.Equal(t, res.StatusCode, tt.wantCode, "http status code should match")
+			assert.Equal(t, tt.wantCode, res.StatusCode, "http status code should match")
 		})
 	}
 }
@@ -375,7 +392,7 @@ func Test_GetChartReadme(t *testing.T) {
 			"chart exists",
 			"1.2.3",
 			nil,
-			models.ChartFiles{ID: "my-repo/my-chart", Readme: testChartReadme},
+			models.ChartFiles{ID: "my-repo/my-chart", Readme: utils.TestChartReadme},
 			http.StatusOK,
 		},
 		{
@@ -390,12 +407,13 @@ func Test_GetChartReadme(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			var m mock.Mock
-			dbSession = mockstore.NewMockSession(&m)
+			dbClient := datastore.NewMockClient(&m)
+			fdb.InitDBConfig(dbClient, "test")
 			if tt.err != nil {
-				m.On("One", mock.Anything).Return(tt.err)
+				m.On("FindOne", mock.Anything, mock.Anything, &models.ChartFiles{}, mock.Anything).Return(mongo.ErrNoDocuments)
 			} else {
-				m.On("One", &models.ChartFiles{}).Return(nil).Run(func(args mock.Arguments) {
-					*args.Get(0).(*models.ChartFiles) = tt.files
+				m.On("FindOne", mock.Anything, mock.Anything, &models.ChartFiles{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
+					*args.Get(2).(*models.ChartFiles) = tt.files
 				})
 			}
 
@@ -432,7 +450,7 @@ func Test_GetChartValues(t *testing.T) {
 			"chart exists",
 			"3.2.1",
 			nil,
-			models.ChartFiles{ID: "my-repo/my-chart", Values: testChartValues},
+			models.ChartFiles{ID: "my-repo/my-chart", Values: utils.TestChartValues},
 			http.StatusOK,
 		},
 		{
@@ -447,12 +465,13 @@ func Test_GetChartValues(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			var m mock.Mock
-			dbSession = mockstore.NewMockSession(&m)
+			dbClient := datastore.NewMockClient(&m)
+			fdb.InitDBConfig(dbClient, "test")
 			if tt.err != nil {
-				m.On("One", mock.Anything).Return(tt.err)
+				m.On("FindOne", mock.Anything, mock.Anything, &models.ChartFiles{}, mock.Anything).Return(mongo.ErrNoDocuments)
 			} else {
-				m.On("One", &models.ChartFiles{}).Return(nil).Run(func(args mock.Arguments) {
-					*args.Get(0).(*models.ChartFiles) = tt.files
+				m.On("FindOne", mock.Anything, mock.Anything, &models.ChartFiles{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
+					*args.Get(2).(*models.ChartFiles) = tt.files
 				})
 			}
 
@@ -465,3 +484,61 @@ func Test_GetChartValues(t *testing.T) {
 		})
 	}
 }
+
+// tests the GET /{apiVersion}/assets/{repo}/{chartName}/versions/{version}/values/schema.json endpoint
+func Test_GetChartSchema(t *testing.T) {
+	ts := httptest.NewServer(setupRoutes())
+	defer ts.Close()
+
+	tests := []struct {
+		name     string
+		version  string
+		err      error
+		files    models.ChartFiles
+		wantCode int
+	}{
+		{
+			"chart does not exist",
+			"0.1.0",
+			errors.New("return an error when checking if chart exists"),
+			models.ChartFiles{ID: "my-repo/my-chart"},
+			http.StatusNotFound,
+		},
+		{
+			"chart exists",
+			"3.2.1",
+			nil,
+			models.ChartFiles{ID: "my-repo/my-chart", Schema: testChartSchema},
+			http.StatusOK,
+		},
+		{
+			"chart does not have values.schema.json",
+			"2.2.2",
+			nil,
+			models.ChartFiles{ID: "my-repo/my-chart"},
+			http.StatusOK,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var m mock.Mock
+			dbClient := datastore.NewMockClient(&m)
+			fdb.InitDBConfig(dbClient, "test")
+			if tt.err != nil {
+				m.On("FindOne", mock.Anything, mock.Anything, &models.ChartFiles{}, mock.Anything).Return(mongo.ErrNoDocuments)
+			} else {
+				m.On("FindOne", mock.Anything, mock.Anything, &models.ChartFiles{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
+					*args.Get(2).(*models.ChartFiles) = tt.files
+				})
+			}
+
+			res, err := http.Get(ts.URL + pathPrefix + "/assets/" + tt.files.ID + "/versions/" + tt.version + "/values.schema.json")
+			assert.NoError(t, err)
+			defer res.Body.Close()
+
+			m.AssertExpectations(t)
+			assert.Equal(t, res.StatusCode, tt.wantCode, "http status code should match")
+		})
+	}
+}
diff --git a/src/jetstream/plugins/monocular/chartsvc/models/chart.go b/src/jetstream/plugins/monocular/chartsvc/models/chart.go
index f4e981dfbc..b0511f76e2 100644
--- a/src/jetstream/plugins/monocular/chartsvc/models/chart.go
+++ b/src/jetstream/plugins/monocular/chartsvc/models/chart.go
@@ -30,24 +30,20 @@ type Repo struct {
 
 // Chart is a higher-level representation of a chart package
 type Chart struct {
-	ID            string             `json:"" bson:"_id"`
-	Name          string             `json:"name"`
-	Repo          Repo               `json:"repo"`
-	Description   string             `json:"description"`
-	Home          string             `json:"home"`
-	Keywords      []string           `json:"keywords"`
-	Maintainers   []chart.Maintainer `json:"maintainers"`
-	Sources       []string           `json:"sources"`
-	Icon          string             `json:"icon"`
-	RawIcon       []byte             `json:"-" bson:"raw_icon"`
-	ChartVersions []ChartVersion     `json:"chart_versions,omitempty"`
+	ID              string             `json:"-" bson:"_id"`
+	Name            string             `json:"name"`
+	Repo            Repo               `json:"repo"`
+	Description     string             `json:"description"`
+	Home            string             `json:"home"`
+	Keywords        []string           `json:"keywords"`
+	Maintainers     []chart.Maintainer `json:"maintainers"`
+	Sources         []string           `json:"sources"`
+	Icon            string             `json:"icon"`
+	RawIcon         []byte             `json:"-" bson:"raw_icon"`
+	IconContentType string             `json:"-" bson:"icon_content_type,omitempty"`
+	ChartVersions   []ChartVersion     `json:"-"`
 }
 
-// type ChartWithVersions struct {
-// 	Chart
-// 	Versions []ChartVersion `json:"versions"`
-// }
-
 // ChartVersion is a representation of a specific version of a chart
 type ChartVersion struct {
 	Version    string    `json:"version"`
@@ -57,6 +53,7 @@ type ChartVersion struct {
 	URLs       []string  `json:"urls"`
 	Readme     string    `json:"readme" bson:"-"`
 	Values     string    `json:"values" bson:"-"`
+	Schema     string    `json:"schema" bson:"-"`
 }
 
 // ChartFiles holds the README and values for a given chart version
@@ -64,4 +61,5 @@ type ChartFiles struct {
 	ID     string `bson:"_id"`
 	Readme string
 	Values string
+	Schema string
 }
diff --git a/src/jetstream/plugins/monocular/chartsvc/utils/responses.go b/src/jetstream/plugins/monocular/chartsvc/utils/responses.go
new file mode 100644
index 0000000000..00d6c105f2
--- /dev/null
+++ b/src/jetstream/plugins/monocular/chartsvc/utils/responses.go
@@ -0,0 +1,59 @@
+/*
+Copyright (c) 2019 The Helm Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package utils
+
+//BodyAPIListResponse is an API body response in list format including the number of results pages
+type BodyAPIListResponse struct {
+	Data *ApiListResponse `json:"data"`
+	Meta Meta             `json:"meta,omitempty"`
+}
+
+//BodyAPIResponse is an API body response in non-list format
+type BodyAPIResponse struct {
+	Data ApiResponse `json:"data"`
+}
+
+//ApiResponse is an API response in non-list format
+type ApiResponse struct {
+	ID            string      `json:"id"`
+	Type          string      `json:"type"`
+	Attributes    interface{} `json:"attributes"`
+	Links         interface{} `json:"links"`
+	Relationships RelMap      `json:"relationships"`
+}
+
+//ApiListResponse is an API response in list format
+type ApiListResponse []*ApiResponse
+
+//SelfLink the self-referencing URL to a chart in a response
+type SelfLink struct {
+	Self string `json:"self"`
+}
+
+//RelMap maps elements e.g. Charts to other elements of a response e.g. Chart Versions
+type RelMap map[string]Rel
+
+//Rel describes a relationship between element(s) in a response
+type Rel struct {
+	Data  interface{} `json:"data"`
+	Links SelfLink    `json:"links"`
+}
+
+//Meta the number of pages in the response
+type Meta struct {
+	TotalPages int `json:"totalPages"`
+}
diff --git a/src/jetstream/plugins/monocular/chartsvc/utils/testutils.go b/src/jetstream/plugins/monocular/chartsvc/utils/testutils.go
new file mode 100644
index 0000000000..90339a3702
--- /dev/null
+++ b/src/jetstream/plugins/monocular/chartsvc/utils/testutils.go
@@ -0,0 +1,40 @@
+/*
+Copyright (c) 2019 The Helm Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package utils
+
+import (
+	"bytes"
+	"image/color"
+	"github.com/helm/monocular/cmd/chartsvc/models"
+
+	"github.com/disintegration/imaging"
+)
+
+//ChartsList a list of charts used in unit tests
+var ChartsList []*models.Chart
+
+//IconBytes the bytes of a chart icon image used in unit tests
+func IconBytes() []byte {
+	var b bytes.Buffer
+	img := imaging.New(1, 1, color.White)
+	imaging.Encode(&b, img, imaging.PNG)
+	return b.Bytes()
+}
+
+const TestChartReadme = "# Quickstart\n\n```bash\nhelm install my-repo/my-chart\n```"
+const TestChartValues = "image:\n  registry: docker.io\n  repository: my-repo/my-chart\n  tag: 0.1.0"
+const TestChartSchema = `{"properties": {"type": "object"}}`

From c397b89c96fb7c85565e72480b447d65cd4ac40b Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Thu, 5 Dec 2019 19:26:35 +0000
Subject: [PATCH 192/648] Begin modifications after inital merge-in of new
 monocular code

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 ...re.go => 20190307115300_ChartStore.go_bak} |   0
 .../plugins/monocular/chart-repo/Dockerfile   |   2 +-
 .../plugins/monocular/chart-repo/Makefile     |   2 +-
 .../monocular/chart-repo/chart_repo.go        |   4 +-
 .../chart-repo/common/chart_utils.go          |   2 +-
 .../plugins/monocular/chart-repo/datastore.go |  10 +-
 .../plugins/monocular/chart-repo/delete.go    |   4 +-
 .../chart-repo/foundationdb/utils.go          |   4 +-
 .../chart-repo/foundationdb/utils_test.go     |   4 +-
 .../plugins/monocular/chart-repo/go.mod       |  38 ++--
 .../plugins/monocular/chart-repo/go.sum       | 171 +++++++++++++++---
 .../chart-repo/{mongodb.go => mongodb.go_bak} |   0
 .../plugins/monocular/chart-repo/sync.go      |   4 +-
 .../chart-repo/{types.go => types.go_bak}     |   0
 .../chart-repo/{utils.go => utils.go_bak}     |   0
 .../{utils_test.go => utils_test.go_bak}      |   0
 .../chart-repo/{version.go => version.go_bak} |   0
 .../plugins/monocular/chartsvc/Dockerfile     |   2 +-
 .../plugins/monocular/chartsvc/Makefile       |   2 +-
 .../chartsvc/foundationdb/handler.go          |   6 +-
 .../chartsvc/foundationdb/handler_test.go     |   6 +-
 .../plugins/monocular/chartsvc/go.mod         |  36 +++-
 .../plugins/monocular/chartsvc/go.sum         | 127 ++++++++++---
 .../chartsvc/{handler.go => handler.go_bak}   |   0
 .../{handler_test.go => handler_test.go_bak}  |   0
 .../plugins/monocular/chartsvc/main.go        |   4 +-
 .../plugins/monocular/chartsvc/main_test.go   |   8 +-
 .../chartsvc/{mongodb.go => mongodb.go_bak}   |   0
 .../monocular/chartsvc/utils/testutils.go     |   3 +-
 src/jetstream/plugins/monocular/go.mod        |   1 +
 src/jetstream/plugins/monocular/go.sum        |   1 -
 src/jetstream/plugins/monocular/go.sum_bak    | 120 ++++++++++++
 32 files changed, 446 insertions(+), 115 deletions(-)
 rename src/jetstream/plugins/monocular/{20190307115300_ChartStore.go => 20190307115300_ChartStore.go_bak} (100%)
 rename src/jetstream/plugins/monocular/chart-repo/{mongodb.go => mongodb.go_bak} (100%)
 rename src/jetstream/plugins/monocular/chart-repo/{types.go => types.go_bak} (100%)
 rename src/jetstream/plugins/monocular/chart-repo/{utils.go => utils.go_bak} (100%)
 rename src/jetstream/plugins/monocular/chart-repo/{utils_test.go => utils_test.go_bak} (100%)
 rename src/jetstream/plugins/monocular/chart-repo/{version.go => version.go_bak} (100%)
 rename src/jetstream/plugins/monocular/chartsvc/{handler.go => handler.go_bak} (100%)
 rename src/jetstream/plugins/monocular/chartsvc/{handler_test.go => handler_test.go_bak} (100%)
 rename src/jetstream/plugins/monocular/chartsvc/{mongodb.go => mongodb.go_bak} (100%)
 create mode 100644 src/jetstream/plugins/monocular/go.sum_bak

diff --git a/src/jetstream/plugins/monocular/20190307115300_ChartStore.go b/src/jetstream/plugins/monocular/20190307115300_ChartStore.go_bak
similarity index 100%
rename from src/jetstream/plugins/monocular/20190307115300_ChartStore.go
rename to src/jetstream/plugins/monocular/20190307115300_ChartStore.go_bak
diff --git a/src/jetstream/plugins/monocular/chart-repo/Dockerfile b/src/jetstream/plugins/monocular/chart-repo/Dockerfile
index cbbb6a7d67..780bdfa049 100644
--- a/src/jetstream/plugins/monocular/chart-repo/Dockerfile
+++ b/src/jetstream/plugins/monocular/chart-repo/Dockerfile
@@ -2,7 +2,7 @@ FROM golang:1.12 as builder
 COPY . /go/src/github.com/helm/monocular
 WORKDIR /go/src/github.com/helm/monocular
 ARG VERSION
-RUN GO111MODULE=on GOPROXY=https://gocenter.io CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-X main.version=$VERSION" ./cmd/chart-repo
+RUN GO111MODULE=on GOPROXY=https://gocenter.io CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-X main.version=$VERSION" ./chart-repo
 FROM scratch
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=builder /go/src/github.com/helm/monocular/chart-repo /chart-repo
diff --git a/src/jetstream/plugins/monocular/chart-repo/Makefile b/src/jetstream/plugins/monocular/chart-repo/Makefile
index 64ea4ffe4b..771f988c20 100644
--- a/src/jetstream/plugins/monocular/chart-repo/Makefile
+++ b/src/jetstream/plugins/monocular/chart-repo/Makefile
@@ -5,4 +5,4 @@ VERSION ?= $$(git rev-parse HEAD)
 
 docker-build:
 	# We use the context of the root dir
-	docker build --pull --rm -t ${IMAGE_REPO}:${IMAGE_TAG} --build-arg "VERSION=${VERSION}" -f Dockerfile ../../
+	docker build --pull --rm -t ${IMAGE_REPO}:${IMAGE_TAG} --build-arg "VERSION=${VERSION}" -f Dockerfile ../
diff --git a/src/jetstream/plugins/monocular/chart-repo/chart_repo.go b/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
index 151818e099..c87dad751e 100644
--- a/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
+++ b/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartrepo
+package main
 
 import (
 	"os"
 
-	"github.com/helm/monocular/cmd/chart-repo/utils"
+	"github.com/helm/monocular/chartrepo/utils"
 
 	"github.com/spf13/cobra"
 )
diff --git a/src/jetstream/plugins/monocular/chart-repo/common/chart_utils.go b/src/jetstream/plugins/monocular/chart-repo/common/chart_utils.go
index 163b88de17..7aa5d6c097 100644
--- a/src/jetstream/plugins/monocular/chart-repo/common/chart_utils.go
+++ b/src/jetstream/plugins/monocular/chart-repo/common/chart_utils.go
@@ -26,7 +26,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"github.com/helm/monocular/cmd/chart-repo/utils"
+	"github.com/helm/monocular/chartrepo/utils"
 	"net/http"
 	"net/url"
 	"os"
diff --git a/src/jetstream/plugins/monocular/chart-repo/datastore.go b/src/jetstream/plugins/monocular/chart-repo/datastore.go
index 29ab74b533..dbdddc54bd 100644
--- a/src/jetstream/plugins/monocular/chart-repo/datastore.go
+++ b/src/jetstream/plugins/monocular/chart-repo/datastore.go
@@ -1,16 +1,18 @@
-package chartrepo
+package main
 
 import (
 	"bytes"
+
+	"github.com/helm/monocular/chartrepo/common"
 )
 
 type ChartRepoDatastore interface {
 	DeleteRepo(string) error
 
 	// ImportCharts will import all charts - must be for same repo - and remove and charts not in the imported set
-	ImportCharts([]Chart) error
+	ImportCharts([]common.Chart) error
 
-	StoreChartIcon(Chart, bytes.Buffer) error
+	StoreChartIcon(common.Chart, bytes.Buffer) error
 
-	StoreChartFiles(string, ChartFiles) error
+	StoreChartFiles(string, common.ChartFiles) error
 }
diff --git a/src/jetstream/plugins/monocular/chart-repo/delete.go b/src/jetstream/plugins/monocular/chart-repo/delete.go
index 2d2a37d59c..17b1e2dc43 100644
--- a/src/jetstream/plugins/monocular/chart-repo/delete.go
+++ b/src/jetstream/plugins/monocular/chart-repo/delete.go
@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartrepo
+package main
 
 import (
-	"github.com/helm/monocular/cmd/chart-repo/foundationdb"
+	"github.com/helm/monocular/chartrepo/foundationdb"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
index e2a67ea38d..aa8f165060 100644
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
@@ -29,8 +29,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/helm/monocular/cmd/chart-repo/common"
-	"github.com/helm/monocular/cmd/chart-repo/utils"
+	"github.com/helm/monocular/chartrepo/common"
+	"github.com/helm/monocular/chartrepo/utils"
 
 	"github.com/disintegration/imaging"
 	log "github.com/sirupsen/logrus"
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils_test.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils_test.go
index d8c450b133..3cc4f07883 100644
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils_test.go
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils_test.go
@@ -34,8 +34,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/helm/monocular/cmd/chart-repo/common"
-	"github.com/helm/monocular/cmd/chart-repo/utils"
+	"github.com/helm/monocular/chartrepo/common"
+	"github.com/helm/monocular/chartrepo/utils"
 
 	"github.com/arschles/assert"
 	"github.com/disintegration/imaging"
diff --git a/src/jetstream/plugins/monocular/chart-repo/go.mod b/src/jetstream/plugins/monocular/chart-repo/go.mod
index 46ed194b78..c710f48d3d 100644
--- a/src/jetstream/plugins/monocular/chart-repo/go.mod
+++ b/src/jetstream/plugins/monocular/chart-repo/go.mod
@@ -1,24 +1,32 @@
 module github.com/helm/monocular/chartrepo
 
+go 1.12
+
 require (
-	github.com/BurntSushi/toml v0.3.1 // indirect
-	github.com/Masterminds/semver v1.4.2 // indirect
+	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/arschles/assert v1.0.0
 	github.com/cyphar/filepath-securejoin v0.2.2 // indirect
-	github.com/disintegration/imaging v1.6.0
+	github.com/disintegration/imaging v1.6.2
 	github.com/ghodss/yaml v1.0.0
-	github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8
+	github.com/go-stack/stack v1.8.0 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
-	github.com/golang/protobuf v1.2.0 // indirect
-	github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3
-	github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4
+	github.com/golang/snappy v0.0.1 // indirect
+	github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a
 	github.com/pkg/errors v0.8.1 // indirect
-	github.com/sirupsen/logrus v1.3.0
-	github.com/spf13/cobra v0.0.3
-	github.com/spf13/pflag v1.0.3 // indirect
-	github.com/stretchr/testify v1.2.2
-	gopkg.in/yaml.v2 v2.2.2 // indirect
-	k8s.io/apimachinery v0.0.0-20190221093215-450d01ad5771 // indirect
-	k8s.io/client-go v10.0.0+incompatible // indirect
-	k8s.io/helm v2.12.3+incompatible
+	github.com/sirupsen/logrus v1.4.2
+	github.com/spf13/cobra v0.0.5
+	github.com/stretchr/testify v1.4.0
+	github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c // indirect
+	github.com/xdg/stringprep v1.0.0 // indirect
+	go.mongodb.org/mongo-driver v1.1.3
+	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
+	k8s.io/apimachinery v0.0.0-20191203211716-adc6f4cd9e7d // indirect
+	k8s.io/client-go v11.0.0+incompatible // indirect
+	k8s.io/helm v2.16.1+incompatible
+)
+
+replace (
+	github.com/helm/monocular/chartrepo/common => ./common
+	github.com/helm/monocular/chartrepo/foundationdb => ./foundationdb
+	github.com/helm/monocular/chartrepo/utils => ./utils
 )
diff --git a/src/jetstream/plugins/monocular/chart-repo/go.sum b/src/jetstream/plugins/monocular/chart-repo/go.sum
index 5d22ac0f7c..f0df5a7297 100644
--- a/src/jetstream/plugins/monocular/chart-repo/go.sum
+++ b/src/jetstream/plugins/monocular/chart-repo/go.sum
@@ -1,54 +1,169 @@
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc=
-github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
+github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
+github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/arschles/assert v1.0.0 h1:NofQbRhtxcLgP+XoKunA7J6UMJNTqX7xR/19tej8UsA=
 github.com/arschles/assert v1.0.0/go.mod h1:m/u69zW43x0h8dTHcv3JJZljINyEYgBuf5fYJP6WikI=
+github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
+github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
+github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/disintegration/imaging v1.6.0 h1:nVPXRUUQ36Z7MNf0O77UzgnOb1mkMMor7lmJMJXc/mA=
-github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ=
+github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
+github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
+github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
+github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
+github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=
-github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
+github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
+github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
+github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
+github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
+github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
+github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
-github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
+github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3 h1:sHsPfNMAG70QAvKbddQ0uScZCHQoZsT5NykGRCeeeIs=
-github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
+github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
+github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/helm/monocular v1.9.0 h1:jmCzg4mwHLLyL75/5Ekj3aqJs0Hr63fX3+n/hInwZ3U=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a h1:zPPuIq2jAWWPTrGt70eK/BSch+gFAGrNzecsoENgu2o=
+github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
+github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 h1:wdTBUArlqtBYGN2Dd4+zsaFxFH0m4iGCHToW10jPX0k=
-github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
+github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
+github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
-github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
-github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
+github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
+github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
+github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
+github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 h1:00VmoueYNlNz/aHIilyyQz/MHSqGoWJzpFv/HW8xpzI=
-golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
+github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk=
+github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
+github.com/xdg/stringprep v1.0.0 h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0=
+github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
+github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+go.mongodb.org/mongo-driver v1.1.3 h1:++7u8r9adKhGR+I79NfEtYrk2ktjenErXM99PSufIoI=
+go.mongodb.org/mongo-driver v1.1.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
+golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 h1:mKdxBk7AujPs8kU4m80U72y/zjbZ3UcXC7dClwKbUI0=
+golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U=
+golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456 h1:ng0gs1AKnRRuEMZoTLLlbOd+C17zUDepwGQBb/n+JVg=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-k8s.io/apimachinery v0.0.0-20190221093215-450d01ad5771 h1:XMECjVNpkFVT9uY40z07scw8Xtn2mUnkxx8BC3gjwoE=
-k8s.io/apimachinery v0.0.0-20190221093215-450d01ad5771/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
-k8s.io/client-go v10.0.0+incompatible h1:+xQQxwjrcIPWDMJBAS+1G2FNk1McoPnb53xkvcDiDqE=
-k8s.io/client-go v10.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
-k8s.io/helm v2.12.3+incompatible h1:53+OqKezGNWI8QOHzyb+G1y78MuZURHL/yivhRZ8mIY=
-k8s.io/helm v2.12.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
+gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+k8s.io/apimachinery v0.0.0-20191203211716-adc6f4cd9e7d h1:q+OZmYewHJeMCzwpHkXlNTtk5bvaUMPCikKvf77RBlo=
+k8s.io/apimachinery v0.0.0-20191203211716-adc6f4cd9e7d/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg=
+k8s.io/client-go v11.0.0+incompatible h1:LBbX2+lOwY9flffWlJM7f1Ct8V2SRNiMRDFeiwnJo9o=
+k8s.io/client-go v11.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
+k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/helm v2.16.1+incompatible h1:L+k810plJlaGWEw1EszeT4deK8XVaKxac1oGcuB+WDc=
+k8s.io/helm v2.16.1+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
+k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
+k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
+sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
+sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
diff --git a/src/jetstream/plugins/monocular/chart-repo/mongodb.go b/src/jetstream/plugins/monocular/chart-repo/mongodb.go_bak
similarity index 100%
rename from src/jetstream/plugins/monocular/chart-repo/mongodb.go
rename to src/jetstream/plugins/monocular/chart-repo/mongodb.go_bak
diff --git a/src/jetstream/plugins/monocular/chart-repo/sync.go b/src/jetstream/plugins/monocular/chart-repo/sync.go
index 8e7ee31106..5230e78ead 100644
--- a/src/jetstream/plugins/monocular/chart-repo/sync.go
+++ b/src/jetstream/plugins/monocular/chart-repo/sync.go
@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartrepo
+package main
 
 import (
-	"github.com/helm/monocular/cmd/chart-repo/foundationdb"
+	"github.com/helm/monocular/chartrepo/foundationdb"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
diff --git a/src/jetstream/plugins/monocular/chart-repo/types.go b/src/jetstream/plugins/monocular/chart-repo/types.go_bak
similarity index 100%
rename from src/jetstream/plugins/monocular/chart-repo/types.go
rename to src/jetstream/plugins/monocular/chart-repo/types.go_bak
diff --git a/src/jetstream/plugins/monocular/chart-repo/utils.go b/src/jetstream/plugins/monocular/chart-repo/utils.go_bak
similarity index 100%
rename from src/jetstream/plugins/monocular/chart-repo/utils.go
rename to src/jetstream/plugins/monocular/chart-repo/utils.go_bak
diff --git a/src/jetstream/plugins/monocular/chart-repo/utils_test.go b/src/jetstream/plugins/monocular/chart-repo/utils_test.go_bak
similarity index 100%
rename from src/jetstream/plugins/monocular/chart-repo/utils_test.go
rename to src/jetstream/plugins/monocular/chart-repo/utils_test.go_bak
diff --git a/src/jetstream/plugins/monocular/chart-repo/version.go b/src/jetstream/plugins/monocular/chart-repo/version.go_bak
similarity index 100%
rename from src/jetstream/plugins/monocular/chart-repo/version.go
rename to src/jetstream/plugins/monocular/chart-repo/version.go_bak
diff --git a/src/jetstream/plugins/monocular/chartsvc/Dockerfile b/src/jetstream/plugins/monocular/chartsvc/Dockerfile
index 42d494ab88..91222d6bde 100644
--- a/src/jetstream/plugins/monocular/chartsvc/Dockerfile
+++ b/src/jetstream/plugins/monocular/chartsvc/Dockerfile
@@ -1,7 +1,7 @@
 FROM golang:1.12 as builder
 COPY . /go/src/github.com/helm/monocular
 WORKDIR /go/src/github.com/helm/monocular
-RUN GO111MODULE=on GOPROXY=https://gocenter.io CGO_ENABLED=0 go build -a -installsuffix cgo ./cmd/chartsvc
+RUN GO111MODULE=on GOPROXY=https://gocenter.io CGO_ENABLED=0 go build -a -installsuffix cgo ./chartsvc
 FROM scratch
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=builder /go/src/github.com/helm/monocular/chartsvc /chartsvc
diff --git a/src/jetstream/plugins/monocular/chartsvc/Makefile b/src/jetstream/plugins/monocular/chartsvc/Makefile
index 0593b8f3ac..3d70100767 100644
--- a/src/jetstream/plugins/monocular/chartsvc/Makefile
+++ b/src/jetstream/plugins/monocular/chartsvc/Makefile
@@ -3,4 +3,4 @@ IMAGE_TAG ?= latest
 
 docker-build:
 	# We use the context of the root dir
-	docker build --pull --rm -t ${IMAGE_REPO}:${IMAGE_TAG} -f Dockerfile ../../
+	docker build --pull --rm -t ${IMAGE_REPO}:${IMAGE_TAG} -f Dockerfile ../
diff --git a/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go b/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go
index a28d778b95..5aecd66c96 100644
--- a/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go
+++ b/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go
@@ -24,9 +24,9 @@ import (
 	"sort"
 	"strconv"
 
-	"github.com/helm/monocular/cmd/chartsvc/foundationdb/datastore"
-	"github.com/helm/monocular/cmd/chartsvc/models"
-	"github.com/helm/monocular/cmd/chartsvc/utils"
+	"github.com/helm/monocular/chartsvc/foundationdb/datastore"
+	"github.com/helm/monocular/chartsvc/models"
+	"github.com/helm/monocular/chartsvc/utils"
 
 	"github.com/gorilla/mux"
 	"github.com/kubeapps/common/response"
diff --git a/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler_test.go b/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler_test.go
index 2c8eaeedad..2496a16069 100644
--- a/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler_test.go
+++ b/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler_test.go
@@ -26,9 +26,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/helm/monocular/cmd/chartsvc/foundationdb/datastore"
-	"github.com/helm/monocular/cmd/chartsvc/models"
-	"github.com/helm/monocular/cmd/chartsvc/utils"
+	"github.com/helm/monocular/chartsvc/foundationdb/datastore"
+	"github.com/helm/monocular/chartsvc/models"
+	"github.com/helm/monocular/chartsvc/utils"
 
 	"github.com/disintegration/imaging"
 	"github.com/stretchr/testify/assert"
diff --git a/src/jetstream/plugins/monocular/chartsvc/go.mod b/src/jetstream/plugins/monocular/chartsvc/go.mod
index b5d4d61532..902f6e429f 100644
--- a/src/jetstream/plugins/monocular/chartsvc/go.mod
+++ b/src/jetstream/plugins/monocular/chartsvc/go.mod
@@ -1,16 +1,32 @@
 module github.com/helm/monocular/chartsvc
 
+go 1.12
+
 require (
-	github.com/disintegration/imaging v1.6.0
-	github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8
-	github.com/gorilla/mux v1.7.0
-	github.com/helm/monocular v1.4.0
+	github.com/disintegration/imaging v1.6.2
+	github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 // indirect
+	github.com/go-stack/stack v1.8.0 // indirect
+	github.com/golang/snappy v0.0.1 // indirect
+	github.com/gorilla/mux v1.7.3
 	github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40
-	github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4
-	github.com/prometheus/client_golang v0.9.2 // indirect
-	github.com/sirupsen/logrus v1.3.0
-	github.com/stretchr/testify v1.2.2
-	github.com/unrolled/render v1.0.0 // indirect
+	github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/prometheus/client_golang v1.2.1 // indirect
+	github.com/sirupsen/logrus v1.4.2
+	github.com/stretchr/testify v1.4.0
+	github.com/unrolled/render v1.0.1 // indirect
 	github.com/urfave/negroni v1.0.0
-	k8s.io/helm v2.12.3+incompatible
+	github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c // indirect
+	github.com/xdg/stringprep v1.0.0 // indirect
+	go.mongodb.org/mongo-driver v1.1.3
+	golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9 // indirect
+	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
+	k8s.io/helm v2.16.1+incompatible
+)
+
+replace (
+	github.com/helm/monocular/chartsvc/foundationdb => ./foundationdb
+	github.com/helm/monocular/chartsvc/models => ./models
+	github.com/helm/monocular/chartsvc/utils => ./utils
 )
diff --git a/src/jetstream/plugins/monocular/chartsvc/go.sum b/src/jetstream/plugins/monocular/chartsvc/go.sum
index 2b1a44c353..1cae9ef8fe 100644
--- a/src/jetstream/plugins/monocular/chartsvc/go.sum
+++ b/src/jetstream/plugins/monocular/chartsvc/go.sum
@@ -1,51 +1,120 @@
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/cespare/xxhash/v2 v2.1.0 h1:yTUvW7Vhb89inJ+8irsUqiWjh8iT6sQPZiQzI6ReGkA=
+github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/disintegration/imaging v1.6.0 h1:nVPXRUUQ36Z7MNf0O77UzgnOb1mkMMor7lmJMJXc/mA=
-github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ=
+github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
+github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
+github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
-github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U=
-github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-github.com/helm/monocular v1.4.0 h1:g0sOpuMe+9u+aPfd9ZO8mWV+c8W0dfGyBG9Wl23nwec=
-github.com/helm/monocular v1.4.0/go.mod h1:PpkCN0v4zVVigsIHnsQdJytKFmaUkwfhxB7z33a9/gE=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
+github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
+github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40 h1:GT4RsKmHh1uZyhmTkWJTDALRjSHYQp6FRKrotf0zhAs=
 github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40/go.mod h1:NtmN9h8vrTveVQRLHcX2HQ5wIPBDCsZ351TGbZWgg38=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 h1:wdTBUArlqtBYGN2Dd4+zsaFxFH0m4iGCHToW10jPX0k=
-github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a h1:VqeX/fehAB6FtBox0TVYcjOMXGE56INQIfbXegditX4=
+github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=
-github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.2.1 h1:JnMpQc6ppsNgw9QPAGF6Dod479itz7lvlsMzzNayLOI=
+github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8=
-github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
-github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE=
-github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
-github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.7.0 h1:L+1lyG48J1zAQXA3RBX/nG/B3gjlHq0zTt2tlbJLyCY=
+github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8=
+github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/unrolled/render v1.0.0 h1:XYtvhA3UkpB7PqkvhUFYmpKD55OudoIeygcfus4vcd4=
-github.com/unrolled/render v1.0.0/go.mod h1:tu82oB5W2ykJRVioYsB+IQKcft7ryBr7w12qMBUPyXg=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/unrolled/render v1.0.1 h1:VDDnQQVfBMsOsp3VaCJszSO0nkBIVEYoPWeRThk9spY=
+github.com/unrolled/render v1.0.1/go.mod h1:gN9T0NhL4Bfbwu8ann7Ry/TGHYfosul+J0obPf6NBdM=
 github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I=
+github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk=
+github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
+github.com/xdg/stringprep v1.0.0 h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0=
+github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
+go.mongodb.org/mongo-driver v1.1.3 h1:++7u8r9adKhGR+I79NfEtYrk2ktjenErXM99PSufIoI=
+go.mongodb.org/mongo-driver v1.1.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 h1:00VmoueYNlNz/aHIilyyQz/MHSqGoWJzpFv/HW8xpzI=
-golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
-golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9 h1:abxekknhS/Drh3uoQDk5Hc7BgeiyI39Crb7vhf/1j5s=
+golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U=
+golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-k8s.io/helm v2.12.3+incompatible h1:wo1cdYjOnr5Z+LFuhtwIJaeQnec6D4gcg2H5UAKzY6w=
-k8s.io/helm v2.12.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191010194322-b09406accb47 h1:/XfQ9z7ib8eEJX2hdgFTZJ/ntt0swNk5oYBziWeTCvY=
+golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+k8s.io/helm v2.16.1+incompatible h1:L+k810plJlaGWEw1EszeT4deK8XVaKxac1oGcuB+WDc=
+k8s.io/helm v2.16.1+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
diff --git a/src/jetstream/plugins/monocular/chartsvc/handler.go b/src/jetstream/plugins/monocular/chartsvc/handler.go_bak
similarity index 100%
rename from src/jetstream/plugins/monocular/chartsvc/handler.go
rename to src/jetstream/plugins/monocular/chartsvc/handler.go_bak
diff --git a/src/jetstream/plugins/monocular/chartsvc/handler_test.go b/src/jetstream/plugins/monocular/chartsvc/handler_test.go_bak
similarity index 100%
rename from src/jetstream/plugins/monocular/chartsvc/handler_test.go
rename to src/jetstream/plugins/monocular/chartsvc/handler_test.go_bak
diff --git a/src/jetstream/plugins/monocular/chartsvc/main.go b/src/jetstream/plugins/monocular/chartsvc/main.go
index 8e45e0b861..8f9a1e491c 100644
--- a/src/jetstream/plugins/monocular/chartsvc/main.go
+++ b/src/jetstream/plugins/monocular/chartsvc/main.go
@@ -30,8 +30,8 @@ import (
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 
-	fdb "github.com/helm/monocular/cmd/chartsvc/foundationdb"
-	fdbDatastore "github.com/helm/monocular/cmd/chartsvc/foundationdb/datastore"
+	fdb "github.com/helm/monocular/chartsvc/foundationdb"
+	fdbDatastore "github.com/helm/monocular/chartsvc/foundationdb/datastore"
 )
 
 const pathPrefix = "/v1"
diff --git a/src/jetstream/plugins/monocular/chartsvc/main_test.go b/src/jetstream/plugins/monocular/chartsvc/main_test.go
index 3beeabcc82..9ff6b0bcea 100644
--- a/src/jetstream/plugins/monocular/chartsvc/main_test.go
+++ b/src/jetstream/plugins/monocular/chartsvc/main_test.go
@@ -23,10 +23,10 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	fdb "github.com/helm/monocular/cmd/chartsvc/foundationdb"
-	datastore "github.com/helm/monocular/cmd/chartsvc/foundationdb/datastore"
-	"github.com/helm/monocular/cmd/chartsvc/models"
-	"github.com/helm/monocular/cmd/chartsvc/utils"
+	fdb "github.com/helm/monocular/chartsvc/foundationdb"
+	datastore "github.com/helm/monocular/chartsvc/foundationdb/datastore"
+	"github.com/helm/monocular/chartsvc/models"
+	"github.com/helm/monocular/chartsvc/utils"
 	"go.mongodb.org/mongo-driver/mongo"
 
 	"github.com/stretchr/testify/assert"
diff --git a/src/jetstream/plugins/monocular/chartsvc/mongodb.go b/src/jetstream/plugins/monocular/chartsvc/mongodb.go_bak
similarity index 100%
rename from src/jetstream/plugins/monocular/chartsvc/mongodb.go
rename to src/jetstream/plugins/monocular/chartsvc/mongodb.go_bak
diff --git a/src/jetstream/plugins/monocular/chartsvc/utils/testutils.go b/src/jetstream/plugins/monocular/chartsvc/utils/testutils.go
index 90339a3702..4014887a8f 100644
--- a/src/jetstream/plugins/monocular/chartsvc/utils/testutils.go
+++ b/src/jetstream/plugins/monocular/chartsvc/utils/testutils.go
@@ -19,7 +19,8 @@ package utils
 import (
 	"bytes"
 	"image/color"
-	"github.com/helm/monocular/cmd/chartsvc/models"
+
+	"github.com/helm/monocular/chartsvc/models"
 
 	"github.com/disintegration/imaging"
 )
diff --git a/src/jetstream/plugins/monocular/go.mod b/src/jetstream/plugins/monocular/go.mod
index df993a48ac..bf5760305d 100644
--- a/src/jetstream/plugins/monocular/go.mod
+++ b/src/jetstream/plugins/monocular/go.mod
@@ -19,6 +19,7 @@ require (
 )
 
 replace (
+	github.com/cloudfoundry-incubator/stratos => ../../../..
 	github.com/cloudfoundry-incubator/stratos/src/jetstream => ../..
 	github.com/helm/monocular/chartrepo => ./chart-repo
 	github.com/helm/monocular/chartsvc => ./chartsvc
diff --git a/src/jetstream/plugins/monocular/go.sum b/src/jetstream/plugins/monocular/go.sum
index cfa2ec9c01..e31f024235 100644
--- a/src/jetstream/plugins/monocular/go.sum
+++ b/src/jetstream/plugins/monocular/go.sum
@@ -9,7 +9,6 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLM
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/cloudfoundry-community/go-cfenv v1.17.0 h1:qfxEfn8qKkaHY3ZEk/Y2noY79HBASvNgmtHK9x4+6GY=
 github.com/cloudfoundry-community/go-cfenv v1.17.0/go.mod h1:2UgWvQTRXUuIZ/x3KnW6fk6CgPBhcV4UQb/UGIrUyyI=
-github.com/cloudfoundry-incubator/stratos v2.0.0-beta-001+incompatible h1:UUxNbLjhv2cfymub5yNN1tjjqYkteHBBagb4jcbXEIQ=
 github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
diff --git a/src/jetstream/plugins/monocular/go.sum_bak b/src/jetstream/plugins/monocular/go.sum_bak
new file mode 100644
index 0000000000..cfa2ec9c01
--- /dev/null
+++ b/src/jetstream/plugins/monocular/go.sum_bak
@@ -0,0 +1,120 @@
+bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c h1:bkb2NMGo3/Du52wvYj9Whth5KZfMV6d3O0Vbr3nz/UE=
+bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c/go.mod h1:hSVuE3qU7grINVSwrmzHfpg9k87ALBk+XaualNyUzI4=
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc=
+github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/arschles/assert v1.0.0/go.mod h1:m/u69zW43x0h8dTHcv3JJZljINyEYgBuf5fYJP6WikI=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/cloudfoundry-community/go-cfenv v1.17.0 h1:qfxEfn8qKkaHY3ZEk/Y2noY79HBASvNgmtHK9x4+6GY=
+github.com/cloudfoundry-community/go-cfenv v1.17.0/go.mod h1:2UgWvQTRXUuIZ/x3KnW6fk6CgPBhcV4UQb/UGIrUyyI=
+github.com/cloudfoundry-incubator/stratos v2.0.0-beta-001+incompatible h1:UUxNbLjhv2cfymub5yNN1tjjqYkteHBBagb4jcbXEIQ=
+github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=
+github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/disintegration/imaging v1.6.0 h1:nVPXRUUQ36Z7MNf0O77UzgnOb1mkMMor7lmJMJXc/mA=
+github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ=
+github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=
+github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
+github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
+github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
+github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
+github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
+github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U=
+github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
+github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
+github.com/gorilla/sessions v1.1.3 h1:uXoZdcdA5XdXF3QzuSlheVRUvjl+1rKY7zBXL68L9RU=
+github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
+github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
+github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/govau/cf-common v0.0.7 h1:uhp1P6XM6GGzu1+A4C7LELLX/9mCmH6W5DpJZC0kWmo=
+github.com/govau/cf-common v0.0.7/go.mod h1:5xL/OfE7wxeyHlXb7iei0rAbdQ/5v6dF18BZknPv7NQ=
+github.com/helm/monocular v1.4.0 h1:g0sOpuMe+9u+aPfd9ZO8mWV+c8W0dfGyBG9Wl23nwec=
+github.com/helm/monocular v1.4.0/go.mod h1:PpkCN0v4zVVigsIHnsQdJytKFmaUkwfhxB7z33a9/gE=
+github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40 h1:GT4RsKmHh1uZyhmTkWJTDALRjSHYQp6FRKrotf0zhAs=
+github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40/go.mod h1:NtmN9h8vrTveVQRLHcX2HQ5wIPBDCsZ351TGbZWgg38=
+github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3 h1:sHsPfNMAG70QAvKbddQ0uScZCHQoZsT5NykGRCeeeIs=
+github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 h1:wdTBUArlqtBYGN2Dd4+zsaFxFH0m4iGCHToW10jPX0k=
+github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
+github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28 h1:mkl3tvPHIuPaWsLtmHTybJeoVEW7cbePK73Ir8VtruA=
+github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28/go.mod h1:T/T7jsxVqf9k/zYOqbgNAsANsjxTd1Yq3htjDhQ1H0c=
+github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8bbnE7CX5OEgg=
+github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s=
+github.com/labstack/gommon v0.2.8 h1:JvRqmeZcfrHC5u6uVleB4NxxNbzx6gpbJiQknDbKQu0=
+github.com/labstack/gommon v0.2.8/go.mod h1:/tj9csK2iPSBvn+3NLM9e52usepMtrd5ilFYA+wQNJ4=
+github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
+github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg=
+github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
+github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.6 h1:SrwhHcpV4nWrMGdNcC2kXpMfcBVYGDuTArqyhocJgvA=
+github.com/mattn/go-isatty v0.0.6/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
+github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=
+github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8=
+github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE=
+github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
+github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
+github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
+github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
+github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/unrolled/render v1.0.0 h1:XYtvhA3UkpB7PqkvhUFYmpKD55OudoIeygcfus4vcd4=
+github.com/unrolled/render v1.0.0/go.mod h1:tu82oB5W2ykJRVioYsB+IQKcft7ryBr7w12qMBUPyXg=
+github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
+github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
+github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
+github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4 h1:gKMu1Bf6QINDnvyZuTaACm9ofY+PRh+5vFz4oxBZeF8=
+github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4/go.mod h1:50wTf68f99/Zt14pr046Tgt3Lp2vLyFZKzbFXTOabXw=
+github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
+github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 h1:00VmoueYNlNz/aHIilyyQz/MHSqGoWJzpFv/HW8xpzI=
+golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
+golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+k8s.io/apimachinery v0.0.0-20190221093215-450d01ad5771 h1:XMECjVNpkFVT9uY40z07scw8Xtn2mUnkxx8BC3gjwoE=
+k8s.io/apimachinery v0.0.0-20190221093215-450d01ad5771/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
+k8s.io/client-go v10.0.0+incompatible h1:F1IqCqw7oMBzDkqlcBymRq1450wD0eNqLE9jzUrIi34=
+k8s.io/client-go v10.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
+k8s.io/helm v2.12.3+incompatible h1:wo1cdYjOnr5Z+LFuhtwIJaeQnec6D4gcg2H5UAKzY6w=
+k8s.io/helm v2.12.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=

From c6779b11e29ab67e7928c2f07a17ee4a2bdbece4 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Thu, 5 Dec 2019 19:51:36 +0000
Subject: [PATCH 193/648] Partially fix container build

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 src/jetstream/plugins/monocular/chartsvc/Dockerfile | 2 +-
 src/jetstream/plugins/monocular/chartsvc/Makefile   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/jetstream/plugins/monocular/chartsvc/Dockerfile b/src/jetstream/plugins/monocular/chartsvc/Dockerfile
index 91222d6bde..12824d7fe4 100644
--- a/src/jetstream/plugins/monocular/chartsvc/Dockerfile
+++ b/src/jetstream/plugins/monocular/chartsvc/Dockerfile
@@ -1,7 +1,7 @@
 FROM golang:1.12 as builder
 COPY . /go/src/github.com/helm/monocular
 WORKDIR /go/src/github.com/helm/monocular
-RUN GO111MODULE=on GOPROXY=https://gocenter.io CGO_ENABLED=0 go build -a -installsuffix cgo ./chartsvc
+RUN GO111MODULE=on GOPROXY=https://gocenter.io CGO_ENABLED=0 go build -a -installsuffix cgo .
 FROM scratch
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=builder /go/src/github.com/helm/monocular/chartsvc /chartsvc
diff --git a/src/jetstream/plugins/monocular/chartsvc/Makefile b/src/jetstream/plugins/monocular/chartsvc/Makefile
index 3d70100767..ef0b800ae2 100644
--- a/src/jetstream/plugins/monocular/chartsvc/Makefile
+++ b/src/jetstream/plugins/monocular/chartsvc/Makefile
@@ -3,4 +3,4 @@ IMAGE_TAG ?= latest
 
 docker-build:
 	# We use the context of the root dir
-	docker build --pull --rm -t ${IMAGE_REPO}:${IMAGE_TAG} -f Dockerfile ../
+	docker build --pull --rm -t ${IMAGE_REPO}:${IMAGE_TAG} -f Dockerfile .

From d45b1ed7cffe6ccb99e3bf23691118322fa190f8 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 6 Dec 2019 06:08:49 +0000
Subject: [PATCH 194/648] Latest WIP

---
 .../helm-release-tab-base.component.ts        |  35 +-
 .../kubernetes-certs-auth-form.component.html |  26 +-
 .../kubernetes-certs-auth-form.component.ts   |  14 +-
 custom-src/frontend/sass/custom/suse.scss     |  63 +-
 .../shared/components/json-viewer/README.md   |   9 +
 .../json-viewer/json-viewer.component.html    |  21 +
 .../json-viewer/json-viewer.component.scss    | 101 ++++
 .../json-viewer/json-viewer.component.spec.ts |  25 +
 .../json-viewer/json-viewer.component.ts      | 119 ++++
 src/jetstream/go.mod                          |  14 +-
 src/jetstream/go.sum                          | 538 ++++++++++++++++--
 src/jetstream/plugins/kubernetes/api_proxy.go |   8 +
 .../plugins/kubernetes/helm_client.go         |  38 +-
 .../plugins/kubernetes/install_release.go     |   7 +-
 .../plugins/kubernetes/list_releases.go       |  55 +-
 .../repository/interfaces/jetstream_error.go  |  32 ++
 16 files changed, 982 insertions(+), 123 deletions(-)
 create mode 100644 src/frontend/packages/core/src/shared/components/json-viewer/README.md
 create mode 100644 src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.html
 create mode 100644 src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.scss
 create mode 100644 src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.spec.ts
 create mode 100644 src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.ts
 create mode 100644 src/jetstream/repository/interfaces/jetstream_error.go

diff --git a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts b/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
index 7596d436cb..5ac80fae21 100644
--- a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
@@ -7,8 +7,8 @@ import { Observable, Subject, Subscription } from 'rxjs';
 
 import { HelmReleaseGuid, HelmReleasePod } from '../../store/helm.types';
 import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service';
-import { catchError } from 'rxjs/operators';
-import websocketConnect, { Connection } from 'rxjs-websockets';
+import { catchError, switchMap, share, map, first, debounceTime, startWith } from 'rxjs/operators';
+import makeWebSocketObservable, { GetWebSocketResponses } from 'rxjs-websockets';
 import { Store, Action } from '@ngrx/store';
 import { AppState } from '../../../../../../store/src/app-state';
 import {
@@ -23,6 +23,7 @@ import { PipelineResult } from '../../../../../../store/src/entity-request-pipel
 import { GetHelmReleasePods } from '../../store/helm.actions';
 import { EntityCatalogueEntityConfig } from '../../../../core/entity-catalogue/entity-catalogue.types';
 import { helmReleaseGraphEntityType } from '../../helm-entity-factory';
+import { LoggerService } from '../../../../core/logger.service';
 
 type IDGetterFunction = (data: any) => string;
 
@@ -51,7 +52,7 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
 
   private sub: Subscription;
 
-  private connection: Connection;
+  //private connection: Connection;
 
   public breadcrumbs = [{
     breadcrumbs: [
@@ -74,6 +75,7 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
   constructor(
     public helmReleaseHelper: HelmReleaseHelperService,
     private store: Store<AppState>,
+    private logService: LoggerService
   ) {
     this.title = this.helmReleaseHelper.releaseTitle;
 
@@ -87,13 +89,27 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
     );
     console.log(streamUrl);
 
-    const data = new Subject<string>();
-    const connection = websocketConnect(
-      streamUrl,
-      data
+    // const data = new Subject<string>();
+    // const connection = websocketConnect(
+    //   streamUrl,
+    //   data
+    // );
+
+
+    const socket$ = makeWebSocketObservable(streamUrl).pipe(catchError(e => {
+      this.logService.error(
+        'Error while connecting to socket: ' + JSON.stringify(e)
+      );
+      return [];
+    }),
+      share(),
     );
 
-    const messages = connection.messages.pipe(
+    const messages = socket$.pipe(
+      switchMap((getResponses: GetWebSocketResponses) => {
+        return getResponses(new Subject<string>());
+      }),
+      map((message: string) => message),
       catchError(e => {
         console.log('WS Error');
         console.log(e);
@@ -101,7 +117,8 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
           console.log(e);
         }
         return [];
-      }));
+      })
+    );
 
     let prefix = '';
     this.sub = messages.subscribe(jsonString => {
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html
index fe2a325d20..975c49b94e 100644
--- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html
@@ -1,12 +1,22 @@
 <div [formGroup]="formGroup" class="kube-certs-auth">
   <div formGroupName="authValues" class="kube-certs-auth__form">
-    <span>Specify Certificate file:</span>
-    <app-file-input fileFormControlName="cert" placeholder="cert">
-    </app-file-input>
-    <span>Specify Certificate key file:</span>
-    <app-file-input fileFormControlName="certKey" placeholder="certKey">
-    </app-file-input>
-    <input matInput formControlName="cert" hidden=true>
-    <input matInput formControlName="certKey" hidden=true>
+    <mat-tab-group>
+      <mat-tab label="Certificate Files">
+        <span>Specify Certificate file:</span>
+        <app-file-input fileFormControlName="cert" placeholder="cert">
+        </app-file-input>
+        <span>Specify Certificate key file:</span>
+        <app-file-input fileFormControlName="certKey" placeholder="certKey">
+        </app-file-input>
+        <input matInput formControlName="cert" hidden=true>
+        <input matInput formControlName="certKey" hidden=true>
+      </mat-tab>
+      <mat-tab label="Certificate Content">
+        <span>Specify Certificate:</span>
+        <textarea matInput formControlName="cert"></textarea>
+        <span>Specify Certificate key:</span>
+        <textarea matInput formControlName="certKey"></textarea>
+      </mat-tab>
+    </mat-tab-group>
   </div>
 </div>
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts
index 6eba924c06..5c0b9042b5 100644
--- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts
@@ -20,8 +20,18 @@ export class KubernetesCertsAuthFormComponent implements IEndpointAuthComponent
     /** Body content is in the following encoding:
      * base64encoded:base64encoded
      */
-    const certBase64 = btoa(this.formGroup.value.authValues.cert);
-    const certKeyBase64 = btoa(this.formGroup.value.authValues.certKey);
+
+    let certBase64 = this.formGroup.value.authValues.cert;
+    let certKeyBase64 = this.formGroup.value.authValues.certKey;
+
+    // May already be base64 encoded
+    if (certBase64.indexOf('-----BEGIN') === 0) {
+      certBase64 = btoa(this.formGroup.value.authValues.cert);
+    }
+
+    if (certKeyBase64.indexOf('-----BEGIN') === 0) {
+      certKeyBase64 = btoa(this.formGroup.value.authValues.certKey);
+    }
     return `${certBase64}:${certKeyBase64}`;
   }
 }
diff --git a/custom-src/frontend/sass/custom/suse.scss b/custom-src/frontend/sass/custom/suse.scss
index 4fdaa4adc8..fb4e465bf4 100644
--- a/custom-src/frontend/sass/custom/suse.scss
+++ b/custom-src/frontend/sass/custom/suse.scss
@@ -18,49 +18,52 @@ $suse-blue: #073155;
 $suse-side-nav: $suse-secondary;
 $suse-side-nav-active: #003358;
 
-.stratos .page-content > .page-header {
-  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-  // Ensure kube icons don't appear above sub header
-  background-color: #f5f5f5;
-}
-
-.stratos img.stratos-title__logo {
-  width: 160px;
-}
+.stratos .default {
 
-.stratos h1.stratos-title__header {
-  display: initial;
-}
+  .page-content > .page-header {
+    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+    // Ensure kube icons don't appear above sub header
+    background-color: #f5f5f5;
+  }
 
-.stratos .page-header .mat-toolbar.mat-primary {
-  background-color: #fff;
-  color: #333;
-}
+  img.stratos-title__logo {
+    width: 160px;
+  }
 
-.stratos app-page-subheader {
-  .page-subheader {
-    background-color: #fff;
-    color: #333;
+  h1.stratos-title__header {
+    display: initial;
   }
 
-  .mat-tab-nav-bar.mat-background-primary {
-    .mat-tab-links {
+  .page-header .mat-toolbar.mat-primary {
       background-color: #fff;
       color: #333;
-    }
+  }
 
-    .mat-tab-link {
+  app-page-subheader {
+    .page-subheader {
+      background-color: #fff;
       color: #333;
     }
 
-    .mat-ink-bar {
-      background-color: $suse-primary-color;
+    .mat-tab-nav-bar.mat-background-primary {
+      .mat-tab-links {
+        background-color: #fff;
+        color: #333;
+      }
+
+      .mat-tab-link {
+        color: #333;
+      }
+
+      .mat-ink-bar {
+        background-color: $suse-primary-color;
+      }
     }
   }
 }
 
 // Use SUSE Blue Side Navigation
-.stratos {
+.stratos .default {
   // This is themeable, we really don't need this.
   .side-nav__inner,
   .side-nav__top,
@@ -86,16 +89,16 @@ $suse-side-nav-active: #003358;
 }
 
 // Remove background image from setup screen (e.g. upgrade screen)
-.stratos app-intro-screen > .intro {
+.stratos  .default app-intro-screen > .intro {
   background-color: $suse-blue;
   background-image: none;
 }
 
-.stratos .page-header__divider {
+.stratos  .default .page-header__divider {
   color: #333;
 }
 
-.stratos .page-header__menu-button-icon {
+.stratos  .default .page-header__menu-button-icon {
   background-color: $suse-primary-color;
   color: $suse-text;
 }
diff --git a/src/frontend/packages/core/src/shared/components/json-viewer/README.md b/src/frontend/packages/core/src/shared/components/json-viewer/README.md
new file mode 100644
index 0000000000..4e93beb48d
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/json-viewer/README.md
@@ -0,0 +1,9 @@
+This component originates from:
+
+https://github.com/hivivo/ngx-json-viewer
+
+That project seems to be inactive.
+
+This component has been brought in here as we needed ot make some changes - its a very simple component.
+
+We could look to upstream once we've completed our enhancements.
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.html b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.html
new file mode 100644
index 0000000000..0a86b15db7
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.html
@@ -0,0 +1,21 @@
+<section class="ngx-json-viewer">
+  <section
+    *ngFor="let segment of segments"
+    [ngClass]="['segment', 'segment-type-' + segment.type]">
+    <section
+      (click)="toggle(segment)"
+      [ngClass]="{
+        'segment-main': true,
+        'expandable': isExpandable(segment),
+        'expanded': segment.expanded
+      }">
+      <div *ngIf="isExpandable(segment)" class="toggler"></div>
+      <span class="segment-key">{{ segment.key }}</span>
+      <span class="segment-separator">: </span>
+      <span *ngIf="!segment.expanded || !isExpandable(segment)" class="segment-value">{{ segment.description }}</span>
+    </section>
+    <section *ngIf="segment.expanded && isExpandable(segment)" class="children">
+      <app-json-viewer [json]="segment.value" [expanded]="expanded"></app-json-viewer>
+    </section>
+  </section>
+</section>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.scss b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.scss
new file mode 100644
index 0000000000..e6d507bf40
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.scss
@@ -0,0 +1,101 @@
+$type-colors: (
+  string: #0065ff,
+  number: #009688,
+  boolean: #b938a4,
+  date: #05668D,
+  //null: #787878;
+
+  array: #999,
+  object: #999,
+  function: #999,
+
+  'null': #787878,
+  undefined: #fff
+);
+
+:host {
+  display: flex;
+}
+
+.ngx-json-viewer {
+  font-family: "Source Code Pro";
+  font-size: 14px;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  position: relative;
+
+  .segment {
+    padding: 2px;
+    margin: 1px 1px 1px 12px;
+
+    .segment-main {
+      word-wrap: break-word;
+
+      .toggler {
+        position: absolute;
+        margin-left: -14px;
+        margin-top: 3px;
+        font-size: .8em;
+        line-height: 1.2em;
+        vertical-align: middle;
+        color: #787878;
+
+        &::after {
+          display: inline-block;
+          content: "►";
+          transition: transform 0.1s ease-in;
+        }
+      }
+
+      .segment-key {
+        color: #4E187C;
+      }
+
+      .segment-separator {
+        color: #999;
+      }
+
+      .segment-value {
+        color: #000;
+      }
+    }
+
+    .children {
+      margin-left: 12px;
+    }
+  }
+
+  @each $type, $color in $type-colors {
+    .segment-type-#{$type} > .segment-main > .segment-value {
+      color: $color;
+    }
+  }
+
+  // // special cases need highlightted
+  // .segment-type-null > .segment-main > .segment-value {
+  //   color: #787878;
+  // }
+
+  .segment-type-undefined > .segment-main {
+    & > .segment-key {
+      color: #999;
+    }
+    & > .segment-value {
+      background-color: #999;
+    }
+  }
+  .segment-type-object > .segment-main,
+  .segment-type-array > .segment-main {
+    white-space: nowrap;
+  }
+
+  .expanded > .toggler::after {
+    transform: rotate(90deg);
+  }
+
+  .expandable,
+  .expandable > .toggler {
+    cursor: pointer;
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.spec.ts b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.spec.ts
new file mode 100644
index 0000000000..f7eb491577
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { JsonViewerComponent } from './json-viewer.component';
+
+describe('JsonViewerComponent', () => {
+  let component: JsonViewerComponent;
+  let fixture: ComponentFixture<JsonViewerComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ JsonViewerComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(JsonViewerComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.ts b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.ts
new file mode 100644
index 0000000000..1f225ca9a6
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.ts
@@ -0,0 +1,119 @@
+import { Component, OnChanges, Input } from '@angular/core';
+
+export interface Segment {
+  key: string;
+  value: any;
+  type: undefined | string;
+  description: string;
+  expanded: boolean;
+}
+
+@Component({
+  selector: 'app-json-viewer',
+  templateUrl: './json-viewer.component.html',
+  styleUrls: ['./json-viewer.component.scss']
+})
+export class JsonViewerComponent implements OnChanges {
+
+  @Input() json: any;
+
+  // Whether to expand all initially
+  @Input() expanded = true;
+  /**
+   * @deprecated It will be always true and deleted in version 3.0.0
+   */
+  @Input() cleanOnChange = true;
+
+  segments: Segment[] = [];
+
+  expand() {
+    this.setExpansion(true);
+  }
+
+  collapse() {
+    this.setExpansion(false);
+  }
+
+  private setExpansion(expanded: boolean) {
+    this.segments.forEach(segment => {
+      segment.expanded = expanded;
+    });
+  }
+
+  ngOnChanges() {
+    if (this.cleanOnChange) {
+      this.segments = [];
+    }
+
+    if (typeof this.json === 'object') {
+      Object.keys(this.json).forEach( key => {
+        this.segments.push(this.parseKeyValue(key, this.json[key]));
+      });
+    } else {
+      this.segments.push(this.parseKeyValue(`(${typeof this.json})`, this.json));
+    }
+  }
+
+  isExpandable(segment: Segment) {
+    return segment.type === 'object' || segment.type === 'array';
+  }
+
+  toggle(segment: Segment) {
+    if (this.isExpandable(segment)) {
+      segment.expanded = !segment.expanded;
+    }
+  }
+
+  private parseKeyValue(key: any, value: any): Segment {
+    const segment: Segment = {
+      key,
+      value,
+      type: undefined,
+      description: '' + value,
+      expanded: this.expanded
+    };
+
+    switch (typeof segment.value) {
+      case 'number': {
+        segment.type = 'number';
+        break;
+      }
+      case 'boolean': {
+        segment.type = 'boolean';
+        break;
+      }
+      case 'function': {
+        segment.type = 'function';
+        break;
+      }
+      case 'string': {
+        segment.type = 'string';
+        segment.description = '"' + segment.value + '"';
+        break;
+      }
+      case 'undefined': {
+        segment.type = 'undefined';
+        segment.description = 'undefined';
+        break;
+      }
+      case 'object': {
+        // yea, null is object
+        if (segment.value === null) {
+          segment.type = 'null';
+          segment.description = 'null';
+        } else if (Array.isArray(segment.value)) {
+          segment.type = 'array';
+          segment.description = 'Array[' + segment.value.length + '] ' + JSON.stringify(segment.value);
+        } else if (segment.value instanceof Date) {
+          segment.type = 'date';
+        } else {
+          segment.type = 'object';
+          segment.description = 'Object ' + JSON.stringify(segment.value);
+        }
+        break;
+      }
+    }
+
+    return segment;
+  }
+}
\ No newline at end of file
diff --git a/src/jetstream/go.mod b/src/jetstream/go.mod
index 8dc61a3c37..aa663b2009 100644
--- a/src/jetstream/go.mod
+++ b/src/jetstream/go.mod
@@ -26,9 +26,6 @@ require (
 	github.com/cloudfoundry/cli-plugin-repo v0.0.0-20190220174354-ecf721ef3813 // indirect
 	github.com/cloudfoundry/noaa v2.1.0+incompatible
 	github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4
-	github.com/coreos/bbolt v1.3.3 // indirect
-	github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
-	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
 	github.com/cppforlife/go-patch v0.2.0 // indirect
 	github.com/domodwyer/mailyak v3.1.1+incompatible
 	github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 // indirect
@@ -43,7 +40,6 @@ require (
 	github.com/gorilla/sessions v1.1.3
 	github.com/gorilla/websocket v1.4.0
 	github.com/govau/cf-common v0.0.7
-	github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
 	github.com/jessevdk/go-flags v1.4.0 // indirect
 	github.com/jtolds/gls v4.20.0+incompatible // indirect
 	github.com/kat-co/vala v0.0.0-20170210184112-42e1d8b61f12
@@ -54,32 +50,30 @@ require (
 	github.com/mattn/go-isatty v0.0.10 // indirect
 	github.com/mattn/go-sqlite3 v1.10.0
 	github.com/mholt/archiver v3.1.1+incompatible
-	github.com/mitchellh/mapstructure v1.1.2 // indirect
+	github.com/miekg/dns v1.1.4 // indirect
 	github.com/moby/moby v1.13.1 // indirect
 	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
 	github.com/nwaples/rardecode v1.0.0 // indirect
 	github.com/nwmac/sqlitestore v0.0.0-20180824125213-7d2ab221fb3f
+	github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830 // indirect
 	github.com/pierrec/lz4 v2.0.5+incompatible // indirect
 	github.com/poy/eachers v0.0.0-20181020210610-23942921fe77 // indirect
 	github.com/satori/go.uuid v1.2.0
 	github.com/sirupsen/logrus v1.4.2
 	github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 // indirect
 	github.com/smartystreets/goconvey v1.6.4
-	github.com/soheilhy/cmux v0.1.4 // indirect
 	github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect
 	github.com/tedsuo/rata v1.0.0 // indirect
-	github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
 	github.com/ulikunitz/xz v0.5.6 // indirect
 	github.com/valyala/fasttemplate v1.1.0 // indirect
 	github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec // indirect
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
-	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
-	go.etcd.io/bbolt v1.3.3 // indirect
 	golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152
 	gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0
 	gopkg.in/cheggaaa/pb.v1 v1.0.27 // indirect
 	gopkg.in/yaml.v2 v2.2.7
-	k8s.io/kubernetes v1.16.3 // indirect
+	k8s.io/apiextensions-apiserver v0.0.0 // indirect
+	k8s.io/kubectl v0.0.0 // indirect
 )
 
 replace github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes => ./plugins/kubernetes
diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index f4e13fbd76..29ebc835f3 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -2,47 +2,109 @@ bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c h1:bkb2NMGo3/Du
 bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c/go.mod h1:hSVuE3qU7grINVSwrmzHfpg9k87ALBk+XaualNyUzI4=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
 code.cloudfoundry.org/bytefmt v0.0.0-20180906201452-2aa6f33b730c h1:VzwteSWGbW9mxXTEkH+kpnao5jbgLynw3hq742juQh8=
 code.cloudfoundry.org/bytefmt v0.0.0-20180906201452-2aa6f33b730c/go.mod h1:wN/zk7mhREp/oviagqUXY3EwuHhWyOvAdsn5Y4CzOrc=
 code.cloudfoundry.org/cli v6.43.0+incompatible h1:jAaPyHN5Hb2r2sR9i8Y8ejKPiPpuBYMaHBFyKVmQ7T4=
 code.cloudfoundry.org/cli v6.43.0+incompatible/go.mod h1:e4d+EpbwevNhyTZKybrLlyTvpH+W22vMsmdmcTxs/Fo=
+code.cloudfoundry.org/diego-ssh v0.0.0-20190821205424-d560480f8c18 h1:Uf9tS67L4P92h4tzbnR+9pJqqxUU5MgxQNrvuht8L8g=
+code.cloudfoundry.org/diego-ssh v0.0.0-20190821205424-d560480f8c18/go.mod h1:L2/glHnSK+wKnsG8oZZqdV2sgYY9NDo/I1aDJGhcWaM=
 code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f h1:UrKzEwTgeiff9vxdrfdqxibzpWjxLnuXDI5m6z3GJAk=
 code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f/go.mod h1:sk5LnIjB/nIEU7yP5sDQExVm62wu0pBh3yrElngUisI=
+code.cloudfoundry.org/inigo v0.0.0-20191009011458-4d57c5db28ee h1:tZJ6H/AttVPtxGDJIWHtRYOv0lHE/ieRGpAT4ocJCoY=
+code.cloudfoundry.org/inigo v0.0.0-20191009011458-4d57c5db28ee/go.mod h1:1ZB1JCh2FAp+SqX79ve6dc8YREvbsziULEOncAilX4Q=
+code.cloudfoundry.org/lager v2.0.0+incompatible h1:WZwDKDB2PLd/oL+USK4b4aEjUymIej9My2nUQ9oWEwQ=
+code.cloudfoundry.org/lager v2.0.0+incompatible/go.mod h1:O2sS7gKP3HM2iemG+EnwvyNQK7pTSC6Foi4QiMp9sSk=
+code.cloudfoundry.org/ykk v0.0.0-20170424192843-e4df4ce2fd4d h1:M+zXqtXJqcsmpL76aU0tdl1ho23eYa4axYoM4gD62UA=
+code.cloudfoundry.org/ykk v0.0.0-20170424192843-e4df4ce2fd4d/go.mod h1:YUJiVOr5xl0N/RjMxM1tHmgSpBbi5UM+KoVR5AoejO0=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
+github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
+github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
+github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
+github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
+github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
+github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
+github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/DATA-DOG/go-sqlmock v1.1.0 h1:4Ws0QCHb0hIwOCboP/hT+msNYGbR+qmZdJMSoW4lyvM=
-github.com/DATA-DOG/go-sqlmock v1.1.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/DATA-DOG/go-sqlmock v1.1.3 h1:sVIxMSTMnnVzl9Bn6BMjW6p5lSbpjHL80mqnxMWJ/oE=
 github.com/DATA-DOG/go-sqlmock v1.1.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
+github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
 github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e h1:eb0Pzkt15Bm7f2FFYv7sjY7NPFi3cPkS3tv1CcrFBWA=
 github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
 github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg=
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc=
 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/Masterminds/semver/v3 v3.0.1 h1:2kKm5lb7dKVrt5TYUiAavE6oFc1cFT0057UVGT+JqLk=
+github.com/Masterminds/semver/v3 v3.0.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/Masterminds/sprig v2.18.0+incompatible h1:QoGhlbC6pter1jxKnjMFxT8EqsLuDE6FEcNbWEpw+lI=
 github.com/Masterminds/sprig v2.18.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o=
+github.com/Masterminds/sprig/v3 v3.0.0 h1:KSQz7Nb08/3VU9E4ns29dDxcczhOD1q7O1UfM4G3t3g=
+github.com/Masterminds/sprig/v3 v3.0.0/go.mod h1:NEUY/Qq8Gdm2xgYA+NwJM6wmfdRV9xkh8h/Rld20R0U=
+github.com/Masterminds/vcs v1.13.0/go.mod h1:N09YCmOQr6RLxC6UNHzuVwAdodYbbnycGHSmwVJjcKA=
+github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
+github.com/Microsoft/go-winio v0.4.12 h1:xAfWHN1IrQ0NJ9TBC0KBZoqLjzDTr1ML+4MywiUOryc=
+github.com/Microsoft/go-winio v0.4.12/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
+github.com/Microsoft/hcsshim v0.8.6 h1:ZfF0+zZeYdzMIVMZHKtDKJvLHj76XCuVae/jNkjj0IA=
+github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
+github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
+github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.0 h1:rmGxhojJlM0tuKtfdvliR84CFHljx9ag64t2xmVkjK4=
 github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
+github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc h1:MhBvG7RLaLqlyjxMR6of35vt6MVQ+eXMcgn9X/sy0FE=
 github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA=
+github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs=
+github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/antonlindstrom/pgstore v0.0.0-20170604072116-a407030ba6d0 h1:e6PEaXbztY0ViaKotCICNnBQDUeNEJgrQ5UAHWlloh4=
 github.com/antonlindstrom/pgstore v0.0.0-20170604072116-a407030ba6d0/go.mod h1:2Ti6VUHVxpC0VSmTZzEvpzysnaGAfGBOoMIz5ykPyyw=
+github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77 h1:afT88tB6u9JCKQZVAAaa9ICz/uGn5Uw9ekn6P22mYKM=
+github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77/go.mod h1:bXvGk6IkT1Agy7qzJ+DjIw/SJ1AaB3AvAuMDVV+Vkoo=
+github.com/arschles/assert v1.0.0 h1:NofQbRhtxcLgP+XoKunA7J6UMJNTqX7xR/19tej8UsA=
 github.com/arschles/assert v1.0.0/go.mod h1:m/u69zW43x0h8dTHcv3JJZljINyEYgBuf5fYJP6WikI=
+github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
+github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
+github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/aws/aws-sdk-go v1.17.5 h1:WW9Hm3KYo48iZHpmBc+b7sgyS0h32zgCvya28SLW4BU=
 github.com/aws/aws-sdk-go v1.17.5/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y=
+github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
+github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/bmatcuk/doublestar v1.1.1 h1:YroD6BJCZBYx06yYFEWvUuKVWQn3vLLQAVmDmvTSaiQ=
 github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
+github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40 h1:y4B3+GPxKlrigF1ha5FFErxK+sr6sWxQovRMzwMhejo=
+github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c=
+github.com/bshuster-repo/logrus-logstash-hook v0.4.1 h1:pgAtgj+A31JBVtEHu2uHuEx0n+2ukqUJnS2vVe5pQNA=
+github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
+github.com/bugsnag/bugsnag-go v1.5.0 h1:tP8hiPv1pGGW3LA6LKy5lW6WG+y9J2xWUdPd3WC452k=
+github.com/bugsnag/bugsnag-go v1.5.0/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
+github.com/bugsnag/panicwrap v1.2.0 h1:OzrKrRvXis8qEvOkfcxNcYbOd2O7xXS2nnKMEMABFQA=
+github.com/bugsnag/panicwrap v1.2.0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
+github.com/cespare/xxhash/v2 v2.1.0 h1:yTUvW7Vhb89inJ+8irsUqiWjh8iT6sQPZiQzI6ReGkA=
+github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM=
 github.com/cf-stratos/mysqlstore v0.0.0-20170822100912-304308519d13 h1:WwIvjUUodNoZduhdhotbKnrLSFoIn5vD3QgNZv0hjvo=
 github.com/cf-stratos/mysqlstore v0.0.0-20170822100912-304308519d13/go.mod h1:GgQT0ToC+7JLnMKdDB5d434WwCLC2dpNR2AgTJj/08o=
+github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
 github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 h1:HD4PLRzjuCVW79mQ0/pdsalOLHJ+FaEoqJLxfltpb2U=
 github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
 github.com/charlievieth/fs v0.0.0-20170613215519-7dc373669fa1 h1:vTlpHKxJqykyKdW9bkrDJNWeKNuSIAJ0TP/K4lRsz/Q=
@@ -60,74 +122,200 @@ github.com/cloudfoundry/noaa v2.1.0+incompatible h1:hr6VnM5VlYRN3YD+NmAedQLW8686
 github.com/cloudfoundry/noaa v2.1.0+incompatible/go.mod h1:5LmacnptvxzrTvMfL9+EJhgkUfIgcwI61BVSTh47ECo=
 github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4 h1:cWfya7mo/zbnwYVio6eWGsFJHqYw4/k/uhwIJ1eqRPI=
 github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4/go.mod h1:GS0pCHd7onIsewbw8Ue9qa9pZPv2V88cUZDttK6KzgI=
+github.com/containerd/containerd v1.3.0-beta.2.0.20190823190603-4a2f61c4f2b4/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/containerd v1.3.0 h1:xjvXQWABwS2uiv3TWgQt5Uth60Gu86LTGZXMJkjc7rY=
+github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 h1:4BX8f882bXEDKfWIf0wa8HRvpnBoPszJJXL+TVbBw4M=
+github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
+github.com/coreos/bbolt v1.3.1-coreos.6/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
+github.com/coreos/etcd v3.3.15+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
+github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cppforlife/go-patch v0.2.0 h1:Y14MnCQjDlbw7WXT4k+u6DPAA9XnygN4BfrSpI/19RU=
 github.com/cppforlife/go-patch v0.2.0/go.mod h1:67a7aIi94FHDZdoeGSJRRFDp66l9MhaAG1yGxpUoFD8=
 github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
+github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE=
+github.com/deislabs/oras v0.7.0 h1:RnDoFd3tQYODMiUqxgQ8JxlrlWL0/VMKIKRD01MmNYk=
+github.com/deislabs/oras v0.7.0/go.mod h1:sqMKPG3tMyIX9xwXUBRLhZ24o+uT4y6jgBD2RzUTKDM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/disintegration/imaging v1.6.0 h1:nVPXRUUQ36Z7MNf0O77UzgnOb1mkMMor7lmJMJXc/mA=
 github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ=
+github.com/docker/cli v0.0.0-20190506213505-d88565df0c2d h1:qdD+BtyCE1XXpDyhvn0yZVcZOLILdj9Cw4pKu0kQbPQ=
+github.com/docker/cli v0.0.0-20190506213505-d88565df0c2d/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v1.13.1 h1:IkZjBSIc8hBjLpqeAbeE5mca5mNgeatLHBy3GO78BWo=
-github.com/docker/docker v1.13.1/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker-credential-helpers v0.6.1 h1:Dq4iIfcM7cNtddhLVWe9h4QDjsi4OER3Z8voPu/I52g=
+github.com/docker/docker-credential-helpers v0.6.1/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
+github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
+github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
+github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82 h1:X0fj836zx99zFu83v/M79DuBn84IL/Syx1SY6Y5ZEMA=
+github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI=
+github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
+github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4=
+github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE=
+github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
 github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c h1:ZfSZ3P3BedhKGUhzj7BQlPSU4OvT6tfOKe3DVHzOA7s=
 github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
+github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
 github.com/domodwyer/mailyak v3.1.1+incompatible h1:oPtXn3+56LEFbdqH0bpuPRsqtijW9l2POpQe9sTUsSI=
 github.com/domodwyer/mailyak v3.1.1+incompatible/go.mod h1:5NNYkn9hxcdNEOmmMx0yultN5VLorZQ+AWQo9iya+UY=
 github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 h1:eX+pdPPlD279OWgdx7f6KqIRSONuK7egk+jDx7OM3Ac=
 github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76/go.mod h1:KjxHHirfLaw19iGT70HvVjHQsL1vq1SRQB4yOsAfy2s=
-github.com/evanphx/json-patch v4.1.0+incompatible h1:K1MDoo4AZ4wU0GIU/fPmtZg7VpzLjCxu+UwBD1FvwOc=
-github.com/evanphx/json-patch v4.1.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385 h1:clC1lXBpe2kTj2VHdaIu9ajZQe4kcEY9j0NsnDDBZ3o=
+github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
+github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
+github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484 h1:pEtiCjIXx3RvGjlUJuCNxNOw0MNblyR9Wi+vJGBFh+8=
+github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
+github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
+github.com/elazarl/goproxy/ext v0.0.0-20191011121108-aa519ddbe484 h1:aBgSK7SOjFeL1wfzfbIb/pkPpfRr6EP7b1Af4o/xkpU=
+github.com/elazarl/goproxy/ext v0.0.0-20191011121108-aa519ddbe484/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
+github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/emicklei/go-restful v2.11.1+incompatible h1:CjKsv3uWcCMvySPQYKxO8XX3f9zD4FeZRsW4G0B4ffE=
+github.com/emicklei/go-restful v2.11.1+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M=
+github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
+github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/garyburd/redigo v1.6.0 h1:0VruCpn7yAIIu7pWVClQC8wxCJEcG3nyzpMSHKi1PQc=
+github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
+github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
+github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=
+github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
+github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
+github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk=
+github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
+github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
+github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
+github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
 github.com/go-openapi/jsonpointer v0.17.0 h1:nH6xp8XdXHx8dqveo0ZuJBluCO2qGrPbDNZ0dwoRHP0=
 github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
+github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
+github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
+github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
+github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
 github.com/go-openapi/jsonreference v0.17.0 h1:yJW3HCkTHg7NOA+gZ83IPHzUSnUzGXhGmsdiCcMexbA=
 github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
+github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
+github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
+github.com/go-openapi/jsonreference v0.19.3 h1:5cxNfTy0UVC3X8JL5ymxzyoUZmo8iZb+jeTWn7tUa8o=
+github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
+github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
+github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
+github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
+github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs=
+github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA=
+github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64=
+github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
+github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
 github.com/go-openapi/spec v0.18.0 h1:aIjeyG5mo5/FrvDkpKKEGZPmF9MPHahS72mzfVqeQXQ=
 github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
+github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
+github.com/go-openapi/spec v0.19.4 h1:ixzUSnHTd6hCemgtAJgluaTSGYpLNpJY4mA2DIkdOAo=
+github.com/go-openapi/spec v0.19.4/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
+github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
+github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
+github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY=
+github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
 github.com/go-openapi/swag v0.17.0 h1:iqrgMg7Q7SvtbWLlltPrkMs0UBJI6oTSs79JFRUi880=
 github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
+github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
+github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
+github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
 github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
+github.com/gofrs/flock v0.7.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
+github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
+github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
+github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
+github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef h1:veQD95Isof8w9/WXiA+pa3tz3fJXkt5B7QaRBrM62gk=
-github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 h1:uHTyIjqVhYRhLbJ8nIiOJHkEZZ+5YoOsAbD3sk82NiE=
+github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho=
+github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8=
+github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
-github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf h1:+RRA9JqSOZFfKrOeqr2z77+8R2RKyh8PG66dcu1V0ck=
-github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
-github.com/google/uuid v1.1.0 h1:Jf4mxPC/ziBnoPIdpQdPJ9OeiomAUHLvxmPRSPH9m4s=
-github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhpy9g=
-github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
+github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
+github.com/googleapis/gnostic v0.3.1 h1:WeAefnSUHlBb0iJKwxFDZdbfGwkd7xRNuV+IpXMJhYk=
+github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU=
+github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
 github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e h1:XWcjeEtTFTOVA9Fs1w7n2XBftk5ib4oZrhzWk0B+3eA=
 github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZsA=
+github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U=
 github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
@@ -136,136 +324,241 @@ github.com/gorilla/sessions v1.1.3 h1:uXoZdcdA5XdXF3QzuSlheVRUvjl+1rKY7zBXL68L9R
 github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
 github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY=
+github.com/gosuri/uitable v0.0.1/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/govau/cf-common v0.0.7 h1:uhp1P6XM6GGzu1+A4C7LELLX/9mCmH6W5DpJZC0kWmo=
 github.com/govau/cf-common v0.0.7/go.mod h1:5xL/OfE7wxeyHlXb7iei0rAbdQ/5v6dF18BZknPv7NQ=
+github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
+github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc h1:f8eY6cV/x1x+HLjOp4r72s/31/V2aTUtg5oKRRPf8/Q=
 github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
+github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
 github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.3 h1:YPkqC67at8FYaadspW/6uE0COsBxS2656RLEr8Bppgk=
+github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
+github.com/helm/monocular v1.4.0 h1:g0sOpuMe+9u+aPfd9ZO8mWV+c8W0dfGyBG9Wl23nwec=
+github.com/helm/monocular v1.4.0/go.mod h1:PpkCN0v4zVVigsIHnsQdJytKFmaUkwfhxB7z33a9/gE=
 github.com/heptio/authenticator v0.3.0/go.mod h1:Q86X8hc61JXhE5XxYLKmrSRWby/Oe8IIYZIBgmGVkTA=
 github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40 h1:GT4RsKmHh1uZyhmTkWJTDALRjSHYQp6FRKrotf0zhAs=
 github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40/go.mod h1:NtmN9h8vrTveVQRLHcX2HQ5wIPBDCsZ351TGbZWgg38=
+github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0=
 github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4=
+github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI=
 github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/imdario/mergo v0.3.8 h1:CGgOkSJeqMRmt0D9XLWExdT4m4F1vd3FV3VPt+0VxkQ=
+github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3 h1:sHsPfNMAG70QAvKbddQ0uScZCHQoZsT5NykGRCeeeIs=
 github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/json-iterator/go v1.1.5 h1:gL2yXlmiIo4+t+y32d4WGwOjKGYcGOuyrg46vadswDE=
-github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE=
-github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo=
+github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 h1:PJPDf8OUfOK1bb/NeTKd4f1QXZItOX389VN3B6qC8ro=
+github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
 github.com/kat-co/vala v0.0.0-20170210184112-42e1d8b61f12 h1:DQVOxR9qdYEybJUr/c7ku34r3PfajaMYXZwgDM7KuSk=
 github.com/kat-co/vala v0.0.0-20170210184112-42e1d8b61f12/go.mod h1:u9MdXq/QageOOSGp7qG4XAQsYUMP+V5zEel/Vrl6OOc=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/pty v1.1.5 h1:hyz3dwM5QLc1Rfoz4FuWJQG5BN7tc6K1MndAUnGpQr4=
+github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 h1:wdTBUArlqtBYGN2Dd4+zsaFxFH0m4iGCHToW10jPX0k=
 github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
+github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc h1:Ttr4Z3ZrMv4rAXn10UAqOC8ACx+F1omvcyV1a3hRArE=
+github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc/go.mod h1:ItxiN33Ho7Di8wiC4S4XqbH1NLF0DNdDWOd/5MI9gJU=
 github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28 h1:mkl3tvPHIuPaWsLtmHTybJeoVEW7cbePK73Ir8VtruA=
 github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28/go.mod h1:T/T7jsxVqf9k/zYOqbgNAsANsjxTd1Yq3htjDhQ1H0c=
 github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8bbnE7CX5OEgg=
 github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s=
-github.com/labstack/gommon v0.2.8 h1:JvRqmeZcfrHC5u6uVleB4NxxNbzx6gpbJiQknDbKQu0=
-github.com/labstack/gommon v0.2.8/go.mod h1:/tj9csK2iPSBvn+3NLM9e52usepMtrd5ilFYA+wQNJ4=
 github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0=
 github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
 github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.1.0 h1:/5u4a+KGJptBRqGzPvYQL9p0d/tPR4S31+Tnzj9lEO4=
-github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
+github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
 github.com/lunixbochs/vtclean v1.0.0 h1:xu2sLAri4lGiovBDQKxl5mrXyESr3gUr5m5SM5+LVb8=
 github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
+github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190221075403-6243d8e04c3f h1:B6PQkurxGG1rqEX96oE14gbj8bqvYC5dtks9r5uGmlE=
-github.com/mailru/easyjson v0.0.0-20190221075403-6243d8e04c3f/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg=
-github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
+github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=
+github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.6 h1:SrwhHcpV4nWrMGdNcC2kXpMfcBVYGDuTArqyhocJgvA=
-github.com/mattn/go-isatty v0.0.6/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-isatty v0.0.10 h1:qxFzApOv4WsAL965uUPIsXzAKCZxN2p9UqdhFS4ZW10=
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
 github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mattn/go-shellwords v1.0.5/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
 github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
 github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mholt/archiver v3.1.1+incompatible h1:1dCVxuqs0dJseYEhi5pl7MYPH9zDa1wBi7mF09cbNkU=
 github.com/mholt/archiver v3.1.1+incompatible/go.mod h1:Dh2dOXnSdiLxRiPoVfIr/fI1TwETms9B8CTWfeh7ROU=
+github.com/miekg/dns v0.0.0-20181005163659-0d29b283ac0f/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/miekg/dns v1.1.4 h1:rCMZsU2ScVSYcAsOXgmC6+AKOK+6pmQTOcw03nfwYV0=
+github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
+github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
+github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 h1:cvy4lBOYN3gKfKj8Lzz5Q9TfviP+L7koMHY7SvkyTKs=
+github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
 github.com/moby/moby v1.13.1 h1:mC5WwQwCXt/dYxZ1cIrRsnJAWw7VdtcTZUIGr4tXzOM=
 github.com/moby/moby v1.13.1/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c h1:nXxl5PrvVm2L/wCy8dQu6DMTwH4oIuGN8GJDAlqDdVE=
+github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
+github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
+github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ=
+github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U=
 github.com/nwaples/rardecode v1.0.0 h1:r7vGuS5akxOnR4JQSkko62RJ1ReCMXxQRPtxsiFMBOs=
 github.com/nwaples/rardecode v1.0.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
 github.com/nwmac/sqlitestore v0.0.0-20180824125213-7d2ab221fb3f h1:0U8+7akQEpWd5oaEgSKryzEEeI2oChQNc0ealKppMrk=
 github.com/nwmac/sqlitestore v0.0.0-20180824125213-7d2ab221fb3f/go.mod h1:GVvWHloj3TN6Mb3PH286FnNmEWPnn9VGEM8AhUUbdlw=
+github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo=
+github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
+github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
+github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
+github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI=
+github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
+github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
+github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830 h1:yvQ/2Pupw60ON8TYEIGGTAI77yZsWYkiOeHFZWkwlCk=
+github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
+github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
+github.com/phayes/freeport v0.0.0-20171002181615-b8543db493a5 h1:rZQtoozkfsiNs36c7Tdv/gyGNzD1X1XWKO8rptVNZuM=
+github.com/phayes/freeport v0.0.0-20171002181615-b8543db493a5/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE=
 github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/poy/eachers v0.0.0-20181020210610-23942921fe77 h1:SNdqPRvRsVmYR0gKqFvrUKhFizPJ6yDiGQ++VAJIoDg=
+github.com/poy/eachers v0.0.0-20181020210610-23942921fe77/go.mod h1:x1vqpbcMW9T/KRcQ4b48diSiSVtYgvwQ5xzDByEg4WE=
+github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=
 github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.2.1 h1:JnMpQc6ppsNgw9QPAGF6Dod479itz7lvlsMzzNayLOI=
+github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.7.0 h1:L+1lyG48J1zAQXA3RBX/nG/B3gjlHq0zTt2tlbJLyCY=
+github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190129233650-316cf8ccfec5/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8=
+github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
+github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
+github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
 github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
 github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
-github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 h1:hBSHahWMEgzwRyS6dRpxY0XyjZsHyQ61s084wo5PJe0=
 github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v0.0.0-20160503033757-d4c757aa9afd h1:ZDVcuZGxvWB1ooKj1e31P/ktQK4A2WumM+LucMENpds=
 github.com/smartystreets/goconvey v0.0.0-20160503033757-d4c757aa9afd/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
-github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa h1:E+gaaifzi2xF65PbDmuKI3PhLWY6G5opMLniFq8vmXA=
-github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa/go.mod h1:2RVY1rIf+2J2o/IM9+vPq9RzmHDSseB7FoXiSNIUsoU=
+github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
+github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
+github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
+github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245/go.mod h1:O1c8HleITsZqzNZDjSNzirUGsMT0oGu9LhHKoJrqO+A=
+github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 h1:mujcChM89zOHwgZBBNr5WZ77mBXP1yR+gLThGCYZgAg=
+github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0=
+github.com/tedsuo/rata v1.0.0 h1:Sf9aZrYy6ElSTncjnGkyC2yuVvz5YJetBIUKJ4CmeKE=
+github.com/tedsuo/rata v1.0.0/go.mod h1:X47ELzhOoLbfFIY0Cql9P6yo3Cdwf2CMX3FVZxRzJPc=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ulikunitz/xz v0.5.6 h1:jGHAfXawEGZQ3blwU5wnWKQJvAraT7Ftq9EXjnXYgt8=
 github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
 github.com/unrolled/render v1.0.0 h1:XYtvhA3UkpB7PqkvhUFYmpKD55OudoIeygcfus4vcd4=
@@ -274,79 +567,230 @@ github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4 h1:gKMu1Bf6QINDnvyZuTaACm9ofY+PRh+5vFz4oxBZeF8=
-github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4/go.mod h1:50wTf68f99/Zt14pr046Tgt3Lp2vLyFZKzbFXTOabXw=
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/valyala/fasttemplate v1.1.0 h1:RZqt0yGBsps8NGvLSGW804QQqCUYYLsaOjTVHy1Ocw4=
 github.com/valyala/fasttemplate v1.1.0/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec h1:Klu98tQ9Z1t23gvC7p7sCmvxkZxLhBHLNyrUPsWsYFg=
 github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec/go.mod h1:wPlfmglZmRWMYv/qJy3P+fK/UnoQB5ISk4txfNd9tDo=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v1.1.0 h1:ngVtJC9TY/lg0AA/1k48FYhBrhRoFlEmWzsehpNAaZg=
+github.com/xeipuuv/gojsonschema v1.1.0/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
+github.com/xenolf/lego v0.0.0-20160613233155-a9d8cec0e656/go.mod h1:fwiGnfsIjG7OHPfOvgK7Y/Qo6+2Ox0iozjNTkZICKbY=
+github.com/xenolf/lego v0.3.2-0.20160613233155-a9d8cec0e656 h1:BTvU+npm3/yjuBd53EvgiFLl5+YLikf2WvHsjRQ4KrY=
+github.com/xenolf/lego v0.3.2-0.20160613233155-a9d8cec0e656/go.mod h1:fwiGnfsIjG7OHPfOvgK7Y/Qo6+2Ox0iozjNTkZICKbY=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
+github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 h1:p7OofyZ509h8DmPLh8Hn+EIIZm/xYhdZHJ9GnXHdr6U=
+github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
+github.com/yvasiyarov/gorelic v0.0.6 h1:qMJQYPNdtJ7UNYHjX38KXZtltKTqimMuoQjNnSVIuJg=
+github.com/yvasiyarov/gorelic v0.0.6/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA=
+github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f h1:ERexzlUfuTvpE74urLSbIQW0Z/6hF9t8U4NsJLaioAY=
+github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
 github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
 github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190225124518-7f87c0fbb88b h1:+/WWzjwW6gidDJnMKWLKLX1gxn7irUTF1fLpQovfQ5M=
-golang.org/x/crypto v0.0.0-20190225124518-7f87c0fbb88b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f h1:R423Cnkcp5JABoeemiGEPlt9tHXFfw5kvc0yqlxRPWo=
-golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152 h1:ZC1Xn5A1nlpSmQCIva4bZ3ob3lmhYIefc+GU+DLg1Ow=
+golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 h1:00VmoueYNlNz/aHIilyyQz/MHSqGoWJzpFv/HW8xpzI=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067 h1:KYGJGHOQy8oSi1fDlSpcZF0+juKwk/hEMv5SiwHogR0=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190225153610-fe579d43d832/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190420063019-afa5a82059c6 h1:HdqqaWmYAUI7/dmByKKEw+yxDksGSo+9GjkUc9Zp34E=
-golang.org/x/net v0.0.0-20190420063019-afa5a82059c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271 h1:N66aaryRB3Ax92gH0v3hp1QYZ3zWWCCUR/j8Ifh45Ss=
+golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226191147-529b322ea346 h1:zxGQKdHVCsCsJpbd7ijKsVC27CyETheUBql7Br2TGmA=
-golang.org/x/oauth2 v0.0.0-20190226191147-529b322ea346/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be h1:QAcqgptGM8IQBC9K/RC4o+O9YmqEm0diQn9QmZw/0mU=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191028164358-195ce5e7f934 h1:u/E0NqCIWRDAo9WCFo6Ko49njPFDLSd3z+X1HgWDMpE=
+golang.org/x/sys v0.0.0-20191028164358-195ce5e7f934/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
+gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
+gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190128161407-8ac453e89fca/go.mod h1:L3J43x8/uS+qIUoksaLKe6OS3nUKxOKuIFz1sl2/jx4=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20191028173616-919d9bdd9fe6 h1:UXl+Zk3jqqcbEVV7ace5lrt4YdA4tXiz3f/KbmD29Vo=
+google.golang.org/genproto v0.0.0-20191028173616-919d9bdd9fe6/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
 google.golang.org/grpc v1.19.0 h1:cfg4PD8YEdSFnm7qLV4++93WcmhH2nIUhMjhdCvl3j8=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.24.0 h1:vb/1TCsVn3DcJlQ0Gs1yB1pKI6Do2/QNwxdKqmc/b0s=
+google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/cheggaaa/pb.v1 v1.0.27 h1:kJdccidYzt3CaHD1crCFTS1hxyhSi059NhOFUf03YFo=
 gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
+gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
+gopkg.in/square/go-jose.v1 v1.1.2 h1:/5jmADZB+RiKtZGr4HxsEFOEfbfsjTKsVnqpThUpE30=
+gopkg.in/square/go-jose.v1 v1.1.2/go.mod h1:QpYS+a4WhS+DTlyQIi6Ka7MS3SuR9a055rgXNEe6EiA=
 gopkg.in/square/go-jose.v2 v2.2.2 h1:orlkJ3myw8CN1nVQHBFfloD+L3egixIa4FvUP6RosSA=
 gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
+gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
+helm.sh/helm/v3 v3.0.0 h1:or/9cs1GgfcTQeEnR2CVJNw893/rmqIG1KsNHmUiSFw=
+helm.sh/helm/v3 v3.0.0/go.mod h1:sI7B9yfvMgxtTPMWdk1jSKJ2aa59UyP9qhPydqW6mgo=
+honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/helm v2.12.3+incompatible h1:wo1cdYjOnr5Z+LFuhtwIJaeQnec6D4gcg2H5UAKzY6w=
+k8s.io/helm v2.12.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
+k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
+k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
+k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
+k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
+k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d h1:Xpe6sK+RY4ZgCTyZ3y273UmFmURhjtoJiwOMbQsXitY=
+k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
+k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20191001043732-d647ddbd755f h1:qnPdWj5mRMsfvP85N8J2ogqiu8Aq1T6MPsJdxL3g6Ds=
+k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20191001043732-d647ddbd755f/go.mod h1:cHpnPcbNeE90PrTRnTu13OM+FN+ROt82odVbEh++81o=
+k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20191001043732-d647ddbd755f h1:bpyOu4+qNIFZRKRtSXGv/iJ7YzqwXrAOoaKxUaYKrV4=
+k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20191001043732-d647ddbd755f/go.mod h1:f1tFT2pOqPzfckbG1GjHIzy3G+T2LW7rchcruNoLaiM=
+k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20191001043732-d647ddbd755f h1:X3br+JCtf40mnzQsKAnHnezd1CvCENgG5uLJTbAspZ4=
+k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20191001043732-d647ddbd755f/go.mod h1:PNw+FbGH4/s3zK9V3rAeMiHTbQz2CU/yqAkfQ2UgLVs=
+k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20191001043732-d647ddbd755f/go.mod h1:WmFoxjELD2xtWb77Yj9RPibT5ACkQYEW9lPQtNkGtbE=
+k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20191001043732-d647ddbd755f h1:6CkT409OUoX4ZiP++1N3id3PCcOoktBvclNsDKPKrfc=
+k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20191001043732-d647ddbd755f/go.mod h1:nBogvbgjMgo7AeVA6CuqVO13LVIfmlQ11t6xzAJdBN8=
+k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20191001043732-d647ddbd755f h1:ksJC2cpBqkCP8bzmfDYXr65JRpt9JmANvaKIR3qggt4=
+k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20191001043732-d647ddbd755f/go.mod h1:GiGfbsjtP4tOW6zgpL8/vCUoyXAV5+9X2onLursPi08=
+k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20191001043732-d647ddbd755f/go.mod h1:L8deZCu6NpzgKzY91TOGKJ1JtAoHd8WyJ/HdoxqZCGo=
+k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20191001043732-d647ddbd755f/go.mod h1:spPP+vRNS8EsnNNIhFCZTTuRO3XhV1WoF18HJySoZn8=
+k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20191001043732-d647ddbd755f h1:vH4+rTRLDI8z9dQCZ6cJcIi3RMGZ6JwJWyLbrSNHBCE=
+k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20191001043732-d647ddbd755f/go.mod h1:ellVfoCz8MlDjTnkqsTkU5svJOIjcK3XNx/onmixgDk=
+k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20191001043732-d647ddbd755f/go.mod h1:vQHTmz0IaEb7/OXPSor1uga8Er0V+2M5aSdXG832NbU=
+k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
+k8s.io/utils v0.0.0-20191010214722-8d271d903fe4 h1:Gi+/O1saihwDqnlmC8Vhv1M5Sp4+rbOmK9TbsLn8ZEA=
+k8s.io/utils v0.0.0-20191010214722-8d271d903fe4/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
+modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
+modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
+modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
+modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
+modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
+rsc.io/letsencrypt v0.0.1 h1:DV0d09Ne9E7UUa9ZqWktZ9L2VmybgTgfq7xlfFR/bbU=
+rsc.io/letsencrypt v0.0.1/go.mod h1:buyQKZ6IXrRnB7TdkHP0RyEybLx18HHyOSoTyoOLqNY=
+sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
+sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
+sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
+sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA=
 sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 h1:O69FD9pJA4WUZlEwYatBEEkRWKQ5cKodWpdKTrCS/iQ=
diff --git a/src/jetstream/plugins/kubernetes/api_proxy.go b/src/jetstream/plugins/kubernetes/api_proxy.go
index bcd14dd99b..ed58cff4a9 100644
--- a/src/jetstream/plugins/kubernetes/api_proxy.go
+++ b/src/jetstream/plugins/kubernetes/api_proxy.go
@@ -2,6 +2,7 @@ package kubernetes
 
 import (
 	"fmt"
+	"sync"
 
 	//	"k8s.io/client-go/rest"
 
@@ -29,6 +30,7 @@ type KubeProxyResponse struct {
 // KubeProxyResponses represents response from multiple proxy requests to the Kube API
 type KubeProxyResponses map[string]interface{}
 
+
 // ProxyKubernetesAPI proxies an API request to all of the user's connected Kubernetes endpoints
 func (c *KubernetesSpecification) ProxyKubernetesAPI(userID string, f KubeProxyFunc) (KubeProxyResponses, error) {
 
@@ -39,12 +41,16 @@ func (c *KubernetesSpecification) ProxyKubernetesAPI(userID string, f KubeProxyF
 		return nil, fmt.Errorf("Could not get endpints Client for endpoint: %v+", err)
 	}
 
+
+	// TODO: Endpoint must be connected
 	for _, endpoint := range eps {
 		if endpoint.CNSIType == "k8s" {
 			k8sList = append(k8sList, endpoint)
 		}
 	}
 
+	mapMutex := sync.RWMutex{}
+
 	// Check that we actually have some
 	// TODO
 	done := make(chan KubeProxyResponse)
@@ -55,11 +61,13 @@ func (c *KubernetesSpecification) ProxyKubernetesAPI(userID string, f KubeProxyF
 	responses := make(KubeProxyResponses)
 	for range k8sList {
 		res := <-done
+		mapMutex.RLock()
 		if res.Error == nil {
 			responses[res.Endpoint] = res.Result
 		} else {
 			responses[res.Endpoint] = res.Error
 		}
+		mapMutex.RUnlock()
 	}
 
 	return responses, nil
diff --git a/src/jetstream/plugins/kubernetes/helm_client.go b/src/jetstream/plugins/kubernetes/helm_client.go
index 77cfda9ebc..699b94b36d 100644
--- a/src/jetstream/plugins/kubernetes/helm_client.go
+++ b/src/jetstream/plugins/kubernetes/helm_client.go
@@ -13,6 +13,7 @@ import (
 	diskcached "k8s.io/client-go/discovery/cached/disk"
 	"k8s.io/client-go/restmapper"
 	"k8s.io/client-go/tools/clientcmd"
+	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 
 	restclient "k8s.io/client-go/rest"
 
@@ -68,7 +69,7 @@ func (c *KubernetesSpecification) GetHelmConfiguration(endpointGUID, userID, nam
 		log.Error("Unable to create temporary folder")
 	}
 
-	rcg := newJetStreamRCGetter([]byte(kubeconfigcontents), hc.Folder)
+	rcg := newJetStreamRCGetter([]byte(kubeconfigcontents), hc.Folder, namespace)
 
 	var nopLogger = func(a string, b ...interface{}) {
 		log.Infof(a, b)
@@ -94,6 +95,7 @@ func (c *KubernetesSpecification) GetHelmConfiguration(endpointGUID, userID, nam
 	actionConfig.KubeClient = kc
 	actionConfig.Releases = store
 	actionConfig.Log = nopLogger
+	//actionConfig.
 
 	return &actionConfig, hc, nil
 }
@@ -103,15 +105,45 @@ type jetStreamRestClientGetter struct {
 	tempFolder   string
 }
 
-func newJetStreamRCGetter(kubeconfig []byte, tempFolder string) *jetStreamRestClientGetter {
+type jetstreamClientConfig struct {
+	clientConfig clientcmd.ClientConfig
+	namespace    string
+}
+
+func (f *jetstreamClientConfig) RawConfig() (clientcmdapi.Config, error) {
+	return f.clientConfig.RawConfig()
+}
+
+func (f *jetstreamClientConfig) ClientConfig() (*restclient.Config, error) {
+	return f.clientConfig.ClientConfig()
+}
+
+func (f *jetstreamClientConfig) Namespace() (string, bool, error) {
+	return f.namespace, false, nil
+}
+
+func (f *jetstreamClientConfig) ConfigAccess() clientcmd.ConfigAccess {
+	return f.ConfigAccess()
+}
+
+func newJetStreamRCGetter(kubeconfig []byte, tempFolder string, namespace string) *jetStreamRestClientGetter {
 
 	clientConfig, err := clientcmd.NewClientConfigFromBytes(kubeconfig)
 	if err != nil {
 		log.Error(err)
 	}
 
-	f := &jetStreamRestClientGetter{
+	jsClientConfig := &jetstreamClientConfig{
 		clientConfig: clientConfig,
+		namespace:    namespace,
+	}
+
+	log.Warn("newJetStreamRCGetter")
+	ns, b, er := jsClientConfig.Namespace()
+	log.Warnf("%s %b %+v", ns, b, er)
+
+	f := &jetStreamRestClientGetter{
+		clientConfig: jsClientConfig,
 		tempFolder:   tempFolder,
 	}
 	return f
diff --git a/src/jetstream/plugins/kubernetes/install_release.go b/src/jetstream/plugins/kubernetes/install_release.go
index 9620e62f86..0c7c6e8737 100644
--- a/src/jetstream/plugins/kubernetes/install_release.go
+++ b/src/jetstream/plugins/kubernetes/install_release.go
@@ -50,6 +50,8 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 		return fmt.Errorf("Could not get Create Release Parameters: %v+", err)
 	}
 
+	log.Warn("%+v", params)
+
 	chartID := fmt.Sprintf("%s/%s", params.Chart.Repository, params.Chart.Name)
 
 	log.Info("Installing release")
@@ -116,12 +118,15 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 	install := action.NewInstall(config)
 	install.ReleaseName = params.Name
 	install.Namespace = params.Namespace
+
+	log.Warnf("%+v", install)
+
 	// Set timeout
 	// Wait?
 	// Generate Name ?
 	// Atomic?
 
-	release, err := install.Run(chart, userSuppliedValues)
+	release, err := install.Run(chart, nil)
 	if err != nil {
 		log.Error(err)
 		return fmt.Errorf("Could not install Helm Chart: %v+", err)
diff --git a/src/jetstream/plugins/kubernetes/list_releases.go b/src/jetstream/plugins/kubernetes/list_releases.go
index 337f6e1b01..34d611f6af 100644
--- a/src/jetstream/plugins/kubernetes/list_releases.go
+++ b/src/jetstream/plugins/kubernetes/list_releases.go
@@ -4,6 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 
+	"time"
+
 	//"fmt"
 
 	"github.com/gorilla/websocket"
@@ -222,24 +224,40 @@ func (c *KubernetesSpecification) GetRelease(ec echo.Context) error {
 	graph.ParseManifest(rel)
 	sendResource(ws, "Graph", graph)
 
+	stopchan := make(chan bool)
+
+	go readLoop(ws, stopchan)
+
 	// Now we have everything, so loop, polling to get status
-	// for {
+	for {
+		log.Warn("Polling for release - wait 10 seconds")
+
+		select {
+		case <-stopchan:
+			log.Error("***  RELEASE POLLER HAS FINISHED")
+			log.Error("****************************************************************************************************")
+			ws.Close()
+			return nil
+		case <-time.After(10 * time.Second):
+			break
+		}
+
+		log.Warn("Polling for release ....")
 
-	// 	log.Warn("Polling for release - wait 10 seconds")
-	// 	time.Sleep(10 * time.Second)
+		// Pods
+		rel.UpdatePods(c.portalProxy)
+		sendResource(ws, "Pods", rel.GetPods())
 
-	// 	log.Warn("Polling for release ....")
+		graph.ParseManifest(rel)
+		sendResource(ws, "Graph", graph)
 
-	// 	// Pods
-	// 	pods := rel.GetPods(c.portalProxy)
-	// 	err = sendResource(ws, "Pods", pods)
-	// 	log.Error(err)
+		// Now get all of the resources in the manifest
+		rel.UpdateResources(c.portalProxy)
+		sendResource(ws, "Resources", rel.GetResources())
 
-	// 	// Now get all of the resources in the manifest
-	// 	all := rel.GetResources(c.portalProxy)
-	// 	err = sendResource(ws, "Resources", all)
-	// 	log.Error(err)
-	// }
+		graph.ParseManifest(rel)
+		sendResource(ws, "Graph", graph)
+	}
 
 	log.Error("****************************************************************************************************")
 	log.Error("RELEASE POLLER HAS FINISHED")
@@ -250,6 +268,17 @@ func (c *KubernetesSpecification) GetRelease(ec echo.Context) error {
 	return nil
 }
 
+func readLoop(c *websocket.Conn, stopchan chan<- bool) {
+	for {
+		if _, _, err := c.NextReader(); err != nil {
+			log.Error("WEB SOCKET HAS BEEN CLOSED")
+			c.Close()
+			close(stopchan)
+			break
+		}
+	}
+}
+
 func sendResource(ws *websocket.Conn, kind string, data interface{}) error {
 
 	var err error
diff --git a/src/jetstream/repository/interfaces/jetstream_error.go b/src/jetstream/repository/interfaces/jetstream_error.go
new file mode 100644
index 0000000000..ef8cd6cd1d
--- /dev/null
+++ b/src/jetstream/repository/interfaces/jetstream_error.go
@@ -0,0 +1,32 @@
+package interfaces
+
+import (
+	"fmt"
+
+	"github.com/labstack/echo"
+)
+
+// JetstreamError is standard error response from JetSteam for REST APIs
+type JetstreamError struct {
+	Status          int
+	LogMessage      string
+	UserFacingError string
+}
+
+func (e JetstreamError) Error() string {
+	return fmt.Sprintf("HTTP Error: Status %d -> Log Message: %s", e.Status, e.LogMessage)
+}
+
+// HTTPError formats the error as an echo HTTPError
+func (e JetstreamError) HTTPError() *echo.HTTPError {
+	return echo.NewHTTPError(e.Status, fmt.Sprintf(`{"error":%q}`, e.UserFacingError))
+}
+
+// NewJetstreamError creates a new JetStream error
+func NewJetstreamError(status int, userFacingError string) error {
+	shadowError := JetstreamError{
+		Status:          status,
+		UserFacingError: userFacingError,
+	}
+	return shadowError
+}

From c703f209188f36ae53c861636b18a01be21aeb42 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 6 Dec 2019 07:28:11 +0000
Subject: [PATCH 195/648] WIP: Stateful sets

---
 .../plugins/kubernetes/helm/graph.go          | 23 ++++++++++++++++---
 .../plugins/kubernetes/helm/release.go        |  2 ++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/helm/graph.go b/src/jetstream/plugins/kubernetes/helm/graph.go
index e37b12ca50..2afbd7b14d 100644
--- a/src/jetstream/plugins/kubernetes/helm/graph.go
+++ b/src/jetstream/plugins/kubernetes/helm/graph.go
@@ -9,6 +9,8 @@ import (
 	log "github.com/sirupsen/logrus"
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
+	appsv1beta1 "k8s.io/api/apps/v1beta1"
+	appsv1beta2 "k8s.io/api/apps/v1beta2"
 	extv1beta1 "k8s.io/api/extensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -75,12 +77,27 @@ func (r *HelmReleaseGraph) ParseManifest(release *HelmRelease) {
 			target := getShortResourceId(o.Kind, o.Name)
 			r.ParseResourceOwners(target, o.OwnerReferences)
 			node.Data.Status = mapDeploymentStatus(o.Status.Replicas, o.Status.ReadyReplicas, o.Status.AvailableReplicas, o.Status.UnavailableReplicas)
-			log.Warnf("Status %s => %s", o.Name, node.Data.Status)
+		case *appsv1beta1.Deployment:
+			target := getShortResourceId(o.Kind, o.Name)
+			r.ParseResourceOwners(target, o.OwnerReferences)
+			node.Data.Status = mapDeploymentStatus(o.Status.Replicas, o.Status.ReadyReplicas, o.Status.AvailableReplicas, o.Status.UnavailableReplicas)
+		case *appsv1beta2.Deployment:
+			target := getShortResourceId(o.Kind, o.Name)
+			r.ParseResourceOwners(target, o.OwnerReferences)
+			node.Data.Status = mapDeploymentStatus(o.Status.Replicas, o.Status.ReadyReplicas, o.Status.AvailableReplicas, o.Status.UnavailableReplicas)
 		case *extv1beta1.Deployment:
 			target := getShortResourceId(o.Kind, o.Name)
 			r.ParseResourceOwners(target, o.OwnerReferences)
 			node.Data.Status = mapDeploymentStatus(o.Status.Replicas, o.Status.ReadyReplicas, o.Status.AvailableReplicas, o.Status.UnavailableReplicas)
-			log.Warnf("Status %s => %s", o.Name, node.Data.Status)
+		case *appsv1.StatefulSet:
+			target := getShortResourceId(o.Kind, o.Name)
+			r.ParseResourceOwners(target, o.OwnerReferences)
+		case *appsv1beta2.StatefulSet:
+			target := getShortResourceId(o.Kind, o.Name)
+			r.ParseResourceOwners(target, o.OwnerReferences)
+		case *appsv1beta1.StatefulSet:
+			target := getShortResourceId(o.Kind, o.Name)
+			r.ParseResourceOwners(target, o.OwnerReferences)
 		case *appsv1.ReplicaSet:
 			target := getShortResourceId(o.Kind, o.Name)
 			r.ParseResourceOwners(target, o.OwnerReferences)
@@ -94,7 +111,7 @@ func (r *HelmReleaseGraph) ParseManifest(release *HelmRelease) {
 			target := getShortResourceId(item.Kind, o.Name)
 			r.ProcessService(target, item, o.Spec)
 		default:
-			log.Errorf("Unknown type: %s", reflect.TypeOf(o))
+			log.Errorf("Graph: Unknown type: %s", reflect.TypeOf(o))
 		}
 
 		// Add or replace the node in the map
diff --git a/src/jetstream/plugins/kubernetes/helm/release.go b/src/jetstream/plugins/kubernetes/helm/release.go
index 3a4119e1e6..bc29196821 100644
--- a/src/jetstream/plugins/kubernetes/helm/release.go
+++ b/src/jetstream/plugins/kubernetes/helm/release.go
@@ -167,6 +167,8 @@ func (r *HelmRelease) processDeployment(kres KubeResource) {
 		r.processPodSelector(kres, o.Spec.Selector)
 	case *appsv1beta2.StatefulSet:
 		r.processPodSelector(kres, o.Spec.Selector)
+	case *appsv1beta1.StatefulSet:
+		r.processPodSelector(kres, o.Spec.Selector)
 	case *appsv1.DaemonSet:
 		r.processPodSelector(kres, o.Spec.Selector)
 	default:

From ee946edb19a0a3d1ea893806b951396281f1f545 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 6 Dec 2019 08:06:23 +0000
Subject: [PATCH 196/648] Fix color issue

---
 .../helm-release-resource-graph.component.html              | 6 ++++--
 .../core/sass/components/ngx-charts-gauge.theme.scss        | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
index f6dc66a353..e9c2a106cb 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
@@ -19,14 +19,16 @@
   [layout]="layout"
 >
   <ng-template #nodeTemplate let-node>
-    <svg:g class="node">
+    <svg:g class="node ">
       <svg:rect
         [attr.width]="node.dimension.width"
         [attr.height]="node.dimension.height"
         [attr.fill]="node.data.fill"
         class="node"></svg:rect>
       />
-      <svg:text alignment-baseline="central"
+      <svg:text
+      class="no-style"
+      alignment-baseline="central"
       [attr.fill]="node.data.text"
       [attr.x]="10" [attr.y]="node.dimension.height / 2">
         {{node.label}} ({{node.data.kind}})
diff --git a/src/frontend/packages/core/sass/components/ngx-charts-gauge.theme.scss b/src/frontend/packages/core/sass/components/ngx-charts-gauge.theme.scss
index 406a49f950..f049f1b82f 100644
--- a/src/frontend/packages/core/sass/components/ngx-charts-gauge.theme.scss
+++ b/src/frontend/packages/core/sass/components/ngx-charts-gauge.theme.scss
@@ -1,6 +1,6 @@
 @mixin ngx-charts-gauge($theme, $app-theme) {
   $foreground-colors: map-get($theme, foreground);
-  ngx-charts-chart text {
+  ngx-charts-chart text:not(.no-style) {
     fill: mat-color($foreground-colors, text);
   }
 }

From c420ed1b783447b81dd10c5d91db1eecbb3d24a0 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 6 Dec 2019 08:56:55 +0000
Subject: [PATCH 197/648] updates

---
 .../app/custom/helm/helm-entity-factory.ts    |  9 +++++++++
 .../app/custom/helm/helm-entity-generator.ts  | 11 +++++++++++
 .../helm-release-tab-base.component.ts        |  9 ++++++++-
 .../tabs/helm-release-helper.service.ts       | 11 +++++++++--
 .../helm-release-summary-tab.component.ts     | 15 +++++++++++++++
 .../helm-release-values-tab.component.html    |  8 ++++++++
 .../helm-release-values-tab.component.ts      |  2 ++
 .../app/custom/helm/store/helm.actions.ts     | 19 +++++++++++++++++++
 .../app/custom/helm/store/helm.types.ts       |  2 ++
 .../components/mat-button-toggle-group.scss   |  7 +++++++
 src/frontend/packages/core/src/styles.scss    |  2 ++
 11 files changed, 92 insertions(+), 3 deletions(-)
 create mode 100644 src/frontend/packages/core/sass/components/mat-button-toggle-group.scss

diff --git a/custom-src/frontend/app/custom/helm/helm-entity-factory.ts b/custom-src/frontend/app/custom/helm/helm-entity-factory.ts
index d3b132757a..d9cdae9085 100644
--- a/custom-src/frontend/app/custom/helm/helm-entity-factory.ts
+++ b/custom-src/frontend/app/custom/helm/helm-entity-factory.ts
@@ -9,6 +9,7 @@ import {
   HelmVersion,
   MonocularChart,
   HelmReleaseGraph,
+  HelmReleaseResource,
 } from './store/helm.types';
 
 export const monocularChartsEntityType = 'monocularCharts';
@@ -19,6 +20,7 @@ export const helmReleaseStatusEntityType = 'helmReleaseStatus';
 export const helmReleasePodEntityType = 'helmReleasePod';
 export const helmReleaseServiceEntityType = 'helmReleaseService';
 export const helmReleaseGraphEntityType = 'helmReleaseGraph';
+export const helmReleaseResourceEntityType = 'helmReleaseResource';
 
 export const getMonocularChartId = (entity: MonocularChart) => entity.id;
 export const getHelmReleaseId = (entity: HelmRelease) => entity.endpointId;
@@ -27,6 +29,7 @@ export const getHelmReleaseStatusId = (entity: HelmReleaseStatus) => entity.endp
 export const getHelmReleasePodId = (entity: HelmReleasePod) => entity.name;
 export const getHelmReleaseServiceId = (entity: HelmReleaseService) => entity.name;
 export const getHelmReleaseGraphId = (entity: HelmReleaseGraph) => entity.endpointId;
+export const getHelmReleaseReleaseId = (entity: HelmReleaseResource) => entity.endpointId;
 
 export const HELM_ENDPOINT_TYPE = 'helm';
 
@@ -94,6 +97,12 @@ entityCache[helmReleaseGraphEntityType] = new HelmEntitySchema(
   { idAttribute: getHelmReleaseGraphId }
 );
 
+entityCache[helmReleaseResourceEntityType] = new HelmEntitySchema(
+  helmReleaseResourceEntityType,
+  {},
+  { idAttribute: getHelmReleaseReleaseId }
+);
+
 export function helmEntityFactory(key: string): EntitySchema {
   const entity = entityCache[key];
   if (!entity) {
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 6efc9dcc45..6d14c5fdfa 100644
--- a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
+++ b/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
@@ -15,6 +15,7 @@ import {
   helmReleaseGraphEntityType,
   helmVersionsEntityType,
   monocularChartsEntityType,
+  helmReleaseResourceEntityType,
 } from './helm-entity-factory';
 import {
   HelmRelease,
@@ -24,6 +25,7 @@ import {
   HelmVersion,
   MonocularChart,
   HelmReleaseGraph,
+  HelmReleaseResource,
 } from './store/helm.types';
 
 
@@ -50,6 +52,7 @@ export function generateHelmEntities(): StratosBaseCatalogueEntity[] {
     generateReleasePodEntity(endpointDefinition),
     generateReleaseServiceEntity(endpointDefinition),
     generateReleaseGraphEntity(endpointDefinition),
+    generateReleaseResourceEntity(endpointDefinition),
   ];
 }
 
@@ -123,4 +126,12 @@ function generateReleaseGraphEntity(endpointDefinition: StratosEndpointExtension
   return new StratosCatalogueEntity<IFavoriteMetadata, HelmReleaseGraph>(definition);
 }
 
+function generateReleaseResourceEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: helmReleaseResourceEntityType,
+    schema: helmEntityFactory(helmReleaseResourceEntityType),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogueEntity<IFavoriteMetadata, HelmReleaseResource>(definition);
+}
 
diff --git a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts b/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
index 5ac80fae21..b1ca0226bc 100644
--- a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
@@ -1,4 +1,4 @@
-import { HELM_ENDPOINT_TYPE } from './../../helm-entity-factory';
+import { HELM_ENDPOINT_TYPE, helmReleaseResourceEntityType } from './../../helm-entity-factory';
 import { GetHelmReleaseServices } from './../../store/helm.actions';
 import { entityCatalogue } from './../../../../core/entity-catalogue/entity-catalogue.service';
 import { Component, OnDestroy } from '@angular/core';
@@ -155,6 +155,7 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
           );
           const svcs = [];
 
+          // Store ALL resources for the release
           manifest.forEach(resource => {
             if (resource.kind === 'Service' && prefix) {
               console.log(`Service: ${prefix}-${resource.metadata.name}`);
@@ -165,6 +166,12 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
           if (svcs.length > 0) {
             this.populateList(releaseServicesAction, svcs, (svc) => `${prefix}-${svc.metadata.name}`);
           }
+
+          const resources = {...manifest};
+          resources.endpointId = this.helmReleaseHelper.endpointGuid;
+          resources.releaseTitle = this.helmReleaseHelper.releaseTitle;
+          this.addResource(helmReleaseResourceEntityType,
+            resources, `${resources.endpointId}-${resources.releaseTitle}`, HELM_ENDPOINT_TYPE);
         }
       }
     });
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
index a9dfe96eb8..26694e8905 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
@@ -6,8 +6,8 @@ import { map, tap } from 'rxjs/operators';
 import { EntityServiceFactory } from '../../../../core/entity-service-factory.service';
 import { PaginationMonitor } from '../../../../shared/monitors/pagination-monitor';
 import { helmEntityFactory, helmReleaseEntityKey } from '../../helm-entity-factory';
-import { GetHelmReleases, GetHelmReleaseStatus, GetHelmReleaseGraph } from '../../store/helm.actions';
-import { HelmRelease, HelmReleaseGuid, HelmReleaseStatus, HelmReleaseGraph } from '../../store/helm.types';
+import { GetHelmReleases, GetHelmReleaseStatus, GetHelmReleaseGraph, GetHelmReleaseResource } from '../../store/helm.actions';
+import { HelmRelease, HelmReleaseGuid, HelmReleaseStatus, HelmReleaseGraph, HelmReleaseResource } from '../../store/helm.types';
 import { AppState } from './../../../../../../store/src/app-state';
 import {
   getPaginationObservables,
@@ -74,4 +74,11 @@ export class HelmReleaseHelperService {
     );
   }
 
+  public fetchReleaseResources(): Observable<HelmReleaseResource> {
+    // Get helm release
+    const action = new GetHelmReleaseResource(this.endpointGuid, this.releaseTitle);
+    return this.esf.create<HelmReleaseResource>(action.key, action).waitForEntity$.pipe(
+      map(entity => entity.entity)
+    );
+  }
 }
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index 377ec5a750..a4d6780915 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -69,6 +69,21 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
     const releaseStatus$ = new BehaviorSubject<HelmReleaseStatus>({} as HelmReleaseStatus);
     //.helmReleaseHelper.fetchReleaseStatus();
 
+
+    this.helmReleaseHelper.fetchReleaseResources().subscribe((g: any) => {
+      if (g) {
+        console.log('SUMMARY');
+        console.log(g);
+
+        Object.values(g).forEach((r: any) => console.log(r.kind));
+      }
+      // const resKinds = {};
+      // g.forEach(r => {
+      //   console.log(r);
+      // });
+    });
+
+
     this.isBusy$ = combineLatest([
       this.helmReleaseHelper.isFetching$,
       releaseStatus$,
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
index b4d9c2e6d8..536fdfe150 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
@@ -1,4 +1,12 @@
 <app-page-sub-nav>
+
+  <mat-button-toggle-group class="toolbar" [value]="viewType"
+    (change)="themeService.setTheme($event.value)" name="view" aria-label="View">
+    <mat-button-toggle value="user">User</mat-button-toggle>
+    <mat-button-toggle value="chart">Chart</mat-button-toggle>
+    <mat-button-toggle value="combined">Combined</mat-button-toggle>
+  </mat-button-toggle-group>
+
   <button mat-button name="expand_all" (click)="viewer.expand()" matTooltip="Expand all">
     <mat-icon>expand_more</mat-icon>
     <span>Expand all</span>
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
index c5c7d5471f..5a8dbf09e8 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
@@ -13,6 +13,8 @@ export class HelmReleaseValuesTabComponent {
 
   public values$: Observable<string>;
 
+  public viewType = 'user';
+
   constructor(public helmReleaseHelper: HelmReleaseHelperService) {
 
     this.values$ = helmReleaseHelper.release$.pipe(
diff --git a/custom-src/frontend/app/custom/helm/store/helm.actions.ts b/custom-src/frontend/app/custom/helm/store/helm.actions.ts
index d3df78b09d..6041671ae4 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.actions.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.actions.ts
@@ -14,6 +14,7 @@ import {
   helmVersionsEntityType,
   helmReleaseGraphEntityType,
   monocularChartsEntityType,
+  helmReleaseResourceEntityType,
 } from '../helm-entity-factory';
 
 import { PaginatedAction } from './../../../../../store/src/types/pagination.types';
@@ -150,6 +151,24 @@ export class GetHelmReleaseGraph implements EntityRequestAction {
   actions = [this.type];
 }
 
+// Never dispateched - just used for look-up
+// Don't know why I need an action for this rather than an entity type?
+export class GetHelmReleaseResource implements EntityRequestAction {
+  key: string;
+  constructor(
+    public endpointGuid: string,
+    public releaseTitle: string
+  ) {
+    this.key = `${endpointGuid}-${releaseTitle}`;
+  }
+  type = this.constructor.name;
+  endpointType = HELM_ENDPOINT_TYPE;
+  entity = helmEntityFactory(helmReleaseResourceEntityType);
+  entityType = helmReleaseResourceEntityType;
+  actions = [this.type];
+}
+
+
 export class GetHelmReleasePods implements MonocularPaginationAction {
   constructor(
     public endpointGuid: string,
diff --git a/custom-src/frontend/app/custom/helm/store/helm.types.ts b/custom-src/frontend/app/custom/helm/store/helm.types.ts
index 2e0298123d..cd6fcb1a86 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.types.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.types.ts
@@ -103,6 +103,8 @@ export interface HelmReleaseGraph {
   releaseTitle: string;
 }
 
+export type HelmReleaseResource = any;
+
 export function isHelmReleaseService(obj: any): HelmReleaseService {
   if (obj && obj.kubeService$) {
     return obj as HelmReleaseService;
diff --git a/src/frontend/packages/core/sass/components/mat-button-toggle-group.scss b/src/frontend/packages/core/sass/components/mat-button-toggle-group.scss
new file mode 100644
index 0000000000..855e7902d3
--- /dev/null
+++ b/src/frontend/packages/core/sass/components/mat-button-toggle-group.scss
@@ -0,0 +1,7 @@
+
+.mat-button-toggle-group.toolbar {
+  .mat-button-toggle-appearance-standard .mat-button-toggle-label-content {
+    font-size: 14px;
+    line-height: 30px;
+  }
+}
diff --git a/src/frontend/packages/core/src/styles.scss b/src/frontend/packages/core/src/styles.scss
index f6e062111e..efc3234fb7 100644
--- a/src/frontend/packages/core/src/styles.scss
+++ b/src/frontend/packages/core/src/styles.scss
@@ -10,6 +10,8 @@
 @import '../sass/components/mat-popup';
 @import '../sass/components/mat-tabs';
 @import '../sass/components/mat-table';
+@import '../sass/components/mat-button-toggle-group';
+
 body {
   font-family: Lato, sans-serif; // font-size: 13px;
   margin: 0;

From 67b10540be54044f4a447e6d071f225df967891c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Avelino?= <vavelino@suse.com>
Date: Fri, 6 Dec 2019 08:23:08 -0300
Subject: [PATCH 198/648] k8s endpoint: added sidepanel preview component

---
 ...kubernetes-endpoint-preview.component.html |  72 +++++++++
 ...kubernetes-endpoint-preview.component.scss |   0
 ...ernetes-endpoint-preview.component.spec.ts |  37 +++++
 .../kubernetes-endpoint-preview.component.ts  |  74 ++++++++++
 .../kubernetes/kubernetes-entity-generator.ts |   2 +
 .../kubernetes/kubernetes.setup.module.ts     |  11 +-
 .../services/kubernetes-endpoint.service.ts   | 110 +++++++++++++-
 .../kubernetes-summary.component.ts           | 139 +++++-------------
 8 files changed, 334 insertions(+), 111 deletions(-)
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.html
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.scss
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.ts

diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.html
new file mode 100644
index 0000000000..e216ce4ad7
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.html
@@ -0,0 +1,72 @@
+<app-sidepanel-preview [title]="title">
+  <app-tile-grid fit="true">
+    <app-loading-page [isLoading]="detailsLoading$" text="Retrieving details">
+      <app-tile-group>
+        <app-tile>
+          <div class="cf-space-usage">
+            <mat-card>
+              <mat-card-header>
+                <mat-card-title>Summary</mat-card-title>
+              </mat-card-header>
+              <mat-card-content>
+                <app-tile-group class="app-metadata">
+                  <app-tile class="app-metadata__two-cols">
+                    <app-metadata-item label="Kubernetes Version">
+                      {{ kubeVersion$ | async }}
+                    </app-metadata-item>
+                  </app-tile>
+                </app-tile-group>
+              </mat-card-content>
+            </mat-card>
+          </div>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile>
+          <app-card-number-metric [link]="podsLink" icon="apps" label="Pods" labelSingular="Pod"
+            value="{{ podCount$ | async }}"></app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric [link]="nodesLink" icon="apps" label="Nodes" labelSingular="Node"
+            value="{{ nodeCount$ | async }}"></app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric [link]="appsLink" icon="apps" label="Applications" labelSingular="Application"
+            value="{{ appCount$ | async }}"></app-card-number-metric>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile>
+          <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Pod Usage"
+            value="{{ (podCapacity$ | async)?.used }}"
+            limit="{{ (podCapacity$ | async)?.total }}"></app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Disk Pressure"
+            value="{{ (diskPressure$ | async)?.used }}"
+            limit="{{ (diskPressure$ | async)?.total}}"></app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Memory Pressure"
+            value="{{ (memoryPressure$ | async)?.used }}"
+            limit="{{ (memoryPressure$ | async)?.total}}"></app-card-number-metric>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile>
+          <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Out of Disk"
+            value="{{ (outOfDisk$ | async)?.used }}"
+            limit="{{ (outOfDisk$ | async)?.total }}"></app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Ready"
+            value="{{ (nodesReady$ | async)?.used }}"
+            limit="{{ (nodesReady$ | async)?.total }}"></app-card-number-metric>
+        </app-tile>
+      </app-tile-group>
+    </app-loading-page>
+  </app-tile-grid>
+</app-sidepanel-preview>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.scss b/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.spec.ts
new file mode 100644
index 0000000000..6f1006656d
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.spec.ts
@@ -0,0 +1,37 @@
+import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
+import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
+import { LoggerService } from '../../../core/logger.service';
+import { KubernetesEndpointPreviewComponent } from './kubernetes-endpoint-preview.component';
+
+describe('KubernetesEndpointPreviewComponent', () => {
+  let component: KubernetesEndpointPreviewComponent;
+  let fixture: ComponentFixture<KubernetesEndpointPreviewComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [KubernetesEndpointPreviewComponent],
+      providers: [LoggerService, HttpClient, HttpHandler],
+      imports: [
+        HttpClientModule,
+        HttpClientTestingModule,
+        CoreTestingModule,
+        createBasicStoreModule()
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubernetesEndpointPreviewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.ts
new file mode 100644
index 0000000000..3f8047cf0c
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.ts
@@ -0,0 +1,74 @@
+import { Component } from '@angular/core';
+import { combineLatest, Observable } from 'rxjs';
+import { map, startWith } from 'rxjs/operators';
+
+import {
+  ISimpleUsageChartData,
+} from '../../../../../core/src/shared/components/simple-usage-chart/simple-usage-chart.types';
+import { PreviewableComponent } from '../../../../../core/src/shared/previewable-component';
+import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
+
+@Component({
+  selector: 'app-kubernetes-endpoint-preview-component',
+  templateUrl: './kubernetes-endpoint-preview.component.html',
+  styleUrls: ['./kubernetes-endpoint-preview.component.scss']
+})
+export class KubernetesEndpointPreviewComponent implements PreviewableComponent {
+
+  title: string = null;
+  detailsLoading$: Observable<boolean>;
+  kubeVersion$: Observable<string>;
+  podCount$: Observable<number>;
+  nodeCount$: Observable<number>;
+  appCount$: Observable<number>;
+  podCapacity$: Observable<ISimpleUsageChartData>;
+  diskPressure$: Observable<ISimpleUsageChartData>;
+  memoryPressure$: Observable<ISimpleUsageChartData>;
+  outOfDisk$: Observable<ISimpleUsageChartData>;
+  nodesReady$: Observable<ISimpleUsageChartData>;
+  podsLink: string;
+  nodesLink: string;
+  appsLink: string;
+
+  constructor(
+    public kubeEndpointService: KubernetesEndpointService,
+  ) { }
+
+  setProps(props: { [key: string]: any }) {
+    const kubeGuid = props.cfGuid;
+
+    this.title = props.title;
+
+    this.kubeEndpointService.initialize(kubeGuid);
+    const nodes$ = this.kubeEndpointService.nodes$;
+
+    this.kubeVersion$ = this.kubeEndpointService.getNodeKubeVersions();
+    this.podCount$ = this.kubeEndpointService.getCountObservable(this.kubeEndpointService.pods$);
+    this.nodeCount$ = this.kubeEndpointService.getCountObservable(nodes$);
+    this.appCount$ = this.kubeEndpointService.getCountObservable(this.kubeEndpointService.apps$);
+    this.podCapacity$ = this.kubeEndpointService.getPodCapacity();
+    this.diskPressure$ = this.kubeEndpointService.getNodeStatusCount(this.kubeEndpointService.nodes$, 'DiskPressure');
+    this.memoryPressure$ = this.kubeEndpointService.getNodeStatusCount(this.kubeEndpointService.nodes$, 'MemoryPressure');
+    this.outOfDisk$ = this.kubeEndpointService.getNodeStatusCount(nodes$, 'OutOfDisk');
+    this.nodesReady$ = this.kubeEndpointService.getNodeStatusCount(nodes$, 'Ready');
+
+    this.podsLink = `/kubernetes/${kubeGuid}/pods`;
+    this.nodesLink = `/kubernetes/${kubeGuid}/nodes`;
+    this.appsLink = `/kubernetes/${kubeGuid}/apps`;
+
+    this.detailsLoading$ = combineLatest([
+      this.podCount$,
+      this.nodeCount$,
+      this.appCount$,
+      this.podCapacity$,
+      this.diskPressure$,
+      this.memoryPressure$,
+      this.outOfDisk$,
+      this.nodesReady$,
+      // this.networkUnavailable$,
+    ]).pipe(
+      map(() => false),
+      startWith(true),
+    );
+  }
+}
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 c6e79f120b..0b9ea19dbe 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
@@ -17,6 +17,7 @@ import {
   KubernetesConfigAuthFormComponent,
 } from './auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component';
 import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component';
+import { KubernetesEndpointPreviewComponent } from './kubernetes-endpoint-preview/kubernetes-endpoint-preview.component';
 import {
   KUBERNETES_ENDPOINT_TYPE,
   kubernetesAppsEntityType,
@@ -154,6 +155,7 @@ function generateEndpointEntity(endpointDefinition: StratosEndpointExtensionDefi
   return new StratosCatalogueEndpointEntity(
     endpointDefinition,
     metadata => `/kubernetes/${metadata.guid}`,
+    () => KubernetesEndpointPreviewComponent,
   );
 }
 
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
index 5ade43114c..78170c7b79 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
@@ -16,9 +16,12 @@ import {
   KubernetesConfigAuthFormComponent,
 } from './auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component';
 import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component';
+import { KubernetesEndpointPreviewComponent } from './kubernetes-endpoint-preview/kubernetes-endpoint-preview.component';
 import { KUBERNETES_ENDPOINT_TYPE } from './kubernetes-entity-factory';
 import { generateKubernetesEntities } from './kubernetes-entity-generator';
+import { BaseKubeGuid } from './kubernetes-page.types';
 import { KubernetesStoreModule } from './kubernetes.store.module';
+import { KubernetesEndpointService } from './services/kubernetes-endpoint.service';
 import { KubeHealthCheck } from './store/kubernetes.actions';
 
 
@@ -28,19 +31,25 @@ import { KubeHealthCheck } from './store/kubernetes.actions';
     CoreModule,
     CommonModule,
     SharedModule,
-    KubernetesStoreModule,
+    KubernetesStoreModule
   ],
   declarations: [
     KubernetesCertsAuthFormComponent,
     KubernetesAWSAuthFormComponent,
     KubernetesConfigAuthFormComponent,
     KubernetesGKEAuthFormComponent,
+    KubernetesEndpointPreviewComponent,
+  ],
+  providers: [
+    BaseKubeGuid,
+    KubernetesEndpointService,
   ],
   entryComponents: [
     KubernetesCertsAuthFormComponent,
     KubernetesAWSAuthFormComponent,
     KubernetesConfigAuthFormComponent,
     KubernetesGKEAuthFormComponent,
+    KubernetesEndpointPreviewComponent,
   ]
 })
 export class KubernetesSetupModule {
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
index 9816a4bbea..99c8fe47ba 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
+import { combineLatest, Observable } from 'rxjs';
 import { filter, first, map, shareReplay, startWith, switchMap } from 'rxjs/operators';
 
 import { GetAllEndpoints } from '../../../../../store/src/actions/endpoint.actions';
@@ -12,16 +12,27 @@ import { EntityService } from '../../../core/entity-service';
 import { EntityServiceFactory } from '../../../core/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory';
 import {
+  kubernetesAppsEntityType,
   kubernetesDeploymentsEntityType,
+  kubernetesNodesEntityType,
   kubernetesPodsEntityType,
   kubernetesServicesEntityType,
   kubernetesStatefulSetsEntityType,
 } from '../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../kubernetes-page.types';
-import { KubernetesDeployment, KubernetesPod, KubernetesStatefulSet, KubeService } from '../store/kube.types';
+import {
+  KubernetesApp,
+  KubernetesDeployment,
+  KubernetesNode,
+  KubernetesPod,
+  KubernetesStatefulSet,
+  KubeService,
+} from '../store/kube.types';
 import {
   GeKubernetesDeployments,
+  GetKubernetesApps,
   GetKubernetesDashboard,
+  GetKubernetesNodes,
   GetKubernetesPods,
   GetKubernetesServices,
   GetKubernetesStatefulSets,
@@ -42,6 +53,8 @@ export class KubernetesEndpointService {
   statefulSets$: Observable<KubernetesStatefulSet[]>;
   services$: Observable<KubeService[]>;
   pods$: Observable<KubernetesPod[]>;
+  apps$: Observable<KubernetesApp[]>;
+  nodes$: Observable<KubernetesNode[]>;
   kubeDashboardEnabled$: Observable<boolean>;
 
   constructor(
@@ -50,7 +63,16 @@ export class KubernetesEndpointService {
     private entityServiceFactory: EntityServiceFactory,
     private paginationMonitorFactory: PaginationMonitorFactory
   ) {
-    this.kubeGuid = baseKube.guid;
+    const kubeGuid = baseKube.guid;
+
+    if (kubeGuid) {
+      this.initialize(kubeGuid);
+    }
+  }
+
+  initialize(kubeGuid) {
+    this.kubeGuid = kubeGuid;
+
     this.kubeEndpointEntityService = this.entityServiceFactory.create(
       this.kubeGuid,
       new GetAllEndpoints()
@@ -59,7 +81,77 @@ export class KubernetesEndpointService {
     this.constructCoreObservables();
   }
 
-  constructCoreObservables() {
+  getNodeKubeVersions(nodes$: Observable<KubernetesNode[]> = this.nodes$) {
+    return nodes$.pipe(
+      map(nodes => {
+        const versions = {};
+        nodes.forEach(node => {
+          const v = node.status.nodeInfo.kubeletVersion;
+          if (!versions[v]) {
+            versions[v] = v;
+          }
+        });
+        return Object.keys(versions).join(',');
+      })
+    );
+  }
+
+  getCountObservable(entities$: Observable<any[]>) {
+    return entities$.pipe(
+      map(entities => entities.length),
+      startWith(null)
+    );
+  }
+
+  getPodCapacity(nodes$: Observable<KubernetesNode[]> = this.nodes$, pods$: Observable<KubernetesPod[]> = this.pods$) {
+    return combineLatest(nodes$, pods$).pipe(
+      map(([nodes, pods]) => ({
+        total: nodes.reduce((cap, node) => {
+          return cap + parseInt(node.status.capacity.pods, 10);
+        }, 0),
+        used: pods.length
+      }))
+    );
+  }
+
+  getNodeStatusCount(
+    nodes$: Observable<KubernetesNode[]>,
+    conditionType: string,
+    valueLabels: object = {},
+    countStatus = 'True'
+  ) {
+    return nodes$.pipe(
+      map(nodes => {
+        const total = nodes.length;
+        const { unknown, unavailable, used } = nodes.reduce((cap, node) => {
+          const conditionStatus = node.status.conditions.find(con => con.type === conditionType);
+          if (!conditionStatus || !conditionStatus.status) {
+            ++cap.unavailable;
+          } else {
+            if (conditionStatus.status === countStatus) {
+              ++cap.used;
+            } else if (conditionStatus.status === 'Unknown') {
+              ++cap.unknown;
+            }
+          }
+          return cap;
+        }, { unavailable: 0, used: 0, unknown: 0 });
+        const result = {
+          total,
+          supported: total !== unavailable,
+          // Depends on K8S version as to what is supported
+          unavailable,
+          used,
+          unknown,
+          ...valueLabels
+        };
+        result.supported = result.total !== result.unavailable;
+        return result;
+      })
+    );
+  }
+
+  private constructCoreObservables() {
     this.endpoint$ = this.kubeEndpointEntityService.waitForEntity$;
 
     this.connected$ = this.endpoint$.pipe(
@@ -78,6 +170,16 @@ export class KubernetesEndpointService {
       kubernetesPodsEntityType
     );
 
+    this.nodes$ = this.getObservable<KubernetesNode>(
+      new GetKubernetesNodes(this.kubeGuid),
+      kubernetesNodesEntityType
+    );
+
+    this.apps$ = this.getObservable<KubernetesApp>(
+      new GetKubernetesApps(this.kubeGuid),
+      kubernetesAppsEntityType
+    );
+
     this.statefulSets$ = this.getObservable<KubernetesStatefulSet>(
       new GetKubernetesStatefulSets(this.kubeGuid),
       kubernetesStatefulSetsEntityType
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 5b56862e8b..754b504b63 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
@@ -17,8 +17,6 @@ import {
 import { PaginationMonitorFactory } from '../../../../shared/monitors/pagination-monitor.factory';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
 import { GetKubernetesNodes, GetKubernetesPods } from '../../store/kubernetes.actions';
-import { KubernetesNode } from './../../../../../../../../../custom-src/frontend/app/custom/kubernetes/store/kube.types';
-import { KubernetesPod } from './../../store/kube.types';
 import { GetKubernetesApps } from './../../store/kubernetes.actions';
 
 interface IValueLabels {
@@ -95,7 +93,6 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
 
   public isLoading$: Observable<boolean>;
 
-
   constructor(
     public kubeEndpointService: KubernetesEndpointService,
     public httpClient: HttpClient,
@@ -105,99 +102,6 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
   ) {
   }
 
-  private getPaginationObservable(action: PaginatedAction) {
-    const paginationMonitor = this.paginationMonitorFactory.create(
-      action.paginationKey,
-      action
-    );
-
-    this.ngZone.runOutsideAngular(() => {
-      this.polls.push(
-        interval(10000).subscribe(() => {
-          this.ngZone.run(() => {
-            this.store.dispatch(action);
-          });
-        })
-      );
-    });
-
-    return getPaginationObservables({
-      store: this.store,
-      action,
-      paginationMonitor
-    }).entities$;
-  }
-
-  private getCountObservable(entities$: Observable<any[]>) {
-    return entities$.pipe(
-      map(entities => entities.length),
-      startWith(null)
-    );
-  }
-  private getPodCapacity(nodes$: Observable<KubernetesNode[]>, pods$: Observable<KubernetesPod[]>) {
-    return combineLatest(nodes$, pods$).pipe(
-      map(([nodes, pods]) => ({
-        total: nodes.reduce((cap, node) => {
-          return cap + parseInt(node.status.capacity.pods, 10);
-        }, 0),
-        used: pods.length
-      }))
-    );
-  }
-
-  private getNodeStatusCount(
-    nodes$: Observable<KubernetesNode[]>,
-    conditionType: string,
-    valueLabels: IValueLabels = {},
-    countStatus = 'True'
-  ) {
-    return nodes$.pipe(
-      map(nodes => {
-        const total = nodes.length;
-        const { unknown, unavailable, used } = nodes.reduce((cap, node) => {
-          const conditionStatus = node.status.conditions.find(con => con.type === conditionType);
-          if (!conditionStatus || !conditionStatus.status) {
-            ++cap.unavailable;
-          } else {
-            if (conditionStatus.status === countStatus) {
-              ++cap.used;
-            } else if (conditionStatus.status === 'Unknown') {
-              ++cap.unknown;
-            }
-          }
-          return cap;
-        }, { unavailable: 0, used: 0, unknown: 0 });
-        const result = {
-          total,
-          supported: total !== unavailable,
-          // Depends on K8S version as to what is supported
-          unavailable,
-          used,
-          unknown,
-          ...valueLabels
-        };
-        result.supported = result.total !== result.unavailable;
-        return result;
-      })
-    );
-  }
-
-  private getNodeKubeVersions(nodes$: Observable<KubernetesNode[]>) {
-    return nodes$.pipe(
-      map(nodes => {
-        const versions = {};
-        nodes.forEach(node => {
-          const v = node.status.nodeInfo.kubeletVersion;
-          if (!versions[v]) {
-            versions[v] = v;
-          }
-        });
-        return Object.keys(versions).join(',');
-      })
-    );
-  }
-
-
   ngOnInit() {
     const guid = this.kubeEndpointService.baseKube.guid;
 
@@ -208,36 +112,36 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
     const pods$ = this.getPaginationObservable(podCountAction);
     const nodes$ = this.getPaginationObservable(nodeCountAction);
 
-    this.podCount$ = this.getCountObservable(pods$);
-    this.nodeCount$ = this.getCountObservable(nodes$);
-    this.appCount$ = this.getCountObservable(applications$);
+    this.podCount$ = this.kubeEndpointService.getCountObservable(pods$);
+    this.nodeCount$ = this.kubeEndpointService.getCountObservable(nodes$);
+    this.appCount$ = this.kubeEndpointService.getCountObservable(applications$);
 
-    this.podCapacity$ = this.getPodCapacity(nodes$, pods$);
-    this.diskPressure$ = this.getNodeStatusCount(nodes$, 'DiskPressure', {
+    this.podCapacity$ = this.kubeEndpointService.getPodCapacity(nodes$, pods$);
+    this.diskPressure$ = this.kubeEndpointService.getNodeStatusCount(nodes$, 'DiskPressure', {
       usedLabel: 'Nodes with disk pressure',
       remainingLabel: 'Nodes with no disk pressure',
       unknownLabel: 'Nodes with unknown disk pressure',
       warningText: 'Nodes with unknown disk pressure found'
     });
-    this.memoryPressure$ = this.getNodeStatusCount(nodes$, 'MemoryPressure', {
+    this.memoryPressure$ = this.kubeEndpointService.getNodeStatusCount(nodes$, 'MemoryPressure', {
       usedLabel: 'Nodes with memory pressure',
       remainingLabel: 'Nodes with no memory pressure',
       unknownLabel: 'Nodes with unknown memory pressure',
       warningText: 'Nodes with unknown memory pressure found'
     });
-    this.outOfDisk$ = this.getNodeStatusCount(nodes$, 'OutOfDisk', {
+    this.outOfDisk$ = this.kubeEndpointService.getNodeStatusCount(nodes$, 'OutOfDisk', {
       usedLabel: 'Nodes that are out of disk space',
       remainingLabel: 'Nodes that have disk space remaining',
       unknownLabel: 'Nodes with unknown remaining disk space',
       warningText: 'Nodes with unknown remaining disk space found'
     });
-    this.networkUnavailable$ = this.getNodeStatusCount(nodes$, 'NetworkUnavailable', {
+    this.networkUnavailable$ = this.kubeEndpointService.getNodeStatusCount(nodes$, 'NetworkUnavailable', {
       usedLabel: 'Nodes with available networks',
       remainingLabel: 'Nodes with unavailable networks',
       unknownLabel: 'Nodes with unknown networks availability',
       warningText: 'Nodes with unknown networks availability found'
     }, 'False');
-    this.nodesReady$ = this.getNodeStatusCount(nodes$, 'Ready', {
+    this.nodesReady$ = this.kubeEndpointService.getNodeStatusCount(nodes$, 'Ready', {
       usedLabel: 'Nodes are ready',
       remainingLabel: 'Nodes are not ready',
       unknownLabel: 'Nodes with unknown ready status',
@@ -245,7 +149,7 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
     });
     this.dashboardLink = `/kubernetes/${guid}/dashboard`;
 
-    this.kubeNodeVersions$ = this.getNodeKubeVersions(nodes$).pipe(startWith('-'));
+    this.kubeNodeVersions$ = this.kubeEndpointService.getNodeKubeVersions(nodes$).pipe(startWith('-'));
 
     this.isLoading$ = combineLatest([
       this.endpointDetails$,
@@ -264,6 +168,29 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
     );
   }
 
+  private getPaginationObservable(action: PaginatedAction) {
+    const paginationMonitor = this.paginationMonitorFactory.create(
+      action.paginationKey,
+      action
+    );
+
+    this.ngZone.runOutsideAngular(() => {
+      this.polls.push(
+        interval(10000).subscribe(() => {
+          this.ngZone.run(() => {
+            this.store.dispatch(action);
+          });
+        })
+      );
+    });
+
+    return getPaginationObservables({
+      store: this.store,
+      action,
+      paginationMonitor
+    }).entities$;
+  }
+
   ngOnDestroy() {
     safeUnsubscribe(...(this.polls || []));
   }

From 3161bd0f1fafb384c73f6fbe21a840150ef8911a Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Fri, 6 Dec 2019 13:38:02 +0000
Subject: [PATCH 199/648] Add preview panel

---
 .../frontend/app/custom/helm/helm.module.ts   |  5 +++-
 .../app/custom/helm/helm.setup.module.ts      |  9 ++++++-
 ...helm-release-resource-graph.component.html |  2 +-
 .../helm-release-resource-graph.component.ts  | 17 ++++++++++++-
 ...lm-release-resource-preview.component.html |  2 ++
 ...lm-release-resource-preview.component.scss |  0
 ...release-resource-preview.component.spec.ts | 25 +++++++++++++++++++
 ...helm-release-resource-preview.component.ts | 19 ++++++++++++++
 package.json                                  |  9 ++++---
 src/frontend/packages/core/src/app.module.ts  |  2 ++
 .../dashboard-base.component.ts               |  2 ++
 .../shared/services/panel-preview.service.ts  | 14 ++++++++++-
 .../packages/core/src/shared/shared.module.ts |  1 -
 .../core/test-framework/store-test-helper.ts  |  1 +
 14 files changed, 98 insertions(+), 10 deletions(-)
 create mode 100644 custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.html
 create mode 100644 custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.scss
 create mode 100644 custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts

diff --git a/custom-src/frontend/app/custom/helm/helm.module.ts b/custom-src/frontend/app/custom/helm/helm.module.ts
index eb8d4d7033..dd3f6877d8 100644
--- a/custom-src/frontend/app/custom/helm/helm.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm.module.ts
@@ -36,6 +36,7 @@ import { HelmReleaseNotesTabComponent } from './release/tabs/helm-release-notes-
 import { HelmReleaseServicesTabComponent } from './release/tabs/helm-release-services/helm-release-services-tab.component';
 import { HelmReleaseSummaryTabComponent } from './release/tabs/helm-release-summary-tab/helm-release-summary-tab.component';
 import { HelmReleaseValuesTabComponent } from './release/tabs/helm-release-values-tab/helm-release-values-tab.component';
+import { HelmReleaseResourcePreviewComponent} from './release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component';
 import { CatalogTabComponent } from './tabs/catalog-tab/catalog-tab.component';
 import { HelmConfigurationComponent } from './tabs/configuration-tab/helm-configuration.component';
 import { HelmReleasesTabComponent } from './tabs/releases-tab/releases-tab.component';
@@ -84,6 +85,7 @@ import { NgxGraphModule } from '@swimlane/ngx-graph';
     HelmReleaseServicesTabComponent,
     HelmServicePortsComponent,
     HelmReleaseResourceGraphComponent,
+    //HelmReleaseResourcePreviewComponent,
   ],
   providers: [
     ChartsService,
@@ -94,7 +96,8 @@ import { NgxGraphModule } from '@swimlane/ngx-graph';
   entryComponents: [
     MonocularChartCardComponent,
     HelmReleaseServiceCardComponent,
-    HelmServicePortsComponent
+    HelmServicePortsComponent,
+    //HelmReleaseResourcePreviewComponent,
   ]
 })
 export class HelmModule { }
diff --git a/custom-src/frontend/app/custom/helm/helm.setup.module.ts b/custom-src/frontend/app/custom/helm/helm.setup.module.ts
index 779e7becfc..60a44a1acc 100644
--- a/custom-src/frontend/app/custom/helm/helm.setup.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm.setup.module.ts
@@ -12,6 +12,7 @@ import { SharedModule } from '../../shared/shared.module';
 import { HELM_ENDPOINT_TYPE } from './helm-entity-factory';
 import { generateHelmEntities } from './helm-entity-generator';
 import { HelmStoreModule } from './helm.store.module';
+import { HelmReleaseResourcePreviewComponent } from './release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component';
 
 @NgModule({
   imports: [
@@ -20,7 +21,13 @@ import { HelmStoreModule } from './helm.store.module';
     CommonModule,
     SharedModule,
     HelmStoreModule,
-  ]
+  ],
+  declarations: [
+    HelmReleaseResourcePreviewComponent,
+  ],
+  entryComponents: [
+    HelmReleaseResourcePreviewComponent,
+  ]  
 })
 export class HelmSetupModule {
   constructor(
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
index e9c2a106cb..4cb7c6e4c8 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
@@ -19,7 +19,7 @@
   [layout]="layout"
 >
   <ng-template #nodeTemplate let-node>
-    <svg:g class="node ">
+    <svg:g class="node" (click)="onNodeClick(node)">
       <svg:rect
         [attr.width]="node.dimension.width"
         [attr.height]="node.dimension.height"
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
index e2625c446e..dfa7da1a5b 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
@@ -2,6 +2,8 @@ import { Node, Edge } from '@swimlane/ngx-graph';
 import { Component, OnInit, OnDestroy } from '@angular/core';
 import { HelmReleaseHelperService } from '../helm-release-helper.service';
 import { Subject, Subscription } from 'rxjs';
+import { PanelPreviewService } from '../../../../../shared/services/panel-preview.service';
+import { HelmReleaseResourcePreviewComponent } from './helm-release-resource-preview/helm-release-resource-preview.component';
 
 interface Colors {
   bg: string;
@@ -36,7 +38,7 @@ export class HelmReleaseResourceGraphComponent implements OnInit, OnDestroy {
 
   private graph: Subscription;
 
-  constructor(private helper: HelmReleaseHelperService) { }
+  constructor(private helper: HelmReleaseHelperService, private previewPanel: PanelPreviewService) { }
 
   ngOnInit() {
 
@@ -79,6 +81,19 @@ export class HelmReleaseResourceGraphComponent implements OnInit, OnDestroy {
     }
   }
 
+  // Open side panel when node is clicked
+  public onNodeClick(node: any) {
+    console.log('Node was clicked')
+    console.log(node);
+
+    this.previewPanel.show(
+      HelmReleaseResourcePreviewComponent,
+      {
+        node
+      }
+    );
+  }
+
   public fitGraph() {
     this.fit$.next(true);
   }
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.html
new file mode 100644
index 0000000000..29e804c289
--- /dev/null
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.html
@@ -0,0 +1,2 @@
+<app-sidepanel-preview title="Helm Release Resource Preview">
+</app-sidepanel-preview>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.scss b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts
new file mode 100644
index 0000000000..534fadc806
--- /dev/null
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HelmReleaseResourcePreviewComponent } from './helm-release-resource-preview.component';
+
+describe('HelmReleaseResourcePreviewComponent', () => {
+  let component: HelmReleaseResourcePreviewComponent;
+  let fixture: ComponentFixture<HelmReleaseResourcePreviewComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ HelmReleaseResourcePreviewComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(HelmReleaseResourcePreviewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts
new file mode 100644
index 0000000000..6a4de96f9f
--- /dev/null
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts
@@ -0,0 +1,19 @@
+import { Component, OnInit } from '@angular/core';
+import { PreviewableComponent } from '../../../../../../shared/previewable-component';
+
+@Component({
+  selector: 'app-helm-release-resource-preview',
+  templateUrl: './helm-release-resource-preview.component.html',
+  styleUrls: ['./helm-release-resource-preview.component.scss']
+})
+export class HelmReleaseResourcePreviewComponent implements OnInit, PreviewableComponent  {
+
+  setProps(props: { [key: string]: any; }): void {
+  }
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/package.json b/package.json
index 7856c8e7ed..329debb5bd 100644
--- a/package.json
+++ b/package.json
@@ -63,17 +63,19 @@
     "@ngrx/router-store": "^8.3.0",
     "@ngrx/store": "^8.3.0",
     "@ngrx/store-devtools": "^8.3.0",
+    "@nrwl/angular": "8.5.2",
     "@swimlane/ngx-charts": "^12.0.1",
-    "@types/moment-timezone": "^0.5.12",
+    "@swimlane/ngx-graph": "^6.2.0",
     "@types/marked": "^0.6.5",
+    "@types/moment-timezone": "^0.5.12",
     "angular2-virtual-scroll": "^0.4.16",
     "core-js": "^3.2.1",
     "hammerjs": "^2.0.8",
     "immer": "^4.0.0",
+    "intersect": "^1.0.1",
     "lodash-es": "^4.17.14",
     "mappy-breakpoints": "^0.2.3",
     "marked": "^0.7.0",
-    "intersect": "^1.0.1",
     "moment": "^2.24.0",
     "moment-timezone": "^0.5.12",
     "ngrx-store-localstorage": "8.0.0",
@@ -88,8 +90,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"
diff --git a/src/frontend/packages/core/src/app.module.ts b/src/frontend/packages/core/src/app.module.ts
index 81584b7822..f890b35e56 100644
--- a/src/frontend/packages/core/src/app.module.ts
+++ b/src/frontend/packages/core/src/app.module.ts
@@ -47,6 +47,7 @@ import { FavoritesConfigMapper } from './shared/components/favorites-meta-card/f
 import { endpointEventKey, GlobalEventData, GlobalEventService } from './shared/global-events.service';
 import { SharedModule } from './shared/shared.module';
 import { XSRFModule } from '../xsrf.module';
+import { PanelPreviewService } from './shared/services/panel-preview.service';
 
 // Create action for router navigation. See
 // - https://github.com/ngrx/platform/issues/68
@@ -110,6 +111,7 @@ export class CustomRouterStateSerializer
     LoggedInService,
     ExtensionService,
     DynamicExtensionRoutes,
+    PanelPreviewService,
     { provide: GITHUB_API_URL, useFactory: getGitHubAPIURL },
     { provide: RouterStateSerializer, useClass: CustomRouterStateSerializer }, // Create action for router navigation
     { provide: RouteReuseStrategy, useClass: CustomReuseStrategy }
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 f7d95b7362..542eb86902 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
@@ -132,6 +132,8 @@ export class DashboardBaseComponent implements OnInit, OnDestroy, AfterViewInit
   }
 
   ngAfterViewInit() {
+    console.log('*************');
+    console.log('SETTING PREVIEW PANEL');
     this.panelPreviewService.setContainer(this.previewPanelContainer);
   }
 
diff --git a/src/frontend/packages/core/src/shared/services/panel-preview.service.ts b/src/frontend/packages/core/src/shared/services/panel-preview.service.ts
index 04b42e4010..85a87d2aa3 100644
--- a/src/frontend/packages/core/src/shared/services/panel-preview.service.ts
+++ b/src/frontend/packages/core/src/shared/services/panel-preview.service.ts
@@ -1,7 +1,8 @@
-import { ComponentFactory, ComponentFactoryResolver, ComponentRef, Injectable, ViewContainerRef } from '@angular/core';
+import { ComponentFactory, ComponentFactoryResolver, ComponentRef, Injectable, ViewContainerRef, Inject } 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';
 
 @Injectable()
 export class PanelPreviewService {
@@ -13,6 +14,7 @@ export class PanelPreviewService {
   constructor(
     private componentFactoryResolver: ComponentFactoryResolver,
     private router: Router,
+    @Inject(DOCUMENT) private document: Document,    
   ) {
     this.openedSubject = new BehaviorSubject(false);
     this.opened$ = this.observeSubject(this.openedSubject);
@@ -35,6 +37,14 @@ export class PanelPreviewService {
 
     this.render(component, props);
     this.openedSubject.next(true);
+
+    this.document.addEventListener('keydown', this.onKeyDown);
+  }
+
+  onKeyDown = (event) => {
+    if (event.key === 'Escape') {
+      this.hide();
+    }
   }
 
   public hide() {
@@ -43,6 +53,8 @@ export class PanelPreviewService {
     }
 
     this.openedSubject.next(false);
+    this.document.removeEventListener('keydown', this.onKeyDown);
+
   }
 
   render(component: object, props: { [key: string]: any }) {
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index dc239b6976..37d5826062 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -325,7 +325,6 @@ import { JsonViewerComponent } from './components/json-viewer/json-viewer.compon
     ApplicationStateService,
     EndpointListHelper,
     EndpointsListConfigService,
-    PanelPreviewService,
     // CfUserService,
     ConfirmationDialogService,
     EntityMonitorFactory,
diff --git a/src/frontend/packages/core/test-framework/store-test-helper.ts b/src/frontend/packages/core/test-framework/store-test-helper.ts
index 3a6277b913..514913173a 100644
--- a/src/frontend/packages/core/test-framework/store-test-helper.ts
+++ b/src/frontend/packages/core/test-framework/store-test-helper.ts
@@ -164,6 +164,7 @@ function getDefaultInitialTestStratosStoreState() {
       isMobile: false,
       isMobileNavOpen: false,
       sideNavPinned: false,
+      headerEventMinimized: false,
       pollingEnabled: true,
       themeKey: null
     },

From 659cf267e4aa7fd81ae6382ea274d715ccbd8379 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Fri, 6 Dec 2019 14:49:31 +0000
Subject: [PATCH 200/648] Fix namespace issue

---
 .../plugins/kubernetes/endpoint_config.go     | 10 ++++--
 .../plugins/kubernetes/helm_client.go         | 35 ++-----------------
 2 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/endpoint_config.go b/src/jetstream/plugins/kubernetes/endpoint_config.go
index e1ae6e9627..a9ff92700a 100644
--- a/src/jetstream/plugins/kubernetes/endpoint_config.go
+++ b/src/jetstream/plugins/kubernetes/endpoint_config.go
@@ -47,7 +47,7 @@ func (c *KubernetesSpecification) GetConfigForEndpoint(masterURL string, token i
 
 }
 
-func (c *KubernetesSpecification) GetKubeConfigForEndpoint(masterURL string, token interfaces.TokenRecord) (string, error) {
+func (c *KubernetesSpecification) GetKubeConfigForEndpoint(masterURL string, token interfaces.TokenRecord, namespace string) (string, error) {
 
 	name := "config-0"
 	clusterName := "cluster-0"
@@ -83,6 +83,7 @@ contexts:
 - context:
 		cluster: kube
 		user: kube
+		%s
 	name: kube
 clusters:
 - cluster:
@@ -96,6 +97,11 @@ users:
 	user:
 `
 
+	nsReplace := ""
+	if len(namespace) > 0 {
+		nsReplace = fmt.Sprintf("namespace: %s", namespace)
+	}
+
 	space := regexp.MustCompile(`\t`)
 	s := space.ReplaceAllString(str, "  ")
 
@@ -109,7 +115,7 @@ users:
 		s = fmt.Sprintf("%s    client-key-data: %s\n", s, base64.StdEncoding.EncodeToString(authInfo.ClientKeyData))
 	}
 
-	return fmt.Sprintf(s, masterURL), err
+	return fmt.Sprintf(s, nsReplace, masterURL), err
 }
 
 func (c *KubernetesSpecification) addAuthInfoForEndpoint(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
diff --git a/src/jetstream/plugins/kubernetes/helm_client.go b/src/jetstream/plugins/kubernetes/helm_client.go
index 699b94b36d..1be20f6c52 100644
--- a/src/jetstream/plugins/kubernetes/helm_client.go
+++ b/src/jetstream/plugins/kubernetes/helm_client.go
@@ -13,7 +13,6 @@ import (
 	diskcached "k8s.io/client-go/discovery/cached/disk"
 	"k8s.io/client-go/restmapper"
 	"k8s.io/client-go/tools/clientcmd"
-	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 
 	restclient "k8s.io/client-go/rest"
 
@@ -55,7 +54,7 @@ func (c *KubernetesSpecification) GetHelmConfiguration(endpointGUID, userID, nam
 		return nil, hc, errors.New("Helm: Can not get user token for endpoint")
 	}
 
-	kubeconfigcontents, err := c.GetKubeConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRecord)
+	kubeconfigcontents, err := c.GetKubeConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRecord, namespace)
 	if err != nil {
 		log.Errorf("Helm: Could not get kubeconfig for endpoint: %s", err)
 		return nil, hc, errors.New("Can not get Kubernetes config for specified endpoint")
@@ -105,27 +104,6 @@ type jetStreamRestClientGetter struct {
 	tempFolder   string
 }
 
-type jetstreamClientConfig struct {
-	clientConfig clientcmd.ClientConfig
-	namespace    string
-}
-
-func (f *jetstreamClientConfig) RawConfig() (clientcmdapi.Config, error) {
-	return f.clientConfig.RawConfig()
-}
-
-func (f *jetstreamClientConfig) ClientConfig() (*restclient.Config, error) {
-	return f.clientConfig.ClientConfig()
-}
-
-func (f *jetstreamClientConfig) Namespace() (string, bool, error) {
-	return f.namespace, false, nil
-}
-
-func (f *jetstreamClientConfig) ConfigAccess() clientcmd.ConfigAccess {
-	return f.ConfigAccess()
-}
-
 func newJetStreamRCGetter(kubeconfig []byte, tempFolder string, namespace string) *jetStreamRestClientGetter {
 
 	clientConfig, err := clientcmd.NewClientConfigFromBytes(kubeconfig)
@@ -133,17 +111,8 @@ func newJetStreamRCGetter(kubeconfig []byte, tempFolder string, namespace string
 		log.Error(err)
 	}
 
-	jsClientConfig := &jetstreamClientConfig{
-		clientConfig: clientConfig,
-		namespace:    namespace,
-	}
-
-	log.Warn("newJetStreamRCGetter")
-	ns, b, er := jsClientConfig.Namespace()
-	log.Warnf("%s %b %+v", ns, b, er)
-
 	f := &jetStreamRestClientGetter{
-		clientConfig: jsClientConfig,
+		clientConfig: clientConfig,
 		tempFolder:   tempFolder,
 	}
 	return f

From c73e85e61bda44123c8eec7219495bba083c7966 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Fri, 6 Dec 2019 14:50:23 +0000
Subject: [PATCH 201/648] Fix user supplied values

---
 src/jetstream/plugins/kubernetes/install_release.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/install_release.go b/src/jetstream/plugins/kubernetes/install_release.go
index 0c7c6e8737..386d5cecbd 100644
--- a/src/jetstream/plugins/kubernetes/install_release.go
+++ b/src/jetstream/plugins/kubernetes/install_release.go
@@ -111,8 +111,6 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 		return err
 	}
 
-	log.Infof("%+v", userSuppliedValues)
-
 	log.Warn("Installing.....")
 
 	install := action.NewInstall(config)
@@ -126,7 +124,7 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 	// Generate Name ?
 	// Atomic?
 
-	release, err := install.Run(chart, nil)
+	release, err := install.Run(chart, userSuppliedValues)
 	if err != nil {
 		log.Error(err)
 		return fmt.Errorf("Could not install Helm Chart: %v+", err)

From 2af5c1e0c1b0ac98d3d9dbe6e485f938242f135d Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Fri, 6 Dec 2019 15:09:33 +0000
Subject: [PATCH 202/648] view type

---
 .../helm-release-values-tab.component.html    |  2 +-
 .../helm-release-values-tab.component.ts      | 26 ++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
index 536fdfe150..07979874c1 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
@@ -1,7 +1,7 @@
 <app-page-sub-nav>
 
   <mat-button-toggle-group class="toolbar" [value]="viewType"
-    (change)="themeService.setTheme($event.value)" name="view" aria-label="View">
+    (change)="viewTypeChange($event.value)" name="view" aria-label="View">
     <mat-button-toggle value="user">User</mat-button-toggle>
     <mat-button-toggle value="chart">Chart</mat-button-toggle>
     <mat-button-toggle value="combined">Combined</mat-button-toggle>
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
index 5a8dbf09e8..ead7de70fc 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { Observable } from 'rxjs';
+import { combineLatest, Observable, Subject } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { HelmReleaseHelperService } from '../helm-release-helper.service';
@@ -15,13 +15,33 @@ export class HelmReleaseValuesTabComponent {
 
   public viewType = 'user';
 
+  private viewTypeSubject = new Subject<boolean>('user');
+
+  // Observable boolean streams
+  public viewType$ = this.viewTypeSubject.asObservable();  
+
   constructor(public helmReleaseHelper: HelmReleaseHelperService) {
 
-    this.values$ = helmReleaseHelper.release$.pipe(
-      map(release => release.chart.values)
+    this.values$ = combineLatest(
+      this.viewType$,
+      helmReleaseHelper.release$
+    ).pipe(
+      map(([vtype, release]) => {
+        console.log('HELLO');
+        console.log(vtype);
+        console.log(release);
+
+        return release.chart.values;
+      })
     );
   }
 
+  public viewTypeChange(viewType: string) {
+    this.viewType = viewType;
+    this.viewTypeSubject.next(viewType);
+
+  }
+
   private hidePasswords(values: string): string {
     // TODO: See #150 - It's a PITA but this should be done in the back end
     let mask = values.replace(new RegExp('(PASSWORD: [a-zA-Z0-9_\-]*)', 'gm'), 'PASSWORD: **********');

From b4cf98537a9fcc4193c9733315d416973f34aee7 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Mon, 9 Dec 2019 07:18:46 +0000
Subject: [PATCH 203/648] Chart repo and chartsvc docker images now build

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 src/jetstream/plugins/monocular/chart-repo/Dockerfile    | 6 +++---
 src/jetstream/plugins/monocular/chart-repo/Makefile      | 2 +-
 src/jetstream/plugins/monocular/chart-repo/chart_repo.go | 2 +-
 src/jetstream/plugins/monocular/chart-repo/datastore.go  | 2 +-
 src/jetstream/plugins/monocular/chart-repo/delete.go     | 2 +-
 src/jetstream/plugins/monocular/chart-repo/sync.go       | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/jetstream/plugins/monocular/chart-repo/Dockerfile b/src/jetstream/plugins/monocular/chart-repo/Dockerfile
index 780bdfa049..a4f5fac4ad 100644
--- a/src/jetstream/plugins/monocular/chart-repo/Dockerfile
+++ b/src/jetstream/plugins/monocular/chart-repo/Dockerfile
@@ -1,8 +1,8 @@
 FROM golang:1.12 as builder
-COPY . /go/src/github.com/helm/monocular
-WORKDIR /go/src/github.com/helm/monocular
+COPY . /go/src/github.com/helm/monocular/chart-repo
+WORKDIR /go/src/github.com/helm/monocular/chart-repo
 ARG VERSION
-RUN GO111MODULE=on GOPROXY=https://gocenter.io CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-X main.version=$VERSION" ./chart-repo
+RUN GO111MODULE=on GOPROXY=https://gocenter.io CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-X main.version=$VERSION" .
 FROM scratch
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=builder /go/src/github.com/helm/monocular/chart-repo /chart-repo
diff --git a/src/jetstream/plugins/monocular/chart-repo/Makefile b/src/jetstream/plugins/monocular/chart-repo/Makefile
index 771f988c20..454c4a38ad 100644
--- a/src/jetstream/plugins/monocular/chart-repo/Makefile
+++ b/src/jetstream/plugins/monocular/chart-repo/Makefile
@@ -5,4 +5,4 @@ VERSION ?= $$(git rev-parse HEAD)
 
 docker-build:
 	# We use the context of the root dir
-	docker build --pull --rm -t ${IMAGE_REPO}:${IMAGE_TAG} --build-arg "VERSION=${VERSION}" -f Dockerfile ../
+	docker build --pull --rm -t ${IMAGE_REPO}:${IMAGE_TAG} --build-arg "VERSION=${VERSION}" -f Dockerfile .
diff --git a/src/jetstream/plugins/monocular/chart-repo/chart_repo.go b/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
index c87dad751e..d5f6ccc350 100644
--- a/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
+++ b/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package chartrepo
 
 import (
 	"os"
diff --git a/src/jetstream/plugins/monocular/chart-repo/datastore.go b/src/jetstream/plugins/monocular/chart-repo/datastore.go
index dbdddc54bd..5b1e420112 100644
--- a/src/jetstream/plugins/monocular/chart-repo/datastore.go
+++ b/src/jetstream/plugins/monocular/chart-repo/datastore.go
@@ -1,4 +1,4 @@
-package main
+package chartrepo
 
 import (
 	"bytes"
diff --git a/src/jetstream/plugins/monocular/chart-repo/delete.go b/src/jetstream/plugins/monocular/chart-repo/delete.go
index 17b1e2dc43..b1b3636e3f 100644
--- a/src/jetstream/plugins/monocular/chart-repo/delete.go
+++ b/src/jetstream/plugins/monocular/chart-repo/delete.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package chartrepo
 
 import (
 	"github.com/helm/monocular/chartrepo/foundationdb"
diff --git a/src/jetstream/plugins/monocular/chart-repo/sync.go b/src/jetstream/plugins/monocular/chart-repo/sync.go
index 5230e78ead..8cd3591cc5 100644
--- a/src/jetstream/plugins/monocular/chart-repo/sync.go
+++ b/src/jetstream/plugins/monocular/chart-repo/sync.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package chartrepo
 
 import (
 	"github.com/helm/monocular/chartrepo/foundationdb"

From c8bedd9fc068aeb9c6847feedf9809eeeeb2e339 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 10 Dec 2019 07:22:58 +0000
Subject: [PATCH 204/648] More progress - working with side panel. Added Job
 support

---
 .../frontend/app/custom/helm/helm.module.ts   |  6 +-
 .../frontend/app/custom/helm/helm.routing.ts  |  2 -
 .../app/custom/helm/helm.setup.module.ts      |  9 +-
 ...ocular-release-pods-list-config.service.ts | 36 ++++----
 .../monocular-tab-base.component.ts           |  1 -
 .../helm-release-tab-base.component.ts        | 18 ----
 .../tabs/helm-release-helper.service.ts       | 18 ++--
 .../helm-release-resource-graph.component.ts  | 20 +++--
 ...lm-release-resource-preview.component.html | 27 ++++++
 ...lm-release-resource-preview.component.scss | 30 +++++++
 ...helm-release-resource-preview.component.ts | 39 ++++++++-
 .../helm-release-summary-tab.component.html   | 10 +++
 .../helm-release-summary-tab.component.scss   | 28 +++++++
 .../helm-release-summary-tab.component.ts     | 82 +++++++++++++++----
 .../helm-release-values-tab.component.html    |  2 +-
 .../helm-release-values-tab.component.ts      | 61 +++++++++-----
 .../app/custom/helm/store/helm.types.ts       |  9 +-
 .../helm-configuration.component.html         |  1 -
 .../helm-configuration.component.scss         |  0
 .../helm-configuration.component.spec.ts      | 29 -------
 .../helm-configuration.component.ts           | 16 ----
 .../assets/custom/app_placeholder.svg         |  9 ++
 .../json-viewer/json-viewer.component.html    |  3 +-
 .../json-viewer/json-viewer.component.ts      |  6 ++
 .../shared/services/panel-preview.service.ts  | 13 +--
 .../plugins/kubernetes/helm/graph.go          | 46 ++++++++---
 .../plugins/kubernetes/helm/graph_status.go   |  6 ++
 .../plugins/kubernetes/helm/release.go        | 65 ++++++++++-----
 .../plugins/kubernetes/list_releases.go       |  6 +-
 29 files changed, 403 insertions(+), 195 deletions(-)
 delete mode 100644 custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.html
 delete mode 100644 custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.scss
 delete mode 100644 custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.spec.ts
 delete mode 100644 custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.ts
 create mode 100644 custom-src/frontend/assets/custom/app_placeholder.svg

diff --git a/custom-src/frontend/app/custom/helm/helm.module.ts b/custom-src/frontend/app/custom/helm/helm.module.ts
index dd3f6877d8..0fb1ddca98 100644
--- a/custom-src/frontend/app/custom/helm/helm.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm.module.ts
@@ -38,7 +38,6 @@ import { HelmReleaseSummaryTabComponent } from './release/tabs/helm-release-summ
 import { HelmReleaseValuesTabComponent } from './release/tabs/helm-release-values-tab/helm-release-values-tab.component';
 import { HelmReleaseResourcePreviewComponent} from './release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component';
 import { CatalogTabComponent } from './tabs/catalog-tab/catalog-tab.component';
-import { HelmConfigurationComponent } from './tabs/configuration-tab/helm-configuration.component';
 import { HelmReleasesTabComponent } from './tabs/releases-tab/releases-tab.component';
 import { RepositoryTabComponent } from './tabs/repository-tab/repository-tab.component';
 import { KubernetesModule } from '../kubernetes/kubernetes.module';
@@ -73,7 +72,6 @@ import { NgxGraphModule } from '@swimlane/ngx-graph';
     RepositoryTabComponent,
     CatalogTabComponent,
     HelmReleasesTabComponent,
-    HelmConfigurationComponent,
     MonocularChartCardComponent,
     HelmReleaseServiceCardComponent,
     MonocularChartViewComponent,
@@ -85,7 +83,7 @@ import { NgxGraphModule } from '@swimlane/ngx-graph';
     HelmReleaseServicesTabComponent,
     HelmServicePortsComponent,
     HelmReleaseResourceGraphComponent,
-    //HelmReleaseResourcePreviewComponent,
+    HelmReleaseResourcePreviewComponent,
   ],
   providers: [
     ChartsService,
@@ -97,7 +95,7 @@ import { NgxGraphModule } from '@swimlane/ngx-graph';
     MonocularChartCardComponent,
     HelmReleaseServiceCardComponent,
     HelmServicePortsComponent,
-    //HelmReleaseResourcePreviewComponent,
+    HelmReleaseResourcePreviewComponent,
   ]
 })
 export class HelmModule { }
diff --git a/custom-src/frontend/app/custom/helm/helm.routing.ts b/custom-src/frontend/app/custom/helm/helm.routing.ts
index 5f86c75431..80c2660c7e 100644
--- a/custom-src/frontend/app/custom/helm/helm.routing.ts
+++ b/custom-src/frontend/app/custom/helm/helm.routing.ts
@@ -11,7 +11,6 @@ import { HelmReleaseServicesTabComponent } from './release/tabs/helm-release-ser
 import { HelmReleaseSummaryTabComponent } from './release/tabs/helm-release-summary-tab/helm-release-summary-tab.component';
 import { HelmReleaseValuesTabComponent } from './release/tabs/helm-release-values-tab/helm-release-values-tab.component';
 import { CatalogTabComponent } from './tabs/catalog-tab/catalog-tab.component';
-import { HelmConfigurationComponent } from './tabs/configuration-tab/helm-configuration.component';
 import { HelmReleasesTabComponent } from './tabs/releases-tab/releases-tab.component';
 import { RepositoryTabComponent } from './tabs/repository-tab/repository-tab.component';
 import { HelmReleaseResourceGraphComponent } from './release/tabs/helm-release-resource-graph/helm-release-resource-graph.component';
@@ -26,7 +25,6 @@ const monocular: Routes = [
       { path: 'charts/:repo', component: CatalogTabComponent },
       { path: 'repos', component: RepositoryTabComponent },
       { path: 'repos/:guid', component: RepositoryTabComponent },
-      { path: 'config', component: HelmConfigurationComponent },
       { path: 'releases', component: HelmReleasesTabComponent },
     ]
   },
diff --git a/custom-src/frontend/app/custom/helm/helm.setup.module.ts b/custom-src/frontend/app/custom/helm/helm.setup.module.ts
index 60a44a1acc..779e7becfc 100644
--- a/custom-src/frontend/app/custom/helm/helm.setup.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm.setup.module.ts
@@ -12,7 +12,6 @@ import { SharedModule } from '../../shared/shared.module';
 import { HELM_ENDPOINT_TYPE } from './helm-entity-factory';
 import { generateHelmEntities } from './helm-entity-generator';
 import { HelmStoreModule } from './helm.store.module';
-import { HelmReleaseResourcePreviewComponent } from './release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component';
 
 @NgModule({
   imports: [
@@ -21,13 +20,7 @@ import { HelmReleaseResourcePreviewComponent } from './release/tabs/helm-release
     CommonModule,
     SharedModule,
     HelmStoreModule,
-  ],
-  declarations: [
-    HelmReleaseResourcePreviewComponent,
-  ],
-  entryComponents: [
-    HelmReleaseResourcePreviewComponent,
-  ]  
+  ]
 })
 export class HelmSetupModule {
   constructor(
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts
index 01ddc7936f..5a9cb1b3d9 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts
@@ -3,6 +3,8 @@ import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 
+import * as moment from 'moment';
+
 import { AppState } from '../../../../../store/src/app-state';
 import { ITableColumn } from '../../../shared/components/list/list-table/table.types';
 import { IListConfig, ListViewTypes } from '../../../shared/components/list/list.component.types';
@@ -68,28 +70,30 @@ export class HelmReleasePodsListConfig implements IListConfig<HelmReleasePod> {
       columnId: 'age',
       headerCell: () => 'Age',
       cellDefinition: {
-        valuePath: 'age'
+        getValue: (row: any) => {
+          return moment(row.metadata.creationTimestamp).fromNow(true);
+        }
       },
       sort: {
         type: 'sort',
         orderKey: 'age',
-        field: 'age'
-      },
-      cellFlex: '1'
-    },
-    {
-      columnId: 'restarts',
-      headerCell: () => 'Restarts',
-      cellDefinition: {
-        valuePath: 'restarts'
-      },
-      sort: {
-        type: 'sort',
-        orderKey: 'restarts',
-        field: 'restarts'
+        field: 'metadata.creationTimestamp'
       },
       cellFlex: '1'
-    },
+    }
+    // {
+    //   columnId: 'restarts',
+    //   headerCell: () => 'Restarts',
+    //   cellDefinition: {
+    //     valuePath: 'restarts'
+    //   },
+    //   sort: {
+    //     type: 'sort',
+    //     orderKey: 'restarts',
+    //     field: 'restarts'
+    //   },
+    //   cellFlex: '1'
+    // },
   ];
   initialised$: Observable<boolean>;
 
diff --git a/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.ts b/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.ts
index 67993ea19f..9a512b3415 100644
--- a/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.ts
+++ b/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.ts
@@ -11,7 +11,6 @@ export class MonocularTabBaseComponent {
     { link: 'charts', label: 'Charts', icon: 'folder_open' },
     { link: 'repos', label: 'Repositories', icon: 'products', iconFont: 'stratos-icons' },
     { link: 'releases', label: 'Releases', icon: 'apps' },
-    { link: 'config', label: 'Config', icon: 'build' },
   ];
 
 }
diff --git a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts b/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
index b1ca0226bc..e93a680b0f 100644
--- a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
@@ -79,7 +79,6 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
   ) {
     this.title = this.helmReleaseHelper.releaseTitle;
 
-    console.log('RELEASE BASE - CREATE NEW');
 
     const releaseRef = this.helmReleaseHelper.guidAsUrlFragment();
     const host = window.location.host;
@@ -87,14 +86,6 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
     const streamUrl = (
       `${protocol}://${host}/pp/v1/helm/releases/${releaseRef}`
     );
-    console.log(streamUrl);
-
-    // const data = new Subject<string>();
-    // const connection = websocketConnect(
-    //   streamUrl,
-    //   data
-    // );
-
 
     const socket$ = makeWebSocketObservable(streamUrl).pipe(catchError(e => {
       this.logService.error(
@@ -124,14 +115,8 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
     this.sub = messages.subscribe(jsonString => {
       const messageObj = JSON.parse(jsonString);
       if (messageObj) {
-        console.log('Got message .... ' + messageObj.kind);
-        console.log(messageObj);
-
-        // this.store.dispatch(new HelmUpdateRelease(messageObj));
-
         if (messageObj.kind === 'ReleasePrefix') {
           prefix = messageObj.data;
-          console.log('Got prefix: ' + prefix);
         } else if (messageObj.kind === 'Pods') {
           const pods = messageObj.data;
           pods.forEach(pod => {
@@ -140,7 +125,6 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
           const releasePodsAction = new GetHelmReleasePods(this.helmReleaseHelper.endpointGuid, this.helmReleaseHelper.releaseTitle);
           this.populateList(releasePodsAction, pods);
         } else if (messageObj.kind === 'Graph') {
-          console.log('GOT GRAPH');
           const graph = messageObj.data;
           graph.endpointId = this.helmReleaseHelper.endpointGuid;
           graph.releaseTitle = this.helmReleaseHelper.releaseTitle;
@@ -158,7 +142,6 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
           // Store ALL resources for the release
           manifest.forEach(resource => {
             if (resource.kind === 'Service' && prefix) {
-              console.log(`Service: ${prefix}-${resource.metadata.name}`);
               this.addResource(kubernetesServicesEntityType, resource, `${prefix}-${resource.metadata.name}`);
               svcs.push(resource);
             }
@@ -245,7 +228,6 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
   }
 
   ngOnDestroy() {
-    console.log('DESTROY RELEASE TAB BASE');
     this.sub.unsubscribe();
   }
 }
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
index 26694e8905..2ea28d7bcd 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
@@ -41,7 +41,15 @@ export class HelmReleaseHelperService {
     this.isFetching$ = svc.fetchingEntities$;
 
     this.release$ = svc.entities$.pipe(
-      map((items: HelmRelease[]) => items.find(item => item.guid === this.guid))
+      map((items: HelmRelease[]) => items.find(item => item.guid === this.guid)),
+      map((item: HelmRelease) => {
+        if (!item.chart.metadata.icon) {
+          const copy = JSON.parse(JSON.stringify(item));
+          copy.chart.metadata.icon = '/core/assets/custom/app_placeholder.svg';
+          return copy;
+        }
+        return item;
+      })
     );
   }
 
@@ -61,15 +69,7 @@ export class HelmReleaseHelperService {
   public fetchReleaseGraph(): Observable<HelmReleaseGraph> {
     // Get helm release
     const action = new GetHelmReleaseGraph(this.endpointGuid, this.releaseTitle);
-
-    console.log('fetchReleaseGraph');
-    console.log(action);
-
     return this.esf.create<HelmReleaseGraph>(action.key, action).waitForEntity$.pipe(
-      tap(e => {
-        console.log('ENTITY HELM RELEASE GRAPH');
-        console.log(e);
-      }),
       map(entity => entity.entity)
     );
   }
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
index dfa7da1a5b..969368aa34 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
@@ -1,5 +1,5 @@
 import { Node, Edge } from '@swimlane/ngx-graph';
-import { Component, OnInit, OnDestroy } from '@angular/core';
+import { Component, OnInit, OnDestroy, ComponentFactoryResolver } from '@angular/core';
 import { HelmReleaseHelperService } from '../helm-release-helper.service';
 import { Subject, Subscription } from 'rxjs';
 import { PanelPreviewService } from '../../../../../shared/services/panel-preview.service';
@@ -38,12 +38,13 @@ export class HelmReleaseResourceGraphComponent implements OnInit, OnDestroy {
 
   private graph: Subscription;
 
-  constructor(private helper: HelmReleaseHelperService, private previewPanel: PanelPreviewService) { }
+  constructor(
+    private componentFactoryResolver: ComponentFactoryResolver,
+    private helper: HelmReleaseHelperService,
+    private previewPanel: PanelPreviewService) { }
 
   ngOnInit() {
 
-    console.log('GOING TO WAIT FOR RESOURCE GRAPH.....');
-
     // Listen for the graph
     this.graph = this.helper.fetchReleaseGraph().subscribe((g: any) => {
       const newNodes = [];
@@ -83,14 +84,15 @@ export class HelmReleaseResourceGraphComponent implements OnInit, OnDestroy {
 
   // Open side panel when node is clicked
   public onNodeClick(node: any) {
-    console.log('Node was clicked')
-    console.log(node);
-
     this.previewPanel.show(
       HelmReleaseResourcePreviewComponent,
       {
-        node
-      }
+        node,
+        helper: this.helper,
+        endpoint: this.helper.endpointGuid,
+        releaseTitle: this.helper.releaseTitle
+      },
+      this.componentFactoryResolver
     );
   }
 
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.html
index 29e804c289..4fcce0ab85 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.html
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.html
@@ -1,2 +1,29 @@
 <app-sidepanel-preview title="Helm Release Resource Preview">
+
+  <div *ngIf="resource$ | async as resource">
+    <app-metadata-item class="chart-details__item" label="Name">{{ resource.metadata.name }}</app-metadata-item>
+    <app-metadata-item class="chart-details__item" label="Kind">{{ resource.kind }}</app-metadata-item>
+    <app-metadata-item class="chart-details__item" label="API Version">{{ resource.apiVersion }}</app-metadata-item>
+    <div class="resource-preview__side-by-side">
+      <app-metadata-item label="Created">{{ resource.metadata.creationTimestamp | date:'medium' }}</app-metadata-item>
+      <app-metadata-item label="Age">{{ resource.age }}</app-metadata-item>
+    </div>
+
+    <app-metadata-item class="resource-preview__labels" label="Labels">
+      <div *ngFor="let label of resource.labels" class="resource-preview__label">
+        <div class="resource-preview__label-name">{{ label.name }}</div>
+        <div class="resource-preview__label-value">{{ label.value }}</div>
+      </div>
+    </app-metadata-item>
+
+    <app-metadata-item class="resource-preview__labels" label="Annotations" *ngIf="resource.annotations">
+        <div *ngFor="let label of resource.annotations" class="resource-preview__label">
+          <div class="resource-preview__label-name">{{ label.name }}</div>
+          <div class="resource-preview__label-value">{{ label.value }}</div>
+        </div>
+      </app-metadata-item>          
+
+    <app-json-viewer #viewer [json]="resource"></app-json-viewer>
+
+  </div>
 </app-sidepanel-preview>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.scss b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.scss
index e69de29bb2..d66faa8fc6 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.scss
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.scss
@@ -0,0 +1,30 @@
+.resource-preview {
+
+  &__labels {
+    display: table;
+  }
+  
+  &__label {
+    display: table-row;
+  }
+
+  &__label-name {
+    display: table-cell;
+    opacity: 0.8;
+    padding: 2px 20px 2px 2px;
+  }
+
+  &__label-value {
+    display: table-cell;
+  }
+
+  &__side-by-side {
+    display: flex;
+
+    app-metadata-item {
+      margin-right: 40px;
+    }
+    
+  }
+
+}
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts
index 6a4de96f9f..03a6829474 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts
@@ -1,19 +1,50 @@
 import { Component, OnInit } from '@angular/core';
 import { PreviewableComponent } from '../../../../../../shared/previewable-component';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import * as moment from 'moment';
 
 @Component({
   selector: 'app-helm-release-resource-preview',
   templateUrl: './helm-release-resource-preview.component.html',
   styleUrls: ['./helm-release-resource-preview.component.scss']
 })
-export class HelmReleaseResourcePreviewComponent implements OnInit, PreviewableComponent  {
+export class HelmReleaseResourcePreviewComponent implements PreviewableComponent  {
+
+  public resource$: Observable<any>;
 
   setProps(props: { [key: string]: any; }): void {
-  }
+    this.resource$ = props.helper.fetchReleaseResources().pipe(
+      map((r: any[]) => {
+        const item = Object.values(r).find((res: any) => res.metadata.name === props.node.label && res.metadata.kind === props.node.kind);
 
-  constructor() { }
+        const newItem = { ...item};
+        newItem.age = moment(item.metadata.creationTimestamp).fromNow(true);
+
+        newItem.labels = [];
+        Object.keys(item.metadata.labels).forEach(labelName => {
+          newItem.labels.push({
+            name: labelName,
+            value: item.metadata.labels[labelName]
+          });
+        });
+
+        if (item.metadata && item.metadata.annotations) {
+          newItem.annotations = [];
+          Object.keys(item.metadata.annotations).forEach(labelName => {
+            newItem.annotations.push({
+              name: labelName,
+              value: item.metadata.annotations[labelName]
+            });
+          });
+        }
+
+        return newItem;
+      })
+    );
 
-  ngOnInit() {
   }
 
+  constructor() { }
+
 }
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
index 5316d836fc..765cb96759 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
@@ -42,7 +42,17 @@
             </app-tile>
           </app-tile-group>
         </app-tile-grid> -->
+
       </div>
+      <app-metadata-item class="chart-details__item" label="Resources"></app-metadata-item>
+
+
+        <div *ngIf="resources$ | async as resources" class="grid">
+          <app-card-number-metric *ngFor="let res of resources" label="{{ res.label }}"
+          icon="{{ res.icon.name }}" iconFont="{{ res.icon.font }}"
+              value="{{ res.count }}">
+          </app-card-number-metric>
+        </div>
     </app-entity-summary-title>
 
 
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
index cb85d21fdb..8f8c0eb39d 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
@@ -1,4 +1,6 @@
 
+@import '../../../../../../sass/mixins';
+
 .app-metadata {
   display: flex;
   flex-direction: row;
@@ -25,3 +27,29 @@
   max-width: 800px;
   opacity: .6;
 }
+
+
+.grid {
+  $bottom-space: 20px;
+  display: grid;
+  grid-column-gap: 10px;
+  grid-row-gap: 10px;
+  grid-template-columns: 100%;
+  min-height: 0;
+  min-width: 0;
+
+  @include breakpoint(tablet) {
+    grid-column-gap: $bottom-space;
+    grid-row-gap: $bottom-space;
+    grid-template-columns: repeat(2, 1fr);
+  }
+
+  @include breakpoint(laptop) {
+    grid-template-columns: repeat(4, 1fr);
+  }
+
+  @include breakpoint(desktop) {
+    grid-template-columns: repeat(5, 1fr);
+  }
+}
+
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index a4d6780915..91f4e788e2 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -16,7 +16,8 @@ import { ConfirmationDialogConfig } from '../../../../../shared/components/confi
 import { ConfirmationDialogService } from '../../../../../shared/components/confirmation-dialog.service';
 import { HELM_ENDPOINT_TYPE, helmReleaseEntityKey } from '../../../helm-entity-factory';
 import { HelmReleaseHelperService } from '../helm-release-helper.service';
-import { HelmReleaseStatus } from '../../../store/helm.types';
+import { HelmReleaseStatus, HELM_INSTALLING_KEY } from '../../../store/helm.types';
+import { EntityRequestAction } from '../../../../../../../store/src/types/request.types';
 
 @Component({
   selector: 'app-helm-release-summary-tab',
@@ -50,6 +51,31 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
     }
   ];
 
+  public iconMappings = {
+    Pod: {
+      name: 'adjust'
+    },
+    Role: {
+      name: 'lock'
+    },
+    RoleBinding: {
+      name: 'lock'
+    },
+    ServiceAccount: {
+      name: 'lock'
+    },
+    ReplicaSet: {
+      name: 'filter_none'
+    },
+    default: {
+      name: 'collocation',
+      font: 'stratos-icons'
+    }
+  };
+
+
+  public resources$: Observable<any>;
+
   // Blue: #00B2E2
   // Yellow: #FFC107
 
@@ -70,18 +96,8 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
     //.helmReleaseHelper.fetchReleaseStatus();
 
 
-    this.helmReleaseHelper.fetchReleaseResources().subscribe((g: any) => {
-      if (g) {
-        console.log('SUMMARY');
-        console.log(g);
 
-        Object.values(g).forEach((r: any) => console.log(r.kind));
-      }
-      // const resKinds = {};
-      // g.forEach(r => {
-      //   console.log(r);
-      // });
-    });
+
 
 
     this.isBusy$ = combineLatest([
@@ -95,6 +111,27 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
       startWith(true)
     );
 
+    this.resources$ = this.helmReleaseHelper.fetchReleaseGraph().pipe(
+      map((graph: any) => {
+        const resources = {};
+        // Collect the resources
+        Object.values(graph.nodes).forEach((node: any) => {
+          if (!resources[node.data.kind]) {
+            resources[node.data.kind] = {
+              kind: node.data.kind,
+              label: `${node.data.kind}s`,
+              count: 0,
+              statuses: [],
+              icon: this.getIcon(node.data.kind)
+            };
+          }
+          resources[node.data.kind].count++;
+          resources[node.data.kind].statuses.push(node.data.status);
+        });
+        return Object.values(resources).sort((a: any, b: any) => a.kind.localeCompare(b.kind));
+      })
+    );
+
     // Async fetch release status
     // this.chartData$ = obsOf({});
     // this.chartData$ = releaseStatus$.pipe(
@@ -117,6 +154,15 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
     // );
   }
 
+  private getIcon(kind: string) {
+    const rkind = kind || 'Pod';
+    if (this.iconMappings[rkind]) {
+      return this.iconMappings[rkind];
+    } else {
+      return this.iconMappings.default;
+    }
+  }
+
   private startDelete() {
     this.loadingMessage = 'Deleting Release';
     this.busyDeletingSubject.next(true);
@@ -145,8 +191,16 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
           this.logService.error('Failed to delete release: ', err);
         },
         complete: () => {
-          const releaseEntityConfig = entityCatalogue.getEntity(HELM_ENDPOINT_TYPE, helmReleaseEntityKey);
-          this.store.dispatch(new ClearPaginationOfType(releaseEntityConfig));
+          // Just need an action to clear the pagination for the Helm releases
+          const apiAction = {
+            endpointType: HELM_ENDPOINT_TYPE,
+            entityType: helmReleaseEntityKey,
+            guid: this.helmReleaseHelper.guid,
+            type: null,
+            updatingKey: HELM_INSTALLING_KEY
+          } as EntityRequestAction;
+
+          this.store.dispatch(new ClearPaginationOfType(apiAction));
           this.completeDelete();
           this.store.dispatch(new RouterNav({ path: ['monocular/releases'] }));
         }
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
index 07979874c1..49f9d181c6 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
@@ -1,6 +1,6 @@
 <app-page-sub-nav>
 
-  <mat-button-toggle-group class="toolbar" [value]="viewType"
+  <mat-button-toggle-group class="toolbar" [value]="viewType$ | async"
     (change)="viewTypeChange($event.value)" name="view" aria-label="View">
     <mat-button-toggle value="user">User</mat-button-toggle>
     <mat-button-toggle value="chart">Chart</mat-button-toggle>
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
index ead7de70fc..e995a94edb 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { combineLatest, Observable, Subject } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map, tap, startWith } from 'rxjs/operators';
 
 import { HelmReleaseHelperService } from '../helm-release-helper.service';
 
@@ -11,43 +11,64 @@ import { HelmReleaseHelperService } from '../helm-release-helper.service';
 })
 export class HelmReleaseValuesTabComponent {
 
-  public values$: Observable<string>;
+  public values$: Observable<any>;
 
-  public viewType = 'user';
+  private viewTypeSubject = new Subject<string>();
 
-  private viewTypeSubject = new Subject<boolean>('user');
-
-  // Observable boolean streams
-  public viewType$ = this.viewTypeSubject.asObservable();  
+  public viewType$: Observable<string>;
 
   constructor(public helmReleaseHelper: HelmReleaseHelperService) {
 
+    this.viewType$ = this.viewTypeSubject.asObservable().pipe(startWith('user'));
+
     this.values$ = combineLatest(
       this.viewType$,
       helmReleaseHelper.release$
     ).pipe(
       map(([vtype, release]) => {
-        console.log('HELLO');
-        console.log(vtype);
-        console.log(release);
-
-        return release.chart.values;
+        switch (vtype) {
+          case 'user':
+            return release.config || {};
+          case 'combined':
+              const chart = release.chart.values || {};
+              const user = release.config || {};
+              const target = {};
+              return this.mergeDeep(target, chart, user);
+          default:
+            return release.chart.values || {};
+        }
       })
     );
   }
 
   public viewTypeChange(viewType: string) {
-    this.viewType = viewType;
     this.viewTypeSubject.next(viewType);
+  }
 
+  private isObject(item) {
+    return (item && typeof item === 'object' && !Array.isArray(item));
   }
 
-  private hidePasswords(values: string): string {
-    // TODO: See #150 - It's a PITA but this should be done in the back end
-    let mask = values.replace(new RegExp('(PASSWORD: [a-zA-Z0-9_\-]*)', 'gm'), 'PASSWORD: **********');
-    mask = mask.replace(new RegExp('(password: [a-zA-Z0-9_\-]*)', 'gm'), 'password: **********');
-    mask = mask.replace(new RegExp('(SECRET: [a-zA-Z0-9_\-]*)', 'gm'), 'SECRET: **********');
-    mask = mask.replace(new RegExp('(secret: [a-zA-Z0-9_\-]*)', 'gm'), 'secret: **********');
-    return mask;
+  private mergeDeep(target, ...sources) {
+    if (!sources.length) {
+      return target;
+    }
+    const source = sources.shift();
+
+    if (this.isObject(target) && this.isObject(source)) {
+      for (const key in source) {
+        if (this.isObject(source[key])) {
+          if (!target[key]) {
+            Object.assign(target, { [key]: {} });
+          }
+          this.mergeDeep(target[key], source[key]);
+        } else {
+          Object.assign(target, { [key]: source[key] });
+        }
+      }
+    }
+
+    return this.mergeDeep(target, ...sources);
   }
+
 }
diff --git a/custom-src/frontend/app/custom/helm/store/helm.types.ts b/custom-src/frontend/app/custom/helm/store/helm.types.ts
index cd6fcb1a86..11fb7b0a2f 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.types.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.types.ts
@@ -49,12 +49,13 @@ export interface HelmRelease {
     notes: string;
     status: string;
   };
-  config: {
-    raw: string;
-  };
+  config: any;
   chart: {
     values: any;
-  }
+    metadata: {
+      icon?: string;
+    };
+  };
 }
 
 export interface HelmReleaseStatus {
diff --git a/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.html b/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.html
deleted file mode 100644
index dd2b6cb351..0000000000
--- a/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<app-list></app-list>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.scss b/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.spec.ts b/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.spec.ts
deleted file mode 100644
index 5c82b66529..0000000000
--- a/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.spec.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { HelmBaseTestModules } from '../../helm-testing.module';
-import { HelmConfigurationComponent } from './helm-configuration.component';
-
-describe('HelmConfigurationComponent', () => {
-  let component: HelmConfigurationComponent;
-  let fixture: ComponentFixture<HelmConfigurationComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        ...HelmBaseTestModules
-      ],
-      declarations: [HelmConfigurationComponent]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(HelmConfigurationComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.ts b/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.ts
deleted file mode 100644
index c6c3d58357..0000000000
--- a/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Component } from '@angular/core';
-
-import { ListConfig } from '../../../../shared/components/list/list.component.types';
-import { HelmVersionsListConfig } from '../../list-types/monocular-versions-list-config.service';
-
-@Component({
-  selector: 'app-helm-configuration',
-  templateUrl: './helm-configuration.component.html',
-  styleUrls: ['./helm-configuration.component.scss'],
-  providers: [{
-    provide: ListConfig,
-    useClass: HelmVersionsListConfig,
-  }]
-})
-export class HelmConfigurationComponent { }
-
diff --git a/custom-src/frontend/assets/custom/app_placeholder.svg b/custom-src/frontend/assets/custom/app_placeholder.svg
new file mode 100644
index 0000000000..98cd9de0d5
--- /dev/null
+++ b/custom-src/frontend/assets/custom/app_placeholder.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <title>app_placeholder</title>
+  <path
+  stroke="#808080"
+  fill="none"
+  stroke-width="1"
+  stroke-linecap="butt" 
+  d="M16,3H8A2,2,0,0,0,6.29,4l-4,7a2,2,0,0,0,0,2l4,7A2,2,0,0,0,8,21h8a2,2,0,0,0,1.74-1l4-7a2,2,0,0,0,0-2l-4-7A2,2,0,0,0,16,3Z"/>
+</svg>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.html b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.html
index 0a86b15db7..fbc96182c2 100644
--- a/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.html
+++ b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.html
@@ -15,7 +15,8 @@
       <span *ngIf="!segment.expanded || !isExpandable(segment)" class="segment-value">{{ segment.description }}</span>
     </section>
     <section *ngIf="segment.expanded && isExpandable(segment)" class="children">
-      <app-json-viewer [json]="segment.value" [expanded]="expanded"></app-json-viewer>
+      <app-json-viewer root="false" [json]="segment.value" [expanded]="expanded"></app-json-viewer>
     </section>
   </section>
+  <div *ngIf="root !== 'false' && segments.length === 0">Nothing to show</div>
 </section>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.ts b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.ts
index 1f225ca9a6..91583e2005 100644
--- a/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.ts
+++ b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.ts
@@ -17,6 +17,8 @@ export class JsonViewerComponent implements OnChanges {
 
   @Input() json: any;
 
+  @Input() root: string;
+
   // Whether to expand all initially
   @Input() expanded = true;
   /**
@@ -45,6 +47,10 @@ export class JsonViewerComponent implements OnChanges {
       this.segments = [];
     }
 
+    if (!this.json) {
+      return;
+    }
+
     if (typeof this.json === 'object') {
       Object.keys(this.json).forEach( key => {
         this.segments.push(this.parseKeyValue(key, this.json[key]));
diff --git a/src/frontend/packages/core/src/shared/services/panel-preview.service.ts b/src/frontend/packages/core/src/shared/services/panel-preview.service.ts
index 85a87d2aa3..eae4ace3af 100644
--- a/src/frontend/packages/core/src/shared/services/panel-preview.service.ts
+++ b/src/frontend/packages/core/src/shared/services/panel-preview.service.ts
@@ -14,7 +14,7 @@ export class PanelPreviewService {
   constructor(
     private componentFactoryResolver: ComponentFactoryResolver,
     private router: Router,
-    @Inject(DOCUMENT) private document: Document,    
+    @Inject(DOCUMENT) private document: Document,
   ) {
     this.openedSubject = new BehaviorSubject(false);
     this.opened$ = this.observeSubject(this.openedSubject);
@@ -30,12 +30,12 @@ export class PanelPreviewService {
     this.container = container;
   }
 
-  public show(component: object, props?: { [key: string]: any }) {
+  public show(component: object, props?: { [key: string]: any }, componentFactoryResolver?: ComponentFactoryResolver) {
     if (!this.container) {
       throw new Error('PanelPreviewService: container must be set');
     }
 
-    this.render(component, props);
+    this.render(component, props, componentFactoryResolver);
     this.openedSubject.next(true);
 
     this.document.addEventListener('keydown', this.onKeyDown);
@@ -57,12 +57,15 @@ export class PanelPreviewService {
 
   }
 
-  render(component: object, props: { [key: string]: any }) {
+  render(component: object, props: { [key: string]: any }, componentFactoryResolver?: ComponentFactoryResolver) {
     if (this.container.length) {
       this.container.remove(0);
     }
 
-    const factory: ComponentFactory<any> = this.componentFactoryResolver.resolveComponentFactory(component as any);
+    // Use the supplied component factory resolver if provided
+    const resolver = componentFactoryResolver ||  this.componentFactoryResolver;
+
+    const factory: ComponentFactory<any> = resolver.resolveComponentFactory(component as any);
     const componentRef: ComponentRef<any> = this.container.createComponent(factory);
 
     if (props) {
diff --git a/src/jetstream/plugins/kubernetes/helm/graph.go b/src/jetstream/plugins/kubernetes/helm/graph.go
index 2afbd7b14d..5edd600404 100644
--- a/src/jetstream/plugins/kubernetes/helm/graph.go
+++ b/src/jetstream/plugins/kubernetes/helm/graph.go
@@ -8,10 +8,12 @@ import (
 
 	log "github.com/sirupsen/logrus"
 	appsv1 "k8s.io/api/apps/v1"
-	v1 "k8s.io/api/core/v1"
 	appsv1beta1 "k8s.io/api/apps/v1beta1"
 	appsv1beta2 "k8s.io/api/apps/v1beta2"
+	batchv1 "k8s.io/api/batch/v1"
+	v1 "k8s.io/api/core/v1"
 	extv1beta1 "k8s.io/api/extensions/v1beta1"
+	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -53,14 +55,11 @@ func (r *HelmReleaseGraph) AddLink(source, target string) {
 		Target: target,
 	}
 	r.Links[link.ID] = link
-	log.Warnf("Adding link %s -> %s", source, target)
+	log.Debugf("Adding link %s -> %s", source, target)
 }
 
 // ParseManifest
 func (r *HelmReleaseGraph) ParseManifest(release *HelmRelease) {
-
-	log.Warnf("Graph:: Parse ManifestL %d", len(release.Resources))
-
 	for _, item := range release.Resources {
 		log.Warn(item.Kind)
 
@@ -110,8 +109,15 @@ func (r *HelmReleaseGraph) ParseManifest(release *HelmRelease) {
 		case *v1.Service:
 			target := getShortResourceId(item.Kind, o.Name)
 			r.ProcessService(target, item, o.Spec)
+		case *batchv1.Job:
+			target := getShortResourceId(item.Kind, o.Name)
+			r.ParseResourceOwners(target, o.OwnerReferences)
+			r.ProcessServiceAccount(target, o.Spec.Template)
+		case *rbacv1.RoleBinding:
+			target := getShortResourceId(item.Kind, o.Name)
+			r.ParseRoleBinding(target, o)
 		default:
-			log.Errorf("Graph: Unknown type: %s", reflect.TypeOf(o))
+			log.Debugf("Graph: Unknown type: %s", reflect.TypeOf(o))
 		}
 
 		// Add or replace the node in the map
@@ -127,8 +133,6 @@ func (r *HelmReleaseGraph) ParseManifest(release *HelmRelease) {
 			r.generateTemporaryNode(link.Target)
 		}
 	}
-
-	log.Warn("End parse graph")
 }
 
 func (r *HelmReleaseGraph) generateTemporaryNode(id string) {
@@ -165,7 +169,6 @@ func (r *HelmReleaseGraph) ParseResourceOwners(id string, owners []metav1.OwnerR
 func (r *HelmReleaseGraph) ProcessPod(id string, res KubeResource, spec v1.PodSpec, status v1.PodStatus) {
 	// Look through volumes
 	// name and: PersistentVolumeClaim.ClaimName or Secret.SecretName
-	log.Warnf("Processing Pod Volumes for %s", id)
 	for _, volume := range spec.Volumes {
 		if volume.VolumeSource.PersistentVolumeClaim != nil {
 			ref := fmt.Sprintf("PersistentVolumeClaim-%s", volume.VolumeSource.PersistentVolumeClaim.ClaimName)
@@ -226,11 +229,7 @@ func (r *HelmReleaseGraph) ProcessService(id string, res KubeResource, spec v1.S
 		for _, item := range r.Release.Resources {
 			switch o := item.Resource.(type) {
 			case *v1.Pod:
-				log.Warnf("Pod %s", o.Name)
-
 				if labelsMatch(spec.Selector, o.Labels) {
-					log.Error("GOT A POD FOR THE SERVICE: %s", o.Name)
-
 					podID := fmt.Sprintf("Pod-%s", o.Name)
 					r.AddLink(podID, id)
 				}
@@ -238,3 +237,24 @@ func (r *HelmReleaseGraph) ProcessService(id string, res KubeResource, spec v1.S
 		}
 	}
 }
+
+func (r *HelmReleaseGraph) ProcessServiceAccount(id string, template v1.PodTemplateSpec) {
+	if len(template.Spec.ServiceAccountName) > 0 {
+		svcAccountID := fmt.Sprintf("ServiceAccount-%s", template.Spec.ServiceAccountName)
+		r.AddLink(id, svcAccountID)
+	} else if len(template.Spec.DeprecatedServiceAccount) > 0 {
+		svcAccountID := fmt.Sprintf("ServiceAccount-%s", template.Spec.DeprecatedServiceAccount)
+		r.AddLink(id, svcAccountID)
+	}
+}
+
+func (r *HelmReleaseGraph) ParseRoleBinding(id string, roleBinding *rbacv1.RoleBinding) {
+	for _, subject := range roleBinding.Subjects {
+		// TODO: Only match those with the same namespace ????
+		subjectID := fmt.Sprintf("%s-%s", subject.Kind, subject.Name)
+		r.AddLink(id, subjectID)
+	}
+
+	roleRefID := fmt.Sprintf("%s-%s", roleBinding.RoleRef.Kind, roleBinding.RoleRef.Name)
+	r.AddLink(id, roleRefID)
+}
diff --git a/src/jetstream/plugins/kubernetes/helm/graph_status.go b/src/jetstream/plugins/kubernetes/helm/graph_status.go
index 639ac37ba1..f2bfdce76b 100644
--- a/src/jetstream/plugins/kubernetes/helm/graph_status.go
+++ b/src/jetstream/plugins/kubernetes/helm/graph_status.go
@@ -51,6 +51,12 @@ func mapContainerStatus(status v1.PodStatus, name string) NodeStatus {
 			if cstat.Ready {
 				return NodeOK
 			} else {
+				// Could be a pod that has completed
+				if cstat.State.Terminated != nil {
+					if cstat.State.Terminated.ExitCode == 0 && cstat.State.Terminated.Reason == "Completed" {
+						return NodeOK
+					}
+				}
 				return NodeWarn
 			}
 		}
diff --git a/src/jetstream/plugins/kubernetes/helm/release.go b/src/jetstream/plugins/kubernetes/helm/release.go
index bc29196821..ab13508217 100644
--- a/src/jetstream/plugins/kubernetes/helm/release.go
+++ b/src/jetstream/plugins/kubernetes/helm/release.go
@@ -12,26 +12,32 @@ import (
 
 	log "github.com/sirupsen/logrus"
 	"helm.sh/helm/v3/pkg/release"
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 	appsv1 "k8s.io/api/apps/v1"
 	appsv1beta1 "k8s.io/api/apps/v1beta1"
 	appsv1beta2 "k8s.io/api/apps/v1beta2"
+	batchv1 "k8s.io/api/batch/v1"
+	v1 "k8s.io/api/core/v1"
 	extv1beta1 "k8s.io/api/extensions/v1beta1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes/scheme"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 )
 
+var resourcesWithoutStatus = map[string]bool{
+	"RoleBinding": false,
+	"Role":        false,
+}
+
 // HelmRelease represents a Helm Release deployed via Helm
 type HelmRelease struct {
 	*release.Release
-	Endpoint string `json:"-"`
-	User     string `json:"-"`
-	Resources map[string]KubeResource `json:"resources"`
-	Jobs    []KubeResourceJob `json:"-"`
-	PodJobs []KubeResourceJob `json:"-"`
+	Endpoint  string                     `json:"-"`
+	User      string                     `json:"-"`
+	Resources map[string]KubeResource    `json:"resources"`
+	Jobs      []KubeResourceJob          `json:"-"`
+	PodJobs   map[string]KubeResourceJob `json:"-"`
 }
 
 // KubeResource is a simple struct to pull out core common metadata for a Kube resource
@@ -57,6 +63,7 @@ func NewHelmRelease(info *release.Release, endpoint, user string) *HelmRelease {
 		User:     user,
 	}
 	r.Resources = make(map[string]KubeResource)
+	r.PodJobs = make(map[string]KubeResourceJob)
 	r.parseManifest()
 	return r
 }
@@ -129,9 +136,10 @@ func (r *HelmRelease) processResource(obj runtime.Object) {
 			t.Manifest = true
 			r.setResource(t)
 			log.Infof("Got resource: %s : %s", t.Kind, t.Metadata.Name)
-			if t.Kind == "Deployment" || t.Kind == "StatefulSet" || t.Kind == "DaemonSet" {
-				r.processDeployment(t)
-			}
+			// if t.Kind == "Deployment" || t.Kind == "StatefulSet" || t.Kind == "DaemonSet" || t.Kind =={
+			// 	r.processController(t)
+			// }
+			r.processController(t)
 			r.addJobForResource(t.Kind, t.APIVersion, t.Metadata.Name)
 		} else {
 			log.Error("Helm Release Manifest: Could not parse Kubernetes resource")
@@ -153,7 +161,7 @@ func (r *HelmRelease) addJobForResource(kind, apiVersion, name string) {
 	r.Jobs = append(r.Jobs, job)
 }
 
-func (r *HelmRelease) processDeployment(kres KubeResource) {
+func (r *HelmRelease) processController(kres KubeResource) {
 	switch o := kres.Resource.(type) {
 	case *appsv1.Deployment:
 		r.processPodSelector(kres, o.Spec.Selector)
@@ -171,13 +179,19 @@ func (r *HelmRelease) processDeployment(kres KubeResource) {
 		r.processPodSelector(kres, o.Spec.Selector)
 	case *appsv1.DaemonSet:
 		r.processPodSelector(kres, o.Spec.Selector)
+	case *batchv1.Job:
+		r.processPodSelector(kres, o.Spec.Selector)
 	default:
-		// Ignore
-		log.Errorf("Ignoring: deployment type: %s", reflect.TypeOf(o))
+		// Ignore - not a controller
+		log.Errorf("Ignoring: non-controller type: %s", reflect.TypeOf(o))
 	}
 }
 
 func (r *HelmRelease) processPodSelector(kres KubeResource, selector *metav1.LabelSelector) {
+	if selector == nil {
+		return
+	}
+
 	qs := podSelectorToQueryString(selector)
 
 	// Add a job to get the pods in this deployment
@@ -189,14 +203,18 @@ func (r *HelmRelease) processPodSelector(kres KubeResource, selector *metav1.Lab
 		User:      r.User,
 		Namespace: r.Namespace,
 	}
-	r.PodJobs = append(r.PodJobs, job)
+	r.PodJobs[job.ID] = job
 }
 
 // UpdatePods will run the jobs needed to get the pods
 // This uses the selectors to find the pods - so new pods should be picked up
 func (r *HelmRelease) UpdatePods(jetstream interfaces.PortalProxy) {
-	// This will be an array of pod lists
-	runner := NewKubeAPIJob(jetstream, r.PodJobs)
+	var jobs []KubeResourceJob
+	for _, job := range r.PodJobs {
+		jobs = append(jobs, job)
+	}
+
+	runner := NewKubeAPIJob(jetstream, jobs)
 	res := runner.Run()
 	for _, j := range res {
 		var list v1.PodList
@@ -275,7 +293,7 @@ func (r *HelmRelease) UpdateResources(jetstream interfaces.PortalProxy) {
 
 		// TODO: If the status was 404, then we should remove the resource
 
-		// Add a kube resource for the pod
+		// Add a kube resource
 		res := KubeResource{
 			Kind:       j.Kind,
 			APIVersion: j.APIVersion,
@@ -293,6 +311,9 @@ func (r *HelmRelease) UpdateResources(jetstream interfaces.PortalProxy) {
 		} else {
 			log.Error("Could not parse resource")
 		}
+
+		// TODO: If the resource was a job, process the selector again
+		r.processController(res)
 	}
 }
 
@@ -301,8 +322,14 @@ func getRestURL(namespace, kind, apiVersion, name string) string {
 	base := "api"
 	if len(strings.Split(apiVersion, "/")) > 1 {
 		base = "apis"
-		name += "/status"
+
+		v, ok := resourcesWithoutStatus[kind]
+		if !ok || v {
+			name += "/status"
+		}
 	}
 	restURL = fmt.Sprintf("/%s/%s/namespaces/%s/%ss/%s", base, apiVersion, namespace, strings.ToLower(kind), name)
+
+	//log.Errorf("%s %s %s -> %s", kind, apiVersion, name, restURL)
 	return restURL
 }
diff --git a/src/jetstream/plugins/kubernetes/list_releases.go b/src/jetstream/plugins/kubernetes/list_releases.go
index 34d611f6af..9dc54d5415 100644
--- a/src/jetstream/plugins/kubernetes/list_releases.go
+++ b/src/jetstream/plugins/kubernetes/list_releases.go
@@ -228,6 +228,8 @@ func (c *KubernetesSpecification) GetRelease(ec echo.Context) error {
 
 	go readLoop(ws, stopchan)
 
+	var sleep = 1 * time.Second
+
 	// Now we have everything, so loop, polling to get status
 	for {
 		log.Warn("Polling for release - wait 10 seconds")
@@ -238,7 +240,7 @@ func (c *KubernetesSpecification) GetRelease(ec echo.Context) error {
 			log.Error("****************************************************************************************************")
 			ws.Close()
 			return nil
-		case <-time.After(10 * time.Second):
+		case <-time.After(sleep):
 			break
 		}
 
@@ -257,6 +259,8 @@ func (c *KubernetesSpecification) GetRelease(ec echo.Context) error {
 
 		graph.ParseManifest(rel)
 		sendResource(ws, "Graph", graph)
+
+		sleep = 10 * time.Second
 	}
 
 	log.Error("****************************************************************************************************")

From b690f8b0bdfbc3e5412f2434e09d3cf3d4012d51 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Tue, 10 Dec 2019 13:17:01 +0000
Subject: [PATCH 205/648] modify config to build chartsvc container

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 src/jetstream/plugins/monocular/chartsvc/Dockerfile | 4 ++--
 src/jetstream/plugins/monocular/go.mod              | 1 -
 src/jetstream/plugins/monocular/go.sum              | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/jetstream/plugins/monocular/chartsvc/Dockerfile b/src/jetstream/plugins/monocular/chartsvc/Dockerfile
index 12824d7fe4..9f4ce2c0bc 100644
--- a/src/jetstream/plugins/monocular/chartsvc/Dockerfile
+++ b/src/jetstream/plugins/monocular/chartsvc/Dockerfile
@@ -1,6 +1,6 @@
 FROM golang:1.12 as builder
-COPY . /go/src/github.com/helm/monocular
-WORKDIR /go/src/github.com/helm/monocular
+COPY . /go/src/github.com/helm/monocular/chartsvc
+WORKDIR /go/src/github.com/helm/monocular/chartsvc
 RUN GO111MODULE=on GOPROXY=https://gocenter.io CGO_ENABLED=0 go build -a -installsuffix cgo .
 FROM scratch
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
diff --git a/src/jetstream/plugins/monocular/go.mod b/src/jetstream/plugins/monocular/go.mod
index bf5760305d..df993a48ac 100644
--- a/src/jetstream/plugins/monocular/go.mod
+++ b/src/jetstream/plugins/monocular/go.mod
@@ -19,7 +19,6 @@ require (
 )
 
 replace (
-	github.com/cloudfoundry-incubator/stratos => ../../../..
 	github.com/cloudfoundry-incubator/stratos/src/jetstream => ../..
 	github.com/helm/monocular/chartrepo => ./chart-repo
 	github.com/helm/monocular/chartsvc => ./chartsvc
diff --git a/src/jetstream/plugins/monocular/go.sum b/src/jetstream/plugins/monocular/go.sum
index e31f024235..cfa2ec9c01 100644
--- a/src/jetstream/plugins/monocular/go.sum
+++ b/src/jetstream/plugins/monocular/go.sum
@@ -9,6 +9,7 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLM
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/cloudfoundry-community/go-cfenv v1.17.0 h1:qfxEfn8qKkaHY3ZEk/Y2noY79HBASvNgmtHK9x4+6GY=
 github.com/cloudfoundry-community/go-cfenv v1.17.0/go.mod h1:2UgWvQTRXUuIZ/x3KnW6fk6CgPBhcV4UQb/UGIrUyyI=
+github.com/cloudfoundry-incubator/stratos v2.0.0-beta-001+incompatible h1:UUxNbLjhv2cfymub5yNN1tjjqYkteHBBagb4jcbXEIQ=
 github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

From 18f963e9148e075e321114296739878c47be59e8 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Wed, 11 Dec 2019 13:18:56 +0000
Subject: [PATCH 206/648] fdb helm charts added

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 .../local-helm/fdbdoclayer/.helmignore        | 22 +++++++++
 .../console/local-helm/fdbdoclayer/Chart.yaml |  5 +++
 .../fdbdoclayer/templates/_helpers.tpl        | 33 ++++++++++++++
 .../templates/fdb-doc-layer-deployment.yaml   | 45 +++++++++++++++++++
 .../fdb-doc-layer-networkpolicy.yaml          | 20 +++++++++
 .../templates/fdb-doc-layer-service.yaml      | 19 ++++++++
 .../templates/fdbserver-deployment.yaml       | 45 +++++++++++++++++++
 .../templates/fdbserver-networkpolicy.yaml    | 20 +++++++++
 .../templates/fdbserver-service.yaml          | 19 ++++++++
 .../local-helm/fdbdoclayer/values.yaml        | 26 +++++++++++
 deploy/kubernetes/console/requirements.lock   |  6 +++
 deploy/kubernetes/console/requirements.yaml   |  4 ++
 12 files changed, 264 insertions(+)
 create mode 100644 deploy/kubernetes/console/local-helm/fdbdoclayer/.helmignore
 create mode 100644 deploy/kubernetes/console/local-helm/fdbdoclayer/Chart.yaml
 create mode 100644 deploy/kubernetes/console/local-helm/fdbdoclayer/templates/_helpers.tpl
 create mode 100644 deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
 create mode 100644 deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-networkpolicy.yaml
 create mode 100644 deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml
 create mode 100644 deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
 create mode 100644 deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-networkpolicy.yaml
 create mode 100644 deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-service.yaml
 create mode 100644 deploy/kubernetes/console/local-helm/fdbdoclayer/values.yaml
 create mode 100644 deploy/kubernetes/console/requirements.lock
 create mode 100644 deploy/kubernetes/console/requirements.yaml

diff --git a/deploy/kubernetes/console/local-helm/fdbdoclayer/.helmignore b/deploy/kubernetes/console/local-helm/fdbdoclayer/.helmignore
new file mode 100644
index 0000000000..50af031725
--- /dev/null
+++ b/deploy/kubernetes/console/local-helm/fdbdoclayer/.helmignore
@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/deploy/kubernetes/console/local-helm/fdbdoclayer/Chart.yaml b/deploy/kubernetes/console/local-helm/fdbdoclayer/Chart.yaml
new file mode 100644
index 0000000000..e19e1e279f
--- /dev/null
+++ b/deploy/kubernetes/console/local-helm/fdbdoclayer/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: fdbdoclayer
+version: 0.1.0
diff --git a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/_helpers.tpl b/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/_helpers.tpl
new file mode 100644
index 0000000000..a61ed5fe2a
--- /dev/null
+++ b/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/_helpers.tpl
@@ -0,0 +1,33 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "fullname" -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name for the document layer.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "doclayer.fullname" -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- printf "%s-%s-%s" .Release.Name $name "fdbdoclayer" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Render image reference
+*/}}
+{{- define "fdb.image" -}}
+{{ .registry }}/{{ .repository }}:{{ .tag }}
+{{- end -}}
diff --git a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml b/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
new file mode 100644
index 0000000000..48fcd62697
--- /dev/null
+++ b/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
@@ -0,0 +1,45 @@
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "fullname" . }}-fdbdoclayer
+  labels:
+    app: {{ template "fullname" . }}-fdbdoclayer
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+spec:
+  replicas: {{ .Values.fdbdoclayer.replicas }}
+  selector:
+    matchLabels:
+      app: {{ template "fullname" . }}-fdbdoclayer
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "fullname" . }}-fdbdoclayer
+        release: {{ .Release.Name }}
+    spec:
+{{- with .Values.securityContext }}
+      securityContext:
+{{ toYaml . | indent 8 }}
+{{- end }}
+      containers:
+      - name: fdbdoclayer
+        image: {{ template "fdb.image" .Values.fdbdoclayer.image }}
+        env:
+        - name: FDB_COORDINATOR
+          value: {{ template "fullname" . }}-fdbserver
+        - name: CLUSTER_ID
+          value: chartdb:erlklkg
+        ports:
+        - containerPort: {{ .Values.fdbdoclayer.service.port }}
+        livenessProbe:
+          tcpSocket:
+            port: {{ .Values.fdbdoclayer.service.port }}
+          initialDelaySeconds: 3
+          periodSeconds: 20
+        readinessProbe:
+          tcpSocket:
+            port: {{ .Values.fdbdoclayer.service.port }}
+          initialDelaySeconds: 3
+          periodSeconds: 10
\ No newline at end of file
diff --git a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-networkpolicy.yaml b/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-networkpolicy.yaml
new file mode 100644
index 0000000000..1dc5c4eb9e
--- /dev/null
+++ b/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-networkpolicy.yaml
@@ -0,0 +1,20 @@
+{{- if .Values.networkPolicy.enabled }}
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: {{ template "fullname" . }}-fdbdoclayer
+  labels:
+    app: {{ template "fullname" . }}-fdbdoclayer
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+spec:
+  podSelector:
+    matchLabels:
+      app: {{ template "fullname" . }}-fdbdoclayer
+      release: {{ .Release.Name }}
+  ingress:
+    ports:
+      port: {{ .Values.fdbdoclayer.service.port }}
+      protocol: TCP
+{{- end }}
diff --git a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml b/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml
new file mode 100644
index 0000000000..d10f6e545b
--- /dev/null
+++ b/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "doclayer.fullname" . }}
+  labels:
+    app: {{ template "fullname" . }}-fdbdoclayer
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+spec:
+  type: ClusterIP
+  ports:
+  - port: {{ .Values.fdbdoclayer.service.port }}
+    targetPort: {{ .Values.fdbdoclayer.service.port }}
+    protocol: TCP
+    name: {{ .Values.fdbdoclayer.service.name }}
+  selector:
+    app: {{ template "fullname" . }}-fdbdoclayer
+    release: {{ .Release.Name }}
\ No newline at end of file
diff --git a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml b/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
new file mode 100644
index 0000000000..d5dd4d7295
--- /dev/null
+++ b/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
@@ -0,0 +1,45 @@
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "fullname" . }}-fdbserver
+  labels:
+    app: {{ template "fullname" . }}-fdbserver
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+spec:
+  replicas: {{ .Values.fdbserver.replicas }}
+  selector:
+    matchLabels:
+      app: {{ template "fullname" . }}-fdbserver
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "fullname" . }}-fdbserver
+        release: {{ .Release.Name }}
+    spec:
+{{- with .Values.securityContext }}
+      securityContext:
+{{ toYaml . | indent 8 }}
+{{- end }}
+      containers:
+      - name: fdbserver
+        image: {{ template "fdb.image" .Values.fdbserver.image }}
+        env:
+        - name: FDB_COORDINATOR
+          value: {{ template "fullname" . }}-fdbserver.monocular.svc.cluster.local
+        - name: CLUSTER_ID
+          value: chartdb:erlklkg
+        ports:
+        - containerPort: {{ .Values.fdbserver.service.port }}
+        livenessProbe:
+          tcpSocket:
+            port: {{ .Values.fdbserver.service.port }}
+          initialDelaySeconds: 3
+          periodSeconds: 20
+        readinessProbe:
+          tcpSocket:
+            port: {{ .Values.fdbserver.service.port }}
+          initialDelaySeconds: 3
+          periodSeconds: 10
\ No newline at end of file
diff --git a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-networkpolicy.yaml b/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-networkpolicy.yaml
new file mode 100644
index 0000000000..385e45749e
--- /dev/null
+++ b/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-networkpolicy.yaml
@@ -0,0 +1,20 @@
+{{- if .Values.networkPolicy.enabled }}
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: {{ template "fullname" . }}-fdbserver
+  labels:
+    app: {{ template "fullname" . }}-fdbserver
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+spec:
+  podSelector:
+    matchLabels:
+      app: {{ template "fullname" . }}-fdbserver
+      release: {{ .Release.Name }}
+  ingress:
+  - ports:
+    - port: {{ .Values.fdbserver.service.port }}
+      protocol: TCP
+{{- end }}
diff --git a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-service.yaml b/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-service.yaml
new file mode 100644
index 0000000000..3b258e5c98
--- /dev/null
+++ b/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "fullname" . }}-fdbserver
+  labels:
+    app: {{ template "fullname" . }}-fdbserver
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+spec:
+  type: ClusterIP
+  ports:
+  - port: {{ .Values.fdbserver.service.port }}
+    targetPort: {{ .Values.fdbserver.service.port }}
+    protocol: TCP
+    name: {{ .Values.fdbserver.service.name }}
+  selector:
+    app: {{ template "fullname" . }}-fdbserver
+    release: {{ .Release.Name }}
\ No newline at end of file
diff --git a/deploy/kubernetes/console/local-helm/fdbdoclayer/values.yaml b/deploy/kubernetes/console/local-helm/fdbdoclayer/values.yaml
new file mode 100644
index 0000000000..de07ac2ea9
--- /dev/null
+++ b/deploy/kubernetes/console/local-helm/fdbdoclayer/values.yaml
@@ -0,0 +1,26 @@
+fdbserver:
+  replicas: 1
+  image:
+    registry: docker.io
+    repository: kreinecke/foundationdb
+    tag: 6.0.18-k8s
+    pullPolicy: Always
+  service:
+    name: fdbserver
+    port: 4500
+
+fdbdoclayer:
+  replicas: 1
+  image:
+    registry: docker.io
+    repository: kreinecke/fdb-document-layer
+    tag: 1.6.3-k8s
+    pullPolicy: Always
+  service:
+    name: fdbdoclayer
+    port: 27016
+
+# Installs networkPolicy for the services. This will allow communication betweeen the services in
+# environments where the default policy is deny
+networkPolicy:
+  enabled: false
\ No newline at end of file
diff --git a/deploy/kubernetes/console/requirements.lock b/deploy/kubernetes/console/requirements.lock
new file mode 100644
index 0000000000..71b03f85b5
--- /dev/null
+++ b/deploy/kubernetes/console/requirements.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: fdbdoclayer
+  repository: file://./local-helm/fdbdoclayer/
+  version: 0.1.0
+digest: sha256:e783f9ae56e7661533bba491fae357ae2b8d18367ac0bde6715dcc68a982348f
+generated: "2019-12-10T13:27:53.911953269Z"
diff --git a/deploy/kubernetes/console/requirements.yaml b/deploy/kubernetes/console/requirements.yaml
new file mode 100644
index 0000000000..87ccde9bb4
--- /dev/null
+++ b/deploy/kubernetes/console/requirements.yaml
@@ -0,0 +1,4 @@
+dependencies:
+- name: fdbdoclayer
+  version: 0.1.0
+  repository: file://./local-helm/fdbdoclayer/
\ No newline at end of file

From 63f60344fd317bbdf5d8c5807a25e323e297dc28 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Wed, 11 Dec 2019 13:21:56 +0000
Subject: [PATCH 207/648] Add API endpoint to allow on-demand trigger of sync
 and delete

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 .../monocular/chart-repo/api_endpoint.go      | 136 ++++++++++++++++++
 .../monocular/chart-repo/chart_repo.go        |   2 +
 .../{datastore.go => datastore.go_bak}        |   0
 .../chart-repo/foundationdb/utils.go          |   4 +-
 4 files changed, 140 insertions(+), 2 deletions(-)
 create mode 100644 src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
 rename src/jetstream/plugins/monocular/chart-repo/{datastore.go => datastore.go_bak} (100%)

diff --git a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
new file mode 100644
index 0000000000..3d7f6946cb
--- /dev/null
+++ b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
@@ -0,0 +1,136 @@
+/*
+Copyright (c) 2017 The Helm Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package chartrepo
+
+import (
+	"context"
+	"flag"
+	"net/http"
+	"os"
+
+	"github.com/gorilla/mux"
+	"github.com/heptiolabs/healthcheck"
+	mongoDatastore "github.com/kubeapps/common/datastore"
+	log "github.com/sirupsen/logrus"
+	"github.com/urfave/negroni"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
+
+	fdb "github.com/helm/monocular/chartsvc/foundationdb"
+	fdbDatastore "github.com/helm/monocular/chartsvc/foundationdb/datastore"
+)
+
+const pathPrefix = "/v1"
+
+var client *mongo.Client
+var fDBName string
+var authorizationHeader string
+
+func setupRoutes() http.Handler {
+	r := mux.NewRouter()
+
+	// Healthcheck
+	health := healthcheck.NewHandler()
+	r.Handle("/live", health)
+	r.Handle("/ready", health)
+
+	// Routes
+	apiv1 := r.PathPrefix(pathPrefix).Subrouter()
+	apiv1.Methods("PUT").Path("/sync/{repo}").Handler(fdb.WithParams(fdb.OnDemandSync))
+	apiv1.Methods("PUT").Path("/delete/{repo}").Handler(fdb.WithParams(fdb.OnDemandDelete))
+	
+	n := negroni.Classic()
+	n.UseHandler(r)
+	return n
+}
+
+func OnDemandSync(w http.ResponseWriter, req *http.Request, params Params)
+	repoURL := req.FormValue("repoURL") 
+	repoName := params["repo"]
+	//TODO kate check and handle errors
+	startTime := time.Now()
+	if err = fdb.SyncRepo(client, fDBName, repoName, repoURL, authorizationHeader); err != nil {
+		log.Fatalf("Can't sync chart repository with database: %v", err)
+		return
+	}
+	timeTaken := time.Since(startTime).Seconds()
+	log.Infof("Successfully added the chart repository %s to database in %v seconds", args[0], timeTaken)
+}
+
+func OnDemandDelete(w http.ResponseWriter, req *http.Request, params Params)
+	repoName := params["repo"]
+	//TODO kate check and handle errors
+	if err = deleteRepo(cient, fDBName, repoName); err != nil {
+		log.Fatalf("Can't delete chart repository %s from database: %v", args[0], err)
+	}
+}
+
+func initOnDemandEndpoint() {
+
+	debugVar, isSet := os.LookupEnv("DEBUG")
+	var debug bool
+	if !isSet {
+		debug = strconv.ParseBool(debug)
+	}
+
+	authorizationHeader = os.Getenv("AUTHORIZATION_HEADER")
+
+	//Flags for optional FoundationDB + Document Layer backend
+	fdbURL, isSet = os.LookupEnv("doclayer-url")
+	if !isSet {
+		fdbURL = "mongodb://fdb-service/27016"
+	}
+
+	fDBName, isSet = os.LookupEnv("doclayer-database")
+	if !isSet {
+		fDB = "charts"
+	}
+
+	if debug {
+		log.SetLevel(log.DebugLevel)
+	}
+
+	InitFDBDocLayerConnection(&fdbURL, &fDB, &debug)
+
+	n := setupRoutes()
+
+	port := os.Getenv("PORT")
+	if port == "" {
+		port = "8080"
+	}
+	addr := ":" + port
+	log.WithFields(log.Fields{"addr": addr}).Info("On-Demand endpoint listening on: %v", port)
+	http.ListenAndServe(addr, n)
+}
+
+func InitFDBDocLayerConnection(fdbURL *string, fDB *string, debug *bool) {
+
+	log.Debugf("Attempting to connect to FDB: %v, %v, debug: %v", *fdbURL, *fDB, *debug)
+
+	clientOptions := options.Client().ApplyURI(*fdbURL).SetMinPoolSize(10).SetMaxPoolSize(100)
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+	client, err := fdbDatastore.NewDocLayerClient(context.Background(), clientOptions)
+	if err != nil {
+		log.Fatalf("Can't create client for FoundationDB document layer: %v", err)
+		return
+	}
+	log.Debugf("FDB Document Layer client created.")
+
+	fdb.InitDBConfig(client, *fDB)
+	fdb.SetPathPrefix(pathPrefix)
+}
diff --git a/src/jetstream/plugins/monocular/chart-repo/chart_repo.go b/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
index d5f6ccc350..b8bc64a77b 100644
--- a/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
+++ b/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
@@ -41,6 +41,8 @@ func main() {
 
 func init() {
 
+	initOnDemandEndpoint()
+	
 	cmds := []*cobra.Command{SyncCmd, DeleteCmd}
 
 	for _, cmd := range cmds {
diff --git a/src/jetstream/plugins/monocular/chart-repo/datastore.go b/src/jetstream/plugins/monocular/chart-repo/datastore.go_bak
similarity index 100%
rename from src/jetstream/plugins/monocular/chart-repo/datastore.go
rename to src/jetstream/plugins/monocular/chart-repo/datastore.go_bak
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
index aa8f165060..c20a33af2e 100644
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
@@ -67,7 +67,7 @@ func init() {
 // These steps are processed in this way to ensure relevant chart data is
 // imported into the database as fast as possible. E.g. we want all icons for
 // charts before fetching readmes for each chart and version pair.
-func syncRepo(dbClient Client, dbName, repoName, repoURL string, authorizationHeader string) error {
+func SyncRepo(dbClient Client, dbName, repoName, repoURL string, authorizationHeader string) error {
 
 	db, closer := dbClient.Database(dbName)
 	defer closer()
@@ -190,7 +190,7 @@ func updateLastCheck(db Database, repoName string, checksum string, now time.Tim
 	return err
 }
 
-func deleteRepo(dbClient Client, dbName, repoName string) error {
+func DeleteRepo(dbClient Client, dbName, repoName string) error {
 	db, closer := dbClient.Database(dbName)
 	defer closer()
 	collection := db.Collection(chartCollection)

From e5b7199fd05916f8b1aceef7edce362489efba03 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Wed, 11 Dec 2019 13:24:54 +0000
Subject: [PATCH 208/648] Update stratos plugin code to point to new fdb code
 in chartsvc. Remove direct calls to chart repo - to be replaced by rest calls
 to chart-repo container

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 go.mod                                        |  44 +++
 go.sum                                        | 308 +++++++++++++++
 .../plugins/monocular/chartsvc/datastore.go   |  16 -
 .../plugins/monocular/chartsvc/main.go        |   4 +-
 src/jetstream/plugins/monocular/main.go       |  87 ++---
 .../plugins/monocular/repodatastore.go        |   7 +
 .../plugins/monocular/sql_datastore.go        | 308 ---------------
 .../plugins/monocular/sql_datastore.go_bak    | 358 ++++++++++++++++++
 src/jetstream/plugins/monocular/sync.go       |  12 +-
 9 files changed, 768 insertions(+), 376 deletions(-)
 create mode 100644 go.mod
 create mode 100644 go.sum
 delete mode 100644 src/jetstream/plugins/monocular/chartsvc/datastore.go
 create mode 100644 src/jetstream/plugins/monocular/repodatastore.go
 create mode 100644 src/jetstream/plugins/monocular/sql_datastore.go_bak

diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000000..25fd0aad93
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,44 @@
+module github.com/kreinecke/stratos
+
+go 1.12
+
+require (
+	github.com/Masterminds/goutils v1.1.0 // indirect
+	github.com/Masterminds/semver v1.5.0 // indirect
+	github.com/Masterminds/sprig v2.22.0+incompatible // indirect
+	github.com/arschles/assert v1.0.0 // indirect
+	github.com/cyphar/filepath-securejoin v0.2.2 // indirect
+	github.com/disintegration/imaging v1.6.2 // indirect
+	github.com/ghodss/yaml v1.0.0 // indirect
+	github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 // indirect
+	github.com/go-stack/stack v1.8.0 // indirect
+	github.com/gobwas/glob v0.2.3 // indirect
+	github.com/golang/snappy v0.0.1 // indirect
+	github.com/google/go-cmp v0.3.1 // indirect
+	github.com/gorilla/mux v1.7.3 // indirect
+	github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40 // indirect
+	github.com/huandu/xstrings v1.2.1 // indirect
+	github.com/imdario/mergo v0.3.8 // indirect
+	github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect
+	github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a // indirect
+	github.com/labstack/echo v3.3.10+incompatible // indirect
+	github.com/labstack/gommon v0.3.0 // indirect
+	github.com/mitchellh/copystructure v1.0.0 // indirect
+	github.com/prometheus/client_golang v1.2.1 // indirect
+	github.com/spf13/cobra v0.0.5 // indirect
+	github.com/tidwall/pretty v1.0.0 // indirect
+	github.com/unrolled/render v1.0.1 // indirect
+	github.com/urfave/negroni v1.0.0 // indirect
+	github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c // indirect
+	github.com/xdg/stringprep v1.0.0 // indirect
+	go.mongodb.org/mongo-driver v1.1.3 // indirect
+	golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect
+	golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 // indirect
+	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
+	golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135 // indirect
+	google.golang.org/grpc v1.25.1 // indirect
+	honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc // indirect
+	k8s.io/apimachinery v0.0.0-20191203211716-adc6f4cd9e7d // indirect
+	k8s.io/client-go v11.0.0+incompatible // indirect
+	k8s.io/helm v2.16.1+incompatible // indirect
+)
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000000..3f94b81fa5
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,308 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg=
+github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
+github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
+github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60=
+github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o=
+github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
+github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
+github.com/arschles/assert v1.0.0 h1:NofQbRhtxcLgP+XoKunA7J6UMJNTqX7xR/19tej8UsA=
+github.com/arschles/assert v1.0.0/go.mod h1:m/u69zW43x0h8dTHcv3JJZljINyEYgBuf5fYJP6WikI=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.1.0 h1:yTUvW7Vhb89inJ+8irsUqiWjh8iT6sQPZiQzI6ReGkA=
+github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
+github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
+github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=
+github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
+github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
+github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
+github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
+github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
+github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
+github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=
+github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
+github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
+github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
+github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
+github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
+github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
+github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
+github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
+github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
+github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/helm/monocular v1.9.0 h1:jmCzg4mwHLLyL75/5Ekj3aqJs0Hr63fX3+n/hInwZ3U=
+github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40 h1:GT4RsKmHh1uZyhmTkWJTDALRjSHYQp6FRKrotf0zhAs=
+github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40/go.mod h1:NtmN9h8vrTveVQRLHcX2HQ5wIPBDCsZ351TGbZWgg38=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/huandu/xstrings v1.2.1 h1:v6IdmkCnDhJG/S0ivr58PeIfg+tyhqQYy4YsCsQ0Pdc=
+github.com/huandu/xstrings v1.2.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
+github.com/imdario/mergo v0.3.8 h1:CGgOkSJeqMRmt0D9XLWExdT4m4F1vd3FV3VPt+0VxkQ=
+github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a h1:zPPuIq2jAWWPTrGt70eK/BSch+gFAGrNzecsoENgu2o=
+github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
+github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kreinecke/stratos/src/jetstream v0.0.0-20191128152648-9e13f7b0c751 h1:fIiB2iGpWMaOlf5U/GGmV2Rr4eAxxRUCb1KwF1P8J5A=
+github.com/kreinecke/stratos/src/jetstream/plugins/monocular v0.0.0-20191128152648-9e13f7b0c751 h1:mwcdJU43TApz7VikIDWpWoz7n/JUavQC7Is9W+qrLVc=
+github.com/kreinecke/stratos/src/jetstream/plugins/monocular/chart-repo v0.0.0-20191128152648-9e13f7b0c751 h1:BgaO5eLQ+3jhgT7p0+UU/99aDjSq3+OoKGb4QIi5t9k=
+github.com/kreinecke/stratos/src/jetstream/plugins/monocular/chartsvc v0.0.0-20191128152648-9e13f7b0c751 h1:2qnDeOJxdjLXTttbIMtod9XgUvE8RbALBmH07VvSa0E=
+github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a h1:VqeX/fehAB6FtBox0TVYcjOMXGE56INQIfbXegditX4=
+github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
+github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8bbnE7CX5OEgg=
+github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s=
+github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0=
+github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
+github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
+github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg=
+github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
+github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
+github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
+github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
+github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
+github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.2.1 h1:JnMpQc6ppsNgw9QPAGF6Dod479itz7lvlsMzzNayLOI=
+github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.7.0 h1:L+1lyG48J1zAQXA3RBX/nG/B3gjlHq0zTt2tlbJLyCY=
+github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8=
+github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
+github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
+github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
+github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
+github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
+github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
+github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
+github.com/unrolled/render v1.0.1 h1:VDDnQQVfBMsOsp3VaCJszSO0nkBIVEYoPWeRThk9spY=
+github.com/unrolled/render v1.0.1/go.mod h1:gN9T0NhL4Bfbwu8ann7Ry/TGHYfosul+J0obPf6NBdM=
+github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
+github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
+github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
+github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasttemplate v1.0.1 h1:tY9CJiPnMXf1ERmG2EyK7gNUd+c6RKGD0IfU8WdUSz8=
+github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
+github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk=
+github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
+github.com/xdg/stringprep v1.0.0 h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0=
+github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
+github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+go.mongodb.org/mongo-driver v1.1.3 h1:++7u8r9adKhGR+I79NfEtYrk2ktjenErXM99PSufIoI=
+go.mongodb.org/mongo-driver v1.1.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g=
+golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U=
+golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 h1:dfGZHvZk057jK2MCeWus/TowKpJ8y4AmooUzdBSR9GU=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 h1:rjwSpXsdiK0dV8/Naq3kAw9ymfAeJIyd0upUIElB+lI=
+golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191010194322-b09406accb47 h1:/XfQ9z7ib8eEJX2hdgFTZJ/ntt0swNk5oYBziWeTCvY=
+golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1 h1:wdKvqQk7IttEw92GoRyKG2IDrUIpgpj6H6m81yfeMW0=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+k8s.io/apimachinery v0.0.0-20191203211716-adc6f4cd9e7d h1:q+OZmYewHJeMCzwpHkXlNTtk5bvaUMPCikKvf77RBlo=
+k8s.io/apimachinery v0.0.0-20191203211716-adc6f4cd9e7d/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg=
+k8s.io/client-go v11.0.0+incompatible h1:LBbX2+lOwY9flffWlJM7f1Ct8V2SRNiMRDFeiwnJo9o=
+k8s.io/client-go v11.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
+k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/helm v2.16.1+incompatible h1:L+k810plJlaGWEw1EszeT4deK8XVaKxac1oGcuB+WDc=
+k8s.io/helm v2.16.1+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
+k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
+k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
+sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
+sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
diff --git a/src/jetstream/plugins/monocular/chartsvc/datastore.go b/src/jetstream/plugins/monocular/chartsvc/datastore.go
deleted file mode 100644
index 63cb377fe5..0000000000
--- a/src/jetstream/plugins/monocular/chartsvc/datastore.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package chartsvc
-
-import (
-	//"bytes"
-	"github.com/helm/monocular/chartsvc/models"
-)
-
-type ChartSvcDatastore interface {
-	ListRepositories() ([]string, error)
-	ListCharts() ([]*models.Chart, error)
-	GetChart(chartID string) (models.Chart, error)
-	GetChartVersion(chartID, version string) (models.Chart, error)
-	GetChartIcon(chartID string) ([]byte, error)
-	GetChartVersionReadme(chartID, version string) ([]byte, error)
-	GetChartVersionValuesYaml(chartID, version string) ([]byte, error)
-}
diff --git a/src/jetstream/plugins/monocular/chartsvc/main.go b/src/jetstream/plugins/monocular/chartsvc/main.go
index 8f9a1e491c..57ea6ae792 100644
--- a/src/jetstream/plugins/monocular/chartsvc/main.go
+++ b/src/jetstream/plugins/monocular/chartsvc/main.go
@@ -87,7 +87,7 @@ func main() {
 		log.SetLevel(log.DebugLevel)
 	}
 
-	initFDBDocLayerConnection(fdbURL, fDB, debug)
+	InitFDBDocLayerConnection(fdbURL, fDB, debug)
 
 	n := setupRoutes()
 
@@ -100,7 +100,7 @@ func main() {
 	http.ListenAndServe(addr, n)
 }
 
-func initFDBDocLayerConnection(fdbURL *string, fDB *string, debug *bool) {
+func InitFDBDocLayerConnection(fdbURL *string, fDB *string, debug *bool) {
 
 	log.Debugf("Attempting to connect to FDB: %v, %v, debug: %v", *fdbURL, *fDB, *debug)
 
diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index f1c31bfa95..6fa2973154 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -6,11 +6,9 @@ import (
 	"strings"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
-	"github.com/kubeapps/common/datastore"
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/helm/monocular/chartrepo"
 	"github.com/helm/monocular/chartsvc"
 )
 
@@ -23,10 +21,8 @@ const prefix = "/pp/v1/chartsvc/"
 // Monocular is a plugin for Monocular
 type Monocular struct {
 	portalProxy    interfaces.PortalProxy
-	dbSession      datastore.Session
 	chartSvcRoutes http.Handler
-	Store          chartrepo.ChartRepoDatastore
-	QueryStore     chartsvc.ChartSvcDatastore
+	RepoQueryStore chartsvc.ChartSvcDatastore
 }
 
 // Init creates a new Monocular
@@ -34,12 +30,8 @@ func Init(portalProxy interfaces.PortalProxy) (interfaces.StratosPlugin, error)
 	return &Monocular{portalProxy: portalProxy}, nil
 }
 
-func (m *Monocular) GetDBSession() datastore.Session {
-	return m.dbSession
-}
-
 func (m *Monocular) GetChartStore() chartsvc.ChartSvcDatastore {
-	return m.QueryStore
+	return m.RepoQueryStore
 }
 
 // Init performs plugin initialization
@@ -48,7 +40,10 @@ func (m *Monocular) Init() error {
 	if !m.portalProxy.GetConfig().EnableTechPreview {
 		return errors.New("Feature is in Tech Preview")
 	}
-	m.ConfigureSQL()
+	fdbURL := "fdb service name"
+	fDB := "monocular-plugin"
+	debug := false
+	m.ConfigureChartSVC(&fdbURL, &fDB, &debug)
 	m.chartSvcRoutes = chartsvc.GetRoutes()
 	m.InitSync()
 	m.syncOnStartup()
@@ -58,7 +53,7 @@ func (m *Monocular) Init() error {
 func (m *Monocular) syncOnStartup() {
 
 	// Get the repositories that we currently have
-	repos, err := m.QueryStore.ListRepositories()
+	repos, err := m.RepoQueryStore.ListRepositories()
 	if err != nil {
 		log.Errorf("Chart Repostiory Startup: Unable to sync repositories: %v+", err)
 		return
@@ -109,54 +104,56 @@ func arrayContainsString(a []string, x string) bool {
 }
 
 // func (m *Monocular) ConfigureMonocular() error {
-// 	log.Info("Connecting to MongoDB...")
-
-// 	var host = "127.0.0.1"
-// 	var db = "monocular"
-// 	var user = "mongoadmin"
-// 	var password = "secret"
-
-// 	session, err := chartsvc.SetMongoConfig(&host, &db, &user, password)
-// 	if err != nil {
-// 		log.Warn("Could not connect to MongoDB")
-// 		return err
-// 	}
-
-// 	store, err := chartsvc.NewMongoDBChartSvcDatastore(session)
-// 	if err != nil {
-// 		return err
-// 	}
-// 	chartsvc.SetStore(store)
-// 	m.QueryStore = store
-
-// 	syncStore, err := chartrepo.NewMongoDBChartRepoDatastore(session)
-// 	if err != nil {
-// 		return err
-// 	}
-// 	m.Store = syncStore
-// 	log.Info("Connected to MongoDB")
-
-// 	return nil
+//     log.Info("Connecting to MongoDB...")
+
+//     var host = "127.0.0.1"
+//     var db = "monocular"
+//     var user = "mongoadmin"
+//     var password = "secret"
+
+//     session, err := chartsvc.SetMongoConfig(&host, &db, &user, password)
+//     if err != nil {
+//             log.Warn("Could not connect to MongoDB")
+//             return err
+//     }
+
+//     store, err := chartsvc.NewMongoDBChartSvcDatastore(session)
+//     if err != nil {
+//             return err
+//     }
+//     chartsvc.SetStore(store)
+//     m.QueryStore = store
+
+//     syncStore, err := chartrepo.NewMongoDBChartRepoDatastore(session)
+//     if err != nil {
+//             return err
+//     }
+//     m.Store = syncStore
+//     log.Info("Connected to MongoDB")
+
+//     return nil
 // }
 
 func (m *Monocular) ConfigureSQL() error {
 
-	log.Info("Connecting to SQL Helm Chart store")
+	log.Info("Connecting to SQL Repo store")
 
 	InitRepositoryProvider(m.portalProxy.GetConfig().DatabaseProviderName)
 
-	store, err := NewSQLDBCMonocularDatastore(m.portalProxy.GetDatabaseConnection())
+	sqldbStore, err := NewSQLDBCMonocularDatastore(m.portalProxy.GetDatabaseConnection())
 	if err != nil {
 		return err
 	}
 
-	m.Store = store
-	m.QueryStore = store
+	m.RepoQueryStore = sqldbStore
 
-	chartsvc.SetStore(store)
 	return nil
 }
 
+func (m *Monocular) ConfigureChartSVC(fdbURL *string, fDB *string, debug *bool) {
+	chartsvc.InitFDBDocLayerConnection(fdbURL, fDB, debug)
+}
+
 func (m *Monocular) OnEndpointNotification(action interfaces.EndpointAction, endpoint *interfaces.CNSIRecord) {
 	if endpoint.CNSIType == helmEndpointType {
 		m.Sync(action, endpoint)
diff --git a/src/jetstream/plugins/monocular/repodatastore.go b/src/jetstream/plugins/monocular/repodatastore.go
new file mode 100644
index 0000000000..d7c20db16b
--- /dev/null
+++ b/src/jetstream/plugins/monocular/repodatastore.go
@@ -0,0 +1,7 @@
+package chartsvc
+
+//"bytes"
+
+type ChartSvcDatastore interface {
+	ListRepositories() ([]string, error)
+}
diff --git a/src/jetstream/plugins/monocular/sql_datastore.go b/src/jetstream/plugins/monocular/sql_datastore.go
index 02f8e9e74f..4d0d90e998 100644
--- a/src/jetstream/plugins/monocular/sql_datastore.go
+++ b/src/jetstream/plugins/monocular/sql_datastore.go
@@ -1,52 +1,12 @@
 package monocular
 
 import (
-	"bytes"
 	"database/sql"
-	"encoding/json"
 	"fmt"
-	"strings"
-
-	"github.com/helm/monocular/chartrepo"
-
-	uuid "github.com/satori/go.uuid"
-	log "github.com/sirupsen/logrus"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore"
-	"github.com/helm/monocular/chartsvc/models"
 )
 
-var insertChart = `INSERT INTO charts (id, name, repo_name, update_batch, content)
-						VALUES ($1, $2, $3, $4, $5)`
-
-var deleteChart = `DELETE FROM charts WHERE id = $1`
-
-var countCharts = `SELECT COUNT(*)
-											FROM charts
-											WHERE id = $1`
-
-var updateChart = `UPDATE charts
-										SET name = $1, repo_name = $2, update_batch = $3, content = $4
-										WHERE id = $5`
-
-var insertChartFile = `INSERT INTO chart_files (id, filename, chart_id, name, repo_name, digest, content) VALUES ($1, $2, $3, $4, $5, $6, $7)`
-var updateChartFile = `UPDATE chart_files SET chart_id = $1, name = $2, repo_name = $3, digest = $4, content = $5 WHERE id = $6 AND filename = $7`
-var countChartFile = `SELECT COUNT(*) FROM chart_files WHERE id = $1 AND filename = $2`
-
-var deleteChartFiles = `DELETE FROM chart_files WHERE (name, repo_name) IN (SELECT name, repo_name FROM charts WHERE repo_name = $1 AND update_batch != $2)`
-var deleteCharts = `DELETE FROM charts WHERE repo_name = $1 AND update_batch != $2`
-
-var deleteRepoChartFiles = `DELETE FROM chart_files WHERE repo_name = $1`
-var deleteRepoCharts = `DELETE FROM charts WHERE repo_name = $1`
-
-var getAllCharts = `SELECT c.id, c.content, f.filename as has_icon from charts c left join chart_files f on c.id = f.chart_id AND f.filename="icon"`
-
-var getChart = `SELECT c.content, f.filename as has_icon from charts c LEFT JOIN chart_files f on c.id = f.chart_id AND f.filename="icon" WHERE c.id = $1`
-
-var getChartFile = `SELECT content from chart_files WHERE chart_id = $1 AND filename=$2`
-
-var getChartFileByID = `SELECT content from chart_files WHERE id = $1 AND filename=$2`
-
 var getRepositories = `SELECT DISTINCT repo_name from charts`
 
 type SQLDBCMonocularDatastore struct {
@@ -62,277 +22,9 @@ func NewSQLDBCMonocularDatastore(db *sql.DB) (*SQLDBCMonocularDatastore, error)
 // InitRepositoryProvider - One time init for the given DB Provider
 func InitRepositoryProvider(databaseProvider string) {
 	// Modify the database statements if needed, for the given database type
-	insertChart = datastore.ModifySQLStatement(insertChart, databaseProvider)
-	deleteChart = datastore.ModifySQLStatement(deleteChart, databaseProvider)
-	countCharts = datastore.ModifySQLStatement(countCharts, databaseProvider)
-	updateChart = datastore.ModifySQLStatement(updateChart, databaseProvider)
-	insertChartFile = datastore.ModifySQLStatement(insertChartFile, databaseProvider)
-	updateChartFile = datastore.ModifySQLStatement(updateChartFile, databaseProvider)
-	countChartFile = datastore.ModifySQLStatement(countChartFile, databaseProvider)
-	deleteCharts = datastore.ModifySQLStatement(deleteCharts, databaseProvider)
-	deleteChartFiles = datastore.ModifySQLStatement(deleteChartFiles, databaseProvider)
-	deleteRepoChartFiles = datastore.ModifySQLStatement(deleteRepoChartFiles, databaseProvider)
-	deleteRepoCharts = datastore.ModifySQLStatement(deleteRepoCharts, databaseProvider)
-
-	getAllCharts = datastore.ModifySQLStatement(getAllCharts, databaseProvider)
-	getChart = datastore.ModifySQLStatement(getChart, databaseProvider)
-	getChartFile = datastore.ModifySQLStatement(getChartFile, databaseProvider)
-	getChartFileByID = datastore.ModifySQLStatement(getChartFileByID, databaseProvider)
 	getRepositories = datastore.ModifySQLStatement(getRepositories, databaseProvider)
 }
 
-// DeleteRepo will delete all charts and chart fils for a give repository
-func (s *SQLDBCMonocularDatastore) DeleteRepo(repoName string) error {
-
-	log.Debugf("Deleting helm repo: %s", repoName)
-
-	// Delete all charts for a repo
-	if _, err := s.db.Exec(deleteRepoChartFiles, repoName); err != nil {
-		log.Error("Could not delete files")
-		return fmt.Errorf("Unable to delete chart files: %v", err)
-	}
-
-	if _, err := s.db.Exec(deleteRepoCharts, repoName); err != nil {
-		log.Error("Could not delete charts")
-		return fmt.Errorf("Unable to delete chart: %v", err)
-	}
-
-	return nil
-}
-
-func (s *SQLDBCMonocularDatastore) ImportCharts(charts []chartrepo.Chart) error {
-
-	if len(charts) == 0 {
-		return nil
-	}
-
-	// Use a new batch ID for all charts, so we can then delete all removed charts
-	updateBatchID := uuid.NewV4().String()
-
-	// Iterate over all of the charts, one by one
-	for _, c := range charts {
-
-		// Check if existing chart exists
-		var count int
-		err := s.db.QueryRow(countCharts, c.ID).Scan(&count)
-		if err != nil {
-			log.Errorf("Unknown error attempting to find chart: %v", err)
-		}
-
-		// Serialize Chart to JSON
-		content, err := json.Marshal(c)
-		if err != nil {
-			return fmt.Errorf("Could not serialize Chart to JSON: %v", err)
-		}
-
-		switch count {
-		case 0:
-			log.Debug("Inserting new chart")
-			if _, err := s.db.Exec(insertChart, c.ID, c.Name, c.Repo.Name, updateBatchID, content); err != nil {
-				msg := "Unable to insert new Chart: %v"
-				log.Debugf(msg, err)
-				return fmt.Errorf(msg, err)
-			}
-			log.Debug("Chart inserted")
-		default:
-			log.Debug("Performing UPDATE of existing chart")
-			if _, updateErr := s.db.Exec(updateChart, c.Name, c.Repo.Name, updateBatchID, content, c.ID); updateErr != nil {
-				msg := "Unable to UPDATE UAA token: %v"
-				log.Debugf(msg, updateErr)
-				return fmt.Errorf(msg, updateErr)
-			}
-		}
-	}
-
-	repoName := charts[0].Repo.Name
-
-	// Delete all chart files for charts no longer needed
-	if _, err := s.db.Exec(deleteChartFiles, repoName, updateBatchID); err != nil {
-		return fmt.Errorf("Unable to delete chart files: %v", err)
-	}
-
-	if _, err := s.db.Exec(deleteChart, repoName); err != nil {
-		return fmt.Errorf("Unable to delete charts: %v", err)
-	}
-
-	return nil
-}
-
-func (s *SQLDBCMonocularDatastore) StoreChartIcon(c chartrepo.Chart, b bytes.Buffer) error {
-	// Store as a file
-	return s.addFile(c.ID, "icon", c.Name, c.Repo.Name, "icon", b.Bytes())
-}
-
-func (s *SQLDBCMonocularDatastore) StoreChartFiles(fileID string, files chartrepo.ChartFiles) error {
-
-	ids := strings.Split(fileID, "/")
-	chartIDs := strings.Split(ids[1], "-")
-
-	if len(files.Readme) > 0 {
-		if err := s.addFile(fileID, "readme", chartIDs[0], files.Repo.Name, files.Digest, []byte(files.Readme)); err != nil {
-			return err
-		}
-	}
-
-	if len(files.Values) > 0 {
-		if err := s.addFile(fileID, "values", chartIDs[0], files.Repo.Name, files.Digest, []byte(files.Values)); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (s *SQLDBCMonocularDatastore) addFile(id, filename, name, repo, digest string, content []byte) error {
-
-	chartID := fmt.Sprintf("%s/%s", repo, name)
-
-	// Check if file already exists
-	var count int
-	err := s.db.QueryRow(countChartFile, id, filename).Scan(&count)
-	if err != nil {
-		log.Errorf("Unknown error attempting to find chart file: %v", err)
-	}
-
-	switch count {
-	case 0:
-		log.Debug("Inserting new chart file")
-		if _, err := s.db.Exec(insertChartFile, id, filename, chartID, name, repo, digest, content); err != nil {
-			msg := "Unable to insert new chart file: %v"
-			log.Debugf(msg, err)
-			return fmt.Errorf(msg, err)
-		}
-		log.Debug("Chart inserted")
-	default:
-		log.Debug("Performing update of existing chart file")
-		if _, updateErr := s.db.Exec(updateChartFile, chartID, name, repo, digest, content, id, filename); updateErr != nil {
-			msg := "Unable to update existing chart file: %v"
-			log.Debugf(msg, updateErr)
-			return fmt.Errorf(msg, updateErr)
-		}
-	}
-	return nil
-}
-
-// ListCharts gets all charts
-func (s *SQLDBCMonocularDatastore) ListCharts() ([]*models.Chart, error) {
-
-	rows, err := s.db.Query(getAllCharts)
-	if err != nil {
-		return nil, fmt.Errorf("Unable to retrieve Helm charts: %v", err)
-	}
-	defer rows.Close()
-
-	var charts []*models.Chart
-	charts = make([]*models.Chart, 0)
-
-	for rows.Next() {
-		var (
-			id      string
-			content []byte
-			hasIcon sql.NullString
-		)
-
-		err := rows.Scan(&id, &content, &hasIcon)
-		if err != nil {
-			return nil, fmt.Errorf("Unable to scan chart records: %v", err)
-		}
-
-		// Deserialize JSON
-		chart := &models.Chart{}
-		if err := json.Unmarshal(content, chart); err == nil {
-			charts = append(charts, chart)
-			chart.ID = id
-			if hasIcon.Valid {
-				chart.RawIcon = []byte(hasIcon.String)
-			}
-		}
-	}
-
-	if err = rows.Err(); err != nil {
-		return nil, fmt.Errorf("Unable to get chart records: %v", err)
-	}
-
-	return charts, nil
-}
-
-func (s *SQLDBCMonocularDatastore) GetChart(chartID string) (models.Chart, error) {
-
-	var (
-		content []byte
-		hasIcon sql.NullString
-	)
-
-	chart := models.Chart{}
-
-	err := s.db.QueryRow(getChart, chartID).Scan(&content, &hasIcon)
-	if err != nil {
-		return chart, fmt.Errorf("Unable to scan chart record: %v", err)
-	}
-
-	// Deserialize JSON
-	if err := json.Unmarshal(content, &chart); err == nil {
-		chart.ID = chartID
-		if hasIcon.Valid {
-			chart.RawIcon = []byte(hasIcon.String)
-		}
-	} else {
-		return chart, fmt.Errorf("Unable to deserialize chart: %v+", err)
-	}
-
-	return chart, nil
-
-}
-
-func (s *SQLDBCMonocularDatastore) GetChartVersion(chartID, version string) (models.Chart, error) {
-	chart, err := s.GetChart(chartID)
-	if err != nil {
-		return chart, err
-	}
-
-	// Find the version
-	for _, v := range chart.ChartVersions {
-		if v.Version == version {
-			chart.ChartVersions = make([]models.ChartVersion, 1)
-			chart.ChartVersions[0] = v
-			return chart, err
-		}
-	}
-
-	return chart, fmt.Errorf("Can not find chart version: %s", version)
-}
-
-func (s *SQLDBCMonocularDatastore) GetChartIcon(chartID string) ([]byte, error) {
-	var content []byte
-	err := s.db.QueryRow(getChartFile, chartID, "icon").Scan(&content)
-	if err != nil {
-		return nil, fmt.Errorf("Unable to scan chart file record: %v", err)
-	}
-
-	return content, nil
-}
-
-func (s *SQLDBCMonocularDatastore) GetChartVersionReadme(chartID, version string) ([]byte, error) {
-	var content []byte
-	fileID := fmt.Sprintf("%s-%s", chartID, version)
-	err := s.db.QueryRow(getChartFileByID, fileID, "readme").Scan(&content)
-	if err != nil {
-		return nil, fmt.Errorf("Unable to scan chart file record: %v", err)
-	}
-
-	return content, nil
-}
-
-func (s *SQLDBCMonocularDatastore) GetChartVersionValuesYaml(chartID, version string) ([]byte, error) {
-	var content []byte
-	fileID := fmt.Sprintf("%s-%s", chartID, version)
-	err := s.db.QueryRow(getChartFileByID, fileID, "values").Scan(&content)
-	if err != nil {
-		return nil, fmt.Errorf("Unable to scan chart file record: %v", err)
-	}
-
-	return content, nil
-}
-
 // ListRepositories gets all repository names
 func (s *SQLDBCMonocularDatastore) ListRepositories() ([]string, error) {
 	rows, err := s.db.Query(getRepositories)
diff --git a/src/jetstream/plugins/monocular/sql_datastore.go_bak b/src/jetstream/plugins/monocular/sql_datastore.go_bak
new file mode 100644
index 0000000000..02f8e9e74f
--- /dev/null
+++ b/src/jetstream/plugins/monocular/sql_datastore.go_bak
@@ -0,0 +1,358 @@
+package monocular
+
+import (
+	"bytes"
+	"database/sql"
+	"encoding/json"
+	"fmt"
+	"strings"
+
+	"github.com/helm/monocular/chartrepo"
+
+	uuid "github.com/satori/go.uuid"
+	log "github.com/sirupsen/logrus"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore"
+	"github.com/helm/monocular/chartsvc/models"
+)
+
+var insertChart = `INSERT INTO charts (id, name, repo_name, update_batch, content)
+						VALUES ($1, $2, $3, $4, $5)`
+
+var deleteChart = `DELETE FROM charts WHERE id = $1`
+
+var countCharts = `SELECT COUNT(*)
+											FROM charts
+											WHERE id = $1`
+
+var updateChart = `UPDATE charts
+										SET name = $1, repo_name = $2, update_batch = $3, content = $4
+										WHERE id = $5`
+
+var insertChartFile = `INSERT INTO chart_files (id, filename, chart_id, name, repo_name, digest, content) VALUES ($1, $2, $3, $4, $5, $6, $7)`
+var updateChartFile = `UPDATE chart_files SET chart_id = $1, name = $2, repo_name = $3, digest = $4, content = $5 WHERE id = $6 AND filename = $7`
+var countChartFile = `SELECT COUNT(*) FROM chart_files WHERE id = $1 AND filename = $2`
+
+var deleteChartFiles = `DELETE FROM chart_files WHERE (name, repo_name) IN (SELECT name, repo_name FROM charts WHERE repo_name = $1 AND update_batch != $2)`
+var deleteCharts = `DELETE FROM charts WHERE repo_name = $1 AND update_batch != $2`
+
+var deleteRepoChartFiles = `DELETE FROM chart_files WHERE repo_name = $1`
+var deleteRepoCharts = `DELETE FROM charts WHERE repo_name = $1`
+
+var getAllCharts = `SELECT c.id, c.content, f.filename as has_icon from charts c left join chart_files f on c.id = f.chart_id AND f.filename="icon"`
+
+var getChart = `SELECT c.content, f.filename as has_icon from charts c LEFT JOIN chart_files f on c.id = f.chart_id AND f.filename="icon" WHERE c.id = $1`
+
+var getChartFile = `SELECT content from chart_files WHERE chart_id = $1 AND filename=$2`
+
+var getChartFileByID = `SELECT content from chart_files WHERE id = $1 AND filename=$2`
+
+var getRepositories = `SELECT DISTINCT repo_name from charts`
+
+type SQLDBCMonocularDatastore struct {
+	//dbSession datastore.Session
+	db *sql.DB
+}
+
+// NewSQLDBCMonocularDatastore creates a new SQL data store
+func NewSQLDBCMonocularDatastore(db *sql.DB) (*SQLDBCMonocularDatastore, error) {
+	return &SQLDBCMonocularDatastore{db: db}, nil
+}
+
+// InitRepositoryProvider - One time init for the given DB Provider
+func InitRepositoryProvider(databaseProvider string) {
+	// Modify the database statements if needed, for the given database type
+	insertChart = datastore.ModifySQLStatement(insertChart, databaseProvider)
+	deleteChart = datastore.ModifySQLStatement(deleteChart, databaseProvider)
+	countCharts = datastore.ModifySQLStatement(countCharts, databaseProvider)
+	updateChart = datastore.ModifySQLStatement(updateChart, databaseProvider)
+	insertChartFile = datastore.ModifySQLStatement(insertChartFile, databaseProvider)
+	updateChartFile = datastore.ModifySQLStatement(updateChartFile, databaseProvider)
+	countChartFile = datastore.ModifySQLStatement(countChartFile, databaseProvider)
+	deleteCharts = datastore.ModifySQLStatement(deleteCharts, databaseProvider)
+	deleteChartFiles = datastore.ModifySQLStatement(deleteChartFiles, databaseProvider)
+	deleteRepoChartFiles = datastore.ModifySQLStatement(deleteRepoChartFiles, databaseProvider)
+	deleteRepoCharts = datastore.ModifySQLStatement(deleteRepoCharts, databaseProvider)
+
+	getAllCharts = datastore.ModifySQLStatement(getAllCharts, databaseProvider)
+	getChart = datastore.ModifySQLStatement(getChart, databaseProvider)
+	getChartFile = datastore.ModifySQLStatement(getChartFile, databaseProvider)
+	getChartFileByID = datastore.ModifySQLStatement(getChartFileByID, databaseProvider)
+	getRepositories = datastore.ModifySQLStatement(getRepositories, databaseProvider)
+}
+
+// DeleteRepo will delete all charts and chart fils for a give repository
+func (s *SQLDBCMonocularDatastore) DeleteRepo(repoName string) error {
+
+	log.Debugf("Deleting helm repo: %s", repoName)
+
+	// Delete all charts for a repo
+	if _, err := s.db.Exec(deleteRepoChartFiles, repoName); err != nil {
+		log.Error("Could not delete files")
+		return fmt.Errorf("Unable to delete chart files: %v", err)
+	}
+
+	if _, err := s.db.Exec(deleteRepoCharts, repoName); err != nil {
+		log.Error("Could not delete charts")
+		return fmt.Errorf("Unable to delete chart: %v", err)
+	}
+
+	return nil
+}
+
+func (s *SQLDBCMonocularDatastore) ImportCharts(charts []chartrepo.Chart) error {
+
+	if len(charts) == 0 {
+		return nil
+	}
+
+	// Use a new batch ID for all charts, so we can then delete all removed charts
+	updateBatchID := uuid.NewV4().String()
+
+	// Iterate over all of the charts, one by one
+	for _, c := range charts {
+
+		// Check if existing chart exists
+		var count int
+		err := s.db.QueryRow(countCharts, c.ID).Scan(&count)
+		if err != nil {
+			log.Errorf("Unknown error attempting to find chart: %v", err)
+		}
+
+		// Serialize Chart to JSON
+		content, err := json.Marshal(c)
+		if err != nil {
+			return fmt.Errorf("Could not serialize Chart to JSON: %v", err)
+		}
+
+		switch count {
+		case 0:
+			log.Debug("Inserting new chart")
+			if _, err := s.db.Exec(insertChart, c.ID, c.Name, c.Repo.Name, updateBatchID, content); err != nil {
+				msg := "Unable to insert new Chart: %v"
+				log.Debugf(msg, err)
+				return fmt.Errorf(msg, err)
+			}
+			log.Debug("Chart inserted")
+		default:
+			log.Debug("Performing UPDATE of existing chart")
+			if _, updateErr := s.db.Exec(updateChart, c.Name, c.Repo.Name, updateBatchID, content, c.ID); updateErr != nil {
+				msg := "Unable to UPDATE UAA token: %v"
+				log.Debugf(msg, updateErr)
+				return fmt.Errorf(msg, updateErr)
+			}
+		}
+	}
+
+	repoName := charts[0].Repo.Name
+
+	// Delete all chart files for charts no longer needed
+	if _, err := s.db.Exec(deleteChartFiles, repoName, updateBatchID); err != nil {
+		return fmt.Errorf("Unable to delete chart files: %v", err)
+	}
+
+	if _, err := s.db.Exec(deleteChart, repoName); err != nil {
+		return fmt.Errorf("Unable to delete charts: %v", err)
+	}
+
+	return nil
+}
+
+func (s *SQLDBCMonocularDatastore) StoreChartIcon(c chartrepo.Chart, b bytes.Buffer) error {
+	// Store as a file
+	return s.addFile(c.ID, "icon", c.Name, c.Repo.Name, "icon", b.Bytes())
+}
+
+func (s *SQLDBCMonocularDatastore) StoreChartFiles(fileID string, files chartrepo.ChartFiles) error {
+
+	ids := strings.Split(fileID, "/")
+	chartIDs := strings.Split(ids[1], "-")
+
+	if len(files.Readme) > 0 {
+		if err := s.addFile(fileID, "readme", chartIDs[0], files.Repo.Name, files.Digest, []byte(files.Readme)); err != nil {
+			return err
+		}
+	}
+
+	if len(files.Values) > 0 {
+		if err := s.addFile(fileID, "values", chartIDs[0], files.Repo.Name, files.Digest, []byte(files.Values)); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (s *SQLDBCMonocularDatastore) addFile(id, filename, name, repo, digest string, content []byte) error {
+
+	chartID := fmt.Sprintf("%s/%s", repo, name)
+
+	// Check if file already exists
+	var count int
+	err := s.db.QueryRow(countChartFile, id, filename).Scan(&count)
+	if err != nil {
+		log.Errorf("Unknown error attempting to find chart file: %v", err)
+	}
+
+	switch count {
+	case 0:
+		log.Debug("Inserting new chart file")
+		if _, err := s.db.Exec(insertChartFile, id, filename, chartID, name, repo, digest, content); err != nil {
+			msg := "Unable to insert new chart file: %v"
+			log.Debugf(msg, err)
+			return fmt.Errorf(msg, err)
+		}
+		log.Debug("Chart inserted")
+	default:
+		log.Debug("Performing update of existing chart file")
+		if _, updateErr := s.db.Exec(updateChartFile, chartID, name, repo, digest, content, id, filename); updateErr != nil {
+			msg := "Unable to update existing chart file: %v"
+			log.Debugf(msg, updateErr)
+			return fmt.Errorf(msg, updateErr)
+		}
+	}
+	return nil
+}
+
+// ListCharts gets all charts
+func (s *SQLDBCMonocularDatastore) ListCharts() ([]*models.Chart, error) {
+
+	rows, err := s.db.Query(getAllCharts)
+	if err != nil {
+		return nil, fmt.Errorf("Unable to retrieve Helm charts: %v", err)
+	}
+	defer rows.Close()
+
+	var charts []*models.Chart
+	charts = make([]*models.Chart, 0)
+
+	for rows.Next() {
+		var (
+			id      string
+			content []byte
+			hasIcon sql.NullString
+		)
+
+		err := rows.Scan(&id, &content, &hasIcon)
+		if err != nil {
+			return nil, fmt.Errorf("Unable to scan chart records: %v", err)
+		}
+
+		// Deserialize JSON
+		chart := &models.Chart{}
+		if err := json.Unmarshal(content, chart); err == nil {
+			charts = append(charts, chart)
+			chart.ID = id
+			if hasIcon.Valid {
+				chart.RawIcon = []byte(hasIcon.String)
+			}
+		}
+	}
+
+	if err = rows.Err(); err != nil {
+		return nil, fmt.Errorf("Unable to get chart records: %v", err)
+	}
+
+	return charts, nil
+}
+
+func (s *SQLDBCMonocularDatastore) GetChart(chartID string) (models.Chart, error) {
+
+	var (
+		content []byte
+		hasIcon sql.NullString
+	)
+
+	chart := models.Chart{}
+
+	err := s.db.QueryRow(getChart, chartID).Scan(&content, &hasIcon)
+	if err != nil {
+		return chart, fmt.Errorf("Unable to scan chart record: %v", err)
+	}
+
+	// Deserialize JSON
+	if err := json.Unmarshal(content, &chart); err == nil {
+		chart.ID = chartID
+		if hasIcon.Valid {
+			chart.RawIcon = []byte(hasIcon.String)
+		}
+	} else {
+		return chart, fmt.Errorf("Unable to deserialize chart: %v+", err)
+	}
+
+	return chart, nil
+
+}
+
+func (s *SQLDBCMonocularDatastore) GetChartVersion(chartID, version string) (models.Chart, error) {
+	chart, err := s.GetChart(chartID)
+	if err != nil {
+		return chart, err
+	}
+
+	// Find the version
+	for _, v := range chart.ChartVersions {
+		if v.Version == version {
+			chart.ChartVersions = make([]models.ChartVersion, 1)
+			chart.ChartVersions[0] = v
+			return chart, err
+		}
+	}
+
+	return chart, fmt.Errorf("Can not find chart version: %s", version)
+}
+
+func (s *SQLDBCMonocularDatastore) GetChartIcon(chartID string) ([]byte, error) {
+	var content []byte
+	err := s.db.QueryRow(getChartFile, chartID, "icon").Scan(&content)
+	if err != nil {
+		return nil, fmt.Errorf("Unable to scan chart file record: %v", err)
+	}
+
+	return content, nil
+}
+
+func (s *SQLDBCMonocularDatastore) GetChartVersionReadme(chartID, version string) ([]byte, error) {
+	var content []byte
+	fileID := fmt.Sprintf("%s-%s", chartID, version)
+	err := s.db.QueryRow(getChartFileByID, fileID, "readme").Scan(&content)
+	if err != nil {
+		return nil, fmt.Errorf("Unable to scan chart file record: %v", err)
+	}
+
+	return content, nil
+}
+
+func (s *SQLDBCMonocularDatastore) GetChartVersionValuesYaml(chartID, version string) ([]byte, error) {
+	var content []byte
+	fileID := fmt.Sprintf("%s-%s", chartID, version)
+	err := s.db.QueryRow(getChartFileByID, fileID, "values").Scan(&content)
+	if err != nil {
+		return nil, fmt.Errorf("Unable to scan chart file record: %v", err)
+	}
+
+	return content, nil
+}
+
+// ListRepositories gets all repository names
+func (s *SQLDBCMonocularDatastore) ListRepositories() ([]string, error) {
+	rows, err := s.db.Query(getRepositories)
+	if err != nil {
+		return nil, fmt.Errorf("Unable to retrieve Helm repositories: %v", err)
+	}
+	defer rows.Close()
+
+	var repos []string
+	repos = make([]string, 0)
+
+	for rows.Next() {
+		var name string
+		err := rows.Scan(&name)
+		if err != nil {
+			return nil, fmt.Errorf("Unable to scan repository records: %v", err)
+		}
+
+		repos = append(repos, name)
+	}
+
+	return repos, nil
+}
diff --git a/src/jetstream/plugins/monocular/sync.go b/src/jetstream/plugins/monocular/sync.go
index 9513c243e4..0968106d03 100644
--- a/src/jetstream/plugins/monocular/sync.go
+++ b/src/jetstream/plugins/monocular/sync.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
-	"github.com/helm/monocular/chartrepo"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -18,7 +17,7 @@ type SyncMetadata struct {
 	Busy   bool   `json:"busy"`
 }
 
-// Sync Chanel
+// Sync Channel
 var syncChan = make(chan SyncJob, 100)
 
 // InitSync starts the go routine that will sync repositories in the background
@@ -26,7 +25,7 @@ func (m *Monocular) InitSync() {
 	go m.processSyncRequests()
 }
 
-// Sync shceudles a sync action for the given endpoint
+// Sync schedules a sync action for the given endpoint
 func (m *Monocular) Sync(action interfaces.EndpointAction, endpoint *interfaces.CNSIRecord) {
 
 	job := SyncJob{
@@ -50,7 +49,9 @@ func (m *Monocular) processSyncRequests() {
 				Busy:   true,
 			}
 			m.portalProxy.UpdateEndointMetadata(job.Endpoint.GUID, marshalSyncMetadata(metadata))
-			err := chartrepo.SyncRepo(m.Store, job.Endpoint.Name, job.Endpoint.APIEndpoint.String(), "")
+			//Kate TODO hit the sync container rest endpoint to trigger a sync for given repo
+			//err := chartrepo.SyncRepo(m.Store, job.Endpoint.Name, job.Endpoint.APIEndpoint.String(), "")
+			var err error
 			metadata.Busy = false
 			if err != nil {
 				log.Warn("Failed to sync repository: %v+", err)
@@ -63,7 +64,8 @@ func (m *Monocular) processSyncRequests() {
 			log.Infof("Sync completed for repository: %s", job.Endpoint.APIEndpoint.String())
 		} else if job.Action == 1 {
 			log.Infof("Deleting Helm Repository: %s", job.Endpoint.Name)
-			m.Store.DeleteRepo(job.Endpoint.Name)
+			//Kate TODO hit the sync container rest endpoint to trigger a delete for given repo
+			//m.Store.DeleteRepo(job.Endpoint.Name)
 		}
 	}
 

From 6c66be9dada9e15715c270126e4d97369ad262c3 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Wed, 11 Dec 2019 14:44:31 +0000
Subject: [PATCH 209/648] Add start of code for serve command

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 .../monocular/chart-repo/api_endpoint.go      | 42 +++++++----------
 .../monocular/chart-repo/chart_repo.go        |  4 +-
 .../chart-repo/foundationdb/delete.go         |  2 +-
 .../monocular/chart-repo/foundationdb/sync.go |  2 +-
 .../plugins/monocular/chart-repo/serve.go     | 47 +++++++++++++++++++
 5 files changed, 67 insertions(+), 30 deletions(-)
 create mode 100644 src/jetstream/plugins/monocular/chart-repo/serve.go

diff --git a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
index 3d7f6946cb..eddf8955ff 100644
--- a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
+++ b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
@@ -30,8 +30,8 @@ import (
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 
-	fdb "github.com/helm/monocular/chartsvc/foundationdb"
-	fdbDatastore "github.com/helm/monocular/chartsvc/foundationdb/datastore"
+	fdb "github.com/helm/monocular/chart-repo/foundationdb"
+	fdbDatastore "github.com/helm/monocular/chart-repo/foundationdb/datastore"
 )
 
 const pathPrefix = "/v1"
@@ -40,6 +40,12 @@ var client *mongo.Client
 var fDBName string
 var authorizationHeader string
 
+// Params a key-value map of path params
+type Params map[string]string
+
+// WithParams can be used to wrap handlers to take an extra arg for path params
+type WithParams func(http.ResponseWriter, *http.Request, Params)
+
 func setupRoutes() http.Handler {
 	r := mux.NewRouter()
 
@@ -50,15 +56,15 @@ func setupRoutes() http.Handler {
 
 	// Routes
 	apiv1 := r.PathPrefix(pathPrefix).Subrouter()
-	apiv1.Methods("PUT").Path("/sync/{repo}").Handler(fdb.WithParams(fdb.OnDemandSync))
-	apiv1.Methods("PUT").Path("/delete/{repo}").Handler(fdb.WithParams(fdb.OnDemandDelete))
+	apiv1.Methods("PUT").Path("/sync/{repo}").Handler(WithParams(OnDemandSync))
+	apiv1.Methods("PUT").Path("/delete/{repo}").Handler(WithParams(OnDemandDelete))
 	
 	n := negroni.Classic()
 	n.UseHandler(r)
 	return n
 }
 
-func OnDemandSync(w http.ResponseWriter, req *http.Request, params Params)
+func OnDemandSync(w http.ResponseWriter, req *http.Request, params Params) {
 	repoURL := req.FormValue("repoURL") 
 	repoName := params["repo"]
 	//TODO kate check and handle errors
@@ -74,31 +80,17 @@ func OnDemandSync(w http.ResponseWriter, req *http.Request, params Params)
 func OnDemandDelete(w http.ResponseWriter, req *http.Request, params Params)
 	repoName := params["repo"]
 	//TODO kate check and handle errors
-	if err = deleteRepo(cient, fDBName, repoName); err != nil {
+	if err = fdb.DeleteRepo(cient, fDBName, repoName); err != nil {
 		log.Fatalf("Can't delete chart repository %s from database: %v", args[0], err)
 	}
 }
 
-func initOnDemandEndpoint() {
-
-	debugVar, isSet := os.LookupEnv("DEBUG")
-	var debug bool
-	if !isSet {
-		debug = strconv.ParseBool(debug)
-	}
-
-	authorizationHeader = os.Getenv("AUTHORIZATION_HEADER")
-
-	//Flags for optional FoundationDB + Document Layer backend
-	fdbURL, isSet = os.LookupEnv("doclayer-url")
-	if !isSet {
-		fdbURL = "mongodb://fdb-service/27016"
-	}
+func initOnDemandEndpoint(fdbURL string, fdbName string , authHeader string, debug bool) {
 
-	fDBName, isSet = os.LookupEnv("doclayer-database")
-	if !isSet {
-		fDB = "charts"
-	}
+	authorizationHeader = authHeader
+	debug = debug
+	fdbURL = fdbURL
+	fdbName = fdbName
 
 	if debug {
 		log.SetLevel(log.DebugLevel)
diff --git a/src/jetstream/plugins/monocular/chart-repo/chart_repo.go b/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
index b8bc64a77b..5629f9a8cb 100644
--- a/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
+++ b/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
@@ -40,10 +40,8 @@ func main() {
 }
 
 func init() {
-
-	initOnDemandEndpoint()
 	
-	cmds := []*cobra.Command{SyncCmd, DeleteCmd}
+	cmds := []*cobra.Command{SyncCmd, DeleteCmd, ServeCmd}
 
 	for _, cmd := range cmds {
 		rootCmd.AddCommand(cmd)
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/delete.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/delete.go
index 0db4219641..1d4dd7f34c 100644
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/delete.go
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/delete.go
@@ -56,7 +56,7 @@ func Delete(cmd *cobra.Command, args []string) {
 
 	log.Debugf("Client created.")
 
-	if err = deleteRepo(client, fDB, args[0]); err != nil {
+	if err = DeleteRepo(client, fDB, args[0]); err != nil {
 		log.Fatalf("Can't delete chart repository %s from database: %v", args[0], err)
 	}
 
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/sync.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/sync.go
index 5f5feab172..f2eeca8c77 100644
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/sync.go
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/sync.go
@@ -59,7 +59,7 @@ func Sync(cmd *cobra.Command, args []string) {
 
 	startTime := time.Now()
 	authorizationHeader := os.Getenv("AUTHORIZATION_HEADER")
-	if err = syncRepo(client, fDB, args[0], args[1], authorizationHeader); err != nil {
+	if err = SyncRepo(client, fDB, args[0], args[1], authorizationHeader); err != nil {
 		log.Fatalf("Can't add chart repository to database: %v", err)
 		return
 	}
diff --git a/src/jetstream/plugins/monocular/chart-repo/serve.go b/src/jetstream/plugins/monocular/chart-repo/serve.go
new file mode 100644
index 0000000000..4ab4df5ca7
--- /dev/null
+++ b/src/jetstream/plugins/monocular/chart-repo/serve.go
@@ -0,0 +1,47 @@
+/*
+Copyright (c) 2018 The Helm Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package chartrepo
+
+import (
+	"github.com/helm/monocular/chartrepo/foundationdb"
+
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+)
+
+//ServeCmd Start an HTTP server to allow on-demand trigger of sync or delete
+var ServeCmd = &cobra.Command{
+	Use:   "serve",
+	Short: "Start an HTTP server for on-demand trigger of sync or delete",
+	Run: func(cmd *cobra.Command, args []string) {
+		fdbURL, err := cmd.Flags().GetString("doclayer-url")
+		if err != nil {
+			log.Fatal(err)
+		}
+		fDB, err := cmd.Flags().GetString("doclayer-database")
+		if err != nil {
+			log.Fatal(err)
+		}
+		debug, err := cmd.Flags().GetBool("debug")
+		if err != nil {
+			log.Fatal(err)
+		}
+		authorizationHeader := os.Getenv("AUTHORIZATION_HEADER")
+
+		initOnDemandEndpoint(fdbURL, fDB, debug, authorizationHeader)
+	},
+}

From 6785c9b5d0468444ef9c9a145ab59751c63d6ebb Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Thu, 12 Dec 2019 14:02:02 +0000
Subject: [PATCH 210/648] Complete addition of serve command code and fix build
 of chartsvc and chart-repo

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 src/jetstream/plugins/monocular/chartsvc/go.sum | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/jetstream/plugins/monocular/chartsvc/go.sum b/src/jetstream/plugins/monocular/chartsvc/go.sum
index 1cae9ef8fe..ec9a3dfac2 100644
--- a/src/jetstream/plugins/monocular/chartsvc/go.sum
+++ b/src/jetstream/plugins/monocular/chartsvc/go.sum
@@ -29,6 +29,7 @@ github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=

From 970297e4afbf02d4e0d6cd811eb7a6cb94f9c4a7 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Fri, 13 Dec 2019 14:25:06 +0000
Subject: [PATCH 211/648] Fix chart-repo container build

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 .../plugins/monocular/chart-repo/Dockerfile   |  8 +--
 .../monocular/chart-repo/api_endpoint.go      | 39 ++++++------
 .../monocular/chart-repo/chart_repo.go        |  4 +-
 .../plugins/monocular/chart-repo/delete.go    |  2 +-
 .../chart-repo/foundationdb/utils_test.go     |  6 +-
 .../plugins/monocular/chart-repo/go.mod       |  7 ++-
 .../plugins/monocular/chart-repo/go.sum       | 60 +++++++++++++++++++
 .../plugins/monocular/chart-repo/serve.go     |  6 +-
 .../plugins/monocular/chart-repo/sync.go      |  2 +-
 9 files changed, 100 insertions(+), 34 deletions(-)

diff --git a/src/jetstream/plugins/monocular/chart-repo/Dockerfile b/src/jetstream/plugins/monocular/chart-repo/Dockerfile
index a4f5fac4ad..8a6770b29d 100644
--- a/src/jetstream/plugins/monocular/chart-repo/Dockerfile
+++ b/src/jetstream/plugins/monocular/chart-repo/Dockerfile
@@ -1,10 +1,10 @@
 FROM golang:1.12 as builder
-COPY . /go/src/github.com/helm/monocular/chart-repo
-WORKDIR /go/src/github.com/helm/monocular/chart-repo
+COPY . /go/src/github.com/helm/monocular
+WORKDIR /go/src/github.com/helm/monocular
 ARG VERSION
 RUN GO111MODULE=on GOPROXY=https://gocenter.io CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-X main.version=$VERSION" .
 FROM scratch
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY --from=builder /go/src/github.com/helm/monocular/chart-repo /chart-repo
+COPY --from=builder /go/src/github.com/helm/monocular/chartrepo /chartrepo
 USER 1001
-CMD ["/chart-repo"]
+CMD ["/chartrepo"]
diff --git a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
index eddf8955ff..6d572c6138 100644
--- a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
+++ b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
@@ -14,29 +14,26 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartrepo
+package main
 
 import (
 	"context"
-	"flag"
 	"net/http"
 	"os"
+	"time"
 
 	"github.com/gorilla/mux"
 	"github.com/heptiolabs/healthcheck"
-	mongoDatastore "github.com/kubeapps/common/datastore"
 	log "github.com/sirupsen/logrus"
 	"github.com/urfave/negroni"
-	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 
-	fdb "github.com/helm/monocular/chart-repo/foundationdb"
-	fdbDatastore "github.com/helm/monocular/chart-repo/foundationdb/datastore"
+	fdb "github.com/helm/monocular/chartrepo/foundationdb"
 )
 
 const pathPrefix = "/v1"
 
-var client *mongo.Client
+var fdbClient fdb.Client
 var fDBName string
 var authorizationHeader string
 
@@ -46,6 +43,11 @@ type Params map[string]string
 // WithParams can be used to wrap handlers to take an extra arg for path params
 type WithParams func(http.ResponseWriter, *http.Request, Params)
 
+func (h WithParams) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	vars := mux.Vars(req)
+	h(w, req, vars)
+}
+
 func setupRoutes() http.Handler {
 	r := mux.NewRouter()
 
@@ -58,34 +60,34 @@ func setupRoutes() http.Handler {
 	apiv1 := r.PathPrefix(pathPrefix).Subrouter()
 	apiv1.Methods("PUT").Path("/sync/{repo}").Handler(WithParams(OnDemandSync))
 	apiv1.Methods("PUT").Path("/delete/{repo}").Handler(WithParams(OnDemandDelete))
-	
+
 	n := negroni.Classic()
 	n.UseHandler(r)
 	return n
 }
 
 func OnDemandSync(w http.ResponseWriter, req *http.Request, params Params) {
-	repoURL := req.FormValue("repoURL") 
+	repoURL := req.FormValue("repoURL")
 	repoName := params["repo"]
 	//TODO kate check and handle errors
 	startTime := time.Now()
-	if err = fdb.SyncRepo(client, fDBName, repoName, repoURL, authorizationHeader); err != nil {
+	if err := fdb.SyncRepo(fdbClient, fDBName, repoName, repoURL, authorizationHeader); err != nil {
 		log.Fatalf("Can't sync chart repository with database: %v", err)
 		return
 	}
 	timeTaken := time.Since(startTime).Seconds()
-	log.Infof("Successfully added the chart repository %s to database in %v seconds", args[0], timeTaken)
+	log.Infof("Successfully added the chart repository %s to database in %v seconds", repoName, timeTaken)
 }
 
-func OnDemandDelete(w http.ResponseWriter, req *http.Request, params Params)
+func OnDemandDelete(w http.ResponseWriter, req *http.Request, params Params) {
 	repoName := params["repo"]
 	//TODO kate check and handle errors
-	if err = fdb.DeleteRepo(cient, fDBName, repoName); err != nil {
-		log.Fatalf("Can't delete chart repository %s from database: %v", args[0], err)
+	if err := fdb.DeleteRepo(fdbClient, fDBName, repoName); err != nil {
+		log.Fatalf("Can't delete chart repository %s from database: %v", repoName, err)
 	}
 }
 
-func initOnDemandEndpoint(fdbURL string, fdbName string , authHeader string, debug bool) {
+func initOnDemandEndpoint(fdbURL string, fdbName string, authHeader string, debug bool) {
 
 	authorizationHeader = authHeader
 	debug = debug
@@ -96,7 +98,7 @@ func initOnDemandEndpoint(fdbURL string, fdbName string , authHeader string, deb
 		log.SetLevel(log.DebugLevel)
 	}
 
-	InitFDBDocLayerConnection(&fdbURL, &fDB, &debug)
+	InitFDBDocLayerConnection(&fdbURL, &fdbName, &debug)
 
 	n := setupRoutes()
 
@@ -116,13 +118,12 @@ func InitFDBDocLayerConnection(fdbURL *string, fDB *string, debug *bool) {
 	clientOptions := options.Client().ApplyURI(*fdbURL).SetMinPoolSize(10).SetMaxPoolSize(100)
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
-	client, err := fdbDatastore.NewDocLayerClient(context.Background(), clientOptions)
+	client, err := fdb.NewDocLayerClient(ctx, clientOptions)
+	fdbClient = client
 	if err != nil {
 		log.Fatalf("Can't create client for FoundationDB document layer: %v", err)
 		return
 	}
 	log.Debugf("FDB Document Layer client created.")
 
-	fdb.InitDBConfig(client, *fDB)
-	fdb.SetPathPrefix(pathPrefix)
 }
diff --git a/src/jetstream/plugins/monocular/chart-repo/chart_repo.go b/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
index 5629f9a8cb..e4b43ab04f 100644
--- a/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
+++ b/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartrepo
+package main
 
 import (
 	"os"
@@ -40,7 +40,7 @@ func main() {
 }
 
 func init() {
-	
+
 	cmds := []*cobra.Command{SyncCmd, DeleteCmd, ServeCmd}
 
 	for _, cmd := range cmds {
diff --git a/src/jetstream/plugins/monocular/chart-repo/delete.go b/src/jetstream/plugins/monocular/chart-repo/delete.go
index b1b3636e3f..17b1e2dc43 100644
--- a/src/jetstream/plugins/monocular/chart-repo/delete.go
+++ b/src/jetstream/plugins/monocular/chart-repo/delete.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartrepo
+package main
 
 import (
 	"github.com/helm/monocular/chartrepo/foundationdb"
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils_test.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils_test.go
index 3cc4f07883..c80671beaf 100644
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils_test.go
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils_test.go
@@ -172,7 +172,7 @@ func Test_syncURLInvalidity(t *testing.T) {
 	dbClient := NewMockClient(&m)
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			err := syncRepo(dbClient, "test", "test", tt.repoURL, "")
+			err := SyncRepo(dbClient, "test", "test", tt.repoURL, "")
 			assert.ExistsErr(t, err, tt.name)
 		})
 	}
@@ -322,7 +322,7 @@ func Test_DeleteRepo(t *testing.T) {
 	}, mock.Anything).Return(&mongo.DeleteResult{}, nil)
 	dbClient := NewMockClient(m)
 
-	err := deleteRepo(dbClient, "test", "test")
+	err := DeleteRepo(dbClient, "test", "test")
 	if err != nil {
 		t.Errorf("failed to delete chart repo test: %v", err)
 	}
@@ -633,7 +633,7 @@ func Test_emptyChartRepo(t *testing.T) {
 	//Expect a call to test the DB readiness
 	m.On("InsertOne", mock.Anything, mock.Anything, mock.Anything).Return(&mongo.InsertOneResult{}, nil)
 	m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
-	err := syncRepo(dbClient, "test", "testRepo", "https://my.examplerepo.com", "")
+	err := SyncRepo(dbClient, "test", "testRepo", "https://my.examplerepo.com", "")
 	assert.ExistsErr(t, err, "Failed Request")
 }
 
diff --git a/src/jetstream/plugins/monocular/chart-repo/go.mod b/src/jetstream/plugins/monocular/chart-repo/go.mod
index c710f48d3d..b3c3d90e96 100644
--- a/src/jetstream/plugins/monocular/chart-repo/go.mod
+++ b/src/jetstream/plugins/monocular/chart-repo/go.mod
@@ -8,14 +8,19 @@ require (
 	github.com/cyphar/filepath-securejoin v0.2.2 // indirect
 	github.com/disintegration/imaging v1.6.2
 	github.com/ghodss/yaml v1.0.0
+	github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 // indirect
 	github.com/go-stack/stack v1.8.0 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/golang/snappy v0.0.1 // indirect
+	github.com/gorilla/mux v1.7.3
+	github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40
 	github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a
-	github.com/pkg/errors v0.8.1 // indirect
+	github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a
+	github.com/prometheus/client_golang v1.2.1 // indirect
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/cobra v0.0.5
 	github.com/stretchr/testify v1.4.0
+	github.com/urfave/negroni v1.0.0
 	github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c // indirect
 	github.com/xdg/stringprep v1.0.0 // indirect
 	go.mongodb.org/mongo-driver v1.1.3
diff --git a/src/jetstream/plugins/monocular/chart-repo/go.sum b/src/jetstream/plugins/monocular/chart-repo/go.sum
index f0df5a7297..dc9d7eec27 100644
--- a/src/jetstream/plugins/monocular/chart-repo/go.sum
+++ b/src/jetstream/plugins/monocular/chart-repo/go.sum
@@ -5,9 +5,19 @@ github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF0
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/arschles/assert v1.0.0 h1:NofQbRhtxcLgP+XoKunA7J6UMJNTqX7xR/19tej8UsA=
 github.com/arschles/assert v1.0.0/go.mod h1:m/u69zW43x0h8dTHcv3JJZljINyEYgBuf5fYJP6WikI=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/cespare/xxhash/v2 v2.1.0 h1:yTUvW7Vhb89inJ+8irsUqiWjh8iT6sQPZiQzI6ReGkA=
+github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
@@ -28,6 +38,12 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=
+github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
 github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
@@ -37,10 +53,12 @@ github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
@@ -50,23 +68,35 @@ github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSN
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
+github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
+github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/helm/monocular v1.9.0 h1:jmCzg4mwHLLyL75/5Ekj3aqJs0Hr63fX3+n/hInwZ3U=
+github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40 h1:GT4RsKmHh1uZyhmTkWJTDALRjSHYQp6FRKrotf0zhAs=
+github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40/go.mod h1:NtmN9h8vrTveVQRLHcX2HQ5wIPBDCsZ351TGbZWgg38=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a h1:zPPuIq2jAWWPTrGt70eK/BSch+gFAGrNzecsoENgu2o=
 github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
 github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a h1:VqeX/fehAB6FtBox0TVYcjOMXGE56INQIfbXegditX4=
+github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -75,6 +105,7 @@ github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lN
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -82,12 +113,29 @@ github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.2.1 h1:JnMpQc6ppsNgw9QPAGF6Dod479itz7lvlsMzzNayLOI=
+github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.7.0 h1:L+1lyG48J1zAQXA3RBX/nG/B3gjlHq0zTt2tlbJLyCY=
+github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8=
+github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
@@ -110,6 +158,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
+github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
+github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
 github.com/xdg/stringprep v1.0.0 h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0=
@@ -117,6 +167,7 @@ github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 go.mongodb.org/mongo-driver v1.1.3 h1:++7u8r9adKhGR+I79NfEtYrk2ktjenErXM99PSufIoI=
 go.mongodb.org/mongo-driver v1.1.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 h1:mKdxBk7AujPs8kU4m80U72y/zjbZ3UcXC7dClwKbUI0=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
@@ -125,18 +176,26 @@ golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456 h1:ng0gs1AKnRRuEMZoTLLlbOd+C17zUDepwGQBb/n+JVg=
 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191010194322-b09406accb47 h1:/XfQ9z7ib8eEJX2hdgFTZJ/ntt0swNk5oYBziWeTCvY=
+golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -145,6 +204,7 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
diff --git a/src/jetstream/plugins/monocular/chart-repo/serve.go b/src/jetstream/plugins/monocular/chart-repo/serve.go
index 4ab4df5ca7..b7d7a27f7c 100644
--- a/src/jetstream/plugins/monocular/chart-repo/serve.go
+++ b/src/jetstream/plugins/monocular/chart-repo/serve.go
@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartrepo
+package main
 
 import (
-	"github.com/helm/monocular/chartrepo/foundationdb"
+	"os"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -42,6 +42,6 @@ var ServeCmd = &cobra.Command{
 		}
 		authorizationHeader := os.Getenv("AUTHORIZATION_HEADER")
 
-		initOnDemandEndpoint(fdbURL, fDB, debug, authorizationHeader)
+		initOnDemandEndpoint(fdbURL, fDB, authorizationHeader, debug)
 	},
 }
diff --git a/src/jetstream/plugins/monocular/chart-repo/sync.go b/src/jetstream/plugins/monocular/chart-repo/sync.go
index 8cd3591cc5..5230e78ead 100644
--- a/src/jetstream/plugins/monocular/chart-repo/sync.go
+++ b/src/jetstream/plugins/monocular/chart-repo/sync.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartrepo
+package main
 
 import (
 	"github.com/helm/monocular/chartrepo/foundationdb"

From 8d4d642c74f244b0c03dbea3379fb5dc3ddc3c41 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Fri, 27 Dec 2019 15:28:25 +0000
Subject: [PATCH 212/648] Add readme instructions for running chart-repo
 container in serve mode

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 src/jetstream/plugins/monocular/README.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/jetstream/plugins/monocular/README.txt

diff --git a/src/jetstream/plugins/monocular/README.txt b/src/jetstream/plugins/monocular/README.txt
new file mode 100644
index 0000000000..86279bf2be
--- /dev/null
+++ b/src/jetstream/plugins/monocular/README.txt
@@ -0,0 +1 @@
+docker run -p 8080:8080 --rm -e -ti --network=host kreinecke/suse-fdb-chart-repo:latest /chartrepo serve --doclayer-url=mongodb://192.168.57.1:27016 stable https://kubernetes-charts.storage.googleapis.com

From 8310ac1e2f1e0e184d2903822d272f8608a8d7b3 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Sat, 28 Dec 2019 15:31:17 +0000
Subject: [PATCH 213/648] Serve-mode sync request handler works

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 .../monocular/chart-repo/api_endpoint.go      | 35 +++++++++++++++----
 .../chart-repo/foundationdb/utils.go          |  2 +-
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
index 6d572c6138..bedb61905f 100644
--- a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
+++ b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
@@ -18,6 +18,7 @@ package main
 
 import (
 	"context"
+	"encoding/json"
 	"net/http"
 	"os"
 	"time"
@@ -67,9 +68,27 @@ func setupRoutes() http.Handler {
 }
 
 func OnDemandSync(w http.ResponseWriter, req *http.Request, params Params) {
-	repoURL := req.FormValue("repoURL")
+	type syncParams struct {
+		RepoURL string `json:"repoURL"`
+	}
+
+	dec := json.NewDecoder(req.Body)
+	var url syncParams
+	if err := dec.Decode(&url); err != nil {
+		log.Fatal(err)
+	}
+
+	repoURL := url.RepoURL
 	repoName := params["repo"]
-	//TODO kate check and handle errors
+
+	if repoURL == "" {
+		log.Fatal("No Repository URL provided in request for Sync action.")
+	}
+
+	if repoName == "" {
+		log.Fatal("No Repository name provided in request for Sync action.")
+	}
+
 	startTime := time.Now()
 	if err := fdb.SyncRepo(fdbClient, fDBName, repoName, repoURL, authorizationHeader); err != nil {
 		log.Fatalf("Can't sync chart repository with database: %v", err)
@@ -81,7 +100,11 @@ func OnDemandSync(w http.ResponseWriter, req *http.Request, params Params) {
 
 func OnDemandDelete(w http.ResponseWriter, req *http.Request, params Params) {
 	repoName := params["repo"]
-	//TODO kate check and handle errors
+
+	if repoName != "" {
+		log.Fatal("No Repository name provided in request for Delete action.")
+	}
+
 	if err := fdb.DeleteRepo(fdbClient, fDBName, repoName); err != nil {
 		log.Fatalf("Can't delete chart repository %s from database: %v", repoName, err)
 	}
@@ -90,9 +113,7 @@ func OnDemandDelete(w http.ResponseWriter, req *http.Request, params Params) {
 func initOnDemandEndpoint(fdbURL string, fdbName string, authHeader string, debug bool) {
 
 	authorizationHeader = authHeader
-	debug = debug
-	fdbURL = fdbURL
-	fdbName = fdbName
+	fDBName = fdbName
 
 	if debug {
 		log.SetLevel(log.DebugLevel)
@@ -107,7 +128,7 @@ func initOnDemandEndpoint(fdbURL string, fdbName string, authHeader string, debu
 		port = "8080"
 	}
 	addr := ":" + port
-	log.WithFields(log.Fields{"addr": addr}).Info("On-Demand endpoint listening on: %v", port)
+	log.Infof("On-Demand endpoint listening on: %v", addr)
 	http.ListenAndServe(addr, n)
 }
 
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
index c20a33af2e..367eef209c 100644
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
@@ -83,7 +83,7 @@ func SyncRepo(dbClient Client, dbName, repoName, repoURL string, authorizationHe
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	res, err := collection.InsertOne(ctx, bson.M{"name": "pi", "value": 3.14159}, options.InsertOne())
 	if err != nil {
-		log.Fatalf("Database readiness test failed: %v", err)
+		log.Fatalf("Database readiness/connection test failed: %v", err)
 		cancel()
 		return err
 	}

From 608e209c3dc3f147a8e61b3a14a5c4ef3ac798d9 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Sat, 28 Dec 2019 16:00:28 +0000
Subject: [PATCH 214/648] Serve-mode delete request handler works

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 .../monocular/chart-repo/api_endpoint.go        |  2 +-
 .../monocular/chart-repo/foundationdb/utils.go  | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
index bedb61905f..a7ef887c25 100644
--- a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
+++ b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
@@ -101,7 +101,7 @@ func OnDemandSync(w http.ResponseWriter, req *http.Request, params Params) {
 func OnDemandDelete(w http.ResponseWriter, req *http.Request, params Params) {
 	repoName := params["repo"]
 
-	if repoName != "" {
+	if repoName == "" {
 		log.Fatal("No Repository name provided in request for Delete action.")
 	}
 
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
index 367eef209c..a333518fae 100644
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
@@ -193,7 +193,22 @@ func updateLastCheck(db Database, repoName string, checksum string, now time.Tim
 func DeleteRepo(dbClient Client, dbName, repoName string) error {
 	db, closer := dbClient.Database(dbName)
 	defer closer()
-	collection := db.Collection(chartCollection)
+
+	log.Debugf("Checking database connection and readiness...")
+	collection := db.Collection("numbers")
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	res, err := collection.InsertOne(ctx, bson.M{"name": "pi", "value": 3.14159}, options.InsertOne())
+	if err != nil {
+		log.Fatalf("Database readiness/connection test failed: %v", err)
+		cancel()
+		return err
+	}
+	id := res.InsertedID
+	cancel()
+	log.Debugf("Database connection test successful.")
+	log.Debugf("Inserted a test document to test collection with ID: %v", id)
+
+	collection = db.Collection(chartCollection)
 	filter := bson.M{
 		"repo.name": repoName,
 	}

From 02ff73e5768b51e851118bca44b403bc01ebb9e5 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Tue, 7 Jan 2020 14:08:37 +0000
Subject: [PATCH 215/648] Update buildpack version to v3

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 manifest.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifest.yml b/manifest.yml
index 9d229edd2b..1611522c45 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -4,15 +4,15 @@ applications:
     disk_quota: 1024M
     host: console
     timeout: 180
-    buildpack: https://github.com/cloudfoundry-incubator/stratos-buildpack#v2.4
+    buildpack: https://github.com/cloudfoundry-incubator/stratos-buildpack#v3
     health-check-type: port
-#    env:
+    env:
 # Override CF API endpoint URL inferred from VCAP_APPLICATION env 
 #       CF_API_URL: https://CLOUD_FOUNDRY_API_ENDPOINT
 # Force the console to use secured communication with the Cloud Foundry API endpoint
 #       CF_API_FORCE_SECURE: true
 # Turn on backend debugging
-#       LOG_LEVEL: debug
+       LOG_LEVEL: debug
 
 # User provided services can also be used to set environment properties:
 #   env:

From 6be44f837b55c0fb2ce228d20ad359594e2f9fa5 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 8 Jan 2020 08:31:35 +0000
Subject: [PATCH 216/648] Merge helm-v3 branch

---
 .travis.yml                                   |    6 +-
 CHANGELOG.md                                  |   14 +
 action-builders-branch-tests                  | 8341 -----------------
 build/update-tools-versions.sh                |   84 +-
 .../app/custom/custom-routing.module.ts       |    2 +
 .../app/custom/helm/helm-entity-factory.ts    |   18 +
 .../app/custom/helm/helm-entity-generator.ts  |   24 +
 .../frontend/app/custom/helm/helm.module.ts   |   15 +-
 .../frontend/app/custom/helm/helm.routing.ts  |    9 +-
 .../app/custom/helm/helm.store.module.ts      |    5 +-
 .../helm-release-service-card.component.html  |    8 +-
 .../helm-service-ports.component.ts           |    3 +-
 ...ocular-release-pods-list-config.service.ts |   62 +-
 .../monocular-release-pods-list-source.ts     |    5 +-
 .../monocular-release-services-list-source.ts |   27 +-
 .../monocular-releases-list-config.service.ts |    2 +-
 .../monocular-tab-base.component.ts           |    1 -
 .../chart-details.component.html              |    2 +-
 .../helm-release-tab-base.component.ts        |  196 +-
 .../tabs/helm-release-helper.service.ts       |  142 +-
 .../helm-release-notes-tab.component.scss     |    2 +-
 .../helm-release-notes-tab.component.ts       |    4 +-
 ...helm-release-resource-graph.component.html |   38 +
 ...helm-release-resource-graph.component.scss |    5 +
 ...m-release-resource-graph.component.spec.ts |   25 +
 .../helm-release-resource-graph.component.ts  |  141 +
 ...lm-release-resource-preview.component.html |   29 +
 ...lm-release-resource-preview.component.scss |   30 +
 ...release-resource-preview.component.spec.ts |   25 +
 ...helm-release-resource-preview.component.ts |   50 +
 .../helm-release-summary-tab.component.html   |   18 +-
 .../helm-release-summary-tab.component.scss   |   28 +
 .../helm-release-summary-tab.component.ts     |  124 +-
 .../helm-release-values-tab.component.html    |   29 +-
 .../helm-release-values-tab.component.ts      |   69 +-
 .../app/custom/helm/store/helm.actions.ts     |   67 +-
 .../app/custom/helm/store/helm.effects.ts     |   45 +-
 .../app/custom/helm/store/helm.reducers.ts    |   12 +
 .../app/custom/helm/store/helm.types.ts       |   22 +-
 .../helm-configuration.component.html         |    1 -
 .../helm-configuration.component.spec.ts      |   29 -
 .../helm-configuration.component.ts           |   16 -
 .../kubernetes-certs-auth-form.component.html |   26 +-
 .../kubernetes-certs-auth-form.component.ts   |   14 +-
 ...kubernetes-endpoint-preview.component.html |   72 +
 ...ubernetes-endpoint-preview.component.scss} |    0
 ...ernetes-endpoint-preview.component.spec.ts |   37 +
 .../kubernetes-endpoint-preview.component.ts  |   74 +
 .../kubernetes/kubernetes-entity-generator.ts |    2 +
 .../custom/kubernetes/kubernetes.module.ts    |   12 +-
 .../kubernetes/kubernetes.setup.module.ts     |   11 +-
 .../kubernetes-pod-readiness.component.html   |    1 +
 .../kubernetes-pod-readiness.component.scss   |    0
 ...kubernetes-pod-readiness.component.spec.ts |   25 +
 .../kubernetes-pod-readiness.component.ts     |   21 +
 .../kubernetes-pod-status.component.html      |    1 +
 .../kubernetes-pod-status.component.scss      |    7 +
 .../kubernetes-pod-status.component.spec.ts   |   25 +
 .../kubernetes-pod-status.component.ts        |   30 +
 .../services/kubernetes-endpoint.service.ts   |  110 +-
 .../app/custom/kubernetes/store/kube.types.ts |    1 +
 .../kubernetes-summary.component.ts           |  139 +-
 .../assets/custom/app_placeholder.svg         |    9 +
 custom-src/frontend/sass/custom/suse.scss     |   63 +-
 deploy/Dockerfile.all-in-one                  |    4 +-
 deploy/Dockerfile.bk                          |   10 +-
 deploy/Dockerfile.ui                          |    6 +-
 deploy/ci/scripts/Dockerfile.bosh             |    2 +-
 deploy/ci/scripts/Dockerfile.stratos-ci       |    2 +-
 deploy/ci/tasks/dev-releases/github-helper.sh |    2 +-
 deploy/ci/travis/depcache.sh                  |    2 +-
 deploy/common-build.sh                        |    2 +-
 deploy/containers/nginx/Dockerfile.dc         |    2 +-
 deploy/db/Dockerfile.mariadb                  |    9 +-
 deploy/db/mariadb-entrypoint.sh               |  255 +-
 deploy/db/mariadb-ping.sh                     |    3 +
 deploy/fissile/Dockerfile.bosh-cli            |    4 +-
 deploy/kubernetes/build.sh                    |   32 +-
 .../console/templates/__helpers.tpl           |   18 +
 .../console/templates/deployment.yaml         |   18 +-
 .../kubernetes/console/templates/ingress.yaml |   12 +-
 .../console/tests/ingress_test.yaml           |    8 +-
 .../console/tests/kube_version_test.yaml      |   31 +
 .../Dockerfile.stratos-base.tmpl              |    4 +
 .../Dockerfile.stratos-bk-base.tmpl           |   27 +-
 .../Dockerfile.stratos-bk-build-base.tmpl     |   11 +-
 .../Dockerfile.stratos-go-build-base.tmpl     |   13 +-
 .../Dockerfile.stratos-mariadb-base.tmpl      |   18 +-
 .../Dockerfile.stratos-nginx-base.tmpl        |   17 +-
 .../Dockerfile.stratos-ruby-build-base.tmpl   |   21 +-
 .../Dockerfile.stratos-ui-build-base.tmpl     |   26 +-
 .../stratos-base-images/build-base-images.sh  |   15 +-
 deploy/stratos-base-images/install-ruby.sh    |   17 +-
 deploy/stratos-ui-release/config/blobs.yml    |    4 +-
 .../packages/golang/packaging                 |    2 +-
 .../stratos-ui-release/packages/golang/spec   |    2 +-
 docs/customizing.md                           |   20 +-
 docs/developers-guide.md                      |    2 +-
 examples/custom-src/frontend/sass/custom.scss |    8 +-
 .../custom-src/frontend/sass/custom/acme.scss |    2 +-
 manifest.yml                                  |    2 +
 package-lock.json                             |    2 +-
 package.json                                  |   13 +-
 ...utoscaler-metric-chart-card.component.scss |    1 -
 .../actions/deploy-applications.actions.ts    |    2 +-
 .../src/actions/organization.actions.ts       |    6 +-
 .../src/actions/relation.actions.ts           |   14 +-
 .../src/actions/service-instances.actions.ts  |   12 +-
 .../src/actions/space.actions.ts              |   14 +-
 .../cloud-foundry/src/cf-entity-generator.ts  |   12 +-
 .../entity-relations/entity-relation-tree.ts  |    4 +-
 .../applications/application.service.ts       |   68 +-
 .../deploy-application.component.theme.scss   |   12 +-
 .../cloud-foundry/cloud-foundry.module.ts     |    8 +-
 .../cloud-foundry-endpoint.service.ts         |   42 +-
 .../cloud-foundry-organization.service.ts     |   25 +-
 .../services/cloud-foundry-space.service.ts   |   38 +-
 .../cloud-foundry-cell.service.ts             |   46 +-
 .../cloud-foundry-cells.component.ts          |   13 +-
 .../application-preview.component.html        |   70 +
 .../application-preview.component.scss        |    0
 .../application-preview.component.spec.ts     |   37 +
 .../application-preview.component.ts          |   72 +
 .../card-cf-info/card-cf-info.component.html  |    4 +-
 .../card-cf-info/card-cf-info.component.ts    |   48 +-
 .../card-cf-space-details.component.html      |    2 +-
 .../card-cf-space-details.component.ts        |    7 +-
 .../cf-endpoint-preview.component.html        |   76 +
 .../cf-endpoint-preview.component.scss        |    0
 .../cf-endpoint-preview.component.spec.ts     |   37 +
 .../cf-endpoint-preview.component.ts          |   45 +
 .../shared/components/components.module.ts    |   23 +-
 .../cf-app-instances-config.service.ts        |   14 +-
 .../list-types/base-cf/base-cf-list-config.ts |    3 +
 .../cf-cell-health-list-config.service.ts     |   38 +-
 .../cf-cells/cf-cells-data-source.ts          |   18 +-
 .../cf-cells/cf-cells-list-config.service.ts  |   19 +-
 .../organization-preview.component.html       |  102 +
 .../organization-preview.component.scss       |    0
 .../organization-preview.component.spec.ts    |   37 +
 .../organization-preview.component.ts         |   50 +
 .../space-preview.component.html              |  101 +
 .../space-preview.component.scss              |    0
 .../space-preview.component.spec.ts           |   37 +
 .../space-preview/space-preview.component.ts  |   47 +
 .../packages/core/misc/custom/custom.scss     |    1 -
 .../packages/core/sass/_all-theme.scss        |   29 +-
 .../components/mat-button-toggle-group.scss   |    7 +
 .../sass/components/mat-snack-bar.theme.scss  |   20 +
 .../core/sass/components/mat-tabs.theme.scss  |   20 -
 .../components/ngx-charts-gauge.theme.scss    |    6 +
 .../sass/components/text-status.theme.scss    |   18 +
 src/frontend/packages/core/sass/theme.scss    |   44 +-
 ...api-entity-type-selector.component.spec.ts |    6 +-
 ...api-endpoint-select-page.component.spec.ts |   20 +-
 .../api-endpoint-select-page.component.ts     |    6 +-
 ...ndpoint-type-select-page.component.spec.ts |   19 +-
 .../api-entity-list-page.component.html       |    2 +-
 .../api-entity-list-page.component.spec.ts    |   18 +-
 .../api-entity-list-page.component.ts         |    2 +-
 ...-entity-type-select-page.component.spec.ts |   20 +-
 .../api-entity-type-select-page.component.ts  |    7 +-
 .../packages/core/src/app.component.html      |    7 +-
 .../packages/core/src/app.component.ts        |    4 +-
 src/frontend/packages/core/src/app.module.ts  |    2 +
 .../packages/core/src/base-entity-schemas.ts  |    3 +-
 .../core/src/core/endpoints.service.ts        |   15 +-
 .../entity-catalogue-entity.ts                |   22 +-
 .../entity-catalogue.types.ts                 |    6 +-
 .../log-out-dialog.component.ts               |   13 +-
 .../packages/core/src/core/page-visible.ts    |   18 +
 .../packages/core/src/core/style.service.ts   |   38 +
 .../packages/core/src/core/theme.service.ts   |  151 +
 .../features/cloud-foundry/cf-cell.helpers.ts |   71 +
 .../dashboard-base.component.html             |    8 +-
 .../dashboard-base.component.scss             |   11 +-
 .../dashboard-base.component.ts               |   65 +-
 .../page-side-nav.component.html              |    3 +-
 .../page-side-nav.component.scss              |   14 +
 .../page-side-nav.component.theme.scss        |    2 +-
 .../connect-endpoint-dialog.component.ts      |    6 +-
 .../create-endpoint-connect.component.ts      |    8 +-
 .../features/endpoints/endpoint-helpers.ts    |   18 +-
 .../profile-info/profile-info.component.html  |   12 +
 .../profile-info/profile-info.component.ts    |    7 +-
 .../packages/core/src/logged-in.service.ts    |    2 +-
 .../packages/core/src/route-reuse-stragegy.ts |   10 +-
 .../code-block.component.theme.scss           |   18 +-
 .../entity-summary-title.component.html       |    4 +-
 .../entity-summary-title.component.scss       |   15 +-
 .../entity-summary-title.component.ts         |    2 +-
 .../favorites-meta-card.component.html        |    2 +-
 .../favorites-meta-card.component.ts          |   37 +-
 .../shared/components/json-viewer/README.md   |    9 +
 .../json-viewer/json-viewer.component.html    |   22 +
 .../json-viewer/json-viewer.component.scss    |  101 +
 .../json-viewer/json-viewer.component.spec.ts |   25 +
 .../json-viewer/json-viewer.component.ts      |  125 +
 .../local-list-controller.ts                  |    7 +-
 .../meta-card-item.component.scss             |    4 -
 .../meta-card-item.component.theme.scss       |   12 +
 .../components/list/list.component.theme.scss |   11 +-
 .../simple-list/simple-list.component.spec.ts |   31 +-
 .../markdown-preview.component.html           |    7 +-
 .../markdown-preview.component.scss           |   21 -
 .../markdown-preview.component.ts             |   13 +-
 .../page-header.component.theme.scss          |    7 +
 .../page-header/page-header.component.ts      |    3 +-
 .../sidepanel-preview.component.html          |    8 +
 .../sidepanel-preview.component.scss          |   23 +
 .../sidepanel-preview.component.spec.ts       |   37 +
 .../sidepanel-preview.component.theme.scss}   |    8 +-
 .../sidepanel-preview.component.ts            |   14 +
 .../src/shared/monitors/pagination-monitor.ts |    2 +
 .../core/src/shared/previewable-component.ts  |    3 +
 .../shared/services/panel-preview.service.ts  |   95 +
 .../packages/core/src/shared/shared.module.ts |   23 +-
 src/frontend/packages/core/src/styles.scss    |   10 +
 .../core/test-framework/store-test-helper.ts  |    4 +-
 .../store/src/actions/dashboard-actions.ts    |   19 +-
 .../store/src/effects/auth.effects.ts         |   17 +-
 .../store/src/effects/dashboard.effects.ts    |   24 +
 .../store/src/effects/endpoint.effects.ts     |    5 +-
 .../map-multi-endpoint.pipes.ts               |   62 +-
 .../normalize-entity-request-response.pipe.ts |   14 -
 .../store/src/reducers/dashboard-reducer.ts   |   29 +-
 .../packages/store/src/store.module.ts        |    4 +-
 src/jetstream/authuaa.go                      |    5 -
 src/jetstream/go.mod                          |   69 +-
 src/jetstream/go.sum                          |  554 +-
 src/jetstream/middleware.go                   |    2 +
 src/jetstream/plugins/kubernetes/api_proxy.go |    8 +
 .../plugins/kubernetes/endpoint_config.go     |   73 +
 src/jetstream/plugins/kubernetes/go.mod       |   73 +-
 src/jetstream/plugins/kubernetes/go.sum       |  565 +-
 .../plugins/kubernetes/helm/graph.go          |  260 +
 .../plugins/kubernetes/helm/graph_status.go   |   84 +
 src/jetstream/plugins/kubernetes/helm/job.go  |   85 +
 .../plugins/kubernetes/helm/release.go        |  335 +
 .../plugins/kubernetes/helm/release_test.go   |   29 +
 src/jetstream/plugins/kubernetes/helm/util.go |   52 +
 .../plugins/kubernetes/helm_client.go         |  149 +-
 .../plugins/kubernetes/helm_versions.go       |   63 -
 .../plugins/kubernetes/install_release.go     |  100 +-
 .../plugins/kubernetes/kube_dashboard.go      |   25 +-
 .../plugins/kubernetes/list_releases.go       |  249 +-
 src/jetstream/plugins/kubernetes/main.go      |    5 +-
 .../plugins/metrics/cloud_foundry.go          |    2 +-
 .../repository/console_config/env_lookup.go   |   10 +-
 .../repository/interfaces/jetstream_error.go  |   32 +
 src/jetstream/session.go                      |   13 +-
 251 files changed, 6921 insertions(+), 9866 deletions(-)
 delete mode 100644 action-builders-branch-tests
 create mode 100644 custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
 create mode 100644 custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss
 create mode 100644 custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
 create mode 100644 custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.html
 create mode 100644 custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.scss
 create mode 100644 custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts
 create mode 100644 custom-src/frontend/app/custom/helm/store/helm.reducers.ts
 delete mode 100644 custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.html
 delete mode 100644 custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.spec.ts
 delete mode 100644 custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.html
 rename custom-src/frontend/app/custom/{helm/tabs/configuration-tab/helm-configuration.component.scss => kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.scss} (100%)
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.html
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.scss
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.scss
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
 create mode 100644 custom-src/frontend/assets/custom/app_placeholder.svg
 create mode 100755 deploy/db/mariadb-ping.sh
 create mode 100644 deploy/kubernetes/console/tests/kube_version_test.yaml
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.html
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.scss
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.spec.ts
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.ts
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.html
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.scss
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.spec.ts
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.ts
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.html
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.scss
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.spec.ts
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.ts
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.html
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.scss
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.spec.ts
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.ts
 create mode 100644 src/frontend/packages/core/sass/components/mat-button-toggle-group.scss
 create mode 100644 src/frontend/packages/core/sass/components/mat-snack-bar.theme.scss
 delete mode 100644 src/frontend/packages/core/sass/components/mat-tabs.theme.scss
 create mode 100644 src/frontend/packages/core/sass/components/ngx-charts-gauge.theme.scss
 create mode 100644 src/frontend/packages/core/src/core/style.service.ts
 create mode 100644 src/frontend/packages/core/src/core/theme.service.ts
 create mode 100644 src/frontend/packages/core/src/features/cloud-foundry/cf-cell.helpers.ts
 create mode 100644 src/frontend/packages/core/src/shared/components/json-viewer/README.md
 create mode 100644 src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.html
 create mode 100644 src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.scss
 create mode 100644 src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.spec.ts
 create mode 100644 src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.ts
 create mode 100644 src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.theme.scss
 create mode 100644 src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.html
 create mode 100644 src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.scss
 create mode 100644 src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.spec.ts
 rename src/frontend/packages/core/src/shared/components/{markdown-preview/markdown-preview.component.theme.scss => sidepanel-preview/sidepanel-preview.component.theme.scss} (67%)
 create mode 100644 src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.ts
 create mode 100644 src/frontend/packages/core/src/shared/previewable-component.ts
 create mode 100644 src/frontend/packages/core/src/shared/services/panel-preview.service.ts
 create mode 100644 src/frontend/packages/store/src/effects/dashboard.effects.ts
 delete mode 100644 src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/normalize-entity-request-response.pipe.ts
 create mode 100644 src/jetstream/plugins/kubernetes/helm/graph.go
 create mode 100644 src/jetstream/plugins/kubernetes/helm/graph_status.go
 create mode 100644 src/jetstream/plugins/kubernetes/helm/job.go
 create mode 100644 src/jetstream/plugins/kubernetes/helm/release.go
 create mode 100644 src/jetstream/plugins/kubernetes/helm/release_test.go
 create mode 100644 src/jetstream/plugins/kubernetes/helm/util.go
 delete mode 100644 src/jetstream/plugins/kubernetes/helm_versions.go
 create mode 100644 src/jetstream/repository/interfaces/jetstream_error.go

diff --git a/.travis.yml b/.travis.yml
index 2d0c6436a6..011d0d496e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "10.16.3"
+  - "12.13.0"
 sudo: required
 dist: bionic
 services:
@@ -39,7 +39,7 @@ jobs:
       before_script:
         - curl -sL -o ~/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
         - chmod +x ~/bin/gimme
-        - eval "$(gimme 1.12.4)"
+        - eval "$(gimme 1.13.4)"
         - go get -u golang.org/x/lint/golint
       script:
         - golint src/jetstream/...
@@ -61,7 +61,7 @@ jobs:
       before_script:
         - curl -sL -o ~/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
         - chmod +x ~/bin/gimme
-        - eval "$(gimme 1.12.4)"
+        - eval "$(gimme 1.13.4)"
       script:
         - npm run test-backend
     - name: Helm Chart Unit Tests
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f664211f31..2ab677a1db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Change Log
 
+## 2.6.1
+
+[Full Changelog](https://github.com/cloudfoundry/stratos/compare/2.6.0...2.6.1)
+
+This release contains a few fixes:
+
+**Fixes:**
+
+- Helm Chart does not work with Kubernetes 1.16 [\#4022](https://github.com/cloudfoundry/stratos/issues/4022)
+- Generated Ingress certificates during Kubernetes deployment are empty [\#4006](https://github.com/cloudfoundry/stratos/issues/4006)
+- Kubernetes Ingress certificate is incorrectly set [\#4005](https://github.com/cloudfoundry/stratos/issues/4005)
+- Update metric used for cells [\#4009](https://github.com/cloudfoundry/stratos/pull/4009)
+- Fix incorrect SSO behaviour following 2.4.0 --> 2.6.0 upgrade [\#4015](https://github.com/cloudfoundry/stratos/pull/4015)
+
 ## 2.6.0
 
 [Full Changelog](https://github.com/SUSE/stratos/compare/2.5.3...2.6.0)
diff --git a/action-builders-branch-tests b/action-builders-branch-tests
deleted file mode 100644
index d231c8f5e8..0000000000
--- a/action-builders-branch-tests
+++ /dev/null
@@ -1,8341 +0,0 @@
-
-> stratos@2.5.0 test /home/kater/dev/git/stratos
-> run-s test-frontend:* --continue-on-error
-
-
-> stratos@2.5.0 test-frontend:core /home/kater/dev/git/stratos
-> ng test core --code-coverage --watch=false
-
-06 09 2019 10:56:41.793:INFO [karma-server]: Karma v4.0.0 server started at http://0.0.0.0:9876/
-06 09 2019 10:56:41.794:INFO [launcher]: Launching browsers Chrome with concurrency unlimited
-06 09 2019 10:56:41.804:INFO [launcher]: Starting browser Chrome
-06 09 2019 10:57:05.988:INFO [Chrome 76.0.3809 (Linux 0.0.0)]: Connected on socket zC-6oTngp75NMl9iAAAA with id 22572577
-
-  AppComponent
-    ✓ should create the app
-
-  AuthGuardService
-    ✓ should be created
-
-  ButtonBlurOnClickDirective
-    ✓ should create an instance
-
-  CurrentUserPermissionsService
-    ✓ should be created
-    ✓ should allow create application
-    ✓ should allow create application for single endpoint with access
-    ✓ should allow create application for single endpoint with access and org/space
-    ✓ should allow if feature flag
-    ✓ should not allow if no feature flag
-    ✓ should allow if stratos admin
-    ✓ should allow if has stratos change password scope
-    ✓ should allow if has endpoint scope
-    ✓ should not allow if has endpoint scope
-    ✓ should not allow if read only admin
-    ✓ should not allow if read only user
-
-  DotContentComponent
-    ✓ should create
-
-  EndpointsService
-    ✓ should be created
-
-  ActionDispatcher
-    ✓ should not dispatch unknown action
-    ✓ should dispatch custom action
-    ✓ should dispatch get action
-    ✓ should dispatch delete action
-    ✓ should dispatch update action
-    ✓ should dispatch create action
-    ✓ should dispatch getMultiple action
-
-  ActionOrchestrator
-    ✓ should not have action builders
-    ✓ should have base action builders
-    ✓ should have custom actions builders
-    ✓ should have custom and base actions builders
-    ✓ should get entity action dispatcher
-
-  EntityCatalogueService
-    ✓ should create correct id
-    ✓ should get default schema from single schema
-    ✓ should get default schema from multiple schemas
-    ✓ should get non-default schema from multiple schemas
-    ✓ should get endpoint
-    ✓ should get endpoint subtype
-    ✓ should get entity subtype
-
-  EntityFavoriteStarComponent
-    ✓ should create
-
-  EntityServiceFactoryService
-    ✓ should be created
-
-  EntityServiceService
-    ✓ should be created
-    ✓ should poll
-    ✓ should get application
-    ✗ should fail new entity
-	Error: Timeout - Async callback was not invoked within 10000ms (set by jasmine.DEFAULT_TIMEOUT_INTERVAL)
-	    at <Jasmine>
-
-Chrome 76.0.3809 (Linux 0.0.0) EntityServiceService should fail new entity FAILED
-	Error: Timeout - Async callback was not invoked within 10000ms (set by jasmine.DEFAULT_TIMEOUT_INTERVAL)
-	    at <Jasmine>
-    ✗ should fail previously fetched entity
-	Error: Timeout - Async callback was not invoked within 10000ms (set by jasmine.DEFAULT_TIMEOUT_INTERVAL)
-	    at <Jasmine>
-
-Chrome 76.0.3809 (Linux 0.0.0) EntityServiceService should fail previously fetched entity FAILED
-	Error: Timeout - Async callback was not invoked within 10000ms (set by jasmine.DEFAULT_TIMEOUT_INTERVAL)
-	    at <Jasmine>
-    ✓ should set busy new entity
-    ✓ should set busy
-    ✓ should set deleted new entity
-    ✓ should set deleted
-    ✗ should set deleted failed
-	Error: Expected false to equal true.
-	    at <Jasmine>
-	    at TapSubscriber._tapNext (src/core/entity-service.spec.ts:395:56)
-	    at TapSubscriber._next (home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/operators/tap.js:45:1)
-	    at TapSubscriber.Subscriber.next (home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/Subscriber.js:53:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) EntityServiceService should set deleted failed FAILED
-	Error: Expected false to equal true.
-	    at <Jasmine>
-	    at TapSubscriber._tapNext (src/core/entity-service.spec.ts:395:56)
-	    at TapSubscriber._next (home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/operators/tap.js:45:1)
-	    at TapSubscriber.Subscriber.next (home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/Subscriber.js:53:1)
-
-  EventWatcherService
-    ✓ should be created
-
-  LogOutDialogComponent
-    ✓ should be created
-
-  LoggerService
-    ✓ should be created
-
-  PageHeaderService
-    ✓ should be created
-
-  PageNotFoundComponentComponent
-    ✓ should create
-
-  StatefulIconComponent
-    ✓ should be created
-
-  UserService
-    ✓ should be created
-
-  UtilsService
-    ✓ should be created
-
-  AboutPageComponent
-    ✓ should create
-06 09 2019 10:57:48.579:WARN [web-server]: 404: /core/assets/logo.png
-
-  DiagnosticsPageComponent
-    ✓ should create
-
-  EulaPageComponent
-    ✓ should create
-WARN LOG: 'Could not find catalogue entity for endpoint type 'cf' and entity type 'quota_definition'. Stack: ', 'Error
-    at TestEntityCatalogue.EntityCatalogue.getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/core/entity-catalogue/entity-catalogue.service.ts:119:162)
-    at PaginationMonitorFactory.getEntity [as create] (http://localhost:9876/_karma_webpack_/webpack:/src/shared/monitors/pagination-monitor.factory.ts:21:47)
-    at QuotaDefinitionFormComponent.create [as fetchQuotasDefinitions] (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts:75:62)
-    at QuotaDefinitionFormComponent.fetchQuotasDefinitions [as ngOnInit] (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts:51:14)
-    at checkAndUpdateDirectiveInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-    at checkAndUpdateNodeInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-    at checkAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-    at debugCheckAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-    at debugCheckDirectivesFn (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateQuotaStepComponent.ngfactory.js:16:5)'
-WARN: 'Could not find catalogue entity for endpoint type 'cf' and entity type 'quota_definition'. Stack: ', 'Error
-    at TestEntityCatalogue.EntityCatalogue.getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/core/entity-catalogue/entity-catalogue.service.ts:119:162)
-    at PaginationMonitorFactory.getEntity [as create] (http://localhost:9876/_karma_webpack_/webpack:/src/shared/monitors/pagination-monitor.factory.ts:21:47)
-    at QuotaDefinitionFormComponent.create [as fetchQuotasDefinitions] (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts:75:62)
-    at QuotaDefinitionFormComponent.fetchQuotasDefinitions [as ngOnInit] (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts:51:14)
-    at checkAndUpdateDirectiveInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-    at checkAndUpdateNodeInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-    at checkAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-    at debugCheckAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-    at debugCheckDirectivesFn (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateQuotaStepComponent.ngfactory.js:16:5)'
-WARN: 'Could not find catalogue entity for endpoint type 'cf' and entity type 'quota_definition'. Stack: ', 'Error
-    at TestEntityCatalogue.EntityCatalogue.getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/core/entity-catalogue/entity-catalogue.service.ts:119:162)
-    at PaginationMonitorFactory.getEntity [as create] (http://localhost:9876/_karma_webpack_/webpack:/src/shared/monitors/pagination-monitor.factory.ts:21:47)
-    at QuotaDefinitionFormComponent.create [as fetchQuotasDefinitions] (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts:75:62)
-    at QuotaDefinitionFormComponent.fetchQuotasDefinitions [as ngOnInit] (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts:51:14)
-    at checkAndUpdateDirectiveInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-    at checkAndUpdateNodeInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-    at checkAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-    at debugCheckAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-    at debugCheckDirectivesFn (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateQuotaStepComponent.ngfactory.js:16:5)'
-
-  AddQuotaComponent
-    ✗ should create
-	Error: Could not find catalogue entity for endpoint type 'cf' and entity type 'quota_definition'
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 436453379, rootNodeFlags: 402653185, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: -1, flags: 402653184, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, ngContentIndex: -1, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: null, provider: null, text: null, query: Object({ id: 1, filterId: 2, bindings: [ Object ] }), ngContent: null }), Object({ nodeIndex: 1, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 1, childFlags: 33800195, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 4, bindings: [  ], bindingFlags: 0, outputs: [  ],  ...
-	    at PaginationMonitorFactory.create (src/shared/monitors/pagination-monitor.factory.ts:23:19)
-	    at QuotaDefinitionFormComponent.create [as fetchQuotasDefinitions] (src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts:75:62)
-	    at QuotaDefinitionFormComponent.fetchQuotasDefinitions [as ngOnInit] (src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts:51:14)
-	    at checkAndUpdateDirectiveInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-	    at checkAndUpdateNodeInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-	    at checkAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-	    at debugCheckAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-	    at debugCheckDirectivesFn (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-	    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateQuotaStepComponent.ngfactory.js:16:5)
-	    at Object.debugUpdateDirectives [as updateDirectives] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23901:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) AddQuotaComponent should create FAILED
-	Error: Could not find catalogue entity for endpoint type 'cf' and entity type 'quota_definition'
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 436453379, rootNodeFlags: 402653185, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: -1, flags: 402653184, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, ngContentIndex: -1, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: null, provider: null, text: null, query: Object({ id: 1, filterId: 2, bindings: [ Object ] }), ngContent: null }), Object({ nodeIndex: 1, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 1, childFlags: 33800195, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 4, bindings: [  ], bindingFlags: 0, outputs: [  ],  ...
-	    at PaginationMonitorFactory.create (src/shared/monitors/pagination-monitor.factory.ts:23:19)
-	    at QuotaDefinitionFormComponent.create [as fetchQuotasDefinitions] (src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts:75:62)
-	    at QuotaDefinitionFormComponent.fetchQuotasDefinitions [as ngOnInit] (src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts:51:14)
-	    at checkAndUpdateDirectiveInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-	    at checkAndUpdateNodeInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-	    at checkAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-	    at debugCheckAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-	    at debugCheckDirectivesFn (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-	    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateQuotaStepComponent.ngfactory.js:16:5)
-	    at Object.debugUpdateDirectives [as updateDirectives] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23901:1)
-WARN LOG: 'Could not find catalogue entity for endpoint type 'cf' and entity type 'quota_definition'. Stack: ', 'Error
-    at TestEntityCatalogue.EntityCatalogue.getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/core/entity-catalogue/entity-catalogue.service.ts:119:162)
-    at PaginationMonitorFactory.getEntity [as create] (http://localhost:9876/_karma_webpack_/webpack:/src/shared/monitors/pagination-monitor.factory.ts:21:47)
-    at QuotaDefinitionFormComponent.create [as fetchQuotasDefinitions] (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts:75:62)
-    at QuotaDefinitionFormComponent.fetchQuotasDefinitions [as ngOnInit] (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts:51:14)
-    at checkAndUpdateDirectiveInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-    at checkAndUpdateNodeInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-    at checkAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-    at debugCheckAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-    at debugCheckDirectivesFn (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateQuotaStepComponent.ngfactory.js:16:5)'
-WARN: 'Could not find catalogue entity for endpoint type 'cf' and entity type 'quota_definition'. Stack: ', 'Error
-    at TestEntityCatalogue.EntityCatalogue.getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/core/entity-catalogue/entity-catalogue.service.ts:119:162)
-    at PaginationMonitorFactory.getEntity [as create] (http://localhost:9876/_karma_webpack_/webpack:/src/shared/monitors/pagination-monitor.factory.ts:21:47)
-    at QuotaDefinitionFormComponent.create [as fetchQuotasDefinitions] (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts:75:62)
-    at QuotaDefinitionFormComponent.fetchQuotasDefinitions [as ngOnInit] (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts:51:14)
-    at checkAndUpdateDirectiveInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-    at checkAndUpdateNodeInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-    at checkAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-    at debugCheckAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-    at debugCheckDirectivesFn (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateQuotaStepComponent.ngfactory.js:16:5)'
-WARN: 'Could not find catalogue entity for endpoint type 'cf' and entity type 'quota_definition'. Stack: ', 'Error
-    at TestEntityCatalogue.EntityCatalogue.getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/core/entity-catalogue/entity-catalogue.service.ts:119:162)
-    at PaginationMonitorFactory.getEntity [as create] (http://localhost:9876/_karma_webpack_/webpack:/src/shared/monitors/pagination-monitor.factory.ts:21:47)
-    at QuotaDefinitionFormComponent.create [as fetchQuotasDefinitions] (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts:75:62)
-    at QuotaDefinitionFormComponent.fetchQuotasDefinitions [as ngOnInit] (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts:51:14)
-    at checkAndUpdateDirectiveInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-    at checkAndUpdateNodeInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-    at checkAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-    at debugCheckAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-    at debugCheckDirectivesFn (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateQuotaStepComponent.ngfactory.js:16:5)'
-
-  CreateQuotaStepComponent
-    ✗ should create
-	Error: Could not find catalogue entity for endpoint type 'cf' and entity type 'quota_definition'
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 436453379, rootNodeFlags: 402653185, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: -1, flags: 402653184, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, ngContentIndex: -1, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: null, provider: null, text: null, query: Object({ id: 1, filterId: 2, bindings: [ Object ] }), ngContent: null }), Object({ nodeIndex: 1, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 1, childFlags: 33800195, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 4, bindings: [  ], bindingFlags: 0, outputs: [  ],  ...
-	    at PaginationMonitorFactory.create (src/shared/monitors/pagination-monitor.factory.ts:23:19)
-	    at QuotaDefinitionFormComponent.create [as fetchQuotasDefinitions] (src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts:75:62)
-	    at QuotaDefinitionFormComponent.fetchQuotasDefinitions [as ngOnInit] (src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts:51:14)
-	    at checkAndUpdateDirectiveInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-	    at checkAndUpdateNodeInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-	    at checkAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-	    at debugCheckAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-	    at debugCheckDirectivesFn (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-	    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateQuotaStepComponent.ngfactory.js:16:5)
-	    at Object.debugUpdateDirectives [as updateDirectives] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23901:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CreateQuotaStepComponent should create FAILED
-	Error: Could not find catalogue entity for endpoint type 'cf' and entity type 'quota_definition'
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 436453379, rootNodeFlags: 402653185, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: -1, flags: 402653184, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, ngContentIndex: -1, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: null, provider: null, text: null, query: Object({ id: 1, filterId: 2, bindings: [ Object ] }), ngContent: null }), Object({ nodeIndex: 1, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 1, childFlags: 33800195, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 4, bindings: [  ], bindingFlags: 0, outputs: [  ],  ...
-	    at PaginationMonitorFactory.create (src/shared/monitors/pagination-monitor.factory.ts:23:19)
-	    at QuotaDefinitionFormComponent.create [as fetchQuotasDefinitions] (src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts:75:62)
-	    at QuotaDefinitionFormComponent.fetchQuotasDefinitions [as ngOnInit] (src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts:51:14)
-	    at checkAndUpdateDirectiveInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-	    at checkAndUpdateNodeInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-	    at checkAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-	    at debugCheckAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-	    at debugCheckDirectivesFn (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-	    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateQuotaStepComponent.ngfactory.js:16:5)
-	    at Object.debugUpdateDirectives [as updateDirectives] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23901:1)
-WARN LOG: 'Could not find catalogue entity for endpoint type 'cf' and entity type 'space_quota_definition'. Stack: ', 'Error
-    at TestEntityCatalogue.EntityCatalogue.getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/core/entity-catalogue/entity-catalogue.service.ts:119:162)
-    at PaginationMonitorFactory.getEntity [as create] (http://localhost:9876/_karma_webpack_/webpack:/src/shared/monitors/pagination-monitor.factory.ts:21:47)
-    at SpaceQuotaDefinitionFormComponent.create [as fetchQuotasDefinitions] (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts:75:62)
-    at SpaceQuotaDefinitionFormComponent.fetchQuotasDefinitions [as ngOnInit] (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts:52:14)
-    at checkAndUpdateDirectiveInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-    at checkAndUpdateNodeInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-    at checkAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-    at debugCheckAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-    at debugCheckDirectivesFn (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateSpaceQuotaStepComponent.ngfactory.js:16:5)'
-WARN: 'Could not find catalogue entity for endpoint type 'cf' and entity type 'space_quota_definition'. Stack: ', 'Error
-    at TestEntityCatalogue.EntityCatalogue.getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/core/entity-catalogue/entity-catalogue.service.ts:119:162)
-    at PaginationMonitorFactory.getEntity [as create] (http://localhost:9876/_karma_webpack_/webpack:/src/shared/monitors/pagination-monitor.factory.ts:21:47)
-    at SpaceQuotaDefinitionFormComponent.create [as fetchQuotasDefinitions] (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts:75:62)
-    at SpaceQuotaDefinitionFormComponent.fetchQuotasDefinitions [as ngOnInit] (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts:52:14)
-    at checkAndUpdateDirectiveInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-    at checkAndUpdateNodeInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-    at checkAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-    at debugCheckAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-    at debugCheckDirectivesFn (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateSpaceQuotaStepComponent.ngfactory.js:16:5)'
-WARN: 'Could not find catalogue entity for endpoint type 'cf' and entity type 'space_quota_definition'. Stack: ', 'Error
-    at TestEntityCatalogue.EntityCatalogue.getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/core/entity-catalogue/entity-catalogue.service.ts:119:162)
-    at PaginationMonitorFactory.getEntity [as create] (http://localhost:9876/_karma_webpack_/webpack:/src/shared/monitors/pagination-monitor.factory.ts:21:47)
-    at SpaceQuotaDefinitionFormComponent.create [as fetchQuotasDefinitions] (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts:75:62)
-    at SpaceQuotaDefinitionFormComponent.fetchQuotasDefinitions [as ngOnInit] (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts:52:14)
-    at checkAndUpdateDirectiveInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-    at checkAndUpdateNodeInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-    at checkAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-    at debugCheckAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-    at debugCheckDirectivesFn (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateSpaceQuotaStepComponent.ngfactory.js:16:5)'
-
-  AddSpaceQuotaComponent
-    ✗ should create
-	Error: Could not find catalogue entity for endpoint type 'cf' and entity type 'space_quota_definition'
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 436453379, rootNodeFlags: 402653185, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: -1, flags: 402653184, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, ngContentIndex: -1, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: null, provider: null, text: null, query: Object({ id: 1, filterId: 2, bindings: [ Object ] }), ngContent: null }), Object({ nodeIndex: 1, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 1, childFlags: 33800195, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 4, bindings: [  ], bindingFlags: 0, outputs: [  ],  ...
-	    at PaginationMonitorFactory.create (src/shared/monitors/pagination-monitor.factory.ts:23:19)
-	    at SpaceQuotaDefinitionFormComponent.create [as fetchQuotasDefinitions] (src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts:75:62)
-	    at SpaceQuotaDefinitionFormComponent.fetchQuotasDefinitions [as ngOnInit] (src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts:52:14)
-	    at checkAndUpdateDirectiveInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-	    at checkAndUpdateNodeInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-	    at checkAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-	    at debugCheckAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-	    at debugCheckDirectivesFn (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-	    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateSpaceQuotaStepComponent.ngfactory.js:16:5)
-	    at Object.debugUpdateDirectives [as updateDirectives] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23901:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) AddSpaceQuotaComponent should create FAILED
-	Error: Could not find catalogue entity for endpoint type 'cf' and entity type 'space_quota_definition'
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 436453379, rootNodeFlags: 402653185, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: -1, flags: 402653184, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, ngContentIndex: -1, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: null, provider: null, text: null, query: Object({ id: 1, filterId: 2, bindings: [ Object ] }), ngContent: null }), Object({ nodeIndex: 1, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 1, childFlags: 33800195, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 4, bindings: [  ], bindingFlags: 0, outputs: [  ],  ...
-	    at PaginationMonitorFactory.create (src/shared/monitors/pagination-monitor.factory.ts:23:19)
-	    at SpaceQuotaDefinitionFormComponent.create [as fetchQuotasDefinitions] (src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts:75:62)
-	    at SpaceQuotaDefinitionFormComponent.fetchQuotasDefinitions [as ngOnInit] (src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts:52:14)
-	    at checkAndUpdateDirectiveInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-	    at checkAndUpdateNodeInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-	    at checkAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-	    at debugCheckAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-	    at debugCheckDirectivesFn (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-	    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateSpaceQuotaStepComponent.ngfactory.js:16:5)
-	    at Object.debugUpdateDirectives [as updateDirectives] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23901:1)
-WARN LOG: 'Could not find catalogue entity for endpoint type 'cf' and entity type 'space_quota_definition'. Stack: ', 'Error
-    at TestEntityCatalogue.EntityCatalogue.getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/core/entity-catalogue/entity-catalogue.service.ts:119:162)
-    at PaginationMonitorFactory.getEntity [as create] (http://localhost:9876/_karma_webpack_/webpack:/src/shared/monitors/pagination-monitor.factory.ts:21:47)
-    at SpaceQuotaDefinitionFormComponent.create [as fetchQuotasDefinitions] (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts:75:62)
-    at SpaceQuotaDefinitionFormComponent.fetchQuotasDefinitions [as ngOnInit] (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts:52:14)
-    at checkAndUpdateDirectiveInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-    at checkAndUpdateNodeInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-    at checkAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-    at debugCheckAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-    at debugCheckDirectivesFn (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateSpaceQuotaStepComponent.ngfactory.js:16:5)'
-WARN: 'Could not find catalogue entity for endpoint type 'cf' and entity type 'space_quota_definition'. Stack: ', 'Error
-    at TestEntityCatalogue.EntityCatalogue.getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/core/entity-catalogue/entity-catalogue.service.ts:119:162)
-    at PaginationMonitorFactory.getEntity [as create] (http://localhost:9876/_karma_webpack_/webpack:/src/shared/monitors/pagination-monitor.factory.ts:21:47)
-    at SpaceQuotaDefinitionFormComponent.create [as fetchQuotasDefinitions] (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts:75:62)
-    at SpaceQuotaDefinitionFormComponent.fetchQuotasDefinitions [as ngOnInit] (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts:52:14)
-    at checkAndUpdateDirectiveInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-    at checkAndUpdateNodeInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-    at checkAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-    at debugCheckAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-    at debugCheckDirectivesFn (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateSpaceQuotaStepComponent.ngfactory.js:16:5)'
-WARN: 'Could not find catalogue entity for endpoint type 'cf' and entity type 'space_quota_definition'. Stack: ', 'Error
-    at TestEntityCatalogue.EntityCatalogue.getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/core/entity-catalogue/entity-catalogue.service.ts:119:162)
-    at PaginationMonitorFactory.getEntity [as create] (http://localhost:9876/_karma_webpack_/webpack:/src/shared/monitors/pagination-monitor.factory.ts:21:47)
-    at SpaceQuotaDefinitionFormComponent.create [as fetchQuotasDefinitions] (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts:75:62)
-    at SpaceQuotaDefinitionFormComponent.fetchQuotasDefinitions [as ngOnInit] (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts:52:14)
-    at checkAndUpdateDirectiveInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-    at checkAndUpdateNodeInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-    at checkAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-    at debugCheckAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-    at debugCheckDirectivesFn (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateSpaceQuotaStepComponent.ngfactory.js:16:5)'
-
-  CreateSpaceQuotaStepComponent
-    ✗ should create
-	Error: Could not find catalogue entity for endpoint type 'cf' and entity type 'space_quota_definition'
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 436453379, rootNodeFlags: 402653185, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: -1, flags: 402653184, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, ngContentIndex: -1, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: null, provider: null, text: null, query: Object({ id: 1, filterId: 2, bindings: [ Object ] }), ngContent: null }), Object({ nodeIndex: 1, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 1, childFlags: 33800195, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 4, bindings: [  ], bindingFlags: 0, outputs: [  ],  ...
-	    at PaginationMonitorFactory.create (src/shared/monitors/pagination-monitor.factory.ts:23:19)
-	    at SpaceQuotaDefinitionFormComponent.create [as fetchQuotasDefinitions] (src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts:75:62)
-	    at SpaceQuotaDefinitionFormComponent.fetchQuotasDefinitions [as ngOnInit] (src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts:52:14)
-	    at checkAndUpdateDirectiveInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-	    at checkAndUpdateNodeInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-	    at checkAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-	    at debugCheckAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-	    at debugCheckDirectivesFn (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-	    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateSpaceQuotaStepComponent.ngfactory.js:16:5)
-	    at Object.debugUpdateDirectives [as updateDirectives] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23901:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CreateSpaceQuotaStepComponent should create FAILED
-	Error: Could not find catalogue entity for endpoint type 'cf' and entity type 'space_quota_definition'
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 436453379, rootNodeFlags: 402653185, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: -1, flags: 402653184, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, ngContentIndex: -1, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: null, provider: null, text: null, query: Object({ id: 1, filterId: 2, bindings: [ Object ] }), ngContent: null }), Object({ nodeIndex: 1, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 1, childFlags: 33800195, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 4, bindings: [  ], bindingFlags: 0, outputs: [  ],  ...
-	    at PaginationMonitorFactory.create (src/shared/monitors/pagination-monitor.factory.ts:23:19)
-	    at SpaceQuotaDefinitionFormComponent.create [as fetchQuotasDefinitions] (src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts:75:62)
-	    at SpaceQuotaDefinitionFormComponent.fetchQuotasDefinitions [as ngOnInit] (src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts:52:14)
-	    at checkAndUpdateDirectiveInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-	    at checkAndUpdateNodeInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-	    at checkAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-	    at debugCheckAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-	    at debugCheckDirectivesFn (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-	    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateSpaceQuotaStepComponent.ngfactory.js:16:5)
-	    at Object.debugUpdateDirectives [as updateDirectives] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23901:1)
-
-  EditQuotaStepComponent
-    ✗ should create
-	TypeError: Cannot read property 'entityGuid' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33735681, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 181248, directChildFlags: 181248, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-edit-quota-step', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0, ou ...
-	    at <Jasmine>
-	    at EntityServiceFactory.entityGuid [as isConfig] (src/core/entity-service-factory.service.ts:25:25)
-	    at EntityServiceFactory.isConfig [as create] (src/core/entity-service-factory.service.ts:32:29)
-	    at EditQuotaStepComponent.create [as fetchQuotaDefinition] (src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts:44:59)
-	    at new fetchQuotaDefinition (src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts:40:14)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22150:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-	    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-	    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts:28:23)
-	    at ZoneDelegate.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/proxy.js:129:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) EditQuotaStepComponent should create FAILED
-	TypeError: Cannot read property 'entityGuid' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33735681, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 181248, directChildFlags: 181248, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-edit-quota-step', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0, ou ...
-	    at <Jasmine>
-	    at EntityServiceFactory.entityGuid [as isConfig] (src/core/entity-service-factory.service.ts:25:25)
-	    at EntityServiceFactory.isConfig [as create] (src/core/entity-service-factory.service.ts:32:29)
-	    at EditQuotaStepComponent.create [as fetchQuotaDefinition] (src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts:44:59)
-	    at new fetchQuotaDefinition (src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts:40:14)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22150:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-	    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-	    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts:28:23)
-	    at ZoneDelegate.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/proxy.js:129:1)
-
-  EditQuotaComponent
-    ✗ should create
-	TypeError: Cannot read property 'entityGuid' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 643024387, rootNodeFlags: 1, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643024387, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 12, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'div', attrs: [ Array ], template: null, componentProvider: null, componentView: null, componentRendererType: null, publicProviders: null({  }), allProviders: null({  }), handleEvent: Function }), provider: null, text: null, query: null, ngContent: null }), Object({ nodeIndex: 1, parent: Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643024387, directChildFlags:  ...
-	    at <Jasmine>
-	    at EntityServiceFactory.entityGuid [as isConfig] (src/core/entity-service-factory.service.ts:25:25)
-	    at EntityServiceFactory.isConfig [as create] (src/core/entity-service-factory.service.ts:32:29)
-	    at EditQuotaStepComponent.create [as fetchQuotaDefinition] (src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts:44:59)
-	    at new fetchQuotaDefinition (src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts:40:14)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22150:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at callViewAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23561:1)
-	    at execComponentViewsAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23480:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23273:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/edit-quota/edit-quota.component.spec.ts:29:23)
-	    at ZoneDelegate.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/proxy.js:129:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) EditQuotaComponent should create FAILED
-	TypeError: Cannot read property 'entityGuid' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 643024387, rootNodeFlags: 1, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643024387, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 12, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'div', attrs: [ Array ], template: null, componentProvider: null, componentView: null, componentRendererType: null, publicProviders: null({  }), allProviders: null({  }), handleEvent: Function }), provider: null, text: null, query: null, ngContent: null }), Object({ nodeIndex: 1, parent: Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643024387, directChildFlags:  ...
-	    at <Jasmine>
-	    at EntityServiceFactory.entityGuid [as isConfig] (src/core/entity-service-factory.service.ts:25:25)
-	    at EntityServiceFactory.isConfig [as create] (src/core/entity-service-factory.service.ts:32:29)
-	    at EditQuotaStepComponent.create [as fetchQuotaDefinition] (src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts:44:59)
-	    at new fetchQuotaDefinition (src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts:40:14)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22150:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at callViewAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23561:1)
-	    at execComponentViewsAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23480:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23273:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/edit-quota/edit-quota.component.spec.ts:29:23)
-	    at ZoneDelegate.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/proxy.js:129:1)
-
-  EditSpaceQuotaStepComponent
-    ✗ should create
-	TypeError: Cannot read property 'entityGuid' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33734657, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 180224, directChildFlags: 180224, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-edit-space-quota-step', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0,  ...
-	    at <Jasmine>
-	    at EntityServiceFactory.entityGuid [as isConfig] (src/core/entity-service-factory.service.ts:25:25)
-	    at EntityServiceFactory.isConfig [as create] (src/core/entity-service-factory.service.ts:32:29)
-	    at EditSpaceQuotaStepComponent.create [as fetchQuotaDefinition] (src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts:42:64)
-	    at new fetchQuotaDefinition (src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts:38:14)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22144:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-	    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-	    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts:30:23)
-	    at ZoneDelegate.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/proxy.js:129:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) EditSpaceQuotaStepComponent should create FAILED
-	TypeError: Cannot read property 'entityGuid' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33734657, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 180224, directChildFlags: 180224, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-edit-space-quota-step', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0,  ...
-	    at <Jasmine>
-	    at EntityServiceFactory.entityGuid [as isConfig] (src/core/entity-service-factory.service.ts:25:25)
-	    at EntityServiceFactory.isConfig [as create] (src/core/entity-service-factory.service.ts:32:29)
-	    at EditSpaceQuotaStepComponent.create [as fetchQuotaDefinition] (src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts:42:64)
-	    at new fetchQuotaDefinition (src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts:38:14)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22144:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-	    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-	    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts:30:23)
-	    at ZoneDelegate.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/proxy.js:129:1)
-
-  EditSpaceQuotaComponent
-    ✗ should create
-	TypeError: Cannot read property 'entityGuid' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 643023363, rootNodeFlags: 1, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643023363, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 11, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'div', attrs: [ Array ], template: null, componentProvider: null, componentView: null, componentRendererType: null, publicProviders: null({  }), allProviders: null({  }), handleEvent: Function }), provider: null, text: null, query: null, ngContent: null }), Object({ nodeIndex: 1, parent: Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643023363, directChildFlags:  ...
-	    at <Jasmine>
-	    at EntityServiceFactory.entityGuid [as isConfig] (src/core/entity-service-factory.service.ts:25:25)
-	    at EntityServiceFactory.isConfig [as create] (src/core/entity-service-factory.service.ts:32:29)
-	    at EditSpaceQuotaStepComponent.create [as fetchQuotaDefinition] (src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts:42:64)
-	    at new fetchQuotaDefinition (src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts:38:14)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22144:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at callViewAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23561:1)
-	    at execComponentViewsAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23480:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23273:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.spec.ts:29:23)
-	    at ZoneDelegate.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/proxy.js:129:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) EditSpaceQuotaComponent should create FAILED
-	TypeError: Cannot read property 'entityGuid' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 643023363, rootNodeFlags: 1, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643023363, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 11, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'div', attrs: [ Array ], template: null, componentProvider: null, componentView: null, componentRendererType: null, publicProviders: null({  }), allProviders: null({  }), handleEvent: Function }), provider: null, text: null, query: null, ngContent: null }), Object({ nodeIndex: 1, parent: Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643023363, directChildFlags:  ...
-	    at <Jasmine>
-	    at EntityServiceFactory.entityGuid [as isConfig] (src/core/entity-service-factory.service.ts:25:25)
-	    at EntityServiceFactory.isConfig [as create] (src/core/entity-service-factory.service.ts:32:29)
-	    at EditSpaceQuotaStepComponent.create [as fetchQuotaDefinition] (src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts:42:64)
-	    at new fetchQuotaDefinition (src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts:38:14)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22144:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at callViewAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23561:1)
-	    at execComponentViewsAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23480:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23273:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.spec.ts:29:23)
-	    at ZoneDelegate.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/proxy.js:129:1)
-
-  CloudFoundryOrganizationSpaceQuotasComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33608193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 53760, directChildFlags: 53760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-organization-space-quotas', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQu ...
-	    at NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.spec.ts:35:23)
-	    at ZoneDelegate.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/proxy.js:129:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CloudFoundryOrganizationSpaceQuotasComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33608193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 53760, directChildFlags: 53760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-organization-space-quotas', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQu ...
-	    at NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.spec.ts:35:23)
-	    at ZoneDelegate.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/proxy.js:129:1)
-
-  CloudFoundryQuotasComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33608193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 53760, directChildFlags: 53760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-quotas', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references:  ...
-	    at NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.spec.ts:35:23)
-	    at ZoneDelegate.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/proxy.js:129:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CloudFoundryQuotasComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33608193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 53760, directChildFlags: 53760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-quotas', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references:  ...
-	    at NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.spec.ts:35:23)
-	    at ZoneDelegate.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/proxy.js:129:1)
-06 09 2019 10:58:14.032:WARN [web-server]: 404: /core/assets/nav-logo.png
-
-  DashboardBaseComponent
-    ✓ should be created
-
-  PageSideNavComponent
-    ✓ should create
-
-  SideNavComponent
-    ✓ should be created
-
-  CreateEndpointBaseStepComponent
-    ✓ should create
-06 09 2019 10:58:16.836:WARN [web-server]: 404: /core/assets/endpoint-icons/metrics.svg
-
-  CreateEndpointConnectComponent
-    ✓ should create
-
-  EndpointsPageComponent
-    ✓ should be created
-
-  EventsPageComponent
-    ✓ should create
-
-  HomePageComponent
-    ✓ should be created
-
-  LoginPageComponent
-    ✓ should be created
-06 09 2019 10:58:26.676:WARN [web-server]: 404: /core/assets/logo.png
-06 09 2019 10:58:28.603:WARN [web-server]: 404: /core/assets/login-bg.jpg
-
-  NoEndpointsNonAdminComponent
-    ✓ should be created
-
-  DomainMismatchComponent
-    ✓ should create
-06 09 2019 10:58:28.952:WARN [web-server]: 404: /core/assets/logo.png
-
-  ConsoleUaaWizardComponent
-    ✓ should be created
-06 09 2019 10:58:31.054:WARN [web-server]: 404: /core/assets/logo.png
-
-  UpgradePageComponent
-    ✓ should create
-06 09 2019 10:58:31.749:WARN [web-server]: 404: /core/assets/logo.png
-
-  EditProfileInfoComponent
-    ✓ should create
-
-  ProfileInfoComponent
-    ✓ should create
-
-  LoggedInService
-    ✓ should be created
-
-  AppNameUniqueDirective
-    ✓ should create an instance
-
-  AppActionMonitorIconComponent
-    ✓ should create
-
-  AppActionMonitorComponent
-    ✓ should create
-
-  ApplicationStateIconComponent
-    ✓ should be created
-
-  ApplicationStateIconPipe
-    ✓ create an instance
-
-  ApplicationStateComponent
-    ✓ should be created
-
-  ApplicationStateService
-    ✓ should be created
-    check friendly names and indicators
-      ✓ Busted push
-      ✓ Updating app
-      ✓ Incomplete app
-      ✓ User stopped app
-      ✓ Incomplete
-      ✓ During push
-      ✓ After successful push
-      ✓ Starting
-      ✓ Running!
-      ✓ Borked, usually due to app code
-      ✓ Borked, usually due to starting timeouts
-      ✓ Borked, usually due to starting timeouts (1)
-      ✓ Borked, usually due to platform issues
-      ✓ Borked, usually due to platform issues (2)
-      ✓ Borked, one crashed, one running, one stating
-      ✓ Started, but no stats available
-      ✓ Started, but have instance counf set to 0
-
-  BooleanIndicatorComponent
-    ✓ should create
-
-  BreadcrumbsComponent
-    ✓ should create
-
-  CardBooleanMetricComponent
-    ✓ should create
-
-  CardNumberMetricComponent
-    ✓ should create
-
-  CardStatusComponent
-    ✓ should create
-
-  CfAuthService
-    ✓ should be created
-
-  AppChipsComponent
-    ✓ should create
-
-  CodeBlockComponent
-    ✓ should be created
-
-  ConfirmationDialogService
-    ✓ should be created
-
-  DateTimeComponent
-    ✓ should create
-
-  DetailsCardComponent
-    ✓ should be created
-
-  DialogConfirmComponent
-    ✓ should create
-
-  DialogErrorComponent
-    ✓ should be created
-
-  DisplayValueComponent
-    ✓ should be created
-
-  EditableDisplayValueComponent
-    ✓ should be created
-
-  EndpointsMissingComponent
-    ✓ should be created
-
-  EntitySummaryTitleComponent
-    ✓ should create
-
-  EnumerateComponent
-    ✓ should create
-
-  EnvVarViewComponent
-    ✓ should create
-
-  ExtensionButtonsComponent
-    ✓ should create
-
-  FavoritesEntityListComponent
-    ✓ should create
-
-  FavoritesGlobalListComponent
-    ✓ should create
-
-  FavoritesMetaCardComponent
-    ✓ should create
-
-  FileInputComponent
-    ✓ should create
-
-  FocusDirective
-    ✓ should create an instance
-
-  GithubCommitAuthorComponent
-    ✓ should create
-
-  IntroScreenComponent
-    ✓ should create
-
-  LocalListController
-    ✓ should get correct start index 1
-    ✓ should get correct start index 2
-    ✓ should get correct start index 3
-    ✓ should get correct start index 4
-    ✓ should get split pages
-    ✓ should get split pages 1
-    ✓ should get split pages 2
-    ✓ should get split pages 3
-    ✓ should get split pages 4
-    ✓ should get split pages 5
-06 09 2019 10:59:07.301:WARN [web-server]: 404: /core/assets/login-bg.jpg
-
-  CardComponent
-    ✓ should be created
-
-  CardsComponent
-    ✓ should be created
-
-  MetaCardComponent
-    ✓ should create
-
-  MetaCardItemComponent
-    ✓ should create
-
-  MetaCardKeyComponent
-    ✓ should create
-
-  MetaCardTitleComponent
-    ✓ should create
-
-  MetaCardValueComponent
-    ✓ should create
-
-  TableCellActionsComponent
-    ✓ should be created
-
-  TableCellBooleanIndicatorComponent
-    ✓ should create
-
-  TableCellEditComponent
-    ✓ should be created
-
-  TableCellFavoriteComponent
-    ✓ should create
-
-  TableCellRadioComponent
-    ✓ should create
-
-  TableCellRequestMonitorIconComponent
-    ✓ should create
-
-  TableCellSelectComponent
-    ✓ should be created
-
-  TableCellStatusDirective
-    ✓ should create an instance
-
-  TableCellComponent
-    ✓ should be created
-
-  TableHeaderSelectComponent
-    ✓ should be created
-
-  TableRowStateManager
-    ✓ should init the state
-    ✓ should update the row state
-    ✓ should update the state
-    ✓ should set the state
-    ✓ should set the row state
-
-  TableRowComponent
-    ✓ should create
-    ✓ should show error
-
-  TableComponent
-    ✓ should be created
-    ✓ should get base column ids
-    ✓ should get base column ids + selection
-    ✓ should get base column ids + actions
-    ✓ should get base column ids + actions + selection
-WARN LOG: 'Could not find catalogue entity for endpoint type 'cf' and entity type 'quota_definition'. Stack: ', 'Error
-    at TestEntityCatalogue.EntityCatalogue.getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/core/entity-catalogue/entity-catalogue.service.ts:119:162)
-    at new getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/shared/monitors/pagination-monitor.ts:50:47)
-    at CfQuotasDataSourceService.ListDataSource [as constructor] (http://localhost:9876/_karma_webpack_/webpack:/src/shared/components/list/data-sources-controllers/list-data-source.ts:78:33)
-    at new call (http://localhost:9876/_karma_webpack_/webpack:/src/shared/components/list/list-types/cf-quotas/cf-quotas-data-source.service.ts:30:24)
-    at new CfQuotasListConfigService (http://localhost:9876/_karma_webpack_/webpack:/src/shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service.ts:115:28)
-    at _createClass (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21263:1)
-    at _createProviderInstance (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-    at resolveNgModuleDep (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-    at NgModuleRef_.get (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at TestBedViewEngine.get (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)'
-WARN: 'Could not find catalogue entity for endpoint type 'cf' and entity type 'quota_definition'. Stack: ', 'Error
-    at TestEntityCatalogue.EntityCatalogue.getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/core/entity-catalogue/entity-catalogue.service.ts:119:162)
-    at new getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/shared/monitors/pagination-monitor.ts:50:47)
-    at CfQuotasDataSourceService.ListDataSource [as constructor] (http://localhost:9876/_karma_webpack_/webpack:/src/shared/components/list/data-sources-controllers/list-data-source.ts:78:33)
-    at new call (http://localhost:9876/_karma_webpack_/webpack:/src/shared/components/list/list-types/cf-quotas/cf-quotas-data-source.service.ts:30:24)
-    at new CfQuotasListConfigService (http://localhost:9876/_karma_webpack_/webpack:/src/shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service.ts:115:28)
-    at _createClass (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21263:1)
-    at _createProviderInstance (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-    at resolveNgModuleDep (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-    at NgModuleRef_.get (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at TestBedViewEngine.get (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)'
-WARN: 'Could not find catalogue entity for endpoint type 'cf' and entity type 'quota_definition'. Stack: ', 'Error
-    at TestEntityCatalogue.EntityCatalogue.getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/core/entity-catalogue/entity-catalogue.service.ts:119:162)
-    at new getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/shared/monitors/pagination-monitor.ts:50:47)
-    at CfQuotasDataSourceService.ListDataSource [as constructor] (http://localhost:9876/_karma_webpack_/webpack:/src/shared/components/list/data-sources-controllers/list-data-source.ts:78:33)
-    at new call (http://localhost:9876/_karma_webpack_/webpack:/src/shared/components/list/list-types/cf-quotas/cf-quotas-data-source.service.ts:30:24)
-    at new CfQuotasListConfigService (http://localhost:9876/_karma_webpack_/webpack:/src/shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service.ts:115:28)
-    at _createClass (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21263:1)
-    at _createProviderInstance (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-    at resolveNgModuleDep (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-    at NgModuleRef_.get (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at TestBedViewEngine.get (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)'
-
-  CfQuotasListConfigService
-    ✗ should be created
-	Error: Could not find catalogue entity for endpoint type 'cf' and entity type 'quota_definition'
-	    at new PaginationMonitor (src/shared/monitors/pagination-monitor.ts:52:19)
-	    at CfQuotasDataSourceService.ListDataSource [as constructor] (src/shared/components/list/data-sources-controllers/list-data-source.ts:78:33)
-	    at new call (src/shared/components/list/list-types/cf-quotas/cf-quotas-data-source.service.ts:30:24)
-	    at new CfQuotasListConfigService (src/shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service.ts:115:28)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21263:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-	    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-
-Chrome 76.0.3809 (Linux 0.0.0) CfQuotasListConfigService should be created FAILED
-	Error: Could not find catalogue entity for endpoint type 'cf' and entity type 'quota_definition'
-	    at new PaginationMonitor (src/shared/monitors/pagination-monitor.ts:52:19)
-	    at CfQuotasDataSourceService.ListDataSource [as constructor] (src/shared/components/list/data-sources-controllers/list-data-source.ts:78:33)
-	    at new call (src/shared/components/list/list-types/cf-quotas/cf-quotas-data-source.service.ts:30:24)
-	    at new CfQuotasListConfigService (src/shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service.ts:115:28)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21263:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-	    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-
-  TableCellQuotaComponent
-    ✓ should create
-WARN LOG: 'Could not find catalogue entity for endpoint type 'cf' and entity type 'space_quota_definition'. Stack: ', 'Error
-    at TestEntityCatalogue.EntityCatalogue.getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/core/entity-catalogue/entity-catalogue.service.ts:119:162)
-    at new getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/shared/monitors/pagination-monitor.ts:50:47)
-    at CfOrgSpaceQuotasDataSourceService.ListDataSource [as constructor] (http://localhost:9876/_karma_webpack_/webpack:/src/shared/components/list/data-sources-controllers/list-data-source.ts:78:33)
-    at new call (http://localhost:9876/_karma_webpack_/webpack:/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-data-source.service.ts:30:24)
-    at new CfSpaceQuotasListConfigService (http://localhost:9876/_karma_webpack_/webpack:/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.ts:119:28)
-    at _createClass (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21263:1)
-    at _createProviderInstance (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-    at resolveNgModuleDep (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-    at NgModuleRef_.get (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at TestBedViewEngine.get (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)'
-WARN: 'Could not find catalogue entity for endpoint type 'cf' and entity type 'space_quota_definition'. Stack: ', 'Error
-    at TestEntityCatalogue.EntityCatalogue.getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/core/entity-catalogue/entity-catalogue.service.ts:119:162)
-    at new getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/shared/monitors/pagination-monitor.ts:50:47)
-    at CfOrgSpaceQuotasDataSourceService.ListDataSource [as constructor] (http://localhost:9876/_karma_webpack_/webpack:/src/shared/components/list/data-sources-controllers/list-data-source.ts:78:33)
-    at new call (http://localhost:9876/_karma_webpack_/webpack:/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-data-source.service.ts:30:24)
-    at new CfSpaceQuotasListConfigService (http://localhost:9876/_karma_webpack_/webpack:/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.ts:119:28)
-    at _createClass (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21263:1)
-    at _createProviderInstance (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-    at resolveNgModuleDep (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-    at NgModuleRef_.get (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at TestBedViewEngine.get (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)'
-WARN: 'Could not find catalogue entity for endpoint type 'cf' and entity type 'space_quota_definition'. Stack: ', 'Error
-    at TestEntityCatalogue.EntityCatalogue.getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/core/entity-catalogue/entity-catalogue.service.ts:119:162)
-    at new getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/shared/monitors/pagination-monitor.ts:50:47)
-    at CfOrgSpaceQuotasDataSourceService.ListDataSource [as constructor] (http://localhost:9876/_karma_webpack_/webpack:/src/shared/components/list/data-sources-controllers/list-data-source.ts:78:33)
-    at new call (http://localhost:9876/_karma_webpack_/webpack:/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-data-source.service.ts:30:24)
-    at new CfSpaceQuotasListConfigService (http://localhost:9876/_karma_webpack_/webpack:/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.ts:119:28)
-    at _createClass (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21263:1)
-    at _createProviderInstance (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-    at resolveNgModuleDep (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-    at NgModuleRef_.get (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at TestBedViewEngine.get (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)'
-
-  CfSpaceQuotasListConfigService
-    ✗ should be created
-	Error: Could not find catalogue entity for endpoint type 'cf' and entity type 'space_quota_definition'
-	    at new PaginationMonitor (src/shared/monitors/pagination-monitor.ts:52:19)
-	    at CfOrgSpaceQuotasDataSourceService.ListDataSource [as constructor] (src/shared/components/list/data-sources-controllers/list-data-source.ts:78:33)
-	    at new call (src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-data-source.service.ts:30:24)
-	    at new CfSpaceQuotasListConfigService (src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.ts:119:28)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21263:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-	    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-
-Chrome 76.0.3809 (Linux 0.0.0) CfSpaceQuotasListConfigService should be created FAILED
-	Error: Could not find catalogue entity for endpoint type 'cf' and entity type 'space_quota_definition'
-	    at new PaginationMonitor (src/shared/monitors/pagination-monitor.ts:52:19)
-	    at CfOrgSpaceQuotasDataSourceService.ListDataSource [as constructor] (src/shared/components/list/data-sources-controllers/list-data-source.ts:78:33)
-	    at new call (src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-data-source.service.ts:30:24)
-	    at new CfSpaceQuotasListConfigService (src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.ts:119:28)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21263:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-	    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-
-  EndpointCardComponent
-    ✓ should create
-06 09 2019 10:59:42.375:WARN [web-server]: 404: /core/assets/endpoint-icons/metrics.svg
-
-  EndpointsListConfigService
-    ✓ should be created
-
-  TableCellEndpointDetailsComponent
-    ✓ should create
-
-  TableCellEndpointNameComponent
-    ✗ should create
-	TypeError: Cannot read property 'entityGuid' of undefined
-	    at <Jasmine>
-	    at EntityServiceFactory.entityGuid [as isConfig] (src/core/entity-service-factory.service.ts:25:25)
-	    at EntityServiceFactory.isConfig [as create] (src/core/entity-service-factory.service.ts:32:29)
-	    at TableCellEndpointNameComponent.create [as row] (src/shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component.ts:41:56)
-	    at UserContext.<anonymous> (src/shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component.spec.ts:30:18)
-	    at ZoneDelegate.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/proxy.js:129:1)
-	    at ZoneDelegate.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:390:1)
-	    at Zone.../../../../node_modules/zone.js/dist/zone.js.Zone.run (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:150:1)
-	    at runInTestZone (home/kater/dev/git/stratos/node_modules/zone.js/dist/jasmine-patch.js:145:1)
-	    at UserContext.<anonymous> (home/kater/dev/git/stratos/node_modules/zone.js/dist/jasmine-patch.js:160:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) TableCellEndpointNameComponent should create FAILED
-	TypeError: Cannot read property 'entityGuid' of undefined
-	    at <Jasmine>
-	    at EntityServiceFactory.entityGuid [as isConfig] (src/core/entity-service-factory.service.ts:25:25)
-	    at EntityServiceFactory.isConfig [as create] (src/core/entity-service-factory.service.ts:32:29)
-	    at TableCellEndpointNameComponent.create [as row] (src/shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component.ts:41:56)
-	    at UserContext.<anonymous> (src/shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component.spec.ts:30:18)
-	    at ZoneDelegate.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/proxy.js:129:1)
-	    at ZoneDelegate.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:390:1)
-	    at Zone.../../../../node_modules/zone.js/dist/zone.js.Zone.run (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:150:1)
-	    at runInTestZone (home/kater/dev/git/stratos/node_modules/zone.js/dist/jasmine-patch.js:145:1)
-	    at UserContext.<anonymous> (home/kater/dev/git/stratos/node_modules/zone.js/dist/jasmine-patch.js:160:1)
-WARN LOG: 'Could not find catalogue entity for endpoint type 'null' and entity type 'null'. Stack: ', 'Error
-    at TestEntityCatalogue.EntityCatalogue.getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/core/entity-catalogue/entity-catalogue.service.ts:119:162)
-    at TestEntityCatalogue.getEntity [as getEndpoint] (http://localhost:9876/_karma_webpack_/webpack:/src/core/entity-catalogue/entity-catalogue.service.ts:131:21)
-    at TableCellEndpointStatusComponent.getEndpoint [as ngOnInit] (http://localhost:9876/_karma_webpack_/webpack:/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component.ts:37:34)
-    at checkAndUpdateDirectiveInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-    at checkAndUpdateNodeInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-    at checkAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-    at debugCheckAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-    at debugCheckDirectivesFn (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/TableCellEndpointStatusComponent_Host.ngfactory.js:9:5)
-    at Object.debugUpdateDirectives [as updateDirectives] (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23901:1)'
-WARN: 'Could not find catalogue entity for endpoint type 'null' and entity type 'null'. Stack: ', 'Error
-    at TestEntityCatalogue.EntityCatalogue.getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/core/entity-catalogue/entity-catalogue.service.ts:119:162)
-    at TestEntityCatalogue.getEntity [as getEndpoint] (http://localhost:9876/_karma_webpack_/webpack:/src/core/entity-catalogue/entity-catalogue.service.ts:131:21)
-    at TableCellEndpointStatusComponent.getEndpoint [as ngOnInit] (http://localhost:9876/_karma_webpack_/webpack:/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component.ts:37:34)
-    at checkAndUpdateDirectiveInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-    at checkAndUpdateNodeInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-    at checkAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-    at debugCheckAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-    at debugCheckDirectivesFn (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/TableCellEndpointStatusComponent_Host.ngfactory.js:9:5)
-    at Object.debugUpdateDirectives [as updateDirectives] (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23901:1)'
-WARN: 'Could not find catalogue entity for endpoint type 'null' and entity type 'null'. Stack: ', 'Error
-    at TestEntityCatalogue.EntityCatalogue.getEntity (http://localhost:9876/_karma_webpack_/webpack:/src/core/entity-catalogue/entity-catalogue.service.ts:119:162)
-    at TestEntityCatalogue.getEntity [as getEndpoint] (http://localhost:9876/_karma_webpack_/webpack:/src/core/entity-catalogue/entity-catalogue.service.ts:131:21)
-    at TableCellEndpointStatusComponent.getEndpoint [as ngOnInit] (http://localhost:9876/_karma_webpack_/webpack:/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component.ts:37:34)
-    at checkAndUpdateDirectiveInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-    at checkAndUpdateNodeInline (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-    at checkAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-    at debugCheckAndUpdateNode (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-    at debugCheckDirectivesFn (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/TableCellEndpointStatusComponent_Host.ngfactory.js:9:5)
-    at Object.debugUpdateDirectives [as updateDirectives] (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23901:1)'
-
-  TableCellEndpointStatusComponent
-    ✓ should be created
-
-  GithubCommitsListConfigService
-    ✓ should be created
-
-  TableCellCommitAuthorComponent
-    ✓ should create
-
-  ListComponent
-    basic tests
-      ✓ initialised - default
-      ✓ initialised - custom
-    full test bed
-      ✓ should be created
-      Header
-        ✓ Nothing enabled
-        ✓ Everything enabled
-        ✓ First filter hidden if only one option
-      ✓ No rows
-
-  LoadingPageComponent
-    ✓ should be created
-
-  LogViewerComponent
-    ✓ should be created
-    ✓ should add logline from observable
-    ✓ should only allow max rows
-    ✓ should be in high throughput mode
-
-  MarkdownPreviewComponent
-    ✓ should create
-
-  MetadataItemComponent
-    ✓ should create
-
-  MetricsParentRangeSelectorComponent
-    ✓ should create
-
-  MetricsRangeSelectorComponent
-    ✓ should create
-
-  MultilineTitleComponent
-    ✓ should create
-
-  NestedTabsComponent
-    ✓ should create
-
-  NoContentMessageComponent
-    ✓ should be created
-
-  PageHeaderEventsComponent
-    ✓ should create
-
-  PageHeaderComponent
-    ✓ should be created
-    ✓ should have 3 breadcrumbs
-    ✓ should have 2 breadcrumb
-
-  ShowPageHeaderComponent
-    ✓ should create
-
-  PageSubNavSectionComponent
-    ✓ should create
-
-  PageSubNavComponent
-    ✓ should create
-
-  PageSubheaderComponent
-    ✓ should create
-
-  PollingIndicatorComponent
-    ✓ should create
-
-  RecentEntitiesComponent
-    ✓ should create
-
-  RingChartComponent
-    ✓ should create
-
-  RoutingIndicatorComponent
-    ✓ should create
-
-  SimpleUsageChartComponent
-    ✓ should create
-
-  SnackBarReturnComponent
-    ✓ should create
-
-  SshViewerComponent
-    ✓ should create
-
-  StackedInputActionComponent
-    ✓ should create
-
-  StackedInputActionsComponent
-    ✓ should create
-
-  StartEndDateComponent
-    ✓ should create
-
-  StepComponent
-    ✓ should be created
-
-  StepperFormComponent
-    ✓ should be created
-
-  SteppersService
-    ✓ should be created
-
-  SteppersComponent
-    ✓ should be created
-
-  StratosTitleComponent
-    ✓ should create
-06 09 2019 11:00:26.814:WARN [web-server]: 404: /core/assets/logo.png
-
-  TileSelectorComponent
-    ✓ should create
-
-  TileGridComponent
-    ✓ should create
-
-  TileGroupComponent
-    ✓ should create
-
-  TileComponent
-    ✓ should create
-
-  UniqueDirective
-    ✓ should create an instance
-
-  UnlimitedInputComponent
-    ✓ should create
-
-  UploadProgressIndicatorComponent
-    ✓ should create
-
-  UsageGaugeComponent
-    ✓ should create
-
-  UserProfileBannerComponent
-    ✓ should create
-
-  GlobalEventsService
-    ✓ should be created
-
-  EntityMonitor
-    ✓ should be created
-
-  InternalEventMonitorFactory
-    ✓ should be created
-
-  PaginationMonitorFactoryService
-    ✓ should be created
-
-  MbToHumanSizePipe
-    ✓ create an instance
-
-  MetricsRangeSelectorManagerService
-    ✓ should be created
-
-  MetricsRangeSelectorService
-    ✓ should be created
-
-  UserPermissionDirective
-    ✓ should create an instance
-TOTAL: 16 FAILED, 228 SUCCESS
-
-Chrome 76.0.3809 (Linux 0.0.0): Executed 244 of 250 (16 FAILED) (skipped 6) (3 mins 19.901 secs / 3 mins 19.089 secs)
-TOTAL: 16 FAILED, 228 SUCCESS
-
-
-1) should fail new entity
-     EntityServiceService
-     Error: Timeout - Async callback was not invoked within 10000ms (set by jasmine.DEFAULT_TIMEOUT_INTERVAL)
-    at <Jasmine>
-
-2) should fail previously fetched entity
-     EntityServiceService
-     Error: Timeout - Async callback was not invoked within 10000ms (set by jasmine.DEFAULT_TIMEOUT_INTERVAL)
-    at <Jasmine>
-
-3) should set deleted failed
-     EntityServiceService
-     Error: Expected false to equal true.
-    at <Jasmine>
-    at TapSubscriber._tapNext (src/core/entity-service.spec.ts:395:56)
-    at TapSubscriber._next (home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/operators/tap.js:45:1)
-    at TapSubscriber.Subscriber.next (home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/Subscriber.js:53:1)
-
-4) should create
-     AddQuotaComponent
-     Error: Could not find catalogue entity for endpoint type 'cf' and entity type 'quota_definition'
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 436453379, rootNodeFlags: 402653185, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: -1, flags: 402653184, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, ngContentIndex: -1, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: null, provider: null, text: null, query: Object({ id: 1, filterId: 2, bindings: [ Object ] }), ngContent: null }), Object({ nodeIndex: 1, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 1, childFlags: 33800195, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 4, bindings: [  ], bindingFlags: 0, outputs: [  ],  ...
-    at PaginationMonitorFactory.create (src/shared/monitors/pagination-monitor.factory.ts:23:19)
-    at QuotaDefinitionFormComponent.create [as fetchQuotasDefinitions] (src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts:75:62)
-    at QuotaDefinitionFormComponent.fetchQuotasDefinitions [as ngOnInit] (src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts:51:14)
-    at checkAndUpdateDirectiveInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-    at checkAndUpdateNodeInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-    at checkAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-    at debugCheckAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-    at debugCheckDirectivesFn (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateQuotaStepComponent.ngfactory.js:16:5)
-    at Object.debugUpdateDirectives [as updateDirectives] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23901:1)
-
-5) should create
-     CreateQuotaStepComponent
-     Error: Could not find catalogue entity for endpoint type 'cf' and entity type 'quota_definition'
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 436453379, rootNodeFlags: 402653185, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: -1, flags: 402653184, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, ngContentIndex: -1, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: null, provider: null, text: null, query: Object({ id: 1, filterId: 2, bindings: [ Object ] }), ngContent: null }), Object({ nodeIndex: 1, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 1, childFlags: 33800195, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 4, bindings: [  ], bindingFlags: 0, outputs: [  ],  ...
-    at PaginationMonitorFactory.create (src/shared/monitors/pagination-monitor.factory.ts:23:19)
-    at QuotaDefinitionFormComponent.create [as fetchQuotasDefinitions] (src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts:75:62)
-    at QuotaDefinitionFormComponent.fetchQuotasDefinitions [as ngOnInit] (src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts:51:14)
-    at checkAndUpdateDirectiveInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-    at checkAndUpdateNodeInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-    at checkAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-    at debugCheckAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-    at debugCheckDirectivesFn (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateQuotaStepComponent.ngfactory.js:16:5)
-    at Object.debugUpdateDirectives [as updateDirectives] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23901:1)
-
-6) should create
-     AddSpaceQuotaComponent
-     Error: Could not find catalogue entity for endpoint type 'cf' and entity type 'space_quota_definition'
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 436453379, rootNodeFlags: 402653185, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: -1, flags: 402653184, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, ngContentIndex: -1, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: null, provider: null, text: null, query: Object({ id: 1, filterId: 2, bindings: [ Object ] }), ngContent: null }), Object({ nodeIndex: 1, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 1, childFlags: 33800195, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 4, bindings: [  ], bindingFlags: 0, outputs: [  ],  ...
-    at PaginationMonitorFactory.create (src/shared/monitors/pagination-monitor.factory.ts:23:19)
-    at SpaceQuotaDefinitionFormComponent.create [as fetchQuotasDefinitions] (src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts:75:62)
-    at SpaceQuotaDefinitionFormComponent.fetchQuotasDefinitions [as ngOnInit] (src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts:52:14)
-    at checkAndUpdateDirectiveInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-    at checkAndUpdateNodeInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-    at checkAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-    at debugCheckAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-    at debugCheckDirectivesFn (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateSpaceQuotaStepComponent.ngfactory.js:16:5)
-    at Object.debugUpdateDirectives [as updateDirectives] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23901:1)
-
-7) should create
-     CreateSpaceQuotaStepComponent
-     Error: Could not find catalogue entity for endpoint type 'cf' and entity type 'space_quota_definition'
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 436453379, rootNodeFlags: 402653185, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: -1, flags: 402653184, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, ngContentIndex: -1, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: null, provider: null, text: null, query: Object({ id: 1, filterId: 2, bindings: [ Object ] }), ngContent: null }), Object({ nodeIndex: 1, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 1, childFlags: 33800195, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 4, bindings: [  ], bindingFlags: 0, outputs: [  ],  ...
-    at PaginationMonitorFactory.create (src/shared/monitors/pagination-monitor.factory.ts:23:19)
-    at SpaceQuotaDefinitionFormComponent.create [as fetchQuotasDefinitions] (src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts:75:62)
-    at SpaceQuotaDefinitionFormComponent.fetchQuotasDefinitions [as ngOnInit] (src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts:52:14)
-    at checkAndUpdateDirectiveInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-    at checkAndUpdateNodeInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-    at checkAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-    at debugCheckAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-    at debugCheckDirectivesFn (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateSpaceQuotaStepComponent.ngfactory.js:16:5)
-    at Object.debugUpdateDirectives [as updateDirectives] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23901:1)
-
-8) should create
-     EditQuotaStepComponent
-     TypeError: Cannot read property 'entityGuid' of undefined
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33735681, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 181248, directChildFlags: 181248, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-edit-quota-step', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0, ou ...
-    at <Jasmine>
-    at EntityServiceFactory.entityGuid [as isConfig] (src/core/entity-service-factory.service.ts:25:25)
-    at EntityServiceFactory.isConfig [as create] (src/core/entity-service-factory.service.ts:32:29)
-    at EditQuotaStepComponent.create [as fetchQuotaDefinition] (src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts:44:59)
-    at new fetchQuotaDefinition (src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts:40:14)
-    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22150:1)
-    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts:28:23)
-    at ZoneDelegate.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/proxy.js:129:1)
-
-9) should create
-     EditQuotaComponent
-     TypeError: Cannot read property 'entityGuid' of undefined
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 643024387, rootNodeFlags: 1, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643024387, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 12, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'div', attrs: [ Array ], template: null, componentProvider: null, componentView: null, componentRendererType: null, publicProviders: null({  }), allProviders: null({  }), handleEvent: Function }), provider: null, text: null, query: null, ngContent: null }), Object({ nodeIndex: 1, parent: Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643024387, directChildFlags:  ...
-    at <Jasmine>
-    at EntityServiceFactory.entityGuid [as isConfig] (src/core/entity-service-factory.service.ts:25:25)
-    at EntityServiceFactory.isConfig [as create] (src/core/entity-service-factory.service.ts:32:29)
-    at EditQuotaStepComponent.create [as fetchQuotaDefinition] (src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts:44:59)
-    at new fetchQuotaDefinition (src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts:40:14)
-    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22150:1)
-    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-    at callViewAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23561:1)
-    at execComponentViewsAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23480:1)
-    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23273:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/edit-quota/edit-quota.component.spec.ts:29:23)
-    at ZoneDelegate.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/proxy.js:129:1)
-
-10) should create
-     EditSpaceQuotaStepComponent
-     TypeError: Cannot read property 'entityGuid' of undefined
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33734657, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 180224, directChildFlags: 180224, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-edit-space-quota-step', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0,  ...
-    at <Jasmine>
-    at EntityServiceFactory.entityGuid [as isConfig] (src/core/entity-service-factory.service.ts:25:25)
-    at EntityServiceFactory.isConfig [as create] (src/core/entity-service-factory.service.ts:32:29)
-    at EditSpaceQuotaStepComponent.create [as fetchQuotaDefinition] (src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts:42:64)
-    at new fetchQuotaDefinition (src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts:38:14)
-    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22144:1)
-    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts:30:23)
-    at ZoneDelegate.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/proxy.js:129:1)
-
-11) should create
-     EditSpaceQuotaComponent
-     TypeError: Cannot read property 'entityGuid' of undefined
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 643023363, rootNodeFlags: 1, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643023363, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 11, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'div', attrs: [ Array ], template: null, componentProvider: null, componentView: null, componentRendererType: null, publicProviders: null({  }), allProviders: null({  }), handleEvent: Function }), provider: null, text: null, query: null, ngContent: null }), Object({ nodeIndex: 1, parent: Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643023363, directChildFlags:  ...
-    at <Jasmine>
-    at EntityServiceFactory.entityGuid [as isConfig] (src/core/entity-service-factory.service.ts:25:25)
-    at EntityServiceFactory.isConfig [as create] (src/core/entity-service-factory.service.ts:32:29)
-    at EditSpaceQuotaStepComponent.create [as fetchQuotaDefinition] (src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts:42:64)
-    at new fetchQuotaDefinition (src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts:38:14)
-    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22144:1)
-    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-    at callViewAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23561:1)
-    at execComponentViewsAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23480:1)
-    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23273:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.spec.ts:29:23)
-    at ZoneDelegate.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/proxy.js:129:1)
-
-12) should create
-     CloudFoundryOrganizationSpaceQuotasComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33608193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 53760, directChildFlags: 53760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-organization-space-quotas', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQu ...
-    at NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.spec.ts:35:23)
-    at ZoneDelegate.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/proxy.js:129:1)
-
-13) should create
-     CloudFoundryQuotasComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33608193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 53760, directChildFlags: 53760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-quotas', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references:  ...
-    at NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.spec.ts:35:23)
-    at ZoneDelegate.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/proxy.js:129:1)
-
-14) should be created
-     CfQuotasListConfigService
-     Error: Could not find catalogue entity for endpoint type 'cf' and entity type 'quota_definition'
-    at new PaginationMonitor (src/shared/monitors/pagination-monitor.ts:52:19)
-    at CfQuotasDataSourceService.ListDataSource [as constructor] (src/shared/components/list/data-sources-controllers/list-data-source.ts:78:33)
-    at new call (src/shared/components/list/list-types/cf-quotas/cf-quotas-data-source.service.ts:30:24)
-    at new CfQuotasListConfigService (src/shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service.ts:115:28)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21263:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-    at NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-
-15) should be created
-     CfSpaceQuotasListConfigService
-     Error: Could not find catalogue entity for endpoint type 'cf' and entity type 'space_quota_definition'
-    at new PaginationMonitor (src/shared/monitors/pagination-monitor.ts:52:19)
-    at CfOrgSpaceQuotasDataSourceService.ListDataSource [as constructor] (src/shared/components/list/data-sources-controllers/list-data-source.ts:78:33)
-    at new call (src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-data-source.service.ts:30:24)
-    at new CfSpaceQuotasListConfigService (src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.ts:119:28)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21263:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-    at NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-
-16) should create
-     TableCellEndpointNameComponent
-     TypeError: Cannot read property 'entityGuid' of undefined
-    at <Jasmine>
-    at EntityServiceFactory.entityGuid [as isConfig] (src/core/entity-service-factory.service.ts:25:25)
-    at EntityServiceFactory.isConfig [as create] (src/core/entity-service-factory.service.ts:32:29)
-    at TableCellEndpointNameComponent.create [as row] (src/shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component.ts:41:56)
-    at UserContext.<anonymous> (src/shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component.spec.ts:30:18)
-    at ZoneDelegate.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/proxy.js:129:1)
-    at ZoneDelegate.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:390:1)
-    at Zone.../../../../node_modules/zone.js/dist/zone.js.Zone.run (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:150:1)
-    at runInTestZone (home/kater/dev/git/stratos/node_modules/zone.js/dist/jasmine-patch.js:145:1)
-    at UserContext.<anonymous> (home/kater/dev/git/stratos/node_modules/zone.js/dist/jasmine-patch.js:160:1)
-
-
-TOTAL: 16 FAILED, 228 SUCCESS
-06 09 2019 11:00:38.782:WARN [launcher]: Chrome was not killed in 2000 ms, sending SIGKILL.
-
-> stratos@2.5.0 test-frontend:store /home/kater/dev/git/stratos
-> ng test store --code-coverage --watch=false
-
-06 09 2019 11:00:52.784:INFO [karma-server]: Karma v4.0.0 server started at http://0.0.0.0:9876/
-06 09 2019 11:00:52.786:INFO [launcher]: Launching browsers Chrome with concurrency unlimited
-06 09 2019 11:00:52.790:INFO [launcher]: Starting browser Chrome
-
-
-
-06 09 2019 11:00:55.387:WARN [launcher]: Chrome was not killed in 2000 ms, sending SIGKILL.
-
-> stratos@2.5.0 test-frontend:cloud-foundry /home/kater/dev/git/stratos
-> ng test cloud-foundry --code-coverage --watch=false
-
-06 09 2019 11:01:18.216:INFO [karma-server]: Karma v4.0.0 server started at http://0.0.0.0:9876/
-06 09 2019 11:01:18.218:INFO [launcher]: Launching browsers Chrome with concurrency unlimited
-06 09 2019 11:01:18.224:INFO [launcher]: Starting browser Chrome
-06 09 2019 11:02:05.440:INFO [Chrome 76.0.3809 (Linux 0.0.0)]: Connected on socket VdYDbE6dtpZqeVFGAAAA with id 91044442
-
-  Entity Relations - populate from parent
-    ✓ No list in parent - no op
-    ✓ List in parent
-
-  Entity Relations - List relations
-    ✓ no relations
-    ✓ relation depth of 2 with relations
-
-  Entity Relations - validate -
-    validate from store - 
-      ✓ Everything missing, nothing required
-      ✓ List missing, list required
-      ✓ List exists, list required
-      ✓ List exists, list not required
-      ✓ Entity Missing, entity required
-      ✓ child has missing required relation
-      ✓ Missing entities has required relations but not allowed to populate missing
-      ✓ Basic no-op
-      ✗ Have missing relation in store, associate it with parent
-	Error: Expected $.apiAction not to have properties
-	    childEntityKey: 'cfQuota_definition'
-	    at <Jasmine>
-	    at src/entity-relations/entity-relations-validate.spec.ts:470:52
-	    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.execute (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1822:1)
-	    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1991:29
-
-Chrome 76.0.3809 (Linux 0.0.0) Entity Relations - validate - validate from store -  Have missing relation in store, associate it with parent FAILED
-	Error: Expected $.apiAction not to have properties
-	    childEntityKey: 'cfQuota_definition'
-	    at <Jasmine>
-	    at src/entity-relations/entity-relations-validate.spec.ts:470:52
-	    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.execute (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1822:1)
-	    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1991:29
-    validate from api response
-      ✓ Everything missing, nothing required
-      ✓ List missing, list required
-      ✓ List exists, list required
-      ✓ List exists, list not required
-      ✓ Entity Missing, entity required
-
-  Entity Relations - Tree
-    ✓ no relations
-    ✓ relation depth of 1, no relations
-    ✓ relation depth of 1 with relations (key)
-    ✓ relation depth of 1 with relations (type)
-    ✓ relation depth of 2 with relations
-    ✓ relation depth of 2 without relations
-
-  ApplicationDeleteComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33608193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 53760, directChildFlags: 53760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-application-delete', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 3, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 3, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/application-delete/application-delete.component.spec.ts:47:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) ApplicationDeleteComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33608193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 53760, directChildFlags: 53760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-application-delete', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 3, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 3, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/application-delete/application-delete.component.spec.ts:47:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  DeleteAppInstancesComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33735169, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 180736, directChildFlags: 180736, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-delete-app-instances', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/application-delete/delete-app-instances/delete-app-instances.component.spec.ts:44:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) DeleteAppInstancesComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33735169, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 180736, directChildFlags: 180736, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-delete-app-instances', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/application-delete/delete-app-instances/delete-app-instances.component.spec.ts:44:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  DeleteAppRoutesComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33735169, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 180736, directChildFlags: 180736, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-delete-app-routes', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/application-delete/delete-app-routes/delete-app-routes.component.spec.ts:45:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) DeleteAppRoutesComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33735169, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 180736, directChildFlags: 180736, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-delete-app-routes', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/application-delete/delete-app-routes/delete-app-routes.component.spec.ts:45:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  ApplicationWallComponent
-    ✗ should be created
-	TypeError: Cannot read property 'paginationKey' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33739265, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 184832, directChildFlags: 184832, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-application-wall', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 3, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 3, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0, o ...
-	    at <Jasmine>
-	    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22142:1)
-	    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-	    at createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22002:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23232:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-	    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-	    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-	    at ComponentFactory_.push.../../../../node_modules/@angular/core/fesm5/core.js.ComponentFactory_.create (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21498:1)
-	    at initComponent (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1916:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/application-wall/application-wall.component.spec.ts:37:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) ApplicationWallComponent should be created FAILED
-	TypeError: Cannot read property 'paginationKey' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33739265, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 184832, directChildFlags: 184832, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-application-wall', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 3, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 3, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0, o ...
-	    at <Jasmine>
-	    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22142:1)
-	    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-	    at createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22002:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23232:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-	    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-	    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-	    at ComponentFactory_.push.../../../../node_modules/@angular/core/fesm5/core.js.ComponentFactory_.create (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21498:1)
-	    at initComponent (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1916:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/application-wall/application-wall.component.spec.ts:37:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  ApplicationService
-    ✗ should be created
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ] })
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) ApplicationService should be created FAILED
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ] })
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-  ApplicationBaseComponent
-    ✓ should create
-
-  ApplicationPollComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-application-poll', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, n ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/application/application-tabs-application-poll/application-poll.component.spec.ts:44:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) ApplicationPollComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-application-poll', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, n ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/application/application-tabs-application-poll/application-poll.component.spec.ts:44:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  ApplicationTabsBaseComponent
-    ✗ should be created
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800705, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 246272, directChildFlags: 246272, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-application-tabs-base', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: O ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/application/application-tabs-application-tabs-base.component.spec.ts:71:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) ApplicationTabsBaseComponent should be created FAILED
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800705, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 246272, directChildFlags: 246272, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-application-tabs-base', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: O ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/application/application-tabs-application-tabs-base.component.spec.ts:71:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  ApplicationEnvVarsService
-    ✓ should be created
-
-  BuildTabComponent
-    ✓ should be created
-
-  ViewBuildpackComponent
-    ✓ should be created
-
-  EventsTabComponent
-    ✗ should be created
-	TypeError: actionBuilder is not a function
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 38518785, rootNodeFlags: 1, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 38518785, directChildFlags: 33554433, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'div', attrs: [ Array ], template: null, componentProvider: null, componentView: null, componentRendererType: null, publicProviders: null({  }), allProviders: null({  }), handleEvent: Function }), provider: null, text: null, query: null, ngContent: null }), Object({ nodeIndex: 1, parent: Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 38518785, directChildFlags:  ...
-	    at <Jasmine>
-	    at new actionBuilder (src/shared/components/list/list-types/app-event/cf-app-events-data-source.ts:28:22)
-	    at new CfAppEventsConfigService (src/shared/components/list/list-types/app-event/cf-app-events-config.service.ts:63:29)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22142:1)
-	    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22244:45)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22148:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at callViewAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23561:1)
-	    at execComponentViewsAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23480:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/application/application-tabs-tabs/events-tab/events-tab.component.spec.ts:75:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) EventsTabComponent should be created FAILED
-	TypeError: actionBuilder is not a function
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 38518785, rootNodeFlags: 1, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 38518785, directChildFlags: 33554433, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'div', attrs: [ Array ], template: null, componentProvider: null, componentView: null, componentRendererType: null, publicProviders: null({  }), allProviders: null({  }), handleEvent: Function }), provider: null, text: null, query: null, ngContent: null }), Object({ nodeIndex: 1, parent: Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 38518785, directChildFlags:  ...
-	    at <Jasmine>
-	    at new actionBuilder (src/shared/components/list/list-types/app-event/cf-app-events-data-source.ts:28:22)
-	    at new CfAppEventsConfigService (src/shared/components/list/list-types/app-event/cf-app-events-config.service.ts:63:29)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22142:1)
-	    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22244:45)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22148:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at callViewAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23561:1)
-	    at execComponentViewsAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23480:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/application/application-tabs-tabs/events-tab/events-tab.component.spec.ts:75:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-WARN LOG: 'Could not find catalogue entity for endpoint type 'stratos' and entity type 'gitRepo'. Stack: ', 'Error
-    at TestEntityCatalogue.../core/src/core/entity-catalogue/entity-catalogue.service.ts.EntityCatalogue.getEntity (http://localhost:9876/_karma_webpack_/webpack:/core/src/core/entity-catalogue/entity-catalogue.service.ts:128:9)
-    at TapSubscriber.getEntity [as _tapNext] (http://localhost:9876/_karma_webpack_/webpack:/src/features/applications/application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component.ts:56:49)
-    at TapSubscriber.push.../../../../node_modules/rxjs/_esm5/internal/operators/tap.js.TapSubscriber._next (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/operators/tap.js:45:1)
-    at TapSubscriber.push.../../../../node_modules/rxjs/_esm5/internal/Subscriber.js.Subscriber.next (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/Subscriber.js:53:1)
-    at TakeSubscriber.push.../../../../node_modules/rxjs/_esm5/internal/operators/take.js.TakeSubscriber._next (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/operators/take.js:40:1)
-    at TakeSubscriber.push.../../../../node_modules/rxjs/_esm5/internal/Subscriber.js.Subscriber.next (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/Subscriber.js:53:1)
-    at Observable._subscribe (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/observable/scalar.js:5:1)
-    at Observable.push.../../../../node_modules/rxjs/_esm5/internal/Observable.js.Observable._trySubscribe (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/Observable.js:43:1)
-    at Observable.push.../../../../node_modules/rxjs/_esm5/internal/Observable.js.Observable.subscribe (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/Observable.js:29:1)
-    at TakeOperator.push.../../../../node_modules/rxjs/_esm5/internal/operators/take.js.TakeOperator.call (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/operators/take.js:24:1)'
-WARN: 'Could not find catalogue entity for endpoint type 'stratos' and entity type 'gitRepo'. Stack: ', 'Error
-    at TestEntityCatalogue.../core/src/core/entity-catalogue/entity-catalogue.service.ts.EntityCatalogue.getEntity (http://localhost:9876/_karma_webpack_/webpack:/core/src/core/entity-catalogue/entity-catalogue.service.ts:128:9)
-    at TapSubscriber.getEntity [as _tapNext] (http://localhost:9876/_karma_webpack_/webpack:/src/features/applications/application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component.ts:56:49)
-    at TapSubscriber.push.../../../../node_modules/rxjs/_esm5/internal/operators/tap.js.TapSubscriber._next (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/operators/tap.js:45:1)
-    at TapSubscriber.push.../../../../node_modules/rxjs/_esm5/internal/Subscriber.js.Subscriber.next (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/Subscriber.js:53:1)
-    at TakeSubscriber.push.../../../../node_modules/rxjs/_esm5/internal/operators/take.js.TakeSubscriber._next (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/operators/take.js:40:1)
-    at TakeSubscriber.push.../../../../node_modules/rxjs/_esm5/internal/Subscriber.js.Subscriber.next (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/Subscriber.js:53:1)
-    at Observable._subscribe (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/observable/scalar.js:5:1)
-    at Observable.push.../../../../node_modules/rxjs/_esm5/internal/Observable.js.Observable._trySubscribe (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/Observable.js:43:1)
-    at Observable.push.../../../../node_modules/rxjs/_esm5/internal/Observable.js.Observable.subscribe (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/Observable.js:29:1)
-    at TakeOperator.push.../../../../node_modules/rxjs/_esm5/internal/operators/take.js.TakeOperator.call (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/operators/take.js:24:1)'
-WARN: 'Could not find catalogue entity for endpoint type 'stratos' and entity type 'gitRepo'. Stack: ', 'Error
-    at TestEntityCatalogue.../core/src/core/entity-catalogue/entity-catalogue.service.ts.EntityCatalogue.getEntity (http://localhost:9876/_karma_webpack_/webpack:/core/src/core/entity-catalogue/entity-catalogue.service.ts:128:9)
-    at TapSubscriber.getEntity [as _tapNext] (http://localhost:9876/_karma_webpack_/webpack:/src/features/applications/application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component.ts:56:49)
-    at TapSubscriber.push.../../../../node_modules/rxjs/_esm5/internal/operators/tap.js.TapSubscriber._next (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/operators/tap.js:45:1)
-    at TapSubscriber.push.../../../../node_modules/rxjs/_esm5/internal/Subscriber.js.Subscriber.next (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/Subscriber.js:53:1)
-    at TakeSubscriber.push.../../../../node_modules/rxjs/_esm5/internal/operators/take.js.TakeSubscriber._next (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/operators/take.js:40:1)
-    at TakeSubscriber.push.../../../../node_modules/rxjs/_esm5/internal/Subscriber.js.Subscriber.next (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/Subscriber.js:53:1)
-    at Observable._subscribe (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/observable/scalar.js:5:1)
-    at Observable.push.../../../../node_modules/rxjs/_esm5/internal/Observable.js.Observable._trySubscribe (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/Observable.js:43:1)
-    at Observable.push.../../../../node_modules/rxjs/_esm5/internal/Observable.js.Observable.subscribe (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/Observable.js:29:1)
-    at TakeOperator.push.../../../../node_modules/rxjs/_esm5/internal/operators/take.js.TakeOperator.call (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/rxjs/_esm5/internal/operators/take.js:24:1)'
-
-  GitSCMTabComponent
-    ✓ should create
-
-  InstancesTabComponent
-    ✗ should create
-	Uncaught TypeError: Cannot read property 'actionOrchestrator' of undefined thrown
-
-	Error: StaticInjectorError(DynamicTestModule)[ListConfig -> CloudFoundryEndpointService]: 
-	  StaticInjectorError(Platform: core)[ListConfig -> CloudFoundryEndpointService]: 
-	    NullInjectorError: No provider for CloudFoundryEndpointService!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ListConfig', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 643547137, rootNodeFlags: 33554433, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 638828545, directChildFlags: 33603585, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 16, bindings: [ Object({ flags: 2, ns: '', name: 'app-tile-grid-fit', nonMinifiedName: 'app-tile-grid-fit', securityContext: undefined, suffix: undefined }) ], bindingFlags: 2, outputs: [  ], element: Object({ ns: '', name: 'app-tile-grid', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 1, outputIndex: 0, checkIndex: 1, flags:  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/application/application-tabs-tabs/instances-tab/instances-tab.component.spec.ts:50:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at AsyncTestZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.AsyncTestZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:714:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) InstancesTabComponent should create FAILED
-	Uncaught TypeError: Cannot read property 'actionOrchestrator' of undefined thrown
-	Error: StaticInjectorError(DynamicTestModule)[ListConfig -> CloudFoundryEndpointService]: 
-	  StaticInjectorError(Platform: core)[ListConfig -> CloudFoundryEndpointService]: 
-	    NullInjectorError: No provider for CloudFoundryEndpointService!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ListConfig', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 643547137, rootNodeFlags: 33554433, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 638828545, directChildFlags: 33603585, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 16, bindings: [ Object({ flags: 2, ns: '', name: 'app-tile-grid-fit', nonMinifiedName: 'app-tile-grid-fit', securityContext: undefined, suffix: undefined }) ], bindingFlags: 2, outputs: [  ], element: Object({ ns: '', name: 'app-tile-grid', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 1, outputIndex: 0, checkIndex: 1, flags:  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/application/application-tabs-tabs/instances-tab/instances-tab.component.spec.ts:50:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at AsyncTestZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.AsyncTestZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:714:1)
-
-  LogStreamTabComponent
-    ✗ should be created
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-log-stream-tab', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/application/application-tabs-tabs/log-stream-tab/log-stream-tab.component.spec.ts:70:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) LogStreamTabComponent should be created FAILED
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-log-stream-tab', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/application/application-tabs-tabs/log-stream-tab/log-stream-tab.component.spec.ts:70:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  RoutesTabComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33805825, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 251392, directChildFlags: 251392, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-routes-tab', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 3, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 3, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngCo ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/application/application-tabs-tabs/routes-tab/routes-tab/routes-tab.component.spec.ts:37:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) RoutesTabComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33805825, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 251392, directChildFlags: 251392, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-routes-tab', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 3, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 3, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngCo ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/application/application-tabs-tabs/routes-tab/routes-tab/routes-tab.component.spec.ts:37:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  ServicesTabComponent
-    ✗ should be created
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 38518785, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, flags: 1, checkIndex: -1, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({ noEntries: 2 }), ngContentIndex: null, childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: null, name: null, attrs: null, template: Object({ factory: Function, nodeFlags: 33669185, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: Array, updateDirectives: Function, updateRenderer: Function, handleEvent: Function, bindingCount: 5, outputCount: 0, lastRenderRootNode: Object }), componentProvider: null, componentView: null, componentRendererType: null,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/application/application-tabs-tabs/services-tab/services-tab.component.spec.ts:45:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) ServicesTabComponent should be created FAILED
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 38518785, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, flags: 1, checkIndex: -1, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({ noEntries: 2 }), ngContentIndex: null, childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: null, name: null, attrs: null, template: Object({ factory: Function, nodeFlags: 33669185, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: Array, updateDirectives: Function, updateRenderer: Function, handleEvent: Function, bindingCount: 5, outputCount: 0, lastRenderRootNode: Object }), componentProvider: null, componentView: null, componentRendererType: null,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/application/application-tabs-tabs/services-tab/services-tab.component.spec.ts:45:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  VariablesTabComponent
-    ✓ should be created
-
-  CliInfoApplicationComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cli-info-application', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/cli-info-application/cli-info-application.component.spec.ts:60:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CliInfoApplicationComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cli-info-application', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/cli-info-application/cli-info-application.component.spec.ts:60:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-WARN LOG: '
-    It looks like you're using ngModel on the same form field as formControlName. 
-    Support for using the ngModel input property and ngModelChange event with 
-    reactive form directives has been deprecated in Angular v6 and will be removed 
-    in Angular v7.
-    
-    For more information on this, see our API docs here:
-    https://angular.io/api/forms/FormControlName#use-with-ngmodel
-    '
-WARN: '
-    It looks like you're using ngModel on the same form field as formControlName. 
-    Support for using the ngModel input property and ngModelChange event with 
-    reactive form directives has been deprecated in Angular v6 and will be removed 
-    in Angular v7.
-    
-    For more information on this, see our API docs here:
-    https://angular.io/api/forms/FormControlName#use-with-ngmodel
-    '
-WARN: '
-    It looks like you're using ngModel on the same form field as formControlName. 
-    Support for using the ngModel input property and ngModelChange event with 
-    reactive form directives has been deprecated in Angular v6 and will be removed 
-    in Angular v7.
-    
-    For more information on this, see our API docs here:
-    https://angular.io/api/forms/FormControlName#use-with-ngmodel
-    '
-
-  CreateApplicationStep2Component
-    ✓ should be created
-
-  CreateApplicationStep3Component
-    ✗ should be created
-	Error: StaticInjectorError(DynamicTestModule)[CreateApplicationStep3Component -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CreateApplicationStep3Component -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CreateApplicationStep3Component', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33673729, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 119296, directChildFlags: 119296, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-create-application-step3', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/create-application/create-application-step3/create-application-step3.component.spec.ts:37:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CreateApplicationStep3Component should be created FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CreateApplicationStep3Component -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CreateApplicationStep3Component -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CreateApplicationStep3Component', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33673729, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 119296, directChildFlags: 119296, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-create-application-step3', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/create-application/create-application-step3/create-application-step3.component.spec.ts:37:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CreateApplicationComponent
-    ✗ should be created
-	TypeError: Cannot read property 'paginationKey' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800705, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 246272, directChildFlags: 246272, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-create-application', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0,  ...
-	    at <Jasmine>
-	    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22142:1)
-	    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-	    at createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22002:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23232:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-	    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-	    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-	    at ComponentFactory_.push.../../../../node_modules/@angular/core/fesm5/core.js.ComponentFactory_.create (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21498:1)
-	    at initComponent (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1916:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/create-application/create-application.component.spec.ts:65:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CreateApplicationComponent should be created FAILED
-	TypeError: Cannot read property 'paginationKey' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800705, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 246272, directChildFlags: 246272, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-create-application', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0,  ...
-	    at <Jasmine>
-	    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22142:1)
-	    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-	    at createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22002:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23232:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-	    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-	    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-	    at ComponentFactory_.push.../../../../node_modules/@angular/core/fesm5/core.js.ComponentFactory_.create (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21498:1)
-	    at initComponent (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1916:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/create-application/create-application.component.spec.ts:65:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  DeployApplicationOptionsStepComponent
-    ✓ should create
-
-  DeployApplicationStepSourceUploadComponent
-    ✗ should create
-	TypeError: Cannot read property 'paginationKey' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33734657, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 180224, directChildFlags: 180224, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-deploy-application-step-source-upload', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array,  ...
-	    at <Jasmine>
-	    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21255:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22142:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/deploy-application/deploy-application-step-source-upload/deploy-application-step-source-upload.component.spec.ts:43:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) DeployApplicationStepSourceUploadComponent should create FAILED
-	TypeError: Cannot read property 'paginationKey' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33734657, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 180224, directChildFlags: 180224, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-deploy-application-step-source-upload', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array,  ...
-	    at <Jasmine>
-	    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21255:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22142:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/deploy-application/deploy-application-step-source-upload/deploy-application-step-source-upload.component.spec.ts:43:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CommitListWrapperComponent
-    ✓ should create
-
-  DeployApplicationStep21Component
-    ✓ should create
-
-  DeployApplicationFsComponent
-    ✓ should create
-
-  DeployApplicationStep2Component
-    ✓ should create
-
-  DeployApplicationStep3Component
-    ✗ should create
-	TypeError: Cannot read property 'paginationKey' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33734657, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 180224, directChildFlags: 180224, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-deploy-application-step3', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags:  ...
-	    at <Jasmine>
-	    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21255:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22144:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/deploy-application/deploy-application-step3/deploy-application-step3.component.spec.ts:45:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) DeployApplicationStep3Component should create FAILED
-	TypeError: Cannot read property 'paginationKey' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33734657, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 180224, directChildFlags: 180224, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-deploy-application-step3', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags:  ...
-	    at <Jasmine>
-	    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21255:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22144:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/deploy-application/deploy-application-step3/deploy-application-step3.component.spec.ts:45:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  DeployApplicationComponent
-    ✗ should create
-	TypeError: Cannot read property 'paginationKey' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33804801, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 250368, directChildFlags: 250368, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-deploy-application', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 3, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 3, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0,  ...
-	    at <Jasmine>
-	    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22142:1)
-	    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-	    at createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22002:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23232:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-	    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-	    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-	    at ComponentFactory_.push.../../../../node_modules/@angular/core/fesm5/core.js.ComponentFactory_.create (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21498:1)
-	    at initComponent (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1916:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/deploy-application/deploy-application.component.spec.ts:85:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) DeployApplicationComponent should create FAILED
-	TypeError: Cannot read property 'paginationKey' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33804801, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 250368, directChildFlags: 250368, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-deploy-application', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 3, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 3, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0,  ...
-	    at <Jasmine>
-	    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22142:1)
-	    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-	    at createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22002:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23232:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-	    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-	    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-	    at ComponentFactory_.push.../../../../node_modules/@angular/core/fesm5/core.js.ComponentFactory_.create (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21498:1)
-	    at initComponent (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1916:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/deploy-application/deploy-application.component.spec.ts:85:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  GithubProjectExistsDirective
-    ✓ should create an instance
-
-  EditApplicationComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33804801, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 250368, directChildFlags: 250368, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-edit-application', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/edit-application/edit-application.component.spec.ts:69:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) EditApplicationComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33804801, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 250368, directChildFlags: 250368, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-edit-application', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/edit-application/edit-application.component.spec.ts:69:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  NewApplicationBaseStepComponent
-    ✓ should create
-06 09 2019 11:03:59.267:WARN [web-server]: 404: /core/assets/endpoint-icons/github-logo.png
-06 09 2019 11:03:59.268:WARN [web-server]: 404: /core/assets/endpoint-icons/gitlab-icon-rgb.svg
-06 09 2019 11:03:59.269:WARN [web-server]: 404: /core/assets/endpoint-icons/Git-logo.png
-
-  AddRouteStepperComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[AddRoutesComponent -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[AddRoutesComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'AddRoutesComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 643023363, rootNodeFlags: 33554433, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 4374531, directChildFlags: 4374529, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-page-header', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 4374528, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/routes/add-route-stepper/add-route-stepper.component.spec.ts:51:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) AddRouteStepperComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[AddRoutesComponent -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[AddRoutesComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'AddRoutesComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 643023363, rootNodeFlags: 33554433, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 4374531, directChildFlags: 4374529, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-page-header', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 4374528, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/routes/add-route-stepper/add-route-stepper.component.spec.ts:51:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  AddRoutesComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[AddRoutesComponent -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[AddRoutesComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'AddRoutesComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-add-routes', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngCo ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/routes/add-routes/add-routes.component.spec.ts:41:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) AddRoutesComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[AddRoutesComponent -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[AddRoutesComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'AddRoutesComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-add-routes', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngCo ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/applications/routes/add-routes/add-routes.component.spec.ts:41:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  MapRoutesComponent
-    ✓ should create
-
-  SshApplicationComponent
-    ✓ should create
-
-  AddOrganizationComponent
-    ✗ should create
-	TypeError: Cannot read property 'includeRelations' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 643023363, rootNodeFlags: 1, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643023363, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 11, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'div', attrs: [ Array ], template: null, componentProvider: null, componentView: null, componentRendererType: null, publicProviders: null({  }), allProviders: null({  }), handleEvent: Function }), provider: null, text: null, query: null, ngContent: null }), Object({ nodeIndex: 1, parent: Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643023363, directChildFlags:  ...
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/quota-definition.action-builders.ts:4:35)
-	    at CreateOrganizationStepComponent.actionBuilder [as ngOnInit] (src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts:79:40)
-	    at checkAndUpdateDirectiveInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-	    at checkAndUpdateNodeInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-	    at checkAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-	    at debugCheckAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-	    at debugCheckDirectivesFn (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-	    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/AddOrganizationComponent.ngfactory.js:37:5)
-	    at Object.debugUpdateDirectives [as updateDirectives] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23901:1)
-	    at checkAndUpdateView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23297:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) AddOrganizationComponent should create FAILED
-	TypeError: Cannot read property 'includeRelations' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 643023363, rootNodeFlags: 1, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643023363, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 11, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'div', attrs: [ Array ], template: null, componentProvider: null, componentView: null, componentRendererType: null, publicProviders: null({  }), allProviders: null({  }), handleEvent: Function }), provider: null, text: null, query: null, ngContent: null }), Object({ nodeIndex: 1, parent: Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643023363, directChildFlags:  ...
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/quota-definition.action-builders.ts:4:35)
-	    at CreateOrganizationStepComponent.actionBuilder [as ngOnInit] (src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts:79:40)
-	    at checkAndUpdateDirectiveInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-	    at checkAndUpdateNodeInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-	    at checkAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-	    at debugCheckAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-	    at debugCheckDirectivesFn (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-	    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/AddOrganizationComponent.ngfactory.js:37:5)
-	    at Object.debugUpdateDirectives [as updateDirectives] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23901:1)
-	    at checkAndUpdateView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23297:1)
-ERROR LOG: 'Error during cleanup of component', Object{component: AddOrganizationComponent{cfUrl: '/cloud-foundry/null/organizations'}, stacktrace: TypeError: Cannot read property 'unsubscribe' of undefined
-TypeError: Cannot read property 'unsubscribe' of undefined
-    at CreateOrganizationStepComponent.unsubscribe (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts:94:30)
-    at callProviderLifecycles (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22412:1)
-    at callElementProvidersLifecycles (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22380:1)
-    at callLifecycleHooksChildrenFirst (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22370:1)
-    at destroyView (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23432:1)
-    at callViewAction (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23558:1)
-    at execComponentViewsAction (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23480:1)
-    at destroyView (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23431:1)
-    at callWithDebugContext (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-    at Object.debugDestroyView [as destroyView] (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23875:1)}
-ERROR: 'Error during cleanup of component', Object{component: AddOrganizationComponent{cfUrl: '/cloud-foundry/null/organizations'}, stacktrace: TypeError: Cannot read property 'unsubscribe' of undefined
-TypeError: Cannot read property 'unsubscribe' of undefined
-    at CreateOrganizationStepComponent.unsubscribe (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts:94:30)
-    at callProviderLifecycles (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22412:1)
-    at callElementProvidersLifecycles (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22380:1)
-    at callLifecycleHooksChildrenFirst (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22370:1)
-    at destroyView (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23432:1)
-    at callViewAction (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23558:1)
-    at execComponentViewsAction (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23480:1)
-    at destroyView (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23431:1)
-    at callWithDebugContext (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-    at Object.debugDestroyView [as destroyView] (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23875:1)}
-ERROR: 'Error during cleanup of component', Object{component: AddOrganizationComponent{cfUrl: '/cloud-foundry/null/organizations'}, stacktrace: TypeError: Cannot read property 'unsubscribe' of undefined
-TypeError: Cannot read property 'unsubscribe' of undefined
-    at CreateOrganizationStepComponent.unsubscribe (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts:94:30)
-    at callProviderLifecycles (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22412:1)
-    at callElementProvidersLifecycles (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22380:1)
-    at callLifecycleHooksChildrenFirst (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22370:1)
-    at destroyView (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23432:1)
-    at callViewAction (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23558:1)
-    at execComponentViewsAction (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23480:1)
-    at destroyView (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23431:1)
-    at callWithDebugContext (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-    at Object.debugDestroyView [as destroyView] (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23875:1)}
-
-  CreateOrganizationStepComponent
-    ✗ should create
-	TypeError: Cannot read property 'includeRelations' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-create-organization-step', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags:  ...
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/quota-definition.action-builders.ts:4:35)
-	    at CreateOrganizationStepComponent.actionBuilder [as ngOnInit] (src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts:79:40)
-	    at checkAndUpdateDirectiveInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-	    at checkAndUpdateNodeInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-	    at checkAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-	    at debugCheckAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-	    at debugCheckDirectivesFn (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-	    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateOrganizationStepComponent_Host.ngfactory.js:10:5)
-	    at Object.debugUpdateDirectives [as updateDirectives] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23901:1)
-	    at checkAndUpdateView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23297:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CreateOrganizationStepComponent should create FAILED
-	TypeError: Cannot read property 'includeRelations' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-create-organization-step', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags:  ...
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/quota-definition.action-builders.ts:4:35)
-	    at CreateOrganizationStepComponent.actionBuilder [as ngOnInit] (src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts:79:40)
-	    at checkAndUpdateDirectiveInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-	    at checkAndUpdateNodeInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-	    at checkAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-	    at debugCheckAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-	    at debugCheckDirectivesFn (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-	    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateOrganizationStepComponent_Host.ngfactory.js:10:5)
-	    at Object.debugUpdateDirectives [as updateDirectives] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23901:1)
-	    at checkAndUpdateView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23297:1)
-ERROR LOG: 'Error during cleanup of component', Object{component: CreateOrganizationStepComponent{store: Store{_isScalar: ..., actionsObserver: ..., reducerManager: ..., source: ...}, activatedRoute: ActivatedRoute{url: ..., params: ..., queryParams: ..., fragment: ..., data: ..., outlet: ..., component: ..., _futureSnapshot: ..., snapshot: ..., _routerState: ...}, paginationMonitorFactory: PaginationMonitorFactory{store: ..., monitorCache: ...}, nameTakenValidator: function(){ ... }, validateNameTaken: function(value){ ... }, validate: function(){ ... }, submit: function(){ ... }, cfGuid: undefined, addOrg: FormGroup{validator: ..., asyncValidator: ..., _onCollectionChange: ..., pristine: ..., touched: ..., _onDisabledChange: ..., controls: ..., valueChanges: ..., statusChanges: ..., status: ..., value: ..., errors: ...}, orgs$: Observable{_isScalar: ..., source: ..., operator: ...}}, stacktrace: TypeError: Cannot read property 'unsubscribe' of undefined
-TypeError: Cannot read property 'unsubscribe' of undefined
-    at CreateOrganizationStepComponent.unsubscribe (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts:94:30)
-    at callProviderLifecycles (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22412:1)
-    at callElementProvidersLifecycles (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22380:1)
-    at callLifecycleHooksChildrenFirst (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22370:1)
-    at destroyView (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23432:1)
-    at callWithDebugContext (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-    at Object.debugDestroyView [as destroyView] (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23875:1)
-    at ViewRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.ViewRef_.destroy (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21701:1)
-    at ComponentRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.ComponentRef_.destroy (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21537:52)
-    at ComponentFixture.push.../../../../node_modules/@angular/core/fesm5/testing.js.ComponentFixture.destroy (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:310:1)}
-ERROR: 'Error during cleanup of component', Object{component: CreateOrganizationStepComponent{store: Store{_isScalar: ..., actionsObserver: ..., reducerManager: ..., source: ...}, activatedRoute: ActivatedRoute{url: ..., params: ..., queryParams: ..., fragment: ..., data: ..., outlet: ..., component: ..., _futureSnapshot: ..., snapshot: ..., _routerState: ...}, paginationMonitorFactory: PaginationMonitorFactory{store: ..., monitorCache: ...}, nameTakenValidator: function(){ ... }, validateNameTaken: function(value){ ... }, validate: function(){ ... }, submit: function(){ ... }, cfGuid: undefined, addOrg: FormGroup{validator: ..., asyncValidator: ..., _onCollectionChange: ..., pristine: ..., touched: ..., _onDisabledChange: ..., controls: ..., valueChanges: ..., statusChanges: ..., status: ..., value: ..., errors: ...}, orgs$: Observable{_isScalar: ..., source: ..., operator: ...}}, stacktrace: TypeError: Cannot read property 'unsubscribe' of undefined
-TypeError: Cannot read property 'unsubscribe' of undefined
-    at CreateOrganizationStepComponent.unsubscribe (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts:94:30)
-    at callProviderLifecycles (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22412:1)
-    at callElementProvidersLifecycles (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22380:1)
-    at callLifecycleHooksChildrenFirst (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22370:1)
-    at destroyView (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23432:1)
-    at callWithDebugContext (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-    at Object.debugDestroyView [as destroyView] (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23875:1)
-    at ViewRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.ViewRef_.destroy (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21701:1)
-    at ComponentRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.ComponentRef_.destroy (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21537:52)
-    at ComponentFixture.push.../../../../node_modules/@angular/core/fesm5/testing.js.ComponentFixture.destroy (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:310:1)}
-ERROR: 'Error during cleanup of component', Object{component: CreateOrganizationStepComponent{store: Store{_isScalar: ..., actionsObserver: ..., reducerManager: ..., source: ...}, activatedRoute: ActivatedRoute{url: ..., params: ..., queryParams: ..., fragment: ..., data: ..., outlet: ..., component: ..., _futureSnapshot: ..., snapshot: ..., _routerState: ...}, paginationMonitorFactory: PaginationMonitorFactory{store: ..., monitorCache: ...}, nameTakenValidator: function(){ ... }, validateNameTaken: function(value){ ... }, validate: function(){ ... }, submit: function(){ ... }, cfGuid: undefined, addOrg: FormGroup{validator: ..., asyncValidator: ..., _onCollectionChange: ..., pristine: ..., touched: ..., _onDisabledChange: ..., controls: ..., valueChanges: ..., statusChanges: ..., status: ..., value: ..., errors: ...}, orgs$: Observable{_isScalar: ..., source: ..., operator: ...}}, stacktrace: TypeError: Cannot read property 'unsubscribe' of undefined
-TypeError: Cannot read property 'unsubscribe' of undefined
-    at CreateOrganizationStepComponent.unsubscribe (http://localhost:9876/_karma_webpack_/webpack:/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts:94:30)
-    at callProviderLifecycles (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22412:1)
-    at callElementProvidersLifecycles (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22380:1)
-    at callLifecycleHooksChildrenFirst (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22370:1)
-    at destroyView (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23432:1)
-    at callWithDebugContext (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-    at Object.debugDestroyView [as destroyView] (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23875:1)
-    at ViewRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.ViewRef_.destroy (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21701:1)
-    at ComponentRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.ComponentRef_.destroy (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21537:52)
-    at ComponentFixture.push.../../../../node_modules/@angular/core/fesm5/testing.js.ComponentFixture.destroy (http://localhost:9876/_karma_webpack_/webpack:/home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:310:1)}
-
-  AddSpaceComponent
-    ✗ should create
-	TypeError: Cannot read property 'includeRelations' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 643023363, rootNodeFlags: 1, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643023363, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 11, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'div', attrs: [ Array ], template: null, componentProvider: null, componentView: null, componentRendererType: null, publicProviders: null({  }), allProviders: null({  }), handleEvent: Function }), provider: null, text: null, query: null, ngContent: null }), Object({ nodeIndex: 1, parent: Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643023363, directChildFlags:  ...
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/space.action-builders.ts:22:35)
-	    at CreateSpaceStepComponent.getAllSpaceActionBuilder (src/features/cloud-foundry/add-edit-space-step-base.ts:27:22)
-	    at new call (src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.ts:39:28)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22150:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at callViewAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23561:1)
-	    at execComponentViewsAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23480:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23273:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/add-space/add-space.component.spec.ts:28:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) AddSpaceComponent should create FAILED
-	TypeError: Cannot read property 'includeRelations' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 643023363, rootNodeFlags: 1, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643023363, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 11, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'div', attrs: [ Array ], template: null, componentProvider: null, componentView: null, componentRendererType: null, publicProviders: null({  }), allProviders: null({  }), handleEvent: Function }), provider: null, text: null, query: null, ngContent: null }), Object({ nodeIndex: 1, parent: Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643023363, directChildFlags:  ...
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/space.action-builders.ts:22:35)
-	    at CreateSpaceStepComponent.getAllSpaceActionBuilder (src/features/cloud-foundry/add-edit-space-step-base.ts:27:22)
-	    at new call (src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.ts:39:28)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22150:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at callViewAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23561:1)
-	    at execComponentViewsAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23480:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23273:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/add-space/add-space.component.spec.ts:28:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CreateSpaceStepComponent
-    ✗ should create
-	TypeError: Cannot read property 'includeRelations' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-create-space-step', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0,  ...
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/space.action-builders.ts:22:35)
-	    at CreateSpaceStepComponent.getAllSpaceActionBuilder (src/features/cloud-foundry/add-edit-space-step-base.ts:27:22)
-	    at new call (src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.ts:39:28)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22150:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-	    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-	    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-	    at ComponentFactory_.push.../../../../node_modules/@angular/core/fesm5/core.js.ComponentFactory_.create (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21498:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.spec.ts:27:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CreateSpaceStepComponent should create FAILED
-	TypeError: Cannot read property 'includeRelations' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-create-space-step', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0,  ...
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/space.action-builders.ts:22:35)
-	    at CreateSpaceStepComponent.getAllSpaceActionBuilder (src/features/cloud-foundry/add-edit-space-step-base.ts:27:22)
-	    at new call (src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.ts:39:28)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22150:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-	    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-	    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-	    at ComponentFactory_.push.../../../../node_modules/@angular/core/fesm5/core.js.ComponentFactory_.create (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21498:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.spec.ts:27:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CliInfoCloudFoundryComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundrySpaceService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundrySpaceService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundrySpaceService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33670657, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 116224, directChildFlags: 116224, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 5, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cli-info-cloud-foundry', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 5, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 5, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.spec.ts:39:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CliInfoCloudFoundryComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundrySpaceService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundrySpaceService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundrySpaceService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33670657, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 116224, directChildFlags: 116224, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 5, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cli-info-cloud-foundry', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 5, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 5, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.spec.ts:39:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CloudFoundryBaseComponent
-    ✓ should create
-
-  CloudFoundryTabsBaseComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-tabs-base', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, re ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/cloud-foundry-tabs-cloud-foundry-tabs-base.component.spec.ts:40:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CloudFoundryTabsBaseComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-tabs-base', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, re ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/cloud-foundry-tabs-cloud-foundry-tabs-base.component.spec.ts:40:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CloudFoundryComponent
-    ✓ should create
-
-  EditOrganizationStepComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryOrganizationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33801729, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 247296, directChildFlags: 247296, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-edit-organization-step', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 3, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 3, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.spec.ts:30:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) EditOrganizationStepComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryOrganizationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33801729, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 247296, directChildFlags: 247296, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-edit-organization-step', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 3, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 3, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.spec.ts:30:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  EditOrganizationComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryOrganizationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 643024387, rootNodeFlags: 1, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643024387, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 13, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'div', attrs: [ Array ], template: null, componentProvider: null, componentView: null, componentRendererType: null, publicProviders: null({  }), allProviders: null({  }), handleEvent: Function }), provider: null, text: null, query: null, ngContent: null }), Object({ nodeIndex: 1, parent: Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex:  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/edit-organization/edit-organization.component.spec.ts:33:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) EditOrganizationComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryOrganizationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 643024387, rootNodeFlags: 1, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643024387, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 13, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'div', attrs: [ Array ], template: null, componentProvider: null, componentView: null, componentRendererType: null, publicProviders: null({  }), allProviders: null({  }), handleEvent: Function }), provider: null, text: null, query: null, ngContent: null }), Object({ nodeIndex: 1, parent: Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex:  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/edit-organization/edit-organization.component.spec.ts:33:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  EditSpaceStepComponent
-    ✗ should create
-	TypeError: Cannot read property 'includeRelations' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33734657, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 180224, directChildFlags: 180224, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-edit-space-step', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0, ou ...
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/space.action-builders.ts:22:35)
-	    at EditSpaceStepComponent.getAllSpaceActionBuilder (src/features/cloud-foundry/add-edit-space-step-base.ts:27:22)
-	    at new call (src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.ts:43:28)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22150:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-	    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-	    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-	    at ComponentFactory_.push.../../../../node_modules/@angular/core/fesm5/core.js.ComponentFactory_.create (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21498:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.spec.ts:34:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) EditSpaceStepComponent should create FAILED
-	TypeError: Cannot read property 'includeRelations' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33734657, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 180224, directChildFlags: 180224, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-edit-space-step', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0, ou ...
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/space.action-builders.ts:22:35)
-	    at EditSpaceStepComponent.getAllSpaceActionBuilder (src/features/cloud-foundry/add-edit-space-step-base.ts:27:22)
-	    at new call (src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.ts:43:28)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22150:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-	    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-	    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-	    at ComponentFactory_.push.../../../../node_modules/@angular/core/fesm5/core.js.ComponentFactory_.create (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21498:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.spec.ts:34:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  EditSpaceComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundrySpaceService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundrySpaceService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundrySpaceService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33670657, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 116224, directChildFlags: 116224, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-edit-space', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 3, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 3, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/edit-space/edit-space.component.spec.ts:33:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) EditSpaceComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundrySpaceService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundrySpaceService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundrySpaceService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33670657, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 116224, directChildFlags: 116224, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-edit-space', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 3, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 3, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/edit-space/edit-space.component.spec.ts:33:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  QuotaDefinitionComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[QuotaDefinitionComponent -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[QuotaDefinitionComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'QuotaDefinitionComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33604609, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 50176, directChildFlags: 50176, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-quota-definition', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/quota-definition/quota-definition.component.spec.ts:46:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) QuotaDefinitionComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[QuotaDefinitionComponent -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[QuotaDefinitionComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'QuotaDefinitionComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33604609, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 50176, directChildFlags: 50176, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-quota-definition', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/quota-definition/quota-definition.component.spec.ts:46:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  SpaceQuotaDefinitionComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[SpaceQuotaDefinitionComponent -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[SpaceQuotaDefinitionComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'SpaceQuotaDefinitionComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33604609, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 50176, directChildFlags: 50176, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-space-quota-definition', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, refe ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.spec.ts:98:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) SpaceQuotaDefinitionComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[SpaceQuotaDefinitionComponent -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[SpaceQuotaDefinitionComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'SpaceQuotaDefinitionComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33604609, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 50176, directChildFlags: 50176, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-space-quota-definition', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, refe ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.spec.ts:98:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CfAdminAddUserWarningComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CfUserService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CfUserService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfUserService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cf-admin-add-user-warning', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.spec.ts:28:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CfAdminAddUserWarningComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CfUserService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CfUserService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfUserService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cf-admin-add-user-warning', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.spec.ts:28:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CloudFoundryBuildPacksComponent
-    ✓ should create
-
-  CloudFoundryCellsComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33609217, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 54784, directChildFlags: 54784, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-cells', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 3, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 3, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references:  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.spec.ts:45:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CloudFoundryCellsComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33609217, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 54784, directChildFlags: 54784, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-cells', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 3, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 3, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references:  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.spec.ts:45:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CloudFoundryFeatureFlagsComponent
-    ✓ should create
-
-  CloudFoundryFirehoseComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-firehose', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, ref ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.spec.ts:30:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CloudFoundryFirehoseComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-firehose', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, ref ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.spec.ts:30:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CloudFoundryInviteUserLinkComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-invite-user-link', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0 ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component.spec.ts:31:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CloudFoundryInviteUserLinkComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-invite-user-link', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0 ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component.spec.ts:31:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CloudFoundryOrganizationBaseComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryOrganizationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33605121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 50688, directChildFlags: 50688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 5, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-organization-base', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 5, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 5, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds:  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-cloud-foundry-organization-base.component.spec.ts:30:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CloudFoundryOrganizationBaseComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryOrganizationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33605121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 50688, directChildFlags: 50688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 5, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-organization-base', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 5, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 5, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds:  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-cloud-foundry-organization-base.component.spec.ts:30:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CloudFoundryOrganizationSpacesComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33608193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 53760, directChildFlags: 53760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-organization-spaces', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0 ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.spec.ts:38:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CloudFoundryOrganizationSpacesComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33608193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 53760, directChildFlags: 53760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-organization-spaces', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0 ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.spec.ts:38:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CloudFoundrySpaceBaseComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundrySpaceService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundrySpaceService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundrySpaceService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33736193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 181760, directChildFlags: 181760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 5, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-space-base', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 5, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 5, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, refe ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-cloud-foundry-space-base.component.spec.ts:30:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CloudFoundrySpaceBaseComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundrySpaceService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundrySpaceService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundrySpaceService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33736193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 181760, directChildFlags: 181760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 5, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-space-base', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 5, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 5, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, refe ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-cloud-foundry-space-base.component.spec.ts:30:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CloudFoundrySpaceAppsComponent
-    ✓ should create
-
-  CloudFoundrySpaceRoutesComponent
-    ✓ should create
-
-  CloudFoundrySpaceServiceInstancesComponent
-    ✓ should create
-
-  CloudFoundrySpaceSummaryComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryOrganizationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-space-summary', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts:53:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CloudFoundrySpaceSummaryComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryOrganizationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-space-summary', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts:53:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CloudFoundrySpaceUserServiceInstancesComponent
-    ✓ should create
-
-  CloudFoundrySpaceUsersComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 38518785, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, flags: 1, checkIndex: -1, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({ noEntriesForCurrentFilter: 2 }), ngContentIndex: null, childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: null, name: null, attrs: null, template: Object({ factory: Function, nodeFlags: 33669185, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: Array, updateDirectives: Function, updateRenderer: Function, handleEvent: Function, bindingCount: 4, outputCount: 0, lastRenderRootNode: Object }), componentProvider: null, componentView: null, co ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts:46:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CloudFoundrySpaceUsersComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 38518785, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, flags: 1, checkIndex: -1, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({ noEntriesForCurrentFilter: 2 }), ngContentIndex: null, childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: null, name: null, attrs: null, template: Object({ factory: Function, nodeFlags: 33669185, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: Array, updateDirectives: Function, updateRenderer: Function, handleEvent: Function, bindingCount: 4, outputCount: 0, lastRenderRootNode: Object }), componentProvider: null, componentView: null, co ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts:46:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CloudFoundryOrganizationSummaryComponent
-    ✗ should create
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-organization-summary', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0 ...
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.spec.ts:47:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CloudFoundryOrganizationSummaryComponent should create FAILED
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-organization-summary', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0 ...
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.spec.ts:47:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CloudFoundryOrganizationUsersComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 38518785, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, flags: 1, checkIndex: -1, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({ noEntriesForCurrentFilter: 2 }), ngContentIndex: null, childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: null, name: null, attrs: null, template: Object({ factory: Function, nodeFlags: 33669185, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: Array, updateDirectives: Function, updateRenderer: Function, handleEvent: Function, bindingCount: 4, outputCount: 0, lastRenderRootNode: Object }), componentProvider: null, componentView: null, co ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component.spec.ts:41:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CloudFoundryOrganizationUsersComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 38518785, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, flags: 1, checkIndex: -1, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({ noEntriesForCurrentFilter: 2 }), ngContentIndex: null, childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: null, name: null, attrs: null, template: Object({ factory: Function, nodeFlags: 33669185, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: Array, updateDirectives: Function, updateRenderer: Function, handleEvent: Function, bindingCount: 4, outputCount: 0, lastRenderRootNode: Object }), componentProvider: null, componentView: null, co ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component.spec.ts:41:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CloudFoundryOrganizationsComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33608193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 53760, directChildFlags: 53760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-organizations', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, r ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organizations.component.spec.ts:31:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CloudFoundryOrganizationsComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33608193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 53760, directChildFlags: 53760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-organizations', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, r ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organizations.component.spec.ts:31:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CloudFoundryRoutesComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 38518785, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, flags: 1, checkIndex: -1, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({ noEntriesMaxedResults: 2 }), ngContentIndex: null, childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: null, name: null, attrs: null, template: Object({ factory: Function, nodeFlags: 33669185, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: Array, updateDirectives: Function, updateRenderer: Function, handleEvent: Function, bindingCount: 4, outputCount: 0, lastRenderRootNode: Object }), componentProvider: null, componentView: null, compon ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-routes/cloud-foundry-routes.component.spec.ts:35:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CloudFoundryRoutesComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 38518785, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, flags: 1, checkIndex: -1, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({ noEntriesMaxedResults: 2 }), ngContentIndex: null, childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: null, name: null, attrs: null, template: Object({ factory: Function, nodeFlags: 33669185, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: Array, updateDirectives: Function, updateRenderer: Function, handleEvent: Function, bindingCount: 4, outputCount: 0, lastRenderRootNode: Object }), componentProvider: null, componentView: null, compon ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-routes/cloud-foundry-routes.component.spec.ts:35:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CloudFoundrySecurityGroupsComponent
-    ✗ should create
-	TypeError: Cannot read property 'includeRelations' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 38518785, rootNodeFlags: 1, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 38518785, directChildFlags: 33554433, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'div', attrs: [ Array ], template: null, componentProvider: null, componentView: null, componentRendererType: null, publicProviders: null({  }), allProviders: null({  }), handleEvent: Function }), provider: null, text: null, query: null, ngContent: null }), Object({ nodeIndex: 1, parent: Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 38518785, directChildFlags:  ...
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/security-groups.action-builder.ts:6:35)
-	    at new actionBuilder (src/shared/components/list/list-types/cf-security-groups/cf-security-groups-data-source.ts:28:22)
-	    at new CfSecurityGroupsListConfigService (src/shared/components/list/list-types/cf-security-groups/cf-security-groups-list-config.service.ts:61:28)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22142:1)
-	    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22244:45)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22148:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at callViewAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23561:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-security-groups/cloud-foundry-security-groups.component.spec.ts:27:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CloudFoundrySecurityGroupsComponent should create FAILED
-	TypeError: Cannot read property 'includeRelations' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 38518785, rootNodeFlags: 1, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 38518785, directChildFlags: 33554433, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'div', attrs: [ Array ], template: null, componentProvider: null, componentView: null, componentRendererType: null, publicProviders: null({  }), allProviders: null({  }), handleEvent: Function }), provider: null, text: null, query: null, ngContent: null }), Object({ nodeIndex: 1, parent: Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 38518785, directChildFlags:  ...
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/security-groups.action-builder.ts:6:35)
-	    at new actionBuilder (src/shared/components/list/list-types/cf-security-groups/cf-security-groups-data-source.ts:28:22)
-	    at new CfSecurityGroupsListConfigService (src/shared/components/list/list-types/cf-security-groups/cf-security-groups-list-config.service.ts:61:28)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22142:1)
-	    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22244:45)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22148:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at callViewAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23561:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-security-groups/cloud-foundry-security-groups.component.spec.ts:27:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CloudFoundryStacksComponent
-    ✓ should create
-
-  CloudFoundrySummaryTabComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-summary-tab', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, ref ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.spec.ts:37:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CloudFoundrySummaryTabComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-summary-tab', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, ref ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.spec.ts:37:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CloudFoundryUsersComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 38518785, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, flags: 1, checkIndex: -1, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({ noEntriesForCurrentFilter: 2 }), ngContentIndex: null, childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: null, name: null, attrs: null, template: Object({ factory: Function, nodeFlags: 33669185, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: Array, updateDirectives: Function, updateRenderer: Function, handleEvent: Function, bindingCount: 4, outputCount: 0, lastRenderRootNode: Object }), componentProvider: null, componentView: null, co ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.spec.ts:38:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CloudFoundryUsersComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 38518785, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, flags: 1, checkIndex: -1, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({ noEntriesForCurrentFilter: 2 }), ngContentIndex: null, childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: null, name: null, attrs: null, template: Object({ factory: Function, nodeFlags: 33669185, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: Array, updateDirectives: Function, updateRenderer: Function, handleEvent: Function, bindingCount: 4, outputCount: 0, lastRenderRootNode: Object }), componentProvider: null, componentView: null, co ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.spec.ts:38:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  InviteUsersCreateComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-invite-users-create', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.spec.ts:38:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) InviteUsersCreateComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-invite-users-create', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.spec.ts:38:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  InviteUsersComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 643023379, rootNodeFlags: 33554433, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 4374530, directChildFlags: 4374530, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-page-header', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 4374528, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngC ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/users/invite-users/invite-users.component.spec.ts:36:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) InviteUsersComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 643023379, rootNodeFlags: 33554433, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 4374530, directChildFlags: 4374530, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-page-header', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 4374528, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngC ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/users/invite-users/invite-users.component.spec.ts:36:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CfRolesService
-    ✗ should be created
-	Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ] })
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CfRolesService should be created FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ] })
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-  UsersRolesConfirmComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 34717697, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 1163264, directChildFlags: 1163264, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-manage-users-confirm', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 1163264, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/users/manage-users/manage-users-confirm/manage-users-confirm.component.spec.ts:45:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) UsersRolesConfirmComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 34717697, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 1163264, directChildFlags: 1163264, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-manage-users-confirm', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 1163264, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/users/manage-users/manage-users-confirm/manage-users-confirm.component.spec.ts:45:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  UsersRolesModifyComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33808897, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 254464, directChildFlags: 254464, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-manage-users-modify', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.spec.ts:49:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) UsersRolesModifyComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33808897, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 254464, directChildFlags: 254464, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-manage-users-modify', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.spec.ts:49:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  SpaceRolesListWrapperComponent
-    ✓ should create
-
-  UsersRolesSelectComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33604609, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 50176, directChildFlags: 50176, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-manage-users-select', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ng ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/users/manage-users/manage-users-select/manage-users-select.component.spec.ts:43:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) UsersRolesSelectComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33604609, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 50176, directChildFlags: 50176, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-manage-users-select', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ng ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/users/manage-users/manage-users-select/manage-users-select.component.spec.ts:43:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  UsersRolesComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CfUserService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CfUserService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfUserService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33740289, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 185856, directChildFlags: 185856, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 4, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-manage-users', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 4, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 4, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngConte ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/users/manage-users/manage-users.component.spec.ts:68:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) UsersRolesComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CfUserService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CfUserService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfUserService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33740289, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 185856, directChildFlags: 185856, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 4, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-manage-users', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 4, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 4, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngConte ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/users/manage-users/manage-users.component.spec.ts:68:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  RemoveUserComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33736193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 181760, directChildFlags: 181760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 4, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-remove-user', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 4, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 4, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngConte ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/users/remove-user/remove-user.component.spec.ts:61:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) RemoveUserComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33736193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 181760, directChildFlags: 181760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 4, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-remove-user', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 4, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 4, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngConte ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/cloud-foundry/users/remove-user/remove-user.component.spec.ts:61:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  ServiceBaseComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[ServicesService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ServicesService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ServicesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33604609, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 50176, directChildFlags: 50176, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-service-base', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngConten ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/service-catalog/service-service-base.component.spec.ts:33:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) ServiceBaseComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[ServicesService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ServicesService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ServicesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33604609, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 50176, directChildFlags: 50176, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-service-base', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngConten ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/service-catalog/service-service-base.component.spec.ts:33:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  ServiceCatalogPageComponent
-    ✓ should create
-
-  ServiceInstancesComponent
-    ✗ should create
-	TypeError: Cannot read property 'includeRelations' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 38518785, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 4964352, directChildFlags: 4964352, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-list', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 4964352, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0, outputs: Array ...
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/service-instance.action.builders.ts:13:35)
-	    at new actionBuilder (src/shared/components/list/list-types/service-instances/service-instances-data-source.ts:27:22)
-	    at new ServiceInstancesListConfigService (src/shared/components/list/list-types/service-instances/service-instances-list-config.service.ts:44:28)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22150:1)
-	    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22244:45)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22148:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at callViewAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23561:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/service-catalog/service-instances/service-instances.component.spec.ts:42:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) ServiceInstancesComponent should create FAILED
-	TypeError: Cannot read property 'includeRelations' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 38518785, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 4964352, directChildFlags: 4964352, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-list', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 4964352, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0, outputs: Array ...
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/service-instance.action.builders.ts:13:35)
-	    at new actionBuilder (src/shared/components/list/list-types/service-instances/service-instances-data-source.ts:27:22)
-	    at new ServiceInstancesListConfigService (src/shared/components/list/list-types/service-instances/service-instances-list-config.service.ts:44:28)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22150:1)
-	    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22244:45)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22148:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at callViewAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23561:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/service-catalog/service-instances/service-instances.component.spec.ts:42:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  ServicePlansComponent
-    ✓ should create
-
-  ServiceSummaryComponent
-    ✗ should create
-	  StaticInjectorError(Platform: core)[ServiceBrokerCardComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ServiceBrokerCardComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 638697473, rootNodeFlags: 33554433, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 638697473, directChildFlags: 34717697, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 10, bindings: [ Object({ flags: 2, ns: '', name: 'tile-group-gutters', nonMinifiedName: 'tile-group-gutters', securityContext: undefined, suffix: undefined }), Object({ flags: 2, ns: '', name: 'tile-group-6-cols', nonMinifiedName: 'tile-group-6-cols', securityContext: undefined, suffix: undefined }), Object({ flags: 2, ns: '', name: 'tile-group-4-cols', nonMinifiedName: 'tile-group-4-cols', securityContext: undefined, suffix: u ...
-	Error: StaticInjectorError(DynamicTestModule)[ServiceBrokerCardComponent -> CFEntityServiceFactory]: 
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) ServiceSummaryComponent should create FAILED
-	  StaticInjectorError(Platform: core)[ServiceBrokerCardComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ServiceBrokerCardComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 638697473, rootNodeFlags: 33554433, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 638697473, directChildFlags: 34717697, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 10, bindings: [ Object({ flags: 2, ns: '', name: 'tile-group-gutters', nonMinifiedName: 'tile-group-gutters', securityContext: undefined, suffix: undefined }), Object({ flags: 2, ns: '', name: 'tile-group-6-cols', nonMinifiedName: 'tile-group-6-cols', securityContext: undefined, suffix: undefined }), Object({ flags: 2, ns: '', name: 'tile-group-4-cols', nonMinifiedName: 'tile-group-4-cols', securityContext: undefined, suffix: u ...
-	Error: StaticInjectorError(DynamicTestModule)[ServiceBrokerCardComponent -> CFEntityServiceFactory]: 
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-  ServiceTabsBaseComponent
-    ✓ should create
-
-  DetachAppsComponent
-    ✗ should create
-	TypeError: Cannot read property 'includeRelations' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33735169, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 180736, directChildFlags: 180736, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-detach-apps', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0, outputs:  ...
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/service-binding.action-builders.ts:22:35)
-	    at new actionBuilder (src/shared/components/list/list-types/detach-apps/detach-apps-data-source.ts:27:43)
-	    at new DetachAppsListConfigService (src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts:60:27)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22144:1)
-	    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-	    at createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22002:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23232:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-	    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-	    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/services/detach-service-instance/detach-apps/detach-apps.component.spec.ts:27:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) DetachAppsComponent should create FAILED
-	TypeError: Cannot read property 'includeRelations' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33735169, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 180736, directChildFlags: 180736, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-detach-apps', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0, outputs:  ...
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/service-binding.action-builders.ts:22:35)
-	    at new actionBuilder (src/shared/components/list/list-types/detach-apps/detach-apps-data-source.ts:27:43)
-	    at new DetachAppsListConfigService (src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts:60:27)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22144:1)
-	    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-	    at createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22002:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23232:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-	    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-	    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/services/detach-service-instance/detach-apps/detach-apps.component.spec.ts:27:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  DetachServiceInstanceComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[DetachServiceInstanceComponent -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[DetachServiceInstanceComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'DetachServiceInstanceComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-detach-service-instance', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, re ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/services/detach-service-instance/detach-service-instance.component.spec.ts:30:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) DetachServiceInstanceComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[DetachServiceInstanceComponent -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[DetachServiceInstanceComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'DetachServiceInstanceComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-detach-service-instance', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, re ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/services/detach-service-instance/detach-service-instance.component.spec.ts:30:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  ServicesWallComponent
-    ✗ should create
-	TypeError: Cannot read property 'paginationKey' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33739265, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 184832, directChildFlags: 184832, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-services-wall', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 3, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 3, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0, outputs ...
-	    at <Jasmine>
-	    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22142:1)
-	    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-	    at createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22002:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23232:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-	    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-	    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-	    at ComponentFactory_.push.../../../../node_modules/@angular/core/fesm5/core.js.ComponentFactory_.create (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21498:1)
-	    at initComponent (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1916:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/services/services-wall/services-wall.component.spec.ts:37:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) ServicesWallComponent should create FAILED
-	TypeError: Cannot read property 'paginationKey' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33739265, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 184832, directChildFlags: 184832, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-services-wall', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 3, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 3, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0, outputs ...
-	    at <Jasmine>
-	    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22142:1)
-	    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-	    at createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22002:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23232:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-	    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-	    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-	    at ComponentFactory_.push.../../../../node_modules/@angular/core/fesm5/core.js.ComponentFactory_.create (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21498:1)
-	    at initComponent (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1916:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/features/services/services-wall/services-wall.component.spec.ts:37:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  ServicesWallService
-    ✗ should be created
-	TypeError: Cannot read property 'includeRelations' of undefined
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/service.entity-builders.ts:9:35)
-	    at ServicesWallService.actionBuilder [as initServicesObservable] (src/features/services/services/services-wall.service.ts:29:37)
-	    at new initServicesObservable (src/features/services/services/services-wall.service.ts:48:31)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21255:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-	    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-	    at <Jasmine>
-
-Chrome 76.0.3809 (Linux 0.0.0) ServicesWallService should be created FAILED
-	TypeError: Cannot read property 'includeRelations' of undefined
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/service.entity-builders.ts:9:35)
-	    at ServicesWallService.actionBuilder [as initServicesObservable] (src/features/services/services/services-wall.service.ts:29:37)
-	    at new initServicesObservable (src/features/services/services/services-wall.service.ts:48:31)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21255:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-	    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-	    at <Jasmine>
-
-  AddServiceInstanceBaseStepComponent
-    ✓ should create
-
-  AddServiceInstanceComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[AddServiceInstanceComponent -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[AddServiceInstanceComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'AddServiceInstanceComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 34788865, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 1234432, directChildFlags: 1234432, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 7, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-add-service-instance', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 7, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 7, flags: 1228800, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, re ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/add-service-instance/add-service-instance/add-service-instance.component.spec.ts:132:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) AddServiceInstanceComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[AddServiceInstanceComponent -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[AddServiceInstanceComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'AddServiceInstanceComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 34788865, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 1234432, directChildFlags: 1234432, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 7, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-add-service-instance', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 7, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 7, flags: 1228800, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, re ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/add-service-instance/add-service-instance/add-service-instance.component.spec.ts:132:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  BindAppsStepComponent
-    ✓ should create
-
-  CsiGuidsService
-    ✓ should be created
-
-  CsiModeService
-    ✓ should be created
-
-  NoServicePlansComponent
-    ✓ should create
-
-  SelectPlanStepComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[ServicePlanPublicComponent -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ServicePlanPublicComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ServicePlanPublicComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33739265, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 184832, directChildFlags: 184832, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-select-plan-step', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references:  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/add-service-instance/select-plan-step/select-plan-step.component.spec.ts:54:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) SelectPlanStepComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[ServicePlanPublicComponent -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ServicePlanPublicComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ServicePlanPublicComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33739265, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 184832, directChildFlags: 184832, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-select-plan-step', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references:  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/add-service-instance/select-plan-step/select-plan-step.component.spec.ts:54:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  SpecifyDetailsStepComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CreateServiceInstanceHelperServiceFactory -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CreateServiceInstanceHelperServiceFactory -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CreateServiceInstanceHelperServiceFactory', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 34783233, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 1228800, directChildFlags: 1228800, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-specify-details-step', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 1228800, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQ ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/add-service-instance/specify-details-step/specify-details-step.component.spec.ts:47:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) SpecifyDetailsStepComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CreateServiceInstanceHelperServiceFactory -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CreateServiceInstanceHelperServiceFactory -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CreateServiceInstanceHelperServiceFactory', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 34783233, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 1228800, directChildFlags: 1228800, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-specify-details-step', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 1228800, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQ ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/add-service-instance/specify-details-step/specify-details-step.component.spec.ts:47:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  SpecifyUserProvidedDetailsComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryUserProvidedServicesService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryUserProvidedServicesService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryUserProvidedServicesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33734657, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 180224, directChildFlags: 180224, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-specify-user-provided-details', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matc ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21257:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.spec.ts:35:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) SpecifyUserProvidedDetailsComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryUserProvidedServicesService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryUserProvidedServicesService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryUserProvidedServicesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33734657, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 180224, directChildFlags: 180224, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-specify-user-provided-details', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matc ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21257:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.spec.ts:35:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CardAppInstancesComponent
-    ✓ should create
-
-  CardAppStatusComponent
-    ✓ should create
-
-  CardAppUptimeComponent
-    ✓ should create
-
-  CardAppUsageComponent
-    ✓ should create
-
-  CardCfInfoComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-card-cf-info', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: O ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/cards/card-cf-info/card-cf-info.component.spec.ts:35:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CardCfInfoComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-card-cf-info', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: O ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/cards/card-cf-info/card-cf-info.component.spec.ts:35:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CardCfOrgUserDetailsComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-card-cf-org-user-details', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, refe ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/cards/card-cf-org-user-details/card-cf-org-user-details.component.spec.ts:54:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CardCfOrgUserDetailsComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-card-cf-org-user-details', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, refe ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/cards/card-cf-org-user-details/card-cf-org-user-details.component.spec.ts:54:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CardCfRecentAppsComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-card-cf-recent-apps', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.spec.ts:58:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CardCfRecentAppsComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-card-cf-recent-apps', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.spec.ts:58:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CompactAppCardComponent
-    ✓ should create
-
-  CardCfSpaceDetailsComponent
-    ✓ should create
-
-  CardCfUserInfoComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-card-cf-user-info', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references:  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/cards/card-cf-user-info/card-cf-user-info.component.spec.ts:30:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CardCfUserInfoComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-card-cf-user-info', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references:  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/cards/card-cf-user-info/card-cf-user-info.component.spec.ts:30:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CompactServiceInstanceCardComponent
-    ✓ should create
-
-  ServiceBrokerCardComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[ServiceBrokerCardComponent -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ServiceBrokerCardComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ServiceBrokerCardComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-service-broker-card', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references:  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/cards/service-broker-card/service-broker-card.component.spec.ts:42:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) ServiceBrokerCardComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[ServiceBrokerCardComponent -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ServiceBrokerCardComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ServiceBrokerCardComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-service-broker-card', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references:  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/cards/service-broker-card/service-broker-card.component.spec.ts:42:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  ServiceRecentInstancesCardComponent
-    ✓ should create
-
-  ServiceSummaryCardComponent
-    ✓ should create
-06 09 2019 11:07:47.424:WARN [web-server]: 404: /test
-
-  CfEndpointDetailsComponent
-    ✓ should create
-
-  CfEndpointsMissingComponent
-    ✓ should create
-
-  CfOrgSpaceLinksComponent
-    ✓ should create
-    ✓ should render only org and space
-    with multiple endpoints
-      ✓ should render cf if multiple
-
-  CfRoleCheckboxComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cf-role-checkbox', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ng ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/cf-role-checkbox/cf-role-checkbox.component.spec.ts:45:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CfRoleCheckboxComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cf-role-checkbox', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ng ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/cf-role-checkbox/cf-role-checkbox.component.spec.ts:45:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CliCommandComponent
-    ✓ should create
-
-  CliInfoComponent
-    ✓ should create
-
-  CreateApplicationStep1Component
-    ✗ should be created
-	TypeError: Cannot read property 'paginationKey' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 34717697, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 1163264, directChildFlags: 1163264, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-create-application-step1', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 1163264, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, binding ...
-	    at <Jasmine>
-	    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21255:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22144:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/create-application/create-application-step1/create-application-step1.component.spec.ts:42:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CreateApplicationStep1Component should be created FAILED
-	TypeError: Cannot read property 'paginationKey' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 34717697, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 1163264, directChildFlags: 1163264, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-create-application-step1', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 1163264, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, binding ...
-	    at <Jasmine>
-	    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21255:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22144:1)
-	    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/create-application/create-application-step1/create-application-step1.component.spec.ts:42:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CfAppEventsConfigService
-    ✗ should be created
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ] })
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CfAppEventsConfigService should be created FAILED
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ] })
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-  EventTabActorIconPipe
-    ✓ create an instance
-
-  TableCellEventActionComponent
-    ✓ should be created
-
-  TableCellEventDetailComponent
-    ✓ should be created
-
-  TableCellEventTimestampComponent
-    ✓ should be created
-
-  TableCellEventTypeComponent
-    ✓ should be created
-
-  CfAppInstancesConfigService
-    ✗ should be created
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ] })
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CfAppInstancesConfigService should be created FAILED
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ] })
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-  TableCellCfCellComponent
-    ✓ should create
-
-  TableCellUsageComponent
-    ✓ should create
-
-  CfAppMapRoutesListConfigService
-    ✓ should be created
-
-  CfAppRoutesListConfigService
-    ✓ should be created
-
-  AppServiceBindingCardComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[AppServiceBindingCardComponent -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[AppServiceBindingCardComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'AppServiceBindingCardComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-app-service-binding-card', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.spec.ts:80:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) AppServiceBindingCardComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[AppServiceBindingCardComponent -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[AppServiceBindingCardComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'AppServiceBindingCardComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-app-service-binding-card', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.spec.ts:80:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  AppServiceBindingListConfigService
-    ✗ should be created
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ] })
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) AppServiceBindingListConfigService should be created FAILED
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ] })
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-  CfAppVariablesListConfigService
-    ✗ should be created
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ] })
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CfAppVariablesListConfigService should be created FAILED
-	Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ] })
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-  TableCellEditVariableComponent
-    ✓ should be created
-
-  CardAppComponent
-    ✓ should be created
-
-  CfAppConfigService
-    ✗ should be created
-	TypeError: Cannot read property 'paginationKey' of undefined
-	    at <Jasmine>
-	    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21255:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-	    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-
-Chrome 76.0.3809 (Linux 0.0.0) CfAppConfigService should be created FAILED
-	TypeError: Cannot read property 'paginationKey' of undefined
-	    at <Jasmine>
-	    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21255:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-	    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-
-  TableCellAppStatusComponent
-    ✓ should create
-    ✓ should create
-
-  TableCellAppInstancesComponent
-    ✓ should create
-
-  TableCellAppNameComponent
-    ✓ should be created
-
-  TableCellAppStatusComponent
-    ✓ should create
-
-  CfBuildpackCardComponent
-    ✓ should create
-
-  CfBuildpacksListConfigService
-    ✓ should be created
-
-  TableCellConfirmOrgSpaceComponent
-    ✓ should create
-
-  TableCellConfirmRoleAddRemComponent
-    ✓ should create
-
-  CfFeatureFlagsListConfigService
-    ✓ should be created
-
-  TableCellFeatureFlagStateComponent
-    ✓ should create
-
-  CfOrgUsersListConfigService
-    ✗ should be created
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ] })
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CfOrgUsersListConfigService should be created FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ] })
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-  CfOrgCardComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cf-org-card', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.spec.ts:399:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CfOrgCardComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cf-org-card', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.spec.ts:399:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CfOrgsListConfigService
-    ✓ should be created
-
-  TableCellRouteAppsAttachedComponent
-    ✓ should create
-
-  TableCellRouteComponent
-    ✓ should create
-
-  TableCellTCPRouteComponent
-    ✓ should create
-
-  CfSecurityGroupsCardComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cf-security-groups-card', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, re ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component.spec.ts:52:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CfSecurityGroupsCardComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cf-security-groups-card', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, re ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component.spec.ts:52:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CfSecurityGroupsListConfigService
-    ✗ should be created
-	TypeError: Cannot read property 'includeRelations' of undefined
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/security-groups.action-builder.ts:6:35)
-	    at new actionBuilder (src/shared/components/list/list-types/cf-security-groups/cf-security-groups-data-source.ts:28:22)
-	    at new CfSecurityGroupsListConfigService (src/shared/components/list/list-types/cf-security-groups/cf-security-groups-list-config.service.ts:61:28)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21255:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-	    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-	    at <Jasmine>
-
-Chrome 76.0.3809 (Linux 0.0.0) CfSecurityGroupsListConfigService should be created FAILED
-	TypeError: Cannot read property 'includeRelations' of undefined
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/security-groups.action-builder.ts:6:35)
-	    at new actionBuilder (src/shared/components/list/list-types/cf-security-groups/cf-security-groups-data-source.ts:28:22)
-	    at new CfSecurityGroupsListConfigService (src/shared/components/list/list-types/cf-security-groups/cf-security-groups-list-config.service.ts:61:28)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21255:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-	    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-	    at <Jasmine>
-
-  CfServiceCardComponent
-    ✓ should create
-
-  CfServicesListConfigService
-    ✗ should be created
-	TypeError: Cannot read property 'includeRelations' of undefined
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/service.entity-builders.ts:9:35)
-	    at new actionBuilder (src/shared/components/list/list-types/cf-services/cf-services-data-source.ts:29:33)
-	    at new CfServicesListConfigService (src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts:68:27)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21257:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-	    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-	    at <Jasmine>
-
-Chrome 76.0.3809 (Linux 0.0.0) CfServicesListConfigService should be created FAILED
-	TypeError: Cannot read property 'includeRelations' of undefined
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/service.entity-builders.ts:9:35)
-	    at new actionBuilder (src/shared/components/list/list-types/cf-services/cf-services-data-source.ts:29:33)
-	    at new CfServicesListConfigService (src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts:68:27)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21257:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-	    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-	    at <Jasmine>
-
-  CfSpaceAppsListConfigService
-    ✓ should be created
-
-  CfSpaceRoutesListConfigService
-    ✓ should be created
-
-  CfSpaceUsersListConfigService
-    ✗ should be created
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ] })
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CfSpaceUsersListConfigService should be created FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ] })
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-  CfSpacesServiceInstancesListConfigService
-    ✓ should be created
-
-  TableCellServiceInstanceAppsAttachedComponent
-    ✓ should create
-
-  TableCellServiceInstanceTagsComponent
-    ✓ should create
-
-  TableCellServiceNameComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[TableCellServiceNameComponent -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[TableCellServiceNameComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'TableCellServiceNameComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-table-cell-service-name', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-name/table-cell-service-name.component.spec.ts:46:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) TableCellServiceNameComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[TableCellServiceNameComponent -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[TableCellServiceNameComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'TableCellServiceNameComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-table-cell-service-name', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-name/table-cell-service-name.component.spec.ts:46:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  TableCellServicePlanComponent
-    ✓ should create
-
-  TableCellSpaceNameComponent
-    ✓ should create
-
-  CfSpaceCardComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryOrganizationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cf-space-card', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references:  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.spec.ts:88:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CfSpaceCardComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryOrganizationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cf-space-card', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references:  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.spec.ts:88:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CfOrgsSpaceListConfigService
-    ✓ should be created
-
-  CfStacksCardComponent
-    ✓ should create
-
-  CfStacksListConfigService
-    ✓ should be created
-
-  TableCellSpaceRoleComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cf-role-checkbox', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ng ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component.spec.ts:60:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) TableCellSpaceRoleComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cf-role-checkbox', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ng ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component.spec.ts:60:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  TableCellSelectOrgComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-table-cell-select-org', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component.spec.ts:47:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) TableCellSelectOrgComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-table-cell-select-org', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component.spec.ts:47:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CfUserPermissionCellComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-org-user-permission-cell', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, refe ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/list/list-types/cf-users/cf-org-permission-cell/cf-org-permission-cell.component.spec.ts:39:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CfUserPermissionCellComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-org-user-permission-cell', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, refe ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/list/list-types/cf-users/cf-org-permission-cell/cf-org-permission-cell.component.spec.ts:39:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CfSpacePermissionCellComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cf-space-permission-cell', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, refe ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/list/list-types/cf-users/cf-space-permission-cell/cf-space-permission-cell.component.spec.ts:29:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CfSpacePermissionCellComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cf-space-permission-cell', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, refe ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/list/list-types/cf-users/cf-space-permission-cell/cf-space-permission-cell.component.spec.ts:29:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  CfUserListConfigService
-    ✗ should be created
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ] })
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CfUserListConfigService should be created FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ] })
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-  DetachAppsListConfigService
-    ✗ should be created
-	TypeError: Cannot read property 'includeRelations' of undefined
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/service-binding.action-builders.ts:22:35)
-	    at new actionBuilder (src/shared/components/list/list-types/detach-apps/detach-apps-data-source.ts:27:43)
-	    at new DetachAppsListConfigService (src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts:60:27)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21257:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-	    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-	    at <Jasmine>
-
-Chrome 76.0.3809 (Linux 0.0.0) DetachAppsListConfigService should be created FAILED
-	TypeError: Cannot read property 'includeRelations' of undefined
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/service-binding.action-builders.ts:22:35)
-	    at new actionBuilder (src/shared/components/list/list-types/detach-apps/detach-apps-data-source.ts:27:43)
-	    at new DetachAppsListConfigService (src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts:60:27)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21257:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-	    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-	    at <Jasmine>
-
-  ServiceInstancesListConfigService
-    ✗ should be created
-	TypeError: Cannot read property 'includeRelations' of undefined
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/service-instance.action.builders.ts:13:35)
-	    at new actionBuilder (src/shared/components/list/list-types/service-instances/service-instances-data-source.ts:27:22)
-	    at new ServiceInstancesListConfigService (src/shared/components/list/list-types/service-instances/service-instances-list-config.service.ts:44:28)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21263:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-	    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-	    at <Jasmine>
-
-Chrome 76.0.3809 (Linux 0.0.0) ServiceInstancesListConfigService should be created FAILED
-	TypeError: Cannot read property 'includeRelations' of undefined
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/service-instance.action.builders.ts:13:35)
-	    at new actionBuilder (src/shared/components/list/list-types/service-instances/service-instances-data-source.ts:27:22)
-	    at new ServiceInstancesListConfigService (src/shared/components/list/list-types/service-instances/service-instances-list-config.service.ts:44:28)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21263:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-	    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-	    at <Jasmine>
-
-  ServicePlansListConfigService
-    ✓ should be created
-
-  TableCellAServicePlanExtrasComponent
-    ✓ should create
-
-  TableCellAServicePlanPriceComponent
-    ✓ should create
-
-  TableCellAServicePlanPublicComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[ServicePlanPublicComponent -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ServicePlanPublicComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ServicePlanPublicComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-service-plan-public', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references:  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/list/list-types/service-plans/table-cell-service-plan-public/table-cell-service-plan-public.component.spec.ts:42:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) TableCellAServicePlanPublicComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[ServicePlanPublicComponent -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ServicePlanPublicComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ServicePlanPublicComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-service-plan-public', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references:  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/list/list-types/service-plans/table-cell-service-plan-public/table-cell-service-plan-public.component.spec.ts:42:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  ServiceInstanceCardComponent
-    ✓ should create
-
-  ServiceInstancesWallListConfigService
-    ✗ should be created
-	TypeError: Cannot read property 'paginationKey' of undefined
-	    at <Jasmine>
-	    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21255:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-	    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-
-Chrome 76.0.3809 (Linux 0.0.0) ServiceInstancesWallListConfigService should be created FAILED
-	TypeError: Cannot read property 'paginationKey' of undefined
-	    at <Jasmine>
-	    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21255:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-	    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-
-  UserProvidedServiceInstanceCardComponent
-    ✓ should create
-
-  RunningInstancesComponent
-    ✓ should create
-
-  SchemaFormComponent
-    ✓ should create
-
-  SelectServiceComponent
-    ✗ should create
-	TypeError: Cannot read property 'includeRelations' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 34783745, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 1229312, directChildFlags: 1229312, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-select-service', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 1228800, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0,  ...
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/service.entity-builders.ts:9:35)
-	    at ServicesWallService.actionBuilder [as initServicesObservable] (src/features/services/services/services-wall.service.ts:29:37)
-	    at new initServicesObservable (src/features/services/services/services-wall.service.ts:48:31)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22142:1)
-	    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-	    at createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22002:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23232:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-	    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-	    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/select-service/select-service.component.spec.ts:86:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) SelectServiceComponent should create FAILED
-	TypeError: Cannot read property 'includeRelations' of undefined
-	error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 34783745, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 1229312, directChildFlags: 1229312, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-select-service', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 1228800, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0,  ...
-	    at <Jasmine>
-	    at includeRelations (src/entity-action-builders/service.entity-builders.ts:9:35)
-	    at ServicesWallService.actionBuilder [as initServicesObservable] (src/features/services/services/services-wall.service.ts:29:37)
-	    at new initServicesObservable (src/features/services/services/services-wall.service.ts:48:31)
-	    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22142:1)
-	    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-	    at createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22002:1)
-	    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23232:1)
-	    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-	    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-	    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/select-service/select-service.component.spec.ts:86:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  ServiceIconComponent
-    ✓ should create
-
-  ServicePlanPriceComponent
-    ✓ should create
-
-  ServicePlanPublicComponent
-    ✗ should create
-	Error: StaticInjectorError(DynamicTestModule)[ServicePlanPublicComponent -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ServicePlanPublicComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ServicePlanPublicComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-service-plan-public', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references:  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/service-plan-public/service-plan-public.component.spec.ts:32:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) ServicePlanPublicComponent should create FAILED
-	Error: StaticInjectorError(DynamicTestModule)[ServicePlanPublicComponent -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[ServicePlanPublicComponent -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ServicePlanPublicComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-service-plan-public', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references:  ...
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-	Error: Expected undefined to be truthy.
-	    at <Jasmine>
-	    at UserContext.<anonymous> (src/shared/components/service-plan-public/service-plan-public.component.spec.ts:32:23)
-	    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-	    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-  EndpointOrgSpaceServiceService
-    ✗ should be created
-	TypeError: Cannot read property 'paginationKey' of undefined
-	    at <Jasmine>
-	    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21255:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-	    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-	    at <Jasmine>
-	    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.execute (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:1)
-	    at UserContext.<anonymous> (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1991:29)
-
-Chrome 76.0.3809 (Linux 0.0.0) EndpointOrgSpaceServiceService should be created FAILED
-	TypeError: Cannot read property 'paginationKey' of undefined
-	    at <Jasmine>
-	    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21255:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-	    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-	    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-	    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-	    at <Jasmine>
-	    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.execute (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:1)
-	    at UserContext.<anonymous> (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1991:29)
-
-  CfUserService
-    ✗ should be created
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ] })
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-Chrome 76.0.3809 (Linux 0.0.0) CfUserService should be created FAILED
-	Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-	    NullInjectorError: No provider for CFEntityServiceFactory!
-	error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ] })
-	    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-	    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-	    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-	    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-	    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-	    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-  ServiceActionHelperService
-    ✓ should be created
-TOTAL: 103 FAILED, 120 SUCCESS
-
-Chrome 76.0.3809 (Linux 0.0.0): Executed 223 of 229 (103 FAILED) (skipped 6) (8 mins 13.018 secs / 8 mins 11.699 secs)
-TOTAL: 103 FAILED, 120 SUCCESS
-
-
-1) Have missing relation in store, associate it with parent
-     Entity Relations - validate - validate from store - 
-     Error: Expected $.apiAction not to have properties
-    childEntityKey: 'cfQuota_definition'
-    at <Jasmine>
-    at src/entity-relations/entity-relations-validate.spec.ts:470:52
-    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.execute (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1822:1)
-    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1991:29
-
-2) should create
-     ApplicationDeleteComponent
-     Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33608193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 53760, directChildFlags: 53760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-application-delete', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 3, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 3, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/applications/application-delete/application-delete.component.spec.ts:47:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-3) should create
-     DeleteAppInstancesComponent
-     Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33735169, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 180736, directChildFlags: 180736, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-delete-app-instances', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/applications/application-delete/delete-app-instances/delete-app-instances.component.spec.ts:44:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-4) should create
-     DeleteAppRoutesComponent
-     Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33735169, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 180736, directChildFlags: 180736, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-delete-app-routes', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/applications/application-delete/delete-app-routes/delete-app-routes.component.spec.ts:45:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-5) should be created
-     ApplicationWallComponent
-     TypeError: Cannot read property 'paginationKey' of undefined
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33739265, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 184832, directChildFlags: 184832, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-application-wall', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 3, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 3, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0, o ...
-    at <Jasmine>
-    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22142:1)
-    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-    at createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22002:1)
-    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23232:1)
-    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-    at ComponentFactory_.push.../../../../node_modules/@angular/core/fesm5/core.js.ComponentFactory_.create (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21498:1)
-    at initComponent (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1916:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/applications/application-wall/application-wall.component.spec.ts:37:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-6) should be created
-     ApplicationService
-     Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ] })
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-7) should create
-     ApplicationPollComponent
-     Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-application-poll', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, n ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/applications/application/application-tabs-application-poll/application-poll.component.spec.ts:44:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-8) should be created
-     ApplicationTabsBaseComponent
-     Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800705, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 246272, directChildFlags: 246272, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-application-tabs-base', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: O ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/applications/application/application-tabs-application-tabs-base.component.spec.ts:71:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-9) should be created
-     EventsTabComponent
-     TypeError: actionBuilder is not a function
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 38518785, rootNodeFlags: 1, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 38518785, directChildFlags: 33554433, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'div', attrs: [ Array ], template: null, componentProvider: null, componentView: null, componentRendererType: null, publicProviders: null({  }), allProviders: null({  }), handleEvent: Function }), provider: null, text: null, query: null, ngContent: null }), Object({ nodeIndex: 1, parent: Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 38518785, directChildFlags:  ...
-    at <Jasmine>
-    at new actionBuilder (src/shared/components/list/list-types/app-event/cf-app-events-data-source.ts:28:22)
-    at new CfAppEventsConfigService (src/shared/components/list/list-types/app-event/cf-app-events-config.service.ts:63:29)
-    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22142:1)
-    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22244:45)
-    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22148:1)
-    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-    at callViewAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23561:1)
-    at execComponentViewsAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23480:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/applications/application/application-tabs-tabs/events-tab/events-tab.component.spec.ts:75:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-10) should create
-     InstancesTabComponent
-     Uncaught TypeError: Cannot read property 'actionOrchestrator' of undefined thrown
-     Error: StaticInjectorError(DynamicTestModule)[ListConfig -> CloudFoundryEndpointService]: 
-  StaticInjectorError(Platform: core)[ListConfig -> CloudFoundryEndpointService]: 
-    NullInjectorError: No provider for CloudFoundryEndpointService!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ListConfig', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 643547137, rootNodeFlags: 33554433, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 638828545, directChildFlags: 33603585, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 16, bindings: [ Object({ flags: 2, ns: '', name: 'app-tile-grid-fit', nonMinifiedName: 'app-tile-grid-fit', securityContext: undefined, suffix: undefined }) ], bindingFlags: 2, outputs: [  ], element: Object({ ns: '', name: 'app-tile-grid', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 1, outputIndex: 0, checkIndex: 1, flags:  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/applications/application/application-tabs-tabs/instances-tab/instances-tab.component.spec.ts:50:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at AsyncTestZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.AsyncTestZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:714:1)
-
-11) should be created
-     LogStreamTabComponent
-     Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-log-stream-tab', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/applications/application/application-tabs-tabs/log-stream-tab/log-stream-tab.component.spec.ts:70:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-12) should create
-     RoutesTabComponent
-     Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33805825, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 251392, directChildFlags: 251392, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-routes-tab', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 3, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 3, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngCo ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/applications/application/application-tabs-tabs/routes-tab/routes-tab/routes-tab.component.spec.ts:37:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-13) should be created
-     ServicesTabComponent
-     Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 38518785, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, flags: 1, checkIndex: -1, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({ noEntries: 2 }), ngContentIndex: null, childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: null, name: null, attrs: null, template: Object({ factory: Function, nodeFlags: 33669185, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: Array, updateDirectives: Function, updateRenderer: Function, handleEvent: Function, bindingCount: 5, outputCount: 0, lastRenderRootNode: Object }), componentProvider: null, componentView: null, componentRendererType: null,  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/applications/application/application-tabs-tabs/services-tab/services-tab.component.spec.ts:45:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-14) should create
-     CliInfoApplicationComponent
-     Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cli-info-application', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/applications/cli-info-application/cli-info-application.component.spec.ts:60:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-15) should be created
-     CreateApplicationStep3Component
-     Error: StaticInjectorError(DynamicTestModule)[CreateApplicationStep3Component -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CreateApplicationStep3Component -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CreateApplicationStep3Component', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33673729, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 119296, directChildFlags: 119296, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-create-application-step3', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0,  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/applications/create-application/create-application-step3/create-application-step3.component.spec.ts:37:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-16) should be created
-     CreateApplicationComponent
-     TypeError: Cannot read property 'paginationKey' of undefined
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800705, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 246272, directChildFlags: 246272, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-create-application', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0,  ...
-    at <Jasmine>
-    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22142:1)
-    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-    at createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22002:1)
-    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23232:1)
-    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-    at ComponentFactory_.push.../../../../node_modules/@angular/core/fesm5/core.js.ComponentFactory_.create (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21498:1)
-    at initComponent (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1916:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/applications/create-application/create-application.component.spec.ts:65:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-17) should create
-     DeployApplicationStepSourceUploadComponent
-     TypeError: Cannot read property 'paginationKey' of undefined
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33734657, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 180224, directChildFlags: 180224, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-deploy-application-step-source-upload', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array,  ...
-    at <Jasmine>
-    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21255:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22142:1)
-    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/applications/deploy-application/deploy-application-step-source-upload/deploy-application-step-source-upload.component.spec.ts:43:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-18) should create
-     DeployApplicationStep3Component
-     TypeError: Cannot read property 'paginationKey' of undefined
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33734657, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 180224, directChildFlags: 180224, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-deploy-application-step3', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags:  ...
-    at <Jasmine>
-    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21255:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22144:1)
-    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/applications/deploy-application/deploy-application-step3/deploy-application-step3.component.spec.ts:45:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-19) should create
-     DeployApplicationComponent
-     TypeError: Cannot read property 'paginationKey' of undefined
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33804801, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 250368, directChildFlags: 250368, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-deploy-application', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 3, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 3, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0,  ...
-    at <Jasmine>
-    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22142:1)
-    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-    at createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22002:1)
-    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23232:1)
-    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-    at ComponentFactory_.push.../../../../node_modules/@angular/core/fesm5/core.js.ComponentFactory_.create (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21498:1)
-    at initComponent (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1916:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/applications/deploy-application/deploy-application.component.spec.ts:85:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-20) should create
-     EditApplicationComponent
-     Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33804801, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 250368, directChildFlags: 250368, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-edit-application', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/applications/edit-application/edit-application.component.spec.ts:69:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-21) should create
-     AddRouteStepperComponent
-     Error: StaticInjectorError(DynamicTestModule)[AddRoutesComponent -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[AddRoutesComponent -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'AddRoutesComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 643023363, rootNodeFlags: 33554433, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 4374531, directChildFlags: 4374529, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-page-header', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 4374528, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/applications/routes/add-route-stepper/add-route-stepper.component.spec.ts:51:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-22) should create
-     AddRoutesComponent
-     Error: StaticInjectorError(DynamicTestModule)[AddRoutesComponent -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[AddRoutesComponent -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'AddRoutesComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-add-routes', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngCo ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/applications/routes/add-routes/add-routes.component.spec.ts:41:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-23) should create
-     AddOrganizationComponent
-     TypeError: Cannot read property 'includeRelations' of undefined
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 643023363, rootNodeFlags: 1, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643023363, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 11, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'div', attrs: [ Array ], template: null, componentProvider: null, componentView: null, componentRendererType: null, publicProviders: null({  }), allProviders: null({  }), handleEvent: Function }), provider: null, text: null, query: null, ngContent: null }), Object({ nodeIndex: 1, parent: Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643023363, directChildFlags:  ...
-    at <Jasmine>
-    at includeRelations (src/entity-action-builders/quota-definition.action-builders.ts:4:35)
-    at CreateOrganizationStepComponent.actionBuilder [as ngOnInit] (src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts:79:40)
-    at checkAndUpdateDirectiveInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-    at checkAndUpdateNodeInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-    at checkAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-    at debugCheckAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-    at debugCheckDirectivesFn (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/AddOrganizationComponent.ngfactory.js:37:5)
-    at Object.debugUpdateDirectives [as updateDirectives] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23901:1)
-    at checkAndUpdateView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23297:1)
-
-24) should create
-     CreateOrganizationStepComponent
-     TypeError: Cannot read property 'includeRelations' of undefined
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-create-organization-step', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags:  ...
-    at <Jasmine>
-    at includeRelations (src/entity-action-builders/quota-definition.action-builders.ts:4:35)
-    at CreateOrganizationStepComponent.actionBuilder [as ngOnInit] (src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts:79:40)
-    at checkAndUpdateDirectiveInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22089:1)
-    at checkAndUpdateNodeInline (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23353:1)
-    at checkAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23315:1)
-    at debugCheckAndUpdateNode (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23949:1)
-    at debugCheckDirectivesFn (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23909:1)
-    at Object.eval [as updateDirectives] (ng:///DynamicTestModule/CreateOrganizationStepComponent_Host.ngfactory.js:10:5)
-    at Object.debugUpdateDirectives [as updateDirectives] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23901:1)
-    at checkAndUpdateView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23297:1)
-
-25) should create
-     AddSpaceComponent
-     TypeError: Cannot read property 'includeRelations' of undefined
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 643023363, rootNodeFlags: 1, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643023363, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 11, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'div', attrs: [ Array ], template: null, componentProvider: null, componentView: null, componentRendererType: null, publicProviders: null({  }), allProviders: null({  }), handleEvent: Function }), provider: null, text: null, query: null, ngContent: null }), Object({ nodeIndex: 1, parent: Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643023363, directChildFlags:  ...
-    at <Jasmine>
-    at includeRelations (src/entity-action-builders/space.action-builders.ts:22:35)
-    at CreateSpaceStepComponent.getAllSpaceActionBuilder (src/features/cloud-foundry/add-edit-space-step-base.ts:27:22)
-    at new call (src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.ts:39:28)
-    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22150:1)
-    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-    at callViewAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23561:1)
-    at execComponentViewsAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23480:1)
-    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23273:1)
-    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/add-space/add-space.component.spec.ts:28:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-26) should create
-     CreateSpaceStepComponent
-     TypeError: Cannot read property 'includeRelations' of undefined
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-create-space-step', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0,  ...
-    at <Jasmine>
-    at includeRelations (src/entity-action-builders/space.action-builders.ts:22:35)
-    at CreateSpaceStepComponent.getAllSpaceActionBuilder (src/features/cloud-foundry/add-edit-space-step-base.ts:27:22)
-    at new call (src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.ts:39:28)
-    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22150:1)
-    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-    at ComponentFactory_.push.../../../../node_modules/@angular/core/fesm5/core.js.ComponentFactory_.create (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21498:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.spec.ts:27:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-27) should create
-     CliInfoCloudFoundryComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundrySpaceService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundrySpaceService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundrySpaceService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33670657, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 116224, directChildFlags: 116224, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 5, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cli-info-cloud-foundry', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 5, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 5, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.spec.ts:39:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-28) should create
-     CloudFoundryTabsBaseComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-tabs-base', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, re ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/cloud-foundry-tabs-cloud-foundry-tabs-base.component.spec.ts:40:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-29) should create
-     EditOrganizationStepComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryOrganizationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33801729, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 247296, directChildFlags: 247296, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-edit-organization-step', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 3, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 3, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0,  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.spec.ts:30:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-30) should create
-     EditOrganizationComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryOrganizationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 643024387, rootNodeFlags: 1, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 643024387, directChildFlags: 33554433, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 13, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'div', attrs: [ Array ], template: null, componentProvider: null, componentView: null, componentRendererType: null, publicProviders: null({  }), allProviders: null({  }), handleEvent: Function }), provider: null, text: null, query: null, ngContent: null }), Object({ nodeIndex: 1, parent: Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex:  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/edit-organization/edit-organization.component.spec.ts:33:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-31) should create
-     EditSpaceStepComponent
-     TypeError: Cannot read property 'includeRelations' of undefined
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33734657, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 180224, directChildFlags: 180224, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-edit-space-step', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0, ou ...
-    at <Jasmine>
-    at includeRelations (src/entity-action-builders/space.action-builders.ts:22:35)
-    at EditSpaceStepComponent.getAllSpaceActionBuilder (src/features/cloud-foundry/add-edit-space-step-base.ts:27:22)
-    at new call (src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.ts:43:28)
-    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22150:1)
-    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-    at ComponentFactory_.push.../../../../node_modules/@angular/core/fesm5/core.js.ComponentFactory_.create (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21498:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.spec.ts:34:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-32) should create
-     EditSpaceComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundrySpaceService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundrySpaceService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundrySpaceService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33670657, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 116224, directChildFlags: 116224, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-edit-space', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 3, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 3, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/edit-space/edit-space.component.spec.ts:33:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-33) should create
-     QuotaDefinitionComponent
-     Error: StaticInjectorError(DynamicTestModule)[QuotaDefinitionComponent -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[QuotaDefinitionComponent -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'QuotaDefinitionComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33604609, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 50176, directChildFlags: 50176, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-quota-definition', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/quota-definition/quota-definition.component.spec.ts:46:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-34) should create
-     SpaceQuotaDefinitionComponent
-     Error: StaticInjectorError(DynamicTestModule)[SpaceQuotaDefinitionComponent -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[SpaceQuotaDefinitionComponent -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'SpaceQuotaDefinitionComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33604609, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 50176, directChildFlags: 50176, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-space-quota-definition', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, refe ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.spec.ts:98:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-35) should create
-     CfAdminAddUserWarningComponent
-     Error: StaticInjectorError(DynamicTestModule)[CfUserService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CfUserService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfUserService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cf-admin-add-user-warning', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.spec.ts:28:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-36) should create
-     CloudFoundryCellsComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33609217, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 54784, directChildFlags: 54784, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-cells', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 3, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 3, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references:  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.spec.ts:45:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-37) should create
-     CloudFoundryFirehoseComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-firehose', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, ref ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.spec.ts:30:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-38) should create
-     CloudFoundryInviteUserLinkComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-invite-user-link', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0 ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component.spec.ts:31:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-39) should create
-     CloudFoundryOrganizationBaseComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryOrganizationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33605121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 50688, directChildFlags: 50688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 5, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-organization-base', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 5, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 5, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds:  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-cloud-foundry-organization-base.component.spec.ts:30:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-40) should create
-     CloudFoundryOrganizationSpacesComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33608193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 53760, directChildFlags: 53760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-organization-spaces', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0 ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.spec.ts:38:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-41) should create
-     CloudFoundrySpaceBaseComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundrySpaceService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundrySpaceService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundrySpaceService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33736193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 181760, directChildFlags: 181760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 5, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-space-base', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 5, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 5, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, refe ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-cloud-foundry-space-base.component.spec.ts:30:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-42) should create
-     CloudFoundrySpaceSummaryComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryOrganizationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-space-summary', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0,  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts:53:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-43) should create
-     CloudFoundrySpaceUsersComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 38518785, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, flags: 1, checkIndex: -1, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({ noEntriesForCurrentFilter: 2 }), ngContentIndex: null, childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: null, name: null, attrs: null, template: Object({ factory: Function, nodeFlags: 33669185, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: Array, updateDirectives: Function, updateRenderer: Function, handleEvent: Function, bindingCount: 4, outputCount: 0, lastRenderRootNode: Object }), componentProvider: null, componentView: null, co ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts:46:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-44) should create
-     CloudFoundryOrganizationSummaryComponent
-       StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-organization-summary', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0 ...
-Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.spec.ts:47:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-45) should create
-     CloudFoundryOrganizationUsersComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 38518785, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, flags: 1, checkIndex: -1, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({ noEntriesForCurrentFilter: 2 }), ngContentIndex: null, childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: null, name: null, attrs: null, template: Object({ factory: Function, nodeFlags: 33669185, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: Array, updateDirectives: Function, updateRenderer: Function, handleEvent: Function, bindingCount: 4, outputCount: 0, lastRenderRootNode: Object }), componentProvider: null, componentView: null, co ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component.spec.ts:41:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-46) should create
-     CloudFoundryOrganizationsComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33608193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 53760, directChildFlags: 53760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-organizations', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, r ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organizations.component.spec.ts:31:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-47) should create
-     CloudFoundryRoutesComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 38518785, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, flags: 1, checkIndex: -1, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({ noEntriesMaxedResults: 2 }), ngContentIndex: null, childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: null, name: null, attrs: null, template: Object({ factory: Function, nodeFlags: 33669185, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: Array, updateDirectives: Function, updateRenderer: Function, handleEvent: Function, bindingCount: 4, outputCount: 0, lastRenderRootNode: Object }), componentProvider: null, componentView: null, compon ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-routes/cloud-foundry-routes.component.spec.ts:35:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-48) should create
-     CloudFoundrySecurityGroupsComponent
-     TypeError: Cannot read property 'includeRelations' of undefined
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 38518785, rootNodeFlags: 1, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 38518785, directChildFlags: 33554433, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'div', attrs: [ Array ], template: null, componentProvider: null, componentView: null, componentRendererType: null, publicProviders: null({  }), allProviders: null({  }), handleEvent: Function }), provider: null, text: null, query: null, ngContent: null }), Object({ nodeIndex: 1, parent: Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 1, childFlags: 38518785, directChildFlags:  ...
-    at <Jasmine>
-    at includeRelations (src/entity-action-builders/security-groups.action-builder.ts:6:35)
-    at new actionBuilder (src/shared/components/list/list-types/cf-security-groups/cf-security-groups-data-source.ts:28:22)
-    at new CfSecurityGroupsListConfigService (src/shared/components/list/list-types/cf-security-groups/cf-security-groups-list-config.service.ts:61:28)
-    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22142:1)
-    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22244:45)
-    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22148:1)
-    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-    at callViewAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23561:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-security-groups/cloud-foundry-security-groups.component.spec.ts:27:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-49) should create
-     CloudFoundrySummaryTabComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cloud-foundry-summary-tab', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, ref ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.spec.ts:37:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-50) should create
-     CloudFoundryUsersComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 38518785, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, flags: 1, checkIndex: -1, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({ noEntriesForCurrentFilter: 2 }), ngContentIndex: null, childCount: 0, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: null, name: null, attrs: null, template: Object({ factory: Function, nodeFlags: 33669185, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: Array, updateDirectives: Function, updateRenderer: Function, handleEvent: Function, bindingCount: 4, outputCount: 0, lastRenderRootNode: Object }), componentProvider: null, componentView: null, co ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.spec.ts:38:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-51) should create
-     InviteUsersCreateComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-invite-users-create', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.spec.ts:38:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-52) should create
-     InviteUsersComponent
-     Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 643023379, rootNodeFlags: 33554433, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 4374530, directChildFlags: 4374530, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-page-header', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 4374528, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngC ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/users/invite-users/invite-users.component.spec.ts:36:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-53) should be created
-     CfRolesService
-     Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ] })
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-54) should create
-     UsersRolesConfirmComponent
-     Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 34717697, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 1163264, directChildFlags: 1163264, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-manage-users-confirm', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 1163264, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/users/manage-users/manage-users-confirm/manage-users-confirm.component.spec.ts:45:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-55) should create
-     UsersRolesModifyComponent
-     Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33808897, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 254464, directChildFlags: 254464, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-manage-users-modify', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.spec.ts:49:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-56) should create
-     UsersRolesSelectComponent
-     Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33604609, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 50176, directChildFlags: 50176, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-manage-users-select', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ng ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/users/manage-users/manage-users-select/manage-users-select.component.spec.ts:43:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-57) should create
-     UsersRolesComponent
-     Error: StaticInjectorError(DynamicTestModule)[CfUserService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CfUserService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfUserService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33740289, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 185856, directChildFlags: 185856, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 4, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-manage-users', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 4, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 4, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngConte ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/users/manage-users/manage-users.component.spec.ts:68:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-58) should create
-     RemoveUserComponent
-     Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33736193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 181760, directChildFlags: 181760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 4, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-remove-user', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 4, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 4, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngConte ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/cloud-foundry/users/remove-user/remove-user.component.spec.ts:61:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-59) should create
-     ServiceBaseComponent
-     Error: StaticInjectorError(DynamicTestModule)[ServicesService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[ServicesService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ServicesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33604609, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 50176, directChildFlags: 50176, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-service-base', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngConten ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/service-catalog/service-service-base.component.spec.ts:33:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-60) should create
-     ServiceInstancesComponent
-     TypeError: Cannot read property 'includeRelations' of undefined
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 38518785, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 4964352, directChildFlags: 4964352, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-list', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 4964352, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0, outputs: Array ...
-    at <Jasmine>
-    at includeRelations (src/entity-action-builders/service-instance.action.builders.ts:13:35)
-    at new actionBuilder (src/shared/components/list/list-types/service-instances/service-instances-data-source.ts:27:22)
-    at new ServiceInstancesListConfigService (src/shared/components/list/list-types/service-instances/service-instances-list-config.service.ts:44:28)
-    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22150:1)
-    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22244:45)
-    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22148:1)
-    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-    at callViewAction (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23561:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/service-catalog/service-instances/service-instances.component.spec.ts:42:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-61) should create
-     ServiceSummaryComponent
-       StaticInjectorError(Platform: core)[ServiceBrokerCardComponent -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ServiceBrokerCardComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 638697473, rootNodeFlags: 33554433, nodeMatchedQueries: 2, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 638697473, directChildFlags: 34717697, childMatchedQueries: 2, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 10, bindings: [ Object({ flags: 2, ns: '', name: 'tile-group-gutters', nonMinifiedName: 'tile-group-gutters', securityContext: undefined, suffix: undefined }), Object({ flags: 2, ns: '', name: 'tile-group-6-cols', nonMinifiedName: 'tile-group-6-cols', securityContext: undefined, suffix: undefined }), Object({ flags: 2, ns: '', name: 'tile-group-4-cols', nonMinifiedName: 'tile-group-4-cols', securityContext: undefined, suffix: u ...
-Error: StaticInjectorError(DynamicTestModule)[ServiceBrokerCardComponent -> CFEntityServiceFactory]: 
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-
-62) should create
-     DetachAppsComponent
-     TypeError: Cannot read property 'includeRelations' of undefined
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33735169, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 180736, directChildFlags: 180736, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-detach-apps', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0, outputs:  ...
-    at <Jasmine>
-    at includeRelations (src/entity-action-builders/service-binding.action-builders.ts:22:35)
-    at new actionBuilder (src/shared/components/list/list-types/detach-apps/detach-apps-data-source.ts:27:43)
-    at new DetachAppsListConfigService (src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts:60:27)
-    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22144:1)
-    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-    at createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22002:1)
-    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23232:1)
-    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/services/detach-service-instance/detach-apps/detach-apps.component.spec.ts:27:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-63) should create
-     DetachServiceInstanceComponent
-     Error: StaticInjectorError(DynamicTestModule)[DetachServiceInstanceComponent -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[DetachServiceInstanceComponent -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'DetachServiceInstanceComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-detach-service-instance', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, re ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/services/detach-service-instance/detach-service-instance.component.spec.ts:30:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-64) should create
-     ServicesWallComponent
-     TypeError: Cannot read property 'paginationKey' of undefined
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33739265, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 184832, directChildFlags: 184832, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 3, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-services-wall', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 3, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 3, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0, outputs ...
-    at <Jasmine>
-    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22142:1)
-    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-    at createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22002:1)
-    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23232:1)
-    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-    at ComponentFactory_.push.../../../../node_modules/@angular/core/fesm5/core.js.ComponentFactory_.create (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21498:1)
-    at initComponent (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1916:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/features/services/services-wall/services-wall.component.spec.ts:37:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-65) should be created
-     ServicesWallService
-     TypeError: Cannot read property 'includeRelations' of undefined
-    at <Jasmine>
-    at includeRelations (src/entity-action-builders/service.entity-builders.ts:9:35)
-    at ServicesWallService.actionBuilder [as initServicesObservable] (src/features/services/services/services-wall.service.ts:29:37)
-    at new initServicesObservable (src/features/services/services/services-wall.service.ts:48:31)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21255:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-    at <Jasmine>
-
-66) should create
-     AddServiceInstanceComponent
-     Error: StaticInjectorError(DynamicTestModule)[AddServiceInstanceComponent -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[AddServiceInstanceComponent -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'AddServiceInstanceComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 34788865, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 1234432, directChildFlags: 1234432, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 7, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-add-service-instance', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 7, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 7, flags: 1228800, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, re ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/shared/components/add-service-instance/add-service-instance/add-service-instance.component.spec.ts:132:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-67) should create
-     SelectPlanStepComponent
-     Error: StaticInjectorError(DynamicTestModule)[ServicePlanPublicComponent -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[ServicePlanPublicComponent -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ServicePlanPublicComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33739265, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 184832, directChildFlags: 184832, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-select-plan-step', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references:  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/shared/components/add-service-instance/select-plan-step/select-plan-step.component.spec.ts:54:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-68) should create
-     SpecifyDetailsStepComponent
-     Error: StaticInjectorError(DynamicTestModule)[CreateServiceInstanceHelperServiceFactory -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CreateServiceInstanceHelperServiceFactory -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CreateServiceInstanceHelperServiceFactory', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 34783233, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 1228800, directChildFlags: 1228800, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-specify-details-step', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 1228800, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQ ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/shared/components/add-service-instance/specify-details-step/specify-details-step.component.spec.ts:47:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-69) should create
-     SpecifyUserProvidedDetailsComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryUserProvidedServicesService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryUserProvidedServicesService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryUserProvidedServicesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33734657, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 180224, directChildFlags: 180224, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-specify-user-provided-details', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 180224, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matc ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21257:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.spec.ts:35:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-70) should create
-     CardCfInfoComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-card-cf-info', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: O ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/shared/components/cards/card-cf-info/card-cf-info.component.spec.ts:35:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-71) should create
-     CardCfOrgUserDetailsComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-card-cf-org-user-details', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, refe ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/shared/components/cards/card-cf-org-user-details/card-cf-org-user-details.component.spec.ts:54:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-72) should create
-     CardCfRecentAppsComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-card-cf-recent-apps', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.spec.ts:58:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-73) should create
-     CardCfUserInfoComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-card-cf-user-info', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references:  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/shared/components/cards/card-cf-user-info/card-cf-user-info.component.spec.ts:30:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-74) should create
-     ServiceBrokerCardComponent
-     Error: StaticInjectorError(DynamicTestModule)[ServiceBrokerCardComponent -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[ServiceBrokerCardComponent -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ServiceBrokerCardComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-service-broker-card', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references:  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/shared/components/cards/service-broker-card/service-broker-card.component.spec.ts:42:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-75) should create
-     CfRoleCheckboxComponent
-     Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cf-role-checkbox', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ng ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/shared/components/cf-role-checkbox/cf-role-checkbox.component.spec.ts:45:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-76) should be created
-     CreateApplicationStep1Component
-     TypeError: Cannot read property 'paginationKey' of undefined
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 34717697, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 1163264, directChildFlags: 1163264, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-create-application-step1', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 1163264, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, binding ...
-    at <Jasmine>
-    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21255:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22144:1)
-    at createDirectiveInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22019:1)
-    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23245:1)
-    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/shared/components/create-application/create-application-step1/create-application-step1.component.spec.ts:42:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-77) should be created
-     CfAppEventsConfigService
-     Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ] })
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-78) should be created
-     CfAppInstancesConfigService
-     Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ] })
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-79) should create
-     AppServiceBindingCardComponent
-     Error: StaticInjectorError(DynamicTestModule)[AppServiceBindingCardComponent -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[AppServiceBindingCardComponent -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'AppServiceBindingCardComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-app-service-binding-card', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0,  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.spec.ts:80:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-80) should be created
-     AppServiceBindingListConfigService
-     Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ] })
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-81) should be created
-     CfAppVariablesListConfigService
-     Error: StaticInjectorError(DynamicTestModule)[ApplicationService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[ApplicationService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ApplicationService', Function ] })
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-82) should be created
-     CfAppConfigService
-     TypeError: Cannot read property 'paginationKey' of undefined
-    at <Jasmine>
-    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21255:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-
-83) should be created
-     CfOrgUsersListConfigService
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ] })
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _callFactory (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21280:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21228:1)
-
-84) should create
-     CfOrgCardComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cf-org-card', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.spec.ts:399:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-85) should create
-     CfSecurityGroupsCardComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cf-security-groups-card', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, re ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/shared/components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component.spec.ts:52:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-86) should be created
-     CfSecurityGroupsListConfigService
-     TypeError: Cannot read property 'includeRelations' of undefined
-    at <Jasmine>
-    at includeRelations (src/entity-action-builders/security-groups.action-builder.ts:6:35)
-    at new actionBuilder (src/shared/components/list/list-types/cf-security-groups/cf-security-groups-data-source.ts:28:22)
-    at new CfSecurityGroupsListConfigService (src/shared/components/list/list-types/cf-security-groups/cf-security-groups-list-config.service.ts:61:28)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21255:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-    at <Jasmine>
-
-87) should be created
-     CfServicesListConfigService
-     TypeError: Cannot read property 'includeRelations' of undefined
-    at <Jasmine>
-    at includeRelations (src/entity-action-builders/service.entity-builders.ts:9:35)
-    at new actionBuilder (src/shared/components/list/list-types/cf-services/cf-services-data-source.ts:29:33)
-    at new CfServicesListConfigService (src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts:68:27)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21257:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-    at <Jasmine>
-
-88) should be created
-     CfSpaceUsersListConfigService
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ] })
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-89) should create
-     TableCellServiceNameComponent
-     Error: StaticInjectorError(DynamicTestModule)[TableCellServiceNameComponent -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[TableCellServiceNameComponent -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'TableCellServiceNameComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33669121, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 114688, directChildFlags: 114688, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-table-cell-service-name', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 114688, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0,  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-name/table-cell-service-name.component.spec.ts:46:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-90) should create
-     CfSpaceCardComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryOrganizationService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryOrganizationService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cf-space-card', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references:  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.spec.ts:88:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-91) should create
-     TableCellSpaceRoleComponent
-     Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cf-role-checkbox', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ng ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component.spec.ts:60:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-92) should create
-     TableCellSelectOrgComponent
-     Error: StaticInjectorError(DynamicTestModule)[CfRolesService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CfRolesService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CfRolesService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33800193, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 245760, directChildFlags: 245760, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-table-cell-select-org', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 245760, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object,  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component.spec.ts:47:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-93) should create
-     CfUserPermissionCellComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-org-user-permission-cell', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, refe ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/shared/components/list/list-types/cf-users/cf-org-permission-cell/cf-org-permission-cell.component.spec.ts:39:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-94) should create
-     CfSpacePermissionCellComponent
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-cf-space-permission-cell', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, refe ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/shared/components/list/list-types/cf-users/cf-space-permission-cell/cf-space-permission-cell.component.spec.ts:29:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-95) should be created
-     CfUserListConfigService
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ] })
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-96) should be created
-     DetachAppsListConfigService
-     TypeError: Cannot read property 'includeRelations' of undefined
-    at <Jasmine>
-    at includeRelations (src/entity-action-builders/service-binding.action-builders.ts:22:35)
-    at new actionBuilder (src/shared/components/list/list-types/detach-apps/detach-apps-data-source.ts:27:43)
-    at new DetachAppsListConfigService (src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts:60:27)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21257:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-    at <Jasmine>
-
-97) should be created
-     ServiceInstancesListConfigService
-     TypeError: Cannot read property 'includeRelations' of undefined
-    at <Jasmine>
-    at includeRelations (src/entity-action-builders/service-instance.action.builders.ts:13:35)
-    at new actionBuilder (src/shared/components/list/list-types/service-instances/service-instances-data-source.ts:27:22)
-    at new ServiceInstancesListConfigService (src/shared/components/list/list-types/service-instances/service-instances-list-config.service.ts:44:28)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21263:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-    at <Jasmine>
-
-98) should create
-     TableCellAServicePlanPublicComponent
-     Error: StaticInjectorError(DynamicTestModule)[ServicePlanPublicComponent -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[ServicePlanPublicComponent -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ServicePlanPublicComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-service-plan-public', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references:  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/shared/components/list/list-types/service-plans/table-cell-service-plan-public/table-cell-service-plan-public.component.spec.ts:42:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-99) should be created
-     ServiceInstancesWallListConfigService
-     TypeError: Cannot read property 'paginationKey' of undefined
-    at <Jasmine>
-    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21255:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-
-100) should create
-     SelectServiceComponent
-     TypeError: Cannot read property 'includeRelations' of undefined
-error properties: Object({ ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 34783745, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 1229312, directChildFlags: 1229312, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 2, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-select-service', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 2, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 2, flags: 1228800, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references: Object, ngContentIndex: -1, childCount: 0, bindings: Array, bindingFlags: 0,  ...
-    at <Jasmine>
-    at includeRelations (src/entity-action-builders/service.entity-builders.ts:9:35)
-    at ServicesWallService.actionBuilder [as initServicesObservable] (src/features/services/services/services-wall.service.ts:29:37)
-    at new initServicesObservable (src/features/services/services/services-wall.service.ts:48:31)
-    at createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22142:1)
-    at _createProviderInstance$1 (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22125:1)
-    at createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22002:1)
-    at createViewNodes (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23232:1)
-    at createRootView (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23159:1)
-    at callWithDebugContext (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:24167:1)
-    at Object.debugCreateRootView [as createRootView] (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:23677:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/shared/components/select-service/select-service.component.spec.ts:86:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-101) should create
-     ServicePlanPublicComponent
-     Error: StaticInjectorError(DynamicTestModule)[ServicePlanPublicComponent -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[ServicePlanPublicComponent -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'ServicePlanPublicComponent', Function ], ngDebugContext: DebugContext_({ view: Object({ def: Object({ factory: Function, nodeFlags: 33603585, rootNodeFlags: 33554433, nodeMatchedQueries: 0, flags: 0, nodes: [ Object({ nodeIndex: 0, parent: null, renderParent: null, bindingIndex: 0, outputIndex: 0, checkIndex: 0, flags: 33554433, childFlags: 49152, directChildFlags: 49152, childMatchedQueries: 0, matchedQueries: Object({  }), matchedQueryIds: 0, references: Object({  }), ngContentIndex: null, childCount: 1, bindings: [  ], bindingFlags: 0, outputs: [  ], element: Object({ ns: '', name: 'app-service-plan-public', attrs: [  ], template: null, componentProvider: Object({ nodeIndex: 1, parent: <circular reference: Object>, renderParent: <circular reference: Object>, bindingIndex: 0, outputIndex: 0, checkIndex: 1, flags: 49152, childFlags: 0, directChildFlags: 0, childMatchedQueries: 0, matchedQueries: Object, matchedQueryIds: 0, references:  ...
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at resolveDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:22268:1)
-     Error: Expected undefined to be truthy.
-    at <Jasmine>
-    at UserContext.<anonymous> (src/shared/components/service-plan-public/service-plan-public.component.spec.ts:32:23)
-    at ZoneDelegate.push.../../../../node_modules/zone.js/dist/zone.js.ZoneDelegate.invoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone.js:391:1)
-    at ProxyZoneSpec.push.../../../../node_modules/zone.js/dist/zone-testing.js.ProxyZoneSpec.onInvoke (home/kater/dev/git/stratos/node_modules/zone.js/dist/zone-testing.js:289:1)
-
-102) should be created
-     EndpointOrgSpaceServiceService
-     TypeError: Cannot read property 'paginationKey' of undefined
-    at <Jasmine>
-    at new paginationKey (src/shared/data-services/cf-org-space-service.service.ts:118:91)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21255:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21189:1)
-    at NgModuleRef_.push.../../../../node_modules/@angular/core/fesm5/core.js.NgModuleRef_.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21897:1)
-    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1815:1)
-    at home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:47
-    at <Jasmine>
-    at TestBedViewEngine.push.../../../../node_modules/@angular/core/fesm5/testing.js.TestBedViewEngine.execute (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1821:1)
-    at UserContext.<anonymous> (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/testing.js:1991:29)
-
-103) should be created
-     CfUserService
-     Error: StaticInjectorError(DynamicTestModule)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-  StaticInjectorError(Platform: core)[CloudFoundryEndpointService -> CFEntityServiceFactory]: 
-    NullInjectorError: No provider for CFEntityServiceFactory!
-error properties: Object({ ngTempTokenPath: null, ngTokenPath: [ 'CloudFoundryEndpointService', Function ] })
-    at NullInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.NullInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8895:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9140:1)
-    at tryResolveToken (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:9084:1)
-    at StaticInjector.push.../../../../node_modules/@angular/core/fesm5/core.js.StaticInjector.get (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:8981:1)
-    at resolveNgModuleDep (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21208:1)
-    at _createClass (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21261:1)
-    at _createProviderInstance (home/kater/dev/git/stratos/node_modules/@angular/core/fesm5/core.js:21225:1)
-
-
-TOTAL: 103 FAILED, 120 SUCCESS
-
-> stratos@2.5.0 test-frontend:cf-autoscaler /home/kater/dev/git/stratos
-> ng test cf-autoscaler --code-coverage --watch=false
-
-06 09 2019 11:10:51.921:INFO [karma-server]: Karma v4.0.0 server started at http://0.0.0.0:9876/
-06 09 2019 11:10:51.923:INFO [launcher]: Launching browsers Chrome with concurrency unlimited
-06 09 2019 11:10:51.927:INFO [launcher]: Starting browser Chrome
-
-
-
diff --git a/build/update-tools-versions.sh b/build/update-tools-versions.sh
index 0cec02d6f4..897ccaa7b2 100755
--- a/build/update-tools-versions.sh
+++ b/build/update-tools-versions.sh
@@ -1,21 +1,32 @@
 #!/bin/bash
 
+# Colours
+CYAN="\033[96m"
+YELLOW="\033[93m"
+RED="\033[91m"
+RESET="\033[0m"
+BOLD="\033[1m"
+
 # Program Paths:
 PROG=$(basename ${BASH_SOURCE[0]})
 PROG_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 STRATOS_DIR="$( cd "${PROG_DIR}/.." && pwd )"
 
-echo "Stratos Directory: ${STRATOS_DIR}"
+echo -e "${CYAN}${BOLD}=============================${RESET}"
+echo -e "${CYAN}${BOLD}Updating Go and Node versions${RESET}"
+echo -e "${CYAN}${BOLD}=============================${RESET}"
 
-UPDATE="false"
+echo -e "${YELLOW}Stratos Directory: ${STRATOS_DIR}${RESET}"
+echo ""
 
 # Current versions that we should be using
-GO_VERSION=1.12.4
-NODE_VERSION=10.15.3
+GO_VERSION=1.13.4
+NODE_VERSION=12.13.0
 
-ALL_GOOD="true"
+echo -e "${YELLOW}Go Version  : ${GO_VERSION}${RESET}"
+echo -e "${YELLOW}Node Version: ${NODE_VERSION}${RESET}"
 
-function checkGoVersion() {
+function checkVersion() {
 
   FILE=$1
   DESC=$2
@@ -23,46 +34,39 @@ function checkGoVersion() {
   REPLACE=$4
 
   if [ ! -f "$FILE" ]; then
-    echo "Error: File $FILE does not exist"
+    echo -e "${RED}Error: File $FILE does not exist${RESET}"
   fi
 
-  grep "${EXISTS}" "${FILE}" > /dev/null
-  if [ $? -ne 0 ]; then
-    echo "${DESC} has incorrect Go version"
-    ALL_GOOD="false"
-
-    if [ "$UPDATE" == "true" ]; then
-      echo "  => Updating to correct Go version"
-      sed -i.bak -e 's/'"$REPLACE"'/'"$EXISTS"'/g' ${FILE}
-    fi
-  fi
+  echo -e "${CYAN}  ${FILE}${RESET}"
+  sed -i.bak -e 's/'"$REPLACE"'/'"$EXISTS"'/g' ${FILE}
 }
 
-if [ "$1" == "-u" ]; then
-  UPDATE="true"
-  echo "Versions will be updated"
-fi
-
 # Check versions in the various files that we have
 
+echo ""
+echo -e "${YELLOW}Patching files:${RESET}"
 
 # Go Version
 
-checkGoVersion "${STRATOS_DIR}/deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl" "Go Builder Base Image" "go${GO_VERSION}.linux" "go[0-9\.]*.linux"
-checkGoVersion "${STRATOS_DIR}/.travis.yml" "Travis file" "gimme ${GO_VERSION}" "gimme [0-9\.]*"
-checkGoVersion "${STRATOS_DIR}/deploy/ci/travis/depcache.sh" "Depcache generation script" "gimme ${GO_VERSION}" "gimme [0-9\.]*"
-checkGoVersion "${STRATOS_DIR}/deploy/ci/travis/run-e2e-tests.sh" "Travis E2E Tests script" "gimme ${GO_VERSION}" "gimme [0-9\.]*"
-checkGoVersion "${STRATOS_DIR}/deploy/fissile/Dockerfile.bosh-cli" "BOSH Release Dockerfile" "go${GO_VERSION}.linux" "go[0-9\.]*.linux"
-checkGoVersion "${STRATOS_DIR}/deploy/ci/scripts/Dockerfile.bosh" "BOSH Dockerfile" "go${GO_VERSION}.linux" "go[0-9\.]*.linux"
-checkGoVersion "${STRATOS_DIR}/deploy/stratos-ui-release/config/blobs.yml" "BOSH Release config file" "go${GO_VERSION}.linux" "go[0-9\.]*.linux"
-checkGoVersion "${STRATOS_DIR}/deploy/stratos-ui-release/packages/golang/packaging" "BOSH Release packaging file" "go${GO_VERSION}.linux" "go[0-9\.]*.linux"
-checkGoVersion "${STRATOS_DIR}/deploy/stratos-ui-release/packages/golang/spec" "BOSH Release spec file" "go${GO_VERSION}.linux" "go[0-9\.]*.linux"
-checkGoVersion "${STRATOS_DIR}/src/frontend/packages/core/test-framework/store-test-helper.ts" "Store test helper" "\'go${GO_VERSION}\'" "\'go[0-9\.]*\'"
-
-if [ "$ALL_GOOD" == "true" ]; then
-  echo "All files have correct versions"
-else
-  echo "Some files do not have correct versions"
-fi
-
-echo "NOTE: Please ensure you check the Go version in the Stratos Buildpack"
+checkVersion "${STRATOS_DIR}/deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl" "Go Builder Base Image" "go${GO_VERSION}.linux" "go[0-9\.]*.linux"
+checkVersion "${STRATOS_DIR}/.travis.yml" "Travis file" "(gimme ${GO_VERSION})" "(gimme [0-9\.]*)"
+checkVersion "${STRATOS_DIR}/deploy/ci/travis/depcache.sh" "Depcache generation script" "gimme ${GO_VERSION}" "gimme [0-9\.]*"
+checkVersion "${STRATOS_DIR}/deploy/fissile/Dockerfile.bosh-cli" "BOSH Release Dockerfile" "go${GO_VERSION}.linux" "go[0-9\.]*.linux"
+checkVersion "${STRATOS_DIR}/deploy/ci/scripts/Dockerfile.bosh" "BOSH Dockerfile" "go${GO_VERSION}.linux" "go[0-9\.]*.linux"
+checkVersion "${STRATOS_DIR}/deploy/stratos-ui-release/config/blobs.yml" "BOSH Release config file" "go${GO_VERSION}.linux" "go[0-9\.]*.linux"
+checkVersion "${STRATOS_DIR}/deploy/stratos-ui-release/packages/golang/packaging" "BOSH Release packaging file" "go${GO_VERSION}.linux" "go[0-9\.]*.linux"
+checkVersion "${STRATOS_DIR}/deploy/stratos-ui-release/packages/golang/spec" "BOSH Release spec file" "go${GO_VERSION}.linux" "go[0-9\.]*.linux"
+
+# Node Version
+
+checkVersion "${STRATOS_DIR}/deploy/stratos-base-images/Dockerfile.stratos-ui-build-base.tmpl" "UI Builder Base Image" "v${NODE_VERSION}\/node-v${NODE_VERSION}-linux" "v[0-9\.]*\/node-v[0-9\.]*-linux"
+checkVersion "${STRATOS_DIR}/deploy/stratos-base-images/Dockerfile.stratos-ui-build-base.tmpl" "UI Builder Base Image 2" "node-v${NODE_VERSION}" "node-v[0-9\.]*"
+checkVersion "${STRATOS_DIR}/deploy/stratos-base-images/Dockerfile.stratos-bk-build-base.tmpl" "Backend Builder Base Image" "node-v${NODE_VERSION}" "node-v[0-9\.]*"
+checkVersion "${STRATOS_DIR}/deploy/stratos-base-images/Dockerfile.stratos-bk-build-base.tmpl" "Backend Builder Base Image" "v${NODE_VERSION}\/node-v${NODE_VERSION}-linux" "v[0-9\.]*\/node-v[0-9\.]*-linux"
+checkVersion "${STRATOS_DIR}/.travis.yml" "Travis file" "  - \"${NODE_VERSION}\"" "  - \"[0-9\.]*\""
+checkVersion "${STRATOS_DIR}/package.json" "Package file" "\"node\": \"${NODE_VERSION}\"" "\"node\": \"[0-9\.]*\""
+checkVersion "${STRATOS_DIR}/docs/developers-guide.md" "Developer Guide doc" "minimum node version ${NODE_VERSION}" "minimum node version [0-9\.]*"
+ 
+echo ""
+echo -e "${YELLOW}NOTE: Please ensure you check the Go version in the Stratos Buildpack${RESET}"
+echo ""
diff --git a/custom-src/frontend/app/custom/custom-routing.module.ts b/custom-src/frontend/app/custom/custom-routing.module.ts
index 3a6afdf3a0..42231973be 100644
--- a/custom-src/frontend/app/custom/custom-routing.module.ts
+++ b/custom-src/frontend/app/custom/custom-routing.module.ts
@@ -1,3 +1,4 @@
+import { DashboardBaseComponent } from './../features/dashboard/dashboard-base/dashboard-base.component';
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
@@ -22,6 +23,7 @@ const kubernetes: Routes = [
     path: 'monocular',
     loadChildren: './helm/helm.module#HelmModule',
     data: {
+      reuseRoute: true,
       stratosNavigation: {
         text: 'Helm',
         matIcon: 'helm',
diff --git a/custom-src/frontend/app/custom/helm/helm-entity-factory.ts b/custom-src/frontend/app/custom/helm/helm-entity-factory.ts
index 6ac3ac46f4..d9cdae9085 100644
--- a/custom-src/frontend/app/custom/helm/helm-entity-factory.ts
+++ b/custom-src/frontend/app/custom/helm/helm-entity-factory.ts
@@ -8,6 +8,8 @@ import {
   HelmReleaseStatus,
   HelmVersion,
   MonocularChart,
+  HelmReleaseGraph,
+  HelmReleaseResource,
 } from './store/helm.types';
 
 export const monocularChartsEntityType = 'monocularCharts';
@@ -17,6 +19,8 @@ export const helmVersionsEntityType = 'helmVersions';
 export const helmReleaseStatusEntityType = 'helmReleaseStatus';
 export const helmReleasePodEntityType = 'helmReleasePod';
 export const helmReleaseServiceEntityType = 'helmReleaseService';
+export const helmReleaseGraphEntityType = 'helmReleaseGraph';
+export const helmReleaseResourceEntityType = 'helmReleaseResource';
 
 export const getMonocularChartId = (entity: MonocularChart) => entity.id;
 export const getHelmReleaseId = (entity: HelmRelease) => entity.endpointId;
@@ -24,6 +28,8 @@ export const getHelmVersionId = (entity: HelmVersion) => entity.endpointId;
 export const getHelmReleaseStatusId = (entity: HelmReleaseStatus) => entity.endpointId;
 export const getHelmReleasePodId = (entity: HelmReleasePod) => entity.name;
 export const getHelmReleaseServiceId = (entity: HelmReleaseService) => entity.name;
+export const getHelmReleaseGraphId = (entity: HelmReleaseGraph) => entity.endpointId;
+export const getHelmReleaseReleaseId = (entity: HelmReleaseResource) => entity.endpointId;
 
 export const HELM_ENDPOINT_TYPE = 'helm';
 
@@ -85,6 +91,18 @@ entityCache[helmReleaseServiceEntityType] = new HelmEntitySchema(
   { idAttribute: getHelmReleaseServiceId }
 );
 
+entityCache[helmReleaseGraphEntityType] = new HelmEntitySchema(
+  helmReleaseGraphEntityType,
+  {},
+  { idAttribute: getHelmReleaseGraphId }
+);
+
+entityCache[helmReleaseResourceEntityType] = new HelmEntitySchema(
+  helmReleaseResourceEntityType,
+  {},
+  { idAttribute: getHelmReleaseReleaseId }
+);
+
 export function helmEntityFactory(key: string): EntitySchema {
   const entity = entityCache[key];
   if (!entity) {
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 771d9cb170..6d14c5fdfa 100644
--- a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
+++ b/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
@@ -12,8 +12,10 @@ import {
   helmReleasePodEntityType,
   helmReleaseServiceEntityType,
   helmReleaseStatusEntityType,
+  helmReleaseGraphEntityType,
   helmVersionsEntityType,
   monocularChartsEntityType,
+  helmReleaseResourceEntityType,
 } from './helm-entity-factory';
 import {
   HelmRelease,
@@ -22,6 +24,8 @@ import {
   HelmReleaseStatus,
   HelmVersion,
   MonocularChart,
+  HelmReleaseGraph,
+  HelmReleaseResource,
 } from './store/helm.types';
 
 
@@ -47,6 +51,8 @@ export function generateHelmEntities(): StratosBaseCatalogueEntity[] {
     generateReleaseStatusEntity(endpointDefinition),
     generateReleasePodEntity(endpointDefinition),
     generateReleaseServiceEntity(endpointDefinition),
+    generateReleaseGraphEntity(endpointDefinition),
+    generateReleaseResourceEntity(endpointDefinition),
   ];
 }
 
@@ -111,3 +117,21 @@ function generateReleaseServiceEntity(endpointDefinition: StratosEndpointExtensi
   return new StratosCatalogueEntity<IFavoriteMetadata, HelmReleaseService>(definition);
 }
 
+function generateReleaseGraphEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: helmReleaseGraphEntityType,
+    schema: helmEntityFactory(helmReleaseGraphEntityType),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogueEntity<IFavoriteMetadata, HelmReleaseGraph>(definition);
+}
+
+function generateReleaseResourceEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: helmReleaseResourceEntityType,
+    schema: helmEntityFactory(helmReleaseResourceEntityType),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogueEntity<IFavoriteMetadata, HelmReleaseResource>(definition);
+}
+
diff --git a/custom-src/frontend/app/custom/helm/helm.module.ts b/custom-src/frontend/app/custom/helm/helm.module.ts
index 071fcebc91..0fb1ddca98 100644
--- a/custom-src/frontend/app/custom/helm/helm.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm.module.ts
@@ -1,3 +1,4 @@
+import { HelmReleaseResourceGraphComponent } from './release/tabs/helm-release-resource-graph/helm-release-resource-graph.component';
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 
@@ -35,10 +36,12 @@ import { HelmReleaseNotesTabComponent } from './release/tabs/helm-release-notes-
 import { HelmReleaseServicesTabComponent } from './release/tabs/helm-release-services/helm-release-services-tab.component';
 import { HelmReleaseSummaryTabComponent } from './release/tabs/helm-release-summary-tab/helm-release-summary-tab.component';
 import { HelmReleaseValuesTabComponent } from './release/tabs/helm-release-values-tab/helm-release-values-tab.component';
+import { HelmReleaseResourcePreviewComponent} from './release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component';
 import { CatalogTabComponent } from './tabs/catalog-tab/catalog-tab.component';
-import { HelmConfigurationComponent } from './tabs/configuration-tab/helm-configuration.component';
 import { HelmReleasesTabComponent } from './tabs/releases-tab/releases-tab.component';
 import { RepositoryTabComponent } from './tabs/repository-tab/repository-tab.component';
+import { KubernetesModule } from '../kubernetes/kubernetes.module';
+import { NgxGraphModule } from '@swimlane/ngx-graph';
 
 @NgModule({
   imports: [
@@ -47,6 +50,8 @@ import { RepositoryTabComponent } from './tabs/repository-tab/repository-tab.com
     SharedModule,
     HelmRoutingModule,
     CreateReleaseModule,
+    KubernetesModule,
+    NgxGraphModule,
   ],
   declarations: [
     PanelComponent,
@@ -67,7 +72,6 @@ import { RepositoryTabComponent } from './tabs/repository-tab/repository-tab.com
     RepositoryTabComponent,
     CatalogTabComponent,
     HelmReleasesTabComponent,
-    HelmConfigurationComponent,
     MonocularChartCardComponent,
     HelmReleaseServiceCardComponent,
     MonocularChartViewComponent,
@@ -77,7 +81,9 @@ import { RepositoryTabComponent } from './tabs/repository-tab/repository-tab.com
     HelmReleaseValuesTabComponent,
     HelmReleasePodsTabComponent,
     HelmReleaseServicesTabComponent,
-    HelmServicePortsComponent
+    HelmServicePortsComponent,
+    HelmReleaseResourceGraphComponent,
+    HelmReleaseResourcePreviewComponent,
   ],
   providers: [
     ChartsService,
@@ -88,7 +94,8 @@ import { RepositoryTabComponent } from './tabs/repository-tab/repository-tab.com
   entryComponents: [
     MonocularChartCardComponent,
     HelmReleaseServiceCardComponent,
-    HelmServicePortsComponent
+    HelmServicePortsComponent,
+    HelmReleaseResourcePreviewComponent,
   ]
 })
 export class HelmModule { }
diff --git a/custom-src/frontend/app/custom/helm/helm.routing.ts b/custom-src/frontend/app/custom/helm/helm.routing.ts
index 68c7b2d12e..80c2660c7e 100644
--- a/custom-src/frontend/app/custom/helm/helm.routing.ts
+++ b/custom-src/frontend/app/custom/helm/helm.routing.ts
@@ -11,9 +11,9 @@ import { HelmReleaseServicesTabComponent } from './release/tabs/helm-release-ser
 import { HelmReleaseSummaryTabComponent } from './release/tabs/helm-release-summary-tab/helm-release-summary-tab.component';
 import { HelmReleaseValuesTabComponent } from './release/tabs/helm-release-values-tab/helm-release-values-tab.component';
 import { CatalogTabComponent } from './tabs/catalog-tab/catalog-tab.component';
-import { HelmConfigurationComponent } from './tabs/configuration-tab/helm-configuration.component';
 import { HelmReleasesTabComponent } from './tabs/releases-tab/releases-tab.component';
 import { RepositoryTabComponent } from './tabs/repository-tab/repository-tab.component';
+import { HelmReleaseResourceGraphComponent } from './release/tabs/helm-release-resource-graph/helm-release-resource-graph.component';
 
 const monocular: Routes = [
   {
@@ -25,7 +25,6 @@ const monocular: Routes = [
       { path: 'charts/:repo', component: CatalogTabComponent },
       { path: 'repos', component: RepositoryTabComponent },
       { path: 'repos/:guid', component: RepositoryTabComponent },
-      { path: 'config', component: HelmConfigurationComponent },
       { path: 'releases', component: HelmReleasesTabComponent },
     ]
   },
@@ -33,13 +32,17 @@ const monocular: Routes = [
     // Helm Release Views
     path: 'releases/:guid',
     component: HelmReleaseTabBaseComponent,
+    data: {
+      reuseRoute: HelmReleaseTabBaseComponent,
+    },
     children: [
       { path: '', redirectTo: 'summary', pathMatch: 'full' },
       { path: 'summary', component: HelmReleaseSummaryTabComponent },
       { path: 'notes', component: HelmReleaseNotesTabComponent },
       { path: 'values', component: HelmReleaseValuesTabComponent },
       { path: 'pods', component: HelmReleasePodsTabComponent },
-      { path: 'services', component: HelmReleaseServicesTabComponent }
+      { path: 'services', component: HelmReleaseServicesTabComponent },
+      { path: 'graph', component: HelmReleaseResourceGraphComponent }
     ]
   },
   { pathMatch: 'full', path: 'charts/:repo/:chartName/:version', component: MonocularChartViewComponent },
diff --git a/custom-src/frontend/app/custom/helm/helm.store.module.ts b/custom-src/frontend/app/custom/helm/helm.store.module.ts
index 40b8febc72..c65d792a2d 100644
--- a/custom-src/frontend/app/custom/helm/helm.store.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm.store.module.ts
@@ -2,12 +2,15 @@ import { NgModule } from '@angular/core';
 import { EffectsModule } from '@ngrx/effects';
 
 import { HelmEffects } from './store/helm.effects';
+import { StoreModule } from '@ngrx/store';
+import { helmReleaseReducer } from './store/helm.reducers';
 
 @NgModule({
   imports: [
     EffectsModule.forFeature([
       HelmEffects
-    ])
+    ]),
+    StoreModule.forFeature('helmRelease', helmReleaseReducer),
   ]
 })
 export class HelmStoreModule { }
diff --git a/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.html b/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.html
index 1154ce5069..72b4959df7 100644
--- a/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.html
+++ b/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.html
@@ -1,19 +1,19 @@
 <app-meta-card class="card">
   <app-meta-card-title class=" card__title">
-    <app-multiline-title class="card__title-link">{{ row?.name }}</app-multiline-title>
+    <app-multiline-title class="card__title-link">{{ row?.metadata.name }}</app-multiline-title>
   </app-meta-card-title>
   <app-meta-card-item>
     <app-meta-card-key>Cluster IP</app-meta-card-key>
-    <app-meta-card-value>{{(row?.kubeService$ | async)?.spec.clusterIP}}</app-meta-card-value>
+    <app-meta-card-value>{{row?.spec.clusterIP}}</app-meta-card-value>
   </app-meta-card-item>
   <app-meta-card-item>
     <app-meta-card-key>Port Type</app-meta-card-key>
-    <app-meta-card-value>{{(row?.kubeService$ | async)?.spec.type}}</app-meta-card-value>
+    <app-meta-card-value>{{row?.spec.type}}</app-meta-card-value>
   </app-meta-card-item>
   <app-meta-card-item customStyle="column">
     <app-meta-card-key>Ports</app-meta-card-key>
     <app-meta-card-value>
-      <app-helm-service-ports [row]="row"></app-helm-service-ports>
+      <app-kubernetes-service-ports [row]="row"></app-kubernetes-service-ports>
     </app-meta-card-value>
   </app-meta-card-item>
 </app-meta-card>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/list-types/helm-service-ports/helm-service-ports.component.ts b/custom-src/frontend/app/custom/helm/list-types/helm-service-ports/helm-service-ports.component.ts
index 5f2fc14f79..c0a8203af3 100644
--- a/custom-src/frontend/app/custom/helm/list-types/helm-service-ports/helm-service-ports.component.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/helm-service-ports/helm-service-ports.component.ts
@@ -16,8 +16,9 @@ export class HelmServicePortsComponent extends KubernetesServicePortsComponent {
     if (!row) {
       return;
     }
+    console.log(row);
     const helmReleaseService = (row as HelmReleaseService);
-    this.kubeService$ = helmReleaseService.kubeService$;
+    // this.kubeService$ = helmReleaseService.kubeService$;
     this.endpointId = helmReleaseService.endpointId;
   }
 }
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts
index 22d21f4dc0..5a9cb1b3d9 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts
@@ -3,12 +3,20 @@ import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 
+import * as moment from 'moment';
+
 import { AppState } from '../../../../../store/src/app-state';
 import { ITableColumn } from '../../../shared/components/list/list-table/table.types';
 import { IListConfig, ListViewTypes } from '../../../shared/components/list/list.component.types';
 import { HelmReleaseHelperService } from '../release/tabs/helm-release-helper.service';
 import { HelmReleasePod } from '../store/helm.types';
 import { HelmReleasePodsDataSource } from './monocular-release-pods-list-source';
+import {
+  KubernetesPodStatusComponent
+} from '../../kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component';
+import {
+  KubernetesPodReadinessComponent
+} from '../../kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component';
 
 @Injectable()
 export class HelmReleasePodsListConfig implements IListConfig<HelmReleasePod> {
@@ -21,34 +29,36 @@ export class HelmReleasePodsListConfig implements IListConfig<HelmReleasePod> {
       columnId: 'name',
       headerCell: () => 'Name',
       cellDefinition: {
-        valuePath: 'name'
+        valuePath: 'metadata.name'
       },
       sort: {
         type: 'sort',
         orderKey: 'name',
-        field: 'name'
+        field: 'metadata.name'
       },
       cellFlex: '4'
     },
     {
       columnId: 'status',
       headerCell: () => 'Status',
-      cellDefinition: {
-        valuePath: 'status'
-      },
+      cellComponent: KubernetesPodStatusComponent,
+      // cellDefinition: {
+      //   valuePath: 'status.phase'
+      // },
       sort: {
         type: 'sort',
         orderKey: 'status',
-        field: 'status'
+        field: 'status.phase'
       },
       cellFlex: '1'
     },
     {
       columnId: 'ready',
       headerCell: () => 'Ready',
-      cellDefinition: {
-        valuePath: 'ready'
-      },
+      cellComponent: KubernetesPodReadinessComponent,
+      // cellDefinition: {
+      //   valuePath: 'ready'
+      // },
       sort: {
         type: 'sort',
         orderKey: 'ready',
@@ -60,28 +70,30 @@ export class HelmReleasePodsListConfig implements IListConfig<HelmReleasePod> {
       columnId: 'age',
       headerCell: () => 'Age',
       cellDefinition: {
-        valuePath: 'age'
+        getValue: (row: any) => {
+          return moment(row.metadata.creationTimestamp).fromNow(true);
+        }
       },
       sort: {
         type: 'sort',
         orderKey: 'age',
-        field: 'age'
-      },
-      cellFlex: '1'
-    },
-    {
-      columnId: 'restarts',
-      headerCell: () => 'Restarts',
-      cellDefinition: {
-        valuePath: 'restarts'
-      },
-      sort: {
-        type: 'sort',
-        orderKey: 'restarts',
-        field: 'restarts'
+        field: 'metadata.creationTimestamp'
       },
       cellFlex: '1'
-    },
+    }
+    // {
+    //   columnId: 'restarts',
+    //   headerCell: () => 'Restarts',
+    //   cellDefinition: {
+    //     valuePath: 'restarts'
+    //   },
+    //   sort: {
+    //     type: 'sort',
+    //     orderKey: 'restarts',
+    //     field: 'restarts'
+    //   },
+    //   cellFlex: '1'
+    // },
   ];
   initialised$: Observable<boolean>;
 
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-source.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-source.ts
index 14850b887a..13a6808341 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-source.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-source.ts
@@ -4,7 +4,7 @@ import { AppState } from '../../../../../store/src/app-state';
 import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../shared/components/list/list.component.types';
 import { getHelmReleasePodId, helmEntityFactory } from '../helm-entity-factory';
-import { GetHelmReleasePods } from '../store/helm.actions';
+import { GetHelmReleasePods, GetHelmReleaseServices } from '../store/helm.actions';
 import { HelmReleasePod } from '../store/helm.types';
 
 export class HelmReleasePodsDataSource extends ListDataSource<HelmReleasePod> {
@@ -16,10 +16,11 @@ export class HelmReleasePodsDataSource extends ListDataSource<HelmReleasePod> {
     releaseTitle: string
   ) {
     const action = new GetHelmReleasePods(endpointGuid, releaseTitle);
+
     super({
       store,
       action,
-      schema: helmEntityFactory(action.entityType),
+      schema: action.entity[0],
       getRowUniqueId: getHelmReleasePodId,
       paginationKey: action.paginationKey,
       isLocal: true,
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-source.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-source.ts
index 5e76b11b8d..094f2a4fcd 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-source.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-source.ts
@@ -50,23 +50,24 @@ export class HelmReleaseServicesDataSource extends ListDataSource<HelmReleaseSer
     super({
       store,
       action,
-      schema: helmEntityFactory(action.entityType),
+      schema: action.entity[0],
       getRowUniqueId: getHelmReleaseServiceId,
       paginationKey: action.paginationKey,
       isLocal: true,
       listConfig,
-      transformEntity: map((helmServices: HelmReleaseService[]) => {
-        return helmServices.map(helmService => {
-          if (!helmService.kubeService$) {
-            helmService.kubeService$ = fetchHelmReleaseServiceFromKubernetes(store, helmService);
-          }
-          return helmService;
-        });
-      }),
-      refresh: () => {
-        store.dispatch(action);
-        store.dispatch(new ClearPaginationOfType(action));
-      }
     });
+    //   transformEntity: map((helmServices: HelmReleaseService[]) => {
+    //     return helmServices.map(helmService => {
+    //       if (!helmService.kubeService$) {
+    //         helmService.kubeService$ = fetchHelmReleaseServiceFromKubernetes(store, helmService);
+    //       }
+    //       return helmService;
+    //     });
+    //   }),
+    //   refresh: () => {
+    //     store.dispatch(action);
+    //     store.dispatch(new ClearPaginationOfType(action));
+    //   }
+    // });
   }
 }
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-config.service.ts
index 9512498e97..8ae5e1fd35 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-config.service.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-config.service.ts
@@ -93,7 +93,7 @@ export class HelmReleasesListConfig implements IListConfig<HelmRelease> {
       columnId: 'last_Deployed',
       headerCell: () => 'Last Deployed',
       cellDefinition: {
-        getValue: (row) => `${this.datePipe.transform(row.lastDeployed, 'medium')}`
+        getValue: (row) => `${this.datePipe.transform(row.info.last_deployed, 'medium')}`
       },
       sort: {
         type: 'sort',
diff --git a/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.ts b/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.ts
index 67993ea19f..9a512b3415 100644
--- a/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.ts
+++ b/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.ts
@@ -11,7 +11,6 @@ export class MonocularTabBaseComponent {
     { link: 'charts', label: 'Charts', icon: 'folder_open' },
     { link: 'repos', label: 'Repositories', icon: 'products', iconFont: 'stratos-icons' },
     { link: 'releases', label: 'Releases', icon: 'apps' },
-    { link: 'config', label: 'Config', icon: 'build' },
   ];
 
 }
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.html b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.html
index 499d896079..fae3d4f7d5 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.html
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.html
@@ -6,7 +6,7 @@ <h2>Sorry, we couldn't find the chart</h2>
     <div class="chart-details__wrapper">
       <app-entity-summary-title class="summary-title" *ngIf="chart" [title]="chart.attributes.name"
         subTitle="{{ chart.attributes.repo.name }}"
-        [subText]="chart.attributes.description" [inlineImagePath]="iconUrl">
+        [subText]="chart.attributes.description" [imagePath]="iconUrl">
         <div class="chart-details__content">
           <article class="chart-details__content__docs">
             <app-chart-details-readme [currentVersion]=currentVersion></app-chart-details-readme>
diff --git a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts b/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
index e5063a381f..e93a680b0f 100644
--- a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
@@ -1,9 +1,33 @@
-import { Component } from '@angular/core';
+import { HELM_ENDPOINT_TYPE, helmReleaseResourceEntityType } from './../../helm-entity-factory';
+import { GetHelmReleaseServices } from './../../store/helm.actions';
+import { entityCatalogue } from './../../../../core/entity-catalogue/entity-catalogue.service';
+import { Component, OnDestroy } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Observable } from 'rxjs';
+import { Observable, Subject, Subscription } from 'rxjs';
 
-import { HelmReleaseGuid } from '../../store/helm.types';
+import { HelmReleaseGuid, HelmReleasePod } from '../../store/helm.types';
 import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service';
+import { catchError, switchMap, share, map, first, debounceTime, startWith } from 'rxjs/operators';
+import makeWebSocketObservable, { GetWebSocketResponses } from 'rxjs-websockets';
+import { Store, Action } from '@ngrx/store';
+import { AppState } from '../../../../../../store/src/app-state';
+import {
+  successEntityHandler
+} from '../../../../../../store/src/entity-request-pipeline/entity-request-base-handlers/success-entity-request.handler';
+import {
+  KUBERNETES_ENDPOINT_TYPE,
+  kubernetesPodsEntityType,
+  kubernetesServicesEntityType
+} from '../../../kubernetes/kubernetes-entity-factory';
+import { PipelineResult } from '../../../../../../store/src/entity-request-pipeline/entity-request-pipeline.types';
+import { GetHelmReleasePods } from '../../store/helm.actions';
+import { EntityCatalogueEntityConfig } from '../../../../core/entity-catalogue/entity-catalogue.types';
+import { helmReleaseGraphEntityType } from '../../helm-entity-factory';
+import { LoggerService } from '../../../../core/logger.service';
+
+type IDGetterFunction = (data: any) => string;
+
+
 
 @Component({
   selector: 'app-helm-release-tab-base',
@@ -22,10 +46,14 @@ import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service';
     }
   ]
 })
-export class HelmReleaseTabBaseComponent {
+export class HelmReleaseTabBaseComponent implements OnDestroy {
 
   isFetching$: Observable<boolean>;
 
+  private sub: Subscription;
+
+  //private connection: Connection;
+
   public breadcrumbs = [{
     breadcrumbs: [
       { value: 'Helm', routerLink: '/monocular' },
@@ -39,13 +67,167 @@ export class HelmReleaseTabBaseComponent {
     { link: 'summary', label: 'Summary', icon: 'helm', iconFont: 'stratos-icons' },
     { link: 'notes', label: 'Notes', icon: 'subject' },
     { link: 'values', label: 'Values', icon: 'list' },
+    { link: '-', label: 'Resources' },
+    { link: 'graph', label: 'Overview', icon: 'share' },
     { link: 'pods', label: 'Pods', icon: 'adjust' },
     { link: 'services', label: 'Services', icon: 'service', iconFont: 'stratos-icons' }
   ];
   constructor(
-    private helmRelease: HelmReleaseGuid,
+    public helmReleaseHelper: HelmReleaseHelperService,
+    private store: Store<AppState>,
+    private logService: LoggerService
   ) {
-    const guid = this.helmRelease.guid;
-    this.title = guid.split(':')[1];
+    this.title = this.helmReleaseHelper.releaseTitle;
+
+
+    const releaseRef = this.helmReleaseHelper.guidAsUrlFragment();
+    const host = window.location.host;
+    const protocol = window.location.protocol === 'https:' ? 'wss' : 'ws';
+    const streamUrl = (
+      `${protocol}://${host}/pp/v1/helm/releases/${releaseRef}`
+    );
+
+    const socket$ = makeWebSocketObservable(streamUrl).pipe(catchError(e => {
+      this.logService.error(
+        'Error while connecting to socket: ' + JSON.stringify(e)
+      );
+      return [];
+    }),
+      share(),
+    );
+
+    const messages = socket$.pipe(
+      switchMap((getResponses: GetWebSocketResponses) => {
+        return getResponses(new Subject<string>());
+      }),
+      map((message: string) => message),
+      catchError(e => {
+        console.log('WS Error');
+        console.log(e);
+        if (e.type === 'error') {
+          console.log(e);
+        }
+        return [];
+      })
+    );
+
+    let prefix = '';
+    this.sub = messages.subscribe(jsonString => {
+      const messageObj = JSON.parse(jsonString);
+      if (messageObj) {
+        if (messageObj.kind === 'ReleasePrefix') {
+          prefix = messageObj.data;
+        } else if (messageObj.kind === 'Pods') {
+          const pods = messageObj.data;
+          pods.forEach(pod => {
+            this.addResource(kubernetesPodsEntityType, pod, pod.metadata.uid);
+          });
+          const releasePodsAction = new GetHelmReleasePods(this.helmReleaseHelper.endpointGuid, this.helmReleaseHelper.releaseTitle);
+          this.populateList(releasePodsAction, pods);
+        } else if (messageObj.kind === 'Graph') {
+          const graph = messageObj.data;
+          graph.endpointId = this.helmReleaseHelper.endpointGuid;
+          graph.releaseTitle = this.helmReleaseHelper.releaseTitle;
+          this.addResource(helmReleaseGraphEntityType, graph, `${graph.endpointId}-${graph.releaseTitle}`, HELM_ENDPOINT_TYPE);
+        } else if (messageObj.kind === 'Manifest' ||  messageObj.kind === 'Resources') {
+          // Store all of the services
+          const manifest = messageObj.data;
+          const ep = this.helmReleaseHelper.endpointGuid;
+          const releaseServicesAction = new GetHelmReleaseServices(
+            this.helmReleaseHelper.endpointGuid,
+            this.helmReleaseHelper.releaseTitle
+          );
+          const svcs = [];
+
+          // Store ALL resources for the release
+          manifest.forEach(resource => {
+            if (resource.kind === 'Service' && prefix) {
+              this.addResource(kubernetesServicesEntityType, resource, `${prefix}-${resource.metadata.name}`);
+              svcs.push(resource);
+            }
+          });
+          if (svcs.length > 0) {
+            this.populateList(releaseServicesAction, svcs, (svc) => `${prefix}-${svc.metadata.name}`);
+          }
+
+          const resources = {...manifest};
+          resources.endpointId = this.helmReleaseHelper.endpointGuid;
+          resources.releaseTitle = this.helmReleaseHelper.releaseTitle;
+          this.addResource(helmReleaseResourceEntityType,
+            resources, `${resources.endpointId}-${resources.releaseTitle}`, HELM_ENDPOINT_TYPE);
+        }
+      }
+    });
+  }
+
+  private addResource(entityType: string, data: any, id: string, endpointType = KUBERNETES_ENDPOINT_TYPE) {
+    const actionDispatcher = (action) => this.store.dispatch(action);
+    const catalogEntity = entityCatalogue.getEntity(endpointType, entityType);
+    const pr = {
+      success: true,
+      response: {
+        entities: {
+          [catalogEntity.entityKey]: {
+            [id]: data
+          }
+        },
+        result: [
+          id
+        ]
+      }
+    } as PipelineResult;
+    successEntityHandler(
+      actionDispatcher,
+      catalogEntity,
+      'get',
+      {
+        endpointType,
+        entityType,
+        guid: id
+      },
+      pr
+    );
+  }
+
+  private populateList(action: EntityCatalogueEntityConfig, resources: any, idGetter?: IDGetterFunction) {
+    const entityType = kubernetesPodsEntityType;
+    const releaseTitle = this.helmReleaseHelper.releaseTitle;
+    const endpointId = this.helmReleaseHelper.endpointGuid;
+
+    if (!idGetter) {
+      idGetter = (data) => data.metadata.uid;
+    }
+
+    const actionDispatcher = (a) => this.store.dispatch(a);
+    const catalogEntity = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, entityType);
+    const newResources = {};
+    resources.forEach(resource => {
+      const newResource: HelmReleasePod = {
+        endpointId,
+        releaseTitle,
+        ...resource
+      };
+      newResources[idGetter(resource)] = newResource;
+    });
+
+    const releasePods = {
+      success: true,
+      response: {
+        entities: { [entityCatalogue.getEntityKey(action)]: Object.values(newResources) },
+        result: Object.keys(newResources)
+      }
+    };
+
+    successEntityHandler(
+      actionDispatcher,
+      catalogEntity,
+      'get',
+      action,
+      releasePods,
+    );
+  }
+
+  ngOnDestroy() {
+    this.sub.unsubscribe();
   }
 }
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
index 320d4495d5..2ea28d7bcd 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
@@ -1,13 +1,13 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map, tap } from 'rxjs/operators';
 
 import { EntityServiceFactory } from '../../../../core/entity-service-factory.service';
 import { PaginationMonitor } from '../../../../shared/monitors/pagination-monitor';
 import { helmEntityFactory, helmReleaseEntityKey } from '../../helm-entity-factory';
-import { GetHelmReleases, GetHelmReleaseStatus } from '../../store/helm.actions';
-import { HelmRelease, HelmReleaseGuid, HelmReleaseStatus } from '../../store/helm.types';
+import { GetHelmReleases, GetHelmReleaseStatus, GetHelmReleaseGraph, GetHelmReleaseResource } from '../../store/helm.actions';
+import { HelmRelease, HelmReleaseGuid, HelmReleaseStatus, HelmReleaseGraph, HelmReleaseResource } from '../../store/helm.types';
 import { AppState } from './../../../../../../store/src/app-state';
 import {
   getPaginationObservables,
@@ -22,6 +22,7 @@ export class HelmReleaseHelperService {
 
   public guid: string;
   public endpointGuid: string;
+  public namespace: string;
   public releaseTitle: string;
 
   constructor(
@@ -30,7 +31,8 @@ export class HelmReleaseHelperService {
     private esf: EntityServiceFactory
   ) {
     this.guid = helmReleaseGuid.guid;
-    this.releaseTitle = this.guid.split(':')[1];
+    this.releaseTitle = this.guid.split(':')[2];
+    this.namespace = this.guid.split(':')[1];
     this.endpointGuid = this.guid.split(':')[0];
 
     const action = new GetHelmReleases();
@@ -39,10 +41,22 @@ export class HelmReleaseHelperService {
     this.isFetching$ = svc.fetchingEntities$;
 
     this.release$ = svc.entities$.pipe(
-      map((items: HelmRelease[]) => items.find(item => item.guid === this.guid))
+      map((items: HelmRelease[]) => items.find(item => item.guid === this.guid)),
+      map((item: HelmRelease) => {
+        if (!item.chart.metadata.icon) {
+          const copy = JSON.parse(JSON.stringify(item));
+          copy.chart.metadata.icon = '/core/assets/custom/app_placeholder.svg';
+          return copy;
+        }
+        return item;
+      })
     );
   }
 
+  public guidAsUrlFragment(): string {
+    return this.guid.replace(':', '/').replace(':', '/');
+  }
+
   public fetchReleaseStatus(): Observable<HelmReleaseStatus> {
     // Get helm release
     const action = new GetHelmReleaseStatus(this.endpointGuid, this.releaseTitle);
@@ -51,114 +65,20 @@ export class HelmReleaseHelperService {
       map(entity => entity.entity)
     );
   }
-}
-
-export const parseHelmReleaseStatus = (res: string): HelmReleaseStatus => {
-  const lines = res.split('\n');
-  const result = {
-    pods: {},
-    fields: [],
-    data: {
-      'v1/Pod': {},
-      'v1/Service': {}
-    }
-  };
-
-  // Process
-  let i = 0;
-  while (i < lines.length) {
-    if (lines[i].indexOf('==>') === 0) {
-      // Got a resource type
-      const resType = getResourceName(lines[i].substr(4));
-      // Read fields
-      i++;
-      i = readFields(result, lines, i);
-      i = readResType(result, resType, lines, i);
-    } else {
-      i++;
-    }
-  }
-
-  calculateStats(result);
-  return result;
-};
-
-function getResourceName(name: string): string {
-  const parts = name.trim().split('(');
-  return parts[0].trim();
-}
-
-function readFields(result, lines, i): number {
-  let read = result.fields.length === 0;
-  if (!read && lines[i].length === 0) {
-    i++;
-    read = true;
-  }
-
-  if (lines[i].indexOf('NAME') === 0) {
-    read = true;
-  }
-
-  if (read) {
-    const params = lines[i].replace(/  +/g, ' ');
-    result.fields = params.split(' ');
-    i++;
-  }
-  return i;
-}
 
-function readResType(result, resType, lines, i): number {
-  const data = result.data;
-  data[resType] = [];
-  while (i < lines.length) {
-    if (lines[i].length === 0) {
-      return i + 1;
-    }
-    let values = lines[i];
-    values = values.replace(/  +/g, ' ');
-    const value = {};
-    values.split(' ').forEach((v, index) => {
-      let p = result.fields[index].trim();
-      p = p.toLowerCase();
-      value[p] = v.trim();
-    });
-    data[resType].push(value);
-    i++;
+  public fetchReleaseGraph(): Observable<HelmReleaseGraph> {
+    // Get helm release
+    const action = new GetHelmReleaseGraph(this.endpointGuid, this.releaseTitle);
+    return this.esf.create<HelmReleaseGraph>(action.key, action).waitForEntity$.pipe(
+      map(entity => entity.entity)
+    );
   }
 
-  return i;
-}
-
-function calculateStats(res) {
-  // Calculate Pod Stats
-  if (!!res.data['v1/Pod']) {
-    calculatePodStats(res, res.data['v1/Pod']);
+  public fetchReleaseResources(): Observable<HelmReleaseResource> {
+    // Get helm release
+    const action = new GetHelmReleaseResource(this.endpointGuid, this.releaseTitle);
+    return this.esf.create<HelmReleaseResource>(action.key, action).waitForEntity$.pipe(
+      map(entity => entity.entity)
+    );
   }
 }
-
-function calculatePodStats(data, pods) {
-  data.pods = {
-    status: {},
-    containers: 0,
-    ready: 0,
-  };
-
-  pods.forEach(pod => {
-    let count = data.pods.status[pod.status];
-    if (!count) {
-      count = 0;
-    }
-    data.pods.status[pod.status] = count + 1;
-
-    // Parse the ready state if running
-    if (pod.status === 'Running') {
-      const readyParts = pod.ready.split('/');
-      if (readyParts.length === 2) {
-        const ready = parseInt(readyParts[0], 10);
-        const total = parseInt(readyParts[1], 10);
-        data.pods.ready += ready;
-        data.pods.containers += total;
-      }
-    }
-  });
-}
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss
index d16a37d86c..db0219cb1e 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss
@@ -2,5 +2,5 @@
   display: block;
   font-family: Source Code Pro;
   font-size: 14px;
-  white-space: pre;
+  white-space: pre-wrap;
 }
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts
index 91425115d6..5da24e9315 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts
@@ -20,8 +20,8 @@ export class HelmReleaseNotesTabComponent {
 
     this.notes$ = helmReleaseHelper.release$.pipe(
       map(release => {
-        if (release.info.status.notes) {
-          return this.colorizer.ansiColorsToHtml(release.info.status.notes);
+        if (release.info.notes) {
+          return this.colorizer.ansiColorsToHtml(release.info.notes);
         } else {
           return '';
         }
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
new file mode 100644
index 0000000000..4cb7c6e4c8
--- /dev/null
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
@@ -0,0 +1,38 @@
+<app-page-sub-nav>
+  <button mat-button name="fit" (click)="fitGraph()" matTooltip="Fit">
+    <mat-icon>all_out</mat-icon>
+    <span>Fit</span>
+  </button>
+  <button mat-button name="toggle" (click)="toggleLayout()" matTooltip="Toggle Layout">
+    <mat-icon>view_quilt</mat-icon>
+    <span>Toggle Layout</span>
+  </button>
+</app-page-sub-nav>
+
+<ngx-graph
+  class="chart-container"
+  (zoomChange)="onZoomChanged($event)"
+  [links]="links"
+  [nodes]="nodes"
+  [update$]="update$"
+  [zoomToFit$]="fit$"
+  [layout]="layout"
+>
+  <ng-template #nodeTemplate let-node>
+    <svg:g class="node" (click)="onNodeClick(node)">
+      <svg:rect
+        [attr.width]="node.dimension.width"
+        [attr.height]="node.dimension.height"
+        [attr.fill]="node.data.fill"
+        class="node"></svg:rect>
+      />
+      <svg:text
+      class="no-style"
+      alignment-baseline="central"
+      [attr.fill]="node.data.text"
+      [attr.x]="10" [attr.y]="node.dimension.height / 2">
+        {{node.label}} ({{node.data.kind}})
+      </svg:text>
+    </svg:g>
+  </ng-template>
+</ngx-graph>
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss
new file mode 100644
index 0000000000..ec3bfddc2f
--- /dev/null
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss
@@ -0,0 +1,5 @@
+:host {
+  display: flex;
+  height: 100%;
+  width: 100%;
+}
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
new file mode 100644
index 0000000000..274f69a1e3
--- /dev/null
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HelmReleaseResourceGraphComponent } from './helm-release-resource-graph.component';
+
+describe('HelmReleaseResourceGraphComponent', () => {
+  let component: HelmReleaseResourceGraphComponent;
+  let fixture: ComponentFixture<HelmReleaseResourceGraphComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ HelmReleaseResourceGraphComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(HelmReleaseResourceGraphComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
new file mode 100644
index 0000000000..969368aa34
--- /dev/null
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
@@ -0,0 +1,141 @@
+import { Node, Edge } from '@swimlane/ngx-graph';
+import { Component, OnInit, OnDestroy, ComponentFactoryResolver } from '@angular/core';
+import { HelmReleaseHelperService } from '../helm-release-helper.service';
+import { Subject, Subscription } from 'rxjs';
+import { PanelPreviewService } from '../../../../../shared/services/panel-preview.service';
+import { HelmReleaseResourcePreviewComponent } from './helm-release-resource-preview/helm-release-resource-preview.component';
+
+interface Colors {
+  bg: string;
+  fg: string;
+}
+
+const layouts = [
+  'dagre',
+  'd3ForceDirected',
+  'colaForceDirected'
+];
+
+@Component({
+  selector: 'app-helm-release-resource-graph',
+  templateUrl: './helm-release-resource-graph.component.html',
+  styleUrls: ['./helm-release-resource-graph.component.scss']
+})
+export class HelmReleaseResourceGraphComponent implements OnInit, OnDestroy {
+
+  // see: https://swimlane.github.io/ngx-graph/#/#quick-start
+
+  public nodes = [] as Node[];
+  public links = [] as Edge[];
+
+  update$: Subject<boolean> = new Subject();
+
+  fit$: Subject<boolean> = new Subject();
+
+  public layout = 'dagre';
+
+  public layoutIndex = 0;
+
+  private graph: Subscription;
+
+  constructor(
+    private componentFactoryResolver: ComponentFactoryResolver,
+    private helper: HelmReleaseHelperService,
+    private previewPanel: PanelPreviewService) { }
+
+  ngOnInit() {
+
+    // Listen for the graph
+    this.graph = this.helper.fetchReleaseGraph().subscribe((g: any) => {
+      const newNodes = [];
+      Object.values(g.nodes).forEach((node: any) => {
+        const colors = this.getColor(node.data.status);
+        newNodes.push({
+          id: node.id,
+          label: node.label,
+          data: {
+            ...node.data,
+            fill: colors.bg,
+            text: colors.fg
+          },
+        });
+      });
+      this.nodes = newNodes;
+
+      const newLinks = [];
+      Object.values(g.links).forEach((link: any) => {
+        newLinks.push({
+          id: link.id,
+          label: link.id,
+          source: link.source,
+          target: link.target
+        });
+      });
+      this.links = newLinks;
+      this.update$.next(true);
+    });
+  }
+
+  ngOnDestroy() {
+    if (this.graph) {
+      this.graph.unsubscribe();
+    }
+  }
+
+  // Open side panel when node is clicked
+  public onNodeClick(node: any) {
+    this.previewPanel.show(
+      HelmReleaseResourcePreviewComponent,
+      {
+        node,
+        helper: this.helper,
+        endpoint: this.helper.endpointGuid,
+        releaseTitle: this.helper.releaseTitle
+      },
+      this.componentFactoryResolver
+    );
+  }
+
+  public fitGraph() {
+    this.fit$.next(true);
+  }
+
+  public toggleLayout() {
+    this.layoutIndex++;
+    if (this.layoutIndex === layouts.length) {
+      this.layoutIndex = 0;
+    }
+
+    this.layout = layouts[this.layoutIndex];
+  }
+
+  private getColor(status: string): Colors {
+    switch (status) {
+      case 'error':
+        return {
+          bg: 'red',
+          fg: 'white'
+        };
+      case 'ok':
+        return {
+          bg: 'green',
+          fg: 'white'
+        };
+      case 'warn':
+        return {
+          bg: 'orange',
+          fg: 'white'
+        };
+      default:
+        return {
+          bg: '#5a9cb0',
+          fg: 'white'
+        };
+    }
+  }
+
+  public onZoomChanged(e) {
+    //console.log(e);
+  }
+
+}
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.html
new file mode 100644
index 0000000000..4fcce0ab85
--- /dev/null
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.html
@@ -0,0 +1,29 @@
+<app-sidepanel-preview title="Helm Release Resource Preview">
+
+  <div *ngIf="resource$ | async as resource">
+    <app-metadata-item class="chart-details__item" label="Name">{{ resource.metadata.name }}</app-metadata-item>
+    <app-metadata-item class="chart-details__item" label="Kind">{{ resource.kind }}</app-metadata-item>
+    <app-metadata-item class="chart-details__item" label="API Version">{{ resource.apiVersion }}</app-metadata-item>
+    <div class="resource-preview__side-by-side">
+      <app-metadata-item label="Created">{{ resource.metadata.creationTimestamp | date:'medium' }}</app-metadata-item>
+      <app-metadata-item label="Age">{{ resource.age }}</app-metadata-item>
+    </div>
+
+    <app-metadata-item class="resource-preview__labels" label="Labels">
+      <div *ngFor="let label of resource.labels" class="resource-preview__label">
+        <div class="resource-preview__label-name">{{ label.name }}</div>
+        <div class="resource-preview__label-value">{{ label.value }}</div>
+      </div>
+    </app-metadata-item>
+
+    <app-metadata-item class="resource-preview__labels" label="Annotations" *ngIf="resource.annotations">
+        <div *ngFor="let label of resource.annotations" class="resource-preview__label">
+          <div class="resource-preview__label-name">{{ label.name }}</div>
+          <div class="resource-preview__label-value">{{ label.value }}</div>
+        </div>
+      </app-metadata-item>          
+
+    <app-json-viewer #viewer [json]="resource"></app-json-viewer>
+
+  </div>
+</app-sidepanel-preview>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.scss b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.scss
new file mode 100644
index 0000000000..d66faa8fc6
--- /dev/null
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.scss
@@ -0,0 +1,30 @@
+.resource-preview {
+
+  &__labels {
+    display: table;
+  }
+  
+  &__label {
+    display: table-row;
+  }
+
+  &__label-name {
+    display: table-cell;
+    opacity: 0.8;
+    padding: 2px 20px 2px 2px;
+  }
+
+  &__label-value {
+    display: table-cell;
+  }
+
+  &__side-by-side {
+    display: flex;
+
+    app-metadata-item {
+      margin-right: 40px;
+    }
+    
+  }
+
+}
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts
new file mode 100644
index 0000000000..534fadc806
--- /dev/null
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HelmReleaseResourcePreviewComponent } from './helm-release-resource-preview.component';
+
+describe('HelmReleaseResourcePreviewComponent', () => {
+  let component: HelmReleaseResourcePreviewComponent;
+  let fixture: ComponentFixture<HelmReleaseResourcePreviewComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ HelmReleaseResourcePreviewComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(HelmReleaseResourcePreviewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts
new file mode 100644
index 0000000000..03a6829474
--- /dev/null
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts
@@ -0,0 +1,50 @@
+import { Component, OnInit } from '@angular/core';
+import { PreviewableComponent } from '../../../../../../shared/previewable-component';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import * as moment from 'moment';
+
+@Component({
+  selector: 'app-helm-release-resource-preview',
+  templateUrl: './helm-release-resource-preview.component.html',
+  styleUrls: ['./helm-release-resource-preview.component.scss']
+})
+export class HelmReleaseResourcePreviewComponent implements PreviewableComponent  {
+
+  public resource$: Observable<any>;
+
+  setProps(props: { [key: string]: any; }): void {
+    this.resource$ = props.helper.fetchReleaseResources().pipe(
+      map((r: any[]) => {
+        const item = Object.values(r).find((res: any) => res.metadata.name === props.node.label && res.metadata.kind === props.node.kind);
+
+        const newItem = { ...item};
+        newItem.age = moment(item.metadata.creationTimestamp).fromNow(true);
+
+        newItem.labels = [];
+        Object.keys(item.metadata.labels).forEach(labelName => {
+          newItem.labels.push({
+            name: labelName,
+            value: item.metadata.labels[labelName]
+          });
+        });
+
+        if (item.metadata && item.metadata.annotations) {
+          newItem.annotations = [];
+          Object.keys(item.metadata.annotations).forEach(labelName => {
+            newItem.annotations.push({
+              name: labelName,
+              value: item.metadata.annotations[labelName]
+            });
+          });
+        }
+
+        return newItem;
+      })
+    );
+
+  }
+
+  constructor() { }
+
+}
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
index 1a1ef4f001..765cb96759 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
@@ -21,13 +21,13 @@
           </app-metadata-item>
           <app-metadata-item class="chart-details__item" label="Status">{{ release.status }}</app-metadata-item>
           <app-metadata-item class="chart-details__item" label="First Deployed">
-            {{ release.firstDeployed | date:'medium' }}
+            {{ release.info.first_deployed | date:'medium' }}
           </app-metadata-item>
           <app-metadata-item class="chart-details__item" label="Last Deployed">
-            {{ release.lastDeployed | date:'medium' }}
+            {{ release.info.last_deployed | date:'medium' }}
           </app-metadata-item>
         </div>
-        <app-tile-grid>
+        <!-- <app-tile-grid>
           <app-tile-group *ngIf="chartData$ | async as chartData">
             <app-tile>
               <mat-card class="full-card">
@@ -41,8 +41,18 @@
               </mat-card>
             </app-tile>
           </app-tile-group>
-        </app-tile-grid>
+        </app-tile-grid> -->
+
       </div>
+      <app-metadata-item class="chart-details__item" label="Resources"></app-metadata-item>
+
+
+        <div *ngIf="resources$ | async as resources" class="grid">
+          <app-card-number-metric *ngFor="let res of resources" label="{{ res.label }}"
+          icon="{{ res.icon.name }}" iconFont="{{ res.icon.font }}"
+              value="{{ res.count }}">
+          </app-card-number-metric>
+        </div>
     </app-entity-summary-title>
 
 
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
index cb85d21fdb..8f8c0eb39d 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
@@ -1,4 +1,6 @@
 
+@import '../../../../../../sass/mixins';
+
 .app-metadata {
   display: flex;
   flex-direction: row;
@@ -25,3 +27,29 @@
   max-width: 800px;
   opacity: .6;
 }
+
+
+.grid {
+  $bottom-space: 20px;
+  display: grid;
+  grid-column-gap: 10px;
+  grid-row-gap: 10px;
+  grid-template-columns: 100%;
+  min-height: 0;
+  min-width: 0;
+
+  @include breakpoint(tablet) {
+    grid-column-gap: $bottom-space;
+    grid-row-gap: $bottom-space;
+    grid-template-columns: repeat(2, 1fr);
+  }
+
+  @include breakpoint(laptop) {
+    grid-template-columns: repeat(4, 1fr);
+  }
+
+  @include breakpoint(desktop) {
+    grid-template-columns: repeat(5, 1fr);
+  }
+}
+
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index d4820f671a..91f4e788e2 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -1,8 +1,10 @@
 import { HttpClient } from '@angular/common/http';
 import { Component, OnDestroy } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { combineLatest, Observable, ReplaySubject } from 'rxjs';
-import { map, startWith } from 'rxjs/operators';
+import { combineLatest, Observable, ReplaySubject, of as obsOf, Subject, BehaviorSubject } from 'rxjs';
+import { map, startWith, catchError, share, filter } from 'rxjs/operators';
+
+import websocketConnect from 'rxjs-websockets';
 
 import { ClearPaginationOfType } from '../../../../../../../store/src/actions/pagination.actions';
 import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
@@ -14,6 +16,8 @@ import { ConfirmationDialogConfig } from '../../../../../shared/components/confi
 import { ConfirmationDialogService } from '../../../../../shared/components/confirmation-dialog.service';
 import { HELM_ENDPOINT_TYPE, helmReleaseEntityKey } from '../../../helm-entity-factory';
 import { HelmReleaseHelperService } from '../helm-release-helper.service';
+import { HelmReleaseStatus, HELM_INSTALLING_KEY } from '../../../store/helm.types';
+import { EntityRequestAction } from '../../../../../../../store/src/types/request.types';
 
 @Component({
   selector: 'app-helm-release-summary-tab',
@@ -47,6 +51,31 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
     }
   ];
 
+  public iconMappings = {
+    Pod: {
+      name: 'adjust'
+    },
+    Role: {
+      name: 'lock'
+    },
+    RoleBinding: {
+      name: 'lock'
+    },
+    ServiceAccount: {
+      name: 'lock'
+    },
+    ReplicaSet: {
+      name: 'filter_none'
+    },
+    default: {
+      name: 'collocation',
+      font: 'stratos-icons'
+    }
+  };
+
+
+  public resources$: Observable<any>;
+
   // Blue: #00B2E2
   // Yellow: #FFC107
 
@@ -61,7 +90,15 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
     private logService: LoggerService
   ) {
 
-    const releaseStatus$ = this.helmReleaseHelper.fetchReleaseStatus();
+    //const releaseStatus$ = this.helmReleaseHelper.fetchReleaseStatus();
+
+    const releaseStatus$ = new BehaviorSubject<HelmReleaseStatus>({} as HelmReleaseStatus);
+    //.helmReleaseHelper.fetchReleaseStatus();
+
+
+
+
+
 
     this.isBusy$ = combineLatest([
       this.helmReleaseHelper.isFetching$,
@@ -74,25 +111,56 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
       startWith(true)
     );
 
-    // Async fetch release status
-    this.chartData$ = releaseStatus$.pipe(
-      map(data => ({
-        podsChartData: Object.keys(data.pods.status).map(status => ({
-          name: status,
-          value: data.pods.status[status]
-        })),
-        containersChartData: [
-          {
-            name: 'Ready',
-            value: data.pods.ready
-          },
-          {
-            name: 'Not Ready',
-            value: data.pods.containers - data.pods.ready
+    this.resources$ = this.helmReleaseHelper.fetchReleaseGraph().pipe(
+      map((graph: any) => {
+        const resources = {};
+        // Collect the resources
+        Object.values(graph.nodes).forEach((node: any) => {
+          if (!resources[node.data.kind]) {
+            resources[node.data.kind] = {
+              kind: node.data.kind,
+              label: `${node.data.kind}s`,
+              count: 0,
+              statuses: [],
+              icon: this.getIcon(node.data.kind)
+            };
           }
-        ]
-      }))
+          resources[node.data.kind].count++;
+          resources[node.data.kind].statuses.push(node.data.status);
+        });
+        return Object.values(resources).sort((a: any, b: any) => a.kind.localeCompare(b.kind));
+      })
     );
+
+    // Async fetch release status
+    // this.chartData$ = obsOf({});
+    // this.chartData$ = releaseStatus$.pipe(
+    //   map(data => ({
+    //     podsChartData: Object.keys(data.pods.status).map(status => ({
+    //       name: status,
+    //       value: data.pods.status[status]
+    //     })),
+    //     containersChartData: [
+    //       {
+    //         name: 'Ready',
+    //         value: data.pods.ready
+    //       },
+    //       {
+    //         name: 'Not Ready',
+    //         value: data.pods.containers - data.pods.ready
+    //       }
+    //     ]
+    //   }))
+    // );
+  }
+
+  private getIcon(kind: string) {
+    const rkind = kind || 'Pod';
+    if (this.iconMappings[rkind]) {
+      return this.iconMappings[rkind];
+    } else {
+      return this.iconMappings.default;
+    }
   }
 
   private startDelete() {
@@ -114,17 +182,25 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
   public deleteRelease() {
     this.confirmDialog.open(this.deleteReleaseConfirmation, () => {
       // Make the http request to delete the release
-      const endpointAndName = this.helmReleaseHelper.guid.replace(':', '/');
+      const releaseRef = this.helmReleaseHelper.guidAsUrlFragment();
       this.startDelete();
-      this.httpClient.delete(`/pp/v1/helm/releases/${endpointAndName}`).subscribe({
+      this.httpClient.delete(`/pp/v1/helm/releases/${releaseRef}`).subscribe({
         error: (err: any) => {
           this.endDelete();
           this.store.dispatch(new ShowSnackBar('Failed to delete release', 'Close'));
           this.logService.error('Failed to delete release: ', err);
         },
         complete: () => {
-          const releaseEntityConfig = entityCatalogue.getEntity(HELM_ENDPOINT_TYPE, helmReleaseEntityKey);
-          this.store.dispatch(new ClearPaginationOfType(releaseEntityConfig));
+          // Just need an action to clear the pagination for the Helm releases
+          const apiAction = {
+            endpointType: HELM_ENDPOINT_TYPE,
+            entityType: helmReleaseEntityKey,
+            guid: this.helmReleaseHelper.guid,
+            type: null,
+            updatingKey: HELM_INSTALLING_KEY
+          } as EntityRequestAction;
+
+          this.store.dispatch(new ClearPaginationOfType(apiAction));
           this.completeDelete();
           this.store.dispatch(new RouterNav({ path: ['monocular/releases'] }));
         }
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
index 370172b3b7..49f9d181c6 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
@@ -1,9 +1,26 @@
-<div *ngIf="values$ | async as values; else noValues">
-  <app-code-block codeBlockStyle="pre">
-    <pre [innerHtml]="values">
-      </pre>
-  </app-code-block>
-</div>
+<app-page-sub-nav>
+
+  <mat-button-toggle-group class="toolbar" [value]="viewType$ | async"
+    (change)="viewTypeChange($event.value)" name="view" aria-label="View">
+    <mat-button-toggle value="user">User</mat-button-toggle>
+    <mat-button-toggle value="chart">Chart</mat-button-toggle>
+    <mat-button-toggle value="combined">Combined</mat-button-toggle>
+  </mat-button-toggle-group>
+
+  <button mat-button name="expand_all" (click)="viewer.expand()" matTooltip="Expand all">
+    <mat-icon>expand_more</mat-icon>
+    <span>Expand all</span>
+  </button>
+  <button mat-button name="collapse_all" (click)="viewer.collapse()" matTooltip="Collapse all">
+    <mat-icon>expand_less</mat-icon>
+    <span>Collapse all</span>
+  </button>
+</app-page-sub-nav>
+
+<app-json-viewer #viewer [json]="values$ | async"></app-json-viewer>
+<!-- <div *ngIf="values$ | async as values; else noValues">
+  <app-json-viewer #viewer [json]="values"></app-json-viewer>
+</div> -->
 <ng-template #noValues>
   <app-no-content-message [icon]="'list'" [firstLine]="'There are no release values'"></app-no-content-message>
 </ng-template>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
index ae015b09a5..e995a94edb 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { combineLatest, Observable, Subject } from 'rxjs';
+import { map, tap, startWith } from 'rxjs/operators';
 
 import { HelmReleaseHelperService } from '../helm-release-helper.service';
 
@@ -11,27 +11,64 @@ import { HelmReleaseHelperService } from '../helm-release-helper.service';
 })
 export class HelmReleaseValuesTabComponent {
 
-  public values$: Observable<string>;
+  public values$: Observable<any>;
+
+  private viewTypeSubject = new Subject<string>();
+
+  public viewType$: Observable<string>;
 
   constructor(public helmReleaseHelper: HelmReleaseHelperService) {
 
-    this.values$ = helmReleaseHelper.release$.pipe(
-      map(release => {
-        if (release.config.raw) {
-          return this.hidePasswords(release.config.raw);
-        } else {
-          return '';
+    this.viewType$ = this.viewTypeSubject.asObservable().pipe(startWith('user'));
+
+    this.values$ = combineLatest(
+      this.viewType$,
+      helmReleaseHelper.release$
+    ).pipe(
+      map(([vtype, release]) => {
+        switch (vtype) {
+          case 'user':
+            return release.config || {};
+          case 'combined':
+              const chart = release.chart.values || {};
+              const user = release.config || {};
+              const target = {};
+              return this.mergeDeep(target, chart, user);
+          default:
+            return release.chart.values || {};
         }
       })
     );
   }
 
-  private hidePasswords(values: string): string {
-    // TODO: See #150 - It's a PITA but this should be done in the back end
-    let mask = values.replace(new RegExp('(PASSWORD: [a-zA-Z0-9_\-]*)', 'gm'), 'PASSWORD: **********');
-    mask = mask.replace(new RegExp('(password: [a-zA-Z0-9_\-]*)', 'gm'), 'password: **********');
-    mask = mask.replace(new RegExp('(SECRET: [a-zA-Z0-9_\-]*)', 'gm'), 'SECRET: **********');
-    mask = mask.replace(new RegExp('(secret: [a-zA-Z0-9_\-]*)', 'gm'), 'secret: **********');
-    return mask;
+  public viewTypeChange(viewType: string) {
+    this.viewTypeSubject.next(viewType);
   }
+
+  private isObject(item) {
+    return (item && typeof item === 'object' && !Array.isArray(item));
+  }
+
+  private mergeDeep(target, ...sources) {
+    if (!sources.length) {
+      return target;
+    }
+    const source = sources.shift();
+
+    if (this.isObject(target) && this.isObject(source)) {
+      for (const key in source) {
+        if (this.isObject(source[key])) {
+          if (!target[key]) {
+            Object.assign(target, { [key]: {} });
+          }
+          this.mergeDeep(target[key], source[key]);
+        } else {
+          Object.assign(target, { [key]: source[key] });
+        }
+      }
+    }
+
+    return this.mergeDeep(target, ...sources);
+  }
+
 }
diff --git a/custom-src/frontend/app/custom/helm/store/helm.actions.ts b/custom-src/frontend/app/custom/helm/store/helm.actions.ts
index b7c950b02e..6041671ae4 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.actions.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.actions.ts
@@ -1,3 +1,8 @@
+import {
+  KUBERNETES_ENDPOINT_TYPE,
+  kubernetesPodsEntityType,
+  kubernetesServicesEntityType,
+  kubernetesEntityFactory} from '../../kubernetes/kubernetes-entity-factory';
 import { Action } from '@ngrx/store';
 
 import { EntityRequestAction } from '../../../../../store/src/types/request.types';
@@ -5,12 +10,13 @@ import {
   HELM_ENDPOINT_TYPE,
   helmEntityFactory,
   helmReleaseEntityKey,
-  helmReleasePodEntityType,
-  helmReleaseServiceEntityType,
   helmReleaseStatusEntityType,
   helmVersionsEntityType,
+  helmReleaseGraphEntityType,
   monocularChartsEntityType,
+  helmReleaseResourceEntityType,
 } from '../helm-entity-factory';
+
 import { PaginatedAction } from './../../../../../store/src/types/pagination.types';
 import { HelmInstallValues } from './helm.types';
 
@@ -42,6 +48,10 @@ export const HELM_INSTALL = '[Helm] Install';
 export const HELM_INSTALL_SUCCESS = '[Helm] Install Success';
 export const HELM_INSTALL_FAILURE = '[Helm] Install Failure';
 
+export const UPDATE_HELM_RELEASE_STATUS = '[Helm] Update Release Status [WS]';
+export const UPDATE_HELM_RELEASE_STATUS_SUCCESS = '[Helm] Update Release Status [WS] Success';
+export const UPDATE_HELM_RELEASE_STATUS_FAILURE  = '[Helm] Update Release Status [WS] Failure';
+
 export interface MonocularPaginationAction extends PaginatedAction, EntityRequestAction { }
 
 export class GetMonocularCharts implements MonocularPaginationAction {
@@ -124,6 +134,41 @@ export class GetHelmReleaseStatus implements EntityRequestAction {
   ];
 }
 
+// Never dispateched - just used for look-up
+// Don't know why I need an action for this rather than an entity type?
+export class GetHelmReleaseGraph implements EntityRequestAction {
+  key: string;
+  constructor(
+    public endpointGuid: string,
+    public releaseTitle: string
+  ) {
+    this.key = `${endpointGuid}-${releaseTitle}`;
+  }
+  type = this.constructor.name;
+  endpointType = HELM_ENDPOINT_TYPE;
+  entity = helmEntityFactory(helmReleaseGraphEntityType);
+  entityType = helmReleaseGraphEntityType;
+  actions = [this.type];
+}
+
+// Never dispateched - just used for look-up
+// Don't know why I need an action for this rather than an entity type?
+export class GetHelmReleaseResource implements EntityRequestAction {
+  key: string;
+  constructor(
+    public endpointGuid: string,
+    public releaseTitle: string
+  ) {
+    this.key = `${endpointGuid}-${releaseTitle}`;
+  }
+  type = this.constructor.name;
+  endpointType = HELM_ENDPOINT_TYPE;
+  entity = helmEntityFactory(helmReleaseResourceEntityType);
+  entityType = helmReleaseResourceEntityType;
+  actions = [this.type];
+}
+
+
 export class GetHelmReleasePods implements MonocularPaginationAction {
   constructor(
     public endpointGuid: string,
@@ -132,9 +177,9 @@ export class GetHelmReleasePods implements MonocularPaginationAction {
     this.paginationKey = `${endpointGuid}/${releaseTitle}/pods`;
   }
   type = GET_HELM_RELEASE_PODS;
-  endpointType = HELM_ENDPOINT_TYPE;
-  entityType = helmReleasePodEntityType;
-  entity = [helmEntityFactory(helmReleasePodEntityType)];
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
+  entityType = kubernetesPodsEntityType;
+  entity = [kubernetesEntityFactory(kubernetesPodsEntityType)];
   actions = [
     GET_HELM_RELEASE_PODS,
     GET_HELM_RELEASE_PODS_SUCCESS,
@@ -158,9 +203,9 @@ export class GetHelmReleaseServices implements MonocularPaginationAction {
     this.paginationKey = `${endpointGuid}/${releaseTitle}/services`;
   }
   type = GET_HELM_RELEASE_SERVICES;
-  endpointType = HELM_ENDPOINT_TYPE;
-  entityType = helmReleaseServiceEntityType;
-  entity = [helmEntityFactory(helmReleaseServiceEntityType)];
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
+  entityType = kubernetesServicesEntityType;
+  entity = [kubernetesEntityFactory(kubernetesServicesEntityType)];
   actions = [
     GET_HELM_RELEASE_SERVICES,
     GET_HELM_RELEASE_SERVICES_SUCCESS,
@@ -181,3 +226,9 @@ export class HelmInstall implements Action {
   type = HELM_INSTALL;
   public guid = () => '<New Release>' + this.values.releaseName;
 }
+
+export class HelmUpdateRelease implements Action {
+  constructor(public values: any) { }
+  type = UPDATE_HELM_RELEASE_STATUS;
+  // public guid = () => '<New Release>' + this.values.releaseName;
+}
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 017506db62..edfec83630 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.effects.ts
@@ -17,7 +17,6 @@ import {
 import { entityCatalogue } from '../../../core/entity-catalogue/entity-catalogue.service';
 import { environment } from '../../../environments/environment';
 import { HELM_ENDPOINT_TYPE, helmReleaseEntityKey } from '../helm-entity-factory';
-import { parseHelmReleaseStatus } from '../release/tabs/helm-release-helper.service';
 import {
   GET_HELM_RELEASE_PODS,
   GET_HELM_RELEASE_SERVICES,
@@ -98,16 +97,18 @@ export class HelmEffects {
           if (!endpointData) {
             return;
           }
-          endpointData.releases.forEach((data) => {
+          endpointData.forEach((data) => {
+            console.log('Got helm release');
+            console.log(data);
             const helmRelease: HelmRelease = {
               ...data,
               endpointId: endpoint
             };
-            // Release name is unique for an endpoint
-            const id = endpoint + ':' + data.name;
+            // Release name is unique for an endpoint - for Helm 3, include the namespace
+            const id = endpoint + ':' + data.namespace + ':' + data.name;
             helmRelease.guid = id;
             // Make a note of the guid of the endpoint for the release
-            helmRelease.status = mapHelmStatus(data.info.status.code);
+            helmRelease.status = mapHelmStatus(data.info.status);
             helmRelease.lastDeployed = mapHelmModifiedDate(data.info.last_deployed);
             helmRelease.firstDeployed = mapHelmModifiedDate(data.info.first_deployed);
             // data.info =
@@ -162,17 +163,25 @@ export class HelmEffects {
             result: []
           } as NormalizedResponse;
 
-          const status = parseHelmReleaseStatus(response.info.status.resources);
+          const status = {};
 
-          this.updateReleasePods(action, status);
+          // TODO
 
-          this.updateReleaseServices(action, status);
+          // this.updateReleasePods(action, status);
+
+          // this.updateReleaseServices(action, status);
 
           // Go through each endpoint ID
           const newStatus: HelmReleaseStatus = {
             endpointId: action.endpointGuid,
             releaseTitle: action.releaseTitle,
-            ...status
+            ...status,
+            pods: [],
+            fields: [],
+            data: {
+              'v1/Pod': {},
+              'v1/Service': {}
+            }
           };
           processedData.entities[entityKey][action.key] = newStatus;
           processedData.result.push(action.key);
@@ -181,11 +190,11 @@ export class HelmEffects {
     })
   );
 
-  @Effect()
-  fetchHelmReleasePods$ = this.actions$.pipe(
-    ofType<GetHelmReleasePods>(GET_HELM_RELEASE_PODS),
-    mergeMap(action => [new GetHelmReleaseStatus(action.endpointGuid, action.releaseTitle)])
-  );
+  // @Effect()
+  // fetchHelmReleasePods$ = this.actions$.pipe(
+  //   ofType<GetHelmReleasePods>(GET_HELM_RELEASE_PODS),
+  //   mergeMap(action => [new GetHelmReleaseStatus(action.endpointGuid, action.releaseTitle)])
+  // );
 
   @Effect()
   fetchHelmReleaseServices$ = this.actions$.pipe(
@@ -311,10 +320,16 @@ export class HelmEffects {
   }
 }
 
-function mapHelmStatus(status: number) {
+function _mapHelmStatus(status: number) {
   return HelmStatus[status].replace('_', ' ');
 }
 
+function mapHelmStatus(status: string) {
+  // TODO: Capitalize first letter
+  return status;
+  //return HelmStatus[status].replace('_', ' ');
+}
+
 function mapHelmModifiedDate(date: any) {
   let unix = date.seconds * 1000 + date.nanos / 1000;
   unix = Math.floor(unix);
diff --git a/custom-src/frontend/app/custom/helm/store/helm.reducers.ts b/custom-src/frontend/app/custom/helm/store/helm.reducers.ts
new file mode 100644
index 0000000000..3d31b6fefc
--- /dev/null
+++ b/custom-src/frontend/app/custom/helm/store/helm.reducers.ts
@@ -0,0 +1,12 @@
+import { UPDATE_HELM_RELEASE_STATUS } from './helm.actions';
+
+const defaultState = {};
+
+export function helmReleaseReducer(state: any = defaultState, action) {
+  switch (action.type) {
+    case UPDATE_HELM_RELEASE_STATUS:
+      return {
+        ...state,
+      };
+  }
+}
diff --git a/custom-src/frontend/app/custom/helm/store/helm.types.ts b/custom-src/frontend/app/custom/helm/store/helm.types.ts
index c082044078..11fb7b0a2f 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.types.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.types.ts
@@ -44,12 +44,17 @@ export interface HelmRelease {
   lastDeployed: Date;
   firstDeployed: Date;
   info: {
-    status: {
-      notes: string;
-    }
+    last_deployed: Date;
+    first_deployed: Date;
+    notes: string;
+    status: string;
   };
-  config: {
-    raw: string;
+  config: any;
+  chart: {
+    values: any;
+    metadata: {
+      icon?: string;
+    };
   };
 }
 
@@ -94,6 +99,13 @@ export interface HelmReleaseService {
   kubeService$?: Observable<KubeService>;
 }
 
+export interface HelmReleaseGraph {
+  endpointId: string;
+  releaseTitle: string;
+}
+
+export type HelmReleaseResource = any;
+
 export function isHelmReleaseService(obj: any): HelmReleaseService {
   if (obj && obj.kubeService$) {
     return obj as HelmReleaseService;
diff --git a/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.html b/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.html
deleted file mode 100644
index dd2b6cb351..0000000000
--- a/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<app-list></app-list>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.spec.ts b/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.spec.ts
deleted file mode 100644
index 5c82b66529..0000000000
--- a/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.spec.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { HelmBaseTestModules } from '../../helm-testing.module';
-import { HelmConfigurationComponent } from './helm-configuration.component';
-
-describe('HelmConfigurationComponent', () => {
-  let component: HelmConfigurationComponent;
-  let fixture: ComponentFixture<HelmConfigurationComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        ...HelmBaseTestModules
-      ],
-      declarations: [HelmConfigurationComponent]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(HelmConfigurationComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.ts b/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.ts
deleted file mode 100644
index c6c3d58357..0000000000
--- a/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Component } from '@angular/core';
-
-import { ListConfig } from '../../../../shared/components/list/list.component.types';
-import { HelmVersionsListConfig } from '../../list-types/monocular-versions-list-config.service';
-
-@Component({
-  selector: 'app-helm-configuration',
-  templateUrl: './helm-configuration.component.html',
-  styleUrls: ['./helm-configuration.component.scss'],
-  providers: [{
-    provide: ListConfig,
-    useClass: HelmVersionsListConfig,
-  }]
-})
-export class HelmConfigurationComponent { }
-
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html
index fe2a325d20..975c49b94e 100644
--- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html
@@ -1,12 +1,22 @@
 <div [formGroup]="formGroup" class="kube-certs-auth">
   <div formGroupName="authValues" class="kube-certs-auth__form">
-    <span>Specify Certificate file:</span>
-    <app-file-input fileFormControlName="cert" placeholder="cert">
-    </app-file-input>
-    <span>Specify Certificate key file:</span>
-    <app-file-input fileFormControlName="certKey" placeholder="certKey">
-    </app-file-input>
-    <input matInput formControlName="cert" hidden=true>
-    <input matInput formControlName="certKey" hidden=true>
+    <mat-tab-group>
+      <mat-tab label="Certificate Files">
+        <span>Specify Certificate file:</span>
+        <app-file-input fileFormControlName="cert" placeholder="cert">
+        </app-file-input>
+        <span>Specify Certificate key file:</span>
+        <app-file-input fileFormControlName="certKey" placeholder="certKey">
+        </app-file-input>
+        <input matInput formControlName="cert" hidden=true>
+        <input matInput formControlName="certKey" hidden=true>
+      </mat-tab>
+      <mat-tab label="Certificate Content">
+        <span>Specify Certificate:</span>
+        <textarea matInput formControlName="cert"></textarea>
+        <span>Specify Certificate key:</span>
+        <textarea matInput formControlName="certKey"></textarea>
+      </mat-tab>
+    </mat-tab-group>
   </div>
 </div>
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts
index 6eba924c06..5c0b9042b5 100644
--- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts
@@ -20,8 +20,18 @@ export class KubernetesCertsAuthFormComponent implements IEndpointAuthComponent
     /** Body content is in the following encoding:
      * base64encoded:base64encoded
      */
-    const certBase64 = btoa(this.formGroup.value.authValues.cert);
-    const certKeyBase64 = btoa(this.formGroup.value.authValues.certKey);
+
+    let certBase64 = this.formGroup.value.authValues.cert;
+    let certKeyBase64 = this.formGroup.value.authValues.certKey;
+
+    // May already be base64 encoded
+    if (certBase64.indexOf('-----BEGIN') === 0) {
+      certBase64 = btoa(this.formGroup.value.authValues.cert);
+    }
+
+    if (certKeyBase64.indexOf('-----BEGIN') === 0) {
+      certKeyBase64 = btoa(this.formGroup.value.authValues.certKey);
+    }
     return `${certBase64}:${certKeyBase64}`;
   }
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.html
new file mode 100644
index 0000000000..e216ce4ad7
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.html
@@ -0,0 +1,72 @@
+<app-sidepanel-preview [title]="title">
+  <app-tile-grid fit="true">
+    <app-loading-page [isLoading]="detailsLoading$" text="Retrieving details">
+      <app-tile-group>
+        <app-tile>
+          <div class="cf-space-usage">
+            <mat-card>
+              <mat-card-header>
+                <mat-card-title>Summary</mat-card-title>
+              </mat-card-header>
+              <mat-card-content>
+                <app-tile-group class="app-metadata">
+                  <app-tile class="app-metadata__two-cols">
+                    <app-metadata-item label="Kubernetes Version">
+                      {{ kubeVersion$ | async }}
+                    </app-metadata-item>
+                  </app-tile>
+                </app-tile-group>
+              </mat-card-content>
+            </mat-card>
+          </div>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile>
+          <app-card-number-metric [link]="podsLink" icon="apps" label="Pods" labelSingular="Pod"
+            value="{{ podCount$ | async }}"></app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric [link]="nodesLink" icon="apps" label="Nodes" labelSingular="Node"
+            value="{{ nodeCount$ | async }}"></app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric [link]="appsLink" icon="apps" label="Applications" labelSingular="Application"
+            value="{{ appCount$ | async }}"></app-card-number-metric>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile>
+          <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Pod Usage"
+            value="{{ (podCapacity$ | async)?.used }}"
+            limit="{{ (podCapacity$ | async)?.total }}"></app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Disk Pressure"
+            value="{{ (diskPressure$ | async)?.used }}"
+            limit="{{ (diskPressure$ | async)?.total}}"></app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Memory Pressure"
+            value="{{ (memoryPressure$ | async)?.used }}"
+            limit="{{ (memoryPressure$ | async)?.total}}"></app-card-number-metric>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile>
+          <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Out of Disk"
+            value="{{ (outOfDisk$ | async)?.used }}"
+            limit="{{ (outOfDisk$ | async)?.total }}"></app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Ready"
+            value="{{ (nodesReady$ | async)?.used }}"
+            limit="{{ (nodesReady$ | async)?.total }}"></app-card-number-metric>
+        </app-tile>
+      </app-tile-group>
+    </app-loading-page>
+  </app-tile-grid>
+</app-sidepanel-preview>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.scss b/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.scss
rename to custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.spec.ts
new file mode 100644
index 0000000000..6f1006656d
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.spec.ts
@@ -0,0 +1,37 @@
+import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
+import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
+import { LoggerService } from '../../../core/logger.service';
+import { KubernetesEndpointPreviewComponent } from './kubernetes-endpoint-preview.component';
+
+describe('KubernetesEndpointPreviewComponent', () => {
+  let component: KubernetesEndpointPreviewComponent;
+  let fixture: ComponentFixture<KubernetesEndpointPreviewComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [KubernetesEndpointPreviewComponent],
+      providers: [LoggerService, HttpClient, HttpHandler],
+      imports: [
+        HttpClientModule,
+        HttpClientTestingModule,
+        CoreTestingModule,
+        createBasicStoreModule()
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubernetesEndpointPreviewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.ts
new file mode 100644
index 0000000000..3f8047cf0c
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.ts
@@ -0,0 +1,74 @@
+import { Component } from '@angular/core';
+import { combineLatest, Observable } from 'rxjs';
+import { map, startWith } from 'rxjs/operators';
+
+import {
+  ISimpleUsageChartData,
+} from '../../../../../core/src/shared/components/simple-usage-chart/simple-usage-chart.types';
+import { PreviewableComponent } from '../../../../../core/src/shared/previewable-component';
+import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
+
+@Component({
+  selector: 'app-kubernetes-endpoint-preview-component',
+  templateUrl: './kubernetes-endpoint-preview.component.html',
+  styleUrls: ['./kubernetes-endpoint-preview.component.scss']
+})
+export class KubernetesEndpointPreviewComponent implements PreviewableComponent {
+
+  title: string = null;
+  detailsLoading$: Observable<boolean>;
+  kubeVersion$: Observable<string>;
+  podCount$: Observable<number>;
+  nodeCount$: Observable<number>;
+  appCount$: Observable<number>;
+  podCapacity$: Observable<ISimpleUsageChartData>;
+  diskPressure$: Observable<ISimpleUsageChartData>;
+  memoryPressure$: Observable<ISimpleUsageChartData>;
+  outOfDisk$: Observable<ISimpleUsageChartData>;
+  nodesReady$: Observable<ISimpleUsageChartData>;
+  podsLink: string;
+  nodesLink: string;
+  appsLink: string;
+
+  constructor(
+    public kubeEndpointService: KubernetesEndpointService,
+  ) { }
+
+  setProps(props: { [key: string]: any }) {
+    const kubeGuid = props.cfGuid;
+
+    this.title = props.title;
+
+    this.kubeEndpointService.initialize(kubeGuid);
+    const nodes$ = this.kubeEndpointService.nodes$;
+
+    this.kubeVersion$ = this.kubeEndpointService.getNodeKubeVersions();
+    this.podCount$ = this.kubeEndpointService.getCountObservable(this.kubeEndpointService.pods$);
+    this.nodeCount$ = this.kubeEndpointService.getCountObservable(nodes$);
+    this.appCount$ = this.kubeEndpointService.getCountObservable(this.kubeEndpointService.apps$);
+    this.podCapacity$ = this.kubeEndpointService.getPodCapacity();
+    this.diskPressure$ = this.kubeEndpointService.getNodeStatusCount(this.kubeEndpointService.nodes$, 'DiskPressure');
+    this.memoryPressure$ = this.kubeEndpointService.getNodeStatusCount(this.kubeEndpointService.nodes$, 'MemoryPressure');
+    this.outOfDisk$ = this.kubeEndpointService.getNodeStatusCount(nodes$, 'OutOfDisk');
+    this.nodesReady$ = this.kubeEndpointService.getNodeStatusCount(nodes$, 'Ready');
+
+    this.podsLink = `/kubernetes/${kubeGuid}/pods`;
+    this.nodesLink = `/kubernetes/${kubeGuid}/nodes`;
+    this.appsLink = `/kubernetes/${kubeGuid}/apps`;
+
+    this.detailsLoading$ = combineLatest([
+      this.podCount$,
+      this.nodeCount$,
+      this.appCount$,
+      this.podCapacity$,
+      this.diskPressure$,
+      this.memoryPressure$,
+      this.outOfDisk$,
+      this.nodesReady$,
+      // this.networkUnavailable$,
+    ]).pipe(
+      map(() => false),
+      startWith(true),
+    );
+  }
+}
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 c6e79f120b..0b9ea19dbe 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
@@ -17,6 +17,7 @@ import {
   KubernetesConfigAuthFormComponent,
 } from './auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component';
 import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component';
+import { KubernetesEndpointPreviewComponent } from './kubernetes-endpoint-preview/kubernetes-endpoint-preview.component';
 import {
   KUBERNETES_ENDPOINT_TYPE,
   kubernetesAppsEntityType,
@@ -154,6 +155,7 @@ function generateEndpointEntity(endpointDefinition: StratosEndpointExtensionDefi
   return new StratosCatalogueEndpointEntity(
     endpointDefinition,
     metadata => `/kubernetes/${metadata.guid}`,
+    () => KubernetesEndpointPreviewComponent,
   );
 }
 
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
index e9f7dbfad8..769375f010 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
@@ -93,8 +93,8 @@ import { KubernetesNamespacesTabComponent } from './tabs/kubernetes-namespaces-t
 import { KubernetesNodesTabComponent } from './tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component';
 import { KubernetesPodsTabComponent } from './tabs/kubernetes-pods-tab/kubernetes-pods-tab.component';
 import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kubernetes-summary.component';
-
-
+import { KubernetesPodStatusComponent } from './list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component';
+import { KubernetesPodReadinessComponent } from './list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component';
 
 /* tslint:enable */
 
@@ -151,7 +151,9 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     KubeNamespacePodCountComponent,
     PodNameLinkComponent,
     NodePodCountComponent,
-    KubernetesServicePortsComponent
+    KubernetesServicePortsComponent,
+    KubernetesPodStatusComponent,
+    KubernetesPodReadinessComponent
   ],
   exports: [
     KubernetesServicePortsComponent
@@ -178,7 +180,9 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     KubeNamespacePodCountComponent,
     PodNameLinkComponent,
     NodePodCountComponent,
-    KubernetesServicePortsComponent
+    KubernetesServicePortsComponent,
+    KubernetesPodStatusComponent,
+    KubernetesPodReadinessComponent
   ]
 })
 export class KubernetesModule { }
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
index 5ade43114c..78170c7b79 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
@@ -16,9 +16,12 @@ import {
   KubernetesConfigAuthFormComponent,
 } from './auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component';
 import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component';
+import { KubernetesEndpointPreviewComponent } from './kubernetes-endpoint-preview/kubernetes-endpoint-preview.component';
 import { KUBERNETES_ENDPOINT_TYPE } from './kubernetes-entity-factory';
 import { generateKubernetesEntities } from './kubernetes-entity-generator';
+import { BaseKubeGuid } from './kubernetes-page.types';
 import { KubernetesStoreModule } from './kubernetes.store.module';
+import { KubernetesEndpointService } from './services/kubernetes-endpoint.service';
 import { KubeHealthCheck } from './store/kubernetes.actions';
 
 
@@ -28,19 +31,25 @@ import { KubeHealthCheck } from './store/kubernetes.actions';
     CoreModule,
     CommonModule,
     SharedModule,
-    KubernetesStoreModule,
+    KubernetesStoreModule
   ],
   declarations: [
     KubernetesCertsAuthFormComponent,
     KubernetesAWSAuthFormComponent,
     KubernetesConfigAuthFormComponent,
     KubernetesGKEAuthFormComponent,
+    KubernetesEndpointPreviewComponent,
+  ],
+  providers: [
+    BaseKubeGuid,
+    KubernetesEndpointService,
   ],
   entryComponents: [
     KubernetesCertsAuthFormComponent,
     KubernetesAWSAuthFormComponent,
     KubernetesConfigAuthFormComponent,
     KubernetesGKEAuthFormComponent,
+    KubernetesEndpointPreviewComponent,
   ]
 })
 export class KubernetesSetupModule {
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.html
new file mode 100644
index 0000000000..4045175bb1
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.html
@@ -0,0 +1 @@
+<div>{{ready}} / {{total}}</div>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.spec.ts
new file mode 100644
index 0000000000..5b79e614fd
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { KubernetesPodReadinessComponent } from './kubernetes-pod-readiness.component';
+
+describe('KubernetesPodReadinessComponent', () => {
+  let component: KubernetesPodReadinessComponent;
+  let fixture: ComponentFixture<KubernetesPodReadinessComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ KubernetesPodReadinessComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubernetesPodReadinessComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.ts
new file mode 100644
index 0000000000..e2da0782d2
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.ts
@@ -0,0 +1,21 @@
+import { Component, OnInit } from '@angular/core';
+import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { KubernetesPod, ContainerStatus } from '../../../store/kube.types';
+
+@Component({
+  selector: 'app-kubernetes-pod-readiness',
+  templateUrl: './kubernetes-pod-readiness.component.html',
+  styleUrls: ['./kubernetes-pod-readiness.component.scss']
+})
+export class KubernetesPodReadinessComponent extends TableCellCustom<KubernetesPod> implements OnInit {
+
+  public total = 0;
+  public ready = 0;
+
+  ngOnInit() {
+    const containers = this.row.status.containerStatuses || [];
+    this.total = containers.length;
+    this.ready = containers.reduce((r: number, cstatus: ContainerStatus) => cstatus.ready ? r + 1 : r, 0);
+  }
+
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html
new file mode 100644
index 0000000000..2afc9145e7
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html
@@ -0,0 +1 @@
+<div class="pod-status {{ style }}">{{ row.status.phase }}</div>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.scss
new file mode 100644
index 0000000000..c385ef5762
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.scss
@@ -0,0 +1,7 @@
+.pod-status {
+  display: inline;
+  border-radius: 3px;  
+  border-style: solid;
+  border-width: 1px;
+  padding: 2px 4px;
+}
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts
new file mode 100644
index 0000000000..cae15b9ce2
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { KubernetesPodStatusComponent } from './kubernetes-pod-status.component';
+
+describe('KubernetesPodStatusComponent', () => {
+  let component: KubernetesPodStatusComponent;
+  let fixture: ComponentFixture<KubernetesPodStatusComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ KubernetesPodStatusComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubernetesPodStatusComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
new file mode 100644
index 0000000000..18489515dd
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
@@ -0,0 +1,30 @@
+import { Component, OnInit } from '@angular/core';
+import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { KubernetesPod, KubernetesStatus } from '../../../store/kube.types';
+
+@Component({
+  selector: 'app-kubernetes-pod-status',
+  templateUrl: './kubernetes-pod-status.component.html',
+  styleUrls: ['./kubernetes-pod-status.component.scss']
+})
+export class KubernetesPodStatusComponent extends TableCellCustom<KubernetesPod> implements OnInit {
+
+  public style = 'border-success';
+
+  ngOnInit() {
+    let status: string;
+    switch (this.row.status.phase) {
+      case 'Running':
+        status = 'success';
+        break;
+      case KubernetesStatus.PENDING:
+        status = 'warning';
+        break;
+      default:
+        status = 'tentative';
+        break;
+    }
+
+    this.style = `border-${status} text-${status}`;
+  }
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
index 9816a4bbea..99c8fe47ba 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
+import { combineLatest, Observable } from 'rxjs';
 import { filter, first, map, shareReplay, startWith, switchMap } from 'rxjs/operators';
 
 import { GetAllEndpoints } from '../../../../../store/src/actions/endpoint.actions';
@@ -12,16 +12,27 @@ import { EntityService } from '../../../core/entity-service';
 import { EntityServiceFactory } from '../../../core/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory';
 import {
+  kubernetesAppsEntityType,
   kubernetesDeploymentsEntityType,
+  kubernetesNodesEntityType,
   kubernetesPodsEntityType,
   kubernetesServicesEntityType,
   kubernetesStatefulSetsEntityType,
 } from '../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../kubernetes-page.types';
-import { KubernetesDeployment, KubernetesPod, KubernetesStatefulSet, KubeService } from '../store/kube.types';
+import {
+  KubernetesApp,
+  KubernetesDeployment,
+  KubernetesNode,
+  KubernetesPod,
+  KubernetesStatefulSet,
+  KubeService,
+} from '../store/kube.types';
 import {
   GeKubernetesDeployments,
+  GetKubernetesApps,
   GetKubernetesDashboard,
+  GetKubernetesNodes,
   GetKubernetesPods,
   GetKubernetesServices,
   GetKubernetesStatefulSets,
@@ -42,6 +53,8 @@ export class KubernetesEndpointService {
   statefulSets$: Observable<KubernetesStatefulSet[]>;
   services$: Observable<KubeService[]>;
   pods$: Observable<KubernetesPod[]>;
+  apps$: Observable<KubernetesApp[]>;
+  nodes$: Observable<KubernetesNode[]>;
   kubeDashboardEnabled$: Observable<boolean>;
 
   constructor(
@@ -50,7 +63,16 @@ export class KubernetesEndpointService {
     private entityServiceFactory: EntityServiceFactory,
     private paginationMonitorFactory: PaginationMonitorFactory
   ) {
-    this.kubeGuid = baseKube.guid;
+    const kubeGuid = baseKube.guid;
+
+    if (kubeGuid) {
+      this.initialize(kubeGuid);
+    }
+  }
+
+  initialize(kubeGuid) {
+    this.kubeGuid = kubeGuid;
+
     this.kubeEndpointEntityService = this.entityServiceFactory.create(
       this.kubeGuid,
       new GetAllEndpoints()
@@ -59,7 +81,77 @@ export class KubernetesEndpointService {
     this.constructCoreObservables();
   }
 
-  constructCoreObservables() {
+  getNodeKubeVersions(nodes$: Observable<KubernetesNode[]> = this.nodes$) {
+    return nodes$.pipe(
+      map(nodes => {
+        const versions = {};
+        nodes.forEach(node => {
+          const v = node.status.nodeInfo.kubeletVersion;
+          if (!versions[v]) {
+            versions[v] = v;
+          }
+        });
+        return Object.keys(versions).join(',');
+      })
+    );
+  }
+
+  getCountObservable(entities$: Observable<any[]>) {
+    return entities$.pipe(
+      map(entities => entities.length),
+      startWith(null)
+    );
+  }
+
+  getPodCapacity(nodes$: Observable<KubernetesNode[]> = this.nodes$, pods$: Observable<KubernetesPod[]> = this.pods$) {
+    return combineLatest(nodes$, pods$).pipe(
+      map(([nodes, pods]) => ({
+        total: nodes.reduce((cap, node) => {
+          return cap + parseInt(node.status.capacity.pods, 10);
+        }, 0),
+        used: pods.length
+      }))
+    );
+  }
+
+  getNodeStatusCount(
+    nodes$: Observable<KubernetesNode[]>,
+    conditionType: string,
+    valueLabels: object = {},
+    countStatus = 'True'
+  ) {
+    return nodes$.pipe(
+      map(nodes => {
+        const total = nodes.length;
+        const { unknown, unavailable, used } = nodes.reduce((cap, node) => {
+          const conditionStatus = node.status.conditions.find(con => con.type === conditionType);
+          if (!conditionStatus || !conditionStatus.status) {
+            ++cap.unavailable;
+          } else {
+            if (conditionStatus.status === countStatus) {
+              ++cap.used;
+            } else if (conditionStatus.status === 'Unknown') {
+              ++cap.unknown;
+            }
+          }
+          return cap;
+        }, { unavailable: 0, used: 0, unknown: 0 });
+        const result = {
+          total,
+          supported: total !== unavailable,
+          // Depends on K8S version as to what is supported
+          unavailable,
+          used,
+          unknown,
+          ...valueLabels
+        };
+        result.supported = result.total !== result.unavailable;
+        return result;
+      })
+    );
+  }
+
+  private constructCoreObservables() {
     this.endpoint$ = this.kubeEndpointEntityService.waitForEntity$;
 
     this.connected$ = this.endpoint$.pipe(
@@ -78,6 +170,16 @@ export class KubernetesEndpointService {
       kubernetesPodsEntityType
     );
 
+    this.nodes$ = this.getObservable<KubernetesNode>(
+      new GetKubernetesNodes(this.kubeGuid),
+      kubernetesNodesEntityType
+    );
+
+    this.apps$ = this.getObservable<KubernetesApp>(
+      new GetKubernetesApps(this.kubeGuid),
+      kubernetesAppsEntityType
+    );
+
     this.statefulSets$ = this.getObservable<KubernetesStatefulSet>(
       new GetKubernetesStatefulSets(this.kubeGuid),
       kubernetesStatefulSetsEntityType
diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
index 5592eb92a0..4f47b191fa 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
@@ -204,6 +204,7 @@ export enum KubernetesStatus {
   ACTIVE = 'Active',
   RUNNING = 'Running',
   FAILED = 'Failed',
+  PENDING = 'Pending'
 }
 export interface KubernetesNamespace extends BasicKubeAPIResource {
   metadata: Metadata;
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 5b56862e8b..754b504b63 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
@@ -17,8 +17,6 @@ import {
 import { PaginationMonitorFactory } from '../../../../shared/monitors/pagination-monitor.factory';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
 import { GetKubernetesNodes, GetKubernetesPods } from '../../store/kubernetes.actions';
-import { KubernetesNode } from './../../../../../../../../../custom-src/frontend/app/custom/kubernetes/store/kube.types';
-import { KubernetesPod } from './../../store/kube.types';
 import { GetKubernetesApps } from './../../store/kubernetes.actions';
 
 interface IValueLabels {
@@ -95,7 +93,6 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
 
   public isLoading$: Observable<boolean>;
 
-
   constructor(
     public kubeEndpointService: KubernetesEndpointService,
     public httpClient: HttpClient,
@@ -105,99 +102,6 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
   ) {
   }
 
-  private getPaginationObservable(action: PaginatedAction) {
-    const paginationMonitor = this.paginationMonitorFactory.create(
-      action.paginationKey,
-      action
-    );
-
-    this.ngZone.runOutsideAngular(() => {
-      this.polls.push(
-        interval(10000).subscribe(() => {
-          this.ngZone.run(() => {
-            this.store.dispatch(action);
-          });
-        })
-      );
-    });
-
-    return getPaginationObservables({
-      store: this.store,
-      action,
-      paginationMonitor
-    }).entities$;
-  }
-
-  private getCountObservable(entities$: Observable<any[]>) {
-    return entities$.pipe(
-      map(entities => entities.length),
-      startWith(null)
-    );
-  }
-  private getPodCapacity(nodes$: Observable<KubernetesNode[]>, pods$: Observable<KubernetesPod[]>) {
-    return combineLatest(nodes$, pods$).pipe(
-      map(([nodes, pods]) => ({
-        total: nodes.reduce((cap, node) => {
-          return cap + parseInt(node.status.capacity.pods, 10);
-        }, 0),
-        used: pods.length
-      }))
-    );
-  }
-
-  private getNodeStatusCount(
-    nodes$: Observable<KubernetesNode[]>,
-    conditionType: string,
-    valueLabels: IValueLabels = {},
-    countStatus = 'True'
-  ) {
-    return nodes$.pipe(
-      map(nodes => {
-        const total = nodes.length;
-        const { unknown, unavailable, used } = nodes.reduce((cap, node) => {
-          const conditionStatus = node.status.conditions.find(con => con.type === conditionType);
-          if (!conditionStatus || !conditionStatus.status) {
-            ++cap.unavailable;
-          } else {
-            if (conditionStatus.status === countStatus) {
-              ++cap.used;
-            } else if (conditionStatus.status === 'Unknown') {
-              ++cap.unknown;
-            }
-          }
-          return cap;
-        }, { unavailable: 0, used: 0, unknown: 0 });
-        const result = {
-          total,
-          supported: total !== unavailable,
-          // Depends on K8S version as to what is supported
-          unavailable,
-          used,
-          unknown,
-          ...valueLabels
-        };
-        result.supported = result.total !== result.unavailable;
-        return result;
-      })
-    );
-  }
-
-  private getNodeKubeVersions(nodes$: Observable<KubernetesNode[]>) {
-    return nodes$.pipe(
-      map(nodes => {
-        const versions = {};
-        nodes.forEach(node => {
-          const v = node.status.nodeInfo.kubeletVersion;
-          if (!versions[v]) {
-            versions[v] = v;
-          }
-        });
-        return Object.keys(versions).join(',');
-      })
-    );
-  }
-
-
   ngOnInit() {
     const guid = this.kubeEndpointService.baseKube.guid;
 
@@ -208,36 +112,36 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
     const pods$ = this.getPaginationObservable(podCountAction);
     const nodes$ = this.getPaginationObservable(nodeCountAction);
 
-    this.podCount$ = this.getCountObservable(pods$);
-    this.nodeCount$ = this.getCountObservable(nodes$);
-    this.appCount$ = this.getCountObservable(applications$);
+    this.podCount$ = this.kubeEndpointService.getCountObservable(pods$);
+    this.nodeCount$ = this.kubeEndpointService.getCountObservable(nodes$);
+    this.appCount$ = this.kubeEndpointService.getCountObservable(applications$);
 
-    this.podCapacity$ = this.getPodCapacity(nodes$, pods$);
-    this.diskPressure$ = this.getNodeStatusCount(nodes$, 'DiskPressure', {
+    this.podCapacity$ = this.kubeEndpointService.getPodCapacity(nodes$, pods$);
+    this.diskPressure$ = this.kubeEndpointService.getNodeStatusCount(nodes$, 'DiskPressure', {
       usedLabel: 'Nodes with disk pressure',
       remainingLabel: 'Nodes with no disk pressure',
       unknownLabel: 'Nodes with unknown disk pressure',
       warningText: 'Nodes with unknown disk pressure found'
     });
-    this.memoryPressure$ = this.getNodeStatusCount(nodes$, 'MemoryPressure', {
+    this.memoryPressure$ = this.kubeEndpointService.getNodeStatusCount(nodes$, 'MemoryPressure', {
       usedLabel: 'Nodes with memory pressure',
       remainingLabel: 'Nodes with no memory pressure',
       unknownLabel: 'Nodes with unknown memory pressure',
       warningText: 'Nodes with unknown memory pressure found'
     });
-    this.outOfDisk$ = this.getNodeStatusCount(nodes$, 'OutOfDisk', {
+    this.outOfDisk$ = this.kubeEndpointService.getNodeStatusCount(nodes$, 'OutOfDisk', {
       usedLabel: 'Nodes that are out of disk space',
       remainingLabel: 'Nodes that have disk space remaining',
       unknownLabel: 'Nodes with unknown remaining disk space',
       warningText: 'Nodes with unknown remaining disk space found'
     });
-    this.networkUnavailable$ = this.getNodeStatusCount(nodes$, 'NetworkUnavailable', {
+    this.networkUnavailable$ = this.kubeEndpointService.getNodeStatusCount(nodes$, 'NetworkUnavailable', {
       usedLabel: 'Nodes with available networks',
       remainingLabel: 'Nodes with unavailable networks',
       unknownLabel: 'Nodes with unknown networks availability',
       warningText: 'Nodes with unknown networks availability found'
     }, 'False');
-    this.nodesReady$ = this.getNodeStatusCount(nodes$, 'Ready', {
+    this.nodesReady$ = this.kubeEndpointService.getNodeStatusCount(nodes$, 'Ready', {
       usedLabel: 'Nodes are ready',
       remainingLabel: 'Nodes are not ready',
       unknownLabel: 'Nodes with unknown ready status',
@@ -245,7 +149,7 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
     });
     this.dashboardLink = `/kubernetes/${guid}/dashboard`;
 
-    this.kubeNodeVersions$ = this.getNodeKubeVersions(nodes$).pipe(startWith('-'));
+    this.kubeNodeVersions$ = this.kubeEndpointService.getNodeKubeVersions(nodes$).pipe(startWith('-'));
 
     this.isLoading$ = combineLatest([
       this.endpointDetails$,
@@ -264,6 +168,29 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
     );
   }
 
+  private getPaginationObservable(action: PaginatedAction) {
+    const paginationMonitor = this.paginationMonitorFactory.create(
+      action.paginationKey,
+      action
+    );
+
+    this.ngZone.runOutsideAngular(() => {
+      this.polls.push(
+        interval(10000).subscribe(() => {
+          this.ngZone.run(() => {
+            this.store.dispatch(action);
+          });
+        })
+      );
+    });
+
+    return getPaginationObservables({
+      store: this.store,
+      action,
+      paginationMonitor
+    }).entities$;
+  }
+
   ngOnDestroy() {
     safeUnsubscribe(...(this.polls || []));
   }
diff --git a/custom-src/frontend/assets/custom/app_placeholder.svg b/custom-src/frontend/assets/custom/app_placeholder.svg
new file mode 100644
index 0000000000..98cd9de0d5
--- /dev/null
+++ b/custom-src/frontend/assets/custom/app_placeholder.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <title>app_placeholder</title>
+  <path
+  stroke="#808080"
+  fill="none"
+  stroke-width="1"
+  stroke-linecap="butt" 
+  d="M16,3H8A2,2,0,0,0,6.29,4l-4,7a2,2,0,0,0,0,2l4,7A2,2,0,0,0,8,21h8a2,2,0,0,0,1.74-1l4-7a2,2,0,0,0,0-2l-4-7A2,2,0,0,0,16,3Z"/>
+</svg>
\ No newline at end of file
diff --git a/custom-src/frontend/sass/custom/suse.scss b/custom-src/frontend/sass/custom/suse.scss
index 4fdaa4adc8..fb4e465bf4 100644
--- a/custom-src/frontend/sass/custom/suse.scss
+++ b/custom-src/frontend/sass/custom/suse.scss
@@ -18,49 +18,52 @@ $suse-blue: #073155;
 $suse-side-nav: $suse-secondary;
 $suse-side-nav-active: #003358;
 
-.stratos .page-content > .page-header {
-  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-  // Ensure kube icons don't appear above sub header
-  background-color: #f5f5f5;
-}
-
-.stratos img.stratos-title__logo {
-  width: 160px;
-}
+.stratos .default {
 
-.stratos h1.stratos-title__header {
-  display: initial;
-}
+  .page-content > .page-header {
+    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+    // Ensure kube icons don't appear above sub header
+    background-color: #f5f5f5;
+  }
 
-.stratos .page-header .mat-toolbar.mat-primary {
-  background-color: #fff;
-  color: #333;
-}
+  img.stratos-title__logo {
+    width: 160px;
+  }
 
-.stratos app-page-subheader {
-  .page-subheader {
-    background-color: #fff;
-    color: #333;
+  h1.stratos-title__header {
+    display: initial;
   }
 
-  .mat-tab-nav-bar.mat-background-primary {
-    .mat-tab-links {
+  .page-header .mat-toolbar.mat-primary {
       background-color: #fff;
       color: #333;
-    }
+  }
 
-    .mat-tab-link {
+  app-page-subheader {
+    .page-subheader {
+      background-color: #fff;
       color: #333;
     }
 
-    .mat-ink-bar {
-      background-color: $suse-primary-color;
+    .mat-tab-nav-bar.mat-background-primary {
+      .mat-tab-links {
+        background-color: #fff;
+        color: #333;
+      }
+
+      .mat-tab-link {
+        color: #333;
+      }
+
+      .mat-ink-bar {
+        background-color: $suse-primary-color;
+      }
     }
   }
 }
 
 // Use SUSE Blue Side Navigation
-.stratos {
+.stratos .default {
   // This is themeable, we really don't need this.
   .side-nav__inner,
   .side-nav__top,
@@ -86,16 +89,16 @@ $suse-side-nav-active: #003358;
 }
 
 // Remove background image from setup screen (e.g. upgrade screen)
-.stratos app-intro-screen > .intro {
+.stratos  .default app-intro-screen > .intro {
   background-color: $suse-blue;
   background-image: none;
 }
 
-.stratos .page-header__divider {
+.stratos  .default .page-header__divider {
   color: #333;
 }
 
-.stratos .page-header__menu-button-icon {
+.stratos  .default .page-header__menu-button-icon {
   background-color: $suse-primary-color;
   color: $suse-text;
 }
diff --git a/deploy/Dockerfile.all-in-one b/deploy/Dockerfile.all-in-one
index ed3391cea7..ce046c3325 100644
--- a/deploy/Dockerfile.all-in-one
+++ b/deploy/Dockerfile.all-in-one
@@ -1,5 +1,5 @@
 # Docker build for all-in-one Stratos
-FROM splatform/stratos-aio-base:opensuse as builder
+FROM splatform/stratos-aio-base:leap15_1 as builder
 
 # Ensure that we copy the custom-src folder
 COPY --chown=stratos:users . ./
@@ -17,7 +17,7 @@ RUN CERTS_PATH=/home/stratos/dev-certs ./generate_cert.sh \
     && chmod +x jetstream
 
 # use --target=aio to build All-in-one image
-FROM splatform/stratos-bk-base:opensuse
+FROM splatform/stratos-bk-base:leap15_1
 ARG CANARY_BUILD
 COPY --from=builder /home/stratos/deploy/db /src/deploy/db
 COPY --from=builder /home/stratos/dev-certs /srv/dev-certs
diff --git a/deploy/Dockerfile.bk b/deploy/Dockerfile.bk
index 41ec20f1fb..8317187079 100644
--- a/deploy/Dockerfile.bk
+++ b/deploy/Dockerfile.bk
@@ -1,4 +1,4 @@
-FROM splatform/stratos-bk-build-base:opensuse as builder
+FROM splatform/stratos-bk-build-base:leap15_1 as builder
 ARG stratos_version
 RUN mkdir -p /home/stratos
 WORKDIR /home/stratos
@@ -7,12 +7,12 @@ RUN go version
 RUN npm install
 RUN npm run build-backend
 
-FROM splatform/stratos-bk-base:opensuse as common-build
+FROM splatform/stratos-bk-base:leap15_1 as common-build
 COPY --from=builder /home/stratos/src/jetstream/jetstream /srv/
 RUN chmod +x /srv/jetstream
 
 # use --target=db-migrator to build db-migrator image
-FROM splatform/stratos-bk-base:opensuse as db-migrator
+FROM splatform/stratos-bk-base:leap15_1 as db-migrator
 WORKDIR /src
 COPY deploy/db/dbconf.yml db/dbconf.yml
 COPY deploy/db/scripts/development.sh .
@@ -23,7 +23,7 @@ RUN chmod +x development.sh
 CMD bash /src/wait-for-it.sh -t 90 mariadb:3306 && bash /src/development.sh
 
 # use --target=postflight-job to build prod postflight-job
-FROM splatform/stratos-bk-base:opensuse as postflight-job
+FROM splatform/stratos-bk-base:leap15_1 as postflight-job
 RUN zypper -n in mariadb-client
 COPY --from=common-build /srv/jetstream /usr/local/bin/jetstream
 COPY deploy/db/dbconf.yml db/dbconf.yml
@@ -31,7 +31,7 @@ COPY deploy/db/scripts/run-postflight-job.k8s.sh /run-postflight-job.sh
 CMD ["/run-postflight-job.sh"]
 
 # use --target=prod-build to build a backend image for Kubernetes
-FROM splatform/stratos-bk-base:opensuse as prod-build
+FROM splatform/stratos-bk-base:leap15_1 as prod-build
 RUN zypper in -y curl
 COPY deploy/containers/proxy/entrypoint.sh /entrypoint.sh
 COPY /deploy/db/scripts/run-preflight-job.sh /run-preflight-job.sh
diff --git a/deploy/Dockerfile.ui b/deploy/Dockerfile.ui
index 66856bb28c..19ee495543 100644
--- a/deploy/Dockerfile.ui
+++ b/deploy/Dockerfile.ui
@@ -1,4 +1,4 @@
-FROM splatform/stratos-ui-build-base:opensuse as base-build
+FROM splatform/stratos-ui-build-base:leap15_1 as base-build
 ARG project
 ARG branch
 ARG commit
@@ -13,7 +13,7 @@ RUN npm install && \
     mkdir -p /usr/dist && \
     cp -R dist/* /usr/dist
 
-FROM splatform/stratos-nginx-base:opensuse as prod-build
+FROM splatform/stratos-nginx-base:leap15_1 as prod-build
 RUN mkdir -p /usr/share/doc/suse
 COPY  deploy/containers/nginx/LICENSE.txt /usr/share/doc/suse/LICENSE.txt
 COPY  deploy/containers/nginx/conf/nginx.k8s.conf /etc/nginx/nginx.conf
@@ -22,7 +22,7 @@ COPY deploy/containers/nginx/run-nginx.sh/ /run-nginx.sh
 EXPOSE 80 443
 CMD [ "/run-nginx.sh" ]
 
-FROM splatform/stratos-nginx-base:opensuse as dev-build
+FROM splatform/stratos-nginx-base:leap15_1 as dev-build
 RUN mkdir -p /etc/secrets/ && \
   openssl req -batch -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout /etc/secrets/server.key -out /etc/secrets/server.crt && \
   chmod 0600 /etc/secrets && \
diff --git a/deploy/ci/scripts/Dockerfile.bosh b/deploy/ci/scripts/Dockerfile.bosh
index f56472dac1..ec9a8fe87b 100644
--- a/deploy/ci/scripts/Dockerfile.bosh
+++ b/deploy/ci/scripts/Dockerfile.bosh
@@ -2,7 +2,7 @@ FROM bosh/cli2
 
 RUN apt-get update
 RUN apt-get install -y git curl wget
-RUN curl https://storage.googleapis.com/golang/go1.12.4.linux-amd64.tar.gz -o /go1.9.7.tar.gz
+RUN curl https://storage.googleapis.com/golang/go1.13.4.linux-amd64.tar.gz -o /go1.9.7.tar.gz
 RUN curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash - && \
     sudo apt-get install -y nodejs git
 RUN tar -C /usr/local -xzf /go1.9.7.tar.gz
diff --git a/deploy/ci/scripts/Dockerfile.stratos-ci b/deploy/ci/scripts/Dockerfile.stratos-ci
index a9c9dcbc1d..b2e9ec19b7 100644
--- a/deploy/ci/scripts/Dockerfile.stratos-ci
+++ b/deploy/ci/scripts/Dockerfile.stratos-ci
@@ -6,7 +6,7 @@
 # Default Image used to run tasks - contains Helm
 
 # Builder for the github release tool
-FROM splatform/stratos-go-build-base:opensuse as go-base
+FROM splatform/stratos-go-build-base:leap15_1 as go-base
 RUN export GOPATH=/home/stratos/go && \
     mkdir -p ${GOPATH} && \
     go get github.com/aktau/github-release
diff --git a/deploy/ci/tasks/dev-releases/github-helper.sh b/deploy/ci/tasks/dev-releases/github-helper.sh
index 632d4353b0..a4b0765286 100644
--- a/deploy/ci/tasks/dev-releases/github-helper.sh
+++ b/deploy/ci/tasks/dev-releases/github-helper.sh
@@ -39,7 +39,7 @@ downloadReleaseFile() {
   local parser=". | map(select(.tag_name == \"$VERSION\"))[0].assets | map(select(.name == \"$FILE\"))[0].id"
   
   # Get release information from GitHub
-  curl -H "Authorization: token $TOKEN" -H "Accept: application/vnd.github.v3.raw" -s $GITHUB/repos/$REPO/releases > releases.json
+  curl -L -H "Authorization: token $TOKEN" -H "Accept: application/vnd.github.v3.raw" -s $GITHUB/repos/$REPO/releases > releases.json
   if [ $? -ne 0 ]; then
     echo "Could not download release information for ${REPO}"
     exit 1
diff --git a/deploy/ci/travis/depcache.sh b/deploy/ci/travis/depcache.sh
index 568129299e..8466846f0c 100755
--- a/deploy/ci/travis/depcache.sh
+++ b/deploy/ci/travis/depcache.sh
@@ -10,7 +10,7 @@ apt-get install -y curl
 apt-get install -y git
 curl -sL -o ./gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
 chmod +x ./gimme
-eval "$(./gimme 1.12.4)"
+eval "$(./gimme 1.13.4)"
 mkdir -p /root/go/bin
 export PATH=/root/go/bin:$PATH
 cd /stratos/src/jetstream
diff --git a/deploy/common-build.sh b/deploy/common-build.sh
index ee5c771c20..2e8906adf4 100644
--- a/deploy/common-build.sh
+++ b/deploy/common-build.sh
@@ -43,7 +43,7 @@ function buildAndPublishImage {
 
 # Proxy support
 # Remove intermediate containers after a successful build
-BUILD_ARGS="--rm=true"
+BUILD_ARGS="--rm=true --squash"
 RUN_ARGS=""
 if [ -n "${http_proxy:-}" -o -n "${HTTP_PROXY:-}" ]; then
   BUILD_ARGS="${BUILD_ARGS} --build-arg http_proxy=${http_proxy:-${HTTP_PROXY}}"
diff --git a/deploy/containers/nginx/Dockerfile.dc b/deploy/containers/nginx/Dockerfile.dc
index 7af4708169..049c6c9a5a 100644
--- a/deploy/containers/nginx/Dockerfile.dc
+++ b/deploy/containers/nginx/Dockerfile.dc
@@ -1,4 +1,4 @@
-FROM splatform/stratos-nginx-base:opensuse
+FROM splatform/stratos-nginx-base:leap15_1
 
 RUN mkdir -p /etc/secrets/ && \
   openssl req -batch -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout /etc/secrets/server.key -out /etc/secrets/server.crt && \
diff --git a/deploy/db/Dockerfile.mariadb b/deploy/db/Dockerfile.mariadb
index 9bcb558457..885f8d3cc3 100644
--- a/deploy/db/Dockerfile.mariadb
+++ b/deploy/db/Dockerfile.mariadb
@@ -1,6 +1,13 @@
-FROM splatform/stratos-db-base:opensuse
+FROM splatform/stratos-db-base:leap15_1
+
+# See: https://github.com/docker-library/mariadb/blob/master/10.2/Dockerfile
+RUN \
+	find /etc/ -name 'my*.cnf' -print0 \
+		| xargs -0 grep -lZE '^(bind-address|log)' \
+		| xargs -rt -0 sed -Ei 's/^(bind-address|log)/#&/'; 
 
 COPY mariadb-entrypoint.sh /docker-entrypoint.sh
+COPY mariadb-ping.sh /dbping.sh
 
 # ENTRYPOINT
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/deploy/db/mariadb-entrypoint.sh b/deploy/db/mariadb-entrypoint.sh
index 45e0471437..48e04e3142 100755
--- a/deploy/db/mariadb-entrypoint.sh
+++ b/deploy/db/mariadb-entrypoint.sh
@@ -1,49 +1,214 @@
 #!/bin/bash
-set -e
-
-MYSQL_DATADIR="/var/lib/mysql"
-
-if [ ! -d "$MYSQL_DATADIR/mysql" ]; then
-  # if [ -z "$MYSQL_ROOT_PASSWORD" -a -z "$MYSQL_ALLOW_EMPTY_PASSWORD" ]; then
-  #   echo >&2 'error: database is uninitialized and MYSQL_ROOT_PASSWORD not set'
-  #   echo >&2 '  Did you forget to add -e MYSQL_ROOT_PASSWORD=... ?'
-  #   exit 1
-  # fi
-
-  echo 'Running mysql_install_db ...'
-  mysql_install_db --user=mysql --datadir="$MYSQL_DATADIR"
-  echo 'Finished mysql_install_db'
-
-  # These statements _must_ be on individual lines, and _must_ end with
-  # semicolons (no line breaks or comments are permitted).
-  # TODO proper SQL escaping on ALL the things D:
-
- tempSqlFile='/tmp/mysql-first-time.sql'
-  cat > "$tempSqlFile" <<-EOSQL
-DELETE FROM mysql.user ;
-CREATE USER 'root'@'%' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}' ;
-GRANT ALL ON *.* TO 'root'@'%' WITH GRANT OPTION ;
-DROP DATABASE IF EXISTS test ;
-EOSQL
-
-  if [ "$MYSQL_DATABASE" ]; then
-    echo "CREATE DATABASE IF NOT EXISTS \`$MYSQL_DATABASE\` ;" >> "$tempSqlFile"
-  fi
-
-  if [ "$MYSQL_USER" -a "$MYSQL_PASSWORD" ]; then
-    echo "CREATE USER '$MYSQL_USER'@'%' IDENTIFIED BY '$MYSQL_PASSWORD' ;" >> "$tempSqlFile"
-
-    if [ "$MYSQL_DATABASE" ]; then
-      echo "GRANT ALL ON \`$MYSQL_DATABASE\`.* TO '$MYSQL_USER'@'%' ;" >> "$tempSqlFile"
-    fi
-  fi
-
-  echo 'FLUSH PRIVILEGES ;' >> "$tempSqlFile"
-  set -- "$@" --init-file="$tempSqlFile"
+
+###########################################################################################################
+#
+# This is the entrypoint script taken from here: https://github.com/docker-library/mariadb/tree/master/10.2
+#
+# There is one change - which is clearly marked below
+#
+###########################################################################################################
+
+set -eo pipefail
+shopt -s nullglob
+
+# if command starts with an option, prepend mysqld
+if [ "${1:0:1}" = '-' ]; then
+	set -- mysqld "$@"
 fi
 
-chown -R mysql:mysql "$MYSQL_DATADIR"
-mkdir /var/run/mysql
-chown -R mysql:mysql /var/run/mysql
+# skip setup if they want an option that stops mysqld
+wantHelp=
+for arg; do
+	case "$arg" in
+		-'?'|--help|--print-defaults|-V|--version)
+			wantHelp=1
+			break
+			;;
+	esac
+done
+
+# usage: file_env VAR [DEFAULT]
+#    ie: file_env 'XYZ_DB_PASSWORD' 'example'
+# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of
+#  "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature)
+file_env() {
+	local var="$1"
+	local fileVar="${var}_FILE"
+	local def="${2:-}"
+	if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
+		echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
+		exit 1
+	fi
+	local val="$def"
+	if [ "${!var:-}" ]; then
+		val="${!var}"
+	elif [ "${!fileVar:-}" ]; then
+		val="$(< "${!fileVar}")"
+	fi
+	export "$var"="$val"
+	unset "$fileVar"
+}
+
+_check_config() {
+	toRun=( "$@" --verbose --help --log-bin-index="$(mktemp -u)" )
+	if ! errors="$("${toRun[@]}" 2>&1 >/dev/null)"; then
+		cat >&2 <<-EOM
+
+			ERROR: mysqld failed while attempting to check config
+			command was: "${toRun[*]}"
+
+			$errors
+		EOM
+		exit 1
+	fi
+}
+
+# Fetch value from server config
+# We use mysqld --verbose --help instead of my_print_defaults because the
+# latter only show values present in config files, and not server defaults
+_get_config() {
+	local conf="$1"; shift
+	"$@" --verbose --help --log-bin-index="$(mktemp -u)" 2>/dev/null \
+		| awk '$1 == "'"$conf"'" && /^[^ \t]/ { sub(/^[^ \t]+[ \t]+/, ""); print; exit }'
+	# match "datadir      /some/path with/spaces in/it here" but not "--xyz=abc\n     datadir (xyz)"
+}
+
+# allow the container to be started with `--user`
+if [ "$1" = 'mysqld' -a -z "$wantHelp" -a "$(id -u)" = '0' ]; then
+	_check_config "$@"
+	DATADIR="$(_get_config 'datadir' "$@")"
+	mkdir -p "$DATADIR"
+	find "$DATADIR" \! -user mysql -exec chown mysql '{}' +
+	exec gosu mysql "$BASH_SOURCE" "$@"
+fi
+
+if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
+	# still need to check config, container may have started with --user
+	_check_config "$@"
+	# Get config
+	DATADIR="$(_get_config 'datadir' "$@")"
+
+	echo "Data dir is: ${DATADIR}"
+	
+	if [ ! -d "$DATADIR/mysql" ]; then
+		file_env 'MYSQL_ROOT_PASSWORD'
+		if [ -z "$MYSQL_ROOT_PASSWORD" -a -z "$MYSQL_ALLOW_EMPTY_PASSWORD" -a -z "$MYSQL_RANDOM_ROOT_PASSWORD" ]; then
+			echo >&2 'error: database is uninitialized and password option is not specified '
+			echo >&2 '  You need to specify one of MYSQL_ROOT_PASSWORD, MYSQL_ALLOW_EMPTY_PASSWORD and MYSQL_RANDOM_ROOT_PASSWORD'
+			exit 1
+		fi
+
+		mkdir -p "$DATADIR"
+		# ========================================
+		# Stratos changes
+		chown -R mysql:mysql "$DATADIR"
+		# ========================================
+
+		echo 'Initializing database'
+		installArgs=( --datadir="$DATADIR" --rpm )
+		if { mysql_install_db --help || :; } | grep -q -- '--auth-root-authentication-method'; then
+			# beginning in 10.4.3, install_db uses "socket" which only allows system user root to connect, switch back to "normal" to allow mysql root without a password
+			# see https://github.com/MariaDB/server/commit/b9f3f06857ac6f9105dc65caae19782f09b47fb3
+			# (this flag doesn't exist in 10.0 and below)
+			installArgs+=( --auth-root-authentication-method=normal )
+		fi
+		# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
+		mysql_install_db "${installArgs[@]}" "${@:2}"
+		echo 'Database initialized'
+
+		SOCKET="$(_get_config 'socket' "$@")"
+		"$@" --skip-networking --socket="${SOCKET}" &
+		pid="$!"
+
+		mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
+
+		for i in {30..0}; do
+			if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
+				break
+			fi
+			echo 'MySQL init process in progress...'
+			sleep 1
+		done
+		if [ "$i" = 0 ]; then
+			echo >&2 'MySQL init process failed.'
+			exit 1
+		fi
+
+		if [ -z "$MYSQL_INITDB_SKIP_TZINFO" ]; then
+			# sed is for https://bugs.mysql.com/bug.php?id=20545
+			mysql_tzinfo_to_sql /usr/share/zoneinfo | sed 's/Local time zone must be set--see zic manual page/FCTY/' | "${mysql[@]}" mysql
+		fi
+
+		if [ ! -z "$MYSQL_RANDOM_ROOT_PASSWORD" ]; then
+			export MYSQL_ROOT_PASSWORD="$(pwgen -1 32)"
+			echo "GENERATED ROOT PASSWORD: $MYSQL_ROOT_PASSWORD"
+		fi
+
+		rootCreate=
+		# default root to listen for connections from anywhere
+		file_env 'MYSQL_ROOT_HOST' '%'
+		if [ ! -z "$MYSQL_ROOT_HOST" -a "$MYSQL_ROOT_HOST" != 'localhost' ]; then
+			# no, we don't care if read finds a terminating character in this heredoc
+			# https://unix.stackexchange.com/questions/265149/why-is-set-o-errexit-breaking-this-read-heredoc-expression/265151#265151
+			read -r -d '' rootCreate <<-EOSQL || true
+				CREATE USER 'root'@'${MYSQL_ROOT_HOST}' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}' ;
+				GRANT ALL ON *.* TO 'root'@'${MYSQL_ROOT_HOST}' WITH GRANT OPTION ;
+			EOSQL
+		fi
+
+		"${mysql[@]}" <<-EOSQL
+			-- What's done in this file shouldn't be replicated
+			--  or products like mysql-fabric won't work
+			SET @@SESSION.SQL_LOG_BIN=0;
+
+			DELETE FROM mysql.user WHERE user NOT IN ('mysql.sys', 'mysqlxsys', 'root') OR host NOT IN ('localhost') ;
+			SET PASSWORD FOR 'root'@'localhost'=PASSWORD('${MYSQL_ROOT_PASSWORD}') ;
+			GRANT ALL ON *.* TO 'root'@'localhost' WITH GRANT OPTION ;
+			${rootCreate}
+			DROP DATABASE IF EXISTS test ;
+			FLUSH PRIVILEGES ;
+		EOSQL
+
+		if [ ! -z "$MYSQL_ROOT_PASSWORD" ]; then
+			mysql+=( -p"${MYSQL_ROOT_PASSWORD}" )
+		fi
+
+		file_env 'MYSQL_DATABASE'
+		if [ "$MYSQL_DATABASE" ]; then
+			echo "CREATE DATABASE IF NOT EXISTS \`$MYSQL_DATABASE\` ;" | "${mysql[@]}"
+			mysql+=( "$MYSQL_DATABASE" )
+		fi
+
+		file_env 'MYSQL_USER'
+		file_env 'MYSQL_PASSWORD'
+		if [ "$MYSQL_USER" -a "$MYSQL_PASSWORD" ]; then
+			echo "CREATE USER '$MYSQL_USER'@'%' IDENTIFIED BY '$MYSQL_PASSWORD' ;" | "${mysql[@]}"
+
+			if [ "$MYSQL_DATABASE" ]; then
+				echo "GRANT ALL ON \`$MYSQL_DATABASE\`.* TO '$MYSQL_USER'@'%' ;" | "${mysql[@]}"
+			fi
+		fi
+
+		echo
+		for f in /docker-entrypoint-initdb.d/*; do
+			case "$f" in
+				*.sh)     echo "$0: running $f"; . "$f" ;;
+				*.sql)    echo "$0: running $f"; "${mysql[@]}" < "$f"; echo ;;
+				*.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${mysql[@]}"; echo ;;
+				*)        echo "$0: ignoring $f" ;;
+			esac
+			echo
+		done
+
+		if ! kill -s TERM "$pid" || ! wait "$pid"; then
+			echo >&2 'MySQL init process failed.'
+			exit 1
+		fi
+
+		echo
+		echo 'MySQL init process done. Ready for start up.'
+		echo
+	fi
+fi
 
-exec "$@"
+exec "$@"
\ No newline at end of file
diff --git a/deploy/db/mariadb-ping.sh b/deploy/db/mariadb-ping.sh
new file mode 100755
index 0000000000..331f6bb5a0
--- /dev/null
+++ b/deploy/db/mariadb-ping.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+mysqladmin --password="$MYSQL_ROOT_PASSWORD" --user=root ping
\ No newline at end of file
diff --git a/deploy/fissile/Dockerfile.bosh-cli b/deploy/fissile/Dockerfile.bosh-cli
index 0da9b977cf..faec0af67e 100644
--- a/deploy/fissile/Dockerfile.bosh-cli
+++ b/deploy/fissile/Dockerfile.bosh-cli
@@ -1,7 +1,7 @@
 FROM splatform/bosh-cli
 
-RUN curl https://storage.googleapis.com/golang/go1.12.4.linux-amd64.tar.gz -o go1.12.4.linux-amd64.tar.gz
-RUN tar -C /usr/local -xzf go1.12.4.linux-amd64.tar.gz
+RUN curl https://storage.googleapis.com/golang/go1.13.4.linux-amd64.tar.gz -o go1.13.4.linux-amd64.tar.gz
+RUN tar -C /usr/local -xzf go1.13.4.linux-amd64.tar.gz
 RUN curl https://deb.nodesource.com/setup_6.x -o install_node.sh
 RUN chmod +x install_node.sh && \
     ./install_node.sh && \
diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
index 0fcf535154..e7c2c0ad79 100755
--- a/deploy/kubernetes/build.sh
+++ b/deploy/kubernetes/build.sh
@@ -26,8 +26,9 @@ ADD_OFFICIAL_TAG="false"
 TAG_LATEST="false"
 NO_PUSH="true"
 DOCKER_REG_DEFAULTS="true"
+CHART_ONLY="false"
 
-while getopts ":ho:r:t:Tclb:On" opt; do
+while getopts ":ho:r:t:Tclb:Op" opt; do
   case $opt in
     h)
       echo
@@ -64,6 +65,9 @@ while getopts ":ho:r:t:Tclb:On" opt; do
     p)
       NO_PUSH="false"
       ;;      
+    c)
+      CHART_ONLY="true"
+      ;;      
     \?)
       echo "Invalid option: -${OPTARG}" >&2
       exit 1
@@ -175,22 +179,24 @@ cleanup
 
 updateTagForRelease
 
-# Build all of the components that make up the Console
+if [ "${CHART_ONLY}" == "false" ]; then
+  # Build all of the components that make up the Console
 
-log "-- Build & publish the runtime container image for Jetstream (backend)"
-patchAndPushImage stratos-jetstream deploy/Dockerfile.bk "${STRATOS_PATH}" prod-build
+  log "-- Build & publish the runtime container image for Jetstream (backend)"
+  patchAndPushImage stratos-jetstream deploy/Dockerfile.bk "${STRATOS_PATH}" prod-build
 
-# Build the postflight container
-log "-- Build & publish the runtime container image for the postflight job"
-patchAndPushImage stratos-postflight-job deploy/Dockerfile.bk "${STRATOS_PATH}" postflight-job
+  # Build the postflight container
+  log "-- Build & publish the runtime container image for the postflight job"
+  patchAndPushImage stratos-postflight-job deploy/Dockerfile.bk "${STRATOS_PATH}" postflight-job
 
-# Build and push an image based on the mariab db container
-log "-- Building/publishing MariaDB"
-patchAndPushImage stratos-mariadb Dockerfile.mariadb "${STRATOS_PATH}/deploy/db"
+  # Build and push an image based on the mariab db container
+  log "-- Building/publishing MariaDB"
+  patchAndPushImage stratos-mariadb Dockerfile.mariadb "${STRATOS_PATH}/deploy/db"
 
-# Build and push an image based on the nginx container (Front-end)
-log "-- Building/publishing the runtime container image for the Console web server (frontend)"
-patchAndPushImage stratos-console deploy/Dockerfile.ui "${STRATOS_PATH}" prod-build
+  # Build and push an image based on the nginx container (Front-end)
+  log "-- Building/publishing the runtime container image for the Console web server (frontend)"
+  patchAndPushImage stratos-console deploy/Dockerfile.ui "${STRATOS_PATH}" prod-build
+fi
 
 log "-- Building Helm Chart"
 
diff --git a/deploy/kubernetes/console/templates/__helpers.tpl b/deploy/kubernetes/console/templates/__helpers.tpl
index 5511d09bad..c24f888f74 100644
--- a/deploy/kubernetes/console/templates/__helpers.tpl
+++ b/deploy/kubernetes/console/templates/__helpers.tpl
@@ -106,6 +106,24 @@ tls.crt: {{ $cert.Cert | b64enc }}
 tls.key: {{ $cert.Key | b64enc }}
 {{- end -}}
 
+{{/*
+Generate self-signed certificate for ingress if needed
+*/}}
+{{- define "console.generateIngressCertificate" -}}
+{{- $altNames := list (printf "%s" .Values.console.service.ingress.host) (printf "%s.%s" (include "console.certName" .) .Release.Namespace ) ( printf "%s.%s.svc" (include "console.certName" .) .Release.Namespace ) -}}
+{{- $ca := genCA "stratos-ca" 365 -}}
+{{- $cert := genSignedCert ( include "console.certName" . ) nil $altNames 365 $ca -}}
+{{- if .Values.console.service.ingress.tls.crt }}
+  tls.crt: {{ .Values.console.service.ingress.tls.crt | b64enc | quote }}
+{{- else }}
+  tls.crt: {{ $cert.Cert | b64enc | quote }}
+{{- end -}}
+{{- if .Values.console.service.ingress.tls.key }}
+  tls.key: {{ .Values.console.service.ingress.tls.key | b64enc | quote }}
+{{- else }}
+  tls.key: {{ $cert.Key | b64enc | quote }}
+{{- end -}}
+{{- end -}}
 
 {{/*
 Ingress Host from .Values.console.service
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 1f36fc9548..e419592e6b 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -1,5 +1,9 @@
 ---
+{{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major .Capabilities.KubeVersion.Minor)}}
+apiVersion: apps/v1
+{{- else }}
 apiVersion: apps/v1beta1
+{{- end }}
 kind: StatefulSet
 metadata:
   name: stratos
@@ -309,7 +313,11 @@ spec:
           name: {{ .Values.console.templatesConfigMapName }}
       {{- end }}
 ---
+{{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major .Capabilities.KubeVersion.Minor)}}
+apiVersion: apps/v1
+{{- else }}
 apiVersion: extensions/v1beta1
+{{- end }}
 kind: Deployment
 metadata:
   name: stratos-db
@@ -353,7 +361,7 @@ spec:
               key: mariadb-password
         {{- end }}
         {{- else }}
-        - name: ALLOW_EMPTY_PASSWORD
+        - name: MYSQL_ALLOW_EMPTY_PASSWORD
           value: "yes"
         {{- end }}
         - name: MYSQL_USER
@@ -366,15 +374,13 @@ spec:
         livenessProbe:
           exec:
             command:
-            - mysqladmin
-            - ping
-          initialDelaySeconds: 30
+            - /dbping.sh
+          initialDelaySeconds: 10
           timeoutSeconds: 5
         readinessProbe:
           exec:
             command:
-            - mysqladmin
-            - ping
+            - /dbping.sh
           initialDelaySeconds: 5
           timeoutSeconds: 1
         resources:
diff --git a/deploy/kubernetes/console/templates/ingress.yaml b/deploy/kubernetes/console/templates/ingress.yaml
index 2578b52df5..f50266c71b 100644
--- a/deploy/kubernetes/console/templates/ingress.yaml
+++ b/deploy/kubernetes/console/templates/ingress.yaml
@@ -21,13 +21,16 @@ metadata:
     app.kubernetes.io/component: "console-ingress-tls"
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 data:
-  tls.crt: {{ .Values.console.service.ingress.tls.crt | default "" | b64enc | quote }}
-  tls.key: {{ .Values.console.service.ingress.tls.key | default "" | b64enc | quote }}
+{{ template "console.generateIngressCertificate" . }}
 {{- end }}
 
 ---
 # Ingress for the Console UI service
+{{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major .Capabilities.KubeVersion.Minor) }}
+apiVersion: "networking.k8s.io/v1beta1"
+{{- else }}
 apiVersion: "extensions/v1beta1"
+{{- end }}
 kind: "Ingress"
 metadata:
   name: "{{ .Release.Name }}-ingress"
@@ -35,6 +38,9 @@ metadata:
     {{- if hasKey .Values.console.service.ingress.annotations "kubernetes.io/ingress.class" | not -}}
       {{ $_ := set .Values.console.service.ingress.annotations "kubernetes.io/ingress.class" "nginx" }}
     {{- end }}
+    {{- if hasKey .Values.console.service.ingress.annotations "kubernetes.io/ingress.allow-http" | not -}}
+      {{ $_ := set .Values.console.service.ingress.annotations "kubernetes.io/ingress.allow-http" "false" }}
+    {{- end }}
     {{- if hasKey .Values.console.service.ingress.annotations "nginx.ingress.kubernetes.io/secure-backends" | not -}}
       {{ $_ := set .Values.console.service.ingress.annotations "nginx.ingress.kubernetes.io/secure-backends" "true" }}
     {{- end }}
@@ -60,7 +66,7 @@ metadata:
 {{- end }}    
 spec:
   tls:
-  - secretName: {{ default "{{ .Release.Name }}-ingress-tls" .Values.console.service.ingress.secretName | quote }}
+  - secretName: {{ default (print .Release.Name "-ingress-tls") .Values.console.service.ingress.secretName | quote }}
     hosts:
     - {{ template "ingress.host" . }}
   rules:
diff --git a/deploy/kubernetes/console/tests/ingress_test.yaml b/deploy/kubernetes/console/tests/ingress_test.yaml
index d275098c9b..50f214b502 100644
--- a/deploy/kubernetes/console/tests/ingress_test.yaml
+++ b/deploy/kubernetes/console/tests/ingress_test.yaml
@@ -47,10 +47,9 @@ tests:
       - equal:
           path: kind
           value: "Secret"
-      - equal:
+      - isNotEmpty:
           path: data.tls\.crt
-          value: ""
-      - equal:
+      - isNotEmpty:
           path: data.tls\.key
           value: ""
   - it: should create secret with specified values
@@ -147,6 +146,7 @@ tests:
       - equal:
           path: metadata.annotations
           value:
+            kubernetes.io/ingress.allow-http: "false"
             kubernetes.io/ingress.class: "nginx"
             nginx.ingress.kubernetes.io/secure-backends: "true"
             nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
@@ -171,6 +171,7 @@ tests:
       - equal:
           path: metadata.annotations
           value:
+            kubernetes.io/ingress.allow-http: "false"
             kubernetes.io/ingress.class: "nginx"
             nginx.ingress.kubernetes.io/secure-backends: "true"
             nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
@@ -196,6 +197,7 @@ tests:
           path: metadata.annotations
           value:
             test-annotation: "test"
+            kubernetes.io/ingress.allow-http: "false"
             kubernetes.io/ingress.class: "nginx"
             nginx.ingress.kubernetes.io/secure-backends: "true"
             nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
diff --git a/deploy/kubernetes/console/tests/kube_version_test.yaml b/deploy/kubernetes/console/tests/kube_version_test.yaml
new file mode 100644
index 0000000000..c803485484
--- /dev/null
+++ b/deploy/kubernetes/console/tests/kube_version_test.yaml
@@ -0,0 +1,31 @@
+suite: test stratos deployment with kube versions
+templates:
+  - deployment.yaml
+tests:
+  - it: should use newer API versions when kube >= 1.16
+    capabilities:
+      kubeVersion:
+        major: 1
+        minor: 16
+    asserts:
+      - equal:
+          path: apiVersion
+          value: apps/v1
+  - it: should use newer API versions when kube >= 2
+    capabilities:
+      kubeVersion:
+        major: 2
+        minor: 1
+    asserts:
+      - equal:
+          path: apiVersion
+          value: apps/v1
+  - it: should use older API versions when kube < 1.16
+    capabilities:
+      kubeVersion:
+        major: 1
+        minor: 14
+    asserts:
+      - equal:
+          path: apiVersion
+          value: apps/v1beta1
diff --git a/deploy/stratos-base-images/Dockerfile.stratos-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-base.tmpl
index 701a2fbde5..b956a582b7 100644
--- a/deploy/stratos-base-images/Dockerfile.stratos-base.tmpl
+++ b/deploy/stratos-base-images/Dockerfile.stratos-base.tmpl
@@ -1,3 +1,7 @@
 FROM {{BASE_IMAGE}}
 
+{{#IS_SLE}}
+RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp
+{{/IS_SLE}}
+
 WORKDIR /srv
diff --git a/deploy/stratos-base-images/Dockerfile.stratos-bk-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-bk-base.tmpl
index 712ce98087..8416e9ea83 100644
--- a/deploy/stratos-base-images/Dockerfile.stratos-bk-base.tmpl
+++ b/deploy/stratos-base-images/Dockerfile.stratos-bk-base.tmpl
@@ -1,6 +1,7 @@
 FROM {{BASE_IMAGE}}
 
 {{#IS_SLE}}
+RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp
 RUN zypper addrepo  -G -c '{{SMT_INTERNAL}}' smt_internal
 RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_UPDATE}}' smt_internal_update
 RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SDK}}' smt_internal_sdk
@@ -8,22 +9,32 @@ RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SERVER}}' smt_internal_server
 RUN zypper ref
 {{/IS_SLE}}
 RUN zypper in -y ca-certificates && \
+    # Can remove this when we remove the postflight job
+    zypper in -y mariadb-client curl && \
     mkdir -p /srv && \
     mkdir -p /root/.npm-global
 # Install latest git from devel/tools/scm repository
 {{^IS_SLE}}
-RUN zypper ar http://download.opensuse.org/repositories/devel:/tools:/scm/openSUSE_Leap_42.3/devel:tools:scm.repo && \
-    zypper --no-gpg-checks in -y git
+RUN zypper ar http://download.opensuse.org/repositories/devel:/tools:/scm/openSUSE_Leap_15.1/devel:tools:scm.repo && \
+    zypper --no-gpg-checks in -y git && \
+    zypper rr devel_tools_scm && \
+    zypper clean -a && \
+    rm -f /var/log/zypper.log /var/log/zypp/history
+
 {{/IS_SLE}}
 {{#IS_SLE}}
-RUN zypper ar http://download.opensuse.org/repositories/devel:/tools:/scm/SLE_12_SP3/devel:tools:scm.repo && \
-    zypper --no-gpg-checks in -y git
+RUN zypper ar http://download.opensuse.org/repositories/devel:/tools:/scm/SLE_15/devel:tools:scm.repo && \
+    zypper --no-gpg-checks in -y git && \
+    zypper rr devel_tools_scm && \
+    zypper clean -a && \
+    rm -f /var/log/zypper.log /var/log/zypp/history
+
 {{/IS_SLE}}
 
 {{#IS_SLE}}
-RUN zypper rr  smt_internal
-RUN zypper rr  smt_internal_update
-RUN zypper rr  smt_internal_sdk
-RUN zypper rr  smt_internal_server
+RUN zypper rr smt_internal
+RUN zypper rr smt_internal_update
+RUN zypper rr smt_internal_sdk
+RUN zypper rr smt_internal_server
 {{/IS_SLE}}
 WORKDIR /srv
diff --git a/deploy/stratos-base-images/Dockerfile.stratos-bk-build-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-bk-build-base.tmpl
index 169657a541..04137d442f 100644
--- a/deploy/stratos-base-images/Dockerfile.stratos-bk-build-base.tmpl
+++ b/deploy/stratos-base-images/Dockerfile.stratos-bk-build-base.tmpl
@@ -5,9 +5,12 @@ RUN useradd -ms /bin/bash stratos && \
     chown -R stratos /home/stratos && \
     chgrp -R users /home/stratos
 
-RUN cd / && wget https://nodejs.org/dist/v8.11.2/node-v8.11.2-linux-x64.tar.xz && \
-    tar -xf node-v8.11.2-linux-x64.tar.xz
+RUN cd / && wget https://nodejs.org/dist/v12.13.0/node-v12.13.0-linux-x64.tar.xz && \
+    tar -xf node-v12.13.0-linux-x64.tar.xz && \
+    rm node-v12.13.0-linux-x64.tar.xz
 ENV USER=stratos
-ENV PATH=$PATH:/node-v8.11.2-linux-x64/bin
+ENV PATH=$PATH:/node-v12.13.0-linux-x64/bin
 USER stratos
-WORKDIR /home/stratos
\ No newline at end of file
+WORKDIR /home/stratos
+
+
diff --git a/deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl
index 49a0687acf..871c53c857 100644
--- a/deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl
+++ b/deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl
@@ -1,6 +1,7 @@
 FROM {{BASE_IMAGE}}
 
 {{#IS_SLE}}
+RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp
 RUN zypper addrepo  -G -c '{{SMT_INTERNAL}}' smt_internal
 RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_UPDATE}}' smt_internal_update
 RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SDK}}' smt_internal_sdk
@@ -9,10 +10,14 @@ RUN zypper ref
 {{/IS_SLE}}
 
 RUN zypper -n ref && \
-zypper -n up && \
-zypper in -y which tar git gcc curl wget
-RUN wget https://storage.googleapis.com/golang/go1.12.4.linux-amd64.tar.gz && \
-    tar -xzf go1.12.4.linux-amd64.tar.gz -C /usr/local/ && \
+    zypper -n up && \
+    zypper in -y which tar git gcc curl wget gzip xz && \
+    zypper clean -a && \
+    rm -f /var/log/zypper.log /var/log/zypp/history
+
+RUN wget https://storage.googleapis.com/golang/go1.13.4.linux-amd64.tar.gz && \
+    tar -xzf go1.13.4.linux-amd64.tar.gz -C /usr/local/ && \
+    rm go1.13.4.linux-amd64.tar.gz && \
     mkdir -p /home/stratos/go/bin && \
     mkdir -p /home/stratos/go/src
     
diff --git a/deploy/stratos-base-images/Dockerfile.stratos-mariadb-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-mariadb-base.tmpl
index 61d6d758df..7c4cce74ff 100644
--- a/deploy/stratos-base-images/Dockerfile.stratos-mariadb-base.tmpl
+++ b/deploy/stratos-base-images/Dockerfile.stratos-mariadb-base.tmpl
@@ -1,7 +1,11 @@
 FROM {{BASE_IMAGE}}
 
 {{#IS_SLE}}
+RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp
 RUN zypper addrepo  -G -c '{{SMT_INTERNAL}}' smt_internal
+RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_UPDATE}}' smt_internal_update
+RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SDK}}' smt_internal_sdk
+RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SERVER}}' smt_internal_server
 RUN zypper ref
 {{/IS_SLE}}
 
@@ -9,8 +13,13 @@ RUN zypper ref
 ENV MYSQL_ROOT_PASSWORD mysecretpassword
 
 # Add repo for the latest mariadb
-RUN zypper in -y mariadb net-tools \
-  && zypper clean --all
+RUN zypper in -y mariadb net-tools mariadb-tools timezone wget awk grep && \
+    zypper clean -a && \
+    rm -f /var/log/zypper.log /var/log/zypp/history
+
+ARG GOSU_VERSION=1.11
+RUN wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-amd64" \
+    && chmod +x /usr/local/bin/gosu
 
 # Config for mariadb
 RUN rm -rf /var/lib/mysql \
@@ -20,7 +29,10 @@ RUN rm -rf /var/lib/mysql \
   && chown -R mysql:mysql /var/log/mysql
 
 {{#IS_SLE}}
-RUN zypper rr  smt_internal
+RUN zypper rr smt_internal
+RUN zypper rr smt_internal_update
+RUN zypper rr smt_internal_sdk
+RUN zypper rr smt_internal_server
 {{/IS_SLE}}
 
 VOLUME ["/var/lib/mysql"]
\ No newline at end of file
diff --git a/deploy/stratos-base-images/Dockerfile.stratos-nginx-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-nginx-base.tmpl
index 021c2d9ff3..d42d542d5b 100644
--- a/deploy/stratos-base-images/Dockerfile.stratos-nginx-base.tmpl
+++ b/deploy/stratos-base-images/Dockerfile.stratos-nginx-base.tmpl
@@ -1,12 +1,23 @@
 FROM {{BASE_IMAGE}}
 {{#IS_SLE}}
-RUN zypper addrepo -G -t yum -c 'http://nginx.org/packages/sles/12' nginx
+RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp
+RUN zypper addrepo -G -t yum -c 'http://nginx.org/packages/sles/15' nginx
+RUN zypper addrepo  -G -c '{{SMT_INTERNAL}}' smt_internal
+RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_UPDATE}}' smt_internal_update
+RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SDK}}' smt_internal_sdk
 RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SERVER}}' smt_internal_server
 {{/IS_SLE}}
+
 RUN zypper -n ref && \
     zypper -n up && \
-    zypper in -y nginx apache2-utils
+    zypper in -y nginx apache2-utils && \
+    zypper clean -a && \
+    rm -f /var/log/zypper.log /var/log/zypp/history
 
 {{#IS_SLE}}
+RUN zypper rr nginx
+RUN zypper rr smt_internal
+RUN zypper rr smt_internal_update
+RUN zypper rr smt_internal_sdk
 RUN zypper rr smt_internal_server
-{{/IS_SLE}}    
\ No newline at end of file
+{{/IS_SLE}}
\ No newline at end of file
diff --git a/deploy/stratos-base-images/Dockerfile.stratos-ruby-build-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-ruby-build-base.tmpl
index 2a23f226a8..fd1728474c 100644
--- a/deploy/stratos-base-images/Dockerfile.stratos-ruby-build-base.tmpl
+++ b/deploy/stratos-base-images/Dockerfile.stratos-ruby-build-base.tmpl
@@ -1,6 +1,7 @@
 FROM {{BASE_IMAGE}}
 
 {{#IS_SLE}}
+RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp
 RUN zypper addrepo  -G -c '{{SMT_INTERNAL}}' smt_internal
 RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_UPDATE}}' smt_internal_update
 RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SDK}}' smt_internal_sdk
@@ -9,18 +10,20 @@ RUN zypper ref
 {{/IS_SLE}}
 
 RUN zypper -n ref && \
-zypper -n up && \
-zypper in -y which tar curl wget
-
-{{#IS_SLE}}
-RUN zypper rr  smt_internal
-RUN zypper rr  smt_internal_update
-RUN zypper rr  smt_internal_sdk
-RUN zypper rr  smt_internal_server
-{{/IS_SLE}}
+    zypper -n up && \
+    zypper in -y which tar curl wget gzip && \
+    zypper clean -a && \
+    rm -f /var/log/zypper.log /var/log/zypp/history
 
 WORKDIR /
 USER root
 
 ADD install-ruby.sh /install-ruby.sh
 RUN /install-ruby.sh
+
+{{#IS_SLE}}
+RUN zypper rr smt_internal
+RUN zypper rr smt_internal_update
+RUN zypper rr smt_internal_sdk
+RUN zypper rr smt_internal_server
+{{/IS_SLE}}
diff --git a/deploy/stratos-base-images/Dockerfile.stratos-ui-build-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-ui-build-base.tmpl
index db0af5208b..55cdaf6c5b 100644
--- a/deploy/stratos-base-images/Dockerfile.stratos-ui-build-base.tmpl
+++ b/deploy/stratos-base-images/Dockerfile.stratos-ui-build-base.tmpl
@@ -1,6 +1,7 @@
 FROM {{BASE_IMAGE}}
 
 {{#IS_SLE}}
+RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp
 RUN zypper addrepo  -G -c '{{SMT_INTERNAL}}' smt_internal
 RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_UPDATE}}' smt_internal_update
 RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SDK}}' smt_internal_sdk
@@ -9,12 +10,15 @@ RUN zypper ref
 {{/IS_SLE}}
 
 RUN zypper -n ref && \
-zypper -n up && \
-zypper in -y wget tar git
-RUN cd / && wget https://nodejs.org/dist/v8.11.2/node-v8.11.2-linux-x64.tar.xz && \
-    tar -xf node-v8.11.2-linux-x64.tar.xz
+    zypper -n up && \
+    zypper in -y wget tar git xz && \
+    zypper clean -a && \
+    rm -f /var/log/zypper.log /var/log/zypp/history
+
+RUN cd / && wget https://nodejs.org/dist/v12.13.0/node-v12.13.0-linux-x64.tar.xz && \
+    tar -xf node-v12.13.0-linux-x64.tar.xz
 ENV USER=stratos
-ENV PATH=$PATH:/node-v8.11.2-linux-x64/bin
+ENV PATH=$PATH:/node-v12.13.0-linux-x64/bin
 RUN useradd -ms /bin/bash stratos && \
     mkdir -p /home/stratos && \
     chown -R stratos /home/stratos && \
@@ -24,11 +28,11 @@ RUN useradd -ms /bin/bash stratos && \
     chgrp users /usr/dist
 
 {{#IS_SLE}}
-RUN zypper rr  smt_internal
-RUN zypper rr  smt_internal_update
-RUN zypper rr  smt_internal_sdk
-RUN zypper rr  smt_internal_server
+RUN zypper rr smt_internal
+RUN zypper rr smt_internal_update
+RUN zypper rr smt_internal_sdk
+RUN zypper rr smt_internal_server
 {{/IS_SLE}}
 
-USER stratos
-WORKDIR /home/stratos
\ No newline at end of file
+USER stratos    
+WORKDIR /home/stratos
diff --git a/deploy/stratos-base-images/build-base-images.sh b/deploy/stratos-base-images/build-base-images.sh
index e85a2f6061..2e58c97a4c 100755
--- a/deploy/stratos-base-images/build-base-images.sh
+++ b/deploy/stratos-base-images/build-base-images.sh
@@ -7,11 +7,13 @@ YELLOW="\033[93m"
 RESET="\033[0m"
 BOLD="\033[1m"
 
-BASE_IMAGE=opensuse:42.3
+BASE_IMAGE=opensuse/leap:15.1
 REGISTRY=docker.io
 ORGANIZATION=splatform
-TAG=opensuse
+TAG=leap15_1
 PROG=$(basename ${BASH_SOURCE[0]})
+SQUASH_ARGS="--squash"
+NO_SQUASH="stratos-base"
 
 function usage {
     echo "usage: $PROG [-b BASE] [-r REGISTRY] [-o ORGANIZATION] [-t TAG] [-p] [h]"
@@ -115,8 +117,15 @@ build_and_push_image() {
     printf "${CYAN}Building image ${YELLOW}${image_name}${CYAN} with docker file ${YELLOW}${docker_file}${RESET}\n"
     printf "${CYAN}========= >>>>${RESET}\n"
     echo ""
+
+    # We can't squash base image as its the same as the base (just re-tagged)
+    ARG=""
+    if [ "${image_name}" != "$NO_SQUASH" ]; then
+        ARG="${SQUASH_ARGS}"
+    fi
     set -x
-    docker build . -f $docker_file  -t ${REGISTRY}/${ORGANIZATION}/${image_name}:${TAG}
+    # Always remove intermediate containers
+    docker build --force-rm ${ARG} . -f $docker_file  -t ${REGISTRY}/${ORGANIZATION}/${image_name}:${TAG}
     if [ ! -z ${PUSH_IMAGES} ]; then
         docker push ${REGISTRY}/${ORGANIZATION}/${image_name}:${TAG}
     fi
diff --git a/deploy/stratos-base-images/install-ruby.sh b/deploy/stratos-base-images/install-ruby.sh
index fc8a4bd622..237851a43a 100755
--- a/deploy/stratos-base-images/install-ruby.sh
+++ b/deploy/stratos-base-images/install-ruby.sh
@@ -15,20 +15,11 @@ set -e
 
 if [ "$IS_SLES" == "false" ]; then
   zypper in -y curl jq make gcc-c++
-  zypper in -y libopenssl-devel readline-devel  
+  zypper in -y libopenssl-devel readline-devel
+  zypper in -y ruby-devel
 fi
 
-# Build from source
-mkdir -p /tmp/ruby
-cd /tmp/ruby
-wget https://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.8.tar.gz
-gunzip ./ruby-2.3.8.tar.gz
-tar -xvf ./ruby-2.3.8.tar
-cd ruby-2.3.8
-
-./configure
-
-make
-make install
+# OpenSUSE Leap 15.1 will install ruby 2.5
+zypper in -y ruby
 
 ruby --version
diff --git a/deploy/stratos-ui-release/config/blobs.yml b/deploy/stratos-ui-release/config/blobs.yml
index f3434ed0df..fee051dbdf 100644
--- a/deploy/stratos-ui-release/config/blobs.yml
+++ b/deploy/stratos-ui-release/config/blobs.yml
@@ -7,8 +7,8 @@ nginx/pcre-8.40.tar.gz:
   size: 2065161
   object_id: 44706e8c-255c-4ff3-9737-23ab55a1a214
   sha: 10384eb3d411794cc15f55b9d837d3f69e35391e
-golang/go1.12.4.linux-amd64.tar.gz:
+golang/go1.13.4.linux-amd64.tar.gz:
   size: 118297141
   object_id: 53346f1f-edfc-40d5-54b9-04126e05fdf3
-  sha: fa74941098fcf91fdcf1a45f6275a0de3ac67f1f
+  sha: bd3d3df8557fbf84e9328a1327fbf0ae1367df85
 
diff --git a/deploy/stratos-ui-release/packages/golang/packaging b/deploy/stratos-ui-release/packages/golang/packaging
index ca60a76473..f600104565 100644
--- a/deploy/stratos-ui-release/packages/golang/packaging
+++ b/deploy/stratos-ui-release/packages/golang/packaging
@@ -1,4 +1,4 @@
 set -e
 
-tar xzf golang/go1.12.4.linux-amd64.tar.gz
+tar xzf golang/go1.13.4.linux-amd64.tar.gz
 cp -R go/* ${BOSH_INSTALL_TARGET}
diff --git a/deploy/stratos-ui-release/packages/golang/spec b/deploy/stratos-ui-release/packages/golang/spec
index 903488ceed..abf33e4195 100644
--- a/deploy/stratos-ui-release/packages/golang/spec
+++ b/deploy/stratos-ui-release/packages/golang/spec
@@ -2,4 +2,4 @@
 name: golang
 
 files:
-  - golang/go1.12.4.linux-amd64.tar.gz
+  - golang/go1.13.4.linux-amd64.tar.gz
diff --git a/docs/customizing.md b/docs/customizing.md
index 2171212e3c..c167a77516 100644
--- a/docs/customizing.md
+++ b/docs/customizing.md
@@ -50,7 +50,7 @@ In this file you can set any or all of the following variables:
 |---|---|
 |$stratos-theme|The main theme to use for Stratos|
 |$stratos-nav-theme|Theme to use for the side navigation panel|
-$stratos-status-theme|Theme to use for displaying status in Stratos|
+|$stratos-status-theme|Theme to use for displaying status in Stratos|
 
 Note that you do not have to specify all of these - defaults will be used if they are not set.
 
@@ -72,6 +72,24 @@ $suse-app-theme: mat-light-theme($suse-app-primary, $suse-app-primary, $suse-the
 $stratos-theme: $suse-app-theme;
 ```
 
+#### Creating or disabling the Dark theme
+
+You can also change the Dark theme, if you wish, by defining the following variables:
+
+|Variable|Purpose|
+|---|---|
+|$stratos-dark-theme|The dark theme to use for Stratos|
+|$stratos-dark-nav-theme|Dark theme to use for the side navigation panel|
+|$stratos-dark-status-theme|Dark theme to use for displaying status in Stratos|
+
+Note that minimally you must supply `stratos-dark-theme` to create a dark theme.
+
+By default a dark theme is assumed to be available and the default will be used if not overridden. You can disable dark theme support in the UI by setting the following variable in your `custom.scss`:
+
+```
+$stratos-dark-theme-supported: false;
+```
+
 ### Changing Styles
 
 We don't generally recommend modifying styles, since from version to version of Stratos, we may change the styles used slightly which can mean any modifications you made will need updating. Should you wish to do so, you can modify these in the same `custom.scss` file that is used for theming.
diff --git a/docs/developers-guide.md b/docs/developers-guide.md
index d59d17ff00..eb36575687 100644
--- a/docs/developers-guide.md
+++ b/docs/developers-guide.md
@@ -30,7 +30,7 @@ using Visual Studio Code. If you feel comfortable with these and are happy with
     choose a deployment method and bring one up. These deployments will bring up the entire backend, including api service and database
     along with a V2 frontend.
   * Need to make changes to the backend code? Follow the below [Backend Development](#Backend-Development) set up guide
-* Install [NodeJs](https://nodejs.org) (minimum node version 8.11.3)
+* Install [NodeJs](https://nodejs.org) (minimum node version 12.13.0)
 * Install [Angular CLI](https://cli.angular.io/) - `npm install -g @angular/cli`
 
 ### Configuration
diff --git a/examples/custom-src/frontend/sass/custom.scss b/examples/custom-src/frontend/sass/custom.scss
index 308b1ef362..e3eb84c38a 100644
--- a/examples/custom-src/frontend/sass/custom.scss
+++ b/examples/custom-src/frontend/sass/custom.scss
@@ -2,11 +2,17 @@
 
 // ACME Primary Material Design pallette
 // From http://mcg.mbitson.com/#!?mcgpalette0=%233f51b5
-$acme-primary: (50: #e0f7f0, 100: #b3ecd9, 200: #80e0c0, 300: #4dd3a7, 400: #26c994, 500: #00c081, 600: #00ba79, 700: #00b26e, 800: #00aa64, 900: #009c51, A100: #c7ffe0, A200: #94ffc4, A400: #61ffa8, A700: #47ff9a, contrast: (50: #000, 100: #000, 200: #000, 300: #000, 400: #000, 500: #fff, 600: #fff, 700: #fff, 800: #fff, 900: #fff, A100: #000, A200: #000, A400: #000, A700: #000));
+$acme-primary: (50: #e8eaf6, 100: #c5cbe9, 200: #9fa8da, 300: #7985cb, 400: #5c6bc0, 500: #3f51b5, 600: #394aae, 700: #3140a5, 800: #29379d, 900: #1b278d, A100: #c6cbff, A200: #939dff, A400: #606eff, A700: #4757ff, contrast: (  50: #000000,  100: #000000,  200: #000000,  300: #000000,  400: #ffffff,  500: #ffffff,  600: #ffffff,  700: #ffffff,  800: #ffffff,  900: #ffffff,  A100: #000000,  A200: #000000,  A400: #ffffff,  A700: #ffffff, ));
 $mat-red: ( 50: #ffebee, 100: #ffcdd2, 200: #ef9a9a, 300: #e57373, 400: #ef5350, 500: #f44336, 600: #e53935, 700: #d32f2f, 800: #c62828, 900: #b71c1c, A100: #ff8a80, A200: #ff5252, A400: #ff1744, A700: #d50000, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: white, A400: white, A700: white, ));
 
+// Common
 $acme-theme-primary: mat-palette($acme-primary);
 $acme-theme-warn: mat-palette($mat-red);
+
+// Dark Theme
+$stratos-dark-theme: mat-dark-theme($acme-theme-primary, $acme-theme-primary, $acme-theme-warn);
+
+// Default Theme
 $stratos-theme: mat-light-theme($acme-theme-primary, $acme-theme-primary, $acme-theme-warn);
 
 @import 'custom/acme';
diff --git a/examples/custom-src/frontend/sass/custom/acme.scss b/examples/custom-src/frontend/sass/custom/acme.scss
index d153c4bc36..75794ebb6e 100644
--- a/examples/custom-src/frontend/sass/custom/acme.scss
+++ b/examples/custom-src/frontend/sass/custom/acme.scss
@@ -11,7 +11,7 @@ $acme-blue: #073155;
 $acme-side-nav: $acme-secondary;
 $acme-side-nav-active: #003358;
 
-.stratos {
+body.stratos {
   app-page-subheader {
     .page-subheader {
       background-color: #fff;
diff --git a/manifest.yml b/manifest.yml
index 1611522c45..bd204292b0 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -13,6 +13,8 @@ applications:
 #       CF_API_FORCE_SECURE: true
 # Turn on backend debugging
        LOG_LEVEL: debug
+# Turn on staging debugging in stratos-buildpack
+# STRATOS_BP_DEBUG: true #Remove line to turn off debugging
 
 # User provided services can also be used to set environment properties:
 #   env:
diff --git a/package-lock.json b/package-lock.json
index ce5b2d62f2..a548d0cc34 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "stratos",
-  "version": "2.6.0",
+  "version": "3.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6f65152326..329debb5bd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stratos",
-  "version": "2.6.0",
+  "version": "3.0.0",
   "description": "Stratos Console",
   "main": "index.js",
   "scripts": {
@@ -63,17 +63,19 @@
     "@ngrx/router-store": "^8.3.0",
     "@ngrx/store": "^8.3.0",
     "@ngrx/store-devtools": "^8.3.0",
+    "@nrwl/angular": "8.5.2",
     "@swimlane/ngx-charts": "^12.0.1",
-    "@types/moment-timezone": "^0.5.12",
+    "@swimlane/ngx-graph": "^6.2.0",
     "@types/marked": "^0.6.5",
+    "@types/moment-timezone": "^0.5.12",
     "angular2-virtual-scroll": "^0.4.16",
     "core-js": "^3.2.1",
     "hammerjs": "^2.0.8",
     "immer": "^4.0.0",
+    "intersect": "^1.0.1",
     "lodash-es": "^4.17.14",
     "mappy-breakpoints": "^0.2.3",
     "marked": "^0.7.0",
-    "intersect": "^1.0.1",
     "moment": "^2.24.0",
     "moment-timezone": "^0.5.12",
     "ngrx-store-localstorage": "8.0.0",
@@ -88,11 +90,10 @@
     "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": "8.11.2"
+    "node": "12.13.0"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "~0.803.7",
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.scss 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.scss
index 002bddcdbd..de27bc5c5e 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.scss
+++ 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.scss
@@ -1,6 +1,5 @@
 mat-card-header {
   .autoscaler-metric-subtitle {
-    color: rgba(0, 0, 0, .54);
     font-size: .9em;
     margin-top: .3em;
   }
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 7264dee6a7..36baef9f80 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
@@ -9,7 +9,7 @@ import { GitAppDetails, OverrideAppDetails, SourceType } from '../store/types/de
 import { GitBranch, GitCommit } from '../store/types/git.types';
 
 export const SET_APP_SOURCE_DETAILS = '[Deploy App] Application Source';
-export const CHECK_PROJECT_EXISTS = '[Deploy App] Check Projet exists';
+export const CHECK_PROJECT_EXISTS = '[Deploy App] Check Project exists';
 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';
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 61bbeef953..58077aa52f 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/organization.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/organization.actions.ts
@@ -18,7 +18,7 @@ import {
 } from '../entity-relations/entity-relations.types';
 import { CFStartAction } from './cf-action.types';
 import { createDefaultUserRelations } from './user.actions.helpers';
-import { HttpRequest } from '@angular/common/http';
+import { HttpRequest, HttpHeaders } from '@angular/common/http';
 
 export const GET_ORGANIZATION = '[Organization] Get one';
 export const GET_ORGANIZATION_SUCCESS = '[Organization] Get one success';
@@ -172,10 +172,10 @@ export class DeleteOrganization extends CFStartAction implements ICFAction {
       'DELETE',
       `organizations/${guid}`,
       {
-        params: {
+        params: new HttpHeaders({
           recursive: 'true',
           async: 'false'
-        }
+        })
       }
     );
   }
diff --git a/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts
index ade4c360b2..985214b8dd 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts
@@ -1,13 +1,11 @@
+import { HttpParams, HttpRequest } from '@angular/common/http';
+
 import { EntityCatalogueEntityConfig } from '../../../core/src/core/entity-catalogue/entity-catalogue.types';
-import {
-  EntityInlineChildAction,
-  EntityInlineParentAction,
-} from '../entity-relations/entity-relations.types';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
-import { RequestEntityLocation, RequestActionEntity } from '../../../store/src/types/request.types';
-import { CFStartAction } from './cf-action.types';
+import { RequestActionEntity, RequestEntityLocation } from '../../../store/src/types/request.types';
 import { EntityTreeRelation } from '../entity-relations/entity-relation-tree';
-import { HttpRequest } from '@angular/common/http';
+import { EntityInlineChildAction, EntityInlineParentAction } from '../entity-relations/entity-relations.types';
+import { CFStartAction } from './cf-action.types';
 
 const relationActionId = 'FetchRelationAction';
 
@@ -27,7 +25,7 @@ export abstract class FetchRelationAction extends CFStartAction implements Entit
       'GET',
       url.startsWith('/v2/') ? url.substring(4, url.length) : url,
       {
-        params: {}
+        params: new HttpParams()
       }
     );
     this.parentEntityConfig = parent.entity;
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 44654b6f0f..9f0a3f6a55 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
@@ -84,11 +84,13 @@ export class DeleteServiceInstance extends CFStartAction implements ICFAction {
       'DELETE',
       `service_instances/${guid}`,
       {
-        params: {
-          accepts_incomplete: 'true',
-          async: 'false',
-          recursive: 'true'
-        }
+        params: new HttpParams({
+          fromObject: {
+            accepts_incomplete: 'true',
+            async: 'false',
+            recursive: 'true'
+          }
+        })
       }
     );
   }
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 4d3387dd25..53c27a466b 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/space.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/space.actions.ts
@@ -24,7 +24,7 @@ import { CFStartAction } from './cf-action.types';
 import { GetAllOrgUsers } from './organization.actions';
 import { RouteEvents } from './route.actions';
 import { getServiceInstanceRelations } from './service-instances.actions';
-import { HttpRequest } from '@angular/common/http';
+import { HttpRequest, HttpParams } from '@angular/common/http';
 
 export const GET_SPACES = '[Space] Get all';
 export const GET_SPACES_SUCCESS = '[Space] Get all success';
@@ -75,7 +75,7 @@ export class GetAllSpaces extends CFStartAction implements PaginatedAction, Enti
     super();
     this.options = new HttpRequest(
       'GET',
-      'spsace'
+      'space'
     );
   }
   actions = [GET_SPACES, GET_SPACES_SUCCESS, GET_SPACES_FAILED];
@@ -177,10 +177,12 @@ export class DeleteSpace extends BaseSpaceAction {
       'DELETE',
       `spaces/${guid}`,
       {
-        params: {
-          recursive: 'true',
-          async: 'false'
-        }
+        params: new HttpParams({
+          fromObject: {
+            recursive: 'true',
+            async: 'false'
+          }
+        })
       }
     );
   }
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 c376c55e85..f89dc2ca16 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
@@ -1,4 +1,5 @@
 import * as moment from 'moment';
+
 import {
   IService,
   IServiceBinding,
@@ -38,6 +39,7 @@ 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 { EntitySchema } from '../../store/src/helpers/entity-schema';
 import { endpointDisconnectRemoveEntitiesReducer } from '../../store/src/reducers/endpoint-disconnect-application.reducer';
 import { APIResource } from '../../store/src/types/api.types';
 import { IFavoriteMetadata } from '../../store/src/types/user-favorites.types';
@@ -116,7 +118,11 @@ import { spaceActionBuilders } from './entity-action-builders/space.action-build
 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 { ApplicationPreviewComponent } from './shared/components/application-preview/application-preview.component';
 import { CfEndpointDetailsComponent } from './shared/components/cf-endpoint-details/cf-endpoint-details.component';
+import { CfEndpointPreviewComponent } from './shared/components/cf-endpoint-preview/cf-endpoint-preview.component';
+import { OrganizationPreviewComponent } from './shared/components/organization-preview/organization-preview.component';
+import { SpacePreviewComponent } from './shared/components/space-preview/space-preview.component';
 import { updateApplicationRoutesReducer } from './store/reducers/application-route.reducer';
 import { updateOrganizationQuotaReducer } from './store/reducers/organization-quota.reducer';
 import { updateOrganizationSpaceReducer } from './store/reducers/organization-space.reducer';
@@ -128,8 +134,6 @@ import { AppStat } from './store/types/app-metadata.types';
 import { CFResponse } from './store/types/cf-api.types';
 import { GitBranch, GitCommit, GitRepo } from './store/types/git.types';
 import { CfUser } from './store/types/user.types';
-import { CfApplicationState } from './store/types/application.types';
-import { EntitySchema } from '../../store/src/helpers/entity-schema';
 
 export interface CFBasePipelineRequestActionMeta {
   includeRelations?: string[];
@@ -855,6 +859,7 @@ function generateCfEndpointEntity(endpointDefinition: StratosEndpointExtensionDe
   return new StratosCatalogueEndpointEntity(
     endpointDefinition,
     metadata => `/cloud-foundry/${metadata.guid}`,
+    () => CfEndpointPreviewComponent,
   );
 }
 
@@ -889,6 +894,7 @@ function generateCfApplicationEntity(endpointDefinition: StratosEndpointExtensio
         }),
         getLink: metadata => `/applications/${metadata.cfGuid}/${metadata.guid}/summary`,
         getGuid: metadata => metadata.guid,
+        getPreviewableComponent: () => ApplicationPreviewComponent,
         getLines: () => ([
           ['Creation  Date', (meta) => meta.createdAt]
         ])
@@ -925,6 +931,7 @@ function generateCfSpaceEntity(endpointDefinition: StratosEndpointExtensionDefin
           name: space.entity.name,
           cfGuid: space.entity.cfGuid,
         }),
+        getPreviewableComponent: () => SpacePreviewComponent,
         getLines: () => ([
           ['Name', (meta) => meta.name],
         ]),
@@ -960,6 +967,7 @@ function generateCfOrgEntity(endpointDefinition: StratosEndpointExtensionDefinit
           name: org.entity.name,
           cfGuid: org.entity.cfGuid,
         }),
+        getPreviewableComponent: () => OrganizationPreviewComponent,
         getLink: metadata => `/cloud-foundry/${metadata.cfGuid}/organizations/${metadata.guid}`,
         getGuid: metadata => metadata.guid
       }
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 a60a65894e..d758718c6c 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,5 +1,5 @@
-import { EntitySchema } from '../../../store/src/helpers/entity-schema';
 import { entityCatalogue } from '../../../core/src/core/entity-catalogue/entity-catalogue.service';
+import { EntitySchema } from '../../../store/src/helpers/entity-schema';
 
 /**
  * A structure which represents the tree like layout of entity dependencies. For example organization --> space --> routes
@@ -18,7 +18,7 @@ export class EntityTreeRelation {
 
   /**
    * Creates an instance of EntityTreeRelation.
-   * @param [isArray=false] is this a collection of entities (should be paginationed) or not
+   * @param [isArray=false] is this a collection of entities (should be paginated) or not
    * @param paramName parameter name of the entity within the schema. For example `space` may be `spaces` (entity.spaces)
    * @param [path=''] location of the entity within the parent. For example `space` entity maybe be `entity.spaces`
    */
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 dd94db5dfe..c854e5f873 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
@@ -22,9 +22,9 @@ import {
   routeEntityType,
   serviceBindingEntityType,
   spaceEntityType,
+  spaceWithOrgEntityType,
   stackEntityType,
 } from '../../../../cloud-foundry/src/cf-entity-types';
-import { selectCfEntity } from '../../../../cloud-foundry/src/store/selectors/api.selectors';
 import { IApp, IAppSummary, IDomain, IOrganization, ISpace } from '../../../../core/src/core/cf-api.types';
 import { entityCatalogue } from '../../../../core/src/core/entity-catalogue/entity-catalogue.service';
 import { EntityService } from '../../../../core/src/core/entity-service';
@@ -47,6 +47,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 { cfEntityFactory } from '../../cf-entity-factory';
 import { createEntityRelationKey } from '../../entity-relations/entity-relations.types';
 import { AppStat } from '../../store/types/app-metadata.types';
 import {
@@ -59,13 +60,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),
+  ]
   );
 }
 
@@ -91,21 +92,9 @@ export class ApplicationService {
     private appEnvVarsService: ApplicationEnvVarsHelper,
     private paginationMonitorFactory: PaginationMonitorFactory,
   ) {
-    this.appEntityService = this.entityServiceFactory.create<APIResource<IApp>>(
-      appGuid,
-      createGetApplicationAction(appGuid, cfGuid)
-    );
-    const appSummaryEntity = entityCatalogue.getEntity(CF_ENDPOINT_TYPE, appSummaryEntityType);
-    const actionBuilder = appSummaryEntity.actionOrchestrator.getActionBuilder('get');
-    const getAppSummaryAction = actionBuilder(appGuid, cfGuid);
-    this.appSummaryEntityService = this.entityServiceFactory.create<IAppSummary>(
-      appGuid,
-      getAppSummaryAction
-    );
-
-    this.constructCoreObservables();
-    this.constructAmalgamatedObservables();
-    this.constructStatusObservables();
+    if (cfGuid && appGuid) {
+      this.initialize(cfGuid, appGuid);
+    }
   }
 
   // NJ: This needs to be cleaned up. So much going on!
@@ -161,6 +150,27 @@ export class ApplicationService {
     ).pipe(publishReplay(1), refCount());
   }
 
+  public initialize(cfGuid, appGuid) {
+    this.cfGuid = cfGuid;
+    this.appGuid = appGuid;
+
+    this.appEntityService = this.entityServiceFactory.create<APIResource<IApp>>(
+      appGuid,
+      createGetApplicationAction(appGuid, cfGuid)
+    );
+    const appSummaryEntity = entityCatalogue.getEntity(CF_ENDPOINT_TYPE, appSummaryEntityType);
+    const actionBuilder = appSummaryEntity.actionOrchestrator.getActionBuilder('get');
+    const getAppSummaryAction = actionBuilder(appGuid, cfGuid);
+    this.appSummaryEntityService = this.entityServiceFactory.create<IAppSummary>(
+      appGuid,
+      getAppSummaryAction
+    );
+
+    this.constructCoreObservables();
+    this.constructAmalgamatedObservables();
+    this.constructStatusObservables();
+  }
+
   private constructCoreObservables() {
     // First set up all the base observables
     this.app$ = this.appEntityService.waitForEntity$;
@@ -177,6 +187,8 @@ export class ApplicationService {
           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
@@ -189,13 +201,9 @@ export class ApplicationService {
     );
     this.appOrg$ = moreWaiting$.pipe(
       first(),
-      switchMap(app => this.appSpace$.pipe(
-        map(space => space.entity.organization_guid),
-        switchMap(orgGuid => {
-          return this.store.select(selectCfEntity(organizationEntityType, orgGuid));
-        }),
-        filter(org => !!org)
-      ))
+      switchMap(() => this.appSpace$),
+      map(space => space.entity.organization),
+      filter(org => !!org)
     );
 
     this.isDeletingApp$ = this.appEntityService.isDeletingEntity$.pipe(publishReplay(1), refCount());
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application.component.theme.scss b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application.component.theme.scss
index 0ce40249ca..d5f3293582 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application.component.theme.scss
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application.component.theme.scss
@@ -1,7 +1,17 @@
 @import '~@angular/material/theming';
 @mixin app-deploy-app-theme($theme, $app-theme) {
+  $is-dark: map-get($theme, is-dark);
+
   $ansi-colors: map-get($app-theme, ansi-colors);
+  $background-color: map-get(map-get($ansi-colors, 'white'), intense);
+
+  @if $is-dark == true {
+    $background-colors: map-get($theme, background);
+    $foreground-colors: map-get($theme, foreground);
+    $background-color: lighten(mat-color($background-colors, background), 5%);
+  }
+
   .deploy-app {
-    background-color: map-get(map-get($ansi-colors, 'white'), intense);
+    background-color: $background-color;
   }
 }
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 7e396021dc..c59f4c1a86 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
@@ -36,15 +36,12 @@ import {
 import {
   CloudFoundryQuotasComponent,
 } from '../../../../core/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component';
-import { EndpointListHelper } from '../../../../core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers';
-import {
-  EndpointsListConfigService,
-} from '../../../../core/src/shared/components/list/list-types/endpoint/endpoints-list-config.service';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
 import { CloudFoundryComponentsModule } from '../../shared/components/components.module';
 import {
   CFEndpointsListConfigService,
 } from '../../shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service';
+import { ApplicationService } from '../applications/application.service';
 import { AddOrganizationComponent } from './add-organization/add-organization.component';
 import {
   CreateOrganizationStepComponent,
@@ -64,6 +61,7 @@ import { EditSpaceComponent } from './edit-space/edit-space.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 { CloudFoundrySpaceService } from './services/cloud-foundry-space.service';
 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';
@@ -228,6 +226,8 @@ import { RemoveUserComponent } from './users/remove-user/remove-user.component';
       provide: ActiveRouteCfCell,
       useValue: {}
     },
+    ApplicationService,
+    CloudFoundrySpaceService,
     CloudFoundryOrganizationService,
     CloudFoundryEndpointService,
     // CfRolesService,
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 0dc2f48391..ac0dfa57ec 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
@@ -63,6 +63,8 @@ export function appDataSort(app1: APIResource<IApp>, app2: APIResource<IApp>): n
 export class CloudFoundryEndpointService {
   hasSSHAccess$: Observable<boolean>;
   totalMem$: Observable<number>;
+  description$: Observable<string>;
+  apiUrl$: Observable<string>;
   paginationSubscription: any;
   appsPagObs: PaginationObservables<APIResource<IApp>>;
   usersCount$: Observable<number | null>;
@@ -98,6 +100,7 @@ export class CloudFoundryEndpointService {
       }) as PaginatedAction;
     return getAllOrganizationsAction;
   }
+
   static createGetAllOrganizationsLimitedSchema(cfGuid: string) {
     const paginationKey = cfGuid ?
       createEntityRelationPaginationKey(endpointSchemaKey, cfGuid)
@@ -138,7 +141,14 @@ export class CloudFoundryEndpointService {
     private endpointService: EndpointsService,
     private paginationMonitorFactory: PaginationMonitorFactory
   ) {
-    this.cfGuid = activeRouteCfOrgSpace.cfGuid;
+    const cfGuid = activeRouteCfOrgSpace.cfGuid;
+    if (cfGuid) {
+      this.initialize(cfGuid);
+    }
+  }
+
+  public initialize(cfGuid) {
+    this.cfGuid = cfGuid;
     this.getAllOrgsAction = CloudFoundryEndpointService.createGetAllOrganizations(this.cfGuid) as GetAllOrganizations;
     this.getAllAppsAction = new GetAllApplications(createEntityRelationPaginationKey('cf', this.cfGuid), this.cfGuid);
 
@@ -197,6 +207,14 @@ export class CloudFoundryEndpointService {
     );
     this.totalMem$ = this.appsPagObs.entities$.pipe(map(apps => this.getMetricFromApps(apps, 'memory')));
 
+    this.apiUrl$ = this.endpoint$.pipe(
+      map(endpoint => this.getApiEndpointUrl(endpoint.entity.api_endpoint))
+    );
+
+    this.description$ = this.info$.pipe(
+      map(entity => this.getDescription(entity))
+    );
+
     this.connected$ = this.endpoint$.pipe(
       map(p => p.entity.connectionStatus === 'connected')
     );
@@ -256,6 +274,28 @@ export class CloudFoundryEndpointService {
     this.store.dispatch(this.getAllAppsAction);
   }
 
+  private getApiEndpointUrl(apiEndpoint) {
+    const path = apiEndpoint.Path ? `/${apiEndpoint.Path}` : '';
+    return `${apiEndpoint.Scheme}://${apiEndpoint.Host}${path}`;
+  }
+
+  private getMetadataFromInfo(entity: EntityInfo<APIResource<ICfV2Info>>) {
+    return entity && entity.entity && entity.entity.entity ? entity.entity.entity : null;
+  }
+
+  private getDescription(entity: EntityInfo<APIResource<ICfV2Info>>): string {
+    const metadata = this.getMetadataFromInfo(entity);
+    if (metadata) {
+      if (metadata.description) {
+        return metadata.description + (metadata.build ? ` (${metadata.build})` : '');
+      }
+      if (metadata.support === 'pcfdev@pivotal.io') {
+        return 'PCF Dev';
+      }
+    }
+    return '-';
+  }
+
   hasCellMetrics(endpointId: string): Observable<boolean> {
     return this.endpointService.hasMetrics(endpointId).pipe(
       switchMap(hasMetrics => {
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 a581a419d1..fe0356517e 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
@@ -24,19 +24,19 @@ import {
   ISpaceQuotaDefinition,
 } from '../../../../../core/src/core/cf-api.types';
 import { getEntityFlattenedList, getStartedAppInstanceCount } from '../../../../../core/src/core/cf.helpers';
+import { entityCatalogue } from '../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
 import { EntityServiceFactory } from '../../../../../core/src/core/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../../../../core/src/shared/monitors/pagination-monitor.factory';
 import {
   CloudFoundryUserProvidedServicesService,
 } from '../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
+import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
 import { createEntityRelationKey } from '../../../entity-relations/entity-relations.types';
 import { CfUserService } from '../../../shared/data-services/cf-user.service';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { getOrgRolesString } from '../cf.helpers';
 import { CloudFoundryEndpointService } from './cloud-foundry-endpoint.service';
-import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
-import { entityCatalogue } from '../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
 
 export const createOrgQuotaDefinition = (): IOrgQuotaDefinition => ({
   memory_limit: -1,
@@ -85,7 +85,7 @@ export class CloudFoundryOrganizationService {
   usersCount$: Observable<number | null>;
 
   constructor(
-    public activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
+    activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
     private store: Store<CFAppState>,
     private entityServiceFactory: EntityServiceFactory,
     private cfUserService: CfUserService,
@@ -93,10 +93,12 @@ export class CloudFoundryOrganizationService {
     private cfEndpointService: CloudFoundryEndpointService,
     private cfUserProvidedServicesService: CloudFoundryUserProvidedServicesService
   ) {
-    this.orgGuid = activeRouteCfOrgSpace.orgGuid;
-    this.cfGuid = activeRouteCfOrgSpace.cfGuid;
+    const orgGuid = activeRouteCfOrgSpace.orgGuid;
+    const cfGuid = activeRouteCfOrgSpace.cfGuid;
 
-    this.initialiseObservables();
+    if (cfGuid && orgGuid) {
+      this.initialize(cfGuid, orgGuid);
+    }
   }
 
   public deleteSpace(spaceGuid: string, orgGuid: string, endpointGuid: string) {
@@ -110,7 +112,10 @@ export class CloudFoundryOrganizationService {
     this.cfEndpointService.fetchApps();
   }
 
-  private initialiseObservables() {
+  public initialize(cfGuid, orgGuid) {
+    this.cfGuid = cfGuid;
+    this.orgGuid = orgGuid;
+
     this.org$ = this.cfUserService.isConnectedUserAdmin(this.cfGuid).pipe(
       switchMap(isAdmin => {
         const relations = [
@@ -133,7 +138,7 @@ export class CloudFoundryOrganizationService {
         }
         const orgEntity = entityCatalogue.getEntity(CF_ENDPOINT_TYPE, organizationEntityType);
         const getOrgActionBuilder = orgEntity.actionOrchestrator.getActionBuilder('get');
-        const getOrgAction = getOrgActionBuilder(this.orgGuid, this.cfGuid, relations);
+        const getOrgAction = getOrgActionBuilder(this.orgGuid, this.cfGuid, { includeRelations: relations });
         const orgEntityService = this.entityServiceFactory.create<APIResource<IOrganization>>(
           this.orgGuid,
           getOrgAction
@@ -194,8 +199,8 @@ export class CloudFoundryOrganizationService {
     return CloudFoundryEndpointService.fetchAppCount(
       this.store,
       this.paginationMonitorFactory,
-      this.activeRouteCfOrgSpace.cfGuid,
-      this.activeRouteCfOrgSpace.orgGuid
+      this.cfGuid,
+      this.orgGuid
     );
   }
 
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 4ba4505590..a3a230d5c7 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
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { combineLatest, Observable, of } from 'rxjs';
-import { filter, map, publishReplay, refCount, switchMap } from 'rxjs/operators';
+import { map, publishReplay, refCount, switchMap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import {
@@ -15,12 +15,14 @@ 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 { entityCatalogue } from '../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
 import { EntityServiceFactory } from '../../../../../core/src/core/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../../../../core/src/shared/monitors/pagination-monitor.factory';
 import {
   CloudFoundryUserProvidedServicesService,
 } from '../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
+import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
 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 { entityCatalogue } from '../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
-import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
 
 @Injectable()
 export class CloudFoundrySpaceService {
@@ -48,6 +48,7 @@ export class CloudFoundrySpaceService {
    */
   spaceQuotaDefinition$: Observable<ISpaceQuotaDefinition>;
   allowSsh$: Observable<string>;
+  allowSshStatus$: Observable<string>;
   totalMem$: Observable<number>;
   routes$: Observable<APIResource<IRoute>[]>;
   serviceInstancesCount$: Observable<number>;
@@ -71,18 +72,20 @@ export class CloudFoundrySpaceService {
     private cfOrgService: CloudFoundryOrganizationService
   ) {
 
-    this.spaceGuid = activeRouteCfOrgSpace.spaceGuid;
-    this.orgGuid = activeRouteCfOrgSpace.orgGuid;
-    this.cfGuid = activeRouteCfOrgSpace.cfGuid;
+    const spaceGuid = activeRouteCfOrgSpace.spaceGuid;
+    const orgGuid = activeRouteCfOrgSpace.orgGuid;
+    const cfGuid = activeRouteCfOrgSpace.cfGuid;
 
-    this.initialiseObservables();
+    if (cfGuid && orgGuid && spaceGuid) {
+      this.initialize(cfGuid, orgGuid, spaceGuid);
+    }
   }
 
-  public fetchApps() {
-    this.cfEndpointService.fetchApps();
-  }
+  public initialize(cfGuid: string, orgGuid: string, spaceGuid: string) {
+    this.cfGuid = cfGuid;
+    this.orgGuid = orgGuid;
+    this.spaceGuid = spaceGuid;
 
-  private initialiseObservables() {
     this.initialiseSpaceObservables();
     this.initialiseAppObservables();
 
@@ -100,6 +103,10 @@ export class CloudFoundrySpaceService {
     this.usersCount$ = this.cfUserService.fetchTotalUsers(this.cfGuid, this.orgGuid, this.spaceGuid);
   }
 
+  public fetchApps() {
+    this.cfEndpointService.fetchApps();
+  }
+
   private initialiseSpaceObservables() {
     this.space$ = this.cfUserService.isConnectedUserAdmin(this.cfGuid).pipe(
       switchMap(isAdmin => {
@@ -126,7 +133,7 @@ export class CloudFoundrySpaceService {
           this.spaceGuid,
           getSpaceAction
         );
-        return spaceEntityService.entityObs$.pipe(filter(o => !!o && !!o.entity));
+        return spaceEntityService.waitForEntity$;
       }),
       publishReplay(1),
       refCount()
@@ -142,6 +149,7 @@ export class CloudFoundrySpaceService {
       this.cfUserProvidedServicesService.fetchUserProvidedServiceInstancesCount(this.cfGuid, this.orgGuid, this.spaceGuid);
     this.routes$ = this.space$.pipe(map(o => o.entity.entity.routes));
     this.allowSsh$ = this.space$.pipe(map(o => o.entity.entity.allow_ssh ? 'true' : 'false'));
+    this.allowSshStatus$ = this.allowSsh$.pipe(map(status => status === 'false' ? 'Disabled' : 'Enabled'));
     this.spaceQuotaDefinition$ = this.space$.pipe(
       map(q => q.entity.entity.space_quota_definition ? q.entity.entity.space_quota_definition.entity : null)
     );
@@ -211,9 +219,9 @@ export class CloudFoundrySpaceService {
     return CloudFoundryEndpointService.fetchAppCount(
       this.store,
       this.paginationMonitorFactory,
-      this.activeRouteCfOrgSpace.cfGuid,
-      this.activeRouteCfOrgSpace.orgGuid,
-      this.activeRouteCfOrgSpace.spaceGuid
+      this.cfGuid,
+      this.orgGuid,
+      this.spaceGuid
     );
   }
 }
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 4f737b86e6..c9a8089fbe 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
@@ -1,15 +1,19 @@
 import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
 import { combineLatest, Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map, switchMap } from 'rxjs/operators';
 
 import { EntityServiceFactory } from '../../../../../../../core/src/core/entity-service-factory.service';
+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 {
   MetricsChartHelpers,
 } from '../../../../../../../core/src/shared/components/metrics-chart/metrics.component.helpers';
+import { PaginationMonitorFactory } from '../../../../../../../core/src/shared/monitors/pagination-monitor.factory';
 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 { 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';
@@ -17,7 +21,14 @@ import { ActiveRouteCfCell } from '../../../cf-page.types';
 
 
 export const enum CellMetrics {
-  HEALTHY = 'firehose_value_metric_rep_unhealthy_cell',
+  /**
+   * Deprecated since Diego v2.31.0. See https://github.com/bosh-prometheus/prometheus-boshrelease/issues/333
+   */
+  HEALTHY_DEP = 'firehose_value_metric_rep_unhealthy_cell',
+  /**
+   * Available from Diego v2.31.0. See https://github.com/bosh-prometheus/prometheus-boshrelease/issues/333
+   */
+  HEALTHY = 'firehose_value_metric_rep_garden_health_check_failed',
   REMAINING_CONTAINERS = 'firehose_value_metric_rep_capacity_remaining_containers',
   REMAINING_DISK = 'firehose_value_metric_rep_capacity_remaining_disk',
   REMAINING_MEMORY = 'firehose_value_metric_rep_capacity_remaining_memory',
@@ -27,6 +38,10 @@ export const enum CellMetrics {
   CPUS = 'firehose_value_metric_rep_num_cpus'
 }
 
+
+/**
+ * Designed to be used once drilled down to a cell (see ActiveRouteCfCell)
+ */
 @Injectable()
 export class CloudFoundryCellService {
 
@@ -52,12 +67,13 @@ export class CloudFoundryCellService {
 
   constructor(
     activeRouteCfCell: ActiveRouteCfCell,
-    private entityServiceFactory: EntityServiceFactory) {
+    private entityServiceFactory: EntityServiceFactory,
+    store: Store<AppState>,
+    paginationMonitorFactory: PaginationMonitorFactory) {
 
     this.cellId = activeRouteCfCell.cellId;
     this.cfGuid = activeRouteCfCell.cfGuid;
 
-    this.healthy$ = this.generate(CellMetrics.HEALTHY);
     this.remainingContainers$ = this.generate(CellMetrics.REMAINING_CONTAINERS);
     this.totalContainers$ = this.generate(CellMetrics.TOTAL_CONTAINERS);
     this.remainingDisk$ = this.generate(CellMetrics.REMAINING_DISK);
@@ -70,8 +86,19 @@ export class CloudFoundryCellService {
     this.usageDisk$ = this.generateUsage(this.remainingDisk$, this.totalDisk$);
     this.usageMemory$ = this.generateUsage(this.remainingMemory$, this.totalMemory$);
 
-    this.cellMetric$ = this.generate(CellMetrics.HEALTHY, true);
-
+    const cellHelper = new CfCellHelper(store, paginationMonitorFactory);
+    const action$ = cellHelper.createCellMetricAction(this.cfGuid);
+    this.cellMetric$ = action$.pipe(
+      switchMap(action => {
+        this.healthyMetricId = action.guid;
+        return this.generate(action.query.metric as CellMetrics, true);
+      })
+    );
+    this.healthy$ = action$.pipe(
+      switchMap(action => {
+        return this.generate(action.query.metric as CellMetrics, false);
+      })
+    );
   }
 
   public buildMetricConfig(
@@ -99,17 +126,14 @@ export class CloudFoundryCellService {
     return lineChartConfig;
   }
 
-  private generate(metric: CellMetrics, isMetric = false): Observable<any> {
-    const action = new FetchCFCellMetricsAction(
+  private generate(metric: CellMetrics, isMetric = false, customAction?: FetchCFCellMetricsAction): Observable<any> {
+    const action = customAction || new FetchCFCellMetricsAction(
       this.cfGuid,
       this.cellId,
       new MetricQueryConfig(metric + `{bosh_job_id="${this.cellId}"}`, {}),
       MetricQueryType.QUERY,
       false
     );
-    if (metric === CellMetrics.HEALTHY) {
-      this.healthyMetricId = action.guid;
-    }
     return this.entityServiceFactory.create<IMetrics<IMetricVectorResult<IMetricCell>>>(
       action.guid,
       action,
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 dd2e028c36..dd9fb19aa9 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
@@ -1,7 +1,11 @@
 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 { PaginationMonitorFactory } from '../../../../../../core/src/shared/monitors/pagination-monitor.factory';
+import { AppState } from '../../../../../../store/src/app-state';
 import {
   CfCellsListConfigService,
 } from '../../../../shared/components/list/list-types/cf-cells/cf-cells-list-config.service';
@@ -23,7 +27,12 @@ import { CloudFoundryEndpointService } from '../../services/cloud-foundry-endpoi
 export class CloudFoundryCellsComponent {
   hasCellMetrics$: Observable<boolean>;
 
-  constructor(cfEndpointService: CloudFoundryEndpointService) {
-    this.hasCellMetrics$ = cfEndpointService.hasCellMetrics(cfEndpointService.cfGuid);
+  constructor(
+    cfEndpointService: CloudFoundryEndpointService,
+    store: Store<AppState>,
+    paginationMonitorFactory: PaginationMonitorFactory
+  ) {
+    const cellHelper = new CfCellHelper(store, paginationMonitorFactory);
+    this.hasCellMetrics$ = cellHelper.hasCellMetrics(cfEndpointService.cfGuid);
   }
 }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.html
new file mode 100644
index 0000000000..f47a8f18fe
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.html
@@ -0,0 +1,70 @@
+<app-sidepanel-preview [title]="title">
+  <app-tile-grid fit="true" *ngIf="applicationService.application$ | async as appSvc">
+    <app-loading-page [isLoading]="detailsLoading$" text="Retrieving details">
+      <app-tile-group>
+        <app-tile>
+          <div class="cf-space-usage">
+            <mat-card>
+              <mat-card-header>
+                <mat-card-title>Summary</mat-card-title>
+              </mat-card-header>
+              <mat-card-content>
+                <app-tile-group *ngIf="applicationService.appOrg$ | async as appOrg">
+                  <app-tile>
+                    <app-metadata-item label="Cloud Foundry">
+                      <a [routerLink]="['/cloud-foundry/' + appSvc.cf?.guid]"
+                        matTooltip="CF API URL: {{ getFullEndpointApiUrl(appSvc.cf) }}">{{ appSvc.cf?.name}}</a>
+                    </app-metadata-item>
+                    <app-metadata-item label="Cloud Foundry">
+                      <a [routerLink]="['/cloud-foundry/' + appSvc.cf?.guid]"
+                        matTooltip="CF API URL: {{ getFullEndpointApiUrl(appSvc.cf) }}">{{ appSvc.cf?.name}}</a>
+                    </app-metadata-item>
+                  </app-tile>
+                  <app-tile class="app-metadata__two-cols">
+                    <app-metadata-item label="SSH Access">
+                      {{ sshStatus$ | async }}
+                    </app-metadata-item>
+                    <app-metadata-item label="Organization">
+                      <a
+                        [routerLink]="['/cloud-foundry/' + appSvc.cf?.guid + '/organizations/' + appOrg.metadata.guid]">{{ appOrg.entity.name }}</a>
+                    </app-metadata-item>
+                  </app-tile>
+                  <app-tile class="app-metadata__two-cols">
+                    <app-metadata-item label="CLI Info" class="cli-link">
+                      <a [routerLink]="['/applications/' + appSvc.cf?.guid + '/' + appSvc.app?.metadata.guid + '/cli']">View</a>
+                    </app-metadata-item>
+                    <app-metadata-item *ngIf="applicationService.appSpace$ | async as appSpace" label="Space">
+                      <a
+                        [routerLink]="['/cloud-foundry/' + appSvc.cf?.guid + '/organizations/' + appOrg.metadata?.guid + '/spaces/' + appSpace.metadata?.guid]">{{ appSpace.entity.name }}</a>
+                    </app-metadata-item>
+                  </app-tile>
+                </app-tile-group>
+              </mat-card-content>
+            </mat-card>
+          </div>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile>
+          <app-card-number-metric icon="memory" label="Memory Usage" value="{{ appSvc.app.entity.memory | mbToHumanSize }}"></app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric icon="storage" label="Disk Quota" value="{{ appSvc.app.entity.disk_quota | mbToHumanSize }}"></app-card-number-metric>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile>
+          <app-card-number-metric iconFont="stratos-icons" icon="service" label="Service Instances"
+            value="{{ (applicationService.appSummary$ | async)?.entity?.services?.length || '0' }}"></app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Routes"
+            value="{{ (applicationService.appSummary$ | async)?.entity?.routes?.length || '0' }}"></app-card-number-metric>
+        </app-tile>
+      </app-tile-group>
+      <app-tile-group></app-tile-group>
+    </app-loading-page>
+  </app-tile-grid>
+</app-sidepanel-preview>
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.spec.ts
new file mode 100644
index 0000000000..2d3d25d230
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.spec.ts
@@ -0,0 +1,37 @@
+import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
+import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
+import { LoggerService } from '../../../core/logger.service';
+import { ApplicationPreviewComponent } from './application-preview.component';
+
+describe('ApplicationPreviewComponent', () => {
+  let component: ApplicationPreviewComponent;
+  let fixture: ComponentFixture<ApplicationPreviewComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ApplicationPreviewComponent],
+      providers: [LoggerService, HttpClient, HttpHandler],
+      imports: [
+        HttpClientModule,
+        HttpClientTestingModule,
+        CoreTestingModule,
+        createBasicStoreModule()
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ApplicationPreviewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.ts
new file mode 100644
index 0000000000..649e38af6f
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.ts
@@ -0,0 +1,72 @@
+import { Component } from '@angular/core';
+import { Observable } from 'rxjs';
+import { combineLatest, distinct, map } from 'rxjs/operators';
+
+import { IAppSummary } from '../../../../../core/src/core/cf-api.types';
+import { getFullEndpointApiUrl } from '../../../../../core/src/features/endpoints/endpoint-helpers';
+import { APP_GUID, CF_GUID } from '../../../../../core/src/shared/entity.tokens';
+import { PreviewableComponent } from '../../../../../core/src/shared/previewable-component';
+import { EntityInfo } from '../../../../../store/src/types/api.types';
+import { ApplicationData, ApplicationService } from '../../../features/applications/application.service';
+
+@Component({
+  selector: 'app-application-preview-component',
+  templateUrl: './application-preview.component.html',
+  styleUrls: ['./application-preview.component.scss'],
+  providers: [
+    ApplicationService,
+    {
+      provide: CF_GUID,
+      useValue: '',
+    },
+    {
+      provide: APP_GUID,
+      useValue: '',
+    },
+  ]
+})
+export class ApplicationPreviewComponent implements PreviewableComponent {
+
+  title = null;
+  cfEndpointService: object;
+  sshStatus$: Observable<string>;
+  detailsLoading$: Observable<boolean>;
+
+  getFullEndpointApiUrl = getFullEndpointApiUrl;
+
+  constructor(public applicationService: ApplicationService) {
+  }
+
+  setProps(props: { [key: string]: any }) {
+    this.title = props.title;
+
+    this.applicationService.initialize(props.cfGuid, props.guid);
+    this.sshStatus$ = this.applicationService.application$.pipe(
+      combineLatest(this.applicationService.appSpace$),
+      map(([app, space]) => {
+        if (!space.entity.allow_ssh) {
+          return 'Disabled by the space';
+        } else {
+          return app.app.entity.enable_ssh ? 'Yes' : 'No';
+        }
+      })
+    );
+
+    this.detailsLoading$ = this.applicationService.application$.pipe(
+      combineLatest(
+        this.applicationService.appSummary$
+      ),
+      map(([app, appSummary]: [ApplicationData, EntityInfo<IAppSummary>]) => {
+        return app.fetching || appSummary.entityRequestInfo.fetching;
+      }), distinct());
+
+      //   // Wait for the apps to have been fetched, this will determine if multiple small cards are shown or now
+    //   this.cfEndpointService.appsPagObs.fetchingEntities$.pipe(
+    //     filter(loading => !loading)
+    //   ),
+    // ]).pipe(
+    //   map(() => false),
+    //   startWith(true)
+    // );
+  }
+}
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.html
index 9ce13dc103..e8a2a95463 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.html
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.html
@@ -6,8 +6,8 @@
     <mat-card-content>
       <div class="app-metadata">
         <div class="app-metadata__two-cols">
-          <app-metadata-item icon="title" label="Description">{{ (description$ | async) }}</app-metadata-item>
-          <app-metadata-item icon="link" label="Instance Address">{{ apiUrl }}</app-metadata-item>
+          <app-metadata-item icon="title" label="Description">{{ cfEndpointService.description$ | async }}</app-metadata-item>
+          <app-metadata-item icon="link" label="Instance Address">{{ cfEndpointService.apiUrl$ | async }}</app-metadata-item>
           <app-metadata-item icon="info_outline" label="CF API Version">
             {{ (cfEndpointService.info$ | async)?.entity.entity.api_version }}</app-metadata-item>
           <app-metadata-item *ngIf="autoscalerVersion$ | async as autoscalerVersion" icon="meter"
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 dcf0c83d14..e87578524a 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,10 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import { Observable, Subscription } from 'rxjs';
-import { map, tap } from 'rxjs/operators';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 import { fetchAutoscalerInfo } from '../../../../../../cf-autoscaler/src/core/autoscaler-helpers/autoscaler-available';
-import { ICfV2Info } from '../../../../../../core/src/core/cf-api.types';
 import { EntityServiceFactory } from '../../../../../../core/src/core/entity-service-factory.service';
-import { APIResource, EntityInfo } from '../../../../../../store/src/types/api.types';
 import { CloudFoundryEndpointService } from '../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
 import {
   UserInviteConfigurationDialogComponent,
@@ -19,9 +17,8 @@ import { UserInviteService } from '../../../../features/cloud-foundry/user-invit
   templateUrl: './card-cf-info.component.html',
   styleUrls: ['./card-cf-info.component.scss']
 })
-export class CardCfInfoComponent implements OnInit, OnDestroy {
+export class CardCfInfoComponent implements OnInit {
   public apiUrl: string;
-  private subs: Subscription[] = [];
   public autoscalerVersion$: Observable<string>;
 
   constructor(
@@ -34,17 +31,6 @@ export class CardCfInfoComponent implements OnInit, OnDestroy {
   description$: Observable<string>;
 
   ngOnInit() {
-    const obs$ = this.cfEndpointService.endpoint$.pipe(
-      tap(endpoint => {
-        this.apiUrl = this.getApiEndpointUrl(endpoint.entity.api_endpoint);
-      })
-    );
-    this.subs.push(obs$.subscribe());
-
-    this.description$ = this.cfEndpointService.info$.pipe(
-      map(entity => this.getDescription(entity))
-    );
-
     // FIXME: CF should not depend on autoscaler. See #3916
     this.autoscalerVersion$ = fetchAutoscalerInfo(this.cfEndpointService.cfGuid, this.esf).pipe(
       map(e => e.entityRequestInfo.error ?
@@ -53,32 +39,6 @@ export class CardCfInfoComponent implements OnInit, OnDestroy {
     );
   }
 
-  getApiEndpointUrl(apiEndpoint) {
-    const path = apiEndpoint.Path ? `/${apiEndpoint.Path}` : '';
-    return `${apiEndpoint.Scheme}://${apiEndpoint.Host}${path}`;
-  }
-
-  ngOnDestroy(): void {
-    this.subs.forEach(s => s.unsubscribe());
-  }
-
-  private getMetadataFromInfo(entity: EntityInfo<APIResource<ICfV2Info>>) {
-    return entity && entity.entity && entity.entity.entity ? entity.entity.entity : null;
-  }
-
-  private getDescription(entity: EntityInfo<APIResource<ICfV2Info>>): string {
-    const metadata = this.getMetadataFromInfo(entity);
-    if (metadata) {
-      if (metadata.description) {
-        return metadata.description + (metadata.build ? ` (${metadata.build})` : '');
-      }
-      if (metadata.support === 'pcfdev@pivotal.io') {
-        return 'PCF Dev';
-      }
-    }
-    return '-';
-  }
-
   configureUserInvites() {
     this.dialog.open(UserInviteConfigurationDialogComponent, {
       data: {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.html
index f2b722ebda..92c2869e70 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.html
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.html
@@ -31,7 +31,7 @@
         </div>
         <div class="app-metadata__two-cols">
           <app-metadata-item label="SSH Access">
-            {{ allowSshStatus$ | async }}
+            {{ cfSpaceService.allowSshStatus$ | async }}
           </app-metadata-item>
           <app-metadata-item label="Created At">
             {{ ((cfSpaceService.space$ | async)?.entity?.metadata?.created_at) | date: 'medium' }}
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts
index 1e20e5ab65..efaf18cd79 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts
@@ -1,8 +1,7 @@
 import { Component, OnDestroy } from '@angular/core';
 import { Router } from '@angular/router';
 import { Store } from '@ngrx/store';
-import { Observable, Subscription } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { Subscription } from 'rxjs';
 
 import {
   CloudFoundrySpaceService,
@@ -18,7 +17,6 @@ import { AppState } from '../../../../../../store/src/app-state';
   styleUrls: ['./card-cf-space-details.component.scss']
 })
 export class CardCfSpaceDetailsComponent implements OnDestroy {
-  allowSshStatus$: Observable<string>;
   quotaLinkSub: Subscription;
 
   constructor(
@@ -26,9 +24,6 @@ export class CardCfSpaceDetailsComponent implements OnDestroy {
     private store: Store<AppState>,
     private router: Router
   ) {
-    this.allowSshStatus$ = cfSpaceService.allowSsh$.pipe(
-      map(status => status === 'false' ? 'Disabled' : 'Enabled')
-    );
   }
 
   goToOrgQuota() {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.html
new file mode 100644
index 0000000000..64b1fd46da
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.html
@@ -0,0 +1,76 @@
+<app-sidepanel-preview [title]="title">
+  <app-tile-grid fit="true">
+    <app-loading-page [isLoading]="detailsLoading$" text="Retrieving details">
+      <app-tile-group>
+        <app-tile>
+          <div class="cf-space-usage">
+            <mat-card>
+              <mat-card-header>
+                <mat-card-title>Summary</mat-card-title>
+              </mat-card-header>
+              <mat-card-content>
+                <app-tile-group class="app-metadata">
+                  <app-tile class="app-metadata__two-cols">
+                    <app-metadata-item label="Description">
+                      {{ cfEndpointService.description$ | async }}
+                    </app-metadata-item>
+                  </app-tile>
+                </app-tile-group>
+                <app-tile-group>
+                  <app-tile>
+                    <app-metadata-item label="Instance Address">
+                      {{ cfEndpointService.apiUrl$ | async }}
+                    </app-metadata-item>
+                    <app-metadata-item label="CF API Version">
+                      {{ (cfEndpointService.info$ | async)?.entity.entity.api_version }}
+                    </app-metadata-item>
+                  </app-tile>
+                  <app-tile class="app-metadata__two-cols">
+                    <app-metadata-item label="Account Username">
+                      {{ (cfEndpointService.endpoint$ | async )?.entity.user.name }}
+                      <span *ngIf="(cfEndpointService.endpoint$ | async )?.entity.user.admin"> (Administrator)</span>
+                    </app-metadata-item>
+                    <app-metadata-item label="SSH Access">
+                      {{ (cfEndpointService.hasSSHAccess$ | async) ? 'Available' : 'Not available' }}
+                    </app-metadata-item>
+                  </app-tile>
+                </app-tile-group>
+              </mat-card-content>
+            </mat-card>
+          </div>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile>
+          <app-card-number-metric [link]="appLink" icon="apps" label="Applications" labelSingular="Application"
+            value="{{ cfEndpointService.appsPagObs.totalEntities$ | async }}"></app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric link="/cloud-foundry/{{cfEndpointService.cfGuid}}/organizations" iconFont="stratos-icons"
+            icon="organization" label="Orgs" labelSingular="Org" value="{{ (cfEndpointService.orgs$ | async)?.length }}">
+          </app-card-number-metric>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile *ngIf="cfEndpointService.usersCount$ | async">
+          <app-card-number-metric link="/cloud-foundry/{{cfEndpointService.cfGuid}}/users" icon="person" label="Users"
+            labelSingular="User" value="{{ cfEndpointService.usersCount$ | async }}"></app-card-number-metric>
+        </app-tile>
+        <app-tile *ngIf="cfEndpointService.appsPagObs.hasEntities$ | async">
+          <app-card-number-metric icon="memory" units="mb" label="Memory Usage"
+            value="{{ cfEndpointService.totalMem$ | async }}"></app-card-number-metric>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile>
+          <app-card-cf-recent-apps *ngIf="!(detailsLoading$ | async)" [allApps$]="cfEndpointService.appsPagObs.entities$"
+            [loading$]="cfEndpointService.appsPagObs.fetchingEntities$" (refresh)="cfEndpointService.fetchApps()">
+          </app-card-cf-recent-apps>
+        </app-tile>
+      </app-tile-group>
+    </app-loading-page>
+  </app-tile-grid>
+</app-sidepanel-preview>
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.spec.ts
new file mode 100644
index 0000000000..ec7a6eb81d
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.spec.ts
@@ -0,0 +1,37 @@
+import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
+import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
+import { LoggerService } from '../../../core/logger.service';
+import { CfEndpointPreviewComponent } from './cf-endpoint-preview.component';
+
+describe('CfEndpointPreviewComponent', () => {
+  let component: CfEndpointPreviewComponent;
+  let fixture: ComponentFixture<CfEndpointPreviewComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [CfEndpointPreviewComponent],
+      providers: [LoggerService, HttpClient, HttpHandler],
+      imports: [
+        HttpClientModule,
+        HttpClientTestingModule,
+        CoreTestingModule,
+        createBasicStoreModule()
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CfEndpointPreviewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.ts
new file mode 100644
index 0000000000..e627eee112
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.ts
@@ -0,0 +1,45 @@
+import { Component } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { combineLatest, Observable } from 'rxjs';
+import { filter, map, startWith } from 'rxjs/operators';
+
+import { PreviewableComponent } from '../../../../../core/src/shared/previewable-component';
+import { CFAppState } from '../../../cf-app-state';
+import { goToAppWall } from '../../../features/cloud-foundry/cf.helpers';
+import { CloudFoundryEndpointService } from '../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
+
+@Component({
+  selector: 'app-cf-endpoint-preview-component',
+  templateUrl: './cf-endpoint-preview.component.html',
+  styleUrls: ['./cf-endpoint-preview.component.scss']
+})
+export class CfEndpointPreviewComponent implements PreviewableComponent {
+
+  title = null;
+  detailsLoading$: Observable<boolean>;
+
+  constructor(
+    public cfEndpointService: CloudFoundryEndpointService,
+    private store: Store<CFAppState>) {
+  }
+
+  appLink() {
+    goToAppWall(this.store, this.cfEndpointService.cfGuid);
+  }
+
+  setProps(props: { [key: string]: any }) {
+    this.title = props.title;
+
+    this.cfEndpointService.initialize(props.cfGuid);
+
+    this.detailsLoading$ = combineLatest([
+      // Wait for the apps to have been fetched, this will determine if multiple small cards are shown or now
+      this.cfEndpointService.appsPagObs.fetchingEntities$.pipe(
+        filter(loading => !loading)
+      ),
+    ]).pipe(
+      map(() => false),
+      startWith(true)
+    );
+  }
+}
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 769b889fa9..05738ad3f1 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
@@ -19,6 +19,7 @@ import { SpecifyDetailsStepComponent } from './add-service-instance/specify-deta
 import {
   SpecifyUserProvidedDetailsComponent,
 } from './add-service-instance/specify-user-provided-details/specify-user-provided-details.component';
+import { ApplicationPreviewComponent } from './application-preview/application-preview.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';
@@ -38,6 +39,7 @@ import {
 } 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 { CfEndpointPreviewComponent } from './cf-endpoint-preview/cf-endpoint-preview.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';
@@ -143,12 +145,14 @@ import {
 import {
   UserProvidedServiceInstanceCardComponent,
 } from './list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component';
+import { OrganizationPreviewComponent } from './organization-preview/organization-preview.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';
+import { SpacePreviewComponent } from './space-preview/space-preview.component';
 
 // tslint:enable:max-line-length
 
@@ -238,7 +242,12 @@ import { ServicePlanPublicComponent } from './service-plan-public/service-plan-p
     TableCellEventActionComponent,
     TableCellEventDetailComponent,
     TableCellUsageComponent,
-    TableCellQuotaComponent
+    TableCellQuotaComponent,
+
+    CfEndpointPreviewComponent,
+    SpacePreviewComponent,
+    OrganizationPreviewComponent,
+    ApplicationPreviewComponent,
   ],
   exports: [
     ServiceIconComponent,
@@ -275,12 +284,22 @@ import { ServicePlanPublicComponent } from './service-plan-public/service-plan-p
     RunningInstancesComponent,
     ServicePlanPublicComponent,
     ServicePlanPriceComponent,
-    CreateApplicationStep1Component
+    CreateApplicationStep1Component,
+
+    CfEndpointPreviewComponent,
+    SpacePreviewComponent,
+    OrganizationPreviewComponent,
+    ApplicationPreviewComponent,
   ],
   entryComponents: [
     CfEndpointDetailsComponent,
     NoServicePlansComponent,
 
+    CfEndpointPreviewComponent,
+    SpacePreviewComponent,
+    OrganizationPreviewComponent,
+    ApplicationPreviewComponent,
+
     AppServiceBindingCardComponent,
     CardAppComponent,
     CfOrgCardComponent,
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 4e0b40a398..31d25e1a8d 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
@@ -2,17 +2,14 @@ import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { combineLatest, filter, map, switchMap } from 'rxjs/operators';
+import { combineLatest, map, switchMap } from 'rxjs/operators';
 
 import { DeleteApplicationInstance } from '../../../../../../../cloud-foundry/src/actions/application.actions';
 import { FetchApplicationMetricsAction } from '../../../../../../../cloud-foundry/src/actions/cf-metrics.actions';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { ApplicationService } from '../../../../../../../cloud-foundry/src/features/applications/application.service';
-import {
-  CloudFoundryEndpointService,
-} from '../../../../../../../cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service';
 import { EntityServiceFactory } from '../../../../../../../core/src/core/entity-service-factory.service';
 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 {
@@ -24,10 +21,12 @@ import {
   IListConfig,
   ListViewTypes,
 } from '../../../../../../../core/src/shared/components/list/list.component.types';
+import { PaginationMonitorFactory } from '../../../../../../../core/src/shared/monitors/pagination-monitor.factory';
 import { MetricQueryType } from '../../../../../../../core/src/shared/services/metrics-range-selector.types';
 import { MetricQueryConfig } from '../../../../../../../store/src/actions/metrics.actions';
 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 { 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';
@@ -199,10 +198,11 @@ export class CfAppInstancesConfigService implements IListConfig<ListAppInstance>
     private router: Router,
     private confirmDialog: ConfirmationDialogService,
     entityServiceFactory: EntityServiceFactory,
-    cfEndpointService: CloudFoundryEndpointService
+    paginationMonitorFactory: PaginationMonitorFactory
   ) {
+    const cellHelper = new CfCellHelper(store, paginationMonitorFactory);
 
-    this.initialised$ = cfEndpointService.hasCellMetrics(appService.cfGuid).pipe(
+    this.initialised$ = cellHelper.hasCellMetrics(appService.cfGuid).pipe(
       map(hasMetrics => {
         if (hasMetrics) {
           this.columns.splice(1, 0, this.cfCellColumn);
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/base-cf/base-cf-list-config.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/base-cf/base-cf-list-config.ts
index d92a018ff8..dbd2be20a1 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/base-cf/base-cf-list-config.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/base-cf/base-cf-list-config.ts
@@ -1,3 +1,5 @@
+import { of } from 'rxjs';
+
 import {
   IListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
@@ -19,4 +21,5 @@ export class BaseCfListConfig<T> implements IListConfig<T> {
   getMultiActions = () => [];
   getSingleActions = () => [];
   getMultiFiltersConfigs = () => [];
+  getInitialised = () => of(true);
 }
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 e01675f771..4c62959ca5 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
@@ -2,8 +2,10 @@
 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 { 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';
@@ -13,10 +15,10 @@ import {
 } from '../../../../../../../core/src/shared/components/list/list-table/table-cell-boolean-indicator/table-cell-boolean-indicator.component';
 import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
 import { ListViewTypes } from '../../../../../../../core/src/shared/components/list/list.component.types';
-import { MetricQueryType } from '../../../../../../../core/src/shared/services/metrics-range-selector.types';
+import { PaginationMonitorFactory } from '../../../../../../../core/src/shared/monitors/pagination-monitor.factory';
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
-import { MetricQueryConfig } from '../../../../../../../store/src/actions/metrics.actions';
 import { FetchCFCellMetricsPaginatedAction } from '../../../../../actions/cf-metrics.actions';
+import { CFAppState } from '../../../../../cf-app-state';
 import {
   CloudFoundryCellService,
 } from '../../../../../features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service';
@@ -37,6 +39,7 @@ export class CfCellHealthListConfigService extends BaseCfListConfig<CfCellHealth
     title: 'Cell Health History',
     noEntries: 'Cell has no health history'
   };
+  private init$: Observable<any>;
 
   private boolIndicatorConfig: TableCellBooleanIndicatorComponentConfig<CfCellHealthEntry> = {
     isEnabled: (row: CfCellHealthEntry) =>
@@ -46,25 +49,28 @@ export class CfCellHealthListConfigService extends BaseCfListConfig<CfCellHealth
     showText: true
   };
 
-  constructor(store: Store<CFAppState>, cloudFoundryCellService: CloudFoundryCellService, private datePipe: DatePipe) {
+  constructor(
+    private store: Store<CFAppState>,
+    cloudFoundryCellService: CloudFoundryCellService,
+    private datePipe: DatePipe,
+    private paginationMonitorFactory: PaginationMonitorFactory) {
     super();
-    const action = this.createMetricsAction(cloudFoundryCellService.cfGuid, cloudFoundryCellService.cellId);
-    this.dataSource = new CfCellHealthDataSource(store, this, action);
+
+    this.init$ = this.createMetricsAction(cloudFoundryCellService.cfGuid, cloudFoundryCellService.cellId).pipe(
+      first(),
+      tap(action => {
+        this.dataSource = new CfCellHealthDataSource(this.store, this, action);
+      })
+    );
     this.showCustomTime = true;
   }
 
-  private createMetricsAction(cfGuid: string, cellId: string): FetchCFCellMetricsPaginatedAction {
-    const action = new FetchCFCellMetricsPaginatedAction(
-      cfGuid,
-      cellId,
-      new MetricQueryConfig(`firehose_value_metric_rep_unhealthy_cell{bosh_job_id="${cellId}"}`, {}),
-      MetricQueryType.QUERY
-    );
-    action.initialParams['order-direction-field'] = 'dateTime';
-    action.initialParams['order-direction'] = 'asc';
-    return action;
+  private createMetricsAction(cfGuid: string, cellId: string): Observable<FetchCFCellMetricsPaginatedAction> {
+    const cellHelper = new CfCellHelper(this.store, this.paginationMonitorFactory);
+    return cellHelper.createCellMetricAction(cfGuid, cellId);
   }
 
+  getInitialised = () => this.init$;
   getColumns = (): ITableColumn<CfCellHealthEntry>[] => [
     {
       columnId: 'dateTime',
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 cf7e8e6512..44190871bf 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,20 +1,17 @@
 import { Store } from '@ngrx/store';
 import { map } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 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 { IMetrics, IMetricVectorResult } from '../../../../../../../store/src/types/base-metric.types';
 import { IMetricCell } from '../../../../../../../store/src/types/metric.types';
 import { FetchCFCellMetricsPaginatedAction } from '../../../../../actions/cf-metrics.actions';
+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>>> {
 
@@ -23,14 +20,11 @@ export class CfCellsDataSource
   static cellHealthyPath = 'value.1';
   static cellDeploymentPath = 'metric.bosh_deployment';
 
-  constructor(store: Store<CFAppState>, cfGuid: string, listConfig: IListConfig<IMetricVectorResult<IMetricCell>>) {
-    const action = new FetchCFCellMetricsPaginatedAction(
-      cfGuid,
-      cfGuid,
-      new MetricQueryConfig('firehose_value_metric_rep_unhealthy_cell', {}),
-      MetricQueryType.QUERY
-    );
-
+  constructor(
+    store: Store<CFAppState>,
+    listConfig: IListConfig<IMetricVectorResult<IMetricCell>>,
+    action: FetchCFCellMetricsPaginatedAction
+  ) {
     super({
       store,
       action,
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 bb03b0907e..6e664f59e2 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,8 +1,11 @@
 // 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';
@@ -12,6 +15,7 @@ import {
 } from '../../../../../../../core/src/shared/components/list/list-table/table-cell-boolean-indicator/table-cell-boolean-indicator.component';
 import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
 import { ListViewTypes } from '../../../../../../../core/src/shared/components/list/list.component.types';
+import { PaginationMonitorFactory } from '../../../../../../../core/src/shared/monitors/pagination-monitor.factory';
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
 import { IMetricVectorResult } from '../../../../../../../store/src/types/base-metric.types';
 import { IMetricCell } from '../../../../../../../store/src/types/metric.types';
@@ -33,6 +37,7 @@ export class CfCellsListConfigService extends BaseCfListConfig<IMetricVectorResu
     filter: 'Search by id',
     noEntries: 'There are no cells'
   };
+  private init$: Observable<any>;
 
   private boolIndicatorConfig: TableCellBooleanIndicatorComponentConfig<IMetricVectorResult<IMetricCell>> = {
     // "0 signifies healthy, and 1 signifies unhealthy"
@@ -98,11 +103,21 @@ export class CfCellsListConfigService extends BaseCfListConfig<IMetricVectorResu
     },
   ];
 
-  constructor(store: Store<CFAppState>, private activeRouteCfCell: ActiveRouteCfCell) {
+  constructor(
+    store: Store<CFAppState>,
+    private activeRouteCfCell: ActiveRouteCfCell,
+    paginationMonitorFactory: PaginationMonitorFactory) {
     super();
-    this.dataSource = new CfCellsDataSource(store, activeRouteCfCell.cfGuid, this);
+    const cellHelper = new CfCellHelper(store, paginationMonitorFactory);
+    this.init$ = cellHelper.createCellMetricAction(activeRouteCfCell.cfGuid).pipe(
+      first(),
+      tap(action => {
+        this.dataSource = new CfCellsDataSource(store, this, action);
+      })
+    );
   }
 
+  getInitialised = () => this.init$;
   getColumns = () => this.columns;
   getDataSource = () => this.dataSource;
 }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.html
new file mode 100644
index 0000000000..6387b13274
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.html
@@ -0,0 +1,102 @@
+<app-sidepanel-preview [title]="title">
+  <app-tile-grid fit="true">
+    <app-loading-page [isLoading]="detailsLoading$" text="Retrieving details">
+      <app-tile-group>
+        <app-tile>
+          <div class="cf-space-usage">
+            <mat-card>
+              <mat-card-header>
+                <mat-card-title>Summary</mat-card-title>
+              </mat-card-header>
+              <mat-card-content>
+                <app-tile-group class="app-metadata">
+                  <app-tile class="app-metadata__two-cols">
+                    <app-metadata-item label="User Org Role">
+                      {{ (cfOrgService.userOrgRole$ | async) }}
+                    </app-metadata-item>
+                    <app-metadata-item label="Quota Definition">
+                      <a [routerLink]="cfOrgService.quotaLink$ | async">
+                        {{ (cfOrgService.quotaDefinition$ | async)?.name }}
+                      </a>
+                    </app-metadata-item>
+                  </app-tile>
+                  <app-tile class="app-metadata__two-cols">
+                    <app-metadata-item label="Provision Paid Services">
+                      <app-boolean-indicator
+                        [isTrue]="(cfOrgService.quotaDefinition$ | async)?.non_basic_services_allowed" type="yes-no">
+                      </app-boolean-indicator>
+                    </app-metadata-item>
+                    <app-metadata-item label="Org Status">
+                      {{ ((cfOrgService.org$ | async)?.entity?.entity?.status) | capitalizeFirst}}
+                    </app-metadata-item>
+                  </app-tile>
+                </app-tile-group>
+              </mat-card-content>
+            </mat-card>
+          </div>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile>
+          <app-card-number-metric
+            link="/cloud-foundry/{{cfOrgService.cfGuid}}/organizations/{{cfOrgService.orgGuid}}/spaces" icon="language"
+            label="Spaces" labelSingular="Space" value="{{ (cfOrgService.spaces$ | async)?.length }}">
+          </app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric [link]="appLink" icon="apps" label="Applications" labelSingular="Application"
+            value="{{ cfOrgService.appCount$ | async }}"></app-card-number-metric>
+        </app-tile>
+        <app-tile *ngIf="cfEndpointService.appsPagObs.hasEntities$ | async">
+          <app-card-number-metric icon="content_copy" label="App Instances"
+            value="{{ cfOrgService.appInstances$ | async }}"
+            limit="{{ (cfOrgService.quotaDefinition$ | async)?.app_instance_limit }}"></app-card-number-metric>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile>
+          <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Routes"
+            value="{{ (cfOrgService.routes$ | async)?.length }}"
+            limit="{{ (cfOrgService.quotaDefinition$ | async)?.total_routes}}"></app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric
+            link="/cloud-foundry/{{cfOrgService.cfGuid}}/organizations/{{cfOrgService.orgGuid}}/users" icon="person"
+            label="Users" labelSingular="User" value="{{ cfOrgService.usersCount$ | async }}">
+          </app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric icon="domain" label="Private Domains"
+            value="{{ (cfOrgService.privateDomains$ | async)?.length }}"
+            limit="{{ (cfOrgService.quotaDefinition$ | async)?.total_private_domains}}"></app-card-number-metric>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile>
+          <app-card-number-metric iconFont="stratos-icons" icon="service" label="Service Instances"
+            value="{{ cfOrgService.serviceInstancesCount$ | async }}"
+            limit="{{ (cfOrgService.quotaDefinition$ | async)?.total_services }}"></app-card-number-metric>
+        </app-tile>
+        <app-tile [hidden]="!cfEndpointService.appsPagObs.hasEntities$ | async">
+          <app-card-number-metric icon="memory" label="Memory Usage" units="mb"
+            value="{{ cfOrgService.totalMem$ | async }}"
+            limit="{{ (cfOrgService.quotaDefinition$ | async)?.memory_limit }}"></app-card-number-metric>
+        </app-tile>
+        <app-tile [hidden]="!(cfOrgService.userProvidedServiceInstancesCount$ | async) > 0">
+          <app-card-number-metric iconFont="stratos-icons" icon="service" label="User Service Instances"
+            value="{{ cfOrgService.userProvidedServiceInstancesCount$ | async }}"></app-card-number-metric>
+        </app-tile>
+      </app-tile-group>
+      <app-tile-group></app-tile-group>
+      <app-tile-group>
+        <app-tile>
+          <app-card-cf-recent-apps *ngIf="!(detailsLoading$ | async)" [allApps$]="cfOrgService.apps$"
+            [loading$]="cfOrgService.loadingApps$" (refresh)="cfOrgService.fetchApps()"></app-card-cf-recent-apps>
+        </app-tile>
+      </app-tile-group>
+    </app-loading-page>
+  </app-tile-grid>
+</app-sidepanel-preview>
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.spec.ts
new file mode 100644
index 0000000000..f753652c8b
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.spec.ts
@@ -0,0 +1,37 @@
+import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
+import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
+import { LoggerService } from '../../../core/logger.service';
+import { OrganizationPreviewComponent } from './organization-preview.component';
+
+describe('OrganizationPreviewComponent', () => {
+  let component: OrganizationPreviewComponent;
+  let fixture: ComponentFixture<OrganizationPreviewComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [OrganizationPreviewComponent],
+      providers: [LoggerService, HttpClient, HttpHandler],
+      imports: [
+        HttpClientModule,
+        HttpClientTestingModule,
+        CoreTestingModule,
+        createBasicStoreModule()
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(OrganizationPreviewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.ts
new file mode 100644
index 0000000000..eec648002b
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.ts
@@ -0,0 +1,50 @@
+import { Component } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { combineLatest, Observable } from 'rxjs';
+import { filter, map, startWith } from 'rxjs/operators';
+
+import { PreviewableComponent } from '../../../../../core/src/shared/previewable-component';
+import { CFAppState } from '../../../cf-app-state';
+import { goToAppWall } from '../../../features/cloud-foundry/cf.helpers';
+import { CloudFoundryEndpointService } from '../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
+import {
+  CloudFoundryOrganizationService,
+} from '../../../features/cloud-foundry/services/cloud-foundry-organization.service';
+
+@Component({
+  selector: 'app-organization-preview-component',
+  templateUrl: './organization-preview.component.html',
+  styleUrls: ['./organization-preview.component.scss']
+})
+export class OrganizationPreviewComponent implements PreviewableComponent {
+
+  title = null;
+  detailsLoading$: Observable<boolean>;
+
+  constructor(
+    public cfEndpointService: CloudFoundryEndpointService,
+    public cfOrgService: CloudFoundryOrganizationService,
+    private store: Store<CFAppState>) {
+  }
+
+  appLink() {
+    goToAppWall(this.store, this.cfOrgService.cfGuid, this.cfOrgService.orgGuid);
+  }
+
+  setProps(props: { [key: string]: any }) {
+    this.title = props.title;
+
+    this.cfEndpointService.initialize(props.cfGuid);
+    this.cfOrgService.initialize(props.cfGuid, props.guid);
+
+    this.detailsLoading$ = combineLatest([
+      // Wait for the apps to have been fetched, this will determine if multiple small cards are shown or now
+      this.cfEndpointService.appsPagObs.fetchingEntities$.pipe(
+        filter(loading => !loading)
+      ),
+    ]).pipe(
+      map(() => false),
+      startWith(true)
+    );
+  }
+}
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.html
new file mode 100644
index 0000000000..a1fe099e86
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.html
@@ -0,0 +1,101 @@
+<app-sidepanel-preview [title]="title">
+  <app-tile-grid fit="true">
+    <app-loading-page [isLoading]="detailsLoading$" text="Retrieving details">
+      <app-tile-group>
+        <app-tile>
+          <div class="cf-space-usage">
+            <mat-card>
+              <mat-card-header>
+                <mat-card-title>Summary</mat-card-title>
+              </mat-card-header>
+              <mat-card-content>
+                <app-tile-group class="app-metadata">
+                  <app-tile class="app-metadata__two-cols">
+                    <app-metadata-item label="User Space Role/s">
+                      {{ (cfSpaceService.userRole$ | async) }}
+                    </app-metadata-item>
+                    <app-metadata-item label="Quota Definition">
+                      <ng-container *ngIf="(cfSpaceService.spaceQuotaDefinition$ | async) as spaceQuotaDefinition; else fallBackQuota">
+                        <a [routerLink]="cfSpaceService.quotaLink$ | async">
+                          {{ spaceQuotaDefinition.name }}
+                        </a>
+                      </ng-container>
+                      <ng-template #fallBackQuota>
+                        None assigned
+                        <span *ngIf="cfSpaceService.quotaDefinition$ | async as quotaDefinition"> - <a [routerLink]=""
+                            (click)="goToOrgQuota($event)">view organization's quota</a>
+                        </span>
+                      </ng-template>
+                    </app-metadata-item>
+                  </app-tile>
+                  <app-tile class="app-metadata__two-cols">
+                    <app-metadata-item label="SSH Access">
+                      {{ cfSpaceService.allowSshStatus$ | async }}
+                    </app-metadata-item>
+                    <app-metadata-item label="Provision Paid Services">
+                      <app-boolean-indicator [isTrue]="(cfSpaceService.quotaDefinition$ | async)?.non_basic_services_allowed" type="yes-no">
+                      </app-boolean-indicator>
+                    </app-metadata-item>
+                  </app-tile>
+                </app-tile-group>
+              </mat-card-content>
+            </mat-card>
+          </div>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile>
+          <app-card-number-metric
+            link="/cloud-foundry/{{cfSpaceService.cfGuid}}/organizations/{{cfSpaceService.orgGuid}}/spaces/{{cfSpaceService.spaceGuid}}/apps"
+            icon="apps" label="Applications" labelSingular="Application" value="{{ cfSpaceService.appCount$ | async }}">
+          </app-card-number-metric>
+        </app-tile>
+        <app-tile *ngIf="cfEndpointService.appsPagObs.hasEntities$ | async">
+          <app-card-number-metric icon="content_copy" label="App Instances"
+            value="{{ (cfSpaceService.appInstances$ | async) }}"
+            limit="{{ (cfSpaceService.quotaDefinition$ | async)?.app_instance_limit}}"></app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric
+            link="/cloud-foundry/{{cfSpaceService.cfGuid}}/organizations/{{cfSpaceService.orgGuid}}/spaces/{{cfSpaceService.spaceGuid}}/routes"
+            iconFont="stratos-icons" icon="network_route" label="Routes"
+            value="{{ (cfSpaceService.routes$ | async)?.length }}"
+            limit="{{ (cfSpaceService.quotaDefinition$ | async)?.total_routes}}"></app-card-number-metric>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile>
+          <app-card-number-metric
+            link="/cloud-foundry/{{cfSpaceService.cfGuid}}/organizations/{{cfSpaceService.orgGuid}}/spaces/{{cfSpaceService.spaceGuid}}/users"
+            icon="person" label="Users" labelSingular="User" value="{{ cfSpaceService.usersCount$ | async }}">
+          </app-card-number-metric>
+        </app-tile>
+        <app-tile>
+          <app-card-number-metric
+            link="/cloud-foundry/{{cfSpaceService.cfGuid}}/organizations/{{cfSpaceService.orgGuid}}/spaces/{{cfSpaceService.spaceGuid}}/service-instances"
+            iconFont="stratos-icons" icon="service" label="Service Instances"
+            value="{{ (cfSpaceService.serviceInstancesCount$ | async)}}"
+            limit="{{ (cfSpaceService.quotaDefinition$ | async)?.total_services }}"></app-card-number-metric>
+        </app-tile>
+        <app-tile *ngIf="(cfSpaceService.userProvidedServiceInstancesCount$ | async) > 0">
+          <app-card-number-metric iconFont="stratos-icons" icon="service" label="User Service Instances"
+            value="5"></app-card-number-metric>
+        </app-tile>
+        <app-tile *ngIf="true">
+          <app-card-number-metric icon="memory" label="Memory Usage" units="mb"
+            value="5"
+            limit="10"></app-card-number-metric>
+        </app-tile>
+      </app-tile-group>
+
+      <app-tile-group>
+        <app-tile>
+          <app-card-cf-recent-apps *ngIf="!(detailsLoading$ | async)" [allApps$]="cfSpaceService.apps$"
+            [loading$]="cfSpaceService.loadingApps$" (refresh)="cfEndpointService.fetchApps()"></app-card-cf-recent-apps>
+        </app-tile>
+      </app-tile-group>
+    </app-loading-page>
+  </app-tile-grid>
+</app-sidepanel-preview>
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.spec.ts
new file mode 100644
index 0000000000..80a547980e
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.spec.ts
@@ -0,0 +1,37 @@
+import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
+import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
+import { LoggerService } from '../../../core/logger.service';
+import { SpacePreviewComponent } from './space-preview.component';
+
+describe('SpacePreviewComponent', () => {
+  let component: SpacePreviewComponent;
+  let fixture: ComponentFixture<SpacePreviewComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [SpacePreviewComponent],
+      providers: [LoggerService, HttpClient, HttpHandler],
+      imports: [
+        HttpClientModule,
+        HttpClientTestingModule,
+        CoreTestingModule,
+        createBasicStoreModule()
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SpacePreviewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.ts
new file mode 100644
index 0000000000..727611d5c9
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.ts
@@ -0,0 +1,47 @@
+import { Component } from '@angular/core';
+import { combineLatest, Observable } from 'rxjs';
+import { delay, filter, map, startWith } from 'rxjs/operators';
+
+import { PreviewableComponent } from '../../../../../core/src/shared/previewable-component';
+import { CloudFoundryEndpointService } from '../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
+import {
+  CloudFoundryOrganizationService,
+} from '../../../features/cloud-foundry/services/cloud-foundry-organization.service';
+import { CloudFoundrySpaceService } from '../../../features/cloud-foundry/services/cloud-foundry-space.service';
+
+@Component({
+  selector: 'app-space-preview-component',
+  templateUrl: './space-preview.component.html',
+  styleUrls: ['./space-preview.component.scss']
+})
+export class SpacePreviewComponent implements PreviewableComponent {
+
+  title = null;
+  detailsLoading$: Observable<boolean>;
+
+  constructor(
+    public cfEndpointService: CloudFoundryEndpointService,
+    private cfOrgService: CloudFoundryOrganizationService,
+    public cfSpaceService: CloudFoundrySpaceService) {
+  }
+
+  setProps(props: { [key: string]: any }) {
+    this.title = props.title;
+
+    this.cfEndpointService.initialize(props.cfGuid);
+    this.cfOrgService.initialize(props.cfGuid, props.orgGuid);
+    this.cfSpaceService.initialize(props.cfGuid, props.orgGuid, props.guid);
+
+    this.detailsLoading$ = combineLatest([
+      // Wait for the apps to have been fetched, this will determine if multiple small cards are shown or now
+      this.cfEndpointService.appsPagObs.fetchingEntities$.pipe(
+        filter(loading => !loading)
+      ),
+      this.cfSpaceService.userProvidedServiceInstancesCount$
+    ]).pipe(
+      map(() => false),
+      delay(50000),
+      startWith(true)
+    );
+  }
+}
diff --git a/src/frontend/packages/core/misc/custom/custom.scss b/src/frontend/packages/core/misc/custom/custom.scss
index eb5d596b7e..f6d83b743c 100644
--- a/src/frontend/packages/core/misc/custom/custom.scss
+++ b/src/frontend/packages/core/misc/custom/custom.scss
@@ -3,4 +3,3 @@
 // This file is in the .gitignore - changes will not be flagged
 
 // The customization build step will replace this file with the custom one if provided
-
diff --git a/src/frontend/packages/core/sass/_all-theme.scss b/src/frontend/packages/core/sass/_all-theme.scss
index 184dc594e9..e791afd5a3 100644
--- a/src/frontend/packages/core/sass/_all-theme.scss
+++ b/src/frontend/packages/core/sass/_all-theme.scss
@@ -32,6 +32,7 @@
 @import '../src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component.theme';
 @import '../src/shared/components/upload-progress-indicator/upload-progress-indicator.component.theme';
 @import '../src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.theme';
+@import '../src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.theme';
 @import '../src/shared/components/start-end-date/start-end-date.component.theme';
 @import '../src/shared/components/metrics-chart/metrics-chart.component.theme';
 @import '../src/shared/components/metrics-range-selector/metrics-range-selector.component.theme';
@@ -40,8 +41,9 @@
 @import '../src/shared/components/multiline-title/multiline-title.component.theme';
 @import '../src/features/user-profile/profile-info/profile-info.component.theme';
 @import '../src/core/stateful-icon/stateful-icon.component.theme';
-@import '../src/shared/components/markdown-preview/markdown-preview.component.theme';
-@import './components/mat-tabs.theme';
+@import '../src/shared/components/sidepanel-preview/sidepanel-preview.component.theme';
+@import './components/mat-snack-bar.theme';
+@import './components/ngx-charts-gauge.theme';
 @import './components/text-status.theme';
 @import './components/hyperlinks.theme';
 @import './mat-themes';
@@ -82,12 +84,10 @@ $side-nav-light-active: #484848;
   $warn: map-get($theme, warn);
   $subdued: mat-contrast($primary, 50);
 
-  @if $is-dark==true {
+  @if $is-dark == true {
     $app-background-color: lighten(mat-color($background-colors, background), 10%);
-    $subdued: darken($subdued, 50);
-  }
-
-  @else {
+    $subdued: lighten($subdued, 90);
+  } @else {
     $app-background-color: darken(mat-color($background-colors, background), 2%);
     $subdued: lighten($subdued, 50);
   }
@@ -106,7 +106,8 @@ $side-nav-light-active: #484848;
   @include steppers-theme($theme, $app-theme);
   @include list-theme($theme, $app-theme);
   @include app-base-page-theme($theme, $app-theme);
-  @include app-mat-tabs-theme($theme, $app-theme);
+  @include app-mat-snack-bar-theme($theme, $app-theme);
+  @include ngx-charts-gauge($theme, $app-theme);
   @include app-text-status-theme($theme, $app-theme);
   @include app-card-status-theme($theme, $app-theme);
   @include app-usage-gauge-theme($theme, $app-theme);
@@ -138,26 +139,24 @@ $side-nav-light-active: #484848;
   @include metrics-chart-theme($theme, $app-theme);
   @include metrics-range-selector-theme($theme, $app-theme);
   @include app-multiline-title-theme($theme, $app-theme);
-  @include app-markdown-preview-theme($theme, $app-theme);
+  @include app-sidepanel-preview-theme($theme, $app-theme);
   @include tile-selector-theme($theme, $app-theme);
   @include profile-page-theme($theme, $app-theme);
   @include stateful-icon($theme, $app-theme);
-  @include app-markdown-preview-theme($theme, $app-theme);
   @include app-simple-usage-chart($theme, $app-theme);
   @include home-page-theme($theme, $app-theme);
   @include favorites-global-list-theme($theme, $app-theme);
   @include page-side-nav-theme($theme, $app-theme);
   @include cf-admin-add-user-warning($theme, $app-theme);
   @include entity-summary-title-theme($theme, $app-theme);
+  @include app-meta-card-item-theme($theme, $app-theme);
   @include error-page-theme($theme, $app-theme);
 }
 
 @function app-generate-nav-theme($theme, $nav-theme: null) {
   @if ($nav-theme) {
     @return $nav-theme;
-  }
-
-  @else {
+  } @else {
     // Use default palette for side navigation
     @return (background: $side-nav-light-bg, background-top: $side-nav-light-bg, text: darken($side-nav-light-text, 10%), active: $side-nav-light-active, active-text: $side-nav-light-text, hover: $side-nav-light-hover, hover-text: $side-nav-light-text);
   }
@@ -166,9 +165,7 @@ $side-nav-light-active: #484848;
 @function app-generate-status-theme($theme, $status-theme: null) {
   @if ($status-theme) {
     @return $status-theme;
-  }
-
-  @else {
+  } @else {
     $warn: map-get($theme, warn);
     $primary: map-get($theme, primary);
     $white: #fff; // Use default palette for status
diff --git a/src/frontend/packages/core/sass/components/mat-button-toggle-group.scss b/src/frontend/packages/core/sass/components/mat-button-toggle-group.scss
new file mode 100644
index 0000000000..855e7902d3
--- /dev/null
+++ b/src/frontend/packages/core/sass/components/mat-button-toggle-group.scss
@@ -0,0 +1,7 @@
+
+.mat-button-toggle-group.toolbar {
+  .mat-button-toggle-appearance-standard .mat-button-toggle-label-content {
+    font-size: 14px;
+    line-height: 30px;
+  }
+}
diff --git a/src/frontend/packages/core/sass/components/mat-snack-bar.theme.scss b/src/frontend/packages/core/sass/components/mat-snack-bar.theme.scss
new file mode 100644
index 0000000000..536d6434d7
--- /dev/null
+++ b/src/frontend/packages/core/sass/components/mat-snack-bar.theme.scss
@@ -0,0 +1,20 @@
+@mixin app-mat-snack-bar-theme($theme, $app-theme) {
+  $is-dark: map-get($theme, is-dark);
+  $background-colors: map-get($theme, background);
+  $foreground-colors: map-get($theme, foreground);
+
+  $background-color: mat-color($foreground-colors, text);
+  $color: mat-color($background-colors, text);
+
+  @if $is-dark == true {
+    $background-color: lighten(mat-color($background-colors, background), 5%);
+    $color: mat-color($foreground-colors, text);
+  }
+
+  .mat-snack-bar-container {
+    background-color: $background-color;
+    .mat-simple-snackbar {
+      color: $color;
+    }
+  }
+}
diff --git a/src/frontend/packages/core/sass/components/mat-tabs.theme.scss b/src/frontend/packages/core/sass/components/mat-tabs.theme.scss
deleted file mode 100644
index 29f7023533..0000000000
--- a/src/frontend/packages/core/sass/components/mat-tabs.theme.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-// Fix the color of the underline for the active tab
-// when on a primary backgrdound
-// Need to revist this and check if this is an issue with the Angular Material library
-@mixin app-mat-tabs-theme($theme, $app-theme) {
-  $is-dark: map-get($theme, is-dark);
-  $primary: map-get($theme, primary);
-  $tabs-ink-color: mat-color($primary);
-  @if $is-dark == true {
-    $tabs-ink-color: lighten($tabs-ink-color, 20%);
-  } @else {
-    $tabs-ink-color: darken($tabs-ink-color, 20%);
-  }
-
-  .mat-tab-nav-bar.mat-primary.mat-background-primary {
-    .mat-ink-bar {
-      //background-color: $tabs-ink-color;
-    }
-
-  }
-}
diff --git a/src/frontend/packages/core/sass/components/ngx-charts-gauge.theme.scss b/src/frontend/packages/core/sass/components/ngx-charts-gauge.theme.scss
new file mode 100644
index 0000000000..f049f1b82f
--- /dev/null
+++ b/src/frontend/packages/core/sass/components/ngx-charts-gauge.theme.scss
@@ -0,0 +1,6 @@
+@mixin ngx-charts-gauge($theme, $app-theme) {
+  $foreground-colors: map-get($theme, foreground);
+  ngx-charts-chart text:not(.no-style) {
+    fill: mat-color($foreground-colors, text);
+  }
+}
diff --git a/src/frontend/packages/core/sass/components/text-status.theme.scss b/src/frontend/packages/core/sass/components/text-status.theme.scss
index bfd0ec037a..f30b1de267 100644
--- a/src/frontend/packages/core/sass/components/text-status.theme.scss
+++ b/src/frontend/packages/core/sass/components/text-status.theme.scss
@@ -23,4 +23,22 @@
     color: $status-tentative;
   }
 
+  // Border colors
+
+  .border-success {
+    border-color: $status-success;
+  }
+
+  .border-warning {
+    border-color: $status-warning;
+  }
+
+  .border-danger {
+    border-color: $status-danger;
+  }
+
+  .border-tentative {
+    border-color: $status-tentative;
+  }  
+
 }
diff --git a/src/frontend/packages/core/sass/theme.scss b/src/frontend/packages/core/sass/theme.scss
index eb3e41787c..ed6428d931 100644
--- a/src/frontend/packages/core/sass/theme.scss
+++ b/src/frontend/packages/core/sass/theme.scss
@@ -6,18 +6,38 @@
 // Custom theme support
 @import './custom';
 
-// Themes palettes and colors
-$oss-theme-primary: mat-palette($mat-blue);
-$oss-theme-accent: mat-palette($mat-blue);
-$oss-theme-warn: mat-palette($mat-red);
-$oss-theme: mat-light-theme($oss-theme-primary, $oss-theme-accent, $oss-theme-warn);
+.dark-theme {
+  // Dark Theme defaults
+  $dark-primary: mat-palette($mat-blue);
+  $dark-accent: mat-palette($mat-amber, A400, A100, A700);
+  $dark-warn: mat-palette($mat-red);
+  $dark-theme: mat-dark-theme($dark-primary, $dark-accent, $dark-warn);
 
-// Default to using the open source theme
-$stratos-theme: $oss-theme !default;
-$stratos-nav-theme: null !default;
-$stratos-status-theme: null !default;
+  $stratos-dark-theme: $dark-theme !default;
+  $stratos-dark-nav-theme: null !default;
+  $stratos-dark-status-theme: null !default;
+
+  @include angular-material-theme($stratos-dark-theme);
+  @include app-theme($stratos-dark-theme, $stratos-dark-nav-theme, $stratos-dark-status-theme);
+}
+
+.default {
+  // Themes palettes and colors
+  $oss-theme-primary: mat-palette($mat-blue);
+  $oss-theme-accent: mat-palette($mat-blue);
+  $oss-theme-warn: mat-palette($mat-red);
+  $oss-theme: mat-light-theme($oss-theme-primary, $oss-theme-accent, $oss-theme-warn);
+
+  // Default to using the open source theme
+  $stratos-theme: $oss-theme !default;
+  $stratos-nav-theme: null !default;
+  $stratos-status-theme: null !default;
+
+  @include angular-material-theme($stratos-theme);
+  @include app-theme($stratos-theme, $stratos-nav-theme, $stratos-status-theme);
+}
+
+$stratos-dark-theme-supported: true !default;
 
 // Create the theme
-@include mat-core();
-@include angular-material-theme($stratos-theme);
-@include app-theme($stratos-theme, $stratos-nav-theme, $stratos-status-theme);
+@include mat-core;
diff --git a/src/frontend/packages/core/src/api-driven-views/components/api-type-selector/api-entity-type-selector.component.spec.ts b/src/frontend/packages/core/src/api-driven-views/components/api-type-selector/api-entity-type-selector.component.spec.ts
index 9f538b0477..b54398c933 100644
--- a/src/frontend/packages/core/src/api-driven-views/components/api-type-selector/api-entity-type-selector.component.spec.ts
+++ b/src/frontend/packages/core/src/api-driven-views/components/api-type-selector/api-entity-type-selector.component.spec.ts
@@ -3,15 +3,15 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ApiEntityType } from '../../api-drive-views.types';
 import { SharedModule } from '../../../shared/shared.module';
 import { ApiEntityTypeSelectorComponent } from './api-entity-type-selector.component';
+import { ApiDrivenViewsModule } from '../../api-driven-views.module';
 
-fdescribe('ApiEntityTypeSelectorComponent', () => {
+describe('ApiEntityTypeSelectorComponent', () => {
   let component: ApiEntityTypeSelectorComponent;
   let fixture: ComponentFixture<ApiEntityTypeSelectorComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ApiEntityTypeSelectorComponent],
-      imports: [SharedModule]
+      imports: [SharedModule, ApiDrivenViewsModule]
     })
       .compileComponents();
   }));
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 46d0bff541..8edb118f05 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
@@ -1,6 +1,14 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ApiEndpointSelectPageComponent } from './api-endpoint-select-page.component';
+import { SharedModule } from '../../../shared/shared.module';
+import { ApiDrivenViewsModule } from '../../api-driven-views.module';
+import { CoreModule } from '../../../core/core.module';
+import { RouterTestingModule } from '@angular/router/testing';
+import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
+import { TabNavService } from '../../../../tab-nav.service';
+import { EntityCatalogueModule } from '../../../core/entity-catalogue.module';
+import { generateStratosEntities } from '../../../base-entity-types';
 
 describe('ApiEndpointSelectPageComponent', () => {
   let component: ApiEndpointSelectPageComponent;
@@ -8,9 +16,17 @@ describe('ApiEndpointSelectPageComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ ApiEndpointSelectPageComponent ]
+      imports: [
+        EntityCatalogueModule.forFeature(generateStratosEntities),
+        CoreModule,
+        RouterTestingModule,
+        SharedModule,
+        createBasicStoreModule(),
+        ApiDrivenViewsModule,
+      ],
+      providers: [TabNavService]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-select-page/api-endpoint-select-page.component.ts b/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-select-page/api-endpoint-select-page.component.ts
index 7bf4a74a36..4e0374aa43 100644
--- a/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-select-page/api-endpoint-select-page.component.ts
+++ b/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-select-page/api-endpoint-select-page.component.ts
@@ -5,7 +5,7 @@ import { ApiEntityType } from '../../api-drive-views.types';
 import { Store } from '@ngrx/store';
 import { connectedEndpointsOfTypesSelector } from '../../../../../store/src/selectors/endpoint.selectors';
 import { ActivatedRoute, Router } from '@angular/router';
-import { map } from 'rxjs/operators';
+import { map, filter } from 'rxjs/operators';
 
 @Component({
   selector: 'app-api-endpoint-select-page',
@@ -26,7 +26,9 @@ export class ApiEndpointSelectPageComponent implements OnInit {
     const endpointType = this.route.snapshot.params.endpointType;
 
     this.connectedEndpointsOfType$ = this.store.select(connectedEndpointsOfTypesSelector(endpointType)).pipe(
-      map(endpoints => Object.values(endpoints).map(endpoint => new ApiEntityType(
+      map(endpointsMap => Object.values(endpointsMap)),
+      filter(endpoints => !!endpoints || !endpoints.length),
+      map(endpoints => endpoints.map(endpoint => new ApiEntityType(
         endpoint.guid,
         endpoint.name
         //  TODO Get icon from entity catalogue
diff --git a/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.spec.ts b/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.spec.ts
index f07f695835..ccf3a5249f 100644
--- a/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.spec.ts
+++ b/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.spec.ts
@@ -2,6 +2,15 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ApiEndpointTypeSelectPageComponent } from './api-endpoint-type-select-page.component';
 import { ApiDrivenViewsModule } from '../../api-driven-views.module';
+import { StoreModule } from '@ngrx/store';
+import { appReducers } from '../../../../../store/src/reducers.module';
+import { RouterTestingModule } from '@angular/router/testing';
+import { CoreModule } from '../../../core/core.module';
+import { SharedModule } from '../../../shared/shared.module';
+import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
+import { TabNavService } from '../../../../tab-nav.service';
+import { EntityCatalogueModule } from '../../../core/entity-catalogue.module';
+import { generateStratosEntities } from '../../../base-entity-types';
 
 describe('ApiEndpointTypeSelectPageComponent', () => {
   let component: ApiEndpointTypeSelectPageComponent;
@@ -9,7 +18,15 @@ describe('ApiEndpointTypeSelectPageComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [ApiDrivenViewsModule]
+      imports: [
+        EntityCatalogueModule.forFeature(generateStratosEntities),
+        CoreModule,
+        RouterTestingModule,
+        SharedModule,
+        createBasicStoreModule(),
+        ApiDrivenViewsModule,
+      ],
+      providers: [TabNavService]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.html b/src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.html
index 24546a949b..56a5ebb7f1 100644
--- a/src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.html
+++ b/src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.html
@@ -1 +1 @@
-<app-simple-list [catalogueEntity]="catalogueEntity"></app-simple-list>
\ No newline at end of file
+<app-simple-list *ngIf="catalogueEntity" [catalogueEntity]="catalogueEntity"></app-simple-list>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.spec.ts b/src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.spec.ts
index 8469756c7d..340228d85c 100644
--- a/src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.spec.ts
+++ b/src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.spec.ts
@@ -1,6 +1,13 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ApiEntityListPageComponent } from './api-entity-list-page.component';
+import { ApiDrivenViewsModule } from '../../api-driven-views.module';
+import { RouterTestingModule } from '@angular/router/testing';
+import { EntityCatalogueModule } from '../../../core/entity-catalogue.module';
+import { generateStratosEntities } from '../../../base-entity-types';
+import { CoreModule } from '../../../core/core.module';
+import { SharedModule } from '../../../shared/shared.module';
+import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
 
 describe('ApiEntityListPageComponent', () => {
   let component: ApiEntityListPageComponent;
@@ -8,9 +15,16 @@ describe('ApiEntityListPageComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ ApiEntityListPageComponent ]
+      imports: [
+        EntityCatalogueModule.forFeature(generateStratosEntities),
+        CoreModule,
+        RouterTestingModule,
+        SharedModule,
+        createBasicStoreModule(),
+        ApiDrivenViewsModule,
+      ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
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 3458579617..8b2b897a91 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
@@ -15,7 +15,7 @@ export class ApiEntityListPageComponent implements OnInit {
   ) { }
 
   ngOnInit() {
-    const endpointType = this.route.parent.snapshot.params.endpointType;
+    const endpointType = this.route.parent ? this.route.parent.snapshot.params.endpointType : null;
     const entityType = this.route.snapshot.params.entityType;
     this.catalogueEntity = entityCatalogue.getEntity(endpointType, entityType);
   }
diff --git a/src/frontend/packages/core/src/api-driven-views/features/api-entity-type-select-page/api-entity-type-select-page.component.spec.ts b/src/frontend/packages/core/src/api-driven-views/features/api-entity-type-select-page/api-entity-type-select-page.component.spec.ts
index 257136f53e..1dcdf1be51 100644
--- a/src/frontend/packages/core/src/api-driven-views/features/api-entity-type-select-page/api-entity-type-select-page.component.spec.ts
+++ b/src/frontend/packages/core/src/api-driven-views/features/api-entity-type-select-page/api-entity-type-select-page.component.spec.ts
@@ -1,6 +1,14 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ApiEntityTypeSelectPageComponent } from './api-entity-type-select-page.component';
+import { ApiDrivenViewsModule } from '../../api-driven-views.module';
+import { RouterTestingModule } from '@angular/router/testing';
+import { EntityCatalogueModule } from '../../../core/entity-catalogue.module';
+import { generateStratosEntities } from '../../../base-entity-types';
+import { CoreModule } from '../../../core/core.module';
+import { SharedModule } from '../../../shared/shared.module';
+import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
+import { TabNavService } from '../../../../tab-nav.service';
 
 describe('ApiEntityTypeSelectPageComponent', () => {
   let component: ApiEntityTypeSelectPageComponent;
@@ -8,9 +16,17 @@ describe('ApiEntityTypeSelectPageComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ ApiEntityTypeSelectPageComponent ]
+      imports: [
+        EntityCatalogueModule.forFeature(generateStratosEntities),
+        CoreModule,
+        RouterTestingModule,
+        SharedModule,
+        createBasicStoreModule(),
+        ApiDrivenViewsModule,
+      ],
+      providers: [TabNavService]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
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 0a9d57966c..f0dce95d7c 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
@@ -32,13 +32,14 @@ export class ApiEntityTypeSelectPageComponent implements OnInit {
     const endpointEntity = entityCatalogue.getEndpoint(endpointType);
     const endpointEntities = entityCatalogue.getAllEntitiesForEndpointType(endpointType);
     const entitiesWithGetMultiple = endpointEntities.filter(
-      entity => entity.definition.tableConfig && entity.actionOrchestrator.hasActionBuilder('getMultiple')
+      entity => entity && entity.definition.tableConfig && entity.actionOrchestrator.hasActionBuilder('getMultiple')
     );
     this.connectedEndpointsOfType$ = this.store.select(connectedEndpointsOfTypesSelector(endpointType)).pipe(
       map(endpoints => endpoints[endpointGuid] ? endpoints[endpointGuid].name : 'Entities')
     );
-
-    this.tabNavService.setHeader(endpointEntity.definition.label);
+    if (endpointEntity) {
+      this.tabNavService.setHeader(endpointEntity.definition.label);
+    }
     this.tabs = entitiesWithGetMultiple.map(entity => {
       return {
         link: entity.type,
diff --git a/src/frontend/packages/core/src/app.component.html b/src/frontend/packages/core/src/app.component.html
index 192fe40149..16017c9762 100644
--- a/src/frontend/packages/core/src/app.component.html
+++ b/src/frontend/packages/core/src/app.component.html
@@ -1,2 +1,5 @@
-<router-outlet></router-outlet>
-<div class="user-id" *ngIf="userId$ | async as userId" id="__stratos-userid__">{{userId}}</div>
\ No newline at end of file
+<span [ngClass]="(themeService.getTheme() | async).styleName">
+
+  <router-outlet></router-outlet>
+  <div class="user-id" *ngIf="userId$ | async as userId" id="__stratos-userid__">{{userId}}</div>
+</span>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/app.component.ts b/src/frontend/packages/core/src/app.component.ts
index 62df36b02f..5dce6095bc 100644
--- a/src/frontend/packages/core/src/app.component.ts
+++ b/src/frontend/packages/core/src/app.component.ts
@@ -4,6 +4,7 @@ import { Observable } from 'rxjs';
 import { create } from 'rxjs-spy';
 
 import { AuthOnlyAppState } from '../../store/src/app-state';
+import { ThemeService } from './core/theme.service';
 import { environment } from './environments/environment';
 import { LoggedInService } from './logged-in.service';
 
@@ -20,7 +21,8 @@ export class AppComponent implements OnInit, OnDestroy, AfterContentInit {
 
   constructor(
     private loggedInService: LoggedInService,
-    store: Store<AuthOnlyAppState>
+    store: Store<AuthOnlyAppState>,
+    public themeService: ThemeService
   ) {
     // We use the username to key the session storage. We could replace this with the users id?
     this.userId$ = store.select(state => state.auth.sessionData && state.auth.sessionData.user ? state.auth.sessionData.user.name : null);
diff --git a/src/frontend/packages/core/src/app.module.ts b/src/frontend/packages/core/src/app.module.ts
index 81584b7822..f890b35e56 100644
--- a/src/frontend/packages/core/src/app.module.ts
+++ b/src/frontend/packages/core/src/app.module.ts
@@ -47,6 +47,7 @@ import { FavoritesConfigMapper } from './shared/components/favorites-meta-card/f
 import { endpointEventKey, GlobalEventData, GlobalEventService } from './shared/global-events.service';
 import { SharedModule } from './shared/shared.module';
 import { XSRFModule } from '../xsrf.module';
+import { PanelPreviewService } from './shared/services/panel-preview.service';
 
 // Create action for router navigation. See
 // - https://github.com/ngrx/platform/issues/68
@@ -110,6 +111,7 @@ export class CustomRouterStateSerializer
     LoggedInService,
     ExtensionService,
     DynamicExtensionRoutes,
+    PanelPreviewService,
     { provide: GITHUB_API_URL, useFactory: getGitHubAPIURL },
     { provide: RouterStateSerializer, useClass: CustomRouterStateSerializer }, // Create action for router navigation
     { provide: RouteReuseStrategy, useClass: CustomReuseStrategy }
diff --git a/src/frontend/packages/core/src/base-entity-schemas.ts b/src/frontend/packages/core/src/base-entity-schemas.ts
index 6a1f2c9ee8..4242afd616 100644
--- a/src/frontend/packages/core/src/base-entity-schemas.ts
+++ b/src/frontend/packages/core/src/base-entity-schemas.ts
@@ -1,13 +1,14 @@
 import {
   endpointSchemaKey,
   entityFactory,
+  systemInfoSchemaKey,
   userFavouritesSchemaKey,
   userProfileSchemaKey,
-  systemInfoSchemaKey,
 } from '../../store/src/helpers/entity-factory';
 import { EntitySchema } from '../../store/src/helpers/entity-schema';
 
 export const STRATOS_ENDPOINT_TYPE = 'stratos';
+export const ENDPOINT_TYPE = 'endpoint';
 
 class StratosEntitySchema extends EntitySchema {
   constructor(entityType: string) {
diff --git a/src/frontend/packages/core/src/core/endpoints.service.ts b/src/frontend/packages/core/src/core/endpoints.service.ts
index 1195cdeb90..7a887277c1 100644
--- a/src/frontend/packages/core/src/core/endpoints.service.ts
+++ b/src/frontend/packages/core/src/core/endpoints.service.ts
@@ -2,18 +2,15 @@ import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { filter, first, map, skipWhile, withLatestFrom } from 'rxjs/operators';
+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 { AuthState } from '../../../store/src/reducers/auth.reducer';
-import {
-  endpointEntitiesSelector,
-  endpointsEntityRequestDataSelector,
-  endpointStatusSelector,
-} from '../../../store/src/selectors/endpoint.selectors';
+import { endpointEntitiesSelector, endpointStatusSelector } from '../../../store/src/selectors/endpoint.selectors';
 import { EndpointModel, EndpointState } from '../../../store/src/types/endpoint.types';
 import { EndpointHealthCheck, EndpointHealthChecks } from '../../endpoints-health-checks';
+import { endpointHasMetricsByAvailable } from '../features/endpoints/endpoint-helpers';
 import { entityCatalogue } from './entity-catalogue/entity-catalogue.service';
 import { UserService } from './user.service';
 
@@ -121,11 +118,7 @@ export class EndpointsService implements CanActivate {
   }
 
   hasMetrics(endpointId: string): Observable<boolean> {
-    return this.store.select(endpointsEntityRequestDataSelector(endpointId)).pipe(
-      filter(endpoint => !!endpoint),
-      map(endpoint => endpoint.metricsAvailable),
-      first()
-    );
+    return endpointHasMetricsByAvailable(this.store, endpointId);
   }
 
   doesNotHaveConnectedEndpointType(type: string): Observable<boolean> {
diff --git a/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue-entity.ts b/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue-entity.ts
index bfe12dbd77..4ca21ea92d 100644
--- a/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue-entity.ts
+++ b/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue-entity.ts
@@ -1,9 +1,8 @@
 import { ActionReducer, Store } from '@ngrx/store';
-import { normalize } from 'normalizr';
 
 import { AppState, IRequestEntityTypeState } from '../../../../store/src/app-state';
+import { EntityPipelineEntity, stratosEndpointGuidKey } from '../../../../store/src/entity-request-pipeline/pipeline.types';
 import { EntitySchema } from '../../../../store/src/helpers/entity-schema';
-import { NormalizedResponse } from '../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
 import { APISuccessOrFailedAction, EntityRequestAction } from '../../../../store/src/types/request.types';
 import { IEndpointFavMetadata } from '../../../../store/src/types/user-favorites.types';
@@ -28,7 +27,6 @@ import {
   IStratosEntityDefinition,
   StratosEndpointExtensionDefinition,
 } from './entity-catalogue.types';
-import { EntityPipelineEntity, stratosEndpointGuidKey } from '../../../../store/src/entity-request-pipeline/pipeline.types';
 
 export interface EntityCatalogueBuilders<
   T extends IEntityMetadata = IEntityMetadata,
@@ -89,8 +87,8 @@ export class StratosBaseCatalogueEntity<
       }
       return newSchema;
     }, {
-        default: entitySchemas.default
-      });
+      default: entitySchemas.default
+    });
   }
 
   private getEndpointType(definition: IStratosBaseEntityDefinition) {
@@ -217,13 +215,6 @@ export class StratosBaseCatalogueEntity<
 
   }
 
-  public getNormalizedEntityData(entities: Y | Y[], schemaKey?: string): NormalizedResponse<Y> {
-    const schema = this.getSchema(schemaKey);
-    if (Array.isArray(entities)) {
-      return normalize(entities, [schema]);
-    }
-    return normalize(entities, schema);
-  }
 }
 
 export class StratosCatalogueEntity<
@@ -263,7 +254,9 @@ export class StratosCatalogueEndpointEntity extends StratosBaseCatalogueEntity<I
   public definition: IStratosEndpointDefinition<EntityCatalogueSchemas>;
   constructor(
     entity: StratosEndpointExtensionDefinition | IStratosEndpointDefinition,
-    getLink?: (metadata: IEndpointFavMetadata) => string
+    getLink?: (metadata: IEndpointFavMetadata) => string,
+    // TODO find a way to attach this to PreviewableComponent
+    getPreviewableComponent?: () => object
   ) {
     const fullEntity = {
       ...entity,
@@ -274,7 +267,8 @@ export class StratosCatalogueEndpointEntity extends StratosBaseCatalogueEntity<I
     super(fullEntity, {
       entityBuilder: {
         ...StratosCatalogueEndpointEntity.baseEndpointRender,
-        getLink: getLink || StratosCatalogueEndpointEntity.baseEndpointRender.getLink
+        getLink: getLink || StratosCatalogueEndpointEntity.baseEndpointRender.getLink,
+        getPreviewableComponent,
       }
     });
   }
diff --git a/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.types.ts b/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.types.ts
index ebcd47166a..6e948950f9 100644
--- a/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.types.ts
+++ b/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.types.ts
@@ -1,5 +1,7 @@
+import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 
+import { GeneralEntityAppState } from '../../../../store/src/app-state';
 import {
   ApiErrorMessageHandler,
   PreApiRequest,
@@ -13,8 +15,6 @@ import { EntitySchema } from '../../../../store/src/helpers/entity-schema';
 import { StratosStatus } from '../../shared/shared.types';
 import { EndpointAuthTypeConfig } from '../extension/extension-types';
 import { Omit } from '../utils.service';
-import { GeneralEntityAppState } from '../../../../store/src/app-state';
-import { Store } from '@ngrx/store';
 
 export interface EntityCatalogueEntityConfig {
   entityType: string;
@@ -149,6 +149,8 @@ export interface IStratosEntityBuilder<T extends IEntityMetadata, Y = any> {
   getStatusObservable?(entity: Y): Observable<StratosStatus>;
   // TODO This should be used in the entities schema.
   getGuid(entityMetadata: T): string;
+  // TODO find a way to attach this to PreviewableComponent
+  getPreviewableComponent?(): object;
   getLink?(entityMetadata: T): string;
   getLines?(): EntityRowBuilder<T>[];
   getSubTypeLabels?(entityMetadata: T): {
diff --git a/src/frontend/packages/core/src/core/log-out-dialog/log-out-dialog.component.ts b/src/frontend/packages/core/src/core/log-out-dialog/log-out-dialog.component.ts
index 1d5262a97c..477fc342d5 100644
--- a/src/frontend/packages/core/src/core/log-out-dialog/log-out-dialog.component.ts
+++ b/src/frontend/packages/core/src/core/log-out-dialog/log-out-dialog.component.ts
@@ -19,21 +19,22 @@ export class LogOutDialogComponent implements OnInit, OnDestroy {
     private store: Store<GeneralEntityAppState>) { }
 
   private autoLogout: Subscription;
-  public countDown: number;
-  public countdownTotal: number;
+  private countDown: number;
+  private countdownTotal: number;
   public percentage = 0;
 
   ngOnInit() {
     const updateInterval = 500;
-    this.countdownTotal = this.countDown = this.data.expiryDate - Date.now();
+    this.countdownTotal = this.calcCountdown();
     this.autoLogout = interval(updateInterval)
       .pipe(
         tap(() => {
+          // Recalculate this every time, as `interval` slows down when tab not focused
+          this.countDown = this.calcCountdown();
           if (this.countDown <= 0) {
             this.autoLogout.unsubscribe();
             this.store.dispatch(new Logout());
           } else {
-            this.countDown -= updateInterval;
             this.percentage = ((this.countdownTotal - this.countDown) / this.countdownTotal) * 100;
           }
         })
@@ -44,4 +45,8 @@ export class LogOutDialogComponent implements OnInit, OnDestroy {
     this.percentage = 0;
     this.autoLogout.unsubscribe();
   }
+
+  private calcCountdown(): number {
+    return this.data.expiryDate - Date.now();
+  }
 }
diff --git a/src/frontend/packages/core/src/core/page-visible.ts b/src/frontend/packages/core/src/core/page-visible.ts
index 73c9f10dd5..70869059c3 100644
--- a/src/frontend/packages/core/src/core/page-visible.ts
+++ b/src/frontend/packages/core/src/core/page-visible.ts
@@ -17,6 +17,7 @@ class VisibilityStatusConstant {
 export class PageVisible {
   private hidden: string;
   private visibilityState: string;
+  // private visibilityChanged: string;
 
   constructor(@Inject(DOCUMENT) private document: Document) {
     this.defineBrowserSupport();
@@ -30,6 +31,20 @@ export class PageVisible {
     return VisibilityStatusConstant.HIDDEN === this.getVisibilityState() || this.isHidden();
   }
 
+  // nowVisible(): Observable<any> {
+  //   return this.getVisibility().pipe(
+  //     startWith(false),
+  //     pairwise(),
+  //     filter(([oldV, newV]) => oldV === false && newV === true)
+  //   );
+  // }
+
+  // getVisibility(): Observable<boolean> {
+  //   return fromEvent(document, this.visibilityChanged).pipe(
+  //     map(() => this.isPageVisible())
+  //   );
+  // }
+
   private isHidden(): boolean {
     return document[this.hidden];
   }
@@ -42,12 +57,15 @@ export class PageVisible {
     if (typeof document[HiddenKeyConstant.DEFAULT] !== 'undefined') { // Opera 12.10 and Firefox 18 and later support
       this.hidden = HiddenKeyConstant.DEFAULT;
       this.visibilityState = 'visibilityState';
+      // this.visibilityChanged = 'visibilitychange';
     } else if (typeof document[HiddenKeyConstant.MS] !== 'undefined') {
       this.hidden = HiddenKeyConstant.MS;
       this.visibilityState = 'msVisibilityState';
+      // this.visibilityChanged = 'msvisibilitychange';
     } else if (typeof document[HiddenKeyConstant.WEB_KIT] !== 'undefined') {
       this.hidden = HiddenKeyConstant.WEB_KIT;
       this.visibilityState = 'webkitVisibilityState';
+      // this.visibilityChanged = 'webkitvisibilitychange';
     }
   }
 }
diff --git a/src/frontend/packages/core/src/core/style.service.ts b/src/frontend/packages/core/src/core/style.service.ts
new file mode 100644
index 0000000000..f832f06c0d
--- /dev/null
+++ b/src/frontend/packages/core/src/core/style.service.ts
@@ -0,0 +1,38 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class StyleService {
+
+  private rules: string[] = [];
+  constructor() {
+    this.rules = this.getAllSelectors();
+  }
+
+  hasSelector = (selector) => {
+    return !!this.rules.find(ruleSelector => ruleSelector === selector);
+  }
+
+  private getAllSelectors = (): string[] => {
+    const ret = [];
+    // tslint:disable-next-line:prefer-for-of
+    for (let i = 0; i < document.styleSheets.length; i++) {
+      const styleSheet = document.styleSheets[i];
+      if (!(styleSheet instanceof CSSStyleSheet)) {
+        continue;
+      }
+      const rules = styleSheet.rules || styleSheet.cssRules;
+      // tslint:disable-next-line:prefer-for-of
+      for (let y = 0; y < rules.length; y++) {
+        const rule = rules[y];
+        if (!(rule instanceof CSSStyleRule)) {
+          continue;
+        }
+        if (typeof rule.selectorText === 'string') { ret.push(rule.selectorText); }
+      }
+    }
+    return ret;
+  }
+
+}
diff --git a/src/frontend/packages/core/src/core/theme.service.ts b/src/frontend/packages/core/src/core/theme.service.ts
new file mode 100644
index 0000000000..f5ee16ba18
--- /dev/null
+++ b/src/frontend/packages/core/src/core/theme.service.ts
@@ -0,0 +1,151 @@
+import { OverlayContainer } from '@angular/cdk/overlay';
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { first, map } from 'rxjs/operators';
+
+import { SetThemeAction } from '../../../store/src/actions/dashboard-actions';
+import { DashboardOnlyAppState } from '../../../store/src/app-state';
+import { selectDashboardState } from '../../../store/src/selectors/dashboard.selectors';
+import { StyleService } from './style.service';
+
+export interface StratosTheme {
+  key: string;
+  label: string;
+  styleName: string;
+}
+
+const lightTheme: StratosTheme = {
+  key: 'default',
+  label: 'Light',
+  styleName: 'default'
+};
+const darkTheme: StratosTheme = {
+  key: 'dark',
+  label: 'Dark',
+  styleName: 'dark-theme'
+};
+const osTheme: StratosTheme = {
+  key: 'os',
+  label: 'OS',
+  styleName: ''
+};
+
+@Injectable({
+  providedIn: 'root',
+})
+export class ThemeService {
+
+  private osThemeInfo = {
+    supports: false,
+    isDarkMode: window.matchMedia('(prefers-color-scheme: dark)').matches,
+    isLightMode: window.matchMedia('(prefers-color-scheme: light)').matches,
+    isNotSpecified: window.matchMedia('(prefers-color-scheme: no-preference)').matches
+  };
+  private themes: StratosTheme[] = [lightTheme];
+
+  constructor(
+    private store: Store<DashboardOnlyAppState>,
+    private overlayContainer: OverlayContainer,
+    private styleService: StyleService) {
+    this.initialiseStratosThemeInfo();
+  }
+
+  getThemes(): StratosTheme[] {
+    return this.themes;
+  }
+
+  getTheme(): Observable<StratosTheme> {
+    return this.store.select(selectDashboardState).pipe(
+      map(dashboardState => this.findTheme(dashboardState.themeKey)),
+    );
+  }
+
+  setTheme(themeKey: string) {
+    const findTheme = this.findTheme(themeKey);
+    this.setOverlay(findTheme);
+    this.store.dispatch(new SetThemeAction(findTheme));
+  }
+
+  /**
+   * Initialize the service with a theme that may already exists in the store
+   */
+  initialize() {
+    this.getTheme().pipe(first()).subscribe(theme => this.setOverlay(theme));
+  }
+
+  private initialiseStratosThemeInfo() {
+    const hasDarkTheme = this.styleService.hasSelector('.dark-theme-supported');
+
+    if (hasDarkTheme) {
+      this.themes.push(darkTheme);
+
+      this.initialiseOsThemeInfo();
+    }
+
+  }
+
+  private initialiseOsThemeInfo() {
+    this.osThemeInfo.supports = this.osThemeInfo.isDarkMode || this.osThemeInfo.isLightMode || this.osThemeInfo.isNotSpecified;
+
+    if (this.osThemeInfo.supports) {
+      this.themes.push(osTheme);
+
+      // Watch for changes at run time
+      window.matchMedia('(prefers-color-scheme: dark)').addListener(e => e.matches && this.updateFollowingOsThemeChange());
+      window.matchMedia('(prefers-color-scheme: light)').addListener(e => e.matches && this.updateFollowingOsThemeChange());
+      window.matchMedia('(prefers-color-scheme: no-preference)').addListener(e => e.matches && this.updateFollowingOsThemeChange());
+    }
+  }
+
+  /**
+   * Find a theme in a safe way with fall backs
+   */
+  private findTheme(themeKey: string): StratosTheme {
+    if (themeKey === osTheme.key && this.getThemes().find(theme => theme.key === osTheme.key)) {
+      return this.getOsTheme() || lightTheme;
+    }
+    return this.getThemes().find(theme => theme.key === themeKey) || lightTheme;
+  }
+
+  /**
+   * Create an `OS` theme that contains the relevant style
+   */
+  private getOsTheme(): StratosTheme {
+    if (this.osThemeInfo.supports) {
+      return this.osThemeInfo.isDarkMode ? {
+        ...osTheme,
+        styleName: darkTheme.styleName
+      } : this.osThemeInfo.isLightMode || this.osThemeInfo.isNotSpecified ? {
+        ...osTheme,
+        styleName: lightTheme.styleName
+      } : null;
+    }
+  }
+
+  /**
+   * Overlays require the theme specifically set, see https://material.angular.io/guide/theming#multiple-themes
+   * `Multiple themes and overlay-based components`
+   */
+  private setOverlay(newTheme: StratosTheme) {
+    // Remove pre-existing styles
+    this.getThemes()
+      .filter(theme => theme.styleName)
+      .forEach(theme => this.overlayContainer.getContainerElement().classList.remove(theme.styleName));
+    // Add new style (not from getThemes list, handles OS case)
+    this.overlayContainer.getContainerElement().classList.add(newTheme.styleName);
+  }
+
+  /**
+   * Update theme given changes in OS theme settings
+   */
+  private updateFollowingOsThemeChange() {
+    this.osThemeInfo.isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches;
+    this.osThemeInfo.isLightMode = window.matchMedia('(prefers-color-scheme: light)').matches;
+    this.osThemeInfo.isNotSpecified = window.matchMedia('(prefers-color-scheme: no-preference)').matches;
+
+    this.store.select(selectDashboardState).pipe(
+      first()
+    ).subscribe(dashboardState => dashboardState.themeKey === osTheme.key && this.setTheme(osTheme.key));
+  }
+}
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/cf-cell.helpers.ts b/src/frontend/packages/core/src/features/cloud-foundry/cf-cell.helpers.ts
new file mode 100644
index 0000000000..af49499bbf
--- /dev/null
+++ b/src/frontend/packages/core/src/features/cloud-foundry/cf-cell.helpers.ts
@@ -0,0 +1,71 @@
+import { Store } from '@ngrx/store';
+import { Observable, of } from 'rxjs';
+import { filter, first, map, publishReplay, refCount, switchMap } from 'rxjs/operators';
+
+import { CFEntityConfig } from '../../../../cloud-foundry/cf-types';
+import { FetchCFCellMetricsPaginatedAction } from '../../../../cloud-foundry/src/actions/cf-metrics.actions';
+import {
+  CellMetrics,
+} from '../../../../cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service';
+import { MetricQueryConfig } from '../../../../store/src/actions/metrics.actions';
+import { AppState } from '../../../../store/src/app-state';
+import { getPaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
+import { IMetrics } from '../../../../store/src/types/base-metric.types';
+import { PaginationMonitorFactory } from '../../shared/monitors/pagination-monitor.factory';
+import { MetricQueryType } from '../../shared/services/metrics-range-selector.types';
+import { endpointHasMetricsByAvailable } from '../endpoints/endpoint-helpers';
+
+export class CfCellHelper {
+
+  constructor(
+    private store: Store<AppState>,
+    private paginationMonitorFactory: PaginationMonitorFactory) {
+  }
+
+  public createCellMetricAction(cfId: string, cellId?: string): Observable<FetchCFCellMetricsPaginatedAction> {
+    const cellIdString = !!cellId ? `{bosh_job_id="${cellId}"}` : '';
+
+    const newMetricAction: FetchCFCellMetricsPaginatedAction = new FetchCFCellMetricsPaginatedAction(
+      cfId,
+      cfId,
+      new MetricQueryConfig(CellMetrics.HEALTHY + cellIdString, {}),
+      MetricQueryType.QUERY
+    );
+    return this.hasMetric(newMetricAction).pipe(
+      switchMap(hasNewMetric => hasNewMetric ?
+        of(hasNewMetric) :
+        this.hasMetric(new FetchCFCellMetricsPaginatedAction(
+          cfId,
+          cfId,
+          new MetricQueryConfig(CellMetrics.HEALTHY_DEP + cellIdString, {}),
+          MetricQueryType.QUERY
+        ))
+      )
+    );
+  }
+
+  private hasMetric(action: FetchCFCellMetricsPaginatedAction): Observable<FetchCFCellMetricsPaginatedAction> {
+    return getPaginationObservables<IMetrics>({
+      store: this.store,
+      action,
+      paginationMonitor: this.paginationMonitorFactory.create(
+        action.paginationKey,
+        new CFEntityConfig(action.entityType)
+      )
+    }).entities$.pipe(
+      filter(entities => !!entities && !!entities.length),
+      first(),
+      map(entities => !!entities.find(entity => !!entity.data.result.length) ? action : null),
+      publishReplay(1),
+      refCount()
+    );
+  }
+
+  public hasCellMetrics(endpointId: string): Observable<boolean> {
+    return endpointHasMetricsByAvailable(this.store, endpointId).pipe(
+      // If metrics set up for this endpoint check if we can fetch cell metrics from it.
+      // If the metric is unknown an empty list is returned
+      switchMap(hasMetrics => hasMetrics ? this.createCellMetricAction(endpointId).pipe(map(action => !!action)) : of(false))
+    );
+  }
+}
diff --git a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.html b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.html
index 2122da51c7..e6313f681e 100644
--- a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.html
+++ b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.html
@@ -33,13 +33,13 @@
       </div>
     </mat-drawer-content>
   </mat-drawer-container>
-  <mat-drawer class="dashboard__side-help-outer" #sideHelp *ngIf="rightNavState$ | async as rightNavState"
-    [autoFocus]="false" mode="over" position="end" [opened]="rightNavState.opened" (closedStart)="sideHelpClosed()">
+  <mat-drawer class="dashboard__side-help-outer" #sideHelp
+    [autoFocus]="false" mode="over" position="end" [opened]="panelPreviewService.opened$ | async" (closedStart)="sideHelpClosed()">
     <div class="dashboard__side-help">
-      <button class="dashboard__side-help-button" mat-icon-button (click)="rightNavState.opened = false">
+      <button class="dashboard__side-help-button" mat-icon-button (click)="panelPreviewService.hide()">
         <mat-icon>close</mat-icon>
       </button>
-      <app-markdown-preview [documentUrl]="rightNavState.documentUrl"></app-markdown-preview>
+      <template #previewPanelContainer></template>
     </div>
   </mat-drawer>
 </div>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
index 0884263a2b..6b4fe94aaf 100644
--- a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
+++ b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
@@ -3,7 +3,6 @@
 
 $app-sub-header-height: 48px;
 .dashboard {
-  background-color: transparent;
   display: flex;
   flex-direction: column;
   height: 100%;
@@ -16,6 +15,10 @@ $app-sub-header-height: 48px;
   }
   &__side-help-outer {
     z-index: 9999;
+
+    @include breakpoint(mobileonly) {
+      left: 0;
+    }
   }
   &__side-help-button {
     position: absolute;
@@ -52,6 +55,11 @@ $app-sub-header-height: 48px;
   }
   &__side-help {
     max-width: 600px;
+    min-width: 600px;
+
+    @include breakpoint(mobileonly) {
+      min-width: auto;
+    }
   }
 }
 
@@ -75,7 +83,6 @@ $app-sub-header-height: 48px;
   height: $app-sub-header-height;
   margin-left: 200px;
   padding: 0;
-  width: 100%;
   @include breakpoint(tablet) {
     margin: 0;
     padding: 0 20px;
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 00a22d86dd..542eb86902 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,6 +1,6 @@
 import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
 import { Portal } from '@angular/cdk/portal';
-import { Component, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, NgZone, OnDestroy, OnInit, ViewChild, ViewContainerRef } from '@angular/core';
 import { MatDrawer } from '@angular/material';
 import { ActivatedRoute, ActivatedRouteSnapshot, NavigationEnd, Route, Router } from '@angular/router';
 import { Store } from '@ngrx/store';
@@ -13,12 +13,7 @@ import { cfInfoEntityType } from '../../../../../cloud-foundry/src/cf-entity-typ
 import {
   CfInfoDefinitionActionBuilders,
 } from '../../../../../cloud-foundry/src/entity-action-builders/cf-info.action-builders';
-import {
-  CloseSideHelp,
-  CloseSideNav,
-  DisableMobileNav,
-  EnableMobileNav,
-} from '../../../../../store/src/actions/dashboard-actions';
+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';
@@ -29,6 +24,7 @@ import { CustomizationService } from '../../../core/customizations.types';
 import { EndpointsService } from '../../../core/endpoints.service';
 import { entityCatalogue } from '../../../core/entity-catalogue/entity-catalogue.service';
 import { IEntityMetadata } from '../../../core/entity-catalogue/entity-catalogue.types';
+import { PanelPreviewService } from '../../../shared/services/panel-preview.service';
 import { PageHeaderService } from './../../../core/page-header-service/page-header.service';
 import { SideNavItem } from './../side-nav/side-nav.component';
 
@@ -39,16 +35,28 @@ import { SideNavItem } from './../side-nav/side-nav.component';
   styleUrls: ['./dashboard-base.component.scss']
 })
 
-export class DashboardBaseComponent implements OnInit, OnDestroy {
+export class DashboardBaseComponent implements OnInit, OnDestroy, AfterViewInit {
   public activeTabLabel$: Observable<string>;
   public subNavData$: Observable<[string, Portal<any>]>;
   public isMobile$: Observable<boolean>;
   public sideNavMode$: Observable<string>;
   public sideNavMode: string;
   public mainNavState$: Observable<{ mode: string; opened: boolean; iconMode: boolean }>;
-  public rightNavState$: Observable<{ opened: boolean; documentUrl: string; }>;
+  public rightNavState$: Observable<{ opened: boolean, component?: object, props?: object }>;
   private dashboardState$: Observable<DashboardState>;
+  public noMargin$: Observable<boolean>;
+  private closeSub: Subscription;
+  private mobileSub: Subscription;
   private drawer: MatDrawer;
+  public iconModeOpen = false;
+  public sideNavWidth = 54;
+
+  sideNavTabs: SideNavItem[] = this.getNavigationRoutes();
+  sideNaveMode = 'side';
+
+  @ViewChild('previewPanelContainer', { read: ViewContainerRef, static: false }) previewPanelContainer: ViewContainerRef;
+
+  @ViewChild('content', { static: false }) public content;
 
   constructor(
     public pageHeaderService: PageHeaderService,
@@ -59,6 +67,7 @@ export class DashboardBaseComponent implements OnInit, OnDestroy {
     private endpointsService: EndpointsService,
     public tabNavService: TabNavService,
     private ngZone: NgZone,
+    public panelPreviewService: PanelPreviewService,
     private cs: CustomizationService
   ) {
     this.noMargin$ = this.router.events.pipe(
@@ -89,24 +98,11 @@ export class DashboardBaseComponent implements OnInit, OnDestroy {
         }
       })
     );
-    this.rightNavState$ = this.dashboardState$.pipe(
-      map(state => ({
-        opened: !!state.sideHelpDocument && state.sideHelpOpen,
-        documentUrl: state.sideHelpDocument
-      }))
-    );
+
     this.mobileSub = this.isMobile$
       .subscribe(isMobile => isMobile ? this.store.dispatch(new EnableMobileNav()) : this.store.dispatch(new DisableMobileNav()));
   }
 
-  public helpDocumentUrl: string;
-
-  private closeSub: Subscription;
-
-  public noMargin$: Observable<boolean>;
-
-  private mobileSub: Subscription;
-
   @ViewChild('sidenav', { static: false }) set sidenav(drawer: MatDrawer) {
     this.drawer = drawer;
     if (!this.closeSub) {
@@ -119,15 +115,6 @@ export class DashboardBaseComponent implements OnInit, OnDestroy {
     }
   }
 
-  @ViewChild('content', { static: true }) public content;
-
-  sideNavTabs: SideNavItem[] = this.getNavigationRoutes();
-
-  sideNaveMode = 'side';
-
-  public iconModeOpen = false;
-  public sideNavWidth = 54;
-
   public redrawSideNav() {
     // We need to do this to ensure there isn't a space left behind
     // when going from mobile to desktop
@@ -140,6 +127,16 @@ export class DashboardBaseComponent implements OnInit, OnDestroy {
     this.store.dispatch(new GetCurrentUsersRelations());
   }
 
+  sideHelpClosed() {
+    this.panelPreviewService.hide();
+  }
+
+  ngAfterViewInit() {
+    console.log('*************');
+    console.log('SETTING PREVIEW PANEL');
+    this.panelPreviewService.setContainer(this.previewPanelContainer);
+  }
+
   ngOnInit() {
     this.subNavData$ = combineLatest(
       this.tabNavService.getCurrentTabHeaderObservable().pipe(
@@ -173,10 +170,6 @@ export class DashboardBaseComponent implements OnInit, OnDestroy {
     return false;
   }
 
-  public sideHelpClosed() {
-    this.store.dispatch(new CloseSideHelp());
-  }
-
   private getNavigationRoutes(): SideNavItem[] {
     let navItems = this.collectNavigationRoutes('', this.router.config);
 
diff --git a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.html b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.html
index 09f01fda05..570506a80f 100644
--- a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.html
+++ b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.html
@@ -9,7 +9,8 @@
   </div>
   <ul class="page-side-nav__items">
     <li tabindex="1" *ngFor="let tab of tabs">
-      <a *ngIf="!tab.hidden$ || !(tab.hidden$ | async)" class="page-side-nav__item" [routerLink]="[tab.link]"
+      <div *ngIf="!tab.link" class="page-side-nav__item-sep">{{ tab.label }}</div>
+      <a *ngIf="tab.link && (!tab.hidden$ || !(tab.hidden$ | async))" class="page-side-nav__item" [routerLink]="[tab.link]"
         [routerLinkActive]="['page-side-nav__item--active']">
         <mat-icon class="page-side-nav__icon" *ngIf="tab.icon" [fontSet]="tab.iconFont">{{ tab.icon }}
         </mat-icon>
diff --git a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.scss b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.scss
index c1e9e75bae..4aa4b95ff6 100644
--- a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.scss
+++ b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.scss
@@ -35,6 +35,20 @@
       text-align: center;
     }
   }
+  &__item-sep {
+    align-items: center;
+    border-color: transparent;
+    cursor: default;
+    display: flex;
+    font-size: 12px;
+    letter-spacing: .01em;
+    line-height: 18px;
+    outline: 0;
+    padding: 10px;
+    padding-left: $item-header-padding;
+    text-decoration: none;
+    text-transform: uppercase;
+  }
   &__items {
     border-bottom: 1px solid $border-color;
     display: none;
diff --git a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.theme.scss b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.theme.scss
index a05435ff5a..d7c1ebb669 100644
--- a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.theme.scss
+++ b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.theme.scss
@@ -23,7 +23,7 @@
       }
     }
     &__item {
-      color: rgba(0, 0, 0, .6);
+      color: map-get($app-theme, subdued-color);
       &--active {
         background-color: transparentize($primary-color, .9);
         color: $primary-color;
diff --git a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.ts b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.ts
index e418b05aff..788d2bc4ae 100644
--- a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.ts
@@ -3,10 +3,11 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { Subscription } from 'rxjs';
 
-import { ShowSideHelp } from '../../../../../store/src/actions/dashboard-actions';
 import { ShowSnackBar } from '../../../../../store/src/actions/snackBar.actions';
 import { EndpointOnlyAppState } from '../../../../../store/src/app-state';
 import { EndpointsService } from '../../../core/endpoints.service';
+import { MarkdownPreviewComponent } from '../../../shared/components/markdown-preview/markdown-preview.component';
+import { PanelPreviewService } from '../../../shared/services/panel-preview.service';
 import { ConnectEndpointConfig, ConnectEndpointService } from '../connect.service';
 
 
@@ -28,6 +29,7 @@ export class ConnectEndpointDialogComponent implements OnDestroy {
     @Inject(MAT_DIALOG_DATA) public data: ConnectEndpointConfig,
     private store: Store<EndpointOnlyAppState>,
     endpointsService: EndpointsService,
+    private panelPreviewService: PanelPreviewService,
   ) {
     this.connectService = new ConnectEndpointService(store, endpointsService, data);
 
@@ -38,7 +40,7 @@ export class ConnectEndpointDialogComponent implements OnDestroy {
   }
 
   showHelp() {
-    this.store.dispatch(new ShowSideHelp(this.helpDocumentUrl));
+    this.panelPreviewService.show(MarkdownPreviewComponent, { documentUrl: this.helpDocumentUrl });
   }
 
   ngOnDestroy(): void {
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.ts b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.ts
index d513432c29..ff128ef73c 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.ts
@@ -3,10 +3,11 @@ import { Store } from '@ngrx/store';
 import { Observable, of } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { ShowSideHelp } from '../../../../../../store/src/actions/dashboard-actions';
 import { EndpointOnlyAppState } from '../../../../../../store/src/app-state';
 import { EndpointsService } from '../../../../core/endpoints.service';
+import { MarkdownPreviewComponent } from '../../../../shared/components/markdown-preview/markdown-preview.component';
 import { IStepperStep, StepOnNextResult } from '../../../../shared/components/stepper/step/step.component';
+import { PanelPreviewService } from '../../../../shared/services/panel-preview.service';
 import { ConnectEndpointConfig, ConnectEndpointService } from '../../connect.service';
 
 
@@ -26,12 +27,13 @@ export class CreateEndpointConnectComponent implements OnDestroy, IStepperStep {
 
   constructor(
     private store: Store<EndpointOnlyAppState>,
-    private endpointsService: EndpointsService
+    private endpointsService: EndpointsService,
+    private panelPreviewService: PanelPreviewService,
   ) {
   }
 
   showHelp() {
-    this.store.dispatch(new ShowSideHelp(this.helpDocumentUrl));
+    this.panelPreviewService.show(MarkdownPreviewComponent, { documentUrl: this.helpDocumentUrl });
   }
 
   onEnter = (data: ConnectEndpointConfig) => {
diff --git a/src/frontend/packages/core/src/features/endpoints/endpoint-helpers.ts b/src/frontend/packages/core/src/features/endpoints/endpoint-helpers.ts
index 2b83b6b969..0d6a5a43ae 100644
--- a/src/frontend/packages/core/src/features/endpoints/endpoint-helpers.ts
+++ b/src/frontend/packages/core/src/features/endpoints/endpoint-helpers.ts
@@ -1,10 +1,13 @@
 import { Type } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import { filter, first, map } from 'rxjs/operators';
 
-import { EndpointOnlyAppState } from '../../../../store/src/app-state';
-import { endpointEntitiesSelector } from '../../../../store/src/selectors/endpoint.selectors';
+import { AppState, EndpointOnlyAppState } from '../../../../store/src/app-state';
+import {
+  endpointEntitiesSelector,
+  endpointsEntityRequestDataSelector,
+} from '../../../../store/src/selectors/endpoint.selectors';
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
 import { EndpointListDetailsComponent } from '../../shared/components/list/list-types/endpoint/endpoint-list.helpers';
 
@@ -39,3 +42,12 @@ export function endpointHasMetrics(endpointGuid: string, store: Store<EndpointOn
     map(state => !!state[endpointGuid].metadata && !!state[endpointGuid].metadata.metrics)
   );
 }
+
+// There are two different methods for checking if an endpoint has metrics. Need to understand use cases
+export function endpointHasMetricsByAvailable(store: Store<AppState>, endpointId: string): Observable<boolean> {
+  return store.select(endpointsEntityRequestDataSelector(endpointId)).pipe(
+    filter(endpoint => !!endpoint),
+    map(endpoint => endpoint.metricsAvailable),
+    first()
+  );
+}
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 93feabd5f5..7e807d5687 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
@@ -92,6 +92,18 @@ <h1>User Profile</h1>
                 polling may result in some pages showing out-of-date information.</div>
             </div>
           </div>
+          <div class="user-profile__option" *ngIf="hasMultipleThemes">
+            <div class="user-profile__option-inner">
+              <div class="user-profile__option-header">
+                Theme
+              </div>
+              <mat-button-toggle-group [value]="(themeService.getTheme() | async).key"
+                (change)="themeService.setTheme($event.value)" name="theme" aria-label="Theme">
+                <mat-button-toggle *ngFor="let theme of themeService.getThemes()" [value]="theme.key"> {{ theme.label }}
+                </mat-button-toggle>
+              </mat-button-toggle-group>
+            </div>
+          </div>
         </div>
       </mat-card>
       <mat-card *ngIf="profile.origin === 'uaa'">
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 fda5d8da05..b504c6832f 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
@@ -7,10 +7,11 @@ import { SetPollingEnabledAction, SetSessionTimeoutAction } from '../../../../..
 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 { ConfirmationDialogConfig } from '../../../shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service';
 import { UserProfileService } from '../user-profile.service';
-import { UserService } from '../../../core/user.service';
 
 @Component({
   selector: 'app-profile-info',
@@ -31,6 +32,7 @@ export class ProfileInfoComponent implements OnInit {
   userProfile$: Observable<UserProfileInfo>;
 
   primaryEmailAddress$: Observable<string>;
+  hasMultipleThemes: boolean;
 
   private sessionDialogConfig = new ConfirmationDialogConfig(
     'Disable session timeout',
@@ -60,6 +62,7 @@ export class ProfileInfoComponent implements OnInit {
     private store: Store<DashboardOnlyAppState>,
     private confirmDialog: ConfirmationDialogService,
     public userService: UserService,
+    public themeService: ThemeService
   ) {
     this.isError$ = userProfileService.isError$;
     this.userProfile$ = userProfileService.userProfile$;
@@ -67,6 +70,8 @@ export class ProfileInfoComponent implements OnInit {
     this.primaryEmailAddress$ = this.userProfile$.pipe(
       map((profile: UserProfileInfo) => userProfileService.getPrimaryEmailAddress(profile))
     );
+
+    this.hasMultipleThemes = themeService.getThemes().length > 1;
   }
 
   ngOnInit() {
diff --git a/src/frontend/packages/core/src/logged-in.service.ts b/src/frontend/packages/core/src/logged-in.service.ts
index ffd2b0227c..7db8ed0ddc 100644
--- a/src/frontend/packages/core/src/logged-in.service.ts
+++ b/src/frontend/packages/core/src/logged-in.service.ts
@@ -95,7 +95,7 @@ export class LoggedInService {
             this.store.select(selectDashboardState),
             this.store.select(s => s.auth)
           ),
-          tap(([i, dashboardState, authState]) => {
+          tap(([, dashboardState, authState]) => {
             this.ngZone.run(() => {
               this._checkSession(dashboardState, authState);
             });
diff --git a/src/frontend/packages/core/src/route-reuse-stragegy.ts b/src/frontend/packages/core/src/route-reuse-stragegy.ts
index 86846cc5af..a82b053d35 100644
--- a/src/frontend/packages/core/src/route-reuse-stragegy.ts
+++ b/src/frontend/packages/core/src/route-reuse-stragegy.ts
@@ -13,6 +13,14 @@ export class CustomReuseStrategy extends RouteReuseStrategy {
   shouldReuseRoute(future: ActivatedRouteSnapshot, curr: ActivatedRouteSnapshot): boolean {
     const isDashboard = curr.component === DashboardBaseComponent && future.component === DashboardBaseComponent;
     const isAppComp = curr.component === AppComponent && future.component === AppComponent;
-    return isDashboard || isAppComp;
+
+    let reuse = false;
+    if (curr.data.reuseRoute === true) {
+      reuse = curr.data.reuseRoute && future.data.reuseRoute && !curr.component && !future.component;
+    } else {
+      // Expect it to be a component
+      reuse = curr.component === curr.data.reuseRoute && future.component === future.data.reuseRoute;
+    }
+    return isDashboard || isAppComp || reuse;
   }
 }
diff --git a/src/frontend/packages/core/src/shared/components/code-block/code-block.component.theme.scss b/src/frontend/packages/core/src/shared/components/code-block/code-block.component.theme.scss
index 1010773073..bfac5a8b6e 100644
--- a/src/frontend/packages/core/src/shared/components/code-block/code-block.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/code-block/code-block.component.theme.scss
@@ -1,16 +1,22 @@
 @import '~@angular/material/theming';
 @mixin display-value-theme($theme, $app-theme) {
+  $is-dark: map-get($theme, is-dark);
   $primary: map-get($theme, primary);
   $background-colors: map-get($theme, background);
   $foreground-colors: map-get($theme, foreground);
   .app-code-block {
-    background-color: mat-color($foreground-colors, text);
-    color: darken(mat-color($background-colors, background), 2%);
-    &___copied-icon {
-      color: mat-color($primary);
+    $background-color: mat-color($foreground-colors, text);
+    $color: darken(mat-color($background-colors, background), 2%);
+    @if $is-dark == true {
+      // See the app variable and cf cli pages
+      $background-color: lighten(mat-color($background-colors, background), 5%);
+      $color: mat-color($foreground-colors, text);
     }
-    &__copied-div {
-      background-color: mat-color($foreground-colors, text);
+
+    background-color: $background-color;
+    color: $color;
+    &__copied-icon {
+      color: mat-color($primary);
     }
   }
 }
diff --git a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.html b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.html
index 4da34cbe74..49bbeeb353 100644
--- a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.html
+++ b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.html
@@ -1,8 +1,6 @@
 <div class="entity-summary">
-  <img *ngIf="imagePath" class="entity-summary__logo" title="{{ title }}'s image'" src="{{ imagePath }}" />
   <div class="entity-summary__header-section">
-    <img class="entity-summary__inline-logo" title="{{ title }}'s image'" *ngIf="inlineImagePath"
-      src="{{ inlineImagePath }}">
+    <img *ngIf="imagePath" class="entity-summary__logo" title="{{ title }}'s image'" src="{{ imagePath }}">
     <div class="entity-summary__header-inner">
       <div class="entity-summary__header-wrapper">
         <h1 class="entity-summary__header">{{ title }} </h1>
diff --git a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.scss b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.scss
index a96068938d..bef4b4562c 100644
--- a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.scss
+++ b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.scss
@@ -1,12 +1,11 @@
 .entity-summary {
   margin: 10px 0;
   &__logo {
-    height: 400px;
-    opacity: .2;
-    position: absolute;
-    right: -120px;
-    top: 20px;
-    z-index: -1;
+    flex: 0 0 64px;
+    max-height: 64px;
+  }
+  &__logo-large {
+    max-height: 160px;
   }
   &__inline-logo {
     max-height: 160px;
@@ -25,6 +24,10 @@
   &__header {
     margin: 0;
   }
+  &__header-inner {
+    flex: 1;
+    margin-left: 10px;
+  }
   &__header-wrapper {
     align-items: baseline;
     display: flex;
diff --git a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.ts b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.ts
index 7b049b1f96..b568df7a89 100644
--- a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.ts
+++ b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.ts
@@ -11,5 +11,5 @@ export class EntitySummaryTitleComponent {
   @Input() info: string;
   @Input() subText: string;
   @Input() imagePath: string;
-  @Input() inlineImagePath: string;
+  @Input() imageSize: string;
 }
diff --git a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.html b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.html
index 53a2b5e295..9af11474b9 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.html
+++ b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.html
@@ -1,5 +1,5 @@
 <app-meta-card [favorite]="metaFavorite" [confirmFavoriteRemoval]="true" [ngClass]="{'fav-meta-card__clickable': !!(routerLink$ | async)}"
-  [actionMenu]="actions$ | async" [routerLink]="routerLink$ | async" class="fav-meta-card" *ngIf="config" [status$]="status$"
+  [actionMenu]="actions$ | async" (click)="previewPanel()" class="fav-meta-card" *ngIf="config" [status$]="status$"
   [entityConfig]="entityConfig">
   <app-meta-card-title class="fav-meta-card__header">
     <!--<div>ICON</div>-->
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 a252d8b69e..5a91f03f22 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,10 +7,15 @@ import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import {
   RemoveUserFavoriteAction,
 } from '../../../../../store/src/actions/user-favourites-actions/remove-user-favorite-action';
-import { endpointEntitiesSelector } from '../../../../../store/src/selectors/endpoint.selectors';
+import {
+  endpointEntitiesSelector,
+  endpointsEntityRequestDataSelector,
+} from '../../../../../store/src/selectors/endpoint.selectors';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../store/src/types/user-favorites.types';
-import { userFavoritesEntitySchema } from '../../../base-entity-schemas';
+import { ENDPOINT_TYPE, userFavoritesEntitySchema } from '../../../base-entity-schemas';
+import { entityCatalogue } from '../../../core/entity-catalogue/entity-catalogue.service';
 import { IFavoriteEntity } from '../../../core/user-favorite-manager';
+import { PanelPreviewService } from '../../services/panel-preview.service';
 import { ComponentEntityMonitorConfig, StratosStatus } from '../../shared.types';
 import { ConfirmationDialogConfig } from '../confirmation-dialog.config';
 import { ConfirmationDialogService } from '../confirmation-dialog.service';
@@ -97,7 +102,33 @@ export class FavoritesMetaCardComponent {
     }
   }
 
-  constructor(private store: Store<CFAppState>, private confirmDialog: ConfirmationDialogService) { }
+  constructor(
+    private store: Store<CFAppState>,
+    private confirmDialog: ConfirmationDialogService,
+    private panelPreviewService: PanelPreviewService
+  ) { }
+
+  previewPanel() {
+    const catalogueEntity = entityCatalogue.getEntity(this.favorite.endpointType, this.favorite.entityType);
+    const previewComponent = catalogueEntity.builders.entityBuilder.getPreviewableComponent();
+
+    // TODO: use 'endpoint' as constant
+    if (this.favorite.entityType === ENDPOINT_TYPE) {
+      const entity$ = this.store.select(endpointsEntityRequestDataSelector(this.favorite.endpointId));
+      this.panelPreviewService.show(previewComponent, {
+        title: this.favorite.metadata.name,
+        entity$,
+        cfGuid: this.favorite.endpointId
+      });
+    } else {
+      this.panelPreviewService.show(previewComponent, {
+        title: this.favorite.metadata.name,
+        cfGuid: this.favorite.metadata.cfGuid,
+        orgGuid: this.favorite.metadata.orgGuid,
+        guid: this.favorite.metadata.guid
+      });
+    }
+  }
 
   public setConfirmation(prettyName: string, favorite: UserFavorite<IFavoriteMetadata>) {
     this.confirmation = new ConfirmationDialogConfig(
diff --git a/src/frontend/packages/core/src/shared/components/json-viewer/README.md b/src/frontend/packages/core/src/shared/components/json-viewer/README.md
new file mode 100644
index 0000000000..4e93beb48d
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/json-viewer/README.md
@@ -0,0 +1,9 @@
+This component originates from:
+
+https://github.com/hivivo/ngx-json-viewer
+
+That project seems to be inactive.
+
+This component has been brought in here as we needed ot make some changes - its a very simple component.
+
+We could look to upstream once we've completed our enhancements.
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.html b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.html
new file mode 100644
index 0000000000..fbc96182c2
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.html
@@ -0,0 +1,22 @@
+<section class="ngx-json-viewer">
+  <section
+    *ngFor="let segment of segments"
+    [ngClass]="['segment', 'segment-type-' + segment.type]">
+    <section
+      (click)="toggle(segment)"
+      [ngClass]="{
+        'segment-main': true,
+        'expandable': isExpandable(segment),
+        'expanded': segment.expanded
+      }">
+      <div *ngIf="isExpandable(segment)" class="toggler"></div>
+      <span class="segment-key">{{ segment.key }}</span>
+      <span class="segment-separator">: </span>
+      <span *ngIf="!segment.expanded || !isExpandable(segment)" class="segment-value">{{ segment.description }}</span>
+    </section>
+    <section *ngIf="segment.expanded && isExpandable(segment)" class="children">
+      <app-json-viewer root="false" [json]="segment.value" [expanded]="expanded"></app-json-viewer>
+    </section>
+  </section>
+  <div *ngIf="root !== 'false' && segments.length === 0">Nothing to show</div>
+</section>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.scss b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.scss
new file mode 100644
index 0000000000..e6d507bf40
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.scss
@@ -0,0 +1,101 @@
+$type-colors: (
+  string: #0065ff,
+  number: #009688,
+  boolean: #b938a4,
+  date: #05668D,
+  //null: #787878;
+
+  array: #999,
+  object: #999,
+  function: #999,
+
+  'null': #787878,
+  undefined: #fff
+);
+
+:host {
+  display: flex;
+}
+
+.ngx-json-viewer {
+  font-family: "Source Code Pro";
+  font-size: 14px;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  position: relative;
+
+  .segment {
+    padding: 2px;
+    margin: 1px 1px 1px 12px;
+
+    .segment-main {
+      word-wrap: break-word;
+
+      .toggler {
+        position: absolute;
+        margin-left: -14px;
+        margin-top: 3px;
+        font-size: .8em;
+        line-height: 1.2em;
+        vertical-align: middle;
+        color: #787878;
+
+        &::after {
+          display: inline-block;
+          content: "►";
+          transition: transform 0.1s ease-in;
+        }
+      }
+
+      .segment-key {
+        color: #4E187C;
+      }
+
+      .segment-separator {
+        color: #999;
+      }
+
+      .segment-value {
+        color: #000;
+      }
+    }
+
+    .children {
+      margin-left: 12px;
+    }
+  }
+
+  @each $type, $color in $type-colors {
+    .segment-type-#{$type} > .segment-main > .segment-value {
+      color: $color;
+    }
+  }
+
+  // // special cases need highlightted
+  // .segment-type-null > .segment-main > .segment-value {
+  //   color: #787878;
+  // }
+
+  .segment-type-undefined > .segment-main {
+    & > .segment-key {
+      color: #999;
+    }
+    & > .segment-value {
+      background-color: #999;
+    }
+  }
+  .segment-type-object > .segment-main,
+  .segment-type-array > .segment-main {
+    white-space: nowrap;
+  }
+
+  .expanded > .toggler::after {
+    transform: rotate(90deg);
+  }
+
+  .expandable,
+  .expandable > .toggler {
+    cursor: pointer;
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.spec.ts b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.spec.ts
new file mode 100644
index 0000000000..f7eb491577
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { JsonViewerComponent } from './json-viewer.component';
+
+describe('JsonViewerComponent', () => {
+  let component: JsonViewerComponent;
+  let fixture: ComponentFixture<JsonViewerComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ JsonViewerComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(JsonViewerComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.ts b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.ts
new file mode 100644
index 0000000000..91583e2005
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.ts
@@ -0,0 +1,125 @@
+import { Component, OnChanges, Input } from '@angular/core';
+
+export interface Segment {
+  key: string;
+  value: any;
+  type: undefined | string;
+  description: string;
+  expanded: boolean;
+}
+
+@Component({
+  selector: 'app-json-viewer',
+  templateUrl: './json-viewer.component.html',
+  styleUrls: ['./json-viewer.component.scss']
+})
+export class JsonViewerComponent implements OnChanges {
+
+  @Input() json: any;
+
+  @Input() root: string;
+
+  // Whether to expand all initially
+  @Input() expanded = true;
+  /**
+   * @deprecated It will be always true and deleted in version 3.0.0
+   */
+  @Input() cleanOnChange = true;
+
+  segments: Segment[] = [];
+
+  expand() {
+    this.setExpansion(true);
+  }
+
+  collapse() {
+    this.setExpansion(false);
+  }
+
+  private setExpansion(expanded: boolean) {
+    this.segments.forEach(segment => {
+      segment.expanded = expanded;
+    });
+  }
+
+  ngOnChanges() {
+    if (this.cleanOnChange) {
+      this.segments = [];
+    }
+
+    if (!this.json) {
+      return;
+    }
+
+    if (typeof this.json === 'object') {
+      Object.keys(this.json).forEach( key => {
+        this.segments.push(this.parseKeyValue(key, this.json[key]));
+      });
+    } else {
+      this.segments.push(this.parseKeyValue(`(${typeof this.json})`, this.json));
+    }
+  }
+
+  isExpandable(segment: Segment) {
+    return segment.type === 'object' || segment.type === 'array';
+  }
+
+  toggle(segment: Segment) {
+    if (this.isExpandable(segment)) {
+      segment.expanded = !segment.expanded;
+    }
+  }
+
+  private parseKeyValue(key: any, value: any): Segment {
+    const segment: Segment = {
+      key,
+      value,
+      type: undefined,
+      description: '' + value,
+      expanded: this.expanded
+    };
+
+    switch (typeof segment.value) {
+      case 'number': {
+        segment.type = 'number';
+        break;
+      }
+      case 'boolean': {
+        segment.type = 'boolean';
+        break;
+      }
+      case 'function': {
+        segment.type = 'function';
+        break;
+      }
+      case 'string': {
+        segment.type = 'string';
+        segment.description = '"' + segment.value + '"';
+        break;
+      }
+      case 'undefined': {
+        segment.type = 'undefined';
+        segment.description = 'undefined';
+        break;
+      }
+      case 'object': {
+        // yea, null is object
+        if (segment.value === null) {
+          segment.type = 'null';
+          segment.description = 'null';
+        } else if (Array.isArray(segment.value)) {
+          segment.type = 'array';
+          segment.description = 'Array[' + segment.value.length + '] ' + JSON.stringify(segment.value);
+        } else if (segment.value instanceof Date) {
+          segment.type = 'date';
+        } else {
+          segment.type = 'object';
+          segment.description = 'Object ' + JSON.stringify(segment.value);
+        }
+        break;
+      }
+    }
+
+    return segment;
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts
index d89b4b4d34..76d10b4ec3 100644
--- a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts
+++ b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts
@@ -61,7 +61,12 @@ export class LocalListController<T = any> {
         }
         return { paginationEntity, entities };
       }),
-      tap(({ paginationEntity, entities }) => this.setResultCount(paginationEntity, entities)),
+      tap(({ paginationEntity, entities }) => {
+        console.log('------- HERE');
+        console.log(paginationEntity);
+        console.log(entities);
+        this.setResultCount(paginationEntity, entities);
+      }),
       map(({ entities }) => entities)
     );
     return cleanPagination$.pipe(
diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.scss b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.scss
index ab1ec9abec..7ad3af708e 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.scss
+++ b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.scss
@@ -1,6 +1,5 @@
 .meta-card-item-row,
 .meta-card-item-row-top {
-  $text-color: rgba(0, 0, 0, .6);
   align-items: center;
   display: flex;
   justify-content: space-between;
@@ -20,8 +19,6 @@
 }
 
 .meta-card-item__key {
-  $text-color: rgba(0, 0, 0, .6);
-  color: $text-color;
   flex: none;
   font-weight: 300;
   padding-right: 10px;
@@ -51,7 +48,6 @@
     line-height: 18px;
     position: relative;
     &::after {
-      background: linear-gradient(to right, rgba(255, 255, 255, 0), rgba(255, 255, 255, 1) 75%);
       bottom: 0;
       content: '';
       height: 1.2em;
diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.theme.scss b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.theme.scss
new file mode 100644
index 0000000000..890951c936
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.theme.scss
@@ -0,0 +1,12 @@
+@mixin app-meta-card-item-theme($theme, $app-theme) {
+  $backgrounds: map-get($theme, background);
+  $background: mat-color($backgrounds, card);
+
+  .meta-card-item-long-text-fixed {
+    .meta-card-item__value {
+      &::after {
+        background: linear-gradient(to right, rgba(255, 255, 255, 0), $background 50%);
+      }
+    }
+  }
+}
diff --git a/src/frontend/packages/core/src/shared/components/list/list.component.theme.scss b/src/frontend/packages/core/src/shared/components/list/list.component.theme.scss
index 6c51012b83..c7e86ff821 100644
--- a/src/frontend/packages/core/src/shared/components/list/list.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/list/list.component.theme.scss
@@ -4,10 +4,19 @@
   $primary: map-get($theme, primary);
   $foreground-colors: map-get($theme, foreground);
   $background-colors: map-get($theme, background);
+  $is-dark: map-get($theme, is-dark);
+
+  $header-selected-color: #fff;
+  @if $is-dark == true {
+    $header-selected-color: lighten(mat-color($background-colors, background), 20%);
+  } @else {
+    $header-selected-color: mat-color($primary, 50);
+  }
+
   .list-component {
     &__header {
       &--selected {
-        background-color: mat-color($primary, 50);
+        background-color: $header-selected-color;
       }
       &__right,
       &__left--multi-filters {
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 3de9cf3725..67c87f35d7 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
@@ -9,6 +9,7 @@ import { StratosEndpointExtensionDefinition } from '../../../../core/entity-cata
 import { EntitySchema } from '../../../../../../store/src/helpers/entity-schema';
 import { EntityCatalogueTestModule, TEST_CATALOGUE_ENTITIES } from '../../../../core/entity-catalogue-test.module';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
 
 describe('SimpleListComponent', () => {
   let component: SimpleListComponent;
@@ -30,20 +31,20 @@ describe('SimpleListComponent', () => {
     schema: new EntitySchema('key', endpoint.type),
     endpoint,
   }, {
-      entityBuilder: {
-        getLines: () => ([]),
-        getMetadata: () => ({ name: 'test' }),
-        getGuid: () => 'test',
-      },
-      actionBuilders: {
-        getMultiple: () => ({
-          type: 'testAction',
-          paginationKey: 'testPagKey',
-          entityType: ceType,
-          endpointType: endpoint.type
-        })
-      }
-    });
+    entityBuilder: {
+      getLines: () => ([]),
+      getMetadata: () => ({ name: 'test' }),
+      getGuid: () => 'test',
+    },
+    actionBuilders: {
+      getMultiple: () => ({
+        type: 'testAction',
+        paginationKey: 'testPagKey',
+        entityType: ceType,
+        endpointType: endpoint.type
+      })
+    }
+  });
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
@@ -51,6 +52,8 @@ describe('SimpleListComponent', () => {
         SharedModule,
         CoreModule,
         AppReducersModule,
+        RouterTestingModule,
+        SharedModule,
         NoopAnimationsModule,
         {
           ngModule: EntityCatalogueTestModule,
diff --git a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.html b/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.html
index 4ad4077847..972ac85319 100644
--- a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.html
+++ b/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.html
@@ -1,6 +1,3 @@
-<div class="markdown-preview">
-  <div class="markdown-preview__header">
-    <h1>{{ title }}</h1>
-  </div>
+<app-sidepanel-preview [title]="title">
   <div #markdown class="markdown-preview__content" [innerHtml]="markdownHtml" appMarkdownContentObserver (innerHtmlRendered)="markdownRendered()"></div>
-</div>
\ No newline at end of file
+</app-sidepanel-preview>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.scss b/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.scss
index 2a7eaa882f..e69de29bb2 100644
--- a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.scss
+++ b/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.scss
@@ -1,21 +0,0 @@
-.markdown-preview {
-  display: flex;
-  flex-direction: column;
-  height: 100vh;
-  &__header {
-    display: flex;
-    flex: 0 0 56px;
-    height: 56px;
-
-    h1 {
-      align-self: center;
-      font-size: 20px;
-      margin-left: 24px;
-    }
-  }
-  &__content {
-    flex: 1;
-    overflow: auto;
-    padding: 10px 24px;
-  }
-}
diff --git a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.ts b/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.ts
index 97384669d0..9dba74b1d5 100644
--- a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.ts
+++ b/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.ts
@@ -4,13 +4,14 @@ import { DomSanitizer } from '@angular/platform-browser';
 import * as markdown from 'marked';
 
 import { LoggerService } from '../../../core/logger.service';
+import { PreviewableComponent } from '../../previewable-component';
 
 @Component({
   selector: 'app-markdown-preview',
   templateUrl: './markdown-preview.component.html',
   styleUrls: ['./markdown-preview.component.scss']
 })
-export class MarkdownPreviewComponent {
+export class MarkdownPreviewComponent implements PreviewableComponent {
 
   markdownHtml: string;
   documentUrl: string;
@@ -27,7 +28,15 @@ export class MarkdownPreviewComponent {
 
   @ViewChild('markdown', { static: true }) public markdown: ElementRef;
 
-  constructor(private httpClient: HttpClient, private logger: LoggerService, private domSanitizer: DomSanitizer) { }
+  constructor(
+    private httpClient: HttpClient,
+    private logger: LoggerService,
+    private domSanitizer: DomSanitizer
+  ) { }
+
+  setProps(props: { [key: string]: any }) {
+    this.setDocumentUrl = props.documentUrl;
+  }
 
   private loadDocument() {
     this.httpClient.get(this.documentUrl, { responseType: 'text' }).subscribe(
diff --git a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss
index 736c50de6b..65ed55245f 100644
--- a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss
@@ -7,6 +7,7 @@
   $error: map-get($status-colors, danger);
   $warning: map-get($status-colors, warning);
   $info: lighten($primmary-color, 20%);
+  $subdued: map-get($app-theme, subdued-color);
   .page-header {
     &__warning-count {
       background-color: mat-color($primary);
@@ -18,6 +19,12 @@
     &__menu-separator {
       background-color: mat-color($foreground, divider);
     }
+    &__menu-inner {
+      color: mat-contrast($primary, 500);
+    }
+    &__history {
+      color: $subdued;
+    }
     &__underflow {
       background-color: mat-color($primary);
     }
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 af846d0efc..d3e0436ba7 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
@@ -52,7 +52,7 @@ export class PageHeaderComponent implements OnDestroy, AfterViewInit {
     if (tabs) {
       this.pTabs = tabs.map(tab => ({
         ...tab,
-        link: this.router.createUrlTree([tab.link], {
+        link: tab.link === '-' ? null : this.router.createUrlTree([tab.link], {
           relativeTo: this.route
         }).toString()
       }));
@@ -67,7 +67,6 @@ export class PageHeaderComponent implements OnDestroy, AfterViewInit {
     }
   }
 
-
   @Input() showUnderFlow = false;
 
   private pShowHistory = true;
diff --git a/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.html b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.html
new file mode 100644
index 0000000000..9e95cac0d8
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.html
@@ -0,0 +1,8 @@
+<div class="sidepanel-preview">
+  <div class="sidepanel-preview__header">
+    <h1>{{ title }}</h1>
+  </div>
+  <div class="sidepanel-preview__content">
+    <ng-content></ng-content>
+  </div>
+</div>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.scss b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.scss
new file mode 100644
index 0000000000..c3afff37d8
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.scss
@@ -0,0 +1,23 @@
+.sidepanel-preview {
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  &__header {
+    display: flex;
+    flex: 0 0 56px;
+    height: 56px;
+
+    h1 {
+      align-self: center;
+      font-size: 20px;
+      margin-left: 24px;
+    }
+  }
+  &__content {
+    flex: 1;
+    overflow-x: hidden;
+    overflow-y: auto;
+    padding: 12px 15px;
+    position: relative;
+  }
+}
diff --git a/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.spec.ts b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.spec.ts
new file mode 100644
index 0000000000..2eb1505ae2
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.spec.ts
@@ -0,0 +1,37 @@
+import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
+import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
+import { LoggerService } from '../../../core/logger.service';
+import { SidepanelPreviewComponent } from './sidepanel-preview.component';
+
+describe('SidepanelPreviewComponent', () => {
+  let component: SidepanelPreviewComponent;
+  let fixture: ComponentFixture<SidepanelPreviewComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [SidepanelPreviewComponent],
+      providers: [LoggerService, HttpClient, HttpHandler],
+      imports: [
+        HttpClientModule,
+        HttpClientTestingModule,
+        CoreTestingModule,
+        createBasicStoreModule()
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SidepanelPreviewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.theme.scss b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.theme.scss
similarity index 67%
rename from src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.theme.scss
rename to src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.theme.scss
index 926eb8127e..c84bed25dc 100644
--- a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.theme.scss
@@ -1,12 +1,14 @@
-@mixin app-markdown-preview-theme($theme, $app-theme) {
+@mixin app-sidepanel-preview-theme($theme, $app-theme) {
   $primary: map-get($theme, primary);
 
-  .markdown-preview__header {
+  .sidepanel-preview__header {
     background-color: mat-color($primary);
     color: mat-contrast($primary, 500);
   }
 
-  .markdown-preview__content {
+  .sidepanel-preview__content {
+    background-color: map-get($app-theme, app-background-color);
+
     > h1:first-child {
       height: 0;
       margin: 0;
diff --git a/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.ts b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.ts
new file mode 100644
index 0000000000..315d11c160
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.ts
@@ -0,0 +1,14 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+  selector: 'app-sidepanel-preview',
+  templateUrl: './sidepanel-preview.component.html',
+  styleUrls: ['./sidepanel-preview.component.scss']
+})
+export class SidepanelPreviewComponent {
+
+  @Input()
+  title: string;
+
+  constructor() { }
+}
diff --git a/src/frontend/packages/core/src/shared/monitors/pagination-monitor.ts b/src/frontend/packages/core/src/shared/monitors/pagination-monitor.ts
index 595356b9aa..c9ed99a898 100644
--- a/src/frontend/packages/core/src/shared/monitors/pagination-monitor.ts
+++ b/src/frontend/packages/core/src/shared/monitors/pagination-monitor.ts
@@ -228,6 +228,8 @@ export class PaginationMonitor<T = any, Y extends AppState = GeneralEntityAppSta
       schema
     );
 
+    console.log(schema);
+
     const allEntitiesObservable$ = this.store.select(getAPIRequestDataState);
 
     const entities$ = pagination$.pipe(
diff --git a/src/frontend/packages/core/src/shared/previewable-component.ts b/src/frontend/packages/core/src/shared/previewable-component.ts
new file mode 100644
index 0000000000..40410d6f07
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/previewable-component.ts
@@ -0,0 +1,3 @@
+export interface PreviewableComponent {
+  setProps(props: { [key: string]: any }): void;
+}
diff --git a/src/frontend/packages/core/src/shared/services/panel-preview.service.ts b/src/frontend/packages/core/src/shared/services/panel-preview.service.ts
new file mode 100644
index 0000000000..eae4ace3af
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/services/panel-preview.service.ts
@@ -0,0 +1,95 @@
+import { ComponentFactory, ComponentFactoryResolver, ComponentRef, Injectable, ViewContainerRef, Inject } 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';
+
+@Injectable()
+export class PanelPreviewService {
+  private openedSubject: BehaviorSubject<boolean>;
+  public opened$: Observable<boolean>;
+
+  private container: ViewContainerRef;
+
+  constructor(
+    private componentFactoryResolver: ComponentFactoryResolver,
+    private router: Router,
+    @Inject(DOCUMENT) private document: Document,
+  ) {
+    this.openedSubject = new BehaviorSubject(false);
+    this.opened$ = this.observeSubject(this.openedSubject);
+
+    this.setupRouterListener();
+  }
+
+  public setContainer(container: ViewContainerRef) {
+    if (this.container) {
+      throw new Error('PanelPreviewService: container already set');
+    }
+
+    this.container = container;
+  }
+
+  public show(component: object, props?: { [key: string]: any }, componentFactoryResolver?: ComponentFactoryResolver) {
+    if (!this.container) {
+      throw new Error('PanelPreviewService: container must be set');
+    }
+
+    this.render(component, props, componentFactoryResolver);
+    this.openedSubject.next(true);
+
+    this.document.addEventListener('keydown', this.onKeyDown);
+  }
+
+  onKeyDown = (event) => {
+    if (event.key === 'Escape') {
+      this.hide();
+    }
+  }
+
+  public hide() {
+    if (!this.container) {
+      throw new Error('PanelPreviewService: container must be set');
+    }
+
+    this.openedSubject.next(false);
+    this.document.removeEventListener('keydown', this.onKeyDown);
+
+  }
+
+  render(component: object, props: { [key: string]: any }, componentFactoryResolver?: ComponentFactoryResolver) {
+    if (this.container.length) {
+      this.container.remove(0);
+    }
+
+    // Use the supplied component factory resolver if provided
+    const resolver = componentFactoryResolver ||  this.componentFactoryResolver;
+
+    const factory: ComponentFactory<any> = resolver.resolveComponentFactory(component as any);
+    const componentRef: ComponentRef<any> = this.container.createComponent(factory);
+
+    if (props) {
+      componentRef.instance.setProps(props);
+    }
+  }
+
+  public clear() {
+    this.container.clear();
+    this.openedSubject.next(false);
+  }
+
+  private setupRouterListener() {
+    this.router.events.pipe(
+      filter(() => !!this.container),
+      tap((e) => this.hide()))
+      .subscribe();
+  }
+
+  private observeSubject(subject: Subject<any>) {
+    return subject.asObservable().pipe(
+      publishReplay(1),
+      refCount(),
+      observeOn(asapScheduler)
+    );
+  }
+}
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index 12aae65f83..37d5826062 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -58,8 +58,12 @@ import { TableCellStatusDirective } from './components/list/list-table/table-cel
 import { TableComponent } from './components/list/list-table/table.component';
 import { listTableComponents } from './components/list/list-table/table.types';
 import { EndpointCardComponent } from './components/list/list-types/endpoint/endpoint-card/endpoint-card.component';
+import { EndpointListHelper } from './components/list/list-types/endpoint/endpoint-list.helpers';
+import { EndpointsListConfigService } from './components/list/list-types/endpoint/endpoints-list-config.service';
 import { ListComponent } from './components/list/list.component';
 import { ListConfig } from './components/list/list.component.types';
+import { ListHostDirective } from './components/list/simple-list/list-host.directive';
+import { SimpleListComponent } from './components/list/simple-list/simple-list.component';
 import { LoadingPageComponent } from './components/loading-page/loading-page.component';
 import { LogViewerComponent } from './components/log-viewer/log-viewer.component';
 import { MarkdownContentObserverDirective } from './components/markdown-preview/markdown-content-observer.directive';
@@ -78,6 +82,7 @@ import { PageSubNavComponent } from './components/page-sub-nav/page-sub-nav.comp
 import { PollingIndicatorComponent } from './components/polling-indicator/polling-indicator.component';
 import { RingChartComponent } from './components/ring-chart/ring-chart.component';
 import { RoutingIndicatorComponent } from './components/routing-indicator/routing-indicator.component';
+import { SidepanelPreviewComponent } from './components/sidepanel-preview/sidepanel-preview.component';
 import { SimpleUsageChartComponent } from './components/simple-usage-chart/simple-usage-chart.component';
 import { SnackBarReturnComponent } from './components/snackbar-return/snackbar-return.component';
 import { SshViewerComponent } from './components/ssh-viewer/ssh-viewer.component';
@@ -111,11 +116,9 @@ import { UsageBytesPipe } from './pipes/usage-bytes.pipe';
 import { ValuesPipe } from './pipes/values.pipe';
 import { CloudFoundryUserProvidedServicesService } from './services/cloud-foundry-user-provided-services.service';
 import { MetricsRangeSelectorService } from './services/metrics-range-selector.service';
+import { PanelPreviewService } from './services/panel-preview.service';
 import { UserPermissionDirective } from './user-permission.directive';
-import { SimpleListComponent } from './components/list/simple-list/simple-list.component';
-import { ListHostDirective } from './components/list/simple-list/list-host.directive';
-import { EndpointListHelper } from './components/list/list-types/endpoint/endpoint-list.helpers';
-import { EndpointsListConfigService } from './components/list/list-types/endpoint/endpoints-list-config.service';
+import { JsonViewerComponent } from './components/json-viewer/json-viewer.component';
 
 /* tslint:disable:max-line-length */
 
@@ -211,13 +214,14 @@ import { EndpointsListConfigService } from './components/list/list-types/endpoin
     BreadcrumbsComponent,
     PageSubNavSectionComponent,
     EntitySummaryTitleComponent,
-    MarkdownPreviewComponent,
     MarkdownContentObserverDirective,
     SnackBarReturnComponent,
     PollingIndicatorComponent,
     UnlimitedInputComponent,
+    JsonViewerComponent,
     SimpleListComponent,
     ListHostDirective,
+    SidepanelPreviewComponent
   ],
   exports: [
     ApplicationStateIconPipe,
@@ -300,18 +304,21 @@ import { EndpointsListConfigService } from './components/list/list-types/endpoin
     AppNameUniqueDirective,
     SimpleUsageChartComponent,
     EntitySummaryTitleComponent,
-    MarkdownPreviewComponent,
     MarkdownContentObserverDirective,
+    TileSelectorComponent,
     AppNameUniqueDirective,
     PollingIndicatorComponent,
     UnlimitedInputComponent,
+    JsonViewerComponent,
     SimpleListComponent,
-    ListHostDirective
+    ListHostDirective,
+    SidepanelPreviewComponent,
   ],
   entryComponents: [
     DialogConfirmComponent,
     EnvVarViewComponent,
-    SnackBarReturnComponent
+    SnackBarReturnComponent,
+    MarkdownPreviewComponent,
   ],
   providers: [
     ListConfig,
diff --git a/src/frontend/packages/core/src/styles.scss b/src/frontend/packages/core/src/styles.scss
index 1fe35bd298..efc3234fb7 100644
--- a/src/frontend/packages/core/src/styles.scss
+++ b/src/frontend/packages/core/src/styles.scss
@@ -10,6 +10,8 @@
 @import '../sass/components/mat-popup';
 @import '../sass/components/mat-tabs';
 @import '../sass/components/mat-table';
+@import '../sass/components/mat-button-toggle-group';
+
 body {
   font-family: Lato, sans-serif; // font-size: 13px;
   margin: 0;
@@ -65,3 +67,11 @@ button.mat-simple-snackbar-action {
 //   flex: 1;
 //   flex-direction: column;
 // }
+
+
+// Add selector so that the UI can detect if a dark theme is available
+@if $stratos-dark-theme-supported {
+  .dark-theme-supported {
+    margin: 0;
+  }
+}
diff --git a/src/frontend/packages/core/test-framework/store-test-helper.ts b/src/frontend/packages/core/test-framework/store-test-helper.ts
index c2383e2937..514913173a 100644
--- a/src/frontend/packages/core/test-framework/store-test-helper.ts
+++ b/src/frontend/packages/core/test-framework/store-test-helper.ts
@@ -164,7 +164,9 @@ function getDefaultInitialTestStratosStoreState() {
       isMobile: false,
       isMobileNavOpen: false,
       sideNavPinned: false,
-      pollingEnabled: true
+      headerEventMinimized: false,
+      pollingEnabled: true,
+      themeKey: null
     },
     actionHistory: [],
     lists: {},
diff --git a/src/frontend/packages/store/src/actions/dashboard-actions.ts b/src/frontend/packages/store/src/actions/dashboard-actions.ts
index 88c8f8019c..b06a5d043a 100644
--- a/src/frontend/packages/store/src/actions/dashboard-actions.ts
+++ b/src/frontend/packages/store/src/actions/dashboard-actions.ts
@@ -1,5 +1,6 @@
 import { Action } from '@ngrx/store';
 
+import { StratosTheme } from '../../../core/src/core/theme.service';
 import { DashboardState } from '../reducers/dashboard-reducer';
 
 export const OPEN_SIDE_NAV = '[Dashboard] Open side nav';
@@ -10,12 +11,9 @@ export const SET_HEADER_EVENT = '[Dashboard] Set header event';
 export const ENABLE_SIDE_NAV_MOBILE_MODE = '[Dashboard] Enable mobile nav';
 export const DISABLE_SIDE_NAV_MOBILE_MODE = '[Dashboard] Disable mobile nav';
 
-export const SHOW_SIDE_HELP = '[Dashboard] Show side help';
-export const CLOSE_SIDE_HELP = '[Dashboard] Close side help';
-
-
 export const TIMEOUT_SESSION = '[Dashboard] Timeout Session';
 export const ENABLE_POLLING = '[Dashboard] Enable Polling';
+export const SET_STRATOS_THEME = '[Dashboard] Set Theme';
 
 export const HYDRATE_DASHBOARD_STATE = '[Dashboard] Hydrate dashboard state';
 
@@ -36,15 +34,6 @@ export class ToggleSideNav implements Action {
   type = TOGGLE_SIDE_NAV;
 }
 
-export class ShowSideHelp implements Action {
-  constructor(public document: string) { }
-  type = SHOW_SIDE_HELP;
-}
-
-export class CloseSideHelp implements Action {
-  type = CLOSE_SIDE_HELP;
-}
-
 export class SetHeaderEvent implements Action {
   constructor(public minimised = false) { }
   type = SET_HEADER_EVENT;
@@ -73,3 +62,7 @@ export class HydrateDashboardStateAction implements Action {
   type = HYDRATE_DASHBOARD_STATE;
 }
 
+export class SetThemeAction implements Action {
+  constructor(public theme: StratosTheme) { }
+  type = SET_STRATOS_THEME;
+}
diff --git a/src/frontend/packages/store/src/effects/auth.effects.ts b/src/frontend/packages/store/src/effects/auth.effects.ts
index 15966e03a5..38c8883ba8 100644
--- a/src/frontend/packages/store/src/effects/auth.effects.ts
+++ b/src/frontend/packages/store/src/effects/auth.effects.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
+import { HttpClient, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
@@ -28,9 +28,9 @@ import {
 import { HydrateDashboardStateAction } from '../actions/dashboard-actions';
 import { GET_ENDPOINTS_SUCCESS, GetAllEndpointsSuccess } from '../actions/endpoint.actions';
 import { GetSystemInfo } from '../actions/system.actions';
+import { DispatchOnlyAppState } from '../app-state';
 import { getDashboardStateSessionId } from '../helpers/store-helpers';
 import { SessionData } from '../types/auth.types';
-import { DispatchOnlyAppState } from '../app-state';
 
 const SETUP_HEADER = 'stratos-setup-required';
 const UPGRADE_HEADER = 'retry-after';
@@ -50,8 +50,6 @@ export class AuthEffect {
   @Effect() loginRequest$ = this.actions$.pipe(
     ofType<Login>(LOGIN),
     switchMap(({ username, password }) => {
-      const encoder = new BrowserStandardEncoder();
-      const headers = new HttpHeaders();
       const params = new HttpParams({
         encoder: new BrowserStandardEncoder(),
         fromObject: {
@@ -59,9 +57,10 @@ export class AuthEffect {
           password
         }
       });
+      const headers = {
+        'x-cap-request-date': (Math.floor(Date.now() / 1000)).toString()
+      };
 
-      headers.set('Content-Type', 'application/x-www-form-urlencoded');
-      headers.set('x-cap-request-date', (Math.floor(Date.now() / 1000)).toString());
       return this.http.post('/pp/v1/auth/login/uaa', params, {
         headers,
       }).pipe(
@@ -72,8 +71,10 @@ export class AuthEffect {
   @Effect() verifyAuth$ = this.actions$.pipe(
     ofType<VerifySession>(VERIFY_SESSION),
     switchMap(action => {
-      const headers = new HttpHeaders();
-      headers.set('x-cap-request-date', (Math.floor(Date.now() / 1000)).toString());
+      const headers = {
+        'x-cap-request-date': (Math.floor(Date.now() / 1000)).toString()
+      };
+
       return this.http.get<SessionData>('/pp/v1/auth/session/verify', {
         headers,
         observe: 'response',
diff --git a/src/frontend/packages/store/src/effects/dashboard.effects.ts b/src/frontend/packages/store/src/effects/dashboard.effects.ts
new file mode 100644
index 0000000000..0e796db044
--- /dev/null
+++ b/src/frontend/packages/store/src/effects/dashboard.effects.ts
@@ -0,0 +1,24 @@
+import { Injectable } from '@angular/core';
+import { Actions, Effect, ofType } from '@ngrx/effects';
+import { map } from 'rxjs/operators';
+
+import { ThemeService } from '../../../core/src/core/theme.service';
+import { HYDRATE_DASHBOARD_STATE, HydrateDashboardStateAction } from '../actions/dashboard-actions';
+
+
+@Injectable()
+export class DashboardEffect {
+
+  constructor(
+    private actions$: Actions,
+    private themeService: ThemeService
+  ) { }
+
+  @Effect({ dispatch: false }) hydrate$ = this.actions$.pipe(
+    ofType<HydrateDashboardStateAction>(HYDRATE_DASHBOARD_STATE),
+    map(() => {
+      // Ensure the previous theme is applied
+      this.themeService.initialize();
+    })
+  );
+}
diff --git a/src/frontend/packages/store/src/effects/endpoint.effects.ts b/src/frontend/packages/store/src/effects/endpoint.effects.ts
index d5deac379f..ae60aeff15 100644
--- a/src/frontend/packages/store/src/effects/endpoint.effects.ts
+++ b/src/frontend/packages/store/src/effects/endpoint.effects.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpErrorResponse, HttpHeaders, HttpParams } from '@angular/common/http';
+import { HttpClient, HttpErrorResponse, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
@@ -274,11 +274,8 @@ export class EndpointsEffect {
     errorMessageHandler?: (e: any) => string,
   ) {
     const endpointEntityKey = entityCatalogue.getEntityKey(apiAction);
-    const headers = new HttpHeaders();
-    headers.set('Content-Type', 'application/x-www-form-urlencoded');
     this.store.dispatch(new StartRequestAction(apiAction, apiActionType));
     return this.http.post(url, body || {}, {
-      headers,
       params
     }).pipe(
       mergeMap((endpoint: EndpointModel) => {
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 00a2a1f541..d08d04483d 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,4 +1,5 @@
 import { Action } from '@ngrx/store';
+import { normalize } from 'normalizr';
 
 import { StratosBaseCatalogueEntity } from '../../../../core/src/core/entity-catalogue/entity-catalogue-entity';
 import { entityCatalogue } from '../../../../core/src/core/entity-catalogue/entity-catalogue.service';
@@ -10,9 +11,8 @@ import { PipelineResult } from '../entity-request-pipeline.types';
 import { getSuccessMapper } from '../pipeline-helpers';
 import { endpointErrorsHandlerFactory } from './endpoint-errors.handler';
 import { patchActionWithForcedConfig } from './forced-action-type.helpers';
-import { HandledMultiEndpointResponse, JetstreamError } from './handle-multi-endpoints.pipe';
+import { HandledMultiEndpointResponse, JetstreamError, MultiEndpointResponse } from './handle-multi-endpoints.pipe';
 import { multiEndpointResponseMergePipe } from './merge-multi-endpoint-data.pipe';
-import { normalizeEntityPipeFactory } from './normalize-entity-request-response.pipe';
 
 const baseErrorHandler = () => 'Api Request Failed';
 
@@ -56,6 +56,19 @@ function getEntities(
     }, {});
 }
 
+// TODO: Type the output of this pipe. #3976
+function getNormalizedEntityData(
+  entities: any[],
+  action: EntityRequestAction,
+  catalogueEntity: StratosBaseCatalogueEntity) {
+  // Can patchActionWithForcedConfig be done outside of the pipe?
+  // This pipe shouldn't have to worry about the multi entity lists.
+  const patchedAction = patchActionWithForcedConfig(action);
+  const schema = patchedAction.entity || catalogueEntity.getSchema(patchedAction.schemaKey);
+  const arraySafeSchema = Array.isArray(schema) ? schema[0] : schema;
+  return normalize(entities, Array.isArray(entities) ? [arraySafeSchema] : arraySafeSchema);
+}
+
 export function mapMultiEndpointResponses(
   action: EntityRequestAction,
   catalogueEntity: StratosBaseCatalogueEntity,
@@ -63,12 +76,6 @@ export function mapMultiEndpointResponses(
   multiEndpointResponses: HandledMultiEndpointResponse,
   actionDispatcher: (actionToDispatch: Action) => void
 ): PipelineResult {
-  const normalizeEntityPipe = normalizeEntityPipeFactory(
-    catalogueEntity,
-    // Can this be done outside of the pipe?
-    // This pipe shouldn't have to worry about the multi entity lists.
-    patchActionWithForcedConfig(action).schemaKey
-  );
   const endpointErrorHandler = endpointErrorsHandlerFactory(actionDispatcher);
   endpointErrorHandler(
     action,
@@ -84,23 +91,28 @@ export function mapMultiEndpointResponses(
       errorMessage
     };
   } else {
-    const responses = multiEndpointResponses.successes.map(normalizeEntityPipe);
-    const mapped = responses.map(endpointResponse => {
-      const entities = getEntities(endpointResponse, action);
-      const parentEntities = entities[catalogueEntity.entityKey];
-      return {
-        response: {
-          entities,
-          // If we changed the guid of the entities then make sure this is reflected in the result array.
-          result: parentEntities ? Object.keys(parentEntities) : endpointResponse.normalizedEntities.result,
-        },
-        totalPages: endpointResponse.totalPages,
-        totalResults: endpointResponse.totalResults,
-        success: null
-      };
-    });
-    // NormalizedResponse
-    const response = multiEndpointResponseMergePipe(mapped);
+    const responses = multiEndpointResponses.successes
+      .map((responseData: MultiEndpointResponse<any>) => ({
+        normalizedEntities: getNormalizedEntityData(responseData.entities, action, catalogueEntity),
+        endpointGuid: responseData.endpointGuid,
+        totalResults: responseData.totalResults,
+        totalPages: responseData.totalPages
+      }))
+      .map(endpointResponse => {
+        const entities = getEntities(endpointResponse, action);
+        const parentEntities = entities[catalogueEntity.entityKey];
+        return {
+          response: {
+            entities,
+            // If we changed the guid of the entities then make sure this is reflected in the result array.
+            result: parentEntities ? Object.keys(parentEntities) : endpointResponse.normalizedEntities.result,
+          },
+          totalPages: endpointResponse.totalPages,
+          totalResults: endpointResponse.totalResults,
+          success: null
+        };
+      });
+    const response = multiEndpointResponseMergePipe(responses);
     return {
       ...response,
       success: true,
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/normalize-entity-request-response.pipe.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/normalize-entity-request-response.pipe.ts
deleted file mode 100644
index ee538455b8..0000000000
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/normalize-entity-request-response.pipe.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { StratosBaseCatalogueEntity } from '../../../../core/src/core/entity-catalogue/entity-catalogue-entity';
-import { MultiEndpointResponse } from './handle-multi-endpoints.pipe';
-
-// TODO: Type the output of this pipe. #3976
-export const normalizeEntityPipeFactory = (catalogueEntity: StratosBaseCatalogueEntity, schemaKey?: string) => {
-  return (responseData: MultiEndpointResponse<any>) => {
-    return {
-      normalizedEntities: catalogueEntity.getNormalizedEntityData(responseData.entities, schemaKey),
-      endpointGuid: responseData.endpointGuid,
-      totalResults: responseData.totalResults,
-      totalPages: responseData.totalPages
-    };
-  };
-};
diff --git a/src/frontend/packages/store/src/reducers/dashboard-reducer.ts b/src/frontend/packages/store/src/reducers/dashboard-reducer.ts
index 5963b912b9..4673aa2a15 100644
--- a/src/frontend/packages/store/src/reducers/dashboard-reducer.ts
+++ b/src/frontend/packages/store/src/reducers/dashboard-reducer.ts
@@ -1,5 +1,4 @@
 import {
-  CLOSE_SIDE_HELP,
   CLOSE_SIDE_NAV,
   DISABLE_SIDE_NAV_MOBILE_MODE,
   ENABLE_POLLING,
@@ -7,9 +6,12 @@ import {
   HYDRATE_DASHBOARD_STATE,
   HydrateDashboardStateAction,
   OPEN_SIDE_NAV,
+  SET_HEADER_EVENT,
+  SET_STRATOS_THEME,
+  SetHeaderEvent,
   SetPollingEnabledAction,
   SetSessionTimeoutAction,
-  SHOW_SIDE_HELP,
+  SetThemeAction,
   TIMEOUT_SESSION,
   TOGGLE_SIDE_NAV,
 } from '../actions/dashboard-actions';
@@ -21,8 +23,8 @@ export interface DashboardState {
   isMobile: boolean;
   isMobileNavOpen: boolean;
   sideNavPinned: boolean;
-  sideHelpOpen: boolean;
-  sideHelpDocument: string;
+  headerEventMinimized: boolean;
+  themeKey: string;
 }
 
 export const defaultDashboardState: DashboardState = {
@@ -32,8 +34,8 @@ export const defaultDashboardState: DashboardState = {
   isMobile: false,
   isMobileNavOpen: false,
   sideNavPinned: true,
-  sideHelpOpen: false,
-  sideHelpDocument: null,
+  headerEventMinimized: false,
+  themeKey: null
 };
 
 export function dashboardReducer(state: DashboardState = defaultDashboardState, action): DashboardState {
@@ -57,10 +59,11 @@ export function dashboardReducer(state: DashboardState = defaultDashboardState,
       return { ...state, isMobile: true, isMobileNavOpen: false };
     case DISABLE_SIDE_NAV_MOBILE_MODE:
       return { ...state, isMobile: false, isMobileNavOpen: false };
-    case SHOW_SIDE_HELP:
-      return { ...state, sideHelpOpen: true, sideHelpDocument: action.document };
-    case CLOSE_SIDE_HELP:
-      return { ...state, sideHelpOpen: false, sideHelpDocument: '' };
+    case SET_HEADER_EVENT:
+      const setHeaderEvent = action as SetHeaderEvent;
+      return {
+        ...state, headerEventMinimized: setHeaderEvent.minimised
+      };
     case TIMEOUT_SESSION:
       const timeoutSessionAction = action as SetSessionTimeoutAction;
       return {
@@ -79,6 +82,12 @@ export function dashboardReducer(state: DashboardState = defaultDashboardState,
         ...state,
         ...hydrateDashboardStateAction.dashboardState
       };
+    case SET_STRATOS_THEME:
+      const setThemeAction = action as SetThemeAction;
+      return {
+        ...state,
+        themeKey: setThemeAction.theme ? setThemeAction.theme.key : null
+      };
     default:
       return state;
   }
diff --git a/src/frontend/packages/store/src/store.module.ts b/src/frontend/packages/store/src/store.module.ts
index 386db19890..14c8160af6 100644
--- a/src/frontend/packages/store/src/store.module.ts
+++ b/src/frontend/packages/store/src/store.module.ts
@@ -6,6 +6,7 @@ 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';
 import { EndpointsEffect } from './effects/endpoint.effects';
 import { MetricsEffect } from './effects/metrics.effects';
@@ -21,8 +22,8 @@ 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';
-import { AppReducersModule } from './reducers.module';
 import { PipelineHttpClient } from './entity-request-pipeline/pipline-http-client.service';
+import { AppReducersModule } from './reducers.module';
 
 
 @NgModule({
@@ -33,6 +34,7 @@ import { PipelineHttpClient } from './entity-request-pipeline/pipline-http-clien
     AppReducersModule,
     HttpClientModule,
     EffectsModule.forRoot([
+      DashboardEffect,
       APIEffect,
       EndpointApiError,
       AuthEffect,
diff --git a/src/jetstream/authuaa.go b/src/jetstream/authuaa.go
index f5d7ee3113..63b152eab4 100644
--- a/src/jetstream/authuaa.go
+++ b/src/jetstream/authuaa.go
@@ -151,11 +151,6 @@ func (a *uaaAuth) VerifySession(c echo.Context, sessionUser string, sessionExpir
 		if err = a.p.setSessionValues(c, sessionValues); err != nil {
 			return err
 		}
-	} else {
-		// Still need to extend the expires_on of the Session
-		if err = a.p.setSessionValues(c, nil); err != nil {
-			return err
-		}
 	}
 
 	return nil
diff --git a/src/jetstream/go.mod b/src/jetstream/go.mod
index 46648a6e7f..aa663b2009 100644
--- a/src/jetstream/go.mod
+++ b/src/jetstream/go.mod
@@ -6,13 +6,16 @@ require (
 	bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c
 	code.cloudfoundry.org/bytefmt v0.0.0-20180906201452-2aa6f33b730c // indirect
 	code.cloudfoundry.org/cli v6.43.0+incompatible
+	code.cloudfoundry.org/diego-ssh v0.0.0-20190821205424-d560480f8c18 // indirect
 	code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f // indirect
-	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
-	github.com/SermoDigital/jose v0.9.1
-	github.com/Sirupsen/logrus v0.0.0-00010101000000-000000000000 // indirect
+	code.cloudfoundry.org/inigo v0.0.0-20191009011458-4d57c5db28ee // indirect
+	code.cloudfoundry.org/lager v2.0.0+incompatible // indirect
+	code.cloudfoundry.org/ykk v0.0.0-20170424192843-e4df4ce2fd4d // indirect
 	github.com/antonlindstrom/pgstore v0.0.0-20170604072116-a407030ba6d0
+	github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77 // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
 	github.com/bmatcuk/doublestar v1.1.1 // indirect
+	github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40 // indirect
 	github.com/cf-stratos/mysqlstore v0.0.0-20170822100912-304308519d13
 	github.com/charlievieth/fs v0.0.0-20170613215519-7dc373669fa1 // indirect
 	github.com/cloudfoundry-community/go-cfenv v1.17.0
@@ -24,9 +27,9 @@ require (
 	github.com/cloudfoundry/noaa v2.1.0+incompatible
 	github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4
 	github.com/cppforlife/go-patch v0.2.0 // indirect
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
 	github.com/domodwyer/mailyak v3.1.1+incompatible
 	github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 // indirect
+	github.com/elazarl/goproxy/ext v0.0.0-20191011121108-aa519ddbe484 // indirect
 	github.com/fatih/color v1.7.0 // indirect
 	github.com/go-sql-driver/mysql v1.4.1
 	github.com/golang/snappy v0.0.1 // indirect
@@ -40,36 +43,37 @@ require (
 	github.com/jessevdk/go-flags v1.4.0 // indirect
 	github.com/jtolds/gls v4.20.0+incompatible // indirect
 	github.com/kat-co/vala v0.0.0-20170210184112-42e1d8b61f12
-	github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4
 	github.com/labstack/echo v3.3.10+incompatible
 	github.com/labstack/gommon v0.3.0 // indirect
-	github.com/lib/pq v1.1.0 // indirect
 	github.com/lunixbochs/vtclean v1.0.0 // indirect
-	github.com/mailru/easyjson v0.0.0-20190221075403-6243d8e04c3f // indirect
 	github.com/mattn/go-colorable v0.1.4 // indirect
 	github.com/mattn/go-isatty v0.0.10 // indirect
-	github.com/mattn/go-runewidth v0.0.4 // indirect
 	github.com/mattn/go-sqlite3 v1.10.0
 	github.com/mholt/archiver v3.1.1+incompatible
-	github.com/mitchellh/mapstructure v1.1.2 // indirect
+	github.com/miekg/dns v1.1.4 // indirect
 	github.com/moby/moby v1.13.1 // indirect
+	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
 	github.com/nwaples/rardecode v1.0.0 // indirect
 	github.com/nwmac/sqlitestore v0.0.0-20180824125213-7d2ab221fb3f
+	github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830 // indirect
 	github.com/pierrec/lz4 v2.0.5+incompatible // indirect
+	github.com/poy/eachers v0.0.0-20181020210610-23942921fe77 // indirect
 	github.com/satori/go.uuid v1.2.0
-	github.com/sirupsen/logrus v1.3.0
+	github.com/sirupsen/logrus v1.4.2
 	github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 // indirect
-	github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa
+	github.com/smartystreets/goconvey v1.6.4
+	github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect
+	github.com/tedsuo/rata v1.0.0 // indirect
 	github.com/ulikunitz/xz v0.5.6 // indirect
 	github.com/valyala/fasttemplate v1.1.0 // indirect
 	github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec // indirect
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
-	golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f
-	golang.org/x/net v0.0.0-20190420063019-afa5a82059c6 // indirect
-	google.golang.org/appengine v1.5.0 // indirect
-	gopkg.in/DATA-DOG/go-sqlmock.v1 v1.0.0-00010101000000-000000000000
+	golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152
+	gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0
 	gopkg.in/cheggaaa/pb.v1 v1.0.27 // indirect
-	gopkg.in/yaml.v2 v2.2.2
+	gopkg.in/yaml.v2 v2.2.7
+	k8s.io/apiextensions-apiserver v0.0.0 // indirect
+	k8s.io/kubectl v0.0.0 // indirect
 )
 
 replace github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes => ./plugins/kubernetes
@@ -79,6 +83,7 @@ replace github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/monocula
 replace (
 	github.com/SermoDigital/jose => github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc
 	github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.4.1
+	github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309
 	github.com/helm/monocular/chartrepo => ./plugins/monocular/chart-repo
 	github.com/helm/monocular/chartsvc => ./plugins/monocular/chartsvc
 	github.com/kubernetes-sigs/aws-iam-authenticator => github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc
@@ -87,12 +92,28 @@ replace (
 	github.com/smartystreets/goconvey => github.com/smartystreets/goconvey v0.0.0-20160503033757-d4c757aa9afd
 	github.com/spf13/cobra => github.com/spf13/cobra v0.0.3
 	gopkg.in/DATA-DOG/go-sqlmock.v1 => github.com/DATA-DOG/go-sqlmock v1.1.3
-	k8s.io/api => k8s.io/api v0.0.0-20190222213804-5cb15d344471
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190221221350-bfb440be4b87
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628
-	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190221215341-5838f549963b
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190221221947-d8fee89e76ca
-	k8s.io/client-go => k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible
-	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4
-	k8s.io/kubernetes => k8s.io/kubernetes v1.13.3
+	k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20191001043732-d647ddbd755f
+	//k8s.io/kubernetes => k8s.io/kubernetes/staging/src/k8s.io/kubernetes v1.13.3
+	k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20191001043732-d647ddbd755f
+	//k8s.io/kube-openapi => k8s.io/kubernetes/staging/src/k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4
+	k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20191001043732-d647ddbd755f
+	k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20191001043732-d647ddbd755f
+
 )
diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index ebbb9c968a..29ebc835f3 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -2,48 +2,109 @@ bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c h1:bkb2NMGo3/Du
 bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c/go.mod h1:hSVuE3qU7grINVSwrmzHfpg9k87ALBk+XaualNyUzI4=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
 code.cloudfoundry.org/bytefmt v0.0.0-20180906201452-2aa6f33b730c h1:VzwteSWGbW9mxXTEkH+kpnao5jbgLynw3hq742juQh8=
 code.cloudfoundry.org/bytefmt v0.0.0-20180906201452-2aa6f33b730c/go.mod h1:wN/zk7mhREp/oviagqUXY3EwuHhWyOvAdsn5Y4CzOrc=
 code.cloudfoundry.org/cli v6.43.0+incompatible h1:jAaPyHN5Hb2r2sR9i8Y8ejKPiPpuBYMaHBFyKVmQ7T4=
 code.cloudfoundry.org/cli v6.43.0+incompatible/go.mod h1:e4d+EpbwevNhyTZKybrLlyTvpH+W22vMsmdmcTxs/Fo=
+code.cloudfoundry.org/diego-ssh v0.0.0-20190821205424-d560480f8c18 h1:Uf9tS67L4P92h4tzbnR+9pJqqxUU5MgxQNrvuht8L8g=
+code.cloudfoundry.org/diego-ssh v0.0.0-20190821205424-d560480f8c18/go.mod h1:L2/glHnSK+wKnsG8oZZqdV2sgYY9NDo/I1aDJGhcWaM=
 code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f h1:UrKzEwTgeiff9vxdrfdqxibzpWjxLnuXDI5m6z3GJAk=
 code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f/go.mod h1:sk5LnIjB/nIEU7yP5sDQExVm62wu0pBh3yrElngUisI=
+code.cloudfoundry.org/inigo v0.0.0-20191009011458-4d57c5db28ee h1:tZJ6H/AttVPtxGDJIWHtRYOv0lHE/ieRGpAT4ocJCoY=
+code.cloudfoundry.org/inigo v0.0.0-20191009011458-4d57c5db28ee/go.mod h1:1ZB1JCh2FAp+SqX79ve6dc8YREvbsziULEOncAilX4Q=
+code.cloudfoundry.org/lager v2.0.0+incompatible h1:WZwDKDB2PLd/oL+USK4b4aEjUymIej9My2nUQ9oWEwQ=
+code.cloudfoundry.org/lager v2.0.0+incompatible/go.mod h1:O2sS7gKP3HM2iemG+EnwvyNQK7pTSC6Foi4QiMp9sSk=
+code.cloudfoundry.org/ykk v0.0.0-20170424192843-e4df4ce2fd4d h1:M+zXqtXJqcsmpL76aU0tdl1ho23eYa4axYoM4gD62UA=
+code.cloudfoundry.org/ykk v0.0.0-20170424192843-e4df4ce2fd4d/go.mod h1:YUJiVOr5xl0N/RjMxM1tHmgSpBbi5UM+KoVR5AoejO0=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
+github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
+github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
+github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
+github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
+github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
+github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
+github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/DATA-DOG/go-sqlmock v1.1.0 h1:4Ws0QCHb0hIwOCboP/hT+msNYGbR+qmZdJMSoW4lyvM=
-github.com/DATA-DOG/go-sqlmock v1.1.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/DATA-DOG/go-sqlmock v1.1.3 h1:sVIxMSTMnnVzl9Bn6BMjW6p5lSbpjHL80mqnxMWJ/oE=
 github.com/DATA-DOG/go-sqlmock v1.1.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
+github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
 github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e h1:eb0Pzkt15Bm7f2FFYv7sjY7NPFi3cPkS3tv1CcrFBWA=
 github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
 github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg=
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc=
 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/Masterminds/semver/v3 v3.0.1 h1:2kKm5lb7dKVrt5TYUiAavE6oFc1cFT0057UVGT+JqLk=
+github.com/Masterminds/semver/v3 v3.0.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/Masterminds/sprig v2.18.0+incompatible h1:QoGhlbC6pter1jxKnjMFxT8EqsLuDE6FEcNbWEpw+lI=
 github.com/Masterminds/sprig v2.18.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o=
+github.com/Masterminds/sprig/v3 v3.0.0 h1:KSQz7Nb08/3VU9E4ns29dDxcczhOD1q7O1UfM4G3t3g=
+github.com/Masterminds/sprig/v3 v3.0.0/go.mod h1:NEUY/Qq8Gdm2xgYA+NwJM6wmfdRV9xkh8h/Rld20R0U=
+github.com/Masterminds/vcs v1.13.0/go.mod h1:N09YCmOQr6RLxC6UNHzuVwAdodYbbnycGHSmwVJjcKA=
+github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
+github.com/Microsoft/go-winio v0.4.12 h1:xAfWHN1IrQ0NJ9TBC0KBZoqLjzDTr1ML+4MywiUOryc=
+github.com/Microsoft/go-winio v0.4.12/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
+github.com/Microsoft/hcsshim v0.8.6 h1:ZfF0+zZeYdzMIVMZHKtDKJvLHj76XCuVae/jNkjj0IA=
+github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
+github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
+github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.0 h1:rmGxhojJlM0tuKtfdvliR84CFHljx9ag64t2xmVkjK4=
 github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
+github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc h1:MhBvG7RLaLqlyjxMR6of35vt6MVQ+eXMcgn9X/sy0FE=
 github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA=
+github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs=
+github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/antonlindstrom/pgstore v0.0.0-20170604072116-a407030ba6d0 h1:e6PEaXbztY0ViaKotCICNnBQDUeNEJgrQ5UAHWlloh4=
 github.com/antonlindstrom/pgstore v0.0.0-20170604072116-a407030ba6d0/go.mod h1:2Ti6VUHVxpC0VSmTZzEvpzysnaGAfGBOoMIz5ykPyyw=
+github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77 h1:afT88tB6u9JCKQZVAAaa9ICz/uGn5Uw9ekn6P22mYKM=
+github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77/go.mod h1:bXvGk6IkT1Agy7qzJ+DjIw/SJ1AaB3AvAuMDVV+Vkoo=
 github.com/arschles/assert v1.0.0 h1:NofQbRhtxcLgP+XoKunA7J6UMJNTqX7xR/19tej8UsA=
 github.com/arschles/assert v1.0.0/go.mod h1:m/u69zW43x0h8dTHcv3JJZljINyEYgBuf5fYJP6WikI=
+github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
+github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
+github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/aws/aws-sdk-go v1.17.5 h1:WW9Hm3KYo48iZHpmBc+b7sgyS0h32zgCvya28SLW4BU=
 github.com/aws/aws-sdk-go v1.17.5/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y=
+github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
+github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/bmatcuk/doublestar v1.1.1 h1:YroD6BJCZBYx06yYFEWvUuKVWQn3vLLQAVmDmvTSaiQ=
 github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
+github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40 h1:y4B3+GPxKlrigF1ha5FFErxK+sr6sWxQovRMzwMhejo=
+github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c=
+github.com/bshuster-repo/logrus-logstash-hook v0.4.1 h1:pgAtgj+A31JBVtEHu2uHuEx0n+2ukqUJnS2vVe5pQNA=
+github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
+github.com/bugsnag/bugsnag-go v1.5.0 h1:tP8hiPv1pGGW3LA6LKy5lW6WG+y9J2xWUdPd3WC452k=
+github.com/bugsnag/bugsnag-go v1.5.0/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
+github.com/bugsnag/panicwrap v1.2.0 h1:OzrKrRvXis8qEvOkfcxNcYbOd2O7xXS2nnKMEMABFQA=
+github.com/bugsnag/panicwrap v1.2.0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
+github.com/cespare/xxhash/v2 v2.1.0 h1:yTUvW7Vhb89inJ+8irsUqiWjh8iT6sQPZiQzI6ReGkA=
+github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM=
 github.com/cf-stratos/mysqlstore v0.0.0-20170822100912-304308519d13 h1:WwIvjUUodNoZduhdhotbKnrLSFoIn5vD3QgNZv0hjvo=
 github.com/cf-stratos/mysqlstore v0.0.0-20170822100912-304308519d13/go.mod h1:GgQT0ToC+7JLnMKdDB5d434WwCLC2dpNR2AgTJj/08o=
+github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
 github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 h1:HD4PLRzjuCVW79mQ0/pdsalOLHJ+FaEoqJLxfltpb2U=
 github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
 github.com/charlievieth/fs v0.0.0-20170613215519-7dc373669fa1 h1:vTlpHKxJqykyKdW9bkrDJNWeKNuSIAJ0TP/K4lRsz/Q=
@@ -61,74 +122,200 @@ github.com/cloudfoundry/noaa v2.1.0+incompatible h1:hr6VnM5VlYRN3YD+NmAedQLW8686
 github.com/cloudfoundry/noaa v2.1.0+incompatible/go.mod h1:5LmacnptvxzrTvMfL9+EJhgkUfIgcwI61BVSTh47ECo=
 github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4 h1:cWfya7mo/zbnwYVio6eWGsFJHqYw4/k/uhwIJ1eqRPI=
 github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4/go.mod h1:GS0pCHd7onIsewbw8Ue9qa9pZPv2V88cUZDttK6KzgI=
+github.com/containerd/containerd v1.3.0-beta.2.0.20190823190603-4a2f61c4f2b4/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/containerd v1.3.0 h1:xjvXQWABwS2uiv3TWgQt5Uth60Gu86LTGZXMJkjc7rY=
+github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 h1:4BX8f882bXEDKfWIf0wa8HRvpnBoPszJJXL+TVbBw4M=
+github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
+github.com/coreos/bbolt v1.3.1-coreos.6/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
+github.com/coreos/etcd v3.3.15+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
+github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cppforlife/go-patch v0.2.0 h1:Y14MnCQjDlbw7WXT4k+u6DPAA9XnygN4BfrSpI/19RU=
 github.com/cppforlife/go-patch v0.2.0/go.mod h1:67a7aIi94FHDZdoeGSJRRFDp66l9MhaAG1yGxpUoFD8=
 github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
+github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE=
+github.com/deislabs/oras v0.7.0 h1:RnDoFd3tQYODMiUqxgQ8JxlrlWL0/VMKIKRD01MmNYk=
+github.com/deislabs/oras v0.7.0/go.mod h1:sqMKPG3tMyIX9xwXUBRLhZ24o+uT4y6jgBD2RzUTKDM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/disintegration/imaging v1.6.0 h1:nVPXRUUQ36Z7MNf0O77UzgnOb1mkMMor7lmJMJXc/mA=
 github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ=
+github.com/docker/cli v0.0.0-20190506213505-d88565df0c2d h1:qdD+BtyCE1XXpDyhvn0yZVcZOLILdj9Cw4pKu0kQbPQ=
+github.com/docker/cli v0.0.0-20190506213505-d88565df0c2d/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v1.13.1 h1:IkZjBSIc8hBjLpqeAbeE5mca5mNgeatLHBy3GO78BWo=
-github.com/docker/docker v1.13.1/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker-credential-helpers v0.6.1 h1:Dq4iIfcM7cNtddhLVWe9h4QDjsi4OER3Z8voPu/I52g=
+github.com/docker/docker-credential-helpers v0.6.1/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
+github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
+github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
+github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82 h1:X0fj836zx99zFu83v/M79DuBn84IL/Syx1SY6Y5ZEMA=
+github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI=
+github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
+github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4=
+github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE=
+github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
 github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c h1:ZfSZ3P3BedhKGUhzj7BQlPSU4OvT6tfOKe3DVHzOA7s=
 github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
+github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
 github.com/domodwyer/mailyak v3.1.1+incompatible h1:oPtXn3+56LEFbdqH0bpuPRsqtijW9l2POpQe9sTUsSI=
 github.com/domodwyer/mailyak v3.1.1+incompatible/go.mod h1:5NNYkn9hxcdNEOmmMx0yultN5VLorZQ+AWQo9iya+UY=
 github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 h1:eX+pdPPlD279OWgdx7f6KqIRSONuK7egk+jDx7OM3Ac=
 github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76/go.mod h1:KjxHHirfLaw19iGT70HvVjHQsL1vq1SRQB4yOsAfy2s=
-github.com/evanphx/json-patch v4.1.0+incompatible h1:K1MDoo4AZ4wU0GIU/fPmtZg7VpzLjCxu+UwBD1FvwOc=
-github.com/evanphx/json-patch v4.1.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385 h1:clC1lXBpe2kTj2VHdaIu9ajZQe4kcEY9j0NsnDDBZ3o=
+github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
+github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
+github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484 h1:pEtiCjIXx3RvGjlUJuCNxNOw0MNblyR9Wi+vJGBFh+8=
+github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
+github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
+github.com/elazarl/goproxy/ext v0.0.0-20191011121108-aa519ddbe484 h1:aBgSK7SOjFeL1wfzfbIb/pkPpfRr6EP7b1Af4o/xkpU=
+github.com/elazarl/goproxy/ext v0.0.0-20191011121108-aa519ddbe484/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
+github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/emicklei/go-restful v2.11.1+incompatible h1:CjKsv3uWcCMvySPQYKxO8XX3f9zD4FeZRsW4G0B4ffE=
+github.com/emicklei/go-restful v2.11.1+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M=
+github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
+github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/garyburd/redigo v1.6.0 h1:0VruCpn7yAIIu7pWVClQC8wxCJEcG3nyzpMSHKi1PQc=
+github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
+github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
+github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=
+github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
+github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
+github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk=
+github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
+github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
+github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
+github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
 github.com/go-openapi/jsonpointer v0.17.0 h1:nH6xp8XdXHx8dqveo0ZuJBluCO2qGrPbDNZ0dwoRHP0=
 github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
+github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
+github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
+github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
+github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
 github.com/go-openapi/jsonreference v0.17.0 h1:yJW3HCkTHg7NOA+gZ83IPHzUSnUzGXhGmsdiCcMexbA=
 github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
+github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
+github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
+github.com/go-openapi/jsonreference v0.19.3 h1:5cxNfTy0UVC3X8JL5ymxzyoUZmo8iZb+jeTWn7tUa8o=
+github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
+github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
+github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
+github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
+github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs=
+github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA=
+github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64=
+github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
+github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
 github.com/go-openapi/spec v0.18.0 h1:aIjeyG5mo5/FrvDkpKKEGZPmF9MPHahS72mzfVqeQXQ=
 github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
+github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
+github.com/go-openapi/spec v0.19.4 h1:ixzUSnHTd6hCemgtAJgluaTSGYpLNpJY4mA2DIkdOAo=
+github.com/go-openapi/spec v0.19.4/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
+github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
+github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
+github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY=
+github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
 github.com/go-openapi/swag v0.17.0 h1:iqrgMg7Q7SvtbWLlltPrkMs0UBJI6oTSs79JFRUi880=
 github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
+github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
+github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
+github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
 github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
+github.com/gofrs/flock v0.7.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
+github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
+github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
+github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
+github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef h1:veQD95Isof8w9/WXiA+pa3tz3fJXkt5B7QaRBrM62gk=
-github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 h1:uHTyIjqVhYRhLbJ8nIiOJHkEZZ+5YoOsAbD3sk82NiE=
+github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho=
+github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8=
+github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
-github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf h1:+RRA9JqSOZFfKrOeqr2z77+8R2RKyh8PG66dcu1V0ck=
-github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
-github.com/google/uuid v1.1.0 h1:Jf4mxPC/ziBnoPIdpQdPJ9OeiomAUHLvxmPRSPH9m4s=
-github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhpy9g=
-github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
+github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
+github.com/googleapis/gnostic v0.3.1 h1:WeAefnSUHlBb0iJKwxFDZdbfGwkd7xRNuV+IpXMJhYk=
+github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU=
+github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
 github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e h1:XWcjeEtTFTOVA9Fs1w7n2XBftk5ib4oZrhzWk0B+3eA=
 github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZsA=
+github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U=
 github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
@@ -137,40 +324,70 @@ github.com/gorilla/sessions v1.1.3 h1:uXoZdcdA5XdXF3QzuSlheVRUvjl+1rKY7zBXL68L9R
 github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
 github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY=
+github.com/gosuri/uitable v0.0.1/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/govau/cf-common v0.0.7 h1:uhp1P6XM6GGzu1+A4C7LELLX/9mCmH6W5DpJZC0kWmo=
 github.com/govau/cf-common v0.0.7/go.mod h1:5xL/OfE7wxeyHlXb7iei0rAbdQ/5v6dF18BZknPv7NQ=
+github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
+github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc h1:f8eY6cV/x1x+HLjOp4r72s/31/V2aTUtg5oKRRPf8/Q=
 github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
+github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
 github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.3 h1:YPkqC67at8FYaadspW/6uE0COsBxS2656RLEr8Bppgk=
+github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/helm/monocular v1.4.0 h1:g0sOpuMe+9u+aPfd9ZO8mWV+c8W0dfGyBG9Wl23nwec=
 github.com/helm/monocular v1.4.0/go.mod h1:PpkCN0v4zVVigsIHnsQdJytKFmaUkwfhxB7z33a9/gE=
 github.com/heptio/authenticator v0.3.0/go.mod h1:Q86X8hc61JXhE5XxYLKmrSRWby/Oe8IIYZIBgmGVkTA=
 github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40 h1:GT4RsKmHh1uZyhmTkWJTDALRjSHYQp6FRKrotf0zhAs=
 github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40/go.mod h1:NtmN9h8vrTveVQRLHcX2HQ5wIPBDCsZ351TGbZWgg38=
+github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0=
 github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4=
+github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI=
 github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/imdario/mergo v0.3.8 h1:CGgOkSJeqMRmt0D9XLWExdT4m4F1vd3FV3VPt+0VxkQ=
+github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3 h1:sHsPfNMAG70QAvKbddQ0uScZCHQoZsT5NykGRCeeeIs=
 github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/json-iterator/go v1.1.5 h1:gL2yXlmiIo4+t+y32d4WGwOjKGYcGOuyrg46vadswDE=
-github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE=
-github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo=
+github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 h1:PJPDf8OUfOK1bb/NeTKd4f1QXZItOX389VN3B6qC8ro=
+github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
 github.com/kat-co/vala v0.0.0-20170210184112-42e1d8b61f12 h1:DQVOxR9qdYEybJUr/c7ku34r3PfajaMYXZwgDM7KuSk=
 github.com/kat-co/vala v0.0.0-20170210184112-42e1d8b61f12/go.mod h1:u9MdXq/QageOOSGp7qG4XAQsYUMP+V5zEel/Vrl6OOc=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/pty v1.1.5 h1:hyz3dwM5QLc1Rfoz4FuWJQG5BN7tc6K1MndAUnGpQr4=
+github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 h1:wdTBUArlqtBYGN2Dd4+zsaFxFH0m4iGCHToW10jPX0k=
 github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
 github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc h1:Ttr4Z3ZrMv4rAXn10UAqOC8ACx+F1omvcyV1a3hRArE=
@@ -179,100 +396,169 @@ github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28 h1:mkl3tvPHIuP
 github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28/go.mod h1:T/T7jsxVqf9k/zYOqbgNAsANsjxTd1Yq3htjDhQ1H0c=
 github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8bbnE7CX5OEgg=
 github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s=
-github.com/labstack/gommon v0.2.8 h1:JvRqmeZcfrHC5u6uVleB4NxxNbzx6gpbJiQknDbKQu0=
-github.com/labstack/gommon v0.2.8/go.mod h1:/tj9csK2iPSBvn+3NLM9e52usepMtrd5ilFYA+wQNJ4=
 github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0=
 github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
 github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.1.0 h1:/5u4a+KGJptBRqGzPvYQL9p0d/tPR4S31+Tnzj9lEO4=
-github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
+github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
 github.com/lunixbochs/vtclean v1.0.0 h1:xu2sLAri4lGiovBDQKxl5mrXyESr3gUr5m5SM5+LVb8=
 github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
+github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190221075403-6243d8e04c3f h1:B6PQkurxGG1rqEX96oE14gbj8bqvYC5dtks9r5uGmlE=
-github.com/mailru/easyjson v0.0.0-20190221075403-6243d8e04c3f/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg=
-github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
+github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=
+github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.6 h1:SrwhHcpV4nWrMGdNcC2kXpMfcBVYGDuTArqyhocJgvA=
-github.com/mattn/go-isatty v0.0.6/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-isatty v0.0.10 h1:qxFzApOv4WsAL965uUPIsXzAKCZxN2p9UqdhFS4ZW10=
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
 github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mattn/go-shellwords v1.0.5/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
 github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
 github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mholt/archiver v3.1.1+incompatible h1:1dCVxuqs0dJseYEhi5pl7MYPH9zDa1wBi7mF09cbNkU=
 github.com/mholt/archiver v3.1.1+incompatible/go.mod h1:Dh2dOXnSdiLxRiPoVfIr/fI1TwETms9B8CTWfeh7ROU=
+github.com/miekg/dns v0.0.0-20181005163659-0d29b283ac0f/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/miekg/dns v1.1.4 h1:rCMZsU2ScVSYcAsOXgmC6+AKOK+6pmQTOcw03nfwYV0=
+github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
+github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
+github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 h1:cvy4lBOYN3gKfKj8Lzz5Q9TfviP+L7koMHY7SvkyTKs=
+github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
 github.com/moby/moby v1.13.1 h1:mC5WwQwCXt/dYxZ1cIrRsnJAWw7VdtcTZUIGr4tXzOM=
 github.com/moby/moby v1.13.1/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c h1:nXxl5PrvVm2L/wCy8dQu6DMTwH4oIuGN8GJDAlqDdVE=
+github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
+github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
+github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ=
+github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U=
 github.com/nwaples/rardecode v1.0.0 h1:r7vGuS5akxOnR4JQSkko62RJ1ReCMXxQRPtxsiFMBOs=
 github.com/nwaples/rardecode v1.0.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
 github.com/nwmac/sqlitestore v0.0.0-20180824125213-7d2ab221fb3f h1:0U8+7akQEpWd5oaEgSKryzEEeI2oChQNc0ealKppMrk=
 github.com/nwmac/sqlitestore v0.0.0-20180824125213-7d2ab221fb3f/go.mod h1:GVvWHloj3TN6Mb3PH286FnNmEWPnn9VGEM8AhUUbdlw=
+github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo=
+github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
+github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
+github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
+github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI=
+github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
+github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
+github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830 h1:yvQ/2Pupw60ON8TYEIGGTAI77yZsWYkiOeHFZWkwlCk=
+github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
+github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
+github.com/phayes/freeport v0.0.0-20171002181615-b8543db493a5 h1:rZQtoozkfsiNs36c7Tdv/gyGNzD1X1XWKO8rptVNZuM=
+github.com/phayes/freeport v0.0.0-20171002181615-b8543db493a5/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE=
 github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/poy/eachers v0.0.0-20181020210610-23942921fe77 h1:SNdqPRvRsVmYR0gKqFvrUKhFizPJ6yDiGQ++VAJIoDg=
+github.com/poy/eachers v0.0.0-20181020210610-23942921fe77/go.mod h1:x1vqpbcMW9T/KRcQ4b48diSiSVtYgvwQ5xzDByEg4WE=
+github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=
 github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.2.1 h1:JnMpQc6ppsNgw9QPAGF6Dod479itz7lvlsMzzNayLOI=
+github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.7.0 h1:L+1lyG48J1zAQXA3RBX/nG/B3gjlHq0zTt2tlbJLyCY=
+github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190129233650-316cf8ccfec5/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8=
+github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
+github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
+github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
 github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
 github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
-github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 h1:hBSHahWMEgzwRyS6dRpxY0XyjZsHyQ61s084wo5PJe0=
 github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v0.0.0-20160503033757-d4c757aa9afd h1:ZDVcuZGxvWB1ooKj1e31P/ktQK4A2WumM+LucMENpds=
 github.com/smartystreets/goconvey v0.0.0-20160503033757-d4c757aa9afd/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
-github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa h1:E+gaaifzi2xF65PbDmuKI3PhLWY6G5opMLniFq8vmXA=
-github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa/go.mod h1:2RVY1rIf+2J2o/IM9+vPq9RzmHDSseB7FoXiSNIUsoU=
+github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
+github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
+github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
+github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245/go.mod h1:O1c8HleITsZqzNZDjSNzirUGsMT0oGu9LhHKoJrqO+A=
+github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 h1:mujcChM89zOHwgZBBNr5WZ77mBXP1yR+gLThGCYZgAg=
+github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0=
+github.com/tedsuo/rata v1.0.0 h1:Sf9aZrYy6ElSTncjnGkyC2yuVvz5YJetBIUKJ4CmeKE=
+github.com/tedsuo/rata v1.0.0/go.mod h1:X47ELzhOoLbfFIY0Cql9P6yo3Cdwf2CMX3FVZxRzJPc=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ulikunitz/xz v0.5.6 h1:jGHAfXawEGZQ3blwU5wnWKQJvAraT7Ftq9EXjnXYgt8=
 github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
 github.com/unrolled/render v1.0.0 h1:XYtvhA3UkpB7PqkvhUFYmpKD55OudoIeygcfus4vcd4=
@@ -281,100 +567,230 @@ github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4 h1:gKMu1Bf6QINDnvyZuTaACm9ofY+PRh+5vFz4oxBZeF8=
-github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4/go.mod h1:50wTf68f99/Zt14pr046Tgt3Lp2vLyFZKzbFXTOabXw=
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/valyala/fasttemplate v1.1.0 h1:RZqt0yGBsps8NGvLSGW804QQqCUYYLsaOjTVHy1Ocw4=
 github.com/valyala/fasttemplate v1.1.0/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec h1:Klu98tQ9Z1t23gvC7p7sCmvxkZxLhBHLNyrUPsWsYFg=
 github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec/go.mod h1:wPlfmglZmRWMYv/qJy3P+fK/UnoQB5ISk4txfNd9tDo=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v1.1.0 h1:ngVtJC9TY/lg0AA/1k48FYhBrhRoFlEmWzsehpNAaZg=
+github.com/xeipuuv/gojsonschema v1.1.0/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
+github.com/xenolf/lego v0.0.0-20160613233155-a9d8cec0e656/go.mod h1:fwiGnfsIjG7OHPfOvgK7Y/Qo6+2Ox0iozjNTkZICKbY=
+github.com/xenolf/lego v0.3.2-0.20160613233155-a9d8cec0e656 h1:BTvU+npm3/yjuBd53EvgiFLl5+YLikf2WvHsjRQ4KrY=
+github.com/xenolf/lego v0.3.2-0.20160613233155-a9d8cec0e656/go.mod h1:fwiGnfsIjG7OHPfOvgK7Y/Qo6+2Ox0iozjNTkZICKbY=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
+github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 h1:p7OofyZ509h8DmPLh8Hn+EIIZm/xYhdZHJ9GnXHdr6U=
+github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
+github.com/yvasiyarov/gorelic v0.0.6 h1:qMJQYPNdtJ7UNYHjX38KXZtltKTqimMuoQjNnSVIuJg=
+github.com/yvasiyarov/gorelic v0.0.6/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA=
+github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f h1:ERexzlUfuTvpE74urLSbIQW0Z/6hF9t8U4NsJLaioAY=
+github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
 github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
 github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190225124518-7f87c0fbb88b h1:+/WWzjwW6gidDJnMKWLKLX1gxn7irUTF1fLpQovfQ5M=
-golang.org/x/crypto v0.0.0-20190225124518-7f87c0fbb88b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f h1:R423Cnkcp5JABoeemiGEPlt9tHXFfw5kvc0yqlxRPWo=
-golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152 h1:ZC1Xn5A1nlpSmQCIva4bZ3ob3lmhYIefc+GU+DLg1Ow=
+golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 h1:00VmoueYNlNz/aHIilyyQz/MHSqGoWJzpFv/HW8xpzI=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067 h1:KYGJGHOQy8oSi1fDlSpcZF0+juKwk/hEMv5SiwHogR0=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190225153610-fe579d43d832/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190420063019-afa5a82059c6 h1:HdqqaWmYAUI7/dmByKKEw+yxDksGSo+9GjkUc9Zp34E=
-golang.org/x/net v0.0.0-20190420063019-afa5a82059c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271 h1:N66aaryRB3Ax92gH0v3hp1QYZ3zWWCCUR/j8Ifh45Ss=
+golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226191147-529b322ea346 h1:zxGQKdHVCsCsJpbd7ijKsVC27CyETheUBql7Br2TGmA=
-golang.org/x/oauth2 v0.0.0-20190226191147-529b322ea346/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be h1:QAcqgptGM8IQBC9K/RC4o+O9YmqEm0diQn9QmZw/0mU=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191028164358-195ce5e7f934 h1:u/E0NqCIWRDAo9WCFo6Ko49njPFDLSd3z+X1HgWDMpE=
+golang.org/x/sys v0.0.0-20191028164358-195ce5e7f934/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
+gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
+gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190128161407-8ac453e89fca/go.mod h1:L3J43x8/uS+qIUoksaLKe6OS3nUKxOKuIFz1sl2/jx4=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20191028173616-919d9bdd9fe6 h1:UXl+Zk3jqqcbEVV7ace5lrt4YdA4tXiz3f/KbmD29Vo=
+google.golang.org/genproto v0.0.0-20191028173616-919d9bdd9fe6/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
 google.golang.org/grpc v1.19.0 h1:cfg4PD8YEdSFnm7qLV4++93WcmhH2nIUhMjhdCvl3j8=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.24.0 h1:vb/1TCsVn3DcJlQ0Gs1yB1pKI6Do2/QNwxdKqmc/b0s=
+google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/cheggaaa/pb.v1 v1.0.27 h1:kJdccidYzt3CaHD1crCFTS1hxyhSi059NhOFUf03YFo=
 gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
+gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
+gopkg.in/square/go-jose.v1 v1.1.2 h1:/5jmADZB+RiKtZGr4HxsEFOEfbfsjTKsVnqpThUpE30=
+gopkg.in/square/go-jose.v1 v1.1.2/go.mod h1:QpYS+a4WhS+DTlyQIi6Ka7MS3SuR9a055rgXNEe6EiA=
 gopkg.in/square/go-jose.v2 v2.2.2 h1:orlkJ3myw8CN1nVQHBFfloD+L3egixIa4FvUP6RosSA=
 gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
+gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
+gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
+helm.sh/helm/v3 v3.0.0 h1:or/9cs1GgfcTQeEnR2CVJNw893/rmqIG1KsNHmUiSFw=
+helm.sh/helm/v3 v3.0.0/go.mod h1:sI7B9yfvMgxtTPMWdk1jSKJ2aa59UyP9qhPydqW6mgo=
+honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-k8s.io/api v0.0.0-20190222213804-5cb15d344471 h1:MzQGt8qWQCR+39kbYRd0uQqsvSidpYqJLFeWiJ9l4OE=
-k8s.io/api v0.0.0-20190222213804-5cb15d344471/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
-k8s.io/apiextensions-apiserver v0.0.0-20190221221350-bfb440be4b87 h1:BMfPZfi3CkPd9e9Qbm+/AFgE6qXWQcbzUvC91LR3m7w=
-k8s.io/apiextensions-apiserver v0.0.0-20190221221350-bfb440be4b87/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE=
-k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628 h1:UYfHH+KEF88OTg+GojQUwFTNxbxwmoktLwutUzR0GPg=
-k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
-k8s.io/apiserver v0.0.0-20190221215341-5838f549963b h1:yFFYCR/UVj6hsYX6yRbY3CJ3917NF7tn0hwcdUil1aI=
-k8s.io/apiserver v0.0.0-20190221215341-5838f549963b/go.mod h1:6bqaTSOSJavUIXUtfaR9Os9JtTCm8ZqH2SUl2S60C4w=
-k8s.io/cli-runtime v0.0.0-20190221221947-d8fee89e76ca h1:UbXBTjFC1Yy5SDU8TPLVay3znB6yrlCo7Yq/q1VdESQ=
-k8s.io/cli-runtime v0.0.0-20190221221947-d8fee89e76ca/go.mod h1:qWnH3/b8sp/l7EvlDh7ulDU3UWA4P4N1NFbEEP791tM=
-k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible h1:xkYgpj1zwmLkSh7QASe/GUMTyjPI3hwHy7k/RcQSp2A=
-k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/helm v2.12.3+incompatible h1:wo1cdYjOnr5Z+LFuhtwIJaeQnec6D4gcg2H5UAKzY6w=
 k8s.io/helm v2.12.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
-k8s.io/klog v0.2.0 h1:0ElL0OHzF3N+OhoJTL0uca20SxtYt4X4+bzHeqrB83c=
-k8s.io/klog v0.2.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
-k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4 h1:gW+EUB2I96nbxVenV/8ctfbACsHP+yxlT2dhMCsiy+s=
-k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
-k8s.io/kubernetes v1.13.3 h1:46t44D87wKtdKFgr/lXM60K8xPrW0wO67Woof3Vsv6E=
-k8s.io/kubernetes v1.13.3/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
-k8s.io/utils v0.0.0-20190221042446-c2654d5206da h1:ElyM7RPonbKnQqOcw7dG2IK5uvQQn3b/WPHqD5mBvP4=
-k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=
+k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
+k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
+k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
+k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
+k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d h1:Xpe6sK+RY4ZgCTyZ3y273UmFmURhjtoJiwOMbQsXitY=
+k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
+k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20191001043732-d647ddbd755f h1:qnPdWj5mRMsfvP85N8J2ogqiu8Aq1T6MPsJdxL3g6Ds=
+k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20191001043732-d647ddbd755f/go.mod h1:cHpnPcbNeE90PrTRnTu13OM+FN+ROt82odVbEh++81o=
+k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20191001043732-d647ddbd755f h1:bpyOu4+qNIFZRKRtSXGv/iJ7YzqwXrAOoaKxUaYKrV4=
+k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20191001043732-d647ddbd755f/go.mod h1:f1tFT2pOqPzfckbG1GjHIzy3G+T2LW7rchcruNoLaiM=
+k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20191001043732-d647ddbd755f h1:X3br+JCtf40mnzQsKAnHnezd1CvCENgG5uLJTbAspZ4=
+k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20191001043732-d647ddbd755f/go.mod h1:PNw+FbGH4/s3zK9V3rAeMiHTbQz2CU/yqAkfQ2UgLVs=
+k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20191001043732-d647ddbd755f/go.mod h1:WmFoxjELD2xtWb77Yj9RPibT5ACkQYEW9lPQtNkGtbE=
+k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20191001043732-d647ddbd755f h1:6CkT409OUoX4ZiP++1N3id3PCcOoktBvclNsDKPKrfc=
+k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20191001043732-d647ddbd755f/go.mod h1:nBogvbgjMgo7AeVA6CuqVO13LVIfmlQ11t6xzAJdBN8=
+k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20191001043732-d647ddbd755f h1:ksJC2cpBqkCP8bzmfDYXr65JRpt9JmANvaKIR3qggt4=
+k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20191001043732-d647ddbd755f/go.mod h1:GiGfbsjtP4tOW6zgpL8/vCUoyXAV5+9X2onLursPi08=
+k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20191001043732-d647ddbd755f/go.mod h1:L8deZCu6NpzgKzY91TOGKJ1JtAoHd8WyJ/HdoxqZCGo=
+k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20191001043732-d647ddbd755f/go.mod h1:spPP+vRNS8EsnNNIhFCZTTuRO3XhV1WoF18HJySoZn8=
+k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20191001043732-d647ddbd755f h1:vH4+rTRLDI8z9dQCZ6cJcIi3RMGZ6JwJWyLbrSNHBCE=
+k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20191001043732-d647ddbd755f/go.mod h1:ellVfoCz8MlDjTnkqsTkU5svJOIjcK3XNx/onmixgDk=
+k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20191001043732-d647ddbd755f/go.mod h1:vQHTmz0IaEb7/OXPSor1uga8Er0V+2M5aSdXG832NbU=
+k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
+k8s.io/utils v0.0.0-20191010214722-8d271d903fe4 h1:Gi+/O1saihwDqnlmC8Vhv1M5Sp4+rbOmK9TbsLn8ZEA=
+k8s.io/utils v0.0.0-20191010214722-8d271d903fe4/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
+modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
+modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
+modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
+modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
+modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
+rsc.io/letsencrypt v0.0.1 h1:DV0d09Ne9E7UUa9ZqWktZ9L2VmybgTgfq7xlfFR/bbU=
+rsc.io/letsencrypt v0.0.1/go.mod h1:buyQKZ6IXrRnB7TdkHP0RyEybLx18HHyOSoTyoOLqNY=
+sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
+sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
+sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
+sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA=
 sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 h1:O69FD9pJA4WUZlEwYatBEEkRWKQ5cKodWpdKTrCS/iQ=
diff --git a/src/jetstream/middleware.go b/src/jetstream/middleware.go
index 0983457e66..0fafea74af 100644
--- a/src/jetstream/middleware.go
+++ b/src/jetstream/middleware.go
@@ -207,6 +207,8 @@ func errorLoggingMiddleware(h echo.HandlerFunc) echo.HandlerFunc {
 				log.Error(shadowError.LogMessage)
 			}
 			return shadowError.HTTPError
+		} else if jetstreamError, ok := err.(interfaces.JetstreamError); ok {
+			return jetstreamError.HTTPError()
 		}
 
 		return err
diff --git a/src/jetstream/plugins/kubernetes/api_proxy.go b/src/jetstream/plugins/kubernetes/api_proxy.go
index bcd14dd99b..ed58cff4a9 100644
--- a/src/jetstream/plugins/kubernetes/api_proxy.go
+++ b/src/jetstream/plugins/kubernetes/api_proxy.go
@@ -2,6 +2,7 @@ package kubernetes
 
 import (
 	"fmt"
+	"sync"
 
 	//	"k8s.io/client-go/rest"
 
@@ -29,6 +30,7 @@ type KubeProxyResponse struct {
 // KubeProxyResponses represents response from multiple proxy requests to the Kube API
 type KubeProxyResponses map[string]interface{}
 
+
 // ProxyKubernetesAPI proxies an API request to all of the user's connected Kubernetes endpoints
 func (c *KubernetesSpecification) ProxyKubernetesAPI(userID string, f KubeProxyFunc) (KubeProxyResponses, error) {
 
@@ -39,12 +41,16 @@ func (c *KubernetesSpecification) ProxyKubernetesAPI(userID string, f KubeProxyF
 		return nil, fmt.Errorf("Could not get endpints Client for endpoint: %v+", err)
 	}
 
+
+	// TODO: Endpoint must be connected
 	for _, endpoint := range eps {
 		if endpoint.CNSIType == "k8s" {
 			k8sList = append(k8sList, endpoint)
 		}
 	}
 
+	mapMutex := sync.RWMutex{}
+
 	// Check that we actually have some
 	// TODO
 	done := make(chan KubeProxyResponse)
@@ -55,11 +61,13 @@ func (c *KubernetesSpecification) ProxyKubernetesAPI(userID string, f KubeProxyF
 	responses := make(KubeProxyResponses)
 	for range k8sList {
 		res := <-done
+		mapMutex.RLock()
 		if res.Error == nil {
 			responses[res.Endpoint] = res.Result
 		} else {
 			responses[res.Endpoint] = res.Error
 		}
+		mapMutex.RUnlock()
 	}
 
 	return responses, nil
diff --git a/src/jetstream/plugins/kubernetes/endpoint_config.go b/src/jetstream/plugins/kubernetes/endpoint_config.go
index 161460ce06..a9ff92700a 100644
--- a/src/jetstream/plugins/kubernetes/endpoint_config.go
+++ b/src/jetstream/plugins/kubernetes/endpoint_config.go
@@ -1,7 +1,9 @@
 package kubernetes
 
 import (
+	"encoding/base64"
 	"fmt"
+	"regexp"
 
 	log "github.com/sirupsen/logrus"
 
@@ -45,6 +47,77 @@ func (c *KubernetesSpecification) GetConfigForEndpoint(masterURL string, token i
 
 }
 
+func (c *KubernetesSpecification) GetKubeConfigForEndpoint(masterURL string, token interfaces.TokenRecord, namespace string) (string, error) {
+
+	name := "config-0"
+	clusterName := "cluster-0"
+	userName := "user-0"
+
+	// Create a config
+
+	// Initialize a new config
+	context := clientcmdapi.NewContext()
+	context.Cluster = clusterName
+	context.AuthInfo = userName
+
+	// Configure the cluster
+	cluster := clientcmdapi.NewCluster()
+	cluster.Server = masterURL
+	cluster.InsecureSkipTLSVerify = true
+
+	// Configure auth information
+	authInfo := clientcmdapi.NewAuthInfo()
+	err := c.addAuthInfoForEndpoint(authInfo, token)
+
+	config := clientcmdapi.NewConfig()
+	config.Clusters[clusterName] = cluster
+	config.Kind = "Config"
+	config.Contexts[name] = context
+	config.AuthInfos[userName] = authInfo
+	config.CurrentContext = context.Cluster
+
+	// Convert to string
+	str := `apiVersion: v1
+kind: Config
+contexts:
+- context:
+		cluster: kube
+		user: kube
+		%s
+	name: kube
+clusters:
+- cluster:
+		insecure-skip-tls-verify: true
+		server: %s
+	name: kube
+current-context: kube
+preferences: {}
+users:
+- name: kube
+	user:
+`
+
+	nsReplace := ""
+	if len(namespace) > 0 {
+		nsReplace = fmt.Sprintf("namespace: %s", namespace)
+	}
+
+	space := regexp.MustCompile(`\t`)
+	s := space.ReplaceAllString(str, "  ")
+
+	// Now append the auth details
+	//log.Infof("%+v", authInfo)
+
+	if authInfo.ClientCertificateData != nil {
+		s = fmt.Sprintf("%s    client-certificate-data: %s\n", s, base64.StdEncoding.EncodeToString(authInfo.ClientCertificateData))
+	}
+	if authInfo.ClientKeyData != nil {
+		s = fmt.Sprintf("%s    client-key-data: %s\n", s, base64.StdEncoding.EncodeToString(authInfo.ClientKeyData))
+	}
+
+	return fmt.Sprintf(s, nsReplace, masterURL), err
+}
+
 func (c *KubernetesSpecification) addAuthInfoForEndpoint(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
 
 	log.Debug("addAuthInfoForEndpoint")
diff --git a/src/jetstream/plugins/kubernetes/go.mod b/src/jetstream/plugins/kubernetes/go.mod
index c8bfd538e3..4e384f1314 100644
--- a/src/jetstream/plugins/kubernetes/go.mod
+++ b/src/jetstream/plugins/kubernetes/go.mod
@@ -3,89 +3,42 @@ module github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernete
 go 1.12
 
 require (
-	github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e // indirect
-	github.com/Masterminds/goutils v1.1.0 // indirect
 	github.com/Masterminds/semver v1.4.2 // indirect
 	github.com/Masterminds/sprig v2.18.0+incompatible // indirect
 	github.com/SermoDigital/jose v0.9.1
 	github.com/aws/aws-sdk-go v1.17.5
 	github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 // indirect
-	github.com/cyphar/filepath-securejoin v0.2.2 // indirect
-	github.com/docker/distribution v2.7.1+incompatible // indirect
 	github.com/docker/docker v1.13.1 // indirect
-	github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
-	github.com/evanphx/json-patch v4.1.0+incompatible // indirect
-	github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
-	github.com/ghodss/yaml v1.0.0 // indirect
-	github.com/go-openapi/spec v0.18.0 // indirect
-	github.com/gobwas/glob v0.2.3 // indirect
-	github.com/gogo/protobuf v1.2.1 // indirect
-	github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
-	github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c // indirect
-	github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
-	github.com/google/uuid v1.1.0 // indirect
-	github.com/googleapis/gnostic v0.2.0 // indirect
+	github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385 // indirect
+	github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484 // indirect
+	github.com/ghodss/yaml v1.0.0
+	github.com/gorilla/websocket v1.4.0
 	github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect
-	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
-	github.com/hashicorp/golang-lru v0.5.0 // indirect
-	github.com/helm/monocular v1.4.0
 	github.com/helm/monocular/chartsvc v0.0.0-00010101000000-000000000000
 	github.com/heptio/authenticator v0.3.0 // indirect
-	github.com/huandu/xstrings v1.2.0 // indirect
-	github.com/imdario/mergo v0.3.7 // indirect
-	github.com/json-iterator/go v1.1.5 // indirect
-	github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4
 	github.com/kubernetes-sigs/aws-iam-authenticator v0.3.0
 	github.com/labstack/echo v3.3.10+incompatible
-	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.1 // indirect
-	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f
-	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
-	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
-	github.com/pkg/errors v0.8.1 // indirect
 	github.com/russross/blackfriday v2.0.0+incompatible // indirect
 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
-	github.com/sirupsen/logrus v1.3.0
-	github.com/spf13/cobra v0.0.3 // indirect
-	github.com/spf13/pflag v1.0.3 // indirect
+	github.com/sirupsen/logrus v1.4.2
+	github.com/smartystreets/goconvey v1.6.4
 	github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245 // indirect
-	golang.org/x/net v0.0.0-20190225153610-fe579d43d832 // indirect
-	golang.org/x/oauth2 v0.0.0-20190226191147-529b322ea346 // indirect
-	golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect
-	google.golang.org/grpc v1.19.0 // indirect
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/square/go-jose.v2 v2.2.2 // indirect
-	gopkg.in/yaml.v2 v2.2.2
-	k8s.io/api v0.0.0-20190226013409-f951fa7b8c72
-	k8s.io/apiextensions-apiserver v0.0.0-20190225215027-42f453e3c54a // indirect
-	k8s.io/apimachinery v0.0.0-20190117220443-572dfc7bdfcb
-	k8s.io/apiserver v0.0.0-20190225213950-239e48e34c98 // indirect
-	k8s.io/cli-runtime v0.0.0-20190223141024-b5efea9a9c9c // indirect
-	k8s.io/client-go v10.0.0+incompatible
-	k8s.io/helm v2.12.3+incompatible
-	k8s.io/klog v0.2.0
-	k8s.io/kube-openapi v0.0.0-20190225204428-d50a959ae76a // indirect
-	k8s.io/kubernetes v1.13.3
-	k8s.io/utils v0.0.0-20190221042446-c2654d5206da // indirect
-	sigs.k8s.io/yaml v1.1.0 // indirect
+	gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect
+	gopkg.in/yaml.v2 v2.2.4
+	helm.sh/helm/v3 v3.0.0
+	k8s.io/api v0.0.0-20191016110408-35e52d86657a
+	k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8
+	k8s.io/client-go v0.0.0-20191016111102-bec269661e48
 	vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 // indirect
 )
 
 replace (
 	github.com/SermoDigital/jose => github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc
 	github.com/cloudfoundry-incubator/stratos/src/jetstream => ../..
+	github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309
 	github.com/helm/monocular/chartsvc => ../monocular/chartsvc
 	github.com/kubernetes-sigs/aws-iam-authenticator => github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc
 	github.com/russross/blackfriday v2.0.0+incompatible => github.com/russross/blackfriday v1.5.2
 	github.com/sergi/go-diff => github.com/sergi/go-diff v1.0.0
 	github.com/spf13/cobra => github.com/spf13/cobra v0.0.3
-	k8s.io/api => k8s.io/api v0.0.0-20190222213804-5cb15d344471
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190221221350-bfb440be4b87
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628
-	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190221215341-5838f549963b
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190221221947-d8fee89e76ca
-	k8s.io/client-go => k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible
-	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4
-	k8s.io/kubernetes => k8s.io/kubernetes v1.13.3
 )
diff --git a/src/jetstream/plugins/kubernetes/go.sum b/src/jetstream/plugins/kubernetes/go.sum
index 69a959d32c..4af88b969f 100644
--- a/src/jetstream/plugins/kubernetes/go.sum
+++ b/src/jetstream/plugins/kubernetes/go.sum
@@ -1,27 +1,85 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
+contrib.go.opencensus.io/exporter/ocagent v0.2.0/go.mod h1:0fnkYHF+ORKj7HWzOExKkUHeFX79gXSKUQbpnAM+wzo=
+git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
+github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
+github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
+github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
+github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
+github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
+github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
+github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
+github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
+github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
 github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e h1:eb0Pzkt15Bm7f2FFYv7sjY7NPFi3cPkS3tv1CcrFBWA=
 github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
 github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg=
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc=
 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/Masterminds/semver/v3 v3.0.1 h1:2kKm5lb7dKVrt5TYUiAavE6oFc1cFT0057UVGT+JqLk=
+github.com/Masterminds/semver/v3 v3.0.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/Masterminds/sprig v2.18.0+incompatible h1:QoGhlbC6pter1jxKnjMFxT8EqsLuDE6FEcNbWEpw+lI=
 github.com/Masterminds/sprig v2.18.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o=
+github.com/Masterminds/sprig/v3 v3.0.0 h1:KSQz7Nb08/3VU9E4ns29dDxcczhOD1q7O1UfM4G3t3g=
+github.com/Masterminds/sprig/v3 v3.0.0/go.mod h1:NEUY/Qq8Gdm2xgYA+NwJM6wmfdRV9xkh8h/Rld20R0U=
+github.com/Masterminds/vcs v1.13.0/go.mod h1:N09YCmOQr6RLxC6UNHzuVwAdodYbbnycGHSmwVJjcKA=
+github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
+github.com/Microsoft/go-winio v0.4.12 h1:xAfWHN1IrQ0NJ9TBC0KBZoqLjzDTr1ML+4MywiUOryc=
+github.com/Microsoft/go-winio v0.4.12/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
+github.com/Microsoft/hcsshim v0.8.6 h1:ZfF0+zZeYdzMIVMZHKtDKJvLHj76XCuVae/jNkjj0IA=
+github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
+github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
+github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk=
+github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.0 h1:rmGxhojJlM0tuKtfdvliR84CFHljx9ag64t2xmVkjK4=
 github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
+github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/SermoDigital/jose v0.9.1 h1:atYaHPD3lPICcbK1owly3aPm0iaJGSGPi0WD4vLznv8=
 github.com/SermoDigital/jose v0.9.1/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA=
 github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc h1:MhBvG7RLaLqlyjxMR6of35vt6MVQ+eXMcgn9X/sy0FE=
 github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA=
+github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs=
+github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
+github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
+github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/aws/aws-sdk-go v1.17.5 h1:WW9Hm3KYo48iZHpmBc+b7sgyS0h32zgCvya28SLW4BU=
 github.com/aws/aws-sdk-go v1.17.5/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y=
+github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
+github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
+github.com/bshuster-repo/logrus-logstash-hook v0.4.1 h1:pgAtgj+A31JBVtEHu2uHuEx0n+2ukqUJnS2vVe5pQNA=
+github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
+github.com/bugsnag/bugsnag-go v1.5.0 h1:tP8hiPv1pGGW3LA6LKy5lW6WG+y9J2xWUdPd3WC452k=
+github.com/bugsnag/bugsnag-go v1.5.0/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
+github.com/bugsnag/panicwrap v1.2.0 h1:OzrKrRvXis8qEvOkfcxNcYbOd2O7xXS2nnKMEMABFQA=
+github.com/bugsnag/panicwrap v1.2.0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
+github.com/census-instrumentation/opencensus-proto v0.0.2-0.20180913191712-f303ae3f8d6a/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/census-instrumentation/opencensus-proto v0.1.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.1.0 h1:yTUvW7Vhb89inJ+8irsUqiWjh8iT6sQPZiQzI6ReGkA=
+github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM=
+github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
 github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 h1:HD4PLRzjuCVW79mQ0/pdsalOLHJ+FaEoqJLxfltpb2U=
 github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -29,53 +87,209 @@ github.com/cloudfoundry-community/go-cfenv v1.17.0 h1:qfxEfn8qKkaHY3ZEk/Y2noY79H
 github.com/cloudfoundry-community/go-cfenv v1.17.0/go.mod h1:2UgWvQTRXUuIZ/x3KnW6fk6CgPBhcV4UQb/UGIrUyyI=
 github.com/cloudfoundry-incubator/stratos v2.0.0-beta-001+incompatible h1:UUxNbLjhv2cfymub5yNN1tjjqYkteHBBagb4jcbXEIQ=
 github.com/cloudfoundry-incubator/stratos/src/jetstream v0.0.0-20190516104506-727fa3589a90 h1:IeIyBIgh2xEQm1CxHN2yFSBU7Ap+HQZleOs3TlAymI0=
+github.com/containerd/containerd v1.3.0-beta.2.0.20190823190603-4a2f61c4f2b4 h1:aMyA5J7j6D07U7pf8BFEY67BKoDcz0zWleAbQj3zVng=
+github.com/containerd/containerd v1.3.0-beta.2.0.20190823190603-4a2f61c4f2b4/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/containerd v1.3.0 h1:xjvXQWABwS2uiv3TWgQt5Uth60Gu86LTGZXMJkjc7rY=
+github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 h1:4BX8f882bXEDKfWIf0wa8HRvpnBoPszJJXL+TVbBw4M=
+github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
+github.com/coreos/bbolt v1.3.1-coreos.6/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
+github.com/coreos/etcd v3.3.15+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
+github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
+github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE=
+github.com/deislabs/oras v0.7.0 h1:RnDoFd3tQYODMiUqxgQ8JxlrlWL0/VMKIKRD01MmNYk=
+github.com/deislabs/oras v0.7.0/go.mod h1:sqMKPG3tMyIX9xwXUBRLhZ24o+uT4y6jgBD2RzUTKDM=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/disintegration/imaging v1.6.0 h1:nVPXRUUQ36Z7MNf0O77UzgnOb1mkMMor7lmJMJXc/mA=
 github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ=
+github.com/docker/cli v0.0.0-20190506213505-d88565df0c2d h1:qdD+BtyCE1XXpDyhvn0yZVcZOLILdj9Cw4pKu0kQbPQ=
+github.com/docker/cli v0.0.0-20190506213505-d88565df0c2d/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker v1.13.1 h1:IkZjBSIc8hBjLpqeAbeE5mca5mNgeatLHBy3GO78BWo=
 github.com/docker/docker v1.13.1/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker-credential-helpers v0.6.1 h1:Dq4iIfcM7cNtddhLVWe9h4QDjsi4OER3Z8voPu/I52g=
+github.com/docker/docker-credential-helpers v0.6.1/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
+github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
+github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
+github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82 h1:X0fj836zx99zFu83v/M79DuBn84IL/Syx1SY6Y5ZEMA=
+github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI=
+github.com/docker/go-units v0.3.3 h1:Xk8S3Xj5sLGlG5g67hJmYMmUgXv5N4PhkjJHHqrwnTk=
+github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
+github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4=
+github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE=
+github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
 github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c h1:ZfSZ3P3BedhKGUhzj7BQlPSU4OvT6tfOKe3DVHzOA7s=
 github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
+github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
+github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385 h1:clC1lXBpe2kTj2VHdaIu9ajZQe4kcEY9j0NsnDDBZ3o=
+github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
+github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
+github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484 h1:pEtiCjIXx3RvGjlUJuCNxNOw0MNblyR9Wi+vJGBFh+8=
+github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
+github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2 h1:dWB6v3RcOy03t/bUadywsbyrQwCqZeNIEX6M1OtSZOM=
+github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
+github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/emicklei/go-restful v2.11.1+incompatible h1:CjKsv3uWcCMvySPQYKxO8XX3f9zD4FeZRsW4G0B4ffE=
+github.com/emicklei/go-restful v2.11.1+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/evanphx/json-patch v4.1.0+incompatible h1:K1MDoo4AZ4wU0GIU/fPmtZg7VpzLjCxu+UwBD1FvwOc=
 github.com/evanphx/json-patch v4.1.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch v4.2.0+incompatible h1:fUDGZCv/7iAN7u0puUVhvKCcsR6vRfwrJatElLBEf0I=
+github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M=
+github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
+github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
+github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/garyburd/redigo v1.6.0 h1:0VruCpn7yAIIu7pWVClQC8wxCJEcG3nyzpMSHKi1PQc=
+github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
+github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
+github.com/go-inf/inf v0.9.1/go.mod h1:ZWwB6rTV+0pO94RdIMKue59tExzQp6/pj/BMuPQkXaA=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
+github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=
+github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
+github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
+github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk=
+github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
+github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
+github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
+github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
 github.com/go-openapi/jsonpointer v0.17.0 h1:nH6xp8XdXHx8dqveo0ZuJBluCO2qGrPbDNZ0dwoRHP0=
 github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
+github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
+github.com/go-openapi/jsonpointer v0.19.2 h1:A9+F4Dc/MCNB5jibxf6rRvOvR/iFgQdyNx9eIhnGqq0=
+github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
+github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
+github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
 github.com/go-openapi/jsonreference v0.17.0 h1:yJW3HCkTHg7NOA+gZ83IPHzUSnUzGXhGmsdiCcMexbA=
 github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
+github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
+github.com/go-openapi/jsonreference v0.19.2 h1:o20suLFB4Ri0tuzpWtyHlh7E7HnkqTNLq6aR6WVNS1w=
+github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
+github.com/go-openapi/jsonreference v0.19.3 h1:5cxNfTy0UVC3X8JL5ymxzyoUZmo8iZb+jeTWn7tUa8o=
+github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
+github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
+github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
+github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
+github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs=
+github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA=
+github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64=
+github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
+github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
 github.com/go-openapi/spec v0.18.0 h1:aIjeyG5mo5/FrvDkpKKEGZPmF9MPHahS72mzfVqeQXQ=
 github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
+github.com/go-openapi/spec v0.19.2 h1:SStNd1jRcYtfKCN7R0laGNs80WYYvn5CbBjM2sOmCrE=
+github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
+github.com/go-openapi/spec v0.19.4 h1:ixzUSnHTd6hCemgtAJgluaTSGYpLNpJY4mA2DIkdOAo=
+github.com/go-openapi/spec v0.19.4/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
+github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
+github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
+github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY=
+github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
 github.com/go-openapi/swag v0.17.0 h1:iqrgMg7Q7SvtbWLlltPrkMs0UBJI6oTSs79JFRUi880=
 github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
+github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
+github.com/go-openapi/swag v0.19.2 h1:jvO6bCMBEilGwMfHhrd61zIID4oIFdwb76V17SM88dE=
+github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
+github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
+github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
+github.com/gofrs/flock v0.7.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
+github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
+github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
+github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I=
+github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
+github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef h1:veQD95Isof8w9/WXiA+pa3tz3fJXkt5B7QaRBrM62gk=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 h1:uHTyIjqVhYRhLbJ8nIiOJHkEZZ+5YoOsAbD3sk82NiE=
+github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho=
+github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8=
+github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
 github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf h1:+RRA9JqSOZFfKrOeqr2z77+8R2RKyh8PG66dcu1V0ck=
 github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
+github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.0 h1:Jf4mxPC/ziBnoPIdpQdPJ9OeiomAUHLvxmPRSPH9m4s=
 github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhpy9g=
 github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
+github.com/googleapis/gnostic v0.3.1 h1:WeAefnSUHlBb0iJKwxFDZdbfGwkd7xRNuV+IpXMJhYk=
+github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU=
+github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZsA=
+github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U=
 github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
@@ -84,14 +298,25 @@ github.com/gorilla/sessions v1.1.3 h1:uXoZdcdA5XdXF3QzuSlheVRUvjl+1rKY7zBXL68L9R
 github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
 github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY=
+github.com/gosuri/uitable v0.0.1/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/govau/cf-common v0.0.7 h1:uhp1P6XM6GGzu1+A4C7LELLX/9mCmH6W5DpJZC0kWmo=
 github.com/govau/cf-common v0.0.7/go.mod h1:5xL/OfE7wxeyHlXb7iei0rAbdQ/5v6dF18BZknPv7NQ=
+github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
+github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc h1:f8eY6cV/x1x+HLjOp4r72s/31/V2aTUtg5oKRRPf8/Q=
 github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
+github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
+github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
 github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.3 h1:YPkqC67at8FYaadspW/6uE0COsBxS2656RLEr8Bppgk=
+github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/helm/monocular v1.4.0 h1:g0sOpuMe+9u+aPfd9ZO8mWV+c8W0dfGyBG9Wl23nwec=
 github.com/helm/monocular v1.4.0/go.mod h1:PpkCN0v4zVVigsIHnsQdJytKFmaUkwfhxB7z33a9/gE=
 github.com/helm/monocular v1.5.0 h1:y8anOb2XLsCluYNOPx01G6EPqyBZ9fxDi+9BKbesULE=
@@ -101,17 +326,47 @@ github.com/heptio/authenticator v0.3.0 h1:Xh6XWkLZ+CksGuky+vsr77mHnI9C4L3nwj+xuZ
 github.com/heptio/authenticator v0.3.0/go.mod h1:Q86X8hc61JXhE5XxYLKmrSRWby/Oe8IIYZIBgmGVkTA=
 github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40 h1:GT4RsKmHh1uZyhmTkWJTDALRjSHYQp6FRKrotf0zhAs=
 github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40/go.mod h1:NtmN9h8vrTveVQRLHcX2HQ5wIPBDCsZ351TGbZWgg38=
+github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0=
 github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4=
+github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI=
 github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/imdario/mergo v0.3.8 h1:CGgOkSJeqMRmt0D9XLWExdT4m4F1vd3FV3VPt+0VxkQ=
+github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
+github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
+github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.5 h1:gL2yXlmiIo4+t+y32d4WGwOjKGYcGOuyrg46vadswDE=
 github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo=
+github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.8 h1:QiWkFLKq0T7mpzwOTu6BzNDbfTE8OLrYhVKYMLF46Ok=
+github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 h1:PJPDf8OUfOK1bb/NeTKd4f1QXZItOX389VN3B6qC8ro=
+github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 h1:wdTBUArlqtBYGN2Dd4+zsaFxFH0m4iGCHToW10jPX0k=
 github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
 github.com/kubernetes-sigs/aws-iam-authenticator v0.3.0 h1:HOC7YpUao5F3RTIncfBfoh+7/ID1Jl97ALNgEmWIjxo=
@@ -122,59 +377,161 @@ github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8
 github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s=
 github.com/labstack/gommon v0.2.8 h1:JvRqmeZcfrHC5u6uVleB4NxxNbzx6gpbJiQknDbKQu0=
 github.com/labstack/gommon v0.2.8/go.mod h1:/tj9csK2iPSBvn+3NLM9e52usepMtrd5ilFYA+wQNJ4=
+github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
+github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
+github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 h1:2gxZ0XQIU/5z3Z3bUBu+FXuk2pFbkN6tcwi/pjyaDic=
 github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63 h1:nTT4s92Dgz2HlrB2NaMgvlfqHH39OgMhA7z3PK7PGD4=
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=
+github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
 github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.6 h1:SrwhHcpV4nWrMGdNcC2kXpMfcBVYGDuTArqyhocJgvA=
 github.com/mattn/go-isatty v0.0.6/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
+github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mattn/go-shellwords v1.0.5/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
+github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/miekg/dns v0.0.0-20181005163659-0d29b283ac0f h1:wVzAD6PG9MIDNQMZ6zc2YpzE/9hhJ3EN+b+a4B1thVs=
+github.com/miekg/dns v0.0.0-20181005163659-0d29b283ac0f/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
+github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
+github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 h1:cvy4lBOYN3gKfKj8Lzz5Q9TfviP+L7koMHY7SvkyTKs=
+github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c h1:nXxl5PrvVm2L/wCy8dQu6DMTwH4oIuGN8GJDAlqDdVE=
+github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
+github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
+github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo=
+github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
+github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
+github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
+github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI=
+github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
+github.com/opencontainers/runc v0.1.1 h1:GlxAyO6x8rfZYN9Tt0Kti5a/cP41iuiO2yYT0IJGY8Y=
+github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
+github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830 h1:yvQ/2Pupw60ON8TYEIGGTAI77yZsWYkiOeHFZWkwlCk=
+github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
+github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
+github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
+github.com/petar/GoLLRB v0.0.0-20130427215148-53be0d36a84c/go.mod h1:HUpKUBZnpzkdx0kD/+Yfuft+uD3zHGtXF/XJB14TUr4=
 github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
+github.com/phayes/freeport v0.0.0-20171002181615-b8543db493a5 h1:rZQtoozkfsiNs36c7Tdv/gyGNzD1X1XWKO8rptVNZuM=
+github.com/phayes/freeport v0.0.0-20171002181615-b8543db493a5/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
+github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=
 github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.2.1 h1:JnMpQc6ppsNgw9QPAGF6Dod479itz7lvlsMzzNayLOI=
+github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/common v0.2.0 h1:kUZDBDTdBVBYBj5Tmh2NZLlF60mfjA27rM34b+cVwNU=
+github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.7.0 h1:L+1lyG48J1zAQXA3RBX/nG/B3gjlHq0zTt2tlbJLyCY=
+github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
+github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190129233650-316cf8ccfec5 h1:Etei0Wx6pooT/DeOKcGTr1M/01ggz95Ajq8BBwCOKBU=
+github.com/prometheus/procfs v0.0.0-20190129233650-316cf8ccfec5/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8=
+github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
+github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
+github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
+github.com/rubenv/sql-migrate v0.0.0-20190902133344-8926f37f0bc1/go.mod h1:WS0rl9eEliYI8DPnr3TOwz4439pay+qNgzJoVya/DmY=
 github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/russross/blackfriday v2.0.0+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday v2.0.0 h1:L7Oc72h7rDqGkbUorN/ncJ4N/y220/YRezHvBoKLOFA=
+github.com/russross/blackfriday v2.0.0+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday v2.0.0/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
 github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
+github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
+github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/square/go-jose v2.3.0+incompatible/go.mod h1:7MxpAF/1WTVUu8Am+T5kNy+t0902CaLWM4Z745MkOa8=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
+github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245 h1:DNVk+NIkGS0RbLkjQOLCJb/759yfCysThkMbl7EXxyY=
 github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245/go.mod h1:O1c8HleITsZqzNZDjSNzirUGsMT0oGu9LhHKoJrqO+A=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/unrolled/render v1.0.0 h1:XYtvhA3UkpB7PqkvhUFYmpKD55OudoIeygcfus4vcd4=
 github.com/unrolled/render v1.0.0/go.mod h1:tu82oB5W2ykJRVioYsB+IQKcft7ryBr7w12qMBUPyXg=
 github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
@@ -183,87 +540,293 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4 h1:gKMu1Bf6QINDnvyZuTaACm9ofY+PRh+5vFz4oxBZeF8=
 github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4/go.mod h1:50wTf68f99/Zt14pr046Tgt3Lp2vLyFZKzbFXTOabXw=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v1.1.0 h1:ngVtJC9TY/lg0AA/1k48FYhBrhRoFlEmWzsehpNAaZg=
+github.com/xeipuuv/gojsonschema v1.1.0/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
+github.com/xenolf/lego v0.0.0-20160613233155-a9d8cec0e656/go.mod h1:fwiGnfsIjG7OHPfOvgK7Y/Qo6+2Ox0iozjNTkZICKbY=
+github.com/xenolf/lego v0.3.2-0.20160613233155-a9d8cec0e656 h1:BTvU+npm3/yjuBd53EvgiFLl5+YLikf2WvHsjRQ4KrY=
+github.com/xenolf/lego v0.3.2-0.20160613233155-a9d8cec0e656/go.mod h1:fwiGnfsIjG7OHPfOvgK7Y/Qo6+2Ox0iozjNTkZICKbY=
+github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 h1:p7OofyZ509h8DmPLh8Hn+EIIZm/xYhdZHJ9GnXHdr6U=
+github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
+github.com/yvasiyarov/gorelic v0.0.6 h1:qMJQYPNdtJ7UNYHjX38KXZtltKTqimMuoQjNnSVIuJg=
+github.com/yvasiyarov/gorelic v0.0.6/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA=
+github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f h1:ERexzlUfuTvpE74urLSbIQW0Z/6hF9t8U4NsJLaioAY=
+github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
+go.opencensus.io v0.17.0/go.mod h1:mp1VrMQxhlqqDpKvH4UcQUa4YwlzNmymAjPrDdfxNpI=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7 h1:0hQKqeLdqlt5iIwVOBErRisrHJAN57yOiPRQItI20fU=
+golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152 h1:ZC1Xn5A1nlpSmQCIva4bZ3ob3lmhYIefc+GU+DLg1Ow=
+golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067 h1:KYGJGHOQy8oSi1fDlSpcZF0+juKwk/hEMv5SiwHogR0=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190225153610-fe579d43d832 h1:2IdId8zoI92l1bUzjAOygcAOkmCe13HY1j0rqPPPzB8=
 golang.org/x/net v0.0.0-20190225153610-fe579d43d832/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc h1:gkKoSkUmnU6bpS/VhkuO27bzQeSA51uaEfbOW5dNb68=
+golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271 h1:N66aaryRB3Ax92gH0v3hp1QYZ3zWWCCUR/j8Ifh45Ss=
+golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226191147-529b322ea346 h1:zxGQKdHVCsCsJpbd7ijKsVC27CyETheUBql7Br2TGmA=
 golang.org/x/oauth2 v0.0.0-20190226191147-529b322ea346/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f h1:25KHgbfyiSm6vwQLbM3zZIe1v9p/3ea4Rz+nnM5K/i4=
+golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191028164358-195ce5e7f934 h1:u/E0NqCIWRDAo9WCFo6Ko49njPFDLSd3z+X1HgWDMpE=
+golang.org/x/sys v0.0.0-20191028164358-195ce5e7f934/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
+gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
+gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ=
+google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/api v0.6.1-0.20190607001116-5213b8090861/go.mod h1:btoxGiFvQNVUZQ8W08zLtrVS08CNpINPEfxXxgJL1Q4=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190128161407-8ac453e89fca/go.mod h1:L3J43x8/uS+qIUoksaLKe6OS3nUKxOKuIFz1sl2/jx4=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 h1:nfPFGzJkUDX6uBmpN/pSw7MbOAWegH5QDQuoXFHedLg=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20191028173616-919d9bdd9fe6 h1:UXl+Zk3jqqcbEVV7ace5lrt4YdA4tXiz3f/KbmD29Vo=
+google.golang.org/genproto v0.0.0-20191028173616-919d9bdd9fe6/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+google.golang.org/grpc v1.15.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
+google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
 google.golang.org/grpc v1.19.0 h1:cfg4PD8YEdSFnm7qLV4++93WcmhH2nIUhMjhdCvl3j8=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.23.0 h1:AzbTB6ux+okLTzP8Ru1Xs41C303zdcfEht7MQnYJt5A=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.24.0 h1:vb/1TCsVn3DcJlQ0Gs1yB1pKI6Do2/QNwxdKqmc/b0s=
+google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA=
+gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 h1:FVCohIoYO7IJoDDVpV2pdq7SgrMH6wHnuTyrdrxJNoY=
+gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0/go.mod h1:OdE7CF6DbADk7lN8LIKRzRJTTZXIjtWgA5THM5lhBAw=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/gorp.v1 v1.7.2/go.mod h1:Wo3h+DBQZIxATwftsglhdD/62zRFPhGhTiu5jUJmCaw=
+gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
+gopkg.in/square/go-jose.v1 v1.1.2 h1:/5jmADZB+RiKtZGr4HxsEFOEfbfsjTKsVnqpThUpE30=
+gopkg.in/square/go-jose.v1 v1.1.2/go.mod h1:QpYS+a4WhS+DTlyQIi6Ka7MS3SuR9a055rgXNEe6EiA=
 gopkg.in/square/go-jose.v2 v2.2.2 h1:orlkJ3myw8CN1nVQHBFfloD+L3egixIa4FvUP6RosSA=
 gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
+gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
+helm.sh/helm v2.14.3+incompatible h1:M3xvix8x41Xjc/ZGARGpUOTjxTBrb86yZG5FmCjgIew=
+helm.sh/helm/v3 v3.0.0-beta.4 h1:gK5iJztTqr4Ai712LSS2fxqaW2b635GxunkBinEBCXY=
+helm.sh/helm/v3 v3.0.0-beta.4/go.mod h1:ZQ5l9gLmS7attkwdVKXxygj84XE4dzZIdr3frQ9H7No=
+helm.sh/helm/v3 v3.0.0 h1:or/9cs1GgfcTQeEnR2CVJNw893/rmqIG1KsNHmUiSFw=
+helm.sh/helm/v3 v3.0.0/go.mod h1:sI7B9yfvMgxtTPMWdk1jSKJ2aa59UyP9qhPydqW6mgo=
+honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 k8s.io/api v0.0.0-20190222213804-5cb15d344471 h1:MzQGt8qWQCR+39kbYRd0uQqsvSidpYqJLFeWiJ9l4OE=
 k8s.io/api v0.0.0-20190222213804-5cb15d344471/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
 k8s.io/api v0.0.0-20190226013409-f951fa7b8c72 h1:4wrH+M4Kpkbbjs4UzT7XOvuhgBczsd4eXfBn9T5WqKk=
 k8s.io/api v0.0.0-20190226013409-f951fa7b8c72/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
+k8s.io/api v0.0.0-20191016110408-35e52d86657a h1:VVUE9xTCXP6KUPMf92cQmN88orz600ebexcRRaBTepQ=
+k8s.io/api v0.0.0-20191016110408-35e52d86657a/go.mod h1:/L5qH+AD540e7Cetbui1tuJeXdmNhO8jM6VkXeDdDhQ=
+k8s.io/api v0.0.0-20191115135540-bbc9463b57e5 h1:o1kKo74JxBOOhxPdKzTx54MJHwu+Z6Lv5/1tu8Qf9eM=
+k8s.io/api v0.0.0-20191115135540-bbc9463b57e5/go.mod h1:iA/8arsvelvo4IDqIhX4IbjTEKBGgvsf2OraTuRtLFU=
 k8s.io/apiextensions-apiserver v0.0.0-20190221221350-bfb440be4b87 h1:BMfPZfi3CkPd9e9Qbm+/AFgE6qXWQcbzUvC91LR3m7w=
 k8s.io/apiextensions-apiserver v0.0.0-20190221221350-bfb440be4b87/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE=
 k8s.io/apiextensions-apiserver v0.0.0-20190225215027-42f453e3c54a h1:+yPI0R62TeitWAXHh5K5xVQrUF1JQwK+nrl5Lz6213E=
 k8s.io/apiextensions-apiserver v0.0.0-20190225215027-42f453e3c54a/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE=
+k8s.io/apiextensions-apiserver v0.0.0-20191016113550-5357c4baaf65 h1:kThoiqgMsSwBdMK/lPgjtYTsEjbUU9nXCA9DyU3feok=
+k8s.io/apiextensions-apiserver v0.0.0-20191016113550-5357c4baaf65/go.mod h1:5BINdGqggRXXKnDgpwoJ7PyQH8f+Ypp02fvVNcIFy9s=
 k8s.io/apimachinery v0.0.0-20190117220443-572dfc7bdfcb h1:+mNFBkhBgd0wFJ1K18cOYw3LVW7aMIM/pazb4i44aS0=
 k8s.io/apimachinery v0.0.0-20190117220443-572dfc7bdfcb/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
 k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628 h1:UYfHH+KEF88OTg+GojQUwFTNxbxwmoktLwutUzR0GPg=
 k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
 k8s.io/apimachinery v0.0.0-20190223094358-dcb391cde5ca h1:rOczZwIfERvL7YLSQ96uI3NUYamzdK/MmSDIfChQRBk=
 k8s.io/apimachinery v0.0.0-20190223094358-dcb391cde5ca/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
+k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8 h1:Iieh/ZEgT3BWwbLD5qEKcY06jKuPEl6zC7gPSehoLw4=
+k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8/go.mod h1:llRdnznGEAqC3DcNm6yEj472xaFVfLM7hnYofMb12tQ=
+k8s.io/apimachinery v0.0.0-20191115015347-3c7067801da2 h1:TSH6UZ+y3etc/aDbVqow1NT8o7SJXkxhLKbp3Ywhyvg=
+k8s.io/apimachinery v0.0.0-20191115015347-3c7067801da2/go.mod h1:dXFS2zaQR8fyzuvRdJDHw2Aerij/yVGJSre0bZQSVJA=
 k8s.io/apiserver v0.0.0-20190221215341-5838f549963b h1:yFFYCR/UVj6hsYX6yRbY3CJ3917NF7tn0hwcdUil1aI=
 k8s.io/apiserver v0.0.0-20190221215341-5838f549963b/go.mod h1:6bqaTSOSJavUIXUtfaR9Os9JtTCm8ZqH2SUl2S60C4w=
 k8s.io/apiserver v0.0.0-20190225213950-239e48e34c98 h1:aC93uSkvMU+AbozPRy72NtzFi7lefwzh4jKNuJZ8+ug=
 k8s.io/apiserver v0.0.0-20190225213950-239e48e34c98/go.mod h1:6bqaTSOSJavUIXUtfaR9Os9JtTCm8ZqH2SUl2S60C4w=
+k8s.io/apiserver v0.0.0-20191016112112-5190913f932d/go.mod h1:7OqfAolfWxUM/jJ/HBLyE+cdaWFBUoo5Q5pHgJVj2ws=
 k8s.io/cli-runtime v0.0.0-20190221221947-d8fee89e76ca h1:UbXBTjFC1Yy5SDU8TPLVay3znB6yrlCo7Yq/q1VdESQ=
 k8s.io/cli-runtime v0.0.0-20190221221947-d8fee89e76ca/go.mod h1:qWnH3/b8sp/l7EvlDh7ulDU3UWA4P4N1NFbEEP791tM=
 k8s.io/cli-runtime v0.0.0-20190223141024-b5efea9a9c9c h1:fOmiMKsuY198ukXcZMRhEEQGYhVFhwCHn2j/fMExtcA=
 k8s.io/cli-runtime v0.0.0-20190223141024-b5efea9a9c9c/go.mod h1:qWnH3/b8sp/l7EvlDh7ulDU3UWA4P4N1NFbEEP791tM=
+k8s.io/cli-runtime v0.0.0-20191016114015-74ad18325ed5 h1:8ZfMjkMBzcXEawLsYHg9lDM7aLEVso3NiVKfUTnN56A=
+k8s.io/cli-runtime v0.0.0-20191016114015-74ad18325ed5/go.mod h1:sDl6WKSQkDM6zS1u9F49a0VooQ3ycYFBFLqd2jf2Xfo=
+k8s.io/client-go v0.0.0-20191016111102-bec269661e48 h1:C2XVy2z0dV94q9hSSoCuTPp1KOG7IegvbdXuz9VGxoU=
+k8s.io/client-go v0.0.0-20191016111102-bec269661e48/go.mod h1:hrwktSwYGI4JK+TJA3dMaFyyvHVi/aLarVHpbs8bgCU=
 k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible h1:xkYgpj1zwmLkSh7QASe/GUMTyjPI3hwHy7k/RcQSp2A=
 k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
 k8s.io/client-go v10.0.0+incompatible h1:F1IqCqw7oMBzDkqlcBymRq1450wD0eNqLE9jzUrIi34=
 k8s.io/client-go v10.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
+k8s.io/code-generator v0.0.0-20190927045949-f81bca4f5e85/go.mod h1:V5BD6M4CyaN5m+VthcclXWsVcT1Hu+glwa1bi3MIsyE=
+k8s.io/code-generator v0.0.0-20191004115455-8e001e5d1894/go.mod h1:mJUgkl06XV4kstAnLHAIzJPVCOzVR+ZcfPIv4fUsFCY=
+k8s.io/component-base v0.0.0-20191003000551-f573d376509c/go.mod h1:VLMr8+SrOC4J3MDbbL7cjBDEPBcwLP9/kv/u8PVUEo4=
+k8s.io/component-base v0.0.0-20191016111319-039242c015a9/go.mod h1:SuWowIgd/dtU/m/iv8OD9eOxp3QZBBhTIiWMsBQvKjI=
+k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/helm v2.12.3+incompatible h1:wo1cdYjOnr5Z+LFuhtwIJaeQnec6D4gcg2H5UAKzY6w=
 k8s.io/helm v2.12.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
+k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.2.0 h1:0ElL0OHzF3N+OhoJTL0uca20SxtYt4X4+bzHeqrB83c=
 k8s.io/klog v0.2.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v0.4.0 h1:lCJCxf/LIowc2IGS9TPjWDyXY4nOmdGdfcwwDQCOURQ=
+k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
+k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
+k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4 h1:gW+EUB2I96nbxVenV/8ctfbACsHP+yxlT2dhMCsiy+s=
 k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
 k8s.io/kube-openapi v0.0.0-20190225204428-d50a959ae76a h1:x9PsbfKs/IaYsygEYCbR58UWoyxHQTeHjUDpy4o+QoE=
 k8s.io/kube-openapi v0.0.0-20190225204428-d50a959ae76a/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
+k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
+k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d h1:Xpe6sK+RY4ZgCTyZ3y273UmFmURhjtoJiwOMbQsXitY=
+k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
+k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a h1:UcxjrRMyNx/i/y8G7kPvLyy7rfbeuf1PYyBf973pgyU=
+k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
+k8s.io/kubectl v0.0.0-20191003004222-1f3c0cd90ca9 h1:fIRS0hFdUag6oW29mzbml8LOzXIFw6Pey2uRVT0vWsM=
+k8s.io/kubectl v0.0.0-20191003004222-1f3c0cd90ca9/go.mod h1:vRGcIHH2xhkOt8KjrcyJGt6tJYopGswaRENLPPG3jvQ=
+k8s.io/kubectl v0.0.0-20191016120415-2ed914427d51 h1:RBkTKVMF+xsNsSOVc0+HdC0B5gD1sr6s6Cu5w9qNbuQ=
+k8s.io/kubectl v0.0.0-20191016120415-2ed914427d51/go.mod h1:gL826ZTIfD4vXTGlmzgTbliCAT9NGiqpCqK2aNYv5MQ=
 k8s.io/kubernetes v1.13.3 h1:46t44D87wKtdKFgr/lXM60K8xPrW0wO67Woof3Vsv6E=
 k8s.io/kubernetes v1.13.3/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
+k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20191001043732-d647ddbd755f/go.mod h1:spPP+vRNS8EsnNNIhFCZTTuRO3XhV1WoF18HJySoZn8=
+k8s.io/metrics v0.0.0-20191003002233-837aead57baf/go.mod h1:3nppwBBAvxwYOuLha+uf3pQfBRBUT8unkiBEU3EH7/U=
+k8s.io/metrics v0.0.0-20191016113814-3b1a734dba6e/go.mod h1:ve7/vMWeY5lEBkZf6Bt5TTbGS3b8wAxwGbdXAsufjRs=
 k8s.io/utils v0.0.0-20190221042446-c2654d5206da h1:ElyM7RPonbKnQqOcw7dG2IK5uvQQn3b/WPHqD5mBvP4=
 k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=
+k8s.io/utils v0.0.0-20190801114015-581e00157fb1 h1:+ySTxfHnfzZb9ys375PXNlLhkJPLKgHajBU0N62BDvE=
+k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
+k8s.io/utils v0.0.0-20191010214722-8d271d903fe4 h1:Gi+/O1saihwDqnlmC8Vhv1M5Sp4+rbOmK9TbsLn8ZEA=
+k8s.io/utils v0.0.0-20191010214722-8d271d903fe4/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
+modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
+modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
+modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
+modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
+modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
+rsc.io/letsencrypt v0.0.1 h1:DV0d09Ne9E7UUa9ZqWktZ9L2VmybgTgfq7xlfFR/bbU=
+rsc.io/letsencrypt v0.0.1/go.mod h1:buyQKZ6IXrRnB7TdkHP0RyEybLx18HHyOSoTyoOLqNY=
+sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
+sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
+sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
+sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA=
 sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 h1:O69FD9pJA4WUZlEwYatBEEkRWKQ5cKodWpdKTrCS/iQ=
diff --git a/src/jetstream/plugins/kubernetes/helm/graph.go b/src/jetstream/plugins/kubernetes/helm/graph.go
new file mode 100644
index 0000000000..5edd600404
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/helm/graph.go
@@ -0,0 +1,260 @@
+package helm
+
+import (
+	"fmt"
+
+	"reflect"
+	"strings"
+
+	log "github.com/sirupsen/logrus"
+	appsv1 "k8s.io/api/apps/v1"
+	appsv1beta1 "k8s.io/api/apps/v1beta1"
+	appsv1beta2 "k8s.io/api/apps/v1beta2"
+	batchv1 "k8s.io/api/batch/v1"
+	v1 "k8s.io/api/core/v1"
+	extv1beta1 "k8s.io/api/extensions/v1beta1"
+	rbacv1 "k8s.io/api/rbac/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+type HelmReleaseGraph struct {
+	Release *HelmRelease           `json:"-"`
+	Nodes   map[string]ReleaseNode `json:"nodes"`
+	Links   map[string]ReleaseLink `json:"links"`
+}
+
+type ReleaseNode struct {
+	ID    string `json:"id"`
+	Label string `json:"label"`
+	Data  struct {
+		Kind   string     `json:"kind"`
+		Status NodeStatus `json:"status"`
+	} `json:"data"`
+}
+
+type ReleaseLink struct {
+	ID     string `json:"id"`
+	Source string `json:"source"`
+	Target string `json:"target"`
+}
+
+// NewHelmReleaseGraph represents graph of the Helm Release
+func NewHelmReleaseGraph(release *HelmRelease) *HelmReleaseGraph {
+	r := &HelmReleaseGraph{
+		Release: release,
+	}
+	r.Nodes = make(map[string]ReleaseNode)
+	r.Links = make(map[string]ReleaseLink)
+	return r
+}
+
+func (r *HelmReleaseGraph) AddLink(source, target string) {
+	link := ReleaseLink{
+		ID:     fmt.Sprintf("%s_to_%s", source, target),
+		Source: source,
+		Target: target,
+	}
+	r.Links[link.ID] = link
+	log.Debugf("Adding link %s -> %s", source, target)
+}
+
+// ParseManifest
+func (r *HelmReleaseGraph) ParseManifest(release *HelmRelease) {
+	for _, item := range release.Resources {
+		log.Warn(item.Kind)
+
+		node := ReleaseNode{
+			ID:    fmt.Sprintf("%s-%s", item.Kind, item.Metadata.Name),
+			Label: item.Metadata.Name,
+		}
+
+		node.Data.Kind = item.Kind
+		node.Data.Status = "unknown"
+
+		switch o := item.Resource.(type) {
+		case *appsv1.Deployment:
+			target := getShortResourceId(o.Kind, o.Name)
+			r.ParseResourceOwners(target, o.OwnerReferences)
+			node.Data.Status = mapDeploymentStatus(o.Status.Replicas, o.Status.ReadyReplicas, o.Status.AvailableReplicas, o.Status.UnavailableReplicas)
+		case *appsv1beta1.Deployment:
+			target := getShortResourceId(o.Kind, o.Name)
+			r.ParseResourceOwners(target, o.OwnerReferences)
+			node.Data.Status = mapDeploymentStatus(o.Status.Replicas, o.Status.ReadyReplicas, o.Status.AvailableReplicas, o.Status.UnavailableReplicas)
+		case *appsv1beta2.Deployment:
+			target := getShortResourceId(o.Kind, o.Name)
+			r.ParseResourceOwners(target, o.OwnerReferences)
+			node.Data.Status = mapDeploymentStatus(o.Status.Replicas, o.Status.ReadyReplicas, o.Status.AvailableReplicas, o.Status.UnavailableReplicas)
+		case *extv1beta1.Deployment:
+			target := getShortResourceId(o.Kind, o.Name)
+			r.ParseResourceOwners(target, o.OwnerReferences)
+			node.Data.Status = mapDeploymentStatus(o.Status.Replicas, o.Status.ReadyReplicas, o.Status.AvailableReplicas, o.Status.UnavailableReplicas)
+		case *appsv1.StatefulSet:
+			target := getShortResourceId(o.Kind, o.Name)
+			r.ParseResourceOwners(target, o.OwnerReferences)
+		case *appsv1beta2.StatefulSet:
+			target := getShortResourceId(o.Kind, o.Name)
+			r.ParseResourceOwners(target, o.OwnerReferences)
+		case *appsv1beta1.StatefulSet:
+			target := getShortResourceId(o.Kind, o.Name)
+			r.ParseResourceOwners(target, o.OwnerReferences)
+		case *appsv1.ReplicaSet:
+			target := getShortResourceId(o.Kind, o.Name)
+			r.ParseResourceOwners(target, o.OwnerReferences)
+			node.Data.Status = mapReplicaSetStatus(o.Status)
+		case *v1.Pod:
+			target := getShortResourceId(item.Kind, o.Name)
+			r.ParseResourceOwners(target, o.OwnerReferences)
+			r.ProcessPod(target, item, o.Spec, o.Status)
+			node.Data.Status = mapPodStatus(o.Status.Phase)
+		case *v1.Service:
+			target := getShortResourceId(item.Kind, o.Name)
+			r.ProcessService(target, item, o.Spec)
+		case *batchv1.Job:
+			target := getShortResourceId(item.Kind, o.Name)
+			r.ParseResourceOwners(target, o.OwnerReferences)
+			r.ProcessServiceAccount(target, o.Spec.Template)
+		case *rbacv1.RoleBinding:
+			target := getShortResourceId(item.Kind, o.Name)
+			r.ParseRoleBinding(target, o)
+		default:
+			log.Debugf("Graph: Unknown type: %s", reflect.TypeOf(o))
+		}
+
+		// Add or replace the node in the map
+		r.Nodes[node.ID] = node
+	}
+
+	// Make sure all links have nodes
+	for _, link := range r.Links {
+		if _, ok := r.Nodes[link.Source]; !ok {
+			r.generateTemporaryNode(link.Source)
+		}
+		if _, ok := r.Nodes[link.Target]; !ok {
+			r.generateTemporaryNode(link.Target)
+		}
+	}
+}
+
+func (r *HelmReleaseGraph) generateTemporaryNode(id string) {
+	var parts = strings.Split(id, "-")
+
+	node := ReleaseNode{
+		ID:    id,
+		Label: parts[1],
+	}
+
+	node.Data.Kind = parts[0]
+	node.Data.Status = "missing"
+
+	r.Nodes[node.ID] = node
+}
+
+func getShortResourceId(kind, name string) string {
+	// // TODO: FIX
+	// if len(kind) == 0 {
+	// 	kind = "Pod"
+	// }
+	return fmt.Sprintf("%s-%s", kind, name)
+}
+
+func (r *HelmReleaseGraph) ParseResourceOwners(id string, owners []metav1.OwnerReference) {
+	// We've got a pod, so associate it with its owner(s)
+	//objMeta.OwnerReferences
+	for _, owner := range owners {
+		source := getShortResourceId(owner.Kind, owner.Name)
+		r.AddLink(source, id)
+	}
+}
+
+func (r *HelmReleaseGraph) ProcessPod(id string, res KubeResource, spec v1.PodSpec, status v1.PodStatus) {
+	// Look through volumes
+	// name and: PersistentVolumeClaim.ClaimName or Secret.SecretName
+	for _, volume := range spec.Volumes {
+		if volume.VolumeSource.PersistentVolumeClaim != nil {
+			ref := fmt.Sprintf("PersistentVolumeClaim-%s", volume.VolumeSource.PersistentVolumeClaim.ClaimName)
+			r.AddLink(id, ref)
+		} else if volume.VolumeSource.Secret != nil {
+			ref := fmt.Sprintf("Secret-%s", volume.VolumeSource.Secret.SecretName)
+			r.AddLink(id, ref)
+		} else if volume.VolumeSource.ConfigMap != nil {
+			ref := fmt.Sprintf("ConfigMap-%s", volume.VolumeSource.ConfigMap.Name)
+			r.AddLink(id, ref)
+		}
+	}
+
+	// Go through the pod and process each container
+	// Add a node for each container
+	for _, container := range spec.Containers {
+		node := ReleaseNode{
+			ID:    fmt.Sprintf("%s-%s", id, container.Name),
+			Label: container.Name,
+		}
+
+		node.Data.Kind = "Container"
+		node.Data.Status = mapContainerStatus(status, container.Name)
+
+		// Add a node for the container and link it to the pod
+		r.Nodes[node.ID] = node
+		r.AddLink(id, node.ID)
+
+		// Add links for ConfigMaps and Secrets used in the env_from
+		for _, envFrom := range container.EnvFrom {
+			if envFrom.ConfigMapRef != nil {
+				ref := fmt.Sprintf("ConfigMap-%s", envFrom.ConfigMapRef.Name)
+				r.AddLink(node.ID, ref)
+			} else if envFrom.SecretRef != nil {
+				ref := fmt.Sprintf("Secret-%s", envFrom.SecretRef.Name)
+				r.AddLink(node.ID, ref)
+			}
+		}
+
+		// Add links for ConfigMaps and Secrets used in the env
+		for _, env := range container.Env {
+			if env.ValueFrom != nil {
+				if env.ValueFrom.ConfigMapKeyRef != nil {
+					ref := fmt.Sprintf("ConfigMap-%s", env.ValueFrom.ConfigMapKeyRef)
+					r.AddLink(node.ID, ref)
+				} else if env.ValueFrom.SecretKeyRef != nil {
+					ref := fmt.Sprintf("Secret-%s", env.ValueFrom.SecretKeyRef.Name)
+					r.AddLink(node.ID, ref)
+				}
+			}
+		}
+	}
+}
+
+func (r *HelmReleaseGraph) ProcessService(id string, res KubeResource, spec v1.ServiceSpec) {
+	if len(spec.Selector) > 0 {
+		// Find all Pods that match this selector
+		for _, item := range r.Release.Resources {
+			switch o := item.Resource.(type) {
+			case *v1.Pod:
+				if labelsMatch(spec.Selector, o.Labels) {
+					podID := fmt.Sprintf("Pod-%s", o.Name)
+					r.AddLink(podID, id)
+				}
+			}
+		}
+	}
+}
+
+func (r *HelmReleaseGraph) ProcessServiceAccount(id string, template v1.PodTemplateSpec) {
+	if len(template.Spec.ServiceAccountName) > 0 {
+		svcAccountID := fmt.Sprintf("ServiceAccount-%s", template.Spec.ServiceAccountName)
+		r.AddLink(id, svcAccountID)
+	} else if len(template.Spec.DeprecatedServiceAccount) > 0 {
+		svcAccountID := fmt.Sprintf("ServiceAccount-%s", template.Spec.DeprecatedServiceAccount)
+		r.AddLink(id, svcAccountID)
+	}
+}
+
+func (r *HelmReleaseGraph) ParseRoleBinding(id string, roleBinding *rbacv1.RoleBinding) {
+	for _, subject := range roleBinding.Subjects {
+		// TODO: Only match those with the same namespace ????
+		subjectID := fmt.Sprintf("%s-%s", subject.Kind, subject.Name)
+		r.AddLink(id, subjectID)
+	}
+
+	roleRefID := fmt.Sprintf("%s-%s", roleBinding.RoleRef.Kind, roleBinding.RoleRef.Name)
+	r.AddLink(id, roleRefID)
+}
diff --git a/src/jetstream/plugins/kubernetes/helm/graph_status.go b/src/jetstream/plugins/kubernetes/helm/graph_status.go
new file mode 100644
index 0000000000..f2bfdce76b
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/helm/graph_status.go
@@ -0,0 +1,84 @@
+package helm
+
+import (
+	log "github.com/sirupsen/logrus"
+	appsv1 "k8s.io/api/apps/v1"
+	v1 "k8s.io/api/core/v1"
+)
+
+// NodeStatus represents the status of a node in the graph
+type NodeStatus string
+
+const (
+	NodeOK      NodeStatus = "ok"
+	NodeWarn    NodeStatus = "warn"
+	NodeError   NodeStatus = "error"
+	NodeUnknown NodeStatus = "unknown"
+	NodeNone    NodeStatus = "none"
+)
+
+func mapDeploymentStatus(replicas, ready, available, unavailable int32) NodeStatus {
+	if replicas == ready {
+		return NodeOK
+	}
+
+	if unavailable > 0 {
+		return NodeError
+	}
+
+	if replicas != unavailable {
+		return NodeWarn
+	}
+
+	return NodeWarn
+}
+
+func mapReplicaSetStatus(status appsv1.ReplicaSetStatus) NodeStatus {
+	if status.Replicas == status.ReadyReplicas {
+		return NodeOK
+	}
+
+	if status.Replicas != status.AvailableReplicas {
+		return NodeError
+	}
+
+	return NodeWarn
+}
+
+func mapContainerStatus(status v1.PodStatus, name string) NodeStatus {
+	for _, cstat := range status.ContainerStatuses {
+		if cstat.Name == name {
+			if cstat.Ready {
+				return NodeOK
+			} else {
+				// Could be a pod that has completed
+				if cstat.State.Terminated != nil {
+					if cstat.State.Terminated.ExitCode == 0 && cstat.State.Terminated.Reason == "Completed" {
+						return NodeOK
+					}
+				}
+				return NodeWarn
+			}
+		}
+	}
+	return NodeError
+}
+
+func mapPodStatus(phase v1.PodPhase) NodeStatus {
+
+	status := NodeUnknown
+
+	switch phase {
+	case v1.PodFailed:
+		status = NodeError
+	case v1.PodRunning:
+		status = NodeOK
+	case v1.PodSucceeded:
+		status = NodeOK
+	case v1.PodPending:
+		status = NodeWarn
+	}
+
+	log.Infof("Map Pod Status: %s => %s", phase, status)
+	return status
+}
diff --git a/src/jetstream/plugins/kubernetes/helm/job.go b/src/jetstream/plugins/kubernetes/helm/job.go
new file mode 100644
index 0000000000..ab2385be37
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/helm/job.go
@@ -0,0 +1,85 @@
+package helm
+
+import (
+	log "github.com/sirupsen/logrus"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+)
+
+// KubeResourceJob = Resource(s) that we need to go and fetch
+type KubeResourceJob struct {
+	ID         string
+	Kind       string
+	APIVersion string
+	Name       string
+	Namespace  string
+	Endpoint   string
+	User       string
+	URL        string
+	Parent     string
+}
+
+// KubeResourceJobResult is the result from a job
+type KubeResourceJobResult struct {
+	KubeResourceJob
+	StatusCode int
+	Data       []byte
+}
+
+// KubeAPIJob represents a set of jobs to run against the Kube API
+type KubeAPIJob struct {
+	Jetstream interfaces.PortalProxy
+	Jobs      []KubeResourceJob
+}
+
+// NewKubeAPIJob returns a helper that can execute all jobs and return results
+func NewKubeAPIJob(jetstream interfaces.PortalProxy, jobs []KubeResourceJob) *KubeAPIJob {
+	r := &KubeAPIJob{
+		Jetstream: jetstream,
+		Jobs:      jobs,
+	}
+	return r
+}
+
+// Run will run all of the jobs
+func (j *KubeAPIJob) Run() []KubeResourceJobResult {
+	count := len(j.Jobs)
+	var res []KubeResourceJobResult
+	kubeJobs := make(chan KubeResourceJob, count)
+	kubeResults := make(chan KubeResourceJobResult, count)
+
+	for w := 1; w <= 4; w++ {
+		go j.restWorker(j.Jetstream, w, kubeJobs, kubeResults)
+	}
+
+	for _, j := range j.Jobs {
+		kubeJobs <- j
+	}
+
+	close(kubeJobs)
+
+	var v KubeResourceJobResult
+	for a := 1; a <= count; a++ {
+		v = <-kubeResults
+		res = append(res, v)
+	}
+
+	return res
+}
+
+func (j *KubeAPIJob) restWorker(jetstream interfaces.PortalProxy, id int, jobs <-chan KubeResourceJob, results chan<- KubeResourceJobResult) {
+	for job := range jobs {
+		response, err := j.Jetstream.DoProxySingleRequest(job.Endpoint, job.User, "GET", job.URL, nil, nil)
+		log.Infof("Rest Worker finished for: %s - %d", job.URL, response.StatusCode)
+		res := KubeResourceJobResult{
+			KubeResourceJob: job,
+			StatusCode:      response.StatusCode,
+			Data:            response.Response,
+		}
+
+		if err != nil {
+			log.Errorf("KubeAPIJob: Failed to run job: %+v", err)
+		}
+		results <- res
+	}
+}
diff --git a/src/jetstream/plugins/kubernetes/helm/release.go b/src/jetstream/plugins/kubernetes/helm/release.go
new file mode 100644
index 0000000000..ab13508217
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/helm/release.go
@@ -0,0 +1,335 @@
+package helm
+
+import (
+	"bufio"
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"reflect"
+
+	//	"io"
+	"strings"
+
+	log "github.com/sirupsen/logrus"
+	"helm.sh/helm/v3/pkg/release"
+	appsv1 "k8s.io/api/apps/v1"
+	appsv1beta1 "k8s.io/api/apps/v1beta1"
+	appsv1beta2 "k8s.io/api/apps/v1beta2"
+	batchv1 "k8s.io/api/batch/v1"
+	v1 "k8s.io/api/core/v1"
+	extv1beta1 "k8s.io/api/extensions/v1beta1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/client-go/kubernetes/scheme"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+)
+
+var resourcesWithoutStatus = map[string]bool{
+	"RoleBinding": false,
+	"Role":        false,
+}
+
+// HelmRelease represents a Helm Release deployed via Helm
+type HelmRelease struct {
+	*release.Release
+	Endpoint  string                     `json:"-"`
+	User      string                     `json:"-"`
+	Resources map[string]KubeResource    `json:"resources"`
+	Jobs      []KubeResourceJob          `json:"-"`
+	PodJobs   map[string]KubeResourceJob `json:"-"`
+}
+
+// KubeResource is a simple struct to pull out core common metadata for a Kube resource
+type KubeResource struct {
+	Kind       string `yaml:"kind" json:"kind"`
+	APIVersion string `yaml:"apiVersion" json:"apiVersion"`
+	Metadata   struct {
+		Name string `yaml:"name" json:"name"`
+	} `yaml:"metadata" json:"metadata"`
+	Resource interface{} `yaml:"resource"`
+	Manifest bool
+}
+
+func (r *KubeResource) getID() string {
+	return fmt.Sprintf("%s-%s-%s", r.Kind, r.APIVersion, r.Metadata.Name)
+}
+
+// NewHelmRelease represents extended info about a Helm Release
+func NewHelmRelease(info *release.Release, endpoint, user string) *HelmRelease {
+	r := &HelmRelease{
+		Release:  info,
+		Endpoint: endpoint,
+		User:     user,
+	}
+	r.Resources = make(map[string]KubeResource)
+	r.PodJobs = make(map[string]KubeResourceJob)
+	r.parseManifest()
+	return r
+}
+
+// Parse the release manifest from the Helm release
+func (r *HelmRelease) parseManifest() {
+	reader := bytes.NewReader([]byte(r.Manifest))
+	buffer := bufio.NewReader(reader)
+	var bufr strings.Builder
+	for {
+		line, err := buffer.ReadString('\n')
+		if err != nil || (err == nil && strings.TrimSpace(line) == "---") {
+			data := []byte(bufr.String())
+			if len(data) > 0 {
+				decode := scheme.Codecs.UniversalDeserializer().Decode
+				obj, _, err := decode([]byte(bufr.String()), nil, nil)
+				if err != nil {
+					log.Error(fmt.Sprintf("Helm Manifest Parser: Error while decoding YAML object. Err was: %s", err))
+				} else {
+					r.processResource(obj)
+				}
+
+				bufr.Reset()
+				line = ""
+			}
+		}
+
+		if err != nil {
+			break
+		}
+		bufr.WriteString(line)
+	}
+}
+
+func getResourceIdentifier(typeMeta metav1.TypeMeta, objectMeta metav1.ObjectMeta) string {
+	return fmt.Sprintf("%s-%s-%s", typeMeta.Kind, typeMeta.APIVersion, objectMeta.Name)
+}
+
+func (r *HelmRelease) setResource(res KubeResource) {
+	r.Resources[res.getID()] = res
+}
+
+// GetResources gets all fo the resources for the release
+func (r *HelmRelease) GetResources() []interface{} {
+	var resources []interface{}
+	for _, res := range r.Resources {
+		resources = append(resources, res.Resource)
+	}
+	return resources
+}
+
+// GetPods gets the pod resources for the release
+func (r *HelmRelease) GetPods() []interface{} {
+	var resources []interface{}
+	for _, res := range r.Resources {
+		if res.Kind == "Pod" {
+			resources = append(resources, res.Resource)
+		}
+	}
+	return resources
+}
+
+// process a yaml resource from the helm manifest
+func (r *HelmRelease) processResource(obj runtime.Object) {
+	j, err := json.Marshal(obj)
+	if err == nil {
+		var t KubeResource
+		if json.Unmarshal(j, &t) == nil {
+			t.Resource = obj
+			t.Manifest = true
+			r.setResource(t)
+			log.Infof("Got resource: %s : %s", t.Kind, t.Metadata.Name)
+			// if t.Kind == "Deployment" || t.Kind == "StatefulSet" || t.Kind == "DaemonSet" || t.Kind =={
+			// 	r.processController(t)
+			// }
+			r.processController(t)
+			r.addJobForResource(t.Kind, t.APIVersion, t.Metadata.Name)
+		} else {
+			log.Error("Helm Release Manifest: Could not parse Kubernetes resource")
+		}
+	}
+}
+
+func (r *HelmRelease) addJobForResource(kind, apiVersion, name string) {
+	job := KubeResourceJob{
+		ID:         fmt.Sprintf("%s-%s#Pods", kind, name),
+		Endpoint:   r.Endpoint,
+		User:       r.User,
+		Namespace:  r.Namespace,
+		Name:       name,
+		URL:        getRestURL(r.Namespace, kind, apiVersion, name),
+		APIVersion: apiVersion,
+		Kind:       kind,
+	}
+	r.Jobs = append(r.Jobs, job)
+}
+
+func (r *HelmRelease) processController(kres KubeResource) {
+	switch o := kres.Resource.(type) {
+	case *appsv1.Deployment:
+		r.processPodSelector(kres, o.Spec.Selector)
+	case *appsv1beta1.Deployment:
+		r.processPodSelector(kres, o.Spec.Selector)
+	case *appsv1beta2.Deployment:
+		r.processPodSelector(kres, o.Spec.Selector)
+	case *extv1beta1.Deployment:
+		r.processPodSelector(kres, o.Spec.Selector)
+	case *appsv1.StatefulSet:
+		r.processPodSelector(kres, o.Spec.Selector)
+	case *appsv1beta2.StatefulSet:
+		r.processPodSelector(kres, o.Spec.Selector)
+	case *appsv1beta1.StatefulSet:
+		r.processPodSelector(kres, o.Spec.Selector)
+	case *appsv1.DaemonSet:
+		r.processPodSelector(kres, o.Spec.Selector)
+	case *batchv1.Job:
+		r.processPodSelector(kres, o.Spec.Selector)
+	default:
+		// Ignore - not a controller
+		log.Errorf("Ignoring: non-controller type: %s", reflect.TypeOf(o))
+	}
+}
+
+func (r *HelmRelease) processPodSelector(kres KubeResource, selector *metav1.LabelSelector) {
+	if selector == nil {
+		return
+	}
+
+	qs := podSelectorToQueryString(selector)
+
+	// Add a job to get the pods in this deployment
+	job := KubeResourceJob{
+		ID:        fmt.Sprintf("%s-%s#Pods", kres.Kind, kres.Metadata.Name),
+		Parent:    fmt.Sprintf("%s-%s", kres.Kind, kres.Metadata.Name),
+		URL:       fmt.Sprintf("/api/v1/namespaces/%s/pods%s", r.Namespace, qs),
+		Endpoint:  r.Endpoint,
+		User:      r.User,
+		Namespace: r.Namespace,
+	}
+	r.PodJobs[job.ID] = job
+}
+
+// UpdatePods will run the jobs needed to get the pods
+// This uses the selectors to find the pods - so new pods should be picked up
+func (r *HelmRelease) UpdatePods(jetstream interfaces.PortalProxy) {
+	var jobs []KubeResourceJob
+	for _, job := range r.PodJobs {
+		jobs = append(jobs, job)
+	}
+
+	runner := NewKubeAPIJob(jetstream, jobs)
+	res := runner.Run()
+	for _, j := range res {
+		var list v1.PodList
+		err := json.Unmarshal(j.Data, &list)
+		if err == nil {
+			for _, pod := range list.Items {
+				// Add a kube resource for the pod
+				res := KubeResource{
+					Kind:       "Pod",
+					APIVersion: "v1",
+				}
+				res.Metadata.Name = pod.Name
+				res.Manifest = false
+
+				podCopy := &v1.Pod{}
+				*podCopy = pod
+				res.Resource = podCopy
+
+				r.setResource(res)
+				r.processPodOwners(pod)
+			}
+		}
+	}
+}
+
+// Pods can be owned by a ReplicaSet - these are not represented in the manifest, as they
+// are created as part of the Deployment resource
+// Look through the pod and add the ReplicaSets to the manifest
+func (r *HelmRelease) processPodOwners(pod v1.Pod) {
+	for _, owner := range pod.ObjectMeta.OwnerReferences {
+		if owner.Kind == "ReplicaSet" {
+			// This is an incompelte ReplicaSet, but enough for us to use to go get more metadata
+			resource := appsv1.ReplicaSet{}
+			resource.TypeMeta = metav1.TypeMeta{
+				Kind:       owner.Kind,
+				APIVersion: owner.APIVersion,
+			}
+			resource.ObjectMeta = metav1.ObjectMeta{
+				Name:      owner.Name,
+				Namespace: r.Namespace,
+			}
+			identifier := getResourceIdentifier(resource.TypeMeta, resource.ObjectMeta)
+			if _, ok := r.Resources[identifier]; !ok {
+				// Create a Kube Resource for the ReplicaSet
+				res := KubeResource{
+					Kind:       resource.Kind,
+					APIVersion: resource.APIVersion,
+				}
+				res.Metadata.Name = resource.Name
+				res.Manifest = false
+				res.Resource = &resource
+				r.setResource(res)
+
+				r.addJobForResource(owner.Kind, owner.APIVersion, owner.Name)
+			}
+		} else {
+			log.Warn("Unexpected Pod owner kind: %s", owner.Kind)
+		}
+	}
+}
+
+// func (r *HelmRelease) getKubeResource(typeMeta metav1.TypeMeta, objectMeta metav1.ObjectMeta) KubeResource {
+// 	kres := KubeResource{
+// 		Kind:       typeMeta.Kind,
+// 		APIVersion: typeMeta.APIVersion,
+// 	}
+// 	kres.Metadata.Name = objectMeta.Name
+// 	return kres
+// }
+
+func (r *HelmRelease) UpdateResources(jetstream interfaces.PortalProxy) {
+	// This will be an array of resources
+	runner := NewKubeAPIJob(jetstream, r.Jobs)
+	res := runner.Run()
+	for _, j := range res {
+
+		// TODO: If the status was 404, then we should remove the resource
+
+		// Add a kube resource
+		res := KubeResource{
+			Kind:       j.Kind,
+			APIVersion: j.APIVersion,
+		}
+		res.Metadata.Name = j.Name
+
+		// TODO: This should carry over
+		res.Manifest = false
+
+		decode := scheme.Codecs.UniversalDeserializer().Decode
+		obj, _, err := decode(j.Data, nil, nil)
+		if err == nil {
+			res.Resource = obj
+			r.setResource(res)
+		} else {
+			log.Error("Could not parse resource")
+		}
+
+		// TODO: If the resource was a job, process the selector again
+		r.processController(res)
+	}
+}
+
+func getRestURL(namespace, kind, apiVersion, name string) string {
+	var restURL string
+	base := "api"
+	if len(strings.Split(apiVersion, "/")) > 1 {
+		base = "apis"
+
+		v, ok := resourcesWithoutStatus[kind]
+		if !ok || v {
+			name += "/status"
+		}
+	}
+	restURL = fmt.Sprintf("/%s/%s/namespaces/%s/%ss/%s", base, apiVersion, namespace, strings.ToLower(kind), name)
+
+	//log.Errorf("%s %s %s -> %s", kind, apiVersion, name, restURL)
+	return restURL
+}
diff --git a/src/jetstream/plugins/kubernetes/helm/release_test.go b/src/jetstream/plugins/kubernetes/helm/release_test.go
new file mode 100644
index 0000000000..4b0fdbaf86
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/helm/release_test.go
@@ -0,0 +1,29 @@
+package helm
+
+import (
+	"testing"
+
+	. "github.com/smartystreets/goconvey/convey"
+
+	log "github.com/sirupsen/logrus"
+)
+
+func TestPodSelector(t *testing.T) {
+
+	Convey("TestPodSelector", t, func() {
+
+		t1 := KubeDeploymentResource{}
+		t1.Spec.Selector.MatchLabels = make(map[string]string)
+		t1.Spec.Selector.MatchLabels["environemnt"] = "dev"
+
+		res := podSelectorToQueryString(t1)
+
+		log.Info(res)
+
+		// So(ArrayContainsString(str1, "two"), ShouldBeTrue)
+		// So(ArrayContainsString(str1, "four"), ShouldBeFalse)
+		// So(ArrayContainsString(str1, ""), ShouldBeFalse)
+		// So(ArrayContainsString(nil, "test"), ShouldBeFalse)
+	})
+
+}
diff --git a/src/jetstream/plugins/kubernetes/helm/util.go b/src/jetstream/plugins/kubernetes/helm/util.go
new file mode 100644
index 0000000000..7e20ec5513
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/helm/util.go
@@ -0,0 +1,52 @@
+package helm
+
+import (
+	"fmt"
+	"strings"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// See: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+func podSelectorToQueryString(selector *metav1.LabelSelector) string {
+
+	qs := "?labelSelector="
+	ml := ""
+	sep := ""
+
+	// Match labels
+	for k, v := range selector.MatchLabels {
+		fmt.Printf("key[%s] value[%s]\n", k, v)
+		if len(ml) > 0 {
+			sep = ","
+		}
+
+		ml = fmt.Sprintf("%s%s%s%%3D%s", ml, sep, k, v)
+	}
+
+	// Now add set based match expressions
+	for _, v := range selector.MatchExpressions {
+		if len(ml) > 0 {
+			sep = ","
+		}
+		ml = fmt.Sprintf("%s%s%s+%s+%%28%s%%s29", ml, sep, v.Key, v.Operator, strings.Join(v.Values, "%%2C"))
+	}
+
+	if len(ml) > 0 {
+		return fmt.Sprintf("%s%s", qs, ml)
+	}
+
+	return ""
+}
+
+// Check that the selectors maps contains everything in the find map
+func labelsMatch(find, selectors map[string]string) bool {
+	for k, v := range find {
+		if sv, ok := selectors[k]; ok {
+			if sv != v {
+				return false
+			}
+		}
+	}
+	return true
+}
diff --git a/src/jetstream/plugins/kubernetes/helm_client.go b/src/jetstream/plugins/kubernetes/helm_client.go
index 8cfeef9cb0..1be20f6c52 100644
--- a/src/jetstream/plugins/kubernetes/helm_client.go
+++ b/src/jetstream/plugins/kubernetes/helm_client.go
@@ -2,60 +2,159 @@ package kubernetes
 
 import (
 	"errors"
-	"fmt"
+	"io/ioutil"
+	"os"
+	"time"
 
 	log "github.com/sirupsen/logrus"
 
-	"k8s.io/client-go/kubernetes"
-	"k8s.io/helm/pkg/helm"
-	"k8s.io/helm/pkg/helm/portforwarder"
-	"k8s.io/helm/pkg/kube"
+	"k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/client-go/discovery"
+	diskcached "k8s.io/client-go/discovery/cached/disk"
+	"k8s.io/client-go/restmapper"
+	"k8s.io/client-go/tools/clientcmd"
+
+	restclient "k8s.io/client-go/rest"
+
+	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/kube"
+	"helm.sh/helm/v3/pkg/storage"
+	"helm.sh/helm/v3/pkg/storage/driver"
 
 	// Import the OIDC auth plugin
 	_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
 )
 
-// GetHelmClient gets a client that can be used to talk to Tiller
-func (c *KubernetesSpecification) GetHelmClient(endpointGUID, userID string) (helm.Interface, *kubernetes.Clientset, *kube.Tunnel, error) {
+// HelmConfiguration stores any resources that need to be cleaned up after use
+type HelmConfiguration struct {
+	Folder string
+}
+
+// Cleanup any resources associated with the Helm configuration
+func (f *HelmConfiguration) Cleanup() {
+	if len(f.Folder) > 0 {
+		os.RemoveAll(f.Folder)
+	}
+}
+
+// GetHelmConfiguration - gets a Helm V3 client for using it as a client library
+func (c *KubernetesSpecification) GetHelmConfiguration(endpointGUID, userID, namespace string) (*action.Configuration, *HelmConfiguration, error) {
 	// Need to get a config object for the target endpoint
 	var p = c.portalProxy
 
+	hc := &HelmConfiguration{}
+
 	cnsiRecord, err := p.GetCNSIRecord(endpointGUID)
 	if err != nil {
-		return nil, nil, nil, errors.New("Helm: Can not get endpoint record")
+		return nil, hc, errors.New("Helm: Can not get endpoint record")
 	}
 
 	tokenRecord, ok := p.GetCNSITokenRecord(endpointGUID, userID)
 	if !ok {
-		return nil, nil, nil, errors.New("Helm: Can not get user token for endpoint")
+		return nil, hc, errors.New("Helm: Can not get user token for endpoint")
 	}
 
-	config, err := c.GetConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRecord)
+	kubeconfigcontents, err := c.GetKubeConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRecord, namespace)
 	if err != nil {
-		log.Errorf("Helm: Could not get config for endpoint: %s", err)
-		return nil, nil, nil, errors.New("Can not get Kubernetes config for specified endpoint")
+		log.Errorf("Helm: Could not get kubeconfig for endpoint: %s", err)
+		return nil, hc, errors.New("Can not get Kubernetes config for specified endpoint")
 	}
 
-	kubeClient, err := kubernetes.NewForConfig(config)
+	// TODO: Some auth schemes needs to have the token refreshed - so we should do that first
+	// to ensure it is valid when we use it subsequently
+
+	hc.Folder, err = ioutil.TempDir("", "helm-client-")
 	if err != nil {
-		log.Errorf("Helm: Could not get kube client: %s", err)
-		return nil, nil, nil, err
+		log.Error("Unable to create temporary folder")
 	}
 
-	tillerTunnel, err := portforwarder.New("kube-system", kubeClient, config)
+	rcg := newJetStreamRCGetter([]byte(kubeconfigcontents), hc.Folder, namespace)
+
+	var nopLogger = func(a string, b ...interface{}) {
+		log.Infof(a, b)
+	}
+
+	var actionConfig action.Configuration
+	// kubeconfig := kube.GetConfig(kubeConfigPath, "kube", namespace)
+
+	kc := kube.New(rcg)
+	kc.Log = nopLogger
+
+	clientset, err := kc.Factory.KubernetesClientSet()
 	if err != nil {
-		log.Error("Helm: Could not establish port forwarding for Tiller")
-		return nil, nil, nil, err
+		return nil, hc, err
 	}
 
-	log.Debugf("Helm: Tiller tunnel is using Port: %d", tillerTunnel.Local)
-	tillerHost := fmt.Sprintf("127.0.0.1:%d", tillerTunnel.Local)
-	client := newClient(tillerHost)
+	var store *storage.Storage
+	d := driver.NewSecrets(clientset.CoreV1().Secrets(namespace))
+	d.Log = nopLogger
+	store = storage.Init(d)
+
+	actionConfig.RESTClientGetter = rcg
+	actionConfig.KubeClient = kc
+	actionConfig.Releases = store
+	actionConfig.Log = nopLogger
+	//actionConfig.
 
-	return client, kubeClient, tillerTunnel, nil
+	return &actionConfig, hc, nil
 }
 
-func newClient(tillerHost string) helm.Interface {
-	options := []helm.Option{helm.Host(tillerHost), helm.ConnectTimeout(20)}
-	return helm.NewClient(options...)
+type jetStreamRestClientGetter struct {
+	clientConfig clientcmd.ClientConfig
+	tempFolder   string
+}
+
+func newJetStreamRCGetter(kubeconfig []byte, tempFolder string, namespace string) *jetStreamRestClientGetter {
+
+	clientConfig, err := clientcmd.NewClientConfigFromBytes(kubeconfig)
+	if err != nil {
+		log.Error(err)
+	}
+
+	f := &jetStreamRestClientGetter{
+		clientConfig: clientConfig,
+		tempFolder:   tempFolder,
+	}
+	return f
+}
+
+// ToRESTConfig returns restconfig
+func (f *jetStreamRestClientGetter) ToRESTConfig() (*restclient.Config, error) {
+	return f.clientConfig.ClientConfig()
+}
+
+// ToRawKubeConfigLoader binds config flag values to config overrides
+// Returns an interactive clientConfig if the password flag is enabled,
+// or a non-interactive clientConfig otherwise.
+func (f *jetStreamRestClientGetter) ToRawKubeConfigLoader() clientcmd.ClientConfig {
+	return f.clientConfig
+}
+
+// ToDiscoveryClient returns discovery client
+func (f *jetStreamRestClientGetter) ToDiscoveryClient() (discovery.CachedDiscoveryInterface, error) {
+	config, err := f.ToRESTConfig()
+	if err != nil {
+		return nil, err
+	}
+
+	// The more groups you have, the more discovery requests you need to make.
+	// given 25 groups (our groups + a few custom resources) with one-ish version each, discovery needs to make 50 requests
+	// double it just so we don't end up here again for a while.  This config is only used for discovery.
+	config.Burst = 100
+
+	httpCacheDir := f.tempFolder
+	discoveryCacheDir := f.tempFolder
+	return diskcached.NewCachedDiscoveryClientForConfig(config, discoveryCacheDir, httpCacheDir, time.Duration(10*time.Minute))
+}
+
+// ToRESTMapper returns a mapper.
+func (f *jetStreamRestClientGetter) ToRESTMapper() (meta.RESTMapper, error) {
+	discoveryClient, err := f.ToDiscoveryClient()
+	if err != nil {
+		return nil, err
+	}
+
+	mapper := restmapper.NewDeferredDiscoveryRESTMapper(discoveryClient)
+	expander := restmapper.NewShortcutExpander(mapper, discoveryClient)
+	return expander, nil
 }
diff --git a/src/jetstream/plugins/kubernetes/helm_versions.go b/src/jetstream/plugins/kubernetes/helm_versions.go
deleted file mode 100644
index 1a21f5dbae..0000000000
--- a/src/jetstream/plugins/kubernetes/helm_versions.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package kubernetes
-
-import (
-	"net/http"
-
-	"github.com/labstack/echo"
-	log "github.com/sirupsen/logrus"
-
-	// "k8s.io/client-go/kubernetes"
-	// "k8s.io/client-go/rest"
-	// "k8s.io/helm/pkg/helm"
-	// "k8s.io/helm/pkg/helm/portforwarder"
-	// "k8s.io/helm/pkg/kube"
-	// "k8s.io/helm/pkg/kube"
-
-	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
-)
-
-// GetHelmVersions will retrieve Tiller details for all endpoints
-func (c *KubernetesSpecification) GetHelmVersions(ec echo.Context) error {
-
-	log.Debug("GetHelmVersions")
-	// Need to get a config object for the target endpoint
-	// endpointGUID := ec.Param("endpoint")
-	userID := ec.Get("user_id").(string)
-
-	resp, err := c.ProxyKubernetesAPI(userID, c.fetchHelmVersion)
-	if err != nil {
-		return interfaces.NewHTTPShadowError(
-			http.StatusInternalServerError,
-			"Error fetching Helm Tiller Versions",
-			"Error fetching Helm Tiller Versions: %v", err,
-		)
-	}
-	return ec.JSON(200, resp)
-}
-
-func (c *KubernetesSpecification) fetchHelmVersion(ep *interfaces.ConnectedEndpoint, done chan KubeProxyResponse) {
-
-	respone := KubeProxyResponse{
-		Endpoint: ep.GUID,
-		Result:   nil,
-	}
-
-	client, kubeClient, tiller, err := c.GetHelmClient(ep.GUID, ep.Account)
-	if err != nil {
-		done <- respone
-		return
-	}
-
-	defer tiller.Close()
-
-	resp, err := client.GetVersion()
-	if err != nil {
-		done <- respone
-		return
-	}
-
-	_, _ = kubeClient.Discovery().ServerVersion()
-
-	respone.Result = resp
-	done <- respone
-}
diff --git a/src/jetstream/plugins/kubernetes/install_release.go b/src/jetstream/plugins/kubernetes/install_release.go
index b6fc1ff755..386d5cecbd 100644
--- a/src/jetstream/plugins/kubernetes/install_release.go
+++ b/src/jetstream/plugins/kubernetes/install_release.go
@@ -5,13 +5,17 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net/http"
 
 	"github.com/helm/monocular/chartsvc"
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
+	"sigs.k8s.io/yaml"
 
-	"k8s.io/helm/pkg/chartutil"
-	"k8s.io/helm/pkg/helm"
+	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/chart/loader"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 )
 
 const chartCollection = "charts"
@@ -46,6 +50,8 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 		return fmt.Errorf("Could not get Create Release Parameters: %v+", err)
 	}
 
+	log.Warn("%+v", params)
+
 	chartID := fmt.Sprintf("%s/%s", params.Chart.Repository, params.Chart.Name)
 
 	log.Info("Installing release")
@@ -59,7 +65,7 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 	log.Debugf("Chart Download URL: %s", downloadURL)
 
 	// Should we ignore SSL certs?
-	// TODO: Look up Helm Repository endpoiint and use the value from that
+	// TODO: Look up Helm Repository endpoint and use the value from that
 	http := c.portalProxy.GetHttpClient(true)
 
 	resp, err := http.Get(downloadURL)
@@ -69,50 +75,64 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 	}
 
 	defer resp.Body.Close()
-	chart, err := chartutil.LoadArchive(resp.Body)
+
+	chart, err := loader.LoadArchive(resp.Body)
 	if err != nil {
 		return fmt.Errorf("Could not load chart from archive: %v+", err)
 	}
 
-	log.Debug("Loaded helm chart")
+	log.Warn("Loaded helm chart")
+	log.Warn(chart.Name())
 
 	endpointGUID := params.Endpoint
 	userGUID := ec.Get("user_id").(string)
 
-	client, _, tiller, err := c.GetHelmClient(endpointGUID, userGUID)
+	config, hc, err := c.GetHelmConfiguration(endpointGUID, userGUID, params.Namespace)
 	if err != nil {
-		return fmt.Errorf("Could not get Helm Client for endpoint: %v+", err)
+		return fmt.Errorf("Could not get Helm Configuration for endpoint: %v+", err)
 	}
 
-	defer tiller.Close()
+	defer hc.Cleanup()
 
-	if _, err := chartutil.LoadRequirements(chart); err == nil {
-		log.Debug("Chart requirements loaded")
-	} else if err != chartutil.ErrRequirementsNotFound {
-		log.Error("Can not load requirements for helm chart")
-	} else {
-		log.Error(err)
+	// if _, err := chartutil.LoadRequirements(chart); err == nil {
+	// 	log.Debug("Chart requirements loaded")
+	// } else if err != chartutil.ErrRequirementsNotFound {
+	// 	log.Error("Can not load requirements for helm chart")
+	// } else {
+	// 	log.Error(err)
+	// }
+
+	log.Warn("Got values")
+	log.Warn(params.Values)
+
+	userSuppliedValues := map[string]interface{}{}
+	if err := yaml.Unmarshal([]byte(params.Values), &userSuppliedValues); err != nil {
+		// Could not parse the user's values
+		return err
 	}
 
-	installResponse, err := client.InstallReleaseFromChart(
-		chart,
-		params.Namespace,
-		helm.ValueOverrides([]byte(params.Values)),
-		helm.ReleaseName(params.Name),
-		helm.InstallDryRun(false),
-		helm.InstallReuseName(false),
-		helm.InstallDisableHooks(false),
-		helm.InstallDisableCRDHook(false),
-		helm.InstallTimeout(300),
-		helm.InstallWait(false),
-		helm.InstallDescription(""),
-	)
+	log.Warn("Installing.....")
+
+	install := action.NewInstall(config)
+	install.ReleaseName = params.Name
+	install.Namespace = params.Namespace
+
+	log.Warnf("%+v", install)
+
+	// Set timeout
+	// Wait?
+	// Generate Name ?
+	// Atomic?
 
+	release, err := install.Run(chart, userSuppliedValues)
 	if err != nil {
+		log.Error(err)
 		return fmt.Errorf("Could not install Helm Chart: %v+", err)
-
 	}
-	return ec.JSON(200, installResponse)
+
+	log.Warn("All okay")
+
+	return ec.JSON(200, release)
 }
 
 func (c *KubernetesSpecification) getChart(chartID, version string) (string, error) {
@@ -150,19 +170,31 @@ func (c *KubernetesSpecification) DeleteRelease(ec echo.Context) error {
 
 	endpointGUID := ec.Param("endpoint")
 	releaseName := ec.Param("name")
+	namespace := ec.Param("namespace")
+
+	// I think we're going to need the namespace
 
 	userGUID := ec.Get("user_id").(string)
-	client, _, tiller, err := c.GetHelmClient(endpointGUID, userGUID)
+
+	config, hc, err := c.GetHelmConfiguration(endpointGUID, userGUID, namespace)
 	if err != nil {
-		return fmt.Errorf("Could not get Helm Client for endpoint: %v+", err)
+		log.Errorf("Helm: DeleteRelease could not get a Helm Configuration: %s", err)
+		return err
 	}
 
-	defer tiller.Close()
+	defer hc.Cleanup()
+
+	uninstall := action.NewUninstall(config)
 
-	deleteResponse, err := client.DeleteRelease(releaseName, helm.DeletePurge(true))
+	log.Warnf("%+v", config)
+	log.Warnf("%+v", uninstall)
+
+	deleteResponse, err := uninstall.Run(releaseName)
 	if err != nil {
-		return fmt.Errorf("Could not delete Helm Release: %v+", err)
+		return interfaces.NewJetstreamError(http.StatusInternalServerError, "Could not delete Helm Release")
 	}
 
+	log.Warnf("%+v", deleteResponse)
+
 	return ec.JSON(200, deleteResponse)
 }
diff --git a/src/jetstream/plugins/kubernetes/kube_dashboard.go b/src/jetstream/plugins/kubernetes/kube_dashboard.go
index 76e9dc4c69..ec28a7d502 100644
--- a/src/jetstream/plugins/kubernetes/kube_dashboard.go
+++ b/src/jetstream/plugins/kubernetes/kube_dashboard.go
@@ -23,10 +23,6 @@ import (
 	"k8s.io/client-go/transport"
 
 	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/kubernetes/pkg/api/legacyscheme"
-	api "k8s.io/kubernetes/pkg/apis/core"
-	k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
 )
 
 // GET /api/v1/namespaces/{namespace}/pods/{name}/proxy
@@ -324,22 +320,15 @@ func (k *KubernetesSpecification) getKubeDashboardPod(c echo.Context, labelSelec
 	return &pod, nil
 }
 
-func tryDecodePodList(data []byte) (parsed bool, pods v1.PodList, err error) {
-	obj, err := runtime.Decode(legacyscheme.Codecs.UniversalDecoder(), data)
-	if err != nil {
-		return false, pods, err
-	}
+func tryDecodePodList(data []byte) (bool, v1.PodList, error) {
 
-	newPods, ok := obj.(*api.PodList)
-	// Check whether the object could be converted to list of pods.
-	if !ok {
-		err = fmt.Errorf("invalid pods list: %#v", obj)
+	var pods v1.PodList
+	var err error
+
+	err = json.Unmarshal(data, &pods)
+	if err != nil {
 		return false, pods, err
 	}
 
-	v1Pods := &v1.PodList{}
-	if err := k8s_api_v1.Convert_core_PodList_To_v1_PodList(newPods, v1Pods, nil); err != nil {
-		return true, pods, err
-	}
-	return true, *v1Pods, err
+	return true, pods, err
 }
diff --git a/src/jetstream/plugins/kubernetes/list_releases.go b/src/jetstream/plugins/kubernetes/list_releases.go
index 5e7e920a83..9dc54d5415 100644
--- a/src/jetstream/plugins/kubernetes/list_releases.go
+++ b/src/jetstream/plugins/kubernetes/list_releases.go
@@ -1,21 +1,68 @@
 package kubernetes
 
 import (
-	//"encoding/json"
+	"encoding/json"
+	"fmt"
+
+	"time"
+
 	//"fmt"
-	"net/url"
 
+	"github.com/gorilla/websocket"
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
 
-	// "k8s.io/client-go/kubernetes"
 	// "k8s.io/client-go/rest"
-	"k8s.io/helm/pkg/helm"
+	"helm.sh/helm/v3/pkg/action"
+	// "helm.sh/helm/v3/pkg/release"
+
 	// "k8s.io/helm/pkg/kube"
 
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/helm"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 )
 
+// type helmReleaseInfo struct {
+// 	*release.Release
+// 	Extra     string                `json:"extra"`
+// 	Resources []helmReleaseResource `json:"resources"`
+// }
+
+// type helmReleaseResource struct {
+// 	Kind       string `json:"kind"`
+// 	APIVersion string `json:"apiVersion"`
+// 	Name       string `json:"name"`
+// }
+
+type ResourceResponse struct {
+	Kind string          `json:"kind"`
+	Data json.RawMessage `json:"data"`
+}
+
+// type KubeResource struct {
+// 	Kind       string `yaml:"kind"`
+// 	APIVersion string `yaml:"apiVersion"`
+// 	Metadata   struct {
+// 		Name string `yaml:"name"`
+// 	} `yaml:"metadata"`
+// 	Spec interface{} `yaml:"spec"`
+// }
+
+// type kubeAPIJob struct {
+// 	Kind       string
+// 	APIVersion string
+// 	Name       string
+// 	Namespace  string
+// 	Endpoint   string
+// 	User       string
+// }
+
+// type KubeAPIJobResult struct {
+// 	helm.KubeResourceJob
+// 	StatusCode int
+// 	Data       json.RawMessage
+// }
+
 type kubeReleasesData struct {
 	Endpoint  string `json:"endpoint"`
 	Name      string `json:"releaseName"`
@@ -27,6 +74,17 @@ type kubeReleasesData struct {
 	} `json:"chart"`
 }
 
+// type helmReleasesData struct {
+// 	Manifest  string `json:"endpoint"`
+// 	Name      string `json:"releaseName"`
+// 	Namespace string `json:"releaseNamespace"`
+// 	Chart     struct {
+// 		Name       string `json:"chartName"`
+// 		Repository string `json:"repo"`
+// 		Version    string `json:"version"`
+// 	} `json:"chart"`
+// }
+
 type kubeReleasesResponse map[string]kubeReleasesData
 
 // ListReleases will list the helm releases for all endpoints
@@ -53,20 +111,21 @@ func (c *KubernetesSpecification) listReleases(ep *interfaces.ConnectedEndpoint,
 	}
 
 	log.Debugf("listReleases: START: %s", ep.GUID)
-	client, _, tiller, err := c.GetHelmClient(ep.GUID, ep.Account)
+
+	config, hc, err := c.GetHelmConfiguration(ep.GUID, ep.Account, "")
 	if err != nil {
-		log.Errorf("Helm: ListReleases could not get a Helm Client: %s", err)
+		log.Errorf("Helm: ListReleases could not get a Helm Configuration: %s", err)
 		done <- response
 		return
 	}
 
-	defer tiller.Close()
+	defer hc.Cleanup()
+
+	list := action.NewList(config)
 
 	log.Debugf("listReleases: REQUEST: %s", ep.GUID)
 
-	res, err := client.ListReleases(
-		helm.ReleaseListStatuses(nil),
-	)
+	res, err := list.Run()
 	if err != nil {
 		log.Debugf("listReleases: ERROR: %s", ep.GUID)
 		log.Error(err)
@@ -77,71 +136,171 @@ func (c *KubernetesSpecification) listReleases(ep *interfaces.ConnectedEndpoint,
 
 	log.Debugf("listReleases: OK: %s", ep.GUID)
 	response.Result = res
+
 	done <- response
 }
 
 // GetRelease will get release status for the given release
+// This is a web socket request and will return info over the websocket
+// polling until disconnected
 func (c *KubernetesSpecification) GetRelease(ec echo.Context) error {
 
 	// Need to get a config object for the target endpoint
 	endpointGUID := ec.Param("endpoint")
 	release := ec.Param("name")
+	namespace := ec.Param("namespace")
 	userID := ec.Get("user_id").(string)
 
-	client, _, tiller, err := c.GetHelmClient(endpointGUID, userID)
+	log.Infof("GET RELEASE: %s %s %s", endpointGUID, namespace, release)
+
+	config, hc, err := c.GetHelmConfiguration(endpointGUID, userID, namespace)
 	if err != nil {
-		log.Errorf("Helm: GetRelease could not get a Helm Client: %s", err)
+		log.Errorf("Helm: GetRelease could not get a Helm Configuration: %s", err)
 		return err
 	}
 
-	defer tiller.Close()
+	defer hc.Cleanup()
 
-	res, err := client.ReleaseStatus(release, helm.StatusReleaseVersion(0))
+	status := action.NewStatus(config)
+	res, err := status.Run(release)
 	if err != nil {
 		log.Error(err)
 		return err
 	}
 
-	return ec.JSON(200, res)
-}
+	// Upgrade to a web socket
+	ws, pingTicker, err := interfaces.UpgradeToWebSocket(ec)
+	if err != nil {
+		return err
+	}
+	defer ws.Close()
+	defer pingTicker.Stop()
 
-// ListReleases will list the helm releases for all endpoints
-func (c *KubernetesSpecification) aListReleases(ec echo.Context) error {
+	// ws is the websocket ready for use
 
-	// Need to get a config object for the target endpoint
-	// endpointGUID := ec.Param("endpoint")
-	userID := ec.Get("user_id").(string)
+	// Write the release info first - we will then go fetch the status of evertyhing in the release and send
+	// this back incrementally
 
-	// Get the config maps directly - don't go via Tiller
+	// Parse the manifest
+	log.Info("Got release")
+	rel := helm.NewHelmRelease(res, endpointGUID, userID)
+	log.Info("Done")
 
-	requests := c.makeKubeProxyRequest(userID, "GET", "/api/v1/configmaps?labelSelector=OWNER%3DTILLER")
-	responses, _ := c.portalProxy.DoProxyRequest(requests)
-	return c.portalProxy.SendProxiedResponse(ec, responses)
-}
+	graph := helm.NewHelmReleaseGraph(rel)
 
-func (c *KubernetesSpecification) makeKubeProxyRequest(userID, method, uri string) []interfaces.ProxyRequestInfo {
+	id := fmt.Sprintf("%s-%s", endpointGUID, rel.Namespace)
 
-	var p = c.portalProxy
-	eps, err := p.ListEndpointsByUser(userID)
-	if err != nil {
-		return nil
+	// Send over the namespace details of the release
+	sendResource(ws, "ReleasePrefix", id)
+
+	//graph.ParseManifest(rel)
+
+	// Send the manifest for the release
+	sendResource(ws, "Resources", rel.GetResources())
+
+	// // Send the manifest for the release
+	// sendResource(ws, "Test", rel.HelmManifest)
+
+	// Send the graph as we have it now
+	sendResource(ws, "Graph", graph)
+
+	// Loop over this until the web socket is closed
+
+	// Get the pods first and send those
+	rel.UpdatePods(c.portalProxy)
+	sendResource(ws, "Pods", rel.GetPods())
+
+	//graph.Generate(pods)
+	//graph.ParseManifest(rel)
+	sendResource(ws, "Graph", graph)
+
+	// Send the manifest for the release again (ReplicaSets will now be added)
+	sendResource(ws, "Manifest", rel.GetResources())
+
+	// Now get all of the resources in the manifest
+	rel.UpdateResources(c.portalProxy)
+	sendResource(ws, "Resources", rel.GetResources())
+
+	graph.ParseManifest(rel)
+	sendResource(ws, "Graph", graph)
+
+	stopchan := make(chan bool)
+
+	go readLoop(ws, stopchan)
+
+	var sleep = 1 * time.Second
+
+	// Now we have everything, so loop, polling to get status
+	for {
+		log.Warn("Polling for release - wait 10 seconds")
+
+		select {
+		case <-stopchan:
+			log.Error("***  RELEASE POLLER HAS FINISHED")
+			log.Error("****************************************************************************************************")
+			ws.Close()
+			return nil
+		case <-time.After(sleep):
+			break
+		}
+
+		log.Warn("Polling for release ....")
+
+		// Pods
+		rel.UpdatePods(c.portalProxy)
+		sendResource(ws, "Pods", rel.GetPods())
+
+		graph.ParseManifest(rel)
+		sendResource(ws, "Graph", graph)
+
+		// Now get all of the resources in the manifest
+		rel.UpdateResources(c.portalProxy)
+		sendResource(ws, "Resources", rel.GetResources())
+
+		graph.ParseManifest(rel)
+		sendResource(ws, "Graph", graph)
+
+		sleep = 10 * time.Second
 	}
 
-	// Construct the metadata for proxying
-	requests := make([]interfaces.ProxyRequestInfo, 0)
-	for _, endpoint := range eps {
-		if endpoint.CNSIType == "k8s" {
-			req := interfaces.ProxyRequestInfo{}
-			req.UserGUID = userID
-			req.ResultGUID = endpoint.GUID
-			req.EndpointGUID = endpoint.GUID
-			req.Method = method
-
-			uri, _ := url.Parse(uri)
-			req.URI = uri
-			requests = append(requests, req)
+	log.Error("****************************************************************************************************")
+	log.Error("RELEASE POLLER HAS FINISHED")
+	log.Error("****************************************************************************************************")
+
+	ws.Close()
+
+	return nil
+}
+
+func readLoop(c *websocket.Conn, stopchan chan<- bool) {
+	for {
+		if _, _, err := c.NextReader(); err != nil {
+			log.Error("WEB SOCKET HAS BEEN CLOSED")
+			c.Close()
+			close(stopchan)
+			break
+		}
+	}
+}
+
+func sendResource(ws *websocket.Conn, kind string, data interface{}) error {
+
+	var err error
+	var txt []byte
+	if txt, err = json.Marshal(data); err == nil {
+		resp := ResourceResponse{
+			Kind: kind,
+			Data: json.RawMessage(txt),
+		}
+
+		if txt, err = json.Marshal(resp); err == nil {
+			if ws.WriteMessage(websocket.TextMessage, txt); err == nil {
+				return nil
+			}
+
+			log.Info(err)
 		}
 	}
 
-	return requests
+	return err
 }
diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index 8e98096659..fc668ed6dd 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -118,9 +118,8 @@ func (c *KubernetesSpecification) AddSessionGroupRoutes(echoGroup *echo.Group) {
 	// Helm Routes
 	echoGroup.GET("/helm/releases", c.ListReleases)
 	echoGroup.POST("/helm/install", c.InstallRelease)
-	echoGroup.GET("/helm/versions", c.GetHelmVersions)
-	echoGroup.DELETE("/helm/releases/:endpoint/:name", c.DeleteRelease)
-	echoGroup.GET("/helm/releases/:endpoint/:name", c.GetRelease)
+	echoGroup.DELETE("/helm/releases/:endpoint/:namespace/:name", c.DeleteRelease)
+	echoGroup.GET("/helm/releases/:endpoint/:namespace/:name", c.GetRelease)
 }
 
 func (c *KubernetesSpecification) Info(apiEndpoint string, skipSSLValidation bool) (interfaces.CNSIRecord, interface{}, error) {
diff --git a/src/jetstream/plugins/metrics/cloud_foundry.go b/src/jetstream/plugins/metrics/cloud_foundry.go
index f7fa8c8e84..7fd1e6e1e2 100644
--- a/src/jetstream/plugins/metrics/cloud_foundry.go
+++ b/src/jetstream/plugins/metrics/cloud_foundry.go
@@ -15,6 +15,7 @@ import (
 var (
 	cellQueryWhiteList = []string{
 		"firehose_value_metric_rep_unhealthy_cell",
+		"firehose_value_metric_rep_garden_health_check_failed",
 		"firehose_value_metric_rep_capacity_remaining_containers",
 		"firehose_value_metric_rep_capacity_remaining_disk",
 		"firehose_value_metric_rep_capacity_remaining_memory",
@@ -205,6 +206,5 @@ func (m *MetricsSpecification) getCloudFoundryCellMetrics(c echo.Context) error
 	}
 
 	cnsiList := strings.Split(c.Request().Header.Get("x-cap-cnsi-list"), ",")
-
 	return m.makePrometheusRequest(c, cnsiList, "")
 }
diff --git a/src/jetstream/repository/console_config/env_lookup.go b/src/jetstream/repository/console_config/env_lookup.go
index 8c87844b34..d5d3997200 100644
--- a/src/jetstream/repository/console_config/env_lookup.go
+++ b/src/jetstream/repository/console_config/env_lookup.go
@@ -104,8 +104,14 @@ func MigrateSetupData(portal interfaces.PortalProxy, configStore Repository) err
 		return err
 	}
 
-	if err := migrateConfigSetting(portal.Env(), configStore, "SSO_LOGIN", strconv.FormatBool(config.UseSSO), "false"); err != nil {
-		return err
+	// Don't store previous SSO_LOGIN value if it's false.
+	// SSO_LOGIN was incorrectly being set in previous console config table, this was then transferred over here where the console expects
+	// previous values to have been explicitly set by user (and as such should take precedents over env vars)
+	// See https://github.com/cloudfoundry/stratos/issues/4013
+	if config.UseSSO == true {
+		if err := migrateConfigSetting(portal.Env(), configStore, "SSO_LOGIN", strconv.FormatBool(config.UseSSO), "false"); err != nil {
+			return err
+		}
 	}
 
 	// Delete the content form the legacy table
diff --git a/src/jetstream/repository/interfaces/jetstream_error.go b/src/jetstream/repository/interfaces/jetstream_error.go
new file mode 100644
index 0000000000..ef8cd6cd1d
--- /dev/null
+++ b/src/jetstream/repository/interfaces/jetstream_error.go
@@ -0,0 +1,32 @@
+package interfaces
+
+import (
+	"fmt"
+
+	"github.com/labstack/echo"
+)
+
+// JetstreamError is standard error response from JetSteam for REST APIs
+type JetstreamError struct {
+	Status          int
+	LogMessage      string
+	UserFacingError string
+}
+
+func (e JetstreamError) Error() string {
+	return fmt.Sprintf("HTTP Error: Status %d -> Log Message: %s", e.Status, e.LogMessage)
+}
+
+// HTTPError formats the error as an echo HTTPError
+func (e JetstreamError) HTTPError() *echo.HTTPError {
+	return echo.NewHTTPError(e.Status, fmt.Sprintf(`{"error":%q}`, e.UserFacingError))
+}
+
+// NewJetstreamError creates a new JetStream error
+func NewJetstreamError(status int, userFacingError string) error {
+	shadowError := JetstreamError{
+		Status:          status,
+		UserFacingError: userFacingError,
+	}
+	return shadowError
+}
diff --git a/src/jetstream/session.go b/src/jetstream/session.go
index 0564099004..79c331614a 100644
--- a/src/jetstream/session.go
+++ b/src/jetstream/session.go
@@ -16,7 +16,6 @@ import (
 
 const (
 
-
 	// XSRFTokenHeader - XSRF Token Header name
 	XSRFTokenHeader = "X-Xsrf-Token"
 	// XSRFTokenSessionName - XSRF Token Session name
@@ -32,13 +31,8 @@ const (
 	jetstreamSessionName              = "console-session"
 	jetStreamSessionContextKey        = "jetstream-session"
 	jetStreamSessionContextUpdatedKey = "jetstream-session-updated"
-
 )
 
-
-
-
-
 // SessionValueNotFound - Error returned when a requested key was not found in the session
 type SessionValueNotFound struct {
 	msg string
@@ -254,6 +248,11 @@ func (p *portalProxy) verifySession(c echo.Context) error {
 
 	} else {
 
+		// Still need to extend the expires_on of the Session (set session will save session, in save we update `expires_on`)
+		if err = p.setSessionValues(c, nil); err != nil {
+			return err
+		}
+
 		err = p.handleSessionExpiryHeader(c)
 		if err != nil {
 			return err
@@ -272,6 +271,6 @@ func (p *portalProxy) verifySession(c echo.Context) error {
 			return err
 		}
 	}
-	
+
 	return err
 }

From c4811577fd3bf16e402ed27cec28e5a1afd07b48 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 8 Jan 2020 08:32:02 +0000
Subject: [PATCH 217/648] Fix go mod

---
 src/jetstream/go.mod |  3 +--
 src/jetstream/go.sum | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/jetstream/go.mod b/src/jetstream/go.mod
index aa663b2009..c99d5a4403 100644
--- a/src/jetstream/go.mod
+++ b/src/jetstream/go.mod
@@ -32,7 +32,6 @@ require (
 	github.com/elazarl/goproxy/ext v0.0.0-20191011121108-aa519ddbe484 // indirect
 	github.com/fatih/color v1.7.0 // indirect
 	github.com/go-sql-driver/mysql v1.4.1
-	github.com/golang/snappy v0.0.1 // indirect
 	github.com/google/go-querystring v1.0.0 // indirect
 	github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e // indirect
 	github.com/gorilla/context v1.1.1
@@ -68,7 +67,7 @@ require (
 	github.com/valyala/fasttemplate v1.1.0 // indirect
 	github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec // indirect
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
-	golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152
+	golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9
 	gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0
 	gopkg.in/cheggaaa/pb.v1 v1.0.27 // indirect
 	gopkg.in/yaml.v2 v2.2.7
diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index 29ebc835f3..2ed48f4f3b 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -38,6 +38,8 @@ github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RP
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc=
 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
+github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/semver/v3 v3.0.1 h1:2kKm5lb7dKVrt5TYUiAavE6oFc1cFT0057UVGT+JqLk=
 github.com/Masterminds/semver/v3 v3.0.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/Masterminds/sprig v2.18.0+incompatible h1:QoGhlbC6pter1jxKnjMFxT8EqsLuDE6FEcNbWEpw+lI=
@@ -148,6 +150,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumC
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/disintegration/imaging v1.6.0 h1:nVPXRUUQ36Z7MNf0O77UzgnOb1mkMMor7lmJMJXc/mA=
 github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ=
+github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
+github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
 github.com/docker/cli v0.0.0-20190506213505-d88565df0c2d h1:qdD+BtyCE1XXpDyhvn0yZVcZOLILdj9Cw4pKu0kQbPQ=
 github.com/docker/cli v0.0.0-20190506213505-d88565df0c2d/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
@@ -256,6 +260,7 @@ github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+
 github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
 github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
@@ -318,6 +323,8 @@ github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZs
 github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U=
 github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
+github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/sessions v1.1.3 h1:uXoZdcdA5XdXF3QzuSlheVRUvjl+1rKY7zBXL68L9RU=
@@ -360,6 +367,7 @@ github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGAR
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3 h1:sHsPfNMAG70QAvKbddQ0uScZCHQoZsT5NykGRCeeeIs=
 github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
+github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
@@ -390,6 +398,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 h1:wdTBUArlqtBYGN2Dd4+zsaFxFH0m4iGCHToW10jPX0k=
 github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
+github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a h1:VqeX/fehAB6FtBox0TVYcjOMXGE56INQIfbXegditX4=
+github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
 github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc h1:Ttr4Z3ZrMv4rAXn10UAqOC8ACx+F1omvcyV1a3hRArE=
 github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc/go.mod h1:ItxiN33Ho7Di8wiC4S4XqbH1NLF0DNdDWOd/5MI9gJU=
 github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28 h1:mkl3tvPHIuPaWsLtmHTybJeoVEW7cbePK73Ir8VtruA=
@@ -563,6 +573,8 @@ github.com/ulikunitz/xz v0.5.6 h1:jGHAfXawEGZQ3blwU5wnWKQJvAraT7Ftq9EXjnXYgt8=
 github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
 github.com/unrolled/render v1.0.0 h1:XYtvhA3UkpB7PqkvhUFYmpKD55OudoIeygcfus4vcd4=
 github.com/unrolled/render v1.0.0/go.mod h1:tu82oB5W2ykJRVioYsB+IQKcft7ryBr7w12qMBUPyXg=
+github.com/unrolled/render v1.0.1 h1:VDDnQQVfBMsOsp3VaCJszSO0nkBIVEYoPWeRThk9spY=
+github.com/unrolled/render v1.0.1/go.mod h1:gN9T0NhL4Bfbwu8ann7Ry/TGHYfosul+J0obPf6NBdM=
 github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
@@ -572,6 +584,10 @@ github.com/valyala/fasttemplate v1.1.0 h1:RZqt0yGBsps8NGvLSGW804QQqCUYYLsaOjTVHy
 github.com/valyala/fasttemplate v1.1.0/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec h1:Klu98tQ9Z1t23gvC7p7sCmvxkZxLhBHLNyrUPsWsYFg=
 github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec/go.mod h1:wPlfmglZmRWMYv/qJy3P+fK/UnoQB5ISk4txfNd9tDo=
+github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk=
+github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
+github.com/xdg/stringprep v1.0.0 h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0=
+github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
@@ -592,6 +608,8 @@ github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f h1
 github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
 github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
 github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
+go.mongodb.org/mongo-driver v1.1.3 h1:++7u8r9adKhGR+I79NfEtYrk2ktjenErXM99PSufIoI=
+go.mongodb.org/mongo-driver v1.1.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
@@ -605,6 +623,8 @@ golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152 h1:ZC1Xn5A1nlpSmQCIva4bZ3ob3lmhYIefc+GU+DLg1Ow=
 golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9 h1:abxekknhS/Drh3uoQDk5Hc7BgeiyI39Crb7vhf/1j5s=
+golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -612,6 +632,8 @@ golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 h1:00VmoueYNlNz/aHIilyyQz/
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067 h1:KYGJGHOQy8oSi1fDlSpcZF0+juKwk/hEMv5SiwHogR0=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U=
+golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -647,6 +669,8 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -753,6 +777,8 @@ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8
 k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/helm v2.12.3+incompatible h1:wo1cdYjOnr5Z+LFuhtwIJaeQnec6D4gcg2H5UAKzY6w=
 k8s.io/helm v2.12.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
+k8s.io/helm v2.16.1+incompatible h1:L+k810plJlaGWEw1EszeT4deK8XVaKxac1oGcuB+WDc=
+k8s.io/helm v2.16.1+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
 k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=

From ff2e81c5ca3e3ea793961fc4bc88510cb2a15e8d Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Wed, 8 Jan 2020 12:11:44 +0000
Subject: [PATCH 218/648] Add function to list repository names in chartsvc

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 .../chartsvc/foundationdb/handler.go          | 19 +++++++
 .../monocular/chartsvc/models/chart.go        |  8 +++
 ...{repodatastore.go => repodatastore.go_bak} |  0
 .../plugins/monocular/sql_datastore.go        | 50 -------------------
 4 files changed, 27 insertions(+), 50 deletions(-)
 rename src/jetstream/plugins/monocular/{repodatastore.go => repodatastore.go_bak} (100%)
 delete mode 100644 src/jetstream/plugins/monocular/sql_datastore.go

diff --git a/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go b/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go
index 5aecd66c96..a8304b3106 100644
--- a/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go
+++ b/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go
@@ -49,6 +49,7 @@ func (h WithParams) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 
 const chartCollection = "charts"
 const filesCollection = "files"
+const repoCollection = "repos"
 
 // count is used to parse the result of a $count operation in the database
 type count struct {
@@ -183,6 +184,24 @@ func getPaginatedChartList(repo string, pageNumber, pageSize int, showDuplicates
 	return newChartListResponse(paginatedCharts), utils.Meta{TotalPages: totalPages}, nil
 }
 
+//ListRepos returns a list of names of all stored repositories
+func ListRepos() ([]string, error) {
+	var repoNames []string
+	//Find all repo names
+	collection := db.Collection(repoCollection)
+	filter := bson.M{}
+	var lastChecks []*models.RepoCheck
+	err := collection.Find(context.Background(), filter, &lastChecks, options.Find())
+	if err != nil {
+		log.WithError(err).Error("could not fetch repositories")
+		return repoNames, err
+	}
+	for i := range lastChecks {
+		repoNames = append(repoNames, lastChecks[i].ID)
+	}
+	return repoNames, nil
+}
+
 // ListCharts returns a list of charts
 func ListCharts(w http.ResponseWriter, req *http.Request) {
 	log.Debug("Request for charts..")
diff --git a/src/jetstream/plugins/monocular/chartsvc/models/chart.go b/src/jetstream/plugins/monocular/chartsvc/models/chart.go
index b0511f76e2..7501f85c36 100644
--- a/src/jetstream/plugins/monocular/chartsvc/models/chart.go
+++ b/src/jetstream/plugins/monocular/chartsvc/models/chart.go
@@ -63,3 +63,11 @@ type ChartFiles struct {
 	Values string
 	Schema string
 }
+
+//RepoCheck describes the state of a repository in terms its current checksum and last update time.
+//It is used to determine whether or not to re-sync a respository.
+type RepoCheck struct {
+	ID         string    `bson:"_id"`
+	LastUpdate time.Time `bson:"last_update"`
+	Checksum   string    `bson:"checksum"`
+}
diff --git a/src/jetstream/plugins/monocular/repodatastore.go b/src/jetstream/plugins/monocular/repodatastore.go_bak
similarity index 100%
rename from src/jetstream/plugins/monocular/repodatastore.go
rename to src/jetstream/plugins/monocular/repodatastore.go_bak
diff --git a/src/jetstream/plugins/monocular/sql_datastore.go b/src/jetstream/plugins/monocular/sql_datastore.go
deleted file mode 100644
index 4d0d90e998..0000000000
--- a/src/jetstream/plugins/monocular/sql_datastore.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package monocular
-
-import (
-	"database/sql"
-	"fmt"
-
-	"github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore"
-)
-
-var getRepositories = `SELECT DISTINCT repo_name from charts`
-
-type SQLDBCMonocularDatastore struct {
-	//dbSession datastore.Session
-	db *sql.DB
-}
-
-// NewSQLDBCMonocularDatastore creates a new SQL data store
-func NewSQLDBCMonocularDatastore(db *sql.DB) (*SQLDBCMonocularDatastore, error) {
-	return &SQLDBCMonocularDatastore{db: db}, nil
-}
-
-// InitRepositoryProvider - One time init for the given DB Provider
-func InitRepositoryProvider(databaseProvider string) {
-	// Modify the database statements if needed, for the given database type
-	getRepositories = datastore.ModifySQLStatement(getRepositories, databaseProvider)
-}
-
-// ListRepositories gets all repository names
-func (s *SQLDBCMonocularDatastore) ListRepositories() ([]string, error) {
-	rows, err := s.db.Query(getRepositories)
-	if err != nil {
-		return nil, fmt.Errorf("Unable to retrieve Helm repositories: %v", err)
-	}
-	defer rows.Close()
-
-	var repos []string
-	repos = make([]string, 0)
-
-	for rows.Next() {
-		var name string
-		err := rows.Scan(&name)
-		if err != nil {
-			return nil, fmt.Errorf("Unable to scan repository records: %v", err)
-		}
-
-		repos = append(repos, name)
-	}
-
-	return repos, nil
-}

From a21517e565954b2a39c029f7bf92a42c51a8699d Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Wed, 8 Jan 2020 17:49:05 +0000
Subject: [PATCH 219/648] Fix full backend build

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 .../chart-repo/foundationdb/utils.go          |   2 +
 .../chart-repo/foundationdb/utils_test.go     |   6 +
 .../plugins/monocular/chartsvc/datastore.go   |  41 +++
 .../chartsvc/foundationdb/handler.go          |   4 +-
 .../plugins/monocular/chartsvc/go.mod         |   4 +-
 .../plugins/monocular/chartsvc/go.sum         |  18 ++
 .../plugins/monocular/chartsvc/main.go        |   4 +-
 .../plugins/monocular/chartsvc/main_test.go   |  22 +-
 .../plugins/monocular/chartsvc/mongodb.go_bak |  94 ------
 src/jetstream/plugins/monocular/go.mod        |   4 +-
 src/jetstream/plugins/monocular/go.sum        | 202 +++++++++++++
 .../plugins/monocular/go.sum412124244.tmp     | 279 ++++++++++++++++++
 src/jetstream/plugins/monocular/main.go       |  52 +---
 13 files changed, 571 insertions(+), 161 deletions(-)
 create mode 100644 src/jetstream/plugins/monocular/chartsvc/datastore.go
 delete mode 100644 src/jetstream/plugins/monocular/chartsvc/mongodb.go_bak
 create mode 100644 src/jetstream/plugins/monocular/go.sum412124244.tmp

diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
index a333518fae..e4e38a582e 100644
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
@@ -88,6 +88,7 @@ func SyncRepo(dbClient Client, dbName, repoName, repoURL string, authorizationHe
 		return err
 	}
 	id := res.InsertedID
+	collection.DeleteMany(ctx, bson.M{"_id": id}, options.Delete())
 	cancel()
 	log.Debugf("Database connection test successful.")
 	log.Debugf("Inserted a test document to test collection with ID: %v", id)
@@ -204,6 +205,7 @@ func DeleteRepo(dbClient Client, dbName, repoName string) error {
 		return err
 	}
 	id := res.InsertedID
+	collection.DeleteMany(ctx, bson.M{"_id": id}, options.Delete())
 	cancel()
 	log.Debugf("Database connection test successful.")
 	log.Debugf("Inserted a test document to test collection with ID: %v", id)
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils_test.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils_test.go
index c80671beaf..e435012458 100644
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils_test.go
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils_test.go
@@ -317,6 +317,10 @@ func Test_importCharts(t *testing.T) {
 
 func Test_DeleteRepo(t *testing.T) {
 	m := &mock.Mock{}
+	//Expect a few calls to test the DB readiness
+	m.On("InsertOne", mock.Anything, mock.Anything, mock.Anything).Return(&mongo.InsertOneResult{}, nil)
+	m.On("DeleteMany", mock.Anything, mock.Anything, mock.Anything).Return(&mongo.DeleteResult{}, nil)
+
 	m.On("DeleteMany", mock.Anything, bson.M{
 		"repo.name": "test",
 	}, mock.Anything).Return(&mongo.DeleteResult{}, nil)
@@ -632,6 +636,8 @@ func Test_emptyChartRepo(t *testing.T) {
 	dbClient := NewMockClient(&m)
 	//Expect a call to test the DB readiness
 	m.On("InsertOne", mock.Anything, mock.Anything, mock.Anything).Return(&mongo.InsertOneResult{}, nil)
+	m.On("DeleteMany", mock.Anything, mock.Anything, mock.Anything).Return(&mongo.DeleteResult{}, nil)
+
 	m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
 	err := SyncRepo(dbClient, "test", "testRepo", "https://my.examplerepo.com", "")
 	assert.ExistsErr(t, err, "Failed Request")
diff --git a/src/jetstream/plugins/monocular/chartsvc/datastore.go b/src/jetstream/plugins/monocular/chartsvc/datastore.go
new file mode 100644
index 0000000000..0e789c277c
--- /dev/null
+++ b/src/jetstream/plugins/monocular/chartsvc/datastore.go
@@ -0,0 +1,41 @@
+package chartsvc
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/helm/monocular/chartsvc/foundationdb"
+	"github.com/helm/monocular/chartsvc/foundationdb/datastore"
+	"github.com/helm/monocular/chartsvc/models"
+	log "github.com/sirupsen/logrus"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
+)
+
+const chartCollection = "charts"
+
+type ChartSvcDatastore struct {
+	dbClient datastore.Client
+	db       datastore.Database
+	dbCloser func()
+}
+
+func (m *ChartSvcDatastore) ListRepositories() ([]string, error) {
+	return foundationdb.ListRepositories()
+}
+
+// GetChart returns the chart with the given ID
+func (m *ChartSvcDatastore) GetChart(chartID string) (models.Chart, error) {
+	var chart models.Chart
+
+	chartCollection := m.db.Collection(chartCollection)
+	filter := bson.M{"_id": chartID}
+	findResult := chartCollection.FindOne(context.Background(), filter, &chart, options.FindOne())
+	if findResult == mongo.ErrNoDocuments {
+		log.WithError(findResult).Errorf("could not find chart with id %s", chartID)
+		return chart, fmt.Errorf("could not find chart with id %s", chartID)
+	}
+
+	return chart, nil
+}
diff --git a/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go b/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go
index a8304b3106..2032a0db9d 100644
--- a/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go
+++ b/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go
@@ -184,8 +184,8 @@ func getPaginatedChartList(repo string, pageNumber, pageSize int, showDuplicates
 	return newChartListResponse(paginatedCharts), utils.Meta{TotalPages: totalPages}, nil
 }
 
-//ListRepos returns a list of names of all stored repositories
-func ListRepos() ([]string, error) {
+//ListRepositories returns a list of names of all stored repositories
+func ListRepositories() ([]string, error) {
 	var repoNames []string
 	//Find all repo names
 	collection := db.Collection(repoCollection)
diff --git a/src/jetstream/plugins/monocular/chartsvc/go.mod b/src/jetstream/plugins/monocular/chartsvc/go.mod
index 902f6e429f..5e476feff1 100644
--- a/src/jetstream/plugins/monocular/chartsvc/go.mod
+++ b/src/jetstream/plugins/monocular/chartsvc/go.mod
@@ -4,12 +4,14 @@ go 1.12
 
 require (
 	github.com/disintegration/imaging v1.6.2
-	github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 // indirect
+	github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8
 	github.com/go-stack/stack v1.8.0 // indirect
 	github.com/golang/snappy v0.0.1 // indirect
 	github.com/gorilla/mux v1.7.3
 	github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40
 	github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a
+	github.com/labstack/echo v3.3.10+incompatible // indirect
+	github.com/labstack/gommon v0.3.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.1 // indirect
 	github.com/prometheus/client_golang v1.2.1 // indirect
diff --git a/src/jetstream/plugins/monocular/chartsvc/go.sum b/src/jetstream/plugins/monocular/chartsvc/go.sum
index ec9a3dfac2..dbf10aba67 100644
--- a/src/jetstream/plugins/monocular/chartsvc/go.sum
+++ b/src/jetstream/plugins/monocular/chartsvc/go.sum
@@ -43,6 +43,15 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a h1:VqeX/fehAB6FtBox0TVYcjOMXGE56INQIfbXegditX4=
 github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
+github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8bbnE7CX5OEgg=
+github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s=
+github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0=
+github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
+github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
+github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg=
+github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -83,12 +92,17 @@ github.com/unrolled/render v1.0.1 h1:VDDnQQVfBMsOsp3VaCJszSO0nkBIVEYoPWeRThk9spY
 github.com/unrolled/render v1.0.1/go.mod h1:gN9T0NhL4Bfbwu8ann7Ry/TGHYfosul+J0obPf6NBdM=
 github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
+github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
+github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasttemplate v1.0.1 h1:tY9CJiPnMXf1ERmG2EyK7gNUd+c6RKGD0IfU8WdUSz8=
+github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
 github.com/xdg/stringprep v1.0.0 h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0=
 github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 go.mongodb.org/mongo-driver v1.1.3 h1:++7u8r9adKhGR+I79NfEtYrk2ktjenErXM99PSufIoI=
 go.mongodb.org/mongo-driver v1.1.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
+go.mongodb.org/mongo-driver v1.2.1 h1:ANAlYXXM5XmOdW/Nc38jOr+wS5nlk7YihT24U1imiWM=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9 h1:abxekknhS/Drh3uoQDk5Hc7BgeiyI39Crb7vhf/1j5s=
@@ -97,6 +111,7 @@ golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 h1:dfGZHvZk057jK2MCeWus/TowKpJ8y4AmooUzdBSR9GU=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -105,14 +120,17 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191010194322-b09406accb47 h1:/XfQ9z7ib8eEJX2hdgFTZJ/ntt0swNk5oYBziWeTCvY=
 golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
diff --git a/src/jetstream/plugins/monocular/chartsvc/main.go b/src/jetstream/plugins/monocular/chartsvc/main.go
index 57ea6ae792..bb022f2b99 100644
--- a/src/jetstream/plugins/monocular/chartsvc/main.go
+++ b/src/jetstream/plugins/monocular/chartsvc/main.go
@@ -39,7 +39,7 @@ const pathPrefix = "/v1"
 var client *mongo.Client
 var dbSession mongoDatastore.Session
 
-func setupRoutes() http.Handler {
+func SetupRoutes() http.Handler {
 	r := mux.NewRouter()
 
 	// Healthcheck
@@ -89,7 +89,7 @@ func main() {
 
 	InitFDBDocLayerConnection(fdbURL, fDB, debug)
 
-	n := setupRoutes()
+	n := SetupRoutes()
 
 	port := os.Getenv("PORT")
 	if port == "" {
diff --git a/src/jetstream/plugins/monocular/chartsvc/main_test.go b/src/jetstream/plugins/monocular/chartsvc/main_test.go
index 9ff6b0bcea..8dbc7b3e11 100644
--- a/src/jetstream/plugins/monocular/chartsvc/main_test.go
+++ b/src/jetstream/plugins/monocular/chartsvc/main_test.go
@@ -43,7 +43,7 @@ func Test_GetLive(t *testing.T) {
 	dbClient := datastore.NewMockClient(&m)
 	fdb.InitDBConfig(dbClient, "test")
 
-	ts := httptest.NewServer(setupRoutes())
+	ts := httptest.NewServer(SetupRoutes())
 	defer ts.Close()
 
 	res, err := http.Get(ts.URL + "/live")
@@ -58,7 +58,7 @@ func Test_GetReady(t *testing.T) {
 	dbClient := datastore.NewMockClient(&m)
 	fdb.InitDBConfig(dbClient, "test")
 
-	ts := httptest.NewServer(setupRoutes())
+	ts := httptest.NewServer(SetupRoutes())
 	defer ts.Close()
 
 	res, err := http.Get(ts.URL + "/ready")
@@ -69,7 +69,7 @@ func Test_GetReady(t *testing.T) {
 
 // tests the GET /{apiVersion}/charts endpoint
 func Test_GetCharts(t *testing.T) {
-	ts := httptest.NewServer(setupRoutes())
+	ts := httptest.NewServer(SetupRoutes())
 	defer ts.Close()
 
 	tests := []struct {
@@ -112,7 +112,7 @@ func Test_GetCharts(t *testing.T) {
 
 // tests the GET /{apiVersion}/charts/{repo} endpoint
 func Test_GetChartsInRepo(t *testing.T) {
-	ts := httptest.NewServer(setupRoutes())
+	ts := httptest.NewServer(SetupRoutes())
 	defer ts.Close()
 
 	tests := []struct {
@@ -155,7 +155,7 @@ func Test_GetChartsInRepo(t *testing.T) {
 
 // tests the GET /{apiVersion}/charts/{repo}/{chartName} endpoint
 func Test_GetChartInRepo(t *testing.T) {
-	ts := httptest.NewServer(setupRoutes())
+	ts := httptest.NewServer(SetupRoutes())
 	defer ts.Close()
 
 	tests := []struct {
@@ -209,7 +209,7 @@ func Test_GetChartInRepo(t *testing.T) {
 
 // tests the GET /{apiVersion}/charts/{repo}/{chartName}/versions endpoint
 func Test_ListChartVersions(t *testing.T) {
-	ts := httptest.NewServer(setupRoutes())
+	ts := httptest.NewServer(SetupRoutes())
 	defer ts.Close()
 
 	tests := []struct {
@@ -263,7 +263,7 @@ func Test_ListChartVersions(t *testing.T) {
 
 // tests the GET /{apiVersion}/charts/{repo}/{chartName}/versions/{:version} endpoint
 func Test_GetChartVersion(t *testing.T) {
-	ts := httptest.NewServer(setupRoutes())
+	ts := httptest.NewServer(SetupRoutes())
 	defer ts.Close()
 
 	tests := []struct {
@@ -317,7 +317,7 @@ func Test_GetChartVersion(t *testing.T) {
 
 // tests the GET /{apiVersion}/assets/{repo}/{chartName}/logo-160x160-fit.png endpoint
 func Test_GetChartIcon(t *testing.T) {
-	ts := httptest.NewServer(setupRoutes())
+	ts := httptest.NewServer(SetupRoutes())
 	defer ts.Close()
 
 	tests := []struct {
@@ -371,7 +371,7 @@ func Test_GetChartIcon(t *testing.T) {
 
 // tests the GET /{apiVersion}/assets/{repo}/{chartName}/versions/{version}/README.md endpoint
 func Test_GetChartReadme(t *testing.T) {
-	ts := httptest.NewServer(setupRoutes())
+	ts := httptest.NewServer(SetupRoutes())
 	defer ts.Close()
 
 	tests := []struct {
@@ -429,7 +429,7 @@ func Test_GetChartReadme(t *testing.T) {
 
 // tests the GET /{apiVersion}/assets/{repo}/{chartName}/versions/{version}/values.yaml endpoint
 func Test_GetChartValues(t *testing.T) {
-	ts := httptest.NewServer(setupRoutes())
+	ts := httptest.NewServer(SetupRoutes())
 	defer ts.Close()
 
 	tests := []struct {
@@ -487,7 +487,7 @@ func Test_GetChartValues(t *testing.T) {
 
 // tests the GET /{apiVersion}/assets/{repo}/{chartName}/versions/{version}/values/schema.json endpoint
 func Test_GetChartSchema(t *testing.T) {
-	ts := httptest.NewServer(setupRoutes())
+	ts := httptest.NewServer(SetupRoutes())
 	defer ts.Close()
 
 	tests := []struct {
diff --git a/src/jetstream/plugins/monocular/chartsvc/mongodb.go_bak b/src/jetstream/plugins/monocular/chartsvc/mongodb.go_bak
deleted file mode 100644
index b9b2f70388..0000000000
--- a/src/jetstream/plugins/monocular/chartsvc/mongodb.go_bak
+++ /dev/null
@@ -1,94 +0,0 @@
-package chartsvc
-
-import (
-	//"bytes"
-	"errors"
-	"fmt"
-
-	"github.com/globalsign/mgo/bson"
-	"github.com/helm/monocular/chartsvc/models"
-	"github.com/kubeapps/common/datastore"
-)
-
-// const (
-// 	chartCollection       = "charts"
-// 	chartFilesCollection  = "files"
-// 	defaultTimeoutSeconds = 10
-// 	additionalCAFile      = "/usr/local/share/ca-certificates/ca.crt"
-// )
-
-type MongoDBChartSvcDatastore struct {
-	dbSession datastore.Session
-}
-
-// MongoDBChartSvcDatastore creates a new MongoDB data store
-func NewMongoDBChartSvcDatastore(dbSession datastore.Session) (*MongoDBChartSvcDatastore, error) {
-	return &MongoDBChartSvcDatastore{dbSession: dbSession}, nil
-}
-
-func (m *MongoDBChartSvcDatastore) ListRepositories() ([]string, error) {
-	return nil, nil
-}
-
-func (m *MongoDBChartSvcDatastore) ListCharts() ([]*models.Chart, error) {
-	db, closer := dbSession.DB()
-	defer closer()
-	var charts []*models.Chart
-	err := db.C(chartCollection).Find(nil).Sort("name").All(&charts)
-	return charts, err
-}
-
-func (m *MongoDBChartSvcDatastore) GetChart(chartID string) (models.Chart, error) {
-	db, closer := dbSession.DB()
-	defer closer()
-	var chart models.Chart
-	err := db.C(chartCollection).FindId(chartID).One(&chart)
-	return chart, err
-}
-
-func (m *MongoDBChartSvcDatastore) GetChartVersion(chartID, version string) (models.Chart, error) {
-	db, closer := dbSession.DB()
-	defer closer()
-	var chart models.Chart
-	err := db.C(chartCollection).Find(bson.M{
-		"_id":           chartID,
-		"chartversions": bson.M{"$elemMatch": bson.M{"version": version}},
-	}).Select(bson.M{
-		"name": 1, "repo": 1, "description": 1, "home": 1, "keywords": 1, "maintainers": 1, "sources": 1,
-		"chartversions.$": 1,
-	}).One(&chart)
-	return chart, err
-}
-
-func (m *MongoDBChartSvcDatastore) GetChartIcon(chartID string) ([]byte, error) {
-	db, closer := dbSession.DB()
-	defer closer()
-	var chart models.Chart
-	err := db.C(chartCollection).FindId(chartID).One(&chart)
-	if err != nil {
-		return nil, fmt.Errorf("No icon available for chart: %s", chartID)
-	}
-
-	if chart.RawIcon == nil {
-		return nil, fmt.Errorf("No icon available for chart: %s", chartID)
-	}
-
-	return chart.RawIcon, nil
-}
-
-func (m *MongoDBChartSvcDatastore) GetChartVersionReadme(chartID, version string) ([]byte, error) {
-	db, closer := dbSession.DB()
-	defer closer()
-	var files models.ChartFiles
-	fileID := fmt.Sprintf("/%s-%s", chartID, version)
-	if err := db.C(filesCollection).FindId(fileID).One(&files); err != nil {
-		return nil, err
-	}
-
-	readme := []byte(files.Readme)
-	return readme, nil
-}
-
-func (m *MongoDBChartSvcDatastore) GetChartVersionValuesYaml(chartID, version string) ([]byte, error) {
-	return nil, errors.New("Not implemented")
-}
diff --git a/src/jetstream/plugins/monocular/go.mod b/src/jetstream/plugins/monocular/go.mod
index df993a48ac..d099ac958b 100644
--- a/src/jetstream/plugins/monocular/go.mod
+++ b/src/jetstream/plugins/monocular/go.mod
@@ -8,13 +8,13 @@ require (
 	github.com/helm/monocular v1.4.0
 	github.com/helm/monocular/chartrepo v0.0.0-00010101000000-000000000000
 	github.com/helm/monocular/chartsvc v0.0.0-00010101000000-000000000000
-	github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4
+	github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a
 	github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28 // indirect
 	github.com/labstack/echo v3.3.10+incompatible
 	github.com/lib/pq v1.0.0 // indirect
 	github.com/mattn/go-sqlite3 v1.10.0 // indirect
 	github.com/satori/go.uuid v1.2.0
-	github.com/sirupsen/logrus v1.3.0
+	github.com/sirupsen/logrus v1.4.2
 	github.com/ziutek/mymysql v1.5.4 // indirect
 )
 
diff --git a/src/jetstream/plugins/monocular/go.sum b/src/jetstream/plugins/monocular/go.sum
index cfa2ec9c01..c437df6077 100644
--- a/src/jetstream/plugins/monocular/go.sum
+++ b/src/jetstream/plugins/monocular/go.sum
@@ -4,32 +4,90 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc=
 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
+github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
+github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/arschles/assert v1.0.0/go.mod h1:m/u69zW43x0h8dTHcv3JJZljINyEYgBuf5fYJP6WikI=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/cespare/xxhash/v2 v2.1.0 h1:yTUvW7Vhb89inJ+8irsUqiWjh8iT6sQPZiQzI6ReGkA=
+github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM=
 github.com/cloudfoundry-community/go-cfenv v1.17.0 h1:qfxEfn8qKkaHY3ZEk/Y2noY79HBASvNgmtHK9x4+6GY=
 github.com/cloudfoundry-community/go-cfenv v1.17.0/go.mod h1:2UgWvQTRXUuIZ/x3KnW6fk6CgPBhcV4UQb/UGIrUyyI=
 github.com/cloudfoundry-incubator/stratos v2.0.0-beta-001+incompatible h1:UUxNbLjhv2cfymub5yNN1tjjqYkteHBBagb4jcbXEIQ=
+github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
+github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
+github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/disintegration/imaging v1.6.0 h1:nVPXRUUQ36Z7MNf0O77UzgnOb1mkMMor7lmJMJXc/mA=
 github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ=
+github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
+github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
+github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
+github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
+github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
+github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
+github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
+github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
+github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
+github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
 github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
+github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U=
 github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
+github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/sessions v1.1.3 h1:uXoZdcdA5XdXF3QzuSlheVRUvjl+1rKY7zBXL68L9RU=
@@ -38,83 +96,227 @@ github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/govau/cf-common v0.0.7 h1:uhp1P6XM6GGzu1+A4C7LELLX/9mCmH6W5DpJZC0kWmo=
 github.com/govau/cf-common v0.0.7/go.mod h1:5xL/OfE7wxeyHlXb7iei0rAbdQ/5v6dF18BZknPv7NQ=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/helm/monocular v1.4.0 h1:g0sOpuMe+9u+aPfd9ZO8mWV+c8W0dfGyBG9Wl23nwec=
 github.com/helm/monocular v1.4.0/go.mod h1:PpkCN0v4zVVigsIHnsQdJytKFmaUkwfhxB7z33a9/gE=
 github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40 h1:GT4RsKmHh1uZyhmTkWJTDALRjSHYQp6FRKrotf0zhAs=
 github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40/go.mod h1:NtmN9h8vrTveVQRLHcX2HQ5wIPBDCsZ351TGbZWgg38=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3 h1:sHsPfNMAG70QAvKbddQ0uScZCHQoZsT5NykGRCeeeIs=
 github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
+github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a h1:zPPuIq2jAWWPTrGt70eK/BSch+gFAGrNzecsoENgu2o=
+github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
+github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 h1:wdTBUArlqtBYGN2Dd4+zsaFxFH0m4iGCHToW10jPX0k=
 github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
+github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a h1:VqeX/fehAB6FtBox0TVYcjOMXGE56INQIfbXegditX4=
+github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
 github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28 h1:mkl3tvPHIuPaWsLtmHTybJeoVEW7cbePK73Ir8VtruA=
 github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28/go.mod h1:T/T7jsxVqf9k/zYOqbgNAsANsjxTd1Yq3htjDhQ1H0c=
 github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8bbnE7CX5OEgg=
 github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s=
 github.com/labstack/gommon v0.2.8 h1:JvRqmeZcfrHC5u6uVleB4NxxNbzx6gpbJiQknDbKQu0=
 github.com/labstack/gommon v0.2.8/go.mod h1:/tj9csK2iPSBvn+3NLM9e52usepMtrd5ilFYA+wQNJ4=
+github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0=
+github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
 github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
+github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
+github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.6 h1:SrwhHcpV4nWrMGdNcC2kXpMfcBVYGDuTArqyhocJgvA=
 github.com/mattn/go-isatty v0.0.6/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg=
+github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
 github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
+github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
+github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=
 github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.2.1 h1:JnMpQc6ppsNgw9QPAGF6Dod479itz7lvlsMzzNayLOI=
+github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.7.0 h1:L+1lyG48J1zAQXA3RBX/nG/B3gjlHq0zTt2tlbJLyCY=
+github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8=
+github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
+github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
 github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
+github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
+github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
+github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/unrolled/render v1.0.0 h1:XYtvhA3UkpB7PqkvhUFYmpKD55OudoIeygcfus4vcd4=
 github.com/unrolled/render v1.0.0/go.mod h1:tu82oB5W2ykJRVioYsB+IQKcft7ryBr7w12qMBUPyXg=
+github.com/unrolled/render v1.0.1 h1:VDDnQQVfBMsOsp3VaCJszSO0nkBIVEYoPWeRThk9spY=
+github.com/unrolled/render v1.0.1/go.mod h1:gN9T0NhL4Bfbwu8ann7Ry/TGHYfosul+J0obPf6NBdM=
 github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4 h1:gKMu1Bf6QINDnvyZuTaACm9ofY+PRh+5vFz4oxBZeF8=
 github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4/go.mod h1:50wTf68f99/Zt14pr046Tgt3Lp2vLyFZKzbFXTOabXw=
+github.com/valyala/fasttemplate v1.0.1 h1:tY9CJiPnMXf1ERmG2EyK7gNUd+c6RKGD0IfU8WdUSz8=
+github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
+github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk=
+github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
+github.com/xdg/stringprep v1.0.0 h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0=
+github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
+github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
 github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
+go.mongodb.org/mongo-driver v1.1.3 h1:++7u8r9adKhGR+I79NfEtYrk2ktjenErXM99PSufIoI=
+go.mongodb.org/mongo-driver v1.1.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9 h1:abxekknhS/Drh3uoQDk5Hc7BgeiyI39Crb7vhf/1j5s=
+golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 h1:00VmoueYNlNz/aHIilyyQz/MHSqGoWJzpFv/HW8xpzI=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
+golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U=
+golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 h1:rjwSpXsdiK0dV8/Naq3kAw9ymfAeJIyd0upUIElB+lI=
+golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191010194322-b09406accb47 h1:/XfQ9z7ib8eEJX2hdgFTZJ/ntt0swNk5oYBziWeTCvY=
+golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 k8s.io/apimachinery v0.0.0-20190221093215-450d01ad5771 h1:XMECjVNpkFVT9uY40z07scw8Xtn2mUnkxx8BC3gjwoE=
 k8s.io/apimachinery v0.0.0-20190221093215-450d01ad5771/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
+k8s.io/apimachinery v0.0.0-20191203211716-adc6f4cd9e7d h1:q+OZmYewHJeMCzwpHkXlNTtk5bvaUMPCikKvf77RBlo=
+k8s.io/apimachinery v0.0.0-20191203211716-adc6f4cd9e7d/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg=
 k8s.io/client-go v10.0.0+incompatible h1:F1IqCqw7oMBzDkqlcBymRq1450wD0eNqLE9jzUrIi34=
 k8s.io/client-go v10.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
+k8s.io/client-go v11.0.0+incompatible h1:LBbX2+lOwY9flffWlJM7f1Ct8V2SRNiMRDFeiwnJo9o=
+k8s.io/client-go v11.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
+k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/helm v2.12.3+incompatible h1:wo1cdYjOnr5Z+LFuhtwIJaeQnec6D4gcg2H5UAKzY6w=
 k8s.io/helm v2.12.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
+k8s.io/helm v2.16.1+incompatible h1:L+k810plJlaGWEw1EszeT4deK8XVaKxac1oGcuB+WDc=
+k8s.io/helm v2.16.1+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
+k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
+k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
+sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
+sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
diff --git a/src/jetstream/plugins/monocular/go.sum412124244.tmp b/src/jetstream/plugins/monocular/go.sum412124244.tmp
new file mode 100644
index 0000000000..feb47c71bb
--- /dev/null
+++ b/src/jetstream/plugins/monocular/go.sum412124244.tmp
@@ -0,0 +1,279 @@
+bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c h1:bkb2NMGo3/Du52wvYj9Whth5KZfMV6d3O0Vbr3nz/UE=
+bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c/go.mod h1:hSVuE3qU7grINVSwrmzHfpg9k87ALBk+XaualNyUzI4=
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc=
+github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
+github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
+github.com/arschles/assert v1.0.0/go.mod h1:m/u69zW43x0h8dTHcv3JJZljINyEYgBuf5fYJP6WikI=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM=
+github.com/cloudfoundry-community/go-cfenv v1.17.0 h1:qfxEfn8qKkaHY3ZEk/Y2noY79HBASvNgmtHK9x4+6GY=
+github.com/cloudfoundry-community/go-cfenv v1.17.0/go.mod h1:2UgWvQTRXUuIZ/x3KnW6fk6CgPBhcV4UQb/UGIrUyyI=
+github.com/cloudfoundry-incubator/stratos v2.0.0-beta-001+incompatible h1:UUxNbLjhv2cfymub5yNN1tjjqYkteHBBagb4jcbXEIQ=
+github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
+github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
+github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=
+github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
+github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/disintegration/imaging v1.6.0 h1:nVPXRUUQ36Z7MNf0O77UzgnOb1mkMMor7lmJMJXc/mA=
+github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ=
+github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
+github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
+github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
+github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
+github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=
+github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
+github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
+github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
+github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
+github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
+github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
+github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
+github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
+github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
+github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U=
+github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
+github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
+github.com/gorilla/sessions v1.1.3 h1:uXoZdcdA5XdXF3QzuSlheVRUvjl+1rKY7zBXL68L9RU=
+github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
+github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
+github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/govau/cf-common v0.0.7 h1:uhp1P6XM6GGzu1+A4C7LELLX/9mCmH6W5DpJZC0kWmo=
+github.com/govau/cf-common v0.0.7/go.mod h1:5xL/OfE7wxeyHlXb7iei0rAbdQ/5v6dF18BZknPv7NQ=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/helm/monocular v1.4.0 h1:g0sOpuMe+9u+aPfd9ZO8mWV+c8W0dfGyBG9Wl23nwec=
+github.com/helm/monocular v1.4.0/go.mod h1:PpkCN0v4zVVigsIHnsQdJytKFmaUkwfhxB7z33a9/gE=
+github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40 h1:GT4RsKmHh1uZyhmTkWJTDALRjSHYQp6FRKrotf0zhAs=
+github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40/go.mod h1:NtmN9h8vrTveVQRLHcX2HQ5wIPBDCsZ351TGbZWgg38=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3 h1:sHsPfNMAG70QAvKbddQ0uScZCHQoZsT5NykGRCeeeIs=
+github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
+github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
+github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 h1:wdTBUArlqtBYGN2Dd4+zsaFxFH0m4iGCHToW10jPX0k=
+github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
+github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
+github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28 h1:mkl3tvPHIuPaWsLtmHTybJeoVEW7cbePK73Ir8VtruA=
+github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28/go.mod h1:T/T7jsxVqf9k/zYOqbgNAsANsjxTd1Yq3htjDhQ1H0c=
+github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8bbnE7CX5OEgg=
+github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s=
+github.com/labstack/gommon v0.2.8 h1:JvRqmeZcfrHC5u6uVleB4NxxNbzx6gpbJiQknDbKQu0=
+github.com/labstack/gommon v0.2.8/go.mod h1:/tj9csK2iPSBvn+3NLM9e52usepMtrd5ilFYA+wQNJ4=
+github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
+github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg=
+github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
+github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.6 h1:SrwhHcpV4nWrMGdNcC2kXpMfcBVYGDuTArqyhocJgvA=
+github.com/mattn/go-isatty v0.0.6/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
+github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
+github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
+github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=
+github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8=
+github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE=
+github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
+github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
+github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
+github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
+github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
+github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
+github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
+github.com/unrolled/render v1.0.0 h1:XYtvhA3UkpB7PqkvhUFYmpKD55OudoIeygcfus4vcd4=
+github.com/unrolled/render v1.0.0/go.mod h1:tu82oB5W2ykJRVioYsB+IQKcft7ryBr7w12qMBUPyXg=
+github.com/unrolled/render v1.0.1/go.mod h1:gN9T0NhL4Bfbwu8ann7Ry/TGHYfosul+J0obPf6NBdM=
+github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
+github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
+github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
+github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4 h1:gKMu1Bf6QINDnvyZuTaACm9ofY+PRh+5vFz4oxBZeF8=
+github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4/go.mod h1:50wTf68f99/Zt14pr046Tgt3Lp2vLyFZKzbFXTOabXw=
+github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
+github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
+github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
+github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
+go.mongodb.org/mongo-driver v1.1.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 h1:00VmoueYNlNz/aHIilyyQz/MHSqGoWJzpFv/HW8xpzI=
+golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
+golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+k8s.io/apimachinery v0.0.0-20190221093215-450d01ad5771 h1:XMECjVNpkFVT9uY40z07scw8Xtn2mUnkxx8BC3gjwoE=
+k8s.io/apimachinery v0.0.0-20190221093215-450d01ad5771/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
+k8s.io/apimachinery v0.0.0-20191203211716-adc6f4cd9e7d/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg=
+k8s.io/client-go v10.0.0+incompatible h1:F1IqCqw7oMBzDkqlcBymRq1450wD0eNqLE9jzUrIi34=
+k8s.io/client-go v10.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
+k8s.io/client-go v11.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
+k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/helm v2.12.3+incompatible h1:wo1cdYjOnr5Z+LFuhtwIJaeQnec6D4gcg2H5UAKzY6w=
+k8s.io/helm v2.12.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
+k8s.io/helm v2.16.1+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
+k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
+k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
+sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
+sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index 6fa2973154..55abbb960b 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -10,6 +10,7 @@ import (
 	log "github.com/sirupsen/logrus"
 
 	"github.com/helm/monocular/chartsvc"
+	"github.com/helm/monocular/chartsvc/foundationdb"
 )
 
 const (
@@ -44,7 +45,7 @@ func (m *Monocular) Init() error {
 	fDB := "monocular-plugin"
 	debug := false
 	m.ConfigureChartSVC(&fdbURL, &fDB, &debug)
-	m.chartSvcRoutes = chartsvc.GetRoutes()
+	m.chartSvcRoutes = chartsvc.SetupRoutes()
 	m.InitSync()
 	m.syncOnStartup()
 	return nil
@@ -53,7 +54,7 @@ func (m *Monocular) Init() error {
 func (m *Monocular) syncOnStartup() {
 
 	// Get the repositories that we currently have
-	repos, err := m.RepoQueryStore.ListRepositories()
+	repos, err := foundationdb.ListRepositories()
 	if err != nil {
 		log.Errorf("Chart Repostiory Startup: Unable to sync repositories: %v+", err)
 		return
@@ -103,53 +104,6 @@ func arrayContainsString(a []string, x string) bool {
 	return false
 }
 
-// func (m *Monocular) ConfigureMonocular() error {
-//     log.Info("Connecting to MongoDB...")
-
-//     var host = "127.0.0.1"
-//     var db = "monocular"
-//     var user = "mongoadmin"
-//     var password = "secret"
-
-//     session, err := chartsvc.SetMongoConfig(&host, &db, &user, password)
-//     if err != nil {
-//             log.Warn("Could not connect to MongoDB")
-//             return err
-//     }
-
-//     store, err := chartsvc.NewMongoDBChartSvcDatastore(session)
-//     if err != nil {
-//             return err
-//     }
-//     chartsvc.SetStore(store)
-//     m.QueryStore = store
-
-//     syncStore, err := chartrepo.NewMongoDBChartRepoDatastore(session)
-//     if err != nil {
-//             return err
-//     }
-//     m.Store = syncStore
-//     log.Info("Connected to MongoDB")
-
-//     return nil
-// }
-
-func (m *Monocular) ConfigureSQL() error {
-
-	log.Info("Connecting to SQL Repo store")
-
-	InitRepositoryProvider(m.portalProxy.GetConfig().DatabaseProviderName)
-
-	sqldbStore, err := NewSQLDBCMonocularDatastore(m.portalProxy.GetDatabaseConnection())
-	if err != nil {
-		return err
-	}
-
-	m.RepoQueryStore = sqldbStore
-
-	return nil
-}
-
 func (m *Monocular) ConfigureChartSVC(fdbURL *string, fDB *string, debug *bool) {
 	chartsvc.InitFDBDocLayerConnection(fdbURL, fDB, debug)
 }

From 12852cfa6d726451d324d786b9d2ab342312ce85 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Thu, 9 Jan 2020 14:06:19 +0000
Subject: [PATCH 220/648] Minor fixes

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 custom-src/frontend/app/custom/helm/store/helm.effects.ts       | 2 ++
 custom-src/frontend/app/custom/helm/store/helm.types.ts         | 2 ++
 .../organization-preview/organization-preview.component.html    | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

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 edfec83630..b3a6c38538 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.effects.ts
@@ -300,6 +300,8 @@ export class HelmEffects {
       const newService: HelmReleaseService = {
         endpointId: action.endpointGuid,
         releaseTitle: action.releaseTitle,
+        metadata: null,
+        spec: null,
         ...service
       };
       res[GetHelmReleasePods.createKey(action.endpointGuid, action.releaseTitle, service.name)] = newService;
diff --git a/custom-src/frontend/app/custom/helm/store/helm.types.ts b/custom-src/frontend/app/custom/helm/store/helm.types.ts
index 11fb7b0a2f..fb39c84a1e 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.types.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.types.ts
@@ -96,6 +96,8 @@ export interface HelmReleaseService {
   endpointId: string;
   releaseTitle: string;
   name: string;
+  metadata: any;
+  spec: any;
   kubeService$?: Observable<KubeService>;
 }
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.html
index 6387b13274..3f5677873c 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.html
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.html
@@ -85,7 +85,7 @@
             value="{{ cfOrgService.totalMem$ | async }}"
             limit="{{ (cfOrgService.quotaDefinition$ | async)?.memory_limit }}"></app-card-number-metric>
         </app-tile>
-        <app-tile [hidden]="!(cfOrgService.userProvidedServiceInstancesCount$ | async) > 0">
+        <app-tile [hidden]="(cfOrgService.userProvidedServiceInstancesCount$ | async) <= 0">
           <app-card-number-metric iconFont="stratos-icons" icon="service" label="User Service Instances"
             value="{{ cfOrgService.userProvidedServiceInstancesCount$ | async }}"></app-card-number-metric>
         </app-tile>

From 364452ad5e9bac8f2b4c099d54217a46a1959b03 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 9 Jan 2020 15:35:05 +0000
Subject: [PATCH 221/648] Fix backend build

---
 src/jetstream/go.mod                    |  5 +-
 src/jetstream/go.sum                    | 67 +++++++++++++++++++++++++
 src/jetstream/plugins/kubernetes/go.mod |  2 +-
 3 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/src/jetstream/go.mod b/src/jetstream/go.mod
index 46648a6e7f..f6642fbefc 100644
--- a/src/jetstream/go.mod
+++ b/src/jetstream/go.mod
@@ -64,9 +64,7 @@ require (
 	github.com/valyala/fasttemplate v1.1.0 // indirect
 	github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec // indirect
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
-	golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f
-	golang.org/x/net v0.0.0-20190420063019-afa5a82059c6 // indirect
-	google.golang.org/appengine v1.5.0 // indirect
+	golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8
 	gopkg.in/DATA-DOG/go-sqlmock.v1 v1.0.0-00010101000000-000000000000
 	gopkg.in/cheggaaa/pb.v1 v1.0.27 // indirect
 	gopkg.in/yaml.v2 v2.2.2
@@ -92,7 +90,6 @@ replace (
 	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628
 	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190221215341-5838f549963b
 	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190221221947-d8fee89e76ca
-	k8s.io/client-go => k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible
 	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4
 	k8s.io/kubernetes => k8s.io/kubernetes v1.13.3
 )
diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index ebbb9c968a..0498f45196 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -2,6 +2,7 @@ bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c h1:bkb2NMGo3/Du
 bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c/go.mod h1:hSVuE3qU7grINVSwrmzHfpg9k87ALBk+XaualNyUzI4=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
 code.cloudfoundry.org/bytefmt v0.0.0-20180906201452-2aa6f33b730c h1:VzwteSWGbW9mxXTEkH+kpnao5jbgLynw3hq742juQh8=
 code.cloudfoundry.org/bytefmt v0.0.0-20180906201452-2aa6f33b730c/go.mod h1:wN/zk7mhREp/oviagqUXY3EwuHhWyOvAdsn5Y4CzOrc=
 code.cloudfoundry.org/cli v6.43.0+incompatible h1:jAaPyHN5Hb2r2sR9i8Y8ejKPiPpuBYMaHBFyKVmQ7T4=
@@ -10,6 +11,13 @@ code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f h1:UrKzEwTg
 code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f/go.mod h1:sk5LnIjB/nIEU7yP5sDQExVm62wu0pBh3yrElngUisI=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
+github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
+github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
+github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
+github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
+github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
+github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
+github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/DATA-DOG/go-sqlmock v1.1.0 h1:4Ws0QCHb0hIwOCboP/hT+msNYGbR+qmZdJMSoW4lyvM=
@@ -84,6 +92,8 @@ github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 h1:eX+pdPPlD279OWgd
 github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76/go.mod h1:KjxHHirfLaw19iGT70HvVjHQsL1vq1SRQB4yOsAfy2s=
 github.com/evanphx/json-patch v4.1.0+incompatible h1:K1MDoo4AZ4wU0GIU/fPmtZg7VpzLjCxu+UwBD1FvwOc=
 github.com/evanphx/json-patch v4.1.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch v4.2.0+incompatible h1:fUDGZCv/7iAN7u0puUVhvKCcsR6vRfwrJatElLBEf0I=
+github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
@@ -92,6 +102,7 @@ github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
+github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-openapi/jsonpointer v0.17.0 h1:nH6xp8XdXHx8dqveo0ZuJBluCO2qGrPbDNZ0dwoRHP0=
 github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 github.com/go-openapi/jsonreference v0.17.0 h1:yJW3HCkTHg7NOA+gZ83IPHzUSnUzGXhGmsdiCcMexbA=
@@ -106,24 +117,38 @@ github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
+github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I=
+github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef h1:veQD95Isof8w9/WXiA+pa3tz3fJXkt5B7QaRBrM62gk=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf h1:+RRA9JqSOZFfKrOeqr2z77+8R2RKyh8PG66dcu1V0ck=
 github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
+github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/uuid v1.1.0 h1:Jf4mxPC/ziBnoPIdpQdPJ9OeiomAUHLvxmPRSPH9m4s=
 github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhpy9g=
 github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
+github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e h1:XWcjeEtTFTOVA9Fs1w7n2XBftk5ib4oZrhzWk0B+3eA=
 github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
@@ -139,6 +164,7 @@ github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/govau/cf-common v0.0.7 h1:uhp1P6XM6GGzu1+A4C7LELLX/9mCmH6W5DpJZC0kWmo=
 github.com/govau/cf-common v0.0.7/go.mod h1:5xL/OfE7wxeyHlXb7iei0rAbdQ/5v6dF18BZknPv7NQ=
+github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc h1:f8eY6cV/x1x+HLjOp4r72s/31/V2aTUtg5oKRRPf8/Q=
 github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
@@ -151,6 +177,7 @@ github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40 h1:GT4RsKmH
 github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40/go.mod h1:NtmN9h8vrTveVQRLHcX2HQ5wIPBDCsZ351TGbZWgg38=
 github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0=
 github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4=
+github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI=
 github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
@@ -161,6 +188,7 @@ github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5i
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/json-iterator/go v1.1.5 h1:gL2yXlmiIo4+t+y32d4WGwOjKGYcGOuyrg46vadswDE=
 github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE=
 github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
@@ -168,6 +196,7 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV
 github.com/kat-co/vala v0.0.0-20170210184112-42e1d8b61f12 h1:DQVOxR9qdYEybJUr/c7ku34r3PfajaMYXZwgDM7KuSk=
 github.com/kat-co/vala v0.0.0-20170210184112-42e1d8b61f12/go.mod h1:u9MdXq/QageOOSGp7qG4XAQsYUMP+V5zEel/Vrl6OOc=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -263,6 +292,7 @@ github.com/smartystreets/goconvey v0.0.0-20160503033757-d4c757aa9afd h1:ZDVcuZGx
 github.com/smartystreets/goconvey v0.0.0-20160503033757-d4c757aa9afd/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
 github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa h1:E+gaaifzi2xF65PbDmuKI3PhLWY6G5opMLniFq8vmXA=
 github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa/go.mod h1:2RVY1rIf+2J2o/IM9+vPq9RzmHDSseB7FoXiSNIUsoU=
+github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
@@ -271,6 +301,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245/go.mod h1:O1c8HleITsZqzNZDjSNzirUGsMT0oGu9LhHKoJrqO+A=
 github.com/ulikunitz/xz v0.5.6 h1:jGHAfXawEGZQ3blwU5wnWKQJvAraT7Ftq9EXjnXYgt8=
@@ -292,33 +323,50 @@ github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofm
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
 github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
 github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190225124518-7f87c0fbb88b h1:+/WWzjwW6gidDJnMKWLKLX1gxn7irUTF1fLpQovfQ5M=
 golang.org/x/crypto v0.0.0-20190225124518-7f87c0fbb88b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f h1:R423Cnkcp5JABoeemiGEPlt9tHXFfw5kvc0yqlxRPWo=
 golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 h1:1wopBVtVdWnn03fZelqdXTqk7U7zPQCb+T4rbU9ZEoU=
+golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 h1:00VmoueYNlNz/aHIilyyQz/MHSqGoWJzpFv/HW8xpzI=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190225153610-fe579d43d832/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190420063019-afa5a82059c6 h1:HdqqaWmYAUI7/dmByKKEw+yxDksGSo+9GjkUc9Zp34E=
 golang.org/x/net v0.0.0-20190420063019-afa5a82059c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc h1:gkKoSkUmnU6bpS/VhkuO27bzQeSA51uaEfbOW5dNb68=
+golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226191147-529b322ea346 h1:zxGQKdHVCsCsJpbd7ijKsVC27CyETheUBql7Br2TGmA=
 golang.org/x/oauth2 v0.0.0-20190226191147-529b322ea346/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -329,16 +377,25 @@ golang.org/x/sys v0.0.0-20191008105621-543471e840be h1:QAcqgptGM8IQBC9K/RC4o+O9Y
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2 h1:z99zHgr7hKfrUcX/KsoJk5FJfjTceCKIp96+biqP4To=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7 h1:ZUjXAXmrAyrmmCPHgCA/vChHcpsX27MZ3yBonD/z1KE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/grpc v1.19.0 h1:cfg4PD8YEdSFnm7qLV4++93WcmhH2nIUhMjhdCvl3j8=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
@@ -353,6 +410,7 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 k8s.io/api v0.0.0-20190222213804-5cb15d344471 h1:MzQGt8qWQCR+39kbYRd0uQqsvSidpYqJLFeWiJ9l4OE=
 k8s.io/api v0.0.0-20190222213804-5cb15d344471/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
 k8s.io/apiextensions-apiserver v0.0.0-20190221221350-bfb440be4b87 h1:BMfPZfi3CkPd9e9Qbm+/AFgE6qXWQcbzUvC91LR3m7w=
@@ -363,18 +421,27 @@ k8s.io/apiserver v0.0.0-20190221215341-5838f549963b h1:yFFYCR/UVj6hsYX6yRbY3CJ39
 k8s.io/apiserver v0.0.0-20190221215341-5838f549963b/go.mod h1:6bqaTSOSJavUIXUtfaR9Os9JtTCm8ZqH2SUl2S60C4w=
 k8s.io/cli-runtime v0.0.0-20190221221947-d8fee89e76ca h1:UbXBTjFC1Yy5SDU8TPLVay3znB6yrlCo7Yq/q1VdESQ=
 k8s.io/cli-runtime v0.0.0-20190221221947-d8fee89e76ca/go.mod h1:qWnH3/b8sp/l7EvlDh7ulDU3UWA4P4N1NFbEEP791tM=
+k8s.io/client-go v0.0.0-20191016111102-bec269661e48 h1:C2XVy2z0dV94q9hSSoCuTPp1KOG7IegvbdXuz9VGxoU=
+k8s.io/client-go v0.0.0-20191016111102-bec269661e48/go.mod h1:hrwktSwYGI4JK+TJA3dMaFyyvHVi/aLarVHpbs8bgCU=
 k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible h1:xkYgpj1zwmLkSh7QASe/GUMTyjPI3hwHy7k/RcQSp2A=
 k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
+k8s.io/client-go v10.0.0+incompatible h1:F1IqCqw7oMBzDkqlcBymRq1450wD0eNqLE9jzUrIi34=
+k8s.io/client-go v10.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
 k8s.io/helm v2.12.3+incompatible h1:wo1cdYjOnr5Z+LFuhtwIJaeQnec6D4gcg2H5UAKzY6w=
 k8s.io/helm v2.12.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
 k8s.io/klog v0.2.0 h1:0ElL0OHzF3N+OhoJTL0uca20SxtYt4X4+bzHeqrB83c=
 k8s.io/klog v0.2.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v0.4.0 h1:lCJCxf/LIowc2IGS9TPjWDyXY4nOmdGdfcwwDQCOURQ=
+k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4 h1:gW+EUB2I96nbxVenV/8ctfbACsHP+yxlT2dhMCsiy+s=
 k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
 k8s.io/kubernetes v1.13.3 h1:46t44D87wKtdKFgr/lXM60K8xPrW0wO67Woof3Vsv6E=
 k8s.io/kubernetes v1.13.3/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
 k8s.io/utils v0.0.0-20190221042446-c2654d5206da h1:ElyM7RPonbKnQqOcw7dG2IK5uvQQn3b/WPHqD5mBvP4=
 k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=
+k8s.io/utils v0.0.0-20190801114015-581e00157fb1 h1:+ySTxfHnfzZb9ys375PXNlLhkJPLKgHajBU0N62BDvE=
+k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 h1:O69FD9pJA4WUZlEwYatBEEkRWKQ5cKodWpdKTrCS/iQ=
diff --git a/src/jetstream/plugins/kubernetes/go.mod b/src/jetstream/plugins/kubernetes/go.mod
index c8bfd538e3..7d1f10af1e 100644
--- a/src/jetstream/plugins/kubernetes/go.mod
+++ b/src/jetstream/plugins/kubernetes/go.mod
@@ -85,7 +85,7 @@ replace (
 	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628
 	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190221215341-5838f549963b
 	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190221221947-d8fee89e76ca
-	k8s.io/client-go => k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible
+	k8s.io/client-go => k8s.io/client-go kubernetes-1.13.9 
 	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4
 	k8s.io/kubernetes => k8s.io/kubernetes v1.13.3
 )

From f249565a1ce17d22700719246c55274acb516a68 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 10 Jan 2020 08:28:57 +0000
Subject: [PATCH 222/648] Tidy ups

---
 deploy/containers/config-init/config-init.sh  |   5 -
 deploy/db/scripts/README.md                   |   3 -
 deploy/db/scripts/development.sh              |  35 ----
 deploy/db/scripts/migrate-volumes.sh          | 141 ----------------
 deploy/db/scripts/run-preflight-job.sh        |  33 ----
 deploy/db/scripts/wait-for-it.sh              | 154 ------------------
 .../console/templates/config-init.yaml        |  10 --
 7 files changed, 381 deletions(-)
 delete mode 100644 deploy/db/scripts/README.md
 delete mode 100755 deploy/db/scripts/development.sh
 delete mode 100755 deploy/db/scripts/migrate-volumes.sh
 delete mode 100755 deploy/db/scripts/run-preflight-job.sh
 delete mode 100644 deploy/db/scripts/wait-for-it.sh

diff --git a/deploy/containers/config-init/config-init.sh b/deploy/containers/config-init/config-init.sh
index f14d8fa382..ca31ecd84d 100755
--- a/deploy/containers/config-init/config-init.sh
+++ b/deploy/containers/config-init/config-init.sh
@@ -52,11 +52,6 @@ function generateCert {
     fi
   fi
 
-  # Not going to support this going forward
-  if [ -n "${CONSOLE_CERT}" ] && [ -n "${CONSOLE_CERT_KEY}" ]; then
-    echo "Got a certificate in the vars CONSOLE_CERT and CONSOLE_CERT_KEY - going to use it"
-  fi
-
   echo "Using cert generator to generate a self-signed certificate ..."
   export CERTS_PATH=./certs
   export DEV_CERTS_DOMAIN=tls
diff --git a/deploy/db/scripts/README.md b/deploy/db/scripts/README.md
deleted file mode 100644
index 7050fecf94..0000000000
--- a/deploy/db/scripts/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Deprecated
-
-This folder can be removed
\ No newline at end of file
diff --git a/deploy/db/scripts/development.sh b/deploy/db/scripts/development.sh
deleted file mode 100755
index 77283916d8..0000000000
--- a/deploy/db/scripts/development.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-set -e
-
-# Check the version
-echo "Checking database version."
-./jetstream --env=mariadb-development dbversion
-
-EXITVAL=$?
-while [ $EXITVAL -ne 0 ]
-do
-  echo "Failed to execute dbversion check, retrying after one second"
-  sleep 1
-  ./jetstream --env=mariadb-development dbversion
-  EXITVAL=$?
-done
-
-# Check the status
-echo "Checking database status."
-./jetstream --env=mariadb-development status
-
-# Run migrations
-echo "Attempting database migrations."
-./jetstream --env=mariadb-development up
-
-# CHeck the status
-echo "Checking database status."
-./jetstream --env=mariadb-development status
-
-# Check the version
-echo "Checking database version."
-./jetstream --env=mariadb-development dbversion
-
-echo "Database operation(s) complete."
-
-exit 0
diff --git a/deploy/db/scripts/migrate-volumes.sh b/deploy/db/scripts/migrate-volumes.sh
deleted file mode 100755
index df0b5e5784..0000000000
--- a/deploy/db/scripts/migrate-volumes.sh
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/bin/bash
-
-echo "============================================"
-echo "Stratos Volume Migration"
-echo "============================================"
-echo ""
-echo "Migrating volume secrets to Kubernetes secrets"
-echo ""
-
-function waitForFile() {
-  FILE=$1
-  local TIMEOUT=0
-
-  while [ ! -f "${FILE}" ]
-  do
-    sleep 5
-    TIMEOUT=$((TIMEOUT+1))
-    if [ ${TIMEOUT} -eq 60 ]; then
-      echo "Timed out waiting for file ${FILE}"
-      exit 1
-    fi
-    echo "Waiting for file: ${FILE}"
-  done
-}
-
-CERT_FILE=console.crt
-CERT_KEY=console.key
-#ENCRYPTION_KEY_FILENAME - Supplied by Helm Chart
-
-# Kubernetes token
-KUBE_TOKEN=$(</var/run/secrets/kubernetes.io/serviceaccount/token)
-KUBE_API_SERVER=https://$KUBERNETES_SERVICE_HOST:$KUBERNETES_PORT_443_TCP_PORT
-
-# ==============================================================================================================================
-# Encryption Key
-# ==============================================================================================================================
-
-# Check whether the secret already exists
-curl -k \
-    --fail \
-    -H "Authorization: Bearer $KUBE_TOKEN" \
-    -H 'Content-Type: application/json' \
-    ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets/${RELEASE_NAME}-key-secret > /dev/null
-
-EXISTS=$?
-if [ $EXISTS -ne 0 ]; then
-  echo "Encryption Key secret does not exist - this should have been created by the Helm Chart"
-  exit $EXISTS
-fi
-
-# Update the secret with the existing Encryption Key value from the Volume
-
-# Wait for the Encryption Key to appear
-echo "Waiting for Encryption Key to be created"
-waitForFile "${ENCRYPTION_KEY_VOLUME}/${ENCRYPTION_KEY_FILENAME}"
-
-echo "Encryption key is now available"
-KEY=$(cat "${ENCRYPTION_KEY_VOLUME}/${ENCRYPTION_KEY_FILENAME}" | base64 | sed -e 's/[\/&]/\\&/g')
-
-cat << EOF > patch-secret.yaml
-{
-  "data": {
-EOF
-
-echo "\"key\": \"${KEY}\"" >> patch-secret.yaml
-echo "} }" >> patch-secret.yaml
-
-echo "Patching secret for the Encryption Key"
-
-# Patch secret for the Encryption Key
-curl -k \
-    --fail \
-    -X PATCH \
-    -d @patch-secret.yaml \
-    -H "Authorization: Bearer $KUBE_TOKEN" \
-    -H 'Accept: application/json' \
-    -H 'Content-Type: application/merge-patch+json' \
-    ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets/${RELEASE_NAME}-key-secret > /dev/null
-
-RET_PATCH=$?
-echo "Patch Encryption Key secret exit code: $RET_PATCH"
-rm -rf patch-secret.yaml
-if [ $RET_PATCH -ne 0 ]; then
-  echo "Error patching Encryption Key secret"
-  exit $RET_PATCH
-fi
-
-# ==============================================================================================================================
-# Certificate
-# ==============================================================================================================================
-
-# Check whether the secret already exists
-curl -k \
-    --fail \
-    -H "Authorization: Bearer $KUBE_TOKEN" \
-    -H 'Content-Type: application/json' \
-    ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets/${RELEASE_NAME}-cert-secret > /dev/null
-
-EXISTS=$?
-if [ $EXISTS -ne 0 ]; then
-  echo "Certificate secret does not exist - this should have been created by the Helm Chart"
-  exit $EXISTS
-fi
-
-# Wait for the Certificate to appear
-echo "Waiting for Certificate to be created"
-waitForFile "${ENCRYPTION_KEY_VOLUME}/${CERT_FILE}"
-waitForFile "${ENCRYPTION_KEY_VOLUME}/${CERT_KEY}"
-echo "Certificate is now available"
-CERT=$(cat "${ENCRYPTION_KEY_VOLUME}/${CERT_FILE}" | base64 | sed -e 's/[\/&]/\\&/g')
-KEY=$(cat "${ENCRYPTION_KEY_VOLUME}/${CERT_KEY}" | base64 | sed -e 's/[\/&]/\\&/g')
-
-cat << EOF > patch-secret.yaml
-{
-  "data": {
-EOF
-
-echo "\"tls.crt\": \"${CERT}\"," >> patch-secret.yaml
-echo "\"tls.key\": \"${KEY}\"" >> patch-secret.yaml
-echo "} }" >> patch-secret.yaml
-
-# Create a secret for the Certificate
-curl -k \
-    --fail \
-    -X PATCH \
-    -d @patch-secret.yaml \
-    -H "Authorization: Bearer $KUBE_TOKEN" \
-    -H 'Accept: application/json' \
-    -H 'Content-Type: application/merge-patch+json' \
-    ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets/${RELEASE_NAME}-cert-secret > /dev/null
-
-RET_CREATED=$?
-echo "Patch Certificate secret exit code: $?"
-rm -rf patch-secret.yaml
-if [ $RET_CREATED -ne 0 ]; then
-  echo "Error patching Certificate secret $RET_CREATED"
-  exit $RET_CREATED
-fi
-
-echo ""
-echo "Volume Migration completed"
diff --git a/deploy/db/scripts/run-preflight-job.sh b/deploy/db/scripts/run-preflight-job.sh
deleted file mode 100755
index ed54af72ee..0000000000
--- a/deploy/db/scripts/run-preflight-job.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-set -e
-
-exit 1
-
-# Step 1 - No longer needed
-
-# Step 2 - Create an AES-256 compliant encryption key
-# in a file on a shared volume.
-echo "Checking to see if we need to generate the encryption key $ENCRYPTION_KEY_FILENAME file:"
-if [ ! -e /$ENCRYPTION_KEY_VOLUME/$ENCRYPTION_KEY_FILENAME ]; then
-  echo "-- Adding $ENCRYPTION_KEY_FILENAME file to the shared volume $ENCRYPTION_KEY_VOLUME."
-  keyfile=$(openssl enc -aes-256-cbc -k secret -P -md sha1 | grep key | cut -d '=' -f2)
-  printf "%s" "$keyfile" > /$ENCRYPTION_KEY_VOLUME/$ENCRYPTION_KEY_FILENAME
-  chmod 440 /$ENCRYPTION_KEY_VOLUME/$ENCRYPTION_KEY_FILENAME
-  echo "-- Done."
-fi
-
-# Step 3 - Write out or generate SSL certificate data
-if [ "${CONSOLE_CERT:-not-set}" = "not-set" -a "${CONSOLE_CERT_KEY:-not-set}" = "not-set" ]; then
-  echo "CONSOLE_CERT and CONSOLE_CERT_KEY not set, generating..."
-  export CERTS_PATH=/$ENCRYPTION_KEY_VOLUME
-  export DEV_CERTS_DOMAIN=console
-  /generate_cert.sh
-  echo "Certificates generated."
-else
-  echo "CONSOLE_CERT and CONSOLE_CERT_KEY have been provided, writing them to the Encryption volume"
-  echo "$CONSOLE_CERT" > /$ENCRYPTION_KEY_VOLUME/console.crt 
-  echo "$CONSOLE_CERT_KEY" > /$ENCRYPTION_KEY_VOLUME/console.key 
-  echo "Wrote out certificates."
-fi
-
-exit 0
diff --git a/deploy/db/scripts/wait-for-it.sh b/deploy/db/scripts/wait-for-it.sh
deleted file mode 100644
index dcea3fbdef..0000000000
--- a/deploy/db/scripts/wait-for-it.sh
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/usr/bin/env bash
-#   Use this script to test if a given TCP host/port are available
-
-cmdname=$(basename $0)
-
-echoerr() { if [[ $QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
-
-usage()
-{
-    cat << USAGE >&2
-Usage:
-    $cmdname host:port [-s] [-t timeout] [-- command args]
-    -h HOST | --host=HOST       Host or IP under test
-    -p PORT | --port=PORT       TCP port under test
-                                Alternatively, you specify the host and port as host:port
-    -s | --strict               Only execute subcommand if the test succeeds
-    -q | --quiet                Don't output any status messages
-    -t TIMEOUT | --timeout=TIMEOUT
-                                Timeout in seconds, zero for no timeout
-    -- COMMAND ARGS             Execute command with args after the test finishes
-USAGE
-    exit 1
-}
-wait_for()
-{
-    if [[ $TIMEOUT -gt 0 ]]; then
-        echoerr "$cmdname: waiting $TIMEOUT seconds for $HOST:$PORT"
-    else
-        echoerr "$cmdname: waiting for $HOST:$PORT without a timeout"
-    fi
-    start_ts=$(date +%s)
-    while :
-    do
-        (echo > /dev/tcp/$HOST/$PORT) >/dev/null 2>&1
-        result=$?
-        if [[ $result -eq 0 ]]; then
-            end_ts=$(date +%s)
-            echoerr "$cmdname: $HOST:$PORT is available after $((end_ts - start_ts)) seconds"
-            break
-        fi
-        sleep 1
-    done
-    return $result
-}
-wait_for_wrapper()
-{
-    # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
-    if [[ $QUIET -eq 1 ]]; then
-        timeout $TIMEOUT $0 --quiet --child --host=$HOST --port=$PORT --timeout=$TIMEOUT &
-    else
-        timeout $TIMEOUT $0 --child --host=$HOST --port=$PORT --timeout=$TIMEOUT &
-    fi
-    PID=$!
-    trap "kill -INT -$PID" INT
-    wait $PID
-    RESULT=$?
-    if [[ $RESULT -ne 0 ]]; then
-        echoerr "$cmdname: timeout occurred after waiting $TIMEOUT seconds for $HOST:$PORT"
-    fi
-    return $RESULT
-}
-# process arguments
-while [[ $# -gt 0 ]]
-do
-    case "$1" in
-        *:* )
-        hostport=(${1//:/ })
-        HOST=${hostport[0]}
-        PORT=${hostport[1]}
-        shift 1
-        ;;
-        --child)
-        CHILD=1
-        shift 1
-        ;;
-        -q | --quiet)
-        QUIET=1
-        shift 1
-        ;;
-        -s | --strict)
-        STRICT=1
-        shift 1
-        ;;
-        -h)
-        HOST="$2"
-        if [[ $HOST == "" ]]; then break; fi
-        shift 2
-        ;;
-        --host=*)
-        HOST="${1#*=}"
-        shift 1
-        ;;
-        -p)
-        PORT="$2"
-        if [[ $PORT == "" ]]; then break; fi
-        shift 2
-        ;;
-        --port=*)
-        PORT="${1#*=}"
-        shift 1
-        ;;
-        -t)
-        TIMEOUT="$2"
-        if [[ $TIMEOUT == "" ]]; then break; fi
-        shift 2
-        ;;
-        --timeout=*)
-        TIMEOUT="${1#*=}"
-        shift 1
-        ;;
-        --)
-        shift
-        CLI="$@"
-        break
-        ;;
-        --help)
-        usage
-        ;;
-        *)
-        echoerr "Unknown argument: $1"
-        usage
-        ;;
-    esac
-done
-if [[ "$HOST" == "" || "$PORT" == "" ]]; then
-    echoerr "Error: you need to provide a host and port to test."
-    usage
-fi
-TIMEOUT=${TIMEOUT:-15}
-STRICT=${STRICT:-0}
-CHILD=${CHILD:-0}
-QUIET=${QUIET:-0}
-if [[ $CHILD -gt 0 ]]; then
-    wait_for
-    RESULT=$?
-    exit $RESULT
-else
-    if [[ $TIMEOUT -gt 0 ]]; then
-        wait_for_wrapper
-        RESULT=$?
-    else
-        wait_for
-        RESULT=$?
-    fi
-fi
-if [[ $CLI != "" ]]; then
-    if [[ $RESULT -ne 0 && $STRICT -eq 1 ]]; then
-        echoerr "$cmdname: strict mode, refusing to execute subprocess"
-        exit $RESULT
-    fi
-    exec $CLI
-else
-    exit $RESULT
-fi
diff --git a/deploy/kubernetes/console/templates/config-init.yaml b/deploy/kubernetes/console/templates/config-init.yaml
index 1659199f12..555e550696 100644
--- a/deploy/kubernetes/console/templates/config-init.yaml
+++ b/deploy/kubernetes/console/templates/config-init.yaml
@@ -104,16 +104,6 @@ spec:
           value: "/{{ .Release.Name }}-encryption-key-volume"
         - name: ENCRYPTION_KEY_FILENAME
           value: key
-        {{- if .Values.consoleCert }}
-        - name: CONSOLE_CERT
-          value: | 
-{{ .Values.consoleCert | indent 12 }}
-        {{- end }}
-        {{- if .Values.consoleCertKey }}
-        - name: CONSOLE_CERT_KEY
-          value: |
-{{ .Values.consoleCertKey | indent 12 }}
-        {{- end }}
         - name: CONSOLE_TLS_SECRET_NAME
           value: "{{ default "" .Values.console.tlsSecretName }}"
         - name: CONSOLE_PROXY_CERT_PATH

From ddabcf25ed269bd1fbd733d469931b3452e24ce6 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 10 Jan 2020 09:01:17 +0000
Subject: [PATCH 223/648] Merge fixes

---
 deploy/db/mariadb-entrypoint.sh                   | 4 ++++
 deploy/kubernetes/console/templates/database.yaml | 8 +++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/deploy/db/mariadb-entrypoint.sh b/deploy/db/mariadb-entrypoint.sh
index 48e04e3142..49501848da 100755
--- a/deploy/db/mariadb-entrypoint.sh
+++ b/deploy/db/mariadb-entrypoint.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# TODO - Need to add back in code to update the password after init
+
+
+
 ###########################################################################################################
 #
 # This is the entrypoint script taken from here: https://github.com/docker-library/mariadb/tree/master/10.2
diff --git a/deploy/kubernetes/console/templates/database.yaml b/deploy/kubernetes/console/templates/database.yaml
index 844006e412..1f6683b553 100644
--- a/deploy/kubernetes/console/templates/database.yaml
+++ b/deploy/kubernetes/console/templates/database.yaml
@@ -56,15 +56,13 @@ spec:
         livenessProbe:
           exec:
             command:
-            - mysqladmin
-            - ping
-          initialDelaySeconds: 30
+            - /dbping.sh
+          initialDelaySeconds: 10
           timeoutSeconds: 5
         readinessProbe:
           exec:
             command:
-            - mysqladmin
-            - ping
+            - /dbping.sh
           initialDelaySeconds: 5
           timeoutSeconds: 1
         resources:

From 666206445c5e5f20666141cdf0b072983760cabd Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 10 Jan 2020 10:22:49 +0000
Subject: [PATCH 224/648] Revert changes

---
 src/frontend/packages/core/src/core/core.module.ts       | 7 -------
 src/frontend/packages/core/src/core/core.types.ts        | 9 ---------
 .../setup/uaa-wizard/console-uaa-wizard.component.html   | 2 +-
 3 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 src/frontend/packages/core/src/core/core.types.ts

diff --git a/src/frontend/packages/core/src/core/core.module.ts b/src/frontend/packages/core/src/core/core.module.ts
index cdd3539682..633c891109 100644
--- a/src/frontend/packages/core/src/core/core.module.ts
+++ b/src/frontend/packages/core/src/core/core.module.ts
@@ -1,4 +1,3 @@
-import { APP_TITLE, appTitleFactory } from './core.types';
 import { PortalModule } from '@angular/cdk/portal';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -31,7 +30,6 @@ import { TruncatePipe } from './truncate.pipe';
 import { UserService } from './user.service';
 import { UtilsService } from './utils.service';
 import { WindowRef } from './window-ref/window-ref.service';
-import { Title } from '@angular/platform-browser';
 
 @NgModule({
   imports: [
@@ -75,11 +73,6 @@ import { Title } from '@angular/platform-browser';
     UserService,
     EntityServiceFactory,
     CurrentUserPermissionsService,
-    {
-      provide: APP_TITLE,
-      useFactory: appTitleFactory,
-      deps: [Title]
-    }
   ],
   declarations: [
     StatefulIconComponent,
diff --git a/src/frontend/packages/core/src/core/core.types.ts b/src/frontend/packages/core/src/core/core.types.ts
deleted file mode 100644
index f522d660b1..0000000000
--- a/src/frontend/packages/core/src/core/core.types.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { InjectionToken } from '@angular/core';
-
-import { Title } from '@angular/platform-browser';
-
-export const APP_TITLE = new InjectionToken<string>('appTitle');
-
-export const appTitleFactory = (titleService: Title) => {
-  return titleService.getTitle();
-};
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.html b/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.html
index 3b9383fca4..49819e93dc 100644
--- a/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.html
+++ b/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.html
@@ -1,6 +1,6 @@
 <div class="page-container">
   <app-page-header hideMenu="true" [showHistory]="false">
-    <h1>{{title}} Setup with Cloud Foundry UAA</h1>
+    <h1>Stratos Setup with Cloud Foundry UAA</h1>
   </app-page-header>
   <app-show-page-header></app-show-page-header>
   <div class="uaa-wizard">

From b47f6cc53ce837657bf84fd53e4addb6680393f8 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Fri, 10 Jan 2020 11:19:15 +0000
Subject: [PATCH 225/648] Fixes following merge

---
 .../create-release.component.spec.ts          | 10 +++---
 .../create-release.component.ts               |  4 +--
 .../app/custom/helm/helm-entity-generator.ts  | 28 +++++++--------
 .../app/custom/helm/helm-testing.module.ts    | 12 +++----
 .../app/custom/helm/helm.setup.module.ts      |  4 +--
 .../monocular-release-services-list-source.ts |  2 +-
 ...onocular-repository-list-config.service.ts |  6 ++--
 .../monocular-repository-list-source.ts       |  6 ++--
 .../chart-details-usage.component.spec.ts     |  2 +-
 .../chart-details.component.spec.ts           |  4 +--
 .../tabs/helm-release-helper.service.ts       |  4 +--
 .../helm-release-summary-tab.component.ts     |  4 +--
 .../app/custom/helm/store/helm.effects.ts     | 14 ++++----
 .../kubernetes/kubernetes-entity-generator.ts | 34 +++++++++----------
 .../kubernetes/kubernetes.setup.module.ts     |  4 +--
 .../kubernetes/kubernetes.testing.module.ts   | 12 +++----
 .../kubernetes-endpoints-data-source.ts       |  6 ++--
 ...ubernetes-endpoints-list-config.service.ts |  6 ++--
 .../pod-metrics/pod-metrics.component.ts      |  2 +-
 .../services/helm-release.service.ts          |  2 +-
 .../services/kubernetes-endpoint.service.ts   |  6 ++--
 .../services/kubernetes-namespace.service.ts  |  4 +--
 .../services/kubernetes-node.service.ts       |  6 ++--
 .../kubernetes/services/kubernetes.service.ts |  4 +--
 .../kubernetes/store/kubernetes.effects.ts    | 32 ++++++++---------
 .../kubernetes-summary.component.ts           |  8 ++---
 .../list-types/app/cf-apps-data-source.ts     | 12 +++----
 .../cf-org-space-service.service.ts           |  3 +-
 .../store/src/entity-catalog.module.ts        |  7 ++--
 29 files changed, 124 insertions(+), 124 deletions(-)

diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.spec.ts b/custom-src/frontend/app/custom/helm/create-release/create-release.component.spec.ts
index a2e77432d6..26e121fdac 100644
--- a/custom-src/frontend/app/custom/helm/create-release/create-release.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/create-release/create-release.component.spec.ts
@@ -1,15 +1,15 @@
 // import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { HttpClient } from '@angular/common/http';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+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 '../../../../tab-nav.service';
 import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service';
-import { EntityMonitorFactory } from '../../../shared/monitors/entity-monitor.factory.service';
-import { InternalEventMonitorFactory } from '../../../shared/monitors/internal-event-monitor.factory';
-import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory';
 import { KubernetesBaseTestModules } from '../../kubernetes/kubernetes.testing.module';
 import { CreateReleaseComponent } from './create-release.component';
-import { HttpClient } from '@angular/common/http';
-import { HttpTestingController, HttpClientTestingModule } from '@angular/common/http/testing';
 
 describe('CreateReleaseComponent', () => {
   let component: CreateReleaseComponent;
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 cbd16ec8f1..2b09f4e7c3 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
@@ -8,8 +8,8 @@ import { Observable, of, Subscription } from 'rxjs';
 import { delay, filter, first, map, pairwise, switchMap, tap } from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
 import { EndpointsService } from '../../../core/endpoints.service';
-import { entityCatalogue } from '../../../core/entity-catalogue/entity-catalogue.service';
 import { ConfirmationDialogConfig } from '../../../shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service';
 import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component';
@@ -133,7 +133,7 @@ export class CreateReleaseComponent implements OnInit {
     const action = new HelmInstall(values);
     this.store.dispatch(action);
 
-    const releaseEntityConfig = entityCatalogue.getEntity(HELM_ENDPOINT_TYPE, helmReleaseEntityKey);
+    const releaseEntityConfig = entityCatalog.getEntity(HELM_ENDPOINT_TYPE, helmReleaseEntityKey);
 
     // Wait for result of request
     return of(true).pipe(
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 771d9cb170..b18a9cdedd 100644
--- a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
+++ b/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
@@ -1,10 +1,10 @@
-import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types';
 import {
-  StratosBaseCatalogueEntity,
-  StratosCatalogueEndpointEntity,
-  StratosCatalogueEntity,
-} from '../../core/entity-catalogue/entity-catalogue-entity';
-import { StratosEndpointExtensionDefinition } from '../../core/entity-catalogue/entity-catalogue.types';
+  StratosBaseCatalogEntity,
+  StratosCatalogEndpointEntity,
+  StratosCatalogEntity,
+} from '../../../../store/src/entity-catalog/entity-catalog-entity';
+import { StratosEndpointExtensionDefinition } from '../../../../store/src/entity-catalog/entity-catalog.types';
+import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types';
 import {
   HELM_ENDPOINT_TYPE,
   helmEntityFactory,
@@ -25,7 +25,7 @@ import {
 } from './store/helm.types';
 
 
-export function generateHelmEntities(): StratosBaseCatalogueEntity[] {
+export function generateHelmEntities(): StratosBaseCatalogEntity[] {
   const endpointDefinition: StratosEndpointExtensionDefinition = {
     type: HELM_ENDPOINT_TYPE,
     label: 'Helm Repository',
@@ -51,7 +51,7 @@ export function generateHelmEntities(): StratosBaseCatalogueEntity[] {
 }
 
 function generateEndpointEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  return new StratosCatalogueEndpointEntity(
+  return new StratosCatalogEndpointEntity(
     endpointDefinition,
     metadata => `/monocular/repos/${metadata.guid}`,
   );
@@ -63,7 +63,7 @@ function generateChartEntity(endpointDefinition: StratosEndpointExtensionDefinit
     schema: helmEntityFactory(monocularChartsEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogueEntity<IFavoriteMetadata, MonocularChart>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, MonocularChart>(definition);
 }
 
 function generateReleaseEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -72,7 +72,7 @@ function generateReleaseEntity(endpointDefinition: StratosEndpointExtensionDefin
     schema: helmEntityFactory(helmReleaseEntityKey),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogueEntity<IFavoriteMetadata, HelmRelease>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, HelmRelease>(definition);
 }
 
 function generateVersionEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -81,7 +81,7 @@ function generateVersionEntity(endpointDefinition: StratosEndpointExtensionDefin
     schema: helmEntityFactory(helmVersionsEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogueEntity<IFavoriteMetadata, HelmVersion>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, HelmVersion>(definition);
 }
 
 function generateReleaseStatusEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -90,7 +90,7 @@ function generateReleaseStatusEntity(endpointDefinition: StratosEndpointExtensio
     schema: helmEntityFactory(helmReleaseStatusEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogueEntity<IFavoriteMetadata, HelmReleaseStatus>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseStatus>(definition);
 }
 
 function generateReleasePodEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -99,7 +99,7 @@ function generateReleasePodEntity(endpointDefinition: StratosEndpointExtensionDe
     schema: helmEntityFactory(helmReleasePodEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogueEntity<IFavoriteMetadata, HelmReleasePod>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, HelmReleasePod>(definition);
 }
 
 function generateReleaseServiceEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -108,6 +108,6 @@ function generateReleaseServiceEntity(endpointDefinition: StratosEndpointExtensi
     schema: helmEntityFactory(helmReleaseServiceEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogueEntity<IFavoriteMetadata, HelmReleaseService>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseService>(definition);
 }
 
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 3b1f6d3813..21ac749902 100644
--- a/custom-src/frontend/app/custom/helm/helm-testing.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm-testing.module.ts
@@ -1,14 +1,14 @@
-import { HttpClient, HttpHandler, HttpClientModule } from '@angular/common/http';
+import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 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 { createBasicStoreModule } from '../../../test-framework/store-test-helper';
 import { generateStratosEntities } from '../../base-entity-types';
 import { CoreModule } from '../../core/core.module';
-import { CATALOGUE_ENTITIES, EntityCatalogueFeatureModule } from '../../core/entity-catalogue.module';
-import { entityCatalogue, TestEntityCatalogue } from '../../core/entity-catalogue/entity-catalogue.service';
 import { SharedModule } from '../../shared/shared.module';
 import { generateHelmEntities } from './helm-entity-generator';
 import { HelmReleaseHelperService } from './release/tabs/helm-release-helper.service';
@@ -16,12 +16,12 @@ import { HelmReleaseGuid } from './store/helm.types';
 
 @NgModule({
   imports: [{
-    ngModule: EntityCatalogueFeatureModule,
+    ngModule: EntityCatalogFeatureModule,
     providers: [
       {
         provide: CATALOGUE_ENTITIES, useFactory: () => {
-          const testEntityCatalogue = entityCatalogue as TestEntityCatalogue;
-          testEntityCatalogue.clear();
+          const testEntityCatalog = entityCatalog as TestEntityCatalog;
+          testEntityCatalog.clear();
           return [
             ...generateStratosEntities(),
             ...generateHelmEntities(),
diff --git a/custom-src/frontend/app/custom/helm/helm.setup.module.ts b/custom-src/frontend/app/custom/helm/helm.setup.module.ts
index 779e7becfc..b116eee7ce 100644
--- a/custom-src/frontend/app/custom/helm/helm.setup.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm.setup.module.ts
@@ -4,10 +4,10 @@ import { Store } from '@ngrx/store';
 
 import { GetSystemInfo } from '../../../../store/src/actions/system.actions';
 import { AppState } from '../../../../store/src/app-state';
+import { EntityCatalogModule } from '../../../../store/src/entity-catalog.module';
 import { EndpointHealthCheck } from '../../../endpoints-health-checks';
 import { CoreModule } from '../../core/core.module';
 import { EndpointsService } from '../../core/endpoints.service';
-import { EntityCatalogueModule } from '../../core/entity-catalogue.module';
 import { SharedModule } from '../../shared/shared.module';
 import { HELM_ENDPOINT_TYPE } from './helm-entity-factory';
 import { generateHelmEntities } from './helm-entity-generator';
@@ -15,7 +15,7 @@ import { HelmStoreModule } from './helm.store.module';
 
 @NgModule({
   imports: [
-    EntityCatalogueModule.forFeature(generateHelmEntities),
+    EntityCatalogModule.forFeature(generateHelmEntities),
     CoreModule,
     CommonModule,
     SharedModule,
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-source.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-source.ts
index 5e76b11b8d..df54cdaca9 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-source.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-source.ts
@@ -4,10 +4,10 @@ import { filter, map, publishReplay, refCount, switchMap } from 'rxjs/operators'
 
 import { ClearPaginationOfType } from '../../../../../store/src/actions/pagination.actions';
 import { AppState } 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 { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../shared/components/list/list.component.types';
-import { PaginationMonitor } from '../../../shared/monitors/pagination-monitor';
 import { kubernetesEntityFactory } from '../../kubernetes/kubernetes-entity-factory';
 import { KubeService } from '../../kubernetes/store/kube.types';
 import { GetKubernetesServicesInNamespace } from '../../kubernetes/store/kubernetes.actions';
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 0e99e7dd86..c9018599bf 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
@@ -3,6 +3,9 @@ import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 
 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 { getFullEndpointApiUrl } from '../../../features/endpoints/endpoint-helpers';
 import { ITableColumn } from '../../../shared/components/list/list-table/table.types';
@@ -13,9 +16,6 @@ import {
   TableCellEndpointStatusComponent,
 } from '../../../shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component';
 import { IListConfig, ListViewTypes } from '../../../shared/components/list/list.component.types';
-import { EntityMonitorFactory } from '../../../shared/monitors/entity-monitor.factory.service';
-import { InternalEventMonitorFactory } from '../../../shared/monitors/internal-event-monitor.factory';
-import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory';
 import { defaultHelmKubeListPageSize } from '../../kubernetes/list-types/kube-helm-list-types';
 import { MonocularRepositoryDataSource } from './monocular-repository-list-source';
 
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-source.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-source.ts
index 23cadde039..59148b3d79 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-source.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-source.ts
@@ -4,6 +4,9 @@ import { interval, Observable, of as observableOf, Subscription } from 'rxjs';
 
 import { GetAllEndpoints } from '../../../../../store/src/actions/endpoint.actions';
 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 { safeUnsubscribe } from '../../../core/utils.service';
 import { RowState } from '../../../shared/components/list/data-sources-controllers/list-data-source-types';
@@ -12,9 +15,6 @@ import {
   syncPaginationSection,
 } from '../../../shared/components/list/list-types/endpoint/base-endpoints-data-source';
 import { IListConfig } from '../../../shared/components/list/list.component.types';
-import { EntityMonitorFactory } from '../../../shared/monitors/entity-monitor.factory.service';
-import { InternalEventMonitorFactory } from '../../../shared/monitors/internal-event-monitor.factory';
-import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory';
 import { HELM_ENDPOINT_TYPE } from '../helm-entity-factory';
 
 export class MonocularRepositoryDataSource extends BaseEndpointsDataSource {
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts
index e54638cd29..979905d767 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts
@@ -1,10 +1,10 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 
+import { PaginationMonitorFactory } from '../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { BaseTestModulesNoShared } from '../../../../../../test-framework/core-test.helper';
 import { EndpointsService } from '../../../../../core/endpoints.service';
 import { UtilsService } from '../../../../../core/utils.service';
-import { PaginationMonitorFactory } from '../../../../../shared/monitors/pagination-monitor.factory';
 import { ChartDetailsUsageComponent } from './chart-details-usage.component';
 
 describe('Component: ChartDetailsUsage', () => {
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 612000add8..6b6940f420 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,15 +1,15 @@
 import 'hammerjs';
 
-import { HttpClientModule, HttpClient } from '@angular/common/http';
+import { HttpClient, HttpClientModule } from '@angular/common/http';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { BrowserModule } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 
+import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { BaseTestModulesNoShared } from '../../../../../test-framework/core-test.helper';
 import {
   EntitySummaryTitleComponent,
 } from '../../../../shared/components/entity-summary-title/entity-summary-title.component';
-import { PaginationMonitorFactory } from '../../../../shared/monitors/pagination-monitor.factory';
 import { ChartItemComponent } from '../chart-item/chart-item.component';
 import { ListItemComponent } from '../list-item/list-item.component';
 import { LoaderComponent } from '../loader/loader.component';
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
index 320d4495d5..0bb135d085 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
@@ -3,8 +3,8 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { EntityServiceFactory } from '../../../../core/entity-service-factory.service';
-import { PaginationMonitor } from '../../../../shared/monitors/pagination-monitor';
+import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service';
+import { PaginationMonitor } from '../../../../../../store/src/monitors/pagination-monitor';
 import { helmEntityFactory, helmReleaseEntityKey } from '../../helm-entity-factory';
 import { GetHelmReleases, GetHelmReleaseStatus } from '../../store/helm.actions';
 import { HelmRelease, HelmReleaseGuid, HelmReleaseStatus } from '../../store/helm.types';
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index d4820f671a..913d1264d5 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -8,7 +8,7 @@ import { ClearPaginationOfType } from '../../../../../../../store/src/actions/pa
 import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
 import { HideSnackBar, ShowSnackBar } from '../../../../../../../store/src/actions/snackBar.actions';
 import { AppState } from '../../../../../../../store/src/app-state';
-import { entityCatalogue } from '../../../../../core/entity-catalogue/entity-catalogue.service';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { LoggerService } from '../../../../../core/logger.service';
 import { ConfirmationDialogConfig } from '../../../../../shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../../shared/components/confirmation-dialog.service';
@@ -123,7 +123,7 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
           this.logService.error('Failed to delete release: ', err);
         },
         complete: () => {
-          const releaseEntityConfig = entityCatalogue.getEntity(HELM_ENDPOINT_TYPE, helmReleaseEntityKey);
+          const releaseEntityConfig = entityCatalog.getEntity(HELM_ENDPOINT_TYPE, helmReleaseEntityKey);
           this.store.dispatch(new ClearPaginationOfType(releaseEntityConfig));
           this.completeDelete();
           this.store.dispatch(new RouterNav({ path: ['monocular/releases'] }));
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 017506db62..1635dfb170 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.effects.ts
@@ -7,6 +7,7 @@ import { catchError, flatMap, mergeMap } from 'rxjs/operators';
 
 import { ClearPaginationOfType } from '../../../../../store/src/actions/pagination.actions';
 import { AppState } from '../../../../../store/src/app-state';
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
 import { NormalizedResponse } from '../../../../../store/src/types/api.types';
 import {
   EntityRequestAction,
@@ -14,7 +15,6 @@ import {
   WrapperRequestActionFailed,
   WrapperRequestActionSuccess,
 } from '../../../../../store/src/types/request.types';
-import { entityCatalogue } from '../../../core/entity-catalogue/entity-catalogue.service';
 import { environment } from '../../../environments/environment';
 import { HELM_ENDPOINT_TYPE, helmReleaseEntityKey } from '../helm-entity-factory';
 import { parseHelmReleaseStatus } from '../release/tabs/helm-release-helper.service';
@@ -59,7 +59,7 @@ export class HelmEffects {
   fetchCharts$ = this.actions$.pipe(
     ofType<GetMonocularCharts>(GET_MONOCULAR_CHARTS),
     flatMap(action => {
-      const entityKey = entityCatalogue.getEntityKey(action);
+      const entityKey = entityCatalog.getEntityKey(action);
       return this.makeRequest(action, `/pp/${this.proxyAPIVersion}/chartsvc/v1/charts`, (response) => {
         const base = {
           entities: { [entityKey]: {} },
@@ -85,7 +85,7 @@ export class HelmEffects {
   fetchReleases$ = this.actions$.pipe(
     ofType<GetHelmReleases>(GET_HELM_RELEASES),
     flatMap(action => {
-      const entityKey = entityCatalogue.getEntityKey(action);
+      const entityKey = entityCatalog.getEntityKey(action);
       return this.makeRequest(action, `/pp/${this.proxyAPIVersion}/helm/releases`, (response) => {
         const processedData = {
           entities: { [entityKey]: {} },
@@ -124,7 +124,7 @@ export class HelmEffects {
   fetchVersions$ = this.actions$.pipe(
     ofType<GetHelmVersions>(GET_HELM_VERSIONS),
     flatMap(action => {
-      const entityKey = entityCatalogue.getEntityKey(action);
+      const entityKey = entityCatalog.getEntityKey(action);
       return this.makeRequest(action, `/pp/${this.proxyAPIVersion}/helm/versions`, (response) => {
         // const a: HelmVersion = {};
         const processedData = {
@@ -152,7 +152,7 @@ export class HelmEffects {
   fetchHelmReleaseStatus$ = this.actions$.pipe(
     ofType<GetHelmReleaseStatus>(GET_HELM_RELEASE_STATUS),
     flatMap(action => {
-      const entityKey = entityCatalogue.getEntityKey(action);
+      const entityKey = entityCatalog.getEntityKey(action);
       return this.makeRequest(
         action,
         `/pp/${this.proxyAPIVersion}/helm/releases/${action.endpointGuid}/${action.releaseTitle}`,
@@ -273,7 +273,7 @@ export class HelmEffects {
     }, {});
     const keys = Object.keys(pods);
     const releasePods = {
-      entities: { [entityCatalogue.getEntityKey(releasePodsAction)]: pods },
+      entities: { [entityCatalog.getEntityKey(releasePodsAction)]: pods },
       result: keys
     } as NormalizedResponse;
     this.store.dispatch(new WrapperRequestActionSuccess(
@@ -298,7 +298,7 @@ export class HelmEffects {
     }, {});
     const keys = Object.keys(services);
     const releaseServices = {
-      entities: { [entityCatalogue.getEntityKey(releaseServiceAction)]: services },
+      entities: { [entityCatalog.getEntityKey(releaseServiceAction)]: services },
       result: keys
     } as NormalizedResponse;
     this.store.dispatch(new WrapperRequestActionSuccess(
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 c6e79f120b..969e93b54f 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
@@ -1,13 +1,13 @@
 import { Validators } from '@angular/forms';
 
 import { metricEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
-import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types';
 import {
-  StratosBaseCatalogueEntity,
-  StratosCatalogueEndpointEntity,
-  StratosCatalogueEntity,
-} from '../../core/entity-catalogue/entity-catalogue-entity';
-import { StratosEndpointExtensionDefinition } from '../../core/entity-catalogue/entity-catalogue.types';
+  StratosBaseCatalogEntity,
+  StratosCatalogEndpointEntity,
+  StratosCatalogEntity,
+} from '../../../../store/src/entity-catalog/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';
 import { KubernetesAWSAuthFormComponent } from './auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component';
 import {
@@ -99,7 +99,7 @@ const kubeAuthTypeMap: { [type: string]: EndpointAuthTypeConfig } = {
   }
 };
 
-export function generateKubernetesEntities(): StratosBaseCatalogueEntity[] {
+export function generateKubernetesEntities(): StratosBaseCatalogEntity[] {
   const endpointDefinition: StratosEndpointExtensionDefinition = {
     type: KUBERNETES_ENDPOINT_TYPE,
     label: 'Kubernetes',
@@ -151,7 +151,7 @@ export function generateKubernetesEntities(): StratosBaseCatalogueEntity[] {
 }
 
 function generateEndpointEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  return new StratosCatalogueEndpointEntity(
+  return new StratosCatalogEndpointEntity(
     endpointDefinition,
     metadata => `/kubernetes/${metadata.guid}`,
   );
@@ -163,7 +163,7 @@ function generateAppEntity(endpointDefinition: StratosEndpointExtensionDefinitio
     schema: kubernetesEntityFactory(kubernetesAppsEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesApp>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesApp>(definition);
 }
 
 function generateStatefulSetsEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -172,7 +172,7 @@ function generateStatefulSetsEntity(endpointDefinition: StratosEndpointExtension
     schema: kubernetesEntityFactory(kubernetesStatefulSetsEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesStatefulSet>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesStatefulSet>(definition);
 }
 
 function generatePodsEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -181,7 +181,7 @@ function generatePodsEntity(endpointDefinition: StratosEndpointExtensionDefiniti
     schema: kubernetesEntityFactory(kubernetesPodsEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesPod>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesPod>(definition);
 }
 
 function generateDeploymentsEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -190,7 +190,7 @@ function generateDeploymentsEntity(endpointDefinition: StratosEndpointExtensionD
     schema: kubernetesEntityFactory(kubernetesDeploymentsEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesDeployment>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesDeployment>(definition);
 }
 
 function generateNodesEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -199,7 +199,7 @@ function generateNodesEntity(endpointDefinition: StratosEndpointExtensionDefinit
     schema: kubernetesEntityFactory(kubernetesNodesEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesNode>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesNode>(definition);
 }
 
 function generateNamespacesEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -208,7 +208,7 @@ function generateNamespacesEntity(endpointDefinition: StratosEndpointExtensionDe
     schema: kubernetesEntityFactory(kubernetesNamespacesEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogueEntity<IFavoriteMetadata, KubernetesNamespace>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesNamespace>(definition);
 }
 
 function generateServicesEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -217,7 +217,7 @@ function generateServicesEntity(endpointDefinition: StratosEndpointExtensionDefi
     schema: kubernetesEntityFactory(kubernetesServicesEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogueEntity<IFavoriteMetadata, KubeService>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, KubeService>(definition);
 }
 
 function generateDashboardEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -226,7 +226,7 @@ function generateDashboardEntity(endpointDefinition: StratosEndpointExtensionDef
     schema: kubernetesEntityFactory(kubernetesDashboardEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogueEntity<IFavoriteMetadata>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata>(definition);
 }
 
 function generateMetricEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -237,5 +237,5 @@ function generateMetricEntity(endpointDefinition: StratosEndpointExtensionDefini
     labelPlural: 'Kubernetes Metrics',
     endpoint: endpointDefinition,
   };
-  return new StratosCatalogueEntity(definition);
+  return new StratosCatalogEntity(definition);
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
index 5ade43114c..5f3a929c63 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
@@ -3,10 +3,10 @@ import { NgModule, Optional, SkipSelf } from '@angular/core';
 import { Store } from '@ngrx/store';
 
 import { AppState } from '../../../../store/src/app-state';
+import { EntityCatalogModule } from '../../../../store/src/entity-catalog.module';
 import { EndpointHealthCheck } from '../../../endpoints-health-checks';
 import { CoreModule } from '../../core/core.module';
 import { EndpointsService } from '../../core/endpoints.service';
-import { EntityCatalogueModule } from '../../core/entity-catalogue.module';
 import { SharedModule } from '../../shared/shared.module';
 import { KubernetesAWSAuthFormComponent } from './auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component';
 import {
@@ -24,7 +24,7 @@ import { KubeHealthCheck } from './store/kubernetes.actions';
 
 @NgModule({
   imports: [
-    EntityCatalogueModule.forFeature(generateKubernetesEntities),
+    EntityCatalogModule.forFeature(generateKubernetesEntities),
     CoreModule,
     CommonModule,
     SharedModule,
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 10606f0728..b5a1655bcc 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
@@ -1,24 +1,24 @@
+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 { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../../../store/src/entity-catalog.module';
+import { entityCatalog, TestEntityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
 import { createBasicStoreModule } from '../../../test-framework/store-test-helper';
 import { generateStratosEntities } from '../../base-entity-types';
 import { CoreModule } from '../../core/core.module';
-import { CATALOGUE_ENTITIES, EntityCatalogueFeatureModule } from '../../core/entity-catalogue.module';
-import { entityCatalogue, TestEntityCatalogue } from '../../core/entity-catalogue/entity-catalogue.service';
 import { SharedModule } from '../../shared/shared.module';
 import { generateKubernetesEntities } from './kubernetes-entity-generator';
-import { HttpClientModule } from '@angular/common/http';
 
 @NgModule({
   imports: [{
-    ngModule: EntityCatalogueFeatureModule,
+    ngModule: EntityCatalogFeatureModule,
     providers: [
       {
         provide: CATALOGUE_ENTITIES, useFactory: () => {
-          const testEntityCatalogue = entityCatalogue as TestEntityCatalogue;
-          testEntityCatalogue.clear();
+          const testEntityCatalog = entityCatalog as TestEntityCatalog;
+          testEntityCatalog.clear();
           return [
             ...generateStratosEntities(),
             ...generateKubernetesEntities(),
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts
index 925b330268..5ae3b49a74 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts
@@ -2,15 +2,15 @@ import { Store } from '@ngrx/store';
 
 import { GetAllEndpoints } from '../../../../../../store/src/actions/endpoint.actions';
 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 {
   BaseEndpointsDataSource,
   syncPaginationSection,
 } from '../../../../shared/components/list/list-types/endpoint/base-endpoints-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { EntityMonitorFactory } from '../../../../shared/monitors/entity-monitor.factory.service';
-import { InternalEventMonitorFactory } from '../../../../shared/monitors/internal-event-monitor.factory';
-import { PaginationMonitorFactory } from '../../../../shared/monitors/pagination-monitor.factory';
 
 export class KubernetesEndpointsDataSource extends BaseEndpointsDataSource {
 
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
index 7e5576ac06..13762f529b 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
@@ -2,6 +2,9 @@ import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 
 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 { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
 import { BaseEndpointsDataSource } from '../../../../shared/components/list/list-types/endpoint/base-endpoints-data-source';
@@ -12,9 +15,6 @@ import {
   EndpointsListConfigService,
 } from '../../../../shared/components/list/list-types/endpoint/endpoints-list-config.service';
 import { IListConfig, ListViewTypes } from '../../../../shared/components/list/list.component.types';
-import { EntityMonitorFactory } from '../../../../shared/monitors/entity-monitor.factory.service';
-import { InternalEventMonitorFactory } from '../../../../shared/monitors/internal-event-monitor.factory';
-import { PaginationMonitorFactory } from '../../../../shared/monitors/pagination-monitor.factory';
 import { KubernetesEndpointsDataSource } from './kubernetes-endpoints-data-source';
 
 @Injectable()
diff --git a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts b/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
index 4d99a2de1b..1608b983df 100644
--- a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
@@ -6,10 +6,10 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
+import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { EntityInfo } from '../../../../../store/src/types/api.types';
 import { ChartSeries, IMetricMatrixResult } from '../../../../../store/src/types/base-metric.types';
 import { IMetricApplication } from '../../../../../store/src/types/metric.types';
-import { EntityServiceFactory } from '../../../core/entity-service-factory.service';
 import { getIdFromRoute } from '../../../core/utils.service';
 import { MetricsConfig } from '../../../shared/components/metrics-chart/metrics-chart.component';
 import { MetricsLineChartConfig } from '../../../shared/components/metrics-chart/metrics-chart.types';
diff --git a/custom-src/frontend/app/custom/kubernetes/services/helm-release.service.ts b/custom-src/frontend/app/custom/kubernetes/services/helm-release.service.ts
index c837dc80f7..3848b47f2f 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/helm-release.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/helm-release.service.ts
@@ -5,9 +5,9 @@ import { combineLatest, Observable } from 'rxjs';
 import { filter, first, map, share } from 'rxjs/operators';
 
 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 { getIdFromRoute } from '../../../core/utils.service';
-import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory';
 import { KubernetesApp, KubernetesDeployment, KubernetesPod, KubernetesStatefulSet, KubeService } from '../store/kube.types';
 import { GetKubernetesApps, GetKubernetesServices } from '../store/kubernetes.actions';
 import { KubernetesEndpointService } from './kubernetes-endpoint.service';
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
index 9816a4bbea..dd2e4c7ccd 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
@@ -5,12 +5,12 @@ import { filter, first, map, shareReplay, startWith, switchMap } from 'rxjs/oper
 
 import { GetAllEndpoints } from '../../../../../store/src/actions/endpoint.actions';
 import { AppState } from '../../../../../store/src/app-state';
+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 { EntityInfo } from '../../../../../store/src/types/api.types';
 import { EndpointModel, EndpointUser } from '../../../../../store/src/types/endpoint.types';
-import { EntityService } from '../../../core/entity-service';
-import { EntityServiceFactory } from '../../../core/entity-service-factory.service';
-import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory';
 import {
   kubernetesDeploymentsEntityType,
   kubernetesPodsEntityType,
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts
index 52bd7934c9..0d58870122 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts
@@ -5,9 +5,9 @@ import { Observable } from 'rxjs';
 import { filter, first, map, publishReplay } from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
-import { EntityServiceFactory } from '../../../core/entity-service-factory.service';
+import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
+import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { getIdFromRoute } from '../../../core/utils.service';
-import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory';
 import { KubernetesNamespace } from '../store/kube.types';
 import { GetKubernetesNamespace } from '../store/kubernetes.actions';
 import { KubernetesEndpointService } from './kubernetes-endpoint.service';
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts
index 7d8a349294..1cb1073ec1 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts
@@ -6,11 +6,11 @@ import { filter, first, map, shareReplay } from 'rxjs/operators';
 
 import { MetricQueryConfig, MetricsAction } from '../../../../../store/src/actions/metrics.actions';
 import { AppState } from '../../../../../store/src/app-state';
+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 { EntityInfo } from '../../../../../store/src/types/api.types';
-import { EntityServiceFactory } from '../../../core/entity-service-factory.service';
 import { getIdFromRoute } from '../../../core/utils.service';
-import { EntityMonitorFactory } from '../../../shared/monitors/entity-monitor.factory.service';
-import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory';
 import { MetricQueryType } from '../../../shared/services/metrics-range-selector.types';
 import { KubernetesNode, MetricStatistic } from '../store/kube.types';
 import { FetchKubernetesMetricsAction, GetKubernetesNode } from '../store/kubernetes.actions';
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts
index 74c98459a1..f1297c152c 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts
@@ -2,11 +2,11 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map, shareReplay } from 'rxjs/operators';
 
+import { PaginationMonitor } from '../../../../../store/src/monitors/pagination-monitor';
+import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
 import { endpointListKey, EndpointModel } from '../../../../../store/src/types/endpoint.types';
 import { endpointEntitySchema } from '../../../base-entity-schemas';
-import { PaginationMonitor } from '../../../shared/monitors/pagination-monitor';
-import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory';
 
 @Injectable()
 export class KubernetesService {
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 98021f537f..53b32d5afa 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
@@ -5,13 +5,13 @@ import { Store } from '@ngrx/store';
 import { catchError, combineLatest, flatMap, mergeMap } from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
 import { NormalizedResponse } from '../../../../../store/src/types/api.types';
 import {
   StartRequestAction,
   WrapperRequestActionFailed,
   WrapperRequestActionSuccess,
 } from '../../../../../store/src/types/request.types';
-import { entityCatalogue } from '../../../core/entity-catalogue/entity-catalogue.service';
 import { environment } from '../../../environments/environment';
 import {
   KUBERNETES_ENDPOINT_TYPE,
@@ -94,7 +94,7 @@ export class KubernetesEffects {
         headers
       };
       const url = `/pp/${this.proxyAPIVersion}/kubedash/${action.kubeGuid}/status`;
-      const dashboardEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesDashboardEntityType);
+      const dashboardEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesDashboardEntityType);
       return this.http
         .get(url, requestArgs)
         .pipe(mergeMap(response => {
@@ -125,7 +125,7 @@ export class KubernetesEffects {
   fetchReleasePodsInfo$ = this.actions$.pipe(
     ofType<GetKubernetesReleasePods>(GET_RELEASE_POD_INFO),
     flatMap(action => {
-      const nodeEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesEntityType);
+      const nodeEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesEntityType);
       return this.processListAction<KubernetesPod>(
         action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`,
@@ -145,7 +145,7 @@ export class KubernetesEffects {
   fetchNodeInfo$ = this.actions$.pipe(
     ofType<GetKubernetesNode>(GET_NODE_INFO),
     flatMap(action => {
-      const nodeEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesEntityType);
+      const nodeEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesEntityType);
       return this.processSingleItemAction<KubernetesNode>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes/${action.nodeName}`,
         nodeEntityConfig.entityKey,
@@ -157,7 +157,7 @@ export class KubernetesEffects {
   fetchNamespaceInfo$ = this.actions$.pipe(
     ofType<GetKubernetesNamespace>(GET_NAMESPACE_INFO),
     flatMap(action => {
-      const namespaceEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNamespacesEntityType);
+      const namespaceEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNamespacesEntityType);
       return this.processSingleItemAction<KubernetesNamespace>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}`,
         namespaceEntityConfig.entityKey,
@@ -169,7 +169,7 @@ export class KubernetesEffects {
   fetchPodsInfo$ = this.actions$.pipe(
     ofType<GetKubernetesPods>(GET_POD_INFO),
     flatMap(action => {
-      const podsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType);
+      const podsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType);
       return this.processListAction<KubernetesPod>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`,
         podsEntityConfig.entityKey,
@@ -181,7 +181,7 @@ export class KubernetesEffects {
   fetchPodsOnNodeInfo$ = this.actions$.pipe(
     ofType<GetKubernetesPodsOnNode>(GET_PODS_ON_NODE_INFO),
     flatMap(action => {
-      const podsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType);
+      const podsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType);
       return this.processListAction<KubernetesPod>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`,
         podsEntityConfig.entityKey,
@@ -194,7 +194,7 @@ export class KubernetesEffects {
   fetchPodsInNamespaceInfo$ = this.actions$.pipe(
     ofType<GetKubernetesPodsInNamespace>(GET_PODS_IN_NAMESPACE_INFO),
     flatMap(action => {
-      const podsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType);
+      const podsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType);
       return this.processListAction<KubernetesPod>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/pods`,
         podsEntityConfig.entityKey,
@@ -207,7 +207,7 @@ export class KubernetesEffects {
   fetchServicesInNamespaceInfo$ = this.actions$.pipe(
     ofType<GetKubernetesServicesInNamespace>(GET_SERVICES_IN_NAMESPACE_INFO),
     flatMap(action => {
-      const servicesEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesServicesEntityType);
+      const servicesEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesServicesEntityType);
       return this.processListAction<KubeService>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/services`,
         servicesEntityConfig.entityKey,
@@ -220,7 +220,7 @@ export class KubernetesEffects {
   fetchPodInfo$ = this.actions$.pipe(
     ofType<GetKubernetesPod>(GET_KUBE_POD),
     flatMap(action => {
-      const podsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType);
+      const podsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType);
       return this.processListAction<KubernetesPod>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/pods/${action.podName}`,
         podsEntityConfig.entityKey,
@@ -232,7 +232,7 @@ export class KubernetesEffects {
   fetchServicesInfo$ = this.actions$.pipe(
     ofType<GetKubernetesServices>(GET_SERVICE_INFO),
     flatMap(action => {
-      const servicesEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesServicesEntityType);
+      const servicesEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesServicesEntityType);
       return this.processListAction<KubeService>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/services`,
         servicesEntityConfig.entityKey,
@@ -244,7 +244,7 @@ export class KubernetesEffects {
   fetchNamespacesInfo$ = this.actions$.pipe(
     ofType<GetKubernetesNamespaces>(GET_NAMESPACES_INFO),
     flatMap(action => {
-      const namespaceEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNamespacesEntityType);
+      const namespaceEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNamespacesEntityType);
       return this.processListAction<KubernetesNamespace>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces`,
         namespaceEntityConfig.entityKey,
@@ -256,7 +256,7 @@ export class KubernetesEffects {
   fetchStatefulSets$ = this.actions$.pipe(
     ofType<GetKubernetesStatefulSets>(GET_KUBE_STATEFULSETS),
     flatMap(action => {
-      const statefulSetsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesStatefulSetsEntityType);
+      const statefulSetsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesStatefulSetsEntityType);
       return this.processListAction<KubernetesStatefulSet>(action,
         `/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/statefulsets`,
         statefulSetsEntityConfig.entityKey,
@@ -268,7 +268,7 @@ export class KubernetesEffects {
   fetchDeployments$ = this.actions$.pipe(
     ofType<GeKubernetesDeployments>(GET_KUBE_DEPLOYMENT),
     flatMap(action => {
-      const deploymentsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesDeploymentsEntityType);
+      const deploymentsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesDeploymentsEntityType);
       return this.processListAction<KubernetesDeployment>(action,
         `/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/deployments`,
         deploymentsEntityConfig.entityKey,
@@ -285,7 +285,7 @@ export class KubernetesEffects {
       const requestArgs = {
         headers
       };
-      const appsEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesAppsEntityType);
+      const appsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesAppsEntityType);
       return this.http
         .get<ConfigMap>(`/pp/${this.proxyAPIVersion}/proxy/api/v1/configmaps`, requestArgs)
         .pipe(
@@ -357,7 +357,7 @@ export class KubernetesEffects {
 
 
   private processNodeAction(action: GetKubernetesReleasePods | GetKubernetesNodes) {
-    const nodeEntityConfig = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesEntityType);
+    const nodeEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesEntityType);
     return this.processListAction<KubernetesNode>(action,
       `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes`,
       nodeEntityConfig.entityKey,
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 5b56862e8b..fba869bcd4 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
@@ -6,15 +6,15 @@ 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 { 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';
-import { entityCatalogue } from '../../../../core/entity-catalogue/entity-catalogue.service';
 import { safeUnsubscribe } from '../../../../core/utils.service';
 import {
   IChartThresholds,
   ISimpleUsageChartData,
 } from '../../../../shared/components/simple-usage-chart/simple-usage-chart.types';
-import { PaginationMonitorFactory } from '../../../../shared/monitors/pagination-monitor.factory';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
 import { GetKubernetesNodes, GetKubernetesPods } from '../../store/kubernetes.actions';
 import { KubernetesNode } from './../../../../../../../../../custom-src/frontend/app/custom/kubernetes/store/kube.types';
@@ -49,9 +49,9 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
   };
   public endpointDetails$: Observable<IEndpointDetails> = this.kubeEndpointService.endpoint$.pipe(
     map(endpoint => {
-      const endpointConfig = entityCatalogue.getEndpoint(endpoint.entity.cnsi_type, endpoint.entity.sub_type);
+      const endpointConfig = entityCatalog.getEndpoint(endpoint.entity.cnsi_type, endpoint.entity.sub_type);
       const { logoUrl, label } = endpointConfig.definition;
-      // const { imagePath, label } = entityCatalogue.getEndpoint(endpoint.entity.cnsi_type, endpoint.entity.sub_type);
+      // const { imagePath, label } = entityCatalog.getEndpoint(endpoint.entity.cnsi_type, endpoint.entity.sub_type);
 
       // const { imagePath, label } = getEndpointType(endpoint.entity.cnsi_type, endpoint.entity.sub_type);
       return {
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 1a4f9cf8ea..664461c3f6 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
@@ -4,7 +4,6 @@ import { tag } from 'rxjs-spy/operators/tag';
 import { debounceTime, delay, distinctUntilChanged, map, withLatestFrom } from 'rxjs/operators';
 
 import { GetAllApplications } from '../../../../../../../cloud-foundry/src/actions/application.actions';
-import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import {
   applicationEntityType,
   appStatsEntityType,
@@ -14,7 +13,6 @@ import {
 } from '../../../../../../../cloud-foundry/src/cf-entity-types';
 import { createEntityRelationKey } from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { DispatchSequencer, DispatchSequencerAction } from '../../../../../../../core/src/core/dispatch-sequencer';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import {
   distinctPageUntilChanged,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
@@ -22,14 +20,16 @@ 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 { MultiActionListEntity } from '../../../../../../../store/src/monitors/pagination-monitor';
 import { CreatePagination } from '../../../../../../../store/src/actions/pagination.actions';
-import { CFListDataSource } from '../../../../cf-list-data-source';
+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 { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 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';
 
 // export function createGetAllAppAction(paginationKey): GetAllApplications {
@@ -53,7 +53,7 @@ export class CfAppsDataSource extends CFListDataSource<APIResource> {
 
 
   constructor(
-    store: Store<CFAppState>,
+    store: Store<AppState>,
     listConfig?: IListConfig<APIResource>,
     transformEntities?: any[],
     paginationKey = CfAppsDataSource.paginationKey,
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 a8691e767a..ee06815966 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
@@ -25,6 +25,7 @@ import {
   valueOrCommonFalsy,
 } from '../../../../core/src/shared/components/list/data-sources-controllers/list-pagination-controller';
 import { ResetPagination, SetParams } from '../../../../store/src/actions/pagination.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 {
@@ -104,7 +105,7 @@ export const initCfOrgSpaceService = (
 };
 
 export const createCfOrSpaceMultipleFilterFn = (
-  store: Store<CFAppState>,
+  store: Store<AppState>,
   action: PaginatedAction,
   setQParam: (setQ: QParam, qs: QParam[]) => boolean
 ) => {
diff --git a/src/frontend/packages/store/src/entity-catalog.module.ts b/src/frontend/packages/store/src/entity-catalog.module.ts
index 2680128c72..ce1830c9af 100644
--- a/src/frontend/packages/store/src/entity-catalog.module.ts
+++ b/src/frontend/packages/store/src/entity-catalog.module.ts
@@ -1,14 +1,13 @@
 import { Inject, ModuleWithProviders, 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 } from './entity-catalog/entity-catalog.service';
+import { requestDataReducerFactory } from './reducers/api-request-data-reducer/request-data-reducer.factory';
+import { chainApiReducers, requestActions } from './reducers/api-request-reducers.generator.helpers';
 
+// FIXME: Needs spelling update
 export const CATALOGUE_ENTITIES = '__CATALOGUE_ENTITIES__';
 
 @NgModule({})

From 28d2af20cf082b2c9ac1baa7d9b2bc829abd9b49 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Fri, 10 Jan 2020 11:25:38 +0000
Subject: [PATCH 226/648] Fixes following merge

---
 custom-src/frontend/app/custom/helm/helm-testing.module.ts      | 2 +-
 .../frontend/app/custom/kubernetes/kubernetes.testing.module.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 21ac749902..337281cb14 100644
--- a/custom-src/frontend/app/custom/helm/helm-testing.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm-testing.module.ts
@@ -6,7 +6,7 @@ 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 { createBasicStoreModule } from '../../../test-framework/store-test-helper';
+import { createBasicStoreModule } from '../../../../store/testing/public-api';
 import { generateStratosEntities } from '../../base-entity-types';
 import { CoreModule } from '../../core/core.module';
 import { SharedModule } from '../../shared/shared.module';
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 b5a1655bcc..d84f853192 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
@@ -5,7 +5,7 @@ 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 { createBasicStoreModule } from '../../../test-framework/store-test-helper';
+import { createBasicStoreModule } from '../../../../store/testing/public-api';
 import { generateStratosEntities } from '../../base-entity-types';
 import { CoreModule } from '../../core/core.module';
 import { SharedModule } from '../../shared/shared.module';

From 30ef1d8f4e4b931c4e5d92f263bbfc12fc7a029f Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Fri, 10 Jan 2020 13:59:55 +0000
Subject: [PATCH 227/648] Update name in doc and eula, also update copyright to
 2020

---
 custom-src/frontend/app/custom/custom.module.ts | 2 +-
 custom-src/frontend/assets/eula.html            | 2 +-
 docs/suse/deploy.md                             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/custom-src/frontend/app/custom/custom.module.ts b/custom-src/frontend/app/custom/custom.module.ts
index 12e73758c3..9c3292afa2 100644
--- a/custom-src/frontend/app/custom/custom.module.ts
+++ b/custom-src/frontend/app/custom/custom.module.ts
@@ -13,7 +13,7 @@ import { SuseLoginComponent } from './suse-login/suse-login.component';
 import { SuseWelcomeComponent } from './suse-welcome/suse-welcome.component';
 
 const SuseCustomizations: CustomizationsMetadata = {
-  copyright: '&copy; 2019 SUSE',
+  copyright: '&copy; 2020 SUSE',
   hasEula: true,
   aboutInfoComponent: SuseAboutInfoComponent,
   noEndpointsComponent: SuseWelcomeComponent,
diff --git a/custom-src/frontend/assets/eula.html b/custom-src/frontend/assets/eula.html
index b2fbd96f07..3fdde6d193 100644
--- a/custom-src/frontend/assets/eula.html
+++ b/custom-src/frontend/assets/eula.html
@@ -1,4 +1,4 @@
-<p>SUSE® Cloud Application Platform</p>
+<p>SUSE® Stratos Console</p>
 
 <p>SUSE End User License Agreement</p>
 
diff --git a/docs/suse/deploy.md b/docs/suse/deploy.md
index 2e9026f4c8..0b0e3d8a3a 100644
--- a/docs/suse/deploy.md
+++ b/docs/suse/deploy.md
@@ -7,7 +7,7 @@ The following instructions cover how to:
 - Deploy Stratos Metrics
 - Connect Stratos Metrics to Stratos to enable Metrics views in Stratos
 
-These instructions assume that you are deploying the SUSE Cloud Application Platform and that you have deployed UAA/SCF using a `scf-config-values` configuration file.
+These instructions assume that you are deploying the SUSE Stratos Console and that you have deployed UAA/SCF using a `scf-config-values` configuration file.
 
 ## Install Stratos with Helm
 

From bad61234109b2f92cc9275e05090334d6c7f2f95 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Fri, 10 Jan 2020 14:26:03 +0000
Subject: [PATCH 228/648] Fix unit tests

---
 .../helm/monocular/chart-item/chart-item.component.spec.ts  | 6 +++---
 .../custom/helm/monocular/charts/charts.component.spec.ts   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.spec.ts
index efff405e57..6a4f2723fe 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.spec.ts
@@ -1,13 +1,13 @@
+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 { createBasicStoreModule } from '../../../../../test-framework/store-test-helper';
+import { createBasicStoreModule } from '../../../../../../store/testing/public-api';
 import { LoggerService } from '../../../../core/logger.service';
 import { ChartsService } from '../shared/services/charts.service';
 import { ConfigService } from '../shared/services/config.service';
 import { ChartItemComponent } from './chart-item.component';
-import { HttpClient } from '@angular/common/http';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
 
 
 describe('Component: ChartItem', () => {
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 a6b61a8e65..fda675c9e7 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
@@ -1,8 +1,10 @@
+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 { createBasicStoreModule } from '../../../../../test-framework/store-test-helper';
+import { createBasicStoreModule } from '../../../../../../store/testing/public-api';
 import { LoggerService } from '../../../../core/logger.service';
 import { ChartItemComponent } from '../chart-item/chart-item.component';
 import { ChartListComponent } from '../chart-list/chart-list.component';
@@ -14,8 +16,6 @@ import { ConfigService } from '../shared/services/config.service';
 import { MenuService } from '../shared/services/menu.service';
 import { ReposService } from '../shared/services/repos.service';
 import { ChartsComponent } from './charts.component';
-import { HttpClient } from '@angular/common/http';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
 
 // import { HeaderBarComponent } from '../header-bar/header-bar.component';
 // import { SeoService } from '../shared/services/seo.service';

From 53eba7e6b9136abc9408eb8fb823e99c22369fd5 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Fri, 10 Jan 2020 14:41:46 +0000
Subject: [PATCH 229/648] Fix unit test

---
 .../setup/uaa-wizard/console-uaa-wizard.component.spec.ts      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.spec.ts b/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.spec.ts
index c28c584108..873fe6b16d 100644
--- a/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.spec.ts
+++ b/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.spec.ts
@@ -3,6 +3,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { StoreModule } from '@ngrx/store';
+import { appReducers } from 'frontend/packages/store/src/reducers.module';
 
 import { TabNavService } from '../../../../tab-nav.service';
 import { CoreModule } from '../../../core/core.module';
@@ -27,7 +28,7 @@ describe('ConsoleUaaWizardComponent', () => {
         PageHeaderModule,
         ReactiveFormsModule,
         MDAppModule,
-        StoreModule.forRoot({}),
+        StoreModule.forRoot(appReducers),
         NoopAnimationsModule,
       ],
       providers: [TabNavService]

From 26911b3b940c846ec58f5fecaba3c9082e671176 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Fri, 10 Jan 2020 17:32:27 +0000
Subject: [PATCH 230/648] Improve Manage Users Test - Fail test if user/row
 isn't found - Scroll row into view if found

---
 .../manage-users-stepper-e2e.spec.ts          | 131 +++++++++---------
 1 file changed, 69 insertions(+), 62 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 ea3e1eba32..f2fdc7f861 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
@@ -11,6 +11,8 @@ import { CfTopLevelPage } from './cf-level/cf-top-level-page.po';
 import { ManagerUsersPage } from './manage-users-page.po';
 import { setUpTestOrgSpaceE2eTest } from './users-list-e2e.helper';
 
+const until = protractor.ExpectedConditions;
+
 describe('Manage Users Stepper', () => {
 
   const customOrgSpacesLabel = E2EHelpers.e2eItemPrefix + (process.env.CUSTOM_APP_LABEL || process.env.USER) + '-manage-users';
@@ -58,68 +60,73 @@ describe('Manage Users Stepper', () => {
     const usersTable = new CFUsersListComponent();
     usersTable.header.setSearchText(userName);
     let usersRow = -1;
-    usersTable.table.findRow('username', userName).then(row => {
-      usersRow = row;
-      expect(usersRow).toBeGreaterThanOrEqual(0);
-      expect(usersTable.table.getCell(usersRow, 1).getText()).toBe(userName);
-
-      const selectUser = new CheckboxComponent(usersTable.table.getCell(usersRow, 0));
-      selectUser.getComponent().click();
-      const usersButton = usersTable.header.getIconButton('people');
-      expect(usersButton.isDisplayed()).toBeTruthy();
-      usersButton.click();
-
-      manageUsersPage = new ManagerUsersPage(cfGuid, null, null, userGuid);
-      manageUsersPage.waitForPage();
-      expect(manageUsersPage.stepper.getActiveStepName()).toBe('Select Roles');
-
-      // Select Roles Step
-      const modifyStep = manageUsersPage.modifyUsersStep;
-      const orgsList = modifyStep.orgsList;
-      const spacesList = modifyStep.spacesList;
-      managerUsersStepper = manageUsersPage.stepper;
-
-      orgsList.waitUntilShown();
-      modifyStep.setOrg(orgName);
-      // ... check button state
-      expect(managerUsersStepper.canPrevious()).toBeFalsy();
-      expect(managerUsersStepper.canCancel()).toBeTruthy();
-      expect(managerUsersStepper.canNext()).toBeFalsy();
-
-      // ... check org state
-      orgManagerCheckbox = modifyStep.getOrgManagerCheckbox();
-      orgAuditorCheckbox = modifyStep.getOrgAuditorCheckbox();
-      orgBillingManagerCheckbox = modifyStep.getOrgBillingManagerCheckbox();
-      orgUserCheckbox = modifyStep.getOrgUserCheckbox();
-
-      expect(orgManagerCheckbox.isDisabled()).toBeFalsy();
-      expect(orgManagerCheckbox.isChecked()).toBeTruthy();
-      expect(orgAuditorCheckbox.isDisabled()).toBeFalsy();
-      expect(orgAuditorCheckbox.isChecked()).toBeTruthy();
-      expect(orgBillingManagerCheckbox.isDisabled()).toBeFalsy();
-      expect(orgBillingManagerCheckbox.isChecked()).toBeFalsy();
-      expect(orgUserCheckbox.isDisabled()).toBeTruthy();
-      expect(orgUserCheckbox.isChecked()).toBeTruthy();
-
-      // ... check space state
-      expect(spacesList.getTotalResults()).toBe(1);
-      expect(spacesList.table.getCell(0, 0).getText()).toBe(spaceName);
-      spaceManagerCheckbox = modifyStep.getSpaceManagerCheckbox(0);
-      spaceAuditorCheckbox = modifyStep.getSpaceAuditorCheckbox(0);
-      spaceDeveloperCheckbox = modifyStep.getSpaceDeveloperCheckbox(0);
-      expect(spaceManagerCheckbox.isDisabled()).toBeFalsy();
-      expect(spaceManagerCheckbox.isChecked()).toBeTruthy();
-      expect(spaceAuditorCheckbox.isDisabled()).toBeFalsy();
-      expect(spaceAuditorCheckbox.isChecked()).toBeTruthy();
-      expect(spaceDeveloperCheckbox.isDisabled()).toBeFalsy();
-      expect(spaceDeveloperCheckbox.isChecked()).toBeTruthy();
-
-      // ... check button state on toggle changes
-      orgManagerCheckbox.getComponent().click();
-      expect(managerUsersStepper.canNext()).toBeTruthy();
-      orgManagerCheckbox.getComponent().click();
-      expect(managerUsersStepper.canNext()).toBeFalsy();
-    });
+    usersTable.table.findRow('username', userName)
+      .then(row => {
+        usersRow = row;
+        expect(usersRow).toBeGreaterThanOrEqual(0);
+        expect(usersTable.table.getCell(usersRow, 1).getText()).toBe(userName);
+
+        const selectUser = new CheckboxComponent(usersTable.table.getCell(usersRow, 0));
+        selectUser.scrollIntoView();
+        selectUser.waitUntilShown();
+        selectUser.getComponent().click();
+
+        const usersButton = usersTable.header.getIconButton('people');
+        browser.wait(until.visibilityOf(usersButton));
+        usersButton.click();
+
+        manageUsersPage = new ManagerUsersPage(cfGuid, null, null, userGuid);
+        manageUsersPage.waitForPage();
+        expect(manageUsersPage.stepper.getActiveStepName()).toBe('Select Roles');
+
+        // Select Roles Step
+        const modifyStep = manageUsersPage.modifyUsersStep;
+        const orgsList = modifyStep.orgsList;
+        const spacesList = modifyStep.spacesList;
+        managerUsersStepper = manageUsersPage.stepper;
+
+        orgsList.waitUntilShown();
+        modifyStep.setOrg(orgName);
+        // ... check button state
+        expect(managerUsersStepper.canPrevious()).toBeFalsy();
+        expect(managerUsersStepper.canCancel()).toBeTruthy();
+        expect(managerUsersStepper.canNext()).toBeFalsy();
+
+        // ... check org state
+        orgManagerCheckbox = modifyStep.getOrgManagerCheckbox();
+        orgAuditorCheckbox = modifyStep.getOrgAuditorCheckbox();
+        orgBillingManagerCheckbox = modifyStep.getOrgBillingManagerCheckbox();
+        orgUserCheckbox = modifyStep.getOrgUserCheckbox();
+
+        expect(orgManagerCheckbox.isDisabled()).toBeFalsy();
+        expect(orgManagerCheckbox.isChecked()).toBeTruthy();
+        expect(orgAuditorCheckbox.isDisabled()).toBeFalsy();
+        expect(orgAuditorCheckbox.isChecked()).toBeTruthy();
+        expect(orgBillingManagerCheckbox.isDisabled()).toBeFalsy();
+        expect(orgBillingManagerCheckbox.isChecked()).toBeFalsy();
+        expect(orgUserCheckbox.isDisabled()).toBeTruthy();
+        expect(orgUserCheckbox.isChecked()).toBeTruthy();
+
+        // ... check space state
+        expect(spacesList.getTotalResults()).toBe(1);
+        expect(spacesList.table.getCell(0, 0).getText()).toBe(spaceName);
+        spaceManagerCheckbox = modifyStep.getSpaceManagerCheckbox(0);
+        spaceAuditorCheckbox = modifyStep.getSpaceAuditorCheckbox(0);
+        spaceDeveloperCheckbox = modifyStep.getSpaceDeveloperCheckbox(0);
+        expect(spaceManagerCheckbox.isDisabled()).toBeFalsy();
+        expect(spaceManagerCheckbox.isChecked()).toBeTruthy();
+        expect(spaceAuditorCheckbox.isDisabled()).toBeFalsy();
+        expect(spaceAuditorCheckbox.isChecked()).toBeTruthy();
+        expect(spaceDeveloperCheckbox.isDisabled()).toBeFalsy();
+        expect(spaceDeveloperCheckbox.isChecked()).toBeTruthy();
+
+        // ... check button state on toggle changes
+        orgManagerCheckbox.getComponent().click();
+        expect(managerUsersStepper.canNext()).toBeTruthy();
+        orgManagerCheckbox.getComponent().click();
+        expect(managerUsersStepper.canNext()).toBeFalsy();
+      })
+      .catch(err => fail(err));
 
   });
 

From 7a0b969c59db3b9e2c520517c63038d620ae8509 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 13 Jan 2020 11:39:10 +0000
Subject: [PATCH 231/648] Release 3.0.0 branch

---
 src/jetstream/go.mod | 2 +-
 src/jetstream/go.sum | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/jetstream/go.mod b/src/jetstream/go.mod
index 4db931e0e6..b9b0edf7f8 100644
--- a/src/jetstream/go.mod
+++ b/src/jetstream/go.mod
@@ -55,9 +55,9 @@ require (
 	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
 	github.com/nwaples/rardecode v1.0.0 // indirect
 	github.com/nwmac/sqlitestore v0.0.0-20180824125213-7d2ab221fb3f
-	github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830 // indirect
 	github.com/onsi/ginkgo v1.11.0 // indirect
 	github.com/onsi/gomega v1.8.1 // indirect
+	github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830 // indirect
 	github.com/pierrec/lz4 v2.0.5+incompatible // indirect
 	github.com/poy/eachers v0.0.0-20181020210610-23942921fe77 // indirect
 	github.com/satori/go.uuid v1.2.0
diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index 29ebc835f3..4bd07417b1 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -324,6 +324,8 @@ github.com/gorilla/sessions v1.1.3 h1:uXoZdcdA5XdXF3QzuSlheVRUvjl+1rKY7zBXL68L9R
 github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
 github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
+github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY=
 github.com/gosuri/uitable v0.0.1/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/govau/cf-common v0.0.7 h1:uhp1P6XM6GGzu1+A4C7LELLX/9mCmH6W5DpJZC0kWmo=
@@ -423,6 +425,8 @@ github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp
 github.com/mattn/go-shellwords v1.0.5/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
 github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
 github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/mattn/go-sqlite3 v1.13.0 h1:LnJI81JidiW9r7pS/hXe6cFeO5EXNq7KbfvoJLRI69c=
+github.com/mattn/go-sqlite3 v1.13.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mholt/archiver v3.1.1+incompatible h1:1dCVxuqs0dJseYEhi5pl7MYPH9zDa1wBi7mF09cbNkU=
@@ -466,10 +470,12 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
 github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo=
 github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI=
@@ -692,6 +698,7 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
 gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
 gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ=

From 81a4b8f01997ef512543ceab152e937139a27865 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 13 Jan 2020 11:48:59 +0000
Subject: [PATCH 232/648] Unpick preview panel

---
 .../cloud-foundry/src/cf-entity-generator.ts  |   3 -
 .../application-preview.component.html        |  70 ------------
 .../application-preview.component.scss        |   0
 .../application-preview.component.spec.ts     |  37 -------
 .../application-preview.component.ts          |  72 -------------
 .../cf-endpoint-preview.component.html        |  76 -------------
 .../cf-endpoint-preview.component.scss        |   0
 .../cf-endpoint-preview.component.spec.ts     |  37 -------
 .../cf-endpoint-preview.component.ts          |  45 --------
 .../organization-preview.component.html       | 102 ------------------
 .../organization-preview.component.scss       |   0
 .../organization-preview.component.spec.ts    |  37 -------
 .../organization-preview.component.ts         |  50 ---------
 .../space-preview.component.html              | 101 -----------------
 .../space-preview.component.scss              |   0
 .../space-preview.component.spec.ts           |  37 -------
 .../space-preview/space-preview.component.ts  |  47 --------
 .../favorites-meta-card.component.html        |   2 +-
 .../favorites-meta-card.component.ts          |  30 +-----
 19 files changed, 3 insertions(+), 743 deletions(-)
 delete mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.html
 delete mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.scss
 delete mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.spec.ts
 delete mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.ts
 delete mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.html
 delete mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.scss
 delete mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.spec.ts
 delete mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.ts
 delete mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.html
 delete mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.scss
 delete mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.spec.ts
 delete mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.ts
 delete mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.html
 delete mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.scss
 delete mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.spec.ts
 delete mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.ts

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 b0848852f6..4e9d5d776f 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
@@ -901,7 +901,6 @@ function generateCfApplicationEntity(endpointDefinition: StratosEndpointExtensio
         }),
         getLink: metadata => `/applications/${metadata.cfGuid}/${metadata.guid}/summary`,
         getGuid: metadata => metadata.guid,
-        getPreviewableComponent: () => ApplicationPreviewComponent,
         getLines: () => ([
           ['Creation Date', (meta) => meta.createdAt]
         ])
@@ -939,7 +938,6 @@ function generateCfSpaceEntity(endpointDefinition: StratosEndpointExtensionDefin
           cfGuid: space.entity.cfGuid,
           createdAt: moment(space.metadata.created_at).format('LLL'),
         }),
-        getPreviewableComponent: () => SpacePreviewComponent,
         getLines: () => ([
           ['Creation Date', (meta) => meta.createdAt]
         ]),
@@ -976,7 +974,6 @@ function generateCfOrgEntity(endpointDefinition: StratosEndpointExtensionDefinit
           cfGuid: org.entity.cfGuid,
           createdAt: moment(org.metadata.created_at).format('LLL'),
         }),
-        getPreviewableComponent: () => OrganizationPreviewComponent,
         getLink: metadata => `/cloud-foundry/${metadata.cfGuid}/organizations/${metadata.guid}`,
         getLines: () => ([
           ['Creation Date', (meta) => meta.createdAt]
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.html
deleted file mode 100644
index f47a8f18fe..0000000000
--- a/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<app-sidepanel-preview [title]="title">
-  <app-tile-grid fit="true" *ngIf="applicationService.application$ | async as appSvc">
-    <app-loading-page [isLoading]="detailsLoading$" text="Retrieving details">
-      <app-tile-group>
-        <app-tile>
-          <div class="cf-space-usage">
-            <mat-card>
-              <mat-card-header>
-                <mat-card-title>Summary</mat-card-title>
-              </mat-card-header>
-              <mat-card-content>
-                <app-tile-group *ngIf="applicationService.appOrg$ | async as appOrg">
-                  <app-tile>
-                    <app-metadata-item label="Cloud Foundry">
-                      <a [routerLink]="['/cloud-foundry/' + appSvc.cf?.guid]"
-                        matTooltip="CF API URL: {{ getFullEndpointApiUrl(appSvc.cf) }}">{{ appSvc.cf?.name}}</a>
-                    </app-metadata-item>
-                    <app-metadata-item label="Cloud Foundry">
-                      <a [routerLink]="['/cloud-foundry/' + appSvc.cf?.guid]"
-                        matTooltip="CF API URL: {{ getFullEndpointApiUrl(appSvc.cf) }}">{{ appSvc.cf?.name}}</a>
-                    </app-metadata-item>
-                  </app-tile>
-                  <app-tile class="app-metadata__two-cols">
-                    <app-metadata-item label="SSH Access">
-                      {{ sshStatus$ | async }}
-                    </app-metadata-item>
-                    <app-metadata-item label="Organization">
-                      <a
-                        [routerLink]="['/cloud-foundry/' + appSvc.cf?.guid + '/organizations/' + appOrg.metadata.guid]">{{ appOrg.entity.name }}</a>
-                    </app-metadata-item>
-                  </app-tile>
-                  <app-tile class="app-metadata__two-cols">
-                    <app-metadata-item label="CLI Info" class="cli-link">
-                      <a [routerLink]="['/applications/' + appSvc.cf?.guid + '/' + appSvc.app?.metadata.guid + '/cli']">View</a>
-                    </app-metadata-item>
-                    <app-metadata-item *ngIf="applicationService.appSpace$ | async as appSpace" label="Space">
-                      <a
-                        [routerLink]="['/cloud-foundry/' + appSvc.cf?.guid + '/organizations/' + appOrg.metadata?.guid + '/spaces/' + appSpace.metadata?.guid]">{{ appSpace.entity.name }}</a>
-                    </app-metadata-item>
-                  </app-tile>
-                </app-tile-group>
-              </mat-card-content>
-            </mat-card>
-          </div>
-        </app-tile>
-      </app-tile-group>
-
-      <app-tile-group>
-        <app-tile>
-          <app-card-number-metric icon="memory" label="Memory Usage" value="{{ appSvc.app.entity.memory | mbToHumanSize }}"></app-card-number-metric>
-        </app-tile>
-        <app-tile>
-          <app-card-number-metric icon="storage" label="Disk Quota" value="{{ appSvc.app.entity.disk_quota | mbToHumanSize }}"></app-card-number-metric>
-        </app-tile>
-      </app-tile-group>
-
-      <app-tile-group>
-        <app-tile>
-          <app-card-number-metric iconFont="stratos-icons" icon="service" label="Service Instances"
-            value="{{ (applicationService.appSummary$ | async)?.entity?.services?.length || '0' }}"></app-card-number-metric>
-        </app-tile>
-        <app-tile>
-          <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Routes"
-            value="{{ (applicationService.appSummary$ | async)?.entity?.routes?.length || '0' }}"></app-card-number-metric>
-        </app-tile>
-      </app-tile-group>
-      <app-tile-group></app-tile-group>
-    </app-loading-page>
-  </app-tile-grid>
-</app-sidepanel-preview>
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.spec.ts
deleted file mode 100644
index 2d3d25d230..0000000000
--- a/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.spec.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
-import { LoggerService } from '../../../core/logger.service';
-import { ApplicationPreviewComponent } from './application-preview.component';
-
-describe('ApplicationPreviewComponent', () => {
-  let component: ApplicationPreviewComponent;
-  let fixture: ComponentFixture<ApplicationPreviewComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ApplicationPreviewComponent],
-      providers: [LoggerService, HttpClient, HttpHandler],
-      imports: [
-        HttpClientModule,
-        HttpClientTestingModule,
-        CoreTestingModule,
-        createBasicStoreModule()
-      ]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ApplicationPreviewComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.ts
deleted file mode 100644
index 649e38af6f..0000000000
--- a/src/frontend/packages/cloud-foundry/src/shared/components/application-preview/application-preview.component.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { Component } from '@angular/core';
-import { Observable } from 'rxjs';
-import { combineLatest, distinct, map } from 'rxjs/operators';
-
-import { IAppSummary } from '../../../../../core/src/core/cf-api.types';
-import { getFullEndpointApiUrl } from '../../../../../core/src/features/endpoints/endpoint-helpers';
-import { APP_GUID, CF_GUID } from '../../../../../core/src/shared/entity.tokens';
-import { PreviewableComponent } from '../../../../../core/src/shared/previewable-component';
-import { EntityInfo } from '../../../../../store/src/types/api.types';
-import { ApplicationData, ApplicationService } from '../../../features/applications/application.service';
-
-@Component({
-  selector: 'app-application-preview-component',
-  templateUrl: './application-preview.component.html',
-  styleUrls: ['./application-preview.component.scss'],
-  providers: [
-    ApplicationService,
-    {
-      provide: CF_GUID,
-      useValue: '',
-    },
-    {
-      provide: APP_GUID,
-      useValue: '',
-    },
-  ]
-})
-export class ApplicationPreviewComponent implements PreviewableComponent {
-
-  title = null;
-  cfEndpointService: object;
-  sshStatus$: Observable<string>;
-  detailsLoading$: Observable<boolean>;
-
-  getFullEndpointApiUrl = getFullEndpointApiUrl;
-
-  constructor(public applicationService: ApplicationService) {
-  }
-
-  setProps(props: { [key: string]: any }) {
-    this.title = props.title;
-
-    this.applicationService.initialize(props.cfGuid, props.guid);
-    this.sshStatus$ = this.applicationService.application$.pipe(
-      combineLatest(this.applicationService.appSpace$),
-      map(([app, space]) => {
-        if (!space.entity.allow_ssh) {
-          return 'Disabled by the space';
-        } else {
-          return app.app.entity.enable_ssh ? 'Yes' : 'No';
-        }
-      })
-    );
-
-    this.detailsLoading$ = this.applicationService.application$.pipe(
-      combineLatest(
-        this.applicationService.appSummary$
-      ),
-      map(([app, appSummary]: [ApplicationData, EntityInfo<IAppSummary>]) => {
-        return app.fetching || appSummary.entityRequestInfo.fetching;
-      }), distinct());
-
-      //   // Wait for the apps to have been fetched, this will determine if multiple small cards are shown or now
-    //   this.cfEndpointService.appsPagObs.fetchingEntities$.pipe(
-    //     filter(loading => !loading)
-    //   ),
-    // ]).pipe(
-    //   map(() => false),
-    //   startWith(true)
-    // );
-  }
-}
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.html
deleted file mode 100644
index 64b1fd46da..0000000000
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<app-sidepanel-preview [title]="title">
-  <app-tile-grid fit="true">
-    <app-loading-page [isLoading]="detailsLoading$" text="Retrieving details">
-      <app-tile-group>
-        <app-tile>
-          <div class="cf-space-usage">
-            <mat-card>
-              <mat-card-header>
-                <mat-card-title>Summary</mat-card-title>
-              </mat-card-header>
-              <mat-card-content>
-                <app-tile-group class="app-metadata">
-                  <app-tile class="app-metadata__two-cols">
-                    <app-metadata-item label="Description">
-                      {{ cfEndpointService.description$ | async }}
-                    </app-metadata-item>
-                  </app-tile>
-                </app-tile-group>
-                <app-tile-group>
-                  <app-tile>
-                    <app-metadata-item label="Instance Address">
-                      {{ cfEndpointService.apiUrl$ | async }}
-                    </app-metadata-item>
-                    <app-metadata-item label="CF API Version">
-                      {{ (cfEndpointService.info$ | async)?.entity.entity.api_version }}
-                    </app-metadata-item>
-                  </app-tile>
-                  <app-tile class="app-metadata__two-cols">
-                    <app-metadata-item label="Account Username">
-                      {{ (cfEndpointService.endpoint$ | async )?.entity.user.name }}
-                      <span *ngIf="(cfEndpointService.endpoint$ | async )?.entity.user.admin"> (Administrator)</span>
-                    </app-metadata-item>
-                    <app-metadata-item label="SSH Access">
-                      {{ (cfEndpointService.hasSSHAccess$ | async) ? 'Available' : 'Not available' }}
-                    </app-metadata-item>
-                  </app-tile>
-                </app-tile-group>
-              </mat-card-content>
-            </mat-card>
-          </div>
-        </app-tile>
-      </app-tile-group>
-
-      <app-tile-group>
-        <app-tile>
-          <app-card-number-metric [link]="appLink" icon="apps" label="Applications" labelSingular="Application"
-            value="{{ cfEndpointService.appsPagObs.totalEntities$ | async }}"></app-card-number-metric>
-        </app-tile>
-        <app-tile>
-          <app-card-number-metric link="/cloud-foundry/{{cfEndpointService.cfGuid}}/organizations" iconFont="stratos-icons"
-            icon="organization" label="Orgs" labelSingular="Org" value="{{ (cfEndpointService.orgs$ | async)?.length }}">
-          </app-card-number-metric>
-        </app-tile>
-      </app-tile-group>
-
-      <app-tile-group>
-        <app-tile *ngIf="cfEndpointService.usersCount$ | async">
-          <app-card-number-metric link="/cloud-foundry/{{cfEndpointService.cfGuid}}/users" icon="person" label="Users"
-            labelSingular="User" value="{{ cfEndpointService.usersCount$ | async }}"></app-card-number-metric>
-        </app-tile>
-        <app-tile *ngIf="cfEndpointService.appsPagObs.hasEntities$ | async">
-          <app-card-number-metric icon="memory" units="mb" label="Memory Usage"
-            value="{{ cfEndpointService.totalMem$ | async }}"></app-card-number-metric>
-        </app-tile>
-      </app-tile-group>
-
-      <app-tile-group>
-        <app-tile>
-          <app-card-cf-recent-apps *ngIf="!(detailsLoading$ | async)" [allApps$]="cfEndpointService.appsPagObs.entities$"
-            [loading$]="cfEndpointService.appsPagObs.fetchingEntities$" (refresh)="cfEndpointService.fetchApps()">
-          </app-card-cf-recent-apps>
-        </app-tile>
-      </app-tile-group>
-    </app-loading-page>
-  </app-tile-grid>
-</app-sidepanel-preview>
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.spec.ts
deleted file mode 100644
index ec7a6eb81d..0000000000
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.spec.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
-import { LoggerService } from '../../../core/logger.service';
-import { CfEndpointPreviewComponent } from './cf-endpoint-preview.component';
-
-describe('CfEndpointPreviewComponent', () => {
-  let component: CfEndpointPreviewComponent;
-  let fixture: ComponentFixture<CfEndpointPreviewComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [CfEndpointPreviewComponent],
-      providers: [LoggerService, HttpClient, HttpHandler],
-      imports: [
-        HttpClientModule,
-        HttpClientTestingModule,
-        CoreTestingModule,
-        createBasicStoreModule()
-      ]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(CfEndpointPreviewComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.ts
deleted file mode 100644
index e627eee112..0000000000
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-preview/cf-endpoint-preview.component.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { Component } from '@angular/core';
-import { Store } from '@ngrx/store';
-import { combineLatest, Observable } from 'rxjs';
-import { filter, map, startWith } from 'rxjs/operators';
-
-import { PreviewableComponent } from '../../../../../core/src/shared/previewable-component';
-import { CFAppState } from '../../../cf-app-state';
-import { goToAppWall } from '../../../features/cloud-foundry/cf.helpers';
-import { CloudFoundryEndpointService } from '../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
-
-@Component({
-  selector: 'app-cf-endpoint-preview-component',
-  templateUrl: './cf-endpoint-preview.component.html',
-  styleUrls: ['./cf-endpoint-preview.component.scss']
-})
-export class CfEndpointPreviewComponent implements PreviewableComponent {
-
-  title = null;
-  detailsLoading$: Observable<boolean>;
-
-  constructor(
-    public cfEndpointService: CloudFoundryEndpointService,
-    private store: Store<CFAppState>) {
-  }
-
-  appLink() {
-    goToAppWall(this.store, this.cfEndpointService.cfGuid);
-  }
-
-  setProps(props: { [key: string]: any }) {
-    this.title = props.title;
-
-    this.cfEndpointService.initialize(props.cfGuid);
-
-    this.detailsLoading$ = combineLatest([
-      // Wait for the apps to have been fetched, this will determine if multiple small cards are shown or now
-      this.cfEndpointService.appsPagObs.fetchingEntities$.pipe(
-        filter(loading => !loading)
-      ),
-    ]).pipe(
-      map(() => false),
-      startWith(true)
-    );
-  }
-}
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.html
deleted file mode 100644
index 6387b13274..0000000000
--- a/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<app-sidepanel-preview [title]="title">
-  <app-tile-grid fit="true">
-    <app-loading-page [isLoading]="detailsLoading$" text="Retrieving details">
-      <app-tile-group>
-        <app-tile>
-          <div class="cf-space-usage">
-            <mat-card>
-              <mat-card-header>
-                <mat-card-title>Summary</mat-card-title>
-              </mat-card-header>
-              <mat-card-content>
-                <app-tile-group class="app-metadata">
-                  <app-tile class="app-metadata__two-cols">
-                    <app-metadata-item label="User Org Role">
-                      {{ (cfOrgService.userOrgRole$ | async) }}
-                    </app-metadata-item>
-                    <app-metadata-item label="Quota Definition">
-                      <a [routerLink]="cfOrgService.quotaLink$ | async">
-                        {{ (cfOrgService.quotaDefinition$ | async)?.name }}
-                      </a>
-                    </app-metadata-item>
-                  </app-tile>
-                  <app-tile class="app-metadata__two-cols">
-                    <app-metadata-item label="Provision Paid Services">
-                      <app-boolean-indicator
-                        [isTrue]="(cfOrgService.quotaDefinition$ | async)?.non_basic_services_allowed" type="yes-no">
-                      </app-boolean-indicator>
-                    </app-metadata-item>
-                    <app-metadata-item label="Org Status">
-                      {{ ((cfOrgService.org$ | async)?.entity?.entity?.status) | capitalizeFirst}}
-                    </app-metadata-item>
-                  </app-tile>
-                </app-tile-group>
-              </mat-card-content>
-            </mat-card>
-          </div>
-        </app-tile>
-      </app-tile-group>
-
-      <app-tile-group>
-        <app-tile>
-          <app-card-number-metric
-            link="/cloud-foundry/{{cfOrgService.cfGuid}}/organizations/{{cfOrgService.orgGuid}}/spaces" icon="language"
-            label="Spaces" labelSingular="Space" value="{{ (cfOrgService.spaces$ | async)?.length }}">
-          </app-card-number-metric>
-        </app-tile>
-        <app-tile>
-          <app-card-number-metric [link]="appLink" icon="apps" label="Applications" labelSingular="Application"
-            value="{{ cfOrgService.appCount$ | async }}"></app-card-number-metric>
-        </app-tile>
-        <app-tile *ngIf="cfEndpointService.appsPagObs.hasEntities$ | async">
-          <app-card-number-metric icon="content_copy" label="App Instances"
-            value="{{ cfOrgService.appInstances$ | async }}"
-            limit="{{ (cfOrgService.quotaDefinition$ | async)?.app_instance_limit }}"></app-card-number-metric>
-        </app-tile>
-      </app-tile-group>
-
-      <app-tile-group>
-        <app-tile>
-          <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Routes"
-            value="{{ (cfOrgService.routes$ | async)?.length }}"
-            limit="{{ (cfOrgService.quotaDefinition$ | async)?.total_routes}}"></app-card-number-metric>
-        </app-tile>
-        <app-tile>
-          <app-card-number-metric
-            link="/cloud-foundry/{{cfOrgService.cfGuid}}/organizations/{{cfOrgService.orgGuid}}/users" icon="person"
-            label="Users" labelSingular="User" value="{{ cfOrgService.usersCount$ | async }}">
-          </app-card-number-metric>
-        </app-tile>
-        <app-tile>
-          <app-card-number-metric icon="domain" label="Private Domains"
-            value="{{ (cfOrgService.privateDomains$ | async)?.length }}"
-            limit="{{ (cfOrgService.quotaDefinition$ | async)?.total_private_domains}}"></app-card-number-metric>
-        </app-tile>
-      </app-tile-group>
-
-      <app-tile-group>
-        <app-tile>
-          <app-card-number-metric iconFont="stratos-icons" icon="service" label="Service Instances"
-            value="{{ cfOrgService.serviceInstancesCount$ | async }}"
-            limit="{{ (cfOrgService.quotaDefinition$ | async)?.total_services }}"></app-card-number-metric>
-        </app-tile>
-        <app-tile [hidden]="!cfEndpointService.appsPagObs.hasEntities$ | async">
-          <app-card-number-metric icon="memory" label="Memory Usage" units="mb"
-            value="{{ cfOrgService.totalMem$ | async }}"
-            limit="{{ (cfOrgService.quotaDefinition$ | async)?.memory_limit }}"></app-card-number-metric>
-        </app-tile>
-        <app-tile [hidden]="!(cfOrgService.userProvidedServiceInstancesCount$ | async) > 0">
-          <app-card-number-metric iconFont="stratos-icons" icon="service" label="User Service Instances"
-            value="{{ cfOrgService.userProvidedServiceInstancesCount$ | async }}"></app-card-number-metric>
-        </app-tile>
-      </app-tile-group>
-      <app-tile-group></app-tile-group>
-      <app-tile-group>
-        <app-tile>
-          <app-card-cf-recent-apps *ngIf="!(detailsLoading$ | async)" [allApps$]="cfOrgService.apps$"
-            [loading$]="cfOrgService.loadingApps$" (refresh)="cfOrgService.fetchApps()"></app-card-cf-recent-apps>
-        </app-tile>
-      </app-tile-group>
-    </app-loading-page>
-  </app-tile-grid>
-</app-sidepanel-preview>
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.spec.ts
deleted file mode 100644
index f753652c8b..0000000000
--- a/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.spec.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
-import { LoggerService } from '../../../core/logger.service';
-import { OrganizationPreviewComponent } from './organization-preview.component';
-
-describe('OrganizationPreviewComponent', () => {
-  let component: OrganizationPreviewComponent;
-  let fixture: ComponentFixture<OrganizationPreviewComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [OrganizationPreviewComponent],
-      providers: [LoggerService, HttpClient, HttpHandler],
-      imports: [
-        HttpClientModule,
-        HttpClientTestingModule,
-        CoreTestingModule,
-        createBasicStoreModule()
-      ]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(OrganizationPreviewComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.ts
deleted file mode 100644
index eec648002b..0000000000
--- a/src/frontend/packages/cloud-foundry/src/shared/components/organization-preview/organization-preview.component.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { Component } from '@angular/core';
-import { Store } from '@ngrx/store';
-import { combineLatest, Observable } from 'rxjs';
-import { filter, map, startWith } from 'rxjs/operators';
-
-import { PreviewableComponent } from '../../../../../core/src/shared/previewable-component';
-import { CFAppState } from '../../../cf-app-state';
-import { goToAppWall } from '../../../features/cloud-foundry/cf.helpers';
-import { CloudFoundryEndpointService } from '../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
-import {
-  CloudFoundryOrganizationService,
-} from '../../../features/cloud-foundry/services/cloud-foundry-organization.service';
-
-@Component({
-  selector: 'app-organization-preview-component',
-  templateUrl: './organization-preview.component.html',
-  styleUrls: ['./organization-preview.component.scss']
-})
-export class OrganizationPreviewComponent implements PreviewableComponent {
-
-  title = null;
-  detailsLoading$: Observable<boolean>;
-
-  constructor(
-    public cfEndpointService: CloudFoundryEndpointService,
-    public cfOrgService: CloudFoundryOrganizationService,
-    private store: Store<CFAppState>) {
-  }
-
-  appLink() {
-    goToAppWall(this.store, this.cfOrgService.cfGuid, this.cfOrgService.orgGuid);
-  }
-
-  setProps(props: { [key: string]: any }) {
-    this.title = props.title;
-
-    this.cfEndpointService.initialize(props.cfGuid);
-    this.cfOrgService.initialize(props.cfGuid, props.guid);
-
-    this.detailsLoading$ = combineLatest([
-      // Wait for the apps to have been fetched, this will determine if multiple small cards are shown or now
-      this.cfEndpointService.appsPagObs.fetchingEntities$.pipe(
-        filter(loading => !loading)
-      ),
-    ]).pipe(
-      map(() => false),
-      startWith(true)
-    );
-  }
-}
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.html
deleted file mode 100644
index a1fe099e86..0000000000
--- a/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<app-sidepanel-preview [title]="title">
-  <app-tile-grid fit="true">
-    <app-loading-page [isLoading]="detailsLoading$" text="Retrieving details">
-      <app-tile-group>
-        <app-tile>
-          <div class="cf-space-usage">
-            <mat-card>
-              <mat-card-header>
-                <mat-card-title>Summary</mat-card-title>
-              </mat-card-header>
-              <mat-card-content>
-                <app-tile-group class="app-metadata">
-                  <app-tile class="app-metadata__two-cols">
-                    <app-metadata-item label="User Space Role/s">
-                      {{ (cfSpaceService.userRole$ | async) }}
-                    </app-metadata-item>
-                    <app-metadata-item label="Quota Definition">
-                      <ng-container *ngIf="(cfSpaceService.spaceQuotaDefinition$ | async) as spaceQuotaDefinition; else fallBackQuota">
-                        <a [routerLink]="cfSpaceService.quotaLink$ | async">
-                          {{ spaceQuotaDefinition.name }}
-                        </a>
-                      </ng-container>
-                      <ng-template #fallBackQuota>
-                        None assigned
-                        <span *ngIf="cfSpaceService.quotaDefinition$ | async as quotaDefinition"> - <a [routerLink]=""
-                            (click)="goToOrgQuota($event)">view organization's quota</a>
-                        </span>
-                      </ng-template>
-                    </app-metadata-item>
-                  </app-tile>
-                  <app-tile class="app-metadata__two-cols">
-                    <app-metadata-item label="SSH Access">
-                      {{ cfSpaceService.allowSshStatus$ | async }}
-                    </app-metadata-item>
-                    <app-metadata-item label="Provision Paid Services">
-                      <app-boolean-indicator [isTrue]="(cfSpaceService.quotaDefinition$ | async)?.non_basic_services_allowed" type="yes-no">
-                      </app-boolean-indicator>
-                    </app-metadata-item>
-                  </app-tile>
-                </app-tile-group>
-              </mat-card-content>
-            </mat-card>
-          </div>
-        </app-tile>
-      </app-tile-group>
-
-      <app-tile-group>
-        <app-tile>
-          <app-card-number-metric
-            link="/cloud-foundry/{{cfSpaceService.cfGuid}}/organizations/{{cfSpaceService.orgGuid}}/spaces/{{cfSpaceService.spaceGuid}}/apps"
-            icon="apps" label="Applications" labelSingular="Application" value="{{ cfSpaceService.appCount$ | async }}">
-          </app-card-number-metric>
-        </app-tile>
-        <app-tile *ngIf="cfEndpointService.appsPagObs.hasEntities$ | async">
-          <app-card-number-metric icon="content_copy" label="App Instances"
-            value="{{ (cfSpaceService.appInstances$ | async) }}"
-            limit="{{ (cfSpaceService.quotaDefinition$ | async)?.app_instance_limit}}"></app-card-number-metric>
-        </app-tile>
-        <app-tile>
-          <app-card-number-metric
-            link="/cloud-foundry/{{cfSpaceService.cfGuid}}/organizations/{{cfSpaceService.orgGuid}}/spaces/{{cfSpaceService.spaceGuid}}/routes"
-            iconFont="stratos-icons" icon="network_route" label="Routes"
-            value="{{ (cfSpaceService.routes$ | async)?.length }}"
-            limit="{{ (cfSpaceService.quotaDefinition$ | async)?.total_routes}}"></app-card-number-metric>
-        </app-tile>
-      </app-tile-group>
-
-      <app-tile-group>
-        <app-tile>
-          <app-card-number-metric
-            link="/cloud-foundry/{{cfSpaceService.cfGuid}}/organizations/{{cfSpaceService.orgGuid}}/spaces/{{cfSpaceService.spaceGuid}}/users"
-            icon="person" label="Users" labelSingular="User" value="{{ cfSpaceService.usersCount$ | async }}">
-          </app-card-number-metric>
-        </app-tile>
-        <app-tile>
-          <app-card-number-metric
-            link="/cloud-foundry/{{cfSpaceService.cfGuid}}/organizations/{{cfSpaceService.orgGuid}}/spaces/{{cfSpaceService.spaceGuid}}/service-instances"
-            iconFont="stratos-icons" icon="service" label="Service Instances"
-            value="{{ (cfSpaceService.serviceInstancesCount$ | async)}}"
-            limit="{{ (cfSpaceService.quotaDefinition$ | async)?.total_services }}"></app-card-number-metric>
-        </app-tile>
-        <app-tile *ngIf="(cfSpaceService.userProvidedServiceInstancesCount$ | async) > 0">
-          <app-card-number-metric iconFont="stratos-icons" icon="service" label="User Service Instances"
-            value="5"></app-card-number-metric>
-        </app-tile>
-        <app-tile *ngIf="true">
-          <app-card-number-metric icon="memory" label="Memory Usage" units="mb"
-            value="5"
-            limit="10"></app-card-number-metric>
-        </app-tile>
-      </app-tile-group>
-
-      <app-tile-group>
-        <app-tile>
-          <app-card-cf-recent-apps *ngIf="!(detailsLoading$ | async)" [allApps$]="cfSpaceService.apps$"
-            [loading$]="cfSpaceService.loadingApps$" (refresh)="cfEndpointService.fetchApps()"></app-card-cf-recent-apps>
-        </app-tile>
-      </app-tile-group>
-    </app-loading-page>
-  </app-tile-grid>
-</app-sidepanel-preview>
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.spec.ts
deleted file mode 100644
index 80a547980e..0000000000
--- a/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.spec.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
-import { LoggerService } from '../../../core/logger.service';
-import { SpacePreviewComponent } from './space-preview.component';
-
-describe('SpacePreviewComponent', () => {
-  let component: SpacePreviewComponent;
-  let fixture: ComponentFixture<SpacePreviewComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [SpacePreviewComponent],
-      providers: [LoggerService, HttpClient, HttpHandler],
-      imports: [
-        HttpClientModule,
-        HttpClientTestingModule,
-        CoreTestingModule,
-        createBasicStoreModule()
-      ]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SpacePreviewComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.ts
deleted file mode 100644
index 727611d5c9..0000000000
--- a/src/frontend/packages/cloud-foundry/src/shared/components/space-preview/space-preview.component.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { Component } from '@angular/core';
-import { combineLatest, Observable } from 'rxjs';
-import { delay, filter, map, startWith } from 'rxjs/operators';
-
-import { PreviewableComponent } from '../../../../../core/src/shared/previewable-component';
-import { CloudFoundryEndpointService } from '../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
-import {
-  CloudFoundryOrganizationService,
-} from '../../../features/cloud-foundry/services/cloud-foundry-organization.service';
-import { CloudFoundrySpaceService } from '../../../features/cloud-foundry/services/cloud-foundry-space.service';
-
-@Component({
-  selector: 'app-space-preview-component',
-  templateUrl: './space-preview.component.html',
-  styleUrls: ['./space-preview.component.scss']
-})
-export class SpacePreviewComponent implements PreviewableComponent {
-
-  title = null;
-  detailsLoading$: Observable<boolean>;
-
-  constructor(
-    public cfEndpointService: CloudFoundryEndpointService,
-    private cfOrgService: CloudFoundryOrganizationService,
-    public cfSpaceService: CloudFoundrySpaceService) {
-  }
-
-  setProps(props: { [key: string]: any }) {
-    this.title = props.title;
-
-    this.cfEndpointService.initialize(props.cfGuid);
-    this.cfOrgService.initialize(props.cfGuid, props.orgGuid);
-    this.cfSpaceService.initialize(props.cfGuid, props.orgGuid, props.guid);
-
-    this.detailsLoading$ = combineLatest([
-      // Wait for the apps to have been fetched, this will determine if multiple small cards are shown or now
-      this.cfEndpointService.appsPagObs.fetchingEntities$.pipe(
-        filter(loading => !loading)
-      ),
-      this.cfSpaceService.userProvidedServiceInstancesCount$
-    ]).pipe(
-      map(() => false),
-      delay(50000),
-      startWith(true)
-    );
-  }
-}
diff --git a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.html b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.html
index 9af11474b9..53a2b5e295 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.html
+++ b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.html
@@ -1,5 +1,5 @@
 <app-meta-card [favorite]="metaFavorite" [confirmFavoriteRemoval]="true" [ngClass]="{'fav-meta-card__clickable': !!(routerLink$ | async)}"
-  [actionMenu]="actions$ | async" (click)="previewPanel()" class="fav-meta-card" *ngIf="config" [status$]="status$"
+  [actionMenu]="actions$ | async" [routerLink]="routerLink$ | async" class="fav-meta-card" *ngIf="config" [status$]="status$"
   [entityConfig]="entityConfig">
   <app-meta-card-title class="fav-meta-card__header">
     <!--<div>ICON</div>-->
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 5a91f03f22..349bb8e89c 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
@@ -9,13 +9,10 @@ import {
 } from '../../../../../store/src/actions/user-favourites-actions/remove-user-favorite-action';
 import {
   endpointEntitiesSelector,
-  endpointsEntityRequestDataSelector,
 } from '../../../../../store/src/selectors/endpoint.selectors';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../store/src/types/user-favorites.types';
-import { ENDPOINT_TYPE, userFavoritesEntitySchema } from '../../../base-entity-schemas';
-import { entityCatalogue } from '../../../core/entity-catalogue/entity-catalogue.service';
+import { userFavoritesEntitySchema } from '../../../base-entity-schemas';
 import { IFavoriteEntity } from '../../../core/user-favorite-manager';
-import { PanelPreviewService } from '../../services/panel-preview.service';
 import { ComponentEntityMonitorConfig, StratosStatus } from '../../shared.types';
 import { ConfirmationDialogConfig } from '../confirmation-dialog.config';
 import { ConfirmationDialogService } from '../confirmation-dialog.service';
@@ -104,32 +101,9 @@ export class FavoritesMetaCardComponent {
 
   constructor(
     private store: Store<CFAppState>,
-    private confirmDialog: ConfirmationDialogService,
-    private panelPreviewService: PanelPreviewService
+    private confirmDialog: ConfirmationDialogService
   ) { }
 
-  previewPanel() {
-    const catalogueEntity = entityCatalogue.getEntity(this.favorite.endpointType, this.favorite.entityType);
-    const previewComponent = catalogueEntity.builders.entityBuilder.getPreviewableComponent();
-
-    // TODO: use 'endpoint' as constant
-    if (this.favorite.entityType === ENDPOINT_TYPE) {
-      const entity$ = this.store.select(endpointsEntityRequestDataSelector(this.favorite.endpointId));
-      this.panelPreviewService.show(previewComponent, {
-        title: this.favorite.metadata.name,
-        entity$,
-        cfGuid: this.favorite.endpointId
-      });
-    } else {
-      this.panelPreviewService.show(previewComponent, {
-        title: this.favorite.metadata.name,
-        cfGuid: this.favorite.metadata.cfGuid,
-        orgGuid: this.favorite.metadata.orgGuid,
-        guid: this.favorite.metadata.guid
-      });
-    }
-  }
-
   public setConfirmation(prettyName: string, favorite: UserFavorite<IFavoriteMetadata>) {
     this.confirmation = new ConfirmationDialogConfig(
       `Unfavorite ${prettyName}`,

From a46b7259926029b8f6e1be1a516023479c47e8b6 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 13 Jan 2020 11:58:35 +0000
Subject: [PATCH 233/648] Fix frontend build

---
 .../app/custom/helm/helm-entity-generator.ts     |  4 ++--
 .../helm-release-tab-base.component.ts           | 16 ++++++++--------
 .../kubernetes/kubernetes-entity-generator.ts    |  3 +--
 .../cloud-foundry/src/cf-entity-generator.ts     |  7 +------
 .../packages/core/src/shared/shared.module.ts    |  1 +
 5 files changed, 13 insertions(+), 18 deletions(-)

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 c4db841b65..fedc2805a2 100644
--- a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
+++ b/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
@@ -123,7 +123,7 @@ function generateReleaseGraphEntity(endpointDefinition: StratosEndpointExtension
     schema: helmEntityFactory(helmReleaseGraphEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogueEntity<IFavoriteMetadata, HelmReleaseGraph>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseGraph>(definition);
 }
 
 function generateReleaseResourceEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -132,6 +132,6 @@ function generateReleaseResourceEntity(endpointDefinition: StratosEndpointExtens
     schema: helmEntityFactory(helmReleaseResourceEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogueEntity<IFavoriteMetadata, HelmReleaseResource>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseResource>(definition);
 }
 
diff --git a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts b/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
index e93a680b0f..fdf26b710b 100644
--- a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
+++ b/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
@@ -1,15 +1,15 @@
 import { HELM_ENDPOINT_TYPE, helmReleaseResourceEntityType } from './../../helm-entity-factory';
 import { GetHelmReleaseServices } from './../../store/helm.actions';
-import { entityCatalogue } from './../../../../core/entity-catalogue/entity-catalogue.service';
+import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { Component, OnDestroy } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Observable, Subject, Subscription } from 'rxjs';
 
 import { HelmReleaseGuid, HelmReleasePod } from '../../store/helm.types';
 import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service';
-import { catchError, switchMap, share, map, first, debounceTime, startWith } from 'rxjs/operators';
+import { catchError, switchMap, share, map } from 'rxjs/operators';
 import makeWebSocketObservable, { GetWebSocketResponses } from 'rxjs-websockets';
-import { Store, Action } from '@ngrx/store';
+import { Store } from '@ngrx/store';
 import { AppState } from '../../../../../../store/src/app-state';
 import {
   successEntityHandler
@@ -21,9 +21,9 @@ import {
 } from '../../../kubernetes/kubernetes-entity-factory';
 import { PipelineResult } from '../../../../../../store/src/entity-request-pipeline/entity-request-pipeline.types';
 import { GetHelmReleasePods } from '../../store/helm.actions';
-import { EntityCatalogueEntityConfig } from '../../../../core/entity-catalogue/entity-catalogue.types';
 import { helmReleaseGraphEntityType } from '../../helm-entity-factory';
 import { LoggerService } from '../../../../core/logger.service';
+import { EntityCatalogEntityConfig } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
 
 type IDGetterFunction = (data: any) => string;
 
@@ -162,7 +162,7 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
 
   private addResource(entityType: string, data: any, id: string, endpointType = KUBERNETES_ENDPOINT_TYPE) {
     const actionDispatcher = (action) => this.store.dispatch(action);
-    const catalogEntity = entityCatalogue.getEntity(endpointType, entityType);
+    const catalogEntity = entityCatalog.getEntity(endpointType, entityType);
     const pr = {
       success: true,
       response: {
@@ -189,7 +189,7 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
     );
   }
 
-  private populateList(action: EntityCatalogueEntityConfig, resources: any, idGetter?: IDGetterFunction) {
+  private populateList(action: EntityCatalogEntityConfig, resources: any, idGetter?: IDGetterFunction) {
     const entityType = kubernetesPodsEntityType;
     const releaseTitle = this.helmReleaseHelper.releaseTitle;
     const endpointId = this.helmReleaseHelper.endpointGuid;
@@ -199,7 +199,7 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
     }
 
     const actionDispatcher = (a) => this.store.dispatch(a);
-    const catalogEntity = entityCatalogue.getEntity(KUBERNETES_ENDPOINT_TYPE, entityType);
+    const catalogEntity = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, entityType);
     const newResources = {};
     resources.forEach(resource => {
       const newResource: HelmReleasePod = {
@@ -213,7 +213,7 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
     const releasePods = {
       success: true,
       response: {
-        entities: { [entityCatalogue.getEntityKey(action)]: Object.values(newResources) },
+        entities: { [entityCatalog.getEntityKey(action)]: Object.values(newResources) },
         result: Object.keys(newResources)
       }
     };
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 fa54271c13..1d9f4df432 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
@@ -154,8 +154,7 @@ export function generateKubernetesEntities(): StratosBaseCatalogEntity[] {
 function generateEndpointEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   return new StratosCatalogEndpointEntity(
     endpointDefinition,
-    metadata => `/kubernetes/${metadata.guid}`,
-    () => KubernetesEndpointPreviewComponent,
+    metadata => `/kubernetes/${metadata.guid}`
   );
 }
 
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 4e9d5d776f..90c2861776 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
@@ -119,11 +119,7 @@ import { spaceActionBuilders } from './entity-action-builders/space.action-build
 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 { ApplicationPreviewComponent } from './shared/components/application-preview/application-preview.component';
 import { CfEndpointDetailsComponent } from './shared/components/cf-endpoint-details/cf-endpoint-details.component';
-import { CfEndpointPreviewComponent } from './shared/components/cf-endpoint-preview/cf-endpoint-preview.component';
-import { OrganizationPreviewComponent } from './shared/components/organization-preview/organization-preview.component';
-import { SpacePreviewComponent } from './shared/components/space-preview/space-preview.component';
 import { updateApplicationRoutesReducer } from './store/reducers/application-route.reducer';
 import { updateOrganizationQuotaReducer } from './store/reducers/organization-quota.reducer';
 import { updateOrganizationSpaceReducer } from './store/reducers/organization-space.reducer';
@@ -865,8 +861,7 @@ function generateFeatureFlagEntity(endpointDefinition: StratosEndpointExtensionD
 function generateCfEndpointEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   return new StratosCatalogEndpointEntity(
     endpointDefinition,
-    metadata => `/cloud-foundry/${metadata.guid}`,
-    () => CfEndpointPreviewComponent,
+    metadata => `/cloud-foundry/${metadata.guid}`
   );
 }
 
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index 925b0f50e4..09bc143808 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -119,6 +119,7 @@ import { CloudFoundryUserProvidedServicesService } from './services/cloud-foundr
 import { LongRunningOperationsService } from './services/long-running-op.service';
 import { MetricsRangeSelectorService } from './services/metrics-range-selector.service';
 import { UserPermissionDirective } from './user-permission.directive';
+import { JsonViewerComponent } from './components/json-viewer/json-viewer.component';
 
 
 @NgModule({

From c43180c7e384fec3421505817786d8858b653b42 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 13 Jan 2020 12:10:55 +0000
Subject: [PATCH 234/648] Fix compilation issues

---
 custom-src/frontend/app/custom/helm/store/helm.effects.ts  | 4 ++--
 custom-src/frontend/app/custom/helm/store/helm.types.ts    | 2 ++
 .../card-cf-space-details.component.html                   | 2 +-
 .../card-cf-space-details.component.ts                     | 7 ++++++-
 src/frontend/packages/core/src/shared/shared.module.ts     | 3 +++
 5 files changed, 14 insertions(+), 4 deletions(-)

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 f2a035a454..f9885b09ba 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.effects.ts
@@ -297,11 +297,11 @@ export class HelmEffects {
   private updateReleaseServices(action: GetHelmReleaseStatus, status: HelmReleaseStatus) {
     const releaseServiceAction = new GetHelmReleaseServices(action.endpointGuid, action.releaseTitle);
     const services = Object.values(status.data['v1/Service']).reduce((res, service) => {
-      const newService: HelmReleaseService = {
+      const newService = {
         endpointId: action.endpointGuid,
         releaseTitle: action.releaseTitle,
         ...service
-      };
+      } as HelmReleaseService;
       res[GetHelmReleasePods.createKey(action.endpointGuid, action.releaseTitle, service.name)] = newService;
       return res;
     }, {});
diff --git a/custom-src/frontend/app/custom/helm/store/helm.types.ts b/custom-src/frontend/app/custom/helm/store/helm.types.ts
index 11fb7b0a2f..6d13d026b4 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.types.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.types.ts
@@ -97,6 +97,8 @@ export interface HelmReleaseService {
   releaseTitle: string;
   name: string;
   kubeService$?: Observable<KubeService>;
+  metadata: any;
+  spec: any;
 }
 
 export interface HelmReleaseGraph {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.html
index 92c2869e70..f2b722ebda 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.html
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.html
@@ -31,7 +31,7 @@
         </div>
         <div class="app-metadata__two-cols">
           <app-metadata-item label="SSH Access">
-            {{ cfSpaceService.allowSshStatus$ | async }}
+            {{ allowSshStatus$ | async }}
           </app-metadata-item>
           <app-metadata-item label="Created At">
             {{ ((cfSpaceService.space$ | async)?.entity?.metadata?.created_at) | date: 'medium' }}
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts
index efaf18cd79..1e20e5ab65 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts
@@ -1,7 +1,8 @@
 import { Component, OnDestroy } from '@angular/core';
 import { Router } from '@angular/router';
 import { Store } from '@ngrx/store';
-import { Subscription } from 'rxjs';
+import { Observable, Subscription } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 import {
   CloudFoundrySpaceService,
@@ -17,6 +18,7 @@ import { AppState } from '../../../../../../store/src/app-state';
   styleUrls: ['./card-cf-space-details.component.scss']
 })
 export class CardCfSpaceDetailsComponent implements OnDestroy {
+  allowSshStatus$: Observable<string>;
   quotaLinkSub: Subscription;
 
   constructor(
@@ -24,6 +26,9 @@ export class CardCfSpaceDetailsComponent implements OnDestroy {
     private store: Store<AppState>,
     private router: Router
   ) {
+    this.allowSshStatus$ = cfSpaceService.allowSsh$.pipe(
+      map(status => status === 'false' ? 'Disabled' : 'Enabled')
+    );
   }
 
   goToOrgQuota() {
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index 09bc143808..f44cb27e48 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -1,3 +1,4 @@
+import { SidepanelPreviewComponent } from './components/sidepanel-preview/sidepanel-preview.component';
 import { CdkTableModule } from '@angular/cdk/table';
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
@@ -224,6 +225,7 @@ import { JsonViewerComponent } from './components/json-viewer/json-viewer.compon
     ListHostDirective,
     CopyToClipboardComponent,
     TileSelectorTileComponent,
+    SidepanelPreviewComponent
   ],
   exports: [
     ApplicationStateIconPipe,
@@ -316,6 +318,7 @@ import { JsonViewerComponent } from './components/json-viewer/json-viewer.compon
     ListHostDirective,
     CopyToClipboardComponent,
     TileSelectorTileComponent,
+    SidepanelPreviewComponent
   ],
   entryComponents: [
     DialogConfirmComponent,

From 526f8bf95954ae2b16bd346ac99a465345b22d8c Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 13 Jan 2020 14:28:48 +0000
Subject: [PATCH 235/648] Fix crash with multiple k8s endpoints

---
 src/jetstream/plugins/kubernetes/helm_client.go   |  7 +++++++
 src/jetstream/plugins/kubernetes/list_releases.go | 11 ++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/helm_client.go b/src/jetstream/plugins/kubernetes/helm_client.go
index 1be20f6c52..58d9585741 100644
--- a/src/jetstream/plugins/kubernetes/helm_client.go
+++ b/src/jetstream/plugins/kubernetes/helm_client.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"io/ioutil"
 	"os"
+	"sync"
 	"time"
 
 	log "github.com/sirupsen/logrus"
@@ -37,7 +38,10 @@ func (f *HelmConfiguration) Cleanup() {
 	}
 }
 
+var lock sync.Mutex
+
 // GetHelmConfiguration - gets a Helm V3 client for using it as a client library
+// The Helm API we use is not thead safe, so use a lock to make sure only one call at a time
 func (c *KubernetesSpecification) GetHelmConfiguration(endpointGUID, userID, namespace string) (*action.Configuration, *HelmConfiguration, error) {
 	// Need to get a config object for the target endpoint
 	var p = c.portalProxy
@@ -54,6 +58,9 @@ func (c *KubernetesSpecification) GetHelmConfiguration(endpointGUID, userID, nam
 		return nil, hc, errors.New("Helm: Can not get user token for endpoint")
 	}
 
+	lock.Lock()
+	defer lock.Unlock()
+
 	kubeconfigcontents, err := c.GetKubeConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRecord, namespace)
 	if err != nil {
 		log.Errorf("Helm: Could not get kubeconfig for endpoint: %s", err)
diff --git a/src/jetstream/plugins/kubernetes/list_releases.go b/src/jetstream/plugins/kubernetes/list_releases.go
index 9dc54d5415..867da05e1c 100644
--- a/src/jetstream/plugins/kubernetes/list_releases.go
+++ b/src/jetstream/plugins/kubernetes/list_releases.go
@@ -232,19 +232,17 @@ func (c *KubernetesSpecification) GetRelease(ec echo.Context) error {
 
 	// Now we have everything, so loop, polling to get status
 	for {
-		log.Warn("Polling for release - wait 10 seconds")
+		log.Debug("Polling for release - wait 10 seconds")
 
 		select {
 		case <-stopchan:
-			log.Error("***  RELEASE POLLER HAS FINISHED")
-			log.Error("****************************************************************************************************")
 			ws.Close()
 			return nil
 		case <-time.After(sleep):
 			break
 		}
 
-		log.Warn("Polling for release ....")
+		log.Debug("Polling for release ....")
 
 		// Pods
 		rel.UpdatePods(c.portalProxy)
@@ -263,10 +261,6 @@ func (c *KubernetesSpecification) GetRelease(ec echo.Context) error {
 		sleep = 10 * time.Second
 	}
 
-	log.Error("****************************************************************************************************")
-	log.Error("RELEASE POLLER HAS FINISHED")
-	log.Error("****************************************************************************************************")
-
 	ws.Close()
 
 	return nil
@@ -275,7 +269,6 @@ func (c *KubernetesSpecification) GetRelease(ec echo.Context) error {
 func readLoop(c *websocket.Conn, stopchan chan<- bool) {
 	for {
 		if _, _, err := c.NextReader(); err != nil {
-			log.Error("WEB SOCKET HAS BEEN CLOSED")
 			c.Close()
 			close(stopchan)
 			break

From b559d09199ed75bf47737a46c923b9fe3ce3733e Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Mon, 13 Jan 2020 18:46:26 +0000
Subject: [PATCH 236/648] Log URL to fdb server on plugin init. Modify Helm
 plugin DB URL to point to fdb

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 src/jetstream/plugins/monocular/chart-repo/api_endpoint.go    | 2 +-
 .../plugins/monocular/chart-repo/foundationdb/delete.go       | 2 +-
 .../plugins/monocular/chart-repo/foundationdb/sync.go         | 2 +-
 src/jetstream/plugins/monocular/chartsvc/main.go              | 2 +-
 src/jetstream/plugins/monocular/go.sum                        | 1 +
 src/jetstream/plugins/monocular/main.go                       | 2 +-
 src/jetstream/plugins/monocular/sync.go                       | 4 ++--
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
index a7ef887c25..22ed499834 100644
--- a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
+++ b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
@@ -142,7 +142,7 @@ func InitFDBDocLayerConnection(fdbURL *string, fDB *string, debug *bool) {
 	client, err := fdb.NewDocLayerClient(ctx, clientOptions)
 	fdbClient = client
 	if err != nil {
-		log.Fatalf("Can't create client for FoundationDB document layer: %v", err)
+		log.Fatalf("Can't create client for FoundationDB document layer: %v. URL provided was: %v", err, *fdbURL)
 		return
 	}
 	log.Debugf("FDB Document Layer client created.")
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/delete.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/delete.go
index 1d4dd7f34c..79105d2bac 100644
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/delete.go
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/delete.go
@@ -50,7 +50,7 @@ func Delete(cmd *cobra.Command, args []string) {
 	defer cancel()
 	client, err := NewDocLayerClient(ctx, clientOptions)
 	if err != nil {
-		log.Fatalf("Can't create client for FoundationDB document layer: %v", err)
+		log.Fatalf("Can't create client for FoundationDB document layer: %v URL provided was: %v", err, fdbURL)
 		return
 	}
 
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/sync.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/sync.go
index f2eeca8c77..1b25b651ce 100644
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/sync.go
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/sync.go
@@ -51,7 +51,7 @@ func Sync(cmd *cobra.Command, args []string) {
 	defer cancel()
 	client, err := NewDocLayerClient(ctx, clientOptions)
 	if err != nil {
-		log.Fatalf("Can't create client for FoundationDB document layer: %v", err)
+		log.Fatalf("Can't create client for FoundationDB document layer: %v. URL provided was: %v", err, fdbURL)
 		return
 	}
 
diff --git a/src/jetstream/plugins/monocular/chartsvc/main.go b/src/jetstream/plugins/monocular/chartsvc/main.go
index bb022f2b99..ffe1f5022d 100644
--- a/src/jetstream/plugins/monocular/chartsvc/main.go
+++ b/src/jetstream/plugins/monocular/chartsvc/main.go
@@ -107,7 +107,7 @@ func InitFDBDocLayerConnection(fdbURL *string, fDB *string, debug *bool) {
 	clientOptions := options.Client().ApplyURI(*fdbURL)
 	client, err := fdbDatastore.NewDocLayerClient(context.Background(), clientOptions)
 	if err != nil {
-		log.Fatalf("Can't create client for FoundationDB document layer: %v", err)
+		log.Fatalf("Can't create client for FoundationDB document layer: %v. URL provided was: %v.", err, *fdbURL)
 		return
 	}
 	log.Debugf("FDB Document Layer client created.")
diff --git a/src/jetstream/plugins/monocular/go.sum b/src/jetstream/plugins/monocular/go.sum
index c437df6077..80159379dd 100644
--- a/src/jetstream/plugins/monocular/go.sum
+++ b/src/jetstream/plugins/monocular/go.sum
@@ -14,6 +14,7 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
+github.com/arschles/assert v1.0.0 h1:NofQbRhtxcLgP+XoKunA7J6UMJNTqX7xR/19tej8UsA=
 github.com/arschles/assert v1.0.0/go.mod h1:m/u69zW43x0h8dTHcv3JJZljINyEYgBuf5fYJP6WikI=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index 55abbb960b..f9475bd3cd 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -41,7 +41,7 @@ func (m *Monocular) Init() error {
 	if !m.portalProxy.GetConfig().EnableTechPreview {
 		return errors.New("Feature is in Tech Preview")
 	}
-	fdbURL := "fdb service name"
+	fdbURL := "mongodb://127.0.0.1:27016"
 	fDB := "monocular-plugin"
 	debug := false
 	m.ConfigureChartSVC(&fdbURL, &fDB, &debug)
diff --git a/src/jetstream/plugins/monocular/sync.go b/src/jetstream/plugins/monocular/sync.go
index 0968106d03..599803718a 100644
--- a/src/jetstream/plugins/monocular/sync.go
+++ b/src/jetstream/plugins/monocular/sync.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	"github.com/helm/monocular/chartrepo"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -50,8 +51,7 @@ func (m *Monocular) processSyncRequests() {
 			}
 			m.portalProxy.UpdateEndointMetadata(job.Endpoint.GUID, marshalSyncMetadata(metadata))
 			//Kate TODO hit the sync container rest endpoint to trigger a sync for given repo
-			//err := chartrepo.SyncRepo(m.Store, job.Endpoint.Name, job.Endpoint.APIEndpoint.String(), "")
-			var err error
+			err := chartrepo.SyncRepo(dbClient, dbName, job.Endpoint.Name, job.Endpoint.APIEndpoint.String(), "")
 			metadata.Busy = false
 			if err != nil {
 				log.Warn("Failed to sync repository: %v+", err)

From 6eca4a61f0a0ac3e6ec6ab0f1fbb7a6720084ae1 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 14 Jan 2020 10:39:15 +0000
Subject: [PATCH 237/648] Bug fixes and tidy ups

---
 src/jetstream/plugins/kubernetes/api_proxy.go |  6 +-
 .../plugins/kubernetes/endpoint_config.go     | 97 +++++--------------
 .../plugins/kubernetes/helm_client.go         |  2 +-
 .../plugins/kubernetes/list_releases.go       | 53 ----------
 4 files changed, 26 insertions(+), 132 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/api_proxy.go b/src/jetstream/plugins/kubernetes/api_proxy.go
index ed58cff4a9..74d285d399 100644
--- a/src/jetstream/plugins/kubernetes/api_proxy.go
+++ b/src/jetstream/plugins/kubernetes/api_proxy.go
@@ -4,8 +4,6 @@ import (
 	"fmt"
 	"sync"
 
-	//	"k8s.io/client-go/rest"
-
 	// Import the OIDC auth plugin
 	_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
 
@@ -30,7 +28,6 @@ type KubeProxyResponse struct {
 // KubeProxyResponses represents response from multiple proxy requests to the Kube API
 type KubeProxyResponses map[string]interface{}
 
-
 // ProxyKubernetesAPI proxies an API request to all of the user's connected Kubernetes endpoints
 func (c *KubernetesSpecification) ProxyKubernetesAPI(userID string, f KubeProxyFunc) (KubeProxyResponses, error) {
 
@@ -41,8 +38,7 @@ func (c *KubernetesSpecification) ProxyKubernetesAPI(userID string, f KubeProxyF
 		return nil, fmt.Errorf("Could not get endpints Client for endpoint: %v+", err)
 	}
 
-
-	// TODO: Endpoint must be connected
+	// Get all connected k8s endpoints for the user
 	for _, endpoint := range eps {
 		if endpoint.CNSIType == "k8s" {
 			k8sList = append(k8sList, endpoint)
diff --git a/src/jetstream/plugins/kubernetes/endpoint_config.go b/src/jetstream/plugins/kubernetes/endpoint_config.go
index a9ff92700a..3f20fe15fc 100644
--- a/src/jetstream/plugins/kubernetes/endpoint_config.go
+++ b/src/jetstream/plugins/kubernetes/endpoint_config.go
@@ -1,9 +1,7 @@
 package kubernetes
 
 import (
-	"encoding/base64"
 	"fmt"
-	"regexp"
 
 	log "github.com/sirupsen/logrus"
 
@@ -17,52 +15,29 @@ import (
 // GetConfigForEndpoint gets a config for the Kubernetes go-client for the specified endpoint
 func (c *KubernetesSpecification) GetConfigForEndpoint(masterURL string, token interfaces.TokenRecord) (*restclient.Config, error) {
 	return clientcmd.BuildConfigFromKubeconfigGetter(masterURL, func() (*clientcmdapi.Config, error) {
-
-		name := "cluster-0"
-
-		// Create a config
-
-		// Initialize a new config
-		context := clientcmdapi.NewContext()
-		context.Cluster = name
-		context.AuthInfo = name
-
-		// Configure the cluster
-		cluster := clientcmdapi.NewCluster()
-		cluster.Server = masterURL
-		cluster.InsecureSkipTLSVerify = true
-
-		// Configure auth information
-		authInfo := clientcmdapi.NewAuthInfo()
-		err := c.addAuthInfoForEndpoint(authInfo, token)
-
-		config := clientcmdapi.NewConfig()
-		config.Clusters[name] = cluster
-		config.Contexts[name] = context
-		config.AuthInfos[name] = authInfo
-		config.CurrentContext = context.Cluster
-
-		return config, err
+		return c.getKubeConfigForEndpoint(masterURL, token, "")
 	})
-
 }
 
-func (c *KubernetesSpecification) GetKubeConfigForEndpoint(masterURL string, token interfaces.TokenRecord, namespace string) (string, error) {
+func (c *KubernetesSpecification) getKubeConfigForEndpoint(masterURL string, token interfaces.TokenRecord, namespace string) (*clientcmdapi.Config, error) {
 
-	name := "config-0"
-	clusterName := "cluster-0"
-	userName := "user-0"
+	name := "cluster-0"
 
 	// Create a config
 
 	// Initialize a new config
 	context := clientcmdapi.NewContext()
-	context.Cluster = clusterName
-	context.AuthInfo = userName
+	context.Cluster = name
+	context.AuthInfo = name
+	if len(namespace) > 0 {
+		context.Namespace = namespace
+	}
 
 	// Configure the cluster
 	cluster := clientcmdapi.NewCluster()
 	cluster.Server = masterURL
+
+	// TODO
 	cluster.InsecureSkipTLSVerify = true
 
 	// Configure auth information
@@ -70,52 +45,28 @@ func (c *KubernetesSpecification) GetKubeConfigForEndpoint(masterURL string, tok
 	err := c.addAuthInfoForEndpoint(authInfo, token)
 
 	config := clientcmdapi.NewConfig()
-	config.Clusters[clusterName] = cluster
-	config.Kind = "Config"
+	config.Clusters[name] = cluster
 	config.Contexts[name] = context
-	config.AuthInfos[userName] = authInfo
+	config.AuthInfos[name] = authInfo
 	config.CurrentContext = context.Cluster
 
-	// Convert to string
-	str := `apiVersion: v1
-kind: Config
-contexts:
-- context:
-		cluster: kube
-		user: kube
-		%s
-	name: kube
-clusters:
-- cluster:
-		insecure-skip-tls-verify: true
-		server: %s
-	name: kube
-current-context: kube
-preferences: {}
-users:
-- name: kube
-	user:
-`
-
-	nsReplace := ""
-	if len(namespace) > 0 {
-		nsReplace = fmt.Sprintf("namespace: %s", namespace)
-	}
-
-	space := regexp.MustCompile(`\t`)
-	s := space.ReplaceAllString(str, "  ")
+	return config, err
+}
 
-	// Now append the auth details
-	//log.Infof("%+v", authInfo)
+// GetKubeConfigForEndpoint gets a Kube Config file contents for the specified endpoint
+func (c *KubernetesSpecification) GetKubeConfigForEndpoint(masterURL string, token interfaces.TokenRecord, namespace string) (string, error) {
 
-	if authInfo.ClientCertificateData != nil {
-		s = fmt.Sprintf("%s    client-certificate-data: %s\n", s, base64.StdEncoding.EncodeToString(authInfo.ClientCertificateData))
+	config, err := c.getKubeConfigForEndpoint(masterURL, token, namespace)
+	if err != nil {
+		return "", err
 	}
-	if authInfo.ClientKeyData != nil {
-		s = fmt.Sprintf("%s    client-key-data: %s\n", s, base64.StdEncoding.EncodeToString(authInfo.ClientKeyData))
+
+	kconfig, err := clientcmd.Write(*config)
+	if err != nil {
+		return "", err
 	}
 
-	return fmt.Sprintf(s, nsReplace, masterURL), err
+	return string(kconfig), nil
 }
 
 func (c *KubernetesSpecification) addAuthInfoForEndpoint(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
diff --git a/src/jetstream/plugins/kubernetes/helm_client.go b/src/jetstream/plugins/kubernetes/helm_client.go
index 58d9585741..a28ae2d07f 100644
--- a/src/jetstream/plugins/kubernetes/helm_client.go
+++ b/src/jetstream/plugins/kubernetes/helm_client.go
@@ -38,10 +38,10 @@ func (f *HelmConfiguration) Cleanup() {
 	}
 }
 
+// The Helm API we use is not thead safe, so use a lock to make sure only one call at a time
 var lock sync.Mutex
 
 // GetHelmConfiguration - gets a Helm V3 client for using it as a client library
-// The Helm API we use is not thead safe, so use a lock to make sure only one call at a time
 func (c *KubernetesSpecification) GetHelmConfiguration(endpointGUID, userID, namespace string) (*action.Configuration, *HelmConfiguration, error) {
 	// Need to get a config object for the target endpoint
 	var p = c.portalProxy
diff --git a/src/jetstream/plugins/kubernetes/list_releases.go b/src/jetstream/plugins/kubernetes/list_releases.go
index 867da05e1c..0d07b0cf5c 100644
--- a/src/jetstream/plugins/kubernetes/list_releases.go
+++ b/src/jetstream/plugins/kubernetes/list_releases.go
@@ -6,63 +6,21 @@ import (
 
 	"time"
 
-	//"fmt"
-
 	"github.com/gorilla/websocket"
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
 
-	// "k8s.io/client-go/rest"
 	"helm.sh/helm/v3/pkg/action"
-	// "helm.sh/helm/v3/pkg/release"
-
-	// "k8s.io/helm/pkg/kube"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/helm"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 )
 
-// type helmReleaseInfo struct {
-// 	*release.Release
-// 	Extra     string                `json:"extra"`
-// 	Resources []helmReleaseResource `json:"resources"`
-// }
-
-// type helmReleaseResource struct {
-// 	Kind       string `json:"kind"`
-// 	APIVersion string `json:"apiVersion"`
-// 	Name       string `json:"name"`
-// }
-
 type ResourceResponse struct {
 	Kind string          `json:"kind"`
 	Data json.RawMessage `json:"data"`
 }
 
-// type KubeResource struct {
-// 	Kind       string `yaml:"kind"`
-// 	APIVersion string `yaml:"apiVersion"`
-// 	Metadata   struct {
-// 		Name string `yaml:"name"`
-// 	} `yaml:"metadata"`
-// 	Spec interface{} `yaml:"spec"`
-// }
-
-// type kubeAPIJob struct {
-// 	Kind       string
-// 	APIVersion string
-// 	Name       string
-// 	Namespace  string
-// 	Endpoint   string
-// 	User       string
-// }
-
-// type KubeAPIJobResult struct {
-// 	helm.KubeResourceJob
-// 	StatusCode int
-// 	Data       json.RawMessage
-// }
-
 type kubeReleasesData struct {
 	Endpoint  string `json:"endpoint"`
 	Name      string `json:"releaseName"`
@@ -74,17 +32,6 @@ type kubeReleasesData struct {
 	} `json:"chart"`
 }
 
-// type helmReleasesData struct {
-// 	Manifest  string `json:"endpoint"`
-// 	Name      string `json:"releaseName"`
-// 	Namespace string `json:"releaseNamespace"`
-// 	Chart     struct {
-// 		Name       string `json:"chartName"`
-// 		Repository string `json:"repo"`
-// 		Version    string `json:"version"`
-// 	} `json:"chart"`
-// }
-
 type kubeReleasesResponse map[string]kubeReleasesData
 
 // ListReleases will list the helm releases for all endpoints

From 3b4e19e67d5bc58ed85aaaf3d57fe7f4de228c8e Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 13 Jan 2020 15:47:54 +0000
Subject: [PATCH 238/648] Update Helm Release location and naming - Move Helm
 Releases table and Release Summary pages into k8s module - Rename, in ux,
 Helm Release/s to Workload/s - There's still some `TODO: RC` in there that
 I'll come back to once other parts are completed - Some TODO's related to
 legacy work, like tying in error bars and favourties to k8/helm pages -
 There's some `TODO: NWM` in there related to the new `GetRelease`
 action/endpoint

---
 .../app/custom/custom-routing.module.ts       |  22 +-
 .../create-release.component.ts               |  19 +-
 .../app/custom/helm/helm-entity-factory.ts    |  62 +----
 .../app/custom/helm/helm-entity-generator.ts  |  76 +-----
 .../app/custom/helm/helm-testing.module.ts    |   4 +-
 .../frontend/app/custom/helm/helm.module.ts   |  29 ---
 .../frontend/app/custom/helm/helm.routing.ts  |  26 --
 .../app/custom/helm/helm.store.module.ts      |   3 -
 .../helm-service-ports.component.ts           |  24 --
 .../monocular-releases-list-source.ts         |  27 ---
 .../monocular-versions-list-source.ts         |   4 +-
 .../monocular-tab-base.component.html         |   2 +
 .../monocular-tab-base.component.ts           |   3 +-
 .../chart-details-usage.component.html        |   4 +-
 .../chart-details-usage.component.scss        |   5 +
 .../helm-release-tab-base.component.html      |   4 -
 .../app/custom/helm/store/helm.actions.ts     | 161 -------------
 .../app/custom/helm/store/helm.effects.ts     | 193 +--------------
 .../app/custom/helm/store/helm.types.ts       |  90 +------
 .../releases-tab/releases-tab.component.html  |   1 -
 .../kubernetes/kubernetes-entity-factory.ts   |   4 +
 .../kubernetes/kubernetes-entity-generator.ts |   5 +-
 .../custom/kubernetes/kubernetes.module.ts    |  19 +-
 .../helm-release-pods-data-source.ts          |   1 -
 .../kubernetes-service-ports.component.ts     |   5 +
 .../helm-release-service-card.component.html  |   2 +-
 .../helm-release-service-card.component.scss  |   0
 ...elm-release-service-card.component.spec.ts |   0
 .../helm-release-service-card.component.ts    |   6 +-
 .../helm-service-ports.component.html         |  22 ++
 .../helm-service-ports.component.scss         |  11 +
 .../helm-service-ports.component.spec.ts      |   0
 .../helm-service-ports.component.ts           |  35 +++
 ...ocular-release-pods-list-config.service.ts |  23 +-
 .../monocular-release-pods-list-source.ts     |  13 +-
 ...ar-release-services-list-config.service.ts |  10 +-
 .../monocular-release-services-list-source.ts |  24 +-
 .../monocular-releases-list-config.service.ts |  14 +-
 .../monocular-releases-list-source.ts         |  28 +++
 .../helm-release-tab-base.component.html      |   4 +
 .../helm-release-tab-base.component.scss      |   0
 .../helm-release-tab-base.component.spec.ts   |   0
 .../helm-release-tab-base.component.ts        |  49 ++--
 .../tabs/helm-release-helper.service.ts       |  32 ++-
 .../helm-release-notes-tab.component.html     |   0
 .../helm-release-notes-tab.component.scss     |   0
 .../helm-release-notes-tab.component.spec.ts  |   0
 .../helm-release-notes-tab.component.ts       |   2 +-
 .../helm-release-pods-tab.component.html      |   0
 .../helm-release-pods-tab.component.scss      |   0
 .../helm-release-pods-tab.component.spec.ts   |   0
 .../helm-release-pods-tab.component.ts        |   2 +-
 ...helm-release-resource-graph.component.html |   0
 ...helm-release-resource-graph.component.scss |   0
 ...m-release-resource-graph.component.spec.ts |   0
 .../helm-release-resource-graph.component.ts  |  15 +-
 ...lm-release-resource-preview.component.html |   0
 ...lm-release-resource-preview.component.scss |   0
 ...release-resource-preview.component.spec.ts |   0
 ...helm-release-resource-preview.component.ts |  12 +-
 .../helm-release-services-tab.component.html  |   0
 .../helm-release-services-tab.component.scss  |   0
 ...elm-release-services-tab.component.spec.ts |   0
 .../helm-release-services-tab.component.ts    |   2 +-
 .../helm-release-summary-tab.component.html   |   0
 .../helm-release-summary-tab.component.scss   |   2 +-
 ...helm-release-summary-tab.component.spec.ts |   0
 .../helm-release-summary-tab.component.ts     |  26 +-
 .../helm-release-values-tab.component.html    |   0
 .../helm-release-values-tab.component.scss    |   0
 .../helm-release-values-tab.component.spec.ts |   0
 .../helm-release-values-tab.component.ts      |  10 +-
 .../releases-tab/releases-tab.component.html  |   6 +
 .../releases-tab/releases-tab.component.scss  |   0
 .../releases-tab.component.spec.ts            |   7 +-
 .../releases-tab/releases-tab.component.ts    |   3 +-
 .../store/workloads-entity-factory.ts         |  71 ++++++
 .../store/workloads-entity-generator.ts       |  92 ++++++++
 .../workloads/store/workloads.actions.ts      | 164 +++++++++++++
 .../workloads/store/workloads.effects.ts      | 223 ++++++++++++++++++
 .../workloads/store/workloads.reducers.ts}    |   2 +-
 .../workloads/store/workloads.store.module.ts |  16 ++
 .../kubernetes/workloads/workload.types.ts    |  90 +++++++
 .../kubernetes/workloads/workloads.module.ts  |  53 +++++
 .../kubernetes/workloads/workloads.routing.ts |  52 ++++
 .../packages/core/src/shared/shared.module.ts |  10 +-
 86 files changed, 1093 insertions(+), 833 deletions(-)
 delete mode 100644 custom-src/frontend/app/custom/helm/list-types/helm-service-ports/helm-service-ports.component.ts
 delete mode 100644 custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-source.ts
 delete mode 100644 custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.html
 delete mode 100644 custom-src/frontend/app/custom/helm/tabs/releases-tab/releases-tab.component.html
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/list-types/helm-release-service-card/helm-release-service-card.component.html (90%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/list-types/helm-release-service-card/helm-release-service-card.component.scss (100%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/list-types/helm-release-service-card/helm-release-service-card.component.spec.ts (100%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/list-types/helm-release-service-card/helm-release-service-card.component.ts (67%)
 create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.html
 create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.scss
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/list-types/helm-service-ports/helm-service-ports.component.spec.ts (100%)
 create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.ts
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/list-types/monocular-release-pods-list-config.service.ts (82%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/list-types/monocular-release-pods-list-source.ts (53%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/list-types/monocular-release-services-list-config.service.ts (84%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/list-types/monocular-release-services-list-source.ts (71%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/list-types/monocular-releases-list-config.service.ts (83%)
 create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-releases-list-source.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.html
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/helm-release-tab-base/helm-release-tab-base.component.scss (100%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts (100%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/helm-release-tab-base/helm-release-tab-base.component.ts (83%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-helper.service.ts (71%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.html (100%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss (100%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts (100%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts (89%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-pods/helm-release-pods-tab.component.html (100%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss (100%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts (100%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts (81%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html (100%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss (100%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts (100%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts (88%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.html (100%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.scss (100%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts (100%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts (83%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-services/helm-release-services-tab.component.html (100%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-services/helm-release-services-tab.component.scss (100%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts (100%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-services/helm-release-services-tab.component.ts (82%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html (100%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss (94%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts (100%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts (76%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html (100%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-values-tab/helm-release-values-tab.component.scss (100%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts (100%)
 rename custom-src/frontend/app/custom/{helm => kubernetes/workloads}/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts (87%)
 create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.html
 rename custom-src/frontend/app/custom/{helm/tabs => kubernetes/workloads}/releases-tab/releases-tab.component.scss (100%)
 rename custom-src/frontend/app/custom/{helm/tabs => kubernetes/workloads}/releases-tab/releases-tab.component.spec.ts (78%)
 rename custom-src/frontend/app/custom/{helm/tabs => kubernetes/workloads}/releases-tab/releases-tab.component.ts (71%)
 create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-generator.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts
 rename custom-src/frontend/app/custom/{helm/store/helm.reducers.ts => kubernetes/workloads/store/workloads.reducers.ts} (76%)
 create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.store.module.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/workloads.routing.ts

diff --git a/custom-src/frontend/app/custom/custom-routing.module.ts b/custom-src/frontend/app/custom/custom-routing.module.ts
index 42231973be..835cb19976 100644
--- a/custom-src/frontend/app/custom/custom-routing.module.ts
+++ b/custom-src/frontend/app/custom/custom-routing.module.ts
@@ -1,11 +1,10 @@
-import { DashboardBaseComponent } from './../features/dashboard/dashboard-base/dashboard-base.component';
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
 import { HELM_ENDPOINT_TYPE } from './helm/helm-entity-factory';
 import { KUBERNETES_ENDPOINT_TYPE } from './kubernetes/kubernetes-entity-factory';
 
-const kubernetes: Routes = [
+const customRoutes: Routes = [
   {
     path: 'kubernetes',
     loadChildren: './kubernetes/kubernetes.module#KubernetesModule',
@@ -19,6 +18,21 @@ const kubernetes: Routes = [
       }
     }
   },
+  {
+    path: 'workloads',
+    // loadChildren: './helm/helm.module#HelmModule',
+    loadChildren: () => import('./kubernetes/workloads/workloads.module').then(m => m.WorkloadsModule),
+    data: {
+      reuseRoute: true,
+      stratosNavigation: {
+        text: 'Workloads',
+        matIcon: 'apps',
+        // matIconFont: 'stratos-icons',
+        position: 64,
+        requiresEndpointType: KUBERNETES_ENDPOINT_TYPE // TODO: RC CHECK
+      }
+    }
+  },
   {
     path: 'monocular',
     loadChildren: './helm/helm.module#HelmModule',
@@ -32,12 +46,12 @@ const kubernetes: Routes = [
         requiresEndpointType: HELM_ENDPOINT_TYPE
       }
     }
-  }
+  },
 ];
 
 @NgModule({
   imports: [
-    RouterModule.forRoot(kubernetes),
+    RouterModule.forRoot(customRoutes),
   ],
   declarations: []
 })
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 2b09f4e7c3..56c56e900c 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
@@ -4,8 +4,9 @@ import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { MatTextareaAutosize } from '@angular/material';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
+import { EntityServiceFactory } from 'frontend/packages/store/src/entity-service-factory.service';
 import { Observable, of, Subscription } from 'rxjs';
-import { delay, filter, first, map, pairwise, switchMap, tap } from 'rxjs/operators';
+import { combineLatest, delay, filter, first, map, pairwise, switchMap, tap } from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
@@ -14,7 +15,7 @@ import { ConfirmationDialogConfig } from '../../../shared/components/confirmatio
 import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service';
 import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component';
 import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes/kubernetes-entity-factory';
-import { HELM_ENDPOINT_TYPE, helmReleaseEntityKey } from '../helm-entity-factory';
+import { helmReleaseEntityKey } from '../../kubernetes/workloads/store/workloads-entity-factory';
 import { HelmInstall } from '../store/helm.actions';
 import { HELM_INSTALLING_KEY, HelmInstallValues } from '../store/helm.types';
 
@@ -54,6 +55,7 @@ export class CreateReleaseComponent implements OnInit {
     private store: Store<AppState>,
     private httpClient: HttpClient,
     private confirmDialog: ConfirmationDialogService,
+    private esf: EntityServiceFactory
   ) {
     const chart = this.route.snapshot.params;
     this.cancelUrl = `/monocular/charts/${chart.repo}/${chart.chartName}/${chart.version}`;
@@ -133,7 +135,10 @@ export class CreateReleaseComponent implements OnInit {
     const action = new HelmInstall(values);
     this.store.dispatch(action);
 
-    const releaseEntityConfig = entityCatalog.getEntity(HELM_ENDPOINT_TYPE, helmReleaseEntityKey);
+    const releaseEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, helmReleaseEntityKey);
+
+    // TODO: RC Once we have a GetRelease action use to access new entity for info to redirect to the release page using redirectPayload
+    // this.esf.create(action.guid(), )
 
     // Wait for result of request
     return of(true).pipe(
@@ -143,15 +148,17 @@ export class CreateReleaseComponent implements OnInit {
       filter(update => !!update),
       pairwise(),
       filter(([oldVal, newVal]) => (oldVal.busy && !newVal.busy)),
-      map(([oldVal, newVal]) => newVal),
+      map(([, newVal]) => newVal),
       map(result => ({
         success: !result.error,
         redirect: !result.error,
         redirectPayload: {
-          path: 'monocular/releases'
+          path: `workloads`
         },
         message: !result.error ? '' : result.message
-      })));
+      })),
+      combineLatest()
+    );
 
   }
 
diff --git a/custom-src/frontend/app/custom/helm/helm-entity-factory.ts b/custom-src/frontend/app/custom/helm/helm-entity-factory.ts
index d9cdae9085..5bb57a9a65 100644
--- a/custom-src/frontend/app/custom/helm/helm-entity-factory.ts
+++ b/custom-src/frontend/app/custom/helm/helm-entity-factory.ts
@@ -1,35 +1,13 @@
 import { Schema, schema } from 'normalizr';
 
 import { EntitySchema } from '../../../../store/src/helpers/entity-schema';
-import {
-  HelmRelease,
-  HelmReleasePod,
-  HelmReleaseService,
-  HelmReleaseStatus,
-  HelmVersion,
-  MonocularChart,
-  HelmReleaseGraph,
-  HelmReleaseResource,
-} from './store/helm.types';
+import { HelmVersion, MonocularChart } from './store/helm.types';
 
-export const monocularChartsEntityType = 'monocularCharts';
-
-export const helmReleaseEntityKey = 'helmReleases';
 export const helmVersionsEntityType = 'helmVersions';
-export const helmReleaseStatusEntityType = 'helmReleaseStatus';
-export const helmReleasePodEntityType = 'helmReleasePod';
-export const helmReleaseServiceEntityType = 'helmReleaseService';
-export const helmReleaseGraphEntityType = 'helmReleaseGraph';
-export const helmReleaseResourceEntityType = 'helmReleaseResource';
+export const monocularChartsEntityType = 'monocularCharts';
 
 export const getMonocularChartId = (entity: MonocularChart) => entity.id;
-export const getHelmReleaseId = (entity: HelmRelease) => entity.endpointId;
 export const getHelmVersionId = (entity: HelmVersion) => entity.endpointId;
-export const getHelmReleaseStatusId = (entity: HelmReleaseStatus) => entity.endpointId;
-export const getHelmReleasePodId = (entity: HelmReleasePod) => entity.name;
-export const getHelmReleaseServiceId = (entity: HelmReleaseService) => entity.name;
-export const getHelmReleaseGraphId = (entity: HelmReleaseGraph) => entity.endpointId;
-export const getHelmReleaseReleaseId = (entity: HelmReleaseResource) => entity.endpointId;
 
 export const HELM_ENDPOINT_TYPE = 'helm';
 
@@ -61,48 +39,12 @@ entityCache[monocularChartsEntityType] = new HelmEntitySchema(
   { idAttribute: getMonocularChartId }
 );
 
-entityCache[helmReleaseEntityKey] = new HelmEntitySchema(
-  helmReleaseEntityKey,
-  {},
-  { idAttribute: getHelmReleaseId }
-);
-
 entityCache[helmVersionsEntityType] = new HelmEntitySchema(
   helmVersionsEntityType,
   {},
   { idAttribute: getHelmVersionId }
 );
 
-entityCache[helmReleaseStatusEntityType] = new HelmEntitySchema(
-  helmReleaseStatusEntityType,
-  {},
-  { idAttribute: getHelmReleaseStatusId }
-);
-
-entityCache[helmReleasePodEntityType] = new HelmEntitySchema(
-  helmReleasePodEntityType,
-  {},
-  { idAttribute: getHelmReleasePodId }
-);
-
-entityCache[helmReleaseServiceEntityType] = new HelmEntitySchema(
-  helmReleaseServiceEntityType,
-  {},
-  { idAttribute: getHelmReleaseServiceId }
-);
-
-entityCache[helmReleaseGraphEntityType] = new HelmEntitySchema(
-  helmReleaseGraphEntityType,
-  {},
-  { idAttribute: getHelmReleaseGraphId }
-);
-
-entityCache[helmReleaseResourceEntityType] = new HelmEntitySchema(
-  helmReleaseResourceEntityType,
-  {},
-  { idAttribute: getHelmReleaseReleaseId }
-);
-
 export function helmEntityFactory(key: string): EntitySchema {
   const entity = entityCache[key];
   if (!entity) {
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 fedc2805a2..0aa67e1db5 100644
--- a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
+++ b/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
@@ -8,25 +8,10 @@ import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.ty
 import {
   HELM_ENDPOINT_TYPE,
   helmEntityFactory,
-  helmReleaseEntityKey,
-  helmReleasePodEntityType,
-  helmReleaseServiceEntityType,
-  helmReleaseStatusEntityType,
-  helmReleaseGraphEntityType,
   helmVersionsEntityType,
   monocularChartsEntityType,
-  helmReleaseResourceEntityType,
 } from './helm-entity-factory';
-import {
-  HelmRelease,
-  HelmReleasePod,
-  HelmReleaseService,
-  HelmReleaseStatus,
-  HelmVersion,
-  MonocularChart,
-  HelmReleaseGraph,
-  HelmReleaseResource,
-} from './store/helm.types';
+import { HelmVersion, MonocularChart } from './store/helm.types';
 
 
 export function generateHelmEntities(): StratosBaseCatalogEntity[] {
@@ -46,13 +31,7 @@ export function generateHelmEntities(): StratosBaseCatalogEntity[] {
   return [
     generateEndpointEntity(endpointDefinition),
     generateChartEntity(endpointDefinition),
-    generateReleaseEntity(endpointDefinition),
     generateVersionEntity(endpointDefinition),
-    generateReleaseStatusEntity(endpointDefinition),
-    generateReleasePodEntity(endpointDefinition),
-    generateReleaseServiceEntity(endpointDefinition),
-    generateReleaseGraphEntity(endpointDefinition),
-    generateReleaseResourceEntity(endpointDefinition),
   ];
 }
 
@@ -72,15 +51,6 @@ function generateChartEntity(endpointDefinition: StratosEndpointExtensionDefinit
   return new StratosCatalogEntity<IFavoriteMetadata, MonocularChart>(definition);
 }
 
-function generateReleaseEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
-    type: helmReleaseEntityKey,
-    schema: helmEntityFactory(helmReleaseEntityKey),
-    endpoint: endpointDefinition
-  };
-  return new StratosCatalogEntity<IFavoriteMetadata, HelmRelease>(definition);
-}
-
 function generateVersionEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   const definition = {
     type: helmVersionsEntityType,
@@ -90,48 +60,4 @@ function generateVersionEntity(endpointDefinition: StratosEndpointExtensionDefin
   return new StratosCatalogEntity<IFavoriteMetadata, HelmVersion>(definition);
 }
 
-function generateReleaseStatusEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
-    type: helmReleaseStatusEntityType,
-    schema: helmEntityFactory(helmReleaseStatusEntityType),
-    endpoint: endpointDefinition
-  };
-  return new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseStatus>(definition);
-}
-
-function generateReleasePodEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
-    type: helmReleasePodEntityType,
-    schema: helmEntityFactory(helmReleasePodEntityType),
-    endpoint: endpointDefinition
-  };
-  return new StratosCatalogEntity<IFavoriteMetadata, HelmReleasePod>(definition);
-}
-
-function generateReleaseServiceEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
-    type: helmReleaseServiceEntityType,
-    schema: helmEntityFactory(helmReleaseServiceEntityType),
-    endpoint: endpointDefinition
-  };
-  return new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseService>(definition);
-}
-
-function generateReleaseGraphEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
-    type: helmReleaseGraphEntityType,
-    schema: helmEntityFactory(helmReleaseGraphEntityType),
-    endpoint: endpointDefinition
-  };
-  return new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseGraph>(definition);
-}
-
-function generateReleaseResourceEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
-    type: helmReleaseResourceEntityType,
-    schema: helmEntityFactory(helmReleaseResourceEntityType),
-    endpoint: endpointDefinition
-  };
-  return new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseResource>(definition);
-}
 
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 337281cb14..cd66fa5963 100644
--- a/custom-src/frontend/app/custom/helm/helm-testing.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm-testing.module.ts
@@ -10,9 +10,9 @@ import { createBasicStoreModule } from '../../../../store/testing/public-api';
 import { generateStratosEntities } from '../../base-entity-types';
 import { CoreModule } from '../../core/core.module';
 import { SharedModule } from '../../shared/shared.module';
+import { HelmReleaseHelperService } from '../kubernetes/workloads/release/tabs/helm-release-helper.service';
+import { HelmReleaseGuid } from '../kubernetes/workloads/workload.types';
 import { generateHelmEntities } from './helm-entity-generator';
-import { HelmReleaseHelperService } from './release/tabs/helm-release-helper.service';
-import { HelmReleaseGuid } from './store/helm.types';
 
 @NgModule({
   imports: [{
diff --git a/custom-src/frontend/app/custom/helm/helm.module.ts b/custom-src/frontend/app/custom/helm/helm.module.ts
index 0fb1ddca98..4a375945ae 100644
--- a/custom-src/frontend/app/custom/helm/helm.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm.module.ts
@@ -1,4 +1,3 @@
-import { HelmReleaseResourceGraphComponent } from './release/tabs/helm-release-resource-graph/helm-release-resource-graph.component';
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 
@@ -7,8 +6,6 @@ import { SharedModule } from '../../shared/shared.module';
 import { MonocularChartViewComponent } from './chart-view/monocular.component';
 import { CreateReleaseModule } from './create-release/create-release.module';
 import { HelmRoutingModule } from './helm.routing';
-import { HelmReleaseServiceCardComponent } from './list-types/helm-release-service-card/helm-release-service-card.component';
-import { HelmServicePortsComponent } from './list-types/helm-service-ports/helm-service-ports.component';
 import { MonocularChartCardComponent } from './list-types/monocular-chart-card/monocular-chart-card.component';
 import { MonocularTabBaseComponent } from './monocular-tab-base/monocular-tab-base.component';
 import { ChartDetailsInfoComponent } from './monocular/chart-details/chart-details-info/chart-details-info.component';
@@ -30,18 +27,8 @@ import { ChartsService } from './monocular/shared/services/charts.service';
 import { ConfigService } from './monocular/shared/services/config.service';
 import { MenuService } from './monocular/shared/services/menu.service';
 import { ReposService } from './monocular/shared/services/repos.service';
-import { HelmReleaseTabBaseComponent } from './release/helm-release-tab-base/helm-release-tab-base.component';
-import { HelmReleasePodsTabComponent } from './release/tabs//helm-release-pods/helm-release-pods-tab.component';
-import { HelmReleaseNotesTabComponent } from './release/tabs/helm-release-notes-tab/helm-release-notes-tab.component';
-import { HelmReleaseServicesTabComponent } from './release/tabs/helm-release-services/helm-release-services-tab.component';
-import { HelmReleaseSummaryTabComponent } from './release/tabs/helm-release-summary-tab/helm-release-summary-tab.component';
-import { HelmReleaseValuesTabComponent } from './release/tabs/helm-release-values-tab/helm-release-values-tab.component';
-import { HelmReleaseResourcePreviewComponent} from './release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component';
 import { CatalogTabComponent } from './tabs/catalog-tab/catalog-tab.component';
-import { HelmReleasesTabComponent } from './tabs/releases-tab/releases-tab.component';
 import { RepositoryTabComponent } from './tabs/repository-tab/repository-tab.component';
-import { KubernetesModule } from '../kubernetes/kubernetes.module';
-import { NgxGraphModule } from '@swimlane/ngx-graph';
 
 @NgModule({
   imports: [
@@ -50,8 +37,6 @@ import { NgxGraphModule } from '@swimlane/ngx-graph';
     SharedModule,
     HelmRoutingModule,
     CreateReleaseModule,
-    KubernetesModule,
-    NgxGraphModule,
   ],
   declarations: [
     PanelComponent,
@@ -71,19 +56,8 @@ import { NgxGraphModule } from '@swimlane/ngx-graph';
     MonocularTabBaseComponent,
     RepositoryTabComponent,
     CatalogTabComponent,
-    HelmReleasesTabComponent,
     MonocularChartCardComponent,
-    HelmReleaseServiceCardComponent,
     MonocularChartViewComponent,
-    HelmReleaseTabBaseComponent,
-    HelmReleaseSummaryTabComponent,
-    HelmReleaseNotesTabComponent,
-    HelmReleaseValuesTabComponent,
-    HelmReleasePodsTabComponent,
-    HelmReleaseServicesTabComponent,
-    HelmServicePortsComponent,
-    HelmReleaseResourceGraphComponent,
-    HelmReleaseResourcePreviewComponent,
   ],
   providers: [
     ChartsService,
@@ -93,9 +67,6 @@ import { NgxGraphModule } from '@swimlane/ngx-graph';
   ],
   entryComponents: [
     MonocularChartCardComponent,
-    HelmReleaseServiceCardComponent,
-    HelmServicePortsComponent,
-    HelmReleaseResourcePreviewComponent,
   ]
 })
 export class HelmModule { }
diff --git a/custom-src/frontend/app/custom/helm/helm.routing.ts b/custom-src/frontend/app/custom/helm/helm.routing.ts
index 80c2660c7e..0f67b21db6 100644
--- a/custom-src/frontend/app/custom/helm/helm.routing.ts
+++ b/custom-src/frontend/app/custom/helm/helm.routing.ts
@@ -4,16 +4,8 @@ import { RouterModule, Routes } from '@angular/router';
 import { MonocularChartViewComponent } from './chart-view/monocular.component';
 import { CreateReleaseComponent } from './create-release/create-release.component';
 import { MonocularTabBaseComponent } from './monocular-tab-base/monocular-tab-base.component';
-import { HelmReleaseTabBaseComponent } from './release/helm-release-tab-base/helm-release-tab-base.component';
-import { HelmReleaseNotesTabComponent } from './release/tabs/helm-release-notes-tab/helm-release-notes-tab.component';
-import { HelmReleasePodsTabComponent } from './release/tabs/helm-release-pods/helm-release-pods-tab.component';
-import { HelmReleaseServicesTabComponent } from './release/tabs/helm-release-services/helm-release-services-tab.component';
-import { HelmReleaseSummaryTabComponent } from './release/tabs/helm-release-summary-tab/helm-release-summary-tab.component';
-import { HelmReleaseValuesTabComponent } from './release/tabs/helm-release-values-tab/helm-release-values-tab.component';
 import { CatalogTabComponent } from './tabs/catalog-tab/catalog-tab.component';
-import { HelmReleasesTabComponent } from './tabs/releases-tab/releases-tab.component';
 import { RepositoryTabComponent } from './tabs/repository-tab/repository-tab.component';
-import { HelmReleaseResourceGraphComponent } from './release/tabs/helm-release-resource-graph/helm-release-resource-graph.component';
 
 const monocular: Routes = [
   {
@@ -25,24 +17,6 @@ const monocular: Routes = [
       { path: 'charts/:repo', component: CatalogTabComponent },
       { path: 'repos', component: RepositoryTabComponent },
       { path: 'repos/:guid', component: RepositoryTabComponent },
-      { path: 'releases', component: HelmReleasesTabComponent },
-    ]
-  },
-  {
-    // Helm Release Views
-    path: 'releases/:guid',
-    component: HelmReleaseTabBaseComponent,
-    data: {
-      reuseRoute: HelmReleaseTabBaseComponent,
-    },
-    children: [
-      { path: '', redirectTo: 'summary', pathMatch: 'full' },
-      { path: 'summary', component: HelmReleaseSummaryTabComponent },
-      { path: 'notes', component: HelmReleaseNotesTabComponent },
-      { path: 'values', component: HelmReleaseValuesTabComponent },
-      { path: 'pods', component: HelmReleasePodsTabComponent },
-      { path: 'services', component: HelmReleaseServicesTabComponent },
-      { path: 'graph', component: HelmReleaseResourceGraphComponent }
     ]
   },
   { pathMatch: 'full', path: 'charts/:repo/:chartName/:version', component: MonocularChartViewComponent },
diff --git a/custom-src/frontend/app/custom/helm/helm.store.module.ts b/custom-src/frontend/app/custom/helm/helm.store.module.ts
index c65d792a2d..481eaae349 100644
--- a/custom-src/frontend/app/custom/helm/helm.store.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm.store.module.ts
@@ -2,15 +2,12 @@ import { NgModule } from '@angular/core';
 import { EffectsModule } from '@ngrx/effects';
 
 import { HelmEffects } from './store/helm.effects';
-import { StoreModule } from '@ngrx/store';
-import { helmReleaseReducer } from './store/helm.reducers';
 
 @NgModule({
   imports: [
     EffectsModule.forFeature([
       HelmEffects
     ]),
-    StoreModule.forFeature('helmRelease', helmReleaseReducer),
   ]
 })
 export class HelmStoreModule { }
diff --git a/custom-src/frontend/app/custom/helm/list-types/helm-service-ports/helm-service-ports.component.ts b/custom-src/frontend/app/custom/helm/list-types/helm-service-ports/helm-service-ports.component.ts
deleted file mode 100644
index c0a8203af3..0000000000
--- a/custom-src/frontend/app/custom/helm/list-types/helm-service-ports/helm-service-ports.component.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Component, Input } from '@angular/core';
-
-import {
-  KubernetesServicePortsComponent,
-} from '../../../kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component';
-import { HelmReleaseService } from '../../store/helm.types';
-
-@Component({
-  selector: 'app-helm-service-ports',
-  templateUrl: '../../../kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html',
-  styleUrls: ['../../../kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.scss']
-})
-export class HelmServicePortsComponent extends KubernetesServicePortsComponent {
-
-  @Input() set row(row: any) {
-    if (!row) {
-      return;
-    }
-    console.log(row);
-    const helmReleaseService = (row as HelmReleaseService);
-    // this.kubeService$ = helmReleaseService.kubeService$;
-    this.endpointId = helmReleaseService.endpointId;
-  }
-}
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-source.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-source.ts
deleted file mode 100644
index f5b362fbd3..0000000000
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-source.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Store } from '@ngrx/store';
-
-import { AppState } from '../../../../../store/src/app-state';
-import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
-import { IListConfig } from '../../../shared/components/list/list.component.types';
-import { getHelmReleaseId, helmEntityFactory, helmReleaseEntityKey } from '../helm-entity-factory';
-import { GetHelmReleases } from '../store/helm.actions';
-import { HelmRelease } from '../store/helm.types';
-
-export class HelmReleasesDataSource extends ListDataSource<HelmRelease> {
-
-  constructor(
-    store: Store<AppState>,
-    listConfig: IListConfig<HelmRelease>
-  ) {
-    const action = new GetHelmReleases();
-    super({
-      store,
-      action,
-      schema: helmEntityFactory(helmReleaseEntityKey),
-      getRowUniqueId: getHelmReleaseId,
-      paginationKey: action.paginationKey,
-      isLocal: true,
-      listConfig
-    });
-  }
-}
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-source.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-source.ts
index deb3181630..ed1f8ca297 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-source.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-source.ts
@@ -3,7 +3,7 @@ import { Store } from '@ngrx/store';
 import { AppState } from '../../../../../store/src/app-state';
 import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../shared/components/list/list.component.types';
-import { getHelmVersionId, helmEntityFactory } from '../helm-entity-factory';
+import { helmEntityFactory } from '../helm-entity-factory';
 import { GetHelmVersions } from '../store/helm.actions';
 import { HelmVersion } from '../store/helm.types';
 
@@ -18,7 +18,7 @@ export class HelmVersionsDataSource extends ListDataSource<HelmVersion> {
       store,
       action,
       schema: helmEntityFactory(action.entityType),
-      getRowUniqueId: getHelmVersionId,
+      getRowUniqueId: (entity: HelmVersion) => entity.endpointId,
       paginationKey: action.paginationKey,
       isLocal: true,
       listConfig,
diff --git a/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.html b/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.html
index 68143c7ff4..08378bd421 100644
--- a/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.html
+++ b/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.html
@@ -1,3 +1,5 @@
+<!-- // TODO: RC should have [endpointIds$] which handles header events -->
+<!-- // TODO: RC should have favourites config -->
 <app-page-header tabsHeader="Helm" [tabs]="tabLinks">
   <h1>Helm</h1>
 </app-page-header>
diff --git a/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.ts b/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.ts
index 9a512b3415..69fc94e14c 100644
--- a/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.ts
+++ b/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.ts
@@ -9,8 +9,7 @@ export class MonocularTabBaseComponent {
 
   tabLinks = [
     { link: 'charts', label: 'Charts', icon: 'folder_open' },
-    { link: 'repos', label: 'Repositories', icon: 'products', iconFont: 'stratos-icons' },
-    { link: 'releases', label: 'Releases', icon: 'apps' },
+    { link: 'repos', label: 'Repositories', icon: 'products', iconFont: 'stratos-icons' }
   ];
 
 }
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html
index 105979a113..4058bb6801 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html
@@ -8,7 +8,7 @@ <h1>Install</h1>
     </mat-tab>
 
     <mat-tab label="Helm CLI">
-      <div *ngIf="showRepoInstructions" class="chart-details-usage__repository">
+      <div *ngIf="showRepoInstructions" class="chart-details-usage__repository chart-details-usage__section">
         <h2 class="chart-details-usage__label">Add {{ chart.attributes.repo.name }} repository</h2>
         <mat-form-field>
           <input matInput floatingPlaceholder=false [value]=repoAddInstructions>
@@ -17,7 +17,7 @@ <h2 class="chart-details-usage__label">Add {{ chart.attributes.repo.name }} repo
           <mat-icon svgIcon="content-copy"></mat-icon>
         </button>
       </div>
-      <div>
+      <div class="chart-details-usage__section">
         <h2 class="chart-details-usage__label">Install chart</h2>
         <mat-form-field>
           <input matInput readonly floatingPlaceholder=false [value]=installInstructions>
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.scss b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.scss
index fa09897191..f74db6a81e 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.scss
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.scss
@@ -21,6 +21,11 @@ mat-tab-body {
     margin-bottom: 1.5em;
   }
 
+  &__section {
+    display: flex;
+    flex-direction: column;
+  }
+
   .mat-input-element {
     .mat-input-wrapper {
       margin: 1em 0 .5em;
diff --git a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.html b/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.html
deleted file mode 100644
index 84b2bd06a1..0000000000
--- a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<app-page-header tabsHeader="Release" [tabs]="tabLinks" [breadcrumbs]="breadcrumbs">
-  <h1>{{ title }}</h1>
-</app-page-header>
-<router-outlet></router-outlet>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/store/helm.actions.ts b/custom-src/frontend/app/custom/helm/store/helm.actions.ts
index 6041671ae4..6341e176a4 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.actions.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.actions.ts
@@ -1,22 +1,12 @@
-import {
-  KUBERNETES_ENDPOINT_TYPE,
-  kubernetesPodsEntityType,
-  kubernetesServicesEntityType,
-  kubernetesEntityFactory} from '../../kubernetes/kubernetes-entity-factory';
 import { Action } from '@ngrx/store';
 
 import { EntityRequestAction } from '../../../../../store/src/types/request.types';
 import {
   HELM_ENDPOINT_TYPE,
   helmEntityFactory,
-  helmReleaseEntityKey,
-  helmReleaseStatusEntityType,
   helmVersionsEntityType,
-  helmReleaseGraphEntityType,
   monocularChartsEntityType,
-  helmReleaseResourceEntityType,
 } from '../helm-entity-factory';
-
 import { PaginatedAction } from './../../../../../store/src/types/pagination.types';
 import { HelmInstallValues } from './helm.types';
 
@@ -24,34 +14,14 @@ export const GET_MONOCULAR_CHARTS = '[Monocular] Get Charts';
 export const GET_MONOCULAR_CHARTS_SUCCESS = '[Monocular] Get Charts Success';
 export const GET_MONOCULAR_CHARTS_FAILURE = '[Monocular] Get Charts Failure';
 
-export const GET_HELM_RELEASES = '[Helm] Get Releases';
-export const GET_HELM_RELEASES_SUCCESS = '[Helm] Get Releases Success';
-export const GET_HELM_RELEASES_FAILURE = '[Helm] Get Releases Failure';
-
 export const GET_HELM_VERSIONS = '[Helm] Get Versions';
 export const GET_HELM_VERSIONS_SUCCESS = '[Helm] Get Versions Success';
 export const GET_HELM_VERSIONS_FAILURE = '[Helm] Get Versions Failure';
 
-export const GET_HELM_RELEASE_STATUS = '[Helm] Get Release Status';
-export const GET_HELM_RELEASE_STATUS_SUCCESS = '[Helm] Get Release Status Success';
-export const GET_HELM_RELEASE_STATUS_FAILURE = '[Helm] Get Release Status Failure';
-
-export const GET_HELM_RELEASE_PODS = '[Helm] Get Release Pods';
-export const GET_HELM_RELEASE_PODS_SUCCESS = '[Helm] Get Release Pods Success';
-export const GET_HELM_RELEASE_PODS_FAILURE = '[Helm] Get Release Pods Failure';
-
-export const GET_HELM_RELEASE_SERVICES = '[Helm] Get Release Services';
-export const GET_HELM_RELEASE_SERVICES_SUCCESS = '[Helm] Get Release Services Success';
-export const GET_HELM_RELEASE_SERVICES_FAILURE = '[Helm] Get Release Services Failure';
-
 export const HELM_INSTALL = '[Helm] Install';
 export const HELM_INSTALL_SUCCESS = '[Helm] Install Success';
 export const HELM_INSTALL_FAILURE = '[Helm] Install Failure';
 
-export const UPDATE_HELM_RELEASE_STATUS = '[Helm] Update Release Status [WS]';
-export const UPDATE_HELM_RELEASE_STATUS_SUCCESS = '[Helm] Update Release Status [WS] Success';
-export const UPDATE_HELM_RELEASE_STATUS_FAILURE  = '[Helm] Update Release Status [WS] Failure';
-
 export interface MonocularPaginationAction extends PaginatedAction, EntityRequestAction { }
 
 export class GetMonocularCharts implements MonocularPaginationAction {
@@ -75,26 +45,6 @@ export class GetMonocularCharts implements MonocularPaginationAction {
 }
 
 
-export class GetHelmReleases implements MonocularPaginationAction {
-  constructor() {
-    this.paginationKey = 'helm-releases';
-  }
-  type = GET_HELM_RELEASES;
-  endpointType = HELM_ENDPOINT_TYPE;
-  entityType = helmReleaseEntityKey;
-  entity = [helmEntityFactory(helmReleaseEntityKey)];
-  actions = [
-    GET_HELM_RELEASES,
-    GET_HELM_RELEASES_SUCCESS,
-    GET_HELM_RELEASES_FAILURE
-  ];
-  paginationKey: string;
-  initialParams = {
-    'order-direction': 'desc',
-    'order-direction-field': 'name',
-  };
-}
-
 export class GetHelmVersions implements MonocularPaginationAction {
   constructor() {
     this.paginationKey = 'helm-versions';
@@ -115,120 +65,9 @@ export class GetHelmVersions implements MonocularPaginationAction {
   };
 }
 
-export class GetHelmReleaseStatus implements EntityRequestAction {
-  key: string;
-  constructor(
-    public endpointGuid: string,
-    public releaseTitle: string
-  ) {
-    this.key = `${endpointGuid}/${releaseTitle}`;
-  }
-  type = GET_HELM_RELEASE_STATUS;
-  endpointType = HELM_ENDPOINT_TYPE;
-  entity = helmEntityFactory(helmReleaseStatusEntityType);
-  entityType = helmReleaseStatusEntityType;
-  actions = [
-    GET_HELM_RELEASE_STATUS,
-    GET_HELM_RELEASE_STATUS_SUCCESS,
-    GET_HELM_RELEASE_STATUS_FAILURE
-  ];
-}
-
-// Never dispateched - just used for look-up
-// Don't know why I need an action for this rather than an entity type?
-export class GetHelmReleaseGraph implements EntityRequestAction {
-  key: string;
-  constructor(
-    public endpointGuid: string,
-    public releaseTitle: string
-  ) {
-    this.key = `${endpointGuid}-${releaseTitle}`;
-  }
-  type = this.constructor.name;
-  endpointType = HELM_ENDPOINT_TYPE;
-  entity = helmEntityFactory(helmReleaseGraphEntityType);
-  entityType = helmReleaseGraphEntityType;
-  actions = [this.type];
-}
-
-// Never dispateched - just used for look-up
-// Don't know why I need an action for this rather than an entity type?
-export class GetHelmReleaseResource implements EntityRequestAction {
-  key: string;
-  constructor(
-    public endpointGuid: string,
-    public releaseTitle: string
-  ) {
-    this.key = `${endpointGuid}-${releaseTitle}`;
-  }
-  type = this.constructor.name;
-  endpointType = HELM_ENDPOINT_TYPE;
-  entity = helmEntityFactory(helmReleaseResourceEntityType);
-  entityType = helmReleaseResourceEntityType;
-  actions = [this.type];
-}
-
-
-export class GetHelmReleasePods implements MonocularPaginationAction {
-  constructor(
-    public endpointGuid: string,
-    public releaseTitle: string
-  ) {
-    this.paginationKey = `${endpointGuid}/${releaseTitle}/pods`;
-  }
-  type = GET_HELM_RELEASE_PODS;
-  endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entityType = kubernetesPodsEntityType;
-  entity = [kubernetesEntityFactory(kubernetesPodsEntityType)];
-  actions = [
-    GET_HELM_RELEASE_PODS,
-    GET_HELM_RELEASE_PODS_SUCCESS,
-    GET_HELM_RELEASE_PODS_FAILURE
-  ];
-  paginationKey: string;
-  initialParams = {
-    'order-direction': 'asc',
-    'order-direction-field': 'name',
-  };
-  static createKey = (endpointGuid: string, releaseTitle: string, name: string): string => {
-    return `${endpointGuid}/${releaseTitle}/${name}`;
-  }
-}
-
-export class GetHelmReleaseServices implements MonocularPaginationAction {
-  constructor(
-    public endpointGuid: string,
-    public releaseTitle: string
-  ) {
-    this.paginationKey = `${endpointGuid}/${releaseTitle}/services`;
-  }
-  type = GET_HELM_RELEASE_SERVICES;
-  endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entityType = kubernetesServicesEntityType;
-  entity = [kubernetesEntityFactory(kubernetesServicesEntityType)];
-  actions = [
-    GET_HELM_RELEASE_SERVICES,
-    GET_HELM_RELEASE_SERVICES_SUCCESS,
-    GET_HELM_RELEASE_SERVICES_FAILURE
-  ];
-  paginationKey: string;
-  initialParams = {
-    'order-direction': 'asc',
-    'order-direction-field': 'name',
-  };
-  static createKey = (endpointGuid: string, releaseTitle: string, name: string): string => {
-    return `${endpointGuid}/${releaseTitle}/${name}`;
-  }
-}
-
 export class HelmInstall implements Action {
   constructor(public values: HelmInstallValues) { }
   type = HELM_INSTALL;
   public guid = () => '<New Release>' + this.values.releaseName;
 }
 
-export class HelmUpdateRelease implements Action {
-  constructor(public values: any) { }
-  type = UPDATE_HELM_RELEASE_STATUS;
-  // public guid = () => '<New Release>' + this.values.releaseName;
-}
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 f9885b09ba..33fa1e70c6 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.effects.ts
@@ -2,46 +2,31 @@ 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 { Observable } from 'rxjs';
-import { catchError, flatMap, mergeMap } from 'rxjs/operators';
-
-import { ClearPaginationOfType } from '../../../../../store/src/actions/pagination.actions';
-import { AppState } from '../../../../../store/src/app-state';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
-import { NormalizedResponse } from '../../../../../store/src/types/api.types';
+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 { NormalizedResponse } from 'frontend/packages/store/src/types/api.types';
 import {
   EntityRequestAction,
   StartRequestAction,
   WrapperRequestActionFailed,
   WrapperRequestActionSuccess,
-} from '../../../../../store/src/types/request.types';
+} from 'frontend/packages/store/src/types/request.types';
+import { Observable } from 'rxjs';
+import { catchError, flatMap, mergeMap } from 'rxjs/operators';
+
 import { environment } from '../../../environments/environment';
-import { HELM_ENDPOINT_TYPE, helmReleaseEntityKey } from '../helm-entity-factory';
+import { helmReleaseEntityKey } from '../../kubernetes/workloads/store/workloads-entity-factory';
+import { HELM_ENDPOINT_TYPE } from '../helm-entity-factory';
 import {
-  GET_HELM_RELEASE_PODS,
-  GET_HELM_RELEASE_SERVICES,
-  GET_HELM_RELEASE_STATUS,
-  GET_HELM_RELEASES,
   GET_HELM_VERSIONS,
   GET_MONOCULAR_CHARTS,
-  GetHelmReleasePods,
-  GetHelmReleases,
-  GetHelmReleaseServices,
-  GetHelmReleaseStatus,
   GetHelmVersions,
   GetMonocularCharts,
   HELM_INSTALL,
   HelmInstall,
 } from './helm.actions';
-import {
-  HELM_INSTALLING_KEY,
-  HelmRelease,
-  HelmReleasePod,
-  HelmReleaseService,
-  HelmReleaseStatus,
-  HelmStatus,
-  HelmVersion,
-} from './helm.types';
+import { HELM_INSTALLING_KEY, HelmVersion } from './helm.types';
 
 @Injectable()
 export class HelmEffects {
@@ -79,48 +64,6 @@ export class HelmEffects {
     })
   );
 
-
-  @Effect()
-  fetchReleases$ = this.actions$.pipe(
-    ofType<GetHelmReleases>(GET_HELM_RELEASES),
-    flatMap(action => {
-      const entityKey = entityCatalog.getEntityKey(action);
-      return this.makeRequest(action, `/pp/${this.proxyAPIVersion}/helm/releases`, (response) => {
-        const processedData = {
-          entities: { [entityKey]: {} },
-          result: []
-        } as NormalizedResponse;
-
-        // Go through each endpoint ID
-        Object.keys(response).forEach(endpoint => {
-          const endpointData = response[endpoint];
-          if (!endpointData) {
-            return;
-          }
-          endpointData.forEach((data) => {
-            console.log('Got helm release');
-            console.log(data);
-            const helmRelease: HelmRelease = {
-              ...data,
-              endpointId: endpoint
-            };
-            // Release name is unique for an endpoint - for Helm 3, include the namespace
-            const id = endpoint + ':' + data.namespace + ':' + data.name;
-            helmRelease.guid = id;
-            // Make a note of the guid of the endpoint for the release
-            helmRelease.status = mapHelmStatus(data.info.status);
-            helmRelease.lastDeployed = mapHelmModifiedDate(data.info.last_deployed);
-            helmRelease.firstDeployed = mapHelmModifiedDate(data.info.first_deployed);
-            // data.info =
-            processedData.entities[entityKey][id] = helmRelease;
-            processedData.result.push(id);
-          });
-        });
-        return processedData;
-      }, []);
-    })
-  );
-
   @Effect()
   fetchVersions$ = this.actions$.pipe(
     ofType<GetHelmVersions>(GET_HELM_VERSIONS),
@@ -149,60 +92,12 @@ export class HelmEffects {
     })
   );
 
-  @Effect()
-  fetchHelmReleaseStatus$ = this.actions$.pipe(
-    ofType<GetHelmReleaseStatus>(GET_HELM_RELEASE_STATUS),
-    flatMap(action => {
-      const entityKey = entityCatalog.getEntityKey(action);
-      return this.makeRequest(
-        action,
-        `/pp/${this.proxyAPIVersion}/helm/releases/${action.endpointGuid}/${action.releaseTitle}`,
-        (response) => {
-          const processedData = {
-            entities: { [entityKey]: {} },
-            result: []
-          } as NormalizedResponse;
-
-          const status = {};
-
-          // TODO
-
-          // this.updateReleasePods(action, status);
-
-          // this.updateReleaseServices(action, status);
-
-          // Go through each endpoint ID
-          const newStatus: HelmReleaseStatus = {
-            endpointId: action.endpointGuid,
-            releaseTitle: action.releaseTitle,
-            ...status,
-            pods: [],
-            fields: [],
-            data: {
-              'v1/Pod': {},
-              'v1/Service': {}
-            }
-          };
-          processedData.entities[entityKey][action.key] = newStatus;
-          processedData.result.push(action.key);
-          return processedData;
-        }, [action.endpointGuid]);
-    })
-  );
-
   // @Effect()
   // fetchHelmReleasePods$ = this.actions$.pipe(
   //   ofType<GetHelmReleasePods>(GET_HELM_RELEASE_PODS),
   //   mergeMap(action => [new GetHelmReleaseStatus(action.endpointGuid, action.releaseTitle)])
   // );
 
-  @Effect()
-  fetchHelmReleaseServices$ = this.actions$.pipe(
-    ofType<GetHelmReleaseServices>(GET_HELM_RELEASE_SERVICES),
-    mergeMap(action => [new GetHelmReleaseStatus(action.endpointGuid, action.releaseTitle)])
-  );
-
-
   @Effect()
   helmInstall$ = this.actions$.pipe(
     ofType<HelmInstall>(HELM_INSTALL),
@@ -269,70 +164,4 @@ export class HelmEffects {
     );
   }
 
-  private updateReleasePods(action: GetHelmReleaseStatus, status: HelmReleaseStatus) {
-    const releasePodsAction = new GetHelmReleasePods(action.endpointGuid, action.releaseTitle);
-    const pods = Object.values(status.data['v1/Pod']).reduce((res, pod) => {
-      const newPod: HelmReleasePod = {
-        endpointId: action.endpointGuid,
-        releaseTitle: action.releaseTitle,
-        ...pod
-      };
-      res[GetHelmReleasePods.createKey(action.endpointGuid, action.releaseTitle, pod.name)] = newPod;
-      return res;
-    }, {});
-    const keys = Object.keys(pods);
-    const releasePods = {
-      entities: { [entityCatalog.getEntityKey(releasePodsAction)]: pods },
-      result: keys
-    } as NormalizedResponse;
-    this.store.dispatch(new WrapperRequestActionSuccess(
-      releasePods,
-      releasePodsAction,
-      'fetch',
-      keys.length,
-      1)
-    );
-  }
-
-  private updateReleaseServices(action: GetHelmReleaseStatus, status: HelmReleaseStatus) {
-    const releaseServiceAction = new GetHelmReleaseServices(action.endpointGuid, action.releaseTitle);
-    const services = Object.values(status.data['v1/Service']).reduce((res, service) => {
-      const newService = {
-        endpointId: action.endpointGuid,
-        releaseTitle: action.releaseTitle,
-        ...service
-      } as HelmReleaseService;
-      res[GetHelmReleasePods.createKey(action.endpointGuid, action.releaseTitle, service.name)] = newService;
-      return res;
-    }, {});
-    const keys = Object.keys(services);
-    const releaseServices = {
-      entities: { [entityCatalog.getEntityKey(releaseServiceAction)]: services },
-      result: keys
-    } as NormalizedResponse;
-    this.store.dispatch(new WrapperRequestActionSuccess(
-      releaseServices,
-      releaseServiceAction,
-      'fetch',
-      keys.length,
-      1)
-    );
-  }
 }
-
-function _mapHelmStatus(status: number) {
-  return HelmStatus[status].replace('_', ' ');
-}
-
-function mapHelmStatus(status: string) {
-  // TODO: Capitalize first letter
-  return status;
-  //return HelmStatus[status].replace('_', ' ');
-}
-
-function mapHelmModifiedDate(date: any) {
-  let unix = date.seconds * 1000 + date.nanos / 1000;
-  unix = Math.floor(unix);
-  return new Date(unix);
-}
-
diff --git a/custom-src/frontend/app/custom/helm/store/helm.types.ts b/custom-src/frontend/app/custom/helm/store/helm.types.ts
index 6d13d026b4..1f78d4fdee 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.types.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.types.ts
@@ -1,8 +1,3 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
-
-import { KubeService } from '../../kubernetes/store/kube.types';
-
 export interface MonocularRepository {
   name: string;
   url: string;
@@ -34,86 +29,6 @@ export interface MonocularChart {
   };
 }
 
-export interface HelmRelease {
-  endpointId: string;
-  guid: string;
-  name: string;
-  namespace: string;
-  version: string;
-  status: string;
-  lastDeployed: Date;
-  firstDeployed: Date;
-  info: {
-    last_deployed: Date;
-    first_deployed: Date;
-    notes: string;
-    status: string;
-  };
-  config: any;
-  chart: {
-    values: any;
-    metadata: {
-      icon?: string;
-    };
-  };
-}
-
-export interface HelmReleaseStatus {
-  endpointId?: string;
-  releaseTitle?: string;
-  data: {
-    'v1/Pod': {
-      [key: string]: {
-        age: string;
-        name: string;
-        ready: string;
-        restarts: string;
-        status: string;
-      }
-    }
-    'v1/Service': {
-      [key: string]: {
-        name: string;
-      }
-    },
-    [dataKey: string]: any
-  };
-  fields: string[];
-  pods: any;
-}
-
-export interface HelmReleasePod {
-  endpointId: string;
-  releaseTitle: string;
-  name: string;
-  ready: string;
-  status: string;
-  restarts: string;
-  age: string;
-}
-
-export interface HelmReleaseService {
-  endpointId: string;
-  releaseTitle: string;
-  name: string;
-  kubeService$?: Observable<KubeService>;
-  metadata: any;
-  spec: any;
-}
-
-export interface HelmReleaseGraph {
-  endpointId: string;
-  releaseTitle: string;
-}
-
-export type HelmReleaseResource = any;
-
-export function isHelmReleaseService(obj: any): HelmReleaseService {
-  if (obj && obj.kubeService$) {
-    return obj as HelmReleaseService;
-  }
-}
-
 export interface HelmVersion {
   endpointId: string;
   Version?: {
@@ -135,10 +50,7 @@ export enum HelmStatus {
   Pending_Rollback = 8
 }
 
-@Injectable()
-export class HelmReleaseGuid {
-  guid: string;
-}
+
 
 export interface HelmInstallValues {
   endpoint: string;
diff --git a/custom-src/frontend/app/custom/helm/tabs/releases-tab/releases-tab.component.html b/custom-src/frontend/app/custom/helm/tabs/releases-tab/releases-tab.component.html
deleted file mode 100644
index dd2b6cb351..0000000000
--- a/custom-src/frontend/app/custom/helm/tabs/releases-tab/releases-tab.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<app-list></app-list>
\ No newline at end of file
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 5c12dfcdbb..ca5f33c8fa 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts
@@ -99,6 +99,10 @@ entityCache[kubernetesDashboardEntityType] = new KubernetesEntitySchema(
 
 entityCache[metricEntityType] = new KubernetesEntitySchema(metricEntityType);
 
+export function addKubernetesEntitySchema(key: string, newSchema: EntitySchema) {
+  entityCache[key] = newSchema
+}
+
 export function kubernetesEntityFactory(key: string): EntitySchema {
   const entity = entityCache[key];
   if (!entity) {
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 1d9f4df432..87c166f128 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
@@ -17,7 +17,6 @@ import {
   KubernetesConfigAuthFormComponent,
 } from './auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component';
 import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component';
-import { KubernetesEndpointPreviewComponent } from './kubernetes-endpoint-preview/kubernetes-endpoint-preview.component';
 import {
   KUBERNETES_ENDPOINT_TYPE,
   kubernetesAppsEntityType,
@@ -39,6 +38,7 @@ import {
   KubernetesStatefulSet,
   KubeService,
 } from './store/kube.types';
+import { generateWorkloadsEntities } from './workloads/store/workloads-entity-generator';
 
 const enum KubeEndpointAuthTypes {
   CERT_AUTH = 'kube-cert-auth',
@@ -147,7 +147,8 @@ export function generateKubernetesEntities(): StratosBaseCatalogEntity[] {
     generateNamespacesEntity(endpointDefinition),
     generateServicesEntity(endpointDefinition),
     generateDashboardEntity(endpointDefinition),
-    generateMetricEntity(endpointDefinition)
+    generateMetricEntity(endpointDefinition),
+    ...generateWorkloadsEntities(endpointDefinition)
   ];
 }
 
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
index 769375f010..2e4b9de424 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
@@ -1,4 +1,3 @@
-/* tslint:disable:max-line-length */
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
@@ -80,6 +79,12 @@ import {
   KubernetesNodeTagsCardComponent,
 } from './list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component';
 import { NodePodCountComponent } from './list-types/kubernetes-nodes/node-pod-count/node-pod-count.component';
+import {
+  KubernetesPodReadinessComponent,
+} from './list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component';
+import {
+  KubernetesPodStatusComponent,
+} from './list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component';
 import { KubernetesPodTagsComponent } from './list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component';
 import { PodNameLinkComponent } from './list-types/kubernetes-pods/pod-name-link/pod-name-link.component';
 import { KubernetesServicePortsComponent } from './list-types/kubernetes-service-ports/kubernetes-service-ports.component';
@@ -93,8 +98,9 @@ import { KubernetesNamespacesTabComponent } from './tabs/kubernetes-namespaces-t
 import { KubernetesNodesTabComponent } from './tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component';
 import { KubernetesPodsTabComponent } from './tabs/kubernetes-pods-tab/kubernetes-pods-tab.component';
 import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kubernetes-summary.component';
-import { KubernetesPodStatusComponent } from './list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component';
-import { KubernetesPodReadinessComponent } from './list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component';
+import { WorkloadsModule } from './workloads/workloads.module';
+
+/* tslint:disable:max-line-length */
 
 /* tslint:enable */
 
@@ -105,6 +111,7 @@ import { KubernetesPodReadinessComponent } from './list-types/kubernetes-pods/ku
     SharedModule,
     NgxChartsModule,
     KubernetesRoutingModule,
+    WorkloadsModule
   ],
   declarations: [
     KubernetesComponent,
@@ -155,9 +162,9 @@ import { KubernetesPodReadinessComponent } from './list-types/kubernetes-pods/ku
     KubernetesPodStatusComponent,
     KubernetesPodReadinessComponent
   ],
-  exports: [
-    KubernetesServicePortsComponent
-  ],
+  // exports: [
+  //   KubernetesServicePortsComponent
+  // ],
   providers: [
     KubernetesService,
     BaseKubeGuid,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts
index 79bdc9c2cd..13a3ba0c13 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts
@@ -25,7 +25,6 @@ export class KubernetesReleasePodsDataSource extends ListDataSource<KubernetesPo
       action,
       schema: kubernetesEntityFactory(kubernetesPodsEntityType),
       getRowUniqueId: a => a.name,
-      // getRowUniqueId: getHelmReleaseServiceId,  //TODO: RC
       paginationKey: action.paginationKey,
       isLocal: true,
       listConfig,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
index b2fb434d33..f1eb39c0e6 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
@@ -4,6 +4,7 @@ import { Observable, of } from 'rxjs';
 import { CardCell } from '../../../../shared/components/list/list.types';
 import { KubeService } from '../../../kubernetes/store/kube.types';
 
+// import { CardCell } from '../../../src/frontend/packages/core/src/shared/components/list/list.types';
 @Component({
   selector: 'app-kubernetes-service-ports',
   templateUrl: './kubernetes-service-ports.component.html',
@@ -21,6 +22,10 @@ export class KubernetesServicePortsComponent extends CardCell<KubeService> {
     }
     this.pRow = row;
     this.kubeService$ = of(row as KubeService);
+    // TODO: RC - PReviously in Helm Release table `HelmServicePortsComponent` extended this and set endpoint ID as below.
+    // Now it's in a child module this can't happen
+    // const helmReleaseService = (row as HelmReleaseService);
+    // this.endpointId = helmReleaseService.endpointId;
   }
   get row(): KubeService {
     return this.pRow;
diff --git a/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-service-card/helm-release-service-card.component.html
similarity index 90%
rename from custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.html
rename to custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-service-card/helm-release-service-card.component.html
index 72b4959df7..6b6618c25f 100644
--- a/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-service-card/helm-release-service-card.component.html
@@ -13,7 +13,7 @@
   <app-meta-card-item customStyle="column">
     <app-meta-card-key>Ports</app-meta-card-key>
     <app-meta-card-value>
-      <app-kubernetes-service-ports [row]="row"></app-kubernetes-service-ports>
+      <app-helm-service-ports [row]="row"></app-helm-service-ports>
     </app-meta-card-value>
   </app-meta-card-item>
 </app-meta-card>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.scss b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-service-card/helm-release-service-card.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.scss
rename to custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-service-card/helm-release-service-card.component.scss
diff --git a/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-service-card/helm-release-service-card.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.spec.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-service-card/helm-release-service-card.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-service-card/helm-release-service-card.component.ts
similarity index 67%
rename from custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-service-card/helm-release-service-card.component.ts
index d60751bf79..006a93401d 100644
--- a/custom-src/frontend/app/custom/helm/list-types/helm-release-service-card/helm-release-service-card.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-service-card/helm-release-service-card.component.ts
@@ -1,7 +1,9 @@
 import { Component } from '@angular/core';
+import { CardCell } from 'frontend/packages/core/src/shared/components/list/list.types';
+
+import { HelmReleaseService } from '../../workload.types';
+
 
-import { CardCell } from '../../../../shared/components/list/list.types';
-import { HelmReleaseService } from '../../store/helm.types';
 
 @Component({
   selector: 'app-release-service-card',
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.html
new file mode 100644
index 0000000000..35187acf75
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.html
@@ -0,0 +1,22 @@
+<ng-container *ngIf="(kubeService$ | async) as kubeService; else noPorts">
+  <table *ngIf="!!kubeService.spec?.ports.length; else noPorts">
+    <tr>
+      <th>Name</th>
+      <th>Protocol</th>
+      <th>Port</th>
+      <th>Target Port</th>
+    </tr>
+    <tr *ngFor="let port of kubeService.spec?.ports">
+      <td>
+        <a *ngIf="endpointId; else noLink" href="{{getServiceLink(kubeService, port)}}" target="_blank">
+          {{ port.name}}
+        </a>
+        <ng-template #noLink>{{port.name}}</ng-template>
+      </td>
+      <td>{{port.protocol}}</td>
+      <td>{{port.port}}</td>
+      <td>{{port.targetPort}}</td>
+    </tr>
+  </table>
+</ng-container>
+<ng-template #noPorts>-</ng-template>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.scss b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.scss
new file mode 100644
index 0000000000..2aa856a7c5
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.scss
@@ -0,0 +1,11 @@
+th {
+  font-style: italic;
+  font-weight: 400;
+}
+
+th,
+td {
+  padding-right: 15px;
+  text-align: left;
+}
+
diff --git a/custom-src/frontend/app/custom/helm/list-types/helm-service-ports/helm-service-ports.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/list-types/helm-service-ports/helm-service-ports.component.spec.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.ts
new file mode 100644
index 0000000000..6f235a269a
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.ts
@@ -0,0 +1,35 @@
+import { Component, Input } from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { CardCell } from '../../../../../shared/components/list/list.types';
+import { HelmReleaseService } from '../../workload.types';
+
+@Component({
+  selector: 'app-helm-service-ports',
+  templateUrl: './helm-service-ports.component.html',
+  styleUrls: ['./helm-service-ports.component.scss']
+})
+export class HelmServicePortsComponent extends CardCell<HelmReleaseService> {
+
+  private pRow: HelmReleaseService;
+  public kubeService$: Observable<HelmReleaseService>;
+  // Used when extending this class
+  public endpointId: string;
+
+  @Input() set row(row: HelmReleaseService) {
+    if (!row) {
+      return;
+    }
+    this.pRow = row;
+    // this.kubeService$ = of(row as KubeService);
+    // this.kubeService$ = helmReleaseService.kubeService$;
+    this.endpointId = row.endpointId;
+  }
+  get row(): HelmReleaseService {
+    return this.pRow;
+  }
+
+  getServiceLink(service: HelmReleaseService, port: { name: string }): string {
+    return `/kubernetes/svcproxy/${this.endpointId}/${service.metadata.namespace}/${service.metadata.name}/${port.name}`;
+  }
+}
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-config.service.ts
similarity index 82%
rename from custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-config.service.ts
index 5a9cb1b3d9..9639d87dc6 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-config.service.ts
@@ -1,22 +1,21 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
-
+import { ITableColumn } from 'frontend/packages/core/src/shared/components/list/list-table/table.types';
+import { IListConfig, ListViewTypes } from 'frontend/packages/core/src/shared/components/list/list.component.types';
+import { AppState } from 'frontend/packages/store/src/app-state';
 import * as moment from 'moment';
+import { Observable } from 'rxjs';
 
-import { AppState } from '../../../../../store/src/app-state';
-import { ITableColumn } from '../../../shared/components/list/list-table/table.types';
-import { IListConfig, ListViewTypes } from '../../../shared/components/list/list.component.types';
-import { HelmReleaseHelperService } from '../release/tabs/helm-release-helper.service';
-import { HelmReleasePod } from '../store/helm.types';
-import { HelmReleasePodsDataSource } from './monocular-release-pods-list-source';
 import {
-  KubernetesPodStatusComponent
-} from '../../kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component';
+  KubernetesPodReadinessComponent,
+} from '../../list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component';
 import {
-  KubernetesPodReadinessComponent
-} from '../../kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component';
+  KubernetesPodStatusComponent,
+} from '../../list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component';
+import { HelmReleaseHelperService } from '../release/tabs/helm-release-helper.service';
+import { HelmReleasePod } from '../workload.types';
+import { HelmReleasePodsDataSource } from './monocular-release-pods-list-source';
 
 @Injectable()
 export class HelmReleasePodsListConfig implements IListConfig<HelmReleasePod> {
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-source.ts
similarity index 53%
rename from custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-source.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-source.ts
index 13a6808341..b61b4665a8 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-release-pods-list-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-source.ts
@@ -1,11 +1,12 @@
 import { Store } from '@ngrx/store';
+import { ListDataSource } from 'frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source';
+import { IListConfig } from 'frontend/packages/core/src/shared/components/list/list.component.types';
+import { AppState } from 'frontend/packages/store/src/app-state';
+
+import { getHelmReleasePodId } from '../store/workloads-entity-factory';
+import { GetHelmReleasePods } from '../store/workloads.actions';
+import { HelmReleasePod } from '../workload.types';
 
-import { AppState } from '../../../../../store/src/app-state';
-import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
-import { IListConfig } from '../../../shared/components/list/list.component.types';
-import { getHelmReleasePodId, helmEntityFactory } from '../helm-entity-factory';
-import { GetHelmReleasePods, GetHelmReleaseServices } from '../store/helm.actions';
-import { HelmReleasePod } from '../store/helm.types';
 
 export class HelmReleasePodsDataSource extends ListDataSource<HelmReleasePod> {
 
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-config.service.ts
similarity index 84%
rename from custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-config.service.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-config.service.ts
index b1b46b43cb..089db9bcef 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-config.service.ts
@@ -1,14 +1,14 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
+import { ITableColumn } from 'frontend/packages/core/src/shared/components/list/list-table/table.types';
+import { IListConfig, ListViewTypes } from 'frontend/packages/core/src/shared/components/list/list.component.types';
+import { ListView } from 'frontend/packages/store/src/actions/list.actions';
+import { AppState } from 'frontend/packages/store/src/app-state';
 import { Observable } from 'rxjs';
 
-import { ListView } from '../../../../../store/src/actions/list.actions';
-import { AppState } from '../../../../../store/src/app-state';
-import { ITableColumn } from '../../../shared/components/list/list-table/table.types';
-import { IListConfig, ListViewTypes } from '../../../shared/components/list/list.component.types';
 import { HelmReleaseHelperService } from '../release/tabs/helm-release-helper.service';
-import { HelmReleaseService } from '../store/helm.types';
+import { HelmReleaseService } from '../workload.types';
 import { HelmReleaseServiceCardComponent } from './helm-release-service-card/helm-release-service-card.component';
 import { HelmServicePortsComponent } from './helm-service-ports/helm-service-ports.component';
 import { HelmReleaseServicesDataSource } from './monocular-release-services-list-source';
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-source.ts
similarity index 71%
rename from custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-source.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-source.ts
index 4ab437fba4..8543871e43 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-release-services-list-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-source.ts
@@ -1,19 +1,19 @@
 import { Store } from '@ngrx/store';
+import { ListDataSource } from 'frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source';
+import { IListConfig } from 'frontend/packages/core/src/shared/components/list/list.component.types';
+import { AppState } from 'frontend/packages/store/src/app-state';
+import { PaginationMonitor } from 'frontend/packages/store/src/monitors/pagination-monitor';
+import { getPaginationObservables } from 'frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { Observable } from 'rxjs';
 import { filter, map, publishReplay, refCount, switchMap } from 'rxjs/operators';
 
-import { ClearPaginationOfType } from '../../../../../store/src/actions/pagination.actions';
-import { AppState } 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 { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
-import { IListConfig } from '../../../shared/components/list/list.component.types';
-import { kubernetesEntityFactory } from '../../kubernetes/kubernetes-entity-factory';
-import { KubeService } from '../../kubernetes/store/kube.types';
-import { GetKubernetesServicesInNamespace } from '../../kubernetes/store/kubernetes.actions';
-import { getHelmReleaseServiceId, helmEntityFactory } from '../helm-entity-factory';
-import { GetHelmReleases, GetHelmReleaseServices } from '../store/helm.actions';
-import { HelmRelease, HelmReleaseService } from '../store/helm.types';
+import { kubernetesEntityFactory } from '../../kubernetes-entity-factory';
+import { KubeService } from '../../store/kube.types';
+import { GetKubernetesServicesInNamespace } from '../../store/kubernetes.actions';
+import { getHelmReleaseServiceId } from '../store/workloads-entity-factory';
+import { GetHelmReleases, GetHelmReleaseServices } from '../store/workloads.actions';
+import { HelmRelease, HelmReleaseService } from '../workload.types';
+
 
 export const fetchHelmReleaseServiceFromKubernetes = (store: Store<AppState>, helmService: HelmReleaseService): Observable<KubeService> => {
   return fetchRelease(store, helmService.endpointId, helmService.releaseTitle).pipe(
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-releases-list-config.service.ts
similarity index 83%
rename from custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-config.service.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-releases-list-config.service.ts
index 8ae5e1fd35..2960fb65c0 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-releases-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-releases-list-config.service.ts
@@ -2,15 +2,15 @@ import { DatePipe } from '@angular/common';
 import { Injectable } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
-
-import { AppState } from '../../../../../store/src/app-state';
-import { ITableColumn } from '../../../shared/components/list/list-table/table.types';
+import { ITableColumn } from 'frontend/packages/core/src/shared/components/list/list-table/table.types';
 import {
   TableCellEndpointNameComponent,
-} from '../../../shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component';
-import { IListConfig, ListViewTypes } from '../../../shared/components/list/list.component.types';
-import { defaultHelmKubeListPageSize } from '../../kubernetes/list-types/kube-helm-list-types';
-import { HelmRelease } from '../store/helm.types';
+} from 'frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component';
+import { IListConfig, ListViewTypes } from 'frontend/packages/core/src/shared/components/list/list.component.types';
+import { AppState } from 'frontend/packages/store/src/app-state';
+
+import { defaultHelmKubeListPageSize } from '../../list-types/kube-helm-list-types';
+import { HelmRelease } from '../workload.types';
 import { HelmReleasesDataSource } from './monocular-releases-list-source';
 
 @Injectable()
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-releases-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-releases-list-source.ts
new file mode 100644
index 0000000000..e11c2f5e1d
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-releases-list-source.ts
@@ -0,0 +1,28 @@
+import { Store } from '@ngrx/store';
+import { ListDataSource } from 'frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source';
+import { IListConfig } from 'frontend/packages/core/src/shared/components/list/list.component.types';
+import { AppState } from 'frontend/packages/store/src/app-state';
+
+import { kubernetesEntityFactory } from '../../kubernetes-entity-factory';
+import { getHelmReleaseId, helmReleaseEntityKey } from '../store/workloads-entity-factory';
+import { GetHelmReleases } from '../store/workloads.actions';
+import { HelmRelease } from '../workload.types';
+
+export class HelmReleasesDataSource extends ListDataSource<HelmRelease> {
+
+  constructor(
+    store: Store<AppState>,
+    listConfig: IListConfig<HelmRelease>
+  ) {
+    const action = new GetHelmReleases();
+    super({
+      store,
+      action,
+      schema: kubernetesEntityFactory(helmReleaseEntityKey),
+      getRowUniqueId: getHelmReleaseId,
+      paginationKey: action.paginationKey,
+      isLocal: true,
+      listConfig
+    });
+  }
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.html
new file mode 100644
index 0000000000..4b359ba8f9
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.html
@@ -0,0 +1,4 @@
+<app-page-header tabsHeader="Workload" [tabs]="tabLinks" [breadcrumbs]="breadcrumbs">
+  <h1>{{ title }}</h1>
+</app-page-header>
+<router-outlet></router-outlet>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.scss b/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.scss
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.scss
diff --git a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/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
similarity index 83%
rename from custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
index fdf26b710b..557a220a8f 100644
--- a/custom-src/frontend/app/custom/helm/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
@@ -1,29 +1,27 @@
-import { HELM_ENDPOINT_TYPE, helmReleaseResourceEntityType } from './../../helm-entity-factory';
-import { GetHelmReleaseServices } from './../../store/helm.actions';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { Component, OnDestroy } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Observable, Subject, Subscription } from 'rxjs';
-
-import { HelmReleaseGuid, HelmReleasePod } from '../../store/helm.types';
-import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service';
-import { catchError, switchMap, share, map } from 'rxjs/operators';
-import makeWebSocketObservable, { GetWebSocketResponses } from 'rxjs-websockets';
 import { Store } from '@ngrx/store';
-import { AppState } from '../../../../../../store/src/app-state';
+import { LoggerService } from 'frontend/packages/core/src/core/logger.service';
+import { AppState } from 'frontend/packages/store/src/app-state';
+import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog.service';
+import { EntityCatalogEntityConfig } from 'frontend/packages/store/src/entity-catalog/entity-catalog.types';
 import {
-  successEntityHandler
-} from '../../../../../../store/src/entity-request-pipeline/entity-request-base-handlers/success-entity-request.handler';
+  successEntityHandler,
+} from 'frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/success-entity-request.handler';
+import { PipelineResult } from 'frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types';
+import { Observable, Subject, Subscription } from 'rxjs';
+import makeWebSocketObservable, { GetWebSocketResponses } from 'rxjs-websockets';
+import { catchError, map, share, switchMap } from 'rxjs/operators';
+
 import {
   KUBERNETES_ENDPOINT_TYPE,
   kubernetesPodsEntityType,
-  kubernetesServicesEntityType
-} from '../../../kubernetes/kubernetes-entity-factory';
-import { PipelineResult } from '../../../../../../store/src/entity-request-pipeline/entity-request-pipeline.types';
-import { GetHelmReleasePods } from '../../store/helm.actions';
-import { helmReleaseGraphEntityType } from '../../helm-entity-factory';
-import { LoggerService } from '../../../../core/logger.service';
-import { EntityCatalogEntityConfig } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
+  kubernetesServicesEntityType,
+} from '../../../kubernetes-entity-factory';
+import { helmReleaseGraphEntityType, helmReleaseResourceEntityType } from '../../store/workloads-entity-factory';
+import { GetHelmReleasePods, GetHelmReleaseServices } from '../../store/workloads.actions';
+import { HelmReleaseGuid, HelmReleasePod } from '../../workload.types';
+import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service';
 
 type IDGetterFunction = (data: any) => string;
 
@@ -52,12 +50,11 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
 
   private sub: Subscription;
 
-  //private connection: Connection;
+  // private connection: Connection;
 
   public breadcrumbs = [{
     breadcrumbs: [
-      { value: 'Helm', routerLink: '/monocular' },
-      { value: 'Releases', routerLink: '/monocular/releases' }
+      { value: 'Workloads', routerLink: '/workloads' }
     ]
   }];
 
@@ -128,8 +125,8 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
           const graph = messageObj.data;
           graph.endpointId = this.helmReleaseHelper.endpointGuid;
           graph.releaseTitle = this.helmReleaseHelper.releaseTitle;
-          this.addResource(helmReleaseGraphEntityType, graph, `${graph.endpointId}-${graph.releaseTitle}`, HELM_ENDPOINT_TYPE);
-        } else if (messageObj.kind === 'Manifest' ||  messageObj.kind === 'Resources') {
+          this.addResource(helmReleaseGraphEntityType, graph, `${graph.endpointId}-${graph.releaseTitle}`, KUBERNETES_ENDPOINT_TYPE);
+        } else if (messageObj.kind === 'Manifest' || messageObj.kind === 'Resources') {
           // Store all of the services
           const manifest = messageObj.data;
           const ep = this.helmReleaseHelper.endpointGuid;
@@ -150,11 +147,11 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
             this.populateList(releaseServicesAction, svcs, (svc) => `${prefix}-${svc.metadata.name}`);
           }
 
-          const resources = {...manifest};
+          const resources = { ...manifest };
           resources.endpointId = this.helmReleaseHelper.endpointGuid;
           resources.releaseTitle = this.helmReleaseHelper.releaseTitle;
           this.addResource(helmReleaseResourceEntityType,
-            resources, `${resources.endpointId}-${resources.releaseTitle}`, HELM_ENDPOINT_TYPE);
+            resources, `${resources.endpointId}-${resources.releaseTitle}`, KUBERNETES_ENDPOINT_TYPE);
         }
       }
     });
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
similarity index 71%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
index 31cf85655b..c2fa6bd22c 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
@@ -1,17 +1,28 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
+import { AppState } from 'frontend/packages/store/src/app-state';
+import { EntityServiceFactory } from 'frontend/packages/store/src/entity-service-factory.service';
+import { PaginationMonitor } from 'frontend/packages/store/src/monitors/pagination-monitor';
+import { getPaginationObservables } from 'frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { Observable } from 'rxjs';
-import { map, tap } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 
-import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service';
-import { PaginationMonitor } from '../../../../../../store/src/monitors/pagination-monitor';
-import { helmEntityFactory, helmReleaseEntityKey } from '../../helm-entity-factory';
-import { GetHelmReleases, GetHelmReleaseStatus, GetHelmReleaseGraph, GetHelmReleaseResource } from '../../store/helm.actions';
-import { HelmRelease, HelmReleaseGuid, HelmReleaseStatus, HelmReleaseGraph, HelmReleaseResource } from '../../store/helm.types';
-import { AppState } from './../../../../../../store/src/app-state';
+import { kubernetesEntityFactory } from '../../../kubernetes-entity-factory';
+import { helmReleaseEntityKey } from '../../store/workloads-entity-factory';
 import {
-  getPaginationObservables,
-} from './../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
+  GetHelmReleaseGraph,
+  GetHelmReleaseResource,
+  GetHelmReleases,
+  GetHelmReleaseStatus,
+} from '../../store/workloads.actions';
+import {
+  HelmRelease,
+  HelmReleaseGraph,
+  HelmReleaseGuid,
+  HelmReleaseResource,
+  HelmReleaseStatus,
+} from '../../workload.types';
+
 
 @Injectable()
 export class HelmReleaseHelperService {
@@ -35,8 +46,9 @@ export class HelmReleaseHelperService {
     this.namespace = this.guid.split(':')[1];
     this.endpointGuid = this.guid.split(':')[0];
 
+    // TODO: NWM This should use a `GetHelmRelease` action instead of fetching the entire list
     const action = new GetHelmReleases();
-    const paginationMonitor = new PaginationMonitor(store, action.paginationKey, helmEntityFactory(helmReleaseEntityKey));
+    const paginationMonitor = new PaginationMonitor(store, action.paginationKey, kubernetesEntityFactory(helmReleaseEntityKey));
     const svc = getPaginationObservables({ store, action, paginationMonitor });
     this.isFetching$ = svc.fetchingEntities$;
 
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.html
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.html
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts
similarity index 89%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts
index 5da24e9315..35a2ed9039 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts
@@ -1,8 +1,8 @@
 import { Component } from '@angular/core';
+import { AnsiColors } from 'frontend/packages/core/src/shared/components/log-viewer/ansi-colors';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { AnsiColors } from '../../../../../shared/components/log-viewer/ansi-colors';
 import { HelmReleaseHelperService } from '../helm-release-helper.service';
 
 @Component({
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-pods/helm-release-pods-tab.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-pods/helm-release-pods-tab.component.html
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.html
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts
similarity index 81%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts
index d0efba1213..7d52f8fb53 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
+import { ListConfig } from 'frontend/packages/core/src/shared/components/list/list.component.types';
 
-import { ListConfig } from '../../../../../shared/components/list/list.component.types';
 import { HelmReleasePodsListConfig } from '../../../list-types/monocular-release-pods-list-config.service';
 
 @Component({
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
similarity index 88%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
index 969368aa34..0f1a5ea4bb 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
@@ -1,9 +1,12 @@
-import { Node, Edge } from '@swimlane/ngx-graph';
-import { Component, OnInit, OnDestroy, ComponentFactoryResolver } from '@angular/core';
-import { HelmReleaseHelperService } from '../helm-release-helper.service';
+import { Component, ComponentFactoryResolver, OnDestroy, OnInit } from '@angular/core';
+import { Edge, Node } from '@swimlane/ngx-graph';
+import { PanelPreviewService } from 'frontend/packages/core/src/shared/services/panel-preview.service';
 import { Subject, Subscription } from 'rxjs';
-import { PanelPreviewService } from '../../../../../shared/services/panel-preview.service';
-import { HelmReleaseResourcePreviewComponent } from './helm-release-resource-preview/helm-release-resource-preview.component';
+
+import { HelmReleaseHelperService } from '../helm-release-helper.service';
+import {
+  HelmReleaseResourcePreviewComponent,
+} from './helm-release-resource-preview/helm-release-resource-preview.component';
 
 interface Colors {
   bg: string;
@@ -135,7 +138,7 @@ export class HelmReleaseResourceGraphComponent implements OnInit, OnDestroy {
   }
 
   public onZoomChanged(e) {
-    //console.log(e);
+    // console.log(e);
   }
 
 }
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.html
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.html
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.scss b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.scss
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.scss
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts
similarity index 83%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts
index 03a6829474..e42d6a607a 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts
@@ -1,15 +1,15 @@
-import { Component, OnInit } from '@angular/core';
-import { PreviewableComponent } from '../../../../../../shared/previewable-component';
+import { Component } from '@angular/core';
+import { PreviewableComponent } from 'frontend/packages/core/src/shared/previewable-component';
+import * as moment from 'moment';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import * as moment from 'moment';
 
 @Component({
   selector: 'app-helm-release-resource-preview',
   templateUrl: './helm-release-resource-preview.component.html',
-  styleUrls: ['./helm-release-resource-preview.component.scss']
+  styleUrls: ['./helm-release-resource-preview.component.scss'],
 })
-export class HelmReleaseResourcePreviewComponent implements PreviewableComponent  {
+export class HelmReleaseResourcePreviewComponent implements PreviewableComponent {
 
   public resource$: Observable<any>;
 
@@ -18,7 +18,7 @@ export class HelmReleaseResourcePreviewComponent implements PreviewableComponent
       map((r: any[]) => {
         const item = Object.values(r).find((res: any) => res.metadata.name === props.node.label && res.metadata.kind === props.node.kind);
 
-        const newItem = { ...item};
+        const newItem = { ...item };
         newItem.age = moment(item.metadata.creationTimestamp).fromNow(true);
 
         newItem.labels = [];
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-services/helm-release-services-tab.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-services/helm-release-services-tab.component.html
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.html
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-services/helm-release-services-tab.component.scss b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-services/helm-release-services-tab.component.scss
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.scss
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-services/helm-release-services-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.ts
similarity index 82%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-services/helm-release-services-tab.component.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.ts
index 64d8714419..1f4806fcc0 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-services/helm-release-services-tab.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
+import { ListConfig } from 'frontend/packages/core/src/shared/components/list/list.component.types';
 
-import { ListConfig } from '../../../../../shared/components/list/list.component.types';
 import { HelmReleaseServicesListConfig } from '../../../list-types/monocular-release-services-list-config.service';
 
 @Component({
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
similarity index 94%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
index 8f8c0eb39d..2cd1e5e0aa 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
@@ -1,5 +1,5 @@
 
-@import '../../../../../../sass/mixins';
+@import '../../../../../../../../core/sass/mixins';
 
 .app-metadata {
   display: flex;
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
similarity index 76%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index 913d1264d5..a0927a1178 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -1,18 +1,19 @@
 import { HttpClient } from '@angular/common/http';
 import { Component, OnDestroy } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { combineLatest, Observable, ReplaySubject } from 'rxjs';
+import { LoggerService } from 'frontend/packages/core/src/core/logger.service';
+import { ConfirmationDialogConfig } from 'frontend/packages/core/src/shared/components/confirmation-dialog.config';
+import { ConfirmationDialogService } from 'frontend/packages/core/src/shared/components/confirmation-dialog.service';
+import { ClearPaginationOfType } from 'frontend/packages/store/src/actions/pagination.actions';
+import { RouterNav } from 'frontend/packages/store/src/actions/router.actions';
+import { HideSnackBar, ShowSnackBar } from 'frontend/packages/store/src/actions/snackBar.actions';
+import { AppState } from 'frontend/packages/store/src/app-state';
+import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog.service';
+import { combineLatest, Observable, of, ReplaySubject } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 
-import { ClearPaginationOfType } from '../../../../../../../store/src/actions/pagination.actions';
-import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
-import { HideSnackBar, ShowSnackBar } from '../../../../../../../store/src/actions/snackBar.actions';
-import { AppState } from '../../../../../../../store/src/app-state';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { LoggerService } from '../../../../../core/logger.service';
-import { ConfirmationDialogConfig } from '../../../../../shared/components/confirmation-dialog.config';
-import { ConfirmationDialogService } from '../../../../../shared/components/confirmation-dialog.service';
-import { HELM_ENDPOINT_TYPE, helmReleaseEntityKey } from '../../../helm-entity-factory';
+import { KUBERNETES_ENDPOINT_TYPE } from '../../../../kubernetes-entity-factory';
+import { helmReleaseEntityKey } from '../../../store/workloads-entity-factory';
 import { HelmReleaseHelperService } from '../helm-release-helper.service';
 
 @Component({
@@ -65,7 +66,8 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
 
     this.isBusy$ = combineLatest([
       this.helmReleaseHelper.isFetching$,
-      releaseStatus$,
+      // releaseStatus$, // TODO: NWM
+      of(true),
       this.busyDeletingSubject.asObservable().pipe(
         startWith(false)
       )
@@ -123,7 +125,7 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
           this.logService.error('Failed to delete release: ', err);
         },
         complete: () => {
-          const releaseEntityConfig = entityCatalog.getEntity(HELM_ENDPOINT_TYPE, helmReleaseEntityKey);
+          const releaseEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, helmReleaseEntityKey);
           this.store.dispatch(new ClearPaginationOfType(releaseEntityConfig));
           this.completeDelete();
           this.store.dispatch(new RouterNav({ path: ['monocular/releases'] }));
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.scss b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.scss
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.scss
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
similarity index 87%
rename from custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
index e995a94edb..331d484ea3 100644
--- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { combineLatest, Observable, Subject } from 'rxjs';
-import { map, tap, startWith } from 'rxjs/operators';
+import { map, startWith } from 'rxjs/operators';
 
 import { HelmReleaseHelperService } from '../helm-release-helper.service';
 
@@ -30,10 +30,10 @@ export class HelmReleaseValuesTabComponent {
           case 'user':
             return release.config || {};
           case 'combined':
-              const chart = release.chart.values || {};
-              const user = release.config || {};
-              const target = {};
-              return this.mergeDeep(target, chart, user);
+            const chart = release.chart.values || {};
+            const user = release.config || {};
+            const target = {};
+            return this.mergeDeep(target, chart, user);
           default:
             return release.chart.values || {};
         }
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.html
new file mode 100644
index 0000000000..2cab2f2e2e
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.html
@@ -0,0 +1,6 @@
+<!-- // TODO: RC should have [endpointIds$] which handles header events -->
+<app-page-header>
+  <h1>Workloads</h1>
+</app-page-header>
+
+<app-list></app-list>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/tabs/releases-tab/releases-tab.component.scss b/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/tabs/releases-tab/releases-tab.component.scss
rename to custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.scss
diff --git a/custom-src/frontend/app/custom/helm/tabs/releases-tab/releases-tab.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts
similarity index 78%
rename from custom-src/frontend/app/custom/helm/tabs/releases-tab/releases-tab.component.spec.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts
index be394b5f5b..335db13c6a 100644
--- a/custom-src/frontend/app/custom/helm/tabs/releases-tab/releases-tab.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts
@@ -1,7 +1,6 @@
-import { DatePipe } from '@angular/common';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { HelmBaseTestModules } from '../../helm-testing.module';
+import { HelmBaseTestModules } from '../../../helm/helm-testing.module';
+import { DatePipe } from './@angular/common';
+import { async, ComponentFixture, TestBed } from './@angular/core/testing';
 import { HelmReleasesTabComponent } from './releases-tab.component';
 
 describe('ReleasesTabComponent', () => {
diff --git a/custom-src/frontend/app/custom/helm/tabs/releases-tab/releases-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts
similarity index 71%
rename from custom-src/frontend/app/custom/helm/tabs/releases-tab/releases-tab.component.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts
index 0bf44db786..5b984757ac 100644
--- a/custom-src/frontend/app/custom/helm/tabs/releases-tab/releases-tab.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 
 import { ListConfig } from '../../../../shared/components/list/list.component.types';
-import { HelmReleasesListConfig } from '../../list-types/monocular-releases-list-config.service';
+import { HelmReleasesListConfig } from '../list-types/monocular-releases-list-config.service';
 
 @Component({
   selector: 'app-releases-tab',
@@ -13,4 +13,5 @@ import { HelmReleasesListConfig } from '../../list-types/monocular-releases-list
   }]
 })
 export class HelmReleasesTabComponent { }
+// TODO: RC Rename all 'HelmRelease' files/names to 'Workload`
 
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts
new file mode 100644
index 0000000000..ab8eed0e3a
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts
@@ -0,0 +1,71 @@
+import { EntitySchema } from '../../../../../../store/src/helpers/entity-schema';
+import { addKubernetesEntitySchema, KubernetesEntitySchema } from '../../kubernetes-entity-factory';
+import {
+  HelmRelease,
+  HelmReleaseGraph,
+  HelmReleasePod,
+  HelmReleaseResource,
+  HelmReleaseService,
+  HelmReleaseStatus,
+} from '../workload.types';
+
+export const helmReleaseEntityKey = 'helmReleases';
+export const helmReleaseStatusEntityType = 'helmReleaseStatus';
+export const helmReleasePodEntityType = 'helmReleasePod';
+export const helmReleaseServiceEntityType = 'helmReleaseService';
+export const helmReleaseGraphEntityType = 'helmReleaseGraph';
+export const helmReleaseResourceEntityType = 'helmReleaseResource';
+
+export const getHelmReleaseId = (entity: HelmRelease) => entity.endpointId;
+export const getHelmReleaseStatusId = (entity: HelmReleaseStatus) => entity.endpointId;
+export const getHelmReleasePodId = (entity: HelmReleasePod) => entity.name;
+export const getHelmReleaseServiceId = (entity: HelmReleaseService) => entity.name;
+export const getHelmReleaseGraphId = (entity: HelmReleaseGraph) => entity.endpointId;
+export const getHelmReleaseReleaseId = (entity: HelmReleaseResource) => entity.endpointId;
+
+const entityCache: {
+  [key: string]: EntitySchema
+} = {};
+
+
+entityCache[helmReleaseEntityKey] = new KubernetesEntitySchema(
+  helmReleaseEntityKey,
+  {},
+  { idAttribute: getHelmReleaseId }
+);
+
+entityCache[helmReleaseStatusEntityType] = new KubernetesEntitySchema(
+  helmReleaseStatusEntityType,
+  {},
+  { idAttribute: getHelmReleaseStatusId }
+);
+
+entityCache[helmReleasePodEntityType] = new KubernetesEntitySchema(
+  helmReleasePodEntityType,
+  {},
+  { idAttribute: getHelmReleasePodId }
+);
+
+entityCache[helmReleaseServiceEntityType] = new KubernetesEntitySchema(
+  helmReleaseServiceEntityType,
+  {},
+  { idAttribute: getHelmReleaseServiceId }
+);
+
+entityCache[helmReleaseGraphEntityType] = new KubernetesEntitySchema(
+  helmReleaseGraphEntityType,
+  {},
+  { idAttribute: getHelmReleaseGraphId }
+);
+
+entityCache[helmReleaseResourceEntityType] = new KubernetesEntitySchema(
+  helmReleaseResourceEntityType,
+  {},
+  { idAttribute: getHelmReleaseReleaseId }
+);
+
+Object.entries(entityCache).forEach(([key, workloadSchema]) => addKubernetesEntitySchema(key, workloadSchema));
+
+export const createHelmReleaseEntities = (): { [cacheName: string]: EntitySchema } => {
+  return entityCache;
+};
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
new file mode 100644
index 0000000000..9aef89ebda
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-generator.ts
@@ -0,0 +1,92 @@
+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 { kubernetesEntityFactory } from '../../kubernetes-entity-factory';
+import {
+  HelmRelease,
+  HelmReleaseGraph,
+  HelmReleasePod,
+  HelmReleaseResource,
+  HelmReleaseService,
+  HelmReleaseStatus,
+} from '../workload.types';
+import {
+  helmReleaseEntityKey,
+  helmReleaseGraphEntityType,
+  helmReleasePodEntityType,
+  helmReleaseResourceEntityType,
+  helmReleaseServiceEntityType,
+  helmReleaseStatusEntityType,
+} from './workloads-entity-factory';
+
+
+export function generateWorkloadsEntities(endpointDefinition: StratosEndpointExtensionDefinition): StratosBaseCatalogEntity[] {
+  return [
+    generateReleaseEntity(endpointDefinition),
+    generateReleaseStatusEntity(endpointDefinition),
+    generateReleasePodEntity(endpointDefinition),
+    generateReleaseServiceEntity(endpointDefinition),
+    generateReleaseGraphEntity(endpointDefinition),
+    generateReleaseResourceEntity(endpointDefinition),
+  ];
+}
+
+
+function generateReleaseEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: helmReleaseEntityKey,
+    schema: kubernetesEntityFactory(helmReleaseEntityKey),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogEntity<IFavoriteMetadata, HelmRelease>(definition);
+}
+
+function generateReleaseStatusEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: helmReleaseStatusEntityType,
+    schema: kubernetesEntityFactory(helmReleaseStatusEntityType),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseStatus>(definition);
+}
+
+function generateReleasePodEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: helmReleasePodEntityType,
+    schema: kubernetesEntityFactory(helmReleasePodEntityType),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogEntity<IFavoriteMetadata, HelmReleasePod>(definition);
+}
+
+function generateReleaseServiceEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: helmReleaseServiceEntityType,
+    schema: kubernetesEntityFactory(helmReleaseServiceEntityType),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseService>(definition);
+}
+
+function generateReleaseGraphEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: helmReleaseGraphEntityType,
+    schema: kubernetesEntityFactory(helmReleaseGraphEntityType),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseGraph>(definition);
+}
+
+function generateReleaseResourceEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: helmReleaseResourceEntityType,
+    schema: kubernetesEntityFactory(helmReleaseResourceEntityType),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseResource>(definition);
+}
+
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
new file mode 100644
index 0000000000..84570d7311
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
@@ -0,0 +1,164 @@
+import { Action } from '@ngrx/store';
+import { EntityRequestAction } from 'frontend/packages/store/src/types/request.types';
+
+import { MonocularPaginationAction } from '../../../helm/store/helm.actions';
+import {
+  KUBERNETES_ENDPOINT_TYPE,
+  kubernetesEntityFactory,
+  kubernetesPodsEntityType,
+  kubernetesServicesEntityType,
+} from '../../kubernetes-entity-factory';
+import { helmReleaseEntityKey, helmReleaseGraphEntityType, helmReleaseStatusEntityType } from './workloads-entity-factory';
+
+export const GET_HELM_RELEASES = '[Helm] Get Releases';
+export const GET_HELM_RELEASES_SUCCESS = '[Helm] Get Releases Success';
+export const GET_HELM_RELEASES_FAILURE = '[Helm] Get Releases Failure';
+
+export const GET_HELM_RELEASE_STATUS = '[Helm] Get Release Status';
+export const GET_HELM_RELEASE_STATUS_SUCCESS = '[Helm] Get Release Status Success';
+export const GET_HELM_RELEASE_STATUS_FAILURE = '[Helm] Get Release Status Failure';
+
+export const GET_HELM_RELEASE_PODS = '[Helm] Get Release Pods';
+export const GET_HELM_RELEASE_PODS_SUCCESS = '[Helm] Get Release Pods Success';
+export const GET_HELM_RELEASE_PODS_FAILURE = '[Helm] Get Release Pods Failure';
+
+export const GET_HELM_RELEASE_SERVICES = '[Helm] Get Release Services';
+export const GET_HELM_RELEASE_SERVICES_SUCCESS = '[Helm] Get Release Services Success';
+export const GET_HELM_RELEASE_SERVICES_FAILURE = '[Helm] Get Release Services Failure';
+
+export const UPDATE_HELM_RELEASE_STATUS = '[Helm] Update Release Status [WS]';
+export const UPDATE_HELM_RELEASE_STATUS_SUCCESS = '[Helm] Update Release Status [WS] Success';
+export const UPDATE_HELM_RELEASE_STATUS_FAILURE = '[Helm] Update Release Status [WS] Failure';
+
+export class GetHelmReleases implements MonocularPaginationAction {
+  constructor() {
+    this.paginationKey = 'helm-releases';
+  }
+  type = GET_HELM_RELEASES;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
+  entityType = helmReleaseEntityKey;
+  entity = [kubernetesEntityFactory(helmReleaseEntityKey)];
+  actions = [
+    GET_HELM_RELEASES,
+    GET_HELM_RELEASES_SUCCESS,
+    GET_HELM_RELEASES_FAILURE
+  ];
+  paginationKey: string;
+  initialParams = {
+    'order-direction': 'desc',
+    'order-direction-field': 'name',
+  };
+}
+
+export class GetHelmReleaseStatus implements EntityRequestAction {
+  key: string;
+  constructor(
+    public endpointGuid: string,
+    public releaseTitle: string
+  ) {
+    // TODO: This should have `namespace` in if used in future?
+    this.key = `${endpointGuid}/${releaseTitle}`;
+  }
+  type = GET_HELM_RELEASE_STATUS;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
+  entity = kubernetesEntityFactory(helmReleaseStatusEntityType);
+  entityType = helmReleaseStatusEntityType;
+  actions = [
+    GET_HELM_RELEASE_STATUS,
+    GET_HELM_RELEASE_STATUS_SUCCESS,
+    GET_HELM_RELEASE_STATUS_FAILURE
+  ];
+}
+
+// Never dispateched - just used for look-up
+// Don't know why I need an action for this rather than an entity type?
+export class GetHelmReleaseGraph implements EntityRequestAction {
+  key: string;
+  constructor(
+    public endpointGuid: string,
+    public releaseTitle: string
+  ) {
+    this.key = `${endpointGuid}-${releaseTitle}`;
+  }
+  type = this.constructor.name;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
+  entity = kubernetesEntityFactory(helmReleaseGraphEntityType);
+  entityType = helmReleaseGraphEntityType;
+  actions = [this.type];
+}
+
+// Never dispateched - just used for look-up
+// Don't know why I need an action for this rather than an entity type?
+export class GetHelmReleaseResource implements EntityRequestAction {
+  key: string;
+  constructor(
+    public endpointGuid: string,
+    public releaseTitle: string
+  ) {
+    this.key = `${endpointGuid}-${releaseTitle}`;
+  }
+  type = this.constructor.name;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
+  entity = kubernetesEntityFactory(kubernetesPodsEntityType);
+  entityType = kubernetesPodsEntityType;
+  actions = [this.type];
+}
+
+
+export class GetHelmReleasePods implements MonocularPaginationAction {
+  constructor(
+    public endpointGuid: string,
+    public releaseTitle: string
+  ) {
+    this.paginationKey = `${endpointGuid}/${releaseTitle}/pods`;
+  }
+  type = GET_HELM_RELEASE_PODS;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
+  entityType = kubernetesPodsEntityType;
+  entity = [kubernetesEntityFactory(kubernetesPodsEntityType)];
+  actions = [
+    GET_HELM_RELEASE_PODS,
+    GET_HELM_RELEASE_PODS_SUCCESS,
+    GET_HELM_RELEASE_PODS_FAILURE
+  ];
+  paginationKey: string;
+  initialParams = {
+    'order-direction': 'asc',
+    'order-direction-field': 'name',
+  };
+  static createKey = (endpointGuid: string, releaseTitle: string, name: string): string => {
+    return `${endpointGuid}/${releaseTitle}/${name}`;
+  }
+}
+
+export class GetHelmReleaseServices implements MonocularPaginationAction {
+  constructor(
+    public endpointGuid: string,
+    public releaseTitle: string
+  ) {
+    this.paginationKey = `${endpointGuid}/${releaseTitle}/services`;
+  }
+  type = GET_HELM_RELEASE_SERVICES;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
+  entityType = kubernetesServicesEntityType;
+  entity = [kubernetesEntityFactory(kubernetesServicesEntityType)];
+  actions = [
+    GET_HELM_RELEASE_SERVICES,
+    GET_HELM_RELEASE_SERVICES_SUCCESS,
+    GET_HELM_RELEASE_SERVICES_FAILURE
+  ];
+  paginationKey: string;
+  initialParams = {
+    'order-direction': 'asc',
+    'order-direction-field': 'name',
+  };
+  static createKey = (endpointGuid: string, releaseTitle: string, name: string): string => {
+    return `${endpointGuid}/${releaseTitle}/${name}`;
+  }
+}
+
+export class HelmUpdateRelease implements Action {
+  constructor(public values: any) { }
+  type = UPDATE_HELM_RELEASE_STATUS;
+  // public guid = () => '<New Release>' + this.values.releaseName;
+}
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
new file mode 100644
index 0000000000..557d4b15a7
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts
@@ -0,0 +1,223 @@
+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 { environment } from 'frontend/packages/core/src/environments/environment';
+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 { NormalizedResponse } from '../../../../../../store/src/types/api.types';
+import {
+  EntityRequestAction,
+  StartRequestAction,
+  WrapperRequestActionFailed,
+  WrapperRequestActionSuccess,
+} from '../../../../../../store/src/types/request.types';
+import { HelmRelease, HelmReleaseStatus } from '../workload.types';
+import {
+  GET_HELM_RELEASE_SERVICES,
+  GET_HELM_RELEASE_STATUS,
+  GET_HELM_RELEASES,
+  GetHelmReleases,
+  GetHelmReleaseServices,
+  GetHelmReleaseStatus,
+} from './workloads.actions';
+
+@Injectable()
+export class WorkloadsEffects {
+
+  constructor(
+    private httpClient: HttpClient,
+    private actions$: Actions,
+    private store: Store<AppState>
+  ) {
+
+
+  }
+
+  proxyAPIVersion = environment.proxyAPIVersion;
+
+
+  @Effect()
+  fetchReleases$ = this.actions$.pipe(
+    ofType<GetHelmReleases>(GET_HELM_RELEASES),
+    flatMap(action => {
+      const entityKey = entityCatalog.getEntityKey(action);
+      return this.makeRequest(action, `/pp/${this.proxyAPIVersion}/helm/releases`, (response) => {
+        const processedData = {
+          entities: { [entityKey]: {} },
+          result: []
+        } as NormalizedResponse;
+
+        // Go through each endpoint ID
+        Object.keys(response).forEach(endpoint => {
+          const endpointData = response[endpoint];
+          if (!endpointData) {
+            return;
+          }
+          endpointData.forEach((data) => {
+            console.log('Got helm release');
+            console.log(data);
+            const helmRelease: HelmRelease = {
+              ...data,
+              endpointId: endpoint
+            };
+            // Release name is unique for an endpoint - for Helm 3, include the namespace
+            const id = endpoint + ':' + data.namespace + ':' + data.name;
+            helmRelease.guid = id;
+            // Make a note of the guid of the endpoint for the release
+            helmRelease.status = this.mapHelmStatus(data.info.status);
+            helmRelease.lastDeployed = this.mapHelmModifiedDate(data.info.last_deployed);
+            helmRelease.firstDeployed = this.mapHelmModifiedDate(data.info.first_deployed);
+            // data.info =
+            processedData.entities[entityKey][id] = helmRelease;
+            processedData.result.push(id);
+          });
+        });
+        return processedData;
+      }, []);
+    })
+  );
+
+  @Effect()
+  fetchHelmReleaseStatus$ = this.actions$.pipe(
+    ofType<GetHelmReleaseStatus>(GET_HELM_RELEASE_STATUS),
+    flatMap(action => {
+      const entityKey = entityCatalog.getEntityKey(action);
+      return this.makeRequest(
+        action,
+        `/pp/${this.proxyAPIVersion}/helm/releases/${action.endpointGuid}/${action.releaseTitle}`,
+        (response) => {
+          const processedData = {
+            entities: { [entityKey]: {} },
+            result: []
+          } as NormalizedResponse;
+
+          const status = {};
+
+          // TODO
+
+          // this.updateReleasePods(action, status);
+
+          // this.updateReleaseServices(action, status);
+
+          // Go through each endpoint ID
+          const newStatus: HelmReleaseStatus = {
+            endpointId: action.endpointGuid,
+            releaseTitle: action.releaseTitle,
+            ...status,
+            pods: [],
+            fields: [],
+            data: {
+              'v1/Pod': {},
+              'v1/Service': {}
+            }
+          };
+          processedData.entities[entityKey][action.key] = newStatus;
+          processedData.result.push(action.key);
+          return processedData;
+        }, [action.endpointGuid]);
+    })
+  );
+
+
+  // TODO: NWM This uses GetHelmReleaseStatus. I added `namespace` to GetHelmReleaseStatus
+  @Effect()
+  fetchHelmReleaseServices$ = this.actions$.pipe(
+    ofType<GetHelmReleaseServices>(GET_HELM_RELEASE_SERVICES),
+    mergeMap(action => [new GetHelmReleaseStatus(action.endpointGuid, action.releaseTitle)])
+  );
+
+  // private updateReleasePods(action: GetHelmReleaseStatus, status: HelmReleaseStatus) {
+  //   const releasePodsAction = new GetHelmReleasePods(action.endpointGuid, action.releaseTitle);
+  //   const pods = Object.values(status.data['v1/Pod']).reduce((res, pod) => {
+  //     const newPod: HelmReleasePod = {
+  //       endpointId: action.endpointGuid,
+  //       releaseTitle: action.releaseTitle,
+  //       ...pod
+  //     };
+  //     res[GetHelmReleasePods.createKey(action.endpointGuid, action.releaseTitle, pod.name)] = newPod;
+  //     return res;
+  //   }, {});
+  //   const keys = Object.keys(pods);
+  //   const releasePods = {
+  //     entities: { [entityCatalog.getEntityKey(releasePodsAction)]: pods },
+  //     result: keys
+  //   } as NormalizedResponse;
+  //   this.store.dispatch(new WrapperRequestActionSuccess(
+  //     releasePods,
+  //     releasePodsAction,
+  //     'fetch',
+  //     keys.length,
+  //     1)
+  //   );
+  // }
+
+  // private updateReleaseServices(action: GetHelmReleaseStatus, status: HelmReleaseStatus) {
+  //   const releaseServiceAction = new GetHelmReleaseServices(action.endpointGuid, action.releaseTitle);
+  //   const services = Object.values(status.data['v1/Service']).reduce((res, service) => {
+  //     const newService: HelmReleaseService = {
+  //       endpointId: action.endpointGuid,
+  //       releaseTitle: action.releaseTitle,
+  //       ...service
+  //     };
+  //     res[GetHelmReleasePods.createKey(action.endpointGuid, action.releaseTitle, service.name)] = newService;
+  //     return res;
+  //   }, {});
+  //   const keys = Object.keys(services);
+  //   const releaseServices = {
+  //     entities: { [entityCatalog.getEntityKey(releaseServiceAction)]: services },
+  //     result: keys
+  //   } as NormalizedResponse;
+  //   this.store.dispatch(new WrapperRequestActionSuccess(
+  //     releaseServices,
+  //     releaseServiceAction,
+  //     'fetch',
+  //     keys.length,
+  //     1)
+  //   );
+  // }
+
+  private makeRequest(
+    action: EntityRequestAction,
+    url: string,
+    mapResult: (response: any) => NormalizedResponse,
+    endpointIds: string[]
+  ): Observable<Action> {
+    this.store.dispatch(new StartRequestAction(action));
+    const requestArgs = {
+      headers: null,
+      params: null
+    };
+    return this.httpClient.get(url, requestArgs).pipe(
+      mergeMap((response: any) => [new WrapperRequestActionSuccess(mapResult(response), action)]),
+      catchError(error => [
+        new WrapperRequestActionFailed(error.message, action, 'fetch', {
+          endpointIds,
+          url: error.url || url,
+          eventCode: error.status ? error.status + '' : '500',
+          message: 'Helm Release API request error',
+          error
+        })
+      ])
+    );
+  }
+
+  // function _mapHelmStatus(status: number) {
+  //   return HelmStatus[status].replace('_', ' ');
+  // }
+
+  private mapHelmStatus(status: string) {
+    // TODO: Capitalize first letter
+    return status;
+    // return HelmStatus[status].replace('_', ' ');
+  }
+
+  private mapHelmModifiedDate(date: any) {
+    let unix = date.seconds * 1000 + date.nanos / 1000;
+    unix = Math.floor(unix);
+    return new Date(unix);
+  }
+}
diff --git a/custom-src/frontend/app/custom/helm/store/helm.reducers.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.reducers.ts
similarity index 76%
rename from custom-src/frontend/app/custom/helm/store/helm.reducers.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.reducers.ts
index 3d31b6fefc..44126dea98 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.reducers.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.reducers.ts
@@ -1,4 +1,4 @@
-import { UPDATE_HELM_RELEASE_STATUS } from './helm.actions';
+import { UPDATE_HELM_RELEASE_STATUS } from './workloads.actions';
 
 const defaultState = {};
 
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.store.module.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.store.module.ts
new file mode 100644
index 0000000000..5a66223f7b
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.store.module.ts
@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { EffectsModule } from '@ngrx/effects';
+import { StoreModule } from '@ngrx/store';
+
+import { WorkloadsEffects } from './workloads.effects';
+import { helmReleaseReducer } from './workloads.reducers';
+
+@NgModule({
+  imports: [
+    EffectsModule.forFeature([
+      WorkloadsEffects
+    ]),
+    StoreModule.forFeature('helmRelease', helmReleaseReducer),
+  ]
+})
+export class WorkloadsStoreModule { }
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
new file mode 100644
index 0000000000..833ec2674c
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
@@ -0,0 +1,90 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { KubeService } from '../store/kube.types';
+
+export interface HelmRelease {
+  endpointId: string;
+  guid: string;
+  name: string;
+  namespace: string;
+  version: string;
+  status: string;
+  lastDeployed: Date;
+  firstDeployed: Date;
+  info: {
+    last_deployed: Date;
+    first_deployed: Date;
+    notes: string;
+    status: string;
+  };
+  config: any;
+  chart: {
+    values: any;
+    metadata: {
+      icon?: string;
+    };
+  };
+}
+
+export interface HelmReleaseStatus {
+  endpointId?: string;
+  releaseTitle?: string;
+  data: {
+    'v1/Pod': {
+      [key: string]: {
+        age: string;
+        name: string;
+        ready: string;
+        restarts: string;
+        status: string;
+      }
+    }
+    'v1/Service': {
+      [key: string]: {
+        name: string;
+      }
+    },
+    [dataKey: string]: any
+  };
+  fields: string[];
+  pods: any;
+}
+
+export interface HelmReleasePod {
+  endpointId: string;
+  releaseTitle: string;
+  name: string;
+  ready: string;
+  status: string;
+  restarts: string;
+  age: string;
+}
+
+export interface HelmReleaseService {
+  endpointId: string;
+  releaseTitle: string;
+  name: string;
+  kubeService$?: Observable<KubeService>;
+  metadata: any;
+  spec: any;
+}
+
+export interface HelmReleaseGraph {
+  endpointId: string;
+  releaseTitle: string;
+}
+
+export type HelmReleaseResource = any;
+
+export function isHelmReleaseService(obj: any): HelmReleaseService {
+  if (obj && obj.kubeService$) {
+    return obj as HelmReleaseService;
+  }
+}
+
+
+@Injectable()
+export class HelmReleaseGuid {
+  guid: string;
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts b/custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts
new file mode 100644
index 0000000000..0bbc4b8307
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts
@@ -0,0 +1,53 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { NgxGraphModule } from '@swimlane/ngx-graph';
+
+import { CoreModule } from '../../../core/core.module';
+import { SharedModule } from '../../../shared/shared.module';
+import { HelmReleaseServiceCardComponent } from './list-types/helm-release-service-card/helm-release-service-card.component';
+import { HelmServicePortsComponent } from './list-types/helm-service-ports/helm-service-ports.component';
+import { HelmReleaseTabBaseComponent } from './release/helm-release-tab-base/helm-release-tab-base.component';
+import { HelmReleaseNotesTabComponent } from './release/tabs/helm-release-notes-tab/helm-release-notes-tab.component';
+import { HelmReleasePodsTabComponent } from './release/tabs/helm-release-pods/helm-release-pods-tab.component';
+import {
+  HelmReleaseResourceGraphComponent,
+} from './release/tabs/helm-release-resource-graph/helm-release-resource-graph.component';
+import {
+  HelmReleaseResourcePreviewComponent,
+} from './release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component';
+import { HelmReleaseServicesTabComponent } from './release/tabs/helm-release-services/helm-release-services-tab.component';
+import { HelmReleaseSummaryTabComponent } from './release/tabs/helm-release-summary-tab/helm-release-summary-tab.component';
+import { HelmReleaseValuesTabComponent } from './release/tabs/helm-release-values-tab/helm-release-values-tab.component';
+import { HelmReleasesTabComponent } from './releases-tab/releases-tab.component';
+import { WorkloadsStoreModule } from './store/workloads.store.module';
+import { WorkloadsRouting } from './workloads.routing';
+
+@NgModule({
+  imports: [
+    CoreModule,
+    CommonModule,
+    SharedModule,
+    WorkloadsStoreModule,
+    WorkloadsRouting,
+    NgxGraphModule,
+  ],
+  declarations: [
+    HelmReleasesTabComponent,
+    HelmReleaseServiceCardComponent,
+    HelmReleaseTabBaseComponent,
+    HelmReleaseSummaryTabComponent,
+    HelmReleaseNotesTabComponent,
+    HelmReleaseValuesTabComponent,
+    HelmReleasePodsTabComponent,
+    HelmReleaseServicesTabComponent,
+    HelmReleaseResourceGraphComponent,
+    HelmReleaseResourcePreviewComponent,
+    HelmServicePortsComponent
+  ],
+  entryComponents: [
+    HelmReleaseServiceCardComponent,
+    HelmServicePortsComponent,
+    HelmReleaseResourcePreviewComponent,
+  ]
+})
+export class WorkloadsModule { }
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workloads.routing.ts b/custom-src/frontend/app/custom/kubernetes/workloads/workloads.routing.ts
new file mode 100644
index 0000000000..8f3a4100a7
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/workloads.routing.ts
@@ -0,0 +1,52 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { NgxChartsModule } from '@swimlane/ngx-charts';
+
+import { HelmReleaseTabBaseComponent } from './release/helm-release-tab-base/helm-release-tab-base.component';
+import { HelmReleaseNotesTabComponent } from './release/tabs/helm-release-notes-tab/helm-release-notes-tab.component';
+import { HelmReleasePodsTabComponent } from './release/tabs/helm-release-pods/helm-release-pods-tab.component';
+import {
+  HelmReleaseResourceGraphComponent,
+} from './release/tabs/helm-release-resource-graph/helm-release-resource-graph.component';
+import { HelmReleaseServicesTabComponent } from './release/tabs/helm-release-services/helm-release-services-tab.component';
+import { HelmReleaseSummaryTabComponent } from './release/tabs/helm-release-summary-tab/helm-release-summary-tab.component';
+import { HelmReleaseValuesTabComponent } from './release/tabs/helm-release-values-tab/helm-release-values-tab.component';
+import { HelmReleasesTabComponent } from './releases-tab/releases-tab.component';
+
+const routes: Routes = [
+  {
+    path: '',
+    children: [
+      {
+        path: '',
+        component: HelmReleasesTabComponent,
+        pathMatch: 'full',
+      },
+      {
+        // Helm Release Views
+        path: ':guid',
+        component: HelmReleaseTabBaseComponent,
+        data: {
+          reuseRoute: HelmReleaseTabBaseComponent,
+        },
+        children: [
+          { path: '', redirectTo: 'summary', pathMatch: 'full' },
+          { path: 'summary', component: HelmReleaseSummaryTabComponent },
+          { path: 'notes', component: HelmReleaseNotesTabComponent },
+          { path: 'values', component: HelmReleaseValuesTabComponent },
+          { path: 'pods', component: HelmReleasePodsTabComponent },
+          { path: 'services', component: HelmReleaseServicesTabComponent },
+          { path: 'graph', component: HelmReleaseResourceGraphComponent }
+        ]
+      },
+    ]
+  },
+];
+
+@NgModule({
+  imports: [
+    NgxChartsModule,
+    RouterModule.forChild(routes)
+  ]
+})
+export class WorkloadsRouting { }
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index f44cb27e48..c0421c9b43 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -1,4 +1,3 @@
-import { SidepanelPreviewComponent } from './components/sidepanel-preview/sidepanel-preview.component';
 import { CdkTableModule } from '@angular/cdk/table';
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
@@ -9,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 { 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';
@@ -47,6 +49,7 @@ 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';
 import { MetaCardComponent } from './components/list/list-cards/meta-card/meta-card-base/meta-card.component';
 import { MetaCardItemComponent } from './components/list/list-cards/meta-card/meta-card-item/meta-card-item.component';
@@ -84,6 +87,7 @@ import { PageSubNavComponent } from './components/page-sub-nav/page-sub-nav.comp
 import { PollingIndicatorComponent } from './components/polling-indicator/polling-indicator.component';
 import { RingChartComponent } from './components/ring-chart/ring-chart.component';
 import { RoutingIndicatorComponent } from './components/routing-indicator/routing-indicator.component';
+import { SidepanelPreviewComponent } from './components/sidepanel-preview/sidepanel-preview.component';
 import { SimpleUsageChartComponent } from './components/simple-usage-chart/simple-usage-chart.component';
 import { SnackBarReturnComponent } from './components/snackbar-return/snackbar-return.component';
 import { SshViewerComponent } from './components/ssh-viewer/ssh-viewer.component';
@@ -107,9 +111,6 @@ import {
 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 { 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 { CapitalizeFirstPipe } from './pipes/capitalizeFirstLetter.pipe';
 import { MbToHumanSizePipe } from './pipes/mb-to-human-size.pipe';
 import { PercentagePipe } from './pipes/percentage.pipe';
@@ -120,7 +121,6 @@ import { CloudFoundryUserProvidedServicesService } from './services/cloud-foundr
 import { LongRunningOperationsService } from './services/long-running-op.service';
 import { MetricsRangeSelectorService } from './services/metrics-range-selector.service';
 import { UserPermissionDirective } from './user-permission.directive';
-import { JsonViewerComponent } from './components/json-viewer/json-viewer.component';
 
 
 @NgModule({

From 178dfbc3b422d116b2023b0694ec5b3d80e28ade Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 14 Jan 2020 14:35:13 +0000
Subject: [PATCH 239/648] Add API for getting Helm Release

---
 .../helm-release-tab-base.component.ts        |   2 +-
 .../tabs/helm-release-helper.service.ts       |  45 ++--
 .../workloads/store/workloads.actions.ts      |  30 +--
 .../workloads/store/workloads.effects.ts      |  29 +--
 .../workloads/store/workloads.reducers.ts     |   4 +-
 .../plugins/kubernetes/get_release.go         | 220 ++++++++++++++++
 .../plugins/kubernetes/list_releases.go       | 236 ------------------
 src/jetstream/plugins/kubernetes/main.go      |   1 +
 8 files changed, 277 insertions(+), 290 deletions(-)
 create mode 100644 src/jetstream/plugins/kubernetes/get_release.go

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 557a220a8f..f429f739a8 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
@@ -81,7 +81,7 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
     const host = window.location.host;
     const protocol = window.location.protocol === 'https:' ? 'wss' : 'ws';
     const streamUrl = (
-      `${protocol}://${host}/pp/v1/helm/releases/${releaseRef}`
+      `${protocol}://${host}/pp/v1/helm/releases/${releaseRef}/status`
     );
 
     const socket$ = makeWebSocketObservable(streamUrl).pipe(catchError(e => {
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 c2fa6bd22c..3e26a4bacf 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
@@ -13,7 +13,7 @@ import {
   GetHelmReleaseGraph,
   GetHelmReleaseResource,
   GetHelmReleases,
-  GetHelmReleaseStatus,
+  GetHelmRelease,
 } from '../../store/workloads.actions';
 import {
   HelmRelease,
@@ -46,23 +46,30 @@ export class HelmReleaseHelperService {
     this.namespace = this.guid.split(':')[1];
     this.endpointGuid = this.guid.split(':')[0];
 
-    // TODO: NWM This should use a `GetHelmRelease` action instead of fetching the entire list
-    const action = new GetHelmReleases();
-    const paginationMonitor = new PaginationMonitor(store, action.paginationKey, kubernetesEntityFactory(helmReleaseEntityKey));
-    const svc = getPaginationObservables({ store, action, paginationMonitor });
-    this.isFetching$ = svc.fetchingEntities$;
-
-    this.release$ = svc.entities$.pipe(
-      map((items: HelmRelease[]) => items.find(item => item.guid === this.guid)),
-      map((item: HelmRelease) => {
-        if (!item.chart.metadata.icon) {
-          const copy = JSON.parse(JSON.stringify(item));
-          copy.chart.metadata.icon = '/core/assets/custom/app_placeholder.svg';
-          return copy;
-        }
-        return item;
-      })
+    const action = new GetHelmRelease(this.endpointGuid, this.namespace, this.releaseTitle);
+    const entityService = this.esf.create<HelmRelease>(action.guid, action);
+
+
+    this.release$ = entityService.waitForEntity$.pipe(
+      map((item) => item.entity)
     );
+
+    // TODO: NWM This should use a `GetHelmRelease` action instead of fetching the entire list
+    // const paginationMonitor = new PaginationMonitor(store, action.paginationKey, kubernetesEntityFactory(helmReleaseEntityKey));
+    // const svc = getPaginationObservables({ store, action, paginationMonitor });
+    this.isFetching$ = entityService.isFetchingEntity$;
+
+    // this.release$ = svc.entities$.pipe(
+    //   map((items: HelmRelease[]) => items.find(item => item.guid === this.guid)),
+    //   map((item: HelmRelease) => {
+    //     if (!item.chart.metadata.icon) {
+    //       const copy = JSON.parse(JSON.stringify(item));
+    //       copy.chart.metadata.icon = '/core/assets/custom/app_placeholder.svg';
+    //       return copy;
+    //     }
+    //     return item;
+    //   })
+    // );
   }
 
   public guidAsUrlFragment(): string {
@@ -71,9 +78,9 @@ export class HelmReleaseHelperService {
 
   public fetchReleaseStatus(): Observable<HelmReleaseStatus> {
     // Get helm release
-    const action = new GetHelmReleaseStatus(this.endpointGuid, this.releaseTitle);
+    const action = new GetHelmRelease(this.endpointGuid, this.namespace, this.releaseTitle);
 
-    return this.esf.create<HelmReleaseStatus>(action.key, action).waitForEntity$.pipe(
+    return this.esf.create<HelmReleaseStatus>(action.guid, action).waitForEntity$.pipe(
       map(entity => entity.entity)
     );
   }
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
index 84570d7311..a0648baf09 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
@@ -14,9 +14,9 @@ export const GET_HELM_RELEASES = '[Helm] Get Releases';
 export const GET_HELM_RELEASES_SUCCESS = '[Helm] Get Releases Success';
 export const GET_HELM_RELEASES_FAILURE = '[Helm] Get Releases Failure';
 
-export const GET_HELM_RELEASE_STATUS = '[Helm] Get Release Status';
-export const GET_HELM_RELEASE_STATUS_SUCCESS = '[Helm] Get Release Status Success';
-export const GET_HELM_RELEASE_STATUS_FAILURE = '[Helm] Get Release Status Failure';
+export const GET_HELM_RELEASE = '[Helm] Get Release Status';
+export const GET_HELM_RELEASE_SUCCESS = '[Helm] Get Release Status Success';
+export const GET_HELM_RELEASE_FAILURE = '[Helm] Get Release Status Failure';
 
 export const GET_HELM_RELEASE_PODS = '[Helm] Get Release Pods';
 export const GET_HELM_RELEASE_PODS_SUCCESS = '[Helm] Get Release Pods Success';
@@ -26,9 +26,9 @@ export const GET_HELM_RELEASE_SERVICES = '[Helm] Get Release Services';
 export const GET_HELM_RELEASE_SERVICES_SUCCESS = '[Helm] Get Release Services Success';
 export const GET_HELM_RELEASE_SERVICES_FAILURE = '[Helm] Get Release Services Failure';
 
-export const UPDATE_HELM_RELEASE_STATUS = '[Helm] Update Release Status [WS]';
-export const UPDATE_HELM_RELEASE_STATUS_SUCCESS = '[Helm] Update Release Status [WS] Success';
-export const UPDATE_HELM_RELEASE_STATUS_FAILURE = '[Helm] Update Release Status [WS] Failure';
+export const UPDATE_HELM_RELEASE = '[Helm] Update Release';
+export const UPDATE_HELM_RELEASE_SUCCESS = '[Helm] Update Release Success';
+export const UPDATE_HELM_RELEASE_FAILURE = '[Helm] Update Release Failure';
 
 export class GetHelmReleases implements MonocularPaginationAction {
   constructor() {
@@ -50,23 +50,23 @@ export class GetHelmReleases implements MonocularPaginationAction {
   };
 }
 
-export class GetHelmReleaseStatus implements EntityRequestAction {
-  key: string;
+export class GetHelmRelease implements EntityRequestAction {
+  guid: string;
   constructor(
     public endpointGuid: string,
+    public namespace: string,
     public releaseTitle: string
   ) {
-    // TODO: This should have `namespace` in if used in future?
-    this.key = `${endpointGuid}/${releaseTitle}`;
+    this.guid = `${endpointGuid}:${namespace}:${releaseTitle}`;
   }
-  type = GET_HELM_RELEASE_STATUS;
+  type = GET_HELM_RELEASE;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = kubernetesEntityFactory(helmReleaseStatusEntityType);
   entityType = helmReleaseStatusEntityType;
   actions = [
-    GET_HELM_RELEASE_STATUS,
-    GET_HELM_RELEASE_STATUS_SUCCESS,
-    GET_HELM_RELEASE_STATUS_FAILURE
+    GET_HELM_RELEASE,
+    GET_HELM_RELEASE_SUCCESS,
+    GET_HELM_RELEASE_FAILURE
   ];
 }
 
@@ -159,6 +159,6 @@ export class GetHelmReleaseServices implements MonocularPaginationAction {
 
 export class HelmUpdateRelease implements Action {
   constructor(public values: any) { }
-  type = UPDATE_HELM_RELEASE_STATUS;
+  type = UPDATE_HELM_RELEASE;
   // public guid = () => '<New Release>' + this.values.releaseName;
 }
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 557d4b15a7..4894169aec 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
@@ -17,12 +17,10 @@ import {
 } from '../../../../../../store/src/types/request.types';
 import { HelmRelease, HelmReleaseStatus } from '../workload.types';
 import {
-  GET_HELM_RELEASE_SERVICES,
-  GET_HELM_RELEASE_STATUS,
+  GET_HELM_RELEASE,
   GET_HELM_RELEASES,
   GetHelmReleases,
-  GetHelmReleaseServices,
-  GetHelmReleaseStatus,
+  GetHelmRelease
 } from './workloads.actions';
 
 @Injectable()
@@ -82,13 +80,13 @@ export class WorkloadsEffects {
   );
 
   @Effect()
-  fetchHelmReleaseStatus$ = this.actions$.pipe(
-    ofType<GetHelmReleaseStatus>(GET_HELM_RELEASE_STATUS),
+  fetchHelmRelease$ = this.actions$.pipe(
+    ofType<GetHelmRelease>(GET_HELM_RELEASE),
     flatMap(action => {
       const entityKey = entityCatalog.getEntityKey(action);
       return this.makeRequest(
         action,
-        `/pp/${this.proxyAPIVersion}/helm/releases/${action.endpointGuid}/${action.releaseTitle}`,
+        `/pp/${this.proxyAPIVersion}/helm/releases/${action.endpointGuid}/${action.namespace}/${action.releaseTitle}`,
         (response) => {
           const processedData = {
             entities: { [entityKey]: {} },
@@ -97,11 +95,7 @@ export class WorkloadsEffects {
 
           const status = {};
 
-          // TODO
-
-          // this.updateReleasePods(action, status);
-
-          // this.updateReleaseServices(action, status);
+          console.log(response);
 
           // Go through each endpoint ID
           const newStatus: HelmReleaseStatus = {
@@ -124,11 +118,12 @@ export class WorkloadsEffects {
 
 
   // TODO: NWM This uses GetHelmReleaseStatus. I added `namespace` to GetHelmReleaseStatus
-  @Effect()
-  fetchHelmReleaseServices$ = this.actions$.pipe(
-    ofType<GetHelmReleaseServices>(GET_HELM_RELEASE_SERVICES),
-    mergeMap(action => [new GetHelmReleaseStatus(action.endpointGuid, action.releaseTitle)])
-  );
+  // RC: Don't need this anymore - services come back over the web socket
+  // @Effect()
+  // fetchHelmReleaseServices$ = this.actions$.pipe(
+  //   ofType<GetHelmReleaseServices>(GET_HELM_RELEASE_SERVICES),
+  //   mergeMap(action => [new GetHelmReleaseStatus(action.endpointGuid, action.releaseTitle)])
+  // );
 
   // private updateReleasePods(action: GetHelmReleaseStatus, status: HelmReleaseStatus) {
   //   const releasePodsAction = new GetHelmReleasePods(action.endpointGuid, action.releaseTitle);
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.reducers.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.reducers.ts
index 44126dea98..1d6797ee74 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.reducers.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.reducers.ts
@@ -1,10 +1,10 @@
-import { UPDATE_HELM_RELEASE_STATUS } from './workloads.actions';
+import { UPDATE_HELM_RELEASE } from './workloads.actions';
 
 const defaultState = {};
 
 export function helmReleaseReducer(state: any = defaultState, action) {
   switch (action.type) {
-    case UPDATE_HELM_RELEASE_STATUS:
+    case UPDATE_HELM_RELEASE:
       return {
         ...state,
       };
diff --git a/src/jetstream/plugins/kubernetes/get_release.go b/src/jetstream/plugins/kubernetes/get_release.go
new file mode 100644
index 0000000000..6607d5844c
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/get_release.go
@@ -0,0 +1,220 @@
+package kubernetes
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"time"
+
+	//"fmt"
+
+	"github.com/gorilla/websocket"
+	"github.com/labstack/echo"
+	log "github.com/sirupsen/logrus"
+
+	"helm.sh/helm/v3/pkg/action"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/helm"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+)
+
+type ResourceResponse struct {
+	Kind string          `json:"kind"`
+	Data json.RawMessage `json:"data"`
+}
+
+type kubeReleasesData struct {
+	Endpoint  string `json:"endpoint"`
+	Name      string `json:"releaseName"`
+	Namespace string `json:"releaseNamespace"`
+	Chart     struct {
+		Name       string `json:"chartName"`
+		Repository string `json:"repo"`
+		Version    string `json:"version"`
+	} `json:"chart"`
+}
+
+// GetRelease gets the release information for a specific Helm release
+func (c *KubernetesSpecification) GetRelease(ec echo.Context) error {
+
+	// Need to get a config object for the target endpoint
+	endpointGUID := ec.Param("endpoint")
+	release := ec.Param("name")
+	namespace := ec.Param("namespace")
+	userID := ec.Get("user_id").(string)
+
+	log.Debugf("Helm: Get Release: %s %s %s", endpointGUID, namespace, release)
+
+	config, hc, err := c.GetHelmConfiguration(endpointGUID, userID, namespace)
+	if err != nil {
+		log.Errorf("Helm: GetRelease could not get a Helm Configuration: %s", err)
+		return err
+	}
+
+	defer hc.Cleanup()
+
+	status := action.NewStatus(config)
+	res, err := status.Run(release)
+	if err != nil {
+		log.Error(err)
+		return err
+	}
+
+	return ec.JSON(200, res)
+}
+
+// GetReleaseStatus will get release status for the given release
+// This is a web socket request and will return info over the websocket
+// polling until disconnected
+func (c *KubernetesSpecification) GetReleaseStatus(ec echo.Context) error {
+
+	// Need to get a config object for the target endpoint
+	endpointGUID := ec.Param("endpoint")
+	release := ec.Param("name")
+	namespace := ec.Param("namespace")
+	userID := ec.Get("user_id").(string)
+
+	log.Debugf("Helm: Get Release Status: %s %s %s", endpointGUID, namespace, release)
+
+	config, hc, err := c.GetHelmConfiguration(endpointGUID, userID, namespace)
+	if err != nil {
+		log.Errorf("Helm: GetRelease could not get a Helm Configuration: %s", err)
+		return err
+	}
+
+	defer hc.Cleanup()
+
+	status := action.NewStatus(config)
+	res, err := status.Run(release)
+	if err != nil {
+		log.Error(err)
+		return err
+	}
+
+	// Upgrade to a web socket
+	ws, pingTicker, err := interfaces.UpgradeToWebSocket(ec)
+	if err != nil {
+		return err
+	}
+	defer ws.Close()
+	defer pingTicker.Stop()
+
+	// ws is the websocket ready for use
+
+	// Write the release info first - we will then go fetch the status of evertyhing in the release and send
+	// this back incrementally
+
+	// Parse the manifest
+	log.Info("Got release")
+	rel := helm.NewHelmRelease(res, endpointGUID, userID)
+	log.Info("Done")
+
+	graph := helm.NewHelmReleaseGraph(rel)
+
+	id := fmt.Sprintf("%s-%s", endpointGUID, rel.Namespace)
+
+	// Send over the namespace details of the release
+	sendResource(ws, "ReleasePrefix", id)
+
+	//graph.ParseManifest(rel)
+
+	// Send the manifest for the release
+	sendResource(ws, "Resources", rel.GetResources())
+
+	// // Send the manifest for the release
+	// sendResource(ws, "Test", rel.HelmManifest)
+
+	// Send the graph as we have it now
+	sendResource(ws, "Graph", graph)
+
+	// Loop over this until the web socket is closed
+
+	// Get the pods first and send those
+	rel.UpdatePods(c.portalProxy)
+	sendResource(ws, "Pods", rel.GetPods())
+
+	//graph.Generate(pods)
+	//graph.ParseManifest(rel)
+	sendResource(ws, "Graph", graph)
+
+	// Send the manifest for the release again (ReplicaSets will now be added)
+	sendResource(ws, "Manifest", rel.GetResources())
+
+	// Now get all of the resources in the manifest
+	rel.UpdateResources(c.portalProxy)
+	sendResource(ws, "Resources", rel.GetResources())
+
+	graph.ParseManifest(rel)
+	sendResource(ws, "Graph", graph)
+
+	stopchan := make(chan bool)
+
+	go readLoop(ws, stopchan)
+
+	var sleep = 1 * time.Second
+
+	// Now we have everything, so loop, polling to get status
+	for {
+		log.Debug("Polling for release - wait 10 seconds")
+
+		select {
+		case <-stopchan:
+			ws.Close()
+			return nil
+		case <-time.After(sleep):
+			break
+		}
+
+		log.Debug("Polling for release ....")
+
+		// Pods
+		rel.UpdatePods(c.portalProxy)
+		sendResource(ws, "Pods", rel.GetPods())
+
+		graph.ParseManifest(rel)
+		sendResource(ws, "Graph", graph)
+
+		// Now get all of the resources in the manifest
+		rel.UpdateResources(c.portalProxy)
+		sendResource(ws, "Resources", rel.GetResources())
+
+		graph.ParseManifest(rel)
+		sendResource(ws, "Graph", graph)
+
+		sleep = 10 * time.Second
+	}
+
+	ws.Close()
+
+	return nil
+}
+
+func readLoop(c *websocket.Conn, stopchan chan<- bool) {
+	for {
+		if _, _, err := c.NextReader(); err != nil {
+			c.Close()
+			close(stopchan)
+			break
+		}
+	}
+}
+
+func sendResource(ws *websocket.Conn, kind string, data interface{}) error {
+
+	var err error
+	var txt []byte
+	if txt, err = json.Marshal(data); err == nil {
+		resp := ResourceResponse{
+			Kind: kind,
+			Data: json.RawMessage(txt),
+		}
+
+		if txt, err = json.Marshal(resp); err == nil {
+			if ws.WriteMessage(websocket.TextMessage, txt); err == nil {
+				return nil
+			}
+		}
+	}
+
+	return err
+}
diff --git a/src/jetstream/plugins/kubernetes/list_releases.go b/src/jetstream/plugins/kubernetes/list_releases.go
index 867da05e1c..849dbd68c3 100644
--- a/src/jetstream/plugins/kubernetes/list_releases.go
+++ b/src/jetstream/plugins/kubernetes/list_releases.go
@@ -1,92 +1,14 @@
 package kubernetes
 
 import (
-	"encoding/json"
-	"fmt"
-
-	"time"
-
-	//"fmt"
-
-	"github.com/gorilla/websocket"
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
 
-	// "k8s.io/client-go/rest"
 	"helm.sh/helm/v3/pkg/action"
-	// "helm.sh/helm/v3/pkg/release"
 
-	// "k8s.io/helm/pkg/kube"
-
-	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/helm"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 )
 
-// type helmReleaseInfo struct {
-// 	*release.Release
-// 	Extra     string                `json:"extra"`
-// 	Resources []helmReleaseResource `json:"resources"`
-// }
-
-// type helmReleaseResource struct {
-// 	Kind       string `json:"kind"`
-// 	APIVersion string `json:"apiVersion"`
-// 	Name       string `json:"name"`
-// }
-
-type ResourceResponse struct {
-	Kind string          `json:"kind"`
-	Data json.RawMessage `json:"data"`
-}
-
-// type KubeResource struct {
-// 	Kind       string `yaml:"kind"`
-// 	APIVersion string `yaml:"apiVersion"`
-// 	Metadata   struct {
-// 		Name string `yaml:"name"`
-// 	} `yaml:"metadata"`
-// 	Spec interface{} `yaml:"spec"`
-// }
-
-// type kubeAPIJob struct {
-// 	Kind       string
-// 	APIVersion string
-// 	Name       string
-// 	Namespace  string
-// 	Endpoint   string
-// 	User       string
-// }
-
-// type KubeAPIJobResult struct {
-// 	helm.KubeResourceJob
-// 	StatusCode int
-// 	Data       json.RawMessage
-// }
-
-type kubeReleasesData struct {
-	Endpoint  string `json:"endpoint"`
-	Name      string `json:"releaseName"`
-	Namespace string `json:"releaseNamespace"`
-	Chart     struct {
-		Name       string `json:"chartName"`
-		Repository string `json:"repo"`
-		Version    string `json:"version"`
-	} `json:"chart"`
-}
-
-// type helmReleasesData struct {
-// 	Manifest  string `json:"endpoint"`
-// 	Name      string `json:"releaseName"`
-// 	Namespace string `json:"releaseNamespace"`
-// 	Chart     struct {
-// 		Name       string `json:"chartName"`
-// 		Repository string `json:"repo"`
-// 		Version    string `json:"version"`
-// 	} `json:"chart"`
-// }
-
-type kubeReleasesResponse map[string]kubeReleasesData
-
 // ListReleases will list the helm releases for all endpoints
 func (c *KubernetesSpecification) ListReleases(ec echo.Context) error {
 	log.Debug("ListReleases")
@@ -139,161 +61,3 @@ func (c *KubernetesSpecification) listReleases(ep *interfaces.ConnectedEndpoint,
 
 	done <- response
 }
-
-// GetRelease will get release status for the given release
-// This is a web socket request and will return info over the websocket
-// polling until disconnected
-func (c *KubernetesSpecification) GetRelease(ec echo.Context) error {
-
-	// Need to get a config object for the target endpoint
-	endpointGUID := ec.Param("endpoint")
-	release := ec.Param("name")
-	namespace := ec.Param("namespace")
-	userID := ec.Get("user_id").(string)
-
-	log.Infof("GET RELEASE: %s %s %s", endpointGUID, namespace, release)
-
-	config, hc, err := c.GetHelmConfiguration(endpointGUID, userID, namespace)
-	if err != nil {
-		log.Errorf("Helm: GetRelease could not get a Helm Configuration: %s", err)
-		return err
-	}
-
-	defer hc.Cleanup()
-
-	status := action.NewStatus(config)
-	res, err := status.Run(release)
-	if err != nil {
-		log.Error(err)
-		return err
-	}
-
-	// Upgrade to a web socket
-	ws, pingTicker, err := interfaces.UpgradeToWebSocket(ec)
-	if err != nil {
-		return err
-	}
-	defer ws.Close()
-	defer pingTicker.Stop()
-
-	// ws is the websocket ready for use
-
-	// Write the release info first - we will then go fetch the status of evertyhing in the release and send
-	// this back incrementally
-
-	// Parse the manifest
-	log.Info("Got release")
-	rel := helm.NewHelmRelease(res, endpointGUID, userID)
-	log.Info("Done")
-
-	graph := helm.NewHelmReleaseGraph(rel)
-
-	id := fmt.Sprintf("%s-%s", endpointGUID, rel.Namespace)
-
-	// Send over the namespace details of the release
-	sendResource(ws, "ReleasePrefix", id)
-
-	//graph.ParseManifest(rel)
-
-	// Send the manifest for the release
-	sendResource(ws, "Resources", rel.GetResources())
-
-	// // Send the manifest for the release
-	// sendResource(ws, "Test", rel.HelmManifest)
-
-	// Send the graph as we have it now
-	sendResource(ws, "Graph", graph)
-
-	// Loop over this until the web socket is closed
-
-	// Get the pods first and send those
-	rel.UpdatePods(c.portalProxy)
-	sendResource(ws, "Pods", rel.GetPods())
-
-	//graph.Generate(pods)
-	//graph.ParseManifest(rel)
-	sendResource(ws, "Graph", graph)
-
-	// Send the manifest for the release again (ReplicaSets will now be added)
-	sendResource(ws, "Manifest", rel.GetResources())
-
-	// Now get all of the resources in the manifest
-	rel.UpdateResources(c.portalProxy)
-	sendResource(ws, "Resources", rel.GetResources())
-
-	graph.ParseManifest(rel)
-	sendResource(ws, "Graph", graph)
-
-	stopchan := make(chan bool)
-
-	go readLoop(ws, stopchan)
-
-	var sleep = 1 * time.Second
-
-	// Now we have everything, so loop, polling to get status
-	for {
-		log.Debug("Polling for release - wait 10 seconds")
-
-		select {
-		case <-stopchan:
-			ws.Close()
-			return nil
-		case <-time.After(sleep):
-			break
-		}
-
-		log.Debug("Polling for release ....")
-
-		// Pods
-		rel.UpdatePods(c.portalProxy)
-		sendResource(ws, "Pods", rel.GetPods())
-
-		graph.ParseManifest(rel)
-		sendResource(ws, "Graph", graph)
-
-		// Now get all of the resources in the manifest
-		rel.UpdateResources(c.portalProxy)
-		sendResource(ws, "Resources", rel.GetResources())
-
-		graph.ParseManifest(rel)
-		sendResource(ws, "Graph", graph)
-
-		sleep = 10 * time.Second
-	}
-
-	ws.Close()
-
-	return nil
-}
-
-func readLoop(c *websocket.Conn, stopchan chan<- bool) {
-	for {
-		if _, _, err := c.NextReader(); err != nil {
-			c.Close()
-			close(stopchan)
-			break
-		}
-	}
-}
-
-func sendResource(ws *websocket.Conn, kind string, data interface{}) error {
-
-	var err error
-	var txt []byte
-	if txt, err = json.Marshal(data); err == nil {
-		resp := ResourceResponse{
-			Kind: kind,
-			Data: json.RawMessage(txt),
-		}
-
-		if txt, err = json.Marshal(resp); err == nil {
-			if ws.WriteMessage(websocket.TextMessage, txt); err == nil {
-				return nil
-			}
-
-			log.Info(err)
-		}
-	}
-
-	return err
-}
diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index fc668ed6dd..d98db1ca64 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -119,6 +119,7 @@ func (c *KubernetesSpecification) AddSessionGroupRoutes(echoGroup *echo.Group) {
 	echoGroup.GET("/helm/releases", c.ListReleases)
 	echoGroup.POST("/helm/install", c.InstallRelease)
 	echoGroup.DELETE("/helm/releases/:endpoint/:namespace/:name", c.DeleteRelease)
+	echoGroup.GET("/helm/releases/:endpoint/:namespace/:name/status", c.GetReleaseStatus)
 	echoGroup.GET("/helm/releases/:endpoint/:namespace/:name", c.GetRelease)
 }
 

From aa8a729f24055b02164787a0a7cc0bd83b6ed156 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 14 Jan 2020 16:11:36 +0000
Subject: [PATCH 240/648] Fix & tidy up Endpoint Connected State - Removed odd
 `Registered` property on endpoint object   - Switch usages to look at
 connected state instead - Fix handling of endpoints that are connectable in
 Favourites component

---
 .../cf-services-list-config.service.ts        | 14 ++---
 .../cf-org-space-service.service.ts           |  4 +-
 .../src/store/effects/permissions.effect.ts   |  6 +--
 .../core/current-user-permissions.checker.ts  |  6 +--
 .../src/features/endpoints/connect.service.ts |  8 ++-
 .../components/cf-auth/cf-auth.service.ts     |  2 +-
 .../favorites-meta-card.component.ts          | 12 ++---
 .../store/src/effects/endpoint.effects.ts     |  3 +-
 .../pipline-http-client.service.ts            |  8 +--
 .../store/src/selectors/endpoint.selectors.ts | 51 ++++++++-----------
 .../store/src/types/endpoint.types.ts         |  1 -
 11 files changed, 54 insertions(+), 61 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts
index ff33e3955c..4be15adbb2 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
+import { endpointsCfEntitiesConnectedSelector } from 'frontend/packages/store/src/selectors/endpoint.selectors';
 import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
 import { first, map } from 'rxjs/operators';
 
@@ -11,9 +12,7 @@ import {
   ListViewTypes,
 } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
-import { endpointsRegisteredEntitiesSelector } from '../../../../../../../store/src/selectors/endpoint.selectors';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
 import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
 import { haveMultiConnectedCfs } from '../../../../../features/cloud-foundry/cf.helpers';
 import { CfOrgSpaceItem, createCfOrgSpaceFilterConfig } from '../../../../data-services/cf-org-space-service.service';
@@ -39,13 +38,10 @@ export class CfServicesListConfigService implements IListConfig<APIResource> {
   ) {
     this.dataSource = new CfServicesDataSource(this.store, activeRouteCfOrgSpace.cfGuid, this);
     this.cf = {
-      list$: this.store
-        .select(endpointsRegisteredEntitiesSelector).pipe(
-          first(),
-          map(endpoints => {
-            return Object.values(endpoints)
-              .filter((endpoint: EndpointModel) => endpoint.connectionStatus === 'connected' && endpoint.cnsi_type === 'cf');
-          })),
+      list$: this.store.select(endpointsCfEntitiesConnectedSelector).pipe(
+        first(),
+        map(endpoints => Object.values(endpoints))
+      ),
       loading$: observableOf(false),
       select: new BehaviorSubject(undefined)
     };
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 ee06815966..907bd96ec5 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
@@ -1,5 +1,6 @@
 import { Injectable, OnDestroy } from '@angular/core';
 import { Store } from '@ngrx/store';
+import { endpointsCfEntitiesConnectedSelector } from 'frontend/packages/store/src/selectors/endpoint.selectors';
 import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs';
 import {
   distinctUntilChanged,
@@ -32,7 +33,6 @@ import {
   getCurrentPageRequestInfo,
   getPaginationObservables,
 } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
-import { endpointsRegisteredEntitiesSelector } from '../../../../store/src/selectors/endpoint.selectors';
 import { selectPaginationState } from '../../../../store/src/selectors/pagination.selectors';
 import { APIResource } from '../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
@@ -219,7 +219,7 @@ export class CfOrgSpaceDataService implements OnDestroy {
   }
 
   private createCf() {
-    const list$ = this.store.select(endpointsRegisteredEntitiesSelector).pipe(
+    const list$ = this.store.select(endpointsCfEntitiesConnectedSelector).pipe(
       // Ensure we have endpoints
       filter(endpoints => endpoints && !!Object.keys(endpoints).length),
       publishReplay(1),
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 edf2bb0c5c..0a49a853e8 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
@@ -2,6 +2,7 @@ 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 { endpointsCfEntitiesConnectedSelector } from 'frontend/packages/store/src/selectors/endpoint.selectors';
 import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import {
   catchError,
@@ -16,16 +17,15 @@ import {
   withLatestFrom,
 } from 'rxjs/operators';
 
-import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
 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 {
   BaseHttpClientFetcher,
   flattenPagination,
   PaginationFlattener,
 } from '../../../../store/src/helpers/paginated-request-helpers';
 import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
-import { endpointsRegisteredCFEntitiesSelector } from '../../../../store/src/selectors/endpoint.selectors';
 import { selectPaginationState } from '../../../../store/src/selectors/pagination.selectors';
 import { EndpointModel, INewlyConnectedEndpointInfo } from '../../../../store/src/types/endpoint.types';
 import { BasePaginatedAction, PaginationEntityState } from '../../../../store/src/types/pagination.types';
@@ -146,7 +146,7 @@ export class PermissionsEffects {
 
   @Effect() getCurrentUsersPermissions$ = this.actions$.pipe(
     ofType<GetCurrentUsersRelations>(GET_CURRENT_USER_RELATIONS),
-    withLatestFrom(this.store.select(endpointsRegisteredCFEntitiesSelector)),
+    withLatestFrom(this.store.select(endpointsCfEntitiesConnectedSelector)),
     switchMap(([action, endpoints]) => {
       const endpointsArray = Object.values(endpoints);
       const isAllAdmins = endpointsArray.every(endpoint => !!endpoint.user.admin);
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 fa32235f70..946a1b5998 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
@@ -16,14 +16,14 @@ 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,
 } from '../../../store/src/selectors/current-user-role.selectors';
-import { endpointsRegisteredEntitiesSelector } from '../../../store/src/selectors/endpoint.selectors';
+import { connectedEndpointsSelector } from '../../../store/src/selectors/endpoint.selectors';
 import { CFFeatureFlagTypes } from '../shared/components/cf-auth/cf-auth.types';
-import { PaginationMonitor } from '../../../store/src/monitors/pagination-monitor';
 import { IFeatureFlag } from './cf-api.types';
 import {
   PermissionConfig,
@@ -320,7 +320,7 @@ export class CurrentUserPermissionsChecker {
   }
 
   private getAllEndpointGuids() {
-    return this.store.select(endpointsRegisteredEntitiesSelector).pipe(
+    return this.store.select(connectedEndpointsSelector).pipe(
       map(endpoints => Object.values(endpoints).filter(e => e.cnsi_type === 'cf').map(endpoint => endpoint.guid))
     );
   }
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 f235ef5429..102df34440 100644
--- a/src/frontend/packages/core/src/features/endpoints/connect.service.ts
+++ b/src/frontend/packages/core/src/features/endpoints/connect.service.ts
@@ -17,13 +17,13 @@ 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 { 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';
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
 import { STRATOS_ENDPOINT_TYPE } from '../../base-entity-schemas';
 import { EndpointsService } from '../../core/endpoints.service';
-import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
 import { EndpointType } from '../../core/extension/extension-types';
 import { safeUnsubscribe } from '../../core/utils.service';
 
@@ -42,6 +42,12 @@ export interface ConnectEndpointData {
   bodyContent: string;
 }
 
+// Why is this here instead of somewhere more common? Answer - Because it'd create circulate dependencies due to reliance on entityCatalog
+export const isEndpointConnected = (endpoint: EndpointModel): boolean => {
+  const epType = entityCatalog.getEndpoint(endpoint.cnsi_type, endpoint.sub_type).definition;
+  return endpoint.connectionStatus === 'connected' || epType.unConnectable;
+};
+
 export class ConnectEndpointService {
 
   public connectingError$: Observable<string>;
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 0ca4950461..39cd232897 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
@@ -58,7 +58,7 @@ export class CfAuthService {
     ).subscribe(([endpoints, session]: [IRequestEntityTypeState<EndpointModel>, SessionData]) => {
       this.session = session;
       Object.values(endpoints).forEach(endpoint => {
-        if (endpoint.registered) {
+        if (endpoint.connectionStatus !== 'connected') {
           // User hasn't connected to this endpoint
           return;
         } else if (this.isInitialized(endpoint.guid)) {
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 349bb8e89c..555c7947a3 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,12 +7,11 @@ import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import {
   RemoveUserFavoriteAction,
 } from '../../../../../store/src/actions/user-favourites-actions/remove-user-favorite-action';
-import {
-  endpointEntitiesSelector,
-} from '../../../../../store/src/selectors/endpoint.selectors';
+import { endpointEntitiesSelector } from '../../../../../store/src/selectors/endpoint.selectors';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../store/src/types/user-favorites.types';
 import { userFavoritesEntitySchema } from '../../../base-entity-schemas';
 import { IFavoriteEntity } from '../../../core/user-favorite-manager';
+import { isEndpointConnected } from '../../../features/endpoints/connect.service';
 import { ComponentEntityMonitorConfig, StratosStatus } from '../../shared.types';
 import { ConfirmationDialogConfig } from '../confirmation-dialog.config';
 import { ConfirmationDialogService } from '../confirmation-dialog.service';
@@ -85,13 +84,14 @@ export class FavoritesMetaCardComponent {
       this.setConfirmation(this.prettyName, favorite);
 
       const config = cardMapper && favorite && favorite.metadata ? cardMapper(favorite.metadata) : null;
+
       if (config) {
         if (this.endpoint) {
-          this.name$ = endpoint$.pipe(map(endpoint => config.name + (endpoint.user ? '' : ' (Disconnected)')));
-          this.routerLink$ = endpoint$.pipe(map(endpoint => endpoint.user ? config.routerLink : '/endpoints'));
+          this.name$ = endpoint$.pipe(map(endpoint => config.name + (isEndpointConnected(endpoint) ? '' : ' (Disconnected)')));
+          this.routerLink$ = endpoint$.pipe(map(endpoint => isEndpointConnected(endpoint) ? config.routerLink : '/endpoints'));
         } else {
           this.name$ = observableOf(config.name);
-          this.routerLink$ = endpoint$.pipe(map(endpoint => endpoint.user ? config.routerLink : null));
+          this.routerLink$ = endpoint$.pipe(map(endpoint => isEndpointConnected(endpoint) ? config.routerLink : null));
         }
         config.lines = this.mapLinesToObservables(config.lines);
         this.config = config;
diff --git a/src/frontend/packages/store/src/effects/endpoint.effects.ts b/src/frontend/packages/store/src/effects/endpoint.effects.ts
index 85c9dbd18b..002321d972 100644
--- a/src/frontend/packages/store/src/effects/endpoint.effects.ts
+++ b/src/frontend/packages/store/src/effects/endpoint.effects.ts
@@ -5,7 +5,6 @@ import { Store } from '@ngrx/store';
 import { catchError, mergeMap } from 'rxjs/operators';
 
 import { STRATOS_ENDPOINT_TYPE } from '../../../core/src/base-entity-schemas';
-import { entityCatalog } from '../entity-catalog/entity-catalog.service';
 import { EndpointType } from '../../../core/src/core/extension/extension-types';
 import { BrowserStandardEncoder } from '../../../core/src/helper';
 import {
@@ -35,6 +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 { endpointSchemaKey } from '../helpers/entity-factory';
 import { ApiRequestTypes } from '../reducers/api-request-reducer/request-helpers';
 import { NormalizedResponse } from '../types/api.types';
@@ -87,7 +87,6 @@ export class EndpointsEffect {
           mappedData.entities[endpointEntityKey][endpointInfo.guid] = {
             ...endpointInfo,
             connectionStatus: endpointInfo.user ? 'connected' : 'disconnected',
-            registered: !!endpointInfo.user,
           };
           mappedData.result.push(endpointInfo.guid);
         });
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 e3faa915c1..9cf1fd1bac 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
@@ -4,11 +4,11 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, first, map, mergeMap } from 'rxjs/operators';
 
-import { StratosCatalogEndpointEntity } from '../entity-catalog/entity-catalog-entity';
-import { IStratosEndpointDefinition } from '../entity-catalog/entity-catalog.types';
 import { environment } from '../../../core/src/environments/environment';
 import { InternalAppState } from '../app-state';
-import { connectedEndpointsOfTypesSelector, registeredEndpointsOfTypesSelector } from '../selectors/endpoint.selectors';
+import { StratosCatalogEndpointEntity } from '../entity-catalog/entity-catalog-entity';
+import { IStratosEndpointDefinition } from '../entity-catalog/entity-catalog.types';
+import { connectedEndpointsOfTypesSelector, endpointOfTypeSelector } from '../selectors/endpoint.selectors';
 
 const { proxyAPIVersion, cfAPIVersion } = environment;
 
@@ -44,7 +44,7 @@ export class PipelineHttpClient {
       return this.httpClient.request<R>(hr.clone({ headers, url }));
     } else {
       const selector = endpointConfig.unConnectable ?
-        registeredEndpointsOfTypesSelector(endpointConfig.type) :
+        endpointOfTypeSelector(endpointConfig.type) :
         connectedEndpointsOfTypesSelector(endpointConfig.type);
 
       return this.store.select(selector).pipe(
diff --git a/src/frontend/packages/store/src/selectors/endpoint.selectors.ts b/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
index 49b9efdb45..ee89fa29f4 100644
--- a/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
+++ b/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
@@ -1,8 +1,8 @@
 import { compose, createSelector } from '@ngrx/store';
 
 import { STRATOS_ENDPOINT_TYPE } from '../../../core/src/base-entity-schemas';
-import { EntityCatalogHelpers } from '../entity-catalog/entity-catalog.helper';
 import { InternalAppState, IRequestEntityTypeState } from '../app-state';
+import { EntityCatalogHelpers } from '../entity-catalog/entity-catalog.helper';
 import { endpointSchemaKey } from '../helpers/entity-factory';
 import { EndpointModel, EndpointState } from '../types/endpoint.types';
 import { selectEntities, selectEntity, selectRequestInfo } from './api.selectors';
@@ -15,53 +15,45 @@ export const endpointStatusSelector = (state: InternalAppState): EndpointState =
 const endpointEntityKey = EntityCatalogHelpers.buildEntityKey(endpointSchemaKey, STRATOS_ENDPOINT_TYPE);
 export const endpointEntitiesSelector = selectEntities<EndpointModel>(endpointEntityKey);
 
-export const endpointOfTypeSelector = (type: string) =>
+const endpointOfType = (type: string) =>
   (endpoints: IRequestEntityTypeState<EndpointModel>): IRequestEntityTypeState<EndpointModel> => {
-    return Object.values(endpoints).reduce((endpointsOfType, endpoint) => {
+    return Object.values(endpoints || {}).reduce((endpointsOfType, endpoint) => {
       if (endpoint.cnsi_type === type) {
         endpointsOfType[endpoint.guid] = endpoint;
       }
       return endpointsOfType;
-    }, {});
+    }, {} as IRequestEntityTypeState<EndpointModel>);
   };
 
-// TODO: Move this #3769
-export const cfEndpointEntitiesSelector = endpointOfTypeSelector('cf');
+export const endpointOfTypeSelector = (endpointType: string) => compose(
+  endpointOfType(endpointType),
+  endpointEntitiesSelector,
+);
 
-export const getRegisteredEndpoints = (endpoints: IRequestEntityTypeState<EndpointModel>) =>
-  Object.values(endpoints).reduce((registered, endpoint) => {
-    if (endpoint.registered) {
-      registered[endpoint.guid] = endpoint;
-    }
-    return registered;
-  }, {} as IRequestEntityTypeState<EndpointModel>);
+// TODO: Move this #3769
+export const cfEndpointEntitiesSelector = endpointOfType('cf');
 
-export const getConnectedEndpoints = (endpoints: IRequestEntityTypeState<EndpointModel>) =>
-  Object.values(endpoints).reduce((connected, endpoint) => {
+const getConnectedEndpoints = (endpoints: IRequestEntityTypeState<EndpointModel>) =>
+  Object.values(endpoints || {}).reduce((connected, endpoint) => {
+    // FIXME: This won't work for helm as endpoint type is `unConnectable`. We have the info to determine endpoint type `unConnectable`(see
+    // `isEndpointConnected`) however it would bring in `entityCatalog`.. which creates circular references
     if (endpoint.connectionStatus === 'connected') {
       connected[endpoint.guid] = endpoint;
     }
     return connected;
   }, {} as IRequestEntityTypeState<EndpointModel>);
 
-// All Registered  endpoint request data
-export const endpointsRegisteredEntitiesSelector = createSelector(
+export const connectedEndpointsSelector = () => compose(
+  getConnectedEndpoints,
   endpointEntitiesSelector,
-  getRegisteredEndpoints
 );
 
 export const connectedEndpointsOfTypesSelector = (endpointType: string) => compose(
   getConnectedEndpoints,
-  endpointOfTypeSelector(endpointType),
-  getRegisteredEndpoints,
+  endpointOfType(endpointType),
   endpointEntitiesSelector,
 );
 
-export const registeredEndpointsOfTypesSelector = (endpointType: string) => createSelector(
-  endpointEntitiesSelector,
-  endpointOfTypeSelector(endpointType),
-  getRegisteredEndpoints
-);
 
 // TODO: Move this #3769
 export const endpointsCFEntitiesSelector = createSelector(
@@ -69,11 +61,12 @@ export const endpointsCFEntitiesSelector = createSelector(
   cfEndpointEntitiesSelector
 );
 
+// const log = (label) => {
+//   return (val) => console.log(label, val);
+// };
+
 // TODO: Move this #3769
-export const endpointsRegisteredCFEntitiesSelector = createSelector(
-  endpointsCFEntitiesSelector,
-  getRegisteredEndpoints
-);
+export const endpointsCfEntitiesConnectedSelector = connectedEndpointsOfTypesSelector('cf');
 
 // Single endpoint request information
 export const endpointsEntityRequestSelector = (guid: string) => selectRequestInfo(endpointEntityKey, guid);
diff --git a/src/frontend/packages/store/src/types/endpoint.types.ts b/src/frontend/packages/store/src/types/endpoint.types.ts
index 78f23a05f9..ec6e3e5d54 100644
--- a/src/frontend/packages/store/src/types/endpoint.types.ts
+++ b/src/frontend/packages/store/src/types/endpoint.types.ts
@@ -55,7 +55,6 @@ export interface EndpointModel {
   system_shared_token: boolean;
   sso_allowed: boolean;
   // These are generated client side when we login
-  registered?: boolean;
   connectionStatus?: endpointConnectionStatus;
   metricsAvailable: boolean;
 }

From adfaa6dce9e01c81fa842ed6b7ef95258b6d41a6 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 14 Jan 2020 16:13:19 +0000
Subject: [PATCH 241/648] Wire in error bar to helm & helm pages

---
 .../monocular-tab-base.component.html         |  4 +---
 .../monocular-tab-base.component.ts           | 22 +++++++++++++++----
 .../kubernetes-tab-base.component.html        |  2 +-
 .../kubernetes-tab-base.component.ts          | 15 +++++++++----
 .../releases-tab/releases-tab.component.html  |  4 +---
 .../releases-tab/releases-tab.component.ts    | 19 ++++++++++++++--
 6 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.html b/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.html
index 08378bd421..106aa1b41e 100644
--- a/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.html
+++ b/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.html
@@ -1,6 +1,4 @@
-<!-- // TODO: RC should have [endpointIds$] which handles header events -->
-<!-- // TODO: RC should have favourites config -->
-<app-page-header tabsHeader="Helm" [tabs]="tabLinks">
+<app-page-header tabsHeader="Helm" [tabs]="tabLinks" [endpointIds$]="endpointIds$">
   <h1>Helm</h1>
 </app-page-header>
 <router-outlet></router-outlet>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.ts b/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.ts
index 69fc94e14c..e6cb223a67 100644
--- a/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.ts
+++ b/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.ts
@@ -1,16 +1,30 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { AppState } from 'frontend/packages/store/src/app-state';
+import { endpointOfTypeSelector } from 'frontend/packages/store/src/selectors/endpoint.selectors';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { HELM_ENDPOINT_TYPE } from '../helm-entity-factory';
 
 @Component({
   selector: 'app-monocular-tab-base',
   templateUrl: './monocular-tab-base.component.html',
   styleUrls: ['./monocular-tab-base.component.scss']
 })
-export class MonocularTabBaseComponent {
+export class MonocularTabBaseComponent implements OnInit {
 
-  tabLinks = [
+  public tabLinks = [
     { link: 'charts', label: 'Charts', icon: 'folder_open' },
     { link: 'repos', label: 'Repositories', icon: 'products', iconFont: 'stratos-icons' }
   ];
+  public endpointIds$: Observable<string[]>;
 
-}
+  constructor(private store: Store<AppState>) { }
 
+  ngOnInit() {
+    this.endpointIds$ = this.store.select(endpointOfTypeSelector(HELM_ENDPOINT_TYPE)).pipe(
+      map(endpoints => Object.keys(endpoints))
+    );
+  }
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.html
index 566dd06b5a..ab204d0455 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.html
@@ -1,4 +1,4 @@
-<app-page-header [tabs]="tabLinks" [favorite]="favorite$ | async" tabsHeader="Kubernetes">
+<app-page-header [tabs]="tabLinks" [favorite]="favorite$ | async" tabsHeader="Kubernetes" [endpointIds$]="endpointIds$">
   <h1>{{ (kubeEndpointService.endpoint$ | async)?.entity.name }}</h1>
   <div class="page-header-right">
   </div>
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
index 3e4f043918..882e65d512 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Observable, of as ObservableOf } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import { Observable } from 'rxjs';
+import { first, map, startWith } from 'rxjs/operators';
 
 import { UserFavoriteEndpoint } from '../../../../../store/src/types/user-favorites.types';
 import { FavoritesConfigMapper } from '../../../shared/components/favorites-meta-card/favorite-config-mapper';
@@ -39,19 +39,26 @@ export class KubernetesTabBaseComponent implements OnInit {
     { link: 'apps', label: 'Applications', icon: 'apps' }
   ];
 
-  isFetching$: Observable<boolean>;
+  public isFetching$: Observable<boolean>;
   public favorite$: Observable<UserFavoriteEndpoint>;
+  public endpointIds$: Observable<string[]>;
 
   constructor(
     public kubeEndpointService: KubernetesEndpointService,
     public favoritesConfigMapper: FavoritesConfigMapper) { }
 
   ngOnInit() {
-    this.isFetching$ = ObservableOf(false);
+    this.isFetching$ = this.kubeEndpointService.endpoint$.pipe(
+      map(endpoint => !endpoint),
+      startWith(true)
+    );
     this.favorite$ = this.kubeEndpointService.endpoint$.pipe(
       first(),
       map(endpoint => this.favoritesConfigMapper.getFavoriteEndpointFromEntity(endpoint.entity))
     );
+    this.endpointIds$ = this.kubeEndpointService.endpoint$.pipe(
+      map(endpoint => [endpoint.entity.guid])
+    );
   }
 
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.html
index 2cab2f2e2e..01dfbce77b 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.html
@@ -1,6 +1,4 @@
-<!-- // TODO: RC should have [endpointIds$] which handles header events -->
-<app-page-header>
+<app-page-header [endpointIds$]="helmIds$">
   <h1>Workloads</h1>
 </app-page-header>
-
 <app-list></app-list>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts
index 5b984757ac..45b70ee739 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts
@@ -1,6 +1,12 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { AppState } from 'frontend/packages/store/src/app-state';
+import { endpointOfTypeSelector } from 'frontend/packages/store/src/selectors/endpoint.selectors';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 import { ListConfig } from '../../../../shared/components/list/list.component.types';
+import { HELM_ENDPOINT_TYPE } from '../../../helm/helm-entity-factory';
 import { HelmReleasesListConfig } from '../list-types/monocular-releases-list-config.service';
 
 @Component({
@@ -12,6 +18,15 @@ import { HelmReleasesListConfig } from '../list-types/monocular-releases-list-co
     useClass: HelmReleasesListConfig,
   }]
 })
-export class HelmReleasesTabComponent { }
 // TODO: RC Rename all 'HelmRelease' files/names to 'Workload`
+export class HelmReleasesTabComponent implements OnInit {
+  public helmIds$: Observable<string[]>;
 
+  constructor(private store: Store<AppState>) { }
+
+  ngOnInit() {
+    this.helmIds$ = this.store.select(endpointOfTypeSelector(HELM_ENDPOINT_TYPE)).pipe(
+      map(endpoints => Object.keys(endpoints)),
+    );
+  }
+}

From bf998f2a5e49799726de58624495baca43972f75 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 14 Jan 2020 16:16:16 +0000
Subject: [PATCH 242/648] Fix store test helper

---
 .../packages/store/testing/src/store-test-helper.ts   | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

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 09ef07ba4b..1ea17edeaa 100644
--- a/src/frontend/packages/store/testing/src/store-test-helper.ts
+++ b/src/frontend/packages/store/testing/src/store-test-helper.ts
@@ -2,21 +2,19 @@ import { ModuleWithProviders } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 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 { EntityCatalogEntityConfig } from '../../src/entity-catalog/entity-catalog.types';
 import { appReducers } from '../../src/reducers.module';
 import { getDefaultRequestState } from '../../src/reducers/api-request-reducer/types';
-import {
-  getDefaultPaginationEntityState,
-} from '../../src/reducers/pagination-reducer/pagination-reducer-reset-pagination';
+import { getDefaultPaginationEntityState } from '../../src/reducers/pagination-reducer/pagination-reducer-reset-pagination';
 import { NormalizedResponse } from '../../src/types/api.types';
 import { SessionData, SessionDataEndpoint } from '../../src/types/auth.types';
 import { getDefaultEndpointRoles, getDefaultRolesRequestState } from '../../src/types/current-user-roles.types';
 import { EndpointModel } from '../../src/types/endpoint.types';
 import { BaseEntityValues } from '../../src/types/entity.types';
 import { WrapperRequestActionSuccess } from '../../src/types/request.types';
-import { endpointEntitySchema } from '../../../core/src/base-entity-schemas';
-import { entityCatalog } from '../../src/entity-catalog/entity-catalog.service';
-import { EntityCatalogEntityConfig } from '../../src/entity-catalog/entity-catalog.types';
 
 export const testSCFEndpointGuid = '01ccda9d-8f40-4dd0-bc39-08eea68e364f';
 const testSCFSessionEndpoint: SessionDataEndpoint = {
@@ -299,7 +297,6 @@ function getDefaultInitialTestStoreState(): AppState<BaseEntityValues> {
             admin: true
           },
           connectionStatus: 'connected',
-          registered: true,
           system_shared_token: false,
           metricsAvailable: false
         },

From 5016b6898805d4265e62a118fbe8821db8ea2d0b Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 14 Jan 2020 18:16:42 +0000
Subject: [PATCH 243/648] Use helm actions & WrapperRequestActionSuccess to
 store data from socket - dispatch wrapper success action with relevent helm
 action - fix actions - fix idAttribute for helm schemas

---
 .../kubernetes/kubernetes-entity-factory.ts   |   2 +-
 ...ocular-release-pods-list-config.service.ts |  32 +++--
 .../monocular-release-pods-list-source.ts     |   4 +-
 .../helm-release-tab-base.component.ts        | 121 ++++++------------
 .../tabs/helm-release-helper.service.ts       |  60 +++------
 .../helm-release-summary-tab.component.html   |  14 +-
 .../helm-release-summary-tab.component.ts     |  39 +++---
 .../store/workloads-entity-factory.ts         |  35 ++---
 .../store/workloads-entity-generator.ts       |  28 ++--
 .../workloads/store/workloads.actions.ts      |  24 ++--
 .../workloads/store/workloads.effects.ts      |  72 ++++-------
 .../kubernetes/workloads/workload.types.ts    |   1 -
 12 files changed, 159 insertions(+), 273 deletions(-)

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 ca5f33c8fa..787e1a6024 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts
@@ -100,7 +100,7 @@ entityCache[kubernetesDashboardEntityType] = new KubernetesEntitySchema(
 entityCache[metricEntityType] = new KubernetesEntitySchema(metricEntityType);
 
 export function addKubernetesEntitySchema(key: string, newSchema: EntitySchema) {
-  entityCache[key] = newSchema
+  entityCache[key] = newSchema;
 }
 
 export function kubernetesEntityFactory(key: string): EntitySchema {
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-config.service.ts
index 9639d87dc6..809fe3be8e 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-config.service.ts
@@ -10,9 +10,6 @@ import { Observable } from 'rxjs';
 import {
   KubernetesPodReadinessComponent,
 } from '../../list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component';
-import {
-  KubernetesPodStatusComponent,
-} from '../../list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component';
 import { HelmReleaseHelperService } from '../release/tabs/helm-release-helper.service';
 import { HelmReleasePod } from '../workload.types';
 import { HelmReleasePodsDataSource } from './monocular-release-pods-list-source';
@@ -37,20 +34,21 @@ export class HelmReleasePodsListConfig implements IListConfig<HelmReleasePod> {
       },
       cellFlex: '4'
     },
-    {
-      columnId: 'status',
-      headerCell: () => 'Status',
-      cellComponent: KubernetesPodStatusComponent,
-      // cellDefinition: {
-      //   valuePath: 'status.phase'
-      // },
-      sort: {
-        type: 'sort',
-        orderKey: 'status',
-        field: 'status.phase'
-      },
-      cellFlex: '1'
-    },
+    // TODO: RC Tidy up when pods lists are the same
+    // {
+    //   columnId: 'status',
+    //   headerCell: () => 'Status',
+    //   cellComponent: KubernetesPodStatusComponent,
+    //   // cellDefinition: {
+    //   //   valuePath: 'status.phase'
+    //   // },
+    //   sort: {
+    //     type: 'sort',
+    //     orderKey: 'status',
+    //     field: 'status.phase'
+    //   },
+    //   cellFlex: '1'
+    // },
     {
       columnId: 'ready',
       headerCell: () => 'Ready',
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-source.ts
index b61b4665a8..b0b0c31e2a 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-source.ts
@@ -3,7 +3,7 @@ import { ListDataSource } from 'frontend/packages/core/src/shared/components/lis
 import { IListConfig } from 'frontend/packages/core/src/shared/components/list/list.component.types';
 import { AppState } from 'frontend/packages/store/src/app-state';
 
-import { getHelmReleasePodId } from '../store/workloads-entity-factory';
+import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { GetHelmReleasePods } from '../store/workloads.actions';
 import { HelmReleasePod } from '../workload.types';
 
@@ -22,7 +22,7 @@ export class HelmReleasePodsDataSource extends ListDataSource<HelmReleasePod> {
       store,
       action,
       schema: action.entity[0],
-      getRowUniqueId: getHelmReleasePodId,
+      getRowUniqueId: getKubeAPIResourceGuid,
       paginationKey: action.paginationKey,
       isLocal: true,
       listConfig,
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 f429f739a8..3d76c14bf6 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,22 +4,20 @@ import { Store } from '@ngrx/store';
 import { LoggerService } from 'frontend/packages/core/src/core/logger.service';
 import { AppState } from 'frontend/packages/store/src/app-state';
 import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog.service';
-import { EntityCatalogEntityConfig } from 'frontend/packages/store/src/entity-catalog/entity-catalog.types';
-import {
-  successEntityHandler,
-} from 'frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/success-entity-request.handler';
-import { PipelineResult } from 'frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types';
+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';
 import makeWebSocketObservable, { GetWebSocketResponses } from 'rxjs-websockets';
 import { catchError, map, share, switchMap } from 'rxjs/operators';
 
+import { getKubeAPIResourceGuid } from '../../../store/kube.selectors';
+import { getHelmReleaseServiceId } from '../../store/workloads-entity-factory';
 import {
-  KUBERNETES_ENDPOINT_TYPE,
-  kubernetesPodsEntityType,
-  kubernetesServicesEntityType,
-} from '../../../kubernetes-entity-factory';
-import { helmReleaseGraphEntityType, helmReleaseResourceEntityType } from '../../store/workloads-entity-factory';
-import { GetHelmReleasePods, GetHelmReleaseServices } from '../../store/workloads.actions';
+  GetHelmReleaseGraph,
+  GetHelmReleasePods,
+  GetHelmReleaseResource,
+  GetHelmReleaseServices,
+} from '../../store/workloads.actions';
 import { HelmReleaseGuid, HelmReleasePod } from '../../workload.types';
 import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service';
 
@@ -99,6 +97,7 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
       }),
       map((message: string) => message),
       catchError(e => {
+        // TODO: RC/NWM Remove comments/handle error. Raise wrapper failed action to push error to store & notification bar?
         console.log('WS Error');
         console.log(e);
         if (e.type === 'error') {
@@ -116,112 +115,76 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
           prefix = messageObj.data;
         } else if (messageObj.kind === 'Pods') {
           const pods = messageObj.data;
-          pods.forEach(pod => {
-            this.addResource(kubernetesPodsEntityType, pod, pod.metadata.uid);
-          });
           const releasePodsAction = new GetHelmReleasePods(this.helmReleaseHelper.endpointGuid, this.helmReleaseHelper.releaseTitle);
-          this.populateList(releasePodsAction, pods);
+          this.populateList(releasePodsAction, pods, getKubeAPIResourceGuid);
         } else if (messageObj.kind === 'Graph') {
           const graph = messageObj.data;
           graph.endpointId = this.helmReleaseHelper.endpointGuid;
           graph.releaseTitle = this.helmReleaseHelper.releaseTitle;
-          this.addResource(helmReleaseGraphEntityType, graph, `${graph.endpointId}-${graph.releaseTitle}`, KUBERNETES_ENDPOINT_TYPE);
+          const releaseGraphAction = new GetHelmReleaseGraph(graph.endpointId, graph.releaseTitle);
+
+          this.addResource(releaseGraphAction, graph);
         } else if (messageObj.kind === 'Manifest' || messageObj.kind === 'Resources') {
           // Store all of the services
           const manifest = messageObj.data;
-          const ep = this.helmReleaseHelper.endpointGuid;
-          const releaseServicesAction = new GetHelmReleaseServices(
-            this.helmReleaseHelper.endpointGuid,
-            this.helmReleaseHelper.releaseTitle
-          );
           const svcs = [];
-
           // Store ALL resources for the release
           manifest.forEach(resource => {
             if (resource.kind === 'Service' && prefix) {
-              this.addResource(kubernetesServicesEntityType, resource, `${prefix}-${resource.metadata.name}`);
               svcs.push(resource);
             }
           });
           if (svcs.length > 0) {
-            this.populateList(releaseServicesAction, svcs, (svc) => `${prefix}-${svc.metadata.name}`);
+            const releaseServicesAction = new GetHelmReleaseServices(
+              this.helmReleaseHelper.endpointGuid,
+              this.helmReleaseHelper.releaseTitle
+            );
+            this.populateList(releaseServicesAction, svcs, getHelmReleaseServiceId);
           }
 
           const resources = { ...manifest };
           resources.endpointId = this.helmReleaseHelper.endpointGuid;
           resources.releaseTitle = this.helmReleaseHelper.releaseTitle;
-          this.addResource(helmReleaseResourceEntityType,
-            resources, `${resources.endpointId}-${resources.releaseTitle}`, KUBERNETES_ENDPOINT_TYPE);
+          const releaseResourceAction = new GetHelmReleaseResource(resources.endpointId, resources.releaseTitle);
+          this.addResource(releaseResourceAction, resources);
         }
       }
     });
   }
 
-  private addResource(entityType: string, data: any, id: string, endpointType = KUBERNETES_ENDPOINT_TYPE) {
-    const actionDispatcher = (action) => this.store.dispatch(action);
-    const catalogEntity = entityCatalog.getEntity(endpointType, entityType);
-    const pr = {
-      success: true,
-      response: {
-        entities: {
-          [catalogEntity.entityKey]: {
-            [id]: data
-          }
-        },
-        result: [
-          id
-        ]
-      }
-    } as PipelineResult;
-    successEntityHandler(
-      actionDispatcher,
-      catalogEntity,
-      'get',
-      {
-        endpointType,
-        entityType,
-        guid: id
+  private addResource(action: EntityRequestAction, data: any) {
+    const catalogEntity = entityCatalog.getEntity(action);
+    const response = {
+      entities: {
+        [catalogEntity.entityKey]: {
+          [action.guid]: data
+        }
       },
-      pr
-    );
+      result: [
+        action.guid
+      ]
+    };
+    const successWrapper = new WrapperRequestActionSuccess(response, action);
+    this.store.dispatch(successWrapper);
   }
 
-  private populateList(action: EntityCatalogEntityConfig, resources: any, idGetter?: IDGetterFunction) {
-    const entityType = kubernetesPodsEntityType;
-    const releaseTitle = this.helmReleaseHelper.releaseTitle;
-    const endpointId = this.helmReleaseHelper.endpointGuid;
-
-    if (!idGetter) {
-      idGetter = (data) => data.metadata.uid;
-    }
-
-    const actionDispatcher = (a) => this.store.dispatch(a);
-    const catalogEntity = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, entityType);
+  private populateList(action: PaginatedAction, resources: any, idGetter: IDGetterFunction) {
     const newResources = {};
     resources.forEach(resource => {
       const newResource: HelmReleasePod = {
-        endpointId,
-        releaseTitle,
+        endpointId: action.endpointGuid,
+        releaseTitle: this.helmReleaseHelper.releaseTitle,
         ...resource
       };
-      newResources[idGetter(resource)] = newResource;
+      newResources[idGetter(newResource)] = newResource;
     });
 
     const releasePods = {
-      success: true,
-      response: {
-        entities: { [entityCatalog.getEntityKey(action)]: Object.values(newResources) },
-        result: Object.keys(newResources)
-      }
+      entities: { [entityCatalog.getEntityKey(action)]: newResources },
+      result: Object.keys(newResources)
     };
-
-    successEntityHandler(
-      actionDispatcher,
-      catalogEntity,
-      'get',
-      action,
-      releasePods,
-    );
+    const successWrapper = new WrapperRequestActionSuccess(releasePods, action, 'fetch', releasePods.result.length, 1);
+    this.store.dispatch(successWrapper);
   }
 
   ngOnDestroy() {
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 3e26a4bacf..98b893fdf0 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
@@ -2,26 +2,11 @@ import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { AppState } from 'frontend/packages/store/src/app-state';
 import { EntityServiceFactory } from 'frontend/packages/store/src/entity-service-factory.service';
-import { PaginationMonitor } from 'frontend/packages/store/src/monitors/pagination-monitor';
-import { getPaginationObservables } from 'frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { kubernetesEntityFactory } from '../../../kubernetes-entity-factory';
-import { helmReleaseEntityKey } from '../../store/workloads-entity-factory';
-import {
-  GetHelmReleaseGraph,
-  GetHelmReleaseResource,
-  GetHelmReleases,
-  GetHelmRelease,
-} from '../../store/workloads.actions';
-import {
-  HelmRelease,
-  HelmReleaseGraph,
-  HelmReleaseGuid,
-  HelmReleaseResource,
-  HelmReleaseStatus,
-} from '../../workload.types';
+import { GetHelmRelease, GetHelmReleaseGraph, GetHelmReleaseResource } from '../../store/workloads.actions';
+import { HelmRelease, HelmReleaseGraph, HelmReleaseGuid, HelmReleaseResource } from '../../workload.types';
 
 
 @Injectable()
@@ -49,54 +34,39 @@ export class HelmReleaseHelperService {
     const action = new GetHelmRelease(this.endpointGuid, this.namespace, this.releaseTitle);
     const entityService = this.esf.create<HelmRelease>(action.guid, action);
 
-
     this.release$ = entityService.waitForEntity$.pipe(
-      map((item) => item.entity)
+      map((item) => item.entity),
+      map((item: HelmRelease) => {
+        if (!item.chart.metadata.icon) {
+          const copy = JSON.parse(JSON.stringify(item));
+          copy.chart.metadata.icon = '/core/assets/custom/app_placeholder.svg';
+          return copy;
+        }
+        return item;
+      })
     );
 
-    // TODO: NWM This should use a `GetHelmRelease` action instead of fetching the entire list
-    // const paginationMonitor = new PaginationMonitor(store, action.paginationKey, kubernetesEntityFactory(helmReleaseEntityKey));
-    // const svc = getPaginationObservables({ store, action, paginationMonitor });
     this.isFetching$ = entityService.isFetchingEntity$;
-
-    // this.release$ = svc.entities$.pipe(
-    //   map((items: HelmRelease[]) => items.find(item => item.guid === this.guid)),
-    //   map((item: HelmRelease) => {
-    //     if (!item.chart.metadata.icon) {
-    //       const copy = JSON.parse(JSON.stringify(item));
-    //       copy.chart.metadata.icon = '/core/assets/custom/app_placeholder.svg';
-    //       return copy;
-    //     }
-    //     return item;
-    //   })
-    // );
   }
 
   public guidAsUrlFragment(): string {
     return this.guid.replace(':', '/').replace(':', '/');
   }
 
-  public fetchReleaseStatus(): Observable<HelmReleaseStatus> {
-    // Get helm release
-    const action = new GetHelmRelease(this.endpointGuid, this.namespace, this.releaseTitle);
-
-    return this.esf.create<HelmReleaseStatus>(action.guid, action).waitForEntity$.pipe(
-      map(entity => entity.entity)
-    );
-  }
-
   public fetchReleaseGraph(): Observable<HelmReleaseGraph> {
     // Get helm release
     const action = new GetHelmReleaseGraph(this.endpointGuid, this.releaseTitle);
-    return this.esf.create<HelmReleaseGraph>(action.key, action).waitForEntity$.pipe(
+    return this.esf.create<HelmReleaseGraph>(action.guid, action).waitForEntity$.pipe(
       map(entity => entity.entity)
     );
   }
 
   public fetchReleaseResources(): Observable<HelmReleaseResource> {
     // Get helm release
+    // TODO: RC --> NWM If this should never be expected to fetch the resource there's a `selectEntity` selector that can be used instead
+    // of action
     const action = new GetHelmReleaseResource(this.endpointGuid, this.releaseTitle);
-    return this.esf.create<HelmReleaseResource>(action.key, action).waitForEntity$.pipe(
+    return this.esf.create<HelmReleaseResource>(action.guid, action).waitForEntity$.pipe(
       map(entity => entity.entity)
     );
   }
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
index 765cb96759..a9416bf803 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
@@ -27,6 +27,7 @@
             {{ release.info.last_deployed | date:'medium' }}
           </app-metadata-item>
         </div>
+        <!-- // TODO: RC -- NWM Is this needed anymore? -->
         <!-- <app-tile-grid>
           <app-tile-group *ngIf="chartData$ | async as chartData">
             <app-tile>
@@ -46,13 +47,12 @@
       </div>
       <app-metadata-item class="chart-details__item" label="Resources"></app-metadata-item>
 
-
-        <div *ngIf="resources$ | async as resources" class="grid">
-          <app-card-number-metric *ngFor="let res of resources" label="{{ res.label }}"
-          icon="{{ res.icon.name }}" iconFont="{{ res.icon.font }}"
-              value="{{ res.count }}">
-          </app-card-number-metric>
-        </div>
+      <!-- // TODO: RC -- NWM Is this needed anymore? -->
+      <div *ngIf="resources$ | async as resources" class="grid">
+        <app-card-number-metric *ngFor="let res of resources" label="{{ res.label }}" icon="{{ res.icon.name }}"
+          iconFont="{{ res.icon.font }}" value="{{ res.count }}">
+        </app-card-number-metric>
+      </div>
     </app-entity-summary-title>
 
 
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index a0927a1178..95ab87c1e7 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -62,7 +62,7 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
     private logService: LoggerService
   ) {
 
-    const releaseStatus$ = this.helmReleaseHelper.fetchReleaseStatus();
+    // const releaseStatus$ = this.helmReleaseHelper.fetchReleaseStatus();
 
     this.isBusy$ = combineLatest([
       this.helmReleaseHelper.isFetching$,
@@ -76,25 +76,26 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
       startWith(true)
     );
 
+    // TODO: RC --> NWM Is this needed anymore?
     // Async fetch release status
-    this.chartData$ = releaseStatus$.pipe(
-      map(data => ({
-        podsChartData: Object.keys(data.pods.status).map(status => ({
-          name: status,
-          value: data.pods.status[status]
-        })),
-        containersChartData: [
-          {
-            name: 'Ready',
-            value: data.pods.ready
-          },
-          {
-            name: 'Not Ready',
-            value: data.pods.containers - data.pods.ready
-          }
-        ]
-      }))
-    );
+    // this.chartData$ = releaseStatus$.pipe(
+    //   map(data => ({
+    //     podsChartData: Object.keys(data.pods.status).map(status => ({
+    //       name: status,
+    //       value: data.pods.status[status]
+    //     })),
+    //     containersChartData: [
+    //       {
+    //         name: 'Ready',
+    //         value: data.pods.ready
+    //       },
+    //       {
+    //         name: 'Not Ready',
+    //         value: data.pods.containers - data.pods.ready
+    //       }
+    //     ]
+    //   }))
+    // );
   }
 
   private startDelete() {
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts
index ab8eed0e3a..0a7e9fdcbd 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts
@@ -1,49 +1,34 @@
 import { EntitySchema } from '../../../../../../store/src/helpers/entity-schema';
 import { addKubernetesEntitySchema, KubernetesEntitySchema } from '../../kubernetes-entity-factory';
-import {
-  HelmRelease,
-  HelmReleaseGraph,
-  HelmReleasePod,
-  HelmReleaseResource,
-  HelmReleaseService,
-  HelmReleaseStatus,
-} from '../workload.types';
+import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
+import { HelmRelease, HelmReleaseGraph, HelmReleaseResource, HelmReleaseService } from '../workload.types';
 
-export const helmReleaseEntityKey = 'helmReleases';
-export const helmReleaseStatusEntityType = 'helmReleaseStatus';
+export const helmReleaseEntityKey = 'helmRelease';
 export const helmReleasePodEntityType = 'helmReleasePod';
 export const helmReleaseServiceEntityType = 'helmReleaseService';
 export const helmReleaseGraphEntityType = 'helmReleaseGraph';
 export const helmReleaseResourceEntityType = 'helmReleaseResource';
 
-export const getHelmReleaseId = (entity: HelmRelease) => entity.endpointId;
-export const getHelmReleaseStatusId = (entity: HelmReleaseStatus) => entity.endpointId;
-export const getHelmReleasePodId = (entity: HelmReleasePod) => entity.name;
-export const getHelmReleaseServiceId = (entity: HelmReleaseService) => entity.name;
-export const getHelmReleaseGraphId = (entity: HelmReleaseGraph) => entity.endpointId;
-export const getHelmReleaseReleaseId = (entity: HelmReleaseResource) => entity.endpointId;
+export const getHelmReleaseId = (entity: HelmRelease) => `${entity.endpointId}-${entity.namespace}-${entity.name}`;
+export const getHelmReleaseServiceId =
+  (entity: HelmReleaseService) => `${entity.endpointId}-${entity.releaseTitle}-${entity.metadata.name}`;
+export const getHelmReleaseGraphId = (entity: HelmReleaseGraph) => `${entity.endpointId}-${entity.releaseTitle}`;
+export const getHelmReleaseResourceId = (entity: HelmReleaseResource) => `${entity.endpointId}-${entity.releaseTitle}`;
 
 const entityCache: {
   [key: string]: EntitySchema
 } = {};
 
-
 entityCache[helmReleaseEntityKey] = new KubernetesEntitySchema(
   helmReleaseEntityKey,
   {},
   { idAttribute: getHelmReleaseId }
 );
 
-entityCache[helmReleaseStatusEntityType] = new KubernetesEntitySchema(
-  helmReleaseStatusEntityType,
-  {},
-  { idAttribute: getHelmReleaseStatusId }
-);
-
 entityCache[helmReleasePodEntityType] = new KubernetesEntitySchema(
   helmReleasePodEntityType,
   {},
-  { idAttribute: getHelmReleasePodId }
+  { idAttribute: getKubeAPIResourceGuid }
 );
 
 entityCache[helmReleaseServiceEntityType] = new KubernetesEntitySchema(
@@ -61,7 +46,7 @@ entityCache[helmReleaseGraphEntityType] = new KubernetesEntitySchema(
 entityCache[helmReleaseResourceEntityType] = new KubernetesEntitySchema(
   helmReleaseResourceEntityType,
   {},
-  { idAttribute: getHelmReleaseReleaseId }
+  { idAttribute: getHelmReleaseResourceId }
 );
 
 Object.entries(entityCache).forEach(([key, workloadSchema]) => addKubernetesEntitySchema(key, workloadSchema));
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 9aef89ebda..dfae4f0d00 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
@@ -6,28 +6,20 @@ import { StratosEndpointExtensionDefinition } from 'frontend/packages/store/src/
 import { IFavoriteMetadata } from 'frontend/packages/store/src/types/user-favorites.types';
 
 import { kubernetesEntityFactory } from '../../kubernetes-entity-factory';
-import {
-  HelmRelease,
-  HelmReleaseGraph,
-  HelmReleasePod,
-  HelmReleaseResource,
-  HelmReleaseService,
-  HelmReleaseStatus,
-} from '../workload.types';
+import { HelmRelease, HelmReleaseGraph, HelmReleasePod, HelmReleaseResource, HelmReleaseService } from '../workload.types';
 import {
   helmReleaseEntityKey,
   helmReleaseGraphEntityType,
   helmReleasePodEntityType,
   helmReleaseResourceEntityType,
   helmReleaseServiceEntityType,
-  helmReleaseStatusEntityType,
 } from './workloads-entity-factory';
 
 
 export function generateWorkloadsEntities(endpointDefinition: StratosEndpointExtensionDefinition): StratosBaseCatalogEntity[] {
   return [
     generateReleaseEntity(endpointDefinition),
-    generateReleaseStatusEntity(endpointDefinition),
+    // generateReleaseStatusEntity(endpointDefinition),
     generateReleasePodEntity(endpointDefinition),
     generateReleaseServiceEntity(endpointDefinition),
     generateReleaseGraphEntity(endpointDefinition),
@@ -45,14 +37,14 @@ function generateReleaseEntity(endpointDefinition: StratosEndpointExtensionDefin
   return new StratosCatalogEntity<IFavoriteMetadata, HelmRelease>(definition);
 }
 
-function generateReleaseStatusEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
-    type: helmReleaseStatusEntityType,
-    schema: kubernetesEntityFactory(helmReleaseStatusEntityType),
-    endpoint: endpointDefinition
-  };
-  return new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseStatus>(definition);
-}
+// function generateReleaseStatusEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+//   const definition = {
+//     type: helmReleaseStatusEntityType,
+//     schema: kubernetesEntityFactory(helmReleaseStatusEntityType),
+//     endpoint: endpointDefinition
+//   };
+//   return new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseStatus>(definition);
+// }
 
 function generateReleasePodEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   const definition = {
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
index a0648baf09..54ad1978fa 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
@@ -8,7 +8,7 @@ import {
   kubernetesPodsEntityType,
   kubernetesServicesEntityType,
 } from '../../kubernetes-entity-factory';
-import { helmReleaseEntityKey, helmReleaseGraphEntityType, helmReleaseStatusEntityType } from './workloads-entity-factory';
+import { helmReleaseEntityKey, helmReleaseGraphEntityType, helmReleaseResourceEntityType } from './workloads-entity-factory';
 
 export const GET_HELM_RELEASES = '[Helm] Get Releases';
 export const GET_HELM_RELEASES_SUCCESS = '[Helm] Get Releases Success';
@@ -61,8 +61,8 @@ export class GetHelmRelease implements EntityRequestAction {
   }
   type = GET_HELM_RELEASE;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = kubernetesEntityFactory(helmReleaseStatusEntityType);
-  entityType = helmReleaseStatusEntityType;
+  entity = kubernetesEntityFactory(helmReleaseEntityKey);
+  entityType = helmReleaseEntityKey;
   actions = [
     GET_HELM_RELEASE,
     GET_HELM_RELEASE_SUCCESS,
@@ -70,15 +70,13 @@ export class GetHelmRelease implements EntityRequestAction {
   ];
 }
 
-// Never dispateched - just used for look-up
-// Don't know why I need an action for this rather than an entity type?
 export class GetHelmReleaseGraph implements EntityRequestAction {
-  key: string;
+  guid: string;
   constructor(
     public endpointGuid: string,
     public releaseTitle: string
   ) {
-    this.key = `${endpointGuid}-${releaseTitle}`;
+    this.guid = `${endpointGuid}-${releaseTitle}`;
   }
   type = this.constructor.name;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
@@ -87,24 +85,23 @@ export class GetHelmReleaseGraph implements EntityRequestAction {
   actions = [this.type];
 }
 
-// Never dispateched - just used for look-up
-// Don't know why I need an action for this rather than an entity type?
 export class GetHelmReleaseResource implements EntityRequestAction {
-  key: string;
+  guid: string;
   constructor(
     public endpointGuid: string,
     public releaseTitle: string
   ) {
-    this.key = `${endpointGuid}-${releaseTitle}`;
+    this.guid = `${endpointGuid}-${releaseTitle}`;
   }
   type = this.constructor.name;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = kubernetesEntityFactory(kubernetesPodsEntityType);
-  entityType = kubernetesPodsEntityType;
+  entity = kubernetesEntityFactory(helmReleaseResourceEntityType);
+  entityType = helmReleaseResourceEntityType;
   actions = [this.type];
 }
 
 
+// TODO: RC candidate for removal, look after pods work finished
 export class GetHelmReleasePods implements MonocularPaginationAction {
   constructor(
     public endpointGuid: string,
@@ -131,6 +128,7 @@ export class GetHelmReleasePods implements MonocularPaginationAction {
   }
 }
 
+// TODO: RC candidate for removal, look after pods work finished
 export class GetHelmReleaseServices implements MonocularPaginationAction {
   constructor(
     public endpointGuid: string,
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 4894169aec..3955dda1e2 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
@@ -15,13 +15,8 @@ import {
   WrapperRequestActionFailed,
   WrapperRequestActionSuccess,
 } from '../../../../../../store/src/types/request.types';
-import { HelmRelease, HelmReleaseStatus } from '../workload.types';
-import {
-  GET_HELM_RELEASE,
-  GET_HELM_RELEASES,
-  GetHelmReleases,
-  GetHelmRelease
-} from './workloads.actions';
+import { HelmRelease } from '../workload.types';
+import { GET_HELM_RELEASE, GET_HELM_RELEASES, GetHelmRelease, GetHelmReleases } from './workloads.actions';
 
 @Injectable()
 export class WorkloadsEffects {
@@ -30,10 +25,7 @@ export class WorkloadsEffects {
     private httpClient: HttpClient,
     private actions$: Actions,
     private store: Store<AppState>
-  ) {
-
-
-  }
+  ) { }
 
   proxyAPIVersion = environment.proxyAPIVersion;
 
@@ -50,28 +42,15 @@ export class WorkloadsEffects {
         } as NormalizedResponse;
 
         // Go through each endpoint ID
-        Object.keys(response).forEach(endpoint => {
-          const endpointData = response[endpoint];
+        Object.keys(response).forEach(endpointId => {
+          const endpointData = response[endpointId];
           if (!endpointData) {
             return;
           }
           endpointData.forEach((data) => {
-            console.log('Got helm release');
-            console.log(data);
-            const helmRelease: HelmRelease = {
-              ...data,
-              endpointId: endpoint
-            };
-            // Release name is unique for an endpoint - for Helm 3, include the namespace
-            const id = endpoint + ':' + data.namespace + ':' + data.name;
-            helmRelease.guid = id;
-            // Make a note of the guid of the endpoint for the release
-            helmRelease.status = this.mapHelmStatus(data.info.status);
-            helmRelease.lastDeployed = this.mapHelmModifiedDate(data.info.last_deployed);
-            helmRelease.firstDeployed = this.mapHelmModifiedDate(data.info.first_deployed);
-            // data.info =
-            processedData.entities[entityKey][id] = helmRelease;
-            processedData.result.push(id);
+            const helmRelease = this.mapHelmRelease(data, endpointId);
+            processedData.entities[entityKey][helmRelease.guid] = helmRelease;
+            processedData.result.push(helmRelease.guid);
           });
         });
         return processedData;
@@ -93,29 +72,30 @@ export class WorkloadsEffects {
             result: []
           } as NormalizedResponse;
 
-          const status = {};
-
-          console.log(response);
-
           // Go through each endpoint ID
-          const newStatus: HelmReleaseStatus = {
-            endpointId: action.endpointGuid,
-            releaseTitle: action.releaseTitle,
-            ...status,
-            pods: [],
-            fields: [],
-            data: {
-              'v1/Pod': {},
-              'v1/Service': {}
-            }
-          };
-          processedData.entities[entityKey][action.key] = newStatus;
-          processedData.result.push(action.key);
+          processedData.entities[entityKey][action.guid] = this.mapHelmRelease(response, action.endpointGuid);
+          processedData.result.push(action.guid);
           return processedData;
         }, [action.endpointGuid]);
     })
   );
 
+  private mapHelmRelease(data, endpointId) {
+    // console.log('Got helm release');
+    // console.log(data);
+    const helmRelease: HelmRelease = {
+      ...data,
+      endpointId
+    };
+    // Release name is unique for an endpoint - for Helm 3, include the namespace
+    helmRelease.guid = endpointId + ':' + data.namespace + ':' + data.name;
+    // Make a note of the guid of the endpoint for the release
+    helmRelease.status = this.mapHelmStatus(data.info.status);
+    helmRelease.lastDeployed = this.mapHelmModifiedDate(data.info.last_deployed);
+    helmRelease.firstDeployed = this.mapHelmModifiedDate(data.info.first_deployed);
+    return helmRelease;
+  }
+
 
   // TODO: NWM This uses GetHelmReleaseStatus. I added `namespace` to GetHelmReleaseStatus
   // RC: Don't need this anymore - services come back over the web socket
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
index 833ec2674c..619c8d6df2 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
@@ -83,7 +83,6 @@ export function isHelmReleaseService(obj: any): HelmReleaseService {
   }
 }
 
-
 @Injectable()
 export class HelmReleaseGuid {
   guid: string;

From 470db5e7a3686c5f4384d2037fa55a25b7c9b938 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 15 Jan 2020 13:22:34 +0000
Subject: [PATCH 244/648] Tidy ups

---
 .../plugins/kubernetes/endpoint_config.go     | 21 +++++++
 .../plugins/kubernetes/install_release.go     | 63 +++++++++----------
 .../repository/interfaces/jetstream_error.go  |  5 +-
 3 files changed, 52 insertions(+), 37 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/endpoint_config.go b/src/jetstream/plugins/kubernetes/endpoint_config.go
index 3f20fe15fc..8a7acd85af 100644
--- a/src/jetstream/plugins/kubernetes/endpoint_config.go
+++ b/src/jetstream/plugins/kubernetes/endpoint_config.go
@@ -1,6 +1,7 @@
 package kubernetes
 
 import (
+	"errors"
 	"fmt"
 
 	log "github.com/sirupsen/logrus"
@@ -19,6 +20,26 @@ func (c *KubernetesSpecification) GetConfigForEndpoint(masterURL string, token i
 	})
 }
 
+// GetConfigForEndpointUser gets a kube config for the endpoint ID and user ID
+func (c *KubernetesSpecification) GetConfigForEndpointUser(endpointID, userID string) (*restclient.Config, error) {
+
+	var p = c.portalProxy
+
+	cnsiRecord, err := p.GetCNSIRecord(endpointID)
+	if err != nil {
+		//return sendSSHError("Could not get endpoint information")
+		return nil, errors.New("Could not get endpoint information")
+	}
+
+	// Get token for this users
+	tokenRec, ok := p.GetCNSITokenRecord(endpointID, userID)
+	if !ok {
+		return nil, errors.New("Could not get token")
+	}
+
+	return c.GetConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRec)
+}
+
 func (c *KubernetesSpecification) getKubeConfigForEndpoint(masterURL string, token interfaces.TokenRecord, namespace string) (*clientcmdapi.Config, error) {
 
 	name := "cluster-0"
diff --git a/src/jetstream/plugins/kubernetes/install_release.go b/src/jetstream/plugins/kubernetes/install_release.go
index 386d5cecbd..8d5088f8a1 100644
--- a/src/jetstream/plugins/kubernetes/install_release.go
+++ b/src/jetstream/plugins/kubernetes/install_release.go
@@ -5,13 +5,15 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"net/http"
 
 	"github.com/helm/monocular/chartsvc"
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
 	"sigs.k8s.io/yaml"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes"
+
 	"helm.sh/helm/v3/pkg/action"
 	"helm.sh/helm/v3/pkg/chart/loader"
 
@@ -37,7 +39,7 @@ type Monocular interface {
 	GetChartStore() chartsvc.ChartSvcDatastore
 }
 
-// InstallRelease will install a release
+// InstallRelease will install a Helm 3 release
 func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 
 	bodyReader := ec.Request().Body
@@ -50,12 +52,9 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 		return fmt.Errorf("Could not get Create Release Parameters: %v+", err)
 	}
 
-	log.Warn("%+v", params)
-
 	chartID := fmt.Sprintf("%s/%s", params.Chart.Repository, params.Chart.Name)
 
-	log.Info("Installing release")
-	log.Info(chartID)
+	log.Debugf("Helm: Installing release %s", chartID)
 
 	downloadURL, err := c.getChart(chartID, params.Chart.Version)
 	if err != nil {
@@ -66,9 +65,9 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 
 	// Should we ignore SSL certs?
 	// TODO: Look up Helm Repository endpoint and use the value from that
-	http := c.portalProxy.GetHttpClient(true)
+	httpClient := c.portalProxy.GetHttpClient(true)
 
-	resp, err := http.Get(downloadURL)
+	resp, err := httpClient.Get(downloadURL)
 
 	if resp.StatusCode != 200 {
 		return fmt.Errorf("Could not download Chart Archive: %s", resp.Status)
@@ -81,8 +80,7 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 		return fmt.Errorf("Could not load chart from archive: %v+", err)
 	}
 
-	log.Warn("Loaded helm chart")
-	log.Warn(chart.Name())
+	log.Debugf("Loaded helm chart: %s", chart.Name())
 
 	endpointGUID := params.Endpoint
 	userGUID := ec.Get("user_id").(string)
@@ -94,31 +92,36 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 
 	defer hc.Cleanup()
 
-	// if _, err := chartutil.LoadRequirements(chart); err == nil {
-	// 	log.Debug("Chart requirements loaded")
-	// } else if err != chartutil.ErrRequirementsNotFound {
-	// 	log.Error("Can not load requirements for helm chart")
-	// } else {
-	// 	log.Error(err)
-	// }
-
-	log.Warn("Got values")
-	log.Warn(params.Values)
-
 	userSuppliedValues := map[string]interface{}{}
 	if err := yaml.Unmarshal([]byte(params.Values), &userSuppliedValues); err != nil {
 		// Could not parse the user's values
 		return err
 	}
 
-	log.Warn("Installing.....")
+	// In Helm 3, the namespace must already exist
+	// Check to see if the namespace exists
+	// TODO
+
+	kubeClient, _ := c.GetConfigForEndpointUser(endpointGUID, userGUID)
+	clientset, _ := kubernetes.NewForConfig(kubeClient)
+
+	coreclient := clientset.CoreV1()
+	_, err = coreclient.Namespaces().Get(params.Namespace, metav1.GetOptions{})
+	if err != nil {
+		msg := fmt.Sprintf("Namespace '%s' does not exist", params.Namespace)
+		return interfaces.NewJetstreamError(msg)
+	}
+
+	// Create the namespace if it does not exist and the user asked us to
+	// TODO
+
+	// Check release name is valid and does not already exist
+	// TODO
 
 	install := action.NewInstall(config)
 	install.ReleaseName = params.Name
 	install.Namespace = params.Namespace
 
-	log.Warnf("%+v", install)
-
 	// Set timeout
 	// Wait?
 	// Generate Name ?
@@ -126,12 +129,9 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 
 	release, err := install.Run(chart, userSuppliedValues)
 	if err != nil {
-		log.Error(err)
 		return fmt.Errorf("Could not install Helm Chart: %v+", err)
 	}
 
-	log.Warn("All okay")
-
 	return ec.JSON(200, release)
 }
 
@@ -172,8 +172,6 @@ func (c *KubernetesSpecification) DeleteRelease(ec echo.Context) error {
 	releaseName := ec.Param("name")
 	namespace := ec.Param("namespace")
 
-	// I think we're going to need the namespace
-
 	userGUID := ec.Get("user_id").(string)
 
 	config, hc, err := c.GetHelmConfiguration(endpointGUID, userGUID, namespace)
@@ -186,15 +184,10 @@ func (c *KubernetesSpecification) DeleteRelease(ec echo.Context) error {
 
 	uninstall := action.NewUninstall(config)
 
-	log.Warnf("%+v", config)
-	log.Warnf("%+v", uninstall)
-
 	deleteResponse, err := uninstall.Run(releaseName)
 	if err != nil {
-		return interfaces.NewJetstreamError(http.StatusInternalServerError, "Could not delete Helm Release")
+		return interfaces.NewJetstreamError("Could not delete Helm Release")
 	}
 
-	log.Warnf("%+v", deleteResponse)
-
 	return ec.JSON(200, deleteResponse)
 }
diff --git a/src/jetstream/repository/interfaces/jetstream_error.go b/src/jetstream/repository/interfaces/jetstream_error.go
index ef8cd6cd1d..05821fb404 100644
--- a/src/jetstream/repository/interfaces/jetstream_error.go
+++ b/src/jetstream/repository/interfaces/jetstream_error.go
@@ -2,6 +2,7 @@ package interfaces
 
 import (
 	"fmt"
+	"net/http"
 
 	"github.com/labstack/echo"
 )
@@ -23,9 +24,9 @@ func (e JetstreamError) HTTPError() *echo.HTTPError {
 }
 
 // NewJetstreamError creates a new JetStream error
-func NewJetstreamError(status int, userFacingError string) error {
+func NewJetstreamError(userFacingError string) error {
 	shadowError := JetstreamError{
-		Status:          status,
+		Status:          http.StatusInternalServerError,
 		UserFacingError: userFacingError,
 	}
 	return shadowError

From daf84f2c4d33454d8967ca51f7678ffd5a0a286c Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 15 Jan 2020 15:42:31 +0000
Subject: [PATCH 245/648] Improve workloads table - Fix text search - Add
 Kube/Namespace filter - Fix kube fetch for multiple endpoints

---
 .../app/custom/kubernetes/store/kube.types.ts |   4 +-
 .../kubernetes/store/kubernetes.actions.ts    |   2 +-
 .../kubernetes/store/kubernetes.effects.ts    |  68 +++++---
 .../kube-namespaces-filter-config.service.ts  | 154 ++++++++++++++++++
 .../monocular-releases-list-config.service.ts |  39 ++++-
 .../monocular-releases-list-source.ts         |  29 +++-
 .../releases-tab/releases-tab.component.html  |  15 +-
 .../releases-tab/releases-tab.component.ts    |  12 +-
 .../list-data-source.ts                       |   8 +-
 9 files changed, 293 insertions(+), 38 deletions(-)
 create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts

diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
index 4f47b191fa..80630c1b0d 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
@@ -450,9 +450,9 @@ export interface Volume {
 }
 
 
-export interface ConfigMap {
+export interface ConfigMap<T = Item> {
   name: string;
-  items: Item[];
+  items: T[];
   defaultMode: number;
 }
 
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 00bcb6e3dc..e67704dadc 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
@@ -260,7 +260,7 @@ export class GetKubernetesPodsInNamespace implements PaginatedAction, KubeAction
 
 export class GetKubernetesNamespaces implements KubePaginationAction {
   constructor(public kubeGuid) {
-    this.paginationKey = getPaginationKey(kubernetesNamespacesEntityType, kubeGuid);
+    this.paginationKey = getPaginationKey(kubernetesNamespacesEntityType, kubeGuid || 'all');
   }
   type = GET_NAMESPACES_INFO;
   entityType = kubernetesNamespacesEntityType;
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 53b32d5afa..2d164d0cf0 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
@@ -2,7 +2,9 @@ import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
-import { catchError, combineLatest, flatMap, mergeMap } from 'rxjs/operators';
+import { connectedEndpointsOfTypesSelector } from 'frontend/packages/store/src/selectors/endpoint.selectors';
+import { of } from 'rxjs';
+import { catchError, combineLatest, 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';
@@ -281,6 +283,7 @@ export class KubernetesEffects {
     ofType<GetKubernetesApps>(GET_KUBERNETES_APP_INFO),
     flatMap(action => {
       this.store.dispatch(new StartRequestAction(action));
+
       const headers = new HttpHeaders({ 'x-cap-cnsi-list': action.kubeGuid });
       const requestArgs = {
         headers
@@ -365,32 +368,53 @@ export class KubernetesEffects {
   }
 
 
-  private processListAction<T>(
+  private processListAction<T = any>(
     action: KubePaginationAction | KubeAction,
     url: string,
     entityKey: string,
     getId: GetID<T>,
     filterResults?: Filter<T>) {
     this.store.dispatch(new StartRequestAction(action));
-    const headers = new HttpHeaders({ 'x-cap-cnsi-list': action.kubeGuid });
-    const requestArgs = {
-      headers,
-      params: null
-    };
-    const paginationAction = action as KubePaginationAction;
-    if (paginationAction.initialParams) {
-      requestArgs.params = Object.keys(paginationAction.initialParams).reduce((httpParams, initialKey: string) => {
-        return httpParams.set(initialKey, paginationAction.initialParams[initialKey].toString());
-      }, new HttpParams());
-    }
-    return this.http
-      .get(url, requestArgs)
-      .pipe(mergeMap(response => {
+
+    const getKubeIds = action.kubeGuid ?
+      of([action.kubeGuid]) :
+      this.store.select(connectedEndpointsOfTypesSelector(KUBERNETES_ENDPOINT_TYPE)).pipe(
+        first(),
+        map(endpoints => Object.values(endpoints).map(endpoint => endpoint.guid))
+      );
+    let pKubeIds;
+
+    return getKubeIds.pipe(
+      switchMap(kubeIds => {
+        pKubeIds = kubeIds;
+        const headers = new HttpHeaders({ 'x-cap-cnsi-list': kubeIds });
+        // const headers = hr.headers.set(PipelineHttpClient.EndpointHeader, endpointGuids);
+        const requestArgs = {
+          headers,
+          params: null
+        };
+        const paginationAction = action as KubePaginationAction;
+        if (paginationAction.initialParams) {
+          requestArgs.params = Object.keys(paginationAction.initialParams).reduce((httpParams, initialKey: string) => {
+            return httpParams.set(initialKey, paginationAction.initialParams[initialKey].toString());
+          }, new HttpParams());
+        }
+        return this.http.get(url, requestArgs);
+      }),
+      mergeMap(allRes => {
         const base = {
           entities: { [entityKey]: {} },
           result: []
         } as NormalizedResponse;
-        const items = response[action.kubeGuid].items as Array<any>;
+
+        const items: Array<T> = Object.entries(allRes).reduce((combinedRes, [kubeId, res]) => {
+          res.items.forEach(item => {
+            item.metadata.kubeId = kubeId;
+            combinedRes.push(item);
+          });
+          return combinedRes;
+        }, []);
+        // const items = response[action.kubeGuid].items as Array<any>;
         const processesData = items.filter((res) => !!filterResults ? filterResults(res) : true)
           .reduce((res, data) => {
             const id = getId(data);
@@ -401,15 +425,17 @@ export class KubernetesEffects {
         return [
           new WrapperRequestActionSuccess(processesData, action)
         ];
-      }), catchError(error => [
+      }),
+      catchError(error => [
         new WrapperRequestActionFailed(error.message, action, 'fetch', {
-          endpointIds: [action.kubeGuid],
+          endpointIds: pKubeIds,
           url: error.url || url,
           eventCode: error.status ? error.status + '' : '500',
           message: 'Kubernetes API request error',
-          error
+          error,
         })
-      ]));
+      ])
+    );
   }
 
   private processSingleItemAction<T>(action: KubeAction, url: string, schemaKey: string, getId: GetID<T>) {
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
new file mode 100644
index 0000000000..211f0b7c65
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts
@@ -0,0 +1,154 @@
+import { Injectable, OnDestroy } from '@angular/core';
+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 { 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';
+import {
+  distinctUntilChanged,
+  filter,
+  first,
+  map,
+  publishReplay,
+  refCount,
+  startWith,
+  tap,
+  withLatestFrom,
+} from 'rxjs/operators';
+
+import { KUBERNETES_ENDPOINT_TYPE, kubernetesEntityFactory } from '../../kubernetes-entity-factory';
+import { KubernetesNamespace } from '../../store/kube.types';
+import { GetKubernetesNamespaces } from '../../store/kubernetes.actions';
+
+export interface KubernetesNamespacesFilterItem<T = any> {
+  list$: Observable<T[]>;
+  loading$: Observable<boolean>;
+  select: BehaviorSubject<string>;
+}
+
+/**
+ * This service relies on OnDestroy, so must be `provided` by a component
+ */
+@Injectable()
+export class KubernetesNamespacesFilterService implements OnDestroy {
+  public kube: KubernetesNamespacesFilterItem<EndpointModel>;
+  public namespace: KubernetesNamespacesFilterItem<KubernetesNamespace>;
+
+  private isLoading$: Observable<boolean>;
+  private subs: Subscription[] = [];
+
+  private paginationAction = new GetKubernetesNamespaces(null);
+  private allNamespaces = this.getNamespacesObservable();
+  private allNamespacesLoading$ = this.allNamespaces.pagination$.pipe(map(
+    pag => getCurrentPageRequestInfo(pag).busy
+  ));
+
+  constructor(
+    private store: Store<AppState>,
+    private paginationMonitorFactory: PaginationMonitorFactory,
+  ) {
+    this.kube = this.createKube();
+    this.namespace = this.createNamespace();
+
+    // Start watching the cf/org/space plus automatically setting values only when we actually have values to auto select
+    this.namespace.list$.pipe(first()).subscribe(() => this.setupAutoSelectors());
+
+    this.isLoading$ = combineLatest(
+      this.kube.loading$,
+      this.namespace.loading$,
+    ).pipe(
+      map(([kubeLoading, nsLoading]) => kubeLoading || nsLoading)
+    );
+  }
+
+  private getNamespacesObservable() {
+    return getPaginationObservables<KubernetesNamespace>({
+      store: this.store,
+      action: this.paginationAction,
+      paginationMonitor: this.paginationMonitorFactory.create(
+        this.paginationAction.paginationKey,
+        kubernetesEntityFactory(this.paginationAction.entityType)
+      )
+    }, true);
+  }
+
+  private createKube() {
+    const list$ = this.store.select(connectedEndpointsOfTypesSelector(KUBERNETES_ENDPOINT_TYPE)).pipe(
+      // Ensure we have endpoints
+      filter(endpoints => endpoints && !!Object.keys(endpoints).length),
+      publishReplay(1),
+      refCount(),
+    );
+    return {
+      list$: list$.pipe(
+        map(endpoints => Object.values(endpoints)),
+        first(),
+        map((endpoints: EndpointModel[]) => {
+          return Object.values(endpoints).sort((a: EndpointModel, b: EndpointModel) => a.name.localeCompare(b.name));
+        }),
+      ),
+      loading$: list$.pipe(map(kubes => !kubes)),
+      select: new BehaviorSubject(undefined)
+    };
+  }
+
+  private createNamespace() {
+    const namespaceList$ = combineLatest(
+      this.kube.select.asObservable(),
+      this.allNamespaces.entities$
+    ).pipe(map(([selectedKubeId, entities]) => {
+      if (selectedKubeId && entities) {
+        return entities
+          .filter(namespace => namespace.metadata.kubeId === selectedKubeId)
+          .sort((a, b) => a.metadata.name.localeCompare(b.metadata.name));
+      }
+      return [];
+    }));
+
+    return {
+      list$: namespaceList$,
+      loading$: this.allNamespacesLoading$,
+      select: new BehaviorSubject(undefined)
+    };
+  }
+
+  private setupAutoSelectors() {
+    const namespaceResetSub = this.kube.select.asObservable().pipe(
+      startWith(undefined),
+      distinctUntilChanged(),
+      withLatestFrom(this.namespace.list$),
+      tap(([, namespaces]) => {
+        if (!!namespaces.length && namespaces.length === 1
+        ) {
+          this.selectSet(this.namespace.select, namespaces[0].metadata.name);
+        } else {
+          this.selectSet(this.namespace.select, undefined);
+        }
+      }),
+    ).subscribe();
+    this.subs.push(namespaceResetSub);
+  }
+
+  private selectSet(select: BehaviorSubject<string>, newValue: string) {
+    if (select.getValue() !== newValue) {
+      select.next(newValue);
+    }
+  }
+
+  ngOnDestroy(): void {
+    this.destroy();
+  }
+
+  destroy() {
+    // OnDestroy will be called when the component the service is provided at is destroyed. In theory this should not need to be called
+    // separately, if you see error's first ensure the service is provided at a component that will be destroyed
+    // Should be called in the OnDestroy of the component where it's provided
+    safeUnsubscribe(...this.subs);
+  }
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-releases-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-releases-list-config.service.ts
index 2960fb65c0..1410e14d14 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-releases-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-releases-list-config.service.ts
@@ -6,22 +6,28 @@ import { ITableColumn } from 'frontend/packages/core/src/shared/components/list/
 import {
   TableCellEndpointNameComponent,
 } from 'frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component';
-import { IListConfig, ListViewTypes } from 'frontend/packages/core/src/shared/components/list/list.component.types';
+import {
+  IListConfig,
+  IListMultiFilterConfig,
+  ListViewTypes,
+} from 'frontend/packages/core/src/shared/components/list/list.component.types';
 import { AppState } from 'frontend/packages/store/src/app-state';
+import { filter, map } from 'rxjs/operators';
 
 import { defaultHelmKubeListPageSize } from '../../list-types/kube-helm-list-types';
 import { HelmRelease } from '../workload.types';
+import { KubernetesNamespacesFilterItem, KubernetesNamespacesFilterService } from './kube-namespaces-filter-config.service';
 import { HelmReleasesDataSource } from './monocular-releases-list-source';
 
 @Injectable()
 export class HelmReleasesListConfig implements IListConfig<HelmRelease> {
+
   isLocal = true;
   dataSource: HelmReleasesDataSource;
   viewType = ListViewTypes.TABLE_ONLY;
   text = {
     title: '',
-    filter: 'Filter Releases',
-    noEntries: 'There are no releases'
+    filter: 'Filter by Name',
   };
   pageSizeOptions = defaultHelmKubeListPageSize;
   enableTextFilter = true;
@@ -42,7 +48,7 @@ export class HelmReleasesListConfig implements IListConfig<HelmRelease> {
         orderKey: 'name',
         field: 'name'
       },
-      cellFlex: '2'
+      cellFlex: '2',
     },
     {
       columnId: 'cluster',
@@ -104,18 +110,41 @@ export class HelmReleasesListConfig implements IListConfig<HelmRelease> {
     },
   ];
 
+  private multiFilterConfigs: IListMultiFilterConfig[];
+
   constructor(
     private store: Store<AppState>,
     public activatedRoute: ActivatedRoute,
     private datePipe: DatePipe,
+    kubeNamespaceService: KubernetesNamespacesFilterService
   ) {
     this.dataSource = new HelmReleasesDataSource(this.store, this);
+
+    this.multiFilterConfigs = [
+      createKubeNamespaceFilterConfig('kubeId', 'Kubernetes', kubeNamespaceService.kube),
+      createKubeNamespaceFilterConfig('namespace', 'Namespace', kubeNamespaceService.namespace),
+    ];
   }
 
   public getColumns = () => this.columns;
   public getGlobalActions = () => [];
   public getMultiActions = () => [];
   public getSingleActions = () => [];
-  public getMultiFiltersConfigs = () => [];
+  getMultiFiltersConfigs = () => this.multiFilterConfigs;
   public getDataSource = () => this.dataSource;
 }
+
+function createKubeNamespaceFilterConfig(key: string, label: string, cfOrgSpaceItem: KubernetesNamespacesFilterItem) {
+  return {
+    key,
+    label,
+    ...cfOrgSpaceItem,
+    list$: cfOrgSpaceItem.list$.pipe(map((entities: any[]) => {
+      return entities.map(entity => ({
+        label: entity.name || entity.metadata.name,
+        item: entity,
+        value: entity.guid || entity.metadata.name // Endpoint search via guid, namespace by name (easier filtering)
+      }));
+    })),
+  };
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-releases-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-releases-list-source.ts
index e11c2f5e1d..87785be92d 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-releases-list-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-releases-list-source.ts
@@ -1,13 +1,37 @@
 import { Store } from '@ngrx/store';
-import { ListDataSource } from 'frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source';
+import {
+  DataFunctionDefinitionType,
+  ListDataSource,
+} from 'frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source';
+import {
+  extractActualListEntity,
+} from 'frontend/packages/core/src/shared/components/list/data-sources-controllers/local-filtering-sorting';
 import { IListConfig } from 'frontend/packages/core/src/shared/components/list/list.component.types';
 import { AppState } from 'frontend/packages/store/src/app-state';
+import { PaginationEntityState } from 'frontend/packages/store/src/types/pagination.types';
 
 import { kubernetesEntityFactory } from '../../kubernetes-entity-factory';
 import { getHelmReleaseId, helmReleaseEntityKey } from '../store/workloads-entity-factory';
 import { GetHelmReleases } from '../store/workloads.actions';
 import { HelmRelease } from '../workload.types';
 
+const kubeEndpointFilter = (entities: HelmRelease[], paginationState: PaginationEntityState) => {
+  // Filtering is done remotely when maxedResults are hit (see `setMultiFilter`)
+  if (!!paginationState.maxedMode) {
+    return entities;
+  }
+
+  // Filter by Kube Endpoint and Namespace
+  const kubeId = paginationState.clientPagination.filter.items.kubeId;
+  const namespace = paginationState.clientPagination.filter.items.namespace;
+  return !kubeId && !namespace ? entities : entities.filter(e => {
+    e = extractActualListEntity(e);
+    const validKubeId = !(kubeId && kubeId !== e.endpointId);
+    const validNamespace = !(namespace && namespace !== e.namespace);
+    return validKubeId && validNamespace;
+  });
+};
+
 export class HelmReleasesDataSource extends ListDataSource<HelmRelease> {
 
   constructor(
@@ -15,6 +39,7 @@ export class HelmReleasesDataSource extends ListDataSource<HelmRelease> {
     listConfig: IListConfig<HelmRelease>
   ) {
     const action = new GetHelmReleases();
+    const transformEntities = [{ type: 'filter' as DataFunctionDefinitionType, field: 'name' }, kubeEndpointFilter];
     super({
       store,
       action,
@@ -22,7 +47,9 @@ export class HelmReleasesDataSource extends ListDataSource<HelmRelease> {
       getRowUniqueId: getHelmReleaseId,
       paginationKey: action.paginationKey,
       isLocal: true,
+      transformEntities,
       listConfig
     });
   }
+
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.html
index 01dfbce77b..bae593c115 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.html
@@ -1,4 +1,17 @@
 <app-page-header [endpointIds$]="helmIds$">
   <h1>Workloads</h1>
 </app-page-header>
-<app-list></app-list>
\ No newline at end of file
+
+<ng-template #noEntriesForCurrentFilter>
+  <app-no-content-message [icon]="'apps'" [firstLine]="'There are no workloads for the current filter'" [secondLine]="{
+  text: ''
+}"></app-no-content-message>
+</ng-template>
+
+<ng-template #noEntries>
+  <app-no-content-message [icon]="'apps'" [firstLine]="'There are no workloads'" [secondLine]="{
+  text: ''
+}"></app-no-content-message>
+</ng-template>
+
+<app-list [noEntries]="noEntries" [noEntriesForCurrentFilter]="noEntriesForCurrentFilter"></app-list>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts
index 45b70ee739..3587e5ba8f 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts
@@ -7,16 +7,20 @@ import { map } from 'rxjs/operators';
 
 import { ListConfig } from '../../../../shared/components/list/list.component.types';
 import { HELM_ENDPOINT_TYPE } from '../../../helm/helm-entity-factory';
+import { KubernetesNamespacesFilterService } from '../list-types/kube-namespaces-filter-config.service';
 import { HelmReleasesListConfig } from '../list-types/monocular-releases-list-config.service';
 
 @Component({
   selector: 'app-releases-tab',
   templateUrl: './releases-tab.component.html',
   styleUrls: ['./releases-tab.component.scss'],
-  providers: [{
-    provide: ListConfig,
-    useClass: HelmReleasesListConfig,
-  }]
+  providers: [
+    {
+      provide: ListConfig,
+      useClass: HelmReleasesListConfig,
+    },
+    KubernetesNamespacesFilterService,
+  ]
 })
 // TODO: RC Rename all 'HelmRelease' files/names to 'Workload`
 export class HelmReleasesTabComponent implements OnInit {
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 6827cf525f..68b8bb789c 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
@@ -28,11 +28,11 @@ import { ListFilter, ListSort } from '../../../../../../store/src/actions/list.a
 import { MetricsAction } from '../../../../../../store/src/actions/metrics.actions';
 import { 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 { 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';
 import { PaginatedAction, PaginationEntityState, PaginationParam } from '../../../../../../store/src/types/pagination.types';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { PaginationMonitor } from '../../../../../../store/src/monitors/pagination-monitor';
 import { IListDataSourceConfig, MultiActionConfig } from './list-data-source-config';
 import {
   EntitySelectConfig,
@@ -47,8 +47,10 @@ import { getDataFunctionList } from './local-filtering-sorting';
 import { LocalListController } from './local-list-controller';
 import { LocalPaginationHelpers } from './local-list.helpers';
 
+export type DataFunctionDefinitionType = 'sort' | 'filter';
+
 export class DataFunctionDefinition {
-  type: 'sort' | 'filter';
+  type: DataFunctionDefinitionType;
   orderKey?: string;
   field: string;
   static is(obj) {

From 92d2861abaa29c3a512fbb6d581d1cb62ebb1834 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 15 Jan 2020 16:48:40 +0000
Subject: [PATCH 246/648] Use common pods list for workload pods

---
 .../custom/kubernetes/kubernetes.module.ts    |   2 -
 .../helm-release-pods-list-config.service.ts  |  11 +-
 ...etes-namespace-pods-list-config.service.ts |  11 +-
 ...ubernetes-node-pods-list-config.service.ts |  14 ++-
 .../kubernetes-pods-list-config.service.ts    |  53 ++++++++-
 ...ocular-release-pods-list-config.service.ts | 107 ++----------------
 .../monocular-release-pods-list-source.ts     |   6 +-
 .../helm-release-summary-tab.component.ts     |   8 +-
 .../workloads/store/workloads.actions.ts      |  16 +--
 .../kubernetes/workloads/workloads.module.ts  |   2 +
 10 files changed, 98 insertions(+), 132 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
index 2e4b9de424..3e77a45967 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
@@ -98,7 +98,6 @@ import { KubernetesNamespacesTabComponent } from './tabs/kubernetes-namespaces-t
 import { KubernetesNodesTabComponent } from './tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component';
 import { KubernetesPodsTabComponent } from './tabs/kubernetes-pods-tab/kubernetes-pods-tab.component';
 import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kubernetes-summary.component';
-import { WorkloadsModule } from './workloads/workloads.module';
 
 /* tslint:disable:max-line-length */
 
@@ -111,7 +110,6 @@ import { WorkloadsModule } from './workloads/workloads.module';
     SharedModule,
     NgxChartsModule,
     KubernetesRoutingModule,
-    WorkloadsModule
   ],
   declarations: [
     KubernetesComponent,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-list-config.service.ts
index c11bb47ca8..fa455459e0 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-list-config.service.ts
@@ -4,18 +4,23 @@ import { Store } from '@ngrx/store';
 import { AppState } from '../../../../../../store/src//app-state';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { HelmReleaseService } from '../../services/helm-release.service';
-import { KubernetesPodsListConfigService } from '../kubernetes-pods/kubernetes-pods-list-config.service';
+import { BaseKubernetesPodsListConfigService } from '../kubernetes-pods/kubernetes-pods-list-config.service';
 import { KubernetesReleasePodsDataSource } from './helm-release-pods-data-source';
 
 
 @Injectable()
-export class KubernetesReleasePodsListConfigService extends KubernetesPodsListConfigService {
+export class KubernetesReleasePodsListConfigService extends BaseKubernetesPodsListConfigService {
+
+  private podsDataSource: KubernetesReleasePodsDataSource;
+
+  getDataSource = () => this.podsDataSource;
+
   constructor(
     store: Store<AppState>,
     kubeId: BaseKubeGuid,
     public helmReleaseService: HelmReleaseService,
   ) {
-    super(store, kubeId);
+    super();
     this.podsDataSource = new KubernetesReleasePodsDataSource(store, kubeId, this, helmReleaseService);
   }
 
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts
index bf39118edb..b126532d57 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts
@@ -4,17 +4,22 @@ import { Store } from '@ngrx/store';
 import { AppState } from '../../../../../../store/src/app-state';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesNamespaceService } from '../../services/kubernetes-namespace.service';
-import { KubernetesPodsListConfigService } from '../kubernetes-pods/kubernetes-pods-list-config.service';
+import { BaseKubernetesPodsListConfigService } from '../kubernetes-pods/kubernetes-pods-list-config.service';
 import { KubernetesNamespacePodsDataSource } from './kubernetes-namespace-pods-data-source';
 
 @Injectable()
-export class KubernetesNamespacePodsListConfigService extends KubernetesPodsListConfigService {
+export class KubernetesNamespacePodsListConfigService extends BaseKubernetesPodsListConfigService {
+
+  private podsDataSource: KubernetesNamespacePodsDataSource;
+
+  getDataSource = () => this.podsDataSource;
+
   constructor(
     store: Store<AppState>,
     kubeId: BaseKubeGuid,
     public kubeNamespaceService: KubernetesNamespaceService,
   ) {
-    super(store, kubeId);
+    super();
     this.podsDataSource = new KubernetesNamespacePodsDataSource(store, kubeId, this, kubeNamespaceService);
   }
 
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts
index 72c2a85043..527cb9cffc 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts
@@ -1,19 +1,25 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
+
 import { AppState } from '../../../../../../store/src/app-state';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
-import { KubernetesPodsListConfigService } from '../kubernetes-pods/kubernetes-pods-list-config.service';
-import { KubernetesNodePodsDataSource } from './kubernetes-node-pods-data-source';
 import { KubernetesNodeService } from '../../services/kubernetes-node.service';
+import { BaseKubernetesPodsListConfigService } from '../kubernetes-pods/kubernetes-pods-list-config.service';
+import { KubernetesNodePodsDataSource } from './kubernetes-node-pods-data-source';
 
 @Injectable()
-export class KubernetesNodePodsListConfigService extends KubernetesPodsListConfigService {
+export class KubernetesNodePodsListConfigService extends BaseKubernetesPodsListConfigService {
+
+  private podsDataSource: KubernetesNodePodsDataSource;
+
+  getDataSource = () => this.podsDataSource;
+
   constructor(
     store: Store<AppState>,
     kubeId: BaseKubeGuid,
     public kubeNodeService: KubernetesNodeService,
   ) {
-    super(store, kubeId);
+    super();
     this.podsDataSource = new KubernetesNodePodsDataSource(store, kubeId, this, kubeNodeService);
   }
 
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
index 6b02a6e2bd..a31bd98055 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
@@ -1,5 +1,9 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
+import {
+  IListDataSource,
+} from 'frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source-types';
+import * as moment from 'moment';
 
 import { AppState } from '../../../../../../store/src/app-state';
 import { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
@@ -8,12 +12,11 @@ import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesPod } from '../../store/kube.types';
 import { defaultHelmKubeListPageSize } from '../kube-helm-list-types';
 import { getContainerLengthSort } from '../kube-sort.helper';
+import { KubernetesPodReadinessComponent } from './kubernetes-pod-readiness/kubernetes-pod-readiness.component';
 import { KubernetesPodsDataSource } from './kubernetes-pods-data-source';
 import { PodNameLinkComponent } from './pod-name-link/pod-name-link.component';
 
-@Injectable()
-export class KubernetesPodsListConfigService implements IListConfig<KubernetesPod> {
-  podsDataSource: KubernetesPodsDataSource;
+export abstract class BaseKubernetesPodsListConfigService implements IListConfig<KubernetesPod> {
 
   columns: Array<ITableColumn<KubernetesPod>> = [
     {
@@ -90,6 +93,37 @@ export class KubernetesPodsListConfigService implements IListConfig<KubernetesPo
       },
       cellFlex: '5',
     },
+    // TODO: RC --> NWM From releases table. Diff between this and above?
+    {
+      columnId: 'ready',
+      headerCell: () => 'Ready',
+      cellComponent: KubernetesPodReadinessComponent,
+      // cellDefinition: {
+      //   valuePath: 'ready'
+      // },
+      sort: {
+        type: 'sort',
+        orderKey: 'ready',
+        field: 'ready'
+      },
+      cellFlex: '1'
+    },
+    // TODO: RC --> NWM From releases table, keep in all pod tables?
+    {
+      columnId: 'age',
+      headerCell: () => 'Age',
+      cellDefinition: {
+        getValue: (row: any) => {
+          return moment(row.metadata.creationTimestamp).fromNow(true);
+        }
+      },
+      sort: {
+        type: 'sort',
+        orderKey: 'age',
+        field: 'metadata.creationTimestamp'
+      },
+      cellFlex: '1'
+    }
   ];
 
   pageSizeOptions = defaultHelmKubeListPageSize;
@@ -99,19 +133,28 @@ export class KubernetesPodsListConfigService implements IListConfig<KubernetesPo
     filter: 'Filter by Name',
     noEntries: 'There are no pods'
   };
-
+  abstract getDataSource: () => IListDataSource<KubernetesPod>;
   getGlobalActions = () => null;
   getMultiActions = () => [];
   getSingleActions = () => [];
   getColumns = () => this.columns;
-  getDataSource = () => this.podsDataSource;
   getMultiFiltersConfigs = () => [];
 
+}
+
+@Injectable()
+export class KubernetesPodsListConfigService extends BaseKubernetesPodsListConfigService {
+  private podsDataSource: KubernetesPodsDataSource;
+
+  getDataSource = () => this.podsDataSource;
+
   constructor(
     store: Store<AppState>,
     kubeId: BaseKubeGuid,
   ) {
+    super();
     this.podsDataSource = new KubernetesPodsDataSource(store, kubeId, this);
   }
 
 }
+
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-config.service.ts
index 809fe3be8e..132f3ac5d9 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-config.service.ts
@@ -1,111 +1,26 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
-import { ITableColumn } from 'frontend/packages/core/src/shared/components/list/list-table/table.types';
-import { IListConfig, ListViewTypes } from 'frontend/packages/core/src/shared/components/list/list.component.types';
 import { AppState } from 'frontend/packages/store/src/app-state';
-import * as moment from 'moment';
-import { Observable } from 'rxjs';
 
-import {
-  KubernetesPodReadinessComponent,
-} from '../../list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component';
+import { BaseKubernetesPodsListConfigService } from '../../list-types/kubernetes-pods/kubernetes-pods-list-config.service';
 import { HelmReleaseHelperService } from '../release/tabs/helm-release-helper.service';
-import { HelmReleasePod } from '../workload.types';
 import { HelmReleasePodsDataSource } from './monocular-release-pods-list-source';
 
+
 @Injectable()
-export class HelmReleasePodsListConfig implements IListConfig<HelmReleasePod> {
-  isLocal = true;
-  dataSource: HelmReleasePodsDataSource;
-  viewType = ListViewTypes.TABLE_ONLY;
-  tableFixedRowHeight = true;
-  columns: ITableColumn<HelmReleasePod>[] = [
-    {
-      columnId: 'name',
-      headerCell: () => 'Name',
-      cellDefinition: {
-        valuePath: 'metadata.name'
-      },
-      sort: {
-        type: 'sort',
-        orderKey: 'name',
-        field: 'metadata.name'
-      },
-      cellFlex: '4'
-    },
-    // TODO: RC Tidy up when pods lists are the same
-    // {
-    //   columnId: 'status',
-    //   headerCell: () => 'Status',
-    //   cellComponent: KubernetesPodStatusComponent,
-    //   // cellDefinition: {
-    //   //   valuePath: 'status.phase'
-    //   // },
-    //   sort: {
-    //     type: 'sort',
-    //     orderKey: 'status',
-    //     field: 'status.phase'
-    //   },
-    //   cellFlex: '1'
-    // },
-    {
-      columnId: 'ready',
-      headerCell: () => 'Ready',
-      cellComponent: KubernetesPodReadinessComponent,
-      // cellDefinition: {
-      //   valuePath: 'ready'
-      // },
-      sort: {
-        type: 'sort',
-        orderKey: 'ready',
-        field: 'ready'
-      },
-      cellFlex: '1'
-    },
-    {
-      columnId: 'age',
-      headerCell: () => 'Age',
-      cellDefinition: {
-        getValue: (row: any) => {
-          return moment(row.metadata.creationTimestamp).fromNow(true);
-        }
-      },
-      sort: {
-        type: 'sort',
-        orderKey: 'age',
-        field: 'metadata.creationTimestamp'
-      },
-      cellFlex: '1'
-    }
-    // {
-    //   columnId: 'restarts',
-    //   headerCell: () => 'Restarts',
-    //   cellDefinition: {
-    //     valuePath: 'restarts'
-    //   },
-    //   sort: {
-    //     type: 'sort',
-    //     orderKey: 'restarts',
-    //     field: 'restarts'
-    //   },
-    //   cellFlex: '1'
-    // },
-  ];
-  initialised$: Observable<boolean>;
+export class HelmReleasePodsListConfig extends BaseKubernetesPodsListConfigService {
 
   constructor(
-    private store: Store<AppState>,
-    public activatedRoute: ActivatedRoute,
+    store: Store<AppState>,
     helmReleaseHelper: HelmReleaseHelperService
   ) {
-    this.dataSource = new HelmReleasePodsDataSource(this.store, this, helmReleaseHelper.endpointGuid, helmReleaseHelper.releaseTitle);
+    super();
+    this.podsDataSource = new HelmReleasePodsDataSource(store, this, helmReleaseHelper.endpointGuid, helmReleaseHelper.releaseTitle);
   }
 
-  public getColumns = () => this.columns;
-  public getGlobalActions = () => [];
-  public getMultiActions = () => [];
-  public getSingleActions = () => [];
-  public getMultiFiltersConfigs = () => [];
-  public getDataSource = () => this.dataSource;
+  private podsDataSource: HelmReleasePodsDataSource;
+
+  hideRefresh = true;
+
+  getDataSource = () => this.podsDataSource;
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-source.ts
index b0b0c31e2a..d3cb3f80c4 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-source.ts
@@ -4,15 +4,15 @@ import { IListConfig } from 'frontend/packages/core/src/shared/components/list/l
 import { AppState } from 'frontend/packages/store/src/app-state';
 
 import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
+import { KubernetesPod } from '../../store/kube.types';
 import { GetHelmReleasePods } from '../store/workloads.actions';
-import { HelmReleasePod } from '../workload.types';
 
 
-export class HelmReleasePodsDataSource extends ListDataSource<HelmReleasePod> {
+export class HelmReleasePodsDataSource extends ListDataSource<KubernetesPod> {
 
   constructor(
     store: Store<AppState>,
-    listConfig: IListConfig<HelmReleasePod>,
+    listConfig: IListConfig<KubernetesPod>,
     endpointGuid: string,
     releaseTitle: string
   ) {
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index 95ab87c1e7..5d6e6fb4a1 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -9,7 +9,7 @@ import { RouterNav } from 'frontend/packages/store/src/actions/router.actions';
 import { HideSnackBar, ShowSnackBar } from 'frontend/packages/store/src/actions/snackBar.actions';
 import { AppState } from 'frontend/packages/store/src/app-state';
 import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog.service';
-import { combineLatest, Observable, of, ReplaySubject } from 'rxjs';
+import { combineLatest, Observable, ReplaySubject } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 
 import { KUBERNETES_ENDPOINT_TYPE } from '../../../../kubernetes-entity-factory';
@@ -62,17 +62,13 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
     private logService: LoggerService
   ) {
 
-    // const releaseStatus$ = this.helmReleaseHelper.fetchReleaseStatus();
-
     this.isBusy$ = combineLatest([
       this.helmReleaseHelper.isFetching$,
-      // releaseStatus$, // TODO: NWM
-      of(true),
       this.busyDeletingSubject.asObservable().pipe(
         startWith(false)
       )
     ]).pipe(
-      map(([isFetching, releaseStatus, isDeleting]) => isFetching || !releaseStatus || isDeleting),
+      map(([isFetching, isDeleting]) => isFetching || isDeleting),
       startWith(true)
     );
 
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
index 54ad1978fa..239d3791b6 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
@@ -100,8 +100,9 @@ export class GetHelmReleaseResource implements EntityRequestAction {
   actions = [this.type];
 }
 
-
-// TODO: RC candidate for removal, look after pods work finished
+/**
+ * Won't fetch pods, used to push/retrieve data from store
+ */
 export class GetHelmReleasePods implements MonocularPaginationAction {
   constructor(
     public endpointGuid: string,
@@ -123,12 +124,11 @@ export class GetHelmReleasePods implements MonocularPaginationAction {
     'order-direction': 'asc',
     'order-direction-field': 'name',
   };
-  static createKey = (endpointGuid: string, releaseTitle: string, name: string): string => {
-    return `${endpointGuid}/${releaseTitle}/${name}`;
-  }
 }
 
-// TODO: RC candidate for removal, look after pods work finished
+/**
+ * Won't fetch pods, used to push/retrieve data from store
+ */
 export class GetHelmReleaseServices implements MonocularPaginationAction {
   constructor(
     public endpointGuid: string,
@@ -150,13 +150,9 @@ export class GetHelmReleaseServices implements MonocularPaginationAction {
     'order-direction': 'asc',
     'order-direction-field': 'name',
   };
-  static createKey = (endpointGuid: string, releaseTitle: string, name: string): string => {
-    return `${endpointGuid}/${releaseTitle}/${name}`;
-  }
 }
 
 export class HelmUpdateRelease implements Action {
   constructor(public values: any) { }
   type = UPDATE_HELM_RELEASE;
-  // public guid = () => '<New Release>' + this.values.releaseName;
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts b/custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts
index 0bbc4b8307..48da062724 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts
@@ -4,6 +4,7 @@ import { NgxGraphModule } from '@swimlane/ngx-graph';
 
 import { CoreModule } from '../../../core/core.module';
 import { SharedModule } from '../../../shared/shared.module';
+import { KubernetesModule } from '../kubernetes.module';
 import { HelmReleaseServiceCardComponent } from './list-types/helm-release-service-card/helm-release-service-card.component';
 import { HelmServicePortsComponent } from './list-types/helm-service-ports/helm-service-ports.component';
 import { HelmReleaseTabBaseComponent } from './release/helm-release-tab-base/helm-release-tab-base.component';
@@ -30,6 +31,7 @@ import { WorkloadsRouting } from './workloads.routing';
     WorkloadsStoreModule,
     WorkloadsRouting,
     NgxGraphModule,
+    KubernetesModule
   ],
   declarations: [
     HelmReleasesTabComponent,

From a8651e0b77f55020ad3eab301c38d4e40c12ff18 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 15 Jan 2020 16:55:50 +0000
Subject: [PATCH 247/648] Use common services list for workload services

---
 ...ar-release-services-list-config.service.ts | 66 +++----------------
 .../monocular-release-services-list-source.ts |  4 +-
 2 files changed, 10 insertions(+), 60 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-config.service.ts
index 089db9bcef..dc848abd26 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-config.service.ts
@@ -1,77 +1,27 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
-import { ITableColumn } from 'frontend/packages/core/src/shared/components/list/list-table/table.types';
-import { IListConfig, ListViewTypes } from 'frontend/packages/core/src/shared/components/list/list.component.types';
-import { ListView } from 'frontend/packages/store/src/actions/list.actions';
 import { AppState } from 'frontend/packages/store/src/app-state';
-import { Observable } from 'rxjs';
 
+import { BaseKubernetesServicesListConfig } from '../../list-types/kubernetes-service-list-config.service';
 import { HelmReleaseHelperService } from '../release/tabs/helm-release-helper.service';
-import { HelmReleaseService } from '../workload.types';
-import { HelmReleaseServiceCardComponent } from './helm-release-service-card/helm-release-service-card.component';
-import { HelmServicePortsComponent } from './helm-service-ports/helm-service-ports.component';
 import { HelmReleaseServicesDataSource } from './monocular-release-services-list-source';
 
+
+// cardComponent = HelmReleaseServiceCardComponent; // TODO: RC
+
 @Injectable()
-export class HelmReleaseServicesListConfig implements IListConfig<HelmReleaseService> {
-  isLocal = true;
+export class HelmReleaseServicesListConfig extends BaseKubernetesServicesListConfig {
   dataSource: HelmReleaseServicesDataSource;
-  viewType = ListViewTypes.BOTH;
-  defaultView = 'cards' as ListView;
-  cardComponent = HelmReleaseServiceCardComponent;
-  tableFixedRowHeight = true;
-  columns: ITableColumn<HelmReleaseService>[] = [
-    {
-      columnId: 'name',
-      headerCell: () => 'Name',
-      cellDefinition: {
-        valuePath: 'name'
-      },
-      sort: {
-        type: 'sort',
-        orderKey: 'name',
-        field: 'name'
-      },
-      cellFlex: '4'
-    },
-    {
-      columnId: 'clusterIp',
-      headerCell: () => 'Cluster IP',
-      cellDefinition: {
-        asyncValue: {
-          pathToObs: 'kubeService$',
-          pathToValue: 'spec.clusterIP'
-        }
-      },
-      cellFlex: '2'
-    },
-    {
-      columnId: 'portType',
-      headerCell: () => 'Port Type',
-      cellDefinition: {
-        asyncValue: {
-          pathToObs: 'kubeService$',
-          pathToValue: 'spec.type'
-        }
-      },
-      cellFlex: '2'
-    },
-    {
-      columnId: 'Ports',
-      headerCell: () => 'Ports',
-      cellComponent: HelmServicePortsComponent,
-      cellFlex: '4'
-    },
-  ];
-  initialised$: Observable<boolean>;
 
+  public getDataSource = () => this.dataSource;
 
   constructor(
     private store: Store<AppState>,
     public activatedRoute: ActivatedRoute,
     helmReleaseHelper: HelmReleaseHelperService
   ) {
+    super();
     this.dataSource = new HelmReleaseServicesDataSource(this.store, this, helmReleaseHelper.endpointGuid, helmReleaseHelper.releaseTitle);
   }
 
@@ -80,5 +30,5 @@ export class HelmReleaseServicesListConfig implements IListConfig<HelmReleaseSer
   public getMultiActions = () => [];
   public getSingleActions = () => [];
   public getMultiFiltersConfigs = () => [];
-  public getDataSource = () => this.dataSource;
+
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-source.ts
index 8543871e43..ff70a8a77e 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-source.ts
@@ -38,11 +38,11 @@ function fetchRelease(store: Store<AppState>, endpointGuid: string, releaseTitle
   );
 }
 
-export class HelmReleaseServicesDataSource extends ListDataSource<HelmReleaseService> {
+export class HelmReleaseServicesDataSource extends ListDataSource<KubeService> {
 
   constructor(
     store: Store<AppState>,
-    listConfig: IListConfig<HelmReleaseService>,
+    listConfig: IListConfig<KubeService>,
     endpointGuid: string,
     releaseTitle: string
   ) {

From be9b0b62da9337d7b3f332c782931a2a1064d61d Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 15 Jan 2020 17:17:00 +0000
Subject: [PATCH 248/648] Tidying up service list artifacts

---
 .../custom/kubernetes/kubernetes.module.ts    | 12 ++++---
 ...bernetes-namespace-services-data-source.ts |  2 +-
 ...-namespace-services-list-config.service.ts |  2 +-
 ...kubernetes-release-services-data-source.ts |  2 +-
 ...es-release-services-list-config.service.ts |  2 +-
 .../kubernetes-service-ports.component.ts     |  7 ++--
 .../kubernetes-service-card.component.html}   |  2 +-
 .../kubernetes-service-card.component.scss}   |  0
 .../kubernetes-service-card.component.spec.ts | 33 +++++++++++++++++
 .../kubernetes-service-card.component.ts      | 11 ++++++
 .../kubernetes-service-list-config.service.ts | 18 +++++-----
 .../kubernetes-services-data-source.ts        | 14 ++++----
 ...elm-release-service-card.component.spec.ts | 36 -------------------
 .../helm-release-service-card.component.ts    | 13 -------
 .../helm-service-ports.component.html         | 22 ------------
 .../helm-service-ports.component.scss         | 11 ------
 .../helm-service-ports.component.spec.ts      | 25 -------------
 .../helm-service-ports.component.ts           | 35 ------------------
 ...ar-release-services-list-config.service.ts | 14 ++------
 .../monocular-releases-list-source.ts         |  5 ---
 .../kubernetes/workloads/workloads.module.ts  |  6 ----
 21 files changed, 78 insertions(+), 194 deletions(-)
 rename custom-src/frontend/app/custom/kubernetes/{workloads/list-types/helm-release-service-card/helm-release-service-card.component.html => list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.html} (90%)
 rename custom-src/frontend/app/custom/kubernetes/{workloads/list-types/helm-release-service-card/helm-release-service-card.component.scss => list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.scss} (100%)
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.ts
 rename custom-src/frontend/app/custom/kubernetes/list-types/{ => kubernetes-services}/kubernetes-service-list-config.service.ts (61%)
 rename custom-src/frontend/app/custom/kubernetes/list-types/{ => kubernetes-services}/kubernetes-services-data-source.ts (59%)
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-service-card/helm-release-service-card.component.spec.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-service-card/helm-release-service-card.component.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.html
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.scss
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.spec.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.ts

diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
index 3e77a45967..55a51b0491 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
@@ -88,6 +88,9 @@ import {
 import { KubernetesPodTagsComponent } from './list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component';
 import { PodNameLinkComponent } from './list-types/kubernetes-pods/pod-name-link/pod-name-link.component';
 import { KubernetesServicePortsComponent } from './list-types/kubernetes-service-ports/kubernetes-service-ports.component';
+import {
+  KubeServiceCardComponent,
+} from './list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component';
 import { PodMetricsComponent } from './pod-metrics/pod-metrics.component';
 import { HelmReleaseService } from './services/helm-release.service';
 import { KubernetesEndpointService } from './services/kubernetes-endpoint.service';
@@ -158,11 +161,9 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     NodePodCountComponent,
     KubernetesServicePortsComponent,
     KubernetesPodStatusComponent,
-    KubernetesPodReadinessComponent
+    KubernetesPodReadinessComponent,
+    KubeServiceCardComponent
   ],
-  // exports: [
-  //   KubernetesServicePortsComponent
-  // ],
   providers: [
     KubernetesService,
     BaseKubeGuid,
@@ -187,7 +188,8 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     NodePodCountComponent,
     KubernetesServicePortsComponent,
     KubernetesPodStatusComponent,
-    KubernetesPodReadinessComponent
+    KubernetesPodReadinessComponent,
+    KubeServiceCardComponent
   ]
 })
 export class KubernetesModule { }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts
index bf1be7755f..063318f97f 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts
@@ -5,7 +5,7 @@ import { IListConfig } from '../../../../shared/components/list/list.component.t
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubeService } from '../../store/kube.types';
 import { GetKubernetesServicesInNamespace } from '../../store/kubernetes.actions';
-import { BaseKubernetesServicesDataSource } from '../kubernetes-services-data-source';
+import { BaseKubernetesServicesDataSource } from '../kubernetes-services/kubernetes-services-data-source';
 
 
 export class KubernetesNamespaceServicesDataSource extends BaseKubernetesServicesDataSource {
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service.ts
index 74c2fd5cdf..d6bf8a0385 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service.ts
@@ -4,7 +4,7 @@ import { Store } from '@ngrx/store';
 import { AppState } from '../../../../../../store/src/app-state';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesNamespaceService } from '../../services/kubernetes-namespace.service';
-import { BaseKubernetesServicesListConfig } from '../kubernetes-service-list-config.service';
+import { BaseKubernetesServicesListConfig } from '../kubernetes-services/kubernetes-service-list-config.service';
 import { KubernetesNamespaceServicesDataSource } from './kubernetes-namespace-services-data-source';
 
 @Injectable()
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-release-services/kubernetes-release-services-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-release-services/kubernetes-release-services-data-source.ts
index 48eb2035dc..4350345e62 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-release-services/kubernetes-release-services-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-release-services/kubernetes-release-services-data-source.ts
@@ -7,7 +7,7 @@ import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { HelmReleaseService } from '../../services/helm-release.service';
 import { KubeService } from '../../store/kube.types';
 import { GetKubernetesServices } from '../../store/kubernetes.actions';
-import { BaseKubernetesServicesDataSource } from '../kubernetes-services-data-source';
+import { BaseKubernetesServicesDataSource } from '../kubernetes-services/kubernetes-services-data-source';
 
 
 export class KubernetesHelmReleaseServicesDataSource extends BaseKubernetesServicesDataSource {
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-release-services/kubernetes-release-services-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-release-services/kubernetes-release-services-list-config.service.ts
index 5cd42f0c72..0ccfb74b16 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-release-services/kubernetes-release-services-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-release-services/kubernetes-release-services-list-config.service.ts
@@ -4,7 +4,7 @@ import { Store } from '@ngrx/store';
 import { AppState } from '../../../../../../store/src/app-state';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { HelmReleaseService } from '../../services/helm-release.service';
-import { BaseKubernetesServicesListConfig } from '../kubernetes-service-list-config.service';
+import { BaseKubernetesServicesListConfig } from '../kubernetes-services/kubernetes-service-list-config.service';
 import { KubernetesHelmReleaseServicesDataSource } from './kubernetes-release-services-data-source';
 
 @Injectable()
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
index f1eb39c0e6..9e9de01551 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
@@ -4,7 +4,6 @@ import { Observable, of } from 'rxjs';
 import { CardCell } from '../../../../shared/components/list/list.types';
 import { KubeService } from '../../../kubernetes/store/kube.types';
 
-// import { CardCell } from '../../../src/frontend/packages/core/src/shared/components/list/list.types';
 @Component({
   selector: 'app-kubernetes-service-ports',
   templateUrl: './kubernetes-service-ports.component.html',
@@ -22,10 +21,8 @@ export class KubernetesServicePortsComponent extends CardCell<KubeService> {
     }
     this.pRow = row;
     this.kubeService$ = of(row as KubeService);
-    // TODO: RC - PReviously in Helm Release table `HelmServicePortsComponent` extended this and set endpoint ID as below.
-    // Now it's in a child module this can't happen
-    // const helmReleaseService = (row as HelmReleaseService);
-    // this.endpointId = helmReleaseService.endpointId;
+    /* tslint:disable-next-line:no-string-literal  */
+    this.endpointId = row['endpointId'];
   }
   get row(): KubeService {
     return this.pRow;
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-service-card/helm-release-service-card.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.html
similarity index 90%
rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-service-card/helm-release-service-card.component.html
rename to custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.html
index 6b6618c25f..72b4959df7 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-service-card/helm-release-service-card.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.html
@@ -13,7 +13,7 @@
   <app-meta-card-item customStyle="column">
     <app-meta-card-key>Ports</app-meta-card-key>
     <app-meta-card-value>
-      <app-helm-service-ports [row]="row"></app-helm-service-ports>
+      <app-kubernetes-service-ports [row]="row"></app-kubernetes-service-ports>
     </app-meta-card-value>
   </app-meta-card-item>
 </app-meta-card>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-service-card/helm-release-service-card.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-service-card/helm-release-service-card.component.scss
rename to custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.spec.ts
new file mode 100644
index 0000000000..d689c5baf0
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.spec.ts
@@ -0,0 +1,33 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
+import { KubernetesServicePortsComponent } from '../../kubernetes-service-ports/kubernetes-service-ports.component';
+import { KubeServiceCardComponent } from './kubernetes-service-card.component';
+
+
+
+describe('KubeServiceCardComponent', () => {
+  let component: KubeServiceCardComponent;
+  let fixture: ComponentFixture<KubeServiceCardComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [
+        KubeServiceCardComponent,
+        KubernetesServicePortsComponent,
+      ],
+      imports: [...KubernetesBaseTestModules],
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubeServiceCardComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.ts
new file mode 100644
index 0000000000..fb6e81d43c
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+import { CardCell } from 'frontend/packages/core/src/shared/components/list/list.types';
+
+import { KubeService } from '../../../store/kube.types';
+
+@Component({
+  selector: 'app-kube-service-card',
+  templateUrl: './kubernetes-service-card.component.html',
+  styleUrls: ['./kubernetes-service-card.component.scss']
+})
+export class KubeServiceCardComponent extends CardCell<KubeService> { }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
similarity index 61%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-list-config.service.ts
rename to custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
index 01ab7ecc46..e0da42a113 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
@@ -1,10 +1,10 @@
-import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
-import { ITableColumn } from '../../../shared/components/list/list-table/table.types';
-import { IListConfig, ListViewTypes } from '../../../shared/components/list/list.component.types';
-import { KubeService } from '../store/kube.types';
-import { defaultHelmKubeListPageSize } from './kube-helm-list-types';
-import { KubernetesServicePortsComponent } from './kubernetes-service-ports/kubernetes-service-ports.component';
-
+import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
+import { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
+import { IListConfig, ListViewTypes } from '../../../../shared/components/list/list.component.types';
+import { KubeService } from '../../store/kube.types';
+import { defaultHelmKubeListPageSize } from '../kube-helm-list-types';
+import { KubernetesServicePortsComponent } from '../kubernetes-service-ports/kubernetes-service-ports.component';
+import { KubeServiceCardComponent } from './kubernetes-service-card/kubernetes-service-card.component';
 
 export abstract class BaseKubernetesServicesListConfig implements IListConfig<KubeService> {
   columns: Array<ITableColumn<KubeService>> = [
@@ -45,7 +45,9 @@ export abstract class BaseKubernetesServicesListConfig implements IListConfig<Ku
   ];
 
   pageSizeOptions = defaultHelmKubeListPageSize;
-  viewType = ListViewTypes.TABLE_ONLY;
+  // TODO: RC --> NWM Do we just want this in helm world?
+  cardComponent = KubeServiceCardComponent;
+  viewType = ListViewTypes.BOTH;
   enableTextFilter = true;
   text = {
     filter: 'Filter by Name',
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts
similarity index 59%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services-data-source.ts
rename to custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts
index f5628fbfd9..6aed4a43f6 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts
@@ -1,13 +1,13 @@
 import { Store } from '@ngrx/store';
 import { OperatorFunction } from 'rxjs';
 
-import { AppState } from '../../../../../store/src/app-state';
-import { PaginatedAction } from '../../../../../store/src/types/pagination.types';
-import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
-import { IListConfig } from '../../../shared/components/list/list.component.types';
-import { kubernetesEntityFactory, kubernetesServicesEntityType } from '../kubernetes-entity-factory';
-import { getKubeAPIResourceGuid } from '../store/kube.selectors';
-import { KubeService } from '../store/kube.types';
+import { AppState } from '../../../../../../store/src/app-state';
+import { PaginatedAction } from '../../../../../../store/src/types/pagination.types';
+import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
+import { IListConfig } from '../../../../shared/components/list/list.component.types';
+import { kubernetesEntityFactory, kubernetesServicesEntityType } from '../../kubernetes-entity-factory';
+import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
+import { KubeService } from '../../store/kube.types';
 
 export class BaseKubernetesServicesDataSource extends ListDataSource<KubeService> {
 
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-service-card/helm-release-service-card.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-service-card/helm-release-service-card.component.spec.ts
deleted file mode 100644
index 913f7f4906..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-service-card/helm-release-service-card.component.spec.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import {
-  KubernetesServicePortsComponent,
-} from '../../../kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component';
-import { HelmBaseTestModules } from '../../helm-testing.module';
-import { HelmServicePortsComponent } from '../helm-service-ports/helm-service-ports.component';
-import { HelmReleaseServiceCardComponent } from './helm-release-service-card.component';
-
-
-describe('HelmReleaseServiceCardComponent', () => {
-  let component: HelmReleaseServiceCardComponent;
-  let fixture: ComponentFixture<HelmReleaseServiceCardComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [
-        HelmReleaseServiceCardComponent,
-        KubernetesServicePortsComponent,
-        HelmServicePortsComponent
-      ],
-      imports: [...HelmBaseTestModules],
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(HelmReleaseServiceCardComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-service-card/helm-release-service-card.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-service-card/helm-release-service-card.component.ts
deleted file mode 100644
index 006a93401d..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-service-card/helm-release-service-card.component.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Component } from '@angular/core';
-import { CardCell } from 'frontend/packages/core/src/shared/components/list/list.types';
-
-import { HelmReleaseService } from '../../workload.types';
-
-
-
-@Component({
-  selector: 'app-release-service-card',
-  templateUrl: './helm-release-service-card.component.html',
-  styleUrls: ['./helm-release-service-card.component.scss']
-})
-export class HelmReleaseServiceCardComponent extends CardCell<HelmReleaseService> { }
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.html
deleted file mode 100644
index 35187acf75..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<ng-container *ngIf="(kubeService$ | async) as kubeService; else noPorts">
-  <table *ngIf="!!kubeService.spec?.ports.length; else noPorts">
-    <tr>
-      <th>Name</th>
-      <th>Protocol</th>
-      <th>Port</th>
-      <th>Target Port</th>
-    </tr>
-    <tr *ngFor="let port of kubeService.spec?.ports">
-      <td>
-        <a *ngIf="endpointId; else noLink" href="{{getServiceLink(kubeService, port)}}" target="_blank">
-          {{ port.name}}
-        </a>
-        <ng-template #noLink>{{port.name}}</ng-template>
-      </td>
-      <td>{{port.protocol}}</td>
-      <td>{{port.port}}</td>
-      <td>{{port.targetPort}}</td>
-    </tr>
-  </table>
-</ng-container>
-<ng-template #noPorts>-</ng-template>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.scss b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.scss
deleted file mode 100644
index 2aa856a7c5..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-th {
-  font-style: italic;
-  font-weight: 400;
-}
-
-th,
-td {
-  padding-right: 15px;
-  text-align: left;
-}
-
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.spec.ts
deleted file mode 100644
index 7d3385155c..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { HelmServicePortsComponent } from './helm-service-ports.component';
-
-describe('HelmServicePortsComponent', () => {
-  let component: HelmServicePortsComponent;
-  let fixture: ComponentFixture<HelmServicePortsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [HelmServicePortsComponent]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(HelmServicePortsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.ts
deleted file mode 100644
index 6f235a269a..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-service-ports/helm-service-ports.component.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Component, Input } from '@angular/core';
-import { Observable } from 'rxjs';
-
-import { CardCell } from '../../../../../shared/components/list/list.types';
-import { HelmReleaseService } from '../../workload.types';
-
-@Component({
-  selector: 'app-helm-service-ports',
-  templateUrl: './helm-service-ports.component.html',
-  styleUrls: ['./helm-service-ports.component.scss']
-})
-export class HelmServicePortsComponent extends CardCell<HelmReleaseService> {
-
-  private pRow: HelmReleaseService;
-  public kubeService$: Observable<HelmReleaseService>;
-  // Used when extending this class
-  public endpointId: string;
-
-  @Input() set row(row: HelmReleaseService) {
-    if (!row) {
-      return;
-    }
-    this.pRow = row;
-    // this.kubeService$ = of(row as KubeService);
-    // this.kubeService$ = helmReleaseService.kubeService$;
-    this.endpointId = row.endpointId;
-  }
-  get row(): HelmReleaseService {
-    return this.pRow;
-  }
-
-  getServiceLink(service: HelmReleaseService, port: { name: string }): string {
-    return `/kubernetes/svcproxy/${this.endpointId}/${service.metadata.namespace}/${service.metadata.name}/${port.name}`;
-  }
-}
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-config.service.ts
index dc848abd26..123981b01c 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-config.service.ts
@@ -3,13 +3,12 @@ import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { AppState } from 'frontend/packages/store/src/app-state';
 
-import { BaseKubernetesServicesListConfig } from '../../list-types/kubernetes-service-list-config.service';
+import {
+  BaseKubernetesServicesListConfig,
+} from '../../list-types/kubernetes-services/kubernetes-service-list-config.service';
 import { HelmReleaseHelperService } from '../release/tabs/helm-release-helper.service';
 import { HelmReleaseServicesDataSource } from './monocular-release-services-list-source';
 
-
-// cardComponent = HelmReleaseServiceCardComponent; // TODO: RC
-
 @Injectable()
 export class HelmReleaseServicesListConfig extends BaseKubernetesServicesListConfig {
   dataSource: HelmReleaseServicesDataSource;
@@ -24,11 +23,4 @@ export class HelmReleaseServicesListConfig extends BaseKubernetesServicesListCon
     super();
     this.dataSource = new HelmReleaseServicesDataSource(this.store, this, helmReleaseHelper.endpointGuid, helmReleaseHelper.releaseTitle);
   }
-
-  public getColumns = () => this.columns;
-  public getGlobalActions = () => [];
-  public getMultiActions = () => [];
-  public getSingleActions = () => [];
-  public getMultiFiltersConfigs = () => [];
-
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-releases-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-releases-list-source.ts
index 87785be92d..35bf800960 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-releases-list-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-releases-list-source.ts
@@ -16,11 +16,6 @@ import { GetHelmReleases } from '../store/workloads.actions';
 import { HelmRelease } from '../workload.types';
 
 const kubeEndpointFilter = (entities: HelmRelease[], paginationState: PaginationEntityState) => {
-  // Filtering is done remotely when maxedResults are hit (see `setMultiFilter`)
-  if (!!paginationState.maxedMode) {
-    return entities;
-  }
-
   // Filter by Kube Endpoint and Namespace
   const kubeId = paginationState.clientPagination.filter.items.kubeId;
   const namespace = paginationState.clientPagination.filter.items.namespace;
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts b/custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts
index 48da062724..18349d8b6d 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts
@@ -5,8 +5,6 @@ import { NgxGraphModule } from '@swimlane/ngx-graph';
 import { CoreModule } from '../../../core/core.module';
 import { SharedModule } from '../../../shared/shared.module';
 import { KubernetesModule } from '../kubernetes.module';
-import { HelmReleaseServiceCardComponent } from './list-types/helm-release-service-card/helm-release-service-card.component';
-import { HelmServicePortsComponent } from './list-types/helm-service-ports/helm-service-ports.component';
 import { HelmReleaseTabBaseComponent } from './release/helm-release-tab-base/helm-release-tab-base.component';
 import { HelmReleaseNotesTabComponent } from './release/tabs/helm-release-notes-tab/helm-release-notes-tab.component';
 import { HelmReleasePodsTabComponent } from './release/tabs/helm-release-pods/helm-release-pods-tab.component';
@@ -35,7 +33,6 @@ import { WorkloadsRouting } from './workloads.routing';
   ],
   declarations: [
     HelmReleasesTabComponent,
-    HelmReleaseServiceCardComponent,
     HelmReleaseTabBaseComponent,
     HelmReleaseSummaryTabComponent,
     HelmReleaseNotesTabComponent,
@@ -44,11 +41,8 @@ import { WorkloadsRouting } from './workloads.routing';
     HelmReleaseServicesTabComponent,
     HelmReleaseResourceGraphComponent,
     HelmReleaseResourcePreviewComponent,
-    HelmServicePortsComponent
   ],
   entryComponents: [
-    HelmReleaseServiceCardComponent,
-    HelmServicePortsComponent,
     HelmReleaseResourcePreviewComponent,
   ]
 })

From d773ac3167edb1fae65987770f2217766a31a6e5 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 15 Jan 2020 17:28:41 +0000
Subject: [PATCH 249/648] Remove un-needed entities

---
 .../helm-release/helm-release.component.ts    | 13 +++---
 .../services/helm-release.service.ts          |  1 +
 .../store/workloads-entity-factory.ts         | 13 ------
 .../store/workloads-entity-generator.ts       | 40 +------------------
 4 files changed, 11 insertions(+), 56 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.ts b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.ts
index b0734a0099..01413297cc 100644
--- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.ts
@@ -1,13 +1,16 @@
-import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types';
 import { Component, OnInit } from '@angular/core';
-import { BaseKubeGuid } from '../kubernetes-page.types';
 import { ActivatedRoute } from '@angular/router';
-import { KubernetesService } from '../services/kubernetes.service';
-import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
 import { Observable, of as ObservableOf } from 'rxjs';
-import { HelmReleaseService } from '../services/helm-release.service';
 import { map } from 'rxjs/operators';
 
+import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types';
+import { BaseKubeGuid } from '../kubernetes-page.types';
+import { HelmReleaseService } from '../services/helm-release.service';
+import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
+import { KubernetesService } from '../services/kubernetes.service';
+
+// TODO: RC Remove this whole folder? (kube/apps/release summary tab)
+// Also include any lists, components, etc
 @Component({
   selector: 'app-helm-release',
   templateUrl: './helm-release.component.html',
diff --git a/custom-src/frontend/app/custom/kubernetes/services/helm-release.service.ts b/custom-src/frontend/app/custom/kubernetes/services/helm-release.service.ts
index 3848b47f2f..76b9678e23 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/helm-release.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/helm-release.service.ts
@@ -12,6 +12,7 @@ import { KubernetesApp, KubernetesDeployment, KubernetesPod, KubernetesStatefulS
 import { GetKubernetesApps, GetKubernetesServices } from '../store/kubernetes.actions';
 import { KubernetesEndpointService } from './kubernetes-endpoint.service';
 
+//TODO: RC Move to workloads?
 @Injectable()
 export class HelmReleaseService {
   kubeGuid: string;
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts
index 0a7e9fdcbd..804514030a 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts
@@ -1,6 +1,5 @@
 import { EntitySchema } from '../../../../../../store/src/helpers/entity-schema';
 import { addKubernetesEntitySchema, KubernetesEntitySchema } from '../../kubernetes-entity-factory';
-import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { HelmRelease, HelmReleaseGraph, HelmReleaseResource, HelmReleaseService } from '../workload.types';
 
 export const helmReleaseEntityKey = 'helmRelease';
@@ -25,18 +24,6 @@ entityCache[helmReleaseEntityKey] = new KubernetesEntitySchema(
   { idAttribute: getHelmReleaseId }
 );
 
-entityCache[helmReleasePodEntityType] = new KubernetesEntitySchema(
-  helmReleasePodEntityType,
-  {},
-  { idAttribute: getKubeAPIResourceGuid }
-);
-
-entityCache[helmReleaseServiceEntityType] = new KubernetesEntitySchema(
-  helmReleaseServiceEntityType,
-  {},
-  { idAttribute: getHelmReleaseServiceId }
-);
-
 entityCache[helmReleaseGraphEntityType] = new KubernetesEntitySchema(
   helmReleaseGraphEntityType,
   {},
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 dfae4f0d00..cddd1778f4 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
@@ -6,22 +6,13 @@ import { StratosEndpointExtensionDefinition } from 'frontend/packages/store/src/
 import { IFavoriteMetadata } from 'frontend/packages/store/src/types/user-favorites.types';
 
 import { kubernetesEntityFactory } from '../../kubernetes-entity-factory';
-import { HelmRelease, HelmReleaseGraph, HelmReleasePod, HelmReleaseResource, HelmReleaseService } from '../workload.types';
-import {
-  helmReleaseEntityKey,
-  helmReleaseGraphEntityType,
-  helmReleasePodEntityType,
-  helmReleaseResourceEntityType,
-  helmReleaseServiceEntityType,
-} from './workloads-entity-factory';
+import { HelmRelease, HelmReleaseGraph, HelmReleaseResource } from '../workload.types';
+import { helmReleaseEntityKey, helmReleaseGraphEntityType, helmReleaseResourceEntityType } from './workloads-entity-factory';
 
 
 export function generateWorkloadsEntities(endpointDefinition: StratosEndpointExtensionDefinition): StratosBaseCatalogEntity[] {
   return [
     generateReleaseEntity(endpointDefinition),
-    // generateReleaseStatusEntity(endpointDefinition),
-    generateReleasePodEntity(endpointDefinition),
-    generateReleaseServiceEntity(endpointDefinition),
     generateReleaseGraphEntity(endpointDefinition),
     generateReleaseResourceEntity(endpointDefinition),
   ];
@@ -37,33 +28,6 @@ function generateReleaseEntity(endpointDefinition: StratosEndpointExtensionDefin
   return new StratosCatalogEntity<IFavoriteMetadata, HelmRelease>(definition);
 }
 
-// function generateReleaseStatusEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-//   const definition = {
-//     type: helmReleaseStatusEntityType,
-//     schema: kubernetesEntityFactory(helmReleaseStatusEntityType),
-//     endpoint: endpointDefinition
-//   };
-//   return new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseStatus>(definition);
-// }
-
-function generateReleasePodEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
-    type: helmReleasePodEntityType,
-    schema: kubernetesEntityFactory(helmReleasePodEntityType),
-    endpoint: endpointDefinition
-  };
-  return new StratosCatalogEntity<IFavoriteMetadata, HelmReleasePod>(definition);
-}
-
-function generateReleaseServiceEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
-    type: helmReleaseServiceEntityType,
-    schema: kubernetesEntityFactory(helmReleaseServiceEntityType),
-    endpoint: endpointDefinition
-  };
-  return new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseService>(definition);
-}
-
 function generateReleaseGraphEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   const definition = {
     type: helmReleaseGraphEntityType,

From 1bce8e44fe4d22be958f0f4ae0adad76951cd88d Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 15 Jan 2020 17:32:38 +0000
Subject: [PATCH 250/648] Also hide refresh on worload service table

---
 .../monocular-release-services-list-config.service.ts     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-config.service.ts
index 123981b01c..c9e4c0f0c4 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-config.service.ts
@@ -11,9 +11,6 @@ import { HelmReleaseServicesDataSource } from './monocular-release-services-list
 
 @Injectable()
 export class HelmReleaseServicesListConfig extends BaseKubernetesServicesListConfig {
-  dataSource: HelmReleaseServicesDataSource;
-
-  public getDataSource = () => this.dataSource;
 
   constructor(
     private store: Store<AppState>,
@@ -23,4 +20,9 @@ export class HelmReleaseServicesListConfig extends BaseKubernetesServicesListCon
     super();
     this.dataSource = new HelmReleaseServicesDataSource(this.store, this, helmReleaseHelper.endpointGuid, helmReleaseHelper.releaseTitle);
   }
+  dataSource: HelmReleaseServicesDataSource;
+
+  hideRefresh = true;
+
+  public getDataSource = () => this.dataSource;
 }

From a42a870528b386052e22ecc99aa1edd328008227 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 16 Jan 2020 13:34:00 +0000
Subject: [PATCH 251/648] Updates to pods list after review

---
 .../helm-release-pods-list-config.service.ts  |  2 +-
 ...etes-namespace-pods-list-config.service.ts | 10 ++--
 ...ubernetes-node-pods-list-config.service.ts |  2 +-
 .../kubernetes-pod-readiness.component.ts     |  7 ++-
 .../kubernetes-pods-list-config.service.ts    | 50 ++++++-------------
 ...ocular-release-pods-list-config.service.ts |  2 +-
 .../workloads/store/workloads.actions.ts      |  4 +-
 7 files changed, 31 insertions(+), 46 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-list-config.service.ts
index fa455459e0..680ecfc6a0 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-list-config.service.ts
@@ -20,7 +20,7 @@ export class KubernetesReleasePodsListConfigService extends BaseKubernetesPodsLi
     kubeId: BaseKubeGuid,
     public helmReleaseService: HelmReleaseService,
   ) {
-    super();
+    super(kubeId.guid);
     this.podsDataSource = new KubernetesReleasePodsDataSource(store, kubeId, this, helmReleaseService);
   }
 
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts
index b126532d57..3947bdc70f 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts
@@ -10,17 +10,19 @@ import { KubernetesNamespacePodsDataSource } from './kubernetes-namespace-pods-d
 @Injectable()
 export class KubernetesNamespacePodsListConfigService extends BaseKubernetesPodsListConfigService {
 
-  private podsDataSource: KubernetesNamespacePodsDataSource;
-
-  getDataSource = () => this.podsDataSource;
+  showNamespaceLink = false;
 
   constructor(
     store: Store<AppState>,
     kubeId: BaseKubeGuid,
     public kubeNamespaceService: KubernetesNamespaceService,
   ) {
-    super();
+    super(kubeId.guid);
     this.podsDataSource = new KubernetesNamespacePodsDataSource(store, kubeId, this, kubeNamespaceService);
   }
 
+  private podsDataSource: KubernetesNamespacePodsDataSource;
+
+  getDataSource = () => this.podsDataSource;
+
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts
index 527cb9cffc..67d16aff96 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts
@@ -19,7 +19,7 @@ export class KubernetesNodePodsListConfigService extends BaseKubernetesPodsListC
     kubeId: BaseKubeGuid,
     public kubeNodeService: KubernetesNodeService,
   ) {
-    super();
+    super(kubeId.guid);
     this.podsDataSource = new KubernetesNodePodsDataSource(store, kubeId, this, kubeNodeService);
   }
 
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.ts
index e2da0782d2..838a66f2b8 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.ts
@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core';
+
 import { TableCellCustom } from '../../../../../shared/components/list/list.types';
-import { KubernetesPod, ContainerStatus } from '../../../store/kube.types';
+import { ContainerStatus, KubernetesPod } from '../../../store/kube.types';
 
 @Component({
   selector: 'app-kubernetes-pod-readiness',
@@ -13,6 +14,10 @@ export class KubernetesPodReadinessComponent extends TableCellCustom<KubernetesP
   public ready = 0;
 
   ngOnInit() {
+    if (this.row.status.phase === 'Failed') {
+      return `0 / ${this.row.spec.containers.length}`;
+    }
+
     const containers = this.row.status.containerStatuses || [];
     this.total = containers.length;
     this.ready = containers.reduce((r: number, cstatus: ContainerStatus) => cstatus.ready ? r + 1 : r, 0);
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
index a31bd98055..41bcc574bd 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
@@ -11,13 +11,16 @@ import { IListConfig, ListViewTypes } from '../../../../shared/components/list/l
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesPod } from '../../store/kube.types';
 import { defaultHelmKubeListPageSize } from '../kube-helm-list-types';
-import { getContainerLengthSort } from '../kube-sort.helper';
 import { KubernetesPodReadinessComponent } from './kubernetes-pod-readiness/kubernetes-pod-readiness.component';
 import { KubernetesPodsDataSource } from './kubernetes-pods-data-source';
 import { PodNameLinkComponent } from './pod-name-link/pod-name-link.component';
 
 export abstract class BaseKubernetesPodsListConfigService implements IListConfig<KubernetesPod> {
 
+  public showNamespaceLink = true;
+
+  constructor(private kubeId: string) { }
+
   columns: Array<ITableColumn<KubernetesPod>> = [
     {
       columnId: 'name', headerCell: () => 'Name',
@@ -27,7 +30,7 @@ export abstract class BaseKubernetesPodsListConfigService implements IListConfig
         orderKey: 'name',
         field: 'metadata.name'
       },
-      cellFlex: '5',
+      cellFlex: '3',
     },
     // TODO: See #150 - keep out RC bring back after demo
     // {
@@ -35,37 +38,31 @@ export abstract class BaseKubernetesPodsListConfigService implements IListConfig
     //   cellComponent: KubernetesPodTagsComponent,
     //   cellFlex: '5',
     // },
-    {
-      columnId: 'containers', headerCell: () => 'No. of Containers',
-      cellDefinition: {
-        valuePath: 'spec.containers.length'
-      },
-      sort: getContainerLengthSort,
-      cellFlex: '2',
-    },
     {
       columnId: 'namespace', headerCell: () => 'Namespace',
       cellDefinition: {
-        valuePath: 'metadata.namespace'
+        valuePath: 'metadata.namespace',
+        getLink: row => this.showNamespaceLink ? `/kubernetes/${this.kubeId}/namespaces/${row.metadata.namespace}` : null
       },
       sort: {
         type: 'sort',
         orderKey: 'namespace',
         field: 'metadata.namespace'
       },
-      cellFlex: '5',
+      cellFlex: '2',
     },
     {
       columnId: 'node', headerCell: () => 'Node',
       cellDefinition: {
-        valuePath: 'spec.nodeName'
+        valuePath: 'spec.nodeName',
+        getLink: () => `/kubernetes/${this.kubeId}/summary`
       },
       sort: {
         type: 'sort',
         orderKey: 'node',
         field: 'spec.nodeName'
       },
-      cellFlex: '5',
+      cellFlex: '2',
     },
     {
       columnId: 'status', headerCell: () => 'Status',
@@ -77,30 +74,12 @@ export abstract class BaseKubernetesPodsListConfigService implements IListConfig
         orderKey: 'status',
         field: 'status.phase'
       },
-      cellFlex: '5',
-    },
-    {
-      columnId: 'container-status', headerCell: () => `Ready Containers`,
-      cellDefinition: {
-        getValue: (row) => {
-          if (row.status.phase === 'Failed') {
-            return `0 / ${row.spec.containers.length}`;
-          }
-          const readyPods = row.status.containerStatuses.filter(status => status.ready).length;
-          const allContainers = row.status.containerStatuses.length;
-          return `${readyPods} / ${allContainers}`;
-        }
-      },
-      cellFlex: '5',
+      cellFlex: '1',
     },
-    // TODO: RC --> NWM From releases table. Diff between this and above?
     {
       columnId: 'ready',
       headerCell: () => 'Ready',
       cellComponent: KubernetesPodReadinessComponent,
-      // cellDefinition: {
-      //   valuePath: 'ready'
-      // },
       sort: {
         type: 'sort',
         orderKey: 'ready',
@@ -108,7 +87,6 @@ export abstract class BaseKubernetesPodsListConfigService implements IListConfig
       },
       cellFlex: '1'
     },
-    // TODO: RC --> NWM From releases table, keep in all pod tables?
     {
       columnId: 'age',
       headerCell: () => 'Age',
@@ -134,12 +112,12 @@ export abstract class BaseKubernetesPodsListConfigService implements IListConfig
     noEntries: 'There are no pods'
   };
   abstract getDataSource: () => IListDataSource<KubernetesPod>;
+
   getGlobalActions = () => null;
   getMultiActions = () => [];
   getSingleActions = () => [];
   getColumns = () => this.columns;
   getMultiFiltersConfigs = () => [];
-
 }
 
 @Injectable()
@@ -152,7 +130,7 @@ export class KubernetesPodsListConfigService extends BaseKubernetesPodsListConfi
     store: Store<AppState>,
     kubeId: BaseKubeGuid,
   ) {
-    super();
+    super(kubeId.guid);
     this.podsDataSource = new KubernetesPodsDataSource(store, kubeId, this);
   }
 
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-config.service.ts
index 132f3ac5d9..b44e58b5ce 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-config.service.ts
@@ -14,7 +14,7 @@ export class HelmReleasePodsListConfig extends BaseKubernetesPodsListConfigServi
     store: Store<AppState>,
     helmReleaseHelper: HelmReleaseHelperService
   ) {
-    super();
+    super(helmReleaseHelper.endpointGuid);
     this.podsDataSource = new HelmReleasePodsDataSource(store, this, helmReleaseHelper.endpointGuid, helmReleaseHelper.releaseTitle);
   }
 
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
index 239d3791b6..92818a4800 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
@@ -121,7 +121,7 @@ export class GetHelmReleasePods implements MonocularPaginationAction {
   ];
   paginationKey: string;
   initialParams = {
-    'order-direction': 'asc',
+    'order-direction': 'desc',
     'order-direction-field': 'name',
   };
 }
@@ -147,7 +147,7 @@ export class GetHelmReleaseServices implements MonocularPaginationAction {
   ];
   paginationKey: string;
   initialParams = {
-    'order-direction': 'asc',
+    'order-direction': 'desc',
     'order-direction-field': 'name',
   };
 }

From d93fb5d70f1a8b04f72eb3eabf4d22cc5db5eb1c Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 16 Jan 2020 13:48:27 +0000
Subject: [PATCH 252/648] Remove link from service ports section of services
 table/cards

---
 .../kubernetes-service-ports.component.html   |  9 ++----
 .../kubernetes-service-ports.component.ts     | 28 ++-----------------
 2 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html
index 35187acf75..ca4796f76c 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html
@@ -1,4 +1,4 @@
-<ng-container *ngIf="(kubeService$ | async) as kubeService; else noPorts">
+<ng-container *ngIf="row as kubeService; else noPorts">
   <table *ngIf="!!kubeService.spec?.ports.length; else noPorts">
     <tr>
       <th>Name</th>
@@ -7,12 +7,7 @@
       <th>Target Port</th>
     </tr>
     <tr *ngFor="let port of kubeService.spec?.ports">
-      <td>
-        <a *ngIf="endpointId; else noLink" href="{{getServiceLink(kubeService, port)}}" target="_blank">
-          {{ port.name}}
-        </a>
-        <ng-template #noLink>{{port.name}}</ng-template>
-      </td>
+      <td>{{port.name}}</td>
       <td>{{port.protocol}}</td>
       <td>{{port.port}}</td>
       <td>{{port.targetPort}}</td>
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
index 9e9de01551..72540b7eec 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
@@ -1,5 +1,4 @@
-import { Component, Input } from '@angular/core';
-import { Observable, of } from 'rxjs';
+import { Component } from '@angular/core';
 
 import { CardCell } from '../../../../shared/components/list/list.types';
 import { KubeService } from '../../../kubernetes/store/kube.types';
@@ -9,27 +8,4 @@ import { KubeService } from '../../../kubernetes/store/kube.types';
   templateUrl: './kubernetes-service-ports.component.html',
   styleUrls: ['./kubernetes-service-ports.component.scss']
 })
-export class KubernetesServicePortsComponent extends CardCell<KubeService> {
-  private pRow: KubeService;
-  public kubeService$: Observable<KubeService>;
-  // Used when extending this class
-  public endpointId: string;
-
-  @Input() set row(row: KubeService) {
-    if (!row) {
-      return;
-    }
-    this.pRow = row;
-    this.kubeService$ = of(row as KubeService);
-    /* tslint:disable-next-line:no-string-literal  */
-    this.endpointId = row['endpointId'];
-  }
-  get row(): KubeService {
-    return this.pRow;
-  }
-
-
-  getServiceLink(service: KubeService, port: { name: string }): string {
-    return `/kubernetes/svcproxy/${this.endpointId}/${service.metadata.namespace}/${service.metadata.name}/${port.name}`;
-  }
-}
+export class KubernetesServicePortsComponent extends CardCell<KubeService> { }

From 07accd9a8fe6985c87602edded83dbba853d8098 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 16 Jan 2020 14:00:00 +0000
Subject: [PATCH 253/648] Fix card error

---
 .../kubernetes-service-ports.component.ts                   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
index 72540b7eec..5dc2beed7c 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, Input } from '@angular/core';
 
 import { CardCell } from '../../../../shared/components/list/list.types';
 import { KubeService } from '../../../kubernetes/store/kube.types';
@@ -8,4 +8,6 @@ import { KubeService } from '../../../kubernetes/store/kube.types';
   templateUrl: './kubernetes-service-ports.component.html',
   styleUrls: ['./kubernetes-service-ports.component.scss']
 })
-export class KubernetesServicePortsComponent extends CardCell<KubeService> { }
+export class KubernetesServicePortsComponent extends CardCell<KubeService> {
+  @Input() row: KubeService;
+}

From 16570d6d5192c97dc447d933112b18cc6bc5d60f Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 16 Jan 2020 14:24:32 +0000
Subject: [PATCH 254/648] Fix workload header text for service + pod via tab
 link '-'

---
 .../page-header/page-header.component.ts      | 11 +++++------
 src/frontend/packages/core/tab-nav.service.ts | 19 +++++++++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

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 5f1b5fe2de..7ae278058a 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
@@ -9,18 +9,17 @@ 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 { 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 { EntityCatalogHelpers } from '../../../../../store/src/entity-catalog/entity-catalog.helper';
+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 { TabNavItem } from '../../../../tab-nav.types';
-import { IPageSideNavTab } from '../../../features/dashboard/page-side-nav/page-side-nav.component';
 
 @Component({
   selector: 'app-page-header',
@@ -52,9 +51,9 @@ export class PageHeaderComponent implements OnDestroy, AfterViewInit {
     if (tabs) {
       this.pTabs = tabs.map(tab => ({
         ...tab,
-        link: tab.link === '-' ? null : this.router.createUrlTree([tab.link], {
-          relativeTo: this.route
-        }).toString()
+        link: tab.link === '-' ?
+          TabNavService.TabsNoLinkValue :
+          this.router.createUrlTree([tab.link], { relativeTo: this.route }).toString()
       }));
       this.tabNavService.setTabs(this.pTabs);
     }
diff --git a/src/frontend/packages/core/tab-nav.service.ts b/src/frontend/packages/core/tab-nav.service.ts
index 814f8e9d75..fbdad8cad7 100644
--- a/src/frontend/packages/core/tab-nav.service.ts
+++ b/src/frontend/packages/core/tab-nav.service.ts
@@ -1,13 +1,17 @@
-import { Injectable } from '@angular/core';
-import { BehaviorSubject, asapScheduler, Observable, Subject, combineLatest } from 'rxjs';
-import { observeOn, map, startWith, publishReplay, refCount, tap, filter } from 'rxjs/operators';
 import { Portal } from '@angular/cdk/portal';
-import { Router, NavigationEnd } from '@angular/router';
-import { TabNavItem } from './tab-nav.types';
+import { Injectable } from '@angular/core';
+import { NavigationEnd, Router } from '@angular/router';
+import { asapScheduler, BehaviorSubject, combineLatest, Observable, Subject } from 'rxjs';
+import { filter, map, observeOn, publishReplay, refCount, startWith } from 'rxjs/operators';
+
 import { IPageSideNavTab } from './src/features/dashboard/page-side-nav/page-side-nav.component';
 
+
 @Injectable()
 export class TabNavService {
+
+  static TabsNoLinkValue = null;
+
   private tabNavsSubject: BehaviorSubject<IPageSideNavTab[]>;
   public tabNavs$: Observable<IPageSideNavTab[]>;
 
@@ -63,7 +67,10 @@ export class TabNavService {
     if (!tabs) {
       return null;
     }
-    const activeTab = tabs.find(tab => this.router.isActive(tab.link, false));
+    const activeTab = tabs
+      .filter(tab => tab.link !== TabNavService.TabsNoLinkValue)
+      .find(tab => this.router.isActive(tab.link, false));
+
     if (!activeTab) {
       return null;
     }

From d2fc04f6019d77cd8986750c7b557c2db8a46aef Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 16 Jan 2020 14:51:57 +0000
Subject: [PATCH 255/648] Couple more '-' fixes

---
 .../helm-release-tab-base/helm-release-tab-base.component.ts  | 3 ++-
 .../packages/core/src/core/extension/extension-service.ts     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

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 3d76c14bf6..5404a28a77 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
@@ -2,6 +2,7 @@ import { Component, OnDestroy } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 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 { PaginatedAction } from 'frontend/packages/store/src/types/pagination.types';
@@ -58,7 +59,7 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
 
   public title = '';
 
-  tabLinks = [
+  tabLinks: IPageSideNavTab[] = [
     { link: 'summary', label: 'Summary', icon: 'helm', iconFont: 'stratos-icons' },
     { link: 'notes', label: 'Notes', icon: 'subject' },
     { link: 'values', label: 'Values', icon: 'list' },
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 582e36882b..33664e86b5 100644
--- a/src/frontend/packages/core/src/core/extension/extension-service.ts
+++ b/src/frontend/packages/core/src/core/extension/extension-service.ts
@@ -4,8 +4,8 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 
 import { AppState, GeneralEntityAppState } from '../../../../store/src/app-state';
-import { IPageSideNavTab } from '../../features/dashboard/page-side-nav/page-side-nav.component';
 import { EntityServiceFactory } from '../../../../store/src/entity-service-factory.service';
+import { IPageSideNavTab } from '../../features/dashboard/page-side-nav/page-side-nav.component';
 
 export const extensionsActionRouteKey = 'extensionsActionsKey';
 
@@ -21,7 +21,7 @@ export enum StratosTabType {
 export interface StratosTabMetadata {
   label: string;
   link: string;
-  icon: string;
+  icon?: string;
   iconFont?: string;
   hidden?: (store: Store<AppState>, esf: EntityServiceFactory, activatedRoute: ActivatedRoute) => Observable<boolean>;
 }

From 6849e5e3a4fc66f482fd8f282c59c9a181f7c159 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 16 Jan 2020 17:02:52 +0000
Subject: [PATCH 256/648] Fix workload charts and resource cards

---
 .../tabs/helm-release-helper.service.ts       | 77 +++++++++++++++++--
 .../helm-release-summary-tab.component.html   |  5 +-
 .../helm-release-summary-tab.component.ts     | 77 ++++++++++++++-----
 .../kubernetes/workloads/workload.types.ts    | 52 +++++++------
 4 files changed, 157 insertions(+), 54 deletions(-)

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 98b893fdf0..0c6b790de8 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
@@ -2,11 +2,24 @@ import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { AppState } from 'frontend/packages/store/src/app-state';
 import { EntityServiceFactory } from 'frontend/packages/store/src/entity-service-factory.service';
+import { PaginationMonitorFactory } from 'frontend/packages/store/src/monitors/pagination-monitor.factory';
 import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { filter, map } from 'rxjs/operators';
 
-import { GetHelmRelease, GetHelmReleaseGraph, GetHelmReleaseResource } from '../../store/workloads.actions';
-import { HelmRelease, HelmReleaseGraph, HelmReleaseGuid, HelmReleaseResource } from '../../workload.types';
+import { KubernetesPod } from '../../../store/kube.types';
+import {
+  GetHelmRelease,
+  GetHelmReleaseGraph,
+  GetHelmReleasePods,
+  GetHelmReleaseResource,
+} from '../../store/workloads.actions';
+import {
+  HelmRelease,
+  HelmReleaseChartData,
+  HelmReleaseGraph,
+  HelmReleaseGuid,
+  HelmReleaseResource,
+} from '../../workload.types';
 
 
 @Injectable()
@@ -23,8 +36,9 @@ export class HelmReleaseHelperService {
 
   constructor(
     helmReleaseGuid: HelmReleaseGuid,
-    store: Store<AppState>,
-    private esf: EntityServiceFactory
+    private store: Store<AppState>,
+    private esf: EntityServiceFactory,
+    private paginationMonitorFactory: PaginationMonitorFactory,
   ) {
     this.guid = helmReleaseGuid.guid;
     this.releaseTitle = this.guid.split(':')[2];
@@ -53,6 +67,7 @@ export class HelmReleaseHelperService {
     return this.guid.replace(':', '/').replace(':', '/');
   }
 
+  // TODO: RC convert both of these to just selects fetchReleaseGraph fetchReleaseResources
   public fetchReleaseGraph(): Observable<HelmReleaseGraph> {
     // Get helm release
     const action = new GetHelmReleaseGraph(this.endpointGuid, this.releaseTitle);
@@ -63,11 +78,59 @@ export class HelmReleaseHelperService {
 
   public fetchReleaseResources(): Observable<HelmReleaseResource> {
     // Get helm release
-    // TODO: RC --> NWM If this should never be expected to fetch the resource there's a `selectEntity` selector that can be used instead
-    // of action
     const action = new GetHelmReleaseResource(this.endpointGuid, this.releaseTitle);
     return this.esf.create<HelmReleaseResource>(action.guid, action).waitForEntity$.pipe(
       map(entity => entity.entity)
     );
   }
+
+  public fetchReleaseChartStats(): Observable<HelmReleaseChartData> {
+    const action = new GetHelmReleasePods(this.endpointGuid, this.releaseTitle);
+    return this.paginationMonitorFactory.create(
+      action.paginationKey,
+      action.entity[0]
+    ).currentPage$.pipe(
+      filter(pods => !!pods),
+      map(this.mapPods)
+    );
+  }
+
+  private mapPods(pods: KubernetesPod[]): HelmReleaseChartData {
+    const podPhases: { [phase: string]: number } = {};
+    const containers = {
+      ready: {
+        name: 'Ready',
+        value: 0
+      },
+      notReady: {
+        name: 'Not Ready',
+        value: 0
+      }
+    };
+
+    pods.forEach(pod => {
+      const status = pod.status.phase;
+      if (!podPhases[status]) {
+        podPhases[status] = 1;
+      } else {
+        podPhases[status]++;
+      }
+
+      pod.status.containerStatuses.forEach(containerStatus => {
+        if (containerStatus.state.running) {
+          containers.ready.value++;
+        } else {
+          containers.notReady.value++;
+        }
+      });
+    });
+
+    return {
+      podsChartData: Object.entries(podPhases).map(([phase, count]) => ({
+        name: phase,
+        value: count
+      })),
+      containersChartData: Object.values(containers)
+    };
+  }
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
index a9416bf803..4314512d29 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
@@ -27,8 +27,7 @@
             {{ release.info.last_deployed | date:'medium' }}
           </app-metadata-item>
         </div>
-        <!-- // TODO: RC -- NWM Is this needed anymore? -->
-        <!-- <app-tile-grid>
+        <app-tile-grid>
           <app-tile-group *ngIf="chartData$ | async as chartData">
             <app-tile>
               <mat-card class="full-card">
@@ -42,7 +41,7 @@
               </mat-card>
             </app-tile>
           </app-tile-group>
-        </app-tile-grid> -->
+        </app-tile-grid>
 
       </div>
       <app-metadata-item class="chart-details__item" label="Resources"></app-metadata-item>
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index 5d6e6fb4a1..283c6dae11 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -14,6 +14,7 @@ import { map, startWith } from 'rxjs/operators';
 
 import { KUBERNETES_ENDPOINT_TYPE } from '../../../../kubernetes-entity-factory';
 import { helmReleaseEntityKey } from '../../../store/workloads-entity-factory';
+import { HelmReleaseChartData, HelmReleaseResource } from '../../../workload.types';
 import { HelmReleaseHelperService } from '../helm-release-helper.service';
 
 @Component({
@@ -48,11 +49,34 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
     }
   ];
 
+  public iconMappings = {
+    Pod: {
+      name: 'adjust'
+    },
+    Role: {
+      name: 'lock'
+    },
+    RoleBinding: {
+      name: 'lock'
+    },
+    ServiceAccount: {
+      name: 'lock'
+    },
+    ReplicaSet: {
+      name: 'filter_none'
+    },
+    default: {
+      name: 'collocation',
+      font: 'stratos-icons'
+    }
+  };
+
   // Blue: #00B2E2
   // Yellow: #FFC107
 
   private deleted = false;
-  public chartData$: Observable<{ podsChartData: { name: string; value: any; }[]; containersChartData: { name: string; value: any; }[]; }>;
+  public chartData$: Observable<HelmReleaseChartData>;
+  public resources$: Observable<HelmReleaseResource[]>;
 
   constructor(
     public helmReleaseHelper: HelmReleaseHelperService,
@@ -72,26 +96,37 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
       startWith(true)
     );
 
-    // TODO: RC --> NWM Is this needed anymore?
-    // Async fetch release status
-    // this.chartData$ = releaseStatus$.pipe(
-    //   map(data => ({
-    //     podsChartData: Object.keys(data.pods.status).map(status => ({
-    //       name: status,
-    //       value: data.pods.status[status]
-    //     })),
-    //     containersChartData: [
-    //       {
-    //         name: 'Ready',
-    //         value: data.pods.ready
-    //       },
-    //       {
-    //         name: 'Not Ready',
-    //         value: data.pods.containers - data.pods.ready
-    //       }
-    //     ]
-    //   }))
-    // );
+    this.chartData$ = this.helmReleaseHelper.fetchReleaseChartStats();
+
+    this.resources$ = this.helmReleaseHelper.fetchReleaseGraph().pipe(
+      map((graph: any) => {
+        const resources = {};
+        // Collect the resources
+        Object.values(graph.nodes).forEach((node: any) => {
+          if (!resources[node.data.kind]) {
+            resources[node.data.kind] = {
+              kind: node.data.kind,
+              label: `${node.data.kind}s`,
+              count: 0,
+              statuses: [],
+              icon: this.getIcon(node.data.kind)
+            };
+          }
+          resources[node.data.kind].count++;
+          resources[node.data.kind].statuses.push(node.data.status);
+        });
+        return Object.values(resources).sort((a: any, b: any) => a.kind.localeCompare(b.kind));
+      })
+    );
+  }
+
+  private getIcon(kind: string) {
+    const rkind = kind || 'Pod';
+    if (this.iconMappings[rkind]) {
+      return this.iconMappings[rkind];
+    } else {
+      return this.iconMappings.default;
+    }
   }
 
   private startDelete() {
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
index 619c8d6df2..45fac18fd8 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
@@ -27,29 +27,30 @@ export interface HelmRelease {
   };
 }
 
-export interface HelmReleaseStatus {
-  endpointId?: string;
-  releaseTitle?: string;
-  data: {
-    'v1/Pod': {
-      [key: string]: {
-        age: string;
-        name: string;
-        ready: string;
-        restarts: string;
-        status: string;
-      }
-    }
-    'v1/Service': {
-      [key: string]: {
-        name: string;
-      }
-    },
-    [dataKey: string]: any
-  };
-  fields: string[];
-  pods: any;
-}
+// TODO: RC Remove
+// export interface HelmReleaseStatus {
+//   endpointId?: string;
+//   releaseTitle?: string;
+//   data: {
+//     'v1/Pod': {
+//       [key: string]: {
+//         age: string;
+//         name: string;
+//         ready: string;
+//         restarts: string;
+//         status: string;
+//       }
+//     }
+//     'v1/Service': {
+//       [key: string]: {
+//         name: string;
+//       }
+//     },
+//     [dataKey: string]: any
+//   };
+//   fields: string[];
+//   pods: any;
+// }
 
 export interface HelmReleasePod {
   endpointId: string;
@@ -87,3 +88,8 @@ export function isHelmReleaseService(obj: any): HelmReleaseService {
 export class HelmReleaseGuid {
   guid: string;
 }
+
+export interface HelmReleaseChartData {
+  podsChartData: { name: string; value: any; }[];
+  containersChartData: { name: string; value: any; }[];
+}

From 5419c7fb1076d277cf180b3484d8dd95d930d1f7 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 17 Jan 2020 11:37:27 +0000
Subject: [PATCH 257/648] Remove background

---
 .../entity-summary-title.component.scss                     | 1 -
 .../entity-summary-title.component.theme.scss               | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.scss b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.scss
index bef4b4562c..f92925f938 100644
--- a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.scss
+++ b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.scss
@@ -43,7 +43,6 @@
     margin: 10px;
   }
   &__content {
-    background: linear-gradient(to bottom, transparent 0%, #f5f5f5 10%);
     margin: 0 -20px -20px;
     padding: 0 20px 20px;
   }
diff --git a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.theme.scss b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.theme.scss
index f3a359e4e6..4f852bb653 100644
--- a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.theme.scss
@@ -1,7 +1,7 @@
 @mixin entity-summary-title-theme($theme, $app-theme) {
   $background-colors: map-get($theme, background);
   $background: mat-color($background-colors, background);
-  .entity-summary__content {
-    background: linear-gradient(to bottom, transparent 0%, $background 10%);
-  }
+  //.entity-summary__content {
+  // background: linear-gradient(to bottom, transparent 0%, $background 10%);
+  //}
 }

From 4bd21484a8ca3c67fc18c3ca8a2316296409aa1a Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 17 Jan 2020 13:15:07 +0000
Subject: [PATCH 258/648] Remove Kube Applications View

---
 .../helm-release-pods-tab.component.html      |   1 -
 .../helm-release-pods-tab.component.scss      |   0
 .../helm-release-pods-tab.component.ts        |  17 ---
 .../helm-release-services.component.html      |   1 -
 .../helm-release-services.component.scss      |   0
 .../helm-release-services.component.ts        |  17 ---
 .../helm-release-summary-card.component.html  |  16 ---
 .../helm-release-summary-card.component.scss  |   0
 ...elm-release-summary-card.component.spec.ts |  31 -----
 .../helm-release-summary-card.component.ts    |  30 -----
 .../helm-release-summary.component.html       |   7 --
 .../helm-release-summary.component.scss       |   4 -
 .../helm-release-summary.component.spec.ts    |  39 -------
 .../helm-release-summary.component.ts         |   8 --
 .../helm-release/helm-release.component.html  |   8 --
 .../helm-release/helm-release.component.scss  |   0
 .../helm-release/helm-release.component.ts    |  61 ----------
 .../kubernetes-tab-base.component.ts          |   1 -
 .../custom/kubernetes/kubernetes.module.ts    |  12 --
 .../custom/kubernetes/kubernetes.routing.ts   |  22 ----
 .../helm-release-pods-data-source.ts          |  35 ------
 .../helm-release-pods-list-config.service.ts  |  27 -----
 ...kubernetes-release-services-data-source.ts |  33 ------
 ...es-release-services-list-config.service.ts |  25 ----
 .../kubernetes/store/kubernetes.actions.ts    |  23 ----
 .../kubernetes/store/kubernetes.effects.ts    | 107 +-----------------
 .../kubernetes-summary.component.html         |   6 +-
 .../kubernetes-summary.component.ts           |   6 -
 28 files changed, 3 insertions(+), 534 deletions(-)
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-pods-tab/helm-release-pods-tab.component.html
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-pods-tab/helm-release-pods-tab.component.scss
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-pods-tab/helm-release-pods-tab.component.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-services/helm-release-services.component.html
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-services/helm-release-services.component.scss
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-services/helm-release-services.component.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.html
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.scss
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.spec.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.html
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.scss
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.spec.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.html
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.scss
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-list-config.service.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-release-services/kubernetes-release-services-data-source.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-release-services/kubernetes-release-services-list-config.service.ts

diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-pods-tab/helm-release-pods-tab.component.html b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-pods-tab/helm-release-pods-tab.component.html
deleted file mode 100644
index f2d54fe259..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-pods-tab/helm-release-pods-tab.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<app-list></app-list>
diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-pods-tab/helm-release-pods-tab.component.scss b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-pods-tab/helm-release-pods-tab.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-pods-tab/helm-release-pods-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-pods-tab/helm-release-pods-tab.component.ts
deleted file mode 100644
index c7b9b05e93..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-pods-tab/helm-release-pods-tab.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Component } from '@angular/core';
-
-import { ListConfig } from '../../../../shared/components/list/list.component.types';
-import {
-  KubernetesReleasePodsListConfigService,
-} from '../../list-types/helm-release-pods/helm-release-pods-list-config.service';
-
-@Component({
-  selector: 'app-helm-release-pods-tab',
-  templateUrl: './helm-release-pods-tab.component.html',
-  styleUrls: ['./helm-release-pods-tab.component.scss'],
-  providers: [{
-    provide: ListConfig,
-    useClass: KubernetesReleasePodsListConfigService,
-  }]
-})
-export class KubernetesReleasePodsTabComponent { }
diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-services/helm-release-services.component.html b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-services/helm-release-services.component.html
deleted file mode 100644
index f2d54fe259..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-services/helm-release-services.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<app-list></app-list>
diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-services/helm-release-services.component.scss b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-services/helm-release-services.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-services/helm-release-services.component.ts b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-services/helm-release-services.component.ts
deleted file mode 100644
index fed24d27c5..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-services/helm-release-services.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Component } from '@angular/core';
-
-import { ListConfig } from '../../../../shared/components/list/list.component.types';
-import {
-  KubernetesReleaseServicesListConfig,
-} from '../../list-types/kubernetes-release-services/kubernetes-release-services-list-config.service';
-
-@Component({
-  selector: 'app-helm-release-services',
-  templateUrl: './helm-release-services.component.html',
-  styleUrls: ['./helm-release-services.component.scss'],
-  providers: [{
-    provide: ListConfig,
-    useClass: KubernetesReleaseServicesListConfig,
-  }]
-})
-export class HelmReleaseServicesComponent { }
diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.html b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.html
deleted file mode 100644
index c24a1922a0..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="helm-release-summary-card">
-  <mat-card>
-    <mat-card-header>
-      <mat-card-title>Summary</mat-card-title>
-    </mat-card-header>
-    <mat-card-content>
-      <div class="helm-release-summary-card__content">
-        <app-metadata-item icon="title" label="Name">{{ (chartName$ | async) }}</app-metadata-item>
-        <app-metadata-item icon="title" label="Status">{{ (helmReleaseService.helmRelease$ | async)?.status }}</app-metadata-item>
-        <app-metadata-item icon="memory" label="Version">{{ (helmReleaseService.helmRelease$ | async)?.version }}</app-metadata-item>
-        <app-metadata-item icon="date_range" label="Created At">{{ (helmReleaseService.helmRelease$ | async)?.createdAt
-          | date:'medium' }}</app-metadata-item>
-      </div>
-    </mat-card-content>
-  </mat-card>
-</div>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.scss b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.spec.ts
deleted file mode 100644
index d8e3071e3e..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.spec.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { BaseKubeGuid } from '../../../kubernetes-page.types';
-import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
-import { HelmReleaseService } from '../../../services/helm-release.service';
-import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
-import { HelmReleaseSummaryCardComponent } from './helm-release-summary-card.component';
-
-describe('HelmReleaseSummaryCardComponent', () => {
-  let component: HelmReleaseSummaryCardComponent;
-  let fixture: ComponentFixture<HelmReleaseSummaryCardComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [HelmReleaseSummaryCardComponent],
-      imports: KubernetesBaseTestModules,
-      providers: [BaseKubeGuid, HelmReleaseService, KubernetesEndpointService]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(HelmReleaseSummaryCardComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.ts b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.ts
deleted file mode 100644
index bf5d72c0f5..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Component } from '@angular/core';
-import { combineLatest, Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-
-import { HelmReleaseService } from '../../../services/helm-release.service';
-
-@Component({
-  selector: 'app-helm-release-summary-card',
-  templateUrl: './helm-release-summary-card.component.html',
-  styleUrls: ['./helm-release-summary-card.component.scss']
-})
-export class HelmReleaseSummaryCardComponent {
-  chartName$: Observable<string>;
-
-  constructor(
-    public helmReleaseService: HelmReleaseService
-  ) {
-    // get chart name
-    this.chartName$ = combineLatest(this.helmReleaseService.deployments$, this.helmReleaseService.statefulSets$).pipe(
-      map(([deployments, statefulsets]) => {
-        if (deployments.length !== 0) {
-          return deployments[0].metadata.labels.chart;
-        }
-        if (statefulsets.length !== 0) {
-          return statefulsets[0].metadata.labels.chart;
-        }
-      })
-    );
-  }
-}
diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.html b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.html
deleted file mode 100644
index 6311a46921..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="helm-release-summary">
-  <app-tile>
-    <app-tile-group>
-      <app-helm-release-summary-card></app-helm-release-summary-card>
-    </app-tile-group>
-  </app-tile>
-</div>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.scss b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.scss
deleted file mode 100644
index 783faa0cf1..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.helm-release-summary {
-  padding-left: 20px;
-  padding-top: 20px;
-}
diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.spec.ts
deleted file mode 100644
index f7c78bf281..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.spec.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { BaseKubeGuid } from '../../kubernetes-page.types';
-import { KubernetesBaseTestModules } from '../../kubernetes.testing.module';
-import { HelmReleaseService } from '../../services/helm-release.service';
-import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
-import { HelmReleaseSummaryCardComponent } from './helm-release-summary-card/helm-release-summary-card.component';
-import { HelmReleaseSummaryComponent } from './helm-release-summary.component';
-
-describe('HelmReleaseSummaryComponent', () => {
-  let component: HelmReleaseSummaryComponent;
-  let fixture: ComponentFixture<HelmReleaseSummaryComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [
-        HelmReleaseSummaryComponent,
-        HelmReleaseSummaryCardComponent
-      ],
-      imports: KubernetesBaseTestModules,
-      providers: [BaseKubeGuid, HelmReleaseService, KubernetesEndpointService]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(HelmReleaseSummaryComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  afterEach(() => {
-    fixture.destroy();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.ts b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.ts
deleted file mode 100644
index fd855cfb99..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-helm-release-summary',
-  templateUrl: './helm-release-summary.component.html',
-  styleUrls: ['./helm-release-summary.component.scss']
-})
-export class HelmReleaseSummaryComponent {}
diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.html b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.html
deleted file mode 100644
index 92c1400e76..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<app-page-header tabsHeader="Application" [breadcrumbs]="breadcrumbs$ | async" [tabs]=" tabLinks">
-  <h1>{{ helmReleaseService.helmReleaseName }}</h1>
-  <div class="page-header-right">
-  </div>
-</app-page-header>
-<app-loading-page [isLoading]="isFetching$" [text]="'Retrieving Release Details'">
-  <router-outlet></router-outlet>
-</app-loading-page>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.scss b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.ts b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.ts
deleted file mode 100644
index 01413297cc..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { Observable, of as ObservableOf } from 'rxjs';
-import { map } from 'rxjs/operators';
-
-import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types';
-import { BaseKubeGuid } from '../kubernetes-page.types';
-import { HelmReleaseService } from '../services/helm-release.service';
-import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
-import { KubernetesService } from '../services/kubernetes.service';
-
-// TODO: RC Remove this whole folder? (kube/apps/release summary tab)
-// Also include any lists, components, etc
-@Component({
-  selector: 'app-helm-release',
-  templateUrl: './helm-release.component.html',
-  styleUrls: ['./helm-release.component.scss'],
-  providers: [
-    {
-      provide: BaseKubeGuid,
-      useFactory: (activatedRoute: ActivatedRoute) => {
-        return {
-          guid: activatedRoute.snapshot.params.endpointId
-        };
-      },
-      deps: [
-        ActivatedRoute
-      ]
-    },
-    KubernetesService,
-    HelmReleaseService,
-    KubernetesEndpointService
-  ]
-})
-export class HelmReleaseComponent implements OnInit {
-
-  public tabLinks = [
-    { link: 'pods', label: 'Pods', icon: 'adjust' },
-    { link: 'services', label: 'Services', icon: 'service', iconFont: 'stratos-icons' },
-  ];
-
-  public breadcrumbs$: Observable<IHeaderBreadcrumb[]>;
-
-  isFetching$: Observable<boolean>;
-  constructor(public kubeEndpointService: KubernetesEndpointService, public helmReleaseService: HelmReleaseService) {
-    this.breadcrumbs$ = kubeEndpointService.endpoint$.pipe(
-      map(endpoint => ([{
-        breadcrumbs: [
-          { value: endpoint.entity.name, routerLink: `/kubernetes/${endpoint.entity.guid}/apps` },
-        ]
-      }])
-      )
-    );
-  }
-
-
-  ngOnInit() {
-    this.isFetching$ = ObservableOf(false);
-  }
-
-}
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
index 882e65d512..b61ebc2c76 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
@@ -36,7 +36,6 @@ export class KubernetesTabBaseComponent implements OnInit {
     { link: 'nodes', label: 'Nodes', icon: 'developer_board' },
     { link: 'namespaces', label: 'Namespaces', icon: 'language' },
     { link: 'pods', label: 'Pods', icon: 'adjust' },
-    { link: 'apps', label: 'Applications', icon: 'apps' }
   ];
 
   public isFetching$: Observable<boolean>;
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
index 55a51b0491..3ffaa95f64 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
@@ -4,13 +4,6 @@ import { NgxChartsModule } from '@swimlane/ngx-charts';
 
 import { CoreModule } from '../../core/core.module';
 import { SharedModule } from '../../shared/shared.module';
-import { KubernetesReleasePodsTabComponent } from './helm-release/helm-release-pods-tab/helm-release-pods-tab.component';
-import { HelmReleaseServicesComponent } from './helm-release/helm-release-services/helm-release-services.component';
-import {
-  HelmReleaseSummaryCardComponent,
-} from './helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component';
-import { HelmReleaseSummaryComponent } from './helm-release/helm-release-summary/helm-release-summary.component';
-import { HelmReleaseComponent } from './helm-release/helm-release.component';
 import { KubernetesDashboardTabComponent } from './kubernetes-dashboard/kubernetes-dashboard.component';
 import {
   KubernetesNamespacePodsComponent,
@@ -125,12 +118,7 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     KubernetesDashboardTabComponent,
     KubernetesSummaryTabComponent,
     KubernetesAppsTabComponent,
-    HelmReleaseComponent,
     AppLinkComponent,
-    KubernetesReleasePodsTabComponent,
-    HelmReleaseSummaryComponent,
-    HelmReleaseServicesComponent,
-    HelmReleaseSummaryCardComponent,
     PodMetricsComponent,
     KubernetesNodeLinkComponent,
     KubernetesNodeIpsComponent,
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts
index f2d3839458..30b2863648 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts
@@ -1,9 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
-import { KubernetesReleasePodsTabComponent } from './helm-release/helm-release-pods-tab/helm-release-pods-tab.component';
-import { HelmReleaseServicesComponent } from './helm-release/helm-release-services/helm-release-services.component';
-import { HelmReleaseComponent } from './helm-release/helm-release.component';
 import { KubernetesDashboardTabComponent } from './kubernetes-dashboard/kubernetes-dashboard.component';
 import {
   KubernetesNamespacePodsComponent,
@@ -90,25 +87,6 @@ const kubernetes: Routes = [{
 
   ]
 },
-{
-  path: ':endpointId/apps/:releaseName',
-  component: HelmReleaseComponent,
-  children: [
-    {
-      path: '',
-      redirectTo: 'pods',
-      pathMatch: 'full'
-    },
-    {
-      path: 'pods',
-      component: KubernetesReleasePodsTabComponent
-    },
-    {
-      path: 'services',
-      component: HelmReleaseServicesComponent
-    }
-  ]
-},
 {
   path: ':endpointId',
   component: KubernetesTabBaseComponent,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts
deleted file mode 100644
index 13a3ba0c13..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Store } from '@ngrx/store';
-
-import { AppState } from '../../../../../../store/src/app-state';
-import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
-import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { kubernetesEntityFactory, kubernetesPodsEntityType } from '../../kubernetes-entity-factory';
-import { BaseKubeGuid } from '../../kubernetes-page.types';
-import { HelmReleaseService } from '../../services/helm-release.service';
-import { KubernetesPod } from '../../store/kube.types';
-import { GetKubernetesReleasePods } from '../../store/kubernetes.actions';
-
-
-// import { getHelmReleaseServiceId } from '../../../helm/store/helm.entities';
-export class KubernetesReleasePodsDataSource extends ListDataSource<KubernetesPod, any> {
-
-  constructor(
-    store: Store<AppState>,
-    kubeGuid: BaseKubeGuid,
-    listConfig: IListConfig<KubernetesPod>,
-    helmReleaseService: HelmReleaseService,
-  ) {
-    const action = new GetKubernetesReleasePods(kubeGuid.guid, helmReleaseService.helmReleaseName);
-    super({
-      store,
-      action,
-      schema: kubernetesEntityFactory(kubernetesPodsEntityType),
-      getRowUniqueId: a => a.name,
-      paginationKey: action.paginationKey,
-      isLocal: true,
-      listConfig,
-      transformEntities: [{ type: 'filter', field: 'metadata.name' }]
-    });
-  }
-
-}
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-list-config.service.ts
deleted file mode 100644
index 680ecfc6a0..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-list-config.service.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
-
-import { AppState } from '../../../../../../store/src//app-state';
-import { BaseKubeGuid } from '../../kubernetes-page.types';
-import { HelmReleaseService } from '../../services/helm-release.service';
-import { BaseKubernetesPodsListConfigService } from '../kubernetes-pods/kubernetes-pods-list-config.service';
-import { KubernetesReleasePodsDataSource } from './helm-release-pods-data-source';
-
-
-@Injectable()
-export class KubernetesReleasePodsListConfigService extends BaseKubernetesPodsListConfigService {
-
-  private podsDataSource: KubernetesReleasePodsDataSource;
-
-  getDataSource = () => this.podsDataSource;
-
-  constructor(
-    store: Store<AppState>,
-    kubeId: BaseKubeGuid,
-    public helmReleaseService: HelmReleaseService,
-  ) {
-    super(kubeId.guid);
-    this.podsDataSource = new KubernetesReleasePodsDataSource(store, kubeId, this, helmReleaseService);
-  }
-
-}
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-release-services/kubernetes-release-services-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-release-services/kubernetes-release-services-data-source.ts
deleted file mode 100644
index 4350345e62..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-release-services/kubernetes-release-services-data-source.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Store } from '@ngrx/store';
-import { map } from 'rxjs/operators';
-
-import { AppState } from '../../../../../../store/src//app-state';
-import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { BaseKubeGuid } from '../../kubernetes-page.types';
-import { HelmReleaseService } from '../../services/helm-release.service';
-import { KubeService } from '../../store/kube.types';
-import { GetKubernetesServices } from '../../store/kubernetes.actions';
-import { BaseKubernetesServicesDataSource } from '../kubernetes-services/kubernetes-services-data-source';
-
-
-export class KubernetesHelmReleaseServicesDataSource extends BaseKubernetesServicesDataSource {
-
-  constructor(
-    store: Store<AppState>,
-    kubeGuid: BaseKubeGuid,
-    listConfig: IListConfig<KubeService>,
-    helmReleaseService: HelmReleaseService,
-  ) {
-    const action = new GetKubernetesServices(kubeGuid.guid);
-    super(
-      store,
-      action,
-      listConfig,
-      map((services: KubeService[]) => services.filter(svc =>
-        svc.metadata.labels &&
-        svc.metadata.labels['app.kubernetes.io/instance'] === helmReleaseService.helmReleaseName
-      ))
-    );
-  }
-
-}
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-release-services/kubernetes-release-services-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-release-services/kubernetes-release-services-list-config.service.ts
deleted file mode 100644
index 0ccfb74b16..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-release-services/kubernetes-release-services-list-config.service.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
-
-import { AppState } from '../../../../../../store/src/app-state';
-import { BaseKubeGuid } from '../../kubernetes-page.types';
-import { HelmReleaseService } from '../../services/helm-release.service';
-import { BaseKubernetesServicesListConfig } from '../kubernetes-services/kubernetes-service-list-config.service';
-import { KubernetesHelmReleaseServicesDataSource } from './kubernetes-release-services-data-source';
-
-@Injectable()
-export class KubernetesReleaseServicesListConfig extends BaseKubernetesServicesListConfig {
-  podsDataSource: KubernetesHelmReleaseServicesDataSource;
-
-  constructor(
-    store: Store<AppState>,
-    kubeId: BaseKubeGuid,
-    helmReleaseService: HelmReleaseService
-  ) {
-    super();
-    this.podsDataSource = new KubernetesHelmReleaseServicesDataSource(store, kubeId, this, helmReleaseService);
-  }
-  getDataSource = () => this.podsDataSource;
-
-
-}
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 e67704dadc..3875328a51 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
@@ -88,29 +88,6 @@ export interface KubeAction extends EntityRequestAction {
 }
 export interface KubePaginationAction extends PaginatedAction, KubeAction { }
 
-export class GetKubernetesReleasePods implements KubePaginationAction {
-
-  constructor(public kubeGuid: string, releaseName: string) {
-    this.paginationKey = getPaginationKey(kubernetesPodsEntityType, `release-${releaseName}`, kubeGuid);
-    this.initialParams = {
-      labelSelector: `app.kubernetes.io/instance=${releaseName}`,
-      ...sortPodsByName
-    };
-  }
-  initialParams: PaginationParam;
-  type = GET_RELEASE_POD_INFO;
-  entityType = kubernetesPodsEntityType;
-  endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesPodsEntityType)];
-  params: { labelSelector: string; };
-  actions = [
-    GET_RELEASE_POD_INFO,
-    GET_RELEASE_POD_INFO_SUCCESS,
-    GET_RELEASE_POD_INFO_FAILURE
-  ];
-  paginationKey: string;
-}
-
 export class KubeHealthCheck implements KubePaginationAction {
   constructor(public kubeGuid) {
     this.paginationKey = kubeGuid + '-health-check';
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 2d164d0cf0..9ffed502bc 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
@@ -4,7 +4,7 @@ import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { connectedEndpointsOfTypesSelector } from 'frontend/packages/store/src/selectors/endpoint.selectors';
 import { of } from 'rxjs';
-import { catchError, combineLatest, first, flatMap, map, mergeMap, switchMap } from 'rxjs/operators';
+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';
@@ -17,7 +17,6 @@ import {
 import { environment } from '../../../environments/environment';
 import {
   KUBERNETES_ENDPOINT_TYPE,
-  kubernetesAppsEntityType,
   kubernetesDashboardEntityType,
   kubernetesDeploymentsEntityType,
   kubernetesNamespacesEntityType,
@@ -28,8 +27,6 @@ import {
 } from '../kubernetes-entity-factory';
 import { getKubeAPIResourceGuid } from './kube.selectors';
 import {
-  ConfigMap,
-  KubernetesConfigMap,
   KubernetesDeployment,
   KubernetesNamespace,
   KubernetesNode,
@@ -43,7 +40,6 @@ import {
   GET_KUBE_DEPLOYMENT,
   GET_KUBE_POD,
   GET_KUBE_STATEFULSETS,
-  GET_KUBERNETES_APP_INFO,
   GET_NAMESPACE_INFO,
   GET_NAMESPACES_INFO,
   GET_NODE_INFO,
@@ -51,10 +47,8 @@ import {
   GET_POD_INFO,
   GET_PODS_IN_NAMESPACE_INFO,
   GET_PODS_ON_NODE_INFO,
-  GET_RELEASE_POD_INFO,
   GET_SERVICE_INFO,
   GET_SERVICES_IN_NAMESPACE_INFO,
-  GetKubernetesApps,
   GetKubernetesDashboard,
   GetKubernetesNamespace,
   GetKubernetesNamespaces,
@@ -64,7 +58,6 @@ import {
   GetKubernetesPods,
   GetKubernetesPodsInNamespace,
   GetKubernetesPodsOnNode,
-  GetKubernetesReleasePods,
   GetKubernetesServices,
   GetKubernetesServicesInNamespace,
   GetKubernetesStatefulSets,
@@ -123,20 +116,6 @@ export class KubernetesEffects {
     })
   );
 
-  @Effect()
-  fetchReleasePodsInfo$ = this.actions$.pipe(
-    ofType<GetKubernetesReleasePods>(GET_RELEASE_POD_INFO),
-    flatMap(action => {
-      const nodeEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesEntityType);
-      return this.processListAction<KubernetesPod>(
-        action,
-        `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`,
-        nodeEntityConfig.entityKey,
-        getKubeAPIResourceGuid
-      );
-    })
-  );
-
   @Effect()
   fetchNodesInfo$ = this.actions$.pipe(
     ofType<GetKubernetesNodes>(GET_NODES_INFO),
@@ -278,88 +257,7 @@ export class KubernetesEffects {
     })
   );
 
-  @Effect()
-  fetchKubernetesAppsInfo$ = this.actions$.pipe(
-    ofType<GetKubernetesApps>(GET_KUBERNETES_APP_INFO),
-    flatMap(action => {
-      this.store.dispatch(new StartRequestAction(action));
-
-      const headers = new HttpHeaders({ 'x-cap-cnsi-list': action.kubeGuid });
-      const requestArgs = {
-        headers
-      };
-      const appsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesAppsEntityType);
-      return this.http
-        .get<ConfigMap>(`/pp/${this.proxyAPIVersion}/proxy/api/v1/configmaps`, requestArgs)
-        .pipe(
-          combineLatest(
-            this.http.get<ConfigMap>(`/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/deployments`, requestArgs),
-            this.http.get<ConfigMap>(`/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/statefulsets`, requestArgs)),
-          mergeMap(([configMapsResponse, deploymentsResponse, statefulesetResponse]) => {
-            const { kubeGuid: kubeId } = action;
-            const items = configMapsResponse[kubeId].items as Array<any>;
-            const deployments = deploymentsResponse[kubeId].items as Array<KubernetesDeployment>;
-            const statefulSets = statefulesetResponse[kubeId].items as Array<any>;
-
-            const getChartName = (name: string, labelName: string): string => {
-              // Might not have a label (e.g. Dex)
-              const releaseDeployment = deployments.filter(d =>
-                d.metadata.labels && d.metadata.labels['app.kubernetes.io/instance'] === name);
-              const releaseStatefulSets = statefulSets.filter(d =>
-                d.metadata.labels && d.metadata.labels['app.kubernetes.io/instance'] === name);
-
-              if (releaseDeployment.length !== 0) {
-                return releaseDeployment[0].metadata.labels[labelName];
-              }
-              if (releaseStatefulSets.length !== 0) {
-                return releaseStatefulSets[0].metadata.labels[labelName];
-              }
-            };
-            const releases = items
-              .filter((configMap) => !!configMap.metadata.labels &&
-                !!configMap.metadata.labels.NAME &&
-                configMap.metadata.labels.OWNER === 'TILLER'
-              )
-              .map((configMap: KubernetesConfigMap) => ({
-                name: configMap.metadata.labels.NAME,
-                kubeId,
-                createdAt: configMap.metadata.creationTimestamp,
-                status: configMap.metadata.labels.STATUS,
-                version: configMap.metadata.labels.VERSION,
-                chartName: getChartName(configMap.metadata.labels.NAME, 'helm.sh/chart'),
-                appVersion: getChartName(configMap.metadata.labels.NAME, 'app.kubernetes.io/version')
-              })
-              ).reduce((res, app) => {
-                const id = `${app.kubeId}-${app.name}`;
-                res.entities[appsEntityConfig.entityKey][id] = app;
-                if (res.result.indexOf(id) === -1) {
-                  res.result.push(id);
-                }
-                return res;
-              }, {
-                entities: { [appsEntityConfig.entityKey]: {} },
-                result: []
-              } as NormalizedResponse);
-
-            return [
-              new WrapperRequestActionSuccess(releases, action)
-            ];
-          }),
-          catchError(error => [
-            new WrapperRequestActionFailed(error.message, action, 'fetch', {
-              endpointIds: [action.kubeGuid],
-              url: error.url || `/pp/${this.proxyAPIVersion}/proxy/api/v1/configmaps`,
-              eventCode: error.status ? error.status + '' : '500',
-              message: 'Kubernetes API request error',
-              error
-            })
-          ])
-        );
-    })
-  );
-
-
-  private processNodeAction(action: GetKubernetesReleasePods | GetKubernetesNodes) {
+  private processNodeAction(action: GetKubernetesNodes) {
     const nodeEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesEntityType);
     return this.processListAction<KubernetesNode>(action,
       `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes`,
@@ -367,7 +265,6 @@ export class KubernetesEffects {
       getKubeAPIResourceGuid);
   }
 
-
   private processListAction<T = any>(
     action: KubePaginationAction | KubeAction,
     url: string,
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
index 7198ba3c46..8c7ae3b246 100644
--- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
@@ -22,11 +22,7 @@
               icon="apps" label="Nodes" labelSingular="Node" value="{{ nodeCount$ | async }}">
             </app-card-number-metric>
           </app-tile>
-          <app-tile>
-            <app-card-number-metric [textOnly]="true" link="/kubernetes/{{kubeEndpointService.baseKube.guid}}/apps"
-              icon="apps" label="Applications" labelSingular="Application" value="{{ appCount$ | async }}">
-            </app-card-number-metric>
-          </app-tile>
+          <!-- // TODO: RC add namespace, sort order matching nav -->
         </app-tile-group>
       </app-tile-grid>
       <div class="kube-details__graphs">
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 104583bc30..4a31108cc8 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
@@ -17,7 +17,6 @@ import {
 } from '../../../../shared/components/simple-usage-chart/simple-usage-chart.types';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
 import { GetKubernetesNodes, GetKubernetesPods } from '../../store/kubernetes.actions';
-import { GetKubernetesApps } from './../../store/kubernetes.actions';
 
 interface IValueLabels {
   usedLabel?: string;
@@ -38,7 +37,6 @@ interface IEndpointDetails {
 export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
   public podCount$: Observable<number>;
   public nodeCount$: Observable<number>;
-  public appCount$: Observable<number>;
   public highUsageColors = {
     domain: ['#00000026', '#00af00']
   };
@@ -107,14 +105,11 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
 
     const podCountAction = new GetKubernetesPods(guid);
     const nodeCountAction = new GetKubernetesNodes(guid);
-    const appCountAction = new GetKubernetesApps(guid);
-    const applications$ = this.getPaginationObservable(appCountAction);
     const pods$ = this.getPaginationObservable(podCountAction);
     const nodes$ = this.getPaginationObservable(nodeCountAction);
 
     this.podCount$ = this.kubeEndpointService.getCountObservable(pods$);
     this.nodeCount$ = this.kubeEndpointService.getCountObservable(nodes$);
-    this.appCount$ = this.kubeEndpointService.getCountObservable(applications$);
 
     this.podCapacity$ = this.kubeEndpointService.getPodCapacity(nodes$, pods$);
     this.diskPressure$ = this.kubeEndpointService.getNodeStatusCount(nodes$, 'DiskPressure', {
@@ -155,7 +150,6 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
       this.endpointDetails$,
       this.podCount$,
       this.nodeCount$,
-      this.appCount$,
       this.podCapacity$,
       this.diskPressure$,
       this.memoryPressure$,

From 7d4ebf3fb8d15335791a9428536d1741a15b02db Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 17 Jan 2020 13:15:20 +0000
Subject: [PATCH 259/648] Fix build warning

---
 custom-src/frontend/app/custom/kubernetes/store/kube.types.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
index 80630c1b0d..8df733a37f 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
@@ -43,6 +43,7 @@ export interface DeploymentSpec {
   revisionHistoryLimit: number;
   progressDeadlineSeconds: number;
   type?: string;
+  clusterIP?: string;
 }
 
 export interface KubernetesDeployment extends BasicKubeAPIResource {

From 1b4026dee50da449f7b704665da5bca5e152920d Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 17 Jan 2020 13:34:53 +0000
Subject: [PATCH 260/648] Remove root kube apps lists

---
 ...kubernetes-endpoint-preview.component.html |  24 ++---
 .../kubernetes-endpoint-preview.component.ts  |   3 -
 .../custom/kubernetes/kubernetes.module.ts    |  14 +--
 .../custom/kubernetes/kubernetes.routing.ts   |   9 --
 .../app-link/app-link.component.html          |   1 -
 .../app-link/app-link.component.scss          |   0
 .../app-link/app-link.component.spec.ts       |  38 -------
 .../app-link/app-link.component.ts            |  21 ----
 .../kube-appcreated-date.component.html       |   1 -
 .../kube-appcreated-date.component.scss       |   0
 .../kube-appcreated-date.component.spec.ts    |  38 -------
 .../kube-appcreated-date.component.ts         |  15 ---
 .../kubernetes-apps-data-source.ts            |  32 ------
 .../kubernetes-apps-list-config.service.ts    | 100 ------------------
 .../pod-metrics/pod-metrics.component.ts      |  13 +--
 .../services/helm-release.service.ts          |  94 ----------------
 .../services/kubernetes-endpoint.service.ts   |   9 --
 .../kubernetes/store/kubernetes.actions.ts    |  21 ----
 .../kubernetes-apps-tab.component.html        |   1 -
 .../kubernetes-apps-tab.component.scss        |   0
 .../kubernetes-apps-tab.component.spec.ts     |  29 -----
 .../kubernetes-apps-tab.component.ts          |  15 ---
 .../kubernetes/workloads/workload.types.ts    |  31 ------
 23 files changed, 17 insertions(+), 492 deletions(-)
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.html
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.scss
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.spec.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.html
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.scss
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.spec.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-data-source.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-list-config.service.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/services/helm-release.service.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.html
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.scss
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.spec.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.ts

diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.html
index e216ce4ad7..c1d6871205 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.html
@@ -31,40 +31,36 @@
           <app-card-number-metric [link]="nodesLink" icon="apps" label="Nodes" labelSingular="Node"
             value="{{ nodeCount$ | async }}"></app-card-number-metric>
         </app-tile>
-        <app-tile>
-          <app-card-number-metric [link]="appsLink" icon="apps" label="Applications" labelSingular="Application"
-            value="{{ appCount$ | async }}"></app-card-number-metric>
-        </app-tile>
+        <!-- // TODO: RC Namespaces/Order -->
       </app-tile-group>
 
       <app-tile-group>
         <app-tile>
           <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Pod Usage"
-            value="{{ (podCapacity$ | async)?.used }}"
-            limit="{{ (podCapacity$ | async)?.total }}"></app-card-number-metric>
+            value="{{ (podCapacity$ | async)?.used }}" limit="{{ (podCapacity$ | async)?.total }}">
+          </app-card-number-metric>
         </app-tile>
         <app-tile>
           <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Disk Pressure"
-            value="{{ (diskPressure$ | async)?.used }}"
-            limit="{{ (diskPressure$ | async)?.total}}"></app-card-number-metric>
+            value="{{ (diskPressure$ | async)?.used }}" limit="{{ (diskPressure$ | async)?.total}}">
+          </app-card-number-metric>
         </app-tile>
         <app-tile>
           <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Memory Pressure"
-            value="{{ (memoryPressure$ | async)?.used }}"
-            limit="{{ (memoryPressure$ | async)?.total}}"></app-card-number-metric>
+            value="{{ (memoryPressure$ | async)?.used }}" limit="{{ (memoryPressure$ | async)?.total}}">
+          </app-card-number-metric>
         </app-tile>
       </app-tile-group>
 
       <app-tile-group>
         <app-tile>
           <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Out of Disk"
-            value="{{ (outOfDisk$ | async)?.used }}"
-            limit="{{ (outOfDisk$ | async)?.total }}"></app-card-number-metric>
+            value="{{ (outOfDisk$ | async)?.used }}" limit="{{ (outOfDisk$ | async)?.total }}"></app-card-number-metric>
         </app-tile>
         <app-tile>
           <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Ready"
-            value="{{ (nodesReady$ | async)?.used }}"
-            limit="{{ (nodesReady$ | async)?.total }}"></app-card-number-metric>
+            value="{{ (nodesReady$ | async)?.used }}" limit="{{ (nodesReady$ | async)?.total }}">
+          </app-card-number-metric>
         </app-tile>
       </app-tile-group>
     </app-loading-page>
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.ts
index 3f8047cf0c..a6b7141e08 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.ts
@@ -20,7 +20,6 @@ export class KubernetesEndpointPreviewComponent implements PreviewableComponent
   kubeVersion$: Observable<string>;
   podCount$: Observable<number>;
   nodeCount$: Observable<number>;
-  appCount$: Observable<number>;
   podCapacity$: Observable<ISimpleUsageChartData>;
   diskPressure$: Observable<ISimpleUsageChartData>;
   memoryPressure$: Observable<ISimpleUsageChartData>;
@@ -45,7 +44,6 @@ export class KubernetesEndpointPreviewComponent implements PreviewableComponent
     this.kubeVersion$ = this.kubeEndpointService.getNodeKubeVersions();
     this.podCount$ = this.kubeEndpointService.getCountObservable(this.kubeEndpointService.pods$);
     this.nodeCount$ = this.kubeEndpointService.getCountObservable(nodes$);
-    this.appCount$ = this.kubeEndpointService.getCountObservable(this.kubeEndpointService.apps$);
     this.podCapacity$ = this.kubeEndpointService.getPodCapacity();
     this.diskPressure$ = this.kubeEndpointService.getNodeStatusCount(this.kubeEndpointService.nodes$, 'DiskPressure');
     this.memoryPressure$ = this.kubeEndpointService.getNodeStatusCount(this.kubeEndpointService.nodes$, 'MemoryPressure');
@@ -59,7 +57,6 @@ export class KubernetesEndpointPreviewComponent implements PreviewableComponent
     this.detailsLoading$ = combineLatest([
       this.podCount$,
       this.nodeCount$,
-      this.appCount$,
       this.podCapacity$,
       this.diskPressure$,
       this.memoryPressure$,
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
index 3ffaa95f64..9ee79b188e 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
@@ -28,10 +28,6 @@ import { BaseKubeGuid } from './kubernetes-page.types';
 import { KubernetesTabBaseComponent } from './kubernetes-tab-base/kubernetes-tab-base.component';
 import { KubernetesRoutingModule } from './kubernetes.routing';
 import { KubernetesComponent } from './kubernetes/kubernetes.component';
-import { AppLinkComponent } from './list-types/kubernetes-apps/app-link/app-link.component';
-import {
-  KubeAppcreatedDateComponent,
-} from './list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component';
 import { KubernetesLabelsCellComponent } from './list-types/kubernetes-labels-cell/kubernetes-labels-cell.component';
 import {
   KubeNamespacePodCountComponent,
@@ -85,16 +81,15 @@ import {
   KubeServiceCardComponent,
 } from './list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component';
 import { PodMetricsComponent } from './pod-metrics/pod-metrics.component';
-import { HelmReleaseService } from './services/helm-release.service';
 import { KubernetesEndpointService } from './services/kubernetes-endpoint.service';
 import { KubernetesNodeService } from './services/kubernetes-node.service';
 import { KubernetesService } from './services/kubernetes.service';
-import { KubernetesAppsTabComponent } from './tabs/kubernetes-apps-tab/kubernetes-apps-tab.component';
 import { KubernetesNamespacesTabComponent } from './tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component';
 import { KubernetesNodesTabComponent } from './tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component';
 import { KubernetesPodsTabComponent } from './tabs/kubernetes-pods-tab/kubernetes-pods-tab.component';
 import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kubernetes-summary.component';
 
+// import { HelmReleaseService } from './services/helm-release.service';
 /* tslint:disable:max-line-length */
 
 /* tslint:enable */
@@ -117,8 +112,6 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     KubernetesNamespacesTabComponent,
     KubernetesDashboardTabComponent,
     KubernetesSummaryTabComponent,
-    KubernetesAppsTabComponent,
-    AppLinkComponent,
     PodMetricsComponent,
     KubernetesNodeLinkComponent,
     KubernetesNodeIpsComponent,
@@ -143,7 +136,6 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     KubernetesNamespaceComponent,
     KubernetesNamespacePodsComponent,
     KubernetesNamespaceServicesComponent,
-    KubeAppcreatedDateComponent,
     KubeNamespacePodCountComponent,
     PodNameLinkComponent,
     NodePodCountComponent,
@@ -156,13 +148,12 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     KubernetesService,
     BaseKubeGuid,
     KubernetesEndpointService,
-    HelmReleaseService,
+    // HelmReleaseService,
     KubernetesNodeService
   ],
   entryComponents: [
     KubernetesNodeCapacityComponent,
     KubernetesPodTagsComponent,
-    AppLinkComponent,
     KubernetesNodeLinkComponent,
     KubernetesNodeIpsComponent,
     KubernetesNodeLabelsComponent,
@@ -170,7 +161,6 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     KubernetesLabelsCellComponent,
     ConditionCellComponent,
     KubernetesNamespaceLinkComponent,
-    KubeAppcreatedDateComponent,
     KubeNamespacePodCountComponent,
     PodNameLinkComponent,
     NodePodCountComponent,
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts
index 30b2863648..bdf3932795 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts
@@ -18,7 +18,6 @@ import {
   KubernetesNodeSummaryComponent,
 } from './list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component';
 import { PodMetricsComponent } from './pod-metrics/pod-metrics.component';
-import { KubernetesAppsTabComponent } from './tabs/kubernetes-apps-tab/kubernetes-apps-tab.component';
 import { KubernetesNamespacesTabComponent } from './tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component';
 import { KubernetesNodesTabComponent } from './tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component';
 import { KubernetesPodsTabComponent } from './tabs/kubernetes-pods-tab/kubernetes-pods-tab.component';
@@ -28,10 +27,6 @@ const kubernetes: Routes = [{
   path: '',
   component: KubernetesComponent
 },
-{
-  path: ':endpointId/apps/:releaseName/pods/:namespace/:podName',
-  component: PodMetricsComponent,
-},
 {
   path: ':endpointId/nodes/:nodeName/pods/:namespace/:podName',
   component: PodMetricsComponent,
@@ -112,10 +107,6 @@ const kubernetes: Routes = [{
       path: 'pods',
       component: KubernetesPodsTabComponent
     },
-    {
-      path: 'apps',
-      component: KubernetesAppsTabComponent,
-    },
   ]
 },
 {
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.html
deleted file mode 100644
index ae67f78d1d..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<a [routerLink]="routerLink">{{row.name}}</a>
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.spec.ts
deleted file mode 100644
index 3b9b21aa8f..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.spec.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
-import { AppLinkComponent } from './app-link.component';
-
-describe('AppLinkComponent', () => {
-  let component: AppLinkComponent<any>;
-  let fixture: ComponentFixture<AppLinkComponent<any>>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [AppLinkComponent],
-      imports: KubernetesBaseTestModules
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(AppLinkComponent);
-    component = fixture.componentInstance;
-    const testString = 'test';
-    component.row = {
-      kubeId: testString,
-      name: testString,
-      pods: [],
-      createdAt: (new Date()),
-      status: testString,
-      version: testString,
-      chartName: testString,
-      appVersion: testString,
-    };
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.ts
deleted file mode 100644
index af6a93df0c..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { TableCellCustom } from '../../../../../shared/components/list/list.types';
-import { KubernetesApp } from '../../../../../custom/kubernetes/store/kube.types';
-
-@Component({
-  selector: 'app-app-link',
-  templateUrl: './app-link.component.html',
-  styleUrls: ['./app-link.component.scss']
-})
-export class AppLinkComponent<T> extends TableCellCustom<KubernetesApp> implements OnInit {
-  routerLink: string;
-
-  constructor() {
-    super();
-  }
-
-  ngOnInit(): void {
-    this.routerLink = `${this.row.name}`;
-  }
-
-}
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.html
deleted file mode 100644
index a5511d63f9..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ row.createdAt | date:'medium'}}
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.spec.ts
deleted file mode 100644
index a3a15ea926..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.spec.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
-import { KubeAppcreatedDateComponent } from './kube-appcreated-date.component';
-
-describe('KubeAppcreatedDateComponent', () => {
-  let component: KubeAppcreatedDateComponent;
-  let fixture: ComponentFixture<KubeAppcreatedDateComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [KubeAppcreatedDateComponent],
-      imports: KubernetesBaseTestModules
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(KubeAppcreatedDateComponent);
-    component = fixture.componentInstance;
-    const testString = 'test';
-    component.row = {
-      kubeId: testString,
-      name: testString,
-      pods: [],
-      createdAt: (new Date()),
-      status: testString,
-      version: testString,
-      chartName: testString,
-      appVersion: testString,
-    };
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.ts
deleted file mode 100644
index 2fe3dc5fff..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component } from '@angular/core';
-import { KubernetesApp } from '../../../store/kube.types';
-import { TableCellCustom } from '../../../../../shared/components/list/list.types';
-
-@Component({
-  selector: 'app-kube-appcreated-date',
-  templateUrl: './kube-appcreated-date.component.html',
-  styleUrls: ['./kube-appcreated-date.component.scss']
-})
-export class KubeAppcreatedDateComponent extends TableCellCustom<KubernetesApp> {
-
-  constructor() {
-    super();
-   }
-}
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-data-source.ts
deleted file mode 100644
index c461e7e100..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-data-source.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Store } from '@ngrx/store';
-
-import { getPaginationKey } from '../../../../../../store/src/actions/pagination.actions';
-import { AppState } from '../../../../../../store/src/app-state';
-import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
-import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { getKubeAppId, kubernetesAppsEntityType, kubernetesEntityFactory } from '../../kubernetes-entity-factory';
-import { BaseKubeGuid } from '../../kubernetes-page.types';
-import { KubernetesApp } from '../../store/kube.types';
-import { GetKubernetesApps } from '../../store/kubernetes.actions';
-
-
-export class KubernetesAppsDataSource extends ListDataSource<KubernetesApp> {
-
-  constructor(
-    store: Store<AppState>,
-    kubeGuid: BaseKubeGuid,
-    listConfig: IListConfig<KubernetesApp>
-  ) {
-    super({
-      store,
-      action: new GetKubernetesApps(kubeGuid.guid),
-      schema: kubernetesEntityFactory(kubernetesAppsEntityType),
-      getRowUniqueId: getKubeAppId,
-      paginationKey: getPaginationKey(kubernetesAppsEntityType, kubeGuid.guid),
-      isLocal: true,
-      listConfig,
-      transformEntities: [{ type: 'filter', field: 'name' }]
-    });
-  }
-
-}
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-list-config.service.ts
deleted file mode 100644
index e984169e53..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-list-config.service.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
-
-import { AppState } from '../../../../../../store/src/app-state';
-import { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
-import { IListConfig, ListViewTypes } from '../../../../shared/components/list/list.component.types';
-import { BaseKubeGuid } from '../../kubernetes-page.types';
-import { KubernetesApp } from '../../store/kube.types';
-import { defaultHelmKubeListPageSize } from '../kube-helm-list-types';
-import { AppLinkComponent } from './app-link/app-link.component';
-import { KubeAppcreatedDateComponent } from './kube-appcreated-date/kube-appcreated-date.component';
-import { KubernetesAppsDataSource } from './kubernetes-apps-data-source';
-
-@Injectable()
-export class KubernetesAppsListConfigService implements IListConfig<KubernetesApp> {
-  AppsDataSource: KubernetesAppsDataSource;
-
-  columns: Array<ITableColumn<KubernetesApp>> = [
-    {
-      columnId: 'name', headerCell: () => 'Release Name',
-      cellComponent: AppLinkComponent,
-      sort: {
-        type: 'sort',
-        orderKey: 'name',
-        field: 'name'
-      },
-      cellFlex: '5',
-    },
-    {
-      columnId: 'chartName', headerCell: () => 'Chart Name',
-      cellDefinition: {
-        getValue: (a) => a.chartName
-      },
-      sort: {
-        type: 'sort',
-        orderKey: 'chartName',
-        field: 'chartName'
-      },
-      cellFlex: '5',
-    },
-    {
-      columnId: 'status', headerCell: () => 'Status',
-      cellDefinition: {
-        getValue: (a) => a.status
-      },
-      sort: {
-        type: 'sort',
-        orderKey: 'status',
-        field: 'status'
-      },
-      cellFlex: '5',
-    },
-    {
-      columnId: 'appVersion', headerCell: () => 'App Version',
-      cellDefinition: {
-        getValue: (a) => a.appVersion,
-      },
-      sort: {
-        type: 'sort',
-        orderKey: 'appVersion',
-        field: 'appVersion'
-      },
-      cellFlex: '5',
-    },
-    {
-      columnId: 'createdAt', headerCell: () => 'Created At',
-      cellComponent: KubeAppcreatedDateComponent,
-      sort: {
-        type: 'sort',
-        orderKey: 'createdAt',
-        field: 'createdAt'
-      },
-      cellFlex: '5',
-    },
-  ];
-
-  pageSizeOptions = defaultHelmKubeListPageSize;
-  viewType = ListViewTypes.TABLE_ONLY;
-
-  enableTextFilter = true;
-  text = {
-    filter: 'Filter by Name',
-    noEntries: 'There are no applications'
-  };
-
-  getGlobalActions = () => null;
-  getMultiActions = () => [];
-  getSingleActions = () => [];
-  getColumns = () => this.columns;
-  getDataSource = () => this.AppsDataSource;
-  getMultiFiltersConfigs = () => [];
-
-  constructor(
-    store: Store<AppState>,
-    kubeId: BaseKubeGuid,
-  ) {
-    this.AppsDataSource = new KubernetesAppsDataSource(store, kubeId, this);
-  }
-
-}
diff --git a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts b/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
index 1608b983df..0441831b28 100644
--- a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
@@ -19,7 +19,6 @@ import {
 } from '../../../shared/components/metrics-chart/metrics.component.helpers';
 import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types';
 import { BaseKubeGuid } from '../kubernetes-page.types';
-import { HelmReleaseService } from '../services/helm-release.service';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
 import { KubernetesService } from '../services/kubernetes.service';
 import { KubernetesPod } from '../store/kube.types';
@@ -42,7 +41,6 @@ import { FetchKubernetesMetricsAction, GetKubernetesPod } from '../store/kuberne
       ]
     },
     KubernetesService,
-    HelmReleaseService,
     KubernetesEndpointService
   ]
 })
@@ -58,7 +56,6 @@ export class PodMetricsComponent {
   ][];
 
   constructor(
-    public helmReleaseService: HelmReleaseService,
     public activatedRoute: ActivatedRoute,
     public store: Store<AppState>,
     public entityServiceFactory: EntityServiceFactory,
@@ -76,7 +73,7 @@ export class PodMetricsComponent {
       chartConfigBuilder(
         new FetchKubernetesMetricsAction(
           this.podName,
-          helmReleaseService.kubeGuid,
+          kubeEndpointService.kubeGuid,
           `container_memory_usage_bytes{pod_name="${this.podName}",namespace="${namespace}"}`
         ),
         'Memory Usage (MB)',
@@ -88,7 +85,7 @@ export class PodMetricsComponent {
       cpuChartConfigBuilder(
         new FetchKubernetesMetricsAction(
           this.podName,
-          helmReleaseService.kubeGuid,
+          kubeEndpointService.kubeGuid,
           `container_cpu_usage_seconds_total{pod_name="${this.podName}",namespace="${namespace}"}`
         ),
         'CPU Usage',
@@ -119,7 +116,7 @@ export class PodMetricsComponent {
       networkChartConfigBuilder(
         new FetchKubernetesMetricsAction(
           this.podName,
-          helmReleaseService.kubeGuid,
+          kubeEndpointService.kubeGuid,
           `container_network_transmit_bytes_total{pod_name="${this.podName}",namespace="${namespace}"}`
         ),
         'Cumulative Data transmitted (MB)',
@@ -128,7 +125,7 @@ export class PodMetricsComponent {
       networkChartConfigBuilder(
         new FetchKubernetesMetricsAction(
           this.podName,
-          helmReleaseService.kubeGuid,
+          kubeEndpointService.kubeGuid,
           `container_network_receive_bytes_total{pod_name="${this.podName}",namespace="${namespace}"}`
         ),
         'Cumulative Data received (MB)',
@@ -178,7 +175,7 @@ export class PodMetricsComponent {
     );
     this.podEntity$ = this.entityServiceFactory.create<KubernetesPod>(
       this.podName,
-      new GetKubernetesPod(this.podName, this.namespaceName, this.helmReleaseService.kubeGuid),
+      new GetKubernetesPod(this.podName, this.namespaceName, this.kubeEndpointService.kubeGuid),
     ).entityObs$;
   }
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/services/helm-release.service.ts b/custom-src/frontend/app/custom/kubernetes/services/helm-release.service.ts
deleted file mode 100644
index 76b9678e23..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/services/helm-release.service.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { Store } from '@ngrx/store';
-import { combineLatest, Observable } from 'rxjs';
-import { filter, first, map, share } from 'rxjs/operators';
-
-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 { getIdFromRoute } from '../../../core/utils.service';
-import { KubernetesApp, KubernetesDeployment, KubernetesPod, KubernetesStatefulSet, KubeService } from '../store/kube.types';
-import { GetKubernetesApps, GetKubernetesServices } from '../store/kubernetes.actions';
-import { KubernetesEndpointService } from './kubernetes-endpoint.service';
-
-//TODO: RC Move to workloads?
-@Injectable()
-export class HelmReleaseService {
-  kubeGuid: string;
-  helmReleaseName: string;
-  helmRelease$: Observable<KubernetesApp>;
-  deployments$: Observable<KubernetesDeployment[]>;
-  statefulSets$: Observable<KubernetesStatefulSet[]>;
-  services$: Observable<KubeService[]>;
-
-  constructor(
-    public kubeEndpointService: KubernetesEndpointService,
-    public activatedRoute: ActivatedRoute,
-    public store: Store<AppState>,
-    public paginationMonitorFactory: PaginationMonitorFactory
-  ) {
-
-    this.kubeGuid = kubeEndpointService.kubeGuid;
-    this.helmReleaseName = getIdFromRoute(activatedRoute, 'releaseName');
-
-    const action = new GetKubernetesApps(this.kubeGuid);
-
-    this.helmRelease$ = getPaginationObservables<KubernetesApp>({
-      store: this.store,
-      action,
-      paginationMonitor: this.paginationMonitorFactory.create(
-        action.paginationKey,
-        action
-      )
-    }, true).entities$.pipe(
-      filter(p => !!p),
-      map(p => p.filter(r => r.name === this.helmReleaseName)[0]),
-      share()
-    );
-
-    this.statefulSets$ = kubeEndpointService.statefulSets$.pipe(
-      map(p => p.filter(r => r.metadata.labels['app.kubernetes.io/instance'] === this.helmReleaseName)),
-      first(),
-    );
-
-    this.deployments$ = kubeEndpointService.deployments$.pipe(
-      map(p => p.filter(r => r.metadata.labels['app.kubernetes.io/instance'] === this.helmReleaseName)),
-      first()
-    );
-
-    const servicesAction = new GetKubernetesServices(this.kubeGuid);
-
-    this.services$ = getPaginationObservables<KubeService>({
-      store: this.store,
-      action: servicesAction,
-      paginationMonitor: this.paginationMonitorFactory.create(
-        servicesAction.paginationKey,
-        servicesAction
-      )
-    }, true).entities$.pipe(
-      filter(p => !!p),
-      map(p => {
-        return p.filter(r => {
-          return r.metadata.labels.release === this.helmReleaseName;
-        });
-
-      }),
-      first()
-    );
-  }
-
-  public getReleasePods(pods: Observable<KubernetesPod[]>): Observable<KubernetesPod[]> {
-    return combineLatest(this.deployments$, this.statefulSets$, pods).pipe(
-      map(([deployments, statefulSets, allPods]) => {
-        return allPods.filter(p => {
-          const podName = p.metadata.name;
-          const filteredDeployments = deployments.filter(d => podName.startsWith(d.metadata.name));
-          const filteredStatefulSets = statefulSets.filter(d => podName.startsWith(d.metadata.name));
-          return filteredDeployments.length !== 0 || filteredStatefulSets.length !== 0;
-        });
-      })
-    );
-  }
-
-}
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
index 7c11950b57..ca25a5eb28 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
@@ -12,7 +12,6 @@ import { getPaginationObservables } from '../../../../../store/src/reducers/pagi
 import { EntityInfo } from '../../../../../store/src/types/api.types';
 import { EndpointModel, EndpointUser } from '../../../../../store/src/types/endpoint.types';
 import {
-  kubernetesAppsEntityType,
   kubernetesDeploymentsEntityType,
   kubernetesNodesEntityType,
   kubernetesPodsEntityType,
@@ -21,7 +20,6 @@ import {
 } from '../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../kubernetes-page.types';
 import {
-  KubernetesApp,
   KubernetesDeployment,
   KubernetesNode,
   KubernetesPod,
@@ -30,7 +28,6 @@ import {
 } from '../store/kube.types';
 import {
   GeKubernetesDeployments,
-  GetKubernetesApps,
   GetKubernetesDashboard,
   GetKubernetesNodes,
   GetKubernetesPods,
@@ -53,7 +50,6 @@ export class KubernetesEndpointService {
   statefulSets$: Observable<KubernetesStatefulSet[]>;
   services$: Observable<KubeService[]>;
   pods$: Observable<KubernetesPod[]>;
-  apps$: Observable<KubernetesApp[]>;
   nodes$: Observable<KubernetesNode[]>;
   kubeDashboardEnabled$: Observable<boolean>;
 
@@ -175,11 +171,6 @@ export class KubernetesEndpointService {
       kubernetesNodesEntityType
     );
 
-    this.apps$ = this.getObservable<KubernetesApp>(
-      new GetKubernetesApps(this.kubeGuid),
-      kubernetesAppsEntityType
-    );
-
     this.statefulSets$ = this.getObservable<KubernetesStatefulSet>(
       new GetKubernetesStatefulSets(this.kubeGuid),
       kubernetesStatefulSetsEntityType
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 3875328a51..21aea6eac6 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
@@ -6,7 +6,6 @@ import { PaginatedAction, PaginationParam } from '../../../../../store/src/types
 import { EntityRequestAction } from '../../../../../store/src/types/request.types';
 import {
   KUBERNETES_ENDPOINT_TYPE,
-  kubernetesAppsEntityType,
   kubernetesDashboardEntityType,
   kubernetesDeploymentsEntityType,
   kubernetesEntityFactory,
@@ -255,26 +254,6 @@ export class GetKubernetesNamespaces implements KubePaginationAction {
   };
 }
 
-export class GetKubernetesApps implements KubePaginationAction {
-  constructor(public kubeGuid) {
-    this.paginationKey = getPaginationKey(kubernetesAppsEntityType, kubeGuid);
-  }
-  type = GET_KUBERNETES_APP_INFO;
-  entityType = kubernetesAppsEntityType;
-  endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesAppsEntityType)];
-  actions = [
-    GET_KUBERNETES_APP_INFO,
-    GET_KUBERNETES_APP_INFO_SUCCESS,
-    GET_KUBERNETES_APP_INFO_FAILURE
-  ];
-  paginationKey: string;
-  initialParams = {
-    'order-direction': 'desc' as SortDirection,
-    'order-direction-field': 'name'
-  };
-}
-
 export class GetKubernetesServices implements KubePaginationAction {
   constructor(public kubeGuid) {
     this.paginationKey = getPaginationKey(kubernetesServicesEntityType, kubeGuid);
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.html b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.html
deleted file mode 100644
index f2d54fe259..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<app-list></app-list>
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.scss b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.spec.ts
deleted file mode 100644
index 2d25616922..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.spec.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { BaseKubeGuid } from '../../kubernetes-page.types';
-import { KubernetesBaseTestModules } from '../../kubernetes.testing.module';
-import { KubernetesAppsTabComponent } from './kubernetes-apps-tab.component';
-
-describe('KubernetesAppsTabComponent', () => {
-  let component: KubernetesAppsTabComponent;
-  let fixture: ComponentFixture<KubernetesAppsTabComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [KubernetesAppsTabComponent],
-      imports: [KubernetesBaseTestModules],
-      providers: [BaseKubeGuid]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(KubernetesAppsTabComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.ts
deleted file mode 100644
index 86c3c08d87..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component } from '@angular/core';
-
-import { ListConfig } from '../../../../shared/components/list/list.component.types';
-import { KubernetesAppsListConfigService } from '../../list-types/kubernetes-apps/kubernetes-apps-list-config.service';
-
-@Component({
-  selector: 'app-kubernetes-apps-tab',
-  templateUrl: './kubernetes-apps-tab.component.html',
-  styleUrls: ['./kubernetes-apps-tab.component.scss'],
-  providers: [{
-    provide: ListConfig,
-    useClass: KubernetesAppsListConfigService,
-  }]
-})
-export class KubernetesAppsTabComponent { }
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
index 45fac18fd8..34b42d5e27 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
@@ -27,31 +27,6 @@ export interface HelmRelease {
   };
 }
 
-// TODO: RC Remove
-// export interface HelmReleaseStatus {
-//   endpointId?: string;
-//   releaseTitle?: string;
-//   data: {
-//     'v1/Pod': {
-//       [key: string]: {
-//         age: string;
-//         name: string;
-//         ready: string;
-//         restarts: string;
-//         status: string;
-//       }
-//     }
-//     'v1/Service': {
-//       [key: string]: {
-//         name: string;
-//       }
-//     },
-//     [dataKey: string]: any
-//   };
-//   fields: string[];
-//   pods: any;
-// }
-
 export interface HelmReleasePod {
   endpointId: string;
   releaseTitle: string;
@@ -78,12 +53,6 @@ export interface HelmReleaseGraph {
 
 export type HelmReleaseResource = any;
 
-export function isHelmReleaseService(obj: any): HelmReleaseService {
-  if (obj && obj.kubeService$) {
-    return obj as HelmReleaseService;
-  }
-}
-
 @Injectable()
 export class HelmReleaseGuid {
   guid: string;

From 468382ad3b7b29b8cb6602607796969a6e4d3d48 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 17 Jan 2020 14:15:50 +0000
Subject: [PATCH 261/648] Remove KubernetesEndpointPreviewComponent (in another
 branch)

---
 ...kubernetes-endpoint-preview.component.html | 68 ------------------
 ...kubernetes-endpoint-preview.component.scss |  0
 ...ernetes-endpoint-preview.component.spec.ts | 37 ----------
 .../kubernetes-endpoint-preview.component.ts  | 71 -------------------
 .../kubernetes/kubernetes.setup.module.ts     |  3 -
 5 files changed, 179 deletions(-)
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.html
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.scss
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.spec.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.ts

diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.html
deleted file mode 100644
index c1d6871205..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<app-sidepanel-preview [title]="title">
-  <app-tile-grid fit="true">
-    <app-loading-page [isLoading]="detailsLoading$" text="Retrieving details">
-      <app-tile-group>
-        <app-tile>
-          <div class="cf-space-usage">
-            <mat-card>
-              <mat-card-header>
-                <mat-card-title>Summary</mat-card-title>
-              </mat-card-header>
-              <mat-card-content>
-                <app-tile-group class="app-metadata">
-                  <app-tile class="app-metadata__two-cols">
-                    <app-metadata-item label="Kubernetes Version">
-                      {{ kubeVersion$ | async }}
-                    </app-metadata-item>
-                  </app-tile>
-                </app-tile-group>
-              </mat-card-content>
-            </mat-card>
-          </div>
-        </app-tile>
-      </app-tile-group>
-
-      <app-tile-group>
-        <app-tile>
-          <app-card-number-metric [link]="podsLink" icon="apps" label="Pods" labelSingular="Pod"
-            value="{{ podCount$ | async }}"></app-card-number-metric>
-        </app-tile>
-        <app-tile>
-          <app-card-number-metric [link]="nodesLink" icon="apps" label="Nodes" labelSingular="Node"
-            value="{{ nodeCount$ | async }}"></app-card-number-metric>
-        </app-tile>
-        <!-- // TODO: RC Namespaces/Order -->
-      </app-tile-group>
-
-      <app-tile-group>
-        <app-tile>
-          <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Pod Usage"
-            value="{{ (podCapacity$ | async)?.used }}" limit="{{ (podCapacity$ | async)?.total }}">
-          </app-card-number-metric>
-        </app-tile>
-        <app-tile>
-          <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Disk Pressure"
-            value="{{ (diskPressure$ | async)?.used }}" limit="{{ (diskPressure$ | async)?.total}}">
-          </app-card-number-metric>
-        </app-tile>
-        <app-tile>
-          <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Memory Pressure"
-            value="{{ (memoryPressure$ | async)?.used }}" limit="{{ (memoryPressure$ | async)?.total}}">
-          </app-card-number-metric>
-        </app-tile>
-      </app-tile-group>
-
-      <app-tile-group>
-        <app-tile>
-          <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Out of Disk"
-            value="{{ (outOfDisk$ | async)?.used }}" limit="{{ (outOfDisk$ | async)?.total }}"></app-card-number-metric>
-        </app-tile>
-        <app-tile>
-          <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Ready"
-            value="{{ (nodesReady$ | async)?.used }}" limit="{{ (nodesReady$ | async)?.total }}">
-          </app-card-number-metric>
-        </app-tile>
-      </app-tile-group>
-    </app-loading-page>
-  </app-tile-grid>
-</app-sidepanel-preview>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.scss b/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.spec.ts
deleted file mode 100644
index 6f1006656d..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.spec.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
-import { LoggerService } from '../../../core/logger.service';
-import { KubernetesEndpointPreviewComponent } from './kubernetes-endpoint-preview.component';
-
-describe('KubernetesEndpointPreviewComponent', () => {
-  let component: KubernetesEndpointPreviewComponent;
-  let fixture: ComponentFixture<KubernetesEndpointPreviewComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [KubernetesEndpointPreviewComponent],
-      providers: [LoggerService, HttpClient, HttpHandler],
-      imports: [
-        HttpClientModule,
-        HttpClientTestingModule,
-        CoreTestingModule,
-        createBasicStoreModule()
-      ]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(KubernetesEndpointPreviewComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.ts
deleted file mode 100644
index a6b7141e08..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-endpoint-preview/kubernetes-endpoint-preview.component.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { Component } from '@angular/core';
-import { combineLatest, Observable } from 'rxjs';
-import { map, startWith } from 'rxjs/operators';
-
-import {
-  ISimpleUsageChartData,
-} from '../../../../../core/src/shared/components/simple-usage-chart/simple-usage-chart.types';
-import { PreviewableComponent } from '../../../../../core/src/shared/previewable-component';
-import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
-
-@Component({
-  selector: 'app-kubernetes-endpoint-preview-component',
-  templateUrl: './kubernetes-endpoint-preview.component.html',
-  styleUrls: ['./kubernetes-endpoint-preview.component.scss']
-})
-export class KubernetesEndpointPreviewComponent implements PreviewableComponent {
-
-  title: string = null;
-  detailsLoading$: Observable<boolean>;
-  kubeVersion$: Observable<string>;
-  podCount$: Observable<number>;
-  nodeCount$: Observable<number>;
-  podCapacity$: Observable<ISimpleUsageChartData>;
-  diskPressure$: Observable<ISimpleUsageChartData>;
-  memoryPressure$: Observable<ISimpleUsageChartData>;
-  outOfDisk$: Observable<ISimpleUsageChartData>;
-  nodesReady$: Observable<ISimpleUsageChartData>;
-  podsLink: string;
-  nodesLink: string;
-  appsLink: string;
-
-  constructor(
-    public kubeEndpointService: KubernetesEndpointService,
-  ) { }
-
-  setProps(props: { [key: string]: any }) {
-    const kubeGuid = props.cfGuid;
-
-    this.title = props.title;
-
-    this.kubeEndpointService.initialize(kubeGuid);
-    const nodes$ = this.kubeEndpointService.nodes$;
-
-    this.kubeVersion$ = this.kubeEndpointService.getNodeKubeVersions();
-    this.podCount$ = this.kubeEndpointService.getCountObservable(this.kubeEndpointService.pods$);
-    this.nodeCount$ = this.kubeEndpointService.getCountObservable(nodes$);
-    this.podCapacity$ = this.kubeEndpointService.getPodCapacity();
-    this.diskPressure$ = this.kubeEndpointService.getNodeStatusCount(this.kubeEndpointService.nodes$, 'DiskPressure');
-    this.memoryPressure$ = this.kubeEndpointService.getNodeStatusCount(this.kubeEndpointService.nodes$, 'MemoryPressure');
-    this.outOfDisk$ = this.kubeEndpointService.getNodeStatusCount(nodes$, 'OutOfDisk');
-    this.nodesReady$ = this.kubeEndpointService.getNodeStatusCount(nodes$, 'Ready');
-
-    this.podsLink = `/kubernetes/${kubeGuid}/pods`;
-    this.nodesLink = `/kubernetes/${kubeGuid}/nodes`;
-    this.appsLink = `/kubernetes/${kubeGuid}/apps`;
-
-    this.detailsLoading$ = combineLatest([
-      this.podCount$,
-      this.nodeCount$,
-      this.podCapacity$,
-      this.diskPressure$,
-      this.memoryPressure$,
-      this.outOfDisk$,
-      this.nodesReady$,
-      // this.networkUnavailable$,
-    ]).pipe(
-      map(() => false),
-      startWith(true),
-    );
-  }
-}
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
index e76158c036..305457f572 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
@@ -16,7 +16,6 @@ import {
   KubernetesConfigAuthFormComponent,
 } from './auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component';
 import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component';
-import { KubernetesEndpointPreviewComponent } from './kubernetes-endpoint-preview/kubernetes-endpoint-preview.component';
 import { KUBERNETES_ENDPOINT_TYPE } from './kubernetes-entity-factory';
 import { generateKubernetesEntities } from './kubernetes-entity-generator';
 import { BaseKubeGuid } from './kubernetes-page.types';
@@ -38,7 +37,6 @@ import { KubeHealthCheck } from './store/kubernetes.actions';
     KubernetesAWSAuthFormComponent,
     KubernetesConfigAuthFormComponent,
     KubernetesGKEAuthFormComponent,
-    KubernetesEndpointPreviewComponent,
   ],
   providers: [
     BaseKubeGuid,
@@ -49,7 +47,6 @@ import { KubeHealthCheck } from './store/kubernetes.actions';
     KubernetesAWSAuthFormComponent,
     KubernetesConfigAuthFormComponent,
     KubernetesGKEAuthFormComponent,
-    KubernetesEndpointPreviewComponent,
   ]
 })
 export class KubernetesSetupModule {

From b362f0feff4e46d6559246512c916336b286872c Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 17 Jan 2020 14:16:33 +0000
Subject: [PATCH 262/648] Fix kube summary, tweak styling

---
 .../kubernetes-summary.component.html         | 27 +++++++++++--------
 .../kubernetes-summary.component.scss         | 11 ++++----
 .../kubernetes-summary.component.ts           |  8 +++++-
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
index 8c7ae3b246..e325858058 100644
--- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
@@ -13,58 +13,63 @@
       <app-tile-grid class="kube-details__metrics" fit="true">
         <app-tile-group>
           <app-tile>
-            <app-card-number-metric [textOnly]="true" link="/kubernetes/{{kubeEndpointService.baseKube.guid}}/pods"
-              icon="apps" label="Pods" labelSingular="Pod" value="{{ podCount$ | async }}">
+            <app-card-number-metric [textOnly]="true" link="/kubernetes/{{kubeEndpointService.baseKube.guid}}/nodes"
+              icon="apps" label="Nodes" labelSingular="Node" value="{{ nodeCount$ | async }}">
             </app-card-number-metric>
           </app-tile>
           <app-tile>
-            <app-card-number-metric [textOnly]="true" link="/kubernetes/{{kubeEndpointService.baseKube.guid}}/nodes"
-              icon="apps" label="Nodes" labelSingular="Node" value="{{ nodeCount$ | async }}">
+            <app-card-number-metric class="kube-details__metrics--namespace" [textOnly]="true"
+              link="/kubernetes/{{kubeEndpointService.baseKube.guid}}/namespaces" icon="language" label="Namespaces"
+              labelSingular="Node" value="{{ namespaceCount$ | async }}">
+            </app-card-number-metric>
+          </app-tile>
+          <app-tile>
+            <app-card-number-metric [textOnly]="true" link="/kubernetes/{{kubeEndpointService.baseKube.guid}}/pods"
+              icon="apps" label="Pods" labelSingular="Pod" value="{{ podCount$ | async }}">
             </app-card-number-metric>
           </app-tile>
-          <!-- // TODO: RC add namespace, sort order matching nav -->
         </app-tile-group>
       </app-tile-grid>
       <div class="kube-details__graphs">
         <div class="kube-details__graphs-group">
           <div class="kube-details__graph">
             <mat-card>
-              <app-simple-usage-chart chartTitle="Pod Usage" [data]="podCapacity$ | async">
+              <app-simple-usage-chart chartTitle="Pod Usage" [data]="podCapacity$ | async" height="{{chartHeight}}">
               </app-simple-usage-chart>
             </mat-card>
           </div>
           <div class="kube-details__graph">
             <mat-card>
               <app-simple-usage-chart [thresholds]="pressureChartThresholds" chartTitle="Nodes With Disk Pressure"
-                [data]="diskPressure$ | async">
+                [data]="diskPressure$ | async" height="{{chartHeight}}">
               </app-simple-usage-chart>
             </mat-card>
           </div>
           <div class="kube-details__graph">
             <mat-card>
               <app-simple-usage-chart [thresholds]="pressureChartThresholds" chartTitle="Nodes With Memory Pressure"
-                [data]="memoryPressure$ | async">
+                [data]="memoryPressure$ | async" height="{{chartHeight}}">
               </app-simple-usage-chart>
             </mat-card>
           </div>
           <div class="kube-details__graph">
             <mat-card>
               <app-simple-usage-chart chartTitle="Nodes Out Of Disk" [thresholds]="criticalPressureChartThresholds"
-                [data]="outOfDisk$ | async">
+                [data]="outOfDisk$ | async" height="{{chartHeight}}">
               </app-simple-usage-chart>
             </mat-card>
           </div>
           <div class="kube-details__graph">
             <mat-card>
               <app-simple-usage-chart [thresholds]="nominalPressureChartThresholds" chartTitle="Nodes Ready"
-                [data]="nodesReady$ | async">
+                [data]="nodesReady$ | async" height="{{chartHeight}}">
               </app-simple-usage-chart>
             </mat-card>
           </div>
           <div class="kube-details__graph">
             <mat-card *ngIf="(networkUnavailable$ | async)?.supported">
               <app-simple-usage-chart [thresholds]="criticalPressureChartThresholdsInverted"
-                chartTitle="Nodes With Network Available" [data]="networkUnavailable$ | async">
+                chartTitle="Nodes With Network Available" [data]="networkUnavailable$ | async" height="{{chartHeight}}">
               </app-simple-usage-chart>
             </mat-card>
           </div>
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss
index b453016970..b831614ad5 100644
--- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss
+++ b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss
@@ -2,22 +2,23 @@
   margin-bottom: 0;
   margin-left: 20px;
   margin-top: 10px;
-  
   &__metrics {
     max-width: 350px;
+
+    &--namespace {
+      padding-left: 0;
+    }
   }
-  
   &__header {
     margin: 0;
   }
-  
   &__graphs {
     margin: 10px;
   }
   &__graph {
     display: inline-block;
-    padding: 10px;
-    width: 33%;
+    padding: 0 20px 20px 0;
+    width: 250px;
   }
   &__dashboard {
     font-size: 14px;
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 4a31108cc8..8d65d0caa9 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
@@ -16,7 +16,7 @@ import {
   ISimpleUsageChartData,
 } from '../../../../shared/components/simple-usage-chart/simple-usage-chart.types';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
-import { GetKubernetesNodes, GetKubernetesPods } from '../../store/kubernetes.actions';
+import { GetKubernetesNamespaces, GetKubernetesNodes, GetKubernetesPods } from '../../store/kubernetes.actions';
 
 interface IValueLabels {
   usedLabel?: string;
@@ -37,12 +37,15 @@ interface IEndpointDetails {
 export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
   public podCount$: Observable<number>;
   public nodeCount$: Observable<number>;
+  public namespaceCount$: Observable<number>;
+
   public highUsageColors = {
     domain: ['#00000026', '#00af00']
   };
   public normalUsageColors = {
     domain: ['#00af00', '#00af002e']
   };
+  public chartHeight = '150px';
   public endpointDetails$: Observable<IEndpointDetails> = this.kubeEndpointService.endpoint$.pipe(
     map(endpoint => {
       const endpointConfig = entityCatalog.getEndpoint(endpoint.entity.cnsi_type, endpoint.entity.sub_type);
@@ -105,11 +108,14 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
 
     const podCountAction = new GetKubernetesPods(guid);
     const nodeCountAction = new GetKubernetesNodes(guid);
+    const namespacesCountAction = new GetKubernetesNamespaces(guid);
     const pods$ = this.getPaginationObservable(podCountAction);
     const nodes$ = this.getPaginationObservable(nodeCountAction);
+    const namespaces$ = this.getPaginationObservable(namespacesCountAction);
 
     this.podCount$ = this.kubeEndpointService.getCountObservable(pods$);
     this.nodeCount$ = this.kubeEndpointService.getCountObservable(nodes$);
+    this.namespaceCount$ = this.kubeEndpointService.getCountObservable(namespaces$);
 
     this.podCapacity$ = this.kubeEndpointService.getPodCapacity(nodes$, pods$);
     this.diskPressure$ = this.kubeEndpointService.getNodeStatusCount(nodes$, 'DiskPressure', {

From c935f6615242e13bf08062b9851e08df8aa15f72 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 17 Jan 2020 16:32:43 +0000
Subject: [PATCH 263/648] Fixes & TODOs - Update HelmInstall action and effect
 - Redirect to Workload page after installing - Require user to enter release
 title when deleting - Fix delete complete handler after changes

---
 .../app/custom/custom-routing.module.ts       |  3 +-
 .../create-release.component.ts               | 17 ++++-------
 .../app/custom/helm/store/helm.actions.ts     | 16 ++++++----
 .../app/custom/helm/store/helm.effects.ts     | 29 ++++--------------
 .../app/custom/helm/store/helm.types.ts       |  3 --
 .../kubernetes-service-list-config.service.ts |  1 -
 .../tabs/helm-release-helper.service.ts       | 30 +++++++++++--------
 .../helm-release-summary-tab.component.html   |  1 -
 .../helm-release-summary-tab.component.ts     | 26 ++++++++--------
 9 files changed, 54 insertions(+), 72 deletions(-)

diff --git a/custom-src/frontend/app/custom/custom-routing.module.ts b/custom-src/frontend/app/custom/custom-routing.module.ts
index 835cb19976..98c658e695 100644
--- a/custom-src/frontend/app/custom/custom-routing.module.ts
+++ b/custom-src/frontend/app/custom/custom-routing.module.ts
@@ -20,7 +20,6 @@ const customRoutes: Routes = [
   },
   {
     path: 'workloads',
-    // loadChildren: './helm/helm.module#HelmModule',
     loadChildren: () => import('./kubernetes/workloads/workloads.module').then(m => m.WorkloadsModule),
     data: {
       reuseRoute: true,
@@ -29,7 +28,7 @@ const customRoutes: Routes = [
         matIcon: 'apps',
         // matIconFont: 'stratos-icons',
         position: 64,
-        requiresEndpointType: KUBERNETES_ENDPOINT_TYPE // TODO: RC CHECK
+        requiresEndpointType: KUBERNETES_ENDPOINT_TYPE
       }
     }
   },
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 56c56e900c..a5c7971ddb 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
@@ -4,9 +4,8 @@ import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { MatTextareaAutosize } from '@angular/material';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
-import { EntityServiceFactory } from 'frontend/packages/store/src/entity-service-factory.service';
 import { Observable, of, Subscription } from 'rxjs';
-import { combineLatest, delay, filter, first, map, pairwise, switchMap, tap } from 'rxjs/operators';
+import { delay, filter, first, map, pairwise, switchMap, tap } from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
@@ -17,7 +16,7 @@ import { StepOnNextFunction } from '../../../shared/components/stepper/step/step
 import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes/kubernetes-entity-factory';
 import { helmReleaseEntityKey } from '../../kubernetes/workloads/store/workloads-entity-factory';
 import { HelmInstall } from '../store/helm.actions';
-import { HELM_INSTALLING_KEY, HelmInstallValues } from '../store/helm.types';
+import { HelmInstallValues } from '../store/helm.types';
 
 @Component({
   selector: 'app-create-release',
@@ -55,7 +54,7 @@ export class CreateReleaseComponent implements OnInit {
     private store: Store<AppState>,
     private httpClient: HttpClient,
     private confirmDialog: ConfirmationDialogService,
-    private esf: EntityServiceFactory
+    // private esf: EntityServiceFactory
   ) {
     const chart = this.route.snapshot.params;
     this.cancelUrl = `/monocular/charts/${chart.repo}/${chart.chartName}/${chart.version}`;
@@ -137,14 +136,11 @@ export class CreateReleaseComponent implements OnInit {
 
     const releaseEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, helmReleaseEntityKey);
 
-    // TODO: RC Once we have a GetRelease action use to access new entity for info to redirect to the release page using redirectPayload
-    // this.esf.create(action.guid(), )
-
     // Wait for result of request
     return of(true).pipe(
       delay(1),
-      switchMap(() => releaseEntityConfig.getEntityMonitor(this.store, action.guid()).updatingSection$),
-      map(updatingSection => updatingSection[HELM_INSTALLING_KEY]),
+      switchMap(() => releaseEntityConfig.getEntityMonitor(this.store, action.guid).updatingSection$),
+      map(updatingSection => updatingSection[action.updatingKey]),
       filter(update => !!update),
       pairwise(),
       filter(([oldVal, newVal]) => (oldVal.busy && !newVal.busy)),
@@ -153,11 +149,10 @@ export class CreateReleaseComponent implements OnInit {
         success: !result.error,
         redirect: !result.error,
         redirectPayload: {
-          path: `workloads`
+          path: !result.error ? `workloads/${values.endpoint}:${values.releaseNamespace}:${values.releaseName}/summary` : ''
         },
         message: !result.error ? '' : result.message
       })),
-      combineLatest()
     );
 
   }
diff --git a/custom-src/frontend/app/custom/helm/store/helm.actions.ts b/custom-src/frontend/app/custom/helm/store/helm.actions.ts
index 6341e176a4..e1d1768f65 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.actions.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.actions.ts
@@ -1,6 +1,6 @@
-import { Action } from '@ngrx/store';
-
 import { EntityRequestAction } from '../../../../../store/src/types/request.types';
+import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes/kubernetes-entity-factory';
+import { helmReleaseEntityKey } from '../../kubernetes/workloads/store/workloads-entity-factory';
 import {
   HELM_ENDPOINT_TYPE,
   helmEntityFactory,
@@ -65,9 +65,15 @@ export class GetHelmVersions implements MonocularPaginationAction {
   };
 }
 
-export class HelmInstall implements Action {
-  constructor(public values: HelmInstallValues) { }
+export class HelmInstall implements EntityRequestAction {
+  static HELM_INSTALLING_KEY = 'installing';
   type = HELM_INSTALL;
-  public guid = () => '<New Release>' + this.values.releaseName;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
+  entityType = helmReleaseEntityKey;
+  updatingKey = HelmInstall.HELM_INSTALLING_KEY;
+  guid: string;
+  constructor(public values: HelmInstallValues) {
+    this.guid = '<New Release>' + this.values.releaseName;
+  }
 }
 
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 33fa1e70c6..a61f676b40 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.effects.ts
@@ -16,8 +16,6 @@ import { Observable } from 'rxjs';
 import { catchError, flatMap, mergeMap } from 'rxjs/operators';
 
 import { environment } from '../../../environments/environment';
-import { helmReleaseEntityKey } from '../../kubernetes/workloads/store/workloads-entity-factory';
-import { HELM_ENDPOINT_TYPE } from '../helm-entity-factory';
 import {
   GET_HELM_VERSIONS,
   GET_MONOCULAR_CHARTS,
@@ -26,7 +24,7 @@ import {
   HELM_INSTALL,
   HelmInstall,
 } from './helm.actions';
-import { HELM_INSTALLING_KEY, HelmVersion } from './helm.types';
+import { HelmVersion } from './helm.types';
 
 @Injectable()
 export class HelmEffects {
@@ -92,30 +90,23 @@ export class HelmEffects {
     })
   );
 
-  // @Effect()
-  // fetchHelmReleasePods$ = this.actions$.pipe(
-  //   ofType<GetHelmReleasePods>(GET_HELM_RELEASE_PODS),
-  //   mergeMap(action => [new GetHelmReleaseStatus(action.endpointGuid, action.releaseTitle)])
-  // );
-
   @Effect()
   helmInstall$ = this.actions$.pipe(
     ofType<HelmInstall>(HELM_INSTALL),
     flatMap(action => {
-      const apiAction = this.getHelmUpdateAction(action.guid(), action.type, HELM_INSTALLING_KEY);
       const url = '/pp/v1/helm/install';
-      this.store.dispatch(new StartRequestAction(apiAction));
+      this.store.dispatch(new StartRequestAction(action));
       return this.httpClient.post(url, action.values).pipe(
         mergeMap(() => {
           return [
-            new ClearPaginationOfType(apiAction),
-            new WrapperRequestActionSuccess(null, apiAction)
+            new ClearPaginationOfType(action),
+            new WrapperRequestActionSuccess(null, action)
           ];
         }),
         catchError(error => {
           const errorMessage = `Failed to install helm chart: ${error.message}`;
           return [
-            new WrapperRequestActionFailed(errorMessage, apiAction, 'create', {
+            new WrapperRequestActionFailed(errorMessage, action, 'create', {
               endpointIds: [action.values.endpoint],
               url: error.url || url,
               eventCode: error.status ? error.status + '' : '500',
@@ -129,16 +120,6 @@ export class HelmEffects {
     })
   );
 
-  private getHelmUpdateAction(guid: string, type: string, updatingKey: string) {
-    return {
-      endpointType: HELM_ENDPOINT_TYPE,
-      entityType: helmReleaseEntityKey,
-      guid,
-      type,
-      updatingKey,
-    } as EntityRequestAction;
-  }
-
   private makeRequest(
     action: EntityRequestAction,
     url: string,
diff --git a/custom-src/frontend/app/custom/helm/store/helm.types.ts b/custom-src/frontend/app/custom/helm/store/helm.types.ts
index 1f78d4fdee..54b21b657c 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.types.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.types.ts
@@ -59,6 +59,3 @@ export interface HelmInstallValues {
   values: string;
   chart: string;
 }
-
-export const HELM_INSTALLING_KEY = 'installing';
-
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
index e0da42a113..cc47429e42 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
@@ -45,7 +45,6 @@ export abstract class BaseKubernetesServicesListConfig implements IListConfig<Ku
   ];
 
   pageSizeOptions = defaultHelmKubeListPageSize;
-  // TODO: RC --> NWM Do we just want this in helm world?
   cardComponent = KubeServiceCardComponent;
   viewType = ListViewTypes.BOTH;
   enableTextFilter = true;
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 0c6b790de8..f85acfc842 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,8 +1,10 @@
 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 { 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';
 import { Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
@@ -67,20 +69,21 @@ export class HelmReleaseHelperService {
     return this.guid.replace(':', '/').replace(':', '/');
   }
 
-  // TODO: RC convert both of these to just selects fetchReleaseGraph fetchReleaseResources
   public fetchReleaseGraph(): Observable<HelmReleaseGraph> {
     // Get helm release
     const action = new GetHelmReleaseGraph(this.endpointGuid, this.releaseTitle);
-    return this.esf.create<HelmReleaseGraph>(action.guid, action).waitForEntity$.pipe(
-      map(entity => entity.entity)
+    const entityKey = entityCatalog.getEntityKey(action);
+    return this.store.select(selectEntity<HelmReleaseGraph>(entityKey, action.guid)).pipe(
+      filter(graph => !!graph)
     );
   }
 
   public fetchReleaseResources(): Observable<HelmReleaseResource> {
     // Get helm release
     const action = new GetHelmReleaseResource(this.endpointGuid, this.releaseTitle);
-    return this.esf.create<HelmReleaseResource>(action.guid, action).waitForEntity$.pipe(
-      map(entity => entity.entity)
+    const entityKey = entityCatalog.getEntityKey(action);
+    return this.store.select(selectEntity<HelmReleaseResource>(entityKey, action.guid)).pipe(
+      filter(resources => !!resources)
     );
   }
 
@@ -115,14 +118,15 @@ export class HelmReleaseHelperService {
       } else {
         podPhases[status]++;
       }
-
-      pod.status.containerStatuses.forEach(containerStatus => {
-        if (containerStatus.state.running) {
-          containers.ready.value++;
-        } else {
-          containers.notReady.value++;
-        }
-      });
+      if (pod.status.containerStatuses) {
+        pod.status.containerStatuses.forEach(containerStatus => {
+          if (containerStatus.state.running) {
+            containers.ready.value++;
+          } else {
+            containers.notReady.value++;
+          }
+        });
+      }
     });
 
     return {
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
index 4314512d29..6363a050bf 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
@@ -46,7 +46,6 @@
       </div>
       <app-metadata-item class="chart-details__item" label="Resources"></app-metadata-item>
 
-      <!-- // TODO: RC -- NWM Is this needed anymore? -->
       <div *ngIf="resources$ | async as resources" class="grid">
         <app-card-number-metric *ngFor="let res of resources" label="{{ res.label }}" icon="{{ res.icon.name }}"
           iconFont="{{ res.icon.font }}" value="{{ res.count }}">
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index 283c6dae11..9a65e8bedb 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -8,12 +8,10 @@ import { ClearPaginationOfType } from 'frontend/packages/store/src/actions/pagin
 import { RouterNav } from 'frontend/packages/store/src/actions/router.actions';
 import { HideSnackBar, ShowSnackBar } from 'frontend/packages/store/src/actions/snackBar.actions';
 import { AppState } from 'frontend/packages/store/src/app-state';
-import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog.service';
 import { combineLatest, Observable, ReplaySubject } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 
-import { KUBERNETES_ENDPOINT_TYPE } from '../../../../kubernetes-entity-factory';
-import { helmReleaseEntityKey } from '../../../store/workloads-entity-factory';
+import { GetHelmReleases } from '../../../store/workloads.actions';
 import { HelmReleaseChartData, HelmReleaseResource } from '../../../workload.types';
 import { HelmReleaseHelperService } from '../helm-release-helper.service';
 
@@ -24,11 +22,7 @@ import { HelmReleaseHelperService } from '../helm-release-helper.service';
 })
 export class HelmReleaseSummaryTabComponent implements OnDestroy {
   // Confirmation dialogs
-  deleteReleaseConfirmation = new ConfirmationDialogConfig(
-    'Delete Release',
-    'Are you sure you want to delete this Release?',
-    'Delete'
-  );
+  deleteReleaseConfirmation: ConfirmationDialogConfig;
 
   private busyDeletingSubject = new ReplaySubject<boolean>();
   public isBusy$: Observable<boolean>;
@@ -118,6 +112,14 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
         return Object.values(resources).sort((a: any, b: any) => a.kind.localeCompare(b.kind));
       })
     );
+
+    this.deleteReleaseConfirmation = new ConfirmationDialogConfig(
+      `Delete Workload`,
+      {
+        textToMatch: helmReleaseHelper.releaseTitle
+      },
+      'Delete'
+    );
   }
 
   private getIcon(kind: string) {
@@ -148,7 +150,7 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
   public deleteRelease() {
     this.confirmDialog.open(this.deleteReleaseConfirmation, () => {
       // Make the http request to delete the release
-      const endpointAndName = this.helmReleaseHelper.guid.replace(':', '/');
+      const endpointAndName = this.helmReleaseHelper.guid.replace(':', '/').replace(':', '/');
       this.startDelete();
       this.httpClient.delete(`/pp/v1/helm/releases/${endpointAndName}`).subscribe({
         error: (err: any) => {
@@ -157,10 +159,10 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
           this.logService.error('Failed to delete release: ', err);
         },
         complete: () => {
-          const releaseEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, helmReleaseEntityKey);
-          this.store.dispatch(new ClearPaginationOfType(releaseEntityConfig));
+          const action = new GetHelmReleases();
+          this.store.dispatch(new ClearPaginationOfType(action));
           this.completeDelete();
-          this.store.dispatch(new RouterNav({ path: ['monocular/releases'] }));
+          this.store.dispatch(new RouterNav({ path: ['workloads'] }));
         }
       });
     });

From 9c128cac4257046857abcc0e0dee11bf4d831bbb Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 20 Jan 2020 17:23:14 +0000
Subject: [PATCH 264/648] Allow user to select from existing namespace or
 create one

---
 .../create-release.component.html             |  23 ++-
 .../create-release.component.scss             |   6 +
 .../create-release.component.ts               | 165 +++++++++++++++---
 .../kubernetes/store/kubernetes.actions.ts    |  20 ++-
 4 files changed, 179 insertions(+), 35 deletions(-)

diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.html b/custom-src/frontend/app/custom/helm/create-release/create-release.component.html
index 7171022700..1061f2c1dc 100644
--- a/custom-src/frontend/app/custom/helm/create-release/create-release.component.html
+++ b/custom-src/frontend/app/custom/helm/create-release/create-release.component.html
@@ -15,24 +15,37 @@
       <br>
       <b>Specify name and namespace for the installation</b>
       <mat-form-field>
-        <input #releaseNameInputField matInput placeholder="Name" name="releaseName" formControlName="releaseName" autocomplete="off">
+        <input #releaseNameInputField matInput placeholder="Name" name="releaseName" formControlName="releaseName"
+          autocomplete="off">
       </mat-form-field>
 
       <mat-form-field>
-        <input matInput placeholder="Namespace" name="releaseNamespace" formControlName="releaseNamespace"
-          autocomplete="off">
+        <input type="text" placeholder="Namespace" matInput formControlName="releaseNamespace" [matAutocomplete]="auto">
+        <mat-autocomplete #auto="matAutocomplete">
+          <mat-option *ngFor="let namespace of namespaces$ | async" [value]="namespace">
+            {{namespace}}
+          </mat-option>
+        </mat-autocomplete>
+        <mat-error *ngIf="details.controls.releaseNamespace.errors?.namespaceDoesNotExist">
+          Namespace does not exist
+        </mat-error>
       </mat-form-field>
+
+      <mat-checkbox matInput formControlName="createNamespace">Create Namespace</mat-checkbox>
+
     </form>
   </app-step>
   <app-step [title]="'Overrides'" [onNext]="submit" [finishButtonText]="'Install'" [onEnter]="onEnterOverrides">
     <form [formGroup]="overrides" class="stepper-form overrides_form">
       <div class="helm-create-release__heading">
         <h3 class="helm-create-release__title">Enter YAML Value Overrides</h3>
-        <button (click)="useValuesYaml()" [disabled]="!valuesYaml" class="helm-create-release__button" mat-button color="primary">Copy from values.yaml</button>
+        <button (click)="useValuesYaml()" [disabled]="!valuesYaml" class="helm-create-release__button" mat-button
+          color="primary">Copy from values.yaml</button>
       </div>
       <mat-form-field [floatLabel]="'always'" class="overrides_form-field">
         <mat-label>Values</mat-label>
-        <textarea #overridesYamlTextArea class="overrides__yaml" matInput formControlName="values" name="Values"  spellcheck="false"></textarea>
+        <textarea #overridesYamlTextArea class="overrides__yaml" matInput formControlName="values" name="Values"
+          spellcheck="false"></textarea>
       </mat-form-field>
     </form>
   </app-step>
diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.scss b/custom-src/frontend/app/custom/helm/create-release/create-release.component.scss
index 03ca214f4e..a2974cf6f0 100644
--- a/custom-src/frontend/app/custom/helm/create-release/create-release.component.scss
+++ b/custom-src/frontend/app/custom/helm/create-release/create-release.component.scss
@@ -19,6 +19,12 @@
 
 form {
   flex: 1;
+
+  mat-checkbox {
+    display: flex;
+    height: 23px;
+    margin-top: 10px;
+  }
 }
 
 .overrides {
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 a5c7971ddb..99007d00f4 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,19 +1,35 @@
 import { HttpClient } from '@angular/common/http';
-import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
+import { Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { MatTextareaAutosize } from '@angular/material';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
-import { Observable, of, Subscription } from 'rxjs';
-import { delay, filter, first, map, pairwise, switchMap, tap } from 'rxjs/operators';
+import { PaginationMonitorFactory } from 'frontend/packages/store/src/monitors/pagination-monitor.factory';
+import { getPaginationObservables } from 'frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper';
+import { BehaviorSubject, combineLatest, Observable, of, Subscription } from 'rxjs';
+import {
+  delay,
+  distinctUntilChanged,
+  filter,
+  first,
+  map,
+  pairwise,
+  publishReplay,
+  refCount,
+  startWith,
+  switchMap,
+} from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
 import { EndpointsService } from '../../../core/endpoints.service';
+import { safeUnsubscribe } from '../../../core/utils.service';
 import { ConfirmationDialogConfig } from '../../../shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service';
-import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component';
+import { StepOnNextFunction, StepOnNextResult } from '../../../shared/components/stepper/step/step.component';
 import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes/kubernetes-entity-factory';
+import { KubernetesNamespace } from '../../kubernetes/store/kube.types';
+import { CreateKubernetesNamespace, GetKubernetesNamespaces } from '../../kubernetes/store/kubernetes.actions';
 import { helmReleaseEntityKey } from '../../kubernetes/workloads/store/workloads-entity-factory';
 import { HelmInstall } from '../store/helm.actions';
 import { HelmInstallValues } from '../store/helm.types';
@@ -23,7 +39,7 @@ import { HelmInstallValues } from '../store/helm.types';
   templateUrl: './create-release.component.html',
   styleUrls: ['./create-release.component.scss'],
 })
-export class CreateReleaseComponent implements OnInit {
+export class CreateReleaseComponent implements OnInit, OnDestroy {
 
   // Confirmation dialog
   overwriteValuesConfirmation = new ConfirmationDialogConfig(
@@ -40,52 +56,120 @@ export class CreateReleaseComponent implements OnInit {
   validate$: Observable<boolean>;
 
   details: FormGroup;
+  namespaces$: Observable<string[]>;
   overrides: FormGroup;
 
+  private endpointChanged = new BehaviorSubject(null);
+
   @ViewChild('releaseNameInputField', { static: true }) releaseNameInputField: ElementRef;
   @ViewChild('overridesYamlTextArea', { static: true }) overridesYamlTextArea: ElementRef;
   @ViewChild(MatTextareaAutosize, { static: false }) overridesYamlAutosize: MatTextareaAutosize;
 
   public valuesYaml = '';
 
+  private subs: Subscription[] = [];
+
   constructor(
     private route: ActivatedRoute,
     public endpointsService: EndpointsService,
     private store: Store<AppState>,
     private httpClient: HttpClient,
     private confirmDialog: ConfirmationDialogService,
-    // private esf: EntityServiceFactory
+    private pmf: PaginationMonitorFactory
   ) {
     const chart = this.route.snapshot.params;
     this.cancelUrl = `/monocular/charts/${chart.repo}/${chart.chartName}/${chart.version}`;
 
-    this.kubeEndpoints$ = this.endpointsService.connectedEndpointsOfTypes(KUBERNETES_ENDPOINT_TYPE);
-
-    this.details = new FormGroup({
-      endpoint: new FormControl('', Validators.required),
-      releaseName: new FormControl('', Validators.required),
-      releaseNamespace: new FormControl('', Validators.required),
-    });
+    this.setupDetailsStep();
 
     this.overrides = new FormGroup({
       values: new FormControl('')
     });
 
-    this.validate$ = this.details.statusChanges.pipe(
-      map(() => this.details.valid)
-    );
-
     // Fetch the values.yaml for the Chart
     const valuesYamlUrl = `/pp/v1/chartsvc/v1/assets/${chart.repo}/${chart.chartName}/versions/${chart.version}/values.yaml`;
 
+    // TODO: RC Error handling
     this.httpClient.get(valuesYamlUrl, { responseType: 'text' }).subscribe(response => {
       this.valuesYaml = response;
     });
   }
 
-  public useValuesYaml() {
+  private setupDetailsStep() {
+    this.kubeEndpoints$ = this.endpointsService.connectedEndpointsOfTypes(KUBERNETES_ENDPOINT_TYPE);
+
+    this.namespaces$ = this.endpointChanged.asObservable().pipe(
+      switchMap(endpoint => {
+        const action = new GetKubernetesNamespaces(endpoint);
+        return getPaginationObservables<KubernetesNamespace>({
+          store: this.store,
+          action,
+          paginationMonitor: this.pmf.create(action.paginationKey, action)
+        }).entities$;
+      }),
+      map((namespaces: KubernetesNamespace[]) => namespaces.map(namespace => namespace.metadata.name)),
+      publishReplay(1),
+      refCount(),
+    );
+
+    this.details = new FormGroup({
+      endpoint: new FormControl('', Validators.required),
+      releaseName: new FormControl('', Validators.required),
+      releaseNamespace: new FormControl(''),
+      createNamespace: new FormControl(false),
+    });
+    this.details.controls.createNamespace.disable();
+
+    const namespaceChanged$ = this.details.controls.releaseNamespace.valueChanges.pipe(
+      distinctUntilChanged()
+    );
+    const createNamespaceChanged$ = this.details.controls.createNamespace.valueChanges.pipe(
+      startWith(false),
+      distinctUntilChanged()
+    );
 
+    this.subs.push(
+      combineLatest([
+        this.namespaces$,
+        namespaceChanged$,
+        createNamespaceChanged$
+      ])
+        .pipe().subscribe(([namespaces, namespace, create]) => {
+          const namespaceExists = !!namespaces.find(val => val === namespace);
+          if (namespaceExists) {
+            // All is fine
+            this.details.controls.releaseNamespace.validator = () => null;
+            this.details.controls.createNamespace.setValue(false);
+            this.details.controls.createNamespace.disable();
+          } else if (!namespace) {
+            // Invalid - missing namespace
+            this.details.controls.releaseNamespace.validator = () => ({ required: true });
+            this.details.controls.createNamespace.disable();
+          } else if (!create) {
+            // Invalid - namespace doesn't exist and not creating
+            this.details.controls.releaseNamespace.validator = () => ({ namespaceDoesNotExist: true });
+            this.details.controls.createNamespace.enable();
+          } else {
+            // Valid - namespace doesn't exist but creating
+            this.details.controls.releaseNamespace.validator = () => null;
+            // this.details.controls.createNamespace.disable();
+          }
+          this.details.controls.releaseNamespace.updateValueAndValidity();
+        })
+    );
+
+    this.subs.push(
+      this.details.controls.endpoint.valueChanges.subscribe(val => {
+        this.endpointChanged.next(val);
+      })
+    );
+
+    this.validate$ = this.details.statusChanges.pipe(
+      map(() => this.details.valid)
+    );
+  }
 
+  public useValuesYaml() {
     if (this.overrides.value.values.length !== 0) {
       this.confirmDialog.open(this.overwriteValuesConfirmation, () => {
         this.replaceWithValuesYaml();
@@ -102,17 +186,15 @@ export class CreateReleaseComponent implements OnInit {
 
   ngOnInit() {
     // Auto select endpoint if there is only one
-    this.kubeEndpoints$.pipe(
-      first(),
-      tap(ep => {
-        if (ep.length === 1) {
-          this.details.controls.endpoint.setValue(ep[0].guid, { onlySelf: true });
-          setTimeout(() => {
-            this.releaseNameInputField.nativeElement.focus();
-          }, 1);
-        }
-      })
-    ).subscribe();
+    this.kubeEndpoints$.pipe(first()).subscribe(ep => {
+      if (ep.length > 1) {
+        this.details.controls.endpoint.setValue(ep[0].guid, { onlySelf: true });
+        this.endpointChanged.next(ep[0].guid);
+        setTimeout(() => {
+          this.releaseNameInputField.nativeElement.focus();
+        }, 1);
+      }
+    });
   }
 
   onEnterOverrides = () => {
@@ -123,6 +205,28 @@ export class CreateReleaseComponent implements OnInit {
   }
 
   submit: StepOnNextFunction = () => {
+
+    const createNamespace$ = this.details.controls.createNamespace.value ? this.createNamespace() : of({ success: true });
+
+    return createNamespace$.pipe(
+      switchMap(createRes => {
+        if (!createRes.success) {
+          return createRes;
+        }
+        return this.installChart();
+      })
+    );
+  }
+
+  createNamespace(): Observable<StepOnNextResult> {
+    // TODO: RC namespace exists from previous run??
+    const action = new CreateKubernetesNamespace();
+    return of({
+      success: false
+    });
+  }
+
+  installChart(): Observable<StepOnNextResult> {
     // Build the request body
     const values: HelmInstallValues = {
       ...this.details.value,
@@ -154,7 +258,10 @@ export class CreateReleaseComponent implements OnInit {
         message: !result.error ? '' : result.message
       })),
     );
+  }
 
+  ngOnDestroy() {
+    safeUnsubscribe(...this.subs);
   }
 
 }
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 21aea6eac6..8588206faf 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,5 @@
 import { SortDirection } from '@angular/material';
+import { getActions } from 'frontend/packages/store/src/actions/action.helper';
 
 import { MetricQueryConfig, MetricsAction, MetricsChartAction } from '../../../../../store/src/actions/metrics.actions';
 import { getPaginationKey } from '../../../../../store/src/actions/pagination.actions';
@@ -52,6 +53,8 @@ export const GET_NAMESPACE_INFO = '[KUBERNETES Endpoint] Get Namespace Info';
 export const GET_NAMESPACE_INFO_SUCCESS = '[KUBERNETES Endpoint] Get Namespace Info Success';
 export const GET_NAMESPACE_INFO_FAILURE = '[KUBERNETES Endpoint] Get Namespace Info Failure';
 
+export const CREATE_NAMESPACE = '[KUBERNETES Endpoint] Create Namespace';
+
 export const GET_KUBERNETES_APP_INFO = '[KUBERNETES Endpoint] Get Kubernetes App Info';
 export const GET_KUBERNETES_APP_INFO_SUCCESS = '[KUBERNETES Endpoint] Get Kubernetes App Info Success';
 export const GET_KUBERNETES_APP_INFO_FAILURE = '[KUBERNETES Endpoint] Get Kubernetes App Info Failure';
@@ -156,6 +159,19 @@ export class GetKubernetesNamespace implements KubeAction {
   ];
 }
 
+export class CreateKubernetesNamespace implements KubeAction {
+  public guid: string;
+  constructor(public namespaceName: string, public kubeGuid: string) {
+    this.guid = `Creating-${namespaceName}-${kubeGuid}`;
+  }
+
+  type = CREATE_NAMESPACE;
+  entityType = kubernetesNamespacesEntityType;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
+  entity = [kubernetesEntityFactory(kubernetesNamespacesEntityType)];
+  actions = getActions('Namespace', 'Create');
+}
+
 export class GetKubernetesPods implements KubePaginationAction {
   constructor(public kubeGuid) {
     this.paginationKey = getPaginationKey(kubernetesPodsEntityType, 'k8', kubeGuid);
@@ -235,7 +251,7 @@ export class GetKubernetesPodsInNamespace implements PaginatedAction, KubeAction
 }
 
 export class GetKubernetesNamespaces implements KubePaginationAction {
-  constructor(public kubeGuid) {
+  constructor(public kubeGuid: string) {
     this.paginationKey = getPaginationKey(kubernetesNamespacesEntityType, kubeGuid || 'all');
   }
   type = GET_NAMESPACES_INFO;
@@ -365,3 +381,5 @@ export class FetchKubernetesChartMetricsAction extends MetricsChartAction {
     );
   }
 }
+
+

From aa3bc44a8b862220e46d428215bb850861cce3ca Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 21 Jan 2020 14:07:34 +0000
Subject: [PATCH 265/648] Create action/effect to create namespace & fix kube
 error handling

---
 .../create-release.component.ts               |  51 ++++--
 .../app/custom/helm/store/helm.effects.ts     |   2 -
 .../kubernetes/store/kubernetes.actions.ts    |   2 +
 .../kubernetes/store/kubernetes.effects.ts    | 149 +++++++++++++-----
 .../packages/core/src/jetstream.helpers.ts    |  18 ++-
 5 files changed, 158 insertions(+), 64 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 99007d00f4..38af00140f 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
@@ -30,7 +30,6 @@ import { StepOnNextFunction, StepOnNextResult } from '../../../shared/components
 import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes/kubernetes-entity-factory';
 import { KubernetesNamespace } from '../../kubernetes/store/kube.types';
 import { CreateKubernetesNamespace, GetKubernetesNamespaces } from '../../kubernetes/store/kubernetes.actions';
-import { helmReleaseEntityKey } from '../../kubernetes/workloads/store/workloads-entity-factory';
 import { HelmInstall } from '../store/helm.actions';
 import { HelmInstallValues } from '../store/helm.types';
 
@@ -68,6 +67,7 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
   public valuesYaml = '';
 
   private subs: Subscription[] = [];
+  private createdNamespace = false;
 
   constructor(
     private route: ActivatedRoute,
@@ -98,7 +98,9 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
   private setupDetailsStep() {
     this.kubeEndpoints$ = this.endpointsService.connectedEndpointsOfTypes(KUBERNETES_ENDPOINT_TYPE);
 
+    // TODO: RC ALL upfront or mess with loading indicators on change
     this.namespaces$ = this.endpointChanged.asObservable().pipe(
+      // filter(endpoint => !!endpoint),
       switchMap(endpoint => {
         const action = new GetKubernetesNamespaces(endpoint);
         return getPaginationObservables<KubernetesNamespace>({
@@ -205,27 +207,44 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
   }
 
   submit: StepOnNextFunction = () => {
+    return this.createNamespace().pipe(
+      switchMap(createRes => createRes.success ? this.installChart() : of(createRes))
+    );
+  }
 
-    const createNamespace$ = this.details.controls.createNamespace.value ? this.createNamespace() : of({ success: true });
+  createNamespace(): Observable<StepOnNextResult> {
+    if (!this.details.controls.createNamespace.value || this.createdNamespace) {
+      return of({
+        success: true
+      });
+    }
+
+    const action = new CreateKubernetesNamespace(
+      this.details.controls.releaseNamespace.value,
+      this.details.controls.endpoint.value);
+    this.store.dispatch(action);
 
-    return createNamespace$.pipe(
-      switchMap(createRes => {
-        if (!createRes.success) {
-          return createRes;
+    const namespaceEntityConfig = entityCatalog.getEntity(action);
+    const monitor = namespaceEntityConfig.getEntityMonitor(this.store, action.guid);
+    return monitor.entityRequest$.pipe(
+      pairwise(),
+      filter(([oldVal, newVal]) => oldVal.creating && !newVal.creating),
+      map(([, newVal]) => newVal),
+      map(state => {
+        if (state.error) {
+          return {
+            success: false,
+            message: `Failed to create namespace '${this.details.controls.releaseNamespace.value}': ` + state.message
+          };
         }
-        return this.installChart();
+        this.createdNamespace = true;
+        return {
+          success: true
+        };
       })
     );
   }
 
-  createNamespace(): Observable<StepOnNextResult> {
-    // TODO: RC namespace exists from previous run??
-    const action = new CreateKubernetesNamespace();
-    return of({
-      success: false
-    });
-  }
-
   installChart(): Observable<StepOnNextResult> {
     // Build the request body
     const values: HelmInstallValues = {
@@ -238,7 +257,7 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     const action = new HelmInstall(values);
     this.store.dispatch(action);
 
-    const releaseEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, helmReleaseEntityKey);
+    const releaseEntityConfig = entityCatalog.getEntity(action);
 
     // Wait for result of request
     return of(true).pipe(
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 a61f676b40..bb1020f221 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.effects.ts
@@ -68,7 +68,6 @@ export class HelmEffects {
     flatMap(action => {
       const entityKey = entityCatalog.getEntityKey(action);
       return this.makeRequest(action, `/pp/${this.proxyAPIVersion}/helm/versions`, (response) => {
-        // const a: HelmVersion = {};
         const processedData = {
           entities: { [entityKey]: {} },
           result: []
@@ -116,7 +115,6 @@ export class HelmEffects {
           ];
         })
       );
-
     })
   );
 
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 8588206faf..6d1d44c4ef 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
@@ -1,5 +1,6 @@
 import { SortDirection } from '@angular/material';
 import { getActions } from 'frontend/packages/store/src/actions/action.helper';
+import { ApiRequestTypes } from 'frontend/packages/store/src/reducers/api-request-reducer/request-helpers';
 
 import { MetricQueryConfig, MetricsAction, MetricsChartAction } from '../../../../../store/src/actions/metrics.actions';
 import { getPaginationKey } from '../../../../../store/src/actions/pagination.actions';
@@ -170,6 +171,7 @@ export class CreateKubernetesNamespace implements KubeAction {
   endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = [kubernetesEntityFactory(kubernetesNamespacesEntityType)];
   actions = getActions('Namespace', 'Create');
+  requestType: ApiRequestTypes = 'create';
 }
 
 export class GetKubernetesPods implements KubePaginationAction {
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 9ffed502bc..0d8fdc036d 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
@@ -1,7 +1,9 @@
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
-import { Store } from '@ngrx/store';
+import { Action, Store } from '@ngrx/store';
+import { ClearPaginationOfType } from 'frontend/packages/store/src/actions/pagination.actions';
+import { ApiRequestTypes } from 'frontend/packages/store/src/reducers/api-request-reducer/request-helpers';
 import { connectedEndpointsOfTypesSelector } from 'frontend/packages/store/src/selectors/endpoint.selectors';
 import { of } from 'rxjs';
 import { catchError, first, flatMap, map, mergeMap, switchMap } from 'rxjs/operators';
@@ -15,6 +17,7 @@ import {
   WrapperRequestActionSuccess,
 } from '../../../../../store/src/types/request.types';
 import { environment } from '../../../environments/environment';
+import { isJetstreamError } from '../../../jetstream.helpers';
 import {
   KUBERNETES_ENDPOINT_TYPE,
   kubernetesDashboardEntityType,
@@ -35,6 +38,8 @@ import {
   KubeService,
 } from './kube.types';
 import {
+  CREATE_NAMESPACE,
+  CreateKubernetesNamespace,
   GeKubernetesDeployments,
   GET_KUBE_DASHBOARD,
   GET_KUBE_DEPLOYMENT,
@@ -233,6 +238,26 @@ export class KubernetesEffects {
     })
   );
 
+
+  @Effect()
+  createNamespace$ = this.actions$.pipe(
+    ofType<CreateKubernetesNamespace>(CREATE_NAMESPACE),
+    flatMap(action => {
+      const namespaceEntityConfig = entityCatalog.getEntity(action);
+      return this.processSingleItemAction<KubernetesNamespace>(action,
+        `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces`,
+        namespaceEntityConfig.entityKey,
+        getKubeAPIResourceGuid,
+        {
+          kind: 'Namespace',
+          apiVersion: 'v1',
+          metadata: {
+            name: action.namespaceName,
+          },
+        });
+    })
+  );
+
   @Effect()
   fetchStatefulSets$ = this.actions$.pipe(
     ofType<GetKubernetesStatefulSets>(GET_KUBE_STATEFULSETS),
@@ -284,7 +309,7 @@ export class KubernetesEffects {
     return getKubeIds.pipe(
       switchMap(kubeIds => {
         pKubeIds = kubeIds;
-        const headers = new HttpHeaders({ 'x-cap-cnsi-list': kubeIds });
+        const headers = new HttpHeaders({ 'x-cap-cnsi-list': pKubeIds });
         // const headers = hr.headers.set(PipelineHttpClient.EndpointHeader, endpointGuids);
         const requestArgs = {
           headers,
@@ -305,13 +330,17 @@ export class KubernetesEffects {
         } as NormalizedResponse;
 
         const items: Array<T> = Object.entries(allRes).reduce((combinedRes, [kubeId, res]) => {
+          if (!res.items) {
+            // The request to this endpoint has failed. Note - throwing this hides any other failures,
+            // however we follow the same approach elsewhere
+            throw res;
+          }
           res.items.forEach(item => {
             item.metadata.kubeId = kubeId;
             combinedRes.push(item);
           });
           return combinedRes;
         }, []);
-        // const items = response[action.kubeGuid].items as Array<any>;
         const processesData = items.filter((res) => !!filterResults ? filterResults(res) : true)
           .reduce((res, data) => {
             const id = getId(data);
@@ -323,50 +352,92 @@ export class KubernetesEffects {
           new WrapperRequestActionSuccess(processesData, action)
         ];
       }),
-      catchError(error => [
-        new WrapperRequestActionFailed(error.message, action, 'fetch', {
-          endpointIds: pKubeIds,
-          url: error.url || url,
-          eventCode: error.status ? error.status + '' : '500',
-          message: 'Kubernetes API request error',
-          error,
-        })
-      ])
+      catchError(error => {
+        const { status, message } = this.createKubeError(error);
+        return [
+          new WrapperRequestActionFailed(message, action, 'fetch', {
+            endpointIds: pKubeIds,
+            url: error.url || url,
+            eventCode: status,
+            message,
+            error,
+          })
+        ];
+      })
     );
   }
 
-  private processSingleItemAction<T>(action: KubeAction, url: string, schemaKey: string, getId: GetID<T>) {
-    this.store.dispatch(new StartRequestAction(action));
-    const headers = new HttpHeaders({ 'x-cap-cnsi-list': action.kubeGuid });
+  private processSingleItemAction<T>(action: KubeAction, url: string, schemaKey: string, getId: GetID<T>, body?: any) {
+    const requestType: ApiRequestTypes = body ? 'create' : 'fetch';
+    this.store.dispatch(new StartRequestAction(action, requestType));
+    const headers = new HttpHeaders({
+      'x-cap-cnsi-list': action.kubeGuid,
+      'x-cap-passthrough': 'true'
+    },
+    );
     const requestArgs = {
       headers
     };
-    return this.http
-      .get(url, requestArgs)
-      .pipe(mergeMap(response => {
-        const base = {
-          entities: { [schemaKey]: {} },
-          result: []
-        } as NormalizedResponse;
-        const items = [response[action.kubeGuid]];
-        const processesData = items.reduce((res, data) => {
-          const id = getId(data);
-          res.entities[schemaKey][id] = data;
+    const request = body ? this.http.post(url, body, requestArgs) : this.http.get(url, requestArgs);
+
+    return request
+      .pipe(
+        mergeMap((response: T) => {
+          const res = {
+            entities: { [schemaKey]: {} },
+            result: []
+          } as NormalizedResponse;
+          const id = getId(response);
+          res.entities[schemaKey][id] = response;
           res.result.push(id);
-          return res;
-        }, base);
-        return [
-          new WrapperRequestActionSuccess(processesData, action)
-        ];
-      }), catchError(error => [
-        new WrapperRequestActionFailed(error.message, action, 'fetch', {
-          endpointIds: [action.kubeGuid],
-          url: error.url || url,
-          eventCode: error.status ? error.status + '' : '500',
-          message: 'Kubernetes API request error',
-          error
+          const actions: Action[] = [
+            new WrapperRequestActionSuccess(res, action)
+          ];
+          if (requestType === 'create') {
+            actions.push(new ClearPaginationOfType(action));
+          }
+          return actions;
+        }),
+        catchError(error => {
+          const { status, message } = this.createKubeError(error);
+          return [
+            new WrapperRequestActionFailed(message, action, requestType, {
+              endpointIds: [action.kubeGuid],
+              url: error.url || url,
+              eventCode: status,
+              message,
+              error
+            })
+          ];
         })
-      ]));
+      );
+  }
+
+  private createKubeErrorMessage(err: any): string {
+    if (err) {
+      if (err.error && err.error.message) {
+        // Kube error
+        return err.error.message;
+      } else if (err.message) {
+        // Http error
+        return err.message;
+      }
+    }
+    return 'Kubernetes API request error';
   }
 
+  private createKubeError(err: any): { status: string, message: string } {
+    const jetstreamError = isJetstreamError(err);
+    if (jetstreamError) {
+      // Wrapped error
+      return {
+        status: jetstreamError.error.statusCode.toString(),
+        message: this.createKubeErrorMessage(jetstreamError.errorResponse)
+      };
+    }
+    return {
+      status: err && err.status ? err.status + '' : '500',
+      message: this.createKubeErrorMessage(err)
+    };
+  }
 }
diff --git a/src/frontend/packages/core/src/jetstream.helpers.ts b/src/frontend/packages/core/src/jetstream.helpers.ts
index 27e6b743fe..36bbac53ea 100644
--- a/src/frontend/packages/core/src/jetstream.helpers.ts
+++ b/src/frontend/packages/core/src/jetstream.helpers.ts
@@ -14,6 +14,16 @@ export interface JetStreamErrorResponse<T = any> {
   errorResponse: T;
 }
 
+export function isJetstreamError(err: any): JetStreamErrorResponse {
+  return !!(
+    err &&
+    err.error &&
+    err.error.status &&
+    err.error.statusCode &&
+    'errorResponse' in err
+  ) ? err as JetStreamErrorResponse : null;
+}
+
 // TODO It would be nice if the BE could return a unique para for us to check for. #3827
 // There is always a chance that this will return a false positive (more so with extensions).
 export function hasJetStreamError(pages: Partial<JetStreamErrorResponse>[]): JetStreamErrorResponse {
@@ -21,13 +31,7 @@ export function hasJetStreamError(pages: Partial<JetStreamErrorResponse>[]): Jet
     return null;
   }
   return pages.find(page => {
-    return !!(
-      page &&
-      page.error &&
-      page.error.status &&
-      page.error.statusCode &&
-      'errorResponse' in page
-    );
+    return isJetstreamError(page);
   }) as JetStreamErrorResponse;
 }
 

From 8ff67ebd815deb9fdd82f08f6422d66863d3ba91 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 21 Jan 2020 14:20:39 +0000
Subject: [PATCH 266/648] Better handling of get all namespaces + spacing
 change

---
 .../create-release.component.ts               | 85 ++++++++-----------
 1 file changed, 37 insertions(+), 48 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 38af00140f..2f50850d8c 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
@@ -7,18 +7,7 @@ import { Store } from '@ngrx/store';
 import { PaginationMonitorFactory } from 'frontend/packages/store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from 'frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { BehaviorSubject, combineLatest, Observable, of, Subscription } from 'rxjs';
-import {
-  delay,
-  distinctUntilChanged,
-  filter,
-  first,
-  map,
-  pairwise,
-  publishReplay,
-  refCount,
-  startWith,
-  switchMap,
-} from 'rxjs/operators';
+import { delay, 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';
@@ -98,20 +87,21 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
   private setupDetailsStep() {
     this.kubeEndpoints$ = this.endpointsService.connectedEndpointsOfTypes(KUBERNETES_ENDPOINT_TYPE);
 
-    // TODO: RC ALL upfront or mess with loading indicators on change
-    this.namespaces$ = this.endpointChanged.asObservable().pipe(
-      // filter(endpoint => !!endpoint),
-      switchMap(endpoint => {
-        const action = new GetKubernetesNamespaces(endpoint);
-        return getPaginationObservables<KubernetesNamespace>({
-          store: this.store,
-          action,
-          paginationMonitor: this.pmf.create(action.paginationKey, action)
-        }).entities$;
-      }),
+    const action = new GetKubernetesNamespaces(null);
+    const allNamespaces$ = getPaginationObservables<KubernetesNamespace>({
+      store: this.store,
+      action,
+      paginationMonitor: this.pmf.create(action.paginationKey, action)
+    }).entities$.pipe(
+      filter(namespaces => !!namespaces),
+      first()
+    );
+    this.namespaces$ = combineLatest([
+      allNamespaces$,
+      this.endpointChanged.asObservable()
+    ]).pipe(
+      map(([namespaces, namespace]: [KubernetesNamespace[], string]) => namespaces.filter(ns => ns.metadata.kubeId === namespace)),
       map((namespaces: KubernetesNamespace[]) => namespaces.map(namespace => namespace.metadata.name)),
-      publishReplay(1),
-      refCount(),
     );
 
     this.details = new FormGroup({
@@ -135,29 +125,28 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
         this.namespaces$,
         namespaceChanged$,
         createNamespaceChanged$
-      ])
-        .pipe().subscribe(([namespaces, namespace, create]) => {
-          const namespaceExists = !!namespaces.find(val => val === namespace);
-          if (namespaceExists) {
-            // All is fine
-            this.details.controls.releaseNamespace.validator = () => null;
-            this.details.controls.createNamespace.setValue(false);
-            this.details.controls.createNamespace.disable();
-          } else if (!namespace) {
-            // Invalid - missing namespace
-            this.details.controls.releaseNamespace.validator = () => ({ required: true });
-            this.details.controls.createNamespace.disable();
-          } else if (!create) {
-            // Invalid - namespace doesn't exist and not creating
-            this.details.controls.releaseNamespace.validator = () => ({ namespaceDoesNotExist: true });
-            this.details.controls.createNamespace.enable();
-          } else {
-            // Valid - namespace doesn't exist but creating
-            this.details.controls.releaseNamespace.validator = () => null;
-            // this.details.controls.createNamespace.disable();
-          }
-          this.details.controls.releaseNamespace.updateValueAndValidity();
-        })
+      ]).pipe().subscribe(([namespaces, namespace, create]) => {
+        const namespaceExists = !!namespaces.find(val => val === namespace);
+        if (namespaceExists) {
+          // All is fine
+          this.details.controls.releaseNamespace.validator = () => null;
+          this.details.controls.createNamespace.setValue(false);
+          this.details.controls.createNamespace.disable();
+        } else if (!namespace) {
+          // Invalid - missing namespace
+          this.details.controls.releaseNamespace.validator = () => ({ required: true });
+          this.details.controls.createNamespace.disable();
+        } else if (!create) {
+          // Invalid - namespace doesn't exist and not creating
+          this.details.controls.releaseNamespace.validator = () => ({ namespaceDoesNotExist: true });
+          this.details.controls.createNamespace.enable();
+        } else {
+          // Valid - namespace doesn't exist but creating
+          this.details.controls.releaseNamespace.validator = () => null;
+          // this.details.controls.createNamespace.disable();
+        }
+        this.details.controls.releaseNamespace.updateValueAndValidity();
+      })
     );
 
     this.subs.push(

From e45282cc458eb275f77e4a73568894c2a62ce48f Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 21 Jan 2020 14:54:34 +0000
Subject: [PATCH 267/648] Better handling of auto select when typing

---
 .../create-release.component.html             |  2 +-
 .../create-release.component.ts               | 38 +++++++++++++------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.html b/custom-src/frontend/app/custom/helm/create-release/create-release.component.html
index 1061f2c1dc..4aec9bb603 100644
--- a/custom-src/frontend/app/custom/helm/create-release/create-release.component.html
+++ b/custom-src/frontend/app/custom/helm/create-release/create-release.component.html
@@ -21,7 +21,7 @@
 
       <mat-form-field>
         <input type="text" placeholder="Namespace" matInput formControlName="releaseNamespace" [matAutocomplete]="auto">
-        <mat-autocomplete #auto="matAutocomplete">
+        <mat-autocomplete #auto="matAutocomplete" autoActiveFirstOption>
           <mat-option *ngFor="let namespace of namespaces$ | async" [value]="namespace">
             {{namespace}}
           </mat-option>
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 2f50850d8c..59c042636a 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
@@ -85,6 +85,14 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
   }
 
   private setupDetailsStep() {
+    this.details = new FormGroup({
+      endpoint: new FormControl('', Validators.required),
+      releaseName: new FormControl('', Validators.required),
+      releaseNamespace: new FormControl(''),
+      createNamespace: new FormControl(false),
+    });
+    this.details.controls.createNamespace.disable();
+
     this.kubeEndpoints$ = this.endpointsService.connectedEndpointsOfTypes(KUBERNETES_ENDPOINT_TYPE);
 
     const action = new GetKubernetesNamespaces(null);
@@ -98,20 +106,23 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     );
     this.namespaces$ = combineLatest([
       allNamespaces$,
-      this.endpointChanged.asObservable()
+      this.endpointChanged.asObservable(),
+      this.details.controls.releaseNamespace.valueChanges.pipe(startWith(''), distinctUntilChanged())
     ]).pipe(
-      map(([namespaces, namespace]: [KubernetesNamespace[], string]) => namespaces.filter(ns => ns.metadata.kubeId === namespace)),
-      map((namespaces: KubernetesNamespace[]) => namespaces.map(namespace => namespace.metadata.name)),
+      // Filter out namespaces from other kubes
+      map(([namespaces, kubeId, namespace]: [KubernetesNamespace[], string, string]) => ([
+        namespaces.filter(ns => ns.metadata.kubeId === kubeId),
+        namespace
+      ])),
+      // Map to endpoint names
+      map(([namespaces, namespace]: [KubernetesNamespace[], string]) => [
+        namespaces.map(ns => ns.metadata.name),
+        namespace
+      ]),
+      // Filter out namespaces not matching existing text
+      map(([namespaces, namespace]: [string[], string]) => this.filterTyped(namespaces, namespace)),
     );
 
-    this.details = new FormGroup({
-      endpoint: new FormControl('', Validators.required),
-      releaseName: new FormControl('', Validators.required),
-      releaseNamespace: new FormControl(''),
-      createNamespace: new FormControl(false),
-    });
-    this.details.controls.createNamespace.disable();
-
     const namespaceChanged$ = this.details.controls.releaseNamespace.valueChanges.pipe(
       distinctUntilChanged()
     );
@@ -160,6 +171,11 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     );
   }
 
+  private filterTyped(namespaces: string[], namespace: string): string[] {
+    const lowerCase = namespace.toLowerCase();
+    return lowerCase.length ? namespaces.filter(ns => ns.toLowerCase().indexOf(lowerCase) >= 0) : namespaces;
+  }
+
   public useValuesYaml() {
     if (this.overrides.value.values.length !== 0) {
       this.confirmDialog.open(this.overwriteValuesConfirmation, () => {

From e1e73ee1af7f9030d8e2373e0500b4da19e54c2f Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Tue, 21 Jan 2020 15:05:15 +0000
Subject: [PATCH 268/648] Hit chart-repo server container when processing sync
 and delete commands

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 src/jetstream/plugins/monocular/sync.go | 36 ++++++++++++++++++-------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/jetstream/plugins/monocular/sync.go b/src/jetstream/plugins/monocular/sync.go
index 599803718a..1242f39cdb 100644
--- a/src/jetstream/plugins/monocular/sync.go
+++ b/src/jetstream/plugins/monocular/sync.go
@@ -2,9 +2,12 @@ package monocular
 
 import (
 	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"strings"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
-	"github.com/helm/monocular/chartrepo"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -18,6 +21,8 @@ type SyncMetadata struct {
 	Busy   bool   `json:"busy"`
 }
 
+const chartRepoPathPrefix = "/v1"
+
 // Sync Channel
 var syncChan = make(chan SyncJob, 100)
 
@@ -41,7 +46,7 @@ func (m *Monocular) processSyncRequests() {
 	log.Info("Helm Repository Sync init")
 	for job := range syncChan {
 		log.Debugf("Processing Helm Repository Sync Job: %s", job.Endpoint.Name)
-
+		var repoSyncRequestParams string = fmt.Sprintf("{\"repoURL\":%q}", job.Endpoint.APIEndpoint.String())
 		// Could be delete or sync
 		if job.Action == 0 {
 			log.Debug("Syncing new repository")
@@ -50,22 +55,25 @@ func (m *Monocular) processSyncRequests() {
 				Busy:   true,
 			}
 			m.portalProxy.UpdateEndointMetadata(job.Endpoint.GUID, marshalSyncMetadata(metadata))
-			//Kate TODO hit the sync container rest endpoint to trigger a sync for given repo
-			err := chartrepo.SyncRepo(dbClient, dbName, job.Endpoint.Name, job.Endpoint.APIEndpoint.String(), "")
+			//Hit the sync server container endpoint to trigger a sync for given repo
+			err := putRequest("reposync:8080" + chartRepoPathPrefix + "/sync/" + job.Endpoint.Name, strings.NewReader(repoSyncRequestParams))
 			metadata.Busy = false
 			if err != nil {
-				log.Warn("Failed to sync repository: %v+", err)
+				log.Warn("Request to sync repository failed: %v+", err)
 				metadata.Status = "Sync Failed"
 				m.updateMetadata(job.Endpoint.GUID, metadata)
 			} else {
-				metadata.Status = "Synchronized"
+				metadata.Status = "Synchronizing"
 				m.updateMetadata(job.Endpoint.GUID, metadata)
 			}
-			log.Infof("Sync completed for repository: %s", job.Endpoint.APIEndpoint.String())
+			log.Infof("Sync in progress for repository: %s", job.Endpoint.APIEndpoint.String())
 		} else if job.Action == 1 {
 			log.Infof("Deleting Helm Repository: %s", job.Endpoint.Name)
-			//Kate TODO hit the sync container rest endpoint to trigger a delete for given repo
-			//m.Store.DeleteRepo(job.Endpoint.Name)
+			//Hit the sync server container endpoint to trigger a delete for given repo
+			err := putRequest("reposync:8080" + chartRepoPathPrefix + "/delete/" + job.Endpoint.Name, strings.NewReader(repoSyncRequestParams))
+			if err != nil {
+				log.Warn("Request to delete repository failed: %v+", err)
+			}
 		}
 	}
 
@@ -86,3 +94,13 @@ func (m *Monocular) updateMetadata(endpoint string, metadata SyncMetadata) {
 		log.Errorf("Failed to update endpoint metadata: %v+", err)
 	}
 }
+
+//https://gist.github.com/maniankara/a10d19960293b34b608ac7ef068a3d63
+func putRequest(url string, data io.Reader) error {
+	client := &http.Client{}
+	req, err := http.NewRequest(http.MethodPut, url, data)
+	if err == nil {
+		_, err = client.Do(req)
+	}
+	return err
+}

From 8fedcbd219337673d5f869b96c0d954ef925c6ca Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Tue, 21 Jan 2020 15:06:07 +0000
Subject: [PATCH 269/648] Tweak for building images

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 deploy/kubernetes/build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
index e7c2c0ad79..2d28f1e5ad 100755
--- a/deploy/kubernetes/build.sh
+++ b/deploy/kubernetes/build.sh
@@ -207,7 +207,7 @@ DEST_HELM_CHART_PATH="${STRATOS_PATH}/deploy/kubernetes/helm-chart"
 
 rm -rf ${DEST_HELM_CHART_PATH}
 mkdir -p ${DEST_HELM_CHART_PATH}
-cp -R ${SRC_HELM_CHART_PATH}/ ${DEST_HELM_CHART_PATH}/
+cp -RT ${SRC_HELM_CHART_PATH}/ ${DEST_HELM_CHART_PATH}/
 
 pushd ${DEST_HELM_CHART_PATH} > /dev/null
 
@@ -220,6 +220,7 @@ fi
 # Fetch subcharts
 helm dependency update
 
+# Commands:
 sed -i.bak -e 's/consoleVersion: latest/consoleVersion: '"${TAG}"'/g' values.yaml
 sed -i.bak -e 's/organization: splatform/organization: '"${DOCKER_ORG}"'/g' values.yaml
 sed -i.bak -e 's/hostname: docker.io/hostname: '"${DOCKER_REGISTRY}"'/g' values.yaml
@@ -230,7 +231,6 @@ rm -rf *.bak
 
 # Generate image list
 echo ${STRATOS_PATH}
-echo
 ${STRATOS_PATH}/deploy/kubernetes/imagelist-gen.sh .
 
 popd > /dev/null

From 11a98ca78d0765bb03d772ac9b71e05d97b8bf1f Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 21 Jan 2020 15:50:34 +0000
Subject: [PATCH 270/648] Fix Helm error handling

---
 .../create-release.component.ts               | 13 ++--
 .../monocular-versions-list-config.service.ts |  1 +
 .../app/custom/helm/store/helm.actions.ts     |  2 -
 .../app/custom/helm/store/helm.effects.ts     | 64 +++++++++++++++----
 4 files changed, 57 insertions(+), 23 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 59c042636a..1f15d77410 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
@@ -7,7 +7,7 @@ import { Store } from '@ngrx/store';
 import { PaginationMonitorFactory } from 'frontend/packages/store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from 'frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { BehaviorSubject, combineLatest, Observable, of, Subscription } from 'rxjs';
-import { delay, distinctUntilChanged, filter, first, map, pairwise, startWith, switchMap } from 'rxjs/operators';
+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';
@@ -265,13 +265,10 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     const releaseEntityConfig = entityCatalog.getEntity(action);
 
     // Wait for result of request
-    return of(true).pipe(
-      delay(1),
-      switchMap(() => releaseEntityConfig.getEntityMonitor(this.store, action.guid).updatingSection$),
-      map(updatingSection => updatingSection[action.updatingKey]),
-      filter(update => !!update),
+    return releaseEntityConfig.getEntityMonitor(this.store, action.guid).entityRequest$.pipe(
+      filter(state => !!state),
       pairwise(),
-      filter(([oldVal, newVal]) => (oldVal.busy && !newVal.busy)),
+      filter(([oldVal, newVal]) => (oldVal.creating && !newVal.creating)),
       map(([, newVal]) => newVal),
       map(result => ({
         success: !result.error,
@@ -280,7 +277,7 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
           path: !result.error ? `workloads/${values.endpoint}:${values.releaseNamespace}:${values.releaseName}/summary` : ''
         },
         message: !result.error ? '' : result.message
-      })),
+      }))
     );
   }
 
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-config.service.ts
index 4da8970655..6ebae8b5c4 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-config.service.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-config.service.ts
@@ -11,6 +11,7 @@ import { IListConfig, ListViewTypes } from '../../../shared/components/list/list
 import { HelmVersion } from '../store/helm.types';
 import { HelmVersionsDataSource } from './monocular-versions-list-source';
 
+// TODO: RC/NWM This isn't used anywhere, can HelmVersionsListConfig & HelmVersionsDataSource be deleted?
 @Injectable()
 export class HelmVersionsListConfig implements IListConfig<HelmVersion> {
   isLocal = true;
diff --git a/custom-src/frontend/app/custom/helm/store/helm.actions.ts b/custom-src/frontend/app/custom/helm/store/helm.actions.ts
index e1d1768f65..ce114a1245 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.actions.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.actions.ts
@@ -66,11 +66,9 @@ export class GetHelmVersions implements MonocularPaginationAction {
 }
 
 export class HelmInstall implements EntityRequestAction {
-  static HELM_INSTALLING_KEY = 'installing';
   type = HELM_INSTALL;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
   entityType = helmReleaseEntityKey;
-  updatingKey = HelmInstall.HELM_INSTALLING_KEY;
   guid: string;
   constructor(public values: HelmInstallValues) {
     this.guid = '<New Release>' + this.values.releaseName;
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 bb1020f221..bd499732d8 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.effects.ts
@@ -5,6 +5,7 @@ import { Action, Store } from '@ngrx/store';
 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 { ApiRequestTypes } from 'frontend/packages/store/src/reducers/api-request-reducer/request-helpers';
 import { NormalizedResponse } from 'frontend/packages/store/src/types/api.types';
 import {
   EntityRequestAction,
@@ -16,6 +17,7 @@ import { Observable } from 'rxjs';
 import { catchError, flatMap, mergeMap } from 'rxjs/operators';
 
 import { environment } from '../../../environments/environment';
+import { isJetstreamError } from '../../../jetstream.helpers';
 import {
   GET_HELM_VERSIONS,
   GET_MONOCULAR_CHARTS,
@@ -76,6 +78,9 @@ export class HelmEffects {
         // Go through each endpoint ID
         Object.keys(response).forEach(endpoint => {
           const endpointData = response[endpoint] || {};
+          if (isJetstreamError(endpointData)) {
+            throw endpointData;
+          }
           // Maintain typing
           const version: HelmVersion = {
             endpointId: endpoint,
@@ -93,8 +98,9 @@ export class HelmEffects {
   helmInstall$ = this.actions$.pipe(
     ofType<HelmInstall>(HELM_INSTALL),
     flatMap(action => {
+      const requestType: ApiRequestTypes = 'create';
       const url = '/pp/v1/helm/install';
-      this.store.dispatch(new StartRequestAction(action));
+      this.store.dispatch(new StartRequestAction(action, requestType));
       return this.httpClient.post(url, action.values).pipe(
         mergeMap(() => {
           return [
@@ -103,12 +109,13 @@ export class HelmEffects {
           ];
         }),
         catchError(error => {
-          const errorMessage = `Failed to install helm chart: ${error.message}`;
+          const { status, message } = this.createHelmError(error);
+          const errorMessage = `Failed to install helm chart: ${message}`;
           return [
-            new WrapperRequestActionFailed(errorMessage, action, 'create', {
+            new WrapperRequestActionFailed(errorMessage, action, requestType, {
               endpointIds: [action.values.endpoint],
               url: error.url || url,
-              eventCode: error.status ? error.status + '' : '500',
+              eventCode: status,
               message: errorMessage,
               error
             })
@@ -131,16 +138,47 @@ export class HelmEffects {
     };
     return this.httpClient.get(url, requestArgs).pipe(
       mergeMap((response: any) => [new WrapperRequestActionSuccess(mapResult(response), action)]),
-      catchError(error => [
-        new WrapperRequestActionFailed(error.message, action, 'fetch', {
-          endpointIds,
-          url: error.url || url,
-          eventCode: error.status ? error.status + '' : '500',
-          message: 'Monocular API request error',
-          error
-        })
-      ])
+      catchError(error => {
+        const { status, message } = this.createHelmError(error);
+        return [
+          new WrapperRequestActionFailed(message, action, 'fetch', {
+            endpointIds,
+            url: error.url || url,
+            eventCode: status,
+            message,
+            error
+          })
+        ];
+      })
     );
   }
 
+  private createHelmErrorMessage(err: any): string {
+    if (err) {
+      if (err.error && err.error.message) {
+        // Kube error
+        return err.error.message;
+      } else if (err.message) {
+        // Http error
+        return err.message;
+      }
+    }
+    return 'Monocular API request error';
+  }
+
+  private createHelmError(err: any): { status: string, message: string } {
+    const jetstreamError = isJetstreamError(err);
+    if (jetstreamError) {
+      // Wrapped error
+      return {
+        status: jetstreamError.error.statusCode.toString(),
+        message: this.createHelmErrorMessage(jetstreamError.errorResponse)
+      };
+    }
+    return {
+      status: err && err.status ? err.status + '' : '500',
+      message: this.createHelmErrorMessage(err)
+    };
+  }
+
 }

From 2dfa9573e1e7a5d62e910c5e4e499a99539a3048 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 21 Jan 2020 16:20:00 +0000
Subject: [PATCH 271/648] Fix CF Description and Address - Removed as part of
 37ca8502c973

---
 .../card-cf-info/card-cf-info.component.ts    | 48 +++++++++++++++++--
 1 file changed, 44 insertions(+), 4 deletions(-)

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 4f091539ab..86c6126adc 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,7 +1,9 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { ICfV2Info } from 'frontend/packages/core/src/core/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';
@@ -17,8 +19,9 @@ import { UserInviteService } from '../../../../features/cloud-foundry/user-invit
   templateUrl: './card-cf-info.component.html',
   styleUrls: ['./card-cf-info.component.scss']
 })
-export class CardCfInfoComponent implements OnInit {
+export class CardCfInfoComponent implements OnInit, OnDestroy {
   public apiUrl: string;
+  private subs: Subscription[] = [];
   public autoscalerVersion$: Observable<string>;
 
   constructor(
@@ -31,6 +34,17 @@ export class CardCfInfoComponent implements OnInit {
   description$: Observable<string>;
 
   ngOnInit() {
+    const obs$ = this.cfEndpointService.endpoint$.pipe(
+      tap(endpoint => {
+        this.apiUrl = this.getApiEndpointUrl(endpoint.entity.api_endpoint);
+      })
+    );
+    this.subs.push(obs$.subscribe());
+
+    this.description$ = this.cfEndpointService.info$.pipe(
+      map(entity => this.getDescription(entity))
+    );
+
     // FIXME: CF should not depend on autoscaler. See #3916
     this.autoscalerVersion$ = fetchAutoscalerInfo(this.cfEndpointService.cfGuid, this.esf).pipe(
       map(e => e.entityRequestInfo.error ?
@@ -39,6 +53,32 @@ export class CardCfInfoComponent implements OnInit {
     );
   }
 
+  getApiEndpointUrl(apiEndpoint) {
+    const path = apiEndpoint.Path ? `/${apiEndpoint.Path}` : '';
+    return `${apiEndpoint.Scheme}://${apiEndpoint.Host}${path}`;
+  }
+
+  ngOnDestroy(): void {
+    this.subs.forEach(s => s.unsubscribe());
+  }
+
+  private getMetadataFromInfo(entity: EntityInfo<APIResource<ICfV2Info>>) {
+    return entity && entity.entity && entity.entity.entity ? entity.entity.entity : null;
+  }
+
+  private getDescription(entity: EntityInfo<APIResource<ICfV2Info>>): string {
+    const metadata = this.getMetadataFromInfo(entity);
+    if (metadata) {
+      if (metadata.description) {
+        return metadata.description + (metadata.build ? ` (${metadata.build})` : '');
+      }
+      if (metadata.support === 'pcfdev@pivotal.io') {
+        return 'PCF Dev';
+      }
+    }
+    return '-';
+  }
+
   configureUserInvites() {
     this.dialog.open(UserInviteConfigurationDialogComponent, {
       data: {

From bea30db37308e1e8e03040d4abdb1262c5fb0330 Mon Sep 17 00:00:00 2001
From: Kate R <50168367+kreinecke@users.noreply.github.com>
Date: Wed, 22 Jan 2020 17:26:22 +0000
Subject: [PATCH 272/648] Plugin init Sync request  hits on-demand container

Signed-off-by: Kate R <50168367+kreinecke@users.noreply.github.com>
---
 src/jetstream/plugins/monocular/main.go | 2 +-
 src/jetstream/plugins/monocular/sync.go | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index f9475bd3cd..bd9a63b1ce 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -37,7 +37,7 @@ func (m *Monocular) GetChartStore() chartsvc.ChartSvcDatastore {
 
 // Init performs plugin initialization
 func (m *Monocular) Init() error {
-
+	log.SetLevel(log.DebugLevel)
 	if !m.portalProxy.GetConfig().EnableTechPreview {
 		return errors.New("Feature is in Tech Preview")
 	}
diff --git a/src/jetstream/plugins/monocular/sync.go b/src/jetstream/plugins/monocular/sync.go
index 1242f39cdb..2003e855f2 100644
--- a/src/jetstream/plugins/monocular/sync.go
+++ b/src/jetstream/plugins/monocular/sync.go
@@ -56,7 +56,7 @@ func (m *Monocular) processSyncRequests() {
 			}
 			m.portalProxy.UpdateEndointMetadata(job.Endpoint.GUID, marshalSyncMetadata(metadata))
 			//Hit the sync server container endpoint to trigger a sync for given repo
-			err := putRequest("reposync:8080" + chartRepoPathPrefix + "/sync/" + job.Endpoint.Name, strings.NewReader(repoSyncRequestParams))
+			err := putRequest("http://127.0.0.1:8080" + chartRepoPathPrefix + "/sync/" + job.Endpoint.Name, strings.NewReader(repoSyncRequestParams))
 			metadata.Busy = false
 			if err != nil {
 				log.Warn("Request to sync repository failed: %v+", err)
@@ -70,7 +70,7 @@ func (m *Monocular) processSyncRequests() {
 		} else if job.Action == 1 {
 			log.Infof("Deleting Helm Repository: %s", job.Endpoint.Name)
 			//Hit the sync server container endpoint to trigger a delete for given repo
-			err := putRequest("reposync:8080" + chartRepoPathPrefix + "/delete/" + job.Endpoint.Name, strings.NewReader(repoSyncRequestParams))
+			err := putRequest("http://127.0.0.1:8080" + chartRepoPathPrefix + "/delete/" + job.Endpoint.Name, strings.NewReader(repoSyncRequestParams))
 			if err != nil {
 				log.Warn("Request to delete repository failed: %v+", err)
 			}

From 5234dc186221caff3426b08431e24dcc79a7df34 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 22 Jan 2020 18:11:31 +0000
Subject: [PATCH 273/648] Fix core unit tests

---
 .../app/custom/helm/helm-testing.module.ts    |  4 --
 ...bernetes-certs-auth-form.component.spec.ts |  2 +
 .../kubernetes-dashboard.component.spec.ts    | 16 ++++-
 .../kubernetes-node.component.spec.ts         | 19 +++++-
 .../kubernetes-tab-base.component.spec.ts     | 16 ++++-
 .../custom/kubernetes/kubernetes.module.ts    |  5 +-
 .../kubernetes/kubernetes.testing.module.ts   | 27 ++++++++
 ...kube-namespace-pod-count.component.spec.ts |  6 +-
 .../node-pod-count.component.spec.ts          |  5 +-
 ...kubernetes-pod-readiness.component.spec.ts | 17 +++++-
 .../kubernetes-pod-status.component.spec.ts   | 13 +++-
 .../pod-name-link.component.spec.ts           |  3 +-
 .../pod-metrics/pod-metrics.component.spec.ts | 16 ++++-
 .../kubernetes-summary.component.spec.ts      |  5 +-
 .../helm-release-tab-base.component.spec.ts   |  8 +--
 .../helm-release-tab-base.component.ts        |  4 +-
 .../helm-release-notes-tab.component.spec.ts  |  6 +-
 .../helm-release-pods-tab.component.spec.ts   |  6 +-
 ...helm-release-resource-graph.component.html | 25 ++------
 ...m-release-resource-graph.component.spec.ts | 17 +++++-
 .../helm-release-resource-graph.component.ts  | 16 ++---
 ...release-resource-preview.component.spec.ts |  8 ++-
 ...elm-release-services-tab.component.spec.ts |  6 +-
 ...helm-release-summary-tab.component.spec.ts |  8 ++-
 .../helm-release-values-tab.component.spec.ts |  9 ++-
 .../releases-tab.component.spec.ts            | 20 +++---
 .../workloads/store/workloads.effects.ts      | 61 -------------------
 .../kubernetes/workloads/workload.types.ts    |  4 ++
 .../current-user-permissions.service.spec.ts  |  8 +--
 .../dashboard-base.component.spec.ts          |  4 +-
 .../dashboard-base.component.ts               |  2 -
 .../create-endpoint-connect.component.spec.ts | 10 ++-
 .../local-account-wizard.component.spec.ts    | 12 ++--
 .../local-list-controller.ts                  |  3 -
 .../markdown-preview.component.spec.ts        |  8 ++-
 .../sidepanel-preview.component.spec.ts       |  2 +-
 .../store/src/monitors/pagination-monitor.ts  | 12 ++--
 37 files changed, 235 insertions(+), 178 deletions(-)

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 cd66fa5963..62765f8b0d 100644
--- a/custom-src/frontend/app/custom/helm/helm-testing.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm-testing.module.ts
@@ -10,7 +10,6 @@ import { createBasicStoreModule } from '../../../../store/testing/public-api';
 import { generateStratosEntities } from '../../base-entity-types';
 import { CoreModule } from '../../core/core.module';
 import { SharedModule } from '../../shared/shared.module';
-import { HelmReleaseHelperService } from '../kubernetes/workloads/release/tabs/helm-release-helper.service';
 import { HelmReleaseGuid } from '../kubernetes/workloads/workload.types';
 import { generateHelmEntities } from './helm-entity-generator';
 
@@ -64,9 +63,6 @@ export const HelmBaseTestModules = [
 ];
 
 export const HelmBaseTestProviders = [
-  HelmReleaseHelperService,
-  HelmReleaseActivatedRouteMock,
-  HelmReleaseGuidMock,
   HttpClient,
   HttpHandler
 ];
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts
index f9c259e7f6..af9ca17150 100644
--- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts
@@ -1,6 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormBuilder } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { CoreModule } from 'frontend/packages/core/src/core/core.module';
 
 import { SharedModule } from '../../../../shared/shared.module';
 import { KubernetesCertsAuthFormComponent } from './kubernetes-certs-auth-form.component';
@@ -13,6 +14,7 @@ describe('KubernetesCertsAuthFormComponent', () => {
     TestBed.configureTestingModule({
       declarations: [KubernetesCertsAuthFormComponent],
       imports: [
+        CoreModule,
         SharedModule,
         NoopAnimationsModule
       ]
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts
index 971bc1bbef..9bd1d38afa 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts
@@ -1,4 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
 
 import { TabNavService } from '../../../../tab-nav.service';
 import { KubernetesBaseTestModules } from '../kubernetes.testing.module';
@@ -12,7 +13,20 @@ describe('KubernetesDashboardTabComponent', () => {
     TestBed.configureTestingModule({
       declarations: [KubernetesDashboardTabComponent],
       imports: [...KubernetesBaseTestModules],
-      providers: [TabNavService]
+      providers: [
+        TabNavService,
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: {
+              params: {
+                endpointId: 'anything'
+              },
+              queryParams: {}
+            }
+          }
+        }
+      ]
     })
       .compileComponents();
   }));
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts
index ee709c0ca1..277bf2ca96 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts
@@ -1,7 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
 
 import { TabNavService } from '../../../../tab-nav.service';
-import { KubernetesBaseTestModules } from '../kubernetes.testing.module';
+import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../kubernetes.testing.module';
 import { KubernetesNodeComponent } from './kubernetes-node.component';
 
 describe('KubernetesNodeComponent', () => {
@@ -12,7 +13,21 @@ describe('KubernetesNodeComponent', () => {
     TestBed.configureTestingModule({
       declarations: [KubernetesNodeComponent],
       imports: KubernetesBaseTestModules,
-      providers: [TabNavService]
+      providers: [
+        TabNavService,
+        KubeBaseGuidMock,
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: {
+              params: {
+                endpointId: 'anything'
+              },
+              queryParams: {}
+            }
+          }
+        }
+      ]
     })
       .compileComponents();
   }));
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts
index f783def07d..22ffd1698a 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts
@@ -1,4 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
 
 import { TabNavService } from '../../../../tab-nav.service';
 import { KubernetesBaseTestModules } from '../kubernetes.testing.module';
@@ -12,7 +13,20 @@ describe('KubernetesTabBaseComponent', () => {
     TestBed.configureTestingModule({
       declarations: [KubernetesTabBaseComponent],
       imports: KubernetesBaseTestModules,
-      providers: [TabNavService]
+      providers: [
+        TabNavService,
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: {
+              params: {
+                endpointId: 'anything'
+              },
+              queryParams: {}
+            }
+          }
+        }
+      ]
     })
       .compileComponents();
   }));
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
index 9ee79b188e..593b74341f 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
@@ -1,3 +1,4 @@
+/* tslint:disable:max-line-length */
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
@@ -89,8 +90,7 @@ import { KubernetesNodesTabComponent } from './tabs/kubernetes-nodes-tab/kuberne
 import { KubernetesPodsTabComponent } from './tabs/kubernetes-pods-tab/kubernetes-pods-tab.component';
 import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kubernetes-summary.component';
 
-// import { HelmReleaseService } from './services/helm-release.service';
-/* tslint:disable:max-line-length */
+
 
 /* tslint:enable */
 
@@ -148,7 +148,6 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     KubernetesService,
     BaseKubeGuid,
     KubernetesEndpointService,
-    // HelmReleaseService,
     KubernetesNodeService
   ],
   entryComponents: [
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 d84f853192..9aa2016dfd 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
@@ -9,7 +9,10 @@ import { createBasicStoreModule } from '../../../../store/testing/public-api';
 import { generateStratosEntities } from '../../base-entity-types';
 import { CoreModule } from '../../core/core.module';
 import { SharedModule } from '../../shared/shared.module';
+import { HelmReleaseActivatedRouteMock, HelmReleaseGuidMock } from '../helm/helm-testing.module';
 import { generateKubernetesEntities } from './kubernetes-entity-generator';
+import { BaseKubeGuid } from './kubernetes-page.types';
+import { HelmReleaseHelperService } from './workloads/release/tabs/helm-release-helper.service';
 
 @NgModule({
   imports: [{
@@ -35,7 +38,31 @@ 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,
 ];
+
+export const HelmReleaseProviders = [
+  HelmReleaseHelperService,
+  HelmReleaseActivatedRouteMock,
+  HelmReleaseGuidMock,
+];
+
+export const KubeBaseGuidMock = { provide: BaseKubeGuid, useValue: { guid: 'anything' } };
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts
index d3ad45391a..d5f28ba20e 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts
@@ -1,8 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { BaseKubeGuid } from '../../../kubernetes-page.types';
-import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
-import { HelmReleaseService } from '../../../services/helm-release.service';
+import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
 import { KubeNamespacePodCountComponent } from './kube-namespace-pod-count.component';
 
@@ -14,7 +12,7 @@ describe('KubeNamespacePodCountComponent', () => {
     TestBed.configureTestingModule({
       declarations: [KubeNamespacePodCountComponent],
       imports: KubernetesBaseTestModules,
-      providers: [BaseKubeGuid, HelmReleaseService, KubernetesEndpointService]
+      providers: [KubeBaseGuidMock, KubernetesEndpointService]
     })
       .compileComponents();
   }));
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts
index 671d7234ec..238a27d291 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts
@@ -1,7 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { BaseKubeGuid } from '../../../kubernetes-page.types';
-import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
+import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
 import { NodePodCountComponent } from './node-pod-count.component';
 
@@ -13,7 +12,7 @@ describe('NodePodCountComponent', () => {
     TestBed.configureTestingModule({
       declarations: [NodePodCountComponent],
       imports: KubernetesBaseTestModules,
-      providers: [BaseKubeGuid, KubernetesEndpointService]
+      providers: [KubeBaseGuidMock, KubernetesEndpointService]
     })
       .compileComponents();
   }));
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.spec.ts
index 5b79e614fd..a41cbad052 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.spec.ts
@@ -1,5 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
+import { KubernetesPod, KubernetesStatus } from '../../../store/kube.types';
 import { KubernetesPodReadinessComponent } from './kubernetes-pod-readiness.component';
 
 describe('KubernetesPodReadinessComponent', () => {
@@ -8,14 +10,25 @@ describe('KubernetesPodReadinessComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ KubernetesPodReadinessComponent ]
+      imports: [
+        ...KubernetesBaseTestModules,
+      ],
+      declarations: [KubernetesPodReadinessComponent]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(KubernetesPodReadinessComponent);
     component = fixture.componentInstance;
+    component.row = {
+      status: {
+        phase: KubernetesStatus.FAILED,
+      },
+      spec: {
+        containers: []
+      }
+    } as KubernetesPod;
     fixture.detectChanges();
   });
 
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts
index cae15b9ce2..1cd136eaf3 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts
@@ -1,5 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { KubernetesPod, KubernetesStatus } from '../../../store/kube.types';
 import { KubernetesPodStatusComponent } from './kubernetes-pod-status.component';
 
 describe('KubernetesPodStatusComponent', () => {
@@ -8,14 +9,22 @@ describe('KubernetesPodStatusComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ KubernetesPodStatusComponent ]
+      declarations: [KubernetesPodStatusComponent]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(KubernetesPodStatusComponent);
     component = fixture.componentInstance;
+    component.row = {
+      status: {
+        phase: KubernetesStatus.FAILED,
+      },
+      spec: {
+        containers: []
+      }
+    } as KubernetesPod;
     fixture.detectChanges();
   });
 
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.spec.ts
index 515736cc10..c81384b474 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.spec.ts
@@ -2,7 +2,6 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { BaseKubeGuid } from '../../../kubernetes-page.types';
 import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
-import { HelmReleaseService } from '../../../services/helm-release.service';
 import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
 import { KubernetesStatus } from '../../../store/kube.types';
 import { PodNameLinkComponent } from './pod-name-link.component';
@@ -15,7 +14,7 @@ describe('PodNameLinkComponent', () => {
     TestBed.configureTestingModule({
       declarations: [PodNameLinkComponent],
       imports: KubernetesBaseTestModules,
-      providers: [BaseKubeGuid, HelmReleaseService, KubernetesEndpointService]
+      providers: [BaseKubeGuid, KubernetesEndpointService]
 
     })
       .compileComponents();
diff --git a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts
index eba50aaea2..c999020533 100644
--- a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts
@@ -1,4 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
 
 import { TabNavService } from '../../../../tab-nav.service';
 import { KubernetesBaseTestModules } from '../kubernetes.testing.module';
@@ -13,7 +14,20 @@ describe('PodMetricsComponent', () => {
     TestBed.configureTestingModule({
       declarations: [PodMetricsComponent],
       imports: KubernetesBaseTestModules,
-      providers: [TabNavService]
+      providers: [
+        TabNavService,
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: {
+              params: {
+                endpointId: 'anything'
+              },
+              queryParams: {}
+            }
+          }
+        }
+      ]
     })
       .compileComponents();
   }));
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts
index 7c7ac7079f..8e64596d2e 100644
--- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts
@@ -2,8 +2,7 @@ import { HttpClient, HttpHandler } from '@angular/common/http';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { TabNavService } from '../../../../../tab-nav.service';
-import { BaseKubeGuid } from '../../kubernetes-page.types';
-import { KubernetesBaseTestModules } from '../../kubernetes.testing.module';
+import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
 import { KubernetesSummaryTabComponent } from './kubernetes-summary.component';
 
@@ -17,7 +16,7 @@ describe('KubernetesSummaryTabComponent', () => {
       imports: [...KubernetesBaseTestModules],
       providers: [
         KubernetesEndpointService,
-        BaseKubeGuid,
+        KubeBaseGuidMock,
         HttpClient,
         HttpHandler,
         TabNavService
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts
index e85413aa0a..4777afe99b 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { TabNavService } from 'frontend/packages/core/tab-nav.service';
 
-import { TabNavService } from '../../../../../tab-nav.service';
-import { HelmBaseTestModules, HelmBaseTestProviders } from '../../helm-testing.module';
+import { HelmReleaseProviders, KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
 import { HelmReleaseTabBaseComponent } from './helm-release-tab-base.component';
 
 
@@ -11,10 +11,10 @@ describe('HelmReleaseTabBaseComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [...HelmBaseTestModules],
+      imports: [...KubernetesBaseTestModules],
       declarations: [HelmReleaseTabBaseComponent],
       providers: [
-        ...HelmBaseTestProviders,
+        ...HelmReleaseProviders,
         TabNavService
       ]
     })
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 5404a28a77..1ed1dc73f9 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
@@ -19,7 +19,7 @@ import {
   GetHelmReleaseResource,
   GetHelmReleaseServices,
 } from '../../store/workloads.actions';
-import { HelmReleaseGuid, HelmReleasePod } from '../../workload.types';
+import { HelmReleaseGraph, HelmReleaseGuid, HelmReleasePod } from '../../workload.types';
 import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service';
 
 type IDGetterFunction = (data: any) => string;
@@ -119,7 +119,7 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
           const releasePodsAction = new GetHelmReleasePods(this.helmReleaseHelper.endpointGuid, this.helmReleaseHelper.releaseTitle);
           this.populateList(releasePodsAction, pods, getKubeAPIResourceGuid);
         } else if (messageObj.kind === 'Graph') {
-          const graph = messageObj.data;
+          const graph: HelmReleaseGraph = messageObj.data;
           graph.endpointId = this.helmReleaseHelper.endpointGuid;
           graph.releaseTitle = this.helmReleaseHelper.releaseTitle;
           const releaseGraphAction = new GetHelmReleaseGraph(graph.endpointId, graph.releaseTitle);
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts
index 119f485328..1d3a3c6811 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { HelmBaseTestModules, HelmBaseTestProviders } from '../../../helm-testing.module';
+import { HelmReleaseProviders, KubernetesBaseTestModules } from '../../../../kubernetes.testing.module';
 import { HelmReleaseNotesTabComponent } from './helm-release-notes-tab.component';
 
 describe('HelmReleaseNotesTabComponent', () => {
@@ -10,13 +10,13 @@ describe('HelmReleaseNotesTabComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
-        ...HelmBaseTestModules
+        ...KubernetesBaseTestModules
       ],
       declarations: [
         HelmReleaseNotesTabComponent
       ],
       providers: [
-        ...HelmBaseTestProviders
+        ...HelmReleaseProviders
       ]
     })
       .compileComponents();
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts
index e1fa969f5f..2dc9718ec8 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { HelmBaseTestModules, HelmBaseTestProviders } from '../../../helm-testing.module';
+import { HelmReleaseProviders, KubernetesBaseTestModules } from '../../../../kubernetes.testing.module';
 import { HelmReleasePodsTabComponent } from './helm-release-pods-tab.component';
 
 describe('HelmReleasePodsTabComponent', () => {
@@ -10,11 +10,11 @@ describe('HelmReleasePodsTabComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
-        ...HelmBaseTestModules
+        ...KubernetesBaseTestModules
       ],
       declarations: [HelmReleasePodsTabComponent],
       providers: [
-        ...HelmBaseTestProviders
+        ...HelmReleaseProviders
       ]
     })
       .compileComponents();
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
index 4cb7c6e4c8..6dd8d86bda 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
@@ -9,30 +9,17 @@
   </button>
 </app-page-sub-nav>
 
-<ngx-graph
-  class="chart-container"
-  (zoomChange)="onZoomChanged($event)"
-  [links]="links"
-  [nodes]="nodes"
-  [update$]="update$"
-  [zoomToFit$]="fit$"
-  [layout]="layout"
->
+<ngx-graph *ngIf="nodes && nodes.length" class="chart-container" [links]="links" [nodes]="nodes" [update$]="update$"
+  [zoomToFit$]="fit$" [layout]="layout">
   <ng-template #nodeTemplate let-node>
     <svg:g class="node" (click)="onNodeClick(node)">
-      <svg:rect
-        [attr.width]="node.dimension.width"
-        [attr.height]="node.dimension.height"
-        [attr.fill]="node.data.fill"
+      <svg:rect [attr.width]="node.dimension.width" [attr.height]="node.dimension.height" [attr.fill]="node.data.fill"
         class="node"></svg:rect>
       />
-      <svg:text
-      class="no-style"
-      alignment-baseline="central"
-      [attr.fill]="node.data.text"
-      [attr.x]="10" [attr.y]="node.dimension.height / 2">
+      <svg:text class="no-style" alignment-baseline="central" [attr.fill]="node.data.text" [attr.x]="10"
+        [attr.y]="node.dimension.height / 2">
         {{node.label}} ({{node.data.kind}})
       </svg:text>
     </svg:g>
   </ng-template>
-</ngx-graph>
+</ngx-graph>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
index 274f69a1e3..53267e42ab 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
@@ -1,5 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { NgxGraphModule } from '@swimlane/ngx-graph';
+import { PanelPreviewService } from 'frontend/packages/core/src/shared/services/panel-preview.service';
+import { TabNavService } from 'frontend/packages/core/tab-nav.service';
 
+import { HelmReleaseProviders, KubernetesBaseTestModules } from '../../../../kubernetes.testing.module';
 import { HelmReleaseResourceGraphComponent } from './helm-release-resource-graph.component';
 
 describe('HelmReleaseResourceGraphComponent', () => {
@@ -8,9 +12,18 @@ describe('HelmReleaseResourceGraphComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ HelmReleaseResourceGraphComponent ]
+      imports: [
+        ...KubernetesBaseTestModules,
+        NgxGraphModule
+      ],
+      declarations: [HelmReleaseResourceGraphComponent],
+      providers: [
+        ...HelmReleaseProviders,
+        PanelPreviewService,
+        TabNavService,
+      ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
index 0f1a5ea4bb..61fc21d0eb 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
@@ -1,7 +1,7 @@
 import { Component, ComponentFactoryResolver, OnDestroy, OnInit } from '@angular/core';
 import { Edge, Node } from '@swimlane/ngx-graph';
 import { PanelPreviewService } from 'frontend/packages/core/src/shared/services/panel-preview.service';
-import { Subject, Subscription } from 'rxjs';
+import { BehaviorSubject, Subscription } from 'rxjs';
 
 import { HelmReleaseHelperService } from '../helm-release-helper.service';
 import {
@@ -28,12 +28,12 @@ export class HelmReleaseResourceGraphComponent implements OnInit, OnDestroy {
 
   // see: https://swimlane.github.io/ngx-graph/#/#quick-start
 
-  public nodes = [] as Node[];
-  public links = [] as Edge[];
+  public nodes: Node[] = [];
+  public links: Edge[] = [];
 
-  update$: Subject<boolean> = new Subject();
+  update$: BehaviorSubject<boolean> = new BehaviorSubject(false);
 
-  fit$: Subject<boolean> = new Subject();
+  fit$: BehaviorSubject<boolean> = new BehaviorSubject(false);
 
   public layout = 'dagre';
 
@@ -49,7 +49,7 @@ export class HelmReleaseResourceGraphComponent implements OnInit, OnDestroy {
   ngOnInit() {
 
     // Listen for the graph
-    this.graph = this.helper.fetchReleaseGraph().subscribe((g: any) => {
+    this.graph = this.helper.fetchReleaseGraph().subscribe(g => {
       const newNodes = [];
       Object.values(g.nodes).forEach((node: any) => {
         const colors = this.getColor(node.data.status);
@@ -137,8 +137,4 @@ export class HelmReleaseResourceGraphComponent implements OnInit, OnDestroy {
     }
   }
 
-  public onZoomChanged(e) {
-    // console.log(e);
-  }
-
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts
index 534fadc806..bbb824fbc6 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts
@@ -1,5 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { KubernetesBaseTestModules } from '../../../../../kubernetes.testing.module';
 import { HelmReleaseResourcePreviewComponent } from './helm-release-resource-preview.component';
 
 describe('HelmReleaseResourcePreviewComponent', () => {
@@ -8,9 +9,12 @@ describe('HelmReleaseResourcePreviewComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ HelmReleaseResourcePreviewComponent ]
+      imports: [
+        ...KubernetesBaseTestModules
+      ],
+      declarations: [HelmReleaseResourcePreviewComponent]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts
index 1bb2ff267c..392dd17d4b 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { HelmBaseTestModules, HelmBaseTestProviders } from '../../../helm-testing.module';
+import { HelmReleaseProviders, KubernetesBaseTestModules } from '../../../../kubernetes.testing.module';
 import { HelmReleaseServicesTabComponent } from './helm-release-services-tab.component';
 
 
@@ -11,11 +11,11 @@ describe('HelmReleaseServicesTabComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
-        ...HelmBaseTestModules
+        ...KubernetesBaseTestModules
       ],
       declarations: [HelmReleaseServicesTabComponent],
       providers: [
-        ...HelmBaseTestProviders
+        ...HelmReleaseProviders
       ]
     })
       .compileComponents();
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
index 2376c09f73..60540500e7 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
@@ -1,6 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { TabNavService } from 'frontend/packages/core/tab-nav.service';
 
-import { HelmBaseTestModules, HelmBaseTestProviders } from '../../../helm-testing.module';
+import { HelmReleaseProviders, KubernetesBaseTestModules } from '../../../../kubernetes.testing.module';
 import { HelmReleaseSummaryTabComponent } from './helm-release-summary-tab.component';
 
 describe('HelmReleaseSummaryTabComponent', () => {
@@ -10,11 +11,12 @@ describe('HelmReleaseSummaryTabComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
-        ...HelmBaseTestModules
+        ...KubernetesBaseTestModules
       ],
       declarations: [HelmReleaseSummaryTabComponent],
       providers: [
-        ...HelmBaseTestProviders
+        ...HelmReleaseProviders,
+        TabNavService
       ]
     })
       .compileComponents();
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts
index 2100c60585..753a4c1445 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts
@@ -1,6 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { TabNavService } from 'frontend/packages/core/tab-nav.service';
 
-import { HelmBaseTestModules, HelmBaseTestProviders } from '../../../helm-testing.module';
+import { HelmReleaseProviders, KubernetesBaseTestModules } from '../../../../kubernetes.testing.module';
 import { HelmReleaseValuesTabComponent } from './helm-release-values-tab.component';
 
 describe('HelmReleaseValuesTabComponent', () => {
@@ -10,13 +11,15 @@ describe('HelmReleaseValuesTabComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
-        ...HelmBaseTestModules
+        ...KubernetesBaseTestModules
       ],
       declarations: [
         HelmReleaseValuesTabComponent
       ],
       providers: [
-        ...HelmBaseTestProviders
+        // ...HelmBaseTestProviders,
+        ...HelmReleaseProviders,
+        TabNavService
       ]
     })
       .compileComponents();
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts
index 335db13c6a..745833b6fd 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts
@@ -1,26 +1,32 @@
-import { HelmBaseTestModules } from '../../../helm/helm-testing.module';
-import { DatePipe } from './@angular/common';
-import { async, ComponentFixture, TestBed } from './@angular/core/testing';
+import { DatePipe } from '@angular/common';
+import { async, TestBed } from '@angular/core/testing';
+import { TabNavService } from 'frontend/packages/core/tab-nav.service';
+
+import { KubernetesBaseTestModules } from '../../kubernetes.testing.module';
+import { HelmReleaseHelperService } from '../release/tabs/helm-release-helper.service';
 import { HelmReleasesTabComponent } from './releases-tab.component';
 
 describe('ReleasesTabComponent', () => {
   let component: HelmReleasesTabComponent;
-  let fixture: ComponentFixture<HelmReleasesTabComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
-        ...HelmBaseTestModules
+        ...KubernetesBaseTestModules
       ],
       declarations: [HelmReleasesTabComponent],
-      providers: [DatePipe]
+      providers: [
+        DatePipe,
+        HelmReleaseHelperService,
+        TabNavService
+      ]
 
     })
       .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(HelmReleasesTabComponent);
+    const fixture = TestBed.createComponent(HelmReleasesTabComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
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 3955dda1e2..6c77a0d388 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
@@ -81,8 +81,6 @@ export class WorkloadsEffects {
   );
 
   private mapHelmRelease(data, endpointId) {
-    // console.log('Got helm release');
-    // console.log(data);
     const helmRelease: HelmRelease = {
       ...data,
       endpointId
@@ -96,65 +94,6 @@ export class WorkloadsEffects {
     return helmRelease;
   }
 
-
-  // TODO: NWM This uses GetHelmReleaseStatus. I added `namespace` to GetHelmReleaseStatus
-  // RC: Don't need this anymore - services come back over the web socket
-  // @Effect()
-  // fetchHelmReleaseServices$ = this.actions$.pipe(
-  //   ofType<GetHelmReleaseServices>(GET_HELM_RELEASE_SERVICES),
-  //   mergeMap(action => [new GetHelmReleaseStatus(action.endpointGuid, action.releaseTitle)])
-  // );
-
-  // private updateReleasePods(action: GetHelmReleaseStatus, status: HelmReleaseStatus) {
-  //   const releasePodsAction = new GetHelmReleasePods(action.endpointGuid, action.releaseTitle);
-  //   const pods = Object.values(status.data['v1/Pod']).reduce((res, pod) => {
-  //     const newPod: HelmReleasePod = {
-  //       endpointId: action.endpointGuid,
-  //       releaseTitle: action.releaseTitle,
-  //       ...pod
-  //     };
-  //     res[GetHelmReleasePods.createKey(action.endpointGuid, action.releaseTitle, pod.name)] = newPod;
-  //     return res;
-  //   }, {});
-  //   const keys = Object.keys(pods);
-  //   const releasePods = {
-  //     entities: { [entityCatalog.getEntityKey(releasePodsAction)]: pods },
-  //     result: keys
-  //   } as NormalizedResponse;
-  //   this.store.dispatch(new WrapperRequestActionSuccess(
-  //     releasePods,
-  //     releasePodsAction,
-  //     'fetch',
-  //     keys.length,
-  //     1)
-  //   );
-  // }
-
-  // private updateReleaseServices(action: GetHelmReleaseStatus, status: HelmReleaseStatus) {
-  //   const releaseServiceAction = new GetHelmReleaseServices(action.endpointGuid, action.releaseTitle);
-  //   const services = Object.values(status.data['v1/Service']).reduce((res, service) => {
-  //     const newService: HelmReleaseService = {
-  //       endpointId: action.endpointGuid,
-  //       releaseTitle: action.releaseTitle,
-  //       ...service
-  //     };
-  //     res[GetHelmReleasePods.createKey(action.endpointGuid, action.releaseTitle, service.name)] = newService;
-  //     return res;
-  //   }, {});
-  //   const keys = Object.keys(services);
-  //   const releaseServices = {
-  //     entities: { [entityCatalog.getEntityKey(releaseServiceAction)]: services },
-  //     result: keys
-  //   } as NormalizedResponse;
-  //   this.store.dispatch(new WrapperRequestActionSuccess(
-  //     releaseServices,
-  //     releaseServiceAction,
-  //     'fetch',
-  //     keys.length,
-  //     1)
-  //   );
-  // }
-
   private makeRequest(
     action: EntityRequestAction,
     url: string,
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
index 34b42d5e27..a0f26ebe03 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
@@ -46,9 +46,13 @@ export interface HelmReleaseService {
   spec: any;
 }
 
+// TODO: RC/NWM - Remove WS release logging in backend
+
 export interface HelmReleaseGraph {
   endpointId: string;
   releaseTitle: string;
+  nodes: {};
+  links: {};
 }
 
 export type HelmReleaseResource = any;
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 512245eca2..13387610c3 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
@@ -1,15 +1,17 @@
 import { TestBed } from '@angular/core/testing';
+import { createBasicStoreModule, createEntityStoreState, TestStoreEntity } from '@stratos/store/testing';
 import { first, tap } from 'rxjs/operators';
 
 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';
 import { AppState } from '../../../store/src/app-state';
+import { EntityCatalogTestModule, TEST_CATALOGUE_ENTITIES } from '../../../store/src/entity-catalog-test.module';
+import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types';
 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 { createBasicStoreModule, createEntityStoreState, TestStoreEntity } from '@stratos/store/testing';
 import { endpointEntitySchema } from '../base-entity-schemas';
 import { generateStratosEntities } from '../base-entity-types';
 import { CFFeatureFlagTypes } from '../shared/components/cf-auth/cf-auth.types';
@@ -22,8 +24,6 @@ import {
   ScopeStrings,
 } from './current-user-permissions.config';
 import { CurrentUserPermissionsService } from './current-user-permissions.service';
-import { EntityCatalogTestModule, TEST_CATALOGUE_ENTITIES } from '../../../store/src/entity-catalog-test.module';
-import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types';
 
 const ffSchema = cfEntityFactory(featureFlagEntityType);
 
@@ -65,7 +65,6 @@ describe('CurrentUserPermissionsService', () => {
         },
         metricsAvailable: false,
         connectionStatus: 'connected',
-        registered: true,
         system_shared_token: false,
         sso_allowed: false
       },
@@ -104,7 +103,6 @@ describe('CurrentUserPermissionsService', () => {
         },
         metricsAvailable: false,
         connectionStatus: 'connected',
-        registered: true,
         system_shared_token: false,
         sso_allowed: false
       }
diff --git a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.spec.ts b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.spec.ts
index f22295bbe2..75586ea67d 100644
--- a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.spec.ts
+++ b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.spec.ts
@@ -10,6 +10,7 @@ import { appReducers } from '../../../../../store/src/reducers.module';
 import { TabNavService } from '../../../../tab-nav.service';
 import { CoreModule } from '../../../core/core.module';
 import { PageHeaderService } from '../../../core/page-header-service/page-header.service';
+import { PanelPreviewService } from '../../../shared/services/panel-preview.service';
 import { SharedModule } from '../../../shared/shared.module';
 import { MetricsService } from '../../metrics/services/metrics-service';
 import { PageSideNavComponent } from '../page-side-nav/page-side-nav.component';
@@ -40,7 +41,8 @@ describe('DashboardBaseComponent', () => {
         MetricsService,
         TabNavService,
         HttpClient,
-        HttpHandler
+        HttpHandler,
+        PanelPreviewService
       ],
     })
       .compileComponents();
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 e7aedc0c15..5caa0bad1c 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
@@ -132,8 +132,6 @@ export class DashboardBaseComponent implements OnInit, OnDestroy, AfterViewInit
   }
 
   ngAfterViewInit() {
-    console.log('*************');
-    console.log('SETTING PREVIEW PANEL');
     this.panelPreviewService.setContainer(this.previewPanelContainer);
   }
 
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.spec.ts
index bc70537cf2..6e7f50c389 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.spec.ts
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.spec.ts
@@ -1,7 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { createBasicStoreModule } from '@stratos/store/testing';
+import { PanelPreviewService } from 'frontend/packages/core/src/shared/services/panel-preview.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 { ConnectEndpointComponent } from '../../connect-endpoint/connect-endpoint.component';
@@ -15,13 +17,17 @@ describe('CreateEndpointConnectComponent', () => {
     TestBed.configureTestingModule({
       declarations: [
         CreateEndpointConnectComponent,
-        ConnectEndpointComponent
+        ConnectEndpointComponent,
       ],
       imports: [
         CoreModule,
         SharedModule,
         CoreTestingModule,
+        RouterTestingModule,
         createBasicStoreModule(),
+      ],
+      providers: [
+        PanelPreviewService,
       ]
     })
       .compileComponents();
diff --git a/src/frontend/packages/core/src/features/setup/local-account-wizard/local-account-wizard.component.spec.ts b/src/frontend/packages/core/src/features/setup/local-account-wizard/local-account-wizard.component.spec.ts
index bdc41a9533..c2eee31eeb 100644
--- a/src/frontend/packages/core/src/features/setup/local-account-wizard/local-account-wizard.component.spec.ts
+++ b/src/frontend/packages/core/src/features/setup/local-account-wizard/local-account-wizard.component.spec.ts
@@ -1,4 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
+import { createEmptyStoreModule } from '@stratos/store/testing';
 
 import { TabNavService } from '../../../../tab-nav.service';
 import { CoreModule } from '../../../core/core.module';
@@ -7,10 +11,6 @@ import { PageHeaderModule } from '../../../shared/components/page-header/page-he
 import { SharedModule } from '../../../shared/shared.module';
 import { SetupModule } from '../setup.module';
 import { LocalAccountWizardComponent } from './local-account-wizard.component';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { RouterTestingModule } from '@angular/router/testing';
-import { StoreModule } from '@ngrx/store';
 
 describe('LocalAccountWizardComponent', () => {
   let component: LocalAccountWizardComponent;
@@ -27,12 +27,12 @@ describe('LocalAccountWizardComponent', () => {
         PageHeaderModule,
         ReactiveFormsModule,
         MDAppModule,
-        StoreModule.forRoot({}),
+        createEmptyStoreModule(),
         NoopAnimationsModule,
       ],
       providers: [TabNavService]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts
index 76d10b4ec3..bb0fb7391f 100644
--- a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts
+++ b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts
@@ -62,9 +62,6 @@ export class LocalListController<T = any> {
         return { paginationEntity, entities };
       }),
       tap(({ paginationEntity, entities }) => {
-        console.log('------- HERE');
-        console.log(paginationEntity);
-        console.log(entities);
         this.setResultCount(paginationEntity, entities);
       }),
       map(({ entities }) => entities)
diff --git a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.spec.ts b/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.spec.ts
index 5e67976b94..ea8522cf1f 100644
--- a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.spec.ts
@@ -1,10 +1,11 @@
 import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 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 { LoggerService } from '../../../core/logger.service';
+import { SidepanelPreviewComponent } from '../sidepanel-preview/sidepanel-preview.component';
 import { MarkdownPreviewComponent } from './markdown-preview.component';
 
 describe('MarkdownPreviewComponent', () => {
@@ -13,7 +14,10 @@ describe('MarkdownPreviewComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [MarkdownPreviewComponent],
+      declarations: [
+        MarkdownPreviewComponent,
+        SidepanelPreviewComponent
+      ],
       providers: [LoggerService, HttpClient, HttpHandler],
       imports: [
         HttpClientModule,
diff --git a/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.spec.ts b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.spec.ts
index 2eb1505ae2..e944d38e60 100644
--- a/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.spec.ts
@@ -1,9 +1,9 @@
 import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 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 '../../../../test-framework/store-test-helper';
 import { LoggerService } from '../../../core/logger.service';
 import { SidepanelPreviewComponent } from './sidepanel-preview.component';
 
diff --git a/src/frontend/packages/store/src/monitors/pagination-monitor.ts b/src/frontend/packages/store/src/monitors/pagination-monitor.ts
index 708a89f132..f1ad6bd3d2 100644
--- a/src/frontend/packages/store/src/monitors/pagination-monitor.ts
+++ b/src/frontend/packages/store/src/monitors/pagination-monitor.ts
@@ -14,16 +14,18 @@ import {
   withLatestFrom,
 } from 'rxjs/operators';
 
+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 { EntityCatalogEntityConfig } from '../entity-catalog/entity-catalog.types';
 import { EntitySchema } from '../helpers/entity-schema';
 import { ActionState, ListActionState } from '../reducers/api-request-reducer/types';
 import { getAPIRequestDataState, selectEntities } from '../selectors/api.selectors';
 import { selectPaginationState } from '../selectors/pagination.selectors';
 import { PaginationEntityState } from '../types/pagination.types';
-import { StratosBaseCatalogEntity } from '../entity-catalog/entity-catalog-entity';
-import { entityCatalog } from '../entity-catalog/entity-catalog.service';
-import { EntityCatalogEntityConfig } from '../entity-catalog/entity-catalog.types';
-import { LocalPaginationHelpers } from '../../../core/src/shared/components/list/data-sources-controllers/local-list.helpers';
 
 export class MultiActionListEntity {
   static getEntity(entity: MultiActionListEntity | any) {
@@ -228,8 +230,6 @@ export class PaginationMonitor<T = any, Y extends AppState = GeneralEntityAppSta
       schema
     );
 
-    console.log(schema);
-
     const allEntitiesObservable$ = this.store.select(getAPIRequestDataState);
 
     const entities$ = pagination$.pipe(

From d89823b77b961567a1d2e02dbf4676dbb971c07a Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 23 Jan 2020 10:12:08 +0000
Subject: [PATCH 274/648] Fix cloud-foundry unit tests

---
 .../src/features/cloud-foundry/cf.helpers.ts  |  6 +--
 .../cli-info-cloud-foundry.component.spec.ts  |  4 --
 .../cloud-foundry-endpoint.service.ts         | 12 +++---
 ...ndry-organization-events.component.spec.ts |  6 ++-
 ...oud-foundry-space-events.component.spec.ts |  6 ++-
 ...ud-foundry-space-summary.component.spec.ts | 10 ++---
 .../invite-users-create.component.spec.ts     |  8 ++--
 .../invite-users.component.spec.ts            |  6 ++-
 .../card-cf-recent-apps.component.spec.ts     |  4 +-
 .../cloud-foundry-endpoint-service.helper.ts  | 38 +++++++++++++++----
 10 files changed, 64 insertions(+), 36 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 2c0e748717..b35efb9e2b 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
@@ -3,7 +3,6 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable } from 'rxjs';
 import { filter, first, map, publishReplay, refCount, tap } from 'rxjs/operators';
 
-import { CFEntityConfig } from '../../cf-types';
 import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
 import { getCFEntityKey } from '../../../../cloud-foundry/src/cf-entity-helpers';
 import { applicationEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
@@ -28,10 +27,10 @@ import { getIdFromRoute, pathGet } from '../../../../core/src/core/utils.service
 import {
   extractActualListEntity,
 } from '../../../../core/src/shared/components/list/data-sources-controllers/local-filtering-sorting';
-import { MultiActionListEntity } from '../../../../store/src/monitors/pagination-monitor';
-import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import { SetClientFilter } from '../../../../store/src/actions/pagination.actions';
 import { RouterNav } from '../../../../store/src/actions/router.actions';
+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';
 import { selectPaginationState } from '../../../../store/src/selectors/pagination.selectors';
@@ -39,6 +38,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 { cfEntityFactory } from '../../cf-entity-factory';
+import { CFEntityConfig } from '../../cf-types';
 import { ActiveRouteCfCell, ActiveRouteCfOrgSpace } from './cf-page.types';
 
 export interface IUserRole<T> {
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..537b4881ec 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,8 +7,6 @@ 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 { ActiveRouteCfOrgSpace } from '../cf-page.types';
-import { CloudFoundryEndpointService } from '../services/cloud-foundry-endpoint.service';
 import { CliInfoCloudFoundryComponent } from './cli-info-cloud-foundry.component';
 
 describe('CliInfoCloudFoundryComponent', () => {
@@ -20,9 +18,7 @@ describe('CliInfoCloudFoundryComponent', () => {
       declarations: [CliInfoCloudFoundryComponent, CliInfoComponent, CliCommandComponent],
       imports: generateCfBaseTestModules(),
       providers: [
-        CloudFoundryEndpointService,
         generateTestCfEndpointServiceProvider(),
-        ActiveRouteCfOrgSpace,
         TabNavService
       ]
     })
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 0c5a25dd79..a7d5cd8902 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
@@ -22,15 +22,14 @@ import {
 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 { 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 { MetricQueryType } from '../../../../../core/src/shared/services/metrics-range-selector.types';
 import { GetAllEndpoints } from '../../../../../store/src/actions/endpoint.actions';
 import { MetricQueryConfig } from '../../../../../store/src/actions/metrics.actions';
+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 { endpointSchemaKey } from '../../../../../store/src/helpers/entity-factory';
-import { QParam, QParamJoiners } from '../../../shared/q-param';
+import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import {
   getPaginationObservables,
   PaginationObservables,
@@ -39,11 +38,12 @@ import { APIResource, EntityInfo } from '../../../../../store/src/types/api.type
 import { IMetrics } from '../../../../../store/src/types/base-metric.types';
 import { EndpointModel, EndpointUser } from '../../../../../store/src/types/endpoint.types';
 import { PaginatedAction } from '../../../../../store/src/types/pagination.types';
-import { CF_ENDPOINT_TYPE } from '../../../cf-types';
 import { FetchCFCellMetricsPaginatedAction } from '../../../actions/cf-metrics.actions';
 import { cfEntityFactory } from '../../../cf-entity-factory';
+import { CF_ENDPOINT_TYPE } from '../../../cf-types';
 import { CfInfoDefinitionActionBuilders } from '../../../entity-action-builders/cf-info.action-builders';
 import { CfUserService } from '../../../shared/data-services/cf-user.service';
+import { QParam, QParamJoiners } from '../../../shared/q-param';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { fetchTotalResults } from '../cf.helpers';
 
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 25ff5ccf76..08ea6f028e 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
@@ -1,4 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  generateActiveRouteCfOrgSpaceMock,
+} from 'frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper';
 
 import { ListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { CFBaseTestModules } from '../../../../../../test-framework/cf-test-helper';
@@ -9,7 +12,6 @@ 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 { ActiveRouteCfOrgSpace } from '../../../cf-page.types';
 import { CloudFoundryEndpointService } from '../../../services/cloud-foundry-endpoint.service';
 import { CloudFoundryOrganizationService } from '../../../services/cloud-foundry-organization.service';
 import { CloudFoundryOrganizationEventsComponent } from './cloud-foundry-organization-events.component';
@@ -29,8 +31,8 @@ describe('CloudFoundryOrganizationEventsComponent', () => {
           provide: ListConfig,
           useClass: CfOrganizationEventsConfigService,
         },
+        generateActiveRouteCfOrgSpaceMock(),
         CloudFoundryOrganizationService,
-        ActiveRouteCfOrgSpace,
         CfUserService,
         CloudFoundryEndpointService
       ],
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 fe8d28fbf6..8981199e29 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
@@ -1,4 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  generateActiveRouteCfOrgSpaceMock,
+} from 'frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper';
 
 import { ListConfig } from '../../../../../../../../../core/src/shared/components/list/list.component.types';
 import { CFBaseTestModules } from '../../../../../../../../test-framework/cf-test-helper';
@@ -9,7 +12,6 @@ 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 { ActiveRouteCfOrgSpace } from '../../../../../cf-page.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';
@@ -30,8 +32,8 @@ describe('CloudFoundrySpaceEventsComponent', () => {
           provide: ListConfig,
           useClass: CfSpaceEventsConfigService,
         },
+        generateActiveRouteCfOrgSpaceMock(),
         CloudFoundrySpaceService,
-        ActiveRouteCfOrgSpace,
         CfUserService,
         CloudFoundryEndpointService,
         CloudFoundryOrganizationService
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 37401db631..42709f07f1 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,12 +1,13 @@
 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 {
   CloudFoundrySpaceServiceMock,
 } from '../../../../../../../../../core/test-framework/cloud-foundry-space.service.mock';
+import {
+  generateActiveRouteCfOrgSpaceMock,
+  generateCfBaseTestModules,
+} from '../../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import {
   CardCfRecentAppsComponent,
 } from '../../../../../../../shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component';
@@ -17,7 +18,6 @@ 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 { ActiveRouteCfOrgSpace } from '../../../../../cf-page.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';
@@ -32,7 +32,7 @@ describe('CloudFoundrySpaceSummaryComponent', () => {
       declarations: [CloudFoundrySpaceSummaryComponent, CardCfSpaceDetailsComponent, CardCfRecentAppsComponent, CompactAppCardComponent],
       imports: generateCfBaseTestModules(),
       providers: [
-        ActiveRouteCfOrgSpace,
+        generateActiveRouteCfOrgSpaceMock(),
         CloudFoundryEndpointService,
         { provide: CloudFoundrySpaceService, useClass: CloudFoundrySpaceServiceMock },
         CloudFoundryOrganizationService,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.spec.ts
index 2cf5ba6863..afff04afae 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.spec.ts
@@ -1,9 +1,11 @@
 import { HttpClient, HttpHandler } from '@angular/common/http';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { generateCfBaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import {
+  generateActiveRouteCfOrgSpaceMock,
+  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 { UserInviteService } from '../../../user-invites/user-invite.service';
 import { InviteUsersCreateComponent } from './invite-users-create.component';
@@ -17,7 +19,7 @@ describe('InviteUsersCreateComponent', () => {
       declarations: [InviteUsersCreateComponent],
       imports: generateCfBaseTestModules(),
       providers: [
-        ActiveRouteCfOrgSpace,
+        generateActiveRouteCfOrgSpaceMock(),
         CloudFoundryEndpointService,
         UserInviteService,
         HttpClient,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users.component.spec.ts
index 1976d2f4ad..92b37bb6b0 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users.component.spec.ts
@@ -2,7 +2,10 @@ import { HttpClient, HttpHandler } from '@angular/common/http';
 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 {
+  generateCfActiveRouteMock,
+  generateCfBaseTestModules,
+} from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { InviteUsersCreateComponent } from './invite-users-create/invite-users-create.component';
 import { InviteUsersComponent } from './invite-users.component';
 
@@ -18,6 +21,7 @@ describe('InviteUsersComponent', () => {
       ],
       imports: generateCfBaseTestModules(),
       providers: [
+        generateCfActiveRouteMock(),
         HttpClient,
         HttpHandler,
         TabNavService
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.spec.ts
index 475f446cae..e05382f2c2 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.spec.ts
@@ -13,9 +13,9 @@ import {
 import { EntityMonitorFactory } from '../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import {
+  generateActiveRouteCfOrgSpaceMock,
   generateCfBaseTestModulesNoShared,
 } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { ActiveRouteCfOrgSpace } from '../../../../features/cloud-foundry/cf-page.types';
 import { CloudFoundryEndpointService } from '../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
 import { CfUserService } from '../../../data-services/cf-user.service';
 import { CardCfRecentAppsComponent } from './card-cf-recent-apps.component';
@@ -36,8 +36,8 @@ describe('CardCfRecentAppsComponent', () => {
       ],
       imports: generateCfBaseTestModulesNoShared(),
       providers: [
+        generateActiveRouteCfOrgSpaceMock(),
         CloudFoundryEndpointService,
-        ActiveRouteCfOrgSpace,
         EntityMonitorFactory,
         CfUserService,
         PaginationMonitorFactory
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 a46a7a0149..7a72e4072a 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
@@ -1,15 +1,16 @@
 import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { Store, StoreModule } from '@ngrx/store';
+import { testSCFEndpointGuid } from '@stratos/store/testing';
 
 import { CoreModule } from '../../core/src/core/core.module';
+import { SharedModule } from '../../core/src/shared/shared.module';
+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';
-import { SharedModule } from '../../core/src/shared/shared.module';
-import { testSCFEndpointGuid } from '@stratos/store/testing';
-import { CfUserServiceTestProvider } from '../../core/test-framework/user-service-helper';
 import { appReducers } from '../../store/src/reducers.module';
 import { CFAppState } from '../src/cf-app-state';
 import { CloudFoundryTestingModule } from '../src/cloud-foundry-test.module';
@@ -21,7 +22,6 @@ 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';
 
-
 export const cfEndpointServiceProviderDeps = [
   EntityServiceFactory,
   CfOrgSpaceDataService,
@@ -43,12 +43,34 @@ export class BaseCfOrgSpaceRouteMock {
     this.orgGuid = guid;
   }
 }
+
+export function generateCfActiveRouteMock(guid = testSCFEndpointGuid) {
+  return {
+    provide: ActivatedRoute,
+    useValue: {
+      snapshot: {
+        params: {
+          endpointId: guid,
+          orgId: guid,
+          spaceId: guid,
+        },
+        queryParams: {}
+      }
+    }
+  };
+}
+
+export function generateActiveRouteCfOrgSpaceMock(guid = testSCFEndpointGuid) {
+  return {
+    provide: ActiveRouteCfOrgSpace,
+    useFactory: () => new BaseCfOrgSpaceRouteMock(guid)
+  };
+}
+
 export function generateTestCfEndpointServiceProvider(guid = testSCFEndpointGuid) {
   return [
-    {
-      provide: ActiveRouteCfOrgSpace,
-      useFactory: () => new BaseCfOrgSpaceRouteMock(guid)
-    },
+    generateActiveRouteCfOrgSpaceMock(guid),
+    generateCfActiveRouteMock(guid),
     CfUserServiceTestProvider,
     CloudFoundryEndpointService,
     UserInviteService,

From 14a3f87eb5ccddb265dc85b8e70fb69d34c57be8 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 23 Jan 2020 11:10:53 +0000
Subject: [PATCH 275/648] Fixes Following Merge

---
 .../helm-release-resource-graph.component.spec.ts            | 4 ++--
 .../helm-release-resource-graph.component.ts                 | 5 +++--
 .../helm-release-resource-preview.component.ts               | 4 ++--
 src/frontend/packages/core/sass/_all-theme.scss              | 1 -
 src/frontend/packages/store/testing/src/store-test-helper.ts | 1 -
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
index 53267e42ab..238acbf3c5 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NgxGraphModule } from '@swimlane/ngx-graph';
-import { PanelPreviewService } from 'frontend/packages/core/src/shared/services/panel-preview.service';
+import { SidePanelService } from 'frontend/packages/core/src/shared/services/side-panel.service';
 import { TabNavService } from 'frontend/packages/core/tab-nav.service';
 
 import { HelmReleaseProviders, KubernetesBaseTestModules } from '../../../../kubernetes.testing.module';
@@ -19,7 +19,7 @@ describe('HelmReleaseResourceGraphComponent', () => {
       declarations: [HelmReleaseResourceGraphComponent],
       providers: [
         ...HelmReleaseProviders,
-        PanelPreviewService,
+        SidePanelService,
         TabNavService,
       ]
     })
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
index 61fc21d0eb..fb1d5cc2fb 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
@@ -1,6 +1,6 @@
 import { Component, ComponentFactoryResolver, OnDestroy, OnInit } from '@angular/core';
 import { Edge, Node } from '@swimlane/ngx-graph';
-import { PanelPreviewService } from 'frontend/packages/core/src/shared/services/panel-preview.service';
+import { SidePanelService } from 'frontend/packages/core/src/shared/services/side-panel.service';
 import { BehaviorSubject, Subscription } from 'rxjs';
 
 import { HelmReleaseHelperService } from '../helm-release-helper.service';
@@ -8,6 +8,7 @@ import {
   HelmReleaseResourcePreviewComponent,
 } from './helm-release-resource-preview/helm-release-resource-preview.component';
 
+
 interface Colors {
   bg: string;
   fg: string;
@@ -44,7 +45,7 @@ export class HelmReleaseResourceGraphComponent implements OnInit, OnDestroy {
   constructor(
     private componentFactoryResolver: ComponentFactoryResolver,
     private helper: HelmReleaseHelperService,
-    private previewPanel: PanelPreviewService) { }
+    private previewPanel: SidePanelService) { }
 
   ngOnInit() {
 
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts
index e42d6a607a..052793d3f6 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts
@@ -22,7 +22,7 @@ export class HelmReleaseResourcePreviewComponent implements PreviewableComponent
         newItem.age = moment(item.metadata.creationTimestamp).fromNow(true);
 
         newItem.labels = [];
-        Object.keys(item.metadata.labels).forEach(labelName => {
+        Object.keys(item.metadata.labels || []).forEach(labelName => {
           newItem.labels.push({
             name: labelName,
             value: item.metadata.labels[labelName]
@@ -31,7 +31,7 @@ export class HelmReleaseResourcePreviewComponent implements PreviewableComponent
 
         if (item.metadata && item.metadata.annotations) {
           newItem.annotations = [];
-          Object.keys(item.metadata.annotations).forEach(labelName => {
+          Object.keys(item.metadata.annotations || []).forEach(labelName => {
             newItem.annotations.push({
               name: labelName,
               value: item.metadata.annotations[labelName]
diff --git a/src/frontend/packages/core/sass/_all-theme.scss b/src/frontend/packages/core/sass/_all-theme.scss
index e121449717..0956107cbe 100644
--- a/src/frontend/packages/core/sass/_all-theme.scss
+++ b/src/frontend/packages/core/sass/_all-theme.scss
@@ -42,7 +42,6 @@
 @import '../src/shared/components/multiline-title/multiline-title.component.theme';
 @import '../src/features/user-profile/profile-info/profile-info.component.theme';
 @import '../src/core/stateful-icon/stateful-icon.component.theme';
-@import '../src/shared/components/sidepanel-preview/sidepanel-preview.component.theme';
 @import './components/mat-snack-bar.theme';
 @import './components/ngx-charts-gauge.theme';
 @import '../src/shared/components/sidepanel-preview/sidepanel-preview.component.theme';
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 397d30d74e..d463c1b7a1 100644
--- a/src/frontend/packages/store/testing/src/store-test-helper.ts
+++ b/src/frontend/packages/store/testing/src/store-test-helper.ts
@@ -162,7 +162,6 @@ function getDefaultInitialTestStratosStoreState() {
       isMobile: false,
       isMobileNavOpen: false,
       sideNavPinned: false,
-      headerEventMinimized: false,
       pollingEnabled: true,
       themeKey: null,
       headerEventMinimized: true,

From 31df7a58bfabae6cfd2c16f7484f5ab964a4ff7c Mon Sep 17 00:00:00 2001
From: Kate R <50168367+kreinecke@users.noreply.github.com>
Date: Thu, 23 Jan 2020 13:01:05 +0000
Subject: [PATCH 276/648] Repo Sync server keeps client alive between requests.
 Chartsvc API handles jetstream requests.

Signed-off-by: Kate R <50168367+kreinecke@users.noreply.github.com>
---
 .../plugins/monocular/chart-repo/api_endpoint.go | 10 ++++++++--
 .../plugins/monocular/chart-repo/chart_repo.go   |  2 +-
 .../monocular/chart-repo/foundationdb/delete.go  |  6 ++++--
 .../monocular/chart-repo/foundationdb/sync.go    |  4 +++-
 .../monocular/chart-repo/foundationdb/utils.go   | 16 ++++++++++++----
 .../chartsvc/foundationdb/datastore/datastore.go |  1 +
 .../monocular/chartsvc/foundationdb/handler.go   |  2 +-
 src/jetstream/plugins/monocular/chartsvc/main.go |  2 +-
 src/jetstream/plugins/monocular/main.go          |  2 ++
 9 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
index 22ed499834..9cebd59286 100644
--- a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
+++ b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
@@ -68,6 +68,9 @@ func setupRoutes() http.Handler {
 }
 
 func OnDemandSync(w http.ResponseWriter, req *http.Request, params Params) {
+	//Running in serve mode, we dont want to close the db client connection after a request
+	var clientKeepAlive = true
+
 	type syncParams struct {
 		RepoURL string `json:"repoURL"`
 	}
@@ -90,7 +93,7 @@ func OnDemandSync(w http.ResponseWriter, req *http.Request, params Params) {
 	}
 
 	startTime := time.Now()
-	if err := fdb.SyncRepo(fdbClient, fDBName, repoName, repoURL, authorizationHeader); err != nil {
+	if err := fdb.SyncRepo(fdbClient, fDBName, repoName, repoURL, authorizationHeader, clientKeepAlive); err != nil {
 		log.Fatalf("Can't sync chart repository with database: %v", err)
 		return
 	}
@@ -105,7 +108,10 @@ func OnDemandDelete(w http.ResponseWriter, req *http.Request, params Params) {
 		log.Fatal("No Repository name provided in request for Delete action.")
 	}
 
-	if err := fdb.DeleteRepo(fdbClient, fDBName, repoName); err != nil {
+	//Running in serve mode, we dont want to close the db client connection after a request
+	var clientKeepAlive = true
+
+	if err := fdb.DeleteRepo(fdbClient, fDBName, repoName, clientKeepAlive); err != nil {
 		log.Fatalf("Can't delete chart repository %s from database: %v", repoName, err)
 	}
 }
diff --git a/src/jetstream/plugins/monocular/chart-repo/chart_repo.go b/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
index e4b43ab04f..8b23957299 100644
--- a/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
+++ b/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
@@ -48,7 +48,7 @@ func init() {
 
 		//Flags for optional FoundationDB + Document Layer backend
 		cmd.Flags().String("doclayer-url", "mongodb://dev-fdbdoclayer/27016", "FoundationDB Document Layer URL")
-		cmd.Flags().String("doclayer-database", "charts", "FoundationDB Document-Layer database")
+		cmd.Flags().String("doclayer-database", "monocular-plugin", "FoundationDB Document-Layer database")
 
 		// see version.go
 		cmd.Flags().StringVarP(&utils.UserAgentComment, "user-agent-comment", "", "", "UserAgent comment used during outbound requests")
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/delete.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/delete.go
index 79105d2bac..d5f29445ab 100644
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/delete.go
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/delete.go
@@ -56,8 +56,10 @@ func Delete(cmd *cobra.Command, args []string) {
 
 	log.Debugf("Client created.")
 
-	if err = DeleteRepo(client, fDB, args[0]); err != nil {
-		log.Fatalf("Can't delete chart repository %s from database: %v", args[0], err)
+	//Close db client after serving request
+	var clientKeepAlive = false
+	if err = DeleteRepo(client, fDB, args[0], clientKeepAlive); err != nil {
+		log.Fatalf("Can't delete chart repository %s from database: %v", args[0], err, clientKeepAlive)
 	}
 
 	log.Infof("Successfully deleted the chart repository %s from database", args[0])
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/sync.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/sync.go
index 1b25b651ce..6db32d6b64 100644
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/sync.go
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/sync.go
@@ -58,8 +58,10 @@ func Sync(cmd *cobra.Command, args []string) {
 	log.Debugf("Client created.")
 
 	startTime := time.Now()
+	//Close db client after serving request
+	var clientKeepAlive = false
 	authorizationHeader := os.Getenv("AUTHORIZATION_HEADER")
-	if err = SyncRepo(client, fDB, args[0], args[1], authorizationHeader); err != nil {
+	if err = SyncRepo(client, fDB, args[0], args[1], authorizationHeader, clientKeepAlive); err != nil {
 		log.Fatalf("Can't add chart repository to database: %v", err)
 		return
 	}
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
index e4e38a582e..597f168b85 100644
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
@@ -67,10 +67,14 @@ func init() {
 // These steps are processed in this way to ensure relevant chart data is
 // imported into the database as fast as possible. E.g. we want all icons for
 // charts before fetching readmes for each chart and version pair.
-func SyncRepo(dbClient Client, dbName, repoName, repoURL string, authorizationHeader string) error {
+func SyncRepo(dbClient Client, dbName, repoName, repoURL string, authorizationHeader string, clientKeepAlive bool) error {
 
 	db, closer := dbClient.Database(dbName)
-	defer closer()
+
+	log.Infof("Keeping client alive: %v", clientKeepAlive)
+	if !clientKeepAlive {
+		defer closer()
+	}
 
 	url, err := common.ParseRepoURL(repoURL)
 	if err != nil {
@@ -191,9 +195,13 @@ func updateLastCheck(db Database, repoName string, checksum string, now time.Tim
 	return err
 }
 
-func DeleteRepo(dbClient Client, dbName, repoName string) error {
+func DeleteRepo(dbClient Client, dbName, repoName string, clientKeepAlive bool) error {
 	db, closer := dbClient.Database(dbName)
-	defer closer()
+
+	log.Infof("Keeping client alive: %v", clientKeepAlive)
+	if !clientKeepAlive {
+		defer closer()
+	}
 
 	log.Debugf("Checking database connection and readiness...")
 	collection := db.Collection("numbers")
diff --git a/src/jetstream/plugins/monocular/chartsvc/foundationdb/datastore/datastore.go b/src/jetstream/plugins/monocular/chartsvc/foundationdb/datastore/datastore.go
index 2580d1f93b..37ac06d008 100644
--- a/src/jetstream/plugins/monocular/chartsvc/foundationdb/datastore/datastore.go
+++ b/src/jetstream/plugins/monocular/chartsvc/foundationdb/datastore/datastore.go
@@ -78,6 +78,7 @@ func (c *mongoClient) Database(dbName string) (Database, func()) {
 	db := &mongoDatabase{c.Client.Database(dbName)}
 
 	return db, func() {
+		log.Infof("Closing db connection")
 		err := c.Client.Disconnect(context.Background())
 
 		if err != nil {
diff --git a/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go b/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go
index 2032a0db9d..fde7d07fde 100644
--- a/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go
+++ b/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go
@@ -120,7 +120,7 @@ func uniqChartList(charts []*models.Chart) []*models.Chart {
 }
 
 func getPaginatedChartList(repo string, pageNumber, pageSize int, showDuplicates bool) (utils.ApiListResponse, interface{}, error) {
-	log.Debugf("Request for paginated chart list..")
+	log.Debugf("Request for paginated chart list for repo %v", repo)
 
 	//Find all charts for repo name and sort by chart name
 	collection := db.Collection(chartCollection)
diff --git a/src/jetstream/plugins/monocular/chartsvc/main.go b/src/jetstream/plugins/monocular/chartsvc/main.go
index ffe1f5022d..68aa3586e2 100644
--- a/src/jetstream/plugins/monocular/chartsvc/main.go
+++ b/src/jetstream/plugins/monocular/chartsvc/main.go
@@ -79,7 +79,7 @@ func main() {
 
 	//Flags for optional FoundationDB + Document Layer backend
 	fdbURL := flag.String("doclayer-url", "mongodb://fdb-service/27016", "FoundationDB Document Layer URL")
-	fDB := flag.String("doclayer-database", "charts", "FoundationDB Document-Layer database")
+	fDB := flag.String("doclayer-database", "monocular-plugin", "FoundationDB Document-Layer database")
 
 	flag.Parse()
 
diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index bd9a63b1ce..236f9d86a9 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -145,10 +145,12 @@ func (m *Monocular) AddSessionGroupRoutes(echoGroup *echo.Group) {
 func (m *Monocular) handleAPI(c echo.Context) error {
 	// Modify the path to remove our prefix for the Chart Service API
 	path := c.Request().URL.Path
+	log.Debugf("URL to chartsvc requested: %v", path)
 	if strings.Index(path, prefix) == 0 {
 		path = path[len(prefix)-1:]
 		c.Request().URL.Path = path
 	}
+	log.Debugf("URL to chartsvc requested after modification: %v", path)
 	m.chartSvcRoutes.ServeHTTP(c.Response().Writer, c.Request())
 	return nil
 }

From 6992cec4617e472e872e12ef1db4d57fccd06cde Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 23 Jan 2020 13:04:54 +0000
Subject: [PATCH 277/648] Remove preview panel remnents

---
 .../cloud-foundry/cloud-foundry.module.ts     | 18 ++--
 .../cloud-foundry-endpoint.service.ts         | 44 +--------
 .../shared/services/panel-preview.service.ts  | 95 -------------------
 3 files changed, 13 insertions(+), 144 deletions(-)
 delete mode 100644 src/frontend/packages/core/src/shared/services/panel-preview.service.ts

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 7383b46dac..6c80a8dde4 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
@@ -1,4 +1,3 @@
-/* tslint:disable:max-line-length */
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
@@ -41,7 +40,6 @@ import { CloudFoundryComponentsModule } from '../../shared/components/components
 import {
   CFEndpointsListConfigService,
 } from '../../shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service';
-import { ApplicationService } from '../applications/application.service';
 import { AddOrganizationComponent } from './add-organization/add-organization.component';
 import {
   CreateOrganizationStepComponent,
@@ -61,7 +59,6 @@ import { EditSpaceComponent } from './edit-space/edit-space.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 { CloudFoundrySpaceService } from './services/cloud-foundry-space.service';
 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 +76,7 @@ import {
 } from './tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component';
 import { CloudFoundryCellService } from './tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service';
 import { CloudFoundryCellsComponent } from './tabs/cloud-foundry-cells/cloud-foundry-cells.component';
+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 {
@@ -87,6 +85,9 @@ import {
 import {
   CloudFoundryOrganizationBaseComponent,
 } from './tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component';
+import {
+  CloudFoundryOrganizationEventsComponent,
+} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component';
 import {
   CloudFoundryOrganizationSpacesComponent,
 } from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component';
@@ -96,6 +97,9 @@ import {
 import {
   CloudFoundrySpaceAppsComponent,
 } from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component';
+import {
+  CloudFoundrySpaceEventsComponent,
+} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component';
 import {
   CloudFoundrySpaceRoutesComponent,
 } from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component';
@@ -141,10 +145,8 @@ import {
 import { UsersRolesSelectComponent } from './users/manage-users/manage-users-select/manage-users-select.component';
 import { UsersRolesComponent } from './users/manage-users/manage-users.component';
 import { RemoveUserComponent } from './users/remove-user/remove-user.component';
-import { CloudFoundryEventsComponent } from './tabs/cloud-foundry-events/cloud-foundry-events.component';
-import { CloudFoundryOrganizationEventsComponent } from './tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component';
-import { CloudFoundrySpaceEventsComponent } from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component';
 
+/* tslint:disable:max-line-length */
 
 @NgModule({
   imports: [
@@ -232,8 +234,8 @@ import { CloudFoundrySpaceEventsComponent } from './tabs/cloud-foundry-organizat
       provide: ActiveRouteCfCell,
       useValue: {}
     },
-    ApplicationService,
-    CloudFoundrySpaceService,
+    // ApplicationService,
+    // CloudFoundrySpaceService,
     CloudFoundryOrganizationService,
     CloudFoundryEndpointService,
     // CfRolesService,
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 a7d5cd8902..1e5665ba89 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
@@ -59,12 +59,12 @@ export function appDataSort(app1: APIResource<IApp>, app2: APIResource<IApp>): n
   return 0;
 }
 
+
 @Injectable()
 export class CloudFoundryEndpointService {
+
   hasSSHAccess$: Observable<boolean>;
   totalMem$: Observable<number>;
-  description$: Observable<string>;
-  apiUrl$: Observable<string>;
   paginationSubscription: any;
   appsPagObs: PaginationObservables<APIResource<IApp>>;
   usersCount$: Observable<number | null>;
@@ -100,7 +100,6 @@ export class CloudFoundryEndpointService {
       }) as PaginatedAction;
     return getAllOrganizationsAction;
   }
-
   static createGetAllOrganizationsLimitedSchema(cfGuid: string) {
     const paginationKey = cfGuid ?
       createEntityRelationPaginationKey(endpointSchemaKey, cfGuid)
@@ -141,14 +140,7 @@ export class CloudFoundryEndpointService {
     private endpointService: EndpointsService,
     private paginationMonitorFactory: PaginationMonitorFactory
   ) {
-    const cfGuid = activeRouteCfOrgSpace.cfGuid;
-    if (cfGuid) {
-      this.initialize(cfGuid);
-    }
-  }
-
-  public initialize(cfGuid) {
-    this.cfGuid = cfGuid;
+    this.cfGuid = activeRouteCfOrgSpace.cfGuid;
     this.getAllOrgsAction = CloudFoundryEndpointService.createGetAllOrganizations(this.cfGuid) as GetAllOrganizations;
     this.getAllAppsAction = new GetAllApplications(createEntityRelationPaginationKey('cf', this.cfGuid), this.cfGuid);
 
@@ -207,14 +199,6 @@ export class CloudFoundryEndpointService {
     );
     this.totalMem$ = this.appsPagObs.entities$.pipe(map(apps => this.getMetricFromApps(apps, 'memory')));
 
-    this.apiUrl$ = this.endpoint$.pipe(
-      map(endpoint => this.getApiEndpointUrl(endpoint.entity.api_endpoint))
-    );
-
-    this.description$ = this.info$.pipe(
-      map(entity => this.getDescription(entity))
-    );
-
     this.connected$ = this.endpoint$.pipe(
       map(p => p.entity.connectionStatus === 'connected')
     );
@@ -274,28 +258,6 @@ export class CloudFoundryEndpointService {
     this.store.dispatch(this.getAllAppsAction);
   }
 
-  private getApiEndpointUrl(apiEndpoint) {
-    const path = apiEndpoint.Path ? `/${apiEndpoint.Path}` : '';
-    return `${apiEndpoint.Scheme}://${apiEndpoint.Host}${path}`;
-  }
-
-  private getMetadataFromInfo(entity: EntityInfo<APIResource<ICfV2Info>>) {
-    return entity && entity.entity && entity.entity.entity ? entity.entity.entity : null;
-  }
-
-  private getDescription(entity: EntityInfo<APIResource<ICfV2Info>>): string {
-    const metadata = this.getMetadataFromInfo(entity);
-    if (metadata) {
-      if (metadata.description) {
-        return metadata.description + (metadata.build ? ` (${metadata.build})` : '');
-      }
-      if (metadata.support === 'pcfdev@pivotal.io') {
-        return 'PCF Dev';
-      }
-    }
-    return '-';
-  }
-
   hasCellMetrics(endpointId: string): Observable<boolean> {
     return this.endpointService.hasMetrics(endpointId).pipe(
       switchMap(hasMetrics => {
diff --git a/src/frontend/packages/core/src/shared/services/panel-preview.service.ts b/src/frontend/packages/core/src/shared/services/panel-preview.service.ts
deleted file mode 100644
index eae4ace3af..0000000000
--- a/src/frontend/packages/core/src/shared/services/panel-preview.service.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { ComponentFactory, ComponentFactoryResolver, ComponentRef, Injectable, ViewContainerRef, Inject } 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';
-
-@Injectable()
-export class PanelPreviewService {
-  private openedSubject: BehaviorSubject<boolean>;
-  public opened$: Observable<boolean>;
-
-  private container: ViewContainerRef;
-
-  constructor(
-    private componentFactoryResolver: ComponentFactoryResolver,
-    private router: Router,
-    @Inject(DOCUMENT) private document: Document,
-  ) {
-    this.openedSubject = new BehaviorSubject(false);
-    this.opened$ = this.observeSubject(this.openedSubject);
-
-    this.setupRouterListener();
-  }
-
-  public setContainer(container: ViewContainerRef) {
-    if (this.container) {
-      throw new Error('PanelPreviewService: container already set');
-    }
-
-    this.container = container;
-  }
-
-  public show(component: object, props?: { [key: string]: any }, componentFactoryResolver?: ComponentFactoryResolver) {
-    if (!this.container) {
-      throw new Error('PanelPreviewService: container must be set');
-    }
-
-    this.render(component, props, componentFactoryResolver);
-    this.openedSubject.next(true);
-
-    this.document.addEventListener('keydown', this.onKeyDown);
-  }
-
-  onKeyDown = (event) => {
-    if (event.key === 'Escape') {
-      this.hide();
-    }
-  }
-
-  public hide() {
-    if (!this.container) {
-      throw new Error('PanelPreviewService: container must be set');
-    }
-
-    this.openedSubject.next(false);
-    this.document.removeEventListener('keydown', this.onKeyDown);
-
-  }
-
-  render(component: object, props: { [key: string]: any }, componentFactoryResolver?: ComponentFactoryResolver) {
-    if (this.container.length) {
-      this.container.remove(0);
-    }
-
-    // Use the supplied component factory resolver if provided
-    const resolver = componentFactoryResolver ||  this.componentFactoryResolver;
-
-    const factory: ComponentFactory<any> = resolver.resolveComponentFactory(component as any);
-    const componentRef: ComponentRef<any> = this.container.createComponent(factory);
-
-    if (props) {
-      componentRef.instance.setProps(props);
-    }
-  }
-
-  public clear() {
-    this.container.clear();
-    this.openedSubject.next(false);
-  }
-
-  private setupRouterListener() {
-    this.router.events.pipe(
-      filter(() => !!this.container),
-      tap((e) => this.hide()))
-      .subscribe();
-  }
-
-  private observeSubject(subject: Subject<any>) {
-    return subject.asObservable().pipe(
-      publishReplay(1),
-      refCount(),
-      observeOn(asapScheduler)
-    );
-  }
-}

From 386913042bae3fb9b90a388a09c0352c961ac5a9 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 23 Jan 2020 13:20:08 +0000
Subject: [PATCH 278/648] Fix unit tests

---
 .../helm-release-resource-preview.component.spec.ts           | 4 +++-
 .../create-endpoint-connect.component.spec.ts                 | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts
index bbb824fbc6..cdd63660cd 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts
@@ -1,4 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { SidePanelService } from 'frontend/packages/core/src/shared/services/side-panel.service';
 
 import { KubernetesBaseTestModules } from '../../../../../kubernetes.testing.module';
 import { HelmReleaseResourcePreviewComponent } from './helm-release-resource-preview.component';
@@ -12,7 +13,8 @@ describe('HelmReleaseResourcePreviewComponent', () => {
       imports: [
         ...KubernetesBaseTestModules
       ],
-      declarations: [HelmReleaseResourcePreviewComponent]
+      declarations: [HelmReleaseResourcePreviewComponent],
+      providers: [SidePanelService]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.spec.ts
index 2545d195b8..02e8eb1026 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.spec.ts
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.spec.ts
@@ -1,5 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createBasicStoreModule } from '@stratos/store/testing';
 
 import { CoreTestingModule } from '../../../../../test-framework/core-test.modules';
 import { CoreModule } from '../../../../core/core.module';
@@ -23,7 +24,7 @@ describe('CreateEndpointConnectComponent', () => {
         SharedModule,
         CoreTestingModule,
         RouterTestingModule,
-        // createBasicStoreModule(),
+        createBasicStoreModule(),
       ],
       providers: [SidePanelService],
     })

From 64ad569f7ef8438fecee5d2f354e1e0301264bdc Mon Sep 17 00:00:00 2001
From: Kate R <50168367+kreinecke@users.noreply.github.com>
Date: Thu, 23 Jan 2020 18:06:26 +0000
Subject: [PATCH 279/648] Add utility code to poll URL GET for status and body

Signed-off-by: Kate R <50168367+kreinecke@users.noreply.github.com>
---
 .../plugins/monocular/utils/urlpoll.go        | 144 ++++++++++++++++++
 1 file changed, 144 insertions(+)
 create mode 100644 src/jetstream/plugins/monocular/utils/urlpoll.go

diff --git a/src/jetstream/plugins/monocular/utils/urlpoll.go b/src/jetstream/plugins/monocular/utils/urlpoll.go
new file mode 100644
index 0000000000..6d9aef14b7
--- /dev/null
+++ b/src/jetstream/plugins/monocular/utils/urlpoll.go
@@ -0,0 +1,144 @@
+// https://golang.org/doc%2Fcodewalk%2Furlpoll.go
+
+package utils
+
+import (
+	"ioutil"
+	"log"
+	"net/http"
+	"time"
+)
+
+const (
+	numPollers     = 2                // number of Poller goroutines to launch
+	pollInterval   = 60 * time.Second // how often to poll each URL
+	statusInterval = 10 * time.Second // how often to log status to stdout
+	errTimeout     = 10 * time.Second // back-off timeout on error
+)
+
+var urls = []string{
+	"http://www.google.com/",
+	"http://golang.org/",
+	"http://blog.golang.org/",
+}
+
+// State represents the last-known state of a URL.
+type State struct {
+	url    string
+	status string
+	body   string
+	error  string
+}
+
+// StateMonitor maintains a map that stores the state of the URLs being
+// polled, and prints the current state every updateInterval nanoseconds.
+// It returns a chan State to which resource state should be sent.
+func StateMonitor(updateInterval time.Duration) chan<- State {
+	updates := make(chan State)
+	urlStatus := make(map[string]string)
+	ticker := time.NewTicker(updateInterval)
+	go func() {
+		for {
+			select {
+			case <-ticker.C:
+				logState(urlStatus)
+			case s := <-updates:
+				urlStatus[s.url] = s.status
+			}
+		}
+	}()
+	return updates
+}
+
+// logState prints a state map.
+func logState(s map[string]string) {
+	log.Println("Current state:")
+	for k, v := range s {
+		log.Printf(" %s %s", k, v)
+	}
+}
+
+// Resource represents an HTTP URL to be polled by this program.
+type Resource struct {
+	url      string
+	errCount int
+}
+
+// Poll executes an HTTP HEAD request for url
+// and returns the HTTP status string or an error string.
+func (r *Resource) PollHead() string {
+	resp, err := http.Head(r.url)
+	if err != nil {
+		log.Println("Error", r.url, err)
+		r.errCount++
+		return err.Error()
+	}
+	r.errCount = 0
+	return resp.Status
+}
+
+// Poll executes an HTTP GET request for url
+// and returns the HTTP status string, body as a string.
+func (r *Resource) PollGet() string, error {
+
+	var body = ""
+	resp, err := http.Get(r.url)
+	defer resp.Body.Close()
+	if err != nil {
+		r.errCount++
+		return body, resp.Status, err
+	}
+
+	bodyBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		r.errCount++
+		return body, resp.Status, err
+	}
+
+	r.errCount = 0
+	body = string(bodyBytes)
+	return body, resp.Status, nil
+}
+
+// Sleep sleeps for an appropriate interval (dependent on error state)
+// before sending the Resource to done.
+func (r *Resource) Sleep(done chan<- *Resource) {
+	time.Sleep(pollInterval + errTimeout*time.Duration(r.errCount))
+	done <- r
+}
+
+func BodyPoller(in <-chan *Resource, out chan<- *Resource, status chan<- State) {
+	for r := range in {
+		b, s, e := r.PollGet()
+		errorString = ""
+		if e != nil {
+			errorString = e.Error()
+		}
+		status <- State{r.url, s, b, errorString}
+		out <- r
+	}
+}
+
+func main() {
+	// Create our input and output channels.
+	pending, complete := make(chan *Resource), make(chan *Resource)
+
+	// Launch the StateMonitor.
+	status := StateMonitor(statusInterval)
+
+	// Launch some Poller goroutines.
+	for i := 0; i < numPollers; i++ {
+		go Poller(pending, complete, status)
+	}
+
+	// Send some Resources to the pending queue.
+	go func() {
+		for _, url := range urls {
+			pending <- &Resource{url: url}
+		}
+	}()
+
+	for r := range complete {
+		go r.Sleep(pending)
+	}
+}

From c28deedbe27564dd5758ec195cbb7fc299162560 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 24 Jan 2020 11:41:47 +0000
Subject: [PATCH 280/648] Kubernetes Dashboard fixes and improvements

---
 CHANGELOG.md                                  |  21 ++
 .../kubedash-configuration.component.html     | 129 +++++++
 .../kubedash-configuration.component.scss     |  69 ++++
 .../kubedash-configuration.component.spec.ts  |  34 ++
 .../kubedash-configuration.component.ts       | 231 ++++++++++++
 .../kubernetes-dashboard.component.html       |  10 +-
 .../kubernetes-dashboard.component.scss       |   6 +
 .../kubernetes-dashboard.component.ts         | 112 ++++--
 .../custom/kubernetes/kubernetes.module.ts    |   4 +-
 .../custom/kubernetes/kubernetes.routing.ts   |   5 +
 .../services/kubernetes-endpoint.service.ts   |  50 ++-
 .../kubernetes/store/kubernetes.effects.ts    |  19 +
 .../kubernetes-summary.component.html         |  23 +-
 .../kubernetes-summary.component.scss         |  27 ++
 .../kubernetes-summary.component.ts           |   9 +-
 custom-src/stratos.yaml                       |   2 +-
 deploy/kubernetes/console/values.yaml         |   2 +-
 .../card-progress-overlay.component.html      |   6 +
 .../card-progress-overlay.component.scss      |  21 ++
 .../card-progress-overlay.component.spec.ts   |  29 ++
 ...card-progress-overlay.component.theme.scss |   9 +
 .../card-progress-overlay.component.ts        |  15 +
 .../datastore/20200117152200_SesssionData.go  |  22 ++
 src/jetstream/main.go                         |  55 ++-
 src/jetstream/middleware.go                   |   6 +
 src/jetstream/passthrough.go                  |   5 +
 .../plugins/kubernetes/dashboard/common.go    | 262 ++++++++++++++
 .../plugins/kubernetes/dashboard/configure.go | 243 +++++++++++++
 .../plugins/kubernetes/dashboard/login.go     | 101 ++++++
 .../plugins/kubernetes/dashboard/proxy.go     | 137 +++++++
 .../plugins/kubernetes/dashboard/status.go    |  53 +++
 .../plugins/kubernetes/dashboard/yaml.go      |  63 ++++
 .../plugins/kubernetes/kube_dashboard.go      | 337 ++++--------------
 src/jetstream/plugins/kubernetes/main.go      |  11 +-
 src/jetstream/portal_proxy.go                 |   1 +
 .../repository/interfaces/portal_proxy.go     |   1 +
 .../repository/interfaces/sessiondata.go      |  18 +
 .../repository/sessiondata/cleanup.go         |  64 ++++
 .../sessiondata/psql_sessiondata.go           | 102 ++++++
 src/jetstream/session.go                      |   6 +-
 40 files changed, 1986 insertions(+), 334 deletions(-)
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.html
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.scss
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts
 create mode 100644 src/frontend/packages/core/src/shared/components/card-progress-overlay/card-progress-overlay.component.html
 create mode 100644 src/frontend/packages/core/src/shared/components/card-progress-overlay/card-progress-overlay.component.scss
 create mode 100644 src/frontend/packages/core/src/shared/components/card-progress-overlay/card-progress-overlay.component.spec.ts
 create mode 100644 src/frontend/packages/core/src/shared/components/card-progress-overlay/card-progress-overlay.component.theme.scss
 create mode 100644 src/frontend/packages/core/src/shared/components/card-progress-overlay/card-progress-overlay.component.ts
 create mode 100644 src/jetstream/datastore/20200117152200_SesssionData.go
 create mode 100644 src/jetstream/plugins/kubernetes/dashboard/common.go
 create mode 100644 src/jetstream/plugins/kubernetes/dashboard/configure.go
 create mode 100644 src/jetstream/plugins/kubernetes/dashboard/login.go
 create mode 100644 src/jetstream/plugins/kubernetes/dashboard/proxy.go
 create mode 100644 src/jetstream/plugins/kubernetes/dashboard/status.go
 create mode 100644 src/jetstream/plugins/kubernetes/dashboard/yaml.go
 create mode 100644 src/jetstream/repository/interfaces/sessiondata.go
 create mode 100644 src/jetstream/repository/sessiondata/cleanup.go
 create mode 100644 src/jetstream/repository/sessiondata/psql_sessiondata.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ab677a1db..f34fb1060a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,26 @@
 # Change Log
 
+## 2.7.0
+
+[Full Changelog](https://github.com/SUSE/stratos/compare/2.6.1...2.7.0)
+
+This release sees a change in branding to "SUSE Stratos Console" along with numerous fixes and improvements
+to the Kubernetes Dashboard integration.
+
+Details:
+
+**Fixes:**
+
+- Kubernetes Dashboard integration is hard to configure [\#270](https://github.com/SUSE/stratos/pull/270)
+- Kubernetes Dashboard integration does not work with CaaSP 4.1 [\#269](https://github.com/SUSE/stratos/pull/269)
+- Fix long running service actions [\#4049] (https://github.com/cloudfoundry/stratos/pull/4049)
+
+**Improvements:**
+
+- Update branding to "SUSE Stratos Console" [\#271](https://github.com/SUSE/stratos/pull/271)
+- Show last operation and service broker info for service instances [\#4038](https://github.com/cloudfoundry/stratos/pull/4038)
+- Disable Volume Migration Job [\#279](https://github.com/SUSE/stratos/issues/279)
+
 ## 2.6.1
 
 [Full Changelog](https://github.com/cloudfoundry/stratos/compare/2.6.0...2.6.1)
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.html
new file mode 100644
index 0000000000..a873a408d8
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.html
@@ -0,0 +1,129 @@
+<app-page-header [breadcrumbs]="breadcrumbs$ | async">
+  <h1>Dashboard Configuration</h1>
+</app-page-header>
+
+<p>Stratos can proxy and embed the Kubernetes Dashboard UI when configured. This requires:</p>
+<ol class="kubedash__list">
+  <li>Kubernetes Dashboard Installation - An installation of the Dashboard in the Kubernetes cluster</li>
+  <li>Service Account - A Service Account that can be used to access the Dashboard</li>
+</ol>
+
+<div *ngIf="!(kubeDashboardStatus$ | async) || isUpdatingStatus" class="kubedash__loading">
+  <mat-spinner diameter="20"></mat-spinner>
+  <div>Retrieving Dashboard configuration ...</div>
+</div>
+
+<div *ngIf="(kubeDashboardStatus$ | async) && !isUpdatingStatus">
+  <div *ngIf="kubeDashboardStatus$ | async as status">
+    <div class="kubedash__ready" *ngIf="status.service && status.serviceAccount">
+      <div class="kubedash__access">
+        <app-boolean-indicator [showText]="false" [isTrue]="true" type="yes-no"></app-boolean-indicator>
+        <div>Kubernetes Dashboard is installed and a Service Account exists - you can access the dashboard using the 'View Dashboard' button on the Summary view for this cluster.</div>
+      </div>
+      <button *ngIf="kubeEndpointService.kubeDashboardConfigured$ | async" [routerLink]="dashboardLink" mat-button>
+        <mat-icon>dashboard</mat-icon>
+        <span class="kube-details__button">View Dashboard</span>
+      </button>
+    </div>
+
+    <mat-card class="kubedash__card">
+      <app-card-progress-overlay [busy]="dashboardUIBusy$" [label]="dashboardUIMsg"></app-card-progress-overlay>
+      <mat-card-header>
+        <mat-card-title>Kubernetes Dashboard Installation</mat-card-title>
+        <div class="kubedash__card-icon">
+          <app-boolean-indicator *ngIf="status.service" [showText]="false" [isTrue]="true" type="yes-no"></app-boolean-indicator>
+          <mat-icon *ngIf="!status.service">warning</mat-icon>
+        </div>
+      </mat-card-header>
+
+      <mat-card-content *ngIf="!status.service">
+        <p>No installation found</p>
+        <h2 class="kubedash__option">Manually install the Kubernetes Dashboard</h2>
+        <div class="kubedash__option-block">
+          <p>Manually install the Kubernetes Dashboard into your cluster. Please refer to
+            <a class="kubedash__card-link" target="_blank" href="https://github.com/kubernetes/dashboard#getting-started">https://github.com/kubernetes/dashboard#getting-started</a>.
+          </p>
+        </div>  
+
+        <h2 class="kubedash__option">Install the Kubernetes Dashboard from Stratos</h2>
+        <div class="kubedash__option-block">
+          <p>Stratos will download the Dashboard yaml from the Dashboard GitHub repository and install it for you.</p>
+          <div class="kubedash__buttons">
+            <button (click)="installDashboard()" [disabled]="isBusy$ | async" mat-button color="primary">Install Dashboard</button>
+          </div>
+        </div>
+      </mat-card-content>
+
+      <mat-card-content *ngIf="status.service">
+        <p>An installation of Kubernetes Dashboard was found:</p>
+        <div class="kubedash__metadata">
+          <app-metadata-item label="Version">{{ status.version }}</app-metadata-item>
+          <app-metadata-item label="Service Name">{{ status.service.name }}</app-metadata-item>
+          <app-metadata-item label="Namespace">{{ status.service.namespace }}</app-metadata-item>
+        </div>
+        <div class="kubedash__buttons" *ngIf="status.stratosInstalled">
+          <button (click)="deleteDashboard()" [disabled]="isBusy$ | async" mat-button color="primary">Delete Dashboard</button>
+        </div>
+      </mat-card-content>
+    </mat-card>
+
+    <mat-card class="kubedash__card">
+      <app-card-progress-overlay [busy]="serviceAccountBusy$" [label]="serviceAccountMsg"></app-card-progress-overlay>
+      <mat-card-header>
+        <mat-card-title>Service Account</mat-card-title>
+        <div class="kubedash__card-icon">
+          <app-boolean-indicator *ngIf="status.serviceAccount" [showText]="false" [isTrue]="true" type="yes-no"></app-boolean-indicator>
+          <mat-icon *ngIf="!status.serviceAccount">warning</mat-icon>
+        </div>
+      </mat-card-header>
+
+      <mat-card-content *ngIf="!status.serviceAccount">
+        <div *ngIf="(isAzure$ | async)">
+          <p class="kubedash__warn"><mat-icon>warning</mat-icon>You are using the Azure deployed version of Kubernetes Dashboard.</p>
+          <p>This version uses the Service Account 'kubernetes-dashboard' to access the Dashboard UI. You will need to create a Cluster Role Binding as described
+            <a class="kubedash__card-link" target="_blank" href="https://docs.microsoft.com/en-us/azure/aks/kubernetes-dashboard" >here</a> to give this account permissions.
+          </p>
+          <p>You also need to add the following label to the Service Account in order for Stratos to know the account is configured:</p>
+          <div class="kubedash__label">stratos-role: kubernetes-dashboard-user</div>
+          <p>You can add this label with the following command:</p>
+          <div class="kubedash__label">kubectl label serviceaccount -n kube-system kubernetes-dashboard stratos-role=kubernetes-dashboard-user</div>
+        </div>
+        <div *ngIf="!(isAzure$ | async)">
+          <p>Service Account not found - you can create one manually or Stratos can do this for you.</p>
+          <h2 class="kubedash__option">Manually create a Service Account</h2>
+          <div class="kubedash__option-block">
+            <p>Create a Service Account with the appropriate permissions that will be used by the Dashboard to
+            access your Kubernetes cluster.</p>
+            <p>Ensure that this token is labelled with the label:</p>
+            <div class="kubedash__label">stratos-role: kubernetes-dashboard-user</div>
+          </div>  
+          <h2 class="kubedash__option">Create a Service Account from Stratos</h2>
+          <div class="kubedash__option-block">
+            <div *ngIf="!status.service">
+              <p>Stratos can create a service account for accessing the Kubernetes Dashboard - please install the Dashboard first to enable this capability.</p>
+            </div>
+            <div *ngIf="status.service">
+              <p>Stratos will create a service account with a cluster role binding to the cluster-admin role. This user will
+                have full permissions over the cluster.</p>
+              <p class="kubedash__warn"><mat-icon>warning</mat-icon>Please make sure you understand the risks involved</p>
+              <div class="kubedash__buttons">
+                <button (click)="createServiceAccount()" [disabled]="isBusy$ | async" mat-button color="primary">Create Service Account</button>
+              </div>
+            </div>        
+          </div>
+        </div>
+      </mat-card-content>
+
+      <mat-card-content *ngIf="status.serviceAccount">
+        <p>A Service Account  was found:</p>
+        <div class="kubedash__metadata">
+          <app-metadata-item label="Name">{{ status.serviceAccount.metadata.name }}</app-metadata-item>
+          <app-metadata-item label="Namespace">{{ status.serviceAccount.metadata.namespace }}</app-metadata-item>
+          <div class="kubedash__buttons">
+            <button (click)="deleteServiceAccount()" [disabled]="isBusy$ | async" mat-button color="primary">Delete Service Account</button>
+          </div>
+        </div>
+      </mat-card-content>
+    </mat-card>
+  </div>
+</div>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.scss b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.scss
new file mode 100644
index 0000000000..8e187e2358
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.scss
@@ -0,0 +1,69 @@
+.kubedash {
+  &__header {
+    margin: 0;
+  }
+  &__list {
+    line-height: 1.5em;
+  }
+  &__card {
+    margin-bottom: 20px;
+  }
+  &__card-link {
+    color: inherit;
+  }
+  &__card-icon {
+    position: absolute;
+    right: 20px;
+    top: 20px;
+  }
+  &__ready {
+    > div {
+      flex: 1;
+    }
+    display: flex;
+    margin: 20px 0;
+  }
+  &__access {
+    display: flex;
+    > :first-child {
+      margin-right: 8px;
+    }
+  }
+  &__loading {
+    display: flex;
+    margin: 10px 0;
+
+    > mat-spinner {
+      margin-right: 8px;
+    }
+  }
+  &__option-block {
+    margin-left: 20px;
+  }
+  &__option {
+    font-size: 14px;
+    font-weight: normal;
+    text-decoration: underline;
+  }
+  &__label {
+    font-family: Source Code Pro;
+    font-size: 12px;
+  }
+  &__metadata {
+    margin-left: 20px;
+  }
+  &__buttons {
+    display: flex;
+    justify-content: flex-end;
+    width: 100%;
+  }
+  &__warn {
+    align-items: center;
+    display: flex;
+
+    > mat-icon {
+      margin-right: 8px;
+    }
+
+  }
+}
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts
new file mode 100644
index 0000000000..5543dea362
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts
@@ -0,0 +1,34 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { KubedashConfigurationComponent } from './kubedash-configuration.component';
+import { KubernetesBaseTestModules } from '../../kubernetes.testing.module';
+import { TabNavService } from '../../../../../tab-nav.service';
+import { HttpClient, HttpHandler } from '@angular/common/http';
+
+describe('KubedashConfigurationComponent', () => {
+  let component: KubedashConfigurationComponent;
+  let fixture: ComponentFixture<KubedashConfigurationComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [...KubernetesBaseTestModules],
+      declarations: [ KubedashConfigurationComponent ],
+      providers: [
+        TabNavService,
+        HttpClient,
+        HttpHandler,
+      ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubedashConfigurationComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
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
new file mode 100644
index 0000000000..6595239e28
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts
@@ -0,0 +1,231 @@
+import { IHeaderBreadcrumb } from './../../../../shared/components/page-header/page-header.types';
+import {
+  KubernetesEndpointService
+} from '../../services/kubernetes-endpoint.service';
+import { KubernetesService } from '../../services/kubernetes.service';
+import { ActivatedRoute } from '@angular/router';
+import { BaseKubeGuid } from '../../kubernetes-page.types';
+import { Component, OnInit, OnDestroy } from '@angular/core';
+import { Observable, BehaviorSubject, Subscription } from 'rxjs';
+import { map, distinctUntilChanged, tap, filter } from 'rxjs/operators';
+import { KubeDashboardStatus } from '../../store/kubernetes.effects';
+import { ConfirmationDialogConfig } from '../../../../shared/components/confirmation-dialog.config';
+import { HttpClient } from '@angular/common/http';
+import { ConfirmationDialogService } from '../../../../shared/components/confirmation-dialog.service';
+import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material';
+
+type MessageUpdater = (msg: string) => void;
+type ReadyFilter = (status: KubeDashboardStatus) => boolean;
+
+@Component({
+  selector: 'app-kubedash-configuration',
+  templateUrl: './kubedash-configuration.component.html',
+  styleUrls: ['./kubedash-configuration.component.scss'],
+  providers: [
+    {
+      provide: BaseKubeGuid,
+      useFactory: (activatedRoute: ActivatedRoute) => {
+        return {
+          guid: activatedRoute.snapshot.params.endpointId
+        };
+      },
+      deps: [
+        ActivatedRoute
+      ]
+    },
+    KubernetesService,
+    KubernetesEndpointService,
+  ]
+})
+export class KubedashConfigurationComponent implements OnInit, OnDestroy {
+
+  // Confirmation dialog
+  deleteServiceAccountConfirmation = new ConfirmationDialogConfig(
+    'Delete Service Account?',
+    'Are you sure you want to delete the Service Account and Cluster Role Binding?',
+    'Delete'
+  );
+
+  createServiceAccountConfirmation = new ConfirmationDialogConfig(
+    'Create Service Account?',
+    'Are you sure you want to create the Service Account and Cluster Role Binding?',
+    'Create'
+  );
+
+  installDashboardConfirmation = new ConfirmationDialogConfig(
+    'Install Kubernetes Dashboard?',
+    'Are you sure you want to install the Kubernetes Dashboard into this cluster?',
+    'Install'
+  );
+
+  deleteDashboardConfirmation = new ConfirmationDialogConfig(
+    'Delete Kubernetes Dashboard?',
+    'Are you sure you want to delete the Kubernetes Dashboard from this cluster?' +
+    'This will delete the dashboard namespace and cluster service account and role binding',
+    'Delete'
+  );
+
+  public breadcrumbs$: Observable<IHeaderBreadcrumb[]>;
+
+  public kubeDashboardStatus$: Observable<KubeDashboardStatus>;
+
+  private snackBarRef: MatSnackBarRef<SimpleSnackBar>;
+
+  public serviceAccountBusy$ = new BehaviorSubject<boolean>(false);
+  public serviceAccountMsg = '';
+
+  public dashboardUIBusy$ = new BehaviorSubject<boolean>(false);
+  public dashboardUIMsg = '';
+
+  // Are we busy with an operation - disable buttons if we are
+  public isBusy$ = new BehaviorSubject<boolean>(false);
+
+  // Is the status loading
+  public isUpdatingStatus = false;
+
+  private sub: Subscription;
+
+  public isAzure$: Observable<boolean>;
+
+  public dashboardLink: string;
+
+  constructor(
+    public kubeEndpointService: KubernetesEndpointService,
+    private httpClient: HttpClient,
+    private confirmDialog: ConfirmationDialogService,
+    private snackBar: MatSnackBar,
+) {
+    this.kubeDashboardStatus$ = kubeEndpointService.kubeDashboardStatus$;
+    // Clear the updatind status when we get back new dashboard status
+    this.sub = this.kubeDashboardStatus$.pipe(distinctUntilChanged()).subscribe(status => {
+      if (status !== null) {
+        this.isUpdatingStatus = false;
+      }
+    });
+
+    this.dashboardLink = `/kubernetes/${kubeEndpointService.kubeGuid}/dashboard`;
+
+    this.isAzure$ = this.kubeDashboardStatus$.pipe(
+      filter(status => status !== null),
+      filter(status => !!status.version),
+      map(status => status.version.indexOf('azure') !== -1)
+    );
+  }
+
+  ngOnInit() {
+    this.breadcrumbs$ = this.kubeEndpointService.endpoint$.pipe(
+      map(endpoint => ([{
+        breadcrumbs: [{ value: endpoint.entity.name, routerLink: `/kubernetes/${endpoint.entity.guid}` }]
+      }]))
+    );
+  }
+
+  ngOnDestroy() {
+    if (this.snackBarRef) {
+      this.snackBarRef.dismiss();
+    }
+    if (this.sub) {
+      this.sub.unsubscribe();
+    }
+  }
+
+  public createServiceAccount() {
+    this.confirmDialog.open(this.createServiceAccountConfirmation, () => {
+      this.doCreateServiceAccount();
+    });
+  }
+
+  public doCreateServiceAccount() {
+    this.makeRequest('post',
+    'serviceAccount',
+    'Creating Service Account ...',
+    'Service Account created', 'An error occurred creating the Service Account',
+    this.serviceAccountBusy$,
+    (msg) => this.serviceAccountMsg = msg
+    );
+  }
+
+  public deleteServiceAccount() {
+    this.confirmDialog.open(this.deleteServiceAccountConfirmation, () => {
+      this.doDeleteServiceAccount();
+    });
+  }
+
+  public doDeleteServiceAccount() {
+    this.makeRequest('delete', 'serviceAccount',
+      'Deleting Service Account ...',
+      'Service Account deleted',
+      'An error occurred deleting the Service Account', this.serviceAccountBusy$,
+      (msg => this.serviceAccountMsg = msg));
+  }
+
+  public installDashboard() {
+    this.confirmDialog.open(this.installDashboardConfirmation, () => {
+      this.doInstallDashboard();
+    });
+  }
+
+  public doInstallDashboard() {
+    this.makeRequest('post',
+    'installation',
+    'Installing Kubernetes Dashboard ...',
+    'Kubernetes Dashboard installed', 'An error occurred installing the Kubernetes Dashboard',
+    this.dashboardUIBusy$,
+    (msg) => this.dashboardUIMsg = msg
+    );
+  }
+
+  public deleteDashboard() {
+    this.confirmDialog.open(this.deleteDashboardConfirmation, () => {
+      this.doDeleteDashboard();
+    });
+  }
+
+  public doDeleteDashboard() {
+    this.makeRequest('delete',
+    'installation',
+    'Deleting Kubernetes Dashboard ...',
+    'Kubernetes Dashboard deleted', 'An error occurred deleting the Kubernetes Dashboard',
+    this.dashboardUIBusy$,
+    (msg) => this.dashboardUIMsg = msg
+    );
+  }
+
+  private makeRequest(method: string, op: string, busyMsg: string, okMsg: string, errorMsg: string,
+                      busy: BehaviorSubject<boolean>, msgUpdater: MessageUpdater) {
+   const guid = this.kubeEndpointService.kubeGuid;
+   const url = `/pp/v1/kubedash/${guid}/${op}`;
+   let obs;
+   msgUpdater(busyMsg);
+   busy.next(true);
+   this.isBusy$.next(true);
+   if (method === 'post') {
+     obs =  this.httpClient.post(url, {});
+   } else if (method === 'delete') {
+    obs =  this.httpClient.delete(url, {});
+   } else {
+     console.error('Unsupported http method');
+     return;
+   }
+
+   obs.subscribe(() => {
+     this.snackBar.open(okMsg, 'Dismiss', { duration: 3000 });
+     busy.next(false);
+     this.refresh();
+   }, (e) => {
+     let msg = errorMsg;
+     if (e && e.error && e.error.error) {
+       msg = e.error.error;
+     }
+     this.snackBarRef = this.snackBar.open(msg, 'Dismiss');
+     busy.next(false);
+     this.refresh();
+    });
+  }
+
+  private refresh() {
+    this.isUpdatingStatus = true;
+    this.kubeEndpointService.refreshKubernetesDashboardStatus();
+    this.isBusy$.next(false);
+  }
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.html
index bd35902725..bee441e958 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.html
@@ -12,7 +12,11 @@ <h1>Dashboard</h1>
   </div>
 </app-page-header>
 
-<app-loading-page [isLoading]="isLoading$" [text]="'Loading Kubernetes dashboard'">
-  <iframe #kubeDash (load)="iframeLoaded()" id="kubedash" [src]="source" class="kube-dashboard"></iframe>
+<app-loading-page [isLoading]="isLoading$" text="Loading Kubernetes dashboard">
+  <iframe *ngIf="!(hasError$ | async) && source" #kubeDash (load)="iframeLoaded()" id="kubedash" [src]="source" class="kube-dashboard"></iframe>
+  <div class="kube-dashoard__error" *ngIf="hasError$ | async">
+    <app-no-content-message *ngIf="errorMsg$ | async as message" icon="warning" [hidden]="!message" [firstLine]="message.firstLine" [secondLine]="message.secondLine">
+    </app-no-content-message>
+    <a [routerLink]="configUrl()">Check Dashboard Configuration</a>
+  </div>
 </app-loading-page>
-
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.scss b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.scss
index ff32c05101..83bde95157 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.scss
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.scss
@@ -13,3 +13,9 @@
   display: inline;
   font-size: 16px;
 }
+
+.kube-dashoard__error {
+  align-items: center;
+  display: flex;
+  flex-direction: column;
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
index 9ab6fd93a1..204a73279e 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
@@ -8,6 +8,7 @@ import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-h
 import { BaseKubeGuid } from '../kubernetes-page.types';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
 import { KubernetesService } from '../services/kubernetes.service';
+import { EndpointMissingMessageParts } from '../../../shared/components/endpoints-missing/endpoints-missing.component';
 
 @Component({
   selector: 'app-kubernetes-dashboard',
@@ -44,31 +45,27 @@ export class KubernetesDashboardTabComponent implements OnInit {
   }
 
   source: SafeResourceUrl;
+  href = '';
   isLoading$ = new BehaviorSubject<boolean>(true);
+  hasError$ = new BehaviorSubject<boolean>(false);
   expanded = false;
 
-  searchTerms: any;
-
-  href = '';
-
+  private loadCheckTries = 0;
   private haveSetupEventLister = false;
   private hasIframeLoaded = false;
-
   public breadcrumbs$: Observable<IHeaderBreadcrumb[]>;
 
+  public errorMsg$ = new BehaviorSubject<EndpointMissingMessageParts>({} as EndpointMissingMessageParts);
+
   constructor(public kubeEndpointService: KubernetesEndpointService, private sanitizer: DomSanitizer, public renderer: Renderer2) { }
 
   ngOnInit() {
     const guid = this.kubeEndpointService.baseKube.guid;
-
     let href = window.location.href;
     const index = href.indexOf('dashboard');
     href = href.substr(index + 9);
-    // console.log(href);
     this.href = href;
-    this.source = this.sanitizer.bypassSecurityTrustResourceUrl(`/pp/v1/kubedash/ui/${guid}/`);
-    // console.log(window.location);
-
+    this.source = this.sanitizer.bypassSecurityTrustResourceUrl(`/pp/v1/kubedash/${guid}/login`);
     this.breadcrumbs$ = this.kubeEndpointService.endpoint$.pipe(
       map(endpoint => ([{
         breadcrumbs: [
@@ -79,14 +76,55 @@ export class KubernetesDashboardTabComponent implements OnInit {
     );
   }
 
+  public configUrl(): string {
+    const guid = this.kubeEndpointService.baseKube.guid;
+    return `/kubernetes/${guid}/dashboard-config`;
+  }
+
   iframeLoaded() {
+    if (!this.kubeDash) {
+      return;
+    }
+    this.loadCheckTries = 20;
+    this.checkPageLoad();
+    this.hasIframeLoaded = true;
+    this.setupEventListener();
+  }
+
+  checkPageLoad() {
+    let hasLoaded = false;
+    const errMsg = this.getStratosError();
+    if (!!errMsg) {
+      hasLoaded = true;
+      this.errorMsg$.next({
+        firstLine: errMsg,
+        secondLine: { text: ''}
+      });
+      this.hasError$.next(true);
+    }
+
     const kdToolbar = this.getKubeDashToolbar();
     if (!!kdToolbar) {
+      hasLoaded = true;
+    }
+    if (this.getKubeDashLogin()) {
+      hasLoaded = true;
+    }
+
+    if (!hasLoaded) {
+      this.loadCheckTries--;
+      if (this.loadCheckTries > 0) {
+        setTimeout(() => this.checkPageLoad(), 350);
+      } else {
+        hasLoaded = true;
+      }
+    }
+
+    if (hasLoaded) {
       this.isLoading$.next(false);
       this.toggle(false);
     }
-    this.hasIframeLoaded = true;
-    this.setupEventListener();
+
   }
 
   setupEventListener() {
@@ -95,36 +133,22 @@ export class KubernetesDashboardTabComponent implements OnInit {
     }
 
     this.haveSetupEventLister = true;
-
     const iframeWindow = this.kubeDash.nativeElement.contentWindow;
-    // console.log('iframe loaded');
-
     iframeWindow.addEventListener('hashchange', () => {
-      // Object.defineProperty( event, "oldURL", { enumerable: true, configurable: true, value: lastURL } );
-      // Object.defineProperty( event, "newURL", { enumerable: true, configurable: true, value: document.URL } );
-      // lastURL = document.URL;
-      // console.log('iframe hashchange');
-      // console.log(event);
-
-      // console.log(iframeWindow.location);
-
-      // console.log(this.href);
-
       if (this.href) {
         let h2 = decodeURI(this.href);
         h2 = decodeURI(h2);
 
         h2 = h2.replace('%3F', '?');
         h2 = h2.replace('%3D', '=');
-        // console.log(h2);
         h2 = '#!' + h2;
-        // console.log('Changing location hash');
         iframeWindow.location.hash = h2;
         this.href = '';
       }
     });
   }
 
+  // toggle visibility of the kube dashboard header bar
   toggle(val: boolean) {
     if (val !== undefined) {
       this.expanded = val;
@@ -140,6 +164,7 @@ export class KubernetesDashboardTabComponent implements OnInit {
     }
   }
 
+  // Can we detect the dashboard's toolbar (implies dashboard UI has loaded)
   private getKubeDashToolbar() {
     if (this.kubeDash &&
       this.kubeDash.nativeElement &&
@@ -147,11 +172,40 @@ export class KubernetesDashboardTabComponent implements OnInit {
       this.kubeDash.nativeElement.contentDocument.getElementsByTagName) {
       const kdChrome = this.kubeDash.nativeElement.contentDocument.getElementsByTagName('kd-chrome')[0];
       if (kdChrome) {
-        const kdToolbar = kdChrome.getElementsByTagName('md-toolbar')[0];
-        return kdToolbar;
+        const kdToolbar = kdChrome.getElementsByTagName('mat-toolbar')[0];
+        if (kdToolbar) {
+          return kdToolbar;
+        }
+        const mdToolbar = kdChrome.getElementsByTagName('md-toolbar')[0];
+        return mdToolbar;
       }
     }
     return null;
   }
 
+  // Can we detect the dashboard login page?
+  private getKubeDashLogin(): boolean {
+    if (this.kubeDash &&
+      this.kubeDash.nativeElement &&
+      this.kubeDash.nativeElement.contentDocument &&
+      this.kubeDash.nativeElement.contentDocument.getElementsByTagName) {
+      const kdLogin = this.kubeDash.nativeElement.contentDocument.getElementsByTagName('kd-login');
+      return kdLogin.length === 1;
+    }
+    return false;
+  }
+
+  // Can we detect a Stratos error message page?
+  private getStratosError(): string {
+    if (this.kubeDash &&
+      this.kubeDash.nativeElement &&
+      this.kubeDash.nativeElement.contentDocument &&
+      this.kubeDash.nativeElement.contentDocument.getElementsByTagName) {
+      const stratosError = this.kubeDash.nativeElement.contentDocument.getElementsByTagName('stratos-error');
+      if (stratosError.length === 1) {
+        return stratosError[0].innerText;
+      }
+    }
+    return null;
+  }
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
index e9f7dbfad8..9edcff7d65 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
@@ -93,6 +93,7 @@ import { KubernetesNamespacesTabComponent } from './tabs/kubernetes-namespaces-t
 import { KubernetesNodesTabComponent } from './tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component';
 import { KubernetesPodsTabComponent } from './tabs/kubernetes-pods-tab/kubernetes-pods-tab.component';
 import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kubernetes-summary.component';
+import { KubedashConfigurationComponent } from './kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component';
 
 
 
@@ -151,7 +152,8 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     KubeNamespacePodCountComponent,
     PodNameLinkComponent,
     NodePodCountComponent,
-    KubernetesServicePortsComponent
+    KubernetesServicePortsComponent,
+    KubedashConfigurationComponent,
   ],
   exports: [
     KubernetesServicePortsComponent
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts
index f2d3839458..83f22925ae 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts
@@ -26,6 +26,7 @@ import { KubernetesNamespacesTabComponent } from './tabs/kubernetes-namespaces-t
 import { KubernetesNodesTabComponent } from './tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component';
 import { KubernetesPodsTabComponent } from './tabs/kubernetes-pods-tab/kubernetes-pods-tab.component';
 import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kubernetes-summary.component';
+import { KubedashConfigurationComponent } from './kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component';
 
 const kubernetes: Routes = [{
   path: '',
@@ -155,6 +156,10 @@ const kubernetes: Routes = [{
       }
     }
   ]
+},
+{
+  path: ':endpointId/dashboard-config',
+  component: KubedashConfigurationComponent,
 }
 ];
 
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
index dd2e4c7ccd..e4d58e331e 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
@@ -28,6 +28,7 @@ import {
   KubePaginationAction,
 } from '../store/kubernetes.actions';
 import { KubeDashboardStatus } from '../store/kubernetes.effects';
+import { AuthState } from '../../../../../store/src/reducers/auth.reducer';
 
 @Injectable()
 export class KubernetesEndpointService {
@@ -43,6 +44,10 @@ export class KubernetesEndpointService {
   services$: Observable<KubeService[]>;
   pods$: Observable<KubernetesPod[]>;
   kubeDashboardEnabled$: Observable<boolean>;
+  kubeDashboardVersion$: Observable<string>;
+  kubeDashboardStatus$: Observable<KubeDashboardStatus>;
+  kubeDashboardLabel$: Observable<string>;
+  kubeDashboardConfigured$: Observable<boolean>;
 
   constructor(
     public baseKube: BaseKubeGuid,
@@ -88,23 +93,50 @@ export class KubernetesEndpointService {
       kubernetesServicesEntityType
     );
 
-    const kubeDashboardEnabled$ = this.store.select('auth').pipe(
+    this.kubeDashboardEnabled$ = this.store.select('auth').pipe(
       filter(auth => !!auth.sessionData['plugin-config']),
-      map(auth => auth.sessionData['plugin-config'].kubeDashboardEnabled === 'true'),
-      first(),
+      map(auth => auth.sessionData['plugin-config'].kubeDashboardEnabled === 'true')
     );
 
-    this.kubeDashboardEnabled$ = kubeDashboardEnabled$.pipe(
+    this.kubeDashboardStatus$ = this.kubeDashboardEnabled$.pipe(
       filter(enabled => enabled),
       switchMap(() => this.entityServiceFactory.create<KubeDashboardStatus>(
-        this.kubeGuid,
-        new GetKubernetesDashboard(this.kubeGuid),
-      ).waitForEntity$.pipe(map(status => status.entity.installed))
-      ),
-      startWith(false),
+      kubernetesDashboardSchemaKey,
+      entityFactory(kubernetesDashboardSchemaKey),
+      this.kubeGuid,
+      new GetKubernetesDashboard(this.kubeGuid),
+      false
+    ).waitForEntity$.pipe(map(status => status.entity)).pipe(
+      startWith(null),
+    )
+    ));
+
+    this.kubeDashboardConfigured$ = this.kubeDashboardStatus$.pipe(
+      filter(status => !!status),
+      map(status => {
+        return status.installed && !!status.serviceAccount && !!status.service;
+      }),
+      startWith(false)
+    );
+
+    this.kubeDashboardLabel$ = this.kubeDashboardStatus$.pipe(
+      filter(status => !!status),
+      map(status => {
+        if (!status.installed) {
+          return 'Not installed';
+        } else if (!status.serviceAccount) {
+          return 'Not configured';
+        } else {
+          return status.version;
+        }
+      })
     );
   }
 
+  public refreshKubernetesDashboardStatus() {
+    this.store.dispatch(new GetKubernetesDashboard(this.kubeGuid));
+  }
+
   private getObservable<T>(paginationAction: KubePaginationAction, schemaKey: string): Observable<T[]> {
     return getPaginationObservables<T>({
       store: this.store,
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 53b32d5afa..7441d75dcc 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
@@ -70,9 +70,28 @@ import {
   KubePaginationAction,
 } from './kubernetes.actions';
 
+export interface KubeDashboardContainer {
+  name: string;
+  image: string;
+}
+
 export interface KubeDashboardStatus {
   guid: string;
   installed: boolean;
+  stratosInstalled: boolean;
+  running: boolean;
+  pod: {
+    spec: {
+      containers: KubeDashboardContainer[]
+    }
+  };
+  version: string;
+  service: {
+    namespace: string;
+    name: string;
+    scheme: string;
+  };
+  serviceAccount: any;
 }
 
 type GetID<T> = (p: T) => string;
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
index 7198ba3c46..6d1a95a961 100644
--- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
@@ -1,6 +1,6 @@
 <div>
   <app-page-sub-nav>
-    <button *ngIf="kubeEndpointService.kubeDashboardEnabled$ | async" [routerLink]="dashboardLink" mat-button>
+    <button *ngIf="kubeEndpointService.kubeDashboardConfigured$ | async" [routerLink]="dashboardLink" mat-button>
       <mat-icon>dashboard</mat-icon>
       <span class="kube-details__button">View Dashboard</span>
     </button>
@@ -8,8 +8,7 @@
 
   <app-loading-page [isLoading]="isLoading$" [text]="'Retrieving Kubernetes details'">
     <app-entity-summary-title *ngIf="endpointDetails$ | async as details" [imagePath]="details.imagePath"
-      [title]="details.name" [subTitle]="details.label"
-      info="Kubernetes Node Version: {{ (kubeNodeVersions$ | async) }}">
+      [title]="details.name" [subTitle]="details.label">
       <app-tile-grid class="kube-details__metrics" fit="true">
         <app-tile-group>
           <app-tile>
@@ -29,6 +28,24 @@
           </app-tile>
         </app-tile-group>
       </app-tile-grid>
+
+      <div class="app-metadata">
+        <div class="app-metadata__two-cols">
+          <app-metadata-item label="Node version">
+            {{ (kubeNodeVersions$ | async) }}
+          </app-metadata-item>
+        </div>
+        <div class="app-metadata__two-cols" *ngIf="kubeEndpointService.kubeDashboardEnabled$ | async">
+          <app-metadata-item label="Kubernetes Dashboard">
+            <div class="kube-details__dashboard-version">
+            <div *ngIf="(kubeEndpointService.kubeDashboardStatus$ | async) !== null" class="kube-details__dashboard-version-label">{{ (kubeEndpointService.kubeDashboardLabel$ | async) }}</div>
+            <button class="kube-details__dashboard-configure" *ngIf="(kubeEndpointService.kubeDashboardStatus$ | async) !== null" color="primary" mat-button (click)="configureDashboard()">Configure</button>
+            <mat-spinner *ngIf="(kubeEndpointService.kubeDashboardStatus$ | async) === null" diameter="20"></mat-spinner>
+          </div>
+          </app-metadata-item>
+        </div>
+      </div>
+
       <div class="kube-details__graphs">
         <div class="kube-details__graphs-group">
           <div class="kube-details__graph">
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss
index b453016970..2cdb6fe2cd 100644
--- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss
+++ b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss
@@ -30,4 +30,31 @@
   &__button {
     margin-left: 4px;
   }
+  &__dashboard-version {
+    align-items: baseline;
+    display: flex;
+  }
+  &__dashboard-version-label {
+    margin-right: 10px;
+  }
+  &__dashboard-configure {
+    line-height: initial;
+    margin: 0;
+    min-width: auto;
+    padding: 0;    
+  }
+}
+
+.app-metadata {
+  display: flex;
+  flex-direction: row;
+  margin-left: 12px;
+
+  &__two-cols {
+    margin-right: 20px;
+
+    app-metadata-item:first-child {
+      margin-top: 0;
+    }
+  }
 }
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 fba869bcd4..2a5aca389e 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
@@ -20,6 +20,7 @@ import { GetKubernetesNodes, GetKubernetesPods } from '../../store/kubernetes.ac
 import { KubernetesNode } from './../../../../../../../../../custom-src/frontend/app/custom/kubernetes/store/kube.types';
 import { KubernetesPod } from './../../store/kube.types';
 import { GetKubernetesApps } from './../../store/kubernetes.actions';
+import { Router } from '@angular/router';
 
 interface IValueLabels {
   usedLabel?: string;
@@ -101,7 +102,8 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
     public httpClient: HttpClient,
     public paginationMonitorFactory: PaginationMonitorFactory,
     private store: Store<AppState>,
-    private ngZone: NgZone
+    private ngZone: NgZone,
+    private router: Router,
   ) {
   }
 
@@ -197,6 +199,11 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
     );
   }
 
+  // Go the Kubernetes Dashboard configuration page
+  public configureDashboard() {
+    const guid = this.kubeEndpointService.baseKube.guid;
+    this.router.navigate([`/kubernetes/${guid}/dashboard-config`]);
+  }
 
   ngOnInit() {
     const guid = this.kubeEndpointService.baseKube.guid;
diff --git a/custom-src/stratos.yaml b/custom-src/stratos.yaml
index b45c0ea693..6500a6eb26 100644
--- a/custom-src/stratos.yaml
+++ b/custom-src/stratos.yaml
@@ -1,2 +1,2 @@
 title: SUSE Stratos Console
-productVersion: 1.5.1
+productVersion: 2.0.0
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index 9503103673..cf8522bfde 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -66,7 +66,7 @@ console:
   userInviteSubject: ~
 
   # Whether to perform the volume migration job on install/upgrade (migrate to secrets)
-  migrateVolumes: true
+  migrateVolumes: false
   
   # Enable/disable Tech Preview
   techPreview: false
diff --git a/src/frontend/packages/core/src/shared/components/card-progress-overlay/card-progress-overlay.component.html b/src/frontend/packages/core/src/shared/components/card-progress-overlay/card-progress-overlay.component.html
new file mode 100644
index 0000000000..575c957829
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/card-progress-overlay/card-progress-overlay.component.html
@@ -0,0 +1,6 @@
+<div *ngIf="busy | async" class="mat-card__progress-overlay">
+  <div class="mat-card__progress-overlay-inner">
+    <div class="mat-card__progress-text">{{ label }}</div>
+    <mat-progress-bar mode="indeterminate"></mat-progress-bar>
+  </div>
+</div>
diff --git a/src/frontend/packages/core/src/shared/components/card-progress-overlay/card-progress-overlay.component.scss b/src/frontend/packages/core/src/shared/components/card-progress-overlay/card-progress-overlay.component.scss
new file mode 100644
index 0000000000..e6308bd0c3
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/card-progress-overlay/card-progress-overlay.component.scss
@@ -0,0 +1,21 @@
+.mat-card {
+  &__progress-overlay {
+    align-items: center;
+    bottom: 0;
+    display: flex;
+    justify-content: center;
+    left: 0;
+    position: absolute;
+    right: 0;
+    top: 0;
+
+    &-inner {
+      width: 25%;
+    }
+  }
+
+  &__progress-text {
+    margin-bottom: 5px;
+    text-align: center;
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/card-progress-overlay/card-progress-overlay.component.spec.ts b/src/frontend/packages/core/src/shared/components/card-progress-overlay/card-progress-overlay.component.spec.ts
new file mode 100644
index 0000000000..8acfed0852
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/card-progress-overlay/card-progress-overlay.component.spec.ts
@@ -0,0 +1,29 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CardProgressOverlayComponent } from './card-progress-overlay.component';
+import { CoreModule } from '../../../core/core.module';
+
+describe('CardProgressOverlayComponent', () => {
+  let component: CardProgressOverlayComponent;
+  let fixture: ComponentFixture<CardProgressOverlayComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        CoreModule,
+      ],
+      declarations: [ CardProgressOverlayComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CardProgressOverlayComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/core/src/shared/components/card-progress-overlay/card-progress-overlay.component.theme.scss b/src/frontend/packages/core/src/shared/components/card-progress-overlay/card-progress-overlay.component.theme.scss
new file mode 100644
index 0000000000..868fa619be
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/card-progress-overlay/card-progress-overlay.component.theme.scss
@@ -0,0 +1,9 @@
+@import '~@angular/material/theming';
+@mixin app-card-progerss-overlay-theme($theme, $app-theme) {
+  $background: map-get($theme, background);
+
+  .mat-card__progress-overlay {
+    background: mat-color($background, card);
+    z-index: 100;
+  }
+}
diff --git a/src/frontend/packages/core/src/shared/components/card-progress-overlay/card-progress-overlay.component.ts b/src/frontend/packages/core/src/shared/components/card-progress-overlay/card-progress-overlay.component.ts
new file mode 100644
index 0000000000..93ceb8803d
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/card-progress-overlay/card-progress-overlay.component.ts
@@ -0,0 +1,15 @@
+import { Component, Input } from '@angular/core';
+import { Observable } from 'rxjs';
+
+@Component({
+  selector: 'app-card-progress-overlay',
+  templateUrl: './card-progress-overlay.component.html',
+  styleUrls: ['./card-progress-overlay.component.scss']
+})
+export class CardProgressOverlayComponent {
+
+  @Input() label: string;
+
+  @Input() busy: Observable<boolean>;
+
+}
diff --git a/src/jetstream/datastore/20200117152200_SesssionData.go b/src/jetstream/datastore/20200117152200_SesssionData.go
new file mode 100644
index 0000000000..6b52943583
--- /dev/null
+++ b/src/jetstream/datastore/20200117152200_SesssionData.go
@@ -0,0 +1,22 @@
+package datastore
+
+import (
+	"database/sql"
+
+	"bitbucket.org/liamstask/goose/lib/goose"
+)
+
+func init() {
+	RegisterMigration(20200117152200, "SesssionData", func(txn *sql.Tx, conf *goose.DBConf) error {
+		sessionDataTable := "CREATE TABLE IF NOT EXISTS session_data ("
+		sessionDataTable += "  session           VARCHAR(255)      NOT NULL,"
+		sessionDataTable += "  groupName         VARCHAR(32)       NOT NULL,"
+		sessionDataTable += "  name              VARCHAR(64)       NOT NULL,"
+		sessionDataTable += "  value             TEXT              NOT NULL,"
+		sessionDataTable += "  keep_on_expire    BOOLEAN           NOT NULL DEFAULT FALSE,"
+		sessionDataTable += "  expired           BOOLEAN           NOT NULL DEFAULT FALSE);"
+
+		_, err := txn.Exec(sessionDataTable)
+		return err
+	})
+}
diff --git a/src/jetstream/main.go b/src/jetstream/main.go
index 421c45bf17..7b7cb5b81d 100644
--- a/src/jetstream/main.go
+++ b/src/jetstream/main.go
@@ -40,6 +40,7 @@ import (
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces/config"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/localusers"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/sessiondata"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/tokens"
 )
 
@@ -66,19 +67,6 @@ var (
 	httpClientMutatingSkipSSL = http.Client{}
 )
 
-func cleanup(dbc *sql.DB, ss HttpSessionStore) {
-	// Print a newline - if you pressed CTRL+C, the alighment will be slightly out, so start a new line first
-	fmt.Println()
-	log.Info("Attempting to shut down gracefully...")
-	log.Info(`... Closing databaseConnectionPool`)
-	dbc.Close()
-	log.Info(`... Closing sessionStore`)
-	ss.Close()
-	log.Info(`.. Stopping sessionStore cleanup`)
-	ss.StopCleanup(ss.Cleanup(time.Minute * 5))
-	log.Info("Graceful shut down complete")
-}
-
 // getEnvironmentLookup return a search path for configuration settings
 func getEnvironmentLookup() *env.VarSet {
 	// Make environment lookup
@@ -190,6 +178,7 @@ func main() {
 	tokens.InitRepositoryProvider(dc.DatabaseProvider)
 	console_config.InitRepositoryProvider(dc.DatabaseProvider)
 	localusers.InitRepositoryProvider(dc.DatabaseProvider)
+	sessiondata.InitRepositoryProvider(dc.DatabaseProvider)
 
 	// Establish a Postgresql connection pool
 	var databaseConnectionPool *sql.DB
@@ -244,15 +233,48 @@ func main() {
 	}()
 	log.Info("Session store initialized.")
 
+	// Create session data store
+	sessionDataStore, err := sessiondata.NewPostgresSessionDataRepository(databaseConnectionPool)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	// Session Data Store: Ensure the cleanup tick starts now (this will delete expired session data from the DB)
+	dataQuitCleanup, dataDoneCleanup := sessionDataStore.Cleanup(time.Minute * 3)
+	defer func() {
+		log.Info(`... Cleaning up session data store`)
+		sessionDataStore.StopCleanup(dataQuitCleanup, dataDoneCleanup)
+	}()
+	log.Info("Session data store initialized.")
+
 	// Setup the global interface for the proxy
 	portalProxy := newPortalProxy(portalConfig, databaseConnectionPool, sessionStore, sessionStoreOptions, envLookup)
+	portalProxy.SessionDataStore = sessionDataStore
 	log.Info("Initialization complete.")
 
 	c := make(chan os.Signal, 2)
 	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
 	go func() {
 		<-c
-		cleanup(databaseConnectionPool, sessionStore)
+		// Print a newline - if you pressed CTRL+C, the alighment will be slightly out, so start a new line first
+		fmt.Println()
+		log.Info("Attempting to shut down gracefully...")
+
+		// Database connection pool
+		log.Info(`... Closing database connection pool`)
+		databaseConnectionPool.Close()
+
+		// Session store
+		log.Info(`... Closing session store`)
+		sessionStore.Close()
+		log.Info(`... Stopping sessionStore cleanup`)
+		sessionStore.StopCleanup(quitCleanup, doneCleanup)
+
+		// Session Data Store
+		log.Info(`... Stopping sessiondata store cleanup`)
+		sessionDataStore.StopCleanup(dataQuitCleanup, dataDoneCleanup)
+
+		log.Info("Graceful shut down complete")
 		os.Exit(1)
 	}()
 
@@ -322,6 +344,11 @@ func (portalProxy *portalProxy) GetDatabaseConnection() *sql.DB {
 	return portalProxy.DatabaseConnectionPool
 }
 
+// GetSessionDataStore returns the store that can be used for extra session data
+func (portalProxy *portalProxy) GetSessionDataStore() interfaces.SessionDataStore {
+	return portalProxy.SessionDataStore
+}
+
 func (portalProxy *portalProxy) GetPlugin(name string) interface{} {
 	plugin := portalProxy.Plugins[name]
 	log.Warn(portalProxy.Plugins)
diff --git a/src/jetstream/middleware.go b/src/jetstream/middleware.go
index 0983457e66..ca47bd9f7e 100644
--- a/src/jetstream/middleware.go
+++ b/src/jetstream/middleware.go
@@ -103,6 +103,12 @@ func (p *portalProxy) xsrfMiddleware(h echo.HandlerFunc) echo.HandlerFunc {
 		if c.Request().Method == "GET" || c.Request().Method == "HEAD" {
 			return h(c)
 		}
+
+		// Routes registered with /apps are assumed to be web apps that do their own XSRF
+		if strings.HasPrefix(c.Request().URL.String(), "/pp/v1/apps/") {
+			return h(c)
+		}
+
 		errMsg := "Failed to get stored XSRF token from user session"
 		token, err := p.GetSessionStringValue(c, XSRFTokenSessionName)
 		if err == nil {
diff --git a/src/jetstream/passthrough.go b/src/jetstream/passthrough.go
index 786a3bbf9a..26f68144dd 100644
--- a/src/jetstream/passthrough.go
+++ b/src/jetstream/passthrough.go
@@ -471,6 +471,11 @@ func (p *portalProxy) doRequest(cnsiRequest *interfaces.CNSIRequest, done chan<-
 		req.Header.Set(longRunningTimeoutHeader, "true")
 	}
 
+	// If this is a long running request, add a header which we can use at request time to change the timeout
+	if cnsiRequest.LongRunning {
+		req.Header.Set(longRunningTimeoutHeader, "true")
+	}
+
 	// Find the auth provider for the auth type - default ot oauthflow
 	authHandler := p.GetAuthProvider(tokenRec.AuthType)
 	if authHandler.Handler != nil {
diff --git a/src/jetstream/plugins/kubernetes/dashboard/common.go b/src/jetstream/plugins/kubernetes/dashboard/common.go
new file mode 100644
index 0000000000..e8e99846ff
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/dashboard/common.go
@@ -0,0 +1,262 @@
+package dashboard
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"time"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	"github.com/labstack/echo"
+	log "github.com/sirupsen/logrus"
+
+	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
+	api "k8s.io/kubernetes/pkg/apis/core"
+	k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
+)
+
+const (
+	kubeDashSessionGroup       = "kubernetes-dashboard"
+	kubeDashSessionEndpointID  = "kubeDashSessionEndpointID"
+	kubeDashSessionNamespace   = "kubeDashSessionNamespace"
+	kubeDashSessionScheme      = "kubeDashSessionScheme"
+	kubeDashSessionServiceName = "kubeDashSessionServiceName"
+	kubeDashSessionToken       = "kubeDashSessionToken"
+
+	defaultFlushInterval = 200 * time.Millisecond
+)
+
+// ServiceInfo represents the information for the Dashboard Service
+// that we need to proxy the service
+type ServiceInfo struct {
+	Namespace   string `json:"namespace"`
+	ServiceName string `json:"name"`
+	Scheme      string `json:"scheme"`
+	StratosInstalled bool `json:"-"`
+}
+
+// StatusResponse is the response from the dashboard status check
+type StatusResponse struct {
+	Endpoint      string             `json:"guid"`
+	Installed     bool               `json:"installed"`
+	StratosInstalled bool `json:"stratosInstalled"`
+	Running       bool               `json:"running"`
+	Pod           *v1.Pod            `json:"pod"`
+	Version       string             `json:"version"`
+	Service       *ServiceInfo       `json:"service"`
+	HasToken      bool               `json:"tokenExists"`
+	ServiceAccont *v1.ServiceAccount `json:"serviceAccount"`
+	Token         string             `json:"-"`
+}
+
+// Determine if the specified Kube endpoint has the dashboard installed and ready
+func getKubeDashboardPod(p interfaces.PortalProxy, cnsiGUID, userGUID string, labelSelector string) (*v1.Pod, error) {
+	log.Debug("kubeDashboardStatus request")
+
+	response, err := p.DoProxySingleRequest(cnsiGUID, userGUID, "GET", "/api/v1/pods?labelSelector="+labelSelector, nil, nil)
+	if err != nil || response.StatusCode != 200 {
+		return nil, errors.New("Could not fetch pod list")
+	}
+
+	ok, list, err := tryDecodePodList(response.Response)
+	if !ok {
+		return nil, errors.New("Kube dashboard not installed - could not decode pod list")
+	}
+
+	if len(list.Items) == 0 {
+		return nil, errors.New("Kube dashboard not installed")
+	}
+
+	// Should just be one pod
+	if len(list.Items) > 1 {
+		return nil, errors.New("More than one Kubernetes Dashboard installation found")
+	}
+
+	pod := list.Items[0]
+	return &pod, nil
+}
+
+// Get the service for the kubernetes dashboard
+func getKubeDashboardService(p interfaces.PortalProxy, cnsiGUID, userGUID string, labelSelector string) (ServiceInfo, error) {
+	log.Debug("getKubeDashboardService request")
+
+	info := ServiceInfo{}
+	response, err := p.DoProxySingleRequest(cnsiGUID, userGUID, "GET", "/api/v1/services?labelSelector="+labelSelector, nil, nil)
+	if err != nil || response.StatusCode != 200 {
+		return info, errors.New("Could not fetch service list")
+	}
+
+	ok, list, err := tryDecodeServiceList(response.Response)
+	if !ok {
+		return info, errors.New("Kube dashboard not installed - could not decode service list")
+	}
+
+	if len(list.Items) == 0 {
+		return info, errors.New("Kube dashboard not installed")
+	}
+
+	// Should just be one pod
+	if len(list.Items) != 1 {
+		return info, errors.New("Kube dashboard not installed - too many pods")
+	}
+
+	svc := list.Items[0]
+	info.Namespace = svc.Namespace
+	info.ServiceName = svc.Name
+	info.Scheme = "http"
+
+	if len(svc.Spec.Ports) > 0 {
+		port := svc.Spec.Ports[0].Port
+		if port == 443 {
+			info.Scheme = "https"
+		}
+	}
+
+	// Check the labels on the service
+	info.StratosInstalled = hasAnnotation(svc.Labels, "stratos-role", "kubernetes-dashboard")
+
+	return info, nil
+}
+
+func getKubeDashboardServiceInfo(p interfaces.PortalProxy, endpointGUID, userGUID string) (ServiceInfo, error) {
+	svc, err := getKubeDashboardService(p, endpointGUID, userGUID, "app%3Dkubernetes-dashboard")
+	if err != nil {
+		svc, err = getKubeDashboardService(p, endpointGUID, userGUID, "k8s-app%3Dkubernetes-dashboard")
+	}
+	return svc, err
+}
+
+// Get the service account for the kubernetes dashboard
+func getKubeDashboardServiceAccount(p interfaces.PortalProxy, cnsiGUID, userGUID string, labelSelector string) (*v1.ServiceAccount, error) {
+	log.Debug("getKubeDashboardService request")
+
+	response, err := p.DoProxySingleRequest(cnsiGUID, userGUID, "GET", "/api/v1/serviceaccounts?labelSelector="+labelSelector, nil, nil)
+	if err != nil || response.StatusCode != 200 {
+		return nil, errors.New("Could not fetch service account list")
+	}
+
+	ok, list, err := tryDecodeServiceAccountList(response.Response)
+	if !ok {
+		return nil, errors.New("Could not find service account for Kubernetes dashboard")
+	}
+
+	if len(list.Items) == 0 {
+		return nil, errors.New("Could not find service account for Kubernetes dashboard")
+	}
+
+	// Should just be one pod
+	if len(list.Items) != 1 {
+		return nil, errors.New("Could not find service account for Kubernetes dashboard - too may accounts")
+	}
+
+	svcAccount := list.Items[0]
+	return &svcAccount, nil
+}
+
+// Get the service account for the kubernetes dashboard
+func getKubeDashboardSecretToken(p interfaces.PortalProxy, cnsiGUID, userGUID string, sa *v1.ServiceAccount) (string, error) {
+	log.Debug("getKubeDashboardSecretToken request")
+
+	namespace := sa.Namespace
+
+	if len(sa.Secrets) != 1 {
+		return "", errors.New("Service Account has too many secrets - expecting only 1")
+	}
+
+	// Need to get all secrets in the namespace and find the one with the correct annotation
+	apiURL := fmt.Sprintf("/api/v1/namespaces/%s/secrets", namespace)
+	response, err := p.DoProxySingleRequest(cnsiGUID, userGUID, "GET", apiURL, nil, nil)
+	if err != nil || response.StatusCode != 200 {
+		return "", errors.New("Could not find secrets for Kubernetes dashboard")
+	}
+
+	ok, secrets, err := tryDecodeSecrets(response.Response)
+	if !ok {
+		return "", errors.New("Could not find secrets for Kubernetes dashboard")
+	}
+
+	for _, secret := range secrets.Items {
+		if hasAnnotation(secret.Annotations, "kubernetes.io/service-account.name", sa.Name) {
+			if token, ok := secret.Data["token"]; ok {
+				return string(token), nil
+			}
+			return "", errors.New("Could not find token in the data for the Service Account Secret")
+		}
+	}
+
+	return "", errors.New("Could not find token for the Service Account")
+}
+
+// Check string map for the given (key, value) pair
+// Used to check if an annotation with the specified value if present on a resource
+func hasAnnotation(annotations map[string]string, key, value string) bool {
+	for k, v := range annotations {
+		if k == key && v == value {
+			return true
+		}
+	}
+	return false
+}
+
+func tryDecodePodList(data []byte) (parsed bool, pods v1.PodList, err error) {
+	obj, err := runtime.Decode(legacyscheme.Codecs.UniversalDecoder(), data)
+	if err != nil {
+		return false, pods, err
+	}
+
+	newPods, ok := obj.(*api.PodList)
+	// Check whether the object could be converted to list of pods.
+	if !ok {
+		err = fmt.Errorf("invalid pods list: %#v", obj)
+		return false, pods, err
+	}
+
+	v1Pods := &v1.PodList{}
+	if err := k8s_api_v1.Convert_core_PodList_To_v1_PodList(newPods, v1Pods, nil); err != nil {
+		return true, pods, err
+	}
+	return true, *v1Pods, err
+}
+
+func tryDecodeServiceList(data []byte) (bool, v1.ServiceList, error) {
+	var svcs v1.ServiceList
+	var err error
+
+	err = json.Unmarshal(data, &svcs)
+	if err != nil {
+		return false, svcs, err
+	}
+	return true, svcs, err
+}
+
+func tryDecodeServiceAccountList(data []byte) (bool, v1.ServiceAccountList, error) {
+	var svcAccounts v1.ServiceAccountList
+	var err error
+
+	err = json.Unmarshal(data, &svcAccounts)
+	if err != nil {
+		return false, svcAccounts, err
+	}
+	return true, svcAccounts, err
+}
+
+func tryDecodeSecrets(data []byte) (bool, v1.SecretList, error) {
+	var secrets v1.SecretList
+	var err error
+
+	err = json.Unmarshal(data, &secrets)
+	if err != nil {
+		return false, secrets, err
+	}
+	return true, secrets, err
+}
+
+// Send an error page that will get loaded into the IFRAME and the onload handler will detect
+// it and show a Stratos error message
+func sendErrorPage(c echo.Context, msg string) error {
+	html := fmt.Sprintf("<html><body><stratos-error>%s</stratos-error></body></html>", msg)
+	c.Response().Write([]byte(html))
+	return nil
+}
diff --git a/src/jetstream/plugins/kubernetes/dashboard/configure.go b/src/jetstream/plugins/kubernetes/dashboard/configure.go
new file mode 100644
index 0000000000..41bcafae81
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/dashboard/configure.go
@@ -0,0 +1,243 @@
+package dashboard
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"strings"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	log "github.com/sirupsen/logrus"
+	"gopkg.in/yaml.v2"
+)
+
+const dashboardInstallYAMLDownloadURL = "https://raw.githubusercontent.com/kubernetes/dashboard/v2.0.0-rc2/aio/deploy/recommended.yaml"
+
+// Service Account definition - as per kube dashboard docs
+const serviceAccountDefinition = `{
+	"apiVersion": "v1",
+	"kind": "ServiceAccount",
+	"metadata": {
+		"name": "stratos-dashboard-user",
+		"namespace": "$NAMESPACE",
+		"labels": {
+			"stratos-role": "kubernetes-dashboard-user"
+		}
+	}
+}`
+
+// Cluster Role Binding definition - as per kube dashboard docs
+const clusterRoleBindingDefinition = `{
+	"apiVersion": "rbac.authorization.k8s.io/v1",
+	"kind": "ClusterRoleBinding",
+	"metadata": {
+		"name": "stratos-dashboard-user",
+		"labels": {
+			"stratos-role": "kubernetes-dashboard-user"
+		}
+	},
+	"roleRef": {
+		"apiGroup": "rbac.authorization.k8s.io",
+		"kind": "ClusterRole",
+		"name": "cluster-admin"
+	}, 
+	"subjects": [
+		{
+			"kind": "ServiceAccount",
+			"name": "stratos-dashboard-user",
+			"namespace": "$NAMESPACE"
+		}
+	]
+}`
+
+type apiVersionAndKind struct {
+	APIVersion string `json:"apiVersion"`
+	Kind       string `json:"kind"`
+}
+
+// CreateServiceAccount will create a service account for accessing the Kubernetes Dashboard
+func CreateServiceAccount(p interfaces.PortalProxy, endpointGUID, userGUID string) error {
+	log.Debug("CreateServiceAccount")
+
+	svc, err := getKubeDashboardServiceInfo(p, endpointGUID, userGUID)
+	if err != nil {
+		return err
+	}
+
+	namespace := svc.Namespace
+	target := fmt.Sprintf("api/v1/namespaces/%s/serviceaccounts", namespace)
+	headers := make(http.Header, 0)
+	headers.Set("Content-Type", "application/json")
+
+	response, err := p.DoProxySingleRequest(endpointGUID, userGUID, "POST", target, headers,
+		replaceNamespace(serviceAccountDefinition, namespace))
+	if err != nil {
+		return err
+	}
+
+	if response.StatusCode != 201 {
+		return fmt.Errorf("Unable to create Service Account - unexpected response from API: %d", response.StatusCode)
+	}
+
+	target = "/apis/rbac.authorization.k8s.io/v1/clusterrolebindings"
+	response, err = p.DoProxySingleRequest(endpointGUID, userGUID, "POST", target, headers,
+		replaceNamespace(clusterRoleBindingDefinition, namespace))
+	if err != nil {
+		return err
+	}
+
+	if response.StatusCode != 201 {
+		return fmt.Errorf("Unable to create Cluster Role Binding - unexpected response from API: %d", response.StatusCode)
+	}
+
+	return err
+}
+
+func replaceNamespace(definition, namespace string) []byte {
+	updated := strings.ReplaceAll(definition, "$NAMESPACE", namespace)
+	return []byte(updated)
+}
+
+// DeleteServiceAccount will delete the service account
+func DeleteServiceAccount(p interfaces.PortalProxy, endpointGUID, userGUID string) error {
+	log.Debug("DeleteServiceAccount")
+
+	svcAccount, err := getKubeDashboardServiceAccount(p, endpointGUID, userGUID, stratosServiceAccountSelector)
+	if err != nil {
+		return err
+	}
+
+	msg := ""
+	target := fmt.Sprintf("api/v1/namespaces/%s/serviceaccounts/%s", svcAccount.Namespace, svcAccount.Name)
+	response, err := p.DoProxySingleRequest(endpointGUID, userGUID, "DELETE", target, nil, nil)
+	msg = addErrorMessage(msg, "Unable to delete Service Account", response, err)
+
+	target = fmt.Sprintf("apis/rbac.authorization.k8s.io/v1/clusterrolebindings/%s", svcAccount.Name)
+	response, err = p.DoProxySingleRequest(endpointGUID, userGUID, "DELETE", target, nil, nil)
+	msg = addErrorMessage(msg, "Unable to delete Cluster Role Binding", response, err)
+
+	if len(msg) > 0 {
+		return errors.New(msg)
+	}
+
+	return nil
+}
+
+func addErrorMessage(msg, prefix string, response *interfaces.CNSIRequest, err error) string {
+	errMsg := ""
+	if err != nil {
+		errMsg = fmt.Sprintf("%s - Error: %v", prefix, err.Error())
+	} else if response.StatusCode != 200 {
+		errMsg = fmt.Sprintf("%s - unexpected response from API: %d", prefix, response.StatusCode)
+	}
+
+	if len(errMsg) > 0 {
+		if len(msg) > 0 {
+			return fmt.Sprintf("%s. %s", msg, errMsg)
+		}
+		return errMsg
+	}
+
+	return msg
+}
+
+// InstallDashboard will install the dashboard into a Kubernetes cluster
+func InstallDashboard(p interfaces.PortalProxy, endpointGUID, userGUID string) error {
+	// Download the Yaml for the dashboard
+	log.Debugf("InstallDashboardL %s", dashboardInstallYAMLDownloadURL)
+
+	http := p.GetHttpClient(false)
+	resp, err := http.Get(dashboardInstallYAMLDownloadURL)
+	if resp.StatusCode != 200 {
+		return fmt.Errorf("Could not download YAML to install the dashboard: %s", resp.Status)
+	}
+
+	defer resp.Body.Close()
+
+	// Read the entire body
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return fmt.Errorf("Could not read YAML to install the dashboard: %s", err.Error())
+	}
+
+	r := bytes.NewReader(body)
+	dec := yaml.NewDecoder(r)
+	var t interface{}
+	for dec.Decode(&t) == nil {
+		jsonDoc, err := YAMLToJSONWithLabel(t)
+		if err != nil {
+			return fmt.Errorf("Could not convert YAML to JSON during dashboard installation %s", err.Error())
+		}
+
+		info := &apiVersionAndKind{}
+		if err := json.Unmarshal(jsonDoc, info); err != nil {
+			return fmt.Errorf("Could not parse YAML during dashboard installation %s", err.Error())
+		}
+
+		// Now create the resource
+		var api, resource string
+		if info.APIVersion != "v1" {
+			api = fmt.Sprintf("apis/%s", info.APIVersion)
+		} else {
+			api = fmt.Sprintf("api/%s", info.APIVersion)
+		}
+
+		if isClusterAPI(info.Kind) {
+			if info.Kind == "Namespace" {
+				resource = fmt.Sprintf("api/v1/namespaces")
+			} else {
+				resource = fmt.Sprintf("%s/%ss", api, strings.ToLower(info.Kind))
+			}
+		} else {
+			resource = fmt.Sprintf("%s/namespaces/kubernetes-dashboard/%ss", api, strings.ToLower(info.Kind))
+		}
+
+		response, err := p.DoProxySingleRequest(endpointGUID, userGUID, "POST", resource, nil, jsonDoc)
+		if err != nil {
+			return err
+		}
+
+		if response.StatusCode != 201 {
+			// Don't fail if creation of a cluster-level resoures fails beacuse it already exists
+			if !(response.StatusCode == 409 && isClusterAPI(info.Kind)) {
+				return fmt.Errorf("Unable to delete %s - unexpected response from API: %d", info.Kind, response.StatusCode)
+			}
+		}
+	}
+
+	return nil
+}
+
+func isClusterAPI(api string) bool {
+	return strings.HasPrefix(api, "Cluster") || api == "Namespace"
+}
+
+// DeleteDashboard will delete the dashboard from Kubernetes cluster
+func DeleteDashboard(p interfaces.PortalProxy, endpointGUID, userGUID string) error {
+	log.Debug("DeleteDashboard")
+
+	// Delete the service
+	svc, err := getKubeDashboardServiceInfo(p, endpointGUID, userGUID)
+	if err == nil {
+		svcTarget := fmt.Sprintf("api/v1/namespaces/%s/services/%s", svc.Namespace, svc.ServiceName)
+		// Don't wory if this fails, it will get deleted when the namespace is deleted
+		// We delete it here specifically so we know that it has gone since this is what we use
+		// to determine if the Dashboard is installed
+		p.DoProxySingleRequest(endpointGUID, userGUID, "DELETE", svcTarget, nil, nil)
+	}
+
+	// Delete the service account
+	DeleteServiceAccount(p, endpointGUID, userGUID)
+
+	// Delete the namespace 'kubernetes-dashboard'
+	target := "api/v1/namespaces/kubernetes-dashboard?propagationPolicy=Background"
+	_, err = p.DoProxySingleRequest(endpointGUID, userGUID, "DELETE", target, nil, nil)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/src/jetstream/plugins/kubernetes/dashboard/login.go b/src/jetstream/plugins/kubernetes/dashboard/login.go
new file mode 100644
index 0000000000..a0a2cb7a73
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/dashboard/login.go
@@ -0,0 +1,101 @@
+package dashboard
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"net/url"
+
+	"github.com/labstack/echo"
+	log "github.com/sirupsen/logrus"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+)
+
+type loginResponse struct {
+	Token string `json:"token"`
+}
+
+type loginOKResponse struct {
+	JWEToken string `json:"jweToken"`
+}
+
+// KubeDashboardLogin will check and log into the Kubernetes Dashboard then redirect to the Dashboard UI
+func KubeDashboardLogin(c echo.Context, p interfaces.PortalProxy) error {
+	log.Debug("kubeDashboardLogin request")
+
+	endpointGUID := c.Param("guid")
+	userGUID := c.Get("user_id").(string)
+
+	// Get the dashboard status
+	status, _ := KubeDashboardStatus(p, endpointGUID, userGUID, true)
+	if status.Service == nil {
+		return sendErrorPage(c, "Kubernetes Dashboard is not installed")
+	}
+
+	// Check that we have a token
+	if len(status.Token) == 0 {
+		return sendErrorPage(c, "Kubernetes Dashboard is not confiured - could not find Service Account Token")
+	}
+
+	// Now we need to log the user in
+	svc := status.Service
+	target := fmt.Sprintf("/api/v1/namespaces/%s/services/%s:%s:/proxy/api/v1/csrftoken/login", svc.Namespace, svc.Scheme, svc.ServiceName)
+	response, err := p.DoProxySingleRequest(endpointGUID, userGUID, "GET", target, nil, nil)
+	if err != nil || response.StatusCode != 200 {
+		return sendErrorPage(c, "Unable to login to Kubernetes Dashboard")
+	}
+
+	// Get the csrf token
+	token := &loginResponse{}
+	if err := json.Unmarshal(response.Response, token); err != nil {
+		return sendErrorPage(c, "Failed to login to Kubernetes Dashboard - invalid login response")
+	}
+
+	// Login
+	login := loginResponse{
+		Token: status.Token,
+	}
+	body, err := json.Marshal(login)
+	if err != nil {
+		return sendErrorPage(c, "Failed to set auth token for Kubernetes Dashboard")
+	}
+
+	target = fmt.Sprintf("/api/v1/namespaces/%s/services/%s:%s:/proxy/api/v1/login", svc.Namespace, svc.Scheme, svc.ServiceName)
+	headers := make(http.Header)
+	headers.Set("X-CSRF-TOKEN", token.Token)
+	headers.Set("Content-Type", "application/json")
+
+	response, err = p.DoProxySingleRequest(endpointGUID, userGUID, "POST", target, headers, body)
+	if err != nil || response.StatusCode != 200 {
+		return sendErrorPage(c, "Failed to login to Kubernetes Dashboard")
+	}
+
+	// Get the csrf token
+	jweToken := &loginOKResponse{}
+	if err := json.Unmarshal(response.Response, jweToken); err != nil {
+		return sendErrorPage(c, "Failed to login to Kubernetes Dashboard - invalid login response")
+	}
+
+	session, err := p.GetSession(c)
+	if err != nil {
+		return sendErrorPage(c, "Failed to login to Kubernetes Dashboard - could not get Stratos Session")
+	}
+
+	// Need to cache the service information in the session to improve proxying performance
+	sessionValues := make(map[string]string)
+	sessionValues[kubeDashSessionEndpointID] = endpointGUID
+	sessionValues[kubeDashSessionNamespace] = svc.Namespace
+	sessionValues[kubeDashSessionScheme] = svc.Scheme
+	sessionValues[kubeDashSessionServiceName] = svc.ServiceName
+	sessionValues[kubeDashSessionToken] = url.QueryEscape(string(jweToken.JWEToken))
+
+	err = p.GetSessionDataStore().SetValues(session.ID, kubeDashSessionGroup, sessionValues, false)
+	if err != nil {
+		return sendErrorPage(c, "Failed to login to Kubernetes Dashboard - could not save Stratos Session data")
+	}
+
+	// Redirect to the kube dashboard proxy
+	redirectURL := fmt.Sprintf("/pp/v1/apps/kubedash/ui/%s/", endpointGUID)
+	return c.Redirect(http.StatusTemporaryRedirect, redirectURL)
+}
diff --git a/src/jetstream/plugins/kubernetes/dashboard/proxy.go b/src/jetstream/plugins/kubernetes/dashboard/proxy.go
new file mode 100644
index 0000000000..406638add6
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/dashboard/proxy.go
@@ -0,0 +1,137 @@
+package dashboard
+
+import (
+	"fmt"
+	"net/http"
+	"net/http/httputil"
+	"net/url"
+	"strings"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	"github.com/labstack/echo"
+	log "github.com/sirupsen/logrus"
+	utilnet "k8s.io/apimachinery/pkg/util/net"
+	"k8s.io/client-go/rest"
+)
+
+// KubeDashboardProxy proxies a request to the Kube Dash service using the K8S API
+func KubeDashboardProxy(c echo.Context, p interfaces.PortalProxy, config *rest.Config) error {
+	log.Debugf("KubeDashboardProxy request for: %s", c.Request().RequestURI)
+
+	cnsiGUID := c.Param("guid")
+	prefix := "/pp/v1/apps/kubedash/ui/" + cnsiGUID + "/"
+	path := c.Request().RequestURI[len(prefix):]
+
+	cnsiRecord, err := p.GetCNSIRecord(cnsiGUID)
+	if err != nil {
+		return sendErrorPage(c, "Failed to access Kubernetes Dashboard - could not find endpoint")
+	}
+
+	session, err := p.GetSession(c)
+	if err != nil {
+		return sendErrorPage(c, "Failed to access Kubernetes Dashboard - could not get Stratos Session")
+	}
+
+	var kubeDashEndpointID = ""
+	var token = ""
+	svc := ServiceInfo{}
+
+	sessionData, err := p.GetSessionDataStore().GetValues(session.ID, kubeDashSessionGroup)
+	if err != nil {
+		return sendErrorPage(c, "Failed to access to Kubernetes Dashboard - could not get Stratos Session data")
+	}
+
+	// We have to have cached the data we need via the /login endpoint
+	var errors = 0
+	var ok bool
+
+	if kubeDashEndpointID, ok = sessionData[kubeDashSessionEndpointID]; !ok {
+		errors = errors + 1
+	}
+
+	if svc.Namespace, ok = sessionData[kubeDashSessionNamespace]; !ok {
+		errors = errors + 1
+	}
+
+	if svc.Scheme, ok = sessionData[kubeDashSessionScheme]; !ok {
+		errors = errors + 1
+	}
+
+	if svc.ServiceName, ok = sessionData[kubeDashSessionServiceName]; !ok {
+		errors = errors + 1
+	}
+
+	if token, ok = sessionData[kubeDashSessionToken]; !ok {
+		errors = errors + 1
+	}
+
+	// The cached data must be all there and must be for the correct endpoint
+	if errors > 0 || kubeDashEndpointID != cnsiGUID {
+		return sendErrorPage(c, "Failed to access to Kubernetes Dashboard - session data invalid")
+	}
+
+	apiEndpoint := cnsiRecord.APIEndpoint
+	log.Debug(apiEndpoint)
+
+	target := fmt.Sprintf("%s/api/v1/namespaces/%s/services/%s:%s:/proxy/%s", apiEndpoint, svc.Namespace, svc.Scheme, svc.ServiceName, path)
+	log.Debug(target)
+	targetURL, _ := url.Parse(target)
+
+	req := c.Request()
+	w := c.Response().Writer
+
+	loc := targetURL
+	loc.RawQuery = req.URL.RawQuery
+
+	// If original request URL ended in '/', append a '/' at the end of the
+	// of the proxy URL
+	if !strings.HasSuffix(loc.Path, "/") && strings.HasSuffix(req.URL.Path, "/") {
+		loc.Path += "/"
+	}
+
+	// From pkg/genericapiserver/endpoints/handlers/proxy.go#ServeHTTP:
+	// Redirect requests with an empty path to a location that ends with a '/'
+	// This is essentially a hack for http://issue.k8s.io/4958.
+	// Note: Keep this code after tryUpgrade to not break that flow.
+	if len(loc.Path) == 0 {
+		log.Debug("Redirecting")
+		var queryPart string
+		if len(req.URL.RawQuery) > 0 {
+			queryPart = "?" + req.URL.RawQuery
+		}
+		w.Header().Set("Location", req.URL.Path+"/"+queryPart)
+		w.WriteHeader(http.StatusMovedPermanently)
+		return nil
+	}
+
+	transport, err := rest.TransportFor(config)
+	if err != nil {
+		return err
+	}
+
+	// WithContext creates a shallow clone of the request with the new context.
+	newReq := req.WithContext(req.Context())
+	newReq.Header = utilnet.CloneHeader(req.Header)
+	newReq.URL = loc
+
+	proxy := httputil.NewSingleHostReverseProxy(&url.URL{Scheme: loc.Scheme, Host: loc.Host})
+	proxy.Transport = transport
+	proxy.FlushInterval = defaultFlushInterval
+	proxy.ModifyResponse = func(response *http.Response) error {
+		log.Debugf("Got proxy response for: %s (Status: %s)", loc.String(), response.StatusCode)
+		// For the root page, set the session cookie so that the user is automatically logged in from
+		// the login we did manually
+		if len(path) == 0 {
+			// TODO: Check the value for the cookie header - kube dash may well update with the value
+			// that it wants to use
+			cookie := fmt.Sprintf("jweToken=%s; Max-Age=36000", token)
+			response.Header.Set("Set-Cookie", cookie)
+		}
+		return nil
+	}
+
+	// Proxy the request
+	proxy.ServeHTTP(w, newReq)
+
+	return nil
+}
diff --git a/src/jetstream/plugins/kubernetes/dashboard/status.go b/src/jetstream/plugins/kubernetes/dashboard/status.go
new file mode 100644
index 0000000000..d8f844bae5
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/dashboard/status.go
@@ -0,0 +1,53 @@
+package dashboard
+
+import (
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+)
+
+const stratosServiceAccountSelector = "stratos-role%3Dkubernetes-dashboard-user"
+
+// KubeDashboardStatus will determine if the specified Kube endpoint has the dashboard installed and ready
+func KubeDashboardStatus(p interfaces.PortalProxy, endpointGUID, userGUID string, includeToken bool) (*StatusResponse, error) {
+
+	status := &StatusResponse{
+		Endpoint:  endpointGUID,
+		Installed: false,
+		Running:   false,
+		HasToken:  false,
+		StratosInstalled: false,
+	}
+
+	pod, err := getKubeDashboardPod(p, endpointGUID, userGUID, "app%3Dkubernetes-dashboard")
+	if err != nil {
+		pod, err = getKubeDashboardPod(p, endpointGUID, userGUID, "k8s-app%3Dkubernetes-dashboard")
+	}
+
+	status.Pod = pod
+	if err == nil {
+		status.Installed = true
+		status.Running = (pod.Status.Phase == "Running")
+
+		// Get the image name
+		if len(pod.Spec.Containers) == 1 {
+			status.Version = pod.Spec.Containers[0].Image
+		}
+	}
+
+	svc, err := getKubeDashboardServiceInfo(p, endpointGUID, userGUID)
+	if err == nil {
+		status.Service = &svc
+		status.StratosInstalled = svc.StratosInstalled
+	}
+
+	svcAccount, err := getKubeDashboardServiceAccount(p, endpointGUID, userGUID, stratosServiceAccountSelector)
+	status.ServiceAccont = svcAccount
+	if err == nil && includeToken {
+		token, err := getKubeDashboardSecretToken(p, endpointGUID, userGUID, svcAccount)
+		if err == nil {
+			status.HasToken = true
+			status.Token = token
+		}
+	}
+
+	return status, nil
+}
diff --git a/src/jetstream/plugins/kubernetes/dashboard/yaml.go b/src/jetstream/plugins/kubernetes/dashboard/yaml.go
new file mode 100644
index 0000000000..92e0c9eabc
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/dashboard/yaml.go
@@ -0,0 +1,63 @@
+package dashboard
+
+import (
+	"encoding/json"
+	"strings"
+)
+
+func YAMLToJSONWithLabel(body interface{}) ([]byte, error) {
+	body = convert(body)
+	addLabel(body)
+	b, err := json.Marshal(body)
+	return b, err
+}
+
+func convert(i interface{}) interface{} {
+	switch x := i.(type) {
+	case map[interface{}]interface{}:
+		m2 := map[string]interface{}{}
+		for k, v := range x {
+			m2[k.(string)] = convert(v)
+		}
+		return m2
+	case []interface{}:
+		for i, v := range x {
+			x[i] = convert(v)
+		}
+	}
+	return i
+}
+
+func addLabel(resource interface{}) {
+	if labels, ok := getPath("metadata.labels", resource); ok {
+		labels["stratos-role"] = "kubernetes-dashboard"
+	} else {
+		// Resource may not have labels
+		if metadata, ok := getPath("metadata", resource); ok {
+			// Got metadata
+			labels := make(map[string]interface{})
+			labels["stratos-role"] = "kubernetes-dashboard"
+			metadata["labels"] = labels
+		}
+	}
+}
+
+func getPath(path string, resource interface{}) (map[string]interface{}, bool) {
+	paths := strings.Split(path, ".")
+	res := resource
+	for _, key := range paths {
+		if m, ok := res.(map[string]interface{}); ok {
+			if value, ok := m[key]; ok {
+				res = value
+			} else {
+				return make(map[string]interface{}), false
+			}
+		}
+	}
+
+	if m, ok := res.(map[string]interface{}); ok {
+		return m, true
+	}
+
+	return make(map[string]interface{}), false
+}
diff --git a/src/jetstream/plugins/kubernetes/kube_dashboard.go b/src/jetstream/plugins/kubernetes/kube_dashboard.go
index 76e9dc4c69..145d6c88d3 100644
--- a/src/jetstream/plugins/kubernetes/kube_dashboard.go
+++ b/src/jetstream/plugins/kubernetes/kube_dashboard.go
@@ -1,271 +1,68 @@
 package kubernetes
 
 import (
-	//"context"
 	"encoding/json"
 	"errors"
-	"fmt"
-	"net"
 	"net/http"
-	"net/http/httputil"
-	"net/url"
-	"strings"
-	"time"
 
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
-
-	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
-
-	utilnet "k8s.io/apimachinery/pkg/util/net"
-	"k8s.io/apimachinery/pkg/util/proxy"
 	"k8s.io/client-go/rest"
-	"k8s.io/client-go/transport"
 
-	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/kubernetes/pkg/api/legacyscheme"
-	api "k8s.io/kubernetes/pkg/apis/core"
-	k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/dashboard"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 )
 
-// GET /api/v1/namespaces/{namespace}/pods/{name}/proxy
-
-// http://localhost:8001/api/v1/namespaces/kube-system/services/https:kubernetes-dashboard:/proxy/.
-
-//GET /api/v1/namespaces/{namespace}/services/{name}/proxy
-
-const defaultFlushInterval = 200 * time.Millisecond
-
-type responder struct{}
-
-type dashboardStatusResponse struct {
-	Endpoint  string  `json:"guid"`
-	Installed bool    `json:"installed"`
-	Pod       *v1.Pod `json:"pod"`
-}
-
-func (r *responder) Error(w http.ResponseWriter, req *http.Request, err error) {
-	log.Errorf("Error while proxying request: %v", err)
-	http.Error(w, err.Error(), http.StatusInternalServerError)
-}
-
-// Get the config for the certificate authentication
+// Get the config for the endpoint
 func (k *KubernetesSpecification) getConfig(cnsiRecord *interfaces.CNSIRecord, tokenRecord *interfaces.TokenRecord) (*rest.Config, error) {
 	masterURL := cnsiRecord.APIEndpoint.String()
 	return k.GetConfigForEndpoint(masterURL, *tokenRecord)
 }
 
-// makeUpgradeTransport creates a transport that explicitly bypasses HTTP2 support
-// for proxy connections that must upgrade.
-func makeUpgradeTransport(config *rest.Config, keepalive time.Duration) (proxy.UpgradeRequestRoundTripper, error) {
-	transportConfig, err := config.TransportConfig()
-	if err != nil {
-		return nil, err
-	}
-	tlsConfig, err := transport.TLSConfigFor(transportConfig)
-	if err != nil {
-		return nil, err
-	}
-	rt := utilnet.SetOldTransportDefaults(&http.Transport{
-		TLSClientConfig: tlsConfig,
-		DialContext: (&net.Dialer{
-			Timeout:   30 * time.Second,
-			KeepAlive: keepalive,
-		}).DialContext,
-	})
-
-	upgrader, err := transport.HTTPWrappersForConfig(transportConfig, proxy.MirrorRequest)
-	if err != nil {
-		return nil, err
-	}
-	return proxy.NewUpgradeRequestRoundTripper(rt, upgrader), nil
-}
-
-// normalizeLocation returns the result of parsing the full URL, with scheme set to http if missing
-func normalizeLocation(location *url.URL) *url.URL {
-	normalized, _ := url.Parse(location.String())
-	if len(normalized.Scheme) == 0 {
-		normalized.Scheme = "http"
-	}
-	return normalized
-}
-
+// Proxy the request
 func (k *KubernetesSpecification) kubeDashboardProxy(c echo.Context) error {
 	log.Debug("kubeDashboardTest request")
-
-	//	c.Response().Header().Set("X-FRAME-OPTIONS", "sameorigin")
+	var p = k.portalProxy
 
 	cnsiGUID := c.Param("guid")
 	userGUID := c.Get("user_id").(string)
 
-	var p = k.portalProxy
-
-	log.Debug(c.Request().RequestURI)
-
-	var prefix = "/pp/v1/kubedash/ui/" + cnsiGUID + "/"
-
-	path := c.Request().RequestURI[len(prefix):]
-
-	log.Debug(path)
-
 	cnsiRecord, err := p.GetCNSIRecord(cnsiGUID)
 	if err != nil {
-		//return sendSSHError("Could not get endpoint information")
+		// TODO: Use sendError
 		return errors.New("Could not get endpoint information")
 	}
 
 	// Get token for this users
 	tokenRec, ok := p.GetCNSITokenRecord(cnsiGUID, userGUID)
 	if !ok {
-		//return sendSSHError("Could not get endpoint information")
+		// TODO: Use sendError
 		return errors.New("Could not get token")
 	}
 
-	log.Debug(tokenRec.AuthToken)
-	log.Debug(tokenRec.AuthType)
-
-	// Make the info call to the SSH endpoint info
-	// Currently this is not cached, so we must get it each time
-	apiEndpoint := cnsiRecord.APIEndpoint
-	log.Debug(apiEndpoint)
-	// target := fmt.Sprintf("%s/api/v1/namespaces/kube-system/services/https:kubernetes-dashboard:/proxy/", apiEndpoint)
-	//target := fmt.Sprintf("%s/api/v1/namespaces/kube-system/services/http:kubernetes-dashboard:/proxy/", apiEndpoint)
-	// target := http://localhost:8001/api/v1/namespaces/kube-system/services/kubernetes-dashboard/proxy
-
-	// TODO: Need namespace and whether it is https or http
-	target := fmt.Sprintf("%s/api/v1/namespaces/kube-system/services/http:kubernetes-dashboard:/proxy/%s", apiEndpoint, path)
-	log.Debug(target)
-	targetURL, _ := url.Parse(target)
-	targetURL = normalizeLocation(targetURL)
-
 	config, err := k.getConfig(&cnsiRecord, &tokenRec)
 	if err != nil {
+		// TODO: Use sendError
 		return errors.New("Could not get config for this auth type")
 	}
 
-	log.Info("Config")
-	log.Info(config.Host)
-	log.Info("Making request")
-	req := c.Request()
-	w := c.Response().Writer
-	log.Infof("%v+", req)
-
-	// if h.tryUpgrade(w, req) {
-	// 	return
-	// }
-	// if h.UpgradeRequired {
-	// 	h.Responder.Error(w, req, errors.NewBadRequest("Upgrade request required"))
-	// 	return
-	// }
-
-	loc := targetURL
-	loc.RawQuery = req.URL.RawQuery
-
-	// If original request URL ended in '/', append a '/' at the end of the
-	// of the proxy URL
-	if !strings.HasSuffix(loc.Path, "/") && strings.HasSuffix(req.URL.Path, "/") {
-		loc.Path += "/"
-	}
-
-	log.Info(loc)
-
-	// From pkg/genericapiserver/endpoints/handlers/proxy.go#ServeHTTP:
-	// Redirect requests with an empty path to a location that ends with a '/'
-	// This is essentially a hack for http://issue.k8s.io/4958.
-	// Note: Keep this code after tryUpgrade to not break that flow.
-	if len(loc.Path) == 0 {
-		log.Info("Redirecting")
-		var queryPart string
-		if len(req.URL.RawQuery) > 0 {
-			queryPart = "?" + req.URL.RawQuery
-		}
-		w.Header().Set("Location", req.URL.Path+"/"+queryPart)
-		w.WriteHeader(http.StatusMovedPermanently)
-		return nil
-	}
-
-	// if transport == nil || wrapTransport {
-	// 	h.Transport = h.defaultProxyTransport(req.URL, h.Transport)
-	// }
-
-	transport, err := rest.TransportFor(config)
-	if err != nil {
-		log.Info("Could not get transport")
-		return err
-	}
-
-	log.Info(transport)
-
-	// WithContext creates a shallow clone of the request with the new context.
-	newReq := req.WithContext(req.Context())
-	//newReq := req.WithContext(context.Background())
-	newReq.Header = utilnet.CloneHeader(req.Header)
-	newReq.URL = loc
-
-	// Set auth header so we log in if needed
-	if len(tokenRec.AuthToken) > 0 {
-		newReq.Header.Add("Authorization", "Bearer "+tokenRec.AuthToken)
-		log.Info("Setting auth header")
-	}
-
-	proxy := httputil.NewSingleHostReverseProxy(&url.URL{Scheme: loc.Scheme, Host: loc.Host})
-	proxy.Transport = transport
-	proxy.FlushInterval = defaultFlushInterval
-	proxy.ModifyResponse = func(response *http.Response) error {
-		log.Debugf("GOT PROXY RESPONSE: %s", loc.String())
-		log.Debugf("%d", response.StatusCode)
-		log.Debug(response.Header.Get("Content-Type"))
-
-		log.Debugf("%v+", response.Header)
-		response.Header.Del("X-FRAME-OPTIONS")
-		response.Header.Set("X-FRAME-OPTIONS", "sameorigin")
-		log.Debugf("%v+", response)
-		return nil
-	}
-
-	log.Errorf("Proxy: %s", target)
-
-	// Note that ServeHttp is non blocking and uses a go routine under the hood
-	proxy.ServeHTTP(w, newReq)
-
-	// We need this to be blocking
-
-	// select {
-	// case <-newReq.Context().Done():
-	// 	return newReq.Context().Err()
-	// }
-
-	log.Errorf("Finished proxying request: %s", target)
-
-	return nil
+	return dashboard.KubeDashboardProxy(c, p, config)
 }
 
 // Determine if the specified Kube endpoint has the dashboard installed and ready
 func (k *KubernetesSpecification) kubeDashboardStatus(c echo.Context) error {
+	var p = k.portalProxy
 	endpointGUID := c.Param("guid")
+	userGUID := c.Get("user_id").(string)
 
-	status := dashboardStatusResponse{
-		Endpoint:  endpointGUID,
-		Installed: false,
-	}
-
-	pod, err := k.getKubeDashboardPod(c, "app%3Dkubernetes-dashboard")
-	if err != nil {
-		pod, err = k.getKubeDashboardPod(c, "k8s-app%3Dkubernetes-dashboard")
-	}
-
-	status.Pod = pod
-	if err == nil {
-		status.Installed = true
-	}
-
+	// Don't need the token if we're just checking status
+	status, _ := dashboard.KubeDashboardStatus(p, endpointGUID, userGUID, false)
 	jsonString, err := json.Marshal(status)
 	if err != nil {
 		return interfaces.NewHTTPShadowError(
 			http.StatusBadRequest,
-			"Unable Marshal status response",
-			"Unable Marshal status response")
+			"Could not Kubernetes Dashboard status",
+			"Could not Kubernetes Dashboard status")
 	}
 
 	c.Response().Header().Set("Content-Type", "application/json")
@@ -273,73 +70,73 @@ func (k *KubernetesSpecification) kubeDashboardStatus(c echo.Context) error {
 	return nil
 }
 
-// Determine if the specified Kube endpoint has the dashboard installed and ready
-func (k *KubernetesSpecification) getKubeDashboardPod(c echo.Context, labelSelector string) (*v1.Pod, error) {
-	log.Debug("kubeDashboardStatus request")
-
-	cnsiGUID := c.Param("guid")
-	userGUID := c.Get("user_id").(string)
+// Login to the kubernetes dashboard and then redirect to the UI
+func (k *KubernetesSpecification) kubeDashboardLogin(c echo.Context) error {
+	var p = k.portalProxy
+	err := dashboard.KubeDashboardLogin(c, p)
+	return err
+}
 
+// Creates service account for dashboard access
+func (k *KubernetesSpecification) kubeDashboardCreateServiceAccount(c echo.Context) error {
 	var p = k.portalProxy
-	response, err := p.DoProxySingleRequest(cnsiGUID, userGUID, "GET", "/api/v1/pods?labelSelector="+labelSelector, nil, nil)
+	endpointGUID := c.Param("guid")
+	userGUID := c.Get("user_id").(string)
 
+	err := dashboard.CreateServiceAccount(p, endpointGUID, userGUID)
 	if err != nil {
-		return nil, interfaces.NewHTTPShadowError(
-			http.StatusNotFound,
-			"Could not fetch pod list",
-			"Could not fetch pod list")
-	}
-
-	ok, list, err := tryDecodePodList(response.Response)
-	if !ok {
-		return nil, interfaces.NewHTTPShadowError(
-			http.StatusNotFound,
-			"Kube dashboard not installed - could not decode pod list",
-			"Kube dashboard not installed - could not decode pod list")
+		return interfaces.NewHTTPShadowError(http.StatusInternalServerError, err.Error(), err.Error())
 	}
 
-	if len(list.Items) == 0 {
-		return nil, interfaces.NewHTTPShadowError(
-			http.StatusOK,
-			"Kube dashboard not installed",
-			"Kube dashboard not installed")
-	}
+	c.Response().Header().Set("Content-Type", "application/json")
+	c.Response().Write([]byte("{ \"created\": true }"))
+	return nil
+}
 
-	// Should just be one pod
-	if len(list.Items) != 1 {
-		return nil, interfaces.NewHTTPShadowError(
-			http.StatusNotFound,
-			"Kube dashboard not installed - too many pods",
-			"Kube dashboard not installed - too many pods")
-	}
+// Delete service account used for Dashboard access
+func (k *KubernetesSpecification) kubeDashboardDeleteServiceAccount(c echo.Context) error {
+	var p = k.portalProxy
+	endpointGUID := c.Param("guid")
+	userGUID := c.Get("user_id").(string)
 
-	pod := list.Items[0]
-	if pod.Status.Phase != "Running" {
-		return nil, interfaces.NewHTTPShadowError(
-			http.StatusNotFound,
-			"Dashboard not running",
-			"Dashboard not running")
+	err := dashboard.DeleteServiceAccount(p, endpointGUID, userGUID)
+	if err != nil {
+		return interfaces.NewHTTPShadowError(http.StatusInternalServerError, err.Error(), err.Error())
 	}
 
-	return &pod, nil
+	c.Response().Header().Set("Content-Type", "application/json")
+	c.Response().Write([]byte("{ \"deleted\": true }"))
+	return nil
 }
 
-func tryDecodePodList(data []byte) (parsed bool, pods v1.PodList, err error) {
-	obj, err := runtime.Decode(legacyscheme.Codecs.UniversalDecoder(), data)
+// Install dashboard in a cluster
+func (k *KubernetesSpecification) kubeDashboardInstallDashboard(c echo.Context) error {
+	var p = k.portalProxy
+	endpointGUID := c.Param("guid")
+	userGUID := c.Get("user_id").(string)
+
+	err := dashboard.InstallDashboard(p, endpointGUID, userGUID)
 	if err != nil {
-		return false, pods, err
+		return interfaces.NewHTTPShadowError(http.StatusInternalServerError, err.Error(), err.Error())
 	}
 
-	newPods, ok := obj.(*api.PodList)
-	// Check whether the object could be converted to list of pods.
-	if !ok {
-		err = fmt.Errorf("invalid pods list: %#v", obj)
-		return false, pods, err
-	}
+	c.Response().Header().Set("Content-Type", "application/json")
+	c.Response().Write([]byte("{ \"installation\": true }"))
+	return nil
+}
 
-	v1Pods := &v1.PodList{}
-	if err := k8s_api_v1.Convert_core_PodList_To_v1_PodList(newPods, v1Pods, nil); err != nil {
-		return true, pods, err
+// Delete dashboard in a cluster
+func (k *KubernetesSpecification) kubeDashboardDeleteDashboard(c echo.Context) error {
+	var p = k.portalProxy
+	endpointGUID := c.Param("guid")
+	userGUID := c.Get("user_id").(string)
+
+	err := dashboard.DeleteDashboard(p, endpointGUID, userGUID)
+	if err != nil {
+		return interfaces.NewHTTPShadowError(http.StatusInternalServerError, err.Error(), err.Error())
 	}
-	return true, *v1Pods, err
+
+	c.Response().Header().Set("Content-Type", "application/json")
+	c.Response().Write([]byte("{ \"deleted\": true }"))
+	return nil
 }
diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index 8e98096659..cf59798364 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -112,15 +112,24 @@ func (c *KubernetesSpecification) AddAdminGroupRoutes(echoGroup *echo.Group) {
 func (c *KubernetesSpecification) AddSessionGroupRoutes(echoGroup *echo.Group) {
 
 	// Kubernetes Dashboard Proxy
-	echoGroup.GET("/kubedash/ui/:guid/*", c.kubeDashboardProxy)
+	echoGroup.Any("/apps/kubedash/ui/:guid/*", c.kubeDashboardProxy)
+
+	echoGroup.GET("/kubedash/:guid/login", c.kubeDashboardLogin)
 	echoGroup.GET("/kubedash/:guid/status", c.kubeDashboardStatus)
 
+	echoGroup.POST("/kubedash/:guid/serviceAccount", c.kubeDashboardCreateServiceAccount)
+	echoGroup.DELETE("/kubedash/:guid/serviceAccount", c.kubeDashboardDeleteServiceAccount)
+
+	echoGroup.POST("/kubedash/:guid/installation", c.kubeDashboardInstallDashboard)
+	echoGroup.DELETE("/kubedash/:guid/installation", c.kubeDashboardDeleteDashboard)
+
 	// Helm Routes
 	echoGroup.GET("/helm/releases", c.ListReleases)
 	echoGroup.POST("/helm/install", c.InstallRelease)
 	echoGroup.GET("/helm/versions", c.GetHelmVersions)
 	echoGroup.DELETE("/helm/releases/:endpoint/:name", c.DeleteRelease)
 	echoGroup.GET("/helm/releases/:endpoint/:name", c.GetRelease)
+
 }
 
 func (c *KubernetesSpecification) Info(apiEndpoint string, skipSSLValidation bool) (interfaces.CNSIRecord, interface{}, error) {
diff --git a/src/jetstream/portal_proxy.go b/src/jetstream/portal_proxy.go
index 56196d5e72..f59dc1b456 100644
--- a/src/jetstream/portal_proxy.go
+++ b/src/jetstream/portal_proxy.go
@@ -15,6 +15,7 @@ type portalProxy struct {
 	DatabaseConnectionPool *sql.DB
 	SessionStore           interfaces.SessionStorer
 	SessionStoreOptions    *sessions.Options
+	SessionDataStore       interfaces.SessionDataStore
 	Plugins                map[string]interfaces.StratosPlugin
 	PluginsStatus          map[string]bool
 	Diagnostics            *interfaces.Diagnostics
diff --git a/src/jetstream/repository/interfaces/portal_proxy.go b/src/jetstream/repository/interfaces/portal_proxy.go
index 46c0f15f5c..790f6b83a2 100644
--- a/src/jetstream/repository/interfaces/portal_proxy.go
+++ b/src/jetstream/repository/interfaces/portal_proxy.go
@@ -28,6 +28,7 @@ type PortalProxy interface {
 	GetSessionInt64Value(c echo.Context, key string) (int64, error)
 	GetSessionStringValue(c echo.Context, key string) (string, error)
 	SaveSession(c echo.Context, session *sessions.Session) error
+	GetSessionDataStore() SessionDataStore
 
 	RefreshOAuthToken(skipSSLValidation bool, cnsiGUID, userGUID, client, clientSecret, tokenEndpoint string) (t TokenRecord, err error)
 	DoLoginToCNSI(c echo.Context, cnsiGUID string, systemSharedToken bool) (*LoginRes, error)
diff --git a/src/jetstream/repository/interfaces/sessiondata.go b/src/jetstream/repository/interfaces/sessiondata.go
new file mode 100644
index 0000000000..4128f4280f
--- /dev/null
+++ b/src/jetstream/repository/interfaces/sessiondata.go
@@ -0,0 +1,18 @@
+package interfaces
+
+import (
+	"time"
+)
+
+type SessionDataStore interface {
+	GetValues(session, group string) (map[string]string, error)
+	// SetValues replaces existing values for the group (deletes them first)
+	SetValues(session, group string, values map[string]string, autoExpire bool) error
+	DeleteValues(session, group string) error
+
+	// Cleanup runs a background goroutine every interval that deletes expired sessions from the database
+	Cleanup(interval time.Duration) (chan<- struct{}, <-chan struct{})
+	
+	// StopCleanup stops the background cleanup from running
+	StopCleanup(quit chan<- struct{}, done <-chan struct{})
+}
diff --git a/src/jetstream/repository/sessiondata/cleanup.go b/src/jetstream/repository/sessiondata/cleanup.go
new file mode 100644
index 0000000000..1f52b92dac
--- /dev/null
+++ b/src/jetstream/repository/sessiondata/cleanup.go
@@ -0,0 +1,64 @@
+package sessiondata
+
+import (
+	"time"
+
+	log "github.com/sirupsen/logrus"
+)
+
+var defaultInterval = time.Minute * 5
+
+// Cleanup runs a background goroutine every interval that deletes expired
+// sessions from the database.
+//
+// The design is based on https://github.com/yosssi/boltstore
+func (m *SessionDataRepository) Cleanup(interval time.Duration) (chan<- struct{}, <-chan struct{}) {
+	if interval <= 0 {
+		interval = defaultInterval
+	}
+
+	quit, done := make(chan struct{}), make(chan struct{})
+	go m.cleanup(interval, quit, done)
+	return quit, done
+}
+
+// StopCleanup stops the background cleanup from running.
+func (m *SessionDataRepository) StopCleanup(quit chan<- struct{}, done <-chan struct{}) {
+	quit <- struct{}{}
+	<-done
+}
+
+// cleanup deletes expired sessions at set intervals.
+func (m *SessionDataRepository) cleanup(interval time.Duration, quit <-chan struct{}, done chan<- struct{}) {
+	ticker := time.NewTicker(interval)
+
+	defer func() {
+		ticker.Stop()
+	}()
+
+	for {
+		select {
+		case <-quit:
+			// Handle the quit signal.
+			done <- struct{}{}
+			return
+		case <-ticker.C:
+			// Delete expired sessions on each tick.
+			err := m.deleteExpired()
+			if err != nil {
+				log.Printf("SessionDataRepository: unable to delete expired sessions: %v", err)
+			}
+		}
+	}
+}
+
+// deleteExpired will delete session values when the session expires
+func (c *SessionDataRepository) deleteExpired() error {
+	log.Debug("Expiring session data")
+	_, err := c.db.Exec(expireSessionData)
+	if err != nil {
+		return err
+	}
+	_, err = c.db.Exec(deleteSessionData)
+	return err
+}
diff --git a/src/jetstream/repository/sessiondata/psql_sessiondata.go b/src/jetstream/repository/sessiondata/psql_sessiondata.go
new file mode 100644
index 0000000000..d0c3e7c1a0
--- /dev/null
+++ b/src/jetstream/repository/sessiondata/psql_sessiondata.go
@@ -0,0 +1,102 @@
+package sessiondata
+
+import (
+	"database/sql"
+	"fmt"
+
+	log "github.com/sirupsen/logrus"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+)
+
+var getSessionDataValues = `SELECT name, value FROM session_data WHERE expired=false AND session=$1 AND groupName = $1`
+
+var insertSessionDataValue = `INSERT INTO session_data (session, groupName, name, value, keep_on_expire) VALUES ($1, $2, $3, $4, $5)`
+
+var deleteSessionGroupData = `DELETE FROM session_data WHERE session=$1 AND groupName=$2`
+
+// Expire data for sessions that not longer exist
+var expireSessionData = `UPDATE session_data SET expired=true WHERE session NOT IN (SELECT id from sessions)`
+
+// Delete data for sessions that no longer exist
+var deleteSessionData = `DELETE FROM session_data WHERE expired=true AND keep_on_expire=false`
+
+// SessionDataRepository is a RDB-backed Session Data repository
+type SessionDataRepository struct {
+	db *sql.DB
+}
+
+// NewPostgresSessionDataRepository will create a new instance of the SessionDataRepository
+func NewPostgresSessionDataRepository(dcp *sql.DB) (interfaces.SessionDataStore, error) {
+	return &SessionDataRepository{db: dcp}, nil
+}
+
+// InitRepositoryProvider - One time init for the given DB Provider
+func InitRepositoryProvider(databaseProvider string) {
+	// Modify the database statements if needed, for the given database type
+	getSessionDataValues = datastore.ModifySQLStatement(getSessionDataValues, databaseProvider)
+	insertSessionDataValue = datastore.ModifySQLStatement(insertSessionDataValue, databaseProvider)
+	deleteSessionGroupData = datastore.ModifySQLStatement(deleteSessionGroupData, databaseProvider)
+	expireSessionData = datastore.ModifySQLStatement(expireSessionData, databaseProvider)
+	deleteSessionData = datastore.ModifySQLStatement(deleteSessionData, databaseProvider)
+}
+
+// GetValues returns all values from the config table as a map
+func (c *SessionDataRepository) GetValues(session, group string) (map[string]string, error) {
+	log.Debug("SessionDataRepository GetValues")
+	rows, err := c.db.Query(getSessionDataValues, session, group)
+	if err != nil {
+		return nil, fmt.Errorf("Unable to retrieve session data records: %v", err)
+	}
+	defer rows.Close()
+
+	var values = make(map[string]string)
+	for rows.Next() {
+		var (
+			name  string
+			value string
+		)
+
+		err := rows.Scan(&name, &value)
+		if err != nil {
+			return nil, fmt.Errorf("Unable to scan session data records: %v", err)
+		}
+
+		values[name] = value
+	}
+
+	if err = rows.Err(); err != nil {
+		return nil, fmt.Errorf("Unable to get session data records: %v", err)
+	}
+
+	return values, nil
+}
+
+// DeleteValues deletes all values for the session and group
+func (c *SessionDataRepository) DeleteValues(session, group string) error {
+	log.Debug("SessionDataRepository DeleteValue")
+	if _, err := c.db.Exec(deleteSessionGroupData, session, group); err != nil {
+		return fmt.Errorf("Unable to delete session data values: %v", err)
+	}
+
+	return nil
+}
+
+// SetValues replaces existing group values with those provided
+func (c *SessionDataRepository) SetValues(session, group string, values map[string]string, autoExpire bool) error {
+	err := c.DeleteValues(session, group)
+	if err != nil {
+		return fmt.Errorf("SetValues: Unable to clear existing values: %v", err)
+	}
+
+	for key, value := range values {
+		if _, err := c.db.Exec(insertSessionDataValue, session, group, key, value, autoExpire); err != nil {
+			msg := "Unable to INSERT session data value: %v"
+			log.Debugf(msg, err)
+			return fmt.Errorf(msg, err)
+		}
+	}
+
+	return nil
+}
diff --git a/src/jetstream/session.go b/src/jetstream/session.go
index 79c331614a..5333a75e2e 100644
--- a/src/jetstream/session.go
+++ b/src/jetstream/session.go
@@ -122,7 +122,11 @@ func (p *portalProxy) writeSessionHook(c echo.Context) func() {
 		sessionIntf := c.Get(jetStreamSessionContextKey)
 		if sessionModifed != nil && sessionIntf != nil {
 			if session, ok := sessionIntf.(*sessions.Session); ok {
-				p.SessionStore.Save(c.Request(), c.Response().Writer, session)
+				err := p.SessionStore.Save(c.Request(), c.Response().Writer, session)
+				if err != nil {
+					log.Error("Failed to save session")
+					log.Error(err)
+				}
 			}
 		}
 	}

From bb8a055382bd9f258c877a55f5a4d8751096249e Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 24 Jan 2020 11:51:50 +0000
Subject: [PATCH 281/648] Fixes and improvements

---
 deploy/containers/config-init/config-init.sh  | 318 +++++++-----------
 deploy/db/Dockerfile.mariadb                  |   8 +
 deploy/kubernetes/build.sh                    |   3 +-
 .../console/templates/__helpers.tpl           |  16 +-
 .../console/templates/config-init.yaml        |   9 +-
 .../console/templates/database.yaml           |   4 +
 .../console/templates/deployment.yaml         |  15 +-
 .../console/tests/deployment_test.yaml        |  42 ++-
 deploy/kubernetes/console/values.yaml         |  12 +-
 9 files changed, 216 insertions(+), 211 deletions(-)

diff --git a/deploy/containers/config-init/config-init.sh b/deploy/containers/config-init/config-init.sh
index ca31ecd84d..8110d18c6d 100755
--- a/deploy/containers/config-init/config-init.sh
+++ b/deploy/containers/config-init/config-init.sh
@@ -16,14 +16,15 @@ echo "ENCRYPTION_KEY_FILENAME     : ${ENCRYPTION_KEY_FILENAME}"
 echo "CONSOLE_PROXY_CERT_PATH     : ${CONSOLE_PROXY_CERT_PATH}"
 echo "CONSOLE_PROXY_CERT_KEY_PATH : ${CONSOLE_PROXY_CERT_KEY_PATH}"
 echo ""
+echo "============================================"
+echo ""
 
 # Kubernetes token
 KUBE_TOKEN=$(</var/run/secrets/kubernetes.io/serviceaccount/token)
 KUBE_API_SERVER=https://$KUBERNETES_SERVICE_HOST:$KUBERNETES_PORT_443_TCP_PORT
 
 function deleteSecret {
-  PREFIX=$1
-  REVISION=$2
+  SECRET_NAME=$1
 
   # Delete the old secret
   curl -k -s \
@@ -33,12 +34,12 @@ function deleteSecret {
       -H "Authorization: Bearer $KUBE_TOKEN" \
       -H 'Accept: application/json' \
       -H 'Content-Type: application/json' \
-      ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets/${RELEASE_NAME}-${PREFIX}-${REVISION} > /dev/null 2>&1 <<'EOF' 
+      ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets/${RELEASE_NAME}-${SECRET_NAME} > /dev/null 2>&1 <<'EOF' 
   {}
 EOF
   DELETED=$?
   if [ $DELETED -ne 0 ]; then
-    echo "Unable to delete secret: ${RELEASE_NAME}-${PREFIX}-${REVISION} - error code: ${DELETED}"
+    echo "Unable to delete secret: ${RELEASE_NAME}-${SECRET_NAME} - error code: ${DELETED}"
   fi
 }
 
@@ -67,9 +68,9 @@ function generateCert {
 ###
 if [ "$1" == "--delete" ]; then
   echo "Cleanup up - delete hook"
-  # Delete the old secret
-  deleteSecret "key" ${RELEASE_REVISION}
-  deleteSecret "cert" ${RELEASE_REVISION}
+  # Delete the old secrets
+  deleteSecret "key"
+  deleteSecret "cert"
   exit 0
 fi
 
@@ -79,113 +80,87 @@ fi
 
 KEY=""
 
-# If RELEASE_REVISION is 1 then this is a new install
-# Otherwise it is an upgrade and we need to read the previous secret and
-# migrate it to a new secret and change the values if needed
+# Just look for the secret - if its not there, we need to create it - otherwise leave it alone
 
-if [ ${RELEASE_REVISION} -eq 1 ]; then
-  # Check whether the secret already exists
-  echo "Fresh installation - checking encryption key secret does not already exist ..."
-  curl -k -s \
-      --fail \
-      -H "Authorization: Bearer $KUBE_TOKEN" \
-      -H 'Content-Type: application/json' \
-      ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets/${RELEASE_NAME}-key-${RELEASE_REVISION} > ./key.json 2>&1
+# Check whether the secret already exists
+echo "Fresh installation - checking encryption key secret does not already exist ..."
+curl -k -s \
+    --fail \
+    -H "Authorization: Bearer $KUBE_TOKEN" \
+    -H 'Content-Type: application/json' \
+    ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets/${RELEASE_NAME}-key > ./key.json 2>&1
 
-  EXISTS=$?
-  if [ $EXISTS -eq 0 ]; then
-    KEY=$(cat key.json | jq -r .data.key)
-    echo "Read Encryption Key from previous secret (although was not expecting this secret to be present)"    
-    deleteSecret "key" ${RELEASE_REVISION}
-  else
-    echo "Fresh installation - generating a new Encryption Key"
+EXISTS=$?
+rm -f key.json
+if [ $EXISTS -eq 0 ]; then
+  echo "Encryption Key secret already exists - nothing to do"
+else
+  echo "Fresh installation - generating a new Encryption Key secret"
+
+  # Migrate existing key from the legacy encryption key volume if there is one
+  if [ ${ENCRYPTION_KEY_VOLUME} -a ${ENCRYPTION_KEY_FILENAME} ]; then
+    ekFile="${ENCRYPTION_KEY_VOLUME}/${ENCRYPTION_KEY_FILENAME}"
+    if [ -f "${ekFile}" ]; then
+      echo "Found encryption key file on the legacy encryption key volume"
+      KEY=$(cat ${ekFile} | base64 -w 0)
+    fi
+  fi
+
+  if [ -z $KEY ]; then
     # Generate a random encryption key
+    echo "Generating a new Encryption Key ..."
     KEY=$(openssl enc -aes-256-cbc -k secret -P -md sha1 | grep key | cut -d '=' -f2 | base64 -w 0)
   fi
-  rm -f key.json
-else
-  echo "Upgrade - Looking for previous secret to migrate"
-  PREVIOUS_REVISION=$(($RELEASE_REVISION - 1))
 
-  # Check whether the secret already exists
+  # We will create a new secret for the encryption key
+  cat << EOF > create-key-secret.yaml
+  {
+    "kind": "Secret",
+    "apiVersion": "v1",
+    "type": "Opaque",
+    "metadata": {
+      "name": "@@NAME@@",
+      "stratos-helm-resource": "@@NAME@@",
+      "app.kubernetes.io/name": "stratos",
+      "app.kubernetes.io/instance": "@@RELEASE_NAME@@"
+    },
+    "data": {
+      "key": "@@KEY@@"
+    }
+  }
+EOF
+
+  NAME="${RELEASE_NAME}-key"
+  sed -i.bak "s/@@NAME@@/${NAME}/g" create-key-secret.yaml
+  sed -i.bak "s/@@KEY@@/${KEY}/g" create-key-secret.yaml
+  sed -i.bak "s/@@RELEASE_NAME@@/${RELEASE_NAME}/g" create-key-secret.yaml
+
+  echo "Creating secret for the Encryption Key: ${NAME}"
+
+  # Create secret for the Encryption Key
   curl -k -s \
       --fail \
+      -X POST \
+      -d @create-key-secret.yaml \
       -H "Authorization: Bearer $KUBE_TOKEN" \
+      -H 'Accept: application/json' \
       -H 'Content-Type: application/json' \
-      ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets/${RELEASE_NAME}-key-${PREVIOUS_REVISION} > ./key.json 2>&1
-
-  EXISTS=$?
-  if [ $EXISTS -ne 0 ]; then
-    # This could be an upgrade from a version that did NOT have the config-init job
-    # Look for the encryption key volume
-
-    echo "Could not find existing Encryption Key Secret - checking volume"
-    if [ ${ENCRYPTION_KEY_VOLUME} -a ${ENCRYPTION_KEY_FILENAME} ]; then
-      ekFile="${ENCRYPTION_KEY_VOLUME}/${ENCRYPTION_KEY_FILENAME}"
-      if [ -f "${ekFile}" ]; then
-        echo "Found encryption key file on the legacy encryption key volume"
-        KEY=$(cat ${ekFile} | base64 -w 0)
-      else
-        echo "Could not read encryption key file from legacy encryption key volume"
-        exit 1
-      fi
-    else
-      echo "Encryption Key secret does not exist - this should have been created by a previous installation or upgrade"
-      echo "Generating a new one - this may result in existing tokens not being usable"
-      KEY=$(openssl enc -aes-256-cbc -k secret -P -md sha1 | grep key | cut -d '=' -f2 | base64 -w 0)
-    fi
-  else
-    KEY=$(cat key.json | jq -r .data.key)
-    echo "Read Encryption Key from previous secret"
+      ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets > /dev/null 2>&1
 
-    # Only delete the previous secret if it already exists
-    deleteSecret "key" ${PREVIOUS_REVISION}
+  RET_CREATE=$?
+  echo "Create Encryption Key secret exit code: $RET_CREATE"
+  rm -rf create-key-secret.yaml
+  if [ $RET_CREATE -ne 0 ]; then
+    echo "Error creating Encryption Key secret"
+    exit $RET_CREATE
   fi
 
-  rm -f key.json
-fi
-
-# We will create a new secret for the encryption key
-cat << EOF > create-key-secret.yaml
-{
-  "kind": "Secret",
-  "apiVersion": "v1",
-  "type": "Opaque",
-  "metadata": {
-    "name": "@@NAME@@"
-  },
-  "data": {
-    "key": "@@KEY@@"
-  }
-}
-EOF
-
-NAME="${RELEASE_NAME}-key-${RELEASE_REVISION}"
-
-sed -i.bak "s/@@NAME@@/${NAME}/g" create-key-secret.yaml
-sed -i.bak "s/@@KEY@@/${KEY}/g" create-key-secret.yaml
-
-echo "Creating secret for the Encryption Key: ${RELEASE_NAME}-key-${RELEASE_REVISION}"
+  echo "Encryption key init complete"
 
-# Create secret for the Encryption Key
-curl -k -s \
-    --fail \
-    -X POST \
-    -d @create-key-secret.yaml \
-    -H "Authorization: Bearer $KUBE_TOKEN" \
-    -H 'Accept: application/json' \
-    -H 'Content-Type: application/json' \
-    ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets > /dev/null 2>&1
-
-RET_CREATE=$?
-echo "Create Encryption Key secret exit code: $RET_CREATE"
-rm -rf create-key-secret.yaml
-if [ $RET_CREATE -ne 0 ]; then
-  echo "Error creating Encryption Key secret"
-  exit $RET_CREATE
 fi
 
-echo "Encryption key init complete"
+echo ""
+echo "============================================"
 
 ###############################################################################################################################
 # TLS Certificate
@@ -197,114 +172,73 @@ echo "Checking TLS Certificate ..."
 CERT_CRT=""
 CERT_KEY=""
 
-if [ ${RELEASE_REVISION} -eq 1 ]; then
-  echo "Fresh installation - checking whether we need to generate a certificate"
+# If CONSOLE_TLS_SECRET_NAME is set, then we don't need to create a certificate
+if [ -n "${CONSOLE_TLS_SECRET_NAME}" ]; then
+  echo "Console is using secret ${CONSOLE_TLS_SECRET_NAME} to provide TLS certificate - nothing to do"
+else
+  curl -k -s \
+      --fail \
+      -H "Authorization: Bearer $KUBE_TOKEN" \
+      -H 'Content-Type: application/json' \
+      ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets/${RELEASE_NAME}-cert > ./cert.json 2>&1
 
-  # If CONSOLE_TLS_SECRET_NAME is set, then we don't need to create a certificate
-  if [ -n "${CONSOLE_TLS_SECRET_NAME}" ]; then
-    echo "Console is using secret ${CONSOLE_TLS_SECRET_NAME} to provide TLS certificate - nothing to do"
+  EXISTS=$?
+  if [ $EXISTS -eq 0 ]; then
+    echo "Certificate secret already exists - nothing to do"
   else
+
     # Need a new certificate
     echo "New certificate needed ..."
     generateCert
-    echo "${CERT_CRT}"
-    echo "${CERT_KEY}"
-  fi
-else
-  echo "Upgrade - checking whether we need to generate a certificate"
 
-  # If we have a TLS Secret name, then we don't need the generated cert - so delete the previous one, if there was one
-  if [ -n "${CONSOLE_TLS_SECRET_NAME}" ]; then
-    echo "Console is using secret ${CONSOLE_TLS_SECRET_NAME} to provide TLS certificate - removing previous generated certificate (if any)"
-    PREVIOUS_REVISION=$(($RELEASE_REVISION - 1))
+    # We will create a new secret for the certificate
+    cat << EOF > create-cert-secret.yaml
+    {
+      "kind": "Secret",
+      "apiVersion": "v1",
+      "type": "kubernetes.io/tls",
+      "metadata": {
+        "name": "@@NAME@@",
+        "stratos-helm-resource": "@@NAME@@",
+        "app.kubernetes.io/name": "stratos",
+        "app.kubernetes.io/instance": "@@RELEASE_NAME@@"
+      },
+      "data": {
+        "tls.crt": "@@CRT@@",
+        "tls.key": "@@KEY@@"
+      }
+    }
+EOF
 
-    # Note: This will log an error if the certificate was not previously created - we just safely ignore this
-    echo "Trying to delete previous generated secret if there was one ..."
-    deleteSecret "cert" ${PREVIOUS_REVISION}
-  else
-    # Try and get the previous cert secret - if there isn't one, then possibly the user switched from providing us one
-    # to wanting us to generate one
+    NAME="${RELEASE_NAME}-cert"
+
+    sed -i.bak "s/@@NAME@@/${NAME}/g" create-cert-secret.yaml
+    sed -i.bak "s/@@RELEASE_NAME@@/${RELEASE_NAME}/g" create-cert-secret.yaml
+    sed -i.bak "s/@@CRT@@/${CERT_CRT}/g" create-cert-secret.yaml
+    sed -i.bak "s/@@KEY@@/${CERT_KEY}/g" create-cert-secret.yaml
+
+    # Create secret for the Certificate
+    echo "Creating secret for the Certificate: ${NAME}"
     curl -k -s \
         --fail \
+        -X POST \
+        -d @create-cert-secret.yaml \
         -H "Authorization: Bearer $KUBE_TOKEN" \
+        -H 'Accept: application/json' \
         -H 'Content-Type: application/json' \
-        ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets/${RELEASE_NAME}-cert-${PREVIOUS_REVISION} > ./cert.json 2>&1
-
-    EXISTS=$?
-    if [ $EXISTS -ne 0 ]; then
-      echo "Could not find previous cert secret - will create a new one"
-      # Need a new certificate
-      generateCert
-      echo "${CERT_CRT}"
-      echo "${CERT_KEY}"
-    else
-      echo "Found previous secret ... going to use it"
-
-      cat cert.json
-      # Just copy the secret over with a new name
-      CERT_CRT=$(cat cert.json | jq -r '.data["tls.crt"]')
-      CERT_KEY=$(cat cert.json | jq -r '.data["tls.key"]')
-
-      echo "Read Certificate from previous secret"
-      echo ${CERT_CRT}
-      echo ${CERT_KEY}
-      rm -rf cert.json
-
-      # Only delete the previous secret if it already exists
-      deleteSecret "cert" ${PREVIOUS_REVISION}
-    fi
+        ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets > /dev/null 2>&1
+
+    RET_CREATE=$?
+    echo ""
+    echo "Create Certificate secret exit code: $RET_CREATE"
+    rm -rf create-cert-secret.yaml
+    if [ $RET_CREATE -ne 0 ]; then
+      echo "Error creating Certificate secret"
+      exit $RET_CREATE
+    fi  
   fi
 fi
 
-# If we have CERT_CRT and CERT_KEY then we need to create a new certificate
-if [ -z "${CERT_CRT}" ] && [ -z "${CERT_KEY}" ]; then
-  echo "CERT_CRT and CERT_KEY are empty - nothing to do"
-else
-  echo "CERT_CRT and CERT_KEY are NOT empty - going to create secret"
-
-  # We will create a new secret for the certificate
-  cat << EOF > create-cert-secret.yaml
-  {
-    "kind": "Secret",
-    "apiVersion": "v1",
-    "type": "kubernetes.io/tls",
-    "metadata": {
-      "name": "@@NAME@@"
-    },
-    "data": {
-      "tls.crt": "@@CRT@@",
-      "tls.key": "@@KEY@@"
-    }
-  }
-EOF
-
-  NAME="${RELEASE_NAME}-cert-${RELEASE_REVISION}"
-
-  sed -i.bak "s/@@NAME@@/${NAME}/g" create-cert-secret.yaml
-  sed -i.bak "s/@@CRT@@/${CERT_CRT}/g" create-cert-secret.yaml
-  sed -i.bak "s/@@KEY@@/${CERT_KEY}/g" create-cert-secret.yaml
-
-  # Create secret for the Certificate
-  echo "Creating secret for the Certificate: ${RELEASE_NAME}-cert-${RELEASE_REVISION}"
-  curl -k -s \
-      --fail \
-      -X POST \
-      -d @create-cert-secret.yaml \
-      -H "Authorization: Bearer $KUBE_TOKEN" \
-      -H 'Accept: application/json' \
-      -H 'Content-Type: application/json' \
-      ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets > /dev/null 2>&1
-
-  RET_CREATE=$?
-  echo ""
-  echo "Create Certificate secret exit code: $RET_CREATE"
-  rm -rf create-cert-secret.yaml
-  if [ $RET_CREATE -ne 0 ]; then
-    echo "Error creating Certificate secret"
-    exit $RET_CREATE
-  fi  
-fi
-
 echo ""
 echo "============================================"
 echo "Stratos init job complete"
diff --git a/deploy/db/Dockerfile.mariadb b/deploy/db/Dockerfile.mariadb
index 885f8d3cc3..28ef0026c9 100644
--- a/deploy/db/Dockerfile.mariadb
+++ b/deploy/db/Dockerfile.mariadb
@@ -6,9 +6,17 @@ RUN \
 		| xargs -0 grep -lZE '^(bind-address|log)' \
 		| xargs -rt -0 sed -Ei 's/^(bind-address|log)/#&/'; 
 
+# Permissions
+# comment out any "user" entires in the MySQL config ("docker-entrypoint.sh" or "--user" will handle user switching)
+#RUN sed -ri 's/^user\s/#&/' /etc/mysql/my.cnf /etc/mysql/conf.d/* && \
+# ensure that /var/run/mysqld (used for socket and lock files) is writable regardless of the UID our mysqld instance ends up having at runtime
+
 COPY mariadb-entrypoint.sh /docker-entrypoint.sh
 COPY mariadb-ping.sh /dbping.sh
 
+RUN chmod 777 /docker-entrypoint.sh && \
+		chmod 777 /dbping.sh
+
 # ENTRYPOINT
 ENTRYPOINT ["/docker-entrypoint.sh"]
 
diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
index e2fd3b3c4f..05a574e16e 100755
--- a/deploy/kubernetes/build.sh
+++ b/deploy/kubernetes/build.sh
@@ -19,7 +19,7 @@ BOLD="\033[1m"
 PROD_RELEASE=false
 DOCKER_REGISTRY=docker.io
 DOCKER_ORG=splatform
-BASE_IMAGE_TAG=opensuse
+BASE_IMAGE_TAG=leap15_1
 OFFICIAL_TAG=cap
 TAG=$(date -u +"%Y%m%dT%H%M%SZ")
 ADD_OFFICIAL_TAG="false"
@@ -197,7 +197,6 @@ if [ "${CHART_ONLY}" == "false" ]; then
   # Build and push an image based on the nginx container (Front-end)
   log "-- Building/publishing the runtime container image for the Console web server (frontend)"
   patchAndPushImage stratos-console deploy/Dockerfile.ui "${STRATOS_PATH}" prod-build
-
 fi
 
 log "-- Building Helm Chart"
diff --git a/deploy/kubernetes/console/templates/__helpers.tpl b/deploy/kubernetes/console/templates/__helpers.tpl
index c24f888f74..2762028d4f 100644
--- a/deploy/kubernetes/console/templates/__helpers.tpl
+++ b/deploy/kubernetes/console/templates/__helpers.tpl
@@ -41,16 +41,24 @@ This will do the following:
 {{- end -}}
 {{ end }}
 
-
 {{/*
-Get SCf UAA Endpoint
+Get SCF UAA Endpoint
 */}}
 {{- define "scfUaaEndpoint" -}}
+
 {{- $uaa_zone := default "scf" .Values.env.UAA_ZONE -}}
 {{- if and .Values.env.DOMAIN (not .Values.env.UAA_HOST) -}}
-{{- printf "https://%s.uaa.%s:%v" $uaa_zone .Values.env.DOMAIN .Values.env.UAA_PORT -}}
+{{- if .Values.env.UAA_ZONE -}}
+{{- printf "https://%s.uaa.%s:%v" .Values.env.UAA_ZONE .Values.env.DOMAIN .Values.env.UAA_PORT -}}
+{{- else -}}
+{{- printf "https://uaa.%s:%v" .Values.env.DOMAIN .Values.env.UAA_PORT -}}
+{{- end -}}
 {{- else if .Values.env.UAA_HOST -}}
-{{- printf "https://%s.%s:%v" $uaa_zone .Values.env.UAA_HOST .Values.env.UAA_PORT -}}
+{{- if .Values.env.UAA_ZONE -}}
+{{- printf "https://%s.%s:%v" .Values.env.UAA_ZONE .Values.env.UAA_HOST .Values.env.UAA_PORT -}}
+{{- else -}}
+{{- printf "https://%s:%v" .Values.env.UAA_HOST .Values.env.UAA_PORT -}}
+{{- end -}}
 {{- end -}}
 {{- end -}}
 
diff --git a/deploy/kubernetes/console/templates/config-init.yaml b/deploy/kubernetes/console/templates/config-init.yaml
index 555e550696..d3a90d1848 100644
--- a/deploy/kubernetes/console/templates/config-init.yaml
+++ b/deploy/kubernetes/console/templates/config-init.yaml
@@ -29,16 +29,11 @@ rules:
 - apiGroups:
   - ""
   resources:
-  - "configmaps"
   - "secrets"
   verbs:
   - "create"
   - "post"
   - "get"
-  - "list"
-  - "patch"
-  - "update"
-  - "delete"
 {{- end }}
 ---
 # Role binding for service account "config-init" and role "config-init-role"
@@ -134,7 +129,8 @@ spec:
         persistentVolumeClaim:
           claimName: "{{ .Release.Name }}-encryption-key-volume"
 ---
-# Cleanup job will delete the created secret when the release is deleted
+{{- if .Values.autoCleanup }}
+Cleanup job will delete the created secret when the release is deleted
 apiVersion: "batch/v1"
 kind: "Job"
 metadata:
@@ -184,3 +180,4 @@ spec:
       serviceAccountName: "config-init"
       {{- end }}
       terminationGracePeriodSeconds: 30
+{{- end }}
diff --git a/deploy/kubernetes/console/templates/database.yaml b/deploy/kubernetes/console/templates/database.yaml
index 1f6683b553..07fbca8b62 100644
--- a/deploy/kubernetes/console/templates/database.yaml
+++ b/deploy/kubernetes/console/templates/database.yaml
@@ -1,6 +1,10 @@
 {{- if not .Values.mariadb.external }}
 ---
+{{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major (trimSuffix "+" .Capabilities.KubeVersion.Minor) )}}
+apiVersion: apps/v1
+{{- else }}
 apiVersion: extensions/v1beta1
+{{- end }}
 kind: Deployment
 metadata:
   name: stratos-db
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 1a8da17982..55270fe87e 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -133,6 +133,10 @@ spec:
             secretKeyRef:
               name: "{{ .Release.Name }}-secret"
               key: clientSecret
+        {{- if .Values.console.autoRegisterCF }}
+        - name: AUTO_REG_CF_URL
+          value: {{ .Values.console.autoRegisterCF }}
+        {{- end }}
         # Local admin user
         {{- if .Values.console.localAdminPassword }}
         - name: CONSOLE_ADMIN_SCOPE 
@@ -155,7 +159,7 @@ spec:
         {{- if or .Values.env.UAA_HOST .Values.env.DOMAIN }}  
         - name: UAA_ENDPOINT 
           value: {{ template "scfUaaEndpoint" . }}
-        {{- if .Values.env.DOMAIN }}  
+        {{- if and .Values.env.DOMAIN (not .Values.console.autoRegisterCF) }}
         - name: AUTO_REG_CF_URL
           value: https://api.{{.Values.env.DOMAIN}}
         {{- end }}
@@ -223,6 +227,11 @@ spec:
           value: {{ default "" .Values.console.userInviteSubject | quote }}
         - name: ENABLE_TECH_PREVIEW
           value: {{ default "false" .Values.console.techPreview | quote }}
+        readinessProbe:
+          tcpSocket:
+            port: 3003
+          initialDelaySeconds: 3
+          periodSeconds: 3
         ports:
         - containerPort: 3003
           name: proxy
@@ -249,13 +258,13 @@ spec:
       volumes:
       - name: "{{ .Release.Name }}-encryption-key-volume"
         secret:
-          secretName: "{{ .Release.Name }}-key-{{ .Release.Revision }}"
+          secretName: "{{ .Release.Name }}-key"
       - name: "{{ .Release.Name }}-cert-volume"
         secret:
           {{- if .Values.console.tlsSecretName }}
           secretName: "{{ .values.console.tlsSecretName }}"
           {{- else }}
-          secretName: "{{ .Release.Name }}-cert-{{ .Release.Revision }}"
+          secretName: "{{ .Release.Name }}-cert"
           {{- end }}
       - name: "{{ .Release.Name }}-db-secret"
         secret:
diff --git a/deploy/kubernetes/console/tests/deployment_test.yaml b/deploy/kubernetes/console/tests/deployment_test.yaml
index a817f56477..b451ba5a3a 100644
--- a/deploy/kubernetes/console/tests/deployment_test.yaml
+++ b/deploy/kubernetes/console/tests/deployment_test.yaml
@@ -26,4 +26,44 @@ tests:
           content:
             name: AUTO_REG_CF_URL
             value: https://api.test.com
-            
\ No newline at end of file
+  - it: should set UAA_ENDPOINT correctly when zone is empty
+    set:
+      env.UAA_HOST: scf.test.com
+      env.UAA_ZONE: ~
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[1].env
+          content:
+            name: UAA_ENDPOINT
+            value: https://scf.test.com:2793
+  - it: should set UAA_ENDPOINT correctly when zone is empty with env.DOMAIN
+    set:
+      env.DOMAIN: scf.test.com
+      env.UAA_ZONE: ~
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[1].env
+          content:
+            name: UAA_ENDPOINT
+            value: https://uaa.scf.test.com:2793
+  - it: should allow AUTO_REG_CF_URL to be set
+    set:
+      console.autoRegisterCF: https://autoreg.test.com
+      env.UAA_ZONE: ~
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[1].env
+          content:
+            name: AUTO_REG_CF_URL
+            value: https://autoreg.test.com
+  - it: should allow AUTO_REG_CF_URL to be set when env.DOMAIN is also set
+    set:
+      console.autoRegisterCF: https://autoreg.test.com
+      env.UAA_ZONE: ~
+      env.DOMAIN: domain.com
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[1].env
+          content:
+            name: AUTO_REG_CF_URL
+            value: https://autoreg.test.com
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index 135813c4cc..e5e618f389 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -71,6 +71,8 @@ console:
   # Secret containing certificate for the Console
   tlsSecretName:
 
+  autoRegisterCF: ~
+  
 images:
   console: stratos-console
   proxy: stratos-jetstream
@@ -82,6 +84,7 @@ images:
 
 # Database configuration
 mariadb:
+  # Whether or not to use an external database in place of the in-build MariaDB
   external: false
   database: console
   user: console
@@ -90,10 +93,10 @@ mariadb:
   # Leave password blank to auto-generate (not needed for external database)
   rootPassword:
 
-  # DB Host
+  # DB Host (when using an external database)
   host:
 
-  # Override port (default 3306)
+  # Override port (default 3306) (when using an external database)
   port:
 
   # Override DB type - default is mysql
@@ -158,11 +161,14 @@ kube:
     email: default
 
 # ================================================================================
-# Values below are for internal use only for SCF compatability - subject to change
+# Values below are for internal use only - do not use
 # ================================================================================
 
+autoCleanup: false
+
 services:
   loadbalanced: false
 
 # useLb is deprecated - use console.service.type
 useLb: false
+

From a1707020820b0bc97207f96d8fca539185d7399a Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 24 Jan 2020 12:45:58 +0000
Subject: [PATCH 282/648] Fix build

---
 .../custom/kubernetes/services/kubernetes-endpoint.service.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
index e4d58e331e..90fbad1379 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
@@ -1,3 +1,4 @@
+import { kubernetesDashboardEntityType } from './../../../../../../../../custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
@@ -101,11 +102,8 @@ export class KubernetesEndpointService {
     this.kubeDashboardStatus$ = this.kubeDashboardEnabled$.pipe(
       filter(enabled => enabled),
       switchMap(() => this.entityServiceFactory.create<KubeDashboardStatus>(
-      kubernetesDashboardSchemaKey,
-      entityFactory(kubernetesDashboardSchemaKey),
       this.kubeGuid,
       new GetKubernetesDashboard(this.kubeGuid),
-      false
     ).waitForEntity$.pipe(map(status => status.entity)).pipe(
       startWith(null),
     )

From 5e869443247b9d47d30383b2767ac81155b7d83b Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Fri, 24 Jan 2020 12:47:19 +0000
Subject: [PATCH 283/648] Remove TODO

---
 deploy/db/mariadb-entrypoint.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/deploy/db/mariadb-entrypoint.sh b/deploy/db/mariadb-entrypoint.sh
index 49501848da..b1f36c01e9 100755
--- a/deploy/db/mariadb-entrypoint.sh
+++ b/deploy/db/mariadb-entrypoint.sh
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-# TODO - Need to add back in code to update the password after init
-
-
-
 ###########################################################################################################
 #
 # This is the entrypoint script taken from here: https://github.com/docker-library/mariadb/tree/master/10.2
@@ -215,4 +211,4 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 	fi
 fi
 
-exec "$@"
\ No newline at end of file
+exec "$@"

From 24e12cd2395729063f0da05aa4ab669a7c010b81 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 24 Jan 2020 12:50:07 +0000
Subject: [PATCH 284/648] Compilation fixes

---
 .../custom/kubernetes/services/kubernetes-endpoint.service.ts   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
index 90fbad1379..b41a254953 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
@@ -1,4 +1,3 @@
-import { kubernetesDashboardEntityType } from './../../../../../../../../custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
@@ -29,7 +28,6 @@ import {
   KubePaginationAction,
 } from '../store/kubernetes.actions';
 import { KubeDashboardStatus } from '../store/kubernetes.effects';
-import { AuthState } from '../../../../../store/src/reducers/auth.reducer';
 
 @Injectable()
 export class KubernetesEndpointService {

From 520155aac236029699c0faf8907e12e963b82e5c Mon Sep 17 00:00:00 2001
From: Kate R <50168367+kreinecke@users.noreply.github.com>
Date: Fri, 24 Jan 2020 13:28:49 +0000
Subject: [PATCH 285/648] Begin code to make serving requests asynchronous and
 enable fetching of repo sync state

Signed-off-by: Kate R <50168367+kreinecke@users.noreply.github.com>
---
 .../monocular/chart-repo/api_endpoint.go      | 85 ++++++++++++++++---
 .../monocular/chartsvc/utils/responses.go     |  5 ++
 2 files changed, 79 insertions(+), 11 deletions(-)

diff --git a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
index 9cebd59286..1ba08a0899 100644
--- a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
+++ b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
@@ -19,10 +19,12 @@ package main
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"net/http"
 	"os"
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/gorilla/mux"
 	"github.com/heptiolabs/healthcheck"
 	log "github.com/sirupsen/logrus"
@@ -30,6 +32,7 @@ import (
 	"go.mongodb.org/mongo-driver/mongo/options"
 
 	fdb "github.com/helm/monocular/chartrepo/foundationdb"
+	responses "github.com/helm/monocular/chartsvc/utils"
 )
 
 const pathPrefix = "/v1"
@@ -38,6 +41,8 @@ var fdbClient fdb.Client
 var fDBName string
 var authorizationHeader string
 
+var repoJobStatus map[string]string
+
 // Params a key-value map of path params
 type Params map[string]string
 
@@ -62,6 +67,8 @@ func setupRoutes() http.Handler {
 	apiv1.Methods("PUT").Path("/sync/{repo}").Handler(WithParams(OnDemandSync))
 	apiv1.Methods("PUT").Path("/delete/{repo}").Handler(WithParams(OnDemandDelete))
 
+	apiv1.Methods("GET").Path("/status/{repo}").Handler(WithParams(RepoSyncStatus))
+
 	n := negroni.Classic()
 	n.UseHandler(r)
 	return n
@@ -78,42 +85,98 @@ func OnDemandSync(w http.ResponseWriter, req *http.Request, params Params) {
 	dec := json.NewDecoder(req.Body)
 	var url syncParams
 	if err := dec.Decode(&url); err != nil {
-		log.Fatal(err)
+		log.Error(err.Error())
+		w.Header().Set("Server", "ChartRepo (On-Demand)")
+		http.Error(w, "Error decoding sync request repository URL: "+err.Error(), http.StatusBadRequest)
+		return
 	}
 
 	repoURL := url.RepoURL
 	repoName := params["repo"]
 
 	if repoURL == "" {
-		log.Fatal("No Repository URL provided in request for Sync action.")
+		err := fmt.Errorf("No Repository URL provided in request for Sync action.")
+		log.Error(err.Error())
+		w.Header().Set("Server", "ChartRepo (On-Demand)")
+		http.Error(w, err.Error(), http.StatusBadRequest)
+		return
 	}
 
 	if repoName == "" {
-		log.Fatal("No Repository name provided in request for Sync action.")
+		err := fmt.Errorf("No Repository name provided in request for Sync action.")
+		log.Error(err.Error())
+		w.Header().Set("Server", "ChartRepo (On-Demand)")
+		http.Error(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+
+	requestUUID, err := uuid.NewUUID()
+	if err != nil {
+		log.Error(err.Error())
+		w.Header().Set("Server", "ChartRepo (On-Demand)")
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
 	}
 
-	startTime := time.Now()
-	if err := fdb.SyncRepo(fdbClient, fDBName, repoName, repoURL, authorizationHeader, clientKeepAlive); err != nil {
-		log.Fatalf("Can't sync chart repository with database: %v", err)
+	go fdb.SyncRepo(fdbClient, fDBName, repoName, repoURL, authorizationHeader, clientKeepAlive)
+
+	//TODO Kate maintain repo sync status with last successful/failed/in-progress sync UUID
+	repoJobStatus[repoName]
+
+	//Return sync status in response
+	response := responses.SyncStatusResponse{requestUUID.String(), "Syncing"}
+	js, err := json.Marshal(response)
+	if err != nil {
+		log.Error(err.Error())
+		w.Header().Set("Server", "ChartRepo (On-Demand)")
+		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
-	timeTaken := time.Since(startTime).Seconds()
-	log.Infof("Successfully added the chart repository %s to database in %v seconds", repoName, timeTaken)
+
+	w.Header().Set("Content-Type", "application/json")
+	w.Header().Set("Server", "ChartRepo (On-Demand)")
+	w.Write(js)
+	w.WriteHeader(200)
 }
 
 func OnDemandDelete(w http.ResponseWriter, req *http.Request, params Params) {
 	repoName := params["repo"]
 
 	if repoName == "" {
-		log.Fatal("No Repository name provided in request for Delete action.")
+		err := fmt.Errorf("No Repository name provided in request for Delete action.")
+		log.Error(err.Error())
+		w.Header().Set("Server", "ChartRepo (On-Demand)")
+		http.Error(w, err.Error(), http.StatusBadRequest)
 	}
 
 	//Running in serve mode, we dont want to close the db client connection after a request
 	var clientKeepAlive = true
 
-	if err := fdb.DeleteRepo(fdbClient, fDBName, repoName, clientKeepAlive); err != nil {
-		log.Fatalf("Can't delete chart repository %s from database: %v", repoName, err)
+	go fdb.DeleteRepo(fdbClient, fDBName, repoName, clientKeepAlive)
+
+	//Return delete status in response
+	requestUUID, err := uuid.NewUUID()
+	response := responses.SyncStatusResponse{requestUUID.String(), "Deleting"}
+	js, err := json.Marshal(response)
+	if err != nil {
+		log.Error(err.Error())
+		w.Header().Set("Server", "ChartRepo (On-Demand)")
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
 	}
+
+	w.Header().Set("Content-Type", "application/json")
+	w.Header().Set("Server", "ChartRepo (On-Demand)")
+	w.Write(js)
+	w.WriteHeader(200)
+}
+
+func RepoSyncStatus(w http.ResponseWriter, req *http.Request, params Params) {
+	repoName := params["repo"]
+	if repoName == "" {
+		log.Fatal("No Repository name provided in request for status.")
+	}
+
 }
 
 func initOnDemandEndpoint(fdbURL string, fdbName string, authHeader string, debug bool) {
diff --git a/src/jetstream/plugins/monocular/chartsvc/utils/responses.go b/src/jetstream/plugins/monocular/chartsvc/utils/responses.go
index 00d6c105f2..3cab11ea20 100644
--- a/src/jetstream/plugins/monocular/chartsvc/utils/responses.go
+++ b/src/jetstream/plugins/monocular/chartsvc/utils/responses.go
@@ -39,6 +39,11 @@ type ApiResponse struct {
 //ApiListResponse is an API response in list format
 type ApiListResponse []*ApiResponse
 
+type SyncStatusResponse struct {
+	UUID  string `json:"uuid"`
+	State string `json:"state"`
+}
+
 //SelfLink the self-referencing URL to a chart in a response
 type SelfLink struct {
 	Self string `json:"self"`

From 035e5eaa04704e10577227f60738412dc5079181 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 24 Jan 2020 13:40:08 +0000
Subject: [PATCH 286/648] Tidy up/TODODs

---
 .../create-release.component.ts               | 10 ++--
 .../monocular-versions-list-config.service.ts | 57 -------------------
 .../monocular-versions-list-source.ts         | 27 ---------
 ... helm-release-pods-list-config.service.ts} |  2 +-
 ...ce.ts => helm-release-pods-list-source.ts} |  0
 ...m-release-services-list-config.service.ts} |  2 +-
 ...s => helm-release-services-list-source.ts} |  0
 ...s => helm-releases-list-config.service.ts} |  2 +-
 ...source.ts => helm-releases-list-source.ts} |  0
 .../helm-release-tab-base.component.ts        |  7 +--
 .../helm-release-pods-tab.component.ts        |  2 +-
 .../helm-release-services-tab.component.ts    |  2 +-
 .../releases-tab/releases-tab.component.ts    |  3 +-
 .../workloads/store/workloads.effects.ts      | 12 +---
 .../plugins/kubernetes/install_release.go     |  7 +--
 15 files changed, 15 insertions(+), 118 deletions(-)
 delete mode 100644 custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-config.service.ts
 delete mode 100644 custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-source.ts
 rename custom-src/frontend/app/custom/kubernetes/workloads/list-types/{monocular-release-pods-list-config.service.ts => helm-release-pods-list-config.service.ts} (91%)
 rename custom-src/frontend/app/custom/kubernetes/workloads/list-types/{monocular-release-pods-list-source.ts => helm-release-pods-list-source.ts} (100%)
 rename custom-src/frontend/app/custom/kubernetes/workloads/list-types/{monocular-release-services-list-config.service.ts => helm-release-services-list-config.service.ts} (91%)
 rename custom-src/frontend/app/custom/kubernetes/workloads/list-types/{monocular-release-services-list-source.ts => helm-release-services-list-source.ts} (100%)
 rename custom-src/frontend/app/custom/kubernetes/workloads/list-types/{monocular-releases-list-config.service.ts => helm-releases-list-config.service.ts} (98%)
 rename custom-src/frontend/app/custom/kubernetes/workloads/list-types/{monocular-releases-list-source.ts => helm-releases-list-source.ts} (100%)

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 1f15d77410..f184d0896a 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
@@ -78,10 +78,12 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     // Fetch the values.yaml for the Chart
     const valuesYamlUrl = `/pp/v1/chartsvc/v1/assets/${chart.repo}/${chart.chartName}/versions/${chart.version}/values.yaml`;
 
-    // TODO: RC Error handling
-    this.httpClient.get(valuesYamlUrl, { responseType: 'text' }).subscribe(response => {
-      this.valuesYaml = response;
-    });
+    this.httpClient.get(valuesYamlUrl, { responseType: 'text' })
+      .subscribe(response => {
+        this.valuesYaml = response;
+      }, err => {
+        console.error('Failed to fetch chart values: ', err.message || err);
+      });
   }
 
   private setupDetailsStep() {
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-config.service.ts
deleted file mode 100644
index 6ebae8b5c4..0000000000
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-config.service.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { Store } from '@ngrx/store';
-
-import { AppState } from '../../../../../store/src/app-state';
-import { ITableColumn } from '../../../shared/components/list/list-table/table.types';
-import {
-  TableCellEndpointNameComponent,
-} from '../../../shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component';
-import { IListConfig, ListViewTypes } from '../../../shared/components/list/list.component.types';
-import { HelmVersion } from '../store/helm.types';
-import { HelmVersionsDataSource } from './monocular-versions-list-source';
-
-// TODO: RC/NWM This isn't used anywhere, can HelmVersionsListConfig & HelmVersionsDataSource be deleted?
-@Injectable()
-export class HelmVersionsListConfig implements IListConfig<HelmVersion> {
-  isLocal = true;
-  dataSource: HelmVersionsDataSource;
-  viewType = ListViewTypes.TABLE_ONLY;
-  tableFixedRowHeight = true;
-  columns: ITableColumn<HelmVersion>[] = [
-    {
-      columnId: 'name',
-      headerCell: () => 'Cluster',
-      cellComponent: TableCellEndpointNameComponent,
-      cellFlex: '2'
-    },
-    {
-      columnId: 'version',
-      headerCell: () => 'Helm Version',
-      cellDefinition: {
-        getValue: (version) => version.Version ? version.Version.sem_ver : 'Not installed'
-      },
-      sort: {
-        type: 'sort',
-        orderKey: 'version',
-        field: 'Version.sem_ver'
-      },
-      cellFlex: '1'
-    },
-  ];
-
-
-  constructor(
-    private store: Store<AppState>,
-    public activatedRoute: ActivatedRoute,
-  ) {
-    this.dataSource = new HelmVersionsDataSource(this.store, this);
-  }
-
-  public getColumns = () => this.columns;
-  public getGlobalActions = () => [];
-  public getMultiActions = () => [];
-  public getSingleActions = () => [];
-  public getMultiFiltersConfigs = () => [];
-  public getDataSource = () => this.dataSource;
-}
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-source.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-source.ts
deleted file mode 100644
index ed1f8ca297..0000000000
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-versions-list-source.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Store } from '@ngrx/store';
-
-import { AppState } from '../../../../../store/src/app-state';
-import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
-import { IListConfig } from '../../../shared/components/list/list.component.types';
-import { helmEntityFactory } from '../helm-entity-factory';
-import { GetHelmVersions } from '../store/helm.actions';
-import { HelmVersion } from '../store/helm.types';
-
-export class HelmVersionsDataSource extends ListDataSource<HelmVersion> {
-
-  constructor(
-    store: Store<AppState>,
-    listConfig: IListConfig<any>
-  ) {
-    const action = new GetHelmVersions();
-    super({
-      store,
-      action,
-      schema: helmEntityFactory(action.entityType),
-      getRowUniqueId: (entity: HelmVersion) => entity.endpointId,
-      paginationKey: action.paginationKey,
-      isLocal: true,
-      listConfig,
-    });
-  }
-}
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-config.service.ts
similarity index 91%
rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-config.service.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-config.service.ts
index b44e58b5ce..7f433fd139 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-config.service.ts
@@ -4,7 +4,7 @@ import { AppState } from 'frontend/packages/store/src/app-state';
 
 import { BaseKubernetesPodsListConfigService } from '../../list-types/kubernetes-pods/kubernetes-pods-list-config.service';
 import { HelmReleaseHelperService } from '../release/tabs/helm-release-helper.service';
-import { HelmReleasePodsDataSource } from './monocular-release-pods-list-source';
+import { HelmReleasePodsDataSource } from './helm-release-pods-list-source';
 
 
 @Injectable()
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-pods-list-source.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-config.service.ts
similarity index 91%
rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-config.service.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-config.service.ts
index c9e4c0f0c4..d9d31a7505 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-config.service.ts
@@ -7,7 +7,7 @@ import {
   BaseKubernetesServicesListConfig,
 } from '../../list-types/kubernetes-services/kubernetes-service-list-config.service';
 import { HelmReleaseHelperService } from '../release/tabs/helm-release-helper.service';
-import { HelmReleaseServicesDataSource } from './monocular-release-services-list-source';
+import { HelmReleaseServicesDataSource } from './helm-release-services-list-source';
 
 @Injectable()
 export class HelmReleaseServicesListConfig extends BaseKubernetesServicesListConfig {
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-release-services-list-source.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-releases-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts
similarity index 98%
rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-releases-list-config.service.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts
index 1410e14d14..22d79e91ec 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-releases-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts
@@ -16,8 +16,8 @@ import { filter, map } from 'rxjs/operators';
 
 import { defaultHelmKubeListPageSize } from '../../list-types/kube-helm-list-types';
 import { HelmRelease } from '../workload.types';
+import { HelmReleasesDataSource } from './helm-releases-list-source';
 import { KubernetesNamespacesFilterItem, KubernetesNamespacesFilterService } from './kube-namespaces-filter-config.service';
-import { HelmReleasesDataSource } from './monocular-releases-list-source';
 
 @Injectable()
 export class HelmReleasesListConfig implements IListConfig<HelmRelease> {
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-releases-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/monocular-releases-list-source.ts
rename to custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts
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 1ed1dc73f9..9a24cf3dbb 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
@@ -98,12 +98,7 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
       }),
       map((message: string) => message),
       catchError(e => {
-        // TODO: RC/NWM Remove comments/handle error. Raise wrapper failed action to push error to store & notification bar?
-        console.log('WS Error');
-        console.log(e);
-        if (e.type === 'error') {
-          console.log(e);
-        }
+        console.error('Workload WS error: ', e);
         return [];
       })
     );
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts
index 7d52f8fb53..3e03a8e982 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ListConfig } from 'frontend/packages/core/src/shared/components/list/list.component.types';
 
-import { HelmReleasePodsListConfig } from '../../../list-types/monocular-release-pods-list-config.service';
+import { HelmReleasePodsListConfig } from '../../../list-types/helm-release-pods-list-config.service';
 
 @Component({
   selector: 'app-helm-release-pods-tab',
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.ts
index 1f4806fcc0..d2ea83b78b 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ListConfig } from 'frontend/packages/core/src/shared/components/list/list.component.types';
 
-import { HelmReleaseServicesListConfig } from '../../../list-types/monocular-release-services-list-config.service';
+import { HelmReleaseServicesListConfig } from '../../../list-types/helm-release-services-list-config.service';
 
 @Component({
   selector: 'app-helm-release-services-tab',
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts
index 3587e5ba8f..fd8813dbb9 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts
@@ -7,8 +7,8 @@ import { map } from 'rxjs/operators';
 
 import { ListConfig } from '../../../../shared/components/list/list.component.types';
 import { HELM_ENDPOINT_TYPE } from '../../../helm/helm-entity-factory';
+import { HelmReleasesListConfig } from '../list-types/helm-releases-list-config.service';
 import { KubernetesNamespacesFilterService } from '../list-types/kube-namespaces-filter-config.service';
-import { HelmReleasesListConfig } from '../list-types/monocular-releases-list-config.service';
 
 @Component({
   selector: 'app-releases-tab',
@@ -22,7 +22,6 @@ import { HelmReleasesListConfig } from '../list-types/monocular-releases-list-co
     KubernetesNamespacesFilterService,
   ]
 })
-// TODO: RC Rename all 'HelmRelease' files/names to 'Workload`
 export class HelmReleasesTabComponent implements OnInit {
   public helmIds$: Observable<string[]>;
 
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 6c77a0d388..10656a97fc 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
@@ -88,7 +88,7 @@ export class WorkloadsEffects {
     // Release name is unique for an endpoint - for Helm 3, include the namespace
     helmRelease.guid = endpointId + ':' + data.namespace + ':' + data.name;
     // Make a note of the guid of the endpoint for the release
-    helmRelease.status = this.mapHelmStatus(data.info.status);
+    helmRelease.status = data.info.status;
     helmRelease.lastDeployed = this.mapHelmModifiedDate(data.info.last_deployed);
     helmRelease.firstDeployed = this.mapHelmModifiedDate(data.info.first_deployed);
     return helmRelease;
@@ -119,16 +119,6 @@ export class WorkloadsEffects {
     );
   }
 
-  // function _mapHelmStatus(status: number) {
-  //   return HelmStatus[status].replace('_', ' ');
-  // }
-
-  private mapHelmStatus(status: string) {
-    // TODO: Capitalize first letter
-    return status;
-    // return HelmStatus[status].replace('_', ' ');
-  }
-
   private mapHelmModifiedDate(date: any) {
     let unix = date.seconds * 1000 + date.nanos / 1000;
     unix = Math.floor(unix);
diff --git a/src/jetstream/plugins/kubernetes/install_release.go b/src/jetstream/plugins/kubernetes/install_release.go
index 8d5088f8a1..2490459aa8 100644
--- a/src/jetstream/plugins/kubernetes/install_release.go
+++ b/src/jetstream/plugins/kubernetes/install_release.go
@@ -99,8 +99,6 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 	}
 
 	// In Helm 3, the namespace must already exist
-	// Check to see if the namespace exists
-	// TODO
 
 	kubeClient, _ := c.GetConfigForEndpointUser(endpointGUID, userGUID)
 	clientset, _ := kubernetes.NewForConfig(kubeClient)
@@ -112,11 +110,8 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 		return interfaces.NewJetstreamError(msg)
 	}
 
-	// Create the namespace if it does not exist and the user asked us to
-	// TODO
-
 	// Check release name is valid and does not already exist
-	// TODO
+	// TODO: NWM
 
 	install := action.NewInstall(config)
 	install.ReleaseName = params.Name

From f8883dc6547d265e46462df4be73213ef1ff4353 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 24 Jan 2020 15:33:16 +0000
Subject: [PATCH 287/648] Fix production build issue

---
 src/frontend/packages/core/src/shared/shared.module.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index 908bc38429..388e2179cb 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -224,6 +224,7 @@ import { UserPermissionDirective } from './user-permission.directive';
     CopyToClipboardComponent,
     SidepanelPreviewComponent,
     TileSelectorTileComponent,
+    CardProgressOverlayComponent,
   ],
   exports: [
     ApplicationStateIconPipe,
@@ -316,6 +317,7 @@ import { UserPermissionDirective } from './user-permission.directive';
     CopyToClipboardComponent,
     SidepanelPreviewComponent,
     TileSelectorTileComponent,
+    CardProgressOverlayComponent,
   ],
   entryComponents: [
     DialogConfirmComponent,

From f72a271ef960d16fb7b024580d1cc9c93188d94e Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 24 Jan 2020 15:37:30 +0000
Subject: [PATCH 288/648] Fix missing import

---
 src/frontend/packages/core/src/shared/shared.module.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index 388e2179cb..2b55acd4d1 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -120,6 +120,7 @@ import { CloudFoundryUserProvidedServicesService } from './services/cloud-foundr
 import { LongRunningOperationsService } from './services/long-running-op.service';
 import { MetricsRangeSelectorService } from './services/metrics-range-selector.service';
 import { UserPermissionDirective } from './user-permission.directive';
+import { CardProgressOverlayComponent } from './components/card-progress-overlay/card-progress-overlay.component';
 
 
 @NgModule({

From 8e0d39dddf885092094e714ddfbadda8d48cb972 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Fri, 24 Jan 2020 16:47:51 +0000
Subject: [PATCH 289/648] Add more code for sync status retrieval

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 .../monocular/chart-repo/api_endpoint.go      | 12 +++-----
 .../monocular/chart-repo/common/types.go      | 28 +++++++++++++++++++
 .../chart-repo/foundationdb/utils.go          | 28 +++++++++++++++++--
 3 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
index 1ba08a0899..4cb79a079f 100644
--- a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
+++ b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
@@ -31,6 +31,7 @@ import (
 	"github.com/urfave/negroni"
 	"go.mongodb.org/mongo-driver/mongo/options"
 
+	"github.com/helm/monocular/chartrepo/common"
 	fdb "github.com/helm/monocular/chartrepo/foundationdb"
 	responses "github.com/helm/monocular/chartsvc/utils"
 )
@@ -41,8 +42,6 @@ var fdbClient fdb.Client
 var fDBName string
 var authorizationHeader string
 
-var repoJobStatus map[string]string
-
 // Params a key-value map of path params
 type Params map[string]string
 
@@ -66,7 +65,6 @@ func setupRoutes() http.Handler {
 	apiv1 := r.PathPrefix(pathPrefix).Subrouter()
 	apiv1.Methods("PUT").Path("/sync/{repo}").Handler(WithParams(OnDemandSync))
 	apiv1.Methods("PUT").Path("/delete/{repo}").Handler(WithParams(OnDemandDelete))
-
 	apiv1.Methods("GET").Path("/status/{repo}").Handler(WithParams(RepoSyncStatus))
 
 	n := negroni.Classic()
@@ -120,11 +118,8 @@ func OnDemandSync(w http.ResponseWriter, req *http.Request, params Params) {
 
 	go fdb.SyncRepo(fdbClient, fDBName, repoName, repoURL, authorizationHeader, clientKeepAlive)
 
-	//TODO Kate maintain repo sync status with last successful/failed/in-progress sync UUID
-	repoJobStatus[repoName]
-
 	//Return sync status in response
-	response := responses.SyncStatusResponse{requestUUID.String(), "Syncing"}
+	response := responses.SyncStatusResponse{requestUUID.String(), common.SyncStatusInProgress}
 	js, err := json.Marshal(response)
 	if err != nil {
 		log.Error(err.Error())
@@ -176,7 +171,8 @@ func RepoSyncStatus(w http.ResponseWriter, req *http.Request, params Params) {
 	if repoName == "" {
 		log.Fatal("No Repository name provided in request for status.")
 	}
-
+	//TODO kate write status to response
+	GetRepoSyncStatus(repoName)
 }
 
 func initOnDemandEndpoint(fdbURL string, fdbName string, authHeader string, debug bool) {
diff --git a/src/jetstream/plugins/monocular/chart-repo/common/types.go b/src/jetstream/plugins/monocular/chart-repo/common/types.go
index 5de9e80ddc..f9b105d1c1 100644
--- a/src/jetstream/plugins/monocular/chart-repo/common/types.go
+++ b/src/jetstream/plugins/monocular/chart-repo/common/types.go
@@ -18,6 +18,7 @@ package common
 
 import (
 	"net/http"
+	"sync"
 	"time"
 )
 
@@ -87,3 +88,30 @@ type ImportChartFilesJob struct {
 type HTTPClient interface {
 	Do(req *http.Request) (*http.Response, error)
 }
+
+type RepoSyncStatus struct {
+	Repo   string `json:"repo"`
+	URL    string `json:"url"`
+	Status string `json:"status"`
+}
+
+type SyncStatusMap struct {
+	mut       sync.Mutex
+	statusMap map[string]RepoSyncStatus
+}
+
+func (m *SyncStatusMap) Set(repo string, status RepoSyncStatus) {
+	m.mut.Lock()
+	defer m.mut.Unlock()
+	m.statusMap[repo] = status
+}
+
+func (m *SyncStatusMap) Get(repo string) RepoSyncStatus {
+	m.mut.Lock()
+	defer m.mut.Unlock()
+	return m.statusMap[repo]
+}
+
+const SyncStatusFailed = "Failed"
+const SyncStatusSuccess = "Synchronized"
+const SyncStatusInProgress = "Synchronizing"
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
index 597f168b85..ae723d1c31 100644
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
@@ -49,6 +49,7 @@ const (
 )
 
 var netClient common.HTTPClient = &http.Client{}
+var repoSyncStatus common.SyncStatusMap
 
 func init() {
 	var err error
@@ -69,6 +70,9 @@ func init() {
 // charts before fetching readmes for each chart and version pair.
 func SyncRepo(dbClient Client, dbName, repoName, repoURL string, authorizationHeader string, clientKeepAlive bool) error {
 
+	//TODO Kate maintain repo sync status with last successful/failed/in-progress sync UUID
+	repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusInProgress})
+
 	db, closer := dbClient.Database(dbName)
 
 	log.Infof("Keeping client alive: %v", clientKeepAlive)
@@ -78,7 +82,8 @@ func SyncRepo(dbClient Client, dbName, repoName, repoURL string, authorizationHe
 
 	url, err := common.ParseRepoURL(repoURL)
 	if err != nil {
-		log.WithFields(log.Fields{"url": repoURL}).WithError(err).Error("failed to parse URL")
+		log.WithFields(log.Fields{"url": repoURL}).WithError(err).Error("Failed to parse Repo URL")
+		repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusFailed})
 		return err
 	}
 
@@ -87,8 +92,9 @@ func SyncRepo(dbClient Client, dbName, repoName, repoURL string, authorizationHe
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	res, err := collection.InsertOne(ctx, bson.M{"name": "pi", "value": 3.14159}, options.InsertOne())
 	if err != nil {
-		log.Fatalf("Database readiness/connection test failed: %v", err)
+		log.Errorf("Database readiness/connection test failed: %v", err)
 		cancel()
+		repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusFailed})
 		return err
 	}
 	id := res.InsertedID
@@ -100,33 +106,43 @@ func SyncRepo(dbClient Client, dbName, repoName, repoURL string, authorizationHe
 	r := common.Repo{Name: repoName, URL: url.String(), AuthorizationHeader: authorizationHeader}
 	repoBytes, err := common.FetchRepoIndex(r, netClient)
 	if err != nil {
+		log.Errorf("Failed to fetch repo index: %v", err)
+		repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusFailed})
 		return err
 	}
 
 	repoChecksum, err := common.GetSha256(repoBytes)
 	if err != nil {
+		log.Errorf("Failed to generate repo checksum: %v", err)
+		repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusFailed})
 		return err
 	}
 
 	// Check if the repo has been already processed
 	if repoAlreadyProcessed(db, repoName, repoChecksum) {
 		log.WithFields(log.Fields{"url": repoURL}).Info("Skipping repository since there are no updates")
+		repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusSuccess})
 		return nil
 	}
 
 	index, err := common.ParseRepoIndex(repoBytes)
 	if err != nil {
+		log.Errorf("Error parsing repo index: %v", err)
+		repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusFailed})
 		return err
 	}
 
 	charts := common.ChartsFromIndex(index, r)
 	log.Debugf("%v Charts in index of repo: %v", len(charts), repoURL)
 	if len(charts) == 0 {
+		repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, "Synchronized"})
 		return errors.New("no charts in repository index")
 	}
 
 	err = importCharts(db, dbName, charts)
 	if err != nil {
+		log.Errorf("Error importing charts: %v", err)
+		repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusFailed})
 		return err
 	}
 
@@ -174,10 +190,12 @@ func SyncRepo(dbClient Client, dbName, repoName, repoURL string, authorizationHe
 
 	// Update cache in the database
 	if err = updateLastCheck(db, repoName, repoChecksum, time.Now()); err != nil {
+		log.Errorf("Error updating last repo check timestamp: %v", err)
+		repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusFailed})
 		return err
 	}
 	log.WithFields(log.Fields{"url": repoURL}).Info("Stored repository update in cache")
-
+	repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusSuccess})
 	return nil
 }
 
@@ -474,6 +492,10 @@ func fetchAndImportFiles(db Database, name string, r common.Repo, cv common.Char
 	return nil
 }
 
+func GetRepoSyncStatus(repo string) common.RepoSyncStatus {
+	return repoSyncStatus.Get(repo)
+}
+
 func database(client *mongo.Client, dbName string) (*mongo.Database, func()) {
 
 	db := client.Database(dbName)

From b0d0cbb7204349cadf549acf41307d14a980d811 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 24 Jan 2020 17:17:50 +0000
Subject: [PATCH 290/648] First round of tweaks

---
 ...ube-sort.helper.ts => kube-list.helper.ts} | 23 +++++++++++-
 ...bernetes-namespaces-list-config.service.ts |  4 +-
 .../kubernetes-nodes-list-config.service.ts   |  5 ++-
 .../kubernetes-pods-list-config.service.ts    | 37 ++++++++-----------
 .../kubernetes-service-list-config.service.ts |  2 +
 .../app/custom/kubernetes/store/kube.types.ts |  4 +-
 .../helm-releases-list-config.service.ts      |  5 ++-
 7 files changed, 49 insertions(+), 31 deletions(-)
 rename custom-src/frontend/app/custom/kubernetes/list-types/{kube-sort.helper.ts => kube-list.helper.ts} (65%)

diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kube-sort.helper.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kube-list.helper.ts
similarity index 65%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kube-sort.helper.ts
rename to custom-src/frontend/app/custom/kubernetes/list-types/kube-list.helper.ts
index 97db07b968..f63fbb6ae7 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kube-sort.helper.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kube-list.helper.ts
@@ -1,5 +1,8 @@
+import * as moment from 'moment';
+
 import { DataFunction } from '../../../shared/components/list/data-sources-controllers/list-data-source';
-import { ConditionType, KubernetesNode } from '../store/kube.types';
+import { ITableColumn } from '../../../shared/components/list/list-table/table.types';
+import { BasicKubeAPIResource, ConditionType, KubernetesNode } from '../store/kube.types';
 
 export function getConditionSort(condition: ConditionType): DataFunction<KubernetesNode> {
   return (entities, paginationState) => {
@@ -31,3 +34,21 @@ export function getContainerLengthSort(entities, paginationState) {
     }
   });
 }
+
+export function createKubeAgeColumn<T extends BasicKubeAPIResource>(): ITableColumn<T> {
+  return {
+    columnId: 'age',
+    headerCell: () => 'Age',
+    cellDefinition: {
+      getValue: (row: T) => {
+        return moment(row.metadata.creationTimestamp).fromNow(true);
+      }
+    },
+    sort: {
+      type: 'sort',
+      orderKey: 'age',
+      field: 'metadata.creationTimestamp'
+    },
+    cellFlex: '1'
+  };
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
index f4093d2b7c..4553399f16 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
@@ -10,6 +10,7 @@ import { KubernetesNamespace } from '../../../kubernetes/store/kube.types';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
 import { defaultHelmKubeListPageSize } from '../kube-helm-list-types';
+import { createKubeAgeColumn } from '../kube-list.helper';
 import { KubeNamespacePodCountComponent } from './kube-namespace-pod-count/kube-namespace-pod-count.component';
 import { KubernetesNamespaceLinkComponent } from './kubernetes-namespace-link/kubernetes-namespace-link.component';
 import { KubernetesNamespacesDataSource } from './kubernetes-namespaces-data-source';
@@ -41,7 +42,7 @@ export class KubernetesNamespacesListConfigService implements IListConfig<Kubern
       cellFlex: '3',
     },
     {
-      columnId: 'pods', headerCell: () => 'No. of Pods',
+      columnId: 'pods', headerCell: () => 'Pods',
       cellComponent: KubeNamespacePodCountComponent,
       cellFlex: '5',
     },
@@ -57,6 +58,7 @@ export class KubernetesNamespacesListConfigService implements IListConfig<Kubern
       },
       cellFlex: '5',
     },
+    createKubeAgeColumn()
   ];
 
   pageSizeOptions = defaultHelmKubeListPageSize;
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
index 5d10ab5b48..17641970eb 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
@@ -9,7 +9,7 @@ import { IListConfig, IListFilter, ListViewTypes } from '../../../../shared/comp
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { ConditionType, KubernetesAddressExternal, KubernetesAddressInternal, KubernetesNode } from '../../store/kube.types';
 import { defaultHelmKubeListPageSize } from '../kube-helm-list-types';
-import { getConditionSort } from '../kube-sort.helper';
+import { createKubeAgeColumn, getConditionSort } from '../kube-list.helper';
 import { ConditionCellComponent } from './condition-cell/condition-cell.component';
 import { KubernetesNodeCapacityComponent } from './kubernetes-node-capacity/kubernetes-node-capacity.component';
 import { KubernetesNodeIpsComponent } from './kubernetes-node-ips/kubernetes-node-ips.component';
@@ -66,7 +66,7 @@ export class KubernetesNodesListConfigService implements IListConfig<KubernetesN
       cellFlex: '2',
     },
     {
-      columnId: 'numPods', headerCell: () => 'No. of Pods',
+      columnId: 'numPods', headerCell: () => 'Pods',
       cellComponent: NodePodCountComponent,
       cellFlex: '2',
     },
@@ -81,6 +81,7 @@ export class KubernetesNodesListConfigService implements IListConfig<KubernetesN
     //   cellComponent: KubernetesLabelsCellComponent,
     //   cellFlex: '6',
     // },
+    createKubeAgeColumn()
   ];
   filters: IListFilter[] = [
     {
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
index 41bcc574bd..64b212d95d 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
@@ -3,7 +3,6 @@ import { Store } from '@ngrx/store';
 import {
   IListDataSource,
 } from 'frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source-types';
-import * as moment from 'moment';
 
 import { AppState } from '../../../../../../store/src/app-state';
 import { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
@@ -11,15 +10,25 @@ import { IListConfig, ListViewTypes } from '../../../../shared/components/list/l
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesPod } from '../../store/kube.types';
 import { defaultHelmKubeListPageSize } from '../kube-helm-list-types';
+import { createKubeAgeColumn } from '../kube-list.helper';
 import { KubernetesPodReadinessComponent } from './kubernetes-pod-readiness/kubernetes-pod-readiness.component';
+import { KubernetesPodStatusComponent } from './kubernetes-pod-status/kubernetes-pod-status.component';
 import { KubernetesPodsDataSource } from './kubernetes-pods-data-source';
 import { PodNameLinkComponent } from './pod-name-link/pod-name-link.component';
 
 export abstract class BaseKubernetesPodsListConfigService implements IListConfig<KubernetesPod> {
 
+  static namespaceColumnId = 'namespace';
   public showNamespaceLink = true;
 
-  constructor(private kubeId: string) { }
+  constructor(
+    private kubeId: string,
+    showNamespaces = false
+  ) {
+    if (!showNamespaces) {
+      this.columns = this.columns.filter(column => column.columnId !== BaseKubernetesPodsListConfigService.namespaceColumnId);
+    }
+  }
 
   columns: Array<ITableColumn<KubernetesPod>> = [
     {
@@ -39,7 +48,7 @@ export abstract class BaseKubernetesPodsListConfigService implements IListConfig
     //   cellFlex: '5',
     // },
     {
-      columnId: 'namespace', headerCell: () => 'Namespace',
+      columnId: BaseKubernetesPodsListConfigService.namespaceColumnId, headerCell: () => 'Namespace',
       cellDefinition: {
         valuePath: 'metadata.namespace',
         getLink: row => this.showNamespaceLink ? `/kubernetes/${this.kubeId}/namespaces/${row.metadata.namespace}` : null
@@ -66,9 +75,7 @@ export abstract class BaseKubernetesPodsListConfigService implements IListConfig
     },
     {
       columnId: 'status', headerCell: () => 'Status',
-      cellDefinition: {
-        valuePath: 'status.phase'
-      },
+      cellComponent: KubernetesPodStatusComponent,
       sort: {
         type: 'sort',
         orderKey: 'status',
@@ -87,21 +94,7 @@ export abstract class BaseKubernetesPodsListConfigService implements IListConfig
       },
       cellFlex: '1'
     },
-    {
-      columnId: 'age',
-      headerCell: () => 'Age',
-      cellDefinition: {
-        getValue: (row: any) => {
-          return moment(row.metadata.creationTimestamp).fromNow(true);
-        }
-      },
-      sort: {
-        type: 'sort',
-        orderKey: 'age',
-        field: 'metadata.creationTimestamp'
-      },
-      cellFlex: '1'
-    }
+    createKubeAgeColumn()
   ];
 
   pageSizeOptions = defaultHelmKubeListPageSize;
@@ -130,7 +123,7 @@ export class KubernetesPodsListConfigService extends BaseKubernetesPodsListConfi
     store: Store<AppState>,
     kubeId: BaseKubeGuid,
   ) {
-    super(kubeId.guid);
+    super(kubeId.guid, true);
     this.podsDataSource = new KubernetesPodsDataSource(store, kubeId, this);
   }
 
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
index cc47429e42..5893430c8b 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
@@ -3,6 +3,7 @@ import { ITableColumn } from '../../../../shared/components/list/list-table/tabl
 import { IListConfig, ListViewTypes } from '../../../../shared/components/list/list.component.types';
 import { KubeService } from '../../store/kube.types';
 import { defaultHelmKubeListPageSize } from '../kube-helm-list-types';
+import { createKubeAgeColumn } from '../kube-list.helper';
 import { KubernetesServicePortsComponent } from '../kubernetes-service-ports/kubernetes-service-ports.component';
 import { KubeServiceCardComponent } from './kubernetes-service-card/kubernetes-service-card.component';
 
@@ -42,6 +43,7 @@ export abstract class BaseKubernetesServicesListConfig implements IListConfig<Ku
       cellComponent: KubernetesServicePortsComponent,
       cellFlex: '4'
     },
+    createKubeAgeColumn()
   ];
 
   pageSizeOptions = defaultHelmKubeListPageSize;
diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
index 8df733a37f..7cdb1a1358 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
@@ -10,9 +10,7 @@ export const KubernetesDefaultState = {
 };
 
 export interface BasicKubeAPIResource {
-  metadata: {
-    uid: string
-  };
+  metadata: Metadata;
   status: any;
   spec: any;
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts
index 22d79e91ec..b275e2e27e 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts
@@ -60,7 +60,8 @@ export class HelmReleasesListConfig implements IListConfig<HelmRelease> {
       columnId: 'namespace',
       headerCell: () => 'Namespace',
       cellDefinition: {
-        valuePath: 'namespace'
+        valuePath: 'namespace',
+        getLink: row => `/kubernetes/${row.endpointId}/namespaces/${row.namespace}`
       },
       sort: {
         type: 'sort',
@@ -73,7 +74,7 @@ export class HelmReleasesListConfig implements IListConfig<HelmRelease> {
       columnId: 'status',
       headerCell: () => 'Status',
       cellDefinition: {
-        valuePath: 'status'
+        getValue: row => row.status.charAt(0).toUpperCase() + row.status.substring(1)
       },
       sort: {
         type: 'sort',

From 6237a96a4617c2558bb6d7234426eded6abb50e9 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 24 Jan 2020 17:18:13 +0000
Subject: [PATCH 291/648] Fix unconnectable endpoint favourites card

---
 .../favorites-meta-card.component.ts                   | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

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 c783f8672f..7476f5156f 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
@@ -75,7 +75,7 @@ export class FavoritesMetaCardComponent {
       const endpoint$ = this.store.select(endpointEntitiesSelector).pipe(
         map(endpoints => endpoints[favoriteEntity.favorite.endpointId])
       );
-      this.endpointConnected$ = endpoint$.pipe(map(endpoint => !!endpoint.user));
+      this.endpointConnected$ = endpoint$.pipe(map(endpoint => isEndpointConnected(endpoint)));
       this.actions$ = this.endpointConnected$.pipe(
         map(connected => connected ? this.config.menuItems : [])
       );
@@ -100,13 +100,11 @@ export class FavoritesMetaCardComponent {
       const config = cardMapper && favorite && favorite.metadata ? cardMapper(favorite.metadata) : null;
 
       if (config) {
+        this.name$ = observableOf(config.name);
         if (this.endpoint) {
-          // this.name$ = endpoint$.pipe(map(endpoint => config.name + (endpoint.user ? '' : ' (Disconnected)')));
-          this.name$ = observableOf(config.name);
-          this.routerLink$ = endpoint$.pipe(map(endpoint => isEndpointConnected(endpoint) ? config.routerLink : '/endpoints'));
+          this.routerLink$ = this.endpointConnected$.pipe(map(connected => connected ? config.routerLink : '/endpoints'));
         } else {
-          this.name$ = observableOf(config.name);
-          this.routerLink$ = endpoint$.pipe(map(endpoint => isEndpointConnected(endpoint) ? config.routerLink : null));
+          this.routerLink$ = this.endpointConnected$.pipe(map(connected => connected ? config.routerLink : null));
         }
         config.lines = this.mapLinesToObservables(config.lines);
         this.config = config;

From 3e8488732893e3425a0b49ea957f266c499bcc99 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 24 Jan 2020 17:44:41 +0000
Subject: [PATCH 292/648] Add helm release list card view

---
 .../helm-release-card.component.html          | 35 +++++++++++++++++
 .../helm-release-card.component.scss          |  6 +++
 .../helm-release-card.component.spec.ts       | 25 ++++++++++++
 .../helm-release-card.component.ts            | 38 +++++++++++++++++++
 .../helm-releases-list-config.service.ts      |  6 ++-
 .../kubernetes/workloads/workloads.module.ts  |  3 ++
 .../packages/core/src/shared/shared.module.ts |  6 ++-
 7 files changed, 117 insertions(+), 2 deletions(-)
 create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
 create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss
 create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts

diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
new file mode 100644
index 0000000000..dc05a059c3
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
@@ -0,0 +1,35 @@
+<app-meta-card class="release-card" [routerLink]="row.guid">
+  <app-meta-card-title>
+    <app-multiline-title>{{ row.name }}</app-multiline-title>
+  </app-meta-card-title>
+  <app-meta-card-item>
+    <app-meta-card-key>Cluster</app-meta-card-key>
+    <app-meta-card-value>
+      <app-table-cell-endpoint-name [row]="row"></app-table-cell-endpoint-name>
+    </app-meta-card-value>
+  </app-meta-card-item>
+  <app-meta-card-item>
+    <app-meta-card-key>Namespace</app-meta-card-key>
+    <app-meta-card-value>
+      <a routerLink="/kubernetes/{{row.endpointId}}/namespaces/{{row.namespace}}">{{ row.namespace}}</a>
+    </app-meta-card-value>
+  </app-meta-card-item>
+  <app-meta-card-item>
+    <app-meta-card-key>Status</app-meta-card-key>
+    <app-meta-card-value>
+      {{ row.status | titlecase }}
+    </app-meta-card-value>
+  </app-meta-card-item>
+  <app-meta-card-item>
+    <app-meta-card-key>Version</app-meta-card-key>
+    <app-meta-card-value>
+      {{ row.version }}
+    </app-meta-card-value>
+  </app-meta-card-item>
+  <app-meta-card-item>
+    <app-meta-card-key>Last Deployed</app-meta-card-key>
+    <app-meta-card-value>
+      {{ row.info.last_deployed | date:'medium' }}
+    </app-meta-card-value>
+  </app-meta-card-item>
+</app-meta-card>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss
new file mode 100644
index 0000000000..4f87607278
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss
@@ -0,0 +1,6 @@
+.release-card {
+  cursor: pointer;
+  &:focus {
+    outline: 0;
+  }
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts
new file mode 100644
index 0000000000..e4aab8b8dc
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HelmReleaseCardComponent } from './helm-release-card.component';
+
+describe('HelmReleaseCardComponent', () => {
+  let component: HelmReleaseCardComponent;
+  let fixture: ComponentFixture<HelmReleaseCardComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ HelmReleaseCardComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(HelmReleaseCardComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts
new file mode 100644
index 0000000000..e99b9d7865
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts
@@ -0,0 +1,38 @@
+import { DatePipe } from '@angular/common';
+import { Component, Input, OnInit } from '@angular/core';
+
+import { CardCell } from '../../../../../shared/components/list/list.types';
+import { HelmRelease } from '../../workload.types';
+
+@Component({
+  selector: 'app-helm-release-card',
+  templateUrl: './helm-release-card.component.html',
+  styleUrls: ['./helm-release-card.component.scss']
+})
+export class HelmReleaseCardComponent extends CardCell<HelmRelease> implements OnInit {
+
+  public status: string;
+  public lastDeployed: string;
+  private pRow: HelmRelease;
+
+  @Input('row')
+  set row(row: HelmRelease) {
+    this.pRow = row;
+    if (row) {
+      this.status = row.status.charAt(0).toUpperCase() + row.status.substring(1);
+      this.lastDeployed = this.datePipe.transform(row.info.last_deployed, 'medium');
+    }
+  }
+  get row(): HelmRelease {
+    return this.pRow;
+  }
+
+
+  constructor(private datePipe: DatePipe) {
+    super();
+  }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts
index b275e2e27e..c956a9dc24 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts
@@ -14,8 +14,10 @@ import {
 import { AppState } from 'frontend/packages/store/src/app-state';
 import { filter, map } from 'rxjs/operators';
 
+import { ListView } from '../../../../../../store/src/actions/list.actions';
 import { defaultHelmKubeListPageSize } from '../../list-types/kube-helm-list-types';
 import { HelmRelease } from '../workload.types';
+import { HelmReleaseCardComponent } from './helm-release-card/helm-release-card.component';
 import { HelmReleasesDataSource } from './helm-releases-list-source';
 import { KubernetesNamespacesFilterItem, KubernetesNamespacesFilterService } from './kube-namespaces-filter-config.service';
 
@@ -24,7 +26,8 @@ export class HelmReleasesListConfig implements IListConfig<HelmRelease> {
 
   isLocal = true;
   dataSource: HelmReleasesDataSource;
-  viewType = ListViewTypes.TABLE_ONLY;
+  viewType = ListViewTypes.BOTH;
+  defaultView = 'cards' as ListView;
   text = {
     title: '',
     filter: 'Filter by Name',
@@ -32,6 +35,7 @@ export class HelmReleasesListConfig implements IListConfig<HelmRelease> {
   pageSizeOptions = defaultHelmKubeListPageSize;
   enableTextFilter = true;
   tableFixedRowHeight = true;
+  cardComponent = HelmReleaseCardComponent;
   columns: ITableColumn<HelmRelease>[] = [
     {
       columnId: 'name',
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts b/custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts
index 18349d8b6d..00353af4b2 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts
@@ -5,6 +5,7 @@ import { NgxGraphModule } from '@swimlane/ngx-graph';
 import { CoreModule } from '../../../core/core.module';
 import { SharedModule } from '../../../shared/shared.module';
 import { KubernetesModule } from '../kubernetes.module';
+import { HelmReleaseCardComponent } from './list-types/helm-release-card/helm-release-card.component';
 import { HelmReleaseTabBaseComponent } from './release/helm-release-tab-base/helm-release-tab-base.component';
 import { HelmReleaseNotesTabComponent } from './release/tabs/helm-release-notes-tab/helm-release-notes-tab.component';
 import { HelmReleasePodsTabComponent } from './release/tabs/helm-release-pods/helm-release-pods-tab.component';
@@ -41,9 +42,11 @@ import { WorkloadsRouting } from './workloads.routing';
     HelmReleaseServicesTabComponent,
     HelmReleaseResourceGraphComponent,
     HelmReleaseResourcePreviewComponent,
+    HelmReleaseCardComponent,
   ],
   entryComponents: [
     HelmReleaseResourcePreviewComponent,
+    HelmReleaseCardComponent
   ]
 })
 export class WorkloadsModule { }
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index 8979cf7923..1e26c3f954 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -65,6 +65,9 @@ import { listTableComponents } from './components/list/list-table/table.types';
 import { EndpointCardComponent } from './components/list/list-types/endpoint/endpoint-card/endpoint-card.component';
 import { EndpointListHelper } from './components/list/list-types/endpoint/endpoint-list.helpers';
 import { EndpointsListConfigService } from './components/list/list-types/endpoint/endpoints-list-config.service';
+import {
+  TableCellEndpointNameComponent,
+} from './components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component';
 import { ListComponent } from './components/list/list.component';
 import { ListConfig } from './components/list/list.component.types';
 import { ListHostDirective } from './components/list/simple-list/list-host.directive';
@@ -320,7 +323,8 @@ import { UserPermissionDirective } from './user-permission.directive';
     CopyToClipboardComponent,
     SidepanelPreviewComponent,
     TileSelectorTileComponent,
-    SidepanelPreviewComponent
+    SidepanelPreviewComponent,
+    TableCellEndpointNameComponent
   ],
   entryComponents: [
     DialogConfirmComponent,

From feaf7150cf428f59fff258d27d0726ad6f1b15db Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Sat, 25 Jan 2020 17:35:23 +0000
Subject: [PATCH 293/648] Fix for tests where state can be null

---
 src/frontend/packages/core/src/core/theme.service.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/frontend/packages/core/src/core/theme.service.ts b/src/frontend/packages/core/src/core/theme.service.ts
index f5ee16ba18..2d8efab76a 100644
--- a/src/frontend/packages/core/src/core/theme.service.ts
+++ b/src/frontend/packages/core/src/core/theme.service.ts
@@ -2,7 +2,7 @@ import { OverlayContainer } from '@angular/cdk/overlay';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import { first, map, filter } from 'rxjs/operators';
 
 import { SetThemeAction } from '../../../store/src/actions/dashboard-actions';
 import { DashboardOnlyAppState } from '../../../store/src/app-state';
@@ -57,6 +57,7 @@ export class ThemeService {
 
   getTheme(): Observable<StratosTheme> {
     return this.store.select(selectDashboardState).pipe(
+      filter(dashboardState => !!dashboardState),
       map(dashboardState => this.findTheme(dashboardState.themeKey)),
     );
   }
@@ -145,7 +146,7 @@ export class ThemeService {
     this.osThemeInfo.isNotSpecified = window.matchMedia('(prefers-color-scheme: no-preference)').matches;
 
     this.store.select(selectDashboardState).pipe(
-      first()
+      first(),
     ).subscribe(dashboardState => dashboardState.themeKey === osTheme.key && this.setTheme(osTheme.key));
   }
 }

From 41c3d36c3009ee197b8ef9e8f6b9b84f2e9152e3 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Sun, 26 Jan 2020 08:55:11 +0000
Subject: [PATCH 294/648] Update config-init.yaml

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

diff --git a/deploy/kubernetes/console/templates/config-init.yaml b/deploy/kubernetes/console/templates/config-init.yaml
index d3a90d1848..8bcfec914c 100644
--- a/deploy/kubernetes/console/templates/config-init.yaml
+++ b/deploy/kubernetes/console/templates/config-init.yaml
@@ -130,7 +130,7 @@ spec:
           claimName: "{{ .Release.Name }}-encryption-key-volume"
 ---
 {{- if .Values.autoCleanup }}
-Cleanup job will delete the created secret when the release is deleted
+# Cleanup job will delete the created secret when the release is deleted
 apiVersion: "batch/v1"
 kind: "Job"
 metadata:

From 846e906dd8a174caaf80a239b678234be17aea7f Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 27 Jan 2020 09:31:04 +0000
Subject: [PATCH 295/648] Tidy ups

---
 src/jetstream/main.go                            |  5 +++--
 src/jetstream/portal_proxy.go                    | 16 ----------------
 .../repository/console_config/env_lookup.go      |  3 +--
 .../repository/interfaces/portal_proxy.go        |  6 ------
 src/jetstream/repository/interfaces/structs.go   | 11 ++++++++++-
 5 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/src/jetstream/main.go b/src/jetstream/main.go
index 6e5a055ae7..967889a5fb 100644
--- a/src/jetstream/main.go
+++ b/src/jetstream/main.go
@@ -146,6 +146,9 @@ func main() {
 		log.SetLevel(level)
 	}
 
+	// Intially, default state is that DB Migrations can be performed
+	portalConfig.CanMigrateDatabaseSchema = true
+
 	log.Info("Configuration loaded.")
 	isUpgrading := isConsoleUpgrading(envLookup)
 
@@ -299,8 +302,6 @@ func main() {
 	portalProxy.Plugins = initedPlugins
 	log.Info("Plugins initialized")
 
-	portalProxy.SetCanPerformMigrations(portalConfig.CanMigrateDatabaseSchema)
-
 	var needSetupMiddleware bool
 
 	// At this stage, all plugins have had a chance to modify configurtion based on hosting environment
diff --git a/src/jetstream/portal_proxy.go b/src/jetstream/portal_proxy.go
index 56196d5e72..551bdba940 100644
--- a/src/jetstream/portal_proxy.go
+++ b/src/jetstream/portal_proxy.go
@@ -32,19 +32,3 @@ type HttpSessionStore interface {
 	StopCleanup(quit chan<- struct{}, done <-chan struct{})
 	Cleanup(interval time.Duration) (chan<- struct{}, <-chan struct{})
 }
-
-// canPerformMigrations indicates if we can safely perform migrations
-// This depends on the deployment mechanism and the database config
-// e.g. if running in Cloud Foundry with a shared DB, then only the 0-index application instance
-// can perform migrations
-var canPerformMigrations = true
-
-// SetCanPerformMigrations updates the state that records if we can perform Database migrations
-func (p *portalProxy) SetCanPerformMigrations(value bool) {
-	canPerformMigrations = canPerformMigrations && value
-}
-
-// CanPerformMigrations returns if we can perform Database migrations
-func (p *portalProxy) CanPerformMigrations() bool {
-	return canPerformMigrations
-}
diff --git a/src/jetstream/repository/console_config/env_lookup.go b/src/jetstream/repository/console_config/env_lookup.go
index d5d3997200..f22e3b347e 100644
--- a/src/jetstream/repository/console_config/env_lookup.go
+++ b/src/jetstream/repository/console_config/env_lookup.go
@@ -56,8 +56,7 @@ func MigrateSetupData(portal interfaces.PortalProxy, configStore Repository) err
 	}
 
 	// If we got a value, then we should migrate
-
-	if !portal.CanPerformMigrations() {
+	if !portal.GetConfig().CanMigrateDatabaseSchema {
 		log.Info("Will not migrate setup data on this instance")
 		return nil
 	}
diff --git a/src/jetstream/repository/interfaces/portal_proxy.go b/src/jetstream/repository/interfaces/portal_proxy.go
index 2ed2287722..2df75c12c0 100644
--- a/src/jetstream/repository/interfaces/portal_proxy.go
+++ b/src/jetstream/repository/interfaces/portal_proxy.go
@@ -72,10 +72,4 @@ type PortalProxy interface {
 
 	// Plugins
 	GetPlugin(name string) interface{}
-
-	// SetCanPerformMigrations updates the state that records if we can perform Database migrations
-	SetCanPerformMigrations(bool)
-
-	// CanPerformMigrations returns if we can perform Database migrations
-	CanPerformMigrations() bool
 }
diff --git a/src/jetstream/repository/interfaces/structs.go b/src/jetstream/repository/interfaces/structs.go
index f25ef55e9e..3d513662dd 100644
--- a/src/jetstream/repository/interfaces/structs.go
+++ b/src/jetstream/repository/interfaces/structs.go
@@ -353,5 +353,14 @@ type PortalConfig struct {
 	PluginConfig                       map[string]string
 	DatabaseProviderName               string
 	EnableTechPreview                  bool `configName:"ENABLE_TECH_PREVIEW"`
-	CanMigrateDatabaseSchema        bool
+	CanMigrateDatabaseSchema           bool
+	// CanMigrateDatabaseSchema indicates if we can safely perform migrations
+	// This depends on the deployment mechanism and the database config
+	// e.g. if running in Cloud Foundry with a shared DB, then only the 0-index application instance
+	// can perform migrations
+}
+
+// SetCanPerformMigrations updates the state that records if we can perform Database migrations
+func (c *PortalConfig) SetCanPerformMigrations(value bool) {
+	c.CanMigrateDatabaseSchema = c.CanMigrateDatabaseSchema && value
 }

From ee45983b752b27fc5acadb16718d2e054a52f34c Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Mon, 27 Jan 2020 09:31:36 +0000
Subject: [PATCH 296/648] Fix log msg

---
 deploy/containers/config-init/config-init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/containers/config-init/config-init.sh b/deploy/containers/config-init/config-init.sh
index 8110d18c6d..867e009319 100755
--- a/deploy/containers/config-init/config-init.sh
+++ b/deploy/containers/config-init/config-init.sh
@@ -4,7 +4,7 @@ echo "============================================"
 echo "Stratos Configuration Init Job"
 echo "============================================"
 echo ""
-echo "Generating/Rotating Secrets"
+echo "Generating Secrets"
 echo ""
 echo "NAMESPACE                   : ${NAMESPACE}"
 echo "RELEASE_NAME                : ${RELEASE_NAME}"

From 7af42b259282bdd7be9c43a3db75f880d39b794b Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 27 Jan 2020 11:33:31 +0000
Subject: [PATCH 297/648] Add TableCellSidePanelComponent - Allows a table cell
 to show a link that will open a side panel - For instance ```      
 cellComponent: TableCellSidePanelComponent,       cellConfig: (pod):
 TableCellSidePanelConfig<KubernetesResourceViewerConfig> => ({         text:
 pod.metadata.name,         sidePanelComponent:
 KubernetesResourceViewerComponent,         sidePanelConfig: {          
 title: `Pod Summary: ${pod.metadata.name}`,           resource$: of(pod)     
    }       })

```
---
 .../table-cell-side-panel.component.html      |  3 +
 .../table-cell-side-panel.component.scss      |  4 ++
 .../table-cell-side-panel.component.spec.ts   | 33 ++++++++++
 .../table-cell-side-panel.component.ts        | 64 +++++++++++++++++++
 .../table-cell/table-cell.component.ts        |  4 +-
 .../packages/core/src/shared/shared.module.ts |  4 +-
 6 files changed, 110 insertions(+), 2 deletions(-)
 create mode 100644 src/frontend/packages/core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component.html
 create mode 100644 src/frontend/packages/core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component.scss
 create mode 100644 src/frontend/packages/core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component.spec.ts
 create mode 100644 src/frontend/packages/core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component.ts

diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component.html b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component.html
new file mode 100644
index 0000000000..b74a54737b
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component.html
@@ -0,0 +1,3 @@
+<a (click)="showSidePanel()">
+  {{actualConfig?.text}}
+</a>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component.scss b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component.scss
new file mode 100644
index 0000000000..13645db922
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component.scss
@@ -0,0 +1,4 @@
+a {
+  cursor: pointer;
+  text-decoration: underline;
+}
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component.spec.ts
new file mode 100644
index 0000000000..a09acd8a06
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component.spec.ts
@@ -0,0 +1,33 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+
+import { SidePanelService } from '../../../../services/side-panel.service';
+import { TableCellSidePanelComponent } from './table-cell-side-panel.component';
+
+describe('TableCellSidePanelComponent', () => {
+  let component: TableCellSidePanelComponent;
+  let fixture: ComponentFixture<TableCellSidePanelComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [TableCellSidePanelComponent],
+      providers: [
+        SidePanelService,
+      ],
+      imports: [
+        RouterTestingModule
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(TableCellSidePanelComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component.ts
new file mode 100644
index 0000000000..9602c820ac
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component.ts
@@ -0,0 +1,64 @@
+import { Component, ComponentFactoryResolver, Input } from '@angular/core';
+
+import { SidePanelService } from '../../../../services/side-panel.service';
+import { TableCellCustom } from '../../list.types';
+import { CellConfigFunction } from '../table.types';
+
+export interface TableCellSidePanelConfig<T> {
+  text: string;
+  sidePanelComponent: any; // PreviewableComponent
+  sidePanelConfig: T;
+}
+
+@Component({
+  selector: 'app-table-cell-side-panel',
+  templateUrl: './table-cell-side-panel.component.html',
+  styleUrls: ['./table-cell-side-panel.component.scss']
+})
+export class TableCellSidePanelComponent<T = any, A = any> extends TableCellCustom<T> {
+
+  private actualConfig: TableCellSidePanelConfig<A>;
+
+  private pRow: T;
+  @Input('row')
+  get row(): T { return this.pRow; }
+  set row(row: T) {
+    this.pRow = row;
+    this.updateConfig();
+  }
+
+  private pConfig: object | CellConfigFunction<T>;
+  @Input('config')
+  get config() { return this.pConfig; }
+  set config(config: object | CellConfigFunction<T>) {
+    this.pConfig = config;
+    this.updateConfig();
+  }
+
+  constructor(
+    private componentFactoryResolver: ComponentFactoryResolver,
+    private previewPanel: SidePanelService
+  ) {
+    super();
+  }
+
+  showSidePanel() {
+    this.previewPanel.show(
+      this.actualConfig.sidePanelComponent,
+      this.actualConfig.sidePanelConfig,
+      this.componentFactoryResolver
+    );
+  }
+
+  updateConfig() {
+    if (typeof (this.config) === 'function') {
+      if (this.row && this.config) {
+        const configFn = this.config as CellConfigFunction<T>;
+        this.actualConfig = configFn(this.row);
+      }
+    } else {
+      this.actualConfig = this.config as TableCellSidePanelConfig<A>;
+    }
+  }
+
+}
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 3386980815..8d0776ffd9 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
@@ -9,6 +9,7 @@ import {
   ViewEncapsulation,
 } from '@angular/core';
 
+import { MultiActionListEntity } from '../../../../../../../store/src/monitors/pagination-monitor';
 import { coreEndpointListDetailsComponents } from '../../../../../features/endpoints/endpoint-helpers';
 import { IListDataSource } from '../../data-sources-controllers/list-data-source-types';
 import {
@@ -34,9 +35,9 @@ import {
   TableCellRequestMonitorIconComponent,
 } from '../table-cell-request-monitor-icon/table-cell-request-monitor-icon.component';
 import { TableCellSelectComponent } from '../table-cell-select/table-cell-select.component';
+import { TableCellSidePanelComponent } from '../table-cell-side-panel/table-cell-side-panel.component';
 import { TableHeaderSelectComponent } from '../table-header-select/table-header-select.component';
 import { ICellDefinition } from '../table.types';
-import { MultiActionListEntity } from '../../../../../../../store/src/monitors/pagination-monitor';
 
 
 
@@ -55,6 +56,7 @@ export const listTableCells = [
   TableCellRequestMonitorIconComponent,
   TableCellFavoriteComponent,
   TableCellEndpointDetailsComponent,
+  TableCellSidePanelComponent,
   ...coreEndpointListDetailsComponents
 ];
 
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index 1e26c3f954..9ac12b08e3 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -124,6 +124,7 @@ import { CloudFoundryUserProvidedServicesService } from './services/cloud-foundr
 import { LongRunningOperationsService } from './services/long-running-op.service';
 import { MetricsRangeSelectorService } from './services/metrics-range-selector.service';
 import { UserPermissionDirective } from './user-permission.directive';
+import { TableCellSidePanelComponent } from './components/list/list-table/table-cell-side-panel/table-cell-side-panel.component';
 
 
 @NgModule({
@@ -229,7 +230,8 @@ import { UserPermissionDirective } from './user-permission.directive';
     CopyToClipboardComponent,
     SidepanelPreviewComponent,
     TileSelectorTileComponent,
-    SidepanelPreviewComponent
+    SidepanelPreviewComponent,
+    TableCellSidePanelComponent
   ],
   exports: [
     ApplicationStateIconPipe,

From e85f9dc9f99b5c1db2c1c344e14f83b156bba985 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Mon, 27 Jan 2020 13:01:11 +0000
Subject: [PATCH 298/648] Finish code to maintain and return sync status
 chart-repo side.

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 .../monocular/chart-repo/api_endpoint.go      | 124 +++++++++++++-----
 .../monocular/chart-repo/common/types.go      |  29 ++++
 .../chart-repo/foundationdb/utils.go          |   6 +-
 src/jetstream/plugins/monocular/sync.go       |  13 +-
 4 files changed, 131 insertions(+), 41 deletions(-)

diff --git a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
index 4cb79a079f..f80cdba01c 100644
--- a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
+++ b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
@@ -33,7 +33,7 @@ import (
 
 	"github.com/helm/monocular/chartrepo/common"
 	fdb "github.com/helm/monocular/chartrepo/foundationdb"
-	responses "github.com/helm/monocular/chartsvc/utils"
+	responses "github.com/helm/monocular/chartrepo/utils"
 )
 
 const pathPrefix = "/v1"
@@ -73,6 +73,7 @@ func setupRoutes() http.Handler {
 }
 
 func OnDemandSync(w http.ResponseWriter, req *http.Request, params Params) {
+
 	//Running in serve mode, we dont want to close the db client connection after a request
 	var clientKeepAlive = true
 
@@ -80,26 +81,7 @@ func OnDemandSync(w http.ResponseWriter, req *http.Request, params Params) {
 		RepoURL string `json:"repoURL"`
 	}
 
-	dec := json.NewDecoder(req.Body)
-	var url syncParams
-	if err := dec.Decode(&url); err != nil {
-		log.Error(err.Error())
-		w.Header().Set("Server", "ChartRepo (On-Demand)")
-		http.Error(w, "Error decoding sync request repository URL: "+err.Error(), http.StatusBadRequest)
-		return
-	}
-
-	repoURL := url.RepoURL
 	repoName := params["repo"]
-
-	if repoURL == "" {
-		err := fmt.Errorf("No Repository URL provided in request for Sync action.")
-		log.Error(err.Error())
-		w.Header().Set("Server", "ChartRepo (On-Demand)")
-		http.Error(w, err.Error(), http.StatusBadRequest)
-		return
-	}
-
 	if repoName == "" {
 		err := fmt.Errorf("No Repository name provided in request for Sync action.")
 		log.Error(err.Error())
@@ -108,18 +90,42 @@ func OnDemandSync(w http.ResponseWriter, req *http.Request, params Params) {
 		return
 	}
 
-	requestUUID, err := uuid.NewUUID()
-	if err != nil {
-		log.Error(err.Error())
-		w.Header().Set("Server", "ChartRepo (On-Demand)")
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
+	var status string
+	var currentRepoStatus = fdb.GetRepoSyncStatus(repoName).Status
+	//If this repo is already syncing, don't start another sync, but return in progress response
+	activeSyncJob := currentRepoStatus == common.SyncStatusInProgress || currentRepoStatus == common.SyncStatusStarted
+	if activeSyncJob {
+		status = common.SyncStatusInProgress
+	} else {
+
+		dec := json.NewDecoder(req.Body)
+		var url syncParams
+		if err := dec.Decode(&url); err != nil {
+			log.Error(err.Error())
+			w.Header().Set("Server", "ChartRepo (On-Demand)")
+			http.Error(w, "Error decoding sync request repository URL: "+err.Error(), http.StatusBadRequest)
+			return
+		}
+
+		repoURL := url.RepoURL
+
+		if repoURL == "" {
+			err := fmt.Errorf("No Repository URL provided in request for Sync action.")
+			log.Error(err.Error())
+			w.Header().Set("Server", "ChartRepo (On-Demand)")
+			http.Error(w, err.Error(), http.StatusBadRequest)
+			return
+		}
+
+		go fdb.SyncRepo(fdbClient, fDBName, repoName, repoURL, authorizationHeader, clientKeepAlive)
+
+		status = common.SyncStatusStarted
 	}
 
-	go fdb.SyncRepo(fdbClient, fDBName, repoName, repoURL, authorizationHeader, clientKeepAlive)
+	requestUUID, err := uuid.NewUUID()
 
 	//Return sync status in response
-	response := responses.SyncStatusResponse{requestUUID.String(), common.SyncStatusInProgress}
+	response := responses.SyncJobStatusResponse{requestUUID.String(), status}
 	js, err := json.Marshal(response)
 	if err != nil {
 		log.Error(err.Error())
@@ -144,14 +150,24 @@ func OnDemandDelete(w http.ResponseWriter, req *http.Request, params Params) {
 		http.Error(w, err.Error(), http.StatusBadRequest)
 	}
 
-	//Running in serve mode, we dont want to close the db client connection after a request
-	var clientKeepAlive = true
+	var status string
+	var currentRepoStatus = fdb.GetRepoSyncStatus(repoName).Status
+	//If this repo is already being deleted, don't start another delete, but return in progress response
+	activeDeleteJob := currentRepoStatus == common.DeleteStatusInProgress || currentRepoStatus == common.DeleteStatusStarted
+	if activeDeleteJob {
+		status = common.DeleteStatusInProgress
+	} else {
 
-	go fdb.DeleteRepo(fdbClient, fDBName, repoName, clientKeepAlive)
+		//Running in serve mode, we dont want to close the db client connection after a request
+		var clientKeepAlive = true
+
+		go fdb.DeleteRepo(fdbClient, fDBName, repoName, clientKeepAlive)
+		status = common.DeleteStatusStarted
+	}
 
 	//Return delete status in response
 	requestUUID, err := uuid.NewUUID()
-	response := responses.SyncStatusResponse{requestUUID.String(), "Deleting"}
+	response := responses.DeleteJobStatusResponse{requestUUID.String(), status}
 	js, err := json.Marshal(response)
 	if err != nil {
 		log.Error(err.Error())
@@ -169,10 +185,48 @@ func OnDemandDelete(w http.ResponseWriter, req *http.Request, params Params) {
 func RepoSyncStatus(w http.ResponseWriter, req *http.Request, params Params) {
 	repoName := params["repo"]
 	if repoName == "" {
-		log.Fatal("No Repository name provided in request for status.")
+		log.Fatal("No Repository name provided in request for sync status.")
+	}
+
+	status := fdb.GetRepoSyncStatus(repoName)
+
+	requestUUID, err := uuid.NewUUID()
+	response := responses.SyncJobStatusResponse{requestUUID.String(), status.Status}
+	js, err := json.Marshal(response)
+	if err != nil {
+		log.Error(err.Error())
+		w.Header().Set("Server", "ChartRepo (On-Demand)")
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	w.Header().Set("Server", "ChartRepo (On-Demand)")
+	w.Write(js)
+	w.WriteHeader(200)
+}
+
+func RepoDeleteStatus(w http.ResponseWriter, req *http.Request, params Params) {
+	repoName := params["repo"]
+	if repoName == "" {
+		log.Fatal("No Repository name provided in request for delete status.")
 	}
-	//TODO kate write status to response
-	GetRepoSyncStatus(repoName)
+
+	status := fdb.GetRepoDeleteStatus(repoName)
+	requestUUID, err := uuid.NewUUID()
+	response := responses.DeleteJobStatusResponse{requestUUID.String(), status.Status}
+	js, err := json.Marshal(response)
+	if err != nil {
+		log.Error(err.Error())
+		w.Header().Set("Server", "ChartRepo (On-Demand)")
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	w.Header().Set("Server", "ChartRepo (On-Demand)")
+	w.Write(js)
+	w.WriteHeader(200)
 }
 
 func initOnDemandEndpoint(fdbURL string, fdbName string, authHeader string, debug bool) {
diff --git a/src/jetstream/plugins/monocular/chart-repo/common/types.go b/src/jetstream/plugins/monocular/chart-repo/common/types.go
index f9b105d1c1..30221ff53b 100644
--- a/src/jetstream/plugins/monocular/chart-repo/common/types.go
+++ b/src/jetstream/plugins/monocular/chart-repo/common/types.go
@@ -115,3 +115,32 @@ func (m *SyncStatusMap) Get(repo string) RepoSyncStatus {
 const SyncStatusFailed = "Failed"
 const SyncStatusSuccess = "Synchronized"
 const SyncStatusInProgress = "Synchronizing"
+const SyncStatusStarted = "Started"
+
+type RepoDeleteStatus struct {
+	Repo   string `json:"repo"`
+	URL    string `json:"url"`
+	Status string `json:"status"`
+}
+
+type DeleteStatusMap struct {
+	mut       sync.Mutex
+	statusMap map[string]RepoDeleteStatus
+}
+
+func (m *DeleteStatusMap) Set(repo string, status RepoDeleteStatus) {
+	m.mut.Lock()
+	defer m.mut.Unlock()
+	m.statusMap[repo] = status
+}
+
+func (m *DeleteStatusMap) Get(repo string) RepoDeleteStatus {
+	m.mut.Lock()
+	defer m.mut.Unlock()
+	return m.statusMap[repo]
+}
+
+const DeleteStatusFailed = "Failed"
+const DeleteStatusSuccess = "Deleted"
+const DeleteStatusInProgress = "Deleting"
+const DeleteStatusStarted = "Started"
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
index ae723d1c31..eee7bb10f1 100644
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
@@ -50,6 +50,7 @@ const (
 
 var netClient common.HTTPClient = &http.Client{}
 var repoSyncStatus common.SyncStatusMap
+var repoDeleteStatus common.DeleteStatusMap
 
 func init() {
 	var err error
@@ -70,7 +71,6 @@ func init() {
 // charts before fetching readmes for each chart and version pair.
 func SyncRepo(dbClient Client, dbName, repoName, repoURL string, authorizationHeader string, clientKeepAlive bool) error {
 
-	//TODO Kate maintain repo sync status with last successful/failed/in-progress sync UUID
 	repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusInProgress})
 
 	db, closer := dbClient.Database(dbName)
@@ -496,6 +496,10 @@ func GetRepoSyncStatus(repo string) common.RepoSyncStatus {
 	return repoSyncStatus.Get(repo)
 }
 
+func GetRepoDeleteStatus(repo string) common.RepoDeleteStatus {
+	return repoDeleteStatus.Get(repo)
+}
+
 func database(client *mongo.Client, dbName string) (*mongo.Database, func()) {
 
 	db := client.Database(dbName)
diff --git a/src/jetstream/plugins/monocular/sync.go b/src/jetstream/plugins/monocular/sync.go
index 2003e855f2..b1efcc9381 100644
--- a/src/jetstream/plugins/monocular/sync.go
+++ b/src/jetstream/plugins/monocular/sync.go
@@ -56,7 +56,8 @@ func (m *Monocular) processSyncRequests() {
 			}
 			m.portalProxy.UpdateEndointMetadata(job.Endpoint.GUID, marshalSyncMetadata(metadata))
 			//Hit the sync server container endpoint to trigger a sync for given repo
-			err := putRequest("http://127.0.0.1:8080" + chartRepoPathPrefix + "/sync/" + job.Endpoint.Name, strings.NewReader(repoSyncRequestParams))
+			response, err := putRequest("http://127.0.0.1:8080"+chartRepoPathPrefix+"/sync/"+job.Endpoint.Name, strings.NewReader(repoSyncRequestParams))
+			//TODO kate extract status from response
 			metadata.Busy = false
 			if err != nil {
 				log.Warn("Request to sync repository failed: %v+", err)
@@ -70,7 +71,8 @@ func (m *Monocular) processSyncRequests() {
 		} else if job.Action == 1 {
 			log.Infof("Deleting Helm Repository: %s", job.Endpoint.Name)
 			//Hit the sync server container endpoint to trigger a delete for given repo
-			err := putRequest("http://127.0.0.1:8080" + chartRepoPathPrefix + "/delete/" + job.Endpoint.Name, strings.NewReader(repoSyncRequestParams))
+			response, err := putRequest("http://127.0.0.1:8080"+chartRepoPathPrefix+"/delete/"+job.Endpoint.Name, strings.NewReader(repoSyncRequestParams))
+			//TODO kate extract status from response
 			if err != nil {
 				log.Warn("Request to delete repository failed: %v+", err)
 			}
@@ -96,11 +98,12 @@ func (m *Monocular) updateMetadata(endpoint string, metadata SyncMetadata) {
 }
 
 //https://gist.github.com/maniankara/a10d19960293b34b608ac7ef068a3d63
-func putRequest(url string, data io.Reader) error {
+func putRequest(url string, data io.Reader) (*http.Response, error) {
 	client := &http.Client{}
 	req, err := http.NewRequest(http.MethodPut, url, data)
+	var resp *http.Response
 	if err == nil {
-		_, err = client.Do(req)
+		resp, err = client.Do(req)
 	}
-	return err
+	return resp, err
 }

From fe40f4ab7996d88a6ef5d5984c50290432dcfc9f Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 27 Jan 2020 15:39:15 +0000
Subject: [PATCH 299/648] Fix backend unit test

---
 src/jetstream/main.go               | 2 +-
 src/jetstream/setup_console_test.go | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/jetstream/main.go b/src/jetstream/main.go
index 967889a5fb..377d183948 100644
--- a/src/jetstream/main.go
+++ b/src/jetstream/main.go
@@ -146,7 +146,7 @@ func main() {
 		log.SetLevel(level)
 	}
 
-	// Intially, default state is that DB Migrations can be performed
+	// Initially, default state is that DB Migrations can be performed
 	portalConfig.CanMigrateDatabaseSchema = true
 
 	log.Info("Configuration loaded.")
diff --git a/src/jetstream/setup_console_test.go b/src/jetstream/setup_console_test.go
index 94d138a47a..c383cf80cb 100644
--- a/src/jetstream/setup_console_test.go
+++ b/src/jetstream/setup_console_test.go
@@ -37,6 +37,8 @@ func TestConsoleSetup(t *testing.T) {
 		envLookup := env.NewVarSet()
 		envLookup.AppendSource(console_config.ConfigLookup)
 		portal := &portalProxy{env: envLookup}
+		// Initalize for testing
+		portal.GetConfig().CanMigrateDatabaseSchema = true
 		err = console_config.MigrateSetupData(portal, configStore)
 		if err != nil {
 			t.Errorf("Could not migrate config settings: %v", err)

From 3d34e3a9b9eef60664e2dd5d2bb7166788fbddc0 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 27 Jan 2020 13:57:54 +0000
Subject: [PATCH 300/648] Show pod + service preview side panel

---
 ...kubernetes-resource-viewer.component.html} |  18 +--
 ...kubernetes-resource-viewer.component.scss} |   8 +-
 ...bernetes-resource-viewer.component.spec.ts |  25 ++++
 .../kubernetes-resource-viewer.component.ts   | 108 ++++++++++++++++++
 .../custom/kubernetes/kubernetes.module.ts    |  14 ++-
 .../kubernetes-pods-list-config.service.ts    |  23 +++-
 .../pod-name-link.component.html              |   2 -
 .../pod-name-link.component.scss              |   0
 .../pod-name-link.component.spec.ts           |  48 --------
 .../pod-name-link/pod-name-link.component.ts  |  39 -------
 .../kubernetes-service-ports.component.html   |   2 +
 .../kubernetes-service-list-config.service.ts |  22 +++-
 .../helm-release-resource-graph.component.ts  |  26 +++--
 ...release-resource-preview.component.spec.ts |  31 -----
 ...helm-release-resource-preview.component.ts |  50 --------
 .../kubernetes/workloads/workloads.module.ts  |   5 -
 16 files changed, 216 insertions(+), 205 deletions(-)
 rename custom-src/frontend/app/custom/kubernetes/{workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.html => kubernetes-resource-viewer/kubernetes-resource-viewer.component.html} (71%)
 rename custom-src/frontend/app/custom/kubernetes/{workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.scss => kubernetes-resource-viewer/kubernetes-resource-viewer.component.scss} (92%)
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.html
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.scss
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.spec.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts

diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html
similarity index 71%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.html
rename to custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html
index 4fcce0ab85..ed9dc6e239 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html
@@ -1,7 +1,11 @@
-<app-sidepanel-preview title="Helm Release Resource Preview">
+<app-sidepanel-preview title="{{title}}">
 
   <div *ngIf="resource$ | async as resource">
-    <app-metadata-item class="chart-details__item" label="Name">{{ resource.metadata.name }}</app-metadata-item>
+    <app-metadata-item class="chart-details__item" label="Name">
+      {{ resource.metadata.name }}
+      <a *ngIf="hasPodMetrics$ | async" [routerLink]="podRouterLink$ | async">View
+        Metrics</a>
+    </app-metadata-item>
     <app-metadata-item class="chart-details__item" label="Kind">{{ resource.kind }}</app-metadata-item>
     <app-metadata-item class="chart-details__item" label="API Version">{{ resource.apiVersion }}</app-metadata-item>
     <div class="resource-preview__side-by-side">
@@ -17,11 +21,11 @@
     </app-metadata-item>
 
     <app-metadata-item class="resource-preview__labels" label="Annotations" *ngIf="resource.annotations">
-        <div *ngFor="let label of resource.annotations" class="resource-preview__label">
-          <div class="resource-preview__label-name">{{ label.name }}</div>
-          <div class="resource-preview__label-value">{{ label.value }}</div>
-        </div>
-      </app-metadata-item>          
+      <div *ngFor="let label of resource.annotations" class="resource-preview__label">
+        <div class="resource-preview__label-name">{{ label.name }}</div>
+        <div class="resource-preview__label-value">{{ label.value }}</div>
+      </div>
+    </app-metadata-item>
 
     <app-json-viewer #viewer [json]="resource"></app-json-viewer>
 
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.scss b/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.scss
similarity index 92%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.scss
rename to custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.scss
index d66faa8fc6..fd6b556a25 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.scss
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.scss
@@ -3,14 +3,14 @@
   &__labels {
     display: table;
   }
-  
+
   &__label {
     display: table-row;
   }
 
   &__label-name {
     display: table-cell;
-    opacity: 0.8;
+    opacity: .8;
     padding: 2px 20px 2px 2px;
   }
 
@@ -24,7 +24,7 @@
     app-metadata-item {
       margin-right: 40px;
     }
-    
+
   }
 
-}
\ No newline at end of file
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts
new file mode 100644
index 0000000000..64416a2edd
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { KubernetesResourceViewerComponent } from './kubernetes-resource-viewer.component';
+
+describe('KubernetesResourceViewerComponent', () => {
+  let component: KubernetesResourceViewerComponent;
+  let fixture: ComponentFixture<KubernetesResourceViewerComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ KubernetesResourceViewerComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubernetesResourceViewerComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
new file mode 100644
index 0000000000..419ba086e8
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
@@ -0,0 +1,108 @@
+import { Component } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import * as moment from 'moment';
+import { Observable, of } from 'rxjs';
+import { filter, first, map, publishReplay, refCount, switchMap } from 'rxjs/operators';
+
+import { EndpointsService } from '../../../core/endpoints.service';
+import { PreviewableComponent } from '../../../shared/previewable-component';
+import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
+import { BasicKubeAPIResource } from '../store/kube.types';
+
+export interface KubernetesResourceViewerConfig {
+  title: string;
+  resource$: Observable<BasicKubeAPIResource>;
+  resourceKind?: string;
+}
+
+@Component({
+  selector: 'app-kubernetes-resource-viewer',
+  templateUrl: './kubernetes-resource-viewer.component.html',
+  styleUrls: ['./kubernetes-resource-viewer.component.scss']
+})
+export class KubernetesResourceViewerComponent implements PreviewableComponent {
+
+  constructor(
+    private activatedRoute: ActivatedRoute,
+    private endpointsService: EndpointsService,
+    private kubeEndpointService: KubernetesEndpointService
+  ) {
+  }
+
+  public title: string;
+  public resource$: Observable<any>;
+
+  public hasPodMetrics$: Observable<boolean>;
+  public podRouterLink$: Observable<string[]>;
+
+  setProps(props: KubernetesResourceViewerConfig) {
+    this.title = props.title;
+    this.resource$ = props.resource$.pipe(
+      map((item: any) => {// KubeAPIResource
+
+        const newItem = { ...item };
+        newItem.age = moment(item.metadata.creationTimestamp).fromNow(true);
+
+        newItem.labels = [];
+        Object.keys(item.metadata.labels || []).forEach(labelName => {
+          newItem.labels.push({
+            name: labelName,
+            value: item.metadata.labels[labelName]
+          });
+        });
+
+        if (item.metadata && item.metadata.annotations) {
+          newItem.annotations = [];
+          Object.keys(item.metadata.annotations || []).forEach(labelName => {
+            newItem.annotations.push({
+              name: labelName,
+              value: item.metadata.annotations[labelName]
+            });
+          });
+        }
+
+        newItem.kind = item.kind || props.resourceKind;
+        newItem.apiVersion = item.apiVersion || this.getVersionFromSelfLink(item.metadata.selfLink);
+        return newItem;
+      }),
+      publishReplay(1),
+      refCount()
+    );
+
+    this.hasPodMetrics$ = this.resource$.pipe(
+      switchMap(resource => {
+        return resource.kind === 'pod' ?
+          this.endpointsService.hasMetrics(this.getEndpointId(resource)) :
+          of(false);
+      }),
+      first(),
+    );
+
+    this.podRouterLink$ = this.hasPodMetrics$.pipe(
+      filter(hasPodMetrics => hasPodMetrics),
+      switchMap(() => this.resource$),
+      map(pod => {
+        return [
+          `/kubernetes`,
+          this.getEndpointId(pod),
+          `pods`,
+          pod.metadata.namespace,
+          pod.metadata.name
+        ];
+      })
+    );
+  }
+
+  private getVersionFromSelfLink(url: string): string {
+    if (!url) {
+      return;
+    }
+    const parts = url.split('/');
+    return `${parts[1]}/${parts[2]}`;
+  }
+
+  private getEndpointId(res): string {
+    return this.kubeEndpointService.kubeGuid || res.endpointId || res.metadata.kubeId;
+  }
+
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
index 593b74341f..2db4b2a5a4 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
@@ -26,6 +26,7 @@ import {
 import { KubernetesNodePodsComponent } from './kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component';
 import { KubernetesNodeComponent } from './kubernetes-node/kubernetes-node.component';
 import { BaseKubeGuid } from './kubernetes-page.types';
+import { KubernetesResourceViewerComponent } from './kubernetes-resource-viewer/kubernetes-resource-viewer.component';
 import { KubernetesTabBaseComponent } from './kubernetes-tab-base/kubernetes-tab-base.component';
 import { KubernetesRoutingModule } from './kubernetes.routing';
 import { KubernetesComponent } from './kubernetes/kubernetes.component';
@@ -76,7 +77,6 @@ import {
   KubernetesPodStatusComponent,
 } from './list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component';
 import { KubernetesPodTagsComponent } from './list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component';
-import { PodNameLinkComponent } from './list-types/kubernetes-pods/pod-name-link/pod-name-link.component';
 import { KubernetesServicePortsComponent } from './list-types/kubernetes-service-ports/kubernetes-service-ports.component';
 import {
   KubeServiceCardComponent,
@@ -92,6 +92,7 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
 
 
 
+
 /* tslint:enable */
 
 @NgModule({
@@ -137,12 +138,12 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     KubernetesNamespacePodsComponent,
     KubernetesNamespaceServicesComponent,
     KubeNamespacePodCountComponent,
-    PodNameLinkComponent,
     NodePodCountComponent,
     KubernetesServicePortsComponent,
     KubernetesPodStatusComponent,
     KubernetesPodReadinessComponent,
-    KubeServiceCardComponent
+    KubeServiceCardComponent,
+    KubernetesResourceViewerComponent
   ],
   providers: [
     KubernetesService,
@@ -161,12 +162,15 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     ConditionCellComponent,
     KubernetesNamespaceLinkComponent,
     KubeNamespacePodCountComponent,
-    PodNameLinkComponent,
     NodePodCountComponent,
     KubernetesServicePortsComponent,
     KubernetesPodStatusComponent,
     KubernetesPodReadinessComponent,
-    KubeServiceCardComponent
+    KubeServiceCardComponent,
+    KubernetesResourceViewerComponent
+  ],
+  exports: [
+    KubernetesResourceViewerComponent
   ]
 })
 export class KubernetesModule { }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
index 64b212d95d..b7318cb2a9 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
@@ -3,18 +3,28 @@ import { Store } from '@ngrx/store';
 import {
   IListDataSource,
 } from 'frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source-types';
+import { of } from 'rxjs';
 
 import { AppState } from '../../../../../../store/src/app-state';
+import {
+  TableCellSidePanelComponent,
+  TableCellSidePanelConfig,
+} from '../../../../shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component';
 import { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
 import { IListConfig, ListViewTypes } from '../../../../shared/components/list/list.component.types';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
+import {
+  KubernetesResourceViewerComponent,
+  KubernetesResourceViewerConfig,
+} from '../../kubernetes-resource-viewer/kubernetes-resource-viewer.component';
 import { KubernetesPod } from '../../store/kube.types';
 import { defaultHelmKubeListPageSize } from '../kube-helm-list-types';
 import { createKubeAgeColumn } from '../kube-list.helper';
 import { KubernetesPodReadinessComponent } from './kubernetes-pod-readiness/kubernetes-pod-readiness.component';
 import { KubernetesPodStatusComponent } from './kubernetes-pod-status/kubernetes-pod-status.component';
 import { KubernetesPodsDataSource } from './kubernetes-pods-data-source';
-import { PodNameLinkComponent } from './pod-name-link/pod-name-link.component';
+
+type a = TableCellSidePanelComponent<KubernetesPod, KubernetesResourceViewerConfig>;
 
 export abstract class BaseKubernetesPodsListConfigService implements IListConfig<KubernetesPod> {
 
@@ -33,13 +43,22 @@ export abstract class BaseKubernetesPodsListConfigService implements IListConfig
   columns: Array<ITableColumn<KubernetesPod>> = [
     {
       columnId: 'name', headerCell: () => 'Name',
-      cellComponent: PodNameLinkComponent,
+      cellComponent: TableCellSidePanelComponent,
       sort: {
         type: 'sort',
         orderKey: 'name',
         field: 'metadata.name'
       },
       cellFlex: '3',
+      cellConfig: (pod): TableCellSidePanelConfig<KubernetesResourceViewerConfig> => ({
+        text: pod.metadata.name,
+        sidePanelComponent: KubernetesResourceViewerComponent,
+        sidePanelConfig: {
+          title: `Pod Summary: ${pod.metadata.name}`,
+          resourceKind: 'pod',
+          resource$: of(pod)
+        }
+      })
     },
     // TODO: See #150 - keep out RC bring back after demo
     // {
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.html
deleted file mode 100644
index c035910aa9..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<a *ngIf="( hasMetrics$ | async )" [routerLink]="routerLink">{{row.metadata.name}}</a>
-<span *ngIf="!( hasMetrics$ | async )">{{row.metadata.name}}</span>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.spec.ts
deleted file mode 100644
index c81384b474..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.spec.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { BaseKubeGuid } from '../../../kubernetes-page.types';
-import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
-import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
-import { KubernetesStatus } from '../../../store/kube.types';
-import { PodNameLinkComponent } from './pod-name-link.component';
-
-describe('PodNameLinkComponent', () => {
-  let component: PodNameLinkComponent;
-  let fixture: ComponentFixture<PodNameLinkComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [PodNameLinkComponent],
-      imports: KubernetesBaseTestModules,
-      providers: [BaseKubeGuid, KubernetesEndpointService]
-
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(PodNameLinkComponent);
-    component = fixture.componentInstance;
-    component.row = {
-      metadata: {
-        namespace: 'test',
-        name: 'test',
-        uid: 'test'
-      },
-      status: {
-        phase: KubernetesStatus.ACTIVE
-      },
-      spec: {
-        containers: [],
-        nodeName: 'test',
-        schedulerName: 'test',
-        initContainers: [],
-      }
-    };
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.ts
deleted file mode 100644
index 0b7495c562..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { Observable } from 'rxjs';
-import { first } from 'rxjs/operators';
-
-import { EndpointsService } from '../../../../../core/endpoints.service';
-import { getIdFromRoute } from '../../../../../core/utils.service';
-import { TableCellCustom } from '../../../../../shared/components/list/list.types';
-import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
-import { KubernetesPod } from '../../../store/kube.types';
-
-@Component({
-  selector: 'app-pod-name-link',
-  templateUrl: './pod-name-link.component.html',
-  styleUrls: ['./pod-name-link.component.scss']
-})
-export class PodNameLinkComponent extends TableCellCustom<KubernetesPod> implements OnInit {
-  routerLink: string[];
-  hasMetrics$: Observable<boolean>;
-  constructor(
-    private activatedRoute: ActivatedRoute,
-    private endpointsService: EndpointsService,
-    private kubeEndpointService: KubernetesEndpointService
-  ) {
-    super();
-  }
-
-  ngOnInit() {
-    this.hasMetrics$ = this.endpointsService.hasMetrics(this.kubeEndpointService.kubeGuid).pipe(
-      first()
-    );
-    const namespace = getIdFromRoute(this.activatedRoute, 'namespaceName');
-    if (!namespace) {
-      this.routerLink = [this.row.metadata.namespace, this.row.metadata.name];
-    } else {
-      this.routerLink = [this.row.metadata.name];
-    }
-  }
-}
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html
index ca4796f76c..51391122e0 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html
@@ -5,12 +5,14 @@
       <th>Protocol</th>
       <th>Port</th>
       <th>Target Port</th>
+      <th>Node Port</th>
     </tr>
     <tr *ngFor="let port of kubeService.spec?.ports">
       <td>{{port.name}}</td>
       <td>{{port.protocol}}</td>
       <td>{{port.port}}</td>
       <td>{{port.targetPort}}</td>
+      <td>{{port.nodePort}}</td>
     </tr>
   </table>
 </ng-container>
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
index 5893430c8b..87563e8ff3 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
@@ -1,6 +1,16 @@
+import { of } from 'rxjs';
+
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
+import {
+  TableCellSidePanelComponent,
+  TableCellSidePanelConfig,
+} from '../../../../shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component';
 import { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
 import { IListConfig, ListViewTypes } from '../../../../shared/components/list/list.component.types';
+import {
+  KubernetesResourceViewerComponent,
+  KubernetesResourceViewerConfig,
+} from '../../kubernetes-resource-viewer/kubernetes-resource-viewer.component';
 import { KubeService } from '../../store/kube.types';
 import { defaultHelmKubeListPageSize } from '../kube-helm-list-types';
 import { createKubeAgeColumn } from '../kube-list.helper';
@@ -11,15 +21,21 @@ export abstract class BaseKubernetesServicesListConfig implements IListConfig<Ku
   columns: Array<ITableColumn<KubeService>> = [
     {
       columnId: 'name', headerCell: () => 'Name',
-      cellDefinition: {
-        valuePath: 'metadata.name'
-      },
+      cellComponent: TableCellSidePanelComponent,
       sort: {
         type: 'sort',
         orderKey: 'name',
         field: 'metadata.name'
       },
       cellFlex: '4',
+      cellConfig: (service): TableCellSidePanelConfig<KubernetesResourceViewerConfig> => ({
+        text: service.metadata.name,
+        sidePanelComponent: KubernetesResourceViewerComponent,
+        sidePanelConfig: {
+          title: `Service Summary: ${service.metadata.name}`,
+          resource$: of(service)
+        }
+      })
     },
     {
       columnId: 'clusterIp',
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
index fb1d5cc2fb..d47848393b 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
@@ -1,12 +1,14 @@
 import { Component, ComponentFactoryResolver, OnDestroy, OnInit } from '@angular/core';
 import { Edge, Node } from '@swimlane/ngx-graph';
 import { SidePanelService } from 'frontend/packages/core/src/shared/services/side-panel.service';
-import { BehaviorSubject, Subscription } from 'rxjs';
+import { BehaviorSubject, Observable, Subscription } from 'rxjs';
+import { filter, first, map } from 'rxjs/operators';
 
-import { HelmReleaseHelperService } from '../helm-release-helper.service';
 import {
-  HelmReleaseResourcePreviewComponent,
-} from './helm-release-resource-preview/helm-release-resource-preview.component';
+  KubernetesResourceViewerComponent,
+} from '../../../../kubernetes-resource-viewer/kubernetes-resource-viewer.component';
+import { KubeAPIResource } from '../../../../store/kube.types';
+import { HelmReleaseHelperService } from '../helm-release-helper.service';
 
 
 interface Colors {
@@ -89,12 +91,10 @@ export class HelmReleaseResourceGraphComponent implements OnInit, OnDestroy {
   // Open side panel when node is clicked
   public onNodeClick(node: any) {
     this.previewPanel.show(
-      HelmReleaseResourcePreviewComponent,
+      KubernetesResourceViewerComponent,
       {
-        node,
-        helper: this.helper,
-        endpoint: this.helper.endpointGuid,
-        releaseTitle: this.helper.releaseTitle
+        title: 'Helm Release Resource Preview',
+        resource$: this.getResource(node)
       },
       this.componentFactoryResolver
     );
@@ -138,4 +138,12 @@ export class HelmReleaseResourceGraphComponent implements OnInit, OnDestroy {
     }
   }
 
+  private getResource(node: any): Observable<KubeAPIResource> {
+    return this.helper.fetchReleaseResources().pipe(
+      filter(r => !!r),
+      map((r: any[]) => Object.values(r).find((res: any) => res.metadata.name === node.label && res.metadata.kind === node.kind)),
+      first(),
+    );
+  }
+
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts
deleted file mode 100644
index cdd63660cd..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.spec.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { SidePanelService } from 'frontend/packages/core/src/shared/services/side-panel.service';
-
-import { KubernetesBaseTestModules } from '../../../../../kubernetes.testing.module';
-import { HelmReleaseResourcePreviewComponent } from './helm-release-resource-preview.component';
-
-describe('HelmReleaseResourcePreviewComponent', () => {
-  let component: HelmReleaseResourcePreviewComponent;
-  let fixture: ComponentFixture<HelmReleaseResourcePreviewComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        ...KubernetesBaseTestModules
-      ],
-      declarations: [HelmReleaseResourcePreviewComponent],
-      providers: [SidePanelService]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(HelmReleaseResourcePreviewComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts
deleted file mode 100644
index 052793d3f6..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { Component } from '@angular/core';
-import { PreviewableComponent } from 'frontend/packages/core/src/shared/previewable-component';
-import * as moment from 'moment';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-
-@Component({
-  selector: 'app-helm-release-resource-preview',
-  templateUrl: './helm-release-resource-preview.component.html',
-  styleUrls: ['./helm-release-resource-preview.component.scss'],
-})
-export class HelmReleaseResourcePreviewComponent implements PreviewableComponent {
-
-  public resource$: Observable<any>;
-
-  setProps(props: { [key: string]: any; }): void {
-    this.resource$ = props.helper.fetchReleaseResources().pipe(
-      map((r: any[]) => {
-        const item = Object.values(r).find((res: any) => res.metadata.name === props.node.label && res.metadata.kind === props.node.kind);
-
-        const newItem = { ...item };
-        newItem.age = moment(item.metadata.creationTimestamp).fromNow(true);
-
-        newItem.labels = [];
-        Object.keys(item.metadata.labels || []).forEach(labelName => {
-          newItem.labels.push({
-            name: labelName,
-            value: item.metadata.labels[labelName]
-          });
-        });
-
-        if (item.metadata && item.metadata.annotations) {
-          newItem.annotations = [];
-          Object.keys(item.metadata.annotations || []).forEach(labelName => {
-            newItem.annotations.push({
-              name: labelName,
-              value: item.metadata.annotations[labelName]
-            });
-          });
-        }
-
-        return newItem;
-      })
-    );
-
-  }
-
-  constructor() { }
-
-}
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts b/custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts
index 00353af4b2..6514ee1c00 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts
@@ -12,9 +12,6 @@ import { HelmReleasePodsTabComponent } from './release/tabs/helm-release-pods/he
 import {
   HelmReleaseResourceGraphComponent,
 } from './release/tabs/helm-release-resource-graph/helm-release-resource-graph.component';
-import {
-  HelmReleaseResourcePreviewComponent,
-} from './release/tabs/helm-release-resource-graph/helm-release-resource-preview/helm-release-resource-preview.component';
 import { HelmReleaseServicesTabComponent } from './release/tabs/helm-release-services/helm-release-services-tab.component';
 import { HelmReleaseSummaryTabComponent } from './release/tabs/helm-release-summary-tab/helm-release-summary-tab.component';
 import { HelmReleaseValuesTabComponent } from './release/tabs/helm-release-values-tab/helm-release-values-tab.component';
@@ -41,11 +38,9 @@ import { WorkloadsRouting } from './workloads.routing';
     HelmReleasePodsTabComponent,
     HelmReleaseServicesTabComponent,
     HelmReleaseResourceGraphComponent,
-    HelmReleaseResourcePreviewComponent,
     HelmReleaseCardComponent,
   ],
   entryComponents: [
-    HelmReleaseResourcePreviewComponent,
     HelmReleaseCardComponent
   ]
 })

From 30cd75cbb51fd9c94bfe7d658e40638f9b740094 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 27 Jan 2020 15:57:11 +0000
Subject: [PATCH 301/648] Remove helm feature from tech preview

---
 custom-src/frontend/app/custom/helm/helm-entity-generator.ts | 2 +-
 src/jetstream/plugins/monocular/main.go                      | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

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 0aa67e1db5..aef2cffc53 100644
--- a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
+++ b/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
@@ -24,7 +24,7 @@ export function generateHelmEntities(): StratosBaseCatalogEntity[] {
     logoUrl: '/core/assets/custom/helm.svg',
     urlValidation: undefined,
     unConnectable: true,
-    techPreview: true,
+    techPreview: false,
     authTypes: [],
     renderPriority: 10,
   };
diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index f1c31bfa95..94eacade11 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -44,10 +44,6 @@ func (m *Monocular) GetChartStore() chartsvc.ChartSvcDatastore {
 
 // Init performs plugin initialization
 func (m *Monocular) Init() error {
-
-	if !m.portalProxy.GetConfig().EnableTechPreview {
-		return errors.New("Feature is in Tech Preview")
-	}
 	m.ConfigureSQL()
 	m.chartSvcRoutes = chartsvc.GetRoutes()
 	m.InitSync()

From 26aeecfe91eab88abe05802bc24c86b23b6f9eb0 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 27 Jan 2020 16:03:28 +0000
Subject: [PATCH 302/648] Automatically show warning icon and button in
 confirmation dialog if textToMatch is set

---
 .../dialog-confirm/dialog-confirm.component.html         | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/frontend/packages/core/src/shared/components/dialog-confirm/dialog-confirm.component.html b/src/frontend/packages/core/src/shared/components/dialog-confirm/dialog-confirm.component.html
index 296a9f6415..0695380d4b 100644
--- a/src/frontend/packages/core/src/shared/components/dialog-confirm/dialog-confirm.component.html
+++ b/src/frontend/packages/core/src/shared/components/dialog-confirm/dialog-confirm.component.html
@@ -1,16 +1,19 @@
 <h1 class="confirm-dialog__header" mat-dialog-title>
   <span class="confirm-dialog__header-title">{{data.title}}</span>
-  <mat-icon class="confirm-dialog__warn-icon" color="warn" *ngIf="data.critical">warning</mat-icon>
+  <mat-icon class="confirm-dialog__warn-icon" color="warn" *ngIf="data.critical || textToMatch">warning</mat-icon>
 </h1>
 <div class="confirm-dialog__message" mat-dialog-content *ngIf="!textToMatch" [innerHtml]="data.message"></div>
 <div class="confirm-dialog__enter-text" *ngIf="textToMatch">
   <span>Please type <b>{{textToMatch}}</b> to continue.</span>
   <mat-form-field>
-    <input (paste)="handlePaste($event)" required matInput id="typeToConfirm" [(ngModel)]="matchValue" [pattern]="textToMatch">
+    <input (paste)="handlePaste($event)" required matInput id="typeToConfirm" [(ngModel)]="matchValue"
+      [pattern]="textToMatch">
   </mat-form-field>
 </div>
 <div mat-dialog-actions class="confirm-dialog__actions">
   <button color="primary" mat-button (click)="onNoClick()" cdkFocusInitial>Cancel</button>
-  <button class="confirm-dialog__confirm" *ngIf="data.confirm" [color]="data.critical ? 'warn' : 'primary'" mat-button [mat-dialog-close]="true" [innerHtml]="" [disabled]="textToMatch && textToMatch !== matchValue">{{
+  <button class="confirm-dialog__confirm" *ngIf="data.confirm"
+    [color]="data.critical || textToMatch ? 'warn' : 'primary'" mat-button [mat-dialog-close]="true" [innerHtml]=""
+    [disabled]="textToMatch && textToMatch !== matchValue">{{
     data.confirm }}</button>
 </div>
\ No newline at end of file

From 1aa7644ffdbc4710a136a2ddd66dfa127f07b812 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 27 Jan 2020 16:34:25 +0000
Subject: [PATCH 303/648] Swap position of workloads and kube side nave items

---
 .../app/custom/custom-routing.module.ts       | 22 +++++++++----------
 .../table-cell-side-panel.component.ts        |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/custom-src/frontend/app/custom/custom-routing.module.ts b/custom-src/frontend/app/custom/custom-routing.module.ts
index 98c658e695..4edfeaf34f 100644
--- a/custom-src/frontend/app/custom/custom-routing.module.ts
+++ b/custom-src/frontend/app/custom/custom-routing.module.ts
@@ -6,27 +6,27 @@ import { KUBERNETES_ENDPOINT_TYPE } from './kubernetes/kubernetes-entity-factory
 
 const customRoutes: Routes = [
   {
-    path: 'kubernetes',
-    loadChildren: './kubernetes/kubernetes.module#KubernetesModule',
+    path: 'workloads',
+    loadChildren: () => import('./kubernetes/workloads/workloads.module').then(m => m.WorkloadsModule),
     data: {
+      reuseRoute: true,
       stratosNavigation: {
-        text: 'Kubernetes',
-        matIcon: 'kubernetes',
-        matIconFont: 'stratos-icons', // TODO: get these from entity config?
+        text: 'Workloads',
+        matIcon: 'apps',
+        // matIconFont: 'stratos-icons',
         position: 60,
         requiresEndpointType: KUBERNETES_ENDPOINT_TYPE
       }
     }
   },
   {
-    path: 'workloads',
-    loadChildren: () => import('./kubernetes/workloads/workloads.module').then(m => m.WorkloadsModule),
+    path: 'kubernetes',
+    loadChildren: './kubernetes/kubernetes.module#KubernetesModule',
     data: {
-      reuseRoute: true,
       stratosNavigation: {
-        text: 'Workloads',
-        matIcon: 'apps',
-        // matIconFont: 'stratos-icons',
+        text: 'Kubernetes',
+        matIcon: 'kubernetes',
+        matIconFont: 'stratos-icons', // TODO: get these from entity config?
         position: 64,
         requiresEndpointType: KUBERNETES_ENDPOINT_TYPE
       }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component.ts
index 9602c820ac..05eee82127 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component.ts
@@ -17,7 +17,7 @@ export interface TableCellSidePanelConfig<T> {
 })
 export class TableCellSidePanelComponent<T = any, A = any> extends TableCellCustom<T> {
 
-  private actualConfig: TableCellSidePanelConfig<A>;
+  public actualConfig: TableCellSidePanelConfig<A>;
 
   private pRow: T;
   @Input('row')

From 98ea0af4ec8cd2fde3fea5860e8007630cb443f6 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 27 Jan 2020 18:06:12 +0000
Subject: [PATCH 304/648] Workload summary page improvements

---
 .../helm-release-summary-tab.component.html   | 55 ++++++++++++-------
 .../helm-release-summary-tab.component.scss   | 14 +++++
 .../helm-release-summary-tab.component.ts     | 23 +++++++-
 3 files changed, 69 insertions(+), 23 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
index 6363a050bf..c207bec0ab 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
@@ -16,10 +16,13 @@
           <app-metadata-item class="chart-details__item" label="Application Version">
             {{ release.chart.metadata.appVersion || '-' }}
           </app-metadata-item>
-          <app-metadata-item class="chart-details__item" label="Namespace">{{ release.namespace }}</app-metadata-item>
+          <app-metadata-item class="chart-details__item" label="Namespace">
+            <a [routerLink]="createRouterLink(release.namespace)">{{ release.namespace | titlecase }}</a>
+          </app-metadata-item>
           <app-metadata-item class="chart-details__item" label="Release Version">{{ release.version }}
           </app-metadata-item>
-          <app-metadata-item class="chart-details__item" label="Status">{{ release.status }}</app-metadata-item>
+          <app-metadata-item class="chart-details__item" label="Status">{{ release.status | titlecase }}
+          </app-metadata-item>
           <app-metadata-item class="chart-details__item" label="First Deployed">
             {{ release.info.first_deployed | date:'medium' }}
           </app-metadata-item>
@@ -27,32 +30,42 @@
             {{ release.info.last_deployed | date:'medium' }}
           </app-metadata-item>
         </div>
-        <app-tile-grid>
-          <app-tile-group *ngIf="chartData$ | async as chartData">
-            <app-tile>
-              <mat-card class="full-card">
-                <app-ring-chart [data]="chartData.podsChartData" label="Pods"></app-ring-chart>
-              </mat-card>
-            </app-tile>
-            <app-tile>
-              <mat-card class="full-card">
-                <app-ring-chart [customColors]="containersChartColors" [data]="chartData.containersChartData"
-                  label="Containers"></app-ring-chart>
-              </mat-card>
-            </app-tile>
-          </app-tile-group>
-        </app-tile-grid>
-
       </div>
-      <app-metadata-item class="chart-details__item" label="Resources"></app-metadata-item>
+    </app-entity-summary-title>
+    <div *ngIf="hasResources$ | async; else loadingResources" class="resources">
+      <app-metadata-item class="chart-details__item" label="Pods and Containers"></app-metadata-item>
+      <app-tile-grid>
+        <app-tile-group *ngIf="chartData$ | async as chartData">
+          <app-tile>
+            <mat-card class="full-card">
+              <app-ring-chart [data]="chartData.podsChartData" label="Pods"></app-ring-chart>
+            </mat-card>
+          </app-tile>
+          <app-tile>
+            <mat-card class="full-card">
+              <app-ring-chart [customColors]="containersChartColors" [data]="chartData.containersChartData"
+                label="Containers"></app-ring-chart>
+            </mat-card>
+          </app-tile>
+        </app-tile-group>
+      </app-tile-grid>
 
+      <app-metadata-item class="chart-details__item" label="All Resources"></app-metadata-item>
       <div *ngIf="resources$ | async as resources" class="grid">
         <app-card-number-metric *ngFor="let res of resources" label="{{ res.label }}" icon="{{ res.icon.name }}"
           iconFont="{{ res.icon.font }}" value="{{ res.count }}">
         </app-card-number-metric>
       </div>
-    </app-entity-summary-title>
-
+    </div>
+    <ng-template #loadingResources>
+      <div class="resources__loading">
+        <div class="resources_loading__content">
+          Loading Resources
+          <mat-progress-bar class="" [color]="'primary'" mode="indeterminate">
+          </mat-progress-bar>
+        </div>
+      </div>
 
+    </ng-template>
   </ng-container>
 </app-loading-page>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
index 2cd1e5e0aa..a40f8d2d52 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
@@ -1,6 +1,20 @@
 
 @import '../../../../../../../../core/sass/mixins';
 
+.resources {
+  padding: 0 10px;
+
+  &__loading {
+        display: flex;
+        justify-content: center;
+    &__content {
+      margin-top: 50px;
+      mat-progress-bar {
+        margin-top: 15px;
+      }
+    }
+  }
+}
 .app-metadata {
   display: flex;
   flex-direction: row;
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index 9a65e8bedb..83a471e459 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -9,7 +9,7 @@ import { RouterNav } from 'frontend/packages/store/src/actions/router.actions';
 import { HideSnackBar, ShowSnackBar } from 'frontend/packages/store/src/actions/snackBar.actions';
 import { AppState } from 'frontend/packages/store/src/app-state';
 import { combineLatest, Observable, ReplaySubject } from 'rxjs';
-import { map, startWith } from 'rxjs/operators';
+import { map, publishReplay, refCount, startWith } from 'rxjs/operators';
 
 import { GetHelmReleases } from '../../../store/workloads.actions';
 import { HelmReleaseChartData, HelmReleaseResource } from '../../../workload.types';
@@ -26,6 +26,7 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
 
   private busyDeletingSubject = new ReplaySubject<boolean>();
   public isBusy$: Observable<boolean>;
+  public hasResources$: Observable<boolean>;
   private readonly DEFAULT_LOADING_MESSAGE = 'Retrieving Release Details';
   public loadingMessage = this.DEFAULT_LOADING_MESSAGE;
 
@@ -110,7 +111,16 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
           resources[node.data.kind].statuses.push(node.data.status);
         });
         return Object.values(resources).sort((a: any, b: any) => a.kind.localeCompare(b.kind));
-      })
+      }),
+      publishReplay(1),
+      refCount()
+    );
+
+    this.hasResources$ = combineLatest([
+      this.chartData$,
+      this.resources$
+    ]).pipe(
+      map(([chartData, resources]) => !!chartData && !!resources)
     );
 
     this.deleteReleaseConfirmation = new ConfirmationDialogConfig(
@@ -173,4 +183,13 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
       this.store.dispatch(new HideSnackBar());
     }
   }
+
+  public createRouterLink(namespace: string): string[] {
+    return [
+      `/kubernetes`,
+      this.helmReleaseHelper.endpointGuid,
+      `namespaces`,
+      namespace
+    ];
+  }
 }

From 1b50f7e1d38e807f57c3e8408668f40b1047dbae Mon Sep 17 00:00:00 2001
From: Kate R <50168367+kreinecke@users.noreply.github.com>
Date: Mon, 27 Jan 2020 18:45:38 +0000
Subject: [PATCH 305/648] Backend sync status code-complete. Ready to start
 testing

Signed-off-by: Kate R <50168367+kreinecke@users.noreply.github.com>
---
 .../monocular/chart-repo/api_endpoint.go      | 17 +++++------
 .../monocular/chart-repo/common/types.go      | 16 +++++++---
 .../chart-repo/foundationdb/utils.go          |  4 +--
 .../monocular/chartsvc/utils/responses.go     |  5 ----
 src/jetstream/plugins/monocular/sync.go       | 29 ++++++++++++++++---
 5 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
index f80cdba01c..e1be75d75e 100644
--- a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
+++ b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
@@ -33,7 +33,6 @@ import (
 
 	"github.com/helm/monocular/chartrepo/common"
 	fdb "github.com/helm/monocular/chartrepo/foundationdb"
-	responses "github.com/helm/monocular/chartrepo/utils"
 )
 
 const pathPrefix = "/v1"
@@ -93,7 +92,7 @@ func OnDemandSync(w http.ResponseWriter, req *http.Request, params Params) {
 	var status string
 	var currentRepoStatus = fdb.GetRepoSyncStatus(repoName).Status
 	//If this repo is already syncing, don't start another sync, but return in progress response
-	activeSyncJob := currentRepoStatus == common.SyncStatusInProgress || currentRepoStatus == common.SyncStatusStarted
+	activeSyncJob := currentRepoStatus == common.SyncStatusInProgress || currentRepoStatus == common.SyncStatusInProgress
 	if activeSyncJob {
 		status = common.SyncStatusInProgress
 	} else {
@@ -119,13 +118,13 @@ func OnDemandSync(w http.ResponseWriter, req *http.Request, params Params) {
 
 		go fdb.SyncRepo(fdbClient, fDBName, repoName, repoURL, authorizationHeader, clientKeepAlive)
 
-		status = common.SyncStatusStarted
+		status = common.SyncStatusInProgress
 	}
 
 	requestUUID, err := uuid.NewUUID()
 
 	//Return sync status in response
-	response := responses.SyncJobStatusResponse{requestUUID.String(), status}
+	response := common.SyncJobStatusResponse{requestUUID.String(), status}
 	js, err := json.Marshal(response)
 	if err != nil {
 		log.Error(err.Error())
@@ -153,7 +152,7 @@ func OnDemandDelete(w http.ResponseWriter, req *http.Request, params Params) {
 	var status string
 	var currentRepoStatus = fdb.GetRepoSyncStatus(repoName).Status
 	//If this repo is already being deleted, don't start another delete, but return in progress response
-	activeDeleteJob := currentRepoStatus == common.DeleteStatusInProgress || currentRepoStatus == common.DeleteStatusStarted
+	activeDeleteJob := currentRepoStatus == common.DeleteStatusInProgress || currentRepoStatus == common.DeleteStatusInProgress
 	if activeDeleteJob {
 		status = common.DeleteStatusInProgress
 	} else {
@@ -162,12 +161,12 @@ func OnDemandDelete(w http.ResponseWriter, req *http.Request, params Params) {
 		var clientKeepAlive = true
 
 		go fdb.DeleteRepo(fdbClient, fDBName, repoName, clientKeepAlive)
-		status = common.DeleteStatusStarted
+		status = common.DeleteStatusInProgress
 	}
 
 	//Return delete status in response
 	requestUUID, err := uuid.NewUUID()
-	response := responses.DeleteJobStatusResponse{requestUUID.String(), status}
+	response := common.DeleteJobStatusResponse{requestUUID.String(), status}
 	js, err := json.Marshal(response)
 	if err != nil {
 		log.Error(err.Error())
@@ -191,7 +190,7 @@ func RepoSyncStatus(w http.ResponseWriter, req *http.Request, params Params) {
 	status := fdb.GetRepoSyncStatus(repoName)
 
 	requestUUID, err := uuid.NewUUID()
-	response := responses.SyncJobStatusResponse{requestUUID.String(), status.Status}
+	response := common.SyncJobStatusResponse{requestUUID.String(), status.Status}
 	js, err := json.Marshal(response)
 	if err != nil {
 		log.Error(err.Error())
@@ -214,7 +213,7 @@ func RepoDeleteStatus(w http.ResponseWriter, req *http.Request, params Params) {
 
 	status := fdb.GetRepoDeleteStatus(repoName)
 	requestUUID, err := uuid.NewUUID()
-	response := responses.DeleteJobStatusResponse{requestUUID.String(), status.Status}
+	response := common.DeleteJobStatusResponse{requestUUID.String(), status.Status}
 	js, err := json.Marshal(response)
 	if err != nil {
 		log.Error(err.Error())
diff --git a/src/jetstream/plugins/monocular/chart-repo/common/types.go b/src/jetstream/plugins/monocular/chart-repo/common/types.go
index 30221ff53b..6cd7d5d31a 100644
--- a/src/jetstream/plugins/monocular/chart-repo/common/types.go
+++ b/src/jetstream/plugins/monocular/chart-repo/common/types.go
@@ -113,9 +113,8 @@ func (m *SyncStatusMap) Get(repo string) RepoSyncStatus {
 }
 
 const SyncStatusFailed = "Failed"
-const SyncStatusSuccess = "Synchronized"
+const SyncStatusSynced = "Synchronized"
 const SyncStatusInProgress = "Synchronizing"
-const SyncStatusStarted = "Started"
 
 type RepoDeleteStatus struct {
 	Repo   string `json:"repo"`
@@ -141,6 +140,15 @@ func (m *DeleteStatusMap) Get(repo string) RepoDeleteStatus {
 }
 
 const DeleteStatusFailed = "Failed"
-const DeleteStatusSuccess = "Deleted"
+const DeleteStatusDeleted = "Deleted"
 const DeleteStatusInProgress = "Deleting"
-const DeleteStatusStarted = "Started"
+
+type SyncJobStatusResponse struct {
+	UUID  string `json:"uuid"`
+	Status string `json:"status"`
+}
+
+type DeleteJobStatusResponse struct {
+	UUID  string `json:"uuid"`
+	Status string `json:"status"`
+}
\ No newline at end of file
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
index eee7bb10f1..fec1bae6ff 100644
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
@@ -121,7 +121,7 @@ func SyncRepo(dbClient Client, dbName, repoName, repoURL string, authorizationHe
 	// Check if the repo has been already processed
 	if repoAlreadyProcessed(db, repoName, repoChecksum) {
 		log.WithFields(log.Fields{"url": repoURL}).Info("Skipping repository since there are no updates")
-		repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusSuccess})
+		repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusSynced})
 		return nil
 	}
 
@@ -195,7 +195,7 @@ func SyncRepo(dbClient Client, dbName, repoName, repoURL string, authorizationHe
 		return err
 	}
 	log.WithFields(log.Fields{"url": repoURL}).Info("Stored repository update in cache")
-	repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusSuccess})
+	repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusSynced})
 	return nil
 }
 
diff --git a/src/jetstream/plugins/monocular/chartsvc/utils/responses.go b/src/jetstream/plugins/monocular/chartsvc/utils/responses.go
index 3cab11ea20..00d6c105f2 100644
--- a/src/jetstream/plugins/monocular/chartsvc/utils/responses.go
+++ b/src/jetstream/plugins/monocular/chartsvc/utils/responses.go
@@ -39,11 +39,6 @@ type ApiResponse struct {
 //ApiListResponse is an API response in list format
 type ApiListResponse []*ApiResponse
 
-type SyncStatusResponse struct {
-	UUID  string `json:"uuid"`
-	State string `json:"state"`
-}
-
 //SelfLink the self-referencing URL to a chart in a response
 type SelfLink struct {
 	Self string `json:"self"`
diff --git a/src/jetstream/plugins/monocular/sync.go b/src/jetstream/plugins/monocular/sync.go
index b1efcc9381..cf74b1c9a3 100644
--- a/src/jetstream/plugins/monocular/sync.go
+++ b/src/jetstream/plugins/monocular/sync.go
@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	"github.com/helm/monocular/chartrepo/common"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -57,12 +58,22 @@ func (m *Monocular) processSyncRequests() {
 			m.portalProxy.UpdateEndointMetadata(job.Endpoint.GUID, marshalSyncMetadata(metadata))
 			//Hit the sync server container endpoint to trigger a sync for given repo
 			response, err := putRequest("http://127.0.0.1:8080"+chartRepoPathPrefix+"/sync/"+job.Endpoint.Name, strings.NewReader(repoSyncRequestParams))
-			//TODO kate extract status from response
 			metadata.Busy = false
 			if err != nil {
-				log.Warn("Request to sync repository failed: %v+", err)
+				log.Warn("Request to sync repository failed: %v", err)
 				metadata.Status = "Sync Failed"
 				m.updateMetadata(job.Endpoint.GUID, metadata)
+			} else {
+			//TODO kate extract status from response
+			statusResponse := common.SyncJobStatusResponse{}
+			defer response.Body.Close()
+			err := json.NewDecoder(response.Body).Decode(&statusResponse)
+			if err != nil { 
+				log.Errorf("Unable to parse response from chart-repo server, sync request may not be processed: %v", err)
+				metadata.Status = "Sync Failed"
+			} else if statusResponse != common.SyncStatusInProgress {
+				log.Errorf("Failed to synchronize repo: %v, response: %v, statusResponse", job.Endpoint.Name, err)
+				metadata.Status = "Sync Failed"
 			} else {
 				metadata.Status = "Synchronizing"
 				m.updateMetadata(job.Endpoint.GUID, metadata)
@@ -72,10 +83,20 @@ func (m *Monocular) processSyncRequests() {
 			log.Infof("Deleting Helm Repository: %s", job.Endpoint.Name)
 			//Hit the sync server container endpoint to trigger a delete for given repo
 			response, err := putRequest("http://127.0.0.1:8080"+chartRepoPathPrefix+"/delete/"+job.Endpoint.Name, strings.NewReader(repoSyncRequestParams))
-			//TODO kate extract status from response
+			//Extract status from response
 			if err != nil {
 				log.Warn("Request to delete repository failed: %v+", err)
-			}
+			} else {
+				//TODO kate extract status from response
+				statusResponse := common.SyncJobStatusResponse{}
+				defer response.Body.Close()
+				err := json.NewDecoder(response.Body).Decode(&statusResponse)
+				if err != nil { 
+					log.Errorf("Unable to parse response from chart-repo server, delete request may not be processed: %v", err)
+				} else if statusResponse != common.DeleteStatusInProgress {
+					log.Errorf("Failed to delete repo: %v, response: %v, statusResponse", job.Endpoint.Name, err)
+				}
+			}	
 		}
 	}
 

From 26013748c8e9d575ca20a17bb5815d69aeb05d0d Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Tue, 28 Jan 2020 10:27:51 +0000
Subject: [PATCH 306/648] Hide Workload overview tab, consistent chart colours

---
 .../helm-release-tab-base.component.ts             |  2 +-
 .../helm-release-summary-tab.component.html        |  5 +++--
 .../helm-release-summary-tab.component.ts          | 14 ++++++++++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

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 9a24cf3dbb..68d11d5578 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
@@ -64,7 +64,7 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
     { link: 'notes', label: 'Notes', icon: 'subject' },
     { link: 'values', label: 'Values', icon: 'list' },
     { link: '-', label: 'Resources' },
-    { link: 'graph', label: 'Overview', icon: 'share' },
+    // { link: 'graph', label: 'Overview', icon: 'share' },
     { link: 'pods', label: 'Pods', icon: 'adjust' },
     { link: 'services', label: 'Services', icon: 'service', iconFont: 'stratos-icons' }
   ];
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
index c207bec0ab..16f0c9a276 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
@@ -17,7 +17,7 @@
             {{ release.chart.metadata.appVersion || '-' }}
           </app-metadata-item>
           <app-metadata-item class="chart-details__item" label="Namespace">
-            <a [routerLink]="createRouterLink(release.namespace)">{{ release.namespace | titlecase }}</a>
+            <a [routerLink]="createNamespaceLink(release.namespace)">{{ release.namespace | titlecase }}</a>
           </app-metadata-item>
           <app-metadata-item class="chart-details__item" label="Release Version">{{ release.version }}
           </app-metadata-item>
@@ -38,7 +38,8 @@
         <app-tile-group *ngIf="chartData$ | async as chartData">
           <app-tile>
             <mat-card class="full-card">
-              <app-ring-chart [data]="chartData.podsChartData" label="Pods"></app-ring-chart>
+              <app-ring-chart [customColors]="podChartColors" [data]="chartData.podsChartData" label="Pods">
+              </app-ring-chart>
             </mat-card>
           </app-tile>
           <app-tile>
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index 83a471e459..c7bcd49c39 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -33,10 +33,19 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
   public podsChartData = [];
   public containersChartData = [];
 
+  private successChartColor = '#4DD3A7';
+
+  public podChartColors = [
+    {
+      name: 'Running',
+      value: this.successChartColor
+    },
+  ];
+
   public containersChartColors = [
     {
       name: 'Ready',
-      value: '#4DD3A7'
+      value: this.successChartColor
     },
     {
       name: 'Not Ready',
@@ -44,6 +53,7 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
     }
   ];
 
+
   public iconMappings = {
     Pod: {
       name: 'adjust'
@@ -184,7 +194,7 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
     }
   }
 
-  public createRouterLink(namespace: string): string[] {
+  public createNamespaceLink(namespace: string): string[] {
     return [
       `/kubernetes`,
       this.helmReleaseHelper.endpointGuid,

From 00d92306c62afafe4d6ee97d77da8d564851c293 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Tue, 28 Jan 2020 11:43:22 +0000
Subject: [PATCH 307/648] Upstream fixes required for downstream setup header
 fix

---
 .../local-account-wizard.component.html       | 63 ++++++++++---------
 .../setup-welcome.component.html              | 10 +--
 .../setup-welcome.component.scss              |  8 ++-
 .../console-uaa-wizard.component.html         |  2 +-
 4 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/src/frontend/packages/core/src/features/setup/local-account-wizard/local-account-wizard.component.html b/src/frontend/packages/core/src/features/setup/local-account-wizard/local-account-wizard.component.html
index d2ad952b8f..c76d05fefc 100644
--- a/src/frontend/packages/core/src/features/setup/local-account-wizard/local-account-wizard.component.html
+++ b/src/frontend/packages/core/src/features/setup/local-account-wizard/local-account-wizard.component.html
@@ -1,31 +1,32 @@
-<div class="page-container">
-    <app-page-header hideMenu="true" [showHistory]="false">
-      <h1>{{title}} Setup with Local Admin Account</h1>
-    </app-page-header>
-    <app-show-page-header></app-show-page-header>
-    <div class="local-setup-wizard">
-      <app-steppers>
-        <app-step title="Local Account Informatiomn" [valid]="validateLocalAuthForm | async" [onNext]="next">
-          <app-loading-page [isLoading]="applyingSetup$" alert="Saving configuration"
-            text="Please wait - this will take a few moments">
-            <div class="local-setup-wizard__form">
-              <p class="local-setup-wizard__form-section">
-                Please choose a password to use for the local Administrator account.</p>
-              <p>This will configure Stratos with a single, built-in account with the username <span class="local-setup-wizard__form-username">admin</span>
-                and the password that you choose below.</p>
-              <form class="local-setup-wizard__form" [formGroup]="passwordForm" class="stepper-form">
-                <div class="local-setup-wizard__form-block">
-                  <mat-form-field>
-                    <input matInput formControlName="adminPassword" placeholder="Password" type="password">
-                  </mat-form-field>
-                  <mat-form-field>
-                    <input matInput formControlName="adminPasswordConfirm" placeholder="Confirm Password" type="password">
-                  </mat-form-field>
-                </div>
-              </form>
-            </div>
-          </app-loading-page>
-        </app-step>
-      </app-steppers>
-    </div>
-  </div>
\ No newline at end of file
+<div class="page-container setup">
+  <app-page-header hideMenu="true" [showHistory]="false">
+    <h1>{{title}} Setup with Local Admin Account</h1>
+  </app-page-header>
+  <app-show-page-header></app-show-page-header>
+  <div class="local-setup-wizard">
+    <app-steppers>
+      <app-step title="Local Account Informatiomn" [valid]="validateLocalAuthForm | async" [onNext]="next">
+        <app-loading-page [isLoading]="applyingSetup$" alert="Saving configuration"
+          text="Please wait - this will take a few moments">
+          <div class="local-setup-wizard__form">
+            <p class="local-setup-wizard__form-section">
+              Please choose a password to use for the local Administrator account.</p>
+            <p>This will configure Stratos with a single, built-in account with the username <span
+                class="local-setup-wizard__form-username">admin</span>
+              and the password that you choose below.</p>
+            <form class="local-setup-wizard__form" [formGroup]="passwordForm" class="stepper-form">
+              <div class="local-setup-wizard__form-block">
+                <mat-form-field>
+                  <input matInput formControlName="adminPassword" placeholder="Password" type="password">
+                </mat-form-field>
+                <mat-form-field>
+                  <input matInput formControlName="adminPasswordConfirm" placeholder="Confirm Password" type="password">
+                </mat-form-field>
+              </div>
+            </form>
+          </div>
+        </app-loading-page>
+      </app-step>
+    </app-steppers>
+  </div>
+</div>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/features/setup/setup-welcome/setup-welcome.component.html b/src/frontend/packages/core/src/features/setup/setup-welcome/setup-welcome.component.html
index e07911edf6..ae0f9454e0 100644
--- a/src/frontend/packages/core/src/features/setup/setup-welcome/setup-welcome.component.html
+++ b/src/frontend/packages/core/src/features/setup/setup-welcome/setup-welcome.component.html
@@ -1,19 +1,21 @@
-<div class="page-container">
+<div class="page-container setup">
   <app-page-header hideMenu="true" [showHistory]="false">
     <h1>{{title}} Setup</h1>
   </app-page-header>
   <app-show-page-header></app-show-page-header>
-  <div class="setup">
+  <div class="setup__container">
     <app-steppers>
       <app-step [hideNextButton]="true">
         <div class="select-step">
           <app-stratos-title></app-stratos-title>
           <div class="setup__config">
             <p class="setup__intro">Welcome to Stratos</p>
-            <p class="setup__welcome">Before you can login, you need to choose how users will login to Stratos and complete the required configuration for the chosen method of authentication:</p>
+            <p class="setup__welcome">Before you can login, you need to choose how users will login to Stratos and
+              complete the required configuration for the chosen method of authentication:</p>
           </div>
           <div class="setup-tiles">
-            <app-tile-selector-tile *ngFor="let tile of tileSelectorConfig" (tileSelect)="selectionChange(tile)" [tile]="tile" [active]="true">
+            <app-tile-selector-tile *ngFor="let tile of tileSelectorConfig" (tileSelect)="selectionChange(tile)"
+              [tile]="tile" [active]="true">
             </app-tile-selector-tile>
           </div>
         </div>
diff --git a/src/frontend/packages/core/src/features/setup/setup-welcome/setup-welcome.component.scss b/src/frontend/packages/core/src/features/setup/setup-welcome/setup-welcome.component.scss
index d029724603..f6f3552ebb 100644
--- a/src/frontend/packages/core/src/features/setup/setup-welcome/setup-welcome.component.scss
+++ b/src/frontend/packages/core/src/features/setup/setup-welcome/setup-welcome.component.scss
@@ -27,9 +27,11 @@
 }
 
 .setup {
-  display: flex;
-  flex: 1;
-  margin: 0 100px;
+  &__container {
+    display: flex;
+    flex: 1;
+    margin: 0 100px;
+  }
 
   &__intro {
     font-size: 28px;
diff --git a/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.html b/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.html
index 3b9383fca4..8eab0cb6ab 100644
--- a/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.html
+++ b/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.html
@@ -1,4 +1,4 @@
-<div class="page-container">
+<div class="page-container setup">
   <app-page-header hideMenu="true" [showHistory]="false">
     <h1>{{title}} Setup with Cloud Foundry UAA</h1>
   </app-page-header>

From 9dae21ac72a6caacd765e15fea5cfef317f509ba Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Tue, 28 Jan 2020 11:43:36 +0000
Subject: [PATCH 308/648] Fix for setup header

---
 custom-src/frontend/sass/custom/suse.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/custom-src/frontend/sass/custom/suse.scss b/custom-src/frontend/sass/custom/suse.scss
index 791d61ef1e..481d1f7236 100644
--- a/custom-src/frontend/sass/custom/suse.scss
+++ b/custom-src/frontend/sass/custom/suse.scss
@@ -39,6 +39,11 @@ body.stratos {
     color: #333;
   }
 
+  .setup .page-header .mat-toolbar.mat-primary {
+    background-color: $suse-primary-color;
+    color: $suse-text;
+  }
+
   app-page-subheader {
     .page-subheader {
       background-color: #fff;

From 73530986a68181c2e4868b63271a0318f9df79cc Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Tue, 28 Jan 2020 11:49:45 +0000
Subject: [PATCH 309/648] Use same colour side panel title as main title

---
 custom-src/frontend/sass/custom/suse.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/custom-src/frontend/sass/custom/suse.scss b/custom-src/frontend/sass/custom/suse.scss
index 481d1f7236..15eb4bc408 100644
--- a/custom-src/frontend/sass/custom/suse.scss
+++ b/custom-src/frontend/sass/custom/suse.scss
@@ -34,7 +34,9 @@ body.stratos {
     display: initial;
   }
 
-  .page-header .mat-toolbar.mat-primary {
+  .page-header .mat-toolbar.mat-primary,
+  .sidepanel-preview__header
+   {
     background-color: #fff;
     color: #333;
   }

From 981ce481aa128b1bc8e309fee91f1211762b5682 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Tue, 28 Jan 2020 13:16:02 +0000
Subject: [PATCH 310/648] Update node conditions - only show condition if it
 exists - add PIDPressire and NetworkUnavailable as per docs - other
 conditions are ignored (we don't know if true/false is good/bad)

---
 .../kubernetes-node-condition-card.component.html           | 4 ++++
 .../kubernetes-node-condition-card.component.ts             | 5 +----
 .../kubernetes-node-condition.component.html                | 4 ++--
 .../kubernetes-node-condition.component.ts                  | 2 ++
 .../kubernetes-nodes-list-config.service.ts                 | 1 -
 .../frontend/app/custom/kubernetes/store/kube.types.ts      | 6 ++++--
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.html
index 30ba64428f..c485a910da 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.html
@@ -12,6 +12,10 @@
         </app-kubernetes-node-condition>
         <app-kubernetes-node-condition [inverse]="true" [subtle]="true" condition="OutOfDisk">
         </app-kubernetes-node-condition>
+        <app-kubernetes-node-condition [inverse]="true" [subtle]="true" condition="PIDPressure">
+        </app-kubernetes-node-condition>
+        <app-kubernetes-node-condition [inverse]="true" [subtle]="true" condition="NetworkUnavailable">
+        </app-kubernetes-node-condition>
       </div>
     </mat-card-content>
   </mat-card>
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts
index 9a555fd840..1046605a5f 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts
@@ -5,7 +5,4 @@ import { Component } from '@angular/core';
   templateUrl: './kubernetes-node-condition-card.component.html',
   styleUrls: ['./kubernetes-node-condition-card.component.scss']
 })
-export class KubernetesNodeConditionCardComponent {
-
-
-}
+export class KubernetesNodeConditionCardComponent { }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html
index 68a011f145..ea848be216 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html
@@ -1,4 +1,4 @@
-<div class="kube-node-condition">
+<div *ngIf="condition$ | async as conditionValue" class="kube-node-condition">
   <div class="kube-node-condition__title">
     <mat-icon [fontSet]="icons[condition][1]">{{ icons[condition][0] }}</mat-icon>
     <div>
@@ -6,5 +6,5 @@
     </div>
   </div>
   <app-boolean-indicator class="kube-node-condition__indicator" [subtle]="subtle" [inverse]="inverse"
-    [isTrue]="condition$ | async" type="yes-no"></app-boolean-indicator>
+    [isTrue]="conditionValue" type="yes-no"></app-boolean-indicator>
 </div>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts
index 6f2e961180..08b17950bf 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts
@@ -30,6 +30,8 @@ export class KubernetesNodeConditionComponent implements OnInit {
     OutOfDisk: ['storage', 'material-icons'],
     MemoryPressure: ['memory', 'material-icons'],
     DiskPressure: ['storage', 'material-icons'],
+    PIDPressure: ['vertical_align_center', 'material-icons'],
+    NetworkUnavailable: ['settings_ethernet', 'material-icons']
   };
 
   constructor(
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
index 17641970eb..d3b391bca3 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
@@ -56,7 +56,6 @@ export class KubernetesNodesListConfigService implements IListConfig<KubernetesN
         conditionType: ConditionType.Ready
       },
       cellComponent: ConditionCellComponent,
-
       sort: getConditionSort(ConditionType.Ready),
       cellFlex: '2',
     },
diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
index 7cdb1a1358..fec2a4106f 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
@@ -133,14 +133,16 @@ export enum ConditionType {
   MemoryPressure = 'MemoryPressure',
   DiskPressure = 'DiskPressure',
   Ready = 'Ready',
-  PIDPressure = 'PIDPressure'
+  PIDPressure = 'PIDPressure',
+  NetworkUnavailable = 'NetworkUnavailable'
 }
 export const ConditionTypeLabels = {
   [ConditionType.Ready]: 'Ready',
   [ConditionType.OutOfDisk]: 'Out of Disk',
   [ConditionType.MemoryPressure]: 'Memory Pressure',
   [ConditionType.DiskPressure]: 'Disk Pressure',
-  [ConditionType.PIDPressure]: 'PID Pressure'
+  [ConditionType.PIDPressure]: 'PID Pressure',
+  [ConditionType.NetworkUnavailable]: 'Network Unavailable'
 };
 
 export enum ConditionStatus {

From 2b8c3b39ddaf1d7c33bf37e24906d2ff53d82774 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Tue, 28 Jan 2020 13:22:54 +0000
Subject: [PATCH 311/648] Fix pods node link

---
 .../kubernetes-pods/kubernetes-pods-list-config.service.ts    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
index b7318cb2a9..b5f053b240 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
@@ -24,8 +24,6 @@ import { KubernetesPodReadinessComponent } from './kubernetes-pod-readiness/kube
 import { KubernetesPodStatusComponent } from './kubernetes-pod-status/kubernetes-pod-status.component';
 import { KubernetesPodsDataSource } from './kubernetes-pods-data-source';
 
-type a = TableCellSidePanelComponent<KubernetesPod, KubernetesResourceViewerConfig>;
-
 export abstract class BaseKubernetesPodsListConfigService implements IListConfig<KubernetesPod> {
 
   static namespaceColumnId = 'namespace';
@@ -83,7 +81,7 @@ export abstract class BaseKubernetesPodsListConfigService implements IListConfig
       columnId: 'node', headerCell: () => 'Node',
       cellDefinition: {
         valuePath: 'spec.nodeName',
-        getLink: () => `/kubernetes/${this.kubeId}/summary`
+        getLink: pod => `/kubernetes/${this.kubeId}/nodes/${pod.spec.nodeName}/summary`
       },
       sort: {
         type: 'sort',

From 8c3802eda5cb6dbc79e64f3f9e5059d4fafc478a Mon Sep 17 00:00:00 2001
From: Kate R <50168367+kreinecke@users.noreply.github.com>
Date: Tue, 28 Jan 2020 14:20:33 +0000
Subject: [PATCH 312/648] Add code to poll for helm-repo sync status

Signed-off-by: Kate R <50168367+kreinecke@users.noreply.github.com>
---
 src/jetstream/plugins/monocular/sync.go       | 80 ++++++++++++++-----
 .../plugins/monocular/utils/urlpoll.go        |  4 +-
 2 files changed, 64 insertions(+), 20 deletions(-)

diff --git a/src/jetstream/plugins/monocular/sync.go b/src/jetstream/plugins/monocular/sync.go
index cf74b1c9a3..a4c8659102 100644
--- a/src/jetstream/plugins/monocular/sync.go
+++ b/src/jetstream/plugins/monocular/sync.go
@@ -6,6 +6,9 @@ import (
 	"io"
 	"net/http"
 	"strings"
+	"time"
+
+	"k8s.io/apimachinery/pkg/util/wait"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	"github.com/helm/monocular/chartrepo/common"
@@ -22,7 +25,11 @@ type SyncMetadata struct {
 	Busy   bool   `json:"busy"`
 }
 
-const chartRepoPathPrefix = "/v1"
+const (
+	chartRepoPathPrefix = "/v1"
+	statusPollInterval = 30
+	statusPollTimeout = 240
+)
 
 // Sync Channel
 var syncChan = make(chan SyncJob, 100)
@@ -62,23 +69,32 @@ func (m *Monocular) processSyncRequests() {
 			if err != nil {
 				log.Warn("Request to sync repository failed: %v", err)
 				metadata.Status = "Sync Failed"
-				m.updateMetadata(job.Endpoint.GUID, metadata)
-			} else {
-			//TODO kate extract status from response
-			statusResponse := common.SyncJobStatusResponse{}
-			defer response.Body.Close()
-			err := json.NewDecoder(response.Body).Decode(&statusResponse)
-			if err != nil { 
-				log.Errorf("Unable to parse response from chart-repo server, sync request may not be processed: %v", err)
-				metadata.Status = "Sync Failed"
-			} else if statusResponse != common.SyncStatusInProgress {
-				log.Errorf("Failed to synchronize repo: %v, response: %v, statusResponse", job.Endpoint.Name, err)
-				metadata.Status = "Sync Failed"
 			} else {
-				metadata.Status = "Synchronizing"
-				m.updateMetadata(job.Endpoint.GUID, metadata)
+				//TODO kate extract status from response
+				statusResponse := common.SyncJobStatusResponse{}
+				defer response.Body.Close()
+				err := json.NewDecoder(response.Body).Decode(&statusResponse)
+				if err != nil { 
+					log.Errorf("Unable to parse response from chart-repo server, sync request may not be processed: %v", err)
+					metadata.Status = "Sync Failed"
+				} else if statusResponse.Status != common.SyncStatusInProgress {
+					log.Errorf("Failed to synchronize repo: %v, response: %v, statusResponse", job.Endpoint.Name, err)
+					metadata.Status = "Sync Failed"
+				} else {
+					metadata.Status = "Synchronizing"
+					m.updateMetadata(job.Endpoint.GUID, metadata)
+					log.Infof("Sync in progress for repository: %s", job.Endpoint.APIEndpoint.String())
+					//Now wait for success
+					err := waitForSyncComplete(job.Endpoint.APIEndpoint.String())
+					if err == nil {
+						metadata.Status = "Synchronized"
+					} else {
+						metadata.Status = "Sync Failed"
+						log.Errorf("Failed to fetch sync status for repo: %v, v%", job.Endpoint.Name, err)
+					}
+				}
 			}
-			log.Infof("Sync in progress for repository: %s", job.Endpoint.APIEndpoint.String())
+			m.updateMetadata(job.Endpoint.GUID, metadata)
 		} else if job.Action == 1 {
 			log.Infof("Deleting Helm Repository: %s", job.Endpoint.Name)
 			//Hit the sync server container endpoint to trigger a delete for given repo
@@ -87,13 +103,12 @@ func (m *Monocular) processSyncRequests() {
 			if err != nil {
 				log.Warn("Request to delete repository failed: %v+", err)
 			} else {
-				//TODO kate extract status from response
 				statusResponse := common.SyncJobStatusResponse{}
 				defer response.Body.Close()
 				err := json.NewDecoder(response.Body).Decode(&statusResponse)
 				if err != nil { 
 					log.Errorf("Unable to parse response from chart-repo server, delete request may not be processed: %v", err)
-				} else if statusResponse != common.DeleteStatusInProgress {
+				} else if statusResponse.Status != common.DeleteStatusInProgress {
 					log.Errorf("Failed to delete repo: %v, response: %v, statusResponse", job.Endpoint.Name, err)
 				}
 			}	
@@ -103,6 +118,24 @@ func (m *Monocular) processSyncRequests() {
 	log.Debug("processSyncRequests finished")
 }
 
+func waitForSyncComplete (url string) error {
+	return wait.Poll(statusPollInterval * time.Second, time.Duration(statusPollTimeout)*time.Second, func() (bool, error) {
+		var complete = false
+		resp, err := http.Get(url)
+		defer resp.Body.Close()
+		if err != nil {
+			statusResponse := common.SyncJobStatusResponse{}
+			err := json.NewDecoder(resp.Body).Decode(&statusResponse)
+			if err != nil {
+				if statusResponse.Status == common.SyncStatusSynced {
+					complete = true
+				}
+			}
+		}
+		return complete, err
+	})
+}
+
 func marshalSyncMetadata(metadata SyncMetadata) string {
 	jsonString, err := json.Marshal(metadata)
 	if err != nil {
@@ -128,3 +161,14 @@ func putRequest(url string, data io.Reader) (*http.Response, error) {
 	}
 	return resp, err
 }
+
+//https://gist.github.com/maniankara/a10d19960293b34b608ac7ef068a3d63
+func getRequest(url string, data io.Reader) (*http.Response, error) {
+	client := &http.Client{}
+	req, err := http.NewRequest(http.MethodPut, url, data)
+	var resp *http.Response
+	if err == nil {
+		resp, err = client.Do(req)
+	}
+	return resp, err
+}
diff --git a/src/jetstream/plugins/monocular/utils/urlpoll.go b/src/jetstream/plugins/monocular/utils/urlpoll.go
index 6d9aef14b7..3e71baddc0 100644
--- a/src/jetstream/plugins/monocular/utils/urlpoll.go
+++ b/src/jetstream/plugins/monocular/utils/urlpoll.go
@@ -11,7 +11,7 @@ import (
 
 const (
 	numPollers     = 2                // number of Poller goroutines to launch
-	pollInterval   = 60 * time.Second // how often to poll each URL
+	pollInterval   = 20 * time.Second // how often to poll each URL
 	statusInterval = 10 * time.Second // how often to log status to stdout
 	errTimeout     = 10 * time.Second // back-off timeout on error
 )
@@ -79,7 +79,7 @@ func (r *Resource) PollHead() string {
 
 // Poll executes an HTTP GET request for url
 // and returns the HTTP status string, body as a string.
-func (r *Resource) PollGet() string, error {
+func (r *Resource) PollGet() (string, string, error) {
 
 	var body = ""
 	resp, err := http.Get(r.url)

From 11587caffb81d82638ecb763526878cade6ff782 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Tue, 28 Jan 2020 14:20:38 +0000
Subject: [PATCH 313/648] Tidy up connect kube form

---
 .../kubernetes-certs-auth-form.component.html | 30 +++++++++++--------
 .../kubernetes-certs-auth-form.component.scss | 19 ++++++++++++
 .../connect-endpoint-dialog.component.scss    |  2 +-
 3 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html
index 975c49b94e..80770e8fcb 100644
--- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html
@@ -2,21 +2,25 @@
   <div formGroupName="authValues" class="kube-certs-auth__form">
     <mat-tab-group>
       <mat-tab label="Certificate Files">
-        <span>Specify Certificate file:</span>
-        <app-file-input fileFormControlName="cert" placeholder="cert">
-        </app-file-input>
-        <span>Specify Certificate key file:</span>
-        <app-file-input fileFormControlName="certKey" placeholder="certKey">
-        </app-file-input>
-        <input matInput formControlName="cert" hidden=true>
-        <input matInput formControlName="certKey" hidden=true>
+        <div class="kube-certs-auth__form__file">
+          <span>Specify Certificate file:</span>
+          <app-file-input fileFormControlName="cert" placeholder="cert">
+          </app-file-input>
+          <span>Specify Certificate key file:</span>
+          <app-file-input fileFormControlName="certKey" placeholder="certKey">
+          </app-file-input>
+          <input matInput formControlName="cert" hidden=true>
+          <input matInput formControlName="certKey" hidden=true>
+        </div>
       </mat-tab>
       <mat-tab label="Certificate Content">
-        <span>Specify Certificate:</span>
-        <textarea matInput formControlName="cert"></textarea>
-        <span>Specify Certificate key:</span>
-        <textarea matInput formControlName="certKey"></textarea>
+        <div class="kube-certs-auth__form__content">
+          <span>Specify Certificate:</span>
+          <textarea matInput formControlName="cert"></textarea>
+          <span>Specify Certificate key:</span>
+          <textarea matInput formControlName="certKey"></textarea>
+        </div>
       </mat-tab>
     </mat-tab-group>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss
index 4918206b4d..23498e9eca 100644
--- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss
+++ b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss
@@ -2,5 +2,24 @@
   &__form {
     display: flex;
     flex-direction: column;
+    height: 250px;
+    width: 450px;
+
+    &__file,
+    &__content {
+      display: flex;
+      flex-direction: column;
+      padding-top: 15px;
+    }
+
+    &__content {
+      & > * {
+        padding-bottom: 10px;
+      }
+      textarea {
+        max-height: 75px;
+        min-height: 60px;
+      }
+    }
   }
 }
diff --git a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.scss b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.scss
index 142e269c1c..9698d04f88 100644
--- a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.scss
+++ b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.scss
@@ -1,6 +1,6 @@
 .connection-dialog {
   $dialog-padding: 24px;
-  width: 300px;
+  max-width: 450px;
   &__content {
     display: flex;
     flex-direction: column;

From bcd7dc8de06609ae0bff0cb6e69ee406c701b9c7 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Tue, 28 Jan 2020 15:30:13 +0000
Subject: [PATCH 314/648] Respect skip ssl setting when validating kube
 endpoint - added TODOs for better feedback to client

---
 src/jetstream/authcnsi.go                     | 9 +++------
 src/jetstream/plugins/kubernetes/auth/cert.go | 2 +-
 src/jetstream/plugins/kubernetes/main.go      | 8 +++++++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/jetstream/authcnsi.go b/src/jetstream/authcnsi.go
index b8e00181e4..5aeea448ad 100644
--- a/src/jetstream/authcnsi.go
+++ b/src/jetstream/authcnsi.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -9,16 +8,14 @@ import (
 	"net/url"
 	"strings"
 
-	log "github.com/sirupsen/logrus"
 	"github.com/labstack/echo"
+	log "github.com/sirupsen/logrus"
 
 	"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"
-
 )
 
-
 // CFAdminIdentifier - The scope that Cloud Foundry uses to convey administrative level perms
 const CFAdminIdentifier = "cloud_controller.admin"
 
@@ -184,7 +181,7 @@ func (p *portalProxy) DoLoginToCNSI(c echo.Context, cnsiGUID string, systemShare
 				p.ClearCNSIToken(cnsiRecord, userID)
 				return nil, interfaces.NewHTTPShadowError(
 					http.StatusBadRequest,
-					"Could not connect to the endpoint",
+					"Could not connect to the endpoint", // TODO: RC/NWM
 					"Could not connect to the endpoint: %s", err)
 			}
 
@@ -482,4 +479,4 @@ func (p *portalProxy) deleteCNSIToken(cnsiID string, userGUID string) error {
 	}
 
 	return nil
-}
\ No newline at end of file
+}
diff --git a/src/jetstream/plugins/kubernetes/auth/cert.go b/src/jetstream/plugins/kubernetes/auth/cert.go
index 9a067a755d..68c5b37231 100644
--- a/src/jetstream/plugins/kubernetes/auth/cert.go
+++ b/src/jetstream/plugins/kubernetes/auth/cert.go
@@ -133,7 +133,7 @@ func (c *CertKubeAuth) DoFlowRequest(cnsiRequest *interfaces.CNSIRequest, req *h
 			Dial:                dial,
 			TLSHandshakeTimeout: 10 * time.Second, // 10 seconds is a sound default value (default is 0)
 			TLSClientConfig: &tls.Config{
-				InsecureSkipVerify: true,
+				InsecureSkipVerify: cnsi.SkipSSLValidation,
 				Certificates:       []tls.Certificate{cert},
 			},
 			MaxIdleConnsPerHost: 6, // (default is 2)
diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index d98db1ca64..d9eac9ce83 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -1,6 +1,7 @@
 package kubernetes
 
 import (
+	"fmt"
 	"net/url"
 	"strconv"
 
@@ -64,7 +65,12 @@ func (c *KubernetesSpecification) Validate(userGUID string, cnsiRecord interface
 	}
 
 	if response.StatusCode >= 400 {
-		return errors.New("Unable to connect to endpoint")
+		// isSSLRelatedError
+		// errorResponse := []byte(fmt.Sprintf("%q", response.Body))
+		// log.Errorf("Validate: %+v", errorResponse)
+		// TODO: RC/NWM
+		// WARN[Tue Jan 28 15:26:54 GMT 2020] Passthrough response: URL: https://192.168.39.75:8443/api/v1/pods?limit=1, Status Code: 500, Status: Error proxing request, Content Type: Unknown, Length: -1
+		return fmt.Errorf("Unable to connect to endpoint: %s", response.Error.Error())
 	}
 
 	return nil

From de0b44bc42c3c4dbcfed53fd9b719392b616d1f6 Mon Sep 17 00:00:00 2001
From: Kate R <50168367+kreinecke@users.noreply.github.com>
Date: Tue, 28 Jan 2020 19:02:09 +0000
Subject: [PATCH 315/648] Sync status working

Signed-off-by: Kate R <50168367+kreinecke@users.noreply.github.com>
---
 src/jetstream/plugins/monocular/README.txt    |  5 ++
 .../monocular/chart-repo/api_endpoint.go      | 46 +++++++++++++------
 .../monocular/chart-repo/common/types.go      | 14 ++++--
 .../chart-repo/foundationdb/utils.go          | 20 +++++---
 src/jetstream/plugins/monocular/sync.go       | 16 +++----
 5 files changed, 69 insertions(+), 32 deletions(-)

diff --git a/src/jetstream/plugins/monocular/README.txt b/src/jetstream/plugins/monocular/README.txt
index 86279bf2be..9e55e1dac0 100644
--- a/src/jetstream/plugins/monocular/README.txt
+++ b/src/jetstream/plugins/monocular/README.txt
@@ -1 +1,6 @@
 docker run -p 8080:8080 --rm -e -ti --network=host kreinecke/suse-fdb-chart-repo:latest /chartrepo serve --doclayer-url=mongodb://192.168.57.1:27016 stable https://kubernetes-charts.storage.googleapis.com
+
+To test sync and status fetch:
+curl -X PUT -H "Content-Type: application/json" -d '{"repoURL":"https://kubernetes-charts.storage.googleapis.com"}' http://localhost:8080/v1/sync/stable
+
+curl -X GET http://localhost:8080/v1/status/stabler
diff --git a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
index e1be75d75e..0248f31fe1 100644
--- a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
+++ b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
@@ -90,9 +90,10 @@ func OnDemandSync(w http.ResponseWriter, req *http.Request, params Params) {
 	}
 
 	var status string
-	var currentRepoStatus = fdb.GetRepoSyncStatus(repoName).Status
 	//If this repo is already syncing, don't start another sync, but return in progress response
-	activeSyncJob := currentRepoStatus == common.SyncStatusInProgress || currentRepoStatus == common.SyncStatusInProgress
+	//Ignore error return value when fetching status - we don't care if the repo does not exist yet
+	currentRepoStatus, _ := fdb.GetRepoSyncStatus(repoName)
+	activeSyncJob := currentRepoStatus.Status == common.SyncStatusInProgress || currentRepoStatus.Status == common.SyncStatusInProgress
 	if activeSyncJob {
 		status = common.SyncStatusInProgress
 	} else {
@@ -136,12 +137,11 @@ func OnDemandSync(w http.ResponseWriter, req *http.Request, params Params) {
 	w.Header().Set("Content-Type", "application/json")
 	w.Header().Set("Server", "ChartRepo (On-Demand)")
 	w.Write(js)
-	w.WriteHeader(200)
 }
 
 func OnDemandDelete(w http.ResponseWriter, req *http.Request, params Params) {
 	repoName := params["repo"]
-
+	requestUUID, err := uuid.NewUUID()
 	if repoName == "" {
 		err := fmt.Errorf("No Repository name provided in request for Delete action.")
 		log.Error(err.Error())
@@ -150,9 +150,15 @@ func OnDemandDelete(w http.ResponseWriter, req *http.Request, params Params) {
 	}
 
 	var status string
-	var currentRepoStatus = fdb.GetRepoSyncStatus(repoName).Status
+	currentRepoStatus, err := fdb.GetRepoSyncStatus(repoName)
+	if err != nil {
+		log.Errorf("Request: requestUUID, %v", err.Error())
+		w.Header().Set("Server", "ChartRepo (On-Demand)")
+		http.Error(w, err.Error(), http.StatusNotFound)
+		return
+	}
 	//If this repo is already being deleted, don't start another delete, but return in progress response
-	activeDeleteJob := currentRepoStatus == common.DeleteStatusInProgress || currentRepoStatus == common.DeleteStatusInProgress
+	activeDeleteJob := currentRepoStatus.Status == common.DeleteStatusInProgress || currentRepoStatus.Status == common.DeleteStatusInProgress
 	if activeDeleteJob {
 		status = common.DeleteStatusInProgress
 	} else {
@@ -165,7 +171,7 @@ func OnDemandDelete(w http.ResponseWriter, req *http.Request, params Params) {
 	}
 
 	//Return delete status in response
-	requestUUID, err := uuid.NewUUID()
+	
 	response := common.DeleteJobStatusResponse{requestUUID.String(), status}
 	js, err := json.Marshal(response)
 	if err != nil {
@@ -178,7 +184,6 @@ func OnDemandDelete(w http.ResponseWriter, req *http.Request, params Params) {
 	w.Header().Set("Content-Type", "application/json")
 	w.Header().Set("Server", "ChartRepo (On-Demand)")
 	w.Write(js)
-	w.WriteHeader(200)
 }
 
 func RepoSyncStatus(w http.ResponseWriter, req *http.Request, params Params) {
@@ -187,13 +192,19 @@ func RepoSyncStatus(w http.ResponseWriter, req *http.Request, params Params) {
 		log.Fatal("No Repository name provided in request for sync status.")
 	}
 
-	status := fdb.GetRepoSyncStatus(repoName)
-
 	requestUUID, err := uuid.NewUUID()
+	status, err := fdb.GetRepoSyncStatus(repoName)
+	if err != nil {
+		log.Errorf("Request: requestUUID, %v, %v", requestUUID, err.Error())
+		w.Header().Set("Server", "ChartRepo (On-Demand)")
+		http.Error(w, err.Error(), http.StatusNotFound)
+		return
+	}
+	
 	response := common.SyncJobStatusResponse{requestUUID.String(), status.Status}
 	js, err := json.Marshal(response)
 	if err != nil {
-		log.Error(err.Error())
+		log.Errorf("Request: requestUUID, %v, %v", requestUUID, err.Error())
 		w.Header().Set("Server", "ChartRepo (On-Demand)")
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
@@ -202,7 +213,6 @@ func RepoSyncStatus(w http.ResponseWriter, req *http.Request, params Params) {
 	w.Header().Set("Content-Type", "application/json")
 	w.Header().Set("Server", "ChartRepo (On-Demand)")
 	w.Write(js)
-	w.WriteHeader(200)
 }
 
 func RepoDeleteStatus(w http.ResponseWriter, req *http.Request, params Params) {
@@ -211,12 +221,19 @@ func RepoDeleteStatus(w http.ResponseWriter, req *http.Request, params Params) {
 		log.Fatal("No Repository name provided in request for delete status.")
 	}
 
-	status := fdb.GetRepoDeleteStatus(repoName)
 	requestUUID, err := uuid.NewUUID()
+	status, err := fdb.GetRepoDeleteStatus(repoName)
+	if err != nil {
+		log.Errorf("Request: requestUUID, %v", err.Error())
+		w.Header().Set("Server", "ChartRepo (On-Demand)")
+		http.Error(w, err.Error(), http.StatusNotFound)
+		return
+	}
+
 	response := common.DeleteJobStatusResponse{requestUUID.String(), status.Status}
 	js, err := json.Marshal(response)
 	if err != nil {
-		log.Error(err.Error())
+		log.Errorf("Request: requestUUID, %v", err.Error())
 		w.Header().Set("Server", "ChartRepo (On-Demand)")
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
@@ -225,7 +242,6 @@ func RepoDeleteStatus(w http.ResponseWriter, req *http.Request, params Params) {
 	w.Header().Set("Content-Type", "application/json")
 	w.Header().Set("Server", "ChartRepo (On-Demand)")
 	w.Write(js)
-	w.WriteHeader(200)
 }
 
 func initOnDemandEndpoint(fdbURL string, fdbName string, authHeader string, debug bool) {
diff --git a/src/jetstream/plugins/monocular/chart-repo/common/types.go b/src/jetstream/plugins/monocular/chart-repo/common/types.go
index 6cd7d5d31a..a1fa3a4076 100644
--- a/src/jetstream/plugins/monocular/chart-repo/common/types.go
+++ b/src/jetstream/plugins/monocular/chart-repo/common/types.go
@@ -100,6 +100,10 @@ type SyncStatusMap struct {
 	statusMap map[string]RepoSyncStatus
 }
 
+func NewSyncStatusMap() *SyncStatusMap {
+	return &SyncStatusMap{sync.Mutex{}, make(map[string]RepoSyncStatus)}
+}
+
 func (m *SyncStatusMap) Set(repo string, status RepoSyncStatus) {
 	m.mut.Lock()
 	defer m.mut.Unlock()
@@ -127,6 +131,10 @@ type DeleteStatusMap struct {
 	statusMap map[string]RepoDeleteStatus
 }
 
+func NewDeleteStatusMap() *DeleteStatusMap {
+	return &DeleteStatusMap{sync.Mutex{}, make(map[string]RepoDeleteStatus)}
+}
+
 func (m *DeleteStatusMap) Set(repo string, status RepoDeleteStatus) {
 	m.mut.Lock()
 	defer m.mut.Unlock()
@@ -144,11 +152,11 @@ const DeleteStatusDeleted = "Deleted"
 const DeleteStatusInProgress = "Deleting"
 
 type SyncJobStatusResponse struct {
-	UUID  string `json:"uuid"`
+	UUID   string `json:"uuid"`
 	Status string `json:"status"`
 }
 
 type DeleteJobStatusResponse struct {
-	UUID  string `json:"uuid"`
+	UUID   string `json:"uuid"`
 	Status string `json:"status"`
-}
\ No newline at end of file
+}
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
index fec1bae6ff..7cf042832f 100644
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
@@ -49,8 +49,8 @@ const (
 )
 
 var netClient common.HTTPClient = &http.Client{}
-var repoSyncStatus common.SyncStatusMap
-var repoDeleteStatus common.DeleteStatusMap
+var repoSyncStatus *common.SyncStatusMap = common.NewSyncStatusMap()
+var repoDeleteStatus *common.DeleteStatusMap = common.NewDeleteStatusMap()
 
 func init() {
 	var err error
@@ -492,12 +492,20 @@ func fetchAndImportFiles(db Database, name string, r common.Repo, cv common.Char
 	return nil
 }
 
-func GetRepoSyncStatus(repo string) common.RepoSyncStatus {
-	return repoSyncStatus.Get(repo)
+func GetRepoSyncStatus(repo string) (common.RepoSyncStatus, error) {
+	status := repoSyncStatus.Get(repo)
+	if status == (common.RepoSyncStatus{}) {
+		return status, errors.New("Repo does not exist in database.")
+	}
+	return status, nil
 }
 
-func GetRepoDeleteStatus(repo string) common.RepoDeleteStatus {
-	return repoDeleteStatus.Get(repo)
+func GetRepoDeleteStatus(repo string) (common.RepoDeleteStatus, error) {
+	status := repoDeleteStatus.Get(repo)
+	if status == (common.RepoDeleteStatus{}) {
+		return status, errors.New("Repo does not exist in database.")
+	}
+	return status, nil
 }
 
 func database(client *mongo.Client, dbName string) (*mongo.Database, func()) {
diff --git a/src/jetstream/plugins/monocular/sync.go b/src/jetstream/plugins/monocular/sync.go
index a4c8659102..25dc12613a 100644
--- a/src/jetstream/plugins/monocular/sync.go
+++ b/src/jetstream/plugins/monocular/sync.go
@@ -28,7 +28,7 @@ type SyncMetadata struct {
 const (
 	chartRepoPathPrefix = "/v1"
 	statusPollInterval = 30
-	statusPollTimeout = 240
+	statusPollTimeout = 320
 )
 
 // Sync Channel
@@ -85,12 +85,12 @@ func (m *Monocular) processSyncRequests() {
 					m.updateMetadata(job.Endpoint.GUID, metadata)
 					log.Infof("Sync in progress for repository: %s", job.Endpoint.APIEndpoint.String())
 					//Now wait for success
-					err := waitForSyncComplete(job.Endpoint.APIEndpoint.String())
+					err := waitForSyncComplete("http://127.0.0.1:8080"+chartRepoPathPrefix+"/status/"+job.Endpoint.Name)
 					if err == nil {
 						metadata.Status = "Synchronized"
 					} else {
 						metadata.Status = "Sync Failed"
-						log.Errorf("Failed to fetch sync status for repo: %v, v%", job.Endpoint.Name, err)
+						log.Errorf("Failed to fetch sync status for repo: %v, %v", job.Endpoint.Name, err)
 					}
 				}
 			}
@@ -121,15 +121,15 @@ func (m *Monocular) processSyncRequests() {
 func waitForSyncComplete (url string) error {
 	return wait.Poll(statusPollInterval * time.Second, time.Duration(statusPollTimeout)*time.Second, func() (bool, error) {
 		var complete = false
+		log.Infof("Making GET request to: %v", url)
 		resp, err := http.Get(url)
 		defer resp.Body.Close()
-		if err != nil {
+		if err == nil {
 			statusResponse := common.SyncJobStatusResponse{}
 			err := json.NewDecoder(resp.Body).Decode(&statusResponse)
-			if err != nil {
-				if statusResponse.Status == common.SyncStatusSynced {
-					complete = true
-				}
+			log.Infof("%v",statusResponse)
+			if err == nil && statusResponse.Status == common.SyncStatusSynced {
+				complete = true
 			}
 		}
 		return complete, err

From 41b6b0c66200a787e58266517fc569b469020fba Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 29 Jan 2020 13:46:59 +0000
Subject: [PATCH 316/648] Add call to `/api` for kube info request - greatly
 improves register kub flow - kube api is checked if up and reachable as part
 of register step - catches bad cert case early - request to api will either
 be   - kind=APIVersions response if no auth   - kind=Status response if has
 auth   - anything else is a failure

---
 src/jetstream/authcnsi.go                |  2 +-
 src/jetstream/plugins/kubernetes/main.go | 65 ++++++++++++++++++++++--
 2 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/src/jetstream/authcnsi.go b/src/jetstream/authcnsi.go
index 5aeea448ad..54d510ebba 100644
--- a/src/jetstream/authcnsi.go
+++ b/src/jetstream/authcnsi.go
@@ -181,7 +181,7 @@ func (p *portalProxy) DoLoginToCNSI(c echo.Context, cnsiGUID string, systemShare
 				p.ClearCNSIToken(cnsiRecord, userID)
 				return nil, interfaces.NewHTTPShadowError(
 					http.StatusBadRequest,
-					"Could not connect to the endpoint", // TODO: RC/NWM
+					"Could not connect to the endpoint",
 					"Could not connect to the endpoint: %s", err)
 			}
 
diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index d9eac9ce83..18667eaed1 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -1,7 +1,9 @@
 package kubernetes
 
 import (
+	"encoding/json"
 	"fmt"
+	"io/ioutil"
 	"net/url"
 	"strconv"
 
@@ -20,6 +22,23 @@ type KubernetesSpecification struct {
 	endpointType string
 }
 
+type KubeStatus struct {
+	Kind       string      `json:"kind"`
+	ApiVersion string      `json:"apiVersion"`
+	Metadata   interface{} `json:"metadata"`
+	Status     string      `json:"status"`
+	Message    string      `json:"message"`
+	Reason     string      `json:"reason"`
+	Details    interface{} `json:"details"`
+	Code       int         `json:"code"`
+}
+
+type KubeAPIVersions struct {
+	Kind                       string        `json:"kind"`
+	Versions                   []string      `json:"versions"`
+	ServerAddressByClientCIDRs []interface{} `json:"serverAddressByClientCIDRs"`
+}
+
 const (
 	kubeEndpointType    = "k8s"
 	defaultKubeClientID = "K8S_CLIENT"
@@ -65,11 +84,6 @@ func (c *KubernetesSpecification) Validate(userGUID string, cnsiRecord interface
 	}
 
 	if response.StatusCode >= 400 {
-		// isSSLRelatedError
-		// errorResponse := []byte(fmt.Sprintf("%q", response.Body))
-		// log.Errorf("Validate: %+v", errorResponse)
-		// TODO: RC/NWM
-		// WARN[Tue Jan 28 15:26:54 GMT 2020] Passthrough response: URL: https://192.168.39.75:8443/api/v1/pods?limit=1, Status Code: 500, Status: Error proxing request, Content Type: Unknown, Length: -1
 		return fmt.Errorf("Unable to connect to endpoint: %s", response.Error.Error())
 	}
 
@@ -130,6 +144,7 @@ func (c *KubernetesSpecification) AddSessionGroupRoutes(echoGroup *echo.Group) {
 }
 
 func (c *KubernetesSpecification) Info(apiEndpoint string, skipSSLValidation bool) (interfaces.CNSIRecord, interface{}, error) {
+
 	log.Debug("Kubernetes Info")
 	var v2InfoResponse interfaces.V2Info
 	var newCNSI interfaces.CNSIRecord
@@ -141,6 +156,46 @@ func (c *KubernetesSpecification) Info(apiEndpoint string, skipSSLValidation boo
 		return newCNSI, nil, err
 	}
 
+	log.Debug("Request Kube API Versions")
+	var httpClient = c.portalProxy.GetHttpClient(skipSSLValidation)
+	res, err := httpClient.Get(apiEndpoint + "/api")
+	if err != nil {
+		// This should ultimately catch 503 cert errors
+		return newCNSI, nil, err
+	}
+
+	body, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		return newCNSI, nil, err
+	}
+
+	if res.StatusCode < 400 {
+		// No auth on kube set up, expect a successful APIVersions response - KubeAPIVersions
+		log.Debug("Kube API Versions Succeeded")
+		apiVersions := KubeAPIVersions{}
+		err := json.Unmarshal(body, &apiVersions)
+		if err != nil {
+			return newCNSI, nil, fmt.Errorf("Failed to parse output as kube kind APIVersions: %+v", err)
+		}
+		if apiVersions.Kind != "APIVersions" {
+			return newCNSI, nil, fmt.Errorf("Failed to parse output as kube kind APIVersions: %+v", apiVersions)
+		}
+	} else if res.StatusCode == 403 {
+		// Expect an auth failed response - KubeStatus
+		log.Debug("Kube API Versions Failed (403)")
+		kubeStatus := KubeStatus{}
+		err := json.Unmarshal(body, &kubeStatus)
+		if err != nil {
+			return newCNSI, nil, fmt.Errorf("Failed to parse 403 output as kube kind status: %+v", err)
+		}
+		if kubeStatus.Kind != "Status" {
+			return newCNSI, nil, fmt.Errorf("Failed to parse 403 output as kube kind status: %+v", kubeStatus)
+		}
+	} else {
+		return newCNSI, nil, fmt.Errorf("Dissallowed response code from `/api` call: %+v", res.StatusCode)
+	}
+
+	log.Debug("Kube API Versions Acceptable Response")
 	newCNSI.TokenEndpoint = apiEndpoint
 	newCNSI.AuthorizationEndpoint = apiEndpoint
 

From 93e38f14258798588f96b3278adc9e4e5305a425 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 29 Jan 2020 20:19:58 +0000
Subject: [PATCH 317/648] Improve Helm error logging

---
 .../app/custom/helm/store/helm.effects.ts     | 13 +++-
 .../error-page/error-page.component.html      |  4 +-
 src/jetstream/go.mod                          |  3 +-
 src/jetstream/middleware.go                   |  2 +-
 .../plugins/kubernetes/helm/graph.go          |  4 +-
 .../plugins/kubernetes/helm/graph_status.go   | 16 +++--
 .../plugins/kubernetes/helm/release.go        |  7 +-
 .../plugins/kubernetes/helm_client.go         |  4 +-
 .../plugins/kubernetes/install_release.go     | 45 +++++-------
 .../repository/interfaces/jetstream_error.go  | 70 +++++++++++++++++--
 10 files changed, 110 insertions(+), 58 deletions(-)

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 bd499732d8..2bbf7f13f2 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.effects.ts
@@ -161,18 +161,25 @@ export class HelmEffects {
       } else if (err.message) {
         // Http error
         return err.message;
+      } else if (err.error.status) {
+        // Jetstream error
+        return err.error.status;
       }
     }
-    return 'Monocular API request error';
+    return 'Helm API request error';
   }
 
   private createHelmError(err: any): { status: string, message: string } {
-    const jetstreamError = isJetstreamError(err);
+    let unwrapped = err;
+    if (err.error) {
+      unwrapped = err.error;
+    }
+    const jetstreamError = isJetstreamError(unwrapped);
     if (jetstreamError) {
       // Wrapped error
       return {
         status: jetstreamError.error.statusCode.toString(),
-        message: this.createHelmErrorMessage(jetstreamError.errorResponse)
+        message: this.createHelmErrorMessage(jetstreamError)
       };
     }
     return {
diff --git a/src/frontend/packages/core/src/features/error-page/error-page/error-page.component.html b/src/frontend/packages/core/src/features/error-page/error-page/error-page.component.html
index f3680eac96..38a5292766 100644
--- a/src/frontend/packages/core/src/features/error-page/error-page/error-page.component.html
+++ b/src/frontend/packages/core/src/features/error-page/error-page/error-page.component.html
@@ -39,7 +39,7 @@ <h2 class="error-page__endpoint-name">{{errorDetails.endpoint.name}}</h2>
           </mat-card-title>
         </mat-card-header>
         <mat-card-content>
-          <app-metadata-item label="Endpoint Response">
+          <app-metadata-item label="Endpoint Response" *ngIf="error.metadata?.errorResponse.errorResponse">
             <div matLine class="error-page__json-response 1error-page__event-value error-page__event-message">
               <pre>{{ (error.metadata.errorResponse.errorResponse || '-') | json }}</pre>
             </div>
@@ -47,7 +47,7 @@ <h2 class="error-page__endpoint-name">{{errorDetails.endpoint.name}}</h2>
           <app-metadata-item label="Jetstream Response">{{ error.message }}</app-metadata-item>
           <app-metadata-item label="URL">{{ error.metadata.url || '-' }}</app-metadata-item>
           <div class="app-metadata">
-            <div class="app-metadata__two-cols">
+            <div class="app-metadata__two-cols" *ngIf="error.metadata.httpMethod">
               <app-metadata-item label="HTTP Method">{{ error.metadata.httpMethod }}</app-metadata-item>
             </div>
             <div class="app-metadata__two-cols">
diff --git a/src/jetstream/go.mod b/src/jetstream/go.mod
index b9b0edf7f8..98caecab23 100644
--- a/src/jetstream/go.mod
+++ b/src/jetstream/go.mod
@@ -44,7 +44,7 @@ require (
 	github.com/jtolds/gls v4.20.0+incompatible // indirect
 	github.com/kat-co/vala v0.0.0-20170210184112-42e1d8b61f12
 	github.com/labstack/echo v3.3.10+incompatible
-	github.com/labstack/gommon v0.3.0 // indirect
+	github.com/labstack/gommon v0.3.0
 	github.com/lunixbochs/vtclean v1.0.0 // indirect
 	github.com/mattn/go-colorable v0.1.4 // indirect
 	github.com/mattn/go-isatty v0.0.10 // indirect
@@ -71,6 +71,7 @@ require (
 	github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec // indirect
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152
+	google.golang.org/appengine v1.6.5
 	gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0
 	gopkg.in/cheggaaa/pb.v1 v1.0.27 // indirect
 	gopkg.in/yaml.v2 v2.2.7
diff --git a/src/jetstream/middleware.go b/src/jetstream/middleware.go
index 0fafea74af..f7ce7fefbd 100644
--- a/src/jetstream/middleware.go
+++ b/src/jetstream/middleware.go
@@ -208,7 +208,7 @@ func errorLoggingMiddleware(h echo.HandlerFunc) echo.HandlerFunc {
 			}
 			return shadowError.HTTPError
 		} else if jetstreamError, ok := err.(interfaces.JetstreamError); ok {
-			return jetstreamError.HTTPError()
+			return jetstreamError.HTTPErrorInContext(c)
 		}
 
 		return err
diff --git a/src/jetstream/plugins/kubernetes/helm/graph.go b/src/jetstream/plugins/kubernetes/helm/graph.go
index 5edd600404..cea0f9c5dd 100644
--- a/src/jetstream/plugins/kubernetes/helm/graph.go
+++ b/src/jetstream/plugins/kubernetes/helm/graph.go
@@ -61,8 +61,6 @@ func (r *HelmReleaseGraph) AddLink(source, target string) {
 // ParseManifest
 func (r *HelmReleaseGraph) ParseManifest(release *HelmRelease) {
 	for _, item := range release.Resources {
-		log.Warn(item.Kind)
-
 		node := ReleaseNode{
 			ID:    fmt.Sprintf("%s-%s", item.Kind, item.Metadata.Name),
 			Label: item.Metadata.Name,
@@ -150,7 +148,7 @@ func (r *HelmReleaseGraph) generateTemporaryNode(id string) {
 }
 
 func getShortResourceId(kind, name string) string {
-	// // TODO: FIX
+	// // TODO: FIX - empty kind is a pod
 	// if len(kind) == 0 {
 	// 	kind = "Pod"
 	// }
diff --git a/src/jetstream/plugins/kubernetes/helm/graph_status.go b/src/jetstream/plugins/kubernetes/helm/graph_status.go
index f2bfdce76b..6598679a4f 100644
--- a/src/jetstream/plugins/kubernetes/helm/graph_status.go
+++ b/src/jetstream/plugins/kubernetes/helm/graph_status.go
@@ -1,7 +1,6 @@
 package helm
 
 import (
-	log "github.com/sirupsen/logrus"
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 )
@@ -10,11 +9,16 @@ import (
 type NodeStatus string
 
 const (
-	NodeOK      NodeStatus = "ok"
-	NodeWarn    NodeStatus = "warn"
-	NodeError   NodeStatus = "error"
+	// NodeOK indicates OK Status
+	NodeOK NodeStatus = "ok"
+	// NodeWarn indicates Warning Status
+	NodeWarn NodeStatus = "warn"
+	// NodeError indicates Error Status
+	NodeError NodeStatus = "error"
+	// NodeUnknown indicates status is unknown
 	NodeUnknown NodeStatus = "unknown"
-	NodeNone    NodeStatus = "none"
+	// NodeNone indicates node has no status
+	NodeNone NodeStatus = "none"
 )
 
 func mapDeploymentStatus(replicas, ready, available, unavailable int32) NodeStatus {
@@ -78,7 +82,5 @@ func mapPodStatus(phase v1.PodPhase) NodeStatus {
 	case v1.PodPending:
 		status = NodeWarn
 	}
-
-	log.Infof("Map Pod Status: %s => %s", phase, status)
 	return status
 }
diff --git a/src/jetstream/plugins/kubernetes/helm/release.go b/src/jetstream/plugins/kubernetes/helm/release.go
index ab13508217..83bd768882 100644
--- a/src/jetstream/plugins/kubernetes/helm/release.go
+++ b/src/jetstream/plugins/kubernetes/helm/release.go
@@ -135,10 +135,7 @@ func (r *HelmRelease) processResource(obj runtime.Object) {
 			t.Resource = obj
 			t.Manifest = true
 			r.setResource(t)
-			log.Infof("Got resource: %s : %s", t.Kind, t.Metadata.Name)
-			// if t.Kind == "Deployment" || t.Kind == "StatefulSet" || t.Kind == "DaemonSet" || t.Kind =={
-			// 	r.processController(t)
-			// }
+			log.Debugf("Got resource: %s : %s", t.Kind, t.Metadata.Name)
 			r.processController(t)
 			r.addJobForResource(t.Kind, t.APIVersion, t.Metadata.Name)
 		} else {
@@ -183,7 +180,7 @@ func (r *HelmRelease) processController(kres KubeResource) {
 		r.processPodSelector(kres, o.Spec.Selector)
 	default:
 		// Ignore - not a controller
-		log.Errorf("Ignoring: non-controller type: %s", reflect.TypeOf(o))
+		log.Debugf("Ignoring: non-controller type: %s", reflect.TypeOf(o))
 	}
 }
 
diff --git a/src/jetstream/plugins/kubernetes/helm_client.go b/src/jetstream/plugins/kubernetes/helm_client.go
index a28ae2d07f..4d1cb2217b 100644
--- a/src/jetstream/plugins/kubernetes/helm_client.go
+++ b/src/jetstream/plugins/kubernetes/helm_client.go
@@ -78,11 +78,10 @@ func (c *KubernetesSpecification) GetHelmConfiguration(endpointGUID, userID, nam
 	rcg := newJetStreamRCGetter([]byte(kubeconfigcontents), hc.Folder, namespace)
 
 	var nopLogger = func(a string, b ...interface{}) {
-		log.Infof(a, b)
+		log.Debugf(a, b)
 	}
 
 	var actionConfig action.Configuration
-	// kubeconfig := kube.GetConfig(kubeConfigPath, "kube", namespace)
 
 	kc := kube.New(rcg)
 	kc.Log = nopLogger
@@ -101,7 +100,6 @@ func (c *KubernetesSpecification) GetHelmConfiguration(endpointGUID, userID, nam
 	actionConfig.KubeClient = kc
 	actionConfig.Releases = store
 	actionConfig.Log = nopLogger
-	//actionConfig.
 
 	return &actionConfig, hc, nil
 }
diff --git a/src/jetstream/plugins/kubernetes/install_release.go b/src/jetstream/plugins/kubernetes/install_release.go
index 2490459aa8..3645f7dfbb 100644
--- a/src/jetstream/plugins/kubernetes/install_release.go
+++ b/src/jetstream/plugins/kubernetes/install_release.go
@@ -41,7 +41,6 @@ type Monocular interface {
 
 // InstallRelease will install a Helm 3 release
 func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
-
 	bodyReader := ec.Request().Body
 	buf := new(bytes.Buffer)
 	buf.ReadFrom(bodyReader)
@@ -49,7 +48,7 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 	var params installRequest
 	err := json.Unmarshal(buf.Bytes(), &params)
 	if err != nil {
-		return fmt.Errorf("Could not get Create Release Parameters: %v+", err)
+		return interfaces.NewJetstreamErrorf("Could not get Create Release Parameters: %v+", err)
 	}
 
 	chartID := fmt.Sprintf("%s/%s", params.Chart.Repository, params.Chart.Name)
@@ -58,26 +57,23 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 
 	downloadURL, err := c.getChart(chartID, params.Chart.Version)
 	if err != nil {
-		return fmt.Errorf("Could not get the Download URL")
+		return interfaces.NewJetstreamErrorf("Could not get the Download URL for the Helm Chart")
 	}
 
 	log.Debugf("Chart Download URL: %s", downloadURL)
 
-	// Should we ignore SSL certs?
-	// TODO: Look up Helm Repository endpoint and use the value from that
-	httpClient := c.portalProxy.GetHttpClient(true)
-
+	// NWM: Should we look up Helm Repository endpoint and use the value from that
+	httpClient := c.portalProxy.GetHttpClient(false)
 	resp, err := httpClient.Get(downloadURL)
-
 	if resp.StatusCode != 200 {
-		return fmt.Errorf("Could not download Chart Archive: %s", resp.Status)
+		return interfaces.NewJetstreamErrorf("Could not download Chart Archive: %s", resp.Status)
 	}
 
 	defer resp.Body.Close()
 
 	chart, err := loader.LoadArchive(resp.Body)
 	if err != nil {
-		return fmt.Errorf("Could not load chart from archive: %v+", err)
+		return interfaces.NewJetstreamErrorf("Could not load chart from archive: %v+", err)
 	}
 
 	log.Debugf("Loaded helm chart: %s", chart.Name())
@@ -87,7 +83,7 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 
 	config, hc, err := c.GetHelmConfiguration(endpointGUID, userGUID, params.Namespace)
 	if err != nil {
-		return fmt.Errorf("Could not get Helm Configuration for endpoint: %v+", err)
+		return interfaces.NewJetstreamErrorf("Could not get Helm Configuration for endpoint: %+v", err)
 	}
 
 	defer hc.Cleanup()
@@ -95,43 +91,38 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 	userSuppliedValues := map[string]interface{}{}
 	if err := yaml.Unmarshal([]byte(params.Values), &userSuppliedValues); err != nil {
 		// Could not parse the user's values
-		return err
+		return interfaces.NewJetstreamErrorf("Could not parse values: %+v", err)
 	}
 
 	// In Helm 3, the namespace must already exist
-
 	kubeClient, _ := c.GetConfigForEndpointUser(endpointGUID, userGUID)
 	clientset, _ := kubernetes.NewForConfig(kubeClient)
-
 	coreclient := clientset.CoreV1()
 	_, err = coreclient.Namespaces().Get(params.Namespace, metav1.GetOptions{})
 	if err != nil {
-		msg := fmt.Sprintf("Namespace '%s' does not exist", params.Namespace)
-		return interfaces.NewJetstreamError(msg)
+		return interfaces.NewJetstreamErrorf("Namespace '%s' does not exist", params.Namespace)
 	}
 
 	// Check release name is valid and does not already exist
-	// TODO: NWM
+	statusAction := action.NewStatus(config)
+	_, err = statusAction.Run(params.Name)
+	if err == nil {
+		return interfaces.NewJetstreamUserError("A Release with that name already exists - please choose another")
+	}
 
 	install := action.NewInstall(config)
 	install.ReleaseName = params.Name
 	install.Namespace = params.Namespace
 
-	// Set timeout
-	// Wait?
-	// Generate Name ?
-	// Atomic?
-
 	release, err := install.Run(chart, userSuppliedValues)
 	if err != nil {
-		return fmt.Errorf("Could not install Helm Chart: %v+", err)
+		return interfaces.NewJetstreamError(fmt.Sprintf("Error installing %+v", err))
 	}
 
 	return ec.JSON(200, release)
 }
 
 func (c *KubernetesSpecification) getChart(chartID, version string) (string, error) {
-
 	helm := c.portalProxy.GetPlugin("monocular")
 	if helm == nil {
 		return "", errors.New("Could not find monocular plugin")
@@ -145,7 +136,7 @@ func (c *KubernetesSpecification) getChart(chartID, version string) (string, err
 	store := monocular.GetChartStore()
 	chart, err := store.GetChart(chartID)
 	if err != nil {
-		log.Error("Could not find chart")
+		return "", errors.New("Could not find Chart")
 	}
 
 	// Find the download URL for the version
@@ -162,7 +153,6 @@ func (c *KubernetesSpecification) getChart(chartID, version string) (string, err
 
 // DeleteRelease will delete a release
 func (c *KubernetesSpecification) DeleteRelease(ec echo.Context) error {
-
 	endpointGUID := ec.Param("endpoint")
 	releaseName := ec.Param("name")
 	namespace := ec.Param("namespace")
@@ -171,8 +161,7 @@ func (c *KubernetesSpecification) DeleteRelease(ec echo.Context) error {
 
 	config, hc, err := c.GetHelmConfiguration(endpointGUID, userGUID, namespace)
 	if err != nil {
-		log.Errorf("Helm: DeleteRelease could not get a Helm Configuration: %s", err)
-		return err
+		return interfaces.NewJetstreamErrorf("Could not get Helm Configuration for endpoint: %+v", err)
 	}
 
 	defer hc.Cleanup()
diff --git a/src/jetstream/repository/interfaces/jetstream_error.go b/src/jetstream/repository/interfaces/jetstream_error.go
index 05821fb404..7ebbd69e29 100644
--- a/src/jetstream/repository/interfaces/jetstream_error.go
+++ b/src/jetstream/repository/interfaces/jetstream_error.go
@@ -1,17 +1,29 @@
 package interfaces
 
 import (
+	"encoding/json"
 	"fmt"
 	"net/http"
 
 	"github.com/labstack/echo"
+	log "github.com/sirupsen/logrus"
 )
 
 // JetstreamError is standard error response from JetSteam for REST APIs
 type JetstreamError struct {
-	Status          int
-	LogMessage      string
-	UserFacingError string
+	Status          int    `json:"statusCode"`
+	StatusMesssage  string `json:"status"`
+	LogMessage      string `json:"-"`
+	UserFacingError string `json:"message"`
+	Method          string `json:"method"`
+}
+
+// JetstreamErrorResponse  formats a Jetstream error in the same way as a passthrough error
+type JetstreamErrorResponse struct {
+	Error         JetstreamError `json:"error"`
+	ErrorResponse struct {
+		Method string `json:"method"`
+	} `json:"errorResponse"`
 }
 
 func (e JetstreamError) Error() string {
@@ -20,14 +32,62 @@ func (e JetstreamError) Error() string {
 
 // HTTPError formats the error as an echo HTTPError
 func (e JetstreamError) HTTPError() *echo.HTTPError {
-	return echo.NewHTTPError(e.Status, fmt.Sprintf(`{"error":%q}`, e.UserFacingError))
+	if len(e.StatusMesssage) == 0 {
+		e.StatusMesssage = "Failed"
+	}
+
+	wrapper := JetstreamErrorResponse{
+		Error: e,
+	}
+
+	jsonString, err := json.Marshal(wrapper)
+	if err != nil {
+		return echo.NewHTTPError(e.Status, e.UserFacingError)
+	}
+	return echo.NewHTTPError(e.Status, string(jsonString))
+}
+
+// HTTPErrorInContext formats the error as an echo HTTPError filling in missing params from the contexts
+func (e JetstreamError) HTTPErrorInContext(c echo.Context) *echo.HTTPError {
+	e.finalize(c)
+	return e.HTTPError()
+}
+
+// Finalize will fill in missing fields from the context before the error is sent to the client
+func (e *JetstreamError) finalize(c echo.Context) {
+	if len(e.StatusMesssage) == 0 {
+		e.StatusMesssage = http.StatusText(e.Status)
+	}
+	if len(e.Method) == 0 {
+		log.Warn(c.Request().Method)
+		e.Method = c.Request().Method
+	}
 }
 
 // NewJetstreamError creates a new JetStream error
-func NewJetstreamError(userFacingError string) error {
+func NewJetstreamError(userFacingError string) JetstreamError {
 	shadowError := JetstreamError{
 		Status:          http.StatusInternalServerError,
 		UserFacingError: userFacingError,
 	}
 	return shadowError
 }
+
+// NewJetstreamErrorf creates a new JetStream error
+func NewJetstreamErrorf(userFacingError string, args ...interface{}) JetstreamError {
+	message := fmt.Sprintf(userFacingError, args...)
+	return NewJetstreamError(message)
+}
+
+// NewJetstreamUserError creates a new JetStream error indicating that the error is a user error
+func NewJetstreamUserError(userFacingError string) JetstreamError {
+	e := NewJetstreamError(userFacingError)
+	e.Status = http.StatusBadRequest
+	return e
+}
+
+// NewJetstreamUserErrorf creates a new JetStream error indicating that the error is a user error
+func NewJetstreamUserErrorf(userFacingError string, args ...interface{}) JetstreamError {
+	message := fmt.Sprintf(userFacingError, args...)
+	return NewJetstreamError(message)
+}

From d311a3b31cf3add86ec4b552543978949ad1fecf Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 29 Jan 2020 20:29:18 +0000
Subject: [PATCH 318/648] Remove debug logging

---
 src/jetstream/plugins/kubernetes/helm/job.go     | 2 +-
 src/jetstream/plugins/kubernetes/helm/release.go | 2 +-
 src/jetstream/plugins/kubernetes/helm/util.go    | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/helm/job.go b/src/jetstream/plugins/kubernetes/helm/job.go
index ab2385be37..523dde9f79 100644
--- a/src/jetstream/plugins/kubernetes/helm/job.go
+++ b/src/jetstream/plugins/kubernetes/helm/job.go
@@ -70,7 +70,7 @@ func (j *KubeAPIJob) Run() []KubeResourceJobResult {
 func (j *KubeAPIJob) restWorker(jetstream interfaces.PortalProxy, id int, jobs <-chan KubeResourceJob, results chan<- KubeResourceJobResult) {
 	for job := range jobs {
 		response, err := j.Jetstream.DoProxySingleRequest(job.Endpoint, job.User, "GET", job.URL, nil, nil)
-		log.Infof("Rest Worker finished for: %s - %d", job.URL, response.StatusCode)
+		log.Debugf("Rest Worker finished for: %s - %d", job.URL, response.StatusCode)
 		res := KubeResourceJobResult{
 			KubeResourceJob: job,
 			StatusCode:      response.StatusCode,
diff --git a/src/jetstream/plugins/kubernetes/helm/release.go b/src/jetstream/plugins/kubernetes/helm/release.go
index 83bd768882..c232de440d 100644
--- a/src/jetstream/plugins/kubernetes/helm/release.go
+++ b/src/jetstream/plugins/kubernetes/helm/release.go
@@ -268,7 +268,7 @@ func (r *HelmRelease) processPodOwners(pod v1.Pod) {
 				r.addJobForResource(owner.Kind, owner.APIVersion, owner.Name)
 			}
 		} else {
-			log.Warn("Unexpected Pod owner kind: %s", owner.Kind)
+			log.Debugf("Unexpected Pod owner kind: %s", owner.Kind)
 		}
 	}
 }
diff --git a/src/jetstream/plugins/kubernetes/helm/util.go b/src/jetstream/plugins/kubernetes/helm/util.go
index 7e20ec5513..803791f54d 100644
--- a/src/jetstream/plugins/kubernetes/helm/util.go
+++ b/src/jetstream/plugins/kubernetes/helm/util.go
@@ -16,11 +16,9 @@ func podSelectorToQueryString(selector *metav1.LabelSelector) string {
 
 	// Match labels
 	for k, v := range selector.MatchLabels {
-		fmt.Printf("key[%s] value[%s]\n", k, v)
 		if len(ml) > 0 {
 			sep = ","
 		}
-
 		ml = fmt.Sprintf("%s%s%s%%3D%s", ml, sep, k, v)
 	}
 

From 71b492001f43520fc22c7f105a3e3c650de9f0ca Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 29 Jan 2020 13:32:13 +0000
Subject: [PATCH 319/648] Fix 404 dues to nginx forwarded headers

---
 src/jetstream/plugins/userinfo/uaa_user.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/jetstream/plugins/userinfo/uaa_user.go b/src/jetstream/plugins/userinfo/uaa_user.go
index 5fe43afe7a..b01e756fdd 100644
--- a/src/jetstream/plugins/userinfo/uaa_user.go
+++ b/src/jetstream/plugins/userinfo/uaa_user.go
@@ -134,9 +134,7 @@ func (userInfo *UaaUserInfo) doAPIRequest(sessionUser string, url string, echoRe
 		return 0, nil, err
 	}
 
-	// Copy original headers through, except custom portal-proxy Headers
-	fwdHeaders(echoReq, req)
-
+	// Add the authorization header
 	req.Header.Set("Authorization", "bearer "+tokenRec.AuthToken)
 
 	client := userInfo.portalProxy.GetHttpClient(userInfo.portalProxy.GetConfig().ConsoleConfig.SkipSSLValidation)
@@ -151,20 +149,22 @@ func (userInfo *UaaUserInfo) doAPIRequest(sessionUser string, url string, echoRe
 	return res.StatusCode, data, err
 }
 
-func fwdHeaders(uaaReq *http.Request, req *http.Request) {
-	log.Debug("fwdHeaders")
+func fwdResponseHeaders(src *http.Header, dest http.Header) {
+	log.Debug("fwdResponseHeaders")
 
-	for k, headers := range uaaReq.Header {
+	for k, headers := range *src {
 		switch {
 		// Skip these
 		//  - "Referer" causes CF to fail with a 403
 		//  - "Connection", "x-cap-*" and "Cookie" are consumed by us
-		case k == "Connection", k == "Cookie", k == "Referer", strings.HasPrefix(strings.ToLower(k), "x-cap-"):
+		case k == "Connection", k == "Cookie", k == "Referer", k == "Accept-Encoding",
+			strings.HasPrefix(strings.ToLower(k), "x-cap-"),
+			strings.HasPrefix(strings.ToLower(k), "x-forwarded-"):
 
 		// Forwarding everything else
 		default:
 			for _, h := range headers {
-				req.Header.Add(k, h)
+				dest.Add(k, h)
 			}
 		}
 	}

From fda681bd056988048405f89a84f6bf8004f3f78b Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 29 Jan 2020 11:17:54 +0000
Subject: [PATCH 320/648] Fix for user profile error with gzip response

---
 src/jetstream/plugins/userinfo/local_user.go | 24 +++----
 src/jetstream/plugins/userinfo/main.go       |  4 +-
 src/jetstream/plugins/userinfo/types.go      | 28 ++++----
 src/jetstream/plugins/userinfo/uaa_user.go   | 67 +++++++++++++-------
 4 files changed, 76 insertions(+), 47 deletions(-)

diff --git a/src/jetstream/plugins/userinfo/local_user.go b/src/jetstream/plugins/userinfo/local_user.go
index fb1c2b08a7..c35da1b0da 100644
--- a/src/jetstream/plugins/userinfo/local_user.go
+++ b/src/jetstream/plugins/userinfo/local_user.go
@@ -6,8 +6,8 @@ import (
 
 	"golang.org/x/crypto/bcrypt"
 
-	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/localusers"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/localusers"
 )
 
 // LocalUserInfo is a plugin to fetch user info
@@ -21,21 +21,21 @@ func InitLocalUserInfo(portalProxy interfaces.PortalProxy) Provider {
 }
 
 // GetUserInfo gets info for the specified user
-func (userInfo *LocalUserInfo) GetUserInfo(id string) (int, []byte, error) {
+func (userInfo *LocalUserInfo) GetUserInfo(id string) (int, []byte, *http.Header, error) {
 
 	localUsersRepo, err := localusers.NewPgsqlLocalUsersRepository(userInfo.portalProxy.GetDatabaseConnection())
 	if err != nil {
-		return 500, nil, err
+		return 500, nil, nil, err
 	}
 
 	user, err := localUsersRepo.FindUser(id)
 	if err != nil {
-		return 500, nil, err
+		return 500, nil, nil, err
 	}
 
 	uaaUser := &uaaUser{
-		ID: id,
-		Origin: "local",
+		ID:       id,
+		Origin:   "local",
 		Username: user.Username,
 	}
 
@@ -55,14 +55,14 @@ func (userInfo *LocalUserInfo) GetUserInfo(id string) (int, []byte, error) {
 
 	jsonString, err := json.Marshal(uaaUser)
 	if err != nil {
-		return 500, nil, err
+		return 500, nil, nil, err
 	}
 
-	return 200, jsonString, nil
+	return 200, jsonString, nil, nil
 }
 
 // UpdateUserInfo updates the user's info
-func (userInfo *LocalUserInfo) UpdateUserInfo(profile *uaaUser) (error) {
+func (userInfo *LocalUserInfo) UpdateUserInfo(profile *uaaUser) error {
 
 	// Fetch the user, make updates and save
 	id := profile.ID
@@ -85,7 +85,7 @@ func (userInfo *LocalUserInfo) UpdateUserInfo(profile *uaaUser) (error) {
 
 	if len(profile.Emails) == 1 {
 		email := profile.Emails[0]
-		if len(email.Value) >0 {
+		if len(email.Value) > 0 {
 			user.Email = email.Value
 		}
 	}
@@ -102,7 +102,7 @@ func (userInfo *LocalUserInfo) UpdateUserInfo(profile *uaaUser) (error) {
 }
 
 // UpdatePassword updates the user's password
-func (userInfo *LocalUserInfo) UpdatePassword(id string, passwordInfo *passwordChangeInfo) (error) {
+func (userInfo *LocalUserInfo) UpdatePassword(id string, passwordInfo *passwordChangeInfo) error {
 
 	// Fetch the user, make updates and save
 	localUsersRepo, err := localusers.NewPgsqlLocalUsersRepository(userInfo.portalProxy.GetDatabaseConnection())
@@ -149,4 +149,4 @@ func (userInfo *LocalUserInfo) UpdatePassword(id string, passwordInfo *passwordC
 func HashPassword(password string) ([]byte, error) {
 	bytes, err := bcrypt.GenerateFromPassword([]byte(password), 14)
 	return bytes, err
-}
\ No newline at end of file
+}
diff --git a/src/jetstream/plugins/userinfo/main.go b/src/jetstream/plugins/userinfo/main.go
index 5364169b82..a2d6968f14 100644
--- a/src/jetstream/plugins/userinfo/main.go
+++ b/src/jetstream/plugins/userinfo/main.go
@@ -100,11 +100,13 @@ func (userInfo *UserInfo) userInfo(c echo.Context) error {
 	}
 
 	provider := userInfo.getProvider(c)
-	statusCode, body, err := provider.GetUserInfo(id)
+	statusCode, body, headers, err := provider.GetUserInfo(id)
 	if err != nil {
 		return err
 	}
 
+	fwdResponseHeaders(headers, c.Response().Header())
+
 	c.Response().WriteHeader(statusCode)
 	_, _ = c.Response().Write(body)
 
diff --git a/src/jetstream/plugins/userinfo/types.go b/src/jetstream/plugins/userinfo/types.go
index 6a65d73905..31f988041e 100644
--- a/src/jetstream/plugins/userinfo/types.go
+++ b/src/jetstream/plugins/userinfo/types.go
@@ -1,8 +1,12 @@
 package userinfo
 
+import (
+	"net/http"
+)
+
 // Provider manages user info for a provider
 type Provider interface {
-	GetUserInfo(id string) (int, []byte, error)
+	GetUserInfo(id string) (int, []byte, *http.Header, error)
 	UpdateUserInfo(*uaaUser) error
 	UpdatePassword(id string, info *passwordChangeInfo) error
 }
@@ -13,7 +17,7 @@ type uaaUserEmail struct {
 
 type uaaUserName struct {
 	FamilyName string `json:"familyName"`
-	GivenName string `json:"givenName"`
+	GivenName  string `json:"givenName"`
 }
 
 type uaaUserGroup struct {
@@ -21,20 +25,20 @@ type uaaUserGroup struct {
 }
 
 type uaaUser struct {
-	Raw []byte
-	ID string `json:"id"`
-	Username string `json:"userName"`
-	Emails []uaaUserEmail `json:"emails"`
-	Name uaaUserName `json:"name"`
-	Origin string `json:"origin"`
-	Groups []uaaUserGroup `json:"groups"`
-	Meta struct {
+	Raw      []byte
+	ID       string         `json:"id"`
+	Username string         `json:"userName"`
+	Emails   []uaaUserEmail `json:"emails"`
+	Name     uaaUserName    `json:"name"`
+	Origin   string         `json:"origin"`
+	Groups   []uaaUserGroup `json:"groups"`
+	Meta     struct {
 		Version int `json:"version"`
 	} `json:"meta"`
 }
 
 type passwordChangeInfo struct {
-	Raw []byte
+	Raw         []byte
 	OldPassword string `json:"oldPassword"`
 	NewPassword string `json:"password"`
-}
\ No newline at end of file
+}
diff --git a/src/jetstream/plugins/userinfo/uaa_user.go b/src/jetstream/plugins/userinfo/uaa_user.go
index b01e756fdd..1a34276c4b 100644
--- a/src/jetstream/plugins/userinfo/uaa_user.go
+++ b/src/jetstream/plugins/userinfo/uaa_user.go
@@ -25,26 +25,26 @@ func InitUaaUserInfo(portalProxy interfaces.PortalProxy, c echo.Context) Provide
 }
 
 // GetUserInfo gets info for the specified user
-func (userInfo *UaaUserInfo) GetUserInfo(id string) (int, []byte, error) {
+func (userInfo *UaaUserInfo) GetUserInfo(id string) (int, []byte, *http.Header, error) {
 	target := fmt.Sprintf("Users/%s", id)
 	return userInfo.uaa(target, nil)
 }
 
 // UpdateUserInfo updates the user's info
-func (userInfo *UaaUserInfo) UpdateUserInfo(profile *uaaUser) (error) {
+func (userInfo *UaaUserInfo) UpdateUserInfo(profile *uaaUser) error {
 	target := fmt.Sprintf("Users/%s", profile.ID)
-	_, _, err := userInfo.uaa(target, profile.Raw)
+	_, _, _, err := userInfo.uaa(target, profile.Raw)
 	return err
 }
 
 // UpdatePassword updates the user's password
-func (userInfo *UaaUserInfo) UpdatePassword(id string, passwordInfo *passwordChangeInfo) (error) {
+func (userInfo *UaaUserInfo) UpdatePassword(id string, passwordInfo *passwordChangeInfo) error {
 	target := fmt.Sprintf("Users/%s/password", id)
-	_, _, err := userInfo.uaa(target, passwordInfo.Raw)
+	_, _, _, err := userInfo.uaa(target, passwordInfo.Raw)
 	return err
 }
 
-func (userInfo *UaaUserInfo) uaa(target string, body []byte) (int, []byte, error)  {
+func (userInfo *UaaUserInfo) uaa(target string, body []byte) (int, []byte, *http.Header, error) {
 	log.Debug("uaa request")
 
 	// Check session
@@ -52,14 +52,14 @@ func (userInfo *UaaUserInfo) uaa(target string, body []byte) (int, []byte, error
 	if err != nil {
 		msg := "Could not find session date"
 		log.Error(msg)
-		return http.StatusForbidden, nil, echo.NewHTTPError(http.StatusForbidden, msg)
+		return http.StatusForbidden, nil, nil, echo.NewHTTPError(http.StatusForbidden, msg)
 	}
 
 	sessionUser, err := userInfo.portalProxy.GetSessionStringValue(userInfo.echo, "user_id")
 	if err != nil {
 		msg := "Could not find user_id in Session"
 		log.Error(msg)
-		return http.StatusForbidden, nil, echo.NewHTTPError(http.StatusForbidden, msg)
+		return http.StatusForbidden, nil, nil, echo.NewHTTPError(http.StatusForbidden, msg)
 	}
 
 	uaaEndpoint := userInfo.portalProxy.GetConfig().ConsoleConfig.UAAEndpoint
@@ -69,7 +69,7 @@ func (userInfo *UaaUserInfo) uaa(target string, body []byte) (int, []byte, error
 
 	username, err := userInfo.portalProxy.GetStratosAuthService().GetUsername(sessionUser)
 	if err != nil {
-		return http.StatusInternalServerError, nil, err
+		return http.StatusInternalServerError, nil, nil, err
 	}
 
 	// Check for custom header - if present, verify the user's password before making the request
@@ -78,24 +78,24 @@ func (userInfo *UaaUserInfo) uaa(target string, body []byte) (int, []byte, error
 		// Need to verify the user's login
 		err := userInfo.portalProxy.RefreshUAALogin(username, password, false)
 		if err != nil {
-			return  http.StatusInternalServerError, nil, err
+			return http.StatusInternalServerError, nil, nil, err
 		}
 	}
 
-	statusCode, body, err := userInfo.doAPIRequest(sessionUser, url, userInfo.echo.Request(), body)
+	statusCode, body, headers, err := userInfo.doAPIRequest(sessionUser, url, userInfo.echo.Request(), body)
 	if err != nil {
-		return http.StatusInternalServerError, nil, err
+		return http.StatusInternalServerError, nil, nil, err
 	}
 
 	// Refresh the access token
 	if statusCode == 401 {
 		_, err := userInfo.portalProxy.RefreshUAAToken(sessionUser)
 		if err != nil {
-			return  http.StatusInternalServerError, nil, err
+			return http.StatusInternalServerError, nil, nil, err
 		}
-		statusCode, body, err = userInfo.doAPIRequest(sessionUser, url, userInfo.echo.Request(), body)
+		statusCode, body, headers, err = userInfo.doAPIRequest(sessionUser, url, userInfo.echo.Request(), body)
 		if err != nil {
-			return  http.StatusInternalServerError, nil, err
+			return http.StatusInternalServerError, nil, nil, err
 		}
 	}
 
@@ -108,21 +108,22 @@ func (userInfo *UaaUserInfo) uaa(target string, body []byte) (int, []byte, error
 		}
 		err := userInfo.portalProxy.RefreshUAALogin(username, password, true)
 		if err != nil {
-			return  http.StatusInternalServerError, nil, err
+			return http.StatusInternalServerError, nil, nil, err
 		}
 	}
 
-	return statusCode, body, nil
+	return statusCode, body, headers, nil
 
 }
 
-func (userInfo *UaaUserInfo) doAPIRequest(sessionUser string, url string, echoReq *http.Request, body []byte) (int, []byte, error) {
+func (userInfo *UaaUserInfo) doAPIRequest(sessionUser string, url string, echoReq *http.Request, body []byte) (int, []byte, *http.Header, error) {
 	// Proxy the request to the UAA on behalf of the user
 	log.Debugf("doAPIRequest: %s", url)
 
 	tokenRec, err := userInfo.portalProxy.GetUAATokenRecord(sessionUser)
 	if err != nil {
-		return 0, nil, echo.NewHTTPError(http.StatusForbidden, "Can not locate token for user")
+		log.Debug("Can not locate token for user")
+		return 0, nil, nil, echo.NewHTTPError(http.StatusForbidden, "Can not locate token for user")
 	}
 
 	// Proxy the request
@@ -131,7 +132,7 @@ func (userInfo *UaaUserInfo) doAPIRequest(sessionUser string, url string, echoRe
 
 	req, err = http.NewRequest(echoReq.Method, url, bytes.NewReader(body))
 	if err != nil {
-		return 0, nil, err
+		return 0, nil, nil, err
 	}
 
 	// Add the authorization header
@@ -140,13 +141,16 @@ func (userInfo *UaaUserInfo) doAPIRequest(sessionUser string, url string, echoRe
 	client := userInfo.portalProxy.GetHttpClient(userInfo.portalProxy.GetConfig().ConsoleConfig.SkipSSLValidation)
 	res, err = client.Do(req)
 	if err != nil {
-		return 0, nil, fmt.Errorf("Request failed: %v", err)
+		log.Debugf("Request failed: %v", err)
+		return 0, nil, nil, fmt.Errorf("Request failed: %v", err)
 	}
 
 	data, err := ioutil.ReadAll(res.Body)
 	defer res.Body.Close()
 
-	return res.StatusCode, data, err
+	log.Debug("User profile request completed OK")
+
+	return res.StatusCode, data, &res.Header, err
 }
 
 func fwdResponseHeaders(src *http.Header, dest http.Header) {
@@ -169,3 +173,22 @@ func fwdResponseHeaders(src *http.Header, dest http.Header) {
 		}
 	}
 }
+
+func fwdResponseHeaders(src *http.Header, dest http.Header) {
+	log.Debug("fwdResponseHeaders")
+
+	for k, headers := range *src {
+		switch {
+		// Skip these
+		//  - "Referer" causes CF to fail with a 403
+		//  - "Connection", "x-cap-*" and "Cookie" are consumed by us
+		case k == "Connection", k == "Cookie", k == "Referer", strings.HasPrefix(strings.ToLower(k), "x-cap-"):
+
+		// Forwarding everything else
+		default:
+			for _, h := range headers {
+				dest.Add(k, h)
+			}
+		}
+	}
+}

From 20d1ed3fc14e5eae7e73a8402eb62169686d2722 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Thu, 30 Jan 2020 08:59:13 +0000
Subject: [PATCH 321/648] Fix merge issue

---
 src/jetstream/plugins/userinfo/uaa_user.go | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/src/jetstream/plugins/userinfo/uaa_user.go b/src/jetstream/plugins/userinfo/uaa_user.go
index 1a34276c4b..085186b08b 100644
--- a/src/jetstream/plugins/userinfo/uaa_user.go
+++ b/src/jetstream/plugins/userinfo/uaa_user.go
@@ -173,22 +173,3 @@ func fwdResponseHeaders(src *http.Header, dest http.Header) {
 		}
 	}
 }
-
-func fwdResponseHeaders(src *http.Header, dest http.Header) {
-	log.Debug("fwdResponseHeaders")
-
-	for k, headers := range *src {
-		switch {
-		// Skip these
-		//  - "Referer" causes CF to fail with a 403
-		//  - "Connection", "x-cap-*" and "Cookie" are consumed by us
-		case k == "Connection", k == "Cookie", k == "Referer", strings.HasPrefix(strings.ToLower(k), "x-cap-"):
-
-		// Forwarding everything else
-		default:
-			for _, h := range headers {
-				dest.Add(k, h)
-			}
-		}
-	}
-}

From ba3b209e758309b0827a88c4723af6a9c80658ae Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 29 Jan 2020 17:48:03 +0000
Subject: [PATCH 322/648] Show Align Pod Info with kubectl get pods WIP

---
 .../custom/kubernetes/kubernetes.module.ts    |   7 -
 .../kubernetes/kubernetes.component.ts        |  15 +-
 .../kubernetes-pod-readiness.component.html   |   1 -
 .../kubernetes-pod-readiness.component.scss   |   0
 ...kubernetes-pod-readiness.component.spec.ts |  38 -----
 .../kubernetes-pod-readiness.component.ts     |  26 ---
 .../kubernetes-pod-status.component.ts        |  17 +-
 .../kubernetes-pods-list-config.service.ts    |  35 ++--
 .../services/kubernetes-expanded-state.ts     | 160 ++++++++++++++++++
 .../app/custom/kubernetes/store/kube.types.ts |  13 ++
 .../kubernetes/store/kubernetes.effects.ts    |  29 +++-
 .../helm-release-tab-base.component.ts        |   7 +-
 .../kubernetes/workloads/workload.types.ts    |   2 -
 13 files changed, 246 insertions(+), 104 deletions(-)
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.html
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.scss
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.spec.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/services/kubernetes-expanded-state.ts

diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
index 2db4b2a5a4..ebc82f07f8 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
@@ -70,9 +70,6 @@ import {
   KubernetesNodeTagsCardComponent,
 } from './list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component';
 import { NodePodCountComponent } from './list-types/kubernetes-nodes/node-pod-count/node-pod-count.component';
-import {
-  KubernetesPodReadinessComponent,
-} from './list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component';
 import {
   KubernetesPodStatusComponent,
 } from './list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component';
@@ -91,8 +88,6 @@ import { KubernetesPodsTabComponent } from './tabs/kubernetes-pods-tab/kubernete
 import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kubernetes-summary.component';
 
 
-
-
 /* tslint:enable */
 
 @NgModule({
@@ -141,7 +136,6 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     NodePodCountComponent,
     KubernetesServicePortsComponent,
     KubernetesPodStatusComponent,
-    KubernetesPodReadinessComponent,
     KubeServiceCardComponent,
     KubernetesResourceViewerComponent
   ],
@@ -165,7 +159,6 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     NodePodCountComponent,
     KubernetesServicePortsComponent,
     KubernetesPodStatusComponent,
-    KubernetesPodReadinessComponent,
     KubeServiceCardComponent,
     KubernetesResourceViewerComponent
   ],
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.ts
index 449bcc9a12..0931336749 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.ts
@@ -1,13 +1,16 @@
 import { Component } from '@angular/core';
-import { KubernetesService } from '../services/kubernetes.service';
 import { Store } from '@ngrx/store';
-import { map, filter, first } from 'rxjs/operators';
 import { Observable } from 'rxjs';
-import { AppState } from '../../../../../store/src/app-state';
+import { filter, first, map } from 'rxjs/operators';
+
 import { RouterNav } from '../../../../../store/src/actions/router.actions';
-import { ListConfig } from '../../../shared/components/list/list.component.types';
-import {KubernetesEndpointsListConfigService} from '../list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service';
+import { AppState } from '../../../../../store/src/app-state';
 import { EndpointListHelper } from '../../../shared/components/list/list-types/endpoint/endpoint-list.helpers';
+import { ListConfig } from '../../../shared/components/list/list.component.types';
+import {
+  KubernetesEndpointsListConfigService,
+} from '../list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service';
+import { KubernetesService } from '../services/kubernetes.service';
 
 @Component({
   selector: 'app-kubernetes',
@@ -27,7 +30,7 @@ export class KubernetesComponent {
   connectedEndpoints$: Observable<number>;
   constructor(
     private store: Store<AppState>,
-    private kubeService: KubernetesService
+    kubeService: KubernetesService
   ) {
     this.connectedEndpoints$ = kubeService.kubeEndpoints$.pipe(
       map(kubeEndpoints => {
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.html
deleted file mode 100644
index 4045175bb1..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<div>{{ready}} / {{total}}</div>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.spec.ts
deleted file mode 100644
index a41cbad052..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.spec.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
-import { KubernetesPod, KubernetesStatus } from '../../../store/kube.types';
-import { KubernetesPodReadinessComponent } from './kubernetes-pod-readiness.component';
-
-describe('KubernetesPodReadinessComponent', () => {
-  let component: KubernetesPodReadinessComponent;
-  let fixture: ComponentFixture<KubernetesPodReadinessComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        ...KubernetesBaseTestModules,
-      ],
-      declarations: [KubernetesPodReadinessComponent]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(KubernetesPodReadinessComponent);
-    component = fixture.componentInstance;
-    component.row = {
-      status: {
-        phase: KubernetesStatus.FAILED,
-      },
-      spec: {
-        containers: []
-      }
-    } as KubernetesPod;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.ts
deleted file mode 100644
index 838a66f2b8..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-readiness/kubernetes-pod-readiness.component.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-import { TableCellCustom } from '../../../../../shared/components/list/list.types';
-import { ContainerStatus, KubernetesPod } from '../../../store/kube.types';
-
-@Component({
-  selector: 'app-kubernetes-pod-readiness',
-  templateUrl: './kubernetes-pod-readiness.component.html',
-  styleUrls: ['./kubernetes-pod-readiness.component.scss']
-})
-export class KubernetesPodReadinessComponent extends TableCellCustom<KubernetesPod> implements OnInit {
-
-  public total = 0;
-  public ready = 0;
-
-  ngOnInit() {
-    if (this.row.status.phase === 'Failed') {
-      return `0 / ${this.row.spec.containers.length}`;
-    }
-
-    const containers = this.row.status.containerStatuses || [];
-    this.total = containers.length;
-    this.ready = containers.reduce((r: number, cstatus: ContainerStatus) => cstatus.ready ? r + 1 : r, 0);
-  }
-
-}
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
index 18489515dd..cdb370f571 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
@@ -1,4 +1,5 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, Input } from '@angular/core';
+
 import { TableCellCustom } from '../../../../../shared/components/list/list.types';
 import { KubernetesPod, KubernetesStatus } from '../../../store/kube.types';
 
@@ -7,11 +8,21 @@ import { KubernetesPod, KubernetesStatus } from '../../../store/kube.types';
   templateUrl: './kubernetes-pod-status.component.html',
   styleUrls: ['./kubernetes-pod-status.component.scss']
 })
-export class KubernetesPodStatusComponent extends TableCellCustom<KubernetesPod> implements OnInit {
+export class KubernetesPodStatusComponent extends TableCellCustom<KubernetesPod> {
 
   public style = 'border-success';
 
-  ngOnInit() {
+  private pRow: KubernetesPod;
+  @Input('row')
+  get row(): KubernetesPod { return this.pRow; }
+  set row(row: KubernetesPod) {
+    this.pRow = row;
+    if (row) {
+      this.updateStatus();
+    }
+  }
+
+  updateStatus() {
     let status: string;
     switch (this.row.status.phase) {
       case 'Running':
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
index b5f053b240..53b11afa32 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
@@ -20,8 +20,6 @@ import {
 import { KubernetesPod } from '../../store/kube.types';
 import { defaultHelmKubeListPageSize } from '../kube-helm-list-types';
 import { createKubeAgeColumn } from '../kube-list.helper';
-import { KubernetesPodReadinessComponent } from './kubernetes-pod-readiness/kubernetes-pod-readiness.component';
-import { KubernetesPodStatusComponent } from './kubernetes-pod-status/kubernetes-pod-status.component';
 import { KubernetesPodsDataSource } from './kubernetes-pods-data-source';
 
 export abstract class BaseKubernetesPodsListConfigService implements IListConfig<KubernetesPod> {
@@ -91,23 +89,36 @@ export abstract class BaseKubernetesPodsListConfigService implements IListConfig
       cellFlex: '2',
     },
     {
-      columnId: 'status', headerCell: () => 'Status',
-      cellComponent: KubernetesPodStatusComponent,
+      columnId: 'ready',
+      headerCell: () => 'Ready',
+      cellDefinition: {
+        getValue: pod => `${pod.expandedStatus.readyContainers}/${pod.expandedStatus.totalContainers}`
+      },
+      cellFlex: '1'
+    },
+    {
+      columnId: 'expandedStatus',
+      headerCell: () => 'Status',
+      cellDefinition: {
+        valuePath: 'expandedStatus.status'
+      },
       sort: {
         type: 'sort',
-        orderKey: 'status',
-        field: 'status.phase'
+        orderKey: 'expandedStatus',
+        field: 'expandedStatus.status'
       },
-      cellFlex: '1',
+      cellFlex: '2'
     },
     {
-      columnId: 'ready',
-      headerCell: () => 'Ready',
-      cellComponent: KubernetesPodReadinessComponent,
+      columnId: 'restarts',
+      headerCell: () => 'Restarts',
+      cellDefinition: {
+        getValue: pod => pod.expandedStatus.restarts.toString()
+      },
       sort: {
         type: 'sort',
-        orderKey: 'ready',
-        field: 'ready'
+        orderKey: 'restarts',
+        field: 'expandedStatus.restarts'
       },
       cellFlex: '1'
     },
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-expanded-state.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-expanded-state.ts
new file mode 100644
index 0000000000..2d1e7c3464
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-expanded-state.ts
@@ -0,0 +1,160 @@
+import { KubernetesPod } from '../store/kube.types';
+
+
+export interface KubernetesPodExpandedStatus {
+  readyContainers: number;
+  totalContainers: number;
+  status: string;
+  restarts: number;
+  podIP: string;
+  nodeName: string;
+  nominatedNodeName: string;
+  readinessGates: string;
+}
+
+export enum KubernetesNodeConstants {
+  // NodeUnreachablePodReason is the reason on a pod when its state cannot be confirmed as kubelet is unresponsive
+  // on the node it is (was) running.
+  NodeUnreachablePodReason = 'NodeLost'
+}
+
+export class KubernetesPodExpandedStatusHelper {
+
+  static updatePodWithExpandedStatus(pod: KubernetesPod): KubernetesPod {
+    return {
+      ...pod,
+      expandedStatus: this.createPodExpandedStatus(pod)
+    };
+  }
+
+  /**
+   * This function is similar to kubectl printPod from
+   * https://github.com/kubernetes/kubernetes/blob/master/pkg/printers/internalversion/printers.go#L659
+   * No optimisation was done to ensure ease of update later on
+   */
+  static createPodExpandedStatus(pod: KubernetesPod): KubernetesPodExpandedStatus {
+
+    let restarts = 0;
+    const totalContainers = pod.spec.containers ? pod.spec.containers.length : 0;
+    let readyContainers = 0;
+
+    let reason = pod.status.phase ? pod.status.phase.toString() : '';
+    if (!!pod.status.reason) {
+      reason = pod.status.reason;
+    }
+
+    let initializing = false;
+    const initContainerStatuses = pod.status.initContainerStatuses || [];
+    for (let i = 0; i < initContainerStatuses.length; i++) {
+      const container = initContainerStatuses[i];
+      restarts += container.restartCount;
+
+      const state = container.state || {};
+
+      if (!!state.terminated && state.terminated.exitCode === 0) {
+
+      } else if (!!state.terminated) {
+        if (state.terminated.reason.length === 0) {
+          if (state.terminated.signal !== 0) {
+            reason = `Init:Signal:${state.terminated.signal}`;
+          } else {
+            reason = `Init:ExitCode:${state.terminated.exitCode}`;
+          }
+        } else {
+          reason = `Init:${state.terminated.reason}`;
+        }
+        initializing = true;
+      } else if (!!state.waiting && !!state.waiting.reason && state.waiting.reason !== 'PodInitializing') {
+        reason = `Init:${state.waiting.reason}`;
+        initializing = true;
+      } else {
+        reason = `Init:${i}/${pod.spec.initContainers.length}`;
+        initializing = true;
+      }
+    }
+    if (!initializing) {
+      restarts = 0;
+      let hasRunning = false;
+
+      const containerStatuses = pod.status.containerStatuses || [];
+      for (let i = containerStatuses.length - 1; i >= 0; i--) {
+        const container = containerStatuses[i];
+        const state = container.state || {};
+        restarts += container.restartCount;
+        if (!!state.waiting) {
+          reason = state.waiting.reason;
+        } else if (!!state.terminated) {
+          reason = state.terminated.reason;
+        } else if (!!state.terminated) {
+          if (state.terminated.signal !== 0) {
+            reason = `Signal:${state.terminated.signal}`;
+          } else {
+            reason = `ExitCode:${state.terminated.exitCode}`;
+          }
+        } else if (!!container.ready && !!state.running) {
+          hasRunning = true;
+          readyContainers++;
+        }
+      }
+
+      // change pod status back to "Running" if there is at least one container still reporting as "Running" status
+      if (reason === 'Completed' && hasRunning) {
+        reason = 'Running';
+      }
+    }
+
+    if (!!pod.deletionTimestamp && pod.status.reason === KubernetesNodeConstants.NodeUnreachablePodReason) {
+      reason = 'Unknown';
+    } else if (!!pod.deletionTimestamp) {
+      reason = 'Terminating';
+    }
+
+
+    let nodeName = pod.spec.nodeName;
+    let nominatedNodeName = pod.status.nominatedNodeName;
+    let podIP = pod.status.podIP;
+    if (pod.status.podIPs && pod.status.podIPs.length > 0) {
+      podIP = pod.status.podIPs[0].ip;
+    }
+
+    if (!podIP) {
+      podIP = '<none>';
+    }
+    if (!nodeName) {
+      nodeName = '<none>';
+    }
+    if (!nominatedNodeName) {
+      nominatedNodeName = '<none>';
+    }
+
+    let readinessGates = '<none>';
+    if (pod.spec.readinessGates && pod.spec.readinessGates.length > 0) {
+      let trueConditions = 0;
+      pod.spec.readinessGates.forEach(readinessGate => {
+        const conditionType = readinessGate.ConditionType;
+        for (const condition of pod.status.conditions) {
+          if (condition.type === conditionType) {
+            if (condition.status === 'True') {
+              trueConditions++;
+            }
+            break;
+          }
+        }
+      });
+      readinessGates = `${trueConditions}/${pod.spec.readinessGates.length}`;
+    }
+
+    const res: KubernetesPodExpandedStatus = {
+      readyContainers,
+      totalContainers,
+      status: reason,
+      restarts,
+      podIP,
+      nodeName,
+      nominatedNodeName,
+      readinessGates
+    };
+
+    return res;
+  }
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
index fec2a4106f..88d9c4a781 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
@@ -1,3 +1,5 @@
+import { KubernetesPodExpandedStatus } from '../services/kubernetes-expanded-state';
+
 export interface KubernetesInfo {
   nodes: {};
   pods: {};
@@ -199,6 +201,8 @@ export interface KubernetesPod extends BasicKubeAPIResource {
   metadata: Metadata;
   status: PodStatus;
   spec: PodSpec;
+  deletionTimestamp?: any;
+  expandedStatus: KubernetesPodExpandedStatus;
 }
 
 export enum KubernetesStatus {
@@ -226,10 +230,14 @@ export interface PodStatus {
   reason?: string;
   hostIP?: string;
   podIP?: string;
+  podIPs?: {
+    ip: string
+  }[];
   startTime?: Date;
   containerStatuses?: ContainerStatus[];
   qosClass?: string;
   initContainerStatuses?: ContainerStatus[];
+  nominatedNodeName: string;
 }
 export interface KubernetesCondition {
   type: ConditionType;
@@ -252,6 +260,9 @@ export interface ContainerStatus {
 export interface State {
   [key: string]: {
     startedAt: Date;
+    reason: string;
+    signal: number;
+    exitCode: number
   };
 }
 
@@ -271,7 +282,9 @@ export interface PodSpec {
   hostNetwork?: boolean;
   initContainers: InitContainer[];
   // nodeSelector?: NodeSelector;
+  readinessGates: any[];
 }
+
 export interface InitContainer {
   name: string;
   image: string;
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 0d8fdc036d..6a7a8b6ff1 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
@@ -28,8 +28,10 @@ import {
   kubernetesServicesEntityType,
   kubernetesStatefulSetsEntityType,
 } from '../kubernetes-entity-factory';
+import { KubernetesPodExpandedStatusHelper } from '../services/kubernetes-expanded-state';
 import { getKubeAPIResourceGuid } from './kube.selectors';
 import {
+  BasicKubeAPIResource,
   KubernetesDeployment,
   KubernetesNamespace,
   KubernetesNode,
@@ -159,7 +161,8 @@ export class KubernetesEffects {
       return this.processListAction<KubernetesPod>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`,
         podsEntityConfig.entityKey,
-        getKubeAPIResourceGuid);
+        getKubeAPIResourceGuid
+      );
     })
   );
 
@@ -210,7 +213,8 @@ export class KubernetesEffects {
       return this.processListAction<KubernetesPod>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/pods/${action.podName}`,
         podsEntityConfig.entityKey,
-        getKubeAPIResourceGuid);
+        getKubeAPIResourceGuid
+      );
     })
   );
 
@@ -310,7 +314,6 @@ export class KubernetesEffects {
       switchMap(kubeIds => {
         pKubeIds = kubeIds;
         const headers = new HttpHeaders({ 'x-cap-cnsi-list': pKubeIds });
-        // const headers = hr.headers.set(PipelineHttpClient.EndpointHeader, endpointGuids);
         const requestArgs = {
           headers,
           params: null
@@ -341,10 +344,14 @@ export class KubernetesEffects {
           });
           return combinedRes;
         }, []);
-        const processesData = items.filter((res) => !!filterResults ? filterResults(res) : true)
+        const filteredItems = filterResults ? items.filter(res => filterResults(res)) : items;
+        const processesData = filteredItems
           .reduce((res, data) => {
             const id = getId(data);
-            res.entities[entityKey][id] = data;
+            const updatedData = action.entityType === kubernetesPodsEntityType ?
+              KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(data as unknown as KubernetesPod) :
+              data;
+            res.entities[entityKey][id] = updatedData;
             res.result.push(id);
             return res;
           }, base);
@@ -367,7 +374,12 @@ export class KubernetesEffects {
     );
   }
 
-  private processSingleItemAction<T>(action: KubeAction, url: string, schemaKey: string, getId: GetID<T>, body?: any) {
+  private processSingleItemAction<T extends BasicKubeAPIResource>(
+    action: KubeAction,
+    url: string,
+    schemaKey: string,
+    getId: GetID<T>,
+    body?: any) {
     const requestType: ApiRequestTypes = body ? 'create' : 'fetch';
     this.store.dispatch(new StartRequestAction(action, requestType));
     const headers = new HttpHeaders({
@@ -388,7 +400,10 @@ export class KubernetesEffects {
             result: []
           } as NormalizedResponse;
           const id = getId(response);
-          res.entities[schemaKey][id] = response;
+          const data = action.entityType === kubernetesPodsEntityType ?
+            KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(response as unknown as KubernetesPod) :
+            response;
+          res.entities[schemaKey][id] = data;
           res.result.push(id);
           const actions: Action[] = [
             new WrapperRequestActionSuccess(res, action)
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 68d11d5578..0787289ab5 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
@@ -11,7 +11,9 @@ import { Observable, Subject, Subscription } from 'rxjs';
 import makeWebSocketObservable, { GetWebSocketResponses } from 'rxjs-websockets';
 import { catchError, map, share, switchMap } from 'rxjs/operators';
 
+import { KubernetesPodExpandedStatusHelper } from '../../../services/kubernetes-expanded-state';
 import { getKubeAPIResourceGuid } from '../../../store/kube.selectors';
+import { KubernetesPod } from '../../../store/kube.types';
 import { getHelmReleaseServiceId } from '../../store/workloads-entity-factory';
 import {
   GetHelmReleaseGraph,
@@ -110,9 +112,10 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
         if (messageObj.kind === 'ReleasePrefix') {
           prefix = messageObj.data;
         } else if (messageObj.kind === 'Pods') {
-          const pods = messageObj.data;
+          const pods: KubernetesPod[] = messageObj.data || [];
+          const podsWithInfo: KubernetesPod[] = pods.map(pod => KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(pod));
           const releasePodsAction = new GetHelmReleasePods(this.helmReleaseHelper.endpointGuid, this.helmReleaseHelper.releaseTitle);
-          this.populateList(releasePodsAction, pods, getKubeAPIResourceGuid);
+          this.populateList(releasePodsAction, podsWithInfo, getKubeAPIResourceGuid);
         } else if (messageObj.kind === 'Graph') {
           const graph: HelmReleaseGraph = messageObj.data;
           graph.endpointId = this.helmReleaseHelper.endpointGuid;
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
index a0f26ebe03..b0394359ab 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
@@ -46,8 +46,6 @@ export interface HelmReleaseService {
   spec: any;
 }
 
-// TODO: RC/NWM - Remove WS release logging in backend
-
 export interface HelmReleaseGraph {
   endpointId: string;
   releaseTitle: string;

From 673bd45c354488b2210070e09c980066820f2b95 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 30 Jan 2020 11:59:48 +0000
Subject: [PATCH 323/648] Ensure we remove stale pods

---
 .../plugins/kubernetes/get_release.go         |  6 ---
 .../plugins/kubernetes/helm/release.go        | 37 +++++++++++++++----
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/get_release.go b/src/jetstream/plugins/kubernetes/get_release.go
index 6607d5844c..bd09da963d 100644
--- a/src/jetstream/plugins/kubernetes/get_release.go
+++ b/src/jetstream/plugins/kubernetes/get_release.go
@@ -3,11 +3,8 @@ package kubernetes
 import (
 	"encoding/json"
 	"fmt"
-
 	"time"
 
-	//"fmt"
-
 	"github.com/gorilla/websocket"
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
@@ -105,9 +102,7 @@ func (c *KubernetesSpecification) GetReleaseStatus(ec echo.Context) error {
 	// this back incrementally
 
 	// Parse the manifest
-	log.Info("Got release")
 	rel := helm.NewHelmRelease(res, endpointGUID, userID)
-	log.Info("Done")
 
 	graph := helm.NewHelmReleaseGraph(rel)
 
@@ -200,7 +195,6 @@ func readLoop(c *websocket.Conn, stopchan chan<- bool) {
 }
 
 func sendResource(ws *websocket.Conn, kind string, data interface{}) error {
-
 	var err error
 	var txt []byte
 	if txt, err = json.Marshal(data); err == nil {
diff --git a/src/jetstream/plugins/kubernetes/helm/release.go b/src/jetstream/plugins/kubernetes/helm/release.go
index c232de440d..9c15554514 100644
--- a/src/jetstream/plugins/kubernetes/helm/release.go
+++ b/src/jetstream/plugins/kubernetes/helm/release.go
@@ -5,9 +5,8 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"reflect"
-
-	//	"io"
 	"strings"
 
 	log "github.com/sirupsen/logrus"
@@ -105,6 +104,9 @@ func getResourceIdentifier(typeMeta metav1.TypeMeta, objectMeta metav1.ObjectMet
 func (r *HelmRelease) setResource(res KubeResource) {
 	r.Resources[res.getID()] = res
 }
+func (r *HelmRelease) deleteResource(res KubeResource) {
+	delete(r.Resources, res.getID())
+}
 
 // GetResources gets all fo the resources for the release
 func (r *HelmRelease) GetResources() []interface{} {
@@ -211,6 +213,8 @@ func (r *HelmRelease) UpdatePods(jetstream interfaces.PortalProxy) {
 		jobs = append(jobs, job)
 	}
 
+	pods := make(map[string]*KubeResource)
+
 	runner := NewKubeAPIJob(jetstream, jobs)
 	res := runner.Run()
 	for _, j := range res {
@@ -229,12 +233,22 @@ func (r *HelmRelease) UpdatePods(jetstream interfaces.PortalProxy) {
 				podCopy := &v1.Pod{}
 				*podCopy = pod
 				res.Resource = podCopy
+				pods[res.getID()] = &res
 
 				r.setResource(res)
 				r.processPodOwners(pod)
 			}
 		}
 	}
+
+	// Now remove all pods that have not just been retrieved
+	// These are stale pods
+	for _, res := range r.Resources {
+		_, exists := pods[res.getID()]
+		if res.Kind == "Pod" && !exists {
+			r.deleteResource(res)
+		}
+	}
 }
 
 // Pods can be owned by a ReplicaSet - these are not represented in the manifest, as they
@@ -288,8 +302,6 @@ func (r *HelmRelease) UpdateResources(jetstream interfaces.PortalProxy) {
 	res := runner.Run()
 	for _, j := range res {
 
-		// TODO: If the status was 404, then we should remove the resource
-
 		// Add a kube resource
 		res := KubeResource{
 			Kind:       j.Kind,
@@ -297,8 +309,19 @@ func (r *HelmRelease) UpdateResources(jetstream interfaces.PortalProxy) {
 		}
 		res.Metadata.Name = j.Name
 
-		// TODO: This should carry over
-		res.Manifest = false
+		// TODO: If the status was 404, then we should remove the resource
+		if j.StatusCode == http.StatusNotFound {
+			log.Debugf("Resource has been deleted - removing: %s -> %s", j.Kind, j.Name)
+			r.deleteResource(res)
+		}
+
+		// Manifest should carry over - indicates if the resource was in the Helm manifest
+		// Pods are an example of a reosurce which is not in the manifest
+		if existing, ok := r.Resources[res.getID()]; ok {
+			res.Manifest = existing.Manifest
+		} else {
+			res.Manifest = false
+		}
 
 		decode := scheme.Codecs.UniversalDeserializer().Decode
 		obj, _, err := decode(j.Data, nil, nil)
@@ -326,7 +349,5 @@ func getRestURL(namespace, kind, apiVersion, name string) string {
 		}
 	}
 	restURL = fmt.Sprintf("/%s/%s/namespaces/%s/%ss/%s", base, apiVersion, namespace, strings.ToLower(kind), name)
-
-	//log.Errorf("%s %s %s -> %s", kind, apiVersion, name, restURL)
 	return restURL
 }

From 3e8c4229bf24c438e4ff399f2043e236bcd53dc3 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 30 Jan 2020 18:03:33 +0000
Subject: [PATCH 324/648] WIP

---
 .../helm-release-card.component.html          | 11 ++++++++-
 .../helm-release-card.component.scss          | 23 +++++++++++++++++++
 .../helm-release-card.component.ts            |  7 ++++++
 .../helm-release-summary-tab.component.html   |  2 +-
 .../helm-release-summary-tab.component.scss   |  4 ++--
 .../entity-summary-title.component.html       |  2 +-
 .../ring-chart/ring-chart.component.ts        |  8 +++----
 7 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
index dc05a059c3..c0165e6ab0 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
@@ -1,6 +1,15 @@
 <app-meta-card class="release-card" [routerLink]="row.guid">
   <app-meta-card-title>
-    <app-multiline-title>{{ row.name }}</app-multiline-title>
+    <div class="release-title">
+      <app-multiline-title>{{ row.name }}</app-multiline-title>
+      <div class='release-title--icon'>
+        <img *ngIf="icon; else noIcon" [src]="icon" (error)="loadImageError()">
+        <ng-template #noIcon>
+          <!-- // TODO: RC -->
+          <mat-icon fontSet="stratos-icons">service</mat-icon>
+        </ng-template>
+      </div>
+    </div>
   </app-meta-card-title>
   <app-meta-card-item>
     <app-meta-card-key>Cluster</app-meta-card-key>
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss
index 4f87607278..90e9c122b6 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss
@@ -4,3 +4,26 @@
     outline: 0;
   }
 }
+
+.release-title {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  width: 100%;
+
+  &--icon {
+    align-self: flex-end;
+    display: flex;
+    &__padding {
+      padding-right: 24px;
+    }
+    img,
+    mat-icon {
+      font-size: 48px;
+      height: 48px;
+      width: 48px;
+    }
+  }
+}
+
+
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts
index e99b9d7865..b449a2d894 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts
@@ -14,6 +14,7 @@ export class HelmReleaseCardComponent extends CardCell<HelmRelease> implements O
   public status: string;
   public lastDeployed: string;
   private pRow: HelmRelease;
+  public icon: string;
 
   @Input('row')
   set row(row: HelmRelease) {
@@ -21,6 +22,7 @@ export class HelmReleaseCardComponent extends CardCell<HelmRelease> implements O
     if (row) {
       this.status = row.status.charAt(0).toUpperCase() + row.status.substring(1);
       this.lastDeployed = this.datePipe.transform(row.info.last_deployed, 'medium');
+      this.icon = row.chart.metadata.icon;
     }
   }
   get row(): HelmRelease {
@@ -35,4 +37,9 @@ export class HelmReleaseCardComponent extends CardCell<HelmRelease> implements O
   ngOnInit() {
   }
 
+  loadImageError() {
+    console.log('sdfdsf');
+    this.icon = null;
+  }
+
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
index 16f0c9a276..386b6ce31c 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
@@ -60,7 +60,7 @@
     </div>
     <ng-template #loadingResources>
       <div class="resources__loading">
-        <div class="resources_loading__content">
+        <div class="resources__loading__content">
           Loading Resources
           <mat-progress-bar class="" [color]="'primary'" mode="indeterminate">
           </mat-progress-bar>
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
index a40f8d2d52..1e7019d68d 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
@@ -5,8 +5,8 @@
   padding: 0 10px;
 
   &__loading {
-        display: flex;
-        justify-content: center;
+    display: flex;
+    justify-content: center;
     &__content {
       margin-top: 50px;
       mat-progress-bar {
diff --git a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.html b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.html
index 49bbeeb353..f851ce17fe 100644
--- a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.html
+++ b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.html
@@ -1,6 +1,6 @@
 <div class="entity-summary">
   <div class="entity-summary__header-section">
-    <img *ngIf="imagePath" class="entity-summary__logo" title="{{ title }}'s image'" src="{{ imagePath }}">
+    <img *ngIf="imagePath" class="entity-summary__logo" title="{{ title }}'s image" src="{{ imagePath }}">
     <div class="entity-summary__header-inner">
       <div class="entity-summary__header-wrapper">
         <h1 class="entity-summary__header">{{ title }} </h1>
diff --git a/src/frontend/packages/core/src/shared/components/ring-chart/ring-chart.component.ts b/src/frontend/packages/core/src/shared/components/ring-chart/ring-chart.component.ts
index 29e5b36ce4..0e96a6cece 100644
--- a/src/frontend/packages/core/src/shared/components/ring-chart/ring-chart.component.ts
+++ b/src/frontend/packages/core/src/shared/components/ring-chart/ring-chart.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, Input, ViewEncapsulation } from '@angular/core';
+import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
 import { ColorHelper } from '@swimlane/ngx-charts';
 
 @Component({
@@ -17,9 +17,9 @@ export class RingChartComponent implements OnInit {
   @Input() scheme: any = 'cool';
   @Input() customColors: any[];
 
-  @Input() onClick: ($event: Event) => void;
-  @Input() onActivate: ($event: Event) => void;
-  @Input() onDeactivate: ($event: Event) => void;
+  @Input() onClick: ($event: Event) => void = () => { };
+  @Input() onActivate: ($event: Event) => void = () => { };
+  @Input() onDeactivate: ($event: Event) => void = () => { };
   @Input() valueFormatting: (value: number) => any = value => value;
   @Input() nameFormatting: (value: string) => any = label => label;
   @Input() percentageFormatting: (value: number) => any = percentage => percentage;

From c148689b2df46c13141830bfb92007f2dbc421d3 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 30 Jan 2020 20:27:38 +0000
Subject: [PATCH 325/648] Fixes following walkthrough

---
 .../kubernetes-dashboard.component.ts         | 40 +++++++-------
 .../plugins/kubernetes/dashboard/common.go    | 53 +++++++------------
 2 files changed, 41 insertions(+), 52 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
index 204a73279e..30ca05ff93 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
@@ -57,7 +57,9 @@ export class KubernetesDashboardTabComponent implements OnInit {
 
   public errorMsg$ = new BehaviorSubject<EndpointMissingMessageParts>({} as EndpointMissingMessageParts);
 
-  constructor(public kubeEndpointService: KubernetesEndpointService, private sanitizer: DomSanitizer, public renderer: Renderer2) { }
+  constructor(public kubeEndpointService: KubernetesEndpointService, private sanitizer: DomSanitizer, public renderer: Renderer2) {
+    this.hasError$.next(false);
+  }
 
   ngOnInit() {
     const guid = this.kubeEndpointService.baseKube.guid;
@@ -82,7 +84,7 @@ export class KubernetesDashboardTabComponent implements OnInit {
   }
 
   iframeLoaded() {
-    if (!this.kubeDash) {
+    if (!this.pKubeDash) {
       return;
     }
     this.loadCheckTries = 20;
@@ -128,12 +130,12 @@ export class KubernetesDashboardTabComponent implements OnInit {
   }
 
   setupEventListener() {
-    if (this.haveSetupEventLister || !this.kubeDash || !this.hasIframeLoaded) {
+    if (this.haveSetupEventLister || !this.pKubeDash || !this.hasIframeLoaded) {
       return;
     }
 
     this.haveSetupEventLister = true;
-    const iframeWindow = this.kubeDash.nativeElement.contentWindow;
+    const iframeWindow = this.pKubeDash.nativeElement.contentWindow;
     iframeWindow.addEventListener('hashchange', () => {
       if (this.href) {
         let h2 = decodeURI(this.href);
@@ -166,11 +168,11 @@ export class KubernetesDashboardTabComponent implements OnInit {
 
   // Can we detect the dashboard's toolbar (implies dashboard UI has loaded)
   private getKubeDashToolbar() {
-    if (this.kubeDash &&
-      this.kubeDash.nativeElement &&
-      this.kubeDash.nativeElement.contentDocument &&
-      this.kubeDash.nativeElement.contentDocument.getElementsByTagName) {
-      const kdChrome = this.kubeDash.nativeElement.contentDocument.getElementsByTagName('kd-chrome')[0];
+    if (this.pKubeDash &&
+      this.pKubeDash.nativeElement &&
+      this.pKubeDash.nativeElement.contentDocument &&
+      this.pKubeDash.nativeElement.contentDocument.getElementsByTagName) {
+      const kdChrome = this.pKubeDash.nativeElement.contentDocument.getElementsByTagName('kd-chrome')[0];
       if (kdChrome) {
         const kdToolbar = kdChrome.getElementsByTagName('mat-toolbar')[0];
         if (kdToolbar) {
@@ -185,11 +187,11 @@ export class KubernetesDashboardTabComponent implements OnInit {
 
   // Can we detect the dashboard login page?
   private getKubeDashLogin(): boolean {
-    if (this.kubeDash &&
-      this.kubeDash.nativeElement &&
-      this.kubeDash.nativeElement.contentDocument &&
-      this.kubeDash.nativeElement.contentDocument.getElementsByTagName) {
-      const kdLogin = this.kubeDash.nativeElement.contentDocument.getElementsByTagName('kd-login');
+    if (this.pKubeDash &&
+      this.pKubeDash.nativeElement &&
+      this.pKubeDash.nativeElement.contentDocument &&
+      this.pKubeDash.nativeElement.contentDocument.getElementsByTagName) {
+      const kdLogin = this.pKubeDash.nativeElement.contentDocument.getElementsByTagName('kd-login');
       return kdLogin.length === 1;
     }
     return false;
@@ -197,11 +199,11 @@ export class KubernetesDashboardTabComponent implements OnInit {
 
   // Can we detect a Stratos error message page?
   private getStratosError(): string {
-    if (this.kubeDash &&
-      this.kubeDash.nativeElement &&
-      this.kubeDash.nativeElement.contentDocument &&
-      this.kubeDash.nativeElement.contentDocument.getElementsByTagName) {
-      const stratosError = this.kubeDash.nativeElement.contentDocument.getElementsByTagName('stratos-error');
+    if (this.pKubeDash &&
+      this.pKubeDash.nativeElement &&
+      this.pKubeDash.nativeElement.contentDocument &&
+      this.pKubeDash.nativeElement.contentDocument.getElementsByTagName) {
+      const stratosError = this.pKubeDash.nativeElement.contentDocument.getElementsByTagName('stratos-error');
       if (stratosError.length === 1) {
         return stratosError[0].innerText;
       }
diff --git a/src/jetstream/plugins/kubernetes/dashboard/common.go b/src/jetstream/plugins/kubernetes/dashboard/common.go
index e8e99846ff..1e058ad831 100644
--- a/src/jetstream/plugins/kubernetes/dashboard/common.go
+++ b/src/jetstream/plugins/kubernetes/dashboard/common.go
@@ -11,10 +11,6 @@ import (
 	log "github.com/sirupsen/logrus"
 
 	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/kubernetes/pkg/api/legacyscheme"
-	api "k8s.io/kubernetes/pkg/apis/core"
-	k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
 )
 
 const (
@@ -31,24 +27,24 @@ const (
 // ServiceInfo represents the information for the Dashboard Service
 // that we need to proxy the service
 type ServiceInfo struct {
-	Namespace   string `json:"namespace"`
-	ServiceName string `json:"name"`
-	Scheme      string `json:"scheme"`
-	StratosInstalled bool `json:"-"`
+	Namespace        string `json:"namespace"`
+	ServiceName      string `json:"name"`
+	Scheme           string `json:"scheme"`
+	StratosInstalled bool   `json:"-"`
 }
 
 // StatusResponse is the response from the dashboard status check
 type StatusResponse struct {
-	Endpoint      string             `json:"guid"`
-	Installed     bool               `json:"installed"`
-	StratosInstalled bool `json:"stratosInstalled"`
-	Running       bool               `json:"running"`
-	Pod           *v1.Pod            `json:"pod"`
-	Version       string             `json:"version"`
-	Service       *ServiceInfo       `json:"service"`
-	HasToken      bool               `json:"tokenExists"`
-	ServiceAccont *v1.ServiceAccount `json:"serviceAccount"`
-	Token         string             `json:"-"`
+	Endpoint         string             `json:"guid"`
+	Installed        bool               `json:"installed"`
+	StratosInstalled bool               `json:"stratosInstalled"`
+	Running          bool               `json:"running"`
+	Pod              *v1.Pod            `json:"pod"`
+	Version          string             `json:"version"`
+	Service          *ServiceInfo       `json:"service"`
+	HasToken         bool               `json:"tokenExists"`
+	ServiceAccont    *v1.ServiceAccount `json:"serviceAccount"`
+	Token            string             `json:"-"`
 }
 
 // Determine if the specified Kube endpoint has the dashboard installed and ready
@@ -200,24 +196,15 @@ func hasAnnotation(annotations map[string]string, key, value string) bool {
 	return false
 }
 
-func tryDecodePodList(data []byte) (parsed bool, pods v1.PodList, err error) {
-	obj, err := runtime.Decode(legacyscheme.Codecs.UniversalDecoder(), data)
-	if err != nil {
-		return false, pods, err
-	}
+func tryDecodePodList(data []byte) (bool, v1.PodList, error) {
+	var pods v1.PodList
+	var err error
 
-	newPods, ok := obj.(*api.PodList)
-	// Check whether the object could be converted to list of pods.
-	if !ok {
-		err = fmt.Errorf("invalid pods list: %#v", obj)
+	err = json.Unmarshal(data, &pods)
+	if err != nil {
 		return false, pods, err
 	}
-
-	v1Pods := &v1.PodList{}
-	if err := k8s_api_v1.Convert_core_PodList_To_v1_PodList(newPods, v1Pods, nil); err != nil {
-		return true, pods, err
-	}
-	return true, *v1Pods, err
+	return true, pods, err
 }
 
 func tryDecodeServiceList(data []byte) (bool, v1.ServiceList, error) {

From a4ac7d7dfc0b914e2868af8f2e8845add7ec3ef8 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 30 Jan 2020 20:29:34 +0000
Subject: [PATCH 326/648] Further fix for stuck loading indicator

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

diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
index 30ca05ff93..9a2451b237 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
@@ -33,7 +33,7 @@ import { EndpointMissingMessageParts } from '../../../shared/components/endpoint
 export class KubernetesDashboardTabComponent implements OnInit {
 
   private pKubeDash: ElementRef;
-  @ViewChild('kubeDash', { read: ElementRef, static: true }) set kubeDash(kubeDash: ElementRef) {
+  @ViewChild('kubeDash', { read: ElementRef, static: false }) set kubeDash(kubeDash: ElementRef) {
     if (!this.pKubeDash) {
       this.pKubeDash = kubeDash;
       // Need to look at this process again. In tests this is never hit, leading to null references to kubeDash

From 55713afa28090c7f88d6f6431fb877bd8cb8b677 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 30 Jan 2020 20:34:33 +0000
Subject: [PATCH 327/648] Add annotations and fix db pod scaling

---
 .../console/templates/database.yaml           | 13 +++++++++++
 .../console/templates/deployment.yaml         | 22 +++++++++++++++++++
 deploy/kubernetes/console/values.yaml         |  9 ++++++++
 3 files changed, 44 insertions(+)

diff --git a/deploy/kubernetes/console/templates/database.yaml b/deploy/kubernetes/console/templates/database.yaml
index 07fbca8b62..fad8a52769 100644
--- a/deploy/kubernetes/console/templates/database.yaml
+++ b/deploy/kubernetes/console/templates/database.yaml
@@ -15,12 +15,22 @@ metadata:
     app.kubernetes.io/component: "stratos-db"
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
+  replicas: 1
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 0
+      maxUnavailable: 1
   selector:
     matchLabels:
       app.kubernetes.io/name: "stratos"
       app.kubernetes.io/component: "stratos-db"
   template:
     metadata:
+{{- if .Values.console.podAnnotations }}
+      annotations:
+{{ toYaml .Values.console.podAnnotations | indent 8 }}
+{{- end }}
       labels:
         app.kubernetes.io/name: "stratos"
         app.kubernetes.io/instance: "{{ .Release.Name }}"
@@ -28,6 +38,9 @@ spec:
         app.kubernetes.io/component: "stratos-db"
         helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
         app: "{{ .Release.Name }}"
+        {{- if .Values.console.podExtraLabels}}
+        {{ toYaml .Values.console.podExtraLabels | nindent 8 }}
+        {{- end}}        
     spec:
       containers:
       - name: mariadb
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 55270fe87e..f592d43426 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -7,6 +7,21 @@ apiVersion: apps/v1beta1
 kind: StatefulSet
 metadata:
   name: stratos
+{{- if .Values.console.statefulSetAnnotations }}
+  annotations:
+{{ toYaml .Values.console.statefulSetAnnotations | indent 4 }}
+{{- end }}
+  labels:
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "stratos"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    app: "{{ .Release.Name }}"
+    component: stratos
+{{- if .Values.console.statefulSetExtraLabels }}
+{{ toYaml .Values.console.statefulSetExtraLabels | nindent 4 }}
+{{- end}}        
 spec:
   serviceName: stratos
   replicas: 1
@@ -16,6 +31,10 @@ spec:
       app.kubernetes.io/component: "stratos"
   template:
     metadata:
+{{- if .Values.console.podAnnotations }}
+      annotations:
+{{ toYaml .Values.console.podAnnotations | indent 8 }}
+{{- end }}
       labels:
         app.kubernetes.io/name: "stratos"
         app.kubernetes.io/instance: "{{ .Release.Name }}"
@@ -24,6 +43,9 @@ spec:
         helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
         app: "{{ .Release.Name }}"
         component: stratos
+        {{- if .Values.console.podExtraLabels}}
+        {{ toYaml .Values.console.podExtraLabels | nindent 8 }}
+        {{- end}}        
     spec:
       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 e5e618f389..e219f123ee 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -72,6 +72,15 @@ console:
   tlsSecretName:
 
   autoRegisterCF: ~
+
+  statefulSetAnnotations: ~
+
+  statefulSetExtraLabels: ~
+
+  podAnnotations: ~
+
+  podExtraLabels: ~
+
   
 images:
   console: stratos-console

From 13a5f3fec2dc6fa4c657fe4d9fa4c8865fe96748 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 30 Jan 2020 18:03:05 +0000
Subject: [PATCH 328/648] Fix for db pod being recreated with two instances

---
 deploy/kubernetes/console/templates/deployment.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 09863ef924..7621674616 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -330,6 +330,12 @@ metadata:
     app.kubernetes.io/component: "stratos-db"
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
+  replicas: 1
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 0
+      maxUnavailable: 1
   selector:
     matchLabels:
       app.kubernetes.io/name: "stratos"

From f6318a80d3aa95ff628733e84ae736f79265272a Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 30 Jan 2020 18:29:18 +0000
Subject: [PATCH 329/648] Fix broken edit user profile

---
 src/jetstream/plugins/userinfo/local_user.go | 28 +++++++++----------
 src/jetstream/plugins/userinfo/main.go       |  8 +++---
 src/jetstream/plugins/userinfo/types.go      |  4 +--
 src/jetstream/plugins/userinfo/uaa_user.go   | 29 +++++++++++++++-----
 4 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/src/jetstream/plugins/userinfo/local_user.go b/src/jetstream/plugins/userinfo/local_user.go
index c35da1b0da..83e36aa8e8 100644
--- a/src/jetstream/plugins/userinfo/local_user.go
+++ b/src/jetstream/plugins/userinfo/local_user.go
@@ -62,23 +62,23 @@ func (userInfo *LocalUserInfo) GetUserInfo(id string) (int, []byte, *http.Header
 }
 
 // UpdateUserInfo updates the user's info
-func (userInfo *LocalUserInfo) UpdateUserInfo(profile *uaaUser) error {
+func (userInfo *LocalUserInfo) UpdateUserInfo(profile *uaaUser) (int, error) {
 
 	// Fetch the user, make updates and save
 	id := profile.ID
 	localUsersRepo, err := localusers.NewPgsqlLocalUsersRepository(userInfo.portalProxy.GetDatabaseConnection())
 	if err != nil {
-		return err
+		return 500, err
 	}
 
 	user, err := localUsersRepo.FindUser(id)
 	if err != nil {
-		return err
+		return 500, err
 	}
 
 	hash, err := localUsersRepo.FindPasswordHash(id)
 	if err != nil {
-		return err
+		return 500, err
 	}
 
 	user.PasswordHash = hash
@@ -95,36 +95,36 @@ func (userInfo *LocalUserInfo) UpdateUserInfo(profile *uaaUser) error {
 
 	err = localUsersRepo.UpdateLocalUser(user)
 	if err != nil {
-		return err
+		return 500, err
 	}
 
-	return nil
+	return 200, nil
 }
 
 // UpdatePassword updates the user's password
-func (userInfo *LocalUserInfo) UpdatePassword(id string, passwordInfo *passwordChangeInfo) error {
+func (userInfo *LocalUserInfo) UpdatePassword(id string, passwordInfo *passwordChangeInfo) (int, error) {
 
 	// Fetch the user, make updates and save
 	localUsersRepo, err := localusers.NewPgsqlLocalUsersRepository(userInfo.portalProxy.GetDatabaseConnection())
 	if err != nil {
-		return err
+		return 500, err
 	}
 
 	user, err := localUsersRepo.FindUser(id)
 	if err != nil {
-		return err
+		return 500, err
 	}
 
 	hash, err := localUsersRepo.FindPasswordHash(id)
 	if err != nil {
-		return err
+		return 500, err
 	}
 
 	// Check old password is correct
 	err = bcrypt.CompareHashAndPassword(hash, []byte(passwordInfo.OldPassword))
 	if err != nil {
 		// Old password is incorrect
-		return interfaces.NewHTTPShadowError(
+		return 500, interfaces.NewHTTPShadowError(
 			http.StatusBadRequest,
 			"Current password is incorrect",
 			"Current password is incorrect: %v", err,
@@ -133,16 +133,16 @@ func (userInfo *LocalUserInfo) UpdatePassword(id string, passwordInfo *passwordC
 
 	passwordHash, err := HashPassword(passwordInfo.NewPassword)
 	if err != nil {
-		return err
+		return 500, err
 	}
 
 	user.PasswordHash = passwordHash
 
 	err = localUsersRepo.UpdateLocalUser(user)
 	if err != nil {
-		return err
+		return 500, err
 	}
-	return nil
+	return 200, nil
 }
 
 //HashPassword accepts a plaintext password string and generates a salted hash
diff --git a/src/jetstream/plugins/userinfo/main.go b/src/jetstream/plugins/userinfo/main.go
index a2d6968f14..ed3a9ae118 100644
--- a/src/jetstream/plugins/userinfo/main.go
+++ b/src/jetstream/plugins/userinfo/main.go
@@ -135,7 +135,7 @@ func (userInfo *UserInfo) updateUserInfo(c echo.Context) error {
 		return echo.NewHTTPError(http.StatusBadRequest, "Invalid message body")
 	}
 
-	err = provider.UpdateUserInfo(updatedProfile)
+	statusCode, err := provider.UpdateUserInfo(updatedProfile)
 	if err != nil {
 		if httpError, ok := err.(interfaces.ErrHTTPShadow); ok {
 			return httpError
@@ -148,7 +148,7 @@ func (userInfo *UserInfo) updateUserInfo(c echo.Context) error {
 		)
 	}
 
-	c.Response().WriteHeader(http.StatusOK)
+	c.Response().WriteHeader(statusCode)
 
 	return nil
 }
@@ -175,7 +175,7 @@ func (userInfo *UserInfo) updateUserPassword(c echo.Context) error {
 		return echo.NewHTTPError(http.StatusBadRequest, "Invalid message body")
 	}
 
-	err = provider.UpdatePassword(id, passwordInfo)
+	statusCode, err := provider.UpdatePassword(id, passwordInfo)
 	if err != nil {
 		if httpError, ok := err.(interfaces.ErrHTTPShadow); ok {
 			return httpError
@@ -188,7 +188,7 @@ func (userInfo *UserInfo) updateUserPassword(c echo.Context) error {
 		)
 	}
 
-	c.Response().WriteHeader(http.StatusOK)
+	c.Response().WriteHeader(statusCode)
 
 	return nil
 }
diff --git a/src/jetstream/plugins/userinfo/types.go b/src/jetstream/plugins/userinfo/types.go
index 31f988041e..a33f089e2f 100644
--- a/src/jetstream/plugins/userinfo/types.go
+++ b/src/jetstream/plugins/userinfo/types.go
@@ -7,8 +7,8 @@ import (
 // Provider manages user info for a provider
 type Provider interface {
 	GetUserInfo(id string) (int, []byte, *http.Header, error)
-	UpdateUserInfo(*uaaUser) error
-	UpdatePassword(id string, info *passwordChangeInfo) error
+	UpdateUserInfo(*uaaUser) (int, error)
+	UpdatePassword(id string, info *passwordChangeInfo) (int, error)
 }
 
 type uaaUserEmail struct {
diff --git a/src/jetstream/plugins/userinfo/uaa_user.go b/src/jetstream/plugins/userinfo/uaa_user.go
index 085186b08b..5749381f43 100644
--- a/src/jetstream/plugins/userinfo/uaa_user.go
+++ b/src/jetstream/plugins/userinfo/uaa_user.go
@@ -31,17 +31,17 @@ func (userInfo *UaaUserInfo) GetUserInfo(id string) (int, []byte, *http.Header,
 }
 
 // UpdateUserInfo updates the user's info
-func (userInfo *UaaUserInfo) UpdateUserInfo(profile *uaaUser) error {
+func (userInfo *UaaUserInfo) UpdateUserInfo(profile *uaaUser) (int, error) {
 	target := fmt.Sprintf("Users/%s", profile.ID)
-	_, _, _, err := userInfo.uaa(target, profile.Raw)
-	return err
+	statusCode, _, _, err := userInfo.uaa(target, profile.Raw)
+	return statusCode, err
 }
 
 // UpdatePassword updates the user's password
-func (userInfo *UaaUserInfo) UpdatePassword(id string, passwordInfo *passwordChangeInfo) error {
+func (userInfo *UaaUserInfo) UpdatePassword(id string, passwordInfo *passwordChangeInfo) (int, error) {
 	target := fmt.Sprintf("Users/%s/password", id)
-	_, _, _, err := userInfo.uaa(target, passwordInfo.Raw)
-	return err
+	statusCode, _, _, err := userInfo.uaa(target, passwordInfo.Raw)
+	return statusCode, err
 }
 
 func (userInfo *UaaUserInfo) uaa(target string, body []byte) (int, []byte, *http.Header, error) {
@@ -137,6 +137,13 @@ func (userInfo *UaaUserInfo) doAPIRequest(sessionUser string, url string, echoRe
 
 	// Add the authorization header
 	req.Header.Set("Authorization", "bearer "+tokenRec.AuthToken)
+	if echoReq.Method == http.MethodPost || echoReq.Method == http.MethodPut {
+		req.Header.Set("Content-Type", "application/json")
+		req.Header.Set("Accept", "application/json")
+		copyHeaderIfSet(echoReq, req, "If-Match")
+		copyHeaderIfSet(echoReq, req, "X-Identity-Zone-Id")
+		copyHeaderIfSet(echoReq, req, "X-Identity-Zone-Subdomain")
+	}
 
 	client := userInfo.portalProxy.GetHttpClient(userInfo.portalProxy.GetConfig().ConsoleConfig.SkipSSLValidation)
 	res, err = client.Do(req)
@@ -149,10 +156,18 @@ func (userInfo *UaaUserInfo) doAPIRequest(sessionUser string, url string, echoRe
 	defer res.Body.Close()
 
 	log.Debug("User profile request completed OK")
-
 	return res.StatusCode, data, &res.Header, err
 }
 
+func copyHeaderIfSet(src *http.Request, dest *http.Request, name string) {
+	if value, ok := src.Header[name]; ok {
+		if len(value) > 0 {
+			// We only expect headers to be single valued
+			dest.Header.Set(name, value[0])
+		}
+	}
+}
+
 func fwdResponseHeaders(src *http.Header, dest http.Header) {
 	log.Debug("fwdResponseHeaders")
 

From 325c61541309468a57032b80f127fb2f25ff43cd Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Fri, 31 Jan 2020 14:42:04 +0000
Subject: [PATCH 330/648] Add fdb and chart repo containers to helm chart

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 .../templates/fdbserver-deployment.yaml       |  2 +-
 .../console/templates/chartrepo.yaml          | 39 +++++++++++++++++++
 .../kubernetes/console/templates/service.yaml | 20 +++++++++-
 deploy/kubernetes/console/values.yaml         |  2 +-
 4 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 deploy/kubernetes/console/templates/chartrepo.yaml

diff --git a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml b/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
index d5dd4d7295..68c8c27a2c 100644
--- a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
+++ b/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
@@ -28,7 +28,7 @@ spec:
         image: {{ template "fdb.image" .Values.fdbserver.image }}
         env:
         - name: FDB_COORDINATOR
-          value: {{ template "fullname" . }}-fdbserver.monocular.svc.cluster.local
+          value: {{ template "fullname" . }}-fdbserver.console.svc.cluster.local
         - name: CLUSTER_ID
           value: chartdb:erlklkg
         ports:
diff --git a/deploy/kubernetes/console/templates/chartrepo.yaml b/deploy/kubernetes/console/templates/chartrepo.yaml
new file mode 100644
index 0000000000..7a77592bb3
--- /dev/null
+++ b/deploy/kubernetes/console/templates/chartrepo.yaml
@@ -0,0 +1,39 @@
+---
+{{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major .Capabilities.KubeVersion.Minor)}}
+apiVersion: apps/v1
+{{- else }}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Deployment
+metadata:
+  name: stratos-chartrepo
+  labels:
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "stratos-chartrepo"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: "stratos"
+      app.kubernetes.io/component: "stratos-chartrepo"
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: "stratos"
+        app.kubernetes.io/instance: "{{ .Release.Name }}"
+        app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+        app.kubernetes.io/component: "stratos-chartrepo"
+        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+        app: "{{ .Release.Name }}"
+    spec:
+      containers:
+      - name: chartrepo
+        image: docker.io/kreinecke/suse-fdb-chart-repo:latest
+        imagePullPolicy: {{.Values.imagePullPolicy}}
+        command: ["/chartrepo"]
+        args: ["serve", "--debug=true","--doclayer-url=mongodb://{{ .Release.Name }}-chartrepo:27016"]
+        ports:
+        - name: endpoint
+          containerPort: 8080
\ No newline at end of file
diff --git a/deploy/kubernetes/console/templates/service.yaml b/deploy/kubernetes/console/templates/service.yaml
index 84f2ec0bad..39b300c2ed 100644
--- a/deploy/kubernetes/console/templates/service.yaml
+++ b/deploy/kubernetes/console/templates/service.yaml
@@ -93,4 +93,22 @@ spec:
     targetPort: mysql
   selector:
     app: "{{ .Release.Name }}"
-
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: "{{ .Release.Name }}-chartrepo"
+  labels:
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "stratos-chartrepo-service"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+spec:
+  type: ClusterIP
+  ports:
+  - name: chartrepo
+    port: 8080
+    targetPort: 8080
+  selector:
+    app: "{{ .Release.Name }}"
\ No newline at end of file
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index 9503103673..f7056b377e 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -69,7 +69,7 @@ console:
   migrateVolumes: true
   
   # Enable/disable Tech Preview
-  techPreview: false
+  techPreview: true
 
   # Use local admin user instead of UAA - set to a password to enable
   localAdminPassword: ~

From 4fcb262d19f268e6153a891926272e7f42d16b6c Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 31 Jan 2020 15:18:51 +0000
Subject: [PATCH 331/648] Kube preview panel: Address UI review feedback

---
 .../kubernetes-resource-viewer.component.html | 20 ++++++-------
 .../kubernetes-resource-viewer.component.scss |  5 ++++
 .../kubernetes-resource-viewer.component.ts   | 29 ++++++++++++-------
 .../kubernetes-pods-list-config.service.ts    |  2 +-
 .../kubernetes-service-list-config.service.ts |  2 +-
 custom-src/frontend/sass/custom/suse.scss     |  4 +--
 .../dashboard-base.component.scss             |  2 +-
 .../sidepanel-preview.component.scss          |  5 ++--
 .../sidepanel-preview.component.theme.scss    |  7 +++--
 9 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html
index ed9dc6e239..bf33ad118f 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html
@@ -1,15 +1,15 @@
 <app-sidepanel-preview title="{{title}}">
 
   <div *ngIf="resource$ | async as resource">
-    <app-metadata-item class="chart-details__item" label="Name">
-      {{ resource.metadata.name }}
-      <a *ngIf="hasPodMetrics$ | async" [routerLink]="podRouterLink$ | async">View
-        Metrics</a>
-    </app-metadata-item>
-    <app-metadata-item class="chart-details__item" label="Kind">{{ resource.kind }}</app-metadata-item>
-    <app-metadata-item class="chart-details__item" label="API Version">{{ resource.apiVersion }}</app-metadata-item>
-    <div class="resource-preview__side-by-side">
-      <app-metadata-item label="Created">{{ resource.metadata.creationTimestamp | date:'medium' }}</app-metadata-item>
+  <div class="resource-preview__side-by-side">
+    <app-metadata-item label="API Version">{{ resource.apiVersion }}</app-metadata-item>
+    <app-metadata-item label="Kind">{{ resource.kind | titlecase }}</app-metadata-item>
+    <div class="resource-preview__metrics">
+      <a *ngIf="hasPodMetrics$ | async" [routerLink]="podRouterLink$ | async">View Metrics</a>
+    </div>
+  </div>
+  <div class="resource-preview__side-by-side">
+      <app-metadata-item label="Created">{{ resource.creationTimestamp | date:'medium' }}</app-metadata-item>
       <app-metadata-item label="Age">{{ resource.age }}</app-metadata-item>
     </div>
 
@@ -27,7 +27,7 @@
       </div>
     </app-metadata-item>
 
-    <app-json-viewer #viewer [json]="resource"></app-json-viewer>
+    <app-json-viewer #viewer [json]="resource.raw"></app-json-viewer>
 
   </div>
 </app-sidepanel-preview>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.scss b/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.scss
index fd6b556a25..a427bd0214 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.scss
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.scss
@@ -27,4 +27,9 @@
 
   }
 
+  &__metrics {
+    align-items: center;
+    display: flex;
+  }
+
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
index 419ba086e8..79a5d1f5c8 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
@@ -39,31 +39,40 @@ export class KubernetesResourceViewerComponent implements PreviewableComponent {
     this.title = props.title;
     this.resource$ = props.resource$.pipe(
       map((item: any) => {// KubeAPIResource
+        const resource = {} as any;
+        const newItem = {} as any;
 
-        const newItem = { ...item };
-        newItem.age = moment(item.metadata.creationTimestamp).fromNow(true);
+        Object.keys(item || []).forEach(k => {
+          if (k !== 'endpointId' && k !== 'releaseTitle' && k !== 'expandedStatus') {
+            newItem[k] = item[k];
+          }
+        });
+
+        resource.raw = newItem;
+        resource.age = moment(item.metadata.creationTimestamp).fromNow(true);
+        resource.creationTimestamp = item.metadata.creationTimestamp;
 
-        newItem.labels = [];
+        resource.labels = [];
         Object.keys(item.metadata.labels || []).forEach(labelName => {
-          newItem.labels.push({
+          resource.labels.push({
             name: labelName,
             value: item.metadata.labels[labelName]
           });
         });
 
         if (item.metadata && item.metadata.annotations) {
-          newItem.annotations = [];
+          resource.annotations = [];
           Object.keys(item.metadata.annotations || []).forEach(labelName => {
-            newItem.annotations.push({
+            resource.annotations.push({
               name: labelName,
               value: item.metadata.annotations[labelName]
             });
           });
         }
 
-        newItem.kind = item.kind || props.resourceKind;
-        newItem.apiVersion = item.apiVersion || this.getVersionFromSelfLink(item.metadata.selfLink);
-        return newItem;
+        resource.kind = item.kind || props.resourceKind;
+        resource.apiVersion = item.apiVersion || this.getVersionFromSelfLink(item.metadata.selfLink);
+        return resource;
       }),
       publishReplay(1),
       refCount()
@@ -102,7 +111,7 @@ export class KubernetesResourceViewerComponent implements PreviewableComponent {
   }
 
   private getEndpointId(res): string {
-    return this.kubeEndpointService.kubeGuid || res.endpointId || res.metadata.kubeId;
+    return this.kubeEndpointService.kubeGuid || res.endpointId || res.raw.metadata.kubeId;
   }
 
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
index 53b11afa32..c3e06816c0 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
@@ -50,7 +50,7 @@ export abstract class BaseKubernetesPodsListConfigService implements IListConfig
         text: pod.metadata.name,
         sidePanelComponent: KubernetesResourceViewerComponent,
         sidePanelConfig: {
-          title: `Pod Summary: ${pod.metadata.name}`,
+          title: pod.metadata.name,
           resourceKind: 'pod',
           resource$: of(pod)
         }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
index 87563e8ff3..4c9626accc 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
@@ -32,7 +32,7 @@ export abstract class BaseKubernetesServicesListConfig implements IListConfig<Ku
         text: service.metadata.name,
         sidePanelComponent: KubernetesResourceViewerComponent,
         sidePanelConfig: {
-          title: `Service Summary: ${service.metadata.name}`,
+          title: service.metadata.name,
           resource$: of(service)
         }
       })
diff --git a/custom-src/frontend/sass/custom/suse.scss b/custom-src/frontend/sass/custom/suse.scss
index 15eb4bc408..481d1f7236 100644
--- a/custom-src/frontend/sass/custom/suse.scss
+++ b/custom-src/frontend/sass/custom/suse.scss
@@ -34,9 +34,7 @@ body.stratos {
     display: initial;
   }
 
-  .page-header .mat-toolbar.mat-primary,
-  .sidepanel-preview__header
-   {
+  .page-header .mat-toolbar.mat-primary {
     background-color: #fff;
     color: #333;
   }
diff --git a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
index 3f94a6f71b..d212cac3c2 100644
--- a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
+++ b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
@@ -25,7 +25,7 @@ $app-header-height: 56px;
 
   &__side_preview {
     top: $app-header-height;
-    height: calc(100vw - #{$app-header-height});
+    height: calc(100vw - #{$app-header-height} - 1px);
   }
 
   &__page-tabs {
diff --git a/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.scss b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.scss
index 7fe9dc8d97..a560f4bd10 100644
--- a/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.scss
+++ b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.scss
@@ -3,7 +3,7 @@
   flex-direction: column;
   height: 100vh;
   &__preview {
-    height: calc(100vh - 56px);
+    height: calc(100vh - 57px);
 
     .sidepanel-preview__header {
       flex: 0 0 48px;
@@ -28,7 +28,7 @@
     h1 {
       align-self: center;
       font-size: 20px;
-      margin-left: 24px;
+      margin-left: 12px;
     }
 
     .sidepanel__close {
@@ -40,7 +40,6 @@
 
   &__content {
     flex: 1;
-    overflow-x: hidden;
     overflow-y: auto;
     padding: 12px 15px;
     position: relative;
diff --git a/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.theme.scss b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.theme.scss
index c84bed25dc..fbf9126dcb 100644
--- a/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.theme.scss
@@ -1,9 +1,12 @@
 @mixin app-sidepanel-preview-theme($theme, $app-theme) {
   $primary: map-get($theme, primary);
+  $background-color: map-get($app-theme, app-background-color);
+  $darker-background-color: darken($background-color, 4%);
+  $foreground: map-get($theme, foreground);
 
   .sidepanel-preview__header {
-    background-color: mat-color($primary);
-    color: mat-contrast($primary, 500);
+    background-color: $darker-background-color;
+    border-top: 1px solid mat-color($foreground, divider);
   }
 
   .sidepanel-preview__content {

From fc9a061aad9cefbce35fcf541dd3d6585bbb2300 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 31 Jan 2020 15:23:31 +0000
Subject: [PATCH 332/648] Trivial change to bump travis

---
 .../frontend/app/custom/kubernetes/store/kubernetes.effects.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 0d8fdc036d..7a9db00fa5 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
@@ -304,7 +304,7 @@ export class KubernetesEffects {
         first(),
         map(endpoints => Object.values(endpoints).map(endpoint => endpoint.guid))
       );
-    let pKubeIds;
+    let pKubeIds: string[];
 
     return getKubeIds.pipe(
       switchMap(kubeIds => {

From 60f56d3a583f53ce227dc1605c6850468999ee6a Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 30 Jan 2020 18:03:33 +0000
Subject: [PATCH 333/648] Show icon in workloads list card, fix console error
 when hover workload chart key

---
 .../helm-release-card.component.html               |  2 +-
 .../helm-release-card.component.ts                 | 14 +++++++++++---
 .../service-icon/service-icon.component.html       |  4 ++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
index c0165e6ab0..bc478082ea 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
@@ -5,7 +5,7 @@
       <div class='release-title--icon'>
         <img *ngIf="icon; else noIcon" [src]="icon" (error)="loadImageError()">
         <ng-template #noIcon>
-          <!-- // TODO: RC -->
+          <!-- // TODO: RC. missing icon & svg via backend? -->
           <mat-icon fontSet="stratos-icons">service</mat-icon>
         </ng-template>
       </div>
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts
index b449a2d894..c7fee58694 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts
@@ -1,5 +1,5 @@
 import { DatePipe } from '@angular/common';
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input } from '@angular/core';
 
 import { CardCell } from '../../../../../shared/components/list/list.types';
 import { HelmRelease } from '../../workload.types';
@@ -9,7 +9,7 @@ import { HelmRelease } from '../../workload.types';
   templateUrl: './helm-release-card.component.html',
   styleUrls: ['./helm-release-card.component.scss']
 })
-export class HelmReleaseCardComponent extends CardCell<HelmRelease> implements OnInit {
+export class HelmReleaseCardComponent extends CardCell<HelmRelease> {
 
   public status: string;
   public lastDeployed: string;
@@ -23,6 +23,13 @@ export class HelmReleaseCardComponent extends CardCell<HelmRelease> implements O
       this.status = row.status.charAt(0).toUpperCase() + row.status.substring(1);
       this.lastDeployed = this.datePipe.transform(row.info.last_deployed, 'medium');
       this.icon = row.chart.metadata.icon;
+      // TODO: RC Check out when updated helm is merged
+      // console.log(row);
+      // this.icon = '/pp/v1/chartsvc/v1/assets/aerospike/aerospike-enterprise/logo';
+      // this.icon = 'chartsvc/v1/assets/ntppool/geoip/logo'
+      // chart summary - /pp/v1/chartsvc/v1/assets/charts/aerospike/logo-160x160-fit.png
+      // chart icon // https://hub.helm.sh/api/chartsvc/v1/assets/aerospike/aerospike-enterprise/logo
+      // yaml url `/pp/v1/chartsvc/v1/assets/${chart.repo}/${chart.chartName}/versions/${chart.version}/values.yaml`;
     }
   }
   get row(): HelmRelease {
@@ -34,7 +41,8 @@ export class HelmReleaseCardComponent extends CardCell<HelmRelease> implements O
     super();
   }
 
-  ngOnInit() {
+  loadImageError() {
+    this.icon = null;
   }
 
   loadImageError() {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/service-icon/service-icon.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/service-icon/service-icon.component.html
index 3ac11f72d7..714d7a1758 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/service-icon/service-icon.component.html
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/service-icon/service-icon.component.html
@@ -1,4 +1,4 @@
 <div class='service-icon' [ngClass]="{'service-icon__padding': addMenuPadding}">
   <mat-icon *ngIf="!image" fontSet="stratos-icons">service</mat-icon>
-  <img [src]="image | safeImg" *ngIf="image" (error)="imageLoadError()">
-</div>
+  <img [src]="image" *ngIf="image" (error)="imageLoadError()">
+</div>
\ No newline at end of file

From f724d0f85ada359455cbd400edf5fbea1552225c Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 31 Jan 2020 14:38:48 +0000
Subject: [PATCH 334/648] Tweak pod node/namespace column visibility

---
 ...etes-namespace-pods-list-config.service.ts |  4 +++-
 ...ubernetes-node-pods-list-config.service.ts |  4 +++-
 .../kubernetes-pods-list-config.service.ts    | 21 ++++++++++++-------
 .../helm-release-pods-list-config.service.ts  |  5 ++++-
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts
index 3947bdc70f..98830df419 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts
@@ -17,7 +17,9 @@ export class KubernetesNamespacePodsListConfigService extends BaseKubernetesPods
     kubeId: BaseKubeGuid,
     public kubeNamespaceService: KubernetesNamespaceService,
   ) {
-    super(kubeId.guid);
+    super(kubeId.guid, [
+      BaseKubernetesPodsListConfigService.namespaceColumnId,
+    ]);
     this.podsDataSource = new KubernetesNamespacePodsDataSource(store, kubeId, this, kubeNamespaceService);
   }
 
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts
index 67d16aff96..be0d52354d 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts
@@ -19,7 +19,9 @@ export class KubernetesNodePodsListConfigService extends BaseKubernetesPodsListC
     kubeId: BaseKubeGuid,
     public kubeNodeService: KubernetesNodeService,
   ) {
-    super(kubeId.guid);
+    super(kubeId.guid, [
+      BaseKubernetesPodsListConfigService.nodeColumnId
+    ]);
     this.podsDataSource = new KubernetesNodePodsDataSource(store, kubeId, this, kubeNodeService);
   }
 
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
index 53b11afa32..749e7b481e 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
@@ -25,18 +25,23 @@ import { KubernetesPodsDataSource } from './kubernetes-pods-data-source';
 export abstract class BaseKubernetesPodsListConfigService implements IListConfig<KubernetesPod> {
 
   static namespaceColumnId = 'namespace';
+  static nodeColumnId = 'node';
   public showNamespaceLink = true;
 
   constructor(
     private kubeId: string,
-    showNamespaces = false
+    hideColumns: string[] = [
+      BaseKubernetesPodsListConfigService.namespaceColumnId,
+      BaseKubernetesPodsListConfigService.nodeColumnId
+    ]
   ) {
-    if (!showNamespaces) {
-      this.columns = this.columns.filter(column => column.columnId !== BaseKubernetesPodsListConfigService.namespaceColumnId);
+    if (hideColumns && hideColumns.filter.length) {
+      this.columns = this.columns.filter(column => hideColumns.indexOf(column.columnId) < 0);
     }
   }
 
   columns: Array<ITableColumn<KubernetesPod>> = [
+    // Name
     {
       columnId: 'name', headerCell: () => 'Name',
       cellComponent: TableCellSidePanelComponent,
@@ -62,6 +67,7 @@ export abstract class BaseKubernetesPodsListConfigService implements IListConfig
     //   cellComponent: KubernetesPodTagsComponent,
     //   cellFlex: '5',
     // },
+    // Namespace
     {
       columnId: BaseKubernetesPodsListConfigService.namespaceColumnId, headerCell: () => 'Namespace',
       cellDefinition: {
@@ -70,20 +76,21 @@ export abstract class BaseKubernetesPodsListConfigService implements IListConfig
       },
       sort: {
         type: 'sort',
-        orderKey: 'namespace',
+        orderKey: BaseKubernetesPodsListConfigService.namespaceColumnId,
         field: 'metadata.namespace'
       },
       cellFlex: '2',
     },
+    // Node
     {
-      columnId: 'node', headerCell: () => 'Node',
+      columnId: BaseKubernetesPodsListConfigService.nodeColumnId, headerCell: () => 'Node',
       cellDefinition: {
         valuePath: 'spec.nodeName',
         getLink: pod => `/kubernetes/${this.kubeId}/nodes/${pod.spec.nodeName}/summary`
       },
       sort: {
         type: 'sort',
-        orderKey: 'node',
+        orderKey: BaseKubernetesPodsListConfigService.nodeColumnId,
         field: 'spec.nodeName'
       },
       cellFlex: '2',
@@ -151,7 +158,7 @@ export class KubernetesPodsListConfigService extends BaseKubernetesPodsListConfi
     store: Store<AppState>,
     kubeId: BaseKubeGuid,
   ) {
-    super(kubeId.guid, true);
+    super(kubeId.guid, []);
     this.podsDataSource = new KubernetesPodsDataSource(store, kubeId, this);
   }
 
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-config.service.ts
index 7f433fd139..ba0c1ddd4c 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-config.service.ts
@@ -14,7 +14,10 @@ export class HelmReleasePodsListConfig extends BaseKubernetesPodsListConfigServi
     store: Store<AppState>,
     helmReleaseHelper: HelmReleaseHelperService
   ) {
-    super(helmReleaseHelper.endpointGuid);
+    super(
+      helmReleaseHelper.endpointGuid,
+      [BaseKubernetesPodsListConfigService.namespaceColumnId]
+    );
     this.podsDataSource = new HelmReleasePodsDataSource(store, this, helmReleaseHelper.endpointGuid, helmReleaseHelper.releaseTitle);
   }
 

From b4265950c2075d3eaa58b6a986040c4a992e5da0 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 31 Jan 2020 14:39:18 +0000
Subject: [PATCH 335/648] show cluster link in workload summary

---
 .../helm-release-summary-tab.component.html    |  5 ++++-
 .../helm-release-summary-tab.component.ts      | 18 +++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
index 386b6ce31c..423db018e1 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
@@ -17,7 +17,10 @@
             {{ release.chart.metadata.appVersion || '-' }}
           </app-metadata-item>
           <app-metadata-item class="chart-details__item" label="Namespace">
-            <a [routerLink]="createNamespaceLink(release.namespace)">{{ release.namespace | titlecase }}</a>
+            <a [routerLink]="createClusterLink()">{{ getClusterName() | async }}</a>
+          </app-metadata-item>
+          <app-metadata-item class="chart-details__item" label="Namespace">
+            <a [routerLink]="createNamespaceLink(release.namespace)">{{ release.namespace }}</a>
           </app-metadata-item>
           <app-metadata-item class="chart-details__item" label="Release Version">{{ release.version }}
           </app-metadata-item>
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index c7bcd49c39..be62056bf6 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -9,8 +9,9 @@ import { RouterNav } from 'frontend/packages/store/src/actions/router.actions';
 import { HideSnackBar, ShowSnackBar } from 'frontend/packages/store/src/actions/snackBar.actions';
 import { AppState } from 'frontend/packages/store/src/app-state';
 import { combineLatest, Observable, ReplaySubject } from 'rxjs';
-import { map, publishReplay, refCount, startWith } from 'rxjs/operators';
+import { filter, first, map, publishReplay, refCount, startWith } from 'rxjs/operators';
 
+import { endpointsEntityRequestDataSelector } from '../../../../../../../../store/src/selectors/endpoint.selectors';
 import { GetHelmReleases } from '../../../store/workloads.actions';
 import { HelmReleaseChartData, HelmReleaseResource } from '../../../workload.types';
 import { HelmReleaseHelperService } from '../helm-release-helper.service';
@@ -202,4 +203,19 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
       namespace
     ];
   }
+
+  public createClusterLink(): string[] {
+    return [
+      `/kubernetes`,
+      this.helmReleaseHelper.endpointGuid,
+    ];
+  }
+
+  public getClusterName(): Observable<string> {
+    return this.store.select(endpointsEntityRequestDataSelector(this.helmReleaseHelper.endpointGuid)).pipe(
+      filter(e => !!e),
+      map(e => e.name),
+      first()
+    );
+  }
 }

From 0f39fb37de196636920a48c3c3de21c6898bc93b Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 31 Jan 2020 15:18:04 +0000
Subject: [PATCH 336/648] Use previous pod phase status code to colourise new
 expanded state status

---
 .../kubernetes-pod-status.component.html      |  2 +-
 .../kubernetes-pod-status.component.ts        | 35 +++++++++++--------
 .../kubernetes-pods-list-config.service.ts    |  5 ++-
 .../services/kubernetes-expanded-state.ts     | 29 ++++++++++-----
 4 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html
index 2afc9145e7..49403a09ed 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html
@@ -1 +1 @@
-<div class="pod-status {{ style }}">{{ row.status.phase }}</div>
\ No newline at end of file
+<div class="pod-status {{ style }}">{{ row.expandedStatus.status }}</div>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
index cdb370f571..5fac2be40f 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
@@ -1,7 +1,8 @@
 import { Component, Input } from '@angular/core';
 
 import { TableCellCustom } from '../../../../../shared/components/list/list.types';
-import { KubernetesPod, KubernetesStatus } from '../../../store/kube.types';
+import { KubernetesPodExpandedStatusTypes } from '../../../services/kubernetes-expanded-state';
+import { KubernetesPod } from '../../../store/kube.types';
 
 @Component({
   selector: 'app-kubernetes-pod-status',
@@ -22,20 +23,24 @@ export class KubernetesPodStatusComponent extends TableCellCustom<KubernetesPod>
     }
   }
 
-  updateStatus() {
-    let status: string;
-    switch (this.row.status.phase) {
-      case 'Running':
-        status = 'success';
-        break;
-      case KubernetesStatus.PENDING:
-        status = 'warning';
-        break;
-      default:
-        status = 'tentative';
-        break;
-    }
-
+  private updateStatus() {
+    const status = this.convertStatus(this.row.expandedStatus.status);
     this.style = `border-${status} text-${status}`;
   }
+
+  private convertStatus(status: string): string {
+    // TODO: RC Run through
+    if (!status) {
+      return 'tentative';
+    }
+    // Everything is fine
+    if (
+      status === KubernetesPodExpandedStatusTypes.RUNNING ||
+      status === KubernetesPodExpandedStatusTypes.COMPLETED) {
+      return 'success';
+    }
+    // Everything else... probably some kind of issue (still coming up or failed)
+    // Includes pods with init containers in anything other than terminated with exit code = 0
+    return 'warning';
+  }
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
index 749e7b481e..b26c7f98ad 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
@@ -20,6 +20,7 @@ import {
 import { KubernetesPod } from '../../store/kube.types';
 import { defaultHelmKubeListPageSize } from '../kube-helm-list-types';
 import { createKubeAgeColumn } from '../kube-list.helper';
+import { KubernetesPodStatusComponent } from './kubernetes-pod-status/kubernetes-pod-status.component';
 import { KubernetesPodsDataSource } from './kubernetes-pods-data-source';
 
 export abstract class BaseKubernetesPodsListConfigService implements IListConfig<KubernetesPod> {
@@ -106,9 +107,7 @@ export abstract class BaseKubernetesPodsListConfigService implements IListConfig
     {
       columnId: 'expandedStatus',
       headerCell: () => 'Status',
-      cellDefinition: {
-        valuePath: 'expandedStatus.status'
-      },
+      cellComponent: KubernetesPodStatusComponent,
       sort: {
         type: 'sort',
         orderKey: 'expandedStatus',
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-expanded-state.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-expanded-state.ts
index 2d1e7c3464..27dbc5e627 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-expanded-state.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-expanded-state.ts
@@ -18,6 +18,17 @@ export enum KubernetesNodeConstants {
   NodeUnreachablePodReason = 'NodeLost'
 }
 
+/**
+ * List of known status that could be returned from `createPodExpandedStatus`
+ */
+export enum KubernetesPodExpandedStatusTypes {
+  RUNNING = 'Running',
+  UNKNOWN = 'Unknown',
+  TERMINATING = 'Terminating',
+  INIT = 'Init',
+  COMPLETED = 'Completed'
+}
+
 export class KubernetesPodExpandedStatusHelper {
 
   static updatePodWithExpandedStatus(pod: KubernetesPod): KubernetesPod {
@@ -56,19 +67,19 @@ export class KubernetesPodExpandedStatusHelper {
       } else if (!!state.terminated) {
         if (state.terminated.reason.length === 0) {
           if (state.terminated.signal !== 0) {
-            reason = `Init:Signal:${state.terminated.signal}`;
+            reason = `${KubernetesPodExpandedStatusTypes.INIT}:Signal:${state.terminated.signal}`;
           } else {
-            reason = `Init:ExitCode:${state.terminated.exitCode}`;
+            reason = `${KubernetesPodExpandedStatusTypes.INIT}:ExitCode:${state.terminated.exitCode}`;
           }
         } else {
-          reason = `Init:${state.terminated.reason}`;
+          reason = `${KubernetesPodExpandedStatusTypes.INIT}:${state.terminated.reason}`;
         }
         initializing = true;
       } else if (!!state.waiting && !!state.waiting.reason && state.waiting.reason !== 'PodInitializing') {
-        reason = `Init:${state.waiting.reason}`;
+        reason = `${KubernetesPodExpandedStatusTypes.INIT}:${state.waiting.reason}`;
         initializing = true;
       } else {
-        reason = `Init:${i}/${pod.spec.initContainers.length}`;
+        reason = `${KubernetesPodExpandedStatusTypes.INIT}:${i}/${pod.spec.initContainers.length}`;
         initializing = true;
       }
     }
@@ -98,15 +109,15 @@ export class KubernetesPodExpandedStatusHelper {
       }
 
       // change pod status back to "Running" if there is at least one container still reporting as "Running" status
-      if (reason === 'Completed' && hasRunning) {
-        reason = 'Running';
+      if (reason === KubernetesPodExpandedStatusTypes.COMPLETED && hasRunning) {
+        reason = KubernetesPodExpandedStatusTypes.RUNNING;
       }
     }
 
     if (!!pod.deletionTimestamp && pod.status.reason === KubernetesNodeConstants.NodeUnreachablePodReason) {
-      reason = 'Unknown';
+      reason = KubernetesPodExpandedStatusTypes.UNKNOWN;
     } else if (!!pod.deletionTimestamp) {
-      reason = 'Terminating';
+      reason = KubernetesPodExpandedStatusTypes.TERMINATING;
     }
 
 

From 5185fc43adde17ffde2c21dbf5a67ec845590b19 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 31 Jan 2020 15:46:26 +0000
Subject: [PATCH 337/648] Better spacing of stats in kube summary

---
 .../kubernetes-summary.component.html                    | 2 +-
 .../kubernetes-summary.component.scss                    | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
index e325858058..bde46f1443 100644
--- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
@@ -10,7 +10,7 @@
     <app-entity-summary-title *ngIf="endpointDetails$ | async as details" [imagePath]="details.imagePath"
       [title]="details.name" [subTitle]="details.label"
       info="Kubernetes Node Version: {{ (kubeNodeVersions$ | async) }}">
-      <app-tile-grid class="kube-details__metrics" fit="true">
+      <app-tile-grid class="kube-details__metrics">
         <app-tile-group>
           <app-tile>
             <app-card-number-metric [textOnly]="true" link="/kubernetes/{{kubeEndpointService.baseKube.guid}}/nodes"
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss
index b831614ad5..9e2618c67e 100644
--- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss
+++ b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss
@@ -5,8 +5,13 @@
   &__metrics {
     max-width: 350px;
 
-    &--namespace {
-      padding-left: 0;
+    app-tile {
+      flex: 0;
+      &:nth-child(2) {
+        display: flex;
+        flex: 2;
+        justify-content: center;
+      }
     }
   }
   &__header {

From 41038a5cdf1f88aaba918f203e3aac29c70c1c8b Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 31 Jan 2020 16:06:24 +0000
Subject: [PATCH 338/648] Don't show pod count in node capacity cell

---
 .../kubernetes-node-capacity.component.html           | 11 +----------
 .../kubernetes-nodes-list-config.service.ts           |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.html
index 4e8dd0b6ae..77e3a8a6c8 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.html
@@ -1,13 +1,4 @@
 <div class="kube-node-capacity">
-  <div class="legend-items-container">
-    <div class="legend-items">
-      <div class="legend-item" tabindex="-1">
-        <div class="item-value">{{ row.status.capacity.pods }}</div>
-        <div class="item-label">Pods</div>
-      </div>
-    </div>
-  </div>
-
   <div class="legend-items-container">
     <div class="legend-items">
       <div class="legend-item" tabindex="-1">
@@ -25,4 +16,4 @@
       </div>
     </div>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
index d3b391bca3..c4dedf94e2 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
@@ -72,7 +72,7 @@ export class KubernetesNodesListConfigService implements IListConfig<KubernetesN
     {
       columnId: 'capacity', headerCell: () => 'Capacity',
       cellComponent: KubernetesNodeCapacityComponent,
-      cellFlex: '4',
+      cellFlex: '3',
     },
     // Display labels as the usual chip list
     // {

From 8327e1e39c49bb673aacbfad70e3479f9737f72e Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 31 Jan 2020 16:34:10 +0000
Subject: [PATCH 339/648] Fix dashboard enabled obs & hide namespace list
 dashboard link

---
 ...bernetes-namespaces-list-config.service.ts | 21 ++++++++++---------
 .../services/kubernetes-endpoint.service.ts   | 18 +++++++++-------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
index 4553399f16..f27e232e8b 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
@@ -31,16 +31,17 @@ export class KubernetesNamespacesListConfigService implements IListConfig<Kubern
       },
       cellFlex: '5',
     },
-    {
-      columnId: 'view', headerCell: () => 'Dashboard',
-      cellDefinition: {
-        getValue: () => 'View',
-        getLink: (row: KubernetesNamespace) => {
-          return `/kubernetes/${this.kubeId.guid}/dashboard/overview?namespace=${row.metadata.name}`;
-        },
-      },
-      cellFlex: '3',
-    },
+    // FIXME: Hide link until the link is fixed
+    // {
+    //   columnId: 'view', headerCell: () => 'Dashboard',
+    //   cellDefinition: {
+    //     getValue: () => 'View',
+    //     getLink: (row: KubernetesNamespace) => {
+    //       return `/kubernetes/${this.kubeId.guid}/dashboard/overview?namespace=${row.metadata.name}`;
+    //     },
+    //   },
+    //   cellFlex: '3',
+    // },
     {
       columnId: 'pods', headerCell: () => 'Pods',
       cellComponent: KubeNamespacePodCountComponent,
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
index ca25a5eb28..0e8e7c9a1d 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { combineLatest, Observable } from 'rxjs';
+import { combineLatest, Observable, of } from 'rxjs';
 import { filter, first, map, shareReplay, startWith, switchMap } from 'rxjs/operators';
 
 import { GetAllEndpoints } from '../../../../../store/src/actions/endpoint.actions';
@@ -187,14 +187,16 @@ export class KubernetesEndpointService {
       first(),
     );
 
+    const kubeDashboard$ = this.entityServiceFactory.create<KubeDashboardStatus>(
+      this.kubeGuid,
+      new GetKubernetesDashboard(this.kubeGuid),
+    ).waitForEntity$.pipe(
+      map(status => status.entity.installed)
+    );
+
     this.kubeDashboardEnabled$ = kubeDashboardEnabled$.pipe(
-      filter(enabled => enabled),
-      switchMap(() => this.entityServiceFactory.create<KubeDashboardStatus>(
-        this.kubeGuid,
-        new GetKubernetesDashboard(this.kubeGuid),
-      ).waitForEntity$.pipe(map(status => status.entity.installed))
-      ),
-      startWith(false),
+      switchMap(enabled => enabled ? kubeDashboard$ : of(false)),
+      first(),
     );
   }
 

From 99e7deb1f522f9c99d18f120c1b3a635c1d90eb9 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 31 Jan 2020 16:39:10 +0000
Subject: [PATCH 340/648] Fix merge issue

---
 .../helm-release-card/helm-release-card.component.ts         | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts
index c7fee58694..6e7c609bd5 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts
@@ -45,9 +45,4 @@ export class HelmReleaseCardComponent extends CardCell<HelmRelease> {
     this.icon = null;
   }
 
-  loadImageError() {
-    console.log('sdfdsf');
-    this.icon = null;
-  }
-
 }

From e468688c1c9f78cbda6797069d641086a3fcfd59 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 31 Jan 2020 17:20:45 +0000
Subject: [PATCH 341/648] Fix unit tests

---
 ...bernetes-resource-viewer.component.spec.ts | 25 ++++++++++++--
 .../helm-release-card.component.spec.ts       | 17 ++++++++--
 .../dialog-confirm.component.spec.ts          | 33 +++++++++++++++++--
 3 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts
index 64416a2edd..5df03aea30 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts
@@ -1,5 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
 
+import { SidePanelService } from '../../../shared/services/side-panel.service';
+import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../kubernetes.testing.module';
+import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
 import { KubernetesResourceViewerComponent } from './kubernetes-resource-viewer.component';
 
 describe('KubernetesResourceViewerComponent', () => {
@@ -8,9 +12,26 @@ describe('KubernetesResourceViewerComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ KubernetesResourceViewerComponent ]
+      declarations: [KubernetesResourceViewerComponent],
+      imports: KubernetesBaseTestModules,
+      providers: [
+        KubernetesEndpointService,
+        KubeBaseGuidMock,
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: {
+              params: {
+                endpointId: 'anything'
+              },
+              queryParams: {}
+            }
+          }
+        },
+        SidePanelService
+      ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts
index e4aab8b8dc..2ab9dddcc0 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts
@@ -1,5 +1,8 @@
+import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
+import { HelmRelease } from '../../workload.types';
 import { HelmReleaseCardComponent } from './helm-release-card.component';
 
 describe('HelmReleaseCardComponent', () => {
@@ -8,14 +11,24 @@ describe('HelmReleaseCardComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ HelmReleaseCardComponent ]
+      declarations: [HelmReleaseCardComponent],
+      imports: KubernetesBaseTestModules,
+      providers: [
+        DatePipe,
+      ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(HelmReleaseCardComponent);
     component = fixture.componentInstance;
+    component.row = {
+      status: 'status',
+      info: {
+        last_deployed: null
+      }
+    } as HelmRelease;
     fixture.detectChanges();
   });
 
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 74e5af0ec9..34186fa3b8 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
@@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+
 import { RequestInfoState } from '../../../../../store/src/reducers/api-request-reducer/types';
 import { CoreModule } from '../../../core/core.module';
 import { DialogConfirmComponent } from './dialog-confirm.component';
@@ -74,16 +75,44 @@ describe('DialogConfirmComponent', () => {
     expect(confirm.disabled).toBeFalsy();
   });
 
-  it('should show warning icon if is critical', () => {
-    expect(element.querySelector('mat-icon')).toBeFalsy();
+  it('should not show warning icon if critical', () => {
+    component.data = {
+      ...component.data,
+      message: {
+        textToMatch: '',
+      },
+      critical: true,
+    };
+    fixture.detectChanges();
+
+    expect(element.querySelector('mat-icon').textContent).toEqual('warning');
+  });
 
+  it('should show warning icon if text to match', () => {
     component.data = {
       ...component.data,
+      message: {
+        textToMatch: 'text',
+      },
+      critical: false,
+    };
+    fixture.detectChanges();
+
+    expect(element.querySelector('mat-icon').textContent).toEqual('warning');
+  });
+
+  it('should show warning icon if is critical', () => {
+    component.data = {
+      ...component.data,
+      message: {
+        textToMatch: '',
+      },
       critical: true,
     };
     fixture.detectChanges();
 
     expect(element.querySelector('mat-icon').textContent).toEqual('warning');
+
   });
 
   it('should disable confirm button if not matching text', () => {

From baa21c7308ac74b32651ef3e412361109ccb570b Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 31 Jan 2020 17:38:49 +0000
Subject: [PATCH 342/648] Fix unit tests

---
 .../condition-cell/condition-cell.component.spec.ts         | 3 ++-
 .../kubernetes-node-ips.component.spec.ts                   | 3 ++-
 .../kubernetes-node-labels.component.spec.ts                | 3 ++-
 .../kubernetes-node-link.component.spec.ts                  | 3 ++-
 .../kubernetes-node-pressure.component.spec.ts              | 3 ++-
 .../setup/setup-welcome/setup-welcome.component.spec.ts     | 6 +++---
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts
index 53a631d61d..bd66e4e87b 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts
@@ -33,7 +33,8 @@ describe('ConditionCellComponent', () => {
         containers: [],
         nodeName: 'test',
         schedulerName: 'test',
-        initContainers: []
+        initContainers: [],
+        readinessGates: []
       }
     };
     fixture.detectChanges();
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts
index 807f5cb307..b55778d677 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts
@@ -34,7 +34,8 @@ describe('KubernetesNodeIpsComponent', () => {
         containers: [],
         nodeName: 'test',
         schedulerName: 'test',
-        initContainers: []
+        initContainers: [],
+        readinessGates: []
       }
     };
     fixture.detectChanges();
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts
index 3ca174e16f..f36e05a977 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts
@@ -34,7 +34,8 @@ describe('KubernetesNodeLabelsComponent', () => {
         containers: [],
         nodeName: 'test',
         schedulerName: 'test',
-        initContainers: []
+        initContainers: [],
+        readinessGates: []
       }
     };
     fixture.detectChanges();
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts
index 4a6acb5d3e..1672ebc38b 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts
@@ -36,7 +36,8 @@ describe('KubernetesNodeLinkComponent', () => {
         containers: [],
         nodeName: 'test',
         schedulerName: 'test',
-        initContainers: []
+        initContainers: [],
+        readinessGates: []
       }
     };
     fixture.detectChanges();
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts
index 4f543f9596..c5e1367b72 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts
@@ -34,7 +34,8 @@ describe('KubernetesNodePressureComponent', () => {
         containers: [],
         nodeName: 'test',
         schedulerName: 'test',
-        initContainers: []
+        initContainers: [],
+        readinessGates: []
       }
     };
     fixture.detectChanges();
diff --git a/src/frontend/packages/core/src/features/setup/setup-welcome/setup-welcome.component.spec.ts b/src/frontend/packages/core/src/features/setup/setup-welcome/setup-welcome.component.spec.ts
index 50db0d4bce..071ba41d53 100644
--- a/src/frontend/packages/core/src/features/setup/setup-welcome/setup-welcome.component.spec.ts
+++ b/src/frontend/packages/core/src/features/setup/setup-welcome/setup-welcome.component.spec.ts
@@ -2,9 +2,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
-import { StoreModule } from '@ngrx/store';
 
 import { TabNavService } from '../../../../tab-nav.service';
+import { generateBaseTestStoreModules } from '../../../../test-framework/core-test.helper';
 import { CoreModule } from '../../../core/core.module';
 import { MDAppModule } from '../../../core/md.module';
 import { PageHeaderModule } from '../../../shared/components/page-header/page-header.module';
@@ -27,12 +27,12 @@ describe('SetupWelcomeComponent', () => {
         PageHeaderModule,
         ReactiveFormsModule,
         MDAppModule,
-        StoreModule.forRoot({}),
+        ...generateBaseTestStoreModules(),
         NoopAnimationsModule,
       ],
       providers: [TabNavService]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {

From 0f6364949f8c2010e899a272090d8742a22dded0 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 31 Jan 2020 19:15:10 +0000
Subject: [PATCH 343/648] Add workloads icon

---
 .../app/custom/custom-routing.module.ts       |   4 ++--
 .../assets/fonts/stratos/stratos-icons.eot    | Bin 32610 -> 32930 bytes
 .../assets/fonts/stratos/stratos-icons.svg    |   7 +++++--
 .../assets/fonts/stratos/stratos-icons.ttf    | Bin 32432 -> 32752 bytes
 .../assets/fonts/stratos/stratos-icons.woff   | Bin 19128 -> 19328 bytes
 .../assets/fonts/stratos/stratos-icons.woff2  | Bin 16244 -> 16348 bytes
 6 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/custom-src/frontend/app/custom/custom-routing.module.ts b/custom-src/frontend/app/custom/custom-routing.module.ts
index 98c658e695..c4d44e5613 100644
--- a/custom-src/frontend/app/custom/custom-routing.module.ts
+++ b/custom-src/frontend/app/custom/custom-routing.module.ts
@@ -25,8 +25,8 @@ const customRoutes: Routes = [
       reuseRoute: true,
       stratosNavigation: {
         text: 'Workloads',
-        matIcon: 'apps',
-        // matIconFont: 'stratos-icons',
+        matIcon: 'workloads',
+        matIconFont: 'stratos-icons',
         position: 64,
         requiresEndpointType: KUBERNETES_ENDPOINT_TYPE
       }
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 66d2201189b0cf959512e07827f019bfa4b02a61..7d8b8a1547bd2a1125204927868622ea5930e6a5 100644
GIT binary patch
delta 964
zcmXX^O>7fq5Ph?@*Sq%mXB|7SAw)5;NSw8m#3`mK2pswYhf<;h5($CH$_Z<TjkmEy
z(*t!7haL(@VG*j-infSTBBcjcr~;+rfLczRzz9@Dw1-y8rA1Y*amTK|)$F`C^Ynf5
z?c3kC>FyOlTw4PEt}csd`{d?>spZU#z!%qsG5{q2bRT)|{SR<+`E^fq*H;4{arGV`
zZXBN+N{y$_uu7U`)l9Can@4}Sw8s1~Yfj}ZReHJ3>*MAw-gBl=yp#4nVSa#V$k59s
z*Zs_6oF$|1>A8~=cYgp}y+C#|Kc~-ze*Ur!oaZ*u`TSf}x4jm6xbQX?V)<fa@t)B5
zi}`6jaIsLz>F;dC#(@jZxc^g8Uo?du{fB}1Tg-be>czR4eP<sr=R@d`St?hie{-A!
ziWR{2y}2-Fes+KVeV}@R^<Q%k2kI~Ce>U^0Q?W$zCJZ<?TM9=vhro}G5n&h3SiQn!
zTBzL-j)*%2h}ePCkf9<754@c1a3aLAEve7)$%kponvjptSnXSRGFuga#uly8ZAiSk
zADtLL0#`Fjp@85N=tB<)l2a0#ODf55OS0SWlLV(tavHFC$?mY(4LE!xDh|;IkOCJJ
zm%$eyO!J^L!!y!&JRa^+RgXuOfp{XG&<3MDT?65Mwc4q620J`{kKgB&6<Kk+cn&G5
zc8FoELyd-_yZ7u>yY`NToE-gK&c6Obl<EwrK`-^SdT$-1QBtF-MuXe+KxB1gWo0HD
zPKCqkfr!$fG|)<f1}L-rd@!PtwxnqpO{;6X4h17>14_^x2@u>t_jbLhwB8usbx%Fm
zoILA0@GpD<-=pop|2b)`<@Zsx_D9|%2d%Ol*7SvSWhgdOVnNfVtkpd~R*fUjVqgnA
z*x$wuHsxp=i(H>#C&?~zWe0L?EbwQ%+{QLc;PW=Nv*u+RJJ|n!+L%ozU%9fNS4!pN
z`CRE@nP1kg^SkBIk>p4+HJlo@#KLuT6eCEsB86daEPu1pS}&v({-0W_v4M#7Mh;Qd
d3Kk#IyS1mq4Z$UUQd*cVl=Rth?S}cx`yacB!)5>g

delta 629
zcmX|6OK1~O6g_W}3`vbijJj!~gf?IoM%z@TR0ZQV1%H7eLP^vy&9BbSWGE3eQT)`6
zmiV^PidqmCr4XqLtKvpQ!Ig|zxG16sQm`9$R=uf%^SJMxbKZIH+_`sI`23rRS`C=3
z)<wyQiSgxn{8sQrm+~E8n*oFp`}Q9|y}q!q7P{6wOzHzbd~|eZYb+_HcLDAsxlUzN
z*%*8^HbZ=tJj0nWGfX;t`XX(<oRL>2rNA5Fzlg5S%VmS~0P!!>-Ff9)?xpu&1!(gE
z>9>WfJQ7S>mw<ee&ZR;jTaz6NLI^0(B}59US-E@s&ky3;D6pjH8F|(D$Qq#dkk02-
zxnc-U0(*eb5#nJ@R<nyUYo8OpO8$96FPpEAe4;=l4mj=`rL0k%+c5`J*OC7Y6{CXn
z(fZcv&FRRy6`?szy@hB_&^QoiIS4UqK#GTji!9Zc6cVC~!HLvuPZtC4^z3DEp7R`L
z@y27%&<WmAoC+<EPvE3~=TG<rdZrceKSAJDv7g@YjT(%uUpe#4z2)mlYMLKXcGtQQ
z{5Kv&tj2a5yWm5@#v<v*XfEdTkkXFRHWtu^3pREjiR(6YlE<>Ki~eTG#v<C8w``VV
zQ!hu08C@&W#=UB%TZ;BYV?DhCykEWPmk>oCRSZ4o#Xx<kgD<HP-=u|Enh$DE8!r8Y
K(0G6LgYPdRuamw2

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 b0bbaa2628..6e4b814e31 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 Wed Mar  6 19:07:45 2019
+Created by FontForge 20180321 at Fri Jan 31 19:10:36 2020
  By Neil MacDougall
 </metadata>
 <defs>
@@ -18,7 +18,7 @@ Created by FontForge 20180321 at Wed Mar  6 19:07:45 2019
     bbox="-0.595506 -64.5 512 448"
     underline-thickness="25"
     underline-position="-76"
-    unicode-range="U+005F-F140"
+    unicode-range="U+005F-F141"
   />
 <missing-glyph horiz-adv-x="187" 
 d="M17 0v341h136v-341h-136zM34 17h102v307h-102v-307z" />
@@ -242,6 +242,9 @@ t62.5 -150.5q0 -27 -11 -62.5t-27 -58.5l-31 31q6 8 10.5 19.5t8 23.5t5.5 24.5t2 22
 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" />
+    <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" />
     <glyph glyph-name="wrench" unicode="wrench" 
 d="M501 39q10 -9 10.5 -21.5t-8.5 -21.5l-51 -51q-9 -9 -21.5 -8.5t-21.5 10.5l-197 230q-32 -17 -68 -17q-60 0 -102 42t-42 102q0 21 6 42l83 -83q10 -10 23 -10t23 10l50 50q10 10 10 23t-10 23l-83 83q21 6 42 6q60 0 102 -42t42 -102q0 -36 -17 -68z" />
     <glyph glyph-name=".notdef" horiz-adv-x="187" 
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 763020a02d43ade8b5528da1ab29d90687761e88..cfaa5d45553aa721d769d7ea6314b819fbb67cc6 100644
GIT binary patch
delta 999
zcmY*X&u<e~5dLQUYu8@?SjSFm8lsq3B+lAO;)GBEZJbb&9H0b}fP{#X#R;3lc5Gsc
zh68n^9(rhd>7uGqD<mqoBvM<+6+*2j9IC<}0IrG<3S5x5fP}a~%-HdTx0*NK_sx6z
z=FPm{-_ffol|TTzJekoxIy!ain{Rs(07Y4C9sBIaD89!h%*UCB$0m+XZUtWc%sj(<
zaBOmVWcN>9pEJJ>SnnR6?1@hd&LjYFp5t?=td<|Yckx%||L~eKsf)#S)_Gj0{oi#y
zua~k{2R-*$IK<qqYlS=qJj}!FMLl!r{Pf9R{s8RlK=R4rf;R8}_s0sb#9<6BvS8X0
z+L(XLJiM4Ku3Z<ZFPWd^1J^RSly=}ncmh~{!12Gc+FD+?<rx9eSD3f2Xr=7J-2T}+
zEbt+8C!Z@6Pd~Lx1KA>A`Ype@kpJ@L!J9y7iZ}4h>-9qAzshsQcyuOOyUC8PRZ?ba
zWfS-_F(T~73}bU$+u3bL8wR+9T5$!&WjaTz<t-Ysek8z(T{sH~3Vd+F#oi1X{FpJK
zVux`;9HC+3ig=8M%g@BwWXTFtU(hD~0Fe*&pc!3=;;Y2E-z(SzI_e}rw26XkT_Fh$
zQF7=W5@9omHXSAxnJp%>4vU+tvc;-<NroM=UFReTr#WAm<Me4F5(%^@iqk1cKqMN8
zs@<WsmaagjQfgM3eN9e})8lqYvLrj~oQD`vnydk}NeTHwd-m>ATK4t(ZET$_wvNsr
ziZ}ZepNl%`v4KyipOlcIQulVn8{FL3*q93h;(@?zZ%}TMtEf9d6_nV1*d0_zU02nF
zs#a7UL%yI=h3s<#`T070j_pcqr7@&mYd!VnlgU~4p*L^~e2)*>6f@rH`zcu-Sj>}!
zHn~&AjiuXiPq-&nyE0qSSY943Md00OHMhWtgAHuqri?eRmGx8HWHL*v>_V!61uo;|
z1~%a&zHVSMulc`$E&McIH!wGy+=b$*R?HP*OR3ySfhVIoy+`Wri}l6gz42aSD*c_(
uk3Pie7Dq4Gj92LsMj{iUq;W3u7acCQX737i>5JTII+N4p3+2bT2d?*ss=><u

delta 694
zcmY*VOK1~O6g_W}hUv$)Rts9A6q`jCM*Cx=e%q=^L23iB2qm#j(>6(+Nya3Uh}yWY
z>PAE!xDZi6h2o+V0`0>3+o<SDkl2NbE)+outqWaQ;%PG*=P~!4bMC$GepZWOc1`3U
z0MyYq(dhG??z`D!`~<`vs&4=B6F%I*Ve(#bk3Y~KT-vsBpWGnV{K0`9_f+#B`4hnP
ztUtJ~Eue*u0&0N%a}iUwdf!gWkk2w^Ffx&8q|Pt7OjA8(MRVo@t@b^IzvT5%J#EoZ
zOa6_w8Z|DCy{S5x1uCk5@Q2u_K2jGhTm_<w^lLE+jwQtn#Fzt5%*<pTohh!6cd%f}
zNJjL^OP<X@e473RQ_ot;d~FXfK0@A@&~xVK^30Z(6s|F0!Ahnx?@oPXL8A+BJhoD!
z*5us5Ibd=t6FB+CzEJp5_(6=trytk%SGv~`+XUNz!s8$k*ohFab3-d-S6~-9xI#UX
zfV?7xMJT@{{H`*=sF3VYn*`*DdQ5c5X|+#u<^QNdXJtJ0(7kr!Hil{r{YH(#=l-j%
zNKbq}9}2}S!Sqk#FVwx?H+l`rd*{1z&8RDN&KjF=z{X{$hTq06>I3XqILoOtVA#eA
zDsb7x4g_%B#!ki*Y+S}kS8eP<gQ!YpQhFwt_QoU0M4Cnp8oO1^+wN^^Y3-C##;qC+
tUbORXLkn8bDSsI|<PlS=EKP>uYiyU@<@F*g@0!o^!Ne;i@4oQ4`X9(Bnv?(l

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 de4006ed06f9b0d1d259e89d6afa827daf0eaa0e..6b34667c0a91e835c926f081fb3d05ff2ea6d501 100644
GIT binary patch
delta 16613
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

delta 16461
zcmY+rV{m3o8!ddtwr$%J+qP{_?Cdxb+qP{?Y)&*uo>-HKt%<(8^_}zM^sZICuhpwp
z_pa(6-L?A)$^h$30|UI2rKCV$psym=2}1v09XRs;$Nzi(e~XlqhT@kl_lw2<0^tt|
zhf`?@NhuIW8ucqC{{kf_0VF7`qOAU<bNGsxzrekVdzCA#t||7V;{<^qxIiH2YQk_@
zJ!N$kfE@$^hx`)Be!)bA+fdlt(e(QlxAql#fIwh+GGm_g=AQ1PAQ1e(7l-f#<S&4%
zzFRwfnW=o4-F{J6`P`@z)~0S>eWhW)n*T3QtsQ)<zPkMYfxZcVK!!7eu=18RmZlb8
z-l-rE0Al?TbE7-_4z&4VzsQlVnDh&j5If+6HjeJzUz7P71oUM9=31!xdG6qB{-uMT
z`Qm#22LwM#bVpO~uYti1zhct=0lWiB#L3jr5(E<epWne(+g!A!`rUVDH+K+7qVmhr
z_-pbd;{f-j_jgyzug>riUqat6<Oa6$w|nQBn^>5bfcC{r`_OLQxQ+1+vv5Ur#}=1j
zS^s@*e7<Jk;-P@L2oX(eLGn+C(f>y;@C*ot5@QU1b|4}u#3G8IVWL8S0y!Z+Kww|a
zhG1SGys!FebdU|G6%+>orM!Xh;S6~1eu6;@j)fw|lXA((Vd9Q}B>NF@Qxw5N;5u`H
z!9dDZZ0#wV;M8CrDG(5HkVbZ>bS<h7ys!ZCAMf0YUbsZUbsysAkKU^m_LlfdzMkst
znt!#Y)!_I6n5>-(q0m;pw*Geg;t0(e6Ll3y6i+fj(hwNHqC@sr!;NYVDRzuX{YByG
zpw@hD$V8?~F22vl{d@5j@<wr_Yb{pxjog22T}3~TxE?=SstGbfizRfU*I>Q0t@``{
zpWc~_tM|{R_s>t_gUo5%SHxQO{K?wib^FBgY=JQ@piRDmZ=Iwj@LISjRH_3@-rA|f
zzDthXE9LsGz%xvK0JfG_yP?f~+rZ_!tnt{pR6xZ0)7xkMCr|1;o97d<KSq1g19Rh(
zM}uV$oH(ic<}K?09KyG9g517Q1*=M++$D=n;SkFu#x@p*)8P+2Mkc+%SP%Gy33`fX
za!2I=O_Rd68hW=^z1gg)oBwRu45qA?CI`HTrd6<)p>|rzEDSRpd4|F?4s8u#5TeuU
zs%WW(Abv$3YE|iEIg$iP+JvdLEacbyqI0ooNeYMkJyj=Hb`;CP98Z!iB_&k~3}?CW
zF6kRy#IZ1$YE{MRp2$(X)2K~W)Fs_QHEE7boA{l)6=x{;rfGHcwEy?B<GB2~agPAe
zIDRVtqJ2+mvp>ZFa!9>l&3eu&fmJfy;)pLrL$`ZO!%)3pz0f{8FwTYgI(B%<6gp_Y
zWO}Hr7FLHXo7V13VQEB>+HOA!n5ohx>|JmAm@PH(=Xn@=3h23v>e!LhdLVFT&|P(U
z!@6v1TBs{it0p(WDwR^BC^I7~m_|miT&ypnT#-qH!nA1;a8t>DsS{Hfqp}MdPE3>w
zH?st@!YRUQldDrxfzK9g(UcZ_qHpZZkn`c+Fp^WoZCE{hh7tYQr&aR+sBO3B$aQV#
zJh7+-)<q~rjXPh{-#5lp(>l7Hi+B}8qo-Ml#UFQCqCI0Q4>%X^9tqEZBrl=GlU_@M
zXk4rVSkmrY1Lu@u*8Y2=m65rnWE9Ey50{&^%SJRYT&jnIe{!qqE<cjkcfLQbPQ!{}
z%f@L+*yA}>m{TkCqHTK&*ioeXxRgqWA=s3z^Eb0`cb`z=KP@EL<JgQKmT$sqe_?1N
zr}^Hv>C7MrEr7C`Il!i5A}DZY{#;AgKj)qA2QLisq*AUwkh1&7*nMtHnCPL#jYxHB
zdD=9wv58{2=o_56N|xaev1`!39|HUw`hy=7UfHUd5HpDu=c-K40I#e82E=>21HoH0
zWu2NH!f5{zt*)fwCHMTGZ2XyyXA@Y1T||9fX=XBYUuiggxx!I_Xq9QTatz@UnySBE
zSQdKk%g+?X`RFaeK-gX^AS?bmLFMNf6rcU*(~}n@UBG9G_V)cQx`)#n^>g9#_oDVX
zD6>!AgTsVWwJJ3`;Av99@@lXzDvpDzndSg`hjfQ%3>$plx6AM@I9v&qN&1{x;$c}M
zGOb{v@3v8lVx=lpU6gYT^WUwSL_fOaGfHt@XfHFoB90uabwYiM{{P-B%S{QEJBjbm
z(~k_T+mE^*JsigQJZG4wB}hYp7E_@>_>WR!;R88q!b>LXfHC_!6E&46w@P{WfQj6Y
zN;`X^NqSymd*<1<OFlP4>lEI4w?6~HNy!Je5$I3r5HT>=IDf1OIF{5?Fb*D?7B?pX
zEB=oB{FZWWILz%Zt>F$OIU5k*Lwh+rD>70R9kXeN>{iyv(UAjnx=D3<@@^FW-j0{5
zH~ae%E@<4>3%G0+cyFuB5ucSm^12*gS(>|hG1`N0aYAU}zI$<cJ6l+%yYl)war(zT
z$A!IM9&3NZ@bN!;g<e0LhvkX`zDM0`%cgi1cM|y&*dR;lzm?50KV%hDsVt{KX;HcK
zY8-?U{B{V-Ld-TIj$|3r7P!+`ZaQRH4$x5g@RFgnhyZDJ)C%g}^!GSMmUWfPLu}r@
z0rUA}e%gt@iHJWxeNXOn)CT5$E<prm6gNr!g(@L=pU`>A88rMY*)<ljzow(Q1ZD4T
zA%L<scXsi+=E1kYC}HDl3ji|?H6HFuIfrf~k!OCSB;wascA;$~MbKE{mKmiZ?c&-n
z0$&b5+e`^Ug9K`iAB-1?BDLDVP^QKItj>^~6f+v9M$9zi;Jw)D690YaBOdk~75ayz
zx!0KzaKah&0I|t6264S=f!gR9c6QHNxxhk48dcmHPaxYnAR%io={_!tU(^cq@#je>
zpoBmN+dSR5sC#@!amURt4N_FahO24PoxBSTnwJ(!jtKaB;b1K5b3BdGRaNuwZ_d*|
z-RRWg?n&Lq%cE^)_1_hlx$tx&eU2GX`v`ZpeJS1bfuU3$6FqpKZ)jGxsgYD=aZR?;
zFQ}Xd-z*V$n#m0FFeUWpLU<VK3~ZDck4CEsYKVV#0Xt2l23s);vX;LICMuBk(nw8{
zW?(PnJ79os<?L&hm;KiX#sfPEecm_wF*v}8{A={Ze^Zy97#M;7j7QJzBCNBCH+}cg
zaE!bykLOte|Lu<|1B3Sg>P?y}A1gnXOWbdFaeN~7$P`S;e@|<hBK1v0toK7BN$t_T
z{Tft#96!f<#N-$E7$W>@f*=<>>|~P1l@;zo-;M}G{rs^rKepU&Q836Q+TG9s{Gfxf
z*R_~FCnd&l;q^F86KK!$;y@s5tmlx1JjMqXLwzBL%?QeHVvT}`5-&7`u--9gpFFpJ
zUeEH03nCvbFSdK`8RWzRcu@Uzub|aa6N(f#MWlbgVTVdzK7=Yf2?BAq%iG3X1972}
z-yi|QWk@94U~<UBfj{rZ=Lu_9Ee%aOW}hMN(61He)903tP>%wBBz`PCW5nhO&BN!Y
zkB4wyOZvBM^|q)9ndF*KqiU-a|HUb#21B0Ecch`pxHv~*H@y^A^}72{{mk_$jS7Yp
zvo^JAxw8Fjv>Ch*HPUdjj{~Bc5l?$h_#+_1K&~)({1d(UA75mZZO(AYzpQ4c+tysz
z@=&Se`B>HkM3=41!AKj<8{z0Hd@k|LGJ>bi9LJfGS@d5Rq|E~c{xQGLcboB+Hx>Qy
z!Zhw0C-xR3`y^5GST(`-q_GeCJHK%Kmt+kLwrt;`DU6WMw88{kQyDZ4naa542LzAA
zR>Da%qMaszQof0zN{VJc<sVB1OBd2kQ|UT6wpw)A>|=r3Nyp=Oi(*O`4*FdehbY1>
zu+Afdlw;`fXkayr#ssT3aiGO>8qDlz$R1HKs=9dNXozf4R3(>27u#(V!^2-!54hw$
z#+`IMNcJj-yd!V!|J&rG(evh41=7OH;G8<y9PD%Lhts?Q2bcM+KdadC@r_Yc5!a&W
zn0MpR5K*+zwvaz@s*!`~!>fab^#+KT>nTXFWUqn{%+xlco99l9$a56EvrSxb!(blg
zz>EqdQPBciy~T}E=~6N*WmSVx8q0&4+2j{!<Bnv&NsJk8y)&ixM5QJ70H|XJ^BcB&
zz@f?IH`w}JvJO=88CB{{*<O~Z*D_>(b>8QtGnW68xZmbO0vblDP9D)2@f^%^b$FPf
z<G?;z(#<rilw>@PUu7w7bv3aOB|ITL%qAK)E_fM&#I4rb00}cSl`Slo9i?{T4kXpk
zf~yA_fkhjJnzKE1B8@va5VH|p-ES^6yLb}zGV`(EzD!FNIPf4h)SH=av+!|dkAPs0
zAdH`N7FCE_CjFFij8P$9<Rb(tr^?5XGzL*YqFdOq_HM8wMYJUX8RhRENI87A7_6(5
z(q##8gi6B}|2>{rj_-t9b77e&b!lQRby`6}D3S}nvn38}^+@>vj6<1WGnfv!1Tit6
zpD9ofG^F2kxzjJe62xB>%4tzW$gIT&yWn;PfUmm3Ep|b5EXBfk!SvYFUR#vzS8g<h
zi?vyZN=s318-yuo(u+A~Y?4jsZ><YKnF^6`FK<dHIgZ&1x^{Yy@o?04z2RTkVOSwM
zm2Kv2jJ%o5Dw1UadK+Da^Kr+kOf)k`V&i)A3CD?yzEvy**kXn#;Y(9a0d-~pbc_}W
zEsBrpPIl@C7J;6%LmV!2p=+OSp)?7w=&&-Q<Qj%c3S)gN2!amK3aAa{38P3XBh&~{
zV8sv)b7u<4or<+~$aD`gIV`3>uY6{uc#5iV^1Yvn0_v&&I4+G)r6JWa4Z(VTG1x$N
z0O{2c^PtYh#)CFE&Pj^eE=&zmwZMQW-G+eDl@&6WkY>or98RT|TIGWr|GZGZ*}Z!9
z6otx==fvqj?b1++WOp?P0X+Wh=9LC34W@`ZsBlWw0e^RVJSbjNO$(|iTEz1^qxZ*4
zfe86tHyS12>$Sce*)<HeTd6~U9Nh=LZ%;;bO((k8Nj^n5hsHTbR+VxrnsyB$ma3Wn
z4qk9Ow&J?hnWb-==DF8LFH_1Ot%vBu5(OHWLe6M?+huqWN^>QtGmAx-avAaUE2pqL
zw#0l(>B=K|s$Id@`kUE>gtiHtm6YQ&BiX~)UI8FJ4i$Ms3lC0leT-g8OniC~q&;0G
zRDRhyp%uI%?WDR&4Bh#&<+t%=FY%`%#(J+D1HWx#*TB4Y<Jd|OOzU#zHtA3Jh~{!!
z*0saB)U;tM<!h$-#{TA>hGL6uuF6PQHb&V7y4o0Ko^>9WfS@Ei5E!Cei@nQ1cZ8$L
z!4Yt#z=3&zFCJ}8I;HBd(mUs_ywbpi@^ZxWXCwZ?7)8W=0IPupWPnqT29wPDfevP(
zuF67o-4Za}7xsP1V~&F|2`5pmn;}cR0nz;Asv_S50|CeBqb@y<p!dbN#bM-!AU$Eh
z{+Mz1{Uu6YmC1=!zd>Cj)Lpg<g!~^Qi8#Pz!Iy=3qbE4LCf}pPxO?ffFJ@<L?JqZG
zs?8l67#`~*KKTH->w`Oe*0n>;{PL4OEE$?c$H{GYA*eH4XiFq%W-@an5CH*=E#a2m
zuj1xGkI8BG=YMma)nSGP9_~JA&AzSr|3$Cz12ViG@fVHXHqsOg(Lz4bCVuUYU?l*t
z9LakEnmA_sil3`>US~g_6ANvq5zP3v2`U?^p46x3O*a~l^?*ns5#lEh|Cmw})+1~3
zgS0G9#^ltm4(7xx+TF=*Rvo#}3;v^*S--476NWx<;;MWe8Lhs(awC)m=&eSAO?an^
zvU<;_4^OSDGHqGvvDJ%SUlyG9D}LZr={wcmeM2L7=Zmt5^e8!VtRs`pIH33SBx|xM
zdKb4*K#)rhD>h|9pJ?m53^=*lO1nU+2O>^$8$)ijLs8|S!EQVHE_;kuoenoVC4nl-
zdS!-xqvV3ocpQ_^q=ddekMqtsqxmcHIX`O$&>s4&C;W(q#?E487WuV4K^S;Lk<o!J
z`;J=~fzDpf#H@8&M;!>>d_Uv)wJR*dXv^V<gI)KN(fU^yiclNx)`rg$D8i7C5TDWZ
z0#|QzO#SD=f{x#kw_PxciTXm?%+FbIHPpAz-h=0CzoCA#$Cv2>yCp>+!MgiI`|M%G
zh^77W@xq>xMc$#8Un*@P=?^eU9AQJeM;H<q;&$H`;>~S!jXcQP;9M20ud-&-5faGf
z0{ko6@jGD>?&Q$?i(PK>a8WfxUB-=Iyd}?ez7QtZag%jz-z3{UFxQN9m~gfK;lktX
zdUq3dS8UHBJfLgk@lB+3hT=m-b>L^ldc6JGYE}*JWgDbTcciQ06Cr?3Q*P~3zG5Ci
zRV9;3B`FD3d0p)qcT+q?ahIlvCRtoPwd!A5lN($YL_ENqJ3V8bzN@R<n8xZs^gzB(
zrjQaNIvmolW8CO@;9O;aARoB1A@9lgKDOh&pj126Xfy8V2h>=40lO^5wN!~UQcaZX
zve)Tio^e+_he&FaOTdzPxzEGYZw~vKV`3wp>*s~CQBQk2Q(sfpVs0%uoICL>i&T*?
z3%>Fc$=kSC>GXe6(1))=Ljg^@+~%bTt|mb-`x?TL&Lgn}oJdxhW<n}thE(#ri4$BM
zu<|Csgy9$7Iic&av=3WMjd;`s#u#-f_gFW7=IFEDz$q8ViUB!Qcniru5B)_-bu7#%
zo(*B|K(QmF`2|j0xRB8Yb#prAjn=${ut7iGSs!%WV0rxVJh{&D+5|#YF2j&vep<X!
zetRF$<S>8YE5#gd7;sq(O?6Z(RW`q~82N+lU7hxV#JSJHG;kbOTR6n+BY%DTRSdo=
z_ObgOAbu!g5P)gQmtKd=F=gV8{CCRAKd4mF{x4%|r%D7>Z`XH|T|6^Zp(i5*Oi+Ae
z4qO<qy*bgOFZa45xsa7|`Sv%f_e`6hmpv?@RZjfRG_aVgZcC@KL6LOpzxrs+h^mPr
zOe3^1`l{z_`O+?-IW%yHxrVyDKDQG|PEP~Do;?ehxd0)7zK{3OUgTW9K)~&N=(MyF
zA+HPJiObV9L?kjJk&d2$&3xPO<CT3Ye%<<?!x>8O_@=0)D2K94rEfl%*^Zd;kfEUx
zUF&mT+$gtQTKX$f=$QCK7QR?=QbhuxdaWEf<p0qvRO40140}G_5+fMWoDBFCWhOxa
z#y2SmhSK?%L|`UNd)LqvuDujf!vzIp{ZF%jc8@RXFs6?TEmm%$3mzN4A5d!INwuFN
z=Y(KSCo0K9Ag#!cC)Fxv=7@9i1UdO%7gAb@>A-4Iwuw1_(aa6&wU(_4F!wk{MgeY|
z5s&J?JUaBYAH+f!K30A`^Wly%l+i3~x}-bZGGhjNj`Pyr*x<bi*i3ghx``5N%6=XT
z3_z9HwR|?>c~jrbyWVHce@>mg+UqI|`dS@dSqE|jp7IIutQ2%>15e%?%&xEgPb6$K
zNcDT2wAsl3tSX{gj4fJXS3nFMS!J^r3ULtQVhTc(p;rb>X<rAfs(Q>ON4lf_*-Y~}
z0$n4MA5{Sfz8p11l;20KKV5=}B`r_tG%^i`tpAoo>W`s9=l*Br?OMd>4k$>Dg@K%v
zUgx3!Vw_t~GVJ;!3j7SCi@3IxwhP|?rjLhDE&Dbgk4H<}G|kSkL(#E?`Sn4_nr{qo
zoipw%YydK!&_BDDoPSiw$%JM+8lwE*H5;3C+ae=zCu)dqeOnSahj2e#afqo2g5-*l
zfO?Qv;-A>nYu~C=2c(0OaYcBTnQN^c-Xv1VUlc+FFo6|iob-w9B|3D7F|9@NFd{B5
zLBB8{R?f*5$9ISSI-Nt_xv;a(byUONG-J(0nag>FP8FrQI%@q1*)b+NEK!e3T>PRs
zq6j*uYGv#F-*!@;<1yFYp<^A0qjNORh~9v*AL?cJk9Z!C#)1-P^o$&u`&4QD^Nr)2
zvcH%y>@>Wkwu$}qkJwYd4w0y*4=<AT&Tl6HbLr{6t2ix=s%WK7oIU2O>6qrxv`56n
zI-SW;PXb<>ltcT`M`!<+Dbk=I3e$D%?~d$<>1GE!?g#@J3`q04m{6OpJ-OOUZJX84
zR<4|yU`s64>_@`0k)}cp$Kta~xz{<J$0qQ%6d(RwLs6vDfzkWAQf~m2Z;_NNf5RJI
zDx8X}t=#rltUB42`7s8XA>Ppk?UbZ@OG+u3BDt@VgM-s~o0FBmO1+2u#bZL8>fC^E
z{QFTp;2##(V*5Cmf<f*Dbe)_qXL*5EU-J03X6G+@p<m{aayOo*ukIB{f^~7`2UGj+
zEN3Kk@AQn*{VD!%N3Lsl^?pl*N97&3{a}kZR!TJa^gi$2?!-~!63mk27l7w(*kLS#
zUq`mCIrOb+ufgh4OQjivrW1S5J0g$zm1mIJjJn5iPHC24c|Ilzl;54ZXnLd^B}x3(
z7@D;SvEE2I-JT^Io0>u`oZ=}iDRE87-|L2nnj-j&x#@E<b(=uVD;bhS>U<|<RnEzm
z%P<Wk*~A#+>g3(ZnZo8R2!Do``h-qHnbvKK4dx7al5<?&xK{A#_gu_ko}-aDiq1Go
z-SYssu61COpMdcL*yn!CriW5X&hZ?L5fCoL&5TdDYJ^lIDpsr5LM>5g9;~oPeGe5D
zH@!yrIHn17{TzS1!G1#-&L#a=C-HX>ws!lRpX=x&$6b8Ma~}NsC}WxIcQs-UYY@4S
zZ^|Kjg=<^+4BHvD6t9hDd_kScmsXhy{1K44W%e2LPW}oHydpjJoNt^fuYHbQhQNbi
z7Q)l`e40SdKXblf;w3i*S3kSI;z|CH`i`roGX7X#CcC+Moks@kCRCq<ucZ?C#-h-1
zpEJXbc!uACr7k*UVHfQaXA4R0%(|kgaSTlW@3yB>KOQ|?wr5r~K5(oWQ{0E@Z`3&m
z8O0hm;vcmI6e6?4tm4s_bFgQc5lmrWH%}my$Ul=-NwBwtC#1;qL@}wIgd5n#9O;tf
zusAfCrq3c;v+PAqLY^Q#bPjlhFj0~Sc?-d#sE$PsUcO^K+P#pK8k9U^8^1e0VE2j4
zZS}ve{{8s3u?<RN`w9M%_zBz~6A-|V1f_fjfA}W=C_s$HDGcDonlaRg;7JuiN;<Uo
zOpIz>lTC==t0jiP4y|p(c}bEVf}o_cOoHMi{uDH7udy^`G`)X<zxq77om;PeJ!{HM
z1t!9CLW6<0s$^;eTA~KH`>&KLWAcppR}-cZeJyjCi8T1KR+tR4ed*_J@@j2MP16|^
zZTbjlDl$dIRH{}k>}4qlR9wK~aIkG_w>5e=Ei;Dvsj#R=!>?yF^8fM<|KeG=sNC-I
zhWswH@ul`ft&f{mNqd#yXqWSZmXg+EC2DY^?7wEsI-KY*YA)i0qN;5MeMT1DJFPTY
z3omF)Ad@N!2%DbH+qRd}VeS^gHka$l#3te0X1}{NQ&&l;mB#Js<Yoe#n1?H7iyEk&
zQIo0Vd*ou<WW{-GFa)C=lNsUY#;4AROeqUoOWyjE1<MYG8jTKxYD|U|%}J7<w*gQG
z(9lo_<uxXg?3X#o^dRK~(#zg<{oaWMtA;h6jE^F<wy=KXdhXMQ^#}X1vC|$Y^yvKz
zgeGYM_xbz#K=#kfb3Fj5sl=|imVQZW>wDmUe1)`{Z{ZmnMcjP=CDmE|e%ZXAz_`3E
z1`oKiUv*YG>oAvk@&H_Y*6(|F{2d29RjOh9bX#*2dD3riE2wCa$okMP14nygTO*SH
zo~~3}>5uT>hGh^_pacvP3PxlwFBx<da#(3~Zy3R1Jiix&=xG4!{(djyAgo^PzFuwr
zk`-T<ojx2lQ=v4!8^JCd6p4jkoN-Et{<Xu=p?i1HWJ+BON?XQu?Y>~|?EQWN>_TFE
zD<~~1^Yf!i7Bi-N3+(G&4?*x8j&G^!*>uzYJ%HS0lM-{_T~f}-NYyoOvLR@RX=gAV
z*pr3k*5J{8nOy;_uVmgKr4Cf2?Mi!As{)!;m@(@Pd_)oX(rl(_P4MI`W?eeObe0I~
zVnP|jN)*y?>SSuVEY~4n&RyweDw~;XIT8~PL>=>rW(rbLbombRE)qsN&_8=bRFr)h
zmX14rM!(f<oUPbt*Dn|1oZp)PR;%(JXAea1V>MqN`wXz<=`?U$T+VGd4+5fysKtj4
zrX+&U*1G}@Lp{3?*Mp(2`<VsDYkd6U#AB;RXoYo!t%C5<CQ0vz{IivPNToMtjVKMy
z1DyL2u7vVs!*_||ZvzJ&)B-Ttdw3&U;N+x8$>;n(=$>&=WF7FRQAuRpD;ZF@&JNx|
zrbfGHMgZ=RqSfCqMe5UBW>*<NA&<kERee!$kvE$;sk_;Iwm6YSGbt*S{*-HEC%sr-
zI}wY`GL#NJfH1r^9p}UMsX~N-5yZ9SMQ3_og3UaneoZR?KK&iustE3&GF<|7?Q`}c
z^&RGs>5=O($029SN;rhxGI*8(L}1QDiHNBb4kTlVI<`sl-BA6N7X3q-8q-o{R`uhh
z(!dH9q|J{h8wTzVZTakO4)&i#-iW<?vH;PzES5f17NlnzmPWPAZMiB<Ytpfn9PND4
z^4P6*a%6C-bQ|YZ!f-Zqa6-md`J4@Pe9;ibBs?}&nMm|up)#p`PzI*8OblmsoK}k{
z8=wKB0>f3DMLnuJ2{vj9Rf-mBRxDw?FT13;41S?S=(m!2qM}uTp{NdrIUz^{&5;@z
zSyOkiX0kD)S)u9ZRjifcw27Fr<c4Zel($|j0F`I83}>mPAdjjgo6%Nn+D1VmH%ezS
zU0Ur>De-JT=6J#-yL2RSDsy8wD-+VNLdE+Knti9K|5-S-3V9b3QXXyGO8#RwR79PQ
zP&qZRK?Yxv*fc%Gn4ZW~y;=fH5`^hNsk)3M28fI7qOgYji&*81)*JHAJJ5)BDQ<bS
zbW7G%u}qd!Ga!YhB|h|?z@k}zkiZ+?Cqh<^WkIt*{U?1xvxpijtAFUNINA}_g7py-
z&-AyxkL<f6eaaR+4nWK`A?%DFUw~#APmqj~EjnR(^D3$He%$VYkkuVH-S|nP&j<51
zeA|FRER>}bE+D5OODJJDSuFy_PZ-${Ly)Enmx+qV8@~!}q*9rz>i0d@;noGJinkZM
z0CL}(Nwb^>T%!c@l1oTD4K30g&(7e&d(cMjj|;`bDXDmh2oSFxQkwD)O`;ml5c@~S
z{`>y>Hw#1(lxaM>dzKOS-{{Tf*;YdjL~rB<D|9%O;ExCb9me5iI?|h?!RnW0`n%Q`
zR7Q3(&qK8E5G{4rg;}vKUj3m4XDF(3Qk8Lky7TtjOMi{)S_urne(;Ik;zpwG%8!mY
zQ`hbwtl##kxdEjMDC^OowtOF#HboyQ#UjiavKVg-SxLX=@_x(wX+bW^nqQcD;nUII
znw)g<LO-mjF5AC4W$AzWctUY#GY<WP|0FE13zo`ZRr`$&CyKw}1+m9HKSIE{C|aC^
zy!Lw(i8^{H1=0T8fjuKO<d>+Znsdoorljafp$jzTb0~1K4j)C1$rcqjM(%m>%qphN
zXHW*(|8~4lB*5OR>-*<<qLc7HIYHbU1a1ttqic?FsWHhVOe{+QHtviyMDX?a`S%}c
zzU{5NuIKBEoo12Vqno%!Y&a8pJhTbK8pt=rU2MHJ%tgC~Cm~xpeDQ<FD!y0N{X3fS
zFMF+p6Fq>q&fEo(7rJd{3e|N;xWc#;ZKz4`sA^lrqy}ALm6}C}B(+^0Uar#!n;<ow
zvjV}4hgEjtWTJNAoNf<~0o+xL$G@FFV+33GLecS#$?uUf!udFz`2<k$O9_9G|0N06
z={6}oUaxgZf@3v#m(d<%L-LZ}d8ZXl=#YGFu)G7?^5e&!4j<p%p5G)C-SvEQ=@kDE
zy%jLhx%M5&JVg0OZrw-pDq;yeEvA{1Fk%XMpHF@A_h++M-BqhK%X`Gv97w6&t(ygU
z5Z7dGSvFk+@3b&rNb!&4Ul}>`ObHbGv!}aFE1*#&oysMClc+6qwj7DgXyTTT#G%7Q
zZ7Kj-u~2To<9FDDA~0(YpeyG=`ebWutUGo}%Q4{wp0p`)5rf1d?E2U~5G4|<uu3_O
z9@Sre$tBg)qqjsuxn6+lT~aw7vZe1~-vqvKrzT%;urBu~a1Arx3tb|@aV>G3MOZI~
zn@Y2PEh}D#Pw$!S4=CgbOvLLL(Yi-A$7P^IP_MT-UFLftzDp$G^uEv1(7jA@DClhJ
zhq<iLX!l|wRE2KRiVlR|nTv!)LNk+ubw{_b=<G--E<26qh|!qW^1w243R7Ig-{3&P
z9ZQRv-~!l*hEunEWj5<vM%N6wYPGUTIj-boB(pP5T*Go&;>l(<?X-N03HLdnCt~2X
z!^nGoLHhS9ap2!U_3?P2@81FIc3wd)Ba*s*Hw6TkDQl0pTXHGUdnT0w^+YdquiNjh
zvt#7#TAk9FKmB-;FB2Z%&@Jk=X6darYxSwEjV#;QWg*JcgozRYa-$*KKZKAh8I;v@
z5|Vy-b$h#(8#rZj9GubLWTpL9RImY@78SJj3BN5>kI*=2|81AvztIMWN%+vm--A$%
zrT7o?wq9a+&ef1>k(uATbKr}N#}vB%o9)cqYO>h)6(g<k?k`O45LJ~O(Wof~P97yl
zWRVo*B7#esTy8K#q-4;)Q%uC4E|Fx$CK<hBFv4HS(|<)!$aq6I7O_}0LFWrV`E&d2
znscZQWthtulaq;kiXJ;6r=TzU{k$-0&~Mm^5{C^X?vm6B^$qH8YvU5%(wZ62a8BA0
zANPFkHzo2%+i-|DO5##5>A57u6q-_Mirh=9-=1>KW=E<XWqK+h%r~Eya%NvaXVN?$
zJ%v4!-?fB0$sGgNMvyV<F24kf<iH-?hq*f@^bRQB>Nve;ngnPbcXg{xi}EF>dX$Q>
z+KABkQx!W6#75;8HG?=pzYW?uGhtKR#q}?^_FTO?Ny4M=yb{p4nV0bQH~w-^QbI;z
z^L(5Mou*M{BsBcy`*%0E%c^2M%RzygR?WGTGnHgYI{0`$(hdF{Iynj;n0TKp(S`3c
zG{>MXkmHK2t~95A&bdg1#gh1Oy78m0#Ipi38M!8XKhbzIjZZNQri>MA;~m<={-Hwn
z;eJV)Mp;>eo6C^_B}`BIv+5mkSl~bH^ONPf;O!M`-b=*syc{JiOuv58^W$?p+}}fb
zOko89|J0S0bMpnJR<??OH;5Ot6O5>$u#5sCuZUaWToTu_or$<uLPZ^|kaU{dn>R9+
zE2;=+^Z4zc4D%gd;pnzWql@8itcXlKRJ6ex*sTV2Q0XR#FIC~`f3CFghNa&;@p|%N
zx0E>C9YZN=WRpFd57WzqC*2i=b58Qh_+81xAbP3x$G44N^9i;9dRF{P50*uCcvXyj
zO?qA#w5epDm9(KXIBaR`Mc1GblrH|67(e;Kqf2a|+SP&vpwQ`1NCo&%auO&YxoQwb
zZxAMI=*Q#FT(xU^N;qaUKjxa6Il9zu;fX^iL{mHr*f|%Pvp7_x9m7<`!onK;Z$MP4
zguwRu@NW}bLZomYl@d!7R9%BmTCbHXizaNi6G<H2XTDExV5k9Qp9}|u{|{EQXqg_y
z!)6jH8j>*fm^mp8N~rfPFGc0`Vh-P7Rh>9Ia`nm}+{r<p%kT<iw@<TX^uPt|!-()s
z<r15TQQCy&i5{ot49<5AW!IKggSYxvCjPM6z;SPJkW&E27JP7cTt7OGJU>^qx<GlC
z^?b?NY^i9z3k~SKzWj{(wi|Qv2DRjX=JC07PTw>4f&2>l3i%56$Z>wW&TzguvHE<#
zqND*S`!SOc_#7#84>7G6PG|fg-4XbFKoW4}c6EyB0kPH)cyqKN?02-No|9l91|hq^
zE^b3F56=Z~g%$DOHc1W{=0=}0wEvYqRJ7#mgk-iayzT7{CP*7{)%ZBa5&C@5?z^6v
zf4ficcXbg`hmU{FR~qCB#a@J?;zh8C%OpD!6SxVcG;iJ_lfNaGz9VSOag->w;LthT
z$7R5eMDKZptsjHvg>@M%>5y^w)#V63E;hMXufzg?tla;FPL(R*#^BIp6HB?U!;L;4
zB4;(eT4Ua9%DvI5QpDdB!JN0g9$9o*J-;Y$rBnrO$RMK7AofF~)8%;n)a@ua6e4lU
zSUgc=N@F=x&mOO1q*&NrN;<eJHsVmG@sGd5fE~hkPsIsm5>FA>!6{fln#Gg==GtrF
zwh{p%7BYc@iA<X3SGFrPA!m!0VcqwHO{uU}%A`uX%h2e=_~gq5dsDG7b6tw3jp&@x
z;ao}=`F;&N{A$DiAw5QHoDzZLwWgDkY*?R}Z$eyqC~*;cHW91Q1IM?4f3Z01p1Fn*
z#oxwEZBF^3e|X~*PjGS?mUwe&q6waRB%=e~`*zgkdcVz^8EI4Hx#xdw?o?yK4q_u)
z9*g%UV(dPcQWQLu%-q9l`pca5t8`f?T9XTBh=1?nNk2Lg%~c$MKfk%85GO?l_h*)5
z*077!x%GggCMkjbhPzUGZ|(9+WB^8YJdV^@WP!Bdp2lecd3=dW!p_@RCHBLx!rlhp
zDY2{2NRv<6tQ!9BXBWQH(!b9i$b<<)2X1>{+4W%juP9}`&!GB`t-XIuC2b`h$=ZL2
zxib#Di_mi{Ur`6$*G)%`r_T}j$NRS4vE}9BlY8d~C0*)~g6scP2MVI})&5&$XKf_U
zARQHBz;ZgGU0e68t0R|SG?j>|W32W9#9Nb~;BBKZ3OmW+f9$c~B$9jU?K&bYv7*IC
zM3I)O^GdvN5<yEUs4-RDPOZ0~2zl?1BvHViFf*R-?ASrUjr00lp7ToFSQ87hxc(ct
zjXF}NNgxz<eOp@yjYJ_1-2ElyRn*hk2?Tz=1$X`K!(N;j)2QRiRZ0yZ4=1MrY&Nfd
zq*h(ULnFi7pkq4S|8CL@1R6`jvUIBA9ye;&KJ*`X%+`$D6)lto@s}&pE^5c_$Vf{|
ze`>Cr*FAjp@va%gq4};9HVs|%xWNo)c>S(K8**IP^m)&5f0=XCJFvbm`svGHbk*y!
zqcqd8J>V?Y+$(HV7Pa_@%0HVAm}IQ?tlyoVZS4pktHMrWPGqv?LJl#7<As<xP{~s5
z;S4Ebvl^qkP2;_>@;RSos6QWh%O0}q%-35iuKJa<CcQh2s3un*FZOcKt8i`_2@Iq$
z<lxNJGBTw}C+p1JT>)2Z3|D=(mtKYek68#AJS+vqhCcf<2Nf9!#JYSytNULQufTdP
zepLe7bb`{GS3XvmP9@+?AK4>u=Tpj0DdMNgj?Q}z^RU-9YaU3Ot5zX2zq72snFBL9
zuTP`{7fJip=zdK*N2XZmP=KKv{@&1>z09v_MN`1+I+?t32jAaWy$<jF+sezzKxsQz
zN2Bh&nO@vkUJV=5>rfuRUl2!te826w95ZYHGk!3z(UIRwVCiT5MEqpN;B1<sW0BE4
zKLc@qmhYBZT1^{I7<V8!GA!Vfo>gx1V*^W8wPEQTj6~XOmVtnl6f)I??F=2yU?_pv
z%)WC5GhCx`sKC&`reo2l>TjGx6f5#l_1J%nc=JdSzI3OMRJY8)IGLQEIz;%5_lQ+a
zAni(aCkc~i8(c@Tvg`ylb@vt=qpUyus|+_V<I29IrjE#!Y^6ub9bP&q%bBg2Y>8G?
z=*?IV0ExWYmTa|*;(6B1j8u;`jkhwQY*p=PwC5GMx&Oi@6o{pziVWW*JYiaL{&VXI
zmNxVV0}+mHs*@P_9b0STnqUPfiq|<hP)ODbYwm;buLMytW*;bHq7-g!j`t8Bl26jU
z)~_m-q2N8R^-0G3<w#Md3O7%-q1egUuSWQ9;>r5<2M&o}QBI+*vL5DCE6z@<Z`(?I
zDA8wB-T?H%#p5_CIL4{Hy^qbRo%Wf>+aP^Gt5<u|<bpdOB#8g#q->keKBrhm->_&(
zM=FqMyR<PZ$3iOYF|!@KM}wg40V<kbA1uAJXtyttHdo=55sJ<O)K6y>h3MweXlBn7
zfl&|rP?WXTb|bkg{qrBe1F4sZSXLI>ydw0&#<SOay(dB-I+uEO9_78k<b;4CVe#m1
z?|3tA=oUEO*PABKwc8#I26Ig#{~V;gD50RtfxN{{ttA-0ueWKS@z-WpmF2LmHT*C*
z%j6USO-$W$q$yNYWXQC9=XkVlG-7PQQ*Wv6LqV|TKs|d<fiRyH!``fWT!F`Ml0Tj>
zR%0>S_Fp+1jRwSPQB^9(2|H&zx82%(`ssmuqplJV>DJd!njYeA`E{fl(VmGB?bn3a
zH&3ijUHYV^<-#xXtz8WTIQlv{k)8K((Myu_5<-?{S4ETTU>EMF0};Qunq;ny+@TZ+
z1zgiwXD;4WX-g%Z2~KGkr8gOm+u-%^{1}K5gpoi3crvT-(tYyq(k%_lyQy^e!Y8ND
zS)74&zlR#uSq;wAk8ad)Fa%|`L3H9Ncaqm_uT@(2>(}mgDKA7WY(ES0_q`VD^aLWK
zTw;=%Kh5GN*9(7DcUqXlF?^_lF;fPl5=q6DW8W>(f_-sL&eSSRWb+SglEbVhPBkVd
zqMB`kW<uAFasB8l7w<R@QB!jc_l7B_*u4SLtYzkqxCYvS=wpOn^DGB1vsSG`gJ}h*
zd~+I(0V+Wx!s$2=7e!Q7m^oD>Y6Bn0OpzOr)&1p~#5Zs~|L}SBAW9-%Su)P6|5bI1
zI=8x7JfdbD)K?$PsbKsoqEQhKY#!!e4dz<<T7C_h)~I!x2&+&yYcD{(?B0WUJ`v#Y
z?H)4NMmu0T;BXe@?$N^#LSzeilhgyKrC4rEu8e;KTpw>O8@BTRDebG!MClgd4v<Gw
zqfw6w2RJ<&oJf&{6!G3}iCv<if3)C#96v!U5W!14vG4X^5=pY179Ti4`RN=uatz!X
z$Dr=c%#4hz>2&4Ff%T9a&6?miaRb!lH02f4<74AvXKlAOKB<Vpu)iYJXaR8z&+Hk(
z#>ht#2_V1bDxN|m3`_6*`u?>;`v9(d8w};`@zGGL;iB%JFR}7Fb95kAyy1>M(!Uqy
z;etVHUGTF^DI=k!favmmTzS`!%0l*d(95tZt=l<dvd&@aFY~Ya(EA?C!a%2d8q!TI
zLs&IbR?N5+hYwL1g%6&Elz3CcScO1?#)NlNQqZy|Zz=|N>fx!Hz!YC_U4a-k{|dWL
zuLJtYdpxD|EH2%rb?6e$=fUEU`2+B`?77RQq|@!q<OB6Bll1QtgfJKL<Zoqc<oCh;
z*R6T|_6p$^?;{(*BiSji62OZV_%0`cSt7t%E2DL@ixc?d_1aGFd&Pph?H4XM6j=MZ
ze=DlAN_<Y7iHYdu6n&6HAv2XzEk>*nUZ0ii^q6UP4IQ3yXL9}Byu*q!f^dP7B841p
z>Z!Ky&fa=Hm(S<??}w6IM{;ey8I{L}+LFe3@nXM&M}AsdtZ@1C1>j&~Dz|FEaj?qS
z73Ui9Xq?HoX3IYX%*%a>i{~$U>@*J53Y4w9Z5cAynpSfg{y0y~D~KJ>AXV>0p}^7&
zUs<EvP!=Q(MjE1$6+#Q5W|J+6x-p3A;>l!?XP*5-0Wd}h{9<#Al#<CTG?|A%`G!EI
z0g2s=h%gFy6>3774!{qZRLdmo7gI)^$&{BNz$Hr9TKZNSHE79~2~`f&3vsjozCb{;
z5HFiiou<8cNts-g8Zq4;_Noqux@CSaCQ?h`76REz?&F~Tgegt5WyFD1;#=@hcr~Mr
zmF+)aB`$Mk9Zp4u{s<ub19j|Qm;?|0#C=_E{Bu9$R2BTb1F<^?_QOpmrfsh(nBQsh
zZG8JIi-%)NZj_4^dUdU`>Fp1#$_5iM4l=2uW)L<nOKor7d@N`m0(cx!0{Aai{FeF^
zhn!O1ST(BaLN;bXp0J@2MFV;QV=ALz1bL21y?h&NMwipnE9!H7jmPfTKR%N5>f#L`
z_UUNyC%ielfGjS=bIiOJd}W_-<%2Py<kemI=S|KWyjcMm^V{r7n(p&&eu;vyKVM}%
zqXfqTOI}xI?~Zy48=nOHN*RJeSrRS|sUcv5@{3G;^l*Po*eRYSG$kc|7>GqP{7~I=
z4$zmvDy~rN`OD2)sAv=`2rrOP=pvtQzOa^~kt|<y3E+j4+Edc8u6q2a(@S>?=1p(8
zT~<Gyo1N=BJ5|rf@4g>7I40(Onh>|vR!ZU7yM}OkwSJmSCNnL+swbxNsgDHut`K*4
zz_QjTNkp>z7c*hA)9hM=c`&=GCrybK$g*<RO(SvDR8HqlC4$SqB#{<8@;+|*!W#*9
z<o91A0MVpNmJZ{$|6-m)Q7$>UsGN=;yzlZJ6fdKe;G2C7fe{s@GvDHNX1AP%^OWnq
z2f4i;$S{8Lxn0WixJvXSy8OU7?vhrj^Mlvm+0{^n(8B|c@!LOb*YKf8mq`x<`6M0-
zI{)dI{9UZGECW-FyORm4zt#>}1rNjHKI?s%0K*|d*Jkon>BXkR<PDAM;~a3GmzqK{
z{`006<E&eI&yZGsqFf3sp`v>{DLZ*wgnVxDCU&D34Tkj2LYyM8Kb|1#PkqX0ntOJw
z&3mE5j;flSE31V>hMGtJNxB&ZQaDq;$51Yc@z3txKNT_PNgtz1P{}rZAQIIKFCJ8C
z09@|Vi*E$0H>5h44r-g$&gKQ0Sy-<ce5DoLXLkb#Fm~pB$Jgu!2_$EU3u0-KV2H?A
z2}(C2(~v9I0lsUlwt?BNq8sXAPQ?H9U;WzeOM7RS%`y|hljXdRAs-JRR0(P|a1^JU
z)NH~}$Vj1pS7La`g3rf_tWF}xe)Ohf0yJ+W=I<%!_KRrJScEHdaT;QEF2$%*JUj#4
zCKg*%x|4U@|1i<;@wtD5|N325TV?+^Y96J#+9s50)75pY1AU#C@|CO8+4-JpZ&>Rg
z&8RqqXz8IducP!R>}7Ai`e=>Kw1sT^P1v2&wYK)CyCupT$5CU7b>D`UFPRtn2uP*P
zT8uZ`B<fi!;31uKt<<E}MQ}Mp^USVm!s#gxc=~Q`)tpU)ED#q}kwDD%ZHJhyDj6GP
z5)+R%Tv6&ES%vXip?!3Gn3)&rwn?!$!oMQOL&u`R{WWL*;I}ab1O#>Ufw|gTzOL^U
zdlMf4>UC9GKeZ+*)Zup86~vR!^Z*)FBShFs=ARb{EvJPag^e-Pk{yxDEfCAs-pE8L
zNdk+{cIT7cN?g;D?uM-s9)Fqhp0gPT2t*A7FC{KUxP1H#`aE;d8#v4CDleSn^mMjP
zYbTd(4JM0-PQVn4%>m^~5<<G!$pT_t9h|>^M{RxT)U*B4>g!hz?P=`BcYuw45~Jl*
ztApu479r`rwf=E~&xjtcwI0j<-oCuTPeWISZvLcJ-uQXdOj7A3j~gDCVPJdHx5kw2
z$8o~!;;(YKo!zDE3yJs2D!RWMR(O4(q-|B@%R5sEGX*KczZdnymxz%=Ufi6pT5=|0
zK2!XhgkXt(U(4wE>G1IgCj;YuZa=}0HXvcWbJOBQ?S@%VB@58`e=Qz@iV&FO2gf`I
zekFSRHnb!Of!o$0JtNfpLoX<!{41q(Cmw#1{1<$w&z&{rT`<iYZiIQ}9ifky9Ffly
zLd8UsuMkBA<8!=#xs%a~Z88kq^v&u32Jy>EMQ=+~ZsjqBYjvG*k~P3M8<HPn-LM+P
zp@&?oq(Jf})G1_-Qm^i-88ziOGmI-Jjn9b18@{ji^l>i#GrfJW?!M$u5yB9seU5}c
z|0vvWg8*jg%ppxvvTCk>V|y|^V>{lXMly6TM)vD&oc`)MJ4@>|i8%n86P7;#dFMJN
z!#HoSqK3chdyi1K8~`JZ-A~(oEbbkDw;f4UFqtrtWztHM%lj)on+17YvO!d&e=iS`
z5}stZ2c-_?o!bXKc(6|(at0v%28f%b&)NKj@|&&CdHn{Bnzhfl{D!xiz0L(+2ZWlH
z&pBR)`kI~3`Sm5BQYwoh`0z8uFqm2w205*MjbhIfNAk{;Bmi}55l{}}$mb)>=VQd@
zqeAE7V1y%NgkxxgqilrZaJeINxnp>_qrAD}PzEDZ24h$Tqg)2#NSh-}n`1<qqk@~#
zzxIY0N+8${<$40Mm|R#Ow8NBi(lS!&r%Dt~gy!!w;DoBR^)eZi%QD<@n(hn`*8c<b
zkm1NWC>E6rxB(fRN;a`x+iG!(E}GvjZ@XovRwcJFs_2SMRJ1nI2969S=BTyMsGZ<a
z%B?(JbxrR@M#BvS2Sv)7Wh*z0ZFf*xr&1Io4<&Q>Zr!UnVPiVcT;|0u4=qX!)M8>~
zN-t!Ijv{_{1wH;!^TvDlWUDq9S3m32w1ajU^~vHgKLSF3CBqD>$}n3_@l5@i+FYi^
z#WsDB_xZ+~YOAG*mte_3CuYm_azcNkQ0=ZZOWT$gD`A=K%A~lLt()X4N$s~@a%yRw
zViM|aJu~6NvN1MhP-9GCjc;KoCRZ<3uY9Dn(6yYLJ6{(CzsIxV?G=}dMCYZ{J%+16
z_uRF}oCCN_5!Bes$yviQSa_7`xd>eG*=D3Bo}m;ALi2L53o30Ugy`!U%QG<FAz4EQ
zW|_<$iQ8IwEZc3>#CAV%<YNwLbd&ug?Oy(`IqmS?_$7}r^ef301ors}Lis<*u)APp
zc%)X~Vp60rNuudw&=Xc*F>D|ZVmWB`EAiJm*F$4c2~!nQaEt5yti0-yz9xDS4NVoz
zI`{h+oQs%-gxQc(3E2qhY6PxuP`HbwL8paftnu#DGg4p(LdNCw<|}cY8fjkO@XzBd
zzn!jQEIE+fTC`~DA1mY8;eiS$1_o4R+sl_0-TzFy?qB!_Qit#yhD_kf7H+*?JYIkf
z?I-MBN#{xZ$G(@bf@@>wtwHz92y<98Q%II;<boTbjU<Xa7O_0yf*w9I&OH~WMf8#)
zBk=@NOJ2v26OCFjW^owscrvyBQnbPl`EAy}d5-;T;6-dN+!}5BKy|#=)nHjYlUyIG
z#nPgwWEX^3n@pS6<mXk0I@#?TvPlMLO1Q*H#xwg3S}I!QEuvJ+)0J|^)q4kF{6|sV
zMp)j+7J4QfN*5@#+OT*e6SjpGa-m;4le?>9wJE6IkH^fguwirtr52D;DG2{umZPD8
zy>p#gdaymYHct$a1~eV8d&C~C%?oflU0(j4M@*`&lJyHQj6GvufQ!haD)InOjx%)<
zI-P#|sN4)07RrPUSHtYBvTl&g()3P6nF<W579TMWh1OA)G!$2=oH?N5RXfpt6Ej*Z
zUfqvRD*JRPem8YB<4t3}r-g~|g|)dDg^M+fHdlPP&rK%i=HG6Hp3+l)@Jz0#<2sUS
z&MP)#bgaH!a>AjbP#c8(jCchiF6Vyzw`-8{H1SefO{!9#efe%ty-e+4<+l>=HbZk0
zHY{Y-E0c3HZPOnh$gnl@U6w-XKh0NP%0E!EN%q81LSd@x4C&1I@@>K^9$DSBd5rt#
zHIrLN^_9f-dg4Sm2;DW;!b9;ayG+{$7+rJs4&fEzN8b+`hLGYVYcG6(QvB)ElCxTE
zC9X~Vzoi}qSK0y|nh$h#t-02nRqwG?+r$QL#&~;e8B@KZc^7u&s^+t#6;5ucyuW!E
zdUs57HHk};O%=?DV|0e384nPsTWRRdsu=<=o*dNHnaSB7OG5(}ehbbT+*8*tp|q`P
zUPO&<AIHV4(Z$1I*)G5G|46Gp-32?~?Ch?ImeW9Z_g2Wcuq))U{6`g~ZyaG8P=Hj?
uWbi6fV#sl6m})5SD;;Bf)c6($1g^H6!X__<#FL(H6}A8})`j^1f&M===A?W8

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 76385a83f1788ec82b2218aa16c95f54fa562914..1c425babdd726b49d70e2a5a1bb8bdbf469a91c6 100644
GIT binary patch
literal 16348
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

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


From 9d642425dd0cf6799fa71f2b1dcb7670643247f2 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 31 Jan 2020 20:12:19 +0000
Subject: [PATCH 344/648] Fix unit tests

---
 .../kubedash-configuration.component.spec.ts       | 14 +++++++++++++-
 .../kubedash-configuration.component.ts            | 10 ++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts
index 5543dea362..3fed757736 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts
@@ -4,8 +4,9 @@ import { KubedashConfigurationComponent } from './kubedash-configuration.compone
 import { KubernetesBaseTestModules } from '../../kubernetes.testing.module';
 import { TabNavService } from '../../../../../tab-nav.service';
 import { HttpClient, HttpHandler } from '@angular/common/http';
+import { ActivatedRoute } from '@angular/router';
 
-describe('KubedashConfigurationComponent', () => {
+fdescribe('KubedashConfigurationComponent', () => {
   let component: KubedashConfigurationComponent;
   let fixture: ComponentFixture<KubedashConfigurationComponent>;
 
@@ -14,6 +15,17 @@ describe('KubedashConfigurationComponent', () => {
       imports: [...KubernetesBaseTestModules],
       declarations: [ KubedashConfigurationComponent ],
       providers: [
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: {
+              params: {
+                endpointId: 'anything'
+              },
+              queryParams: {}
+            }
+          }
+        },
         TabNavService,
         HttpClient,
         HttpHandler,
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 6595239e28..59848d4a06 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
@@ -5,9 +5,9 @@ import {
 import { KubernetesService } from '../../services/kubernetes.service';
 import { ActivatedRoute } from '@angular/router';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
-import { Component, OnInit, OnDestroy } from '@angular/core';
+import { Component, OnDestroy } from '@angular/core';
 import { Observable, BehaviorSubject, Subscription } from 'rxjs';
-import { map, distinctUntilChanged, tap, filter } from 'rxjs/operators';
+import { map, distinctUntilChanged, filter } from 'rxjs/operators';
 import { KubeDashboardStatus } from '../../store/kubernetes.effects';
 import { ConfirmationDialogConfig } from '../../../../shared/components/confirmation-dialog.config';
 import { HttpClient } from '@angular/common/http';
@@ -37,7 +37,7 @@ type ReadyFilter = (status: KubeDashboardStatus) => boolean;
     KubernetesEndpointService,
   ]
 })
-export class KubedashConfigurationComponent implements OnInit, OnDestroy {
+export class KubedashConfigurationComponent implements OnDestroy {
 
   // Confirmation dialog
   deleteServiceAccountConfirmation = new ConfirmationDialogConfig(
@@ -110,10 +110,8 @@ export class KubedashConfigurationComponent implements OnInit, OnDestroy {
       filter(status => !!status.version),
       map(status => status.version.indexOf('azure') !== -1)
     );
-  }
 
-  ngOnInit() {
-    this.breadcrumbs$ = this.kubeEndpointService.endpoint$.pipe(
+    this.breadcrumbs$ = kubeEndpointService.endpoint$.pipe(
       map(endpoint => ([{
         breadcrumbs: [{ value: endpoint.entity.name, routerLink: `/kubernetes/${endpoint.entity.guid}` }]
       }]))

From 009a620d4745756cfd3cd949c929ab998cecd1d2 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 31 Jan 2020 20:12:42 +0000
Subject: [PATCH 345/648] Remove fdescribe

---
 .../kubedash-configuration.component.spec.ts                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts
index 3fed757736..c8f461034f 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts
@@ -6,7 +6,7 @@ import { TabNavService } from '../../../../../tab-nav.service';
 import { HttpClient, HttpHandler } from '@angular/common/http';
 import { ActivatedRoute } from '@angular/router';
 
-fdescribe('KubedashConfigurationComponent', () => {
+describe('KubedashConfigurationComponent', () => {
   let component: KubedashConfigurationComponent;
   let fixture: ComponentFixture<KubedashConfigurationComponent>;
 

From a4a74d9ac86d5cee870ed0fbfbb3d9b65e385938 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 3 Feb 2020 10:39:12 +0000
Subject: [PATCH 346/648] Fix Kube Viewer pod metrics link - Fix metrics link
 visibility on workload pod list - Fix metrics link value

---
 .../kubernetes-resource-viewer.component.html | 16 +++----
 .../kubernetes-resource-viewer.component.ts   | 47 +++++++++++--------
 .../kubernetes-service-list-config.service.ts |  3 +-
 3 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html
index bf33ad118f..cb780e3041 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html
@@ -1,14 +1,14 @@
 <app-sidepanel-preview title="{{title}}">
 
   <div *ngIf="resource$ | async as resource">
-  <div class="resource-preview__side-by-side">
-    <app-metadata-item label="API Version">{{ resource.apiVersion }}</app-metadata-item>
-    <app-metadata-item label="Kind">{{ resource.kind | titlecase }}</app-metadata-item>
-    <div class="resource-preview__metrics">
-      <a *ngIf="hasPodMetrics$ | async" [routerLink]="podRouterLink$ | async">View Metrics</a>
+    <div class="resource-preview__side-by-side">
+      <app-metadata-item label="API Version">{{ resource.apiVersion }}</app-metadata-item>
+      <app-metadata-item label="Kind">{{ resource.kind | titlecase }}</app-metadata-item>
+      <div class="resource-preview__metrics">
+        <a *ngIf="hasPodMetrics$ | async" [routerLink]="podRouterLink$ | async">View Metrics</a>
+      </div>
     </div>
-  </div>
-  <div class="resource-preview__side-by-side">
+    <div class="resource-preview__side-by-side">
       <app-metadata-item label="Created">{{ resource.creationTimestamp | date:'medium' }}</app-metadata-item>
       <app-metadata-item label="Age">{{ resource.age }}</app-metadata-item>
     </div>
@@ -27,7 +27,7 @@
       </div>
     </app-metadata-item>
 
-    <app-json-viewer #viewer [json]="resource.raw"></app-json-viewer>
+    <app-json-viewer #viewer [json]="resource.jsonView"></app-json-viewer>
 
   </div>
 </app-sidepanel-preview>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
index 79a5d1f5c8..1fbe76d824 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
@@ -1,5 +1,4 @@
 import { Component } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
 import * as moment from 'moment';
 import { Observable, of } from 'rxjs';
 import { filter, first, map, publishReplay, refCount, switchMap } from 'rxjs/operators';
@@ -7,12 +6,23 @@ import { filter, first, map, publishReplay, refCount, switchMap } from 'rxjs/ope
 import { EndpointsService } from '../../../core/endpoints.service';
 import { PreviewableComponent } from '../../../shared/previewable-component';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
-import { BasicKubeAPIResource } from '../store/kube.types';
+import { BasicKubeAPIResource, KubeAPIResource } from '../store/kube.types';
 
 export interface KubernetesResourceViewerConfig {
   title: string;
   resource$: Observable<BasicKubeAPIResource>;
-  resourceKind?: string;
+  resourceKind: string;
+}
+
+interface KubernetesResourceViewerResource {
+  raw: any;
+  jsonView: KubeAPIResource;
+  age: string;
+  creationTimestamp: string;
+  labels: { name: string, value: string }[];
+  annotations: { name: string, value: string }[];
+  kind: string;
+  apiVersion: string;
 }
 
 @Component({
@@ -23,14 +33,13 @@ export interface KubernetesResourceViewerConfig {
 export class KubernetesResourceViewerComponent implements PreviewableComponent {
 
   constructor(
-    private activatedRoute: ActivatedRoute,
     private endpointsService: EndpointsService,
     private kubeEndpointService: KubernetesEndpointService
   ) {
   }
 
   public title: string;
-  public resource$: Observable<any>;
+  public resource$: Observable<KubernetesResourceViewerResource>;
 
   public hasPodMetrics$: Observable<boolean>;
   public podRouterLink$: Observable<string[]>;
@@ -39,16 +48,18 @@ export class KubernetesResourceViewerComponent implements PreviewableComponent {
     this.title = props.title;
     this.resource$ = props.resource$.pipe(
       map((item: any) => {// KubeAPIResource
-        const resource = {} as any;
+        const resource: KubernetesResourceViewerResource = {} as KubernetesResourceViewerResource;
         const newItem = {} as any;
 
+        resource.raw = item;
+
         Object.keys(item || []).forEach(k => {
           if (k !== 'endpointId' && k !== 'releaseTitle' && k !== 'expandedStatus') {
             newItem[k] = item[k];
           }
         });
 
-        resource.raw = newItem;
+        resource.jsonView = newItem;
         resource.age = moment(item.metadata.creationTimestamp).fromNow(true);
         resource.creationTimestamp = item.metadata.creationTimestamp;
 
@@ -78,14 +89,12 @@ export class KubernetesResourceViewerComponent implements PreviewableComponent {
       refCount()
     );
 
-    this.hasPodMetrics$ = this.resource$.pipe(
-      switchMap(resource => {
-        return resource.kind === 'pod' ?
-          this.endpointsService.hasMetrics(this.getEndpointId(resource)) :
-          of(false);
-      }),
-      first(),
-    );
+    this.hasPodMetrics$ = props.resourceKind === 'pod' ?
+      this.resource$.pipe(
+        switchMap(resource => this.endpointsService.hasMetrics(this.getEndpointId(resource.raw))),
+        first(),
+      ) :
+      of(false);
 
     this.podRouterLink$ = this.hasPodMetrics$.pipe(
       filter(hasPodMetrics => hasPodMetrics),
@@ -93,10 +102,10 @@ export class KubernetesResourceViewerComponent implements PreviewableComponent {
       map(pod => {
         return [
           `/kubernetes`,
-          this.getEndpointId(pod),
+          this.getEndpointId(pod.raw),
           `pods`,
-          pod.metadata.namespace,
-          pod.metadata.name
+          pod.raw.metadata.namespace,
+          pod.raw.metadata.name
         ];
       })
     );
@@ -111,7 +120,7 @@ export class KubernetesResourceViewerComponent implements PreviewableComponent {
   }
 
   private getEndpointId(res): string {
-    return this.kubeEndpointService.kubeGuid || res.endpointId || res.raw.metadata.kubeId;
+    return this.kubeEndpointService.kubeGuid || res.endpointId || res.metadata.kubeId;
   }
 
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
index 4c9626accc..c4ab189296 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
@@ -33,7 +33,8 @@ export abstract class BaseKubernetesServicesListConfig implements IListConfig<Ku
         sidePanelComponent: KubernetesResourceViewerComponent,
         sidePanelConfig: {
           title: service.metadata.name,
-          resource$: of(service)
+          resource$: of(service),
+          resourceKind: 'service'
         }
       })
     },

From f676edb355da294331debee8aedc5e3e05c71506 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 3 Feb 2020 11:04:12 +0000
Subject: [PATCH 347/648] Fixed multi-action lists (service instance) - Since
 https://github.com/cloudfoundry/stratos/commit/7c94858 we take action.entity
 as paramount - In multi action lists for the secondary type this was
 incorrectly set to the primary type

---
 .../forced-action-type.helpers.ts                            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 5a0742ba26..01c607cd4b 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,5 +1,5 @@
+import { entityCatalog } from '../../entity-catalog/entity-catalog.service';
 import { PaginatedAction } from '../../types/pagination.types';
-
 import { EntityRequestAction } from '../../types/request.types';
 
 export function patchActionWithForcedConfig(action: EntityRequestAction) {
@@ -8,6 +8,9 @@ export function patchActionWithForcedConfig(action: EntityRequestAction) {
     const forced = pagAction.__forcedPageEntityConfig__;
     return {
       ...pagAction,
+      // See https://github.com/cloudfoundry/stratos/commit/7c94858
+      // Need a better way of doing this (when this isn't set multi action lists breaks)
+      entity: entityCatalog.getEntity(forced).getSchema(forced.schemaKey),
       entityType: forced.entityType,
       endpointType: forced.endpointType,
       schemaKey: forced.schemaKey,

From 099b56b574c5146620c4456f25854a5e7763c15e Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 3 Feb 2020 11:07:10 +0000
Subject: [PATCH 348/648] Tidy up missing workload icon, link to issue

---
 .../kubernetes-pod-status/kubernetes-pod-status.component.ts   | 1 -
 .../helm-release-card/helm-release-card.component.html         | 1 -
 .../helm-release-card/helm-release-card.component.ts           | 3 +--
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
index 5fac2be40f..e4294f09ef 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
@@ -29,7 +29,6 @@ export class KubernetesPodStatusComponent extends TableCellCustom<KubernetesPod>
   }
 
   private convertStatus(status: string): string {
-    // TODO: RC Run through
     if (!status) {
       return 'tentative';
     }
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
index bc478082ea..02745a2c0b 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
@@ -5,7 +5,6 @@
       <div class='release-title--icon'>
         <img *ngIf="icon; else noIcon" [src]="icon" (error)="loadImageError()">
         <ng-template #noIcon>
-          <!-- // TODO: RC. missing icon & svg via backend? -->
           <mat-icon fontSet="stratos-icons">service</mat-icon>
         </ng-template>
       </div>
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts
index 6e7c609bd5..49eb16ba5b 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts
@@ -23,8 +23,7 @@ export class HelmReleaseCardComponent extends CardCell<HelmRelease> {
       this.status = row.status.charAt(0).toUpperCase() + row.status.substring(1);
       this.lastDeployed = this.datePipe.transform(row.info.last_deployed, 'medium');
       this.icon = row.chart.metadata.icon;
-      // TODO: RC Check out when updated helm is merged
-      // console.log(row);
+      // FIXME: See #304
       // this.icon = '/pp/v1/chartsvc/v1/assets/aerospike/aerospike-enterprise/logo';
       // this.icon = 'chartsvc/v1/assets/ntppool/geoip/logo'
       // chart summary - /pp/v1/chartsvc/v1/assets/charts/aerospike/logo-160x160-fit.png

From 01fc8f3d456268d96cd4434b2eb5c350e8cab784 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 3 Feb 2020 11:17:51 +0000
Subject: [PATCH 349/648] Fix failing unit tests

---
 .../kubernetes-pod-status.component.spec.ts                    | 3 ++-
 .../helm-release-card/helm-release-card.component.spec.ts      | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts
index 1cd136eaf3..2ef6a3cbf0 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts
@@ -23,7 +23,8 @@ describe('KubernetesPodStatusComponent', () => {
       },
       spec: {
         containers: []
-      }
+      },
+      expandedStatus: {}
     } as KubernetesPod;
     fixture.detectChanges();
   });
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts
index 2ab9dddcc0..97d0be3395 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts
@@ -27,6 +27,9 @@ describe('HelmReleaseCardComponent', () => {
       status: 'status',
       info: {
         last_deployed: null
+      },
+      chart: {
+        metadata: {}
       }
     } as HelmRelease;
     fixture.detectChanges();

From e1357c311ca4860b7c6974e16ffbbefffd5444b2 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 3 Feb 2020 15:32:48 +0000
Subject: [PATCH 350/648] Fixes following commit

---
 .../kubedash-configuration.component.html     |  61 ++++++---
 .../kubedash-configuration.component.ts       | 122 +++++++++---------
 ...bernetes-namespaces-list-config.service.ts |   2 +-
 .../card-progress-overlay.component.scss      |   5 +-
 4 files changed, 107 insertions(+), 83 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.html
index a873a408d8..815e444b0c 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.html
@@ -18,7 +18,8 @@ <h1>Dashboard Configuration</h1>
     <div class="kubedash__ready" *ngIf="status.service && status.serviceAccount">
       <div class="kubedash__access">
         <app-boolean-indicator [showText]="false" [isTrue]="true" type="yes-no"></app-boolean-indicator>
-        <div>Kubernetes Dashboard is installed and a Service Account exists - you can access the dashboard using the 'View Dashboard' button on the Summary view for this cluster.</div>
+        <div>Kubernetes Dashboard is installed and a Service Account exists - you can access the dashboard using the
+          'View Dashboard' button on the Summary view for this cluster.</div>
       </div>
       <button *ngIf="kubeEndpointService.kubeDashboardConfigured$ | async" [routerLink]="dashboardLink" mat-button>
         <mat-icon>dashboard</mat-icon>
@@ -31,7 +32,8 @@ <h1>Dashboard Configuration</h1>
       <mat-card-header>
         <mat-card-title>Kubernetes Dashboard Installation</mat-card-title>
         <div class="kubedash__card-icon">
-          <app-boolean-indicator *ngIf="status.service" [showText]="false" [isTrue]="true" type="yes-no"></app-boolean-indicator>
+          <app-boolean-indicator *ngIf="status.service" [showText]="false" [isTrue]="true" type="yes-no">
+          </app-boolean-indicator>
           <mat-icon *ngIf="!status.service">warning</mat-icon>
         </div>
       </mat-card-header>
@@ -41,15 +43,17 @@ <h1>Dashboard Configuration</h1>
         <h2 class="kubedash__option">Manually install the Kubernetes Dashboard</h2>
         <div class="kubedash__option-block">
           <p>Manually install the Kubernetes Dashboard into your cluster. Please refer to
-            <a class="kubedash__card-link" target="_blank" href="https://github.com/kubernetes/dashboard#getting-started">https://github.com/kubernetes/dashboard#getting-started</a>.
+            <a class="kubedash__card-link" target="_blank"
+              href="https://github.com/kubernetes/dashboard#getting-started">https://github.com/kubernetes/dashboard#getting-started</a>.
           </p>
-        </div>  
+        </div>
 
         <h2 class="kubedash__option">Install the Kubernetes Dashboard from Stratos</h2>
         <div class="kubedash__option-block">
           <p>Stratos will download the Dashboard yaml from the Dashboard GitHub repository and install it for you.</p>
           <div class="kubedash__buttons">
-            <button (click)="installDashboard()" [disabled]="isBusy$ | async" mat-button color="primary">Install Dashboard</button>
+            <button (click)="installDashboard()" [disabled]="isBusy$ | async" mat-button color="primary">Install
+              Dashboard</button>
           </div>
         </div>
       </mat-card-content>
@@ -62,7 +66,8 @@ <h2 class="kubedash__option">Install the Kubernetes Dashboard from Stratos</h2>
           <app-metadata-item label="Namespace">{{ status.service.namespace }}</app-metadata-item>
         </div>
         <div class="kubedash__buttons" *ngIf="status.stratosInstalled">
-          <button (click)="deleteDashboard()" [disabled]="isBusy$ | async" mat-button color="primary">Delete Dashboard</button>
+          <button (click)="deleteDashboard()" [disabled]="isBusy$ | async" mat-button color="primary">Delete
+            Dashboard</button>
         </div>
       </mat-card-content>
     </mat-card>
@@ -72,55 +77,69 @@ <h2 class="kubedash__option">Install the Kubernetes Dashboard from Stratos</h2>
       <mat-card-header>
         <mat-card-title>Service Account</mat-card-title>
         <div class="kubedash__card-icon">
-          <app-boolean-indicator *ngIf="status.serviceAccount" [showText]="false" [isTrue]="true" type="yes-no"></app-boolean-indicator>
+          <app-boolean-indicator *ngIf="status.serviceAccount" [showText]="false" [isTrue]="true" type="yes-no">
+          </app-boolean-indicator>
           <mat-icon *ngIf="!status.serviceAccount">warning</mat-icon>
         </div>
       </mat-card-header>
 
       <mat-card-content *ngIf="!status.serviceAccount">
         <div *ngIf="(isAzure$ | async)">
-          <p class="kubedash__warn"><mat-icon>warning</mat-icon>You are using the Azure deployed version of Kubernetes Dashboard.</p>
-          <p>This version uses the Service Account 'kubernetes-dashboard' to access the Dashboard UI. You will need to create a Cluster Role Binding as described
-            <a class="kubedash__card-link" target="_blank" href="https://docs.microsoft.com/en-us/azure/aks/kubernetes-dashboard" >here</a> to give this account permissions.
+          <p class="kubedash__warn">
+            <mat-icon>warning</mat-icon>You are using the Azure deployed version of Kubernetes Dashboard.
+          </p>
+          <p>This version uses the Service Account 'kubernetes-dashboard' to access the Dashboard UI. You will need to
+            create a Cluster Role Binding as described
+            <a class="kubedash__card-link" target="_blank"
+              href="https://docs.microsoft.com/en-us/azure/aks/kubernetes-dashboard">here</a> to give this account
+            permissions.
           </p>
-          <p>You also need to add the following label to the Service Account in order for Stratos to know the account is configured:</p>
+          <p>You also need to add the following label to the Service Account in order for Stratos to know the account is
+            configured:</p>
           <div class="kubedash__label">stratos-role: kubernetes-dashboard-user</div>
           <p>You can add this label with the following command:</p>
-          <div class="kubedash__label">kubectl label serviceaccount -n kube-system kubernetes-dashboard stratos-role=kubernetes-dashboard-user</div>
+          <div class="kubedash__label">kubectl label serviceaccount -n kube-system kubernetes-dashboard
+            stratos-role=kubernetes-dashboard-user</div>
         </div>
         <div *ngIf="!(isAzure$ | async)">
           <p>Service Account not found - you can create one manually or Stratos can do this for you.</p>
           <h2 class="kubedash__option">Manually create a Service Account</h2>
           <div class="kubedash__option-block">
             <p>Create a Service Account with the appropriate permissions that will be used by the Dashboard to
-            access your Kubernetes cluster.</p>
+              access your Kubernetes cluster.</p>
             <p>Ensure that this token is labelled with the label:</p>
             <div class="kubedash__label">stratos-role: kubernetes-dashboard-user</div>
-          </div>  
+          </div>
           <h2 class="kubedash__option">Create a Service Account from Stratos</h2>
           <div class="kubedash__option-block">
             <div *ngIf="!status.service">
-              <p>Stratos can create a service account for accessing the Kubernetes Dashboard - please install the Dashboard first to enable this capability.</p>
+              <p>Stratos can create a service account for accessing the Kubernetes Dashboard - please install the
+                Dashboard first to enable this capability.</p>
             </div>
             <div *ngIf="status.service">
-              <p>Stratos will create a service account with a cluster role binding to the cluster-admin role. This user will
+              <p>Stratos will create a service account with a cluster role binding to the cluster-admin role. This user
+                will
                 have full permissions over the cluster.</p>
-              <p class="kubedash__warn"><mat-icon>warning</mat-icon>Please make sure you understand the risks involved</p>
+              <p class="kubedash__warn">
+                <mat-icon>warning</mat-icon>Please make sure you understand the risks involved
+              </p>
               <div class="kubedash__buttons">
-                <button (click)="createServiceAccount()" [disabled]="isBusy$ | async" mat-button color="primary">Create Service Account</button>
+                <button (click)="createServiceAccount()" [disabled]="isBusy$ | async" mat-button color="primary">Create
+                  Service Account</button>
               </div>
-            </div>        
+            </div>
           </div>
         </div>
       </mat-card-content>
 
       <mat-card-content *ngIf="status.serviceAccount">
-        <p>A Service Account  was found:</p>
+        <p>A Service Account was found:</p>
         <div class="kubedash__metadata">
           <app-metadata-item label="Name">{{ status.serviceAccount.metadata.name }}</app-metadata-item>
           <app-metadata-item label="Namespace">{{ status.serviceAccount.metadata.namespace }}</app-metadata-item>
           <div class="kubedash__buttons">
-            <button (click)="deleteServiceAccount()" [disabled]="isBusy$ | async" mat-button color="primary">Delete Service Account</button>
+            <button (click)="deleteServiceAccount()" [disabled]="isBusy$ | async" mat-button color="primary">Delete
+              Service Account</button>
           </div>
         </div>
       </mat-card-content>
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 59848d4a06..57fc55e764 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,21 +1,19 @@
-import { IHeaderBreadcrumb } from './../../../../shared/components/page-header/page-header.types';
-import {
-  KubernetesEndpointService
-} from '../../services/kubernetes-endpoint.service';
-import { KubernetesService } from '../../services/kubernetes.service';
-import { ActivatedRoute } from '@angular/router';
-import { BaseKubeGuid } from '../../kubernetes-page.types';
+import { HttpClient } from '@angular/common/http';
 import { Component, OnDestroy } from '@angular/core';
-import { Observable, BehaviorSubject, Subscription } from 'rxjs';
-import { map, distinctUntilChanged, filter } from 'rxjs/operators';
-import { KubeDashboardStatus } from '../../store/kubernetes.effects';
+import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material';
+import { ActivatedRoute } from '@angular/router';
+import { BehaviorSubject, Observable, Subscription } from 'rxjs';
+import { delay, distinctUntilChanged, filter, map } from 'rxjs/operators';
+
 import { ConfirmationDialogConfig } from '../../../../shared/components/confirmation-dialog.config';
-import { HttpClient } from '@angular/common/http';
 import { ConfirmationDialogService } from '../../../../shared/components/confirmation-dialog.service';
-import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material';
+import { BaseKubeGuid } from '../../kubernetes-page.types';
+import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
+import { KubernetesService } from '../../services/kubernetes.service';
+import { KubeDashboardStatus } from '../../store/kubernetes.effects';
+import { IHeaderBreadcrumb } from './../../../../shared/components/page-header/page-header.types';
 
 type MessageUpdater = (msg: string) => void;
-type ReadyFilter = (status: KubeDashboardStatus) => boolean;
 
 @Component({
   selector: 'app-kubedash-configuration',
@@ -94,9 +92,9 @@ export class KubedashConfigurationComponent implements OnDestroy {
     private httpClient: HttpClient,
     private confirmDialog: ConfirmationDialogService,
     private snackBar: MatSnackBar,
-) {
+  ) {
     this.kubeDashboardStatus$ = kubeEndpointService.kubeDashboardStatus$;
-    // Clear the updatind status when we get back new dashboard status
+    // Clear the updating status when we get back new dashboard status
     this.sub = this.kubeDashboardStatus$.pipe(distinctUntilChanged()).subscribe(status => {
       if (status !== null) {
         this.isUpdatingStatus = false;
@@ -135,11 +133,11 @@ export class KubedashConfigurationComponent implements OnDestroy {
 
   public doCreateServiceAccount() {
     this.makeRequest('post',
-    'serviceAccount',
-    'Creating Service Account ...',
-    'Service Account created', 'An error occurred creating the Service Account',
-    this.serviceAccountBusy$,
-    (msg) => this.serviceAccountMsg = msg
+      'serviceAccount',
+      'Creating Service Account ...',
+      'Service Account created', 'An error occurred creating the Service Account',
+      this.serviceAccountBusy$,
+      (msg) => this.serviceAccountMsg = msg
     );
   }
 
@@ -165,11 +163,11 @@ export class KubedashConfigurationComponent implements OnDestroy {
 
   public doInstallDashboard() {
     this.makeRequest('post',
-    'installation',
-    'Installing Kubernetes Dashboard ...',
-    'Kubernetes Dashboard installed', 'An error occurred installing the Kubernetes Dashboard',
-    this.dashboardUIBusy$,
-    (msg) => this.dashboardUIMsg = msg
+      'installation',
+      'Installing Kubernetes Dashboard ...',
+      'Kubernetes Dashboard installed', 'An error occurred installing the Kubernetes Dashboard',
+      this.dashboardUIBusy$,
+      (msg) => this.dashboardUIMsg = msg
     );
   }
 
@@ -181,43 +179,49 @@ export class KubedashConfigurationComponent implements OnDestroy {
 
   public doDeleteDashboard() {
     this.makeRequest('delete',
-    'installation',
-    'Deleting Kubernetes Dashboard ...',
-    'Kubernetes Dashboard deleted', 'An error occurred deleting the Kubernetes Dashboard',
-    this.dashboardUIBusy$,
-    (msg) => this.dashboardUIMsg = msg
+      'installation',
+      'Deleting Kubernetes Dashboard ...',
+      'Kubernetes Dashboard deleted', 'An error occurred deleting the Kubernetes Dashboard',
+      this.dashboardUIBusy$,
+      (msg) => this.dashboardUIMsg = msg
     );
   }
 
-  private makeRequest(method: string, op: string, busyMsg: string, okMsg: string, errorMsg: string,
-                      busy: BehaviorSubject<boolean>, msgUpdater: MessageUpdater) {
-   const guid = this.kubeEndpointService.kubeGuid;
-   const url = `/pp/v1/kubedash/${guid}/${op}`;
-   let obs;
-   msgUpdater(busyMsg);
-   busy.next(true);
-   this.isBusy$.next(true);
-   if (method === 'post') {
-     obs =  this.httpClient.post(url, {});
-   } else if (method === 'delete') {
-    obs =  this.httpClient.delete(url, {});
-   } else {
-     console.error('Unsupported http method');
-     return;
-   }
-
-   obs.subscribe(() => {
-     this.snackBar.open(okMsg, 'Dismiss', { duration: 3000 });
-     busy.next(false);
-     this.refresh();
-   }, (e) => {
-     let msg = errorMsg;
-     if (e && e.error && e.error.error) {
-       msg = e.error.error;
-     }
-     this.snackBarRef = this.snackBar.open(msg, 'Dismiss');
-     busy.next(false);
-     this.refresh();
+  private makeRequest(
+    method: string,
+    op: string,
+    busyMsg: string,
+    okMsg: string,
+    errorMsg: string,
+    busy: BehaviorSubject<boolean>,
+    msgUpdater: MessageUpdater) {
+    const guid = this.kubeEndpointService.kubeGuid;
+    const url = `/pp/v1/kubedash/${guid}/${op}`;
+    let obs;
+    msgUpdater(busyMsg);
+    busy.next(true);
+    this.isBusy$.next(true);
+    if (method === 'post') {
+      obs = this.httpClient.post(url, {});
+    } else if (method === 'delete') {
+      obs = this.httpClient.delete(url, {});
+    } else {
+      console.error('Unsupported http method');
+      return;
+    }
+
+    obs.pipe(delay(999999999)).subscribe(() => {
+      this.snackBar.open(okMsg, 'Dismiss', { duration: 3000 });
+      busy.next(false);
+      this.refresh();
+    }, (e) => {
+      let msg = errorMsg;
+      if (e && e.error && e.error.error) {
+        msg = e.error.error;
+      }
+      this.snackBarRef = this.snackBar.open(msg, 'Dismiss');
+      busy.next(false);
+      this.refresh();
     });
   }
 
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
index f27e232e8b..ebcdedd0dc 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
@@ -86,7 +86,7 @@ export class KubernetesNamespacesListConfigService implements IListConfig<Kubern
   ) {
     this.podsDataSource = new KubernetesNamespacesDataSource(store, this.kubeId, this);
 
-    const hasDashboard = kubeService.kubeDashboardEnabled$.pipe(
+    const hasDashboard = kubeService.kubeDashboardConfigured$.pipe(
       first(),
       tap((enabled) => {
         if (!enabled) {
diff --git a/src/frontend/packages/core/src/shared/components/card-progress-overlay/card-progress-overlay.component.scss b/src/frontend/packages/core/src/shared/components/card-progress-overlay/card-progress-overlay.component.scss
index e6308bd0c3..4f906e48c5 100644
--- a/src/frontend/packages/core/src/shared/components/card-progress-overlay/card-progress-overlay.component.scss
+++ b/src/frontend/packages/core/src/shared/components/card-progress-overlay/card-progress-overlay.component.scss
@@ -1,14 +1,15 @@
 .mat-card {
   &__progress-overlay {
     align-items: center;
+    background-color: rgba(0,0,0,0.5);
     bottom: 0;
+    color: white;
     display: flex;
     justify-content: center;
     left: 0;
     position: absolute;
     right: 0;
     top: 0;
-
     &-inner {
       width: 25%;
     }
@@ -18,4 +19,4 @@
     margin-bottom: 5px;
     text-align: center;
   }
-}
\ No newline at end of file
+}

From 85a135ddab5b1c29125bc611da381c6ca122e98d Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 3 Feb 2020 17:01:52 +0000
Subject: [PATCH 351/648] Fix workload summary chart icon for metrics

---
 .../helm-release-card.component.html           |  2 +-
 .../helm-release-summary-tab.component.html    |  3 ++-
 .../entity-summary-title.component.html        |  8 +++++++-
 .../entity-summary-title.component.scss        | 11 +++++------
 .../entity-summary-title.component.ts          | 18 ++++++++++++++++--
 5 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
index 02745a2c0b..84f3afd17b 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
@@ -5,7 +5,7 @@
       <div class='release-title--icon'>
         <img *ngIf="icon; else noIcon" [src]="icon" (error)="loadImageError()">
         <ng-template #noIcon>
-          <mat-icon fontSet="stratos-icons">service</mat-icon>
+          <mat-icon fontSet="stratos-icons">workloads</mat-icon>
         </ng-template>
       </div>
     </div>
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
index 423db018e1..559812d6ce 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
@@ -8,7 +8,8 @@
 <app-loading-page [isLoading]="isBusy$" [text]="loadingMessage">
   <ng-container *ngIf="helmReleaseHelper.release$ | async as release">
     <app-entity-summary-title [imagePath]="release.chart.metadata.icon" [title]="release.name"
-      [subText]="release.chart.metadata.description" [subTitle]="release.chart.metadata.name">
+      [subText]="release.chart.metadata.description" [subTitle]="release.chart.metadata.name"
+      [fallBackIcon]="'workloads'" [fallBackIconFont]="'stratos-icons'">
       <div class="summary">
         <div class="chart-details">
           <app-metadata-item class="chart-details__item" label="Chart Version">{{ release.chart.metadata.version }}
diff --git a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.html b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.html
index f851ce17fe..2e1350a064 100644
--- a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.html
+++ b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.html
@@ -1,6 +1,12 @@
 <div class="entity-summary">
   <div class="entity-summary__header-section">
-    <img *ngIf="imagePath" class="entity-summary__logo" title="{{ title }}'s image" src="{{ imagePath }}">
+    <!-- <img *ngIf="imagePath" class="entity-summary__logo" title="{{ title }}'s image" src="{{ imagePath }}"> -->
+    <img *ngIf="image; else noIcon" class="entity-summary__img" title="{{ title }}'s image" [src]="image"
+      (error)="failedImageLoad()">
+    <ng-template #noIcon>
+      <mat-icon class="entity-summary__logo" fontSet="{{fallBackIconFont}}">{{fallBackIcon}}</mat-icon>
+    </ng-template>
+
     <div class="entity-summary__header-inner">
       <div class="entity-summary__header-wrapper">
         <h1 class="entity-summary__header">{{ title }} </h1>
diff --git a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.scss b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.scss
index f92925f938..82c922af76 100644
--- a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.scss
+++ b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.scss
@@ -1,15 +1,15 @@
 .entity-summary {
   margin: 10px 0;
+  &__img,
   &__logo {
     flex: 0 0 64px;
     max-height: 64px;
   }
-  &__logo-large {
-    max-height: 160px;
+  &__img {
+    align-self: center;
   }
-  &__inline-logo {
-    max-height: 160px;
-    padding-right: 20px;
+  &__logo {
+    font-size: 54px;
   }
   &__sub-header {
     font-size: 16px;
@@ -38,7 +38,6 @@
     opacity: .4;
   }
   &__header-section {
-    align-items: center;
     display: flex;
     margin: 10px;
   }
diff --git a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.ts b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.ts
index b568df7a89..dc11485dec 100644
--- a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.ts
+++ b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.ts
@@ -10,6 +10,20 @@ export class EntitySummaryTitleComponent {
   @Input() subTitle: string;
   @Input() info: string;
   @Input() subText: string;
-  @Input() imagePath: string;
-  @Input() imageSize: string;
+  @Input()
+  get imagePath(): string {
+    return this.image;
+  }
+  set imagePath(image: string) {
+    this.image = image;
+  }
+  @Input() fallBackIcon: string;
+  @Input() fallBackIconFont: string;
+  public image: string;
+
+  public failedImageLoad() {
+    if (this.fallBackIcon) {
+      this.image = null;
+    }
+  }
 }

From 7dc6544e4dfcb49051fe0208aef926c48d13675f Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 3 Feb 2020 17:04:23 +0000
Subject: [PATCH 352/648] Workload Pod chart uses new status & cluster label
 fix

---
 .../workloads/release/tabs/helm-release-helper.service.ts      | 3 ++-
 .../helm-release-summary-tab.component.html                    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

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 f85acfc842..b9652f2389 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
@@ -112,7 +112,8 @@ export class HelmReleaseHelperService {
     };
 
     pods.forEach(pod => {
-      const status = pod.status.phase;
+      const status = pod.expandedStatus.status;
+
       if (!podPhases[status]) {
         podPhases[status] = 1;
       } else {
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
index 559812d6ce..893a819405 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
@@ -17,7 +17,7 @@
           <app-metadata-item class="chart-details__item" label="Application Version">
             {{ release.chart.metadata.appVersion || '-' }}
           </app-metadata-item>
-          <app-metadata-item class="chart-details__item" label="Namespace">
+          <app-metadata-item class="chart-details__item" label="Cluster">
             <a [routerLink]="createClusterLink()">{{ getClusterName() | async }}</a>
           </app-metadata-item>
           <app-metadata-item class="chart-details__item" label="Namespace">

From b5237d06936b568cd60c0e2697aac9689d58189e Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 4 Feb 2020 10:26:03 +0000
Subject: [PATCH 353/648] Various metrics fixes

---
 .../kubernetes/kubernetes-metrics.helpers.ts  | 21 +++++++++
 .../kubernetes-node-metrics.component.ts      | 11 +++--
 ...bernetes-node-simple-metric.component.html |  2 +-
 ...kubernetes-node-simple-metric.component.ts | 11 +++++
 .../pod-metrics/pod-metrics.component.ts      | 43 ++++++++-----------
 .../metrics-chart.component.html              | 21 ++++++++-
 .../metrics-chart.component.scss              | 11 +++++
 .../metrics-chart/metrics-chart.component.ts  | 30 ++++++++++---
 .../metrics.component.helpers.ts              | 16 +++++--
 .../metrics.component.manager.ts              |  2 +
 .../store/src/types/base-metric.types.ts      |  1 +
 11 files changed, 130 insertions(+), 39 deletions(-)
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-metrics.helpers.ts

diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-metrics.helpers.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-metrics.helpers.ts
new file mode 100644
index 0000000000..518b0114ef
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-metrics.helpers.ts
@@ -0,0 +1,21 @@
+import * as moment from 'moment';
+
+export function formatCPUTime(value: string) {
+  const duration = moment.duration(parseFloat(value) * 1000);
+  if (duration.asDays() >= 1) {
+    return `${duration.asDays().toPrecision(2)} d`;
+  }
+  if (duration.asHours() >= 1) {
+    return `${duration.asHours().toPrecision(2)} hrs`;
+  }
+  if (duration.asMinutes() >= 1) {
+    return `${duration.asMinutes().toPrecision(2)} min`;
+  }
+  if (duration.asSeconds() >= 1) {
+    return `${duration.asSeconds().toPrecision(2)} sec`;
+  }
+  if (duration.asMilliseconds() >= 1) {
+    return `${duration.asSeconds().toPrecision(2)} msec`;
+  }
+  return value;
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts
index 847acb8af8..581645824c 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts
@@ -6,6 +6,7 @@ import { IMetricMatrixResult, ChartSeries } from '../../../../../../store/src/ty
 import { IMetricApplication } from '../../../../../../store/src/types/metric.types';
 import { FetchKubernetesChartMetricsAction } from '../../store/kubernetes.actions';
 import { ChartDataTypes, getMetricsChartConfigBuilder } from '../../../../shared/components/metrics-chart/metrics.component.helpers';
+import { formatCPUTime } from '../../kubernetes-metrics.helpers';
 
 @Component({
   selector: 'app-kubernetes-node-metrics',
@@ -61,8 +62,10 @@ export class KubernetesNodeMetricsComponent implements OnInit {
         'Memory Usage (MB)',
         ChartDataTypes.BYTES,
         (series: ChartSeries[]) => {
-          return series.filter(s => !(s.name.indexOf('/') === 0) && !s.name.endsWith('POD'));
-        }
+          return series.filter(s => !(s.name.indexOf('/') === 0) && !!s.metadata.container_name && s.metadata.container_name !== 'POD');
+        },
+        null,
+        (value: string) => value + ' MB'
       ),
       chartConfigBuilder(
         new FetchKubernetesChartMetricsAction(
@@ -74,7 +77,9 @@ export class KubernetesNodeMetricsComponent implements OnInit {
         null,
         (series: ChartSeries[]) => {
           return series.filter(s => !(s.name.indexOf('/') === 0) && s.name.indexOf('POD') === -1);
-        }
+        },
+        (t) => formatCPUTime(t),
+        (t) => formatCPUTime(t)
       )
     ];
   }
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.html
index f52186b904..b01a16cc12 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.html
@@ -3,6 +3,6 @@
     <span class="kube-node-metric__key__span">{{ key }}</span>
   </div>
   <div class="kube-node-metric__value">
-    <span class="kube-node-metric__value__span">{{ value }} {{unit}}</span>
+    <span class="kube-node-metric__value__span">{{ formatValue() }}</span>
   </div>
 </div>
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts
index 0c2135f903..63a71158e2 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts
@@ -1,4 +1,5 @@
 import { Component, Input } from '@angular/core';
+import { formatCPUTime } from '../../../kubernetes-metrics.helpers';
 
 @Component({
   selector: 'app-kubernetes-node-simple-metric',
@@ -15,4 +16,14 @@ export class KubernetesNodeSimpleMetricComponent {
 
   @Input()
   unit: string;
+
+  public formatValue() {
+    switch(this.unit) {
+      case 'secs':
+        return formatCPUTime(this.value.toString());
+      default:
+        const unit = this.unit || '';
+        return `${this.value} ${unit}`;
+    }
+  }
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts b/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
index 0441831b28..81e31a774a 100644
--- a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
@@ -23,6 +23,7 @@ import { KubernetesEndpointService } from '../services/kubernetes-endpoint.servi
 import { KubernetesService } from '../services/kubernetes.service';
 import { KubernetesPod } from '../store/kube.types';
 import { FetchKubernetesMetricsAction, GetKubernetesPod } from '../store/kubernetes.actions';
+import { formatCPUTime } from '../kubernetes-metrics.helpers';
 
 @Component({
   selector: 'app-pod-metrics',
@@ -79,8 +80,11 @@ export class PodMetricsComponent {
         'Memory Usage (MB)',
         ChartDataTypes.BYTES,
         (series: ChartSeries[]) => {
-          return series.filter(s => !s.name.endsWith('POD'));
-        }
+          // Remove the metric series for pod overhead and for the total!
+          return series.filter(s => !!s.metadata.container_name && s.metadata.container_name !== 'POD');
+        },
+        null,
+        (value: string) => value + ' MB'
       ),
       cpuChartConfigBuilder(
         new FetchKubernetesMetricsAction(
@@ -89,29 +93,12 @@ export class PodMetricsComponent {
           `container_cpu_usage_seconds_total{pod_name="${this.podName}",namespace="${namespace}"}`
         ),
         'CPU Usage',
-        null,
+        ChartDataTypes.CPU_TIME,
         (series: ChartSeries[]) => {
-          return series.filter(s => s.name.indexOf('POD') === -1);
+          return series.filter(s => !!s.metadata.container_name && s.metadata.container_name !== 'POD');
         },
-        (tick: string) => {
-          const duration = moment.duration(parseFloat(tick) * 1000);
-          if (duration.asDays() >= 1) {
-            return `${duration.asDays().toPrecision(2)} d`;
-          }
-          if (duration.asHours() >= 1) {
-            return `${duration.asHours().toPrecision(2)} hrs`;
-          }
-          if (duration.asMinutes() >= 1) {
-            return `${duration.asMinutes().toPrecision(2)} min`;
-          }
-          if (duration.asSeconds() >= 1) {
-            return `${duration.asSeconds().toPrecision(2)} sec`;
-          }
-          if (duration.asMilliseconds() >= 1) {
-            return `${duration.asSeconds().toPrecision(2)} msec`;
-          }
-          return tick;
-        }
+        (tick: string) => formatCPUTime(tick),
+        (value: string) => formatCPUTime(value),
       ),
       networkChartConfigBuilder(
         new FetchKubernetesMetricsAction(
@@ -120,7 +107,10 @@ export class PodMetricsComponent {
           `container_network_transmit_bytes_total{pod_name="${this.podName}",namespace="${namespace}"}`
         ),
         'Cumulative Data transmitted (MB)',
-        ChartDataTypes.BYTES
+        ChartDataTypes.BYTES,
+        null,
+        null,
+        (value: string) => value + ' MB'
       ),
       networkChartConfigBuilder(
         new FetchKubernetesMetricsAction(
@@ -129,7 +119,10 @@ export class PodMetricsComponent {
           `container_network_receive_bytes_total{pod_name="${this.podName}",namespace="${namespace}"}`
         ),
         'Cumulative Data received (MB)',
-        ChartDataTypes.BYTES
+        ChartDataTypes.BYTES,
+        null,
+        null,
+        (value: string) => value + ' MB'
       )
     ];
 
diff --git a/src/frontend/packages/core/src/shared/components/metrics-chart/metrics-chart.component.html b/src/frontend/packages/core/src/shared/components/metrics-chart/metrics-chart.component.html
index b443f063dd..42889407c4 100644
--- a/src/frontend/packages/core/src/shared/components/metrics-chart/metrics-chart.component.html
+++ b/src/frontend/packages/core/src/shared/components/metrics-chart/metrics-chart.component.html
@@ -15,6 +15,25 @@ <h2 class="metrics-chart__title" *ngIf="title">{{title}}</h2>
             [showXAxisLabel]="true" [showYAxisLabel]="true" [xAxis]="true" [yAxis]="true"
             [autoScale]="chartConfig.autoScale" [yAxisTicks]="chartConfig.yAxisTicks"
             [yAxisTickFormatting]="chartConfig.yAxisTickFormatting">
+            <ng-template #tooltipTemplate let-model="model">
+              <div class="metrics-chart__tooltip">
+                <div>{{ model.series }} : {{ getTooltipName(model) }}</div>
+                <div class="metrics-chart__tooltip-value">{{ getTooltipValue(model) }}</div>
+              </div>
+            </ng-template>            
+            <ng-template #seriesTooltipTemplate let-model="model">
+              <div class="area-tooltip-container">
+                <div *ngFor="let tooltipItem of getSeriesTooltipModel(model)" class="tooltip-item">
+                  <div *ngIf="!tooltipItem.truncated">
+                  <span class="tooltip-item-color" [style.background-color]="tooltipItem.color"></span>
+                  {{ tooltipItem.series }} : {{ getTooltipValue(tooltipItem) }}
+                </div>
+                <div *ngIf="tooltipItem.truncated" class="metrics-chart__tooltip-truncated">
+                  ...
+                </div>
+              </div>
+            </div>
+            </ng-template>            
           </ngx-charts-line-chart>
           <span *ngSwitchDefault> {{ chartConfig.chartType }} chart type not found </span>
         </div>
@@ -28,4 +47,4 @@ <h2 class="metrics-chart__title" *ngIf="title">{{title}}</h2>
       {{ chartConfig.yAxisLabel }}
     </div>
   </div>
-</ng-template>
\ No newline at end of file
+</ng-template>
diff --git a/src/frontend/packages/core/src/shared/components/metrics-chart/metrics-chart.component.scss b/src/frontend/packages/core/src/shared/components/metrics-chart/metrics-chart.component.scss
index 77c438ad56..1dc30b3095 100644
--- a/src/frontend/packages/core/src/shared/components/metrics-chart/metrics-chart.component.scss
+++ b/src/frontend/packages/core/src/shared/components/metrics-chart/metrics-chart.component.scss
@@ -131,4 +131,15 @@
       padding-top: 5px;
     }
   }
+
+  &__tooltip {
+    margin: 4px 0;
+  }
+  &__tooltip-value {
+    font-size: 16px;
+  }
+
+  &__tooltip-truncated {
+    font-size: 16px;
+  }
 }
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 f3f1df7eca..dfa08eac16 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
@@ -14,17 +14,19 @@ import {
 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 } from './metrics-chart.types';
+import { MetricsChartTypes, MetricsLineChartConfig, YAxisTickFormattingFunc } from './metrics-chart.types';
 import { MetricsChartManager } from './metrics.component.manager';
 
+const MAX_SERIES_IN_TOOLTIP = 16;
 
 export interface MetricsConfig<T = any> {
   metricsAction: MetricsAction;
   getSeriesName: (T) => string;
-  mapSeriesItemName?: (value) => string | Date;
-  mapSeriesItemValue?: (value) => any;
+  mapSeriesItemName?: (value: any) => string | Date;
+  mapSeriesItemValue?: (value: any) => any;
   filterSeries?: MetricsFilterSeries;
   sort?: (a: ChartSeries<T>, b: ChartSeries<T>) => number;
+  tooltipValueFormatter?: YAxisTickFormattingFunc;
 }
 
 @Component({
@@ -54,7 +56,7 @@ export class MetricsChartComponent implements OnInit, OnDestroy, AfterContentIni
 
   private timeSelectorSub: Subscription;
 
-  public results$;
+  public results$: Observable<IMetrics<any> | ChartSeries<any>[]>;
 
   public metricsMonitor: EntityMonitor<IMetrics>;
 
@@ -148,7 +150,7 @@ export class MetricsChartComponent implements OnInit, OnDestroy, AfterContentIni
   ngAfterContentInit() {
     if (this.timeRangeSelector) {
       this.timeRangeSelector.baseAction = this.metricsConfig.metricsAction;
-      this.timeSelectorSub = this.timeRangeSelector.metricsAction.subscribe((action) => {
+      this.timeSelectorSub = this.timeRangeSelector.metricsAction.subscribe((action: MetricsAction) => {
         this.commitAction(action);
       });
     }
@@ -181,4 +183,22 @@ export class MetricsChartComponent implements OnInit, OnDestroy, AfterContentIni
     this.committedAction = action;
     this.store.dispatch(action);
   }
+
+  public getTooltipName(model: { name: { toLocaleString: () => any; }; }) {
+    return model.name.toLocaleString();
+  }
+
+  public getTooltipValue(model: { value: string; }) {
+    return this.metricsConfig.tooltipValueFormatter ? this.metricsConfig.tooltipValueFormatter(model.value) : model.value;
+  }
+
+  public getSeriesTooltipModel(model) {
+    if (model.length <= MAX_SERIES_IN_TOOLTIP) {
+      return model;
+    }
+
+    const truncated = model.slice(0, MAX_SERIES_IN_TOOLTIP);
+    truncated.push({truncated: true});
+    return truncated;
+  }
 }
diff --git a/src/frontend/packages/core/src/shared/components/metrics-chart/metrics.component.helpers.ts b/src/frontend/packages/core/src/shared/components/metrics-chart/metrics.component.helpers.ts
index 7f90134b87..6976345c7c 100644
--- a/src/frontend/packages/core/src/shared/components/metrics-chart/metrics.component.helpers.ts
+++ b/src/frontend/packages/core/src/shared/components/metrics-chart/metrics.component.helpers.ts
@@ -31,6 +31,7 @@ export class MetricsChartHelpers {
 export enum ChartDataTypes {
   BYTES = 'bytes',
   CPU_PERCENT = 'cpu_percent',
+  CPU_TIME = 'cpu_time',
 }
 export function getMetricsChartConfigBuilder<T = any>(getSeriesName: (result) => string) {
   return (
@@ -38,8 +39,10 @@ export function getMetricsChartConfigBuilder<T = any>(getSeriesName: (result) =>
     yAxisLabel: string,
     dataType: ChartDataTypes = null,
     filterSeries?: MetricsFilterSeries,
-    yAxisTickFormatter?: YAxisTickFormattingFunc
-  ) => buildMetricsChartConfig<T>(metricsAction, yAxisLabel, getSeriesName, dataType, filterSeries, yAxisTickFormatter);
+    yAxisTickFormatter?: YAxisTickFormattingFunc,
+    tooltipValueFormatter?: YAxisTickFormattingFunc
+  ) => buildMetricsChartConfig<T>(metricsAction, yAxisLabel, getSeriesName, dataType, filterSeries, yAxisTickFormatter,
+    tooltipValueFormatter);
 }
 
 export function buildMetricsChartConfig<T = any>(
@@ -48,7 +51,8 @@ export function buildMetricsChartConfig<T = any>(
   getSeriesName: (result) => string,
   dataType: ChartDataTypes = null,
   filterSeries?: MetricsFilterSeries,
-  yAxisTickFormatter?: YAxisTickFormattingFunc
+  yAxisTickFormatter?: YAxisTickFormattingFunc,
+  tooltipValueFormatter?: YAxisTickFormattingFunc
 ): [
     MetricsConfig<IMetricMatrixResult<T>>,
     MetricsLineChartConfig
@@ -61,6 +65,7 @@ export function buildMetricsChartConfig<T = any>(
       mapSeriesItemValue: getServiceItemValueMapper(dataType),
       metricsAction,
       filterSeries,
+      tooltipValueFormatter,
     },
     MetricsChartHelpers.buildChartConfig(yAxisLabel, yAxisTickFormatter)
   ];
@@ -69,9 +74,12 @@ export function buildMetricsChartConfig<T = any>(
 function getServiceItemValueMapper(chartDataType: ChartDataTypes) {
   switch (chartDataType) {
     case ChartDataTypes.BYTES:
-      return (bytes) => (bytes / 1000000).toFixed(2);
+      // Megabytes - this should really be dynamic based on the value
+      return (bytes) => (bytes / 1024 / 1024).toFixed(2);
     case ChartDataTypes.CPU_PERCENT:
       return (percent) => parseFloat(percent).toFixed(2);
+    case ChartDataTypes.CPU_TIME:
+      return (time) => parseFloat(time).toFixed(2);
     default:
       return null;
   }
diff --git a/src/frontend/packages/core/src/shared/components/metrics-chart/metrics.component.manager.ts b/src/frontend/packages/core/src/shared/components/metrics-chart/metrics.component.manager.ts
index 4853a459b5..82bff9c4dc 100644
--- a/src/frontend/packages/core/src/shared/components/metrics-chart/metrics.component.manager.ts
+++ b/src/frontend/packages/core/src/shared/components/metrics-chart/metrics.component.manager.ts
@@ -10,6 +10,7 @@ export class MetricsChartManager {
     return metrics.result.map<ChartSeries<T>>(
       result => ({
         name: metricsConfig.getSeriesName(result),
+        metadata: result.metric,
         series: result.values.map(val => ({
           name: metricsConfig.mapSeriesItemName ? metricsConfig.mapSeriesItemName(val[0]) : val[0],
           value: metricsConfig.mapSeriesItemValue ? metricsConfig.mapSeriesItemValue(val[1]) : val[1]
@@ -21,6 +22,7 @@ export class MetricsChartManager {
     return metrics.result.map<ChartSeries<T>>(
       result => ({
         name: metricsConfig.getSeriesName(result),
+        metadata: result.metric,
         series: [{
           name: metricsConfig.mapSeriesItemName ? metricsConfig.mapSeriesItemName(result.value[0]) : result.value[0],
           value: metricsConfig.mapSeriesItemValue ? metricsConfig.mapSeriesItemValue(result.value[1]) : result.value[1]
diff --git a/src/frontend/packages/store/src/types/base-metric.types.ts b/src/frontend/packages/store/src/types/base-metric.types.ts
index f64bee3e83..a281dbb974 100644
--- a/src/frontend/packages/store/src/types/base-metric.types.ts
+++ b/src/frontend/packages/store/src/types/base-metric.types.ts
@@ -43,6 +43,7 @@ export type IMetricStringsResult = IMetricSample[];
 
 export interface ChartSeries<T = any> {
   name: string;
+  metadata: any;
   series: {
     name: string | Date;
     value: T;

From 231c97693d80619df936e8a316ac200e4b348494 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Tue, 4 Feb 2020 12:25:12 +0000
Subject: [PATCH 354/648] Remove comments

---
 deploy/db/Dockerfile.mariadb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/deploy/db/Dockerfile.mariadb b/deploy/db/Dockerfile.mariadb
index 28ef0026c9..26f4e9c543 100644
--- a/deploy/db/Dockerfile.mariadb
+++ b/deploy/db/Dockerfile.mariadb
@@ -6,11 +6,6 @@ RUN \
 		| xargs -0 grep -lZE '^(bind-address|log)' \
 		| xargs -rt -0 sed -Ei 's/^(bind-address|log)/#&/'; 
 
-# Permissions
-# comment out any "user" entires in the MySQL config ("docker-entrypoint.sh" or "--user" will handle user switching)
-#RUN sed -ri 's/^user\s/#&/' /etc/mysql/my.cnf /etc/mysql/conf.d/* && \
-# ensure that /var/run/mysqld (used for socket and lock files) is writable regardless of the UID our mysqld instance ends up having at runtime
-
 COPY mariadb-entrypoint.sh /docker-entrypoint.sh
 COPY mariadb-ping.sh /dbping.sh
 

From 5cd898a66ea70ed9ec4c20354f24cdcc0d84afd6 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 4 Feb 2020 16:42:32 +0000
Subject: [PATCH 355/648] Bug fixes

---
 .../kubernetes/kubernetes-metrics.helpers.ts  | 40 ++++++++++++++++++-
 .../kubernetes-node-metrics.component.ts      | 10 ++---
 ...kubernetes-node-simple-metric.component.ts |  4 +-
 .../pod-metrics/pod-metrics.component.ts      |  4 +-
 .../services/kubernetes-node.service.ts       |  4 +-
 5 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-metrics.helpers.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-metrics.helpers.ts
index 518b0114ef..1507afc966 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-metrics.helpers.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-metrics.helpers.ts
@@ -1,6 +1,44 @@
+import { ValidatorFn } from '@angular/forms';
 import * as moment from 'moment';
 
-export function formatCPUTime(value: string) {
+
+export function formatCPUTime(value: string | number, debug = false): string {
+
+  const cpuTimeFormat = {
+    day: 86400,
+    hour: 3600,
+    minute: 60,
+    second: 1
+  };
+  const cpuTimeFormatOrder = ['day', 'hour', 'minute', 'second'];
+
+  let num = (typeof value === 'number') ? value : parseFloat(replaceAll(value, ',', ''));
+  if (isNaN(num)) {
+    return '-';
+  }
+
+  // Duration is in seconds
+  const result = [];
+  cpuTimeFormatOrder.forEach(key => {
+    const v = Math.floor(num / cpuTimeFormat[key]);
+    num -= v * cpuTimeFormat[key];
+    if (v > 0 || result.length > 0) {
+      result.push(v + key.substr(0, 1));
+    }
+  });
+
+  if (result.length === 0) {
+    result.push('0s');
+  }
+
+  return result.join(' ');
+}
+
+function replaceAll(str, find, replace) {
+  return str.replace(new RegExp(find, 'g'), replace);
+}
+
+export function formatAxisCPUTime(value: string) {
   const duration = moment.duration(parseFloat(value) * 1000);
   if (duration.asDays() >= 1) {
     return `${duration.asDays().toPrecision(2)} d`;
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts
index 581645824c..1960abaa90 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts
@@ -6,7 +6,7 @@ import { IMetricMatrixResult, ChartSeries } from '../../../../../../store/src/ty
 import { IMetricApplication } from '../../../../../../store/src/types/metric.types';
 import { FetchKubernetesChartMetricsAction } from '../../store/kubernetes.actions';
 import { ChartDataTypes, getMetricsChartConfigBuilder } from '../../../../shared/components/metrics-chart/metrics.component.helpers';
-import { formatCPUTime } from '../../kubernetes-metrics.helpers';
+import { formatCPUTime, formatAxisCPUTime } from '../../kubernetes-metrics.helpers';
 
 @Component({
   selector: 'app-kubernetes-node-metrics',
@@ -62,7 +62,7 @@ export class KubernetesNodeMetricsComponent implements OnInit {
         'Memory Usage (MB)',
         ChartDataTypes.BYTES,
         (series: ChartSeries[]) => {
-          return series.filter(s => !(s.name.indexOf('/') === 0) && !!s.metadata.container_name && s.metadata.container_name !== 'POD');
+          return series.filter(s => s.name.indexOf('/') !== 0 && !!s.metadata.container_name && s.metadata.container_name !== 'POD');
         },
         null,
         (value: string) => value + ' MB'
@@ -74,11 +74,11 @@ export class KubernetesNodeMetricsComponent implements OnInit {
           `${KubeNodeMetric.CPU}{instance="${this.kubeNodeService.nodeName}"}`
         ),
         'CPU Usage (secs)',
-        null,
+        ChartDataTypes.CPU_TIME,
         (series: ChartSeries[]) => {
-          return series.filter(s => !(s.name.indexOf('/') === 0) && s.name.indexOf('POD') === -1);
+          return series.filter(s => s.name.indexOf('/') !== 0 && !!s.metadata.container_name && s.metadata.container_name !== 'POD');
         },
-        (t) => formatCPUTime(t),
+        (t) => formatAxisCPUTime(t),
         (t) => formatCPUTime(t)
       )
     ];
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts
index 63a71158e2..38cf007c35 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts
@@ -18,9 +18,9 @@ export class KubernetesNodeSimpleMetricComponent {
   unit: string;
 
   public formatValue() {
-    switch(this.unit) {
+    switch (this.unit) {
       case 'secs':
-        return formatCPUTime(this.value.toString());
+        return formatCPUTime(this.value);
       default:
         const unit = this.unit || '';
         return `${this.value} ${unit}`;
diff --git a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts b/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
index 81e31a774a..fc113e87eb 100644
--- a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
@@ -23,7 +23,7 @@ import { KubernetesEndpointService } from '../services/kubernetes-endpoint.servi
 import { KubernetesService } from '../services/kubernetes.service';
 import { KubernetesPod } from '../store/kube.types';
 import { FetchKubernetesMetricsAction, GetKubernetesPod } from '../store/kubernetes.actions';
-import { formatCPUTime } from '../kubernetes-metrics.helpers';
+import { formatCPUTime, formatAxisCPUTime } from '../kubernetes-metrics.helpers';
 
 @Component({
   selector: 'app-pod-metrics',
@@ -97,7 +97,7 @@ export class PodMetricsComponent {
         (series: ChartSeries[]) => {
           return series.filter(s => !!s.metadata.container_name && s.metadata.container_name !== 'POD');
         },
-        (tick: string) => formatCPUTime(tick),
+        (tick: string) => formatAxisCPUTime(tick),
         (value: string) => formatCPUTime(value),
       ),
       networkChartConfigBuilder(
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts
index 1cb1073ec1..166a43b40e 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts
@@ -59,8 +59,8 @@ export class KubernetesNodeService {
 
 
   public setupMetricObservable(metric: KubeNodeMetric, metricStatistic: MetricStatistic) {
-
-    const query = `${metricStatistic}(${metricStatistic}_over_time(${metric}{kubernetes_io_hostname="${this.nodeName}"}[1h]))`;
+    const containerFilter = ',container_name!="POD", container_name!=""';
+    const query = `${metricStatistic}(${metricStatistic}_over_time(${metric}{kubernetes_io_hostname="${this.nodeName}"${containerFilter}}[1h]))`;
     const metricsAction = new FetchKubernetesMetricsAction(this.nodeName, this.kubeGuid, query);
     const metricsId = MetricsAction.buildMetricKey(this.nodeName, new MetricQueryConfig(query), true, MetricQueryType.QUERY);
     const metricsMonitor = this.entityMonitorFactory.create<any>(metricsId, metricsAction);

From 7c546eea7e40b04fb3730f96dad2cc6730275d4c Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 4 Feb 2020 17:10:08 +0000
Subject: [PATCH 356/648] Fix issues following review

---
 deploy/containers/config-init/config-init.sh   | 18 +++++++++++-------
 .../console/templates/config-init.yaml         |  1 +
 .../console/templates/deployment.yaml          |  2 ++
 deploy/kubernetes/console/tests/user_test.yaml |  7 -------
 src/jetstream/main.go                          |  2 --
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/deploy/containers/config-init/config-init.sh b/deploy/containers/config-init/config-init.sh
index 867e009319..d83ead540d 100755
--- a/deploy/containers/config-init/config-init.sh
+++ b/deploy/containers/config-init/config-init.sh
@@ -83,7 +83,7 @@ KEY=""
 # Just look for the secret - if its not there, we need to create it - otherwise leave it alone
 
 # Check whether the secret already exists
-echo "Fresh installation - checking encryption key secret does not already exist ..."
+echo "Checking encryption key secret does not already exist ..."
 curl -k -s \
     --fail \
     -H "Authorization: Bearer $KUBE_TOKEN" \
@@ -120,9 +120,11 @@ else
     "type": "Opaque",
     "metadata": {
       "name": "@@NAME@@",
-      "stratos-helm-resource": "@@NAME@@",
-      "app.kubernetes.io/name": "stratos",
-      "app.kubernetes.io/instance": "@@RELEASE_NAME@@"
+      labels: {
+        "stratos-helm-resource": "@@NAME@@",
+        "app.kubernetes.io/name": "stratos",
+        "app.kubernetes.io/instance": "@@RELEASE_NAME@@"
+      }
     },
     "data": {
       "key": "@@KEY@@"
@@ -199,9 +201,11 @@ else
       "type": "kubernetes.io/tls",
       "metadata": {
         "name": "@@NAME@@",
-        "stratos-helm-resource": "@@NAME@@",
-        "app.kubernetes.io/name": "stratos",
-        "app.kubernetes.io/instance": "@@RELEASE_NAME@@"
+        labels: {
+          "stratos-helm-resource": "@@NAME@@",
+          "app.kubernetes.io/name": "stratos",
+          "app.kubernetes.io/instance": "@@RELEASE_NAME@@"
+        }
       },
       "data": {
         "tls.crt": "@@CRT@@",
diff --git a/deploy/kubernetes/console/templates/config-init.yaml b/deploy/kubernetes/console/templates/config-init.yaml
index 8bcfec914c..c0f96fdf80 100644
--- a/deploy/kubernetes/console/templates/config-init.yaml
+++ b/deploy/kubernetes/console/templates/config-init.yaml
@@ -34,6 +34,7 @@ rules:
   - "create"
   - "post"
   - "get"
+  - "delete"
 {{- end }}
 ---
 # Role binding for service account "config-init" and role "config-init-role"
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index f592d43426..4939784d46 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -100,6 +100,8 @@ spec:
           value: "30"
         - name: HTTP_CLIENT_TIMEOUT_MUTATING_IN_SECS
           value: "120"
+        - name: HTTP_CLIENT_TIMEOUT_LONGRUNNING_IN_SECS
+          value: "600"
         - name: SKIP_TLS_VERIFICATION
           value: "false"
         - name: CONSOLE_PROXY_TLS_ADDRESS
diff --git a/deploy/kubernetes/console/tests/user_test.yaml b/deploy/kubernetes/console/tests/user_test.yaml
index 09adfdb541..a03a8e0198 100644
--- a/deploy/kubernetes/console/tests/user_test.yaml
+++ b/deploy/kubernetes/console/tests/user_test.yaml
@@ -81,10 +81,3 @@ tests:
           value: VEVTVF9QQVNTV09SRA==
         template: secrets.yaml
         documentIndex: 0
-
-
-
-
-
-
-
diff --git a/src/jetstream/main.go b/src/jetstream/main.go
index 377d183948..147a0877ce 100644
--- a/src/jetstream/main.go
+++ b/src/jetstream/main.go
@@ -183,7 +183,6 @@ func main() {
 
 	// Store database provider name for diagnostics
 	portalConfig.DatabaseProviderName = dc.DatabaseProvider
-	portalConfig.CanMigrateDatabaseSchema = true
 
 	cnsis.InitRepositoryProvider(dc.DatabaseProvider)
 	tokens.InitRepositoryProvider(dc.DatabaseProvider)
@@ -191,7 +190,6 @@ func main() {
 	localusers.InitRepositoryProvider(dc.DatabaseProvider)
 
 	// Establish a Postgresql connection pool
-	// var databaseConnectionPool *sql.DB
 	databaseConnectionPool, migratorConf, err := initConnPool(dc, envLookup)
 	if err != nil {
 		log.Fatal(err.Error())

From f0cb6805b89babf782147b0d725c12df96d1ca18 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 5 Feb 2020 10:03:31 +0000
Subject: [PATCH 357/648] Remove debug line

---
 .../kubedash-configuration.component.ts                       | 4 ++--
 1 file changed, 2 insertions(+), 2 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 57fc55e764..f2e26cfaf7 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
@@ -3,7 +3,7 @@ import { Component, OnDestroy } from '@angular/core';
 import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material';
 import { ActivatedRoute } from '@angular/router';
 import { BehaviorSubject, Observable, Subscription } from 'rxjs';
-import { delay, distinctUntilChanged, filter, map } from 'rxjs/operators';
+import { distinctUntilChanged, filter, map } from 'rxjs/operators';
 
 import { ConfirmationDialogConfig } from '../../../../shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../shared/components/confirmation-dialog.service';
@@ -210,7 +210,7 @@ export class KubedashConfigurationComponent implements OnDestroy {
       return;
     }
 
-    obs.pipe(delay(999999999)).subscribe(() => {
+    obs.subscribe(() => {
       this.snackBar.open(okMsg, 'Dismiss', { duration: 3000 });
       busy.next(false);
       this.refresh();

From e24837f458a2e4a087b67c120361eab1635be32c Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 5 Feb 2020 12:56:37 +0000
Subject: [PATCH 358/648] Ensure we update password on each start

---
 deploy/db/mariadb-entrypoint.sh | 50 ++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/deploy/db/mariadb-entrypoint.sh b/deploy/db/mariadb-entrypoint.sh
index b1f36c01e9..11948b80b2 100755
--- a/deploy/db/mariadb-entrypoint.sh
+++ b/deploy/db/mariadb-entrypoint.sh
@@ -73,6 +73,43 @@ _get_config() {
 	# match "datadir      /some/path with/spaces in/it here" but not "--xyz=abc\n     datadir (xyz)"
 }
 
+# Stratos Changes to reset password
+reset_passwords() {
+	mysqld --skip-grant-tables --skip-networking --socket="${SOCKET}" &
+	pid="$!"
+
+	mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
+	for i in {30..0}; do
+		if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
+			break
+		fi
+		echo '[Password Change] MySQL startup in progress...'
+		sleep 1
+	done
+	if [ "$i" = 0 ]; then
+		echo >&2 '[Password Changed] MySQL startup failed.'
+		exit 1
+	fi
+
+	echo '[Password Change] MySQL ready for password changes ...'
+
+	"${mysql[@]}"  <<-EOSQL
+	FLUSH PRIVILEGES;
+	ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}';
+	ALTER USER 'root'@'%' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}';
+	ALTER USER '$MYSQL_USER'@'%' IDENTIFIED BY '${MYSQL_PASSWORD}';
+	FLUSH PRIVILEGES ;
+EOSQL
+
+	if ! kill -s TERM "$pid" || ! wait "$pid"; then
+		echo >&2 '[Password Change] MySQL => Password update failed.'
+		echo "[Password Change] Failed"
+		exit 1
+	fi
+
+	echo "[Password Change] Passwords updated okay"
+}
+
 # allow the container to be started with `--user`
 if [ "$1" = 'mysqld' -a -z "$wantHelp" -a "$(id -u)" = '0' ]; then
 	_check_config "$@"
@@ -82,6 +119,8 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" -a "$(id -u)" = '0' ]; then
 	exec gosu mysql "$BASH_SOURCE" "$@"
 fi
 
+SOCKET="$(_get_config 'socket' "$@")"
+
 if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 	# still need to check config, container may have started with --user
 	_check_config "$@"
@@ -89,6 +128,9 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 	DATADIR="$(_get_config 'datadir' "$@")"
 
 	echo "Data dir is: ${DATADIR}"
+
+	# Stratos change
+	RESET_PASSWORDS="true"
 	
 	if [ ! -d "$DATADIR/mysql" ]; then
 		file_env 'MYSQL_ROOT_PASSWORD'
@@ -101,6 +143,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 		mkdir -p "$DATADIR"
 		# ========================================
 		# Stratos changes
+		RESET_PASSWORDS="false"
 		chown -R mysql:mysql "$DATADIR"
 		# ========================================
 
@@ -116,7 +159,6 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 		mysql_install_db "${installArgs[@]}" "${@:2}"
 		echo 'Database initialized'
 
-		SOCKET="$(_get_config 'socket' "$@")"
 		"$@" --skip-networking --socket="${SOCKET}" &
 		pid="$!"
 
@@ -211,4 +253,10 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 	fi
 fi
 
+if [ "${RESET_PASSWORDS}" == "true" ]; then
+	echo "Resetting passwords ..."
+  reset_passwords
+fi
+
+echo "Starting MariaDB ..."
 exec "$@"

From c4c7589f75a80b41373b5eb3d180e1a890992a1c Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 6 Feb 2020 09:09:49 +0000
Subject: [PATCH 359/648] DB MIgrations are immutable

---
 .../monocular/20190307115300_ChartStore.go    | 57 +++++++++++++++++++
 .../20200206090600_ChartStoreRemoval.go       | 29 ++++++++++
 2 files changed, 86 insertions(+)
 create mode 100644 src/jetstream/plugins/monocular/20190307115300_ChartStore.go
 create mode 100644 src/jetstream/plugins/monocular/20200206090600_ChartStoreRemoval.go

diff --git a/src/jetstream/plugins/monocular/20190307115300_ChartStore.go b/src/jetstream/plugins/monocular/20190307115300_ChartStore.go
new file mode 100644
index 0000000000..409fb3691b
--- /dev/null
+++ b/src/jetstream/plugins/monocular/20190307115300_ChartStore.go
@@ -0,0 +1,57 @@
+package monocular
+
+import (
+	"database/sql"
+	"strings"
+
+	"bitbucket.org/liamstask/goose/lib/goose"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore"
+)
+
+func init() {
+	datastore.RegisterMigration(20190307115301, "ChartStore", func(txn *sql.Tx, conf *goose.DBConf) error {
+
+		createChartsTable := "CREATE TABLE IF NOT EXISTS charts ("
+		createChartsTable += "id                  VARCHAR(255) NOT NULL,"
+		createChartsTable += "name                VARCHAR(255) NOT NULL,"
+		createChartsTable += "repo_name           VARCHAR(255) NOT NULL,"
+		createChartsTable += "update_batch        VARCHAR(64)  NOT NULL,"
+		createChartsTable += "content             TEXT,"
+		createChartsTable += "last_updated        TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,"
+		createChartsTable += "PRIMARY KEY (id) );"
+
+		_, err := txn.Exec(createChartsTable)
+		if err != nil {
+			return err
+		}
+
+		createIndex := "CREATE INDEX charts_id ON charts (id);"
+		_, err = txn.Exec(createIndex)
+		if err != nil {
+			return err
+		}
+
+		binaryDataType := "BYTEA"
+		if strings.Contains(conf.Driver.Name, "mysql") {
+			binaryDataType = "BLOB"
+		}
+
+		createChartFilesTable := "CREATE TABLE IF NOT EXISTS chart_files ("
+		createChartFilesTable += "id                  VARCHAR(255) NOT NULL,"
+		createChartFilesTable += "filename            VARCHAR(64)  NOT NULL,"
+		createChartFilesTable += "chart_id            VARCHAR(255) NOT NULL,"
+		createChartFilesTable += "name                VARCHAR(255) NOT NULL,"
+		createChartFilesTable += "repo_name           VARCHAR(255) NOT NULL,"
+		createChartFilesTable += "digest              VARCHAR(255) NOT NULL,"
+		createChartFilesTable += "content             " + binaryDataType + ","
+		createChartFilesTable += "PRIMARY KEY (id, filename) );"
+
+		_, err = txn.Exec(createChartFilesTable)
+		if err != nil {
+			return err
+		}
+
+		return nil
+	})
+}
diff --git a/src/jetstream/plugins/monocular/20200206090600_ChartStoreRemoval.go b/src/jetstream/plugins/monocular/20200206090600_ChartStoreRemoval.go
new file mode 100644
index 0000000000..078610a100
--- /dev/null
+++ b/src/jetstream/plugins/monocular/20200206090600_ChartStoreRemoval.go
@@ -0,0 +1,29 @@
+package monocular
+
+import (
+	"database/sql"
+	"strings"
+
+	"bitbucket.org/liamstask/goose/lib/goose"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore"
+)
+
+func init() {
+	datastore.RegisterMigration(20200206090600, "ChartStoreRemoval", func(txn *sql.Tx, conf *goose.DBConf) error {
+
+		dropChartsTable := "DROP TABLE IF EXISTS charts";
+		_, err := txn.Exec(dropChartsTable)
+		if err != nil {
+			return err
+		}
+
+		dropChartFilesTable := "DROP TABLE IF EXISTS chart_files;"
+		_, err = txn.Exec(dropChartFilesTable)
+		if err != nil {
+			return err
+		}
+
+		return nil
+	})
+}

From 6c3679b7602f3e8ab371a93e84a8e2d36b1824c2 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 6 Feb 2020 09:49:46 +0000
Subject: [PATCH 360/648] Fix unused import

---
 .../plugins/monocular/20200206090600_ChartStoreRemoval.go        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/jetstream/plugins/monocular/20200206090600_ChartStoreRemoval.go b/src/jetstream/plugins/monocular/20200206090600_ChartStoreRemoval.go
index 078610a100..8bae6ce176 100644
--- a/src/jetstream/plugins/monocular/20200206090600_ChartStoreRemoval.go
+++ b/src/jetstream/plugins/monocular/20200206090600_ChartStoreRemoval.go
@@ -2,7 +2,6 @@ package monocular
 
 import (
 	"database/sql"
-	"strings"
 
 	"bitbucket.org/liamstask/goose/lib/goose"
 

From 37d9a94432482e7001e6981b95ee14cd210806fb Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 7 Feb 2020 09:01:32 +0000
Subject: [PATCH 361/648] FIxes to get the chart repo service working

---
 deploy/kubernetes/build.sh                    |  8 ++-
 .../templates/fdb-doc-layer-deployment.yaml   |  4 ++
 .../templates/fdbserver-deployment.yaml       |  4 ++
 .../console/templates/chartrepo.yaml          | 24 +++++++-
 .../console/templates/deployment.yaml         |  2 +
 .../kubernetes/console/templates/service.yaml | 19 ------
 src/jetstream/go.mod                          |  4 +-
 src/jetstream/go.sum                          | 29 +++++++++
 .../plugins/monocular/chart-repo/Dockerfile   | 10 +--
 src/jetstream/plugins/monocular/main.go       | 61 ++++++++++++++++---
 src/jetstream/plugins/monocular/sync.go       | 26 ++++----
 11 files changed, 144 insertions(+), 47 deletions(-)

diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
index 2d28f1e5ad..a39dd6338e 100755
--- a/deploy/kubernetes/build.sh
+++ b/deploy/kubernetes/build.sh
@@ -19,7 +19,7 @@ BOLD="\033[1m"
 PROD_RELEASE=false
 DOCKER_REGISTRY=docker.io
 DOCKER_ORG=splatform
-BASE_IMAGE_TAG=opensuse
+BASE_IMAGE_TAG=openleap15_1
 OFFICIAL_TAG=cap
 TAG=$(date -u +"%Y%m%dT%H%M%SZ")
 ADD_OFFICIAL_TAG="false"
@@ -196,6 +196,10 @@ if [ "${CHART_ONLY}" == "false" ]; then
   # Build and push an image based on the nginx container (Front-end)
   log "-- Building/publishing the runtime container image for the Console web server (frontend)"
   patchAndPushImage stratos-console deploy/Dockerfile.ui "${STRATOS_PATH}" prod-build
+
+  # Build and push an image for the Helm Repo Sync Tool
+  log "-- Building/publishing Monocular Chart Repo"
+  patchAndPushImage stratos-chartsync Dockerfile "${STRATOS_PATH}/src/jetstream/plugins/monocular/chart-repo"
 fi
 
 log "-- Building Helm Chart"
@@ -207,7 +211,7 @@ DEST_HELM_CHART_PATH="${STRATOS_PATH}/deploy/kubernetes/helm-chart"
 
 rm -rf ${DEST_HELM_CHART_PATH}
 mkdir -p ${DEST_HELM_CHART_PATH}
-cp -RT ${SRC_HELM_CHART_PATH}/ ${DEST_HELM_CHART_PATH}/
+cp -R ${SRC_HELM_CHART_PATH}/ ${DEST_HELM_CHART_PATH}/
 
 pushd ${DEST_HELM_CHART_PATH} > /dev/null
 
diff --git a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml b/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
index 48fcd62697..788beeb3c6 100644
--- a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
+++ b/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
@@ -1,4 +1,8 @@
+{{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major (trimSuffix "+" .Capabilities.KubeVersion.Minor) )}}
+apiVersion: apps/v1
+{{- else }}
 apiVersion: apps/v1beta2
+{{- end }}
 kind: Deployment
 metadata:
   name: {{ template "fullname" . }}-fdbdoclayer
diff --git a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml b/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
index 68c8c27a2c..825b6e35cf 100644
--- a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
+++ b/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
@@ -1,4 +1,8 @@
+{{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major (trimSuffix "+" .Capabilities.KubeVersion.Minor) )}}
+apiVersion: apps/v1
+{{- else }}
 apiVersion: apps/v1beta2
+{{- end }}
 kind: Deployment
 metadata:
   name: {{ template "fullname" . }}-fdbserver
diff --git a/deploy/kubernetes/console/templates/chartrepo.yaml b/deploy/kubernetes/console/templates/chartrepo.yaml
index 7a77592bb3..6a8b6d6f27 100644
--- a/deploy/kubernetes/console/templates/chartrepo.yaml
+++ b/deploy/kubernetes/console/templates/chartrepo.yaml
@@ -30,10 +30,30 @@ spec:
     spec:
       containers:
       - name: chartrepo
-        image: docker.io/kreinecke/suse-fdb-chart-repo:latest
+        image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/stratos-chartsync:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         command: ["/chartrepo"]
         args: ["serve", "--debug=true","--doclayer-url=mongodb://{{ .Release.Name }}-chartrepo:27016"]
         ports:
         - name: endpoint
-          containerPort: 8080
\ No newline at end of file
+          containerPort: 8080
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: "{{ .Release.Name }}-chartrepo"
+  labels:
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "stratos-chartrepo-service"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+spec:
+  type: ClusterIP
+  ports:
+  - name: chartrepo
+    port: 8080
+    targetPort: 8080
+  selector:
+    app: "{{ .Release.Name }}"
+    app.kubernetes.io/component: "stratos-chartrepo"
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 7621674616..311a47cc03 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -101,6 +101,8 @@ spec:
         imagePullPolicy: {{.Values.imagePullPolicy}}
         name: proxy
         env:
+        - name: STRATOS_HELM_RELEASE
+          value: "{{ .Release.Name }}"
         - name: DB_USER
           value: "{{ .Values.mariadb.mariadbUser }}"
         - name: DB_PASSWORD
diff --git a/deploy/kubernetes/console/templates/service.yaml b/deploy/kubernetes/console/templates/service.yaml
index 39b300c2ed..2e3a5a3de3 100644
--- a/deploy/kubernetes/console/templates/service.yaml
+++ b/deploy/kubernetes/console/templates/service.yaml
@@ -93,22 +93,3 @@ spec:
     targetPort: mysql
   selector:
     app: "{{ .Release.Name }}"
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: "{{ .Release.Name }}-chartrepo"
-  labels:
-    app.kubernetes.io/name: "stratos"
-    app.kubernetes.io/instance: "{{ .Release.Name }}"
-    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "stratos-chartrepo-service"
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-spec:
-  type: ClusterIP
-  ports:
-  - name: chartrepo
-    port: 8080
-    targetPort: 8080
-  selector:
-    app: "{{ .Release.Name }}"
\ No newline at end of file
diff --git a/src/jetstream/go.mod b/src/jetstream/go.mod
index 98caecab23..12de3a02f2 100644
--- a/src/jetstream/go.mod
+++ b/src/jetstream/go.mod
@@ -32,7 +32,6 @@ require (
 	github.com/elazarl/goproxy/ext v0.0.0-20191011121108-aa519ddbe484 // indirect
 	github.com/fatih/color v1.7.0 // indirect
 	github.com/go-sql-driver/mysql v1.4.1
-	github.com/golang/snappy v0.0.1 // indirect
 	github.com/google/go-querystring v1.0.0 // indirect
 	github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e // indirect
 	github.com/gorilla/context v1.1.1
@@ -66,11 +65,12 @@ require (
 	github.com/smartystreets/goconvey v1.6.4
 	github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect
 	github.com/tedsuo/rata v1.0.0 // indirect
+	github.com/tidwall/pretty v1.0.1 // indirect
 	github.com/ulikunitz/xz v0.5.6 // indirect
 	github.com/valyala/fasttemplate v1.1.0 // indirect
 	github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec // indirect
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
-	golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152
+	golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9
 	google.golang.org/appengine v1.6.5
 	gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0
 	gopkg.in/cheggaaa/pb.v1 v1.0.27 // indirect
diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index 4bd07417b1..9e9247c616 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -38,6 +38,8 @@ github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RP
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc=
 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
+github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/semver/v3 v3.0.1 h1:2kKm5lb7dKVrt5TYUiAavE6oFc1cFT0057UVGT+JqLk=
 github.com/Masterminds/semver/v3 v3.0.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/Masterminds/sprig v2.18.0+incompatible h1:QoGhlbC6pter1jxKnjMFxT8EqsLuDE6FEcNbWEpw+lI=
@@ -148,6 +150,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumC
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/disintegration/imaging v1.6.0 h1:nVPXRUUQ36Z7MNf0O77UzgnOb1mkMMor7lmJMJXc/mA=
 github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ=
+github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
+github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
 github.com/docker/cli v0.0.0-20190506213505-d88565df0c2d h1:qdD+BtyCE1XXpDyhvn0yZVcZOLILdj9Cw4pKu0kQbPQ=
 github.com/docker/cli v0.0.0-20190506213505-d88565df0c2d/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
@@ -256,6 +260,7 @@ github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+
 github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
 github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
@@ -318,6 +323,8 @@ github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZs
 github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U=
 github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
+github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/sessions v1.1.3 h1:uXoZdcdA5XdXF3QzuSlheVRUvjl+1rKY7zBXL68L9RU=
@@ -362,6 +369,8 @@ github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGAR
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3 h1:sHsPfNMAG70QAvKbddQ0uScZCHQoZsT5NykGRCeeeIs=
 github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
+github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a h1:zPPuIq2jAWWPTrGt70eK/BSch+gFAGrNzecsoENgu2o=
+github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
@@ -392,6 +401,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 h1:wdTBUArlqtBYGN2Dd4+zsaFxFH0m4iGCHToW10jPX0k=
 github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
+github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a h1:VqeX/fehAB6FtBox0TVYcjOMXGE56INQIfbXegditX4=
+github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
 github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc h1:Ttr4Z3ZrMv4rAXn10UAqOC8ACx+F1omvcyV1a3hRArE=
 github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc/go.mod h1:ItxiN33Ho7Di8wiC4S4XqbH1NLF0DNdDWOd/5MI9gJU=
 github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28 h1:mkl3tvPHIuPaWsLtmHTybJeoVEW7cbePK73Ir8VtruA=
@@ -564,11 +575,15 @@ github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 h1:mujcChM89zOHwgZBBN
 github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0=
 github.com/tedsuo/rata v1.0.0 h1:Sf9aZrYy6ElSTncjnGkyC2yuVvz5YJetBIUKJ4CmeKE=
 github.com/tedsuo/rata v1.0.0/go.mod h1:X47ELzhOoLbfFIY0Cql9P6yo3Cdwf2CMX3FVZxRzJPc=
+github.com/tidwall/pretty v1.0.1 h1:WE4RBSZ1x6McVVC8S/Md+Qse8YUv6HRObAx6ke00NY8=
+github.com/tidwall/pretty v1.0.1/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ulikunitz/xz v0.5.6 h1:jGHAfXawEGZQ3blwU5wnWKQJvAraT7Ftq9EXjnXYgt8=
 github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
 github.com/unrolled/render v1.0.0 h1:XYtvhA3UkpB7PqkvhUFYmpKD55OudoIeygcfus4vcd4=
 github.com/unrolled/render v1.0.0/go.mod h1:tu82oB5W2ykJRVioYsB+IQKcft7ryBr7w12qMBUPyXg=
+github.com/unrolled/render v1.0.1 h1:VDDnQQVfBMsOsp3VaCJszSO0nkBIVEYoPWeRThk9spY=
+github.com/unrolled/render v1.0.1/go.mod h1:gN9T0NhL4Bfbwu8ann7Ry/TGHYfosul+J0obPf6NBdM=
 github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
@@ -578,6 +593,10 @@ github.com/valyala/fasttemplate v1.1.0 h1:RZqt0yGBsps8NGvLSGW804QQqCUYYLsaOjTVHy
 github.com/valyala/fasttemplate v1.1.0/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec h1:Klu98tQ9Z1t23gvC7p7sCmvxkZxLhBHLNyrUPsWsYFg=
 github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec/go.mod h1:wPlfmglZmRWMYv/qJy3P+fK/UnoQB5ISk4txfNd9tDo=
+github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk=
+github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
+github.com/xdg/stringprep v1.0.0 h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0=
+github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
@@ -598,6 +617,8 @@ github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f h1
 github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
 github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
 github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
+go.mongodb.org/mongo-driver v1.1.3 h1:++7u8r9adKhGR+I79NfEtYrk2ktjenErXM99PSufIoI=
+go.mongodb.org/mongo-driver v1.1.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
@@ -611,6 +632,8 @@ golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152 h1:ZC1Xn5A1nlpSmQCIva4bZ3ob3lmhYIefc+GU+DLg1Ow=
 golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9 h1:abxekknhS/Drh3uoQDk5Hc7BgeiyI39Crb7vhf/1j5s=
+golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -618,6 +641,8 @@ golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 h1:00VmoueYNlNz/aHIilyyQz/
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067 h1:KYGJGHOQy8oSi1fDlSpcZF0+juKwk/hEMv5SiwHogR0=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U=
+golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -653,6 +678,8 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -760,6 +787,8 @@ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8
 k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/helm v2.12.3+incompatible h1:wo1cdYjOnr5Z+LFuhtwIJaeQnec6D4gcg2H5UAKzY6w=
 k8s.io/helm v2.12.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
+k8s.io/helm v2.16.1+incompatible h1:L+k810plJlaGWEw1EszeT4deK8XVaKxac1oGcuB+WDc=
+k8s.io/helm v2.16.1+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
 k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
diff --git a/src/jetstream/plugins/monocular/chart-repo/Dockerfile b/src/jetstream/plugins/monocular/chart-repo/Dockerfile
index 8a6770b29d..3bec7d725c 100644
--- a/src/jetstream/plugins/monocular/chart-repo/Dockerfile
+++ b/src/jetstream/plugins/monocular/chart-repo/Dockerfile
@@ -1,10 +1,12 @@
-FROM golang:1.12 as builder
-COPY . /go/src/github.com/helm/monocular
+FROM splatform/stratos-bk-build-base:leap15_1 as builder
+
+COPY --chown=stratos:users . /go/src/github.com/helm/monocular
 WORKDIR /go/src/github.com/helm/monocular
 ARG VERSION
 RUN GO111MODULE=on GOPROXY=https://gocenter.io CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-X main.version=$VERSION" .
-FROM scratch
-COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+
+FROM splatform/stratos-bk-build-base:leap15_1
+#COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=builder /go/src/github.com/helm/monocular/chartrepo /chartrepo
 USER 1001
 CMD ["/chartrepo"]
diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index 8f0f3d5cba..99f6fe5560 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -2,6 +2,7 @@ package monocular
 
 import (
 	"errors"
+	"fmt"
 	"net/http"
 	"strings"
 
@@ -14,16 +15,24 @@ import (
 )
 
 const (
-	helmEndpointType = "helm"
+	helmEndpointType      = "helm"
+	prefix                = "/pp/v1/chartsvc/"
+	kubeReleaseNameEnvVar = "STRATOS_HELM_RELEASE"
+	foundationDBURLEnvVar = "HELM_FDB_URL"
+	syncServerURLEnvVar   = "HELM_SYNC_SERVER_URL"
+	// e.g. MY_CONSOLE_FDBDOCLAYER_FDBDOCLAYER_PORT=tcp://10.105.215.71:27016
+	fdbHostPortEnvVar = "FDBDOCLAYER_FDBDOCLAYER_PORT"
+	//MY_CONSOLE_CHARTREPO_PORT=tcp://10.108.171.246:8080
+	syncServerHostPortEnvVar = "CHARTREPO_PORT"
 )
 
-const prefix = "/pp/v1/chartsvc/"
-
 // Monocular is a plugin for Monocular
 type Monocular struct {
-	portalProxy    interfaces.PortalProxy
-	chartSvcRoutes http.Handler
-	RepoQueryStore chartsvc.ChartSvcDatastore
+	portalProxy     interfaces.PortalProxy
+	chartSvcRoutes  http.Handler
+	RepoQueryStore  chartsvc.ChartSvcDatastore
+	FoundationDBURL string
+	SyncServiceURL  string
 }
 
 // Init creates a new Monocular
@@ -37,7 +46,12 @@ func (m *Monocular) GetChartStore() chartsvc.ChartSvcDatastore {
 
 // Init performs plugin initialization
 func (m *Monocular) Init() error {
-	fdbURL := "mongodb://127.0.0.1:27016"
+	log.Debug("Monocular init .... ")
+	if err := m.configure(); err != nil {
+		return err
+	}
+
+	fdbURL := m.FoundationDBURL
 	fDB := "monocular-plugin"
 	debug := false
 	m.ConfigureChartSVC(&fdbURL, &fDB, &debug)
@@ -47,6 +61,39 @@ func (m *Monocular) Init() error {
 	return nil
 }
 
+func (m *Monocular) configure() error {
+	if releaseName, ok := m.portalProxy.Env().Lookup(kubeReleaseNameEnvVar); ok {
+		// We are deployed in Kubernetes
+		releaseNameEnvVarPrefix := getReleaseNameEnvVarPrefix(releaseName)
+		if url, ok := m.portalProxy.Env().Lookup(fmt.Sprintf("%s_%s", releaseNameEnvVarPrefix, fdbHostPortEnvVar)); ok {
+			m.FoundationDBURL = strings.ReplaceAll(url, "tcp://", "mongodb://")
+		}
+		if url, ok := m.portalProxy.Env().Lookup(fmt.Sprintf("%s_%s", releaseNameEnvVarPrefix, syncServerHostPortEnvVar)); ok {
+			m.SyncServiceURL = strings.ReplaceAll(url, "tcp://", "http://")
+		}
+
+	} else {
+		// Env var lookup when not running in Kubernetes
+		m.FoundationDBURL = m.portalProxy.Env().String(foundationDBURLEnvVar, "")
+		m.SyncServiceURL = m.portalProxy.Env().String(syncServerURLEnvVar, "")
+	}
+
+	log.Debugf("Foundation DB : %s", m.FoundationDBURL)
+	log.Debugf("Sync Server   : %s", m.SyncServiceURL)
+
+	if len(m.FoundationDBURL) == 0 || len(m.SyncServiceURL) == 0 {
+		return errors.New("Helm Monocular DB and/or Sync server are not configured")
+	}
+
+	return nil
+}
+
+func getReleaseNameEnvVarPrefix(name string) string {
+	prefix := strings.ToUpper(name)
+	prefix = strings.ReplaceAll(prefix, "-", "_")
+	return prefix
+}
+
 func (m *Monocular) syncOnStartup() {
 
 	// Get the repositories that we currently have
diff --git a/src/jetstream/plugins/monocular/sync.go b/src/jetstream/plugins/monocular/sync.go
index 25dc12613a..eb004523df 100644
--- a/src/jetstream/plugins/monocular/sync.go
+++ b/src/jetstream/plugins/monocular/sync.go
@@ -27,8 +27,8 @@ type SyncMetadata struct {
 
 const (
 	chartRepoPathPrefix = "/v1"
-	statusPollInterval = 30
-	statusPollTimeout = 320
+	statusPollInterval  = 30
+	statusPollTimeout   = 320
 )
 
 // Sync Channel
@@ -63,8 +63,10 @@ func (m *Monocular) processSyncRequests() {
 				Busy:   true,
 			}
 			m.portalProxy.UpdateEndointMetadata(job.Endpoint.GUID, marshalSyncMetadata(metadata))
+			syncURL := fmt.Sprintf("%s%s/sync/%s", m.SyncServiceURL, chartRepoPathPrefix, job.Endpoint.Name)
+
 			//Hit the sync server container endpoint to trigger a sync for given repo
-			response, err := putRequest("http://127.0.0.1:8080"+chartRepoPathPrefix+"/sync/"+job.Endpoint.Name, strings.NewReader(repoSyncRequestParams))
+			response, err := putRequest(syncURL, strings.NewReader(repoSyncRequestParams))
 			metadata.Busy = false
 			if err != nil {
 				log.Warn("Request to sync repository failed: %v", err)
@@ -74,7 +76,7 @@ func (m *Monocular) processSyncRequests() {
 				statusResponse := common.SyncJobStatusResponse{}
 				defer response.Body.Close()
 				err := json.NewDecoder(response.Body).Decode(&statusResponse)
-				if err != nil { 
+				if err != nil {
 					log.Errorf("Unable to parse response from chart-repo server, sync request may not be processed: %v", err)
 					metadata.Status = "Sync Failed"
 				} else if statusResponse.Status != common.SyncStatusInProgress {
@@ -85,7 +87,8 @@ func (m *Monocular) processSyncRequests() {
 					m.updateMetadata(job.Endpoint.GUID, metadata)
 					log.Infof("Sync in progress for repository: %s", job.Endpoint.APIEndpoint.String())
 					//Now wait for success
-					err := waitForSyncComplete("http://127.0.0.1:8080"+chartRepoPathPrefix+"/status/"+job.Endpoint.Name)
+					statusURL := fmt.Sprintf("%s%s/status/%s", m.SyncServiceURL, chartRepoPathPrefix, job.Endpoint.Name)
+					err := waitForSyncComplete(statusURL)
 					if err == nil {
 						metadata.Status = "Synchronized"
 					} else {
@@ -98,7 +101,8 @@ func (m *Monocular) processSyncRequests() {
 		} else if job.Action == 1 {
 			log.Infof("Deleting Helm Repository: %s", job.Endpoint.Name)
 			//Hit the sync server container endpoint to trigger a delete for given repo
-			response, err := putRequest("http://127.0.0.1:8080"+chartRepoPathPrefix+"/delete/"+job.Endpoint.Name, strings.NewReader(repoSyncRequestParams))
+			deleteURL := fmt.Sprintf("%s%s/delete/%s", m.SyncServiceURL, chartRepoPathPrefix, job.Endpoint.Name)
+			response, err := putRequest(deleteURL, strings.NewReader(repoSyncRequestParams))
 			//Extract status from response
 			if err != nil {
 				log.Warn("Request to delete repository failed: %v+", err)
@@ -106,20 +110,20 @@ func (m *Monocular) processSyncRequests() {
 				statusResponse := common.SyncJobStatusResponse{}
 				defer response.Body.Close()
 				err := json.NewDecoder(response.Body).Decode(&statusResponse)
-				if err != nil { 
+				if err != nil {
 					log.Errorf("Unable to parse response from chart-repo server, delete request may not be processed: %v", err)
 				} else if statusResponse.Status != common.DeleteStatusInProgress {
 					log.Errorf("Failed to delete repo: %v, response: %v, statusResponse", job.Endpoint.Name, err)
 				}
-			}	
+			}
 		}
 	}
 
 	log.Debug("processSyncRequests finished")
 }
 
-func waitForSyncComplete (url string) error {
-	return wait.Poll(statusPollInterval * time.Second, time.Duration(statusPollTimeout)*time.Second, func() (bool, error) {
+func waitForSyncComplete(url string) error {
+	return wait.Poll(statusPollInterval*time.Second, time.Duration(statusPollTimeout)*time.Second, func() (bool, error) {
 		var complete = false
 		log.Infof("Making GET request to: %v", url)
 		resp, err := http.Get(url)
@@ -127,7 +131,7 @@ func waitForSyncComplete (url string) error {
 		if err == nil {
 			statusResponse := common.SyncJobStatusResponse{}
 			err := json.NewDecoder(resp.Body).Decode(&statusResponse)
-			log.Infof("%v",statusResponse)
+			log.Infof("%v", statusResponse)
 			if err == nil && statusResponse.Status == common.SyncStatusSynced {
 				complete = true
 			}

From 1ed73eb3f69ca2951e0816244f9272e1d80c1e4c Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Fri, 7 Feb 2020 09:03:01 +0000
Subject: [PATCH 362/648] Fix tag name

---
 deploy/kubernetes/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
index a39dd6338e..8a87a94eaf 100755
--- a/deploy/kubernetes/build.sh
+++ b/deploy/kubernetes/build.sh
@@ -19,7 +19,7 @@ BOLD="\033[1m"
 PROD_RELEASE=false
 DOCKER_REGISTRY=docker.io
 DOCKER_ORG=splatform
-BASE_IMAGE_TAG=openleap15_1
+BASE_IMAGE_TAG=leap15_1
 OFFICIAL_TAG=cap
 TAG=$(date -u +"%Y%m%dT%H%M%SZ")
 ADD_OFFICIAL_TAG="false"

From 548476f7e7d6426a4b2a79264abab6ce5c103f9c Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 7 Feb 2020 09:48:07 +0000
Subject: [PATCH 363/648] Fix chart repo ref to foundation db

---
 deploy/kubernetes/console/templates/chartrepo.yaml    | 2 +-
 src/jetstream/plugins/monocular/chart-repo/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy/kubernetes/console/templates/chartrepo.yaml b/deploy/kubernetes/console/templates/chartrepo.yaml
index 6a8b6d6f27..10ab0a25e5 100644
--- a/deploy/kubernetes/console/templates/chartrepo.yaml
+++ b/deploy/kubernetes/console/templates/chartrepo.yaml
@@ -33,7 +33,7 @@ spec:
         image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/stratos-chartsync:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         command: ["/chartrepo"]
-        args: ["serve", "--debug=true","--doclayer-url=mongodb://{{ .Release.Name }}-chartrepo:27016"]
+        args: ["serve", "--debug=true","--doclayer-url=mongodb://{{ .Release.Name }}-fdbdoclayer-fdbdoclayer:27016"]
         ports:
         - name: endpoint
           containerPort: 8080
diff --git a/src/jetstream/plugins/monocular/chart-repo/Dockerfile b/src/jetstream/plugins/monocular/chart-repo/Dockerfile
index 3bec7d725c..ac5d67a440 100644
--- a/src/jetstream/plugins/monocular/chart-repo/Dockerfile
+++ b/src/jetstream/plugins/monocular/chart-repo/Dockerfile
@@ -5,7 +5,7 @@ WORKDIR /go/src/github.com/helm/monocular
 ARG VERSION
 RUN GO111MODULE=on GOPROXY=https://gocenter.io CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-X main.version=$VERSION" .
 
-FROM splatform/stratos-bk-build-base:leap15_1
+FROM splatform/stratos-bk-base:leap15_1
 #COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=builder /go/src/github.com/helm/monocular/chartrepo /chartrepo
 USER 1001

From 0967a305a79f1ad14897ec3a366e06d8f8f139c2 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Tue, 11 Feb 2020 15:28:57 +0000
Subject: [PATCH 364/648] Bump database readiness probes times

---
 deploy/kubernetes/console/templates/database.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/deploy/kubernetes/console/templates/database.yaml b/deploy/kubernetes/console/templates/database.yaml
index fad8a52769..fe70469320 100644
--- a/deploy/kubernetes/console/templates/database.yaml
+++ b/deploy/kubernetes/console/templates/database.yaml
@@ -80,8 +80,9 @@ spec:
           exec:
             command:
             - /dbping.sh
-          initialDelaySeconds: 5
-          timeoutSeconds: 1
+          initialDelaySeconds: 20
+          periodSeconds: 15
+          timeoutSeconds: 3
         resources:
 {{ toYaml .Values.mariadb.resources | indent 10 }}
         volumeMounts:

From b1ca483883df3bb1496ebad958b3c3bf295021b8 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Fri, 14 Feb 2020 11:57:03 +0000
Subject: [PATCH 365/648] Make FDB Doc-layer no longer a subchart, to enable
 easier config sharing

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 .../values.yaml => fdbvalues.yaml}            |  0
 .../local-helm/fdbdoclayer/.helmignore        | 22 -------------------
 .../console/local-helm/fdbdoclayer/Chart.yaml |  5 -----
 deploy/kubernetes/console/requirements.yaml   |  4 ----
 .../console/templates/__helpers.tpl           |  1 +
 .../console/templates/chartrepo.yaml          |  7 ++++++
 .../fdbdoclayer/templates/_helpers.tpl        | 10 ++++++---
 .../templates/fdb-doc-layer-deployment.yaml   | 13 ++++++-----
 .../fdb-doc-layer-networkpolicy.yaml          |  5 +++--
 .../templates/fdb-doc-layer-service.yaml      |  7 +++---
 .../templates/fdbserver-deployment.yaml       | 13 ++++++-----
 .../templates/fdbserver-networkpolicy.yaml    |  5 +++--
 .../templates/fdbserver-service.yaml          |  7 +++---
 13 files changed, 43 insertions(+), 56 deletions(-)
 rename deploy/kubernetes/console/{local-helm/fdbdoclayer/values.yaml => fdbvalues.yaml} (100%)
 delete mode 100644 deploy/kubernetes/console/local-helm/fdbdoclayer/.helmignore
 delete mode 100644 deploy/kubernetes/console/local-helm/fdbdoclayer/Chart.yaml
 delete mode 100644 deploy/kubernetes/console/requirements.yaml
 rename deploy/kubernetes/console/{ => templates}/local-helm/fdbdoclayer/templates/_helpers.tpl (70%)
 rename deploy/kubernetes/console/{ => templates}/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml (77%)
 rename deploy/kubernetes/console/{ => templates}/local-helm/fdbdoclayer/templates/fdb-doc-layer-networkpolicy.yaml (77%)
 rename deploy/kubernetes/console/{ => templates}/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml (68%)
 rename deploy/kubernetes/console/{ => templates}/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml (78%)
 rename deploy/kubernetes/console/{ => templates}/local-helm/fdbdoclayer/templates/fdbserver-networkpolicy.yaml (77%)
 rename deploy/kubernetes/console/{ => templates}/local-helm/fdbdoclayer/templates/fdbserver-service.yaml (68%)

diff --git a/deploy/kubernetes/console/local-helm/fdbdoclayer/values.yaml b/deploy/kubernetes/console/fdbvalues.yaml
similarity index 100%
rename from deploy/kubernetes/console/local-helm/fdbdoclayer/values.yaml
rename to deploy/kubernetes/console/fdbvalues.yaml
diff --git a/deploy/kubernetes/console/local-helm/fdbdoclayer/.helmignore b/deploy/kubernetes/console/local-helm/fdbdoclayer/.helmignore
deleted file mode 100644
index 50af031725..0000000000
--- a/deploy/kubernetes/console/local-helm/fdbdoclayer/.helmignore
+++ /dev/null
@@ -1,22 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/deploy/kubernetes/console/local-helm/fdbdoclayer/Chart.yaml b/deploy/kubernetes/console/local-helm/fdbdoclayer/Chart.yaml
deleted file mode 100644
index e19e1e279f..0000000000
--- a/deploy/kubernetes/console/local-helm/fdbdoclayer/Chart.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for Kubernetes
-name: fdbdoclayer
-version: 0.1.0
diff --git a/deploy/kubernetes/console/requirements.yaml b/deploy/kubernetes/console/requirements.yaml
deleted file mode 100644
index 87ccde9bb4..0000000000
--- a/deploy/kubernetes/console/requirements.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-dependencies:
-- name: fdbdoclayer
-  version: 0.1.0
-  repository: file://./local-helm/fdbdoclayer/
\ No newline at end of file
diff --git a/deploy/kubernetes/console/templates/__helpers.tpl b/deploy/kubernetes/console/templates/__helpers.tpl
index c24f888f74..995650985d 100644
--- a/deploy/kubernetes/console/templates/__helpers.tpl
+++ b/deploy/kubernetes/console/templates/__helpers.tpl
@@ -104,6 +104,7 @@ Generate self-signed certificate
 {{- $cert := genSignedCert ( include "console.certName" . ) nil $altNames 365 $ca -}}
 tls.crt: {{ $cert.Cert | b64enc }}
 tls.key: {{ $cert.Key | b64enc }}
+tls.ca:  {{ $ca.Cert | b64enc }}
 {{- end -}}
 
 {{/*
diff --git a/deploy/kubernetes/console/templates/chartrepo.yaml b/deploy/kubernetes/console/templates/chartrepo.yaml
index 10ab0a25e5..0e05949f4e 100644
--- a/deploy/kubernetes/console/templates/chartrepo.yaml
+++ b/deploy/kubernetes/console/templates/chartrepo.yaml
@@ -30,6 +30,13 @@ spec:
     spec:
       containers:
       - name: chartrepo
+        env:
+        - name: CONSOLE_PROXY_CERT_PATH
+          value: "/{{ .Release.Name }}-encryption-key-volume/console.crt" 
+        - name: CONSOLE_PROXY_CERT_KEY_PATH
+          value: "/{{ .Release.Name }}-encryption-key-volume/console.key" 
+        - name: CONSOLE_PROXY_CERT_KEY_PATH
+          value: "/{{ .Release.Name }}-encryption-key-volume/ca.crt" 
         image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/stratos-chartsync:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         command: ["/chartrepo"]
diff --git a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/_helpers.tpl b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/_helpers.tpl
similarity index 70%
rename from deploy/kubernetes/console/local-helm/fdbdoclayer/templates/_helpers.tpl
rename to deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/_helpers.tpl
index a61ed5fe2a..2ebaff4e8c 100644
--- a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/_helpers.tpl
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/_helpers.tpl
@@ -1,10 +1,12 @@
 {{/* vim: set filetype=mustache: */}}
 
+
 {{/*
 Expand the name of the chart.
 */}}
 {{- define "name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- $v := $.Files.Get "fdbvalues.yaml" | fromYaml }}
+{{- default .Chart.Name $v.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
@@ -12,7 +14,8 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "fullname" -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- $v := $.Files.Get "fdbvalues.yaml" | fromYaml }}
+{{- $name := default .Chart.Name $v.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -21,7 +24,8 @@ Create a default fully qualified app name for the document layer.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "doclayer.fullname" -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- $v := $.Files.Get "fdbvalues.yaml" | fromYaml }}
+{{- $name := default .Chart.Name $v.nameOverride -}}
 {{- printf "%s-%s-%s" .Release.Name $name "fdbdoclayer" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
diff --git a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
similarity index 77%
rename from deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
rename to deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
index 788beeb3c6..48f3b2c772 100644
--- a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
@@ -1,3 +1,4 @@
+{{- $v := $.Files.Get "fdbvalues.yaml" | fromYaml }}
 {{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major (trimSuffix "+" .Capabilities.KubeVersion.Minor) )}}
 apiVersion: apps/v1
 {{- else }}
@@ -12,7 +13,7 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 spec:
-  replicas: {{ .Values.fdbdoclayer.replicas }}
+  replicas: {{ $v.fdbdoclayer.replicas }}
   selector:
     matchLabels:
       app: {{ template "fullname" . }}-fdbdoclayer
@@ -23,27 +24,27 @@ spec:
         app: {{ template "fullname" . }}-fdbdoclayer
         release: {{ .Release.Name }}
     spec:
-{{- with .Values.securityContext }}
+{{- with $v.securityContext }}
       securityContext:
 {{ toYaml . | indent 8 }}
 {{- end }}
       containers:
       - name: fdbdoclayer
-        image: {{ template "fdb.image" .Values.fdbdoclayer.image }}
+        image: {{ template "fdb.image" $v.fdbdoclayer.image }}
         env:
         - name: FDB_COORDINATOR
           value: {{ template "fullname" . }}-fdbserver
         - name: CLUSTER_ID
           value: chartdb:erlklkg
         ports:
-        - containerPort: {{ .Values.fdbdoclayer.service.port }}
+        - containerPort: {{ $v.fdbdoclayer.service.port }}
         livenessProbe:
           tcpSocket:
-            port: {{ .Values.fdbdoclayer.service.port }}
+            port: {{ $v.fdbdoclayer.service.port }}
           initialDelaySeconds: 3
           periodSeconds: 20
         readinessProbe:
           tcpSocket:
-            port: {{ .Values.fdbdoclayer.service.port }}
+            port: {{ $v.fdbdoclayer.service.port }}
           initialDelaySeconds: 3
           periodSeconds: 10
\ No newline at end of file
diff --git a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-networkpolicy.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-networkpolicy.yaml
similarity index 77%
rename from deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-networkpolicy.yaml
rename to deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-networkpolicy.yaml
index 1dc5c4eb9e..fff0908421 100644
--- a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-networkpolicy.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-networkpolicy.yaml
@@ -1,4 +1,5 @@
-{{- if .Values.networkPolicy.enabled }}
+{{- $v := $.Files.Get "fdbvalues.yaml" | fromYaml }}
+{{- if $v.networkPolicy.enabled }}
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
@@ -15,6 +16,6 @@ spec:
       release: {{ .Release.Name }}
   ingress:
     ports:
-      port: {{ .Values.fdbdoclayer.service.port }}
+      port: {{ $v.fdbdoclayer.service.port }}
       protocol: TCP
 {{- end }}
diff --git a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml
similarity index 68%
rename from deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml
rename to deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml
index d10f6e545b..6d045d0c3e 100644
--- a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml
@@ -1,3 +1,4 @@
+{{- $v := $.Files.Get "fdbvalues.yaml" | fromYaml }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -10,10 +11,10 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-  - port: {{ .Values.fdbdoclayer.service.port }}
-    targetPort: {{ .Values.fdbdoclayer.service.port }}
+  - port: {{ $v.fdbdoclayer.service.port }}
+    targetPort: {{ $v.fdbdoclayer.service.port }}
     protocol: TCP
-    name: {{ .Values.fdbdoclayer.service.name }}
+    name: {{ $v.fdbdoclayer.service.name }}
   selector:
     app: {{ template "fullname" . }}-fdbdoclayer
     release: {{ .Release.Name }}
\ No newline at end of file
diff --git a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
similarity index 78%
rename from deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
rename to deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
index 825b6e35cf..57d747a3aa 100644
--- a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
@@ -1,3 +1,4 @@
+{{- $v := $.Files.Get "fdbvalues.yaml" | fromYaml }}
 {{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major (trimSuffix "+" .Capabilities.KubeVersion.Minor) )}}
 apiVersion: apps/v1
 {{- else }}
@@ -12,7 +13,7 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 spec:
-  replicas: {{ .Values.fdbserver.replicas }}
+  replicas: {{ $v.fdbserver.replicas }}
   selector:
     matchLabels:
       app: {{ template "fullname" . }}-fdbserver
@@ -23,27 +24,27 @@ spec:
         app: {{ template "fullname" . }}-fdbserver
         release: {{ .Release.Name }}
     spec:
-{{- with .Values.securityContext }}
+{{- with $v.securityContext }}
       securityContext:
 {{ toYaml . | indent 8 }}
 {{- end }}
       containers:
       - name: fdbserver
-        image: {{ template "fdb.image" .Values.fdbserver.image }}
+        image: {{ template "fdb.image" $v.fdbserver.image }}
         env:
         - name: FDB_COORDINATOR
           value: {{ template "fullname" . }}-fdbserver.console.svc.cluster.local
         - name: CLUSTER_ID
           value: chartdb:erlklkg
         ports:
-        - containerPort: {{ .Values.fdbserver.service.port }}
+        - containerPort: {{ $v.fdbserver.service.port }}
         livenessProbe:
           tcpSocket:
-            port: {{ .Values.fdbserver.service.port }}
+            port: {{ $v.fdbserver.service.port }}
           initialDelaySeconds: 3
           periodSeconds: 20
         readinessProbe:
           tcpSocket:
-            port: {{ .Values.fdbserver.service.port }}
+            port: {{ $v.fdbserver.service.port }}
           initialDelaySeconds: 3
           periodSeconds: 10
\ No newline at end of file
diff --git a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-networkpolicy.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-networkpolicy.yaml
similarity index 77%
rename from deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-networkpolicy.yaml
rename to deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-networkpolicy.yaml
index 385e45749e..6731652471 100644
--- a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-networkpolicy.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-networkpolicy.yaml
@@ -1,4 +1,5 @@
-{{- if .Values.networkPolicy.enabled }}
+{{- $v := $.Files.Get "fdbvalues.yaml" | fromYaml }}
+{{- if $v.networkPolicy.enabled }}
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
@@ -15,6 +16,6 @@ spec:
       release: {{ .Release.Name }}
   ingress:
   - ports:
-    - port: {{ .Values.fdbserver.service.port }}
+    - port: {{ $v.fdbserver.service.port }}
       protocol: TCP
 {{- end }}
diff --git a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-service.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-service.yaml
similarity index 68%
rename from deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-service.yaml
rename to deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-service.yaml
index 3b258e5c98..0bf1a4081c 100644
--- a/deploy/kubernetes/console/local-helm/fdbdoclayer/templates/fdbserver-service.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-service.yaml
@@ -1,3 +1,4 @@
+{{- $v := $.Files.Get "fdbvalues.yaml" | fromYaml }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -10,10 +11,10 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-  - port: {{ .Values.fdbserver.service.port }}
-    targetPort: {{ .Values.fdbserver.service.port }}
+  - port: {{ $v.fdbserver.service.port }}
+    targetPort: {{ $v.fdbserver.service.port }}
     protocol: TCP
-    name: {{ .Values.fdbserver.service.name }}
+    name: {{ $v.fdbserver.service.name }}
   selector:
     app: {{ template "fullname" . }}-fdbserver
     release: {{ .Release.Name }}
\ No newline at end of file

From 5f34d8186a72db14306a84eade6ffe6aa2bf29a9 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Sat, 15 Feb 2020 15:08:20 +0000
Subject: [PATCH 366/648] CHart repo now has TLS enabled for SERVE mode. README
 updated to show required commands

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 .../monocular/chart-repo/api_endpoint.go      | 39 +++++++++++++++----
 .../monocular/chart-repo/chart_repo.go        |  5 +++
 .../plugins/monocular/chart-repo/serve.go     | 14 ++++++-
 3 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
index 0248f31fe1..31ddb898ce 100644
--- a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
+++ b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
@@ -18,8 +18,11 @@ package main
 
 import (
 	"context"
+	"crypto/tls"
+	"crypto/x509"
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
 	"net/http"
 	"os"
 	"time"
@@ -171,7 +174,7 @@ func OnDemandDelete(w http.ResponseWriter, req *http.Request, params Params) {
 	}
 
 	//Return delete status in response
-	
+
 	response := common.DeleteJobStatusResponse{requestUUID.String(), status}
 	js, err := json.Marshal(response)
 	if err != nil {
@@ -200,7 +203,7 @@ func RepoSyncStatus(w http.ResponseWriter, req *http.Request, params Params) {
 		http.Error(w, err.Error(), http.StatusNotFound)
 		return
 	}
-	
+
 	response := common.SyncJobStatusResponse{requestUUID.String(), status.Status}
 	js, err := json.Marshal(response)
 	if err != nil {
@@ -244,7 +247,7 @@ func RepoDeleteStatus(w http.ResponseWriter, req *http.Request, params Params) {
 	w.Write(js)
 }
 
-func initOnDemandEndpoint(fdbURL string, fdbName string, authHeader string, debug bool) {
+func initOnDemandEndpoint(fdbURL string, fdbName string, caCertFile string, certFile string, keyFile string, authHeader string, debug bool) {
 
 	authorizationHeader = authHeader
 	fDBName = fdbName
@@ -253,7 +256,7 @@ func initOnDemandEndpoint(fdbURL string, fdbName string, authHeader string, debu
 		log.SetLevel(log.DebugLevel)
 	}
 
-	InitFDBDocLayerConnection(&fdbURL, &fdbName, &debug)
+	InitFDBDocLayerConnection(&fdbURL, &fdbName, &caCertFile, &certFile, &keyFile, &debug)
 
 	n := setupRoutes()
 
@@ -266,11 +269,34 @@ func initOnDemandEndpoint(fdbURL string, fdbName string, authHeader string, debu
 	http.ListenAndServe(addr, n)
 }
 
-func InitFDBDocLayerConnection(fdbURL *string, fDB *string, debug *bool) {
+func InitFDBDocLayerConnection(fdbURL *string, fDB *string, CAFile *string, certFile *string, keyFile *string, debug *bool) {
 
 	log.Debugf("Attempting to connect to FDB: %v, %v, debug: %v", *fdbURL, *fDB, *debug)
 
-	clientOptions := options.Client().ApplyURI(*fdbURL).SetMinPoolSize(10).SetMaxPoolSize(100)
+	//Load CA Cert from file here
+	CA, err := ioutil.ReadFile(*CAFile) // just pass the file name
+	if err != nil {
+		log.Fatalf("Cannot load CA certificate from file: %v.", err)
+		return
+	}
+	CACert := x509.NewCertPool()
+	ok := CACert.AppendCertsFromPEM([]byte(CA))
+	if !ok {
+		log.Fatalf("Cannot append CA certificate to certificate pool.")
+		return
+	}
+	//Now load the key pair and create tls options struct
+	clientKeyPair, err := tls.LoadX509KeyPair(*certFile, *keyFile)
+	if err != nil {
+		log.Fatalf("Cannot load server keypair: %v", err)
+		return
+	}
+
+	log.Debugf("CA: %v", CA)
+	tlsConfig := &tls.Config{RootCAs: CACert, Certificates: []tls.Certificate{clientKeyPair}}
+
+	//Init client options and open connection
+	clientOptions := options.Client().ApplyURI(*fdbURL).SetMinPoolSize(10).SetMaxPoolSize(100).SetTLSConfig(tlsConfig)
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 	client, err := fdb.NewDocLayerClient(ctx, clientOptions)
@@ -280,5 +306,4 @@ func InitFDBDocLayerConnection(fdbURL *string, fDB *string, debug *bool) {
 		return
 	}
 	log.Debugf("FDB Document Layer client created.")
-
 }
diff --git a/src/jetstream/plugins/monocular/chart-repo/chart_repo.go b/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
index 8b23957299..7d20cc777a 100644
--- a/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
+++ b/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
@@ -50,6 +50,11 @@ func init() {
 		cmd.Flags().String("doclayer-url", "mongodb://dev-fdbdoclayer/27016", "FoundationDB Document Layer URL")
 		cmd.Flags().String("doclayer-database", "monocular-plugin", "FoundationDB Document-Layer database")
 
+		//Flags for Serve-Mode TLS
+		cmd.Flags().String("cafile", "", "Path to CA certificate to use for client verification.")
+		cmd.Flags().String("certfile", "", "Path to TLS certificate.")
+		cmd.Flags().String("keyfile", "", "Path to TLS key.")
+
 		// see version.go
 		cmd.Flags().StringVarP(&utils.UserAgentComment, "user-agent-comment", "", "", "UserAgent comment used during outbound requests")
 		cmd.Flags().Bool("debug", false, "verbose logging")
diff --git a/src/jetstream/plugins/monocular/chart-repo/serve.go b/src/jetstream/plugins/monocular/chart-repo/serve.go
index b7d7a27f7c..ae0a65f003 100644
--- a/src/jetstream/plugins/monocular/chart-repo/serve.go
+++ b/src/jetstream/plugins/monocular/chart-repo/serve.go
@@ -36,12 +36,24 @@ var ServeCmd = &cobra.Command{
 		if err != nil {
 			log.Fatal(err)
 		}
+		cACert, err := cmd.Flags().GetString("cafile")
+		if err != nil {
+			log.Fatal(err)
+		}
+		key, err := cmd.Flags().GetString("keyfile")
+		if err != nil {
+			log.Fatal(err)
+		}
+		cert, err := cmd.Flags().GetString("certfile")
+		if err != nil {
+			log.Fatal(err)
+		}
 		debug, err := cmd.Flags().GetBool("debug")
 		if err != nil {
 			log.Fatal(err)
 		}
 		authorizationHeader := os.Getenv("AUTHORIZATION_HEADER")
 
-		initOnDemandEndpoint(fdbURL, fDB, authorizationHeader, debug)
+		initOnDemandEndpoint(fdbURL, fDB, cACert, cert, key, authorizationHeader, debug)
 	},
 }

From b56cf5d65746cabddd1ba2e57be0c0502d0b0c37 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Sat, 15 Feb 2020 16:51:36 +0000
Subject: [PATCH 367/648] TLS now optional at runtime

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 .../plugins/monocular/chart-repo/Makefile     |  2 +-
 .../monocular/chart-repo/api_endpoint.go      | 59 +++++++++++--------
 .../monocular/chart-repo/chart_repo.go        |  1 +
 .../plugins/monocular/chart-repo/serve.go     | 10 +++-
 4 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/src/jetstream/plugins/monocular/chart-repo/Makefile b/src/jetstream/plugins/monocular/chart-repo/Makefile
index 454c4a38ad..42140b79a8 100644
--- a/src/jetstream/plugins/monocular/chart-repo/Makefile
+++ b/src/jetstream/plugins/monocular/chart-repo/Makefile
@@ -1,4 +1,4 @@
-IMAGE_REPO ?= docker.io/kreinecke/suse-fdb-chart-repo
+IMAGE_REPO ?= docker.io/kreinecke/suse-fdb-chart-repo-tls
 IMAGE_TAG ?= latest
 # Version of the binary to be produced
 VERSION ?= $$(git rev-parse HEAD)
diff --git a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
index 31ddb898ce..07e8d3c4e9 100644
--- a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
+++ b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
@@ -247,7 +247,7 @@ func RepoDeleteStatus(w http.ResponseWriter, req *http.Request, params Params) {
 	w.Write(js)
 }
 
-func initOnDemandEndpoint(fdbURL string, fdbName string, caCertFile string, certFile string, keyFile string, authHeader string, debug bool) {
+func initOnDemandEndpoint(fdbURL string, fdbName string, tlsEnabled bool, caCertFile string, certFile string, keyFile string, authHeader string, debug bool) {
 
 	authorizationHeader = authHeader
 	fDBName = fdbName
@@ -256,7 +256,7 @@ func initOnDemandEndpoint(fdbURL string, fdbName string, caCertFile string, cert
 		log.SetLevel(log.DebugLevel)
 	}
 
-	InitFDBDocLayerConnection(&fdbURL, &fdbName, &caCertFile, &certFile, &keyFile, &debug)
+	InitFDBDocLayerConnection(&fdbURL, &fdbName, &tlsEnabled, &caCertFile, &certFile, &keyFile, &debug)
 
 	n := setupRoutes()
 
@@ -266,37 +266,48 @@ func initOnDemandEndpoint(fdbURL string, fdbName string, caCertFile string, cert
 	}
 	addr := ":" + port
 	log.Infof("On-Demand endpoint listening on: %v", addr)
+	if tlsEnabled {
+		log.Infof("TLS is enabled.")
+	} else {
+		log.Infof("TLS is disabled.")
+	}
 	http.ListenAndServe(addr, n)
 }
 
-func InitFDBDocLayerConnection(fdbURL *string, fDB *string, CAFile *string, certFile *string, keyFile *string, debug *bool) {
+func InitFDBDocLayerConnection(fdbURL *string, fDB *string, tlsEnabled *bool, CAFile *string, certFile *string, keyFile *string, debug *bool) {
 
 	log.Debugf("Attempting to connect to FDB: %v, %v, debug: %v", *fdbURL, *fDB, *debug)
 
-	//Load CA Cert from file here
-	CA, err := ioutil.ReadFile(*CAFile) // just pass the file name
-	if err != nil {
-		log.Fatalf("Cannot load CA certificate from file: %v.", err)
-		return
-	}
-	CACert := x509.NewCertPool()
-	ok := CACert.AppendCertsFromPEM([]byte(CA))
-	if !ok {
-		log.Fatalf("Cannot append CA certificate to certificate pool.")
-		return
-	}
-	//Now load the key pair and create tls options struct
-	clientKeyPair, err := tls.LoadX509KeyPair(*certFile, *keyFile)
-	if err != nil {
-		log.Fatalf("Cannot load server keypair: %v", err)
-		return
-	}
+	var tlsConfig *tls.Config
 
-	log.Debugf("CA: %v", CA)
-	tlsConfig := &tls.Config{RootCAs: CACert, Certificates: []tls.Certificate{clientKeyPair}}
+	if *tlsEnabled {
+		//Load CA Cert from file here
+		CA, err := ioutil.ReadFile(*CAFile) // just pass the file name
+		if err != nil {
+			log.Fatalf("Cannot load CA certificate from file: %v.", err)
+			return
+		}
+		CACert := x509.NewCertPool()
+		ok := CACert.AppendCertsFromPEM([]byte(CA))
+		if !ok {
+			log.Fatalf("Cannot append CA certificate to certificate pool.")
+			return
+		}
+		//Now load the key pair and create tls options struct
+		clientKeyPair, err := tls.LoadX509KeyPair(*certFile, *keyFile)
+		if err != nil {
+			log.Fatalf("Cannot load server keypair: %v", err)
+			return
+		}
+
+		tlsConfig = &tls.Config{RootCAs: CACert, Certificates: []tls.Certificate{clientKeyPair}}
+	}
 
 	//Init client options and open connection
-	clientOptions := options.Client().ApplyURI(*fdbURL).SetMinPoolSize(10).SetMaxPoolSize(100).SetTLSConfig(tlsConfig)
+	clientOptions := options.Client().ApplyURI(*fdbURL).SetMinPoolSize(10).SetMaxPoolSize(100)
+	if *tlsEnabled {
+		clientOptions.SetTLSConfig(tlsConfig)
+	}
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 	client, err := fdb.NewDocLayerClient(ctx, clientOptions)
diff --git a/src/jetstream/plugins/monocular/chart-repo/chart_repo.go b/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
index 7d20cc777a..ec917468d8 100644
--- a/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
+++ b/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
@@ -51,6 +51,7 @@ func init() {
 		cmd.Flags().String("doclayer-database", "monocular-plugin", "FoundationDB Document-Layer database")
 
 		//Flags for Serve-Mode TLS
+		cmd.Flags().Bool("tls", false, "Enable Mutual TLS")
 		cmd.Flags().String("cafile", "", "Path to CA certificate to use for client verification.")
 		cmd.Flags().String("certfile", "", "Path to TLS certificate.")
 		cmd.Flags().String("keyfile", "", "Path to TLS key.")
diff --git a/src/jetstream/plugins/monocular/chart-repo/serve.go b/src/jetstream/plugins/monocular/chart-repo/serve.go
index ae0a65f003..22589b0524 100644
--- a/src/jetstream/plugins/monocular/chart-repo/serve.go
+++ b/src/jetstream/plugins/monocular/chart-repo/serve.go
@@ -48,12 +48,20 @@ var ServeCmd = &cobra.Command{
 		if err != nil {
 			log.Fatal(err)
 		}
+
+		//TLS options must either be all set to enabled TLS, or none set to disable TLS
+		var tlsEnabled = cACert != "" && key != "" && cert != ""
+		if !(tlsEnabled || (cACert == "" && key == "" && cert == "")) {
+			cmd.Help()
+			log.Fatal("To enable TLS, all 3 TLS cert paths must be set.")
+		}
+
 		debug, err := cmd.Flags().GetBool("debug")
 		if err != nil {
 			log.Fatal(err)
 		}
 		authorizationHeader := os.Getenv("AUTHORIZATION_HEADER")
 
-		initOnDemandEndpoint(fdbURL, fDB, cACert, cert, key, authorizationHeader, debug)
+		initOnDemandEndpoint(fdbURL, fDB, tlsEnabled, cACert, cert, key, authorizationHeader, debug)
 	},
 }

From 371f15306c3770a1a9f0236804ba62b47e7cbaea Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Sat, 15 Feb 2020 17:17:36 +0000
Subject: [PATCH 368/648] (Untested) enable optional TLS at monocular plugin
 config

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 src/jetstream/plugins/monocular/README.txt    | 11 ++++-
 .../plugins/monocular/chartsvc/main.go        | 46 ++++++++++++++++++-
 src/jetstream/plugins/monocular/main.go       | 15 ++++--
 3 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/src/jetstream/plugins/monocular/README.txt b/src/jetstream/plugins/monocular/README.txt
index 9e55e1dac0..149af612ae 100644
--- a/src/jetstream/plugins/monocular/README.txt
+++ b/src/jetstream/plugins/monocular/README.txt
@@ -1,6 +1,13 @@
-docker run -p 8080:8080 --rm -e -ti --network=host kreinecke/suse-fdb-chart-repo:latest /chartrepo serve --doclayer-url=mongodb://192.168.57.1:27016 stable https://kubernetes-charts.storage.googleapis.com
+### Run chart repo in serve mode WITH TLS ###
+### Modify the bind mounts according to location of certs on your system
+
+docker run -p 8080:8080 --rm -e -ti --network=host -v ~/dev/git/fdb-doclayer-fork/packaging/docker/testcerts:/etc/tlscerts kreinecke/suse-fdb-chart-repo:latest /chartrepo serve --doclayer-url=mongodb://localhost:27016 stable https://kubernetes-charts.storage.googleapis.com --cafile /etc/tlscerts/ca.crt --certfile /etc/tlscerts/client.crt --keyfile /etc/tlscerts/client.key --debug
 
 To test sync and status fetch:
 curl -X PUT -H "Content-Type: application/json" -d '{"repoURL":"https://kubernetes-charts.storage.googleapis.com"}' http://localhost:8080/v1/sync/stable
 
-curl -X GET http://localhost:8080/v1/status/stabler
+curl -X GET http://localhost:8080/v1/status/stable
+
+
+### TLS Currently not optional, but for reference, use command below if making optional in future ###
+docker run -p 8080:8080 --rm -e -ti --network=host kreinecke/suse-fdb-chart-repo:latest /chartrepo serve --doclayer-url=mongodb://192.168.57.1:27016 stable https://kubernetes-charts.storage.googleapis.com
diff --git a/src/jetstream/plugins/monocular/chartsvc/main.go b/src/jetstream/plugins/monocular/chartsvc/main.go
index 68aa3586e2..482e759795 100644
--- a/src/jetstream/plugins/monocular/chartsvc/main.go
+++ b/src/jetstream/plugins/monocular/chartsvc/main.go
@@ -18,7 +18,10 @@ package chartsvc
 
 import (
 	"context"
+	"crypto/tls"
+	"crypto/x509"
 	"flag"
+	"io/ioutil"
 	"net/http"
 	"os"
 
@@ -81,13 +84,24 @@ func main() {
 	fdbURL := flag.String("doclayer-url", "mongodb://fdb-service/27016", "FoundationDB Document Layer URL")
 	fDB := flag.String("doclayer-database", "monocular-plugin", "FoundationDB Document-Layer database")
 
+	//Flags for Serve-Mode TLS
+	cACertFile := flag.String("cafile", "", "Path to CA certificate to use for client verification.")
+	certFile := flag.String("certfile", "", "Path to TLS certificate.")
+	keyFile := flag.String("keyfile", "", "Path to TLS key.")
+
+	//TLS options must either be all set to enabled TLS, or none set to disable TLS
+	var tlsEnabled = *cACertFile != "" && *keyFile != "" && *certFile != ""
+	if !(tlsEnabled || (*cACertFile == "" && *keyFile == "" && *certFile == "")) {
+		log.Fatal("To enable TLS, all 3 TLS cert paths must be set.")
+	}
+
 	flag.Parse()
 
 	if *debug {
 		log.SetLevel(log.DebugLevel)
 	}
 
-	InitFDBDocLayerConnection(fdbURL, fDB, debug)
+	InitFDBDocLayerConnection(fdbURL, fDB, &tlsEnabled, cACertFile, certFile, keyFile, debug)
 
 	n := SetupRoutes()
 
@@ -100,11 +114,39 @@ func main() {
 	http.ListenAndServe(addr, n)
 }
 
-func InitFDBDocLayerConnection(fdbURL *string, fDB *string, debug *bool) {
+func InitFDBDocLayerConnection(fdbURL *string, fDB *string, tlsEnabled *bool, CAFile *string, certFile *string, keyFile *string, debug *bool) {
 
 	log.Debugf("Attempting to connect to FDB: %v, %v, debug: %v", *fdbURL, *fDB, *debug)
 
+	var tlsConfig *tls.Config
+
+	if *tlsEnabled {
+		//Load CA Cert from file here
+		CA, err := ioutil.ReadFile(*CAFile) // just pass the file name
+		if err != nil {
+			log.Fatalf("Cannot load CA certificate from file: %v.", err)
+			return
+		}
+		CACert := x509.NewCertPool()
+		ok := CACert.AppendCertsFromPEM([]byte(CA))
+		if !ok {
+			log.Fatalf("Cannot append CA certificate to certificate pool.")
+			return
+		}
+		//Now load the key pair and create tls options struct
+		clientKeyPair, err := tls.LoadX509KeyPair(*certFile, *keyFile)
+		if err != nil {
+			log.Fatalf("Cannot load server keypair: %v", err)
+			return
+		}
+
+		tlsConfig = &tls.Config{RootCAs: CACert, Certificates: []tls.Certificate{clientKeyPair}}
+	}
+
 	clientOptions := options.Client().ApplyURI(*fdbURL)
+	if *tlsEnabled {
+		clientOptions.SetTLSConfig(tlsConfig)
+	}
 	client, err := fdbDatastore.NewDocLayerClient(context.Background(), clientOptions)
 	if err != nil {
 		log.Fatalf("Can't create client for FoundationDB document layer: %v. URL provided was: %v.", err, *fdbURL)
diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index 99f6fe5560..14d0c11940 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -33,6 +33,9 @@ type Monocular struct {
 	RepoQueryStore  chartsvc.ChartSvcDatastore
 	FoundationDBURL string
 	SyncServiceURL  string
+	CACertFile      string
+	TLSKey          string
+	TLSCert         string
 }
 
 // Init creates a new Monocular
@@ -54,7 +57,7 @@ func (m *Monocular) Init() error {
 	fdbURL := m.FoundationDBURL
 	fDB := "monocular-plugin"
 	debug := false
-	m.ConfigureChartSVC(&fdbURL, &fDB, &debug)
+	m.ConfigureChartSVC(&fdbURL, &fDB, &m.CACertFile, &m.TLSCert, &m.TLSKey, &debug)
 	m.chartSvcRoutes = chartsvc.SetupRoutes()
 	m.InitSync()
 	m.syncOnStartup()
@@ -147,8 +150,14 @@ func arrayContainsString(a []string, x string) bool {
 	return false
 }
 
-func (m *Monocular) ConfigureChartSVC(fdbURL *string, fDB *string, debug *bool) {
-	chartsvc.InitFDBDocLayerConnection(fdbURL, fDB, debug)
+func (m *Monocular) ConfigureChartSVC(fdbURL *string, fDB *string, cACertFile *string, certFile *string, keyFile *string, debug *bool) error {
+	//TLS options must either be all set to enabled TLS, or none set to disable TLS
+	var tlsEnabled = *cACertFile != "" && *keyFile != "" && *certFile != ""
+	if !(tlsEnabled || (*cACertFile == "" && *keyFile == "" && *certFile == "")) {
+		return errors.New("To enable TLS, all 3 TLS cert paths must be set.")
+	}
+	chartsvc.InitFDBDocLayerConnection(fdbURL, fDB, &tlsEnabled, cACertFile, certFile, keyFile, debug)
+	return nil
 }
 
 func (m *Monocular) OnEndpointNotification(action interfaces.EndpointAction, endpoint *interfaces.CNSIRecord) {

From 394e6a7cd05bd54392744253e04a78849851dc49 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Sat, 15 Feb 2020 19:29:14 +0000
Subject: [PATCH 369/648] Make doclayer TLS optional

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 deploy/kubernetes/console/fdbvalues.yaml                   | 7 ++++---
 .../fdbdoclayer/templates/fdbserver-deployment.yaml        | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/deploy/kubernetes/console/fdbvalues.yaml b/deploy/kubernetes/console/fdbvalues.yaml
index de07ac2ea9..64ff59738d 100644
--- a/deploy/kubernetes/console/fdbvalues.yaml
+++ b/deploy/kubernetes/console/fdbvalues.yaml
@@ -13,14 +13,15 @@ fdbdoclayer:
   replicas: 1
   image:
     registry: docker.io
-    repository: kreinecke/fdb-document-layer
-    tag: 1.6.3-k8s
+    repository: kreinecke/fdb-document-layer-k8s-tls
+    tag: latest
     pullPolicy: Always
   service:
     name: fdbdoclayer
     port: 27016
+  tls: false
 
 # Installs networkPolicy for the services. This will allow communication betweeen the services in
 # environments where the default policy is deny
 networkPolicy:
-  enabled: false
\ No newline at end of file
+  enabled: false
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
index 57d747a3aa..e586155593 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
@@ -36,6 +36,8 @@ spec:
           value: {{ template "fullname" . }}-fdbserver.console.svc.cluster.local
         - name: CLUSTER_ID
           value: chartdb:erlklkg
+        - name: ENABLE_TLS
+          value: $v.fdbserver.tls
         ports:
         - containerPort: {{ $v.fdbserver.service.port }}
         livenessProbe:

From 5d71c389c62f1868b508f16678eb510429a55277 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Sat, 15 Feb 2020 20:15:31 +0000
Subject: [PATCH 370/648] Add configmap for fdb certs and fix tls enable value
 - move from fdbserver to fdb-doclayer

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 .../templates/fdb-doc-layer-deployment.yaml   |  2 ++
 .../fdbdoclayer/templates/tls-configmap.yaml  | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/tls-configmap.yaml

diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
index 48f3b2c772..2f956faa7b 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
@@ -36,6 +36,8 @@ spec:
           value: {{ template "fullname" . }}-fdbserver
         - name: CLUSTER_ID
           value: chartdb:erlklkg
+        - name: ENABLE_TLS
+          value: $v.fdbserver.tls
         ports:
         - containerPort: {{ $v.fdbdoclayer.service.port }}
         livenessProbe:
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/tls-configmap.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/tls-configmap.yaml
new file mode 100644
index 0000000000..f85f8fd1e2
--- /dev/null
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/tls-configmap.yaml
@@ -0,0 +1,23 @@
+{{/*
+Generate self-signed certificate
+*/}}
+{{- define "fdbdoclayer.generateCertificate" -}}
+{{- $altNames := list ( printf "%s%s.%s" (include "fullname" .) "-fdbdoclayer" .Release.Namespace ) ( printf "%s.%s.svc" (include "console.certName" .) .Release.Namespace ) -}}
+{{- $ca := genCA "stratos-ca" 365 -}}
+{{- $cert := genSignedCert "fdbdoclayer" nil $altNames 365 $ca -}}
+fdbtls.crt: {{ $cert.Cert | b64enc }}
+fdbtls.key: {{ $cert.Key | b64enc }}
+fdbtls.ca:  {{ $ca.Cert | b64enc }}
+{{- end -}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "fullname" . }}-fdbdoclayer
+  labels:
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    app: {{ template "fullname" . }}-fdbdoclayer
+    heritage: "{{ .Release.Service }}"
+    release: "{{ .Release.Name }}"
+data:
+  {{ (include "fdbdoclayer.generateCertificate" .) | trim | quote }}
\ No newline at end of file

From 1aed15db9f360b126ef636d14b4e9bb17f2f4d44 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Sat, 15 Feb 2020 20:29:38 +0000
Subject: [PATCH 371/648] Add loading indicator for Workload resource stats

---
 .../helm-release-summary-tab.component.html   | 19 +++++++++++++++----
 .../helm-release-summary-tab.component.ts     |  8 ++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
index 893a819405..f69faf6ea9 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
@@ -56,11 +56,22 @@
       </app-tile-grid>
 
       <app-metadata-item class="chart-details__item" label="All Resources"></app-metadata-item>
-      <div *ngIf="resources$ | async as resources" class="grid">
-        <app-card-number-metric *ngFor="let res of resources" label="{{ res.label }}" icon="{{ res.icon.name }}"
-          iconFont="{{ res.icon.font }}" value="{{ res.count }}">
-        </app-card-number-metric>
+      <div *ngIf="hasAllResources$ | async; else stillLoadingResources">
+        <div *ngIf="resources$ | async as resources" class="grid">
+          <app-card-number-metric *ngFor="let res of resources" label="{{ res.label }}" icon="{{ res.icon.name }}"
+            iconFont="{{ res.icon.font }}" value="{{ res.count }}">
+          </app-card-number-metric>
+        </div>
       </div>
+      <ng-template #stillLoadingResources>
+        <div class="resources__loading">
+          <div class="resources__loading__content">
+            Updating Resource Information
+            <mat-progress-bar class="" [color]="'primary'" mode="indeterminate">
+            </mat-progress-bar>
+          </div>
+        </div>
+      </ng-template>
     </div>
     <ng-template #loadingResources>
       <div class="resources__loading">
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index be62056bf6..43b268b89a 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -28,6 +28,7 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
   private busyDeletingSubject = new ReplaySubject<boolean>();
   public isBusy$: Observable<boolean>;
   public hasResources$: Observable<boolean>;
+  public hasAllResources$: Observable<boolean>;
   private readonly DEFAULT_LOADING_MESSAGE = 'Retrieving Release Details';
   public loadingMessage = this.DEFAULT_LOADING_MESSAGE;
 
@@ -134,6 +135,13 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
       map(([chartData, resources]) => !!chartData && !!resources)
     );
 
+    this.hasAllResources$ = combineLatest([
+      this.resources$,
+      this.hasResources$
+    ]).pipe(
+      map(([resources, hasSome]) => hasSome && resources && resources.length > 0)
+    );
+
     this.deleteReleaseConfirmation = new ConfirmationDialogConfig(
       `Delete Workload`,
       {

From 84a50ab4e37e85ab3e380f147002e43b72875af6 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Sat, 15 Feb 2020 20:56:35 +0000
Subject: [PATCH 372/648] Add a secret to generate and hold certs for
 fdbdoclayer and clients. Mount in fdbdoclayer and chart repo containers

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 .../console/templates/chartrepo.yaml          | 15 ++++++------
 .../templates/fdb-doc-layer-deployment.yaml   | 12 ++++++++--
 .../templates/fdbserver-deployment.yaml       |  2 --
 .../fdbdoclayer/templates/tls-configmap.yaml  | 23 -------------------
 4 files changed, 18 insertions(+), 34 deletions(-)
 delete mode 100644 deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/tls-configmap.yaml

diff --git a/deploy/kubernetes/console/templates/chartrepo.yaml b/deploy/kubernetes/console/templates/chartrepo.yaml
index 0e05949f4e..8ae69374a1 100644
--- a/deploy/kubernetes/console/templates/chartrepo.yaml
+++ b/deploy/kubernetes/console/templates/chartrepo.yaml
@@ -30,13 +30,6 @@ spec:
     spec:
       containers:
       - name: chartrepo
-        env:
-        - name: CONSOLE_PROXY_CERT_PATH
-          value: "/{{ .Release.Name }}-encryption-key-volume/console.crt" 
-        - name: CONSOLE_PROXY_CERT_KEY_PATH
-          value: "/{{ .Release.Name }}-encryption-key-volume/console.key" 
-        - name: CONSOLE_PROXY_CERT_KEY_PATH
-          value: "/{{ .Release.Name }}-encryption-key-volume/ca.crt" 
         image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/stratos-chartsync:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         command: ["/chartrepo"]
@@ -44,6 +37,14 @@ spec:
         ports:
         - name: endpoint
           containerPort: 8080
+        volumeMounts:
+        - name: certs
+          mountPath: "/etc/certs"
+          readOnly: true
+      volumes:
+        - name: certs
+          secret:
+            secretName: {{ template "fullname" . }}-fdbdoclayer-certs
 ---
 apiVersion: v1
 kind: Service
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
index 2f956faa7b..af7adfc37e 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
@@ -31,13 +31,17 @@ spec:
       containers:
       - name: fdbdoclayer
         image: {{ template "fdb.image" $v.fdbdoclayer.image }}
+        volumeMounts:
+        - name: certs
+          mountPath: "/etc/secrets"
+          readOnly: true
         env:
         - name: FDB_COORDINATOR
           value: {{ template "fullname" . }}-fdbserver
         - name: CLUSTER_ID
           value: chartdb:erlklkg
         - name: ENABLE_TLS
-          value: $v.fdbserver.tls
+          value: $v.fdbdoclayer.tls
         ports:
         - containerPort: {{ $v.fdbdoclayer.service.port }}
         livenessProbe:
@@ -49,4 +53,8 @@ spec:
           tcpSocket:
             port: {{ $v.fdbdoclayer.service.port }}
           initialDelaySeconds: 3
-          periodSeconds: 10
\ No newline at end of file
+          periodSeconds: 10
+      volumes:
+        - name: certs
+          secret:
+            secretName: {{ template "fullname" . }}-fdbdoclayer-certs
\ No newline at end of file
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
index e586155593..57d747a3aa 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
@@ -36,8 +36,6 @@ spec:
           value: {{ template "fullname" . }}-fdbserver.console.svc.cluster.local
         - name: CLUSTER_ID
           value: chartdb:erlklkg
-        - name: ENABLE_TLS
-          value: $v.fdbserver.tls
         ports:
         - containerPort: {{ $v.fdbserver.service.port }}
         livenessProbe:
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/tls-configmap.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/tls-configmap.yaml
deleted file mode 100644
index f85f8fd1e2..0000000000
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/tls-configmap.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-{{/*
-Generate self-signed certificate
-*/}}
-{{- define "fdbdoclayer.generateCertificate" -}}
-{{- $altNames := list ( printf "%s%s.%s" (include "fullname" .) "-fdbdoclayer" .Release.Namespace ) ( printf "%s.%s.svc" (include "console.certName" .) .Release.Namespace ) -}}
-{{- $ca := genCA "stratos-ca" 365 -}}
-{{- $cert := genSignedCert "fdbdoclayer" nil $altNames 365 $ca -}}
-fdbtls.crt: {{ $cert.Cert | b64enc }}
-fdbtls.key: {{ $cert.Key | b64enc }}
-fdbtls.ca:  {{ $ca.Cert | b64enc }}
-{{- end -}}
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "fullname" . }}-fdbdoclayer
-  labels:
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    app: {{ template "fullname" . }}-fdbdoclayer
-    heritage: "{{ .Release.Service }}"
-    release: "{{ .Release.Name }}"
-data:
-  {{ (include "fdbdoclayer.generateCertificate" .) | trim | quote }}
\ No newline at end of file

From 017c6a85bafcf7ec60036dcda9ea0073a3c56b3b Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Sat, 15 Feb 2020 22:36:38 +0000
Subject: [PATCH 373/648] Update to leap 15.1

---
 deploy/Dockerfile.init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/Dockerfile.init b/deploy/Dockerfile.init
index 5a653516f0..159ec6437d 100644
--- a/deploy/Dockerfile.init
+++ b/deploy/Dockerfile.init
@@ -1,4 +1,4 @@
-FROM splatform/stratos-bk-base:opensuse
+FROM splatform/stratos-bk-base:leap15_1
 RUN zypper in -y curl openssh jq
 COPY /deploy/containers/config-init/config-init.sh /config-init.sh
 COPY /deploy/tools/generate_cert.sh /generate_cert.sh

From f5e1abe872ee2ae43220ad2bde5d725a9715aaff Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Sun, 16 Feb 2020 14:27:08 +0000
Subject: [PATCH 374/648] Get Helm deployment working with TLS option

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 deploy/kubernetes/console/fdbvalues.yaml      |  2 +-
 .../console/templates/chartrepo.yaml          | 11 +++++++--
 .../console/templates/deployment.yaml         | 19 +++++++++++++++
 .../templates/fdb-doc-layer-deployment.yaml   | 23 ++++++++++++++-----
 .../templates/fdb-doc-layer-service.yaml      |  2 +-
 .../templates/fdbserver-deployment.yaml       |  1 +
 deploy/kubernetes/console/values.yaml         |  4 ++--
 .../plugins/monocular/chartsvc/main.go        |  8 +++----
 src/jetstream/plugins/monocular/main.go       | 14 +++++------
 9 files changed, 61 insertions(+), 23 deletions(-)

diff --git a/deploy/kubernetes/console/fdbvalues.yaml b/deploy/kubernetes/console/fdbvalues.yaml
index 64ff59738d..1c793a1b5f 100644
--- a/deploy/kubernetes/console/fdbvalues.yaml
+++ b/deploy/kubernetes/console/fdbvalues.yaml
@@ -19,7 +19,7 @@ fdbdoclayer:
   service:
     name: fdbdoclayer
     port: 27016
-  tls: false
+  tls: true
 
 # Installs networkPolicy for the services. This will allow communication betweeen the services in
 # environments where the default policy is deny
diff --git a/deploy/kubernetes/console/templates/chartrepo.yaml b/deploy/kubernetes/console/templates/chartrepo.yaml
index 8ae69374a1..e704c9ca78 100644
--- a/deploy/kubernetes/console/templates/chartrepo.yaml
+++ b/deploy/kubernetes/console/templates/chartrepo.yaml
@@ -1,4 +1,5 @@
 ---
+{{- $v := $.Files.Get "fdbvalues.yaml" | fromYaml }}
 {{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major .Capabilities.KubeVersion.Minor)}}
 apiVersion: apps/v1
 {{- else }}
@@ -33,18 +34,24 @@ spec:
         image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/stratos-chartsync:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         command: ["/chartrepo"]
-        args: ["serve", "--debug=true","--doclayer-url=mongodb://{{ .Release.Name }}-fdbdoclayer-fdbdoclayer:27016"]
+        {{- if $v.fdbdoclayer.tls }}
+        args: ["serve", "--debug=true","--doclayer-url=mongodb://{{ .Release.Name }}-fdbdoclayer:27016", "--cafile=/etc/certs/ca.crt", "--certfile=/etc/certs/tls.crt", "--keyfile=/etc/certs/tls.key"]
+        {{- else }}
+        args: ["serve", "--debug=true","--doclayer-url=mongodb://{{ .Release.Name }}-fdbdoclayer:27016"]
+        {{- end }}
         ports:
         - name: endpoint
           containerPort: 8080
+      {{- if $v.fdbdoclayer.tls }}
         volumeMounts:
         - name: certs
           mountPath: "/etc/certs"
-          readOnly: true
+          readOnly: true   
       volumes:
         - name: certs
           secret:
             secretName: {{ template "fullname" . }}-fdbdoclayer-certs
+      {{- end }}
 ---
 apiVersion: v1
 kind: Service
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 311a47cc03..ae5c678664 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -1,4 +1,5 @@
 ---
+{{- $v := $.Files.Get "fdbvalues.yaml" | fromYaml }}
 {{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major (trimSuffix "+" .Capabilities.KubeVersion.Minor) )}}
 apiVersion: apps/v1
 {{- else }}
@@ -280,6 +281,14 @@ spec:
           value: {{ default "" .Values.console.userInviteSubject | quote }}
         - name: ENABLE_TECH_PREVIEW
           value: {{ default "false" .Values.console.techPreview | quote }}
+        {{- if $v.fdbdoclayer.tls }}
+        - name: MONOCULAR_CRT_PATH
+          value: "/etc/monocular-certs/tls.crt"
+        - name: MONOCULAR_KEY_PATH
+          value: "/etc/monocular-certs/tls.key"
+        - name: MONOCULAR_CA_CRT_PATH
+          value: "/etc/monocular-certs/ca.crt"  
+        {{- end }}
         ports:
         - containerPort: 3003
           name: proxy
@@ -297,6 +306,11 @@ spec:
           name: "{{ .Release.Name }}-templates"
           readOnly: true
         {{- end }}
+        {{- if $v.fdbdoclayer.tls }}
+        - mountPath: "/etc/monocular-certs"
+          name: "{{ .Release.Name }}-monocular-certs"
+          readOnly: true
+        {{- end }}
       {{- if and .Values.kube.registry.username .Values.kube.registry.password }}
       imagePullSecrets:
       - name: {{.Values.dockerRegistrySecret}}
@@ -316,6 +330,11 @@ spec:
         configMap:
           name: {{ .Values.console.templatesConfigMapName }}
       {{- end }}
+      {{- if $v.fdbdoclayer.tls }}
+      - name: "{{ .Release.Name }}-monocular-certs"
+        secret:
+          secretName: {{ template "fullname" . }}-fdbdoclayer-certs
+      {{- end }}
 ---
 {{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major (trimSuffix "+" .Capabilities.KubeVersion.Minor) )}}
 apiVersion: apps/v1
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
index af7adfc37e..4774765e0e 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
@@ -31,17 +31,22 @@ spec:
       containers:
       - name: fdbdoclayer
         image: {{ template "fdb.image" $v.fdbdoclayer.image }}
-        volumeMounts:
-        - name: certs
-          mountPath: "/etc/secrets"
-          readOnly: true
+        imagePullPolicy: Always
         env:
         - name: FDB_COORDINATOR
           value: {{ template "fullname" . }}-fdbserver
         - name: CLUSTER_ID
           value: chartdb:erlklkg
         - name: ENABLE_TLS
-          value: $v.fdbdoclayer.tls
+          value: {{ $v.fdbdoclayer.tls  | quote }}
+        {{- if $v.fdbdoclayer.tls }}
+        - name: SERVER_CRT
+          value: "/etc/secrets/tls.crt"
+        - name: SERVER_KEY
+          value: "/etc/secrets/tls.key"
+        - name: CA_CRT
+          value: "/etc/secrets/ca.crt"      
+        {{- end }}  
         ports:
         - containerPort: {{ $v.fdbdoclayer.service.port }}
         livenessProbe:
@@ -54,7 +59,13 @@ spec:
             port: {{ $v.fdbdoclayer.service.port }}
           initialDelaySeconds: 3
           periodSeconds: 10
+{{- if $v.fdbdoclayer.tls }}
+        volumeMounts:
+        - name: certs
+          mountPath: "/etc/secrets"
+          readOnly: true
       volumes:
         - name: certs
           secret:
-            secretName: {{ template "fullname" . }}-fdbdoclayer-certs
\ No newline at end of file
+            secretName: {{ template "fullname" . }}-fdbdoclayer-certs
+{{- end }} 
\ No newline at end of file
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml
index 6d045d0c3e..15c122d1b5 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "doclayer.fullname" . }}
+  name: {{ .Release.Name }}-fdbdoclayer
   labels:
     app: {{ template "fullname" . }}-fdbdoclayer
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
index 57d747a3aa..9a8a7bd33e 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
@@ -31,6 +31,7 @@ spec:
       containers:
       - name: fdbserver
         image: {{ template "fdb.image" $v.fdbserver.image }}
+        imagePullPolicy: {{.Values.imagePullPolicy}}
         env:
         - name: FDB_COORDINATOR
           value: {{ template "fullname" . }}-fdbserver.console.svc.cluster.local
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index cf8522bfde..eef68cc38a 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -29,7 +29,7 @@ console:
     loadBalancerIP:
     loadBalancerSourceRanges: []
     servicePort: 443
-    # nodePort: 30000
+    nodePort: 30000
     type: ClusterIP
     externalName:
     ingress:
@@ -57,7 +57,7 @@ console:
     http:
       enabled: false
       servicePort: 80
-      # nodePort: 30001
+      ## nodePort: 30001
 
   # Name of config map that provides the template files for user invitation emails
   templatesConfigMapName:
diff --git a/src/jetstream/plugins/monocular/chartsvc/main.go b/src/jetstream/plugins/monocular/chartsvc/main.go
index 482e759795..dafb4db291 100644
--- a/src/jetstream/plugins/monocular/chartsvc/main.go
+++ b/src/jetstream/plugins/monocular/chartsvc/main.go
@@ -101,7 +101,7 @@ func main() {
 		log.SetLevel(log.DebugLevel)
 	}
 
-	InitFDBDocLayerConnection(fdbURL, fDB, &tlsEnabled, cACertFile, certFile, keyFile, debug)
+	InitFDBDocLayerConnection(fdbURL, fDB, &tlsEnabled, *cACertFile, *certFile, *keyFile, debug)
 
 	n := SetupRoutes()
 
@@ -114,7 +114,7 @@ func main() {
 	http.ListenAndServe(addr, n)
 }
 
-func InitFDBDocLayerConnection(fdbURL *string, fDB *string, tlsEnabled *bool, CAFile *string, certFile *string, keyFile *string, debug *bool) {
+func InitFDBDocLayerConnection(fdbURL *string, fDB *string, tlsEnabled *bool, CAFile string, certFile string, keyFile string, debug *bool) {
 
 	log.Debugf("Attempting to connect to FDB: %v, %v, debug: %v", *fdbURL, *fDB, *debug)
 
@@ -122,7 +122,7 @@ func InitFDBDocLayerConnection(fdbURL *string, fDB *string, tlsEnabled *bool, CA
 
 	if *tlsEnabled {
 		//Load CA Cert from file here
-		CA, err := ioutil.ReadFile(*CAFile) // just pass the file name
+		CA, err := ioutil.ReadFile(CAFile) // just pass the file name
 		if err != nil {
 			log.Fatalf("Cannot load CA certificate from file: %v.", err)
 			return
@@ -134,7 +134,7 @@ func InitFDBDocLayerConnection(fdbURL *string, fDB *string, tlsEnabled *bool, CA
 			return
 		}
 		//Now load the key pair and create tls options struct
-		clientKeyPair, err := tls.LoadX509KeyPair(*certFile, *keyFile)
+		clientKeyPair, err := tls.LoadX509KeyPair(certFile, keyFile)
 		if err != nil {
 			log.Fatalf("Cannot load server keypair: %v", err)
 			return
diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index 14d0c11940..655fa827e3 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -24,6 +24,9 @@ const (
 	fdbHostPortEnvVar = "FDBDOCLAYER_FDBDOCLAYER_PORT"
 	//MY_CONSOLE_CHARTREPO_PORT=tcp://10.108.171.246:8080
 	syncServerHostPortEnvVar = "CHARTREPO_PORT"
+	caCertEnvVar             = "MONOCULAR_CA_PATH"
+	tlsKeyEnvVar             = "MONOCULAR_KEY_PATH"
+	TLSCertEnvVar            = "MONOCULAR_CRT_PATH"
 )
 
 // Monocular is a plugin for Monocular
@@ -33,9 +36,6 @@ type Monocular struct {
 	RepoQueryStore  chartsvc.ChartSvcDatastore
 	FoundationDBURL string
 	SyncServiceURL  string
-	CACertFile      string
-	TLSKey          string
-	TLSCert         string
 }
 
 // Init creates a new Monocular
@@ -57,7 +57,7 @@ func (m *Monocular) Init() error {
 	fdbURL := m.FoundationDBURL
 	fDB := "monocular-plugin"
 	debug := false
-	m.ConfigureChartSVC(&fdbURL, &fDB, &m.CACertFile, &m.TLSCert, &m.TLSKey, &debug)
+	m.ConfigureChartSVC(&fdbURL, &fDB, caCertEnvVar, TLSCertEnvVar, tlsKeyEnvVar, &debug)
 	m.chartSvcRoutes = chartsvc.SetupRoutes()
 	m.InitSync()
 	m.syncOnStartup()
@@ -150,10 +150,10 @@ func arrayContainsString(a []string, x string) bool {
 	return false
 }
 
-func (m *Monocular) ConfigureChartSVC(fdbURL *string, fDB *string, cACertFile *string, certFile *string, keyFile *string, debug *bool) error {
+func (m *Monocular) ConfigureChartSVC(fdbURL *string, fDB *string, cACertFile string, certFile string, keyFile string, debug *bool) error {
 	//TLS options must either be all set to enabled TLS, or none set to disable TLS
-	var tlsEnabled = *cACertFile != "" && *keyFile != "" && *certFile != ""
-	if !(tlsEnabled || (*cACertFile == "" && *keyFile == "" && *certFile == "")) {
+	var tlsEnabled = cACertFile != "" && keyFile != "" && certFile != ""
+	if !(tlsEnabled || (cACertFile == "" && keyFile == "" && certFile == "")) {
 		return errors.New("To enable TLS, all 3 TLS cert paths must be set.")
 	}
 	chartsvc.InitFDBDocLayerConnection(fdbURL, fDB, &tlsEnabled, cACertFile, certFile, keyFile, debug)

From 9c7cc9463ed0cd8850b2013d6885d88c44da6e52 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Mon, 17 Feb 2020 12:27:58 +0000
Subject: [PATCH 375/648] Fix broken labels

---
 deploy/containers/config-init/config-init.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy/containers/config-init/config-init.sh b/deploy/containers/config-init/config-init.sh
index d83ead540d..31c7ac8876 100755
--- a/deploy/containers/config-init/config-init.sh
+++ b/deploy/containers/config-init/config-init.sh
@@ -120,7 +120,7 @@ else
     "type": "Opaque",
     "metadata": {
       "name": "@@NAME@@",
-      labels: {
+      "labels": {
         "stratos-helm-resource": "@@NAME@@",
         "app.kubernetes.io/name": "stratos",
         "app.kubernetes.io/instance": "@@RELEASE_NAME@@"
@@ -201,7 +201,7 @@ else
       "type": "kubernetes.io/tls",
       "metadata": {
         "name": "@@NAME@@",
-        labels: {
+        "labels": {
           "stratos-helm-resource": "@@NAME@@",
           "app.kubernetes.io/name": "stratos",
           "app.kubernetes.io/instance": "@@RELEASE_NAME@@"

From f512d52e9d9e4d3105ddcc5e9fb95c0d7fe3f6b2 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Mon, 17 Feb 2020 12:39:32 +0000
Subject: [PATCH 376/648] Revert changes to gen certs helper. Add debug logging
 to monocular main

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 .../kubernetes/console/templates/__helpers.tpl  | 17 ++++++++++++-----
 src/jetstream/plugins/monocular/main.go         |  8 +++++++-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/deploy/kubernetes/console/templates/__helpers.tpl b/deploy/kubernetes/console/templates/__helpers.tpl
index 995650985d..2762028d4f 100644
--- a/deploy/kubernetes/console/templates/__helpers.tpl
+++ b/deploy/kubernetes/console/templates/__helpers.tpl
@@ -41,16 +41,24 @@ This will do the following:
 {{- end -}}
 {{ end }}
 
-
 {{/*
-Get SCf UAA Endpoint
+Get SCF UAA Endpoint
 */}}
 {{- define "scfUaaEndpoint" -}}
+
 {{- $uaa_zone := default "scf" .Values.env.UAA_ZONE -}}
 {{- if and .Values.env.DOMAIN (not .Values.env.UAA_HOST) -}}
-{{- printf "https://%s.uaa.%s:%v" $uaa_zone .Values.env.DOMAIN .Values.env.UAA_PORT -}}
+{{- if .Values.env.UAA_ZONE -}}
+{{- printf "https://%s.uaa.%s:%v" .Values.env.UAA_ZONE .Values.env.DOMAIN .Values.env.UAA_PORT -}}
+{{- else -}}
+{{- printf "https://uaa.%s:%v" .Values.env.DOMAIN .Values.env.UAA_PORT -}}
+{{- end -}}
 {{- else if .Values.env.UAA_HOST -}}
-{{- printf "https://%s.%s:%v" $uaa_zone .Values.env.UAA_HOST .Values.env.UAA_PORT -}}
+{{- if .Values.env.UAA_ZONE -}}
+{{- printf "https://%s.%s:%v" .Values.env.UAA_ZONE .Values.env.UAA_HOST .Values.env.UAA_PORT -}}
+{{- else -}}
+{{- printf "https://%s:%v" .Values.env.UAA_HOST .Values.env.UAA_PORT -}}
+{{- end -}}
 {{- end -}}
 {{- end -}}
 
@@ -104,7 +112,6 @@ Generate self-signed certificate
 {{- $cert := genSignedCert ( include "console.certName" . ) nil $altNames 365 $ca -}}
 tls.crt: {{ $cert.Cert | b64enc }}
 tls.key: {{ $cert.Key | b64enc }}
-tls.ca:  {{ $ca.Cert | b64enc }}
 {{- end -}}
 
 {{/*
diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index 655fa827e3..a208264233 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -21,7 +21,7 @@ const (
 	foundationDBURLEnvVar = "HELM_FDB_URL"
 	syncServerURLEnvVar   = "HELM_SYNC_SERVER_URL"
 	// e.g. MY_CONSOLE_FDBDOCLAYER_FDBDOCLAYER_PORT=tcp://10.105.215.71:27016
-	fdbHostPortEnvVar = "FDBDOCLAYER_FDBDOCLAYER_PORT"
+	fdbHostPortEnvVar = "FDBDOCLAYER_PORT"
 	//MY_CONSOLE_CHARTREPO_PORT=tcp://10.108.171.246:8080
 	syncServerHostPortEnvVar = "CHARTREPO_PORT"
 	caCertEnvVar             = "MONOCULAR_CA_PATH"
@@ -65,10 +65,16 @@ func (m *Monocular) Init() error {
 }
 
 func (m *Monocular) configure() error {
+
+	log.Debugf("Looking up kubeReleaseNameEnvVar: %v", kubeReleaseNameEnvVar)
 	if releaseName, ok := m.portalProxy.Env().Lookup(kubeReleaseNameEnvVar); ok {
 		// We are deployed in Kubernetes
 		releaseNameEnvVarPrefix := getReleaseNameEnvVarPrefix(releaseName)
+		log.Debugf("Release name: %v, releaseNameEnvVarPrefix: %v", releaseName, releaseNameEnvVarPrefix)
+		val, _ := m.portalProxy.Env().Lookup(fdbHostPortEnvVar)
+		log.Debugf("fdbHostPortEnvVar lookup: %v", val)
 		if url, ok := m.portalProxy.Env().Lookup(fmt.Sprintf("%s_%s", releaseNameEnvVarPrefix, fdbHostPortEnvVar)); ok {
+			log.Debugf("URL: %v", url)
 			m.FoundationDBURL = strings.ReplaceAll(url, "tcp://", "mongodb://")
 		}
 		if url, ok := m.portalProxy.Env().Lookup(fmt.Sprintf("%s_%s", releaseNameEnvVarPrefix, syncServerHostPortEnvVar)); ok {

From 90b26b311c215f0eab91b75bbd93253a78c9998a Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Mon, 17 Feb 2020 14:12:10 +0000
Subject: [PATCH 377/648] Update env var for monocular ca cert

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 src/jetstream/plugins/monocular/main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index a208264233..2350e11923 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -24,7 +24,7 @@ const (
 	fdbHostPortEnvVar = "FDBDOCLAYER_PORT"
 	//MY_CONSOLE_CHARTREPO_PORT=tcp://10.108.171.246:8080
 	syncServerHostPortEnvVar = "CHARTREPO_PORT"
-	caCertEnvVar             = "MONOCULAR_CA_PATH"
+	caCertEnvVar             = "MONOCULAR_CA_CRT_PATH"
 	tlsKeyEnvVar             = "MONOCULAR_KEY_PATH"
 	TLSCertEnvVar            = "MONOCULAR_CRT_PATH"
 )

From f45b157e060cca3a83e5cd4d3059c6386e317dfc Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 17 Feb 2020 14:30:21 +0000
Subject: [PATCH 378/648] Fixes

---
 deploy/Dockerfile.bk                          |  1 -
 deploy/Dockerfile.init                        |  3 +--
 deploy/ci/tasks/build-images/canary-tag       |  2 +-
 deploy/containers/config-init/config-init.sh  |  4 +--
 .../console/templates/deployment.yaml         |  2 ++
 .../Dockerfile.stratos-bk-base.tmpl           |  5 ++--
 .../Dockerfile.stratos-bk-init-base.tmpl      | 26 +++++++++++++++++++
 .../stratos-base-images/build-base-images.sh  |  3 +++
 8 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl

diff --git a/deploy/Dockerfile.bk b/deploy/Dockerfile.bk
index 79aeaf62c8..0a69c2a346 100644
--- a/deploy/Dockerfile.bk
+++ b/deploy/Dockerfile.bk
@@ -13,7 +13,6 @@ RUN chmod +x /srv/jetstream
 
 # use --target=prod-build to build a backend image for Kubernetes
 FROM splatform/stratos-bk-base:leap15_1 as prod-build
-RUN zypper in -y curl
 COPY deploy/containers/proxy/entrypoint.sh /entrypoint.sh
 COPY /deploy/tools/generate_cert.sh /generate_cert.sh
 COPY --from=common-build /srv /srv
diff --git a/deploy/Dockerfile.init b/deploy/Dockerfile.init
index 5a653516f0..bd6214ebe4 100644
--- a/deploy/Dockerfile.init
+++ b/deploy/Dockerfile.init
@@ -1,4 +1,3 @@
-FROM splatform/stratos-bk-base:opensuse
-RUN zypper in -y curl openssh jq
+FROM splatform/stratos-bk-init-base:leap15_1
 COPY /deploy/containers/config-init/config-init.sh /config-init.sh
 COPY /deploy/tools/generate_cert.sh /generate_cert.sh
diff --git a/deploy/ci/tasks/build-images/canary-tag b/deploy/ci/tasks/build-images/canary-tag
index 0c5e42f77e..be1bd41848 100644
--- a/deploy/ci/tasks/build-images/canary-tag
+++ b/deploy/ci/tasks/build-images/canary-tag
@@ -1 +1 @@
-canary
\ No newline at end of file
+canary
diff --git a/deploy/containers/config-init/config-init.sh b/deploy/containers/config-init/config-init.sh
index d83ead540d..31c7ac8876 100755
--- a/deploy/containers/config-init/config-init.sh
+++ b/deploy/containers/config-init/config-init.sh
@@ -120,7 +120,7 @@ else
     "type": "Opaque",
     "metadata": {
       "name": "@@NAME@@",
-      labels: {
+      "labels": {
         "stratos-helm-resource": "@@NAME@@",
         "app.kubernetes.io/name": "stratos",
         "app.kubernetes.io/instance": "@@RELEASE_NAME@@"
@@ -201,7 +201,7 @@ else
       "type": "kubernetes.io/tls",
       "metadata": {
         "name": "@@NAME@@",
-        labels: {
+        "labels": {
           "stratos-helm-resource": "@@NAME@@",
           "app.kubernetes.io/name": "stratos",
           "app.kubernetes.io/instance": "@@RELEASE_NAME@@"
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 9e2ecc1e7a..6cd3d3bdd1 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -69,6 +69,8 @@ spec:
         imagePullPolicy: {{.Values.imagePullPolicy}}
         name: proxy
         env:
+        - name: STRATOS_HELM_RELEASE
+          value: "{{ .Release.Name }}"
         - name: DB_USER
           valueFrom:
             secretKeyRef:
diff --git a/deploy/stratos-base-images/Dockerfile.stratos-bk-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-bk-base.tmpl
index 8416e9ea83..c472967acf 100644
--- a/deploy/stratos-base-images/Dockerfile.stratos-bk-base.tmpl
+++ b/deploy/stratos-base-images/Dockerfile.stratos-bk-base.tmpl
@@ -9,8 +9,9 @@ RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SERVER}}' smt_internal_server
 RUN zypper ref
 {{/IS_SLE}}
 RUN zypper in -y ca-certificates && \
-    # Can remove this when we remove the postflight job
-    zypper in -y mariadb-client curl && \
+    zypper in -y curl && \
+    zypper in -y bind-utils && \
+    zypper in -y hostname && \
     mkdir -p /srv && \
     mkdir -p /root/.npm-global
 # Install latest git from devel/tools/scm repository
diff --git a/deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl
new file mode 100644
index 0000000000..09057e9795
--- /dev/null
+++ b/deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl
@@ -0,0 +1,26 @@
+FROM {{BASE_IMAGE}}
+
+{{#IS_SLE}}
+RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp
+RUN zypper addrepo  -G -c '{{SMT_INTERNAL}}' smt_internal
+RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_UPDATE}}' smt_internal_update
+RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SDK}}' smt_internal_sdk
+RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SERVER}}' smt_internal_server
+RUN zypper ref
+{{/IS_SLE}}
+RUN zypper in -y ca-certificates && \
+    zypper in -y curl && \
+    zypper in -y openssh && \
+    zypper in -y jq && \
+    zypper in -y bind-utils && \
+    zypper in -y hostname && \
+    mkdir -p /srv && \
+    mkdir -p /root/.npm-global
+
+{{#IS_SLE}}
+RUN zypper rr smt_internal
+RUN zypper rr smt_internal_update
+RUN zypper rr smt_internal_sdk
+RUN zypper rr smt_internal_server
+{{/IS_SLE}}
+WORKDIR /srv
diff --git a/deploy/stratos-base-images/build-base-images.sh b/deploy/stratos-base-images/build-base-images.sh
index 2e58c97a4c..bbb02ec45c 100755
--- a/deploy/stratos-base-images/build-base-images.sh
+++ b/deploy/stratos-base-images/build-base-images.sh
@@ -171,6 +171,9 @@ build_and_push_image stratos-bk-build-base Dockerfile.stratos-bk-build-base
 # Used for building the DB image
 build_and_push_image stratos-db-base Dockerfile.stratos-mariadb-base
 
+# Used for building the init image
+build_and_push_image stratos-bk-init-base Dockerfile.stratos-bk-init-base
+
 # Used for building the AIO image
 tag_and_push_image stratos-bk-build-base stratos-aio-base
 

From fe715109013155cfaf41ce0ca1fa33a3ac4d8900 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Mon, 17 Feb 2020 15:25:51 +0000
Subject: [PATCH 379/648] Use http readiness probe, not TCP

---
 deploy/kubernetes/console/templates/deployment.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 6cd3d3bdd1..a838a70d3d 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -254,10 +254,10 @@ spec:
         - name: ENABLE_TECH_PREVIEW
           value: {{ default "false" .Values.console.techPreview | quote }}
         readinessProbe:
-          tcpSocket:
+          httpGet:
+            path: /pp/v1/version
+            scheme: HTTPS
             port: 3003
-          initialDelaySeconds: 3
-          periodSeconds: 3
         ports:
         - containerPort: 3003
           name: proxy

From 7f7cefae8084b9d8d604ed10d4a628a6760dc326 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Mon, 17 Feb 2020 16:49:35 +0000
Subject: [PATCH 380/648] Temporary fix to replace fdbdoclayer service IP wth
 hostname (needed for certificate validation)

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 src/jetstream/plugins/monocular/main.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index 2350e11923..21be96c294 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -57,7 +57,10 @@ func (m *Monocular) Init() error {
 	fdbURL := m.FoundationDBURL
 	fDB := "monocular-plugin"
 	debug := false
-	m.ConfigureChartSVC(&fdbURL, &fDB, caCertEnvVar, TLSCertEnvVar, tlsKeyEnvVar, &debug)
+	caCertPath, _ := m.portalProxy.Env().Lookup(caCertEnvVar)
+	TLSCertPath, _ := m.portalProxy.Env().Lookup(TLSCertEnvVar)
+	tlsKeyPath, _ := m.portalProxy.Env().Lookup(tlsKeyEnvVar)
+	m.ConfigureChartSVC(&fdbURL, &fDB, caCertPath, TLSCertPath, tlsKeyPath, &debug)
 	m.chartSvcRoutes = chartsvc.SetupRoutes()
 	m.InitSync()
 	m.syncOnStartup()
@@ -66,15 +69,12 @@ func (m *Monocular) Init() error {
 
 func (m *Monocular) configure() error {
 
-	log.Debugf("Looking up kubeReleaseNameEnvVar: %v", kubeReleaseNameEnvVar)
 	if releaseName, ok := m.portalProxy.Env().Lookup(kubeReleaseNameEnvVar); ok {
 		// We are deployed in Kubernetes
 		releaseNameEnvVarPrefix := getReleaseNameEnvVarPrefix(releaseName)
-		log.Debugf("Release name: %v, releaseNameEnvVarPrefix: %v", releaseName, releaseNameEnvVarPrefix)
-		val, _ := m.portalProxy.Env().Lookup(fdbHostPortEnvVar)
-		log.Debugf("fdbHostPortEnvVar lookup: %v", val)
 		if url, ok := m.portalProxy.Env().Lookup(fmt.Sprintf("%s_%s", releaseNameEnvVarPrefix, fdbHostPortEnvVar)); ok {
-			log.Debugf("URL: %v", url)
+			//TODO kate - fetch hostname/port dynamically here (We need the hostname to match the server certificate)
+			url = fmt.Sprintf("%s%s-%s", "tcp://", releaseName, "fdbdoclayer:27016")
 			m.FoundationDBURL = strings.ReplaceAll(url, "tcp://", "mongodb://")
 		}
 		if url, ok := m.portalProxy.Env().Lookup(fmt.Sprintf("%s_%s", releaseNameEnvVarPrefix, syncServerHostPortEnvVar)); ok {

From c777ceeef6af1a5d50fdbffaf0fb92d5efb40957 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 17 Feb 2020 17:22:05 +0000
Subject: [PATCH 381/648] Ensure readiness probe does not spam log

---
 deploy/kubernetes/console/templates/deployment.yaml |  2 +-
 src/jetstream/main.go                               | 13 +++++++++++++
 src/jetstream/setup_console.go                      |  9 ++++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index a838a70d3d..16d09cf2da 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -255,7 +255,7 @@ spec:
           value: {{ default "false" .Values.console.techPreview | quote }}
         readinessProbe:
           httpGet:
-            path: /pp/v1/version
+            path: /pp/v1/ping
             scheme: HTTPS
             port: 3003
         ports:
diff --git a/src/jetstream/main.go b/src/jetstream/main.go
index 147a0877ce..8c157a6d18 100644
--- a/src/jetstream/main.go
+++ b/src/jetstream/main.go
@@ -687,6 +687,14 @@ func initializeHTTPClients(timeout int64, timeoutMutating int64, connectionTimeo
 	httpClientMutatingSkipSSL.Timeout = time.Duration(timeoutMutating) * time.Second
 }
 
+func echoShouldNotLog(ec echo.Context) bool {
+	// Don't log readiness probes
+	if ec.Request().RequestURI == "/pp/v1/ping" {
+		return true
+	}
+	return false
+}
+
 func start(config interfaces.PortalConfig, p *portalProxy, needSetupMiddleware bool, isUpgrade bool) error {
 	log.Debug("start")
 	e := echo.New()
@@ -702,6 +710,8 @@ func start(config interfaces.PortalConfig, p *portalProxy, needSetupMiddleware b
 			`Method:"${method}" Path:"${path}" Status:${status} Latency:${latency_human} ` +
 			`Bytes-In:${bytes_in} Bytes-Out:${bytes_out}` + "\n",
 	}
+	customLoggerConfig.Skipper = echoShouldNotLog
+
 	e.Use(middleware.LoggerWithConfig(customLoggerConfig))
 	e.Use(middleware.Recover())
 	e.Use(middleware.CORSWithConfig(middleware.CORSConfig{
@@ -846,6 +856,9 @@ func (p *portalProxy) registerRoutes(e *echo.Echo, needSetupMiddleware bool) {
 	// Version info
 	pp.GET("/v1/version", p.getVersions)
 
+	// Ping - returns version (but is not logged)
+	pp.GET("/v1/ping", p.getVersions)
+
 	// All routes in the session group need the user to be authenticated
 	sessionGroup := pp.Group("/v1")
 	sessionGroup.Use(p.sessionMiddleware)
diff --git a/src/jetstream/setup_console.go b/src/jetstream/setup_console.go
index f73df07729..ccf1610321 100644
--- a/src/jetstream/setup_console.go
+++ b/src/jetstream/setup_console.go
@@ -25,6 +25,7 @@ const (
 	setupRequestRegex      = "^/pp/v1/setup/save$"
 	setupCheckRequestRegex = "^/pp/v1/setup/check$"
 	versionRequestRegex    = "^/pp/v1/version$"
+	pingRequestRegex       = "^/pp/v1/ping$"
 	backendRequestRegex    = "^/pp/v1/"
 	systemGroupName        = "env"
 )
@@ -250,7 +251,7 @@ func (p *portalProxy) initialiseConsoleConfig(envLookup *env.VarSet) (*interface
 			if consoleConfig.AuthorizationEndpoint == nil {
 				// No Authorization endpoint
 				consoleConfig.AuthorizationEndpoint = consoleConfig.UAAEndpoint
-				log.Infof("Using UAA Endpoint for Auth Endpoint: %s", consoleConfig.AuthorizationEndpoint)
+				log.Debugf("Using UAA Endpoint for Auth Endpoint: %s", consoleConfig.AuthorizationEndpoint)
 			}
 		} else {
 			//Auth endpoint type has been set to an invalid value
@@ -353,6 +354,12 @@ func (p *portalProxy) SetupMiddleware() echo.MiddlewareFunc {
 			if isVersionRequest {
 				return h(c)
 			}
+
+			isPingRequest, _ := regexp.MatchString(pingRequestRegex, requestURLPath)
+			if isPingRequest {
+				return h(c)
+			}
+
 			// Request is not a setup request, refuse backend requests and allow all others
 			isBackendRequest, _ := regexp.MatchString(backendRequestRegex, requestURLPath)
 			if !isBackendRequest {

From 020b2be793bc342b5218559c9c8c5f31d5140c0f Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 17 Feb 2020 17:38:01 +0000
Subject: [PATCH 382/648] Build for extra images

---
 custom-src/deploy/kubernetes/custom-build.sh  | 24 +++++
 deploy/Dockerfile.bk                          |  1 -
 deploy/Dockerfile.init                        |  3 +-
 deploy/containers/config-init/config-init.sh  |  4 +-
 .../monocular/fdb-doclayer/Dockerfile         | 64 +++++++++++++
 .../monocular/fdb-doclayer/fdbdoc.bash        | 54 +++++++++++
 .../monocular/fdb-server/Dockerfile           | 92 +++++++++++++++++++
 .../monocular/fdb-server/configure_db.bash    | 45 +++++++++
 .../fdb-server/create_cluster_file.bash       | 60 ++++++++++++
 .../fdb-server/create_server_environment.bash | 46 ++++++++++
 .../download_multiversion_libraries.bash      | 31 +++++++
 .../containers/monocular/fdb-server/fdb.bash  | 31 +++++++
 deploy/kubernetes/build.sh                    | 14 ++-
 .../console/templates/deployment.yaml         | 10 +-
 .../Dockerfile.stratos-bk-base.tmpl           |  5 +-
 .../Dockerfile.stratos-bk-init-base.tmpl      | 26 ++++++
 .../stratos-base-images/build-base-images.sh  |  3 +
 17 files changed, 495 insertions(+), 18 deletions(-)
 create mode 100644 custom-src/deploy/kubernetes/custom-build.sh
 create mode 100644 deploy/containers/monocular/fdb-doclayer/Dockerfile
 create mode 100755 deploy/containers/monocular/fdb-doclayer/fdbdoc.bash
 create mode 100644 deploy/containers/monocular/fdb-server/Dockerfile
 create mode 100755 deploy/containers/monocular/fdb-server/configure_db.bash
 create mode 100644 deploy/containers/monocular/fdb-server/create_cluster_file.bash
 create mode 100644 deploy/containers/monocular/fdb-server/create_server_environment.bash
 create mode 100644 deploy/containers/monocular/fdb-server/download_multiversion_libraries.bash
 create mode 100644 deploy/containers/monocular/fdb-server/fdb.bash
 create mode 100644 deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl

diff --git a/custom-src/deploy/kubernetes/custom-build.sh b/custom-src/deploy/kubernetes/custom-build.sh
new file mode 100644
index 0000000000..b850a85563
--- /dev/null
+++ b/custom-src/deploy/kubernetes/custom-build.sh
@@ -0,0 +1,24 @@
+# This file is included in the build script
+
+printf "${BOLD}${YELLOW}"
+echo
+echo "==========================================================================="
+echo "SUSE Helm Chart Customization script loaded <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
+echo "==========================================================================="
+echo
+printf "${RESET}"
+
+# Script must provide a function named 'custom_image_build'
+
+function custom_image_build() {
+
+  log "-- Building/publishing Foundation DB Server"
+  patchAndPushImage stratos-fdbserver Dockerfile "${STRATOS_PATH}/deploy/containers/monocular/fdb-server"
+
+  log "-- Building/publishing Foundation DB Document Layer"
+  patchAndPushImage stratos-fdbdoclayer Dockerfile "${STRATOS_PATH}/deploy/containers/monocular/fdb-doclayer"
+
+  # Build and push an image for the Helm Repo Sync Tool
+  log "-- Building/publishing Monocular Chart Repo Sync Tool"
+  patchAndPushImage stratos-chartsync Dockerfile "${STRATOS_PATH}/src/jetstream/plugins/monocular/chart-repo"
+}
\ No newline at end of file
diff --git a/deploy/Dockerfile.bk b/deploy/Dockerfile.bk
index 79aeaf62c8..0a69c2a346 100644
--- a/deploy/Dockerfile.bk
+++ b/deploy/Dockerfile.bk
@@ -13,7 +13,6 @@ RUN chmod +x /srv/jetstream
 
 # use --target=prod-build to build a backend image for Kubernetes
 FROM splatform/stratos-bk-base:leap15_1 as prod-build
-RUN zypper in -y curl
 COPY deploy/containers/proxy/entrypoint.sh /entrypoint.sh
 COPY /deploy/tools/generate_cert.sh /generate_cert.sh
 COPY --from=common-build /srv /srv
diff --git a/deploy/Dockerfile.init b/deploy/Dockerfile.init
index 159ec6437d..bd6214ebe4 100644
--- a/deploy/Dockerfile.init
+++ b/deploy/Dockerfile.init
@@ -1,4 +1,3 @@
-FROM splatform/stratos-bk-base:leap15_1
-RUN zypper in -y curl openssh jq
+FROM splatform/stratos-bk-init-base:leap15_1
 COPY /deploy/containers/config-init/config-init.sh /config-init.sh
 COPY /deploy/tools/generate_cert.sh /generate_cert.sh
diff --git a/deploy/containers/config-init/config-init.sh b/deploy/containers/config-init/config-init.sh
index d83ead540d..31c7ac8876 100755
--- a/deploy/containers/config-init/config-init.sh
+++ b/deploy/containers/config-init/config-init.sh
@@ -120,7 +120,7 @@ else
     "type": "Opaque",
     "metadata": {
       "name": "@@NAME@@",
-      labels: {
+      "labels": {
         "stratos-helm-resource": "@@NAME@@",
         "app.kubernetes.io/name": "stratos",
         "app.kubernetes.io/instance": "@@RELEASE_NAME@@"
@@ -201,7 +201,7 @@ else
       "type": "kubernetes.io/tls",
       "metadata": {
         "name": "@@NAME@@",
-        labels: {
+        "labels": {
           "stratos-helm-resource": "@@NAME@@",
           "app.kubernetes.io/name": "stratos",
           "app.kubernetes.io/instance": "@@RELEASE_NAME@@"
diff --git a/deploy/containers/monocular/fdb-doclayer/Dockerfile b/deploy/containers/monocular/fdb-doclayer/Dockerfile
new file mode 100644
index 0000000000..e670a88e2a
--- /dev/null
+++ b/deploy/containers/monocular/fdb-doclayer/Dockerfile
@@ -0,0 +1,64 @@
+
+# Original Source: https://raw.githubusercontent.com/kreinecke/fdb-document-layer/master/packaging/docker/Dockerfile
+
+# Dockerfile
+#
+# This source file is part of the FoundationDB open source project
+#
+# Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Builder container
+FROM splatform/stratos-bk-build-base:leap15_1 as builder
+
+# Install dependencies
+
+# Our Stratos base image already has curl and less in it
+
+# Install FoundationDB Document Layer Binaries
+
+ARG FDB_DOC_VERSION=1.6.3
+ARG FDB_WEBSITE=https://www.foundationdb.org
+
+WORKDIR /home/stratos
+RUN curl $FDB_WEBSITE/downloads/$FDB_DOC_VERSION/linux/fdb-document-layer-$FDB_DOC_VERSION-Linux.tar.gz -o fdb-document-layer-$FDB_DOC_VERSION-Linux.tar.gz && \
+    tar -xvf fdb-document-layer-$FDB_DOC_VERSION-Linux.tar.gz && \
+    mv fdb-document-layer-$FDB_DOC_VERSION-Linux doclayer
+
+
+# This Docker image is just packing 6.0 client libraries. Document Layer works with
+# any FoundationDB server >= 5.1.0. If your server version is not 6.0, then you might
+# have to add the correct version client library here.
+ARG FDB_CLIENT_VERSION=6.2.15
+RUN curl $FDB_WEBSITE/downloads/$FDB_CLIENT_VERSION/linux/libfdb_c_$FDB_CLIENT_VERSION.so -o /home/stratos/libfdb_c.so && \
+    chmod +x /home/stratos/libfdb_c.so && \
+	rm -rf /mnt/website
+
+# Final doclayer container
+FROM splatform/stratos-bk-init-base:leap15_1
+WORKDIR /var/fdb
+
+COPY --from=builder /home/stratos/libfdb_c.so /usr/lib64/libfdb_c.so
+COPY --from=builder /home/stratos/doclayer/bin/fdbdoc /usr/bin/fdbdoc
+COPY --from=builder /home/stratos/doclayer/lib/foundationdb/document/fdbmonitor /usr/bin/fdbmonitor
+
+COPY fdbdoc.bash scripts/
+RUN chmod u+x scripts/*.bash && mkdir -p logs
+
+CMD /var/fdb/scripts/fdbdoc.bash
+
+# Runtime Configuration Options
+ENV FDB_DOC_PORT 27016
+ENV FDB_NETWORKING_MODE container
\ No newline at end of file
diff --git a/deploy/containers/monocular/fdb-doclayer/fdbdoc.bash b/deploy/containers/monocular/fdb-doclayer/fdbdoc.bash
new file mode 100755
index 0000000000..08bfad6e6b
--- /dev/null
+++ b/deploy/containers/monocular/fdb-doclayer/fdbdoc.bash
@@ -0,0 +1,54 @@
+#! /bin/bash
+
+function setup_cluster_file() {
+	FDB_CLUSTER_FILE=${FDB_CLUSTER_FILE:-/etc/foundationdb/fdb.cluster}
+	mkdir -p $(dirname $FDB_CLUSTER_FILE)
+
+	if [[ -n $FDB_COORDINATOR ]]; then
+		echo "FDB coordinator: $FDB_COORDINATOR"
+		coordinator_ip=$(dig +short +search $FDB_COORDINATOR)
+		echo "Coordinator IP: $coordinator_ip"
+                if [[ -z "$coordinator_ip" ]]; then
+                        echo "Failed to look up coordinator address for $FDB_COORDINATOR" 1>&2
+                        exit 1
+                fi
+                coordinator_port=${FDB_COORDINATOR_PORT:-4500}
+		if [[ -z $CLUSTER_ID ]]; then
+			echo "CLUSTER_ID environment variable not defined" 1>&2
+                	exit 1
+		fi
+                echo "$CLUSTER_ID@$coordinator_ip:$coordinator_port" > $FDB_CLUSTER_FILE
+        else
+                echo "FDB_COORDINATOR environment variable not defined" 1>&2
+                exit 1
+        fi
+
+
+    if [ ! -f ${FDB_CLUSTER_FILE} ]; then
+        echo "Failed to locate cluster file at $FDB_CLUSTER_FILE" 1>&2
+        exit 1
+    fi
+}
+
+
+function setup_public_ip() {
+	if [[ "$FDB_NETWORKING_MODE" == "host" ]]; then
+		public_ip=127.0.0.1
+	elif [[ "$FDB_NETWORKING_MODE" == "container" ]]; then
+		public_ip=$(grep `hostname` /etc/hosts | sed -e "s/\s *`hostname`.*//")
+	else
+		echo "Unknown FDB Networking mode \"$FDB_NETWORKING_MODE\"" 1>&2
+		exit 1
+	fi
+
+	PUBLIC_IP=$public_ip
+}
+
+setup_public_ip
+setup_cluster_file
+
+echo "Starting FDB Document Layer on $PUBLIC_IP:$FDB_DOC_PORT"
+echo "Connecting to FDB server at: $CLUSTER_ID@$coordinator_ip:$coordinator_port"
+echo "Cluster file contents: "
+cat $FDB_CLUSTER_FILE
+fdbdoc -V --listen_address $PUBLIC_IP:$FDB_DOC_PORT --logdir /var/fdb/logs
diff --git a/deploy/containers/monocular/fdb-server/Dockerfile b/deploy/containers/monocular/fdb-server/Dockerfile
new file mode 100644
index 0000000000..16b0ba3c70
--- /dev/null
+++ b/deploy/containers/monocular/fdb-server/Dockerfile
@@ -0,0 +1,92 @@
+# Taken from: https://github.com/kreinecke/foundationdb/tree/fdb-k8s/packaging/docker
+
+# Dockerfile
+#
+# This source file is part of the FoundationDB open source project
+#
+# Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM splatform/stratos-bk-base:leap15_1
+
+# Install dependencies
+
+# RUN apt-get update && \
+# 	apt-get install -y curl>=7.58.0-2ubuntu3.6 \
+# 	dnsutils>=1:9.11.3+dfsg-1ubuntu1.7 && \
+# 	rm -r /var/lib/apt/lists/*
+
+# NOTE: Dependencies are in the base image
+# TODO: Add bind-utils to base image
+# curl is already in our base image
+
+# TODO: Can remove this
+RUN zypper update -y && \
+    zypper in -y bind-utils && \
+    zypper in -y hostname && \
+    zypper in -y tar xz gzip
+
+# Install FoundationDB Binaries
+
+ARG FDB_VERSION=6.2.15
+ARG FDB_WEBSITE=https://www.foundationdb.org
+
+WORKDIR /var/fdb/tmp
+
+# /mnt/website folder is empty
+RUN mkdir -p /mnt/website
+# ADD website /mnt/website
+# RUN ls -l /mnt/website
+
+RUN curl $FDB_WEBSITE/downloads/$FDB_VERSION/linux/fdb_$FDB_VERSION.tar.gz -o fdb_$FDB_VERSION.tar.gz && \
+	tar -xzf fdb_$FDB_VERSION.tar.gz --strip-components=1 && \
+	rm fdb_$FDB_VERSION.tar.gz && \
+	chmod u+x fdbbackup fdbcli fdbdr fdbmonitor fdbrestore fdbserver backup_agent dr_agent && \
+	mv fdbbackup fdbcli fdbdr fdbmonitor fdbrestore fdbserver backup_agent dr_agent /usr/bin && \
+	rm -r /var/fdb/tmp
+
+WORKDIR /var/fdb
+
+# Install FoundationDB Client Libraries
+
+ARG FDB_ADDITIONAL_VERSIONS="5.1.7"
+
+COPY download_multiversion_libraries.bash scripts/
+
+RUN curl $FDB_WEBSITE/downloads/$FDB_VERSION/linux/libfdb_c_$FDB_VERSION.so -o /usr/lib/libfdb_c.so && \
+	bash scripts/download_multiversion_libraries.bash $FDB_WEBSITE $FDB_ADDITIONAL_VERSIONS && \
+	rm -rf /mnt/website
+
+# Set Up Runtime Scripts and Directories
+
+COPY fdb.bash scripts/
+COPY create_server_environment.bash scripts/
+COPY create_cluster_file.bash scripts/
+COPY configure_db.bash scripts/
+RUN chmod u+x scripts/*.bash && \
+	mkdir -p logs
+VOLUME /var/fdb/data
+
+CMD /var/fdb/scripts/fdb.bash
+
+# Runtime Configuration Options
+
+ENV FDB_PORT 4500
+ENV FDB_CLUSTER_FILE /var/fdb/fdb.cluster
+ENV FDB_NETWORKING_MODE container
+ENV FDB_COORDINATOR ""
+ENV FDB_COORDINATOR_PORT 4500
+ENV FDB_CLUSTER_FILE_CONTENTS ""
+ENV FDB_PROCESS_CLASS unset
\ No newline at end of file
diff --git a/deploy/containers/monocular/fdb-server/configure_db.bash b/deploy/containers/monocular/fdb-server/configure_db.bash
new file mode 100755
index 0000000000..df2a8d6e91
--- /dev/null
+++ b/deploy/containers/monocular/fdb-server/configure_db.bash
@@ -0,0 +1,45 @@
+#! /bin/bash
+
+#
+# create_cluster_file.bash
+#
+# This source file is part of the FoundationDB open source project
+#
+# Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# This script creates a cluster file for a server or client.
+# This takes the cluster file path from the FDB_CLUSTER_FILE
+# environment variable, with a default of /etc/foundationdb/fdb.cluster
+#
+# The name of the coordinator must be defined in the FDB_COORDINATOR environment
+# variable, and it must be a name that can be resolved through DNS.
+
+function configure_db() {
+	max_retry=10
+	counter=0
+	until fdbcli --exec "configure new single memory" | grep 'Database created'
+	do
+   		sleep 1
+   		[[ counter -eq $max_retry ]] && echo "Failed!" && exit 1
+   		echo "Could not init db yet. Trying again. Try #$counter"
+   		((counter++))
+	done
+	echo "Database created."
+}
+
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+	configure_db "$@"
+fi
\ No newline at end of file
diff --git a/deploy/containers/monocular/fdb-server/create_cluster_file.bash b/deploy/containers/monocular/fdb-server/create_cluster_file.bash
new file mode 100644
index 0000000000..453a049941
--- /dev/null
+++ b/deploy/containers/monocular/fdb-server/create_cluster_file.bash
@@ -0,0 +1,60 @@
+#! /bin/bash
+
+#
+# create_cluster_file.bash
+#
+# This source file is part of the FoundationDB open source project
+#
+# Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# This script creates a cluster file for a server or client.
+# This takes the cluster file path from the FDB_CLUSTER_FILE
+# environment variable, with a default of /etc/foundationdb/fdb.cluster
+#
+# The name of the coordinator must be defined in the FDB_COORDINATOR environment
+# variable, and it must be a name that can be resolved through DNS.
+
+function create_cluster_file() {
+	FDB_CLUSTER_FILE=${FDB_CLUSTER_FILE:-/etc/foundationdb/fdb.cluster}
+	mkdir -p $(dirname $FDB_CLUSTER_FILE)
+
+	if [[ -n "$FDB_CLUSTER_FILE_CONTENTS" ]]; then
+		echo "$FDB_CLUSTER_FILE_CONTENTS" > $FDB_CLUSTER_FILE
+	elif [[ -n $FDB_COORDINATOR ]]; then
+		coordinator_ip=$(dig +short +search $FDB_COORDINATOR)
+		if [[ -z "$coordinator_ip" ]]; then
+			echo "Failed to look up coordinator address for $FDB_COORDINATOR" 1>&2
+			exit 1
+		fi
+		if [[ -z $CLUSTER_ID ]]; then
+                        echo "CLUSTER_ID environment variable not defined" 1>&2
+                        exit 1
+                fi
+		coordinator_port=${FDB_COORDINATOR_PORT:-4500}
+		echo "export COORDINATOR_IP=$coordinator_ip" >> $env_file
+		echo "export COORDINATOR_PORT=$coordinator_port" >> $env_file
+		source $env_file
+		#echo "$CLUSTER_ID@$coordinator_ip:$coordinator_port,127.0.0.1:4500" > $FDB_CLUSTER_FILE
+		echo "$CLUSTER_ID@$PUBLIC_IP:4500" > $FDB_CLUSTER_FILE
+	else
+		echo "FDB_COORDINATOR environment variable not defined" 1>&2
+		exit 1
+	fi
+}
+
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+	create_cluster_file "$@"
+fi
\ No newline at end of file
diff --git a/deploy/containers/monocular/fdb-server/create_server_environment.bash b/deploy/containers/monocular/fdb-server/create_server_environment.bash
new file mode 100644
index 0000000000..54d90f0854
--- /dev/null
+++ b/deploy/containers/monocular/fdb-server/create_server_environment.bash
@@ -0,0 +1,46 @@
+#! /bin/bash
+
+#
+# create_server_environment.bash
+#
+# This source file is part of the FoundationDB open source project
+#
+# Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source /var/fdb/scripts/create_cluster_file.bash
+
+function create_server_environment() {
+	fdb_dir=/var/fdb
+	env_file=$fdb_dir/.fdbenv
+
+	: > $env_file
+
+	if [[ "$FDB_NETWORKING_MODE" == "host" ]]; then
+		public_ip=127.0.0.1
+	elif [[ "$FDB_NETWORKING_MODE" == "container" ]]; then
+		public_ip=$(grep `hostname` /etc/hosts | sed -e "s/\s *`hostname`.*//")
+	else
+		echo "Unknown FDB Networking mode \"$FDB_NETWORKING_MODE\"" 1>&2
+		exit 1
+	fi
+
+	echo "export PUBLIC_IP=$public_ip" >> $env_file
+	if [[ -z $FDB_COORDINATOR ]]; then
+		FDB_CLUSTER_FILE_CONTENTS="docker:docker@$public_ip:$FDB_PORT"
+	fi
+
+	create_cluster_file
+}
diff --git a/deploy/containers/monocular/fdb-server/download_multiversion_libraries.bash b/deploy/containers/monocular/fdb-server/download_multiversion_libraries.bash
new file mode 100644
index 0000000000..651947857c
--- /dev/null
+++ b/deploy/containers/monocular/fdb-server/download_multiversion_libraries.bash
@@ -0,0 +1,31 @@
+#! /bin/bash
+
+#
+# download_multiversion_libraries.bash
+#
+# This source file is part of the FoundationDB open source project
+#
+# Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+mkdir -p /usr/lib/fdb/multiversion
+website=$1
+shift
+for version in $*; do
+	origin=$website/downloads/$version/linux/libfdb_c_$version.so
+	destination=/usr/lib/fdb/multiversion/libfdb_c_$version.so
+	echo "Downloading $origin to $destination"
+	curl $origin -o $destination
+done
\ No newline at end of file
diff --git a/deploy/containers/monocular/fdb-server/fdb.bash b/deploy/containers/monocular/fdb-server/fdb.bash
new file mode 100644
index 0000000000..0e6ad40827
--- /dev/null
+++ b/deploy/containers/monocular/fdb-server/fdb.bash
@@ -0,0 +1,31 @@
+#! /bin/bash
+
+#
+# fdb.bash
+#
+# This source file is part of the FoundationDB open source project
+#
+# Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source /var/fdb/scripts/create_server_environment.bash
+create_server_environment
+source /var/fdb/.fdbenv
+echo "Starting FDB server listening on: $PUBLIC_IP:$COORDINATOR_PORT public address: $PUBLIC_IP:$COORDINATOR_PORT"
+cat /var/fdb/fdb.cluster
+source /var/fdb/scripts/configure_db.bash
+configure_db &
+fdbserver --listen_address $PUBLIC_IP:$COORDINATOR_PORT --public_address $PUBLIC_IP:$COORDINATOR_PORT \
+	--datadir /var/fdb/data --logdir /var/fdb/logs
\ No newline at end of file
diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
index a500e0d66a..80939ca3f0 100755
--- a/deploy/kubernetes/build.sh
+++ b/deploy/kubernetes/build.sh
@@ -28,6 +28,7 @@ NO_PUSH="true"
 DOCKER_REG_DEFAULTS="true"
 CHART_ONLY="false"
 ADD_GITHASH_TO_TAG="true"
+HAS_CUSTOM_BUILD="false"
 
 while getopts ":ho:r:t:Tclb:Opcn" opt; do
   case $opt in
@@ -132,6 +133,11 @@ __DIRNAME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 STRATOS_PATH=${__DIRNAME}/../../
 source ${STRATOS_PATH}/deploy/common-build.sh
 
+if [ -f "${STRATOS_PATH}/custom-src/deploy/kubernetes/custom-build.sh" ]; then
+  source "${STRATOS_PATH}/custom-src/deploy/kubernetes/custom-build.sh"
+  HAS_CUSTOM_BUILD="true"
+fi
+
 function patchAndPushImage {
   NAME=${1}
   DOCKER_FILE=${2}
@@ -185,7 +191,6 @@ if [ "${ADD_GITHASH_TO_TAG}" == "true" ]; then
   updateTagForRelease
 fi
 
-
 if [ "${CHART_ONLY}" == "false" ]; then
 
   # Build all of the components that make up the Console
@@ -204,9 +209,10 @@ if [ "${CHART_ONLY}" == "false" ]; then
   log "-- Building/publishing the runtime container image for the Console web server (frontend)"
   patchAndPushImage stratos-console deploy/Dockerfile.ui "${STRATOS_PATH}" prod-build
 
-  # Build and push an image for the Helm Repo Sync Tool
-  log "-- Building/publishing Monocular Chart Repo"
-  patchAndPushImage stratos-chartsync Dockerfile "${STRATOS_PATH}/src/jetstream/plugins/monocular/chart-repo"
+  # Build any custom images added by a fork
+  if [ "${HAS_CUSTOM_BUILD}" == "true" ]; then
+    custom_image_build
+  fi
 fi
 
 log "-- Building Helm Chart"
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index d7e26aaec2..c2e408bc84 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -254,7 +254,9 @@ spec:
         - name: ENABLE_TECH_PREVIEW
           value: {{ default "false" .Values.console.techPreview | quote }}
         readinessProbe:
-          tcpSocket:
+          httpGet:
+            path: /pp/v1/ping
+            scheme: HTTPS
             port: 3003
           initialDelaySeconds: 3
           periodSeconds: 3
@@ -309,9 +311,3 @@ spec:
     rollingUpdate:
       maxSurge: 0
       maxUnavailable: 1
-  replicas: 1
-  strategy:
-    type: RollingUpdate
-    rollingUpdate:
-      maxSurge: 0
-      maxUnavailable: 1
diff --git a/deploy/stratos-base-images/Dockerfile.stratos-bk-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-bk-base.tmpl
index 8416e9ea83..c472967acf 100644
--- a/deploy/stratos-base-images/Dockerfile.stratos-bk-base.tmpl
+++ b/deploy/stratos-base-images/Dockerfile.stratos-bk-base.tmpl
@@ -9,8 +9,9 @@ RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SERVER}}' smt_internal_server
 RUN zypper ref
 {{/IS_SLE}}
 RUN zypper in -y ca-certificates && \
-    # Can remove this when we remove the postflight job
-    zypper in -y mariadb-client curl && \
+    zypper in -y curl && \
+    zypper in -y bind-utils && \
+    zypper in -y hostname && \
     mkdir -p /srv && \
     mkdir -p /root/.npm-global
 # Install latest git from devel/tools/scm repository
diff --git a/deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl
new file mode 100644
index 0000000000..09057e9795
--- /dev/null
+++ b/deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl
@@ -0,0 +1,26 @@
+FROM {{BASE_IMAGE}}
+
+{{#IS_SLE}}
+RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp
+RUN zypper addrepo  -G -c '{{SMT_INTERNAL}}' smt_internal
+RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_UPDATE}}' smt_internal_update
+RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SDK}}' smt_internal_sdk
+RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SERVER}}' smt_internal_server
+RUN zypper ref
+{{/IS_SLE}}
+RUN zypper in -y ca-certificates && \
+    zypper in -y curl && \
+    zypper in -y openssh && \
+    zypper in -y jq && \
+    zypper in -y bind-utils && \
+    zypper in -y hostname && \
+    mkdir -p /srv && \
+    mkdir -p /root/.npm-global
+
+{{#IS_SLE}}
+RUN zypper rr smt_internal
+RUN zypper rr smt_internal_update
+RUN zypper rr smt_internal_sdk
+RUN zypper rr smt_internal_server
+{{/IS_SLE}}
+WORKDIR /srv
diff --git a/deploy/stratos-base-images/build-base-images.sh b/deploy/stratos-base-images/build-base-images.sh
index 2e58c97a4c..bbb02ec45c 100755
--- a/deploy/stratos-base-images/build-base-images.sh
+++ b/deploy/stratos-base-images/build-base-images.sh
@@ -171,6 +171,9 @@ build_and_push_image stratos-bk-build-base Dockerfile.stratos-bk-build-base
 # Used for building the DB image
 build_and_push_image stratos-db-base Dockerfile.stratos-mariadb-base
 
+# Used for building the init image
+build_and_push_image stratos-bk-init-base Dockerfile.stratos-bk-init-base
+
 # Used for building the AIO image
 tag_and_push_image stratos-bk-build-base stratos-aio-base
 

From 83f65caa43cad450aeec3477a601d110d57ce8bd Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 17 Feb 2020 17:58:03 +0000
Subject: [PATCH 383/648] Use builder image to reduce size

---
 .../monocular/fdb-server/Dockerfile           | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/deploy/containers/monocular/fdb-server/Dockerfile b/deploy/containers/monocular/fdb-server/Dockerfile
index 16b0ba3c70..48e589f3b1 100644
--- a/deploy/containers/monocular/fdb-server/Dockerfile
+++ b/deploy/containers/monocular/fdb-server/Dockerfile
@@ -19,7 +19,7 @@
 # limitations under the License.
 #
 
-FROM splatform/stratos-bk-base:leap15_1
+FROM splatform/stratos-bk-build-base:leap15_1 as builder
 
 # Install dependencies
 
@@ -29,42 +29,39 @@ FROM splatform/stratos-bk-base:leap15_1
 # 	rm -r /var/lib/apt/lists/*
 
 # NOTE: Dependencies are in the base image
-# TODO: Add bind-utils to base image
-# curl is already in our base image
-
-# TODO: Can remove this
-RUN zypper update -y && \
-    zypper in -y bind-utils && \
-    zypper in -y hostname && \
-    zypper in -y tar xz gzip
 
 # Install FoundationDB Binaries
 
 ARG FDB_VERSION=6.2.15
 ARG FDB_WEBSITE=https://www.foundationdb.org
 
-WORKDIR /var/fdb/tmp
-
-# /mnt/website folder is empty
-RUN mkdir -p /mnt/website
-# ADD website /mnt/website
-# RUN ls -l /mnt/website
-
+USER root
+WORKDIR /home/stratos/tmp
+WORKDIR /home/stratos
+RUN pwd && ls -al
 RUN curl $FDB_WEBSITE/downloads/$FDB_VERSION/linux/fdb_$FDB_VERSION.tar.gz -o fdb_$FDB_VERSION.tar.gz && \
 	tar -xzf fdb_$FDB_VERSION.tar.gz --strip-components=1 && \
 	rm fdb_$FDB_VERSION.tar.gz && \
 	chmod u+x fdbbackup fdbcli fdbdr fdbmonitor fdbrestore fdbserver backup_agent dr_agent && \
-	mv fdbbackup fdbcli fdbdr fdbmonitor fdbrestore fdbserver backup_agent dr_agent /usr/bin && \
-	rm -r /var/fdb/tmp
+	mv fdbbackup fdbcli fdbdr fdbmonitor fdbrestore fdbserver backup_agent dr_agent /home/stratos/tmp
+
+
+# Main container
+FROM splatform/stratos-bk-base:leap15_1
 
 WORKDIR /var/fdb
 
 # Install FoundationDB Client Libraries
 
+ARG FDB_VERSION=6.2.15
 ARG FDB_ADDITIONAL_VERSIONS="5.1.7"
+ARG FDB_WEBSITE=https://www.foundationdb.org
+
+COPY --from=builder /home/stratos/tmp /usr/bin
 
 COPY download_multiversion_libraries.bash scripts/
 
+RUN mkdir -p /mnt/website
 RUN curl $FDB_WEBSITE/downloads/$FDB_VERSION/linux/libfdb_c_$FDB_VERSION.so -o /usr/lib/libfdb_c.so && \
 	bash scripts/download_multiversion_libraries.bash $FDB_WEBSITE $FDB_ADDITIONAL_VERSIONS && \
 	rm -rf /mnt/website

From 3280889eef9c742ab9845f2d567b18f960119ff4 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 17 Feb 2020 19:17:58 +0000
Subject: [PATCH 384/648] Create CI pipeline

---
 deploy/ci/suse-console-dev-releases.yml | 230 ++++++++++++++++++++++++
 1 file changed, 230 insertions(+)
 create mode 100644 deploy/ci/suse-console-dev-releases.yml

diff --git a/deploy/ci/suse-console-dev-releases.yml b/deploy/ci/suse-console-dev-releases.yml
new file mode 100644
index 0000000000..e98aff2330
--- /dev/null
+++ b/deploy/ci/suse-console-dev-releases.yml
@@ -0,0 +1,230 @@
+# This pipeline creates an Alpha, Beta or RC release
+---
+resource_types:
+- name: docker-image
+  type: docker-image
+  privileged: true
+  source:
+    repository: ((docker-resource-image))
+    tag: ((docker-resource-image-tag))
+resources:
+# Stratos Git Repository
+- name: stratos
+  type: git
+  source:
+    uri: git@github.com:((stratos-repository-organization))/((stratos-repository))
+    branch: ((stratos-repository-branch))
+    private_key: ((github-private-key))
+    # Match any Version 3 release (alpha, beta, rc) other than the actual release
+    tag_filter: "3*-*"
+- name: helm-repo
+  type: git
+  source:
+    uri: git@github.com:((helm-repo-github-organization))/((helm-repo-github-repository))
+    branch: ((helm-repo-branch))
+    private_key: ((github-private-key))
+# Docker Images
+- name: jetstream-image
+  type: docker-image
+  source:
+    username: ((docker-username))
+    password: ((docker-password))
+    repository: ((docker-repository))/stratos-jetstream
+- name: config-init-image
+  type: docker-image
+  source:
+    username: ((docker-username))
+    password: ((docker-password))
+    repository: ((docker-repository))/stratos-config-init
+- name: mariadb-image
+  type: docker-image
+  source:
+    username: ((docker-username))
+    password: ((docker-password))
+    repository: ((docker-repository))/stratos-mariadb
+- name: ui-image
+  type: docker-image
+  source:
+    username: ((docker-username))
+    password: ((docker-password))
+    repository: ((docker-repository))/stratos-console
+- name: fdbserver-image
+  type: docker-image
+  source:
+    username: ((docker-username))
+    password: ((docker-password))
+    repository: ((docker-repository))/stratos-fdbserver
+- name: fdbdoclayer-image
+  type: docker-image
+  source:
+    username: ((docker-username))
+    password: ((docker-password))
+    repository: ((docker-repository))/stratos-fdbdoclayer
+
+# Artifacts
+- name: image-tag
+  type: s3
+  source:
+    bucket: ((minio-bucket))
+    endpoint: ((minio-server-endpoint))
+    regexp: temp-artifacts/release-(.*).tar
+    access_key_id: ((minio-access-key))
+    secret_access_key: ((minio-secret-access-key))
+    region_name: eu-central-1
+- name: helm-chart-tarball
+  type: s3
+  source:
+    bucket: ((minio-bucket))
+    endpoint: ((minio-server-endpoint))
+    regexp: temp-artifacts/console-helm-chart-(?P<version>.*).tgz
+    access_key_id: ((minio-access-key))
+    secret_access_key: ((minio-secret-access-key))
+    region_name: eu-central-1
+jobs:
+- name: generate-tag-files
+  plan:
+  - get: stratos
+    trigger: true
+  - do:
+    - task: generate-tag
+      file: stratos/deploy/ci/tasks/dev-releases/generate-tag-files.yml
+      params:
+        TAG_SUFFIX: ((tag-suffix))
+    - put: image-tag
+      params:
+        file: image-tag/*.tar
+        acl: public-read
+- name: check-github
+  plan:
+  - get: stratos
+    passed: [generate-tag-files]
+    trigger: true
+  - get: image-tag
+    passed: [generate-tag-files] 
+    params:
+     unpack: true
+  - do:
+    - task: build
+      privileged: true
+      timeout: 30m
+      file: stratos/deploy/ci/tasks/dev-releases/check-gh-release.yml
+      params:
+        GITHUB_TOKEN: ((github-access-token))
+        GITHUB_USER: ((helm-repo-github-organization))
+        GITHUB_REPO: ((helm-repo-github-repository))
+        GIT_USER: ((concourse-user))
+        GIT_EMAIL: ((concourse-email))
+        GIT_PRIVATE_KEY: ((github-private-key))
+- name: build-images
+  plan:
+  - get: stratos
+    passed: [check-github]
+    trigger: true
+  - get: image-tag
+    passed: [check-github]
+    params:
+      unpack: true
+  - aggregate:
+    - do:
+      - put: jetstream-image
+        params:
+          dockerfile: stratos/deploy/Dockerfile.bk
+          build: stratos/
+          target_name:  prod-build
+          tag: image-tag/v2-alpha-tag
+          build_args_file: image-tag/build-args
+          patch_base_reg: ((patch-base-reg))
+          patch_base_tag: ((patch-base-tag))
+      - put: config-init-image
+        params:
+          dockerfile: stratos/deploy/Dockerfile.init
+          build: stratos/
+          target_name:  postflight-job
+          tag: image-tag/v2-alpha-tag
+          patch_base_reg: ((patch-base-reg))
+          patch_base_tag: ((patch-base-tag))
+      - put: mariadb-image
+        params:
+          dockerfile: stratos/deploy/db/Dockerfile.mariadb
+          build: stratos/deploy/db
+          tag: image-tag/v2-alpha-tag
+          patch_base_reg: ((patch-base-reg))
+          patch_base_tag: ((patch-base-tag))
+    - do: 
+      - put: ui-image
+        params:
+          dockerfile: stratos/deploy/Dockerfile.ui
+          build: stratos/
+          target_name: prod-build
+          tag: image-tag/v2-alpha-tag
+          build_args_file: image-tag/ui-build-args
+          patch_base_reg: ((patch-base-reg))
+          patch_base_tag: ((patch-base-tag))
+      - put: fdbserver-image
+        params:
+          dockerfile: stratos/deploy/containers/monocular/fdb-server/Dockerfile
+          build: stratos/deploy/containers/monocular/fdb-server/
+          target_name: prod-build
+          tag: image-tag/v2-alpha-tag
+          patch_base_reg: ((patch-base-reg))
+          patch_base_tag: ((patch-base-tag))
+      - put: fdbdoclayer-image
+        params:
+          dockerfile: stratos/deploy/containers/monocular/fdb-doclayer/Dockerfile
+          build: stratos/deploy/containers/monocular/fdb-doclayer/
+          target_name: prod-build
+          tag: image-tag/v2-alpha-tag
+          patch_base_reg: ((patch-base-reg))
+          patch_base_tag: ((patch-base-tag))
+- name: create-chart
+  plan:
+  - get: stratos
+    passed: [build-images]
+    trigger: true
+  - get: helm-repo
+  - get: image-tag
+    passed: [build-images]
+    params:
+      unpack: true
+  - do:
+    - task: build
+      privileged: true
+      timeout: 30m
+      file: stratos/deploy/ci/tasks/dev-releases/create-chart.yml
+      params:
+        GIT_USER: ((concourse-user))
+        GIT_EMAIL: ((concourse-email))
+        GITHUB_ORG: ((helm-repo-github-organization))
+        GITHUB_REPO: ((helm-repo-github-repository))
+        GIT_PRIVATE_KEY: ((github-private-key))
+        DOCKER_ORG: ((docker-organization))
+        DOCKER_REGISTRY: ((docker-registry))
+        HELM_REPO_PATH: ((helm-repo-path))
+        HELM_REPO_BRANCH: ((helm-repo-branch))
+    - put: helm-chart-tarball
+      params:
+       file: helm-chart/*.tgz
+       acl: public-read   
+- name: update-github
+  plan:
+  - get: stratos
+    passed: [create-chart]
+    trigger: true
+  - get: helm-chart-tarball
+    passed: [create-chart]
+  - get: image-tag
+    passed: [create-chart] 
+    params:
+     unpack: true
+  - do:
+    - task: build
+      privileged: true
+      timeout: 30m
+      file: stratos/deploy/ci/tasks/dev-releases/update-gh-release.yml
+      params:
+        GITHUB_TOKEN: ((github-access-token))
+        GITHUB_USER: ((helm-repo-github-organization))
+        GITHUB_REPO: ((helm-repo-github-repository))
+        GIT_USER: ((concourse-user))
+        GIT_EMAIL: ((concourse-email))
+        GIT_PRIVATE_KEY: ((github-private-key))
\ No newline at end of file

From a22c89a4cf1259e0225ea323347d31d1b594315f Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 17 Feb 2020 19:25:46 +0000
Subject: [PATCH 385/648] Add updates for TLS

---
 deploy/containers/monocular/fdb-doclayer/fdbdoc.bash | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/deploy/containers/monocular/fdb-doclayer/fdbdoc.bash b/deploy/containers/monocular/fdb-doclayer/fdbdoc.bash
index 08bfad6e6b..f610e609e3 100755
--- a/deploy/containers/monocular/fdb-doclayer/fdbdoc.bash
+++ b/deploy/containers/monocular/fdb-doclayer/fdbdoc.bash
@@ -47,8 +47,13 @@ function setup_public_ip() {
 setup_public_ip
 setup_cluster_file
 
-echo "Starting FDB Document Layer on $PUBLIC_IP:$FDB_DOC_PORT"
 echo "Connecting to FDB server at: $CLUSTER_ID@$coordinator_ip:$coordinator_port"
 echo "Cluster file contents: "
 cat $FDB_CLUSTER_FILE
-fdbdoc -V --listen_address $PUBLIC_IP:$FDB_DOC_PORT --logdir /var/fdb/logs
+if [[ "$ENABLE_TLS" == "true" ]]; then
+	echo "Starting FDB Document Layer on $PUBLIC_IP:$FDB_DOC_PORT:tls. TLS enabled."
+	fdbdoc -V --listen_address $PUBLIC_IP:$FDB_DOC_PORT:tls --tls_certificate_file $SERVER_CRT --tls_ca_file $CA_CRT --tls_key_file $SERVER_KEY --logdir /var/fdb/logs
+else
+	echo "Starting FDB Document Layer on $PUBLIC_IP:$FDB_DOC_PORT. No TLS."
+	fdbdoc -V --listen_address $PUBLIC_IP:$FDB_DOC_PORT --logdir /var/fdb/logs
+fi

From 046dade5f1747308978fa7854a5e95345e9dde0b Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Tue, 18 Feb 2020 09:41:51 +0000
Subject: [PATCH 386/648] Move fdbvalues.yaml into values.yaml. Monocular init
 now uses env vars to set chartsvc and chart-repo URLs

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 .../console/templates/chartrepo.yaml          |  6 ++--
 .../console/templates/deployment.yaml         | 13 +++++---
 .../fdbdoclayer/templates/_helpers.tpl        | 12 +++----
 .../templates/fdb-doc-layer-deployment.yaml   | 22 ++++++-------
 .../fdb-doc-layer-networkpolicy.yaml          |  6 ++--
 .../templates/fdb-doc-layer-service.yaml      |  8 ++---
 .../templates/fdbserver-deployment.yaml       | 14 ++++----
 .../templates/fdbserver-networkpolicy.yaml    |  6 ++--
 .../templates/fdbserver-service.yaml          |  8 ++---
 deploy/kubernetes/console/values.yaml         | 33 +++++++++++++++++++
 src/jetstream/plugins/monocular/main.go       | 21 ++----------
 11 files changed, 85 insertions(+), 64 deletions(-)

diff --git a/deploy/kubernetes/console/templates/chartrepo.yaml b/deploy/kubernetes/console/templates/chartrepo.yaml
index e704c9ca78..7cd388242c 100644
--- a/deploy/kubernetes/console/templates/chartrepo.yaml
+++ b/deploy/kubernetes/console/templates/chartrepo.yaml
@@ -1,5 +1,5 @@
 ---
-{{- $v := $.Files.Get "fdbvalues.yaml" | fromYaml }}
+.Values.
 {{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major .Capabilities.KubeVersion.Minor)}}
 apiVersion: apps/v1
 {{- else }}
@@ -34,7 +34,7 @@ spec:
         image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/stratos-chartsync:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         command: ["/chartrepo"]
-        {{- if $v.fdbdoclayer.tls }}
+        {{- if .Values.fdbdoclayer.tls }}
         args: ["serve", "--debug=true","--doclayer-url=mongodb://{{ .Release.Name }}-fdbdoclayer:27016", "--cafile=/etc/certs/ca.crt", "--certfile=/etc/certs/tls.crt", "--keyfile=/etc/certs/tls.key"]
         {{- else }}
         args: ["serve", "--debug=true","--doclayer-url=mongodb://{{ .Release.Name }}-fdbdoclayer:27016"]
@@ -42,7 +42,7 @@ spec:
         ports:
         - name: endpoint
           containerPort: 8080
-      {{- if $v.fdbdoclayer.tls }}
+      {{- if .Values.fdbdoclayer.tls }}
         volumeMounts:
         - name: certs
           mountPath: "/etc/certs"
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 1562a65ebd..8c4658b37f 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -1,5 +1,4 @@
 ---
-{{- $v := $.Files.Get "fdbvalues.yaml" | fromYaml }}
 {{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major (trimSuffix "+" .Capabilities.KubeVersion.Minor) )}}
 apiVersion: apps/v1
 {{- else }}
@@ -254,14 +253,18 @@ spec:
           value: {{ default "" .Values.console.userInviteSubject | quote }}
         - name: ENABLE_TECH_PREVIEW
           value: {{ default "false" .Values.console.techPreview | quote }}
-        {{- if $v.fdbdoclayer.tls }}
+        {{- if .Values.fdbdoclayer.tls }}
         - name: MONOCULAR_CRT_PATH
           value: "/etc/monocular-certs/tls.crt"
         - name: MONOCULAR_KEY_PATH
           value: "/etc/monocular-certs/tls.key"
         - name: MONOCULAR_CA_CRT_PATH
-          value: "/etc/monocular-certs/ca.crt"  
+          value: "/etc/monocular-certs/ca.crt"
         {{- end }}
+        - name: HELM_FDB_URL
+          value: "mongodb://{{ .Release.Name }}-{{ .Values.fdbdoclayer.service.name }}:{{ .Values.fdbdoclayer.service.port }}"
+        - name: HELM_SYNC_SERVER_URL
+          value: "http://{{ .Release.Name }}-{{ .Values.chartrepo.service.name }}:{{ .Values.chartrepo.service.port }}"
         readinessProbe:
           tcpSocket:
             port: 3003
@@ -286,7 +289,7 @@ spec:
           name: "{{ .Release.Name }}-templates"
           readOnly: true
         {{- end }}
-        {{- if $v.fdbdoclayer.tls }}
+        {{- if .Values.fdbdoclayer.tls }}
         - mountPath: "/etc/monocular-certs"
           name: "{{ .Release.Name }}-monocular-certs"
           readOnly: true
@@ -317,7 +320,7 @@ spec:
         configMap:
           name: {{ .Values.console.templatesConfigMapName }}
       {{- end }}
-      {{- if $v.fdbdoclayer.tls }}
+      {{- if .Values.fdbdoclayer.tls }}
       - name: "{{ .Release.Name }}-monocular-certs"
         secret:
           secretName: {{ template "fullname" . }}-fdbdoclayer-certs
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/_helpers.tpl b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/_helpers.tpl
index 2ebaff4e8c..439751e1a4 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/_helpers.tpl
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/_helpers.tpl
@@ -5,8 +5,8 @@
 Expand the name of the chart.
 */}}
 {{- define "name" -}}
-{{- $v := $.Files.Get "fdbvalues.yaml" | fromYaml }}
-{{- default .Chart.Name $v.nameOverride | trunc 63 | trimSuffix "-" -}}
+
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
@@ -14,8 +14,8 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "fullname" -}}
-{{- $v := $.Files.Get "fdbvalues.yaml" | fromYaml }}
-{{- $name := default .Chart.Name $v.nameOverride -}}
+
+{{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -24,8 +24,8 @@ Create a default fully qualified app name for the document layer.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "doclayer.fullname" -}}
-{{- $v := $.Files.Get "fdbvalues.yaml" | fromYaml }}
-{{- $name := default .Chart.Name $v.nameOverride -}}
+
+{{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s-%s" .Release.Name $name "fdbdoclayer" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
index 4774765e0e..68d4e7e46c 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
@@ -1,4 +1,4 @@
-{{- $v := $.Files.Get "fdbvalues.yaml" | fromYaml }}
+
 {{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major (trimSuffix "+" .Capabilities.KubeVersion.Minor) )}}
 apiVersion: apps/v1
 {{- else }}
@@ -13,7 +13,7 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 spec:
-  replicas: {{ $v.fdbdoclayer.replicas }}
+  replicas: {{ .Values.fdbdoclayer.replicas }}
   selector:
     matchLabels:
       app: {{ template "fullname" . }}-fdbdoclayer
@@ -24,22 +24,22 @@ spec:
         app: {{ template "fullname" . }}-fdbdoclayer
         release: {{ .Release.Name }}
     spec:
-{{- with $v.securityContext }}
+{{- with .Values.securityContext }}
       securityContext:
 {{ toYaml . | indent 8 }}
 {{- end }}
       containers:
       - name: fdbdoclayer
-        image: {{ template "fdb.image" $v.fdbdoclayer.image }}
-        imagePullPolicy: Always
+        image: {{ template "fdb.image" .Values.fdbdoclayer.image }}
+        imagePullPolicy: {{.Values.imagePullPolicy}}
         env:
         - name: FDB_COORDINATOR
           value: {{ template "fullname" . }}-fdbserver
         - name: CLUSTER_ID
           value: chartdb:erlklkg
         - name: ENABLE_TLS
-          value: {{ $v.fdbdoclayer.tls  | quote }}
-        {{- if $v.fdbdoclayer.tls }}
+          value: {{ .Values.fdbdoclayer.tls  | quote }}
+        {{- if .Values.fdbdoclayer.tls }}
         - name: SERVER_CRT
           value: "/etc/secrets/tls.crt"
         - name: SERVER_KEY
@@ -48,18 +48,18 @@ spec:
           value: "/etc/secrets/ca.crt"      
         {{- end }}  
         ports:
-        - containerPort: {{ $v.fdbdoclayer.service.port }}
+        - containerPort: {{ .Values.fdbdoclayer.service.port }}
         livenessProbe:
           tcpSocket:
-            port: {{ $v.fdbdoclayer.service.port }}
+            port: {{ .Values.fdbdoclayer.service.port }}
           initialDelaySeconds: 3
           periodSeconds: 20
         readinessProbe:
           tcpSocket:
-            port: {{ $v.fdbdoclayer.service.port }}
+            port: {{ .Values.fdbdoclayer.service.port }}
           initialDelaySeconds: 3
           periodSeconds: 10
-{{- if $v.fdbdoclayer.tls }}
+{{- if .Values.fdbdoclayer.tls }}
         volumeMounts:
         - name: certs
           mountPath: "/etc/secrets"
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-networkpolicy.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-networkpolicy.yaml
index fff0908421..9d15cbc953 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-networkpolicy.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-networkpolicy.yaml
@@ -1,5 +1,5 @@
-{{- $v := $.Files.Get "fdbvalues.yaml" | fromYaml }}
-{{- if $v.networkPolicy.enabled }}
+
+{{- if .Values.fdbdoclayer.networkPolicy.enabled }}
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
@@ -16,6 +16,6 @@ spec:
       release: {{ .Release.Name }}
   ingress:
     ports:
-      port: {{ $v.fdbdoclayer.service.port }}
+      port: {{ .Values.fdbdoclayer.service.port }}
       protocol: TCP
 {{- end }}
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml
index 15c122d1b5..d5d33cf46d 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml
@@ -1,4 +1,4 @@
-{{- $v := $.Files.Get "fdbvalues.yaml" | fromYaml }}
+
 apiVersion: v1
 kind: Service
 metadata:
@@ -11,10 +11,10 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-  - port: {{ $v.fdbdoclayer.service.port }}
-    targetPort: {{ $v.fdbdoclayer.service.port }}
+  - port: {{ .Values.fdbdoclayer.service.port }}
+    targetPort: {{ .Values.fdbdoclayer.service.port }}
     protocol: TCP
-    name: {{ $v.fdbdoclayer.service.name }}
+    name: {{ .Values.fdbdoclayer.service.name }}
   selector:
     app: {{ template "fullname" . }}-fdbdoclayer
     release: {{ .Release.Name }}
\ No newline at end of file
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
index 9a8a7bd33e..834c4198c1 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
@@ -1,4 +1,4 @@
-{{- $v := $.Files.Get "fdbvalues.yaml" | fromYaml }}
+
 {{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major (trimSuffix "+" .Capabilities.KubeVersion.Minor) )}}
 apiVersion: apps/v1
 {{- else }}
@@ -13,7 +13,7 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 spec:
-  replicas: {{ $v.fdbserver.replicas }}
+  replicas: {{ .Values.fdbserver.replicas }}
   selector:
     matchLabels:
       app: {{ template "fullname" . }}-fdbserver
@@ -24,13 +24,13 @@ spec:
         app: {{ template "fullname" . }}-fdbserver
         release: {{ .Release.Name }}
     spec:
-{{- with $v.securityContext }}
+{{- with .Values.securityContext }}
       securityContext:
 {{ toYaml . | indent 8 }}
 {{- end }}
       containers:
       - name: fdbserver
-        image: {{ template "fdb.image" $v.fdbserver.image }}
+        image: {{ template "fdb.image" .Values.fdbserver.image }}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         env:
         - name: FDB_COORDINATOR
@@ -38,14 +38,14 @@ spec:
         - name: CLUSTER_ID
           value: chartdb:erlklkg
         ports:
-        - containerPort: {{ $v.fdbserver.service.port }}
+        - containerPort: {{ .Values.fdbserver.service.port }}
         livenessProbe:
           tcpSocket:
-            port: {{ $v.fdbserver.service.port }}
+            port: {{ .Values.fdbserver.service.port }}
           initialDelaySeconds: 3
           periodSeconds: 20
         readinessProbe:
           tcpSocket:
-            port: {{ $v.fdbserver.service.port }}
+            port: {{ .Values.fdbserver.service.port }}
           initialDelaySeconds: 3
           periodSeconds: 10
\ No newline at end of file
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-networkpolicy.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-networkpolicy.yaml
index 6731652471..db6ea4d64e 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-networkpolicy.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-networkpolicy.yaml
@@ -1,5 +1,5 @@
-{{- $v := $.Files.Get "fdbvalues.yaml" | fromYaml }}
-{{- if $v.networkPolicy.enabled }}
+
+{{- if .Values.fdbserver.networkPolicy.enabled }}
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
@@ -16,6 +16,6 @@ spec:
       release: {{ .Release.Name }}
   ingress:
   - ports:
-    - port: {{ $v.fdbserver.service.port }}
+    - port: {{ .Values.fdbserver.service.port }}
       protocol: TCP
 {{- end }}
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-service.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-service.yaml
index 0bf1a4081c..87aeca5f1e 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-service.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-service.yaml
@@ -1,4 +1,4 @@
-{{- $v := $.Files.Get "fdbvalues.yaml" | fromYaml }}
+
 apiVersion: v1
 kind: Service
 metadata:
@@ -11,10 +11,10 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-  - port: {{ $v.fdbserver.service.port }}
-    targetPort: {{ $v.fdbserver.service.port }}
+  - port: {{ .Values.fdbserver.service.port }}
+    targetPort: {{ .Values.fdbserver.service.port }}
     protocol: TCP
-    name: {{ $v.fdbserver.service.name }}
+    name: {{ .Values.fdbserver.service.name }}
   selector:
     app: {{ template "fullname" . }}-fdbserver
     release: {{ .Release.Name }}
\ No newline at end of file
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index aacf620163..42e01cd046 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -129,6 +129,39 @@ uaa:
   consoleAdminIdentifier: 
   skipSSLValidation: false
 
+fdbserver:
+  replicas: 1
+  image:
+    registry: docker.io
+    repository: kreinecke/foundationdb
+    tag: 6.0.18-k8s
+  service:
+    name: fdbserver
+    port: 4500
+  networkPolicy:
+    enabled: false
+
+fdbdoclayer:
+  replicas: 1
+  image:
+    registry: docker.io
+    repository: kreinecke/fdb-document-layer-k8s-tls
+    tag: latest
+  service:
+    name: fdbdoclayer
+    port: 27016
+  tls: true
+  networkPolicy:
+    enabled: false
+
+chartrepo:
+  service:
+    name: chartrepo
+    port: 8080
+  tls: true
+  networkPolicy:
+    enabled: false
+
 # SCF values compatability 
 env:
   DOMAIN:
diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index 21be96c294..3de05b728b 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -2,7 +2,6 @@ package monocular
 
 import (
 	"errors"
-	"fmt"
 	"net/http"
 	"strings"
 
@@ -69,23 +68,9 @@ func (m *Monocular) Init() error {
 
 func (m *Monocular) configure() error {
 
-	if releaseName, ok := m.portalProxy.Env().Lookup(kubeReleaseNameEnvVar); ok {
-		// We are deployed in Kubernetes
-		releaseNameEnvVarPrefix := getReleaseNameEnvVarPrefix(releaseName)
-		if url, ok := m.portalProxy.Env().Lookup(fmt.Sprintf("%s_%s", releaseNameEnvVarPrefix, fdbHostPortEnvVar)); ok {
-			//TODO kate - fetch hostname/port dynamically here (We need the hostname to match the server certificate)
-			url = fmt.Sprintf("%s%s-%s", "tcp://", releaseName, "fdbdoclayer:27016")
-			m.FoundationDBURL = strings.ReplaceAll(url, "tcp://", "mongodb://")
-		}
-		if url, ok := m.portalProxy.Env().Lookup(fmt.Sprintf("%s_%s", releaseNameEnvVarPrefix, syncServerHostPortEnvVar)); ok {
-			m.SyncServiceURL = strings.ReplaceAll(url, "tcp://", "http://")
-		}
-
-	} else {
-		// Env var lookup when not running in Kubernetes
-		m.FoundationDBURL = m.portalProxy.Env().String(foundationDBURLEnvVar, "")
-		m.SyncServiceURL = m.portalProxy.Env().String(syncServerURLEnvVar, "")
-	}
+	// Env var lookup when not running in Kubernetes
+	m.FoundationDBURL = m.portalProxy.Env().String(foundationDBURLEnvVar, "")
+	m.SyncServiceURL = m.portalProxy.Env().String(syncServerURLEnvVar, "")
 
 	log.Debugf("Foundation DB : %s", m.FoundationDBURL)
 	log.Debugf("Sync Server   : %s", m.SyncServiceURL)

From 04af9d96c7fb12bf3c0f2cf60cd05c4828d3ed78 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 18 Feb 2020 10:14:56 +0000
Subject: [PATCH 387/648] Further improvements and fixes

---
 deploy/kubernetes/console/README.md           | 78 ++++++++++++++++---
 .../console/templates/config-init.yaml        | 15 ++++
 .../console/templates/database.yaml           |  7 ++
 .../console/templates/deployment.yaml         |  8 +-
 .../kubernetes/console/templates/service.yaml | 16 ++++
 deploy/kubernetes/console/values.yaml         | 23 +++++-
 6 files changed, 128 insertions(+), 19 deletions(-)

diff --git a/deploy/kubernetes/console/README.md b/deploy/kubernetes/console/README.md
index 79bc27455d..36eb3d6dae 100644
--- a/deploy/kubernetes/console/README.md
+++ b/deploy/kubernetes/console/README.md
@@ -4,6 +4,11 @@ Stratos is an Open Source Web-based Management console for Cloud Foundry. It all
 
 ## Installation
 
+Stratos can be installed to a Kubernetes cluster using Helm. Either Helm 2 or Helm 3 can be used, although we recommend using the newer Helm 3 version.
+
+Ensure the [Helm](https://github.com/helm/helm) client and [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) CLIs are installed. If you are using Helm 2, ensure you've initialized Tiller into your cluster with the appropriate
+Service Account.
+
 The Helm chart is published to the Stratos Helm repository.
 
 You will need to have the Stratos Helm repository added to your Helm setup, if you do not, run:
@@ -11,22 +16,30 @@ You will need to have the Stratos Helm repository added to your Helm setup, if y
 ```
 helm repo add stratos https://cloudfoundry.github.io/stratos
 ```
-Check the repository was successfully added by searching for the `console`
+
+Check the repository was successfully added by searching for the `console`, for example:
+
 ```
 helm search console
 NAME               	CHART VERSION   APP VERSION	DESCRIPTION                                  
-stratos/console    	2.6.0           2.6.0      	A Helm chart for deploying Stratos UI Console
+stratos/console    	3.0.0           3.0.0      	A Helm chart for deploying Stratos UI Console
 ```
+
 To install Stratos:
 
 ```
+kubectl create namespace console
 helm install stratos/console --namespace=console --name my-console
 ```
+
+> **Note**: The first `kubectl` command will create a namespace for Stratos. With Helm 3 you must create a namespace before installing.
+We recommend installing Stratos into a separate namespace.
+
 > **Note**: This assumes that a storage class exists in the Kubernetes cluster that has been marked as `default`. If no such storage class exists, a specific storage class needs to be specified, please see the following section *Specifying a custom Storage Class*. 
 
 > You can change the namespace (--namespace) and the release name (--name) to values of your choice.
 
-This will create a Console instance named `my-console` in a namespace called `console` in your Kubernetes cluster.
+This will create a Stratos instance named `my-console` in a namespace called `console` in your Kubernetes cluster.
 
 After the install, you should be able to access the Console in a web browser by following [the instructions](#accessing-the-console) below.
 
@@ -42,7 +55,6 @@ The following table lists the configurable parameters of the Stratos Helm chart
 |console.sessionStoreSecret|Secret to use when encrypting session tokens|auto-generated random value|
 |console.ssoLogin|Whether to enable SSO Login and use the UAA Login UI instead of the built-in one|false|
 |console.backendLogLevel|Log level for backend (info, debug)|info|
-|console.service.annotations|Annotations to add to the console service|[]|
 |console.service.externalIPs|External IPs to add to the console service|[]|
 |console.service.loadBalancerIP|IP address to assign to the load balancer for the metrics service (if supported)||
 |console.service.loadBalancerSourceRanges|List of IP CIDRs allowed access to load balancer (if supported)|[]|
@@ -51,8 +63,6 @@ The following table lists the configurable parameters of the Stratos Helm chart
 |console.service.externalName|External name for the console service when service type is ExternalName||
 |console.service.nodePort|Node port to use for the console service when service type is NodePort or LoadBalancer||
 |console.ingress.enabled|Enable ingress for the console service|false|
-|console.ingress.annotations|Annotations to add to the ingress resource|{}|
-|console.ingress.extraLabels|Extra labels to add to the ingress resource|{}|
 |console.ingress.host|Host for the ingress resource|||
 |console.ingress.secretName|Name of an existing secret containing the TLS certificate for ingress|||
 |console.service.http.enabled|Enabled HTTP access to the console service (as well as HTTPS)|false|
@@ -88,6 +98,18 @@ The following table lists the configurable parameters of the Stratos Helm chart
 |kube.registry.hostname|Hostname of registry to use when pulling images|docker.io|
 |kube.registry.username|Username to use when pulling images from the registry||
 |kube.registry.password|Password to use when pulling images from the registry||
+|console.podAnnotations|Annotations to be added to all pod resources||
+|console.podExtraLabels|Additional labels to be added to all pod resources||
+|console.statefulSetAnnotations|Annotations to be added to all statefulset resources||
+|console.statefulSetExtraLabels|Additional labels to be added to all statefulset resources||
+|console.deploymentAnnotations|Annotations to be added to all deployment resources||
+|console.deploymentExtraLabels|Additional labels to be added to all deployment resources||
+|console.jobAnnotations|Annotations to be added to all job resources||
+|console.jobExtraLabels|Additional labels to be added to all job resources||
+|console.service.annotations|Annotations to be added to all service resources||
+|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||
 
 ## Accessing the Console
 
@@ -129,6 +151,17 @@ $ helm upgrade my-console stratos/console --recreate-pods
 
 After the upgrade, perform a `helm list` to ensure your console is the latest version.
 
+## Uninstalling
+
+To uninstall Stratos, delete the Helm release and also delete the Kubernetes namespace:
+
+```
+helm delete --namespace=console --name my-console --purge
+kubectl delete namespace console
+```
+
+> Note: Stratos creates secrets in the namespace as part of an initialization job. These are not managed by Helm, so make sure you
+delete the namespace to remove these secrets. 
 
 # Advanced Topics
 
@@ -140,7 +173,7 @@ If your Kubernetes deployment supports automatic configuration of a load balance
 helm install stratos/console --namespace=console --name my-console --set console.service.type=LoadBalancer
 ```
 
-### Using an Ingress Controller
+## Using an Ingress Controller
 
 If your Kubernetes Cluster supports Ingress, you can expose Stratos through Ingress by supplying the appropriate ingress configuration when installing.
 
@@ -181,15 +214,15 @@ helm install stratos/console -f private_overrides.yaml --namespace=metrics
 
 ## Deploying with your own TLS certificates
 
-By default the console will generate self-signed certificates for demo purposes. To configure Stratos to use your provided TLS certificate, create a TLS secret in the namespace you are installing into and specify this secret name using the `` when installing.
+By default the console will generate self-signed certificates for demo purposes. To configure Stratos to use your provided TLS certificate, create a TLS secret in the namespace you are installing into and specify this secret name using the helm chart value `console.tlsSecretName` when installing.
 
 Assuming you have your certificate and key in the files `tls.crt` and `tls.key`, create the secret with:
 
 ```
-kubectl create secret tls -n NAMESPACE  stratos-tls-secret --cert=tls.crt --key=tls.key
+kubectl create secret tls -n NAMESPACE stratos-tls-secret --cert=tls.crt --key=tls.key
 ```
 
-> Where NAMESPACE is the namespace you are installing Stratos into - you will need to manually create the namespace first if it does not already exist.
+> Where `NAMESPACE` is the namespace you are installing Stratos into - you will need to manually create the namespace first if it does not already exist.
 
 You can now install Stratos with:
 
@@ -245,6 +278,27 @@ To deploy using the latest Helm chart directly from out GitHub repository
 $ helm install console --namespace console --name my-console --set console.localAdminPassword=<password>
 ```
 
+## Specifying Annotations and Labels
+
+In some scenarios it is useful to be able to add custom annotations and/or labels to the Kubernetes resources that the Stratos Helm chart creates.
+
+The Stratos Helm chart exposes a number of Helm chart values that cabe specified in order to do this - they are:
+
+|Parameter|Description|Default|
+|----|---|---|
+|console.podAnnotations|Annotations to be added to all pod resources||
+|console.podExtraLabels|Additional labels to be added to all pod resources||
+|console.statefulSetAnnotations|Annotations to be added to all statefulset resources|
+|console.statefulSetExtraLabels|Additional labels to be added to all statefulset resources||
+|console.deploymentAnnotations|Annotations to be added to all deployment resources||
+|console.deploymentExtraLabels|Additional labels to be added to all deployment resources||
+|console.jobAnnotations|Annotations to be added to all job resources||
+|console.jobExtraLabels|Additional labels to be added to all job resources||
+|console.service.annotations|Annotations to be added to all service resources||
+|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||
+
 ## Requirements
 
 ### Storage Class
@@ -299,7 +353,7 @@ helm install -f override.yaml stratos/console
 ```
 
 #### Create a default Storage Class
-Alternatively, you can configure a storage class with `storageclass.kubernetes.io/is-default-class` set to `true`. For instance the following storage class will be declared as the default. If you don't have the `hostpath` provisioner available in your local cluster, please follow the instructions on [link] (https://github.com/kubernetes-incubator/external-storage/tree/master/docs/demo/hostpath-provisioner), to deploy one.
+Alternatively, you can configure a storage class with `storageclass.kubernetes.io/is-default-class` set to `true`. For instance the following storage class will be declared as the default. If you don't have the `hostpath` provisioner available in your local cluster, please follow the instructions on [link](https://github.com/kubernetes-incubator/external-storage/tree/master/docs/demo/hostpath-provisioner), to deploy one.
 
 If the hostpath provisioner is available, save the file to `storageclass.yaml`
 
@@ -319,5 +373,5 @@ To create it in your kubernetes cluster, execute the following.
 kubectl create -f storageclass.yaml
 ```
 
-See [Storage Class documentation] ( https://kubernetes.io/docs/tasks/administer-cluster/change-default-storage-class/) for more insformation.
+See [Storage Class documentation](https://kubernetes.io/docs/tasks/administer-cluster/change-default-storage-class/) for more information.
 
diff --git a/deploy/kubernetes/console/templates/config-init.yaml b/deploy/kubernetes/console/templates/config-init.yaml
index c0f96fdf80..685a0ff493 100644
--- a/deploy/kubernetes/console/templates/config-init.yaml
+++ b/deploy/kubernetes/console/templates/config-init.yaml
@@ -62,6 +62,10 @@ roleRef:
 apiVersion: "batch/v1"
 kind: "Job"
 metadata:
+{{- if .Values.console.jobAnnotations }}
+  annotations:
+{{ toYaml .Values.console.jobAnnotations | indent 4 }}
+{{- end }}
   name: "stratos-config-init-{{ .Release.Revision }}"
   labels:
     app.kubernetes.io/component: "stratos-config-init-{{ .Release.Revision }}"
@@ -69,16 +73,27 @@ metadata:
     app.kubernetes.io/name: "stratos"
     app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
     helm.sh/chart:  "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+{{- if .Values.console.jobExtraLabels }}
+{{ toYaml .Values.console.jobExtraLabels | indent 4 }}
+{{- end }}
 spec:
   template:
     metadata:
       name: "stratos-config-init"
+     
+{{- if .Values.console.podAnnotations }}
+      annotations:
+{{ toYaml .Values.console.podAnnotations | indent 8 }}
+{{- end }}
       labels:
         app.kubernetes.io/component: "stratos-config-init"
         app.kubernetes.io/instance: "{{ .Release.Name }}"
         app.kubernetes.io/name: "stratos"
         app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
         helm.sh/chart:  "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+{{- if .Values.console.podExtraLabels}}
+{{ toYaml .Values.console.podExtraLabels | nindent 8 }}
+{{- end }}
     spec:
       containers:
       - env:
diff --git a/deploy/kubernetes/console/templates/database.yaml b/deploy/kubernetes/console/templates/database.yaml
index fe70469320..45af491bca 100644
--- a/deploy/kubernetes/console/templates/database.yaml
+++ b/deploy/kubernetes/console/templates/database.yaml
@@ -8,12 +8,19 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: stratos-db
+{{- if .Values.console.deploymentAnnotations }}
+  annotations:
+{{ toYaml .Values.console.deploymentAnnotations | indent 4 }}
+{{- end }}
   labels:
     app.kubernetes.io/name: "stratos"
     app.kubernetes.io/instance: "{{ .Release.Name }}"
     app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
     app.kubernetes.io/component: "stratos-db"
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+{{- if .Values.console.deploymentExtraLabels }}
+{{ toYaml .Values.console.deploymentExtraLabels | indent 4 }}
+{{- end }}
 spec:
   replicas: 1
   strategy:
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 16d09cf2da..ae8b3aaa34 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -20,8 +20,8 @@ metadata:
     app: "{{ .Release.Name }}"
     component: stratos
 {{- if .Values.console.statefulSetExtraLabels }}
-{{ toYaml .Values.console.statefulSetExtraLabels | nindent 4 }}
-{{- end}}        
+{{ toYaml .Values.console.statefulSetExtraLabels | indent 4 }}
+{{- end }}
 spec:
   serviceName: stratos
   replicas: 1
@@ -44,8 +44,8 @@ spec:
         app: "{{ .Release.Name }}"
         component: stratos
         {{- if .Values.console.podExtraLabels}}
-        {{ toYaml .Values.console.podExtraLabels | nindent 8 }}
-        {{- end}}        
+        {{ toYaml .Values.console.podExtraLabels | indent 8 }}
+        {{- end }}
     spec:
       containers:
       - image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.console}}:{{.Values.consoleVersion}}
diff --git a/deploy/kubernetes/console/templates/service.yaml b/deploy/kubernetes/console/templates/service.yaml
index 84f2ec0bad..417f36e629 100644
--- a/deploy/kubernetes/console/templates/service.yaml
+++ b/deploy/kubernetes/console/templates/service.yaml
@@ -13,6 +13,11 @@ metadata:
     app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
     app.kubernetes.io/component: "console-ext-service"
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+{{- if .Values.console.service -}}
+{{- if .Values.console.service.extraLabels }}
+{{ toYaml .Values.console.service.extraLabels | indent 4 }}
+{{- end }}
+{{- end }}
   name: "{{ .Release.Name }}-ui-ext"
 spec:
   selector:
@@ -79,12 +84,23 @@ apiVersion: v1
 kind: Service
 metadata:
   name: "{{ .Release.Name }}-mariadb"
+{{- if .Values.console.service -}}
+{{- if .Values.console.service.annotations }}
+  annotations:
+{{ toYaml .Values.console.service.annotations | indent 4 }}
+{{- end }}
+{{- end }}
   labels:
     app.kubernetes.io/name: "stratos"
     app.kubernetes.io/instance: "{{ .Release.Name }}"
     app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
     app.kubernetes.io/component: "stratos-db-service"
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+{{- if .Values.console.service -}}
+{{- if .Values.console.service.extraLabels }}
+{{ toYaml .Values.console.service.extraLabels | indent 4 }}
+{{- end }}
+{{- end }}
 spec:
   type: ClusterIP
   ports:
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index e219f123ee..2929520571 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -22,6 +22,7 @@ console:
   # Stratos Services
   service:
     annotations: []
+    extraLabels: []
     externalIPs: []
     loadBalancerIP:
     loadBalancerSourceRanges: []
@@ -34,10 +35,10 @@ console:
       enabled: false
 
       ## Additional annotations
-      annotations: {}
+      annotations: []
 
       ## Additional labels
-      extraLabels: {}
+      extraLabels: []
 
       ## Host for the ingress
       # Defaults to console.[env.Domain] if env.Domain is set and host is not
@@ -71,16 +72,32 @@ console:
   # Secret containing certificate for the Console
   tlsSecretName:
 
+  # URL of a Cloud Foundry to use for authentication and to auto-register on login
   autoRegisterCF: ~
 
+  # Custom annotations to apply to Stateful sets
   statefulSetAnnotations: ~
 
+  # Extra labels to apply to Stateful sets
   statefulSetExtraLabels: ~
 
+  # Custom annotations to apply to Deployments
+  deploymentAnnotations: ~
+
+  # Extra labels to apply to Deployments
+  deploymentExtraLabels: ~
+
+  # Custom annotations to apply to Jobs
+  jobAnnotations: ~
+
+  # Extra labels to apply to Jobs
+  jobExtraLabels: ~
+
+  # Custom annotations to apply to Pods
   podAnnotations: ~
 
+  # Extra labels to apply to Pods
   podExtraLabels: ~
-
   
 images:
   console: stratos-console

From c3e68ad18315c27a7ed8118131eaa10b23d72c4e Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 18 Feb 2020 10:16:57 +0000
Subject: [PATCH 388/648] Remove unused files

---
 deploy/cap/bower.json       | 34 ----------------------------------
 deploy/db/scripts/README.md |  3 ---
 2 files changed, 37 deletions(-)
 delete mode 100644 deploy/cap/bower.json
 delete mode 100644 deploy/db/scripts/README.md

diff --git a/deploy/cap/bower.json b/deploy/cap/bower.json
deleted file mode 100644
index 925037f0ff..0000000000
--- a/deploy/cap/bower.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "name": "console-app",
-  "description": "",
-  "license": "Apache-2.0",
-  "moduleType": [],
-  "homepage": "",
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests"
-  ],
-  "dependencies": {
-    "app-theme": "./components/app-theme",
-    "app-framework": "./components/app-framework",
-    "app-core": "./components/app-core",
-    "suse-branding": "./components/suse-branding",
-    "about-app": "./components/about-app",
-    "endpoints-dashboard": "./components/endpoints-dashboard",
-    "cloud-foundry": "./components/cloud-foundry",
-    "cf-app-push": "./components/cf-app-push",
-    "cf-app-ssh": "./components/cf-app-ssh",
-    "app-setup": "./components/app-setup",
-    "user-info": "./components/user-info"
-  },
-  "devDependencies": {
-    "angular-mocks": "~1.6.6"
-  },
-  "config": {
-    "main": "cloud-foundry"
-  },
-  "stratosLocales": ["en_US", "en_GB"]
-}
diff --git a/deploy/db/scripts/README.md b/deploy/db/scripts/README.md
deleted file mode 100644
index 7050fecf94..0000000000
--- a/deploy/db/scripts/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Deprecated
-
-This folder can be removed
\ No newline at end of file

From 2ae7b2080b84586e91d82fb307c7a294592c77e3 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Tue, 18 Feb 2020 10:17:39 +0000
Subject: [PATCH 389/648] Removew whitespace

---
 deploy/kubernetes/console/tests/user_test.yaml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/deploy/kubernetes/console/tests/user_test.yaml b/deploy/kubernetes/console/tests/user_test.yaml
index 09adfdb541..a03a8e0198 100644
--- a/deploy/kubernetes/console/tests/user_test.yaml
+++ b/deploy/kubernetes/console/tests/user_test.yaml
@@ -81,10 +81,3 @@ tests:
           value: VEVTVF9QQVNTV09SRA==
         template: secrets.yaml
         documentIndex: 0
-
-
-
-
-
-
-

From 92bdd086f8ce3836e540471c0717684db6a56d46 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 18 Feb 2020 10:44:56 +0000
Subject: [PATCH 390/648] CI pipeline updates for V3

---
 deploy/ci/console-dev-releases.yml               | 14 +++++++-------
 deploy/ci/console-nightly-releases.yml           | 16 ++++++++--------
 .../ci/tasks/dev-releases/nightly-release-name   |  2 +-
 deploy/ci/tasks/dev-releases/nightly-tag         |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/deploy/ci/console-dev-releases.yml b/deploy/ci/console-dev-releases.yml
index 707ffd6e0b..a0e7d6c7a6 100644
--- a/deploy/ci/console-dev-releases.yml
+++ b/deploy/ci/console-dev-releases.yml
@@ -122,18 +122,18 @@ jobs:
           build_args_file: image-tag/build-args
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))
-      - put: config-init-image
+      - put: mariadb-image
         params:
-          dockerfile: stratos/deploy/Dockerfile.init
-          build: stratos/
-          target_name:  postflight-job
+          dockerfile: stratos/deploy/db/Dockerfile.mariadb
+          build: stratos/deploy/db
           tag: image-tag/v2-alpha-tag
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))
-      - put: mariadb-image
+    - do:
+      - put: config-init-image
         params:
-          dockerfile: stratos/deploy/db/Dockerfile.mariadb
-          build: stratos/deploy/db
+          dockerfile: stratos/deploy/Dockerfile.init
+          build: stratos/
           tag: image-tag/v2-alpha-tag
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))
diff --git a/deploy/ci/console-nightly-releases.yml b/deploy/ci/console-nightly-releases.yml
index 7bceb86513..813cd9c115 100644
--- a/deploy/ci/console-nightly-releases.yml
+++ b/deploy/ci/console-nightly-releases.yml
@@ -34,12 +34,12 @@ resources:
     username: ((docker-username))
     password: ((docker-password))
     repository: ((docker-organization))/stratos-jetstream
-- name: postflight-image
+- name: config-init-image
   type: docker-image
   source:
     username: ((docker-username))
     password: ((docker-password))
-    repository: ((docker-organization))/stratos-postflight-job
+    repository: ((docker-organization))/stratos-config-init
 - name: mariadb-image
   type: docker-image
   source:
@@ -109,17 +109,17 @@ jobs:
           target_name:  prod-build
           tag: stratos/deploy/ci/tasks/dev-releases/nightly-tag
           build_args_file: image-tag/build-args
-      - put: postflight-image
-        params:
-          dockerfile: stratos/deploy/Dockerfile.bk
-          build: stratos/
-          target_name:  postflight-job
-          tag: stratos/deploy/ci/tasks/dev-releases/nightly-tag
       - put: mariadb-image
         params:
           dockerfile: stratos/deploy/db/Dockerfile.mariadb
           build: stratos/deploy/db
           tag: stratos/deploy/ci/tasks/dev-releases/nightly-tag
+    -do:
+      - put: config-init-image
+        params:
+          dockerfile: stratos/deploy/Dockerfile.init
+          build: stratos/
+          tag: stratos/deploy/ci/tasks/dev-releases/nightly-tag
       - put: ui-image
         params:
           dockerfile: stratos/deploy/Dockerfile.ui
diff --git a/deploy/ci/tasks/dev-releases/nightly-release-name b/deploy/ci/tasks/dev-releases/nightly-release-name
index a694894be3..587acf4004 100644
--- a/deploy/ci/tasks/dev-releases/nightly-release-name
+++ b/deploy/ci/tasks/dev-releases/nightly-release-name
@@ -1 +1 @@
-Stratos 2.0.0 Nightly Dev Release
\ No newline at end of file
+Stratos 3.0.0 Nightly Dev Release
\ No newline at end of file
diff --git a/deploy/ci/tasks/dev-releases/nightly-tag b/deploy/ci/tasks/dev-releases/nightly-tag
index fb0ed550ba..d24daa235f 100644
--- a/deploy/ci/tasks/dev-releases/nightly-tag
+++ b/deploy/ci/tasks/dev-releases/nightly-tag
@@ -1 +1 @@
-2.0.0-dev
\ No newline at end of file
+3.0.0-nightly
\ No newline at end of file

From b26a98ffd455ae79455c244f7e86581c8e687b92 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Tue, 18 Feb 2020 11:17:06 +0000
Subject: [PATCH 391/648] Minor parse error fix

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 deploy/kubernetes/console/templates/chartrepo.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/deploy/kubernetes/console/templates/chartrepo.yaml b/deploy/kubernetes/console/templates/chartrepo.yaml
index 7cd388242c..ac586b2abe 100644
--- a/deploy/kubernetes/console/templates/chartrepo.yaml
+++ b/deploy/kubernetes/console/templates/chartrepo.yaml
@@ -1,5 +1,4 @@
 ---
-.Values.
 {{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major .Capabilities.KubeVersion.Minor)}}
 apiVersion: apps/v1
 {{- else }}

From 397122afce52ca1b3fa9c62504579dbe25678ef0 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Tue, 18 Feb 2020 11:20:38 +0000
Subject: [PATCH 392/648] Tweak to allow build on Linux

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 deploy/kubernetes/build.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
index 60e81acd87..608a668421 100755
--- a/deploy/kubernetes/build.sh
+++ b/deploy/kubernetes/build.sh
@@ -191,14 +191,14 @@ if [ "${CHART_ONLY}" == "false" ]; then
   # Build all of the components that make up the Console
 
   log "-- Build & publish the runtime container image for Jetstream (backend)"
-  patchAndPushImage stratos-jetstream deploy/Dockerfile.bk "${STRATOS_PATH}" prod-build
+  #patchAndPushImage stratos-jetstream deploy/Dockerfile.bk "${STRATOS_PATH}" prod-build
 
   log "-- Build & publish the runtime container image for Install Config Job"
-  patchAndPushImage stratos-config-init deploy/Dockerfile.init "${STRATOS_PATH}"
+  #patchAndPushImage stratos-config-init deploy/Dockerfile.init "${STRATOS_PATH}"
 
   # Build and push an image based on the mariab db container
   log "-- Building/publishing MariaDB"
-  patchAndPushImage stratos-mariadb Dockerfile.mariadb "${STRATOS_PATH}/deploy/db"
+  #patchAndPushImage stratos-mariadb Dockerfile.mariadb "${STRATOS_PATH}/deploy/db"
 
   # Build and push an image based on the nginx container (Front-end)
   log "-- Building/publishing the runtime container image for the Console web server (frontend)"

From 6191e05980965df2c077cf32f03af61dd4deb75d Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 18 Feb 2020 11:29:44 +0000
Subject: [PATCH 393/648] Fixes and extra helm chart unit tests

---
 .../console/templates/config-init.yaml        |   1 -
 .../console/templates/deployment.yaml         |   6 +-
 .../tests/custom_annotations_test.yaml        | 193 ++++++++++++++++++
 .../console/tests/service_test.yaml           |  23 +--
 deploy/kubernetes/console/values.yaml         |  24 +--
 5 files changed, 218 insertions(+), 29 deletions(-)
 create mode 100644 deploy/kubernetes/console/tests/custom_annotations_test.yaml

diff --git a/deploy/kubernetes/console/templates/config-init.yaml b/deploy/kubernetes/console/templates/config-init.yaml
index 685a0ff493..6313d3ab8c 100644
--- a/deploy/kubernetes/console/templates/config-init.yaml
+++ b/deploy/kubernetes/console/templates/config-init.yaml
@@ -80,7 +80,6 @@ spec:
   template:
     metadata:
       name: "stratos-config-init"
-     
 {{- if .Values.console.podAnnotations }}
       annotations:
 {{ toYaml .Values.console.podAnnotations | indent 8 }}
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index ae8b3aaa34..ef149430c8 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -43,9 +43,9 @@ spec:
         helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
         app: "{{ .Release.Name }}"
         component: stratos
-        {{- if .Values.console.podExtraLabels}}
-        {{ toYaml .Values.console.podExtraLabels | indent 8 }}
-        {{- end }}
+{{- if .Values.console.podExtraLabels}}
+{{ toYaml .Values.console.podExtraLabels | indent 8 }}
+{{- end }}
     spec:
       containers:
       - image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.console}}:{{.Values.consoleVersion}}
diff --git a/deploy/kubernetes/console/tests/custom_annotations_test.yaml b/deploy/kubernetes/console/tests/custom_annotations_test.yaml
new file mode 100644
index 0000000000..39a06a3787
--- /dev/null
+++ b/deploy/kubernetes/console/tests/custom_annotations_test.yaml
@@ -0,0 +1,193 @@
+suite: test custom annotations
+templates:
+  - deployment.yaml
+  - database.yaml
+  - config-init.yaml
+tests:
+
+# Deployment
+
+  - it: deployment should not have annotaions unless configured
+    asserts:
+      - isNull:
+          path: metadata.annotations
+        template: database.yaml
+  - it: deployment should support custom annotations
+    set:
+      console.deploymentAnnotations:
+        test-annotation: 172623
+        test-annotation2: r23453463456
+    asserts:
+      - equal:
+          path: metadata.annotations
+          value:
+            test-annotation: 172623
+            test-annotation2: r23453463456
+        template: database.yaml
+  - it: deployment should support custom labels
+    set:
+      console.deploymentExtraLabels:
+        test-label: 172623
+        test-label2: r23453463456
+    asserts:
+      - equal:
+          path: metadata.labels
+          value:
+            app.kubernetes.io/component: stratos-db
+            app.kubernetes.io/instance: RELEASE-NAME
+            app.kubernetes.io/name: stratos
+            app.kubernetes.io/version: 0.1.0
+            helm.sh/chart: console-0.1.0
+            test-label: 172623
+            test-label2: r23453463456
+        template: database.yaml
+  - it: deployment should support custom labels and annotations on its pods
+    set:
+      console.podExtraLabels:
+        test-label: 172623
+        test-label2: r23453463456
+      console.podAnnotations:
+        test-annotation: 172623
+        test-annotation2: r23453463456
+    asserts:
+      - equal:
+          path: spec.template.metadata.labels.test-label
+          value: 172623
+        template: database.yaml
+      - equal:
+          path: spec.template.metadata.labels.test-label2
+          value: r23453463456
+        template: database.yaml
+      - equal:
+          path: spec.template.metadata.annotations.test-annotation
+          value: 172623
+        template: database.yaml
+      - equal:
+          path: spec.template.metadata.annotations.test-annotation2
+          value: r23453463456
+        template: database.yaml
+                                                                
+# Stateful set
+
+  - it: statefulset should not have annotaions unless configured
+    asserts:
+      - isNull:
+          path: metadata.annotations
+        template: deployment.yaml
+  - it: statefulset should support custom annotations
+    set:
+      console.statefulSetAnnotations:
+        test-annotation: 172623
+        test-annotation2: r23453463456
+    asserts:
+      - equal:
+          path: metadata.annotations
+          value:
+            test-annotation: 172623
+            test-annotation2: r23453463456
+        template: deployment.yaml
+  - it: statefulset should support custom labels
+    set:
+      console.statefulSetExtraLabels:
+        test-label: 172623
+        test-label2: r23453463456
+    asserts:
+      - equal:
+          path: metadata.labels.test-label
+          value: 172623
+      - equal:
+          path: metadata.labels.test-label2
+          value: r23453463456
+        template: deployment.yaml
+  - it: statefulset should support custom labels and annotations on its pods
+    set:
+      console.podExtraLabels:
+        test-label: 172623
+        test-label2: r23453463456
+      console.podAnnotations:
+        test-annotation: 172623
+        test-annotation2: r23453463456
+    asserts:
+      - equal:
+          path: spec.template.metadata.labels.test-label
+          value: 172623
+        template: deployment.yaml
+      - equal:
+          path: spec.template.metadata.labels.test-label2
+          value: r23453463456
+        template: deployment.yaml
+      - equal:
+          path: spec.template.metadata.annotations.test-annotation
+          value: 172623
+        template: deployment.yaml
+      - equal:
+          path: spec.template.metadata.annotations.test-annotation2
+          value: r23453463456
+        template: deployment.yaml
+
+# Batch/Job
+
+  - it: batch/job should not have annotaions unless configured
+    asserts:
+      - isNull:
+          path: metadata.annotations
+        template: config-init.yaml
+        documentIndex: 3
+  - it: batch/job should support custom annotations
+    set:
+      console.jobAnnotations:
+        test-annotation: 172623
+        test-annotation2: r23453463456
+    asserts:
+      - equal:
+          path: metadata.annotations
+          value:
+            test-annotation: 172623
+            test-annotation2: r23453463456
+        template: config-init.yaml
+        documentIndex: 3
+  - it: batch/job should support custom labels
+    set:
+      console.jobExtraLabels:
+        test-label: 172623
+        test-label2: r23453463456
+    asserts:
+      - equal:
+          path: metadata.labels.test-label
+          value: 172623
+        template: config-init.yaml
+        documentIndex: 3
+      - equal:
+          path: metadata.labels.test-label2
+          value: r23453463456
+        template: config-init.yaml
+        documentIndex: 3
+  - it: batch/job should support custom labels and annotations on its pods
+    set:
+      console.podExtraLabels:
+        test-label: 172623
+        test-label2: r23453463456
+      console.podAnnotations:
+        test-annotation: 172623
+        test-annotation2: r23453463456
+    asserts:
+      - equal:
+          path: spec.template.metadata.labels.test-label
+          value: 172623
+        template: config-init.yaml
+        documentIndex: 3
+      - equal:
+          path: spec.template.metadata.labels.test-label2
+          value: r23453463456
+        template: config-init.yaml
+        documentIndex: 3
+      - equal:
+          path: spec.template.metadata.annotations.test-annotation
+          value: 172623
+        template: config-init.yaml
+        documentIndex: 3
+      - equal:
+          path: spec.template.metadata.annotations.test-annotation2
+          value: r23453463456
+        template: config-init.yaml
+        documentIndex: 3
diff --git a/deploy/kubernetes/console/tests/service_test.yaml b/deploy/kubernetes/console/tests/service_test.yaml
index ee2f3261f5..f478ba3a6f 100644
--- a/deploy/kubernetes/console/tests/service_test.yaml
+++ b/deploy/kubernetes/console/tests/service_test.yaml
@@ -221,26 +221,23 @@ tests:
   - it: should allow annotations
     set:
       console.service.annotations:
-      - service.beta.kubernetes.io/aws-load-balancer-type: "nlb"
+       service.beta.kubernetes.io/aws-load-balancer-type: "nlb"
     asserts:
-      - contains:
+      - equal:
           path: metadata.annotations
-          content:
-           service.beta.kubernetes.io/aws-load-balancer-type: "nlb"
+          value:
+            service.beta.kubernetes.io/aws-load-balancer-type: "nlb"
   - it: should allow annotations (multiple)
     set:
       console.service.annotations:
-      - service.beta.kubernetes.io/aws-load-balancer-type: "nlb"
-      - service.beta.kubernetes.io/aws-load-balancer-connection-draining-timeout: "60"
+        service.beta.kubernetes.io/aws-load-balancer-type: "nlb"
+        service.beta.kubernetes.io/aws-load-balancer-connection-draining-timeout: "60"
     asserts:
-      - contains:
-          path: metadata.annotations
-          content:
-           service.beta.kubernetes.io/aws-load-balancer-type: "nlb"
-      - contains:
+      - equal:
           path: metadata.annotations
-          content:
-           service.beta.kubernetes.io/aws-load-balancer-connection-draining-timeout: "60"
+          value:
+            service.beta.kubernetes.io/aws-load-balancer-type: "nlb"
+            service.beta.kubernetes.io/aws-load-balancer-connection-draining-timeout: "60"
   - it: should support legacy service port configuration
     set:
       kube.external_ips: [ 1.2.3.4, 5.6.7.8 ]
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index 2929520571..6f3ea04444 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -21,8 +21,8 @@ console:
   sessionStoreSecret:
   # Stratos Services
   service:
-    annotations: []
-    extraLabels: []
+    annotations: {}
+    extraLabels: {}
     externalIPs: []
     loadBalancerIP:
     loadBalancerSourceRanges: []
@@ -35,10 +35,10 @@ console:
       enabled: false
 
       ## Additional annotations
-      annotations: []
+      annotations: {}
 
       ## Additional labels
-      extraLabels: []
+      extraLabels: {}
 
       ## Host for the ingress
       # Defaults to console.[env.Domain] if env.Domain is set and host is not
@@ -76,28 +76,28 @@ console:
   autoRegisterCF: ~
 
   # Custom annotations to apply to Stateful sets
-  statefulSetAnnotations: ~
+  statefulSetAnnotations: {}
 
   # Extra labels to apply to Stateful sets
-  statefulSetExtraLabels: ~
+  statefulSetExtraLabels: {}
 
   # Custom annotations to apply to Deployments
-  deploymentAnnotations: ~
+  deploymentAnnotations: {}
 
   # Extra labels to apply to Deployments
-  deploymentExtraLabels: ~
+  deploymentExtraLabels: {}
 
   # Custom annotations to apply to Jobs
-  jobAnnotations: ~
+  jobAnnotations: {}
 
   # Extra labels to apply to Jobs
-  jobExtraLabels: ~
+  jobExtraLabels: {}
 
   # Custom annotations to apply to Pods
-  podAnnotations: ~
+  podAnnotations: {}
 
   # Extra labels to apply to Pods
-  podExtraLabels: ~
+  podExtraLabels: {}
   
 images:
   console: stratos-console

From 42bed156082fa85d5558f97230e44f60d609ab8a Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 18 Feb 2020 12:38:18 +0000
Subject: [PATCH 394/648] Remove .orig files when building Helm chart

---
 deploy/kubernetes/build.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
index 3d00d416dc..674215c15b 100755
--- a/deploy/kubernetes/build.sh
+++ b/deploy/kubernetes/build.sh
@@ -218,6 +218,9 @@ cp -R ${SRC_HELM_CHART_PATH}/ ${DEST_HELM_CHART_PATH}/
 
 pushd ${DEST_HELM_CHART_PATH} > /dev/null
 
+# Remove any .orig files
+rm -rf ${DEST_HELM_CHART_PATH}/**/*.orig
+
 # Run customization script if there is one
 if [ -f "${STRATOS_PATH}/custom-src/deploy/kubernetes/customize-helm.sh" ]; then
   printf "${YELLOW}${BOLD}Applying Helm Chart customizations${RESET}\n"

From 66a7d5e5280252a7728a2028baa915ad495fc073 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Tue, 18 Feb 2020 13:17:08 +0000
Subject: [PATCH 395/648] Replace hard coded image references for fdbserver and
 fdbdoclayer

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 deploy/kubernetes/build.sh                             |  2 +-
 .../templates/fdb-doc-layer-deployment.yaml            |  2 +-
 .../fdbdoclayer/templates/fdbserver-deployment.yaml    |  2 +-
 deploy/kubernetes/console/values.yaml                  | 10 ++--------
 src/jetstream/plugins/monocular/sync.go                |  1 -
 5 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
index 2800cb8370..f1a4d4f39d 100755
--- a/deploy/kubernetes/build.sh
+++ b/deploy/kubernetes/build.sh
@@ -207,7 +207,7 @@ if [ "${CHART_ONLY}" == "false" ]; then
 
   # Build and push an image based on the nginx container (Front-end)
   log "-- Building/publishing the runtime container image for the Console web server (frontend)"
-  patchAndPushImage stratos-console deploy/Dockerfile.ui "${STRATOS_PATH}" prod-build
+  #patchAndPushImage stratos-console deploy/Dockerfile.ui "${STRATOS_PATH}" prod-build
 
   # Build any custom images added by a fork
   if [ "${HAS_CUSTOM_BUILD}" == "true" ]; then
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
index 68d4e7e46c..81c2947160 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
@@ -30,7 +30,7 @@ spec:
 {{- end }}
       containers:
       - name: fdbdoclayer
-        image: {{ template "fdb.image" .Values.fdbdoclayer.image }}
+        image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.fdbdoclayer}}:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         env:
         - name: FDB_COORDINATOR
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
index 834c4198c1..a302ce8911 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
@@ -30,7 +30,7 @@ spec:
 {{- end }}
       containers:
       - name: fdbserver
-        image: {{ template "fdb.image" .Values.fdbserver.image }}
+        image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.fdbserver}}:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         env:
         - name: FDB_COORDINATOR
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index 42e01cd046..b0444c123b 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -87,6 +87,8 @@ images:
   proxy: stratos-jetstream
   mariadb: stratos-mariadb
   configInit: stratos-config-init
+  fdbserver: stratos-fdbserver
+  fdbdoclayer: stratos-fdbdoclayer
 
 # Specify which storage class should be used for PVCs
 #storageClass: default
@@ -131,10 +133,6 @@ uaa:
 
 fdbserver:
   replicas: 1
-  image:
-    registry: docker.io
-    repository: kreinecke/foundationdb
-    tag: 6.0.18-k8s
   service:
     name: fdbserver
     port: 4500
@@ -143,10 +141,6 @@ fdbserver:
 
 fdbdoclayer:
   replicas: 1
-  image:
-    registry: docker.io
-    repository: kreinecke/fdb-document-layer-k8s-tls
-    tag: latest
   service:
     name: fdbdoclayer
     port: 27016
diff --git a/src/jetstream/plugins/monocular/sync.go b/src/jetstream/plugins/monocular/sync.go
index eb004523df..64ab8182e2 100644
--- a/src/jetstream/plugins/monocular/sync.go
+++ b/src/jetstream/plugins/monocular/sync.go
@@ -72,7 +72,6 @@ func (m *Monocular) processSyncRequests() {
 				log.Warn("Request to sync repository failed: %v", err)
 				metadata.Status = "Sync Failed"
 			} else {
-				//TODO kate extract status from response
 				statusResponse := common.SyncJobStatusResponse{}
 				defer response.Body.Close()
 				err := json.NewDecoder(response.Body).Decode(&statusResponse)

From 3a375c65db5ba345844a460b8c3a461c2519c608 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Tue, 18 Feb 2020 13:21:03 +0000
Subject: [PATCH 396/648] Tweak build.sh for Linux compatibility

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 deploy/kubernetes/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
index f1a4d4f39d..216cd1302d 100755
--- a/deploy/kubernetes/build.sh
+++ b/deploy/kubernetes/build.sh
@@ -224,7 +224,7 @@ DEST_HELM_CHART_PATH="${STRATOS_PATH}/deploy/kubernetes/helm-chart"
 
 rm -rf ${DEST_HELM_CHART_PATH}
 mkdir -p ${DEST_HELM_CHART_PATH}
-cp -RT ${SRC_HELM_CHART_PATH}/ ${DEST_HELM_CHART_PATH}/
+cp -R ${SRC_HELM_CHART_PATH}/. ${DEST_HELM_CHART_PATH}/
 
 pushd ${DEST_HELM_CHART_PATH} > /dev/null
 

From 315550b0e0da167b3999eb7798216c1cccf66db0 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Tue, 18 Feb 2020 15:08:41 +0000
Subject: [PATCH 397/648] Remove comments on build script

---
 deploy/kubernetes/build.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
index 216cd1302d..5e93b66ee4 100755
--- a/deploy/kubernetes/build.sh
+++ b/deploy/kubernetes/build.sh
@@ -196,18 +196,18 @@ if [ "${CHART_ONLY}" == "false" ]; then
   # Build all of the components that make up the Console
 
   log "-- Build & publish the runtime container image for Jetstream (backend)"
-  #patchAndPushImage stratos-jetstream deploy/Dockerfile.bk "${STRATOS_PATH}" prod-build
+  patchAndPushImage stratos-jetstream deploy/Dockerfile.bk "${STRATOS_PATH}" prod-build
 
   log "-- Build & publish the runtime container image for Install Config Job"
-  #patchAndPushImage stratos-config-init deploy/Dockerfile.init "${STRATOS_PATH}"
+  patchAndPushImage stratos-config-init deploy/Dockerfile.init "${STRATOS_PATH}"
 
   # Build and push an image based on the mariab db container
   log "-- Building/publishing MariaDB"
-  #patchAndPushImage stratos-mariadb Dockerfile.mariadb "${STRATOS_PATH}/deploy/db"
+  patchAndPushImage stratos-mariadb Dockerfile.mariadb "${STRATOS_PATH}/deploy/db"
 
   # Build and push an image based on the nginx container (Front-end)
   log "-- Building/publishing the runtime container image for the Console web server (frontend)"
-  #patchAndPushImage stratos-console deploy/Dockerfile.ui "${STRATOS_PATH}" prod-build
+  patchAndPushImage stratos-console deploy/Dockerfile.ui "${STRATOS_PATH}" prod-build
 
   # Build any custom images added by a fork
   if [ "${HAS_CUSTOM_BUILD}" == "true" ]; then

From 0f6d97b8edcca4fa39cd8c14ff23f307f5a516f7 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Tue, 18 Feb 2020 15:10:19 +0000
Subject: [PATCH 398/648] Fix comment

---
 src/jetstream/plugins/monocular/main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index 3de05b728b..8b1425e560 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -68,7 +68,7 @@ func (m *Monocular) Init() error {
 
 func (m *Monocular) configure() error {
 
-	// Env var lookup when not running in Kubernetes
+	// Env var lookup for Monocular services
 	m.FoundationDBURL = m.portalProxy.Env().String(foundationDBURLEnvVar, "")
 	m.SyncServiceURL = m.portalProxy.Env().String(syncServerURLEnvVar, "")
 

From d41db8516331491d7c7111dd7e72a00034721f86 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 18 Feb 2020 15:04:57 +0000
Subject: [PATCH 399/648] Update SLE image builds for 15 SP1

---
 .../Dockerfile.stratos-bk-base.tmpl           | 20 +++++++--------
 .../Dockerfile.stratos-bk-init-base.tmpl      | 25 +++++++++++++++++++
 .../Dockerfile.stratos-go-build-base.tmpl     | 16 ++++++------
 .../Dockerfile.stratos-mariadb-base.tmpl      | 16 ++++++------
 .../Dockerfile.stratos-nginx-base.tmpl        | 18 ++++++-------
 .../Dockerfile.stratos-ruby-build-base.tmpl   | 16 ++++++------
 .../Dockerfile.stratos-ui-build-base.tmpl     | 16 ++++++------
 .../stratos-base-images/build-base-images.sh  |  8 +++---
 8 files changed, 79 insertions(+), 56 deletions(-)
 create mode 100644 deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl

diff --git a/deploy/stratos-base-images/Dockerfile.stratos-bk-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-bk-base.tmpl
index 8416e9ea83..e09e566113 100644
--- a/deploy/stratos-base-images/Dockerfile.stratos-bk-base.tmpl
+++ b/deploy/stratos-base-images/Dockerfile.stratos-bk-base.tmpl
@@ -2,10 +2,10 @@ FROM {{BASE_IMAGE}}
 
 {{#IS_SLE}}
 RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp
-RUN zypper addrepo  -G -c '{{SMT_INTERNAL}}' smt_internal
-RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_UPDATE}}' smt_internal_update
-RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SDK}}' smt_internal_sdk
-RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SERVER}}' smt_internal_server
+RUN zypper addrepo -G -c -p 90 '{{ZYP_REPO_BASE_GA}}' base_ga
+RUN zypper addrepo -G -c -p 80 '{{ZYP_REPO_BASE_UPDATE}}' base_update
+RUN zypper addrepo -G -c -p 70 '{{ZYP_REPO_SP_GA}}' sp_ga
+RUN zypper addrepo -G -c -p 60 '{{ZYP_REPO_SP_UPDATE}}' sp_update
 RUN zypper ref
 {{/IS_SLE}}
 RUN zypper in -y ca-certificates && \
@@ -15,12 +15,11 @@ RUN zypper in -y ca-certificates && \
     mkdir -p /root/.npm-global
 # Install latest git from devel/tools/scm repository
 {{^IS_SLE}}
-RUN zypper ar http://download.opensuse.org/repositories/devel:/tools:/scm/openSUSE_Leap_15.1/devel:tools:scm.repo && \
+RUN zypper ar -p 50 http://download.opensuse.org/repositories/devel:/tools:/scm/openSUSE_Leap_15.1/devel:tools:scm.repo && \
     zypper --no-gpg-checks in -y git && \
     zypper rr devel_tools_scm && \
     zypper clean -a && \
     rm -f /var/log/zypper.log /var/log/zypp/history
-
 {{/IS_SLE}}
 {{#IS_SLE}}
 RUN zypper ar http://download.opensuse.org/repositories/devel:/tools:/scm/SLE_15/devel:tools:scm.repo && \
@@ -28,13 +27,12 @@ RUN zypper ar http://download.opensuse.org/repositories/devel:/tools:/scm/SLE_15
     zypper rr devel_tools_scm && \
     zypper clean -a && \
     rm -f /var/log/zypper.log /var/log/zypp/history
-
 {{/IS_SLE}}
 
 {{#IS_SLE}}
-RUN zypper rr smt_internal
-RUN zypper rr smt_internal_update
-RUN zypper rr smt_internal_sdk
-RUN zypper rr smt_internal_server
+RUN zypper rr base_ga
+RUN zypper rr base_update
+RUN zypper rr sp_ga
+RUN zypper rr sp_update
 {{/IS_SLE}}
 WORKDIR /srv
diff --git a/deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl
new file mode 100644
index 0000000000..a6c7fedeb7
--- /dev/null
+++ b/deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl
@@ -0,0 +1,25 @@
+FROM {{BASE_IMAGE}}
+
+{{#IS_SLE}}
+RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp
+RUN zypper addrepo -G -c -p 90 '{{ZYP_REPO_BASE_GA}}' base_ga
+RUN zypper addrepo -G -c -p 80 '{{ZYP_REPO_BASE_UPDATE}}' base_update
+RUN zypper addrepo -G -c -p 70 '{{ZYP_REPO_SP_GA}}' sp_ga
+RUN zypper addrepo -G -c -p 60 '{{ZYP_REPO_SP_UPDATE}}' sp_updateRUN zypper ref
+{{/IS_SLE}}
+RUN zypper in -y ca-certificates && \
+    zypper in -y curl && \
+    zypper in -y openssh && \
+    zypper in -y jq && \
+    zypper in -y bind-utils && \
+    zypper in -y hostname && \
+    mkdir -p /srv && \
+    mkdir -p /root/.npm-global
+
+{{#IS_SLE}}
+RUN zypper rr base_ga
+RUN zypper rr base_update
+RUN zypper rr sp_ga
+RUN zypper rr sp_update
+{{/IS_SLE}}
+WORKDIR /srv
diff --git a/deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl
index 871c53c857..a510907974 100644
--- a/deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl
+++ b/deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl
@@ -2,10 +2,10 @@ FROM {{BASE_IMAGE}}
 
 {{#IS_SLE}}
 RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp
-RUN zypper addrepo  -G -c '{{SMT_INTERNAL}}' smt_internal
-RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_UPDATE}}' smt_internal_update
-RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SDK}}' smt_internal_sdk
-RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SERVER}}' smt_internal_server
+RUN zypper addrepo -G -c -p 90 '{{ZYP_REPO_BASE_GA}}' base_ga
+RUN zypper addrepo -G -c -p 80 '{{ZYP_REPO_BASE_UPDATE}}' base_update
+RUN zypper addrepo -G -c -p 70 '{{ZYP_REPO_SP_GA}}' sp_ga
+RUN zypper addrepo -G -c -p 60 '{{ZYP_REPO_SP_UPDATE}}' sp_update
 RUN zypper ref
 {{/IS_SLE}}
 
@@ -33,10 +33,10 @@ RUN curl https://glide.sh/get | sh
 RUN curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
 
 {{#IS_SLE}}
-RUN zypper rr  smt_internal
-RUN zypper rr  smt_internal_update
-RUN zypper rr  smt_internal_sdk
-RUN zypper rr  smt_internal_server
+RUN zypper rr base_ga
+RUN zypper rr base_update
+RUN zypper rr sp_ga
+RUN zypper rr sp_update
 {{/IS_SLE}}
 
 WORKDIR /home/stratos/go
diff --git a/deploy/stratos-base-images/Dockerfile.stratos-mariadb-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-mariadb-base.tmpl
index 7c4cce74ff..b5931c3e7a 100644
--- a/deploy/stratos-base-images/Dockerfile.stratos-mariadb-base.tmpl
+++ b/deploy/stratos-base-images/Dockerfile.stratos-mariadb-base.tmpl
@@ -2,10 +2,10 @@ FROM {{BASE_IMAGE}}
 
 {{#IS_SLE}}
 RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp
-RUN zypper addrepo  -G -c '{{SMT_INTERNAL}}' smt_internal
-RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_UPDATE}}' smt_internal_update
-RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SDK}}' smt_internal_sdk
-RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SERVER}}' smt_internal_server
+RUN zypper addrepo -G -c -p 90 '{{ZYP_REPO_BASE_GA}}' base_ga
+RUN zypper addrepo -G -c -p 80 '{{ZYP_REPO_BASE_UPDATE}}' base_update
+RUN zypper addrepo -G -c -p 70 '{{ZYP_REPO_SP_GA}}' sp_ga
+RUN zypper addrepo -G -c -p 60 '{{ZYP_REPO_SP_UPDATE}}' sp_update
 RUN zypper ref
 {{/IS_SLE}}
 
@@ -29,10 +29,10 @@ RUN rm -rf /var/lib/mysql \
   && chown -R mysql:mysql /var/log/mysql
 
 {{#IS_SLE}}
-RUN zypper rr smt_internal
-RUN zypper rr smt_internal_update
-RUN zypper rr smt_internal_sdk
-RUN zypper rr smt_internal_server
+RUN zypper rr base_ga
+RUN zypper rr base_update
+RUN zypper rr sp_ga
+RUN zypper rr sp_update
 {{/IS_SLE}}
 
 VOLUME ["/var/lib/mysql"]
\ No newline at end of file
diff --git a/deploy/stratos-base-images/Dockerfile.stratos-nginx-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-nginx-base.tmpl
index d42d542d5b..af69700a28 100644
--- a/deploy/stratos-base-images/Dockerfile.stratos-nginx-base.tmpl
+++ b/deploy/stratos-base-images/Dockerfile.stratos-nginx-base.tmpl
@@ -1,11 +1,11 @@
 FROM {{BASE_IMAGE}}
 {{#IS_SLE}}
 RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp
-RUN zypper addrepo -G -t yum -c 'http://nginx.org/packages/sles/15' nginx
-RUN zypper addrepo  -G -c '{{SMT_INTERNAL}}' smt_internal
-RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_UPDATE}}' smt_internal_update
-RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SDK}}' smt_internal_sdk
-RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SERVER}}' smt_internal_server
+RUN zypper addrepo -G -c -p 90 '{{ZYP_REPO_BASE_GA}}' base_ga
+RUN zypper addrepo -G -c -p 80 '{{ZYP_REPO_BASE_UPDATE}}' base_update
+RUN zypper addrepo -G -c -p 70 '{{ZYP_REPO_SP_GA}}' sp_ga
+RUN zypper addrepo -G -c -p 60 '{{ZYP_REPO_SP_UPDATE}}' sp_update
+RUN zypper addrepo -G -c -p 50 'http://nginx.org/packages/sles/15' nginx
 {{/IS_SLE}}
 
 RUN zypper -n ref && \
@@ -16,8 +16,8 @@ RUN zypper -n ref && \
 
 {{#IS_SLE}}
 RUN zypper rr nginx
-RUN zypper rr smt_internal
-RUN zypper rr smt_internal_update
-RUN zypper rr smt_internal_sdk
-RUN zypper rr smt_internal_server
+RUN zypper rr base_ga
+RUN zypper rr base_update
+RUN zypper rr sp_ga
+RUN zypper rr sp_update
 {{/IS_SLE}}
\ No newline at end of file
diff --git a/deploy/stratos-base-images/Dockerfile.stratos-ruby-build-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-ruby-build-base.tmpl
index fd1728474c..b278e64b73 100644
--- a/deploy/stratos-base-images/Dockerfile.stratos-ruby-build-base.tmpl
+++ b/deploy/stratos-base-images/Dockerfile.stratos-ruby-build-base.tmpl
@@ -2,10 +2,10 @@ FROM {{BASE_IMAGE}}
 
 {{#IS_SLE}}
 RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp
-RUN zypper addrepo  -G -c '{{SMT_INTERNAL}}' smt_internal
-RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_UPDATE}}' smt_internal_update
-RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SDK}}' smt_internal_sdk
-RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SERVER}}' smt_internal_server
+RUN zypper addrepo -G -c -p 90 '{{ZYP_REPO_BASE_GA}}' base_ga
+RUN zypper addrepo -G -c -p 80 '{{ZYP_REPO_BASE_UPDATE}}' base_update
+RUN zypper addrepo -G -c -p 70 '{{ZYP_REPO_SP_GA}}' sp_ga
+RUN zypper addrepo -G -c -p 60 '{{ZYP_REPO_SP_UPDATE}}' sp_update
 RUN zypper ref
 {{/IS_SLE}}
 
@@ -22,8 +22,8 @@ ADD install-ruby.sh /install-ruby.sh
 RUN /install-ruby.sh
 
 {{#IS_SLE}}
-RUN zypper rr smt_internal
-RUN zypper rr smt_internal_update
-RUN zypper rr smt_internal_sdk
-RUN zypper rr smt_internal_server
+RUN zypper rr base_ga
+RUN zypper rr base_update
+RUN zypper rr sp_ga
+RUN zypper rr sp_update
 {{/IS_SLE}}
diff --git a/deploy/stratos-base-images/Dockerfile.stratos-ui-build-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-ui-build-base.tmpl
index 55cdaf6c5b..08861d7917 100644
--- a/deploy/stratos-base-images/Dockerfile.stratos-ui-build-base.tmpl
+++ b/deploy/stratos-base-images/Dockerfile.stratos-ui-build-base.tmpl
@@ -2,10 +2,10 @@ FROM {{BASE_IMAGE}}
 
 {{#IS_SLE}}
 RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp
-RUN zypper addrepo  -G -c '{{SMT_INTERNAL}}' smt_internal
-RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_UPDATE}}' smt_internal_update
-RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SDK}}' smt_internal_sdk
-RUN zypper addrepo -t rpm-md -G -c '{{SMT_INTERNAL_SERVER}}' smt_internal_server
+RUN zypper addrepo -G -c -p 90 '{{ZYP_REPO_BASE_GA}}' base_ga
+RUN zypper addrepo -G -c -p 80 '{{ZYP_REPO_BASE_UPDATE}}' base_update
+RUN zypper addrepo -G -c -p 70 '{{ZYP_REPO_SP_GA}}' sp_ga
+RUN zypper addrepo -G -c -p 60 '{{ZYP_REPO_SP_UPDATE}}' sp_update
 RUN zypper ref
 {{/IS_SLE}}
 
@@ -28,10 +28,10 @@ RUN useradd -ms /bin/bash stratos && \
     chgrp users /usr/dist
 
 {{#IS_SLE}}
-RUN zypper rr smt_internal
-RUN zypper rr smt_internal_update
-RUN zypper rr smt_internal_sdk
-RUN zypper rr smt_internal_server
+RUN zypper rr base_ga
+RUN zypper rr base_update
+RUN zypper rr sp_ga
+RUN zypper rr sp_update
 {{/IS_SLE}}
 
 USER stratos    
diff --git a/deploy/stratos-base-images/build-base-images.sh b/deploy/stratos-base-images/build-base-images.sh
index 2e58c97a4c..6945ce30fc 100755
--- a/deploy/stratos-base-images/build-base-images.sh
+++ b/deploy/stratos-base-images/build-base-images.sh
@@ -81,10 +81,10 @@ fi
 
 if [ -n "${IS_SLE}" ]; then
   # Check env vars
-  : "${SMT_INTERNAL?Environment variable must be set when building SLE images}"
-  : "${SMT_INTERNAL_UPDATE?Environment variable must be set when building SLE images}"
-  : "${SMT_INTERNAL_SDK?Environment variable must be set when building SLE images}"
-  : "${SMT_INTERNAL_SERVER?Environment variable must be set when building SLE images}"
+  : "${ZYP_REPO_BASE_GA?Environment variable must be set when building SLE images}"
+  : "${ZYP_REPO_BASE_UPDATE?Environment variable must be set when building SLE images}"
+  : "${ZYP_REPO_SP_GA?Environment variable must be set when building SLE images}"
+  : "${ZYP_REPO_SP_UPDATE?Environment variable must be set when building SLE images}"
 fi
 
 set -x

From 911b09beae74ef9ee8796e11214986135c9f2bb6 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 18 Feb 2020 16:05:44 +0000
Subject: [PATCH 400/648] Fix typo

---
 .../stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl
index a6c7fedeb7..16af5f9911 100644
--- a/deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl
+++ b/deploy/stratos-base-images/Dockerfile.stratos-bk-init-base.tmpl
@@ -5,7 +5,8 @@ RUN rm -f /usr/lib/zypp/plugins/services/container-suseconnect-zypp
 RUN zypper addrepo -G -c -p 90 '{{ZYP_REPO_BASE_GA}}' base_ga
 RUN zypper addrepo -G -c -p 80 '{{ZYP_REPO_BASE_UPDATE}}' base_update
 RUN zypper addrepo -G -c -p 70 '{{ZYP_REPO_SP_GA}}' sp_ga
-RUN zypper addrepo -G -c -p 60 '{{ZYP_REPO_SP_UPDATE}}' sp_updateRUN zypper ref
+RUN zypper addrepo -G -c -p 60 '{{ZYP_REPO_SP_UPDATE}}' sp_update
+RUN zypper ref
 {{/IS_SLE}}
 RUN zypper in -y ca-certificates && \
     zypper in -y curl && \

From 6d00c9a238965e438c48883c2a4dedc4b3676866 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Tue, 18 Feb 2020 17:44:54 +0000
Subject: [PATCH 401/648] Prefix secrets.yaml in gitignore to only ignore e2e
 secrets.yaml. Add secrets for fdb and doclayer

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 .gitignore                                    |  2 +-
 .../console/templates/fdb-secrets.yaml        | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 deploy/kubernetes/console/templates/fdb-secrets.yaml

diff --git a/.gitignore b/.gitignore
index ce1c94fc35..ed422405e2 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
diff --git a/deploy/kubernetes/console/templates/fdb-secrets.yaml b/deploy/kubernetes/console/templates/fdb-secrets.yaml
new file mode 100644
index 0000000000..c02bd197d0
--- /dev/null
+++ b/deploy/kubernetes/console/templates/fdb-secrets.yaml
@@ -0,0 +1,27 @@
+{{/*
+Generate self-signed certificate
+*/}}
+{{- define "fdbdoclayer.generateCertificate" -}}
+{{- $altNames := list ( printf "%s%s" .Release.Name "-fdbdoclayer") ( printf "%s%s.%s" (include "fullname" .) "-fdbdoclayer" .Release.Namespace ) ( printf "%s.%s.svc" (include "console.certName" .) .Release.Namespace ) -}}
+{{- $ca := genCA "stratos-ca" 365 -}}
+{{- $cert := genSignedCert "fdbdoclayer" nil $altNames 365 $ca -}}
+tls.crt: {{ $cert.Cert | b64enc }}
+tls.key: {{ $cert.Key | b64enc }}
+tls.pem: {{ printf "%s\n%s\n%s\n" ($cert.Cert) ($ca.Cert) ($cert.Key) | b64enc }}
+ca.crt:  {{ $ca.Cert | b64enc }}
+{{- end -}}
+
+---
+apiVersion: v1
+kind: Secret
+type: kubernetes.io/tls
+metadata:
+  name: {{ template "fullname" . }}-fdbdoclayer-certs
+  labels:
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "fdbdoclayer-certs"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+data:
+{{ (include "fdbdoclayer.generateCertificate" .) | indent 2 }}
\ No newline at end of file

From 7f0241e9140074ae05d2562111fd2d3c341cd8d6 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Tue, 18 Feb 2020 20:07:52 +0000
Subject: [PATCH 402/648] Update config-init.sh

---
 deploy/containers/config-init/config-init.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/deploy/containers/config-init/config-init.sh b/deploy/containers/config-init/config-init.sh
index 664417ab25..ffad7ac93b 100755
--- a/deploy/containers/config-init/config-init.sh
+++ b/deploy/containers/config-init/config-init.sh
@@ -139,18 +139,16 @@ EOF
 
   echo "Creating secret for the Encryption Key: ${NAME}"
 
-  cat create-key-secret.yaml
-  
+ 
   # Create secret for the Encryption Key
   curl -k -s \
       --fail \
       -X POST \
-      -v \
       -d @create-key-secret.yaml \
       -H "Authorization: Bearer $KUBE_TOKEN" \
       -H 'Accept: application/json' \
       -H 'Content-Type: application/json' \
-      ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets
+      ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets > /dev/null &2>1
 
   RET_CREATE=$?
   echo "Create Encryption Key secret exit code: $RET_CREATE"

From 14837619544153ad27663332be8f9d6fc043bc04 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Tue, 18 Feb 2020 20:08:26 +0000
Subject: [PATCH 403/648] Remove debug code

---
 deploy/containers/config-init/config-init.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/deploy/containers/config-init/config-init.sh b/deploy/containers/config-init/config-init.sh
index ffad7ac93b..31c7ac8876 100755
--- a/deploy/containers/config-init/config-init.sh
+++ b/deploy/containers/config-init/config-init.sh
@@ -139,7 +139,6 @@ EOF
 
   echo "Creating secret for the Encryption Key: ${NAME}"
 
- 
   # Create secret for the Encryption Key
   curl -k -s \
       --fail \
@@ -148,7 +147,7 @@ EOF
       -H "Authorization: Bearer $KUBE_TOKEN" \
       -H 'Accept: application/json' \
       -H 'Content-Type: application/json' \
-      ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets > /dev/null &2>1
+      ${KUBE_API_SERVER}/api/v1/namespaces/${NAMESPACE}/secrets > /dev/null 2>&1
 
   RET_CREATE=$?
   echo "Create Encryption Key secret exit code: $RET_CREATE"

From 278e28d4d743c97b0f7742266df29e87f91be043 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Tue, 18 Feb 2020 20:10:02 +0000
Subject: [PATCH 404/648] Update values.yaml

---
 deploy/kubernetes/console/values.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index b0444c123b..c7becbd949 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -8,13 +8,13 @@ dockerRegistrySecret: regsecret
 #noProxy: localhost
 #ftpProxy: proxy.corp.net
 #socksProxy: sock-proxy.corp.net
-imagePullPolicy: Always
+imagePullPolicy: IfNotPresent
 
 console:
   cookieDomain:
   # externalIP deprecated - use console.service.externalIPs
 # externalIP: 127.0.0.1
-  backendLogLevel: debug
+  backendLogLevel: info
   ssoLogin: false
   ssoOptions:
   # Session Store Secret
@@ -26,7 +26,7 @@ console:
     loadBalancerIP:
     loadBalancerSourceRanges: []
     servicePort: 443
-    ## nodePort: 30000
+    # nodePort: 30000
     type: ClusterIP
     externalName:
     ingress:
@@ -54,7 +54,7 @@ console:
     http:
       enabled: false
       servicePort: 80
-      ## nodePort: 30001
+      # nodePort: 30001
 
   # Name of config map that provides the template files for user invitation emails
   templatesConfigMapName:

From 4e02b7bfcc9073c79c38edd54a0f95f85ecd81b6 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 19 Feb 2020 08:17:10 +0000
Subject: [PATCH 405/648] Bug fix: Broken user profile when using local admin
 user

---
 src/jetstream/plugins/userinfo/uaa_user.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/jetstream/plugins/userinfo/uaa_user.go b/src/jetstream/plugins/userinfo/uaa_user.go
index 5749381f43..66f0a52534 100644
--- a/src/jetstream/plugins/userinfo/uaa_user.go
+++ b/src/jetstream/plugins/userinfo/uaa_user.go
@@ -171,6 +171,10 @@ func copyHeaderIfSet(src *http.Request, dest *http.Request, name string) {
 func fwdResponseHeaders(src *http.Header, dest http.Header) {
 	log.Debug("fwdResponseHeaders")
 
+	if src == nil {
+		return
+	}
+
 	for k, headers := range *src {
 		switch {
 		// Skip these

From 3a447458547f1e42126528912d457389b61906fc Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 19 Feb 2020 08:40:02 +0000
Subject: [PATCH 406/648] Fix session error logging bug

---
 src/jetstream/middleware.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/jetstream/middleware.go b/src/jetstream/middleware.go
index 3449471136..723ed2ad49 100644
--- a/src/jetstream/middleware.go
+++ b/src/jetstream/middleware.go
@@ -29,6 +29,8 @@ const StratosSSOHeader = "x-stratos-sso-login"
 const StratosSSOErrorHeader = "x-stratos-sso-error"
 
 func handleSessionError(config interfaces.PortalConfig, c echo.Context, err error, doNotLog bool, msg string) error {
+	log.Debug("handleSessionError")
+
 	// Add header so front-end knows SSO login is enabled
 	if config.SSOLogin {
 		// A non-empty SSO Header means SSO is enabled
@@ -48,11 +50,15 @@ func handleSessionError(config interfaces.PortalConfig, c echo.Context, err erro
 		)
 	}
 
-	var logMessage = ""
-	if !doNotLog {
-		logMessage = msg + ": %v"
+	if doNotLog {
+		return interfaces.NewHTTPShadowError(
+			http.StatusUnauthorized,
+			msg, msg,
+		)
 	}
 
+	var logMessage = msg + ": %v"
+
 	return interfaces.NewHTTPShadowError(
 		http.StatusUnauthorized,
 		msg, logMessage, err,

From eb04cb20a59765dbf8bdef9a0e75c5aefd02eeba Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Wed, 19 Feb 2020 09:09:45 +0000
Subject: [PATCH 407/648] FDB related service/deployment/secret names now
 conform to common format

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 deploy/kubernetes/console/fdbvalues.yaml      | 27 -------------------
 .../console/templates/chartrepo.yaml          |  2 +-
 .../console/templates/deployment.yaml         |  2 +-
 .../console/templates/fdb-secrets.yaml        |  2 +-
 .../templates/fdb-doc-layer-deployment.yaml   |  6 ++---
 .../templates/fdbserver-deployment.yaml       |  4 +--
 .../templates/fdbserver-service.yaml          |  2 +-
 7 files changed, 9 insertions(+), 36 deletions(-)
 delete mode 100644 deploy/kubernetes/console/fdbvalues.yaml

diff --git a/deploy/kubernetes/console/fdbvalues.yaml b/deploy/kubernetes/console/fdbvalues.yaml
deleted file mode 100644
index 1c793a1b5f..0000000000
--- a/deploy/kubernetes/console/fdbvalues.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-fdbserver:
-  replicas: 1
-  image:
-    registry: docker.io
-    repository: kreinecke/foundationdb
-    tag: 6.0.18-k8s
-    pullPolicy: Always
-  service:
-    name: fdbserver
-    port: 4500
-
-fdbdoclayer:
-  replicas: 1
-  image:
-    registry: docker.io
-    repository: kreinecke/fdb-document-layer-k8s-tls
-    tag: latest
-    pullPolicy: Always
-  service:
-    name: fdbdoclayer
-    port: 27016
-  tls: true
-
-# Installs networkPolicy for the services. This will allow communication betweeen the services in
-# environments where the default policy is deny
-networkPolicy:
-  enabled: false
diff --git a/deploy/kubernetes/console/templates/chartrepo.yaml b/deploy/kubernetes/console/templates/chartrepo.yaml
index ac586b2abe..ff4ae27010 100644
--- a/deploy/kubernetes/console/templates/chartrepo.yaml
+++ b/deploy/kubernetes/console/templates/chartrepo.yaml
@@ -49,7 +49,7 @@ spec:
       volumes:
         - name: certs
           secret:
-            secretName: {{ template "fullname" . }}-fdbdoclayer-certs
+            secretName: {{ .Release.Name }}-fdbdoclayer-certs
       {{- end }}
 ---
 apiVersion: v1
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index d4093aadae..52c98a511f 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -323,7 +323,7 @@ spec:
       {{- if .Values.fdbdoclayer.tls }}
       - name: "{{ .Release.Name }}-monocular-certs"
         secret:
-          secretName: {{ template "fullname" . }}-fdbdoclayer-certs
+          secretName: {{ .Release.Name }}-fdbdoclayer-certs
       {{- end }}
 
   replicas: 1
diff --git a/deploy/kubernetes/console/templates/fdb-secrets.yaml b/deploy/kubernetes/console/templates/fdb-secrets.yaml
index c02bd197d0..7e9598779f 100644
--- a/deploy/kubernetes/console/templates/fdb-secrets.yaml
+++ b/deploy/kubernetes/console/templates/fdb-secrets.yaml
@@ -16,7 +16,7 @@ apiVersion: v1
 kind: Secret
 type: kubernetes.io/tls
 metadata:
-  name: {{ template "fullname" . }}-fdbdoclayer-certs
+  name: {{ .Release.Name }}-fdbdoclayer-certs
   labels:
     app.kubernetes.io/name: "stratos"
     app.kubernetes.io/instance: "{{ .Release.Name }}"
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
index 81c2947160..22133a5ffd 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
@@ -6,7 +6,7 @@ apiVersion: apps/v1beta2
 {{- end }}
 kind: Deployment
 metadata:
-  name: {{ template "fullname" . }}-fdbdoclayer
+  name: stratos-fdbdoclayer
   labels:
     app: {{ template "fullname" . }}-fdbdoclayer
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
@@ -34,7 +34,7 @@ spec:
         imagePullPolicy: {{.Values.imagePullPolicy}}
         env:
         - name: FDB_COORDINATOR
-          value: {{ template "fullname" . }}-fdbserver
+          value: {{ .Release.Name }}-fdbserver
         - name: CLUSTER_ID
           value: chartdb:erlklkg
         - name: ENABLE_TLS
@@ -67,5 +67,5 @@ spec:
       volumes:
         - name: certs
           secret:
-            secretName: {{ template "fullname" . }}-fdbdoclayer-certs
+            secretName: {{ .Release.Name }}-fdbdoclayer-certs
 {{- end }} 
\ No newline at end of file
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
index a302ce8911..a6c0f12e0d 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
@@ -6,7 +6,7 @@ apiVersion: apps/v1beta2
 {{- end }}
 kind: Deployment
 metadata:
-  name: {{ template "fullname" . }}-fdbserver
+  name: stratos-fdbserver
   labels:
     app: {{ template "fullname" . }}-fdbserver
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
@@ -34,7 +34,7 @@ spec:
         imagePullPolicy: {{.Values.imagePullPolicy}}
         env:
         - name: FDB_COORDINATOR
-          value: {{ template "fullname" . }}-fdbserver.console.svc.cluster.local
+          value: {{ .Release.Name }}-fdbserver.console.svc.cluster.local
         - name: CLUSTER_ID
           value: chartdb:erlklkg
         ports:
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-service.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-service.yaml
index 87aeca5f1e..49d2531062 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-service.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-service.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "fullname" . }}-fdbserver
+  name: {{ .Release.Name }}-fdbserver
   labels:
     app: {{ template "fullname" . }}-fdbserver
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"

From e8ac9a18fb8d8cfdb30e81d66e0883121fccd513 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 19 Feb 2020 09:20:58 +0000
Subject: [PATCH 408/648] V3 pipeline updates

---
 deploy/ci/console-dev-releases.yml  | 4 ++--
 deploy/ci/console-helm-chart-pr.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/deploy/ci/console-dev-releases.yml b/deploy/ci/console-dev-releases.yml
index 707ffd6e0b..febecb07f5 100644
--- a/deploy/ci/console-dev-releases.yml
+++ b/deploy/ci/console-dev-releases.yml
@@ -14,8 +14,8 @@ resources:
     uri: git@github.com:((stratos-repository-organization))/((stratos-repository))
     branch: ((stratos-repository-branch))
     private_key: ((github-private-key))
-    # Match any Version 2 release (alpha, beta, rc) other than the actual release
-    tag_filter: "2*-*"
+    # Match any Version 3 release (alpha, beta, rc) other than the actual release
+    tag_filter: "3*-*"
 - name: helm-repo
   type: git
   source:
diff --git a/deploy/ci/console-helm-chart-pr.yml b/deploy/ci/console-helm-chart-pr.yml
index 7c6d56da60..bee5e837d4 100644
--- a/deploy/ci/console-helm-chart-pr.yml
+++ b/deploy/ci/console-helm-chart-pr.yml
@@ -7,7 +7,7 @@ resources:
     owner: ((helm-repo-github-organization))
     repository: ((helm-repo-github-repository))
     access_token: ((github-access-token))
-    tag_filter: 2\.[0-9]*\.[0-9]*
+    tag_filter: 3\.[0-9]*\.[0-9]*
 - name: helm-chart-repo
   type: git
   source:

From d3b4f9c4831f07ed909058cb23fc893fbd8b257b Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 19 Feb 2020 10:40:38 +0000
Subject: [PATCH 409/648] CI Pipeline fix

---
 deploy/ci/suse-console-dev-releases.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/deploy/ci/suse-console-dev-releases.yml b/deploy/ci/suse-console-dev-releases.yml
index e98aff2330..1dcac26b6b 100644
--- a/deploy/ci/suse-console-dev-releases.yml
+++ b/deploy/ci/suse-console-dev-releases.yml
@@ -139,7 +139,6 @@ jobs:
         params:
           dockerfile: stratos/deploy/Dockerfile.init
           build: stratos/
-          target_name:  postflight-job
           tag: image-tag/v2-alpha-tag
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))

From 7c66f22bbde5d73bb306b32ab8adb985d0204ac5 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 19 Feb 2020 11:21:43 +0000
Subject: [PATCH 410/648] Fix CI image build pipeline

---
 deploy/ci/suse-console-dev-releases.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/deploy/ci/suse-console-dev-releases.yml b/deploy/ci/suse-console-dev-releases.yml
index 1dcac26b6b..5cd6e1ea70 100644
--- a/deploy/ci/suse-console-dev-releases.yml
+++ b/deploy/ci/suse-console-dev-releases.yml
@@ -163,7 +163,6 @@ jobs:
         params:
           dockerfile: stratos/deploy/containers/monocular/fdb-server/Dockerfile
           build: stratos/deploy/containers/monocular/fdb-server/
-          target_name: prod-build
           tag: image-tag/v2-alpha-tag
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))
@@ -171,7 +170,6 @@ jobs:
         params:
           dockerfile: stratos/deploy/containers/monocular/fdb-doclayer/Dockerfile
           build: stratos/deploy/containers/monocular/fdb-doclayer/
-          target_name: prod-build
           tag: image-tag/v2-alpha-tag
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))

From 607b010b0222edaaf190acf8a2cb9f2f4ecc193d Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 19 Feb 2020 13:51:30 +0000
Subject: [PATCH 411/648] Add missing chartsync image

---
 deploy/ci/suse-console-dev-releases.yml       | 28 ++++++++++++++-----
 .../{chartrepo.yaml => chartsync.yaml}        | 18 ++++++------
 .../console/templates/deployment.yaml         |  2 +-
 deploy/kubernetes/console/values.yaml         |  4 +--
 4 files changed, 33 insertions(+), 19 deletions(-)
 rename deploy/kubernetes/console/templates/{chartrepo.yaml => chartsync.yaml} (85%)

diff --git a/deploy/ci/suse-console-dev-releases.yml b/deploy/ci/suse-console-dev-releases.yml
index 5cd6e1ea70..240f674253 100644
--- a/deploy/ci/suse-console-dev-releases.yml
+++ b/deploy/ci/suse-console-dev-releases.yml
@@ -60,6 +60,12 @@ resources:
     username: ((docker-username))
     password: ((docker-password))
     repository: ((docker-repository))/stratos-fdbdoclayer
+- name: chartsync-image
+  type: docker-image
+  source:
+    username: ((docker-username))
+    password: ((docker-password))
+    repository: ((docker-repository))/stratos-chartsync
 
 # Artifacts
 - name: image-tag
@@ -135,13 +141,6 @@ jobs:
           build_args_file: image-tag/build-args
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))
-      - put: config-init-image
-        params:
-          dockerfile: stratos/deploy/Dockerfile.init
-          build: stratos/
-          tag: image-tag/v2-alpha-tag
-          patch_base_reg: ((patch-base-reg))
-          patch_base_tag: ((patch-base-tag))
       - put: mariadb-image
         params:
           dockerfile: stratos/deploy/db/Dockerfile.mariadb
@@ -159,6 +158,14 @@ jobs:
           build_args_file: image-tag/ui-build-args
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))
+      - put: config-init-image
+        params:
+          dockerfile: stratos/deploy/Dockerfile.init
+          build: stratos/
+          tag: image-tag/v2-alpha-tag
+          patch_base_reg: ((patch-base-reg))
+          patch_base_tag: ((patch-base-tag))
+    - do:
       - put: fdbserver-image
         params:
           dockerfile: stratos/deploy/containers/monocular/fdb-server/Dockerfile
@@ -173,6 +180,13 @@ jobs:
           tag: image-tag/v2-alpha-tag
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))
+      - put: chartsync-image
+        params:
+          dockerfile: stratos/src/jetstream/plugins/monocular/chart-repo/Dockerfile
+          build: stratos/src/jetstream/plugins/monocular/chart-repo/
+          tag: image-tag/v2-alpha-tag
+          patch_base_reg: ((patch-base-reg))
+          patch_base_tag: ((patch-base-tag))
 - name: create-chart
   plan:
   - get: stratos
diff --git a/deploy/kubernetes/console/templates/chartrepo.yaml b/deploy/kubernetes/console/templates/chartsync.yaml
similarity index 85%
rename from deploy/kubernetes/console/templates/chartrepo.yaml
rename to deploy/kubernetes/console/templates/chartsync.yaml
index ff4ae27010..a7dd68de25 100644
--- a/deploy/kubernetes/console/templates/chartrepo.yaml
+++ b/deploy/kubernetes/console/templates/chartsync.yaml
@@ -6,30 +6,30 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: Deployment
 metadata:
-  name: stratos-chartrepo
+  name: stratos-chartsync
   labels:
     app.kubernetes.io/name: "stratos"
     app.kubernetes.io/instance: "{{ .Release.Name }}"
     app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "stratos-chartrepo"
+    app.kubernetes.io/component: "stratos-chartsync"
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: "stratos"
-      app.kubernetes.io/component: "stratos-chartrepo"
+      app.kubernetes.io/component: "stratos-chartsync"
   template:
     metadata:
       labels:
         app.kubernetes.io/name: "stratos"
         app.kubernetes.io/instance: "{{ .Release.Name }}"
         app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-        app.kubernetes.io/component: "stratos-chartrepo"
+        app.kubernetes.io/component: "stratos-chartsync"
         helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
         app: "{{ .Release.Name }}"
     spec:
       containers:
-      - name: chartrepo
+      - name: chartsync
         image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/stratos-chartsync:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         command: ["/chartrepo"]
@@ -55,19 +55,19 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: "{{ .Release.Name }}-chartrepo"
+  name: "{{ .Release.Name }}-chartsync"
   labels:
     app.kubernetes.io/name: "stratos"
     app.kubernetes.io/instance: "{{ .Release.Name }}"
     app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "stratos-chartrepo-service"
+    app.kubernetes.io/component: "stratos-chartsync-service"
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 spec:
   type: ClusterIP
   ports:
-  - name: chartrepo
+  - name: chartsync
     port: 8080
     targetPort: 8080
   selector:
     app: "{{ .Release.Name }}"
-    app.kubernetes.io/component: "stratos-chartrepo"
+    app.kubernetes.io/component: "stratos-chartsync"
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index e4dd0f6487..c4632e97ed 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -264,7 +264,7 @@ spec:
         - name: HELM_FDB_URL
           value: "mongodb://{{ .Release.Name }}-{{ .Values.fdbdoclayer.service.name }}:{{ .Values.fdbdoclayer.service.port }}"
         - name: HELM_SYNC_SERVER_URL
-          value: "http://{{ .Release.Name }}-{{ .Values.chartrepo.service.name }}:{{ .Values.chartrepo.service.port }}"
+          value: "http://{{ .Release.Name }}-{{ .Values.chartsync.service.name }}:{{ .Values.chartsync.service.port }}"
         readinessProbe:
           httpGet:
             path: /pp/v1/ping
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index 8f0dd41ac6..ef1036bce1 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -165,9 +165,9 @@ fdbdoclayer:
   networkPolicy:
     enabled: false
 
-chartrepo:
+chartsync:
   service:
-    name: chartrepo
+    name: chartsync
     port: 8080
   tls: true
   networkPolicy:

From 7fbe7bb3c5829a379d8762d48b1b0e185f28eb49 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 19 Feb 2020 13:57:24 +0000
Subject: [PATCH 412/648] Support upgrade from v2

---
 .../console/templates/chartrepo.yaml          |  8 +-----
 .../console/templates/deployment.yaml         | 11 ++------
 .../templates/fdb-doc-layer-deployment.yaml   | 16 ++++-------
 .../fdb-doc-layer-networkpolicy.yaml          |  2 +-
 .../templates/fdb-doc-layer-service.yaml      |  6 ++--
 .../templates/fdbserver-deployment.yaml       | 10 +++----
 .../templates/fdbserver-networkpolicy.yaml    |  2 +-
 .../templates/fdbserver-service.yaml          |  6 ++--
 deploy/kubernetes/console/values.yaml         | 28 +++----------------
 9 files changed, 26 insertions(+), 63 deletions(-)

diff --git a/deploy/kubernetes/console/templates/chartrepo.yaml b/deploy/kubernetes/console/templates/chartrepo.yaml
index ff4ae27010..9a03b92eb5 100644
--- a/deploy/kubernetes/console/templates/chartrepo.yaml
+++ b/deploy/kubernetes/console/templates/chartrepo.yaml
@@ -30,18 +30,13 @@ spec:
     spec:
       containers:
       - name: chartrepo
-        image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/stratos-chartsync:{{.Values.consoleVersion}}
+        image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{ default "stratos-chartsync" .Values.images.chartsync}}:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         command: ["/chartrepo"]
-        {{- if .Values.fdbdoclayer.tls }}
         args: ["serve", "--debug=true","--doclayer-url=mongodb://{{ .Release.Name }}-fdbdoclayer:27016", "--cafile=/etc/certs/ca.crt", "--certfile=/etc/certs/tls.crt", "--keyfile=/etc/certs/tls.key"]
-        {{- else }}
-        args: ["serve", "--debug=true","--doclayer-url=mongodb://{{ .Release.Name }}-fdbdoclayer:27016"]
-        {{- end }}
         ports:
         - name: endpoint
           containerPort: 8080
-      {{- if .Values.fdbdoclayer.tls }}
         volumeMounts:
         - name: certs
           mountPath: "/etc/certs"
@@ -50,7 +45,6 @@ spec:
         - name: certs
           secret:
             secretName: {{ .Release.Name }}-fdbdoclayer-certs
-      {{- end }}
 ---
 apiVersion: v1
 kind: Service
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index e4dd0f6487..f037a28eda 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -253,18 +253,16 @@ spec:
           value: {{ default "" .Values.console.userInviteSubject | quote }}
         - name: ENABLE_TECH_PREVIEW
           value: {{ default "false" .Values.console.techPreview | quote }}
-        {{- if .Values.fdbdoclayer.tls }}
         - name: MONOCULAR_CRT_PATH
           value: "/etc/monocular-certs/tls.crt"
         - name: MONOCULAR_KEY_PATH
           value: "/etc/monocular-certs/tls.key"
         - name: MONOCULAR_CA_CRT_PATH
           value: "/etc/monocular-certs/ca.crt"
-        {{- end }}
         - name: HELM_FDB_URL
-          value: "mongodb://{{ .Release.Name }}-{{ .Values.fdbdoclayer.service.name }}:{{ .Values.fdbdoclayer.service.port }}"
+          value: "mongodb://{{ .Release.Name }}-fdbdoclayer:27016"
         - name: HELM_SYNC_SERVER_URL
-          value: "http://{{ .Release.Name }}-{{ .Values.chartrepo.service.name }}:{{ .Values.chartrepo.service.port }}"
+          value: "http://{{ .Release.Name }}-chartrepo:8080"
         readinessProbe:
           httpGet:
             path: /pp/v1/ping
@@ -289,11 +287,9 @@ spec:
           name: "{{ .Release.Name }}-templates"
           readOnly: true
         {{- end }}
-        {{- if .Values.fdbdoclayer.tls }}
         - mountPath: "/etc/monocular-certs"
           name: "{{ .Release.Name }}-monocular-certs"
           readOnly: true
-        {{- end }}
       {{- if and .Values.kube.registry.username .Values.kube.registry.password }}
       imagePullSecrets:
       - name: {{.Values.dockerRegistrySecret}}
@@ -320,12 +316,9 @@ spec:
         configMap:
           name: {{ .Values.console.templatesConfigMapName }}
       {{- end }}
-      {{- if .Values.fdbdoclayer.tls }}
       - name: "{{ .Release.Name }}-monocular-certs"
         secret:
           secretName: {{ .Release.Name }}-fdbdoclayer-certs
-      {{- end }}
-
   replicas: 1
   strategy:
     type: RollingUpdate
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
index 22133a5ffd..ee1943899e 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
@@ -13,7 +13,7 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 spec:
-  replicas: {{ .Values.fdbdoclayer.replicas }}
+  replicas: {{ default 1 .Values.fdbdoclayerReplicas }}
   selector:
     matchLabels:
       app: {{ template "fullname" . }}-fdbdoclayer
@@ -30,7 +30,7 @@ spec:
 {{- end }}
       containers:
       - name: fdbdoclayer
-        image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.fdbdoclayer}}:{{.Values.consoleVersion}}
+        image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{ default "stratos-fdbdoclayer" .Values.images.fdbdoclayer}}:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         env:
         - name: FDB_COORDINATOR
@@ -38,28 +38,25 @@ spec:
         - name: CLUSTER_ID
           value: chartdb:erlklkg
         - name: ENABLE_TLS
-          value: {{ .Values.fdbdoclayer.tls  | quote }}
-        {{- if .Values.fdbdoclayer.tls }}
+          value: "true"
         - name: SERVER_CRT
           value: "/etc/secrets/tls.crt"
         - name: SERVER_KEY
           value: "/etc/secrets/tls.key"
         - name: CA_CRT
           value: "/etc/secrets/ca.crt"      
-        {{- end }}  
         ports:
-        - containerPort: {{ .Values.fdbdoclayer.service.port }}
+        - containerPort: 27016
         livenessProbe:
           tcpSocket:
-            port: {{ .Values.fdbdoclayer.service.port }}
+            port: 27016
           initialDelaySeconds: 3
           periodSeconds: 20
         readinessProbe:
           tcpSocket:
-            port: {{ .Values.fdbdoclayer.service.port }}
+            port: 27016
           initialDelaySeconds: 3
           periodSeconds: 10
-{{- if .Values.fdbdoclayer.tls }}
         volumeMounts:
         - name: certs
           mountPath: "/etc/secrets"
@@ -68,4 +65,3 @@ spec:
         - name: certs
           secret:
             secretName: {{ .Release.Name }}-fdbdoclayer-certs
-{{- end }} 
\ No newline at end of file
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-networkpolicy.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-networkpolicy.yaml
index 9d15cbc953..7322378bd0 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-networkpolicy.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-networkpolicy.yaml
@@ -16,6 +16,6 @@ spec:
       release: {{ .Release.Name }}
   ingress:
     ports:
-      port: {{ .Values.fdbdoclayer.service.port }}
+      port: 27016
       protocol: TCP
 {{- end }}
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml
index d5d33cf46d..90c48cc77b 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml
@@ -11,10 +11,10 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-  - port: {{ .Values.fdbdoclayer.service.port }}
-    targetPort: {{ .Values.fdbdoclayer.service.port }}
+  - port: 27016
+    targetPort: 27016
     protocol: TCP
-    name: {{ .Values.fdbdoclayer.service.name }}
+    name: fdbdoclayer
   selector:
     app: {{ template "fullname" . }}-fdbdoclayer
     release: {{ .Release.Name }}
\ No newline at end of file
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
index a6c0f12e0d..d74ffa10d6 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
@@ -13,7 +13,7 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 spec:
-  replicas: {{ .Values.fdbserver.replicas }}
+  replicas: {{ default 1 .Values.fdbserverReplicas }}
   selector:
     matchLabels:
       app: {{ template "fullname" . }}-fdbserver
@@ -30,7 +30,7 @@ spec:
 {{- end }}
       containers:
       - name: fdbserver
-        image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.fdbserver}}:{{.Values.consoleVersion}}
+        image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{ default "stratos-fdbserver" .Values.images.fdbserver}}:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         env:
         - name: FDB_COORDINATOR
@@ -38,14 +38,14 @@ spec:
         - name: CLUSTER_ID
           value: chartdb:erlklkg
         ports:
-        - containerPort: {{ .Values.fdbserver.service.port }}
+        - containerPort: 4500
         livenessProbe:
           tcpSocket:
-            port: {{ .Values.fdbserver.service.port }}
+            port: 4500
           initialDelaySeconds: 3
           periodSeconds: 20
         readinessProbe:
           tcpSocket:
-            port: {{ .Values.fdbserver.service.port }}
+            port: 4500
           initialDelaySeconds: 3
           periodSeconds: 10
\ No newline at end of file
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-networkpolicy.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-networkpolicy.yaml
index db6ea4d64e..2752d371e2 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-networkpolicy.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-networkpolicy.yaml
@@ -16,6 +16,6 @@ spec:
       release: {{ .Release.Name }}
   ingress:
   - ports:
-    - port: {{ .Values.fdbserver.service.port }}
+    - port: 4500
       protocol: TCP
 {{- end }}
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-service.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-service.yaml
index 49d2531062..08fd366533 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-service.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-service.yaml
@@ -11,10 +11,10 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-  - port: {{ .Values.fdbserver.service.port }}
-    targetPort: {{ .Values.fdbserver.service.port }}
+  - port: 4500
+    targetPort: 4500
     protocol: TCP
-    name: {{ .Values.fdbserver.service.name }}
+    name: fdbserver
   selector:
     app: {{ template "fullname" . }}-fdbserver
     release: {{ .Release.Name }}
\ No newline at end of file
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index 8f0dd41ac6..e8b8eaa435 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -106,6 +106,7 @@ images:
   configInit: stratos-config-init
   fdbserver: stratos-fdbserver
   fdbdoclayer: stratos-fdbdoclayer
+  chartsync: stratos-chartsync
 
 # Specify which storage class should be used for PVCs
 #storageClass: default
@@ -148,30 +149,9 @@ uaa:
   consoleAdminIdentifier: 
   skipSSLValidation: false
 
-fdbserver:
-  replicas: 1
-  service:
-    name: fdbserver
-    port: 4500
-  networkPolicy:
-    enabled: false
-
-fdbdoclayer:
-  replicas: 1
-  service:
-    name: fdbdoclayer
-    port: 27016
-  tls: true
-  networkPolicy:
-    enabled: false
-
-chartrepo:
-  service:
-    name: chartrepo
-    port: 8080
-  tls: true
-  networkPolicy:
-    enabled: false
+# Replicas for FDB - do not edit
+fdbserverReplicas: 1
+fdbdoclayerReplicas: 1
 
 # SCF values compatability 
 env:

From 1bd461333288c5c3e19109d1863621a84e906c37 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Wed, 19 Feb 2020 17:01:50 +0000
Subject: [PATCH 413/648] Added fdbserver to AIO image

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 deploy/Dockerfile.all-in-one                  | 86 +++++++++++++++++--
 deploy/aio-entrypoint.sh                      |  4 +
 .../fdb-server/create_cluster_file.bash       |  1 +
 .../fdb-server/create_server_environment.bash |  3 +
 .../containers/monocular/fdb-server/fdb.bash  |  4 +-
 5 files changed, 88 insertions(+), 10 deletions(-)
 create mode 100644 deploy/aio-entrypoint.sh

diff --git a/deploy/Dockerfile.all-in-one b/deploy/Dockerfile.all-in-one
index ce046c3325..5daa498304 100644
--- a/deploy/Dockerfile.all-in-one
+++ b/deploy/Dockerfile.all-in-one
@@ -1,5 +1,5 @@
 # Docker build for all-in-one Stratos
-FROM splatform/stratos-aio-base:leap15_1 as builder
+FROM splatform/stratos-aio-base:leap15_1 as jetstream-builder
 
 # Ensure that we copy the custom-src folder
 COPY --chown=stratos:users . ./
@@ -16,16 +16,84 @@ RUN npm install \
 RUN CERTS_PATH=/home/stratos/dev-certs ./generate_cert.sh \
     && chmod +x jetstream
 
+# TODO Kate ##########################################################################################
+# Add fdbdoclayer, fdbserver and chart repo as additional builders here, then below use copy from builder to add the necessary parts to the final image
+# Create a script that starts the 2 database processes, the chart repo with the localhost URL for the doclayer. Config properties will need to 
+# have env vars for the chart repo and fdbdoclayer localhost URLS, so that jetstream can access them.
+
+FROM splatform/stratos-bk-build-base:leap15_1 as fdbserver-builder
+
+
+# Install FoundationDB Binaries
+
+ARG FDB_VERSION=6.2.15
+ARG FDB_WEBSITE=https://www.foundationdb.org
+
+USER root
+WORKDIR /home/stratos/tmp
+WORKDIR /home/stratos
+RUN pwd && ls -al
+RUN curl $FDB_WEBSITE/downloads/$FDB_VERSION/linux/fdb_$FDB_VERSION.tar.gz -o fdb_$FDB_VERSION.tar.gz && \
+	tar -xzf fdb_$FDB_VERSION.tar.gz --strip-components=1 && \
+	rm fdb_$FDB_VERSION.tar.gz && \
+	chmod u+x fdbbackup fdbcli fdbdr fdbmonitor fdbrestore fdbserver backup_agent dr_agent && \
+	mv fdbbackup fdbcli fdbdr fdbmonitor fdbrestore fdbserver backup_agent dr_agent /usr/bin
+
+WORKDIR /var/fdb
+
+# Install FoundationDB Client Libraries
+
+ARG FDB_VERSION=6.2.15
+ARG FDB_ADDITIONAL_VERSIONS="5.1.7"
+ARG FDB_WEBSITE=https://www.foundationdb.org
+
+COPY deploy/containers/monocular/fdb-server/download_multiversion_libraries.bash scripts/
+
+# Set Up Runtime Scripts and Directories
+COPY deploy/containers/monocular/fdb-server/fdb.bash scripts/
+COPY deploy/containers/monocular/fdb-server/create_server_environment.bash scripts/
+COPY deploy/containers/monocular/fdb-server/create_cluster_file.bash scripts/
+COPY deploy/containers/monocular/fdb-server/configure_db.bash scripts/
+RUN chmod u+x scripts/*.bash && \
+	mkdir -p logs
+
+#####################################################################
+
 # use --target=aio to build All-in-one image
 FROM splatform/stratos-bk-base:leap15_1
 ARG CANARY_BUILD
-COPY --from=builder /home/stratos/deploy/db /src/deploy/db
-COPY --from=builder /home/stratos/dev-certs /srv/dev-certs
-COPY --from=builder /home/stratos/ui /srv/ui
-COPY --from=builder /home/stratos/jetstream /srv/jetstream
-COPY --from=builder /home/stratos/config.properties /srv/config.properties
+COPY --from=jetstream-builder /home/stratos/deploy/db /src/deploy/db
+COPY --from=jetstream-builder /home/stratos/dev-certs /srv/dev-certs
+COPY --from=jetstream-builder /home/stratos/ui /srv/ui
+COPY --from=jetstream-builder /home/stratos/jetstream /srv/jetstream
+COPY --from=jetstream-builder /home/stratos/config.properties /srv/config.properties
+
 # User Invite templates
-COPY --from=builder /home/stratos/src/jetstream/templates /srv/templates
+COPY --from=jetstream-builder /home/stratos/src/jetstream/templates /srv/templates
+
+# Pull in binaries and config from fdbserver-builder
+COPY --from=fdbserver-builder /usr/bin /usr/bin
+COPY --from=fdbserver-builder /var/fdb/scripts /var/fdb/scripts
+
+# Install FoundationDB Client Libraries directly here rther than in the fdbserver-builder as the download destination path depends on an external script.
+ARG FDB_VERSION=6.2.15
+ARG FDB_ADDITIONAL_VERSIONS="5.1.7"
+ARG FDB_WEBSITE=https://www.foundationdb.org
+RUN mkdir -p /mnt/website
+RUN curl $FDB_WEBSITE/downloads/$FDB_VERSION/linux/libfdb_c_$FDB_VERSION.so -o /usr/lib/libfdb_c.so && \
+	bash /var/fdb/scripts/download_multiversion_libraries.bash $FDB_WEBSITE $FDB_ADDITIONAL_VERSIONS && \
+	rm -rf /mnt/website
+VOLUME /var/fdb/data
+RUN mkdir -p /var/fdb/logs
+# FDB runtime vars
+ENV FDB_PORT 4500
+ENV FDB_CLUSTER_FILE /var/fdb/fdb.cluster
+# Set to networking mode to host, since all processes will be running in this single container
+ENV FDB_NETWORKING_MODE host
+ENV FDB_COORDINATOR ""
+ENV FDB_COORDINATOR_PORT 4500
+ENV FDB_CLUSTER_FILE_CONTENTS ""
+ENV FDB_PROCESS_CLASS unset
 
 # Enable persistence features if canary build flag is set
 RUN if [ "x$CANARY_BUILD" != "x" ] ; then printf "\nFORCE_ENABLE_PERSISTENCE_FEATURES=true\n" >> /srv/config.properties ; fi
@@ -38,4 +106,6 @@ EXPOSE 443
 # Need to be root to bind to port 443
 USER root
 
-ENTRYPOINT ["./jetstream"]
+COPY deploy/aio-entrypoint.sh .
+RUN chmod +x ./aio-entrypoint.sh
+ENTRYPOINT ["./aio-entrypoint.sh"]
diff --git a/deploy/aio-entrypoint.sh b/deploy/aio-entrypoint.sh
new file mode 100644
index 0000000000..3dc5c11745
--- /dev/null
+++ b/deploy/aio-entrypoint.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+/var/fdb/scripts/fdb.bash &
+./jetstream
\ No newline at end of file
diff --git a/deploy/containers/monocular/fdb-server/create_cluster_file.bash b/deploy/containers/monocular/fdb-server/create_cluster_file.bash
index 453a049941..0a710264a4 100644
--- a/deploy/containers/monocular/fdb-server/create_cluster_file.bash
+++ b/deploy/containers/monocular/fdb-server/create_cluster_file.bash
@@ -34,6 +34,7 @@ function create_cluster_file() {
 	if [[ -n "$FDB_CLUSTER_FILE_CONTENTS" ]]; then
 		echo "$FDB_CLUSTER_FILE_CONTENTS" > $FDB_CLUSTER_FILE
 	elif [[ -n $FDB_COORDINATOR ]]; then
+		#We are in k8s and must lookup the fdb service hostname, not the pod IP.
 		coordinator_ip=$(dig +short +search $FDB_COORDINATOR)
 		if [[ -z "$coordinator_ip" ]]; then
 			echo "Failed to look up coordinator address for $FDB_COORDINATOR" 1>&2
diff --git a/deploy/containers/monocular/fdb-server/create_server_environment.bash b/deploy/containers/monocular/fdb-server/create_server_environment.bash
index 54d90f0854..d417f0367d 100644
--- a/deploy/containers/monocular/fdb-server/create_server_environment.bash
+++ b/deploy/containers/monocular/fdb-server/create_server_environment.bash
@@ -28,9 +28,11 @@ function create_server_environment() {
 
 	: > $env_file
 
+	# If using docker in host network mode, or if we are running our client in the same container, use 127.0.0.1
 	if [[ "$FDB_NETWORKING_MODE" == "host" ]]; then
 		public_ip=127.0.0.1
 	elif [[ "$FDB_NETWORKING_MODE" == "container" ]]; then
+		#We are running in k8s
 		public_ip=$(grep `hostname` /etc/hosts | sed -e "s/\s *`hostname`.*//")
 	else
 		echo "Unknown FDB Networking mode \"$FDB_NETWORKING_MODE\"" 1>&2
@@ -38,6 +40,7 @@ function create_server_environment() {
 	fi
 
 	echo "export PUBLIC_IP=$public_ip" >> $env_file
+	# If the FDB_COORDINATOR node is not set, then we are the coordinator - use our public IP
 	if [[ -z $FDB_COORDINATOR ]]; then
 		FDB_CLUSTER_FILE_CONTENTS="docker:docker@$public_ip:$FDB_PORT"
 	fi
diff --git a/deploy/containers/monocular/fdb-server/fdb.bash b/deploy/containers/monocular/fdb-server/fdb.bash
index 0e6ad40827..6746af53a8 100644
--- a/deploy/containers/monocular/fdb-server/fdb.bash
+++ b/deploy/containers/monocular/fdb-server/fdb.bash
@@ -23,9 +23,9 @@
 source /var/fdb/scripts/create_server_environment.bash
 create_server_environment
 source /var/fdb/.fdbenv
-echo "Starting FDB server listening on: $PUBLIC_IP:$COORDINATOR_PORT public address: $PUBLIC_IP:$COORDINATOR_PORT"
+echo "Starting FDB server listening on: $PUBLIC_IP:$FDB_PORT public address: $PUBLIC_IP:$FDB_PORT"
 cat /var/fdb/fdb.cluster
 source /var/fdb/scripts/configure_db.bash
 configure_db &
-fdbserver --listen_address $PUBLIC_IP:$COORDINATOR_PORT --public_address $PUBLIC_IP:$COORDINATOR_PORT \
+fdbserver --listen_address $PUBLIC_IP:$FDB_PORT --public_address $PUBLIC_IP:$FDB_PORT \
 	--datadir /var/fdb/data --logdir /var/fdb/logs
\ No newline at end of file

From 3f5c9e58d95dc9b312b8e3643bae7c53c47a70c0 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Wed, 19 Feb 2020 18:17:11 +0000
Subject: [PATCH 414/648] Optionally use prebuilt ui during build

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 deploy/Dockerfile.all-in-one | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/deploy/Dockerfile.all-in-one b/deploy/Dockerfile.all-in-one
index 5daa498304..88237defac 100644
--- a/deploy/Dockerfile.all-in-one
+++ b/deploy/Dockerfile.all-in-one
@@ -6,11 +6,33 @@ COPY --chown=stratos:users . ./
 COPY --chown=stratos:users deploy/tools/generate_cert.sh generate_cert.sh
 COPY --chown=stratos:users deploy/all-in-one/config.all-in-one.properties config.properties
 
-RUN npm install \
-    && npm run build \
+ARG USE_PREBUILT_UI=true
+
+# RUN npm install \
+#     && npm run build \
+#     && npm run build-backend \
+#     && cp src/jetstream/jetstream . \
+#     && mv dist ui
+USER root
+RUN zypper install -y unzip
+USER stratos
+
+# USER root
+# RUN curl https://download.opensuse.org/repositories/openSUSE:/Leap:/15.1/standard/x86_64/unzip-6.00-lp151.5.1.x86_64.rpm -o unzip.rpm && zypper install unzip.rpm
+# USER stratos
+
+RUN if [ $USE_PREBUILT_UI = "true" ] ; then \
+    unzip stratos-frontend-prebuild.zip -d ./dist \
     && npm run build-backend \
     && cp src/jetstream/jetstream . \
-    && mv dist ui
+	&& mv dist ui ; \
+    else \
+		npm install \
+        && npm run build \
+        && npm run build-backend \
+        && cp  src/jetstream/jetstream . \
+        && mv dist ui ; \
+    fi
 
 # Generate dev-certs
 RUN CERTS_PATH=/home/stratos/dev-certs ./generate_cert.sh \
@@ -18,7 +40,7 @@ RUN CERTS_PATH=/home/stratos/dev-certs ./generate_cert.sh \
 
 # TODO Kate ##########################################################################################
 # Add fdbdoclayer, fdbserver and chart repo as additional builders here, then below use copy from builder to add the necessary parts to the final image
-# Create a script that starts the 2 database processes, the chart repo with the localhost URL for the doclayer. Config properties will need to 
+# Config properties for jetstream will need to 
 # have env vars for the chart repo and fdbdoclayer localhost URLS, so that jetstream can access them.
 
 FROM splatform/stratos-bk-build-base:leap15_1 as fdbserver-builder
@@ -75,7 +97,7 @@ COPY --from=jetstream-builder /home/stratos/src/jetstream/templates /srv/templat
 COPY --from=fdbserver-builder /usr/bin /usr/bin
 COPY --from=fdbserver-builder /var/fdb/scripts /var/fdb/scripts
 
-# Install FoundationDB Client Libraries directly here rther than in the fdbserver-builder as the download destination path depends on an external script.
+# Install FoundationDB Client Libraries directly here rather than in the fdbserver-builder as the target destination depends on an external script.
 ARG FDB_VERSION=6.2.15
 ARG FDB_ADDITIONAL_VERSIONS="5.1.7"
 ARG FDB_WEBSITE=https://www.foundationdb.org

From 34fd7cc7f9396df6338cb1a30f562c7d9ad037cb Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 20 Feb 2020 15:51:56 +0000
Subject: [PATCH 415/648] Add support for TLS with MySQL

---
 .../console/templates/deployment.yaml         |  2 +
 deploy/kubernetes/console/values.yaml         |  5 +-
 .../datastore/20190522121200_LocalUsers.go    | 62 +++----------------
 .../20190930092500_LocalUsersTriggerFix.go    |  5 +-
 src/jetstream/datastore/datastore.go          | 31 +++++-----
 src/jetstream/go.mod                          |  2 +-
 src/jetstream/go.sum                          |  4 ++
 7 files changed, 37 insertions(+), 74 deletions(-)

diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index c4632e97ed..abe58b20f0 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -96,6 +96,8 @@ spec:
           value: {{ default "3306" .Values.mariadb.port | quote }}
         - name: DATABASE_PROVIDER
           value: {{ default "mysql" .Values.mariadb.type | quote }}
+        - name: DB_SSL_MODE
+          value: {{ default "false" .Values.mariadb.tls | quote }}
         - name: HTTP_CONNECTION_TIMEOUT_IN_SECS
           value: "10"
         - name: HTTP_CLIENT_TIMEOUT_IN_SECS
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index ef1036bce1..6fcbcf0c73 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -120,13 +120,12 @@ mariadb:
   userPassword:
   # Leave password blank to auto-generate (not needed for external database)
   rootPassword:
-
   # DB Host (when using an external database)
   host:
-
   # Override port (default 3306) (when using an external database)
   port:
-
+  # TLS Mode - can be true, false, skip-verify or preferred
+  tls:
   # Override DB type - default is mysql
   type:
 
diff --git a/src/jetstream/datastore/20190522121200_LocalUsers.go b/src/jetstream/datastore/20190522121200_LocalUsers.go
index 27b34e56b0..e2e964c92f 100644
--- a/src/jetstream/datastore/20190522121200_LocalUsers.go
+++ b/src/jetstream/datastore/20190522121200_LocalUsers.go
@@ -7,6 +7,11 @@ import (
 	"bitbucket.org/liamstask/goose/lib/goose"
 )
 
+// NOTE: This migration script has been modified
+// We originally had a triiger, which is removed in a later migration script
+// This requires a certain level of privilege to create, so it has been removed in this scipt for new installs.
+// Upgrades will still remove the trigger if it exists
+
 func init() {
 	RegisterMigration(20190522121200, "LocalUsers", func(txn *sql.Tx, conf *goose.DBConf) error {
 		binaryDataType := "BYTEA"
@@ -31,34 +36,10 @@ func init() {
 		createLocalUsers += "last_updated  TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, "
 		createLocalUsers += "PRIMARY KEY (user_guid) )"
 
-		//Trigger to update last_updated timestamp
-		createUpdateModifiedTrigger := "CREATE TRIGGER update_last_updated "
-		createUpdateModifiedTrigger += "AFTER UPDATE ON local_users "
-		createUpdateModifiedTrigger += "BEGIN UPDATE local_users SET last_updated = DATETIME('now') WHERE _rowid_ = new._rowid_; "
-		createUpdateModifiedTrigger += "END;"
-
-		//Configure Postgres migration options 
+		//Configure Postgres migration options
 		if strings.Contains(conf.Driver.Name, "postgres") {
 			createLocalUsers += " WITH (OIDS=FALSE);"
-
-			//Postgres requires a trigger function
-			//Create trigger function and generate trigger statement
-			postgresTrigger, err := setupPostgresTrigger(txn)
-			if err != nil {
-				return err
-			}
-			createUpdateModifiedTrigger = postgresTrigger
-
-		} else if strings.Contains(conf.Driver.Name, "mysql") {
-			// MySQL
-			createUpdateModifiedTrigger = "CREATE TRIGGER update_last_updated "
-			createUpdateModifiedTrigger += "AFTER UPDATE ON local_users "
-			createUpdateModifiedTrigger += "FOR EACH ROW BEGIN "
-			createUpdateModifiedTrigger += "UPDATE local_users SET last_updated = NOW() WHERE user_guid = NEW.user_guid; "
-			createUpdateModifiedTrigger += "END;"
-
-			createLocalUsers += ";"
-			} else {
+		} else {
 			createLocalUsers += ";"
 		}
 
@@ -67,11 +48,6 @@ func init() {
 			return err
 		}
 
-		_, err = txn.Exec(createUpdateModifiedTrigger)
-		if err != nil {
-			return err
-		}
-
 		createIndex := "CREATE INDEX local_users_user_guid ON local_users (user_guid);"
 		_, err = txn.Exec(createIndex)
 		if err != nil {
@@ -86,27 +62,3 @@ func init() {
 		return nil
 	})
 }
-
-func setupPostgresTrigger(txn *sql.Tx) (string, error) {
-	
-	createPostgresUpdateModifiedTrigger :=  "CREATE TRIGGER update_trigger "
-	createPostgresUpdateModifiedTrigger +=	"AFTER UPDATE ON local_users FOR EACH ROW "
-	createPostgresUpdateModifiedTrigger +=	"EXECUTE PROCEDURE update_last_modified_time(); "
-
-	postgresTriggerFunction :=	"CREATE OR REPLACE FUNCTION update_last_modified_time() "
-	postgresTriggerFunction +=	"RETURNS trigger AS "
-	postgresTriggerFunction +=	"$BODY$ "
-	postgresTriggerFunction +=	"BEGIN "
-	postgresTriggerFunction +=	"UPDATE local_users "
-	postgresTriggerFunction +=	"SET last_updated = CURRENT_TIMESTAMP WHERE new.user_guid = old.user_guid; "
-	postgresTriggerFunction +=	"RETURN NEW; END; $BODY$ "
-	postgresTriggerFunction +=	"LANGUAGE plpgsql VOLATILE COST 100;"
-
-	_, err := txn.Exec(postgresTriggerFunction)
-	if err != nil {
-		return "", err
-	}
-
-	return createPostgresUpdateModifiedTrigger, err
-}
-
diff --git a/src/jetstream/datastore/20190930092500_LocalUsersTriggerFix.go b/src/jetstream/datastore/20190930092500_LocalUsersTriggerFix.go
index e1d0c209e9..6903ee015b 100644
--- a/src/jetstream/datastore/20190930092500_LocalUsersTriggerFix.go
+++ b/src/jetstream/datastore/20190930092500_LocalUsersTriggerFix.go
@@ -21,7 +21,10 @@ func init() {
 			dropTrigger = "DROP TRIGGER update_trigger ON local_users;"
 		} else if strings.Contains(conf.Driver.Name, "mysql") {
 			// MYSQL
-			dropTrigger = "DROP TRIGGER update_last_updated;"
+			dropTrigger = "DROP TRIGGER IF EXISTS update_last_updated;"
+			// Ignore error - most likely permission bug issue on Mysql
+			txn.Exec(dropTrigger)
+			return nil
 		}
 
 		if len(dropTrigger) > 0 {
diff --git a/src/jetstream/datastore/datastore.go b/src/jetstream/datastore/datastore.go
index e4876e4b11..6905116ba4 100644
--- a/src/jetstream/datastore/datastore.go
+++ b/src/jetstream/datastore/datastore.go
@@ -54,6 +54,7 @@ type DatabaseConfig struct {
 type SSLValidationMode string
 
 const (
+	// PGSQL SSL Modes
 	// SSLDisabled means no checking of SSL
 	SSLDisabled SSLValidationMode = "disable"
 	// SSLRequired requires SSL without validation
@@ -105,12 +106,15 @@ func NewDatabaseConnectionParametersFromConfig(dc DatabaseConfig) (DatabaseConfi
 		if dc.SSLMode == string(SSLDisabled) || dc.SSLMode == string(SSLRequired) ||
 			dc.SSLMode == string(SSLVerifyCA) || dc.SSLMode == string(SSLVerifyFull) {
 			return dc, nil
-		} else {
-			// Invalid SSL mode
-			return dc, fmt.Errorf("Invalid SSL mode: %s", dc.SSLMode)
 		}
+		// Invalid SSL mode
+		return dc, fmt.Errorf("Invalid SSL mode: %s", dc.SSLMode)
 	} else if dc.DatabaseProvider == MYSQL {
-		return dc, nil
+		if dc.SSLMode == "true" || dc.SSLMode == "false" || dc.SSLMode == "skip-verify" || dc.SSLMode == "preferred" {
+			return dc, nil
+		}
+		// Invalid SSL mode
+		return dc, fmt.Errorf("Invalid SSL mode: %s", dc.SSLMode)
 	}
 	return dc, fmt.Errorf("Invalid provider %v", dc)
 }
@@ -268,25 +272,23 @@ func buildConnectionString(dc DatabaseConfig) string {
 }
 
 func buildConnectionStringForMysql(dc DatabaseConfig) string {
-	log.Debug("buildConnectionString")
+	log.Debug("buildConnectionStringForMysql")
 	escapeStr := func(in string) string {
 		return strings.Replace(in, `'`, `\'`, -1)
 	}
 
-	connStr := fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?parseTime=true",
+	connStr := fmt.Sprintf("%s:%%s@tcp(%s:%d)/%s?parseTime=true",
 		escapeStr(dc.Username),
-		escapeStr(dc.Password),
 		dc.Host,
 		dc.Port,
 		escapeStr(dc.Database))
 
-	log.Printf("DB Connection string: %s:*********@tcp(%s:%d)/%s?parseTime=true",
-		escapeStr(dc.Username),
-		dc.Host,
-		dc.Port,
-		escapeStr(dc.Database))
-
-	return connStr
+	if len(dc.SSLMode) > 0 {
+		log.Infof("Setting SSL Mode for mysql: %s", dc.SSLMode)
+		connStr = fmt.Sprintf("%s&tls=%s", connStr, dc.SSLMode)
+	}
+	log.Infof(connStr, "*********")
+	return fmt.Sprintf(connStr, escapeStr(dc.Password))
 }
 
 // Ping - ping the database to ensure the connection/pool works.
@@ -294,6 +296,7 @@ func Ping(db *sql.DB) error {
 	log.Debug("Ping database")
 	err := db.Ping()
 	if err != nil {
+		log.Warn(db.Ping().Error())
 		return fmt.Errorf("Unable to ping the database: %+v", err)
 	}
 
diff --git a/src/jetstream/go.mod b/src/jetstream/go.mod
index 570329df91..06b7801e69 100644
--- a/src/jetstream/go.mod
+++ b/src/jetstream/go.mod
@@ -31,7 +31,7 @@ require (
 	github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 // indirect
 	github.com/elazarl/goproxy/ext v0.0.0-20191011121108-aa519ddbe484 // indirect
 	github.com/fatih/color v1.7.0 // indirect
-	github.com/go-sql-driver/mysql v1.4.1
+	github.com/go-sql-driver/mysql v1.5.0
 	github.com/google/go-querystring v1.0.0 // indirect
 	github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e // indirect
 	github.com/gorilla/context v1.1.1
diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index 9e9247c616..c060d65455 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -260,6 +260,8 @@ github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+
 github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
 github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
+github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
@@ -775,6 +777,8 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 helm.sh/helm/v3 v3.0.0 h1:or/9cs1GgfcTQeEnR2CVJNw893/rmqIG1KsNHmUiSFw=

From 9d97657dcb8ead0552f55c712d4d6cd2c2f10394 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 20 Feb 2020 15:53:43 +0000
Subject: [PATCH 416/648] Tidy mod files

---
 src/jetstream/go.mod |  2 --
 src/jetstream/go.sum | 21 +++++----------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/jetstream/go.mod b/src/jetstream/go.mod
index 570329df91..254fb2996d 100644
--- a/src/jetstream/go.mod
+++ b/src/jetstream/go.mod
@@ -43,7 +43,6 @@ require (
 	github.com/jtolds/gls v4.20.0+incompatible // indirect
 	github.com/kat-co/vala v0.0.0-20170210184112-42e1d8b61f12
 	github.com/labstack/echo v3.3.10+incompatible
-	github.com/labstack/gommon v0.3.0
 	github.com/lunixbochs/vtclean v1.0.0 // indirect
 	github.com/mattn/go-colorable v0.1.4 // indirect
 	github.com/mattn/go-isatty v0.0.10 // indirect
@@ -71,7 +70,6 @@ require (
 	github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec // indirect
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9
-	google.golang.org/appengine v1.6.5
 	gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0
 	gopkg.in/cheggaaa/pb.v1 v1.0.27 // indirect
 	gopkg.in/yaml.v2 v2.2.8
diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index 9e9247c616..7328b2b695 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -148,8 +148,6 @@ github.com/deislabs/oras v0.7.0 h1:RnDoFd3tQYODMiUqxgQ8JxlrlWL0/VMKIKRD01MmNYk=
 github.com/deislabs/oras v0.7.0/go.mod h1:sqMKPG3tMyIX9xwXUBRLhZ24o+uT4y6jgBD2RzUTKDM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/disintegration/imaging v1.6.0 h1:nVPXRUUQ36Z7MNf0O77UzgnOb1mkMMor7lmJMJXc/mA=
-github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ=
 github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
 github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
 github.com/docker/cli v0.0.0-20190506213505-d88565df0c2d h1:qdD+BtyCE1XXpDyhvn0yZVcZOLILdj9Cw4pKu0kQbPQ=
@@ -367,8 +365,6 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3 h1:sHsPfNMAG70QAvKbddQ0uScZCHQoZsT5NykGRCeeeIs=
-github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
 github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a h1:zPPuIq2jAWWPTrGt70eK/BSch+gFAGrNzecsoENgu2o=
 github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
@@ -399,8 +395,6 @@ github.com/kr/pty v1.1.5 h1:hyz3dwM5QLc1Rfoz4FuWJQG5BN7tc6K1MndAUnGpQr4=
 github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 h1:wdTBUArlqtBYGN2Dd4+zsaFxFH0m4iGCHToW10jPX0k=
-github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
 github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a h1:VqeX/fehAB6FtBox0TVYcjOMXGE56INQIfbXegditX4=
 github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
 github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc h1:Ttr4Z3ZrMv4rAXn10UAqOC8ACx+F1omvcyV1a3hRArE=
@@ -481,11 +475,13 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
 github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo=
 github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw=
 github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/gomega v1.8.1 h1:C5Dqfs/LeauYDX0jJXIe2SWmwCbGzx9yF8C8xy3Lh34=
 github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
@@ -542,8 +538,6 @@ github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
-github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 h1:hBSHahWMEgzwRyS6dRpxY0XyjZsHyQ61s084wo5PJe0=
@@ -580,8 +574,6 @@ github.com/tidwall/pretty v1.0.1/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhV
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ulikunitz/xz v0.5.6 h1:jGHAfXawEGZQ3blwU5wnWKQJvAraT7Ftq9EXjnXYgt8=
 github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
-github.com/unrolled/render v1.0.0 h1:XYtvhA3UkpB7PqkvhUFYmpKD55OudoIeygcfus4vcd4=
-github.com/unrolled/render v1.0.0/go.mod h1:tu82oB5W2ykJRVioYsB+IQKcft7ryBr7w12qMBUPyXg=
 github.com/unrolled/render v1.0.1 h1:VDDnQQVfBMsOsp3VaCJszSO0nkBIVEYoPWeRThk9spY=
 github.com/unrolled/render v1.0.1/go.mod h1:gN9T0NhL4Bfbwu8ann7Ry/TGHYfosul+J0obPf6NBdM=
 github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
@@ -637,8 +629,6 @@ golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
-golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 h1:00VmoueYNlNz/aHIilyyQz/MHSqGoWJzpFv/HW8xpzI=
-golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067 h1:KYGJGHOQy8oSi1fDlSpcZF0+juKwk/hEMv5SiwHogR0=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U=
@@ -725,6 +715,7 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
 gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
@@ -773,8 +764,8 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
-gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 helm.sh/helm/v3 v3.0.0 h1:or/9cs1GgfcTQeEnR2CVJNw893/rmqIG1KsNHmUiSFw=
@@ -785,8 +776,6 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
-k8s.io/helm v2.12.3+incompatible h1:wo1cdYjOnr5Z+LFuhtwIJaeQnec6D4gcg2H5UAKzY6w=
-k8s.io/helm v2.12.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
 k8s.io/helm v2.16.1+incompatible h1:L+k810plJlaGWEw1EszeT4deK8XVaKxac1oGcuB+WDc=
 k8s.io/helm v2.16.1+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
 k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=

From 909bbb222e46a9a512c7fb5f8bd4e92e91beace2 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 20 Feb 2020 13:43:45 +0000
Subject: [PATCH 417/648] Fix favourites update bug on mysql

---
 .../userfavorites/userfavoritesstore/favorites-store-db.go      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/jetstream/plugins/userfavorites/userfavoritesstore/favorites-store-db.go b/src/jetstream/plugins/userfavorites/userfavoritesstore/favorites-store-db.go
index 69b6e972cc..723fc5183f 100644
--- a/src/jetstream/plugins/userfavorites/userfavoritesstore/favorites-store-db.go
+++ b/src/jetstream/plugins/userfavorites/userfavoritesstore/favorites-store-db.go
@@ -24,6 +24,8 @@ func InitRepositoryProvider(databaseProvider string) {
 	getFavorites = datastore.ModifySQLStatement(getFavorites, databaseProvider)
 	deleteFavorite = datastore.ModifySQLStatement(deleteFavorite, databaseProvider)
 	saveFavorite = datastore.ModifySQLStatement(saveFavorite, databaseProvider)
+	setMetadata = datastore.ModifySQLStatement(setMetadata, databaseProvider)
+	deleteEndpointFavorite = datastore.ModifySQLStatement(deleteEndpointFavorite, databaseProvider)
 }
 
 // FavoritesDBStore is a DB-backed User Favorites repository

From f6d75e2f8df318fb87cc512e5a814abffd528374 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 20 Feb 2020 16:48:35 +0000
Subject: [PATCH 418/648] Add docs for external db

---
 deploy/kubernetes/console/README.md | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/deploy/kubernetes/console/README.md b/deploy/kubernetes/console/README.md
index 36eb3d6dae..933f0ede2e 100644
--- a/deploy/kubernetes/console/README.md
+++ b/deploy/kubernetes/console/README.md
@@ -79,7 +79,8 @@ The following table lists the configurable parameters of the Stratos Helm chart
 |console.mariadb.userPassword|Password of the user for accessing the database. Leave blank for the built-in database to generate a random password||
 |console.mariadb.rootPassword|Password of the root user for accessing the database. Leave blank for the built-in database to generate a random password||
 |console.mariadb.host|Hostname of the database when using an external db||
-|console.mariadb.port|Port 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 ||
@@ -230,6 +231,29 @@ You can now install Stratos with:
 helm install stratos/console --namespace console --name my-console --set console.tlsSecretName=stratos-tls-secret
 ```
 
+## Using an External Database
+
+You can choose to use Stratos with an external database, rather than deploying a single-node MariaDB instance as part of the Helm install.
+
+To do so, specify `console.mariabdb.external=true` when deploying.
+
+You will also need to specify:
+
+- `console.mariadb.host` as the hostname of the external MariaDB database server
+- `console.mariadb.port` as the port of the external MariaDB database server (defaults to 3306)
+- `console.mariadb.tls` as the TLS mode (default is `false,` use `true` for a TLS connection to the database server)
+- `console.mariadb.database` as the name of the database
+- `console.mariadb.user` as the username to connect to the database server
+- `console.mariadb.userPassword` as the password to connect to the database server
+
+When using an external database server, Stratos expects that you have:
+
+- Created a user that will be used to access the database
+- Created a database for the Stratos tables and data
+- Granted appropriate permissions so that the user can access the database
+
+> Note: When using a database from a Cloud provider, ensure that the username is correct - in some cases this will be `username@servername` - check the provided connection documentation
+
 ## Specifying UAA configuration
 
 When deploying with SCF, the `scf-config-values.yaml` (see [SCF Wiki link](https://github.com/SUSE/scf/wiki/How-to-Install-SCF#configuring-the-deployment)) can be supplied when installing Stratos.

From 9ac57dfdc2095ce28d4e033a3ec5867685256a1c Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Thu, 20 Feb 2020 17:09:27 +0000
Subject: [PATCH 419/648] Fix for other dbs

---
 .../datastore/20190930092500_LocalUsersTriggerFix.go          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/jetstream/datastore/20190930092500_LocalUsersTriggerFix.go b/src/jetstream/datastore/20190930092500_LocalUsersTriggerFix.go
index 6903ee015b..d8c2337a17 100644
--- a/src/jetstream/datastore/20190930092500_LocalUsersTriggerFix.go
+++ b/src/jetstream/datastore/20190930092500_LocalUsersTriggerFix.go
@@ -14,11 +14,11 @@ func init() {
 
 		if strings.Contains(conf.Driver.Name, "sqlite") {
 			//SQLITE
-			dropTrigger = "DROP TRIGGER update_last_updated;"
+			dropTrigger = "DROP TRIGGER IF EXISTS update_last_updated;"
 		}
 		if strings.Contains(conf.Driver.Name, "postgres") {
 			// POSTGRESQL
-			dropTrigger = "DROP TRIGGER update_trigger ON local_users;"
+			dropTrigger = "DROP TRIGGER IF EXISTS update_trigger ON local_users;"
 		} else if strings.Contains(conf.Driver.Name, "mysql") {
 			// MYSQL
 			dropTrigger = "DROP TRIGGER IF EXISTS update_last_updated;"

From 61b3ce23b626a3702cce891f9538a94e3ef9feff Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Thu, 20 Feb 2020 17:14:05 +0000
Subject: [PATCH 420/648] Add FDB, FDB Document Layer and Chart Repo service to
 Stratos AIO image

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 deploy/Dockerfile.all-in-one                  | 73 +++++++++++++------
 deploy/aio-entrypoint.sh                      | 22 ++++++
 .../monocular/fdb-doclayer/fdbdoc.bash        | 16 ++--
 3 files changed, 80 insertions(+), 31 deletions(-)

diff --git a/deploy/Dockerfile.all-in-one b/deploy/Dockerfile.all-in-one
index 88237defac..ac47947234 100644
--- a/deploy/Dockerfile.all-in-one
+++ b/deploy/Dockerfile.all-in-one
@@ -6,21 +6,12 @@ COPY --chown=stratos:users . ./
 COPY --chown=stratos:users deploy/tools/generate_cert.sh generate_cert.sh
 COPY --chown=stratos:users deploy/all-in-one/config.all-in-one.properties config.properties
 
-ARG USE_PREBUILT_UI=true
+ARG USE_PREBUILT_UI=false
 
-# RUN npm install \
-#     && npm run build \
-#     && npm run build-backend \
-#     && cp src/jetstream/jetstream . \
-#     && mv dist ui
 USER root
 RUN zypper install -y unzip
 USER stratos
 
-# USER root
-# RUN curl https://download.opensuse.org/repositories/openSUSE:/Leap:/15.1/standard/x86_64/unzip-6.00-lp151.5.1.x86_64.rpm -o unzip.rpm && zypper install unzip.rpm
-# USER stratos
-
 RUN if [ $USE_PREBUILT_UI = "true" ] ; then \
     unzip stratos-frontend-prebuild.zip -d ./dist \
     && npm run build-backend \
@@ -38,16 +29,11 @@ RUN if [ $USE_PREBUILT_UI = "true" ] ; then \
 RUN CERTS_PATH=/home/stratos/dev-certs ./generate_cert.sh \
     && chmod +x jetstream
 
-# TODO Kate ##########################################################################################
-# Add fdbdoclayer, fdbserver and chart repo as additional builders here, then below use copy from builder to add the necessary parts to the final image
-# Config properties for jetstream will need to 
-# have env vars for the chart repo and fdbdoclayer localhost URLS, so that jetstream can access them.
-
+# Docker build for FDB Server component
 FROM splatform/stratos-bk-build-base:leap15_1 as fdbserver-builder
 
 
 # Install FoundationDB Binaries
-
 ARG FDB_VERSION=6.2.15
 ARG FDB_WEBSITE=https://www.foundationdb.org
 
@@ -79,7 +65,25 @@ COPY deploy/containers/monocular/fdb-server/configure_db.bash scripts/
 RUN chmod u+x scripts/*.bash && \
 	mkdir -p logs
 
-#####################################################################
+# Docker build for FDB Document Layer component
+FROM splatform/stratos-bk-build-base:leap15_1 as fdbdoclayer-builder
+
+# Install FoundationDB Document Layer Binaries
+ARG FDB_DOC_VERSION=1.6.3
+ARG FDB_WEBSITE=https://www.foundationdb.org
+
+WORKDIR /home/stratos
+RUN curl $FDB_WEBSITE/downloads/$FDB_DOC_VERSION/linux/fdb-document-layer-$FDB_DOC_VERSION-Linux.tar.gz -o fdb-document-layer-$FDB_DOC_VERSION-Linux.tar.gz && \
+    tar -xvf fdb-document-layer-$FDB_DOC_VERSION-Linux.tar.gz && \
+    mv fdb-document-layer-$FDB_DOC_VERSION-Linux doclayer
+ 
+# Docker build for Chart Repo component
+FROM splatform/stratos-bk-build-base:leap15_1 as chartrepo-builder
+
+COPY --chown=stratos:users src/jetstream/plugins/monocular/chart-repo /go/src/github.com/helm/monocular
+WORKDIR /go/src/github.com/helm/monocular
+ARG VERSION
+RUN GO111MODULE=on GOPROXY=https://gocenter.io CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-X main.version=$VERSION" .
 
 # use --target=aio to build All-in-one image
 FROM splatform/stratos-bk-base:leap15_1
@@ -93,16 +97,16 @@ COPY --from=jetstream-builder /home/stratos/config.properties /srv/config.proper
 # User Invite templates
 COPY --from=jetstream-builder /home/stratos/src/jetstream/templates /srv/templates
 
-# Pull in binaries and config from fdbserver-builder
+# Pull in binaries from fdbserver-builder
 COPY --from=fdbserver-builder /usr/bin /usr/bin
 COPY --from=fdbserver-builder /var/fdb/scripts /var/fdb/scripts
 
-# Install FoundationDB Client Libraries directly here rather than in the fdbserver-builder as the target destination depends on an external script.
+# Install FoundationDB Client Libraries directly here rather than in the fdbserver-builder, as the install destination depends on an external script.
 ARG FDB_VERSION=6.2.15
 ARG FDB_ADDITIONAL_VERSIONS="5.1.7"
 ARG FDB_WEBSITE=https://www.foundationdb.org
 RUN mkdir -p /mnt/website
-RUN curl $FDB_WEBSITE/downloads/$FDB_VERSION/linux/libfdb_c_$FDB_VERSION.so -o /usr/lib/libfdb_c.so && \
+RUN curl $FDB_WEBSITE/downloads/$FDB_VERSION/linux/libfdb_c_$FDB_VERSION.so -o /usr/lib64/libfdb_c.so && \
 	bash /var/fdb/scripts/download_multiversion_libraries.bash $FDB_WEBSITE $FDB_ADDITIONAL_VERSIONS && \
 	rm -rf /mnt/website
 VOLUME /var/fdb/data
@@ -112,10 +116,33 @@ ENV FDB_PORT 4500
 ENV FDB_CLUSTER_FILE /var/fdb/fdb.cluster
 # Set to networking mode to host, since all processes will be running in this single container
 ENV FDB_NETWORKING_MODE host
-ENV FDB_COORDINATOR ""
 ENV FDB_COORDINATOR_PORT 4500
-ENV FDB_CLUSTER_FILE_CONTENTS ""
 ENV FDB_PROCESS_CLASS unset
+ENV CLUSTER_ID docker:docker
+
+# Pull in binaries from fdbdoclayer-builder
+COPY --from=fdbdoclayer-builder /home/stratos/doclayer/bin/fdbdoc /usr/bin/fdbdoc
+COPY --from=fdbdoclayer-builder /home/stratos/doclayer/lib/foundationdb/document/fdbmonitor /usr/bin/fdbmonitor
+# Bring in doclayer startup script
+COPY deploy/containers/monocular/fdb-doclayer/fdbdoc.bash /var/fdb/scripts
+RUN chmod u+x /var/fdb/scripts/fdbdoc.bash
+
+# Doclayer startup script dependency
+RUN zypper install -y bind-utils
+
+# Document layer runtime var
+ENV FDB_COORDINATOR localhost
+ENV FDB_DOC_PORT 27016
+
+# Pull in binaries from chartrepo-builder
+COPY --from=chartrepo-builder /go/src/github.com/helm/monocular/chartrepo /chartrepo
+
+ENV HELM_FDB_URL mongodb://localhost:${FDB_DOC_PORT}
+ENV HELM_SYNC_SERVER_URL http://localhost:8080
+
+# TODO Kate ##########################################################################################
+# Config properties for jetstream will need to 
+# have env vars for the chart repo and fdbdoclayer localhost URLS, so that jetstream can access them.
 
 # Enable persistence features if canary build flag is set
 RUN if [ "x$CANARY_BUILD" != "x" ] ; then printf "\nFORCE_ENABLE_PERSISTENCE_FEATURES=true\n" >> /srv/config.properties ; fi
@@ -130,4 +157,4 @@ USER root
 
 COPY deploy/aio-entrypoint.sh .
 RUN chmod +x ./aio-entrypoint.sh
-ENTRYPOINT ["./aio-entrypoint.sh"]
+ENTRYPOINT ["bash", "-c", "./aio-entrypoint.sh -u mongodb://localhost:${FDB_DOC_PORT}"]
diff --git a/deploy/aio-entrypoint.sh b/deploy/aio-entrypoint.sh
index 3dc5c11745..939eea2a85 100644
--- a/deploy/aio-entrypoint.sh
+++ b/deploy/aio-entrypoint.sh
@@ -1,4 +1,26 @@
 #!/bin/bash
 
+while getopts ":u:" opt; do
+  case ${opt} in
+    u )
+        doclayer=$OPTARG
+      ;;
+    \? ) echo "Invalid option: $OPTARG" 1>&2
+      ;;
+    : )
+      echo "$OPTARG requires a value set to the URL of the document layer." 1>&2
+      ;;
+  esac
+done
+shift $((OPTIND -1))
+
+if [ -z "$doclayer" ];
+then
+    echo "--doclayer-url must be set." >&2
+    exit 1
+fi
+
 /var/fdb/scripts/fdb.bash &
+/var/fdb/scripts/fdbdoc.bash &
+/chartrepo serve --doclayer-url=$doclayer &
 ./jetstream
\ No newline at end of file
diff --git a/deploy/containers/monocular/fdb-doclayer/fdbdoc.bash b/deploy/containers/monocular/fdb-doclayer/fdbdoc.bash
index f610e609e3..07f2c59028 100755
--- a/deploy/containers/monocular/fdb-doclayer/fdbdoc.bash
+++ b/deploy/containers/monocular/fdb-doclayer/fdbdoc.bash
@@ -8,20 +8,20 @@ function setup_cluster_file() {
 		echo "FDB coordinator: $FDB_COORDINATOR"
 		coordinator_ip=$(dig +short +search $FDB_COORDINATOR)
 		echo "Coordinator IP: $coordinator_ip"
-                if [[ -z "$coordinator_ip" ]]; then
-                        echo "Failed to look up coordinator address for $FDB_COORDINATOR" 1>&2
-                        exit 1
-                fi
+			if [[ -z "$coordinator_ip" ]]; then
+					echo "Failed to look up coordinator address for $FDB_COORDINATOR" 1>&2
+					exit 1
+			fi
                 coordinator_port=${FDB_COORDINATOR_PORT:-4500}
 		if [[ -z $CLUSTER_ID ]]; then
 			echo "CLUSTER_ID environment variable not defined" 1>&2
                 	exit 1
 		fi
                 echo "$CLUSTER_ID@$coordinator_ip:$coordinator_port" > $FDB_CLUSTER_FILE
-        else
-                echo "FDB_COORDINATOR environment variable not defined" 1>&2
-                exit 1
-        fi
+	else
+			echo "FDB_COORDINATOR environment variable not defined" 1>&2
+			exit 1
+	fi
 
 
     if [ ! -f ${FDB_CLUSTER_FILE} ]; then

From b0c023e369387f608f450e30c32126ca14a2338a Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 20 Feb 2020 17:15:48 +0000
Subject: [PATCH 421/648] Fixes for upgrades and other Helm chart issues

---
 .../deploy/kubernetes/customize-helm.sh       |  3 +-
 .../fdb-doc-layer-networkpolicy.yaml          |  0
 .../fdb-server}/fdbserver-networkpolicy.yaml  |  0
 deploy/db/mariadb-entrypoint.sh               | 52 +++++++++++++++++--
 deploy/kubernetes/build.sh                    |  2 +-
 .../templates/fdbserver-deployment.yaml       |  2 +-
 6 files changed, 53 insertions(+), 6 deletions(-)
 rename deploy/{kubernetes/console/templates/local-helm/fdbdoclayer/templates => containers/monocular/fdb-doclayer}/fdb-doc-layer-networkpolicy.yaml (100%)
 rename deploy/{kubernetes/console/templates/local-helm/fdbdoclayer/templates => containers/monocular/fdb-server}/fdbserver-networkpolicy.yaml (100%)

diff --git a/custom-src/deploy/kubernetes/customize-helm.sh b/custom-src/deploy/kubernetes/customize-helm.sh
index d7ef8c7cd3..b93e476ebb 100755
--- a/custom-src/deploy/kubernetes/customize-helm.sh
+++ b/custom-src/deploy/kubernetes/customize-helm.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-CHART_PATH=$1
+STRATOS_PATH=$1
+CHART_PATH=$2
 
 # Script folder
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-networkpolicy.yaml b/deploy/containers/monocular/fdb-doclayer/fdb-doc-layer-networkpolicy.yaml
similarity index 100%
rename from deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-networkpolicy.yaml
rename to deploy/containers/monocular/fdb-doclayer/fdb-doc-layer-networkpolicy.yaml
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-networkpolicy.yaml b/deploy/containers/monocular/fdb-server/fdbserver-networkpolicy.yaml
similarity index 100%
rename from deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-networkpolicy.yaml
rename to deploy/containers/monocular/fdb-server/fdbserver-networkpolicy.yaml
diff --git a/deploy/db/mariadb-entrypoint.sh b/deploy/db/mariadb-entrypoint.sh
index 11948b80b2..c76b357475 100755
--- a/deploy/db/mariadb-entrypoint.sh
+++ b/deploy/db/mariadb-entrypoint.sh
@@ -96,9 +96,8 @@ reset_passwords() {
 	"${mysql[@]}"  <<-EOSQL
 	FLUSH PRIVILEGES;
 	ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}';
-	ALTER USER 'root'@'%' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}';
 	ALTER USER '$MYSQL_USER'@'%' IDENTIFIED BY '${MYSQL_PASSWORD}';
-	FLUSH PRIVILEGES ;
+	FLUSH PRIVILEGES;
 EOSQL
 
 	if ! kill -s TERM "$pid" || ! wait "$pid"; then
@@ -110,6 +109,40 @@ EOSQL
 	echo "[Password Change] Passwords updated okay"
 }
 
+upgrade_database() {
+	mysqld --skip-grant-tables --skip-networking --socket="${SOCKET}" &
+	pid="$!"
+
+	mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
+	for i in {30..0}; do
+		if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
+			break
+		fi
+		echo '[Upgrade] MySQL startup in progress...'
+		sleep 1
+	done
+	if [ "$i" = 0 ]; then
+		echo >&2 '[Upgrade] MySQL startup failed.'
+		exit 1
+	fi
+
+	echo '[Upgrade] MySQL ready for upgrade ...'
+
+	# Change the root password so that we can log in afetr the upgrade
+	#echo "UPDATE mysql.user SET Password=PASSWORD('root') WHERE USER='root';" | "${mysql[@]}"
+	echo "UPDATE mysql.user SET host='localhost' WHERE USER='root';" | "${mysql[@]}"
+
+	mysql_upgrade "${@:2}"
+
+	if ! kill -s TERM "$pid" || ! wait "$pid"; then
+		echo >&2 '[Upgrade ] MySQL => DB upgrade failed.'
+		echo "[Upgrade] Failed"
+		exit 1
+	fi
+
+	echo "[Upgrade] DB upgraded OK"
+}
+
 # allow the container to be started with `--user`
 if [ "$1" = 'mysqld' -a -z "$wantHelp" -a "$(id -u)" = '0' ]; then
 	_check_config "$@"
@@ -188,7 +221,8 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 
 		rootCreate=
 		# default root to listen for connections from anywhere
-		file_env 'MYSQL_ROOT_HOST' '%'
+		#file_env 'MYSQL_ROOT_HOST' '%'
+		file_env 'MYSQL_ROOT_HOST' 'localhost'
 		if [ ! -z "$MYSQL_ROOT_HOST" -a "$MYSQL_ROOT_HOST" != 'localhost' ]; then
 			# no, we don't care if read finds a terminating character in this heredoc
 			# https://unix.stackexchange.com/questions/265149/why-is-set-o-errexit-breaking-this-read-heredoc-expression/265151#265151
@@ -250,9 +284,21 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 		echo
 		echo 'MySQL init process done. Ready for start up.'
 		echo
+	else
+		echo "Data directory already exists..."
+		# Data folder already exists, so check for marker file		
+		if [ ! -f "$DATADIR/.stratos_10.2" ]; then
+			echo "Upgrading database to 10.2 ...."
+			upgrade_database
+		else
+			echo "No need to upgrade - upgrade has already been applied"
+		fi
 	fi
 fi
 
+# Touch marker file to record that we have upgraded to 10.2
+touch "$DATADIR/.stratos_10.2"
+
 if [ "${RESET_PASSWORDS}" == "true" ]; then
 	echo "Resetting passwords ..."
   reset_passwords
diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
index 76cb3e03af..8ec8d59bad 100755
--- a/deploy/kubernetes/build.sh
+++ b/deploy/kubernetes/build.sh
@@ -234,7 +234,7 @@ rm -rf ${DEST_HELM_CHART_PATH}/**/*.orig
 # Run customization script if there is one
 if [ -f "${STRATOS_PATH}/custom-src/deploy/kubernetes/customize-helm.sh" ]; then
   printf "${YELLOW}${BOLD}Applying Helm Chart customizations${RESET}\n"
-  ${STRATOS_PATH}/custom-src/deploy/kubernetes/customize-helm.sh "${STRATOS_PATH}"
+  ${STRATOS_PATH}/custom-src/deploy/kubernetes/customize-helm.sh "${STRATOS_PATH}" "${DEST_HELM_CHART_PATH}"
 fi
 
 # Fetch subcharts
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
index d74ffa10d6..276fbf0769 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
@@ -34,7 +34,7 @@ spec:
         imagePullPolicy: {{.Values.imagePullPolicy}}
         env:
         - name: FDB_COORDINATOR
-          value: {{ .Release.Name }}-fdbserver.console.svc.cluster.local
+          value: {{ .Release.Name }}-fdbserver.{{ .Release.Namespace }}.svc.cluster.local
         - name: CLUSTER_ID
           value: chartdb:erlklkg
         ports:

From 7b3e97a7c6cd8846a22e3cd58d85a9cebf47c227 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Thu, 20 Feb 2020 17:16:25 +0000
Subject: [PATCH 422/648] Initial work on adding a wait for chart repo before
 initing Helm sync

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 .../chart-repo/foundationdb/utils.go          | 10 ++---
 src/jetstream/plugins/monocular/sync.go       | 41 +++++++++++++++++--
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
index 7cf042832f..9977617cd8 100644
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
@@ -194,7 +194,7 @@ func SyncRepo(dbClient Client, dbName, repoName, repoURL string, authorizationHe
 		repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusFailed})
 		return err
 	}
-	log.WithFields(log.Fields{"url": repoURL}).Info("Stored repository update in cache")
+	log.WithFields(log.Fields{"Repository": repoName, "URL": repoURL}).Info("Synchronized successfully: ")
 	repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusSynced})
 	return nil
 }
@@ -343,7 +343,7 @@ func importWorker(db Database, wg *sync.WaitGroup, icons <-chan common.Chart, ch
 
 func fetchAndImportIcon(db Database, c common.Chart) error {
 	if c.Icon == "" {
-		log.WithFields(log.Fields{"name": c.Name}).Info("icon not found")
+		log.WithFields(log.Fields{"name": c.Name}).Debug("icon not found")
 		return nil
 	}
 
@@ -460,17 +460,17 @@ func fetchAndImportFiles(db Database, name string, r common.Repo, cv common.Char
 	if v, ok := files[readmeFileName]; ok {
 		chartFiles.Readme = v
 	} else {
-		log.WithFields(log.Fields{"name": name, "version": cv.Version}).Info("README.md not found")
+		log.WithFields(log.Fields{"name": name, "version": cv.Version}).Debug("README.md not found")
 	}
 	if v, ok := files[valuesFileName]; ok {
 		chartFiles.Values = v
 	} else {
-		log.WithFields(log.Fields{"name": name, "version": cv.Version}).Info("values.yaml not found")
+		log.WithFields(log.Fields{"name": name, "version": cv.Version}).Debug("values.yaml not found")
 	}
 	if v, ok := files[schemaFileName]; ok {
 		chartFiles.Schema = v
 	} else {
-		log.WithFields(log.Fields{"name": name, "version": cv.Version}).Info("values.schema.json not found")
+		log.WithFields(log.Fields{"name": name, "version": cv.Version}).Debug("values.schema.json not found")
 	}
 
 	// inserts the chart files if not already indexed, or updates the existing
diff --git a/src/jetstream/plugins/monocular/sync.go b/src/jetstream/plugins/monocular/sync.go
index 64ab8182e2..e837bcd2ac 100644
--- a/src/jetstream/plugins/monocular/sync.go
+++ b/src/jetstream/plugins/monocular/sync.go
@@ -26,9 +26,10 @@ type SyncMetadata struct {
 }
 
 const (
-	chartRepoPathPrefix = "/v1"
-	statusPollInterval  = 30
-	statusPollTimeout   = 320
+	chartRepoPathPrefix        = "/v1"
+	statusPollInterval         = 30
+	statusPollTimeout          = 320
+	syncServiceTimeoutBoundary = 10
 )
 
 // Sync Channel
@@ -50,9 +51,43 @@ func (m *Monocular) Sync(action interfaces.EndpointAction, endpoint *interfaces.
 	syncChan <- job
 }
 
+func waitForSyncService(syncServiceURL string) error {
+	// Ensure that the database is responsive
+	for {
+
+		// establish an outer timeout boundary
+		timeout := time.Now().Add(time.Minute * syncServiceTimeoutBoundary)
+
+		// Ping the database
+		statusURL := fmt.Sprintf("%s%s/status/%s", syncServiceURL, chartRepoPathPrefix, "none")
+		resp, err := http.Get(statusURL)
+		log.Infof("Chart Repo ping test: %v, %v.", resp.Status, resp.Body)
+		defer resp.Body.Close()
+		if err == nil {
+			log.Info("Chart Repo appears to now be available.")
+			break
+		}
+
+		// If our timeout boundary has been exceeded, bail out
+		if timeout.Sub(time.Now()) < 0 {
+			return fmt.Errorf("timeout boundary of %d minutes has been exceeded.", syncServiceTimeoutBoundary)
+		}
+
+		// Circle back and try again
+		log.Infof("Waiting for Chart Repo to be responsive: %+v", err)
+		time.Sleep(time.Second)
+	}
+	return nil
+}
+
 func (m *Monocular) processSyncRequests() {
 	log.Info("Helm Repository Sync init")
 	for job := range syncChan {
+		err := waitForSyncService(m.SyncServiceURL)
+		if err != nil {
+			log.Errorf("Unable to process sync request for %v. Chart Repo not available after %v minutes. %v", job.Endpoint.Name, syncServiceTimeoutBoundary, err)
+			continue
+		}
 		log.Debugf("Processing Helm Repository Sync Job: %s", job.Endpoint.Name)
 		var repoSyncRequestParams string = fmt.Sprintf("{\"repoURL\":%q}", job.Endpoint.APIEndpoint.String())
 		// Could be delete or sync

From 94ec502adb7ae9dc2a204a15c9b8773daffe7a3e Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 20 Feb 2020 22:33:16 +0000
Subject: [PATCH 423/648] Backend unit test fix

---
 src/jetstream/main_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jetstream/main_test.go b/src/jetstream/main_test.go
index 34e989f2af..1d0ff4e15f 100644
--- a/src/jetstream/main_test.go
+++ b/src/jetstream/main_test.go
@@ -130,7 +130,7 @@ func TestLoadDatabaseConfig(t *testing.T) {
 		"DB_HOST":                    "localhost",
 		"DB_PORT":                    "5432",
 		"DB_CONNECT_TIMEOUT_IN_SECS": "5",
-		"DB_SSL_MODE":                "disable",
+		"DB_SSL_MODE":                "false",
 	})))
 
 	if err != nil {

From 657ee827755833f70f59ef23c1e6c14fca2d910d Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Fri, 21 Feb 2020 08:12:05 +0000
Subject: [PATCH 424/648] Remove debug log stmt

---
 src/jetstream/datastore/datastore.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/jetstream/datastore/datastore.go b/src/jetstream/datastore/datastore.go
index 6905116ba4..d0561b0fe9 100644
--- a/src/jetstream/datastore/datastore.go
+++ b/src/jetstream/datastore/datastore.go
@@ -296,7 +296,6 @@ func Ping(db *sql.DB) error {
 	log.Debug("Ping database")
 	err := db.Ping()
 	if err != nil {
-		log.Warn(db.Ping().Error())
 		return fmt.Errorf("Unable to ping the database: %+v", err)
 	}
 

From d1148ab7d067bdca8dbfa1d4a685ca395c1a212e Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Fri, 21 Feb 2020 08:13:12 +0000
Subject: [PATCH 425/648] Remove duplicate yaml

---
 src/jetstream/go.sum | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index f91e3e009f..1cab656957 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -768,8 +768,6 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 helm.sh/helm/v3 v3.0.0 h1:or/9cs1GgfcTQeEnR2CVJNw893/rmqIG1KsNHmUiSFw=

From a8e0296651355b0b8d64c8f0313bd8914ac1fc3f Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 21 Feb 2020 12:33:51 +0000
Subject: [PATCH 426/648] Hide required markers on login page

---
 .../frontend/app/custom/suse-login/suse-login.component.html  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/custom-src/frontend/app/custom/suse-login/suse-login.component.html b/custom-src/frontend/app/custom/suse-login/suse-login.component.html
index d8e7ee82f0..37525447fb 100644
--- a/custom-src/frontend/app/custom/suse-login/suse-login.component.html
+++ b/custom-src/frontend/app/custom/suse-login/suse-login.component.html
@@ -11,10 +11,10 @@ <h1 class="suse-login__headline">SUSE<br>Stratos<br>Console</h1>
       <div *ngIf="!ssoLogin" class="suse-login__form-title">Sign in</div>
       <div class="suse-login__form-outer">
         <form class="suse-login__form" name="loginForm" (ngSubmit)="login()" #loginForm="ngForm">
-          <mat-form-field *ngIf="!ssoLogin">
+          <mat-form-field *ngIf="!ssoLogin" [hideRequiredMarker]="true">
             <input matInput required [(ngModel)]="username" name="username" placeholder="Username">
           </mat-form-field>
-          <mat-form-field *ngIf="!ssoLogin">
+          <mat-form-field *ngIf="!ssoLogin" [hideRequiredMarker]="true">
             <input matInput required type="password" [(ngModel)]="password" name="password" placeholder="Password">
           </mat-form-field>
           <button class="suse-login__submit" color="primary" *ngIf="!loggedIn" type="submit" mat-button mat-raised-button

From 490573474abb463d58a7c36ceb31088c927d63cd Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Fri, 21 Feb 2020 13:38:50 +0000
Subject: [PATCH 427/648] Wait for Document Layer to come up before syncing
 Helm repos. Rename env vars to remove helm reference, adjust log statement
 levels for sync service to warn when charts are missing icons or schema
 files.

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 deploy/Dockerfile.all-in-one                  | 38 +++++++------------
 .../all-in-one/config.all-in-one.properties   |  4 +-
 .../console/templates/deployment.yaml         |  4 +-
 .../templates/fdb-doc-layer-deployment.yaml   |  2 +-
 .../chart-repo/common/chart_utils.go          |  3 +-
 .../chart-repo/foundationdb/utils.go          | 10 ++---
 src/jetstream/plugins/monocular/main.go       |  4 +-
 src/jetstream/plugins/monocular/sync.go       | 29 +++++++-------
 8 files changed, 45 insertions(+), 49 deletions(-)

diff --git a/deploy/Dockerfile.all-in-one b/deploy/Dockerfile.all-in-one
index ac47947234..915ffa42d6 100644
--- a/deploy/Dockerfile.all-in-one
+++ b/deploy/Dockerfile.all-in-one
@@ -9,11 +9,9 @@ COPY --chown=stratos:users deploy/all-in-one/config.all-in-one.properties config
 ARG USE_PREBUILT_UI=false
 
 USER root
-RUN zypper install -y unzip
-USER stratos
-
 RUN if [ $USE_PREBUILT_UI = "true" ] ; then \
-    unzip stratos-frontend-prebuild.zip -d ./dist \
+    zypper install -y unzip \
+    && unzip stratos-frontend-prebuild.zip -d ./dist \
     && npm run build-backend \
     && cp src/jetstream/jetstream . \
 	&& mv dist ui ; \
@@ -24,10 +22,11 @@ RUN if [ $USE_PREBUILT_UI = "true" ] ; then \
         && cp  src/jetstream/jetstream . \
         && mv dist ui ; \
     fi
+USER stratos
 
 # Generate dev-certs
-RUN CERTS_PATH=/home/stratos/dev-certs ./generate_cert.sh \
-    && chmod +x jetstream
+RUN CERTS_PATH=/home/stratos/dev-certs ./generate_cert.sh
+#    && chmod +x jetstream
 
 # Docker build for FDB Server component
 FROM splatform/stratos-bk-build-base:leap15_1 as fdbserver-builder
@@ -92,6 +91,7 @@ COPY --from=jetstream-builder /home/stratos/deploy/db /src/deploy/db
 COPY --from=jetstream-builder /home/stratos/dev-certs /srv/dev-certs
 COPY --from=jetstream-builder /home/stratos/ui /srv/ui
 COPY --from=jetstream-builder /home/stratos/jetstream /srv/jetstream
+RUN chmod +x /srv/jetstream
 COPY --from=jetstream-builder /home/stratos/config.properties /srv/config.properties
 
 # User Invite templates
@@ -111,14 +111,6 @@ RUN curl $FDB_WEBSITE/downloads/$FDB_VERSION/linux/libfdb_c_$FDB_VERSION.so -o /
 	rm -rf /mnt/website
 VOLUME /var/fdb/data
 RUN mkdir -p /var/fdb/logs
-# FDB runtime vars
-ENV FDB_PORT 4500
-ENV FDB_CLUSTER_FILE /var/fdb/fdb.cluster
-# Set to networking mode to host, since all processes will be running in this single container
-ENV FDB_NETWORKING_MODE host
-ENV FDB_COORDINATOR_PORT 4500
-ENV FDB_PROCESS_CLASS unset
-ENV CLUSTER_ID docker:docker
 
 # Pull in binaries from fdbdoclayer-builder
 COPY --from=fdbdoclayer-builder /home/stratos/doclayer/bin/fdbdoc /usr/bin/fdbdoc
@@ -126,24 +118,22 @@ COPY --from=fdbdoclayer-builder /home/stratos/doclayer/lib/foundationdb/document
 # Bring in doclayer startup script
 COPY deploy/containers/monocular/fdb-doclayer/fdbdoc.bash /var/fdb/scripts
 RUN chmod u+x /var/fdb/scripts/fdbdoc.bash
-
 # Doclayer startup script dependency
 RUN zypper install -y bind-utils
-
-# Document layer runtime var
+# FoundationDB environment variables
+ENV FDB_PORT 4500
+ENV FDB_CLUSTER_FILE /var/fdb/fdb.cluster
+# Set to host, since all processes run in single container
+ENV FDB_NETWORKING_MODE host 
+ENV FDB_COORDINATOR_PORT 4500
+ENV FDB_PROCESS_CLASS unset
+ENV CLUSTER_ID docker:docker
 ENV FDB_COORDINATOR localhost
 ENV FDB_DOC_PORT 27016
 
 # Pull in binaries from chartrepo-builder
 COPY --from=chartrepo-builder /go/src/github.com/helm/monocular/chartrepo /chartrepo
 
-ENV HELM_FDB_URL mongodb://localhost:${FDB_DOC_PORT}
-ENV HELM_SYNC_SERVER_URL http://localhost:8080
-
-# TODO Kate ##########################################################################################
-# Config properties for jetstream will need to 
-# have env vars for the chart repo and fdbdoclayer localhost URLS, so that jetstream can access them.
-
 # Enable persistence features if canary build flag is set
 RUN if [ "x$CANARY_BUILD" != "x" ] ; then printf "\nFORCE_ENABLE_PERSISTENCE_FEATURES=true\n" >> /srv/config.properties ; fi
 
diff --git a/deploy/all-in-one/config.all-in-one.properties b/deploy/all-in-one/config.all-in-one.properties
index 632f685de3..aab49027df 100644
--- a/deploy/all-in-one/config.all-in-one.properties
+++ b/deploy/all-in-one/config.all-in-one.properties
@@ -13,4 +13,6 @@ ENCRYPTION_KEY=B374A26A71490437AA024E4FADD5B497FDFF1A8EA6FF12F6FB65AF2720B59CCF
 STRATOS_DEPLOYMENT_DOCKER_AIO=true
 SKIP_SSL_VALIDATION=true
 SQLITE_KEEP_DB=true
-TEMPLATE_DIR=./templates
\ No newline at end of file
+TEMPLATE_DIR=./templates
+FDB_URL=mongodb://localhost:27016
+SYNC_SERVER_URL=http://localhost:8080
\ No newline at end of file
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 52c98a511f..dd224e34e8 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -261,9 +261,9 @@ spec:
         - name: MONOCULAR_CA_CRT_PATH
           value: "/etc/monocular-certs/ca.crt"
         {{- end }}
-        - name: HELM_FDB_URL
+        - name: FDB_URL
           value: "mongodb://{{ .Release.Name }}-{{ .Values.fdbdoclayer.service.name }}:{{ .Values.fdbdoclayer.service.port }}"
-        - name: HELM_SYNC_SERVER_URL
+        - name: SYNC_SERVER_URL
           value: "http://{{ .Release.Name }}-{{ .Values.chartrepo.service.name }}:{{ .Values.chartrepo.service.port }}"
         readinessProbe:
           httpGet:
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
index 22133a5ffd..92f34fe7c4 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
@@ -35,7 +35,7 @@ spec:
         env:
         - name: FDB_COORDINATOR
           value: {{ .Release.Name }}-fdbserver
-        - name: CLUSTER_ID
+        - name: CLUSTER_ID 
           value: chartdb:erlklkg
         - name: ENABLE_TLS
           value: {{ .Values.fdbdoclayer.tls  | quote }}
diff --git a/src/jetstream/plugins/monocular/chart-repo/common/chart_utils.go b/src/jetstream/plugins/monocular/chart-repo/common/chart_utils.go
index 7aa5d6c097..0a7298c0e2 100644
--- a/src/jetstream/plugins/monocular/chart-repo/common/chart_utils.go
+++ b/src/jetstream/plugins/monocular/chart-repo/common/chart_utils.go
@@ -26,7 +26,6 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"github.com/helm/monocular/chartrepo/utils"
 	"net/http"
 	"net/url"
 	"os"
@@ -34,6 +33,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/helm/monocular/chartrepo/utils"
+
 	"github.com/ghodss/yaml"
 	"github.com/jinzhu/copier"
 	log "github.com/sirupsen/logrus"
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
index 9977617cd8..fb715e16ac 100644
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
@@ -330,13 +330,13 @@ func importWorker(db Database, wg *sync.WaitGroup, icons <-chan common.Chart, ch
 	for c := range icons {
 		log.WithFields(log.Fields{"name": c.Name}).Debug("importing icon")
 		if err := fetchAndImportIcon(db, c); err != nil {
-			log.WithFields(log.Fields{"name": c.Name}).WithError(err).Error("failed to import icon")
+			log.WithFields(log.Fields{"name": c.Name}).WithError(err).Warn("failed to import icon")
 		}
 	}
 	for j := range chartFiles {
 		log.WithFields(log.Fields{"name": j.Name, "version": j.ChartVersion.Version}).Debug("importing readme and values")
 		if err := fetchAndImportFiles(db, j.Name, j.Repo, j.ChartVersion); err != nil {
-			log.WithFields(log.Fields{"name": j.Name, "version": j.ChartVersion.Version}).WithError(err).Error("failed to import files")
+			log.WithFields(log.Fields{"name": j.Name, "version": j.ChartVersion.Version}).WithError(err).Warn("failed to import files")
 		}
 	}
 }
@@ -460,17 +460,17 @@ func fetchAndImportFiles(db Database, name string, r common.Repo, cv common.Char
 	if v, ok := files[readmeFileName]; ok {
 		chartFiles.Readme = v
 	} else {
-		log.WithFields(log.Fields{"name": name, "version": cv.Version}).Debug("README.md not found")
+		log.WithFields(log.Fields{"name": name, "version": cv.Version}).Warn("README.md not found")
 	}
 	if v, ok := files[valuesFileName]; ok {
 		chartFiles.Values = v
 	} else {
-		log.WithFields(log.Fields{"name": name, "version": cv.Version}).Debug("values.yaml not found")
+		log.WithFields(log.Fields{"name": name, "version": cv.Version}).Warn("values.yaml not found")
 	}
 	if v, ok := files[schemaFileName]; ok {
 		chartFiles.Schema = v
 	} else {
-		log.WithFields(log.Fields{"name": name, "version": cv.Version}).Debug("values.schema.json not found")
+		log.WithFields(log.Fields{"name": name, "version": cv.Version}).Warn("values.schema.json not found")
 	}
 
 	// inserts the chart files if not already indexed, or updates the existing
diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index 8b1425e560..144e956863 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -17,8 +17,8 @@ const (
 	helmEndpointType      = "helm"
 	prefix                = "/pp/v1/chartsvc/"
 	kubeReleaseNameEnvVar = "STRATOS_HELM_RELEASE"
-	foundationDBURLEnvVar = "HELM_FDB_URL"
-	syncServerURLEnvVar   = "HELM_SYNC_SERVER_URL"
+	foundationDBURLEnvVar = "FDB_URL"
+	syncServerURLEnvVar   = "SYNC_SERVER_URL"
 	// e.g. MY_CONSOLE_FDBDOCLAYER_FDBDOCLAYER_PORT=tcp://10.105.215.71:27016
 	fdbHostPortEnvVar = "FDBDOCLAYER_PORT"
 	//MY_CONSOLE_CHARTREPO_PORT=tcp://10.108.171.246:8080
diff --git a/src/jetstream/plugins/monocular/sync.go b/src/jetstream/plugins/monocular/sync.go
index e837bcd2ac..356d4f32e4 100644
--- a/src/jetstream/plugins/monocular/sync.go
+++ b/src/jetstream/plugins/monocular/sync.go
@@ -26,10 +26,11 @@ type SyncMetadata struct {
 }
 
 const (
-	chartRepoPathPrefix        = "/v1"
-	statusPollInterval         = 30
-	statusPollTimeout          = 320
-	syncServiceTimeoutBoundary = 10
+	chartRepoPathPrefix          = "/v1"
+	statusPollInterval           = 30
+	statusPollTimeout            = 320
+	syncServiceTimeoutBoundary   = 10
+	syncServiceReadyPollInterval = 5
 )
 
 // Sync Channel
@@ -52,30 +53,32 @@ func (m *Monocular) Sync(action interfaces.EndpointAction, endpoint *interfaces.
 }
 
 func waitForSyncService(syncServiceURL string) error {
-	// Ensure that the database is responsive
+	// Ensure that the chart repo sync service is responsive
 	for {
-
 		// establish an outer timeout boundary
 		timeout := time.Now().Add(time.Minute * syncServiceTimeoutBoundary)
 
-		// Ping the database
+		// Make a dummy status request to the chart repo - if it is up we should get a 404
 		statusURL := fmt.Sprintf("%s%s/status/%s", syncServiceURL, chartRepoPathPrefix, "none")
 		resp, err := http.Get(statusURL)
-		log.Infof("Chart Repo ping test: %v, %v.", resp.Status, resp.Body)
-		defer resp.Body.Close()
+		if resp != nil {
+			defer resp.Body.Close()
+		}
 		if err == nil {
-			log.Info("Chart Repo appears to now be available.")
+			log.Info("Sync service is reachable and ready.")
 			break
+		} else {
+			log.Debugf("Result of chart repo request: %v", err)
+			log.Info("Sync service not yet ready. Waiting for sync service to be available...")
 		}
 
 		// If our timeout boundary has been exceeded, bail out
 		if timeout.Sub(time.Now()) < 0 {
-			return fmt.Errorf("timeout boundary of %d minutes has been exceeded.", syncServiceTimeoutBoundary)
+			return fmt.Errorf("timeout boundary of %d minutes has been exceeded", syncServiceTimeoutBoundary)
 		}
 
 		// Circle back and try again
-		log.Infof("Waiting for Chart Repo to be responsive: %+v", err)
-		time.Sleep(time.Second)
+		time.Sleep(time.Second * syncServiceReadyPollInterval)
 	}
 	return nil
 }

From 75a11c96efe3a99f520343b9907b259753cacce7 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Fri, 21 Feb 2020 15:18:16 +0000
Subject: [PATCH 428/648] Remove debug from default chartsync startup command

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 deploy/kubernetes/console/templates/chartsync.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/kubernetes/console/templates/chartsync.yaml b/deploy/kubernetes/console/templates/chartsync.yaml
index ecd4535eac..cb93fd3026 100644
--- a/deploy/kubernetes/console/templates/chartsync.yaml
+++ b/deploy/kubernetes/console/templates/chartsync.yaml
@@ -33,7 +33,7 @@ spec:
         image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{ default "stratos-chartsync" .Values.images.chartsync}}:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         command: ["/chartrepo"]
-        args: ["serve", "--debug=true","--doclayer-url=mongodb://{{ .Release.Name }}-fdbdoclayer:27016", "--cafile=/etc/certs/ca.crt", "--certfile=/etc/certs/tls.crt", "--keyfile=/etc/certs/tls.key"]
+        args: ["serve", "--doclayer-url=mongodb://{{ .Release.Name }}-fdbdoclayer:27016", "--cafile=/etc/certs/ca.crt", "--certfile=/etc/certs/tls.crt", "--keyfile=/etc/certs/tls.key"]
         ports:
         - name: endpoint
           containerPort: 8080

From c212ce47db2d02c7eea06565a3e9575c58d6bd69 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Fri, 21 Feb 2020 17:49:02 +0000
Subject: [PATCH 429/648] Combine fdbdoclayer and fdbserver into one deployment
 and place behind a single service. Liveness/readiness probes via TCP require
 some changes to fdbserver script for IP binding.

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 .../fdbdoclayer/templates/deployment.yaml     | 91 +++++++++++++++++++
 .../fdb-doc-layer-deployment.yaml             |  0
 .../fdbserver-deployment.yaml                 |  0
 .../templates => temp}/fdbserver-service.yaml |  0
 4 files changed, 91 insertions(+)
 create mode 100644 deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/deployment.yaml
 rename deploy/kubernetes/{console/templates/local-helm/fdbdoclayer/templates => temp}/fdb-doc-layer-deployment.yaml (100%)
 rename deploy/kubernetes/{console/templates/local-helm/fdbdoclayer/templates => temp}/fdbserver-deployment.yaml (100%)
 rename deploy/kubernetes/{console/templates/local-helm/fdbdoclayer/templates => temp}/fdbserver-service.yaml (100%)

diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/deployment.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/deployment.yaml
new file mode 100644
index 0000000000..1ea14b41ef
--- /dev/null
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/deployment.yaml
@@ -0,0 +1,91 @@
+
+{{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major (trimSuffix "+" .Capabilities.KubeVersion.Minor) )}}
+apiVersion: apps/v1
+{{- else }}
+apiVersion: apps/v1beta2
+{{- end }}
+kind: Deployment
+metadata:
+  name: stratos-fdbdoclayer
+  labels:
+    app: {{ template "fullname" . }}-fdbdoclayer
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+spec:
+  replicas: {{ default 1 .Values.fdbdoclayerReplicas }}
+  selector:
+    matchLabels:
+      app: {{ template "fullname" . }}-fdbdoclayer
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "fullname" . }}-fdbdoclayer
+        release: {{ .Release.Name }}
+    spec:
+{{- with .Values.securityContext }}
+      securityContext:
+{{ toYaml . | indent 8 }}
+{{- end }}
+      containers:
+      - name: fdbdoclayer
+        image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.fdbdoclayer}}:{{.Values.consoleVersion}}
+        imagePullPolicy: {{.Values.imagePullPolicy}}
+        env:
+        - name: FDB_COORDINATOR
+          value: localhost
+        - name: CLUSTER_ID 
+          value: chartdb:erlklkg
+        - name: ENABLE_TLS
+          value: "true"
+        - name: SERVER_CRT
+          value: "/etc/secrets/tls.crt"
+        - name: SERVER_KEY
+          value: "/etc/secrets/tls.key"
+        - name: CA_CRT
+          value: "/etc/secrets/ca.crt"   
+        - name: FDB_NETWORKING_MODE 
+          value: container   
+        ports:
+        - containerPort: 27016
+        livenessProbe:
+          tcpSocket:
+            port: 27016
+          initialDelaySeconds: 3
+          periodSeconds: 20
+        readinessProbe:
+          tcpSocket:
+            port: 27016
+          initialDelaySeconds: 3
+          periodSeconds: 10
+        volumeMounts:
+        - name: certs
+          mountPath: "/etc/secrets"
+          readOnly: true
+      - name: fdbserver
+        image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.fdbserver}}:{{.Values.consoleVersion}}
+        imagePullPolicy: {{.Values.imagePullPolicy}}
+        env:
+        - name: FDB_COORDINATOR
+          value: localhost
+        - name: CLUSTER_ID
+          value: chartdb:erlklkg
+        - name: FDB_NETWORKING_MODE 
+          value: host
+        ports:
+        - containerPort: 4500
+        livenessProbe:
+          tcpSocket:
+            port: 4500
+          initialDelaySeconds: 3
+          periodSeconds: 20
+        readinessProbe:
+          tcpSocket:
+            port: 4500
+          initialDelaySeconds: 3
+          periodSeconds: 10
+      volumes:
+        - name: certs
+          secret:
+            secretName: {{ .Release.Name }}-fdbdoclayer-certs
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml b/deploy/kubernetes/temp/fdb-doc-layer-deployment.yaml
similarity index 100%
rename from deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-deployment.yaml
rename to deploy/kubernetes/temp/fdb-doc-layer-deployment.yaml
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml b/deploy/kubernetes/temp/fdbserver-deployment.yaml
similarity index 100%
rename from deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-deployment.yaml
rename to deploy/kubernetes/temp/fdbserver-deployment.yaml
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-service.yaml b/deploy/kubernetes/temp/fdbserver-service.yaml
similarity index 100%
rename from deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdbserver-service.yaml
rename to deploy/kubernetes/temp/fdbserver-service.yaml

From 72af79f9388d1a6618583ec074da99f7a03caf81 Mon Sep 17 00:00:00 2001
From: "Kate E. Reinecke" <50168367+kreinecke@users.noreply.github.com>
Date: Fri, 21 Feb 2020 18:11:57 +0000
Subject: [PATCH 430/648] Comment out fdbserver liveness/readiness for now

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
---
 .../fdbdoclayer/templates/deployment.yaml     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/deployment.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/deployment.yaml
index 1ea14b41ef..823b1227f9 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/deployment.yaml
@@ -75,16 +75,16 @@ spec:
           value: host
         ports:
         - containerPort: 4500
-        livenessProbe:
-          tcpSocket:
-            port: 4500
-          initialDelaySeconds: 3
-          periodSeconds: 20
-        readinessProbe:
-          tcpSocket:
-            port: 4500
-          initialDelaySeconds: 3
-          periodSeconds: 10
+        # livenessProbe:
+        #   tcpSocket:
+        #     port: 4500
+        #   initialDelaySeconds: 3
+        #   periodSeconds: 20
+        # readinessProbe:
+        #   tcpSocket:
+        #     port: 4500
+        #   initialDelaySeconds: 3
+        #   periodSeconds: 10
       volumes:
         - name: certs
           secret:

From f9d2bee802def153da208d78294f70ef0790de09 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Sat, 22 Feb 2020 10:21:09 +0000
Subject: [PATCH 431/648] Fix helm chart bug

---
 deploy/kubernetes/console/templates/deployment.yaml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 2e42036675..15e17ff343 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -322,8 +322,3 @@ spec:
         secret:
           secretName: {{ .Release.Name }}-fdbdoclayer-certs
   replicas: 1
-  strategy:
-    type: RollingUpdate
-    rollingUpdate:
-      maxSurge: 0
-      maxUnavailable: 1

From 025e6d3c1cc648c09743d59ec8b66022478485f7 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Sat, 22 Feb 2020 10:24:13 +0000
Subject: [PATCH 432/648] Update deployment.yaml

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

diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 15e17ff343..64b9f4e6c5 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -321,4 +321,3 @@ spec:
       - name: "{{ .Release.Name }}-monocular-certs"
         secret:
           secretName: {{ .Release.Name }}-fdbdoclayer-certs
-  replicas: 1

From e9d789424685c50125b877984849f851006e6cb4 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Sat, 22 Feb 2020 11:34:54 +0000
Subject: [PATCH 433/648] Fix for helm install not working

---
 .gitignore                                    |  1 +
 .../plugins/kubernetes/install_release.go     |  2 +-
 .../plugins/monocular/chartsvc/main.go        | 19 ++++++++++++++-----
 src/jetstream/plugins/monocular/main.go       |  8 +++++---
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index ed422405e2..cf462ce1fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -94,6 +94,7 @@ src/jetstream/jetstream
 src/jetstream/console-database.db
 src/jetstream/config.properties
 src/jetstream/db/dbconf.yml
+src/jetstream/plugins/monocular/chart-repo/chartrepo
 
 # Customisations
 
diff --git a/src/jetstream/plugins/kubernetes/install_release.go b/src/jetstream/plugins/kubernetes/install_release.go
index 3645f7dfbb..0548fac69d 100644
--- a/src/jetstream/plugins/kubernetes/install_release.go
+++ b/src/jetstream/plugins/kubernetes/install_release.go
@@ -36,7 +36,7 @@ type installRequest struct {
 
 // Monocular is a plugin for Monocular
 type Monocular interface {
-	GetChartStore() chartsvc.ChartSvcDatastore
+	GetChartStore() *chartsvc.ChartSvcDatastore
 }
 
 // InstallRelease will install a Helm 3 release
diff --git a/src/jetstream/plugins/monocular/chartsvc/main.go b/src/jetstream/plugins/monocular/chartsvc/main.go
index dafb4db291..05226e6bc5 100644
--- a/src/jetstream/plugins/monocular/chartsvc/main.go
+++ b/src/jetstream/plugins/monocular/chartsvc/main.go
@@ -114,7 +114,7 @@ func main() {
 	http.ListenAndServe(addr, n)
 }
 
-func InitFDBDocLayerConnection(fdbURL *string, fDB *string, tlsEnabled *bool, CAFile string, certFile string, keyFile string, debug *bool) {
+func InitFDBDocLayerConnection(fdbURL *string, fDB *string, tlsEnabled *bool, CAFile string, certFile string, keyFile string, debug *bool) *ChartSvcDatastore {
 
 	log.Debugf("Attempting to connect to FDB: %v, %v, debug: %v", *fdbURL, *fDB, *debug)
 
@@ -125,19 +125,19 @@ func InitFDBDocLayerConnection(fdbURL *string, fDB *string, tlsEnabled *bool, CA
 		CA, err := ioutil.ReadFile(CAFile) // just pass the file name
 		if err != nil {
 			log.Fatalf("Cannot load CA certificate from file: %v.", err)
-			return
+			return nil
 		}
 		CACert := x509.NewCertPool()
 		ok := CACert.AppendCertsFromPEM([]byte(CA))
 		if !ok {
 			log.Fatalf("Cannot append CA certificate to certificate pool.")
-			return
+			return nil
 		}
 		//Now load the key pair and create tls options struct
 		clientKeyPair, err := tls.LoadX509KeyPair(certFile, keyFile)
 		if err != nil {
 			log.Fatalf("Cannot load server keypair: %v", err)
-			return
+			return nil
 		}
 
 		tlsConfig = &tls.Config{RootCAs: CACert, Certificates: []tls.Certificate{clientKeyPair}}
@@ -150,10 +150,19 @@ func InitFDBDocLayerConnection(fdbURL *string, fDB *string, tlsEnabled *bool, CA
 	client, err := fdbDatastore.NewDocLayerClient(context.Background(), clientOptions)
 	if err != nil {
 		log.Fatalf("Can't create client for FoundationDB document layer: %v. URL provided was: %v.", err, *fdbURL)
-		return
+		return nil
 	}
 	log.Debugf("FDB Document Layer client created.")
 
 	fdb.InitDBConfig(client, *fDB)
 	fdb.SetPathPrefix(pathPrefix)
+
+	db, dbCloser := client.Database(*fDB)
+	datastore := &ChartSvcDatastore{
+		dbClient: client,
+		db:       db,
+		dbCloser: dbCloser,
+	}
+
+	return datastore
 }
diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index 8b1425e560..5ec55f7006 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -32,7 +32,7 @@ const (
 type Monocular struct {
 	portalProxy     interfaces.PortalProxy
 	chartSvcRoutes  http.Handler
-	RepoQueryStore  chartsvc.ChartSvcDatastore
+	RepoQueryStore  *chartsvc.ChartSvcDatastore
 	FoundationDBURL string
 	SyncServiceURL  string
 }
@@ -42,7 +42,8 @@ func Init(portalProxy interfaces.PortalProxy) (interfaces.StratosPlugin, error)
 	return &Monocular{portalProxy: portalProxy}, nil
 }
 
-func (m *Monocular) GetChartStore() chartsvc.ChartSvcDatastore {
+// GetChartStore gets the chart store
+func (m *Monocular) GetChartStore() *chartsvc.ChartSvcDatastore {
 	return m.RepoQueryStore
 }
 
@@ -147,7 +148,8 @@ func (m *Monocular) ConfigureChartSVC(fdbURL *string, fDB *string, cACertFile st
 	if !(tlsEnabled || (cACertFile == "" && keyFile == "" && certFile == "")) {
 		return errors.New("To enable TLS, all 3 TLS cert paths must be set.")
 	}
-	chartsvc.InitFDBDocLayerConnection(fdbURL, fDB, &tlsEnabled, cACertFile, certFile, keyFile, debug)
+	m.RepoQueryStore = chartsvc.InitFDBDocLayerConnection(fdbURL, fDB, &tlsEnabled, cACertFile, certFile, keyFile, debug)
+
 	return nil
 }
 

From c2e127c9c3693a97104337ee02f4368302078a5e Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Sun, 23 Feb 2020 12:03:51 +0000
Subject: [PATCH 434/648] Combine fdb pods. Add annotaion and label suuport.

---
 .../monocular/fdb-doclayer/fdbdoc.bash        | 47 ++++++------
 .../containers/monocular/fdb-server/fdb.bash  |  9 ++-
 .../fdbdoclayer/templates/deployment.yaml     | 71 ++++++++++++-------
 .../templates/fdb-doc-layer-service.yaml      | 25 +++++--
 .../kubernetes/console/templates/service.yaml |  3 +
 5 files changed, 104 insertions(+), 51 deletions(-)

diff --git a/deploy/containers/monocular/fdb-doclayer/fdbdoc.bash b/deploy/containers/monocular/fdb-doclayer/fdbdoc.bash
index 07f2c59028..38cbbe2288 100755
--- a/deploy/containers/monocular/fdb-doclayer/fdbdoc.bash
+++ b/deploy/containers/monocular/fdb-doclayer/fdbdoc.bash
@@ -6,36 +6,37 @@ function setup_cluster_file() {
 
 	if [[ -n $FDB_COORDINATOR ]]; then
 		echo "FDB coordinator: $FDB_COORDINATOR"
-		coordinator_ip=$(dig +short +search $FDB_COORDINATOR)
+		if [[ -z $coordinator_ip ]]; then
+			coordinator_ip=$(dig +short +search $FDB_COORDINATOR)
+		fi
 		echo "Coordinator IP: $coordinator_ip"
-			if [[ -z "$coordinator_ip" ]]; then
-					echo "Failed to look up coordinator address for $FDB_COORDINATOR" 1>&2
-					exit 1
-			fi
-                coordinator_port=${FDB_COORDINATOR_PORT:-4500}
+		if [[ -z "$coordinator_ip" ]]; then
+				echo "Failed to look up coordinator address for $FDB_COORDINATOR" 1>&2
+				exit 1
+		fi
+		coordinator_port=${FDB_COORDINATOR_PORT:-4500}
 		if [[ -z $CLUSTER_ID ]]; then
 			echo "CLUSTER_ID environment variable not defined" 1>&2
-                	exit 1
+			exit 1
 		fi
-                echo "$CLUSTER_ID@$coordinator_ip:$coordinator_port" > $FDB_CLUSTER_FILE
+		echo "$CLUSTER_ID@$coordinator_ip:$coordinator_port" > $FDB_CLUSTER_FILE
 	else
-			echo "FDB_COORDINATOR environment variable not defined" 1>&2
-			exit 1
+		echo "FDB_COORDINATOR environment variable not defined" 1>&2
+		exit 1
 	fi
 
-
-    if [ ! -f ${FDB_CLUSTER_FILE} ]; then
-        echo "Failed to locate cluster file at $FDB_CLUSTER_FILE" 1>&2
-        exit 1
-    fi
+	if [ ! -f ${FDB_CLUSTER_FILE} ]; then
+		echo "Failed to locate cluster file at $FDB_CLUSTER_FILE" 1>&2
+		exit 1
+	fi
 }
 
-
 function setup_public_ip() {
 	if [[ "$FDB_NETWORKING_MODE" == "host" ]]; then
 		public_ip=127.0.0.1
 	elif [[ "$FDB_NETWORKING_MODE" == "container" ]]; then
 		public_ip=$(grep `hostname` /etc/hosts | sed -e "s/\s *`hostname`.*//")
+		coordinator_ip=$public_ip
 	else
 		echo "Unknown FDB Networking mode \"$FDB_NETWORKING_MODE\"" 1>&2
 		exit 1
@@ -47,13 +48,19 @@ function setup_public_ip() {
 setup_public_ip
 setup_cluster_file
 
+if [ -n ${FDB_LISTEN_IP} ]; then
+	LISTEN_IP=${FDB_LISTEN_IP}
+else
+	LISTEN_IP=${PUBLIC_IP}
+fi
+
 echo "Connecting to FDB server at: $CLUSTER_ID@$coordinator_ip:$coordinator_port"
 echo "Cluster file contents: "
 cat $FDB_CLUSTER_FILE
 if [[ "$ENABLE_TLS" == "true" ]]; then
-	echo "Starting FDB Document Layer on $PUBLIC_IP:$FDB_DOC_PORT:tls. TLS enabled."
-	fdbdoc -V --listen_address $PUBLIC_IP:$FDB_DOC_PORT:tls --tls_certificate_file $SERVER_CRT --tls_ca_file $CA_CRT --tls_key_file $SERVER_KEY --logdir /var/fdb/logs
+	echo "Starting FDB Document Layer on $LISTEN_IP:$FDB_DOC_PORT:tls. TLS enabled."
+	fdbdoc -V --listen_address $LISTEN_IP:$FDB_DOC_PORT:tls --tls_certificate_file $SERVER_CRT --tls_ca_file $CA_CRT --tls_key_file $SERVER_KEY --logdir /var/fdb/logs
 else
-	echo "Starting FDB Document Layer on $PUBLIC_IP:$FDB_DOC_PORT. No TLS."
-	fdbdoc -V --listen_address $PUBLIC_IP:$FDB_DOC_PORT --logdir /var/fdb/logs
+	echo "Starting FDB Document Layer on $LISTEN_IP:$FDB_DOC_PORT. No TLS."
+	fdbdoc -V --listen_address $LISTEN_IP:$FDB_DOC_PORT --logdir /var/fdb/logs
 fi
diff --git a/deploy/containers/monocular/fdb-server/fdb.bash b/deploy/containers/monocular/fdb-server/fdb.bash
index 6746af53a8..b31c71ab67 100644
--- a/deploy/containers/monocular/fdb-server/fdb.bash
+++ b/deploy/containers/monocular/fdb-server/fdb.bash
@@ -27,5 +27,12 @@ echo "Starting FDB server listening on: $PUBLIC_IP:$FDB_PORT public address: $PU
 cat /var/fdb/fdb.cluster
 source /var/fdb/scripts/configure_db.bash
 configure_db &
-fdbserver --listen_address $PUBLIC_IP:$FDB_PORT --public_address $PUBLIC_IP:$FDB_PORT \
+
+if [ -n ${FDB_LISTEN_IP} ]; then
+	LISTEN_IP=${FDB_LISTEN_IP}
+else
+	LISTEN_IP=${PUBLIC_IP}
+fi
+
+fdbserver --listen_address $LISTEN_IP:$FDB_PORT --public_address $PUBLIC_IP:$FDB_PORT \
 	--datadir /var/fdb/data --logdir /var/fdb/logs
\ No newline at end of file
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/deployment.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/deployment.yaml
index 823b1227f9..63cdb0e7e8 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/deployment.yaml
@@ -6,23 +6,42 @@ apiVersion: apps/v1beta2
 {{- end }}
 kind: Deployment
 metadata:
-  name: stratos-fdbdoclayer
+  name: stratos-chartstore
+{{- if .Values.console.deploymentAnnotations }}
+  annotations:
+{{ toYaml .Values.console.deploymentAnnotations | indent 4 }}
+{{- end }}
   labels:
-    app: {{ template "fullname" . }}-fdbdoclayer
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "stratos-chartstore"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+{{- if .Values.console.deploymentExtraLabels }}
+{{ toYaml .Values.console.deploymentExtraLabels | indent 4 }}
+{{- end }}
 spec:
-  replicas: {{ default 1 .Values.fdbdoclayerReplicas }}
+  replicas: 1
   selector:
     matchLabels:
-      app: {{ template "fullname" . }}-fdbdoclayer
-      release: {{ .Release.Name }}
+      app.kubernetes.io/name: "stratos"
+      app.kubernetes.io/instance: "{{ .Release.Name }}"
+      app.kubernetes.io/component: "stratos-chartstore"
   template:
     metadata:
+{{- if .Values.console.podAnnotations }}
+      annotations:
+{{ toYaml .Values.console.podAnnotations | indent 8 }}
+{{- end }}
       labels:
-        app: {{ template "fullname" . }}-fdbdoclayer
-        release: {{ .Release.Name }}
+        app.kubernetes.io/name: "stratos"
+        app.kubernetes.io/instance: "{{ .Release.Name }}"
+        app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+        app.kubernetes.io/component: "stratos-chartstore"
+        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+        {{- if .Values.console.podExtraLabels}}
+        {{ toYaml .Values.console.podExtraLabels | nindent 8 }}
+        {{- end}}        
     spec:
 {{- with .Values.securityContext }}
       securityContext:
@@ -34,7 +53,9 @@ spec:
         imagePullPolicy: {{.Values.imagePullPolicy}}
         env:
         - name: FDB_COORDINATOR
-          value: localhost
+          value: {{ .Release.Name }}-fdbdoclayer
+        - name: FDB_LISTEN_IP
+          value: 0.0.0.0
         - name: CLUSTER_ID 
           value: chartdb:erlklkg
         - name: ENABLE_TLS
@@ -46,7 +67,7 @@ spec:
         - name: CA_CRT
           value: "/etc/secrets/ca.crt"   
         - name: FDB_NETWORKING_MODE 
-          value: container   
+          value: container
         ports:
         - containerPort: 27016
         livenessProbe:
@@ -68,23 +89,25 @@ spec:
         imagePullPolicy: {{.Values.imagePullPolicy}}
         env:
         - name: FDB_COORDINATOR
-          value: localhost
+          value: {{ .Release.Name }}-fdbdoclayer
+        - name: FDB_LISTEN_IP
+          value: 0.0.0.0
         - name: CLUSTER_ID
           value: chartdb:erlklkg
         - name: FDB_NETWORKING_MODE 
-          value: host
+          value: container
         ports:
         - containerPort: 4500
-        # livenessProbe:
-        #   tcpSocket:
-        #     port: 4500
-        #   initialDelaySeconds: 3
-        #   periodSeconds: 20
-        # readinessProbe:
-        #   tcpSocket:
-        #     port: 4500
-        #   initialDelaySeconds: 3
-        #   periodSeconds: 10
+        livenessProbe:
+          tcpSocket:
+            port: 4500
+          initialDelaySeconds: 3
+          periodSeconds: 20
+        readinessProbe:
+          tcpSocket:
+            port: 4500
+          initialDelaySeconds: 3
+          periodSeconds: 10
       volumes:
         - name: certs
           secret:
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml
index 90c48cc77b..b3c74bfb0a 100644
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml
+++ b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml
@@ -3,11 +3,23 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Release.Name }}-fdbdoclayer
+{{- if .Values.console.service -}}
+{{- if .Values.console.service.annotations }}
+  annotations:
+{{ toYaml .Values.console.service.annotations | indent 4 }}
+{{- end }}
+{{- end }}
   labels:
-    app: {{ template "fullname" . }}-fdbdoclayer
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "{{ .Release.Name }}-fdbdoclayer"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+{{- if .Values.console.service -}}
+{{- if .Values.console.service.extraLabels }}
+{{ toYaml .Values.console.service.extraLabels | indent 4 }}
+{{- end }}
+{{- end }}
 spec:
   type: ClusterIP
   ports:
@@ -16,5 +28,6 @@ spec:
     protocol: TCP
     name: fdbdoclayer
   selector:
-    app: {{ template "fullname" . }}-fdbdoclayer
-    release: {{ .Release.Name }}
\ No newline at end of file
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/component: "stratos-chartstore"
diff --git a/deploy/kubernetes/console/templates/service.yaml b/deploy/kubernetes/console/templates/service.yaml
index ef91c9a0a8..c89b0c171d 100644
--- a/deploy/kubernetes/console/templates/service.yaml
+++ b/deploy/kubernetes/console/templates/service.yaml
@@ -79,6 +79,7 @@ spec:
     {{ else if .Release.IsUpgrade }}
     nodePort:
     {{- end }}
+{{- if not .Values.mariadb.external }}
 ---
 apiVersion: v1
 kind: Service
@@ -109,3 +110,5 @@ spec:
     targetPort: mysql
   selector:
     app: "{{ .Release.Name }}"
+    app.kubernetes.io/component: stratos-db
+{{- end -}}

From 27b4a6f3f87caeb19f0f701f43400c88cafb6e20 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Sun, 23 Feb 2020 18:35:40 +0000
Subject: [PATCH 435/648] Final tidy-ups

---
 .../templates => fdbdoclayer}/deployment.yaml |  0
 .../fdb-doc-layer-service.yaml                |  0
 .../fdbdoclayer/templates/_helpers.tpl        | 37 -------------------
 deploy/kubernetes/console/values.yaml         |  4 --
 4 files changed, 41 deletions(-)
 rename deploy/kubernetes/console/templates/{local-helm/fdbdoclayer/templates => fdbdoclayer}/deployment.yaml (100%)
 rename deploy/kubernetes/console/templates/{local-helm/fdbdoclayer/templates => fdbdoclayer}/fdb-doc-layer-service.yaml (100%)
 delete mode 100644 deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/_helpers.tpl

diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/deployment.yaml b/deploy/kubernetes/console/templates/fdbdoclayer/deployment.yaml
similarity index 100%
rename from deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/deployment.yaml
rename to deploy/kubernetes/console/templates/fdbdoclayer/deployment.yaml
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml b/deploy/kubernetes/console/templates/fdbdoclayer/fdb-doc-layer-service.yaml
similarity index 100%
rename from deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/fdb-doc-layer-service.yaml
rename to deploy/kubernetes/console/templates/fdbdoclayer/fdb-doc-layer-service.yaml
diff --git a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/_helpers.tpl b/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/_helpers.tpl
deleted file mode 100644
index 439751e1a4..0000000000
--- a/deploy/kubernetes/console/templates/local-helm/fdbdoclayer/templates/_helpers.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-
-
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "name" -}}
-
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "fullname" -}}
-
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name for the document layer.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "doclayer.fullname" -}}
-
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-%s-%s" .Release.Name $name "fdbdoclayer" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Render image reference
-*/}}
-{{- define "fdb.image" -}}
-{{ .registry }}/{{ .repository }}:{{ .tag }}
-{{- end -}}
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index e48e0c55d6..9b3e42d4e0 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -148,10 +148,6 @@ uaa:
   consoleAdminIdentifier: 
   skipSSLValidation: false
 
-# Replicas for FDB - do not edit
-fdbserverReplicas: 1
-fdbdoclayerReplicas: 1
-
 # SCF values compatability 
 env:
   DOMAIN:

From 46a13e61458b9d7734a7524a7e440f3dd2e3500e Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Sun, 23 Feb 2020 19:37:49 +0000
Subject: [PATCH 436/648] Fix missing template function

---
 deploy/kubernetes/console/templates/__helpers.tpl | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/deploy/kubernetes/console/templates/__helpers.tpl b/deploy/kubernetes/console/templates/__helpers.tpl
index 2762028d4f..dca1d26576 100644
--- a/deploy/kubernetes/console/templates/__helpers.tpl
+++ b/deploy/kubernetes/console/templates/__helpers.tpl
@@ -159,3 +159,12 @@ Ingress Host:
 {{ required "Host name is required" $host | quote }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "fullname" -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}

From db0eb443aebeab230ea3169885ed3c6da84a58c3 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 24 Feb 2020 07:23:31 +0000
Subject: [PATCH 437/648] Tweaks

---
 deploy/Dockerfile.all-in-one                  | 24 ++++++++++---------
 .../Dockerfile.stratos-go-build-base.tmpl     |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/deploy/Dockerfile.all-in-one b/deploy/Dockerfile.all-in-one
index 915ffa42d6..ce590c45a1 100644
--- a/deploy/Dockerfile.all-in-one
+++ b/deploy/Dockerfile.all-in-one
@@ -1,4 +1,5 @@
 # Docker build for all-in-one Stratos
+# ---------------------------------------------------------------------------------------------------
 FROM splatform/stratos-aio-base:leap15_1 as jetstream-builder
 
 # Ensure that we copy the custom-src folder
@@ -10,24 +11,23 @@ ARG USE_PREBUILT_UI=false
 
 USER root
 RUN if [ $USE_PREBUILT_UI = "true" ] ; then \
-    zypper install -y unzip \
-    && unzip stratos-frontend-prebuild.zip -d ./dist \
-    && npm run build-backend \
-    && cp src/jetstream/jetstream . \
-	&& mv dist ui ; \
+    unzip stratos-frontend-prebuild.zip -d ./dist ; \
     else \
 		npm install \
-        && npm run build \
-        && npm run build-backend \
-        && cp  src/jetstream/jetstream . \
-        && mv dist ui ; \
+        && npm run build ; \
     fi
+
+# Build backend
+RUN npm run build-backend \
+    && cp src/jetstream/jetstream . \
+    && mv dist ui
+
 USER stratos
 
 # Generate dev-certs
 RUN CERTS_PATH=/home/stratos/dev-certs ./generate_cert.sh
-#    && chmod +x jetstream
 
+# ---------------------------------------------------------------------------------------------------
 # Docker build for FDB Server component
 FROM splatform/stratos-bk-build-base:leap15_1 as fdbserver-builder
 
@@ -64,6 +64,7 @@ COPY deploy/containers/monocular/fdb-server/configure_db.bash scripts/
 RUN chmod u+x scripts/*.bash && \
 	mkdir -p logs
 
+# ---------------------------------------------------------------------------------------------------
 # Docker build for FDB Document Layer component
 FROM splatform/stratos-bk-build-base:leap15_1 as fdbdoclayer-builder
 
@@ -76,6 +77,7 @@ RUN curl $FDB_WEBSITE/downloads/$FDB_DOC_VERSION/linux/fdb-document-layer-$FDB_D
     tar -xvf fdb-document-layer-$FDB_DOC_VERSION-Linux.tar.gz && \
     mv fdb-document-layer-$FDB_DOC_VERSION-Linux doclayer
  
+# ---------------------------------------------------------------------------------------------------
 # Docker build for Chart Repo component
 FROM splatform/stratos-bk-build-base:leap15_1 as chartrepo-builder
 
@@ -84,6 +86,7 @@ WORKDIR /go/src/github.com/helm/monocular
 ARG VERSION
 RUN GO111MODULE=on GOPROXY=https://gocenter.io CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-X main.version=$VERSION" .
 
+# ---------------------------------------------------------------------------------------------------
 # use --target=aio to build All-in-one image
 FROM splatform/stratos-bk-base:leap15_1
 ARG CANARY_BUILD
@@ -119,7 +122,6 @@ COPY --from=fdbdoclayer-builder /home/stratos/doclayer/lib/foundationdb/document
 COPY deploy/containers/monocular/fdb-doclayer/fdbdoc.bash /var/fdb/scripts
 RUN chmod u+x /var/fdb/scripts/fdbdoc.bash
 # Doclayer startup script dependency
-RUN zypper install -y bind-utils
 # FoundationDB environment variables
 ENV FDB_PORT 4500
 ENV FDB_CLUSTER_FILE /var/fdb/fdb.cluster
diff --git a/deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl b/deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl
index a510907974..f34c29d767 100644
--- a/deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl
+++ b/deploy/stratos-base-images/Dockerfile.stratos-go-build-base.tmpl
@@ -11,7 +11,7 @@ RUN zypper ref
 
 RUN zypper -n ref && \
     zypper -n up && \
-    zypper in -y which tar git gcc curl wget gzip xz && \
+    zypper in -y which tar git gcc curl wget gzip xz unzip && \
     zypper clean -a && \
     rm -f /var/log/zypper.log /var/log/zypp/history
 

From 3e55453adf4e80345120e620d1aa6ca9679722b1 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 24 Feb 2020 11:25:02 +0000
Subject: [PATCH 438/648] Make it easier to use chartsync tool in development

---
 build/chartsync-build.sh                      | 42 ++++++++++++++
 package.json                                  |  1 +
 src/jetstream/default.config.properties       |  7 +++
 src/jetstream/main.go                         |  8 ++-
 src/jetstream/plugins/monocular/go.sum        |  1 +
 src/jetstream/plugins/monocular/main.go       | 57 ++++++++++++++++---
 src/jetstream/repository/interfaces/plugin.go |  5 ++
 7 files changed, 112 insertions(+), 9 deletions(-)
 create mode 100755 build/chartsync-build.sh

diff --git a/build/chartsync-build.sh b/build/chartsync-build.sh
new file mode 100755
index 0000000000..029fa7af3c
--- /dev/null
+++ b/build/chartsync-build.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+
+# Build chart-sync
+
+DEV=${STRATOS_BACKEND_DEV:-false}
+ACTION=${1:-build}
+NO_DEP=${STRATOS_USE_VENDOR_AS_IS:-false}
+VERSION=${stratos_version:-dev}
+
+set -euo pipefail
+
+# Script folder
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+STRATOS="`cd "${DIR}/..";pwd`"
+
+pushd "${STRATOS}" > /dev/null
+
+# Determine the build version from the package file if not already set
+if [ "${VERSION}" == "dev" ]; then
+  PACKAGE_VERSION=$(cat package.json | grep "version")
+  REGEX="\"version\": \"([0-9\.]*)\""
+  if [[ $PACKAGE_VERSION =~ $REGEX ]]; then
+    VERSION=${BASH_REMATCH[1]}
+  fi
+fi
+
+# Build chart sync tool
+pushd "${STRATOS}/src/jetstream/plugins/monocular/chart-repo" > /dev/null
+
+if [ "${ACTION}" == "build" ]; then
+  echo "Building chart sync tool ..."
+  echo "Building chart sync tool: ${VERSION}"
+  GO111MODULE=on go build -ldflags -X=main.appVersion=${VERSION}
+  echo "Build complete ..."
+# else
+#   echo "Running backend tests ..."
+#   GO111MODULE=on go test ./... -v -count=1
+fi
+
+popd > /dev/null
+
+popd > /dev/null
\ No newline at end of file
diff --git a/package.json b/package.json
index af3bf213ab..7bdc2b328a 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
   "main": "index.js",
   "scripts": {
     "build-backend": "./build/bk-build.sh",
+    "build-chartsync": "./build/chartsync-build.sh",
     "full-build-dev": "npm run build-dev; npm run build-backend",
     "fetch-backend-deps": "./build/bk-fetch-deps.sh",
     "bosh-build-backend": "gulp bosh-build-backend",
diff --git a/src/jetstream/default.config.properties b/src/jetstream/default.config.properties
index da1f866c69..d9b98d0c0c 100644
--- a/src/jetstream/default.config.properties
+++ b/src/jetstream/default.config.properties
@@ -61,3 +61,10 @@ INVITE_USER_CLIENT_SECRET=
 # DB_PASSWORD=strat0s
 # DB_DATABASE_NAME=stratosdb
 # DB_SSL_MODE=disable
+
+# Helm Monocular configuration
+#FDB_URL="ongodb://127.0.0.1:27016"
+#SYNC_SERVER_URL=http://127.0.0.1:8080"
+
+# Simplify development with FDB (value is port of FDB server: 27016 for FDB, 27017 for MongoDB)
+#FDB_LOCAL_DEV=27017
\ No newline at end of file
diff --git a/src/jetstream/main.go b/src/jetstream/main.go
index 83b5384a5b..2b2789b717 100644
--- a/src/jetstream/main.go
+++ b/src/jetstream/main.go
@@ -281,6 +281,13 @@ func main() {
 		log.Info(`... Stopping sessiondata store cleanup`)
 		sessionDataStore.StopCleanup(dataQuitCleanup, dataDoneCleanup)
 
+		// Plugin cleanup
+		for name, plugin := range portalProxy.Plugins {
+			if pCleanup, ok := plugin.(interfaces.StratosPluginCleanup); ok {
+				pCleanup.Destroy()
+			}
+		}
+
 		log.Info("Graceful shut down complete")
 		os.Exit(1)
 	}()
@@ -358,7 +365,6 @@ func (portalProxy *portalProxy) GetSessionDataStore() interfaces.SessionDataStor
 
 func (portalProxy *portalProxy) GetPlugin(name string) interface{} {
 	plugin := portalProxy.Plugins[name]
-	log.Warn(portalProxy.Plugins)
 	return plugin
 }
 
diff --git a/src/jetstream/plugins/monocular/go.sum b/src/jetstream/plugins/monocular/go.sum
index 80159379dd..1dc960fbfd 100644
--- a/src/jetstream/plugins/monocular/go.sum
+++ b/src/jetstream/plugins/monocular/go.sum
@@ -317,6 +317,7 @@ k8s.io/helm v2.12.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg
 k8s.io/helm v2.16.1+incompatible h1:L+k810plJlaGWEw1EszeT4deK8XVaKxac1oGcuB+WDc=
 k8s.io/helm v2.16.1+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
 k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
 k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index aededd5f69..fcf4d218c3 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -2,7 +2,12 @@ package monocular
 
 import (
 	"errors"
+	"fmt"
+	"math/rand"
 	"net/http"
+	"os"
+	"os/exec"
+	"path/filepath"
 	"strings"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
@@ -19,13 +24,11 @@ const (
 	kubeReleaseNameEnvVar = "STRATOS_HELM_RELEASE"
 	foundationDBURLEnvVar = "FDB_URL"
 	syncServerURLEnvVar   = "SYNC_SERVER_URL"
-	// e.g. MY_CONSOLE_FDBDOCLAYER_FDBDOCLAYER_PORT=tcp://10.105.215.71:27016
-	fdbHostPortEnvVar = "FDBDOCLAYER_PORT"
-	//MY_CONSOLE_CHARTREPO_PORT=tcp://10.108.171.246:8080
-	syncServerHostPortEnvVar = "CHARTREPO_PORT"
-	caCertEnvVar             = "MONOCULAR_CA_CRT_PATH"
-	tlsKeyEnvVar             = "MONOCULAR_KEY_PATH"
-	TLSCertEnvVar            = "MONOCULAR_CRT_PATH"
+	caCertEnvVar          = "MONOCULAR_CA_CRT_PATH"
+	tlsKeyEnvVar          = "MONOCULAR_KEY_PATH"
+	tLSCertEnvVar         = "MONOCULAR_CRT_PATH"
+	localDevEnvVar        = "FDB_LOCAL_DEV"
+	chartSyncBasePort     = 45000
 )
 
 // Monocular is a plugin for Monocular
@@ -35,6 +38,7 @@ type Monocular struct {
 	RepoQueryStore  *chartsvc.ChartSvcDatastore
 	FoundationDBURL string
 	SyncServiceURL  string
+	devSyncPID      int
 }
 
 // Init creates a new Monocular
@@ -58,7 +62,7 @@ func (m *Monocular) Init() error {
 	fDB := "monocular-plugin"
 	debug := false
 	caCertPath, _ := m.portalProxy.Env().Lookup(caCertEnvVar)
-	TLSCertPath, _ := m.portalProxy.Env().Lookup(TLSCertEnvVar)
+	TLSCertPath, _ := m.portalProxy.Env().Lookup(tLSCertEnvVar)
 	tlsKeyPath, _ := m.portalProxy.Env().Lookup(tlsKeyEnvVar)
 	m.ConfigureChartSVC(&fdbURL, &fDB, caCertPath, TLSCertPath, tlsKeyPath, &debug)
 	m.chartSvcRoutes = chartsvc.SetupRoutes()
@@ -67,12 +71,49 @@ func (m *Monocular) Init() error {
 	return nil
 }
 
+// Destroy does any cleanup for the plugin on exit
+func (m *Monocular) Destroy() {
+	log.Debug("Monocular plugin .. destroy")
+	if m.devSyncPID != 0 {
+		log.Info("... Stopping chart sync tool")
+		if p, err := os.FindProcess(m.devSyncPID); err == nil {
+			p.Kill()
+		} else {
+			log.Error("Could not find process for the chart sync tool")
+		}
+	}
+}
+
 func (m *Monocular) configure() error {
 
 	// Env var lookup for Monocular services
 	m.FoundationDBURL = m.portalProxy.Env().String(foundationDBURLEnvVar, "")
 	m.SyncServiceURL = m.portalProxy.Env().String(syncServerURLEnvVar, "")
 
+	if fdbPort, isLocal := m.portalProxy.Env().Lookup(localDevEnvVar); isLocal {
+		// Create a random port to use for the chart sync service
+		m.devSyncPort = chartSyncBasePort + rand.Intn(5000)
+		m.FoundationDBURL = fmt.Sprintf("mongodb://127.0.0.1:%s", fdbPort)
+		m.SyncServiceURL = fmt.Sprintf("http://127.0.0.1:%d", m.devSyncPort)
+
+		// Run the chartrepo tool
+		dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
+		if err != nil {
+			log.Error("Can not get folder of current process")
+		}
+		chartSyncTool := filepath.Join(dir, "plugins", "monocular", "chart-repo", "chartrepo")
+		cmd := exec.Command(chartSyncTool, "serve", fmt.Sprintf("--doclayer-url=%s", m.FoundationDBURL))
+		cmd.Env = make([]string, 1)
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		cmd.Env[0] = fmt.Sprintf("PORT=%d", m.devSyncPort)
+		if err = cmd.Start(); err != nil {
+			log.Fatalf("Error starting chart sync tool: %+v", err)
+		} else {
+			m.devSyncPID = cmd.Process.Pid
+		}
+	}
+
 	log.Debugf("Foundation DB : %s", m.FoundationDBURL)
 	log.Debugf("Sync Server   : %s", m.SyncServiceURL)
 
diff --git a/src/jetstream/repository/interfaces/plugin.go b/src/jetstream/repository/interfaces/plugin.go
index f9a0ac9b3e..d5269b63a1 100644
--- a/src/jetstream/repository/interfaces/plugin.go
+++ b/src/jetstream/repository/interfaces/plugin.go
@@ -27,3 +27,8 @@ func RegisterJetstreamConfigPlugin(plugin JetstreamConfigInit) {
 type EndpointNotificationPlugin interface {
 	OnEndpointNotification(EndpointAction, *CNSIRecord)
 }
+
+// StratosPluginCleanup is interface a plugin can implement if it wants to cleanup on exit
+type StratosPluginCleanup interface {
+	Destroy()
+}

From a30d8c0db01d11b55f48bf9aa8fbea6961e58354 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 24 Feb 2020 11:44:25 +0000
Subject: [PATCH 439/648] Fix compilation issues with tidy ups

---
 src/jetstream/main.go                   | 2 +-
 src/jetstream/plugins/monocular/main.go | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/jetstream/main.go b/src/jetstream/main.go
index 2b2789b717..1ef796c58b 100644
--- a/src/jetstream/main.go
+++ b/src/jetstream/main.go
@@ -282,7 +282,7 @@ func main() {
 		sessionDataStore.StopCleanup(dataQuitCleanup, dataDoneCleanup)
 
 		// Plugin cleanup
-		for name, plugin := range portalProxy.Plugins {
+		for _, plugin := range portalProxy.Plugins {
 			if pCleanup, ok := plugin.(interfaces.StratosPluginCleanup); ok {
 				pCleanup.Destroy()
 			}
diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index fcf4d218c3..3d30928d34 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -92,9 +92,9 @@ func (m *Monocular) configure() error {
 
 	if fdbPort, isLocal := m.portalProxy.Env().Lookup(localDevEnvVar); isLocal {
 		// Create a random port to use for the chart sync service
-		m.devSyncPort = chartSyncBasePort + rand.Intn(5000)
+		devSyncPort := chartSyncBasePort + rand.Intn(5000)
 		m.FoundationDBURL = fmt.Sprintf("mongodb://127.0.0.1:%s", fdbPort)
-		m.SyncServiceURL = fmt.Sprintf("http://127.0.0.1:%d", m.devSyncPort)
+		m.SyncServiceURL = fmt.Sprintf("http://127.0.0.1:%d", devSyncPort)
 
 		// Run the chartrepo tool
 		dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
@@ -106,7 +106,7 @@ func (m *Monocular) configure() error {
 		cmd.Env = make([]string, 1)
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr
-		cmd.Env[0] = fmt.Sprintf("PORT=%d", m.devSyncPort)
+		cmd.Env[0] = fmt.Sprintf("PORT=%d", devSyncPort)
 		if err = cmd.Start(); err != nil {
 			log.Fatalf("Error starting chart sync tool: %+v", err)
 		} else {

From 052e507e83df3d8f8751e54e92e5a7c46986f96c Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 24 Feb 2020 14:06:02 +0000
Subject: [PATCH 440/648] Minor tweaks to Helm UI

---
 .../create-release.component.ts               |  7 ++
 ...onocular-repository-list-config.service.ts | 91 ++++++++++++++++++-
 src/jetstream/plugins/monocular/main.go       |  1 +
 src/jetstream/plugins/monocular/sync.go       | 22 ++++-
 4 files changed, 115 insertions(+), 6 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 f184d0896a..accb46c1c9 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
@@ -171,6 +171,13 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     this.validate$ = this.details.statusChanges.pipe(
       map(() => this.details.valid)
     );
+
+    // Auto-select first endpoint
+    this.kubeEndpoints$.pipe(first()).subscribe(endpoints => {
+      if (endpoints.length === 1) {
+        this.details.controls.endpoint.setValue(endpoints[0].guid);
+      }
+    });
   }
 
   private filterTyped(namespaces: string[], namespace: string): string[] {
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 c9018599bf..4f018e330e 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,7 @@
 import { Injectable, NgZone } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
+import { of as observableOf } from 'rxjs';
 
 import { AppState } from '../../../../../store/src/app-state';
 import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
@@ -15,9 +16,23 @@ import {
 import {
   TableCellEndpointStatusComponent,
 } from '../../../shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component';
-import { IListConfig, ListViewTypes } from '../../../shared/components/list/list.component.types';
+import { IListConfig, ListViewTypes, IListAction } from '../../../shared/components/list/list.component.types';
 import { defaultHelmKubeListPageSize } from '../../kubernetes/list-types/kube-helm-list-types';
 import { MonocularRepositoryDataSource } from './monocular-repository-list-source';
+import { HttpClient } from '@angular/common/http';
+import { environment } from '../../../environments/environment';
+import { map, pairwise } from 'rxjs/operators';
+import { MatSnackBar } from '@angular/material';
+import { SendClearEventAction } from 'frontend/packages/store/src/actions/internal-events.actions';
+import { DisconnectEndpoint, UnregisterEndpoint } from 'frontend/packages/store/src/actions/endpoint.actions';
+import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog.service';
+import { selectDeletionInfo } from 'frontend/packages/store/src/selectors/api.selectors';
+import { STRATOS_ENDPOINT_TYPE } from '../../../base-entity-schemas';
+import { endpointSchemaKey } from 'frontend/packages/store/src/helpers/entity-factory';
+import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service';
+import { ConfirmationDialogConfig } from '../../../shared/components/confirmation-dialog.config';
+import { CurrentUserPermissionsService } from '../../../core/current-user-permissions.service';
+import { CurrentUserPermissions } from '../../../core/current-user-permissions.config';
 
 @Injectable()
 export class MonocularRepositoryListConfig implements IListConfig<EndpointModel> {
@@ -71,13 +86,81 @@ export class MonocularRepositoryListConfig implements IListConfig<EndpointModel>
     },
   ];
 
+  private endpointEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointSchemaKey);
+
+  private listActionSyncRepository: IListAction<EndpointModel> = {
+    action: (item: EndpointModel) => {
+      const requestArgs = {
+        headers: null,
+        params: null
+      };
+      const proxyAPIVersion = environment.proxyAPIVersion;
+      const url = `/pp/${proxyAPIVersion}/chartrepos/${item.guid}`;
+      const req = this.httpClient.post(url, requestArgs);
+      req.subscribe(ok => {
+        this.snackBar.open('Helm Repository synchronization started', 'Dismiss', { duration: 3000 });
+        // Refresh repository status
+        this.dataSource.refresh();
+      }, err => {
+        this.snackBar.open(`Failed to Sycnhronize Helm Repository '${item.name}'`, 'Dismiss', { duration: 5000 });
+      });
+      return req;
+    },
+    label: 'Synchronize',
+    description: '',
+    createVisible: () => observableOf(true),
+    createEnabled: () => observableOf(true)
+  };
+
+  private deleteRepository: IListAction<EndpointModel> = {
+    action: (item) => {
+      const confirmation = new ConfirmationDialogConfig(
+        'Delete Helm Repository',
+        `Are you sure you want to delete repository '${item.name}'?`,
+        'Delete',
+        true
+      );
+      this.confirmDialog.open(confirmation, () => {
+        this.store.dispatch(new UnregisterEndpoint(item.guid, item.cnsi_type));
+        this.handleDeleteAction(item, ([oldVal, newVal]) => {
+          this.snackBar.open(`Delete Helm Repository '${item.name}'`, 'Dismiss', { duration: 3000 });
+        });
+      });
+    },
+    label: 'Delete',
+    description: 'Delete Helm Repository',
+    createVisible: () => this.currentUserPermissionsService.can(CurrentUserPermissions.ENDPOINT_REGISTER)
+  };
+
+  private handleDeleteAction(item, handleChange) {
+    this.handleAction(selectDeletionInfo(
+      this.endpointEntityKey,
+      item.guid,
+    ), handleChange);
+  }
+
+  private handleAction(storeSelect, handleChange) {
+    const disSub = this.store.select(storeSelect).pipe(
+      pairwise())
+      .subscribe(([oldVal, newVal]) => {
+        if (!newVal.error && (oldVal.busy && !newVal.busy)) {
+          handleChange([oldVal, newVal]);
+          disSub.unsubscribe();
+        }
+      });
+  }
+
   constructor(
-    private store: Store<AppState>,
+    public store: Store<AppState>,
     public activatedRoute: ActivatedRoute,
     paginationMonitorFactory: PaginationMonitorFactory,
     entityMonitorFactory: EntityMonitorFactory,
     internalEventMonitorFactory: InternalEventMonitorFactory,
-    ngZone: NgZone
+    ngZone: NgZone,
+    public httpClient: HttpClient,
+    public snackBar: MatSnackBar,
+    public confirmDialog: ConfirmationDialogService,
+    public currentUserPermissionsService: CurrentUserPermissionsService,
   ) {
     const highlighted = activatedRoute.snapshot.params.guid;
     this.dataSource = new MonocularRepositoryDataSource(
@@ -94,7 +177,7 @@ export class MonocularRepositoryListConfig implements IListConfig<EndpointModel>
   public getColumns = () => this.columns;
   public getGlobalActions = () => [];
   public getMultiActions = () => [];
-  public getSingleActions = () => [];
+  public getSingleActions = () => [this.listActionSyncRepository, this.deleteRepository];
   public getMultiFiltersConfigs = () => [];
   public getDataSource = () => this.dataSource;
 }
diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index 3d30928d34..97883ae678 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -225,6 +225,7 @@ func (m *Monocular) AddSessionGroupRoutes(echoGroup *echo.Group) {
 	// API for Helm Chart Repositories
 	echoGroup.GET("/chartrepos", m.ListRepos)
 	echoGroup.Any("/chartsvc/*", m.handleAPI)
+	echoGroup.POST("/chartrepos/:guid", m.SyncRepo)
 }
 
 // Forward requests to the Chart Service API
diff --git a/src/jetstream/plugins/monocular/sync.go b/src/jetstream/plugins/monocular/sync.go
index 356d4f32e4..206a6c055b 100644
--- a/src/jetstream/plugins/monocular/sync.go
+++ b/src/jetstream/plugins/monocular/sync.go
@@ -8,11 +8,11 @@ import (
 	"strings"
 	"time"
 
-	"k8s.io/apimachinery/pkg/util/wait"
-
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	"github.com/helm/monocular/chartrepo/common"
+	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
+	"k8s.io/apimachinery/pkg/util/wait"
 )
 
 type SyncJob struct {
@@ -41,6 +41,24 @@ func (m *Monocular) InitSync() {
 	go m.processSyncRequests()
 }
 
+// SyncRepos is endpoint to force a re-sync of a given Helm Repository
+func (m *Monocular) SyncRepo(c echo.Context) error {
+	log.Debug("SyncRepos")
+
+	// Lookup repository by GUID
+	var p = m.portalProxy
+	guid := c.Param("guid")
+	endpoint, err := p.GetCNSIRecord(guid)
+	if err != nil {
+		return interfaces.NewJetstreamErrorf("Could not find Helm Repository: %v+", err)
+	}
+
+	m.Sync(interfaces.EndpointRegisterAction, &endpoint)
+
+	response := "OK"
+	return c.JSON(200, response)
+}
+
 // Sync schedules a sync action for the given endpoint
 func (m *Monocular) Sync(action interfaces.EndpointAction, endpoint *interfaces.CNSIRecord) {
 

From 43fa98d2a9e13b29218040f80640181e21ba8761 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 25 Feb 2020 09:24:59 +0000
Subject: [PATCH 441/648] Add sync

---
 .../app/custom/helm/store/helm.effects.ts     | 72 ++++++++++++++++++-
 src/jetstream/plugins/monocular/main.go       |  1 +
 src/jetstream/plugins/monocular/repository.go | 39 ++++++++++
 src/jetstream/plugins/monocular/sync.go       |  2 +
 4 files changed, 113 insertions(+), 1 deletion(-)

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 2bbf7f13f2..c93ff4c4e3 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.effects.ts
@@ -13,7 +13,7 @@ import {
   WrapperRequestActionFailed,
   WrapperRequestActionSuccess,
 } from 'frontend/packages/store/src/types/request.types';
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
 import { catchError, flatMap, mergeMap } from 'rxjs/operators';
 
 import { environment } from '../../../environments/environment';
@@ -27,6 +27,7 @@ import {
   HelmInstall,
 } from './helm.actions';
 import { HelmVersion } from './helm.types';
+import { GetAllEndpointsSuccess, GET_ENDPOINTS_SUCCESS } from 'frontend/packages/store/src/actions/endpoint.actions';
 
 @Injectable()
 export class HelmEffects {
@@ -37,8 +38,39 @@ export class HelmEffects {
     private store: Store<AppState>
   ) { }
 
+  // Endpoints that we know are synchronizing
+  private syncing = {};
+  private syncTimer = null;
+
   proxyAPIVersion = environment.proxyAPIVersion;
 
+  // Ensure that we refresh the charts when a repository finishes synchronizing
+  @Effect()
+  updateOnSyncFinished$ = this.actions$.pipe(
+    ofType<GetAllEndpointsSuccess>(GET_ENDPOINTS_SUCCESS),
+    flatMap(action => {
+      // Look to see if we have any endpoints that are sycnhronizing
+      let updated = false;
+      Object.values(action.payload.entities.stratosEndpoint).forEach(endpoint => {
+        if (endpoint.cnsi_type === 'helm' && endpoint.endpoint_metadata) {
+          if (endpoint.endpoint_metadata.status === 'Synchronizing') {
+            // An endpoint is busy, so add it to the list to be monitored
+            if (!this.syncing[endpoint.guid]) {
+              this.syncing[endpoint.guid] = true;
+              updated = true;
+            }
+          }
+        }
+      });
+
+      if (updated) {
+        // Schedule check
+        this.scheduleSyncStatusCheck();
+      }
+      return [];
+    })
+  );
+
   @Effect()
   fetchCharts$ = this.actions$.pipe(
     ofType<GetMonocularCharts>(GET_MONOCULAR_CHARTS),
@@ -188,4 +220,42 @@ export class HelmEffects {
     };
   }
 
+  private checkSyncStatus() {
+    // Dispatch request
+    const url = `/pp/${this.proxyAPIVersion}/chartrepos/status`;
+    const requestArgs = {
+      headers: null,
+      params: null
+    };
+    const req = this.httpClient.post(url, this.syncing, requestArgs);
+    req.subscribe(data => {
+      if (data) {
+        const existing = Object.keys(data).length;
+        const syncing = {};
+        Object.keys(data).forEach(guid => {
+          if (data[guid]) {
+            syncing[guid] = true;
+          }
+        });
+        const remaining = Object.keys(syncing).length;
+        this.syncing = syncing;
+        if (remaining !== existing) {
+          // Dispatch action to refresh charts
+          this.store.dispatch(new GetMonocularCharts());
+        }
+        if (remaining > 0) {
+          this.scheduleSyncStatusCheck();
+        }
+      }
+    });
+  }
+
+  private scheduleSyncStatusCheck() {
+    if (this.syncTimer !== null) {
+      clearTimeout(this.syncTimer);
+      this.syncTimer = null;
+    }
+    this.syncTimer = setTimeout(() => this.checkSyncStatus(), 5000);
+  }
+
 }
diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index 97883ae678..0a6b38438e 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -225,6 +225,7 @@ func (m *Monocular) AddSessionGroupRoutes(echoGroup *echo.Group) {
 	// API for Helm Chart Repositories
 	echoGroup.GET("/chartrepos", m.ListRepos)
 	echoGroup.Any("/chartsvc/*", m.handleAPI)
+	echoGroup.POST("/chartrepos/status", m.GetRepoStatuses)
 	echoGroup.POST("/chartrepos/:guid", m.SyncRepo)
 }
 
diff --git a/src/jetstream/plugins/monocular/repository.go b/src/jetstream/plugins/monocular/repository.go
index 3bb93d5f04..18b1f3e600 100644
--- a/src/jetstream/plugins/monocular/repository.go
+++ b/src/jetstream/plugins/monocular/repository.go
@@ -1,8 +1,11 @@
 package monocular
 
 import (
+	"encoding/json"
 	"errors"
+	"io/ioutil"
 
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
 )
@@ -16,6 +19,8 @@ type HelmRepoInfo struct {
 	} `json:"attributes"`
 }
 
+type helmStatusInfo map[string]bool
+
 func (m *Monocular) ListRepos(c echo.Context) error {
 	log.Debug("ListRepos")
 
@@ -40,3 +45,37 @@ func (m *Monocular) ListRepos(c echo.Context) error {
 
 	return c.JSON(200, repos)
 }
+
+// GetRepoStatuses will get the status of the Helm Endpoints requested
+func (m *Monocular) GetRepoStatuses(c echo.Context) error {
+	log.Debug("GetRepoStatuses")
+
+	// Get the list of endpoints we are looking at
+	// Need to extract the parameters from the request body
+	req := c.Request()
+	defer req.Body.Close()
+	body, err := ioutil.ReadAll(req.Body)
+	if err != nil {
+		return interfaces.NewJetstreamError("Could not read request body")
+	}
+
+	info := helmStatusInfo{}
+	if err := json.Unmarshal(body, &info); err == nil {
+		for guid := range info {
+			newVal := false
+			if endpoint, err := m.portalProxy.GetCNSIRecord(guid); err == nil {
+				if len(endpoint.Metadata) > 0 {
+					status := SyncMetadata{}
+					if err = json.Unmarshal([]byte(endpoint.Metadata), &status); err == nil {
+						newVal = status.Busy
+					}
+				}
+			}
+			info[guid] = newVal
+		}
+	} else {
+		return interfaces.NewJetstreamError("Could not parse Helm Endpoint IDs")
+	}
+
+	return c.JSON(200, info)
+}
diff --git a/src/jetstream/plugins/monocular/sync.go b/src/jetstream/plugins/monocular/sync.go
index 206a6c055b..c877d03ea1 100644
--- a/src/jetstream/plugins/monocular/sync.go
+++ b/src/jetstream/plugins/monocular/sync.go
@@ -139,11 +139,13 @@ func (m *Monocular) processSyncRequests() {
 					metadata.Status = "Sync Failed"
 				} else {
 					metadata.Status = "Synchronizing"
+					metadata.Busy = true
 					m.updateMetadata(job.Endpoint.GUID, metadata)
 					log.Infof("Sync in progress for repository: %s", job.Endpoint.APIEndpoint.String())
 					//Now wait for success
 					statusURL := fmt.Sprintf("%s%s/status/%s", m.SyncServiceURL, chartRepoPathPrefix, job.Endpoint.Name)
 					err := waitForSyncComplete(statusURL)
+					metadata.Busy = false
 					if err == nil {
 						metadata.Status = "Synchronized"
 					} else {

From 3d390698b10f7b0180f152fb2f595434e33445db Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 25 Feb 2020 09:28:57 +0000
Subject: [PATCH 442/648] Fix helm chart patching for SUSE

---
 custom-src/deploy/kubernetes/customize-helm.sh | 3 +--
 deploy/kubernetes/build.sh                     | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/custom-src/deploy/kubernetes/customize-helm.sh b/custom-src/deploy/kubernetes/customize-helm.sh
index b93e476ebb..d7ef8c7cd3 100755
--- a/custom-src/deploy/kubernetes/customize-helm.sh
+++ b/custom-src/deploy/kubernetes/customize-helm.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
-STRATOS_PATH=$1
-CHART_PATH=$2
+CHART_PATH=$1
 
 # Script folder
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
index 8ec8d59bad..5697be80a8 100755
--- a/deploy/kubernetes/build.sh
+++ b/deploy/kubernetes/build.sh
@@ -234,7 +234,7 @@ rm -rf ${DEST_HELM_CHART_PATH}/**/*.orig
 # Run customization script if there is one
 if [ -f "${STRATOS_PATH}/custom-src/deploy/kubernetes/customize-helm.sh" ]; then
   printf "${YELLOW}${BOLD}Applying Helm Chart customizations${RESET}\n"
-  ${STRATOS_PATH}/custom-src/deploy/kubernetes/customize-helm.sh "${STRATOS_PATH}" "${DEST_HELM_CHART_PATH}"
+  ${STRATOS_PATH}/custom-src/deploy/kubernetes/customize-helm.sh "${DEST_HELM_CHART_PATH}"
 fi
 
 # Fetch subcharts

From a1b6d9b15569c54dbfc9e5a0168094c1d5505621 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Tue, 25 Feb 2020 10:46:19 +0000
Subject: [PATCH 443/648] Remove unused lock file

---
 deploy/kubernetes/console/requirements.lock | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 deploy/kubernetes/console/requirements.lock

diff --git a/deploy/kubernetes/console/requirements.lock b/deploy/kubernetes/console/requirements.lock
deleted file mode 100644
index 71b03f85b5..0000000000
--- a/deploy/kubernetes/console/requirements.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: fdbdoclayer
-  repository: file://./local-helm/fdbdoclayer/
-  version: 0.1.0
-digest: sha256:e783f9ae56e7661533bba491fae357ae2b8d18367ac0bde6715dcc68a982348f
-generated: "2019-12-10T13:27:53.911953269Z"

From a87d4b79d1106e0c1f08af2488eb0a6bd79f1b07 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Tue, 25 Feb 2020 11:08:27 +0000
Subject: [PATCH 444/648] Helm Chart readme tidy ups

---
 .../deploy/kubernetes/customize-helm.sh       |  6 ++
 deploy/kubernetes/console/README.md           | 61 +++++++++++--------
 2 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/custom-src/deploy/kubernetes/customize-helm.sh b/custom-src/deploy/kubernetes/customize-helm.sh
index d7ef8c7cd3..6284fe6c35 100755
--- a/custom-src/deploy/kubernetes/customize-helm.sh
+++ b/custom-src/deploy/kubernetes/customize-helm.sh
@@ -44,6 +44,12 @@ echo -e "${CYAN}Patching README.md${RESET}"
 # Change all references to 'Stratos' (case sensitive)
 sed -i.bak -e 's@Stratos@SUSE Stratos Console@g' ${CHART_PATH}/README.md
 
+# Change first paragraph to include Kubernetes
+console for Cloud Foundry.
+SRC="console for Cloud Foundry."
+DEST="console for Cloud Foundry and Kubernetes."
+sed -i.bak -e 's@'"${SRC}"'@'"${DEST}"'@g' ${CHART_PATH}/README.md
+
 # Change command for helm repo addition
 HELM_ADD="helm repo add stratos https://cloudfoundry.github.io/stratos"
 SUSE_HELM_ADD="helm repo add suse https://registry.suse.com"
diff --git a/deploy/kubernetes/console/README.md b/deploy/kubernetes/console/README.md
index 933f0ede2e..a634aecf0a 100644
--- a/deploy/kubernetes/console/README.md
+++ b/deploy/kubernetes/console/README.md
@@ -25,11 +25,13 @@ NAME               	CHART VERSION   APP VERSION	DESCRIPTION
 stratos/console    	3.0.0           3.0.0      	A Helm chart for deploying Stratos UI Console
 ```
 
+> 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:
 
 ```
 kubectl create namespace console
-helm install stratos/console --namespace=console --name my-console
+helm install my-console stratos/console --namespace=console
 ```
 
 > **Note**: The first `kubectl` command will create a namespace for Stratos. With Helm 3 you must create a namespace before installing.
@@ -37,7 +39,7 @@ We recommend installing Stratos into a separate namespace.
 
 > **Note**: This assumes that a storage class exists in the Kubernetes cluster that has been marked as `default`. If no such storage class exists, a specific storage class needs to be specified, please see the following section *Specifying a custom Storage Class*. 
 
-> You can change the namespace (--namespace) and the release name (--name) to values of your choice.
+> You can change the namespace (--namespace) and the release name to values of your choice.
 
 This will create a Stratos instance named `my-console` in a namespace called `console` in your Kubernetes cluster.
 
@@ -115,6 +117,7 @@ The following table lists the configurable parameters of the Stratos Helm chart
 ## Accessing the Console
 
 To check the status of the instance use the following command:
+
 ```
 helm status my-console
 ```
@@ -124,7 +127,7 @@ helm status my-console
 The console is exposed via an HTTPS service - `RELEASE-NAME-ui-ext` (where RELEASE-NAME is the name used for the `name` parameter when installing). You can find the details of this service with:
 
 ```
-$ kubectl get services -n NAMESPACE
+kubectl get services -n NAMESPACE
 NAME                 TYPE        CLUSTER-IP      EXTERNAL-IP   PORT(S)         AGE
 my-console-mariadb   ClusterIP   10.105.216.25   <none>        3306/TCP        60s
 my-console-ui-ext    NodePort    10.109.207.70   <none>        443:31067/TCP   60s
@@ -141,15 +144,17 @@ The URL you use for accessing Stratos will depend on the service configuration a
 To upgrade your instance when using the Helm repository, fetch any updates to the repository:
 
 ```
-$ helm repo update
+helm repo update
 ```
 
 To update an instance, the following assumes your instance is called `my-console`:
 
 ```
-$ helm upgrade my-console stratos/console --recreate-pods
+helm upgrade my-console stratos/console --recreate-pods
 ```
 
+> Note: You *must* use the `--recreate-pods` flag when upgrading
+
 After the upgrade, perform a `helm list` to ensure your console is the latest version.
 
 ## Uninstalling
@@ -157,7 +162,7 @@ After the upgrade, perform a `helm list` to ensure your console is the latest ve
 To uninstall Stratos, delete the Helm release and also delete the Kubernetes namespace:
 
 ```
-helm delete --namespace=console --name my-console --purge
+helm delete my-console --purge
 kubectl delete namespace console
 ```
 
@@ -170,8 +175,10 @@ delete the namespace to remove these secrets.
 
 If your Kubernetes deployment supports automatic configuration of a load balancer (e.g. Google Container Engine), specify the parameters `console.service.type=LoadBalancer` when installing.
 
+
 ```
-helm install stratos/console --namespace=console --name my-console --set console.service.type=LoadBalancer
+kubectl create namespace console
+helm install my-console stratos/console --namespace=console --set console.service.type=LoadBalancer
 ```
 
 ## Using an Ingress Controller
@@ -210,7 +217,8 @@ kube:
 Deploy with:
 
 ```
-helm install stratos/console -f private_overrides.yaml --namespace=metrics
+kubectl create namespace console
+helm install my-console stratos/console --namespace=console -f private_overrides.yaml
 ```
 
 ## Deploying with your own TLS certificates
@@ -228,7 +236,9 @@ kubectl create secret tls -n NAMESPACE stratos-tls-secret --cert=tls.crt --key=t
 You can now install Stratos with:
 
 ```
-helm install stratos/console --namespace console --name my-console --set console.tlsSecretName=stratos-tls-secret
+kubectl create namespace console
+helm install my-console stratos/console --namespace=console --set console.tlsSecretName=stratos-tls-secret
+
 ```
 
 ## Using an External Database
@@ -257,8 +267,10 @@ When using an external database server, Stratos expects that you have:
 ## Specifying UAA configuration
 
 When deploying with SCF, the `scf-config-values.yaml` (see [SCF Wiki link](https://github.com/SUSE/scf/wiki/How-to-Install-SCF#configuring-the-deployment)) can be supplied when installing Stratos.
+
 ```
-$ helm install stratos/console  -f scf-config-values.yaml
+kubectl create namespace console
+helm install my-console stratos/console --namespace=console -f scf-config-values.yaml
 ```
 
 UAA configuration can be specified by providing the following configuration.
@@ -276,8 +288,11 @@ uaa:
 ```
 
 To install Stratos with the above specified configuration:
+
+
 ```
-$ helm install stratos/console -f uaa-config.yaml
+kubectl create namespace console
+helm install my-console stratos/console --namespace=console -f uaa-config.yaml
 ```
 
 ## Configuring a local user account
@@ -287,19 +302,8 @@ This allows for deployment without a UAA. To enable the local user account, supp
 To deploy using our Helm repository:
 
 ```
-helm install stratos/console --namespace=console --name my-console --set console.localAdminPassword=<password>
-```
-
-To deploy using an archive file containing a given release of our Helm chart
-
-```
-helm install console --namespace=console --name my-console --set console.localAdminPassword=<password>
-```
-
-To deploy using the latest Helm chart directly from out GitHub repository
-
-```
-$ helm install console --namespace console --name my-console --set console.localAdminPassword=<password>
+kubectl create namespace console
+helm install my-console stratos/console --namespace=console --set console.localAdminPassword=<password>
 ```
 
 ## Specifying Annotations and Labels
@@ -340,6 +344,7 @@ For non-production environments, you may want to use the `hostpath` storage clas
 ```
 kubectl patch storageclass <your-class-name> -p '{"metadata": {"annotations":{"storageclass.kubernetes.io/is-default-class":"true"}}}'
 ```
+
 Where `<your-class-name>` would be `hostpath` if you follow the SCF instructions.
 
 
@@ -349,7 +354,7 @@ If no default storage class has been defined in the Kubernetes cluster. The Stra
 
 #### Providing Storage Class override
 ```
-$ kubectl get storageclass
+kubectl get storageclass
 NAME                TYPE
 ssd                 kubernetes.io/host-path   
 persistent          kubernetes.io/host-path   
@@ -372,11 +377,14 @@ mariadb:
 ```
 
 Run Helm with the override:
+
 ```
-helm install -f override.yaml stratos/console
+kubectl create namespace console
+helm install my-console stratos/console --namespace=console -f override.yaml
 ```
 
 #### Create a default Storage Class
+
 Alternatively, you can configure a storage class with `storageclass.kubernetes.io/is-default-class` set to `true`. For instance the following storage class will be declared as the default. If you don't have the `hostpath` provisioner available in your local cluster, please follow the instructions on [link](https://github.com/kubernetes-incubator/external-storage/tree/master/docs/demo/hostpath-provisioner), to deploy one.
 
 If the hostpath provisioner is available, save the file to `storageclass.yaml`
@@ -393,6 +401,7 @@ provisioner: kubernetes.io/host-path # Or whatever the local hostpath provisione
 ```
 
 To create it in your kubernetes cluster, execute the following.
+
 ```
 kubectl create -f storageclass.yaml
 ```

From 0464a8f97e2beeb190ba31d004cf66219b9a6037 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Tue, 25 Feb 2020 13:47:33 +0000
Subject: [PATCH 445/648] Fix typo

---
 .../helm/list-types/monocular-repository-list-config.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 4f018e330e..36fd3297e1 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
@@ -102,7 +102,7 @@ export class MonocularRepositoryListConfig implements IListConfig<EndpointModel>
         // Refresh repository status
         this.dataSource.refresh();
       }, err => {
-        this.snackBar.open(`Failed to Sycnhronize Helm Repository '${item.name}'`, 'Dismiss', { duration: 5000 });
+        this.snackBar.open(`Failed to Synchronize Helm Repository '${item.name}'`, 'Dismiss', { duration: 5000 });
       });
       return req;
     },

From 9cea77130330a200edf051214d95b25229da83a5 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 26 Feb 2020 10:27:56 +0000
Subject: [PATCH 446/648] Address PR feedback

---
 custom-src/frontend/app/custom/helm/store/helm.effects.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 c93ff4c4e3..4d3d1534dd 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.effects.ts
@@ -28,6 +28,7 @@ import {
 } 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 {
@@ -52,7 +53,7 @@ export class HelmEffects {
       // Look to see if we have any endpoints that are sycnhronizing
       let updated = false;
       Object.values(action.payload.entities.stratosEndpoint).forEach(endpoint => {
-        if (endpoint.cnsi_type === 'helm' && endpoint.endpoint_metadata) {
+        if (endpoint.cnsi_type === HELM_ENDPOINT_TYPE && endpoint.endpoint_metadata) {
           if (endpoint.endpoint_metadata.status === 'Synchronizing') {
             // An endpoint is busy, so add it to the list to be monitored
             if (!this.syncing[endpoint.guid]) {

From 6c9769fc54a6a5ca6a242fd558e69ddec10e3e44 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 26 Feb 2020 10:46:53 +0000
Subject: [PATCH 447/648] Changelog for 3.0.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f34fb1060a..d0a75d96f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,62 @@
 # Change Log
 
+## 3.0.0
+
+[Full Changelog](https://github.com/cloudfoundry/stratos/compare/2.7.0...3.0.0)
+
+This release sees the Helm functionality move out of technology preview and get an upgrade to Helm 3. Helm releases have been brought out to the
+top-level under a new 'Workloads' side navigation item.
+
+The Helm Chart has also been updated - the upgrade volume has been removed, custom annotations can be added to pods and other resources
+and an external database can be used in place of the integrated MariaDB.
+
+Release details:
+
+**Fixes:**
+
+- Error setting user favourites [\#4086](https://github.com/cloudfoundry/stratos/issues/4086)
+- Fix local admin profile [\#4122](https://github.com/cloudfoundry/stratos/pull/4122)
+- Multiple User Provided Service Instance Create/Update Fixes [\#4117](https://github.com/cloudfoundry/stratos/pull/4117)
+- Fix user profile when deployed with Ingress (Helm) [\#4110](https://github.com/cloudfoundry/stratos/pull/4110)
+- Fix panic on backend error logging [\#4098](https://github.com/cloudfoundry/stratos/pull/4098)
+- Fix failing VCAP_SERVICE credentials check [\#4084](https://github.com/cloudfoundry/stratos/pull/4084)
+- Edit application: fixed validation for mem and disk quota [\#4070](https://github.com/cloudfoundry/stratos/pull/4070)
+- Fix local auth session timeout [\#4028](https://github.com/cloudfoundry/stratos/pull/4028)
+- Ensure active dialog times out correctly [\#4026](https://github.com/cloudfoundry/stratos/pull/4026)
+- Helm: Postflight job should not be a container [\#3506](https://github.com/cloudfoundry/stratos/issues/3506)
+- Card for favourited helm endpoint shows `disconnected` [\#223](https://github.com/SUSE/stratos/issues/223)
+- Hide required markers on login page [/#329](https://github.com/SUSE/stratos/pull/329)
+
+**Improvements:**
+
+- Deploy application via docker image [\#4025](https://github.com/cloudfoundry/stratos/issues/4025)
+- Favourite Card: Add icon for endpoints and improve UX [\#4095](https://github.com/cloudfoundry/stratos/pull/4095)
+- Add cf events page to cf, org and space levels [\#4066](https://github.com/cloudfoundry/stratos/pull/4066)
+- Add table view to marketplace service table [\#4064](https://github.com/cloudfoundry/stratos/pull/4064)
+- Add actions to app service table, add delete org button to org summary [\#4063](https://github.com/cloudfoundry/stratos/pull/4063)
+- Improvements to error/notification process [\#4053](https://github.com/cloudfoundry/stratos/pull/4053)
+- Add an initial loading indicator with customization support [\#4045](https://github.com/cloudfoundry/stratos/pull/4045)
+- Add support for Stratos buildpack verbose logging [\#4039](https://github.com/cloudfoundry/stratos/pull/4039)
+- Add support for setup UI for local admin account [\#4031](https://github.com/cloudfoundry/stratos/pull/4031)
+- Add a dark mode [\#4017](https://github.com/cloudfoundry/stratos/pull/4017)
+- Allow notifications to be marked as 'read' [\#4011](https://github.com/cloudfoundry/stratos/pull/4011)
+- Add endpoint error page [\#3991](https://github.com/cloudfoundry/stratos/pull/3991)
+- Helm Chart: Numerous improvements [\#4000](https://github.com/cloudfoundry/stratos/pull/4000)
+- Helm Chart: Add support for using an external database [\#3499](https://github.com/cloudfoundry/stratos/issues/3499)
+- Helm Chart: Randomize passwords [\#1416](https://github.com/cloudfoundry/stratos/issues/1416)
+- Helm Chart: Allow custom annotations on Pods [\#4109](https://github.com/cloudfoundry/stratos/issues/4109)
+- Helm Chart: Add support for default UAA zone [\#4101](https://github.com/cloudfoundry/stratos/issues/4101)
+- Base images bump [\#3990](https://github.com/cloudfoundry/stratos/pull/3990)
+- Update to Angular 8 [\#3950](https://github.com/cloudfoundry/stratos/pull/3950)
+- Reflect app title in setup screens [\#4090](https://github.com/cloudfoundry/stratos/pull/4090)
+- Add a confirmation dialogue when deleting a helm install [\#208](https://github.com/SUSE/stratos/issues/208)
+- Add support for TLS with MySQL [\#325](https://github.com/SUSE/stratos/pull/325)
+- Update SLE base images [\#316](https://github.com/SUSE/stratos/pull/316)
+- Add loading indicator for Workload resource stats [\#313](https://github.com/SUSE/stratos/pull/313)
+- Optionally create kube namespace during helm install [\#273](https://github.com/SUSE/stratos/pull/273)
+- Switch to helm 3 [\#233](https://github.com/SUSE/stratos/pull/233)
+- Add Workloads view [\#263](https://github.com/SUSE/stratos/pull/263)
+
 ## 2.7.0
 
 [Full Changelog](https://github.com/SUSE/stratos/compare/2.6.1...2.7.0)

From 6768de0de051b594f24c798d34fd9429dadb2043 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 27 Feb 2020 16:03:00 +0000
Subject: [PATCH 448/648] Fix kube connect bugs

---
 .../kubernetes/kubernetes-entity-generator.ts |  4 +--
 .../connect-endpoint.component.ts             | 18 ++++++------
 src/jetstream/plugins/kubernetes/main.go      | 28 ++++++++++++++++++-
 3 files changed, 39 insertions(+), 11 deletions(-)

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 87c166f128..cd4b43f25a 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
@@ -61,7 +61,7 @@ const kubeAuthTypeMap: { [type: string]: EndpointAuthTypeConfig } = {
   },
   [KubeEndpointAuthTypes.CONFIG]: {
     value: KubeEndpointAuthTypes.CONFIG,
-    name: 'CAASP (OIDC)',
+    name: 'Kube Config',
     form: {
       kubeconfig: ['', Validators.required],
     },
@@ -109,7 +109,7 @@ export function generateKubernetesEntities(): StratosBaseCatalogEntity[] {
     iconFont: 'stratos-icons',
     logoUrl: '/core/assets/custom/kubernetes.svg',
     urlValidation: undefined,
-    authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.CERT_AUTH]],
+    authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.CERT_AUTH], kubeAuthTypeMap[KubeEndpointAuthTypes.CONFIG]],
     renderPriority: 4,
     subTypes: [{
       type: 'caasp',
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 1f4d5d7e62..a7f6c6d89b 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
@@ -13,13 +13,13 @@ import {
 } from '@angular/core';
 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 { EndpointAuthTypeConfig, IAuthForm, IEndpointAuthComponent } from '../../../core/extension/extension-types';
 import { safeUnsubscribe } from '../../../core/utils.service';
 import { ConnectEndpointConfig, ConnectEndpointData, ConnectEndpointService } from '../connect.service';
 import { BaseEndpointAuth } from '../endpoint-auth';
+import { map } from 'rxjs/operators';
 
 @Component({
   selector: 'app-connect-endpoint',
@@ -114,14 +114,15 @@ export class ConnectEndpointComponent implements OnInit, OnDestroy {
     // Template container reference is not available at construction
     this.createComponent(this.autoSelected.component);
 
-    this.subs.push(this.endpointForm.valueChanges.pipe(
-      map(() => this.endpointForm.valid)
-    ).subscribe(res => {
-      this.setData();
-      this.valid.next(res);
+    this.subs.push(this.endpointForm.valueChanges.pipe().subscribe(res => {
+      const authType = this.authTypesForEndpoint.find(ep => ep.value === res.authType);
+      let valid = false;
+      if (authType.component === this.authFormComponentRef.componentType) {
+        this.setData();
+        valid = this.endpointForm.valid;
+      }
+      this.valid.next(valid);
     }));
-
-    // Set initial valid status
     this.endpointForm.updateValueAndValidity();
   }
 
@@ -160,6 +161,7 @@ export class ConnectEndpointComponent implements OnInit, OnDestroy {
     if (this.authFormComponentRef) {
       this.authFormComponentRef.destroy();
     }
+
     const factory = this.resolver.resolveComponentFactory<IAuthForm>(component);
     this.authFormComponentRef = this.container.createComponent<IAuthForm>(factory);
     this.authFormComponentRef.instance.formGroup = this.endpointForm;
diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index f79d23abad..fc2dc708bd 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -33,6 +33,12 @@ type KubeStatus struct {
 	Code       int         `json:"code"`
 }
 
+type kubeErrorStatus struct {
+	Type    string `json:"type"`
+	Status  string `json:"status"`
+	Message string `json:"message"`
+}
+
 type KubeAPIVersions struct {
 	Kind                       string        `json:"kind"`
 	Versions                   []string      `json:"versions"`
@@ -83,8 +89,18 @@ func (c *KubernetesSpecification) Validate(userGUID string, cnsiRecord interface
 		return err
 	}
 
+	log.Error("=====================================")
+
+	log.Error(err)
+	log.Error(response.StatusCode)
+
 	if response.StatusCode >= 400 {
-		return fmt.Errorf("Unable to connect to endpoint: %s", response.Error.Error())
+
+		log.Info(response.Error)
+		if response.Error != nil {
+			return fmt.Errorf("Unable to connect to endpoint: %s", response.Error.Error())
+		}
+		return fmt.Errorf("Unable to connect to endpoint: %d => %s", response.StatusCode, response.Status)
 	}
 
 	return nil
@@ -200,6 +216,16 @@ func (c *KubernetesSpecification) Info(apiEndpoint string, skipSSLValidation boo
 		if kubeStatus.Kind != "Status" {
 			return newCNSI, nil, fmt.Errorf("Failed to parse 403 output as kube kind status: %+v", kubeStatus)
 		}
+	} else if res.StatusCode == 401 {
+		log.Debug("Kube API Versions Failed (401)")
+		kubeStatus := kubeErrorStatus{}
+		err := json.Unmarshal(body, &kubeStatus)
+		if err != nil {
+			return newCNSI, nil, fmt.Errorf("Failed to parse 401 output as kube kind status: %+v", err)
+		}
+		if kubeStatus.Type != "error" || kubeStatus.Status != "401" {
+			return newCNSI, nil, fmt.Errorf("Failed to parse 401 output as kube kind status: %+v", kubeStatus)
+		}
 	} else {
 		return newCNSI, nil, fmt.Errorf("Dissallowed response code from `/api` call: %+v", res.StatusCode)
 	}

From 6da2bf8e34a0abbd2d8648bc31b3b2d848dface7 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 27 Feb 2020 18:47:47 +0000
Subject: [PATCH 449/648] Fix issues with rancher kube config

---
 src/jetstream/passthrough.go                  |  4 +++-
 .../plugins/kubernetes/auth/token.go          | 19 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/jetstream/passthrough.go b/src/jetstream/passthrough.go
index 26f68144dd..f59435b028 100644
--- a/src/jetstream/passthrough.go
+++ b/src/jetstream/passthrough.go
@@ -9,6 +9,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/url"
+	"path"
 	"strings"
 	"time"
 
@@ -171,7 +172,8 @@ func (p *portalProxy) buildCNSIRequest(cnsiGUID string, userGUID string, method
 
 	cnsiRequest.URL = new(url.URL)
 	*cnsiRequest.URL = *cnsiRec.APIEndpoint
-	cnsiRequest.URL.Path = uri.Path
+	// The APIEndpoint might have a path already - so join the request URI to it
+	cnsiRequest.URL.Path = path.Join(cnsiRequest.URL.Path, uri.Path)
 	cnsiRequest.URL.RawQuery = uri.RawQuery
 
 	return cnsiRequest, nil
diff --git a/src/jetstream/plugins/kubernetes/auth/token.go b/src/jetstream/plugins/kubernetes/auth/token.go
index 4df2445ca6..8a31ccfa2e 100644
--- a/src/jetstream/plugins/kubernetes/auth/token.go
+++ b/src/jetstream/plugins/kubernetes/auth/token.go
@@ -1,6 +1,8 @@
 package auth
 
 import (
+	"strings"
+
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
@@ -50,6 +52,21 @@ func (c *KubeTokenAuth) RegisterJetstreamAuthType(portal interfaces.PortalProxy)
 	// Register auth type with Jetstream
 	c.portalProxy.AddAuthProvider(c.GetName(), interfaces.AuthProvider{
 		Handler:  c.portalProxy.DoOidcFlowRequest,
-		UserInfo: nil,
+		UserInfo: c.GetUserFromToken,
 	})
 }
+
+func (c *KubeTokenAuth) GetUserFromToken(cnsiGUID string, tokenRecord *interfaces.TokenRecord) (*interfaces.ConnectedUser, bool) {
+	log.Debug("GetUserFromToken (KubeTokenAuth)")
+
+	parts := strings.Split(tokenRecord.AuthToken, ":")
+	if len(parts) != 2 {
+		return c.portalProxy.GetCNSIUserFromOAuthToken(cnsiGUID, tokenRecord)
+	}
+
+	return &interfaces.ConnectedUser{
+		GUID:   parts[0],
+		Name:   parts[0],
+		Scopes: make([]string, 0),
+	}, true
+}

From a10feec5ac56b9dc96137e45d5be7ad41ab9e5a2 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 27 Feb 2020 18:49:29 +0000
Subject: [PATCH 450/648] Remove debug logging

---
 src/jetstream/plugins/kubernetes/main.go | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index fc2dc708bd..11f734427c 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -89,11 +89,6 @@ func (c *KubernetesSpecification) Validate(userGUID string, cnsiRecord interface
 		return err
 	}
 
-	log.Error("=====================================")
-
-	log.Error(err)
-	log.Error(response.StatusCode)
-
 	if response.StatusCode >= 400 {
 
 		log.Info(response.Error)

From 78f8647cb6838f927ac25bd6646d92f5f0e09769 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Fri, 28 Feb 2020 08:35:33 +0000
Subject: [PATCH 451/648] Add back removed comment

---
 .../endpoints/connect-endpoint/connect-endpoint.component.ts  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 a7f6c6d89b..e405e0b217 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
@@ -13,13 +13,13 @@ import {
 } from '@angular/core';
 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 { EndpointAuthTypeConfig, IAuthForm, IEndpointAuthComponent } from '../../../core/extension/extension-types';
 import { safeUnsubscribe } from '../../../core/utils.service';
 import { ConnectEndpointConfig, ConnectEndpointData, ConnectEndpointService } from '../connect.service';
 import { BaseEndpointAuth } from '../endpoint-auth';
-import { map } from 'rxjs/operators';
 
 @Component({
   selector: 'app-connect-endpoint',
@@ -123,6 +123,8 @@ export class ConnectEndpointComponent implements OnInit, OnDestroy {
       }
       this.valid.next(valid);
     }));
+    
+    // Set initial valid status    
     this.endpointForm.updateValueAndValidity();
   }
 

From d1d717ce5b196137a161843f33559fd2a99da4a0 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Fri, 28 Feb 2020 08:36:08 +0000
Subject: [PATCH 452/648] Remove whitespace

---
 .../endpoints/connect-endpoint/connect-endpoint.component.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 e405e0b217..185456b739 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
@@ -123,8 +123,8 @@ export class ConnectEndpointComponent implements OnInit, OnDestroy {
       }
       this.valid.next(valid);
     }));
-    
-    // Set initial valid status    
+
+    // Set initial valid status
     this.endpointForm.updateValueAndValidity();
   }
 

From 0ad41de42a376dc104e6f7bf6597a4147156550b Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 28 Feb 2020 08:41:24 +0000
Subject: [PATCH 453/648] Tweak to ensure compatibility with previous code
 paths

---
 src/jetstream/plugins/kubernetes/auth/token.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/jetstream/plugins/kubernetes/auth/token.go b/src/jetstream/plugins/kubernetes/auth/token.go
index 8a31ccfa2e..f05124ef67 100644
--- a/src/jetstream/plugins/kubernetes/auth/token.go
+++ b/src/jetstream/plugins/kubernetes/auth/token.go
@@ -59,9 +59,16 @@ func (c *KubeTokenAuth) RegisterJetstreamAuthType(portal interfaces.PortalProxy)
 func (c *KubeTokenAuth) GetUserFromToken(cnsiGUID string, tokenRecord *interfaces.TokenRecord) (*interfaces.ConnectedUser, bool) {
 	log.Debug("GetUserFromToken (KubeTokenAuth)")
 
+	// See if we can get token info - if we can, use it
+	_, err := c.portalProxy.GetUserTokenInfo(tokenRecord.AuthToken)
+	if err == nil {
+		return c.portalProxy.GetCNSIUserFromOAuthToken(cnsiGUID, tokenRecord)
+	}
+
 	parts := strings.Split(tokenRecord.AuthToken, ":")
 	if len(parts) != 2 {
-		return c.portalProxy.GetCNSIUserFromOAuthToken(cnsiGUID, tokenRecord)
+		log.Errorf("Could not get user information from token: %s", tokenRecord.TokenGUID)
+		return nil, false
 	}
 
 	return &interfaces.ConnectedUser{

From 5414d5648aad564f1c69320d9068b86d1408e8d7 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Fri, 28 Feb 2020 08:47:21 +0000
Subject: [PATCH 454/648] Remove debug logging

---
 src/jetstream/plugins/kubernetes/main.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index 11f734427c..3bb30206e5 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -90,8 +90,6 @@ func (c *KubernetesSpecification) Validate(userGUID string, cnsiRecord interface
 	}
 
 	if response.StatusCode >= 400 {
-
-		log.Info(response.Error)
 		if response.Error != nil {
 			return fmt.Errorf("Unable to connect to endpoint: %s", response.Error.Error())
 		}

From bdb66aef37bd96db11de13e1b8eafe4279416fca Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Fri, 28 Feb 2020 14:04:58 +0000
Subject: [PATCH 455/648] Add kube fix to release notes

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0a75d96f3..b5092ff333 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,8 @@ Release details:
 - Ensure active dialog times out correctly [\#4026](https://github.com/cloudfoundry/stratos/pull/4026)
 - Helm: Postflight job should not be a container [\#3506](https://github.com/cloudfoundry/stratos/issues/3506)
 - Card for favourited helm endpoint shows `disconnected` [\#223](https://github.com/SUSE/stratos/issues/223)
-- Hide required markers on login page [/#329](https://github.com/SUSE/stratos/pull/329)
+- Hide required markers on login page [\#329](https://github.com/SUSE/stratos/pull/329)
+- Fix registration and connection issues when some Kubernetes favlours [\#344](https://github.com/SUSE/stratos/pull/344)
 
 **Improvements:**
 

From e07e5005dcb001b28b4ae2287c5bc1cabce4139a Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 2 Mar 2020 13:38:48 +0000
Subject: [PATCH 456/648] Fix bug ergistering Azure cluster

---
 src/jetstream/plugins/kubernetes/main.go | 48 ++++++++++++++----------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index 3bb30206e5..0ed9278022 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -198,26 +198,10 @@ func (c *KubernetesSpecification) Info(apiEndpoint string, skipSSLValidation boo
 		if apiVersions.Kind != "APIVersions" {
 			return newCNSI, nil, fmt.Errorf("Failed to parse output as kube kind APIVersions: %+v", apiVersions)
 		}
-	} else if res.StatusCode == 403 {
-		// Expect an auth failed response - KubeStatus
-		log.Debug("Kube API Versions Failed (403)")
-		kubeStatus := KubeStatus{}
-		err := json.Unmarshal(body, &kubeStatus)
+	} else if res.StatusCode == 403 || res.StatusCode == 401 {
+		err := parseErrorResponse(body)
 		if err != nil {
-			return newCNSI, nil, fmt.Errorf("Failed to parse 403 output as kube kind status: %+v", err)
-		}
-		if kubeStatus.Kind != "Status" {
-			return newCNSI, nil, fmt.Errorf("Failed to parse 403 output as kube kind status: %+v", kubeStatus)
-		}
-	} else if res.StatusCode == 401 {
-		log.Debug("Kube API Versions Failed (401)")
-		kubeStatus := kubeErrorStatus{}
-		err := json.Unmarshal(body, &kubeStatus)
-		if err != nil {
-			return newCNSI, nil, fmt.Errorf("Failed to parse 401 output as kube kind status: %+v", err)
-		}
-		if kubeStatus.Type != "error" || kubeStatus.Status != "401" {
-			return newCNSI, nil, fmt.Errorf("Failed to parse 401 output as kube kind status: %+v", kubeStatus)
+			return newCNSI, nil, fmt.Errorf("Failed to parse output as kube kind status: %+v", err)
 		}
 	} else {
 		return newCNSI, nil, fmt.Errorf("Dissallowed response code from `/api` call: %+v", res.StatusCode)
@@ -230,5 +214,31 @@ func (c *KubernetesSpecification) Info(apiEndpoint string, skipSSLValidation boo
 	return newCNSI, v2InfoResponse, nil
 }
 
+func parseErrorResponse(body []byte) error {
+	kubeStatus := KubeStatus{}
+	err := json.Unmarshal(body, &kubeStatus)
+	if err == nil {
+		// Expect a json message with a status
+		if kubeStatus.Kind == "Status" {
+			return nil
+		}
+	}
+
+	// Try the other format
+	errorStatus := kubeErrorStatus{}
+	err = json.Unmarshal(body, &errorStatus)
+	if err == nil {
+		// Expect the type to be error
+		if errorStatus.Type == "error" {
+			return nil
+		}
+	}
+
+	// Not one of the types we recognise
+
+	log.Debug(string(body))
+	return errors.New("Could not understand response from Kubernetes endpoint")
+}
+
 func (c *KubernetesSpecification) UpdateMetadata(info *interfaces.Info, userGUID string, echoContext echo.Context) {
 }

From a73360583f9ff222ed6bc523d683c56c1b3eb06a Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 3 Mar 2020 09:14:08 +0000
Subject: [PATCH 457/648] Docker all-in-one improvements

---
 deploy/Dockerfile.all-in-one                  |  23 +--
 deploy/all-in-one/build.sh                    | 180 ++++++++++++++++++
 deploy/all-in-one/src-build.sh                |  29 +++
 .../monocular/fdb-doclayer/fdbdoc.bash        |   9 +
 .../containers/monocular/fdb-server/fdb.bash  |   8 +
 5 files changed, 235 insertions(+), 14 deletions(-)
 create mode 100755 deploy/all-in-one/build.sh
 create mode 100755 deploy/all-in-one/src-build.sh

diff --git a/deploy/Dockerfile.all-in-one b/deploy/Dockerfile.all-in-one
index ce590c45a1..5cc1408c3a 100644
--- a/deploy/Dockerfile.all-in-one
+++ b/deploy/Dockerfile.all-in-one
@@ -1,6 +1,6 @@
 # Docker build for all-in-one Stratos
 # ---------------------------------------------------------------------------------------------------
-FROM splatform/stratos-aio-base:leap15_1 as jetstream-builder
+FROM splatform/stratos-bk-build-base:leap15_1 as jetstream-builder
 
 # Ensure that we copy the custom-src folder
 COPY --chown=stratos:users . ./
@@ -10,17 +10,8 @@ COPY --chown=stratos:users deploy/all-in-one/config.all-in-one.properties config
 ARG USE_PREBUILT_UI=false
 
 USER root
-RUN if [ $USE_PREBUILT_UI = "true" ] ; then \
-    unzip stratos-frontend-prebuild.zip -d ./dist ; \
-    else \
-		npm install \
-        && npm run build ; \
-    fi
-
-# Build backend
-RUN npm run build-backend \
-    && cp src/jetstream/jetstream . \
-    && mv dist ui
+RUN node --version
+RUN deploy/all-in-one/src-build.sh
 
 USER stratos
 
@@ -31,7 +22,6 @@ RUN CERTS_PATH=/home/stratos/dev-certs ./generate_cert.sh
 # Docker build for FDB Server component
 FROM splatform/stratos-bk-build-base:leap15_1 as fdbserver-builder
 
-
 # Install FoundationDB Binaries
 ARG FDB_VERSION=6.2.15
 ARG FDB_WEBSITE=https://www.foundationdb.org
@@ -86,10 +76,14 @@ WORKDIR /go/src/github.com/helm/monocular
 ARG VERSION
 RUN GO111MODULE=on GOPROXY=https://gocenter.io CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-X main.version=$VERSION" .
 
+
+# ---------------------------------------------------------------------------------------------------
+# Final AIO Container
 # ---------------------------------------------------------------------------------------------------
-# use --target=aio to build All-in-one image
+
 FROM splatform/stratos-bk-base:leap15_1
 ARG CANARY_BUILD
+
 COPY --from=jetstream-builder /home/stratos/deploy/db /src/deploy/db
 COPY --from=jetstream-builder /home/stratos/dev-certs /srv/dev-certs
 COPY --from=jetstream-builder /home/stratos/ui /srv/ui
@@ -132,6 +126,7 @@ ENV FDB_PROCESS_CLASS unset
 ENV CLUSTER_ID docker:docker
 ENV FDB_COORDINATOR localhost
 ENV FDB_DOC_PORT 27016
+ENV FDB_LISTEN_IP 0.0.0.0
 
 # Pull in binaries from chartrepo-builder
 COPY --from=chartrepo-builder /go/src/github.com/helm/monocular/chartrepo /chartrepo
diff --git a/deploy/all-in-one/build.sh b/deploy/all-in-one/build.sh
new file mode 100755
index 0000000000..60bd1760ee
--- /dev/null
+++ b/deploy/all-in-one/build.sh
@@ -0,0 +1,180 @@
+#!/usr/bin/env bash
+
+#####
+#
+# Use this script to build the All-in-one image
+#
+# Note: This is not used by Concourse
+#
+#####
+
+set -u
+
+CYAN="\033[96m"
+YELLOW="\033[93m"
+RESET="\033[0m"
+BOLD="\033[1m"
+
+# Set defaults
+PROD_RELEASE=false
+DOCKER_REGISTRY=docker.io
+DOCKER_ORG=splatform
+BASE_IMAGE_TAG=leap15_1
+TAG=$(date -u +"%Y%m%dT%H%M%SZ")
+ADD_OFFICIAL_TAG="false"
+TAG_LATEST="false"
+NO_PUSH="true"
+DOCKER_REG_DEFAULTS="true"
+HAS_CUSTOM_BUILD="false"
+
+while getopts ":ho:r:t:Tlb:Opc" opt; do
+  case $opt in
+    h)
+      echo
+      echo "--- To build images of Stratos: "
+      echo
+      echo " ./build.sh -t 1.0.13"
+      echo
+      echo "-p to push images"
+      exit 0
+      ;;
+    r)
+      DOCKER_REGISTRY="${OPTARG}"
+      DOCKER_REG_DEFAULTS="false"
+      ;;
+    o)
+      DOCKER_ORG="${OPTARG}"
+      DOCKER_REG_DEFAULTS="false"
+      ;;
+    t)
+      TAG="${OPTARG}"
+      ;;
+    b)
+      BASE_IMAGE_TAG="${OPTARG}"
+      ;;
+    T)
+      TAG="$(git describe $(git rev-list --tags --max-count=1))"
+      ;;
+    l)
+      TAG_LATEST="true"
+      ;;
+    p)
+      NO_PUSH="false"
+      ;;      
+    \?)
+      echo "Invalid option: -${OPTARG}" >&2
+      exit 1
+      ;;
+    :)
+      echo "Option -$OPTARG requires an argument." >&2
+      exit 1
+      ;;
+  esac
+done
+
+echo
+printf "${CYAN}${BOLD}"
+
+echo "==========================================================================="
+echo "== Stratos All-in-one build                                              =="
+echo "==========================================================================="
+
+printf "${RESET}${CYAN}"
+echo
+echo "PRODUCTION BUILD/RELEASE : ${PROD_RELEASE}"
+echo "REGISTRY                 : ${DOCKER_REGISTRY}"
+echo "ORG                      : ${DOCKER_ORG}"
+echo "TAG                      : ${TAG}"
+echo "BASE_IMAGE_TAG           : ${BASE_IMAGE_TAG}"
+
+printf "${RESET}"
+echo
+
+if [ "${NO_PUSH}" != "false" ]; then
+  printf "${YELLOW}Images will ${BOLD}NOT${RESET}${YELLOW} be pushed${RESET}\n"
+else
+  printf "${YELLOW}${BOLD}Images will be pushed${RESET}\n"
+  echo "  REGISTRY : ${DOCKER_REGISTRY}"
+  echo "  ORG      : ${DOCKER_ORG}"
+fi
+
+echo
+printf "${CYAN}${BOLD}Starting build${RESET}\n"
+echo
+
+function log {
+  set +e
+  printf "${BOLD}${YELLOW}"
+  echo
+  echo "==========================================================================="
+  echo "$1"
+  echo "==========================================================================="
+  echo
+  printf "${RESET}"
+  set -e
+}
+
+set -e
+
+__DIRNAME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+STRATOS_PATH=${__DIRNAME}/../../
+source ${STRATOS_PATH}/deploy/common-build.sh
+
+function patchAndPushImage {
+  NAME=${1}
+  DOCKER_FILE=${2}
+  FOLDER=${3}
+  TARGET=${4:-none}
+  PATCHED_DOCKER_FILE="${DOCKER_FILE}.patched"
+
+  patchDockerfile ${DOCKER_FILE} ${FOLDER}
+  buildAndPublishImage ${NAME} "${PATCHED_DOCKER_FILE}" ${FOLDER} ${TARGET}
+
+  rm -rf ${FOLDER}/${PATCHED_DOCKER_FILE}
+  rm -rf ${FOLDER}/${PATCHED_DOCKER_FILE}.bak
+}
+
+function patchDockerfile {
+  DOCKER_FILE=${1}
+  FOLDER=${2}
+  PATCHED_DOCKER_FILE=${DOCKER_FILE}.patched
+
+  # Replace registry/organization
+  pushd ${FOLDER} > /dev/null 2>&1
+  ls
+  rm -rf ${PATCHED_DOCKER_FILE}
+  cp ${DOCKER_FILE} ${PATCHED_DOCKER_FILE}
+  if [ "${DOCKER_REG_DEFAULTS}" == "false" ]; then
+    sed -i.bak "s@splatform@${DOCKER_REGISTRY}/${DOCKER_ORG}@g" ${FOLDER}/${PATCHED_DOCKER_FILE}
+  fi
+  sed -i.bak "s/opensuse/${BASE_IMAGE_TAG}/g" ${FOLDER}/${PATCHED_DOCKER_FILE}
+  popd > /dev/null 2>&1
+}
+
+
+#
+# MAIN -------------------------------------------------------------------------------------------
+#
+
+pushd "${STRATOS_PATH}" > /dev/null 2>&1
+STRATOS_PATH="$(pwd)"
+popd > /dev/null 2>&1
+echo "Base path: ${STRATOS_PATH}"
+
+# cleanup output, intermediate artifacts
+cleanup
+
+log "-- Build & publish the runtime container image for All-in-one"
+patchAndPushImage stratos-aio deploy/Dockerfile.all-in-one "${STRATOS_PATH}"
+
+set +e
+
+printf "${BOLD}${YELLOW}"
+echo
+echo "Build complete...."
+printf "${CYAN}"
+echo "  Registry            : ${DOCKER_REGISTRY}"
+echo "  Org                 : ${DOCKER_ORG}"
+echo "  Tag                 : ${TAG}"
+printf "${RESET}"
+echo ""
diff --git a/deploy/all-in-one/src-build.sh b/deploy/all-in-one/src-build.sh
new file mode 100755
index 0000000000..d1618d6037
--- /dev/null
+++ b/deploy/all-in-one/src-build.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+echo "Building Stratos: Use Prebuild: ${USE_PREBUILT_UI}"
+
+# Use pre-built UI package (speed up building if alreay built)
+if [ "${USE_PREBUILT_UI}" = "true" ]; then
+  echo "Using pre-built UI: unpacking..."
+  unzip stratos-frontend-prebuild.zip -d ./dist
+else
+  echo "Building frontend"
+  npm install
+  npm run customize
+  npm run build
+  if [ $? -ne 0 ]; then
+    echo "Frontend build failed"
+    exit 1
+  fi
+fi
+
+# Build backend
+
+echo "Building backend"
+npm run build-backend
+if [ $? -ne 0 ]; then
+  echo "Backend build failed"
+  exit 1
+fi
+cp src/jetstream/jetstream .
+mv dist ui
\ No newline at end of file
diff --git a/deploy/containers/monocular/fdb-doclayer/fdbdoc.bash b/deploy/containers/monocular/fdb-doclayer/fdbdoc.bash
index 38cbbe2288..935c119741 100755
--- a/deploy/containers/monocular/fdb-doclayer/fdbdoc.bash
+++ b/deploy/containers/monocular/fdb-doclayer/fdbdoc.bash
@@ -54,9 +54,18 @@ else
 	LISTEN_IP=${PUBLIC_IP}
 fi
 
+echo "===================================================================================="
+echo "FDB Document Layer starting"
+echo "===================================================================================="
+echo ""
+
 echo "Connecting to FDB server at: $CLUSTER_ID@$coordinator_ip:$coordinator_port"
 echo "Cluster file contents: "
 cat $FDB_CLUSTER_FILE
+
+echo "Listen IP is ${LISTEN_IP}"
+echo "Public IP is ${PUBLIC_IP}"
+
 if [[ "$ENABLE_TLS" == "true" ]]; then
 	echo "Starting FDB Document Layer on $LISTEN_IP:$FDB_DOC_PORT:tls. TLS enabled."
 	fdbdoc -V --listen_address $LISTEN_IP:$FDB_DOC_PORT:tls --tls_certificate_file $SERVER_CRT --tls_ca_file $CA_CRT --tls_key_file $SERVER_KEY --logdir /var/fdb/logs
diff --git a/deploy/containers/monocular/fdb-server/fdb.bash b/deploy/containers/monocular/fdb-server/fdb.bash
index b31c71ab67..44842089e4 100644
--- a/deploy/containers/monocular/fdb-server/fdb.bash
+++ b/deploy/containers/monocular/fdb-server/fdb.bash
@@ -34,5 +34,13 @@ else
 	LISTEN_IP=${PUBLIC_IP}
 fi
 
+echo "===================================================================================="
+echo "FDB Server starting"
+echo "===================================================================================="
+echo ""
+
+echo "Listen IP is ${LISTEN_IP}"
+echo "Public IP is ${PUBLIC_IP}"
+
 fdbserver --listen_address $LISTEN_IP:$FDB_PORT --public_address $PUBLIC_IP:$FDB_PORT \
 	--datadir /var/fdb/data --logdir /var/fdb/logs
\ No newline at end of file

From 7f99c4ac31b5bc00ff926d1a95e73b6047abb064 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 4 Mar 2020 11:49:18 +0000
Subject: [PATCH 458/648] Ensure for maxed lists we don't make requests for
 pages after one - Missing return meant we still fetched remaining pages -
 This means lists are marked as busy until all pages are fetched, even though
 the list is displayed as maxed

---
 .../pagination-iterator.pipe.ts                              | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 1c0d075b6d..9245da298d 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
@@ -84,7 +84,8 @@ export class PaginationPageIterator<R = any, E = any> {
     }, {} as PagedJetstreamResponse);
   }
 
-  private handleRequests(initialResponse: JetstreamResponse<R>, action: PaginatedAction, totalPages: number, totalResults: number) {
+  private handleRequests(initialResponse: JetstreamResponse<R>, action: PaginatedAction, totalPages: number, totalResults: number):
+    Observable<[JetstreamResponse<R>, JetstreamResponse<R>[]]> {
     if (totalResults > 0) {
       const maxCount = action.flattenPaginationMax;
       // We're maxed so only respond with the first page of results.
@@ -94,7 +95,7 @@ export class PaginationPageIterator<R = any, E = any> {
         this.actionDispatcher(
           new UpdatePaginationMaxedState(maxCount, totalResults, entityType, endpointType, paginationKey, forcedEntityKey)
         );
-        of([initialResponse]);
+        return of([initialResponse, []]);
       }
     }
     return combineLatest(of(initialResponse), this.getAllOtherPageRequests(totalPages));

From 1bc727a988e6356ac346d92c66349c7571741dac Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 5 Mar 2020 10:25:52 +0000
Subject: [PATCH 459/648] Remove debug and unused

---
 .../kubernetes/kube-console/kube-console.component.ts | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts b/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts
index 32481eb139..1466381281 100644
--- a/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts
@@ -72,19 +72,10 @@ export class KubeConsoleComponent implements OnInit {
 
   constructor(
     public kubeEndpointService: KubernetesEndpointService,
-    // private activatedRoute: ActivatedRoute,
-    // private store: Store<AppState>,
   ) { }
 
   ngOnInit() {
-
     const guid = this.kubeEndpointService.baseKube.guid;
-
-    console.log('HERE');
-    console.log(guid);
-    // const routeParams = this.activatedRoute.snapshot.params;
-    // this.instanceId = routeParams.index;
-
     this.kubeSummaryLink = (
       `/kubernetes/${guid}/summary`
     );
@@ -104,8 +95,6 @@ export class KubeConsoleComponent implements OnInit {
         this.sshInput
       );
 
-      console.log(streamUrl);
-
       this.messages = connection.messages.pipe(
         catchError(e => {
           if (e.type === 'error') {

From 187b999e6c8483217891831077f59006ba6448fb Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 5 Mar 2020 10:42:36 +0000
Subject: [PATCH 460/648] Fix Anagular 8 upgrade issues

---
 .../kube-console/kube-console.component.ts    | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts b/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts
index 1466381281..9da2be718a 100644
--- a/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts
@@ -2,10 +2,9 @@ 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 websocketConnect from 'rxjs-websockets';
-import { catchError, first, map } from 'rxjs/operators';
+import websocketConnect, { normalClosureMessage } from 'rxjs-websockets';
+import { catchError, tap, switchMap } from 'rxjs/operators';
 
-import { AppState } from '../../../../../store/src/app-state';
 import { IApp } from '../../../core/cf-api.types';
 import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types';
 import { SshViewerComponent } from '../../../shared/components/ssh-viewer/ssh-viewer.component';
@@ -38,7 +37,7 @@ export class KubeConsoleComponent implements OnInit {
 
   public messages: Observable<string>;
 
-  public connectionStatus: Observable<number>;
+  public connectionStatus = new Subject<number>();
 
   public sshInput: Subject<string>;
 
@@ -56,7 +55,7 @@ export class KubeConsoleComponent implements OnInit {
 
   public breadcrumbs$: Observable<IHeaderBreadcrumb[]>;
 
-  @ViewChild('sshViewer') sshViewer: SshViewerComponent;
+  @ViewChild('sshViewer', { static: false }) sshViewer: SshViewerComponent;
 
   private getBreadcrumbs(
     application: IApp,
@@ -75,6 +74,7 @@ export class KubeConsoleComponent implements OnInit {
   ) { }
 
   ngOnInit() {
+    this.connectionStatus.next(0);
     const guid = this.kubeEndpointService.baseKube.guid;
     this.kubeSummaryLink = (
       `/kubernetes/${guid}/summary`
@@ -82,7 +82,8 @@ export class KubeConsoleComponent implements OnInit {
 
     if (!guid) {
       this.messages = NEVER;
-      this.connectionStatus = NEVER;
+      this.connectionStatus.next(0);
+      this.errorMessage = 'No Endpoint ID available';
     } else {
       const host = window.location.host;
       const protocol = window.location.protocol === 'https:' ? 'wss' : 'ws';
@@ -91,20 +92,19 @@ export class KubeConsoleComponent implements OnInit {
       );
       this.sshInput = new Subject<string>();
       const connection = websocketConnect(
-        streamUrl,
-        this.sshInput
+        streamUrl
       );
 
-      this.messages = connection.messages.pipe(
-        catchError(e => {
-          if (e.type === 'error') {
+      this.messages = connection.pipe(
+        tap(() => this.connectionStatus.next(1)),
+        switchMap(getResponse => getResponse(this.sshInput)),
+        catchError((e: Error) => {
+          if (e.message !== normalClosureMessage) {
             this.errorMessage = 'Error connecting to web socket';
           }
           return [];
         }));
 
-      this.connectionStatus = connection.connectionStatus;
-
       // this.breadcrumbs$ = this.applicationService.waitForAppEntity$.pipe(
       //   map(app => this.getBreadcrumbs(app.entity.entity)),
       //   first()

From b5bf5ba3c062ba4e33ad7b0769580416a7459060 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 5 Mar 2020 10:47:44 +0000
Subject: [PATCH 461/648] Tidy up imports

---
 .../app/custom/kubernetes/kube-console/kube-console.component.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts b/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts
index 9da2be718a..e185e8ffe9 100644
--- a/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts
@@ -1,6 +1,5 @@
 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 websocketConnect, { normalClosureMessage } from 'rxjs-websockets';
 import { catchError, tap, switchMap } from 'rxjs/operators';

From 88a3352c8b0766ba3085610f91c5540dbeb54131 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 6 Mar 2020 09:28:46 +0000
Subject: [PATCH 462/648] Fix Jenkins unit tests

---
 deploy/ci/automation/helmtest.sh | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/deploy/ci/automation/helmtest.sh b/deploy/ci/automation/helmtest.sh
index e5fd7abd75..9f4ca0077b 100755
--- a/deploy/ci/automation/helmtest.sh
+++ b/deploy/ci/automation/helmtest.sh
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-echo "================="
-echo "Stratos Helm Test"
-echo "================="
-
 DIRPATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 STRATOS="$(cd "$(dirname "${BASH_SOURCE[0]}")" && cd ../../.. && pwd)"
 
@@ -12,6 +8,12 @@ YELLOW="\033[93m"
 RESET="\033[0m"
 BOLD="\033[1m"
 
+echo -e "${YELLOW}${BOLD}"
+echo "================="
+echo "Stratos Helm Test"
+echo "================="
+echo -e "${RESET}"
+
 set -e
 
 # We should be running in the Stratos GitHub folder
@@ -55,9 +57,10 @@ function waitForHelmRelease {
       TOTAL=$(($READY + $COMPLETED))
       EXPECTED=$(($COUNT - 1))
       if [ $TOTAL -eq $EXPECTED ]; then
-        READY1=$(kubectl get po --namespace=${NAMESPACE} | grep "3/3" | wc -l)
-        READY2=$(kubectl get po --namespace=${NAMESPACE} | grep "1/1" | wc -l)
-        READY=$(($READY1 + $READY2))
+        READY3=$(kubectl get po --namespace=${NAMESPACE} | grep "3/3" | wc -l)
+        READY2=$(kubectl get po --namespace=${NAMESPACE} | grep "2/2" | wc -l)
+        READY1=$(kubectl get po --namespace=${NAMESPACE} | grep "1/1" | wc -l)
+        READY=$(($READY1 + $READY2 + $READY3))
         if [ $READY -eq 2 ]; then
           DONE="true"
         fi
@@ -65,7 +68,7 @@ function waitForHelmRelease {
     fi
     if [ "$DONE" != "true" ]; then
       echo "Waiting for Stratos Helm release to be ready..."
-      sleep 5
+      sleep 10
       TIMEOUT=$((TIMEOUT+1))
       if [ ${TIMEOUT} -gt 60 ]; then
         echo "Timed out waiting for Helm release to be ready"
@@ -196,4 +199,4 @@ checkVersion console-0.2.0
 # All okay
 deleteRelease
 
-log "All checks completed"
+log "All checks completed"
\ No newline at end of file

From e8825709152a9ee82600e9d2a9273432664ee9fa Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 6 Mar 2020 12:24:45 +0000
Subject: [PATCH 463/648] Helm Upgrade fixes

---
 deploy/ci/automation/helmtest.sh              | 61 +++++++++++--------
 .../tasks/dev-releases/create-chart-helper.sh |  5 +-
 deploy/kubernetes/build.sh                    | 26 +++++++-
 .../kubernetes/console/templates/secrets.yaml | 12 ++--
 4 files changed, 72 insertions(+), 32 deletions(-)

diff --git a/deploy/ci/automation/helmtest.sh b/deploy/ci/automation/helmtest.sh
index 9f4ca0077b..27040121a2 100755
--- a/deploy/ci/automation/helmtest.sh
+++ b/deploy/ci/automation/helmtest.sh
@@ -9,9 +9,9 @@ RESET="\033[0m"
 BOLD="\033[1m"
 
 echo -e "${YELLOW}${BOLD}"
-echo "================="
-echo "Stratos Helm Test"
-echo "================="
+echo "========================================================================================================="
+echo "===== Stratos Helm Tests                                                                            ====="
+echo "========================================================================================================="
 echo -e "${RESET}"
 
 set -e
@@ -82,7 +82,7 @@ function checkVersion {
   VERS=$1
   STATUS=$(helm list ${NAME} | grep ${NAME})
   STATUS=$(echo $STATUS | awk '{$1=$1};1')
-  local HELM_STATUS_REGEX='^([a-z\-]*) ([0-9]*) ([A-Z][a-z][a-z] [A-Z][a-z][a-z] [0-9]* [0-9][0-9]:[0-9][0-9]:[0-9][0-9] [0-9][0-9][0-9][0-9]) ([A-Z]*) ([0-9\.a-z\-]*) ([0-9\.]*) ([a-z\-]*)'
+  local HELM_STATUS_REGEX='^([a-z\-]*) ([0-9]*) ([A-Z][a-z][a-z] [A-Z][a-z][a-z] [0-9]* [0-9][0-9]:[0-9][0-9]:[0-9][0-9] [0-9][0-9][0-9][0-9]) ([A-Z]*) ([0-9\.a-z\-]*) ([0-9\.a-z\-]*) ([a-z\-]*)'
   echo -e $STATUS
   if [[ "${STATUS}" =~ ${HELM_STATUS_REGEX} ]]; then
     # 6 is version
@@ -94,11 +94,17 @@ function checkVersion {
     echo "Helm status parsing failed"
     exit 1
   fi
+
+  echo "Helm release version ok (${BASH_REMATCH[5]})"
 }
 
 function log {
   MSG=$1
-  echo -e "${CYAN}${BOLD}${MSG}${RESET}"
+  echo -e "${CYAN}${BOLD}"
+  echo "========================================================================================================="
+  echo "==>> ${MSG}"
+  echo "========================================================================================================="
+  echo -e "${RESET}"
 }
 
 log "Performing checks..."
@@ -117,6 +123,14 @@ if [ "$EXISTING" -ne 1 ]; then
   helm repo add ${HELM_REPO_NAME} ${HELM_REPO}
 fi
 
+KUBE_FOLDER="${STRATOS}/deploy/kubernetes"
+HELM_TMP="${STRATOS}/deploy/kubernetes/helm-chart"
+echo $HELM_TMP
+echo  "${KUBE_FOLDER}"
+pushd "${KUBE_FOLDER}" > /dev/null
+rm -rf *.tgz
+popd > /dev/null
+
 # Update repos
 helm repo update
 
@@ -133,37 +147,36 @@ waitForHelmRelease
 # Try and upgrade to the latest Chart
 
 # Copy the helm chart folder to a temp location
-TMP_DIR=${TMP_DIR:-/tmp}
-HELM_TMP=${TMP_DIR}/stratos_helm_test
+
+# Use the buil script to build the Helm Chart
+KUBE_FOLDER="${STRATOS}/deploy/kubernetes"
+HELM_TMP="${STRATOS}/deploy/kubernetes/helm-chart"
 echo $HELM_TMP
 
-rm -rf ${HELM_TMP}
-mkdir -p ${HELM_TMP}
-cp -R "${STRATOS}/deploy/kubernetes/console" ${HELM_TMP}
+echo  "${KUBE_FOLDER}"
+ls -al "${KUBE_FOLDER}"
+rm -rf "${KUBE_FOLDER}/*.tgz"
 
-pushd ${HELM_TMP} > /dev/null
-# Make sure we can package the chart
-helm package ${HELM_TMP}/console
+# Build the chart with the specific version for images
+"${STRATOS}/deploy/kubernetes/build.sh" -z -c -n -t ${DEV_IMAGE_VERSION}
 
-CHART_FILE=$(ls ${HELM_TMP}/*.tgz)
+CHART_FILE=$(ls ${KUBE_FOLDER}/*.tgz)
 CHART_FILE=$(printf %q "${CHART_FILE}")
 echo "Chart file path: ${CHART_FILE}"
 
-popd > /dev/null
-
 log "Upgrading using latest Helm Chart"
 helm upgrade ${NAME} ${CHART_FILE} --recreate-pods --debug --set consoleVersion=${DEV_IMAGE_VERSION} --set imagePullPolicy=Always
 
-checkVersion console-0.1.0
+checkVersion console-${DEV_IMAGE_VERSION}
 waitForHelmRelease
 
 # Change just the chart version and try to upgrade
-sed -i.bak -e 's/version: 0.1.0/version: 0.2.0/g' ${HELM_TMP}/console/Chart.yaml
-sed -i.bak -e 's/appVersion: 0.1.0/appVersion: 0.2.0/g' ${HELM_TMP}/console/Chart.yaml
-cat ${HELM_TMP}/console/Chart.yaml
+sed -i.bak -e 's/version: '"${DEV_IMAGE_VERSION}"'/version: 0.2.0/g' ${HELM_TMP}/Chart.yaml
+sed -i.bak -e 's/appVersion: '"${DEV_IMAGE_VERSION}"'/appVersion: 0.2.0/g' ${HELM_TMP}/Chart.yaml
+cat ${HELM_TMP}/Chart.yaml
 
 log "Upgrading using latest Helm Chart (checking chart upgrade)"
-helm upgrade ${NAME} ${HELM_TMP}/console --recreate-pods --debug --set consoleVersion=${DEV_IMAGE_VERSION} --set imagePullPolicy=Always
+helm upgrade ${NAME} ${HELM_TMP} --recreate-pods --debug --set imagePullPolicy=Always
 
 waitForHelmRelease
 checkVersion console-0.2.0
@@ -172,10 +185,10 @@ checkVersion console-0.2.0
 deleteRelease
 
 log "Installing using latest Helm Chart"
-helm install ${CHART_FILE} --name ${NAME} --namespace ${NAMESPACE} --set consoleVersion=${DEV_IMAGE_VERSION} --set imagePullPolicy=Always
+helm install ${CHART_FILE} --name ${NAME} --namespace ${NAMESPACE} --set imagePullPolicy=Always
 
 waitForHelmRelease
-checkVersion console-0.1.0
+checkVersion console-${DEV_IMAGE_VERSION}
 
 deleteRelease
 
@@ -190,7 +203,7 @@ helm install ${HELM_REPO_NAME}/console --name ${NAME} --namespace ${NAMESPACE}
 waitForHelmRelease
 
 log "Upgrading using --reuse-values"
-helm upgrade ${NAME} ${HELM_TMP}/console --recreate-pods --debug --reuse-values
+helm upgrade ${NAME} ${HELM_TMP} --recreate-pods --debug --reuse-values
 
 waitForHelmRelease
 # Should have used same values as before
diff --git a/deploy/ci/tasks/dev-releases/create-chart-helper.sh b/deploy/ci/tasks/dev-releases/create-chart-helper.sh
index 8db92c215a..2079cf4544 100644
--- a/deploy/ci/tasks/dev-releases/create-chart-helper.sh
+++ b/deploy/ci/tasks/dev-releases/create-chart-helper.sh
@@ -15,7 +15,10 @@ patchHelmChart () {
   sed -i -e 's/appVersion: 0.1.0/appVersion: '"${APP_VERSION}"'/g' ${CHART_PATH}/Chart.yaml
 
   # Patch the console image tag in place - otherwise --reuse-values won't work with helm upgrade
-  sed -i -e 's/{{.Values.consoleVersion}}/'"${TAG}"'/g' ${CHART_PATH}/templates/deployment.yaml
+  # Make sure we patch this in all files in templates where it occurs
+  pushd ${CHART_PATH}/templates > dev/null
+  find . -type f -name '*.yaml' | xargs sed -i -e 's/{{.Values.consoleVersion}}/'"${TAG}"'/g'
+  popd > /dev/null
 }
 
 patchHelmChartDev () {
diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
index 5697be80a8..8c5a76a347 100755
--- a/deploy/kubernetes/build.sh
+++ b/deploy/kubernetes/build.sh
@@ -29,8 +29,9 @@ DOCKER_REG_DEFAULTS="true"
 CHART_ONLY="false"
 ADD_GITHASH_TO_TAG="true"
 HAS_CUSTOM_BUILD="false"
+PACKAGE_CHART="false"
 
-while getopts ":ho:r:t:Tclb:Opcn" opt; do
+while getopts ":ho:r:t:Tclb:Opcnz" opt; do
   case $opt in
     h)
       echo
@@ -73,6 +74,9 @@ while getopts ":ho:r:t:Tclb:Opcn" opt; do
     n)
       ADD_GITHASH_TO_TAG="false"
       ;;
+    z)
+      PACKAGE_CHART="true"
+      ;;
     \?)
       echo "Invalid option: -${OPTARG}" >&2
       exit 1
@@ -247,6 +251,14 @@ sed -i.bak -e 's/hostname: docker.io/hostname: '"${DOCKER_REGISTRY}"'/g' values.
 
 sed -i.bak -e 's/version: 0.1.0/version: '"${TAG}"'/g' Chart.yaml
 sed -i.bak -e 's/appVersion: 0.1.0/appVersion: '"${TAG}"'/g' Chart.yaml
+
+# Patch the console image tag in place - otherwise --reuse-values won't work with helm upgrade
+# Make sure we patch all files that have this reference
+cd templates
+find . -type f -name '*.yaml' | xargs sed -i.bak -e 's/{{.Values.consoleVersion}}/'"${TAG}"'/g'
+find . -type f -name "*.bak" -delete
+cd ..
+
 rm -rf *.bak
 
 # Generate image list
@@ -255,6 +267,18 @@ ${STRATOS_PATH}/deploy/kubernetes/imagelist-gen.sh .
 
 popd > /dev/null
 
+if [ "${PACKAGE_CHART}" ==  "true" ]; then
+  echo "Packaging Helm Chart"
+  pushd ${STRATOS_PATH}/deploy/kubernetes > /dev/null
+  PKG_DIST_FOLDER="dist/${TAG}/console"
+  rm -rf ${PKG_DIST_FOLDER}
+  mkdir -p ${PKG_DIST_FOLDER}
+  cp -R ${DEST_HELM_CHART_PATH}/* ${PKG_DIST_FOLDER}
+  helm package ${PKG_DIST_FOLDER}
+  rm -rf ${PKG_DIST_FOLDER}
+  popd > /dev/null
+fi
+
 set +e
 
 printf "${BOLD}${YELLOW}"
diff --git a/deploy/kubernetes/console/templates/secrets.yaml b/deploy/kubernetes/console/templates/secrets.yaml
index 544108e376..6e0830dcf4 100644
--- a/deploy/kubernetes/console/templates/secrets.yaml
+++ b/deploy/kubernetes/console/templates/secrets.yaml
@@ -29,18 +29,18 @@ metadata:
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 type: Opaque
 data:
-  {{- if .Values.mariadb.rootPassword }}
-  rootPassword: {{ .Values.mariadb.rootPassword | b64enc | quote }}
+  {{- if or .Values.mariadb.rootPassword .Values.mariadb.mariadbRootPassword }}
+  rootPassword: {{ (default .Values.mariadb.rootPassword .Values.mariadb.mariadbRootPassword) | b64enc | quote }}
   {{- else }}
   rootPassword: {{ randAlphaNum 32 | b64enc | quote }}
   {{- end }}
-  {{- if .Values.mariadb.userPassword }}
-  password: {{ .Values.mariadb.userPassword | b64enc | quote }}
+  {{- if or .Values.mariadb.userPassword .Values.mariadb.mariadbPassword }}
+  password: {{ (default .Values.mariadb.userPassword .Values.mariadb.mariadbPassword) | b64enc | quote }}
   {{- else }}
   password: {{ randAlphaNum 32 | b64enc | quote }}
   {{- end }}
-  user: {{ .Values.mariadb.user | b64enc | quote }}
-  database: {{ .Values.mariadb.database | b64enc | quote }}
+  user: {{ default .Values.mariadb.user .Values.mariadb.mariadbUser | b64enc | quote }}
+  database: {{ default .Values.mariadb.database .Values.mariadb.mariadbDatabase | b64enc | quote }}
   {{- if .Values.console.sessionStoreSecret }}
   sessionStoreSecret: {{ .Values.console.sessionStoreSecret | b64enc | quote }}
   {{- else }}

From 8fbc06b067d008834fd0f02ee69c83aa4c5dea6d Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 6 Mar 2020 16:02:47 +0000
Subject: [PATCH 464/648] Fix minor error in release pipeline

---
 deploy/ci/tasks/dev-releases/create-chart-helper.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/ci/tasks/dev-releases/create-chart-helper.sh b/deploy/ci/tasks/dev-releases/create-chart-helper.sh
index 2079cf4544..a08c7e13f6 100644
--- a/deploy/ci/tasks/dev-releases/create-chart-helper.sh
+++ b/deploy/ci/tasks/dev-releases/create-chart-helper.sh
@@ -16,7 +16,7 @@ patchHelmChart () {
 
   # Patch the console image tag in place - otherwise --reuse-values won't work with helm upgrade
   # Make sure we patch this in all files in templates where it occurs
-  pushd ${CHART_PATH}/templates > dev/null
+  pushd ${CHART_PATH}/templates > /dev/null
   find . -type f -name '*.yaml' | xargs sed -i -e 's/{{.Values.consoleVersion}}/'"${TAG}"'/g'
   popd > /dev/null
 }

From 89765b10884745eea0cf16f67ceb506446f10ef4 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 6 Mar 2020 16:04:32 +0000
Subject: [PATCH 465/648] Add ability to show a custom component on click of a
 table's row - Remove concept of fixed height rows - Added concept of min
 height rows - Reduced default height of rows - Added new table cell 'icon'
 component - Used new feature to add list of containers to pod view

---
 ...onocular-repository-list-config.service.ts |  30 ++-
 .../custom/kubernetes/kubernetes.module.ts    |  11 +-
 ...ubernetes-endpoints-list-config.service.ts |   1 -
 .../kubernetes-pod-containers.component.html  |   2 +
 .../kubernetes-pod-containers.component.scss  |   0
 ...ubernetes-pod-containers.component.spec.ts |  36 ++++
 .../kubernetes-pod-containers.component.ts    | 193 ++++++++++++++++++
 .../kubernetes-pod-status.component.spec.ts   |   4 +-
 .../kubernetes-pods-list-config.service.ts    |   2 +
 .../app/custom/kubernetes/store/kube.types.ts |  20 +-
 .../helm-releases-list-config.service.ts      |   1 -
 .../cf-app-variables-list-config.service.ts   |   5 +-
 .../cf-endpoints-list-config.service.ts       |   1 -
 .../cf-users/cf-user-list-config.service.ts   |   2 +-
 .../list-data-source-types.ts                 |   3 +-
 .../table-cell-icon.component.html            |   1 +
 .../table-cell-icon.component.scss            |   0
 .../table-cell-icon.component.spec.ts         |  37 ++++
 .../table-cell-icon.component.ts              |  44 ++++
 .../table-cell/table-cell.component.ts        |   2 +
 .../table-row/table-row.component.html        |  16 +-
 .../table-row/table-row.component.scss        |  28 +++
 .../table-row/table-row.component.ts          |  58 +++++-
 .../list/list-table/table.component.html      |   8 +-
 .../list/list-table/table.component.scss      |  11 +-
 .../list/list-table/table.component.ts        |   5 +-
 .../endpoint/endpoints-list-config.service.ts |   5 +-
 .../components/list/list.component.html       |   4 +-
 .../components/list/list.component.types.ts   |  15 +-
 .../packages/core/src/shared/shared.module.ts |   6 +-
 30 files changed, 487 insertions(+), 64 deletions(-)
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts
 create mode 100644 src/frontend/packages/core/src/shared/components/list/list-table/table-cell-icon/table-cell-icon.component.html
 create mode 100644 src/frontend/packages/core/src/shared/components/list/list-table/table-cell-icon/table-cell-icon.component.scss
 create mode 100644 src/frontend/packages/core/src/shared/components/list/list-table/table-cell-icon/table-cell-icon.component.spec.ts
 create mode 100644 src/frontend/packages/core/src/shared/components/list/list-table/table-cell-icon/table-cell-icon.component.ts

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 36fd3297e1..b3d343ef8c 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,14 +1,27 @@
+import { HttpClient } from '@angular/common/http';
 import { Injectable, NgZone } from '@angular/core';
+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 { 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';
+import { pairwise } from 'rxjs/operators';
 
 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 { STRATOS_ENDPOINT_TYPE } from '../../../base-entity-schemas';
+import { CurrentUserPermissions } from '../../../core/current-user-permissions.config';
+import { CurrentUserPermissionsService } from '../../../core/current-user-permissions.service';
+import { environment } from '../../../environments/environment';
 import { getFullEndpointApiUrl } from '../../../features/endpoints/endpoint-helpers';
+import { ConfirmationDialogConfig } from '../../../shared/components/confirmation-dialog.config';
+import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service';
 import { ITableColumn } from '../../../shared/components/list/list-table/table.types';
 import {
   EndpointCardComponent,
@@ -16,23 +29,9 @@ import {
 import {
   TableCellEndpointStatusComponent,
 } from '../../../shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component';
-import { IListConfig, ListViewTypes, IListAction } from '../../../shared/components/list/list.component.types';
+import { IListAction, IListConfig, ListViewTypes } from '../../../shared/components/list/list.component.types';
 import { defaultHelmKubeListPageSize } from '../../kubernetes/list-types/kube-helm-list-types';
 import { MonocularRepositoryDataSource } from './monocular-repository-list-source';
-import { HttpClient } from '@angular/common/http';
-import { environment } from '../../../environments/environment';
-import { map, pairwise } from 'rxjs/operators';
-import { MatSnackBar } from '@angular/material';
-import { SendClearEventAction } from 'frontend/packages/store/src/actions/internal-events.actions';
-import { DisconnectEndpoint, UnregisterEndpoint } from 'frontend/packages/store/src/actions/endpoint.actions';
-import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog.service';
-import { selectDeletionInfo } from 'frontend/packages/store/src/selectors/api.selectors';
-import { STRATOS_ENDPOINT_TYPE } from '../../../base-entity-schemas';
-import { endpointSchemaKey } from 'frontend/packages/store/src/helpers/entity-factory';
-import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service';
-import { ConfirmationDialogConfig } from '../../../shared/components/confirmation-dialog.config';
-import { CurrentUserPermissionsService } from '../../../core/current-user-permissions.service';
-import { CurrentUserPermissions } from '../../../core/current-user-permissions.config';
 
 @Injectable()
 export class MonocularRepositoryListConfig implements IListConfig<EndpointModel> {
@@ -47,7 +46,6 @@ export class MonocularRepositoryListConfig implements IListConfig<EndpointModel>
   };
   pageSizeOptions = defaultHelmKubeListPageSize;
   enableTextFilter = true;
-  tableFixedRowHeight = true;
   columns: ITableColumn<EndpointModel>[] = [
     {
       columnId: 'name',
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
index ec6bb0c9c0..ed05e9af79 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
@@ -5,6 +5,9 @@ import { NgxChartsModule } from '@swimlane/ngx-charts';
 
 import { CoreModule } from '../../core/core.module';
 import { SharedModule } from '../../shared/shared.module';
+import {
+  KubedashConfigurationComponent,
+} from './kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component';
 import { KubernetesDashboardTabComponent } from './kubernetes-dashboard/kubernetes-dashboard.component';
 import {
   KubernetesNamespacePodsComponent,
@@ -70,6 +73,9 @@ import {
   KubernetesNodeTagsCardComponent,
 } from './list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component';
 import { NodePodCountComponent } from './list-types/kubernetes-nodes/node-pod-count/node-pod-count.component';
+import {
+  KubernetesPodContainersComponent,
+} from './list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component';
 import {
   KubernetesPodStatusComponent,
 } from './list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component';
@@ -86,7 +92,6 @@ import { KubernetesNamespacesTabComponent } from './tabs/kubernetes-namespaces-t
 import { KubernetesNodesTabComponent } from './tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component';
 import { KubernetesPodsTabComponent } from './tabs/kubernetes-pods-tab/kubernetes-pods-tab.component';
 import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kubernetes-summary.component';
-import { KubedashConfigurationComponent } from './kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component';
 
 
 /* tslint:enable */
@@ -141,6 +146,7 @@ import { KubedashConfigurationComponent } from './kubernetes-dashboard/kubedash-
     KubernetesResourceViewerComponent,
     KubeServiceCardComponent,
     KubedashConfigurationComponent,
+    KubernetesPodContainersComponent
   ],
   providers: [
     KubernetesService,
@@ -163,7 +169,8 @@ import { KubedashConfigurationComponent } from './kubernetes-dashboard/kubedash-
     KubernetesServicePortsComponent,
     KubernetesPodStatusComponent,
     KubeServiceCardComponent,
-    KubernetesResourceViewerComponent
+    KubernetesResourceViewerComponent,
+    KubernetesPodContainersComponent
   ],
   exports: [
     KubernetesResourceViewerComponent
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
index 13762f529b..39e461d5b5 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
@@ -30,7 +30,6 @@ export class KubernetesEndpointsListConfigService implements IListConfig<Endpoin
     noEntries: 'There are no endpoints'
   };
   enableTextFilter = true;
-  tableFixedRowHeight = true;
 
 
   constructor(
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html
new file mode 100644
index 0000000000..5fc22b8407
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html
@@ -0,0 +1,2 @@
+<app-table [dataSource]="containerDataSource" [columns]="columns" [inExpandedRow]="true">
+</app-table>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.spec.ts
new file mode 100644
index 0000000000..ff465a15c8
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.spec.ts
@@ -0,0 +1,36 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
+import { KubernetesPod } from '../../../store/kube.types';
+import { KubernetesPodContainersComponent } from './kubernetes-pod-containers.component';
+
+describe('KubernetesPodContainersComponent', () => {
+  let component: KubernetesPodContainersComponent;
+  let fixture: ComponentFixture<KubernetesPodContainersComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [KubernetesPodContainersComponent],
+      imports: KubernetesBaseTestModules
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubernetesPodContainersComponent);
+    component = fixture.componentInstance;
+    component.row = {
+      metadata: {
+        uid: ''
+      },
+      status: {
+
+      }
+    } as KubernetesPod;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
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
new file mode 100644
index 0000000000..d9aa85595d
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts
@@ -0,0 +1,193 @@
+import { TitleCasePipe } from '@angular/common';
+import { Component, Input } from '@angular/core';
+import { Store } from '@ngrx/store';
+import * as moment from 'moment';
+import { of } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { AppState } from '../../../../../../../store/src/app-state';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
+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';
+import {
+  TableCellBooleanIndicatorComponent,
+  TableCellBooleanIndicatorComponentConfig,
+} from '../../../../../shared/components/list/list-table/table-cell-boolean-indicator/table-cell-boolean-indicator.component';
+import {
+  TableCellIconComponent,
+  TableCellIconComponentConfig,
+} from '../../../../../shared/components/list/list-table/table-cell-icon/table-cell-icon.component';
+import { ITableColumn } from '../../../../../shared/components/list/list-table/table.types';
+import { CardCell } from '../../../../../shared/components/list/list.types';
+import { KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType } from '../../../kubernetes-entity-factory';
+import { Container, ContainerState, ContainerStatus, InitContainer, KubernetesPod } from '../../../store/kube.types';
+
+export interface ContainerForTable {
+  isInit: boolean;
+  container: Container | InitContainer;
+  containerStatus: ContainerStatus;
+}
+
+@Component({
+  selector: 'app-kubernetes-pod-containers',
+  templateUrl: './kubernetes-pod-containers.component.html',
+  styleUrls: ['./kubernetes-pod-containers.component.scss'],
+  providers: [
+    TitleCasePipe
+  ]
+})
+export class KubernetesPodContainersComponent extends CardCell<KubernetesPod> {
+
+  private entityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType);
+
+  @Input()
+  set row(row: KubernetesPod) {
+    if (!row || !!this.containerDataSource) {
+      return;
+    }
+    this.containerDataSource = {
+      isTableLoading$: of(false),
+      connect: () => this.store.select<KubernetesPod>(selectEntity(this.entityConfig.entityKey, row.metadata.uid)).pipe(
+        map(pod => this.map(pod)),
+      ),
+      disconnect: () => { },
+      trackBy: (index, container: ContainerForTable) => container.container.name,
+    };
+  }
+
+  constructor(
+    private store: Store<AppState>,
+    private titleCase: TitleCasePipe,
+  ) {
+    super();
+  }
+
+  private readyBoolConfig: TableCellBooleanIndicatorComponentConfig<ContainerForTable> = {
+    isEnabled: (row: ContainerForTable) => row.containerStatus.ready,
+    type: BooleanIndicatorType.yesNo,
+    subtle: false,
+    showText: false
+  };
+
+  private iconConfig: TableCellIconComponentConfig<ContainerForTable> = {
+    getIcon: (row: ContainerForTable) => row.isInit ?
+      {
+        icon: 'border_clear',
+        font: '',
+        tooltip: 'Init Container'
+      } : {
+        icon: 'border_outer',
+        font: '',
+        tooltip: 'Container'
+      },
+  };
+
+  public containerDataSource: ITableListDataSource<ContainerForTable>;
+  public columns: ITableColumn<ContainerForTable>[] = [
+    {
+      columnId: 'icon',
+      headerCell: () => '',
+      cellComponent: TableCellIconComponent,
+      cellConfig: this.iconConfig,
+      cellFlex: '0 0 53px',
+    },
+    {
+      columnId: 'name',
+      headerCell: () => 'Container Name',
+      cellDefinition: {
+        valuePath: 'container.name'
+      },
+      cellFlex: '2',
+    },
+    {
+      columnId: 'image',
+      headerCell: () => 'Image',
+      cellDefinition: {
+        valuePath: 'container.image'
+      },
+      cellFlex: '3',
+    },
+    {
+      columnId: 'ready',
+      headerCell: () => 'Ready',
+      cellComponent: TableCellBooleanIndicatorComponent,
+      cellConfig: this.readyBoolConfig,
+      cellFlex: '1',
+    },
+    {
+      columnId: 'status',
+      headerCell: () => 'State',
+      cellDefinition: {
+        getValue: cft => {
+          if (!cft.containerStatus.state) {
+            return 'Unknown';
+          }
+          const entries = Object.entries(cft.containerStatus.state);
+          if (!entries.length) {
+            return 'Unknown';
+          }
+          const sorted = entries.sort((a, b) => {
+            const aStarted = moment(a[1].startedAt);
+            const bStarted = moment(b[1].startedAt);
+
+            return aStarted.isBefore(bStarted) ? -1 :
+              aStarted.isAfter(bStarted) ? 1 : 0;
+
+          });
+          return this.containerStatusToString(sorted[0][0], sorted[0][1]);
+        }
+      },
+      cellFlex: '2'
+    },
+    {
+      columnId: 'restarts',
+      headerCell: () => 'Restarts',
+      cellDefinition: {
+        getValue: cft => cft.containerStatus.restartCount.toString()
+      },
+      cellFlex: '1',
+    },
+    {
+      columnId: 'probes',
+      headerCell: () => 'Probes (L:R)',
+      cellDefinition: {
+        getValue: cft => {
+          if (cft.isInit) {
+            return '';
+          }
+          const container: Container = cft.container as Container;
+          return cft.isInit ? '' : `${container.livenessProbe ? 'on' : 'off'}:${container.readinessProbe ? 'on' : 'off'}`;
+        }
+      },
+      cellFlex: '1',
+    },
+  ];
+
+  private map(row: KubernetesPod): ContainerForTable[] {
+    const containerStatus = row.status.containerStatuses || [];
+    const initContainerStatuses = row.status.initContainerStatuses || [];
+    const containerStatusWithContainers: ContainerForTable[] = [
+      ...containerStatus.map(c => this.createContainerForTable(c, row.spec.containers)),
+      ...initContainerStatuses.map(c => this.createContainerForTable(c, row.spec.initContainers, true))
+    ];
+    return containerStatusWithContainers.sort((a, b) => a.container.name.localeCompare(b.container.name));
+  }
+
+  private createContainerForTable(containerStatus: ContainerStatus, containers: (Container | InitContainer)[], isInit = false):
+    ContainerForTable {
+    const containerForTable: ContainerForTable = {
+      isInit,
+      containerStatus,
+      container: containers.find(c => c.name === containerStatus.name)
+    };
+    return containerForTable;
+  }
+
+  private containerStatusToString(state: string, status: ContainerState): string {
+    const exitCode = status.exitCode ? `:${status.exitCode}` : '';
+    const signal = status.signal ? `:${status.signal}` : '';
+    const reason = status.reason ? ` (${status.reason}${exitCode || signal})` : '';
+    return `${this.titleCase.transform(state)}${reason}`;
+  }
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts
index 2ef6a3cbf0..3b4aa18faa 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts
@@ -9,7 +9,9 @@ describe('KubernetesPodStatusComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [KubernetesPodStatusComponent]
+      declarations: [
+        KubernetesPodStatusComponent
+      ]
     })
       .compileComponents();
   }));
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
index fbbc455874..0ad59ce8be 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
@@ -20,6 +20,7 @@ import {
 import { KubernetesPod } from '../../store/kube.types';
 import { defaultHelmKubeListPageSize } from '../kube-helm-list-types';
 import { createKubeAgeColumn } from '../kube-list.helper';
+import { KubernetesPodContainersComponent } from './kubernetes-pod-containers/kubernetes-pod-containers.component';
 import { KubernetesPodStatusComponent } from './kubernetes-pod-status/kubernetes-pod-status.component';
 import { KubernetesPodsDataSource } from './kubernetes-pods-data-source';
 
@@ -139,6 +140,7 @@ export abstract class BaseKubernetesPodsListConfigService implements IListConfig
     noEntries: 'There are no pods'
   };
   abstract getDataSource: () => IListDataSource<KubernetesPod>;
+  expandComponent = KubernetesPodContainersComponent;
 
   getGlobalActions = () => null;
   getMultiActions = () => [];
diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
index 88d9c4a781..b6b2721e86 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
@@ -248,8 +248,8 @@ export interface KubernetesCondition {
 
 export interface ContainerStatus {
   name: string;
-  state: State;
-  lastState: State;
+  state: ContainerStateCollection;
+  lastState: ContainerStateCollection;
   ready: boolean;
   restartCount: number;
   image: string;
@@ -257,13 +257,15 @@ export interface ContainerStatus {
   containerID: string;
 }
 
-export interface State {
-  [key: string]: {
-    startedAt: Date;
-    reason: string;
-    signal: number;
-    exitCode: number
-  };
+export interface ContainerStateCollection {
+  [key: string]: ContainerState;
+}
+
+export interface ContainerState {
+  startedAt: Date;
+  reason: string;
+  signal: number;
+  exitCode: number;
 }
 
 export interface PodSpec {
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts
index c956a9dc24..9e2b68e4b8 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts
@@ -34,7 +34,6 @@ export class HelmReleasesListConfig implements IListConfig<HelmRelease> {
   };
   pageSizeOptions = defaultHelmKubeListPageSize;
   enableTextFilter = true;
-  tableFixedRowHeight = true;
   cardComponent = HelmReleaseCardComponent;
   columns: ITableColumn<HelmRelease>[] = [
     {
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 1046d0b70a..03a78f107f 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
@@ -3,7 +3,6 @@ import { Store } from '@ngrx/store';
 import { of as observableOf, Subject } from 'rxjs';
 import { filter, first, map, switchMap } from 'rxjs/operators';
 
-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 {
@@ -16,10 +15,11 @@ import {
   IMultiListAction,
   ListViewTypes,
 } from '../../../../../../../core/src/shared/components/list/list.component.types';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { UpdateExistingApplication } from '../../../../../actions/application.actions';
 import { CFAppState } from '../../../../../cf-app-state';
 import { appEnvVarsEntityType, 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';
 import { TableCellEditVariableComponent } from './table-cell-edit-variable/table-cell-edit-variable.component';
@@ -84,6 +84,7 @@ export class CfAppVariablesListConfigService implements IListConfig<ListAppEnvVa
     title: 'Environment Variables', filter: 'Search by name', noEntries: 'There are no variables'
   };
   enableTextFilter = true;
+  minRowHeight = '77px';
 
   private dispatchDeleteAction(newValues: ListAppEnvVar[]) {
     const confirmation = this.getConfirmationModal(newValues);
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service.ts
index 82bf8d29fc..a72c7221e7 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service.ts
@@ -30,7 +30,6 @@ export class CFEndpointsListConfigService implements IListConfig<EndpointModel>
     noEntries: 'There are no endpoints'
   };
   enableTextFilter = true;
-  tableFixedRowHeight = true;
 
   constructor(
     private store: Store<CFAppState>,
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 8b6b70db1a..65b72b2282 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
@@ -10,7 +10,6 @@ import { CfUser } from '../../../../../../../cloud-foundry/src/store/types/user.
 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 { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
 import {
   IListAction,
@@ -20,6 +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 { 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/core/src/shared/components/list/data-sources-controllers/list-data-source-types.ts b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source-types.ts
index d9a9929d89..453ab5c46e 100644
--- a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source-types.ts
+++ b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source-types.ts
@@ -5,9 +5,9 @@ import { BehaviorSubject, Observable, ReplaySubject } from 'rxjs';
 import { ListFilter, ListSort } from '../../../../../../store/src/actions/list.actions';
 import { MetricsAction } from '../../../../../../store/src/actions/metrics.actions';
 import { IRequestEntityTypeState } from '../../../../../../store/src/app-state';
-import { PaginatedAction, PaginationEntityState, PaginationParam } from '../../../../../../store/src/types/pagination.types';
 import { EntityCatalogEntityConfig } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
 import { EntitySchema } from '../../../../../../store/src/helpers/entity-schema';
+import { PaginatedAction, PaginationEntityState, PaginationParam } from '../../../../../../store/src/types/pagination.types';
 
 export interface IEntitySelectItem {
   page: number;
@@ -60,7 +60,6 @@ export class ListActionConfig<T> {
 
 interface ICoreListDataSource<T> extends DataSource<T> {
   rowsState?: Observable<RowsState>;
-
   getRowState?(row: T, schemaKey?: string): Observable<RowState>;
   trackBy(index: number, item: T);
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-icon/table-cell-icon.component.html b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-icon/table-cell-icon.component.html
new file mode 100644
index 0000000000..9c3559ca29
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-icon/table-cell-icon.component.html
@@ -0,0 +1 @@
+<mat-icon [matTooltip]="icon.tooltip" [fontSet]="icon.font" [ngStyle]="{'font-size': size}">{{icon.icon}}</mat-icon>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-icon/table-cell-icon.component.scss b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-icon/table-cell-icon.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-icon/table-cell-icon.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-icon/table-cell-icon.component.spec.ts
new file mode 100644
index 0000000000..7a5d053d44
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-icon/table-cell-icon.component.spec.ts
@@ -0,0 +1,37 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CoreModule } from '../../../../../core/core.module';
+import { TableCellIconComponent } from './table-cell-icon.component';
+
+describe('TableCellIconComponent', () => {
+  let component: TableCellIconComponent;
+  let fixture: ComponentFixture<TableCellIconComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [
+        TableCellIconComponent,
+      ],
+      imports: [
+        CoreModule
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(TableCellIconComponent);
+    component = fixture.componentInstance;
+    component.row = true;
+    component.config = {
+      getIcon: (row) => ({
+        icon: ''
+      })
+    };
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-icon/table-cell-icon.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-icon/table-cell-icon.component.ts
new file mode 100644
index 0000000000..6180d9ece5
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-icon/table-cell-icon.component.ts
@@ -0,0 +1,44 @@
+import { Component, Input } from '@angular/core';
+
+import { TableCellCustom } from '../../list.types';
+
+export interface TableCellIconComponentConfig<T> {
+  getIcon: (row: T) => { icon: string, font?: string, tooltip?: string };
+  size?: string;
+}
+
+@Component({
+  selector: 'app-table-cell-icon',
+  templateUrl: './table-cell-icon.component.html',
+  styleUrls: ['./table-cell-icon.component.scss']
+})
+export class TableCellIconComponent<T = any> extends TableCellCustom<T> {
+
+
+  private pRow: T;
+  @Input('row')
+  get row() { return this.pRow; }
+  set row(row: T) {
+    this.pRow = row;
+    if (this.config) {
+      this.icon = this.config.getIcon(row);
+    }
+  }
+
+  private pConfig: TableCellIconComponentConfig<T>;
+  @Input('config')
+  get config() { return this.pConfig; }
+  set config(config: TableCellIconComponentConfig<T>) {
+    this.pConfig = config;
+    if (!config) {
+      return;
+    }
+    this.icon = config.getIcon(this.row);
+    this.size = config.size;
+  }
+
+  icon: { icon: string, font?: string, tooltip?: string };
+  size = '24px';
+  tooltip = '';
+
+}
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..7a0a025c4d 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
@@ -30,6 +30,7 @@ import { TableCellActionsComponent } from '../table-cell-actions/table-cell-acti
 import { TableCellBooleanIndicatorComponent } from '../table-cell-boolean-indicator/table-cell-boolean-indicator.component';
 import { TableCellEditComponent } from '../table-cell-edit/table-cell-edit.component';
 import { TableCellFavoriteComponent } from '../table-cell-favorite/table-cell-favorite.component';
+import { TableCellIconComponent } from '../table-cell-icon/table-cell-icon.component';
 import { TableCellRadioComponent } from '../table-cell-radio/table-cell-radio.component';
 import {
   TableCellRequestMonitorIconComponent,
@@ -55,6 +56,7 @@ export const listTableCells: Type<TableCellCustom<any>>[] = [
   TableCellFavoriteComponent,
   TableCellEndpointDetailsComponent,
   TableCellSidePanelComponent,
+  TableCellIconComponent,
   ...coreEndpointListDetailsComponents
 ];
 
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 e2d242c657..5c67039e94 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,4 +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 }">
+<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 }">
   <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>
@@ -7,7 +8,16 @@
   </div>
   <div role="row" class="table-row">
     <div class="mat-row table-row__inner">
-      <ng-container cdkCellOutlet></ng-container>
+      <mat-expansion-panel class="table-row__inner__expansion" [togglePosition]="'before'" [disabled]="!expandComponent"
+        (opened)="createExpandedComponent()">
+        <mat-expansion-panel-header class="table-row__inner__expansion--header"
+          [ngClass]="{'in-expanded-row': !!inExpandedRow, 'has-expanded-row': expandComponent}"
+          [collapsedHeight]="'auto'" [expandedHeight]="'auto'"
+          [ngStyle]="{'min-height': minRowHeight || defaultMinRowHeight }">
+          <ng-container cdkCellOutlet></ng-container>
+        </mat-expansion-panel-header>
+        <div #expandedComponent></div>
+      </mat-expansion-panel>
     </div>
   </div>
   <div class="table-row__error mat-row" *ngIf="errorMessage$ | async">
@@ -15,4 +25,4 @@
     <div class="table-row__error-message" [innerHTML]="errorMessage$ | async">
     </div>
   </div>
-</div>
+</div>
\ No newline at end of file
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 8eb203bd1c..91cc75bfa1 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
@@ -86,5 +86,33 @@
     display: flex;
     flex: 1;
     width: 100%;
+
+    .mat-expansion-panel-body {
+      padding: 0;
+    }
+
+    .table-row__inner__expansion.mat-expansion-panel {
+      box-shadow: none;
+      box-sizing: inherit;
+      width: 100%;
+
+      .table-row__inner__expansion--header {
+        padding-left: 0;
+        padding-right: 0;
+
+        &.has-expanded-row {
+          padding-left: 27px;
+        }
+
+        &.in-expanded-row {
+          padding: 0;
+        }
+
+        .mat-expansion-indicator {
+          margin: 0 4px 0 0;
+        }
+
+      }
+    }
   }
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.ts
index 03415f9e38..2919a7bea3 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.ts
@@ -1,9 +1,21 @@
 import { CdkRow } from '@angular/cdk/table';
-import { ChangeDetectionStrategy, Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  ComponentFactoryResolver,
+  ComponentRef,
+  Input,
+  OnInit,
+  ViewChild,
+  ViewContainerRef,
+  ViewEncapsulation,
+} from '@angular/core';
 import { Observable } from 'rxjs';
-import { map, tap } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 
 import { RowState } from '../../data-sources-controllers/list-data-source-types';
+import { ListExpandedComponentType } from '../../list.component.types';
+import { CardCell } from '../../list.types';
 
 
 @Component({
@@ -14,10 +26,16 @@ import { RowState } from '../../data-sources-controllers/list-data-source-types'
   encapsulation: ViewEncapsulation.None,
   preserveWhitespaces: false
 })
-export class TableRowComponent extends CdkRow implements OnInit {
+export class TableRowComponent<T = any> extends CdkRow implements OnInit {
 
-  @Input()
-  rowState: Observable<RowState>;
+  @ViewChild('expandedComponent', { read: ViewContainerRef, static: true })
+  expandedComponent: ViewContainerRef;
+
+  @Input() rowState: Observable<RowState>;
+  @Input() expandComponent: ListExpandedComponentType<T>;
+  @Input() row: T;
+  @Input() minRowHeight: string;
+  @Input() inExpandedRow: boolean;
 
   public inErrorState$: Observable<boolean>;
   public inWarningState$: Observable<boolean>;
@@ -25,6 +43,13 @@ export class TableRowComponent extends CdkRow implements OnInit {
   public isBlocked$: Observable<boolean>;
   public isHighlighted$: Observable<boolean>;
   public isDeleting$: Observable<boolean>;
+  public defaultMinRowHeight = '50px';
+
+  private expandedComponentRef: ComponentRef<any>;
+
+  constructor(private componentFactoryResolver: ComponentFactoryResolver) {
+    super();
+  }
 
   ngOnInit() {
     if (this.rowState) {
@@ -47,6 +72,29 @@ export class TableRowComponent extends CdkRow implements OnInit {
         map(state => state.deleting)
       );
     }
+    if (this.expandComponent) {
+      this.defaultMinRowHeight = '64px';
+    }
+  }
+
+  private getComponent() {
+    return this.componentFactoryResolver.resolveComponentFactory(
+      this.expandComponent
+    );
+  }
+
+  private createComponent() {
+    const component = this.getComponent();
+    return !!component ? this.expandedComponent.createComponent(component) : null;
+  }
+
+  public createExpandedComponent() {
+    if (this.expandedComponentRef) {
+      return;
+    }
+    this.expandedComponentRef = this.createComponent();
+    const instance: CardCell<any> = this.expandedComponentRef.instance;
+    instance.row = this.row; // This could be set again when `row` changes above
   }
 
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table.component.html b/src/frontend/packages/core/src/shared/components/list/list-table/table.component.html
index 462db288ed..d36afc7016 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table.component.html
@@ -28,10 +28,12 @@
               [config]="column.cellConfig" [func]="column.cell" [row]="row" [dataSource]="dataSource"></app-table-cell>
           </mat-cell>
         </ng-container>
-        <mat-header-row [hidden]="hideTable" class="app-table__header-row" *matHeaderRowDef="columnNames">
+        <mat-header-row [hidden]="hideTable" class="app-table__header-row" *matHeaderRowDef="columnNames"
+          [ngClass]="{'app-table__inner--has-expanded-columns': !!expandComponent}">
         </mat-header-row>
-        <app-table-row [ngClass]="{'app-table__inner--fixed-row-height': fixedRowHeight}" class="app-table__row"
-          *matRowDef="let row; columns: columnNames;" [rowState]="getRowState(row)"></app-table-row>
+        <app-table-row class="app-table__row" *matRowDef="let row; columns: columnNames;" [rowState]="getRowState(row)"
+          [row]="row" [expandComponent]="expandComponent" [inExpandedRow]="inExpandedRow" [minRowHeight]="minRowHeight">
+        </app-table-row>
       </mat-table>
     </mat-card-content>
   </mat-card>
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 3c18088c04..fc5fa1bd30 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
@@ -1,5 +1,3 @@
-$row-height: 62px;
-
 .table-column-select {
   overflow: initial;
 }
@@ -34,8 +32,10 @@ mat-header-cell {
       display: none;
     }
 
-    &--fixed-row-height {
-      height: $row-height;
+    &--has-expanded-columns {
+      & > mat-header-cell:first-of-type {
+        padding-left: 63px;
+      }
     }
   }
 
@@ -84,13 +84,10 @@ mat-header-cell {
   }
 
   &__row {
-    min-height: $row-height;
 
     .mat-cell {
-      // Ensure the cell consumes at least height of the row. This ensure the animation on select is correct and edit row doesn't wiggle
       align-items: center;
       display: flex;
-      min-height: $row-height;
     }
 
     &:hover {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table.component.ts
index d95e4dd6a6..534e7161ae 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table.component.ts
@@ -5,6 +5,7 @@ import { tap } from 'rxjs/operators';
 
 import { ITableListDataSource } from '../data-sources-controllers/list-data-source-types';
 import { IListPaginationController } from '../data-sources-controllers/list-pagination-controller';
+import { ListExpandedComponentType } from '../list.component.types';
 import { ListSort } from './../../../../../../store/src/actions/list.actions';
 import { TableCellActionsComponent } from './table-cell-actions/table-cell-actions.component';
 import { TableCellSelectComponent } from './table-cell-select/table-cell-select.component';
@@ -43,12 +44,14 @@ export class TableComponent<T> implements OnInit, OnDestroy {
   @Input() hideTable = false;
   @Input() addSelect = false;
   @Input() addActions = false;
+  @Input() expandComponent: ListExpandedComponentType<T>;
+  @Input() inExpandedRow = false;
   @Input() dataSource: ITableListDataSource<T>;
   @Input() paginationController = null as IListPaginationController<T>;
   @Input() columns: ITableColumn<T>[];
   public columnNames: string[];
 
-  @Input() fixedRowHeight = false;
+  @Input() minRowHeight: string;
 
   ngOnInit() {
     if (this.addSelect || this.addActions) {
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..a2638e2fd5 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
@@ -3,12 +3,12 @@ import { Store } from '@ngrx/store';
 
 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 { 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';
@@ -100,7 +100,6 @@ export class EndpointsListConfigService implements IListConfig<EndpointModel> {
     filter: 'Filter Endpoints'
   };
   enableTextFilter = true;
-  tableFixedRowHeight = true;
 
   constructor(
     private store: Store<CFAppState>,
diff --git a/src/frontend/packages/core/src/shared/components/list/list.component.html b/src/frontend/packages/core/src/shared/components/list/list.component.html
index 9816bc3014..bcbde5192e 100644
--- a/src/frontend/packages/core/src/shared/components/list/list.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list.component.html
@@ -176,8 +176,8 @@
           [component]="config.cardComponent" [hidden]="!(hasRows$ | async)"></app-cards>
         <app-table *ngIf="(view$ | async) === 'table'" #table [dataSource]="dataSource" [addActions]="hasSingleActions"
           [addSelect]="config.allowSelection || (haveMultiActions | async)"
-          [paginationController]="paginationController" [columns]="columns"
-          [fixedRowHeight]="config.tableFixedRowHeight" [hidden]="!(hasRows$ | async)">
+          [paginationController]="paginationController" [columns]="columns" [minRowHeight]="config.minRowHeight"
+          [hidden]="!(hasRows$ | async)" [expandComponent]="config.expandComponent">
         </app-table>
       </div>
       <mat-card class="list-component__paginator" [hidden]="(hidePaginator$ | async)">
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..a0f08a4282 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
@@ -1,3 +1,4 @@
+import { Type } from '@angular/core';
 import * as moment from 'moment';
 import { BehaviorSubject, combineLatest, Observable, of as observableOf } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
@@ -12,6 +13,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 { CardCell } from './list.types';
 
 export enum ListViewTypes {
   CARD_ONLY = 'cardOnly',
@@ -79,9 +81,9 @@ export interface IListConfig<T> {
    */
   enableTextFilter?: boolean;
   /**
-   * Fix the height of a table row
+   * Set a custom value for the minimum height of a table row
    */
-  tableFixedRowHeight?: boolean;
+  minRowHeight?: string;
   /**
    * Set the align-self of each cell in the row
    */
@@ -90,6 +92,13 @@ export interface IListConfig<T> {
    * The card component used in card view
    */
   cardComponent?: CardTypes<T>;
+  /**
+   * The component to show when expanding a row
+   */
+  expandComponent?: ListExpandedComponentType<T>;
+  /**
+   * Hide the fresh button
+   */
   hideRefresh?: boolean;
   /**
    * Allow selection regardless of number or visibility of multi actions
@@ -245,3 +254,5 @@ export class MultiFilterManager<T> {
     this.value = itemValue;
   }
 }
+
+export type ListExpandedComponentType<T> = Type<CardCell<T>>;
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index 7fac344dc1..aafee78f11 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -24,6 +24,7 @@ import { ApplicationStateService } from './components/application-state/applicat
 import { BlurDirective } from './components/blur.directive';
 import { BooleanIndicatorComponent } from './components/boolean-indicator/boolean-indicator.component';
 import { BreadcrumbsComponent } from './components/breadcrumbs/breadcrumbs.component';
+import { CardProgressOverlayComponent } from './components/card-progress-overlay/card-progress-overlay.component';
 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';
@@ -59,6 +60,9 @@ import { MetaCardValueComponent } from './components/list/list-cards/meta-card/m
 import {
   TableCellRequestMonitorIconComponent,
 } from './components/list/list-table/table-cell-request-monitor-icon/table-cell-request-monitor-icon.component';
+import {
+  TableCellSidePanelComponent,
+} from './components/list/list-table/table-cell-side-panel/table-cell-side-panel.component';
 import { TableCellStatusDirective } from './components/list/list-table/table-cell-status.directive';
 import { TableComponent } from './components/list/list-table/table.component';
 import { listTableComponents } from './components/list/list-table/table.types';
@@ -124,8 +128,6 @@ import { CloudFoundryUserProvidedServicesService } from './services/cloud-foundr
 import { LongRunningOperationsService } from './services/long-running-op.service';
 import { MetricsRangeSelectorService } from './services/metrics-range-selector.service';
 import { UserPermissionDirective } from './user-permission.directive';
-import { TableCellSidePanelComponent } from './components/list/list-table/table-cell-side-panel/table-cell-side-panel.component';
-import { CardProgressOverlayComponent } from './components/card-progress-overlay/card-progress-overlay.component';
 
 
 @NgModule({

From d988d9776484b4c36b2e23c25d589bae7c817e50 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 17 Mar 2020 20:42:47 +0000
Subject: [PATCH 466/648] FIx issue where failed helm sync gets stuck as
 synchronizing

---
 .../table-cell-endpoint-status.component.html |  4 +++
 .../monocular/chart-repo/api_endpoint.go      |  5 ++-
 .../chart-repo/foundationdb/utils.go          | 25 ++++++++-----
 src/jetstream/plugins/monocular/sync.go       | 35 +++++++++++++------
 4 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component.html b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component.html
index 9302034935..ae520dca71 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component.html
@@ -27,6 +27,10 @@
         <span *ngIf="config?.showLabel">Synchronizing </span>
         <mat-spinner diameter="20"></mat-spinner>
       </ng-container>
+      <ng-container *ngIf="status === 'Failed'">
+        <span *ngIf="config?.showLabel">Synchronization failed</span>
+        <mat-icon>sync_problem</mat-icon>
+      </ng-container>
     </ng-container>
     <ng-template #noStatus>
       -
diff --git a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
index 07e8d3c4e9..8040e204b2 100644
--- a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
+++ b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
@@ -204,7 +204,10 @@ func RepoSyncStatus(w http.ResponseWriter, req *http.Request, params Params) {
 		return
 	}
 
-	response := common.SyncJobStatusResponse{requestUUID.String(), status.Status}
+	response := common.SyncJobStatusResponse{
+		UUID:   requestUUID.String(),
+		Status: status.Status,
+	}
 	js, err := json.Marshal(response)
 	if err != nil {
 		log.Errorf("Request: requestUUID, %v, %v", requestUUID, err.Error())
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
index fb715e16ac..926ed920ad 100644
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
+++ b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
@@ -60,6 +60,14 @@ func init() {
 	}
 }
 
+func createStatus(repoName, repoUrl, status string) common.RepoSyncStatus {
+	syncStatus := common.RepoSyncStatus{}
+	syncStatus.Repo = repoName
+	syncStatus.URL = repoUrl
+	syncStatus.Status = status
+	return syncStatus
+}
+
 // SyncRepo Syncing is performed in the following steps:
 // 1. Update database to match chart metadata from index
 // 2. Concurrently process icons for charts (concurrently)
@@ -71,7 +79,7 @@ func init() {
 // charts before fetching readmes for each chart and version pair.
 func SyncRepo(dbClient Client, dbName, repoName, repoURL string, authorizationHeader string, clientKeepAlive bool) error {
 
-	repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusInProgress})
+	repoSyncStatus.Set(repoName, createStatus(repoName, repoURL, common.SyncStatusInProgress))
 
 	db, closer := dbClient.Database(dbName)
 
@@ -94,7 +102,7 @@ func SyncRepo(dbClient Client, dbName, repoName, repoURL string, authorizationHe
 	if err != nil {
 		log.Errorf("Database readiness/connection test failed: %v", err)
 		cancel()
-		repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusFailed})
+		repoSyncStatus.Set(repoName, createStatus(repoName, repoURL, common.SyncStatusFailed))
 		return err
 	}
 	id := res.InsertedID
@@ -107,42 +115,43 @@ func SyncRepo(dbClient Client, dbName, repoName, repoURL string, authorizationHe
 	repoBytes, err := common.FetchRepoIndex(r, netClient)
 	if err != nil {
 		log.Errorf("Failed to fetch repo index: %v", err)
-		repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusFailed})
+
+		repoSyncStatus.Set(repoName, createStatus(repoName, repoURL, common.SyncStatusFailed))
 		return err
 	}
 
 	repoChecksum, err := common.GetSha256(repoBytes)
 	if err != nil {
 		log.Errorf("Failed to generate repo checksum: %v", err)
-		repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusFailed})
+		repoSyncStatus.Set(repoName, createStatus(repoName, repoURL, common.SyncStatusFailed))
 		return err
 	}
 
 	// Check if the repo has been already processed
 	if repoAlreadyProcessed(db, repoName, repoChecksum) {
 		log.WithFields(log.Fields{"url": repoURL}).Info("Skipping repository since there are no updates")
-		repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusSynced})
+		repoSyncStatus.Set(repoName, createStatus(repoName, repoURL, common.SyncStatusSynced))
 		return nil
 	}
 
 	index, err := common.ParseRepoIndex(repoBytes)
 	if err != nil {
 		log.Errorf("Error parsing repo index: %v", err)
-		repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusFailed})
+		repoSyncStatus.Set(repoName, createStatus(repoName, repoURL, common.SyncStatusFailed))
 		return err
 	}
 
 	charts := common.ChartsFromIndex(index, r)
 	log.Debugf("%v Charts in index of repo: %v", len(charts), repoURL)
 	if len(charts) == 0 {
-		repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, "Synchronized"})
+		repoSyncStatus.Set(repoName, createStatus(repoName, repoURL, common.SyncStatusSynced))
 		return errors.New("no charts in repository index")
 	}
 
 	err = importCharts(db, dbName, charts)
 	if err != nil {
 		log.Errorf("Error importing charts: %v", err)
-		repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusFailed})
+		repoSyncStatus.Set(repoName, createStatus(repoName, repoURL, common.SyncStatusFailed))
 		return err
 	}
 
diff --git a/src/jetstream/plugins/monocular/sync.go b/src/jetstream/plugins/monocular/sync.go
index c877d03ea1..89696fd2ee 100644
--- a/src/jetstream/plugins/monocular/sync.go
+++ b/src/jetstream/plugins/monocular/sync.go
@@ -147,7 +147,13 @@ func (m *Monocular) processSyncRequests() {
 					err := waitForSyncComplete(statusURL)
 					metadata.Busy = false
 					if err == nil {
-						metadata.Status = "Synchronized"
+						// Need to get the actual status
+						status, err := getSyncStatus(statusURL)
+						if err == nil {
+							metadata.Status = status.Status
+						} else {
+							metadata.Status = "Sync Failed"
+						}
 					} else {
 						metadata.Status = "Sync Failed"
 						log.Errorf("Failed to fetch sync status for repo: %v, %v", job.Endpoint.Name, err)
@@ -182,21 +188,28 @@ func (m *Monocular) processSyncRequests() {
 func waitForSyncComplete(url string) error {
 	return wait.Poll(statusPollInterval*time.Second, time.Duration(statusPollTimeout)*time.Second, func() (bool, error) {
 		var complete = false
-		log.Infof("Making GET request to: %v", url)
-		resp, err := http.Get(url)
-		defer resp.Body.Close()
-		if err == nil {
-			statusResponse := common.SyncJobStatusResponse{}
-			err := json.NewDecoder(resp.Body).Decode(&statusResponse)
-			log.Infof("%v", statusResponse)
-			if err == nil && statusResponse.Status == common.SyncStatusSynced {
-				complete = true
-			}
+		statusResponse, err := getSyncStatus(url)
+		if err == nil && statusResponse.Status == common.SyncStatusSynced || statusResponse.Status == common.SyncStatusFailed {
+			// Note: complete can mean synced okay or sync failed
+			complete = true
 		}
 		return complete, err
 	})
 }
 
+func getSyncStatus(url string) (*common.SyncJobStatusResponse, error) {
+	resp, err := http.Get(url)
+	if err == nil {
+		defer resp.Body.Close()
+		statusResponse := common.SyncJobStatusResponse{}
+		err = json.NewDecoder(resp.Body).Decode(&statusResponse)
+		if err == nil {
+			return &statusResponse, nil
+		}
+	}
+	return nil, err
+}
+
 func marshalSyncMetadata(metadata SyncMetadata) string {
 	jsonString, err := json.Marshal(metadata)
 	if err != nil {

From 95fba6993fd604a0c07a1a316abadf0afd661930 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 18 Mar 2020 07:32:27 +0000
Subject: [PATCH 467/648] Helm Endpoint - add chck that a URL is a Helm
 endpoint

---
 src/jetstream/plugins/monocular/endpoint.go | 23 ++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/jetstream/plugins/monocular/endpoint.go b/src/jetstream/plugins/monocular/endpoint.go
index 8bf5ca906a..f06fd46ddd 100644
--- a/src/jetstream/plugins/monocular/endpoint.go
+++ b/src/jetstream/plugins/monocular/endpoint.go
@@ -2,6 +2,7 @@ package monocular
 
 import (
 	"errors"
+	"fmt"
 	"net/url"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
@@ -9,30 +10,35 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
+// GetType returns the endpoint type supported by this plugin
 func (m *Monocular) GetType() string {
 	return helmEndpointType
 }
 
+// GetClientId gets the default client ID to use
 func (m *Monocular) GetClientId() string {
 	return "helm"
 }
 
+// Register will register a new endpoint of the type Helm
 func (m *Monocular) Register(echoContext echo.Context) error {
 	log.Debug("Helm Repository Register...")
 	return m.portalProxy.RegisterEndpoint(echoContext, m.Info)
 }
 
+// Validate validates the connection to the endpoint - verifies that we can actually connect and call its API
 func (m *Monocular) Validate(userGUID string, cnsiRecord interfaces.CNSIRecord, tokenRecord interfaces.TokenRecord) error {
 	return nil
 }
 
+// Connect to the endpoint
 func (m *Monocular) Connect(ec echo.Context, cnsiRecord interfaces.CNSIRecord, userId string) (*interfaces.TokenRecord, bool, error) {
 	// Note: Helm Repositories don't support connecting
 	return nil, false, errors.New("Connecting not support for a Helm Repository")
 }
 
+// Info checks the endpoint type and fetches any metadata
 func (m *Monocular) Info(apiEndpoint string, skipSSLValidation bool) (interfaces.CNSIRecord, interface{}, error) {
-	// NOTE: This should check that the endpoint is actually a Helm Repository
 	log.Debug("Helm Repository Info")
 	var v2InfoResponse interfaces.V2Info
 	var newCNSI interfaces.CNSIRecord
@@ -44,11 +50,26 @@ func (m *Monocular) Info(apiEndpoint string, skipSSLValidation bool) (interfaces
 		return newCNSI, nil, err
 	}
 
+	// Just check that we can fetch index.yaml
+	var httpClient = m.portalProxy.GetHttpClient(skipSSLValidation)
+	res, err := httpClient.Get(apiEndpoint + "/index.yaml")
+	if err != nil {
+		// This should ultimately catch 503 cert errors
+		return newCNSI, nil, err
+	}
+
+	if res.StatusCode >= 400 {
+		return newCNSI, nil, fmt.Errorf("Does not appear to be a Helm Repository (HTTP Status code: %d)", res.StatusCode)
+	}
+
+	// We were able to fetch the index.yaml, so looks like a Helm Repository
+	// We could parse the contents and check further
 	newCNSI.TokenEndpoint = apiEndpoint
 	newCNSI.AuthorizationEndpoint = apiEndpoint
 
 	return newCNSI, v2InfoResponse, nil
 }
 
+// UpdateMetadata not needed for Helm endpoints
 func (m *Monocular) UpdateMetadata(info *interfaces.Info, userGUID string, echoContext echo.Context) {
 }

From 79fe3764e894525c2d2dc2d5573960ac25e0c4c2 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 18 Mar 2020 08:07:55 +0000
Subject: [PATCH 468/648] FIx for Helm repo sattus shwoing as '-'

---
 .../table-cell-endpoint-status.component.html            | 4 ++++
 src/jetstream/plugins/monocular/sync.go                  | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component.html b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component.html
index 9302034935..091260c52d 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component.html
@@ -27,6 +27,10 @@
         <span *ngIf="config?.showLabel">Synchronizing </span>
         <mat-spinner diameter="20"></mat-spinner>
       </ng-container>
+      <ng-container *ngIf="status === 'Pending'">
+        <span *ngIf="config?.showLabel">Sync Pending</span>
+        <mat-icon>hourglass_empty</mat-icon>
+      </ng-container>
     </ng-container>
     <ng-template #noStatus>
       -
diff --git a/src/jetstream/plugins/monocular/sync.go b/src/jetstream/plugins/monocular/sync.go
index c877d03ea1..8a3c2dabf8 100644
--- a/src/jetstream/plugins/monocular/sync.go
+++ b/src/jetstream/plugins/monocular/sync.go
@@ -62,6 +62,15 @@ func (m *Monocular) SyncRepo(c echo.Context) error {
 // Sync schedules a sync action for the given endpoint
 func (m *Monocular) Sync(action interfaces.EndpointAction, endpoint *interfaces.CNSIRecord) {
 
+	// If the sync job is busy, it won't update the status of this new job until it completes the previou sone
+	// Set the status to indicate it is pending
+	metadata := SyncMetadata{
+		Status: "Pending",
+		Busy:   true,
+	}
+	m.portalProxy.UpdateEndointMetadata(endpoint.GUID, marshalSyncMetadata(metadata))
+
+	// Add the job to the queue to be processed
 	job := SyncJob{
 		Action:   action,
 		Endpoint: endpoint,

From 98592b4fd4b11f00b2fdba1a8a4be23b6d9703e5 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 18 Mar 2020 14:26:30 +0000
Subject: [PATCH 469/648] Resolve merge issues

---
 .../app/custom/helm/create-release/create-release.component.ts | 2 +-
 .../custom/kubernetes/services/kubernetes-endpoint.service.ts  | 2 +-
 .../app/custom/kubernetes/services/kubernetes.service.ts       | 3 ++-
 .../kubernetes-summary-tab/kubernetes-summary.component.ts     | 3 ++-
 .../list-types/kube-namespaces-filter-config.service.ts        | 3 ++-
 .../workloads/release/tabs/helm-release-helper.service.ts      | 3 ++-
 .../components/list/list-types/app/cf-apps-data-source.ts      | 1 +
 7 files changed, 11 insertions(+), 6 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 accb46c1c9..87e87edc6b 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
@@ -101,7 +101,7 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     const allNamespaces$ = getPaginationObservables<KubernetesNamespace>({
       store: this.store,
       action,
-      paginationMonitor: this.pmf.create(action.paginationKey, action)
+      paginationMonitor: this.pmf.create(action.paginationKey, action, true)
     }).entities$.pipe(
       filter(namespaces => !!namespaces),
       first()
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
index 9652549e2e..612e762654 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
@@ -230,7 +230,7 @@ export class KubernetesEndpointService {
     return getPaginationObservables<T>({
       store: this.store,
       action: paginationAction,
-      paginationMonitor: this.paginationMonitorFactory.create(paginationAction.paginationKey, paginationAction)
+      paginationMonitor: this.paginationMonitorFactory.create(paginationAction.paginationKey, paginationAction, true)
     }, true).entities$.pipe(filter(p => !!p), first());
   }
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts
index f1297c152c..8695c7b9ba 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts
@@ -19,7 +19,8 @@ export class KubernetesService {
   ) {
     this.kubeEndpointsMonitor = this.paginationMonitorFactory.create(
       endpointListKey,
-      endpointEntitySchema
+      endpointEntitySchema,
+      true
     );
 
     this.kubeEndpoints$ = this.kubeEndpointsMonitor.currentPage$.pipe(
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 9309ec8669..a7c14df6ce 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
@@ -178,7 +178,8 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
   private getPaginationObservable(action: PaginatedAction) {
     const paginationMonitor = this.paginationMonitorFactory.create(
       action.paginationKey,
-      action
+      action,
+      true
     );
 
     this.ngZone.runOutsideAngular(() => {
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 211f0b7c65..c41019c89a 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
@@ -73,7 +73,8 @@ export class KubernetesNamespacesFilterService implements OnDestroy {
       action: this.paginationAction,
       paginationMonitor: this.paginationMonitorFactory.create(
         this.paginationAction.paginationKey,
-        kubernetesEntityFactory(this.paginationAction.entityType)
+        kubernetesEntityFactory(this.paginationAction.entityType),
+        true
       )
     }, true);
   }
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 b9652f2389..723a77bd33 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
@@ -91,7 +91,8 @@ export class HelmReleaseHelperService {
     const action = new GetHelmReleasePods(this.endpointGuid, this.releaseTitle);
     return this.paginationMonitorFactory.create(
       action.paginationKey,
-      action.entity[0]
+      action.entity[0],
+      true
     ).currentPage$.pipe(
       filter(pods => !!pods),
       map(this.mapPods)
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 b94cf1cfa5..d03f709224 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
@@ -31,6 +31,7 @@ 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';
+import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 
 // export function createGetAllAppAction(paginationKey): GetAllApplications {
 //   return new GetAllApplications(paginationKey, null, [

From daa513794b586e34b26e478896456bdec6b1e432 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 18 Mar 2020 16:20:46 +0000
Subject: [PATCH 470/648] Fix unit test

---
 .../kubernetes-pod-containers.component.ts                     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 d9aa85595d..ecc31b5654 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
@@ -3,7 +3,7 @@ import { Component, Input } from '@angular/core';
 import { Store } from '@ngrx/store';
 import * as moment from 'moment';
 import { of } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { filter, map } from 'rxjs/operators';
 
 import { AppState } from '../../../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
@@ -49,6 +49,7 @@ export class KubernetesPodContainersComponent extends CardCell<KubernetesPod> {
     this.containerDataSource = {
       isTableLoading$: of(false),
       connect: () => this.store.select<KubernetesPod>(selectEntity(this.entityConfig.entityKey, row.metadata.uid)).pipe(
+        filter(pod => !!pod),
         map(pod => this.map(pod)),
       ),
       disconnect: () => { },

From 06aaaee0d3824141af0ee99f690d37d35a387b9b Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 18 Mar 2020 16:21:15 +0000
Subject: [PATCH 471/648] Prevent click throughs

---
 .../app-table-cell-default.component.html             | 11 ++++++-----
 .../table-cell-side-panel.component.html              |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/app-table-cell-default/app-table-cell-default.component.html b/src/frontend/packages/core/src/shared/components/list/list-table/app-table-cell-default/app-table-cell-default.component.html
index 9bc259ff74..75eafe563f 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/app-table-cell-default/app-table-cell-default.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/app-table-cell-default/app-table-cell-default.component.html
@@ -4,7 +4,7 @@
 <span *ngIf="isLink" class="link">
   <ng-container *ngIf="showShortLink">
     <div *ngIf="linkValue" class="link__short">
-      <a class="link__short__icon" [href]="linkValue" [attr.target]="linkTarget">
+      <a class="link__short__icon" [href]="linkValue" [attr.target]="linkTarget" (click)="$event.stopPropagation()">
         <mat-icon>launch</mat-icon>
       </a>
       <a [href]="linkValue" [attr.target]="linkTarget">View</a>
@@ -14,11 +14,12 @@
     </ng-container>
   </ng-container>
   <ng-container *ngIf="!showShortLink">
-    <a [href]="linkValue" [attr.target]="linkTarget" *ngIf="isExternalLink">
-      <ng-container *ngTemplateOutlet="valueTemplate; context: valueContext"></ng-container>
+    <a [href]="linkValue" [attr.target]="linkTarget" *ngIf="isExternalLink" (click)="$event.stopPropagation()"></a>
+    <ng-container *ngTemplateOutlet="valueTemplate; context: valueContext"></ng-container>
     </a>
-    <a [routerLink]="linkValue" [attr.target]="linkTarget" *ngIf="!isExternalLink">
-      <ng-container *ngTemplateOutlet="valueTemplate; context: valueContext"></ng-container>
+    <a [routerLink]="linkValue" [attr.target]="linkTarget" *ngIf="!isExternalLink"
+      (click)="$event.stopPropagation()"></a>
+    <ng-container *ngTemplateOutlet="valueTemplate; context: valueContext"></ng-container>
     </a>
   </ng-container>
 </span>
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component.html b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component.html
index b74a54737b..c73dca11cc 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component.html
@@ -1,3 +1,3 @@
-<a (click)="showSidePanel()">
+<a (click)="showSidePanel(); $event.stopPropagation()">
   {{actualConfig?.text}}
 </a>
\ No newline at end of file

From 252fa09d82eb882f2a2e47111c2171e2d7bb2f7d Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 18 Mar 2020 18:05:23 +0000
Subject: [PATCH 472/648] Fix build

---
 .../app-table-cell-default.component.html                | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/app-table-cell-default/app-table-cell-default.component.html b/src/frontend/packages/core/src/shared/components/list/list-table/app-table-cell-default/app-table-cell-default.component.html
index 75eafe563f..c66ecb63b2 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/app-table-cell-default/app-table-cell-default.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/app-table-cell-default/app-table-cell-default.component.html
@@ -14,12 +14,11 @@
     </ng-container>
   </ng-container>
   <ng-container *ngIf="!showShortLink">
-    <a [href]="linkValue" [attr.target]="linkTarget" *ngIf="isExternalLink" (click)="$event.stopPropagation()"></a>
-    <ng-container *ngTemplateOutlet="valueTemplate; context: valueContext"></ng-container>
+    <a [href]="linkValue" [attr.target]="linkTarget" *ngIf="isExternalLink" (click)="$event.stopPropagation()">
+      <ng-container *ngTemplateOutlet="valueTemplate; context: valueContext"></ng-container>
     </a>
-    <a [routerLink]="linkValue" [attr.target]="linkTarget" *ngIf="!isExternalLink"
-      (click)="$event.stopPropagation()"></a>
-    <ng-container *ngTemplateOutlet="valueTemplate; context: valueContext"></ng-container>
+    <a [routerLink]="linkValue" [attr.target]="linkTarget" *ngIf="!isExternalLink" (click)="$event.stopPropagation()">
+      <ng-container *ngTemplateOutlet="valueTemplate; context: valueContext"></ng-container>
     </a>
   </ng-container>
 </span>

From f12a25ee7592b040498bbc4470b7e34366e8d781 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 19 Mar 2020 11:45:05 +0000
Subject: [PATCH 473/648] Beef up env var e2e test

---
 src/test-e2e/application/application-view-e2e.spec.ts | 8 +++++---
 src/test-e2e/po/component.po.ts                       | 5 +++++
 src/test-e2e/po/list.po.ts                            | 7 ++++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/test-e2e/application/application-view-e2e.spec.ts b/src/test-e2e/application/application-view-e2e.spec.ts
index a947956d90..92e241c8f2 100644
--- a/src/test-e2e/application/application-view-e2e.spec.ts
+++ b/src/test-e2e/application/application-view-e2e.spec.ts
@@ -243,14 +243,16 @@ describe('Application View -', () => {
         const envVarValue = 'new env var value';
         appVariables.addVariable(envVarName, envVarValue);
 
+        appVariables.list.table.waitUntilNotBusy();
+
         expect(appVariables.list.table.getRows().count()).toBe(1);
-        expect(appVariables.list.table.getCell(0, 1).getText()).toBe(envVarName);
-        expect(appVariables.list.table.getCell(0, 2).getText()).toBe(envVarValue);
+        appVariables.list.table.waitForCellText(0, 1, envVarName);
+        appVariables.list.table.waitForCellText(0, 2, envVarValue);
 
         // Edit Env Var
         const envVarValueEdited = `${envVarValue}-edited`;
         appVariables.editVariable(0, envVarValueEdited);
-        expect(appVariables.list.table.getCell(0, 2).getText()).toBe(envVarValueEdited);
+        appVariables.list.table.waitForCellText(0, 2, envVarValueEdited);
 
         // Delete Env Var
         appVariables.deleteVariable(0, envVarName);
diff --git a/src/test-e2e/po/component.po.ts b/src/test-e2e/po/component.po.ts
index 2f1c9ab62c..784bf1a797 100644
--- a/src/test-e2e/po/component.po.ts
+++ b/src/test-e2e/po/component.po.ts
@@ -44,6 +44,11 @@ export class Component {
     return browser.wait(until.invisibilityOf(this.locator), 20000, description);
   }
 
+  waitForText(text: string, elementDescription = 'Element', waitDuration = 5000) {
+    return browser.wait(until.textToBePresentInElement(this.getComponent(), text), waitDuration,
+      `${elementDescription} with text '${text}' taking too long to appear in the DOM`);
+  }
+
   scrollIntoView(): promise.Promise<void> {
     return Component.scrollIntoView(this.locator);
   }
diff --git a/src/test-e2e/po/list.po.ts b/src/test-e2e/po/list.po.ts
index b0ac4fedc1..7018dfeeab 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
@@ -33,6 +33,11 @@ export class ListTableComponent extends Component {
     return this.getRows().get(row).all(by.css('.app-table__cell')).get(column);
   }
 
+  waitForCellText(row: number, column: number, text: string) {
+    const component = new Component(this.getCell(row, column));
+    return component.waitForText(text);
+  }
+
   findRowByCellContent(content) {
     const cell = this.locator.all(by.css('.app-table__cell')).filter(elem =>
       elem.getText().then(text => text === content)

From 0d349ffae1921cc99ac0c56132edbfabe347729d Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 19 Mar 2020 16:30:39 +0000
Subject: [PATCH 474/648] Add debug for failing e2e test

---
 .../application/application-view-e2e.spec.ts  |  2 +-
 src/test-e2e/po/form.po.ts                    | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/test-e2e/application/application-view-e2e.spec.ts b/src/test-e2e/application/application-view-e2e.spec.ts
index 92e241c8f2..02d3d11598 100644
--- a/src/test-e2e/application/application-view-e2e.spec.ts
+++ b/src/test-e2e/application/application-view-e2e.spec.ts
@@ -14,7 +14,7 @@ import { ApplicationPageSummaryTab } from './po/application-page-summary.po';
 import { ApplicationPageVariablesTab } from './po/application-page-variables.po';
 import { CreateRoutesPage } from './po/routes-create-page.po';
 
-describe('Application View -', () => {
+fdescribe('Application View -', () => {
   let cfHelper: CFHelpers;
   let applicationE2eHelper: ApplicationE2eHelper;
   const appName = ApplicationE2eHelper.createApplicationName();
diff --git a/src/test-e2e/po/form.po.ts b/src/test-e2e/po/form.po.ts
index a2aa85be69..c7a556f7ac 100644
--- a/src/test-e2e/po/form.po.ts
+++ b/src/test-e2e/po/form.po.ts
@@ -154,8 +154,23 @@ export class FormComponent extends Component {
     const isInputOrTextAreaP = field.getTagName().then(tagName => tagName === 'input' || tagName === 'textarea');
     const isMatInputFieldP = field.getAttribute('class').then(css => css.indexOf('mat-input-element') >= 0);
 
-    return promise.all([isInputOrTextAreaP, isMatInputFieldP]).then(([isInputOrTextArea, isMatInputField]) =>
-      isInputOrTextArea && isMatInputField ? field.getAttribute('value') : field.getText());
+    return promise.all([isInputOrTextAreaP, isMatInputFieldP]).then(([isInputOrTextArea, isMatInputField]) => {
+
+      if (isInputOrTextArea && isMatInputField) {
+        return field.getAttribute('value').then(a => {
+          console.log(ctrlName + ' 1: ', a);
+          return a;
+        });
+      } else {
+        return field.getText().then(a => {
+          console.log(ctrlName + ' 2: ', a);
+          return a;
+        });
+      }
+      // console.log(ctrlName);
+      // return isInputOrTextArea && isMatInputField ? field.getAttribute('value') : field.getText();
+    }
+    );
   }
 
   // Focus the specified field by clicking it

From 8bc2a71bd41003346c8e0e9f54268c3beb2dd128 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 26 Mar 2020 11:27:34 +0000
Subject: [PATCH 475/648] Fix entering space char in env var list edit env var

---
 .../list-table/table-cell/table-cell.component.html    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.html b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.html
index 40640a9f1d..f597c225b9 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.html
@@ -1,5 +1,9 @@
-<div #target>
-  <div *ngIf="func && !component">
-    {{func(row)}}
+<!-- Ensure any key presses are retained within this element. This stops parent mat-expansion-panel from gobbling space
+  key (see edit env var) -->
+<div (keydown)="$event.stopPropagation()">
+  <div #target>
+    <div *ngIf="func && !component">
+      {{func(row)}}
+    </div>
   </div>
 </div>
\ No newline at end of file

From 65a320af11c5e759ff1d077ee26e3cdee1342769 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 26 Mar 2020 11:27:56 +0000
Subject: [PATCH 476/648] Revert e2e debugging

---
 .../application/application-view-e2e.spec.ts  |  2 +-
 src/test-e2e/helpers/cf-helpers.ts            |  6 ++++--
 src/test-e2e/po/form.po.ts                    | 19 ++-----------------
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/test-e2e/application/application-view-e2e.spec.ts b/src/test-e2e/application/application-view-e2e.spec.ts
index 02d3d11598..92e241c8f2 100644
--- a/src/test-e2e/application/application-view-e2e.spec.ts
+++ b/src/test-e2e/application/application-view-e2e.spec.ts
@@ -14,7 +14,7 @@ import { ApplicationPageSummaryTab } from './po/application-page-summary.po';
 import { ApplicationPageVariablesTab } from './po/application-page-variables.po';
 import { CreateRoutesPage } from './po/routes-create-page.po';
 
-fdescribe('Application View -', () => {
+describe('Application View -', () => {
   let cfHelper: CFHelpers;
   let applicationE2eHelper: ApplicationE2eHelper;
   const appName = ApplicationE2eHelper.createApplicationName();
diff --git a/src/test-e2e/helpers/cf-helpers.ts b/src/test-e2e/helpers/cf-helpers.ts
index 79846fb2f7..e343545abb 100644
--- a/src/test-e2e/helpers/cf-helpers.ts
+++ b/src/test-e2e/helpers/cf-helpers.ts
@@ -50,10 +50,12 @@ export class CFHelpers {
       return promise.fullyResolved({});
     }
     return this.fetchUsers(cnsiGuid).then(users => {
+      expect(users).toBeDefined(`No users fetched from endpoint with api ${endpoint.url}`);
+      expect(users.length).toBeGreaterThanOrEqual(2, `Less than two users detected`);
       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(`Unable to find the non admin user '${endpoint.creds.nonAdmin.username}'`);
+      expect(testAdminUser).toBeDefined(`Unable to find the admin user '${endpoint.creds.admin.username}'`);
       CFHelpers.cachedNonAdminGuid = testUser.metadata.guid;
       CFHelpers.cachedAdminGuid = testAdminUser.metadata.guid;
     });
diff --git a/src/test-e2e/po/form.po.ts b/src/test-e2e/po/form.po.ts
index c7a556f7ac..a2aa85be69 100644
--- a/src/test-e2e/po/form.po.ts
+++ b/src/test-e2e/po/form.po.ts
@@ -154,23 +154,8 @@ export class FormComponent extends Component {
     const isInputOrTextAreaP = field.getTagName().then(tagName => tagName === 'input' || tagName === 'textarea');
     const isMatInputFieldP = field.getAttribute('class').then(css => css.indexOf('mat-input-element') >= 0);
 
-    return promise.all([isInputOrTextAreaP, isMatInputFieldP]).then(([isInputOrTextArea, isMatInputField]) => {
-
-      if (isInputOrTextArea && isMatInputField) {
-        return field.getAttribute('value').then(a => {
-          console.log(ctrlName + ' 1: ', a);
-          return a;
-        });
-      } else {
-        return field.getText().then(a => {
-          console.log(ctrlName + ' 2: ', a);
-          return a;
-        });
-      }
-      // console.log(ctrlName);
-      // return isInputOrTextArea && isMatInputField ? field.getAttribute('value') : field.getText();
-    }
-    );
+    return promise.all([isInputOrTextAreaP, isMatInputFieldP]).then(([isInputOrTextArea, isMatInputField]) =>
+      isInputOrTextArea && isMatInputField ? field.getAttribute('value') : field.getText());
   }
 
   // Focus the specified field by clicking it

From 4e20683efcf2d10ff5c7004b8bbc97ed664630cc Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 31 Mar 2020 11:48:27 +0100
Subject: [PATCH 477/648] Fix chart deployment on EKS

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

diff --git a/deploy/kubernetes/console/templates/chartsync.yaml b/deploy/kubernetes/console/templates/chartsync.yaml
index cb93fd3026..2acedc0bca 100644
--- a/deploy/kubernetes/console/templates/chartsync.yaml
+++ b/deploy/kubernetes/console/templates/chartsync.yaml
@@ -1,5 +1,5 @@
 ---
-{{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major .Capabilities.KubeVersion.Minor)}}
+{{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major (trimSuffix "+" .Capabilities.KubeVersion.Minor) )}}
 apiVersion: apps/v1
 {{- else }}
 apiVersion: extensions/v1beta1

From 66fb7c874510a5e56b0c2cd731b608ba5bb60a92 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 31 Mar 2020 15:39:37 +0100
Subject: [PATCH 478/648] Add header expand/collapse

---
 .../table-cell-expander.component.html        |  3 +
 .../table-cell-expander.component.scss        |  5 ++
 .../table-cell-expander.component.spec.ts     | 25 +++++++
 .../table-cell-expander.component.ts          | 65 +++++++++++++++++++
 .../table-cell/table-cell.component.ts        |  2 +
 .../table-row/table-row-expaned-service.ts    | 42 ++++++++++++
 .../table-row/table-row.component.html        |  3 +-
 .../table-row/table-row.component.scss        |  4 +-
 .../table-row/table-row.component.ts          | 18 ++++-
 .../list/list-table/table.component.html      | 17 +++--
 .../list/list-table/table.component.scss      |  2 +-
 .../list/list-table/table.component.ts        | 21 +++++-
 .../components/list/list-table/table.types.ts | 11 ++++
 .../shared/components/list/list.component.ts  |  8 ++-
 .../packages/core/src/shared/shared.module.ts |  2 +-
 15 files changed, 212 insertions(+), 16 deletions(-)
 create mode 100644 src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.html
 create mode 100644 src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.scss
 create mode 100644 src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.spec.ts
 create mode 100644 src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.ts
 create mode 100644 src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row-expaned-service.ts

diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.html b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.html
new file mode 100644
index 0000000000..ba6bb90345
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.html
@@ -0,0 +1,3 @@
+<div class="expander" (click)="toggle()" [@indicatorRotate]="expandedService.expanded[rowId] ? 'expanded': 'collapsed'">
+  <span class="mat-expansion-indicator"></span>
+</div>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.scss b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.scss
new file mode 100644
index 0000000000..e1803cf340
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.scss
@@ -0,0 +1,5 @@
+.expander {
+  cursor: pointer;
+  height: 18px;
+  width: 8px;
+}
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.spec.ts
new file mode 100644
index 0000000000..1fcefa03c7
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TableCellExpanderComponent } from './table-cell-expander.component';
+
+describe('TableCellExpanderComponent', () => {
+  let component: TableCellExpanderComponent;
+  let fixture: ComponentFixture<TableCellExpanderComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ TableCellExpanderComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(TableCellExpanderComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.ts
new file mode 100644
index 0000000000..97e8f30db4
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.ts
@@ -0,0 +1,65 @@
+import { animate, state, style, transition, trigger } from '@angular/animations';
+import { Component, Input, OnInit } from '@angular/core';
+
+import { TableCellCustom } from '../../list.types';
+import { TableRowExpandedService } from '../table-row/table-row-expaned-service';
+import { CellConfigFunction } from '../table.types';
+
+export interface TableCellExpanderConfig {
+  rowId: string;
+}
+
+@Component({
+  selector: 'app-table-cell-expander',
+  templateUrl: './table-cell-expander.component.html',
+  styleUrls: ['./table-cell-expander.component.scss'],
+  animations: [
+    trigger('indicatorRotate', [
+      state('collapsed, void', style({ transform: 'rotate(0deg)' })),
+      state('expanded', style({ transform: 'rotate(180deg)' })),
+      transition('expanded <=> collapsed, void => collapsed',
+        animate('225ms cubic-bezier(0.4,0.0,0.2,1)')
+      ),
+    ]),
+  ]
+})
+export class TableCellExpanderComponent<T = any> extends TableCellCustom<T> implements OnInit {
+
+  expanded = false;
+  constructor(public expandedService: TableRowExpandedService) {
+    super();
+  }
+
+  private pConfig: CellConfigFunction<T>;
+  @Input() set config(config: CellConfigFunction<T>) {
+    this.pConfig = config;
+    this.updateRowId();
+  }
+
+  private pRow: T;
+  @Input() set row(row: T) {
+    this.pRow = row;
+    this.updateRowId();
+
+  }
+  public rowId = TableRowExpandedService.allExpanderState;
+  private updateRowId() {
+    if (this.pConfig) {
+      const config: TableCellExpanderConfig = this.pConfig(this.pRow);
+      this.rowId = config.rowId;
+      this.expanded = this.expandedService.expanded[this.rowId];
+    }
+  }
+
+  ngOnInit() {
+    this.expanded = this.expandedService.expanded[this.rowId];
+  }
+
+  toggle() {
+    if (this.rowId === TableRowExpandedService.allExpanderState) {
+      this.expandedService.toggleHeader();
+    } else {
+      // Toggle of non-header row is handled natively by header
+    }
+  }
+}
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 7a0a025c4d..62ef19ec1a 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
@@ -29,6 +29,7 @@ import { TableCellDefaultComponent } from '../app-table-cell-default/app-table-c
 import { TableCellActionsComponent } from '../table-cell-actions/table-cell-actions.component';
 import { TableCellBooleanIndicatorComponent } from '../table-cell-boolean-indicator/table-cell-boolean-indicator.component';
 import { TableCellEditComponent } from '../table-cell-edit/table-cell-edit.component';
+import { TableCellExpanderComponent } from '../table-cell-expander/table-cell-expander.component';
 import { TableCellFavoriteComponent } from '../table-cell-favorite/table-cell-favorite.component';
 import { TableCellIconComponent } from '../table-cell-icon/table-cell-icon.component';
 import { TableCellRadioComponent } from '../table-cell-radio/table-cell-radio.component';
@@ -57,6 +58,7 @@ export const listTableCells: Type<TableCellCustom<any>>[] = [
   TableCellEndpointDetailsComponent,
   TableCellSidePanelComponent,
   TableCellIconComponent,
+  TableCellExpanderComponent,
   ...coreEndpointListDetailsComponents
 ];
 
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row-expaned-service.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row-expaned-service.ts
new file mode 100644
index 0000000000..aab0cecc48
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row-expaned-service.ts
@@ -0,0 +1,42 @@
+import { Injectable } from '@angular/core';
+
+@Injectable()
+export class TableRowExpandedService {
+
+  static allExpanderState = 'all-state';
+
+  public expanded: {
+    [rowId: string]: boolean
+  } = {};
+
+  public expandAll() {
+    Object.keys(this.expanded).forEach(id => this.expanded[id] = true);
+  }
+
+  public collapseAll() {
+    Object.keys(this.expanded).forEach(id => this.expanded[id] = false);
+  }
+
+  public expand(id: string) {
+    this.expanded[id] = true;
+  }
+
+  public collapse(id: string) {
+    this.expanded[id] = false;
+  }
+
+  public toggleHeader(): boolean {
+    const expanded = this.toggle(TableRowExpandedService.allExpanderState);
+    if (expanded) {
+      this.expandAll();
+    } else {
+      this.collapseAll();
+    }
+    return expanded;
+  }
+
+  public toggle(id: string): boolean {
+    this.expanded[id] = !this.expanded[id];
+    return this.expanded[id];
+  }
+}
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 5c67039e94..9b6ee97956 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
@@ -9,7 +9,8 @@
   <div role="row" class="table-row">
     <div class="mat-row table-row__inner">
       <mat-expansion-panel class="table-row__inner__expansion" [togglePosition]="'before'" [disabled]="!expandComponent"
-        (opened)="createExpandedComponent()">
+        (opened)="panelOpened()" (closed)="expandedService.collapse(rowId)" [expanded]="expandedService.expanded[rowId]"
+        [hideToggle]="true">
         <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 91cc75bfa1..a81d9ccc52 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
@@ -101,7 +101,7 @@
         padding-right: 0;
 
         &.has-expanded-row {
-          padding-left: 27px;
+          // padding-left: 27px; // TODO: RC
         }
 
         &.in-expanded-row {
@@ -109,7 +109,7 @@
         }
 
         .mat-expansion-indicator {
-          margin: 0 4px 0 0;
+          // margin: 0 4px 0 0; // TODO: RC
         }
 
       }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.ts
index 2919a7bea3..090b73302f 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.ts
@@ -16,6 +16,7 @@ import { map } from 'rxjs/operators';
 import { RowState } from '../../data-sources-controllers/list-data-source-types';
 import { ListExpandedComponentType } from '../../list.component.types';
 import { CardCell } from '../../list.types';
+import { TableRowExpandedService } from './table-row-expaned-service';
 
 
 @Component({
@@ -36,6 +37,7 @@ export class TableRowComponent<T = any> extends CdkRow implements OnInit {
   @Input() row: T;
   @Input() minRowHeight: string;
   @Input() inExpandedRow: boolean;
+  @Input() rowId: string;
 
   public inErrorState$: Observable<boolean>;
   public inWarningState$: Observable<boolean>;
@@ -47,7 +49,10 @@ export class TableRowComponent<T = any> extends CdkRow implements OnInit {
 
   private expandedComponentRef: ComponentRef<any>;
 
-  constructor(private componentFactoryResolver: ComponentFactoryResolver) {
+  constructor(
+    private componentFactoryResolver: ComponentFactoryResolver,
+    public expandedService: TableRowExpandedService
+  ) {
     super();
   }
 
@@ -75,9 +80,15 @@ export class TableRowComponent<T = any> extends CdkRow implements OnInit {
     if (this.expandComponent) {
       this.defaultMinRowHeight = '64px';
     }
+
+    // Ensure we 'register' with the expander service. This also helps with page changes
+    this.expandedService.collapse(this.rowId);
   }
 
   private getComponent() {
+    if (!this.expandComponent) {
+      return;
+    }
     return this.componentFactoryResolver.resolveComponentFactory(
       this.expandComponent
     );
@@ -88,6 +99,11 @@ export class TableRowComponent<T = any> extends CdkRow implements OnInit {
     return !!component ? this.expandedComponent.createComponent(component) : null;
   }
 
+  public panelOpened() {
+    this.createExpandedComponent();
+    this.expandedService.expand(this.rowId);
+  }
+
   public createExpandedComponent() {
     if (this.expandedComponentRef) {
       return;
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table.component.html b/src/frontend/packages/core/src/shared/components/list/list-table/table.component.html
index d36afc7016..f5861a1fd6 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table.component.html
@@ -9,21 +9,23 @@
         [trackBy]="dataSource.trackBy" matSort>
         <ng-container *ngFor="let column of columns" [matColumnDef]="column.columnId">
           <div *ngIf="column.sort">
-            <mat-header-cell class="app-table__header-cell" *matHeaderCellDef [ngClass]="column.class" mat-sort-header
-              [disableClear]="true" [style.flex]="column.cellFlex">
+            <mat-header-cell class="app-table__header-cell" *matHeaderCellDef
+              [ngClass]="[column.class || '', column.headerClass || '']" mat-sort-header [disableClear]="true"
+              [style.flex]="column.cellFlex">
               <app-table-cell [component]="column.headerCellComponent" [func]="column.headerCell"
                 [dataSource]="dataSource"></app-table-cell>
             </mat-header-cell>
           </div>
           <div *ngIf="!column.sort">
-            <mat-header-cell class="app-table__header-cell" *matHeaderCellDef [ngClass]="column.class"
-              [style.flex]="column.cellFlex">
+            <mat-header-cell class="app-table__header-cell" *matHeaderCellDef
+              [ngClass]="[column.class || '', column.headerClass || '']" [style.flex]="column.cellFlex">
               <app-table-cell [component]="column.headerCellComponent" [func]="column.headerCell"
                 [dataSource]="dataSource"></app-table-cell>
             </mat-header-cell>
           </div>
-          <mat-cell class="app-table__cell" *matCellDef="let row" [ngClass]="column.class"
-            [style.flex]="column.cellFlex" [style.align-self]="column.cellAlignSelf || rowAlignSelf">
+          <mat-cell class="app-table__cell" *matCellDef="let row"
+            [ngClass]="[column.class || '', column.cellClass || '']" [style.flex]="column.cellFlex"
+            [style.align-self]="column.cellAlignSelf || rowAlignSelf">
             <app-table-cell [cellDefinition]="column.cellDefinition" [component]="column.cellComponent"
               [config]="column.cellConfig" [func]="column.cell" [row]="row" [dataSource]="dataSource"></app-table-cell>
           </mat-cell>
@@ -32,7 +34,8 @@
           [ngClass]="{'app-table__inner--has-expanded-columns': !!expandComponent}">
         </mat-header-row>
         <app-table-row class="app-table__row" *matRowDef="let row; columns: columnNames;" [rowState]="getRowState(row)"
-          [row]="row" [expandComponent]="expandComponent" [inExpandedRow]="inExpandedRow" [minRowHeight]="minRowHeight">
+          [row]="row" [expandComponent]="expandComponent" [inExpandedRow]="inExpandedRow" [minRowHeight]="minRowHeight"
+          [rowId]="dataSource.trackBy(null, row)">
         </app-table-row>
       </mat-table>
     </mat-card-content>
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 fc5fa1bd30..68629f0292 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
@@ -34,7 +34,7 @@ mat-header-cell {
 
     &--has-expanded-columns {
       & > mat-header-cell:first-of-type {
-        padding-left: 63px;
+        // padding-left: 63px; // TODO: RC 
       }
     }
   }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table.component.ts
index 534e7161ae..b83f1a2693 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table.component.ts
@@ -8,6 +8,7 @@ import { IListPaginationController } from '../data-sources-controllers/list-pagi
 import { ListExpandedComponentType } from '../list.component.types';
 import { ListSort } from './../../../../../../store/src/actions/list.actions';
 import { TableCellActionsComponent } from './table-cell-actions/table-cell-actions.component';
+import { TableCellExpanderComponent, TableCellExpanderConfig } from './table-cell-expander/table-cell-expander.component';
 import { TableCellSelectComponent } from './table-cell-select/table-cell-select.component';
 import { TableHeaderSelectComponent } from './table-header-select/table-header-select.component';
 import { ITableColumn } from './table.types';
@@ -21,6 +22,13 @@ const tableColumnSelect: ITableColumn<any> = {
   cellFlex: '0 0 60px'
 };
 
+const tableColumnExpander: ITableColumn<any> = {
+  columnId: 'expander',
+  headerCellComponent: TableCellExpanderComponent,
+  cellComponent: TableCellExpanderComponent,
+  cellFlex: '0 0 47px',
+};
+
 const tableColumnAction: ITableColumn<any> = {
   columnId: 'actions',
   headerCell: () => '',
@@ -54,11 +62,22 @@ export class TableComponent<T> implements OnInit, OnDestroy {
   @Input() minRowHeight: string;
 
   ngOnInit() {
-    if (this.addSelect || this.addActions) {
+    if (this.addSelect || this.expandComponent || this.addActions) {
       const newColumns = [...this.columns];
       if (this.addSelect) {
         newColumns.splice(0, 0, tableColumnSelect);
       }
+      if (this.expandComponent) {
+        newColumns.splice(0, 0, {
+          ...tableColumnExpander,
+          cellConfig: (row: T) => {
+            const res: TableCellExpanderConfig = {
+              rowId: this.dataSource.trackBy(null, row)
+            };
+            return res;
+          }
+        });
+      }
       if (this.addActions) {
         newColumns.push(tableColumnAction);
       }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table.types.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table.types.ts
index b640895511..938e2b0291 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table.types.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table.types.ts
@@ -39,7 +39,18 @@ export interface ITableColumn<T> {
   cellConfig?: object | CellConfigFunction<T>;   // Config for a custom cell component
   headerCell?: () => string; // Either headerCell OR headerCellComponent should be defined
   headerCellComponent?: any;
+  /**
+   * Has to be a known class in table.component.scss
+   */
   class?: string;
+  /**
+   * Has to be a known class in table.component.scss
+   */
+  headerClass?: string;
+  /**
+   * Has to be a known class in table.component.scss
+   */
+  cellClass?: string;
   sort?: boolean | DataFunctionDefinition | DataFunction<T>;
   cellFlex?: string;
   cellAlignSelf?: string;
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 8e25876d4c..7f2e329430 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,10 +51,10 @@ import {
 } from '../../../../../store/src/actions/list.actions';
 import { SetClientFilterKey, SetPage } from '../../../../../store/src/actions/pagination.actions';
 import { GeneralAppState } from '../../../../../store/src/app-state';
-import { ActionState } from '../../../../../store/src/reducers/api-request-reducer/types';
-import { getListStateObservables } from '../../../../../store/src/reducers/list.reducer';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
 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';
 import { safeUnsubscribe } from '../../../core/utils.service';
 import {
   EntitySelectConfig,
@@ -63,6 +63,7 @@ import {
   RowState,
 } from './data-sources-controllers/list-data-source-types';
 import { IListPaginationController, ListPaginationController } from './data-sources-controllers/list-pagination-controller';
+import { TableRowExpandedService } from './list-table/table-row/table-row-expaned-service';
 import { ITableColumn } from './list-table/table.types';
 import {
   defaultPaginationPageSizeOptionsCards,
@@ -96,6 +97,9 @@ import {
         animate('350ms ease-out', style({ opacity: '1', transform: 'translateX(0)' })),
       ])
     ])
+  ],
+  providers: [
+    TableRowExpandedService
   ]
 })
 export class ListComponent<T> implements OnInit, OnChanges, OnDestroy, AfterViewInit {
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index aafee78f11..c403e9795c 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -235,7 +235,7 @@ import { UserPermissionDirective } from './user-permission.directive';
     TileSelectorTileComponent,
     SidepanelPreviewComponent,
     TableCellSidePanelComponent,
-    CardProgressOverlayComponent,
+    CardProgressOverlayComponent
   ],
   exports: [
     ApplicationStateIconPipe,

From bd95d65b56e0a0b7a72945213c92b4c1b3b37acd Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 31 Mar 2020 16:27:26 +0100
Subject: [PATCH 479/648] Improve table in expander - positioning - borders

---
 ...netes-node-condition-card.component.spec.ts |  1 -
 .../kubernetes-pod-containers.component.html   |  6 ++++--
 .../kubernetes-pod-containers.component.scss   |  7 +++++++
 .../table-row/table-row.component.html         |  3 ++-
 .../table-row/table-row.component.scss         | 13 ++++---------
 .../table-row/table-row.component.theme.scss   |  3 +++
 .../table-row/table-row.component.ts           |  3 +++
 .../list/list-table/table.component.html       |  8 +++++---
 .../list/list-table/table.component.scss       | 18 ++++++++++++------
 9 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts
index 5d22a63f1b..d8dfafea22 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts
@@ -7,7 +7,6 @@ import { KubernetesNodeService } from '../../../../services/kubernetes-node.serv
 import { KubernetesNodeConditionCardComponent } from './kubernetes-node-condition-card.component';
 import { KubernetesNodeConditionComponent } from './kubernetes-node-condition/kubernetes-node-condition.component';
 
-// TODO: RC xdescribed
 describe('KubernetesNodeConditionCardComponent', () => {
   let component: KubernetesNodeConditionCardComponent;
   let fixture: ComponentFixture<KubernetesNodeConditionCardComponent>;
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html
index 5fc22b8407..3eab146d85 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html
@@ -1,2 +1,4 @@
-<app-table [dataSource]="containerDataSource" [columns]="columns" [inExpandedRow]="true">
-</app-table>
\ No newline at end of file
+<div class="pod-containers">
+  <app-table [dataSource]="containerDataSource" [columns]="columns" [inExpandedRow]="true">
+  </app-table>
+</div>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss
index e69de29bb2..2f8c9cf0d0 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss
@@ -0,0 +1,7 @@
+.pod-containers {
+  display: flex;
+  app-table {
+    flex: 1;
+    padding-left: 57px;
+  }
+}
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 9b6ee97956..a9cd96a7f3 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
@@ -6,7 +6,8 @@
       <mat-progress-bar class="table-row__deletion-bar" mode="indeterminate"></mat-progress-bar>
     </div>
   </div>
-  <div role="row" class="table-row">
+  <div role="row" class="table-row"
+    [ngClass]="{'in-expanded-row': !!inExpandedRow, 'has-expanded-row': expandComponent}">
     <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]"
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 a81d9ccc52..d2556480a5 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
@@ -100,19 +100,14 @@
         padding-left: 0;
         padding-right: 0;
 
-        &.has-expanded-row {
-          // padding-left: 27px; // TODO: RC
-        }
-
         &.in-expanded-row {
           padding: 0;
         }
-
-        .mat-expansion-indicator {
-          // margin: 0 4px 0 0; // TODO: RC
-        }
-
       }
     }
   }
+  &.in-expanded-row {
+    border-bottom-width: 0;
+    border-left-width: 1px;
+  }
 }
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 0a6b1cec9b..ced96a6e62 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
@@ -8,6 +8,9 @@
   $foreground: map-get($theme, foreground);
   .table-row {
     border-bottom-color: mat-color($foreground, divider);
+    &.in-expanded-row {
+      border-left-color: mat-color($foreground, divider);
+    }
   }
   .table-row-wrapper {
     &__errored {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.ts
index 090b73302f..7860c89b22 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.ts
@@ -109,6 +109,9 @@ export class TableRowComponent<T = any> extends CdkRow implements OnInit {
       return;
     }
     this.expandedComponentRef = this.createComponent();
+    if (!this.expandedComponentRef) {
+      return;
+    }
     const instance: CardCell<any> = this.expandedComponentRef.instance;
     instance.row = this.row; // This could be set again when `row` changes above
   }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table.component.html b/src/frontend/packages/core/src/shared/components/list/list-table/table.component.html
index f5861a1fd6..4bd2ce8004 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table.component.html
@@ -3,7 +3,8 @@
     <mat-progress-bar color="primary" *ngIf="dataSource.isTableLoading$ | async" mode="indeterminate">
     </mat-progress-bar>
   </div>
-  <mat-card class="app-table__card">
+  <mat-card class="app-table__card"
+    [ngClass]="{'in-expanded-row': !!inExpandedRow, 'has-expanded-row': expandComponent}">
     <mat-card-content class="app-table__content">
       <mat-table class="app-table__inner" #table [hidden]="hideTable" [dataSource]="dataSource"
         [trackBy]="dataSource.trackBy" matSort>
@@ -30,8 +31,9 @@
               [config]="column.cellConfig" [func]="column.cell" [row]="row" [dataSource]="dataSource"></app-table-cell>
           </mat-cell>
         </ng-container>
-        <mat-header-row [hidden]="hideTable" class="app-table__header-row" *matHeaderRowDef="columnNames"
-          [ngClass]="{'app-table__inner--has-expanded-columns': !!expandComponent}">
+        <mat-header-row [hidden]="hideTable" class="app-table__header-row"
+          [ngClass]="{'in-expanded-row': !!inExpandedRow, 'has-expanded-row': expandComponent}"
+          *matHeaderRowDef="columnNames" [ngClass]="{'app-table__inner--has-expanded-columns': !!expandComponent}">
         </mat-header-row>
         <app-table-row class="app-table__row" *matRowDef="let row; columns: columnNames;" [rowState]="getRowState(row)"
           [row]="row" [expandComponent]="expandComponent" [inExpandedRow]="inExpandedRow" [minRowHeight]="minRowHeight"
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 68629f0292..a6c0e9a071 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
@@ -25,18 +25,15 @@ mat-header-cell {
 
   &__card {
     padding: 0;
+    &.in-expanded-row {
+      box-shadow: none;
+    }
   }
 
   &__inner {
     &[hidden] * {
       display: none;
     }
-
-    &--has-expanded-columns {
-      & > mat-header-cell:first-of-type {
-        // padding-left: 63px; // TODO: RC 
-      }
-    }
   }
 
   &__row,
@@ -50,6 +47,15 @@ mat-header-cell {
     }
   }
 
+  &__header-row {
+    &.in-expanded-row {
+      border-left-color: rgba(0, 0, 0, .12);
+      border-left-width: 1px;
+      border-top-color: rgba(0, 0, 0, .12);
+      border-top-width: 1px;
+    }
+  }
+
   mat-row {
     &:first-child {
       padding-left: 24px;

From 9c4854bb76e1a332a65a832470bca1dabef499af Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 31 Mar 2020 17:45:20 +0100
Subject: [PATCH 480/648] Fix unit tests

---
 .../table-cell-expander.component.spec.ts            | 12 ++++++++++--
 .../list-table/table-row/table-row.component.spec.ts |  4 ++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.spec.ts
index 1fcefa03c7..14533fcdd2 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.spec.ts
@@ -1,5 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
+import { TableRowExpandedService } from '../table-row/table-row-expaned-service';
 import { TableCellExpanderComponent } from './table-cell-expander.component';
 
 describe('TableCellExpanderComponent', () => {
@@ -8,9 +10,15 @@ describe('TableCellExpanderComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ TableCellExpanderComponent ]
+      declarations: [TableCellExpanderComponent],
+      imports: [
+        NoopAnimationsModule
+      ],
+      providers: [
+        TableRowExpandedService
+      ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.spec.ts
index 5d03eed20a..7461e77015 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.spec.ts
@@ -5,6 +5,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { of as observableOf } from 'rxjs';
 
 import { CoreModule } from '../../../../../core/core.module';
+import { TableRowExpandedService } from './table-row-expaned-service';
 import { TableRowComponent } from './table-row.component';
 
 
@@ -46,6 +47,9 @@ describe('TableRowComponent', () => {
         CoreModule,
         CdkTableModule,
         NoopAnimationsModule,
+      ],
+      providers: [
+        TableRowExpandedService
       ]
     })
       .compileComponents();

From a68365404b6d526b52ed811767f818804f91396e Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 1 Apr 2020 09:58:37 +0100
Subject: [PATCH 481/648] Fix app-table's used outside of app-list's

---
 .../shared/components/list/list-table/table.component.ts    | 6 +++++-
 .../core/src/shared/components/list/list.component.ts       | 4 ----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table.component.ts
index b83f1a2693..c3599547e2 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table.component.ts
@@ -11,6 +11,7 @@ import { TableCellActionsComponent } from './table-cell-actions/table-cell-actio
 import { TableCellExpanderComponent, TableCellExpanderConfig } from './table-cell-expander/table-cell-expander.component';
 import { TableCellSelectComponent } from './table-cell-select/table-cell-select.component';
 import { TableHeaderSelectComponent } from './table-header-select/table-header-select.component';
+import { TableRowExpandedService } from './table-row/table-row-expaned-service';
 import { ITableColumn } from './table.types';
 
 
@@ -40,7 +41,10 @@ const tableColumnAction: ITableColumn<any> = {
 @Component({
   selector: 'app-table',
   templateUrl: './table.component.html',
-  styleUrls: ['./table.component.scss']
+  styleUrls: ['./table.component.scss'],
+  providers: [
+    TableRowExpandedService
+  ]
 })
 export class TableComponent<T> implements OnInit, OnDestroy {
 
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 7f2e329430..ee00ac9187 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
@@ -63,7 +63,6 @@ import {
   RowState,
 } from './data-sources-controllers/list-data-source-types';
 import { IListPaginationController, ListPaginationController } from './data-sources-controllers/list-pagination-controller';
-import { TableRowExpandedService } from './list-table/table-row/table-row-expaned-service';
 import { ITableColumn } from './list-table/table.types';
 import {
   defaultPaginationPageSizeOptionsCards,
@@ -97,9 +96,6 @@ import {
         animate('350ms ease-out', style({ opacity: '1', transform: 'translateX(0)' })),
       ])
     ])
-  ],
-  providers: [
-    TableRowExpandedService
   ]
 })
 export class ListComponent<T> implements OnInit, OnChanges, OnDestroy, AfterViewInit {

From aab8f0472d6f29b05ad90516cb9d8220701d6730 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 1 Apr 2020 16:17:44 +0100
Subject: [PATCH 482/648] Tweaks following review

---
 .../kubernetes-pod-containers.component.scss                     | 1 +
 .../list/list-table/table-row/table-row.component.scss           | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss
index 2f8c9cf0d0..e6fc2cb39b 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss
@@ -2,6 +2,7 @@
   display: flex;
   app-table {
     flex: 1;
+    padding-bottom: 10px;
     padding-left: 57px;
   }
 }
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 d2556480a5..e9e23bd47a 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
@@ -107,7 +107,6 @@
     }
   }
   &.in-expanded-row {
-    border-bottom-width: 0;
     border-left-width: 1px;
   }
 }

From 98e808d2e7b548465f4a6b6eaac2fe6e6917deb6 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 2 Apr 2020 16:25:20 +0100
Subject: [PATCH 483/648] Fix manage users action monitor table

---
 .../app-action-monitor/app-action-monitor.component.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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 06dc50a4fe..12f5a15fe0 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
@@ -77,7 +77,15 @@ export class AppActionMonitorComponent<T> implements OnInit {
     this.dataSource = {
       connect: () => this.data$,
       disconnect: () => { },
-      trackBy: this.getId ? (index, item) => this.getId(item) : this.trackBy,
+      trackBy: (index, item) => {
+        const fn = monitorColumn.cellConfig(item).getId;
+        if (fn) {
+          return fn(item);
+        } else if (this.getId) {
+          return this.getId(item);
+        }
+        return this.trackBy(index, item);
+      },
       isTableLoading$: observableOf(false)
     } as ITableListDataSource<T>;
   }

From b72ea2e677ca22d58a78e4d6b0f75a506e01e623 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 2 Apr 2020 16:26:31 +0100
Subject: [PATCH 484/648] Fix typo

---
 .../manage-users-confirm/manage-users-confirm.component.ts    | 4 ++--
 .../table-cell-expander/table-cell-expander.component.spec.ts | 2 +-
 .../table-cell-expander/table-cell-expander.component.ts      | 2 +-
 ...e-row-expaned-service.ts => table-row-expanded-service.ts} | 0
 .../list/list-table/table-row/table-row.component.spec.ts     | 2 +-
 .../list/list-table/table-row/table-row.component.ts          | 2 +-
 .../src/shared/components/list/list-table/table.component.ts  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
 rename src/frontend/packages/core/src/shared/components/list/list-table/table-row/{table-row-expaned-service.ts => table-row-expanded-service.ts} (100%)

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 3d5689592d..460e10539e 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
@@ -4,7 +4,6 @@ import { Store } from '@ngrx/store';
 import { Observable, Subject } from 'rxjs';
 import { distinctUntilChanged, filter, first, map, mergeMap, withLatestFrom } from 'rxjs/operators';
 
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import {
   AppMonitorComponentTypes,
 } from '../../../../../../../core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component';
@@ -12,17 +11,18 @@ 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 {
   selectUsersRoles,
   selectUsersRolesChangedRoles,
 } from '../../../../../../../store/src/selectors/users-roles.selector';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { UsersRolesClearUpdateState } from '../../../../../actions/users-roles.actions';
 import { ChangeUserRole } from '../../../../../actions/users.actions';
 import { CFAppState } from '../../../../../cf-app-state';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { cfUserEntityType, organizationEntityType, spaceEntityType } from '../../../../../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import {
   TableCellConfirmOrgSpaceComponent,
 } from '../../../../../shared/components/list/list-types/cf-confirm-roles/table-cell-confirm-org-space/table-cell-confirm-org-space.component';
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.spec.ts
index 14533fcdd2..208ef4b21d 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
-import { TableRowExpandedService } from '../table-row/table-row-expaned-service';
+import { TableRowExpandedService } from '../table-row/table-row-expanded-service';
 import { TableCellExpanderComponent } from './table-cell-expander.component';
 
 describe('TableCellExpanderComponent', () => {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.ts
index 97e8f30db4..c0978a7d4f 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.ts
@@ -2,7 +2,7 @@ import { animate, state, style, transition, trigger } from '@angular/animations'
 import { Component, Input, OnInit } from '@angular/core';
 
 import { TableCellCustom } from '../../list.types';
-import { TableRowExpandedService } from '../table-row/table-row-expaned-service';
+import { TableRowExpandedService } from '../table-row/table-row-expanded-service';
 import { CellConfigFunction } from '../table.types';
 
 export interface TableCellExpanderConfig {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row-expaned-service.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row-expanded-service.ts
similarity index 100%
rename from src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row-expaned-service.ts
rename to src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row-expanded-service.ts
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.spec.ts
index 7461e77015..f36f1698d9 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.spec.ts
@@ -5,7 +5,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { of as observableOf } from 'rxjs';
 
 import { CoreModule } from '../../../../../core/core.module';
-import { TableRowExpandedService } from './table-row-expaned-service';
+import { TableRowExpandedService } from './table-row-expanded-service';
 import { TableRowComponent } from './table-row.component';
 
 
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.ts
index 7860c89b22..25d1759c22 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.ts
@@ -16,7 +16,7 @@ import { map } from 'rxjs/operators';
 import { RowState } from '../../data-sources-controllers/list-data-source-types';
 import { ListExpandedComponentType } from '../../list.component.types';
 import { CardCell } from '../../list.types';
-import { TableRowExpandedService } from './table-row-expaned-service';
+import { TableRowExpandedService } from './table-row-expanded-service';
 
 
 @Component({
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table.component.ts
index c3599547e2..10f0637f6a 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table.component.ts
@@ -11,7 +11,7 @@ import { TableCellActionsComponent } from './table-cell-actions/table-cell-actio
 import { TableCellExpanderComponent, TableCellExpanderConfig } from './table-cell-expander/table-cell-expander.component';
 import { TableCellSelectComponent } from './table-cell-select/table-cell-select.component';
 import { TableHeaderSelectComponent } from './table-header-select/table-header-select.component';
-import { TableRowExpandedService } from './table-row/table-row-expaned-service';
+import { TableRowExpandedService } from './table-row/table-row-expanded-service';
 import { ITableColumn } from './table.types';
 
 

From 756d990536bdacd0423cfb31cb84d54f7509da50 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 3 Apr 2020 14:45:44 +0100
Subject: [PATCH 485/648] Fix expander position

---
 .../table-cell-expander.component.html                   | 4 +++-
 .../table-cell-expander.component.scss                   | 9 +++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.html b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.html
index ba6bb90345..b5a501ec2f 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.html
@@ -1,3 +1,5 @@
 <div class="expander" (click)="toggle()" [@indicatorRotate]="expandedService.expanded[rowId] ? 'expanded': 'collapsed'">
-  <span class="mat-expansion-indicator"></span>
+  <div class="expander__icon-container">
+    <span class="mat-expansion-indicator"></span>
+  </div>
 </div>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.scss b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.scss
index e1803cf340..0a98ff6121 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.scss
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-expander/table-cell-expander.component.scss
@@ -1,5 +1,10 @@
 .expander {
   cursor: pointer;
-  height: 18px;
-  width: 8px;
+  display: flex;
+  justify-content: center;
+
+  &__icon-container {
+    height: 18px;
+    width: 8px;
+  }
 }

From 9fe227f204e712c11acd05eabc9fc8d5c36b436c Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 3 Apr 2020 14:45:55 +0100
Subject: [PATCH 486/648] Remove duped line

---
 src/jetstream/passthrough.go | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/jetstream/passthrough.go b/src/jetstream/passthrough.go
index f59435b028..4a6cfeeba0 100644
--- a/src/jetstream/passthrough.go
+++ b/src/jetstream/passthrough.go
@@ -473,11 +473,6 @@ func (p *portalProxy) doRequest(cnsiRequest *interfaces.CNSIRequest, done chan<-
 		req.Header.Set(longRunningTimeoutHeader, "true")
 	}
 
-	// If this is a long running request, add a header which we can use at request time to change the timeout
-	if cnsiRequest.LongRunning {
-		req.Header.Set(longRunningTimeoutHeader, "true")
-	}
-
 	// Find the auth provider for the auth type - default ot oauthflow
 	authHandler := p.GetAuthProvider(tokenRec.AuthType)
 	if authHandler.Handler != nil {

From b5a4bee30cada209df216a74411ce1601607df13 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 3 Apr 2020 14:50:30 +0100
Subject: [PATCH 487/648] Remove bigger default min table row height for those
 with expander

---
 .../list/list-table/table-row/table-row.component.ts           | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.ts
index 25d1759c22..1c3c08d120 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.ts
@@ -77,9 +77,6 @@ export class TableRowComponent<T = any> extends CdkRow implements OnInit {
         map(state => state.deleting)
       );
     }
-    if (this.expandComponent) {
-      this.defaultMinRowHeight = '64px';
-    }
 
     // Ensure we 'register' with the expander service. This also helps with page changes
     this.expandedService.collapse(this.rowId);

From 51c0c5e44257016b431c1be69a38576e67c40b00 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 3 Apr 2020 15:27:55 +0100
Subject: [PATCH 488/648] Fix new user avatar default colours

---
 custom-src/frontend/sass/custom/suse.scss | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/custom-src/frontend/sass/custom/suse.scss b/custom-src/frontend/sass/custom/suse.scss
index 481d1f7236..1ebeaf156e 100644
--- a/custom-src/frontend/sass/custom/suse.scss
+++ b/custom-src/frontend/sass/custom/suse.scss
@@ -39,6 +39,13 @@ body.stratos {
     color: #333;
   }
 
+  .user-avatar {
+    &__initials {
+      background-color: $suse-primary-color;
+      color: $suse-text;
+    }
+  }
+
   .setup .page-header .mat-toolbar.mat-primary {
     background-color: $suse-primary-color;
     color: $suse-text;

From 50614ddcafb1d323ecc6d6dc0f50fb7d4c3489da Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 14 Apr 2020 11:43:45 +0100
Subject: [PATCH 489/648] go mod + sum changes after merge

---
 src/jetstream/go.mod | 13 +-----------
 src/jetstream/go.sum | 50 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/src/jetstream/go.mod b/src/jetstream/go.mod
index 08c500b137..53e96fbe80 100644
--- a/src/jetstream/go.mod
+++ b/src/jetstream/go.mod
@@ -12,8 +12,6 @@ require (
 	code.cloudfoundry.org/inigo v0.0.0-20200318144131-597cd5dbfe8b // indirect
 	code.cloudfoundry.org/lager v2.0.0+incompatible // indirect
 	code.cloudfoundry.org/ykk v0.0.0-20170424192843-e4df4ce2fd4d // indirect
-	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
-	github.com/SermoDigital/jose v0.9.1 // indirect
 	github.com/Sirupsen/logrus v0.0.0-00010101000000-000000000000 // indirect
 	github.com/antonlindstrom/pgstore v0.0.0-20170604072116-a407030ba6d0
 	github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77 // indirect
@@ -31,10 +29,6 @@ require (
 	github.com/cloudfoundry/noaa v2.1.0+incompatible
 	github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4
 	github.com/cppforlife/go-patch v0.2.0 // indirect
-	github.com/cyphar/filepath-securejoin v0.2.2 // indirect
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
-	github.com/docker/distribution v2.7.1+incompatible // indirect
-	github.com/docker/docker v1.13.1 // indirect
 	github.com/domodwyer/mailyak v3.1.1+incompatible
 	github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 // indirect
 	github.com/elazarl/goproxy v0.0.0-20200315184450-1f3cb6622dad // indirect
@@ -42,7 +36,6 @@ require (
 	github.com/fatih/color v1.7.0 // indirect
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/google/go-querystring v1.0.0 // indirect
-	github.com/google/martian v2.1.0+incompatible // indirect
 	github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e // indirect
 	github.com/gorilla/context v1.1.1
 	github.com/gorilla/securecookie v1.1.1
@@ -53,8 +46,6 @@ require (
 	github.com/jtolds/gls v4.20.0+incompatible // indirect
 	github.com/kat-co/vala v0.0.0-20170210184112-42e1d8b61f12
 	github.com/kr/pty v1.1.8 // indirect
-	github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 // indirect
-	github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28 // indirect
 	github.com/labstack/echo v3.3.10+incompatible
 	github.com/lunixbochs/vtclean v1.0.0 // indirect
 	github.com/mattn/go-colorable v0.1.4 // indirect
@@ -68,16 +59,14 @@ require (
 	github.com/nwmac/sqlitestore v0.0.0-20180824125213-7d2ab221fb3f
 	github.com/onsi/ginkgo v1.11.0 // indirect
 	github.com/onsi/gomega v1.8.1 // indirect
-	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
 	github.com/pierrec/lz4 v2.0.5+incompatible // indirect
-	github.com/pkg/errors v0.8.1 // indirect
 	github.com/poy/eachers v0.0.0-20181020210610-23942921fe77 // indirect
 	github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94 // indirect
 	github.com/sajari/fuzzy v1.0.0 // indirect
 	github.com/satori/go.uuid v1.2.0
 	github.com/sirupsen/logrus v1.4.2
 	github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 // indirect
-	github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa
+	github.com/smartystreets/goconvey v1.6.4
 	github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect
 	github.com/tedsuo/rata v1.0.0 // indirect
 	github.com/ulikunitz/xz v0.5.6 // indirect
diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index bb1fa3b99b..9bf918f27d 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -95,8 +95,14 @@ github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdn
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/bmatcuk/doublestar v1.1.1 h1:YroD6BJCZBYx06yYFEWvUuKVWQn3vLLQAVmDmvTSaiQ=
 github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40 h1:y4B3+GPxKlrigF1ha5FFErxK+sr6sWxQovRMzwMhejo=
 github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c=
+github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
+github.com/bugsnag/bugsnag-go v1.5.0/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
+github.com/bugsnag/panicwrap v1.2.0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
+github.com/cespare/xxhash/v2 v2.1.0 h1:yTUvW7Vhb89inJ+8irsUqiWjh8iT6sQPZiQzI6ReGkA=
+github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM=
 github.com/cf-stratos/mysqlstore v0.0.0-20170822100912-304308519d13 h1:WwIvjUUodNoZduhdhotbKnrLSFoIn5vD3QgNZv0hjvo=
 github.com/cf-stratos/mysqlstore v0.0.0-20170822100912-304308519d13/go.mod h1:GgQT0ToC+7JLnMKdDB5d434WwCLC2dpNR2AgTJj/08o=
 github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
@@ -170,13 +176,23 @@ github.com/domodwyer/mailyak v3.1.1+incompatible h1:oPtXn3+56LEFbdqH0bpuPRsqtijW
 github.com/domodwyer/mailyak v3.1.1+incompatible/go.mod h1:5NNYkn9hxcdNEOmmMx0yultN5VLorZQ+AWQo9iya+UY=
 github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 h1:eX+pdPPlD279OWgdx7f6KqIRSONuK7egk+jDx7OM3Ac=
 github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76/go.mod h1:KjxHHirfLaw19iGT70HvVjHQsL1vq1SRQB4yOsAfy2s=
+github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
+github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
+github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
 github.com/elazarl/goproxy v0.0.0-20200315184450-1f3cb6622dad h1:zPs0fNF2Io1Qytf92EI2CDJ9oCXZr+NmjEVexrUEdq4=
 github.com/elazarl/goproxy v0.0.0-20200315184450-1f3cb6622dad/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
 github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
 github.com/elazarl/goproxy/ext v0.0.0-20200315184450-1f3cb6622dad h1:3OG8xVCbdeebrE5IsoWl0TP25DWiHDbLUy+EKif7hDE=
 github.com/elazarl/goproxy/ext v0.0.0-20200315184450-1f3cb6622dad/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
+github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/emicklei/go-restful v2.11.1+incompatible h1:CjKsv3uWcCMvySPQYKxO8XX3f9zD4FeZRsW4G0B4ffE=
+github.com/emicklei/go-restful v2.11.1+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/evanphx/json-patch v4.1.0+incompatible h1:K1MDoo4AZ4wU0GIU/fPmtZg7VpzLjCxu+UwBD1FvwOc=
 github.com/evanphx/json-patch v4.1.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M=
+github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
 github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
@@ -290,14 +306,26 @@ github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
+github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
 github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf h1:+RRA9JqSOZFfKrOeqr2z77+8R2RKyh8PG66dcu1V0ck=
 github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
+github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.0 h1:Jf4mxPC/ziBnoPIdpQdPJ9OeiomAUHLvxmPRSPH9m4s=
 github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhpy9g=
 github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
+github.com/googleapis/gnostic v0.3.1 h1:WeAefnSUHlBb0iJKwxFDZdbfGwkd7xRNuV+IpXMJhYk=
+github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU=
+github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e h1:XWcjeEtTFTOVA9Fs1w7n2XBftk5ib4oZrhzWk0B+3eA=
 github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
@@ -373,10 +401,19 @@ github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQL
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/pty v1.1.8 h1:AkaSdXYQOWeaO3neb8EM634ahkXXe3jYbVh/F9lq+GI=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 h1:wdTBUArlqtBYGN2Dd4+zsaFxFH0m4iGCHToW10jPX0k=
 github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
+github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a h1:VqeX/fehAB6FtBox0TVYcjOMXGE56INQIfbXegditX4=
+github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
+github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc h1:Ttr4Z3ZrMv4rAXn10UAqOC8ACx+F1omvcyV1a3hRArE=
+github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc/go.mod h1:ItxiN33Ho7Di8wiC4S4XqbH1NLF0DNdDWOd/5MI9gJU=
 github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28 h1:mkl3tvPHIuPaWsLtmHTybJeoVEW7cbePK73Ir8VtruA=
 github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28/go.mod h1:T/T7jsxVqf9k/zYOqbgNAsANsjxTd1Yq3htjDhQ1H0c=
 github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8bbnE7CX5OEgg=
@@ -465,6 +502,7 @@ github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2i
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI=
 github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
+github.com/opencontainers/runc v0.1.1 h1:GlxAyO6x8rfZYN9Tt0Kti5a/cP41iuiO2yYT0IJGY8Y=
 github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830 h1:yvQ/2Pupw60ON8TYEIGGTAI77yZsWYkiOeHFZWkwlCk=
 github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
@@ -483,6 +521,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/poy/eachers v0.0.0-20181020210610-23942921fe77 h1:SNdqPRvRsVmYR0gKqFvrUKhFizPJ6yDiGQ++VAJIoDg=
 github.com/poy/eachers v0.0.0-20181020210610-23942921fe77/go.mod h1:x1vqpbcMW9T/KRcQ4b48diSiSVtYgvwQ5xzDByEg4WE=
+github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=
 github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
@@ -502,6 +542,11 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190129233650-316cf8ccfec5/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8=
+github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
+github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
 github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
 github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
@@ -513,6 +558,7 @@ github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 h1:hBSHahWMEgzwRyS6dRpxY0XyjZsHyQ61s084wo5PJe0=
@@ -544,6 +590,7 @@ github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 h1:mujcChM89zOHwgZBBN
 github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0=
 github.com/tedsuo/rata v1.0.0 h1:Sf9aZrYy6ElSTncjnGkyC2yuVvz5YJetBIUKJ4CmeKE=
 github.com/tedsuo/rata v1.0.0/go.mod h1:X47ELzhOoLbfFIY0Cql9P6yo3Cdwf2CMX3FVZxRzJPc=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ulikunitz/xz v0.5.6 h1:jGHAfXawEGZQ3blwU5wnWKQJvAraT7Ftq9EXjnXYgt8=
 github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
 github.com/unrolled/render v1.0.1 h1:VDDnQQVfBMsOsp3VaCJszSO0nkBIVEYoPWeRThk9spY=
@@ -633,6 +680,9 @@ golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226191147-529b322ea346 h1:zxGQKdHVCsCsJpbd7ijKsVC27CyETheUBql7Br2TGmA=
 golang.org/x/oauth2 v0.0.0-20190226191147-529b322ea346/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

From 021f8720a95cee1feac4272a62792f52533191c8 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Thu, 16 Apr 2020 10:36:16 +0100
Subject: [PATCH 490/648] Fix squashed workload icon (#366)

* Fix squashed workload icon

* Fix icon on the workload summary
---
 .../helm-release-card/helm-release-card.component.html         | 2 +-
 .../helm-release-card/helm-release-card.component.scss         | 1 +
 .../entity-summary-title/entity-summary-title.component.scss   | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
index 84f3afd17b..ad120d3cea 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
@@ -2,7 +2,7 @@
   <app-meta-card-title>
     <div class="release-title">
       <app-multiline-title>{{ row.name }}</app-multiline-title>
-      <div class='release-title--icon'>
+      <div class="release-title--icon">
         <img *ngIf="icon; else noIcon" [src]="icon" (error)="loadImageError()">
         <ng-template #noIcon>
           <mat-icon fontSet="stratos-icons">workloads</mat-icon>
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss
index 90e9c122b6..85c8381fbd 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss
@@ -21,6 +21,7 @@
     mat-icon {
       font-size: 48px;
       height: 48px;
+      object-fit: contain;      
       width: 48px;
     }
   }
diff --git a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.scss b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.scss
index 82c922af76..64db61cfc3 100644
--- a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.scss
+++ b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.scss
@@ -7,6 +7,9 @@
   }
   &__img {
     align-self: center;
+    height: 64px;
+    object-fit: contain;
+    width: 64px;
   }
   &__logo {
     font-size: 54px;

From 4e1c27a39586575cd93169b11616bc55309aee40 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Thu, 16 Apr 2020 11:36:13 +0100
Subject: [PATCH 491/648] Rename attributes to container and pod (#367)

---
 .../kubernetes-node-metrics.component.ts         |  8 ++++----
 .../pod-metrics/pod-metrics.component.ts         | 16 ++++++++--------
 .../services/kubernetes-node.service.ts          |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts
index 1960abaa90..592b5e6a32 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts
@@ -35,8 +35,8 @@ export class KubernetesNodeMetricsComponent implements OnInit {
     const chartConfigBuilder = getMetricsChartConfigBuilder<IMetricApplication>(
       result => {
         const metric = result.metric;
-        if (!!metric.pod_name && !!metric.namespace) {
-          const containerName = `${metric.namespace}:${metric.pod_name}:${metric.container_name}`;
+        if (!!metric.pod && !!metric.namespace) {
+          const containerName = `${metric.namespace}:${metric.pod}:${metric.container}`;
           if (!!metric.cpu) {
             return `${containerName}:${metric.cpu}`;
           }
@@ -62,7 +62,7 @@ export class KubernetesNodeMetricsComponent implements OnInit {
         'Memory Usage (MB)',
         ChartDataTypes.BYTES,
         (series: ChartSeries[]) => {
-          return series.filter(s => s.name.indexOf('/') !== 0 && !!s.metadata.container_name && s.metadata.container_name !== 'POD');
+          return series.filter(s => s.name.indexOf('/') !== 0 && !!s.metadata.container && s.metadata.container !== 'POD');
         },
         null,
         (value: string) => value + ' MB'
@@ -76,7 +76,7 @@ export class KubernetesNodeMetricsComponent implements OnInit {
         'CPU Usage (secs)',
         ChartDataTypes.CPU_TIME,
         (series: ChartSeries[]) => {
-          return series.filter(s => s.name.indexOf('/') !== 0 && !!s.metadata.container_name && s.metadata.container_name !== 'POD');
+          return series.filter(s => s.name.indexOf('/') !== 0 && !!s.metadata.container && s.metadata.container !== 'POD');
         },
         (t) => formatAxisCPUTime(t),
         (t) => formatCPUTime(t)
diff --git a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts b/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
index fc113e87eb..8f144d0768 100644
--- a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
@@ -65,9 +65,9 @@ export class PodMetricsComponent {
     this.podName = activatedRoute.snapshot.params.podName;
     this.namespaceName = getIdFromRoute(activatedRoute, 'namespaceName');
     const namespace = getIdFromRoute(activatedRoute, 'namespace') ? getIdFromRoute(activatedRoute, 'namespace') : this.namespaceName;
-    const chartConfigBuilder = getMetricsChartConfigBuilder<IMetricApplication>(result => `${result.metric.container_name}`);
+    const chartConfigBuilder = getMetricsChartConfigBuilder<IMetricApplication>(result => `${result.metric.container}`);
     const cpuChartConfigBuilder = getMetricsChartConfigBuilder<IMetricApplication>
-      (result => !!result.metric.cpu ? `${result.metric.container_name}:${result.metric.cpu}` : `${result.metric.container_name}`);
+      (result => !!result.metric.cpu ? `${result.metric.container}:${result.metric.cpu}` : `${result.metric.container}`);
     const networkChartConfigBuilder = getMetricsChartConfigBuilder<IMetricApplication>
       (result => `Network Interface: ${result.metric.interface}`);
     this.instanceMetricConfigs = [
@@ -75,13 +75,13 @@ export class PodMetricsComponent {
         new FetchKubernetesMetricsAction(
           this.podName,
           kubeEndpointService.kubeGuid,
-          `container_memory_usage_bytes{pod_name="${this.podName}",namespace="${namespace}"}`
+          `container_memory_usage_bytes{pod="${this.podName}",namespace="${namespace}"}`
         ),
         'Memory Usage (MB)',
         ChartDataTypes.BYTES,
         (series: ChartSeries[]) => {
           // Remove the metric series for pod overhead and for the total!
-          return series.filter(s => !!s.metadata.container_name && s.metadata.container_name !== 'POD');
+          return series.filter(s => !!s.metadata.container && s.metadata.container !== 'POD');
         },
         null,
         (value: string) => value + ' MB'
@@ -90,12 +90,12 @@ export class PodMetricsComponent {
         new FetchKubernetesMetricsAction(
           this.podName,
           kubeEndpointService.kubeGuid,
-          `container_cpu_usage_seconds_total{pod_name="${this.podName}",namespace="${namespace}"}`
+          `container_cpu_usage_seconds_total{pod="${this.podName}",namespace="${namespace}"}`
         ),
         'CPU Usage',
         ChartDataTypes.CPU_TIME,
         (series: ChartSeries[]) => {
-          return series.filter(s => !!s.metadata.container_name && s.metadata.container_name !== 'POD');
+          return series.filter(s => !!s.metadata.container && s.metadata.container !== 'POD');
         },
         (tick: string) => formatAxisCPUTime(tick),
         (value: string) => formatCPUTime(value),
@@ -104,7 +104,7 @@ export class PodMetricsComponent {
         new FetchKubernetesMetricsAction(
           this.podName,
           kubeEndpointService.kubeGuid,
-          `container_network_transmit_bytes_total{pod_name="${this.podName}",namespace="${namespace}"}`
+          `container_network_transmit_bytes_total{pod="${this.podName}",namespace="${namespace}"}`
         ),
         'Cumulative Data transmitted (MB)',
         ChartDataTypes.BYTES,
@@ -116,7 +116,7 @@ export class PodMetricsComponent {
         new FetchKubernetesMetricsAction(
           this.podName,
           kubeEndpointService.kubeGuid,
-          `container_network_receive_bytes_total{pod_name="${this.podName}",namespace="${namespace}"}`
+          `container_network_receive_bytes_total{pod="${this.podName}",namespace="${namespace}"}`
         ),
         'Cumulative Data received (MB)',
         ChartDataTypes.BYTES,
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts
index 166a43b40e..74cc1f75d9 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts
@@ -59,7 +59,7 @@ export class KubernetesNodeService {
 
 
   public setupMetricObservable(metric: KubeNodeMetric, metricStatistic: MetricStatistic) {
-    const containerFilter = ',container_name!="POD", container_name!=""';
+    const containerFilter = ',container!="POD", container!=""';
     const query = `${metricStatistic}(${metricStatistic}_over_time(${metric}{kubernetes_io_hostname="${this.nodeName}"${containerFilter}}[1h]))`;
     const metricsAction = new FetchKubernetesMetricsAction(this.nodeName, this.kubeGuid, query);
     const metricsId = MetricsAction.buildMetricKey(this.nodeName, new MetricQueryConfig(query), true, MetricQueryType.QUERY);

From 77ac79537c5dea536a8b9bd885022aa82c234a4a Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Thu, 16 Apr 2020 13:23:10 +0100
Subject: [PATCH 492/648] Fix avatar colors (#368)

---
 custom-src/frontend/sass/custom/suse.scss | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/custom-src/frontend/sass/custom/suse.scss b/custom-src/frontend/sass/custom/suse.scss
index 1ebeaf156e..e658d2fad9 100644
--- a/custom-src/frontend/sass/custom/suse.scss
+++ b/custom-src/frontend/sass/custom/suse.scss
@@ -39,13 +39,16 @@ body.stratos {
     color: #333;
   }
 
-  .user-avatar {
-    &__initials {
-      background-color: $suse-primary-color;
-      color: $suse-text;
-    }
+  .user-avatar__initials {
+    background-color: $suse-primary-color;
+    color: $suse-text;
   }
 
+  .user-avatar__large .user-avatar__initials {
+    background-color: $suse-text;
+    color: $suse-primary-color;
+  }  
+
   .setup .page-header .mat-toolbar.mat-primary {
     background-color: $suse-primary-color;
     color: $suse-text;

From 0d657242b343ea776d49a0cf1536629131393905 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Thu, 16 Apr 2020 13:24:03 +0100
Subject: [PATCH 493/648] Update change log for 3.1.0 release (#369)

* Update change log for 3.1.0 release

* Add missing feature
---
 CHANGELOG.md             | 6 +++++-
 build/tools/changelog.sh | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c66fc4f53..351a1f2096 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,12 +2,13 @@
 
 ## 3.1.0
 
-[Full Changelog](https://github.com/cloudfoundry/stratos/compare/3.0.0...3.1.0)
+[Full Changelog](https://github.com/SUSE/stratos/compare/3.0.0...3.1.0)
 
 This release contains a number of fixes and improvements:
 
 **Improvements:**
 
+- Add containers table in pods list pod row drop down [\#351](https://github.com/SUSE/stratos/pull/351)
 - Update Feature Flags with new entries [\#4188](https://github.com/cloudfoundry/stratos/issues/4188)
 - Improve Application Deployment UI [\#4183](https://github.com/cloudfoundry/stratos/pull/4183)
 - Scalability: Improve handling of 'maxed' lists [\#4180](https://github.com/cloudfoundry/stratos/issues/4180)
@@ -23,6 +24,9 @@ This release contains a number of fixes and improvements:
 
 **Fixes:**
 
+- Metrics do not show for a Kubernetes 1.16+ cluster [\#362](https://github.com/SUSE/stratos/issues/362)
+- Logos squashed in Workloads view [\#361](https://github.com/SUSE/stratos/issues/361)
+- Can't deploy version 3.0.0 on EKS [\#357](https://github.com/SUSE/stratos/issues/357)
 - CF Quota's `Maximum Application Instance Memory Usage` not formatted correctly [\#4206](https://github.com/cloudfoundry/stratos/issues/4206)
 - Notification and error pages loop when using 'X' [\#4202](https://github.com/cloudfoundry/stratos/issues/4202)
 - Cf app redeploy stepper starts with empty step, cannot continue [\#4185](https://github.com/cloudfoundry/stratos/issues/4185)
diff --git a/build/tools/changelog.sh b/build/tools/changelog.sh
index f81667f690..61affff09f 100755
--- a/build/tools/changelog.sh
+++ b/build/tools/changelog.sh
@@ -67,9 +67,11 @@ function log() {
   echo $1 | tee -a ${CHANGELOG}
 }
 
+COMPARE_REPO=${REPO}
 QUERY="repo:${REPO}+milestone:3.1.0+state:closed"
 if [ -n "${FORK}" ]; then
   FORK_QUERY="repo:${FORK}+milestone:3.1.0+state:closed"
+  COMPARE_REPO=${FORK}
 fi
 
 BUGS="+label:bug"
@@ -77,6 +79,7 @@ NON_BUGS="+-label:bug"
 
 mv ${CHANGELOG} CHANGELOG.old
 
+
 echo ""
 echo -e "${CYAN}${BOLD}Generating Change log - content for version ${MILESTONE} will be shown below"
 echo -e "---------------------------------------------------------------------${RESET}"
@@ -85,7 +88,7 @@ echo  "# Change Log" > ${CHANGELOG}
 log ""
 log "## ${MILESTONE}"
 log ""
-log "[Full Changelog](https://github.com/${REPO}/compare/${CURRENT}...${MILESTONE})"
+log "[Full Changelog](https://github.com/${COMPARE_REPO}/compare/${CURRENT}...${MILESTONE})"
 log ""
 log "This release contains a number of fixes and improvements:"
 log ""

From 096507e704b0bbc388114a877819c842a31d80b1 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 16 Apr 2020 14:04:25 +0100
Subject: [PATCH 494/648] Release pipeline fix

---
 deploy/ci/suse-console-dev-releases.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/deploy/ci/suse-console-dev-releases.yml b/deploy/ci/suse-console-dev-releases.yml
index 240f674253..82b15b962c 100644
--- a/deploy/ci/suse-console-dev-releases.yml
+++ b/deploy/ci/suse-console-dev-releases.yml
@@ -6,7 +6,6 @@ resource_types:
   privileged: true
   source:
     repository: ((docker-resource-image))
-    tag: ((docker-resource-image-tag))
 resources:
 # Stratos Git Repository
 - name: stratos

From 872d34dd659d3df99270eab8726fc035e26a5c2d Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 5 May 2020 14:18:03 +0100
Subject: [PATCH 495/648] Fixes following merge

---
 .../backup-endpoints/backup-endpoints.component.html        | 2 +-
 src/jetstream/plugins/monocular/sync.go                     | 6 +++---
 2 files changed, 4 insertions(+), 4 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 bfbec70bda..f11198e59d 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
@@ -14,7 +14,7 @@ <h1>Backup Endpoints</h1>
         <button mat-raised-button color="primary" [disabled]="disableSelectNone$ | async"
           (click)="service.selectNone()">Select None</button>
       </div>
-      <app-table [dataSource]="endpointDataSource" [columns]="columns"></app-table>
+      <app-table [dataSource]="endpointDataSource" [columns]="columns" [minRowHeight]="'77px'"></app-table>
     </div>
     <ng-template #noEndpoints>
       <p>There are no endpoints to backup</p>
diff --git a/src/jetstream/plugins/monocular/sync.go b/src/jetstream/plugins/monocular/sync.go
index 1c4d5969ce..ab1e6c3460 100644
--- a/src/jetstream/plugins/monocular/sync.go
+++ b/src/jetstream/plugins/monocular/sync.go
@@ -68,7 +68,7 @@ func (m *Monocular) Sync(action interfaces.EndpointAction, endpoint *interfaces.
 		Status: "Pending",
 		Busy:   true,
 	}
-	m.portalProxy.UpdateEndointMetadata(endpoint.GUID, marshalSyncMetadata(metadata))
+	m.portalProxy.UpdateEndpointMetadata(endpoint.GUID, marshalSyncMetadata(metadata))
 
 	// Add the job to the queue to be processed
 	job := SyncJob{
@@ -127,7 +127,7 @@ func (m *Monocular) processSyncRequests() {
 				Status: "Synchronizing",
 				Busy:   true,
 			}
-			m.portalProxy.UpdateEndointMetadata(job.Endpoint.GUID, marshalSyncMetadata(metadata))
+			m.portalProxy.UpdateEndpointMetadata(job.Endpoint.GUID, marshalSyncMetadata(metadata))
 			syncURL := fmt.Sprintf("%s%s/sync/%s", m.SyncServiceURL, chartRepoPathPrefix, job.Endpoint.Name)
 
 			//Hit the sync server container endpoint to trigger a sync for given repo
@@ -228,7 +228,7 @@ func marshalSyncMetadata(metadata SyncMetadata) string {
 }
 
 func (m *Monocular) updateMetadata(endpoint string, metadata SyncMetadata) {
-	err := m.portalProxy.UpdateEndointMetadata(endpoint, marshalSyncMetadata(metadata))
+	err := m.portalProxy.UpdateEndpointMetadata(endpoint, marshalSyncMetadata(metadata))
 	if err != nil {
 		log.Errorf("Failed to update endpoint metadata: %v+", err)
 	}

From 5651d91fdfe6c395a829bd18cf9db1c78b14199e Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 7 May 2020 11:20:49 +0100
Subject: [PATCH 496/648] Fix entity-catalog.service --> entity-catalog file
 change

---
 .../helm/create-release/create-release.component.ts       | 2 +-
 .../frontend/app/custom/helm/helm-testing.module.ts       | 3 ++-
 .../monocular-repository-list-config.service.ts           | 2 +-
 custom-src/frontend/app/custom/helm/store/helm.effects.ts | 8 ++++----
 .../app/custom/kubernetes/kubernetes.testing.module.ts    | 2 +-
 .../kubernetes-pod-containers.component.ts                | 2 +-
 .../app/custom/kubernetes/store/kubernetes.effects.ts     | 2 +-
 .../kubernetes-summary.component.ts                       | 4 ++--
 .../helm-release-tab-base.component.ts                    | 2 +-
 .../workloads/release/tabs/helm-release-helper.service.ts | 2 +-
 .../kubernetes/workloads/store/workloads.effects.ts       | 2 +-
 11 files changed, 16 insertions(+), 15 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..60dd7f0190 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 { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
 import { EndpointsService } from '../../../core/endpoints.service';
 import { safeUnsubscribe } from '../../../core/utils.service';
 import { ConfirmationDialogConfig } from '../../../shared/components/confirmation-dialog.config';
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..be42355419 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';
@@ -13,6 +13,7 @@ import { SharedModule } from '../../shared/shared.module';
 import { HelmReleaseGuid } from '../kubernetes/workloads/workload.types';
 import { generateHelmEntities } from './helm-entity-generator';
 
+
 @NgModule({
   imports: [{
     ngModule: EntityCatalogFeatureModule,
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.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/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.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 cca5f7b4f3d02ac57c37d852b0b67aa254436dc8 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 7 May 2020 14:16:46 +0100
Subject: [PATCH 497/648] WIP

---
 .../app/custom/helm/helm-entity-generator.ts  |  2 +-
 .../kubernetes/kubernetes-entity-catalog.ts   |  7 ++
 .../kubernetes/kubernetes-entity-generator.ts | 79 ++++++++++++++-----
 .../action-builders/kube.action-builders.ts   | 76 ++++++++++++++++++
 .../kubernetes/store/kubernetes.actions.ts    | 30 ++++---
 .../kubernetes/store/kubernetes.effects.ts    | 19 ++---
 .../store/workloads-entity-generator.ts       |  2 +-
 .../card-autoscaler-default.component.spec.ts |  4 +-
 ...p-autoscaler-events-config.service.spec.ts |  4 +-
 ...scaler-metric-chart-card.component.spec.ts |  2 +-
 ...r-metric-chart-list-config.service.spec.ts |  4 +-
 .../metrics/metrics/metrics.component.html    | 19 +++--
 .../core/test-framework/core-test.helper.ts   |  4 +-
 13 files changed, 196 insertions(+), 56 deletions(-)
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts

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/kubernetes/kubernetes-entity-catalog.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts
new file mode 100644
index 0000000000..dbadecc336
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts
@@ -0,0 +1,7 @@
+/**
+ * A strongly typed collection of Kube Catalog Entities.
+ * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc
+ */
+export class KubeEntityCatalog {
+
+}
\ No newline at end of file
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..7beff79804 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
@@ -5,8 +5,11 @@ import {
   StratosBaseCatalogEntity,
   StratosCatalogEndpointEntity,
   StratosCatalogEntity,
-} from '../../../../store/src/entity-catalog/entity-catalog-entity';
-import { StratosEndpointExtensionDefinition } from '../../../../store/src/entity-catalog/entity-catalog.types';
+} from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import {
+  IStratosEntityDefinition,
+  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';
 import { KubernetesAWSAuthFormComponent } from './auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component';
@@ -29,6 +32,24 @@ import {
   kubernetesServicesEntityType,
   kubernetesStatefulSetsEntityType,
 } from './kubernetes-entity-factory';
+import {
+  KubeAppActionBuilders,
+  kubeAppActionBuilders,
+  KubeDashboardActionBuilders,
+  kubeDashboardActionBuilders,
+  KubeDeploymentActionBuilders,
+  kubeDeploymentActionBuilders,
+  KubeNamespaceActionBuilders,
+  kubeNamespaceActionBuilders,
+  KubeNodeActionBuilders,
+  kubeNodeActionBuilders,
+  KubePodActionBuilders,
+  kubePodActionBuilders,
+  KubeServiceActionBuilders,
+  kubeServiceActionBuilders,
+  KubeStatefulSetsActionBuilders,
+  kubeStatefulSetsActionBuilders,
+} from './store/action-builders/kube.action-builders';
 import {
   KubernetesApp,
   KubernetesDeployment,
@@ -160,79 +181,97 @@ function generateEndpointEntity(endpointDefinition: StratosEndpointExtensionDefi
 }
 
 function generateAppEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
+  const definition: IStratosEntityDefinition = {
     type: kubernetesAppsEntityType,
     schema: kubernetesEntityFactory(kubernetesAppsEntityType),
-    endpoint: endpointDefinition
+    endpoint: endpointDefinition,
+
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesApp>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesApp, KubeAppActionBuilders>(definition, {
+    actionBuilders: kubeAppActionBuilders
+  });
 }
 
 function generateStatefulSetsEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
+  const definition: IStratosEntityDefinition = {
     type: kubernetesStatefulSetsEntityType,
     schema: kubernetesEntityFactory(kubernetesStatefulSetsEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesStatefulSet>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesStatefulSet, KubeStatefulSetsActionBuilders>(definition, {
+    actionBuilders: kubeStatefulSetsActionBuilders
+  });
 }
 
 function generatePodsEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
+  const definition: IStratosEntityDefinition = {
     type: kubernetesPodsEntityType,
     schema: kubernetesEntityFactory(kubernetesPodsEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesPod>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesPod, KubePodActionBuilders>(definition, {
+    actionBuilders: kubePodActionBuilders
+  });
 }
 
 function generateDeploymentsEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
+  const definition: IStratosEntityDefinition = {
     type: kubernetesDeploymentsEntityType,
     schema: kubernetesEntityFactory(kubernetesDeploymentsEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesDeployment>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesDeployment, KubeDeploymentActionBuilders>(definition, {
+    actionBuilders: kubeDeploymentActionBuilders
+  });
 }
 
 function generateNodesEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
+  const definition: IStratosEntityDefinition = {
     type: kubernetesNodesEntityType,
     schema: kubernetesEntityFactory(kubernetesNodesEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesNode>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesNode, KubeNodeActionBuilders>(definition, {
+    actionBuilders: kubeNodeActionBuilders
+  });
 }
 
 function generateNamespacesEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
+  const definition: IStratosEntityDefinition = {
     type: kubernetesNamespacesEntityType,
     schema: kubernetesEntityFactory(kubernetesNamespacesEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesNamespace>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesNamespace, KubeNamespaceActionBuilders>(definition, {
+    actionBuilders: kubeNamespaceActionBuilders
+  });
 }
 
 function generateServicesEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
+  const definition: IStratosEntityDefinition = {
     type: kubernetesServicesEntityType,
     schema: kubernetesEntityFactory(kubernetesServicesEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, KubeService>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, KubeService, KubeServiceActionBuilders>(definition, {
+    actionBuilders: kubeServiceActionBuilders
+  });
 }
 
 function generateDashboardEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
+  const definition: IStratosEntityDefinition = {
     type: kubernetesDashboardEntityType,
     schema: kubernetesEntityFactory(kubernetesDashboardEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata>(definition);
+  // TODO: RC any
+  return new StratosCatalogEntity<IFavoriteMetadata, any, KubeDashboardActionBuilders>(definition, {
+    actionBuilders: kubeDashboardActionBuilders
+  });
 }
 
 function generateMetricEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
+  const definition: IStratosEntityDefinition = {
     type: metricEntityType,
     schema: kubernetesEntityFactory(metricEntityType),
     label: 'Kubernetes Metric',
diff --git a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts
new file mode 100644
index 0000000000..0ca8312580
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts
@@ -0,0 +1,76 @@
+import {
+  OrchestratedActionBuilders,
+} from '../../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
+import { GetKubernetesNode, GetKubernetesNodes } from '../kubernetes.actions';
+
+export interface KubeAppActionBuilders extends OrchestratedActionBuilders {
+
+}
+
+export const kubeAppActionBuilders: KubeAppActionBuilders = {
+}
+
+export interface KubeStatefulSetsActionBuilders extends OrchestratedActionBuilders {
+
+}
+
+export const kubeStatefulSetsActionBuilders: KubeStatefulSetsActionBuilders = {
+}
+
+export interface KubePodActionBuilders extends OrchestratedActionBuilders {
+
+}
+
+export const kubePodActionBuilders: KubePodActionBuilders = {
+}
+
+export interface KubeDeploymentActionBuilders extends OrchestratedActionBuilders {
+
+}
+
+export const kubeDeploymentActionBuilders: KubeDeploymentActionBuilders = {
+}
+
+export interface KubeNodeActionBuilders extends OrchestratedActionBuilders {
+  get: (
+    nodeName: string,
+    kubeGuid: string
+  ) => GetKubernetesNode
+  getMultiple: (
+    kubeGuid: string,
+    paginationKey: string,
+  ) => GetKubernetesNodes
+}
+
+export const kubeNodeActionBuilders: KubeNodeActionBuilders = {
+  get: (nodeName: string, endpointGuid: string) => new GetKubernetesNode()
+  getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesNodes(kubeGuid)
+}
+
+export interface KubeNamespaceActionBuilders extends OrchestratedActionBuilders {
+
+}
+
+export const kubeNamespaceActionBuilders: KubeNamespaceActionBuilders = {
+}
+
+export interface KubeServiceActionBuilders extends OrchestratedActionBuilders {
+
+}
+
+export const kubeServiceActionBuilders: KubeServiceActionBuilders = {
+}
+
+export interface KubeDashboardActionBuilders extends OrchestratedActionBuilders {
+
+}
+
+export const kubeDashboardActionBuilders: KubeDashboardActionBuilders = {
+}
+
+// export interface A extends OrchestratedActionBuilders {
+
+// }
+
+// export const a: A = {
+// }
\ No newline at end of file
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..ac98e0735f 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
@@ -17,6 +17,7 @@ import {
   kubernetesServicesEntityType,
   kubernetesStatefulSetsEntityType,
 } from '../kubernetes-entity-factory';
+import { getKubeAPIResourceGuid } from './kube.selectors';
 
 export const GET_RELEASE_POD_INFO = '[KUBERNETES Endpoint] Get Release Pods Info';
 export const GET_RELEASE_POD_INFO_SUCCESS = '[KUBERNETES Endpoint] Get Release Pods Info Success';
@@ -89,7 +90,12 @@ const sortPodsByName = {
 export interface KubeAction extends EntityRequestAction {
   kubeGuid: string;
 }
-export interface KubePaginationAction extends PaginatedAction, KubeAction { }
+export interface KubePaginationAction extends PaginatedAction, KubeAction {
+  getId: (r: any) => string;
+}
+export interface KubeSingleEntityAction extends KubeAction {
+  guid: string;
+}
 
 export class KubeHealthCheck implements KubePaginationAction {
   constructor(public kubeGuid) {
@@ -128,10 +134,12 @@ export class GetKubernetesNodes implements KubePaginationAction {
     'order-direction': 'desc' as SortDirection,
     'order-direction-field': 'name'
   };
+  getId = getKubeAPIResourceGuid;
 }
 
-export class GetKubernetesNode implements KubeAction {
+export class GetKubernetesNode implements KubeSingleEntityAction {
   constructor(public nodeName: string, public kubeGuid: string) {
+    this.guid = this.nodeName;
   }
   type = GET_NODE_INFO;
   entityType = kubernetesNodesEntityType;
@@ -143,9 +151,10 @@ export class GetKubernetesNode implements KubeAction {
     GET_NODE_INFO_SUCCESS,
     GET_NODE_INFO_FAILURE
   ];
+  guid: string;
 }
 
-export class GetKubernetesNamespace implements KubeAction {
+export class GetKubernetesNamespace implements KubeSingleEntityAction {
   constructor(public namespaceName: string, public kubeGuid: string) {
   }
   type = GET_NAMESPACE_INFO;
@@ -160,7 +169,7 @@ export class GetKubernetesNamespace implements KubeAction {
   ];
 }
 
-export class CreateKubernetesNamespace implements KubeAction {
+export class CreateKubernetesNamespace implements KubeSingleEntityAction {
   public guid: string;
   constructor(public namespaceName: string, public kubeGuid: string) {
     this.guid = `Creating-${namespaceName}-${kubeGuid}`;
@@ -193,7 +202,7 @@ export class GetKubernetesPods implements KubePaginationAction {
   };
 }
 
-export class GetKubernetesPodsOnNode implements PaginatedAction, KubeAction {
+export class GetKubernetesPodsOnNode implements KubePaginationAction {
   constructor(public kubeGuid: string, public nodeName: string) {
     this.paginationKey = getPaginationKey(kubernetesPodsEntityType, `node-${nodeName}`, kubeGuid);
     this.initialParams = {
@@ -214,7 +223,7 @@ export class GetKubernetesPodsOnNode implements PaginatedAction, KubeAction {
   initialParams: PaginationParam;
 }
 
-export class GetKubernetesServicesInNamespace implements PaginatedAction, KubeAction {
+export class GetKubernetesServicesInNamespace implements KubePaginationAction {
   constructor(public kubeGuid: string, public namespaceName: string) {
     this.paginationKey = getPaginationKey(kubernetesPodsEntityType, `ns-${namespaceName}`, kubeGuid);
   }
@@ -233,7 +242,7 @@ export class GetKubernetesServicesInNamespace implements PaginatedAction, KubeAc
   };
 }
 
-export class GetKubernetesPodsInNamespace implements PaginatedAction, KubeAction {
+export class GetKubernetesPodsInNamespace implements KubePaginationAction {
   constructor(public kubeGuid: string, public namespaceName: string) {
     this.paginationKey = getPaginationKey(kubernetesPodsEntityType, `ns-${namespaceName}`, kubeGuid);
   }
@@ -292,7 +301,7 @@ export class GetKubernetesServices implements KubePaginationAction {
   };
 }
 
-export class GetKubernetesPod implements KubeAction {
+export class GetKubernetesPod implements KubeSingleEntityAction {
   constructor(public podName, public namespaceName, public kubeGuid) {
   }
   type = GET_KUBE_POD;
@@ -338,8 +347,9 @@ export class GeKubernetesDeployments implements KubePaginationAction {
   paginationKey: string;
 }
 
-export class GetKubernetesDashboard implements KubeAction {
+export class GetKubernetesDashboard implements KubeSingleEntityAction {
   constructor(public kubeGuid: string) {
+    this.guid = this.getId();
   }
   type = GET_KUBE_DASHBOARD;
   entityType = kubernetesDashboardEntityType;
@@ -351,6 +361,8 @@ export class GetKubernetesDashboard implements KubeAction {
     GET_KUBE_DASHBOARD_SUCCESS,
     GET_KUBE_DASHBOARD_FAILURE
   ];
+  getId = () => this.kubeGuid;
+  guid: string;
 }
 
 function getKubeMetricsAction(guid: string) {
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 c55b3cca8a..55d6ccc0f8 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
@@ -124,9 +124,8 @@ export class KubernetesEffects {
             result: []
           } as NormalizedResponse;
           const status = response as KubeDashboardStatus;
-          const id = status.guid;
-          result.entities[dashboardEntityConfig.entityKey][id] = status;
-          result.result.push(id);
+          result.entities[dashboardEntityConfig.entityKey][action.guid] = status;
+          result.result.push(action.guid);
           return [
             new WrapperRequestActionSuccess(result, action)
           ];
@@ -155,8 +154,7 @@ export class KubernetesEffects {
       const nodeEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesEntityType);
       return this.processSingleItemAction<KubernetesNode>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes/${action.nodeName}`,
-        nodeEntityConfig.entityKey,
-        (node) => node.metadata.name);
+        nodeEntityConfig.entityKey);
     })
   );
 
@@ -168,7 +166,7 @@ export class KubernetesEffects {
       return this.processSingleItemAction<KubernetesNamespace>(action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}`,
         namespaceEntityConfig.entityKey,
-        getKubeAPIResourceGuid);
+        getKubeAPIResourceGuid); // TODO: RC HERE
     })
   );
 
@@ -314,10 +312,9 @@ export class KubernetesEffects {
   }
 
   private processListAction<T = any>(
-    action: KubePaginationAction | KubeAction,
+    action: KubePaginationAction,
     url: string,
     entityKey: string,
-    getId: GetID<T>,
     filterResults?: Filter<T>) {
     this.store.dispatch(new StartRequestAction(action));
 
@@ -397,7 +394,6 @@ export class KubernetesEffects {
     action: KubeAction,
     url: string,
     schemaKey: string,
-    getId: GetID<T>,
     body?: any) {
     const requestType: ApiRequestTypes = body ? 'create' : 'fetch';
     this.store.dispatch(new StartRequestAction(action, requestType));
@@ -418,12 +414,11 @@ export class KubernetesEffects {
             entities: { [schemaKey]: {} },
             result: []
           } as NormalizedResponse;
-          const id = getId(response);
           const data = action.entityType === kubernetesPodsEntityType ?
             KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(response as unknown as KubernetesPod) :
             response;
-          res.entities[schemaKey][id] = data;
-          res.result.push(id);
+          res.entities[schemaKey][action.guid] = data;
+          res.result.push(action.guid);
           const actions: Action[] = [
             new WrapperRequestActionSuccess(res, action)
           ];
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..8ba379a06c 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,7 +1,7 @@
 import {
   StratosBaseCatalogEntity,
   StratosCatalogEntity,
-} from 'frontend/packages/store/src/entity-catalog/entity-catalog-entity';
+} from 'frontend/packages/store/src/entity-catalog/entity-catalog-entity/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';
 
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 347c2a3c40..77c25d66d0 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
@@ -15,7 +15,9 @@ import {
 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 {
+  EntityCatalogHelper,
+} from '../../../../store/src/entity-catalog/entity-catalog-entity/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 { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module';
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..8412c69ad4 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
@@ -14,7 +14,9 @@ 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';
+import {
+  EntityCatalogHelper,
+} from '../../../../../store/src/entity-catalog/entity-catalog-entity/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';
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 bc8e376f85..95bab21784 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
@@ -18,7 +18,7 @@ import { generateTestApplicationServiceProvider } from '../../../../../../core/t
 import { AppTestModule } from '../../../../../../core/test-framework/core-test.helper';
 import {
   EntityCatalogHelper,
-} from '../../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service';
+} from '../../../../../../store/src/entity-catalog/entity-catalog-entity/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 { CfAutoscalerTestingModule } from '../../../../cf-autoscaler-testing.module';
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 08e9f627eb..3c16b6b43a 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
@@ -11,7 +11,9 @@ import {
 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 {
+  EntityCatalogHelper,
+} from '../../../../../store/src/entity-catalog/entity-catalog-entity/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';
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..544d07696e 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,5 @@
-<app-page-header [breadcrumbs]="breadcrumbs$ | async">{{ (metricsEndpoint$ | async)?.entity.provider.name }}</app-page-header>
+<app-page-header [breadcrumbs]="breadcrumbs$ | async">{{ (metricsEndpoint$ | async)?.entity.provider.name }}
+</app-page-header>
 
 <div *ngIf="(metricsEndpoint$ | async) as ep">
   <mat-card>
@@ -8,7 +9,8 @@
         <div>
           <div>{{ ep.entity.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.entity.provider.token_endpoint }}">{{ ep.entity.provider.token_endpoint }}</a>
           </h2>
         </div>
       </div>
@@ -35,11 +37,14 @@ <h2 class="metrics-url">
               <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>
+                  <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 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>
@@ -57,6 +62,4 @@ <h2 class="metrics-url">
       </mat-card>
     </div>
   </div>
-</div>
-
-
+</div>
\ No newline at end of file
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 99e36a22d7..d9ca7cafe9 100644
--- a/src/frontend/packages/core/test-framework/core-test.helper.ts
+++ b/src/frontend/packages/core/test-framework/core-test.helper.ts
@@ -5,7 +5,9 @@ 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 {
+  EntityCatalogHelper,
+} from '../../store/src/entity-catalog/entity-catalog-entity/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';

From 4e6a37b37f26ab5e1ef4c39d90e1fe384021caf1 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Mon, 11 May 2020 15:51:49 +0100
Subject: [PATCH 498/648] Merge upstream (#374)

* Add initial UI for backup/restore

* Convert connection details checkbox to drop down

* Add docs for max list feature

* Add db version check

* Tidy up #1

* Tidying & bug fixes. Handle client_secret

* Add minimum password length

* First pass encrypt/decrypt

* Tidy up

* Fix unit tests

* Re-add tests that now work

* Changes following review

* Move backup into it's own module

* 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

* CF Push: Ensure we refresh token

* Fix uaa docs. Make UAA endpoint config simpler

* Fix compile issues

* Fixes following merge

* 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

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

* Fix multiple metrics requests due to recreated list cards

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

* 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

* Autoscaler improvements

* Fix unit tests

* Fix disabling of polling (#4260)

- fixes #4244

* 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

* Fix EndpointCardComponent test

* Increase users table page size before searching for `e2e` user

* 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>

* 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

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

* Override name but do not set a random route

* 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

* 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>

* 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>

* 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>

* 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

* Version bump and change log for 3.2.0

* E2E Test improvements (#4275)

* Speed up form fill

* Fix page set setting

* Remove whitespace

* Add ability to provided a wildcard in path when matching urls (#4277)

* Update releas notes

Co-authored-by: Neil MacDougall <neil_macdougall@hotmail.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: macevil <30493519+macevil@users.noreply.github.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Johannes Jungkunst <macevil@gmail.com>
---
 CHANGELOG.md                                  |  23 ++
 build/tools/changelog.sh                      |   4 +-
 deploy/ci/automation/e2e-clean-remnants.sh    |   1 +
 deploy/ci/travis/helm-chart-unit-tests.sh     |  12 +
 deploy/kubernetes/console/README.md           |  21 +-
 .../console/templates/config-init.yaml        |  10 +
 .../console/templates/database.yaml           |   6 +
 .../console/templates/deployment.yaml         |  18 +-
 .../console/tests/config_init_test.yaml       |  12 +
 .../console/tests/database-test.yaml          |  12 +
 .../console/tests/deployment_test.yaml        |   8 +
 deploy/kubernetes/console/values.yaml         |  23 +-
 docs/cf-entity-scaling.md                     |  43 +++
 docs/sso.md                                   |   6 +-
 package-lock.json                             |   2 +-
 package.json                                  |   2 +-
 .../autoscaler-metric-page.component.spec.ts  |  10 +-
 ...caler-scale-history-page.component.spec.ts |   9 +-
 ...plication-instance-chart.component.spec.ts |   3 +-
 .../metrics-tab/metrics-tab.component.spec.ts |   3 +-
 .../cloud-foundry-cell-apps.component.spec.ts |   7 +-
 .../cloud-foundry-cell-base.component.spec.ts |  11 +-
 ...loud-foundry-cell-charts.component.spec.ts |   7 +-
 ...oud-foundry-cell-summary.component.spec.ts |   9 +-
 .../cf-endpoint-details.component.scss        |   2 +-
 .../shared/components/components.module.ts    |   6 +-
 .../packages/core/sass/_all-theme.scss        |   6 +-
 .../packages/core/src/base-entity-types.ts    |  10 +-
 .../backup-checkbox-cell.component.html       |   2 +
 .../backup-checkbox-cell.component.scss       |   0
 .../backup-checkbox-cell.component.spec.ts    |  45 +++
 .../backup-checkbox-cell.component.ts         |  25 ++
 .../backup-connection-cell.component.html     |  10 +
 .../backup-connection-cell.component.scss     |   0
 .../backup-connection-cell.component.spec.ts  |  43 +++
 .../backup-connection-cell.component.ts       |  36 ++
 .../backup-endpoints.service.ts               | 182 ++++++++++
 .../backup-endpoints.component.html           |  43 +++
 .../backup-endpoints.component.scss           |  15 +
 .../backup-endpoints.component.spec.ts        |  35 ++
 .../backup-endpoints.component.ts             | 187 ++++++++++
 .../backup-restore-endpoints.component.html   |  12 +
 .../backup-restore-endpoints.component.scss   |   3 +
 ...backup-restore-endpoints.component.spec.ts |  35 ++
 .../backup-restore-endpoints.component.ts     |  46 +++
 .../backup-restore/backup-restore.types.ts    |  25 ++
 .../restore-endpoints.service.ts              | 141 ++++++++
 .../restore-endpoints.component.html          |  59 +++
 .../restore-endpoints.component.scss          |  32 ++
 .../restore-endpoints.component.spec.ts       |  35 ++
 .../restore-endpoints.component.theme.scss    |  11 +
 .../restore-endpoints.component.ts            | 105 ++++++
 .../connect-endpoint-dialog.component.spec.ts |   9 +-
 .../connect-endpoint.component.spec.ts        |   5 +-
 ...reate-endpoint-cf-step-1.component.spec.ts |   5 +-
 .../create-endpoint.component.spec.ts         |  12 +-
 .../endpoints-page.component.html             |   7 +-
 .../features/endpoints/endpoints.module.ts    |  20 +-
 .../features/endpoints/endpoints.routing.ts   |  19 +-
 .../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/metrics.component.spec.ts |   5 +-
 .../metrics/metrics.component.theme.scss      |  21 ++
 .../metrics/metrics/metrics.component.ts      |  61 ++--
 .../profile-info/profile-info.component.html  |   2 +-
 .../packages/core/src/jetstream.helpers.ts    |  17 +
 .../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 +-
 .../endpoint/endpoints-list-config.service.ts |   7 +-
 .../metrics-chart.component.spec.ts           |   4 +-
 .../store/src/actions/endpoint.actions.ts     |   2 +-
 .../store/src/actions/metrics-api.actions.ts  |  18 +-
 .../store/src/effects/metrics.effects.ts      |   4 +-
 .../store/src/monitors/pagination-monitor.ts  |   1 +
 .../store/src/reducers/auth.reducer.ts        |   2 +-
 .../src/reducers/system-endpoints.reducer.ts  |  13 +
 .../store/src/types/endpoint.types.ts         |   5 +-
 src/jetstream/authcnsi.go                     |   2 +-
 src/jetstream/cnsi.go                         |   4 +-
 src/jetstream/default.config.properties       |   1 +
 src/jetstream/load_plugins.go                 |   2 +
 .../plugins/backup/backup_restore.go          | 336 ++++++++++++++++++
 src/jetstream/plugins/backup/main.go          | 111 ++++++
 src/jetstream/plugins/cfapppush/deploy.go     |  14 +-
 src/jetstream/plugins/monocular/sync.go       |   6 +-
 src/jetstream/repository/cnsis/cnsis.go       |   1 +
 src/jetstream/repository/cnsis/pgsql_cnsis.go |  22 ++
 .../repository/interfaces/portal_proxy.go     |   2 +-
 .../repository/interfaces/structs.go          |  22 +-
 .../repository/tokens/pgsql_tokens.go         |  95 +++++
 src/jetstream/repository/tokens/tokens.go     |   4 +-
 src/jetstream/stringutils/utils.go            |   7 +-
 src/jetstream/version_info.go                 |   2 +-
 .../application-autoscaler-e2e.spec.ts        |  39 +-
 .../application/application-deploy-helper.ts  |   3 +-
 .../cf-level/manage-quota-e2e.spec.ts         |  17 +-
 .../cloud-foundry/invite-users-e2e.helper.ts  |   8 +-
 .../manage-users-stepper-e2e.spec.ts          |   2 +
 .../cloud-foundry/users-removal-e2e.helper.ts |  25 +-
 src/test-e2e/helpers/e2e-helpers.ts           |   8 +
 src/test-e2e/po/component.po.ts               |  14 +-
 src/test-e2e/po/form.po.ts                    |  42 ++-
 src/test-e2e/po/list.po.ts                    |  18 +-
 112 files changed, 2645 insertions(+), 272 deletions(-)
 create mode 100644 deploy/kubernetes/console/tests/config_init_test.yaml
 create mode 100644 deploy/kubernetes/console/tests/database-test.yaml
 create mode 100644 docs/cf-entity-scaling.md
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/backup-checkbox-cell/backup-checkbox-cell.component.html
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/backup-checkbox-cell/backup-checkbox-cell.component.scss
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/backup-checkbox-cell/backup-checkbox-cell.component.spec.ts
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/backup-checkbox-cell/backup-checkbox-cell.component.ts
 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
 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-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/backup-restore.types.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.theme.scss
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
 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
 create mode 100644 src/jetstream/plugins/backup/backup_restore.go
 create mode 100644 src/jetstream/plugins/backup/main.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 351a1f2096..ace65b5a25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # 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:**
+
+- 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)
+- 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/SUSE/stratos/compare/3.0.0...3.1.0)
diff --git a/build/tools/changelog.sh b/build/tools/changelog.sh
index 61affff09f..c1fd74daae 100755
--- a/build/tools/changelog.sh
+++ b/build/tools/changelog.sh
@@ -68,9 +68,9 @@ function log() {
 }
 
 COMPARE_REPO=${REPO}
-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"
   COMPARE_REPO=${FORK}
 fi
 
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"
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"
diff --git a/deploy/kubernetes/console/README.md b/deploy/kubernetes/console/README.md
index 5a03fedeba..dee1153dd4 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||
@@ -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
 
@@ -280,6 +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
@@ -291,7 +295,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/config-init.yaml b/deploy/kubernetes/console/templates/config-init.yaml
index 6313d3ab8c..e6d2f3582a 100644
--- a/deploy/kubernetes/console/templates/config-init.yaml
+++ b/deploy/kubernetes/console/templates/config-init.yaml
@@ -94,6 +94,12 @@ spec:
 {{ toYaml .Values.console.podExtraLabels | nindent 8 }}
 {{- end }}
     spec:
+{{- if .Values.configInit }}
+{{- if .Values.configInit.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.configInit.nodeSelector | trim  | indent 8 }}
+{{- end }}
+{{- end }}
       containers:
       - env:
         - name: "STRATOS_VOLUME_MIGRATION"
@@ -170,6 +176,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..2f23173f49 100644
--- a/deploy/kubernetes/console/templates/database.yaml
+++ b/deploy/kubernetes/console/templates/database.yaml
@@ -49,6 +49,12 @@ spec:
         {{ toYaml .Values.console.podExtraLabels | nindent 8 }}
         {{- end}}        
     spec:
+{{- if .Values.mariadb }}
+{{- if .Values.mariadb.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.mariadb.nodeSelector | trim | indent 8 }}
+{{- end }}
+{{- 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 c4123af521..b0aec9dc1b 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -47,6 +47,12 @@ spec:
 {{ toYaml .Values.console.podExtraLabels | indent 8 }}
 {{- end }}
     spec:
+{{- if .Values.console }}
+{{- if .Values.console.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.console.nodeSelector | trim | indent 8 }}
+{{- end }}
+{{- end }}
       containers:
       - image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.console}}:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
@@ -184,7 +190,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) }}
@@ -219,7 +233,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
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
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index 975a8073de..8c7a7cf614 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
@@ -104,6 +105,9 @@ console:
 
   # Extra labels to apply to Pods
   podExtraLabels: {}
+
+  # Node Selector for console Pod
+  nodeSelector: {}
   
 images:
   console: stratos-console
@@ -145,13 +149,24 @@ 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:
-  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 
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
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/package-lock.json b/package-lock.json
index e43b5be2d5..6a1d60bb3b 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 6bd5660b6f..558a6f881c 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": {
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/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/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/sass/_all-theme.scss b/src/frontend/packages/core/sass/_all-theme.scss
index 3daaa41180..4f657dbc93 100644
--- a/src/frontend/packages/core/sass/_all-theme.scss
+++ b/src/frontend/packages/core/sass/_all-theme.scss
@@ -65,7 +65,9 @@
 @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';
+@import '../../core/src/features/metrics/metrics/metrics.component.theme';
 
 // Defaults
 $side-nav-light-text: #fff;
@@ -159,6 +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 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/endpoints/backup-restore/backup-checkbox-cell/backup-checkbox-cell.component.html b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-checkbox-cell/backup-checkbox-cell.component.html
new file mode 100644
index 0000000000..3f240bbf9e
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-checkbox-cell/backup-checkbox-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-checkbox-cell/backup-checkbox-cell.component.scss b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-checkbox-cell/backup-checkbox-cell.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-checkbox-cell/backup-checkbox-cell.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-checkbox-cell/backup-checkbox-cell.component.spec.ts
new file mode 100644
index 0000000000..448a1eac17
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-checkbox-cell/backup-checkbox-cell.component.spec.ts
@@ -0,0 +1,45 @@
+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 { BackupCheckboxCellComponent } from './backup-checkbox-cell.component';
+
+describe('BackupCheckboxCellComponent', () => {
+  let component: BackupCheckboxCellComponent;
+  let fixture: ComponentFixture<BackupCheckboxCellComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [BackupCheckboxCellComponent],
+      imports: [
+        ...BaseTestModulesNoShared
+      ],
+      providers: [
+        BackupEndpointsService
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BackupCheckboxCellComponent);
+    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();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-checkbox-cell/backup-checkbox-cell.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-checkbox-cell/backup-checkbox-cell.component.ts
new file mode 100644
index 0000000000..0098d10c9b
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-checkbox-cell/backup-checkbox-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-checkbox-cell',
+  templateUrl: './backup-checkbox-cell.component.html',
+  styleUrls: ['./backup-checkbox-cell.component.scss']
+})
+export class BackupCheckboxCellComponent extends TableCellCustom<EndpointModel> {
+
+  constructor(public service: BackupEndpointsService) {
+    super();
+  }
+
+  validate() {
+    this.service.stateUpdated();
+  }
+
+  disabled(): boolean {
+    return !this.service.canBackupEndpoint(this.row, this.config.type);
+  }
+}
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..43e7eee490
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.html
@@ -0,0 +1,10 @@
+<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 [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>
+<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.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..09028f8d35
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.spec.ts
@@ -0,0 +1,43 @@
+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', () => {
+  let component: BackupConnectionCellComponent;
+  let fixture: ComponentFixture<BackupConnectionCellComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [
+        BackupConnectionCellComponent,
+      ],
+      imports: [
+        ...BaseTestModulesNoShared
+      ],
+      providers: [
+        BackupEndpointsService
+      ]
+    })
+      .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();
+  });
+
+  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..978f098196
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.ts
@@ -0,0 +1,36 @@
+import { Component, OnInit } from '@angular/core';
+
+import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
+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';
+
+@Component({
+  selector: 'app-backup-connection-cell',
+  templateUrl: './backup-connection-cell.component.html',
+  styleUrls: ['./backup-connection-cell.component.scss']
+})
+export class BackupConnectionCellComponent extends TableCellCustom<EndpointModel> implements OnInit {
+
+  connectable = false;
+  backupType = BackupEndpointTypes;
+  connectionTypes = BackupEndpointConnectionTypes;
+  selected: BackupEndpointConnectionTypes;
+  userConnectionWarning: string;
+
+  constructor(public service: BackupEndpointsService) {
+    super();
+  }
+
+  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
new file mode 100644
index 0000000000..d10c9144e8
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
@@ -0,0 +1,182 @@
+import { HttpClient, HttpParams } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+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 { EndpointModel } from '../../../../../store/src/types/endpoint.types';
+import { BrowserStandardEncoder } from '../../../helper';
+import {
+  BackupEndpointConfigUI,
+  BackupEndpointConnectionTypes,
+  BackupEndpointsConfig,
+  BackupEndpointTypes,
+  BaseEndpointConfig,
+} from './backup-restore.types';
+
+
+interface BackupRequest {
+  state: BackupEndpointsConfig<BaseEndpointConfig>;
+  password: string;
+}
+
+@Injectable()
+export class BackupEndpointsService {
+
+  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] = {
+        [BackupEndpointTypes.ENDPOINT]: false,
+        [BackupEndpointTypes.CONNECT]: BackupEndpointConnectionTypes.NONE,
+        entity
+      };
+    });
+    this.stateUpdated();
+  }
+
+  stateUpdated() {
+    const endpoints = Object.values(this.state);
+    endpoints.forEach(endpoint => {
+      if (!endpoint[BackupEndpointTypes.ENDPOINT]) {
+        endpoint[BackupEndpointTypes.CONNECT] = BackupEndpointConnectionTypes.NONE;
+      }
+    });
+
+    const hasChanges = !!endpoints.find(endpoint =>
+      endpoint[BackupEndpointTypes.ENDPOINT] ||
+      endpoint[BackupEndpointTypes.CONNECT] !== BackupEndpointConnectionTypes.NONE
+    );
+    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;
+      return e && c;
+    }
+
+    );
+    this.allChanged.next(allChanged);
+  }
+
+  canBackupEndpoint(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] || !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;
+    }
+
+    return true;
+  }
+
+  canBackup(): boolean {
+    return !!Object.values(this.state).length;
+  }
+
+  selectAll() {
+    Object.values(this.state).forEach(endpoint => {
+      if (this.canBackupEndpoint(endpoint.entity, BackupEndpointTypes.ENDPOINT)) {
+        endpoint[BackupEndpointTypes.ENDPOINT] = true;
+      }
+      if (this.canBackupEndpoint(endpoint.entity, BackupEndpointTypes.CONNECT)) {
+        endpoint[BackupEndpointTypes.CONNECT] = BackupEndpointConnectionTypes.ALL;
+      }
+    });
+    this.stateUpdated();
+  }
+
+  selectNone() {
+    Object.values(this.state).forEach(endpoint => {
+      endpoint[BackupEndpointTypes.ENDPOINT] = false;
+      endpoint[BackupEndpointTypes.CONNECT] = BackupEndpointConnectionTypes.NONE;
+    });
+    this.stateUpdated();
+  }
+
+  hasConnectionDetails(): boolean {
+    return !!Object.values(this.state).find(e => e[BackupEndpointTypes.CONNECT] !== BackupEndpointConnectionTypes.NONE);
+  }
+
+  // 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 => 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(): BackupRequest {
+    const state: BackupEndpointsConfig<BaseEndpointConfig> = Object.entries(this.state).reduce((res, [endpointId, endpoint]) => {
+      if (endpoint[BackupEndpointTypes.ENDPOINT]) {
+        const { entity, ...rest } = endpoint;
+        const requestConfig: BaseEndpointConfig = {
+          ...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..f11198e59d
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html
@@ -0,0 +1,43 @@
+<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 *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"
+          (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" [minRowHeight]="'77px'"></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">
+      <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>
+          <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>
\ 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..3ccb5308ed
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.spec.ts
@@ -0,0 +1,35 @@
+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', () => {
+  let component: BackupEndpointsComponent;
+  let fixture: ComponentFixture<BackupEndpointsComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [BackupEndpointsComponent],
+      imports: [
+        ...BaseTestModulesNoShared,
+        SharedModule
+      ],
+      providers: [
+        TabNavService
+      ]
+    })
+      .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..1d24656803
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
@@ -0,0 +1,187 @@
+import { Component } 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 } 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';
+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';
+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 { BackupEndpointTypes } from '../backup-restore.types';
+
+@Component({
+  selector: 'app-backup-endpoints',
+  templateUrl: './backup-endpoints.component.html',
+  styleUrls: ['./backup-endpoints.component.scss'],
+  providers: [
+    BackupEndpointsService
+  ]
+})
+export class BackupEndpointsComponent {
+
+  // Step 1
+  columns: ITableColumn<EndpointModel>[] = [
+    {
+      columnId: 'name',
+      headerCell: () => 'Name',
+      cellDefinition: {
+        valuePath: 'name'
+      }
+    },
+    {
+      columnId: 'type',
+      headerCell: () => 'Type',
+      cellDefinition: {
+        getValue: this.getEndpointTypeString
+      },
+    },
+    {
+      columnId: 'endpoint',
+      headerCell: () => 'Backup',
+      cellComponent: BackupCheckboxCellComponent,
+      cellConfig: {
+        type: BackupEndpointTypes.ENDPOINT
+      }
+    },
+    {
+      columnId: 'connect',
+      headerCell: () => 'Connection Details',
+      cellComponent: BackupConnectionCellComponent,
+    },
+  ];
+  endpointDataSource: ITableListDataSource<EndpointModel>;
+  disableSelectAll$: Observable<boolean>;
+  disableSelectNone$: Observable<boolean>;
+  selectValid$: Observable<boolean>;
+
+  // Step 2
+  passwordValid$: Observable<boolean>;
+  passwordForm: FormGroup;
+  show = false;
+
+  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, Validators.minLength(6)]),
+    });
+    this.passwordValid$ = this.passwordForm.statusChanges.pipe(
+      map(() => {
+        this.service.password = this.passwordForm.controls.password.value;
+        return this.passwordForm.valid;
+      })
+    );
+  }
+
+  onNext: StepOnNextFunction = () => {
+    const confirmation = new ConfirmationDialogConfig(
+      'Backup',
+      '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
+    );
+    const result = new Subject<StepOnNextResult>();
+
+    const userCancelledDialog = () => {
+      result.next({
+        success: false
+      });
+    };
+
+    const backupSuccess = data => {
+      const downloadURL = window.URL.createObjectURL(data);
+      const link = document.createElement('a');
+      link.href = downloadURL;
+      // Time of client, not server
+      const dateTime = moment().format('YYYYMMDD-HHmmss');
+      link.download = `stratos_backup_${dateTime}.bk`;
+      link.click();
+
+      result.next({
+        success: true,
+        redirect: true,
+      });
+    };
+
+    const backupFailure = err => {
+      const errorMessage = httpErrorResponseToSafeString(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);
+
+    if (this.service.hasConnectionDetails()) {
+      this.confirmDialog.openWithCancel(confirmation, createBackup, userCancelledDialog);
+    } else {
+      createBackup();
+    }
+
+    return result.asObservable();
+  }
+
+
+  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/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..089175d985
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.html
@@ -0,0 +1,12 @@
+<app-page-header>
+  <h1>Backup/Restore Endpoints</h1>
+</app-page-header>
+
+<app-steppers cancel="/endpoints">
+  <app-step [hideNextButton]="true">
+    <div class="tiles">
+      <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..528a5ee7a9
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.spec.ts
@@ -0,0 +1,35 @@
+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', () => {
+  let component: BackupRestoreEndpointsComponent;
+  let fixture: ComponentFixture<BackupRestoreEndpointsComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [BackupRestoreEndpointsComponent],
+      imports: [
+        ...BaseTestModulesNoShared,
+        SharedModule
+      ],
+      providers: [
+        TabNavService
+      ],
+    })
+      .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..615c1d2021
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.ts
@@ -0,0 +1,46 @@
+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 {
+
+  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/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
new file mode 100644
index 0000000000..8fa35048c1
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts
@@ -0,0 +1,141 @@
+import { HttpClient, HttpParams } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
+import { filter, 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';
+
+interface BackupContent {
+  payload: string;
+  dbVersion: number;
+}
+
+interface RestoreEndpointsData {
+  data: string;
+  password: string;
+  ignoreDbVersion: boolean;
+}
+
+@Injectable()
+export class RestoreEndpointsService {
+
+  // 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>;
+  unparsableFileContent: string = null;
+  currentDbVersion$: Observable<number>;
+  ignoreDbVersion = new BehaviorSubject(false);
+  ignoreDbVersion$ = this.ignoreDbVersion.asObservable();
+
+  // Step 2
+  private password: string;
+
+  constructor(
+    private store: Store<GeneralEntityAppState>,
+    private http: HttpClient,
+    private logger: LoggerService
+  ) {
+    this.setupStep1();
+  }
+
+  private setupStep1() {
+    this.currentDbVersion$ = this.store.select(selectSessionData()).pipe(
+      filter(sd => !!sd),
+      map((sd: SessionData) => sd.version.database_version)
+    );
+
+    this.validDb$ = combineLatest([
+      this.file$,
+      this.currentDbVersion$
+    ]).pipe(
+      filter(([file,]) => !!file && !!file.content),
+      map(([file, currentDbVersion]) => {
+        return file && file.content && 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> {
+    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) {
+    let parsedContent: BackupContent;
+    try {
+      parsedContent = JSON.parse(content);
+      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)}`;
+    }
+
+    this.file.next({
+      name: fileName,
+      content: parsedContent
+    });
+  }
+
+  setIgnoreDbVersion(ignore: boolean) {
+    this.ignoreDbVersion.next(ignore);
+  }
+
+  setPassword(password: string) {
+    this.password = password;
+  }
+
+  restoreBackup(): Observable<any> {
+    const url = '/pp/v1/endpoints/restore';
+    const fromObject = {};
+    const params: HttpParams = new HttpParams({
+      fromObject,
+      encoder: new BrowserStandardEncoder()
+    });
+
+    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
new file mode 100644
index 0000000000..1682c9b572
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html
@@ -0,0 +1,59 @@
+<app-page-header>
+  <h1>Restore Endpoints</h1>
+</app-page-header>
+
+<app-steppers cancel="/endpoints" [basePreviousRedirect]="{ path: '/endpoints/backup-restore' }">
+  <app-step title="File" [valid]="service.validFileContent$ | async">
+    <div class="file-step">
+      <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.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:&nbsp;
+              <code>{{service.unparsableFileContent}}</code>
+            </p>
+          </div>
+        </div>
+      </ng-container>
+    </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>
+          <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-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>
\ 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..7fb53ed32c
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.scss
@@ -0,0 +1,32 @@
+:host {
+  flex: 1;
+}
+.file-step {
+
+  &,
+  &__chunk {
+    display: flex;
+    flex-direction: column;
+  }
+  
+  &__input {
+    &--input {
+      height: 0;
+      visibility: hidden;
+      width: 0;
+    }
+    button {
+      margin-right: 5px;
+    }
+  }
+
+  &__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.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..ff141f7953
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.spec.ts
@@ -0,0 +1,35 @@
+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', () => {
+  let component: RestoreEndpointsComponent;
+  let fixture: ComponentFixture<RestoreEndpointsComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [RestoreEndpointsComponent],
+      imports: [
+        ...BaseTestModulesNoShared,
+        SharedModule
+      ],
+      providers: [
+        TabNavService
+      ]
+    })
+      .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.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
new file mode 100644
index 0000000000..2904f6024d
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
@@ -0,0 +1,105 @@
+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 } 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';
+import { ConfirmationDialogService } from '../../../../shared/components/confirmation-dialog.service';
+import { StepOnNextFunction, StepOnNextResult } from '../../../../shared/components/stepper/step/step.component';
+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 {
+
+  // Step 2
+  passwordValid$: Observable<boolean>;
+  passwordForm: FormGroup;
+  show = false;
+
+  constructor(
+    private store: Store<GeneralEntityAppState>,
+    public service: RestoreEndpointsService,
+    private confirmDialog: ConfirmationDialogService,
+  ) {
+    this.setupPasswordStep();
+  }
+
+  setupPasswordStep() {
+    this.passwordForm = new FormGroup({
+      password: new FormControl('', [Validators.required, Validators.minLength(6)]),
+    });
+    this.passwordValid$ = this.passwordForm.statusChanges.pipe(
+      map(() => {
+        this.service.setPassword(this.passwordForm.controls.password.value);
+        return this.passwordForm.valid;
+      })
+    );
+  }
+
+  onFileChange(event) {
+    const files = getEventFiles(event);
+    if (!files.length) {
+      return;
+    }
+    const file = files[0];
+    this.service.setFile(file);
+  }
+
+  onIgnoreDbChange(event: MatCheckboxChange) {
+    this.service.setIgnoreDbVersion(event.checked);
+  }
+
+  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 = () => {
+      this.store.dispatch(new GetAllEndpoints());
+      result.next({
+        success: true,
+        redirect: true,
+      });
+    };
+
+    const backupFailure = err => {
+      const errorMessage = httpErrorResponseToSafeString(err);
+      result.next({
+        success: false,
+        message: `Failed to restore backup` + (errorMessage ? `: ${errorMessage}` : '')
+      });
+      return of(false);
+    };
+
+    const restoreBackup = () => this.service.restoreBackup().pipe(first()).subscribe(restoreSuccess, backupFailure);
+
+    this.confirmDialog.openWithCancel(confirmation, restoreBackup, userCancelledDialog);
+
+    return result.asObservable();
+  }
+
+}
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/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 b68dec67b8..44a05e8e2a 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,23 @@
-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 { 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 {
+  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 +34,19 @@ import { EditEndpointComponent } from './edit-endpoint/edit-endpoint.component';
     NoneAuthFormComponent,
     EditEndpointComponent,
     EditEndpointStepComponent,
+    BackupRestoreEndpointsComponent,
+    BackupEndpointsComponent,
+    RestoreEndpointsComponent,
+    BackupCheckboxCellComponent,
+    BackupConnectionCellComponent,
   ],
   entryComponents: [
     ConnectEndpointDialogComponent,
     CredentialsAuthFormComponent,
     SSOAuthFormComponent,
-    NoneAuthFormComponent
+    NoneAuthFormComponent,
+    BackupCheckboxCellComponent,
+    BackupConnectionCellComponent
   ]
 })
 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/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.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/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/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."
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/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/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 a2638e2fd5..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
@@ -1,5 +1,6 @@
 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';
@@ -28,8 +29,6 @@ export class EndpointsListConfigService implements IListConfig<EndpointModel> {
 
   private singleActions: IListAction<EndpointModel>[];
 
-  private globalActions = [];
-
   public readonly columns: ITableColumn<EndpointModel>[] = [
     {
       columnId: 'name',
@@ -90,7 +89,6 @@ export class EndpointsListConfigService implements IListConfig<EndpointModel> {
     }
   ];
 
-
   isLocal = true;
   dataSource: EndpointsDataSource;
   viewType = ListViewTypes.BOTH;
@@ -108,7 +106,6 @@ export class EndpointsListConfigService implements IListConfig<EndpointModel> {
     internalEventMonitorFactory: InternalEventMonitorFactory,
     endpointListHelper: EndpointListHelper,
     favoritesConfigMapper: FavoritesConfigMapper,
-
   ) {
     this.singleActions = endpointListHelper.endpointActions();
     const favoriteCell = createTableColumnFavorite(
@@ -124,7 +121,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/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', () => {
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/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/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]) => {
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/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 6ec7c8e09a..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;
@@ -60,6 +61,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 3e01345e77..daf0ea3446 100644
--- a/src/jetstream/cnsi.go
+++ b/src/jetstream/cnsi.go
@@ -278,8 +278,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 {
diff --git a/src/jetstream/default.config.properties b/src/jetstream/default.config.properties
index c2856b2cb1..e45f461d9d 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/load_plugins.go b/src/jetstream/load_plugins.go
index c97c4ce2a9..188aef7b7c 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"
@@ -38,6 +39,7 @@ func (pp *portalProxy) loadPlugins() {
 		{"monocular", monocular.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/plugins/backup/backup_restore.go b/src/jetstream/plugins/backup/backup_restore.go
new file mode 100644
index 0000000000..7e6fd8df59
--- /dev/null
+++ b/src/jetstream/plugins/backup/backup_restore.go
@@ -0,0 +1,336 @@
+package backup
+
+import (
+	"crypto/sha256"
+	"database/sql"
+	"encoding/json"
+	"fmt"
+	"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"
+	"github.com/labstack/echo"
+	log "github.com/sirupsen/logrus"
+)
+
+type cnsiTokenBackup struct {
+	databaseConnectionPool *sql.DB
+	encryptionKey          []byte
+	userID                 string
+	dbVersion              int64
+	p                      interfaces.PortalProxy
+}
+
+// ConnectionType - Determine what kind of connection details are stored for an endpoint
+type ConnectionType string
+
+const (
+	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  ConnectionType `json:"connect"`
+}
+
+// BackupRequest - Request from client to create a back up file
+type BackupRequest struct {
+	State    map[string]BackupEndpointsState `json:"state"`
+	Password string                          `json:"password"`
+}
+
+// BackupContentPayload - Encrypted part of the backup
+type BackupContentPayload struct {
+	Endpoints []map[string]interface{}
+	Tokens    []interfaces.BackupTokenRecord
+}
+
+// BackupContent - Everything that's backed up and stored in a file client side
+type BackupContent struct {
+	Payload   []byte `json:"payload"`
+	DBVersion int64  `json:"dbVersion"`
+}
+
+// RestoreRequest - Request from client to restore content from payload
+type RestoreRequest struct {
+	// Data - Content of backup file. This should be of type BackupContent
+	Data            string `json:"data"`
+	Password        string `json:"password"`
+	IgnoreDbVersion bool   `json:"ignoreDbVersion"`
+}
+
+func (ctb *cnsiTokenBackup) BackupEndpoints(c echo.Context) error {
+	log.Debug("BackupEndpoints")
+
+	// 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)
+	}
+
+	data := &BackupRequest{}
+	if err = json.Unmarshal(body, data); err != nil {
+		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 {
+		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body - no endpoints to backup")
+	}
+
+	// Create backup
+	response, err := ctb.createBackup(data)
+	if err != nil {
+		return err
+	}
+
+	// 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)
+	}
+
+	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.NewHTTPShadowError(http.StatusBadGateway, "Failed to fetch endpoints", "Failed to fetch endpoints: %+v", err)
+	}
+
+	// Fetch/Format required data
+	endpoints := make([]map[string]interface{}, 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, serializeEndpoint(e))
+				break
+			}
+		}
+
+		switch connectionType := endpoint.Connect; connectionType {
+		case BACKUP_CONNECTION_ALL:
+			if tokenRecords, ok := ctb.getCNSITokenRecordsBackup(endpointID); ok {
+				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:
+			if tokenRecord, ok := ctb.p.GetCNSITokenRecordWithDisconnected(endpointID, ctb.userID); ok {
+				var btr = interfaces.BackupTokenRecord{
+					TokenRecord:  tokenRecord,
+					EndpointGUID: endpointID,
+					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, ctb.userID)
+				return nil, interfaces.NewHTTPError(http.StatusBadGateway, text)
+			}
+		}
+	}
+
+	// Create the payload, this will be encrypted
+	payload := &BackupContentPayload{
+		Endpoints: endpoints,
+		Tokens:    tokens,
+	}
+
+	// Encrypt the entire payload
+	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)
+	}
+
+	// Add the db version to the response, this will allow client side up front validation
+	response := &BackupContent{
+		Payload:   encryptedPayload,
+		DBVersion: ctb.dbVersion,
+	}
+
+	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.encryptionKey)
+	if err != nil {
+		return make([]interfaces.BackupTokenRecord, 0), false
+	}
+
+	return trs, true
+}
+
+func (ctb *cnsiTokenBackup) RestoreEndpoints(c echo.Context) error {
+	log.Debug("RestoreEndpoints")
+
+	// 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)
+	}
+
+	data := &RestoreRequest{}
+	if err = json.Unmarshal(body, data); err != nil {
+		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)
+	if err != nil {
+		return err
+	}
+
+	c.Response().WriteHeader(http.StatusOK)
+	return nil
+}
+
+func (ctb *cnsiTokenBackup) restoreBackup(backup *RestoreRequest) error {
+	log.Debug("restoreBackup")
+
+	data := &BackupContent{}
+	if err := json.Unmarshal([]byte(backup.Data), data); err != nil {
+		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 {
+		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)
+		}
+	}
+
+	// Get the actual, unencrypted set of endpoints and tokens
+	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)
+	}
+	payload := &BackupContentPayload{}
+	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)
+	}
+
+	for _, endpoint := range payload.Endpoints {
+		e := deSerializeEndpoint(endpoint)
+		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)
+		}
+	}
+
+	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 payload.Tokens {
+		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)
+		}
+	}
+
+	return nil
+}
+
+// Work around the omission of the client secret when serialising the cnsi record
+func serializeEndpoint(endpoint *interfaces.CNSIRecord) map[string]interface{} {
+	// Convert struct to generic map
+	m, _ := json.Marshal(endpoint)
+	var a interface{}
+	json.Unmarshal(m, &a)
+	newEndpoint := a.(map[string]interface{})
+
+	// Apply the correct client secret
+	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 {
+	// Convert struct to endpoint
+	m, _ := json.Marshal(endpoint)
+	var cnsi interfaces.CNSIRecord
+	json.Unmarshal(m, &cnsi)
+
+	// Apply the correct client secret
+	cnsi.ClientSecret = fmt.Sprintf("%v", endpoint["client_secret"])
+	return cnsi
+}
+
+func encryptPayload(payload *BackupContentPayload, password string) ([]byte, error) {
+	// First ensure the password is an ok length
+	secret, err := createHash(password)
+	if err != nil {
+		log.Warningf("Could not create hash: %+v", err)
+		return nil, fmt.Errorf("Could not create hash")
+	}
+
+	// Create the text that will be encrypted
+	payloadBytes, err := json.Marshal(payload)
+	if err != nil {
+		return nil, fmt.Errorf("Could not marshal payload: %+v", err)
+	}
+
+	// Encrypt
+	payloadEncrypted, err := crypto.EncryptToken(secret, string(payloadBytes))
+	if err != nil {
+		return nil, fmt.Errorf("Could not encrypt payload: %+v", err)
+	}
+
+	return payloadEncrypted, nil
+}
+
+func decryptPayload(payloadEncrypted []byte, password string) (*string, error) {
+	// First ensure the password is an ok length
+	secret, err := createHash(password)
+	if err != nil {
+		log.Warningf("Could not create hash: %+v", err)
+		return nil, fmt.Errorf("Could not create hash")
+	}
+
+	payloadUnencrypted, err := crypto.DecryptToken(secret, payloadEncrypted)
+	if err != nil {
+		return nil, fmt.Errorf("Failed to decrypt payload: %+v", err)
+	}
+
+	return &payloadUnencrypted, nil
+}
+
+// createHash - Ensure the token used by crypto is at an acceptable length
+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")
+	}
+	return hasher.Sum(nil), nil
+}
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/plugins/cfapppush/deploy.go b/src/jetstream/plugins/cfapppush/deploy.go
index 0bdc453ddb..a6f1ad7a47 100644
--- a/src/jetstream/plugins/cfapppush/deploy.go
+++ b/src/jetstream/plugins/cfapppush/deploy.go
@@ -479,13 +479,21 @@ 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)
 		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,
@@ -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,
diff --git a/src/jetstream/plugins/monocular/sync.go b/src/jetstream/plugins/monocular/sync.go
index 1c4d5969ce..ab1e6c3460 100644
--- a/src/jetstream/plugins/monocular/sync.go
+++ b/src/jetstream/plugins/monocular/sync.go
@@ -68,7 +68,7 @@ func (m *Monocular) Sync(action interfaces.EndpointAction, endpoint *interfaces.
 		Status: "Pending",
 		Busy:   true,
 	}
-	m.portalProxy.UpdateEndointMetadata(endpoint.GUID, marshalSyncMetadata(metadata))
+	m.portalProxy.UpdateEndpointMetadata(endpoint.GUID, marshalSyncMetadata(metadata))
 
 	// Add the job to the queue to be processed
 	job := SyncJob{
@@ -127,7 +127,7 @@ func (m *Monocular) processSyncRequests() {
 				Status: "Synchronizing",
 				Busy:   true,
 			}
-			m.portalProxy.UpdateEndointMetadata(job.Endpoint.GUID, marshalSyncMetadata(metadata))
+			m.portalProxy.UpdateEndpointMetadata(job.Endpoint.GUID, marshalSyncMetadata(metadata))
 			syncURL := fmt.Sprintf("%s%s/sync/%s", m.SyncServiceURL, chartRepoPathPrefix, job.Endpoint.Name)
 
 			//Hit the sync server container endpoint to trigger a sync for given repo
@@ -228,7 +228,7 @@ func marshalSyncMetadata(metadata SyncMetadata) string {
 }
 
 func (m *Monocular) updateMetadata(endpoint string, metadata SyncMetadata) {
-	err := m.portalProxy.UpdateEndointMetadata(endpoint, marshalSyncMetadata(metadata))
+	err := m.portalProxy.UpdateEndpointMetadata(endpoint, marshalSyncMetadata(metadata))
 	if err != nil {
 		log.Errorf("Failed to update endpoint metadata: %v+", err)
 	}
diff --git a/src/jetstream/repository/cnsis/cnsis.go b/src/jetstream/repository/cnsis/cnsis.go
index d18ddda5ef..0605361d72 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
+	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 7d8db3b2ff..b68bf4933f 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
@@ -59,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
@@ -349,3 +352,22 @@ func (p *PostgresCNSIRepository) UpdateMetadata(guid string, metadata string) er
 
 	return nil
 }
+
+// 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?
+	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)
+	}
+
+	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 ae4d45dcc5..909c91048b 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..43a45459f9 100644
--- a/src/jetstream/repository/tokens/pgsql_tokens.go
+++ b/src/jetstream/repository/tokens/pgsql_tokens.go
@@ -43,6 +43,10 @@ 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'`
 
+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,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)
@@ -323,6 +328,96 @@ 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)
+	}
+
+	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 == "" {
diff --git a/src/jetstream/repository/tokens/tokens.go b/src/jetstream/repository/tokens/tokens.go
index 05384df430..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 {
@@ -18,6 +19,7 @@ type Repository interface {
 
 	FindCNSIToken(cnsiGUID string, userGUID string, encryptionKey []byte) (interfaces.TokenRecord, error)
 	FindCNSITokenIncludeDisconnected(cnsiGUID string, userGUID 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..16e056bc17 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
@@ -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 {
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"
diff --git a/src/test-e2e/application/application-autoscaler-e2e.spec.ts b/src/test-e2e/application/application-autoscaler-e2e.spec.ts
index 2ac4460241..2ba7f2faf6 100644
--- a/src/test-e2e/application/application-autoscaler-e2e.spec.ts
+++ b/src/test-e2e/application/application-autoscaler-e2e.spec.ts
@@ -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();
           }
         });
diff --git a/src/test-e2e/application/application-deploy-helper.ts b/src/test-e2e/application/application-deploy-helper.ts
index 03f7c456a3..ab6b5a4057 100644
--- a/src/test-e2e/application/application-deploy-helper.ts
+++ b/src/test-e2e/application/application-deploy-helper.ts
@@ -207,8 +207,9 @@ export function createApplicationDeployTests(type = CREATE_APP_DEPLOY_TEST_TYPE.
       const overrides = deployApp.getOverridesForm();
       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 });
+        overrides.fill({ name: res.testAppName });
       }
 
       e2e.debugLog(`${loggingPrefix} Overrides Step - overrides set`);
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 f2fdc7f861..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,6 +58,8 @@ describe('Manage Users Stepper', () => {
     cfPage.goToUsersTab();
 
     const usersTable = new CFUsersListComponent();
+    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/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/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 784bf1a797..7ed4f5b704 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> {
@@ -53,6 +53,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/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 fc9ea870fb..4b1d2a9e43 100644
--- a/src/test-e2e/po/list.po.ts
+++ b/src/test-e2e/po/list.po.ts
@@ -98,11 +98,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'
     ));
   }
 
@@ -402,7 +404,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 9d199edf081b5cf24734e50f69e045c1f721b0fe Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 11 May 2020 17:11:23 +0100
Subject: [PATCH 499/648] WIP

---
 .../create-release.component.ts               |  36 ++-
 .../kubernetes/kubernetes-entity-catalog.ts   |  13 +-
 .../kubernetes/kubernetes-entity-generator.ts |   4 +-
 .../kubernetes-pod-containers.component.ts    |   1 +
 .../action-builders/kube.action-builders.ts   |  20 +-
 .../kubernetes/store/kubernetes.actions.ts    | 254 ++++++++++--------
 .../kubernetes/store/kubernetes.effects.ts    | 186 +++++--------
 .../helm-release-services-list-source.ts      |   5 +-
 .../kube-namespaces-filter-config.service.ts  |   6 +-
 .../helm-release-tab-base.component.ts        |  28 +-
 .../store/workloads-entity-factory.ts         |   8 +-
 .../store/workloads-entity-generator.ts       |   1 +
 .../workloads/store/workloads.actions.ts      |  18 +-
 .../src/store/app-autoscaler.actions.ts       |   3 +-
 .../src/store/autoscaler.effects.ts           |   2 +-
 .../src/actions/buildpack.action.ts           |   3 +-
 .../src/actions/domains.actions.ts            |   3 +-
 .../src/actions/quota-definitions.actions.ts  |   5 +-
 .../src/actions/relation.actions.ts           |  12 +-
 .../src/actions/security-groups-actions.ts    |   3 +-
 .../src/actions/service-bindings.actions.ts   |   3 +-
 .../src/actions/service-broker.actions.ts     |   3 +-
 .../service-plan-visibility.actions.ts        |   3 +-
 .../src/actions/service-plan.actions.ts       |   3 +-
 .../entity-relations-validate.spec.ts         |  17 +-
 .../packages/store/src/types/request.types.ts |   2 +-
 26 files changed, 326 insertions(+), 316 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 60dd7f0190..c9c1a14fc6 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
@@ -7,18 +7,20 @@ import { Store } from '@ngrx/store';
 import { PaginationMonitorFactory } from 'frontend/packages/store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from 'frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { BehaviorSubject, combineLatest, Observable, of, Subscription } from 'rxjs';
-import { distinctUntilChanged, filter, first, map, pairwise, startWith, switchMap } from 'rxjs/operators';
+import { distinctUntilChanged, filter, first, map, pairwise, startWith, switchMap, tap } from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
+import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
+import { RequestInfoState } from '../../../../../store/src/reducers/api-request-reducer/types';
 import { EndpointsService } from '../../../core/endpoints.service';
 import { safeUnsubscribe } from '../../../core/utils.service';
 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';
+import { kubeEntityCatalog } from '../../kubernetes/kubernetes-entity-catalog';
 import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes/kubernetes-entity-factory';
 import { KubernetesNamespace } from '../../kubernetes/store/kube.types';
-import { CreateKubernetesNamespace, GetKubernetesNamespaces } from '../../kubernetes/store/kubernetes.actions';
+import { GetKubernetesNamespaces } from '../../kubernetes/store/kubernetes.actions';
 import { HelmInstall } from '../store/helm.actions';
 import { HelmInstallValues } from '../store/helm.types';
 
@@ -64,7 +66,8 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     private store: Store<AppState>,
     private httpClient: HttpClient,
     private confirmDialog: ConfirmationDialogService,
-    private pmf: PaginationMonitorFactory
+    private pmf: PaginationMonitorFactory, // TODO: RC search and destroy
+    private emf: EntityMonitorFactory // TODO: RC search and destroy
   ) {
     const chart = this.route.snapshot.params;
     this.cancelUrl = `/monocular/charts/${chart.repo}/${chart.chartName}/${chart.version}`;
@@ -103,6 +106,7 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
       action,
       paginationMonitor: this.pmf.create(action.paginationKey, action, true)
     }).entities$.pipe(
+      tap(a => console.log(action, a)),
       filter(namespaces => !!namespaces),
       first()
     );
@@ -112,15 +116,18 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
       this.details.controls.releaseNamespace.valueChanges.pipe(startWith(''), distinctUntilChanged())
     ]).pipe(
       // Filter out namespaces from other kubes
+      tap(a => console.log(1, a)),
       map(([namespaces, kubeId, namespace]: [KubernetesNamespace[], string, string]) => ([
         namespaces.filter(ns => ns.metadata.kubeId === kubeId),
         namespace
       ])),
+      tap(a => console.log(2, a)),
       // Map to endpoint names
       map(([namespaces, namespace]: [KubernetesNamespace[], string]) => [
         namespaces.map(ns => ns.metadata.name),
         namespace
       ]),
+      tap(a => console.log(3, a)),
       // Filter out namespaces not matching existing text
       map(([namespaces, namespace]: [string[], string]) => this.filterTyped(namespaces, namespace)),
     );
@@ -233,14 +240,10 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
       });
     }
 
-    const action = new CreateKubernetesNamespace(
+    return kubeEntityCatalog.namespace.api.create<RequestInfoState>(
       this.details.controls.releaseNamespace.value,
-      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(
+      this.details.controls.endpoint.value
+    ).pipe(
       pairwise(),
       filter(([oldVal, newVal]) => oldVal.creating && !newVal.creating),
       map(([, newVal]) => newVal),
@@ -267,14 +270,19 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
       chart: this.route.snapshot.params
     };
 
+    // TODO: RC
     // Make the request
     const action = new HelmInstall(values);
     this.store.dispatch(action);
 
-    const releaseEntityConfig = entityCatalog.getEntity(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(
+      // Wait for result of request
+      // return releaseEntityConfig.getEntityMonitor(this.store, action.guid).entityRequest$.pipe(
       filter(state => !!state),
       pairwise(),
       filter(([oldVal, newVal]) => (oldVal.creating && !newVal.creating)),
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts
index dbadecc336..8aab0f5479 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts
@@ -1,7 +1,18 @@
+import { StratosCatalogEntity } from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types';
+import { KubeNamespaceActionBuilders } from './store/action-builders/kube.action-builders';
+import { KubernetesNamespace } from './store/kube.types';
+
 /**
  * A strongly typed collection of Kube Catalog Entities.
  * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc
  */
 export class KubeEntityCatalog {
 
-}
\ No newline at end of file
+  public namespace: StratosCatalogEntity<IFavoriteMetadata, KubernetesNamespace, KubeNamespaceActionBuilders>;
+
+}
+
+
+
+export const kubeEntityCatalog: KubeEntityCatalog = new KubeEntityCatalog();
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 7beff79804..38b9d860ab 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
@@ -20,6 +20,7 @@ import {
   KubernetesConfigAuthFormComponent,
 } from './auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component';
 import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component';
+import { kubeEntityCatalog } from './kubernetes-entity-catalog';
 import {
   KUBERNETES_ENDPOINT_TYPE,
   kubernetesAppsEntityType,
@@ -242,9 +243,10 @@ function generateNamespacesEntity(endpointDefinition: StratosEndpointExtensionDe
     schema: kubernetesEntityFactory(kubernetesNamespacesEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesNamespace, KubeNamespaceActionBuilders>(definition, {
+  kubeEntityCatalog.namespace = new StratosCatalogEntity<IFavoriteMetadata, KubernetesNamespace, KubeNamespaceActionBuilders>(definition, {
     actionBuilders: kubeNamespaceActionBuilders
   });
+  return kubeEntityCatalog.namespace;
 }
 
 function generateServicesEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
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 f83718f337..a2d755a21d 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
@@ -46,6 +46,7 @@ export class KubernetesPodContainersComponent extends CardCell<KubernetesPod> {
     if (!row || !!this.containerDataSource) {
       return;
     }
+    // TODO: RC 
     this.containerDataSource = {
       isTableLoading$: of(false),
       connect: () => this.store.select<KubernetesPod>(selectEntity(this.entityConfig.entityKey, row.metadata.uid)).pipe(
diff --git a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts
index 0ca8312580..9f6eee394f 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts
@@ -1,7 +1,12 @@
 import {
   OrchestratedActionBuilders,
 } from '../../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
-import { GetKubernetesNode, GetKubernetesNodes } from '../kubernetes.actions';
+import {
+  CreateKubernetesNamespace,
+  GetKubernetesNamespace,
+  GetKubernetesNode,
+  GetKubernetesNodes,
+} from '../kubernetes.actions';
 
 export interface KubeAppActionBuilders extends OrchestratedActionBuilders {
 
@@ -43,15 +48,24 @@ export interface KubeNodeActionBuilders extends OrchestratedActionBuilders {
 }
 
 export const kubeNodeActionBuilders: KubeNodeActionBuilders = {
-  get: (nodeName: string, endpointGuid: string) => new GetKubernetesNode()
+  get: (nodeName: string, endpointGuid: string) => new GetKubernetesNode(nodeName, endpointGuid),
   getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesNodes(kubeGuid)
 }
 
 export interface KubeNamespaceActionBuilders extends OrchestratedActionBuilders {
-
+  get: (
+    namespace: string,
+    kubeGuid: string
+  ) => GetKubernetesNamespace;
+  create: (
+    namespace: string,
+    kubeGuid: string
+  ) => CreateKubernetesNamespace;
 }
 
 export const kubeNamespaceActionBuilders: KubeNamespaceActionBuilders = {
+  get: (namespace: string, kubeGuid: string) => new GetKubernetesNamespace(namespace, kubeGuid),
+  create: (namespace: string, kubeGuid: string) => new CreateKubernetesNamespace(namespace, kubeGuid)
 }
 
 export interface KubeServiceActionBuilders extends OrchestratedActionBuilders {
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 ac98e0735f..fbf8a06d69 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
@@ -17,7 +17,14 @@ import {
   kubernetesServicesEntityType,
   kubernetesStatefulSetsEntityType,
 } from '../kubernetes-entity-factory';
-import { getKubeAPIResourceGuid } from './kube.selectors';
+import {
+  KubernetesDeployment,
+  KubernetesNamespace,
+  KubernetesNode,
+  KubernetesPod,
+  KubernetesStatefulSet,
+  KubeService,
+} from './kube.types';
 
 export const GET_RELEASE_POD_INFO = '[KUBERNETES Endpoint] Get Release Pods Info';
 export const GET_RELEASE_POD_INFO_SUCCESS = '[KUBERNETES Endpoint] Get Release Pods Info Success';
@@ -82,41 +89,45 @@ export const GET_KUBE_DASHBOARD_SUCCESS = '[KUBERNETES Endpoint] Get Dashboard S
 export const GET_KUBE_DASHBOARD_FAILURE = '[KUBERNETES Endpoint] Get Dashboard Failure';
 
 
-const sortPodsByName = {
+const defaultSortParams = {
   'order-direction': 'desc' as SortDirection,
   'order-direction-field': 'name'
 };
 
+const deliminate = (...args: string[]) => args.join('_:_');
+
 export interface KubeAction extends EntityRequestAction {
   kubeGuid: string;
 }
-export interface KubePaginationAction extends PaginatedAction, KubeAction {
-  getId: (r: any) => string;
+export interface KubePaginationAction<T = any> extends PaginatedAction, KubeAction {
+  getId: (r: T, kubeGuid: string) => string;
 }
 export interface KubeSingleEntityAction extends KubeAction {
   guid: string;
 }
 
-export class KubeHealthCheck implements KubePaginationAction {
-  constructor(public kubeGuid) {
-    this.paginationKey = kubeGuid + '-health-check';
+export class GetKubernetesNode implements KubeSingleEntityAction {
+  static getGuid(kubeGuid: string, nodeName: string): string {
+    return deliminate(nodeName, kubeGuid);
   }
-  initialParams = {
-    limit: 1
-  };
-  type = GET_NODES_INFO;
+
+  constructor(public nodeName: string, public kubeGuid: string) {
+    this.guid = GetKubernetesNode.getGuid(kubeGuid, nodeName);
+  }
+  type = GET_NODE_INFO;
   entityType = kubernetesNodesEntityType;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = [kubernetesEntityFactory(kubernetesNodesEntityType)];
+
   actions = [
-    GET_NODES_INFO,
-    GET_NODES_INFO_SUCCESS,
-    GET_NODES_INFO_FAILURE
+    GET_NODE_INFO,
+    GET_NODE_INFO_SUCCESS,
+    GET_NODE_INFO_FAILURE
   ];
-  paginationKey: string;
+  guid: string;
 }
 
-export class GetKubernetesNodes implements KubePaginationAction {
+export class GetKubernetesNodes implements KubePaginationAction<KubernetesNode> {
   constructor(public kubeGuid) {
     this.paginationKey = getPaginationKey(kubernetesNodesEntityType, kubeGuid);
   }
@@ -130,32 +141,41 @@ export class GetKubernetesNodes implements KubePaginationAction {
     GET_NODES_INFO_FAILURE
   ];
   paginationKey: string;
-  initialParams = {
-    'order-direction': 'desc' as SortDirection,
-    'order-direction-field': 'name'
+  initialParams: PaginationParam = {
+    ...defaultSortParams
   };
-  getId = getKubeAPIResourceGuid;
+  getId = (node: KubernetesNode, kubeGuid: string) => GetKubernetesNode.getGuid(kubeGuid, node.metadata.name);
 }
 
-export class GetKubernetesNode implements KubeSingleEntityAction {
-  constructor(public nodeName: string, public kubeGuid: string) {
-    this.guid = this.nodeName;
+export class KubeHealthCheck extends GetKubernetesNodes {
+  constructor(kubeGuid) {
+    super(kubeGuid);
+    this.paginationKey = kubeGuid + '-health-check';
+    this.initialParams.limit = 1;
   }
-  type = GET_NODE_INFO;
-  entityType = kubernetesNodesEntityType;
-  endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesNodesEntityType)];
+}
 
-  actions = [
-    GET_NODE_INFO,
-    GET_NODE_INFO_SUCCESS,
-    GET_NODE_INFO_FAILURE
-  ];
-  guid: string;
+export class CreateKubernetesNamespace implements KubeSingleEntityAction {
+  public guid: string;
+  constructor(public namespaceName: string, public kubeGuid: string) {
+    this.guid = GetKubernetesNamespace.getGuid(kubeGuid, namespaceName); // TODO: RC shouldn't be 'creating-guid'?
+  }
+
+  type = CREATE_NAMESPACE;
+  entityType = kubernetesNamespacesEntityType;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
+  entity = [kubernetesEntityFactory(kubernetesNamespacesEntityType)];
+  actions = getActions('Namespace', 'Create');
+  requestType: ApiRequestTypes = 'create';
 }
 
 export class GetKubernetesNamespace implements KubeSingleEntityAction {
+  static getGuid(kubeGuid: string, namespaceName: string): string {
+    return deliminate(namespaceName, kubeGuid);
+  }
+
   constructor(public namespaceName: string, public kubeGuid: string) {
+    this.guid = GetKubernetesNamespace.getGuid(this.kubeGuid, this.namespaceName);
   }
   type = GET_NAMESPACE_INFO;
   entityType = kubernetesNamespacesEntityType;
@@ -167,23 +187,51 @@ export class GetKubernetesNamespace implements KubeSingleEntityAction {
     GET_NAMESPACE_INFO_SUCCESS,
     GET_NAMESPACE_INFO_FAILURE
   ];
+  guid: string;
 }
 
-export class CreateKubernetesNamespace implements KubeSingleEntityAction {
-  public guid: string;
-  constructor(public namespaceName: string, public kubeGuid: string) {
-    this.guid = `Creating-${namespaceName}-${kubeGuid}`;
+export class GetKubernetesNamespaces implements KubePaginationAction<KubernetesNamespace> {
+  constructor(public kubeGuid: string) {
+    this.paginationKey = getPaginationKey(kubernetesNamespacesEntityType, kubeGuid || 'all');
   }
-
-  type = CREATE_NAMESPACE;
+  type = GET_NAMESPACES_INFO;
   entityType = kubernetesNamespacesEntityType;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = [kubernetesEntityFactory(kubernetesNamespacesEntityType)];
-  actions = getActions('Namespace', 'Create');
-  requestType: ApiRequestTypes = 'create';
+  actions = [
+    GET_NAMESPACES_INFO,
+    GET_NAMESPACES_INFO_SUCCESS,
+    GET_NAMESPACES_INFO_FAILURE
+  ];
+  paginationKey: string;
+  initialParams = {
+    ...defaultSortParams
+  };
+  getId = (namespace: KubernetesNamespace, kubeGuid: string): string => GetKubernetesNamespace.getGuid(kubeGuid, namespace.metadata.name);
+}
+
+export class GetKubernetesPod implements KubeSingleEntityAction {
+  static getId(kubeGuid: string, namespace: string, podName: string): string { // TODO: RC id/guid naming
+    return deliminate(podName, namespace, kubeGuid);
+  }
+
+  // static 
+  constructor(public podName, public namespaceName, public kubeGuid) {
+    this.guid = GetKubernetesPod.getId(kubeGuid, namespaceName, podName);
+  }
+  type = GET_KUBE_POD;
+  entityType = kubernetesPodsEntityType;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
+  entity = [kubernetesEntityFactory(kubernetesPodsEntityType)];
+  actions = [
+    GET_KUBE_POD,
+    GET_KUBE_POD_SUCCESS,
+    GET_KUBE_POD_FAILURE
+  ];
+  guid: string;
 }
 
-export class GetKubernetesPods implements KubePaginationAction {
+export class GetKubernetesPods implements KubePaginationAction<KubernetesPod> {
   constructor(public kubeGuid) {
     this.paginationKey = getPaginationKey(kubernetesPodsEntityType, 'k8', kubeGuid);
   }
@@ -197,91 +245,43 @@ export class GetKubernetesPods implements KubePaginationAction {
     GET_POD_INFO_FAILURE
   ];
   paginationKey: string;
-  initialParams = {
-    ...sortPodsByName
+  initialParams: PaginationParam = {
+    ...defaultSortParams
   };
+  getId = (pod: KubernetesPod, kubeGuid: string) => GetKubernetesPod.getId(kubeGuid, pod.metadata.namespace, pod.metadata.name);
 }
 
-export class GetKubernetesPodsOnNode implements KubePaginationAction {
-  constructor(public kubeGuid: string, public nodeName: string) {
+export class GetKubernetesPodsOnNode extends GetKubernetesPods {
+  constructor(kubeGuid: string, public nodeName: string) {
+    super(kubeGuid)
     this.paginationKey = getPaginationKey(kubernetesPodsEntityType, `node-${nodeName}`, kubeGuid);
-    this.initialParams = {
-      fieldSelector: `spec.nodeName=${nodeName}`,
-      ...sortPodsByName
-    };
+    this.initialParams.fieldSelector = `spec.nodeName=${nodeName}`;
   }
   type = GET_PODS_ON_NODE_INFO;
-  entityType = kubernetesPodsEntityType;
-  endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesPodsEntityType)];
   actions = [
     GET_PODS_ON_NODE_INFO,
     GET_PODS_ON_NODE_INFO_SUCCESS,
     GET_PODS_ON_NODE_INFO_FAILURE
   ];
-  paginationKey: string;
-  initialParams: PaginationParam;
 }
 
-export class GetKubernetesServicesInNamespace implements KubePaginationAction {
-  constructor(public kubeGuid: string, public namespaceName: string) {
-    this.paginationKey = getPaginationKey(kubernetesPodsEntityType, `ns-${namespaceName}`, kubeGuid);
-  }
-  type = GET_SERVICES_IN_NAMESPACE_INFO;
-  entityType = kubernetesServicesEntityType;
-  endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesServicesEntityType)];
-  actions = [
-    GET_SERVICES_IN_NAMESPACE_INFO,
-    GET_SERVICES_IN_NAMESPACE_INFO_SUCCESS,
-    GET_SERVICES_IN_NAMESPACE_INFO_FAILURE
-  ];
-  paginationKey: string;
-  initialParams = {
-    ...sortPodsByName
-  };
-}
-
-export class GetKubernetesPodsInNamespace implements KubePaginationAction {
-  constructor(public kubeGuid: string, public namespaceName: string) {
+export class GetKubernetesPodsInNamespace extends GetKubernetesPods {
+  constructor(kubeGuid: string, public namespaceName: string) {
+    super(kubeGuid);
     this.paginationKey = getPaginationKey(kubernetesPodsEntityType, `ns-${namespaceName}`, kubeGuid);
   }
   type = GET_PODS_IN_NAMESPACE_INFO;
-  entityType = kubernetesPodsEntityType;
-  endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesPodsEntityType)];
   actions = [
     GET_PODS_IN_NAMESPACE_INFO,
     GET_PODS_IN_NAMEPSACE_INFO_SUCCESS,
     GET_PODS_IN_NAMEPSACE_INFO_FAILURE
   ];
-  paginationKey: string;
-  initialParams = {
-    ...sortPodsByName
-  };
 }
 
-export class GetKubernetesNamespaces implements KubePaginationAction {
-  constructor(public kubeGuid: string) {
-    this.paginationKey = getPaginationKey(kubernetesNamespacesEntityType, kubeGuid || 'all');
+export class GetKubernetesServices implements KubePaginationAction<KubeService> {
+  static getId(kubeGuid: string, namespace: string, serviceName: string): string { // TODO: RC id/guid naming
+    return deliminate(serviceName, namespace, kubeGuid);
   }
-  type = GET_NAMESPACES_INFO;
-  entityType = kubernetesNamespacesEntityType;
-  endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesNamespacesEntityType)];
-  actions = [
-    GET_NAMESPACES_INFO,
-    GET_NAMESPACES_INFO_SUCCESS,
-    GET_NAMESPACES_INFO_FAILURE
-  ];
-  paginationKey: string;
-  initialParams = {
-    'order-direction': 'desc' as SortDirection,
-    'order-direction-field': 'name'
-  };
-}
-
-export class GetKubernetesServices implements KubePaginationAction {
   constructor(public kubeGuid) {
     this.paginationKey = getPaginationKey(kubernetesServicesEntityType, kubeGuid);
   }
@@ -295,27 +295,36 @@ export class GetKubernetesServices implements KubePaginationAction {
     GET_SERVICE_INFO_FAILURE
   ];
   paginationKey: string;
-  initialParams = {
-    'order-direction': 'desc' as SortDirection,
-    'order-direction-field': 'name'
+  initialParams: PaginationParam = {
+    ...defaultSortParams
   };
+  getId = (service: KubeService, kubeGuid: string) => GetKubernetesServices.getId(kubeGuid, service.metadata.namespace, service.metadata.name);
 }
 
-export class GetKubernetesPod implements KubeSingleEntityAction {
-  constructor(public podName, public namespaceName, public kubeGuid) {
+export class GetKubernetesServicesInNamespace extends GetKubernetesServices {
+  constructor(kubeGuid: string, public namespaceName: string) {
+    super(kubeGuid);
+    // TODO: RC Check all for guid AND uniqueness
+    this.paginationKey = getPaginationKey(kubernetesPodsEntityType, namespaceName, kubeGuid);
   }
-  type = GET_KUBE_POD;
-  entityType = kubernetesPodsEntityType;
-  endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesPodsEntityType)];
   actions = [
-    GET_KUBE_POD,
-    GET_KUBE_POD_SUCCESS,
-    GET_KUBE_POD_FAILURE
+    GET_SERVICES_IN_NAMESPACE_INFO,
+    GET_SERVICES_IN_NAMESPACE_INFO_SUCCESS,
+    GET_SERVICES_IN_NAMESPACE_INFO_FAILURE
   ];
 }
 
-export class GetKubernetesStatefulSets implements KubePaginationAction {
+// TODO: RC
+// Create name
+// delete name
+// create with same name.. same
+
+
+export class GetKubernetesStatefulSets implements KubePaginationAction<KubernetesStatefulSet> {
+  static getId(kubeGuid: string, namespace: string, name: string): string {
+    return deliminate(name, namespace, kubeGuid); // TODO: RC check
+  }
+
   constructor(public kubeGuid) {
     this.paginationKey = getPaginationKey(kubernetesStatefulSetsEntityType, kubeGuid);
   }
@@ -329,9 +338,13 @@ export class GetKubernetesStatefulSets implements KubePaginationAction {
     GET_KUBE_STATEFULSETS_FAILURE
   ];
   paginationKey: string;
+  getId = (statefulSet: KubernetesStatefulSet, kubeGuid: string) => GetKubernetesStatefulSets.getId(kubeGuid, statefulSet.metadata.namespace, statefulSet.metadata.name);
 }
 
-export class GeKubernetesDeployments implements KubePaginationAction {
+export class GeKubernetesDeployments implements KubePaginationAction<KubernetesDeployment> {
+  static getId(kubeGuid: string, namespace: string, name: string): string {
+    return deliminate(name, namespace, kubeGuid); // TODO: RC check
+  }
   constructor(public kubeGuid) {
     this.paginationKey = getPaginationKey(kubernetesDeploymentsEntityType, kubeGuid);
   }
@@ -345,11 +358,15 @@ export class GeKubernetesDeployments implements KubePaginationAction {
     GET_KUBE_DEPLOYMENT_FAILURE
   ];
   paginationKey: string;
+  getId = (deployment: KubernetesDeployment, kubeGuid: string) => GeKubernetesDeployments.getId(kubeGuid, deployment.metadata.namespace, deployment.metadata.name);
 }
 
 export class GetKubernetesDashboard implements KubeSingleEntityAction {
+  static getId(kubeGuid: string): string {
+    return kubeGuid;
+  }
   constructor(public kubeGuid: string) {
-    this.guid = this.getId();
+    this.guid = GetKubernetesDashboard.getId(kubeGuid);
   }
   type = GET_KUBE_DASHBOARD;
   entityType = kubernetesDashboardEntityType;
@@ -361,7 +378,6 @@ export class GetKubernetesDashboard implements KubeSingleEntityAction {
     GET_KUBE_DASHBOARD_SUCCESS,
     GET_KUBE_DASHBOARD_FAILURE
   ];
-  getId = () => this.kubeGuid;
   guid: string;
 }
 
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 55d6ccc0f8..cf3c752176 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
@@ -21,15 +21,9 @@ import { isJetstreamError } from '../../../jetstream.helpers';
 import {
   KUBERNETES_ENDPOINT_TYPE,
   kubernetesDashboardEntityType,
-  kubernetesDeploymentsEntityType,
-  kubernetesNamespacesEntityType,
-  kubernetesNodesEntityType,
   kubernetesPodsEntityType,
-  kubernetesServicesEntityType,
-  kubernetesStatefulSetsEntityType,
 } from '../kubernetes-entity-factory';
 import { KubernetesPodExpandedStatusHelper } from '../services/kubernetes-expanded-state';
-import { getKubeAPIResourceGuid } from './kube.selectors';
 import {
   BasicKubeAPIResource,
   KubernetesDeployment,
@@ -150,172 +144,133 @@ export class KubernetesEffects {
   @Effect()
   fetchNodeInfo$ = this.actions$.pipe(
     ofType<GetKubernetesNode>(GET_NODE_INFO),
-    flatMap(action => {
-      const nodeEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesEntityType);
-      return this.processSingleItemAction<KubernetesNode>(action,
-        `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes/${action.nodeName}`,
-        nodeEntityConfig.entityKey);
-    })
+    flatMap(action => this.processSingleItemAction<KubernetesNode>(
+      action,
+      `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes/${action.nodeName}`
+    ))
   );
 
   @Effect()
   fetchNamespaceInfo$ = this.actions$.pipe(
     ofType<GetKubernetesNamespace>(GET_NAMESPACE_INFO),
-    flatMap(action => {
-      const namespaceEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNamespacesEntityType);
-      return this.processSingleItemAction<KubernetesNamespace>(action,
-        `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}`,
-        namespaceEntityConfig.entityKey,
-        getKubeAPIResourceGuid); // TODO: RC HERE
-    })
+    flatMap(action => this.processSingleItemAction<KubernetesNamespace>(
+      action,
+      `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}`)
+    )
   );
 
   @Effect()
   fetchPodsInfo$ = this.actions$.pipe(
     ofType<GetKubernetesPods>(GET_POD_INFO),
-    flatMap(action => {
-      const podsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType);
-      return this.processListAction<KubernetesPod>(action,
-        `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`,
-        podsEntityConfig.entityKey,
-        getKubeAPIResourceGuid
-      );
-    })
+    flatMap(action => this.processListAction<KubernetesPod>(
+      action,
+      `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`
+    ))
   );
 
   @Effect()
   fetchPodsOnNodeInfo$ = this.actions$.pipe(
     ofType<GetKubernetesPodsOnNode>(GET_PODS_ON_NODE_INFO),
-    flatMap(action => {
-      const podsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType);
-      return this.processListAction<KubernetesPod>(action,
+    flatMap(action =>
+      this.processListAction<KubernetesPod>(
+        action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`,
-        podsEntityConfig.entityKey,
-        getKubeAPIResourceGuid
-      );
-    })
+        // Note - filtering done via param in action
+      )
+    )
   );
 
   @Effect()
   fetchPodsInNamespaceInfo$ = this.actions$.pipe(
     ofType<GetKubernetesPodsInNamespace>(GET_PODS_IN_NAMESPACE_INFO),
-    flatMap(action => {
-      const podsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType);
-      return this.processListAction<KubernetesPod>(action,
-        `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/pods`,
-        podsEntityConfig.entityKey,
-        getKubeAPIResourceGuid
-      );
-    })
+    flatMap(action => this.processListAction<KubernetesPod>(
+      action,
+      `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/pods`,
+    ))
   );
 
   @Effect()
   fetchServicesInNamespaceInfo$ = this.actions$.pipe(
     ofType<GetKubernetesServicesInNamespace>(GET_SERVICES_IN_NAMESPACE_INFO),
-    flatMap(action => {
-      const servicesEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesServicesEntityType);
-      return this.processListAction<KubeService>(action,
-        `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/services`,
-        servicesEntityConfig.entityKey,
-        getKubeAPIResourceGuid
-      );
-    })
+    flatMap(action => this.processListAction<KubeService>(
+      action,
+      `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/services`,
+    ))
   );
 
   @Effect()
   fetchPodInfo$ = this.actions$.pipe(
     ofType<GetKubernetesPod>(GET_KUBE_POD),
-    flatMap(action => {
-      const podsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType);
-      return this.processListAction<KubernetesPod>(action,
-        `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/pods/${action.podName}`,
-        podsEntityConfig.entityKey,
-        getKubeAPIResourceGuid
-      );
-    })
+    flatMap(action => this.processSingleItemAction<KubernetesPod>(
+      action,
+      `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/pods/${action.podName}`,
+    ))
   );
 
   @Effect()
   fetchServicesInfo$ = this.actions$.pipe(
     ofType<GetKubernetesServices>(GET_SERVICE_INFO),
-    flatMap(action => {
-      const servicesEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesServicesEntityType);
-      return this.processListAction<KubeService>(action,
-        `/pp/${this.proxyAPIVersion}/proxy/api/v1/services`,
-        servicesEntityConfig.entityKey,
-        getKubeAPIResourceGuid);
-    })
+    flatMap(action => this.processListAction<KubeService>(
+      action,
+      `/pp/${this.proxyAPIVersion}/proxy/api/v1/services`,
+    ))
   );
 
   @Effect()
   fetchNamespacesInfo$ = this.actions$.pipe(
     ofType<GetKubernetesNamespaces>(GET_NAMESPACES_INFO),
-    flatMap(action => {
-      const namespaceEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNamespacesEntityType);
-      return this.processListAction<KubernetesNamespace>(action,
-        `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces`,
-        namespaceEntityConfig.entityKey,
-        getKubeAPIResourceGuid);
-    })
+    flatMap(action => this.processListAction<KubernetesNamespace>(
+      action,
+      `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces`,
+    ))
   );
 
 
   @Effect()
   createNamespace$ = this.actions$.pipe(
     ofType<CreateKubernetesNamespace>(CREATE_NAMESPACE),
-    flatMap(action => {
-      const namespaceEntityConfig = entityCatalog.getEntity(action);
-      return this.processSingleItemAction<KubernetesNamespace>(action,
-        `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces`,
-        namespaceEntityConfig.entityKey,
-        getKubeAPIResourceGuid,
-        {
-          kind: 'Namespace',
-          apiVersion: 'v1',
-          metadata: {
-            name: action.namespaceName,
-          },
-        });
-    })
+    flatMap(action => this.processSingleItemAction<KubernetesNamespace>(
+      action,
+      `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces`,
+      {
+        kind: 'Namespace',
+        apiVersion: 'v1',
+        metadata: {
+          name: action.namespaceName,
+        },
+      }
+    )
+    )
   );
 
   @Effect()
   fetchStatefulSets$ = this.actions$.pipe(
     ofType<GetKubernetesStatefulSets>(GET_KUBE_STATEFULSETS),
-    flatMap(action => {
-      const statefulSetsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesStatefulSetsEntityType);
-      return this.processListAction<KubernetesStatefulSet>(action,
-        `/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/statefulsets`,
-        statefulSetsEntityConfig.entityKey,
-        getKubeAPIResourceGuid);
-    })
+    flatMap(action => this.processListAction<KubernetesStatefulSet>(
+      action,
+      `/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/statefulsets`,
+    ))
   );
 
   @Effect()
   fetchDeployments$ = this.actions$.pipe(
     ofType<GeKubernetesDeployments>(GET_KUBE_DEPLOYMENT),
-    flatMap(action => {
-      const deploymentsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesDeploymentsEntityType);
-      return this.processListAction<KubernetesDeployment>(action,
-        `/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/deployments`,
-        deploymentsEntityConfig.entityKey,
-        getKubeAPIResourceGuid);
-    })
+    flatMap(action => this.processListAction<KubernetesDeployment>(
+      action,
+      `/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/deployments`,
+    ))
   );
 
   private processNodeAction(action: GetKubernetesNodes) {
-    const nodeEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesEntityType);
-    return this.processListAction<KubernetesNode>(action,
-      `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes`,
-      nodeEntityConfig.entityKey,
-      getKubeAPIResourceGuid);
+    return this.processListAction<KubernetesNode>(
+      action,
+      `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes`
+    );
   }
 
-  private processListAction<T = any>(
+  private processListAction<T extends BasicKubeAPIResource>(
     action: KubePaginationAction,
-    url: string,
-    entityKey: string,
-    filterResults?: Filter<T>) {
+    url: string) {
     this.store.dispatch(new StartRequestAction(action));
 
     const getKubeIds = action.kubeGuid ?
@@ -326,6 +281,7 @@ export class KubernetesEffects {
       );
     let pKubeIds: string[];
 
+    const entityKey = entityCatalog.getEntityKey(action);
     return getKubeIds.pipe(
       switchMap(kubeIds => {
         pKubeIds = kubeIds;
@@ -360,10 +316,9 @@ export class KubernetesEffects {
           });
           return combinedRes;
         }, []);
-        const filteredItems = filterResults ? items.filter(res => filterResults(res)) : items;
-        const processesData = filteredItems
+        const processesData = items
           .reduce((res, data) => {
-            const id = getId(data);
+            const id = action.getId(data, data.metadata.kubeId);
             const updatedData = action.entityType === kubernetesPodsEntityType ?
               KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(data as unknown as KubernetesPod) :
               data;
@@ -393,7 +348,6 @@ export class KubernetesEffects {
   private processSingleItemAction<T extends BasicKubeAPIResource>(
     action: KubeAction,
     url: string,
-    schemaKey: string,
     body?: any) {
     const requestType: ApiRequestTypes = body ? 'create' : 'fetch';
     this.store.dispatch(new StartRequestAction(action, requestType));
@@ -406,18 +360,18 @@ export class KubernetesEffects {
       headers
     };
     const request = body ? this.http.post(url, body, requestArgs) : this.http.get(url, requestArgs);
-
+    const entityKey = entityCatalog.getEntityKey(action);
     return request
       .pipe(
         mergeMap((response: T) => {
           const res = {
-            entities: { [schemaKey]: {} },
+            entities: { [entityKey]: {} },
             result: []
           } as NormalizedResponse;
           const data = action.entityType === kubernetesPodsEntityType ?
             KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(response as unknown as KubernetesPod) :
             response;
-          res.entities[schemaKey][action.guid] = data;
+          res.entities[entityKey][action.guid] = data;
           res.result.push(action.guid);
           const actions: Action[] = [
             new WrapperRequestActionSuccess(res, action)
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts
index ff70a8a77e..b85316b114 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts
@@ -9,8 +9,7 @@ import { filter, map, publishReplay, refCount, switchMap } from 'rxjs/operators'
 
 import { kubernetesEntityFactory } from '../../kubernetes-entity-factory';
 import { KubeService } from '../../store/kube.types';
-import { GetKubernetesServicesInNamespace } from '../../store/kubernetes.actions';
-import { getHelmReleaseServiceId } from '../store/workloads-entity-factory';
+import { GetKubernetesServices, GetKubernetesServicesInNamespace } from '../../store/kubernetes.actions';
 import { GetHelmReleases, GetHelmReleaseServices } from '../store/workloads.actions';
 import { HelmRelease, HelmReleaseService } from '../workload.types';
 
@@ -51,7 +50,7 @@ export class HelmReleaseServicesDataSource extends ListDataSource<KubeService> {
       store,
       action,
       schema: action.entity[0],
-      getRowUniqueId: getHelmReleaseServiceId,
+      getRowUniqueId: (row: KubeService) => GetKubernetesServices.getId(row.metadata.kubeId, row.metadata.namespace, row.metadata.name),
       paginationKey: action.paginationKey,
       isLocal: true,
       listConfig,
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 f3d8d9927a..c337b3e032 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
@@ -5,16 +5,14 @@ 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';
-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';
 import makeWebSocketObservable, { GetWebSocketResponses } from 'rxjs-websockets';
 import { catchError, map, share, switchMap } from 'rxjs/operators';
 
 import { KubernetesPodExpandedStatusHelper } from '../../../services/kubernetes-expanded-state';
-import { getKubeAPIResourceGuid } from '../../../store/kube.selectors';
-import { KubernetesPod } from '../../../store/kube.types';
-import { getHelmReleaseServiceId } from '../../store/workloads-entity-factory';
+import { KubernetesPod, KubeService } from '../../../store/kube.types';
+import { KubePaginationAction } from '../../../store/kubernetes.actions';
 import {
   GetHelmReleaseGraph,
   GetHelmReleasePods,
@@ -24,9 +22,6 @@ import {
 import { HelmReleaseGraph, HelmReleaseGuid, HelmReleasePod } from '../../workload.types';
 import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service';
 
-type IDGetterFunction = (data: any) => string;
-
-
 
 @Component({
   selector: 'app-helm-release-tab-base',
@@ -113,9 +108,13 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
           prefix = messageObj.data;
         } else if (messageObj.kind === 'Pods') {
           const pods: KubernetesPod[] = messageObj.data || [];
-          const podsWithInfo: KubernetesPod[] = pods.map(pod => KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(pod));
+          const podsWithInfo: KubernetesPod[] = pods.map(pod => {
+            const res = KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(pod);
+            res.metadata.kubeId = this.helmReleaseHelper.endpointGuid;
+            return res;
+          });
           const releasePodsAction = new GetHelmReleasePods(this.helmReleaseHelper.endpointGuid, this.helmReleaseHelper.releaseTitle);
-          this.populateList(releasePodsAction, podsWithInfo, getKubeAPIResourceGuid);
+          this.populateList(releasePodsAction, podsWithInfo);
         } else if (messageObj.kind === 'Graph') {
           const graph: HelmReleaseGraph = messageObj.data;
           graph.endpointId = this.helmReleaseHelper.endpointGuid;
@@ -126,10 +125,11 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
         } else if (messageObj.kind === 'Manifest' || messageObj.kind === 'Resources') {
           // Store all of the services
           const manifest = messageObj.data;
-          const svcs = [];
+          const svcs: KubeService[] = [];
           // Store ALL resources for the release
           manifest.forEach(resource => {
             if (resource.kind === 'Service' && prefix) {
+              resource.metadata.kubeId = this.helmReleaseHelper.endpointGuid;
               svcs.push(resource);
             }
           });
@@ -138,7 +138,7 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
               this.helmReleaseHelper.endpointGuid,
               this.helmReleaseHelper.releaseTitle
             );
-            this.populateList(releaseServicesAction, svcs, getHelmReleaseServiceId);
+            this.populateList(releaseServicesAction, svcs);
           }
 
           const resources = { ...manifest };
@@ -167,15 +167,15 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
     this.store.dispatch(successWrapper);
   }
 
-  private populateList(action: PaginatedAction, resources: any, idGetter: IDGetterFunction) {
+  private populateList(action: KubePaginationAction, resources: any) {
     const newResources = {};
     resources.forEach(resource => {
       const newResource: HelmReleasePod = {
-        endpointId: action.endpointGuid,
+        endpointId: action.kubeGuid,
         releaseTitle: this.helmReleaseHelper.releaseTitle,
         ...resource
       };
-      newResources[idGetter(newResource)] = newResource;
+      newResources[action.getId(newResource, action.kubeGuid)] = newResource;
     });
 
     const releasePods = {
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts
index 804514030a..1053c129c8 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts
@@ -1,6 +1,6 @@
 import { EntitySchema } from '../../../../../../store/src/helpers/entity-schema';
 import { addKubernetesEntitySchema, KubernetesEntitySchema } from '../../kubernetes-entity-factory';
-import { HelmRelease, HelmReleaseGraph, HelmReleaseResource, HelmReleaseService } from '../workload.types';
+import { HelmRelease, HelmReleaseGraph, HelmReleaseResource } from '../workload.types';
 
 export const helmReleaseEntityKey = 'helmRelease';
 export const helmReleasePodEntityType = 'helmReleasePod';
@@ -9,8 +9,8 @@ export const helmReleaseGraphEntityType = 'helmReleaseGraph';
 export const helmReleaseResourceEntityType = 'helmReleaseResource';
 
 export const getHelmReleaseId = (entity: HelmRelease) => `${entity.endpointId}-${entity.namespace}-${entity.name}`;
-export const getHelmReleaseServiceId =
-  (entity: HelmReleaseService) => `${entity.endpointId}-${entity.releaseTitle}-${entity.metadata.name}`;
+// export const getHelmReleaseServiceId =
+// (entity: HelmReleaseService) => `${entity.endpointId}-${entity.releaseTitle}-${entity.metadata.name}`;
 export const getHelmReleaseGraphId = (entity: HelmReleaseGraph) => `${entity.endpointId}-${entity.releaseTitle}`;
 export const getHelmReleaseResourceId = (entity: HelmReleaseResource) => `${entity.endpointId}-${entity.releaseTitle}`;
 
@@ -21,7 +21,7 @@ const entityCache: {
 entityCache[helmReleaseEntityKey] = new KubernetesEntitySchema(
   helmReleaseEntityKey,
   {},
-  { idAttribute: getHelmReleaseId }
+  { idAttribute: getHelmReleaseId } // TODO: RC
 );
 
 entityCache[helmReleaseGraphEntityType] = new KubernetesEntitySchema(
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 8ba379a06c..fa0f66070f 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
@@ -18,6 +18,7 @@ export function generateWorkloadsEntities(endpointDefinition: StratosEndpointExt
   ];
 }
 
+// TODO: RC
 
 function generateReleaseEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   const definition = {
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
index 92818a4800..e5a61ea7a8 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
@@ -8,6 +8,8 @@ import {
   kubernetesPodsEntityType,
   kubernetesServicesEntityType,
 } from '../../kubernetes-entity-factory';
+import { KubernetesPod, KubeService } from '../../store/kube.types';
+import { GetKubernetesPod, GetKubernetesServices, KubePaginationAction } from '../../store/kubernetes.actions';
 import { helmReleaseEntityKey, helmReleaseGraphEntityType, helmReleaseResourceEntityType } from './workloads-entity-factory';
 
 export const GET_HELM_RELEASES = '[Helm] Get Releases';
@@ -103,12 +105,12 @@ export class GetHelmReleaseResource implements EntityRequestAction {
 /**
  * Won't fetch pods, used to push/retrieve data from store
  */
-export class GetHelmReleasePods implements MonocularPaginationAction {
+export class GetHelmReleasePods implements KubePaginationAction {
   constructor(
-    public endpointGuid: string,
+    public kubeGuid: string,
     public releaseTitle: string
   ) {
-    this.paginationKey = `${endpointGuid}/${releaseTitle}/pods`;
+    this.paginationKey = `${kubeGuid}/${releaseTitle}/pods`;
   }
   type = GET_HELM_RELEASE_PODS;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
@@ -124,17 +126,19 @@ export class GetHelmReleasePods implements MonocularPaginationAction {
     'order-direction': 'desc',
     'order-direction-field': 'name',
   };
+  getId = (pod: KubernetesPod, kubeGuid: string) => GetKubernetesPod.getId(kubeGuid, pod.metadata.namespace, pod.metadata.name);
+
 }
 
 /**
  * Won't fetch pods, used to push/retrieve data from store
  */
-export class GetHelmReleaseServices implements MonocularPaginationAction {
+export class GetHelmReleaseServices implements KubePaginationAction {
   constructor(
-    public endpointGuid: string,
+    public kubeGuid: string,
     public releaseTitle: string
   ) {
-    this.paginationKey = `${endpointGuid}/${releaseTitle}/services`;
+    this.paginationKey = `${kubeGuid}/${releaseTitle}/services`;
   }
   type = GET_HELM_RELEASE_SERVICES;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
@@ -150,6 +154,8 @@ export class GetHelmReleaseServices implements MonocularPaginationAction {
     'order-direction': 'desc',
     'order-direction-field': 'name',
   };
+  getId = (service: KubeService, kubeGuid: string) => GetKubernetesServices.getId(kubeGuid, service.metadata.namespace, service.metadata.name);
+
 }
 
 export class HelmUpdateRelease implements Action {
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..2b85882417 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,3 +1,5 @@
+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';
@@ -14,7 +16,6 @@ import {
   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',
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 094fbef14d..c0422d77be 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';
 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';
 import { ApiRequestTypes } from '../../../store/src/reducers/api-request-reducer/request-helpers';
 import {
   resultPerPageParam,
diff --git a/src/frontend/packages/cloud-foundry/src/actions/buildpack.action.ts b/src/frontend/packages/cloud-foundry/src/actions/buildpack.action.ts
index 8fe4445485..d7a40dee9d 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/buildpack.action.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/buildpack.action.ts
@@ -1,9 +1,10 @@
+import { HttpRequest } from '@angular/common/http';
+
 import { getActions } from '../../../store/src/actions/action.helper';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { cfEntityFactory } from '../cf-entity-factory';
 import { buildpackEntityType } from '../cf-entity-types';
 import { CFStartAction } from './cf-action.types';
-import { HttpRequest } from '@angular/common/http';
 
 export class FetchAllBuildpacks extends CFStartAction implements PaginatedAction {
   constructor(public endpointGuid: string, public paginationKey: string) {
diff --git a/src/frontend/packages/cloud-foundry/src/actions/domains.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/domains.actions.ts
index 6d56f47d8d..13d4f6d59b 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/domains.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/domains.actions.ts
@@ -1,3 +1,5 @@
+import { HttpRequest } from '@angular/common/http';
+
 import { endpointSchemaKey } from '../../../store/src/helpers/entity-factory';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
@@ -5,7 +7,6 @@ import { cfEntityFactory } from '../cf-entity-factory';
 import { domainEntityType } from '../cf-entity-types';
 import { createEntityRelationPaginationKey } from '../entity-relations/entity-relations.types';
 import { CFStartAction } from './cf-action.types';
-import { HttpRequest } from '@angular/common/http';
 
 export const GET_DOMAIN = '[domain] Get domain ';
 export const GET_DOMAIN_SUCCESS = '[domain] Get domain success';
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..02200b9fb3 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,16 @@
+import { HttpParams, HttpRequest } from '@angular/common/http';
+
 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 { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
-import { CFEntityConfig } from '../cf-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 { 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/relation.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts
index 1d8e1129fd..b0d2154801 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts
@@ -1,13 +1,11 @@
+import { HttpParams, HttpRequest } from '@angular/common/http';
+
 import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types';
-import {
-  EntityInlineChildAction,
-  EntityInlineParentAction,
-} from '../entity-relations/entity-relations.types';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
-import { RequestEntityLocation, RequestActionEntity } from '../../../store/src/types/request.types';
-import { CFStartAction } from './cf-action.types';
+import { RequestActionEntity, RequestEntityLocation } from '../../../store/src/types/request.types';
 import { EntityTreeRelation } from '../entity-relations/entity-relation-tree';
-import { HttpRequest, HttpParams } from '@angular/common/http';
+import { EntityInlineChildAction, EntityInlineParentAction } from '../entity-relations/entity-relations.types';
+import { CFStartAction } from './cf-action.types';
 
 const relationActionId = 'FetchRelationAction';
 
diff --git a/src/frontend/packages/cloud-foundry/src/actions/security-groups-actions.ts b/src/frontend/packages/cloud-foundry/src/actions/security-groups-actions.ts
index 1930e67071..8d882c6a44 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/security-groups-actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/security-groups-actions.ts
@@ -1,10 +1,11 @@
+import { HttpRequest } from '@angular/common/http';
+
 import { getActions } from '../../../store/src/actions/action.helper';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { cfEntityFactory } from '../cf-entity-factory';
 import { securityGroupEntityType, spaceEntityType } from '../cf-entity-types';
 import { createEntityRelationKey, EntityInlineParentAction } from '../entity-relations/entity-relations.types';
 import { CFStartAction } from './cf-action.types';
-import { HttpRequest } from '@angular/common/http';
 
 export class GetAllSecurityGroups extends CFStartAction implements PaginatedAction, EntityInlineParentAction {
   constructor(
diff --git a/src/frontend/packages/cloud-foundry/src/actions/service-bindings.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/service-bindings.actions.ts
index d0a2763cfb..cd7763a255 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/service-bindings.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/service-bindings.actions.ts
@@ -1,10 +1,11 @@
+import { HttpParams, HttpRequest } from '@angular/common/http';
+
 import { getActions } from '../../../store/src/actions/action.helper';
 import { PaginatedAction, PaginationParam } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
 import { cfEntityFactory } from '../cf-entity-factory';
 import { serviceBindingEntityType } from '../cf-entity-types';
 import { CFStartAction } from './cf-action.types';
-import { HttpRequest, HttpParams } from '@angular/common/http';
 
 export const DELETE_SERVICE_BINDING_ACTION = '[ Service Instances ] Delete Service Binding';
 export const DELETE_SERVICE_BINDING_ACTION_SUCCESS = '[ Service Instances ] Delete Service Binding success';
diff --git a/src/frontend/packages/cloud-foundry/src/actions/service-broker.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/service-broker.actions.ts
index a598c73a26..5dfefc6e7b 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/service-broker.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/service-broker.actions.ts
@@ -1,10 +1,11 @@
+import { HttpRequest } from '@angular/common/http';
+
 import { getActions } from '../../../store/src/actions/action.helper';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { EntityRequestAction } from '../../../store/src/types/request.types';
 import { cfEntityFactory } from '../cf-entity-factory';
 import { serviceBrokerEntityType } from '../cf-entity-types';
 import { CFStartAction } from './cf-action.types';
-import { HttpRequest } from '@angular/common/http';
 
 export class GetServiceBrokers extends CFStartAction implements PaginatedAction {
   constructor(
diff --git a/src/frontend/packages/cloud-foundry/src/actions/service-plan-visibility.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/service-plan-visibility.actions.ts
index 34e8b3dde4..42adf48a73 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/service-plan-visibility.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/service-plan-visibility.actions.ts
@@ -1,3 +1,5 @@
+import { HttpRequest } from '@angular/common/http';
+
 import { getActions } from '../../../store/src/actions/action.helper';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { cfEntityFactory } from '../cf-entity-factory';
@@ -9,7 +11,6 @@ import {
 } from '../cf-entity-types';
 import { createEntityRelationKey } from '../entity-relations/entity-relations.types';
 import { CFStartAction } from './cf-action.types';
-import { HttpRequest } from '@angular/common/http';
 
 export class GetServicePlanVisibilities extends CFStartAction implements PaginatedAction {
   constructor(
diff --git a/src/frontend/packages/cloud-foundry/src/actions/service-plan.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/service-plan.actions.ts
index d12c5e0ee3..a7b2621cda 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/service-plan.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/service-plan.actions.ts
@@ -1,3 +1,5 @@
+import { HttpRequest } from '@angular/common/http';
+
 import { getActions } from '../../../store/src/actions/action.helper';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { cfEntityFactory } from '../cf-entity-factory';
@@ -12,7 +14,6 @@ import {
 } from '../cf-entity-types';
 import { createEntityRelationKey } from '../entity-relations/entity-relations.types';
 import { CFStartAction } from './cf-action.types';
-import { HttpRequest } from '@angular/common/http';
 
 export class GetServicePlanServiceInstances extends CFStartAction implements PaginatedAction {
   constructor(
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..56b874827c 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,21 +1,14 @@
 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 { 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 {
   entityRelationMissingQuotaGuid,
   entityRelationMissingQuotaUrl,
@@ -27,7 +20,6 @@ import {
   RequestEntityLocation,
   WrapperRequestActionSuccess,
 } from '../../../store/src/types/request.types';
-import { CF_ENDPOINT_TYPE } from '../cf-types';
 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/store/src/types/request.types.ts b/src/frontend/packages/store/src/types/request.types.ts
index 1e14568f76..e1b855210c 100644
--- a/src/frontend/packages/store/src/types/request.types.ts
+++ b/src/frontend/packages/store/src/types/request.types.ts
@@ -1,9 +1,9 @@
 import { HttpRequest } from '@angular/common/http';
 import { Action } from '@ngrx/store';
 
+import { ApiActionTypes, RequestTypes } from '../actions/request.actions';
 import { BasePipelineRequestAction } from '../entity-catalog/action-orchestrator/action-orchestrator';
 import { EntityCatalogEntityConfig } from '../entity-catalog/entity-catalog.types';
-import { ApiActionTypes, RequestTypes } from '../actions/request.actions';
 import { EntitySchema } from '../helpers/entity-schema';
 import { ApiRequestTypes } from '../reducers/api-request-reducer/request-helpers';
 import { NormalizedResponse } from './api.types';

From 557deb2f828ee7d79e60f162f5af5da97ee98190 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 12 May 2020 17:15:57 +0100
Subject: [PATCH 500/648] WIP

---
 .../kubernetes/kubernetes-entity-factory.ts   | 30 +++++--
 .../kubernetes-namespaces-data-source.ts      | 10 +--
 .../kubernetes-node-pods-data-source.ts       |  6 +-
 .../kubernetes-nodes-data-source.ts           |  8 +-
 .../kubernetes-pods-data-source.ts            |  6 +-
 .../kubernetes-services-data-source.ts        |  6 +-
 .../custom/kubernetes/store/kube.getIds.ts    | 79 +++++++++++++++++++
 .../custom/kubernetes/store/kube.selectors.ts | 27 +++----
 .../kubernetes/store/kubernetes.actions.ts    | 67 ++++++++--------
 .../kubernetes/store/kubernetes.effects.ts    |  7 +-
 .../helm-release-pods-list-source.ts          |  4 +-
 .../helm-release-services-list-source.ts      | 48 +----------
 .../helm-release-tab-base.component.ts        | 12 ++-
 .../workloads/store/workloads.actions.ts      |  7 +-
 .../kubernetes/workloads/workload.types.ts    | 40 +++++-----
 15 files changed, 196 insertions(+), 161 deletions(-)
 create mode 100644 custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts

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..7ae1e7178c 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts
@@ -3,7 +3,15 @@ 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 { getKubeAPIResourceGuid } from './store/kube.selectors';
+import {
+  getGuidFromKubeDashboardObj,
+  getGuidFromKubeDeploymentObj,
+  getGuidFromKubeNamespaceObj,
+  getGuidFromKubeNodeObj,
+  getGuidFromKubePodObj,
+  getGuidFromKubeServiceObj,
+  getGuidFromKubeStatefulSetObj,
+} from './store/kube.getIds';
 import { KubernetesApp } from './store/kube.types';
 
 export const kubernetesEntityType = 'kubernetesInfo';
@@ -58,43 +66,49 @@ entityCache[kubernetesAppsEntityType] = new KubernetesEntitySchema(
 entityCache[kubernetesStatefulSetsEntityType] = new KubernetesEntitySchema(
   kubernetesStatefulSetsEntityType,
   {},
-  { idAttribute: getKubeAPIResourceGuid }
+  {
+    idAttribute: getGuidFromKubeStatefulSetObj
+  }
 );
 
 entityCache[kubernetesPodsEntityType] = new KubernetesEntitySchema(
   kubernetesPodsEntityType,
   {},
-  { idAttribute: getKubeAPIResourceGuid }
+  {
+    idAttribute: getGuidFromKubePodObj
+  }
 );
 
 entityCache[kubernetesDeploymentsEntityType] = new KubernetesEntitySchema(
   kubernetesDeploymentsEntityType,
   {},
-  { idAttribute: getKubeAPIResourceGuid }
+  {
+    idAttribute: getGuidFromKubeDeploymentObj
+  }
 );
 
 entityCache[kubernetesNodesEntityType] = new KubernetesEntitySchema(
   kubernetesNodesEntityType,
   {},
-  { idAttribute: getKubeAPIResourceGuid }
+  { idAttribute: getGuidFromKubeNodeObj }
 );
 
 entityCache[kubernetesNamespacesEntityType] = new KubernetesEntitySchema(
   kubernetesNamespacesEntityType,
   {},
-  { idAttribute: getKubeAPIResourceGuid }
+  { idAttribute: getGuidFromKubeNamespaceObj }
 );
 
 entityCache[kubernetesServicesEntityType] = new KubernetesEntitySchema(
   kubernetesServicesEntityType,
   {},
-  { idAttribute: getKubeAPIResourceGuid }
+  { idAttribute: getGuidFromKubeServiceObj }
 );
 
 entityCache[kubernetesDashboardEntityType] = new KubernetesEntitySchema(
   kubernetesDashboardEntityType,
   {},
-  { idAttribute: getKubeAPIResourceGuid }
+  { idAttribute: getGuidFromKubeDashboardObj }
 );
 
 entityCache[metricEntityType] = new KubernetesEntitySchema(metricEntityType);
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
index d1fd2cc6e3..eb8d545f24 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
@@ -4,9 +4,8 @@ import { getPaginationKey } from '../../../../../../store/src/actions/pagination
 import { AppState } from '../../../../../../store/src/app-state';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { kubernetesEntityFactory, kubernetesNamespacesEntityType } from '../../kubernetes-entity-factory';
+import { kubernetesNamespacesEntityType } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
-import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { KubernetesNamespace } from '../../store/kube.types';
 import { GetKubernetesNamespaces } from '../../store/kubernetes.actions';
 
@@ -18,11 +17,12 @@ export class KubernetesNamespacesDataSource extends ListDataSource<KubernetesNam
     kubeGuid: BaseKubeGuid,
     listConfig: IListConfig<KubernetesNamespace>
   ) {
+    const action = new GetKubernetesNamespaces(kubeGuid.guid);
     super({
       store,
-      action: new GetKubernetesNamespaces(kubeGuid.guid),
-      schema: kubernetesEntityFactory(kubernetesNamespacesEntityType),
-      getRowUniqueId: getKubeAPIResourceGuid,
+      action,
+      schema: action.entity[0],
+      getRowUniqueId: (row) => action.entity[0].getId(row),
       paginationKey: getPaginationKey(kubernetesNamespacesEntityType, kubeGuid.guid),
       isLocal: true,
       listConfig,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
index a2c59454dd..ffd661ee3e 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
@@ -3,10 +3,8 @@ import { Store } from '@ngrx/store';
 import { AppState } from '../../../../../../store/src/app-state';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { kubernetesEntityFactory, kubernetesPodsEntityType } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesNodeService } from '../../services/kubernetes-node.service';
-import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { KubernetesPod } from '../../store/kube.types';
 import { GetKubernetesPodsOnNode } from '../../store/kubernetes.actions';
 
@@ -22,8 +20,8 @@ export class KubernetesNodePodsDataSource extends ListDataSource<KubernetesPod>
     super({
       store,
       action,
-      schema: kubernetesEntityFactory(kubernetesPodsEntityType),
-      getRowUniqueId: getKubeAPIResourceGuid,
+      schema: action.entity[0],
+      getRowUniqueId: (row) => action.entity[0].getId(row),
       paginationKey: action.paginationKey,
       isLocal: true,
       listConfig,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
index 797cd9a5fd..a4cb7c905a 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
@@ -8,9 +8,8 @@ import {
   ListDataSource,
 } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { kubernetesEntityFactory, kubernetesNodesEntityType } from '../../kubernetes-entity-factory';
+import { kubernetesNodesEntityType } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
-import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { KubernetesNode } from '../../store/kube.types';
 import { GetKubernetesNodes } from '../../store/kubernetes.actions';
 
@@ -22,11 +21,12 @@ export class KubernetesNodesDataSource extends ListDataSource<KubernetesNode> {
     listConfig: IListConfig<KubernetesNode>,
     transformEntities: (DataFunction<KubernetesNode> | DataFunctionDefinition)[]
   ) {
+    const action = new GetKubernetesNodes(kubeGuid.guid);
     super({
       store,
       action: new GetKubernetesNodes(kubeGuid.guid),
-      schema: kubernetesEntityFactory(kubernetesNodesEntityType),
-      getRowUniqueId: getKubeAPIResourceGuid,
+      schema: action.entity[0],
+      getRowUniqueId: (row) => action.entity[0].getId(row),
       paginationKey: getPaginationKey(kubernetesNodesEntityType, kubeGuid.guid),
       isLocal: true,
       listConfig,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
index cd608a2569..abd06114e6 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
@@ -3,9 +3,7 @@ import { Store } from '@ngrx/store';
 import { AppState } from '../../../../../../store/src/app-state';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { kubernetesEntityFactory, kubernetesPodsEntityType } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
-import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { KubernetesPod } from '../../store/kube.types';
 import { GetKubernetesPods } from '../../store/kubernetes.actions';
 
@@ -20,8 +18,8 @@ export class KubernetesPodsDataSource extends ListDataSource<KubernetesPod> {
     super({
       store,
       action,
-      schema: kubernetesEntityFactory(kubernetesPodsEntityType),
-      getRowUniqueId: getKubeAPIResourceGuid,
+      schema: action.entity[0],
+      getRowUniqueId: (row) => action.entity[0].getId(row),
       paginationKey: action.paginationKey,
       isLocal: true,
       listConfig,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts
index 6aed4a43f6..6b02912c88 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts
@@ -5,8 +5,6 @@ import { AppState } from '../../../../../../store/src/app-state';
 import { PaginatedAction } from '../../../../../../store/src/types/pagination.types';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { kubernetesEntityFactory, kubernetesServicesEntityType } from '../../kubernetes-entity-factory';
-import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { KubeService } from '../../store/kube.types';
 
 export class BaseKubernetesServicesDataSource extends ListDataSource<KubeService> {
@@ -20,8 +18,8 @@ export class BaseKubernetesServicesDataSource extends ListDataSource<KubeService
     super({
       store,
       action,
-      schema: kubernetesEntityFactory(kubernetesServicesEntityType),
-      getRowUniqueId: getKubeAPIResourceGuid,
+      schema: action.entity[0],
+      getRowUniqueId: (row) => action.entity[0].getId(row),
       paginationKey: action.paginationKey,
       transformEntity,
       isLocal: true,
diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts
new file mode 100644
index 0000000000..8f5d812860
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts
@@ -0,0 +1,79 @@
+import {
+  BasicKubeAPIResource,
+  KubernetesDeployment,
+  KubernetesNamespace,
+  KubernetesNode,
+  KubernetesPod,
+  KubernetesStatefulSet,
+  KubeService,
+} from './kube.types';
+import { KubeDashboardStatus } from './kubernetes.effects';
+
+const deliminate = (...args: string[]) => args.join('_:_');
+
+const debugMissingKubeId = (entity: BasicKubeAPIResource) => {
+  if (!entity.metadata) {
+    console.log('DANGER WILL ROBINSON1:', entity);
+  } else if (!entity.metadata.kubeId) {
+    console.log('DANGER WILL ROBINSON2:', entity);
+  }
+}
+
+export const getGuidFromKubeNode = (kubeGuid: string, name: string): string => {
+  return deliminate(name, kubeGuid);
+}
+export const getGuidFromKubeNodeObj = (entity: KubernetesNode): string => {
+  debugMissingKubeId(entity);
+  return getGuidFromKubeNode(entity.metadata.kubeId, entity.metadata.name);
+}
+
+export const getGuidFromKubeNamespace = (kubeGuid: string, name: string): string => {
+  return deliminate(name, kubeGuid);
+}
+export const getGuidFromKubeNamespaceObj = (entity: KubernetesNamespace): string => {
+  debugMissingKubeId(entity);
+  return getGuidFromKubeNamespace(entity.metadata.kubeId, entity.metadata.name);
+}
+
+export const getGuidFromKubeService = (kubeGuid: string, namespace: string, name: string): string => {
+  return deliminate(name, namespace, kubeGuid);
+}
+export const getGuidFromKubeServiceObj = (entity: KubeService): string => {
+  debugMissingKubeId(entity);
+  return getGuidFromKubeService(entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name);
+}
+
+export const getGuidFromKubeStatefulSet = (kubeGuid: string, namespace: string, name: string): string => {
+  return deliminate(name, namespace, kubeGuid);
+}
+export const getGuidFromKubeStatefulSetObj = (entity: KubernetesStatefulSet): string => {
+  debugMissingKubeId(entity);
+  return getGuidFromKubeStatefulSet(entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name);
+}
+
+
+export const getGuidFromKubeDeployment = (kubeGuid: string, namespace: string, name: string): string => {
+  return deliminate(name, namespace, kubeGuid);
+}
+export const getGuidFromKubeDeploymentObj = (entity: KubernetesDeployment): string => {
+  debugMissingKubeId(entity);
+  return getGuidFromKubeDeployment(entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name);
+}
+
+export const getGuidFromKubePod = (kubeGuid: string, namespace: string, name: string): string => {
+  return deliminate(name, namespace, kubeGuid);
+}
+export const getGuidFromKubePodObj = (entity: KubernetesPod): string => {
+  debugMissingKubeId(entity);
+  return getGuidFromKubePod(entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name);
+}
+
+export const getGuidFromKubeDashboard = (kubeGuid: string): string => {
+  return kubeGuid;
+}
+export const getGuidFromKubeDashboardObj = (entity: KubeDashboardStatus): string => {
+  if (!!entity.kubeGuid) {
+    console.log('aaaaa!!!!!');
+  }
+  return getGuidFromKubeDashboard(entity.kubeGuid);
+}
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.selectors.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.selectors.ts
index dd88469ca2..127babf675 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kube.selectors.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kube.selectors.ts
@@ -1,20 +1,17 @@
-import { compose } from '@ngrx/store';
+// TODO: RC
 
-import { BasicKubeAPIResource, Metadata } from './kube.types';
+// const getValueOrNull = (object, key) =>
+//   object ? (object[key] ? object[key] : null) : null;
+// export const getMetadataGuid = (metadata: Metadata): string =>
+//   getValueOrNull(metadata, 'uid');
 
+// export const getKubeAPIMetadata = (
+//   resource: BasicKubeAPIResource
+// ): Metadata => getValueOrNull(resource, 'metadata');
 
-const getValueOrNull = (object, key) =>
-  object ? (object[key] ? object[key] : null) : null;
-export const getMetadataGuid = (metadata: Metadata): string =>
-  getValueOrNull(metadata, 'uid');
-
-export const getKubeAPIMetadata = (
-  resource: BasicKubeAPIResource
-): Metadata => getValueOrNull(resource, 'metadata');
-
-export const getKubeAPIResourceGuid = compose(
-  getMetadataGuid,
-  getKubeAPIMetadata
-);
+// export const getKubeAPIResourceGuid = compose(
+//   getMetadataGuid,
+//   getKubeAPIMetadata
+// );
 
 
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 fbf8a06d69..49abc5540c 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
@@ -17,6 +17,7 @@ import {
   kubernetesServicesEntityType,
   kubernetesStatefulSetsEntityType,
 } from '../kubernetes-entity-factory';
+import { getGuidFromKubeDashboard, getGuidFromKubeNode, getGuidFromKubePod } from './kube.getIds';
 import {
   KubernetesDeployment,
   KubernetesNamespace,
@@ -89,36 +90,34 @@ export const GET_KUBE_DASHBOARD_SUCCESS = '[KUBERNETES Endpoint] Get Dashboard S
 export const GET_KUBE_DASHBOARD_FAILURE = '[KUBERNETES Endpoint] Get Dashboard Failure';
 
 
+// TODO: RC TIDY
+
 const defaultSortParams = {
   'order-direction': 'desc' as SortDirection,
   'order-direction-field': 'name'
 };
 
-const deliminate = (...args: string[]) => args.join('_:_');
+
 
 export interface KubeAction extends EntityRequestAction {
   kubeGuid: string;
 }
 export interface KubePaginationAction<T = any> extends PaginatedAction, KubeAction {
-  getId: (r: T, kubeGuid: string) => string;
+  // getId: (r: T, kubeGuid: string) => string;
 }
 export interface KubeSingleEntityAction extends KubeAction {
   guid: string;
 }
 
 export class GetKubernetesNode implements KubeSingleEntityAction {
-  static getGuid(kubeGuid: string, nodeName: string): string {
-    return deliminate(nodeName, kubeGuid);
-  }
 
   constructor(public nodeName: string, public kubeGuid: string) {
-    this.guid = GetKubernetesNode.getGuid(kubeGuid, nodeName);
+    this.guid = getGuidFromKubeNode(kubeGuid, nodeName);
   }
   type = GET_NODE_INFO;
   entityType = kubernetesNodesEntityType;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = [kubernetesEntityFactory(kubernetesNodesEntityType)];
-
   actions = [
     GET_NODE_INFO,
     GET_NODE_INFO_SUCCESS,
@@ -144,7 +143,7 @@ export class GetKubernetesNodes implements KubePaginationAction<KubernetesNode>
   initialParams: PaginationParam = {
     ...defaultSortParams
   };
-  getId = (node: KubernetesNode, kubeGuid: string) => GetKubernetesNode.getGuid(kubeGuid, node.metadata.name);
+  // getId = (node: KubernetesNode, kubeGuid: string) => GetKubernetesNode.getGuid(kubeGuid, node.metadata.name);
 }
 
 export class KubeHealthCheck extends GetKubernetesNodes {
@@ -158,7 +157,7 @@ export class KubeHealthCheck extends GetKubernetesNodes {
 export class CreateKubernetesNamespace implements KubeSingleEntityAction {
   public guid: string;
   constructor(public namespaceName: string, public kubeGuid: string) {
-    this.guid = GetKubernetesNamespace.getGuid(kubeGuid, namespaceName); // TODO: RC shouldn't be 'creating-guid'?
+    // this.guid = GetKubernetesNamespace.getGuid(kubeGuid, namespaceName); // TODO: RC shouldn't be 'creating-guid'?
   }
 
   type = CREATE_NAMESPACE;
@@ -170,12 +169,12 @@ export class CreateKubernetesNamespace implements KubeSingleEntityAction {
 }
 
 export class GetKubernetesNamespace implements KubeSingleEntityAction {
-  static getGuid(kubeGuid: string, namespaceName: string): string {
-    return deliminate(namespaceName, kubeGuid);
-  }
+  // static getGuid(kubeGuid: string, namespaceName: string): string {
+  //   return deliminate(namespaceName, kubeGuid);
+  // }
 
   constructor(public namespaceName: string, public kubeGuid: string) {
-    this.guid = GetKubernetesNamespace.getGuid(this.kubeGuid, this.namespaceName);
+    // this.guid = GetKubernetesNamespace.getGuid(this.kubeGuid, this.namespaceName);
   }
   type = GET_NAMESPACE_INFO;
   entityType = kubernetesNamespacesEntityType;
@@ -207,17 +206,13 @@ export class GetKubernetesNamespaces implements KubePaginationAction<KubernetesN
   initialParams = {
     ...defaultSortParams
   };
-  getId = (namespace: KubernetesNamespace, kubeGuid: string): string => GetKubernetesNamespace.getGuid(kubeGuid, namespace.metadata.name);
+  // getId = (namespace: KubernetesNamespace, kubeGuid: string): string => GetKubernetesNamespace.getGuid(kubeGuid, namespace.metadata.name);
 }
 
 export class GetKubernetesPod implements KubeSingleEntityAction {
-  static getId(kubeGuid: string, namespace: string, podName: string): string { // TODO: RC id/guid naming
-    return deliminate(podName, namespace, kubeGuid);
-  }
 
-  // static 
   constructor(public podName, public namespaceName, public kubeGuid) {
-    this.guid = GetKubernetesPod.getId(kubeGuid, namespaceName, podName);
+    this.guid = getGuidFromKubePod(kubeGuid, namespaceName, podName);
   }
   type = GET_KUBE_POD;
   entityType = kubernetesPodsEntityType;
@@ -248,7 +243,7 @@ export class GetKubernetesPods implements KubePaginationAction<KubernetesPod> {
   initialParams: PaginationParam = {
     ...defaultSortParams
   };
-  getId = (pod: KubernetesPod, kubeGuid: string) => GetKubernetesPod.getId(kubeGuid, pod.metadata.namespace, pod.metadata.name);
+  // getId = (pod: KubernetesPod, kubeGuid: string) => GetKubernetesPod.getId(kubeGuid, pod.metadata.namespace, pod.metadata.name);
 }
 
 export class GetKubernetesPodsOnNode extends GetKubernetesPods {
@@ -279,9 +274,9 @@ export class GetKubernetesPodsInNamespace extends GetKubernetesPods {
 }
 
 export class GetKubernetesServices implements KubePaginationAction<KubeService> {
-  static getId(kubeGuid: string, namespace: string, serviceName: string): string { // TODO: RC id/guid naming
-    return deliminate(serviceName, namespace, kubeGuid);
-  }
+  // static getId(kubeGuid: string, namespace: string, serviceName: string): string { // TODO: RC id/guid naming
+  //   return deliminate(serviceName, namespace, kubeGuid);
+  // }
   constructor(public kubeGuid) {
     this.paginationKey = getPaginationKey(kubernetesServicesEntityType, kubeGuid);
   }
@@ -298,7 +293,7 @@ export class GetKubernetesServices implements KubePaginationAction<KubeService>
   initialParams: PaginationParam = {
     ...defaultSortParams
   };
-  getId = (service: KubeService, kubeGuid: string) => GetKubernetesServices.getId(kubeGuid, service.metadata.namespace, service.metadata.name);
+  // getId = (service: KubeService, kubeGuid: string) => GetKubernetesServices.getId(kubeGuid, service.metadata.namespace, service.metadata.name);
 }
 
 export class GetKubernetesServicesInNamespace extends GetKubernetesServices {
@@ -321,9 +316,9 @@ export class GetKubernetesServicesInNamespace extends GetKubernetesServices {
 
 
 export class GetKubernetesStatefulSets implements KubePaginationAction<KubernetesStatefulSet> {
-  static getId(kubeGuid: string, namespace: string, name: string): string {
-    return deliminate(name, namespace, kubeGuid); // TODO: RC check
-  }
+  // static getId(kubeGuid: string, namespace: string, name: string): string {
+  //   return deliminate(name, namespace, kubeGuid); // TODO: RC check
+  // }
 
   constructor(public kubeGuid) {
     this.paginationKey = getPaginationKey(kubernetesStatefulSetsEntityType, kubeGuid);
@@ -338,13 +333,13 @@ export class GetKubernetesStatefulSets implements KubePaginationAction<Kubernete
     GET_KUBE_STATEFULSETS_FAILURE
   ];
   paginationKey: string;
-  getId = (statefulSet: KubernetesStatefulSet, kubeGuid: string) => GetKubernetesStatefulSets.getId(kubeGuid, statefulSet.metadata.namespace, statefulSet.metadata.name);
+  // getId = (statefulSet: KubernetesStatefulSet, kubeGuid: string) => GetKubernetesStatefulSets.getId(kubeGuid, statefulSet.metadata.namespace, statefulSet.metadata.name);
 }
 
 export class GeKubernetesDeployments implements KubePaginationAction<KubernetesDeployment> {
-  static getId(kubeGuid: string, namespace: string, name: string): string {
-    return deliminate(name, namespace, kubeGuid); // TODO: RC check
-  }
+  // static getId(kubeGuid: string, namespace: string, name: string): string {
+  //   return deliminate(name, namespace, kubeGuid); // TODO: RC check
+  // }
   constructor(public kubeGuid) {
     this.paginationKey = getPaginationKey(kubernetesDeploymentsEntityType, kubeGuid);
   }
@@ -358,15 +353,15 @@ export class GeKubernetesDeployments implements KubePaginationAction<KubernetesD
     GET_KUBE_DEPLOYMENT_FAILURE
   ];
   paginationKey: string;
-  getId = (deployment: KubernetesDeployment, kubeGuid: string) => GeKubernetesDeployments.getId(kubeGuid, deployment.metadata.namespace, deployment.metadata.name);
+  // getId = (deployment: KubernetesDeployment, kubeGuid: string) => GeKubernetesDeployments.getId(kubeGuid, deployment.metadata.namespace, deployment.metadata.name);
 }
 
 export class GetKubernetesDashboard implements KubeSingleEntityAction {
-  static getId(kubeGuid: string): string {
-    return kubeGuid;
-  }
+  // static getId(kubeGuid: string): string {
+  //   return kubeGuid;
+  // }
   constructor(public kubeGuid: string) {
-    this.guid = GetKubernetesDashboard.getId(kubeGuid);
+    this.guid = getGuidFromKubeDashboard(kubeGuid);
   }
   type = GET_KUBE_DASHBOARD;
   entityType = kubernetesDashboardEntityType;
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 cf3c752176..645dc5b91e 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
@@ -73,6 +73,7 @@ export interface KubeDashboardContainer {
 
 export interface KubeDashboardStatus {
   guid: string;
+  kubeGuid: string;
   installed: boolean;
   stratosInstalled: boolean;
   running: boolean;
@@ -90,9 +91,6 @@ export interface KubeDashboardStatus {
   serviceAccount: any;
 }
 
-type GetID<T> = (p: T) => string;
-type Filter<T> = (p: T) => boolean;
-
 @Injectable()
 export class KubernetesEffects {
   proxyAPIVersion = environment.proxyAPIVersion;
@@ -118,6 +116,7 @@ export class KubernetesEffects {
             result: []
           } as NormalizedResponse;
           const status = response as KubeDashboardStatus;
+          status.kubeGuid = action.kubeGuid;
           result.entities[dashboardEntityConfig.entityKey][action.guid] = status;
           result.result.push(action.guid);
           return [
@@ -318,7 +317,7 @@ export class KubernetesEffects {
         }, []);
         const processesData = items
           .reduce((res, data) => {
-            const id = action.getId(data, data.metadata.kubeId);
+            const id = action.entity[0].getId(data);
             const updatedData = action.entityType === kubernetesPodsEntityType ?
               KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(data as unknown as KubernetesPod) :
               data;
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts
index d3cb3f80c4..317867b68d 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts
@@ -3,7 +3,6 @@ import { ListDataSource } from 'frontend/packages/core/src/shared/components/lis
 import { IListConfig } from 'frontend/packages/core/src/shared/components/list/list.component.types';
 import { AppState } from 'frontend/packages/store/src/app-state';
 
-import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { KubernetesPod } from '../../store/kube.types';
 import { GetHelmReleasePods } from '../store/workloads.actions';
 
@@ -17,12 +16,11 @@ export class HelmReleasePodsDataSource extends ListDataSource<KubernetesPod> {
     releaseTitle: string
   ) {
     const action = new GetHelmReleasePods(endpointGuid, releaseTitle);
-
     super({
       store,
       action,
       schema: action.entity[0],
-      getRowUniqueId: getKubeAPIResourceGuid,
+      getRowUniqueId: (row: KubernetesPod) => action.entity[0].getId(row),
       paginationKey: action.paginationKey,
       isLocal: true,
       listConfig,
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts
index b85316b114..24186f23f9 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts
@@ -2,40 +2,9 @@ import { Store } from '@ngrx/store';
 import { ListDataSource } from 'frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from 'frontend/packages/core/src/shared/components/list/list.component.types';
 import { AppState } from 'frontend/packages/store/src/app-state';
-import { PaginationMonitor } from 'frontend/packages/store/src/monitors/pagination-monitor';
-import { getPaginationObservables } from 'frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper';
-import { Observable } from 'rxjs';
-import { filter, map, publishReplay, refCount, switchMap } from 'rxjs/operators';
 
-import { kubernetesEntityFactory } from '../../kubernetes-entity-factory';
 import { KubeService } from '../../store/kube.types';
-import { GetKubernetesServices, GetKubernetesServicesInNamespace } from '../../store/kubernetes.actions';
-import { GetHelmReleases, GetHelmReleaseServices } from '../store/workloads.actions';
-import { HelmRelease, HelmReleaseService } from '../workload.types';
-
-
-export const fetchHelmReleaseServiceFromKubernetes = (store: Store<AppState>, helmService: HelmReleaseService): Observable<KubeService> => {
-  return fetchRelease(store, helmService.endpointId, helmService.releaseTitle).pipe(
-    switchMap(release => {
-      const action = new GetKubernetesServicesInNamespace(helmService.endpointId, release.namespace);
-      const paginationMonitor = new PaginationMonitor<KubeService>(store, action.paginationKey, kubernetesEntityFactory(action.entityType));
-      return getPaginationObservables<KubeService>({ store, action, paginationMonitor }).entities$;
-    }),
-    filter(entities => !!entities),
-    map(services => services.find(service => service.metadata.name === helmService.name)),
-    publishReplay(1),
-    refCount()
-  );
-};
-
-function fetchRelease(store: Store<AppState>, endpointGuid: string, releaseTitle: string) {
-  const action = new GetHelmReleases();
-  const paginationMonitor = new PaginationMonitor(store, action.paginationKey, action);
-  const svc = getPaginationObservables({ store, action, paginationMonitor });
-  return svc.entities$.pipe(
-    map((items: HelmRelease[]) => items.find(item => item.guid === `${endpointGuid}:${releaseTitle}`))
-  );
-}
+import { GetHelmReleaseServices } from '../store/workloads.actions';
 
 export class HelmReleaseServicesDataSource extends ListDataSource<KubeService> {
 
@@ -50,23 +19,10 @@ export class HelmReleaseServicesDataSource extends ListDataSource<KubeService> {
       store,
       action,
       schema: action.entity[0],
-      getRowUniqueId: (row: KubeService) => GetKubernetesServices.getId(row.metadata.kubeId, row.metadata.namespace, row.metadata.name),
+      getRowUniqueId: (row: KubeService) => action.entity[0].getId(row),
       paginationKey: action.paginationKey,
       isLocal: true,
       listConfig,
     });
-    //   transformEntity: map((helmServices: HelmReleaseService[]) => {
-    //     return helmServices.map(helmService => {
-    //       if (!helmService.kubeService$) {
-    //         helmService.kubeService$ = fetchHelmReleaseServiceFromKubernetes(store, helmService);
-    //       }
-    //       return helmService;
-    //     });
-    //   }),
-    //   refresh: () => {
-    //     store.dispatch(action);
-    //     store.dispatch(new ClearPaginationOfType(action));
-    //   }
-    // });
   }
 }
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 c337b3e032..5f5ad87171 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
@@ -19,7 +19,7 @@ import {
   GetHelmReleaseResource,
   GetHelmReleaseServices,
 } from '../../store/workloads.actions';
-import { HelmReleaseGraph, HelmReleaseGuid, HelmReleasePod } from '../../workload.types';
+import { HelmReleaseGraph, HelmReleaseGuid, HelmReleasePod, HelmReleaseService } from '../../workload.types';
 import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service';
 
 
@@ -168,18 +168,22 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
   }
 
   private populateList(action: KubePaginationAction, resources: any) {
+    const entity = entityCatalog.getEntity(action);
+    const entityKey = entity.entityKey;
     const newResources = {};
     resources.forEach(resource => {
-      const newResource: HelmReleasePod = {
+      const newResource: HelmReleasePod | HelmReleaseService = {
         endpointId: action.kubeGuid,
         releaseTitle: this.helmReleaseHelper.releaseTitle,
         ...resource
       };
-      newResources[action.getId(newResource, action.kubeGuid)] = newResource;
+      newResource.metadata.kubeId = action.kubeGuid;
+      const entityId = entity.getSchema(action.schemaKey).getId(resource)
+      newResources[entityId] = newResource;
     });
 
     const releasePods = {
-      entities: { [entityCatalog.getEntityKey(action)]: newResources },
+      entities: { [entityKey]: newResources },
       result: Object.keys(newResources)
     };
     const successWrapper = new WrapperRequestActionSuccess(releasePods, action, 'fetch', releasePods.result.length, 1);
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
index e5a61ea7a8..4e7ebcd501 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
@@ -8,8 +8,7 @@ import {
   kubernetesPodsEntityType,
   kubernetesServicesEntityType,
 } from '../../kubernetes-entity-factory';
-import { KubernetesPod, KubeService } from '../../store/kube.types';
-import { GetKubernetesPod, GetKubernetesServices, KubePaginationAction } from '../../store/kubernetes.actions';
+import { KubePaginationAction } from '../../store/kubernetes.actions';
 import { helmReleaseEntityKey, helmReleaseGraphEntityType, helmReleaseResourceEntityType } from './workloads-entity-factory';
 
 export const GET_HELM_RELEASES = '[Helm] Get Releases';
@@ -126,8 +125,6 @@ export class GetHelmReleasePods implements KubePaginationAction {
     'order-direction': 'desc',
     'order-direction-field': 'name',
   };
-  getId = (pod: KubernetesPod, kubeGuid: string) => GetKubernetesPod.getId(kubeGuid, pod.metadata.namespace, pod.metadata.name);
-
 }
 
 /**
@@ -154,8 +151,6 @@ export class GetHelmReleaseServices implements KubePaginationAction {
     'order-direction': 'desc',
     'order-direction-field': 'name',
   };
-  getId = (service: KubeService, kubeGuid: string) => GetKubernetesServices.getId(kubeGuid, service.metadata.namespace, service.metadata.name);
-
 }
 
 export class HelmUpdateRelease implements Action {
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
index b0394359ab..63007dfd69 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
 
-import { KubeService } from '../store/kube.types';
+import { KubernetesPod, KubeService } from '../store/kube.types';
 
 export interface HelmRelease {
   endpointId: string;
@@ -27,28 +26,33 @@ export interface HelmRelease {
   };
 }
 
-export interface HelmReleasePod {
+export interface HelmReleaseEntity {
   endpointId: string;
   releaseTitle: string;
-  name: string;
-  ready: string;
-  status: string;
-  restarts: string;
-  age: string;
 }
 
-export interface HelmReleaseService {
-  endpointId: string;
-  releaseTitle: string;
-  name: string;
-  kubeService$?: Observable<KubeService>;
-  metadata: any;
-  spec: any;
+export interface HelmReleasePod extends HelmReleaseEntity, KubernetesPod {
+  // endpointId: string;
+  // releaseTitle: string;
+  // name: string;
+  // ready: string;
+  // status: string;
+  // restarts: string;
+  // age: string;
 }
 
-export interface HelmReleaseGraph {
-  endpointId: string;
-  releaseTitle: string;
+export interface HelmReleaseService extends HelmReleaseEntity, KubeService {
+  // endpointId: string;
+  // releaseTitle: string;
+  // name: string;
+  //kubeService$?: Observable<KubeService>; // TODO: RC ??
+  // metadata: any;
+  // spec: any;
+}
+
+export interface HelmReleaseGraph extends HelmReleaseEntity {
+  // endpointId: string;
+  // releaseTitle: string;
   nodes: {};
   links: {};
 }

From aae429e44be82fd0d4ff6d27d92c1e4e0ce98d62 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 12 May 2020 17:42:59 +0100
Subject: [PATCH 501/648] Started to apply

---
 .../kubernetes/kubernetes-entity-catalog.ts   | 38 ++++++++--
 .../kubernetes/kubernetes-entity-generator.ts | 26 ++++---
 .../kubernetes-pod-containers.component.ts    | 10 +--
 .../action-builders/kube.action-builders.ts   | 74 +++++++++++++++++--
 4 files changed, 118 insertions(+), 30 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts
index 8aab0f5479..72cf4013ba 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts
@@ -1,18 +1,44 @@
-import { StratosCatalogEntity } from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import {
+  StratosCatalogEndpointEntity,
+  StratosCatalogEntity,
+} from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types';
-import { KubeNamespaceActionBuilders } from './store/action-builders/kube.action-builders';
-import { KubernetesNamespace } from './store/kube.types';
+import {
+  KubeAppActionBuilders,
+  KubeDashboardActionBuilders,
+  KubeDeploymentActionBuilders,
+  KubeNamespaceActionBuilders,
+  KubeNodeActionBuilders,
+  KubePodActionBuilders,
+  KubeServiceActionBuilders,
+  KubeStatefulSetsActionBuilders,
+} from './store/action-builders/kube.action-builders';
+import {
+  KubernetesApp,
+  KubernetesDeployment,
+  KubernetesNamespace,
+  KubernetesNode,
+  KubernetesPod,
+  KubernetesStatefulSet,
+  KubeService,
+} from './store/kube.types';
 
 /**
  * A strongly typed collection of Kube Catalog Entities.
  * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc
  */
 export class KubeEntityCatalog {
-
+  public endpoint: StratosCatalogEndpointEntity;
+  public app: StratosCatalogEntity<IFavoriteMetadata, KubernetesApp, KubeAppActionBuilders>;
+  public statefulSet: StratosCatalogEntity<IFavoriteMetadata, KubernetesStatefulSet, KubeStatefulSetsActionBuilders>;
+  public pod: StratosCatalogEntity<IFavoriteMetadata, KubernetesPod, KubePodActionBuilders>;
+  public deployment: StratosCatalogEntity<IFavoriteMetadata, KubernetesDeployment, KubeDeploymentActionBuilders>;
+  public node: StratosCatalogEntity<IFavoriteMetadata, KubernetesNode, KubeNodeActionBuilders>;
   public namespace: StratosCatalogEntity<IFavoriteMetadata, KubernetesNamespace, KubeNamespaceActionBuilders>;
-
+  public service: StratosCatalogEntity<IFavoriteMetadata, KubeService, KubeServiceActionBuilders>
+  public dashboard: StratosCatalogEntity<IFavoriteMetadata, any, KubeDashboardActionBuilders>;
+  // TODO: RC workloads stuff
 }
 
 
-
 export const kubeEntityCatalog: KubeEntityCatalog = new KubeEntityCatalog();
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 38b9d860ab..0fda94fd02 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
@@ -175,10 +175,11 @@ export function generateKubernetesEntities(): StratosBaseCatalogEntity[] {
 }
 
 function generateEndpointEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  return new StratosCatalogEndpointEntity(
+  kubeEntityCatalog.endpoint = new StratosCatalogEndpointEntity(
     endpointDefinition,
     metadata => `/kubernetes/${metadata.guid}`
   );
+  return kubeEntityCatalog.endpoint;
 }
 
 function generateAppEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -186,11 +187,11 @@ function generateAppEntity(endpointDefinition: StratosEndpointExtensionDefinitio
     type: kubernetesAppsEntityType,
     schema: kubernetesEntityFactory(kubernetesAppsEntityType),
     endpoint: endpointDefinition,
-
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesApp, KubeAppActionBuilders>(definition, {
+  kubeEntityCatalog.app = new StratosCatalogEntity<IFavoriteMetadata, KubernetesApp, KubeAppActionBuilders>(definition, {
     actionBuilders: kubeAppActionBuilders
   });
+  return kubeEntityCatalog.app;
 }
 
 function generateStatefulSetsEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -199,9 +200,10 @@ function generateStatefulSetsEntity(endpointDefinition: StratosEndpointExtension
     schema: kubernetesEntityFactory(kubernetesStatefulSetsEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesStatefulSet, KubeStatefulSetsActionBuilders>(definition, {
+  kubeEntityCatalog.statefulSet = new StratosCatalogEntity<IFavoriteMetadata, KubernetesStatefulSet, KubeStatefulSetsActionBuilders>(definition, {
     actionBuilders: kubeStatefulSetsActionBuilders
   });
+  return kubeEntityCatalog.statefulSet;
 }
 
 function generatePodsEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -210,9 +212,10 @@ function generatePodsEntity(endpointDefinition: StratosEndpointExtensionDefiniti
     schema: kubernetesEntityFactory(kubernetesPodsEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesPod, KubePodActionBuilders>(definition, {
+  kubeEntityCatalog.pod = new StratosCatalogEntity<IFavoriteMetadata, KubernetesPod, KubePodActionBuilders>(definition, {
     actionBuilders: kubePodActionBuilders
   });
+  return kubeEntityCatalog.pod;
 }
 
 function generateDeploymentsEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -221,9 +224,10 @@ function generateDeploymentsEntity(endpointDefinition: StratosEndpointExtensionD
     schema: kubernetesEntityFactory(kubernetesDeploymentsEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesDeployment, KubeDeploymentActionBuilders>(definition, {
+  kubeEntityCatalog.deployment = new StratosCatalogEntity<IFavoriteMetadata, KubernetesDeployment, KubeDeploymentActionBuilders>(definition, {
     actionBuilders: kubeDeploymentActionBuilders
   });
+  return kubeEntityCatalog.deployment;
 }
 
 function generateNodesEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -232,9 +236,10 @@ function generateNodesEntity(endpointDefinition: StratosEndpointExtensionDefinit
     schema: kubernetesEntityFactory(kubernetesNodesEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesNode, KubeNodeActionBuilders>(definition, {
+  kubeEntityCatalog.node = new StratosCatalogEntity<IFavoriteMetadata, KubernetesNode, KubeNodeActionBuilders>(definition, {
     actionBuilders: kubeNodeActionBuilders
   });
+  return kubeEntityCatalog.node;
 }
 
 function generateNamespacesEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -255,9 +260,10 @@ function generateServicesEntity(endpointDefinition: StratosEndpointExtensionDefi
     schema: kubernetesEntityFactory(kubernetesServicesEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, KubeService, KubeServiceActionBuilders>(definition, {
+  kubeEntityCatalog.service = new StratosCatalogEntity<IFavoriteMetadata, KubeService, KubeServiceActionBuilders>(definition, {
     actionBuilders: kubeServiceActionBuilders
   });
+  return kubeEntityCatalog.service;
 }
 
 function generateDashboardEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -266,10 +272,10 @@ function generateDashboardEntity(endpointDefinition: StratosEndpointExtensionDef
     schema: kubernetesEntityFactory(kubernetesDashboardEntityType),
     endpoint: endpointDefinition
   };
-  // TODO: RC any
-  return new StratosCatalogEntity<IFavoriteMetadata, any, KubeDashboardActionBuilders>(definition, {
+  kubeEntityCatalog.dashboard = new StratosCatalogEntity<IFavoriteMetadata, any, KubeDashboardActionBuilders>(definition, {
     actionBuilders: kubeDashboardActionBuilders
   });
+  return kubeEntityCatalog.dashboard;
 }
 
 function generateMetricEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
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 a2d755a21d..03295227db 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,8 +6,6 @@ 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';
-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';
 import {
@@ -20,7 +18,7 @@ import {
 } from '../../../../../shared/components/list/list-table/table-cell-icon/table-cell-icon.component';
 import { ITableColumn } from '../../../../../shared/components/list/list-table/table.types';
 import { CardCell } from '../../../../../shared/components/list/list.types';
-import { KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType } from '../../../kubernetes-entity-factory';
+import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog';
 import { Container, ContainerState, ContainerStatus, InitContainer, KubernetesPod } from '../../../store/kube.types';
 
 export interface ContainerForTable {
@@ -39,17 +37,15 @@ export interface ContainerForTable {
 })
 export class KubernetesPodContainersComponent extends CardCell<KubernetesPod> {
 
-  private entityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType);
-
   @Input()
   set row(row: KubernetesPod) {
     if (!row || !!this.containerDataSource) {
       return;
     }
-    // TODO: RC 
+    const id = kubeEntityCatalog.pod.getSchema().getId(row);
     this.containerDataSource = {
       isTableLoading$: of(false),
-      connect: () => this.store.select<KubernetesPod>(selectEntity(this.entityConfig.entityKey, row.metadata.uid)).pipe(
+      connect: () => kubeEntityCatalog.pod.store.getEntityMonitor(id).entity$.pipe(
         filter(pod => !!pod),
         map(pod => this.map(pod)),
       ),
diff --git a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts
index 9f6eee394f..5a39ea5df7 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts
@@ -3,9 +3,20 @@ import {
 } from '../../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import {
   CreateKubernetesNamespace,
+  GeKubernetesDeployments,
+  GetKubernetesDashboard,
   GetKubernetesNamespace,
+  GetKubernetesNamespaces,
   GetKubernetesNode,
   GetKubernetesNodes,
+  GetKubernetesPod,
+  GetKubernetesPods,
+  GetKubernetesPodsInNamespace,
+  GetKubernetesPodsOnNode,
+  GetKubernetesServices,
+  GetKubernetesServicesInNamespace,
+  GetKubernetesStatefulSets,
+  KubeHealthCheck,
 } from '../kubernetes.actions';
 
 export interface KubeAppActionBuilders extends OrchestratedActionBuilders {
@@ -16,24 +27,52 @@ export const kubeAppActionBuilders: KubeAppActionBuilders = {
 }
 
 export interface KubeStatefulSetsActionBuilders extends OrchestratedActionBuilders {
-
+  getMultiple: (
+    kubeGuid: string,
+    paginationKey: string,
+  ) => GetKubernetesStatefulSets
 }
 
 export const kubeStatefulSetsActionBuilders: KubeStatefulSetsActionBuilders = {
+  getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesStatefulSets(kubeGuid)
 }
 
 export interface KubePodActionBuilders extends OrchestratedActionBuilders {
-
+  get: (
+    podName: string,
+    kubeGuid: string,
+    extraArgs: { namespace: string }
+  ) => GetKubernetesPod,
+  getMultiple: (
+    kubeGuid: string,
+    paginationKey: string,
+  ) => GetKubernetesPods
+  getOnNode: (
+    kubeGuid: string,
+    nodeName: string
+  ) => GetKubernetesPodsOnNode
+  getInNamespace: (
+    kubeGuid: string,
+    namespace: string
+  ) => GetKubernetesPodsInNamespace
 }
 
 export const kubePodActionBuilders: KubePodActionBuilders = {
+  get: (podName: string, kubeGuid: string, { namespace }) => new GetKubernetesPod(podName, namespace, kubeGuid),
+  getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesPods(kubeGuid),
+  getOnNode: (kubeGuid: string, nodeName: string) => new GetKubernetesPodsOnNode(kubeGuid, nodeName),
+  getInNamespace: (kubeGuid: string, namespace: string) => new GetKubernetesPodsInNamespace(kubeGuid, namespace)
 }
 
 export interface KubeDeploymentActionBuilders extends OrchestratedActionBuilders {
-
+  getMultiple: (
+    kubeGuid: string,
+    paginationKey: string,
+  ) => GeKubernetesDeployments
 }
 
 export const kubeDeploymentActionBuilders: KubeDeploymentActionBuilders = {
+  getMultiple: (kubeGuid: string, paginationKey: string) => new GeKubernetesDeployments(kubeGuid)
 }
 
 export interface KubeNodeActionBuilders extends OrchestratedActionBuilders {
@@ -45,11 +84,15 @@ export interface KubeNodeActionBuilders extends OrchestratedActionBuilders {
     kubeGuid: string,
     paginationKey: string,
   ) => GetKubernetesNodes
+  healthCheck: (
+    kubeGuid: string,
+  ) => KubeHealthCheck;
 }
 
 export const kubeNodeActionBuilders: KubeNodeActionBuilders = {
   get: (nodeName: string, endpointGuid: string) => new GetKubernetesNode(nodeName, endpointGuid),
-  getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesNodes(kubeGuid)
+  getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesNodes(kubeGuid),
+  healthCheck: (kubeGuid: string) => new KubeHealthCheck(kubeGuid)
 }
 
 export interface KubeNamespaceActionBuilders extends OrchestratedActionBuilders {
@@ -61,25 +104,42 @@ export interface KubeNamespaceActionBuilders extends OrchestratedActionBuilders
     namespace: string,
     kubeGuid: string
   ) => CreateKubernetesNamespace;
+  getMultiple: (
+    kubeGuid: string,
+    paginationKey: string,
+  ) => GetKubernetesNamespaces
 }
 
 export const kubeNamespaceActionBuilders: KubeNamespaceActionBuilders = {
   get: (namespace: string, kubeGuid: string) => new GetKubernetesNamespace(namespace, kubeGuid),
-  create: (namespace: string, kubeGuid: string) => new CreateKubernetesNamespace(namespace, kubeGuid)
+  create: (namespace: string, kubeGuid: string) => new CreateKubernetesNamespace(namespace, kubeGuid),
+  getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesNamespaces(kubeGuid)
 }
 
 export interface KubeServiceActionBuilders extends OrchestratedActionBuilders {
-
+  getMultiple: (
+    kubeGuid: string,
+    paginationKey: string
+  ) => GetKubernetesServices
+  getInNamespace: (
+    namespace: string,
+    kubeGuid: string
+  ) => GetKubernetesServicesInNamespace
 }
 
 export const kubeServiceActionBuilders: KubeServiceActionBuilders = {
+  getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesServices(kubeGuid),
+  getInNamespace: (namespace: string, kubeGuid: string) => new GetKubernetesServicesInNamespace(kubeGuid, namespace)
 }
 
 export interface KubeDashboardActionBuilders extends OrchestratedActionBuilders {
-
+  get: (
+    kubeGuid: string
+  ) => GetKubernetesDashboard;
 }
 
 export const kubeDashboardActionBuilders: KubeDashboardActionBuilders = {
+  get: (kubeGuid: string) => new GetKubernetesDashboard(kubeGuid)
 }
 
 // export interface A extends OrchestratedActionBuilders {

From 1b9ce7ba0b9b6556f100d761314b7276c225239e Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 13 May 2020 12:02:57 +0100
Subject: [PATCH 502/648] WIP

---
 .../create-release.component.ts               | 19 +++---
 .../kubernetes/kubernetes.setup.module.ts     |  7 +--
 .../kubernetes-namespace-pods-data-source.ts  |  4 +-
 ...bernetes-namespace-services-data-source.ts |  5 +-
 .../kubernetes-namespaces-data-source.ts      |  4 +-
 .../kubernetes-node-pods-data-source.ts       |  4 +-
 .../kubernetes-nodes-data-source.ts           |  6 +-
 .../kubernetes-pods-data-source.ts            |  4 +-
 .../pod-metrics/pod-metrics.component.ts      | 18 ++----
 .../services/kubernetes-endpoint.service.ts   | 63 ++++---------------
 .../services/kubernetes-namespace.service.ts  | 14 +----
 .../services/kubernetes-node.service.ts       | 12 +---
 .../action-builders/kube.action-builders.ts   | 24 +++----
 .../kubernetes-summary.component.ts           | 11 ++--
 .../kube-namespaces-filter-config.service.ts  | 33 ++++------
 15 files changed, 77 insertions(+), 151 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 c9c1a14fc6..addfb39838 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
@@ -4,8 +4,6 @@ import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { MatTextareaAutosize } from '@angular/material';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
-import { PaginationMonitorFactory } from 'frontend/packages/store/src/monitors/pagination-monitor.factory';
-import { getPaginationObservables } from 'frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { BehaviorSubject, combineLatest, Observable, of, Subscription } from 'rxjs';
 import { distinctUntilChanged, filter, first, map, pairwise, startWith, switchMap, tap } from 'rxjs/operators';
 
@@ -20,10 +18,14 @@ import { StepOnNextFunction, StepOnNextResult } from '../../../shared/components
 import { kubeEntityCatalog } from '../../kubernetes/kubernetes-entity-catalog';
 import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes/kubernetes-entity-factory';
 import { KubernetesNamespace } from '../../kubernetes/store/kube.types';
-import { GetKubernetesNamespaces } from '../../kubernetes/store/kubernetes.actions';
 import { HelmInstall } from '../store/helm.actions';
 import { HelmInstallValues } from '../store/helm.types';
 
+
+// private pmf: PaginationMonitorFactory, // TODO: RC search and destroy
+// private emf: EntityMonitorFactory // TODO: RC search and destroy
+// store.dispatch
+
 @Component({
   selector: 'app-create-release',
   templateUrl: './create-release.component.html',
@@ -66,7 +68,7 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     private store: Store<AppState>,
     private httpClient: HttpClient,
     private confirmDialog: ConfirmationDialogService,
-    private pmf: PaginationMonitorFactory, // TODO: RC search and destroy
+    // private pmf: PaginationMonitorFactory, // TODO: RC search and destroy
     private emf: EntityMonitorFactory // TODO: RC search and destroy
   ) {
     const chart = this.route.snapshot.params;
@@ -100,13 +102,8 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
 
     this.kubeEndpoints$ = this.endpointsService.connectedEndpointsOfTypes(KUBERNETES_ENDPOINT_TYPE);
 
-    const action = new GetKubernetesNamespaces(null);
-    const allNamespaces$ = getPaginationObservables<KubernetesNamespace>({
-      store: this.store,
-      action,
-      paginationMonitor: this.pmf.create(action.paginationKey, action, true)
-    }).entities$.pipe(
-      tap(a => console.log(action, a)),
+    const allNamespaces$ = kubeEntityCatalog.namespace.store.getPaginationService(null).entities$.pipe(
+      // tap(a => console.log(action, a)), // TODO: RC find all console.log
       filter(namespaces => !!namespaces),
       first()
     );
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
index 305457f572..45f33e0292 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
@@ -1,8 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NgModule, Optional, SkipSelf } from '@angular/core';
-import { Store } from '@ngrx/store';
 
-import { AppState } from '../../../../store/src/app-state';
 import { EntityCatalogModule } from '../../../../store/src/entity-catalog.module';
 import { EndpointHealthCheck } from '../../../endpoints-health-checks';
 import { CoreModule } from '../../core/core.module';
@@ -16,12 +14,12 @@ import {
   KubernetesConfigAuthFormComponent,
 } from './auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component';
 import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component';
+import { kubeEntityCatalog } from './kubernetes-entity-catalog';
 import { KUBERNETES_ENDPOINT_TYPE } from './kubernetes-entity-factory';
 import { generateKubernetesEntities } from './kubernetes-entity-generator';
 import { BaseKubeGuid } from './kubernetes-page.types';
 import { KubernetesStoreModule } from './kubernetes.store.module';
 import { KubernetesEndpointService } from './services/kubernetes-endpoint.service';
-import { KubeHealthCheck } from './store/kubernetes.actions';
 
 
 @NgModule({
@@ -52,14 +50,13 @@ import { KubeHealthCheck } from './store/kubernetes.actions';
 export class KubernetesSetupModule {
   constructor(
     endpointService: EndpointsService,
-    store: Store<AppState>,
     @Optional() @SkipSelf() parentModule: KubernetesSetupModule
   ) {
     if (parentModule) {
       // Module has already been imported
     } else {
       endpointService.registerHealthCheck(
-        new EndpointHealthCheck(KUBERNETES_ENDPOINT_TYPE, (endpoint) => store.dispatch(new KubeHealthCheck(endpoint.guid)))
+        new EndpointHealthCheck(KUBERNETES_ENDPOINT_TYPE, (endpoint) => kubeEntityCatalog.node.api.healthCheck(endpoint.guid))
       );
     }
   }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
index aef7b05503..b5c6dbc2aa 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
@@ -3,11 +3,11 @@ import { Store } from '@ngrx/store';
 import { AppState } from '../../../../../../store/src/app-state';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
+import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { kubernetesEntityFactory, kubernetesPodsEntityType } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesNamespaceService } from '../../services/kubernetes-namespace.service';
 import { KubernetesPod } from '../../store/kube.types';
-import { GetKubernetesPodsInNamespace } from '../../store/kubernetes.actions';
 
 export class KubernetesNamespacePodsDataSource extends ListDataSource<KubernetesPod, any> {
 
@@ -17,7 +17,7 @@ export class KubernetesNamespacePodsDataSource extends ListDataSource<Kubernetes
     listConfig: IListConfig<KubernetesPod>,
     kubeNamespaceService: KubernetesNamespaceService,
   ) {
-    const action = new GetKubernetesPodsInNamespace(kubeGuid.guid, kubeNamespaceService.namespaceName);
+    const action = kubeEntityCatalog.pod.actions.getInNamespace(kubeGuid.guid, kubeNamespaceService.namespaceName);
     super({
       store,
       action,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts
index 063318f97f..beb0626c7e 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts
@@ -2,9 +2,9 @@ import { Store } from '@ngrx/store';
 
 import { AppState } from '../../../../../../store/src/app-state';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
+import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubeService } from '../../store/kube.types';
-import { GetKubernetesServicesInNamespace } from '../../store/kubernetes.actions';
 import { BaseKubernetesServicesDataSource } from '../kubernetes-services/kubernetes-services-data-source';
 
 
@@ -16,10 +16,9 @@ export class KubernetesNamespaceServicesDataSource extends BaseKubernetesService
     listConfig: IListConfig<KubeService>,
     namespace: string,
   ) {
-    const action = new GetKubernetesServicesInNamespace(kubeGuid.guid, namespace);
     super(
       store,
-      action,
+      kubeEntityCatalog.service.actions.getInNamespace(namespace, kubeGuid.guid),
       listConfig
     );
   }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
index eb8d545f24..2c3a375252 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
@@ -4,10 +4,10 @@ import { getPaginationKey } from '../../../../../../store/src/actions/pagination
 import { AppState } from '../../../../../../store/src/app-state';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
+import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { kubernetesNamespacesEntityType } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesNamespace } from '../../store/kube.types';
-import { GetKubernetesNamespaces } from '../../store/kubernetes.actions';
 
 
 export class KubernetesNamespacesDataSource extends ListDataSource<KubernetesNamespace> {
@@ -17,7 +17,7 @@ export class KubernetesNamespacesDataSource extends ListDataSource<KubernetesNam
     kubeGuid: BaseKubeGuid,
     listConfig: IListConfig<KubernetesNamespace>
   ) {
-    const action = new GetKubernetesNamespaces(kubeGuid.guid);
+    const action = kubeEntityCatalog.namespace.actions.getMultiple(kubeGuid.guid);
     super({
       store,
       action,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
index ffd661ee3e..f89ae7ae9f 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
@@ -3,10 +3,10 @@ import { Store } from '@ngrx/store';
 import { AppState } from '../../../../../../store/src/app-state';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
+import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesNodeService } from '../../services/kubernetes-node.service';
 import { KubernetesPod } from '../../store/kube.types';
-import { GetKubernetesPodsOnNode } from '../../store/kubernetes.actions';
 
 export class KubernetesNodePodsDataSource extends ListDataSource<KubernetesPod> {
 
@@ -16,7 +16,7 @@ export class KubernetesNodePodsDataSource extends ListDataSource<KubernetesPod>
     listConfig: IListConfig<KubernetesPod>,
     kubeNodeService: KubernetesNodeService,
   ) {
-    const action = new GetKubernetesPodsOnNode(kubeGuid.guid, kubeNodeService.nodeName);
+    const action = kubeEntityCatalog.pod.actions.getOnNode(kubeGuid.guid, kubeNodeService.nodeName);
     super({
       store,
       action,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
index a4cb7c905a..30678de266 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
@@ -8,10 +8,10 @@ import {
   ListDataSource,
 } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
+import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { kubernetesNodesEntityType } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesNode } from '../../store/kube.types';
-import { GetKubernetesNodes } from '../../store/kubernetes.actions';
 
 export class KubernetesNodesDataSource extends ListDataSource<KubernetesNode> {
 
@@ -21,10 +21,10 @@ export class KubernetesNodesDataSource extends ListDataSource<KubernetesNode> {
     listConfig: IListConfig<KubernetesNode>,
     transformEntities: (DataFunction<KubernetesNode> | DataFunctionDefinition)[]
   ) {
-    const action = new GetKubernetesNodes(kubeGuid.guid);
+    const action = kubeEntityCatalog.node.actions.getMultiple(kubeGuid.guid);
     super({
       store,
-      action: new GetKubernetesNodes(kubeGuid.guid),
+      action,
       schema: action.entity[0],
       getRowUniqueId: (row) => action.entity[0].getId(row),
       paginationKey: getPaginationKey(kubernetesNodesEntityType, kubeGuid.guid),
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
index abd06114e6..57d56cf38a 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
@@ -3,9 +3,9 @@ import { Store } from '@ngrx/store';
 import { AppState } from '../../../../../../store/src/app-state';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
+import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesPod } from '../../store/kube.types';
-import { GetKubernetesPods } from '../../store/kubernetes.actions';
 
 export class KubernetesPodsDataSource extends ListDataSource<KubernetesPod> {
 
@@ -14,7 +14,7 @@ export class KubernetesPodsDataSource extends ListDataSource<KubernetesPod> {
     kubeGuid: BaseKubeGuid,
     listConfig: IListConfig<KubernetesPod>
   ) {
-    const action = new GetKubernetesPods(kubeGuid.guid);
+    const action = kubeEntityCatalog.pod.actions.getMultiple(kubeGuid.guid);
     super({
       store,
       action,
diff --git a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts b/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
index 8f144d0768..0da0a94369 100644
--- a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
@@ -1,12 +1,8 @@
 import { Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Store } from '@ngrx/store';
-import * as moment from 'moment';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { AppState } from '../../../../../store/src/app-state';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { EntityInfo } from '../../../../../store/src/types/api.types';
 import { ChartSeries, IMetricMatrixResult } from '../../../../../store/src/types/base-metric.types';
 import { IMetricApplication } from '../../../../../store/src/types/metric.types';
@@ -18,12 +14,13 @@ import {
   getMetricsChartConfigBuilder,
 } from '../../../shared/components/metrics-chart/metrics.component.helpers';
 import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types';
+import { kubeEntityCatalog } from '../kubernetes-entity-catalog';
+import { formatAxisCPUTime, formatCPUTime } from '../kubernetes-metrics.helpers';
 import { BaseKubeGuid } from '../kubernetes-page.types';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
 import { KubernetesService } from '../services/kubernetes.service';
 import { KubernetesPod } from '../store/kube.types';
-import { FetchKubernetesMetricsAction, GetKubernetesPod } from '../store/kubernetes.actions';
-import { formatCPUTime, formatAxisCPUTime } from '../kubernetes-metrics.helpers';
+import { FetchKubernetesMetricsAction } from '../store/kubernetes.actions';
 
 @Component({
   selector: 'app-pod-metrics',
@@ -58,8 +55,6 @@ export class PodMetricsComponent {
 
   constructor(
     public activatedRoute: ActivatedRoute,
-    public store: Store<AppState>,
-    public entityServiceFactory: EntityServiceFactory,
     public kubeEndpointService: KubernetesEndpointService
   ) {
     this.podName = activatedRoute.snapshot.params.podName;
@@ -166,9 +161,8 @@ export class PodMetricsComponent {
         }];
       })
     );
-    this.podEntity$ = this.entityServiceFactory.create<KubernetesPod>(
-      this.podName,
-      new GetKubernetesPod(this.podName, this.namespaceName, this.kubeEndpointService.kubeGuid),
-    ).entityObs$;
+    this.podEntity$ = kubeEntityCatalog.pod.store.getEntityService(this.podName, this.kubeEndpointService.kubeGuid, {
+      namespace: this.namespaceName
+    }).entityObs$;
   }
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
index 612e762654..cd6c67b9f3 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
@@ -7,17 +7,10 @@ import { GetAllEndpoints } from '../../../../../store/src/actions/endpoint.actio
 import { AppState } from '../../../../../store/src/app-state';
 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 { PaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
 import { EntityInfo } from '../../../../../store/src/types/api.types';
 import { EndpointModel, EndpointUser } from '../../../../../store/src/types/endpoint.types';
-import {
-  kubernetesDeploymentsEntityType,
-  kubernetesNodesEntityType,
-  kubernetesPodsEntityType,
-  kubernetesServicesEntityType,
-  kubernetesStatefulSetsEntityType,
-} from '../kubernetes-entity-factory';
+import { kubeEntityCatalog } from '../kubernetes-entity-catalog';
 import { BaseKubeGuid } from '../kubernetes-page.types';
 import {
   KubernetesDeployment,
@@ -26,15 +19,6 @@ import {
   KubernetesStatefulSet,
   KubeService,
 } from '../store/kube.types';
-import {
-  GeKubernetesDeployments,
-  GetKubernetesDashboard,
-  GetKubernetesNodes,
-  GetKubernetesPods,
-  GetKubernetesServices,
-  GetKubernetesStatefulSets,
-  KubePaginationAction,
-} from '../store/kubernetes.actions';
 import { KubeDashboardStatus } from '../store/kubernetes.effects';
 
 @Injectable()
@@ -61,7 +45,6 @@ export class KubernetesEndpointService {
     public baseKube: BaseKubeGuid,
     private store: Store<AppState>,
     private entityServiceFactory: EntityServiceFactory,
-    private paginationMonitorFactory: PaginationMonitorFactory
   ) {
     const kubeGuid = baseKube.guid;
 
@@ -160,40 +143,22 @@ export class KubernetesEndpointService {
 
     this.currentUser$ = this.endpoint$.pipe(map(e => e.entity.user), shareReplay(1));
 
-    this.deployments$ = this.getObservable<KubernetesDeployment>(
-      new GeKubernetesDeployments(this.kubeGuid),
-      kubernetesDeploymentsEntityType
-    );
+    this.deployments$ = this.getObservable<KubernetesDeployment>(kubeEntityCatalog.deployment.store.getPaginationService(this.kubeGuid));
 
-    this.pods$ = this.getObservable<KubernetesPod>(
-      new GetKubernetesPods(this.kubeGuid),
-      kubernetesPodsEntityType
-    );
+    this.pods$ = this.getObservable<KubernetesPod>(kubeEntityCatalog.pod.store.getPaginationService(this.kubeGuid));
 
-    this.nodes$ = this.getObservable<KubernetesNode>(
-      new GetKubernetesNodes(this.kubeGuid),
-      kubernetesNodesEntityType
-    );
+    this.nodes$ = this.getObservable<KubernetesNode>(kubeEntityCatalog.node.store.getPaginationService(this.kubeGuid))
 
-    this.statefulSets$ = this.getObservable<KubernetesStatefulSet>(
-      new GetKubernetesStatefulSets(this.kubeGuid),
-      kubernetesStatefulSetsEntityType
-    );
+    this.statefulSets$ = this.getObservable<KubernetesStatefulSet>(kubeEntityCatalog.statefulSet.store.getPaginationService(this.kubeGuid));
 
-    this.services$ = this.getObservable<KubeService>(
-      new GetKubernetesServices(this.kubeGuid),
-      kubernetesServicesEntityType
-    );
+    this.services$ = this.getObservable<KubeService>(kubeEntityCatalog.service.store.getPaginationService(this.kubeGuid));
 
     this.kubeDashboardEnabled$ = this.store.select('auth').pipe(
       filter(auth => !!auth.sessionData['plugin-config']),
       map(auth => auth.sessionData['plugin-config'].kubeDashboardEnabled === 'true')
     );
 
-    const kubeDashboardStatus$ = this.entityServiceFactory.create<KubeDashboardStatus>(
-      this.kubeGuid,
-      new GetKubernetesDashboard(this.kubeGuid),
-    ).waitForEntity$.pipe(
+    const kubeDashboardStatus$ = kubeEntityCatalog.dashboard.store.getEntityService(this.kubeGuid).waitForEntity$.pipe(
       map(status => status.entity),
       filter(status => !!status)
     );
@@ -223,14 +188,12 @@ export class KubernetesEndpointService {
   }
 
   public refreshKubernetesDashboardStatus() {
-    this.store.dispatch(new GetKubernetesDashboard(this.kubeGuid));
+    // this.store.dispatch(new GetKubernetesDashboard(this.kubeGuid)); // TODO: RC store.dispatch
+    kubeEntityCatalog.dashboard.api.get(this.kubeGuid);
   }
 
-  private getObservable<T>(paginationAction: KubePaginationAction, schemaKey: string): Observable<T[]> {
-    return getPaginationObservables<T>({
-      store: this.store,
-      action: paginationAction,
-      paginationMonitor: this.paginationMonitorFactory.create(paginationAction.paginationKey, paginationAction, true)
-    }, true).entities$.pipe(filter(p => !!p), first());
+  private getObservable<T>(obs: PaginationObservables<T>): Observable<T[]> {
+    return obs.entities$.pipe(filter(p => !!p), first());
   }
+
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts
index 0d58870122..c4686cf28b 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts
@@ -1,15 +1,11 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, first, map, publishReplay } from 'rxjs/operators';
 
-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 { getIdFromRoute } from '../../../core/utils.service';
+import { kubeEntityCatalog } from '../kubernetes-entity-catalog';
 import { KubernetesNamespace } from '../store/kube.types';
-import { GetKubernetesNamespace } from '../store/kubernetes.actions';
 import { KubernetesEndpointService } from './kubernetes-endpoint.service';
 
 @Injectable()
@@ -21,18 +17,12 @@ export class KubernetesNamespaceService {
   constructor(
     public kubeEndpointService: KubernetesEndpointService,
     public activatedRoute: ActivatedRoute,
-    public store: Store<AppState>,
-    public paginationMonitorFactory: PaginationMonitorFactory,
-    public entityServiceFactory: EntityServiceFactory,
   ) {
 
     this.namespaceName = getIdFromRoute(activatedRoute, 'namespaceName');
     this.kubeGuid = kubeEndpointService.kubeGuid;
 
-    const namespaceEntity = this.entityServiceFactory.create<KubernetesNamespace>(
-      this.namespaceName,
-      new GetKubernetesNamespace(this.namespaceName, this.kubeGuid),
-    );
+    const namespaceEntity = kubeEntityCatalog.namespace.store.getEntityService(this.namespaceName, this.kubeGuid);
 
     this.namespace$ = namespaceEntity.entityObs$.pipe(
       filter(p => !!p),
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts
index 74cc1f75d9..096eb86efa 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts
@@ -6,14 +6,13 @@ import { filter, first, map, shareReplay } from 'rxjs/operators';
 
 import { MetricQueryConfig, MetricsAction } from '../../../../../store/src/actions/metrics.actions';
 import { AppState } from '../../../../../store/src/app-state';
-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 { EntityInfo } from '../../../../../store/src/types/api.types';
 import { getIdFromRoute } from '../../../core/utils.service';
 import { MetricQueryType } from '../../../shared/services/metrics-range-selector.types';
+import { kubeEntityCatalog } from '../kubernetes-entity-catalog';
 import { KubernetesNode, MetricStatistic } from '../store/kube.types';
-import { FetchKubernetesMetricsAction, GetKubernetesNode } from '../store/kubernetes.actions';
+import { FetchKubernetesMetricsAction } from '../store/kubernetes.actions';
 import { KubernetesEndpointService } from './kubernetes-endpoint.service';
 
 
@@ -33,17 +32,12 @@ export class KubernetesNodeService {
     public kubeEndpointService: KubernetesEndpointService,
     public activatedRoute: ActivatedRoute,
     public store: Store<AppState>,
-    public paginationMonitorFactory: PaginationMonitorFactory,
-    public entityServiceFactory: EntityServiceFactory,
     public entityMonitorFactory: EntityMonitorFactory
   ) {
     this.nodeName = getIdFromRoute(activatedRoute, 'nodeName');
     this.kubeGuid = kubeEndpointService.kubeGuid;
 
-    const nodeEntityService = this.entityServiceFactory.create<KubernetesNode>(
-      this.nodeName,
-      new GetKubernetesNode(this.nodeName, this.kubeGuid),
-    );
+    const nodeEntityService = kubeEntityCatalog.node.store.getEntityService(this.nodeName, this.kubeGuid);
 
     this.node$ = nodeEntityService.entityObs$.pipe(
       filter(p => !!p && !!p.entity),
diff --git a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts
index 5a39ea5df7..e9a6d5d381 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts
@@ -29,12 +29,12 @@ export const kubeAppActionBuilders: KubeAppActionBuilders = {
 export interface KubeStatefulSetsActionBuilders extends OrchestratedActionBuilders {
   getMultiple: (
     kubeGuid: string,
-    paginationKey: string,
+    paginationKey?: string,
   ) => GetKubernetesStatefulSets
 }
 
 export const kubeStatefulSetsActionBuilders: KubeStatefulSetsActionBuilders = {
-  getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesStatefulSets(kubeGuid)
+  getMultiple: (kubeGuid: string, paginationKey?: string) => new GetKubernetesStatefulSets(kubeGuid)
 }
 
 export interface KubePodActionBuilders extends OrchestratedActionBuilders {
@@ -45,7 +45,7 @@ export interface KubePodActionBuilders extends OrchestratedActionBuilders {
   ) => GetKubernetesPod,
   getMultiple: (
     kubeGuid: string,
-    paginationKey: string,
+    paginationKey?: string,
   ) => GetKubernetesPods
   getOnNode: (
     kubeGuid: string,
@@ -59,7 +59,7 @@ export interface KubePodActionBuilders extends OrchestratedActionBuilders {
 
 export const kubePodActionBuilders: KubePodActionBuilders = {
   get: (podName: string, kubeGuid: string, { namespace }) => new GetKubernetesPod(podName, namespace, kubeGuid),
-  getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesPods(kubeGuid),
+  getMultiple: (kubeGuid: string, paginationKey?: string) => new GetKubernetesPods(kubeGuid),
   getOnNode: (kubeGuid: string, nodeName: string) => new GetKubernetesPodsOnNode(kubeGuid, nodeName),
   getInNamespace: (kubeGuid: string, namespace: string) => new GetKubernetesPodsInNamespace(kubeGuid, namespace)
 }
@@ -67,12 +67,12 @@ export const kubePodActionBuilders: KubePodActionBuilders = {
 export interface KubeDeploymentActionBuilders extends OrchestratedActionBuilders {
   getMultiple: (
     kubeGuid: string,
-    paginationKey: string,
+    paginationKey?: string,
   ) => GeKubernetesDeployments
 }
 
 export const kubeDeploymentActionBuilders: KubeDeploymentActionBuilders = {
-  getMultiple: (kubeGuid: string, paginationKey: string) => new GeKubernetesDeployments(kubeGuid)
+  getMultiple: (kubeGuid: string, paginationKey?: string) => new GeKubernetesDeployments(kubeGuid)
 }
 
 export interface KubeNodeActionBuilders extends OrchestratedActionBuilders {
@@ -82,7 +82,7 @@ export interface KubeNodeActionBuilders extends OrchestratedActionBuilders {
   ) => GetKubernetesNode
   getMultiple: (
     kubeGuid: string,
-    paginationKey: string,
+    paginationKey?: string,
   ) => GetKubernetesNodes
   healthCheck: (
     kubeGuid: string,
@@ -91,7 +91,7 @@ export interface KubeNodeActionBuilders extends OrchestratedActionBuilders {
 
 export const kubeNodeActionBuilders: KubeNodeActionBuilders = {
   get: (nodeName: string, endpointGuid: string) => new GetKubernetesNode(nodeName, endpointGuid),
-  getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesNodes(kubeGuid),
+  getMultiple: (kubeGuid: string, paginationKey?: string) => new GetKubernetesNodes(kubeGuid),
   healthCheck: (kubeGuid: string) => new KubeHealthCheck(kubeGuid)
 }
 
@@ -106,20 +106,20 @@ export interface KubeNamespaceActionBuilders extends OrchestratedActionBuilders
   ) => CreateKubernetesNamespace;
   getMultiple: (
     kubeGuid: string,
-    paginationKey: string,
+    paginationKey?: string,
   ) => GetKubernetesNamespaces
 }
 
 export const kubeNamespaceActionBuilders: KubeNamespaceActionBuilders = {
   get: (namespace: string, kubeGuid: string) => new GetKubernetesNamespace(namespace, kubeGuid),
   create: (namespace: string, kubeGuid: string) => new CreateKubernetesNamespace(namespace, kubeGuid),
-  getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesNamespaces(kubeGuid)
+  getMultiple: (kubeGuid: string, paginationKey?: string) => new GetKubernetesNamespaces(kubeGuid)
 }
 
 export interface KubeServiceActionBuilders extends OrchestratedActionBuilders {
   getMultiple: (
     kubeGuid: string,
-    paginationKey: string
+    paginationKey?: string
   ) => GetKubernetesServices
   getInNamespace: (
     namespace: string,
@@ -128,7 +128,7 @@ export interface KubeServiceActionBuilders extends OrchestratedActionBuilders {
 }
 
 export const kubeServiceActionBuilders: KubeServiceActionBuilders = {
-  getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesServices(kubeGuid),
+  getMultiple: (kubeGuid: string, paginationKey?: string) => new GetKubernetesServices(kubeGuid),
   getInNamespace: (namespace: string, kubeGuid: string) => new GetKubernetesServicesInNamespace(kubeGuid, namespace)
 }
 
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 5f7d4cdd5d..aa4186c638 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
@@ -16,8 +16,8 @@ import {
   IChartThresholds,
   ISimpleUsageChartData,
 } from '../../../../shared/components/simple-usage-chart/simple-usage-chart.types';
+import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
-import { GetKubernetesNamespaces, GetKubernetesNodes, GetKubernetesPods } from '../../store/kubernetes.actions';
 
 interface IValueLabels {
   usedLabel?: string;
@@ -113,9 +113,11 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
   ngOnInit() {
     const guid = this.kubeEndpointService.baseKube.guid;
 
-    const podCountAction = new GetKubernetesPods(guid);
-    const nodeCountAction = new GetKubernetesNodes(guid);
-    const namespacesCountAction = new GetKubernetesNamespaces(guid);
+
+
+    const podCountAction = kubeEntityCatalog.pod.actions.getMultiple(guid);
+    const nodeCountAction = kubeEntityCatalog.node.actions.getMultiple(guid);
+    const namespacesCountAction = kubeEntityCatalog.namespace.actions.getMultiple(guid);
     const pods$ = this.getPaginationObservable(podCountAction);
     const nodes$ = this.getPaginationObservable(nodeCountAction);
     const namespaces$ = this.getPaginationObservable(namespacesCountAction);
@@ -182,6 +184,7 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
       true
     );
 
+    // TODO: RC this could easily get backed up, would entityService .poll be better??
     this.ngZone.runOutsideAngular(() => {
       this.polls.push(
         interval(10000).subscribe(() => {
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 6132e3fc47..c49bd77483 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
@@ -2,8 +2,6 @@ import { Injectable, OnDestroy } from '@angular/core';
 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 { 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';
@@ -20,9 +18,9 @@ import {
 } from 'rxjs/operators';
 
 import { getCurrentPageRequestInfo } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
-import { KUBERNETES_ENDPOINT_TYPE, kubernetesEntityFactory } from '../../kubernetes-entity-factory';
+import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
+import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes-entity-factory';
 import { KubernetesNamespace } from '../../store/kube.types';
-import { GetKubernetesNamespaces } from '../../store/kubernetes.actions';
 
 export interface KubernetesNamespacesFilterItem<T = any> {
   list$: Observable<T[]>;
@@ -38,10 +36,9 @@ export class KubernetesNamespacesFilterService implements OnDestroy {
   public kube: KubernetesNamespacesFilterItem<EndpointModel>;
   public namespace: KubernetesNamespacesFilterItem<KubernetesNamespace>;
 
-  private isLoading$: Observable<boolean>;
+  // private isLoading$: Observable<boolean>;
   private subs: Subscription[] = [];
 
-  private paginationAction = new GetKubernetesNamespaces(null);
   private allNamespaces = this.getNamespacesObservable();
   private allNamespacesLoading$ = this.allNamespaces.pagination$.pipe(map(
     pag => getCurrentPageRequestInfo(pag).busy
@@ -49,7 +46,6 @@ export class KubernetesNamespacesFilterService implements OnDestroy {
 
   constructor(
     private store: Store<AppState>,
-    private paginationMonitorFactory: PaginationMonitorFactory,
   ) {
     this.kube = this.createKube();
     this.namespace = this.createNamespace();
@@ -57,24 +53,17 @@ export class KubernetesNamespacesFilterService implements OnDestroy {
     // Start watching the cf/org/space plus automatically setting values only when we actually have values to auto select
     this.namespace.list$.pipe(first()).subscribe(() => this.setupAutoSelectors());
 
-    this.isLoading$ = combineLatest(
-      this.kube.loading$,
-      this.namespace.loading$,
-    ).pipe(
-      map(([kubeLoading, nsLoading]) => kubeLoading || nsLoading)
-    );
+    // this.isLoading$ = combineLatest( // TODO: RC Not used??
+    //   this.kube.loading$,
+    //   this.namespace.loading$,
+    // ).pipe(
+    //   map(([kubeLoading, nsLoading]) => kubeLoading || nsLoading)
+    // );
   }
 
   private getNamespacesObservable() {
-    return getPaginationObservables<KubernetesNamespace>({
-      store: this.store,
-      action: this.paginationAction,
-      paginationMonitor: this.paginationMonitorFactory.create(
-        this.paginationAction.paginationKey,
-        kubernetesEntityFactory(this.paginationAction.entityType),
-        true
-      )
-    }, true);
+    // TODO: RC is local???
+    return kubeEntityCatalog.namespace.store.getPaginationService(null);
   }
 
   private createKube() {

From 76049dc499e5f7c58a2c8bdf1bc32a2b75cb6d11 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Wed, 13 May 2020 14:58:35 +0100
Subject: [PATCH 503/648] Merge upstream (#376)

* Add initial UI for backup/restore

* Convert connection details checkbox to drop down

* Add docs for max list feature

* Add db version check

* Tidy up #1

* Tidying & bug fixes. Handle client_secret

* Add minimum password length

* First pass encrypt/decrypt

* Tidy up

* Fix unit tests

* Re-add tests that now work

* Changes following review

* Move backup into it's own module

* 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

* CF Push: Ensure we refresh token

* Fix uaa docs. Make UAA endpoint config simpler

* Fix compile issues

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

* 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

* Autoscaler improvements

* Fix disabling of polling (#4260)

- fixes #4244

* 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

* Increase users table page size before searching for `e2e` user

* 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>

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

* Override name but do not set a random route

* 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

* 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>

* 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>

* 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>

* 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

* Version bump and change log for 3.2.0

* E2E Test improvements (#4275)

* Speed up form fill

* Fix page set setting

* Remove whitespace

* Add ability to provided a wildcard in path when matching urls (#4277)

* Update releas notes

* Only show metrics details on endpoint card/list when connected

* Fix icon alignment on service marketplace view

* 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

* CF Push: A better fix for the token expiry issue

* Update changelog for 3.2.0 (#4291)

* Fixes after merge

Co-authored-by: Neil MacDougall <neil_macdougall@hotmail.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: macevil <30493519+macevil@users.noreply.github.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Johannes Jungkunst <macevil@gmail.com>
---
 CHANGELOG.md                                  |  2 +
 .../service-tabs-base.component.html          | 14 ++--
 .../packages/core/src/core/core.module.ts     | 12 ++--
 .../core/src/core/user-profile.service.ts     | 68 +++++++++++--------
 .../backup-endpoints.component.html           |  2 +-
 .../metrics-endpoint-details.component.ts     |  1 +
 .../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 ++++-----
 .../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 ++++-
 17 files changed, 199 insertions(+), 131 deletions(-)
 create mode 100644 src/jetstream/plugins/cfapppush/connection_wrapper.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ace65b5a25..741e0a85ad 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)
+- Service 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)
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">
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/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 f11198e59d..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
@@ -14,7 +14,7 @@ <h1>Backup Endpoints</h1>
         <button mat-raised-button color="primary" [disabled]="disableSelectNone$ | async"
           (click)="service.selectNone()">Select None</button>
       </div>
-      <app-table [dataSource]="endpointDataSource" [columns]="columns" [minRowHeight]="'77px'"></app-table>
+      <app-table [dataSource]="endpointDataSource" [columns]="columns"></app-table>
     </div>
     <ng-template #noEndpoints>
       <p>There are no endpoints to backup</p>
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));
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..08eb2e060b 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 unknown 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;
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 0bcb71188f0ef2f604a8bb2865fa9a73cbd5d5ed Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 13 May 2020 17:53:03 +0100
Subject: [PATCH 504/648] WIP

---
 .../kubernetes/kubernetes-entity-catalog.ts   |  6 +-
 .../action-builders/kube.action-builders.ts   | 22 +++++---
 .../helm-release-pods-list-source.ts          |  4 +-
 .../list-types/helm-releases-list-source.ts   |  8 +--
 .../helm-release-tab-base.component.ts        | 27 ++++-----
 .../tabs/helm-release-helper.service.ts       | 55 ++++++++-----------
 .../helm-release-summary-tab.component.ts     |  4 +-
 .../store/workload-action-builders.ts         | 42 ++++++++++++++
 .../store/workloads-entity-factory.ts         | 26 ++++++---
 .../store/workloads-entity-generator.ts       | 35 ++++++++++--
 .../workloads/store/workloads.actions.ts      | 44 ++++++++++-----
 .../workloads/store/workloads.effects.ts      | 10 ++--
 .../workloads/workloads-entity-catalog.ts     | 20 +++++++
 13 files changed, 207 insertions(+), 96 deletions(-)
 create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/workloads-entity-catalog.ts

diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts
index 72cf4013ba..a59854a6f1 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts
@@ -37,8 +37,10 @@ export class KubeEntityCatalog {
   public namespace: StratosCatalogEntity<IFavoriteMetadata, KubernetesNamespace, KubeNamespaceActionBuilders>;
   public service: StratosCatalogEntity<IFavoriteMetadata, KubeService, KubeServiceActionBuilders>
   public dashboard: StratosCatalogEntity<IFavoriteMetadata, any, KubeDashboardActionBuilders>;
-  // TODO: RC workloads stuff
 }
 
-
+/**
+ * A strongly typed collection of Kube Catalog Entities.
+ * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc
+ */
 export const kubeEntityCatalog: KubeEntityCatalog = new KubeEntityCatalog();
diff --git a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts
index e9a6d5d381..51f1bc53c9 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts
@@ -1,6 +1,7 @@
 import {
   OrchestratedActionBuilders,
 } from '../../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
+import { GetHelmReleasePods, GetHelmReleaseServices } from '../../workloads/store/workloads.actions';
 import {
   CreateKubernetesNamespace,
   GeKubernetesDeployments,
@@ -55,13 +56,18 @@ export interface KubePodActionBuilders extends OrchestratedActionBuilders {
     kubeGuid: string,
     namespace: string
   ) => GetKubernetesPodsInNamespace
+  getInWorkload: (
+    kubeGuid: string,
+    releaseTitle: string
+  ) => GetHelmReleasePods
 }
 
 export const kubePodActionBuilders: KubePodActionBuilders = {
   get: (podName: string, kubeGuid: string, { namespace }) => new GetKubernetesPod(podName, namespace, kubeGuid),
   getMultiple: (kubeGuid: string, paginationKey?: string) => new GetKubernetesPods(kubeGuid),
   getOnNode: (kubeGuid: string, nodeName: string) => new GetKubernetesPodsOnNode(kubeGuid, nodeName),
-  getInNamespace: (kubeGuid: string, namespace: string) => new GetKubernetesPodsInNamespace(kubeGuid, namespace)
+  getInNamespace: (kubeGuid: string, namespace: string) => new GetKubernetesPodsInNamespace(kubeGuid, namespace),
+  getInWorkload: (kubeGuid: string, releaseTitle: string) => new GetHelmReleasePods(kubeGuid, releaseTitle)
 }
 
 export interface KubeDeploymentActionBuilders extends OrchestratedActionBuilders {
@@ -125,11 +131,16 @@ export interface KubeServiceActionBuilders extends OrchestratedActionBuilders {
     namespace: string,
     kubeGuid: string
   ) => GetKubernetesServicesInNamespace
+  getInWorkload: (
+    releaseTitle: string,
+    kubeGuid: string
+  ) => GetHelmReleaseServices
 }
 
 export const kubeServiceActionBuilders: KubeServiceActionBuilders = {
   getMultiple: (kubeGuid: string, paginationKey?: string) => new GetKubernetesServices(kubeGuid),
-  getInNamespace: (namespace: string, kubeGuid: string) => new GetKubernetesServicesInNamespace(kubeGuid, namespace)
+  getInNamespace: (namespace: string, kubeGuid: string) => new GetKubernetesServicesInNamespace(kubeGuid, namespace),
+  getInWorkload: (releaseTitle: string, kubeGuid: string) => new GetHelmReleaseServices(kubeGuid, releaseTitle)
 }
 
 export interface KubeDashboardActionBuilders extends OrchestratedActionBuilders {
@@ -141,10 +152,3 @@ export interface KubeDashboardActionBuilders extends OrchestratedActionBuilders
 export const kubeDashboardActionBuilders: KubeDashboardActionBuilders = {
   get: (kubeGuid: string) => new GetKubernetesDashboard(kubeGuid)
 }
-
-// export interface A extends OrchestratedActionBuilders {
-
-// }
-
-// export const a: A = {
-// }
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts
index 317867b68d..6726c3ef26 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts
@@ -3,8 +3,8 @@ import { ListDataSource } from 'frontend/packages/core/src/shared/components/lis
 import { IListConfig } from 'frontend/packages/core/src/shared/components/list/list.component.types';
 import { AppState } from 'frontend/packages/store/src/app-state';
 
+import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { KubernetesPod } from '../../store/kube.types';
-import { GetHelmReleasePods } from '../store/workloads.actions';
 
 
 export class HelmReleasePodsDataSource extends ListDataSource<KubernetesPod> {
@@ -15,7 +15,7 @@ export class HelmReleasePodsDataSource extends ListDataSource<KubernetesPod> {
     endpointGuid: string,
     releaseTitle: string
   ) {
-    const action = new GetHelmReleasePods(endpointGuid, releaseTitle);
+    const action = kubeEntityCatalog.pod.actions.getInWorkload(endpointGuid, releaseTitle);
     super({
       store,
       action,
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts
index 35bf800960..56a4505195 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts
@@ -11,9 +11,9 @@ import { AppState } from 'frontend/packages/store/src/app-state';
 import { PaginationEntityState } from 'frontend/packages/store/src/types/pagination.types';
 
 import { kubernetesEntityFactory } from '../../kubernetes-entity-factory';
-import { getHelmReleaseId, helmReleaseEntityKey } from '../store/workloads-entity-factory';
-import { GetHelmReleases } from '../store/workloads.actions';
+import { helmReleaseEntityKey } from '../store/workloads-entity-factory';
 import { HelmRelease } from '../workload.types';
+import { workloadsEntityCatalog } from '../workloads-entity-catalog';
 
 const kubeEndpointFilter = (entities: HelmRelease[], paginationState: PaginationEntityState) => {
   // Filter by Kube Endpoint and Namespace
@@ -33,13 +33,13 @@ export class HelmReleasesDataSource extends ListDataSource<HelmRelease> {
     store: Store<AppState>,
     listConfig: IListConfig<HelmRelease>
   ) {
-    const action = new GetHelmReleases();
+    const action = workloadsEntityCatalog.release.actions.getMultiple();
     const transformEntities = [{ type: 'filter' as DataFunctionDefinitionType, field: 'name' }, kubeEndpointFilter];
     super({
       store,
       action,
       schema: kubernetesEntityFactory(helmReleaseEntityKey),
-      getRowUniqueId: getHelmReleaseId,
+      getRowUniqueId: row => action.entity[0].getId(row),
       paginationKey: action.paginationKey,
       isLocal: true,
       transformEntities,
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 5f5ad87171..032037ea6f 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
@@ -10,16 +10,12 @@ import { Observable, Subject, Subscription } from 'rxjs';
 import makeWebSocketObservable, { GetWebSocketResponses } from 'rxjs-websockets';
 import { catchError, map, share, switchMap } from 'rxjs/operators';
 
+import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog';
 import { KubernetesPodExpandedStatusHelper } from '../../../services/kubernetes-expanded-state';
 import { KubernetesPod, KubeService } from '../../../store/kube.types';
 import { KubePaginationAction } from '../../../store/kubernetes.actions';
-import {
-  GetHelmReleaseGraph,
-  GetHelmReleasePods,
-  GetHelmReleaseResource,
-  GetHelmReleaseServices,
-} from '../../store/workloads.actions';
 import { HelmReleaseGraph, HelmReleaseGuid, HelmReleasePod, HelmReleaseService } from '../../workload.types';
+import { workloadsEntityCatalog } from '../../workloads-entity-catalog';
 import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service';
 
 
@@ -113,14 +109,16 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
             res.metadata.kubeId = this.helmReleaseHelper.endpointGuid;
             return res;
           });
-          const releasePodsAction = new GetHelmReleasePods(this.helmReleaseHelper.endpointGuid, this.helmReleaseHelper.releaseTitle);
+          const releasePodsAction = kubeEntityCatalog.pod.actions.getInWorkload(
+            this.helmReleaseHelper.endpointGuid,
+            this.helmReleaseHelper.releaseTitle
+          );
           this.populateList(releasePodsAction, podsWithInfo);
         } else if (messageObj.kind === 'Graph') {
           const graph: HelmReleaseGraph = messageObj.data;
           graph.endpointId = this.helmReleaseHelper.endpointGuid;
           graph.releaseTitle = this.helmReleaseHelper.releaseTitle;
-          const releaseGraphAction = new GetHelmReleaseGraph(graph.endpointId, graph.releaseTitle);
-
+          const releaseGraphAction = workloadsEntityCatalog.graph.actions.get(graph.releaseTitle, graph.endpointId);
           this.addResource(releaseGraphAction, graph);
         } else if (messageObj.kind === 'Manifest' || messageObj.kind === 'Resources') {
           // Store all of the services
@@ -134,17 +132,20 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
             }
           });
           if (svcs.length > 0) {
-            const releaseServicesAction = new GetHelmReleaseServices(
+            const releaseServicesAction = kubeEntityCatalog.service.actions.getInWorkload(
+              this.helmReleaseHelper.releaseTitle,
               this.helmReleaseHelper.endpointGuid,
-              this.helmReleaseHelper.releaseTitle
-            );
+            )
             this.populateList(releaseServicesAction, svcs);
           }
 
           const resources = { ...manifest };
           resources.endpointId = this.helmReleaseHelper.endpointGuid;
           resources.releaseTitle = this.helmReleaseHelper.releaseTitle;
-          const releaseResourceAction = new GetHelmReleaseResource(resources.endpointId, resources.releaseTitle);
+          const releaseResourceAction = workloadsEntityCatalog.resource.actions.get(
+            resources.releaseTitle,
+            resources.endpointId,
+          );
           this.addResource(releaseResourceAction, resources);
         }
       }
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 aa8a7b73c9..0f193ea044 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,20 +1,10 @@
 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';
-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';
 import { Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
+import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog';
 import { KubernetesPod } from '../../../store/kube.types';
-import {
-  GetHelmRelease,
-  GetHelmReleaseGraph,
-  GetHelmReleasePods,
-  GetHelmReleaseResource,
-} from '../../store/workloads.actions';
+import { getHelmReleaseDetailsFromGuid } from '../../store/workloads-entity-factory';
 import {
   HelmRelease,
   HelmReleaseChartData,
@@ -22,6 +12,7 @@ import {
   HelmReleaseGuid,
   HelmReleaseResource,
 } from '../../workload.types';
+import { workloadsEntityCatalog } from '../../workloads-entity-catalog';
 
 
 @Injectable()
@@ -38,17 +29,18 @@ export class HelmReleaseHelperService {
 
   constructor(
     helmReleaseGuid: HelmReleaseGuid,
-    private store: Store<AppState>,
-    private esf: EntityServiceFactory,
-    private paginationMonitorFactory: PaginationMonitorFactory,
   ) {
     this.guid = helmReleaseGuid.guid;
-    this.releaseTitle = this.guid.split(':')[2];
-    this.namespace = this.guid.split(':')[1];
-    this.endpointGuid = this.guid.split(':')[0];
-
-    const action = new GetHelmRelease(this.endpointGuid, this.namespace, this.releaseTitle);
-    const entityService = this.esf.create<HelmRelease>(action.guid, action);
+    const { endpointId, namespace, releaseTitle } = getHelmReleaseDetailsFromGuid(this.guid);
+    this.releaseTitle = releaseTitle;
+    this.namespace = namespace;
+    this.endpointGuid = endpointId;
+
+    const entityService = workloadsEntityCatalog.release.store.getEntityService(
+      this.releaseTitle,
+      this.endpointGuid,
+      { namespace: this.namespace }
+    );
 
     this.release$ = entityService.waitForEntity$.pipe(
       map((item) => item.entity),
@@ -71,28 +63,27 @@ export class HelmReleaseHelperService {
 
   public fetchReleaseGraph(): Observable<HelmReleaseGraph> {
     // Get helm release
-    const action = new GetHelmReleaseGraph(this.endpointGuid, this.releaseTitle);
-    const entityKey = entityCatalog.getEntityKey(action);
-    return this.store.select(selectEntity<HelmReleaseGraph>(entityKey, action.guid)).pipe(
+    const guid = workloadsEntityCatalog.graph.actions.get(this.releaseTitle, this.endpointGuid).guid;
+    return workloadsEntityCatalog.graph.store.getEntityMonitor(guid).entity$.pipe(
       filter(graph => !!graph)
     );
   }
 
   public fetchReleaseResources(): Observable<HelmReleaseResource> {
     // Get helm release
-    const action = new GetHelmReleaseResource(this.endpointGuid, this.releaseTitle);
-    const entityKey = entityCatalog.getEntityKey(action);
-    return this.store.select(selectEntity<HelmReleaseResource>(entityKey, action.guid)).pipe(
+    return workloadsEntityCatalog.resource.store.getPaginationMonitor(
+      this.endpointGuid,
+      null,
+      { releaseTitle: this.releaseTitle }
+    ).currentPage$.pipe(
       filter(resources => !!resources)
     );
   }
 
   public fetchReleaseChartStats(): Observable<HelmReleaseChartData> {
-    const action = new GetHelmReleasePods(this.endpointGuid, this.releaseTitle);
-    return this.paginationMonitorFactory.create(
-      action.paginationKey,
-      action.entity[0],
-      true
+    return kubeEntityCatalog.pod.store.getInWorkload.getPaginationMonitor(
+      this.endpointGuid,
+      this.releaseTitle
     ).currentPage$.pipe(
       filter(pods => !!pods),
       map(this.mapPods)
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index 43b268b89a..daa29e2160 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -12,8 +12,8 @@ import { combineLatest, Observable, ReplaySubject } from 'rxjs';
 import { filter, first, map, publishReplay, refCount, startWith } from 'rxjs/operators';
 
 import { endpointsEntityRequestDataSelector } from '../../../../../../../../store/src/selectors/endpoint.selectors';
-import { GetHelmReleases } from '../../../store/workloads.actions';
 import { HelmReleaseChartData, HelmReleaseResource } from '../../../workload.types';
+import { workloadsEntityCatalog } from '../../../workloads-entity-catalog';
 import { HelmReleaseHelperService } from '../helm-release-helper.service';
 
 @Component({
@@ -188,7 +188,7 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
           this.logService.error('Failed to delete release: ', err);
         },
         complete: () => {
-          const action = new GetHelmReleases();
+          const action = workloadsEntityCatalog.release.actions.getMultiple();
           this.store.dispatch(new ClearPaginationOfType(action));
           this.completeDelete();
           this.store.dispatch(new RouterNav({ path: ['workloads'] }));
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts
new file mode 100644
index 0000000000..eb7591f9c5
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts
@@ -0,0 +1,42 @@
+import {
+  OrchestratedActionBuilders,
+} from '../../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
+import { GetHelmRelease, GetHelmReleaseGraph, GetHelmReleaseResource, GetHelmReleases } from './workloads.actions';
+
+export interface WorkloadReleaseBuilders extends OrchestratedActionBuilders {
+  get: (
+    title: string,
+    endpointGuid: string,
+    extraArgs: { namespace: string }
+  ) => GetHelmRelease;
+  getMultiple: () => GetHelmReleases;
+}
+
+export const workloadReleaseBuilders: WorkloadReleaseBuilders = {
+  get: (title: string, endpointGuid: string, { namespace }: { namespace: string }) => {
+    return new GetHelmRelease(endpointGuid, namespace, title);
+  },
+  getMultiple: () => new GetHelmReleases()
+}
+
+export interface WorkloadGraphBuilders extends OrchestratedActionBuilders {
+  get: (
+    releaseTitle: string,
+    endpointGuid: string
+  ) => GetHelmReleaseGraph
+}
+
+export const workloadGraphBuilders: WorkloadGraphBuilders = {
+  get: (releaseTitle: string, endpointGuid: string) => new GetHelmReleaseGraph(endpointGuid, releaseTitle)
+}
+
+export interface WorkloadResourceBuilders extends OrchestratedActionBuilders {
+  get: (
+    releaseTitle: string,
+    endpointGuid: string,
+  ) => GetHelmReleaseResource
+}
+
+export const workloadResourceBuilders: WorkloadResourceBuilders = {
+  get: (releaseTitle: string, endpointGuid: string) => new GetHelmReleaseResource(endpointGuid, releaseTitle)
+}
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts
index 1053c129c8..abce799544 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts
@@ -8,11 +8,21 @@ export const helmReleaseServiceEntityType = 'helmReleaseService';
 export const helmReleaseGraphEntityType = 'helmReleaseGraph';
 export const helmReleaseResourceEntityType = 'helmReleaseResource';
 
-export const getHelmReleaseId = (entity: HelmRelease) => `${entity.endpointId}-${entity.namespace}-${entity.name}`;
-// export const getHelmReleaseServiceId =
-// (entity: HelmReleaseService) => `${entity.endpointId}-${entity.releaseTitle}-${entity.metadata.name}`;
-export const getHelmReleaseGraphId = (entity: HelmReleaseGraph) => `${entity.endpointId}-${entity.releaseTitle}`;
-export const getHelmReleaseResourceId = (entity: HelmReleaseResource) => `${entity.endpointId}-${entity.releaseTitle}`;
+const separator = ':';
+export const getHelmReleaseDetailsFromGuid = (guid: string) => {
+  const parts = guid.split(separator);
+  return {
+    endpointId: parts[0],
+    namespace: parts[1],
+    releaseTitle: parts[2]
+  }
+}
+export const getHelmReleaseId = (endpointId: string, namespace: string, name: string) => `${endpointId}${separator}${namespace}${separator}${name}`;
+export const getHelmReleaseIdByObj = (entity: HelmRelease) => getHelmReleaseId(entity.endpointId, entity.namespace, entity.name);
+export const getHelmReleaseGraphId = (endpointId: string, releaseTitle: string) => `${endpointId}${separator}${releaseTitle}`;
+export const getHelmReleaseGraphIdByObj = (entity: HelmReleaseGraph) => getHelmReleaseGraphId(entity.endpointId, entity.releaseTitle);
+export const getHelmReleaseResourceId = (endpointId: string, releaseTitle: string) => `${endpointId}${separator}${releaseTitle}`;
+export const getHelmReleaseResourceIdByObj = (entity: HelmReleaseResource) => getHelmReleaseResourceId(entity.endpointId, entity.releaseTitle);
 
 const entityCache: {
   [key: string]: EntitySchema
@@ -21,19 +31,19 @@ const entityCache: {
 entityCache[helmReleaseEntityKey] = new KubernetesEntitySchema(
   helmReleaseEntityKey,
   {},
-  { idAttribute: getHelmReleaseId } // TODO: RC
+  { idAttribute: getHelmReleaseIdByObj }
 );
 
 entityCache[helmReleaseGraphEntityType] = new KubernetesEntitySchema(
   helmReleaseGraphEntityType,
   {},
-  { idAttribute: getHelmReleaseGraphId }
+  { idAttribute: getHelmReleaseGraphIdByObj }
 );
 
 entityCache[helmReleaseResourceEntityType] = new KubernetesEntitySchema(
   helmReleaseResourceEntityType,
   {},
-  { idAttribute: getHelmReleaseResourceId }
+  { idAttribute: getHelmReleaseResourceIdByObj }
 );
 
 Object.entries(entityCache).forEach(([key, workloadSchema]) => addKubernetesEntitySchema(key, workloadSchema));
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 fa0f66070f..2e39c1e892 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
@@ -7,6 +7,15 @@ import { IFavoriteMetadata } from 'frontend/packages/store/src/types/user-favori
 
 import { kubernetesEntityFactory } from '../../kubernetes-entity-factory';
 import { HelmRelease, HelmReleaseGraph, HelmReleaseResource } from '../workload.types';
+import { workloadsEntityCatalog } from '../workloads-entity-catalog';
+import {
+  WorkloadGraphBuilders,
+  workloadGraphBuilders,
+  WorkloadReleaseBuilders,
+  workloadReleaseBuilders,
+  WorkloadResourceBuilders,
+  workloadResourceBuilders,
+} from './workload-action-builders';
 import { helmReleaseEntityKey, helmReleaseGraphEntityType, helmReleaseResourceEntityType } from './workloads-entity-factory';
 
 
@@ -18,15 +27,19 @@ export function generateWorkloadsEntities(endpointDefinition: StratosEndpointExt
   ];
 }
 
-// TODO: RC
-
 function generateReleaseEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   const definition = {
     type: helmReleaseEntityKey,
     schema: kubernetesEntityFactory(helmReleaseEntityKey),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, HelmRelease>(definition);
+  workloadsEntityCatalog.release = new StratosCatalogEntity<IFavoriteMetadata, HelmRelease, WorkloadReleaseBuilders>(
+    definition,
+    {
+      actionBuilders: workloadReleaseBuilders
+    }
+  );
+  return workloadsEntityCatalog.release;
 }
 
 function generateReleaseGraphEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -35,7 +48,13 @@ function generateReleaseGraphEntity(endpointDefinition: StratosEndpointExtension
     schema: kubernetesEntityFactory(helmReleaseGraphEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseGraph>(definition);
+  workloadsEntityCatalog.graph = new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseGraph, WorkloadGraphBuilders>(
+    definition,
+    {
+      actionBuilders: workloadGraphBuilders
+    }
+  );
+  return workloadsEntityCatalog.graph;
 }
 
 function generateReleaseResourceEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -44,6 +63,12 @@ function generateReleaseResourceEntity(endpointDefinition: StratosEndpointExtens
     schema: kubernetesEntityFactory(helmReleaseResourceEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseResource>(definition);
+  workloadsEntityCatalog.resource = new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseResource, WorkloadResourceBuilders>(
+    definition,
+    {
+      actionBuilders: workloadResourceBuilders
+    }
+  );
+  return workloadsEntityCatalog.resource;
 }
 
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
index 4e7ebcd501..511d570f05 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
@@ -1,6 +1,6 @@
-import { Action } from '@ngrx/store';
 import { EntityRequestAction } from 'frontend/packages/store/src/types/request.types';
 
+import { PaginatedAction } from '../../../../../../store/src/types/pagination.types';
 import { MonocularPaginationAction } from '../../../helm/store/helm.actions';
 import {
   KUBERNETES_ENDPOINT_TYPE,
@@ -9,7 +9,14 @@ import {
   kubernetesServicesEntityType,
 } from '../../kubernetes-entity-factory';
 import { KubePaginationAction } from '../../store/kubernetes.actions';
-import { helmReleaseEntityKey, helmReleaseGraphEntityType, helmReleaseResourceEntityType } from './workloads-entity-factory';
+import {
+  getHelmReleaseGraphId,
+  getHelmReleaseId,
+  getHelmReleaseResourceId,
+  helmReleaseEntityKey,
+  helmReleaseGraphEntityType,
+  helmReleaseResourceEntityType,
+} from './workloads-entity-factory';
 
 export const GET_HELM_RELEASES = '[Helm] Get Releases';
 export const GET_HELM_RELEASES_SUCCESS = '[Helm] Get Releases Success';
@@ -31,6 +38,15 @@ export const UPDATE_HELM_RELEASE = '[Helm] Update Release';
 export const UPDATE_HELM_RELEASE_SUCCESS = '[Helm] Update Release Success';
 export const UPDATE_HELM_RELEASE_FAILURE = '[Helm] Update Release Failure';
 
+interface HelmReleaseSingleEntity extends EntityRequestAction {
+  guid: string;
+}
+
+interface HelmReleasePaginated extends PaginatedAction, EntityRequestAction {
+
+}
+
+
 export class GetHelmReleases implements MonocularPaginationAction {
   constructor() {
     this.paginationKey = 'helm-releases';
@@ -51,14 +67,15 @@ export class GetHelmReleases implements MonocularPaginationAction {
   };
 }
 
-export class GetHelmRelease implements EntityRequestAction {
+
+export class GetHelmRelease implements HelmReleaseSingleEntity {
   guid: string;
   constructor(
     public endpointGuid: string,
     public namespace: string,
     public releaseTitle: string
   ) {
-    this.guid = `${endpointGuid}:${namespace}:${releaseTitle}`;
+    this.guid = getHelmReleaseId(endpointGuid, namespace, releaseTitle);
   }
   type = GET_HELM_RELEASE;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
@@ -71,13 +88,13 @@ export class GetHelmRelease implements EntityRequestAction {
   ];
 }
 
-export class GetHelmReleaseGraph implements EntityRequestAction {
+export class GetHelmReleaseGraph implements HelmReleaseSingleEntity {
   guid: string;
   constructor(
     public endpointGuid: string,
     public releaseTitle: string
   ) {
-    this.guid = `${endpointGuid}-${releaseTitle}`;
+    this.guid = getHelmReleaseGraphId(endpointGuid, releaseTitle);
   }
   type = this.constructor.name;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
@@ -86,19 +103,19 @@ export class GetHelmReleaseGraph implements EntityRequestAction {
   actions = [this.type];
 }
 
-export class GetHelmReleaseResource implements EntityRequestAction {
-  guid: string;
+export class GetHelmReleaseResource implements HelmReleaseSingleEntity {
   constructor(
     public endpointGuid: string,
     public releaseTitle: string
   ) {
-    this.guid = `${endpointGuid}-${releaseTitle}`;
+    this.guid = getHelmReleaseResourceId(this.endpointGuid, this.releaseTitle);
   }
   type = this.constructor.name;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = kubernetesEntityFactory(helmReleaseResourceEntityType);
   entityType = helmReleaseResourceEntityType;
   actions = [this.type];
+  guid: string;
 }
 
 /**
@@ -127,8 +144,10 @@ export class GetHelmReleasePods implements KubePaginationAction {
   };
 }
 
+
+// TODO: RC add to kube action builder
 /**
- * Won't fetch pods, used to push/retrieve data from store
+ * Won't fetch services, used to push/retrieve data from store
  */
 export class GetHelmReleaseServices implements KubePaginationAction {
   constructor(
@@ -152,8 +171,3 @@ export class GetHelmReleaseServices implements KubePaginationAction {
     'order-direction-field': 'name',
   };
 }
-
-export class HelmUpdateRelease implements Action {
-  constructor(public values: any) { }
-  type = UPDATE_HELM_RELEASE;
-}
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 086bc29fd8..eb65cffcb3 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
@@ -16,6 +16,7 @@ import {
   WrapperRequestActionSuccess,
 } from '../../../../../../store/src/types/request.types';
 import { HelmRelease } from '../workload.types';
+import { getHelmReleaseId } from './workloads-entity-factory';
 import { GET_HELM_RELEASE, GET_HELM_RELEASES, GetHelmRelease, GetHelmReleases } from './workloads.actions';
 
 @Injectable()
@@ -48,7 +49,7 @@ export class WorkloadsEffects {
             return;
           }
           endpointData.forEach((data) => {
-            const helmRelease = this.mapHelmRelease(data, endpointId);
+            const helmRelease = this.mapHelmRelease(data, endpointId, getHelmReleaseId(endpointId, data.namespace, data.name));
             processedData.entities[entityKey][helmRelease.guid] = helmRelease;
             processedData.result.push(helmRelease.guid);
           });
@@ -73,20 +74,20 @@ export class WorkloadsEffects {
           } as NormalizedResponse;
 
           // Go through each endpoint ID
-          processedData.entities[entityKey][action.guid] = this.mapHelmRelease(response, action.endpointGuid);
+          processedData.entities[entityKey][action.guid] = this.mapHelmRelease(response, action.endpointGuid, action.guid);
           processedData.result.push(action.guid);
           return processedData;
         }, [action.endpointGuid]);
     })
   );
 
-  private mapHelmRelease(data, endpointId) {
+  private mapHelmRelease(data, endpointId, guid: string) {
     const helmRelease: HelmRelease = {
       ...data,
       endpointId
     };
     // Release name is unique for an endpoint - for Helm 3, include the namespace
-    helmRelease.guid = endpointId + ':' + data.namespace + ':' + data.name;
+    helmRelease.guid = guid;//endpointId + ':' + data.namespace + ':' + data.name; //TODO: RC delete
     // Make a note of the guid of the endpoint for the release
     helmRelease.status = data.info.status;
     helmRelease.lastDeployed = this.mapHelmModifiedDate(data.info.last_deployed);
@@ -108,6 +109,7 @@ export class WorkloadsEffects {
     return this.httpClient.get(url, requestArgs).pipe(
       mergeMap((response: any) => [new WrapperRequestActionSuccess(mapResult(response), action)]),
       catchError(error => [
+        // TODO: RC trigger this, understand error (app.module.ts:173) guid of undefined
         new WrapperRequestActionFailed(error.message, action, 'fetch', {
           endpointIds,
           url: error.url || url,
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workloads-entity-catalog.ts b/custom-src/frontend/app/custom/kubernetes/workloads/workloads-entity-catalog.ts
new file mode 100644
index 0000000000..ba37ba0821
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/workloads-entity-catalog.ts
@@ -0,0 +1,20 @@
+import { StratosCatalogEntity } from '../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { IFavoriteMetadata } from '../../../../../store/src/types/user-favorites.types';
+import { WorkloadGraphBuilders, WorkloadReleaseBuilders, WorkloadResourceBuilders } from './store/workload-action-builders';
+import { HelmRelease, HelmReleaseGraph, HelmReleaseResource } from './workload.types';
+
+/**
+ * A strongly typed collection of Kube Catalog Entities.
+ * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc
+ */
+export class WorkloadsEntityCatalog {
+  release: StratosCatalogEntity<IFavoriteMetadata, HelmRelease, WorkloadReleaseBuilders>;
+  graph: StratosCatalogEntity<IFavoriteMetadata, HelmReleaseGraph, WorkloadGraphBuilders>
+  resource: StratosCatalogEntity<IFavoriteMetadata, HelmReleaseResource, WorkloadResourceBuilders>
+}
+
+/**
+ * A strongly typed collection of Kube Catalog Entities.
+ * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc
+ */
+export const workloadsEntityCatalog: WorkloadsEntityCatalog = new WorkloadsEntityCatalog();

From 57ff95c718ef42794e2f14d07cfdfcfc6ae96d87 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 15 May 2020 13:26:53 +0100
Subject: [PATCH 505/648] Fix most todo's

---
 .../create-release.component.ts               | 10 +--
 .../custom/kubernetes/store/kube.getIds.ts    | 84 ++++++-------------
 .../custom/kubernetes/store/kube.selectors.ts | 17 ----
 .../kubernetes/store/kubernetes.actions.ts    | 74 +++++-----------
 .../kube-namespaces-filter-config.service.ts  |  8 --
 .../workloads/store/workloads.actions.ts      |  3 +-
 .../workloads/store/workloads.effects.ts      |  3 +-
 .../kubernetes/workloads/workload.types.ts    | 21 +----
 .../pagination-reducer.helper.ts              | 32 +++++--
 .../store/src/selectors/endpoint.selectors.ts |  4 -
 10 files changed, 80 insertions(+), 176 deletions(-)
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/store/kube.selectors.ts

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 addfb39838..448a20abd8 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
@@ -5,7 +5,7 @@ import { MatTextareaAutosize } from '@angular/material';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { BehaviorSubject, combineLatest, Observable, of, Subscription } from 'rxjs';
-import { distinctUntilChanged, filter, first, map, pairwise, startWith, switchMap, tap } from 'rxjs/operators';
+import { distinctUntilChanged, filter, first, map, pairwise, startWith, switchMap } from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
 import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
@@ -68,8 +68,7 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     private store: Store<AppState>,
     private httpClient: HttpClient,
     private confirmDialog: ConfirmationDialogService,
-    // private pmf: PaginationMonitorFactory, // TODO: RC search and destroy
-    private emf: EntityMonitorFactory // TODO: RC search and destroy
+    private emf: EntityMonitorFactory
   ) {
     const chart = this.route.snapshot.params;
     this.cancelUrl = `/monocular/charts/${chart.repo}/${chart.chartName}/${chart.version}`;
@@ -103,7 +102,6 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     this.kubeEndpoints$ = this.endpointsService.connectedEndpointsOfTypes(KUBERNETES_ENDPOINT_TYPE);
 
     const allNamespaces$ = kubeEntityCatalog.namespace.store.getPaginationService(null).entities$.pipe(
-      // tap(a => console.log(action, a)), // TODO: RC find all console.log
       filter(namespaces => !!namespaces),
       first()
     );
@@ -113,18 +111,15 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
       this.details.controls.releaseNamespace.valueChanges.pipe(startWith(''), distinctUntilChanged())
     ]).pipe(
       // Filter out namespaces from other kubes
-      tap(a => console.log(1, a)),
       map(([namespaces, kubeId, namespace]: [KubernetesNamespace[], string, string]) => ([
         namespaces.filter(ns => ns.metadata.kubeId === kubeId),
         namespace
       ])),
-      tap(a => console.log(2, a)),
       // Map to endpoint names
       map(([namespaces, namespace]: [KubernetesNamespace[], string]) => [
         namespaces.map(ns => ns.metadata.name),
         namespace
       ]),
-      tap(a => console.log(3, a)),
       // Filter out namespaces not matching existing text
       map(([namespaces, namespace]: [string[], string]) => this.filterTyped(namespaces, namespace)),
     );
@@ -267,7 +262,6 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
       chart: this.route.snapshot.params
     };
 
-    // TODO: RC
     // Make the request
     const action = new HelmInstall(values);
     this.store.dispatch(action);
diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts
index 8f5d812860..6639f6f509 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts
@@ -1,3 +1,4 @@
+import { environment } from '../../../environments/environment.prod';
 import {
   BasicKubeAPIResource,
   KubernetesDeployment,
@@ -11,69 +12,38 @@ import { KubeDashboardStatus } from './kubernetes.effects';
 
 const deliminate = (...args: string[]) => args.join('_:_');
 
-const debugMissingKubeId = (entity: BasicKubeAPIResource) => {
-  if (!entity.metadata) {
-    console.log('DANGER WILL ROBINSON1:', entity);
-  } else if (!entity.metadata.kubeId) {
-    console.log('DANGER WILL ROBINSON2:', entity);
+const debugMissingKubeId = (entity: BasicKubeAPIResource, func: (...args: string[]) => string, ...args: string[]) => {
+  if (!environment.production && (!entity.metadata || !entity.metadata.kubeId)) {
+    console.log(`Kube entity does not have a kubeId, this is probably a bug: `, entity);
   }
+  return func(...args);
 }
 
-export const getGuidFromKubeNode = (kubeGuid: string, name: string): string => {
-  return deliminate(name, kubeGuid);
-}
-export const getGuidFromKubeNodeObj = (entity: KubernetesNode): string => {
-  debugMissingKubeId(entity);
-  return getGuidFromKubeNode(entity.metadata.kubeId, entity.metadata.name);
-}
+export const getGuidFromKubeNode = (kubeGuid: string, name: string): string => deliminate(name, kubeGuid)
+export const getGuidFromKubeNodeObj = (entity: KubernetesNode): string =>
+  debugMissingKubeId(entity, getGuidFromKubeNode, entity.metadata.kubeId, entity.metadata.name);
 
-export const getGuidFromKubeNamespace = (kubeGuid: string, name: string): string => {
-  return deliminate(name, kubeGuid);
-}
-export const getGuidFromKubeNamespaceObj = (entity: KubernetesNamespace): string => {
-  debugMissingKubeId(entity);
-  return getGuidFromKubeNamespace(entity.metadata.kubeId, entity.metadata.name);
-}
+export const getGuidFromKubeNamespace = (kubeGuid: string, name: string): string => deliminate(name, kubeGuid)
+export const getGuidFromKubeNamespaceObj = (entity: KubernetesNamespace): string =>
+  debugMissingKubeId(entity, getGuidFromKubeNamespace, entity.metadata.kubeId, entity.metadata.name);
 
-export const getGuidFromKubeService = (kubeGuid: string, namespace: string, name: string): string => {
-  return deliminate(name, namespace, kubeGuid);
-}
-export const getGuidFromKubeServiceObj = (entity: KubeService): string => {
-  debugMissingKubeId(entity);
-  return getGuidFromKubeService(entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name);
-}
+export const getGuidFromKubeService = (kubeGuid: string, namespace: string, name: string): string => deliminate(name, namespace, kubeGuid);
+export const getGuidFromKubeServiceObj = (entity: KubeService): string =>
+  debugMissingKubeId(entity, getGuidFromKubeService, entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name);
 
-export const getGuidFromKubeStatefulSet = (kubeGuid: string, namespace: string, name: string): string => {
-  return deliminate(name, namespace, kubeGuid);
-}
-export const getGuidFromKubeStatefulSetObj = (entity: KubernetesStatefulSet): string => {
-  debugMissingKubeId(entity);
-  return getGuidFromKubeStatefulSet(entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name);
-}
+export const getGuidFromKubeStatefulSet = (kubeGuid: string, namespace: string, name: string): string =>
+  deliminate(name, namespace, kubeGuid);
+export const getGuidFromKubeStatefulSetObj = (entity: KubernetesStatefulSet): string =>
+  debugMissingKubeId(entity, getGuidFromKubeStatefulSet, entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name);
 
+export const getGuidFromKubeDeployment = (kubeGuid: string, namespace: string, name: string): string =>
+  deliminate(name, namespace, kubeGuid);
+export const getGuidFromKubeDeploymentObj = (entity: KubernetesDeployment): string =>
+  debugMissingKubeId(entity, getGuidFromKubeDeployment, entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name);
 
-export const getGuidFromKubeDeployment = (kubeGuid: string, namespace: string, name: string): string => {
-  return deliminate(name, namespace, kubeGuid);
-}
-export const getGuidFromKubeDeploymentObj = (entity: KubernetesDeployment): string => {
-  debugMissingKubeId(entity);
-  return getGuidFromKubeDeployment(entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name);
-}
+export const getGuidFromKubePod = (kubeGuid: string, namespace: string, name: string): string => deliminate(name, namespace, kubeGuid);
+export const getGuidFromKubePodObj = (entity: KubernetesPod): string =>
+  debugMissingKubeId(entity, getGuidFromKubePod, entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name);
 
-export const getGuidFromKubePod = (kubeGuid: string, namespace: string, name: string): string => {
-  return deliminate(name, namespace, kubeGuid);
-}
-export const getGuidFromKubePodObj = (entity: KubernetesPod): string => {
-  debugMissingKubeId(entity);
-  return getGuidFromKubePod(entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name);
-}
-
-export const getGuidFromKubeDashboard = (kubeGuid: string): string => {
-  return kubeGuid;
-}
-export const getGuidFromKubeDashboardObj = (entity: KubeDashboardStatus): string => {
-  if (!!entity.kubeGuid) {
-    console.log('aaaaa!!!!!');
-  }
-  return getGuidFromKubeDashboard(entity.kubeGuid);
-}
\ No newline at end of file
+export const getGuidFromKubeDashboard = (kubeGuid: string): string => kubeGuid
+export const getGuidFromKubeDashboardObj = (entity: KubeDashboardStatus): string => getGuidFromKubeDashboard(entity.kubeGuid);
diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.selectors.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.selectors.ts
deleted file mode 100644
index 127babf675..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/store/kube.selectors.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// TODO: RC
-
-// const getValueOrNull = (object, key) =>
-//   object ? (object[key] ? object[key] : null) : null;
-// export const getMetadataGuid = (metadata: Metadata): string =>
-//   getValueOrNull(metadata, 'uid');
-
-// export const getKubeAPIMetadata = (
-//   resource: BasicKubeAPIResource
-// ): Metadata => getValueOrNull(resource, 'metadata');
-
-// export const getKubeAPIResourceGuid = compose(
-//   getMetadataGuid,
-//   getKubeAPIMetadata
-// );
-
-
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 49abc5540c..971f63dbf7 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
@@ -17,15 +17,7 @@ import {
   kubernetesServicesEntityType,
   kubernetesStatefulSetsEntityType,
 } from '../kubernetes-entity-factory';
-import { getGuidFromKubeDashboard, getGuidFromKubeNode, getGuidFromKubePod } from './kube.getIds';
-import {
-  KubernetesDeployment,
-  KubernetesNamespace,
-  KubernetesNode,
-  KubernetesPod,
-  KubernetesStatefulSet,
-  KubeService,
-} from './kube.types';
+import { getGuidFromKubeDashboard, getGuidFromKubeNamespace, getGuidFromKubeNode, getGuidFromKubePod } from './kube.getIds';
 
 export const GET_RELEASE_POD_INFO = '[KUBERNETES Endpoint] Get Release Pods Info';
 export const GET_RELEASE_POD_INFO_SUCCESS = '[KUBERNETES Endpoint] Get Release Pods Info Success';
@@ -90,27 +82,23 @@ export const GET_KUBE_DASHBOARD_SUCCESS = '[KUBERNETES Endpoint] Get Dashboard S
 export const GET_KUBE_DASHBOARD_FAILURE = '[KUBERNETES Endpoint] Get Dashboard Failure';
 
 
-// TODO: RC TIDY
-
 const defaultSortParams = {
   'order-direction': 'desc' as SortDirection,
   'order-direction-field': 'name'
 };
 
 
-
 export interface KubeAction extends EntityRequestAction {
   kubeGuid: string;
 }
-export interface KubePaginationAction<T = any> extends PaginatedAction, KubeAction {
-  // getId: (r: T, kubeGuid: string) => string;
+export interface KubePaginationAction extends PaginatedAction, KubeAction {
+  flattenPagination: boolean;
 }
 export interface KubeSingleEntityAction extends KubeAction {
   guid: string;
 }
 
 export class GetKubernetesNode implements KubeSingleEntityAction {
-
   constructor(public nodeName: string, public kubeGuid: string) {
     this.guid = getGuidFromKubeNode(kubeGuid, nodeName);
   }
@@ -126,7 +114,7 @@ export class GetKubernetesNode implements KubeSingleEntityAction {
   guid: string;
 }
 
-export class GetKubernetesNodes implements KubePaginationAction<KubernetesNode> {
+export class GetKubernetesNodes implements KubePaginationAction {
   constructor(public kubeGuid) {
     this.paginationKey = getPaginationKey(kubernetesNodesEntityType, kubeGuid);
   }
@@ -143,7 +131,7 @@ export class GetKubernetesNodes implements KubePaginationAction<KubernetesNode>
   initialParams: PaginationParam = {
     ...defaultSortParams
   };
-  // getId = (node: KubernetesNode, kubeGuid: string) => GetKubernetesNode.getGuid(kubeGuid, node.metadata.name);
+  flattenPagination = true;
 }
 
 export class KubeHealthCheck extends GetKubernetesNodes {
@@ -155,9 +143,9 @@ export class KubeHealthCheck extends GetKubernetesNodes {
 }
 
 export class CreateKubernetesNamespace implements KubeSingleEntityAction {
-  public guid: string;
+
   constructor(public namespaceName: string, public kubeGuid: string) {
-    // this.guid = GetKubernetesNamespace.getGuid(kubeGuid, namespaceName); // TODO: RC shouldn't be 'creating-guid'?
+    this.guid = getGuidFromKubeNamespace(kubeGuid, namespaceName);
   }
 
   type = CREATE_NAMESPACE;
@@ -166,21 +154,17 @@ export class CreateKubernetesNamespace implements KubeSingleEntityAction {
   entity = [kubernetesEntityFactory(kubernetesNamespacesEntityType)];
   actions = getActions('Namespace', 'Create');
   requestType: ApiRequestTypes = 'create';
+  guid: string;
 }
 
 export class GetKubernetesNamespace implements KubeSingleEntityAction {
-  // static getGuid(kubeGuid: string, namespaceName: string): string {
-  //   return deliminate(namespaceName, kubeGuid);
-  // }
-
   constructor(public namespaceName: string, public kubeGuid: string) {
-    // this.guid = GetKubernetesNamespace.getGuid(this.kubeGuid, this.namespaceName);
+    this.guid = getGuidFromKubeNamespace(kubeGuid, namespaceName);
   }
   type = GET_NAMESPACE_INFO;
   entityType = kubernetesNamespacesEntityType;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = [kubernetesEntityFactory(kubernetesNamespacesEntityType)];
-
   actions = [
     GET_NAMESPACE_INFO,
     GET_NAMESPACE_INFO_SUCCESS,
@@ -189,7 +173,7 @@ export class GetKubernetesNamespace implements KubeSingleEntityAction {
   guid: string;
 }
 
-export class GetKubernetesNamespaces implements KubePaginationAction<KubernetesNamespace> {
+export class GetKubernetesNamespaces implements KubePaginationAction {
   constructor(public kubeGuid: string) {
     this.paginationKey = getPaginationKey(kubernetesNamespacesEntityType, kubeGuid || 'all');
   }
@@ -206,11 +190,10 @@ export class GetKubernetesNamespaces implements KubePaginationAction<KubernetesN
   initialParams = {
     ...defaultSortParams
   };
-  // getId = (namespace: KubernetesNamespace, kubeGuid: string): string => GetKubernetesNamespace.getGuid(kubeGuid, namespace.metadata.name);
+  flattenPagination = true;
 }
 
 export class GetKubernetesPod implements KubeSingleEntityAction {
-
   constructor(public podName, public namespaceName, public kubeGuid) {
     this.guid = getGuidFromKubePod(kubeGuid, namespaceName, podName);
   }
@@ -226,7 +209,7 @@ export class GetKubernetesPod implements KubeSingleEntityAction {
   guid: string;
 }
 
-export class GetKubernetesPods implements KubePaginationAction<KubernetesPod> {
+export class GetKubernetesPods implements KubePaginationAction {
   constructor(public kubeGuid) {
     this.paginationKey = getPaginationKey(kubernetesPodsEntityType, 'k8', kubeGuid);
   }
@@ -243,7 +226,7 @@ export class GetKubernetesPods implements KubePaginationAction<KubernetesPod> {
   initialParams: PaginationParam = {
     ...defaultSortParams
   };
-  // getId = (pod: KubernetesPod, kubeGuid: string) => GetKubernetesPod.getId(kubeGuid, pod.metadata.namespace, pod.metadata.name);
+  flattenPagination = true;
 }
 
 export class GetKubernetesPodsOnNode extends GetKubernetesPods {
@@ -273,10 +256,7 @@ export class GetKubernetesPodsInNamespace extends GetKubernetesPods {
   ];
 }
 
-export class GetKubernetesServices implements KubePaginationAction<KubeService> {
-  // static getId(kubeGuid: string, namespace: string, serviceName: string): string { // TODO: RC id/guid naming
-  //   return deliminate(serviceName, namespace, kubeGuid);
-  // }
+export class GetKubernetesServices implements KubePaginationAction {
   constructor(public kubeGuid) {
     this.paginationKey = getPaginationKey(kubernetesServicesEntityType, kubeGuid);
   }
@@ -293,13 +273,12 @@ export class GetKubernetesServices implements KubePaginationAction<KubeService>
   initialParams: PaginationParam = {
     ...defaultSortParams
   };
-  // getId = (service: KubeService, kubeGuid: string) => GetKubernetesServices.getId(kubeGuid, service.metadata.namespace, service.metadata.name);
+  flattenPagination = true;
 }
 
 export class GetKubernetesServicesInNamespace extends GetKubernetesServices {
   constructor(kubeGuid: string, public namespaceName: string) {
     super(kubeGuid);
-    // TODO: RC Check all for guid AND uniqueness
     this.paginationKey = getPaginationKey(kubernetesPodsEntityType, namespaceName, kubeGuid);
   }
   actions = [
@@ -309,17 +288,8 @@ export class GetKubernetesServicesInNamespace extends GetKubernetesServices {
   ];
 }
 
-// TODO: RC
-// Create name
-// delete name
-// create with same name.. same
-
-
-export class GetKubernetesStatefulSets implements KubePaginationAction<KubernetesStatefulSet> {
-  // static getId(kubeGuid: string, namespace: string, name: string): string {
-  //   return deliminate(name, namespace, kubeGuid); // TODO: RC check
-  // }
 
+export class GetKubernetesStatefulSets implements KubePaginationAction {
   constructor(public kubeGuid) {
     this.paginationKey = getPaginationKey(kubernetesStatefulSetsEntityType, kubeGuid);
   }
@@ -333,13 +303,10 @@ export class GetKubernetesStatefulSets implements KubePaginationAction<Kubernete
     GET_KUBE_STATEFULSETS_FAILURE
   ];
   paginationKey: string;
-  // getId = (statefulSet: KubernetesStatefulSet, kubeGuid: string) => GetKubernetesStatefulSets.getId(kubeGuid, statefulSet.metadata.namespace, statefulSet.metadata.name);
+  flattenPagination = true;
 }
 
-export class GeKubernetesDeployments implements KubePaginationAction<KubernetesDeployment> {
-  // static getId(kubeGuid: string, namespace: string, name: string): string {
-  //   return deliminate(name, namespace, kubeGuid); // TODO: RC check
-  // }
+export class GeKubernetesDeployments implements KubePaginationAction {
   constructor(public kubeGuid) {
     this.paginationKey = getPaginationKey(kubernetesDeploymentsEntityType, kubeGuid);
   }
@@ -353,13 +320,10 @@ export class GeKubernetesDeployments implements KubePaginationAction<KubernetesD
     GET_KUBE_DEPLOYMENT_FAILURE
   ];
   paginationKey: string;
-  // getId = (deployment: KubernetesDeployment, kubeGuid: string) => GeKubernetesDeployments.getId(kubeGuid, deployment.metadata.namespace, deployment.metadata.name);
+  flattenPagination = true;
 }
 
 export class GetKubernetesDashboard implements KubeSingleEntityAction {
-  // static getId(kubeGuid: string): string {
-  //   return kubeGuid;
-  // }
   constructor(public kubeGuid: string) {
     this.guid = getGuidFromKubeDashboard(kubeGuid);
   }
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 c49bd77483..fe9ca2f1e3 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
@@ -52,17 +52,9 @@ export class KubernetesNamespacesFilterService implements OnDestroy {
 
     // Start watching the cf/org/space plus automatically setting values only when we actually have values to auto select
     this.namespace.list$.pipe(first()).subscribe(() => this.setupAutoSelectors());
-
-    // this.isLoading$ = combineLatest( // TODO: RC Not used??
-    //   this.kube.loading$,
-    //   this.namespace.loading$,
-    // ).pipe(
-    //   map(([kubeLoading, nsLoading]) => kubeLoading || nsLoading)
-    // );
   }
 
   private getNamespacesObservable() {
-    // TODO: RC is local???
     return kubeEntityCatalog.namespace.store.getPaginationService(null);
   }
 
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
index 511d570f05..c2adb9e3e2 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
@@ -142,10 +142,10 @@ export class GetHelmReleasePods implements KubePaginationAction {
     'order-direction': 'desc',
     'order-direction-field': 'name',
   };
+  flattenPagination = true;
 }
 
 
-// TODO: RC add to kube action builder
 /**
  * Won't fetch services, used to push/retrieve data from store
  */
@@ -170,4 +170,5 @@ export class GetHelmReleaseServices implements KubePaginationAction {
     'order-direction': 'desc',
     'order-direction-field': 'name',
   };
+  flattenPagination = true;
 }
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 eb65cffcb3..4fcaf2153a 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
@@ -87,7 +87,7 @@ export class WorkloadsEffects {
       endpointId
     };
     // Release name is unique for an endpoint - for Helm 3, include the namespace
-    helmRelease.guid = guid;//endpointId + ':' + data.namespace + ':' + data.name; //TODO: RC delete
+    helmRelease.guid = guid;
     // Make a note of the guid of the endpoint for the release
     helmRelease.status = data.info.status;
     helmRelease.lastDeployed = this.mapHelmModifiedDate(data.info.last_deployed);
@@ -109,7 +109,6 @@ export class WorkloadsEffects {
     return this.httpClient.get(url, requestArgs).pipe(
       mergeMap((response: any) => [new WrapperRequestActionSuccess(mapResult(response), action)]),
       catchError(error => [
-        // TODO: RC trigger this, understand error (app.module.ts:173) guid of undefined
         new WrapperRequestActionFailed(error.message, action, 'fetch', {
           endpointIds,
           url: error.url || url,
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
index 63007dfd69..f91220bad4 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
@@ -31,28 +31,11 @@ export interface HelmReleaseEntity {
   releaseTitle: string;
 }
 
-export interface HelmReleasePod extends HelmReleaseEntity, KubernetesPod {
-  // endpointId: string;
-  // releaseTitle: string;
-  // name: string;
-  // ready: string;
-  // status: string;
-  // restarts: string;
-  // age: string;
-}
+export interface HelmReleasePod extends HelmReleaseEntity, KubernetesPod { }
 
-export interface HelmReleaseService extends HelmReleaseEntity, KubeService {
-  // endpointId: string;
-  // releaseTitle: string;
-  // name: string;
-  //kubeService$?: Observable<KubeService>; // TODO: RC ??
-  // metadata: any;
-  // spec: any;
-}
+export interface HelmReleaseService extends HelmReleaseEntity, KubeService { }
 
 export interface HelmReleaseGraph extends HelmReleaseEntity {
-  // endpointId: string;
-  // releaseTitle: string;
   nodes: {};
   links: {};
 }
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..6f52000c22 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
@@ -14,6 +14,7 @@ import {
 } from 'rxjs/operators';
 
 import { populatePaginationFromParent } from '../../../../cloud-foundry/src/entity-relations/entity-relations';
+import { isEntityInlineParentAction } from '../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { sortStringify } from '../../../../core/src/core/utils.service';
 import { SetInitialParams } from '../../actions/pagination.actions';
 import { CfValidateEntitiesStart } from '../../actions/request.actions';
@@ -194,6 +195,23 @@ function getObservables<T = any>(
     map(([, newPag]) => newPag)
   );
 
+  const shouldValidate = (action: PaginatedAction): boolean => {
+    // 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 (action.skipValidation || parentAction.includeRelations.length === 0) {
+      return false;
+    }
+    return true;
+  }
+
   let lastValidationFootprint: string;
   const entities$: Observable<T[]> =
     combineLatest(
@@ -211,11 +229,15 @@ function getObservables<T = any>(
           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]
-            )));
+            // This should use something similar to ENTITY_INFO_HANDLER or come from entity itself. See #4296
+            arrayAction.forEach(action => {
+              if (shouldValidate(action)) {
+                store.dispatch(new CfValidateEntitiesStart(
+                  action,
+                  pagination.ids[action.__forcedPageNumber__ || pagination.currentPage]
+                ))
+              }
+            });
           }
         }),
         switchMap(() => paginationMonitor.currentPage$),
diff --git a/src/frontend/packages/store/src/selectors/endpoint.selectors.ts b/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
index ee89fa29f4..e3757bd193 100644
--- a/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
+++ b/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
@@ -61,10 +61,6 @@ export const endpointsCFEntitiesSelector = createSelector(
   cfEndpointEntitiesSelector
 );
 
-// const log = (label) => {
-//   return (val) => console.log(label, val);
-// };
-
 // TODO: Move this #3769
 export const endpointsCfEntitiesConnectedSelector = connectedEndpointsOfTypesSelector('cf');
 

From 54534a99c6ae94394d9ffde7f7e30e9cf8c90c48 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 15 May 2020 14:33:34 +0100
Subject: [PATCH 506/648] WIP

---
 .../create-release.component.ts               | 13 +---
 .../app/custom/helm/helm-entity-catalog.ts    | 17 +++++
 .../app/custom/helm/helm-entity-generator.ts  | 11 +++-
 .../monocular-charts-data-source.ts           |  9 ++-
 .../custom/helm/store/helm.action-builders.ts | 18 +++++
 .../app/custom/helm/store/helm.actions.ts     | 20 +-----
 .../app/custom/helm/store/helm.effects.ts     | 56 +++-------------
 .../kubernetes/store/kubernetes.actions.ts    |  1 +
 .../list-types/helm-releases-list-source.ts   |  5 +-
 .../store/workload-action-builders.ts         | 13 +++-
 .../workloads/store/workloads.actions.ts      | 14 ++++
 .../workloads/store/workloads.effects.ts      | 65 ++++++++++++++++---
 12 files changed, 143 insertions(+), 99 deletions(-)
 create mode 100644 custom-src/frontend/app/custom/helm/helm-entity-catalog.ts
 create mode 100644 custom-src/frontend/app/custom/helm/store/helm.action-builders.ts

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 448a20abd8..283ba6b23c 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
@@ -18,7 +18,7 @@ import { StepOnNextFunction, StepOnNextResult } from '../../../shared/components
 import { kubeEntityCatalog } from '../../kubernetes/kubernetes-entity-catalog';
 import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes/kubernetes-entity-factory';
 import { KubernetesNamespace } from '../../kubernetes/store/kube.types';
-import { HelmInstall } from '../store/helm.actions';
+import { workloadsEntityCatalog } from '../../kubernetes/workloads/workloads-entity-catalog';
 import { HelmInstallValues } from '../store/helm.types';
 
 
@@ -263,17 +263,8 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     };
 
     // Make the request
-    const action = new HelmInstall(values);
-    this.store.dispatch(action);
-
-    // const releaseEntityConfig = entityCatalog.getEntity(action);
-
-    return this.emf.create(
-      action.guid,
-      action
-    ).entityRequest$.pipe(
+    return workloadsEntityCatalog.release.api.install<RequestInfoState>(values).pipe(
       // Wait for result of request
-      // return releaseEntityConfig.getEntityMonitor(this.store, action.guid).entityRequest$.pipe(
       filter(state => !!state),
       pairwise(),
       filter(([oldVal, newVal]) => (oldVal.creating && !newVal.creating)),
diff --git a/custom-src/frontend/app/custom/helm/helm-entity-catalog.ts b/custom-src/frontend/app/custom/helm/helm-entity-catalog.ts
new file mode 100644
index 0000000000..cb1bcde3d7
--- /dev/null
+++ b/custom-src/frontend/app/custom/helm/helm-entity-catalog.ts
@@ -0,0 +1,17 @@
+import { StratosCatalogEndpointEntity, StratosCatalogEntity } from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity'; import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types'; import { MonocularChart, HelmVersion } from './store/helm.types'; import { HelmChartActionBuilders, HelmVersionActionBuilders } from './store/helm.action-builders';
+
+/**
+ * A strongly typed collection of Kube Catalog Entities.
+ * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc
+ */
+export class HelmEntityCatalog {
+  endpoint: StratosCatalogEndpointEntity;
+  chart: StratosCatalogEntity<IFavoriteMetadata, MonocularChart, HelmChartActionBuilders>
+  version: StratosCatalogEntity<IFavoriteMetadata, HelmVersion, HelmVersionActionBuilders>
+}
+
+/**
+ * A strongly typed collection of Kube Catalog Entities.
+ * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc
+ */
+export const helmEntityCatalog: HelmEntityCatalog = new HelmEntityCatalog();
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 0fb65457a6..928e03e767 100644
--- a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
+++ b/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
@@ -5,12 +5,14 @@ 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 { helmEntityCatalog } from './helm-entity-catalog';
 import {
   HELM_ENDPOINT_TYPE,
   helmEntityFactory,
   helmVersionsEntityType,
   monocularChartsEntityType,
 } from './helm-entity-factory';
+import { HelmChartActionBuilders, HelmVersionActionBuilders } from './store/helm.action-builders';
 import { HelmVersion, MonocularChart } from './store/helm.types';
 
 
@@ -36,10 +38,11 @@ export function generateHelmEntities(): StratosBaseCatalogEntity[] {
 }
 
 function generateEndpointEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  return new StratosCatalogEndpointEntity(
+  helmEntityCatalog.endpoint = new StratosCatalogEndpointEntity(
     endpointDefinition,
     metadata => `/monocular/repos/${metadata.guid}`,
   );
+  return helmEntityCatalog.endpoint;
 }
 
 function generateChartEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -48,7 +51,8 @@ function generateChartEntity(endpointDefinition: StratosEndpointExtensionDefinit
     schema: helmEntityFactory(monocularChartsEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, MonocularChart>(definition);
+  helmEntityCatalog.chart = new StratosCatalogEntity<IFavoriteMetadata, MonocularChart, HelmChartActionBuilders>(definition);
+  return helmEntityCatalog.chart;
 }
 
 function generateVersionEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -57,7 +61,8 @@ function generateVersionEntity(endpointDefinition: StratosEndpointExtensionDefin
     schema: helmEntityFactory(helmVersionsEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, HelmVersion>(definition);
+  helmEntityCatalog.version = new StratosCatalogEntity<IFavoriteMetadata, HelmVersion, HelmVersionActionBuilders>(definition);
+  return helmEntityCatalog.version;
 }
 
 
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts
index 2a1c005854..eebb7ad29b 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts
@@ -4,8 +4,7 @@ import { PaginationEntityState } from '../../../../../store/src//types/paginatio
 import { AppState } from '../../../../../store/src/app-state';
 import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../shared/components/list/list.component.types';
-import { getMonocularChartId, helmEntityFactory, monocularChartsEntityType } from '../helm-entity-factory';
-import { GetMonocularCharts } from '../store/helm.actions';
+import { helmEntityCatalog } from '../helm-entity-catalog';
 import { MonocularChart } from '../store/helm.types';
 
 export class MonocularChartsDataSource extends ListDataSource<MonocularChart> {
@@ -14,12 +13,12 @@ export class MonocularChartsDataSource extends ListDataSource<MonocularChart> {
     store: Store<AppState>,
     listConfig: IListConfig<MonocularChart>
   ) {
-    const action = new GetMonocularCharts();
+    const action = helmEntityCatalog.chart.actions.getMultiple();
     super({
       store,
       action,
-      schema: helmEntityFactory(monocularChartsEntityType),
-      getRowUniqueId: getMonocularChartId,
+      schema: action.entity[0],
+      getRowUniqueId: action.entity[0].getId,
       paginationKey: action.paginationKey,
       isLocal: true,
       listConfig,
diff --git a/custom-src/frontend/app/custom/helm/store/helm.action-builders.ts b/custom-src/frontend/app/custom/helm/store/helm.action-builders.ts
new file mode 100644
index 0000000000..9af72dca3d
--- /dev/null
+++ b/custom-src/frontend/app/custom/helm/store/helm.action-builders.ts
@@ -0,0 +1,18 @@
+import { OrchestratedActionBuilders } from '../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
+import { GetHelmVersions, GetMonocularCharts } from './helm.actions';
+
+export interface HelmChartActionBuilders extends OrchestratedActionBuilders {
+  getMultiple: () => GetMonocularCharts
+}
+
+export const helmChartActionBuilders: HelmChartActionBuilders = {
+  getMultiple: () => new GetMonocularCharts()
+}
+
+export interface HelmVersionActionBuilders extends OrchestratedActionBuilders {
+  getMultiple: () => GetHelmVersions
+}
+
+export const helmVersionActionBuilders: HelmVersionActionBuilders = {
+  getMultiple: () => new GetHelmVersions()
+}
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/store/helm.actions.ts b/custom-src/frontend/app/custom/helm/store/helm.actions.ts
index ce114a1245..03bc05a385 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.actions.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.actions.ts
@@ -1,6 +1,4 @@
 import { EntityRequestAction } from '../../../../../store/src/types/request.types';
-import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes/kubernetes-entity-factory';
-import { helmReleaseEntityKey } from '../../kubernetes/workloads/store/workloads-entity-factory';
 import {
   HELM_ENDPOINT_TYPE,
   helmEntityFactory,
@@ -8,7 +6,6 @@ import {
   monocularChartsEntityType,
 } from '../helm-entity-factory';
 import { PaginatedAction } from './../../../../../store/src/types/pagination.types';
-import { HelmInstallValues } from './helm.types';
 
 export const GET_MONOCULAR_CHARTS = '[Monocular] Get Charts';
 export const GET_MONOCULAR_CHARTS_SUCCESS = '[Monocular] Get Charts Success';
@@ -18,10 +15,6 @@ export const GET_HELM_VERSIONS = '[Helm] Get Versions';
 export const GET_HELM_VERSIONS_SUCCESS = '[Helm] Get Versions Success';
 export const GET_HELM_VERSIONS_FAILURE = '[Helm] Get Versions Failure';
 
-export const HELM_INSTALL = '[Helm] Install';
-export const HELM_INSTALL_SUCCESS = '[Helm] Install Success';
-export const HELM_INSTALL_FAILURE = '[Helm] Install Failure';
-
 export interface MonocularPaginationAction extends PaginatedAction, EntityRequestAction { }
 
 export class GetMonocularCharts implements MonocularPaginationAction {
@@ -42,6 +35,7 @@ export class GetMonocularCharts implements MonocularPaginationAction {
     'order-direction': 'desc',
     'order-direction-field': 'name',
   };
+  flattenPagination = true;
 }
 
 
@@ -63,15 +57,5 @@ export class GetHelmVersions implements MonocularPaginationAction {
     'order-direction': 'asc',
     'order-direction-field': 'version',
   };
+  flattenPagination = true;
 }
-
-export class HelmInstall implements EntityRequestAction {
-  type = HELM_INSTALL;
-  endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entityType = helmReleaseEntityKey;
-  guid: string;
-  constructor(public values: HelmInstallValues) {
-    this.guid = '<New Release>' + this.values.releaseName;
-  }
-}
-
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 e79232c5d9..46dcbca74e 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.effects.ts
@@ -3,10 +3,8 @@ 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';
-import { ApiRequestTypes } from 'frontend/packages/store/src/reducers/api-request-reducer/request-helpers';
 import { NormalizedResponse } from 'frontend/packages/store/src/types/api.types';
 import {
   EntityRequestAction,
@@ -19,15 +17,8 @@ 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,
-  GetHelmVersions,
-  GetMonocularCharts,
-  HELM_INSTALL,
-  HelmInstall,
-} from './helm.actions';
+import { getHelmVersionId, getMonocularChartId, HELM_ENDPOINT_TYPE } from '../helm-entity-factory';
+import { GET_HELM_VERSIONS, GET_MONOCULAR_CHARTS, GetHelmVersions, GetMonocularCharts } from './helm.actions';
 import { HelmVersion } from './helm.types';
 
 @Injectable()
@@ -85,7 +76,7 @@ export class HelmEffects {
 
         const items = response.data as Array<any>;
         const processedData = items.reduce((res, data) => {
-          const id = data.id;
+          const id = getMonocularChartId(data);
           res.entities[entityKey][id] = data;
           // Promote the name to the top-level object for simplicity
           data.name = data.attributes.name;
@@ -119,7 +110,7 @@ export class HelmEffects {
             endpointId: endpoint,
             ...endpointData
           };
-          processedData.entities[entityKey][endpoint] = version;
+          processedData.entities[entityKey][getHelmVersionId(version)] = version;
           processedData.result.push(endpoint);
         });
         return processedData;
@@ -127,36 +118,7 @@ export class HelmEffects {
     })
   );
 
-  @Effect()
-  helmInstall$ = this.actions$.pipe(
-    ofType<HelmInstall>(HELM_INSTALL),
-    flatMap(action => {
-      const requestType: ApiRequestTypes = 'create';
-      const url = '/pp/v1/helm/install';
-      this.store.dispatch(new StartRequestAction(action, requestType));
-      return this.httpClient.post(url, action.values).pipe(
-        mergeMap(() => {
-          return [
-            new ClearPaginationOfType(action),
-            new WrapperRequestActionSuccess(null, action)
-          ];
-        }),
-        catchError(error => {
-          const { status, message } = this.createHelmError(error);
-          const errorMessage = `Failed to install helm chart: ${message}`;
-          return [
-            new WrapperRequestActionFailed(errorMessage, action, requestType, {
-              endpointIds: [action.values.endpoint],
-              url: error.url || url,
-              eventCode: status,
-              message: errorMessage,
-              error
-            })
-          ];
-        })
-      );
-    })
-  );
+
 
   private makeRequest(
     action: EntityRequestAction,
@@ -172,7 +134,7 @@ export class HelmEffects {
     return this.httpClient.get(url, requestArgs).pipe(
       mergeMap((response: any) => [new WrapperRequestActionSuccess(mapResult(response), action)]),
       catchError(error => {
-        const { status, message } = this.createHelmError(error);
+        const { status, message } = HelmEffects.createHelmError(error);
         return [
           new WrapperRequestActionFailed(message, action, 'fetch', {
             endpointIds,
@@ -186,7 +148,7 @@ export class HelmEffects {
     );
   }
 
-  private createHelmErrorMessage(err: any): string {
+  static createHelmErrorMessage(err: any): string {
     if (err) {
       if (err.error && err.error.message) {
         // Kube error
@@ -202,7 +164,7 @@ export class HelmEffects {
     return 'Helm API request error';
   }
 
-  private createHelmError(err: any): { status: string, message: string } {
+  static createHelmError(err: any): { status: string, message: string } {
     let unwrapped = err;
     if (err.error) {
       unwrapped = err.error;
@@ -212,7 +174,7 @@ export class HelmEffects {
       // Wrapped error
       return {
         status: jetstreamError.error.statusCode.toString(),
-        message: this.createHelmErrorMessage(jetstreamError)
+        message: HelmEffects.createHelmErrorMessage(jetstreamError)
       };
     }
     return {
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 971f63dbf7..5869014585 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
@@ -281,6 +281,7 @@ export class GetKubernetesServicesInNamespace extends GetKubernetesServices {
     super(kubeGuid);
     this.paginationKey = getPaginationKey(kubernetesPodsEntityType, namespaceName, kubeGuid);
   }
+  type = GET_SERVICES_IN_NAMESPACE_INFO;
   actions = [
     GET_SERVICES_IN_NAMESPACE_INFO,
     GET_SERVICES_IN_NAMESPACE_INFO_SUCCESS,
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts
index 56a4505195..d6fe2020f1 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts
@@ -10,8 +10,6 @@ import { IListConfig } from 'frontend/packages/core/src/shared/components/list/l
 import { AppState } from 'frontend/packages/store/src/app-state';
 import { PaginationEntityState } from 'frontend/packages/store/src/types/pagination.types';
 
-import { kubernetesEntityFactory } from '../../kubernetes-entity-factory';
-import { helmReleaseEntityKey } from '../store/workloads-entity-factory';
 import { HelmRelease } from '../workload.types';
 import { workloadsEntityCatalog } from '../workloads-entity-catalog';
 
@@ -33,12 +31,13 @@ export class HelmReleasesDataSource extends ListDataSource<HelmRelease> {
     store: Store<AppState>,
     listConfig: IListConfig<HelmRelease>
   ) {
+
     const action = workloadsEntityCatalog.release.actions.getMultiple();
     const transformEntities = [{ type: 'filter' as DataFunctionDefinitionType, field: 'name' }, kubeEndpointFilter];
     super({
       store,
       action,
-      schema: kubernetesEntityFactory(helmReleaseEntityKey),
+      schema: action.entity[0],
       getRowUniqueId: row => action.entity[0].getId(row),
       paginationKey: action.paginationKey,
       isLocal: true,
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts
index eb7591f9c5..c325f2b932 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts
@@ -1,7 +1,14 @@
 import {
   OrchestratedActionBuilders,
 } from '../../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
-import { GetHelmRelease, GetHelmReleaseGraph, GetHelmReleaseResource, GetHelmReleases } from './workloads.actions';
+import { HelmInstallValues } from '../../../helm/store/helm.types';
+import {
+  GetHelmRelease,
+  GetHelmReleaseGraph,
+  GetHelmReleaseResource,
+  GetHelmReleases,
+  HelmInstall,
+} from './workloads.actions';
 
 export interface WorkloadReleaseBuilders extends OrchestratedActionBuilders {
   get: (
@@ -10,13 +17,15 @@ export interface WorkloadReleaseBuilders extends OrchestratedActionBuilders {
     extraArgs: { namespace: string }
   ) => GetHelmRelease;
   getMultiple: () => GetHelmReleases;
+  install: (values: HelmInstallValues) => HelmInstall
 }
 
 export const workloadReleaseBuilders: WorkloadReleaseBuilders = {
   get: (title: string, endpointGuid: string, { namespace }: { namespace: string }) => {
     return new GetHelmRelease(endpointGuid, namespace, title);
   },
-  getMultiple: () => new GetHelmReleases()
+  getMultiple: () => new GetHelmReleases(),
+  install: (values: HelmInstallValues) => new HelmInstall(values)
 }
 
 export interface WorkloadGraphBuilders extends OrchestratedActionBuilders {
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
index c2adb9e3e2..9fad760fb7 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
@@ -2,6 +2,7 @@ import { EntityRequestAction } from 'frontend/packages/store/src/types/request.t
 
 import { PaginatedAction } from '../../../../../../store/src/types/pagination.types';
 import { MonocularPaginationAction } from '../../../helm/store/helm.actions';
+import { HelmInstallValues } from '../../../helm/store/helm.types';
 import {
   KUBERNETES_ENDPOINT_TYPE,
   kubernetesEntityFactory,
@@ -38,6 +39,10 @@ export const UPDATE_HELM_RELEASE = '[Helm] Update Release';
 export const UPDATE_HELM_RELEASE_SUCCESS = '[Helm] Update Release Success';
 export const UPDATE_HELM_RELEASE_FAILURE = '[Helm] Update Release Failure';
 
+export const HELM_INSTALL = '[Helm] Install';
+export const HELM_INSTALL_SUCCESS = '[Helm] Install Success';
+export const HELM_INSTALL_FAILURE = '[Helm] Install Failure';
+
 interface HelmReleaseSingleEntity extends EntityRequestAction {
   guid: string;
 }
@@ -46,6 +51,15 @@ interface HelmReleasePaginated extends PaginatedAction, EntityRequestAction {
 
 }
 
+export class HelmInstall implements HelmReleaseSingleEntity {
+  type = HELM_INSTALL;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
+  entityType = helmReleaseEntityKey;
+  guid: string;
+  constructor(public values: HelmInstallValues) {
+    this.guid = '<New Release>' + this.values.releaseName;
+  }
+}
 
 export class GetHelmReleases implements MonocularPaginationAction {
   constructor() {
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 4fcaf2153a..dd9bc41611 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
@@ -6,8 +6,10 @@ import { environment } from 'frontend/packages/core/src/environments/environment
 import { Observable } from 'rxjs';
 import { catchError, flatMap, mergeMap } from 'rxjs/operators';
 
+import { ClearPaginationOfType } from '../../../../../../store/src/actions/pagination.actions';
 import { AppState } from '../../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
+import { ApiRequestTypes } from '../../../../../../store/src/reducers/api-request-reducer/request-helpers';
 import { NormalizedResponse } from '../../../../../../store/src/types/api.types';
 import {
   EntityRequestAction,
@@ -15,9 +17,17 @@ import {
   WrapperRequestActionFailed,
   WrapperRequestActionSuccess,
 } from '../../../../../../store/src/types/request.types';
+import { HelmEffects } from '../../../helm/store/helm.effects';
 import { HelmRelease } from '../workload.types';
 import { getHelmReleaseId } from './workloads-entity-factory';
-import { GET_HELM_RELEASE, GET_HELM_RELEASES, GetHelmRelease, GetHelmReleases } from './workloads.actions';
+import {
+  GET_HELM_RELEASE,
+  GET_HELM_RELEASES,
+  GetHelmRelease,
+  GetHelmReleases,
+  HELM_INSTALL,
+  HelmInstall,
+} from './workloads.actions';
 
 @Injectable()
 export class WorkloadsEffects {
@@ -81,6 +91,37 @@ export class WorkloadsEffects {
     })
   );
 
+  @Effect()
+  helmInstall$ = this.actions$.pipe(
+    ofType<HelmInstall>(HELM_INSTALL),
+    flatMap(action => {
+      const requestType: ApiRequestTypes = 'create';
+      const url = '/pp/v1/helm/install';
+      this.store.dispatch(new StartRequestAction(action, requestType));
+      return this.httpClient.post(url, action.values).pipe(
+        mergeMap(() => {
+          return [
+            new ClearPaginationOfType(action),
+            new WrapperRequestActionSuccess(null, action)
+          ];
+        }),
+        catchError(error => {
+          const { status, message } = HelmEffects.createHelmError(error);
+          const errorMessage = `Failed to install helm chart: ${message}`;
+          return [
+            new WrapperRequestActionFailed(errorMessage, action, requestType, {
+              endpointIds: [action.values.endpoint],
+              url: error.url || url,
+              eventCode: status,
+              message: errorMessage,
+              error
+            })
+          ];
+        })
+      );
+    })
+  );
+
   private mapHelmRelease(data, endpointId, guid: string) {
     const helmRelease: HelmRelease = {
       ...data,
@@ -108,15 +149,19 @@ export class WorkloadsEffects {
     };
     return this.httpClient.get(url, requestArgs).pipe(
       mergeMap((response: any) => [new WrapperRequestActionSuccess(mapResult(response), action)]),
-      catchError(error => [
-        new WrapperRequestActionFailed(error.message, action, 'fetch', {
-          endpointIds,
-          url: error.url || url,
-          eventCode: error.status ? error.status + '' : '500',
-          message: 'Helm Release API request error',
-          error
-        })
-      ])
+      catchError(error => {
+        const { status, message } = HelmEffects.createHelmError(error);
+        const errorMessage = `Failed to fetch helm data: ${message}`;
+        return [
+          new WrapperRequestActionFailed(errorMessage, action, 'fetch', {
+            endpointIds,
+            url: error.url || url,
+            eventCode: status,
+            message: errorMessage,
+            error
+          })
+        ]
+      })
     );
   }
 

From 81db83c3a3703d776bbbbe20296c576e275dd5d4 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 15 May 2020 15:17:32 +0100
Subject: [PATCH 507/648] Final TODO's

---
 .../create-release.component.ts               |  9 +---
 .../app/custom/helm/helm-entity-generator.ts  | 21 ++++++--
 .../monocular-charts-data-source.ts           |  2 +-
 .../custom/helm/store/helm.action-builders.ts | 11 ++--
 .../app/custom/helm/store/helm.actions.ts     | 14 +++++
 .../app/custom/helm/store/helm.effects.ts     | 45 ++++++++++++++--
 .../services/kubernetes-endpoint.service.ts   |  1 -
 .../kubernetes-summary.component.ts           | 54 +++++++++----------
 .../store/workload-action-builders.ts         | 13 +----
 .../workloads/store/workloads.actions.ts      | 15 ------
 .../workloads/store/workloads.effects.ts      | 42 +--------------
 11 files changed, 112 insertions(+), 115 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 283ba6b23c..1c359a71cb 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
@@ -18,14 +18,9 @@ import { StepOnNextFunction, StepOnNextResult } from '../../../shared/components
 import { kubeEntityCatalog } from '../../kubernetes/kubernetes-entity-catalog';
 import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes/kubernetes-entity-factory';
 import { KubernetesNamespace } from '../../kubernetes/store/kube.types';
-import { workloadsEntityCatalog } from '../../kubernetes/workloads/workloads-entity-catalog';
+import { helmEntityCatalog } from '../helm-entity-catalog';
 import { HelmInstallValues } from '../store/helm.types';
 
-
-// private pmf: PaginationMonitorFactory, // TODO: RC search and destroy
-// private emf: EntityMonitorFactory // TODO: RC search and destroy
-// store.dispatch
-
 @Component({
   selector: 'app-create-release',
   templateUrl: './create-release.component.html',
@@ -263,7 +258,7 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     };
 
     // Make the request
-    return workloadsEntityCatalog.release.api.install<RequestInfoState>(values).pipe(
+    return helmEntityCatalog.chart.api.install<RequestInfoState>(values).pipe(
       // Wait for result of request
       filter(state => !!state),
       pairwise(),
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 928e03e767..380b225a40 100644
--- a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
+++ b/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
@@ -12,7 +12,12 @@ import {
   helmVersionsEntityType,
   monocularChartsEntityType,
 } from './helm-entity-factory';
-import { HelmChartActionBuilders, HelmVersionActionBuilders } from './store/helm.action-builders';
+import {
+  HelmChartActionBuilders,
+  helmChartActionBuilders,
+  HelmVersionActionBuilders,
+  helmVersionActionBuilders,
+} from './store/helm.action-builders';
 import { HelmVersion, MonocularChart } from './store/helm.types';
 
 
@@ -51,7 +56,12 @@ function generateChartEntity(endpointDefinition: StratosEndpointExtensionDefinit
     schema: helmEntityFactory(monocularChartsEntityType),
     endpoint: endpointDefinition
   };
-  helmEntityCatalog.chart = new StratosCatalogEntity<IFavoriteMetadata, MonocularChart, HelmChartActionBuilders>(definition);
+  helmEntityCatalog.chart = new StratosCatalogEntity<IFavoriteMetadata, MonocularChart, HelmChartActionBuilders>(
+    definition,
+    {
+      actionBuilders: helmChartActionBuilders
+    }
+  );
   return helmEntityCatalog.chart;
 }
 
@@ -61,7 +71,12 @@ function generateVersionEntity(endpointDefinition: StratosEndpointExtensionDefin
     schema: helmEntityFactory(helmVersionsEntityType),
     endpoint: endpointDefinition
   };
-  helmEntityCatalog.version = new StratosCatalogEntity<IFavoriteMetadata, HelmVersion, HelmVersionActionBuilders>(definition);
+  helmEntityCatalog.version = new StratosCatalogEntity<IFavoriteMetadata, HelmVersion, HelmVersionActionBuilders>(
+    definition,
+    {
+      actionBuilders: helmVersionActionBuilders
+    }
+  );
   return helmEntityCatalog.version;
 }
 
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts
index eebb7ad29b..afefeae64e 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts
@@ -18,7 +18,7 @@ export class MonocularChartsDataSource extends ListDataSource<MonocularChart> {
       store,
       action,
       schema: action.entity[0],
-      getRowUniqueId: action.entity[0].getId,
+      getRowUniqueId: (row) => action.entity[0].getId(row),
       paginationKey: action.paginationKey,
       isLocal: true,
       listConfig,
diff --git a/custom-src/frontend/app/custom/helm/store/helm.action-builders.ts b/custom-src/frontend/app/custom/helm/store/helm.action-builders.ts
index 9af72dca3d..53c20f4de9 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.action-builders.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.action-builders.ts
@@ -1,12 +1,17 @@
 import { OrchestratedActionBuilders } from '../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
-import { GetHelmVersions, GetMonocularCharts } from './helm.actions';
+import { GetHelmVersions, GetMonocularCharts, HelmInstall } from './helm.actions';
+import { HelmInstallValues } from './helm.types';
 
 export interface HelmChartActionBuilders extends OrchestratedActionBuilders {
-  getMultiple: () => GetMonocularCharts
+  getMultiple: () => GetMonocularCharts,
+  // Helm install added to chart action builder and not helm release/workload to ensure action & effect are available in this module
+  // (others may not have loaded)
+  install: (values: HelmInstallValues) => HelmInstall
 }
 
 export const helmChartActionBuilders: HelmChartActionBuilders = {
-  getMultiple: () => new GetMonocularCharts()
+  getMultiple: () => new GetMonocularCharts(),
+  install: (values: HelmInstallValues) => new HelmInstall(values)
 }
 
 export interface HelmVersionActionBuilders extends OrchestratedActionBuilders {
diff --git a/custom-src/frontend/app/custom/helm/store/helm.actions.ts b/custom-src/frontend/app/custom/helm/store/helm.actions.ts
index 03bc05a385..d0c0db844e 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.actions.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.actions.ts
@@ -6,6 +6,7 @@ import {
   monocularChartsEntityType,
 } from '../helm-entity-factory';
 import { PaginatedAction } from './../../../../../store/src/types/pagination.types';
+import { HelmInstallValues } from './helm.types';
 
 export const GET_MONOCULAR_CHARTS = '[Monocular] Get Charts';
 export const GET_MONOCULAR_CHARTS_SUCCESS = '[Monocular] Get Charts Success';
@@ -15,6 +16,10 @@ export const GET_HELM_VERSIONS = '[Helm] Get Versions';
 export const GET_HELM_VERSIONS_SUCCESS = '[Helm] Get Versions Success';
 export const GET_HELM_VERSIONS_FAILURE = '[Helm] Get Versions Failure';
 
+export const HELM_INSTALL = '[Helm] Install';
+export const HELM_INSTALL_SUCCESS = '[Helm] Install Success';
+export const HELM_INSTALL_FAILURE = '[Helm] Install Failure';
+
 export interface MonocularPaginationAction extends PaginatedAction, EntityRequestAction { }
 
 export class GetMonocularCharts implements MonocularPaginationAction {
@@ -38,6 +43,15 @@ export class GetMonocularCharts implements MonocularPaginationAction {
   flattenPagination = true;
 }
 
+export class HelmInstall implements EntityRequestAction {
+  type = HELM_INSTALL;
+  endpointType = HELM_ENDPOINT_TYPE;
+  entityType = monocularChartsEntityType;
+  guid: string;
+  constructor(public values: HelmInstallValues) {
+    this.guid = '<New Release>' + this.values.releaseName;
+  }
+}
 
 export class GetHelmVersions implements MonocularPaginationAction {
   constructor() {
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 46dcbca74e..dfd8a6db60 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.effects.ts
@@ -15,10 +15,20 @@ import {
 import { Observable } from 'rxjs';
 import { catchError, flatMap, mergeMap } from 'rxjs/operators';
 
+import { ClearPaginationOfType } from '../../../../../store/src/actions/pagination.actions';
+import { ApiRequestTypes } from '../../../../../store/src/reducers/api-request-reducer/request-helpers';
 import { environment } from '../../../environments/environment';
 import { isJetstreamError } from '../../../jetstream.helpers';
+import { helmEntityCatalog } from '../helm-entity-catalog';
 import { getHelmVersionId, getMonocularChartId, HELM_ENDPOINT_TYPE } from '../helm-entity-factory';
-import { GET_HELM_VERSIONS, GET_MONOCULAR_CHARTS, GetHelmVersions, GetMonocularCharts } from './helm.actions';
+import {
+  GET_HELM_VERSIONS,
+  GET_MONOCULAR_CHARTS,
+  GetHelmVersions,
+  GetMonocularCharts,
+  HELM_INSTALL,
+  HelmInstall,
+} from './helm.actions';
 import { HelmVersion } from './helm.types';
 
 @Injectable()
@@ -118,7 +128,36 @@ export class HelmEffects {
     })
   );
 
-
+  @Effect()
+  helmInstall$ = this.actions$.pipe(
+    ofType<HelmInstall>(HELM_INSTALL),
+    flatMap(action => {
+      const requestType: ApiRequestTypes = 'create';
+      const url = '/pp/v1/helm/install';
+      this.store.dispatch(new StartRequestAction(action, requestType));
+      return this.httpClient.post(url, action.values).pipe(
+        mergeMap(() => {
+          return [
+            new ClearPaginationOfType(action),
+            new WrapperRequestActionSuccess(null, action)
+          ];
+        }),
+        catchError(error => {
+          const { status, message } = HelmEffects.createHelmError(error);
+          const errorMessage = `Failed to install helm chart: ${message}`;
+          return [
+            new WrapperRequestActionFailed(errorMessage, action, requestType, {
+              endpointIds: [action.values.endpoint],
+              url: error.url || url,
+              eventCode: status,
+              message: errorMessage,
+              error
+            })
+          ];
+        })
+      );
+    })
+  );
 
   private makeRequest(
     action: EntityRequestAction,
@@ -204,7 +243,7 @@ export class HelmEffects {
         this.syncing = syncing;
         if (remaining !== existing) {
           // Dispatch action to refresh charts
-          this.store.dispatch(new GetMonocularCharts());
+          helmEntityCatalog.chart.api.getMultiple();
         }
         if (remaining > 0) {
           this.scheduleSyncStatusCheck();
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
index cd6c67b9f3..7bafc4d2ca 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
@@ -188,7 +188,6 @@ export class KubernetesEndpointService {
   }
 
   public refreshKubernetesDashboardStatus() {
-    // this.store.dispatch(new GetKubernetesDashboard(this.kubeGuid)); // TODO: RC store.dispatch
     kubeEntityCatalog.dashboard.api.get(this.kubeGuid);
   }
 
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 aa4186c638..fc4b0a9ce5 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
@@ -4,13 +4,13 @@ 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 { first, map, startWith } from 'rxjs/operators';
 
 import { AppState } from '../../../../../../store/src/app-state';
 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';
+import { getCurrentPageRequestInfo } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
+import { PaginatedAction, PaginationEntityState } from '../../../../../../store/src/types/pagination.types';
 import { safeUnsubscribe } from '../../../../core/utils.service';
 import {
   IChartThresholds,
@@ -113,14 +113,15 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
   ngOnInit() {
     const guid = this.kubeEndpointService.baseKube.guid;
 
-
-
-    const podCountAction = kubeEntityCatalog.pod.actions.getMultiple(guid);
-    const nodeCountAction = kubeEntityCatalog.node.actions.getMultiple(guid);
-    const namespacesCountAction = kubeEntityCatalog.namespace.actions.getMultiple(guid);
-    const pods$ = this.getPaginationObservable(podCountAction);
-    const nodes$ = this.getPaginationObservable(nodeCountAction);
-    const namespaces$ = this.getPaginationObservable(namespacesCountAction);
+    const podsObs = kubeEntityCatalog.pod.store.getPaginationService(guid);
+    const pods$ = podsObs.entities$;
+    this.poll(kubeEntityCatalog.pod.actions.getMultiple(guid), podsObs.pagination$)
+    const nodesObs = kubeEntityCatalog.node.store.getPaginationService(guid);
+    const nodes$ = nodesObs.entities$;
+    this.poll(kubeEntityCatalog.node.actions.getMultiple(guid), nodesObs.pagination$)
+    const namespacesObs = kubeEntityCatalog.namespace.store.getPaginationService(guid);
+    const namespaces$ = namespacesObs.entities$;
+    this.poll(kubeEntityCatalog.namespace.actions.getMultiple(guid), namespacesObs.pagination$)
 
     this.podCount$ = this.kubeEndpointService.getCountObservable(pods$);
     this.nodeCount$ = this.kubeEndpointService.getCountObservable(nodes$);
@@ -177,29 +178,22 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
     );
   }
 
-  private getPaginationObservable(action: PaginatedAction) {
-    const paginationMonitor = this.paginationMonitorFactory.create(
-      action.paginationKey,
-      action,
-      true
-    );
-
-    // TODO: RC this could easily get backed up, would entityService .poll be better??
-    this.ngZone.runOutsideAngular(() => {
+  private poll(action: PaginatedAction, pagination$: Observable<PaginationEntityState>) {
+    this.ngZone.runOutsideAngular(() =>
       this.polls.push(
         interval(10000).subscribe(() => {
-          this.ngZone.run(() => {
-            this.store.dispatch(action);
-          });
+          this.ngZone.run(() => this.updateList(action, pagination$));
         })
-      );
-    });
+      )
+    );
+  }
 
-    return getPaginationObservables({
-      store: this.store,
-      action,
-      paginationMonitor
-    }).entities$;
+  private updateList(action: PaginatedAction, pagination$: Observable<PaginationEntityState>) {
+    pagination$.pipe(first()).subscribe(pag => {
+      if (!getCurrentPageRequestInfo(pag, { busy: true, error: false, message: '' }).busy) {
+        this.store.dispatch(action);
+      }
+    })
   }
 
   ngOnDestroy() {
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts
index c325f2b932..eb7591f9c5 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts
@@ -1,14 +1,7 @@
 import {
   OrchestratedActionBuilders,
 } from '../../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
-import { HelmInstallValues } from '../../../helm/store/helm.types';
-import {
-  GetHelmRelease,
-  GetHelmReleaseGraph,
-  GetHelmReleaseResource,
-  GetHelmReleases,
-  HelmInstall,
-} from './workloads.actions';
+import { GetHelmRelease, GetHelmReleaseGraph, GetHelmReleaseResource, GetHelmReleases } from './workloads.actions';
 
 export interface WorkloadReleaseBuilders extends OrchestratedActionBuilders {
   get: (
@@ -17,15 +10,13 @@ export interface WorkloadReleaseBuilders extends OrchestratedActionBuilders {
     extraArgs: { namespace: string }
   ) => GetHelmRelease;
   getMultiple: () => GetHelmReleases;
-  install: (values: HelmInstallValues) => HelmInstall
 }
 
 export const workloadReleaseBuilders: WorkloadReleaseBuilders = {
   get: (title: string, endpointGuid: string, { namespace }: { namespace: string }) => {
     return new GetHelmRelease(endpointGuid, namespace, title);
   },
-  getMultiple: () => new GetHelmReleases(),
-  install: (values: HelmInstallValues) => new HelmInstall(values)
+  getMultiple: () => new GetHelmReleases()
 }
 
 export interface WorkloadGraphBuilders extends OrchestratedActionBuilders {
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
index 9fad760fb7..319ef74b8b 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
@@ -2,7 +2,6 @@ import { EntityRequestAction } from 'frontend/packages/store/src/types/request.t
 
 import { PaginatedAction } from '../../../../../../store/src/types/pagination.types';
 import { MonocularPaginationAction } from '../../../helm/store/helm.actions';
-import { HelmInstallValues } from '../../../helm/store/helm.types';
 import {
   KUBERNETES_ENDPOINT_TYPE,
   kubernetesEntityFactory,
@@ -39,10 +38,6 @@ export const UPDATE_HELM_RELEASE = '[Helm] Update Release';
 export const UPDATE_HELM_RELEASE_SUCCESS = '[Helm] Update Release Success';
 export const UPDATE_HELM_RELEASE_FAILURE = '[Helm] Update Release Failure';
 
-export const HELM_INSTALL = '[Helm] Install';
-export const HELM_INSTALL_SUCCESS = '[Helm] Install Success';
-export const HELM_INSTALL_FAILURE = '[Helm] Install Failure';
-
 interface HelmReleaseSingleEntity extends EntityRequestAction {
   guid: string;
 }
@@ -51,16 +46,6 @@ interface HelmReleasePaginated extends PaginatedAction, EntityRequestAction {
 
 }
 
-export class HelmInstall implements HelmReleaseSingleEntity {
-  type = HELM_INSTALL;
-  endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entityType = helmReleaseEntityKey;
-  guid: string;
-  constructor(public values: HelmInstallValues) {
-    this.guid = '<New Release>' + this.values.releaseName;
-  }
-}
-
 export class GetHelmReleases implements MonocularPaginationAction {
   constructor() {
     this.paginationKey = 'helm-releases';
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 dd9bc41611..ea7add12fe 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
@@ -6,10 +6,8 @@ import { environment } from 'frontend/packages/core/src/environments/environment
 import { Observable } from 'rxjs';
 import { catchError, flatMap, mergeMap } from 'rxjs/operators';
 
-import { ClearPaginationOfType } from '../../../../../../store/src/actions/pagination.actions';
 import { AppState } from '../../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
-import { ApiRequestTypes } from '../../../../../../store/src/reducers/api-request-reducer/request-helpers';
 import { NormalizedResponse } from '../../../../../../store/src/types/api.types';
 import {
   EntityRequestAction,
@@ -20,14 +18,7 @@ import {
 import { HelmEffects } from '../../../helm/store/helm.effects';
 import { HelmRelease } from '../workload.types';
 import { getHelmReleaseId } from './workloads-entity-factory';
-import {
-  GET_HELM_RELEASE,
-  GET_HELM_RELEASES,
-  GetHelmRelease,
-  GetHelmReleases,
-  HELM_INSTALL,
-  HelmInstall,
-} from './workloads.actions';
+import { GET_HELM_RELEASE, GET_HELM_RELEASES, GetHelmRelease, GetHelmReleases } from './workloads.actions';
 
 @Injectable()
 export class WorkloadsEffects {
@@ -91,37 +82,6 @@ export class WorkloadsEffects {
     })
   );
 
-  @Effect()
-  helmInstall$ = this.actions$.pipe(
-    ofType<HelmInstall>(HELM_INSTALL),
-    flatMap(action => {
-      const requestType: ApiRequestTypes = 'create';
-      const url = '/pp/v1/helm/install';
-      this.store.dispatch(new StartRequestAction(action, requestType));
-      return this.httpClient.post(url, action.values).pipe(
-        mergeMap(() => {
-          return [
-            new ClearPaginationOfType(action),
-            new WrapperRequestActionSuccess(null, action)
-          ];
-        }),
-        catchError(error => {
-          const { status, message } = HelmEffects.createHelmError(error);
-          const errorMessage = `Failed to install helm chart: ${message}`;
-          return [
-            new WrapperRequestActionFailed(errorMessage, action, requestType, {
-              endpointIds: [action.values.endpoint],
-              url: error.url || url,
-              eventCode: status,
-              message: errorMessage,
-              error
-            })
-          ];
-        })
-      );
-    })
-  );
-
   private mapHelmRelease(data, endpointId, guid: string) {
     const helmRelease: HelmRelease = {
       ...data,

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 508/648] 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 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 509/648] 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 510/648] 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 511/648] 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 cfaadc07d12b67d82bc05245d2369ec970738359 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 1 Jun 2020 11:55:34 +0100
Subject: [PATCH 512/648] Fix left padding on expander rows

---
 .../packages/core/sass/components/mat-table.scss | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/frontend/packages/core/sass/components/mat-table.scss b/src/frontend/packages/core/sass/components/mat-table.scss
index 6eef03a63d..c623288894 100644
--- a/src/frontend/packages/core/sass/components/mat-table.scss
+++ b/src/frontend/packages/core/sass/components/mat-table.scss
@@ -16,10 +16,18 @@ $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/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;
+  .app-table {
+    // 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;
+    }
+    .has-expanded-row {
+      // Override the margin-left from above, there's a lot of white space going on
+      .mat-cell:first-of-type, mat-footer-cell:first-of-type, mat-header-cell:first-of-type {
+        margin-left: 10px;
+      }
+    }
   }
 
   // Use margin, not padding for the right side of the first cell in the row/header/footer

From dedfe8e24a11296a150e8b8f2a9d07a87e776227 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 2 Jun 2020 09:15:23 +0100
Subject: [PATCH 513/648] WIP: Kubernetes terminal

---
 custom-src/deploy/kubernetes/custom-build.sh  |   4 +
 .../kube-console/kube-console.component.html  |   2 +-
 .../kube-console/kube-console.component.ts    |   3 +-
 .../kubernetes-summary.component.html         |   4 +-
 deploy/Dockerfile.kubeconsole.yml             |  18 --
 .../kube-terminal/Dockerfile.kubeconsole      |  40 ++++
 .../kube-terminal}/kubeconsole.bashrc         |  35 ++-
 .../console/templates/deployment.yaml         |   4 +
 .../ssh-viewer/ssh-viewer.component.html      |   2 +-
 .../ssh-viewer/ssh-viewer.component.ts        |  10 +
 src/jetstream/plugins/kubernetes/main.go      |   9 +-
 .../{kube_console.go => terminal.go}          | 210 ++++++++----------
 .../plugins/kubernetes/terminal/terminal.go   |  35 +++
 13 files changed, 230 insertions(+), 146 deletions(-)
 delete mode 100644 deploy/Dockerfile.kubeconsole.yml
 create mode 100644 deploy/containers/kube-terminal/Dockerfile.kubeconsole
 rename deploy/{ => containers/kube-terminal}/kubeconsole.bashrc (50%)
 rename src/jetstream/plugins/kubernetes/{kube_console.go => terminal.go} (79%)
 create mode 100644 src/jetstream/plugins/kubernetes/terminal/terminal.go

diff --git a/custom-src/deploy/kubernetes/custom-build.sh b/custom-src/deploy/kubernetes/custom-build.sh
index b850a85563..14e129d336 100644
--- a/custom-src/deploy/kubernetes/custom-build.sh
+++ b/custom-src/deploy/kubernetes/custom-build.sh
@@ -21,4 +21,8 @@ function custom_image_build() {
   # Build and push an image for the Helm Repo Sync Tool
   log "-- Building/publishing Monocular Chart Repo Sync Tool"
   patchAndPushImage stratos-chartsync Dockerfile "${STRATOS_PATH}/src/jetstream/plugins/monocular/chart-repo"
+
+  # Build and push an image for the Kubernetes Terminal
+  log "-- Building/publishing Kubernetes Terminal"
+  patchAndPushImage stratos-kube-terminal Dockerfile.kubeconsole "${STRATOS_PATH}/deploy/containers/kube-terminal"
 }
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.html b/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.html
index e8cfda74c0..905abb2f62 100644
--- a/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.html
@@ -1,5 +1,5 @@
 <app-page-header [breadcrumbs]="breadcrumbs$ | async">
-  <h1>Kubernetes Console</h1>
+  <h1>Kubernetes Terminal</h1>
   <div class="page-header-right">
     <span>
       <button mat-icon-button matTooltip="Disconnect" name="stop" *ngIf="sshViewer.isConnected" (click)="sshViewer.disconnect()" [disabled]="sshViewer.attemptingConnection">
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts b/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts
index e185e8ffe9..8335425367 100644
--- a/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts
@@ -98,8 +98,9 @@ export class KubeConsoleComponent implements OnInit {
         tap(() => this.connectionStatus.next(1)),
         switchMap(getResponse => getResponse(this.sshInput)),
         catchError((e: Error) => {
+          console.log(e.message);
           if (e.message !== normalClosureMessage) {
-            this.errorMessage = 'Error connecting to web socket';
+            this.errorMessage = 'Error launching Kubernetes Terminal';
           }
           return [];
         }));
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
index 3a1c5b169e..e744bedefc 100644
--- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
@@ -5,8 +5,8 @@
       <span class="kube-details__button">View Dashboard</span>
     </button>
     <button [routerLink]="kubeConsoleLink" mat-button>
-      <mat-icon>dashboard</mat-icon>
-      <span class="kube-details__button">Open Console</span>
+      <mat-icon>desktop_windows</mat-icon>
+      <span class="kube-details__button">Open Terminal</span>
     </button>
   </app-page-sub-nav>
 
diff --git a/deploy/Dockerfile.kubeconsole.yml b/deploy/Dockerfile.kubeconsole.yml
deleted file mode 100644
index 48c3f21443..0000000000
--- a/deploy/Dockerfile.kubeconsole.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM splatform/stratos-bk-base:opensuse as prod-build
-USER root
-RUN zypper in -y wget tar unzip nano vim curl
-
-RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl && \
-    chmod +x ./kubectl && \
-    mv ./kubectl /usr/local/bin/kubectl
-
-# Install Helm
-
-RUN curl -LO https://git.io/get_helm.sh && \
-    chmod 700 get_helm.sh && \
-    ./get_helm.sh
-
-ADD ./kubeconsole.bashrc /root/.bashrc
-WORKDIR /root
-
-CMD exec /bin/bash -c "trap : TERM INT; sleep infinity & wait"
diff --git a/deploy/containers/kube-terminal/Dockerfile.kubeconsole b/deploy/containers/kube-terminal/Dockerfile.kubeconsole
new file mode 100644
index 0000000000..19f55f08b4
--- /dev/null
+++ b/deploy/containers/kube-terminal/Dockerfile.kubeconsole
@@ -0,0 +1,40 @@
+FROM splatform/stratos-bk-build-base:leap15_1 as terminal-builder
+USER root
+WORKDIR /root
+
+#RUN zypper in -y tar
+
+# Kubectl versions
+RUN curl -L -o kubectl_1.18 https://storage.googleapis.com/kubernetes-release/release/v1.18.2/bin/linux/amd64/kubectl
+RUN curl -L -o kubectl_1.17 https://storage.googleapis.com/kubernetes-release/release/v1.17.5/bin/linux/amd64/kubectl
+#RUN curl -L -o kubectl_1.16 https://storage.googleapis.com/kubernetes-release/release/v1.16.9/bin/linux/amd64/kubectl
+#RUN curl -L -o kubectl_1.15 https://storage.googleapis.com/kubernetes-release/release/v1.15.11/bin/linux/amd64/kubectl
+RUN curl -L -o kubectl_1.14 https://storage.googleapis.com/kubernetes-release/release/v1.14.10/bin/linux/amd64/kubectl
+
+# Tar each one up, to save space in the image
+RUN gzip kubectl_1.18
+RUN gzip kubectl_1.17
+RUN gzip kubectl_1.14
+
+# Fetch Helm 3 package
+RUN curl -L -o helm.tar.gz https://get.helm.sh/helm-v3.1.2-linux-amd64.tar.gz && \
+    tar -xvf helm.tar.gz --strip-components=1 && \
+    gzip helm
+
+RUN ls -al
+
+FROM splatform/stratos-bk-init-base:leap15_1
+
+RUN zypper in -y gzip
+
+RUN mkdir /stratos
+
+# Copy the various kubectl versions
+
+COPY --from=terminal-builder /root/helm.gz /stratos/helm.gz
+COPY --from=terminal-builder /root/kubectl* /stratos/
+
+ADD ./kubeconsole.bashrc /root/.bashrc
+WORKDIR /root
+
+CMD exec /bin/bash -c "trap : TERM INT; sleep infinity & wait"
diff --git a/deploy/kubeconsole.bashrc b/deploy/containers/kube-terminal/kubeconsole.bashrc
similarity index 50%
rename from deploy/kubeconsole.bashrc
rename to deploy/containers/kube-terminal/kubeconsole.bashrc
index 2ac7e17679..10da69e597 100644
--- a/deploy/kubeconsole.bashrc
+++ b/deploy/containers/kube-terminal/kubeconsole.bashrc
@@ -6,18 +6,42 @@ RESET="\033[0m"
 BOLD="\033[1m"
 DIM="\033[2m"
 
-echo -e "${BOLD}${GREEN}SUSE Cloud Application Platform${RESET}"
+echo -e "${BOLD}${GREEN}SUSE Stratos Console${RESET}"
 echo ""
-echo -e "${CYAN}Kubernetes Console${RESET}"
+echo -e "${CYAN}Kubernetes Terminal${RESET}"
 echo ""
 
+# Unpack helm comand
+gunzip /stratos/helm.gz
+
+# Need to choose appropriate kubectl version
+pushd /stratos > /dev/null
+# Default to the newwest version that we have
+USE=$(ls kubectl_* | sort -r | head -n1)
+popd > /dev/null
+
+# If env var KUBERNETES_VERSION is set, then use it (major.minor only)
+if [ -n "${KUBERNETES_VERSION}" ]; then
+  VERSION="kubectl_${KUBERNETES_VERSION}.gz"
+  if [ -f "/stratos/${VERSION}" ]; then
+    USE=${VERSION}
+  fi
+fi
+
+gunzip /stratos/${USE}
+VER=${USE::-3}
+mv /stratos/${VER} /stratos/kubectl
+chmod +x /stratos/kubectl
+export PATH=/stratos:$PATH
+
 export KUBECONFIG=/root/.stratos/kubeconfig
 export PS1="\033[92mstratos>\033[0m"
 alias k=kubectl
 
-helm init --client-only > /dev/null
-helm repo remove local > /dev/null
-helm repo remove stable > /dev/null
+# Helm shell completion
+source <(helm completion bash)
+
+#helm repo remove stable > /dev/null
 
 if [ -f "/root/.stratos/helm-setup" ]; then
   echo "Setting up Helm repositories ..."
@@ -26,7 +50,6 @@ if [ -f "/root/.stratos/helm-setup" ]; then
   echo ""
 fi
 
-
 if [ -f "/root/.stratos/history" ]; then
   cat /root/.stratos/history > /root/.bash_history
 fi
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index c4123af521..6792a1ebf0 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -71,6 +71,10 @@ spec:
         env:
         - name: STRATOS_HELM_RELEASE
           value: "{{ .Release.Name }}"
+        - name: STRATOS_KUBERNETES_NAMESPACE
+          value: "{{ .Release.Namespace }}"
+        - name: STRATOS_KUBERNETES_TERMINAL_IMAGE
+          value: "{{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/stratos-kube-terminal:{{.Values.consoleVersion}}"
         - name: DB_USER
           valueFrom:
             secretKeyRef:
diff --git a/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.html b/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.html
index 44cac219ee..d5cee755ee 100644
--- a/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.html
+++ b/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.html
@@ -1,7 +1,7 @@
 <div class="ssh-viewer">
   <div class="ssh-viewer__overlay" *ngIf="!message && (errorMessage || !isConnected)">
     <div class="ssh-viewer__error" *ngIf="errorMessage">
-      Error occurred establishing SSH connection
+      {{ errorMessage || 'Error occurred establishing SSH connection' }}
     </div>
     <div class="ssh-viewer__disconnected" *ngIf="!errorMessage && !isConnected && !isConnecting">
         Disconnected
diff --git a/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.ts b/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.ts
index 8d9d8e055c..c12df6d6a1 100644
--- a/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.ts
+++ b/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.ts
@@ -122,6 +122,11 @@ export class SshViewerComponent implements OnInit, OnDestroy {
             for (const c of data.split(' ')) {
               this.xterm.write(String.fromCharCode(parseInt(c, 16)));
             }
+          } else {
+            console.log('Error')
+            const eMsg = this.errorMessage;
+            //this.disconnect();
+            this.errorMessage = eMsg;
           }
         },
         (err) => {
@@ -146,6 +151,11 @@ export class SshViewerComponent implements OnInit, OnDestroy {
         for (let i = 4; i < chars.length - 1; i++) {
           title += String.fromCharCode(parseInt(chars[i], 16));
         }
+        if (title.length > 0 && title.charAt(0) === '!') {
+          this.errorMessage = title.substr(1);
+          console.log(this.errorMessage);
+          return true;
+        }
         this.message = title;
       }
     return false;
diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index 75e530df4d..5e12edf9c6 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -14,12 +14,15 @@ import (
 	log "github.com/sirupsen/logrus"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/auth"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/terminal"
 )
 
 // KubernetesSpecification is the endpoint that adds Kubernetes support to the backend
 type KubernetesSpecification struct {
 	portalProxy  interfaces.PortalProxy
 	endpointType string
+	kubeTerminal *terminal.KubeTerminal
 }
 
 type KubeStatus struct {
@@ -53,8 +56,10 @@ const (
 	kubeDashboardPluginConfigSetting = "kubeDashboardEnabled"
 )
 
+// Init creates a new instance of the Kubernetes plugin
 func Init(portalProxy interfaces.PortalProxy) (interfaces.StratosPlugin, error) {
-	return &KubernetesSpecification{portalProxy: portalProxy, endpointType: kubeEndpointType}, nil
+	kubeTerminal := terminal.NewKubeTerminal(portalProxy)
+	return &KubernetesSpecification{portalProxy: portalProxy, endpointType: kubeEndpointType, kubeTerminal: kubeTerminal}, nil
 }
 
 func (c *KubernetesSpecification) GetEndpointPlugin() (interfaces.EndpointPlugin, error) {
@@ -160,7 +165,7 @@ func (c *KubernetesSpecification) AddSessionGroupRoutes(echoGroup *echo.Group) {
 	echoGroup.GET("/helm/releases/:endpoint/:namespace/:name", c.GetRelease)
 
 	// Kube Terminal
-	echoGroup.GET("/kubeconsole/:guid", c.KubeConsole)
+	echoGroup.GET("/kubeconsole/:guid", c.KubeTerminal)
 
 }
 
diff --git a/src/jetstream/plugins/kubernetes/kube_console.go b/src/jetstream/plugins/kubernetes/terminal.go
similarity index 79%
rename from src/jetstream/plugins/kubernetes/kube_console.go
rename to src/jetstream/plugins/kubernetes/terminal.go
index 7f54775d01..c1a98d5496 100644
--- a/src/jetstream/plugins/kubernetes/kube_console.go
+++ b/src/jetstream/plugins/kubernetes/terminal.go
@@ -2,34 +2,33 @@ package kubernetes
 
 import (
 	"bytes"
+	"crypto/tls"
 	"errors"
 	"fmt"
-	"crypto/tls"
+
 	//"encoding/base64"
 	"encoding/json"
 	"net"
 	"net/http"
-	"time"
 	"strings"
-	//"io/ioutil"
-	//yaml "gopkg.in/yaml.v2"
+	"time"
 
-	uuid "github.com/satori/go.uuid"
 	"github.com/labstack/echo"
+	uuid "github.com/satori/go.uuid"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/auth"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	restclient "k8s.io/client-go/rest"
-	//"k8s.io/kubernetes/pkg/client/unversioned/remotecommand"
+
 	"github.com/gorilla/websocket"
-	"k8s.io/client-go/kubernetes"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes"
 	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
 
-	"k8s.io/client-go/tools/remotecommand"	
 	scheme "k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/tools/remotecommand"
 )
 
 const (
@@ -47,13 +46,13 @@ var upgrader = websocket.Upgrader{
 
 // PodCreationData stores the clients and names used ot create pod and secret
 type PodCreationData struct {
-	ClientSet *kubernetes.Clientset
-	Config *restclient.Config
-	Namespace string
-	PodClient corev1.PodInterface
+	ClientSet    *kubernetes.Clientset
+	Config       *restclient.Config
+	Namespace    string
+	PodClient    corev1.PodInterface
 	SecretClient corev1.SecretInterface
-	PodName string
-	SecretName string
+	PodName      string
+	SecretName   string
 }
 
 // KeyCode - JSON object that is passed from the front-end to notify of a key press or a term resize
@@ -63,7 +62,7 @@ type KeyCode struct {
 	Rows int    `json:"rows"`
 }
 
-type TermianlSize struct {
+type terminalSize struct {
 	Width  uint16
 	Height uint16
 }
@@ -73,7 +72,24 @@ const (
 	writeWait = 10 * time.Second
 )
 
-func (k *KubernetesSpecification) KubeConsole(c echo.Context) error {
+// Determine if we Kube Terminal is supported
+// TODO
+// Check namespace
+// Check we have secret for pod creation/deletion
+// Image for the terminal
+
+// Environment variables that we expect to see
+// STRATOS_KUBERNETES_NAMESPACE
+// STRATOS_KUBERNETES_TERMINAL_IMAGE
+
+// For development, you can overide the token to use with the Kubernetes API, with:
+// STRATOS_KUBERNETES_API_TOKEN
+
+// Start periodic routing to clean up pods that are orphaned
+// TODO
+
+// KubeTerminal handles web-socket request to launch a Kubernetes Terminal
+func (k *KubernetesSpecification) KubeTerminal(c echo.Context) error {
 
 	c.Response().Status = 500
 
@@ -120,6 +136,9 @@ func (k *KubernetesSpecification) KubeConsole(c echo.Context) error {
 		log.Error("ERROR creating secret or pod")
 		log.Info(err)
 		k.cleanupPodAndSecret(podData)
+
+		// Send error message
+		sendProgressMessage(ws, "!"+err.Error())
 		return err
 	}
 
@@ -143,38 +162,37 @@ func (k *KubernetesSpecification) KubeConsole(c echo.Context) error {
 	// 	return errors.New("Could not get config for this auth type")
 	// }
 
+	// req, err := http.NewRequest("POST", target, nil)
+	// if err != nil {
+	// 	k.cleanupPodAndSecret(podData)
+	// 	return errors.New("Could not create new HTTP request")
+	// }
 
-	req, err := http.NewRequest("POST", target, nil)
-	if err != nil {
-		k.cleanupPodAndSecret(podData)		
-		return errors.New("Could not create new HTTP request")
-	}
-	
-	// Set auth header so we log in if needed
-	if len(tokenRec.AuthToken) > 0 {
-		//req.Header.Add("Authorization", "Bearer "+tokenRec.AuthToken)
-		log.Info("Setting auth header")
-	}
-
-	//req.Header.Add("Accept", "*/*")
+	// // TODO: Check response code
+	// log.Info(re)
 
-	log.Info("Config")
-	log.Info("Making request")
-	log.Info(req)
+	// // Set auth header so we log in if needed
+	// if len(tokenRec.AuthToken) > 0 {
+	// 	//req.Header.Add("Authorization", "Bearer "+tokenRec.AuthToken)
+	// 	log.Info("Setting auth header")
+	// }
 
 	// endpointRequest := &interfaces.CNSIRequest{
 	// 	GUID: endpointGUID,
 	// }
 
+	// TODO: Make generic
+
+	// What is the token for ???
 	kubeAuthToken := &auth.KubeCertificate{}
 	err = json.NewDecoder(strings.NewReader(tokenRec.AuthToken)).Decode(kubeAuthToken)
 	if err != nil {
-		k.cleanupPodAndSecret(podData)		
+		k.cleanupPodAndSecret(podData)
 		return err
 	}
 	cert, err := kubeAuthToken.GetCerticate()
 	if err != nil {
-		k.cleanupPodAndSecret(podData)		
+		k.cleanupPodAndSecret(podData)
 		return err
 	}
 	dial := (&net.Dialer{
@@ -182,6 +200,8 @@ func (k *KubernetesSpecification) KubeConsole(c echo.Context) error {
 		KeepAlive: 30 * time.Second,
 	}).Dial
 
+	// TODO: Not sure about the cert here? I don't think we need this like it is - wonder why I did that?
+
 	sslTransport := &http.Transport{
 		Proxy:               http.ProxyFromEnvironment,
 		Dial:                dial,
@@ -193,10 +213,11 @@ func (k *KubernetesSpecification) KubeConsole(c echo.Context) error {
 		MaxIdleConnsPerHost: 6, // (default is 2)
 	}
 
-	kubeCertClient := http.Client{}
-	kubeCertClient.Transport = sslTransport
-	kubeCertClient.Timeout = time.Duration(30) * time.Second
+	kubeHTTPClient := http.Client{}
+	kubeHTTPClient.Transport = sslTransport
+	kubeHTTPClient.Timeout = time.Duration(30) * time.Second
 
+	// This dialer does not use the kubeHttpClient  - is it unused?
 	dialer := &websocket.Dialer{
 		TLSClientConfig: &tls.Config{
 			InsecureSkipVerify: true,
@@ -204,7 +225,7 @@ func (k *KubernetesSpecification) KubeConsole(c echo.Context) error {
 		},
 	}
 
-	if strings.HasPrefix(target ,"https://") {
+	if strings.HasPrefix(target, "https://") {
 		target = "wss://" + target[8:]
 	} else {
 		target = "ws://" + target[7:]
@@ -217,48 +238,18 @@ func (k *KubernetesSpecification) KubeConsole(c echo.Context) error {
 		defer wsConn.Close()
 	}
 
-	// log.Info(err)
-	// log.Info(res)
-	// log.Info(wsConn)
-
-	// if kubeAuthToken.Token != "" {
-	// 	req.Header.Set("Authorization", "bearer "+kubeAuthToken.Token)
-	// }
-
-	//res, err := kubeCertClient.Do(req)
+	// Check res
+	log.Warn("== Status ===========================================")
+	log.Info(res.Status)
+	log.Info(res.StatusCode)
 
-
-	kubeCertClient.CloseIdleConnections()
-
-	//var res *http.Response
-
-	// var client http.Client
-	// client = p.GetHttpClientForRequest(req, cnsiRecord.SkipSSLValidation)
-	// res, err = client.Do(req)
-
-	// Find the auth provider for the auth type - default to oauthflow
-	// authHandler := p.GetAuthProvider(tokenRec.AuthType)
-	// if authHandler.Handler != nil {
-	// 	res, err = authHandler.Handler(endpointRequest, req)
-	// } else {
-	// 	res, err = p.DoOAuthFlowRequest(endpointRequest, req)
-	// }
-	log.Error(err)
-//	log.Error(res)
+	kubeHTTPClient.CloseIdleConnections()
 
 	if err != nil {
-		log.Error("Failed to make request")
 		k.cleanupPodAndSecret(podData)
 		return errors.New("Could not make request")
 	}
 
-	log.Error("=== Made request to exec endpoint OK")
-	log.Error(res)
-
-	// Websockets next
-	//log.Info(wsConn)
-
-	//done := make(chan struct{})
 	stdoutDone := make(chan struct{})
 	go pumpStdout(ws, wsConn, stdoutDone)
 
@@ -266,9 +257,8 @@ func (k *KubernetesSpecification) KubeConsole(c echo.Context) error {
 	for {
 		_, r, err := ws.ReadMessage()
 		if err != nil {
-			log.Error("Error reading message from web socket")
-			log.Warnf("%v+", err)
-			k.cleanupPodAndSecret(podData)			
+			log.Errorf("Kubernetes terminal: error reading message from web socket: %+v", err)
+			k.cleanupPodAndSecret(podData)
 			return err
 		}
 
@@ -276,36 +266,26 @@ func (k *KubernetesSpecification) KubeConsole(c echo.Context) error {
 		json.Unmarshal(r, &res)
 
 		if res.Cols == 0 {
-
-
 			slice := make([]byte, 1)
 			slice[0] = 0
 			slice = append(slice, []byte(res.Key)...)
 			wsConn.WriteMessage(websocket.TextMessage, slice)
 		} else {
-			// Terminal resize request
-			// if err := windowChange(session, res.Rows, res.Cols); err != nil {
-			// 	log.Error("Can not resize the PTY")
-			// }
-			log.Error("Terminal resize receieved")
-
-			size := TermianlSize{
-				Width: uint16(res.Cols),
+			size := terminalSize{
+				Width:  uint16(res.Cols),
 				Height: uint16(res.Rows),
 			}
 			j, _ := json.Marshal(size)
-			log.Info(j)
-
 			resizeStream := []byte{4}
 			slice := append(resizeStream, j...)
-			log.Info(slice)
 			wsConn.WriteMessage(websocket.TextMessage, slice)
 		}
 	}
 
 	// Cleanup
-	log.Info("*** Cleaning up.... ***")
+	log.Debug("Kubernetes Terminal is cleaning up")
 
+	// This is unreachable????
 	return k.cleanupPodAndSecret(podData)
 }
 
@@ -321,7 +301,7 @@ func pumpStdout(ws *websocket.Conn, source *websocket.Conn, done chan struct{})
 		ws.SetWriteDeadline(time.Now().Add(writeWait))
 		bytes := fmt.Sprintf("% x\n", r[1:])
 		if err := ws.WriteMessage(websocket.TextMessage, []byte(bytes)); err != nil {
-			log.Error("App SSH Failed to write nessage")
+			log.Error("Kubernetes Terimnal failed to write nessage")
 			ws.Close()
 			break
 		}
@@ -343,7 +323,7 @@ func (k *KubernetesSpecification) createPod(c echo.Context, cnsiRecord interface
 
 	result.Config = config
 
-	kubeConfig, err := k.GetKubeConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRecord)
+	kubeConfig, err := k.GetKubeConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRecord, namespace)
 	if err != nil {
 		return result, errors.New("Can not get Kubernetes config for specified endpoint")
 	}
@@ -360,11 +340,11 @@ func (k *KubernetesSpecification) createPod(c echo.Context, cnsiRecord interface
 	// Create the secret
 	secretSpec := &v1.Secret{
 		TypeMeta: metav1.TypeMeta{
-			Kind: "secret",
+			Kind:       "secret",
 			APIVersion: "v1",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name: secretName,
+			Name:      secretName,
 			Namespace: namespace,
 		},
 		Type: "Opaque",
@@ -373,7 +353,7 @@ func (k *KubernetesSpecification) createPod(c echo.Context, cnsiRecord interface
 	secretSpec.Data = make(map[string][]byte)
 	secretSpec.Data["kubeconfig"] = []byte(kubeConfig)
 	secretSpec.Data["history"] = []byte(history)
-	
+
 	// Get Helm repository script if we have Helm repositories
 	helmSetup := getHelmRepoSetupScript(k.portalProxy)
 	if len(helmSetup) > 0 {
@@ -395,11 +375,11 @@ func (k *KubernetesSpecification) createPod(c echo.Context, cnsiRecord interface
 
 	podSpec := &v1.Pod{
 		TypeMeta: metav1.TypeMeta{
-			Kind: "pod",
+			Kind:       "pod",
 			APIVersion: "v1",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name: podName,
+			Name:      podName,
 			Namespace: namespace,
 		},
 	}
@@ -407,7 +387,7 @@ func (k *KubernetesSpecification) createPod(c echo.Context, cnsiRecord interface
 	podSpec.ObjectMeta.Annotations = make(map[string]string)
 
 	// Record the session ID
-	session, err :=k.portalProxy.GetSession(c)
+	session, err := k.portalProxy.GetSession(c)
 	if err == nil {
 		podSpec.ObjectMeta.Annotations["stratos-session"] = session.ID
 		log.Infof("Session ID: %s", session.ID)
@@ -435,7 +415,7 @@ func (k *KubernetesSpecification) createPod(c echo.Context, cnsiRecord interface
 	volumesSpec[0].Secret = &v1.SecretVolumeSource{
 		SecretName: secretName,
 	}
-	podSpec.Spec.Volumes = volumesSpec	
+	podSpec.Spec.Volumes = volumesSpec
 
 	// Create a new pod
 	pod, err := podClient.Create(podSpec)
@@ -446,7 +426,7 @@ func (k *KubernetesSpecification) createPod(c echo.Context, cnsiRecord interface
 	result.PodClient = podClient
 	result.PodName = podName
 
-	sendProgressMessage(ws, "Waiting for Kubernetes Console to start up ...")
+	sendProgressMessage(ws, "Waiting for Kubernetes Terminal to start up ...")
 
 	statusOptions := metav1.GetOptions{}
 
@@ -518,6 +498,7 @@ func sendProgressMessage(ws *websocket.Conn, progressMsg string) {
 	}
 }
 
+// Not used?
 func captureBashHistory(podData *PodCreationData) error {
 
 	log.Warn("**** Trying to capture bash history from pod ****")
@@ -530,14 +511,13 @@ func captureBashHistory(podData *PodCreationData) error {
 	//cmd := []string{"bash", "-c", "\"cat $HISTFILE\""}
 	cmd := []string{"cat", "/root/.bash_history"}
 
-
-	req := podData.ClientSet.Core().RESTClient().Post().
+	req := podData.ClientSet.CoreV1().RESTClient().Post().
 		Resource("pods").
 		Name(podData.PodName).
 		Namespace(podData.Namespace).
 		SubResource("exec").
 		Param("container", consoleContainerName)
-			
+
 	req.VersionedParams(&v1.PodExecOptions{
 		Container: consoleContainerName,
 		Command:   cmd,
@@ -546,7 +526,7 @@ func captureBashHistory(podData *PodCreationData) error {
 		Stderr:    false,
 		TTY:       true,
 	}, scheme.ParameterCodec)
-	
+
 	var stdout bytes.Buffer
 	//err := execute("POST", req.URL(), nil, nil, &stdout, nil, false)
 
@@ -561,10 +541,10 @@ func captureBashHistory(podData *PodCreationData) error {
 
 	err = exec.Stream(remotecommand.StreamOptions{
 		//SupportedProtocols: remotecommandserver.SupportedStreamingProtocols,
-		Stdin:              nil,
-		Stdout:             &stdout,
-		Stderr:             nil,
-		Tty:                true,
+		Stdin:  nil,
+		Stdout: &stdout,
+		Stderr: nil,
+		Tty:    true,
 	})
 
 	log.Error("Get Bash History")
@@ -572,11 +552,11 @@ func captureBashHistory(podData *PodCreationData) error {
 	log.Error(stdout.String())
 
 	history = stdout.String()
-	
-		// if options.PreserveWhitespace {
-		// 	return stdout.String(), stderr.String(), err
-		// }
-		// return strings.TrimSpace(stdout.String()), strings.TrimSpace(stderr.String()), err	
+
+	// if options.PreserveWhitespace {
+	// 	return stdout.String(), stderr.String(), err
+	// }
+	// return strings.TrimSpace(stdout.String()), strings.TrimSpace(stderr.String()), err
 
 	return nil
-}
\ No newline at end of file
+}
diff --git a/src/jetstream/plugins/kubernetes/terminal/terminal.go b/src/jetstream/plugins/kubernetes/terminal/terminal.go
new file mode 100644
index 0000000000..646fb46b45
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/terminal/terminal.go
@@ -0,0 +1,35 @@
+package terminal
+
+import (
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces/config"
+
+	log "github.com/sirupsen/logrus"
+)
+
+// KubeTerminal supports spawning pods to provide a CLI environment to the user
+type KubeTerminal struct {
+	Namespace string `configName:"STRATOS_KUBERNETES_NAMESPACE"`
+	Image     string `configName:"STRATOS_KUBERNETES_TERMINAL_IMAGE"`
+	Token     string `configName:"STRATOS_NAMESPACE"`
+}
+
+// NewKubeTerminal checks that the environment is set up to support the Kube Terminal
+func NewKubeTerminal(p interfaces.PortalProxy) *KubeTerminal {
+
+	kt := &KubeTerminal{}
+	if err := config.Load(kt, p.Env().Lookup); err != nil {
+		log.Warn("Unable to load Kube Terminal configuration. %v", err)
+		return nil
+	}
+
+	// Check that we have everything we need
+	if len(kt.Image) == 0 || len(kt.Namespace) == 0 || len(kt.Token) == 0 {
+		log.Warn("Kube Terminal configuration is not complete")
+		return nil
+	}
+
+	log.Info("Kubernetes Terminal configured")
+
+	return kt
+}

From 7227dcaacf50d014fd9b6eb09f81788613ab6fb8 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 2 Jun 2020 09:39:50 +0100
Subject: [PATCH 514/648] Apply recreate-pods fix to SUSE additional containers

---
 custom-src/deploy/kubernetes/__stratos.tpl        | 15 +++++++++++++++
 custom-src/deploy/kubernetes/customize-helm.sh    |  6 +++++-
 .../kubernetes/console/templates/chartsync.yaml   |  3 +++
 .../kubernetes/console/templates/deployment.yaml  | 10 ----------
 .../console/templates/fdbdoclayer/deployment.yaml |  4 ++++
 5 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 custom-src/deploy/kubernetes/__stratos.tpl

diff --git a/custom-src/deploy/kubernetes/__stratos.tpl b/custom-src/deploy/kubernetes/__stratos.tpl
new file mode 100644
index 0000000000..3ebbce1efe
--- /dev/null
+++ b/custom-src/deploy/kubernetes/__stratos.tpl
@@ -0,0 +1,15 @@
+# Customizations for the Helm Chart
+
+# Extra env vars for the Jetstream Pod in deployment.yaml
+{{- define "stratosJetstreamEnv" }}
+- name: MONOCULAR_CRT_PATH
+  value: "/etc/monocular-certs/tls.crt"
+- name: MONOCULAR_KEY_PATH
+  value: "/etc/monocular-certs/tls.key"
+- name: MONOCULAR_CA_CRT_PATH
+  value: "/etc/monocular-certs/ca.crt"
+- name: FDB_URL
+  value: "mongodb://{{ .Release.Name }}-fdbdoclayer:27016"
+- name: SYNC_SERVER_URL
+  value: "http://{{ .Release.Name }}-chartsync:8080"
+{{- end }}
\ No newline at end of file
diff --git a/custom-src/deploy/kubernetes/customize-helm.sh b/custom-src/deploy/kubernetes/customize-helm.sh
index 6284fe6c35..e57c571440 100755
--- a/custom-src/deploy/kubernetes/customize-helm.sh
+++ b/custom-src/deploy/kubernetes/customize-helm.sh
@@ -15,6 +15,11 @@ echo "Customizations folder: ${DIR}"
 echo "Chart folder         : ${CHART_PATH}"
 echo ""
 
+# ===========================================================================================
+# Copy our customization helper over the default, empty one
+# ===========================================================================================
+cp "${DIR}/__stratos.tpl" "${CHART_PATH}/templates/__stratos.tpl"
+
 # ===========================================================================================
 # Chart.yaml changes
 # ===========================================================================================
@@ -45,7 +50,6 @@ echo -e "${CYAN}Patching README.md${RESET}"
 sed -i.bak -e 's@Stratos@SUSE Stratos Console@g' ${CHART_PATH}/README.md
 
 # Change first paragraph to include Kubernetes
-console for Cloud Foundry.
 SRC="console for Cloud Foundry."
 DEST="console for Cloud Foundry and Kubernetes."
 sed -i.bak -e 's@'"${SRC}"'@'"${DEST}"'@g' ${CHART_PATH}/README.md
diff --git a/deploy/kubernetes/console/templates/chartsync.yaml b/deploy/kubernetes/console/templates/chartsync.yaml
index 2acedc0bca..1eeab2affd 100644
--- a/deploy/kubernetes/console/templates/chartsync.yaml
+++ b/deploy/kubernetes/console/templates/chartsync.yaml
@@ -34,6 +34,9 @@ spec:
         imagePullPolicy: {{.Values.imagePullPolicy}}
         command: ["/chartrepo"]
         args: ["serve", "--doclayer-url=mongodb://{{ .Release.Name }}-fdbdoclayer:27016", "--cafile=/etc/certs/ca.crt", "--certfile=/etc/certs/tls.crt", "--keyfile=/etc/certs/tls.key"]
+        env:
+        - name: STRATOS_IMAGE_REF
+          value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
         ports:
         - name: endpoint
           containerPort: 8080
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 2b5f5a0949..60656b1d83 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -282,16 +282,6 @@ spec:
           value: {{ default "false" .Values.console.ui.listAllowLoadMaxed | quote }}
         {{- end }}
         {{- include "stratosJetstreamEnv" . | indent 8 }}
-        - name: MONOCULAR_CRT_PATH
-          value: "/etc/monocular-certs/tls.crt"
-        - name: MONOCULAR_KEY_PATH
-          value: "/etc/monocular-certs/tls.key"
-        - name: MONOCULAR_CA_CRT_PATH
-          value: "/etc/monocular-certs/ca.crt"
-        - name: FDB_URL
-          value: "mongodb://{{ .Release.Name }}-fdbdoclayer:27016"
-        - name: SYNC_SERVER_URL
-          value: "http://{{ .Release.Name }}-chartsync:8080"
         readinessProbe:
           httpGet:
             path: /pp/v1/ping
diff --git a/deploy/kubernetes/console/templates/fdbdoclayer/deployment.yaml b/deploy/kubernetes/console/templates/fdbdoclayer/deployment.yaml
index 63cdb0e7e8..4a1a02e06d 100644
--- a/deploy/kubernetes/console/templates/fdbdoclayer/deployment.yaml
+++ b/deploy/kubernetes/console/templates/fdbdoclayer/deployment.yaml
@@ -52,6 +52,8 @@ spec:
         image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.fdbdoclayer}}:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         env:
+        - name: STRATOS_IMAGE_REF
+          value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
         - name: FDB_COORDINATOR
           value: {{ .Release.Name }}-fdbdoclayer
         - name: FDB_LISTEN_IP
@@ -88,6 +90,8 @@ spec:
         image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.fdbserver}}:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         env:
+        - name: STRATOS_IMAGE_REF
+          value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
         - name: FDB_COORDINATOR
           value: {{ .Release.Name }}-fdbdoclayer
         - name: FDB_LISTEN_IP

From 76a13f5d149880b568293839bd4d28e45113d8bd Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Wed, 3 Jun 2020 13:42:36 +0100
Subject: [PATCH 515/648] Kubernetes Terminal updates and tidy up

---
 deploy/common-build.sh                        |  15 +-
 .../console/templates/deployment.yaml         |   3 +
 .../console/templates/service-account.yaml    |  61 ++
 src/jetstream/main.go                         |   3 +
 src/jetstream/plugins/kubernetes/api/api.go   |  12 +
 src/jetstream/plugins/kubernetes/main.go      |   9 +-
 src/jetstream/plugins/kubernetes/terminal.go  | 562 ------------------
 .../plugins/kubernetes/terminal/cleanup.go    |  84 +++
 .../plugins/kubernetes/terminal/helpers.go    | 233 ++++++++
 .../plugins/kubernetes/terminal/start.go      | 254 ++++++++
 .../plugins/kubernetes/terminal/terminal.go   |  49 +-
 .../repository/interfaces/sessiondata.go      |   4 +
 .../sessiondata/psql_sessiondata.go           |  32 +-
 13 files changed, 750 insertions(+), 571 deletions(-)
 create mode 100644 deploy/kubernetes/console/templates/service-account.yaml
 create mode 100644 src/jetstream/plugins/kubernetes/api/api.go
 delete mode 100644 src/jetstream/plugins/kubernetes/terminal.go
 create mode 100644 src/jetstream/plugins/kubernetes/terminal/cleanup.go
 create mode 100644 src/jetstream/plugins/kubernetes/terminal/helpers.go
 create mode 100644 src/jetstream/plugins/kubernetes/terminal/start.go

diff --git a/deploy/common-build.sh b/deploy/common-build.sh
index 2e8906adf4..11fb464ddc 100644
--- a/deploy/common-build.sh
+++ b/deploy/common-build.sh
@@ -43,7 +43,7 @@ function buildAndPublishImage {
 
 # Proxy support
 # Remove intermediate containers after a successful build
-BUILD_ARGS="--rm=true --squash"
+BUILD_ARGS="--rm=true"
 RUN_ARGS=""
 if [ -n "${http_proxy:-}" -o -n "${HTTP_PROXY:-}" ]; then
   BUILD_ARGS="${BUILD_ARGS} --build-arg http_proxy=${http_proxy:-${HTTP_PROXY}}"
@@ -54,6 +54,19 @@ if [ -n "${https_proxy:-}" -o -n "${HTTPS_PROXY:-}" ]; then
   RUN_ARGS="${RUN_ARGS} -e https_proxy=${https_proxy:-${HTTPS_PROXY}}"
 fi
 
+# Check if we can squash
+echo "checking"
+CAN_SQUASH=$(docker info 2>&1 | grep "Experimental: true" | cat)
+echo "check"
+if [ "${CAN_SQUASH}" == "1" ]; then
+  BUILD_ARGS="${BUILD_ARGS} --squash"
+  echo "Images will be squashed"
+else
+  echo "Images will NOT be squashed"
+fi
+
+echo "OK"
+
 # Use correct sed command for Mac
 SED="sed -r"
 unamestr=`uname`
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 6792a1ebf0..094a6ed78c 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -308,6 +308,9 @@ spec:
       imagePullSecrets:
       - name: {{.Values.dockerRegistrySecret}}
       {{- end }}
+      {{- if and (eq (printf "%s" .Values.kube.auth) "rbac") (.Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1") }}
+      serviceAccountName: "stratos"
+      {{- end }}
       volumes:
       - name: "{{ .Release.Name }}-encryption-key-volume"
         secret:
diff --git a/deploy/kubernetes/console/templates/service-account.yaml b/deploy/kubernetes/console/templates/service-account.yaml
new file mode 100644
index 0000000000..d8ef0e07d7
--- /dev/null
+++ b/deploy/kubernetes/console/templates/service-account.yaml
@@ -0,0 +1,61 @@
+{{- if and (eq (printf "%s" .Values.kube.auth) "rbac") (.Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1") }}
+---
+# Service account main Stratos Deployment
+# Allows it to create some resources in its namespace
+apiVersion: "v1"
+kind: "ServiceAccount"
+metadata:
+  name: "stratos"
+  labels:
+    app.kubernetes.io/component: "stratos"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    helm.sh/chart:  "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+---
+# Role "stratos-role" only used by account "stratos"
+apiVersion: "rbac.authorization.k8s.io/v1"
+kind: "Role"
+metadata:
+  name: "stratos-role"
+  labels:
+    app.kubernetes.io/component: "stratos-role"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    helm.sh/chart:  "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - "secrets"
+  - "pods"
+  verbs:
+  - "create"
+  - "update"
+  - "get"
+  - "list"
+  - "delete"
+- apiGroups: [""]
+  resources: ["pods/exec"]
+  verbs: ["create", "get"]
+---
+# Role binding for service account "stratos" and role "stratos-role"
+apiVersion: "rbac.authorization.k8s.io/v1"
+kind: "RoleBinding"
+metadata:
+  name: "stratos-role-binding"
+  labels:
+    app.kubernetes.io/component: "stratos-role-binding"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    helm.sh/chart:  "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+subjects:
+- kind: "ServiceAccount"
+  name: "stratos"
+roleRef:
+  apiGroup: "rbac.authorization.k8s.io"
+  kind: "Role"
+  name: "stratos-role"
+{{- end }}
diff --git a/src/jetstream/main.go b/src/jetstream/main.go
index 9b649da31d..f6f90c60c6 100644
--- a/src/jetstream/main.go
+++ b/src/jetstream/main.go
@@ -10,6 +10,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"math/rand"	
 	"net"
 	"net/http"
 	"os"
@@ -115,6 +116,8 @@ func main() {
 		}
 	}
 
+	rand.Seed(time.Now().UnixNano())
+
 	log.SetOutput(os.Stdout)
 
 	log.Info("========================================")
diff --git a/src/jetstream/plugins/kubernetes/api/api.go b/src/jetstream/plugins/kubernetes/api/api.go
new file mode 100644
index 0000000000..b15fc1b3c3
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/api/api.go
@@ -0,0 +1,12 @@
+package api
+
+import (
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+
+	restclient "k8s.io/client-go/rest"
+)
+
+type Kubernetes interface {
+	GetConfigForEndpoint(masterURL string, token interfaces.TokenRecord) (*restclient.Config, error)
+	GetKubeConfigForEndpoint(masterURL string, token interfaces.TokenRecord, namespace string) (string, error)
+}
diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index 5e12edf9c6..bca169a26c 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -59,7 +59,9 @@ const (
 // Init creates a new instance of the Kubernetes plugin
 func Init(portalProxy interfaces.PortalProxy) (interfaces.StratosPlugin, error) {
 	kubeTerminal := terminal.NewKubeTerminal(portalProxy)
-	return &KubernetesSpecification{portalProxy: portalProxy, endpointType: kubeEndpointType, kubeTerminal: kubeTerminal}, nil
+	kube := &KubernetesSpecification{portalProxy: portalProxy, endpointType: kubeEndpointType, kubeTerminal: kubeTerminal}
+	kubeTerminal.Kube = kube
+	return kube, nil
 }
 
 func (c *KubernetesSpecification) GetEndpointPlugin() (interfaces.EndpointPlugin, error) {
@@ -136,6 +138,9 @@ func (c *KubernetesSpecification) Init() error {
 	// Kube dashboard is enabled by Tech Preview mode
 	c.portalProxy.GetConfig().PluginConfig[kubeDashboardPluginConfigSetting] = strconv.FormatBool(c.portalProxy.GetConfig().EnableTechPreview)
 
+	// Kick off the cleanup of any old kube terminal pods
+	c.kubeTerminal.StartCleanup()
+
 	return nil
 }
 
@@ -165,7 +170,7 @@ func (c *KubernetesSpecification) AddSessionGroupRoutes(echoGroup *echo.Group) {
 	echoGroup.GET("/helm/releases/:endpoint/:namespace/:name", c.GetRelease)
 
 	// Kube Terminal
-	echoGroup.GET("/kubeconsole/:guid", c.KubeTerminal)
+	echoGroup.GET("/kubeconsole/:guid", c.kubeTerminal.Start)
 
 }
 
diff --git a/src/jetstream/plugins/kubernetes/terminal.go b/src/jetstream/plugins/kubernetes/terminal.go
deleted file mode 100644
index c1a98d5496..0000000000
--- a/src/jetstream/plugins/kubernetes/terminal.go
+++ /dev/null
@@ -1,562 +0,0 @@
-package kubernetes
-
-import (
-	"bytes"
-	"crypto/tls"
-	"errors"
-	"fmt"
-
-	//"encoding/base64"
-	"encoding/json"
-	"net"
-	"net/http"
-	"strings"
-	"time"
-
-	"github.com/labstack/echo"
-	uuid "github.com/satori/go.uuid"
-	log "github.com/sirupsen/logrus"
-
-	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/auth"
-	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
-	restclient "k8s.io/client-go/rest"
-
-	"github.com/gorilla/websocket"
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/kubernetes"
-	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
-
-	scheme "k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/client-go/tools/remotecommand"
-)
-
-const (
-	consoleContainerName = "kube-console"
-)
-
-var history = ""
-
-// TTY Resize, see: https://gitlab.cncf.ci/kubernetes/kubernetes/commit/3b21a9901bcd48bb452d3bf1a0cddc90dae142c4#9691a2f9b9c30711f0397221db0b9ac55ab0e2d1
-
-// Allow connections from any Origin
-var upgrader = websocket.Upgrader{
-	CheckOrigin: func(r *http.Request) bool { return true },
-}
-
-// PodCreationData stores the clients and names used ot create pod and secret
-type PodCreationData struct {
-	ClientSet    *kubernetes.Clientset
-	Config       *restclient.Config
-	Namespace    string
-	PodClient    corev1.PodInterface
-	SecretClient corev1.SecretInterface
-	PodName      string
-	SecretName   string
-}
-
-// KeyCode - JSON object that is passed from the front-end to notify of a key press or a term resize
-type KeyCode struct {
-	Key  string `json:"key"`
-	Cols int    `json:"cols"`
-	Rows int    `json:"rows"`
-}
-
-type terminalSize struct {
-	Width  uint16
-	Height uint16
-}
-
-const (
-	// Time allowed to write a message to the peer.
-	writeWait = 10 * time.Second
-)
-
-// Determine if we Kube Terminal is supported
-// TODO
-// Check namespace
-// Check we have secret for pod creation/deletion
-// Image for the terminal
-
-// Environment variables that we expect to see
-// STRATOS_KUBERNETES_NAMESPACE
-// STRATOS_KUBERNETES_TERMINAL_IMAGE
-
-// For development, you can overide the token to use with the Kubernetes API, with:
-// STRATOS_KUBERNETES_API_TOKEN
-
-// Start periodic routing to clean up pods that are orphaned
-// TODO
-
-// KubeTerminal handles web-socket request to launch a Kubernetes Terminal
-func (k *KubernetesSpecification) KubeTerminal(c echo.Context) error {
-
-	c.Response().Status = 500
-
-	log.Info("Kube Console backend request")
-
-	endpointGUID := c.Param("guid")
-	userGUID := c.Get("user_id").(string)
-
-	///api/v1/namespaces/project-1/pods/pod-1-lmlzj/exec?command=/bin/bash&stdin=true&stderr=true&stdout=true&tty=true
-
-	namespace := "stratos"
-
-	// TODO: Refresh auth token
-
-	// Upgrade the web socket for the incoming request
-	ws, pingTicker, err := interfaces.UpgradeToWebSocket(c)
-	if err != nil {
-		return err
-	}
-	defer ws.Close()
-	defer pingTicker.Stop()
-
-	// Send a message to say that we are creating the pod
-	sendProgressMessage(ws, "Launching Kubernetes Console ... one moment please")
-
-	var p = k.portalProxy
-
-	cnsiRecord, err := p.GetCNSIRecord(endpointGUID)
-	if err != nil {
-		return errors.New("Could not get endpoint information")
-	}
-
-	// Get token for this users
-	tokenRec, ok := p.GetCNSITokenRecord(endpointGUID, userGUID)
-	if !ok {
-		return errors.New("Could not get token")
-	}
-
-	podData, err := k.createPod(c, cnsiRecord, tokenRec, namespace, ws)
-	// Clear progress message
-	sendProgressMessage(ws, "")
-
-	if err != nil {
-		log.Error("ERROR creating secret or pod")
-		log.Info(err)
-		k.cleanupPodAndSecret(podData)
-
-		// Send error message
-		sendProgressMessage(ws, "!"+err.Error())
-		return err
-	}
-
-	log.Info(podData.PodName)
-
-	log.Info(tokenRec.AuthToken)
-	log.Info(tokenRec.AuthType)
-
-	// Make the info call to the SSH endpoint info
-	// Currently this is not cached, so we must get it each time
-	apiEndpoint := cnsiRecord.APIEndpoint
-	log.Info(apiEndpoint)
-	// target := fmt.Sprintf("%s/api/v1/namespaces/kube-system/services/https:kubernetes-dashboard:/proxy/", apiEndpoint)
-	//target := fmt.Sprintf("%s/api/v1/namespaces/kube-system/services/http:kubernetes-dashboard:/proxy/", apiEndpoint)
-	// target := http://localhost:8001/api/v1/namespaces/kube-system/services/kubernetes-dashboard/proxy
-	target := fmt.Sprintf("%s/api/v1/namespaces/%s/pods/%s/exec?command=/bin/bash&stdin=true&stderr=true&stdout=true&tty=true", apiEndpoint, namespace, podData.PodName)
-	log.Info(target)
-
-	// config, err := k.getConfig(&cnsiRecord, &tokenRec)
-	// if err != nil {
-	// 	return errors.New("Could not get config for this auth type")
-	// }
-
-	// req, err := http.NewRequest("POST", target, nil)
-	// if err != nil {
-	// 	k.cleanupPodAndSecret(podData)
-	// 	return errors.New("Could not create new HTTP request")
-	// }
-
-	// // TODO: Check response code
-	// log.Info(re)
-
-	// // Set auth header so we log in if needed
-	// if len(tokenRec.AuthToken) > 0 {
-	// 	//req.Header.Add("Authorization", "Bearer "+tokenRec.AuthToken)
-	// 	log.Info("Setting auth header")
-	// }
-
-	// endpointRequest := &interfaces.CNSIRequest{
-	// 	GUID: endpointGUID,
-	// }
-
-	// TODO: Make generic
-
-	// What is the token for ???
-	kubeAuthToken := &auth.KubeCertificate{}
-	err = json.NewDecoder(strings.NewReader(tokenRec.AuthToken)).Decode(kubeAuthToken)
-	if err != nil {
-		k.cleanupPodAndSecret(podData)
-		return err
-	}
-	cert, err := kubeAuthToken.GetCerticate()
-	if err != nil {
-		k.cleanupPodAndSecret(podData)
-		return err
-	}
-	dial := (&net.Dialer{
-		Timeout:   time.Duration(30) * time.Second,
-		KeepAlive: 30 * time.Second,
-	}).Dial
-
-	// TODO: Not sure about the cert here? I don't think we need this like it is - wonder why I did that?
-
-	sslTransport := &http.Transport{
-		Proxy:               http.ProxyFromEnvironment,
-		Dial:                dial,
-		TLSHandshakeTimeout: 10 * time.Second, // 10 seconds is a sound default value (default is 0)
-		TLSClientConfig: &tls.Config{
-			InsecureSkipVerify: true,
-			Certificates:       []tls.Certificate{cert},
-		},
-		MaxIdleConnsPerHost: 6, // (default is 2)
-	}
-
-	kubeHTTPClient := http.Client{}
-	kubeHTTPClient.Transport = sslTransport
-	kubeHTTPClient.Timeout = time.Duration(30) * time.Second
-
-	// This dialer does not use the kubeHttpClient  - is it unused?
-	dialer := &websocket.Dialer{
-		TLSClientConfig: &tls.Config{
-			InsecureSkipVerify: true,
-			Certificates:       []tls.Certificate{cert},
-		},
-	}
-
-	if strings.HasPrefix(target, "https://") {
-		target = "wss://" + target[8:]
-	} else {
-		target = "ws://" + target[7:]
-	}
-
-	header := &http.Header{}
-	wsConn, res, err := dialer.Dial(target, *header)
-
-	if err == nil {
-		defer wsConn.Close()
-	}
-
-	// Check res
-	log.Warn("== Status ===========================================")
-	log.Info(res.Status)
-	log.Info(res.StatusCode)
-
-	kubeHTTPClient.CloseIdleConnections()
-
-	if err != nil {
-		k.cleanupPodAndSecret(podData)
-		return errors.New("Could not make request")
-	}
-
-	stdoutDone := make(chan struct{})
-	go pumpStdout(ws, wsConn, stdoutDone)
-
-	// Read the input from the web socket and pipe it to the SSH client
-	for {
-		_, r, err := ws.ReadMessage()
-		if err != nil {
-			log.Errorf("Kubernetes terminal: error reading message from web socket: %+v", err)
-			k.cleanupPodAndSecret(podData)
-			return err
-		}
-
-		res := KeyCode{}
-		json.Unmarshal(r, &res)
-
-		if res.Cols == 0 {
-			slice := make([]byte, 1)
-			slice[0] = 0
-			slice = append(slice, []byte(res.Key)...)
-			wsConn.WriteMessage(websocket.TextMessage, slice)
-		} else {
-			size := terminalSize{
-				Width:  uint16(res.Cols),
-				Height: uint16(res.Rows),
-			}
-			j, _ := json.Marshal(size)
-			resizeStream := []byte{4}
-			slice := append(resizeStream, j...)
-			wsConn.WriteMessage(websocket.TextMessage, slice)
-		}
-	}
-
-	// Cleanup
-	log.Debug("Kubernetes Terminal is cleaning up")
-
-	// This is unreachable????
-	return k.cleanupPodAndSecret(podData)
-}
-
-func pumpStdout(ws *websocket.Conn, source *websocket.Conn, done chan struct{}) {
-	//buffer := make([]byte, 32768)
-	for {
-		_, r, err := source.ReadMessage()
-		if err != nil {
-			log.Info(err)
-			ws.Close()
-			break
-		}
-		ws.SetWriteDeadline(time.Now().Add(writeWait))
-		bytes := fmt.Sprintf("% x\n", r[1:])
-		if err := ws.WriteMessage(websocket.TextMessage, []byte(bytes)); err != nil {
-			log.Error("Kubernetes Terimnal failed to write nessage")
-			ws.Close()
-			break
-		}
-	}
-}
-
-func (k *KubernetesSpecification) createPod(c echo.Context, cnsiRecord interfaces.CNSIRecord, tokenRecord interfaces.TokenRecord, namespace string, ws *websocket.Conn) (*PodCreationData, error) {
-
-	id := uuid.NewV4().String()
-	secretName := fmt.Sprintf("k8s-s-console-%s", id)
-	podName := fmt.Sprintf("k8s-p-console-%s", id)
-
-	result := &PodCreationData{}
-
-	config, err := k.GetConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRecord)
-	if err != nil {
-		return result, errors.New("Can not get Kubernetes config for specified endpoint")
-	}
-
-	result.Config = config
-
-	kubeConfig, err := k.GetKubeConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRecord, namespace)
-	if err != nil {
-		return result, errors.New("Can not get Kubernetes config for specified endpoint")
-	}
-
-	kubeClient, err := kubernetes.NewForConfig(config)
-	if err != nil {
-		log.Error("Could not get kube client")
-		return result, err
-	}
-
-	result.Namespace = namespace
-	result.ClientSet = kubeClient
-
-	// Create the secret
-	secretSpec := &v1.Secret{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "secret",
-			APIVersion: "v1",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      secretName,
-			Namespace: namespace,
-		},
-		Type: "Opaque",
-	}
-
-	secretSpec.Data = make(map[string][]byte)
-	secretSpec.Data["kubeconfig"] = []byte(kubeConfig)
-	secretSpec.Data["history"] = []byte(history)
-
-	// Get Helm repository script if we have Helm repositories
-	helmSetup := getHelmRepoSetupScript(k.portalProxy)
-	if len(helmSetup) > 0 {
-		secretSpec.Data["helm-setup"] = []byte(helmSetup)
-	}
-
-	secretsClient := kubeClient.CoreV1().Secrets(namespace)
-	_, err = secretsClient.Create(secretSpec)
-
-	if err != nil {
-		log.Warn("Unable to create Secret")
-		return result, err
-	}
-
-	result.SecretClient = secretsClient
-	result.SecretName = secretName
-
-	podClient := kubeClient.CoreV1().Pods(namespace)
-
-	podSpec := &v1.Pod{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "pod",
-			APIVersion: "v1",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      podName,
-			Namespace: namespace,
-		},
-	}
-
-	podSpec.ObjectMeta.Annotations = make(map[string]string)
-
-	// Record the session ID
-	session, err := k.portalProxy.GetSession(c)
-	if err == nil {
-		podSpec.ObjectMeta.Annotations["stratos-session"] = session.ID
-		log.Infof("Session ID: %s", session.ID)
-	}
-
-	automount := false
-
-	podSpec.Spec.AutomountServiceAccountToken = &automount
-	podSpec.Spec.RestartPolicy = "Never"
-
-	volumeMountsSpec := make([]v1.VolumeMount, 1)
-	volumeMountsSpec[0].Name = "kubeconfig"
-	volumeMountsSpec[0].MountPath = "/root/.stratos"
-	volumeMountsSpec[0].ReadOnly = true
-
-	containerSpec := make([]v1.Container, 1)
-	containerSpec[0].Name = consoleContainerName
-	containerSpec[0].Image = "nwmac/kubeconsole"
-	containerSpec[0].ImagePullPolicy = "Always"
-	containerSpec[0].VolumeMounts = volumeMountsSpec
-	podSpec.Spec.Containers = containerSpec
-
-	volumesSpec := make([]v1.Volume, 1)
-	volumesSpec[0].Name = "kubeconfig"
-	volumesSpec[0].Secret = &v1.SecretVolumeSource{
-		SecretName: secretName,
-	}
-	podSpec.Spec.Volumes = volumesSpec
-
-	// Create a new pod
-	pod, err := podClient.Create(podSpec)
-	if err != nil {
-		return result, err
-	}
-
-	result.PodClient = podClient
-	result.PodName = podName
-
-	sendProgressMessage(ws, "Waiting for Kubernetes Terminal to start up ...")
-
-	statusOptions := metav1.GetOptions{}
-
-	// Wait for the pod to be running
-	ready := false
-	for {
-		status, err := podClient.Get(pod.Name, statusOptions)
-
-		if err != nil {
-			break
-		}
-
-		//log.Info(status.Status.Phase)
-		if status.Status.Phase == "Running" {
-			ready = true
-		}
-
-		if ready {
-			break
-		}
-
-		// Sleep
-		time.Sleep(2500 * time.Millisecond)
-	}
-
-	return result, err
-}
-
-func (k *KubernetesSpecification) cleanupPodAndSecret(podData *PodCreationData) error {
-
-	if len(podData.PodName) > 0 {
-		captureBashHistory(podData)
-		podData.PodClient.Delete(podData.PodName, nil)
-	}
-
-	if len(podData.SecretName) > 0 {
-		podData.SecretClient.Delete(podData.SecretName, nil)
-	}
-
-	return nil
-}
-
-func getHelmRepoSetupScript(portalProxy interfaces.PortalProxy) string {
-
-	str := ""
-
-	// Get all of the helm endpoints
-	endpoints, err := portalProxy.ListEndpoints()
-	if err != nil {
-		log.Error("Can not list Helm Repository endpoints")
-		return str
-	}
-
-	for _, ep := range endpoints {
-		if ep.CNSIType == "helm" {
-			str += fmt.Sprintf("helm repo add %s %s > /dev/null\n", ep.Name, ep.APIEndpoint)
-		}
-	}
-
-	return str
-}
-
-func sendProgressMessage(ws *websocket.Conn, progressMsg string) {
-	// Send a message to say that we are creating the pod
-	msg := fmt.Sprintf("\033]2;%s\007", progressMsg)
-	bytes := fmt.Sprintf("% x\n", []byte(msg))
-	if err := ws.WriteMessage(websocket.TextMessage, []byte(bytes)); err != nil {
-		log.Error("Could not send message to client to indicate console is starting")
-	}
-}
-
-// Not used?
-func captureBashHistory(podData *PodCreationData) error {
-
-	log.Warn("**** Trying to capture bash history from pod ****")
-
-	// Can we capture the history?
-
-	// returning stdout, stderr and error. `options` allowed for
-	// additional parameters to be passed.
-
-	//cmd := []string{"bash", "-c", "\"cat $HISTFILE\""}
-	cmd := []string{"cat", "/root/.bash_history"}
-
-	req := podData.ClientSet.CoreV1().RESTClient().Post().
-		Resource("pods").
-		Name(podData.PodName).
-		Namespace(podData.Namespace).
-		SubResource("exec").
-		Param("container", consoleContainerName)
-
-	req.VersionedParams(&v1.PodExecOptions{
-		Container: consoleContainerName,
-		Command:   cmd,
-		Stdin:     false,
-		Stdout:    true,
-		Stderr:    false,
-		TTY:       true,
-	}, scheme.ParameterCodec)
-
-	var stdout bytes.Buffer
-	//err := execute("POST", req.URL(), nil, nil, &stdout, nil, false)
-
-	exec, err := remotecommand.NewSPDYExecutor(podData.Config, "POST", req.URL())
-	if err != nil {
-		log.Error("Could not exec")
-		log.Error(err)
-		return err
-	}
-
-	log.Warn("Attempting stream ......")
-
-	err = exec.Stream(remotecommand.StreamOptions{
-		//SupportedProtocols: remotecommandserver.SupportedStreamingProtocols,
-		Stdin:  nil,
-		Stdout: &stdout,
-		Stderr: nil,
-		Tty:    true,
-	})
-
-	log.Error("Get Bash History")
-	log.Error(err)
-	log.Error(stdout.String())
-
-	history = stdout.String()
-
-	// if options.PreserveWhitespace {
-	// 	return stdout.String(), stderr.String(), err
-	// }
-	// return strings.TrimSpace(stdout.String()), strings.TrimSpace(stderr.String()), err
-
-	return nil
-}
diff --git a/src/jetstream/plugins/kubernetes/terminal/cleanup.go b/src/jetstream/plugins/kubernetes/terminal/cleanup.go
new file mode 100644
index 0000000000..8426385b4f
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/terminal/cleanup.go
@@ -0,0 +1,84 @@
+package terminal
+
+import (
+	"math/rand"
+	"strconv"
+	"time"
+
+	log "github.com/sirupsen/logrus"
+
+	metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// Wait time in minutes after intiial wait
+const waitPeriod = 10
+
+// StartCleanup starts a backgrdound routine to cleanup orphaned pods
+func (k *KubeTerminal) StartCleanup() {
+	go k.cleanup()
+}
+
+func (k *KubeTerminal) cleanup() {
+	// Use a random initial wait before cleaning up
+	// If we had moer backends, this helps to ensure they are not all trying to cleanup at the same time
+	wait := rand.Intn(30)
+
+	// Testing
+	wait = 0
+	for {
+		time.Sleep(time.Duration(wait) * time.Minute)
+		log.Debug("Cleaning up stale Kubernetes Terminal pods and secrets ...")
+
+		// Get all pods with a given label
+		podClient, secretClient, err := k.getClients()
+		if err == nil {
+			// Only want the pods that are kube terminals
+			options := metaV1.ListOptions{}
+			options.LabelSelector = "stratos-role=kube-terminal"
+			pods, err := podClient.List(options)
+			if err == nil {
+				for _, pod := range pods.Items {
+					if sessionID, ok := pod.Annotations["stratos-session"]; ok {
+						i, err := strconv.Atoi(sessionID)
+						if err == nil {
+							isValid, err := k.PortalProxy.GetSessionDataStore().IsValidSession(i)
+							if err == nil && !isValid {
+								log.Debugf("Deleting pod %s", pod.Name)
+								podClient.Delete(pod.Name, nil)
+							}
+						}
+					}
+				}
+			} else {
+				log.Debug("Kube Terminal Cleanup: Could not get pods")
+				log.Debug(err)
+			}
+
+			// Only want the secrets that are kube terminals
+			secrets, err := secretClient.List(options)
+			if err == nil {
+				for _, secret := range secrets.Items {
+					if sessionID, ok := secret.Annotations["stratos-session"]; ok {
+						i, err := strconv.Atoi(sessionID)
+						if err == nil {
+							isValid, err := k.PortalProxy.GetSessionDataStore().IsValidSession(i)
+							if err == nil && !isValid {
+								log.Debugf("Deleting secret %s", secret.Name)
+								secretClient.Delete(secret.Name, nil)
+							}
+						}
+					}
+				}
+			} else {
+				log.Debug("Kube Terminal Cleanup: Could not get secrets")
+				log.Debug(err)
+			}
+
+		} else {
+			log.Debug("Kube Terminal Cleanup: Could not get clients")
+			log.Debug(err)
+		}
+
+		wait = waitPeriod
+	}
+}
diff --git a/src/jetstream/plugins/kubernetes/terminal/helpers.go b/src/jetstream/plugins/kubernetes/terminal/helpers.go
new file mode 100644
index 0000000000..7e455a926b
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/terminal/helpers.go
@@ -0,0 +1,233 @@
+package terminal
+
+import (
+	"errors"
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/labstack/echo"
+	uuid "github.com/satori/go.uuid"
+	log "github.com/sirupsen/logrus"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/auth"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+
+	"github.com/gorilla/websocket"
+	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes"
+	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
+)
+
+// PodCreationData stores the clients and names used to create pod and secret
+type PodCreationData struct {
+	Namespace    string
+	PodClient    corev1.PodInterface
+	SecretClient corev1.SecretInterface
+	PodName      string
+	SecretName   string
+}
+
+func (k *KubeTerminal) getClients() (corev1.PodInterface, corev1.SecretInterface, error) {
+
+	// Create a token record for Token Auth using the Service Account token
+	token := auth.NewKubeTokenAuthTokenRecord(k.PortalProxy, string(k.Token))
+	config, err := k.Kube.GetConfigForEndpoint(k.APIServer, *token)
+	if err != nil {
+		return nil, nil, errors.New("Can not get Kubernetes config for specified endpoint")
+	}
+	kubeClient, err := kubernetes.NewForConfig(config)
+	if err != nil {
+		log.Error("Could not get kube client")
+		return nil, nil, err
+	}
+
+	podClient := kubeClient.CoreV1().Pods(k.Namespace)
+	secretsClient := kubeClient.CoreV1().Secrets(k.Namespace)
+	return podClient, secretsClient, nil
+}
+
+// Create a pod for a user to run the Kube terminal
+func (k *KubeTerminal) createPod(c echo.Context, kubeConfig string, ws *websocket.Conn) (*PodCreationData, error) {
+	// Unique ID for the secret and pod name
+	id := uuid.NewV4().String()
+	id = strings.ReplaceAll(id, "-", "")
+	// Names for the secret and pod
+	secretName := fmt.Sprintf("terminal-%s", id)
+	podName := secretName
+
+	podClient, secretClient, err := k.getClients()
+
+	result := &PodCreationData{}
+	result.Namespace = k.Namespace
+
+	// Get the session ID
+	sessionID := ""
+	session, err := k.PortalProxy.GetSession(c)
+	if err == nil {
+		sessionID = session.ID
+	}
+
+	// Create the secret
+	secretSpec := &v1.Secret{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "secret",
+			APIVersion: "v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      secretName,
+			Namespace: k.Namespace,
+		},
+		Type: "Opaque",
+	}
+
+	setResourcMetadata(&secretSpec.ObjectMeta, sessionID)
+
+	secretSpec.Data = make(map[string][]byte)
+	secretSpec.Data["kubeconfig"] = []byte(kubeConfig)
+	//secretSpec.Data["history"] = []byte(history)
+
+	// Get Helm repository script if we have Helm repositories
+	helmSetup := getHelmRepoSetupScript(k.PortalProxy)
+	if len(helmSetup) > 0 {
+		secretSpec.Data["helm-setup"] = []byte(helmSetup)
+	}
+
+	_, err = secretClient.Create(secretSpec)
+	if err != nil {
+		log.Warn("Unable to create Secret")
+		return result, err
+	}
+
+	result.SecretClient = secretClient
+	result.SecretName = secretName
+
+	// Pod
+	podSpec := &v1.Pod{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "pod",
+			APIVersion: "v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      podName,
+			Namespace: k.Namespace,
+		},
+	}
+
+	// Label the pod, so we can find it as a kube terminal pod
+	setResourcMetadata(&podSpec.ObjectMeta, sessionID)
+
+	// Don't mount a service account token
+	off := false
+	podSpec.Spec.AutomountServiceAccountToken = &off
+	podSpec.Spec.EnableServiceLinks = &off
+	podSpec.Spec.RestartPolicy = "Never"
+	podSpec.Spec.DNSPolicy = "Default"
+	
+	volumeMountsSpec := make([]v1.VolumeMount, 1)
+	volumeMountsSpec[0].Name = "kubeconfig"
+	volumeMountsSpec[0].MountPath = "/root/.stratos"
+	volumeMountsSpec[0].ReadOnly = true
+
+	containerSpec := make([]v1.Container, 1)
+	containerSpec[0].Name = consoleContainerName
+	containerSpec[0].Image = k.Image
+	containerSpec[0].ImagePullPolicy = "Always"
+	containerSpec[0].VolumeMounts = volumeMountsSpec
+	podSpec.Spec.Containers = containerSpec
+
+	volumesSpec := make([]v1.Volume, 1)
+	volumesSpec[0].Name = "kubeconfig"
+	volumesSpec[0].Secret = &v1.SecretVolumeSource{
+		SecretName: secretName,
+	}
+	podSpec.Spec.Volumes = volumesSpec
+
+	// Create a new pod
+	pod, err := podClient.Create(podSpec)
+	if err != nil {
+		// Secret will get cleaned up by caller
+		return result, err
+	}
+
+	result.PodClient = podClient
+	result.PodName = podName
+
+	sendProgressMessage(ws, "Waiting for Kubernetes Terminal to start up ...")
+
+	// Wait for the pod to be running
+	timeout := 60
+	statusOptions := metav1.GetOptions{}
+	for {
+		status, err := podClient.Get(pod.Name, statusOptions)
+		if err == nil && status.Status.Phase == "Running" {
+			log.Error("Pod is ready !")
+			break;
+		}
+
+		timeout = timeout - 1
+		if timeout == 0 {
+			err = errors.New("Timed out waiting for pod to enter ready state")
+			break
+		}
+
+		// Sleep
+		time.Sleep(1500 * time.Millisecond)
+	}
+
+	return result, err
+}
+
+func setResourcMetadata(metadata *metav1.ObjectMeta, sessionID string) {
+	// Label the kubeerntes resource, so we can find it as a kube terminal pod
+	metadata.Labels = make(map[string]string)
+	metadata.Labels[stratosRoleLabel] = stratosKubeTerminalRole
+	metadata.Annotations = make(map[string]string)
+	if len(sessionID) > 0 {
+		metadata.Annotations[stratosSessionAnnotation] = sessionID
+	}
+}
+
+// Cleanup the pod and secret
+func (k *KubeTerminal) cleanupPodAndSecret(podData *PodCreationData) error {
+	if len(podData.PodName) > 0 {
+		//captureBashHistory(podData)
+		podData.PodClient.Delete(podData.PodName, nil)
+	}
+
+	if len(podData.SecretName) > 0 {
+		podData.SecretClient.Delete(podData.SecretName, nil)
+	}
+
+	return nil
+}
+
+
+func getHelmRepoSetupScript(portalProxy interfaces.PortalProxy) string {
+	str := ""
+
+	// Get all of the helm endpoints
+	endpoints, err := portalProxy.ListEndpoints()
+	if err != nil {
+		log.Error("Can not list Helm Repository endpoints")
+		return str
+	}
+
+	for _, ep := range endpoints {
+		if ep.CNSIType == "helm" {
+			str += fmt.Sprintf("helm repo add %s %s > /dev/null\n", ep.Name, ep.APIEndpoint)
+		}
+	}
+
+	return str
+}
+
+func sendProgressMessage(ws *websocket.Conn, progressMsg string) {
+	// Send a message to say that we are creating the pod
+	msg := fmt.Sprintf("\033]2;%s\007", progressMsg)
+	bytes := fmt.Sprintf("% x\n", []byte(msg))
+	if err := ws.WriteMessage(websocket.TextMessage, []byte(bytes)); err != nil {
+		log.Error("Could not send message to client to indicate terminal is starting")
+	}
+}
diff --git a/src/jetstream/plugins/kubernetes/terminal/start.go b/src/jetstream/plugins/kubernetes/terminal/start.go
new file mode 100644
index 0000000000..b59e4e0a37
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/terminal/start.go
@@ -0,0 +1,254 @@
+package terminal
+
+import (
+	"crypto/tls"
+	"errors"
+	"fmt"
+
+	//"encoding/base64"
+	"encoding/json"
+	"net"
+	"net/http"
+	"strings"
+	"time"
+
+	"github.com/labstack/echo"
+	log "github.com/sirupsen/logrus"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+
+	"github.com/gorilla/websocket"
+)
+
+// TTY Resize, see: https://gitlab.cncf.ci/kubernetes/kubernetes/commit/3b21a9901bcd48bb452d3bf1a0cddc90dae142c4#9691a2f9b9c30711f0397221db0b9ac55ab0e2d1
+
+// Allow connections from any Origin
+var upgrader = websocket.Upgrader{
+	CheckOrigin: func(r *http.Request) bool { return true },
+}
+
+
+// KeyCode - JSON object that is passed from the front-end to notify of a key press or a term resize
+type KeyCode struct {
+	Key  string `json:"key"`
+	Cols int    `json:"cols"`
+	Rows int    `json:"rows"`
+}
+
+type terminalSize struct {
+	Width  uint16
+	Height uint16
+}
+
+const (
+	// Time allowed to write a message to the peer.
+	writeWait = 10 * time.Second
+)
+
+
+// Determine if we Kube Terminal is supported
+// TODO
+// Check namespace
+// Check we have secret for pod creation/deletion
+// Image for the terminal
+
+// Environment variables that we expect to see
+// STRATOS_KUBERNETES_NAMESPACE
+// STRATOS_KUBERNETES_TERMINAL_IMAGE
+
+// For development, you can overide the token to use with the Kubernetes API, with:
+// STRATOS_KUBERNETES_API_TOKEN
+
+// Start periodic routing to clean up pods that are orphaned
+// TODO
+
+// Start handles web-socket request to launch a Kubernetes Terminal
+func (k *KubeTerminal) Start(c echo.Context) error {
+
+	var p = k.PortalProxy
+
+	c.Response().Status = 500
+
+	log.Info("Kube Terminal backend request")
+
+	// TODO: We will need these ??
+
+	endpointGUID := c.Param("guid")
+	userGUID := c.Get("user_id").(string)
+
+	cnsiRecord, err := p.GetCNSIRecord(endpointGUID)
+	if err != nil {
+		return errors.New("Could not get endpoint information")
+	}
+
+	// Get token for this user
+	tokenRecord, ok := p.GetCNSITokenRecord(endpointGUID, userGUID)
+	if !ok {
+		return errors.New("Could not get token")
+	}
+	
+	// This is the kube config for the kubernetes endpoint that we want configured in the Terminal
+	kubeConfig, err := k.Kube.GetKubeConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRecord, "")
+	if err != nil {
+		return errors.New("Can not get Kubernetes config for specified endpoint")
+	}	
+
+	// TODO: Refresh auth token
+
+	// Upgrade the web socket for the incoming request
+	ws, pingTicker, err := interfaces.UpgradeToWebSocket(c)
+	if err != nil {
+		return err
+	}
+	defer ws.Close()
+	defer pingTicker.Stop()
+
+	// We are now in web socket land - we don't want any middleware to change the HTTP response 
+	c.Set("Stratos-WebSocket", "true")
+
+	// Send a message to say that we are creating the pod
+	sendProgressMessage(ws, "Launching Kubernetes Terminal ... one moment please")
+
+	podData, err := k.createPod(c, kubeConfig, ws)
+
+	// Clear progress message
+	sendProgressMessage(ws, "")
+
+	if err != nil {
+		log.Error("ERROR creating secret or pod")
+		log.Info(err)
+		k.cleanupPodAndSecret(podData)
+
+		// Send error message
+		sendProgressMessage(ws, "!" + err.Error())
+		return err
+	}
+
+	// API Endpoint to SSH/exec into a container
+	target := fmt.Sprintf("%s/api/v1/namespaces/%s/pods/%s/exec?command=/bin/bash&stdin=true&stderr=true&stdout=true&tty=true", k.APIServer, k.Namespace, podData.PodName)
+
+
+	// TODO: Check use of kubeHTTPClient
+
+	dial := (&net.Dialer{
+		Timeout:   time.Duration(30) * time.Second,
+		KeepAlive: 30 * time.Second,
+	}).Dial
+
+	// TODO: Not sure about the cert here? I don't think we need this like it is - wonder why I did that?
+
+	sslTransport := &http.Transport{
+		Proxy:               http.ProxyFromEnvironment,
+		Dial:                dial,
+		TLSHandshakeTimeout: 10 * time.Second, // 10 seconds is a sound default value (default is 0)
+		TLSClientConfig: &tls.Config{
+			InsecureSkipVerify: true,
+			//Certificates:       []tls.Certificate{cert},
+		},
+		MaxIdleConnsPerHost: 6, // (default is 2)
+	}
+
+	kubeHTTPClient := http.Client{}
+	kubeHTTPClient.Transport = sslTransport
+	kubeHTTPClient.Timeout = time.Duration(30) * time.Second
+
+
+	// This dialer does not use the kubeHttpClient  - is it unused?
+	dialer := &websocket.Dialer{
+		TLSClientConfig: &tls.Config{
+			InsecureSkipVerify: true,
+			//Certificates:       []tls.Certificate{cert},
+		},
+	}
+
+	if strings.HasPrefix(target, "https://") {
+		target = "wss://" + target[8:]
+	} else {
+		target = "ws://" + target[7:]
+	}
+
+	header := &http.Header{}
+	header.Add("Authorization", fmt.Sprintf("Bearer %s", string(k.Token)))
+	wsConn, res, err := dialer.Dial(target, *header)
+
+	if err == nil {
+		defer wsConn.Close()
+	}
+
+	// Check res
+	log.Warn("== Status ===========================================")
+	log.Info(res.Status)
+	log.Info(res.StatusCode)
+
+	kubeHTTPClient.CloseIdleConnections()
+
+	if err != nil {
+		k.cleanupPodAndSecret(podData)
+		return errors.New("Could not make request")
+	}
+
+	stdoutDone := make(chan bool)
+	go pumpStdout(ws, wsConn, stdoutDone)
+
+	// Read the input from the web socket and pipe it to the SSH client
+	for {
+		_, r, err := ws.ReadMessage()
+		if err != nil {
+			// Check to see if this was because the web socket was closed cleanly
+			closed := false
+			select {
+			case msg := <-stdoutDone:
+					closed = msg
+			}
+			if !closed {
+				log.Errorf("Kubernetes terminal: error reading message from web socket: %+v", err)
+			}
+			k.cleanupPodAndSecret(podData)
+			return err
+		}
+
+		res := KeyCode{}
+		json.Unmarshal(r, &res)
+
+		if res.Cols == 0 {
+			slice := make([]byte, 1)
+			slice[0] = 0
+			slice = append(slice, []byte(res.Key)...)
+			wsConn.WriteMessage(websocket.TextMessage, slice)
+		} else {
+			size := terminalSize{
+				Width:  uint16(res.Cols),
+				Height: uint16(res.Rows),
+			}
+			j, _ := json.Marshal(size)
+			resizeStream := []byte{4}
+			slice := append(resizeStream, j...)
+			wsConn.WriteMessage(websocket.TextMessage, slice)
+		}
+	}
+
+	// Cleanup
+	log.Debug("Kubernetes Terminal is cleaning up")
+
+	// This is unreachable????
+	return k.cleanupPodAndSecret(podData)
+}
+
+func pumpStdout(ws *websocket.Conn, source *websocket.Conn, done chan bool) {
+	for {
+		_, r, err := source.ReadMessage()
+		if err != nil {
+			// Close
+			ws.Close()
+			done <- true
+			break
+		}
+		ws.SetWriteDeadline(time.Now().Add(writeWait))
+		bytes := fmt.Sprintf("% x\n", r[1:])
+		if err := ws.WriteMessage(websocket.TextMessage, []byte(bytes)); err != nil {
+			log.Errorf("Kubernetes Terimnal failed to write nessage: %+v", err)
+			ws.Close()
+			break
+		}
+	}
+}
diff --git a/src/jetstream/plugins/kubernetes/terminal/terminal.go b/src/jetstream/plugins/kubernetes/terminal/terminal.go
index 646fb46b45..1654006ad7 100644
--- a/src/jetstream/plugins/kubernetes/terminal/terminal.go
+++ b/src/jetstream/plugins/kubernetes/terminal/terminal.go
@@ -1,35 +1,74 @@
 package terminal
 
 import (
+	"fmt"
+	"io/ioutil"
+
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/api"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces/config"
 
 	log "github.com/sirupsen/logrus"
 )
 
+const (
+	//serviceAccountTokenFile = "/var/run/secrets/kubernetes.io/serviceaccount/token"
+	serviceAccountTokenFile = "./token"
+	serviceHostEnvVar = "KUBERNETES_SERVICE_HOST"
+	servicePortEnvVar = "KUBERNETES_SERVICE_PORT"
+
+	stratosRoleLabel = "stratos-role"
+	stratosKubeTerminalRole = "kube-terminal"
+	stratosSessionAnnotation = "stratos-session"
+
+	consoleContainerName = "kube-terminal"
+)
+
 // KubeTerminal supports spawning pods to provide a CLI environment to the user
 type KubeTerminal struct {
+	PortalProxy	interfaces.PortalProxy
 	Namespace string `configName:"STRATOS_KUBERNETES_NAMESPACE"`
 	Image     string `configName:"STRATOS_KUBERNETES_TERMINAL_IMAGE"`
-	Token     string `configName:"STRATOS_NAMESPACE"`
+	Token     []byte
+	APIServer string
+	Kube api.Kubernetes
 }
 
 // NewKubeTerminal checks that the environment is set up to support the Kube Terminal
 func NewKubeTerminal(p interfaces.PortalProxy) *KubeTerminal {
 
-	kt := &KubeTerminal{}
+	kt := &KubeTerminal{
+		PortalProxy: p,
+	}
 	if err := config.Load(kt, p.Env().Lookup); err != nil {
-		log.Warn("Unable to load Kube Terminal configuration. %v", err)
+		log.Warnf("Unable to load Kube Terminal configuration. %v", err)
 		return nil
 	}
 
 	// Check that we have everything we need
-	if len(kt.Image) == 0 || len(kt.Namespace) == 0 || len(kt.Token) == 0 {
+	if len(kt.Image) == 0 || len(kt.Namespace) == 0 {
 		log.Warn("Kube Terminal configuration is not complete")
 		return nil
 	}
 
-	log.Info("Kubernetes Terminal configured")
+	// Read the Kubernetes API Endpoint
+	host, hostFound := p.Env().Lookup(serviceHostEnvVar)
+	port, portFound := p.Env().Lookup(servicePortEnvVar)
+	if !hostFound || !portFound {
+		log.Warn("Kubernetes API Server configuration not found (host and/or port env vars not set)")
+		return nil
+	}
+	kt.APIServer = fmt.Sprintf("https://%s:%s", host, port)
+
+	// Read the Service Account Token
+	token, err := ioutil.ReadFile(serviceAccountTokenFile)
+	if err != nil {
+		log.Warnf("Unable to load Service Account token. %v", err)
+		return nil
+	}
+
+	kt.Token = token
 
+	log.Debug("Kubernetes Terminal configured")
 	return kt
 }
diff --git a/src/jetstream/repository/interfaces/sessiondata.go b/src/jetstream/repository/interfaces/sessiondata.go
index 4128f4280f..37884b576a 100644
--- a/src/jetstream/repository/interfaces/sessiondata.go
+++ b/src/jetstream/repository/interfaces/sessiondata.go
@@ -10,9 +10,13 @@ type SessionDataStore interface {
 	SetValues(session, group string, values map[string]string, autoExpire bool) error
 	DeleteValues(session, group string) error
 
+	IsValidSession(id int) (bool, error)
+
 	// Cleanup runs a background goroutine every interval that deletes expired sessions from the database
 	Cleanup(interval time.Duration) (chan<- struct{}, <-chan struct{})
 	
 	// StopCleanup stops the background cleanup from running
 	StopCleanup(quit chan<- struct{}, done <-chan struct{})
+
+
 }
diff --git a/src/jetstream/repository/sessiondata/psql_sessiondata.go b/src/jetstream/repository/sessiondata/psql_sessiondata.go
index d0c3e7c1a0..c60ad32b63 100644
--- a/src/jetstream/repository/sessiondata/psql_sessiondata.go
+++ b/src/jetstream/repository/sessiondata/psql_sessiondata.go
@@ -3,6 +3,8 @@ package sessiondata
 import (
 	"database/sql"
 	"fmt"
+	"strconv"
+	"time"
 
 	log "github.com/sirupsen/logrus"
 
@@ -16,12 +18,15 @@ var insertSessionDataValue = `INSERT INTO session_data (session, groupName, name
 
 var deleteSessionGroupData = `DELETE FROM session_data WHERE session=$1 AND groupName=$2`
 
-// Expire data for sessions that not longer exist
+// Expire data for sessions that no longer exist
 var expireSessionData = `UPDATE session_data SET expired=true WHERE session NOT IN (SELECT id from sessions)`
 
 // Delete data for sessions that no longer exist
 var deleteSessionData = `DELETE FROM session_data WHERE expired=true AND keep_on_expire=false`
 
+// Check if a session valid
+var isValidSession = `SELECT id, expires_on from sessions WHERE id=$1`
+
 // SessionDataRepository is a RDB-backed Session Data repository
 type SessionDataRepository struct {
 	db *sql.DB
@@ -40,6 +45,7 @@ func InitRepositoryProvider(databaseProvider string) {
 	deleteSessionGroupData = datastore.ModifySQLStatement(deleteSessionGroupData, databaseProvider)
 	expireSessionData = datastore.ModifySQLStatement(expireSessionData, databaseProvider)
 	deleteSessionData = datastore.ModifySQLStatement(deleteSessionData, databaseProvider)
+	isValidSession = datastore.ModifySQLStatement(isValidSession, databaseProvider)
 }
 
 // GetValues returns all values from the config table as a map
@@ -100,3 +106,27 @@ func (c *SessionDataRepository) SetValues(session, group string, values map[stri
 
 	return nil
 }
+
+// IsValidSession - Determines if the given session ID is still valid (has not expired)
+func (c *SessionDataRepository) IsValidSession(session int) (bool, error) {
+	var (
+		id     string
+		expiry time.Time
+	)
+
+	err := c.db.QueryRow(isValidSession, strconv.Itoa(session)).Scan(&id, &expiry)
+
+	switch {
+	case err == sql.ErrNoRows:
+		// No record with this ID - session does not exist
+		return false, nil
+	case err != nil:
+		return false, fmt.Errorf("Error trying to find Session record: %v", err)
+	default:
+		// do nothing
+	}
+
+	// Check if the session has expired
+	now := time.Now()
+	return expiry.After(now), nil
+}

From 891a8de996099847e27b384141c66a2b1116aac3 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Wed, 3 Jun 2020 14:39:16 +0100
Subject: [PATCH 516/648] Detect kube version

---
 .../plugins/kubernetes/terminal/helpers.go    | 40 ++++++++++++++++++-
 .../plugins/kubernetes/terminal/start.go      | 40 ++++---------------
 .../plugins/kubernetes/terminal/terminal.go   | 10 +++++
 3 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/terminal/helpers.go b/src/jetstream/plugins/kubernetes/terminal/helpers.go
index 7e455a926b..656f8893de 100644
--- a/src/jetstream/plugins/kubernetes/terminal/helpers.go
+++ b/src/jetstream/plugins/kubernetes/terminal/helpers.go
@@ -1,8 +1,10 @@
 package terminal
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
+	"regexp"
 	"strings"
 	"time"
 
@@ -49,7 +51,7 @@ func (k *KubeTerminal) getClients() (corev1.PodInterface, corev1.SecretInterface
 }
 
 // Create a pod for a user to run the Kube terminal
-func (k *KubeTerminal) createPod(c echo.Context, kubeConfig string, ws *websocket.Conn) (*PodCreationData, error) {
+func (k *KubeTerminal) createPod(c echo.Context, kubeConfig, kubeVersion string, ws *websocket.Conn) (*PodCreationData, error) {
 	// Unique ID for the secret and pod name
 	id := uuid.NewV4().String()
 	id = strings.ReplaceAll(id, "-", "")
@@ -135,6 +137,12 @@ func (k *KubeTerminal) createPod(c echo.Context, kubeConfig string, ws *websocke
 	containerSpec[0].Image = k.Image
 	containerSpec[0].ImagePullPolicy = "Always"
 	containerSpec[0].VolumeMounts = volumeMountsSpec
+
+	// Add env var for kube version
+	containerSpec[0].Env = make([]v1.EnvVar, 1)
+	containerSpec[0].Env[0].Name = "K8S_VERSION"
+	containerSpec[0].Env[0].Value = kubeVersion
+	
 	podSpec.Spec.Containers = containerSpec
 
 	volumesSpec := make([]v1.Volume, 1)
@@ -162,7 +170,6 @@ func (k *KubeTerminal) createPod(c echo.Context, kubeConfig string, ws *websocke
 	for {
 		status, err := podClient.Get(pod.Name, statusOptions)
 		if err == nil && status.Status.Phase == "Running" {
-			log.Error("Pod is ready !")
 			break;
 		}
 
@@ -231,3 +238,32 @@ func sendProgressMessage(ws *websocket.Conn, progressMsg string) {
 		log.Error("Could not send message to client to indicate terminal is starting")
 	}
 }
+
+func (k *KubeTerminal) getKubeVersion(endpointID, userID string) (string, error) {
+
+	response, err := k.PortalProxy.DoProxySingleRequest(endpointID, userID, "GET", "/api/v1/nodes", nil, nil)
+	if err != nil || response.StatusCode != 200 {
+		return "", errors.New("Could not fetch node list")
+	}
+
+	var nodes v1.NodeList
+	err = json.Unmarshal(response.Response, &nodes)
+	if err != nil {
+		return "", errors.New("Could not unmarshal node list")
+	}
+
+	if len(nodes.Items) > 0 {
+		version := nodes.Items[0].Status.NodeInfo.KubeletVersion
+		reg, err := regexp.Compile("[^0-9\\.]+")
+    if err == nil {
+			version = reg.ReplaceAllString(version, "")
+		}
+		parts := strings.Split(version, ".")
+		if len(parts) > 1 {
+			v := fmt.Sprintf("%s.%s", parts[0], parts[1])
+			return v, nil
+		}
+	}
+
+	return "", errors.New("Can not get Kubernetes version")
+}
diff --git a/src/jetstream/plugins/kubernetes/terminal/start.go b/src/jetstream/plugins/kubernetes/terminal/start.go
index b59e4e0a37..42dcde7b60 100644
--- a/src/jetstream/plugins/kubernetes/terminal/start.go
+++ b/src/jetstream/plugins/kubernetes/terminal/start.go
@@ -45,33 +45,14 @@ const (
 	writeWait = 10 * time.Second
 )
 
-
-// Determine if we Kube Terminal is supported
-// TODO
-// Check namespace
-// Check we have secret for pod creation/deletion
-// Image for the terminal
-
-// Environment variables that we expect to see
-// STRATOS_KUBERNETES_NAMESPACE
-// STRATOS_KUBERNETES_TERMINAL_IMAGE
-
-// For development, you can overide the token to use with the Kubernetes API, with:
-// STRATOS_KUBERNETES_API_TOKEN
-
-// Start periodic routing to clean up pods that are orphaned
-// TODO
-
 // Start handles web-socket request to launch a Kubernetes Terminal
 func (k *KubeTerminal) Start(c echo.Context) error {
 
 	var p = k.PortalProxy
 
-	c.Response().Status = 500
+	//c.Response().Status = 500
 
-	log.Info("Kube Terminal backend request")
-
-	// TODO: We will need these ??
+	log.Debug("Kube Terminal backend request")
 
 	endpointGUID := c.Param("guid")
 	userGUID := c.Get("user_id").(string)
@@ -91,9 +72,11 @@ func (k *KubeTerminal) Start(c echo.Context) error {
 	kubeConfig, err := k.Kube.GetKubeConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRecord, "")
 	if err != nil {
 		return errors.New("Can not get Kubernetes config for specified endpoint")
-	}	
+	}
 
-	// TODO: Refresh auth token
+	// Determine the Kubernetes version
+	version, _ := k.getKubeVersion(endpointGUID, userGUID)
+	log.Debugf("Kubernetes Version: %s", version)
 
 	// Upgrade the web socket for the incoming request
 	ws, pingTicker, err := interfaces.UpgradeToWebSocket(c)
@@ -109,14 +92,13 @@ func (k *KubeTerminal) Start(c echo.Context) error {
 	// Send a message to say that we are creating the pod
 	sendProgressMessage(ws, "Launching Kubernetes Terminal ... one moment please")
 
-	podData, err := k.createPod(c, kubeConfig, ws)
+	podData, err := k.createPod(c, kubeConfig, version, ws)
 
 	// Clear progress message
 	sendProgressMessage(ws, "")
 
 	if err != nil {
-		log.Error("ERROR creating secret or pod")
-		log.Info(err)
+		log.Errorf("Kubernetes Terminal: Error creating secret or pod: %+v", err)
 		k.cleanupPodAndSecret(podData)
 
 		// Send error message
@@ -127,7 +109,6 @@ func (k *KubeTerminal) Start(c echo.Context) error {
 	// API Endpoint to SSH/exec into a container
 	target := fmt.Sprintf("%s/api/v1/namespaces/%s/pods/%s/exec?command=/bin/bash&stdin=true&stderr=true&stdout=true&tty=true", k.APIServer, k.Namespace, podData.PodName)
 
-
 	// TODO: Check use of kubeHTTPClient
 
 	dial := (&net.Dialer{
@@ -175,11 +156,6 @@ func (k *KubeTerminal) Start(c echo.Context) error {
 		defer wsConn.Close()
 	}
 
-	// Check res
-	log.Warn("== Status ===========================================")
-	log.Info(res.Status)
-	log.Info(res.StatusCode)
-
 	kubeHTTPClient.CloseIdleConnections()
 
 	if err != nil {
diff --git a/src/jetstream/plugins/kubernetes/terminal/terminal.go b/src/jetstream/plugins/kubernetes/terminal/terminal.go
index 1654006ad7..c7645d0af7 100644
--- a/src/jetstream/plugins/kubernetes/terminal/terminal.go
+++ b/src/jetstream/plugins/kubernetes/terminal/terminal.go
@@ -3,6 +3,7 @@ package terminal
 import (
 	"fmt"
 	"io/ioutil"
+	"regexp"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/api"
@@ -69,6 +70,15 @@ func NewKubeTerminal(p interfaces.PortalProxy) *KubeTerminal {
 
 	kt.Token = token
 
+	version := "v1.15+"
+
+	reg, err := regexp.Compile("[^0-9\\.]+")
+	if err == nil {
+		version = reg.ReplaceAllString(version, "")
+	}
+
+	log.Info(version)	
+
 	log.Debug("Kubernetes Terminal configured")
 	return kt
 }

From b9f6fdcd8d674d747e4b5da6dfa73a8a4094dffc Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Wed, 3 Jun 2020 16:32:56 +0100
Subject: [PATCH 517/648] Tidy up

---
 .../plugins/kubernetes/terminal/start.go      | 30 +------------------
 .../plugins/kubernetes/terminal/terminal.go   | 25 +++++++---------
 2 files changed, 11 insertions(+), 44 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/terminal/start.go b/src/jetstream/plugins/kubernetes/terminal/start.go
index 42dcde7b60..fd7a1b8619 100644
--- a/src/jetstream/plugins/kubernetes/terminal/start.go
+++ b/src/jetstream/plugins/kubernetes/terminal/start.go
@@ -7,7 +7,6 @@ import (
 
 	//"encoding/base64"
 	"encoding/json"
-	"net"
 	"net/http"
 	"strings"
 	"time"
@@ -109,31 +108,6 @@ func (k *KubeTerminal) Start(c echo.Context) error {
 	// API Endpoint to SSH/exec into a container
 	target := fmt.Sprintf("%s/api/v1/namespaces/%s/pods/%s/exec?command=/bin/bash&stdin=true&stderr=true&stdout=true&tty=true", k.APIServer, k.Namespace, podData.PodName)
 
-	// TODO: Check use of kubeHTTPClient
-
-	dial := (&net.Dialer{
-		Timeout:   time.Duration(30) * time.Second,
-		KeepAlive: 30 * time.Second,
-	}).Dial
-
-	// TODO: Not sure about the cert here? I don't think we need this like it is - wonder why I did that?
-
-	sslTransport := &http.Transport{
-		Proxy:               http.ProxyFromEnvironment,
-		Dial:                dial,
-		TLSHandshakeTimeout: 10 * time.Second, // 10 seconds is a sound default value (default is 0)
-		TLSClientConfig: &tls.Config{
-			InsecureSkipVerify: true,
-			//Certificates:       []tls.Certificate{cert},
-		},
-		MaxIdleConnsPerHost: 6, // (default is 2)
-	}
-
-	kubeHTTPClient := http.Client{}
-	kubeHTTPClient.Transport = sslTransport
-	kubeHTTPClient.Timeout = time.Duration(30) * time.Second
-
-
 	// This dialer does not use the kubeHttpClient  - is it unused?
 	dialer := &websocket.Dialer{
 		TLSClientConfig: &tls.Config{
@@ -150,14 +124,12 @@ func (k *KubeTerminal) Start(c echo.Context) error {
 
 	header := &http.Header{}
 	header.Add("Authorization", fmt.Sprintf("Bearer %s", string(k.Token)))
-	wsConn, res, err := dialer.Dial(target, *header)
+	wsConn, _, err := dialer.Dial(target, *header)
 
 	if err == nil {
 		defer wsConn.Close()
 	}
 
-	kubeHTTPClient.CloseIdleConnections()
-
 	if err != nil {
 		k.cleanupPodAndSecret(podData)
 		return errors.New("Could not make request")
diff --git a/src/jetstream/plugins/kubernetes/terminal/terminal.go b/src/jetstream/plugins/kubernetes/terminal/terminal.go
index c7645d0af7..a77f792908 100644
--- a/src/jetstream/plugins/kubernetes/terminal/terminal.go
+++ b/src/jetstream/plugins/kubernetes/terminal/terminal.go
@@ -3,7 +3,6 @@ package terminal
 import (
 	"fmt"
 	"io/ioutil"
-	"regexp"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/api"
@@ -13,10 +12,11 @@ import (
 )
 
 const (
-	//serviceAccountTokenFile = "/var/run/secrets/kubernetes.io/serviceaccount/token"
-	serviceAccountTokenFile = "./token"
+	serviceAccountTokenFile = "/var/run/secrets/kubernetes.io/serviceaccount/token"
 	serviceHostEnvVar = "KUBERNETES_SERVICE_HOST"
 	servicePortEnvVar = "KUBERNETES_SERVICE_PORT"
+	// For dev - read token from env var
+	serviceTokenEnvVar = "KUBE_TERMINAL_SERVICE_ACCOUNT_TOKEN"
 
 	stratosRoleLabel = "stratos-role"
 	stratosKubeTerminalRole = "kube-terminal"
@@ -37,7 +37,6 @@ type KubeTerminal struct {
 
 // NewKubeTerminal checks that the environment is set up to support the Kube Terminal
 func NewKubeTerminal(p interfaces.PortalProxy) *KubeTerminal {
-
 	kt := &KubeTerminal{
 		PortalProxy: p,
 	}
@@ -64,21 +63,17 @@ func NewKubeTerminal(p interfaces.PortalProxy) *KubeTerminal {
 	// Read the Service Account Token
 	token, err := ioutil.ReadFile(serviceAccountTokenFile)
 	if err != nil {
-		log.Warnf("Unable to load Service Account token. %v", err)
-		return nil
+		// Check env var
+		tkn, found := p.Env().Lookup(serviceTokenEnvVar)
+		if !found {
+			log.Warnf("Unable to load Service Account token. %v", err)
+			return nil
+		}
+		token = []byte(tkn)
 	}
 
 	kt.Token = token
 
-	version := "v1.15+"
-
-	reg, err := regexp.Compile("[^0-9\\.]+")
-	if err == nil {
-		version = reg.ReplaceAllString(version, "")
-	}
-
-	log.Info(version)	
-
 	log.Debug("Kubernetes Terminal configured")
 	return kt
 }

From dc394aa15b01cc4f98def463e92df2a451e24bc6 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Wed, 3 Jun 2020 20:23:04 +0100
Subject: [PATCH 518/648] Bug fixes and further tidy up

---
 custom-src/deploy/kubernetes/__stratos.tpl    |  4 ++
 .../kube-console/kube-console.component.ts    | 45 ++++---------
 .../kube-terminal/kubeconsole.bashrc          | 63 +++++++++++--------
 .../plugins/kubernetes/terminal/cleanup.go    |  9 +--
 .../plugins/kubernetes/terminal/helpers.go    |  9 +--
 .../plugins/kubernetes/terminal/start.go      | 25 ++++----
 6 files changed, 72 insertions(+), 83 deletions(-)

diff --git a/custom-src/deploy/kubernetes/__stratos.tpl b/custom-src/deploy/kubernetes/__stratos.tpl
index 3ebbce1efe..4999b0e2cb 100644
--- a/custom-src/deploy/kubernetes/__stratos.tpl
+++ b/custom-src/deploy/kubernetes/__stratos.tpl
@@ -12,4 +12,8 @@
   value: "mongodb://{{ .Release.Name }}-fdbdoclayer:27016"
 - name: SYNC_SERVER_URL
   value: "http://{{ .Release.Name }}-chartsync:8080"
+- name: STRATOS_KUBERNETES_NAMESPACE
+  value: "{{ .Release.Namespace }}"  
+- name: STRATOS_KUBERNETES_TERMINAL_IMAGE
+  value: "{{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/stratos-kube-terminal:{{.Values.consoleVersion}}"
 {{- end }}
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts b/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts
index 8335425367..42a25a5a9a 100644
--- a/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts
@@ -2,9 +2,8 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { NEVER, Observable, Subject, Subscription } from 'rxjs';
 import websocketConnect, { normalClosureMessage } from 'rxjs-websockets';
-import { catchError, tap, switchMap } from 'rxjs/operators';
+import { catchError, tap, switchMap, map } from 'rxjs/operators';
 
-import { IApp } from '../../../core/cf-api.types';
 import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types';
 import { SshViewerComponent } from '../../../shared/components/ssh-viewer/ssh-viewer.component';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
@@ -42,32 +41,14 @@ export class KubeConsoleComponent implements OnInit {
 
   public errorMessage: string;
 
-  public sshRoute: string;
-
   public connected: boolean;
 
   public kubeSummaryLink: string;
 
-  private connection: Subscription;
-
-  public instanceId: string;
-
   public breadcrumbs$: Observable<IHeaderBreadcrumb[]>;
 
   @ViewChild('sshViewer', { static: false }) sshViewer: SshViewerComponent;
 
-  private getBreadcrumbs(
-    application: IApp,
-  ) {
-    return [
-      {
-        breadcrumbs: [
-          { value: application.name, routerLink: `/kubernetes/${application.cfGuid}/${application.guid}/instances` }
-        ]
-      },
-    ];
-  }
-
   constructor(
     public kubeEndpointService: KubernetesEndpointService,
   ) { }
@@ -75,9 +56,7 @@ export class KubeConsoleComponent implements OnInit {
   ngOnInit() {
     this.connectionStatus.next(0);
     const guid = this.kubeEndpointService.baseKube.guid;
-    this.kubeSummaryLink = (
-      `/kubernetes/${guid}/summary`
-    );
+    this.kubeSummaryLink = `/kubernetes/${guid}/summary`;
 
     if (!guid) {
       this.messages = NEVER;
@@ -90,25 +69,27 @@ export class KubeConsoleComponent implements OnInit {
         `${protocol}://${host}/pp/v1/kubeconsole/${guid}`
       );
       this.sshInput = new Subject<string>();
-      const connection = websocketConnect(
-        streamUrl
-      );
+      const connection = websocketConnect(streamUrl);
 
       this.messages = connection.pipe(
         tap(() => this.connectionStatus.next(1)),
         switchMap(getResponse => getResponse(this.sshInput)),
         catchError((e: Error) => {
-          console.log(e.message);
-          if (e.message !== normalClosureMessage) {
+          if (e.message !== normalClosureMessage && !this.sshViewer.isConnected) {
             this.errorMessage = 'Error launching Kubernetes Terminal';
           }
           return [];
         }));
 
-      // this.breadcrumbs$ = this.applicationService.waitForAppEntity$.pipe(
-      //   map(app => this.getBreadcrumbs(app.entity.entity)),
-      //   first()
-      // );
+      // Breadcrumbs
+      this.breadcrumbs$ = this.kubeEndpointService.endpoint$.pipe(
+        map(endpoint => ([{
+          breadcrumbs: [
+            { value: endpoint.entity.name, routerLink: `/kubernetes/${endpoint.entity.guid}` },
+          ]
+        }])
+        )
+      );
     }
   }
 }
diff --git a/deploy/containers/kube-terminal/kubeconsole.bashrc b/deploy/containers/kube-terminal/kubeconsole.bashrc
index 10da69e597..362fc54adc 100644
--- a/deploy/containers/kube-terminal/kubeconsole.bashrc
+++ b/deploy/containers/kube-terminal/kubeconsole.bashrc
@@ -11,27 +11,31 @@ echo ""
 echo -e "${CYAN}Kubernetes Terminal${RESET}"
 echo ""
 
-# Unpack helm comand
-gunzip /stratos/helm.gz
-
-# Need to choose appropriate kubectl version
-pushd /stratos > /dev/null
-# Default to the newwest version that we have
-USE=$(ls kubectl_* | sort -r | head -n1)
-popd > /dev/null
-
-# If env var KUBERNETES_VERSION is set, then use it (major.minor only)
-if [ -n "${KUBERNETES_VERSION}" ]; then
-  VERSION="kubectl_${KUBERNETES_VERSION}.gz"
-  if [ -f "/stratos/${VERSION}" ]; then
-    USE=${VERSION}
+# Only do these on first run
+if [ ! -f "/root/.stratos/firstrun" ]; then
+  # Unpack helm comand
+  gunzip /stratos/helm.gz
+
+  # Need to choose appropriate kubectl version
+  pushd /stratos > /dev/null
+  # Default to the newwest version that we have
+  USE=$(ls kubectl_* | sort -r | head -n1)
+  popd > /dev/null
+
+  # If env var K8S_VERSION is set, then use it (major.minor only)
+  if [ -n "${K8S_VERSION}" ]; then
+    VERSION="kubectl_${K8S_VERSION}.gz"
+    if [ -f "/stratos/${VERSION}" ]; then
+      USE=${VERSION}
+    fi
   fi
+
+  gunzip /stratos/${USE}
+  VER=${USE::-3}
+  mv /stratos/${VER} /stratos/kubectl
+  chmod +x /stratos/kubectl
 fi
 
-gunzip /stratos/${USE}
-VER=${USE::-3}
-mv /stratos/${VER} /stratos/kubectl
-chmod +x /stratos/kubectl
 export PATH=/stratos:$PATH
 
 export KUBECONFIG=/root/.stratos/kubeconfig
@@ -43,15 +47,17 @@ source <(helm completion bash)
 
 #helm repo remove stable > /dev/null
 
-if [ -f "/root/.stratos/helm-setup" ]; then
-  echo "Setting up Helm repositories ..."
-  source  "/root/.stratos/helm-setup" > /dev/null
-  helm repo update 2>&1 > /dev/null
-  echo ""
-fi
+if [ ! -f "/root/.stratos/firstrun" ]; then
+  if [ -f "/root/.stratos/helm-setup" ]; then
+    echo "Setting up Helm repositories ..."
+    source  "/root/.stratos/helm-setup" > /dev/null
+    helm repo update 2>&1 > /dev/null
+    echo ""
+  fi
 
-if [ -f "/root/.stratos/history" ]; then
-  cat /root/.stratos/history > /root/.bash_history
+  if [ -f "/root/.stratos/history" ]; then
+    cat /root/.stratos/history > /root/.bash_history
+  fi
 fi
 
 # Make Bash append rather than overwrite the history on disk:
@@ -61,5 +67,10 @@ PROMPT_COMMAND='history -a'
 # Don't put duplicate lines in the history.
 export HISTCONTROL=ignoredups
 
+touch /root/.stratos/firstrun
+
+# Remove any env vars matching KUBERNETES
+unset `compgen -A variable | grep KUBERNETES`
+
 echo "Ready"
 echo ""
diff --git a/src/jetstream/plugins/kubernetes/terminal/cleanup.go b/src/jetstream/plugins/kubernetes/terminal/cleanup.go
index 8426385b4f..d1d50aa559 100644
--- a/src/jetstream/plugins/kubernetes/terminal/cleanup.go
+++ b/src/jetstream/plugins/kubernetes/terminal/cleanup.go
@@ -10,21 +10,18 @@ import (
 	metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// Wait time in minutes after intiial wait
+// Wait time in minutes after random intiial wait
 const waitPeriod = 10
 
-// StartCleanup starts a backgrdound routine to cleanup orphaned pods
+// StartCleanup starts a background routine to cleanup orphaned pods
 func (k *KubeTerminal) StartCleanup() {
 	go k.cleanup()
 }
 
 func (k *KubeTerminal) cleanup() {
 	// Use a random initial wait before cleaning up
-	// If we had moer backends, this helps to ensure they are not all trying to cleanup at the same time
+	// If we had more than one backend, this helps to ensure they are not all trying to cleanup at the same time
 	wait := rand.Intn(30)
-
-	// Testing
-	wait = 0
 	for {
 		time.Sleep(time.Duration(wait) * time.Minute)
 		log.Debug("Cleaning up stale Kubernetes Terminal pods and secrets ...")
diff --git a/src/jetstream/plugins/kubernetes/terminal/helpers.go b/src/jetstream/plugins/kubernetes/terminal/helpers.go
index 656f8893de..8cc58caf43 100644
--- a/src/jetstream/plugins/kubernetes/terminal/helpers.go
+++ b/src/jetstream/plugins/kubernetes/terminal/helpers.go
@@ -58,9 +58,7 @@ func (k *KubeTerminal) createPod(c echo.Context, kubeConfig, kubeVersion string,
 	// Names for the secret and pod
 	secretName := fmt.Sprintf("terminal-%s", id)
 	podName := secretName
-
 	podClient, secretClient, err := k.getClients()
-
 	result := &PodCreationData{}
 	result.Namespace = k.Namespace
 
@@ -88,7 +86,6 @@ func (k *KubeTerminal) createPod(c echo.Context, kubeConfig, kubeVersion string,
 
 	secretSpec.Data = make(map[string][]byte)
 	secretSpec.Data["kubeconfig"] = []byte(kubeConfig)
-	//secretSpec.Data["history"] = []byte(history)
 
 	// Get Helm repository script if we have Helm repositories
 	helmSetup := getHelmRepoSetupScript(k.PortalProxy)
@@ -98,7 +95,7 @@ func (k *KubeTerminal) createPod(c echo.Context, kubeConfig, kubeVersion string,
 
 	_, err = secretClient.Create(secretSpec)
 	if err != nil {
-		log.Warn("Unable to create Secret")
+		log.Warnf("Kubernetes Terminal: Unable to create Secret: %+v", err)
 		return result, err
 	}
 
@@ -155,6 +152,7 @@ func (k *KubeTerminal) createPod(c echo.Context, kubeConfig, kubeVersion string,
 	// Create a new pod
 	pod, err := podClient.Create(podSpec)
 	if err != nil {
+		log.Warnf("Kubernetes Terminal: Unable to create Pod: %+v", err)
 		// Secret will get cleaned up by caller
 		return result, err
 	}
@@ -210,7 +208,6 @@ func (k *KubeTerminal) cleanupPodAndSecret(podData *PodCreationData) error {
 	return nil
 }
 
-
 func getHelmRepoSetupScript(portalProxy interfaces.PortalProxy) string {
 	str := ""
 
@@ -240,7 +237,6 @@ func sendProgressMessage(ws *websocket.Conn, progressMsg string) {
 }
 
 func (k *KubeTerminal) getKubeVersion(endpointID, userID string) (string, error) {
-
 	response, err := k.PortalProxy.DoProxySingleRequest(endpointID, userID, "GET", "/api/v1/nodes", nil, nil)
 	if err != nil || response.StatusCode != 200 {
 		return "", errors.New("Could not fetch node list")
@@ -253,6 +249,7 @@ func (k *KubeTerminal) getKubeVersion(endpointID, userID string) (string, error)
 	}
 
 	if len(nodes.Items) > 0 {
+		// Get the version number - remove any 'v' perfix or '+' suffix
 		version := nodes.Items[0].Status.NodeInfo.KubeletVersion
 		reg, err := regexp.Compile("[^0-9\\.]+")
     if err == nil {
diff --git a/src/jetstream/plugins/kubernetes/terminal/start.go b/src/jetstream/plugins/kubernetes/terminal/start.go
index fd7a1b8619..c05b3b579a 100644
--- a/src/jetstream/plugins/kubernetes/terminal/start.go
+++ b/src/jetstream/plugins/kubernetes/terminal/start.go
@@ -46,23 +46,18 @@ const (
 
 // Start handles web-socket request to launch a Kubernetes Terminal
 func (k *KubeTerminal) Start(c echo.Context) error {
-
-	var p = k.PortalProxy
-
-	//c.Response().Status = 500
-
-	log.Debug("Kube Terminal backend request")
+	log.Debug("Kube Terminal start request")
 
 	endpointGUID := c.Param("guid")
 	userGUID := c.Get("user_id").(string)
 
-	cnsiRecord, err := p.GetCNSIRecord(endpointGUID)
+	cnsiRecord, err := k.PortalProxy.GetCNSIRecord(endpointGUID)
 	if err != nil {
 		return errors.New("Could not get endpoint information")
 	}
 
 	// Get token for this user
-	tokenRecord, ok := p.GetCNSITokenRecord(endpointGUID, userGUID)
+	tokenRecord, ok := k.PortalProxy.GetCNSITokenRecord(endpointGUID, userGUID)
 	if !ok {
 		return errors.New("Could not get token")
 	}
@@ -138,6 +133,12 @@ func (k *KubeTerminal) Start(c echo.Context) error {
 	stdoutDone := make(chan bool)
 	go pumpStdout(ws, wsConn, stdoutDone)
 
+	// If the downstream connection is closed, close the other web socket as well
+	ws.SetCloseHandler(func (code int, text string) error {
+		wsConn.Close()
+		return nil
+	})
+
 	// Read the input from the web socket and pipe it to the SSH client
 	for {
 		_, r, err := ws.ReadMessage()
@@ -151,6 +152,7 @@ func (k *KubeTerminal) Start(c echo.Context) error {
 			if !closed {
 				log.Errorf("Kubernetes terminal: error reading message from web socket: %+v", err)
 			}
+			log.Warn("Kube Terminal cleaning up ....")
 			k.cleanupPodAndSecret(podData)
 			return err
 		}
@@ -176,9 +178,8 @@ func (k *KubeTerminal) Start(c echo.Context) error {
 	}
 
 	// Cleanup
-	log.Debug("Kubernetes Terminal is cleaning up")
+	log.Error("Kubernetes Terminal is cleaning up")
 
-	// This is unreachable????
 	return k.cleanupPodAndSecret(podData)
 }
 
@@ -187,15 +188,13 @@ func pumpStdout(ws *websocket.Conn, source *websocket.Conn, done chan bool) {
 		_, r, err := source.ReadMessage()
 		if err != nil {
 			// Close
-			ws.Close()
 			done <- true
 			break
 		}
 		ws.SetWriteDeadline(time.Now().Add(writeWait))
 		bytes := fmt.Sprintf("% x\n", r[1:])
 		if err := ws.WriteMessage(websocket.TextMessage, []byte(bytes)); err != nil {
-			log.Errorf("Kubernetes Terimnal failed to write nessage: %+v", err)
-			ws.Close()
+			log.Errorf("Kubernetes Terminal failed to write message: %+v", err)
 			break
 		}
 	}

From 5899bfdf184ec2e27caa0778d267fd5cdcd770ac Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Wed, 3 Jun 2020 20:31:08 +0100
Subject: [PATCH 519/648] Fix backend logging issue

---
 src/jetstream/plugins/kubernetes/terminal/start.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/terminal/start.go b/src/jetstream/plugins/kubernetes/terminal/start.go
index c05b3b579a..5c88b1d32f 100644
--- a/src/jetstream/plugins/kubernetes/terminal/start.go
+++ b/src/jetstream/plugins/kubernetes/terminal/start.go
@@ -127,7 +127,9 @@ func (k *KubeTerminal) Start(c echo.Context) error {
 
 	if err != nil {
 		k.cleanupPodAndSecret(podData)
-		return errors.New("Could not make request")
+		log.Warn("Kube Terminal: Could not connect to pod")
+		// No point returning an error - we've already upgraded to web sockets, so we can't use the HTTP response now
+		return nil
 	}
 
 	stdoutDone := make(chan bool)
@@ -154,7 +156,9 @@ func (k *KubeTerminal) Start(c echo.Context) error {
 			}
 			log.Warn("Kube Terminal cleaning up ....")
 			k.cleanupPodAndSecret(podData)
-			return err
+
+			// No point returning an error - we've already upgraded to web sockets, so we can't use the HTTP response now
+			return nil
 		}
 
 		res := KeyCode{}

From fc2212583206a62a12e67d32e8bbae2d93beca83 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Wed, 3 Jun 2020 20:32:03 +0100
Subject: [PATCH 520/648] Change log level to debug

---
 src/jetstream/plugins/kubernetes/terminal/start.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jetstream/plugins/kubernetes/terminal/start.go b/src/jetstream/plugins/kubernetes/terminal/start.go
index 5c88b1d32f..3a228b025b 100644
--- a/src/jetstream/plugins/kubernetes/terminal/start.go
+++ b/src/jetstream/plugins/kubernetes/terminal/start.go
@@ -154,7 +154,7 @@ func (k *KubeTerminal) Start(c echo.Context) error {
 			if !closed {
 				log.Errorf("Kubernetes terminal: error reading message from web socket: %+v", err)
 			}
-			log.Warn("Kube Terminal cleaning up ....")
+			log.Debug("Kube Terminal cleaning up ....")
 			k.cleanupPodAndSecret(podData)
 
 			// No point returning an error - we've already upgraded to web sockets, so we can't use the HTTP response now

From 1deac6d67ed8085c24578b8b28c64d98121e33ca Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Thu, 4 Jun 2020 09:35:01 +0100
Subject: [PATCH 521/648] Change some naming to kube terminal

---
 .../kube-console.component.html                       |  0
 .../kube-console.component.scss                       |  0
 .../kube-console.component.spec.ts                    |  4 ++--
 .../kube-console.component.ts                         |  2 +-
 .../app/custom/kubernetes/kubernetes.module.ts        |  2 +-
 .../app/custom/kubernetes/kubernetes.routing.ts       |  4 ++--
 .../services/kubernetes-endpoint.service.ts           |  6 ++++++
 .../kubernetes-summary.component.html                 |  2 +-
 .../kubernetes-summary.component.ts                   |  4 ++--
 src/jetstream/plugins/kubernetes/main.go              | 11 ++++++++---
 10 files changed, 23 insertions(+), 12 deletions(-)
 rename custom-src/frontend/app/custom/kubernetes/{kube-console => kube-terminal}/kube-console.component.html (100%)
 rename custom-src/frontend/app/custom/kubernetes/{kube-console => kube-terminal}/kube-console.component.scss (100%)
 rename custom-src/frontend/app/custom/kubernetes/{kube-console => kube-terminal}/kube-console.component.spec.ts (89%)
 rename custom-src/frontend/app/custom/kubernetes/{kube-console => kube-terminal}/kube-console.component.ts (98%)

diff --git a/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.html b/custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.html
rename to custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.scss b/custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.scss
rename to custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.spec.ts
similarity index 89%
rename from custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.spec.ts
rename to custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.spec.ts
index 030ec22e95..85fda06bf6 100644
--- a/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.spec.ts
@@ -1,5 +1,5 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
+import { async, ComponentFixture, TestBed } from './@angular/core/testing';
+import { RouterTestingModule } from './@angular/router/testing';
 
 import { TabNavService } from '../../../../tab-nav.service';
 import { ApplicationServiceMock } from '../../../../test-framework/application-service-helper';
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts b/custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.ts
similarity index 98%
rename from custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts
rename to custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.ts
index 42a25a5a9a..643fd02271 100644
--- a/custom-src/frontend/app/custom/kubernetes/kube-console/kube-console.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.ts
@@ -66,7 +66,7 @@ export class KubeConsoleComponent implements OnInit {
       const host = window.location.host;
       const protocol = window.location.protocol === 'https:' ? 'wss' : 'ws';
       const streamUrl = (
-        `${protocol}://${host}/pp/v1/kubeconsole/${guid}`
+        `${protocol}://${host}/pp/v1/kubeterminal/${guid}`
       );
       this.sshInput = new Subject<string>();
       const connection = websocketConnect(streamUrl);
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
index 840793c34c..2d33eeeda6 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
@@ -92,7 +92,7 @@ import { KubernetesNamespacesTabComponent } from './tabs/kubernetes-namespaces-t
 import { KubernetesNodesTabComponent } from './tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component';
 import { KubernetesPodsTabComponent } from './tabs/kubernetes-pods-tab/kubernetes-pods-tab.component';
 import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kubernetes-summary.component';
-import { KubeConsoleComponent } from './kube-console/kube-console.component';
+import { KubeConsoleComponent } from './kube-terminal/kube-console.component';
 
 
 /* tslint:enable */
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts
index b30e712772..c7681161ce 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts
@@ -1,4 +1,3 @@
-import { KubeConsoleComponent } from './kube-console/kube-console.component';
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
@@ -24,6 +23,7 @@ import { KubernetesNodesTabComponent } from './tabs/kubernetes-nodes-tab/kuberne
 import { KubernetesPodsTabComponent } from './tabs/kubernetes-pods-tab/kubernetes-pods-tab.component';
 import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kubernetes-summary.component';
 import { KubedashConfigurationComponent } from './kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component';
+import { KubeConsoleComponent } from './kube-terminal/kube-console.component';
 
 const kubernetes: Routes = [{
   path: '',
@@ -132,7 +132,7 @@ const kubernetes: Routes = [{
   component: KubedashConfigurationComponent,
 },
 {
-  path: ':endpointId/console',
+  path: ':endpointId/terminal',
   component: KubeConsoleComponent,
   data: {
     uiNoMargin: true
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
index 612e762654..101e4c099d 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
@@ -56,6 +56,7 @@ export class KubernetesEndpointService {
   kubeDashboardStatus$: Observable<KubeDashboardStatus>;
   kubeDashboardLabel$: Observable<string>;
   kubeDashboardConfigured$: Observable<boolean>;
+  kubeTerminalEnabled$: Observable<boolean>;
 
   constructor(
     public baseKube: BaseKubeGuid,
@@ -190,6 +191,11 @@ export class KubernetesEndpointService {
       map(auth => auth.sessionData['plugin-config'].kubeDashboardEnabled === 'true')
     );
 
+    this.kubeTerminalEnabled$ = this.store.select('auth').pipe(
+      filter(auth => !!auth.sessionData['plugin-config']),
+      map(auth => auth.sessionData['plugin-config'].kubeTerminalEnabled === 'true')
+    );
+
     const kubeDashboardStatus$ = this.entityServiceFactory.create<KubeDashboardStatus>(
       this.kubeGuid,
       new GetKubernetesDashboard(this.kubeGuid),
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
index e744bedefc..4f3165dbe8 100644
--- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
+++ b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
@@ -4,7 +4,7 @@
       <mat-icon>dashboard</mat-icon>
       <span class="kube-details__button">View Dashboard</span>
     </button>
-    <button [routerLink]="kubeConsoleLink" mat-button>
+    <button *ngIf="kubeEndpointService.kubeTerminalEnabled$ | async" [routerLink]="kubeTerminalLink" mat-button>
       <mat-icon>desktop_windows</mat-icon>
       <span class="kube-details__button">Open Terminal</span>
     </button>
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 51fcc2657e..26ee5df7e6 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
@@ -64,7 +64,7 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
   source: SafeResourceUrl;
 
   dashboardLink: string;
-  kubeConsoleLink: string;
+  kubeTerminalLink: string;
 
   public podCapacity$: Observable<ISimpleUsageChartData>;
   public diskPressure$: Observable<ISimpleUsageChartData>;
@@ -158,7 +158,7 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
       warningText: `Nodes with unknown ready status found`
     });
     this.dashboardLink = `/kubernetes/${guid}/dashboard`;
-    this.kubeConsoleLink = `/kubernetes/${guid}/console`;
+    this.kubeTerminalLink = `/kubernetes/${guid}/terminal`;
 
     this.kubeNodeVersions$ = this.kubeEndpointService.getNodeKubeVersions(nodes$).pipe(startWith('-'));
 
diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index bca169a26c..8cccc03ce4 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -52,8 +52,10 @@ const (
 	kubeEndpointType    = "k8s"
 	defaultKubeClientID = "K8S_CLIENT"
 
-	// kubeDashboardPluginConfigSetting is config value send back to the client to indicate if the kube dashboard can be navigated to
+	// kubeDashboardPluginConfigSetting is config value sent back to the client to indicate if the kube dashboard ie enabled
 	kubeDashboardPluginConfigSetting = "kubeDashboardEnabled"
+	// kubeTerminalPluginConfigSetting is config value sent back to the client to indicate if the kube terminal is enabled
+	kubeTerminalPluginConfigSetting ="kubeTerminalEnabled"
 )
 
 // Init creates a new instance of the Kubernetes plugin
@@ -138,6 +140,10 @@ func (c *KubernetesSpecification) Init() error {
 	// Kube dashboard is enabled by Tech Preview mode
 	c.portalProxy.GetConfig().PluginConfig[kubeDashboardPluginConfigSetting] = strconv.FormatBool(c.portalProxy.GetConfig().EnableTechPreview)
 
+	// Kube terminal is enabled by Tech Preview mode
+	c.portalProxy.GetConfig().PluginConfig[kubeTerminalPluginConfigSetting] = strconv.FormatBool(c.portalProxy.GetConfig().EnableTechPreview)
+
+
 	// Kick off the cleanup of any old kube terminal pods
 	c.kubeTerminal.StartCleanup()
 
@@ -170,8 +176,7 @@ func (c *KubernetesSpecification) AddSessionGroupRoutes(echoGroup *echo.Group) {
 	echoGroup.GET("/helm/releases/:endpoint/:namespace/:name", c.GetRelease)
 
 	// Kube Terminal
-	echoGroup.GET("/kubeconsole/:guid", c.kubeTerminal.Start)
-
+	echoGroup.GET("/kubeterminal/:guid", c.kubeTerminal.Start)
 }
 
 func (c *KubernetesSpecification) Info(apiEndpoint string, skipSSLValidation bool) (interfaces.CNSIRecord, interface{}, error) {

From 566e233b1b3d888d5bf072df0ee35690b5f80293 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Thu, 4 Jun 2020 11:55:55 +0100
Subject: [PATCH 522/648] Merge 3.2.1 (#383)

* Add initial UI for backup/restore

* Convert connection details checkbox to drop down

* Add docs for max list feature

* Add db version check

* Tidy up #1

* Tidying & bug fixes. Handle client_secret

* Add minimum password length

* First pass encrypt/decrypt

* Tidy up

* Fix unit tests

* Re-add tests that now work

* Changes following review

* Move backup into it's own module

* 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

* CF Push: Ensure we refresh token

* Fix uaa docs. Make UAA endpoint config simpler

* Fix compile issues

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

* 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

* Autoscaler improvements

* Fix disabling of polling (#4260)

- fixes #4244

* 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

* Increase users table page size before searching for `e2e` user

* 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>

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

* Override name but do not set a random route

* 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

* 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>

* 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>

* 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>

* 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

* Version bump and change log for 3.2.0

* E2E Test improvements (#4275)

* Speed up form fill

* Fix page set setting

* Remove whitespace

* Add ability to provided a wildcard in path when matching urls (#4277)

* Update releas notes

* Only show metrics details on endpoint card/list when connected

* Fix icon alignment on service marketplace view

* 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

* CF Push: A better fix for the token expiry issue

* Update changelog for 3.2.0 (#4291)

* Fix misaligned user button
- fixes #4316

* Temporarily add branch v3.2.1 to travis

* check sso whitelist in more places

Signed-off-by: Ben Berry <ben.berry@gsa.gov>

* refactor sso state checks into single function

Signed-off-by: Ben Berry <ben.berry@gsa.gov>

* Update version

* First pass at changelog (additional SSO fix required)

* Update changelog

* Fixes after merge

* Remove v3.2.1 branch from travis

* Changes following review

* Ensure browser.baseUrl doesn't end with /

Co-authored-by: Neil MacDougall <neil_macdougall@hotmail.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: macevil <30493519+macevil@users.noreply.github.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Johannes Jungkunst <macevil@gmail.com>
Co-authored-by: Ben Berry <ben.berry@gsa.gov>
---
 CHANGELOG.md                                  |   14 +-
 package-lock.json                             | 6383 ++++++++++-------
 package.json                                  |    2 +-
 protractor.conf.js                            |    5 +
 .../page-header/page-header.component.scss    |    1 +
 src/jetstream/authuaa.go                      |   32 +-
 6 files changed, 3991 insertions(+), 2446 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 741e0a85ad..576954b97b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,20 @@
 # Change Log
 
+## 3.2.1
+
+[Full Changelog](https://github.com/SUSE/stratos/compare/3.2.0...3.2.1)
+
+**Improvements:**
+
+- Apply SSO whitelist to additional places [\#4318](https://github.com/cloudfoundry/stratos/issues/4318)
+
+**Fixes:**
+
+- User Button Misaligned [\#4316](https://github.com/cloudfoundry/stratos/issues/4316)
+
 ## 3.2.0
 
-[Full Changelog](https://github.com/cloudfoundry/stratos/compare/3.1.0...3.2.0)
+[Full Changelog](https://github.com/SUSE/stratos/compare/3.1.0...3.2.0)
 
 This release contains a number of fixes and improvements:
 
diff --git a/package-lock.json b/package-lock.json
index 6a1d60bb3b..abc77626a7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,16 @@
 {
   "name": "stratos",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "lockfileVersion": 1,
   "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.803.26",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.26.tgz",
+      "integrity": "sha512-mCynDvhGLElmuiaK5I6hVleMuZ1Svn7o5NnMW1ItiDlVZu1v49JWOxPS1A7C/ypGmhjl9jMorVtz2IumtLgCXw==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "8.3.7",
+        "@angular-devkit/core": "8.3.26",
         "rxjs": "6.4.0"
       },
       "dependencies": {
@@ -26,31 +26,31 @@
       }
     },
     "@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",
+      "version": "0.803.26",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.803.26.tgz",
+      "integrity": "sha512-SoeUbl928QgYWZjDNSMs9m/9wslKjqkFXeZpOI398i5/ZbrsjXcbxicLphVCPndhfR6qETV7pCqQnVmAf4zYjA==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/architect": "0.803.26",
+        "@angular-devkit/build-optimizer": "0.803.26",
+        "@angular-devkit/build-webpack": "0.803.26",
+        "@angular-devkit/core": "8.3.26",
+        "@babel/core": "7.8.7",
+        "@babel/preset-env": "7.8.7",
+        "@ngtools/webpack": "8.3.26",
         "ajv": "6.10.2",
         "autoprefixer": "9.6.1",
-        "browserslist": "4.6.6",
+        "browserslist": "4.10.0",
         "cacache": "12.0.2",
-        "caniuse-lite": "1.0.30000989",
+        "caniuse-lite": "1.0.30001035",
         "circular-dependency-plugin": "5.2.0",
         "clean-css": "4.2.1",
-        "copy-webpack-plugin": "5.0.4",
-        "core-js": "3.2.1",
+        "copy-webpack-plugin": "5.1.1",
+        "core-js": "3.6.4",
+        "coverage-istanbul-loader": "2.0.3",
         "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",
         "karma-source-map-support": "1.4.0",
         "less": "3.9.0",
@@ -77,18 +77,154 @@
         "style-loader": "1.0.0",
         "stylus": "0.54.5",
         "stylus-loader": "3.0.2",
-        "terser": "4.1.4",
-        "terser-webpack-plugin": "1.4.1",
-        "tree-kill": "1.2.1",
+        "terser": "4.6.3",
+        "terser-webpack-plugin": "1.4.3",
+        "tree-kill": "1.2.2",
         "webpack": "4.39.2",
-        "webpack-dev-middleware": "3.7.0",
-        "webpack-dev-server": "3.8.0",
+        "webpack-dev-middleware": "3.7.2",
+        "webpack-dev-server": "3.9.0",
         "webpack-merge": "4.2.1",
         "webpack-sources": "1.4.3",
         "webpack-subresource-integrity": "1.1.0-rc.6",
         "worker-plugin": "3.2.0"
       },
       "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
+          "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.1"
+          }
+        },
+        "@babel/core": {
+          "version": "7.8.7",
+          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.7.tgz",
+          "integrity": "sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.8.3",
+            "@babel/generator": "^7.8.7",
+            "@babel/helpers": "^7.8.4",
+            "@babel/parser": "^7.8.7",
+            "@babel/template": "^7.8.6",
+            "@babel/traverse": "^7.8.6",
+            "@babel/types": "^7.8.7",
+            "convert-source-map": "^1.7.0",
+            "debug": "^4.1.0",
+            "gensync": "^1.0.0-beta.1",
+            "json5": "^2.1.0",
+            "lodash": "^4.17.13",
+            "resolve": "^1.3.2",
+            "semver": "^5.4.1",
+            "source-map": "^0.5.0"
+          },
+          "dependencies": {
+            "semver": {
+              "version": "5.7.1",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+              "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+              "dev": true
+            },
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
+          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
+          "dev": true
+        },
+        "@babel/highlight": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
+          "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/preset-env": {
+          "version": "7.8.7",
+          "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.8.7.tgz",
+          "integrity": "sha512-BYftCVOdAYJk5ASsznKAUl53EMhfBbr8CJ1X+AJLfGPscQkwJFiaV/Wn9DPH/7fzm2v6iRYJKYHSqyynTGw0nw==",
+          "dev": true,
+          "requires": {
+            "@babel/compat-data": "^7.8.6",
+            "@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-object-rest-spread": "^7.8.3",
+            "@babel/plugin-proposal-optional-catch-binding": "^7.8.3",
+            "@babel/plugin-proposal-optional-chaining": "^7.8.3",
+            "@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-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.8.6",
+            "@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.8.6",
+            "@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.8.3",
+            "@babel/plugin-transform-modules-commonjs": "^7.8.3",
+            "@babel/plugin-transform-modules-systemjs": "^7.8.3",
+            "@babel/plugin-transform-modules-umd": "^7.8.3",
+            "@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/types": "^7.8.7",
+            "browserslist": "^4.8.5",
+            "core-js-compat": "^3.6.2",
+            "invariant": "^2.2.2",
+            "levenary": "^1.1.1",
+            "semver": "^5.5.0"
+          },
+          "dependencies": {
+            "semver": {
+              "version": "5.7.1",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+              "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+              "dev": true
+            }
+          }
+        },
         "ajv": {
           "version": "6.10.2",
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
@@ -101,6 +237,63 @@
             "uri-js": "^4.2.2"
           }
         },
+        "browserslist": {
+          "version": "4.10.0",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.10.0.tgz",
+          "integrity": "sha512-TpfK0TDgv71dzuTsEAlQiHeWQ/tiPqgNZVdv046fvNtBZrjbv2O3TsWCDU0AWGJJKCF/KsjNdLzR9hXOsh/CfA==",
+          "dev": true,
+          "requires": {
+            "caniuse-lite": "^1.0.30001035",
+            "electron-to-chromium": "^1.3.378",
+            "node-releases": "^1.1.52",
+            "pkg-up": "^3.1.0"
+          }
+        },
+        "caniuse-lite": {
+          "version": "1.0.30001035",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz",
+          "integrity": "sha512-C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ==",
+          "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"
+          }
+        },
+        "core-js": {
+          "version": "3.6.4",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
+          "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+          "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"
+          }
+        },
+        "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
+        },
+        "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"
+          }
+        },
         "glob": {
           "version": "7.1.4",
           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
@@ -115,12 +308,67 @@
             "path-is-absolute": "^1.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"
+          }
+        },
+        "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": "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
+        },
         "parse5": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
           "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
           "dev": true
         },
+        "pkg-up": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
+          "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
+          "dev": true,
+          "requires": {
+            "find-up": "^3.0.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==",
+          "dev": true
+        },
         "rxjs": {
           "version": "6.4.0",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
@@ -145,12 +393,12 @@
       }
     },
     "@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.803.26",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-ng-packagr/-/build-ng-packagr-0.803.26.tgz",
+      "integrity": "sha512-gaSJmY09s73ko2Y/J7DUdh1k4f+3GojgWHDBJOZsOjEfF6KPf4HWhPHMKno09yR5CzMVyo8dStirjNYjgL7EXA==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.803.7",
+        "@angular-devkit/architect": "0.803.26",
         "rxjs": "6.4.0"
       },
       "dependencies": {
@@ -166,9 +414,9 @@
       }
     },
     "@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.803.26",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.803.26.tgz",
+      "integrity": "sha512-rVcMV/HaWK1g1XVbB1Hj0F6icNbguQETxilhbEn2Ut48hT4iywam6a2tz5w33YlH0uspPHwtFrz7EaLbiWUrPw==",
       "dev": true,
       "requires": {
         "loader-utils": "1.2.3",
@@ -184,24 +432,23 @@
           "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==",
+        "tslib": {
+          "version": "1.10.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
+          "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
           "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.803.26",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.803.26.tgz",
+      "integrity": "sha512-lMmNUza+Qb1/XgVMpj2A2jFr7APvJdX57aLxNPnDg/pM0rWbAMXLUvrphqxZuyqjOwfQcHWmnuVxfLpT0qJSAw==",
       "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.803.26",
+        "@angular-devkit/core": "8.3.26",
+        "rxjs": "6.4.0"
       },
       "dependencies": {
         "rxjs": {
@@ -216,9 +463,9 @@
       }
     },
     "@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": "8.3.26",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.26.tgz",
+      "integrity": "sha512-b1ng9091o33s55/cwQYh1kboiJtj8y8z8xQWATDI9kRmNIQkWYVwVa/MzgPRJ4bzbEGG3zIUHCsp52A6vuGr2A==",
       "dev": true,
       "requires": {
         "ajv": "6.10.2",
@@ -240,6 +487,18 @@
             "uri-js": "^4.2.2"
           }
         },
+        "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
+        },
+        "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
+        },
         "rxjs": {
           "version": "6.4.0",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
@@ -258,12 +517,12 @@
       }
     },
     "@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": "8.3.26",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.26.tgz",
+      "integrity": "sha512-IoZbXVFGLvVi5d0ozfssWDXuzot0/pMSKbQPzWIG8K7nCo7nNMVYpsMHrEVYUikA9EQEL5LqMCGohH36/zVPcA==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "8.3.7",
+        "@angular-devkit/core": "8.3.26",
         "rxjs": "6.4.0"
       },
       "dependencies": {
@@ -279,33 +538,33 @@
       }
     },
     "@angular/animations": {
-      "version": "8.2.9",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.9.tgz",
-      "integrity": "sha512-l30AF0d9P5okTPM1wieUHgcnDyGSNvyaBcxXSOkT790wAP2v5zs7VrKq9Lm+ICu4Nkx07KrOr5XLUHhqsg3VXA==",
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.14.tgz",
+      "integrity": "sha512-3Vc9TnNpKdtvKIXcWDFINSsnwgEMiDmLzjceWg1iYKwpeZGQahUXPoesLwQazBMmxJzQiA4HOMj0TTXKZ+Jzkg==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@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": "8.2.3",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-8.2.3.tgz",
+      "integrity": "sha512-ZwO5Sn720RA2YvBqud0JAHkZXjmjxM0yNzCO8RVtRE9i8Gl26Wk0j0nQeJkVm4zwv2QO8MwbKUKGTMt8evsokA==",
       "requires": {
         "parse5": "^5.0.0",
         "tslib": "^1.7.1"
       }
     },
     "@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": "8.3.26",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-8.3.26.tgz",
+      "integrity": "sha512-/dZik0ALcMSNaZdzqeG5hnFqyezrPQlWv+NXPidp1l0VTIwdEmjWmL26QpSBBvZ9bqXjY5/5SZYb+zZlGu78Kg==",
       "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.803.26",
+        "@angular-devkit/core": "8.3.26",
+        "@angular-devkit/schematics": "8.3.26",
+        "@schematics/angular": "8.3.26",
+        "@schematics/update": "0.803.26",
         "@yarnpkg/lockfile": "1.1.0",
         "ansi-colors": "4.1.1",
         "debug": "^4.1.1",
@@ -316,6 +575,7 @@
         "open": "6.4.0",
         "pacote": "9.5.5",
         "read-package-tree": "5.3.1",
+        "rimraf": "3.0.0",
         "semver": "6.3.0",
         "symbol-observable": "1.2.0",
         "universal-analytics": "^0.4.20",
@@ -343,6 +603,15 @@
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
+        "rimraf": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.0.tgz",
+          "integrity": "sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -352,25 +621,25 @@
       }
     },
     "@angular/common": {
-      "version": "8.2.9",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.2.9.tgz",
-      "integrity": "sha512-76WDU1USlI5vAzqCJ3gxCQGuu57aJEggNk/xoWmQEXipiFTFBh2wSKn/dE6Txr/q3COTPIcrmb9OCeal5kQPIA==",
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.2.14.tgz",
+      "integrity": "sha512-Qmt+aX2quUW54kaNT7QH7WGXnFxr/cC2C6sf5SW5SdkZfDQSiz8IaItvieZfXVQUbBOQKFRJ7TlSkt0jI/yjvw==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@angular/compiler": {
-      "version": "8.2.9",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.2.9.tgz",
-      "integrity": "sha512-oQho19DnOhEDNerCOGuGK95tcZ2oy4dSA5SykJmmniRnZzPM2++bJD32qJehXHy1K+3hv2zN9x7HPhqT3ljT6g==",
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.2.14.tgz",
+      "integrity": "sha512-ABZO4E7eeFA1QyJ2trDezxeQM5ZFa1dXw1Mpl/+1vuXDKNjJgNyWYwKp/NwRkLmrsuV0yv4UDCDe4kJOGbPKnw==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@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": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-8.2.14.tgz",
+      "integrity": "sha512-XDrTyrlIZM+0NquVT+Kbg5bn48AaWFT+B3bAT288PENrTdkuxuF9AhjFRZj8jnMdmaE4O2rioEkXBtl6z3zptA==",
       "dev": true,
       "requires": {
         "canonical-path": "1.0.0",
@@ -440,6 +709,15 @@
           "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
           "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==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
         "get-caller-file": {
           "version": "2.0.5",
           "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -467,6 +745,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",
@@ -495,6 +783,30 @@
             "mem": "^4.0.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": "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
+        },
         "require-main-filename": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
@@ -570,9 +882,9 @@
           }
         },
         "yargs-parser": {
-          "version": "13.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
-          "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+          "version": "13.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
           "dev": true,
           "requires": {
             "camelcase": "^5.0.0",
@@ -582,9 +894,9 @@
       }
     },
     "@angular/core": {
-      "version": "8.2.9",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.2.9.tgz",
-      "integrity": "sha512-GpHAuLOlN9iioELCQBmAsjETTUCyFgVUI3LXwh3e63jnpd+ZuuZcZbjfTYhtgYVNMetn7cVEO6p88eb7qvpUWQ==",
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.2.14.tgz",
+      "integrity": "sha512-zeePkigi+hPh3rN7yoNENG/YUBUsIvUXdxx+AZq+QPaFeKEA2FBSrKn36ojHFrdJUjKzl0lPMEiGC2b6a6bo6g==",
       "requires": {
         "tslib": "^1.9.0"
       }
@@ -598,55 +910,55 @@
       }
     },
     "@angular/forms": {
-      "version": "8.2.9",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.2.9.tgz",
-      "integrity": "sha512-kAdBuApC9PPOdPI8BmNhxCraAkXGbX/PkVan8pQ5xdumvgGqvVjbJvLaUSbJROPtgCRlQyiEDrHFd4gk/WU76A==",
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.2.14.tgz",
+      "integrity": "sha512-zhyKL3CFIqcyHJ/TQF/h1OZztK611a6rxuPHCrt/5Sn1SuBTJJQ1pPTkOYIDy6IrCrtyANc8qB6P17Mao71DNQ==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@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": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-8.2.14.tgz",
+      "integrity": "sha512-7EhN9JJbAJcH2xCa+rIOmekjiEuB0qwPdHuD5qn/wwMfRzMZo+Db4hHbR9KHrLH6H82PTwYKye/LLpDaZqoHOA==",
       "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==",
+      "version": "8.2.3",
+      "resolved": "https://registry.npmjs.org/@angular/material/-/material-8.2.3.tgz",
+      "integrity": "sha512-SOczkIaqes+r+9XF/UUiokidfFKBpHkOPIaFK857sFD0FBNPvPEpOr5oHKCG3feERRwAFqHS7Wo2ohVEWypb5A==",
       "requires": {
         "tslib": "^1.7.1"
       }
     },
     "@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==",
+      "version": "8.2.3",
+      "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-8.2.3.tgz",
+      "integrity": "sha512-x0WE9MyQajqzGPYKm8eHcDmWWlwiobOX9rZ+V5uqY80fsvm2czk6TYnc1drFYcPAHIaIcx7je7NYOULPF1rTpw==",
       "requires": {
         "tslib": "^1.7.1"
       }
     },
     "@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==",
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.2.14.tgz",
+      "integrity": "sha512-MtJptptyKzsE37JZ2VB/tI4cvMrdAH+cT9pMBYZd66YSZfKjIj5s+AZo7z8ncoskQSB1o3HMfDjSK7QXGx1mLQ==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@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==",
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.14.tgz",
+      "integrity": "sha512-mO2JPR5kLU/A3AQngy9+R/Q5gaF9csMStBQjwsCRI0wNtlItOIGL6+wTYpiTuh/ux+WVN1F2sLcEYU4Zf1ud9A==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@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": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-8.2.14.tgz",
+      "integrity": "sha512-gGAgxMmac5CyLcwgB+qCD1o75An0NmpREh/lxPgz6n6Zs9JqdqpZROLSIHqGBaU6MWo1qiOfS6L08HwYPx7ipQ==",
       "requires": {
         "domino": "^2.1.2",
         "tslib": "^1.9.0",
@@ -654,9 +966,9 @@
       }
     },
     "@angular/router": {
-      "version": "8.2.9",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.2.9.tgz",
-      "integrity": "sha512-4P60CWNB/jxGjDBEuYN0Jobt76QlebAQeFBTDswRVwRlq/WJT4QhL3a8AVIRsHn9bQII0LUt/ZQBBPxn7h9lSA==",
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.2.14.tgz",
+      "integrity": "sha512-DHA2BhODqV7F0g6ZKgFaZgbsqzHHWRcfWchCOrOVKu2rYiKUTwwHVLBgZAhrpNeinq2pWanVYSIhMr7wy+LfEA==",
       "requires": {
         "tslib": "^1.9.0"
       }
@@ -665,31 +977,70 @@
       "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.0.0"
       }
     },
+    "@babel/compat-data": {
+      "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==",
+      "requires": {
+        "browserslist": "^4.11.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==",
-      "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==",
+      "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==",
+          "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==",
+          "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==",
+          "requires": {
+            "safe-buffer": "~5.1.1"
+          }
+        },
         "debug": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -698,14 +1049,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==",
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -714,374 +1057,667 @@
       }
     },
     "@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==",
       "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=="
-        }
       }
     },
     "@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==",
       "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==",
+      "requires": {
+        "@babel/helper-explode-assignable-expression": "^7.8.3",
+        "@babel/types": "^7.8.3"
+      }
+    },
+    "@babel/helper-compilation-targets": {
+      "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==",
       "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/compat-data": "^7.9.6",
+        "browserslist": "^4.11.1",
+        "invariant": "^2.2.4",
+        "levenary": "^1.1.1",
+        "semver": "^5.5.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==",
+    "@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==",
       "requires": {
-        "@babel/helper-hoist-variables": "^7.4.4",
-        "@babel/traverse": "^7.4.4",
-        "@babel/types": "^7.4.4"
+        "@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==",
       "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==",
       "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==",
       "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==",
       "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==",
       "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==",
       "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==",
       "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==",
-      "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",
+      "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==",
+      "requires": {
+        "@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==",
       "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=="
     },
     "@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==",
       "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==",
       "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==",
-      "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"
+      "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==",
+      "requires": {
+        "@babel/helper-member-expression-to-functions": "^7.8.3",
+        "@babel/helper-optimise-call-expression": "^7.8.3",
+        "@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==",
+          "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==",
+          "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==",
+          "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==",
+          "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=="
+        },
+        "@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==",
+          "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==",
+          "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=="
+            }
+          }
+        },
+        "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.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=="
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        }
       }
     },
     "@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==",
       "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==",
       "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=="
+    },
     "@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==",
       "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==",
-      "requires": {
-        "@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==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz",
+      "integrity": "sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==",
       "requires": {
-        "chalk": "^2.0.0",
-        "esutils": "^2.0.2",
-        "js-tokens": "^4.0.0"
+        "@babel/template": "^7.8.3",
+        "@babel/traverse": "^7.9.6",
+        "@babel/types": "^7.9.6"
       },
       "dependencies": {
-        "js-tokens": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-        }
-      }
-    },
-    "@babel/parser": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.6.2.tgz",
-      "integrity": "sha512-mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg=="
-    },
-    "@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==",
-      "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/plugin-proposal-dynamic-import": {
+        "@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==",
+          "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==",
+          "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==",
+          "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==",
+          "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=="
+        },
+        "@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==",
+          "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==",
+          "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=="
+            }
+          }
+        },
+        "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.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=="
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        }
+      }
+    },
+    "@babel/highlight": {
       "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==",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
+      "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-dynamic-import": "^7.2.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==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/parser": {
+      "version": "7.9.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
+      "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA=="
+    },
+    "@babel/plugin-proposal-async-generator-functions": {
+      "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==",
+      "requires": {
+        "@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.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==",
+      "requires": {
+        "@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==",
       "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==",
+      "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==",
+      "optional": 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.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==",
       "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-transform-parameters": "^7.9.5"
       }
     },
     "@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==",
       "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==",
+      "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==",
       "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==",
       "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==",
       "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==",
+      "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==",
+      "requires": {
+        "@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==",
+      "optional": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@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==",
       "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==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@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==",
+      "requires": {
+        "@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==",
+      "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==",
       "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==",
       "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==",
       "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==",
       "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==",
-      "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.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz",
+      "integrity": "sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.8.3",
+        "@babel/helper-define-map": "^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",
+        "@babel/helper-split-export-declaration": "^7.8.3",
         "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==",
+          "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=="
+        },
+        "@babel/types": {
+          "version": "7.9.6",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz",
+          "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==",
+          "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",
@@ -1090,315 +1726,383 @@
       }
     },
     "@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==",
       "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.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==",
       "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==",
       "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==",
       "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==",
       "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==",
       "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==",
       "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==",
       "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==",
       "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.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz",
+      "integrity": "sha512-zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw==",
       "requires": {
-        "@babel/helper-module-transforms": "^7.1.0",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "babel-plugin-dynamic-import-node": "^2.3.0"
+        "@babel/helper-module-transforms": "^7.9.0",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@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.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==",
       "requires": {
-        "@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/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.3"
       }
     },
     "@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.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz",
+      "integrity": "sha512-NW5XQuW3N2tTHim8e1b7qGy7s0kZ2OH3m5octc49K1SdAKGxYxeIx7hiIz05kS1R2R+hOWcsr1eYwcGhrdHsrg==",
       "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.8.3",
+        "@babel/helper-module-transforms": "^7.9.0",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@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==",
       "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==",
       "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==",
       "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==",
       "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.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==",
       "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==",
       "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==",
       "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==",
       "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==",
       "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==",
       "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==",
       "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==",
       "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==",
       "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==",
       "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==",
+      "optional": 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==",
+      "optional": 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.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz",
+      "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==",
+      "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==",
       "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==",
+          "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==",
+          "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==",
-      "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",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz",
+      "integrity": "sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==",
+      "requires": {
+        "@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==",
+          "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==",
+          "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",
@@ -1420,82 +2124,107 @@
       }
     },
     "@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==",
       "requires": {
-        "esutils": "^2.0.2",
+        "@babel/helper-validator-identifier": "^7.9.0",
         "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="
-        }
       }
     },
     "@cypress/webpack-preprocessor": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@cypress/webpack-preprocessor/-/webpack-preprocessor-4.1.0.tgz",
-      "integrity": "sha512-LbxsdYVpHGoC2fMOdW0aQvuvVRD7aZx8p8DrP53HISpl7bD1PqLGWKzhHn7cGG24UHycBJrbaEeKEosW29W1dg==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@cypress/webpack-preprocessor/-/webpack-preprocessor-4.1.5.tgz",
+      "integrity": "sha512-B4miSaS3VCMVSlfuvbWCjytTywdnquRsF1tQ3quC7TGUzEXnQZ4+o8WUKibjMozrOomALkUdMxqOJ1ib5oFkKw==",
       "requires": {
         "@babel/core": "^7.0.1",
         "@babel/preset-env": "^7.0.0",
         "babel-loader": "^8.0.2",
-        "bluebird": "3.5.0",
-        "debug": "3.1.0"
+        "bluebird": "3.7.1",
+        "debug": "4.1.1"
       },
       "dependencies": {
         "bluebird": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
-          "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw="
+          "version": "3.7.1",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.1.tgz",
+          "integrity": "sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg=="
         },
         "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==",
           "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=="
         }
       }
     },
+    "@istanbuljs/schema": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz",
+      "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==",
+      "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=="
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-8.6.0.tgz",
+      "integrity": "sha512-JdyJLQbv/wnE0ZPY9DcDOtF9PzJuzsKWmIWgIGunHF18wdjk5O8Zpkcrxq18wDRL6geg5UTtNJRMvTQhpDbzow=="
     },
     "@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": "8.6.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-8.6.0.tgz",
+      "integrity": "sha512-4Dvl6dfOj15lNZ63wucRNcTEHUi0hEqapOBVRslfAsnaSRo2t1lOvfX7b68IbxPiqzabTBdIeEkJwAC2q/rZZg=="
     },
     "@ngrx/store": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-8.3.0.tgz",
-      "integrity": "sha512-QtM5T6/wTYqAlqeW60ptqqrsBwYF7jvQHsh0yE3AnwZIQvSbLFM2t5S2kN+753v4rHiXVRrA5pLaLzjGhAKcSg=="
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-8.6.0.tgz",
+      "integrity": "sha512-K4cvCEa+5hw9qrETQWO+Cha3YbVCAT8yaIKJr/N35KntTL9mQMjoL+51JWLZfBwPV0e19CFgJIyrBnVUTxwr2A=="
     },
     "@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": "8.6.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-8.6.0.tgz",
+      "integrity": "sha512-PWZmiOZE0J56GFfZpuzKLb7w0K2c6OXZSp/eWDeAvtdHFD4/Nas1i4TXtiWWMWWnSZeNs0hNIg4nFJXi2EddJQ=="
     },
     "@ngtools/webpack": {
-      "version": "8.3.7",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-8.3.7.tgz",
-      "integrity": "sha512-JPUzw08myovtT/x2dzzWVUNjFq8OHD81bvcBXdqPAQwQvHDSIdo6bKcu2qhakgagtXLJZnglKtefTJFrMG8ciw==",
+      "version": "8.3.26",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-8.3.26.tgz",
+      "integrity": "sha512-w28u3Akvn37hE0HYwy/l6YrDBWxzh7TceYJz+5hRLmJu+BevSY/rNjZ22AlpVD8ZWqhFfvzJS9cuvAqDgH9rtw==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "8.3.7",
+        "@angular-devkit/core": "8.3.26",
         "enhanced-resolve": "4.1.0",
         "rxjs": "6.4.0",
-        "tree-kill": "1.2.1",
+        "tree-kill": "1.2.2",
         "webpack-sources": "1.4.3"
       },
       "dependencies": {
+        "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==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "memory-fs": "^0.4.0",
+            "tapable": "^1.0.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"
+          }
+        },
         "rxjs": {
           "version": "6.4.0",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
@@ -1508,28 +2237,28 @@
       }
     },
     "@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"
       }
     },
@@ -1586,6 +2315,24 @@
             "uri-js": "^4.2.2"
           }
         },
+        "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="
+        },
+        "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="
+        },
+        "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==",
+          "requires": {
+            "sourcemap-codec": "^1.4.4"
+          }
+        },
         "rxjs": {
           "version": "6.4.0",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
@@ -1636,123 +2383,49 @@
             "wrap-ansi": "^2.0.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=",
+        "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
+        },
+        "lcid": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
           "dev": true,
           "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
+            "invert-kv": "^2.0.0"
           }
         },
-        "execa": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+        "mem": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+          "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
           "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"
-          }
-        },
-        "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.0.0"
+            "map-age-cleaner": "^0.1.1",
+            "mimic-fn": "^2.0.0",
+            "p-is-promise": "^2.0.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=",
+          "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==",
           "dev": true,
           "requires": {
-            "p-limit": "^1.1.0"
+            "execa": "^1.0.0",
+            "lcid": "^2.0.0",
+            "mem": "^4.0.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",
@@ -1784,23 +2457,17 @@
           "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==",
+          "version": "11.1.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.1.tgz",
+          "integrity": "sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==",
           "dev": true,
           "requires": {
             "cliui": "^4.0.0",
             "decamelize": "^1.1.1",
             "find-up": "^2.1.0",
             "get-caller-file": "^1.0.1",
-            "os-locale": "^2.0.0",
+            "os-locale": "^3.1.0",
             "require-directory": "^2.1.1",
             "require-main-filename": "^1.0.1",
             "set-blocking": "^2.0.0",
@@ -1879,6 +2546,24 @@
             "uri-js": "^4.2.2"
           }
         },
+        "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="
+        },
+        "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="
+        },
+        "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==",
+          "requires": {
+            "sourcemap-codec": "^1.4.4"
+          }
+        },
         "rxjs": {
           "version": "6.4.0",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
@@ -1891,6 +2576,11 @@
           "version": "0.7.3",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
           "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
+        },
+        "tree-kill": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz",
+          "integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q=="
         }
       }
     },
@@ -1945,6 +2635,24 @@
             "uri-js": "^4.2.2"
           }
         },
+        "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="
+        },
+        "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="
+        },
+        "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==",
+          "requires": {
+            "sourcemap-codec": "^1.4.4"
+          }
+        },
         "rxjs": {
           "version": "6.4.0",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
@@ -2019,6 +2727,18 @@
             "uri-js": "^4.2.2"
           }
         },
+        "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
+        },
+        "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
+        },
         "rxjs": {
           "version": "6.4.0",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
@@ -2154,40 +2874,17 @@
             "require-from-string": "^2.0.1"
           }
         },
-        "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"
-          }
+        "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
         },
-        "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"
-          }
+        "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
         },
         "fs-extra": {
           "version": "6.0.0",
@@ -2200,94 +2897,55 @@
             "universalify": "^0.1.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
-        },
         "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
         },
+        "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
         },
-        "locate-path": {
+        "lcid": {
           "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==",
+          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
           "dev": true,
           "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
+            "invert-kv": "^2.0.0"
           }
         },
         "mem": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-          "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+          "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
           "dev": true,
           "requires": {
-            "mimic-fn": "^1.0.0"
+            "map-age-cleaner": "^0.1.1",
+            "mimic-fn": "^2.0.0",
+            "p-is-promise": "^2.0.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=",
+          "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==",
           "dev": true,
           "requires": {
-            "p-limit": "^1.1.0"
+            "execa": "^1.0.0",
+            "lcid": "^2.0.0",
+            "mem": "^4.0.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",
@@ -2341,23 +2999,17 @@
           "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==",
+          "version": "11.1.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.1.tgz",
+          "integrity": "sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==",
           "dev": true,
           "requires": {
             "cliui": "^4.0.0",
             "decamelize": "^1.1.1",
             "find-up": "^2.1.0",
             "get-caller-file": "^1.0.1",
-            "os-locale": "^2.0.0",
+            "os-locale": "^3.1.0",
             "require-directory": "^2.1.1",
             "require-main-filename": "^1.0.1",
             "set-blocking": "^2.0.0",
@@ -2390,23 +3042,23 @@
       }
     },
     "@schematics/angular": {
-      "version": "8.3.7",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.7.tgz",
-      "integrity": "sha512-RsUZofittMe+o8AGi2wbrWb10Avurl2VgDqlINF0fAEfdxzmjvNwXkP4IdAo5wsGl2URrxnJWeRP6geBqgueZQ==",
+      "version": "8.3.26",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.26.tgz",
+      "integrity": "sha512-NJCykMxB9RKL+Tmr9xHftUevsivKGsQZQKjkub528wrSgwrCWoFCxGWV31iOXkT3TlBWmuibH6MZkrWbCLX4Sw==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "8.3.7",
-        "@angular-devkit/schematics": "8.3.7"
+        "@angular-devkit/core": "8.3.26",
+        "@angular-devkit/schematics": "8.3.26"
       }
     },
     "@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==",
+      "version": "0.803.26",
+      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.803.26.tgz",
+      "integrity": "sha512-r284UN3HP/UgxK80SG3MDlbF4qPS6EitEqwdSBqXizUYRlV6ovG9vHMLpNruWE0B6vfYbSAn1YvvIwW/ORL1Cw==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "8.3.7",
-        "@angular-devkit/schematics": "8.3.7",
+        "@angular-devkit/core": "8.3.26",
+        "@angular-devkit/schematics": "8.3.26",
         "@yarnpkg/lockfile": "1.1.0",
         "ini": "1.3.5",
         "pacote": "9.5.5",
@@ -2439,9 +3091,9 @@
       "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==",
+      "version": "12.1.0",
+      "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-12.1.0.tgz",
+      "integrity": "sha512-M3H3S/JejG4wKOYwuuwfJrC28XhU3LWhVWKDaZcgA+goRxfEbVbnH7IYcIep5JgFLv17qg7lxhJHtkaySr7Fxg==",
       "requires": {
         "d3": "^4.10.2",
         "d3-array": "^1.2.1",
@@ -2492,15 +3144,21 @@
         "defer-to-connect": "^1.0.1"
       }
     },
+    "@tootallnate/once": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.0.0.tgz",
+      "integrity": "sha512-KYyTT/T6ALPkIRd2Ge080X/BsXvy9O0hcWTtMWkPvwAwF99+vn6Dv4GzrFT/Nn1LePr+FFDbRXXlqmsy9lw2zA==",
+      "dev": true
+    },
     "@tweenjs/tween.js": {
       "version": "17.4.0",
       "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.27",
-      "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.27.tgz",
-      "integrity": "sha512-6BmYWSBea18+tSjjSC3QIyV93ZKAeNWGM7R6aYt1ryTZXrlHF+QLV0G2yV0viEGVyRkyQsWfMoJ0k/YghBX5sQ==",
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.32.tgz",
+      "integrity": "sha512-dIOxFfI0C+jz89g6lQ+TqhGgPQ0MxSnh/E4xuC0blhFtyW269+mPG5QeLgbdwst/LvdP8o1y0o/Gz5EHXLec/g==",
       "dev": true
     },
     "@types/caseless": {
@@ -2514,10 +3172,16 @@
       "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",
-      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
+      "version": "0.0.44",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.44.tgz",
+      "integrity": "sha512-iaIVzr+w2ZJ5HkidlZ3EJM8VTZb2MJLCjw3V+505yVts0gRC4UMvjw0d1HPtGqI/HQC/KdsYtayfzl+AXY2R8g==",
       "dev": true
     },
     "@types/events": {
@@ -2538,9 +3202,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": {
@@ -2552,20 +3216,26 @@
         "@types/jasmine": "*"
       }
     },
+    "@types/json-schema": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.4.tgz",
+      "integrity": "sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==",
+      "dev": true
+    },
     "@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==",
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@types/karma/-/karma-3.0.9.tgz",
+      "integrity": "sha512-GEhyutKIjZstOI1o9HHu58ApHLdgpyvihiUzLaPK3Ig5LIjRTagtSB5RbwKsmfKjmoh0qPNOCmZTYL37VTTcbA==",
       "dev": true,
       "requires": {
         "@types/bluebird": "*",
         "@types/node": "*",
-        "log4js": "^3.0.0"
+        "log4js": "^4.0.0"
       }
     },
     "@types/marked": {
@@ -2580,17 +3250,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.43",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.43.tgz",
+      "integrity": "sha512-KUyZdkGCnVPuXfsKmDUu2XLui65LZIJ2s0M57noy5e+ixUT2oK33ep7zlvgzI8LElcWqbf8AR+o/3GqAPac2zA==",
       "dev": true
     },
     "@types/normalize-package-data": {
@@ -2599,16 +3269,10 @@
       "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
       "dev": true
     },
-    "@types/q": {
-      "version": "0.0.32",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz",
-      "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
-      "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": "*",
@@ -2640,9 +3304,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": {
@@ -2657,15 +3321,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.8",
+      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.8.tgz",
+      "integrity": "sha512-JHB2/xZlXOjzjBB6fMOpH1eQAfsrpqVVIbneE0Rok16WXwFaznaI5vfg75U5WgGJm7V9W1c4xeRQDjX/zwvghA==",
       "dev": true,
       "requires": {
         "@types/node": "*",
@@ -2902,9 +3566,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": {
@@ -2925,9 +3589,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": {
@@ -2955,12 +3619,12 @@
       }
     },
     "ajv": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
-      "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
+      "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": "^2.0.1",
+        "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
         "json-schema-traverse": "^0.4.1",
         "uri-js": "^4.2.2"
@@ -3048,12 +3712,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": {
@@ -3136,9 +3800,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": {
@@ -3327,6 +3991,14 @@
         "bn.js": "^4.0.0",
         "inherits": "^2.0.1",
         "minimalistic-assert": "^1.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "dev": true
+        }
       }
     },
     "assert": {
@@ -3453,9 +4125,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": {
@@ -3559,6 +4231,26 @@
             "pkg-dir": "^3.0.0"
           }
         },
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "optional": 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==",
+          "optional": 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",
@@ -3577,9 +4269,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==",
       "requires": {
         "object.assign": "^4.1.0"
       }
@@ -3595,9 +4287,9 @@
       },
       "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==",
+          "version": "2.6.11",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
+          "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==",
           "dev": true
         },
         "regenerator-runtime": {
@@ -3648,9 +4340,17 @@
         "esutils": "^2.0.2",
         "lodash": "^4.17.4",
         "to-fast-properties": "^1.0.3"
-      }
-    },
-    "babylon": {
+      },
+      "dependencies": {
+        "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=",
+          "dev": true
+        }
+      }
+    },
+    "babylon": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
       "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
@@ -3786,6 +4486,15 @@
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
       "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="
     },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "optional": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "blob": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
@@ -3802,15 +4511,15 @@
       }
     },
     "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": {
-      "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.2",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz",
+      "integrity": "sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==",
       "dev": true
     },
     "body-parser": {
@@ -4008,21 +4717,50 @@
       "requires": {
         "bn.js": "^4.1.0",
         "randombytes": "^2.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "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.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.0.tgz",
+      "integrity": "sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA==",
+      "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",
+        "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
+        }
       }
     },
     "browserify-zlib": {
@@ -4035,13 +4773,14 @@
       }
     },
     "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==",
       "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": {
@@ -4051,24 +4790,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",
@@ -4176,9 +4984,9 @@
       },
       "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",
@@ -4232,9 +5040,9 @@
           }
         },
         "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==",
+          "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
         },
         "lowercase-keys": {
@@ -4298,9 +5106,9 @@
       "dev": true
     },
     "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=="
     },
     "canonical-path": {
       "version": "1.0.0",
@@ -4361,9 +5169,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": {
@@ -4534,27 +5342,27 @@
       "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": {
-      "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",
@@ -4642,9 +5450,9 @@
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
     },
     "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": {
@@ -4665,12 +5473,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": {
@@ -4755,13 +5563,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",
@@ -4788,6 +5593,7 @@
       "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.1"
       }
@@ -4834,12 +5640,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",
@@ -4847,16 +5653,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",
@@ -4864,6 +5670,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",
@@ -4887,9 +5694,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",
@@ -4919,27 +5726,42 @@
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
           "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-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
         }
       }
     },
     "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.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.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.5",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
+      "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
       "requires": {
-        "browserslist": "^4.6.6",
-        "semver": "^6.3.0"
+        "browserslist": "^4.8.5",
+        "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=="
         }
       }
     },
@@ -4972,6 +5794,53 @@
         }
       }
     },
+    "coverage-istanbul-loader": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/coverage-istanbul-loader/-/coverage-istanbul-loader-2.0.3.tgz",
+      "integrity": "sha512-LiGRvyIuzVYs3M1ZYK1tF0HekjH0DJ8zFdUwAZq378EJzqOgToyb1690dp3TAUlP6Y+82uu42LRjuROVeJ54CA==",
+      "dev": true,
+      "requires": {
+        "convert-source-map": "^1.7.0",
+        "istanbul-lib-instrument": "^4.0.0",
+        "loader-utils": "^1.2.3",
+        "merge-source-map": "^1.1.0",
+        "schema-utils": "^2.6.1"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
+          "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
+          "dev": true,
+          "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"
+          }
+        },
+        "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"
+          }
+        },
+        "schema-utils": {
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
+          "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.4",
+            "ajv": "^6.12.2",
+            "ajv-keywords": "^3.4.1"
+          }
+        }
+      }
+    },
     "create-ecdh": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
@@ -4980,6 +5849,14 @@
       "requires": {
         "bn.js": "^4.1.0",
         "elliptic": "^6.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "dev": true
+        }
       }
     },
     "create-hash": {
@@ -5054,42 +5931,14 @@
       "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==",
+      "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": "^0.1.0",
-        "fastparse": "^1.1.1",
-        "regexpu-core": "^1.0.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=",
-          "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"
-          }
-        }
+        "cssesc": "^3.0.0",
+        "fastparse": "^1.1.2",
+        "regexpu-core": "^4.6.0"
       }
     },
     "cssauron": {
@@ -5102,9 +5951,9 @@
       }
     },
     "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
     },
     "cuint": {
@@ -5257,9 +6106,9 @@
       "integrity": "sha1-MacFoLU15ldZ3hQXOjGTMTfxjvo="
     },
     "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",
@@ -5283,9 +6132,9 @@
       "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=="
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz",
+      "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q=="
     },
     "d3-dispatch": {
       "version": "1.0.3",
@@ -5328,9 +6177,9 @@
       }
     },
     "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=="
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.4.tgz",
+      "integrity": "sha512-TWks25e7t8/cqctxCmxpUuzZN11QxIA7YrMbram94zMQ0PXjE4LVIMe/f6a4+xxL8HQ3OsAFULOINQi1pE62Aw=="
     },
     "d3-geo": {
       "version": "1.9.1",
@@ -5341,14 +6190,14 @@
       }
     },
     "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"
       }
@@ -5404,14 +6253,14 @@
       }
     },
     "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"
       }
@@ -5422,9 +6271,9 @@
       "integrity": "sha512-YRZkNhphZh3KcnBfitvF3c6E0JOFGikHZ4YqD+Lzv83ZHn1/u6yGenRU1m+KAk9J1GnZMnKcrtfvSktlA1DXNQ=="
     },
     "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"
       }
@@ -5474,9 +6323,9 @@
       }
     },
     "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": {
@@ -5489,15 +6338,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": {
@@ -5535,9 +6378,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",
@@ -5608,9 +6451,9 @@
       "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": {
@@ -5694,30 +6537,6 @@
             }
           }
         },
-        "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": {
-          "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"
-          }
-        },
         "pify": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
@@ -5768,9 +6587,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",
@@ -5835,6 +6654,14 @@
         "bn.js": "^4.1.0",
         "miller-rabin": "^4.0.0",
         "randombytes": "^2.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "dev": true
+        }
       }
     },
     "dir-glob": {
@@ -5900,9 +6727,9 @@
       "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.5",
+      "resolved": "https://registry.npmjs.org/domino/-/domino-2.1.5.tgz",
+      "integrity": "sha512-vMDo7f6ogUV9PkzmxXLiXzJkJZqU09Le4C40mj+HmAGS/2FPmdetoNOQZXpu2kekn0GJKvtwKMAVoruTj60Xww=="
     },
     "dot-prop": {
       "version": "4.2.0",
@@ -5964,14 +6791,14 @@
       "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=="
     },
     "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",
@@ -5981,6 +6808,14 @@
         "inherits": "^2.0.1",
         "minimalistic-assert": "^1.0.0",
         "minimalistic-crypto-utils": "^1.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "dev": true
+        }
       }
     },
     "emoji-regex": {
@@ -5990,9 +6825,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=="
     },
     "encodeurl": {
       "version": "1.0.2",
@@ -6121,12 +6956,12 @@
       }
     },
     "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==",
       "requires": {
         "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.4.0",
+        "memory-fs": "^0.5.0",
         "tapable": "^1.0.0"
       }
     },
@@ -6597,15 +7432,15 @@
       }
     },
     "eventemitter3": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz",
-      "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz",
+      "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==",
       "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": {
@@ -6861,22 +7696,23 @@
       }
     },
     "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="
+      "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
     },
     "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": {
@@ -6898,9 +7734,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"
@@ -6934,9 +7770,10 @@
       }
     },
     "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="
+      "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
     },
     "fast-levenshtein": {
       "version": "2.0.6",
@@ -6951,12 +7788,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.8.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
+      "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==",
       "dev": true,
       "requires": {
-        "reusify": "^1.0.0"
+        "reusify": "^1.0.4"
       }
     },
     "faye-websocket": {
@@ -6969,15 +7806,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"
@@ -7004,29 +7841,36 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+          "version": "6.12.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
+          "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^2.0.1",
+            "fast-deep-equal": "^3.1.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==",
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
+          "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
           "dev": true,
           "requires": {
-            "ajv": "^6.10.2",
+            "@types/json-schema": "^7.0.4",
+            "ajv": "^6.12.2",
             "ajv-keywords": "^3.4.1"
           }
         }
       }
     },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "optional": true
+    },
     "fileset": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz",
@@ -7104,14 +7948,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.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"
           }
         },
+        "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",
@@ -7121,6 +7974,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",
@@ -7151,11 +8010,11 @@
       "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=",
       "requires": {
-        "locate-path": "^3.0.0"
+        "locate-path": "^2.0.0"
       }
     },
     "findup-sync": {
@@ -7275,9 +8134,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": {
@@ -7291,9 +8150,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"
@@ -7452,549 +8311,17 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "fsevents": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
-      "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
-      "optional": true,
-      "requires": {
-        "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==",
-          "optional": true
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true,
-          "optional": true
-        },
-        "aproba": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-          "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-          "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==",
-          "optional": true,
-          "requires": {
-            "delegates": "1.0.0",
-            "readable-stream": "2.3.6"
-          }
-        },
-        "balanced-match": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-          "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==",
-          "optional": true,
-          "requires": {
-            "balanced-match": "1.0.0",
-            "concat-map": "0.0.1"
-          }
-        },
-        "chownr": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
-          "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
-          "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=",
-          "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=",
-          "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=",
-          "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=",
-          "optional": true
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "optional": true,
-          "requires": {
-            "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==",
-          "optional": true
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-          "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-          "optional": true
-        },
-        "detect-libc": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-          "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
-          "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==",
-          "optional": true,
-          "requires": {
-            "minipass": "2.3.5"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-          "optional": true
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-          "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-          "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"
-          }
-        },
-        "glob": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-          "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"
-          }
-        },
-        "has-unicode": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-          "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-          "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==",
-          "optional": true,
-          "requires": {
-            "safer-buffer": "2.1.2"
-          }
-        },
-        "ignore-walk": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
-          "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
-          "optional": true,
-          "requires": {
-            "minimatch": "3.0.4"
-          }
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-          "optional": true,
-          "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "optional": true
-        },
-        "ini": {
-          "version": "1.3.5",
-          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-          "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
-          "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=",
-          "optional": true,
-          "requires": {
-            "number-is-nan": "1.0.1"
-          }
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "optional": true
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-          "optional": true,
-          "requires": {
-            "brace-expansion": "1.1.11"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "optional": true
-        },
-        "minipass": {
-          "version": "2.3.5",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
-          "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
-          "optional": true,
-          "requires": {
-            "safe-buffer": "5.1.2",
-            "yallist": "3.0.3"
-          }
-        },
-        "minizlib": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
-          "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
-          "optional": true,
-          "requires": {
-            "minipass": "2.3.5"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-          "optional": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "optional": true
-        },
-        "needle": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/needle/-/needle-2.3.0.tgz",
-          "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==",
-          "optional": true,
-          "requires": {
-            "debug": "4.1.1",
-            "iconv-lite": "0.4.24",
-            "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==",
-          "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"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-          "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
-          "optional": true,
-          "requires": {
-            "abbrev": "1.1.1",
-            "osenv": "0.1.5"
-          }
-        },
-        "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==",
-          "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==",
-          "optional": true,
-          "requires": {
-            "ignore-walk": "3.0.1",
-            "npm-bundled": "1.0.6"
-          }
-        },
-        "npmlog": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-          "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-          "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"
-          }
-        },
-        "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=",
-          "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=",
-          "optional": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-          "optional": true,
-          "requires": {
-            "wrappy": "1.0.2"
-          }
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-          "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-          "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=",
-          "optional": true
-        },
-        "osenv": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-          "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-          "optional": true,
-          "requires": {
-            "os-homedir": "1.0.2",
-            "os-tmpdir": "1.0.2"
-          }
-        },
-        "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=",
-          "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==",
-          "optional": true
-        },
-        "rc": {
-          "version": "1.2.8",
-          "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-          "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-          "optional": true,
-          "requires": {
-            "deep-extend": "0.6.0",
-            "ini": "1.3.5",
-            "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=",
-              "optional": true
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "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"
-          }
-        },
-        "rimraf": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-          "optional": true,
-          "requires": {
-            "glob": "7.1.3"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "bundled": 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==",
-          "optional": true
-        },
-        "sax": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-          "optional": true
-        },
-        "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
-          "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=",
-          "optional": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-          "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-          "optional": true
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "optional": true,
-          "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.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==",
-          "optional": true,
-          "requires": {
-            "safe-buffer": "5.1.2"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "ansi-regex": "2.1.1"
-          }
-        },
-        "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=",
-          "optional": true
-        },
-        "tar": {
-          "version": "4.4.8",
-          "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
-          "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
-          "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"
-          }
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-          "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==",
-          "optional": true,
-          "requires": {
-            "string-width": "1.0.2"
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true,
-          "optional": true
-        },
-        "yallist": {
-          "version": "3.0.3",
-          "bundled": true,
-          "optional": true
-        }
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "fsevents": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+      "optional": true,
+      "requires": {
+        "bindings": "^1.5.0",
+        "nan": "^2.12.1"
       }
     },
     "function-bind": {
@@ -8026,6 +8353,11 @@
       "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",
+      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg=="
+    },
     "get-caller-file": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
@@ -8172,9 +8504,9 @@
       "dev": true
     },
     "globby": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz",
-      "integrity": "sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==",
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz",
+      "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==",
       "dev": true,
       "requires": {
         "@types/glob": "^7.1.1",
@@ -8203,9 +8535,9 @@
           }
         },
         "ignore": {
-          "version": "5.1.4",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz",
-          "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==",
+          "version": "5.1.8",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+          "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
           "dev": true
         },
         "path-type": {
@@ -8350,9 +8682,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",
@@ -8407,9 +8739,9 @@
       "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": {
@@ -8554,13 +8886,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": {
@@ -8612,9 +8964,15 @@
       }
     },
     "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": {
+      "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": {
@@ -8651,15 +9009,15 @@
       }
     },
     "http-parser-js": {
-      "version": "0.4.10",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz",
-      "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.2.tgz",
+      "integrity": "sha512-opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ==",
       "dev": true
     },
     "http-proxy": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz",
-      "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==",
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
       "dev": true,
       "requires": {
         "eventemitter3": "^4.0.0",
@@ -8718,9 +9076,9 @@
       "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": "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",
@@ -8780,9 +9138,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"
@@ -8802,9 +9160,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": "4.0.2",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-4.0.2.tgz",
+      "integrity": "sha512-Q/tm+yKqnKy4RIBmmtISBlhXuSDrB69e9EKTYiIenIKQkXBQir43w+kN/eGiax3wt1J0O1b2fYcNqLSbEcXA7w=="
     },
     "import-cwd": {
       "version": "2.1.0",
@@ -8890,9 +9248,9 @@
       "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": {
@@ -8917,9 +9275,9 @@
       },
       "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
         },
         "is-fullwidth-code-point": {
@@ -8929,14 +9287,25 @@
           "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"
+          },
+          "dependencies": {
+            "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-ansi": {
@@ -8946,6 +9315,14 @@
           "dev": true,
           "requires": {
             "ansi-regex": "^4.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
+            }
           }
         }
       }
@@ -8998,9 +9375,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": {
@@ -9135,13 +9512,10 @@
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
     },
     "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"
-      }
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
+      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
+      "dev": true
     },
     "is-fullwidth-code-point": {
       "version": "1.0.0",
@@ -9168,6 +9542,17 @@
       "requires": {
         "global-dirs": "^0.1.0",
         "is-path-inside": "^1.0.0"
+      },
+      "dependencies": {
+        "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"
+          }
+        }
       }
     },
     "is-module": {
@@ -9232,27 +9617,27 @@
       "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": {
@@ -9269,12 +9654,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",
@@ -9282,12 +9661,12 @@
       "dev": true
     },
     "is-reference": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.1.4.tgz",
-      "integrity": "sha512-uJA/CDPO3Tao3GTrxYn6AwkM4nUPJiGGYu5+cB8qbC7WGFlrKZbiRo7SFKxUAEpFUfiHofWCXBUNhvYJMh+6zw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.0.tgz",
+      "integrity": "sha512-ZVxq+5TkOx6GQdnoMm2aRdCKADdcrOWXLGzGT+vIA8DMpqEJaRk5AL1bS80zJ2bjHunVmjdzfCt0e4BymIEqKQ==",
       "dev": true,
       "requires": {
-        "@types/estree": "0.0.39"
+        "@types/estree": "0.0.44"
       }
     },
     "is-regex": {
@@ -9503,59 +9882,35 @@
         "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"
       },
       "dependencies": {
-        "ajv": {
-          "version": "5.5.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-          "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"
-          }
-        },
-        "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=",
+        "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==",
           "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-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==",
           "dev": true,
           "requires": {
-            "ajv": "^5.0.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-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": {
@@ -9568,18 +9923,23 @@
       }
     },
     "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.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-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",
+        "@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": {
@@ -9600,6 +9960,12 @@
           "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
           "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==",
+          "dev": true
+        },
         "supports-color": {
           "version": "3.2.3",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
@@ -9633,6 +9999,12 @@
             "ms": "^2.1.1"
           }
         },
+        "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==",
+          "dev": true
+        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -9708,11 +10080,6 @@
         "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=="
-    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -9735,9 +10102,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=="
     },
     "json-buffer": {
       "version": "3.0.0",
@@ -9790,11 +10157,11 @@
       "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==",
       "requires": {
-        "minimist": "^1.2.0"
+        "minimist": "^1.2.5"
       }
     },
     "jsonfile": {
@@ -9837,9 +10204,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",
@@ -9915,34 +10282,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.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",
             "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.4.0"
           }
         },
         "fill-range": {
@@ -9954,28 +10306,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.3",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+          "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
           "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"
@@ -9996,29 +10337,10 @@
           "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==",
+          "version": "2.4.6",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
+          "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
           "dev": true
         },
         "normalize-path": {
@@ -10028,12 +10350,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.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.4"
+            "picomatch": "^2.2.1"
           }
         },
         "source-map": {
@@ -10042,30 +10364,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",
@@ -10096,9 +10394,9 @@
       }
     },
     "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",
@@ -10133,9 +10431,9 @@
           }
         },
         "istanbul-api": {
-          "version": "2.1.6",
-          "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.1.6.tgz",
-          "integrity": "sha512-x0Eicp6KsShG1k1rMgBAi/1GgY7kFGEBwQpw3PXGEmu+rBcBNhqU8g2DgY9mlepAsLPzrzrbqSgCGANnki4POA==",
+          "version": "2.1.7",
+          "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.1.7.tgz",
+          "integrity": "sha512-LYTOa2UrYFyJ/aSczZi/6lBykVMjCCvUmT64gOe+jPZFy4w6FYfPGqFT2IiQ2BxVHHDOvCD7qrIXb0EOh4uGWw==",
           "dev": true,
           "requires": {
             "async": "^2.6.2",
@@ -10146,7 +10444,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",
+            "istanbul-reports": "^2.2.5",
             "js-yaml": "^3.13.1",
             "make-dir": "^2.1.0",
             "minimatch": "^3.0.4",
@@ -10208,12 +10506,12 @@
           }
         },
         "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==",
+          "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": {
-            "handlebars": "^4.1.2"
+            "html-escaper": "^2.0.0"
           }
         },
         "ms": {
@@ -10252,9 +10550,9 @@
       }
     },
     "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": {
@@ -10291,9 +10589,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=="
     },
     "klaw-sync": {
       "version": "2.1.0",
@@ -10428,6 +10726,19 @@
         }
       }
     },
+    "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=="
+    },
+    "levenary": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
+      "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
+      "requires": {
+        "leven": "^3.1.0"
+      }
+    },
     "levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -10510,18 +10821,36 @@
       "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",
         "json5": "^1.0.1"
+      },
+      "dependencies": {
+        "emojis-list": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+          "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+          "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"
+          }
+        }
       }
     },
     "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=",
       "requires": {
-        "p-locate": "^3.0.0",
+        "p-locate": "^2.0.0",
         "path-exists": "^3.0.0"
       }
     },
@@ -10559,22 +10888,22 @@
       "dev": true
     },
     "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"
@@ -10589,9 +10918,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.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": {
@@ -10621,6 +10950,7 @@
       "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.4"
       }
@@ -10642,22 +10972,22 @@
       }
     },
     "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": "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": "^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",
+        "https-proxy-agent": "^2.2.3",
         "lru-cache": "^5.1.1",
         "mississippi": "^3.0.0",
         "node-fetch-npm": "^2.0.2",
@@ -10840,9 +11170,9 @@
       }
     },
     "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==",
       "requires": {
         "errno": "^0.1.3",
         "readable-stream": "^2.0.1"
@@ -10866,6 +11196,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",
@@ -10912,6 +11259,14 @@
       "requires": {
         "bn.js": "^4.0.0",
         "brorand": "^1.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "dev": true
+        }
       }
     },
     "mime": {
@@ -10921,18 +11276,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": {
@@ -10980,9 +11335,9 @@
       }
     },
     "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=="
     },
     "minipass": {
       "version": "2.9.0",
@@ -11079,9 +11434,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"
       }
@@ -11134,9 +11489,9 @@
       "dev": true
     },
     "nan": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
-      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+      "version": "2.14.1",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
+      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
       "optional": true
     },
     "nanomatch": {
@@ -11176,9 +11531,9 @@
       "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": "5.7.1",
+      "resolved": "https://registry.npmjs.org/ng-packagr/-/ng-packagr-5.7.1.tgz",
+      "integrity": "sha512-NDAUcMtLyZnF3bP6JtC3ANpIQRclRDPilF7C0DsjQuIz1q0V3mT7f1PwV0jnRWy8iRpSZmJZr6AGl736gloHtQ==",
       "dev": true,
       "requires": {
         "ajv": "^6.10.2",
@@ -11198,7 +11553,7 @@
         "postcss-url": "^8.0.0",
         "read-pkg-up": "^5.0.0",
         "rimraf": "^3.0.0",
-        "rollup": "^1.12.1",
+        "rollup": "1.25.2",
         "rollup-plugin-commonjs": "^10.0.0",
         "rollup-plugin-json": "^4.0.0",
         "rollup-plugin-node-resolve": "^5.0.0",
@@ -11210,18 +11565,6 @@
         "update-notifier": "^3.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"
-          }
-        },
         "anymatch": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
@@ -11248,19 +11591,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.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",
             "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.4.0"
           }
         },
         "commander": {
@@ -11278,17 +11621,26 @@
             "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.3",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+          "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
           "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"
@@ -11309,12 +11661,46 @@
           "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
           "dev": true
         },
+        "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.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": "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",
@@ -11350,18 +11736,18 @@
           }
         },
         "readdirp": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.1.3.tgz",
-          "integrity": "sha512-ZOsfTGkjO2kqeR5Mzr5RYDbTGYneSkdNKX2fOX2P5jF7vMrd/GNnIAUtDldeHHumHUCQ3V05YfWUdxMPAsRu9Q==",
+          "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.4"
+            "picomatch": "^2.2.1"
           }
         },
         "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"
@@ -11393,9 +11779,9 @@
       }
     },
     "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"
       }
@@ -11413,9 +11799,9 @@
       "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==",
+      "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",
@@ -11469,12 +11855,9 @@
       }
     },
     "node-releases": {
-      "version": "1.1.33",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.33.tgz",
-      "integrity": "sha512-I0V30bWQEoHb+10W8oedVoUrdjW5wIkYm0w7vvcrPO95pZY738m1k77GF5sO0vKg5eXYg9oGtrMAETbgZGm11A==",
-      "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=="
     },
     "node-sass-tilde-importer": {
       "version": "1.0.2",
@@ -11533,9 +11916,9 @@
       }
     },
     "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",
@@ -11547,9 +11930,18 @@
       }
     },
     "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-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": {
@@ -11565,13 +11957,14 @@
       }
     },
     "npm-packlist": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.4.tgz",
-      "integrity": "sha512-zTLo8UcVYtDU3gdeaFu2Xu0n0EvelfHDGuqtNIn5RO7yQj4H1TqNdBc/yZjxnWA0PVB8D3Woyp0i5B43JwQ6Vw==",
+      "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": {
         "ignore-walk": "^3.0.1",
-        "npm-bundled": "^1.0.1"
+        "npm-bundled": "^1.0.1",
+        "npm-normalize-package-bin": "^1.0.1"
       }
     },
     "npm-pick-manifest": {
@@ -11586,9 +11979,9 @@
       }
     },
     "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": "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",
@@ -11601,9 +11994,9 @@
       },
       "dependencies": {
         "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
         }
       }
@@ -11753,10 +12146,95 @@
       "dev": true
     },
     "object-is": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.1.tgz",
-      "integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=",
-      "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",
@@ -11795,13 +12273,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": {
@@ -12007,19 +12566,19 @@
       "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==",
       "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=",
       "requires": {
-        "p-limit": "^2.0.0"
+        "p-limit": "^1.1.0"
       }
     },
     "p-map": {
@@ -12038,9 +12597,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="
     },
     "package-json": {
       "version": "6.5.0",
@@ -12112,9 +12671,9 @@
       }
     },
     "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": {
@@ -12175,9 +12734,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": {
@@ -12306,9 +12865,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": {
@@ -12344,6 +12903,54 @@
       "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
       "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==",
+          "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==",
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "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==",
+          "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=="
+        }
+      }
+    },
+    "pkg-up": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
+      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
+      "requires": {
+        "find-up": "^2.1.0"
       }
     },
     "plugin-error": {
@@ -12376,20 +12983,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.26",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz",
+      "integrity": "sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==",
       "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
         }
       }
@@ -12474,17 +13090,17 @@
       },
       "dependencies": {
         "mime": {
-          "version": "2.4.4",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
-          "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+          "version": "2.4.6",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
+          "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
           "dev": true
         }
       }
     },
     "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.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
       "dev": true
     },
     "prelude-ls": {
@@ -12577,9 +13193,9 @@
       }
     },
     "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",
@@ -12599,6 +13215,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",
@@ -12647,6 +13269,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",
@@ -12696,13 +13342,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": {
@@ -12720,9 +13366,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"
@@ -12735,9 +13381,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": {
@@ -12752,6 +13398,14 @@
         "parse-asn1": "^5.0.0",
         "randombytes": "^2.0.1",
         "safe-buffer": "^5.1.2"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "dev": true
+        }
       }
     },
     "pump": {
@@ -12882,24 +13536,25 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+          "version": "6.12.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
+          "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^2.0.1",
+            "fast-deep-equal": "^3.1.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==",
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
+          "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
           "dev": true,
           "requires": {
-            "ajv": "^6.10.2",
+            "@types/json-schema": "^7.0.4",
+            "ajv": "^6.12.2",
             "ajv-keywords": "^3.4.1"
           }
         }
@@ -12935,16 +13590,16 @@
       }
     },
     "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-tree": {
@@ -13095,25 +13750,25 @@
       "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="
     },
     "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==",
       "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==",
-      "dev": true
+      "version": "0.13.5",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
+      "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="
     },
     "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==",
       "requires": {
-        "private": "^0.1.6"
+        "@babel/runtime": "^7.8.4",
+        "private": "^0.1.8"
       }
     },
     "regex-not": {
@@ -13126,35 +13781,116 @@
       }
     },
     "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==",
       "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": {
@@ -13167,16 +13903,23 @@
       }
     },
     "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=="
     },
     "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==",
       "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="
+        }
       }
     },
     "remove-bom-buffer": {
@@ -13242,39 +13985,68 @@
       }
     },
     "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": "4.3.1",
+      "resolved": "https://registry.npmjs.org/replace-in-file/-/replace-in-file-4.3.1.tgz",
+      "integrity": "sha512-FqVvfmpqGTD2JRGI1JjJ86b24P17x/WWwGdxExeyJxnh/2rVQz2+jXfD1507UnnhEQw092X0u0DPCBf1WC4ooQ==",
       "dev": true,
       "requires": {
         "chalk": "^2.4.2",
-        "glob": "^7.1.4",
-        "yargs": "^13.3.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"
+          }
+        },
         "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",
@@ -13282,9 +14054,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",
@@ -13296,9 +14068,48 @@
           }
         },
         "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.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": {
@@ -13308,23 +14119,23 @@
           "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"
           }
         },
         "which-module": {
@@ -13334,38 +14145,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.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",
@@ -13375,9 +14187,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",
@@ -13387,7 +14199,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",
@@ -13397,27 +14209,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"
       }
@@ -13593,9 +14405,9 @@
       }
     },
     "rollup": {
-      "version": "1.22.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.22.0.tgz",
-      "integrity": "sha512-x4l4ZrV/Mr/x/jvFTmwROdEAhbZjx16yDRTVSKWh/i4oJDuW2dVEbECT853mybYCz7BAitU8ElGlhx7dNjw3qQ==",
+      "version": "1.25.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.25.2.tgz",
+      "integrity": "sha512-+7z6Wab/L45QCPcfpuTZKwKiB0tynj05s/+s2U3F2Bi7rOLPr9UcjUwO7/xpjlPNXA/hwnth6jBExFRGyf3tMg==",
       "dev": true,
       "requires": {
         "@types/estree": "*",
@@ -13658,13 +14470,10 @@
       }
     },
     "run-async": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
-      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
-      "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",
@@ -13693,9 +14502,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"
       }
@@ -13713,22 +14522,226 @@
       }
     },
     "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",
+          "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"
+          }
+        },
+        "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"
+          }
+        }
       }
     },
     "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",
@@ -13844,12 +14857,48 @@
       "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": {
@@ -13972,9 +15021,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": {
@@ -14116,9 +15165,9 @@
       "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
     },
     "slash": {
@@ -14134,9 +15183,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": {
@@ -14262,9 +15311,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": {
@@ -14351,9 +15400,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",
@@ -14391,13 +15440,13 @@
       }
     },
     "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": {
@@ -14487,9 +15536,9 @@
       "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
     },
     "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=="
     },
     "sparkles": {
       "version": "1.0.1",
@@ -14530,9 +15579,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",
@@ -14589,9 +15638,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",
@@ -14794,6 +15843,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",
@@ -14820,15 +15878,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": {
@@ -14840,6 +15899,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",
@@ -14876,6 +15946,97 @@
         "function-bind": "^1.0.2"
       }
     },
+    "string.prototype.trimend": {
+      "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",
+        "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",
@@ -14896,6 +16057,97 @@
         "function-bind": "^1.1.1"
       }
     },
+    "string.prototype.trimstart": {
+      "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",
+        "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",
@@ -14933,6 +16185,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.0.0",
       "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.0.0.tgz",
@@ -14944,24 +16202,25 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+          "version": "6.12.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
+          "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^2.0.1",
+            "fast-deep-equal": "^3.1.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==",
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
+          "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
           "dev": true,
           "requires": {
-            "ajv": "^6.10.2",
+            "@types/json-schema": "^7.0.4",
+            "ajv": "^6.12.2",
             "ajv-keywords": "^3.4.1"
           }
         }
@@ -14995,6 +16254,12 @@
             "path-is-absolute": "^1.0.0"
           }
         },
+        "sax": {
+          "version": "0.5.8",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz",
+          "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=",
+          "dev": true
+        },
         "source-map": {
           "version": "0.1.43",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
@@ -15162,14 +16427,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": {
@@ -15258,9 +16580,9 @@
       }
     },
     "terser": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.1.4.tgz",
-      "integrity": "sha512-+ZwXJvdSwbd60jG0Illav0F06GDJF0R4ydZ21Q3wGAFKoBGyJGo34F63vzJHgvYxc1ukOtIjvwEvl9MkjzM6Pg==",
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.3.tgz",
+      "integrity": "sha512-Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",
@@ -15277,16 +16599,16 @@
       }
     },
     "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": "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": "^1.7.0",
+        "serialize-javascript": "^2.1.2",
         "source-map": "^0.6.1",
         "terser": "^4.1.2",
         "webpack-sources": "^1.4.0",
@@ -15345,9 +16667,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": {
@@ -15397,10 +16719,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=",
-      "dev": true
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
     },
     "to-object-path": {
       "version": "0.3.0",
@@ -15458,25 +16779,17 @@
     "toidentifier": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
-      "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==",
-      "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
-        }
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "dev": true
+    },
+    "tough-cookie": {
+      "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.28",
+        "punycode": "^2.1.1"
       }
     },
     "transformation-matrix": {
@@ -15485,9 +16798,10 @@
       "integrity": "sha512-ThJH58GNFKhCw3gIoOtwf3tNwuYjbyEeiGdeq4mNMYWdJctnI896KUqn6PVt7jmNVepqa1bcKQtnMB1HtjsDMA=="
     },
     "tree-kill": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz",
-      "integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q=="
+      "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
     },
     "trim-right": {
       "version": "1.0.1",
@@ -15505,12 +16819,32 @@
         "loader-utils": "^1.0.2",
         "micromatch": "^3.1.4",
         "semver": "^5.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==",
+          "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==",
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        }
       }
     },
     "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",
@@ -15536,6 +16870,14 @@
         "strip-bom": "^3.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==",
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
         "strip-bom": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
@@ -15554,33 +16896,20 @@
       }
     },
     "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
-        }
-      }
+      "version": "0.37.1",
+      "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.37.1.tgz",
+      "integrity": "sha512-0GwgOJEnsmRsrONXCvcbAWY0CvdqF3UugPVoupUpA8Ul0qCPTuqqq0ou/hLqtKZOyyulzCP6MYRjb9/J1g9bJg==",
+      "dev": true
     },
     "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": "5.20.0",
-      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.0.tgz",
-      "integrity": "sha512-2vqIvkMHbnx8acMogAERQ/IuINOq6DFqgF8/VDvhEkBqQh/x6SP0Y+OHnKth9/ZcHQSroOZwUQSN18v8KKF0/g==",
+      "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",
@@ -15652,9 +16981,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": {
@@ -15755,14 +17084,14 @@
       }
     },
     "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=="
     },
     "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=="
     },
     "union-value": {
       "version": "1.0.1",
@@ -16050,16 +17379,6 @@
         "object.getownpropertydescriptors": "^2.0.3"
       }
     },
-    "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==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.2",
-        "object.getownpropertydescriptors": "^2.0.3"
-      }
-    },
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -16192,9 +17511,9 @@
       "dev": true
     },
     "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": {
@@ -16204,14 +17523,173 @@
       "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.7.2",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz",
+      "integrity": "sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==",
       "dev": true,
       "requires": {
-        "chokidar": "^2.0.2",
+        "chokidar": "^3.4.0",
         "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
+        "neo-async": "^2.5.0",
+        "watchpack-chokidar2": "^2.0.0"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+          "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "normalize-path": "^3.0.0",
+            "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,
+          "optional": 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,
+          "optional": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "chokidar": {
+          "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,
+          "optional": 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.4.0"
+          }
+        },
+        "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,
+          "optional": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "fsevents": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+          "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+          "dev": true,
+          "optional": 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,
+          "optional": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        },
+        "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,
+          "optional": true,
+          "requires": {
+            "binary-extensions": "^2.0.0"
+          }
+        },
+        "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,
+          "optional": true
+        },
+        "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,
+          "optional": true
+        },
+        "readdirp": {
+          "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,
+          "optional": true,
+          "requires": {
+            "picomatch": "^2.2.1"
+          }
+        },
+        "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,
+          "optional": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
+      }
+    },
+    "watchpack-chokidar2": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
+      "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chokidar": "^2.1.8"
+      },
+      "dependencies": {
+        "chokidar": {
+          "version": "2.1.8",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+          "dev": true,
+          "optional": 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,
+          "optional": true
+        }
       }
     },
     "wbuf": {
@@ -16281,21 +17759,19 @@
       },
       "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==",
+        "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": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
+            "errno": "^0.1.3",
+            "readable-stream": "^2.0.1"
           }
         }
       }
@@ -16328,61 +17804,72 @@
       }
     },
     "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",
-          "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+          "version": "2.4.6",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
+          "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
           "dev": true
         }
       }
     },
     "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.9.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.9.0.tgz",
+      "integrity": "sha512-E6uQ4kRrTX9URN9s/lIbqTAztwEPdvzVrcmHE8EQ9YnuT9J8Es5Wrd8n9BKg1a0oZ5EgEke/EQFgUsp18dSTBw==",
       "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.4",
         "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"
@@ -16445,6 +17932,15 @@
             "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",
@@ -16466,6 +17962,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",
@@ -16500,6 +18006,30 @@
             "mem": "^4.0.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": "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
+        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -16617,12 +18147,12 @@
       }
     },
     "websocket-driver": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz",
-      "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==",
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
+      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
       "dev": true,
       "requires": {
-        "http-parser-js": ">=0.4.0 <0.4.11",
+        "http-parser-js": ">=0.5.1",
         "safe-buffer": ">=5.1.0",
         "websocket-extensions": ">=0.1.1"
       }
@@ -16777,22 +18307,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": {
@@ -16819,9 +18340,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.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",
@@ -16923,9 +18444,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 558a6f881c..084278db93 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stratos",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "Stratos Console",
   "main": "index.js",
   "scripts": {
diff --git a/protractor.conf.js b/protractor.conf.js
index 5c7242d12d..b886d8d400 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'
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;
   }
diff --git a/src/jetstream/authuaa.go b/src/jetstream/authuaa.go
index 63b152eab4..2fee5c0eb4 100644
--- a/src/jetstream/authuaa.go
+++ b/src/jetstream/authuaa.go
@@ -435,14 +435,11 @@ func (p *portalProxy) RefreshUAAToken(userGUID string) (t interfaces.TokenRecord
 // We use a single callback so this can be whitelisted in the client
 func (p *portalProxy) ssoLoginToUAA(c echo.Context) error {
 	state := c.QueryParam("state")
-	if len(state) == 0 {
-		err := interfaces.NewHTTPShadowError(
-			http.StatusUnauthorized,
-			"SSO Login: State parameter missing",
-			"SSO Login: State parameter missing")
-		return err
-	}
 
+	stateErr := validateSSORedirectState(state, p.Config.SSOWhiteList)
+	if stateErr != nil {
+		return stateErr
+	}
 	// We use the same callback URL for both UAA and endpoint login
 	// Check if it is an endpoint login and dens to the right handler
 	endpointGUID := c.QueryParam("guid")
@@ -466,6 +463,7 @@ func (p *portalProxy) ssoLoginToUAA(c echo.Context) error {
 		state = fmt.Sprintf("%s/login?SSO_Message=%s", state, url.QueryEscape(msg))
 	}
 
+
 	return c.Redirect(http.StatusTemporaryRedirect, state)
 }
 
@@ -519,15 +517,25 @@ func (p *portalProxy) initSSOlogin(c echo.Context) error {
 	}
 
 	state := c.QueryParam("state")
+	stateErr := validateSSORedirectState(state, p.Config.SSOWhiteList)
+	if stateErr != nil {
+		return stateErr
+	}
+
+	redirectURL := fmt.Sprintf("%s/oauth/authorize?response_type=code&client_id=%s&redirect_uri=%s", p.Config.ConsoleConfig.AuthorizationEndpoint, p.Config.ConsoleConfig.ConsoleClient, url.QueryEscape(getSSORedirectURI(state, state, "")))
+	c.Redirect(http.StatusTemporaryRedirect, redirectURL)
+	return nil
+}
+
+func validateSSORedirectState(state string, whiteListStr string) error {
 	if len(state) == 0 {
 		err := interfaces.NewHTTPShadowError(
 			http.StatusUnauthorized,
-			"SSO Login: Redirect state parameter missing",
-			"SSO Login: Redirect state parameter missing")
+			"SSO Login: State parameter missing",
+			"SSO Login: State parameter missing")
 		return err
 	}
-
-	if !safeSSORedirectState(state, p.Config.SSOWhiteList) {
+	if !safeSSORedirectState(state,whiteListStr) {
 		err := interfaces.NewHTTPShadowError(
 			http.StatusUnauthorized,
 			"SSO Login: Disallowed redirect state",
@@ -535,8 +543,6 @@ func (p *portalProxy) initSSOlogin(c echo.Context) error {
 		return err
 	}
 
-	redirectURL := fmt.Sprintf("%s/oauth/authorize?response_type=code&client_id=%s&redirect_uri=%s", p.Config.ConsoleConfig.AuthorizationEndpoint, p.Config.ConsoleConfig.ConsoleClient, url.QueryEscape(getSSORedirectURI(state, state, "")))
-	c.Redirect(http.StatusTemporaryRedirect, redirectURL)
 	return nil
 }
 

From 0bb63256548f93941c67bd300007671e148ad4f5 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Thu, 4 Jun 2020 11:59:34 +0100
Subject: [PATCH 523/648] Close stream

---
 src/jetstream/plugins/kubernetes/terminal/start.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/jetstream/plugins/kubernetes/terminal/start.go b/src/jetstream/plugins/kubernetes/terminal/start.go
index 3a228b025b..d0ac6ac276 100644
--- a/src/jetstream/plugins/kubernetes/terminal/start.go
+++ b/src/jetstream/plugins/kubernetes/terminal/start.go
@@ -192,6 +192,7 @@ func pumpStdout(ws *websocket.Conn, source *websocket.Conn, done chan bool) {
 		_, r, err := source.ReadMessage()
 		if err != nil {
 			// Close
+			ws.Close()
 			done <- true
 			break
 		}
@@ -199,6 +200,7 @@ func pumpStdout(ws *websocket.Conn, source *websocket.Conn, done chan bool) {
 		bytes := fmt.Sprintf("% x\n", r[1:])
 		if err := ws.WriteMessage(websocket.TextMessage, []byte(bytes)); err != nil {
 			log.Errorf("Kubernetes Terminal failed to write message: %+v", err)
+			ws.Close()
 			break
 		}
 	}

From 745ae4b772970ef6087e3d2732e81ff7b10521fe Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Thu, 4 Jun 2020 13:49:52 +0100
Subject: [PATCH 524/648] Run container as stratos user

---
 .../kube-terminal/Dockerfile.kubeconsole      | 22 +++++++++++++++----
 .../kube-terminal/kubeconsole.bashrc          | 16 +++++++-------
 .../plugins/kubernetes/terminal/helpers.go    |  2 +-
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/deploy/containers/kube-terminal/Dockerfile.kubeconsole b/deploy/containers/kube-terminal/Dockerfile.kubeconsole
index 19f55f08b4..e62753397e 100644
--- a/deploy/containers/kube-terminal/Dockerfile.kubeconsole
+++ b/deploy/containers/kube-terminal/Dockerfile.kubeconsole
@@ -2,8 +2,6 @@ FROM splatform/stratos-bk-build-base:leap15_1 as terminal-builder
 USER root
 WORKDIR /root
 
-#RUN zypper in -y tar
-
 # Kubectl versions
 RUN curl -L -o kubectl_1.18 https://storage.googleapis.com/kubernetes-release/release/v1.18.2/bin/linux/amd64/kubectl
 RUN curl -L -o kubectl_1.17 https://storage.googleapis.com/kubernetes-release/release/v1.17.5/bin/linux/amd64/kubectl
@@ -34,7 +32,23 @@ RUN mkdir /stratos
 COPY --from=terminal-builder /root/helm.gz /stratos/helm.gz
 COPY --from=terminal-builder /root/kubectl* /stratos/
 
-ADD ./kubeconsole.bashrc /root/.bashrc
-WORKDIR /root
+# Run as user 'stratos'
+RUN useradd -ms /bin/bash stratos -K MAIL_DIR=/dev/null
+
+RUN chown -R stratos /stratos && \
+    chgrp -R users /stratos
+
+# Remove a few packages
+RUN zypper rm -y diffutils shadow util-linux fillup python3 openssl bind-utils kmod \
+    python3-base python-rpm-macros pkg-config hostname GeoIP-data
+
+# Remove zypper
+RUN zypper rm -y dirmngr && \
+    rm -rf /usr/bin/rpm*
+
+USER stratos
+WORKDIR /home/stratos
+
+ADD ./kubeconsole.bashrc /home/stratos/.bashrc
 
 CMD exec /bin/bash -c "trap : TERM INT; sleep infinity & wait"
diff --git a/deploy/containers/kube-terminal/kubeconsole.bashrc b/deploy/containers/kube-terminal/kubeconsole.bashrc
index 362fc54adc..e71545ed5a 100644
--- a/deploy/containers/kube-terminal/kubeconsole.bashrc
+++ b/deploy/containers/kube-terminal/kubeconsole.bashrc
@@ -12,7 +12,7 @@ echo -e "${CYAN}Kubernetes Terminal${RESET}"
 echo ""
 
 # Only do these on first run
-if [ ! -f "/root/.stratos/firstrun" ]; then
+if [ ! -f "/stratos/.firstrun" ]; then
   # Unpack helm comand
   gunzip /stratos/helm.gz
 
@@ -38,7 +38,7 @@ fi
 
 export PATH=/stratos:$PATH
 
-export KUBECONFIG=/root/.stratos/kubeconfig
+export KUBECONFIG=${HOME}/.stratos/kubeconfig
 export PS1="\033[92mstratos>\033[0m"
 alias k=kubectl
 
@@ -47,16 +47,16 @@ source <(helm completion bash)
 
 #helm repo remove stable > /dev/null
 
-if [ ! -f "/root/.stratos/firstrun" ]; then
-  if [ -f "/root/.stratos/helm-setup" ]; then
+if [ ! -f "/stratos/.firstrun" ]; then
+  if [ -f "${HOME}/.stratos/helm-setup" ]; then
     echo "Setting up Helm repositories ..."
-    source  "/root/.stratos/helm-setup" > /dev/null
+    source  "${HOME}/.stratos/helm-setup" > /dev/null
     helm repo update 2>&1 > /dev/null
     echo ""
   fi
 
-  if [ -f "/root/.stratos/history" ]; then
-    cat /root/.stratos/history > /root/.bash_history
+  if [ -f "${HOME}/.stratos/history" ]; then
+    cat ${HOME}/.stratos/history > ${HOME}/.bash_history
   fi
 fi
 
@@ -67,7 +67,7 @@ PROMPT_COMMAND='history -a'
 # Don't put duplicate lines in the history.
 export HISTCONTROL=ignoredups
 
-touch /root/.stratos/firstrun
+touch "/stratos/.firstrun"
 
 # Remove any env vars matching KUBERNETES
 unset `compgen -A variable | grep KUBERNETES`
diff --git a/src/jetstream/plugins/kubernetes/terminal/helpers.go b/src/jetstream/plugins/kubernetes/terminal/helpers.go
index 8cc58caf43..b34caf9a9a 100644
--- a/src/jetstream/plugins/kubernetes/terminal/helpers.go
+++ b/src/jetstream/plugins/kubernetes/terminal/helpers.go
@@ -126,7 +126,7 @@ func (k *KubeTerminal) createPod(c echo.Context, kubeConfig, kubeVersion string,
 	
 	volumeMountsSpec := make([]v1.VolumeMount, 1)
 	volumeMountsSpec[0].Name = "kubeconfig"
-	volumeMountsSpec[0].MountPath = "/root/.stratos"
+	volumeMountsSpec[0].MountPath = "/home/stratos/.stratos"
 	volumeMountsSpec[0].ReadOnly = true
 
 	containerSpec := make([]v1.Container, 1)

From 108f3e243c386f47eed5b2139ced7ccc8544560a Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Thu, 4 Jun 2020 14:38:15 +0100
Subject: [PATCH 525/648] Fix image build

---
 deploy/common-build.sh                           |  6 +-----
 .../kube-terminal/Dockerfile.kubeconsole         | 16 ++++++++++------
 deploy/kubernetes/build.sh                       |  5 +++--
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/deploy/common-build.sh b/deploy/common-build.sh
index 11fb464ddc..6f29c55d1e 100644
--- a/deploy/common-build.sh
+++ b/deploy/common-build.sh
@@ -55,9 +55,7 @@ if [ -n "${https_proxy:-}" -o -n "${HTTPS_PROXY:-}" ]; then
 fi
 
 # Check if we can squash
-echo "checking"
-CAN_SQUASH=$(docker info 2>&1 | grep "Experimental: true" | cat)
-echo "check"
+CAN_SQUASH=$(docker info 2>&1 | grep "Experimental: true" -c | cat)
 if [ "${CAN_SQUASH}" == "1" ]; then
   BUILD_ARGS="${BUILD_ARGS} --squash"
   echo "Images will be squashed"
@@ -65,8 +63,6 @@ else
   echo "Images will NOT be squashed"
 fi
 
-echo "OK"
-
 # Use correct sed command for Mac
 SED="sed -r"
 unamestr=`uname`
diff --git a/deploy/containers/kube-terminal/Dockerfile.kubeconsole b/deploy/containers/kube-terminal/Dockerfile.kubeconsole
index e62753397e..1872e5abb0 100644
--- a/deploy/containers/kube-terminal/Dockerfile.kubeconsole
+++ b/deploy/containers/kube-terminal/Dockerfile.kubeconsole
@@ -5,13 +5,15 @@ WORKDIR /root
 # Kubectl versions
 RUN curl -L -o kubectl_1.18 https://storage.googleapis.com/kubernetes-release/release/v1.18.2/bin/linux/amd64/kubectl
 RUN curl -L -o kubectl_1.17 https://storage.googleapis.com/kubernetes-release/release/v1.17.5/bin/linux/amd64/kubectl
-#RUN curl -L -o kubectl_1.16 https://storage.googleapis.com/kubernetes-release/release/v1.16.9/bin/linux/amd64/kubectl
-#RUN curl -L -o kubectl_1.15 https://storage.googleapis.com/kubernetes-release/release/v1.15.11/bin/linux/amd64/kubectl
+RUN curl -L -o kubectl_1.16 https://storage.googleapis.com/kubernetes-release/release/v1.16.9/bin/linux/amd64/kubectl
+RUN curl -L -o kubectl_1.15 https://storage.googleapis.com/kubernetes-release/release/v1.15.11/bin/linux/amd64/kubectl
 RUN curl -L -o kubectl_1.14 https://storage.googleapis.com/kubernetes-release/release/v1.14.10/bin/linux/amd64/kubectl
 
 # Tar each one up, to save space in the image
 RUN gzip kubectl_1.18
 RUN gzip kubectl_1.17
+RUN gzip kubectl_1.16
+RUN gzip kubectl_1.15
 RUN gzip kubectl_1.14
 
 # Fetch Helm 3 package
@@ -21,9 +23,12 @@ RUN curl -L -o helm.tar.gz https://get.helm.sh/helm-v3.1.2-linux-amd64.tar.gz &&
 
 RUN ls -al
 
-FROM splatform/stratos-bk-init-base:leap15_1
+# Use small base image with very little in it
+FROM splatform/stratos-base:leap15_1
 
-RUN zypper in -y gzip
+# Use gzip from the builder image
+COPY --from=terminal-builder /usr/bin/gunzip /usr/bin/
+COPY --from=terminal-builder /usr/bin/gzip /usr/bin/
 
 RUN mkdir /stratos
 
@@ -39,8 +44,7 @@ RUN chown -R stratos /stratos && \
     chgrp -R users /stratos
 
 # Remove a few packages
-RUN zypper rm -y diffutils shadow util-linux fillup python3 openssl bind-utils kmod \
-    python3-base python-rpm-macros pkg-config hostname GeoIP-data
+RUN zypper rm -y diffutils shadow fillup openssl
 
 # Remove zypper
 RUN zypper rm -y dirmngr && \
diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
index 63cc4a0f63..a9eb81afe3 100755
--- a/deploy/kubernetes/build.sh
+++ b/deploy/kubernetes/build.sh
@@ -169,11 +169,10 @@ function patchDockerfile {
   if [ "${DOCKER_REG_DEFAULTS}" == "false" ]; then
     sed -i.bak "s@splatform@${DOCKER_REGISTRY}/${DOCKER_ORG}@g" "${FOLDER}/${PATCHED_DOCKER_FILE}"
   fi
-  sed -i.bak "s/opensuse/${BASE_IMAGE_TAG}/g" "${FOLDER}/${PATCHED_DOCKER_FILE}"
+  sed -i.bak "s/leap15_1/${BASE_IMAGE_TAG}/g" "${FOLDER}/${PATCHED_DOCKER_FILE}"
   popd > /dev/null 2>&1
 }
 
-
 #
 # MAIN -------------------------------------------------------------------------------------------
 #
@@ -219,6 +218,8 @@ if [ "${CHART_ONLY}" == "false" ]; then
   fi
 fi
 
+custom_image_build
+
 log "-- Building Helm Chart"
 
 # Don't change the chart in the repo, copy it and modify it locally

From 7af08f21a2ff8b7e310863dca141ae99b62fe503 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Thu, 4 Jun 2020 14:41:54 +0100
Subject: [PATCH 526/648] Reanme docker file and add image to CI pipeline

---
 custom-src/deploy/kubernetes/custom-build.sh      |  2 +-
 deploy/ci/suse-console-dev-releases.yml           | 15 ++++++++++++++-
 ...erfile.kubeconsole => Dockerfile.kubeterminal} |  0
 3 files changed, 15 insertions(+), 2 deletions(-)
 rename deploy/containers/kube-terminal/{Dockerfile.kubeconsole => Dockerfile.kubeterminal} (100%)

diff --git a/custom-src/deploy/kubernetes/custom-build.sh b/custom-src/deploy/kubernetes/custom-build.sh
index 14e129d336..35d6202755 100644
--- a/custom-src/deploy/kubernetes/custom-build.sh
+++ b/custom-src/deploy/kubernetes/custom-build.sh
@@ -24,5 +24,5 @@ function custom_image_build() {
 
   # Build and push an image for the Kubernetes Terminal
   log "-- Building/publishing Kubernetes Terminal"
-  patchAndPushImage stratos-kube-terminal Dockerfile.kubeconsole "${STRATOS_PATH}/deploy/containers/kube-terminal"
+  patchAndPushImage stratos-kube-terminal Dockerfile.kubeterminal "${STRATOS_PATH}/deploy/containers/kube-terminal"
 }
\ No newline at end of file
diff --git a/deploy/ci/suse-console-dev-releases.yml b/deploy/ci/suse-console-dev-releases.yml
index 82b15b962c..ef2247a720 100644
--- a/deploy/ci/suse-console-dev-releases.yml
+++ b/deploy/ci/suse-console-dev-releases.yml
@@ -65,7 +65,13 @@ resources:
     username: ((docker-username))
     password: ((docker-password))
     repository: ((docker-repository))/stratos-chartsync
-
+- name: kube-terminal-image
+    type: docker-image
+    source:
+      username: ((docker-username))
+      password: ((docker-password))
+      repository: ((docker-repository))/stratos-kube-terminal
+  
 # Artifacts
 - name: image-tag
   type: s3
@@ -147,6 +153,13 @@ jobs:
           tag: image-tag/v2-alpha-tag
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))
+      - put: kube-terminal-image
+        params:
+          dockerfile: stratos/deploy/containers/kube-terminal/Dockerfile.kubeterminal
+          build: stratos/deploy/containers/kube-terminal
+          tag: image-tag/v2-alpha-tag
+          patch_base_reg: ((patch-base-reg))
+          patch_base_tag: ((patch-base-tag))
     - do: 
       - put: ui-image
         params:
diff --git a/deploy/containers/kube-terminal/Dockerfile.kubeconsole b/deploy/containers/kube-terminal/Dockerfile.kubeterminal
similarity index 100%
rename from deploy/containers/kube-terminal/Dockerfile.kubeconsole
rename to deploy/containers/kube-terminal/Dockerfile.kubeterminal

From b935ca47a2a6a7823d67dd64e0e49614d36beac0 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Mon, 8 Jun 2020 11:49:06 +0100
Subject: [PATCH 527/648] Allow fork to add images to the imagelist file

---
 custom-src/deploy/kubernetes/imagelist.txt |  1 +
 deploy/common-build.sh                     |  1 -
 deploy/kubernetes/build.sh                 |  6 +++---
 deploy/kubernetes/imagelist-gen.sh         | 20 ++++++++++++++++++++
 4 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 custom-src/deploy/kubernetes/imagelist.txt

diff --git a/custom-src/deploy/kubernetes/imagelist.txt b/custom-src/deploy/kubernetes/imagelist.txt
new file mode 100644
index 0000000000..e628bfa984
--- /dev/null
+++ b/custom-src/deploy/kubernetes/imagelist.txt
@@ -0,0 +1 @@
+stratos-kube-terminal:_VERSION_
\ No newline at end of file
diff --git a/deploy/common-build.sh b/deploy/common-build.sh
index 6f29c55d1e..913c159a17 100644
--- a/deploy/common-build.sh
+++ b/deploy/common-build.sh
@@ -113,7 +113,6 @@ function cleanup {
   echo "-- Cleaning up ${STRATOS_PATH}"
   rm -rf ${STRATOS_PATH}/dist
   rm -rf ${STRATOS_PATH}/node_modules
-  rm -rf ${STRATOS_PATH}/bower_components
   echo
   echo "-- Cleaning up ${STRATOS_PATH}/deploy/containers/nginx/dist"
   rm -rf ${STRATOS_PATH}/deploy/containers/nginx/dist
diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
index a9eb81afe3..1b19bf1408 100755
--- a/deploy/kubernetes/build.sh
+++ b/deploy/kubernetes/build.sh
@@ -183,7 +183,9 @@ popd > /dev/null 2>&1
 echo "Base path: ${STRATOS_PATH}"
 
 # cleanup output, intermediate artifacts
-cleanup
+if [ "${CHART_ONLY}" == "false" ]; then
+  cleanup
+fi
 
 # Clean any old patched docker files left if previously errored
 # rm -rf ${STRATOS_PATH}/deploy/Dockerfile.*.patched
@@ -218,8 +220,6 @@ if [ "${CHART_ONLY}" == "false" ]; then
   fi
 fi
 
-custom_image_build
-
 log "-- Building Helm Chart"
 
 # Don't change the chart in the repo, copy it and modify it locally
diff --git a/deploy/kubernetes/imagelist-gen.sh b/deploy/kubernetes/imagelist-gen.sh
index 293c1a7ba4..5f42571609 100755
--- a/deploy/kubernetes/imagelist-gen.sh
+++ b/deploy/kubernetes/imagelist-gen.sh
@@ -12,6 +12,22 @@ __DIRNAME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 printf "${BOLD}${CYAN}Generating ${YELLOW}imagelist.txt${RESET}\n"
 echo ""
 
+STRATOS_FOLDER="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd ../../ && pwd )"
+
+# Add any customizations
+function addCustomizations() {
+
+  if [ -f "${STRATOS_FOLDER}/custom-src/deploy/kubernetes/imagelist.txt" ];then
+    echo "Including custom imagelist contents"
+    cat "${STRATOS_FOLDER}/custom-src/deploy/kubernetes/imagelist.txt" >> ./imagelist.txt
+
+    # Update version number
+    VERSION=$(grep -Po 'consoleVersion: \K(.*)' ./values.yaml)
+    echo "Image Version: ${VERSION}"
+    sed -i 's/_VERSION_/'"${VERSION}"'/g' imagelist.txt
+  fi
+}
+
 
 CHART_FOLDER=${1}
 
@@ -37,6 +53,10 @@ ls -alR
 echo ""
 
 helm template -f ${__DIRNAME}/imagelist.values.yaml ${CHART_FOLDER} | grep "image:" | grep --extended --only-matching '([^"/[:space:]]+/)?[^"/[:space:]]+/[^:[:space:]]+:[a-zA-Z0-9\._-]+' | sort | uniq | awk -F'/' '{print $2}' > imagelist.txt
+
+# Add any customizations
+addCustomizations
+
 popd > /dev/null
 
 printf "${CYAN}"

From e6880465cb091eb18cdf887d01bd6c41d262e41b Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 10 Jun 2020 09:42:09 +0100
Subject: [PATCH 528/648] Fix unit tests

---
 .../card-autoscaler-default.component.spec.ts              | 4 +---
 .../cf-app-autoscaler-events-config.service.spec.ts        | 4 +---
 .../app-autoscaler-metric-chart-card.component.spec.ts     | 4 +---
 ...app-autoscaler-metric-chart-list-config.service.spec.ts | 7 +------
 .../packages/core/test-framework/core-test.helper.ts       | 4 +---
 5 files changed, 5 insertions(+), 18 deletions(-)

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 c675dec32c..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
@@ -15,9 +15,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 { AppTestModule } from '../../../../core/test-framework/core-test.helper';
-import {
-  EntityCatalogHelper,
-} from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity/entity-catalog.service';
+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 { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module';
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 4a97c65001..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
@@ -16,9 +16,7 @@ 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 { generateTestEntityServiceProvider } from '../../../../../core/test-framework/entity-service.helper';
-import {
-  EntityCatalogHelper,
-} from '../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity/entity-catalog.service';
+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';
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 f394b9ec93..7f0a6a1cbf 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
@@ -18,7 +18,7 @@ import { ConfirmationDialogService } from '../../../../../../core/src/shared/com
 import { AppTestModule } from '../../../../../../core/test-framework/core-test.helper';
 import {
   EntityCatalogHelper,
-} from '../../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity/entity-catalog.service';
+} 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 { CfAutoscalerTestingModule } from '../../../../cf-autoscaler-testing.module';
@@ -26,8 +26,6 @@ import { AppAutoscalerMetricChartCardComponent } from './app-autoscaler-metric-c
 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', () => {
   let component: 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 fd0a925eb3..4c6669fe61 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
@@ -11,18 +11,13 @@ import {
 } from '../../../../../cloud-foundry/test-framework/application-service-helper';
 import { MetricsRangeSelectorService } from '../../../../../core/src/shared/services/metrics-range-selector.service';
 import { AppTestModule } from '../../../../../core/test-framework/core-test.helper';
-import {
-  EntityCatalogHelper,
-} from '../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity/entity-catalog.service';
+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 */
 
 describe('AppAutoscalerMetricChartListConfigService', () => {
   beforeEach(() => {
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 d9ca7cafe9..99e36a22d7 100644
--- a/src/frontend/packages/core/test-framework/core-test.helper.ts
+++ b/src/frontend/packages/core/test-framework/core-test.helper.ts
@@ -5,9 +5,7 @@ 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-entity/entity-catalog.service';
+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';

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 529/648] 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
+}

From 955c6ff83dabb081079f27ab6a09a758debbdfa7 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 11 Jun 2020 15:08:57 +0100
Subject: [PATCH 530/648] Improve unit tests

---
 custom-src/frontend/app/custom/helm/helm-testing.module.ts     | 2 ++
 .../app/custom/kubernetes/kubernetes.testing.module.ts         | 2 ++
 .../kubernetes-pod-containers.component.ts                     | 3 ---
 3 files changed, 4 insertions(+), 3 deletions(-)

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 be42355419..2bace2cf52 100644
--- a/custom-src/frontend/app/custom/helm/helm-testing.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm-testing.module.ts
@@ -7,6 +7,7 @@ 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';
 import { createBasicStoreModule } from '../../../../store/testing/public-api';
+import { AppTestModule } from '../../../test-framework/core-test.helper';
 import { generateStratosEntities } from '../../base-entity-types';
 import { CoreModule } from '../../core/core.module';
 import { SharedModule } from '../../shared/shared.module';
@@ -54,6 +55,7 @@ export const HelmReleaseGuidMock = {
 };
 
 export const HelmBaseTestModules = [
+  AppTestModule,
   HelmTestingModule,
   RouterTestingModule,
   CoreModule,
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 c87f6368fc..9185564ccb 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
@@ -6,6 +6,7 @@ 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';
 import { createBasicStoreModule } from '../../../../store/testing/public-api';
+import { AppTestModule } from '../../../test-framework/core-test.helper';
 import { generateStratosEntities } from '../../base-entity-types';
 import { CoreModule } from '../../core/core.module';
 import { SharedModule } from '../../shared/shared.module';
@@ -34,6 +35,7 @@ import { HelmReleaseHelperService } from './workloads/release/tabs/helm-release-
 export class KubernetesTestingModule { }
 
 export const KubernetesBaseTestModules = [
+  AppTestModule,
   KubernetesTestingModule,
   RouterTestingModule,
   CoreModule,
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 03295227db..d838567a71 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
@@ -1,11 +1,9 @@
 import { TitleCasePipe } from '@angular/common';
 import { Component, Input } from '@angular/core';
-import { Store } from '@ngrx/store';
 import * as moment from 'moment';
 import { of } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
-import { AppState } from '../../../../../../../store/src/app-state';
 import { BooleanIndicatorType } from '../../../../../shared/components/boolean-indicator/boolean-indicator.component';
 import { ITableListDataSource } from '../../../../../shared/components/list/data-sources-controllers/list-data-source-types';
 import {
@@ -55,7 +53,6 @@ export class KubernetesPodContainersComponent extends CardCell<KubernetesPod> {
   }
 
   constructor(
-    private store: Store<AppState>,
     private titleCase: TitleCasePipe,
   ) {
     super();

From da9610c575ef766950bf5613d63df3c3f05e1dd9 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 12 Jun 2020 14:16:00 +0100
Subject: [PATCH 531/648] Fix issue where no config caused panic

---
 src/jetstream/plugins/kubernetes/main.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index 8cccc03ce4..929c610494 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -55,14 +55,16 @@ const (
 	// kubeDashboardPluginConfigSetting is config value sent back to the client to indicate if the kube dashboard ie enabled
 	kubeDashboardPluginConfigSetting = "kubeDashboardEnabled"
 	// kubeTerminalPluginConfigSetting is config value sent back to the client to indicate if the kube terminal is enabled
-	kubeTerminalPluginConfigSetting ="kubeTerminalEnabled"
+	kubeTerminalPluginConfigSetting = "kubeTerminalEnabled"
 )
 
 // Init creates a new instance of the Kubernetes plugin
 func Init(portalProxy interfaces.PortalProxy) (interfaces.StratosPlugin, error) {
 	kubeTerminal := terminal.NewKubeTerminal(portalProxy)
 	kube := &KubernetesSpecification{portalProxy: portalProxy, endpointType: kubeEndpointType, kubeTerminal: kubeTerminal}
-	kubeTerminal.Kube = kube
+	if kubeTerminal != nil {
+		kubeTerminal.Kube = kube
+	}
 	return kube, nil
 }
 
@@ -143,7 +145,6 @@ func (c *KubernetesSpecification) Init() error {
 	// Kube terminal is enabled by Tech Preview mode
 	c.portalProxy.GetConfig().PluginConfig[kubeTerminalPluginConfigSetting] = strconv.FormatBool(c.portalProxy.GetConfig().EnableTechPreview)
 
-
 	// Kick off the cleanup of any old kube terminal pods
 	c.kubeTerminal.StartCleanup()
 

From fc197cd99fdd46f90fbdf3fce8ef37a8f9fe2e58 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 12 Jun 2020 17:17:52 +0100
Subject: [PATCH 532/648] Changes following review

---
 .../create-release/create-release.component.ts  |  5 -----
 .../app/custom/helm/helm-entity-catalog.ts      |  4 ++--
 .../kubernetes-certs-auth-form.component.scss   |  2 +-
 .../kubernetes/kubernetes-entity-catalog.ts     |  3 ---
 .../kubernetes/kubernetes-entity-factory.ts     |  7 -------
 .../kubernetes/kubernetes-entity-generator.ts   | 17 -----------------
 .../action-builders/kube.action-builders.ts     |  7 -------
 .../app/custom/kubernetes/store/kube.getIds.ts  |  2 +-
 .../kube-namespaces-filter-config.service.ts    |  3 +--
 .../helm-release-tab-base.component.ts          | 14 +++++---------
 .../release/tabs/helm-release-helper.service.ts |  9 ++++-----
 .../workloads/workloads-entity-catalog.ts       |  4 ++--
 .../backup-endpoints.component.html             |  2 ++
 13 files changed, 18 insertions(+), 61 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 42474594ff..45793d2149 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
@@ -3,12 +3,9 @@ import { Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/co
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { MatTextareaAutosize } from '@angular/material/input';
 import { ActivatedRoute } from '@angular/router';
-import { Store } from '@ngrx/store';
 import { BehaviorSubject, combineLatest, Observable, of, Subscription } from 'rxjs';
 import { distinctUntilChanged, filter, first, map, pairwise, startWith, switchMap } from 'rxjs/operators';
 
-import { AppState } from '../../../../../store/src/app-state';
-import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { RequestInfoState } from '../../../../../store/src/reducers/api-request-reducer/types';
 import { EndpointsService } from '../../../core/endpoints.service';
 import { safeUnsubscribe } from '../../../core/utils.service';
@@ -60,10 +57,8 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
   constructor(
     private route: ActivatedRoute,
     public endpointsService: EndpointsService,
-    private store: Store<AppState>,
     private httpClient: HttpClient,
     private confirmDialog: ConfirmationDialogService,
-    private emf: EntityMonitorFactory
   ) {
     const chart = this.route.snapshot.params;
     this.cancelUrl = `/monocular/charts/${chart.repo}/${chart.chartName}/${chart.version}`;
diff --git a/custom-src/frontend/app/custom/helm/helm-entity-catalog.ts b/custom-src/frontend/app/custom/helm/helm-entity-catalog.ts
index cb1bcde3d7..288b527982 100644
--- a/custom-src/frontend/app/custom/helm/helm-entity-catalog.ts
+++ b/custom-src/frontend/app/custom/helm/helm-entity-catalog.ts
@@ -1,7 +1,7 @@
 import { StratosCatalogEndpointEntity, StratosCatalogEntity } from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity'; import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types'; import { MonocularChart, HelmVersion } from './store/helm.types'; import { HelmChartActionBuilders, HelmVersionActionBuilders } from './store/helm.action-builders';
 
 /**
- * A strongly typed collection of Kube Catalog Entities.
+ * A strongly typed collection of Helm Catalog Entities.
  * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc
  */
 export class HelmEntityCatalog {
@@ -11,7 +11,7 @@ export class HelmEntityCatalog {
 }
 
 /**
- * A strongly typed collection of Kube Catalog Entities.
+ * A strongly typed collection of Helm Catalog Entities.
  * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc
  */
 export const helmEntityCatalog: HelmEntityCatalog = new HelmEntityCatalog();
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss
index 23498e9eca..5385ee9711 100644
--- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss
+++ b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss
@@ -14,7 +14,7 @@
 
     &__content {
       & > * {
-        padding-bottom: 10px;
+        margin-bottom: 10px;
       }
       textarea {
         max-height: 75px;
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts
index a59854a6f1..816ab0bd47 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts
@@ -4,7 +4,6 @@ import {
 } from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types';
 import {
-  KubeAppActionBuilders,
   KubeDashboardActionBuilders,
   KubeDeploymentActionBuilders,
   KubeNamespaceActionBuilders,
@@ -14,7 +13,6 @@ import {
   KubeStatefulSetsActionBuilders,
 } from './store/action-builders/kube.action-builders';
 import {
-  KubernetesApp,
   KubernetesDeployment,
   KubernetesNamespace,
   KubernetesNode,
@@ -29,7 +27,6 @@ import {
  */
 export class KubeEntityCatalog {
   public endpoint: StratosCatalogEndpointEntity;
-  public app: StratosCatalogEntity<IFavoriteMetadata, KubernetesApp, KubeAppActionBuilders>;
   public statefulSet: StratosCatalogEntity<IFavoriteMetadata, KubernetesStatefulSet, KubeStatefulSetsActionBuilders>;
   public pod: StratosCatalogEntity<IFavoriteMetadata, KubernetesPod, KubePodActionBuilders>;
   public deployment: StratosCatalogEntity<IFavoriteMetadata, KubernetesDeployment, KubeDeploymentActionBuilders>;
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 2f2892c23a..a30402dfaa 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts
@@ -21,7 +21,6 @@ export const kubernetesNamespacesEntityType = 'kubernetesNamespace';
 export const kubernetesServicesEntityType = 'kubernetesService';
 export const kubernetesStatefulSetsEntityType = 'kubernetesStatefulSet';
 export const kubernetesDeploymentsEntityType = 'kubernetesDeployment';
-export const kubernetesAppsEntityType = 'kubernetesApp';
 export const kubernetesDashboardEntityType = 'kubernetesDashboard';
 
 export const getKubeAppId = (object: KubernetesApp) => object.name;
@@ -57,12 +56,6 @@ entityCache[kubernetesEntityType] = new KubernetesEntitySchema(
   { idAttribute: getAPIResourceGuid }
 );
 
-entityCache[kubernetesAppsEntityType] = new KubernetesEntitySchema(
-  kubernetesAppsEntityType,
-  {},
-  { idAttribute: getKubeAppId }
-);
-
 entityCache[kubernetesStatefulSetsEntityType] = new KubernetesEntitySchema(
   kubernetesStatefulSetsEntityType,
   {},
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 45a20854e0..eac9f993c0 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
@@ -23,7 +23,6 @@ import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth
 import { kubeEntityCatalog } from './kubernetes-entity-catalog';
 import {
   KUBERNETES_ENDPOINT_TYPE,
-  kubernetesAppsEntityType,
   kubernetesDashboardEntityType,
   kubernetesDeploymentsEntityType,
   kubernetesEntityFactory,
@@ -34,8 +33,6 @@ import {
   kubernetesStatefulSetsEntityType,
 } from './kubernetes-entity-factory';
 import {
-  KubeAppActionBuilders,
-  kubeAppActionBuilders,
   KubeDashboardActionBuilders,
   kubeDashboardActionBuilders,
   KubeDeploymentActionBuilders,
@@ -52,7 +49,6 @@ import {
   kubeStatefulSetsActionBuilders,
 } from './store/action-builders/kube.action-builders';
 import {
-  KubernetesApp,
   KubernetesDeployment,
   KubernetesNamespace,
   KubernetesNode,
@@ -161,7 +157,6 @@ export function generateKubernetesEntities(): StratosBaseCatalogEntity[] {
   };
   return [
     generateEndpointEntity(endpointDefinition),
-    generateAppEntity(endpointDefinition),
     generateStatefulSetsEntity(endpointDefinition),
     generatePodsEntity(endpointDefinition),
     generateDeploymentsEntity(endpointDefinition),
@@ -182,18 +177,6 @@ function generateEndpointEntity(endpointDefinition: StratosEndpointExtensionDefi
   return kubeEntityCatalog.endpoint;
 }
 
-function generateAppEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition: IStratosEntityDefinition = {
-    type: kubernetesAppsEntityType,
-    schema: kubernetesEntityFactory(kubernetesAppsEntityType),
-    endpoint: endpointDefinition,
-  };
-  kubeEntityCatalog.app = new StratosCatalogEntity<IFavoriteMetadata, KubernetesApp, KubeAppActionBuilders>(definition, {
-    actionBuilders: kubeAppActionBuilders
-  });
-  return kubeEntityCatalog.app;
-}
-
 function generateStatefulSetsEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   const definition: IStratosEntityDefinition = {
     type: kubernetesStatefulSetsEntityType,
diff --git a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts
index 51f1bc53c9..58ad75827c 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts
@@ -20,13 +20,6 @@ import {
   KubeHealthCheck,
 } from '../kubernetes.actions';
 
-export interface KubeAppActionBuilders extends OrchestratedActionBuilders {
-
-}
-
-export const kubeAppActionBuilders: KubeAppActionBuilders = {
-}
-
 export interface KubeStatefulSetsActionBuilders extends OrchestratedActionBuilders {
   getMultiple: (
     kubeGuid: string,
diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts
index 6639f6f509..ef66c673df 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts
@@ -1,4 +1,4 @@
-import { environment } from '../../../environments/environment.prod';
+import { environment } from '../../../environments/environment';
 import {
   BasicKubeAPIResource,
   KubernetesDeployment,
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 fe9ca2f1e3..846848fc7a 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
@@ -36,7 +36,6 @@ export class KubernetesNamespacesFilterService implements OnDestroy {
   public kube: KubernetesNamespacesFilterItem<EndpointModel>;
   public namespace: KubernetesNamespacesFilterItem<KubernetesNamespace>;
 
-  // private isLoading$: Observable<boolean>;
   private subs: Subscription[] = [];
 
   private allNamespaces = this.getNamespacesObservable();
@@ -50,7 +49,7 @@ export class KubernetesNamespacesFilterService implements OnDestroy {
     this.kube = this.createKube();
     this.namespace = this.createNamespace();
 
-    // Start watching the cf/org/space plus automatically setting values only when we actually have values to auto select
+    // Start watching the namespace plus automatically setting values only when we actually have values to auto select
     this.namespace.list$.pipe(first()).subscribe(() => this.setupAutoSelectors());
   }
 
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 7f8e317b9a..3c62493c90 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
@@ -104,11 +104,7 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
           prefix = messageObj.data;
         } else if (messageObj.kind === 'Pods') {
           const pods: KubernetesPod[] = messageObj.data || [];
-          const podsWithInfo: KubernetesPod[] = pods.map(pod => {
-            const res = KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(pod);
-            res.metadata.kubeId = this.helmReleaseHelper.endpointGuid;
-            return res;
-          });
+          const podsWithInfo: KubernetesPod[] = pods.map(pod => KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(pod));
           const releasePodsAction = kubeEntityCatalog.pod.actions.getInWorkload(
             this.helmReleaseHelper.endpointGuid,
             this.helmReleaseHelper.releaseTitle
@@ -127,7 +123,6 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
           // Store ALL resources for the release
           manifest.forEach(resource => {
             if (resource.kind === 'Service' && prefix) {
-              resource.metadata.kubeId = this.helmReleaseHelper.endpointGuid;
               svcs.push(resource);
             }
           });
@@ -170,7 +165,6 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
 
   private populateList(action: KubePaginationAction, resources: any) {
     const entity = entityCatalog.getEntity(action);
-    const entityKey = entity.entityKey;
     const newResources = {};
     resources.forEach(resource => {
       const newResource: HelmReleasePod | HelmReleaseService = {
@@ -179,12 +173,14 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
         ...resource
       };
       newResource.metadata.kubeId = action.kubeGuid;
-      const entityId = entity.getSchema(action.schemaKey).getId(resource)
+      // The service entity from manifest is missing this, but apply here to ensure any others are caught
+      newResource.metadata.namespace = this.helmReleaseHelper.namespace;
+      const entityId = action.entity[0].getId(resource)
       newResources[entityId] = newResource;
     });
 
     const releasePods = {
-      entities: { [entityKey]: newResources },
+      entities: { [entity.entityKey]: newResources },
       result: Object.keys(newResources)
     };
     const successWrapper = new WrapperRequestActionSuccess(releasePods, action, 'fetch', releasePods.result.length, 1);
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 0f193ea044..bcdef4478b 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
@@ -71,11 +71,10 @@ export class HelmReleaseHelperService {
 
   public fetchReleaseResources(): Observable<HelmReleaseResource> {
     // Get helm release
-    return workloadsEntityCatalog.resource.store.getPaginationMonitor(
-      this.endpointGuid,
-      null,
-      { releaseTitle: this.releaseTitle }
-    ).currentPage$.pipe(
+    const action = workloadsEntityCatalog.resource.actions.get(this.releaseTitle, this.endpointGuid)
+    return workloadsEntityCatalog.resource.store.getEntityMonitor(
+      action.guid
+    ).entity$.pipe(
       filter(resources => !!resources)
     );
   }
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workloads-entity-catalog.ts b/custom-src/frontend/app/custom/kubernetes/workloads/workloads-entity-catalog.ts
index ba37ba0821..06d3a33c04 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/workloads-entity-catalog.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/workloads-entity-catalog.ts
@@ -4,7 +4,7 @@ import { WorkloadGraphBuilders, WorkloadReleaseBuilders, WorkloadResourceBuilder
 import { HelmRelease, HelmReleaseGraph, HelmReleaseResource } from './workload.types';
 
 /**
- * A strongly typed collection of Kube Catalog Entities.
+ * A strongly typed collection of Workload Catalog Entities.
  * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc
  */
 export class WorkloadsEntityCatalog {
@@ -14,7 +14,7 @@ export class WorkloadsEntityCatalog {
 }
 
 /**
- * A strongly typed collection of Kube Catalog Entities.
+ * A strongly typed collection of Workload Catalog Entities.
  * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc
  */
 export const workloadsEntityCatalog: WorkloadsEntityCatalog = new WorkloadsEntityCatalog();
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 f11198e59d..b86b52acc0 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
@@ -14,6 +14,8 @@ <h1>Backup Endpoints</h1>
         <button mat-raised-button color="primary" [disabled]="disableSelectNone$ | async"
           (click)="service.selectNone()">Select None</button>
       </div>
+      <!-- 77px is the min height given Connection details drop down. In some cases it's missing, those rows would be
+      shorter without the min height here -->
       <app-table [dataSource]="endpointDataSource" [columns]="columns" [minRowHeight]="'77px'"></app-table>
     </div>
     <ng-template #noEndpoints>

From da6eb12e27c7f051f98987c307e9b25cdaac5d2a Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 12 Jun 2020 18:53:23 +0100
Subject: [PATCH 533/648] Workload Summary Pod/Container Ring Chart Fixes - fix
 expanded pod status when there are terminated containers - in container
 ready/not ready count ignore containers that were terminated succesfully -
 sort pod status labels in pod status ring chart to reduce values switching

---
 .../services/kubernetes-expanded-state.ts     |  5 ++--
 .../tabs/helm-release-helper.service.ts       | 23 +++++++++++++++----
 .../helm-release-summary-tab.component.ts     | 12 ++++++++--
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-expanded-state.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-expanded-state.ts
index 27dbc5e627..89bbad518f 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-expanded-state.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-expanded-state.ts
@@ -96,10 +96,9 @@ export class KubernetesPodExpandedStatusHelper {
           reason = state.waiting.reason;
         } else if (!!state.terminated) {
           reason = state.terminated.reason;
-        } else if (!!state.terminated) {
-          if (state.terminated.signal !== 0) {
+          if (!!state.terminated.signal && state.terminated.signal !== 0) {
             reason = `Signal:${state.terminated.signal}`;
-          } else {
+          } else if (!!state.terminated.exitCode && state.terminated.exitCode !== 0) {
             reason = `ExitCode:${state.terminated.exitCode}`;
           }
         } else if (!!container.ready && !!state.running) {
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 bcdef4478b..7ff04b0f07 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
@@ -3,7 +3,7 @@ import { Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
 import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog';
-import { KubernetesPod } from '../../../store/kube.types';
+import { ContainerStateCollection, KubernetesPod } from '../../../store/kube.types';
 import { getHelmReleaseDetailsFromGuid } from '../../store/workloads-entity-factory';
 import {
   HelmRelease,
@@ -85,7 +85,7 @@ export class HelmReleaseHelperService {
       this.releaseTitle
     ).currentPage$.pipe(
       filter(pods => !!pods),
-      map(this.mapPods)
+      map(pods => this.mapPods(pods))
     );
   }
 
@@ -110,11 +110,13 @@ export class HelmReleaseHelperService {
       } else {
         podPhases[status]++;
       }
+
       if (pod.status.containerStatuses) {
         pod.status.containerStatuses.forEach(containerStatus => {
-          if (containerStatus.state.running) {
+          const isReady = this.isContainerReady(containerStatus.state);
+          if (isReady === true) {
             containers.ready.value++;
-          } else {
+          } else if (isReady === false) {
             containers.notReady.value++;
           }
         });
@@ -129,4 +131,17 @@ export class HelmReleaseHelperService {
       containersChartData: Object.values(containers)
     };
   }
+
+  private isContainerReady(state: ContainerStateCollection = {}): Boolean {
+    console.log(state);
+    if (state.running) {
+      return true;
+    } else if (!!state.waiting) {
+      return false;
+    } else if (!!state.terminated) {
+      // Assume a failed state is not ready (covers completed init states), discard success state
+      return state.terminated.exitCode === 0 ? null : false
+    }
+    return false;
+  }
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index daa29e2160..db3dd00963 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -9,7 +9,7 @@ import { RouterNav } from 'frontend/packages/store/src/actions/router.actions';
 import { HideSnackBar, ShowSnackBar } from 'frontend/packages/store/src/actions/snackBar.actions';
 import { AppState } from 'frontend/packages/store/src/app-state';
 import { combineLatest, Observable, ReplaySubject } from 'rxjs';
-import { filter, first, map, publishReplay, refCount, startWith } from 'rxjs/operators';
+import { distinctUntilChanged, filter, first, map, publishReplay, refCount, startWith } from 'rxjs/operators';
 
 import { endpointsEntityRequestDataSelector } from '../../../../../../../../store/src/selectors/endpoint.selectors';
 import { HelmReleaseChartData, HelmReleaseResource } from '../../../workload.types';
@@ -103,7 +103,15 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
       startWith(true)
     );
 
-    this.chartData$ = this.helmReleaseHelper.fetchReleaseChartStats();
+    this.chartData$ = this.helmReleaseHelper.fetchReleaseChartStats().pipe(
+      distinctUntilChanged(),
+      map(chartData => ({
+        ...chartData,
+        containersChartData: chartData.containersChartData.sort((a, b) => a.name.localeCompare(b.name)),
+        podsChartData: chartData.podsChartData.sort((a, b) => a.name.localeCompare(b.name))
+      })
+      )
+    );
 
     this.resources$ = this.helmReleaseHelper.fetchReleaseGraph().pipe(
       map((graph: any) => {

From a9d76f027e3298c7d82069522586a905234c0e2f Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 15 Jun 2020 15:22:08 +0100
Subject: [PATCH 534/648] Fix ring chart legend/ring colour missmatch - ensure
 legend colours update on changes of data - apply a better custom colour to
 'completed' state (rusty red --> sky blue)

---
 .../helm-release-summary-tab.component.ts     |  5 +++++
 .../ring-chart/ring-chart.component.html      |  9 ++++++---
 .../ring-chart/ring-chart.component.ts        | 19 ++++++++++++++++---
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index db3dd00963..759e70acda 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -36,12 +36,17 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
   public containersChartData = [];
 
   private successChartColor = '#4DD3A7';
+  private completedChartColour = '#7aa3e5';
 
   public podChartColors = [
     {
       name: 'Running',
       value: this.successChartColor
     },
+    {
+      name: 'Completed',
+      value: this.completedChartColour
+    },
   ];
 
   public containersChartColors = [
diff --git a/src/frontend/packages/core/src/shared/components/ring-chart/ring-chart.component.html b/src/frontend/packages/core/src/shared/components/ring-chart/ring-chart.component.html
index 40cd0d4a96..e69cdf1c90 100644
--- a/src/frontend/packages/core/src/shared/components/ring-chart/ring-chart.component.html
+++ b/src/frontend/packages/core/src/shared/components/ring-chart/ring-chart.component.html
@@ -1,6 +1,7 @@
 <div class="app-ring-chart">
   <div class="pie">
-    <ngx-charts-pie-chart [customColors]="customColors" [view]="[120,120]" [animations]="true" [doughnut]="true" [results]="data" [gradient]="false">
+    <ngx-charts-pie-chart [customColors]="customColors" [view]="[120,120]" [animations]="true" [doughnut]="true"
+      [results]="data" [gradient]="false">
     </ngx-charts-pie-chart>
   </div>
   <div class="legend">
@@ -8,8 +9,10 @@
       <div class="total-value" ngx-charts-count-up [countTo]="getTotal()"></div>
       <div class="total-label">{{ label }}</div>
     </div>
-    <ngx-charts-advanced-legend [data]="data" [label]="label" [colors]="colors" [animations]="true" [valueFormatting]="valueFormatting" [labelFormatting]="nameFormatting" [percentageFormatting]="percentageFormatting" (select)="onClick($event)" (activate)="onActivate($event)"
+    <ngx-charts-advanced-legend [data]="data" [label]="label" [colors]="colors" [animations]="true"
+      [valueFormatting]="valueFormatting" [labelFormatting]="nameFormatting"
+      [percentageFormatting]="percentageFormatting" (select)="onClick($event)" (activate)="onActivate($event)"
       (deactivate)="onDeactivate($event)">
     </ngx-charts-advanced-legend>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/ring-chart/ring-chart.component.ts b/src/frontend/packages/core/src/shared/components/ring-chart/ring-chart.component.ts
index 0e96a6cece..681984c9d6 100644
--- a/src/frontend/packages/core/src/shared/components/ring-chart/ring-chart.component.ts
+++ b/src/frontend/packages/core/src/shared/components/ring-chart/ring-chart.component.ts
@@ -1,5 +1,5 @@
-import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
-import { ColorHelper } from '@swimlane/ngx-charts';
+import { Component, Input, OnChanges, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
+import { AdvancedLegendComponent, ColorHelper } from '@swimlane/ngx-charts';
 
 @Component({
   selector: 'app-ring-chart',
@@ -7,7 +7,7 @@ import { ColorHelper } from '@swimlane/ngx-charts';
   styleUrls: ['./ring-chart.component.scss'],
   encapsulation: ViewEncapsulation.None,
 })
-export class RingChartComponent implements OnInit {
+export class RingChartComponent implements OnInit, OnChanges {
 
   domain: any[];
   colors: ColorHelper;
@@ -24,17 +24,30 @@ export class RingChartComponent implements OnInit {
   @Input() nameFormatting: (value: string) => any = label => label;
   @Input() percentageFormatting: (value: number) => any = percentage => percentage;
 
+  @ViewChild(AdvancedLegendComponent) lineSeriesComponent: AdvancedLegendComponent;
+
   constructor() { }
 
   ngOnInit() {
     if (!this.data) {
       this.data = [];
     }
+  }
+
+  ngOnChanges() {
+    this.update();
+  }
+
+  update() {
     this.domain = this.getDomain();
     this.setColors();
   }
 
   setColors(): void {
+    if (!this.domain) {
+      // Not set yet, can't set colour without it
+      return;
+    }
     this.colors = new ColorHelper(this.scheme, 'ordinal', this.domain, this.customColors || []);
   }
 

From 5972a7aa9415ba89099e562917f55a475ab362bd Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Tue, 16 Jun 2020 11:39:52 +0100
Subject: [PATCH 535/648] Typed access to actions and entities via catalog
 entity (#377)

* Fixes following merge

* Fix entity-catalog.service --> entity-catalog file change

* WIP

* WIP

* WIP

* Started to apply

* WIP

* WIP

* Fix most todo's

* WIP

* Final TODO's

* Fix left padding on expander rows

* Fix unit tests

* Improve unit tests

* Changes following review
---
 .../create-release.component.ts               |  35 +--
 .../app/custom/helm/helm-entity-catalog.ts    |  17 ++
 .../app/custom/helm/helm-entity-generator.ts  |  26 ++-
 .../app/custom/helm/helm-testing.module.ts    |   3 +
 .../monocular-charts-data-source.ts           |   9 +-
 .../custom/helm/store/helm.action-builders.ts |  23 ++
 .../app/custom/helm/store/helm.actions.ts     |  24 +-
 .../app/custom/helm/store/helm.effects.ts     |  39 ++--
 .../kubernetes-certs-auth-form.component.scss |   2 +-
 .../kubernetes/kubernetes-entity-catalog.ts   |  43 ++++
 .../kubernetes/kubernetes-entity-factory.ts   |  37 +--
 .../kubernetes/kubernetes-entity-generator.ts |  88 +++++---
 .../kubernetes/kubernetes.setup.module.ts     |   7 +-
 .../kubernetes/kubernetes.testing.module.ts   |   2 +
 .../kubernetes-namespace-pods-data-source.ts  |   4 +-
 ...bernetes-namespace-services-data-source.ts |   5 +-
 .../kubernetes-namespaces-data-source.ts      |  12 +-
 .../kubernetes-node-pods-data-source.ts       |  10 +-
 .../kubernetes-nodes-data-source.ts           |  12 +-
 .../kubernetes-pod-containers.component.ts    |  12 +-
 .../kubernetes-pods-data-source.ts            |  10 +-
 .../kubernetes-services-data-source.ts        |   6 +-
 .../pod-metrics/pod-metrics.component.ts      |  18 +-
 .../services/kubernetes-endpoint.service.ts   |  62 +-----
 .../services/kubernetes-namespace.service.ts  |  14 +-
 .../services/kubernetes-node.service.ts       |  12 +-
 .../action-builders/kube.action-builders.ts   | 147 ++++++++++++
 .../custom/kubernetes/store/kube.getIds.ts    |  49 ++++
 .../custom/kubernetes/store/kube.selectors.ts |  20 --
 .../kubernetes/store/kubernetes.actions.ts    | 210 +++++++++---------
 .../kubernetes/store/kubernetes.effects.ts    | 204 +++++++----------
 .../kubernetes-summary.component.ts           |  53 +++--
 .../helm-release-pods-list-source.ts          |   8 +-
 .../helm-release-services-list-source.ts      |  49 +---
 .../list-types/helm-releases-list-source.ts   |  11 +-
 .../kube-namespaces-filter-config.service.ts  |  28 +--
 .../helm-release-tab-base.component.ts        |  69 +++---
 .../tabs/helm-release-helper.service.ts       |  54 ++---
 .../helm-release-summary-tab.component.ts     |   4 +-
 .../store/workload-action-builders.ts         |  42 ++++
 .../store/workloads-entity-factory.ts         |  28 ++-
 .../store/workloads-entity-generator.ts       |  39 +++-
 .../workloads/store/workloads.actions.ts      |  57 +++--
 .../workloads/store/workloads.effects.ts      |  32 +--
 .../kubernetes/workloads/workload.types.ts    |  25 +--
 .../workloads/workloads-entity-catalog.ts     |  20 ++
 ...scaler-metric-chart-card.component.spec.ts |   2 -
 ...r-metric-chart-list-config.service.spec.ts |   3 -
 .../src/actions/buildpack.action.ts           |   3 +-
 .../src/actions/domains.actions.ts            |   3 +-
 .../src/actions/relation.actions.ts           |  12 +-
 .../src/actions/security-groups-actions.ts    |   3 +-
 .../src/actions/service-bindings.actions.ts   |   3 +-
 .../src/actions/service-broker.actions.ts     |   3 +-
 .../service-plan-visibility.actions.ts        |   3 +-
 .../src/actions/service-plan.actions.ts       |   3 +-
 .../core/sass/components/mat-table.scss       |  16 +-
 .../backup-endpoints.component.html           |   4 +-
 .../metrics/metrics/metrics.component.html    |  29 ++-
 .../store/src/selectors/endpoint.selectors.ts |   4 -
 .../packages/store/src/types/request.types.ts |   2 +-
 61 files changed, 986 insertions(+), 788 deletions(-)
 create mode 100644 custom-src/frontend/app/custom/helm/helm-entity-catalog.ts
 create mode 100644 custom-src/frontend/app/custom/helm/store/helm.action-builders.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/store/kube.selectors.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/workloads-entity-catalog.ts

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 709dfdc928..45793d2149 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
@@ -3,23 +3,19 @@ import { Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/co
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 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';
-import { getPaginationObservables } from 'frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { BehaviorSubject, combineLatest, Observable, of, Subscription } from 'rxjs';
 import { distinctUntilChanged, filter, first, map, pairwise, startWith, switchMap } from 'rxjs/operators';
 
-import { AppState } from '../../../../../store/src/app-state';
-import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
+import { RequestInfoState } from '../../../../../store/src/reducers/api-request-reducer/types';
 import { EndpointsService } from '../../../core/endpoints.service';
 import { safeUnsubscribe } from '../../../core/utils.service';
 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';
+import { kubeEntityCatalog } from '../../kubernetes/kubernetes-entity-catalog';
 import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes/kubernetes-entity-factory';
 import { KubernetesNamespace } from '../../kubernetes/store/kube.types';
-import { CreateKubernetesNamespace, GetKubernetesNamespaces } from '../../kubernetes/store/kubernetes.actions';
-import { HelmInstall } from '../store/helm.actions';
+import { helmEntityCatalog } from '../helm-entity-catalog';
 import { HelmInstallValues } from '../store/helm.types';
 
 @Component({
@@ -61,11 +57,8 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
   constructor(
     private route: ActivatedRoute,
     public endpointsService: EndpointsService,
-    private store: Store<AppState>,
     private httpClient: HttpClient,
     private confirmDialog: ConfirmationDialogService,
-    private pmf: PaginationMonitorFactory,
-    private emf: EntityMonitorFactory
   ) {
     const chart = this.route.snapshot.params;
     this.cancelUrl = `/monocular/charts/${chart.repo}/${chart.chartName}/${chart.version}`;
@@ -98,12 +91,7 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
 
     this.kubeEndpoints$ = this.endpointsService.connectedEndpointsOfTypes(KUBERNETES_ENDPOINT_TYPE);
 
-    const action = new GetKubernetesNamespaces(null);
-    const allNamespaces$ = getPaginationObservables<KubernetesNamespace>({
-      store: this.store,
-      action,
-      paginationMonitor: this.pmf.create(action.paginationKey, action, true)
-    }).entities$.pipe(
+    const allNamespaces$ = kubeEntityCatalog.namespace.store.getPaginationService(null).entities$.pipe(
       filter(namespaces => !!namespaces),
       first()
     );
@@ -234,12 +222,10 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
       });
     }
 
-    const action = new CreateKubernetesNamespace(
+    return kubeEntityCatalog.namespace.api.create<RequestInfoState>(
       this.details.controls.releaseNamespace.value,
-      this.details.controls.endpoint.value);
-    this.store.dispatch(action);
-
-    return this.emf.create(action.guid, action).entityRequest$.pipe(
+      this.details.controls.endpoint.value
+    ).pipe(
       pairwise(),
       filter(([oldVal, newVal]) => oldVal.creating && !newVal.creating),
       map(([, newVal]) => newVal),
@@ -267,11 +253,8 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     };
 
     // Make the request
-    const action = new HelmInstall(values);
-    this.store.dispatch(action);
-
-    // Wait for result of request
-    return this.emf.create(action.guid, action).entityRequest$.pipe(
+    return helmEntityCatalog.chart.api.install<RequestInfoState>(values).pipe(
+      // Wait for result of request
       filter(state => !!state),
       pairwise(),
       filter(([oldVal, newVal]) => (oldVal.creating && !newVal.creating)),
diff --git a/custom-src/frontend/app/custom/helm/helm-entity-catalog.ts b/custom-src/frontend/app/custom/helm/helm-entity-catalog.ts
new file mode 100644
index 0000000000..288b527982
--- /dev/null
+++ b/custom-src/frontend/app/custom/helm/helm-entity-catalog.ts
@@ -0,0 +1,17 @@
+import { StratosCatalogEndpointEntity, StratosCatalogEntity } from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity'; import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types'; import { MonocularChart, HelmVersion } from './store/helm.types'; import { HelmChartActionBuilders, HelmVersionActionBuilders } from './store/helm.action-builders';
+
+/**
+ * A strongly typed collection of Helm Catalog Entities.
+ * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc
+ */
+export class HelmEntityCatalog {
+  endpoint: StratosCatalogEndpointEntity;
+  chart: StratosCatalogEntity<IFavoriteMetadata, MonocularChart, HelmChartActionBuilders>
+  version: StratosCatalogEntity<IFavoriteMetadata, HelmVersion, HelmVersionActionBuilders>
+}
+
+/**
+ * A strongly typed collection of Helm Catalog Entities.
+ * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc
+ */
+export const helmEntityCatalog: HelmEntityCatalog = new HelmEntityCatalog();
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 0fb65457a6..380b225a40 100644
--- a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
+++ b/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
@@ -5,12 +5,19 @@ 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 { helmEntityCatalog } from './helm-entity-catalog';
 import {
   HELM_ENDPOINT_TYPE,
   helmEntityFactory,
   helmVersionsEntityType,
   monocularChartsEntityType,
 } from './helm-entity-factory';
+import {
+  HelmChartActionBuilders,
+  helmChartActionBuilders,
+  HelmVersionActionBuilders,
+  helmVersionActionBuilders,
+} from './store/helm.action-builders';
 import { HelmVersion, MonocularChart } from './store/helm.types';
 
 
@@ -36,10 +43,11 @@ export function generateHelmEntities(): StratosBaseCatalogEntity[] {
 }
 
 function generateEndpointEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  return new StratosCatalogEndpointEntity(
+  helmEntityCatalog.endpoint = new StratosCatalogEndpointEntity(
     endpointDefinition,
     metadata => `/monocular/repos/${metadata.guid}`,
   );
+  return helmEntityCatalog.endpoint;
 }
 
 function generateChartEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -48,7 +56,13 @@ function generateChartEntity(endpointDefinition: StratosEndpointExtensionDefinit
     schema: helmEntityFactory(monocularChartsEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, MonocularChart>(definition);
+  helmEntityCatalog.chart = new StratosCatalogEntity<IFavoriteMetadata, MonocularChart, HelmChartActionBuilders>(
+    definition,
+    {
+      actionBuilders: helmChartActionBuilders
+    }
+  );
+  return helmEntityCatalog.chart;
 }
 
 function generateVersionEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -57,7 +71,13 @@ function generateVersionEntity(endpointDefinition: StratosEndpointExtensionDefin
     schema: helmEntityFactory(helmVersionsEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, HelmVersion>(definition);
+  helmEntityCatalog.version = new StratosCatalogEntity<IFavoriteMetadata, HelmVersion, HelmVersionActionBuilders>(
+    definition,
+    {
+      actionBuilders: helmVersionActionBuilders
+    }
+  );
+  return helmEntityCatalog.version;
 }
 
 
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 9ee747eaf0..2bace2cf52 100644
--- a/custom-src/frontend/app/custom/helm/helm-testing.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm-testing.module.ts
@@ -7,12 +7,14 @@ 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';
 import { createBasicStoreModule } from '../../../../store/testing/public-api';
+import { AppTestModule } from '../../../test-framework/core-test.helper';
 import { generateStratosEntities } from '../../base-entity-types';
 import { CoreModule } from '../../core/core.module';
 import { SharedModule } from '../../shared/shared.module';
 import { HelmReleaseGuid } from '../kubernetes/workloads/workload.types';
 import { generateHelmEntities } from './helm-entity-generator';
 
+
 @NgModule({
   imports: [{
     ngModule: EntityCatalogFeatureModule,
@@ -53,6 +55,7 @@ export const HelmReleaseGuidMock = {
 };
 
 export const HelmBaseTestModules = [
+  AppTestModule,
   HelmTestingModule,
   RouterTestingModule,
   CoreModule,
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts
index 2a1c005854..afefeae64e 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts
@@ -4,8 +4,7 @@ import { PaginationEntityState } from '../../../../../store/src//types/paginatio
 import { AppState } from '../../../../../store/src/app-state';
 import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../shared/components/list/list.component.types';
-import { getMonocularChartId, helmEntityFactory, monocularChartsEntityType } from '../helm-entity-factory';
-import { GetMonocularCharts } from '../store/helm.actions';
+import { helmEntityCatalog } from '../helm-entity-catalog';
 import { MonocularChart } from '../store/helm.types';
 
 export class MonocularChartsDataSource extends ListDataSource<MonocularChart> {
@@ -14,12 +13,12 @@ export class MonocularChartsDataSource extends ListDataSource<MonocularChart> {
     store: Store<AppState>,
     listConfig: IListConfig<MonocularChart>
   ) {
-    const action = new GetMonocularCharts();
+    const action = helmEntityCatalog.chart.actions.getMultiple();
     super({
       store,
       action,
-      schema: helmEntityFactory(monocularChartsEntityType),
-      getRowUniqueId: getMonocularChartId,
+      schema: action.entity[0],
+      getRowUniqueId: (row) => action.entity[0].getId(row),
       paginationKey: action.paginationKey,
       isLocal: true,
       listConfig,
diff --git a/custom-src/frontend/app/custom/helm/store/helm.action-builders.ts b/custom-src/frontend/app/custom/helm/store/helm.action-builders.ts
new file mode 100644
index 0000000000..53c20f4de9
--- /dev/null
+++ b/custom-src/frontend/app/custom/helm/store/helm.action-builders.ts
@@ -0,0 +1,23 @@
+import { OrchestratedActionBuilders } from '../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
+import { GetHelmVersions, GetMonocularCharts, HelmInstall } from './helm.actions';
+import { HelmInstallValues } from './helm.types';
+
+export interface HelmChartActionBuilders extends OrchestratedActionBuilders {
+  getMultiple: () => GetMonocularCharts,
+  // Helm install added to chart action builder and not helm release/workload to ensure action & effect are available in this module
+  // (others may not have loaded)
+  install: (values: HelmInstallValues) => HelmInstall
+}
+
+export const helmChartActionBuilders: HelmChartActionBuilders = {
+  getMultiple: () => new GetMonocularCharts(),
+  install: (values: HelmInstallValues) => new HelmInstall(values)
+}
+
+export interface HelmVersionActionBuilders extends OrchestratedActionBuilders {
+  getMultiple: () => GetHelmVersions
+}
+
+export const helmVersionActionBuilders: HelmVersionActionBuilders = {
+  getMultiple: () => new GetHelmVersions()
+}
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/helm/store/helm.actions.ts b/custom-src/frontend/app/custom/helm/store/helm.actions.ts
index ce114a1245..d0c0db844e 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.actions.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.actions.ts
@@ -1,6 +1,4 @@
 import { EntityRequestAction } from '../../../../../store/src/types/request.types';
-import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes/kubernetes-entity-factory';
-import { helmReleaseEntityKey } from '../../kubernetes/workloads/store/workloads-entity-factory';
 import {
   HELM_ENDPOINT_TYPE,
   helmEntityFactory,
@@ -42,8 +40,18 @@ export class GetMonocularCharts implements MonocularPaginationAction {
     'order-direction': 'desc',
     'order-direction-field': 'name',
   };
+  flattenPagination = true;
 }
 
+export class HelmInstall implements EntityRequestAction {
+  type = HELM_INSTALL;
+  endpointType = HELM_ENDPOINT_TYPE;
+  entityType = monocularChartsEntityType;
+  guid: string;
+  constructor(public values: HelmInstallValues) {
+    this.guid = '<New Release>' + this.values.releaseName;
+  }
+}
 
 export class GetHelmVersions implements MonocularPaginationAction {
   constructor() {
@@ -63,15 +71,5 @@ export class GetHelmVersions implements MonocularPaginationAction {
     'order-direction': 'asc',
     'order-direction-field': 'version',
   };
+  flattenPagination = true;
 }
-
-export class HelmInstall implements EntityRequestAction {
-  type = HELM_INSTALL;
-  endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entityType = helmReleaseEntityKey;
-  guid: string;
-  constructor(public values: HelmInstallValues) {
-    this.guid = '<New Release>' + this.values.releaseName;
-  }
-}
-
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 e79232c5d9..5ec555ade5 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.effects.ts
@@ -2,24 +2,25 @@ 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';
-import { ApiRequestTypes } from 'frontend/packages/store/src/reducers/api-request-reducer/request-helpers';
-import { NormalizedResponse } from 'frontend/packages/store/src/types/api.types';
+import { Observable } from 'rxjs';
+import { catchError, flatMap, mergeMap } from 'rxjs/operators';
+
+import { GET_ENDPOINTS_SUCCESS, GetAllEndpointsSuccess } from '../../../../../store/src/actions/endpoint.actions';
+import { ClearPaginationOfType } from '../../../../../store/src/actions/pagination.actions';
+import { AppState } from '../../../../../store/src/app-state';
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
+import { ApiRequestTypes } from '../../../../../store/src/reducers/api-request-reducer/request-helpers';
+import { NormalizedResponse } from '../../../../../store/src/types/api.types';
 import {
   EntityRequestAction,
   StartRequestAction,
   WrapperRequestActionFailed,
   WrapperRequestActionSuccess,
-} from 'frontend/packages/store/src/types/request.types';
-import { Observable } from 'rxjs';
-import { catchError, flatMap, mergeMap } from 'rxjs/operators';
-
+} from '../../../../../store/src/types/request.types';
 import { environment } from '../../../environments/environment';
 import { isJetstreamError } from '../../../jetstream.helpers';
-import { HELM_ENDPOINT_TYPE } from '../helm-entity-factory';
+import { helmEntityCatalog } from '../helm-entity-catalog';
+import { getHelmVersionId, getMonocularChartId, HELM_ENDPOINT_TYPE } from '../helm-entity-factory';
 import {
   GET_HELM_VERSIONS,
   GET_MONOCULAR_CHARTS,
@@ -85,7 +86,7 @@ export class HelmEffects {
 
         const items = response.data as Array<any>;
         const processedData = items.reduce((res, data) => {
-          const id = data.id;
+          const id = getMonocularChartId(data);
           res.entities[entityKey][id] = data;
           // Promote the name to the top-level object for simplicity
           data.name = data.attributes.name;
@@ -119,7 +120,7 @@ export class HelmEffects {
             endpointId: endpoint,
             ...endpointData
           };
-          processedData.entities[entityKey][endpoint] = version;
+          processedData.entities[entityKey][getHelmVersionId(version)] = version;
           processedData.result.push(endpoint);
         });
         return processedData;
@@ -142,7 +143,7 @@ export class HelmEffects {
           ];
         }),
         catchError(error => {
-          const { status, message } = this.createHelmError(error);
+          const { status, message } = HelmEffects.createHelmError(error);
           const errorMessage = `Failed to install helm chart: ${message}`;
           return [
             new WrapperRequestActionFailed(errorMessage, action, requestType, {
@@ -172,7 +173,7 @@ export class HelmEffects {
     return this.httpClient.get(url, requestArgs).pipe(
       mergeMap((response: any) => [new WrapperRequestActionSuccess(mapResult(response), action)]),
       catchError(error => {
-        const { status, message } = this.createHelmError(error);
+        const { status, message } = HelmEffects.createHelmError(error);
         return [
           new WrapperRequestActionFailed(message, action, 'fetch', {
             endpointIds,
@@ -186,7 +187,7 @@ export class HelmEffects {
     );
   }
 
-  private createHelmErrorMessage(err: any): string {
+  static createHelmErrorMessage(err: any): string {
     if (err) {
       if (err.error && err.error.message) {
         // Kube error
@@ -202,7 +203,7 @@ export class HelmEffects {
     return 'Helm API request error';
   }
 
-  private createHelmError(err: any): { status: string, message: string } {
+  static createHelmError(err: any): { status: string, message: string } {
     let unwrapped = err;
     if (err.error) {
       unwrapped = err.error;
@@ -212,7 +213,7 @@ export class HelmEffects {
       // Wrapped error
       return {
         status: jetstreamError.error.statusCode.toString(),
-        message: this.createHelmErrorMessage(jetstreamError)
+        message: HelmEffects.createHelmErrorMessage(jetstreamError)
       };
     }
     return {
@@ -242,7 +243,7 @@ export class HelmEffects {
         this.syncing = syncing;
         if (remaining !== existing) {
           // Dispatch action to refresh charts
-          this.store.dispatch(new GetMonocularCharts());
+          helmEntityCatalog.chart.api.getMultiple();
         }
         if (remaining > 0) {
           this.scheduleSyncStatusCheck();
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss
index 23498e9eca..5385ee9711 100644
--- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss
+++ b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss
@@ -14,7 +14,7 @@
 
     &__content {
       & > * {
-        padding-bottom: 10px;
+        margin-bottom: 10px;
       }
       textarea {
         max-height: 75px;
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts
new file mode 100644
index 0000000000..816ab0bd47
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts
@@ -0,0 +1,43 @@
+import {
+  StratosCatalogEndpointEntity,
+  StratosCatalogEntity,
+} from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types';
+import {
+  KubeDashboardActionBuilders,
+  KubeDeploymentActionBuilders,
+  KubeNamespaceActionBuilders,
+  KubeNodeActionBuilders,
+  KubePodActionBuilders,
+  KubeServiceActionBuilders,
+  KubeStatefulSetsActionBuilders,
+} from './store/action-builders/kube.action-builders';
+import {
+  KubernetesDeployment,
+  KubernetesNamespace,
+  KubernetesNode,
+  KubernetesPod,
+  KubernetesStatefulSet,
+  KubeService,
+} from './store/kube.types';
+
+/**
+ * A strongly typed collection of Kube Catalog Entities.
+ * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc
+ */
+export class KubeEntityCatalog {
+  public endpoint: StratosCatalogEndpointEntity;
+  public statefulSet: StratosCatalogEntity<IFavoriteMetadata, KubernetesStatefulSet, KubeStatefulSetsActionBuilders>;
+  public pod: StratosCatalogEntity<IFavoriteMetadata, KubernetesPod, KubePodActionBuilders>;
+  public deployment: StratosCatalogEntity<IFavoriteMetadata, KubernetesDeployment, KubeDeploymentActionBuilders>;
+  public node: StratosCatalogEntity<IFavoriteMetadata, KubernetesNode, KubeNodeActionBuilders>;
+  public namespace: StratosCatalogEntity<IFavoriteMetadata, KubernetesNamespace, KubeNamespaceActionBuilders>;
+  public service: StratosCatalogEntity<IFavoriteMetadata, KubeService, KubeServiceActionBuilders>
+  public dashboard: StratosCatalogEntity<IFavoriteMetadata, any, KubeDashboardActionBuilders>;
+}
+
+/**
+ * A strongly typed collection of Kube Catalog Entities.
+ * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc
+ */
+export const kubeEntityCatalog: KubeEntityCatalog = new KubeEntityCatalog();
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 1e0aed9df9..a30402dfaa 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts
@@ -3,7 +3,15 @@ import { Schema, schema } from 'normalizr';
 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 {
+  getGuidFromKubeDashboardObj,
+  getGuidFromKubeDeploymentObj,
+  getGuidFromKubeNamespaceObj,
+  getGuidFromKubeNodeObj,
+  getGuidFromKubePodObj,
+  getGuidFromKubeServiceObj,
+  getGuidFromKubeStatefulSetObj,
+} from './store/kube.getIds';
 import { KubernetesApp } from './store/kube.types';
 
 export const kubernetesEntityType = 'kubernetesInfo';
@@ -13,7 +21,6 @@ export const kubernetesNamespacesEntityType = 'kubernetesNamespace';
 export const kubernetesServicesEntityType = 'kubernetesService';
 export const kubernetesStatefulSetsEntityType = 'kubernetesStatefulSet';
 export const kubernetesDeploymentsEntityType = 'kubernetesDeployment';
-export const kubernetesAppsEntityType = 'kubernetesApp';
 export const kubernetesDashboardEntityType = 'kubernetesDashboard';
 
 export const getKubeAppId = (object: KubernetesApp) => object.name;
@@ -49,52 +56,52 @@ entityCache[kubernetesEntityType] = new KubernetesEntitySchema(
   { idAttribute: getAPIResourceGuid }
 );
 
-entityCache[kubernetesAppsEntityType] = new KubernetesEntitySchema(
-  kubernetesAppsEntityType,
-  {},
-  { idAttribute: getKubeAppId }
-);
-
 entityCache[kubernetesStatefulSetsEntityType] = new KubernetesEntitySchema(
   kubernetesStatefulSetsEntityType,
   {},
-  { idAttribute: getKubeAPIResourceGuid }
+  {
+    idAttribute: getGuidFromKubeStatefulSetObj
+  }
 );
 
 entityCache[kubernetesPodsEntityType] = new KubernetesEntitySchema(
   kubernetesPodsEntityType,
   {},
-  { idAttribute: getKubeAPIResourceGuid }
+  {
+    idAttribute: getGuidFromKubePodObj
+  }
 );
 
 entityCache[kubernetesDeploymentsEntityType] = new KubernetesEntitySchema(
   kubernetesDeploymentsEntityType,
   {},
-  { idAttribute: getKubeAPIResourceGuid }
+  {
+    idAttribute: getGuidFromKubeDeploymentObj
+  }
 );
 
 entityCache[kubernetesNodesEntityType] = new KubernetesEntitySchema(
   kubernetesNodesEntityType,
   {},
-  { idAttribute: getKubeAPIResourceGuid }
+  { idAttribute: getGuidFromKubeNodeObj }
 );
 
 entityCache[kubernetesNamespacesEntityType] = new KubernetesEntitySchema(
   kubernetesNamespacesEntityType,
   {},
-  { idAttribute: getKubeAPIResourceGuid }
+  { idAttribute: getGuidFromKubeNamespaceObj }
 );
 
 entityCache[kubernetesServicesEntityType] = new KubernetesEntitySchema(
   kubernetesServicesEntityType,
   {},
-  { idAttribute: getKubeAPIResourceGuid }
+  { idAttribute: getGuidFromKubeServiceObj }
 );
 
 entityCache[kubernetesDashboardEntityType] = new KubernetesEntitySchema(
   kubernetesDashboardEntityType,
   {},
-  { idAttribute: getKubeAPIResourceGuid }
+  { idAttribute: getGuidFromKubeDashboardObj }
 );
 
 entityCache[metricEntityType] = new KubernetesEntitySchema(metricEntityType);
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 8155fd83ce..eac9f993c0 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,10 @@ 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 {
+  IStratosEntityDefinition,
+  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';
@@ -17,9 +20,9 @@ import {
   KubernetesConfigAuthFormComponent,
 } from './auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component';
 import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component';
+import { kubeEntityCatalog } from './kubernetes-entity-catalog';
 import {
   KUBERNETES_ENDPOINT_TYPE,
-  kubernetesAppsEntityType,
   kubernetesDashboardEntityType,
   kubernetesDeploymentsEntityType,
   kubernetesEntityFactory,
@@ -30,7 +33,22 @@ import {
   kubernetesStatefulSetsEntityType,
 } from './kubernetes-entity-factory';
 import {
-  KubernetesApp,
+  KubeDashboardActionBuilders,
+  kubeDashboardActionBuilders,
+  KubeDeploymentActionBuilders,
+  kubeDeploymentActionBuilders,
+  KubeNamespaceActionBuilders,
+  kubeNamespaceActionBuilders,
+  KubeNodeActionBuilders,
+  kubeNodeActionBuilders,
+  KubePodActionBuilders,
+  kubePodActionBuilders,
+  KubeServiceActionBuilders,
+  kubeServiceActionBuilders,
+  KubeStatefulSetsActionBuilders,
+  kubeStatefulSetsActionBuilders,
+} from './store/action-builders/kube.action-builders';
+import {
   KubernetesDeployment,
   KubernetesNamespace,
   KubernetesNode,
@@ -139,7 +157,6 @@ export function generateKubernetesEntities(): StratosBaseCatalogEntity[] {
   };
   return [
     generateEndpointEntity(endpointDefinition),
-    generateAppEntity(endpointDefinition),
     generateStatefulSetsEntity(endpointDefinition),
     generatePodsEntity(endpointDefinition),
     generateDeploymentsEntity(endpointDefinition),
@@ -153,86 +170,99 @@ export function generateKubernetesEntities(): StratosBaseCatalogEntity[] {
 }
 
 function generateEndpointEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  return new StratosCatalogEndpointEntity(
+  kubeEntityCatalog.endpoint = new StratosCatalogEndpointEntity(
     endpointDefinition,
     metadata => `/kubernetes/${metadata.guid}`
   );
-}
-
-function generateAppEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
-    type: kubernetesAppsEntityType,
-    schema: kubernetesEntityFactory(kubernetesAppsEntityType),
-    endpoint: endpointDefinition
-  };
-  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesApp>(definition);
+  return kubeEntityCatalog.endpoint;
 }
 
 function generateStatefulSetsEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
+  const definition: IStratosEntityDefinition = {
     type: kubernetesStatefulSetsEntityType,
     schema: kubernetesEntityFactory(kubernetesStatefulSetsEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesStatefulSet>(definition);
+  kubeEntityCatalog.statefulSet = new StratosCatalogEntity<IFavoriteMetadata, KubernetesStatefulSet, KubeStatefulSetsActionBuilders>(definition, {
+    actionBuilders: kubeStatefulSetsActionBuilders
+  });
+  return kubeEntityCatalog.statefulSet;
 }
 
 function generatePodsEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
+  const definition: IStratosEntityDefinition = {
     type: kubernetesPodsEntityType,
     schema: kubernetesEntityFactory(kubernetesPodsEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesPod>(definition);
+  kubeEntityCatalog.pod = new StratosCatalogEntity<IFavoriteMetadata, KubernetesPod, KubePodActionBuilders>(definition, {
+    actionBuilders: kubePodActionBuilders
+  });
+  return kubeEntityCatalog.pod;
 }
 
 function generateDeploymentsEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
+  const definition: IStratosEntityDefinition = {
     type: kubernetesDeploymentsEntityType,
     schema: kubernetesEntityFactory(kubernetesDeploymentsEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesDeployment>(definition);
+  kubeEntityCatalog.deployment = new StratosCatalogEntity<IFavoriteMetadata, KubernetesDeployment, KubeDeploymentActionBuilders>(definition, {
+    actionBuilders: kubeDeploymentActionBuilders
+  });
+  return kubeEntityCatalog.deployment;
 }
 
 function generateNodesEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
+  const definition: IStratosEntityDefinition = {
     type: kubernetesNodesEntityType,
     schema: kubernetesEntityFactory(kubernetesNodesEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesNode>(definition);
+  kubeEntityCatalog.node = new StratosCatalogEntity<IFavoriteMetadata, KubernetesNode, KubeNodeActionBuilders>(definition, {
+    actionBuilders: kubeNodeActionBuilders
+  });
+  return kubeEntityCatalog.node;
 }
 
 function generateNamespacesEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
+  const definition: IStratosEntityDefinition = {
     type: kubernetesNamespacesEntityType,
     schema: kubernetesEntityFactory(kubernetesNamespacesEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, KubernetesNamespace>(definition);
+  kubeEntityCatalog.namespace = new StratosCatalogEntity<IFavoriteMetadata, KubernetesNamespace, KubeNamespaceActionBuilders>(definition, {
+    actionBuilders: kubeNamespaceActionBuilders
+  });
+  return kubeEntityCatalog.namespace;
 }
 
 function generateServicesEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
+  const definition: IStratosEntityDefinition = {
     type: kubernetesServicesEntityType,
     schema: kubernetesEntityFactory(kubernetesServicesEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, KubeService>(definition);
+  kubeEntityCatalog.service = new StratosCatalogEntity<IFavoriteMetadata, KubeService, KubeServiceActionBuilders>(definition, {
+    actionBuilders: kubeServiceActionBuilders
+  });
+  return kubeEntityCatalog.service;
 }
 
 function generateDashboardEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
+  const definition: IStratosEntityDefinition = {
     type: kubernetesDashboardEntityType,
     schema: kubernetesEntityFactory(kubernetesDashboardEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata>(definition);
+  kubeEntityCatalog.dashboard = new StratosCatalogEntity<IFavoriteMetadata, any, KubeDashboardActionBuilders>(definition, {
+    actionBuilders: kubeDashboardActionBuilders
+  });
+  return kubeEntityCatalog.dashboard;
 }
 
 function generateMetricEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  const definition = {
+  const definition: IStratosEntityDefinition = {
     type: metricEntityType,
     schema: kubernetesEntityFactory(metricEntityType),
     label: 'Kubernetes Metric',
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
index 305457f572..45f33e0292 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
@@ -1,8 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NgModule, Optional, SkipSelf } from '@angular/core';
-import { Store } from '@ngrx/store';
 
-import { AppState } from '../../../../store/src/app-state';
 import { EntityCatalogModule } from '../../../../store/src/entity-catalog.module';
 import { EndpointHealthCheck } from '../../../endpoints-health-checks';
 import { CoreModule } from '../../core/core.module';
@@ -16,12 +14,12 @@ import {
   KubernetesConfigAuthFormComponent,
 } from './auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component';
 import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component';
+import { kubeEntityCatalog } from './kubernetes-entity-catalog';
 import { KUBERNETES_ENDPOINT_TYPE } from './kubernetes-entity-factory';
 import { generateKubernetesEntities } from './kubernetes-entity-generator';
 import { BaseKubeGuid } from './kubernetes-page.types';
 import { KubernetesStoreModule } from './kubernetes.store.module';
 import { KubernetesEndpointService } from './services/kubernetes-endpoint.service';
-import { KubeHealthCheck } from './store/kubernetes.actions';
 
 
 @NgModule({
@@ -52,14 +50,13 @@ import { KubeHealthCheck } from './store/kubernetes.actions';
 export class KubernetesSetupModule {
   constructor(
     endpointService: EndpointsService,
-    store: Store<AppState>,
     @Optional() @SkipSelf() parentModule: KubernetesSetupModule
   ) {
     if (parentModule) {
       // Module has already been imported
     } else {
       endpointService.registerHealthCheck(
-        new EndpointHealthCheck(KUBERNETES_ENDPOINT_TYPE, (endpoint) => store.dispatch(new KubeHealthCheck(endpoint.guid)))
+        new EndpointHealthCheck(KUBERNETES_ENDPOINT_TYPE, (endpoint) => kubeEntityCatalog.node.api.healthCheck(endpoint.guid))
       );
     }
   }
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 c87f6368fc..9185564ccb 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
@@ -6,6 +6,7 @@ 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';
 import { createBasicStoreModule } from '../../../../store/testing/public-api';
+import { AppTestModule } from '../../../test-framework/core-test.helper';
 import { generateStratosEntities } from '../../base-entity-types';
 import { CoreModule } from '../../core/core.module';
 import { SharedModule } from '../../shared/shared.module';
@@ -34,6 +35,7 @@ import { HelmReleaseHelperService } from './workloads/release/tabs/helm-release-
 export class KubernetesTestingModule { }
 
 export const KubernetesBaseTestModules = [
+  AppTestModule,
   KubernetesTestingModule,
   RouterTestingModule,
   CoreModule,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
index aef7b05503..b5c6dbc2aa 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
@@ -3,11 +3,11 @@ import { Store } from '@ngrx/store';
 import { AppState } from '../../../../../../store/src/app-state';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
+import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { kubernetesEntityFactory, kubernetesPodsEntityType } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesNamespaceService } from '../../services/kubernetes-namespace.service';
 import { KubernetesPod } from '../../store/kube.types';
-import { GetKubernetesPodsInNamespace } from '../../store/kubernetes.actions';
 
 export class KubernetesNamespacePodsDataSource extends ListDataSource<KubernetesPod, any> {
 
@@ -17,7 +17,7 @@ export class KubernetesNamespacePodsDataSource extends ListDataSource<Kubernetes
     listConfig: IListConfig<KubernetesPod>,
     kubeNamespaceService: KubernetesNamespaceService,
   ) {
-    const action = new GetKubernetesPodsInNamespace(kubeGuid.guid, kubeNamespaceService.namespaceName);
+    const action = kubeEntityCatalog.pod.actions.getInNamespace(kubeGuid.guid, kubeNamespaceService.namespaceName);
     super({
       store,
       action,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts
index 063318f97f..beb0626c7e 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts
@@ -2,9 +2,9 @@ import { Store } from '@ngrx/store';
 
 import { AppState } from '../../../../../../store/src/app-state';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
+import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubeService } from '../../store/kube.types';
-import { GetKubernetesServicesInNamespace } from '../../store/kubernetes.actions';
 import { BaseKubernetesServicesDataSource } from '../kubernetes-services/kubernetes-services-data-source';
 
 
@@ -16,10 +16,9 @@ export class KubernetesNamespaceServicesDataSource extends BaseKubernetesService
     listConfig: IListConfig<KubeService>,
     namespace: string,
   ) {
-    const action = new GetKubernetesServicesInNamespace(kubeGuid.guid, namespace);
     super(
       store,
-      action,
+      kubeEntityCatalog.service.actions.getInNamespace(namespace, kubeGuid.guid),
       listConfig
     );
   }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
index d1fd2cc6e3..2c3a375252 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
@@ -4,11 +4,10 @@ import { getPaginationKey } from '../../../../../../store/src/actions/pagination
 import { AppState } from '../../../../../../store/src/app-state';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { kubernetesEntityFactory, kubernetesNamespacesEntityType } from '../../kubernetes-entity-factory';
+import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
+import { kubernetesNamespacesEntityType } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
-import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { KubernetesNamespace } from '../../store/kube.types';
-import { GetKubernetesNamespaces } from '../../store/kubernetes.actions';
 
 
 export class KubernetesNamespacesDataSource extends ListDataSource<KubernetesNamespace> {
@@ -18,11 +17,12 @@ export class KubernetesNamespacesDataSource extends ListDataSource<KubernetesNam
     kubeGuid: BaseKubeGuid,
     listConfig: IListConfig<KubernetesNamespace>
   ) {
+    const action = kubeEntityCatalog.namespace.actions.getMultiple(kubeGuid.guid);
     super({
       store,
-      action: new GetKubernetesNamespaces(kubeGuid.guid),
-      schema: kubernetesEntityFactory(kubernetesNamespacesEntityType),
-      getRowUniqueId: getKubeAPIResourceGuid,
+      action,
+      schema: action.entity[0],
+      getRowUniqueId: (row) => action.entity[0].getId(row),
       paginationKey: getPaginationKey(kubernetesNamespacesEntityType, kubeGuid.guid),
       isLocal: true,
       listConfig,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
index a2c59454dd..f89ae7ae9f 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
@@ -3,12 +3,10 @@ import { Store } from '@ngrx/store';
 import { AppState } from '../../../../../../store/src/app-state';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { kubernetesEntityFactory, kubernetesPodsEntityType } from '../../kubernetes-entity-factory';
+import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesNodeService } from '../../services/kubernetes-node.service';
-import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { KubernetesPod } from '../../store/kube.types';
-import { GetKubernetesPodsOnNode } from '../../store/kubernetes.actions';
 
 export class KubernetesNodePodsDataSource extends ListDataSource<KubernetesPod> {
 
@@ -18,12 +16,12 @@ export class KubernetesNodePodsDataSource extends ListDataSource<KubernetesPod>
     listConfig: IListConfig<KubernetesPod>,
     kubeNodeService: KubernetesNodeService,
   ) {
-    const action = new GetKubernetesPodsOnNode(kubeGuid.guid, kubeNodeService.nodeName);
+    const action = kubeEntityCatalog.pod.actions.getOnNode(kubeGuid.guid, kubeNodeService.nodeName);
     super({
       store,
       action,
-      schema: kubernetesEntityFactory(kubernetesPodsEntityType),
-      getRowUniqueId: getKubeAPIResourceGuid,
+      schema: action.entity[0],
+      getRowUniqueId: (row) => action.entity[0].getId(row),
       paginationKey: action.paginationKey,
       isLocal: true,
       listConfig,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
index 797cd9a5fd..30678de266 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
@@ -8,11 +8,10 @@ import {
   ListDataSource,
 } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { kubernetesEntityFactory, kubernetesNodesEntityType } from '../../kubernetes-entity-factory';
+import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
+import { kubernetesNodesEntityType } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
-import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { KubernetesNode } from '../../store/kube.types';
-import { GetKubernetesNodes } from '../../store/kubernetes.actions';
 
 export class KubernetesNodesDataSource extends ListDataSource<KubernetesNode> {
 
@@ -22,11 +21,12 @@ export class KubernetesNodesDataSource extends ListDataSource<KubernetesNode> {
     listConfig: IListConfig<KubernetesNode>,
     transformEntities: (DataFunction<KubernetesNode> | DataFunctionDefinition)[]
   ) {
+    const action = kubeEntityCatalog.node.actions.getMultiple(kubeGuid.guid);
     super({
       store,
-      action: new GetKubernetesNodes(kubeGuid.guid),
-      schema: kubernetesEntityFactory(kubernetesNodesEntityType),
-      getRowUniqueId: getKubeAPIResourceGuid,
+      action,
+      schema: action.entity[0],
+      getRowUniqueId: (row) => action.entity[0].getId(row),
       paginationKey: getPaginationKey(kubernetesNodesEntityType, kubeGuid.guid),
       isLocal: true,
       listConfig,
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 f83718f337..d838567a71 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
@@ -1,13 +1,9 @@
 import { TitleCasePipe } from '@angular/common';
 import { Component, Input } from '@angular/core';
-import { Store } from '@ngrx/store';
 import * as moment from 'moment';
 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';
-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';
 import {
@@ -20,7 +16,7 @@ import {
 } from '../../../../../shared/components/list/list-table/table-cell-icon/table-cell-icon.component';
 import { ITableColumn } from '../../../../../shared/components/list/list-table/table.types';
 import { CardCell } from '../../../../../shared/components/list/list.types';
-import { KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType } from '../../../kubernetes-entity-factory';
+import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog';
 import { Container, ContainerState, ContainerStatus, InitContainer, KubernetesPod } from '../../../store/kube.types';
 
 export interface ContainerForTable {
@@ -39,16 +35,15 @@ export interface ContainerForTable {
 })
 export class KubernetesPodContainersComponent extends CardCell<KubernetesPod> {
 
-  private entityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType);
-
   @Input()
   set row(row: KubernetesPod) {
     if (!row || !!this.containerDataSource) {
       return;
     }
+    const id = kubeEntityCatalog.pod.getSchema().getId(row);
     this.containerDataSource = {
       isTableLoading$: of(false),
-      connect: () => this.store.select<KubernetesPod>(selectEntity(this.entityConfig.entityKey, row.metadata.uid)).pipe(
+      connect: () => kubeEntityCatalog.pod.store.getEntityMonitor(id).entity$.pipe(
         filter(pod => !!pod),
         map(pod => this.map(pod)),
       ),
@@ -58,7 +53,6 @@ export class KubernetesPodContainersComponent extends CardCell<KubernetesPod> {
   }
 
   constructor(
-    private store: Store<AppState>,
     private titleCase: TitleCasePipe,
   ) {
     super();
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
index cd608a2569..57d56cf38a 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
@@ -3,11 +3,9 @@ import { Store } from '@ngrx/store';
 import { AppState } from '../../../../../../store/src/app-state';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { kubernetesEntityFactory, kubernetesPodsEntityType } from '../../kubernetes-entity-factory';
+import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
-import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { KubernetesPod } from '../../store/kube.types';
-import { GetKubernetesPods } from '../../store/kubernetes.actions';
 
 export class KubernetesPodsDataSource extends ListDataSource<KubernetesPod> {
 
@@ -16,12 +14,12 @@ export class KubernetesPodsDataSource extends ListDataSource<KubernetesPod> {
     kubeGuid: BaseKubeGuid,
     listConfig: IListConfig<KubernetesPod>
   ) {
-    const action = new GetKubernetesPods(kubeGuid.guid);
+    const action = kubeEntityCatalog.pod.actions.getMultiple(kubeGuid.guid);
     super({
       store,
       action,
-      schema: kubernetesEntityFactory(kubernetesPodsEntityType),
-      getRowUniqueId: getKubeAPIResourceGuid,
+      schema: action.entity[0],
+      getRowUniqueId: (row) => action.entity[0].getId(row),
       paginationKey: action.paginationKey,
       isLocal: true,
       listConfig,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts
index 6aed4a43f6..6b02912c88 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts
@@ -5,8 +5,6 @@ import { AppState } from '../../../../../../store/src/app-state';
 import { PaginatedAction } from '../../../../../../store/src/types/pagination.types';
 import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../shared/components/list/list.component.types';
-import { kubernetesEntityFactory, kubernetesServicesEntityType } from '../../kubernetes-entity-factory';
-import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
 import { KubeService } from '../../store/kube.types';
 
 export class BaseKubernetesServicesDataSource extends ListDataSource<KubeService> {
@@ -20,8 +18,8 @@ export class BaseKubernetesServicesDataSource extends ListDataSource<KubeService
     super({
       store,
       action,
-      schema: kubernetesEntityFactory(kubernetesServicesEntityType),
-      getRowUniqueId: getKubeAPIResourceGuid,
+      schema: action.entity[0],
+      getRowUniqueId: (row) => action.entity[0].getId(row),
       paginationKey: action.paginationKey,
       transformEntity,
       isLocal: true,
diff --git a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts b/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
index 8f144d0768..0da0a94369 100644
--- a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
@@ -1,12 +1,8 @@
 import { Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Store } from '@ngrx/store';
-import * as moment from 'moment';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { AppState } from '../../../../../store/src/app-state';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { EntityInfo } from '../../../../../store/src/types/api.types';
 import { ChartSeries, IMetricMatrixResult } from '../../../../../store/src/types/base-metric.types';
 import { IMetricApplication } from '../../../../../store/src/types/metric.types';
@@ -18,12 +14,13 @@ import {
   getMetricsChartConfigBuilder,
 } from '../../../shared/components/metrics-chart/metrics.component.helpers';
 import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types';
+import { kubeEntityCatalog } from '../kubernetes-entity-catalog';
+import { formatAxisCPUTime, formatCPUTime } from '../kubernetes-metrics.helpers';
 import { BaseKubeGuid } from '../kubernetes-page.types';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
 import { KubernetesService } from '../services/kubernetes.service';
 import { KubernetesPod } from '../store/kube.types';
-import { FetchKubernetesMetricsAction, GetKubernetesPod } from '../store/kubernetes.actions';
-import { formatCPUTime, formatAxisCPUTime } from '../kubernetes-metrics.helpers';
+import { FetchKubernetesMetricsAction } from '../store/kubernetes.actions';
 
 @Component({
   selector: 'app-pod-metrics',
@@ -58,8 +55,6 @@ export class PodMetricsComponent {
 
   constructor(
     public activatedRoute: ActivatedRoute,
-    public store: Store<AppState>,
-    public entityServiceFactory: EntityServiceFactory,
     public kubeEndpointService: KubernetesEndpointService
   ) {
     this.podName = activatedRoute.snapshot.params.podName;
@@ -166,9 +161,8 @@ export class PodMetricsComponent {
         }];
       })
     );
-    this.podEntity$ = this.entityServiceFactory.create<KubernetesPod>(
-      this.podName,
-      new GetKubernetesPod(this.podName, this.namespaceName, this.kubeEndpointService.kubeGuid),
-    ).entityObs$;
+    this.podEntity$ = kubeEntityCatalog.pod.store.getEntityService(this.podName, this.kubeEndpointService.kubeGuid, {
+      namespace: this.namespaceName
+    }).entityObs$;
   }
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
index 612e762654..7bafc4d2ca 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
@@ -7,17 +7,10 @@ import { GetAllEndpoints } from '../../../../../store/src/actions/endpoint.actio
 import { AppState } from '../../../../../store/src/app-state';
 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 { PaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
 import { EntityInfo } from '../../../../../store/src/types/api.types';
 import { EndpointModel, EndpointUser } from '../../../../../store/src/types/endpoint.types';
-import {
-  kubernetesDeploymentsEntityType,
-  kubernetesNodesEntityType,
-  kubernetesPodsEntityType,
-  kubernetesServicesEntityType,
-  kubernetesStatefulSetsEntityType,
-} from '../kubernetes-entity-factory';
+import { kubeEntityCatalog } from '../kubernetes-entity-catalog';
 import { BaseKubeGuid } from '../kubernetes-page.types';
 import {
   KubernetesDeployment,
@@ -26,15 +19,6 @@ import {
   KubernetesStatefulSet,
   KubeService,
 } from '../store/kube.types';
-import {
-  GeKubernetesDeployments,
-  GetKubernetesDashboard,
-  GetKubernetesNodes,
-  GetKubernetesPods,
-  GetKubernetesServices,
-  GetKubernetesStatefulSets,
-  KubePaginationAction,
-} from '../store/kubernetes.actions';
 import { KubeDashboardStatus } from '../store/kubernetes.effects';
 
 @Injectable()
@@ -61,7 +45,6 @@ export class KubernetesEndpointService {
     public baseKube: BaseKubeGuid,
     private store: Store<AppState>,
     private entityServiceFactory: EntityServiceFactory,
-    private paginationMonitorFactory: PaginationMonitorFactory
   ) {
     const kubeGuid = baseKube.guid;
 
@@ -160,40 +143,22 @@ export class KubernetesEndpointService {
 
     this.currentUser$ = this.endpoint$.pipe(map(e => e.entity.user), shareReplay(1));
 
-    this.deployments$ = this.getObservable<KubernetesDeployment>(
-      new GeKubernetesDeployments(this.kubeGuid),
-      kubernetesDeploymentsEntityType
-    );
+    this.deployments$ = this.getObservable<KubernetesDeployment>(kubeEntityCatalog.deployment.store.getPaginationService(this.kubeGuid));
 
-    this.pods$ = this.getObservable<KubernetesPod>(
-      new GetKubernetesPods(this.kubeGuid),
-      kubernetesPodsEntityType
-    );
+    this.pods$ = this.getObservable<KubernetesPod>(kubeEntityCatalog.pod.store.getPaginationService(this.kubeGuid));
 
-    this.nodes$ = this.getObservable<KubernetesNode>(
-      new GetKubernetesNodes(this.kubeGuid),
-      kubernetesNodesEntityType
-    );
+    this.nodes$ = this.getObservable<KubernetesNode>(kubeEntityCatalog.node.store.getPaginationService(this.kubeGuid))
 
-    this.statefulSets$ = this.getObservable<KubernetesStatefulSet>(
-      new GetKubernetesStatefulSets(this.kubeGuid),
-      kubernetesStatefulSetsEntityType
-    );
+    this.statefulSets$ = this.getObservable<KubernetesStatefulSet>(kubeEntityCatalog.statefulSet.store.getPaginationService(this.kubeGuid));
 
-    this.services$ = this.getObservable<KubeService>(
-      new GetKubernetesServices(this.kubeGuid),
-      kubernetesServicesEntityType
-    );
+    this.services$ = this.getObservable<KubeService>(kubeEntityCatalog.service.store.getPaginationService(this.kubeGuid));
 
     this.kubeDashboardEnabled$ = this.store.select('auth').pipe(
       filter(auth => !!auth.sessionData['plugin-config']),
       map(auth => auth.sessionData['plugin-config'].kubeDashboardEnabled === 'true')
     );
 
-    const kubeDashboardStatus$ = this.entityServiceFactory.create<KubeDashboardStatus>(
-      this.kubeGuid,
-      new GetKubernetesDashboard(this.kubeGuid),
-    ).waitForEntity$.pipe(
+    const kubeDashboardStatus$ = kubeEntityCatalog.dashboard.store.getEntityService(this.kubeGuid).waitForEntity$.pipe(
       map(status => status.entity),
       filter(status => !!status)
     );
@@ -223,14 +188,11 @@ export class KubernetesEndpointService {
   }
 
   public refreshKubernetesDashboardStatus() {
-    this.store.dispatch(new GetKubernetesDashboard(this.kubeGuid));
+    kubeEntityCatalog.dashboard.api.get(this.kubeGuid);
   }
 
-  private getObservable<T>(paginationAction: KubePaginationAction, schemaKey: string): Observable<T[]> {
-    return getPaginationObservables<T>({
-      store: this.store,
-      action: paginationAction,
-      paginationMonitor: this.paginationMonitorFactory.create(paginationAction.paginationKey, paginationAction, true)
-    }, true).entities$.pipe(filter(p => !!p), first());
+  private getObservable<T>(obs: PaginationObservables<T>): Observable<T[]> {
+    return obs.entities$.pipe(filter(p => !!p), first());
   }
+
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts
index 0d58870122..c4686cf28b 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts
@@ -1,15 +1,11 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, first, map, publishReplay } from 'rxjs/operators';
 
-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 { getIdFromRoute } from '../../../core/utils.service';
+import { kubeEntityCatalog } from '../kubernetes-entity-catalog';
 import { KubernetesNamespace } from '../store/kube.types';
-import { GetKubernetesNamespace } from '../store/kubernetes.actions';
 import { KubernetesEndpointService } from './kubernetes-endpoint.service';
 
 @Injectable()
@@ -21,18 +17,12 @@ export class KubernetesNamespaceService {
   constructor(
     public kubeEndpointService: KubernetesEndpointService,
     public activatedRoute: ActivatedRoute,
-    public store: Store<AppState>,
-    public paginationMonitorFactory: PaginationMonitorFactory,
-    public entityServiceFactory: EntityServiceFactory,
   ) {
 
     this.namespaceName = getIdFromRoute(activatedRoute, 'namespaceName');
     this.kubeGuid = kubeEndpointService.kubeGuid;
 
-    const namespaceEntity = this.entityServiceFactory.create<KubernetesNamespace>(
-      this.namespaceName,
-      new GetKubernetesNamespace(this.namespaceName, this.kubeGuid),
-    );
+    const namespaceEntity = kubeEntityCatalog.namespace.store.getEntityService(this.namespaceName, this.kubeGuid);
 
     this.namespace$ = namespaceEntity.entityObs$.pipe(
       filter(p => !!p),
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts
index 74cc1f75d9..096eb86efa 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts
@@ -6,14 +6,13 @@ import { filter, first, map, shareReplay } from 'rxjs/operators';
 
 import { MetricQueryConfig, MetricsAction } from '../../../../../store/src/actions/metrics.actions';
 import { AppState } from '../../../../../store/src/app-state';
-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 { EntityInfo } from '../../../../../store/src/types/api.types';
 import { getIdFromRoute } from '../../../core/utils.service';
 import { MetricQueryType } from '../../../shared/services/metrics-range-selector.types';
+import { kubeEntityCatalog } from '../kubernetes-entity-catalog';
 import { KubernetesNode, MetricStatistic } from '../store/kube.types';
-import { FetchKubernetesMetricsAction, GetKubernetesNode } from '../store/kubernetes.actions';
+import { FetchKubernetesMetricsAction } from '../store/kubernetes.actions';
 import { KubernetesEndpointService } from './kubernetes-endpoint.service';
 
 
@@ -33,17 +32,12 @@ export class KubernetesNodeService {
     public kubeEndpointService: KubernetesEndpointService,
     public activatedRoute: ActivatedRoute,
     public store: Store<AppState>,
-    public paginationMonitorFactory: PaginationMonitorFactory,
-    public entityServiceFactory: EntityServiceFactory,
     public entityMonitorFactory: EntityMonitorFactory
   ) {
     this.nodeName = getIdFromRoute(activatedRoute, 'nodeName');
     this.kubeGuid = kubeEndpointService.kubeGuid;
 
-    const nodeEntityService = this.entityServiceFactory.create<KubernetesNode>(
-      this.nodeName,
-      new GetKubernetesNode(this.nodeName, this.kubeGuid),
-    );
+    const nodeEntityService = kubeEntityCatalog.node.store.getEntityService(this.nodeName, this.kubeGuid);
 
     this.node$ = nodeEntityService.entityObs$.pipe(
       filter(p => !!p && !!p.entity),
diff --git a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts
new file mode 100644
index 0000000000..58ad75827c
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts
@@ -0,0 +1,147 @@
+import {
+  OrchestratedActionBuilders,
+} from '../../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
+import { GetHelmReleasePods, GetHelmReleaseServices } from '../../workloads/store/workloads.actions';
+import {
+  CreateKubernetesNamespace,
+  GeKubernetesDeployments,
+  GetKubernetesDashboard,
+  GetKubernetesNamespace,
+  GetKubernetesNamespaces,
+  GetKubernetesNode,
+  GetKubernetesNodes,
+  GetKubernetesPod,
+  GetKubernetesPods,
+  GetKubernetesPodsInNamespace,
+  GetKubernetesPodsOnNode,
+  GetKubernetesServices,
+  GetKubernetesServicesInNamespace,
+  GetKubernetesStatefulSets,
+  KubeHealthCheck,
+} from '../kubernetes.actions';
+
+export interface KubeStatefulSetsActionBuilders extends OrchestratedActionBuilders {
+  getMultiple: (
+    kubeGuid: string,
+    paginationKey?: string,
+  ) => GetKubernetesStatefulSets
+}
+
+export const kubeStatefulSetsActionBuilders: KubeStatefulSetsActionBuilders = {
+  getMultiple: (kubeGuid: string, paginationKey?: string) => new GetKubernetesStatefulSets(kubeGuid)
+}
+
+export interface KubePodActionBuilders extends OrchestratedActionBuilders {
+  get: (
+    podName: string,
+    kubeGuid: string,
+    extraArgs: { namespace: string }
+  ) => GetKubernetesPod,
+  getMultiple: (
+    kubeGuid: string,
+    paginationKey?: string,
+  ) => GetKubernetesPods
+  getOnNode: (
+    kubeGuid: string,
+    nodeName: string
+  ) => GetKubernetesPodsOnNode
+  getInNamespace: (
+    kubeGuid: string,
+    namespace: string
+  ) => GetKubernetesPodsInNamespace
+  getInWorkload: (
+    kubeGuid: string,
+    releaseTitle: string
+  ) => GetHelmReleasePods
+}
+
+export const kubePodActionBuilders: KubePodActionBuilders = {
+  get: (podName: string, kubeGuid: string, { namespace }) => new GetKubernetesPod(podName, namespace, kubeGuid),
+  getMultiple: (kubeGuid: string, paginationKey?: string) => new GetKubernetesPods(kubeGuid),
+  getOnNode: (kubeGuid: string, nodeName: string) => new GetKubernetesPodsOnNode(kubeGuid, nodeName),
+  getInNamespace: (kubeGuid: string, namespace: string) => new GetKubernetesPodsInNamespace(kubeGuid, namespace),
+  getInWorkload: (kubeGuid: string, releaseTitle: string) => new GetHelmReleasePods(kubeGuid, releaseTitle)
+}
+
+export interface KubeDeploymentActionBuilders extends OrchestratedActionBuilders {
+  getMultiple: (
+    kubeGuid: string,
+    paginationKey?: string,
+  ) => GeKubernetesDeployments
+}
+
+export const kubeDeploymentActionBuilders: KubeDeploymentActionBuilders = {
+  getMultiple: (kubeGuid: string, paginationKey?: string) => new GeKubernetesDeployments(kubeGuid)
+}
+
+export interface KubeNodeActionBuilders extends OrchestratedActionBuilders {
+  get: (
+    nodeName: string,
+    kubeGuid: string
+  ) => GetKubernetesNode
+  getMultiple: (
+    kubeGuid: string,
+    paginationKey?: string,
+  ) => GetKubernetesNodes
+  healthCheck: (
+    kubeGuid: string,
+  ) => KubeHealthCheck;
+}
+
+export const kubeNodeActionBuilders: KubeNodeActionBuilders = {
+  get: (nodeName: string, endpointGuid: string) => new GetKubernetesNode(nodeName, endpointGuid),
+  getMultiple: (kubeGuid: string, paginationKey?: string) => new GetKubernetesNodes(kubeGuid),
+  healthCheck: (kubeGuid: string) => new KubeHealthCheck(kubeGuid)
+}
+
+export interface KubeNamespaceActionBuilders extends OrchestratedActionBuilders {
+  get: (
+    namespace: string,
+    kubeGuid: string
+  ) => GetKubernetesNamespace;
+  create: (
+    namespace: string,
+    kubeGuid: string
+  ) => CreateKubernetesNamespace;
+  getMultiple: (
+    kubeGuid: string,
+    paginationKey?: string,
+  ) => GetKubernetesNamespaces
+}
+
+export const kubeNamespaceActionBuilders: KubeNamespaceActionBuilders = {
+  get: (namespace: string, kubeGuid: string) => new GetKubernetesNamespace(namespace, kubeGuid),
+  create: (namespace: string, kubeGuid: string) => new CreateKubernetesNamespace(namespace, kubeGuid),
+  getMultiple: (kubeGuid: string, paginationKey?: string) => new GetKubernetesNamespaces(kubeGuid)
+}
+
+export interface KubeServiceActionBuilders extends OrchestratedActionBuilders {
+  getMultiple: (
+    kubeGuid: string,
+    paginationKey?: string
+  ) => GetKubernetesServices
+  getInNamespace: (
+    namespace: string,
+    kubeGuid: string
+  ) => GetKubernetesServicesInNamespace
+  getInWorkload: (
+    releaseTitle: string,
+    kubeGuid: string
+  ) => GetHelmReleaseServices
+}
+
+export const kubeServiceActionBuilders: KubeServiceActionBuilders = {
+  getMultiple: (kubeGuid: string, paginationKey?: string) => new GetKubernetesServices(kubeGuid),
+  getInNamespace: (namespace: string, kubeGuid: string) => new GetKubernetesServicesInNamespace(kubeGuid, namespace),
+  getInWorkload: (releaseTitle: string, kubeGuid: string) => new GetHelmReleaseServices(kubeGuid, releaseTitle)
+}
+
+export interface KubeDashboardActionBuilders extends OrchestratedActionBuilders {
+  get: (
+    kubeGuid: string
+  ) => GetKubernetesDashboard;
+}
+
+export const kubeDashboardActionBuilders: KubeDashboardActionBuilders = {
+  get: (kubeGuid: string) => new GetKubernetesDashboard(kubeGuid)
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts
new file mode 100644
index 0000000000..ef66c673df
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts
@@ -0,0 +1,49 @@
+import { environment } from '../../../environments/environment';
+import {
+  BasicKubeAPIResource,
+  KubernetesDeployment,
+  KubernetesNamespace,
+  KubernetesNode,
+  KubernetesPod,
+  KubernetesStatefulSet,
+  KubeService,
+} from './kube.types';
+import { KubeDashboardStatus } from './kubernetes.effects';
+
+const deliminate = (...args: string[]) => args.join('_:_');
+
+const debugMissingKubeId = (entity: BasicKubeAPIResource, func: (...args: string[]) => string, ...args: string[]) => {
+  if (!environment.production && (!entity.metadata || !entity.metadata.kubeId)) {
+    console.log(`Kube entity does not have a kubeId, this is probably a bug: `, entity);
+  }
+  return func(...args);
+}
+
+export const getGuidFromKubeNode = (kubeGuid: string, name: string): string => deliminate(name, kubeGuid)
+export const getGuidFromKubeNodeObj = (entity: KubernetesNode): string =>
+  debugMissingKubeId(entity, getGuidFromKubeNode, entity.metadata.kubeId, entity.metadata.name);
+
+export const getGuidFromKubeNamespace = (kubeGuid: string, name: string): string => deliminate(name, kubeGuid)
+export const getGuidFromKubeNamespaceObj = (entity: KubernetesNamespace): string =>
+  debugMissingKubeId(entity, getGuidFromKubeNamespace, entity.metadata.kubeId, entity.metadata.name);
+
+export const getGuidFromKubeService = (kubeGuid: string, namespace: string, name: string): string => deliminate(name, namespace, kubeGuid);
+export const getGuidFromKubeServiceObj = (entity: KubeService): string =>
+  debugMissingKubeId(entity, getGuidFromKubeService, entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name);
+
+export const getGuidFromKubeStatefulSet = (kubeGuid: string, namespace: string, name: string): string =>
+  deliminate(name, namespace, kubeGuid);
+export const getGuidFromKubeStatefulSetObj = (entity: KubernetesStatefulSet): string =>
+  debugMissingKubeId(entity, getGuidFromKubeStatefulSet, entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name);
+
+export const getGuidFromKubeDeployment = (kubeGuid: string, namespace: string, name: string): string =>
+  deliminate(name, namespace, kubeGuid);
+export const getGuidFromKubeDeploymentObj = (entity: KubernetesDeployment): string =>
+  debugMissingKubeId(entity, getGuidFromKubeDeployment, entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name);
+
+export const getGuidFromKubePod = (kubeGuid: string, namespace: string, name: string): string => deliminate(name, namespace, kubeGuid);
+export const getGuidFromKubePodObj = (entity: KubernetesPod): string =>
+  debugMissingKubeId(entity, getGuidFromKubePod, entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name);
+
+export const getGuidFromKubeDashboard = (kubeGuid: string): string => kubeGuid
+export const getGuidFromKubeDashboardObj = (entity: KubeDashboardStatus): string => getGuidFromKubeDashboard(entity.kubeGuid);
diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.selectors.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.selectors.ts
deleted file mode 100644
index dd88469ca2..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/store/kube.selectors.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { compose } from '@ngrx/store';
-
-import { BasicKubeAPIResource, Metadata } from './kube.types';
-
-
-const getValueOrNull = (object, key) =>
-  object ? (object[key] ? object[key] : null) : null;
-export const getMetadataGuid = (metadata: Metadata): string =>
-  getValueOrNull(metadata, 'uid');
-
-export const getKubeAPIMetadata = (
-  resource: BasicKubeAPIResource
-): Metadata => getValueOrNull(resource, 'metadata');
-
-export const getKubeAPIResourceGuid = compose(
-  getMetadataGuid,
-  getKubeAPIMetadata
-);
-
-
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 e678c983b8..cec88d6f34 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
@@ -17,6 +17,7 @@ import {
   kubernetesServicesEntityType,
   kubernetesStatefulSetsEntityType,
 } from '../kubernetes-entity-factory';
+import { getGuidFromKubeDashboard, getGuidFromKubeNamespace, getGuidFromKubeNode, getGuidFromKubePod } from './kube.getIds';
 
 export const GET_RELEASE_POD_INFO = '[KUBERNETES Endpoint] Get Release Pods Info';
 export const GET_RELEASE_POD_INFO_SUCCESS = '[KUBERNETES Endpoint] Get Release Pods Info Success';
@@ -81,33 +82,36 @@ export const GET_KUBE_DASHBOARD_SUCCESS = '[KUBERNETES Endpoint] Get Dashboard S
 export const GET_KUBE_DASHBOARD_FAILURE = '[KUBERNETES Endpoint] Get Dashboard Failure';
 
 
-const sortPodsByName = {
+const defaultSortParams = {
   'order-direction': 'desc' as SortDirection,
   'order-direction-field': 'name'
 };
 
+
 export interface KubeAction extends EntityRequestAction {
   kubeGuid: string;
 }
-export interface KubePaginationAction extends PaginatedAction, KubeAction { }
+export interface KubePaginationAction extends PaginatedAction, KubeAction {
+  flattenPagination: boolean;
+}
+export interface KubeSingleEntityAction extends KubeAction {
+  guid: string;
+}
 
-export class KubeHealthCheck implements KubePaginationAction {
-  constructor(public kubeGuid) {
-    this.paginationKey = kubeGuid + '-health-check';
+export class GetKubernetesNode implements KubeSingleEntityAction {
+  constructor(public nodeName: string, public kubeGuid: string) {
+    this.guid = getGuidFromKubeNode(kubeGuid, nodeName);
   }
-  initialParams = {
-    limit: 1
-  };
-  type = GET_NODES_INFO;
+  type = GET_NODE_INFO;
   entityType = kubernetesNodesEntityType;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = [kubernetesEntityFactory(kubernetesNodesEntityType)];
   actions = [
-    GET_NODES_INFO,
-    GET_NODES_INFO_SUCCESS,
-    GET_NODES_INFO_FAILURE
+    GET_NODE_INFO,
+    GET_NODE_INFO_SUCCESS,
+    GET_NODE_INFO_FAILURE
   ];
-  paginationKey: string;
+  guid: string;
 }
 
 export class GetKubernetesNodes implements KubePaginationAction {
@@ -124,54 +128,85 @@ export class GetKubernetesNodes implements KubePaginationAction {
     GET_NODES_INFO_FAILURE
   ];
   paginationKey: string;
-  initialParams = {
-    'order-direction': 'desc' as SortDirection,
-    'order-direction-field': 'name'
+  initialParams: PaginationParam = {
+    ...defaultSortParams
   };
+  flattenPagination = true;
 }
 
-export class GetKubernetesNode implements KubeAction {
-  constructor(public nodeName: string, public kubeGuid: string) {
+export class KubeHealthCheck extends GetKubernetesNodes {
+  constructor(kubeGuid) {
+    super(kubeGuid);
+    this.paginationKey = kubeGuid + '-health-check';
+    this.initialParams.limit = 1;
   }
-  type = GET_NODE_INFO;
-  entityType = kubernetesNodesEntityType;
-  endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesNodesEntityType)];
+}
 
-  actions = [
-    GET_NODE_INFO,
-    GET_NODE_INFO_SUCCESS,
-    GET_NODE_INFO_FAILURE
-  ];
+export class CreateKubernetesNamespace implements KubeSingleEntityAction {
+
+  constructor(public namespaceName: string, public kubeGuid: string) {
+    this.guid = getGuidFromKubeNamespace(kubeGuid, namespaceName);
+  }
+
+  type = CREATE_NAMESPACE;
+  entityType = kubernetesNamespacesEntityType;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
+  entity = [kubernetesEntityFactory(kubernetesNamespacesEntityType)];
+  actions = getActions('Namespace', 'Create');
+  requestType: ApiRequestTypes = 'create';
+  guid: string;
 }
 
-export class GetKubernetesNamespace implements KubeAction {
+export class GetKubernetesNamespace implements KubeSingleEntityAction {
   constructor(public namespaceName: string, public kubeGuid: string) {
+    this.guid = getGuidFromKubeNamespace(kubeGuid, namespaceName);
   }
   type = GET_NAMESPACE_INFO;
   entityType = kubernetesNamespacesEntityType;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = [kubernetesEntityFactory(kubernetesNamespacesEntityType)];
-
   actions = [
     GET_NAMESPACE_INFO,
     GET_NAMESPACE_INFO_SUCCESS,
     GET_NAMESPACE_INFO_FAILURE
   ];
+  guid: string;
 }
 
-export class CreateKubernetesNamespace implements KubeAction {
-  public guid: string;
-  constructor(public namespaceName: string, public kubeGuid: string) {
-    this.guid = `Creating-${namespaceName}-${kubeGuid}`;
+export class GetKubernetesNamespaces implements KubePaginationAction {
+  constructor(public kubeGuid: string) {
+    this.paginationKey = getPaginationKey(kubernetesNamespacesEntityType, kubeGuid || 'all');
   }
-
-  type = CREATE_NAMESPACE;
+  type = GET_NAMESPACES_INFO;
   entityType = kubernetesNamespacesEntityType;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = [kubernetesEntityFactory(kubernetesNamespacesEntityType)];
-  actions = getActions('Namespace', 'Create');
-  requestType: ApiRequestTypes = 'create';
+  actions = [
+    GET_NAMESPACES_INFO,
+    GET_NAMESPACES_INFO_SUCCESS,
+    GET_NAMESPACES_INFO_FAILURE
+  ];
+  paginationKey: string;
+  initialParams = {
+    ...defaultSortParams
+  };
+  flattenPagination = true;
+}
+
+export class GetKubernetesPod implements KubeSingleEntityAction {
+  constructor(public podName, public namespaceName, public kubeGuid) {
+    this.guid = getGuidFromKubePod(kubeGuid, namespaceName, podName);
+  }
+  type = GET_KUBE_POD;
+  entityType = kubernetesPodsEntityType;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
+  entity = [kubernetesEntityFactory(kubernetesPodsEntityType)];
+  actions = [
+    GET_KUBE_POD,
+    GET_KUBE_POD_SUCCESS,
+    GET_KUBE_POD_FAILURE
+  ];
+  guid: string;
 }
 
 export class GetKubernetesPods implements KubePaginationAction {
@@ -188,88 +223,37 @@ export class GetKubernetesPods implements KubePaginationAction {
     GET_POD_INFO_FAILURE
   ];
   paginationKey: string;
-  initialParams = {
-    ...sortPodsByName
+  initialParams: PaginationParam = {
+    ...defaultSortParams
   };
+  flattenPagination = true;
 }
 
-export class GetKubernetesPodsOnNode implements PaginatedAction, KubeAction {
-  constructor(public kubeGuid: string, public nodeName: string) {
+export class GetKubernetesPodsOnNode extends GetKubernetesPods {
+  constructor(kubeGuid: string, public nodeName: string) {
+    super(kubeGuid)
     this.paginationKey = getPaginationKey(kubernetesPodsEntityType, `node-${nodeName}`, kubeGuid);
-    this.initialParams = {
-      fieldSelector: `spec.nodeName=${nodeName}`,
-      ...sortPodsByName
-    };
+    this.initialParams.fieldSelector = `spec.nodeName=${nodeName}`;
   }
   type = GET_PODS_ON_NODE_INFO;
-  entityType = kubernetesPodsEntityType;
-  endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesPodsEntityType)];
   actions = [
     GET_PODS_ON_NODE_INFO,
     GET_PODS_ON_NODE_INFO_SUCCESS,
     GET_PODS_ON_NODE_INFO_FAILURE
   ];
-  paginationKey: string;
-  initialParams: PaginationParam;
 }
 
-export class GetKubernetesServicesInNamespace implements PaginatedAction, KubeAction {
-  constructor(public kubeGuid: string, public namespaceName: string) {
-    this.paginationKey = getPaginationKey(kubernetesPodsEntityType, `ns-${namespaceName}`, kubeGuid);
-  }
-  type = GET_SERVICES_IN_NAMESPACE_INFO;
-  entityType = kubernetesServicesEntityType;
-  endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesServicesEntityType)];
-  actions = [
-    GET_SERVICES_IN_NAMESPACE_INFO,
-    GET_SERVICES_IN_NAMESPACE_INFO_SUCCESS,
-    GET_SERVICES_IN_NAMESPACE_INFO_FAILURE
-  ];
-  paginationKey: string;
-  initialParams = {
-    ...sortPodsByName
-  };
-}
-
-export class GetKubernetesPodsInNamespace implements PaginatedAction, KubeAction {
-  constructor(public kubeGuid: string, public namespaceName: string) {
+export class GetKubernetesPodsInNamespace extends GetKubernetesPods {
+  constructor(kubeGuid: string, public namespaceName: string) {
+    super(kubeGuid);
     this.paginationKey = getPaginationKey(kubernetesPodsEntityType, `ns-${namespaceName}`, kubeGuid);
   }
   type = GET_PODS_IN_NAMESPACE_INFO;
-  entityType = kubernetesPodsEntityType;
-  endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesPodsEntityType)];
   actions = [
     GET_PODS_IN_NAMESPACE_INFO,
     GET_PODS_IN_NAMEPSACE_INFO_SUCCESS,
     GET_PODS_IN_NAMEPSACE_INFO_FAILURE
   ];
-  paginationKey: string;
-  initialParams = {
-    ...sortPodsByName
-  };
-}
-
-export class GetKubernetesNamespaces implements KubePaginationAction {
-  constructor(public kubeGuid: string) {
-    this.paginationKey = getPaginationKey(kubernetesNamespacesEntityType, kubeGuid || 'all');
-  }
-  type = GET_NAMESPACES_INFO;
-  entityType = kubernetesNamespacesEntityType;
-  endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesNamespacesEntityType)];
-  actions = [
-    GET_NAMESPACES_INFO,
-    GET_NAMESPACES_INFO_SUCCESS,
-    GET_NAMESPACES_INFO_FAILURE
-  ];
-  paginationKey: string;
-  initialParams = {
-    'order-direction': 'desc' as SortDirection,
-    'order-direction-field': 'name'
-  };
 }
 
 export class GetKubernetesServices implements KubePaginationAction {
@@ -286,26 +270,26 @@ export class GetKubernetesServices implements KubePaginationAction {
     GET_SERVICE_INFO_FAILURE
   ];
   paginationKey: string;
-  initialParams = {
-    'order-direction': 'desc' as SortDirection,
-    'order-direction-field': 'name'
+  initialParams: PaginationParam = {
+    ...defaultSortParams
   };
+  flattenPagination = true;
 }
 
-export class GetKubernetesPod implements KubeAction {
-  constructor(public podName, public namespaceName, public kubeGuid) {
+export class GetKubernetesServicesInNamespace extends GetKubernetesServices {
+  constructor(kubeGuid: string, public namespaceName: string) {
+    super(kubeGuid);
+    this.paginationKey = getPaginationKey(kubernetesPodsEntityType, namespaceName, kubeGuid);
   }
-  type = GET_KUBE_POD;
-  entityType = kubernetesPodsEntityType;
-  endpointType = KUBERNETES_ENDPOINT_TYPE;
-  entity = [kubernetesEntityFactory(kubernetesPodsEntityType)];
+  type = GET_SERVICES_IN_NAMESPACE_INFO;
   actions = [
-    GET_KUBE_POD,
-    GET_KUBE_POD_SUCCESS,
-    GET_KUBE_POD_FAILURE
+    GET_SERVICES_IN_NAMESPACE_INFO,
+    GET_SERVICES_IN_NAMESPACE_INFO_SUCCESS,
+    GET_SERVICES_IN_NAMESPACE_INFO_FAILURE
   ];
 }
 
+
 export class GetKubernetesStatefulSets implements KubePaginationAction {
   constructor(public kubeGuid) {
     this.paginationKey = getPaginationKey(kubernetesStatefulSetsEntityType, kubeGuid);
@@ -320,6 +304,7 @@ export class GetKubernetesStatefulSets implements KubePaginationAction {
     GET_KUBE_STATEFULSETS_FAILURE
   ];
   paginationKey: string;
+  flattenPagination = true;
 }
 
 export class GeKubernetesDeployments implements KubePaginationAction {
@@ -336,10 +321,12 @@ export class GeKubernetesDeployments implements KubePaginationAction {
     GET_KUBE_DEPLOYMENT_FAILURE
   ];
   paginationKey: string;
+  flattenPagination = true;
 }
 
-export class GetKubernetesDashboard implements KubeAction {
+export class GetKubernetesDashboard implements KubeSingleEntityAction {
   constructor(public kubeGuid: string) {
+    this.guid = getGuidFromKubeDashboard(kubeGuid);
   }
   type = GET_KUBE_DASHBOARD;
   entityType = kubernetesDashboardEntityType;
@@ -351,6 +338,7 @@ export class GetKubernetesDashboard implements KubeAction {
     GET_KUBE_DASHBOARD_SUCCESS,
     GET_KUBE_DASHBOARD_FAILURE
   ];
+  guid: string;
 }
 
 function getKubeMetricsAction(guid: string) {
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 c55b3cca8a..645dc5b91e 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
@@ -21,15 +21,9 @@ import { isJetstreamError } from '../../../jetstream.helpers';
 import {
   KUBERNETES_ENDPOINT_TYPE,
   kubernetesDashboardEntityType,
-  kubernetesDeploymentsEntityType,
-  kubernetesNamespacesEntityType,
-  kubernetesNodesEntityType,
   kubernetesPodsEntityType,
-  kubernetesServicesEntityType,
-  kubernetesStatefulSetsEntityType,
 } from '../kubernetes-entity-factory';
 import { KubernetesPodExpandedStatusHelper } from '../services/kubernetes-expanded-state';
-import { getKubeAPIResourceGuid } from './kube.selectors';
 import {
   BasicKubeAPIResource,
   KubernetesDeployment,
@@ -79,6 +73,7 @@ export interface KubeDashboardContainer {
 
 export interface KubeDashboardStatus {
   guid: string;
+  kubeGuid: string;
   installed: boolean;
   stratosInstalled: boolean;
   running: boolean;
@@ -96,9 +91,6 @@ export interface KubeDashboardStatus {
   serviceAccount: any;
 }
 
-type GetID<T> = (p: T) => string;
-type Filter<T> = (p: T) => boolean;
-
 @Injectable()
 export class KubernetesEffects {
   proxyAPIVersion = environment.proxyAPIVersion;
@@ -124,9 +116,9 @@ export class KubernetesEffects {
             result: []
           } as NormalizedResponse;
           const status = response as KubeDashboardStatus;
-          const id = status.guid;
-          result.entities[dashboardEntityConfig.entityKey][id] = status;
-          result.result.push(id);
+          status.kubeGuid = action.kubeGuid;
+          result.entities[dashboardEntityConfig.entityKey][action.guid] = status;
+          result.result.push(action.guid);
           return [
             new WrapperRequestActionSuccess(result, action)
           ];
@@ -151,174 +143,133 @@ export class KubernetesEffects {
   @Effect()
   fetchNodeInfo$ = this.actions$.pipe(
     ofType<GetKubernetesNode>(GET_NODE_INFO),
-    flatMap(action => {
-      const nodeEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesEntityType);
-      return this.processSingleItemAction<KubernetesNode>(action,
-        `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes/${action.nodeName}`,
-        nodeEntityConfig.entityKey,
-        (node) => node.metadata.name);
-    })
+    flatMap(action => this.processSingleItemAction<KubernetesNode>(
+      action,
+      `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes/${action.nodeName}`
+    ))
   );
 
   @Effect()
   fetchNamespaceInfo$ = this.actions$.pipe(
     ofType<GetKubernetesNamespace>(GET_NAMESPACE_INFO),
-    flatMap(action => {
-      const namespaceEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNamespacesEntityType);
-      return this.processSingleItemAction<KubernetesNamespace>(action,
-        `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}`,
-        namespaceEntityConfig.entityKey,
-        getKubeAPIResourceGuid);
-    })
+    flatMap(action => this.processSingleItemAction<KubernetesNamespace>(
+      action,
+      `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}`)
+    )
   );
 
   @Effect()
   fetchPodsInfo$ = this.actions$.pipe(
     ofType<GetKubernetesPods>(GET_POD_INFO),
-    flatMap(action => {
-      const podsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType);
-      return this.processListAction<KubernetesPod>(action,
-        `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`,
-        podsEntityConfig.entityKey,
-        getKubeAPIResourceGuid
-      );
-    })
+    flatMap(action => this.processListAction<KubernetesPod>(
+      action,
+      `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`
+    ))
   );
 
   @Effect()
   fetchPodsOnNodeInfo$ = this.actions$.pipe(
     ofType<GetKubernetesPodsOnNode>(GET_PODS_ON_NODE_INFO),
-    flatMap(action => {
-      const podsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType);
-      return this.processListAction<KubernetesPod>(action,
+    flatMap(action =>
+      this.processListAction<KubernetesPod>(
+        action,
         `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`,
-        podsEntityConfig.entityKey,
-        getKubeAPIResourceGuid
-      );
-    })
+        // Note - filtering done via param in action
+      )
+    )
   );
 
   @Effect()
   fetchPodsInNamespaceInfo$ = this.actions$.pipe(
     ofType<GetKubernetesPodsInNamespace>(GET_PODS_IN_NAMESPACE_INFO),
-    flatMap(action => {
-      const podsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType);
-      return this.processListAction<KubernetesPod>(action,
-        `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/pods`,
-        podsEntityConfig.entityKey,
-        getKubeAPIResourceGuid
-      );
-    })
+    flatMap(action => this.processListAction<KubernetesPod>(
+      action,
+      `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/pods`,
+    ))
   );
 
   @Effect()
   fetchServicesInNamespaceInfo$ = this.actions$.pipe(
     ofType<GetKubernetesServicesInNamespace>(GET_SERVICES_IN_NAMESPACE_INFO),
-    flatMap(action => {
-      const servicesEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesServicesEntityType);
-      return this.processListAction<KubeService>(action,
-        `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/services`,
-        servicesEntityConfig.entityKey,
-        getKubeAPIResourceGuid
-      );
-    })
+    flatMap(action => this.processListAction<KubeService>(
+      action,
+      `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/services`,
+    ))
   );
 
   @Effect()
   fetchPodInfo$ = this.actions$.pipe(
     ofType<GetKubernetesPod>(GET_KUBE_POD),
-    flatMap(action => {
-      const podsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType);
-      return this.processListAction<KubernetesPod>(action,
-        `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/pods/${action.podName}`,
-        podsEntityConfig.entityKey,
-        getKubeAPIResourceGuid
-      );
-    })
+    flatMap(action => this.processSingleItemAction<KubernetesPod>(
+      action,
+      `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/pods/${action.podName}`,
+    ))
   );
 
   @Effect()
   fetchServicesInfo$ = this.actions$.pipe(
     ofType<GetKubernetesServices>(GET_SERVICE_INFO),
-    flatMap(action => {
-      const servicesEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesServicesEntityType);
-      return this.processListAction<KubeService>(action,
-        `/pp/${this.proxyAPIVersion}/proxy/api/v1/services`,
-        servicesEntityConfig.entityKey,
-        getKubeAPIResourceGuid);
-    })
+    flatMap(action => this.processListAction<KubeService>(
+      action,
+      `/pp/${this.proxyAPIVersion}/proxy/api/v1/services`,
+    ))
   );
 
   @Effect()
   fetchNamespacesInfo$ = this.actions$.pipe(
     ofType<GetKubernetesNamespaces>(GET_NAMESPACES_INFO),
-    flatMap(action => {
-      const namespaceEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNamespacesEntityType);
-      return this.processListAction<KubernetesNamespace>(action,
-        `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces`,
-        namespaceEntityConfig.entityKey,
-        getKubeAPIResourceGuid);
-    })
+    flatMap(action => this.processListAction<KubernetesNamespace>(
+      action,
+      `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces`,
+    ))
   );
 
 
   @Effect()
   createNamespace$ = this.actions$.pipe(
     ofType<CreateKubernetesNamespace>(CREATE_NAMESPACE),
-    flatMap(action => {
-      const namespaceEntityConfig = entityCatalog.getEntity(action);
-      return this.processSingleItemAction<KubernetesNamespace>(action,
-        `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces`,
-        namespaceEntityConfig.entityKey,
-        getKubeAPIResourceGuid,
-        {
-          kind: 'Namespace',
-          apiVersion: 'v1',
-          metadata: {
-            name: action.namespaceName,
-          },
-        });
-    })
+    flatMap(action => this.processSingleItemAction<KubernetesNamespace>(
+      action,
+      `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces`,
+      {
+        kind: 'Namespace',
+        apiVersion: 'v1',
+        metadata: {
+          name: action.namespaceName,
+        },
+      }
+    )
+    )
   );
 
   @Effect()
   fetchStatefulSets$ = this.actions$.pipe(
     ofType<GetKubernetesStatefulSets>(GET_KUBE_STATEFULSETS),
-    flatMap(action => {
-      const statefulSetsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesStatefulSetsEntityType);
-      return this.processListAction<KubernetesStatefulSet>(action,
-        `/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/statefulsets`,
-        statefulSetsEntityConfig.entityKey,
-        getKubeAPIResourceGuid);
-    })
+    flatMap(action => this.processListAction<KubernetesStatefulSet>(
+      action,
+      `/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/statefulsets`,
+    ))
   );
 
   @Effect()
   fetchDeployments$ = this.actions$.pipe(
     ofType<GeKubernetesDeployments>(GET_KUBE_DEPLOYMENT),
-    flatMap(action => {
-      const deploymentsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesDeploymentsEntityType);
-      return this.processListAction<KubernetesDeployment>(action,
-        `/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/deployments`,
-        deploymentsEntityConfig.entityKey,
-        getKubeAPIResourceGuid);
-    })
+    flatMap(action => this.processListAction<KubernetesDeployment>(
+      action,
+      `/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/deployments`,
+    ))
   );
 
   private processNodeAction(action: GetKubernetesNodes) {
-    const nodeEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesEntityType);
-    return this.processListAction<KubernetesNode>(action,
-      `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes`,
-      nodeEntityConfig.entityKey,
-      getKubeAPIResourceGuid);
+    return this.processListAction<KubernetesNode>(
+      action,
+      `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes`
+    );
   }
 
-  private processListAction<T = any>(
-    action: KubePaginationAction | KubeAction,
-    url: string,
-    entityKey: string,
-    getId: GetID<T>,
-    filterResults?: Filter<T>) {
+  private processListAction<T extends BasicKubeAPIResource>(
+    action: KubePaginationAction,
+    url: string) {
     this.store.dispatch(new StartRequestAction(action));
 
     const getKubeIds = action.kubeGuid ?
@@ -329,6 +280,7 @@ export class KubernetesEffects {
       );
     let pKubeIds: string[];
 
+    const entityKey = entityCatalog.getEntityKey(action);
     return getKubeIds.pipe(
       switchMap(kubeIds => {
         pKubeIds = kubeIds;
@@ -363,10 +315,9 @@ export class KubernetesEffects {
           });
           return combinedRes;
         }, []);
-        const filteredItems = filterResults ? items.filter(res => filterResults(res)) : items;
-        const processesData = filteredItems
+        const processesData = items
           .reduce((res, data) => {
-            const id = getId(data);
+            const id = action.entity[0].getId(data);
             const updatedData = action.entityType === kubernetesPodsEntityType ?
               KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(data as unknown as KubernetesPod) :
               data;
@@ -396,8 +347,6 @@ export class KubernetesEffects {
   private processSingleItemAction<T extends BasicKubeAPIResource>(
     action: KubeAction,
     url: string,
-    schemaKey: string,
-    getId: GetID<T>,
     body?: any) {
     const requestType: ApiRequestTypes = body ? 'create' : 'fetch';
     this.store.dispatch(new StartRequestAction(action, requestType));
@@ -410,20 +359,19 @@ export class KubernetesEffects {
       headers
     };
     const request = body ? this.http.post(url, body, requestArgs) : this.http.get(url, requestArgs);
-
+    const entityKey = entityCatalog.getEntityKey(action);
     return request
       .pipe(
         mergeMap((response: T) => {
           const res = {
-            entities: { [schemaKey]: {} },
+            entities: { [entityKey]: {} },
             result: []
           } as NormalizedResponse;
-          const id = getId(response);
           const data = action.entityType === kubernetesPodsEntityType ?
             KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(response as unknown as KubernetesPod) :
             response;
-          res.entities[schemaKey][id] = data;
-          res.result.push(id);
+          res.entities[entityKey][action.guid] = data;
+          res.result.push(action.guid);
           const actions: Action[] = [
             new WrapperRequestActionSuccess(res, action)
           ];
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 5f7d4cdd5d..fc4b0a9ce5 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
@@ -4,20 +4,20 @@ 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 { first, map, startWith } from 'rxjs/operators';
 
 import { AppState } from '../../../../../../store/src/app-state';
 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';
+import { getCurrentPageRequestInfo } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
+import { PaginatedAction, PaginationEntityState } from '../../../../../../store/src/types/pagination.types';
 import { safeUnsubscribe } from '../../../../core/utils.service';
 import {
   IChartThresholds,
   ISimpleUsageChartData,
 } from '../../../../shared/components/simple-usage-chart/simple-usage-chart.types';
+import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
-import { GetKubernetesNamespaces, GetKubernetesNodes, GetKubernetesPods } from '../../store/kubernetes.actions';
 
 interface IValueLabels {
   usedLabel?: string;
@@ -113,12 +113,15 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
   ngOnInit() {
     const guid = this.kubeEndpointService.baseKube.guid;
 
-    const podCountAction = new GetKubernetesPods(guid);
-    const nodeCountAction = new GetKubernetesNodes(guid);
-    const namespacesCountAction = new GetKubernetesNamespaces(guid);
-    const pods$ = this.getPaginationObservable(podCountAction);
-    const nodes$ = this.getPaginationObservable(nodeCountAction);
-    const namespaces$ = this.getPaginationObservable(namespacesCountAction);
+    const podsObs = kubeEntityCatalog.pod.store.getPaginationService(guid);
+    const pods$ = podsObs.entities$;
+    this.poll(kubeEntityCatalog.pod.actions.getMultiple(guid), podsObs.pagination$)
+    const nodesObs = kubeEntityCatalog.node.store.getPaginationService(guid);
+    const nodes$ = nodesObs.entities$;
+    this.poll(kubeEntityCatalog.node.actions.getMultiple(guid), nodesObs.pagination$)
+    const namespacesObs = kubeEntityCatalog.namespace.store.getPaginationService(guid);
+    const namespaces$ = namespacesObs.entities$;
+    this.poll(kubeEntityCatalog.namespace.actions.getMultiple(guid), namespacesObs.pagination$)
 
     this.podCount$ = this.kubeEndpointService.getCountObservable(pods$);
     this.nodeCount$ = this.kubeEndpointService.getCountObservable(nodes$);
@@ -175,28 +178,22 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
     );
   }
 
-  private getPaginationObservable(action: PaginatedAction) {
-    const paginationMonitor = this.paginationMonitorFactory.create(
-      action.paginationKey,
-      action,
-      true
-    );
-
-    this.ngZone.runOutsideAngular(() => {
+  private poll(action: PaginatedAction, pagination$: Observable<PaginationEntityState>) {
+    this.ngZone.runOutsideAngular(() =>
       this.polls.push(
         interval(10000).subscribe(() => {
-          this.ngZone.run(() => {
-            this.store.dispatch(action);
-          });
+          this.ngZone.run(() => this.updateList(action, pagination$));
         })
-      );
-    });
+      )
+    );
+  }
 
-    return getPaginationObservables({
-      store: this.store,
-      action,
-      paginationMonitor
-    }).entities$;
+  private updateList(action: PaginatedAction, pagination$: Observable<PaginationEntityState>) {
+    pagination$.pipe(first()).subscribe(pag => {
+      if (!getCurrentPageRequestInfo(pag, { busy: true, error: false, message: '' }).busy) {
+        this.store.dispatch(action);
+      }
+    })
   }
 
   ngOnDestroy() {
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts
index d3cb3f80c4..6726c3ef26 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts
@@ -3,9 +3,8 @@ import { ListDataSource } from 'frontend/packages/core/src/shared/components/lis
 import { IListConfig } from 'frontend/packages/core/src/shared/components/list/list.component.types';
 import { AppState } from 'frontend/packages/store/src/app-state';
 
-import { getKubeAPIResourceGuid } from '../../store/kube.selectors';
+import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { KubernetesPod } from '../../store/kube.types';
-import { GetHelmReleasePods } from '../store/workloads.actions';
 
 
 export class HelmReleasePodsDataSource extends ListDataSource<KubernetesPod> {
@@ -16,13 +15,12 @@ export class HelmReleasePodsDataSource extends ListDataSource<KubernetesPod> {
     endpointGuid: string,
     releaseTitle: string
   ) {
-    const action = new GetHelmReleasePods(endpointGuid, releaseTitle);
-
+    const action = kubeEntityCatalog.pod.actions.getInWorkload(endpointGuid, releaseTitle);
     super({
       store,
       action,
       schema: action.entity[0],
-      getRowUniqueId: getKubeAPIResourceGuid,
+      getRowUniqueId: (row: KubernetesPod) => action.entity[0].getId(row),
       paginationKey: action.paginationKey,
       isLocal: true,
       listConfig,
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts
index ff70a8a77e..24186f23f9 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts
@@ -2,41 +2,9 @@ import { Store } from '@ngrx/store';
 import { ListDataSource } from 'frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from 'frontend/packages/core/src/shared/components/list/list.component.types';
 import { AppState } from 'frontend/packages/store/src/app-state';
-import { PaginationMonitor } from 'frontend/packages/store/src/monitors/pagination-monitor';
-import { getPaginationObservables } from 'frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper';
-import { Observable } from 'rxjs';
-import { filter, map, publishReplay, refCount, switchMap } from 'rxjs/operators';
 
-import { kubernetesEntityFactory } from '../../kubernetes-entity-factory';
 import { KubeService } from '../../store/kube.types';
-import { GetKubernetesServicesInNamespace } from '../../store/kubernetes.actions';
-import { getHelmReleaseServiceId } from '../store/workloads-entity-factory';
-import { GetHelmReleases, GetHelmReleaseServices } from '../store/workloads.actions';
-import { HelmRelease, HelmReleaseService } from '../workload.types';
-
-
-export const fetchHelmReleaseServiceFromKubernetes = (store: Store<AppState>, helmService: HelmReleaseService): Observable<KubeService> => {
-  return fetchRelease(store, helmService.endpointId, helmService.releaseTitle).pipe(
-    switchMap(release => {
-      const action = new GetKubernetesServicesInNamespace(helmService.endpointId, release.namespace);
-      const paginationMonitor = new PaginationMonitor<KubeService>(store, action.paginationKey, kubernetesEntityFactory(action.entityType));
-      return getPaginationObservables<KubeService>({ store, action, paginationMonitor }).entities$;
-    }),
-    filter(entities => !!entities),
-    map(services => services.find(service => service.metadata.name === helmService.name)),
-    publishReplay(1),
-    refCount()
-  );
-};
-
-function fetchRelease(store: Store<AppState>, endpointGuid: string, releaseTitle: string) {
-  const action = new GetHelmReleases();
-  const paginationMonitor = new PaginationMonitor(store, action.paginationKey, action);
-  const svc = getPaginationObservables({ store, action, paginationMonitor });
-  return svc.entities$.pipe(
-    map((items: HelmRelease[]) => items.find(item => item.guid === `${endpointGuid}:${releaseTitle}`))
-  );
-}
+import { GetHelmReleaseServices } from '../store/workloads.actions';
 
 export class HelmReleaseServicesDataSource extends ListDataSource<KubeService> {
 
@@ -51,23 +19,10 @@ export class HelmReleaseServicesDataSource extends ListDataSource<KubeService> {
       store,
       action,
       schema: action.entity[0],
-      getRowUniqueId: getHelmReleaseServiceId,
+      getRowUniqueId: (row: KubeService) => action.entity[0].getId(row),
       paginationKey: action.paginationKey,
       isLocal: true,
       listConfig,
     });
-    //   transformEntity: map((helmServices: HelmReleaseService[]) => {
-    //     return helmServices.map(helmService => {
-    //       if (!helmService.kubeService$) {
-    //         helmService.kubeService$ = fetchHelmReleaseServiceFromKubernetes(store, helmService);
-    //       }
-    //       return helmService;
-    //     });
-    //   }),
-    //   refresh: () => {
-    //     store.dispatch(action);
-    //     store.dispatch(new ClearPaginationOfType(action));
-    //   }
-    // });
   }
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts
index 35bf800960..d6fe2020f1 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts
@@ -10,10 +10,8 @@ import { IListConfig } from 'frontend/packages/core/src/shared/components/list/l
 import { AppState } from 'frontend/packages/store/src/app-state';
 import { PaginationEntityState } from 'frontend/packages/store/src/types/pagination.types';
 
-import { kubernetesEntityFactory } from '../../kubernetes-entity-factory';
-import { getHelmReleaseId, helmReleaseEntityKey } from '../store/workloads-entity-factory';
-import { GetHelmReleases } from '../store/workloads.actions';
 import { HelmRelease } from '../workload.types';
+import { workloadsEntityCatalog } from '../workloads-entity-catalog';
 
 const kubeEndpointFilter = (entities: HelmRelease[], paginationState: PaginationEntityState) => {
   // Filter by Kube Endpoint and Namespace
@@ -33,13 +31,14 @@ export class HelmReleasesDataSource extends ListDataSource<HelmRelease> {
     store: Store<AppState>,
     listConfig: IListConfig<HelmRelease>
   ) {
-    const action = new GetHelmReleases();
+
+    const action = workloadsEntityCatalog.release.actions.getMultiple();
     const transformEntities = [{ type: 'filter' as DataFunctionDefinitionType, field: 'name' }, kubeEndpointFilter];
     super({
       store,
       action,
-      schema: kubernetesEntityFactory(helmReleaseEntityKey),
-      getRowUniqueId: getHelmReleaseId,
+      schema: action.entity[0],
+      getRowUniqueId: row => action.entity[0].getId(row),
       paginationKey: action.paginationKey,
       isLocal: true,
       transformEntities,
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 6132e3fc47..846848fc7a 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
@@ -2,8 +2,6 @@ import { Injectable, OnDestroy } from '@angular/core';
 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 { 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';
@@ -20,9 +18,9 @@ import {
 } from 'rxjs/operators';
 
 import { getCurrentPageRequestInfo } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
-import { KUBERNETES_ENDPOINT_TYPE, kubernetesEntityFactory } from '../../kubernetes-entity-factory';
+import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
+import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes-entity-factory';
 import { KubernetesNamespace } from '../../store/kube.types';
-import { GetKubernetesNamespaces } from '../../store/kubernetes.actions';
 
 export interface KubernetesNamespacesFilterItem<T = any> {
   list$: Observable<T[]>;
@@ -38,10 +36,8 @@ export class KubernetesNamespacesFilterService implements OnDestroy {
   public kube: KubernetesNamespacesFilterItem<EndpointModel>;
   public namespace: KubernetesNamespacesFilterItem<KubernetesNamespace>;
 
-  private isLoading$: Observable<boolean>;
   private subs: Subscription[] = [];
 
-  private paginationAction = new GetKubernetesNamespaces(null);
   private allNamespaces = this.getNamespacesObservable();
   private allNamespacesLoading$ = this.allNamespaces.pagination$.pipe(map(
     pag => getCurrentPageRequestInfo(pag).busy
@@ -49,32 +45,16 @@ export class KubernetesNamespacesFilterService implements OnDestroy {
 
   constructor(
     private store: Store<AppState>,
-    private paginationMonitorFactory: PaginationMonitorFactory,
   ) {
     this.kube = this.createKube();
     this.namespace = this.createNamespace();
 
-    // Start watching the cf/org/space plus automatically setting values only when we actually have values to auto select
+    // Start watching the namespace plus automatically setting values only when we actually have values to auto select
     this.namespace.list$.pipe(first()).subscribe(() => this.setupAutoSelectors());
-
-    this.isLoading$ = combineLatest(
-      this.kube.loading$,
-      this.namespace.loading$,
-    ).pipe(
-      map(([kubeLoading, nsLoading]) => kubeLoading || nsLoading)
-    );
   }
 
   private getNamespacesObservable() {
-    return getPaginationObservables<KubernetesNamespace>({
-      store: this.store,
-      action: this.paginationAction,
-      paginationMonitor: this.paginationMonitorFactory.create(
-        this.paginationAction.paginationKey,
-        kubernetesEntityFactory(this.paginationAction.entityType),
-        true
-      )
-    }, true);
+    return kubeEntityCatalog.namespace.store.getPaginationService(null);
   }
 
   private createKube() {
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 f3d8d9927a..3c62493c90 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
@@ -1,32 +1,23 @@
 import { Component, OnDestroy } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 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';
-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';
 import makeWebSocketObservable, { GetWebSocketResponses } from 'rxjs-websockets';
 import { catchError, map, share, switchMap } from 'rxjs/operators';
 
+import { AppState } from '../../../../../../../store/src/app-state';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
+import { EntityRequestAction, WrapperRequestActionSuccess } from '../../../../../../../store/src/types/request.types';
+import { LoggerService } from '../../../../../core/logger.service';
+import { IPageSideNavTab } from '../../../../../features/dashboard/page-side-nav/page-side-nav.component';
+import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog';
 import { KubernetesPodExpandedStatusHelper } from '../../../services/kubernetes-expanded-state';
-import { getKubeAPIResourceGuid } from '../../../store/kube.selectors';
-import { KubernetesPod } from '../../../store/kube.types';
-import { getHelmReleaseServiceId } from '../../store/workloads-entity-factory';
-import {
-  GetHelmReleaseGraph,
-  GetHelmReleasePods,
-  GetHelmReleaseResource,
-  GetHelmReleaseServices,
-} from '../../store/workloads.actions';
-import { HelmReleaseGraph, HelmReleaseGuid, HelmReleasePod } from '../../workload.types';
+import { KubernetesPod, KubeService } from '../../../store/kube.types';
+import { KubePaginationAction } from '../../../store/kubernetes.actions';
+import { HelmReleaseGraph, HelmReleaseGuid, HelmReleasePod, HelmReleaseService } from '../../workload.types';
+import { workloadsEntityCatalog } from '../../workloads-entity-catalog';
 import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service';
 
-type IDGetterFunction = (data: any) => string;
-
-
 
 @Component({
   selector: 'app-helm-release-tab-base',
@@ -114,19 +105,21 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
         } else if (messageObj.kind === 'Pods') {
           const pods: KubernetesPod[] = messageObj.data || [];
           const podsWithInfo: KubernetesPod[] = pods.map(pod => KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(pod));
-          const releasePodsAction = new GetHelmReleasePods(this.helmReleaseHelper.endpointGuid, this.helmReleaseHelper.releaseTitle);
-          this.populateList(releasePodsAction, podsWithInfo, getKubeAPIResourceGuid);
+          const releasePodsAction = kubeEntityCatalog.pod.actions.getInWorkload(
+            this.helmReleaseHelper.endpointGuid,
+            this.helmReleaseHelper.releaseTitle
+          );
+          this.populateList(releasePodsAction, podsWithInfo);
         } else if (messageObj.kind === 'Graph') {
           const graph: HelmReleaseGraph = messageObj.data;
           graph.endpointId = this.helmReleaseHelper.endpointGuid;
           graph.releaseTitle = this.helmReleaseHelper.releaseTitle;
-          const releaseGraphAction = new GetHelmReleaseGraph(graph.endpointId, graph.releaseTitle);
-
+          const releaseGraphAction = workloadsEntityCatalog.graph.actions.get(graph.releaseTitle, graph.endpointId);
           this.addResource(releaseGraphAction, graph);
         } else if (messageObj.kind === 'Manifest' || messageObj.kind === 'Resources') {
           // Store all of the services
           const manifest = messageObj.data;
-          const svcs = [];
+          const svcs: KubeService[] = [];
           // Store ALL resources for the release
           manifest.forEach(resource => {
             if (resource.kind === 'Service' && prefix) {
@@ -134,17 +127,20 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
             }
           });
           if (svcs.length > 0) {
-            const releaseServicesAction = new GetHelmReleaseServices(
+            const releaseServicesAction = kubeEntityCatalog.service.actions.getInWorkload(
+              this.helmReleaseHelper.releaseTitle,
               this.helmReleaseHelper.endpointGuid,
-              this.helmReleaseHelper.releaseTitle
-            );
-            this.populateList(releaseServicesAction, svcs, getHelmReleaseServiceId);
+            )
+            this.populateList(releaseServicesAction, svcs);
           }
 
           const resources = { ...manifest };
           resources.endpointId = this.helmReleaseHelper.endpointGuid;
           resources.releaseTitle = this.helmReleaseHelper.releaseTitle;
-          const releaseResourceAction = new GetHelmReleaseResource(resources.endpointId, resources.releaseTitle);
+          const releaseResourceAction = workloadsEntityCatalog.resource.actions.get(
+            resources.releaseTitle,
+            resources.endpointId,
+          );
           this.addResource(releaseResourceAction, resources);
         }
       }
@@ -167,19 +163,24 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
     this.store.dispatch(successWrapper);
   }
 
-  private populateList(action: PaginatedAction, resources: any, idGetter: IDGetterFunction) {
+  private populateList(action: KubePaginationAction, resources: any) {
+    const entity = entityCatalog.getEntity(action);
     const newResources = {};
     resources.forEach(resource => {
-      const newResource: HelmReleasePod = {
-        endpointId: action.endpointGuid,
+      const newResource: HelmReleasePod | HelmReleaseService = {
+        endpointId: action.kubeGuid,
         releaseTitle: this.helmReleaseHelper.releaseTitle,
         ...resource
       };
-      newResources[idGetter(newResource)] = newResource;
+      newResource.metadata.kubeId = action.kubeGuid;
+      // The service entity from manifest is missing this, but apply here to ensure any others are caught
+      newResource.metadata.namespace = this.helmReleaseHelper.namespace;
+      const entityId = action.entity[0].getId(resource)
+      newResources[entityId] = newResource;
     });
 
     const releasePods = {
-      entities: { [entityCatalog.getEntityKey(action)]: newResources },
+      entities: { [entity.entityKey]: newResources },
       result: Object.keys(newResources)
     };
     const successWrapper = new WrapperRequestActionSuccess(releasePods, action, 'fetch', releasePods.result.length, 1);
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 aa8a7b73c9..bcdef4478b 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,20 +1,10 @@
 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';
-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';
 import { Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
+import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog';
 import { KubernetesPod } from '../../../store/kube.types';
-import {
-  GetHelmRelease,
-  GetHelmReleaseGraph,
-  GetHelmReleasePods,
-  GetHelmReleaseResource,
-} from '../../store/workloads.actions';
+import { getHelmReleaseDetailsFromGuid } from '../../store/workloads-entity-factory';
 import {
   HelmRelease,
   HelmReleaseChartData,
@@ -22,6 +12,7 @@ import {
   HelmReleaseGuid,
   HelmReleaseResource,
 } from '../../workload.types';
+import { workloadsEntityCatalog } from '../../workloads-entity-catalog';
 
 
 @Injectable()
@@ -38,17 +29,18 @@ export class HelmReleaseHelperService {
 
   constructor(
     helmReleaseGuid: HelmReleaseGuid,
-    private store: Store<AppState>,
-    private esf: EntityServiceFactory,
-    private paginationMonitorFactory: PaginationMonitorFactory,
   ) {
     this.guid = helmReleaseGuid.guid;
-    this.releaseTitle = this.guid.split(':')[2];
-    this.namespace = this.guid.split(':')[1];
-    this.endpointGuid = this.guid.split(':')[0];
-
-    const action = new GetHelmRelease(this.endpointGuid, this.namespace, this.releaseTitle);
-    const entityService = this.esf.create<HelmRelease>(action.guid, action);
+    const { endpointId, namespace, releaseTitle } = getHelmReleaseDetailsFromGuid(this.guid);
+    this.releaseTitle = releaseTitle;
+    this.namespace = namespace;
+    this.endpointGuid = endpointId;
+
+    const entityService = workloadsEntityCatalog.release.store.getEntityService(
+      this.releaseTitle,
+      this.endpointGuid,
+      { namespace: this.namespace }
+    );
 
     this.release$ = entityService.waitForEntity$.pipe(
       map((item) => item.entity),
@@ -71,28 +63,26 @@ export class HelmReleaseHelperService {
 
   public fetchReleaseGraph(): Observable<HelmReleaseGraph> {
     // Get helm release
-    const action = new GetHelmReleaseGraph(this.endpointGuid, this.releaseTitle);
-    const entityKey = entityCatalog.getEntityKey(action);
-    return this.store.select(selectEntity<HelmReleaseGraph>(entityKey, action.guid)).pipe(
+    const guid = workloadsEntityCatalog.graph.actions.get(this.releaseTitle, this.endpointGuid).guid;
+    return workloadsEntityCatalog.graph.store.getEntityMonitor(guid).entity$.pipe(
       filter(graph => !!graph)
     );
   }
 
   public fetchReleaseResources(): Observable<HelmReleaseResource> {
     // Get helm release
-    const action = new GetHelmReleaseResource(this.endpointGuid, this.releaseTitle);
-    const entityKey = entityCatalog.getEntityKey(action);
-    return this.store.select(selectEntity<HelmReleaseResource>(entityKey, action.guid)).pipe(
+    const action = workloadsEntityCatalog.resource.actions.get(this.releaseTitle, this.endpointGuid)
+    return workloadsEntityCatalog.resource.store.getEntityMonitor(
+      action.guid
+    ).entity$.pipe(
       filter(resources => !!resources)
     );
   }
 
   public fetchReleaseChartStats(): Observable<HelmReleaseChartData> {
-    const action = new GetHelmReleasePods(this.endpointGuid, this.releaseTitle);
-    return this.paginationMonitorFactory.create(
-      action.paginationKey,
-      action.entity[0],
-      true
+    return kubeEntityCatalog.pod.store.getInWorkload.getPaginationMonitor(
+      this.endpointGuid,
+      this.releaseTitle
     ).currentPage$.pipe(
       filter(pods => !!pods),
       map(this.mapPods)
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index 43b268b89a..daa29e2160 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -12,8 +12,8 @@ import { combineLatest, Observable, ReplaySubject } from 'rxjs';
 import { filter, first, map, publishReplay, refCount, startWith } from 'rxjs/operators';
 
 import { endpointsEntityRequestDataSelector } from '../../../../../../../../store/src/selectors/endpoint.selectors';
-import { GetHelmReleases } from '../../../store/workloads.actions';
 import { HelmReleaseChartData, HelmReleaseResource } from '../../../workload.types';
+import { workloadsEntityCatalog } from '../../../workloads-entity-catalog';
 import { HelmReleaseHelperService } from '../helm-release-helper.service';
 
 @Component({
@@ -188,7 +188,7 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
           this.logService.error('Failed to delete release: ', err);
         },
         complete: () => {
-          const action = new GetHelmReleases();
+          const action = workloadsEntityCatalog.release.actions.getMultiple();
           this.store.dispatch(new ClearPaginationOfType(action));
           this.completeDelete();
           this.store.dispatch(new RouterNav({ path: ['workloads'] }));
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts
new file mode 100644
index 0000000000..eb7591f9c5
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts
@@ -0,0 +1,42 @@
+import {
+  OrchestratedActionBuilders,
+} from '../../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
+import { GetHelmRelease, GetHelmReleaseGraph, GetHelmReleaseResource, GetHelmReleases } from './workloads.actions';
+
+export interface WorkloadReleaseBuilders extends OrchestratedActionBuilders {
+  get: (
+    title: string,
+    endpointGuid: string,
+    extraArgs: { namespace: string }
+  ) => GetHelmRelease;
+  getMultiple: () => GetHelmReleases;
+}
+
+export const workloadReleaseBuilders: WorkloadReleaseBuilders = {
+  get: (title: string, endpointGuid: string, { namespace }: { namespace: string }) => {
+    return new GetHelmRelease(endpointGuid, namespace, title);
+  },
+  getMultiple: () => new GetHelmReleases()
+}
+
+export interface WorkloadGraphBuilders extends OrchestratedActionBuilders {
+  get: (
+    releaseTitle: string,
+    endpointGuid: string
+  ) => GetHelmReleaseGraph
+}
+
+export const workloadGraphBuilders: WorkloadGraphBuilders = {
+  get: (releaseTitle: string, endpointGuid: string) => new GetHelmReleaseGraph(endpointGuid, releaseTitle)
+}
+
+export interface WorkloadResourceBuilders extends OrchestratedActionBuilders {
+  get: (
+    releaseTitle: string,
+    endpointGuid: string,
+  ) => GetHelmReleaseResource
+}
+
+export const workloadResourceBuilders: WorkloadResourceBuilders = {
+  get: (releaseTitle: string, endpointGuid: string) => new GetHelmReleaseResource(endpointGuid, releaseTitle)
+}
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts
index 804514030a..abce799544 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts
@@ -1,6 +1,6 @@
 import { EntitySchema } from '../../../../../../store/src/helpers/entity-schema';
 import { addKubernetesEntitySchema, KubernetesEntitySchema } from '../../kubernetes-entity-factory';
-import { HelmRelease, HelmReleaseGraph, HelmReleaseResource, HelmReleaseService } from '../workload.types';
+import { HelmRelease, HelmReleaseGraph, HelmReleaseResource } from '../workload.types';
 
 export const helmReleaseEntityKey = 'helmRelease';
 export const helmReleasePodEntityType = 'helmReleasePod';
@@ -8,11 +8,21 @@ export const helmReleaseServiceEntityType = 'helmReleaseService';
 export const helmReleaseGraphEntityType = 'helmReleaseGraph';
 export const helmReleaseResourceEntityType = 'helmReleaseResource';
 
-export const getHelmReleaseId = (entity: HelmRelease) => `${entity.endpointId}-${entity.namespace}-${entity.name}`;
-export const getHelmReleaseServiceId =
-  (entity: HelmReleaseService) => `${entity.endpointId}-${entity.releaseTitle}-${entity.metadata.name}`;
-export const getHelmReleaseGraphId = (entity: HelmReleaseGraph) => `${entity.endpointId}-${entity.releaseTitle}`;
-export const getHelmReleaseResourceId = (entity: HelmReleaseResource) => `${entity.endpointId}-${entity.releaseTitle}`;
+const separator = ':';
+export const getHelmReleaseDetailsFromGuid = (guid: string) => {
+  const parts = guid.split(separator);
+  return {
+    endpointId: parts[0],
+    namespace: parts[1],
+    releaseTitle: parts[2]
+  }
+}
+export const getHelmReleaseId = (endpointId: string, namespace: string, name: string) => `${endpointId}${separator}${namespace}${separator}${name}`;
+export const getHelmReleaseIdByObj = (entity: HelmRelease) => getHelmReleaseId(entity.endpointId, entity.namespace, entity.name);
+export const getHelmReleaseGraphId = (endpointId: string, releaseTitle: string) => `${endpointId}${separator}${releaseTitle}`;
+export const getHelmReleaseGraphIdByObj = (entity: HelmReleaseGraph) => getHelmReleaseGraphId(entity.endpointId, entity.releaseTitle);
+export const getHelmReleaseResourceId = (endpointId: string, releaseTitle: string) => `${endpointId}${separator}${releaseTitle}`;
+export const getHelmReleaseResourceIdByObj = (entity: HelmReleaseResource) => getHelmReleaseResourceId(entity.endpointId, entity.releaseTitle);
 
 const entityCache: {
   [key: string]: EntitySchema
@@ -21,19 +31,19 @@ const entityCache: {
 entityCache[helmReleaseEntityKey] = new KubernetesEntitySchema(
   helmReleaseEntityKey,
   {},
-  { idAttribute: getHelmReleaseId }
+  { idAttribute: getHelmReleaseIdByObj }
 );
 
 entityCache[helmReleaseGraphEntityType] = new KubernetesEntitySchema(
   helmReleaseGraphEntityType,
   {},
-  { idAttribute: getHelmReleaseGraphId }
+  { idAttribute: getHelmReleaseGraphIdByObj }
 );
 
 entityCache[helmReleaseResourceEntityType] = new KubernetesEntitySchema(
   helmReleaseResourceEntityType,
   {},
-  { idAttribute: getHelmReleaseResourceId }
+  { idAttribute: getHelmReleaseResourceIdByObj }
 );
 
 Object.entries(entityCache).forEach(([key, workloadSchema]) => addKubernetesEntitySchema(key, workloadSchema));
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 3f326da1ed..f4a0939afa 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,12 +1,20 @@
-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 { StratosEndpointExtensionDefinition } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
+import { IFavoriteMetadata } from '../../../../../../store/src/types/user-favorites.types';
 import { kubernetesEntityFactory } from '../../kubernetes-entity-factory';
 import { HelmRelease, HelmReleaseGraph, HelmReleaseResource } from '../workload.types';
+import { workloadsEntityCatalog } from '../workloads-entity-catalog';
+import {
+  WorkloadGraphBuilders,
+  workloadGraphBuilders,
+  WorkloadReleaseBuilders,
+  workloadReleaseBuilders,
+  WorkloadResourceBuilders,
+  workloadResourceBuilders,
+} from './workload-action-builders';
 import { helmReleaseEntityKey, helmReleaseGraphEntityType, helmReleaseResourceEntityType } from './workloads-entity-factory';
 
 
@@ -18,14 +26,19 @@ export function generateWorkloadsEntities(endpointDefinition: StratosEndpointExt
   ];
 }
 
-
 function generateReleaseEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   const definition = {
     type: helmReleaseEntityKey,
     schema: kubernetesEntityFactory(helmReleaseEntityKey),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, HelmRelease>(definition);
+  workloadsEntityCatalog.release = new StratosCatalogEntity<IFavoriteMetadata, HelmRelease, WorkloadReleaseBuilders>(
+    definition,
+    {
+      actionBuilders: workloadReleaseBuilders
+    }
+  );
+  return workloadsEntityCatalog.release;
 }
 
 function generateReleaseGraphEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -34,7 +47,13 @@ function generateReleaseGraphEntity(endpointDefinition: StratosEndpointExtension
     schema: kubernetesEntityFactory(helmReleaseGraphEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseGraph>(definition);
+  workloadsEntityCatalog.graph = new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseGraph, WorkloadGraphBuilders>(
+    definition,
+    {
+      actionBuilders: workloadGraphBuilders
+    }
+  );
+  return workloadsEntityCatalog.graph;
 }
 
 function generateReleaseResourceEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -43,6 +62,12 @@ function generateReleaseResourceEntity(endpointDefinition: StratosEndpointExtens
     schema: kubernetesEntityFactory(helmReleaseResourceEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseResource>(definition);
+  workloadsEntityCatalog.resource = new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseResource, WorkloadResourceBuilders>(
+    definition,
+    {
+      actionBuilders: workloadResourceBuilders
+    }
+  );
+  return workloadsEntityCatalog.resource;
 }
 
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
index 92818a4800..319ef74b8b 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
@@ -1,6 +1,6 @@
-import { Action } from '@ngrx/store';
 import { EntityRequestAction } from 'frontend/packages/store/src/types/request.types';
 
+import { PaginatedAction } from '../../../../../../store/src/types/pagination.types';
 import { MonocularPaginationAction } from '../../../helm/store/helm.actions';
 import {
   KUBERNETES_ENDPOINT_TYPE,
@@ -8,7 +8,15 @@ import {
   kubernetesPodsEntityType,
   kubernetesServicesEntityType,
 } from '../../kubernetes-entity-factory';
-import { helmReleaseEntityKey, helmReleaseGraphEntityType, helmReleaseResourceEntityType } from './workloads-entity-factory';
+import { KubePaginationAction } from '../../store/kubernetes.actions';
+import {
+  getHelmReleaseGraphId,
+  getHelmReleaseId,
+  getHelmReleaseResourceId,
+  helmReleaseEntityKey,
+  helmReleaseGraphEntityType,
+  helmReleaseResourceEntityType,
+} from './workloads-entity-factory';
 
 export const GET_HELM_RELEASES = '[Helm] Get Releases';
 export const GET_HELM_RELEASES_SUCCESS = '[Helm] Get Releases Success';
@@ -30,6 +38,14 @@ export const UPDATE_HELM_RELEASE = '[Helm] Update Release';
 export const UPDATE_HELM_RELEASE_SUCCESS = '[Helm] Update Release Success';
 export const UPDATE_HELM_RELEASE_FAILURE = '[Helm] Update Release Failure';
 
+interface HelmReleaseSingleEntity extends EntityRequestAction {
+  guid: string;
+}
+
+interface HelmReleasePaginated extends PaginatedAction, EntityRequestAction {
+
+}
+
 export class GetHelmReleases implements MonocularPaginationAction {
   constructor() {
     this.paginationKey = 'helm-releases';
@@ -50,14 +66,15 @@ export class GetHelmReleases implements MonocularPaginationAction {
   };
 }
 
-export class GetHelmRelease implements EntityRequestAction {
+
+export class GetHelmRelease implements HelmReleaseSingleEntity {
   guid: string;
   constructor(
     public endpointGuid: string,
     public namespace: string,
     public releaseTitle: string
   ) {
-    this.guid = `${endpointGuid}:${namespace}:${releaseTitle}`;
+    this.guid = getHelmReleaseId(endpointGuid, namespace, releaseTitle);
   }
   type = GET_HELM_RELEASE;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
@@ -70,13 +87,13 @@ export class GetHelmRelease implements EntityRequestAction {
   ];
 }
 
-export class GetHelmReleaseGraph implements EntityRequestAction {
+export class GetHelmReleaseGraph implements HelmReleaseSingleEntity {
   guid: string;
   constructor(
     public endpointGuid: string,
     public releaseTitle: string
   ) {
-    this.guid = `${endpointGuid}-${releaseTitle}`;
+    this.guid = getHelmReleaseGraphId(endpointGuid, releaseTitle);
   }
   type = this.constructor.name;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
@@ -85,30 +102,30 @@ export class GetHelmReleaseGraph implements EntityRequestAction {
   actions = [this.type];
 }
 
-export class GetHelmReleaseResource implements EntityRequestAction {
-  guid: string;
+export class GetHelmReleaseResource implements HelmReleaseSingleEntity {
   constructor(
     public endpointGuid: string,
     public releaseTitle: string
   ) {
-    this.guid = `${endpointGuid}-${releaseTitle}`;
+    this.guid = getHelmReleaseResourceId(this.endpointGuid, this.releaseTitle);
   }
   type = this.constructor.name;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
   entity = kubernetesEntityFactory(helmReleaseResourceEntityType);
   entityType = helmReleaseResourceEntityType;
   actions = [this.type];
+  guid: string;
 }
 
 /**
  * Won't fetch pods, used to push/retrieve data from store
  */
-export class GetHelmReleasePods implements MonocularPaginationAction {
+export class GetHelmReleasePods implements KubePaginationAction {
   constructor(
-    public endpointGuid: string,
+    public kubeGuid: string,
     public releaseTitle: string
   ) {
-    this.paginationKey = `${endpointGuid}/${releaseTitle}/pods`;
+    this.paginationKey = `${kubeGuid}/${releaseTitle}/pods`;
   }
   type = GET_HELM_RELEASE_PODS;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
@@ -124,17 +141,19 @@ export class GetHelmReleasePods implements MonocularPaginationAction {
     'order-direction': 'desc',
     'order-direction-field': 'name',
   };
+  flattenPagination = true;
 }
 
+
 /**
- * Won't fetch pods, used to push/retrieve data from store
+ * Won't fetch services, used to push/retrieve data from store
  */
-export class GetHelmReleaseServices implements MonocularPaginationAction {
+export class GetHelmReleaseServices implements KubePaginationAction {
   constructor(
-    public endpointGuid: string,
+    public kubeGuid: string,
     public releaseTitle: string
   ) {
-    this.paginationKey = `${endpointGuid}/${releaseTitle}/services`;
+    this.paginationKey = `${kubeGuid}/${releaseTitle}/services`;
   }
   type = GET_HELM_RELEASE_SERVICES;
   endpointType = KUBERNETES_ENDPOINT_TYPE;
@@ -150,9 +169,5 @@ export class GetHelmReleaseServices implements MonocularPaginationAction {
     'order-direction': 'desc',
     'order-direction-field': 'name',
   };
-}
-
-export class HelmUpdateRelease implements Action {
-  constructor(public values: any) { }
-  type = UPDATE_HELM_RELEASE;
+  flattenPagination = true;
 }
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 086bc29fd8..ea7add12fe 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
@@ -15,7 +15,9 @@ import {
   WrapperRequestActionFailed,
   WrapperRequestActionSuccess,
 } from '../../../../../../store/src/types/request.types';
+import { HelmEffects } from '../../../helm/store/helm.effects';
 import { HelmRelease } from '../workload.types';
+import { getHelmReleaseId } from './workloads-entity-factory';
 import { GET_HELM_RELEASE, GET_HELM_RELEASES, GetHelmRelease, GetHelmReleases } from './workloads.actions';
 
 @Injectable()
@@ -48,7 +50,7 @@ export class WorkloadsEffects {
             return;
           }
           endpointData.forEach((data) => {
-            const helmRelease = this.mapHelmRelease(data, endpointId);
+            const helmRelease = this.mapHelmRelease(data, endpointId, getHelmReleaseId(endpointId, data.namespace, data.name));
             processedData.entities[entityKey][helmRelease.guid] = helmRelease;
             processedData.result.push(helmRelease.guid);
           });
@@ -73,20 +75,20 @@ export class WorkloadsEffects {
           } as NormalizedResponse;
 
           // Go through each endpoint ID
-          processedData.entities[entityKey][action.guid] = this.mapHelmRelease(response, action.endpointGuid);
+          processedData.entities[entityKey][action.guid] = this.mapHelmRelease(response, action.endpointGuid, action.guid);
           processedData.result.push(action.guid);
           return processedData;
         }, [action.endpointGuid]);
     })
   );
 
-  private mapHelmRelease(data, endpointId) {
+  private mapHelmRelease(data, endpointId, guid: string) {
     const helmRelease: HelmRelease = {
       ...data,
       endpointId
     };
     // Release name is unique for an endpoint - for Helm 3, include the namespace
-    helmRelease.guid = endpointId + ':' + data.namespace + ':' + data.name;
+    helmRelease.guid = guid;
     // Make a note of the guid of the endpoint for the release
     helmRelease.status = data.info.status;
     helmRelease.lastDeployed = this.mapHelmModifiedDate(data.info.last_deployed);
@@ -107,15 +109,19 @@ export class WorkloadsEffects {
     };
     return this.httpClient.get(url, requestArgs).pipe(
       mergeMap((response: any) => [new WrapperRequestActionSuccess(mapResult(response), action)]),
-      catchError(error => [
-        new WrapperRequestActionFailed(error.message, action, 'fetch', {
-          endpointIds,
-          url: error.url || url,
-          eventCode: error.status ? error.status + '' : '500',
-          message: 'Helm Release API request error',
-          error
-        })
-      ])
+      catchError(error => {
+        const { status, message } = HelmEffects.createHelmError(error);
+        const errorMessage = `Failed to fetch helm data: ${message}`;
+        return [
+          new WrapperRequestActionFailed(errorMessage, action, 'fetch', {
+            endpointIds,
+            url: error.url || url,
+            eventCode: status,
+            message: errorMessage,
+            error
+          })
+        ]
+      })
     );
   }
 
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
index b0394359ab..f91220bad4 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
 
-import { KubeService } from '../store/kube.types';
+import { KubernetesPod, KubeService } from '../store/kube.types';
 
 export interface HelmRelease {
   endpointId: string;
@@ -27,28 +26,16 @@ export interface HelmRelease {
   };
 }
 
-export interface HelmReleasePod {
+export interface HelmReleaseEntity {
   endpointId: string;
   releaseTitle: string;
-  name: string;
-  ready: string;
-  status: string;
-  restarts: string;
-  age: string;
 }
 
-export interface HelmReleaseService {
-  endpointId: string;
-  releaseTitle: string;
-  name: string;
-  kubeService$?: Observable<KubeService>;
-  metadata: any;
-  spec: any;
-}
+export interface HelmReleasePod extends HelmReleaseEntity, KubernetesPod { }
 
-export interface HelmReleaseGraph {
-  endpointId: string;
-  releaseTitle: string;
+export interface HelmReleaseService extends HelmReleaseEntity, KubeService { }
+
+export interface HelmReleaseGraph extends HelmReleaseEntity {
   nodes: {};
   links: {};
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workloads-entity-catalog.ts b/custom-src/frontend/app/custom/kubernetes/workloads/workloads-entity-catalog.ts
new file mode 100644
index 0000000000..06d3a33c04
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/workloads-entity-catalog.ts
@@ -0,0 +1,20 @@
+import { StratosCatalogEntity } from '../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { IFavoriteMetadata } from '../../../../../store/src/types/user-favorites.types';
+import { WorkloadGraphBuilders, WorkloadReleaseBuilders, WorkloadResourceBuilders } from './store/workload-action-builders';
+import { HelmRelease, HelmReleaseGraph, HelmReleaseResource } from './workload.types';
+
+/**
+ * A strongly typed collection of Workload Catalog Entities.
+ * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc
+ */
+export class WorkloadsEntityCatalog {
+  release: StratosCatalogEntity<IFavoriteMetadata, HelmRelease, WorkloadReleaseBuilders>;
+  graph: StratosCatalogEntity<IFavoriteMetadata, HelmReleaseGraph, WorkloadGraphBuilders>
+  resource: StratosCatalogEntity<IFavoriteMetadata, HelmReleaseResource, WorkloadResourceBuilders>
+}
+
+/**
+ * A strongly typed collection of Workload Catalog Entities.
+ * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc
+ */
+export const workloadsEntityCatalog: WorkloadsEntityCatalog = new WorkloadsEntityCatalog();
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 1061670864..7f0a6a1cbf 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
@@ -26,8 +26,6 @@ import { AppAutoscalerMetricChartCardComponent } from './app-autoscaler-metric-c
 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', () => {
   let component: 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 383469b8a8..4c6669fe61 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
@@ -18,9 +18,6 @@ import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagi
 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 */
 
 describe('AppAutoscalerMetricChartListConfigService', () => {
   beforeEach(() => {
diff --git a/src/frontend/packages/cloud-foundry/src/actions/buildpack.action.ts b/src/frontend/packages/cloud-foundry/src/actions/buildpack.action.ts
index 8fe4445485..d7a40dee9d 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/buildpack.action.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/buildpack.action.ts
@@ -1,9 +1,10 @@
+import { HttpRequest } from '@angular/common/http';
+
 import { getActions } from '../../../store/src/actions/action.helper';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { cfEntityFactory } from '../cf-entity-factory';
 import { buildpackEntityType } from '../cf-entity-types';
 import { CFStartAction } from './cf-action.types';
-import { HttpRequest } from '@angular/common/http';
 
 export class FetchAllBuildpacks extends CFStartAction implements PaginatedAction {
   constructor(public endpointGuid: string, public paginationKey: string) {
diff --git a/src/frontend/packages/cloud-foundry/src/actions/domains.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/domains.actions.ts
index 6d56f47d8d..13d4f6d59b 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/domains.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/domains.actions.ts
@@ -1,3 +1,5 @@
+import { HttpRequest } from '@angular/common/http';
+
 import { endpointSchemaKey } from '../../../store/src/helpers/entity-factory';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
@@ -5,7 +7,6 @@ import { cfEntityFactory } from '../cf-entity-factory';
 import { domainEntityType } from '../cf-entity-types';
 import { createEntityRelationPaginationKey } from '../entity-relations/entity-relations.types';
 import { CFStartAction } from './cf-action.types';
-import { HttpRequest } from '@angular/common/http';
 
 export const GET_DOMAIN = '[domain] Get domain ';
 export const GET_DOMAIN_SUCCESS = '[domain] Get domain success';
diff --git a/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts
index 1d8e1129fd..b0d2154801 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts
@@ -1,13 +1,11 @@
+import { HttpParams, HttpRequest } from '@angular/common/http';
+
 import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types';
-import {
-  EntityInlineChildAction,
-  EntityInlineParentAction,
-} from '../entity-relations/entity-relations.types';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
-import { RequestEntityLocation, RequestActionEntity } from '../../../store/src/types/request.types';
-import { CFStartAction } from './cf-action.types';
+import { RequestActionEntity, RequestEntityLocation } from '../../../store/src/types/request.types';
 import { EntityTreeRelation } from '../entity-relations/entity-relation-tree';
-import { HttpRequest, HttpParams } from '@angular/common/http';
+import { EntityInlineChildAction, EntityInlineParentAction } from '../entity-relations/entity-relations.types';
+import { CFStartAction } from './cf-action.types';
 
 const relationActionId = 'FetchRelationAction';
 
diff --git a/src/frontend/packages/cloud-foundry/src/actions/security-groups-actions.ts b/src/frontend/packages/cloud-foundry/src/actions/security-groups-actions.ts
index 1930e67071..8d882c6a44 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/security-groups-actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/security-groups-actions.ts
@@ -1,10 +1,11 @@
+import { HttpRequest } from '@angular/common/http';
+
 import { getActions } from '../../../store/src/actions/action.helper';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { cfEntityFactory } from '../cf-entity-factory';
 import { securityGroupEntityType, spaceEntityType } from '../cf-entity-types';
 import { createEntityRelationKey, EntityInlineParentAction } from '../entity-relations/entity-relations.types';
 import { CFStartAction } from './cf-action.types';
-import { HttpRequest } from '@angular/common/http';
 
 export class GetAllSecurityGroups extends CFStartAction implements PaginatedAction, EntityInlineParentAction {
   constructor(
diff --git a/src/frontend/packages/cloud-foundry/src/actions/service-bindings.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/service-bindings.actions.ts
index d0a2763cfb..cd7763a255 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/service-bindings.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/service-bindings.actions.ts
@@ -1,10 +1,11 @@
+import { HttpParams, HttpRequest } from '@angular/common/http';
+
 import { getActions } from '../../../store/src/actions/action.helper';
 import { PaginatedAction, PaginationParam } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
 import { cfEntityFactory } from '../cf-entity-factory';
 import { serviceBindingEntityType } from '../cf-entity-types';
 import { CFStartAction } from './cf-action.types';
-import { HttpRequest, HttpParams } from '@angular/common/http';
 
 export const DELETE_SERVICE_BINDING_ACTION = '[ Service Instances ] Delete Service Binding';
 export const DELETE_SERVICE_BINDING_ACTION_SUCCESS = '[ Service Instances ] Delete Service Binding success';
diff --git a/src/frontend/packages/cloud-foundry/src/actions/service-broker.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/service-broker.actions.ts
index a598c73a26..5dfefc6e7b 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/service-broker.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/service-broker.actions.ts
@@ -1,10 +1,11 @@
+import { HttpRequest } from '@angular/common/http';
+
 import { getActions } from '../../../store/src/actions/action.helper';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { EntityRequestAction } from '../../../store/src/types/request.types';
 import { cfEntityFactory } from '../cf-entity-factory';
 import { serviceBrokerEntityType } from '../cf-entity-types';
 import { CFStartAction } from './cf-action.types';
-import { HttpRequest } from '@angular/common/http';
 
 export class GetServiceBrokers extends CFStartAction implements PaginatedAction {
   constructor(
diff --git a/src/frontend/packages/cloud-foundry/src/actions/service-plan-visibility.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/service-plan-visibility.actions.ts
index 34e8b3dde4..42adf48a73 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/service-plan-visibility.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/service-plan-visibility.actions.ts
@@ -1,3 +1,5 @@
+import { HttpRequest } from '@angular/common/http';
+
 import { getActions } from '../../../store/src/actions/action.helper';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { cfEntityFactory } from '../cf-entity-factory';
@@ -9,7 +11,6 @@ import {
 } from '../cf-entity-types';
 import { createEntityRelationKey } from '../entity-relations/entity-relations.types';
 import { CFStartAction } from './cf-action.types';
-import { HttpRequest } from '@angular/common/http';
 
 export class GetServicePlanVisibilities extends CFStartAction implements PaginatedAction {
   constructor(
diff --git a/src/frontend/packages/cloud-foundry/src/actions/service-plan.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/service-plan.actions.ts
index d12c5e0ee3..a7b2621cda 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/service-plan.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/service-plan.actions.ts
@@ -1,3 +1,5 @@
+import { HttpRequest } from '@angular/common/http';
+
 import { getActions } from '../../../store/src/actions/action.helper';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { cfEntityFactory } from '../cf-entity-factory';
@@ -12,7 +14,6 @@ import {
 } from '../cf-entity-types';
 import { createEntityRelationKey } from '../entity-relations/entity-relations.types';
 import { CFStartAction } from './cf-action.types';
-import { HttpRequest } from '@angular/common/http';
 
 export class GetServicePlanServiceInstances extends CFStartAction implements PaginatedAction {
   constructor(
diff --git a/src/frontend/packages/core/sass/components/mat-table.scss b/src/frontend/packages/core/sass/components/mat-table.scss
index 6eef03a63d..c623288894 100644
--- a/src/frontend/packages/core/sass/components/mat-table.scss
+++ b/src/frontend/packages/core/sass/components/mat-table.scss
@@ -16,10 +16,18 @@ $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/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;
+  .app-table {
+    // 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;
+    }
+    .has-expanded-row {
+      // Override the margin-left from above, there's a lot of white space going on
+      .mat-cell:first-of-type, mat-footer-cell:first-of-type, mat-header-cell:first-of-type {
+        margin-left: 10px;
+      }
+    }
   }
 
   // Use margin, not padding for the right side of the first cell in the row/header/footer
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 bfbec70bda..b86b52acc0 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
@@ -14,7 +14,9 @@ <h1>Backup Endpoints</h1>
         <button mat-raised-button color="primary" [disabled]="disableSelectNone$ | async"
           (click)="service.selectNone()">Select None</button>
       </div>
-      <app-table [dataSource]="endpointDataSource" [columns]="columns"></app-table>
+      <!-- 77px is the min height given Connection details drop down. In some cases it's missing, those rows would be
+      shorter without the min height here -->
+      <app-table [dataSource]="endpointDataSource" [columns]="columns" [minRowHeight]="'77px'"></app-table>
     </div>
     <ng-template #noEndpoints>
       <p>There are no endpoints to backup</p>
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 6407fa952b..d1558f2b9d 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
@@ -24,11 +24,11 @@ <h2 class="metrics-url">
     </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">
+      <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>
+            <mat-card-content>
               <div class="metrics-info">
                 <mat-icon fontSet="{{ info.icon.font }}">{{info.icon.name }}</mat-icon>
                 <div class="metrics-metadata">
@@ -36,12 +36,16 @@ <h2 class="metrics-url">
                   <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>
+                      <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 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>
@@ -56,9 +60,11 @@ <h2 class="metrics-url">
                   <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>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 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>
@@ -68,5 +74,4 @@ <h2 class="metrics-url">
       </ul>
     </div>
   </div>
-</div>
-
+</div>
\ No newline at end of file
diff --git a/src/frontend/packages/store/src/selectors/endpoint.selectors.ts b/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
index 0400350b59..cfcd00d4c9 100644
--- a/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
+++ b/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
@@ -61,10 +61,6 @@ export const endpointsCFEntitiesSelector = createSelector(
   cfEndpointEntitiesSelector
 );
 
-// const log = (label) => {
-//   return (val) => console.log(label, val);
-// };
-
 // TODO: Move this #3769
 export const endpointsCfEntitiesConnectedSelector = connectedEndpointsOfTypesSelector('cf');
 
diff --git a/src/frontend/packages/store/src/types/request.types.ts b/src/frontend/packages/store/src/types/request.types.ts
index 1e14568f76..e1b855210c 100644
--- a/src/frontend/packages/store/src/types/request.types.ts
+++ b/src/frontend/packages/store/src/types/request.types.ts
@@ -1,9 +1,9 @@
 import { HttpRequest } from '@angular/common/http';
 import { Action } from '@ngrx/store';
 
+import { ApiActionTypes, RequestTypes } from '../actions/request.actions';
 import { BasePipelineRequestAction } from '../entity-catalog/action-orchestrator/action-orchestrator';
 import { EntityCatalogEntityConfig } from '../entity-catalog/entity-catalog.types';
-import { ApiActionTypes, RequestTypes } from '../actions/request.actions';
 import { EntitySchema } from '../helpers/entity-schema';
 import { ApiRequestTypes } from '../reducers/api-request-reducer/request-helpers';
 import { NormalizedResponse } from './api.types';

From ac7753f8d2e001464a1bd05934fd3aa057ff55d1 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 16 Jun 2020 11:44:44 +0100
Subject: [PATCH 536/648] Fix compile

---
 .../workloads/release/tabs/helm-release-helper.service.ts       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 f7a8ba1229..7ff04b0f07 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
@@ -3,7 +3,7 @@ import { Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
 import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog';
-import { ContainerStateCollection, KubernetesPod, KubernetesPod } from '../../../store/kube.types';
+import { ContainerStateCollection, KubernetesPod } from '../../../store/kube.types';
 import { getHelmReleaseDetailsFromGuid } from '../../store/workloads-entity-factory';
 import {
   HelmRelease,

From d835710da94ecfacf20eeb3692f0fffb7f36ab28 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 16 Jun 2020 14:45:03 +0100
Subject: [PATCH 537/648] Minor changes following review

---
 .../workloads/release/tabs/helm-release-helper.service.ts | 1 -
 .../shared/components/ring-chart/ring-chart.component.ts  | 8 ++------
 2 files changed, 2 insertions(+), 7 deletions(-)

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 7ff04b0f07..a7dd8aaa99 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
@@ -133,7 +133,6 @@ export class HelmReleaseHelperService {
   }
 
   private isContainerReady(state: ContainerStateCollection = {}): Boolean {
-    console.log(state);
     if (state.running) {
       return true;
     } else if (!!state.waiting) {
diff --git a/src/frontend/packages/core/src/shared/components/ring-chart/ring-chart.component.ts b/src/frontend/packages/core/src/shared/components/ring-chart/ring-chart.component.ts
index 681984c9d6..be9557639d 100644
--- a/src/frontend/packages/core/src/shared/components/ring-chart/ring-chart.component.ts
+++ b/src/frontend/packages/core/src/shared/components/ring-chart/ring-chart.component.ts
@@ -1,5 +1,5 @@
-import { Component, Input, OnChanges, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
-import { AdvancedLegendComponent, ColorHelper } from '@swimlane/ngx-charts';
+import { Component, Input, OnChanges, OnInit, ViewEncapsulation } from '@angular/core';
+import { ColorHelper } from '@swimlane/ngx-charts';
 
 @Component({
   selector: 'app-ring-chart',
@@ -24,10 +24,6 @@ export class RingChartComponent implements OnInit, OnChanges {
   @Input() nameFormatting: (value: string) => any = label => label;
   @Input() percentageFormatting: (value: number) => any = percentage => percentage;
 
-  @ViewChild(AdvancedLegendComponent) lineSeriesComponent: AdvancedLegendComponent;
-
-  constructor() { }
-
   ngOnInit() {
     if (!this.data) {
       this.data = [];

From 2da8d284247cdb758339ca9eb62ce457f69480de Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 16 Jun 2020 16:21:31 +0100
Subject: [PATCH 538/648] Workload: Add warning if manifest parse contains
 errors

---
 .../helm-release-tab-base.component.ts        | 15 +++++
 .../tabs/helm-release-helper.service.ts       |  1 +
 .../store/workload-action-builders.ts         | 15 ++++-
 .../store/workloads-entity-generator.ts       |  8 ++-
 .../workloads/store/workloads.actions.ts      | 19 ++++++-
 .../workloads/store/workloads.reducers.ts     | 57 ++++++++++++++++++-
 .../kubernetes/workloads/workload.types.ts    |  1 +
 .../plugins/kubernetes/get_release.go         |  2 +
 .../plugins/kubernetes/helm/release.go        | 13 +++--
 9 files changed, 120 insertions(+), 11 deletions(-)

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 3c62493c90..66a1ff7641 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
@@ -5,6 +5,7 @@ import { Observable, Subject, Subscription } from 'rxjs';
 import makeWebSocketObservable, { GetWebSocketResponses } from 'rxjs-websockets';
 import { catchError, map, share, switchMap } from 'rxjs/operators';
 
+import { HideSnackBar, ShowSnackBar } from '../../../../../../../store/src/actions/snackBar.actions';
 import { AppState } from '../../../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
 import { EntityRequestAction, WrapperRequestActionSuccess } from '../../../../../../../store/src/types/request.types';
@@ -142,6 +143,19 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
             resources.endpointId,
           );
           this.addResource(releaseResourceAction, resources);
+        } else if (messageObj.kind === 'ManifestErrors') {
+          const manifestErrors = messageObj.data;
+          workloadsEntityCatalog.release.api.setManifestError(
+            this.helmReleaseHelper.endpointGuid,
+            this.helmReleaseHelper.namespace,
+            this.helmReleaseHelper.releaseTitle,
+            manifestErrors
+          )
+          if (manifestErrors) {
+            this.store.dispatch(
+              new ShowSnackBar('Errors were found whilst loading this workload. Not all resources may be shown', 'Dismiss')
+            );
+          }
         }
       }
     });
@@ -189,5 +203,6 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
 
   ngOnDestroy() {
     this.sub.unsubscribe();
+    this.store.dispatch(new HideSnackBar());
   }
 }
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 bcdef4478b..90a4deff6d 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
@@ -44,6 +44,7 @@ export class HelmReleaseHelperService {
 
     this.release$ = entityService.waitForEntity$.pipe(
       map((item) => item.entity),
+      filter(item => !!item.chart),
       map((item: HelmRelease) => {
         if (!item.chart.metadata.icon) {
           const copy = JSON.parse(JSON.stringify(item));
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts
index eb7591f9c5..944b7ab893 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts
@@ -1,7 +1,13 @@
 import {
   OrchestratedActionBuilders,
 } from '../../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
-import { GetHelmRelease, GetHelmReleaseGraph, GetHelmReleaseResource, GetHelmReleases } from './workloads.actions';
+import {
+  GetHelmRelease,
+  GetHelmReleaseGraph,
+  GetHelmReleaseResource,
+  GetHelmReleases,
+  UpdateHelmReleaseManifestError,
+} from './workloads.actions';
 
 export interface WorkloadReleaseBuilders extends OrchestratedActionBuilders {
   get: (
@@ -9,6 +15,11 @@ export interface WorkloadReleaseBuilders extends OrchestratedActionBuilders {
     endpointGuid: string,
     extraArgs: { namespace: string }
   ) => GetHelmRelease;
+  setManifestError: (
+    endpointGuid: string,
+    namespace: string,
+    releaseTitle: string,
+    manifestError: boolean) => UpdateHelmReleaseManifestError;
   getMultiple: () => GetHelmReleases;
 }
 
@@ -16,6 +27,8 @@ export const workloadReleaseBuilders: WorkloadReleaseBuilders = {
   get: (title: string, endpointGuid: string, { namespace }: { namespace: string }) => {
     return new GetHelmRelease(endpointGuid, namespace, title);
   },
+  setManifestError: (endpointGuid: string, namespace: string, releaseTitle: string, manifestError: boolean) =>
+    new UpdateHelmReleaseManifestError(endpointGuid, namespace, releaseTitle, manifestError),
   getMultiple: () => new GetHelmReleases()
 }
 
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 f4a0939afa..652c4287ad 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
@@ -16,6 +16,7 @@ import {
   workloadResourceBuilders,
 } from './workload-action-builders';
 import { helmReleaseEntityKey, helmReleaseGraphEntityType, helmReleaseResourceEntityType } from './workloads-entity-factory';
+import { helmReleaseEntityReducer } from './workloads.reducers';
 
 
 export function generateWorkloadsEntities(endpointDefinition: StratosEndpointExtensionDefinition): StratosBaseCatalogEntity[] {
@@ -30,12 +31,15 @@ function generateReleaseEntity(endpointDefinition: StratosEndpointExtensionDefin
   const definition = {
     type: helmReleaseEntityKey,
     schema: kubernetesEntityFactory(helmReleaseEntityKey),
-    endpoint: endpointDefinition
+    endpoint: endpointDefinition,
   };
   workloadsEntityCatalog.release = new StratosCatalogEntity<IFavoriteMetadata, HelmRelease, WorkloadReleaseBuilders>(
     definition,
     {
-      actionBuilders: workloadReleaseBuilders
+      actionBuilders: workloadReleaseBuilders,
+      dataReducers: [
+        helmReleaseEntityReducer()
+      ],
     }
   );
   return workloadsEntityCatalog.release;
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
index 319ef74b8b..54996403a7 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
@@ -1,3 +1,4 @@
+import { Action } from '@ngrx/store';
 import { EntityRequestAction } from 'frontend/packages/store/src/types/request.types';
 
 import { PaginatedAction } from '../../../../../../store/src/types/pagination.types';
@@ -26,6 +27,9 @@ export const GET_HELM_RELEASE = '[Helm] Get Release Status';
 export const GET_HELM_RELEASE_SUCCESS = '[Helm] Get Release Status Success';
 export const GET_HELM_RELEASE_FAILURE = '[Helm] Get Release Status Failure';
 
+
+export const UPDATE_HELM_RELEASE_MANIFEST_ERROR = '[Helm] Update Release Error';
+
 export const GET_HELM_RELEASE_PODS = '[Helm] Get Release Pods';
 export const GET_HELM_RELEASE_PODS_SUCCESS = '[Helm] Get Release Pods Success';
 export const GET_HELM_RELEASE_PODS_FAILURE = '[Helm] Get Release Pods Failure';
@@ -66,7 +70,6 @@ export class GetHelmReleases implements MonocularPaginationAction {
   };
 }
 
-
 export class GetHelmRelease implements HelmReleaseSingleEntity {
   guid: string;
   constructor(
@@ -87,6 +90,20 @@ export class GetHelmRelease implements HelmReleaseSingleEntity {
   ];
 }
 
+export class UpdateHelmReleaseManifestError implements Action {
+  guid: string;
+  constructor(
+    public endpointGuid: string,
+    public namespace: string,
+    public releaseTitle: string,
+    public manifestError: boolean
+  ) {
+    this.guid = getHelmReleaseId(endpointGuid, namespace, releaseTitle);
+  }
+  type = UPDATE_HELM_RELEASE_MANIFEST_ERROR;
+}
+
+
 export class GetHelmReleaseGraph implements HelmReleaseSingleEntity {
   guid: string;
   constructor(
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.reducers.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.reducers.ts
index 1d6797ee74..2d26f38b03 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.reducers.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.reducers.ts
@@ -1,12 +1,65 @@
-import { UPDATE_HELM_RELEASE } from './workloads.actions';
+import { Action } from '@ngrx/store';
+
+import { IRequestEntityTypeState } from '../../../../../../store/src/app-state';
+import { HelmRelease } from '../workload.types';
+import {
+  UPDATE_HELM_RELEASE,
+  UPDATE_HELM_RELEASE_MANIFEST_ERROR,
+  UpdateHelmReleaseManifestError,
+} from './workloads.actions';
 
 const defaultState = {};
 
-export function helmReleaseReducer(state: any = defaultState, action) {
+export function helmReleaseReducer(state = defaultState, action) {
   switch (action.type) {
     case UPDATE_HELM_RELEASE:
       return {
         ...state,
       };
+
   }
 }
+
+const createDefaultHelmRelease = (
+  endpointGuid: string,
+  guid: string,
+  name: string,
+  namespace: string
+): HelmRelease => ({
+  chart: null,
+  config: null,
+  endpointId: endpointGuid,
+  firstDeployed: null,
+  guid,
+  info: null,
+  lastDeployed: null,
+  manifestError: false,
+  name,
+  namespace,
+  status: null,
+  version: null
+})
+export function helmReleaseEntityReducer() {
+  return (state: IRequestEntityTypeState<HelmRelease>, action: Action) => {
+    switch (action.type) {
+      case UPDATE_HELM_RELEASE_MANIFEST_ERROR:
+        const updateErrorAction = action as UpdateHelmReleaseManifestError;
+        const release: HelmRelease = state[updateErrorAction.guid] || createDefaultHelmRelease(
+          updateErrorAction.endpointGuid,
+          updateErrorAction.guid,
+          updateErrorAction.releaseTitle,
+          updateErrorAction.namespace
+        );
+        if (release.manifestError !== updateErrorAction.manifestError) {
+          return {
+            ...state,
+            [updateErrorAction.guid]: {
+              ...[updateErrorAction.guid],
+              manifestError: updateErrorAction.manifestError
+            }
+          }
+        }
+    }
+    return state;
+  };
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
index f91220bad4..814e166c5a 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
@@ -24,6 +24,7 @@ export interface HelmRelease {
       icon?: string;
     };
   };
+  manifestError: boolean;
 }
 
 export interface HelmReleaseEntity {
diff --git a/src/jetstream/plugins/kubernetes/get_release.go b/src/jetstream/plugins/kubernetes/get_release.go
index bd09da963d..d072870557 100644
--- a/src/jetstream/plugins/kubernetes/get_release.go
+++ b/src/jetstream/plugins/kubernetes/get_release.go
@@ -142,6 +142,8 @@ func (c *KubernetesSpecification) GetReleaseStatus(ec echo.Context) error {
 	graph.ParseManifest(rel)
 	sendResource(ws, "Graph", graph)
 
+	sendResource(ws, "ManifestErrors", rel.ManifestErrors)
+
 	stopchan := make(chan bool)
 
 	go readLoop(ws, stopchan)
diff --git a/src/jetstream/plugins/kubernetes/helm/release.go b/src/jetstream/plugins/kubernetes/helm/release.go
index 9c15554514..f8fd9c3131 100644
--- a/src/jetstream/plugins/kubernetes/helm/release.go
+++ b/src/jetstream/plugins/kubernetes/helm/release.go
@@ -32,11 +32,12 @@ var resourcesWithoutStatus = map[string]bool{
 // HelmRelease represents a Helm Release deployed via Helm
 type HelmRelease struct {
 	*release.Release
-	Endpoint  string                     `json:"-"`
-	User      string                     `json:"-"`
-	Resources map[string]KubeResource    `json:"resources"`
-	Jobs      []KubeResourceJob          `json:"-"`
-	PodJobs   map[string]KubeResourceJob `json:"-"`
+	Endpoint       string                     `json:"-"`
+	User           string                     `json:"-"`
+	Resources      map[string]KubeResource    `json:"resources"`
+	Jobs           []KubeResourceJob          `json:"-"`
+	PodJobs        map[string]KubeResourceJob `json:"-"`
+	ManifestErrors bool                       `json:"-"`
 }
 
 // KubeResource is a simple struct to pull out core common metadata for a Kube resource
@@ -69,6 +70,7 @@ func NewHelmRelease(info *release.Release, endpoint, user string) *HelmRelease {
 
 // Parse the release manifest from the Helm release
 func (r *HelmRelease) parseManifest() {
+	r.ManifestErrors = false
 	reader := bytes.NewReader([]byte(r.Manifest))
 	buffer := bufio.NewReader(reader)
 	var bufr strings.Builder
@@ -81,6 +83,7 @@ func (r *HelmRelease) parseManifest() {
 				obj, _, err := decode([]byte(bufr.String()), nil, nil)
 				if err != nil {
 					log.Error(fmt.Sprintf("Helm Manifest Parser: Error while decoding YAML object. Err was: %s", err))
+					r.ManifestErrors = true
 				} else {
 					r.processResource(obj)
 				}

From ea15508a259ebfeefc3f838c8e267d81c3b040ef Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 16 Jun 2020 16:48:40 +0100
Subject: [PATCH 539/648] Fix build

---
 .../custom/kubernetes/workloads/store/workloads.reducers.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.reducers.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.reducers.ts
index 2d26f38b03..532f1caeb5 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.reducers.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.reducers.ts
@@ -40,7 +40,7 @@ const createDefaultHelmRelease = (
   version: null
 })
 export function helmReleaseEntityReducer() {
-  return (state: IRequestEntityTypeState<HelmRelease>, action: Action) => {
+  return (state: IRequestEntityTypeState<HelmRelease>, action: Action): IRequestEntityTypeState<HelmRelease> => {
     switch (action.type) {
       case UPDATE_HELM_RELEASE_MANIFEST_ERROR:
         const updateErrorAction = action as UpdateHelmReleaseManifestError;
@@ -54,7 +54,7 @@ export function helmReleaseEntityReducer() {
           return {
             ...state,
             [updateErrorAction.guid]: {
-              ...[updateErrorAction.guid],
+              ...state[updateErrorAction.guid],
               manifestError: updateErrorAction.manifestError
             }
           }

From 1001e258dbc989f77afef492ed2ca70a22cdce87 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 17 Jun 2020 12:25:34 +0100
Subject: [PATCH 540/648] Remove helm manifest error from store

---
 .../helm-release-tab-base.component.ts        | 11 +---
 .../tabs/helm-release-helper.service.ts       |  1 -
 .../store/workload-action-builders.ts         | 15 +-----
 .../store/workloads-entity-generator.ts       |  8 +--
 .../workloads/store/workloads.actions.ts      | 18 -------
 .../workloads/store/workloads.reducers.ts     | 54 +------------------
 .../kubernetes/workloads/workload.types.ts    |  1 -
 7 files changed, 6 insertions(+), 102 deletions(-)

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 66a1ff7641..3c3721943c 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
@@ -144,16 +144,9 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
           );
           this.addResource(releaseResourceAction, resources);
         } else if (messageObj.kind === 'ManifestErrors') {
-          const manifestErrors = messageObj.data;
-          workloadsEntityCatalog.release.api.setManifestError(
-            this.helmReleaseHelper.endpointGuid,
-            this.helmReleaseHelper.namespace,
-            this.helmReleaseHelper.releaseTitle,
-            manifestErrors
-          )
-          if (manifestErrors) {
+          if (messageObj.data) {
             this.store.dispatch(
-              new ShowSnackBar('Errors were found whilst loading this workload. Not all resources may be shown', 'Dismiss')
+              new ShowSnackBar('Errors were found when parsing this workload. Not all resources may be shown', 'Dismiss')
             );
           }
         }
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 90a4deff6d..bcdef4478b 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
@@ -44,7 +44,6 @@ export class HelmReleaseHelperService {
 
     this.release$ = entityService.waitForEntity$.pipe(
       map((item) => item.entity),
-      filter(item => !!item.chart),
       map((item: HelmRelease) => {
         if (!item.chart.metadata.icon) {
           const copy = JSON.parse(JSON.stringify(item));
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts
index 944b7ab893..eb7591f9c5 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts
@@ -1,13 +1,7 @@
 import {
   OrchestratedActionBuilders,
 } from '../../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
-import {
-  GetHelmRelease,
-  GetHelmReleaseGraph,
-  GetHelmReleaseResource,
-  GetHelmReleases,
-  UpdateHelmReleaseManifestError,
-} from './workloads.actions';
+import { GetHelmRelease, GetHelmReleaseGraph, GetHelmReleaseResource, GetHelmReleases } from './workloads.actions';
 
 export interface WorkloadReleaseBuilders extends OrchestratedActionBuilders {
   get: (
@@ -15,11 +9,6 @@ export interface WorkloadReleaseBuilders extends OrchestratedActionBuilders {
     endpointGuid: string,
     extraArgs: { namespace: string }
   ) => GetHelmRelease;
-  setManifestError: (
-    endpointGuid: string,
-    namespace: string,
-    releaseTitle: string,
-    manifestError: boolean) => UpdateHelmReleaseManifestError;
   getMultiple: () => GetHelmReleases;
 }
 
@@ -27,8 +16,6 @@ export const workloadReleaseBuilders: WorkloadReleaseBuilders = {
   get: (title: string, endpointGuid: string, { namespace }: { namespace: string }) => {
     return new GetHelmRelease(endpointGuid, namespace, title);
   },
-  setManifestError: (endpointGuid: string, namespace: string, releaseTitle: string, manifestError: boolean) =>
-    new UpdateHelmReleaseManifestError(endpointGuid, namespace, releaseTitle, manifestError),
   getMultiple: () => new GetHelmReleases()
 }
 
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 652c4287ad..f4a0939afa 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
@@ -16,7 +16,6 @@ import {
   workloadResourceBuilders,
 } from './workload-action-builders';
 import { helmReleaseEntityKey, helmReleaseGraphEntityType, helmReleaseResourceEntityType } from './workloads-entity-factory';
-import { helmReleaseEntityReducer } from './workloads.reducers';
 
 
 export function generateWorkloadsEntities(endpointDefinition: StratosEndpointExtensionDefinition): StratosBaseCatalogEntity[] {
@@ -31,15 +30,12 @@ function generateReleaseEntity(endpointDefinition: StratosEndpointExtensionDefin
   const definition = {
     type: helmReleaseEntityKey,
     schema: kubernetesEntityFactory(helmReleaseEntityKey),
-    endpoint: endpointDefinition,
+    endpoint: endpointDefinition
   };
   workloadsEntityCatalog.release = new StratosCatalogEntity<IFavoriteMetadata, HelmRelease, WorkloadReleaseBuilders>(
     definition,
     {
-      actionBuilders: workloadReleaseBuilders,
-      dataReducers: [
-        helmReleaseEntityReducer()
-      ],
+      actionBuilders: workloadReleaseBuilders
     }
   );
   return workloadsEntityCatalog.release;
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
index 54996403a7..b2448b591f 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
@@ -1,4 +1,3 @@
-import { Action } from '@ngrx/store';
 import { EntityRequestAction } from 'frontend/packages/store/src/types/request.types';
 
 import { PaginatedAction } from '../../../../../../store/src/types/pagination.types';
@@ -27,9 +26,6 @@ export const GET_HELM_RELEASE = '[Helm] Get Release Status';
 export const GET_HELM_RELEASE_SUCCESS = '[Helm] Get Release Status Success';
 export const GET_HELM_RELEASE_FAILURE = '[Helm] Get Release Status Failure';
 
-
-export const UPDATE_HELM_RELEASE_MANIFEST_ERROR = '[Helm] Update Release Error';
-
 export const GET_HELM_RELEASE_PODS = '[Helm] Get Release Pods';
 export const GET_HELM_RELEASE_PODS_SUCCESS = '[Helm] Get Release Pods Success';
 export const GET_HELM_RELEASE_PODS_FAILURE = '[Helm] Get Release Pods Failure';
@@ -90,20 +86,6 @@ export class GetHelmRelease implements HelmReleaseSingleEntity {
   ];
 }
 
-export class UpdateHelmReleaseManifestError implements Action {
-  guid: string;
-  constructor(
-    public endpointGuid: string,
-    public namespace: string,
-    public releaseTitle: string,
-    public manifestError: boolean
-  ) {
-    this.guid = getHelmReleaseId(endpointGuid, namespace, releaseTitle);
-  }
-  type = UPDATE_HELM_RELEASE_MANIFEST_ERROR;
-}
-
-
 export class GetHelmReleaseGraph implements HelmReleaseSingleEntity {
   guid: string;
   constructor(
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.reducers.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.reducers.ts
index 532f1caeb5..790325ad9a 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.reducers.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.reducers.ts
@@ -1,12 +1,4 @@
-import { Action } from '@ngrx/store';
-
-import { IRequestEntityTypeState } from '../../../../../../store/src/app-state';
-import { HelmRelease } from '../workload.types';
-import {
-  UPDATE_HELM_RELEASE,
-  UPDATE_HELM_RELEASE_MANIFEST_ERROR,
-  UpdateHelmReleaseManifestError,
-} from './workloads.actions';
+import { UPDATE_HELM_RELEASE } from './workloads.actions';
 
 const defaultState = {};
 
@@ -19,47 +11,3 @@ export function helmReleaseReducer(state = defaultState, action) {
 
   }
 }
-
-const createDefaultHelmRelease = (
-  endpointGuid: string,
-  guid: string,
-  name: string,
-  namespace: string
-): HelmRelease => ({
-  chart: null,
-  config: null,
-  endpointId: endpointGuid,
-  firstDeployed: null,
-  guid,
-  info: null,
-  lastDeployed: null,
-  manifestError: false,
-  name,
-  namespace,
-  status: null,
-  version: null
-})
-export function helmReleaseEntityReducer() {
-  return (state: IRequestEntityTypeState<HelmRelease>, action: Action): IRequestEntityTypeState<HelmRelease> => {
-    switch (action.type) {
-      case UPDATE_HELM_RELEASE_MANIFEST_ERROR:
-        const updateErrorAction = action as UpdateHelmReleaseManifestError;
-        const release: HelmRelease = state[updateErrorAction.guid] || createDefaultHelmRelease(
-          updateErrorAction.endpointGuid,
-          updateErrorAction.guid,
-          updateErrorAction.releaseTitle,
-          updateErrorAction.namespace
-        );
-        if (release.manifestError !== updateErrorAction.manifestError) {
-          return {
-            ...state,
-            [updateErrorAction.guid]: {
-              ...state[updateErrorAction.guid],
-              manifestError: updateErrorAction.manifestError
-            }
-          }
-        }
-    }
-    return state;
-  };
-}
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
index 814e166c5a..f91220bad4 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
@@ -24,7 +24,6 @@ export interface HelmRelease {
       icon?: string;
     };
   };
-  manifestError: boolean;
 }
 
 export interface HelmReleaseEntity {

From 8cc207d0d173f0fcf3706f15cdc472de63d95e5d Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Tue, 23 Jun 2020 10:27:18 +0100
Subject: [PATCH 541/648] Merge upstream (#392)

* WIP

* First pass at permission effects

* First pass at reducer

* Final set of cloud-foundry code out of common

* Renames, todos

* Minor fixes

* Fix unit tests

* Tweaks

* Finish todos

* Fix transition from space summary to app summary page
- an entity service for a space with no org was cached by guid
- an entity service for a space requiring org used cached version
- solution is to make cache id include schema key (determines with/without org)

* Add comment, tidy up rootUpdatingKey

* Fix issue where gitlab summary tab threw errors in console
- fixes #4325

* Fix misaligned user button
- fixes #4316

* Temporarily add branch v3.2.1 to travis

* check sso whitelist in more places

Signed-off-by: Ben Berry <ben.berry@gsa.gov>

* refactor sso state checks into single function

Signed-off-by: Ben Berry <ben.berry@gsa.gov>

* Update version

* First pass at changelog (additional SSO fix required)

* Update changelog

* Push combine of permission configs into checkers
- overcomes some weird change of permission type

* Fix issue where default add/remove setting in change role by username was incorrect
- add/remove radio button default value governed by add/remove feature flags
- when one is set to false the radio button should be disabled and the other selected

* Fix store-test-helper

* Fix package-lock.json

* Remove v3.2.1 was .travis.taml

* Remove need for --recreate-pods when upgrading

* Update readme following move to Travis-ci.com

* Add support for helm chart customizations

* Removed change not needed

* Ensure the correct key is used metacard favourite info (#4321)

* Fix display of details in endpoint card in endpoint list (#4319)

* Clean default/blocked logic

* Rename @stratos to @stratosui

* FIx references in tsconfig.json

* Fix endpoint connect

* Fix unit test

* Fix e2e test

* Change following review #1

* Bump github.com/gorilla/websocket from 1.4.1 to 1.4.2 in /src/jetstream (#4199)

* Bump github.com/gorilla/websocket from 1.4.1 to 1.4.2 in /src/jetstream

Bumps [github.com/gorilla/websocket](https://github.com/gorilla/websocket) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/gorilla/websocket/releases)
- [Commits](https://github.com/gorilla/websocket/compare/v1.4.1...v1.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Update go.sum

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>

* Fix errors in console log during setup screens

* Helm: Change default image pull policy to Always

* Add copy address and edit to endpoint list view

* Use icon that is less confusing with refresh

* Change following review #2
- Fix cf package module file name
- Make CUSTOM_USER_PERMISSION_CHECKERS optional
- Remove need to inject CUSTOM_USER_PERMISSION_CHECKERS in multiple cf modules

* Add newline at end for codeclimate

* Fix for buildpack filename wrapping on card

* Fix code climate issue

* Update endpoint-list.helpers.ts

* Improve naming

* Tidy up

* Change following review

* Bump gopkg.in/yaml.v2 from 2.2.8 to 2.3.0 in /src/jetstream (#4336)

* Bump gopkg.in/yaml.v2 from 2.2.8 to 2.3.0 in /src/jetstream

Bumps [gopkg.in/yaml.v2](https://github.com/go-yaml/yaml) from 2.2.8 to 2.3.0.
- [Release notes](https://github.com/go-yaml/yaml/releases)
- [Commits](https://github.com/go-yaml/yaml/compare/v2.2.8...v2.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* CI bump

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil_macdougall@hotmail.com>

* [Security] Bump websocket-extensions from 0.1.3 to 0.1.4 (#4356)

Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. **This update includes a security fix.**
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fail CI build if imagelist generation fails

* Updated __stratos.tpl as per changes in deploy/kubernetes/console/templates/deployment.yaml

* Fix build

* Helm Chart: Icon is missing
- fixes #393

* Fixes following review

Co-authored-by: Ben Berry <ben.berry@gsa.gov>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil_macdougall@hotmail.com>
---
 CONTRIBUTING.md                               |   4 +-
 README.md                                     |  16 +-
 custom-src/deploy/kubernetes/__stratos.tpl    |  15 +
 ...onocular-repository-list-config.service.ts |   7 +-
 deploy/ci/automation/helmtest.sh              |   6 +-
 deploy/cloud-foundry/README.md                |   4 +-
 deploy/kubernetes/README.md                   |   6 +-
 deploy/kubernetes/build.sh                    |   1 +
 deploy/kubernetes/console/Chart.yaml          |   2 +-
 deploy/kubernetes/console/README.md           |   4 +-
 .../console/templates/__stratos.tpl           |   5 +
 .../console/templates/config-init.yaml        |   2 +
 .../console/templates/database.yaml           |   2 +
 .../console/templates/deployment.yaml         |  15 +-
 deploy/kubernetes/console/values.yaml         |   2 +-
 deploy/kubernetes/imagelist-gen.sh            |   4 +
 .../app-action-extension.component.spec.ts    |   6 +-
 package-lock.json                             |  12 +-
 .../autoscaler-base.component.spec.ts         |   2 +-
 .../autoscaler-metric-page.component.spec.ts  |   2 +-
 ...caler-scale-history-page.component.spec.ts |   2 +-
 ...autoscaler-tab-extension.component.spec.ts |   2 +-
 .../edit-autoscaler-credential.component.ts   |   1 -
 .../edit-autoscaler-policy-service.spec.ts    |   2 +-
 ...-autoscaler-policy-step1.component.spec.ts |   2 +-
 ...-autoscaler-policy-step2.component.spec.ts |   2 +-
 ...-autoscaler-policy-step3.component.spec.ts |   2 +-
 ...-autoscaler-policy-step4.component.spec.ts |   2 +-
 .../edit-autoscaler-policy.component.spec.ts  |   2 +-
 .../card-autoscaler-default.component.spec.ts |   2 +-
 ...p-autoscaler-events-config.service.spec.ts |   2 +-
 .../cf-app-autoscaler-events-data-source.ts   |   2 +-
 ...scaler-metric-chart-card.component.spec.ts |   2 +-
 .../combo-series-vertical.component.spec.ts   |   2 +-
 ...app-autoscaler-metric-chart-data-source.ts |   2 +-
 ...r-metric-chart-list-config.service.spec.ts |   2 +-
 .../src/actions/application.actions.ts        |  48 +-
 .../src/actions/organization.actions.ts       |   4 +-
 .../src/actions/permissions.actions.ts        | 165 +++--
 .../src/actions/users-roles.actions.ts        |   2 +-
 .../src/actions/users.actions.ts              |  50 +-
 .../cloud-foundry/src/cf-api.types.ts         |   2 +-
 .../cloud-foundry/src/cf-entity-catalog.ts    |   2 +-
 .../cloud-foundry/src/cf-entity-factory.ts    |   2 +-
 .../cloud-foundry/src/cf-entity-generator.ts  |  16 +-
 .../cloud-foundry/src/cf-entity-types.ts      |   2 +-
 .../cloud-foundry/src/cf-favorites-helpers.ts |   4 +-
 ...ule.ts => cloud-foundry-package.module.ts} |   4 +-
 .../src/cloud-foundry-test.module.ts          |  11 +-
 .../user.action-builders.ts                   |  10 +-
 .../entity-relations-validate.spec.ts         |   2 +-
 .../processors/org-space-post-processor.ts    |   2 +-
 ...te-instances-routes-list-config.service.ts |   2 +-
 .../app-delete-routes-list-config.service.ts  |   2 +-
 .../application-wall.component.html           |   2 +-
 .../application-wall.component.spec.ts        |   4 +-
 .../application-wall.component.ts             |   4 +-
 .../application-tabs-base.component.ts        |   6 +-
 .../tabs/build-tab/build-tab.component.html   |  19 +-
 .../tabs/build-tab/build-tab.component.ts     |   4 +-
 .../instances-tab.component.spec.ts           |   2 +-
 .../routes-tab/routes-tab.component.ts        |   4 +-
 .../applications/applications.module.ts       |   2 +-
 .../deploy-application-steps.types.ts         |   7 +-
 .../src/features/cloud-foundry/cf.helpers.ts  |  33 +-
 .../cli-info-cloud-foundry.component.html     |  30 +-
 .../cli-info-cloud-foundry.component.spec.ts  |   8 +-
 .../cli-info-cloud-foundry.component.ts       |   9 +-
 .../cloud-foundry-tabs-base.component.spec.ts |   2 +-
 .../cloud-foundry-tabs-base.component.ts      |   8 +-
 .../cloud-foundry/cloud-foundry.module.ts     |   2 +-
 .../cloud-foundry.component.spec.ts           |   4 +-
 .../edit-organization-step.component.html     |   7 +-
 .../quota-definition.component.spec.ts        |   2 +-
 .../quota-definition.component.ts             |   6 +-
 .../cloud-foundry-organization.service.ts     |   2 +-
 .../services/cloud-foundry-space.service.ts   |   2 +-
 .../space-quota-definition.component.spec.ts  |   2 +-
 .../space-quota-definition.component.ts       |   6 +-
 .../cf-admin-add-user-warning.component.ts    |   4 +-
 ...dry-organization-space-quotas.component.ts |   6 +-
 ...foundry-organization-spaces.component.html |   2 +-
 ...ndry-organization-spaces.component.spec.ts |   6 +-
 ...d-foundry-organization-spaces.component.ts |   4 +-
 ...cloud-foundry-space-summary.component.html |   4 +-
 ...ud-foundry-space-summary.component.spec.ts |  11 +-
 .../cloud-foundry-space-summary.component.ts  |   6 +-
 .../cloud-foundry-space-users.component.ts    |   6 +-
 ...oundry-organization-summary.component.html |   4 +-
 ...dry-organization-summary.component.spec.ts |   4 +-
 ...-foundry-organization-summary.component.ts |   8 +-
 ...ud-foundry-organization-users.component.ts |   8 +-
 .../cloud-foundry-organizations.component.ts  |   6 +-
 .../cloud-foundry-quotas.component.ts         |   6 +-
 .../cloud-foundry-users.component.ts          |   2 +-
 .../user-invites/user-invite.service.ts       |   6 +-
 .../invite-users-create.component.ts          |   2 +-
 .../users/manage-users/cf-roles.service.ts    |  28 +-
 .../manage-users-confirm.component.ts         |  19 +-
 .../manage-users-modify.component.ts          |  36 +-
 .../space-roles-list-wrapper.component.ts     |   4 +-
 .../manage-users-select.component.ts          |   2 +-
 .../manage-users-set-usernames.component.html |   6 +-
 .../manage-users-set-usernames.component.ts   |  50 +-
 .../manage-users/manage-users.component.ts    |   8 +-
 .../remove-user/remove-user.component.ts      |  14 +-
 .../service-catalog/service-catalog.module.ts |   2 +-
 .../service-tabs-base.component.html          |   7 +-
 .../service-tabs-base.component.spec.ts       |   6 +-
 .../service-tabs-base.component.ts            |   6 +-
 .../services-wall.component.html              |  12 +-
 .../services-wall.component.spec.ts           |   4 +-
 .../services-wall/services-wall.component.ts  |   6 +-
 .../src/shared/cf-shared.module.ts            |  10 +-
 .../cf-role-checkbox.component.ts             |  32 +-
 .../create-application-step1.component.ts     |   4 +-
 .../cf-app-instances-config.service.spec.ts   |   2 +-
 .../cf-app-map-routes-list-config.service.ts  |   4 +-
 .../cf-app-routes-list-config-base.ts         |   8 +-
 .../cf-app-routes-list-config.service.spec.ts |   4 +-
 .../cf-app-routes-list-config.service.ts      |   4 +-
 .../app-service-binding-card.component.ts     |  10 +-
 .../app-service-binding-data-source.ts        |   2 +-
 ...app-service-binding-list-config.service.ts |  12 +-
 .../list-types/app/cf-apps-data-source.ts     |   2 +-
 .../cf-buildpack-card.component.html          |   2 +-
 ...ell-confirm-role-add-rem.component.spec.ts |   2 +-
 .../cf-events/cf-events-data-source.ts        |   4 +-
 .../cf-org-users-list-config.service.ts       |   6 +-
 .../cf-org-card/cf-org-card.component.spec.ts |   2 +-
 .../cf-org-card/cf-org-card.component.ts      |  12 +-
 .../cf-orgs/cf-orgs-data-source.service.ts    |   2 +-
 .../cf-quotas-data-source.service.ts          |   2 +-
 .../cf-quotas-list-config.service.ts          |  10 +-
 .../table-cell-quota.component.spec.ts        |   2 +-
 .../cf-routes/cf-routes-data-source-base.ts   |   2 +-
 .../cf-routes-list-config.service.ts          |   8 +-
 .../cf-security-groups-data-source.ts         |   4 +-
 .../cf-select-users-data-source.service.ts    |   2 +-
 .../cf-select-users-list-config.service.ts    |   2 +-
 .../cf-service-instances-list-config.base.ts  |  14 +-
 .../cf-services/cf-services-data-source.ts    |   4 +-
 .../cf-services-list-config.service.ts        |   5 +-
 .../cf-user-service-instances-list-config.ts  |  14 +-
 .../cf-space-apps-data-source.service.ts      |   4 +-
 .../cf-space-quotas-data-source.service.ts    |   2 +-
 .../cf-space-quotas-list-config.service.ts    |  10 +-
 .../cf-space-routes-list-config.service.ts    |   8 +-
 .../cf-space-users-list-config.service.ts     |   6 +-
 ...cf-spaces-service-instances-data-source.ts |   2 +-
 ...s-service-instances-list-config.service.ts |   4 +-
 ...aces-user-service-instances-data-source.ts |   2 +-
 .../cf-space-card.component.spec.ts           |   2 +-
 .../cf-space-card/cf-space-card.component.ts  |  10 +-
 .../cf-spaces-data-source.service.ts          |   2 +-
 .../cf-stacks/cf-stacks-data-source.ts        |   2 +-
 ...f-users-space-roles-data-source.service.ts |   6 +-
 ...f-users-space-roles-list-config.service.ts |  10 +-
 .../table-cell-select-org.component.ts        |   4 +-
 .../cf-org-permission-cell.component.ts       |  20 +-
 .../list-types/cf-users/cf-permission-cell.ts |   2 +-
 .../cf-space-permission-cell.component.ts     |  20 +-
 .../cf-users/cf-user-data-source.service.ts   |   4 +-
 .../cf-user-list-config.service.spec.ts       |   4 +-
 .../cf-users/cf-user-list-config.service.ts   |  14 +-
 .../cf-users/cf-user-list-helpers.ts          |   2 +-
 .../detach-apps/detach-apps-data-source.ts    |   2 +-
 .../service-instances-data-source.ts          |   2 +-
 .../service-instances-list-config.service.ts  |   4 +-
 .../service-plans-data-source.ts              |   2 +-
 .../service-instance-card.component.ts        |  12 +-
 .../service-instances-wall-data-source.ts     |   2 +-
 ...vice-instances-wall-list-config.service.ts |   4 +-
 ...rovided-service-instance-card.component.ts |  12 +-
 .../cf-org-space-service.service.ts           |   5 +-
 .../shared/data-services/cf-user.service.ts   |  18 +-
 .../shared/data-services/scm/github-scm.ts    |   4 +
 .../shared/data-services/scm/gitlab-scm.ts    |   2 +-
 .../src/shared/data-services/scm/scm.ts       |   1 +
 .../app-name-unique.directive.spec.ts         |   2 +-
 .../cf-user-permission.directive.spec.ts      |  34 +
 .../cf-user-permission.directive.ts           |  80 +++
 .../current-user-permissions.service.spec.ts  | 643 +++++++++---------
 .../store/cloud-foundry.reducers.module.ts    |   8 +-
 .../src/store/cloud-foundry.store.module.ts   |   7 +-
 .../src/store/effects/app.effects.ts          |   4 +-
 .../src/store/effects/permissions.effect.ts   | 274 --------
 .../src/store/effects/update-app-effects.ts   |   4 +-
 .../src/store}/effects/users-roles.effects.ts |  62 +-
 ...s.reducer.ts => cf-users-roles.reducer.ts} |   4 +-
 .../{users.reducer.ts => cf-users.reducer.ts} |  32 +-
 .../current-cf-user-base-cf-role.reducer.ts   |  95 +++
 .../current-cf-user-reducer.helpers.ts}       |  21 +-
 .../current-cf-user-role-session.reducer.ts   |  89 +++
 ...current-cf-user-roles-changed.reducers.ts} |  56 +-
 .../current-cf-user-roles-clear.reducers.ts   | 111 +++
 .../current-cf-user-roles-org.reducer.ts      |  47 ++
 .../current-cf-user-roles-orgs.reducer.ts     |   9 +
 .../current-cf-user-roles-space.reducer.ts}   |  20 +-
 .../current-cf-user-roles-spaces.reducer.ts   |   9 +
 .../current-cf-user-roles.reducer.spec.ts     | 249 +++++++
 .../current-cf-user-roles.reducer.ts          |  90 +++
 .../current-user-base-cf-role.reducer.ts      |  17 -
 .../current-user-cf-roles.reducer.ts          |  62 --
 .../current-user-roles-org.reducer.ts         |  47 --
 .../current-user-roles-orgs.reducer.ts        |  12 -
 .../current-user-roles-spaces.reducer.ts      |  12 -
 .../cf-current-user-role.selectors.ts         |  26 +-
 .../selectors/cf-users-roles.selector.ts      |  50 ++
 .../store/selectors/cloud-foundry.selector.ts |   1 -
 .../types/cf-current-user-roles.types.ts      |   3 +-
 .../types/{user.types.ts => cf-user.types.ts} |   0
 .../src/store/types/users-roles.types.ts      |   2 +-
 .../cf-user-permissions-checkers.ts           | 492 ++++++++++++++
 .../user-permissions/cf-user-roles-fetch.ts   | 218 ++++++
 .../cloud-foundry-endpoint-service.helper.ts  |   4 +-
 .../packages/core/src/app.component.spec.ts   |   2 +-
 src/frontend/packages/core/src/app.module.ts  |  10 +-
 .../packages/core/src/core/core.module.ts     |   2 -
 .../core/current-user-permissions.checker.ts  | 317 ---------
 .../core/current-user-permissions.config.ts   | 159 -----
 .../core/current-user-permissions.service.ts  | 174 -----
 .../core/src/core/endpoints.service.spec.ts   |   2 +-
 .../log-out-dialog.component.spec.ts          |   4 +-
 .../core/src/core/logger.service.spec.ts      |   2 +-
 .../current-user-permissions.config.ts        |  20 +
 .../current-user-permissions.service.spec.ts  | 511 ++++++++++++++
 .../current-user-permissions.service.ts       | 197 ++++++
 .../current-user-permissions.types.ts         |  61 ++
 .../stratos-user-permissions.checker.ts       | 131 ++++
 .../core/src/core/user-favorite-helpers.ts    |   8 +-
 .../core/src/core/user-profile.service.ts     |   2 +
 .../core/src/core/user.service.spec.ts        |   2 +-
 .../about-page/about-page.component.spec.ts   |   2 +-
 .../diagnostics-page.component.spec.ts        |   2 +-
 .../eula-page/eula-page.component.spec.ts     |   2 +-
 .../dashboard-base.component.ts               |   2 +-
 .../side-nav/side-nav.component.spec.ts       |   2 +-
 .../connect-endpoint-dialog.component.spec.ts |   2 +-
 .../connect-endpoint.component.spec.ts        |   2 +-
 ...reate-endpoint-base-step.component.spec.ts |   2 +-
 ...reate-endpoint-cf-step-1.component.spec.ts |   2 +-
 .../create-endpoint-connect.component.spec.ts |   2 +-
 .../create-endpoint.component.spec.ts         |   2 +-
 .../endpoints-page.component.spec.ts          |   7 +-
 .../endpoints-page.component.ts               |   4 +-
 .../error-page/error-page.component.spec.ts   |   2 +-
 .../events-page/events-page.component.spec.ts |   2 +-
 .../home/home/home-page.component.spec.ts     |   2 +-
 .../metrics/metrics/metrics.component.spec.ts |   2 +-
 .../no-endpoints-non-admin.component.spec.ts  |   2 +-
 .../local-account-wizard.component.spec.ts    |   2 +-
 .../edit-profile-info.component.spec.ts       |   7 +-
 .../edit-profile-info.component.ts            |   6 +-
 .../profile-info.component.spec.ts            |   4 +-
 .../core/src/logged-in.service.spec.ts        |   2 +-
 .../code-block/code-block.component.spec.ts   |   2 +-
 .../copy-to-clipboard.component.spec.ts       |   2 +-
 .../endpoints-missing.component.spec.ts       |   2 +-
 .../meta-card.component.spec.ts               |   2 +-
 .../meta-card-base/meta-card.component.ts     |   4 +-
 .../meta-card-item.component.scss             |  11 +
 .../meta-card-item.component.ts               |   1 +
 .../table-cell-actions.component.spec.ts      |   2 +-
 ...ble-cell-request-monitor-icon.component.ts |   2 +-
 .../table-cell/table-cell.component.ts        |   4 +
 .../list/list-table/table.component.spec.ts   |   2 +-
 .../endpoint-card.component.html              |   7 +-
 .../endpoint-card/endpoint-card.component.ts  |  14 +-
 .../endpoint/endpoint-list.helpers.ts         |  18 +-
 .../endpoints-list-config.service.spec.ts     |   5 +-
 .../endpoint/endpoints-list-config.service.ts |   6 +-
 ...table-cell-endpoint-address.component.html |   5 +
 ...table-cell-endpoint-address.component.scss |   8 +
 ...le-cell-endpoint-address.component.spec.ts |  28 +
 .../table-cell-endpoint-address.component.ts  |  33 +
 .../components/list/list.component.spec.ts    |   6 +-
 .../loading-page.component.spec.ts            |   4 +-
 .../markdown-preview.component.spec.ts        |   2 +-
 .../metrics-chart.component.spec.ts           |   2 +-
 ...cs-parent-range-selector.component.spec.ts |   4 +-
 .../metrics-range-selector.component.spec.ts  |   4 +-
 .../page-header/page-header.component.html    |   2 +-
 .../recent-entities.component.html            |   2 +-
 .../recent-entities.component.spec.ts         |   2 +-
 .../sidepanel-preview.component.spec.ts       |   2 +-
 .../steppers/steppers.component.spec.ts       |   2 +-
 .../src/shared/global-events.service.spec.ts  |   2 +-
 .../packages/core/src/shared/shared.module.ts |   1 -
 .../shared/user-permission.directive.spec.ts  |   5 +-
 .../src/shared/user-permission.directive.ts   |  63 +-
 .../core/test-framework/core-test.helper.ts   |   8 +-
 .../store/src/actions/permissions.actions.ts  |   9 +
 .../store/src/effects/permissions.effect.ts   |  73 ++
 .../entity-catalog-entity.ts                  |   4 +-
 .../src/entity-catalog/entity-catalog.ts      |  26 +
 .../entity-catalog/entity-catalog.types.ts    |  12 +-
 .../success-entity-request.handler.ts         |  18 +-
 .../entity-request-pipeline.types.ts          |  18 +-
 .../packages/store/src/entity-service.ts      |   3 +
 .../entity-monitor.factory.service.ts         |   4 +-
 .../src/reducers/api-request-reducer/types.ts |   4 +-
 .../current-user-request-state.reducers.ts    |  50 --
 .../current-user-role-session.reducer.ts      | 105 ---
 .../current-user-roles-clear.reducers.ts      | 119 ----
 .../current-user-roles.reducer.spec.ts        | 249 +------
 .../current-user-roles.reducer.ts             | 123 ++--
 .../selectors/current-user-role.selectors.ts  |  38 +-
 .../store/src/selectors/endpoint.selectors.ts |  15 +-
 .../src/selectors/users-roles.selector.ts     |  50 --
 .../packages/store/src/store.module.ts        |   6 +-
 .../packages/store/src/types/auth.types.ts    |  11 +-
 .../src/types/current-user-roles.types.ts     |  29 +-
 .../store/src/types/endpoint.types.ts         |   6 +-
 .../store/testing/src/store-test-helper.ts    |  10 +-
 src/jetstream/go.mod                          |   2 +-
 src/jetstream/go.sum                          |   7 +-
 ...nage-users-by-username-stepper-e2e.spec.ts |   2 +-
 .../cloud-foundry/users-removal-e2e.helper.ts |   2 +-
 src/test-e2e/helpers/cf-helpers.ts            |   2 +-
 src/tsconfig.json                             |   4 +-
 321 files changed, 4154 insertions(+), 3043 deletions(-)
 create mode 100644 custom-src/deploy/kubernetes/__stratos.tpl
 create mode 100644 deploy/kubernetes/console/templates/__stratos.tpl
 rename src/frontend/packages/cloud-foundry/src/{cloud-foundry.module.ts => cloud-foundry-package.module.ts} (91%)
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/directives/cf-user-permission/cf-user-permission.directive.spec.ts
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/directives/cf-user-permission/cf-user-permission.directive.ts
 rename src/frontend/packages/{core/src/core => cloud-foundry/src/shared/services}/current-user-permissions.service.spec.ts (62%)
 delete mode 100644 src/frontend/packages/cloud-foundry/src/store/effects/permissions.effect.ts
 rename src/frontend/packages/{store/src => cloud-foundry/src/store}/effects/users-roles.effects.ts (78%)
 rename src/frontend/packages/cloud-foundry/src/store/reducers/{users-roles.reducer.ts => cf-users-roles.reducer.ts} (97%)
 rename src/frontend/packages/cloud-foundry/src/store/reducers/{users.reducer.ts => cf-users.reducer.ts} (90%)
 create mode 100644 src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-base-cf-role.reducer.ts
 rename src/frontend/packages/{store/src/reducers/current-user-roles-reducer/current-user-reducer.helpers.ts => cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-reducer.helpers.ts} (65%)
 create mode 100644 src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-role-session.reducer.ts
 rename src/frontend/packages/cloud-foundry/src/store/reducers/{current-user-roles-reducer/current-user-roles-changed.reducers.ts => current-cf-user-roles-reducer/current-cf-user-roles-changed.reducers.ts} (69%)
 create mode 100644 src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles-clear.reducers.ts
 create mode 100644 src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles-org.reducer.ts
 create mode 100644 src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles-orgs.reducer.ts
 rename src/frontend/packages/cloud-foundry/src/store/reducers/{current-user-roles-reducer/current-user-roles-space.reducer.ts => current-cf-user-roles-reducer/current-cf-user-roles-space.reducer.ts} (67%)
 create mode 100644 src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles-spaces.reducer.ts
 create mode 100644 src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles.reducer.spec.ts
 create mode 100644 src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles.reducer.ts
 delete mode 100644 src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-base-cf-role.reducer.ts
 delete mode 100644 src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-cf-roles.reducer.ts
 delete mode 100644 src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-org.reducer.ts
 delete mode 100644 src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-orgs.reducer.ts
 delete mode 100644 src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-spaces.reducer.ts
 create mode 100644 src/frontend/packages/cloud-foundry/src/store/selectors/cf-users-roles.selector.ts
 delete mode 100644 src/frontend/packages/cloud-foundry/src/store/selectors/cloud-foundry.selector.ts
 rename src/frontend/packages/cloud-foundry/src/store/types/{user.types.ts => cf-user.types.ts} (100%)
 create mode 100644 src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-permissions-checkers.ts
 create mode 100644 src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-roles-fetch.ts
 delete mode 100644 src/frontend/packages/core/src/core/current-user-permissions.checker.ts
 delete mode 100644 src/frontend/packages/core/src/core/current-user-permissions.config.ts
 delete mode 100644 src/frontend/packages/core/src/core/current-user-permissions.service.ts
 create mode 100644 src/frontend/packages/core/src/core/permissions/current-user-permissions.config.ts
 create mode 100644 src/frontend/packages/core/src/core/permissions/current-user-permissions.service.spec.ts
 create mode 100644 src/frontend/packages/core/src/core/permissions/current-user-permissions.service.ts
 create mode 100644 src/frontend/packages/core/src/core/permissions/current-user-permissions.types.ts
 create mode 100644 src/frontend/packages/core/src/core/permissions/stratos-user-permissions.checker.ts
 create mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component.html
 create mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component.scss
 create mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component.spec.ts
 create mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component.ts
 create mode 100644 src/frontend/packages/store/src/actions/permissions.actions.ts
 create mode 100644 src/frontend/packages/store/src/effects/permissions.effect.ts
 delete mode 100644 src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-request-state.reducers.ts
 delete mode 100644 src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-role-session.reducer.ts
 delete mode 100644 src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-roles-clear.reducers.ts
 delete mode 100644 src/frontend/packages/store/src/selectors/users-roles.selector.ts

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9ffe5499d4..5da3d8b31d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,10 +6,10 @@ There are two main forms of contribution: reporting issues and performing code c
 
 ## Reporting Issues
 
-If you find a problem with Stratos UI, report it using [GitHub issues](https://github.com/cloudfoundry/stratos/issues/new).
+If you find a problem with Stratos UI, report it using [GitHub issues](https://github.com/suse/stratos/issues/new).
 
 Before reporting a new issue, please take a moment to check whether it has already been reported
-[here](https://github.com/cloudfoundry/stratos/issues). If this is the case, please:
+[here](https://github.com/suse/stratos/issues). If this is the case, please:
 
 - Read all the comments to confirm that it's the same issue you're having.
 - Refrain from adding "same thing here" or "+1" comments. Just hit the
diff --git a/README.md b/README.md
index 25c152a24f..d49aa9dec1 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,17 @@
 # Stratos
 
-<a href="https://travis-ci.org/cloudfoundry/stratos/branches"><img src="https://travis-ci.org/cloudfoundry/stratos.svg?branch=master"></a>&nbsp;<a style="padding-left: 4px" href="https://codeclimate.com/github/cloudfoundry/stratos/maintainability"><img src="https://api.codeclimate.com/v1/badges/61af8b605f385e894632/maintainability" /></a>
-<a href="https://goreportcard.com/report/github.com/cloudfoundry/stratos"><img src="https://goreportcard.com/badge/github.com/cloudfoundry-incubator/stratos"/></a>
-<a href="https://codecov.io/gh/cloudfoundry/stratos/branch/master"><img src="https://codecov.io/gh/cloudfoundry/stratos/branch/graph/badge.svg"/></a>
-[![GitHub release](https://img.shields.io/github/release/cloudfoundry/stratos.svg)](https://github.com/cloudfoundry/stratos/releases/latest)
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/cloudfoundry/stratos/blob/master/LICENSE)
+<a href="https://travis-ci.com/suse/stratos/branches"><img src="https://travis-ci.com/suse/stratos.svg?branch=master"></a>&nbsp;<a style="padding-left: 4px" href="https://codeclimate.com/github/suse/stratos/maintainability"><img src="https://api.codeclimate.com/v1/badges/61af8b605f385e894632/maintainability" /></a>
+<a href="https://goreportcard.com/report/github.com/suse/stratos"><img src="https://goreportcard.com/badge/github.com/suse/stratos"/></a>
+<a href="https://codecov.io/gh/suse/stratos/branch/master"><img src="https://codecov.io/gh/suse/stratos/branch/master/graph/badge.svg"/></a>
+[![GitHub release](https://img.shields.io/github/release/suse/stratos.svg)](https://github.com/suse/stratos/releases/latest)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/suse/stratos/blob/master/LICENSE)
 [![slack.cloudfoundry.org](https://slack.cloudfoundry.org/badge.svg)](https://cloudfoundry.slack.com/messages/C80EP4Y57/)
 
 Stratos is an Open Source Web-based UI (Console) for managing Cloud Foundry. It allows users and administrators to both manage applications running in the Cloud Foundry cluster and perform cluster management tasks.
 
 If you are looking for a version of Stratos, you can find ..
-- V1 in the [v1-master](https://github.com/cloudfoundry/stratos/tree/v1-master) branch.
-- V2 in the [v2-master](https://github.com/cloudfoundry/stratos/tree/v2-master) branch.
+- V1 in the [v1-master](https://github.com/suse/stratos/tree/v1-master) branch.
+- V2 in the [v2-master](https://github.com/suse/stratos/tree/v2-master) branch.
 
 ![Stratos Application view](docs/images/screenshots/app-summary.png)
 
@@ -46,7 +46,7 @@ Get an [Overview](docs/overview.md) of Stratos, its components and the different
 
 Take a look at the [Development Roadmap](docs/roadmap.md) to see where we are heading. We update our status page each week to summarize what we are working on - see the [Status Page](docs/status_updates.md).
 
-Browse through features and issues in the project's [issues](https://github.com/cloudfoundry/stratos/issues) page or [Zenhub Board](https://github.com/cloudfoundry-incubator/stratos#boards).
+Browse through features and issues in the project's [issues](https://github.com/suse/stratos/issues) page.
 
 What kind of code is in Stratos? We've integrated [Code Climate](https://codeclimate.com) for some code quality and maintainability metrics. Take a stroll around the [project page](https://codeclimate.com/github/SUSE/stratos)
 
diff --git a/custom-src/deploy/kubernetes/__stratos.tpl b/custom-src/deploy/kubernetes/__stratos.tpl
new file mode 100644
index 0000000000..3ebbce1efe
--- /dev/null
+++ b/custom-src/deploy/kubernetes/__stratos.tpl
@@ -0,0 +1,15 @@
+# Customizations for the Helm Chart
+
+# Extra env vars for the Jetstream Pod in deployment.yaml
+{{- define "stratosJetstreamEnv" }}
+- name: MONOCULAR_CRT_PATH
+  value: "/etc/monocular-certs/tls.crt"
+- name: MONOCULAR_KEY_PATH
+  value: "/etc/monocular-certs/tls.key"
+- name: MONOCULAR_CA_CRT_PATH
+  value: "/etc/monocular-certs/ca.crt"
+- name: FDB_URL
+  value: "mongodb://{{ .Release.Name }}-fdbdoclayer:27016"
+- name: SYNC_SERVER_URL
+  value: "http://{{ .Release.Name }}-chartsync:8080"
+{{- end }}
\ No newline at end of file
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 84b0b50c70..c2ff5464a6 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
@@ -16,8 +16,8 @@ import { InternalEventMonitorFactory } from '../../../../../store/src/monitors/i
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 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 { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
+import { StratosCurrentUserPermissions } from '../../../core/permissions/stratos-user-permissions.checker';
 import { environment } from '../../../environments/environment';
 import { getFullEndpointApiUrl } from '../../../features/endpoints/endpoint-helpers';
 import { ConfirmationDialogConfig } from '../../../shared/components/confirmation-dialog.config';
@@ -127,7 +127,7 @@ export class MonocularRepositoryListConfig implements IListConfig<EndpointModel>
     },
     label: 'Delete',
     description: 'Delete Helm Repository',
-    createVisible: () => this.currentUserPermissionsService.can(CurrentUserPermissions.ENDPOINT_REGISTER)
+    createVisible: () => this.currentUserPermissionsService.can(StratosCurrentUserPermissions.ENDPOINT_REGISTER)
   };
 
   private handleDeleteAction(item, handleChange) {
@@ -148,6 +148,7 @@ export class MonocularRepositoryListConfig implements IListConfig<EndpointModel>
       });
   }
 
+
   constructor(
     public store: Store<AppState>,
     public activatedRoute: ActivatedRoute,
diff --git a/deploy/ci/automation/helmtest.sh b/deploy/ci/automation/helmtest.sh
index 8c05ad703f..5a50bfac18 100755
--- a/deploy/ci/automation/helmtest.sh
+++ b/deploy/ci/automation/helmtest.sh
@@ -164,7 +164,7 @@ CHART_FILE="${KUBE_FOLDER}/console-${DEV_IMAGE_VERSION}.tgz"
 echo "Chart file path: ${CHART_FILE}"
 
 log "Upgrading using latest Helm Chart"
-helm upgrade ${NAME} "${CHART_FILE}" --recreate-pods --debug --set consoleVersion=${DEV_IMAGE_VERSION} --set imagePullPolicy=Always
+helm upgrade ${NAME} "${CHART_FILE}" --debug --set consoleVersion=${DEV_IMAGE_VERSION} --set imagePullPolicy=Always
 
 checkVersion console-${DEV_IMAGE_VERSION}
 waitForHelmRelease
@@ -177,7 +177,7 @@ sed -i.bak -e 's/appVersion: '"${DEV_IMAGE_VERSION}"'/appVersion: 0.2.0/g' "${HE
 cat "${HELM_TMP}/Chart.yaml"
 
 log "Upgrading using latest Helm Chart (checking chart upgrade)"
-helm upgrade ${NAME} "${HELM_TMP}" --recreate-pods --debug --set imagePullPolicy=Always
+helm upgrade ${NAME} "${HELM_TMP}" --debug --set imagePullPolicy=Always
 
 waitForHelmRelease
 checkVersion console-0.2.0
@@ -204,7 +204,7 @@ helm install ${HELM_REPO_NAME}/console --name ${NAME} --namespace ${NAMESPACE}
 waitForHelmRelease
 
 log "Upgrading using --reuse-values"
-helm upgrade ${NAME} "${HELM_TMP}" --recreate-pods --debug --reuse-values
+helm upgrade ${NAME} "${HELM_TMP}" --debug --reuse-values
 
 waitForHelmRelease
 # Should have used same values as before
diff --git a/deploy/cloud-foundry/README.md b/deploy/cloud-foundry/README.md
index d06e09234e..424faa2a48 100644
--- a/deploy/cloud-foundry/README.md
+++ b/deploy/cloud-foundry/README.md
@@ -73,7 +73,7 @@ and binding a database service instance to Stratos - for more information see [h
 To do so, `clone` the **stratos** repository, `cd` into the newly cloned repository and `push` to Cloud Foundry. This can be done with:
 
 ```
-git clone https://github.com/cloudfoundry/stratos
+git clone https://github.com/suse/stratos
 cd stratos
 git checkout tags/stable -b stable
 ./build/store-git-metadata.sh
@@ -91,7 +91,7 @@ If you wish to enable AOT or reduce the push time, you can pre-build the UI befo
 This can be done with:
 
 ```
-git clone https://github.com/cloudfoundry/stratos
+git clone https://github.com/suse/stratos
 cd stratos
 npm install
 npm run prebuild-ui
diff --git a/deploy/kubernetes/README.md b/deploy/kubernetes/README.md
index 35b76359f2..10358b4ad5 100644
--- a/deploy/kubernetes/README.md
+++ b/deploy/kubernetes/README.md
@@ -105,7 +105,7 @@ After the install, you should be able to access the Console in a web browser by
 
 ### Deploy using an archive of the Helm Chart
 
-Helm chart archives are available for Stratos releases from our GitHub repository, under releases - see https://github.com/cloudfoundry/stratos/releases.
+Helm chart archives are available for Stratos releases from our GitHub repository, under releases - see https://github.com/suse/stratos/releases.
 
 Download the appropriate release `console-helm-chart.X.Y.Z.tgz` from the GitHub repository and unpack the archive to a local folder. The Helm Chart will be extracted to a sub-folder named `console`.
 
@@ -122,7 +122,7 @@ helm install console --namespace=console --name my-console
 Clone the Stratos GitHub repository:
 
 ```
-git clone https://github.com/cloudfoundry/stratos.git
+git clone https://github.com/suse/stratos.git
 ```
 
 Open a terminal and cd to the `deploy/kubernetes` directory:
@@ -220,7 +220,7 @@ $ helm repo update
 To update an instance, the following assumes your instance is called `my-console`, and overrides have been specified in a file called `overrides.yaml`.
 
 ```
-$ helm upgrade -f overrides.yaml my-console stratos/console --recreate-pods
+$ helm upgrade -f overrides.yaml my-console stratos/console
 ```
 
 After the upgrade, perform a `helm list` to ensure your console is the latest version.
diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
index c2e0c5e730..63cc4a0f63 100755
--- a/deploy/kubernetes/build.sh
+++ b/deploy/kubernetes/build.sh
@@ -236,6 +236,7 @@ pushd "${DEST_HELM_CHART_PATH}" > /dev/null
 rm -rf "${DEST_HELM_CHART_PATH}/**/*.orig"
 
 # Run customization script if there is one
+# This can do things like provide a custom __stratos.tpl file
 if [ -f "${STRATOS_PATH}/custom-src/deploy/kubernetes/customize-helm.sh" ]; then
   printf "${YELLOW}${BOLD}Applying Helm Chart customizations${RESET}\n"
   "${STRATOS_PATH}/custom-src/deploy/kubernetes/customize-helm.sh" "${DEST_HELM_CHART_PATH}"
diff --git a/deploy/kubernetes/console/Chart.yaml b/deploy/kubernetes/console/Chart.yaml
index fcf011b8c0..c12c15f631 100644
--- a/deploy/kubernetes/console/Chart.yaml
+++ b/deploy/kubernetes/console/Chart.yaml
@@ -5,4 +5,4 @@ version: 0.1.0
 appVersion: 0.1.0
 sources:
   - https://github.com/cloudfoundry/stratos
-icon: https://raw.githubusercontent.com/cloudfoundry/stratos/master/deploy/kubernetes/icon.png
\ No newline at end of file
+icon: https://github.com/cloudfoundry/stratos/raw/master/deploy/kubernetes/console/icon.png
\ No newline at end of file
diff --git a/deploy/kubernetes/console/README.md b/deploy/kubernetes/console/README.md
index e4c920c061..cc4a7399d4 100644
--- a/deploy/kubernetes/console/README.md
+++ b/deploy/kubernetes/console/README.md
@@ -155,11 +155,9 @@ helm repo update
 To update an instance, the following assumes your instance is called `my-console`:
 
 ```
-helm upgrade my-console stratos/console --recreate-pods
+helm upgrade my-console stratos/console
 ```
 
-> Note: You *must* use the `--recreate-pods` flag when upgrading
-
 After the upgrade, perform a `helm list` to ensure your console is the latest version.
 
 ## Uninstalling
diff --git a/deploy/kubernetes/console/templates/__stratos.tpl b/deploy/kubernetes/console/templates/__stratos.tpl
new file mode 100644
index 0000000000..f1cc982504
--- /dev/null
+++ b/deploy/kubernetes/console/templates/__stratos.tpl
@@ -0,0 +1,5 @@
+# Customizations for the Helm Chart
+
+# Extra env vars for the Jetstream Pod in deployment.yaml
+{{- define "stratosJetstreamEnv" }}
+{{- end }}
\ No newline at end of file
diff --git a/deploy/kubernetes/console/templates/config-init.yaml b/deploy/kubernetes/console/templates/config-init.yaml
index e6d2f3582a..0cc82ee389 100644
--- a/deploy/kubernetes/console/templates/config-init.yaml
+++ b/deploy/kubernetes/console/templates/config-init.yaml
@@ -102,6 +102,8 @@ spec:
 {{- end }}
       containers:
       - env:
+        - name: STRATOS_IMAGE_REF
+          value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
         - name: "STRATOS_VOLUME_MIGRATION"
           value: "true"
         - name: "IS_UPGRADE"
diff --git a/deploy/kubernetes/console/templates/database.yaml b/deploy/kubernetes/console/templates/database.yaml
index 2f23173f49..5f64b162a7 100644
--- a/deploy/kubernetes/console/templates/database.yaml
+++ b/deploy/kubernetes/console/templates/database.yaml
@@ -60,6 +60,8 @@ spec:
         image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.mariadb}}:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         env:
+        - name: STRATOS_IMAGE_REF
+          value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
         - name: MYSQL_ROOT_PASSWORD
           valueFrom:
             secretKeyRef:
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index b0aec9dc1b..60656b1d83 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -65,6 +65,8 @@ spec:
           name: https
           protocol: TCP
         env:
+        - name: STRATOS_IMAGE_REF
+          value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
         - name: CONSOLE_CERT_PATH
           value: "/{{ .Release.Name }}-cert-volume"
         volumeMounts:
@@ -75,6 +77,8 @@ spec:
         imagePullPolicy: {{.Values.imagePullPolicy}}
         name: proxy
         env:
+        - name: STRATOS_IMAGE_REF
+          value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
         - name: STRATOS_HELM_RELEASE
           value: "{{ .Release.Name }}"
         - name: DB_USER
@@ -277,16 +281,7 @@ spec:
         - name: UI_LIST_ALLOW_LOAD_MAXED
           value: {{ default "false" .Values.console.ui.listAllowLoadMaxed | quote }}
         {{- end }}
-        - name: MONOCULAR_CRT_PATH
-          value: "/etc/monocular-certs/tls.crt"
-        - name: MONOCULAR_KEY_PATH
-          value: "/etc/monocular-certs/tls.key"
-        - name: MONOCULAR_CA_CRT_PATH
-          value: "/etc/monocular-certs/ca.crt"
-        - name: FDB_URL
-          value: "mongodb://{{ .Release.Name }}-fdbdoclayer:27016"
-        - name: SYNC_SERVER_URL
-          value: "http://{{ .Release.Name }}-chartsync:8080"
+        {{- include "stratosJetstreamEnv" . | indent 8 }}
         readinessProbe:
           httpGet:
             path: /pp/v1/ping
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index 8c7a7cf614..dd4b40cbdf 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -8,7 +8,7 @@ dockerRegistrySecret: regsecret
 #noProxy: localhost
 #ftpProxy: proxy.corp.net
 #socksProxy: sock-proxy.corp.net
-imagePullPolicy: IfNotPresent
+imagePullPolicy: Always
 
 console:
   cookieDomain:
diff --git a/deploy/kubernetes/imagelist-gen.sh b/deploy/kubernetes/imagelist-gen.sh
index 293c1a7ba4..77db87f409 100755
--- a/deploy/kubernetes/imagelist-gen.sh
+++ b/deploy/kubernetes/imagelist-gen.sh
@@ -37,6 +37,10 @@ ls -alR
 echo ""
 
 helm template -f ${__DIRNAME}/imagelist.values.yaml ${CHART_FOLDER} | grep "image:" | grep --extended --only-matching '([^"/[:space:]]+/)?[^"/[:space:]]+/[^:[:space:]]+:[a-zA-Z0-9\._-]+' | sort | uniq | awk -F'/' '{print $2}' > imagelist.txt
+if [ $? -ne 0 ]; then
+  echo -e "${BOLD}${RED}ERROR: Failed to render Helm Chart in order to generate image list"
+  exit 1
+fi
 popd > /dev/null
 
 printf "${CYAN}"
diff --git a/examples/custom-src/frontend/app/custom/app-action-extension/app-action-extension.component.spec.ts b/examples/custom-src/frontend/app/custom/app-action-extension/app-action-extension.component.spec.ts
index 4efb359c3f..d63c3f0a38 100644
--- a/examples/custom-src/frontend/app/custom/app-action-extension/app-action-extension.component.spec.ts
+++ b/examples/custom-src/frontend/app/custom/app-action-extension/app-action-extension.component.spec.ts
@@ -1,10 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
-import { AppActionExtensionComponent } from './app-action-extension.component';
 import { CoreModule } from '../../core/core.module';
-import { RouterTestingModule } from '@angular/router/testing';
 import { SharedModule } from '../../shared/shared.module';
-import { createBasicStoreModule } from '@stratos/store/testing';
+import { AppActionExtensionComponent } from './app-action-extension.component';
 
 describe('AppActionExtensionComponent', () => {
   let component: AppActionExtensionComponent;
diff --git a/package-lock.json b/package-lock.json
index 0fa8335d5d..200d6f47de 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7113,7 +7113,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
     },
@@ -7816,7 +7816,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": {
@@ -12140,7 +12140,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
     },
@@ -14933,7 +14933,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": {
@@ -18516,7 +18516,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": {
@@ -18693,7 +18693,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": {
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 fb7e09d975..5afb7cda0e 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,7 +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 { createEmptyStoreModule } from '@stratosui/store/testing';
 
 import { ApplicationService } from '../../../cloud-foundry/src/features/applications/application.service';
 import { ApplicationServiceMock } from '../../../cloud-foundry/test-framework/application-service-helper';
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 e387014816..22140a5cdf 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,7 +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 { createEmptyStoreModule } from '@stratosui/store/testing';
 
 import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';
 import { ApplicationServiceMock } from '../../../../cloud-foundry/test-framework/application-service-helper';
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 ccb88d5a1b..78e8a572a4 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,7 +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 { createEmptyStoreModule } from '@stratosui/store/testing';
 
 import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';
 import { ApplicationServiceMock } from '../../../../cloud-foundry/test-framework/application-service-helper';
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 68b583fc77..eff100853b 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,7 +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 { createEmptyStoreModule } from '@stratosui/store/testing';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
 import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';
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 e2f4f14a6d..d327f4bf5b 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
@@ -109,7 +109,6 @@ export class EditAutoscalerCredentialComponent implements OnInit, OnDestroy {
     );
     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),
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 09d208f0a0..884f637d50 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,5 +1,5 @@
 import { inject, TestBed } from '@angular/core/testing';
-import { createEmptyStoreModule } from '@stratos/store/testing';
+import { createEmptyStoreModule } from '@stratosui/store/testing';
 
 import { ApplicationsModule } from '../../../../cloud-foundry/src/features/applications/applications.module';
 import { EntityServiceFactory } from '../../../../store/src/entity-service-factory.service';
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 ac3ca5bcab..02095792e5 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,7 +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 { createEmptyStoreModule } from '@stratosui/store/testing';
 
 import { ApplicationService } from '../../../../../cloud-foundry/src/features/applications/application.service';
 import { ApplicationServiceMock } from '../../../../../cloud-foundry/test-framework/application-service-helper';
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 f6dc925fa8..05552c2692 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,7 +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 { createEmptyStoreModule } from '@stratosui/store/testing';
 
 import { ApplicationService } from '../../../../../cloud-foundry/src/features/applications/application.service';
 import { ApplicationServiceMock } from '../../../../../cloud-foundry/test-framework/application-service-helper';
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 52b26205f7..01d38f4030 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,7 +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 { createEmptyStoreModule } from '@stratosui/store/testing';
 
 import { ApplicationService } from '../../../../../cloud-foundry/src/features/applications/application.service';
 import { ApplicationServiceMock } from '../../../../../cloud-foundry/test-framework/application-service-helper';
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 8bf205e4f0..a2f2dab563 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,7 +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 { createEmptyStoreModule } from '@stratosui/store/testing';
 
 import { ApplicationService } from '../../../../../cloud-foundry/src/features/applications/application.service';
 import { ApplicationServiceMock } from '../../../../../cloud-foundry/test-framework/application-service-helper';
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 b9e5aac8c8..9be13c7f96 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,7 +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 { createEmptyStoreModule } from '@stratosui/store/testing';
 
 import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';
 import { ApplicationServiceMock } from '../../../../cloud-foundry/test-framework/application-service-helper';
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 e0b1c180b2..872a62cad6 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,7 +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 { createEmptyStoreModule } from '@stratosui/store/testing';
 
 import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';
 import {
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 a30d9ddc7e..56fe3b5865 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,7 +3,7 @@ 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 { createEmptyStoreModule } from '@stratosui/store/testing';
 
 import { GetApplication } from '../../../../../cloud-foundry/src/actions/application.actions';
 import { cfEntityFactory } from '../../../../../cloud-foundry/src/cf-entity-factory';
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 22d2449f95..32b9e419e4 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,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import { getRowMetadata } from '@stratos/store';
+import { getRowMetadata } from '@stratosui/store';
 
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import { ListDataSource } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
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 7f0a6a1cbf..6444356618 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 @@
 import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { createEmptyStoreModule } from '@stratos/store/testing';
+import { createEmptyStoreModule } from '@stratosui/store/testing';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
 import {
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 d8ec4e79aa..367ee3f0d1 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,7 +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 { createEmptyStoreModule } from '@stratosui/store/testing';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
 import { ApplicationService } from '../../../../../../../cloud-foundry/src/features/applications/application.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 bbff81af73..562f11e8b9 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,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import { getRowMetadata } from '@stratos/store';
+import { getRowMetadata } from '@stratosui/store';
 
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import { ListDataSource } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
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 4c6669fe61..d4bf8da651 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,6 +1,6 @@
 import { DatePipe } from '@angular/common';
 import { inject, TestBed } from '@angular/core/testing';
-import { createEmptyStoreModule } from '@stratos/store/testing';
+import { createEmptyStoreModule } from '@stratosui/store/testing';
 
 import {
   ApplicationEnvVarsHelper,
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 50488bd836..a3bd914226 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/application.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/application.actions.ts
@@ -12,37 +12,33 @@ import { createEntityRelationPaginationKey, EntityInlineParentAction } from '../
 import { AppMetadataTypes } from './app-metadata.actions';
 import { CFStartAction } from './cf-action.types';
 
-export const GET_ALL = '[Application] Get all';
-export const GET_ALL_SUCCESS = '[Application] Get all success';
-export const GET_ALL_FAILED = '[Application] Get all failed';
+const GET_ALL = '[Application] Get all';
+const GET_ALL_SUCCESS = '[Application] Get all success';
+const GET_ALL_FAILED = '[Application] Get all failed';
 
-export const GET = '[Application] Get one';
-export const GET_SUCCESS = '[Application] Get one success';
-export const GET_FAILED = '[Application] Get one failed';
+const GET = '[Application] Get one';
+const GET_SUCCESS = '[Application] Get one success';
+const GET_FAILED = '[Application] Get one failed';
 
-export const GET_SUMMARY = '[Application] Get summary';
-export const GET_SUMMARY_SUCCESS = '[Application] Get summary success';
-export const GET_SUMMARY_FAILED = '[Application] Get summary failed';
+const CREATE = '[Application] Create';
+const CREATE_SUCCESS = '[Application] Create success';
+const CREATE_FAILED = '[Application] Create failed';
 
-export const CREATE = '[Application] Create';
-export const CREATE_SUCCESS = '[Application] Create success';
-export const CREATE_FAILED = '[Application] Create failed';
+export const CF_APP_UPDATE = '[Application] Update';
+export const CF_APP_UPDATE_SUCCESS = '[Application] Update success';
+export const CF_APP_UPDATE_FAILED = '[Application] Update failed';
 
-export const UPDATE = '[Application] Update';
-export const UPDATE_SUCCESS = '[Application] Update success';
-export const UPDATE_FAILED = '[Application] Update failed';
+const DELETE = '[Application] Delete';
+const DELETE_SUCCESS = '[Application] Delete success';
+const DELETE_FAILED = '[Application] Delete failed';
 
-export const DELETE = '[Application] Delete';
-export const DELETE_SUCCESS = '[Application] Delete success';
-export const DELETE_FAILED = '[Application] Delete failed';
+const DELETE_INSTANCE = '[Application Instance] Delete';
+const DELETE_INSTANCE_SUCCESS = '[Application Instance] Delete success';
+const DELETE_INSTANCE_FAILED = '[Application Instance] Delete failed';
 
-export const DELETE_INSTANCE = '[Application Instance] Delete';
-export const DELETE_INSTANCE_SUCCESS = '[Application Instance] Delete success';
-export const DELETE_INSTANCE_FAILED = '[Application Instance] Delete failed';
-
-export const RESTAGE = '[Application] Restage';
-export const RESTAGE_SUCCESS = '[Application] Restage success';
-export const RESTAGE_FAILED = '[Application] Restage failed';
+const RESTAGE = '[Application] Restage';
+const RESTAGE_SUCCESS = '[Application] Restage success';
+const RESTAGE_FAILED = '[Application] Restage failed';
 
 const applicationEntitySchema = cfEntityFactory(applicationEntityType);
 
@@ -140,7 +136,7 @@ export class UpdateExistingApplication extends CFStartAction implements ICFActio
       newApplication
     );
   }
-  actions = [UPDATE, UPDATE_SUCCESS, UPDATE_FAILED];
+  actions = [CF_APP_UPDATE, CF_APP_UPDATE_SUCCESS, CF_APP_UPDATE_FAILED];
   entity = [applicationEntitySchema];
   entityType = applicationEntityType;
   options: HttpRequest<any>;
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 ff01a09be0..0603548dcf 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/organization.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/organization.actions.ts
@@ -19,7 +19,7 @@ import {
   EntityInlineParentAction,
 } from '../entity-relations/entity-relations.types';
 import { CFStartAction } from './cf-action.types';
-import { createDefaultUserRelations } from './users.actions';
+import { createDefaultCfUserRelations } from './users.actions';
 
 export const GET_ORGANIZATION = '[Organization] Get one';
 export const GET_ORGANIZATION_SUCCESS = '[Organization] Get one success';
@@ -231,7 +231,7 @@ export class GetAllOrgUsers extends CFStartAction implements PaginatedAction, En
     public paginationKey: string,
     public endpointGuid: string,
     public isAdmin: boolean,
-    public includeRelations: string[] = createDefaultUserRelations()) {
+    public includeRelations: string[] = createDefaultCfUserRelations()) {
     super();
     this.options = new HttpRequest(
       'GET',
diff --git a/src/frontend/packages/cloud-foundry/src/actions/permissions.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/permissions.actions.ts
index 1cd3efeb4e..15f3cafc93 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/permissions.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/permissions.actions.ts
@@ -1,54 +1,47 @@
+import { HttpRequest } from '@angular/common/http';
 import { Action } from '@ngrx/store';
 
 import { APIResource } from '../../../store/src/types/api.types';
 import { organizationEntityType, spaceEntityType } from '../cf-entity-types';
-import { HttpRequest } from '@angular/common/http';
 
-export const GET_AUDITED_ORG_CURRENT_USER_RELATIONS = '[Current User] Get audited org Relations';
-export const GET_AUDITED_ORG_CURRENT_USER_RELATIONS_SUCCESS = '[Current User] Get audited org Relations success';
-export const GET_AUDITED_ORG_CURRENT_USER_RELATIONS_FAILED = '[Current User] Get audited org Relations failed';
+export const GET_AUDITED_ORG_CURRENT_CF_USER_RELATIONS = '[Current User] Get audited org Relations';
+export const GET_AUDITED_ORG_CURRENT_CF_USER_RELATIONS_SUCCESS = '[Current User] Get audited org Relations success';
+export const GET_AUDITED_ORG_CURRENT_CF_USER_RELATIONS_FAILED = '[Current User] Get audited org Relations failed';
 
-export const GET_BILLING_MANAGED_ORG_CURRENT_USER_RELATIONS = '[Current User] Get BILLING_MANAGED org Relations';
-export const GET_BILLING_MANAGED_ORG_CURRENT_USER_RELATIONS_SUCCESS = '[Users] Get BILLING_MANAGED org Relations success';
-export const GET_BILLING_MANAGED_ORG_CURRENT_USER_RELATIONS_FAILED = '[Users] Get BILLING_MANAGED org Relations failed';
+export const GET_BILLING_MANAGED_ORG_CURRENT_CF_USER_RELATIONS = '[Current User] Get BILLING_MANAGED org Relations';
+export const GET_BILLING_MANAGED_ORG_CURRENT_CF_USER_RELATIONS_SUCCESS = '[Users] Get BILLING_MANAGED org Relations success';
+export const GET_BILLING_MANAGED_ORG_CURRENT_CF_USER_RELATIONS_FAILED = '[Users] Get BILLING_MANAGED org Relations failed';
 
-export const GET_MANAGED_ORG_CURRENT_USER_RELATIONS = '[Current User] Get MANAGED org Relations';
-export const GET_MANAGED_ORG_CURRENT_USER_RELATIONS_SUCCESS = '[Current User] Get MANAGED org Relations success';
-export const GET_MANAGED_ORG_CURRENT_USER_RELATIONS_FAILED = '[Current User] Get MANAGED org Relations failed';
+export const GET_MANAGED_ORG_CURRENT_CF_USER_RELATIONS = '[Current User] Get MANAGED org Relations';
+export const GET_MANAGED_ORG_CURRENT_CF_USER_RELATIONS_SUCCESS = '[Current User] Get MANAGED org Relations success';
+export const GET_MANAGED_ORG_CURRENT_CF_USER_RELATIONS_FAILED = '[Current User] Get MANAGED org Relations failed';
 
-export const GET_ORG_CURRENT_USER_RELATIONS = '[Current User] Get org Relations';
-export const GET_ORG_CURRENT_USER_RELATIONS_SUCCESS = '[Current User] Get org Relations success';
-export const GET_ORG_CURRENT_USER_RELATIONS_FAILED = '[Current User] Get org Relations failed';
+export const GET_ORG_CURRENT_CF_USER_RELATIONS = '[Current User] Get org Relations';
+export const GET_ORG_CURRENT_CF_USER_RELATIONS_SUCCESS = '[Current User] Get org Relations success';
+export const GET_ORG_CURRENT_CF_USER_RELATIONS_FAILED = '[Current User] Get org Relations failed';
 
-export const GET_AUDITED_SPACE_CURRENT_USER_RELATIONS = '[Current User] Get AUDITED_SPACE Relations';
-export const GET_AUDITED_SPACE_CURRENT_USER_RELATIONS_SUCCESS = '[Current User] Get AUDITED_SPACE Relations success';
-export const GET_AUDITED_SPACE_CURRENT_USER_RELATIONS_FAILED = '[Current User] Get AUDITED_SPACE Relations failed';
+export const GET_AUDITED_SPACE_CURRENT_CF_USER_RELATIONS = '[Current User] Get AUDITED_SPACE Relations';
+export const GET_AUDITED_SPACE_CURRENT_CF_USER_RELATIONS_SUCCESS = '[Current User] Get AUDITED_SPACE Relations success';
+export const GET_AUDITED_SPACE_CURRENT_CF_USER_RELATIONS_FAILED = '[Current User] Get AUDITED_SPACE Relations failed';
 
-export const GET_MANAGED_SPACE_CURRENT_USER_RELATIONS = '[Current User] Get MANAGED_SPACE Relations';
-export const GET_MANAGED_SPACE_CURRENT_USER_RELATIONS_SUCCESS = '[Current User] Get MANAGED_SPACE Relations success';
-export const GET_MANAGED_SPACE_CURRENT_USER_RELATIONS_FAILED = '[Current User] Get MANAGED_SPACE Relations failed';
+export const GET_MANAGED_SPACE_CURRENT_CF_USER_RELATIONS = '[Current User] Get MANAGED_SPACE Relations';
+export const GET_MANAGED_SPACE_CURRENT_CF_USER_RELATIONS_SUCCESS = '[Current User] Get MANAGED_SPACE Relations success';
+export const GET_MANAGED_SPACE_CURRENT_CF_USER_RELATIONS_FAILED = '[Current User] Get MANAGED_SPACE Relations failed';
 
-export const GET_SPACE_CURRENT_USER_RELATIONS = '[Current User] Get SPACE Relations';
-export const GET_SPACE_CURRENT_USER_RELATIONS_SUCCESS = '[Current User] Get SPACE Relations success';
-export const GET_SPACE_CURRENT_USER_RELATIONS_FAILED = '[Current User] Get SPACE Relations failed';
+export const GET_SPACE_CURRENT_CF_USER_RELATIONS = '[Current User] Get SPACE Relations';
+export const GET_SPACE_CURRENT_CF_USER_RELATIONS_SUCCESS = '[Current User] Get SPACE Relations success';
+export const GET_SPACE_CURRENT_CF_USER_RELATIONS_FAILED = '[Current User] Get SPACE Relations failed';
 
-export const GET_CURRENT_USER_RELATION = '[Current User] Get relation';
-export const GET_CURRENT_USER_RELATION_SUCCESS = '[Current User] Get relation success';
-export const GET_CURRENT_USER_RELATION_FAILED = '[Current User] Get relation failed';
+export const GET_CURRENT_CF_USER_RELATION = '[Current User] Get relation';
+export const GET_CURRENT_CF_USER_RELATION_SUCCESS = '[Current User] Get relation success';
+export const GET_CURRENT_CF_USER_RELATION_FAILED = '[Current User] Get relation failed';
 
-export const GET_CURRENT_USER_RELATIONS = '[Current User] Get relations';
-export const GET_CURRENT_USER_RELATIONS_SUCCESS = '[Current User] Get relations success';
-export const GET_CURRENT_USER_RELATIONS_FAILED = '[Current User] Get relations failed';
 
-export const GET_CURRENT_USER_CF_RELATIONS = '[Current User] Get CF relations';
-export const GET_CURRENT_USER_CF_RELATIONS_SUCCESS = '[Current User] Get CF relations success';
-export const GET_CURRENT_USER_CF_RELATIONS_FAILED = '[Current User] Get CF relations failed';
-
-export class GetCurrentUsersRelations implements Action {
-  type = GET_CURRENT_USER_RELATIONS;
-}
+export const GET_CURRENT_CF_USER_RELATIONS = '[Current User] Get CF relations';
+export const GET_CURRENT_CF_USER_RELATIONS_SUCCESS = '[Current User] Get CF relations success';
+export const GET_CURRENT_CF_USER_RELATIONS_FAILED = '[Current User] Get CF relations failed';
 
-export enum UserRelationTypes {
+export enum CfUserRelationTypes {
   AUDITED_ORGANIZATIONS = 'audited_organizations',
   BILLING_MANAGED_ORGANIZATION = 'billing_managed_organizations',
   MANAGED_ORGANIZATION = 'managed_organizations',
@@ -58,7 +51,7 @@ export enum UserRelationTypes {
   SPACES = 'spaces'
 }
 
-export interface IUserRelationTypes {
+export interface ICfUserRelationTypes {
   [key: string]: {
     actions: [
       string,
@@ -69,128 +62,128 @@ export interface IUserRelationTypes {
   };
 }
 
-export class GetUserCfRelations implements Action {
+export class GetCfUserRelations implements Action {
   constructor(public cfGuid: string, public type: string) { }
 }
 
 /**
  * Used in conjunction with `permissions.effects.ts` to fetch roles of a user connected to a cf that power the permissions model
  */
-export class GetUserRelations implements Action {
-  public type = GET_CURRENT_USER_RELATION;
+export class GetCurrentCfUserRelations implements Action {
+  public type = GET_CURRENT_CF_USER_RELATION;
   public actions: string[];
   public options: HttpRequest<any>;
-  constructor(public guid: string, public relationType: UserRelationTypes, public endpointGuid: string) {
+  constructor(public guid: string, public relationType: CfUserRelationTypes, public endpointGuid: string) {
     const typeOptions = this.types[relationType];
     this.options = new HttpRequest(
       'GET',
       `users/${guid}/${relationType}`
     );
     this.actions = typeOptions.actions;
-    this.type = GET_CURRENT_USER_RELATION;
+    this.type = GET_CURRENT_CF_USER_RELATION;
   }
-  private types: IUserRelationTypes = {
-    [UserRelationTypes.AUDITED_ORGANIZATIONS]: {
+  private types: ICfUserRelationTypes = {
+    [CfUserRelationTypes.AUDITED_ORGANIZATIONS]: {
       actions: [
-        GET_AUDITED_ORG_CURRENT_USER_RELATIONS,
-        GET_AUDITED_ORG_CURRENT_USER_RELATIONS_SUCCESS,
-        GET_AUDITED_ORG_CURRENT_USER_RELATIONS_FAILED
+        GET_AUDITED_ORG_CURRENT_CF_USER_RELATIONS,
+        GET_AUDITED_ORG_CURRENT_CF_USER_RELATIONS_SUCCESS,
+        GET_AUDITED_ORG_CURRENT_CF_USER_RELATIONS_FAILED
       ],
       entityType: organizationEntityType
     },
-    [UserRelationTypes.BILLING_MANAGED_ORGANIZATION]: {
+    [CfUserRelationTypes.BILLING_MANAGED_ORGANIZATION]: {
       actions: [
-        GET_BILLING_MANAGED_ORG_CURRENT_USER_RELATIONS,
-        GET_BILLING_MANAGED_ORG_CURRENT_USER_RELATIONS_SUCCESS,
-        GET_BILLING_MANAGED_ORG_CURRENT_USER_RELATIONS_FAILED
+        GET_BILLING_MANAGED_ORG_CURRENT_CF_USER_RELATIONS,
+        GET_BILLING_MANAGED_ORG_CURRENT_CF_USER_RELATIONS_SUCCESS,
+        GET_BILLING_MANAGED_ORG_CURRENT_CF_USER_RELATIONS_FAILED
       ],
       entityType: organizationEntityType
     },
-    [UserRelationTypes.MANAGED_ORGANIZATION]: {
+    [CfUserRelationTypes.MANAGED_ORGANIZATION]: {
       actions: [
-        GET_MANAGED_ORG_CURRENT_USER_RELATIONS,
-        GET_MANAGED_ORG_CURRENT_USER_RELATIONS_SUCCESS,
-        GET_MANAGED_ORG_CURRENT_USER_RELATIONS_FAILED
+        GET_MANAGED_ORG_CURRENT_CF_USER_RELATIONS,
+        GET_MANAGED_ORG_CURRENT_CF_USER_RELATIONS_SUCCESS,
+        GET_MANAGED_ORG_CURRENT_CF_USER_RELATIONS_FAILED
       ],
       entityType: organizationEntityType
     },
-    [UserRelationTypes.ORGANIZATIONS]: {
-      actions: [GET_ORG_CURRENT_USER_RELATIONS, GET_ORG_CURRENT_USER_RELATIONS_SUCCESS, GET_ORG_CURRENT_USER_RELATIONS_FAILED],
+    [CfUserRelationTypes.ORGANIZATIONS]: {
+      actions: [GET_ORG_CURRENT_CF_USER_RELATIONS, GET_ORG_CURRENT_CF_USER_RELATIONS_SUCCESS, GET_ORG_CURRENT_CF_USER_RELATIONS_FAILED],
       entityType: organizationEntityType
     },
-    [UserRelationTypes.AUDITED_SPACES]: {
+    [CfUserRelationTypes.AUDITED_SPACES]: {
       actions: [
-        GET_AUDITED_SPACE_CURRENT_USER_RELATIONS,
-        GET_AUDITED_SPACE_CURRENT_USER_RELATIONS_SUCCESS,
-        GET_AUDITED_SPACE_CURRENT_USER_RELATIONS_FAILED
+        GET_AUDITED_SPACE_CURRENT_CF_USER_RELATIONS,
+        GET_AUDITED_SPACE_CURRENT_CF_USER_RELATIONS_SUCCESS,
+        GET_AUDITED_SPACE_CURRENT_CF_USER_RELATIONS_FAILED
       ],
       entityType: spaceEntityType
     },
-    [UserRelationTypes.MANAGED_SPACES]: {
+    [CfUserRelationTypes.MANAGED_SPACES]: {
       actions: [
-        GET_MANAGED_SPACE_CURRENT_USER_RELATIONS,
-        GET_MANAGED_SPACE_CURRENT_USER_RELATIONS_SUCCESS,
-        GET_MANAGED_SPACE_CURRENT_USER_RELATIONS_FAILED
+        GET_MANAGED_SPACE_CURRENT_CF_USER_RELATIONS,
+        GET_MANAGED_SPACE_CURRENT_CF_USER_RELATIONS_SUCCESS,
+        GET_MANAGED_SPACE_CURRENT_CF_USER_RELATIONS_FAILED
       ],
       entityType: spaceEntityType
     },
-    [UserRelationTypes.SPACES]: {
+    [CfUserRelationTypes.SPACES]: {
       actions: [
-        GET_SPACE_CURRENT_USER_RELATIONS,
-        GET_SPACE_CURRENT_USER_RELATIONS_SUCCESS,
-        GET_SPACE_CURRENT_USER_RELATIONS_SUCCESS
+        GET_SPACE_CURRENT_CF_USER_RELATIONS,
+        GET_SPACE_CURRENT_CF_USER_RELATIONS_SUCCESS,
+        GET_SPACE_CURRENT_CF_USER_RELATIONS_SUCCESS
       ],
       entityType: spaceEntityType
     }
   };
 }
 
-export class GetCurrentUserRelationsComplete<T = any> {
-  public type = GET_CURRENT_USER_RELATION_SUCCESS;
+export class GetCurrentCfUserRelationsComplete<T = any> {
+  public type = GET_CURRENT_CF_USER_RELATION_SUCCESS;
   constructor(
-    public relationType: UserRelationTypes, public endpointGuid: string, public data: APIResource<T>[]
+    public relationType: CfUserRelationTypes, public endpointGuid: string, public data: APIResource<T>[]
   ) { }
 }
 
-export class GetCurrentUsersAuditedOrganizations extends GetUserRelations {
+export class GetCurrentCfUsersAuditedOrganizations extends GetCurrentCfUserRelations {
   constructor(public guid: string, endpointGuid: string) {
-    super(guid, UserRelationTypes.AUDITED_ORGANIZATIONS, endpointGuid);
+    super(guid, CfUserRelationTypes.AUDITED_ORGANIZATIONS, endpointGuid);
   }
 }
 
-export class GetCurrentUsersBillingOrganizations extends GetUserRelations {
+export class GetCurrentCfUsersBillingOrganizations extends GetCurrentCfUserRelations {
   constructor(public guid: string, endpointGuid: string) {
-    super(guid, UserRelationTypes.BILLING_MANAGED_ORGANIZATION, endpointGuid);
+    super(guid, CfUserRelationTypes.BILLING_MANAGED_ORGANIZATION, endpointGuid);
   }
 }
 
-export class GetCurrentUsersManagedOrganizations extends GetUserRelations {
+export class GetCurrentCfUsersManagedOrganizations extends GetCurrentCfUserRelations {
   constructor(public guid: string, endpointGuid: string) {
-    super(guid, UserRelationTypes.MANAGED_ORGANIZATION, endpointGuid);
+    super(guid, CfUserRelationTypes.MANAGED_ORGANIZATION, endpointGuid);
   }
 }
 
-export class GetCurrentUsersOrganizations extends GetUserRelations {
+export class GetCurrentCfUsersOrganizations extends GetCurrentCfUserRelations {
   constructor(public guid: string, endpointGuid: string) {
-    super(guid, UserRelationTypes.ORGANIZATIONS, endpointGuid);
+    super(guid, CfUserRelationTypes.ORGANIZATIONS, endpointGuid);
   }
 }
 
-export class GetCurrentUsersAuditedSpaces extends GetUserRelations {
+export class GetCurrentCfUsersAuditedSpaces extends GetCurrentCfUserRelations {
   constructor(public guid: string, endpointGuid: string) {
-    super(guid, UserRelationTypes.AUDITED_SPACES, endpointGuid);
+    super(guid, CfUserRelationTypes.AUDITED_SPACES, endpointGuid);
   }
 }
 
-export class GetCurrentUsersManagedSpaces extends GetUserRelations {
+export class GetCurrentCfUsersManagedSpaces extends GetCurrentCfUserRelations {
   constructor(public guid: string, endpointGuid: string) {
-    super(guid, UserRelationTypes.MANAGED_SPACES, endpointGuid);
+    super(guid, CfUserRelationTypes.MANAGED_SPACES, endpointGuid);
   }
 }
 
-export class GetCurrentUsersSpaces extends GetUserRelations {
+export class GetCurrentCfUsersSpaces extends GetCurrentCfUserRelations {
   constructor(public guid: string, endpointGuid: string) {
-    super(guid, UserRelationTypes.SPACES, endpointGuid);
+    super(guid, CfUserRelationTypes.SPACES, endpointGuid);
   }
 }
 
diff --git a/src/frontend/packages/cloud-foundry/src/actions/users-roles.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/users-roles.actions.ts
index 66d36f8827..4682fd67ed 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/users-roles.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/users-roles.actions.ts
@@ -1,6 +1,6 @@
 import { Action } from '@ngrx/store';
 
-import { CfUser } from '../store/types/user.types';
+import { CfUser } from '../store/types/cf-user.types';
 import { CfRoleChange } from '../store/types/users-roles.types';
 
 export const UsersRolesActions = {
diff --git a/src/frontend/packages/cloud-foundry/src/actions/users.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/users.actions.ts
index 8aa7e4be31..40f7d57afc 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/users.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/users.actions.ts
@@ -12,29 +12,23 @@ import {
   createEntityRelationPaginationKey,
   EntityInlineParentAction,
 } from '../entity-relations/entity-relations.types';
-import { CfUserRoleParams, OrgUserRoleNames, SpaceUserRoleNames } from '../store/types/user.types';
+import { CfUserRoleParams, OrgUserRoleNames, SpaceUserRoleNames } from '../store/types/cf-user.types';
 import { CFStartAction } from './cf-action.types';
 
-export const GET_ALL = '[Users] Get all';
-export const GET_ALL_SUCCESS = '[Users] Get all success';
-export const GET_ALL_FAILED = '[Users] Get all failed';
+export const GET_ALL_CF_USERS = '[Users] Get all';
+export const GET_ALL_CF_USERS_SUCCESS = '[Users] Get all success';
+export const GET_ALL_CF_USERS_FAILED = '[Users] Get all failed';
 
-export const REMOVE_ROLE = '[Users] Remove role';
-export const REMOVE_ROLE_SUCCESS = '[Users]  Remove role success';
-export const REMOVE_ROLE_FAILED = '[Users]  Remove role failed';
+export const REMOVE_CF_ROLE = '[Users] Remove role';
+export const REMOVE_CF_ROLE_SUCCESS = '[Users]  Remove role success';
+export const REMOVE_CF_ROLE_FAILED = '[Users]  Remove role failed';
 
-export const ADD_ROLE = '[Users] Add role';
-export const ADD_ROLE_SUCCESS = '[Users]  Add role success';
-export const ADD_ROLE_FAILED = '[Users]  Add role failed';
+export const ADD_CF_ROLE = '[Users] Add role';
+export const ADD_CF_ROLE_SUCCESS = '[Users]  Add role success';
+export const ADD_CF_ROLE_FAILED = '[Users]  Add role failed';
 
-export const GET_CF_USER = '[Users] Get cf user ';
-export const GET_CF_USER_SUCCESS = '[Users] Get cf user success';
-export const GET_CF_USER_FAILED = '[Users] Get cf user failed';
 
-export const GET_CF_USERS_AS_NON_ADMIN = '[Users] Get cf users by org ';
-export const GET_CF_USERS_AS_NON_ADMIN_SUCCESS = '[Users] Get cf users by org success';
-
-export function createDefaultUserRelations() {
+export function createDefaultCfUserRelations() {
   return [
     createEntityRelationKey(cfUserEntityType, CfUserRoleParams.ORGANIZATIONS),
     createEntityRelationKey(cfUserEntityType, CfUserRoleParams.AUDITED_ORGS),
@@ -47,12 +41,12 @@ export function createDefaultUserRelations() {
 }
 
 
-export class GetAllUsersAsAdmin extends CFStartAction implements PaginatedAction, EntityInlineParentAction {
+export class GetAllCfUsersAsAdmin extends CFStartAction implements PaginatedAction, EntityInlineParentAction {
   isGetAllUsersAsAdmin = true;
   paginationKey: string;
   constructor(
     public endpointGuid: string,
-    public includeRelations: string[] = createDefaultUserRelations(),
+    public includeRelations: string[] = createDefaultCfUserRelations(),
     public populateMissing = true,
     paginationKey?: string
   ) {
@@ -63,7 +57,7 @@ export class GetAllUsersAsAdmin extends CFStartAction implements PaginatedAction
       'users'
     );
   }
-  actions = [GET_ALL, GET_ALL_SUCCESS, GET_ALL_FAILED];
+  actions = [GET_ALL_CF_USERS, GET_ALL_CF_USERS_SUCCESS, GET_ALL_CF_USERS_FAILED];
   entity = [cfEntityFactory(cfUserEntityType)];
   entityType = cfUserEntityType;
   options: HttpRequest<any>;
@@ -98,7 +92,7 @@ enum ChangeUserRoleType {
 /**
  *  Add or remove a user's role, either by user guid or name
  */
-export class ChangeUserRole extends CFStartAction implements EntityRequestAction {
+export class ChangeCfUserRole extends CFStartAction implements EntityRequestAction {
   public endpointType = 'cf';
   constructor(
     public endpointGuid: string,
@@ -115,7 +109,7 @@ export class ChangeUserRole extends CFStartAction implements EntityRequestAction
   ) {
     super();
     this.guid = entityGuid;
-    this.updatingKey = ChangeUserRole.generateUpdatingKey(permissionTypeKey, userGuid);
+    this.updatingKey = ChangeCfUserRole.generateUpdatingKey(permissionTypeKey, userGuid);
     this.options = new HttpRequest(
       this.createMethod(),
       this.createUrl(),
@@ -166,7 +160,7 @@ export class ChangeUserRole extends CFStartAction implements EntityRequestAction
   }
 }
 
-export class AddUserRole extends ChangeUserRole {
+export class AddCfUserRole extends ChangeCfUserRole {
   constructor(
     endpointGuid: string,
     userGuid: string,
@@ -182,7 +176,7 @@ export class AddUserRole extends ChangeUserRole {
       endpointGuid,
       userGuid,
       ChangeUserRoleType.ADD,
-      [ADD_ROLE, ADD_ROLE_SUCCESS, ADD_ROLE_FAILED],
+      [ADD_CF_ROLE, ADD_CF_ROLE_SUCCESS, ADD_CF_ROLE_FAILED],
       permissionTypeKey,
       entityGuid,
       isSpace,
@@ -194,7 +188,7 @@ export class AddUserRole extends ChangeUserRole {
   }
 }
 
-export class RemoveUserRole extends ChangeUserRole {
+export class RemoveCfUserRole extends ChangeCfUserRole {
   constructor(
     endpointGuid: string,
     userGuid: string,
@@ -210,7 +204,7 @@ export class RemoveUserRole extends ChangeUserRole {
       endpointGuid,
       userGuid,
       ChangeUserRoleType.REMOVE,
-      [REMOVE_ROLE, REMOVE_ROLE_SUCCESS, REMOVE_ROLE_FAILED],
+      [REMOVE_CF_ROLE, REMOVE_CF_ROLE_SUCCESS, REMOVE_CF_ROLE_FAILED],
       permissionTypeKey,
       entityGuid,
       isSpace,
@@ -222,11 +216,11 @@ export class RemoveUserRole extends ChangeUserRole {
   }
 }
 
-export class GetUser extends CFStartAction {
+export class GetCfUser extends CFStartAction {
   constructor(
     public endpointGuid: string,
     public guid: string,
-    public includeRelations: string[] = createDefaultUserRelations(),
+    public includeRelations: string[] = createDefaultCfUserRelations(),
     public populateMissing = true) {
     super();
     this.options = new HttpRequest(
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 0ccae9e71a..0449db54d5 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-api.types.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-api.types.ts
@@ -1,6 +1,6 @@
 import { APIResource } from '../../store/src/types/api.types';
 import { IService, IServiceBinding } from './cf-api-svc.types';
-import { CfUser } from './store/types/user.types';
+import { CfUser } from './store/types/cf-user.types';
 
 export interface StratosCFEntity {
   cfGuid: string;
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 380c47cce7..a3db99e684 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-catalog.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-catalog.ts
@@ -61,8 +61,8 @@ import { StackActionBuilders } from './entity-action-builders/stack-action-build
 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 { CfUser } from './store/types/cf-user.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.
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 0f2d1ebb9e..1112888031 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-factory.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-factory.ts
@@ -46,7 +46,7 @@ import {
   userProvidedServiceInstanceEntityType,
 } from './cf-entity-types';
 import { getAPIResourceGuid } from './store/selectors/api.selectors';
-import { CfUser, CfUserRoleParams, OrgUserRoleNames, SpaceUserRoleNames } from './store/types/user.types';
+import { CfUser, CfUserRoleParams, OrgUserRoleNames, SpaceUserRoleNames } from './store/types/cf-user.types';
 
 const entityCache: {
   [key: string]: EntitySchema
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 26a24ca124..beba13c732 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
@@ -118,6 +118,7 @@ import {
   GitCommitActionBuilders,
   gitCommitActionBuilders,
   GitCommitActionBuildersConfig,
+  GitMeta,
   GitRepoActionBuilders,
   gitRepoActionBuilders,
 } from './entity-action-builders/git-action-builder';
@@ -165,17 +166,19 @@ 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 { cfUserReducer, endpointDisconnectUserReducer, userSpaceOrgReducer } from './store/reducers/cf-users.reducer';
+import { currentCfUserRolesReducer } from './store/reducers/current-cf-user-roles-reducer/current-cf-user-roles.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';
 import { serviceInstanceReducer } from './store/reducers/service-instance.reducer';
 import { updateSpaceQuotaReducer } from './store/reducers/space-quota.reducer';
-import { endpointDisconnectUserReducer, userReducer, userSpaceOrgReducer } from './store/reducers/users.reducer';
 import { AppStat } from './store/types/app-metadata.types';
 import { CFResponse } from './store/types/cf-api.types';
+import { CfUser } from './store/types/cf-user.types';
 import { GitBranch, GitCommit, GitRepo } from './store/types/git.types';
-import { CfUser } from './store/types/user.types';
+import { cfUserRolesFetch } from './user-permissions/cf-user-roles-fetch';
 
 function safePopulatePaginationFromParent(store: Store<GeneralEntityAppState>, action: PaginatedAction): Observable<Action> {
   return populatePaginationFromParent(store, action).pipe(
@@ -364,7 +367,9 @@ export function generateCFEntities(): StratosBaseCatalogEntity[] {
           map(([beValue, userOverride]) => userOverride || beValue || entityTypeDefault)
         );
       },
-    }
+    },
+    userRolesFetch: cfUserRolesFetch,
+    userRolesReducer: currentCfUserRolesReducer
   };
   return [
     generateCfEndpointEntity(endpointDefinition),
@@ -846,7 +851,7 @@ function generateCFUserEntity(endpointDefinition: StratosEndpointExtensionDefini
     definition,
     {
       actionBuilders: userActionBuilders,
-      dataReducers: [userReducer, endpointDisconnectUserReducer],
+      dataReducers: [cfUserReducer, endpointDisconnectUserReducer],
       entityBuilder: {
         getMetadata: ent => ({
           name: ent.entity.username || ent.entity.guid || ent.metadata.guid,
@@ -899,8 +904,9 @@ function generateGitCommitEntity(endpointDefinition: StratosEndpointExtensionDef
     endpoint: endpointDefinition,
     nonJetstreamRequest: true,
     successfulRequestDataMapper: (data, endpointGuid, guid, entityType, endpointType, action) => {
+      const metadata = (action.metadata as GitMeta[])[0];
       return {
-        ...data,
+        ...metadata.scm.convertCommit(metadata.projectName, data),
         guid: action.guid
       };
     },
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 91555203d5..4175b2d4e4 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-types.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-types.ts
@@ -25,8 +25,8 @@ import {
   IStack,
 } from './cf-api.types';
 import { AppStats } from './store/types/app-metadata.types';
+import { CfUser } from './store/types/cf-user.types';
 import { GitBranch, GitCommit, GitRepo } from './store/types/git.types';
-import { CfUser } from './store/types/user.types';
 
 export const applicationEntityType = 'application';
 export const stackEntityType = 'stack';
diff --git a/src/frontend/packages/cloud-foundry/src/cf-favorites-helpers.ts b/src/frontend/packages/cloud-foundry/src/cf-favorites-helpers.ts
index 05c628ff38..ec23f4125f 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-favorites-helpers.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-favorites-helpers.ts
@@ -5,12 +5,12 @@ import { CfAPIResource } from './store/types/cf-api.types';
 
 export function getFavoriteFromCfEntity<T extends IEntityMetadata = IEntityMetadata>(
   entity,
-  entityKey: string,
+  entityType: string,
   favoritesConfigMapper: FavoritesConfigMapper
 ): UserFavorite<T> {
   if (isCfEntity(entity as CfAPIResource)) {
     return favoritesConfigMapper.getFavoriteFromEntity<T>(
-      entityKey,
+      entityType,
       'cf',
       entity.entity.cfGuid,
       entity
diff --git a/src/frontend/packages/cloud-foundry/src/cloud-foundry.module.ts b/src/frontend/packages/cloud-foundry/src/cloud-foundry-package.module.ts
similarity index 91%
rename from src/frontend/packages/cloud-foundry/src/cloud-foundry.module.ts
rename to src/frontend/packages/cloud-foundry/src/cloud-foundry-package.module.ts
index 40bc688274..6e088679f4 100644
--- a/src/frontend/packages/cloud-foundry/src/cloud-foundry.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/cloud-foundry-package.module.ts
@@ -16,6 +16,7 @@ import { LongRunningCfOperationsService } from './shared/data-services/long-runn
 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';
+import { cfCurrentUserPermissionsService } from './user-permissions/cf-user-permissions-checkers';
 
 @NgModule({
   imports: [
@@ -37,11 +38,12 @@ import { CloudFoundryStoreModule } from './store/cloud-foundry.store.module';
     // ])
   ],
   providers: [
+    ...cfCurrentUserPermissionsService,
     CfUserService,
     CloudFoundryService,
     ServiceActionHelperService,
     LongRunningCfOperationsService,
-    CloudFoundryUserProvidedServicesService
+    CloudFoundryUserProvidedServicesService,
   ]
 })
 export class CloudFoundryPackageModule { }
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 ae56fa584e..11769b81a4 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
@@ -8,7 +8,11 @@ import { getGitHubAPIURL, GITHUB_API_URL } from '../../core/src/core/github.help
 import { LoggerService } from '../../core/src/core/logger.service';
 import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../store/src/entity-catalog.module';
 import { entityCatalog, TestEntityCatalog } from '../../store/src/entity-catalog/entity-catalog';
+import { testSCFEndpointGuid } from '../../store/testing/public-api';
+import { BaseCfOrgSpaceRouteMock } from '../test-framework/cloud-foundry-endpoint-service.helper';
 import { generateCFEntities } from './cf-entity-generator';
+import { ActiveRouteCfOrgSpace } from './features/cloud-foundry/cf-page.types';
+import { CfUserService } from './shared/data-services/cf-user.service';
 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';
@@ -39,7 +43,12 @@ import { CloudFoundryStoreModule } from './store/cloud-foundry.store.module';
     { provide: GITHUB_API_URL, useFactory: getGitHubAPIURL },
     GitSCMService,
     LoggerService,
-    LongRunningCfOperationsService
+    LongRunningCfOperationsService,
+    CfUserService,
+    {
+      provide: ActiveRouteCfOrgSpace,
+      useFactory: () => new BaseCfOrgSpaceRouteMock(testSCFEndpointGuid)
+    }
   ]
 })
 export class CloudFoundryTestingModule { }
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 174a9105a0..7c3ba84717 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,20 +1,20 @@
 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 { GetAllCfUsersAsAdmin, GetCfUser } from '../actions/users.actions';
 import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator';
 
 export interface UserActionBuilders extends OrchestratedActionBuilders {
   get: (
     guid: string,
     endpointGuid: string
-  ) => GetUser;
+  ) => GetCfUser;
   // Must be admin user for this to succeed.
   getMultiple: (
     endpointGuid: string,
     paginationKey: string,
     { includeRelations, populateMissing }?: CFBasePipelineRequestActionMeta
-  ) => GetAllUsersAsAdmin;
+  ) => GetAllCfUsersAsAdmin;
   getAllInOrganization: (
     guid: string,
     endpointGuid: string,
@@ -35,13 +35,13 @@ export const userActionBuilders: UserActionBuilders = {
   get: (
     guid,
     endpointGuid
-  ) => new GetUser(endpointGuid, guid),
+  ) => new GetCfUser(endpointGuid, guid),
   // Must be admin user for this to succeed.
   getMultiple: (
     endpointGuid: string,
     paginationKey: string,
     { includeRelations, populateMissing }: CFBasePipelineRequestActionMeta = {}
-  ) => new GetAllUsersAsAdmin(endpointGuid, includeRelations, populateMissing, paginationKey),
+  ) => new GetAllCfUsersAsAdmin(endpointGuid, includeRelations, populateMissing, paginationKey),
   getAllInOrganization: (
     guid: string,
     endpointGuid: string,
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 ea5cb3eca5..2a0f7a07f7 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,6 +1,6 @@
 import { inject, TestBed } from '@angular/core/testing';
 import { Store } from '@ngrx/store';
-import { createBasicStoreModule, createEntityStoreState, TestStoreEntity } from '@stratos/store/testing';
+import { createBasicStoreModule, createEntityStoreState, TestStoreEntity } from '@stratosui/store/testing';
 
 import { environment } from '../../../core/src/environments/environment';
 import { SetInitialParams } from '../../../store/src/actions/pagination.actions';
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 557e5ef776..687e7323be 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
@@ -14,7 +14,7 @@ import { GetSpace } from '../../actions/space.actions';
 import { getCFEntityKey } from '../../cf-entity-helpers';
 import { cfUserEntityType, organizationEntityType, spaceEntityType } from '../../cf-entity-types';
 import { CF_ENDPOINT_TYPE } from '../../cf-types';
-import { CfUser, CfUserRoleParams, OrgUserRoleNames, SpaceUserRoleNames } from '../../store/types/user.types';
+import { CfUser, CfUserRoleParams, OrgUserRoleNames, SpaceUserRoleNames } from '../../store/types/cf-user.types';
 import {
   createEntityRelationPaginationKey,
   ValidateEntityResult,
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 9c2f0d8ea2..91f805f77c 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
@@ -9,7 +9,7 @@ import { serviceBindingEntityType } from '../../../../../../cloud-foundry/src/cf
 import {
   createEntityRelationPaginationKey,
 } from '../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { CurrentUserPermissionsService } from '../../../../../../core/src/core/current-user-permissions.service';
+import { CurrentUserPermissionsService } from '../../../../../../core/src/core/permissions/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 { endpointSchemaKey } from '../../../../../../store/src/helpers/entity-factory';
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 e99d7c41c8..f8bc8de0cf 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,7 +4,7 @@ import { Store } from '@ngrx/store';
 import { Observable, of as observableOf } from 'rxjs';
 
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
-import { CurrentUserPermissionsService } from '../../../../../../core/src/core/current-user-permissions.service';
+import { CurrentUserPermissionsService } from '../../../../../../core/src/core/permissions/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';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-wall/application-wall.component.html b/src/frontend/packages/cloud-foundry/src/features/applications/application-wall/application-wall.component.html
index 67660b76fd..34ef360c0f 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application-wall/application-wall.component.html
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-wall/application-wall.component.html
@@ -1,7 +1,7 @@
 <app-page-header [endpointIds$]="cfIds$">
   <h1>Applications</h1>
   <div *ngIf="haveConnectedCf$ | async" class="page-header-right">
-    <ng-container *appUserPermission="canCreateApplication">
+    <ng-container *appCfUserPermission="canCreateApplication">
       <button id="appwall-create-application" mat-icon-button [routerLink]="'/applications/new/'">
         <mat-icon>add</mat-icon>
       </button>
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-wall/application-wall.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application-wall/application-wall.component.spec.ts
index bc8d31cb10..e92a929b87 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application-wall/application-wall.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-wall/application-wall.component.spec.ts
@@ -5,6 +5,7 @@ import { TabNavService } from '../../../../../core/tab-nav.service';
 import { generateCfBaseTestModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { CfEndpointsMissingComponent } from '../../../shared/components/cf-endpoints-missing/cf-endpoints-missing.component';
 import { CloudFoundryService } from '../../../shared/data-services/cloud-foundry.service';
+import { CfUserPermissionDirective } from '../../../shared/directives/cf-user-permission/cf-user-permission.directive';
 import { ApplicationWallComponent } from './application-wall.component';
 
 describe('ApplicationWallComponent', () => {
@@ -15,7 +16,8 @@ describe('ApplicationWallComponent', () => {
     TestBed.configureTestingModule({
       declarations: [
         ApplicationWallComponent,
-        CfEndpointsMissingComponent
+        CfEndpointsMissingComponent,
+        CfUserPermissionDirective
       ],
       imports: generateCfBaseTestModules(),
       providers: [
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-wall/application-wall.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application-wall/application-wall.component.ts
index e1bb9ccd14..c6cfa5d7dc 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application-wall/application-wall.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-wall/application-wall.component.ts
@@ -6,12 +6,12 @@ import { map } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import { applicationEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
-import { CurrentUserPermissions } from '../../../../../core/src/core/current-user-permissions.config';
 import { ListConfig } from '../../../../../core/src/shared/components/list/list.component.types';
 import { CfAppConfigService } from '../../../shared/components/list/list-types/app/cf-app-config.service';
 import { CfAppsDataSource } from '../../../shared/components/list/list-types/app/cf-apps-data-source';
 import { CfOrgSpaceDataService, initCfOrgSpaceService } from '../../../shared/data-services/cf-org-space-service.service';
 import { CloudFoundryService } from '../../../shared/data-services/cloud-foundry.service';
+import { CfCurrentUserPermissions } from '../../../user-permissions/cf-user-permissions-checkers';
 
 @Component({
   selector: 'app-application-wall',
@@ -52,7 +52,7 @@ export class ApplicationWallComponent implements OnDestroy {
     this.cfIds$ = cloudFoundryService.cFEndpoints$.pipe(
       map(endpoints => endpoints.map(endpoint => endpoint.guid)),
     );
-    this.canCreateApplication = CurrentUserPermissions.APPLICATION_CREATE;
+    this.canCreateApplication = CfCurrentUserPermissions.APPLICATION_CREATE;
 
     this.haveConnectedCf$ = cloudFoundryService.connectedCFEndpoints$.pipe(
       map(endpoints => !!endpoints && endpoints.length > 0)
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 d5b04d1268..ca2194ba6e 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,8 +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 { 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';
 import {
   getActionsFromExtensions,
@@ -16,6 +14,7 @@ import {
   StratosActionType,
   StratosTabType,
 } from '../../../../../../core/src/core/extension/extension-service';
+import { CurrentUserPermissionsService } from '../../../../../../core/src/core/permissions/current-user-permissions.service';
 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';
@@ -37,6 +36,7 @@ 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 { CfCurrentUserPermissions } from '../../../../user-permissions/cf-user-permissions-checkers';
 import { ApplicationService } from '../../application.service';
 import { ApplicationPollingService } from './application-polling.service';
 
@@ -91,7 +91,7 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy {
     );
 
     const appDoesNotHaveEnvVars$ = this.applicationService.appSpace$.pipe(
-      switchMap(space => this.currentUserPermissionsService.can(CurrentUserPermissions.APPLICATION_VIEW_ENV_VARS,
+      switchMap(space => this.currentUserPermissionsService.can(CfCurrentUserPermissions.APPLICATION_VIEW_ENV_VARS,
         this.applicationService.cfGuid, space.metadata.guid)
       ),
       map(can => !can)
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.html b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.html
index 97501ccc56..a1ceaa6f53 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.html
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.html
@@ -2,7 +2,7 @@
   <div class="summary__sub-nav">
     <div class="summary__actions" *ngIf="applicationService.appSpace$ | async as space">
       <ng-container
-        *appUserPermission="manageAppPermission;spaceGuid:space.metadata.guid;endpointGuid:applicationService.cfGuid">
+        *appCfUserPermission="manageAppPermission;spaceGuid:space.metadata.guid;endpointGuid:applicationService.cfGuid">
         <app-page-sub-nav-section>
           <button mat-icon-button name="edit" *ngIf="(applicationService.applicationState$ | async)"
             routerLink="/applications/{{applicationService.cfGuid}}/{{applicationService.appGuid}}/edit"
@@ -198,8 +198,10 @@
             <mat-card-title>Additional Application Info</mat-card-title>
           </mat-card-header>
           <mat-card-content>
-            <app-metadata-item icon="fingerprint" label="Application GUID" [clipboardValue]="appSvc.app.entity.guid">{{ appSvc.app.entity.guid }}</app-metadata-item>
-            <app-metadata-item icon="chevron_right" label="Command">{{ appSvc.app.entity.command || appSvc.app.entity.detected_start_command || '-' }}</app-metadata-item>
+            <app-metadata-item icon="fingerprint" label="Application GUID" [clipboardValue]="appSvc.app.entity.guid">
+              {{ appSvc.app.entity.guid }}</app-metadata-item>
+            <app-metadata-item icon="chevron_right" label="Command">
+              {{ appSvc.app.entity.command || appSvc.app.entity.detected_start_command || '-' }}</app-metadata-item>
             <app-metadata-item icon="power" label="Ports">{{ appSvc.app.entity.ports || '-' }}</app-metadata-item>
           </mat-card-content>
         </mat-card>
@@ -210,11 +212,14 @@
             <mat-card-title>Health Check Configuration</mat-card-title>
           </mat-card-header>
           <mat-card-content>
-            <app-metadata-item icon="favorite_border" label="Health Check Type">{{ appSvc.app.entity.health_check_type }}</app-metadata-item>
-            <app-metadata-item icon="schedule" label="Health Check Timeout">{{ appSvc.app.entity.health_check_timeout | uptime }}</app-metadata-item>
-            <app-metadata-item *ngIf="appSvc.app.entity.health_check_type === 'http'" icon="http" label="Health Check HTTP Endpoint">{{ appSvc.app.entity.health_check_http_endpoint }}</app-metadata-item>
+            <app-metadata-item icon="favorite_border" label="Health Check Type">
+              {{ appSvc.app.entity.health_check_type }}</app-metadata-item>
+            <app-metadata-item icon="schedule" label="Health Check Timeout">
+              {{ appSvc.app.entity.health_check_timeout | uptime }}</app-metadata-item>
+            <app-metadata-item *ngIf="appSvc.app.entity.health_check_type === 'http'" icon="http"
+              label="Health Check HTTP Endpoint">{{ appSvc.app.entity.health_check_http_endpoint }}</app-metadata-item>
           </mat-card-content>
         </mat-card>
       </app-tile>
     </app-tile-group>
-  </app-tile-grid>
+  </app-tile-grid>
\ No newline at end of file
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 68a212bce7..57c88faeb4 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
@@ -7,7 +7,6 @@ import { combineLatest, delay, distinct, filter, first, map, mergeMap, startWith
 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 { 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';
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
@@ -19,6 +18,7 @@ import { APIResource, EntityInfo } from '../../../../../../../../store/src/types
 import { IAppSummary } from '../../../../../../cf-api.types';
 import { cfEntityCatalog } from '../../../../../../cf-entity-catalog';
 import { GitSCMService, GitSCMType } from '../../../../../../shared/data-services/scm/scm.service';
+import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-user-permissions-checkers';
 import { ApplicationMonitorService } from '../../../../application-monitor.service';
 import { ApplicationData, ApplicationService } from '../../../../application.service';
 import { DEPLOY_TYPES_IDS } from '../../../../deploy-application/deploy-application-steps.types';
@@ -57,7 +57,7 @@ const appRestageConfirmation = new ConfirmationDialogConfig(
 })
 export class BuildTabComponent implements OnInit {
   public isBusyUpdating$: Observable<{ updating: boolean }>;
-  public manageAppPermission = CurrentUserPermissions.APPLICATION_MANAGE;
+  public manageAppPermission = CfCurrentUserPermissions.APPLICATION_MANAGE;
   constructor(
     public applicationService: ApplicationService,
     private scmService: GitSCMService,
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 fc079a8720..e38aff2401 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,7 +1,7 @@
 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 { testSCFEndpointGuid } from '@stratosui/store/testing';
 
 import { CoreModule } from '../../../../../../../../core/src/core/core.module';
 import { CF_GUID } from '../../../../../../../../core/src/shared/entity.tokens';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component.ts
index e0982aa04d..401e1b1c30 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component.ts
@@ -5,7 +5,9 @@ import { Subscription } from 'rxjs';
 import { first } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../../../cloud-foundry/src/cf-app-state';
-import { CurrentUserPermissionsService } from '../../../../../../../../../core/src/core/current-user-permissions.service';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import {
   ConfirmationDialogService,
 } from '../../../../../../../../../core/src/shared/components/confirmation-dialog.service';
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 ec68b659c6..ce3afe8842 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
@@ -76,7 +76,7 @@ import { SshApplicationComponent } from './ssh-application/ssh-application.compo
     ApplicationEnvVarsHelper,
     ApplicationMonitorService,
     DatePipe,
-    ApplicationDeploySourceTypes
+    ApplicationDeploySourceTypes,
   ]
 })
 export class ApplicationsModule { }
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 eee27ea9b6..5acb4f80d2 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,11 +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 { PermissionConfig, PermissionTypes } from '../../../../../core/src/core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from '../../../../../core/src/core/current-user-permissions.service';
+import { PermissionConfig } from '../../../../../core/src/core/permissions/current-user-permissions.config';
+import { CurrentUserPermissionsService } from '../../../../../core/src/core/permissions/current-user-permissions.service';
 import { CFFeatureFlagTypes } from '../../../cf-api.types';
 import { CFAppState } from '../../../cf-app-state';
 import { cfEntityCatalog } from '../../../cf-entity-catalog';
+import { CfPermissionTypes } from '../../../user-permissions/cf-user-permissions-checkers';
 
 export enum DEPLOY_TYPES_IDS {
   GITLAB = 'gitlab',
@@ -107,7 +108,7 @@ export class ApplicationDeploySourceTypes {
       );
 
       const canDeployWithDocker$ = this.perms.can(
-        new PermissionConfig(PermissionTypes.FEATURE_FLAG, CFFeatureFlagTypes.diego_docker), cfId
+        new PermissionConfig(CfPermissionTypes.FEATURE_FLAG, CFFeatureFlagTypes.diego_docker), cfId
       ).pipe(
         publishReplay(1),
         refCount(),
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 f94cb8b54a..675a1f4758 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
@@ -10,21 +10,9 @@ import {
   getCurrentUserCFEndpointRolesState,
 } from '../../../../cloud-foundry/src/store/selectors/cf-current-user-role.selectors';
 import { ICfRolesState } from '../../../../cloud-foundry/src/store/types/cf-current-user-roles.types';
-import {
-  CfUser,
-  CfUserRoleParams,
-  OrgUserRoleNames,
-  SpaceUserRoleNames,
-  UserRoleInOrg,
-  UserRoleInSpace,
-} from '../../../../cloud-foundry/src/store/types/user.types';
 import { UserRoleLabels } from '../../../../cloud-foundry/src/store/types/users-roles.types';
-import {
-  CurrentUserPermissions,
-  PermissionConfig,
-  PermissionTypes,
-} from '../../../../core/src/core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from '../../../../core/src/core/current-user-permissions.service';
+import { PermissionConfig } from '../../../../core/src/core/permissions/current-user-permissions.config';
+import { CurrentUserPermissionsService } from '../../../../core/src/core/permissions/current-user-permissions.service';
 import { getIdFromRoute, pathGet } from '../../../../core/src/core/utils.service';
 import {
   extractActualListEntity,
@@ -43,6 +31,15 @@ import { IServiceInstance, IUserProvidedServiceInstance } from '../../cf-api-svc
 import { CFFeatureFlagTypes, ISpace } from '../../cf-api.types';
 import { cfEntityFactory } from '../../cf-entity-factory';
 import { CFEntityConfig } from '../../cf-types';
+import {
+  CfUser,
+  CfUserRoleParams,
+  OrgUserRoleNames,
+  SpaceUserRoleNames,
+  UserRoleInOrg,
+  UserRoleInSpace,
+} from '../../store/types/cf-user.types';
+import { CfCurrentUserPermissions, CfPermissionTypes } from '../../user-permissions/cf-user-permissions-checkers';
 import { ActiveRouteCfCell, ActiveRouteCfOrgSpace } from './cf-page.types';
 
 export interface IUserRole<T> {
@@ -275,8 +272,8 @@ export function canUpdateOrgSpaceRoles(
   orgGuid?: string,
   spaceGuid?: string): Observable<boolean> {
   return combineLatest(
-    perms.can(CurrentUserPermissions.ORGANIZATION_CHANGE_ROLES, cfGuid, orgGuid),
-    perms.can(CurrentUserPermissions.SPACE_CHANGE_ROLES, cfGuid, orgGuid, spaceGuid)
+    perms.can(CfCurrentUserPermissions.ORGANIZATION_CHANGE_ROLES, cfGuid, orgGuid),
+    perms.can(CfCurrentUserPermissions.SPACE_CHANGE_ROLES, cfGuid, orgGuid, spaceGuid)
   ).pipe(
     map((checks: boolean[]) => checks.some(check => check))
   );
@@ -286,7 +283,7 @@ export function canUpdateOrgRoles(
   perms: CurrentUserPermissionsService,
   cfGuid: string,
   orgGuid?: string): Observable<boolean> {
-  return perms.can(CurrentUserPermissions.ORGANIZATION_CHANGE_ROLES, cfGuid, orgGuid);
+  return perms.can(CfCurrentUserPermissions.ORGANIZATION_CHANGE_ROLES, cfGuid, orgGuid);
 }
 
 export function waitForCFPermissions(store: Store<AppState>, cfGuid: string): Observable<ICfRolesState> {
@@ -422,7 +419,7 @@ export function someFeatureFlags(
 ): Observable<boolean> {
   return waitForCFPermissions(store, cfGuid).pipe(
     switchMap(() => combineLatest(ff.map(flag => {
-      const permConfig = new PermissionConfig(PermissionTypes.FEATURE_FLAG, flag);
+      const permConfig = new PermissionConfig(CfPermissionTypes.FEATURE_FLAG, flag);
       return userPerms.can(permConfig, cfGuid);
     }))),
     map(results => results.some(result => !!result))
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.html b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.html
index fd379efe9e..c344130f83 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.html
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.html
@@ -2,10 +2,10 @@
   <h1>CLI Info</h1>
   <div class="page-header-right">
     <span>
-        <button mat-icon-button (click)="back()">
-          <mat-icon matTooltip="Back to App">close</mat-icon>
-        </button>
-      </span>
+      <button mat-icon-button (click)="back()">
+        <mat-icon matTooltip="Back to App">close</mat-icon>
+      </button>
+    </span>
   </div>
 </app-page-header>
 
@@ -17,13 +17,17 @@ <h4>Organization Commands</h4>
   <app-cli-command name="List" msg="To list all orgs:" syntax="cf orgs">
   </app-cli-command>
 
-  <app-cli-command *appUserPermission="permsOrgEdit;endpointGuid:activeRouteCfOrgSpace.cfGuid;organizationGuid:activeRouteCfOrgSpace.orgGuid" name="Rename" msg="To rename an org:" syntax="cf rename-org {{context.orgName || '[organization name]'}} [name]">
+  <app-cli-command
+    *appCfUserPermission="permsOrgEdit;endpointGuid:activeRouteCfOrgSpace.cfGuid;organizationGuid:activeRouteCfOrgSpace.orgGuid"
+    name="Rename" msg="To rename an org:" syntax="cf rename-org {{context.orgName || '[organization name]'}} [name]">
   </app-cli-command>
 
-  <app-cli-command name="Information" msg="To fetch org information:" syntax="cf org {{context.orgName || '[organization name]'}}">
+  <app-cli-command name="Information" msg="To fetch org information:"
+    syntax="cf org {{context.orgName || '[organization name]'}}">
   </app-cli-command>
 
-  <app-cli-command name="Users" msg="List each org role's users:" syntax="cf org-users {{context.orgName || '[organization name]'}}">
+  <app-cli-command name="Users" msg="List each org role's users:"
+    syntax="cf org-users {{context.orgName || '[organization name]'}}">
   </app-cli-command>
 
   <br>
@@ -32,13 +36,17 @@ <h4>Space Commands</h4>
   <app-cli-command name="List" msg="To list the spaces in the targeted org:" syntax="cf spaces">
   </app-cli-command>
 
-  <app-cli-command *appUserPermission="permsSpaceEdit;endpointGuid:activeRouteCfOrgSpace.cfGuid;organizationGuid:orgGuid;spaceGuid:spaceGuid" name="Rename" msg="To rename a space:" syntax="cf rename-space {{context.spaceName || '[space name]'}} [name]">
+  <app-cli-command
+    *appCfUserPermission="permsSpaceEdit;endpointGuid:activeRouteCfOrgSpace.cfGuid;organizationGuid:orgGuid;spaceGuid:spaceGuid"
+    name="Rename" msg="To rename a space:" syntax="cf rename-space {{context.spaceName || '[space name]'}} [name]">
   </app-cli-command>
 
-  <app-cli-command name="Information" msg="To fetch space information:" syntax="cf space {{context.spaceName || '[space name]'}}">
+  <app-cli-command name="Information" msg="To fetch space information:"
+    syntax="cf space {{context.spaceName || '[space name]'}}">
   </app-cli-command>
 
-  <app-cli-command name="Users" msg="List each space role's users:" syntax="cf space-users {{context.spaceName || '[space name]'}}">
+  <app-cli-command name="Users" msg="List each space role's users:"
+    syntax="cf space-users {{context.spaceName || '[space name]'}}">
   </app-cli-command>
 
-</app-cli-info>
+</app-cli-info>
\ No newline at end of file
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 ec3e649441..25e3004052 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,7 @@ 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 { CfUserPermissionDirective } from '../../../shared/directives/cf-user-permission/cf-user-permission.directive';
 import { ApplicationStateService } from '../../../shared/services/application-state.service';
 import {
   CloudFoundryUserProvidedServicesService,
@@ -20,7 +21,12 @@ describe('CliInfoCloudFoundryComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [CliInfoCloudFoundryComponent, CliInfoComponent, CliCommandComponent],
+      declarations: [
+        CliInfoCloudFoundryComponent,
+        CliInfoComponent,
+        CliCommandComponent,
+        CfUserPermissionDirective
+      ],
       imports: generateCfBaseTestModules(),
       providers: [
         generateTestCfEndpointServiceProvider(),
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 ee4e82af47..82ddcf4295 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,8 +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 { 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';
 import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
 import { RouterNav } from '../../../../../store/src/actions/router.actions';
@@ -17,6 +15,7 @@ import { IOrganization, ISpace } from '../../../cf-api.types';
 import {
   CloudFoundryUserProvidedServicesService,
 } from '../../../shared/services/cloud-foundry-user-provided-services.service';
+import { CfCurrentUserPermissions, CfUserPermissionsChecker } from '../../../user-permissions/cf-user-permissions-checkers';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { getActiveRouteCfOrgSpaceProvider } from '../cf.helpers';
 import { CloudFoundryEndpointService } from '../services/cloud-foundry-endpoint.service';
@@ -38,8 +37,8 @@ import { CloudFoundrySpaceService } from '../services/cloud-foundry-space.servic
 })
 export class CliInfoCloudFoundryComponent implements OnInit {
 
-  permsOrgEdit = CurrentUserPermissions.ORGANIZATION_EDIT;
-  permsSpaceEdit = CurrentUserPermissions.SPACE_EDIT;
+  permsOrgEdit = CfCurrentUserPermissions.ORGANIZATION_EDIT;
+  permsSpaceEdit = CfCurrentUserPermissions.SPACE_EDIT;
 
   orgGuid: string;
   spaceGuid: string;
@@ -70,7 +69,7 @@ export class CliInfoCloudFoundryComponent implements OnInit {
     this.breadcrumbs$ = new BehaviorSubject<IHeaderBreadcrumb[]>([]);
     if (activeRouteCfOrgSpace.orgGuid) {
       this.orgGuid = activeRouteCfOrgSpace.orgGuid;
-      this.spaceGuid = activeRouteCfOrgSpace.spaceGuid || CurrentUserPermissionsChecker.ALL_SPACES;
+      this.spaceGuid = activeRouteCfOrgSpace.spaceGuid || CfUserPermissionsChecker.ALL_SPACES;
     }
   }
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.spec.ts
index 7cec150ad2..726f61014c 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { populateStoreWithTestEndpoint, testSCFEndpointGuid } from '@stratosui/store/testing';
 
 import { TabNavService } from '../../../../../core/tab-nav.service';
-import { populateStoreWithTestEndpoint, testSCFEndpointGuid } from '@stratos/store/testing';
 import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts
index 6d8b45c1eb..57ddd512a7 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts
@@ -2,8 +2,6 @@ import { Component, OnInit } from '@angular/core';
 import { Observable, of as observableOf } from 'rxjs';
 import { first, map, startWith } from 'rxjs/operators';
 
-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';
 import {
   getActionsFromExtensions,
@@ -12,10 +10,12 @@ import {
   StratosActionType,
   StratosTabType,
 } from '../../../../../core/src/core/extension/extension-service';
+import { CurrentUserPermissionsService } from '../../../../../core/src/core/permissions/current-user-permissions.service';
 import { environment } from '../../../../../core/src/environments/environment.prod';
 import { IPageSideNavTab } from '../../../../../core/src/features/dashboard/page-side-nav/page-side-nav.component';
 import { FavoritesConfigMapper } from '../../../../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
 import { UserFavoriteEndpoint } from '../../../../../store/src/types/user-favorites.types';
+import { CfCurrentUserPermissions } from '../../../user-permissions/cf-user-permissions-checkers';
 import { CloudFoundryEndpointService } from '../services/cloud-foundry-endpoint.service';
 
 @Component({
@@ -54,7 +54,7 @@ export class CloudFoundryTabsBaseComponent implements OnInit {
     );
 
     const firehoseHidden$ = this.currentUserPermissionsService
-      .can(CurrentUserPermissions.FIREHOSE_VIEW, this.cfEndpointService.cfGuid)
+      .can(CfCurrentUserPermissions.FIREHOSE_VIEW, this.cfEndpointService.cfGuid)
       .pipe(map(visible => !visible));
 
     const usersHidden$ = cfEndpointService.usersCount$.pipe(
@@ -101,7 +101,7 @@ export class CloudFoundryTabsBaseComponent implements OnInit {
 
   ngOnInit() {
     this.isFetching$ = observableOf(false);
-    this.canAddOrg$ = this.currentUserPermissionsService.can(CurrentUserPermissions.ORGANIZATION_CREATE, this.cfEndpointService.cfGuid);
+    this.canAddOrg$ = this.currentUserPermissionsService.can(CfCurrentUserPermissions.ORGANIZATION_CREATE, this.cfEndpointService.cfGuid);
   }
 
 }
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 3e6a816d3e..76e9e15ff3 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
@@ -227,7 +227,7 @@ import { RemoveUserComponent } from './users/remove-user/remove-user.component';
     // CfRolesService,
     CloudFoundryCellService,
     UserInviteService,
-    UserInviteConfigureService
+    UserInviteConfigureService,
   ],
   entryComponents: [
     UserInviteConfigurationDialogComponent
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.spec.ts
index 76f124d947..4b8d81f2a0 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.spec.ts
@@ -1,12 +1,12 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { populateStoreWithTestEndpoint } from '@stratosui/store/testing';
 
-import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { TabNavService } from '../../../../../core/tab-nav.service';
+import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import {
   generateCfBaseTestModules,
   generateTestCfServiceProvider,
 } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { populateStoreWithTestEndpoint } from '@stratos/store/testing';
 import { CfEndpointsMissingComponent } from '../../../shared/components/cf-endpoints-missing/cf-endpoints-missing.component';
 import { CloudFoundryComponent } from './cloud-foundry.component';
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.html b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.html
index d6594dbd8e..9dd3dc9c47 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.html
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.html
@@ -8,10 +8,11 @@
     </mat-form-field>
     <mat-form-field>
       <mat-select class="form-control" formControlName="quotaDefinition" placeholder="Quota Definition">
-        <mat-option *ngFor="let quota of quotaDefinitions$ | async" [value]="quota.metadata.guid">{{ quota.entity.name }}</mat-option>
+        <mat-option *ngFor="let quota of quotaDefinitions$ | async" [value]="quota.metadata.guid">
+          {{ quota.entity.name }}</mat-option>
       </mat-select>
     </mat-form-field>
-    <!-- See permission `CurrentUserPermissions.ORGANIZATION_SUSPEND` -->
+    <!-- See permission `cfCurrentUserPermissions.ORGANIZATION_SUSPEND` -->
     <!-- <div class="edit-org__stepper-form__ssh">
       <div>
         Change Organization Status
@@ -25,4 +26,4 @@
 
     </div> -->
   </form>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.spec.ts
index fb330862e3..4fb96c3435 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.spec.ts
@@ -1,8 +1,8 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
+import { populateStoreWithTestEndpoint, testSCFEndpointGuid } from '@stratosui/store/testing';
 
 import { TabNavService } from '../../../../../core/tab-nav.service';
-import { populateStoreWithTestEndpoint, testSCFEndpointGuid } from '@stratos/store/testing';
 import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
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 4764ba5876..34d2c00086 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,14 +4,14 @@ import { Store } from '@ngrx/store';
 import { Observable, of, Subscription } from 'rxjs';
 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 { CurrentUserPermissionsService } from '../../../../../core/src/core/permissions/current-user-permissions.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 { IOrganization, IOrgQuotaDefinition, ISpace } from '../../../cf-api.types';
 import { cfEntityCatalog } from '../../../cf-entity-catalog';
+import { CfCurrentUserPermissions } from '../../../user-permissions/cf-user-permissions-checkers';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { getActiveRouteCfOrgSpaceProvider } from '../cf.helpers';
 import { QuotaDefinitionBaseComponent } from '../quota-definition-base/quota-definition-base.component';
@@ -51,7 +51,7 @@ export class QuotaDefinitionComponent extends QuotaDefinitionBaseComponent {
     super(store, activeRouteCfOrgSpace, activatedRoute);
     this.setupQuotaDefinitionObservable();
     const { cfGuid, orgGuid } = activeRouteCfOrgSpace;
-    this.canEditQuota$ = currentUserPermissionsService.can(CurrentUserPermissions.QUOTA_EDIT, cfGuid);
+    this.canEditQuota$ = currentUserPermissionsService.can(CfCurrentUserPermissions.QUOTA_EDIT, cfGuid);
     this.isCf = !orgGuid;
     this.editParams = { [QUOTA_ORG_GUID]: orgGuid };
   }
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 a85683a86f..07848a222f 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
@@ -12,7 +12,6 @@ import {
   quotaDefinitionEntityType,
   spaceEntityType,
 } from '../../../../../cloud-foundry/src/cf-entity-types';
-import { OrgUserRoleNames } from '../../../../../cloud-foundry/src/store/types/user.types';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
 import {
@@ -30,6 +29,7 @@ import { CfUserService } from '../../../shared/data-services/cf-user.service';
 import {
   CloudFoundryUserProvidedServicesService,
 } from '../../../shared/services/cloud-foundry-user-provided-services.service';
+import { OrgUserRoleNames } from '../../../store/types/cf-user.types';
 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 794c014a7b..f3faadd465 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
@@ -12,7 +12,6 @@ import {
   spaceEntityType,
   spaceQuotaEntityType,
 } from '../../../../../cloud-foundry/src/cf-entity-types';
-import { SpaceUserRoleNames } from '../../../../../cloud-foundry/src/store/types/user.types';
 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';
@@ -23,6 +22,7 @@ import { CfUserService } from '../../../shared/data-services/cf-user.service';
 import {
   CloudFoundryUserProvidedServicesService,
 } from '../../../shared/services/cloud-foundry-user-provided-services.service';
+import { SpaceUserRoleNames } from '../../../store/types/cf-user.types';
 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/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 eb4f5d792b..6ef73eb96f 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,7 +1,7 @@
 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 { testSCFEndpoint, testSCFEndpointGuid } from '@stratosui/store/testing';
 
 import { endpointEntitySchema } from '../../../../../core/src/base-entity-schemas';
 import { TabNavService } from '../../../../../core/tab-nav.service';
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 41e3bb4f58..010b22e72c 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,14 +4,14 @@ import { Store } from '@ngrx/store';
 import { Observable, of, Subscription } from 'rxjs';
 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 { CurrentUserPermissionsService } from '../../../../../core/src/core/permissions/current-user-permissions.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 { IOrganization, ISpace, ISpaceQuotaDefinition } from '../../../cf-api.types';
 import { cfEntityCatalog } from '../../../cf-entity-catalog';
+import { CfCurrentUserPermissions } from '../../../user-permissions/cf-user-permissions-checkers';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { getActiveRouteCfOrgSpaceProvider } from '../cf.helpers';
 import { QuotaDefinitionBaseComponent } from '../quota-definition-base/quota-definition-base.component';
@@ -49,7 +49,7 @@ export class SpaceQuotaDefinitionComponent extends QuotaDefinitionBaseComponent
     super(store, activeRouteCfOrgSpace, activatedRoute);
     this.setupQuotaDefinitionObservable();
     const { cfGuid, orgGuid, spaceGuid } = activeRouteCfOrgSpace;
-    this.canEditQuota$ = currentUserPermissionsService.can(CurrentUserPermissions.SPACE_QUOTA_EDIT, cfGuid, orgGuid);
+    this.canEditQuota$ = currentUserPermissionsService.can(CfCurrentUserPermissions.SPACE_QUOTA_EDIT, cfGuid, orgGuid);
     this.isOrg = !spaceGuid;
     this.editParams = { [QUOTA_SPACE_GUID]: spaceGuid };
   }
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.ts
index 75984014e2..7cb9cae72d 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.ts
@@ -3,7 +3,7 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, map, switchMap } from 'rxjs/operators';
 
-import { GetAllUsersAsAdmin } from '../../../../../../cloud-foundry/src/actions/users.actions';
+import { GetAllCfUsersAsAdmin } from '../../../../../../cloud-foundry/src/actions/users.actions';
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
 import { CfUserService } from '../../../../shared/data-services/cf-user.service';
 import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
@@ -36,7 +36,7 @@ export class CfAdminAddUserWarningComponent {
         activeRouteCfOrgSpace.orgGuid,
         activeRouteCfOrgSpace.spaceGuid)),
       map(fetchUsersAction => {
-        return !GetAllUsersAsAdmin.is(fetchUsersAction);
+        return !GetAllCfUsersAsAdmin.is(fetchUsersAction);
       })
     );
   }
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/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
index 9c814c204c..9a27b50498 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/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,12 +1,12 @@
 import { Component } from '@angular/core';
 import { Observable } from 'rxjs';
 
-import { CurrentUserPermissions } from '../../../../../../core/src/core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from '../../../../../../core/src/core/current-user-permissions.service';
+import { CurrentUserPermissionsService } from '../../../../../../core/src/core/permissions/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 { CfCurrentUserPermissions } from '../../../../user-permissions/cf-user-permissions-checkers';
 import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
 import { CloudFoundryEndpointService } from '../../services/cloud-foundry-endpoint.service';
 
@@ -30,6 +30,6 @@ export class CloudFoundryOrganizationSpaceQuotasComponent {
     currentUserPermissionsService: CurrentUserPermissionsService
   ) {
     const { cfGuid, orgGuid } = this.activeRouteCfOrgSpace;
-    this.canAddQuota$ = currentUserPermissionsService.can(CurrentUserPermissions.SPACE_QUOTA_CREATE, cfGuid, orgGuid);
+    this.canAddQuota$ = currentUserPermissionsService.can(CfCurrentUserPermissions.SPACE_QUOTA_CREATE, cfGuid, orgGuid);
   }
 }
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.html b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.html
index bc6510ee2a..54a6d00f8e 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.html
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.html
@@ -1,6 +1,6 @@
 <app-page-sub-nav>
   <button mat-button name="add-space"
-    *appUserPermission="permsSpaceCreate;endpointGuid:cfEndpointService.cfGuid;organizationGuid:cfOrgService.orgGuid"
+    *appCfUserPermission="permsSpaceCreate;endpointGuid:cfEndpointService.cfGuid;organizationGuid:cfOrgService.orgGuid"
     routerLink="/cloud-foundry/{{cfEndpointService.cfGuid}}/organizations/{{cfOrgService.orgGuid}}/add-space"
     matTooltip="Create Space">
     <span class="create-button-contents">
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 b7ab24ec95..47b0e37828 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
@@ -8,6 +8,7 @@ import {
 import {
   CloudFoundryOrganizationServiceMock,
 } from '../../../../../../test-framework/cloud-foundry-organization.service.mock';
+import { CfUserPermissionDirective } from '../../../../../shared/directives/cf-user-permission/cf-user-permission.directive';
 import { CloudFoundryOrganizationService } from '../../../services/cloud-foundry-organization.service';
 import { CloudFoundryOrganizationSpacesComponent } from './cloud-foundry-organization-spaces.component';
 
@@ -17,7 +18,10 @@ describe('CloudFoundryOrganizationSpacesComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [CloudFoundryOrganizationSpacesComponent],
+      declarations: [
+        CloudFoundryOrganizationSpacesComponent,
+        CfUserPermissionDirective
+      ],
       imports: generateCfBaseTestModules(),
       providers: [
         ...generateTestCfEndpointServiceProvider(),
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.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.ts
index ff410c7f87..fd744b2caf 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.ts
@@ -1,10 +1,10 @@
 import { Component } from '@angular/core';
 
-import { CurrentUserPermissions } from '../../../../../../../core/src/core/current-user-permissions.config';
 import { ListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import {
   CfSpacesListConfigService,
 } from '../../../../../shared/components/list/list-types/cf-spaces/cf-spaces-list-config.service';
+import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import { CloudFoundryEndpointService } from '../../../services/cloud-foundry-endpoint.service';
 import { CloudFoundryOrganizationService } from '../../../services/cloud-foundry-organization.service';
 
@@ -20,7 +20,7 @@ import { CloudFoundryOrganizationService } from '../../../services/cloud-foundry
   ]
 })
 export class CloudFoundryOrganizationSpacesComponent {
-  public permsSpaceCreate = CurrentUserPermissions.SPACE_CREATE;
+  public permsSpaceCreate = CfCurrentUserPermissions.SPACE_CREATE;
   constructor(
     public cfEndpointService: CloudFoundryEndpointService,
     public cfOrgService: CloudFoundryOrganizationService
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.html 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.html
index 3ec288a9fa..a55eb014df 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.html
+++ 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.html
@@ -1,12 +1,12 @@
 <app-page-sub-nav>
   <button mat-icon-button name="rename"
-    *appUserPermission="permsSpaceEdit;endpointGuid:cfOrgService.cfGuid;organizationGuid:cfOrgService.orgGuid;spaceGuid:cfSpaceService.spaceGuid"
+    *appCfUserPermission="permsSpaceEdit;endpointGuid:cfOrgService.cfGuid;organizationGuid:cfOrgService.orgGuid;spaceGuid:cfSpaceService.spaceGuid"
     routerLink="/cloud-foundry/{{cfEndpointService.cfGuid}}/organizations/{{cfSpaceService.orgGuid}}/spaces/{{cfSpaceService.spaceGuid}}/edit-space"
     matTooltip="Edit Space">
     <mat-icon>edit</mat-icon>
   </button>
   <button mat-icon-button name="delete"
-    *appUserPermission="permsSpaceDelete;endpointGuid:cfOrgService.cfGuid;organizationGuid:cfOrgService.orgGuid;"
+    *appCfUserPermission="permsSpaceDelete;endpointGuid:cfOrgService.cfGuid;organizationGuid:cfOrgService.orgGuid;"
     (click)="deleteSpaceWarn()" matTooltip="Delete Space">
     <mat-icon>delete</mat-icon>
   </button>
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 7153674c1d..e6e27e1e5b 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
@@ -16,6 +16,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 {
+  CfUserPermissionDirective,
+} from '../../../../../../../shared/directives/cf-user-permission/cf-user-permission.directive';
 import {
   CloudFoundryUserProvidedServicesService,
 } from '../../../../../../../shared/services/cloud-foundry-user-provided-services.service';
@@ -30,7 +33,13 @@ describe('CloudFoundrySpaceSummaryComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [CloudFoundrySpaceSummaryComponent, CardCfSpaceDetailsComponent, CardCfRecentAppsComponent, CompactAppCardComponent],
+      declarations: [
+        CloudFoundrySpaceSummaryComponent,
+        CardCfSpaceDetailsComponent,
+        CardCfRecentAppsComponent,
+        CompactAppCardComponent,
+        CfUserPermissionDirective
+      ],
       imports: generateCfBaseTestModules(),
       providers: [
         generateActiveRouteCfOrgSpaceMock(),
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 361689d6b3..5a5bf9eec0 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
@@ -4,7 +4,6 @@ import { Store } from '@ngrx/store';
 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 { ConfirmationDialogConfig } from '../../../../../../../../../core/src/shared/components/confirmation-dialog.config';
 import {
   ConfirmationDialogService,
@@ -15,6 +14,7 @@ import { entityCatalog } from '../../../../../../../../../store/src/entity-catal
 import { selectDeletionInfo } from '../../../../../../../../../store/src/selectors/api.selectors';
 import { spaceEntityType } from '../../../../../../../cf-entity-types';
 import { CF_ENDPOINT_TYPE } from '../../../../../../../cf-types';
+import { CfCurrentUserPermissions } from '../../../../../../../user-permissions/cf-user-permissions-checkers';
 import { CloudFoundryEndpointService } from '../../../../../services/cloud-foundry-endpoint.service';
 import { CloudFoundryOrganizationService } from '../../../../../services/cloud-foundry-organization.service';
 import { CloudFoundrySpaceService } from '../../../../../services/cloud-foundry-space.service';
@@ -27,8 +27,8 @@ import { CloudFoundrySpaceService } from '../../../../../services/cloud-foundry-
 export class CloudFoundrySpaceSummaryComponent {
   detailsLoading$: Observable<boolean>;
   name$: Observable<string>;
-  public permsSpaceEdit = CurrentUserPermissions.SPACE_EDIT;
-  public permsSpaceDelete = CurrentUserPermissions.SPACE_DELETE;
+  public permsSpaceEdit = CfCurrentUserPermissions.SPACE_EDIT;
+  public permsSpaceDelete = CfCurrentUserPermissions.SPACE_DELETE;
 
   constructor(
     public cfEndpointService: CloudFoundryEndpointService,
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 be30449c73..3b82a9e0e0 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
@@ -1,8 +1,7 @@
 import { Component } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { CFAppState } from 'frontend/packages/cloud-foundry/src/cf-app-state';
-import { CurrentUserPermissions } from 'frontend/packages/core/src/core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from 'frontend/packages/core/src/core/current-user-permissions.service';
+import { CurrentUserPermissionsService } from 'frontend/packages/core/src/core/permissions/current-user-permissions.service';
 import { combineLatest, Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 
@@ -11,6 +10,7 @@ import { CFFeatureFlagTypes } from '../../../../../../../cf-api.types';
 import {
   CfSpaceUsersListConfigService,
 } from '../../../../../../../shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service';
+import { CfCurrentUserPermissions } from '../../../../../../../user-permissions/cf-user-permissions-checkers';
 import { ActiveRouteCfOrgSpace } from '../../../../../cf-page.types';
 import { createCfOrgSpaceSteppersUrl, someFeatureFlags, waitForCFPermissions } from '../../../../../cf.helpers';
 
@@ -42,7 +42,7 @@ export class CloudFoundrySpaceUsersComponent {
       switchMap(() => combineLatest([
         someFeatureFlags(requiredFeatureFlags, activeRouteCfOrgSpace.cfGuid, store, userPerms),
         userPerms.can(
-          CurrentUserPermissions.SPACE_CHANGE_ROLES,
+          CfCurrentUserPermissions.SPACE_CHANGE_ROLES,
           activeRouteCfOrgSpace.cfGuid,
           activeRouteCfOrgSpace.orgGuid,
           activeRouteCfOrgSpace.spaceGuid
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.html b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.html
index aca6cf5016..c1565ef97b 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.html
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.html
@@ -1,11 +1,11 @@
 <app-page-sub-nav>
-  <button mat-icon-button name="edit-org" *appUserPermission="permsOrgEdit;endpointGuid:cfEndpointService.cfGuid"
+  <button mat-icon-button name="edit-org" *appCfUserPermission="permsOrgEdit;endpointGuid:cfEndpointService.cfGuid"
     routerLink="/cloud-foundry/{{cfEndpointService.cfGuid}}/organizations/{{cfOrgService.orgGuid}}/edit-org"
     matTooltip="Edit Organization">
     <mat-icon>mode_edit</mat-icon>
   </button>
   <button mat-icon-button name="delete"
-    *appUserPermission="permsOrgDelete;endpointGuid:cfOrgService.cfGuid;organizationGuid:cfOrgService.orgGuid;"
+    *appCfUserPermission="permsOrgDelete;endpointGuid:cfOrgService.cfGuid;organizationGuid:cfOrgService.orgGuid;"
     (click)="deleteOrgWarn()" matTooltip="Delete Organization">
     <mat-icon>delete</mat-icon>
   </button>
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 86b4a72c57..933c783b42 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
@@ -17,6 +17,7 @@ import {
 import {
   CompactAppCardComponent,
 } from '../../../../../shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component';
+import { CfUserPermissionDirective } from '../../../../../shared/directives/cf-user-permission/cf-user-permission.directive';
 import { CloudFoundryOrganizationService } from '../../../services/cloud-foundry-organization.service';
 import { CloudFoundryOrganizationSummaryComponent } from './cloud-foundry-organization-summary.component';
 
@@ -30,7 +31,8 @@ describe('CloudFoundryOrganizationSummaryComponent', () => {
         CloudFoundryOrganizationSummaryComponent,
         CardCfOrgUserDetailsComponent,
         CardCfRecentAppsComponent,
-        CompactAppCardComponent
+        CompactAppCardComponent,
+        CfUserPermissionDirective
       ],
       imports: generateCfBaseTestModules(),
       providers: [
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 2b3a9cf8f9..163a261a4a 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
@@ -5,14 +5,14 @@ import { combineLatest, Observable } from 'rxjs';
 import { filter, first, map, pairwise, startWith, tap } from 'rxjs/operators';
 
 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';
 import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
 import { selectDeletionInfo } from '../../../../../../../store/src/selectors/api.selectors';
 import { organizationEntityType } from '../../../../../cf-entity-types';
 import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
+import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import { goToAppWall } from '../../../cf.helpers';
 import { CloudFoundryEndpointService } from '../../../services/cloud-foundry-endpoint.service';
 import { CloudFoundryOrganizationService } from '../../../services/cloud-foundry-organization.service';
@@ -26,8 +26,8 @@ import { CloudFoundryOrganizationService } from '../../../services/cloud-foundry
 export class CloudFoundryOrganizationSummaryComponent {
   appLink: () => void;
   detailsLoading$: Observable<boolean>;
-  public permsOrgEdit = CurrentUserPermissions.ORGANIZATION_EDIT;
-  public permsOrgDelete = CurrentUserPermissions.ORGANIZATION_DELETE;
+  public permsOrgEdit = CfCurrentUserPermissions.ORGANIZATION_EDIT;
+  public permsOrgDelete = CfCurrentUserPermissions.ORGANIZATION_DELETE;
 
   constructor(
     private store: Store<CFAppState>,
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 df764482bc..cc902d28b7 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
@@ -3,14 +3,16 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable } from 'rxjs';
 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 {
+  CurrentUserPermissionsService,
+} from '../../../../../../../core/src/core/permissions/current-user-permissions.service';
 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,
 } from '../../../../../shared/components/list/list-types/cf-org-users/cf-org-users-list-config.service';
+import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import { ActiveRouteCfOrgSpace } from '../../../cf-page.types';
 import { createCfOrgSpaceSteppersUrl, someFeatureFlags, waitForCFPermissions } from '../../../cf.helpers';
 
@@ -42,7 +44,7 @@ export class CloudFoundryOrganizationUsersComponent {
     this.addRolesByUsernameLink$ = waitForCFPermissions(store, activeRouteCfOrgSpace.cfGuid).pipe(
       switchMap(() => combineLatest([
         someFeatureFlags(requiredFeatureFlags, activeRouteCfOrgSpace.cfGuid, store, userPerms),
-        userPerms.can(CurrentUserPermissions.ORGANIZATION_CHANGE_ROLES, activeRouteCfOrgSpace.cfGuid, activeRouteCfOrgSpace.orgGuid)
+        userPerms.can(CfCurrentUserPermissions.ORGANIZATION_CHANGE_ROLES, activeRouteCfOrgSpace.cfGuid, activeRouteCfOrgSpace.orgGuid)
       ])),
       map(([canSetRolesByUsername, canChangeOrgRole]) => {
         if (canSetRolesByUsername && canChangeOrgRole) {
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organizations.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organizations.component.ts
index 035bfbf51d..479d1c9618 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organizations.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organizations.component.ts
@@ -1,11 +1,11 @@
 import { Component } from '@angular/core';
 import { Observable } from 'rxjs';
 
-import { CurrentUserPermissions } from '../../../../../../core/src/core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from '../../../../../../core/src/core/current-user-permissions.service';
+import { CurrentUserPermissionsService } from '../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
 import { CfOrgCardComponent } from '../../../../shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component';
 import { CfOrgsListConfigService } from '../../../../shared/components/list/list-types/cf-orgs/cf-orgs-list-config.service';
+import { CfCurrentUserPermissions } from '../../../../user-permissions/cf-user-permissions-checkers';
 import { CloudFoundryEndpointService } from '../../services/cloud-foundry-endpoint.service';
 
 @Component({
@@ -25,7 +25,7 @@ export class CloudFoundryOrganizationsComponent {
     public cfEndpointService: CloudFoundryEndpointService,
     currentUserPermissionsService: CurrentUserPermissionsService
   ) {
-    this.canAddOrg$ = currentUserPermissionsService.can(CurrentUserPermissions.ORGANIZATION_CREATE, this.cfEndpointService.cfGuid);
+    this.canAddOrg$ = currentUserPermissionsService.can(CfCurrentUserPermissions.ORGANIZATION_CREATE, this.cfEndpointService.cfGuid);
   }
   cardComponent = CfOrgCardComponent;
 }
diff --git a/src/frontend/packages/cloud-foundry/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
index 566ea33df0..12b9daccf0 100644
--- a/src/frontend/packages/cloud-foundry/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,12 +1,12 @@
 import { Component } from '@angular/core';
 import { Observable } from 'rxjs';
 
-import { CurrentUserPermissions } from '../../../../../../core/src/core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from '../../../../../../core/src/core/current-user-permissions.service';
+import { CurrentUserPermissionsService } from '../../../../../../core/src/core/permissions/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 { CfCurrentUserPermissions } from '../../../../user-permissions/cf-user-permissions-checkers';
 import { CloudFoundryEndpointService } from '../../services/cloud-foundry-endpoint.service';
 
 @Component({
@@ -27,6 +27,6 @@ export class CloudFoundryQuotasComponent {
     public cfEndpointService: CloudFoundryEndpointService,
     currentUserPermissionsService: CurrentUserPermissionsService
   ) {
-    this.canAddQuota$ = currentUserPermissionsService.can(CurrentUserPermissions.QUOTA_CREATE, this.cfEndpointService.cfGuid);
+    this.canAddQuota$ = currentUserPermissionsService.can(CfCurrentUserPermissions.QUOTA_CREATE, this.cfEndpointService.cfGuid);
   }
 }
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.ts
index f990478288..f184bf4ec8 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.ts
@@ -3,7 +3,7 @@ import { Router } from '@angular/router';
 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 { CurrentUserPermissionsService } from '../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
 import { CfUserService } from '../../../../shared/data-services/cf-user.service';
 import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
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 676e0cb299..755128bd1b 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
@@ -6,12 +6,12 @@ import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import { catchError, filter, map, switchMap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
-import { CurrentUserPermissions } from '../../../../../core/src/core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from '../../../../../core/src/core/current-user-permissions.service';
+import { CurrentUserPermissionsService } from '../../../../../core/src/core/permissions/current-user-permissions.service';
 import { environment } from '../../../../../core/src/environments/environment.prod';
 import { ConfirmationDialogConfig } from '../../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../../core/src/shared/components/confirmation-dialog.service';
 import { GetSystemInfo } from '../../../../../store/src/actions/system.actions';
+import { CfCurrentUserPermissions } from '../../../user-permissions/cf-user-permissions-checkers';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { waitForCFPermissions } from '../cf.helpers';
 import { CloudFoundryEndpointService } from '../services/cloud-foundry-endpoint.service';
@@ -162,7 +162,7 @@ export class UserInviteService {
       switchMap(() => combineLatest(
         this.configured$,
         this.currentUserPermissionsService.can(
-          CurrentUserPermissions.ORGANIZATION_CHANGE_ROLES,
+          CfCurrentUserPermissions.ORGANIZATION_CHANGE_ROLES,
           cfGuid,
           orgGuid,
           spaceGuid
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 00b15b39e3..c6c5044e00 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
@@ -18,7 +18,7 @@ import { CFAppState } from '../../../../../cf-app-state';
 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 { SpaceUserRoleNames } from '../../../../../store/types/cf-user.types';
 import { UserRoleLabels } from '../../../../../store/types/users-roles.types';
 import { ActiveRouteCfOrgSpace } from '../../../cf-page.types';
 import { UserInviteSendSpaceRoles, UserInviteService } from '../../../user-invites/user-invite.service';
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 37cb95f700..56a88ed334 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,14 +17,8 @@ import {
   createEntityRelationKey,
   createEntityRelationPaginationKey,
 } from '../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { CurrentUserPermissionsChecker } from '../../../../../../core/src/core/current-user-permissions.checker';
-import { CurrentUserPermissionsService } from '../../../../../../core/src/core/current-user-permissions.service';
+import { CurrentUserPermissionsService } from '../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { endpointSchemaKey } from '../../../../../../store/src/helpers/entity-factory';
-import {
-  selectUsersRolesCf,
-  selectUsersRolesPicked,
-  selectUsersRolesRoles,
-} 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';
@@ -32,9 +26,15 @@ import { CFAppState } from '../../../../cf-app-state';
 import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { organizationEntityType, spaceEntityType } from '../../../../cf-entity-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';
+import { createDefaultOrgRoles, createDefaultSpaceRoles } from '../../../../store/reducers/cf-users-roles.reducer';
+import {
+  selectCfUsersRolesCf,
+  selectCfUsersRolesPicked,
+  selectCfUsersRolesRoles,
+} from '../../../../store/selectors/cf-users-roles.selector';
+import { CfUser, IUserPermissionInOrg, UserRoleInOrg, UserRoleInSpace } from '../../../../store/types/cf-user.types';
 import { CfRoleChange, CfUserRolesSelected } from '../../../../store/types/users-roles.types';
+import { CfUserPermissionsChecker } from '../../../../user-permissions/cf-user-permissions-checkers';
 import { canUpdateOrgSpaceRoles } from '../../cf.helpers';
 
 @Injectable()
@@ -63,7 +63,7 @@ export class CfRolesService {
             orgOrSpace.metadata.guid,
             orgOrSpace.entity.cfGuid,
             isOrg ? orgOrSpace.metadata.guid : (orgOrSpace as APIResource<ISpace>).entity.organization_guid,
-            isOrg ? CurrentUserPermissionsChecker.ALL_SPACES : orgOrSpace.metadata.guid,
+            isOrg ? CfUserPermissionsChecker.ALL_SPACES : orgOrSpace.metadata.guid,
           ))));
       }),
       // Filter out orgs than the current user cannot edit
@@ -91,15 +91,15 @@ export class CfRolesService {
     private cfUserService: CfUserService,
     private userPerms: CurrentUserPermissionsService,
   ) {
-    this.existingRoles$ = this.store.select(selectUsersRolesPicked).pipe(
-      combineLatestOperators(this.store.select(selectUsersRolesCf)),
+    this.existingRoles$ = this.store.select(selectCfUsersRolesPicked).pipe(
+      combineLatestOperators(this.store.select(selectCfUsersRolesCf)),
       filter(([users, cfGuid]) => !!cfGuid),
       switchMap(([users, cfGuid]) => this.populateRoles(cfGuid, users)),
       distinctUntilChanged(),
       publishReplay(1),
       refCount()
     );
-    this.newRoles$ = this.store.select(selectUsersRolesRoles).pipe(
+    this.newRoles$ = this.store.select(selectCfUsersRolesRoles).pipe(
       distinctUntilChanged(),
       publishReplay(1),
       refCount()
@@ -169,7 +169,7 @@ export class CfRolesService {
     return this.existingRoles$.pipe(
       combineLatestOperators(
         this.newRoles$,
-        this.store.select(selectUsersRolesPicked),
+        this.store.select(selectCfUsersRolesPicked),
       ),
       first(),
       map(([existingRoles, newRoles, pickedUsers]) => {
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 c3360df331..969da7b695 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
@@ -11,13 +11,9 @@ import {
 } 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';
-import {
-  selectUsersRoles,
-  selectUsersRolesChangedRoles,
-} from '../../../../../../../store/src/selectors/users-roles.selector';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { UsersRolesClearUpdateState } from '../../../../../actions/users-roles.actions';
-import { ChangeUserRole } from '../../../../../actions/users.actions';
+import { ChangeCfUserRole } from '../../../../../actions/users.actions';
 import { CFAppState } from '../../../../../cf-app-state';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { cfUserEntityType, organizationEntityType, spaceEntityType } from '../../../../../cf-entity-types';
@@ -29,7 +25,8 @@ import {
   TableCellConfirmRoleAddRemComponent,
 } from '../../../../../shared/components/list/list-types/cf-confirm-roles/table-cell-confirm-role-add-rem/table-cell-confirm-role-add-rem.component';
 import { CfUserService } from '../../../../../shared/data-services/cf-user.service';
-import { CfUser, OrgUserRoleNames, SpaceUserRoleNames } from '../../../../../store/types/user.types';
+import { selectCfUsersRoles, selectCfUsersRolesChangedRoles } from '../../../../../store/selectors/cf-users-roles.selector';
+import { CfUser, OrgUserRoleNames, SpaceUserRoleNames } from '../../../../../store/types/cf-user.types';
 import { CfRoleChangeWithNames, UserRoleLabels } from '../../../../../store/types/users-roles.types';
 import { ManageUsersSetUsernamesHelper } from '../manage-users-set-usernames/manage-users-set-usernames.component';
 
@@ -102,7 +99,7 @@ export class UsersRolesConfirmComponent implements OnInit, AfterContentInit {
       entityKey: entityCatalog.getEntityKey(schema),
       schema,
       monitorState: AppMonitorComponentTypes.UPDATE,
-      updateKey: ChangeUserRole.generateUpdatingKey(row.role, row.userGuid),
+      updateKey: ChangeCfUserRole.generateUpdatingKey(row.role, row.userGuid),
       getId: () => guid
     };
   }
@@ -129,7 +126,7 @@ export class UsersRolesConfirmComponent implements OnInit, AfterContentInit {
     // Kick off an update
     this.updateChanges.next(new Date().getTime());
     // Ensure that any entity we're going to show the state for is clear of any previous or unrelated errors
-    this.store.select(selectUsersRoles).pipe(
+    this.store.select(selectCfUsersRoles).pipe(
       first(),
     ).subscribe(usersRoles => this.store.dispatch(new UsersRolesClearUpdateState(usersRoles.changedRoles)));
   }
@@ -149,7 +146,7 @@ export class UsersRolesConfirmComponent implements OnInit, AfterContentInit {
   }
 
   private createCfObs() {
-    this.cfGuid$ = this.store.select(selectUsersRoles).pipe(
+    this.cfGuid$ = this.store.select(selectCfUsersRoles).pipe(
       map(mu => mu.cfGuid),
       filter(cfGuid => !!cfGuid),
       distinctUntilChanged(),
@@ -158,7 +155,7 @@ export class UsersRolesConfirmComponent implements OnInit, AfterContentInit {
 
   private createChangesObs() {
     const changesViaUsername = this.updateChanges.pipe(
-      switchMap(() => this.store.select(selectUsersRolesChangedRoles)),
+      switchMap(() => this.store.select(selectCfUsersRolesChangedRoles)),
       map(changes => changes
         .map(change => ({
           ...change,
@@ -171,7 +168,7 @@ export class UsersRolesConfirmComponent implements OnInit, AfterContentInit {
     const changesViaUserGuid = this.updateChanges.pipe(
       withLatestFrom(this.cfGuid$),
       mergeMap(([, cfGuid]) => this.cfUserService.getUsers(cfGuid)),
-      withLatestFrom(this.store.select(selectUsersRolesChangedRoles)),
+      withLatestFrom(this.store.select(selectCfUsersRolesChangedRoles)),
       map(([users, changes]) =>
         changes
           .map(change => ({
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 4a03a0182b..7782611d97 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,7 +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 { getRowMetadata } from '@stratosui/store';
 import { BehaviorSubject, combineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
 import {
   catchError,
@@ -32,13 +32,6 @@ import {
   ITableListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
 import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
-import {
-  selectUsersIsRemove,
-  selectUsersIsSetByUsername,
-  selectUsersRolesOrgGuid,
-  selectUsersRolesPicked,
-  selectUsersRolesRoles,
-} 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';
@@ -49,7 +42,14 @@ import {
 import {
   TableCellSelectOrgComponent,
 } 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 {
+  selectCfUsersIsRemove,
+  selectCfUsersIsSetByUsername,
+  selectCfUsersRolesOrgGuid,
+  selectCfUsersRolesPicked,
+  selectCfUsersRolesRoles,
+} from '../../../../../store/selectors/cf-users-roles.selector';
+import { CfUser, OrgUserRoleNames } from '../../../../../store/types/cf-user.types';
 import { ActiveRouteCfOrgSpace } from '../../../cf-page.types';
 import { CfRolesService } from '../cf-roles.service';
 import { SpaceRolesListWrapperComponent } from './space-roles-list-wrapper/space-roles-list-wrapper.component';
@@ -154,7 +154,7 @@ export class UsersRolesModifyComponent implements OnInit, OnDestroy {
       this.cfRolesService.loading$.subscribe(loading => this.blocked.next(loading));
     }
 
-    const orgEntity$ = this.store.select(selectUsersRolesOrgGuid).pipe(
+    const orgEntity$ = this.store.select(selectCfUsersRolesOrgGuid).pipe(
       startWith(''),
       distinctUntilChanged(),
       filter(orgGuid => !!orgGuid),
@@ -197,7 +197,7 @@ export class UsersRolesModifyComponent implements OnInit, OnDestroy {
       });
     }
 
-    const users$: Observable<CfUserWithWarning[]> = this.store.select(selectUsersRolesPicked).pipe(
+    const users$: Observable<CfUserWithWarning[]> = this.store.select(selectCfUsersRolesPicked).pipe(
       filter(users => !!users),
       distinctUntilChanged(),
       map(users => users.map(this.mapUser.bind(this)))
@@ -211,14 +211,14 @@ export class UsersRolesModifyComponent implements OnInit, OnDestroy {
       map(users => users.filter(user => !!user.showWarning).map(user => user.username))
     );
 
-    this.valid$ = this.store.select(selectUsersRolesRoles).pipe(
+    this.valid$ = this.store.select(selectCfUsersRolesRoles).pipe(
       debounceTime(150),
       switchMap(newRoles => this.cfRolesService.createRolesDiff(newRoles.orgGuid)),
       map(changes => !!changes.length)
     );
 
-    this.isSetByUsername$ = this.store.select(selectUsersIsSetByUsername);
-    this.isRemove$ = this.store.select(selectUsersIsRemove);
+    this.isSetByUsername$ = this.store.select(selectCfUsersIsSetByUsername);
+    this.isRemove$ = this.store.select(selectCfUsersIsRemove);
   }
 
   private mapUser(user: CfUser): CfUserWithWarning {
@@ -263,7 +263,7 @@ export class UsersRolesModifyComponent implements OnInit, OnDestroy {
     }
 
     // When the state is ready (org guid is correct), recreate the space roles table for the selected org
-    this.store.select(selectUsersRolesRoles).pipe(
+    this.store.select(selectCfUsersRolesRoles).pipe(
       // Wait for the store to have the correct org
       filter(newRoles => newRoles && newRoles.orgGuid === orgGuid),
       first()
@@ -289,7 +289,7 @@ export class UsersRolesModifyComponent implements OnInit, OnDestroy {
     }
 
     // In order to show the removed roles correctly (as ticks) flip them from remove to add
-    this.store.select(selectUsersIsRemove).pipe(first()).subscribe(isRemove => {
+    this.store.select(selectCfUsersIsRemove).pipe(first()).subscribe(isRemove => {
       if (isRemove) {
         this.store.dispatch(new UsersRolesFlipSetRoles());
       }
@@ -305,10 +305,10 @@ export class UsersRolesModifyComponent implements OnInit, OnDestroy {
 
   onNext = () => {
     return combineLatest([
-      this.store.select(selectUsersIsRemove).pipe(first()),
+      this.store.select(selectCfUsersIsRemove).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/features/cloud-foundry/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.ts
index f540626ace..69481c04be 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.ts
@@ -1,7 +1,9 @@
 import { Component } from '@angular/core';
 import { Store } from '@ngrx/store';
 
-import { CurrentUserPermissionsService } from '../../../../../../../../core/src/core/current-user-permissions.service';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { ListConfig } from '../../../../../../../../core/src/shared/components/list/list.component.types';
 import { CFAppState } from '../../../../../../cf-app-state';
 import {
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-select/manage-users-select.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-select/manage-users-select.component.ts
index 03f2b5ad32..524836b8ee 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-select/manage-users-select.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-select/manage-users-select.component.ts
@@ -13,7 +13,7 @@ import {
   CfSelectUsersListConfigService,
 } from '../../../../../shared/components/list/list-types/cf-select-users/cf-select-users-list-config.service';
 import { CfUserService } from '../../../../../shared/data-services/cf-user.service';
-import { CfUser } from '../../../../../store/types/user.types';
+import { CfUser } from '../../../../../store/types/cf-user.types';
 import { ActiveRouteCfOrgSpace } from '../../../cf-page.types';
 import { CfRolesService } from '../cf-roles.service';
 
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 c1d88ad0d8..6d2ce160a2 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">
+    <mat-radio-group [value]="currentValue" (change)="setIsRemove($event)">
+      <mat-radio-button [disabled]="!(canAdd$ | async)" [value]="false">
         Add Roles{{(canAdd$ | async) ? '' : ' (Disabled via feature flag)'}}
       </mat-radio-button>
-      <mat-radio-button [disabled]="!(canRemove$ | async)" [value]="false">
+      <mat-radio-button [disabled]="!(canRemove$ | async)" [value]="true">
         Remove Roles{{(canRemove$ | async) ? '' : ' (Disabled via feature flag)'}}</mat-radio-button>
     </mat-radio-group>
   </div>
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 db0ede2260..17365fc60e 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
@@ -2,10 +2,12 @@ import { Component, OnInit } from '@angular/core';
 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';
+import { first, map, publishReplay, refCount, startWith, switchMap } from 'rxjs/operators';
 
-import { PermissionConfig, PermissionTypes } from '../../../../../../../core/src/core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
+import { PermissionConfig } from '../../../../../../../core/src/core/permissions/current-user-permissions.config';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import {
   StackedInputActionConfig,
 } from '../../../../../../../core/src/shared/components/stacked-input-actions/stacked-input-action/stacked-input-action.component';
@@ -21,7 +23,8 @@ import {
 } 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 { CfUser } from '../../../../../store/types/cf-user.types';
+import { CfPermissionTypes } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import { ActiveRouteCfOrgSpace } from '../../../cf-page.types';
 import { waitForCFPermissions } from '../../../cf.helpers';
 
@@ -50,6 +53,7 @@ export class ManageUsersSetUsernamesComponent implements OnInit {
   public canAdd$: Observable<boolean>;
   public canRemove$: Observable<boolean>;
   public blocked$: Observable<boolean>;
+  public currentValue: boolean;
 
   public stackedActionConfig: StackedInputActionConfig = {
     isEmailInput: false,
@@ -67,41 +71,33 @@ export class ManageUsersSetUsernamesComponent implements OnInit {
     private activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
     userPerms: CurrentUserPermissionsService,
   ) {
-    const ffSetPermConfig = new PermissionConfig(PermissionTypes.FEATURE_FLAG, CFFeatureFlagTypes.set_roles_by_username);
-    const ffRemovePermConfig = new PermissionConfig(PermissionTypes.FEATURE_FLAG, CFFeatureFlagTypes.unset_roles_by_username);
+    const ffSetPermConfig = new PermissionConfig(CfPermissionTypes.FEATURE_FLAG, CFFeatureFlagTypes.set_roles_by_username);
+    const ffRemovePermConfig = new PermissionConfig(CfPermissionTypes.FEATURE_FLAG, CFFeatureFlagTypes.unset_roles_by_username);
     this.canAdd$ = waitForCFPermissions(store, activeRouteCfOrgSpace.cfGuid).pipe(
       switchMap(() => userPerms.can(ffSetPermConfig, activeRouteCfOrgSpace.cfGuid)),
-      tap(canAdd => {
-        if (!canAdd) {
-          this.setIsRemove({ source: null, value: false });
-        }
-      }),
       first(),
       publishReplay(1),
       refCount()
     );
     this.canRemove$ = waitForCFPermissions(store, activeRouteCfOrgSpace.cfGuid).pipe(
       switchMap(() => userPerms.can(ffRemovePermConfig, activeRouteCfOrgSpace.cfGuid)),
-      tap(canRemove => {
-        if (!canRemove) {
-          this.setIsRemove({ source: null, value: true });
-        }
-      }),
       first(),
       publishReplay(1),
       refCount()
     );
 
-    this.blocked$ = combineLatest([this.canAdd$, this.canRemove$]).pipe(
-      map(([canAdd, canRemove]) => {
-        if (canAdd && canRemove) {
-          // Set initial value to be add
-          this.setIsRemove({ source: null, value: true });
-        }
-        return false;
-      }),
+    const canAddRemove = combineLatest([this.canAdd$, this.canRemove$]);
+
+    // Set starting value of add/remove radio button
+    canAddRemove.pipe(first()).subscribe(([canAdd]) => this.setIsRemove({ source: null, value: !canAdd }))
+
+    // Block content until we know the add/remove state
+    this.blocked$ = canAddRemove.pipe(
+      map(() => false),
+      first(),
       startWith(true),
-      take(2)
+      publishReplay(1),
+      refCount(),
     );
 
   }
@@ -125,8 +121,8 @@ export class ManageUsersSetUsernamesComponent implements OnInit {
   }
 
   setIsRemove(event: MatRadioChange) {
-    // Note - event.value is flipped
-    this.store.dispatch(new UsersRolesSetIsRemove(!event.value));
+    this.store.dispatch(new UsersRolesSetIsRemove(event.value));
+    this.currentValue = event.value;
   }
 
   onNext: StepOnNextFunction = () => {
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users.component.ts
index 3470759dcb..9eb662d103 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users.component.ts
@@ -5,11 +5,11 @@ import { Observable, of as observableOf, of } from 'rxjs';
 import { combineLatest, filter, first, map } from 'rxjs/operators';
 
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
-import { selectUsersRoles, selectUsersRolesPicked } from '../../../../../../store/src/selectors/users-roles.selector';
 import { UsersRolesClear, UsersRolesExecuteChanges, UsersRolesSetUsers } from '../../../../actions/users-roles.actions';
 import { CFAppState } from '../../../../cf-app-state';
 import { CfUserService } from '../../../../shared/data-services/cf-user.service';
-import { CfUser } from '../../../../store/types/user.types';
+import { selectCfUsersRoles, selectCfUsersRolesPicked } from '../../../../store/selectors/cf-users-roles.selector';
+import { CfUser } from '../../../../store/types/cf-user.types';
 import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
 import { getActiveRouteCfOrgSpaceProvider } from '../../cf.helpers';
 import { CfRolesService } from './cf-roles.service';
@@ -55,7 +55,7 @@ export class UsersRolesComponent implements OnDestroy {
           first()
         );
       } else {
-        this.initialUsers$ = this.store.select(selectUsersRolesPicked).pipe(first());
+        this.initialUsers$ = this.store.select(selectCfUsersRolesPicked).pipe(first());
       }
 
       this.singleUser$ = this.initialUsers$.pipe(
@@ -65,7 +65,7 @@ export class UsersRolesComponent implements OnDestroy {
       );
 
       // Ensure that when we arrive here directly the store is set up with all it needs
-      this.store.select(selectUsersRoles).pipe(
+      this.store.select(selectCfUsersRoles).pipe(
         combineLatest(this.initialUsers$),
         first()
       ).subscribe(([usersRoles, users]) => {
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/remove-user/remove-user.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/remove-user/remove-user.component.ts
index cfccea2fa2..7c4a435f3d 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/remove-user/remove-user.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/remove-user/remove-user.component.ts
@@ -4,12 +4,10 @@ import { Store } from '@ngrx/store';
 import { combineLatest as obsCombineLatest, Observable, of as observableOf } from 'rxjs';
 import { combineLatest, filter, first, map, startWith } from 'rxjs/operators';
 
-import { CurrentUserPermissions } from '../../../../../../core/src/core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from '../../../../../../core/src/core/current-user-permissions.service';
 import { LoggerService } from '../../../../../../core/src/core/logger.service';
+import { CurrentUserPermissionsService } from '../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { AppState } from '../../../../../../store/src/app-state';
-import { selectUsersRoles } from '../../../../../../store/src/selectors/users-roles.selector';
 import {
   UsersRolesClear,
   UsersRolesExecuteChanges,
@@ -17,8 +15,10 @@ import {
   UsersRolesSetUsers,
 } from '../../../../actions/users-roles.actions';
 import { CfUserService } from '../../../../shared/data-services/cf-user.service';
-import { CfUser, IUserPermissionInOrg, IUserPermissionInSpace } from '../../../../store/types/user.types';
+import { selectCfUsersRoles } from '../../../../store/selectors/cf-users-roles.selector';
+import { CfUser, IUserPermissionInOrg, IUserPermissionInSpace } from '../../../../store/types/cf-user.types';
 import { CfRoleChange } from '../../../../store/types/users-roles.types';
+import { CfCurrentUserPermissions } from '../../../../user-permissions/cf-user-permissions-checkers';
 import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
 import { getActiveRouteCfOrgSpaceProvider } from '../../cf.helpers';
 import { CfRolesService } from '../manage-users/cf-roles.service';
@@ -71,7 +71,7 @@ export class RemoveUserComponent implements OnDestroy {
       return;
     }
 
-    const cfGuid$ = this.store.select(selectUsersRoles).pipe(
+    const cfGuid$ = this.store.select(selectCfUsersRoles).pipe(
       combineLatest(this.singleUser$),
       first()
     );
@@ -114,12 +114,12 @@ export class RemoveUserComponent implements OnDestroy {
       const isOrgRole = !c.spaceGuid;
 
       if (isOrgRole) {
-        return this.userPerms.can(CurrentUserPermissions.ORGANIZATION_CHANGE_ROLES, this.cfGuid, c.orgGuid).pipe(
+        return this.userPerms.can(CfCurrentUserPermissions.ORGANIZATION_CHANGE_ROLES, this.cfGuid, c.orgGuid).pipe(
           map((can) => ({ can, change: c }))
         );
       }
 
-      return this.userPerms.can(CurrentUserPermissions.SPACE_CHANGE_ROLES, this.cfGuid, c.orgGuid, c.spaceGuid).pipe(
+      return this.userPerms.can(CfCurrentUserPermissions.SPACE_CHANGE_ROLES, this.cfGuid, c.orgGuid, c.spaceGuid).pipe(
         map((can) => ({ can, change: c }))
       );
     });
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 015bb2c5af..a959216d92 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
@@ -33,6 +33,6 @@ import { ServiceTabsBaseComponent } from './service-tabs-base/service-tabs-base.
   ],
   exports: [
     ServiceTabsBaseComponent,
-  ],
+  ]
 })
 export class ServiceCatalogModule { }
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 839286509e..f6b4c53c11 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
@@ -3,8 +3,9 @@
     {{ getServiceLabel() | async }}
   </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)">
+    <ng-container *appCfUserPermission="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>
@@ -12,4 +13,4 @@
 </app-page-header>
 <app-loading-page [text]="'Retrieving Service details'" class="router-component">
   <router-outlet></router-outlet>
-</app-loading-page>
+</app-loading-page>
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.spec.ts
index b5a07f34de..e25c5c6f2e 100644
--- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.spec.ts
@@ -2,6 +2,7 @@ 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 { CfUserPermissionDirective } from '../../../shared/directives/cf-user-permission/cf-user-permission.directive';
 import { ServicesService } from '../services.service';
 import { ServicesServiceMock } from '../services.service.mock';
 import { ServiceTabsBaseComponent } from './service-tabs-base.component';
@@ -12,7 +13,10 @@ describe('ServiceTabsBaseComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ServiceTabsBaseComponent],
+      declarations: [
+        ServiceTabsBaseComponent,
+        CfUserPermissionDirective
+      ],
       imports: generateCfBaseTestModules(),
       providers: [{
         provide: ServicesService, useClass: ServicesServiceMock
diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.ts
index b54de1291a..817f55a6e2 100644
--- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.ts
@@ -4,9 +4,9 @@ import { Observable, Subscription } from 'rxjs';
 import { map, publishReplay, refCount } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
-import { CurrentUserPermissions } from '../../../../../core/src/core/current-user-permissions.config';
 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 { CfCurrentUserPermissions } from '../../../user-permissions/cf-user-permissions-checkers';
 import { getServiceName } from '../services-helper';
 import { ServicesService } from '../services.service';
 
@@ -16,7 +16,7 @@ import { ServicesService } from '../services.service';
   styleUrls: ['./service-tabs-base.component.scss'],
 })
 export class ServiceTabsBaseComponent {
-  canCreateServiceInstance: CurrentUserPermissions;
+  canCreateServiceInstance: CfCurrentUserPermissions;
   toolTipText$: Observable<string>;
   hasVisiblePlans$: Observable<boolean>;
   servicesSubscription: Subscription;
@@ -50,7 +50,7 @@ export class ServiceTabsBaseComponent {
   constructor(private servicesService: ServicesService, private store: Store<CFAppState>) {
     this.hasVisiblePlans$ = this.servicesService.servicePlans$.pipe(
       map(p => p.length > 0));
-    this.canCreateServiceInstance = CurrentUserPermissions.SERVICE_INSTANCE_CREATE;
+    this.canCreateServiceInstance = CfCurrentUserPermissions.SERVICE_INSTANCE_CREATE;
     this.toolTipText$ = this.hasVisiblePlans$.pipe(
       map(hasPlans => {
         if (hasPlans) {
diff --git a/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.html b/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.html
index 8fb67cc7bd..cf6322f5e7 100644
--- a/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.html
+++ b/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.html
@@ -2,7 +2,7 @@
   <h1>Services</h1>
   <div class="page-header-right">
     <ng-container *ngIf="(haveConnectedCf$ | async)">
-      <ng-container *appUserPermission="canCreateServiceInstance">
+      <ng-container *appCfUserPermission="canCreateServiceInstance">
         <button mat-icon-button [routerLink]="'/services/new/'">
           <mat-icon>add</mat-icon>
         </button>
@@ -12,15 +12,19 @@ <h1>Services</h1>
 </app-page-header>
 <app-cf-endpoints-missing></app-cf-endpoints-missing>
 <ng-template #noEntriesForCurrentFilter>
-  <app-no-content-message iconFont="stratos-icons" icon="service" [firstLine]="'There are no services instances for the current filter'" [secondLine]="{
+  <app-no-content-message iconFont="stratos-icons" icon="service"
+    [firstLine]="'There are no services instances for the current filter'" [secondLine]="{
   text: ''
 }"></app-no-content-message>
 </ng-template>
 
 <ng-template #noEntries>
-  <app-no-content-message iconFont="stratos-icons" icon="service" [firstLine]="'There are no services instances'" [secondLine]="{
+  <app-no-content-message iconFont="stratos-icons" icon="service" [firstLine]="'There are no services instances'"
+    [secondLine]="{
   text: ''
 }"></app-no-content-message>
 </ng-template>
 
-<app-list class="services-wall" [noEntries]="noEntries" [noEntriesForCurrentFilter]="noEntriesForCurrentFilter" *ngIf="!!(cloudFoundryService.hasRegisteredCFEndpoints$ | async) && !!(cloudFoundryService.hasConnectedCFEndpoints$ | async)"></app-list>
+<app-list class="services-wall" [noEntries]="noEntries" [noEntriesForCurrentFilter]="noEntriesForCurrentFilter"
+  *ngIf="!!(cloudFoundryService.hasRegisteredCFEndpoints$ | async) && !!(cloudFoundryService.hasConnectedCFEndpoints$ | async)">
+</app-list>
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.spec.ts
index 4087596081..7d20df5522 100644
--- a/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.spec.ts
@@ -5,6 +5,7 @@ import { generateCfBaseTestModules } from '../../../../test-framework/cloud-foun
 import { CfEndpointsMissingComponent } from '../../../shared/components/cf-endpoints-missing/cf-endpoints-missing.component';
 import { CfOrgSpaceDataService } from '../../../shared/data-services/cf-org-space-service.service';
 import { CloudFoundryService } from '../../../shared/data-services/cloud-foundry.service';
+import { CfUserPermissionDirective } from '../../../shared/directives/cf-user-permission/cf-user-permission.directive';
 import { ServicesWallComponent } from './services-wall.component';
 
 describe('ServicesWallComponent', () => {
@@ -15,7 +16,8 @@ describe('ServicesWallComponent', () => {
     TestBed.configureTestingModule({
       declarations: [
         ServicesWallComponent,
-        CfEndpointsMissingComponent
+        CfEndpointsMissingComponent,
+        CfUserPermissionDirective
       ],
       imports: generateCfBaseTestModules(),
       providers: [
diff --git a/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.ts b/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.ts
index 4b36fab461..96d806b0c5 100644
--- a/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.ts
@@ -13,8 +13,8 @@ import {
   initCfOrgSpaceService,
 } from '../../../../../cloud-foundry/src/shared/data-services/cf-org-space-service.service';
 import { CloudFoundryService } from '../../../../../cloud-foundry/src/shared/data-services/cloud-foundry.service';
-import { CurrentUserPermissions } from '../../../../../core/src/core/current-user-permissions.config';
 import { ListConfig } from '../../../../../core/src/shared/components/list/list.component.types';
+import { CfCurrentUserPermissions } from '../../../user-permissions/cf-user-permissions-checkers';
 
 @Component({
   selector: 'app-services-wall',
@@ -32,7 +32,7 @@ export class ServicesWallComponent implements OnDestroy {
 
   public haveConnectedCf$: Observable<boolean>;
 
-  canCreateServiceInstance: CurrentUserPermissions;
+  canCreateServiceInstance: CfCurrentUserPermissions;
   initCfOrgSpaceService: Subscription;
   cfIds$: Observable<string[]>;
 
@@ -41,7 +41,7 @@ export class ServicesWallComponent implements OnDestroy {
     public store: Store<CFAppState>,
     private cfOrgSpaceService: CfOrgSpaceDataService) {
 
-    this.canCreateServiceInstance = CurrentUserPermissions.SERVICE_INSTANCE_CREATE;
+    this.canCreateServiceInstance = CfCurrentUserPermissions.SERVICE_INSTANCE_CREATE;
     this.cfIds$ = cloudFoundryService.cFEndpoints$.pipe(
       map(endpoints => endpoints
         .filter(endpoint => endpoint.connectionStatus === 'connected')
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 6c0ce65be1..7da0831fa8 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
@@ -204,6 +204,7 @@ import { ServicePlanPriceComponent } from './components/service-plan-price/servi
 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 { CfUserPermissionDirective } from './directives/cf-user-permission/cf-user-permission.directive';
 import { ApplicationStateService } from './services/application-state.service';
 import { CloudFoundryUserProvidedServicesService } from './services/cloud-foundry-user-provided-services.service';
 
@@ -321,7 +322,8 @@ const cfListCards: Type<CardCell<any>>[] = [
     AppNameUniqueDirective,
     ApplicationInstanceChartComponent,
     GithubCommitAuthorComponent,
-    EnvVarViewComponent
+    EnvVarViewComponent,
+    CfUserPermissionDirective
   ],
   exports: [
     ServiceIconComponent,
@@ -363,7 +365,8 @@ const cfListCards: Type<CardCell<any>>[] = [
     AppNameUniqueDirective,
     ApplicationInstanceChartComponent,
     GithubCommitAuthorComponent,
-    EnvVarViewComponent
+    EnvVarViewComponent,
+    CfUserPermissionDirective
   ],
   entryComponents: [
     CfEndpointDetailsComponent,
@@ -376,7 +379,8 @@ const cfListCards: Type<CardCell<any>>[] = [
   providers: [
     ApplicationStateService,
     GitSCMService,
-    CloudFoundryUserProvidedServicesService,
+    CloudFoundryUserProvidedServicesService
   ]
 })
 export class CloudFoundrySharedModule { }
+
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.ts
index a4652f892f..8472dd6633 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.ts
@@ -5,23 +5,23 @@ import { combineLatest as combineLatestOp, filter, first, map } from 'rxjs/opera
 
 import { UsersRolesSetOrgRole, UsersRolesSetSpaceRole } from '../../../../../cloud-foundry/src/actions/users-roles.actions';
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
+import { CfUserRolesSelected } from '../../../../../cloud-foundry/src/store/types/users-roles.types';
+import { CurrentUserPermissionsService } from '../../../../../core/src/core/permissions/current-user-permissions.service';
+import { canUpdateOrgSpaceRoles } from '../../../features/cloud-foundry/cf.helpers';
+import { CfRolesService } from '../../../features/cloud-foundry/users/manage-users/cf-roles.service';
+import {
+  selectCfUsersIsRemove,
+  selectCfUsersIsSetByUsername,
+  selectCfUsersRolesPicked,
+} from '../../../store/selectors/cf-users-roles.selector';
 import {
   CfUser,
   IUserPermissionInOrg,
   IUserPermissionInSpace,
   OrgUserRoleNames,
   SpaceUserRoleNames,
-} from '../../../../../cloud-foundry/src/store/types/user.types';
-import { CfUserRolesSelected } from '../../../../../cloud-foundry/src/store/types/users-roles.types';
-import { CurrentUserPermissions } from '../../../../../core/src/core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from '../../../../../core/src/core/current-user-permissions.service';
-import {
-  selectUsersIsRemove,
-  selectUsersIsSetByUsername,
-  selectUsersRolesPicked,
-} from '../../../../../store/src/selectors/users-roles.selector';
-import { canUpdateOrgSpaceRoles } from '../../../features/cloud-foundry/cf.helpers';
-import { CfRolesService } from '../../../features/cloud-foundry/users/manage-users/cf-roles.service';
+} from '../../../store/types/cf-user.types';
+import { CfCurrentUserPermissions } from '../../../user-permissions/cf-user-permissions-checkers';
 
 
 enum CfRoleCheckboxMode {
@@ -250,17 +250,17 @@ export class CfRoleCheckboxComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.isOrgRole = !this.spaceGuid;
-    const users$ = this.store.select(selectUsersRolesPicked);
+    const users$ = this.store.select(selectCfUsersRolesPicked);
     // If setting an org role user must be admin or org manager.
     // If setting a space role user must be admin, org manager or space manager
     const canEditRole$ = this.isOrgRole ?
-      this.userPerms.can(CurrentUserPermissions.ORGANIZATION_CHANGE_ROLES, this.cfGuid, this.orgGuid) :
+      this.userPerms.can(CfCurrentUserPermissions.ORGANIZATION_CHANGE_ROLES, this.cfGuid, this.orgGuid) :
       canUpdateOrgSpaceRoles(
         this.userPerms,
         this.cfGuid,
         this.orgGuid,
         this.spaceGuid);
-    const selectUsersIsSetByUsername$ = this.store.select(selectUsersIsSetByUsername);
+    const selectUsersIsSetByUsername$ = this.store.select(selectCfUsersIsSetByUsername);
 
     this.sub = this.cfRolesService.existingRoles$.pipe(
       combineLatestOp(this.cfRolesService.newRoles$, users$, canEditRole$, selectUsersIsSetByUsername$),
@@ -285,8 +285,8 @@ export class CfRoleCheckboxComponent implements OnInit, OnDestroy {
     });
 
     this.mode$ = combineLatest([
-      this.store.select(selectUsersIsSetByUsername),
-      this.store.select(selectUsersIsRemove)
+      this.store.select(selectCfUsersIsSetByUsername),
+      this.store.select(selectCfUsersIsRemove)
     ]).pipe(
       map(([isSetByUsername, isRemove]) => {
         if (!isSetByUsername) {
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 e455fddee4..1e3dd731a4 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,12 +5,12 @@ import { Store } from '@ngrx/store';
 import { asapScheduler, Observable, of } from 'rxjs';
 import { map, observeOn, startWith, switchMap, withLatestFrom } from 'rxjs/operators';
 
-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 { CfPermissionStrings } from '../../../../user-permissions/cf-user-permissions-checkers';
 import { CfOrgSpaceDataService } from '../../../data-services/cf-org-space-service.service';
 
 @Component({
@@ -83,7 +83,7 @@ export class CreateApplicationStep1Component implements OnInit, AfterContentInit
     return this.cfOrgSpaceService.org.select.pipe(
       withLatestFrom(this.cfOrgSpaceService.cf.select),
       switchMap(([orgGuid, endpointGuid]) => {
-        return this.store.select(getSpacesFromOrgWithRole(endpointGuid, orgGuid, PermissionStrings.SPACE_DEVELOPER));
+        return this.store.select(getSpacesFromOrgWithRole(endpointGuid, orgGuid, CfPermissionStrings.SPACE_DEVELOPER));
       }),
       switchMap((spacesOrAll => {
         if (spacesOrAll === 'all') {
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 d015f401ca..dd2d9a08a4 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,7 +1,7 @@
 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 { testSCFEndpointGuid } from '@stratosui/store/testing';
 
 import { CoreModule } from '../../../../../../../core/src/core/core.module';
 import { CF_GUID } from '../../../../../../../core/src/shared/entity.tokens';
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 a07393539f..a113574270 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
@@ -8,7 +8,9 @@ import { spaceEntityType } from '../../../../../../../cloud-foundry/src/cf-entit
 import {
   createEntityRelationPaginationKey,
 } from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { ConfirmationDialogService } from '../../../../../../../core/src/shared/components/confirmation-dialog.service';
 import {
   TableCellRadioComponent,
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 2f970c7cfa..2a658beb99 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
@@ -5,14 +5,16 @@ import { publishReplay, refCount, switchMap } from 'rxjs/operators';
 
 import { GetAppRoutes } from '../../../../../../../cloud-foundry/src/actions/application-service-routes.actions';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { CurrentUserPermissions } from '../../../../../../../core/src/core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../core/src/core/permissions/current-user-permissions.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 { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import { CfRoutesListConfigBase } from '../cf-routes/cf-routes-list-config-base';
 import { CfAppRoutesDataSource } from './cf-app-routes-data-source';
 
@@ -42,7 +44,7 @@ export abstract class CfAppRoutesListConfigServiceBase extends CfRoutesListConfi
   ) {
     const canEditAppsInSpace = hasActions ? appService.app$.pipe(
       switchMap(app => currentUserPermissionsService.can(
-        CurrentUserPermissions.APPLICATION_EDIT,
+        CfCurrentUserPermissions.APPLICATION_EDIT,
         appService.cfGuid,
         app.entity.entity.space_guid
       )),
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 3094755217..59cbb61331 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
@@ -4,7 +4,9 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Store } from '@ngrx/store';
 
 import { CoreModule } from '../../../../../../../core/src/core/core.module';
-import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../core/src/core/permissions/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 '../../../../../../test-framework/application-service-helper';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-routes-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-routes-list-config.service.ts
index 109dc07920..a631fac6ae 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-routes-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-routes-list-config.service.ts
@@ -4,7 +4,9 @@ import { Store } from '@ngrx/store';
 import { take } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { ConfirmationDialogService } from '../../../../../../../core/src/shared/components/confirmation-dialog.service';
 import { IGlobalListAction, IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
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 f3219c6d18..5f15687925 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,8 +4,9 @@ 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 { CurrentUserPermissions } from '../../../../../../../../core/src/core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from '../../../../../../../../core/src/core/current-user-permissions.service';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
 import {
   MetaCardMenuItem,
@@ -31,6 +32,7 @@ import {
   getServiceSummaryUrl,
 } from '../../../../../../features/service-catalog/services-helper';
 import { AppEnvVarsState } from '../../../../../../store/types/app-metadata.types';
+import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-user-permissions-checkers';
 import { ServiceActionHelperService } from '../../../../../data-services/service-action-helper.service';
 import { EnvVarViewComponent } from '../../../../env-var-view/env-var-view.component';
 
@@ -77,7 +79,7 @@ export class AppServiceBindingCardComponent extends CardCell<APIResource<IServic
         action: this.edit,
         can: this.appService.waitForAppEntity$.pipe(
           switchMap(app => this.currentUserPermissionsService.can(
-            CurrentUserPermissions.SERVICE_BINDING_EDIT,
+            CfCurrentUserPermissions.SERVICE_BINDING_EDIT,
             this.appService.cfGuid,
             app.entity.entity.space_guid
           )))
@@ -87,7 +89,7 @@ export class AppServiceBindingCardComponent extends CardCell<APIResource<IServic
         action: this.detach,
         can: this.appService.waitForAppEntity$.pipe(
           switchMap(app => this.currentUserPermissionsService.can(
-            CurrentUserPermissions.SERVICE_BINDING_EDIT,
+            CfCurrentUserPermissions.SERVICE_BINDING_EDIT,
             this.appService.cfGuid,
             app.entity.entity.space_guid
           )))
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 236f9e6abd..932b497638 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,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import { getRowMetadata } from '@stratos/store';
+import { getRowMetadata } from '@stratosui/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import {
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 a11dc7151d..68288fa9ec 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,8 +4,9 @@ import { Store } from '@ngrx/store';
 import { switchMap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { CurrentUserPermissions } from '../../../../../../../core/src/core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import {
   DataFunctionDefinition,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
@@ -22,6 +23,7 @@ import { GetAppServiceBindings } from '../../../../../actions/application-servic
 import { IServiceBinding } from '../../../../../cf-api-svc.types';
 import { ApplicationService } from '../../../../../features/applications/application.service';
 import { isServiceInstance, isUserProvidedServiceInstance } from '../../../../../features/cloud-foundry/cf.helpers';
+import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import { ServiceActionHelperService } from '../../../../data-services/service-action-helper.service';
 import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
 import {
@@ -46,7 +48,7 @@ export class AppServiceBindingListConfigService extends BaseCfListConfig<APIReso
     description: 'Bind Service Instance',
     visible$: this.appService.waitForAppEntity$.pipe(
       switchMap(app => this.currentUserPermissionsService.can(
-        CurrentUserPermissions.SERVICE_INSTANCE_CREATE,
+        CfCurrentUserPermissions.SERVICE_INSTANCE_CREATE,
         this.appService.cfGuid,
         app.entity.entity.space_guid
       ))
@@ -70,7 +72,7 @@ export class AppServiceBindingListConfigService extends BaseCfListConfig<APIReso
     label: 'Edit',
     createVisible: () => this.appService.waitForAppEntity$.pipe(
       switchMap(app => this.currentUserPermissionsService.can(
-        CurrentUserPermissions.SERVICE_BINDING_EDIT,
+        CfCurrentUserPermissions.SERVICE_BINDING_EDIT,
         this.appService.cfGuid,
         app.entity.entity.space_guid
       ))
@@ -91,7 +93,7 @@ export class AppServiceBindingListConfigService extends BaseCfListConfig<APIReso
     label: 'Unbind',
     createVisible: () => this.appService.waitForAppEntity$.pipe(
       switchMap(app => this.currentUserPermissionsService.can(
-        CurrentUserPermissions.SERVICE_BINDING_EDIT,
+        CfCurrentUserPermissions.SERVICE_BINDING_EDIT,
         this.appService.cfGuid,
         app.entity.entity.space_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 3a4849a95a..0e4e9e1269 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,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import { getRowMetadata } from '@stratos/store';
+import { getRowMetadata } from '@stratosui/store';
 import { Subscription } from 'rxjs';
 import { tag } from 'rxjs-spy/operators/tag';
 import { debounceTime, delay, distinctUntilChanged, map, withLatestFrom } from 'rxjs/operators';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpack-card/cf-buildpack-card.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpack-card/cf-buildpack-card.component.html
index 923acf666d..f4a209c775 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpack-card/cf-buildpack-card.component.html
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpack-card/cf-buildpack-card.component.html
@@ -27,7 +27,7 @@
     <app-meta-card-key>Updated</app-meta-card-key>
     <app-meta-card-value>{{ row.metadata.updated_at | date: 'medium' }}</app-meta-card-value>
   </app-meta-card-item>
-  <app-meta-card-item>
+  <app-meta-card-item customStyle="multiline">
     <app-meta-card-key>File Name</app-meta-card-key>
     <app-meta-card-value>{{ row.entity.filename }}</app-meta-card-value>
   </app-meta-card-item>
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-confirm-roles/table-cell-confirm-role-add-rem/table-cell-confirm-role-add-rem.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-confirm-roles/table-cell-confirm-role-add-rem/table-cell-confirm-role-add-rem.component.spec.ts
index 0610d25aae..d0ff520581 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-confirm-roles/table-cell-confirm-role-add-rem/table-cell-confirm-role-add-rem.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-confirm-roles/table-cell-confirm-role-add-rem/table-cell-confirm-role-add-rem.component.spec.ts
@@ -1,10 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { OrgUserRoleNames } from '../../../../../../../../cloud-foundry/src/store/types/user.types';
 import { MDAppModule } from '../../../../../../../../core/src/core/md.module';
 import {
   BooleanIndicatorComponent,
 } from '../../../../../../../../core/src/shared/components/boolean-indicator/boolean-indicator.component';
+import { OrgUserRoleNames } from '../../../../../../store/types/cf-user.types';
 import { TableCellConfirmRoleAddRemComponent } from './table-cell-confirm-role-add-rem.component';
 
 describe('TableCellConfirmRoleAddRemComponent', () => {
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 47d5f725e9..5a6adeb8eb 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,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import { getRowMetadata } from '@stratos/store';
+import { getRowMetadata } from '@stratosui/store';
 
 import {
   ListDataSource,
@@ -29,7 +29,7 @@ export class CfEventsDataSource extends ListDataSource<APIResource> {
       actee
     );
 
-    const action = cfEntityCatalog.event.actions.getMultiple(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-org-users/cf-org-users-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-org-users/cf-org-users-list-config.service.ts
index 7d53361cbb..4d125e2cca 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-org-users/cf-org-users-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-org-users/cf-org-users-list-config.service.ts
@@ -3,12 +3,14 @@ import { Router } from '@angular/router';
 import { Store } from '@ngrx/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { CfUser } from '../../../../../../../cloud-foundry/src/store/types/user.types';
-import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
 import {
   CloudFoundryOrganizationService,
 } from '../../../../../features/cloud-foundry/services/cloud-foundry-organization.service';
+import { CfUser } from '../../../../../store/types/cf-user.types';
 import { CfUserService } from '../../../../data-services/cf-user.service';
 import { CfUserListConfigService } from '../cf-users/cf-user-list-config.service';
 
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 1df1add336..52edb4889a 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,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { Store } from '@ngrx/store';
-import { testSessionData } from '@stratos/store/testing';
+import { testSessionData } from '@stratosui/store/testing';
 
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
 import { MetadataCardTestComponents } from '../../../../../../../../core/test-framework/core-test.helper';
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 c229dd2e8d..c8275787bf 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
@@ -5,9 +5,9 @@ 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 { CurrentUserPermissions } from '../../../../../../../../core/src/core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from '../../../../../../../../core/src/core/current-user-permissions.service';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../../core/src/core/permissions/current-user-permissions.service';
 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';
@@ -37,6 +37,8 @@ import { OrgQuotaHelper } from '../../../../../../features/cloud-foundry/service
 import {
   createOrgQuotaDefinition,
 } from '../../../../../../features/cloud-foundry/services/cloud-foundry-organization.service';
+import { createUserRoleInOrg } from '../../../../../../store/types/cf-user.types';
+import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-user-permissions-checkers';
 import { CfUserService } from '../../../../../data-services/cf-user.service';
 import { CF_ENDPOINT_TYPE } from './../../../../../../cf-types';
 
@@ -78,12 +80,12 @@ export class CfOrgCardComponent extends CardCell<APIResource<IOrganization>> imp
       {
         label: 'Edit',
         action: this.edit,
-        can: this.currentUserPermissionsService.can(CurrentUserPermissions.ORGANIZATION_EDIT, this.cfEndpointService.cfGuid)
+        can: this.currentUserPermissionsService.can(CfCurrentUserPermissions.ORGANIZATION_EDIT, this.cfEndpointService.cfGuid)
       },
       {
         label: 'Delete',
         action: this.delete,
-        can: this.currentUserPermissionsService.can(CurrentUserPermissions.ORGANIZATION_DELETE, this.cfEndpointService.cfGuid)
+        can: this.currentUserPermissionsService.can(CfCurrentUserPermissions.ORGANIZATION_DELETE, this.cfEndpointService.cfGuid)
       }
     ];
   }
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 9149423b08..f0c23e0d95 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,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import { getRowMetadata } from '@stratos/store';
+import { getRowMetadata } from '@stratosui/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { organizationEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
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 09c980b0d2..f2bf84af31 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,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import { getRowMetadata } from '@stratos/store';
+import { getRowMetadata } from '@stratosui/store';
 import { of } from 'rxjs';
 import { distinctUntilChanged, map } from 'rxjs/operators';
 
diff --git a/src/frontend/packages/cloud-foundry/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
index 9840ba444f..d4e001d8aa 100644
--- a/src/frontend/packages/cloud-foundry/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
@@ -9,8 +9,9 @@ import { ActiveRouteCfOrgSpace } from '../../../../../../../cloud-foundry/src/fe
 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 {
+  CurrentUserPermissionsService,
+} from '../../../../../../../core/src/core/permissions/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';
@@ -18,6 +19,7 @@ import { IListAction, ListViewTypes } from '../../../../../../../core/src/shared
 import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { IQuotaDefinition } from '../../../../../cf-api.types';
+import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import { CfQuotasDataSourceService } from './cf-quotas-data-source.service';
 import { TableCellQuotaComponent } from './table-cell-quota/table-cell-quota.component';
 
@@ -39,8 +41,8 @@ export class CfQuotasListConfigService extends BaseCfListConfig<APIResource<IQuo
   ) {
     super();
     this.dataSource = new CfQuotasDataSourceService(this.store, activeRouteCfOrgSpace.cfGuid, this);
-    this.canEdit = this.currentUserPermissionsService.can(CurrentUserPermissions.QUOTA_EDIT, this.activeRouteCfOrgSpace.cfGuid);
-    this.canDelete = this.currentUserPermissionsService.can(CurrentUserPermissions.QUOTA_DELETE, this.activeRouteCfOrgSpace.cfGuid);
+    this.canEdit = this.currentUserPermissionsService.can(CfCurrentUserPermissions.QUOTA_EDIT, this.activeRouteCfOrgSpace.cfGuid);
+    this.canDelete = this.currentUserPermissionsService.can(CfCurrentUserPermissions.QUOTA_DELETE, this.activeRouteCfOrgSpace.cfGuid);
   }
 
 
diff --git a/src/frontend/packages/cloud-foundry/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
index 10e4abeef9..b503d2760f 100644
--- a/src/frontend/packages/cloud-foundry/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,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { createBasicStoreModule } from '@stratos/store/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { IQuotaDefinition } from '../../../../../../cf-api.types';
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 625fa99aec..f176f59556 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,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import { getRowMetadata } from '@stratos/store';
+import { getRowMetadata } from '@stratosui/store';
 import { combineLatest, Observable, Subscription } from 'rxjs';
 import { map, switchMap, tap } from 'rxjs/operators';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-list-config.service.ts
index 813c1d3e3f..9767322990 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-list-config.service.ts
@@ -5,8 +5,9 @@ import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import { map, publishReplay, refCount, startWith, switchMap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { CurrentUserPermissions } from '../../../../../../../core/src/core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { ConfirmationDialogService } from '../../../../../../../core/src/shared/components/confirmation-dialog.service';
 import {
   IListConfig,
@@ -14,6 +15,7 @@ import {
 } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { CloudFoundryEndpointService } from '../../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
+import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import {
   CfOrgSpaceDataService,
   createCfOrgSpaceFilterConfig,
@@ -43,7 +45,7 @@ export class CfRoutesListConfigService extends CfRoutesListConfigBase implements
     const canEditRoute = (route$: Observable<APIResource<ListCfRoute>>) => {
       return route$.pipe(
         switchMap(route => currentUserPermissionsService.can(
-          CurrentUserPermissions.APPLICATION_EDIT,
+          CfCurrentUserPermissions.APPLICATION_EDIT,
           route.entity.cfGuid,
           route.entity.space_guid
         )),
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 6d6fe29a76..42b046e9dd 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,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import { getRowMetadata } from '@stratos/store';
+import { getRowMetadata } from '@stratosui/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { securityGroupEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
@@ -18,7 +18,7 @@ import { cfEntityFactory } from '../../../../../cf-entity-factory';
 export class CfSecurityGroupsDataSource extends ListDataSource<APIResource> {
   constructor(store: Store<CFAppState>, cfGuid: string, listConfig?: IListConfig<APIResource>) {
     const paginationKey = createEntityRelationPaginationKey(endpointSchemaKey, cfGuid);
-    const action = cfEntityCatalog.securityGroup.actions.getMultiple(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-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 e30ec5e1bc..757bc461b3 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,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import { getRowMetadata } from '@stratos/store';
+import { getRowMetadata } from '@stratosui/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { cfUserEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
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 a60d8d0c6c..10ee7b1abb 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
@@ -3,7 +3,6 @@ import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import { distinctUntilChanged, map, publishReplay, refCount, switchMap, tap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { CfUser, CfUserMissingRoles } from '../../../../../../../cloud-foundry/src/store/types/user.types';
 import {
   TableRowStateManager,
 } from '../../../../../../../core/src/shared/components/list/list-table/table-row/table-row-state-manager';
@@ -25,6 +24,7 @@ import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
 import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
 import { waitForCFPermissions } from '../../../../../features/cloud-foundry/cf.helpers';
+import { CfUser, CfUserMissingRoles } from '../../../../../store/types/cf-user.types';
 import { CfUserService } from '../../../../data-services/cf-user.service';
 import { CfSelectUsersDataSourceService } from './cf-select-users-data-source.service';
 
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 0587430dbe..52b60a12ee 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,8 +5,9 @@ import { Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { CurrentUserPermissions } from '../../../../../../../core/src/core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
@@ -20,6 +21,7 @@ import {
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { IServiceInstance } from '../../../../../cf-api-svc.types';
+import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 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 {
@@ -127,7 +129,7 @@ export class CfServiceInstancesListConfigBase implements IListConfig<APIResource
     createVisible: (row$: Observable<APIResource<IServiceInstance>>) =>
       row$.pipe(
         switchMap(
-          row => this.can(this.canDeleteCache, CurrentUserPermissions.SERVICE_INSTANCE_DELETE, row.entity.cfGuid, row.entity.space_guid)
+          row => this.can(this.canDeleteCache, CfCurrentUserPermissions.SERVICE_INSTANCE_DELETE, row.entity.cfGuid, row.entity.space_guid)
         )
       )
   };
@@ -140,7 +142,7 @@ export class CfServiceInstancesListConfigBase implements IListConfig<APIResource
     createVisible: (row$: Observable<APIResource<IServiceInstance>>) =>
       row$.pipe(
         switchMap(
-          row => this.can(this.canDetachCache, CurrentUserPermissions.SERVICE_BINDING_EDIT, row.entity.cfGuid, row.entity.space_guid)
+          row => this.can(this.canDetachCache, CfCurrentUserPermissions.SERVICE_BINDING_EDIT, row.entity.cfGuid, row.entity.space_guid)
         )
       )
   };
@@ -156,12 +158,12 @@ export class CfServiceInstancesListConfigBase implements IListConfig<APIResource
     createVisible: (row$: Observable<APIResource<IServiceInstance>>) =>
       row$.pipe(
         switchMap(
-          row => this.can(this.canDetachCache, CurrentUserPermissions.SERVICE_BINDING_EDIT, row.entity.cfGuid, row.entity.space_guid)
+          row => this.can(this.canDetachCache, CfCurrentUserPermissions.SERVICE_BINDING_EDIT, row.entity.cfGuid, row.entity.space_guid)
         )
       )
   };
 
-  private can(cache: CanCache, perm: CurrentUserPermissions, cfGuid: string, spaceGuid: string): Observable<boolean> {
+  private can(cache: CanCache, perm: CfCurrentUserPermissions, cfGuid: string, spaceGuid: string): Observable<boolean> {
     let can = cache[spaceGuid];
     if (!can) {
       can = this.currentUserPermissionsService.can(perm, cfGuid, spaceGuid);
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 e0a1c8eeef..334d992dd6 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,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import { getRowMetadata } from '@stratos/store';
+import { getRowMetadata } from '@stratosui/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { serviceEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
@@ -20,7 +20,7 @@ import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 export class CfServicesDataSource extends ListDataSource<APIResource> {
   constructor(store: Store<CFAppState>, endpointGuid: string, listConfig?: IListConfig<APIResource>) {
     const paginationKey = createEntityRelationPaginationKey(endpointSchemaKey);
-    const getServicesAction = cfEntityCatalog.service.actions.getMultiple(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-services/cf-services-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts
index b8c4e53ff4..90fdcad893 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts
@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { endpointsCfEntitiesConnectedSelector } from 'frontend/packages/store/src/selectors/endpoint.selectors';
 import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
 import { filter, first, map } from 'rxjs/operators';
 
@@ -12,7 +11,9 @@ import {
   ListViewTypes,
 } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
+import { connectedEndpointsOfTypesSelector } from '../../../../../../../store/src/selectors/endpoint.selectors';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
 import { haveMultiConnectedCfs } from '../../../../../features/cloud-foundry/cf.helpers';
 import { CfOrgSpaceItem, createCfOrgSpaceFilterConfig } from '../../../../data-services/cf-org-space-service.service';
@@ -38,7 +39,7 @@ export class CfServicesListConfigService implements IListConfig<APIResource> {
   ) {
     this.dataSource = new CfServicesDataSource(this.store, activeRouteCfOrgSpace.cfGuid, this);
     this.cf = {
-      list$: this.store.select(endpointsCfEntitiesConnectedSelector).pipe(
+      list$: this.store.select(connectedEndpointsOfTypesSelector(CF_ENDPOINT_TYPE)).pipe(
         first(),
         map(endpoints => Object.values(endpoints))
       ),
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 9c20d74796..9f653f851f 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,8 +5,9 @@ import { Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { CurrentUserPermissions } from '../../../../../../../core/src/core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
@@ -21,6 +22,7 @@ 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 { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import { ServiceActionHelperService } from '../../../../data-services/service-action-helper.service';
 import {
   CANCEL_ORG_ID_PARAM,
@@ -123,7 +125,7 @@ export class CfUserServiceInstancesListConfigBase implements IListConfig<APIReso
     createVisible: (row$: Observable<APIResource<IUserProvidedServiceInstance>>) =>
       row$.pipe(
         switchMap(
-          row => this.can(this.canDeleteCache, CurrentUserPermissions.SERVICE_INSTANCE_DELETE, row.entity.cfGuid, row.entity.space_guid)
+          row => this.can(this.canDeleteCache, CfCurrentUserPermissions.SERVICE_INSTANCE_DELETE, row.entity.cfGuid, row.entity.space_guid)
         )
       )
   };
@@ -137,7 +139,7 @@ export class CfUserServiceInstancesListConfigBase implements IListConfig<APIReso
     createVisible: (row$: Observable<APIResource<IUserProvidedServiceInstance>>) =>
       row$.pipe(
         switchMap(
-          row => this.can(this.canDetachCache, CurrentUserPermissions.SERVICE_BINDING_EDIT, row.entity.cfGuid, row.entity.space_guid)
+          row => this.can(this.canDetachCache, CfCurrentUserPermissions.SERVICE_BINDING_EDIT, row.entity.cfGuid, row.entity.space_guid)
         )
       )
   };
@@ -158,12 +160,12 @@ export class CfUserServiceInstancesListConfigBase implements IListConfig<APIReso
     createVisible: (row$: Observable<APIResource<IUserProvidedServiceInstance>>) =>
       row$.pipe(
         switchMap(
-          row => this.can(this.canDetachCache, CurrentUserPermissions.SERVICE_BINDING_EDIT, row.entity.cfGuid, row.entity.space_guid)
+          row => this.can(this.canDetachCache, CfCurrentUserPermissions.SERVICE_BINDING_EDIT, row.entity.cfGuid, row.entity.space_guid)
         )
       )
   };
 
-  private can(cache: CanCache, perm: CurrentUserPermissions, cfGuid: string, spaceGuid: string): Observable<boolean> {
+  private can(cache: CanCache, perm: CfCurrentUserPermissions, cfGuid: string, spaceGuid: string): Observable<boolean> {
     let can = cache[spaceGuid];
     if (!can) {
       can = this.currentUserPermissionsService.can(perm, cfGuid, spaceGuid);
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 3c7cbaaffe..b858a197ed 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,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import { getRowMetadata } from '@stratos/store';
+import { getRowMetadata } from '@stratosui/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { applicationEntityType, spaceEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
@@ -25,7 +25,7 @@ export class CfSpaceAppsDataSource extends ListDataSource<APIResource> {
       [],
       false,
       false
-    )
+    );
     super({
       store,
       action,
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 39cc613e32..4a880b804b 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,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import { getRowMetadata } from '@stratos/store';
+import { getRowMetadata } from '@stratosui/store';
 import { of } from 'rxjs';
 import { distinctUntilChanged, map } from 'rxjs/operators';
 
diff --git a/src/frontend/packages/cloud-foundry/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
index 3cfc6e83c1..fd78c9a3fd 100644
--- a/src/frontend/packages/cloud-foundry/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,8 +3,9 @@ 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 {
+  CurrentUserPermissionsService,
+} from '../../../../../../../core/src/core/permissions/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';
@@ -15,6 +16,7 @@ import { DeleteSpaceQuotaDefinition } from '../../../../../actions/quota-definit
 import { IQuotaDefinition } from '../../../../../cf-api.types';
 import { CFAppState } from '../../../../../cf-app-state';
 import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
+import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 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';
@@ -37,8 +39,8 @@ export class CfSpaceQuotasListConfigService extends BaseCfListConfig<APIResource
     super();
     this.dataSource = new CfOrgSpaceQuotasDataSourceService(this.store, activeRouteCfOrgSpace.orgGuid, activeRouteCfOrgSpace.cfGuid, this);
     const { cfGuid, orgGuid } = this.activeRouteCfOrgSpace;
-    this.canEdit = this.currentUserPermissionsService.can(CurrentUserPermissions.SPACE_QUOTA_EDIT, cfGuid, orgGuid);
-    this.canDelete = this.currentUserPermissionsService.can(CurrentUserPermissions.SPACE_QUOTA_DELETE, cfGuid, orgGuid);
+    this.canEdit = this.currentUserPermissionsService.can(CfCurrentUserPermissions.SPACE_QUOTA_EDIT, cfGuid, orgGuid);
+    this.canDelete = this.currentUserPermissionsService.can(CfCurrentUserPermissions.SPACE_QUOTA_DELETE, cfGuid, orgGuid);
   }
 
   enableTextFilter = true;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-list-config.service.ts
index 2d60bb0b4c..0090a576fb 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-list-config.service.ts
@@ -4,12 +4,14 @@ import { Store } from '@ngrx/store';
 import { publishReplay, refCount } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { CurrentUserPermissions } from '../../../../../../../core/src/core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../core/src/core/permissions/current-user-permissions.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 { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/services/cloud-foundry-space.service';
+import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import { CfRoutesListConfigBase } from '../cf-routes/cf-routes-list-config-base';
 import { CfSpaceRoutesDataSource } from './cf-space-routes-data-source';
 
@@ -28,7 +30,7 @@ export class CfSpaceRoutesListConfigService extends CfRoutesListConfigBase imple
     currentUserPermissionsService: CurrentUserPermissionsService
   ) {
     const canEditAppsInSpace = currentUserPermissionsService.can(
-      CurrentUserPermissions.APPLICATION_EDIT,
+      CfCurrentUserPermissions.APPLICATION_EDIT,
       cfSpaceService.cfGuid,
       cfSpaceService.spaceGuid
     ).pipe(
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service.ts
index fc9a0200fd..0484f50f82 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service.ts
@@ -3,13 +3,15 @@ import { Router } from '@angular/router';
 import { Store } from '@ngrx/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { CfUser } from '../../../../../../../cloud-foundry/src/store/types/user.types';
-import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
 import {
   CloudFoundryOrganizationService,
 } from '../../../../../features/cloud-foundry/services/cloud-foundry-organization.service';
 import { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/services/cloud-foundry-space.service';
+import { CfUser } from '../../../../../store/types/cf-user.types';
 import { CfUserService } from '../../../../data-services/cf-user.service';
 import { CfUserListConfigService } from '../cf-users/cf-user-list-config.service';
 
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 e4fff5a9c7..b97b426823 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,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import { getRowMetadata } from '@stratos/store';
+import { getRowMetadata } from '@stratosui/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 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.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 2b60252659..e87ed733c5 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,7 +3,9 @@ import { Injectable } from '@angular/core';
 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 {
+  CurrentUserPermissionsService,
+} from '../../../../../../../core/src/core/permissions/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';
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 393b1dd078..8ff16e96b4 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,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import { getRowMetadata } from '@stratos/store';
+import { getRowMetadata } from '@stratosui/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import {
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 5d3228031f..f780e7ce4d 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,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { Store } from '@ngrx/store';
-import { testSessionData } from '@stratos/store/testing';
+import { testSessionData } from '@stratosui/store/testing';
 
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
 import { MetadataCardTestComponents } from '../../../../../../../../core/test-framework/core-test.helper';
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 5d5886c3bb..d124f0d47e 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,9 @@ 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 { CurrentUserPermissions } from '../../../../../../../../core/src/core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from '../../../../../../../../core/src/core/current-user-permissions.service';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../../core/src/core/permissions/current-user-permissions.service';
 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';
@@ -39,6 +40,7 @@ import {
   createSpaceQuotaDefinition,
 } from '../../../../../../features/cloud-foundry/services/cloud-foundry-organization.service';
 import { SpaceQuotaHelper } from '../../../../../../features/cloud-foundry/services/cloud-foundry-space-quota';
+import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-user-permissions-checkers';
 import { CfUserService } from '../../../../../data-services/cf-user.service';
 
 @Component({
@@ -87,7 +89,7 @@ export class CfSpaceCardComponent extends CardCell<APIResource<ISpace>> implemen
         label: 'Edit',
         action: this.edit,
         can: this.currentUserPermissionsService.can(
-          CurrentUserPermissions.SPACE_EDIT,
+          CfCurrentUserPermissions.SPACE_EDIT,
           this.cfEndpointService.cfGuid,
           this.orgGuid,
           this.spaceGuid
@@ -97,7 +99,7 @@ export class CfSpaceCardComponent extends CardCell<APIResource<ISpace>> implemen
         label: 'Delete',
         action: this.delete,
         can: this.currentUserPermissionsService.can(
-          CurrentUserPermissions.SPACE_DELETE,
+          CfCurrentUserPermissions.SPACE_DELETE,
           this.cfEndpointService.cfGuid,
           this.orgGuid
         )
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 87417ff379..27c5a13c81 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,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import { getRowMetadata } from '@stratos/store';
+import { getRowMetadata } from '@stratosui/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import {
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 d4b5816219..4a6e6068ac 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,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import { getRowMetadata } from '@stratos/store';
+import { getRowMetadata } from '@stratosui/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import {
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 a922ee27b8..83128b8b1c 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,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import { getRowMetadata } from '@stratos/store';
+import { getRowMetadata } from '@stratosui/store';
 
 import { GetAllOrganizationSpacesWithOrgs } from '../../../../../../../cloud-foundry/src/actions/organization.actions';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
@@ -9,7 +9,9 @@ import {
   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 {
+  CurrentUserPermissionsService,
+} from '../../../../../../../core/src/core/permissions/current-user-permissions.service';
 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/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 17f384dd8c..a65ce2cf84 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
@@ -3,14 +3,16 @@ import { BehaviorSubject } from 'rxjs';
 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 { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../core/src/core/permissions/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 { selectCfUsersRolesRoles } from '../../../../../store/selectors/cf-users-roles.selector';
+import { SpaceUserRoleNames } from '../../../../../store/types/cf-user.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';
 
@@ -75,7 +77,7 @@ export class CfUsersSpaceRolesListConfigService implements IListConfig<APIResour
   initialised = new BehaviorSubject<boolean>(false);
 
   constructor(private store: Store<CFAppState>, cfGuid: string, spaceGuid: string, userPerms: CurrentUserPermissionsService) {
-    this.store.select(selectUsersRolesRoles).pipe(
+    this.store.select(selectCfUsersRolesRoles).pipe(
       first()
     ).subscribe(newRoles => {
       this.dataSource = new CfUsersSpaceRolesDataSourceService(cfGuid, newRoles.orgGuid, spaceGuid, this.store, userPerms, this);
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 1f8f147977..4d11410056 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
@@ -6,11 +6,11 @@ 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 { 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';
+import { selectCfUsersRolesOrgGuid } from '../../../../../../store/selectors/cf-users-roles.selector';
 
 @Component({
   selector: 'app-table-cell-select-org',
@@ -43,7 +43,7 @@ export class TableCellSelectOrgComponent extends TableCellCustom<APIResource<IOr
         map(orgs => orgs && orgs.length === 1 ? orgs[0] : null)
       );
     }
-    this.orgGuidChangedSub = this.store.select(selectUsersRolesOrgGuid).subscribe(orgGuid => {
+    this.orgGuidChangedSub = this.store.select(selectCfUsersRolesOrgGuid).subscribe(orgGuid => {
       this.selectedOrgGuid = orgGuid;
     });
   }
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 f28255ba44..76825b3388 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
@@ -3,17 +3,13 @@ import { Store } from '@ngrx/store';
 import { combineLatest } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 
-import { RemoveUserRole } from '../../../../../../../../cloud-foundry/src/actions/users.actions';
+import { RemoveCfUserRole } from '../../../../../../../../cloud-foundry/src/actions/users.actions';
 import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
 import { organizationEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-types';
-import {
-  CfUser,
-  IUserPermissionInOrg,
-  OrgUserRoleNames,
-} 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 { arrayHelper } from '../../../../../../../../core/src/core/helper-classes/array.helper';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../../core/src/core/permissions/current-user-permissions.service';
 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';
@@ -21,6 +17,8 @@ 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 { CfUser, IUserPermissionInOrg, OrgUserRoleNames } from '../../../../../../store/types/cf-user.types';
+import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-user-permissions-checkers';
 import { CfUserService } from '../../../../../data-services/cf-user.service';
 import { CfPermissionCell, ICellPermissionList } from '../cf-permission-cell';
 
@@ -60,7 +58,7 @@ export class CfOrgPermissionCellComponent extends CfPermissionCell<OrgUserRoleNa
     row: APIResource<CfUser>,
     showName: boolean): ICellPermissionList<OrgUserRoleNames>[] {
     return getOrgRoles(orgPerms.permissions).map(perm => {
-      const updatingKey = RemoveUserRole.generateUpdatingKey(
+      const updatingKey = RemoveCfUserRole.generateUpdatingKey(
         perm.key,
         row.metadata.guid
       );
@@ -87,7 +85,7 @@ export class CfOrgPermissionCellComponent extends CfPermissionCell<OrgUserRoleNa
   }
 
   public removePermission(cellPermission: ICellPermissionList<OrgUserRoleNames>, updateConnectedUser: boolean) {
-    this.store.dispatch(new RemoveUserRole(
+    this.store.dispatch(new RemoveCfUserRole(
       this.cfUserService.activeRouteCfOrgSpace.cfGuid,
       cellPermission.userGuid,
       cellPermission.guid,
@@ -98,6 +96,6 @@ export class CfOrgPermissionCellComponent extends CfPermissionCell<OrgUserRoleNa
   }
 
   public canRemovePermission = (cfGuid: string, orgGuid: string, spaceGuid: string) =>
-    this.userPerms.can(CurrentUserPermissions.ORGANIZATION_CHANGE_ROLES, cfGuid, orgGuid)
+    this.userPerms.can(CfCurrentUserPermissions.ORGANIZATION_CHANGE_ROLES, cfGuid, orgGuid)
 
 }
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 8708f3cb6b..7c325a8325 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
@@ -4,7 +4,6 @@ import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
 import { filter, first, map, switchMap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { CfUser } from '../../../../../../../cloud-foundry/src/store/types/user.types';
 import { UserRoleLabels } from '../../../../../../../cloud-foundry/src/store/types/users-roles.types';
 import { AppChip } from '../../../../../../../core/src/shared/components/chips/chips.component';
 import { ConfirmationDialogConfig } from '../../../../../../../core/src/shared/components/confirmation-dialog.config';
@@ -13,6 +12,7 @@ import { TableCellCustom } from '../../../../../../../core/src/shared/components
 import { selectSessionData } from '../../../../../../../store/src/reducers/auth.reducer';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { IUserRole } from '../../../../../features/cloud-foundry/cf.helpers';
+import { CfUser } from '../../../../../store/types/cf-user.types';
 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 b03582d3f8..6aa867410f 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
@@ -3,24 +3,22 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import { filter, first, map, switchMap } from 'rxjs/operators';
 
-import { RemoveUserRole } from '../../../../../../../../cloud-foundry/src/actions/users.actions';
+import { RemoveCfUserRole } from '../../../../../../../../cloud-foundry/src/actions/users.actions';
 import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
 import { organizationEntityType, spaceEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-types';
 import { selectCfEntity } from '../../../../../../../../cloud-foundry/src/store/selectors/api.selectors';
-import {
-  CfUser,
-  IUserPermissionInSpace,
-  SpaceUserRoleNames,
-} 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 { arrayHelper } from '../../../../../../../../core/src/core/helper-classes/array.helper';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
 import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog';
 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 { CfUser, IUserPermissionInSpace, SpaceUserRoleNames } from '../../../../../../store/types/cf-user.types';
+import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-user-permissions-checkers';
 import { CfUserService } from '../../../../../data-services/cf-user.service';
 import { CfPermissionCell, ICellPermissionList } from '../cf-permission-cell';
 
@@ -116,7 +114,7 @@ export class CfSpacePermissionCellComponent extends CfPermissionCell<SpaceUserRo
 
   private getSpacePermissions(spacePerms: IUserPermissionInSpace, row: APIResource<CfUser>, isOrgLevel = true) {
     return getSpaceRoles(spacePerms.permissions).map(perm => {
-      const updatingKey = RemoveUserRole.generateUpdatingKey(
+      const updatingKey = RemoveCfUserRole.generateUpdatingKey(
         perm.key,
         row.metadata.guid
       );
@@ -144,7 +142,7 @@ export class CfSpacePermissionCellComponent extends CfPermissionCell<SpaceUserRo
   }
 
   public removePermission(cellPermission: ICellPermissionList<SpaceUserRoleNames>, updateConnectedUser: boolean) {
-    this.store.dispatch(new RemoveUserRole(
+    this.store.dispatch(new RemoveCfUserRole(
       this.cfUserService.activeRouteCfOrgSpace.cfGuid,
       cellPermission.userGuid,
       cellPermission.guid,
@@ -156,5 +154,5 @@ export class CfSpacePermissionCellComponent extends CfPermissionCell<SpaceUserRo
   }
 
   public canRemovePermission = (cfGuid: string, orgGuid: string, spaceGuid: string) =>
-    this.userPerms.can(CurrentUserPermissions.SPACE_CHANGE_ROLES, cfGuid, orgGuid, spaceGuid)
+    this.userPerms.can(CfCurrentUserPermissions.SPACE_CHANGE_ROLES, cfGuid, orgGuid, spaceGuid)
 }
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 73462af393..05d3b80147 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,9 +1,8 @@
 import { Store } from '@ngrx/store';
-import { getRowMetadata } from '@stratos/store';
+import { getRowMetadata } from '@stratosui/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { cfUserEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
-import { CfUser } from '../../../../../../../cloud-foundry/src/store/types/user.types';
 import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
@@ -11,6 +10,7 @@ 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 { CfUser } from '../../../../../store/types/cf-user.types';
 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/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 33f477573a..19f56eb01a 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
@@ -3,7 +3,9 @@ import { Router } from '@angular/router';
 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 {
+  CurrentUserPermissionsService,
+} from '../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
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 f070370166..23f7f500b9 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
@@ -4,11 +4,11 @@ import { BehaviorSubject, combineLatest, Observable, of as observableOf } from '
 import { filter, first, map, switchMap, tap } from 'rxjs/operators';
 
 import { UsersRolesSetUsers } from '../../../../../../../cloud-foundry/src/actions/users-roles.actions';
-import { GetAllUsersAsAdmin } from '../../../../../../../cloud-foundry/src/actions/users.actions';
+import { GetAllCfUsersAsAdmin } 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 { CurrentUserPermissionsChecker } from '../../../../../../../core/src/core/current-user-permissions.checker';
-import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { ITableColumn, ITableText } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
 import {
   IListAction,
@@ -33,6 +33,8 @@ import {
   hasSpaceRoleWithinOrg,
   waitForCFPermissions,
 } from '../../../../../features/cloud-foundry/cf.helpers';
+import { CfUser } from '../../../../../store/types/cf-user.types';
+import { CfUserPermissionsChecker } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import { CfUserService } from './../../../../data-services/cf-user.service';
 import { CfOrgPermissionCellComponent } from './cf-org-permission-cell/cf-org-permission-cell.component';
 import { CfSpacePermissionCellComponent } from './cf-space-permission-cell/cf-space-permission-cell.component';
@@ -235,7 +237,7 @@ export class CfUserListConfigService extends ListConfig<APIResource<CfUser>> {
         this.dataSource = new CfUserDataSourceService(store, action, this, userHasRoles);
 
         // Only show the filter (show users with/without roles) if the list of users can actually contain users without roles
-        if (GetAllUsersAsAdmin.is(action)) {
+        if (GetAllCfUsersAsAdmin.is(action)) {
           this.assignMultiConfig();
           this.initialiseMultiFilter(action);
         } else {
@@ -348,7 +350,7 @@ export class CfUserListConfigService extends ListConfig<APIResource<CfUser>> {
     this.activeRouteCfOrgSpace.cfGuid,
     this.activeRouteCfOrgSpace.orgGuid,
     this.activeRouteCfOrgSpace.orgGuid && !this.activeRouteCfOrgSpace.spaceGuid ?
-      CurrentUserPermissionsChecker.ALL_SPACES : this.activeRouteCfOrgSpace.spaceGuid)
+      CfUserPermissionsChecker.ALL_SPACES : this.activeRouteCfOrgSpace.spaceGuid)
 
   private createCanUpdateOrgRoles = () => canUpdateOrgSpaceRoles(
     this.userPerms,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-helpers.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-helpers.ts
index 058d2df2d2..e0c964ae23 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-helpers.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-helpers.ts
@@ -1,4 +1,4 @@
-import { CfUser } from '../../../../../../../cloud-foundry/src/store/types/user.types';
+import { CfUser } from '../../../../../store/types/cf-user.types';
 
 
 export const userListUserVisibleKey = 'showUsers';
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 6005c3711a..676cb211fc 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,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import { getRowMetadata } from '@stratos/store';
+import { getRowMetadata } from '@stratosui/store';
 
 import {
   createEntityRelationKey,
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 bd441ba537..b99fead8d1 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,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import { getRowMetadata } from '@stratos/store';
+import { getRowMetadata } from '@stratosui/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-instances/service-instances-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-instances/service-instances-list-config.service.ts
index 58637e424f..20878f7924 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-instances/service-instances-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-instances/service-instances-list-config.service.ts
@@ -3,7 +3,9 @@ import { Injectable } from '@angular/core';
 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 {
+  CurrentUserPermissionsService,
+} from '../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { ServicesService } from '../../../../../features/service-catalog/services.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/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 f659096dc7..785edf555b 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,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import { getRowMetadata } from '@stratos/store';
+import { getRowMetadata } from '@stratosui/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import {
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 0d82e721ec..649162074c 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,8 +4,9 @@ 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 { CurrentUserPermissions } from '../../../../../../../../core/src/core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from '../../../../../../../../core/src/core/current-user-permissions.service';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
 import {
   MetaCardMenuItem,
@@ -21,6 +22,7 @@ import {
   getServicePlanName,
   getServiceSummaryUrl,
 } from '../../../../../../features/service-catalog/services-helper';
+import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-user-permissions-checkers';
 import { ServiceActionHelperService } from '../../../../../data-services/service-action-helper.service';
 import { CfOrgSpaceLabelService } from '../../../../../services/cf-org-space-label.service';
 
@@ -48,7 +50,7 @@ export class ServiceInstanceCardComponent extends CardCell<APIResource<IServiceI
           label: 'Edit',
           action: this.edit,
           can: this.currentUserPermissionsService.can(
-            CurrentUserPermissions.SERVICE_INSTANCE_EDIT,
+            CfCurrentUserPermissions.SERVICE_INSTANCE_EDIT,
             this.serviceInstanceEntity.entity.cfGuid,
             this.serviceInstanceEntity.entity.space_guid
           )
@@ -58,7 +60,7 @@ export class ServiceInstanceCardComponent extends CardCell<APIResource<IServiceI
           action: this.detach,
           disabled: observableOf(this.serviceInstanceEntity.entity.service_bindings.length === 0),
           can: this.currentUserPermissionsService.can(
-            CurrentUserPermissions.SERVICE_INSTANCE_EDIT,
+            CfCurrentUserPermissions.SERVICE_INSTANCE_EDIT,
             this.serviceInstanceEntity.entity.cfGuid,
             this.serviceInstanceEntity.entity.space_guid
           )
@@ -67,7 +69,7 @@ export class ServiceInstanceCardComponent extends CardCell<APIResource<IServiceI
           label: 'Delete',
           action: this.delete,
           can: this.currentUserPermissionsService.can(
-            CurrentUserPermissions.SERVICE_INSTANCE_DELETE,
+            CfCurrentUserPermissions.SERVICE_INSTANCE_DELETE,
             this.serviceInstanceEntity.entity.cfGuid,
             this.serviceInstanceEntity.entity.space_guid
           )
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 0ee25d9179..a34e526b83 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,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import { getRowMetadata } from '@stratos/store';
+import { getRowMetadata } from '@stratosui/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { serviceInstancesEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-list-config.service.ts
index d03eb82ab7..f3a4c57132 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-list-config.service.ts
@@ -10,7 +10,9 @@ import {
   serviceInstancesEntityType,
   userProvidedServiceInstanceEntityType,
 } from '../../../../../../../cloud-foundry/src/cf-entity-types';
-import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import {
   CardMultiActionComponents,
 } from '../../../../../../../core/src/shared/components/list/list-cards/card.component.types';
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 886f8d976d..0b2fdcf274 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,8 +4,9 @@ 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 { CurrentUserPermissions } from '../../../../../../../../core/src/core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from '../../../../../../../../core/src/core/current-user-permissions.service';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
 import {
   MetaCardMenuItem,
@@ -15,6 +16,7 @@ import { ComponentEntityMonitorConfig } from '../../../../../../../../core/src/s
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { IUserProvidedServiceInstance } from '../../../../../../cf-api-svc.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
+import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-user-permissions-checkers';
 import { ServiceActionHelperService } from '../../../../../data-services/service-action-helper.service';
 import { CfOrgSpaceLabelService } from '../../../../../services/cf-org-space-label.service';
 
@@ -56,7 +58,7 @@ export class UserProvidedServiceInstanceCardComponent extends CardCell<APIResour
         label: 'Edit',
         action: this.edit,
         can: this.currentUserPermissionsService.can(
-          CurrentUserPermissions.SERVICE_INSTANCE_EDIT,
+          CfCurrentUserPermissions.SERVICE_INSTANCE_EDIT,
           this.serviceInstanceEntity.entity.cfGuid,
           this.serviceInstanceEntity.entity.space_guid
         )
@@ -66,7 +68,7 @@ export class UserProvidedServiceInstanceCardComponent extends CardCell<APIResour
         action: this.detach,
         disabled: observableOf(this.serviceInstanceEntity.entity.service_bindings.length === 0),
         can: this.currentUserPermissionsService.can(
-          CurrentUserPermissions.SERVICE_INSTANCE_EDIT,
+          CfCurrentUserPermissions.SERVICE_INSTANCE_EDIT,
           this.serviceInstanceEntity.entity.cfGuid,
           this.serviceInstanceEntity.entity.space_guid
         )
@@ -75,7 +77,7 @@ export class UserProvidedServiceInstanceCardComponent extends CardCell<APIResour
         label: 'Delete',
         action: this.delete,
         can: this.currentUserPermissionsService.can(
-          CurrentUserPermissions.SERVICE_INSTANCE_DELETE,
+          CfCurrentUserPermissions.SERVICE_INSTANCE_DELETE,
           this.serviceInstanceEntity.entity.cfGuid,
           this.serviceInstanceEntity.entity.space_guid
         )
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 75489373b1..e8ce2c3184 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
@@ -1,6 +1,5 @@
 import { Injectable, OnDestroy } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { endpointsCfEntitiesConnectedSelector } from 'frontend/packages/store/src/selectors/endpoint.selectors';
 import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs';
 import {
   distinctUntilChanged,
@@ -28,6 +27,7 @@ import { ResetPagination, SetParams } from '../../../../store/src/actions/pagina
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { getCurrentPageRequestInfo } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
+import { connectedEndpointsOfTypesSelector } from '../../../../store/src/selectors/endpoint.selectors';
 import { selectPaginationState } from '../../../../store/src/selectors/pagination.selectors';
 import { APIResource } from '../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
@@ -35,6 +35,7 @@ import { PaginatedAction, PaginationParam } from '../../../../store/src/types/pa
 import { IOrganization, ISpace } from '../../cf-api.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 {
@@ -221,7 +222,7 @@ export class CfOrgSpaceDataService implements OnDestroy {
   }
 
   private createCf() {
-    const list$ = this.store.select(endpointsCfEntitiesConnectedSelector).pipe(
+    const list$ = this.store.select(connectedEndpointsOfTypesSelector(CF_ENDPOINT_TYPE)).pipe(
       // Ensure we have endpoints
       filter(endpoints => endpoints && !!Object.keys(endpoints).length),
       publishReplay(1),
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 e96d52510c..30a0022d4b 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
@@ -7,15 +7,6 @@ import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
 import { cfUserEntityType, organizationEntityType, spaceEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
 import { createEntityRelationPaginationKey } from '../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { getCurrentUserCFGlobalStates } from '../../../../cloud-foundry/src/store/selectors/cf-current-user-role.selectors';
-import {
-  CfUser,
-  createUserRoleInOrg,
-  createUserRoleInSpace,
-  IUserPermissionInOrg,
-  IUserPermissionInSpace,
-  UserRoleInOrg,
-  UserRoleInSpace,
-} from '../../../../cloud-foundry/src/store/types/user.types';
 import {
   LocalPaginationHelpers,
 } from '../../../../core/src/shared/components/list/data-sources-controllers/local-list.helpers';
@@ -48,6 +39,15 @@ import {
   waitForCFPermissions,
 } from '../../features/cloud-foundry/cf.helpers';
 import { selectCfPaginationState } from '../../store/selectors/pagination.selectors';
+import {
+  CfUser,
+  createUserRoleInOrg,
+  createUserRoleInSpace,
+  IUserPermissionInOrg,
+  IUserPermissionInSpace,
+  UserRoleInOrg,
+  UserRoleInSpace,
+} from '../../store/types/cf-user.types';
 
 @Injectable()
 export class CfUserService {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/github-scm.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/github-scm.ts
index 476eded13e..5c6180fb38 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/github-scm.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/github-scm.ts
@@ -78,4 +78,8 @@ export class GitHubSCM implements GitSCM {
     );
   }
 
+  public convertCommit(projectName: string, commit: any): GitCommit {
+    return commit;
+  }
+
 }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/gitlab-scm.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/gitlab-scm.ts
index dacdc76916..0d6b210764 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/gitlab-scm.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/gitlab-scm.ts
@@ -134,7 +134,7 @@ export class GitLabSCM implements GitSCM {
     };
   }
 
-  private convertCommit(projectName: string, commit: any): GitCommit {
+  public convertCommit(projectName: string, commit: any): GitCommit {
     const emailMD5 = Md5.hashStr(commit.author_email);
     const avatarURL = `https://secure.gravatar.com/avatar/${emailMD5}?s=120&d=identicon`;
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/scm.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/scm.ts
index 27aab218dd..af4d83f7cc 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/scm.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/scm.ts
@@ -18,6 +18,7 @@ export interface GitSCM {
   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>;
+  convertCommit(projectName: string, commit: any): GitCommit
   getCommits(httpClient: HttpClient, projectName: string, commitSha: string): Observable<GitCommit[]>;
   getCloneURL(projectName: string): string;
   getCommitURL(projectName: string, commitSha: string): string;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/directives/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
index d19c066a77..51a8e0ee13 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/directives/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
@@ -5,7 +5,7 @@ import { inject, TestBed } from '@angular/core/testing';
 import { MatDialogModule } from '@angular/material/dialog';
 import { RouterTestingModule } from '@angular/router/testing';
 import { Store } from '@ngrx/store';
-import { createBasicStoreModule } from '@stratos/store/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreModule } from '../../../../../core/src/core/core.module';
 import { ExtensionService } from '../../../../../core/src/core/extension/extension-service';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/directives/cf-user-permission/cf-user-permission.directive.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/directives/cf-user-permission/cf-user-permission.directive.spec.ts
new file mode 100644
index 0000000000..f5eb80d06d
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/directives/cf-user-permission/cf-user-permission.directive.spec.ts
@@ -0,0 +1,34 @@
+import { Component, TemplateRef } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { BaseTestModules } from '../../../../../core/test-framework/core-test.helper';
+
+
+@Component({
+  template: `<input type="text" appCfUserPermission>`
+})
+class TestUserPermissionComponent {
+}
+
+class MockTemplateRef { }
+
+describe('CfUserPermissionDirective', () => {
+  let component: TestUserPermissionComponent;
+  let fixture: ComponentFixture<TestUserPermissionComponent>;
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        ...BaseTestModules
+      ],
+      providers: [
+        { provide: TemplateRef, useClass: MockTemplateRef },
+      ],
+      declarations: [TestUserPermissionComponent]
+    });
+    fixture = TestBed.createComponent(TestUserPermissionComponent);
+    component = fixture.componentInstance;
+  });
+  it('should create an instance', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/cloud-foundry/src/shared/directives/cf-user-permission/cf-user-permission.directive.ts b/src/frontend/packages/cloud-foundry/src/shared/directives/cf-user-permission/cf-user-permission.directive.ts
new file mode 100644
index 0000000000..283767d5f4
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/directives/cf-user-permission/cf-user-permission.directive.ts
@@ -0,0 +1,80 @@
+import { Directive, Input, OnDestroy, OnInit, TemplateRef, ViewContainerRef } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Observable, of as observableOf, Subscription } from 'rxjs';
+import { switchMap } from 'rxjs/operators';
+
+import { CurrentUserPermissionsService } from '../../../../../core/src/core/permissions/current-user-permissions.service';
+import { AppState } from '../../../../../store/src/app-state';
+import { waitForCFPermissions } from '../../../features/cloud-foundry/cf.helpers';
+import { CfCurrentUserPermissions } from '../../../user-permissions/cf-user-permissions-checkers';
+
+@Directive({
+  selector: '[appCfUserPermission]'
+})
+export class CfUserPermissionDirective implements OnDestroy, OnInit {
+  @Input()
+  public appCfUserPermission: CfCurrentUserPermissions;
+
+  @Input()
+  public appCfUserPermissionEndpointGuid: string;
+
+  @Input()
+  private appCfUserPermissionOrganizationGuid: string;
+
+  @Input()
+  private appCfUserPermissionSpaceGuid: string;
+
+  private canSub: Subscription;
+
+  constructor(
+    private store: Store<AppState>,
+    private templateRef: TemplateRef<any>,
+    private viewContainer: ViewContainerRef,
+    private currentUserPermissionsService: CurrentUserPermissionsService,
+  ) { }
+
+  public ngOnInit() {
+    this.canSub = this.waitForEndpointPermissions(this.appCfUserPermissionEndpointGuid).pipe(
+      switchMap(() => this.currentUserPermissionsService.can(
+        this.appCfUserPermission,
+        this.appCfUserPermissionEndpointGuid,
+        this.getOrgOrSpaceGuid(),
+        this.getSpaceGuid()
+      ))
+    ).subscribe(
+      can => {
+        if (can) {
+          this.viewContainer.createEmbeddedView(this.templateRef);
+        } else {
+          this.viewContainer.clear();
+        }
+      }
+    );
+  }
+
+  private waitForEndpointPermissions(endpointGuid: string): Observable<any> {
+    return endpointGuid && endpointGuid.length > 0 ? waitForCFPermissions(this.store, endpointGuid) : observableOf(true);
+  }
+
+  public ngOnDestroy() {
+    if (this.canSub) {
+      this.canSub.unsubscribe();
+    }
+  }
+
+  private getOrgOrSpaceGuid() {
+    if (this.appCfUserPermissionSpaceGuid && !this.appCfUserPermissionOrganizationGuid) {
+      return this.appCfUserPermissionSpaceGuid;
+    }
+    return this.appCfUserPermissionOrganizationGuid;
+  }
+
+  private getSpaceGuid() {
+    if (this.appCfUserPermissionOrganizationGuid) {
+      return this.appCfUserPermissionSpaceGuid;
+    }
+    return null;
+  }
+
+
+}
diff --git a/src/frontend/packages/core/src/core/current-user-permissions.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/services/current-user-permissions.service.spec.ts
similarity index 62%
rename from src/frontend/packages/core/src/core/current-user-permissions.service.spec.ts
rename to src/frontend/packages/cloud-foundry/src/shared/services/current-user-permissions.service.spec.ts
index 3e4184df98..99dcb96deb 100644
--- a/src/frontend/packages/core/src/core/current-user-permissions.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/services/current-user-permissions.service.spec.ts
@@ -1,33 +1,34 @@
 import { TestBed } from '@angular/core/testing';
-import { createBasicStoreModule, createEntityStoreState, TestStoreEntity } from '@stratos/store/testing';
+import { createBasicStoreModule, createEntityStoreState, TestStoreEntity } from '@stratosui/store/testing';
 import { first, tap } from 'rxjs/operators';
 
-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';
-import { AppState } from '../../../store/src/app-state';
-import { EntityCatalogTestModule, TEST_CATALOGUE_ENTITIES } from '../../../store/src/entity-catalog-test.module';
-import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types';
-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, 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';
 import {
-  CurrentUserPermissions,
-  PermissionConfig,
-  PermissionStrings,
-  PermissionTypes,
-  ScopeStrings,
-} from './current-user-permissions.config';
-import { CurrentUserPermissionsService } from './current-user-permissions.service';
+  CfCurrentUserPermissions,
+  cfCurrentUserPermissionsService,
+  CfPermissionTypes,
+  CfScopeStrings,
+} from '../../../../cloud-foundry/src/user-permissions/cf-user-permissions-checkers';
+import { endpointEntitySchema } from '../../../../core/src/base-entity-schemas';
+import { generateStratosEntities } from '../../../../core/src/base-entity-types';
+import { PermissionConfig } from '../../../../core/src/core/permissions/current-user-permissions.config';
+import { CurrentUserPermissionsService } from '../../../../core/src/core/permissions/current-user-permissions.service';
+import { StratosScopeStrings } from '../../../../core/src/core/permissions/stratos-user-permissions.checker';
+import { AppTestModule } from '../../../../core/test-framework/core-test.helper';
+import { AppState } from '../../../../store/src/app-state';
+import { EntityCatalogTestModule, TEST_CATALOGUE_ENTITIES } from '../../../../store/src/entity-catalog-test.module';
+import { EntityCatalogEntityConfig } from '../../../../store/src/entity-catalog/entity-catalog.types';
+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';
 
 const ffSchema = cfEntityFactory(featureFlagEntityType);
 
-describe('CurrentUserPermissionsService', () => {
+describe('CurrentUserPermissionsService with CF checker', () => {
   let service: CurrentUserPermissionsService;
 
 
@@ -58,9 +59,9 @@ describe('CurrentUserPermissionsService', () => {
           name: 'nathan',
           admin: false,
           scopes: [
-            ScopeStrings.CF_WRITE_SCOPE,
-            ScopeStrings.STRATOS_CHANGE_PASSWORD,
-            ScopeStrings.CF_READ_SCOPE,
+            CfScopeStrings.CF_WRITE_SCOPE,
+            StratosScopeStrings.STRATOS_CHANGE_PASSWORD,
+            CfScopeStrings.CF_READ_SCOPE,
           ]
         },
         metricsAvailable: false,
@@ -92,13 +93,13 @@ describe('CurrentUserPermissionsService', () => {
           name: 'admin',
           admin: true,
           scopes: [
-            ScopeStrings.CF_WRITE_SCOPE,
-            ScopeStrings.STRATOS_CHANGE_PASSWORD,
-            ScopeStrings.CF_READ_SCOPE,
-            ScopeStrings.CF_ADMIN_GROUP,
-            ScopeStrings.CF_READ_ONLY_ADMIN_GROUP,
-            ScopeStrings.CF_ADMIN_GLOBAL_AUDITOR_GROUP,
-            ScopeStrings.SCIM_READ
+            CfScopeStrings.CF_WRITE_SCOPE,
+            StratosScopeStrings.STRATOS_CHANGE_PASSWORD,
+            CfScopeStrings.CF_READ_SCOPE,
+            CfScopeStrings.CF_ADMIN_GROUP,
+            CfScopeStrings.CF_READ_ONLY_ADMIN_GROUP,
+            CfScopeStrings.CF_ADMIN_GLOBAL_AUDITOR_GROUP,
+            StratosScopeStrings.SCIM_READ
           ]
         },
         metricsAvailable: false,
@@ -607,291 +608,292 @@ describe('CurrentUserPermissionsService', () => {
       currentUserRoles: {
         internal: {
           isAdmin: false,
-
           scopes: [
-            ScopeStrings.CF_ADMIN_GROUP,
-            ScopeStrings.CF_READ_ONLY_ADMIN_GROUP,
-            ScopeStrings.CF_ADMIN_GLOBAL_AUDITOR_GROUP,
-            ScopeStrings.CF_WRITE_SCOPE,
-            ScopeStrings.CF_READ_SCOPE,
-            ScopeStrings.STRATOS_CHANGE_PASSWORD,
-            ScopeStrings.SCIM_READ
+            // CfScopeStrings.CF_ADMIN_GROUP,
+            // CfScopeStrings.CF_READ_ONLY_ADMIN_GROUP,
+            // CfScopeStrings.CF_ADMIN_GLOBAL_AUDITOR_GROUP,
+            // CfScopeStrings.CF_WRITE_SCOPE,
+            // CfScopeStrings.CF_READ_SCOPE,
+            StratosScopeStrings.STRATOS_CHANGE_PASSWORD,
+            StratosScopeStrings.SCIM_READ
           ],
         },
-        cf: {
-          '0e934dc8-7ad4-40ff-b85c-53c1b61d2abb': {
-            global: {
-              isAdmin: false,
-              isReadOnlyAdmin: false,
-              isGlobalAuditor: false,
-              canRead: true,
-              canWrite: true,
-              scopes: [
-                'cloud_controller.read',
-                'password.write',
-                'cloud_controller.write',
-                'openid',
-                'uaa.user'
-              ]
-            },
-            spaces: {
-              '56eb5ecc-7c96-4bb1-bdcc-0c6c3d444dc6': {
-                orgId: 'abc',
-                isManager: true,
-                isAuditor: false,
-                isDeveloper: true
-              }
-            },
-            organizations: {
-              'd5e50b05-497f-4b3b-9658-a396a592a8ba': {
-                isManager: false,
-                isAuditor: false,
-                isBillingManager: false,
-                isUser: true,
-                spaceGuids: []
+        endpoints: {
+          cf: {
+            '0e934dc8-7ad4-40ff-b85c-53c1b61d2abb': {
+              global: {
+                isAdmin: false,
+                isReadOnlyAdmin: false,
+                isGlobalAuditor: false,
+                canRead: true,
+                canWrite: true,
+                scopes: [
+                  'cloud_controller.read',
+                  'password.write',
+                  'cloud_controller.write',
+                  'openid',
+                  'uaa.user'
+                ]
               },
-              'c58e7cfd-c765-400a-a473-313fa572d5c4': {
-                isManager: false,
-                isAuditor: false,
-                isBillingManager: false,
-                isUser: true,
-                spaceGuids: []
-              }
-            },
-            state: {
-              initialised: true,
-              fetching: false,
-              error: null
-            }
-          },
-          'c80420ca-204b-4879-bf69-b6b7a202ad87': {
-            global: {
-              isAdmin: false,
-              isReadOnlyAdmin: false,
-              isGlobalAuditor: false,
-              canRead: true,
-              canWrite: true,
-              scopes: [
-                'openid',
-                'scim.read',
-                'cloud_controller.admin',
-                'uaa.user',
-                'routing.router_groups.read',
-                'cloud_controller.read',
-                'password.write',
-                'cloud_controller.write',
-                'doppler.firehose',
-                'scim.write'
-              ]
-            },
-            spaces: {
-              '56eb5ecc-7c96-4bb1-bdcc-0c6c3d444dc6': {
-                isManager: true,
-                isAuditor: false,
-                isDeveloper: true,
-                orgId: 'abc'
+              spaces: {
+                '56eb5ecc-7c96-4bb1-bdcc-0c6c3d444dc6': {
+                  orgId: 'abc',
+                  isManager: true,
+                  isAuditor: false,
+                  isDeveloper: true
+                }
               },
-              'c6450a21-aa1a-4643-9437-035cc818ea72': {
-                isManager: true,
-                isAuditor: false,
-                isDeveloper: true,
-                orgId: 'abc'
+              organizations: {
+                'd5e50b05-497f-4b3b-9658-a396a592a8ba': {
+                  isManager: false,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                },
+                'c58e7cfd-c765-400a-a473-313fa572d5c4': {
+                  isManager: false,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                }
               },
-              '86577124-4b64-4ca1-9a78-d904c60505c4': {
-                isManager: true,
-                isAuditor: false,
-                isDeveloper: true,
-                orgId: 'abc'
+              state: {
+                initialised: true,
+                fetching: false,
+                error: null
               }
             },
-            organizations: {
-              '367a49c1-b5dc-44e6-a8cf-84b1f56426a7': {
-                isManager: true,
-                isAuditor: false,
-                isBillingManager: false,
-                isUser: true,
-                spaceGuids: []
-              },
-              'dccfedde-be2c-46a6-99cf-c1320ea8cb6d': {
-                isManager: true,
-                isAuditor: false,
-                isBillingManager: false,
-                isUser: true,
-                spaceGuids: []
-              },
-              '8a175cad-ff61-436b-8c6f-e5beb13edb5f': {
-                isManager: true,
-                isAuditor: false,
-                isBillingManager: false,
-                isUser: true,
-                spaceGuids: []
+            'c80420ca-204b-4879-bf69-b6b7a202ad87': {
+              global: {
+                isAdmin: false,
+                isReadOnlyAdmin: false,
+                isGlobalAuditor: false,
+                canRead: true,
+                canWrite: true,
+                scopes: [
+                  'openid',
+                  'scim.read',
+                  'cloud_controller.admin',
+                  'uaa.user',
+                  'routing.router_groups.read',
+                  'cloud_controller.read',
+                  'password.write',
+                  'cloud_controller.write',
+                  'doppler.firehose',
+                  'scim.write'
+                ]
               },
-              'd5246255-867b-4f62-9040-346f113f0b7d': {
-                isManager: true,
-                isAuditor: false,
-                isBillingManager: false,
-                isUser: true,
-                spaceGuids: []
-              }
-            },
-            state: {
-              initialised: true,
-              fetching: false,
-              error: null
-            }
-          },
-          READ_ONLY_ADMIN: {
-            global: {
-              isAdmin: false,
-              isReadOnlyAdmin: true,
-              isGlobalAuditor: false,
-              canRead: true,
-              canWrite: true,
-              scopes: [
-                'openid',
-                'scim.read',
-                'cloud_controller.admin',
-                'uaa.user',
-                'routing.router_groups.read',
-                'cloud_controller.read',
-                'password.write',
-                'cloud_controller.write',
-                'doppler.firehose',
-                'scim.write'
-              ]
-            },
-            spaces: {
-              '56eb5ecc-7c96-4bb1-bdcc-0c6c3d444dc6': {
-                orgId: 'abc',
-                isManager: true,
-                isAuditor: false,
-                isDeveloper: true
+              spaces: {
+                '56eb5ecc-7c96-4bb1-bdcc-0c6c3d444dc6': {
+                  isManager: true,
+                  isAuditor: false,
+                  isDeveloper: true,
+                  orgId: 'abc'
+                },
+                'c6450a21-aa1a-4643-9437-035cc818ea72': {
+                  isManager: true,
+                  isAuditor: false,
+                  isDeveloper: true,
+                  orgId: 'abc'
+                },
+                '86577124-4b64-4ca1-9a78-d904c60505c4': {
+                  isManager: true,
+                  isAuditor: false,
+                  isDeveloper: true,
+                  orgId: 'abc'
+                }
               },
-              'c6450a21-aa1a-4643-9437-035cc818ea72': {
-                orgId: 'abc',
-                isManager: true,
-                isAuditor: false,
-                isDeveloper: true
+              organizations: {
+                '367a49c1-b5dc-44e6-a8cf-84b1f56426a7': {
+                  isManager: true,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                },
+                'dccfedde-be2c-46a6-99cf-c1320ea8cb6d': {
+                  isManager: true,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                },
+                '8a175cad-ff61-436b-8c6f-e5beb13edb5f': {
+                  isManager: true,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                },
+                'd5246255-867b-4f62-9040-346f113f0b7d': {
+                  isManager: true,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                }
               },
-              '86577124-4b64-4ca1-9a78-d904c60505c4': {
-                orgId: 'abc',
-                isManager: true,
-                isAuditor: false,
-                isDeveloper: true
+              state: {
+                initialised: true,
+                fetching: false,
+                error: null
               }
             },
-            organizations: {
-              '367a49c1-b5dc-44e6-a8cf-84b1f56426a7': {
-                isManager: true,
-                isAuditor: false,
-                isBillingManager: false,
-                isUser: true,
-                spaceGuids: []
+            READ_ONLY_ADMIN: {
+              global: {
+                isAdmin: false,
+                isReadOnlyAdmin: true,
+                isGlobalAuditor: false,
+                canRead: true,
+                canWrite: true,
+                scopes: [
+                  'openid',
+                  'scim.read',
+                  'cloud_controller.admin',
+                  'uaa.user',
+                  'routing.router_groups.read',
+                  'cloud_controller.read',
+                  'password.write',
+                  'cloud_controller.write',
+                  'doppler.firehose',
+                  'scim.write'
+                ]
               },
-              'dccfedde-be2c-46a6-99cf-c1320ea8cb6d': {
-                isManager: true,
-                isAuditor: false,
-                isBillingManager: false,
-                isUser: true,
-                spaceGuids: []
+              spaces: {
+                '56eb5ecc-7c96-4bb1-bdcc-0c6c3d444dc6': {
+                  orgId: 'abc',
+                  isManager: true,
+                  isAuditor: false,
+                  isDeveloper: true
+                },
+                'c6450a21-aa1a-4643-9437-035cc818ea72': {
+                  orgId: 'abc',
+                  isManager: true,
+                  isAuditor: false,
+                  isDeveloper: true
+                },
+                '86577124-4b64-4ca1-9a78-d904c60505c4': {
+                  orgId: 'abc',
+                  isManager: true,
+                  isAuditor: false,
+                  isDeveloper: true
+                }
               },
-              '8a175cad-ff61-436b-8c6f-e5beb13edb5f': {
-                isManager: true,
-                isAuditor: false,
-                isBillingManager: false,
-                isUser: true,
-                spaceGuids: []
+              organizations: {
+                '367a49c1-b5dc-44e6-a8cf-84b1f56426a7': {
+                  isManager: true,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                },
+                'dccfedde-be2c-46a6-99cf-c1320ea8cb6d': {
+                  isManager: true,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                },
+                '8a175cad-ff61-436b-8c6f-e5beb13edb5f': {
+                  isManager: true,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                },
+                'd5246255-867b-4f62-9040-346f113f0b7d': {
+                  isManager: true,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                }
               },
-              'd5246255-867b-4f62-9040-346f113f0b7d': {
-                isManager: true,
-                isAuditor: false,
-                isBillingManager: false,
-                isUser: true,
-                spaceGuids: []
+              state: {
+                initialised: true,
+                fetching: false,
+                error: null
               }
             },
-            state: {
-              initialised: true,
-              fetching: false,
-              error: null
-            }
-          },
-          READ_ONLY_USER: {
-            global: {
-              isAdmin: false,
-              isReadOnlyAdmin: false,
-              isGlobalAuditor: false,
-              canRead: true,
-              canWrite: false,
-              scopes: [
-                'openid',
-                'scim.read',
-                'cloud_controller.admin',
-                'uaa.user',
-                'routing.router_groups.read',
-                'cloud_controller.read',
-                'password.write',
-                'cloud_controller.write',
-                'doppler.firehose',
-                'scim.write'
-              ]
-            },
-            spaces: {
-              '56eb5ecc-7c96-4bb1-bdcc-0c6c3d444dc6': {
-                isManager: true,
-                isAuditor: false,
-                isDeveloper: true,
-                orgId: 'abc'
+            READ_ONLY_USER: {
+              global: {
+                isAdmin: false,
+                isReadOnlyAdmin: false,
+                isGlobalAuditor: false,
+                canRead: true,
+                canWrite: false,
+                scopes: [
+                  'openid',
+                  'scim.read',
+                  'cloud_controller.admin',
+                  'uaa.user',
+                  'routing.router_groups.read',
+                  'cloud_controller.read',
+                  'password.write',
+                  'cloud_controller.write',
+                  'doppler.firehose',
+                  'scim.write'
+                ]
               },
-              'c6450a21-aa1a-4643-9437-035cc818ea72': {
-                isManager: true,
-                isAuditor: false,
-                isDeveloper: true,
-                orgId: 'abc'
-              },
-              '86577124-4b64-4ca1-9a78-d904c60505c4': {
-                isManager: true,
-                isAuditor: false,
-                isDeveloper: true,
-                orgId: 'abc'
-              }
-            },
-            organizations: {
-              '367a49c1-b5dc-44e6-a8cf-84b1f56426a7': {
-                isManager: true,
-                isAuditor: false,
-                isBillingManager: false,
-                isUser: true,
-                spaceGuids: []
+              spaces: {
+                '56eb5ecc-7c96-4bb1-bdcc-0c6c3d444dc6': {
+                  isManager: true,
+                  isAuditor: false,
+                  isDeveloper: true,
+                  orgId: 'abc'
+                },
+                'c6450a21-aa1a-4643-9437-035cc818ea72': {
+                  isManager: true,
+                  isAuditor: false,
+                  isDeveloper: true,
+                  orgId: 'abc'
+                },
+                '86577124-4b64-4ca1-9a78-d904c60505c4': {
+                  isManager: true,
+                  isAuditor: false,
+                  isDeveloper: true,
+                  orgId: 'abc'
+                }
               },
-              'dccfedde-be2c-46a6-99cf-c1320ea8cb6d': {
-                isManager: true,
-                isAuditor: false,
-                isBillingManager: false,
-                isUser: true,
-                spaceGuids: []
+              organizations: {
+                '367a49c1-b5dc-44e6-a8cf-84b1f56426a7': {
+                  isManager: true,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                },
+                'dccfedde-be2c-46a6-99cf-c1320ea8cb6d': {
+                  isManager: true,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                },
+                '8a175cad-ff61-436b-8c6f-e5beb13edb5f': {
+                  isManager: true,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                },
+                'd5246255-867b-4f62-9040-346f113f0b7d': {
+                  isManager: true,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                }
               },
-              '8a175cad-ff61-436b-8c6f-e5beb13edb5f': {
-                isManager: true,
-                isAuditor: false,
-                isBillingManager: false,
-                isUser: true,
-                spaceGuids: []
-              },
-              'd5246255-867b-4f62-9040-346f113f0b7d': {
-                isManager: true,
-                isAuditor: false,
-                isBillingManager: false,
-                isUser: true,
-                spaceGuids: []
+              state: {
+                initialised: true,
+                fetching: false,
+                error: null
               }
-            },
-            state: {
-              initialised: true,
-              fetching: false,
-              error: null
             }
-          }
+          },
         },
         state: {
           initialised: true,
@@ -913,7 +915,7 @@ describe('CurrentUserPermissionsService', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       providers: [
-        CurrentUserPermissionsService,
+        ...cfCurrentUserPermissionsService
       ],
       imports: [
         {
@@ -928,7 +930,7 @@ describe('CurrentUserPermissionsService', () => {
           ]
         },
         createBasicStoreModule(createStoreState()),
-        AppTestModule
+        AppTestModule,
       ],
 
     });
@@ -940,7 +942,7 @@ describe('CurrentUserPermissionsService', () => {
   });
 
   it('should allow create application', done => {
-    service.can(CurrentUserPermissions.APPLICATION_CREATE).pipe(
+    service.can(CfCurrentUserPermissions.APPLICATION_CREATE).pipe(
       tap(can => {
         expect(can).toBe(true);
         done();
@@ -950,7 +952,7 @@ describe('CurrentUserPermissionsService', () => {
   });
 
   it('should allow create application for single endpoint with access', done => {
-    service.can(CurrentUserPermissions.APPLICATION_CREATE, '0e934dc8-7ad4-40ff-b85c-53c1b61d2abb').pipe(
+    service.can(CfCurrentUserPermissions.APPLICATION_CREATE, '0e934dc8-7ad4-40ff-b85c-53c1b61d2abb').pipe(
       tap(can => {
         expect(can).toBe(true);
         done();
@@ -961,7 +963,7 @@ describe('CurrentUserPermissionsService', () => {
 
   it('should allow create application for single endpoint with access and org/space', done => {
     service.can(
-      CurrentUserPermissions.APPLICATION_CREATE,
+      CfCurrentUserPermissions.APPLICATION_CREATE,
       'c80420ca-204b-4879-bf69-b6b7a202ad87',
       '86577124-4b64-4ca1-9a78-d904c60505c4'
     ).pipe(
@@ -975,7 +977,7 @@ describe('CurrentUserPermissionsService', () => {
 
   it('should allow if feature flag', done => {
     service.can(
-      [new PermissionConfig(PermissionTypes.FEATURE_FLAG, CFFeatureFlagTypes.private_domain_creation)]
+      [new PermissionConfig(CfPermissionTypes.FEATURE_FLAG, CFFeatureFlagTypes.private_domain_creation)]
     ).pipe(
       tap(can => {
         expect(can).toBe(true);
@@ -987,7 +989,7 @@ describe('CurrentUserPermissionsService', () => {
 
   it('should allow if feature flag with cf', done => {
     service.can(
-      [new PermissionConfig(PermissionTypes.FEATURE_FLAG, CFFeatureFlagTypes.private_domain_creation)],
+      [new PermissionConfig(CfPermissionTypes.FEATURE_FLAG, CFFeatureFlagTypes.private_domain_creation)],
       'c80420ca-204b-4879-bf69-b6b7a202ad87'
     ).pipe(
       tap(can => {
@@ -1000,7 +1002,7 @@ describe('CurrentUserPermissionsService', () => {
 
   it('should not allow if no feature flag', done => {
     service.can(
-      [new PermissionConfig(PermissionTypes.FEATURE_FLAG, CFFeatureFlagTypes.user_org_creation)],
+      [new PermissionConfig(CfPermissionTypes.FEATURE_FLAG, CFFeatureFlagTypes.user_org_creation)],
       'c80420ca-204b-4879-bf69-b6b7a202ad87'
     ).pipe(
       tap(can => {
@@ -1011,36 +1013,9 @@ describe('CurrentUserPermissionsService', () => {
     ).subscribe();
   });
 
-  it('should allow if stratos admin', done => {
-    service.can(new PermissionConfig(PermissionTypes.STRATOS, PermissionStrings.STRATOS_ADMIN)).pipe(
-      tap(can => {
-        expect(can).toBe(false);
-        done();
-      }),
-      first()
-    ).subscribe();
-  });
-
-  it('should allow if has stratos change password scope', done => {
-    service.can(new PermissionConfig(PermissionTypes.STRATOS_SCOPE, ScopeStrings.STRATOS_CHANGE_PASSWORD)).pipe(
-      tap(can => {
-        expect(can).toBe(true);
-        done();
-      }),
-      first()
-    ).subscribe();
-
-    service.can([new PermissionConfig(PermissionTypes.STRATOS_SCOPE, ScopeStrings.STRATOS_CHANGE_PASSWORD)]).pipe(
-      tap(can => {
-        expect(can).toBe(true);
-        done();
-      }),
-      first()
-    ).subscribe();
-  });
 
   it('should allow if has endpoint scope', done => {
-    service.can(new PermissionConfig(PermissionTypes.ENDPOINT_SCOPE, ScopeStrings.SCIM_READ), 'c80420ca-204b-4879-bf69-b6b7a202ad87').pipe(
+    service.can(new PermissionConfig(CfPermissionTypes.ENDPOINT_SCOPE, StratosScopeStrings.SCIM_READ), 'c80420ca-204b-4879-bf69-b6b7a202ad87').pipe(
       tap(can => {
         expect(can).toBe(true);
         done();
@@ -1050,7 +1025,7 @@ describe('CurrentUserPermissionsService', () => {
   });
 
   it('should not allow if has endpoint scope', done => {
-    service.can(new PermissionConfig(PermissionTypes.ENDPOINT_SCOPE, ScopeStrings.SCIM_READ), '0e934dc8-7ad4-40ff-b85c-53c1b61d2abb').pipe(
+    service.can(new PermissionConfig(CfPermissionTypes.ENDPOINT_SCOPE, StratosScopeStrings.SCIM_READ), '0e934dc8-7ad4-40ff-b85c-53c1b61d2abb').pipe(
       tap(can => {
         expect(can).toBe(false);
         done();
@@ -1061,7 +1036,7 @@ describe('CurrentUserPermissionsService', () => {
 
   it('should not allow if read only admin', done => {
     service.can(
-      CurrentUserPermissions.APPLICATION_CREATE,
+      CfCurrentUserPermissions.APPLICATION_CREATE,
       'READ_ONLY_ADMIN',
       'c6450a21-aa1a-4643-9437-035cc818ea72'
     ).pipe(
@@ -1075,7 +1050,7 @@ describe('CurrentUserPermissionsService', () => {
 
   it('should not allow if read only user', done => {
     service.can(
-      CurrentUserPermissions.APPLICATION_CREATE,
+      CfCurrentUserPermissions.APPLICATION_CREATE,
       'READ_ONLY_USER',
       'c6450a21-aa1a-4643-9437-035cc818ea72'
     ).pipe(
diff --git a/src/frontend/packages/cloud-foundry/src/store/cloud-foundry.reducers.module.ts b/src/frontend/packages/cloud-foundry/src/store/cloud-foundry.reducers.module.ts
index 6d13912909..71da36d84f 100644
--- a/src/frontend/packages/cloud-foundry/src/store/cloud-foundry.reducers.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/cloud-foundry.reducers.module.ts
@@ -1,15 +1,17 @@
 import { NgModule } from '@angular/core';
 import { StoreModule } from '@ngrx/store';
+
+import { cfUsersRolesReducer } from './reducers/cf-users-roles.reducer';
 import { createAppReducer } from './reducers/create-application.reducer';
-import { deployAppReducer } from './reducers/deploy-app.reducer';
 import { createServiceInstanceReducer } from './reducers/create-service-instance.reducer';
-import { UsersRolesReducer } from './reducers/users-roles.reducer';
+import { deployAppReducer } from './reducers/deploy-app.reducer';
+
 @NgModule({
   imports: [
     StoreModule.forFeature('createApplication', createAppReducer),
     StoreModule.forFeature('deployApplication', deployAppReducer),
     StoreModule.forFeature('createServiceInstance', createServiceInstanceReducer),
-    StoreModule.forFeature('manageUsersRoles', UsersRolesReducer),
+    StoreModule.forFeature('manageUsersRoles', cfUsersRolesReducer),
   ]
 })
 export class CloudFoundryReducersModule { }
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 cf172535cb..f2c9b707bd 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
@@ -8,11 +8,11 @@ import { CloudFoundryEffects } from './effects/cloud-foundry.effects';
 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';
 import { UpdateAppEffects } from './effects/update-app-effects';
+import { UsersRolesEffects } from './effects/users-roles.effects';
 
 @NgModule({
   imports: [
@@ -24,12 +24,11 @@ import { UpdateAppEffects } from './effects/update-app-effects';
       GithubEffects,
       CloudFoundryEffects,
       RouteEffect,
-      PermissionsEffects,
-      PermissionEffects,
       ServiceInstanceEffects,
       AppEffects,
       UpdateAppEffects,
-      CfValidateEffects
+      CfValidateEffects,
+      UsersRolesEffects
     ])
   ]
 })
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 60657b138d..76926a21da 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
@@ -7,7 +7,7 @@ import { endpointHasMetrics } from '../../../../core/src/features/endpoints/endp
 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 { CF_APP_UPDATE_SUCCESS, UpdateExistingApplication } from '../../actions/application.actions';
 import { cfEntityCatalog } from '../../cf-entity-catalog';
 import {
   createAppInstancesMetricAction,
@@ -29,7 +29,7 @@ export class AppEffects {
   );
 
   @Effect({ dispatch: false }) clearCellMetrics$ = this.actions$.pipe(
-    ofType<APISuccessOrFailedAction>(UPDATE_SUCCESS),
+    ofType<APISuccessOrFailedAction>(CF_APP_UPDATE_SUCCESS),
     map(action => {
       // User's can scale down instances and previous instance data is kept in store, when the user scales up again this stale data can
       // be incorrectly shown straight away. In order to work around this fetch the latest metrics again when scaling up
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
deleted file mode 100644
index 8c713def7c..0000000000
--- a/src/frontend/packages/cloud-foundry/src/store/effects/permissions.effect.ts
+++ /dev/null
@@ -1,274 +0,0 @@
-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 { endpointsCfEntitiesConnectedSelector } from 'frontend/packages/store/src/selectors/endpoint.selectors';
-import { combineLatest, Observable, of as observableOf } from 'rxjs';
-import {
-  catchError,
-  first,
-  map,
-  mergeMap,
-  pairwise,
-  share,
-  skipWhile,
-  switchMap,
-  tap,
-  withLatestFrom,
-} from 'rxjs/operators';
-
-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';
-import {
-  BaseHttpClientFetcher,
-  flattenPagination,
-  PaginationFlattener,
-} from '../../../../store/src/helpers/paginated-request-helpers';
-import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
-import { selectPaginationState } from '../../../../store/src/selectors/pagination.selectors';
-import { EndpointModel, INewlyConnectedEndpointInfo } from '../../../../store/src/types/endpoint.types';
-import { BasePaginatedAction, PaginationEntityState } from '../../../../store/src/types/pagination.types';
-import {
-  GET_CURRENT_USER_CF_RELATIONS,
-  GET_CURRENT_USER_CF_RELATIONS_FAILED,
-  GET_CURRENT_USER_CF_RELATIONS_SUCCESS,
-  GET_CURRENT_USER_RELATION,
-  GET_CURRENT_USER_RELATIONS,
-  GET_CURRENT_USER_RELATIONS_FAILED,
-  GET_CURRENT_USER_RELATIONS_SUCCESS,
-  GetCurrentUserRelationsComplete,
-  GetCurrentUsersRelations,
-  GetUserCfRelations,
-  GetUserRelations,
-  UserRelationTypes,
-} from '../../actions/permissions.actions';
-import { CFAppState } from '../../cf-app-state';
-import { cfEntityCatalog } from '../../cf-entity-catalog';
-import { CFResponse } from '../types/cf-api.types';
-
-class PermissionFlattener extends BaseHttpClientFetcher<CFResponse> implements PaginationFlattener<CFResponse, CFResponse> {
-
-  constructor(httpClient: HttpClient, public url, public requestOptions: { [key: string]: any }) {
-    super(httpClient, url, requestOptions, 'page');
-  }
-  public getTotalPages = (res: CFResponse) => res.total_pages;
-
-  public mergePages = (res: CFResponse[]) => {
-    const firstRes = res.shift();
-    const final = res.reduce((finalRes, currentRes) => {
-      finalRes.resources = [
-        ...finalRes.resources,
-      ];
-      return finalRes;
-    }, firstRes);
-    return final;
-  }
-  public getTotalResults = (res: CFResponse): number => res.total_results;
-  public clearResults = (res: CFResponse) => observableOf(res);
-}
-
-interface CfsRequestState {
-  [cfGuid: string]: Observable<boolean>[];
-}
-
-interface IEndpointConnectionInfo {
-  guid: string;
-  userGuid: string;
-}
-
-const successAction: Action = { type: GET_CURRENT_USER_RELATIONS_SUCCESS };
-const failedAction: Action = { type: GET_CURRENT_USER_RELATIONS_FAILED };
-
-function fetchCfUserRole(store: Store<CFAppState>, action: GetUserRelations, httpClient: HttpClient): Observable<boolean> {
-  const url = `pp/v1/proxy/v2/users/${action.guid}/${action.relationType}`;
-  const params = {
-    headers: {
-      'x-cap-cnsi-list': action.endpointGuid,
-      'x-cap-passthrough': 'true'
-    },
-    params: {
-      'results-per-page': '100'
-    }
-  };
-  const get$ = httpClient.get<CFResponse>(
-    url,
-    params
-  );
-  return flattenPagination(
-    (flatAction: Action) => this.store.dispatch(flatAction),
-    get$,
-    new PermissionFlattener(httpClient, url, params)
-  ).pipe(
-    map(data => {
-      store.dispatch(new GetCurrentUserRelationsComplete(action.relationType, action.endpointGuid, data.resources));
-      return true;
-    }),
-    first(),
-    catchError(err => observableOf(false)),
-    share()
-  );
-}
-
-const fetchPaginationStateFromAction = (store: Store<CFAppState>, action: BasePaginatedAction) => {
-  const entityKey = entityCatalog.getEntityKey(action);
-  return store.select(selectPaginationState(entityKey, action.paginationKey));
-};
-
-/**
- * Using the given action wait until the associated pagination section changes from busy to not busy
- */
-const createPaginationCompleteWatcher = (store: Store<CFAppState>, action: BasePaginatedAction): Observable<boolean> =>
-  fetchPaginationStateFromAction(store, action).pipe(
-    map((paginationState: PaginationEntityState) => {
-      const pageRequest: ActionState =
-        paginationState && paginationState.pageRequests && paginationState.pageRequests[paginationState.currentPage];
-      return pageRequest ? pageRequest.busy : true;
-    }),
-    pairwise(),
-    map(([oldFetching, newFetching]) => {
-      return oldFetching === true && newFetching === false;
-    }),
-    skipWhile(completed => !completed),
-    first(),
-  );
-
-@Injectable()
-export class PermissionsEffects {
-  constructor(
-    private httpClient: HttpClient,
-    private actions$: Actions,
-    private store: Store<CFAppState>,
-    private logService: LoggerService
-  ) { }
-
-  @Effect() getCurrentUsersPermissions$ = this.actions$.pipe(
-    ofType<GetCurrentUsersRelations>(GET_CURRENT_USER_RELATIONS),
-    withLatestFrom(this.store.select(endpointsCfEntitiesConnectedSelector)),
-    switchMap(([action, endpoints]) => {
-      const endpointsArray = Object.values(endpoints);
-      const isAllAdmins = endpointsArray.every(endpoint => !!endpoint.user.admin);
-
-      // If all endpoints are connected as admin, there's no permissions to fetch. So only update the permission state to initialised
-      if (isAllAdmins) {
-        return [
-          successAction,
-          ...endpointsArray.map(endpoint => new GetUserCfRelations(endpoint.guid, GET_CURRENT_USER_CF_RELATIONS_SUCCESS))
-        ];
-      }
-
-      // If some endpoints are not connected as admin, go out and fetch the current user's specific roles
-      const flagsAndRoleRequests = this.dispatchRoleRequests(endpointsArray);
-      const allRequestsCompleted = this.handleCfRequests(flagsAndRoleRequests);
-      return combineLatest(allRequestsCompleted).pipe(
-        switchMap(succeeds => succeeds.every(succeeded => !!succeeded) ? [successAction] : [failedAction])
-      );
-    }),
-    catchError(err => {
-      this.logService.warn('Failed to fetch current user permissions: ', err);
-      return observableOf([failedAction]);
-    })
-  );
-
-
-  @Effect() getPermissionForNewlyConnectedEndpoint$ = this.actions$.pipe(
-    ofType<EndpointActionComplete>(CONNECT_ENDPOINTS_SUCCESS),
-    switchMap(action => {
-      const endpoint = action.endpoint as INewlyConnectedEndpointInfo;
-      if (endpoint.user.admin || action.endpointType !== 'cf') {
-        return endpoint.user.admin ? [new GetUserCfRelations(action.guid, GET_CURRENT_USER_CF_RELATIONS_SUCCESS)] : [];
-      }
-
-      // START fetching cf roles for current user
-      this.store.dispatch(new GetUserCfRelations(action.guid, GET_CURRENT_USER_CF_RELATIONS));
-
-      return combineLatest(this.fetchCfUserRoles({ guid: action.guid, userGuid: endpoint.user.guid })).pipe(
-        // FINISH fetching cf roles for current user
-        mergeMap(succeeds => [new GetUserCfRelations(
-          action.guid,
-          succeeds.every(succeeded => !!succeeded) ? GET_CURRENT_USER_CF_RELATIONS_SUCCESS : GET_CURRENT_USER_CF_RELATIONS_FAILED
-        )]),
-        catchError(err => {
-          this.logService.warn('Failed to fetch current user permissions for a cf: ', err);
-          return [new GetUserCfRelations(action.guid, GET_CURRENT_USER_CF_RELATIONS_FAILED)];
-        })
-      );
-    })
-  );
-
-
-  private dispatchRoleRequests(endpoints: EndpointModel[]): CfsRequestState {
-    const requests: CfsRequestState = {};
-
-    // Per endpoint fetch feature flags and user roles (unless admin, where we don't need to), then mark endpoint as initialised
-    endpoints.forEach(endpoint => {
-      if (endpoint.user.admin) {
-        // We don't need permissions for admin users (they can do everything)
-        requests[endpoint.guid] = [observableOf(true)];
-        this.store.dispatch(new GetUserCfRelations(endpoint.guid, GET_CURRENT_USER_CF_RELATIONS_SUCCESS));
-      } else {
-        // START fetching cf roles for current user
-        this.store.dispatch(new GetUserCfRelations(endpoint.guid, GET_CURRENT_USER_CF_RELATIONS));
-
-        // Dispatch feature flags fetch actions
-        const ffAction = cfEntityCatalog.featureFlag.actions.getMultiple(endpoint.guid)
-        requests[endpoint.guid] = [createPaginationCompleteWatcher(this.store, ffAction)];
-        this.store.dispatch(ffAction);
-
-        // Dispatch requests to fetch roles per role type for current user
-        requests[endpoint.guid].push(...this.fetchCfUserRoles({ guid: endpoint.guid, userGuid: endpoint.user.guid }));
-
-        // FINISH fetching cf roles for current user
-        combineLatest(requests[endpoint.guid]).pipe(
-          first(),
-          tap(succeeds => {
-            this.store.dispatch(new GetUserCfRelations(
-              endpoint.guid,
-              succeeds.every(succeeded => !!succeeded) ? GET_CURRENT_USER_CF_RELATIONS_SUCCESS : GET_CURRENT_USER_CF_RELATIONS_FAILED)
-            );
-          }),
-          catchError(err => {
-            this.logService.warn('Failed to fetch current user permissions for a cf: ', err);
-            this.store.dispatch(new GetUserCfRelations(endpoint.guid, GET_CURRENT_USER_CF_RELATIONS_FAILED));
-            return observableOf(err);
-          })
-        ).subscribe();
-      }
-    });
-    return requests;
-  }
-
-  private handleCfRequests(requests: CfsRequestState): Observable<boolean>[] {
-    const allCompleted: Observable<boolean>[] = [];
-    Object.keys(requests).forEach(cfGuid => {
-      const successes = requests[cfGuid];
-      allCompleted.push(...successes);
-    });
-    return allCompleted;
-  }
-
-  fetchCfUserRoles(endpoint: IEndpointConnectionInfo): Observable<boolean>[] {
-    return Object.values(UserRelationTypes).map((type: UserRelationTypes) => {
-      const relAction = new GetUserRelations(endpoint.userGuid, type, endpoint.guid);
-      return fetchCfUserRole(this.store, relAction, this.httpClient);
-    });
-  }
-}
-
-@Injectable()
-export class PermissionEffects {
-  constructor(
-    private httpClient: HttpClient,
-    private actions$: Actions,
-    private store: Store<CFAppState>
-  ) { }
-
-  @Effect() getCurrentUsersPermissions$ = this.actions$.pipe(
-    ofType<GetUserRelations>(GET_CURRENT_USER_RELATION),
-    map(action => {
-      return fetchCfUserRole(this.store, action, this.httpClient).pipe(
-        map((success) => ({ type: action.actions[1] }))
-      );
-    })
-  );
-}
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 a29f72b026..7c080b69e1 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
@@ -4,7 +4,7 @@ import { mergeMap } from 'rxjs/operators';
 
 import { WrapperRequestActionSuccess } from '../../../../store/src/types/request.types';
 import { AppMetadataTypes } from '../../actions/app-metadata.actions';
-import { UPDATE_SUCCESS, UpdateExistingApplication } from '../../actions/application.actions';
+import { CF_APP_UPDATE_SUCCESS, UpdateExistingApplication } from '../../actions/application.actions';
 import { cfEntityCatalog } from '../../cf-entity-catalog';
 
 @Injectable()
@@ -16,7 +16,7 @@ export class UpdateAppEffects {
   }
 
   @Effect() UpdateAppInStore$ = this.actions$.pipe(
-    ofType<WrapperRequestActionSuccess>(UPDATE_SUCCESS),
+    ofType<WrapperRequestActionSuccess>(CF_APP_UPDATE_SUCCESS),
     mergeMap((action: WrapperRequestActionSuccess) => {
       const updateAction = action.apiAction as UpdateExistingApplication;
       const updateEntities = updateAction.updateEntities || [AppMetadataTypes.ENV_VARS, AppMetadataTypes.STATS, AppMetadataTypes.SUMMARY];
diff --git a/src/frontend/packages/store/src/effects/users-roles.effects.ts b/src/frontend/packages/cloud-foundry/src/store/effects/users-roles.effects.ts
similarity index 78%
rename from src/frontend/packages/store/src/effects/users-roles.effects.ts
rename to src/frontend/packages/cloud-foundry/src/store/effects/users-roles.effects.ts
index 640bebb891..7ed0d48c09 100644
--- a/src/frontend/packages/store/src/effects/users-roles.effects.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/effects/users-roles.effects.ts
@@ -1,3 +1,4 @@
+import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
@@ -7,37 +8,46 @@ import {
 import { combineLatest as observableCombineLatest, combineLatest, Observable, of as observableOf, of } from 'rxjs';
 import { catchError, filter, first, map, mergeMap, pairwise, switchMap, tap, withLatestFrom } from 'rxjs/operators';
 
-import {
-  UsersRolesActions,
-  UsersRolesClearUpdateState,
-  UsersRolesExecuteChanges,
-} from '../../../cloud-foundry/src/actions/users-roles.actions';
-import { AddUserRole, ChangeUserRole, RemoveUserRole } from '../../../cloud-foundry/src/actions/users.actions';
-import { CFAppState } from '../../../cloud-foundry/src/cf-app-state';
-import { organizationEntityType, spaceEntityType } from '../../../cloud-foundry/src/cf-entity-types';
-import { CF_ENDPOINT_TYPE } from '../../../cloud-foundry/src/cf-types';
-import { CfUserService } from '../../../cloud-foundry/src/shared/data-services/cf-user.service';
-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';
-import { ActionState } from '../reducers/api-request-reducer/types';
-import { selectSessionData } from '../reducers/auth.reducer';
-import { selectUsersRoles } from '../selectors/users-roles.selector';
-import { SessionDataEndpoint } from '../types/auth.types';
-import { PaginatedAction } from '../types/pagination.types';
-import { ICFAction, UpdateCfAction } from '../types/request.types';
+import { ResetPagination } from '../../../../store/src/actions/pagination.actions';
+import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
+import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
+import { selectSessionData } from '../../../../store/src/reducers/auth.reducer';
+import { SessionDataEndpoint } from '../../../../store/src/types/auth.types';
+import { PaginatedAction } from '../../../../store/src/types/pagination.types';
+import { ICFAction, UpdateCfAction } from '../../../../store/src/types/request.types';
+import { GET_CURRENT_CF_USER_RELATION, GetCurrentCfUserRelations } from '../../actions/permissions.actions';
+import { UsersRolesActions, UsersRolesClearUpdateState, UsersRolesExecuteChanges } from '../../actions/users-roles.actions';
+import { AddCfUserRole, ChangeCfUserRole, RemoveCfUserRole } from '../../actions/users.actions';
+import { CFAppState } from '../../cf-app-state';
+import { organizationEntityType, spaceEntityType } from '../../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../../cf-types';
+import { CfUserService } from '../../shared/data-services/cf-user.service';
+import { fetchCfUserRole } from '../../user-permissions/cf-user-roles-fetch';
+import { selectCfUsersRoles } from '../selectors/cf-users-roles.selector';
+import { OrgUserRoleNames } from '../types/cf-user.types';
+import { CfRoleChange, UsersRolesState } from '../types/users-roles.types';
 
 
 @Injectable()
 export class UsersRolesEffects {
 
   constructor(
+    private httpClient: HttpClient,
     private actions$: Actions,
     private store: Store<CFAppState>,
     private cfUserService: CfUserService,
   ) { }
 
+  @Effect() getCurrentUsersPermissions$ = this.actions$.pipe(
+    ofType<GetCurrentCfUserRelations>(GET_CURRENT_CF_USER_RELATION),
+    map(action => {
+      return fetchCfUserRole(this.store, action, this.httpClient).pipe(
+        map(() => ({ type: action.actions[1] })),
+        catchError(() => [{ type: action.actions[2] }])
+      );
+    })
+  );
+
   @Effect() clearEntityUpdates$ = this.actions$.pipe(
     ofType<UsersRolesClearUpdateState>(UsersRolesActions.ClearUpdateState),
     mergeMap(action => {
@@ -47,7 +57,7 @@ export class UsersRolesEffects {
           guid: change.spaceGuid ? change.spaceGuid : change.orgGuid,
           endpointType: CF_ENDPOINT_TYPE,
           entityType: change.spaceGuid ? spaceEntityType : organizationEntityType,
-          updatingKey: ChangeUserRole.generateUpdatingKey(change.role, change.userGuid),
+          updatingKey: ChangeCfUserRole.generateUpdatingKey(change.role, change.userGuid),
           options: null,
           actions: [],
           type: ''
@@ -61,7 +71,7 @@ export class UsersRolesEffects {
   @Effect() executeUsersRolesChange$ = this.actions$.pipe(
     ofType<UsersRolesExecuteChanges>(UsersRolesActions.ExecuteChanges),
     withLatestFrom(
-      this.store.select(selectUsersRoles),
+      this.store.select(selectCfUsersRoles),
       this.store.select(selectSessionData())
     ),
     mergeMap(([action, usersRoles, sessionData]) => {
@@ -200,11 +210,11 @@ export class UsersRolesEffects {
     change: CfRoleChange,
     username: string,
     usernameOrigin: string
-  ): ChangeUserRole {
+  ): ChangeCfUserRole {
     const isSpace = !!change.spaceGuid;
     const entityGuid = isSpace ? change.spaceGuid : change.orgGuid;
     return change.add ?
-      new AddUserRole(
+      new AddCfUserRole(
         cfGuid,
         change.userGuid,
         entityGuid,
@@ -215,7 +225,7 @@ export class UsersRolesEffects {
         username,
         usernameOrigin
       ) :
-      new RemoveUserRole(
+      new RemoveCfUserRole(
         cfGuid,
         change.userGuid,
         entityGuid,
@@ -228,7 +238,7 @@ export class UsersRolesEffects {
       );
   }
 
-  private createActionObs(action: ChangeUserRole): Observable<any> {
+  private createActionObs(action: ChangeCfUserRole): Observable<any> {
     return entityCatalog.getEntity(action)
       .store
       .getEntityMonitor(action.guid)
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/users-roles.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/cf-users-roles.reducer.ts
similarity index 97%
rename from src/frontend/packages/cloud-foundry/src/store/reducers/users-roles.reducer.ts
rename to src/frontend/packages/cloud-foundry/src/store/reducers/cf-users-roles.reducer.ts
index bcb4b0173d..01f1eb770c 100644
--- a/src/frontend/packages/cloud-foundry/src/store/reducers/users-roles.reducer.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/cf-users-roles.reducer.ts
@@ -16,7 +16,7 @@ import {
   IUserPermissionInOrg,
   IUserPermissionInSpace,
   OrgUserRoleNames,
-} from '../types/user.types';
+} from '../types/cf-user.types';
 import { UsersRolesState } from '../types/users-roles.types';
 
 export function createDefaultOrgRoles(orgGuid: string, orgName: string): IUserPermissionInOrg {
@@ -53,7 +53,7 @@ const defaultState: UsersRolesState = {
   changedRoles: []
 };
 
-export function UsersRolesReducer(state: UsersRolesState = defaultState, action: Action): UsersRolesState {
+export function cfUsersRolesReducer(state: UsersRolesState = defaultState, action: Action): UsersRolesState {
   switch (action.type) {
     case UsersRolesActions.SetUsers:
       const setUsersAction = action as UsersRolesSetUsers;
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/users.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/cf-users.reducer.ts
similarity index 90%
rename from src/frontend/packages/cloud-foundry/src/store/reducers/users.reducer.ts
rename to src/frontend/packages/cloud-foundry/src/store/reducers/cf-users.reducer.ts
index 42376488c6..71079d216e 100644
--- a/src/frontend/packages/cloud-foundry/src/store/reducers/users.reducer.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/cf-users.reducer.ts
@@ -5,10 +5,10 @@ import { APIResource, NormalizedResponse } from '../../../../store/src/types/api
 import { APISuccessOrFailedAction } from '../../../../store/src/types/request.types';
 import { GET_ORGANIZATION_USERS_SUCCESS, GetAllOrgUsers } from '../../actions/organization.actions';
 import {
-  ADD_ROLE_SUCCESS,
-  ChangeUserRole,
-  createDefaultUserRelations,
-  REMOVE_ROLE_SUCCESS,
+  ADD_CF_ROLE_SUCCESS,
+  ChangeCfUserRole,
+  createDefaultCfUserRelations,
+  REMOVE_CF_ROLE_SUCCESS,
 } from '../../actions/users.actions';
 import { IOrganization, ISpace } from '../../cf-api.types';
 import { cfUserEntityType } from '../../cf-entity-types';
@@ -20,7 +20,7 @@ import {
   getDefaultCfUserMissingRoles,
   OrgUserRoleNames,
   SpaceUserRoleNames,
-} from '../types/user.types';
+} from '../types/cf-user.types';
 
 const properties = {
   org: {
@@ -36,12 +36,12 @@ const properties = {
   }
 };
 
-export function userReducer(state: IRequestEntityTypeState<APIResource<CfUser>>, action: APISuccessOrFailedAction) {
+export function cfUserReducer(state: IRequestEntityTypeState<APIResource<CfUser>>, action: APISuccessOrFailedAction) {
   switch (action.type) {
-    case ADD_ROLE_SUCCESS:
-    case REMOVE_ROLE_SUCCESS:
+    case ADD_CF_ROLE_SUCCESS:
+    case REMOVE_CF_ROLE_SUCCESS:
       // Ensure that a user's roles collections are updated when we call add/remove
-      const permAction = action.apiAction as ChangeUserRole;
+      const permAction = action.apiAction as ChangeCfUserRole;
       if (permAction.username) {
         return state;
       }
@@ -50,7 +50,7 @@ export function userReducer(state: IRequestEntityTypeState<APIResource<CfUser>>,
         ...state,
         [userGuid]: {
           ...state[userGuid],
-          entity: updatePermission(state[userGuid].entity, entityGuid, isSpace, permissionTypeKey, action.type === ADD_ROLE_SUCCESS),
+          entity: updatePermission(state[userGuid].entity, entityGuid, isSpace, permissionTypeKey, action.type === ADD_CF_ROLE_SUCCESS),
         }
       };
     case GET_ORGANIZATION_USERS_SUCCESS:
@@ -99,18 +99,18 @@ type StateEntities<T> = IRequestEntityTypeState<APIResource<T>>;
 export function userSpaceOrgReducer<T = StateEntity>(isSpace: boolean) {
   return (state: StateEntities<T>, action: APISuccessOrFailedAction) => {
     switch (action.type) {
-      case ADD_ROLE_SUCCESS:
-      case REMOVE_ROLE_SUCCESS:
+      case ADD_CF_ROLE_SUCCESS:
+      case REMOVE_CF_ROLE_SUCCESS:
         // Ensure that an org or space's roles lists are updated when we call add/remove
-        const permAction = action.apiAction as ChangeUserRole;
-        const isAdd = action.type === ADD_ROLE_SUCCESS ? true : false;
+        const permAction = action.apiAction as ChangeCfUserRole;
+        const isAdd = action.type === ADD_CF_ROLE_SUCCESS ? true : false;
         return (isSpace && !!permAction.isSpace) || (!isSpace && !permAction.isSpace) ? newEntityState<T>(state, permAction, isAdd) : state;
     }
     return state;
   };
 }
 
-function newEntityState<T = StateEntity>(state: StateEntities<T>, action: ChangeUserRole, add: boolean): StateEntities<T> {
+function newEntityState<T = StateEntity>(state: StateEntities<T>, action: ChangeCfUserRole, add: boolean): StateEntities<T> {
   const apiResource: APIResource<T> = state[action.guid];
   if (!apiResource) {
     return state;
@@ -165,7 +165,7 @@ function updateUserMissingRoles(users: IRequestEntityTypeState<APIResource<CfUse
   // The GetAllOrgUsers request should contain the required roles, if not ignore this action (this will occur when we're fetching total
   // number of users in org and junking the result)
   const getOrgUsersAction: GetAllOrgUsers = action.apiAction as GetAllOrgUsers;
-  const requiredRelations = createDefaultUserRelations();
+  const requiredRelations = createDefaultCfUserRelations();
   const hasRequiredRelations = requiredRelations.reduce((reqRels, rel) => {
     if (getOrgUsersAction.includeRelations.find(includedRel => includedRel === rel)) {
       reqRels.push(rel);
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-base-cf-role.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-base-cf-role.reducer.ts
new file mode 100644
index 0000000000..64377c46ee
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-base-cf-role.reducer.ts
@@ -0,0 +1,95 @@
+import { APIResource } from '../../../../../store/src/types/api.types';
+import { getDefaultRolesRequestState } from '../../../../../store/src/types/current-user-roles.types';
+import { CfUserRelationTypes, GetCurrentCfUserRelationsComplete } from '../../../actions/permissions.actions';
+import { ISpace } from '../../../cf-api.types';
+import { IAllCfRolesState, ICfRolesState, IOrgsRoleState } from '../../types/cf-current-user-roles.types';
+import { createCfOrgRoleStateState } from './current-cf-user-roles-org.reducer';
+import { currentCfUserOrgRolesReducer } from './current-cf-user-roles-orgs.reducer';
+import { currentCfUserSpaceRolesReducer } from './current-cf-user-roles-spaces.reducer';
+
+export function getDefaultCfEndpointRoles(): ICfRolesState {
+  return {
+    global: {
+      isAdmin: false,
+      isReadOnlyAdmin: false,
+      isGlobalAuditor: false,
+      canRead: false,
+      canWrite: false,
+      scopes: []
+    },
+    spaces: {
+
+    },
+    organizations: {
+
+    },
+    state: getDefaultRolesRequestState()
+  };
+}
+
+export function currentUserBaseCFRolesReducer(state: IAllCfRolesState = {}, action: GetCurrentCfUserRelationsComplete): IAllCfRolesState {
+  if (!state[action.endpointGuid]) {
+    state = {
+      ...state,
+      [action.endpointGuid]: getDefaultCfEndpointRoles()
+    };
+  }
+  return {
+    ...state,
+    [action.endpointGuid]: currentUserCFRolesReducer(state[action.endpointGuid], action)
+  };
+}
+
+function currentUserCFRolesReducer(
+  state: ICfRolesState = getDefaultCfEndpointRoles(),
+  action: GetCurrentCfUserRelationsComplete): ICfRolesState {
+  if (isOrgRelation(action.relationType)) {
+    return {
+      ...state,
+      organizations: currentCfUserOrgRolesReducer(state.organizations, action)
+    };
+  }
+  if (isSpaceRelation(action.relationType)) {
+    return {
+      ...state,
+      spaces: currentCfUserSpaceRolesReducer(state.spaces, action),
+      organizations: assignSpaceToOrg(state.organizations, action.data)
+    };
+  }
+  return state;
+}
+
+function assignSpaceToOrg(organizations: IOrgsRoleState = {}, spaces: APIResource<ISpace>[]): IOrgsRoleState {
+  return spaces.reduce((newOrganizations: IOrgsRoleState, space) => {
+    const orgGuid = space.entity.organization_guid;
+    const org = newOrganizations[orgGuid] || createCfOrgRoleStateState();
+    const spaceGuids = org.spaceGuids || [];
+    if (spaceGuids.includes(space.metadata.guid)) {
+      return newOrganizations;
+    }
+    return {
+      ...newOrganizations,
+      [orgGuid]: {
+        ...org,
+        spaceGuids: [
+          ...spaceGuids,
+          space.metadata.guid
+        ]
+      }
+    };
+  }, organizations);
+}
+
+
+function isOrgRelation(relationType: CfUserRelationTypes) {
+  return relationType === CfUserRelationTypes.AUDITED_ORGANIZATIONS ||
+    relationType === CfUserRelationTypes.BILLING_MANAGED_ORGANIZATION ||
+    relationType === CfUserRelationTypes.MANAGED_ORGANIZATION ||
+    relationType === CfUserRelationTypes.ORGANIZATIONS;
+}
+
+function isSpaceRelation(relationType: CfUserRelationTypes) {
+  return relationType === CfUserRelationTypes.AUDITED_SPACES ||
+    relationType === CfUserRelationTypes.MANAGED_SPACES ||
+    relationType === CfUserRelationTypes.SPACES;
+}
diff --git a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-reducer.helpers.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-reducer.helpers.ts
similarity index 65%
rename from src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-reducer.helpers.ts
rename to src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-reducer.helpers.ts
index 61459783c7..0cf24c8845 100644
--- a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-reducer.helpers.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-reducer.helpers.ts
@@ -1,23 +1,20 @@
-import {
-  GetCurrentUserRelationsComplete,
-  UserRelationTypes,
-} from '../../../../cloud-foundry/src/actions/permissions.actions';
-import { APIResource } from '../../types/api.types';
+import { APIResource } from '../../../../../store/src/types/api.types';
+import { CfUserRelationTypes, GetCurrentCfUserRelationsComplete } from '../../../actions/permissions.actions';
 
-export interface IKeyedByIDObject<T> {
+interface IKeyedByIDObject<T> {
   [id: string]: T;
 }
 
-export type roleFinalReducer<T, Y = any> = (
+type roleFinalReducer<T, Y = any> = (
   state: T,
-  relationType: UserRelationTypes,
+  relationType: CfUserRelationTypes,
   userHasRelation: boolean,
   data?: APIResource<Y>
 ) => T;
 
-export function addNewRoles<T>(
+export function addNewCfRoles<T>(
   state: IKeyedByIDObject<T>,
-  action: GetCurrentUserRelationsComplete,
+  action: GetCurrentCfUserRelationsComplete,
   reducer: roleFinalReducer<T>
 ) {
   return action.data.reduce((config, data) => {
@@ -32,9 +29,9 @@ export function addNewRoles<T>(
   }, { newState: { ...state }, addedIds: [] });
 }
 
-export function removeOldRoles<T>(
+export function removeOldCfRoles<T>(
   state: IKeyedByIDObject<T>,
-  action: GetCurrentUserRelationsComplete,
+  action: GetCurrentCfUserRelationsComplete,
   newIds: string[],
   reducer: roleFinalReducer<T>
 ) {
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-role-session.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-role-session.reducer.ts
new file mode 100644
index 0000000000..5778477b89
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-role-session.reducer.ts
@@ -0,0 +1,89 @@
+import { VerifiedSession } from '../../../../../store/src/actions/auth.actions';
+import { EndpointActionComplete } from '../../../../../store/src/actions/endpoint.actions';
+import { SessionUser } from '../../../../../store/src/types/auth.types';
+import { EndpointUser, INewlyConnectedEndpointInfo } from '../../../../../store/src/types/endpoint.types';
+import { CF_ENDPOINT_TYPE } from '../../../cf-types';
+import { CfScopeStrings } from '../../../user-permissions/cf-user-permissions-checkers';
+import { IAllCfRolesState, ICfRolesState, IGlobalRolesState } from '../../types/cf-current-user-roles.types';
+import { getDefaultCfEndpointRoles } from './current-cf-user-base-cf-role.reducer';
+
+interface PartialEndpoint {
+  user: EndpointUser | SessionUser;
+  guid: string;
+}
+
+export function cfRoleInfoFromSessionReducer(
+  state: IAllCfRolesState,
+  action: VerifiedSession
+): IAllCfRolesState {
+  const { endpoints } = action.sessionData;
+  return propagateEndpointsAdminPermissions(state, Object.values(endpoints.cf));
+}
+
+export function updateNewlyConnectedCfEndpoint(
+  state: IAllCfRolesState,
+  action: EndpointActionComplete
+): IAllCfRolesState {
+  if (action.endpointType !== CF_ENDPOINT_TYPE) {
+    return state;
+  }
+  const endpoint = action.endpoint as INewlyConnectedEndpointInfo;
+  const cfRoles = propagateEndpointsAdminPermissions(state, [{
+    user: endpoint.user,
+    guid: action.guid
+  }]);
+  return {
+    ...cfRoles,
+  };
+}
+
+
+function propagateEndpointsAdminPermissions(
+  cfState: IAllCfRolesState,
+  endpoints: PartialEndpoint[]
+): IAllCfRolesState {
+  if (!endpoints || !endpoints.length) {
+    return cfState;
+  }
+  return Object.values(endpoints).reduce((state, endpoint) => {
+    return {
+      ...state,
+      [endpoint.guid]: propagateEndpointAdminPermissions(state[endpoint.guid], endpoint)
+    };
+  }, { ...cfState });
+}
+
+function propagateEndpointAdminPermissions(state: ICfRolesState = getDefaultCfEndpointRoles(), endpoint: PartialEndpoint) {
+  const scopes = endpoint.user ? endpoint.user.scopes : [];
+  const global = getEndpointRoles(scopes, state.global);
+  return {
+    ...state,
+    global
+  };
+}
+
+function getEndpointRoles(scopes: string[], globalEndpointState: IGlobalRolesState) {
+  const newEndpointState = {
+    ...globalEndpointState,
+    scopes
+  };
+  return scopes.reduce((roles, scope) => {
+    if (scope === CfScopeStrings.CF_ADMIN_GROUP) {
+      roles.isAdmin = true;
+    }
+    if (scope === CfScopeStrings.CF_READ_ONLY_ADMIN_GROUP) {
+      roles.isReadOnlyAdmin = true;
+    }
+    if (scope === CfScopeStrings.CF_ADMIN_GLOBAL_AUDITOR_GROUP) {
+      roles.isGlobalAuditor = true;
+    }
+    if (scope === CfScopeStrings.CF_READ_SCOPE) {
+      roles.canRead = true;
+    }
+    if (scope === CfScopeStrings.CF_WRITE_SCOPE) {
+      roles.canWrite = true;
+    }
+    return roles;
+  }, newEndpointState);
+}
+
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-changed.reducers.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles-changed.reducers.ts
similarity index 69%
rename from src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-changed.reducers.ts
rename to src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles-changed.reducers.ts
index f67b52a86f..578f857b0a 100644
--- a/src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-changed.reducers.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles-changed.reducers.ts
@@ -1,17 +1,16 @@
-import { PermissionStrings } from '../../../../../core/src/core/current-user-permissions.config';
-import { ICurrentUserRolesState } from '../../../../../store/src/types/current-user-roles.types';
 import { APISuccessOrFailedAction } from '../../../../../store/src/types/request.types';
-import { ChangeUserRole } from '../../../actions/users.actions';
-import { ICfRolesState, IOrgRoleState, ISpaceRoleState } from '../../types/cf-current-user-roles.types';
-import { OrgUserRoleNames, SpaceUserRoleNames } from '../../types/user.types';
-import { defaultUserOrgRoleState } from './current-user-roles-org.reducer';
-import { defaultUserSpaceRoleState } from './current-user-roles-space.reducer';
+import { ChangeCfUserRole } from '../../../actions/users.actions';
+import { CfPermissionStrings } from '../../../user-permissions/cf-user-permissions-checkers';
+import { IAllCfRolesState, ICfRolesState, IOrgRoleState, ISpaceRoleState } from '../../types/cf-current-user-roles.types';
+import { OrgUserRoleNames, SpaceUserRoleNames } from '../../types/cf-user.types';
+import { defaultCfUserOrgRoleState } from './current-cf-user-roles-org.reducer';
+import { defaultCfUserSpaceRoleState } from './current-cf-user-roles-space.reducer';
 
-export function updateAfterRoleChange(
-  state: ICurrentUserRolesState,
+export function updateAfterCfRoleChange(
+  state: IAllCfRolesState,
   isAdd: boolean,
-  action: APISuccessOrFailedAction): ICurrentUserRolesState {
-  const changePerm = action.apiAction as ChangeUserRole;
+  action: APISuccessOrFailedAction): IAllCfRolesState {
+  const changePerm = action.apiAction as ChangeCfUserRole;
   if (!changePerm.updateConnectedUser) {
     // We haven't changed the user connected to this cf or the connected user is an admin. No need to update the permission roles
     return state;
@@ -19,7 +18,7 @@ export function updateAfterRoleChange(
 
   const entityType = changePerm.isSpace ? 'spaces' : 'organizations';
 
-  const cf = state.cf[changePerm.endpointGuid];
+  const cf = state[changePerm.endpointGuid];
   const entity = cf[entityType][changePerm.entityGuid] || createEmptyState(changePerm.isSpace, changePerm.orgGuid);
   const permissionType = userRoleNameToPermissionName(changePerm.permissionTypeKey);
 
@@ -46,34 +45,34 @@ export function updateAfterRoleChange(
 
 function createEmptyState(isSpace: boolean, orgId?: string): ISpaceRoleState | IOrgRoleState {
   return isSpace ? {
-    ...defaultUserSpaceRoleState,
+    ...defaultCfUserSpaceRoleState,
     orgId
   } : {
-      ...defaultUserOrgRoleState,
+      ...defaultCfUserOrgRoleState,
     };
 }
 
-function userRoleNameToPermissionName(roleName: OrgUserRoleNames | SpaceUserRoleNames): PermissionStrings {
+function userRoleNameToPermissionName(roleName: OrgUserRoleNames | SpaceUserRoleNames): CfPermissionStrings {
   switch (roleName) {
     case OrgUserRoleNames.AUDITOR:
-      return PermissionStrings.ORG_AUDITOR;
+      return CfPermissionStrings.ORG_AUDITOR;
     case OrgUserRoleNames.BILLING_MANAGERS:
-      return PermissionStrings.ORG_BILLING_MANAGER;
+      return CfPermissionStrings.ORG_BILLING_MANAGER;
     case OrgUserRoleNames.MANAGER:
-      return PermissionStrings.ORG_MANAGER;
+      return CfPermissionStrings.ORG_MANAGER;
     case OrgUserRoleNames.USER:
-      return PermissionStrings.ORG_USER;
+      return CfPermissionStrings.ORG_USER;
     case SpaceUserRoleNames.AUDITOR:
-      return PermissionStrings.SPACE_AUDITOR;
+      return CfPermissionStrings.SPACE_AUDITOR;
     case SpaceUserRoleNames.DEVELOPER:
-      return PermissionStrings.SPACE_DEVELOPER;
+      return CfPermissionStrings.SPACE_DEVELOPER;
     case SpaceUserRoleNames.MANAGER:
-      return PermissionStrings.SPACE_MANAGER;
+      return CfPermissionStrings.SPACE_MANAGER;
   }
 }
 
 function handleOrgRoleChange(
-  state: ICurrentUserRolesState,
+  state: IAllCfRolesState,
   endpointGuid: string,
   cf: ICfRolesState,
   orgGuid: string,
@@ -95,7 +94,7 @@ function handleOrgRoleChange(
  * Update the space role AND org space guids list
  */
 function handleSpaceRoleChange(
-  state: ICurrentUserRolesState,
+  state: IAllCfRolesState,
   endpointGuid: string,
   cf: ICfRolesState,
   orgGuid: string,
@@ -135,14 +134,11 @@ function handleSpaceRoleChange(
   });
 }
 
-function spreadState(state: ICurrentUserRolesState, cfGuid: string, cf: ICfRolesState): ICurrentUserRolesState {
+function spreadState(state: IAllCfRolesState, cfGuid: string, cf: ICfRolesState): IAllCfRolesState {
   return {
     ...state,
-    cf: {
-      ...state.cf,
-      [cfGuid]: {
-        ...cf
-      }
+    [cfGuid]: {
+      ...cf
     }
   };
 }
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles-clear.reducers.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles-clear.reducers.ts
new file mode 100644
index 0000000000..ade79d48f4
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles-clear.reducers.ts
@@ -0,0 +1,111 @@
+import { EndpointActionComplete } from '../../../../../store/src/actions/endpoint.actions';
+import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
+import { APISuccessOrFailedAction } from '../../../../../store/src/types/request.types';
+import { CF_ENDPOINT_TYPE } from '../../../cf-types';
+import { IAllCfRolesState } from '../../types/cf-current-user-roles.types';
+import { getDefaultCfEndpointRoles } from './current-cf-user-base-cf-role.reducer';
+
+export function removeEndpointCfRoles(state: IAllCfRolesState, action: EndpointActionComplete) {
+  if (!state[action.guid]) {
+    return state;
+  }
+  const cfState = {
+    ...state
+  };
+  delete cfState[action.guid];
+  return {
+    ...cfState,
+  };
+}
+
+export function addCfEndpoint(state: IAllCfRolesState, action: EndpointActionComplete) {
+  if (action.endpointType !== CF_ENDPOINT_TYPE) {
+    return state;
+  }
+  const endpoint = action.endpoint as EndpointModel;
+  const guid = endpoint.guid;
+  if (state[guid]) {
+    return state;
+  }
+  const cfState = {
+    ...state
+  };
+
+  cfState[guid] = getDefaultCfEndpointRoles();
+  return cfState;
+}
+
+export function removeCfSpaceRoles(state: IAllCfRolesState, action: APISuccessOrFailedAction) {
+  const { endpointGuid, guid } = action.apiAction;
+  const removedOrgOrSpaceState = removeOrgOrSpaceRoles(state, endpointGuid as string, guid, 'spaces');
+  return removeSpaceIdFromOrg(removedOrgOrSpaceState, endpointGuid as string, guid);
+}
+
+function removeSpaceIdFromOrg(state: IAllCfRolesState, endpointGuid: string, spaceGuid: string) {
+  const space = state[endpointGuid].spaces[spaceGuid];
+  if (!space) {
+    return state;
+  }
+  const { orgId } = space;
+  return {
+    ...state,
+    [endpointGuid]: {
+      ...state[endpointGuid],
+      organizations: {
+        ...state[endpointGuid].organizations,
+        [orgId]: {
+          ...state[endpointGuid].organizations[orgId],
+          spaceGuids: state[endpointGuid].organizations[orgId].spaceGuids.filter(id => id !== spaceGuid)
+        }
+      }
+    }
+  };
+}
+
+export function removeCfOrgRoles(state: IAllCfRolesState, action: APISuccessOrFailedAction) {
+  const { endpointGuid, guid } = action.apiAction;
+  if (!state[endpointGuid as string].organizations[guid]) {
+    return state;
+  }
+  // const spaceIds = state.cf[endpointGuid].organizations[guid].spaceIds;
+  const spaceIds = [];
+  const newState = removeOrgOrSpaceRoles(state, endpointGuid, guid, 'organizations');
+  return cleanUpOrgSpaces(newState, spaceIds, endpointGuid);
+}
+
+function removeOrgOrSpaceRoles(
+  state: IAllCfRolesState,
+  endpointGuid: string,
+  orgOrSpaceId: string,
+  type: 'organizations' | 'spaces'
+) {
+  if (!state[endpointGuid][type][orgOrSpaceId]) {
+    return state;
+  }
+  // Remove orgOrSpaceId
+  const {
+    [orgOrSpaceId]: omit,
+    ...newTypeState
+  } = state[endpointGuid][type];
+
+  const newState = {
+    ...state,
+    [endpointGuid]: {
+      ...state[endpointGuid],
+      [type]: newTypeState
+    }
+  };
+  return newState;
+}
+
+function cleanUpOrgSpaces(state: IAllCfRolesState, spaceIds: string[], endpointGuid: string) {
+  if (!spaceIds || spaceIds.length === 0 || !state[endpointGuid]) {
+    return state;
+  }
+  return spaceIds.reduce((newState, spaceId) => {
+    if (newState[endpointGuid].spaces[spaceId]) {
+      delete newState[endpointGuid].spaces[spaceId];
+    }
+    return newState;
+  }, { ...state });
+}
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles-org.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles-org.reducer.ts
new file mode 100644
index 0000000000..ecac70b373
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles-org.reducer.ts
@@ -0,0 +1,47 @@
+import { CfUserRelationTypes } from '../../../actions/permissions.actions';
+import { IOrgRoleState } from '../../types/cf-current-user-roles.types';
+
+export const defaultCfUserOrgRoleState: IOrgRoleState = {
+  isManager: false,
+  isAuditor: false,
+  isBillingManager: false,
+  isUser: false,
+  spaceGuids: []
+};
+
+export const createCfOrgRoleStateState = () => ({
+  ...defaultCfUserOrgRoleState,
+  spaceGuids: [
+    ...defaultCfUserOrgRoleState.spaceGuids
+  ]
+});
+
+export function currentCfUserOrgRoleReducer(
+  state: IOrgRoleState = createCfOrgRoleStateState(),
+  relationType: CfUserRelationTypes,
+  userHasRelation: boolean
+) {
+  switch (relationType) {
+    case CfUserRelationTypes.AUDITED_ORGANIZATIONS:
+      return {
+        ...state,
+        isAuditor: userHasRelation
+      };
+    case CfUserRelationTypes.BILLING_MANAGED_ORGANIZATION:
+      return {
+        ...state,
+        isBillingManager: userHasRelation
+      };
+    case CfUserRelationTypes.MANAGED_ORGANIZATION:
+      return {
+        ...state,
+        isManager: userHasRelation
+      };
+    case CfUserRelationTypes.ORGANIZATIONS:
+      return {
+        ...state,
+        isUser: userHasRelation
+      };
+  }
+  return state;
+}
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles-orgs.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles-orgs.reducer.ts
new file mode 100644
index 0000000000..325d21faa0
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles-orgs.reducer.ts
@@ -0,0 +1,9 @@
+import { GetCurrentCfUserRelationsComplete } from '../../../actions/permissions.actions';
+import { IOrgsRoleState } from '../../types/cf-current-user-roles.types';
+import { addNewCfRoles, removeOldCfRoles } from './current-cf-user-reducer.helpers';
+import { currentCfUserOrgRoleReducer } from './current-cf-user-roles-org.reducer';
+
+export function currentCfUserOrgRolesReducer(state: IOrgsRoleState = {}, action: GetCurrentCfUserRelationsComplete) {
+  const { newState, addedIds } = addNewCfRoles(state, action, currentCfUserOrgRoleReducer);
+  return removeOldCfRoles(newState, action, addedIds, currentCfUserOrgRoleReducer);
+}
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-cf-user-roles-reducer/current-cf-user-roles-space.reducer.ts
similarity index 67%
rename from src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-space.reducer.ts
rename to src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles-space.reducer.ts
index fda7c35762..944aee675e 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-cf-user-roles-reducer/current-cf-user-roles-space.reducer.ts
@@ -1,18 +1,18 @@
 import { APIResource } from '../../../../../store/src/types/api.types';
-import { UserRelationTypes } from '../../../actions/permissions.actions';
+import { CfUserRelationTypes } from '../../../actions/permissions.actions';
 import { ISpace } from '../../../cf-api.types';
 import { ISpaceRoleState } from '../../types/cf-current-user-roles.types';
 
-export const defaultUserSpaceRoleState: ISpaceRoleState = {
+export const defaultCfUserSpaceRoleState: ISpaceRoleState = {
   orgId: null,
   isManager: false,
   isAuditor: false,
   isDeveloper: false,
 };
 
-export function currentUserSpaceRoleReducer(
-  state: ISpaceRoleState = defaultUserSpaceRoleState,
-  relationType: UserRelationTypes,
+export function currentCfUserSpaceRoleReducer(
+  state: ISpaceRoleState = defaultCfUserSpaceRoleState,
+  relationType: CfUserRelationTypes,
   userHasRelation: boolean,
   space: APIResource<ISpace>
 ): ISpaceRoleState {
@@ -28,7 +28,7 @@ export function currentUserSpaceRoleReducer(
 }
 
 function addId(
-  state: ISpaceRoleState = defaultUserSpaceRoleState,
+  state: ISpaceRoleState = defaultCfUserSpaceRoleState,
   space: APIResource<ISpace>
 ) {
   if (!state.orgId) {
@@ -42,21 +42,21 @@ function addId(
 
 function applyRoles(
   state: ISpaceRoleState,
-  relationType: UserRelationTypes,
+  relationType: CfUserRelationTypes,
   userHasRelation: boolean
 ) {
   switch (relationType) {
-    case UserRelationTypes.AUDITED_SPACES:
+    case CfUserRelationTypes.AUDITED_SPACES:
       return {
         ...state,
         isAuditor: userHasRelation
       };
-    case UserRelationTypes.MANAGED_SPACES:
+    case CfUserRelationTypes.MANAGED_SPACES:
       return {
         ...state,
         isManager: userHasRelation
       };
-    case UserRelationTypes.SPACES:
+    case CfUserRelationTypes.SPACES:
       return {
         ...state,
         isDeveloper: userHasRelation
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles-spaces.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles-spaces.reducer.ts
new file mode 100644
index 0000000000..f66284401f
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles-spaces.reducer.ts
@@ -0,0 +1,9 @@
+import { GetCurrentCfUserRelationsComplete } from '../../../actions/permissions.actions';
+import { ISpacesRoleState } from '../../types/cf-current-user-roles.types';
+import { addNewCfRoles, removeOldCfRoles } from './current-cf-user-reducer.helpers';
+import { currentCfUserSpaceRoleReducer } from './current-cf-user-roles-space.reducer';
+
+export function currentCfUserSpaceRolesReducer(state: ISpacesRoleState = {}, action: GetCurrentCfUserRelationsComplete) {
+  const { newState, addedIds } = addNewCfRoles(state, action, currentCfUserSpaceRoleReducer);
+  return removeOldCfRoles(newState, action, addedIds, currentCfUserSpaceRoleReducer);
+}
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles.reducer.spec.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles.reducer.spec.ts
new file mode 100644
index 0000000000..eb698f376c
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles.reducer.spec.ts
@@ -0,0 +1,249 @@
+import { CfUserRelationTypes, GetCurrentCfUserRelationsComplete } from '../../../actions/permissions.actions';
+import {
+  IAllCfRolesState,
+  ICfRolesState,
+  IOrgRoleState,
+  ISpaceRoleState,
+  RoleEntities,
+} from '../../types/cf-current-user-roles.types';
+import { getDefaultCfEndpointRoles } from './current-cf-user-base-cf-role.reducer';
+import { createCfOrgRoleStateState } from './current-cf-user-roles-org.reducer';
+import { currentCfUserRolesReducer } from './current-cf-user-roles.reducer';
+
+const testOrgGuid = 'org-1';
+const testSpaceGuid = 'space-1';
+const generalGuid = 'guid-123';
+const testCFEndpointGuid = 'cf-1';
+
+function getSpaceAction(type: CfUserRelationTypes, orgGuid: string = testOrgGuid, spaceGuid: string = testSpaceGuid) {
+  return new GetCurrentCfUserRelationsComplete(
+    type,
+    testCFEndpointGuid,
+    [{ metadata: { guid: spaceGuid, created_at: '1', updated_at: '1', url: '1' }, entity: { organization_guid: orgGuid } }]
+  );
+}
+
+function getOrgAction(type: CfUserRelationTypes, orgGuid: string = testOrgGuid) {
+  return new GetCurrentCfUserRelationsComplete(
+    type,
+    testCFEndpointGuid,
+    [{ metadata: { guid: orgGuid, created_at: '1', updated_at: '1', url: '1' }, entity: {} }]
+  );
+}
+
+function getState(
+  orgOrSpace: RoleEntities,
+  allRoles: { guid: string, roles: ISpaceRoleState | IOrgRoleState }[] = [],
+  roles?: ISpaceRoleState | IOrgRoleState
+): ICfRolesState {
+  const baseState = getDefaultCfEndpointRoles();
+  if (!allRoles.length) {
+    let guid = testSpaceGuid;
+    if (orgOrSpace === RoleEntities.ORGS) {
+      guid = testOrgGuid;
+    }
+    allRoles.push({ guid, roles });
+  }
+  const orgSpaceRoles = {
+    [orgOrSpace]: {}
+  };
+  if (orgOrSpace === RoleEntities.SPACES) {
+    orgSpaceRoles.organizations = {
+      [testOrgGuid]: createCfOrgRoleStateState()
+    };
+  }
+  allRoles.forEach(role => {
+    orgSpaceRoles[orgOrSpace][role.guid] = role.roles;
+    if (orgOrSpace === RoleEntities.SPACES) {
+      orgSpaceRoles.organizations[testOrgGuid].spaceGuids.push(role.guid);
+    }
+  });
+  return {
+    ...baseState,
+    ...orgSpaceRoles
+  };
+}
+
+describe('currentCfUserRolesReducer', () => {
+  it('set defaults', () => {
+    const state = currentCfUserRolesReducer(undefined, { type: 'FAKE_ACTION' });
+    const expectedState: IAllCfRolesState = null;
+    expect(state).toEqual(expectedState);
+  });
+  it('should add org manager role to org', () => {
+    const state = currentCfUserRolesReducer(undefined, getOrgAction(CfUserRelationTypes.MANAGED_ORGANIZATION));
+    const cfPermissions = state[testCFEndpointGuid];
+    expect(cfPermissions).toEqual(getState(RoleEntities.ORGS, [], {
+      isManager: true,
+      isAuditor: false,
+      isBillingManager: false,
+      isUser: false,
+      spaceGuids: []
+    }));
+  });
+  it('should add org auditor role to org', () => {
+    const state = currentCfUserRolesReducer(undefined, getOrgAction(CfUserRelationTypes.AUDITED_ORGANIZATIONS));
+    const cfPermissions = state[testCFEndpointGuid];
+    expect(cfPermissions).toEqual(getState(RoleEntities.ORGS, [], {
+      isManager: false,
+      isAuditor: true,
+      isBillingManager: false,
+      isUser: false,
+      spaceGuids: []
+    }));
+  });
+  it('should add org billing manager role to org', () => {
+    const state = currentCfUserRolesReducer(undefined, getOrgAction(CfUserRelationTypes.BILLING_MANAGED_ORGANIZATION));
+    const cfPermissions = state[testCFEndpointGuid];
+    expect(cfPermissions).toEqual(getState(RoleEntities.ORGS, [], {
+      isManager: false,
+      isAuditor: false,
+      isBillingManager: true,
+      isUser: false,
+      spaceGuids: []
+    }));
+  });
+  it('should add org user role to org', () => {
+    const state = currentCfUserRolesReducer(undefined, getOrgAction(CfUserRelationTypes.ORGANIZATIONS));
+    const cfPermissions = state[testCFEndpointGuid];
+    expect(cfPermissions).toEqual(getState(RoleEntities.ORGS, [], {
+      isManager: false,
+      isAuditor: false,
+      isBillingManager: false,
+      isUser: true,
+      spaceGuids: []
+    }));
+  });
+
+  it('should retain other org roles', () => {
+    let state = currentCfUserRolesReducer(undefined, getOrgAction(CfUserRelationTypes.ORGANIZATIONS));
+    state = currentCfUserRolesReducer(state, getOrgAction(CfUserRelationTypes.AUDITED_ORGANIZATIONS, generalGuid));
+    const cfPermissions = state[testCFEndpointGuid];
+    const toEqual = getState(RoleEntities.ORGS, [{
+      guid: testOrgGuid,
+      roles: {
+        isManager: false,
+        isAuditor: false,
+        isBillingManager: false,
+        isUser: true,
+        spaceGuids: []
+      },
+    },
+    {
+      guid: generalGuid,
+      roles: {
+        isManager: false,
+        isAuditor: true,
+        isBillingManager: false,
+        isUser: false,
+        spaceGuids: []
+      }
+    }]);
+    expect(cfPermissions).toEqual(toEqual);
+  });
+
+  it('should retain other space roles', () => {
+    let state = currentCfUserRolesReducer(undefined, getSpaceAction(CfUserRelationTypes.SPACES));
+    state = currentCfUserRolesReducer(state, getSpaceAction(CfUserRelationTypes.MANAGED_SPACES, generalGuid, generalGuid));
+    const cfPermissions = state[testCFEndpointGuid];
+    const toEqual = getState(RoleEntities.SPACES, [{
+      guid: testSpaceGuid,
+      roles: {
+        orgId: testOrgGuid,
+        isManager: false,
+        isAuditor: false,
+        isDeveloper: true
+      }
+    },
+    {
+      guid: generalGuid,
+      roles: {
+        orgId: generalGuid,
+        isManager: true,
+        isAuditor: false,
+        isDeveloper: false
+      }
+    }]);
+    const orgState = getState(RoleEntities.ORGS, [{
+      guid: testOrgGuid,
+      roles: {
+        isManager: false,
+        isAuditor: false,
+        isBillingManager: false,
+        isUser: false,
+        spaceGuids: [
+          testSpaceGuid
+        ]
+      }
+    },
+    {
+      guid: generalGuid,
+      roles: {
+        isManager: false,
+        isAuditor: false,
+        isBillingManager: false,
+        isUser: false,
+        spaceGuids: [
+          generalGuid
+        ]
+      }
+    }]);
+    toEqual.organizations = orgState.organizations;
+    expect(cfPermissions).toEqual(toEqual);
+  });
+
+  it('should retain other space and org roles', () => {
+    let state = currentCfUserRolesReducer(undefined, getSpaceAction(CfUserRelationTypes.SPACES));
+    state = currentCfUserRolesReducer(state, getSpaceAction(CfUserRelationTypes.MANAGED_SPACES, generalGuid, generalGuid));
+    state = currentCfUserRolesReducer(state, getOrgAction(CfUserRelationTypes.ORGANIZATIONS));
+    state = currentCfUserRolesReducer(state, getOrgAction(CfUserRelationTypes.AUDITED_ORGANIZATIONS, generalGuid));
+    const cfPermissions = state[testCFEndpointGuid];
+
+
+    const spaceState = getState(RoleEntities.SPACES, [{
+      guid: testSpaceGuid,
+      roles: {
+        orgId: testOrgGuid,
+        isManager: false,
+        isAuditor: false,
+        isDeveloper: true
+      }
+    },
+    {
+      guid: generalGuid,
+      roles: {
+        orgId: generalGuid,
+        isManager: true,
+        isAuditor: false,
+        isDeveloper: false
+      }
+    }]);
+
+    const orgState = getState(RoleEntities.ORGS, [{
+      guid: testOrgGuid,
+      roles: {
+        isManager: false,
+        isAuditor: false,
+        isBillingManager: false,
+        isUser: true,
+        spaceGuids: [
+          testSpaceGuid
+        ]
+      }
+    },
+    {
+      guid: generalGuid,
+      roles: {
+        isManager: false,
+        isAuditor: true,
+        isBillingManager: false,
+        isUser: false,
+        spaceGuids: [
+          generalGuid
+        ]
+      }
+    }]);
+    spaceState.organizations = orgState.organizations;
+    expect(cfPermissions).toEqual(spaceState);
+  });
+});
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles.reducer.ts
new file mode 100644
index 0000000000..89a24cc8e5
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/current-cf-user-roles-reducer/current-cf-user-roles.reducer.ts
@@ -0,0 +1,90 @@
+import { Action } from '@ngrx/store';
+
+import { SESSION_VERIFIED, VerifiedSession } from '../../../../../store/src/actions/auth.actions';
+import {
+  CONNECT_ENDPOINTS_SUCCESS,
+  DISCONNECT_ENDPOINTS_SUCCESS,
+  EndpointActionComplete,
+  REGISTER_ENDPOINTS_SUCCESS,
+  UNREGISTER_ENDPOINTS_SUCCESS,
+} from '../../../../../store/src/actions/endpoint.actions';
+import { EntityUserRolesReducer } from '../../../../../store/src/entity-request-pipeline/entity-request-pipeline.types';
+import {
+  currentUserRolesRequestStateReducer,
+  RolesRequestStateStage,
+} from '../../../../../store/src/reducers/current-user-roles-reducer/current-user-roles.reducer';
+import { APISuccessOrFailedAction } from '../../../../../store/src/types/request.types';
+import { DELETE_ORGANIZATION_SUCCESS } from '../../../actions/organization.actions';
+import {
+  GET_CURRENT_CF_USER_RELATION_SUCCESS,
+  GET_CURRENT_CF_USER_RELATIONS,
+  GET_CURRENT_CF_USER_RELATIONS_FAILED,
+  GET_CURRENT_CF_USER_RELATIONS_SUCCESS,
+  GetCfUserRelations,
+  GetCurrentCfUserRelationsComplete,
+} from '../../../actions/permissions.actions';
+import { DELETE_SPACE_SUCCESS } from '../../../actions/space.actions';
+import { ADD_CF_ROLE_SUCCESS, REMOVE_CF_ROLE_SUCCESS } from '../../../actions/users.actions';
+import { IAllCfRolesState } from '../../types/cf-current-user-roles.types';
+import { currentUserBaseCFRolesReducer } from './current-cf-user-base-cf-role.reducer';
+import { cfRoleInfoFromSessionReducer, updateNewlyConnectedCfEndpoint } from './current-cf-user-role-session.reducer';
+import { updateAfterCfRoleChange } from './current-cf-user-roles-changed.reducers';
+import {
+  addCfEndpoint,
+  removeCfOrgRoles,
+  removeCfSpaceRoles,
+  removeEndpointCfRoles,
+} from './current-cf-user-roles-clear.reducers';
+
+export const currentCfUserRolesReducer: EntityUserRolesReducer<IAllCfRolesState> = (
+  state: IAllCfRolesState = {},
+  action: Action
+): IAllCfRolesState => {
+  switch (action.type) {
+    case GET_CURRENT_CF_USER_RELATION_SUCCESS:
+      const gcursAction = action as GetCurrentCfUserRelationsComplete
+      return currentUserBaseCFRolesReducer(state, gcursAction);
+    case SESSION_VERIFIED:
+      return cfRoleInfoFromSessionReducer(state, action as VerifiedSession);
+    case REGISTER_ENDPOINTS_SUCCESS:
+      return addCfEndpoint(state, action as EndpointActionComplete);
+    case CONNECT_ENDPOINTS_SUCCESS:
+      return updateNewlyConnectedCfEndpoint(state, action as EndpointActionComplete);
+    case DISCONNECT_ENDPOINTS_SUCCESS:
+    case UNREGISTER_ENDPOINTS_SUCCESS:
+      return removeEndpointCfRoles(state, action as EndpointActionComplete);
+    case DELETE_ORGANIZATION_SUCCESS:
+      return removeCfOrgRoles(state, action as APISuccessOrFailedAction);
+    case DELETE_SPACE_SUCCESS:
+      return removeCfSpaceRoles(state, action as APISuccessOrFailedAction);
+    case ADD_CF_ROLE_SUCCESS:
+      return updateAfterCfRoleChange(state, true, action as APISuccessOrFailedAction);
+    case REMOVE_CF_ROLE_SUCCESS:
+      return updateAfterCfRoleChange(state, false, action as APISuccessOrFailedAction);
+    case GET_CURRENT_CF_USER_RELATIONS:
+    case GET_CURRENT_CF_USER_RELATIONS_SUCCESS:
+    case GET_CURRENT_CF_USER_RELATIONS_FAILED:
+      return currentUserCfRolesRequestStateReducer(state, action as GetCfUserRelations);
+  }
+  return null;
+}
+
+export function currentUserCfRolesRequestStateReducer(cf: IAllCfRolesState = {}, action: GetCfUserRelations) {
+  const cfGuid = (action as GetCfUserRelations).cfGuid;
+
+  const type = action.type === GET_CURRENT_CF_USER_RELATIONS ?
+    RolesRequestStateStage.START :
+    action.type === GET_CURRENT_CF_USER_RELATIONS_SUCCESS ? RolesRequestStateStage.SUCCESS :
+      action.type === GET_CURRENT_CF_USER_RELATIONS_FAILED ? RolesRequestStateStage.FAILURE :
+        RolesRequestStateStage.OTHER
+  return {
+    ...cf,
+    [cfGuid]: {
+      ...cf[cfGuid],
+      state: {
+        ...cf[cfGuid].state,
+        ...currentUserRolesRequestStateReducer(cf[cfGuid].state, type)
+      }
+    }
+  };
+}
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-base-cf-role.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-base-cf-role.reducer.ts
deleted file mode 100644
index 0e9832beb1..0000000000
--- a/src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-base-cf-role.reducer.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { getDefaultEndpointRoles } from '../../../../../store/src/types/current-user-roles.types';
-import { GetCurrentUserRelationsComplete } from '../../../actions/permissions.actions';
-import { IAllCfRolesState } from '../../types/cf-current-user-roles.types';
-import { currentUserCFRolesReducer } from './current-user-cf-roles.reducer';
-
-export function currentUserBaseCFRolesReducer(state: IAllCfRolesState = {}, action: GetCurrentUserRelationsComplete): IAllCfRolesState {
-  if (!state[action.endpointGuid]) {
-    state = {
-      ...state,
-      [action.endpointGuid]: getDefaultEndpointRoles()
-    };
-  }
-  return {
-    ...state,
-    [action.endpointGuid]: currentUserCFRolesReducer(state[action.endpointGuid], action)
-  };
-}
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
deleted file mode 100644
index 3cb9fbf328..0000000000
--- a/src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-cf-roles.reducer.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-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';
-import { currentUserSpaceRolesReducer } from './current-user-roles-spaces.reducer';
-
-export function currentUserCFRolesReducer(
-  state: ICfRolesState = getDefaultEndpointRoles(),
-  action: GetCurrentUserRelationsComplete): ICfRolesState {
-  if (isOrgRelation(action.relationType)) {
-    return {
-      ...state,
-      organizations: currentUserOrgRolesReducer(state.organizations, action)
-    };
-  }
-  if (isSpaceRelation(action.relationType)) {
-    return {
-      ...state,
-      spaces: currentUserSpaceRolesReducer(state.spaces, action),
-      organizations: assignSpaceToOrg(state.organizations, action.data)
-    };
-  }
-  return state;
-}
-
-function assignSpaceToOrg(organizations: IOrgsRoleState = {}, spaces: APIResource<ISpace>[]): IOrgsRoleState {
-  return spaces.reduce((newOrganizations: IOrgsRoleState, space) => {
-    const orgGuid = space.entity.organization_guid;
-    const org = newOrganizations[orgGuid] || createOrgRoleStateState();
-    const spaceGuids = org.spaceGuids || [];
-    if (spaceGuids.includes(space.metadata.guid)) {
-      return newOrganizations;
-    }
-    return {
-      ...newOrganizations,
-      [orgGuid]: {
-        ...org,
-        spaceGuids: [
-          ...spaceGuids,
-          space.metadata.guid
-        ]
-      }
-    };
-  }, organizations);
-}
-
-
-function isOrgRelation(relationType: UserRelationTypes) {
-  return relationType === UserRelationTypes.AUDITED_ORGANIZATIONS ||
-    relationType === UserRelationTypes.BILLING_MANAGED_ORGANIZATION ||
-    relationType === UserRelationTypes.MANAGED_ORGANIZATION ||
-    relationType === UserRelationTypes.ORGANIZATIONS;
-}
-
-function isSpaceRelation(relationType: UserRelationTypes) {
-  return relationType === UserRelationTypes.AUDITED_SPACES ||
-    relationType === UserRelationTypes.MANAGED_SPACES ||
-    relationType === UserRelationTypes.SPACES;
-}
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-org.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-org.reducer.ts
deleted file mode 100644
index 8f3053d305..0000000000
--- a/src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-org.reducer.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { UserRelationTypes } from '../../../actions/permissions.actions';
-import { IOrgRoleState } from '../../types/cf-current-user-roles.types';
-
-export const defaultUserOrgRoleState: IOrgRoleState = {
-  isManager: false,
-  isAuditor: false,
-  isBillingManager: false,
-  isUser: false,
-  spaceGuids: []
-};
-
-export const createOrgRoleStateState = () => ({
-  ...defaultUserOrgRoleState,
-  spaceGuids: [
-    ...defaultUserOrgRoleState.spaceGuids
-  ]
-});
-
-export function currentUserOrgRoleReducer(
-  state: IOrgRoleState = createOrgRoleStateState(),
-  relationType: UserRelationTypes,
-  userHasRelation: boolean
-) {
-  switch (relationType) {
-    case UserRelationTypes.AUDITED_ORGANIZATIONS:
-      return {
-        ...state,
-        isAuditor: userHasRelation
-      };
-    case UserRelationTypes.BILLING_MANAGED_ORGANIZATION:
-      return {
-        ...state,
-        isBillingManager: userHasRelation
-      };
-    case UserRelationTypes.MANAGED_ORGANIZATION:
-      return {
-        ...state,
-        isManager: userHasRelation
-      };
-    case UserRelationTypes.ORGANIZATIONS:
-      return {
-        ...state,
-        isUser: userHasRelation
-      };
-  }
-  return state;
-}
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-orgs.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-orgs.reducer.ts
deleted file mode 100644
index b7d39d94bb..0000000000
--- a/src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-orgs.reducer.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import {
-  addNewRoles,
-  removeOldRoles,
-} from '../../../../../store/src/reducers/current-user-roles-reducer/current-user-reducer.helpers';
-import { GetCurrentUserRelationsComplete } from '../../../actions/permissions.actions';
-import { IOrgsRoleState } from '../../types/cf-current-user-roles.types';
-import { currentUserOrgRoleReducer } from './current-user-roles-org.reducer';
-
-export function currentUserOrgRolesReducer(state: IOrgsRoleState = {}, action: GetCurrentUserRelationsComplete) {
-  const { newState, addedIds } = addNewRoles(state, action, currentUserOrgRoleReducer);
-  return removeOldRoles(newState, action, addedIds, currentUserOrgRoleReducer);
-}
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-spaces.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-spaces.reducer.ts
deleted file mode 100644
index 5660bca4ef..0000000000
--- a/src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-spaces.reducer.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import {
-  addNewRoles,
-  removeOldRoles,
-} from '../../../../../store/src/reducers/current-user-roles-reducer/current-user-reducer.helpers';
-import { GetCurrentUserRelationsComplete } from '../../../actions/permissions.actions';
-import { ISpacesRoleState } from '../../types/cf-current-user-roles.types';
-import { currentUserSpaceRoleReducer } from './current-user-roles-space.reducer';
-
-export function currentUserSpaceRolesReducer(state: ISpacesRoleState = {}, action: GetCurrentUserRelationsComplete) {
-  const { newState, addedIds } = addNewRoles(state, action, currentUserSpaceRoleReducer);
-  return removeOldRoles(newState, action, addedIds, currentUserSpaceRoleReducer);
-}
diff --git a/src/frontend/packages/cloud-foundry/src/store/selectors/cf-current-user-role.selectors.ts b/src/frontend/packages/cloud-foundry/src/store/selectors/cf-current-user-role.selectors.ts
index f7bd9b3e62..c3df05ca37 100644
--- a/src/frontend/packages/cloud-foundry/src/store/selectors/cf-current-user-role.selectors.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/selectors/cf-current-user-role.selectors.ts
@@ -1,16 +1,13 @@
 import { compose } from '@ngrx/store';
 
+import { PermissionValues } from '../../../../core/src/core/permissions/current-user-permissions.config';
 import {
-  PermissionStrings,
-  PermissionValues,
-  ScopeStrings,
-} from '../../../../core/src/core/current-user-permissions.config';
-import {
-  selectCurrentUserCFGlobalHasScopes,
-  selectCurrentUserRequestState,
+  selectCurrentUserGlobalHasScopes,
   selectCurrentUserRolesState,
 } from '../../../../store/src/selectors/current-user-role.selectors';
 import { ICurrentUserRolesState } from '../../../../store/src/types/current-user-roles.types';
+import { CF_ENDPOINT_TYPE } from '../../cf-types';
+import { CfPermissionStrings, CfScopeStrings } from '../../user-permissions/cf-user-permissions-checkers';
 import {
   IAllCfRolesState,
   ICfRolesState,
@@ -19,7 +16,10 @@ import {
   ISpacesRoleState,
 } from '../types/cf-current-user-roles.types';
 
-const selectSpaceWithRoleFromOrg = (role: PermissionStrings, orgId: string) => (state: ICfRolesState) => {
+
+export const selectCurrentUserRequestState = (state: ICurrentUserRolesState | ICfRolesState) => state.state;
+
+const selectSpaceWithRoleFromOrg = (role: CfPermissionStrings, orgId: string) => (state: ICfRolesState) => {
   if (!state) {
     return 'all';
   }
@@ -38,7 +38,7 @@ const selectSpaceWithRoleFromOrg = (role: PermissionStrings, orgId: string) => (
   }, []);
 };
 
-export const selectCurrentUserCFRolesState = (state: ICurrentUserRolesState) => state.cf;
+export const selectCurrentUserCFRolesState = (state: ICurrentUserRolesState) => state.endpoints[CF_ENDPOINT_TYPE];
 export const selectCurrentUserCFEndpointRolesState = (endpointGuid: string) =>
   (state: IAllCfRolesState) => state ? state[endpointGuid] : null;
 
@@ -63,7 +63,7 @@ export const getCurrentUserCFRolesState = compose(
 // ============================
 export const getCurrentUserCFEndpointRolesState = (endpointGuid: string) => compose(
   selectCurrentUserCFEndpointRolesState(endpointGuid),
-  getCurrentUserCFRolesState
+  getCurrentUserCFRolesState,
 );
 // ============================
 
@@ -101,8 +101,8 @@ export const getCurrentUserCFEndpointScopesState = (endpointGuid: string) => com
 
 // Has endpoint scopes
 // ============================
-export const getCurrentUserCFEndpointHasScope = (endpointGuid: string, scope: ScopeStrings) => compose(
-  selectCurrentUserCFGlobalHasScopes(scope),
+export const getCurrentUserCFEndpointHasScope = (endpointGuid: string, scope: CfScopeStrings) => compose(
+  selectCurrentUserGlobalHasScopes(scope),
   getCurrentUserCFEndpointScopesState(endpointGuid)
 );
 // ============================
@@ -142,7 +142,7 @@ export const getCurrentUserCFOrgRolesState = (endpointGuid: string, orgId: strin
 // Get an array of space guid that have a particular role
 // anf from a particular org
 // ============================
-export const getSpacesFromOrgWithRole = (endpointGuid: string, orgId: string, role: PermissionStrings) => compose(
+export const getSpacesFromOrgWithRole = (endpointGuid: string, orgId: string, role: CfPermissionStrings) => compose(
   selectSpaceWithRoleFromOrg(role, orgId),
   getCurrentUserCFEndpointRolesState(endpointGuid)
 );
diff --git a/src/frontend/packages/cloud-foundry/src/store/selectors/cf-users-roles.selector.ts b/src/frontend/packages/cloud-foundry/src/store/selectors/cf-users-roles.selector.ts
new file mode 100644
index 0000000000..2d5707711f
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/store/selectors/cf-users-roles.selector.ts
@@ -0,0 +1,50 @@
+import { compose } from '@ngrx/store';
+
+import { CFAppState } from '../../cf-app-state';
+import { IUserPermissionInOrg } from '../types/cf-user.types';
+import { UsersRolesState } from '../types/users-roles.types';
+
+export const selectCfUsersRoles = (state: CFAppState): UsersRolesState => state.manageUsersRoles;
+
+const selectUsers = (usersRoles: UsersRolesState) => usersRoles.users;
+export const selectCfUsersRolesPicked = compose(
+  selectUsers,
+  selectCfUsersRoles
+);
+
+const selectNewRoles = (usersRoles: UsersRolesState) => usersRoles.newRoles;
+export const selectCfUsersRolesRoles = compose(
+  selectNewRoles,
+  selectCfUsersRoles
+);
+
+const selectCfGuid = (usersRoles: UsersRolesState) => usersRoles.cfGuid;
+export const selectCfUsersRolesCf = compose(
+  selectCfGuid,
+  selectCfUsersRoles
+);
+
+const selectChanged = (usersRoles: UsersRolesState) => usersRoles.changedRoles;
+export const selectCfUsersRolesChangedRoles = compose(
+  selectChanged,
+  selectCfUsersRoles
+);
+
+const selectNewRoleOrgGuid = (newRoles: IUserPermissionInOrg) => newRoles.orgGuid;
+export const selectCfUsersRolesOrgGuid = compose(
+  selectNewRoleOrgGuid,
+  selectNewRoles,
+  selectCfUsersRoles
+);
+
+const isRemove = (usersRoles: UsersRolesState) => usersRoles.isRemove;
+export const selectCfUsersIsRemove = compose(
+  isRemove,
+  selectCfUsersRoles
+);
+
+const isSetByUsername = (usersRoles: UsersRolesState) => usersRoles.isSetByUsername;
+export const selectCfUsersIsSetByUsername = compose(
+  isSetByUsername,
+  selectCfUsersRoles
+);
diff --git a/src/frontend/packages/cloud-foundry/src/store/selectors/cloud-foundry.selector.ts b/src/frontend/packages/cloud-foundry/src/store/selectors/cloud-foundry.selector.ts
deleted file mode 100644
index 61e11d3b7c..0000000000
--- a/src/frontend/packages/cloud-foundry/src/store/selectors/cloud-foundry.selector.ts
+++ /dev/null
@@ -1 +0,0 @@
-// export const getInfoGuid = compose(getMetadataGuid, getAPIResourceMetadata);
diff --git a/src/frontend/packages/cloud-foundry/src/store/types/cf-current-user-roles.types.ts b/src/frontend/packages/cloud-foundry/src/store/types/cf-current-user-roles.types.ts
index f535579799..83640a6cf8 100644
--- a/src/frontend/packages/cloud-foundry/src/store/types/cf-current-user-roles.types.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/types/cf-current-user-roles.types.ts
@@ -1,6 +1,5 @@
 import { RolesRequestState } from '../../../../store/src/types/current-user-roles.types';
 
-
 export enum RoleEntities {
   ORGS = 'organizations',
   SPACES = 'spaces'
@@ -40,5 +39,5 @@ export interface ICfRolesState {
 }
 
 export interface IAllCfRolesState {
-  [guid: string]: ICfRolesState;
+  [guid: string]: ICfRolesState
 }
diff --git a/src/frontend/packages/cloud-foundry/src/store/types/user.types.ts b/src/frontend/packages/cloud-foundry/src/store/types/cf-user.types.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/store/types/user.types.ts
rename to src/frontend/packages/cloud-foundry/src/store/types/cf-user.types.ts
diff --git a/src/frontend/packages/cloud-foundry/src/store/types/users-roles.types.ts b/src/frontend/packages/cloud-foundry/src/store/types/users-roles.types.ts
index 5e9b41a9da..e6c7dcb045 100644
--- a/src/frontend/packages/cloud-foundry/src/store/types/users-roles.types.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/types/users-roles.types.ts
@@ -1,4 +1,4 @@
-import { CfUser, CfUserRoleParams, IUserPermissionInOrg, OrgUserRoleNames, SpaceUserRoleNames } from './user.types';
+import { CfUser, CfUserRoleParams, IUserPermissionInOrg, OrgUserRoleNames, SpaceUserRoleNames } from './cf-user.types';
 
 export interface UsersRolesState {
   cfGuid: string;
diff --git a/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-permissions-checkers.ts b/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-permissions-checkers.ts
new file mode 100644
index 0000000000..b38816caf9
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-permissions-checkers.ts
@@ -0,0 +1,492 @@
+import { Store } from '@ngrx/store';
+import { combineLatest, Observable, of } from 'rxjs';
+import { distinctUntilChanged, filter, map, switchMap } from 'rxjs/operators';
+
+import {
+  IPermissionConfigs,
+  PermissionConfig,
+  PermissionConfigLink,
+  PermissionTypes,
+  PermissionValues,
+} from '../../../core/src/core/permissions/current-user-permissions.config';
+import {
+  CurrentUserPermissionsService,
+  CUSTOM_USER_PERMISSION_CHECKERS,
+} from '../../../core/src/core/permissions/current-user-permissions.service';
+import {
+  BaseCurrentUserPermissionsChecker,
+  IConfigGroup,
+  IConfigGroups,
+  ICurrentUserPermissionsChecker,
+  IPermissionCheckCombiner,
+} from '../../../core/src/core/permissions/current-user-permissions.types';
+import { GeneralEntityAppState } from '../../../store/src/app-state';
+import { connectedEndpointsSelector } from '../../../store/src/selectors/endpoint.selectors';
+import { CFFeatureFlagTypes, IFeatureFlag } from '../cf-api.types';
+import { cfEntityCatalog } from '../cf-entity-catalog';
+import { CF_ENDPOINT_TYPE } from '../cf-types';
+import {
+  getCurrentUserCFEndpointHasScope,
+  getCurrentUserCFEndpointRolesState,
+  getCurrentUserCFGlobalState,
+} from '../store/selectors/cf-current-user-role.selectors';
+import { IOrgRoleState, ISpaceRoleState, ISpacesRoleState } from '../store/types/cf-current-user-roles.types';
+
+export const cfCurrentUserPermissionsService = [
+  {
+    provide: CUSTOM_USER_PERMISSION_CHECKERS,
+    useFactory: (store: Store<GeneralEntityAppState>) => [new CfUserPermissionsChecker(store)],
+    deps: [Store]
+  },
+  CurrentUserPermissionsService,
+]
+
+export enum CfCurrentUserPermissions {
+  APPLICATION_VIEW = 'view.application',
+  APPLICATION_EDIT = 'edit.application',
+  APPLICATION_CREATE = 'create.application',
+  APPLICATION_MANAGE = 'manage.application',
+  APPLICATION_VIEW_ENV_VARS = 'env-vars.view.application',
+  SPACE_VIEW = 'view.space',
+  SPACE_CREATE = 'create.space',
+  SPACE_DELETE = 'delete.space',
+  SPACE_EDIT = 'edit.space',
+  SPACE_CHANGE_ROLES = 'change-roles.space',
+  ROUTE_CREATE = 'create.route',
+  // ROUTE_BINDING_CREATE = 'create.binding.route',
+  QUOTA_CREATE = 'create.quota',
+  QUOTA_EDIT = 'edit.quota',
+  QUOTA_DELETE = 'delete.quota',
+  SPACE_QUOTA_CREATE = 'create.space-quota',
+  SPACE_QUOTA_EDIT = 'edit.space-quota',
+  SPACE_QUOTA_DELETE = 'delete.space-quota',
+  ORGANIZATION_CREATE = 'create.org',
+  ORGANIZATION_DELETE = 'delete.org',
+  ORGANIZATION_EDIT = 'edit.org',
+  ORGANIZATION_SUSPEND = 'suspend.org',
+  ORGANIZATION_CHANGE_ROLES = 'change-roles.org',
+  SERVICE_INSTANCE_DELETE = 'delete.service-instance',
+  SERVICE_INSTANCE_CREATE = 'create.service-instance',
+  SERVICE_BINDING_EDIT = 'edit.service-binding',
+  FIREHOSE_VIEW = 'view-firehose',
+  SERVICE_INSTANCE_EDIT = 'edit.service-instance'
+}
+
+export enum CfPermissionStrings {
+  _GLOBAL_ = 'global',
+  SPACE_MANAGER = 'isManager',
+  SPACE_AUDITOR = 'isAuditor',
+  SPACE_DEVELOPER = 'isDeveloper',
+  ORG_MANAGER = 'isManager',
+  ORG_AUDITOR = 'isAuditor',
+  ORG_BILLING_MANAGER = 'isBillingManager',
+  ORG_USER = 'isUser',
+}
+
+export enum CfScopeStrings {
+  CF_ADMIN_GROUP = 'cloud_controller.admin',
+  CF_READ_ONLY_ADMIN_GROUP = 'cloud_controller.admin_read_only',
+  CF_ADMIN_GLOBAL_AUDITOR_GROUP = 'cloud_controller.global_auditor',
+  CF_WRITE_SCOPE = 'cloud_controller.write',
+  CF_READ_SCOPE = 'cloud_controller.write',
+}
+
+export enum CfPermissionTypes {
+  SPACE = 'spaces',
+  ORGANIZATION = 'organizations',
+  ENDPOINT = 'endpoint',
+  ENDPOINT_SCOPE = 'endpoint-scope',
+  FEATURE_FLAG = 'feature-flag',
+}
+
+enum CHECKER_GROUPS {
+  CF_GROUP = '__CF_TYPE__'
+}
+
+// For each set permissions are checked by permission types of ENDPOINT, ENDPOINT_SCOPE, STRATOS_SCOPE, FEATURE_FLAG or a random bag.
+// Every group result must be true in order for the permission to be true. A group result is true if all or some of it's permissions are
+// true (see `getCheckFromConfig`).
+export const cfPermissionConfigs: IPermissionConfigs = {
+  [CfCurrentUserPermissions.APPLICATION_VIEW]: [
+    // See #2186
+    new PermissionConfig(CfPermissionTypes.ENDPOINT_SCOPE, CfScopeStrings.CF_READ_ONLY_ADMIN_GROUP),
+    new PermissionConfig(CfPermissionTypes.ENDPOINT_SCOPE, CfScopeStrings.CF_ADMIN_GLOBAL_AUDITOR_GROUP),
+    new PermissionConfig(CfPermissionTypes.ORGANIZATION, CfPermissionStrings.ORG_MANAGER),
+    new PermissionConfig(CfPermissionTypes.SPACE, CfPermissionStrings.SPACE_MANAGER),
+    new PermissionConfig(CfPermissionTypes.SPACE, CfPermissionStrings.SPACE_AUDITOR),
+    new PermissionConfig(CfPermissionTypes.SPACE, CfPermissionStrings.SPACE_DEVELOPER)
+  ],
+  [CfCurrentUserPermissions.APPLICATION_CREATE]: new PermissionConfig(CfPermissionTypes.SPACE, CfPermissionStrings.SPACE_DEVELOPER),
+  [CfCurrentUserPermissions.APPLICATION_MANAGE]: new PermissionConfig(CfPermissionTypes.SPACE, CfPermissionStrings.SPACE_DEVELOPER),
+  [CfCurrentUserPermissions.APPLICATION_EDIT]: new PermissionConfig(CfPermissionTypes.SPACE, CfPermissionStrings.SPACE_DEVELOPER),
+  [CfCurrentUserPermissions.APPLICATION_VIEW_ENV_VARS]: new PermissionConfig(CfPermissionTypes.SPACE, CfPermissionStrings.SPACE_DEVELOPER),
+  [CfCurrentUserPermissions.SPACE_VIEW]: [
+    // See #2186
+    new PermissionConfig(CfPermissionTypes.ENDPOINT_SCOPE, CfScopeStrings.CF_READ_ONLY_ADMIN_GROUP),
+    new PermissionConfig(CfPermissionTypes.ENDPOINT_SCOPE, CfScopeStrings.CF_ADMIN_GLOBAL_AUDITOR_GROUP),
+    new PermissionConfig(CfPermissionTypes.ORGANIZATION, CfPermissionStrings.ORG_MANAGER),
+    new PermissionConfig(CfPermissionTypes.SPACE, CfPermissionStrings.SPACE_MANAGER),
+    new PermissionConfig(CfPermissionTypes.SPACE, CfPermissionStrings.SPACE_AUDITOR),
+    new PermissionConfig(CfPermissionTypes.SPACE, CfPermissionStrings.SPACE_DEVELOPER)
+  ],
+  [CfCurrentUserPermissions.SPACE_CREATE]: new PermissionConfig(CfPermissionTypes.ORGANIZATION, CfPermissionStrings.ORG_MANAGER),
+  [CfCurrentUserPermissions.SPACE_DELETE]: new PermissionConfig(CfPermissionTypes.ORGANIZATION, CfPermissionStrings.ORG_MANAGER),
+  [CfCurrentUserPermissions.SPACE_EDIT]: [
+    new PermissionConfig(CfPermissionTypes.ORGANIZATION, CfPermissionStrings.ORG_MANAGER),
+    new PermissionConfig(CfPermissionTypes.SPACE, CfPermissionStrings.SPACE_MANAGER),
+  ],
+  [CfCurrentUserPermissions.SPACE_CHANGE_ROLES]: [
+    new PermissionConfig(CfPermissionTypes.ORGANIZATION, CfPermissionStrings.ORG_MANAGER),
+    new PermissionConfig(CfPermissionTypes.SPACE, CfPermissionStrings.SPACE_MANAGER)
+  ],
+  // TODO: See #4189. Wire in. Can be org manager?
+  [CfCurrentUserPermissions.ROUTE_CREATE]: [
+    new PermissionConfig(CfPermissionTypes.FEATURE_FLAG, CFFeatureFlagTypes.route_creation),
+    new PermissionConfig(CfPermissionTypes.SPACE, CfPermissionStrings.SPACE_DEVELOPER)
+  ],
+  [CfCurrentUserPermissions.QUOTA_CREATE]: new PermissionConfig(CfPermissionTypes.ENDPOINT_SCOPE, CfScopeStrings.CF_ADMIN_GROUP),
+  [CfCurrentUserPermissions.QUOTA_EDIT]: new PermissionConfig(CfPermissionTypes.ENDPOINT_SCOPE, CfScopeStrings.CF_ADMIN_GROUP),
+  [CfCurrentUserPermissions.QUOTA_DELETE]: new PermissionConfig(CfPermissionTypes.ENDPOINT_SCOPE, CfScopeStrings.CF_ADMIN_GROUP),
+  [CfCurrentUserPermissions.SPACE_QUOTA_CREATE]: new PermissionConfig(CfPermissionTypes.ORGANIZATION, CfPermissionStrings.ORG_MANAGER),
+  [CfCurrentUserPermissions.SPACE_QUOTA_EDIT]: new PermissionConfig(CfPermissionTypes.ORGANIZATION, CfPermissionStrings.ORG_MANAGER),
+  [CfCurrentUserPermissions.SPACE_QUOTA_DELETE]: new PermissionConfig(CfPermissionTypes.ORGANIZATION, CfPermissionStrings.ORG_MANAGER),
+  [CfCurrentUserPermissions.ORGANIZATION_CREATE]: [
+    // is admin (checked for everything) or FF is on and user has a role
+    new PermissionConfig(CfPermissionTypes.FEATURE_FLAG, CFFeatureFlagTypes.user_org_creation),
+    new PermissionConfig(CfPermissionTypes.ORGANIZATION, CfPermissionStrings.ORG_MANAGER),
+    new PermissionConfig(CfPermissionTypes.ORGANIZATION, CfPermissionStrings.ORG_AUDITOR),
+    new PermissionConfig(CfPermissionTypes.ORGANIZATION, CfPermissionStrings.ORG_BILLING_MANAGER),
+    new PermissionConfig(CfPermissionTypes.ORGANIZATION, CfPermissionStrings.ORG_USER),
+    new PermissionConfig(CfPermissionTypes.SPACE, CfPermissionStrings.SPACE_MANAGER),
+    new PermissionConfig(CfPermissionTypes.SPACE, CfPermissionStrings.SPACE_AUDITOR),
+    new PermissionConfig(CfPermissionTypes.SPACE, CfPermissionStrings.SPACE_DEVELOPER)
+  ],
+  [CfCurrentUserPermissions.ORGANIZATION_DELETE]: new PermissionConfig(CfPermissionTypes.ENDPOINT_SCOPE, CfScopeStrings.CF_ADMIN_GROUP),
+  [CfCurrentUserPermissions.ORGANIZATION_EDIT]: new PermissionConfigLink(CfCurrentUserPermissions.ORGANIZATION_DELETE),
+  [CfCurrentUserPermissions.ORGANIZATION_SUSPEND]: new PermissionConfig(CfPermissionTypes.ENDPOINT_SCOPE, CfScopeStrings.CF_ADMIN_GROUP),
+  [CfCurrentUserPermissions.ORGANIZATION_CHANGE_ROLES]: new PermissionConfig(CfPermissionTypes.ORGANIZATION, CfPermissionStrings.ORG_MANAGER),
+  [CfCurrentUserPermissions.SERVICE_INSTANCE_DELETE]: new PermissionConfig(CfPermissionTypes.SPACE, CfPermissionStrings.SPACE_DEVELOPER),
+  [CfCurrentUserPermissions.SERVICE_INSTANCE_CREATE]: new PermissionConfig(CfPermissionTypes.SPACE, CfPermissionStrings.SPACE_DEVELOPER),
+  [CfCurrentUserPermissions.SERVICE_INSTANCE_EDIT]: new PermissionConfig(CfPermissionTypes.SPACE, CfPermissionStrings.SPACE_DEVELOPER),
+  [CfCurrentUserPermissions.SERVICE_BINDING_EDIT]: new PermissionConfig(CfPermissionTypes.SPACE, CfPermissionStrings.SPACE_DEVELOPER),
+  [CfCurrentUserPermissions.FIREHOSE_VIEW]: [
+    new PermissionConfig(CfPermissionTypes.ENDPOINT_SCOPE, CfScopeStrings.CF_READ_ONLY_ADMIN_GROUP)
+  ],
+};
+
+export class CfUserPermissionsChecker extends BaseCurrentUserPermissionsChecker implements ICurrentUserPermissionsChecker {
+  static readonly ALL_SPACES = 'PERMISSIONS__ALL_SPACES_PLEASE';
+
+  constructor(private store: Store<GeneralEntityAppState>) {
+    super();
+  }
+
+  getPermissionConfig(action: string) {
+    return cfPermissionConfigs[action];
+  }
+
+  private check(
+    type: PermissionTypes,
+    permission: PermissionValues,
+    endpointGuid?: string,
+    orgOrSpaceGuid?: string,
+    allSpacesWithinOrg = false
+  ) {
+    if (type === CfPermissionTypes.ENDPOINT_SCOPE) {
+      if (!endpointGuid) {
+        return of(false);
+      }
+      return this.store.select(getCurrentUserCFEndpointHasScope(endpointGuid, permission as CfScopeStrings));
+    }
+
+    if (type === CfPermissionTypes.ENDPOINT) {
+      return this.store.select(getCurrentUserCFGlobalState(endpointGuid, permission));
+    }
+    return this.getCfEndpointState(endpointGuid).pipe(
+      filter(state => !!state),
+      map(state => {
+        const permissionString = permission as CfPermissionStrings;
+        if (allSpacesWithinOrg) {
+          const spaceState = state[CfPermissionTypes.SPACE];
+          return this.checkAllSpacesInOrg(state[CfPermissionTypes.ORGANIZATION][orgOrSpaceGuid], spaceState, permissionString);
+        }
+        return this.selectPermission(state[type][orgOrSpaceGuid], permissionString);
+      }),
+      distinctUntilChanged(),
+    );
+  };
+
+  /**
+  * @param permissionConfig Single permission to be checked
+  */
+  public getSimpleCheck(permissionConfig: PermissionConfig, endpointGuid?: string, orgOrSpaceGuid?: string, spaceGuid?: string) {
+    const check$ = this.getBaseSimpleCheck(permissionConfig, endpointGuid, orgOrSpaceGuid, spaceGuid);
+    if (permissionConfig.type === CfPermissionTypes.ORGANIZATION || permissionConfig.type === CfPermissionTypes.SPACE) {
+      return this.applyAdminCheck(check$, endpointGuid);
+    }
+    return check$;
+  }
+
+  private getBaseSimpleCheck(permissionConfig: PermissionConfig, endpointGuid?: string, orgOrSpaceGuid?: string, spaceGuid?: string) {
+    switch (permissionConfig.type) {
+      case (CfPermissionTypes.FEATURE_FLAG):
+        return this.getFeatureFlagCheck(permissionConfig, endpointGuid);
+      case (CfPermissionTypes.ORGANIZATION):
+      case (CfPermissionTypes.SPACE):
+      case (CfPermissionTypes.ENDPOINT):
+        return this.getCfCheck(permissionConfig, endpointGuid, orgOrSpaceGuid, spaceGuid);
+      case (CfPermissionTypes.ENDPOINT_SCOPE):
+        return this.getEndpointScopesCheck(permissionConfig.permission as CfScopeStrings, endpointGuid);
+    }
+  }
+
+  private getEndpointScopesCheck(permission: CfScopeStrings, endpointGuid?: string) {
+    const endpointGuids$ = this.getEndpointGuidObservable(endpointGuid);
+    return endpointGuids$.pipe(
+      switchMap(guids => combineLatest(guids.map(guid => this.check(CfPermissionTypes.ENDPOINT_SCOPE, permission, endpointGuid)))),
+      map(checks => checks.some(check => check)),
+      distinctUntilChanged()
+    );
+  }
+
+  private getEndpointScopesChecks(
+    configs: PermissionConfig[],
+    endpoint?: string
+  ) {
+    return configs.map(config => {
+      const { permission } = config;
+      return this.getEndpointScopesCheck(permission as CfScopeStrings, endpoint);
+    });
+  }
+
+  private getCfChecks(
+    configs: PermissionConfig[],
+    endpointGuid?: string,
+    orgOrSpaceGuid?: string,
+    spaceGuid?: string
+  ): Observable<boolean>[] {
+    return configs.map(config => this.getCfCheck(config, endpointGuid, orgOrSpaceGuid, spaceGuid));
+  }
+
+  private getCfCheck(config: PermissionConfig, endpointGuid?: string, orgOrSpaceGuid?: string, spaceGuid?: string): Observable<boolean> {
+    const { type, permission } = config;
+    const checkAllSpaces = spaceGuid === CfUserPermissionsChecker.ALL_SPACES;
+    const actualGuid = type === CfPermissionTypes.SPACE && spaceGuid && !checkAllSpaces ? spaceGuid : orgOrSpaceGuid;
+    const cfPermissions = permission as CfPermissionStrings;
+    if (type === CfPermissionTypes.ENDPOINT || (endpointGuid && actualGuid)) {
+      return this.check(type, cfPermissions, endpointGuid, actualGuid, checkAllSpaces);
+    } else if (!actualGuid) {
+      const endpointGuids$ = this.getEndpointGuidObservable(endpointGuid);
+      return endpointGuids$.pipe(
+        switchMap(guids => combineLatest(guids.map(guid => this.checkAllOfType(guid, type as CfPermissionTypes, cfPermissions)))),
+        map(checks => checks.some(check => check)),
+        distinctUntilChanged()
+      );
+    }
+    return of(false);
+  }
+
+  private getFeatureFlagChecks(configs: PermissionConfig[], endpointGuid?: string): Observable<boolean>[] {
+    return configs.map(config => {
+      return this.getFeatureFlagCheck(config, endpointGuid);
+    });
+  }
+
+  private getFeatureFlagCheck(config: PermissionConfig, endpointGuid?: string): Observable<boolean> {
+    const permission = config.permission as CFFeatureFlagTypes;
+    const endpointGuids$ = this.getEndpointGuidObservable(endpointGuid);
+    return endpointGuids$.pipe(
+      switchMap(guids => {
+        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$;
+        return combineLatest(guids.map(createFFObs));
+      }),
+      map(endpointFeatureFlags => endpointFeatureFlags.some(featureFlags => this.checkFeatureFlag(featureFlags, permission))),
+      // startWith(false), // Don't start with anything, this ensures first value out can be trusted. Should never get to the point where
+      // nothing is returned
+      distinctUntilChanged(),
+    );
+  }
+
+  private checkFeatureFlag(featureFlags: IFeatureFlag[], permission: CFFeatureFlagTypes) {
+    const flag = featureFlags.find(ff => ff.name === permission.toString());
+    if (!flag) {
+      return false;
+    }
+    return flag.enabled;
+  }
+
+  private getAdminChecks(endpointGuid?: string) {
+    const endpointGuids$ = this.getEndpointGuidObservable(endpointGuid);
+    return endpointGuids$.pipe(
+      map(guids => guids.map(guid => this.getCfAdminCheck(guid))),
+      switchMap(checks => BaseCurrentUserPermissionsChecker.reduceChecks(checks)),
+    );
+  }
+
+  /**
+ * Includes read only admins, global auditors and users that don't have the cloud_controller.write scope
+ */
+  private getReadOnlyCheck(endpointGuid: string) {
+    return this.getCfEndpointState(endpointGuid).pipe(
+      map(
+        cfPermissions => (
+          cfPermissions && (
+            cfPermissions.global.isGlobalAuditor ||
+            cfPermissions.global.isReadOnlyAdmin ||
+            !cfPermissions.global.canWrite
+          )
+        )
+      ),
+      distinctUntilChanged()
+    );
+  }
+
+  private applyAdminCheck(check$: Observable<boolean>, endpointGuid?: string): Observable<boolean> {
+    const adminCheck$ = this.getAdminChecks(endpointGuid);
+    const readOnlyCheck$ = this.getReadOnlyChecks(endpointGuid);
+    return combineLatest(
+      adminCheck$,
+      readOnlyCheck$
+    ).pipe(
+      distinctUntilChanged(),
+      switchMap(([isAdmin, isReadOnly]) => {
+        if (isAdmin) {
+          return of(true);
+        }
+        if (isReadOnly) {
+          return of(false);
+        }
+        return check$;
+      })
+    );
+  }
+
+  /**
+ * If no endpoint is passed, check them all
+ */
+  private getReadOnlyChecks(endpointGuid?: string) {
+    const endpointGuids$ = this.getEndpointGuidObservable(endpointGuid);
+    return endpointGuids$.pipe(
+      map(guids => guids.map(guid => this.getReadOnlyCheck(guid))),
+      switchMap(checks => BaseCurrentUserPermissionsChecker.reduceChecks(checks, '&&'))
+    );
+  }
+
+  private getCfAdminCheck(endpointGuid: string) {
+    return this.getCfEndpointState(endpointGuid).pipe(
+      filter(cfPermissions => !!cfPermissions),
+      map(cfPermissions => cfPermissions.global.isAdmin)
+    );
+  }
+
+  private checkAllOfType(endpointGuid: string, type: CfPermissionTypes, permission: CfPermissionStrings, orgGuid?: string) {
+    return this.getCfEndpointState(endpointGuid).pipe(
+      map(state => {
+        if (!state || !state[type]) {
+          return false;
+        }
+        return Object.keys(state[type]).some(guid => {
+          return this.selectPermission(state[type][guid], permission);
+        });
+      })
+    );
+  }
+
+  private getAllEndpointGuids() {
+    return this.store.select(connectedEndpointsSelector).pipe(
+      map(endpoints => Object.values(endpoints).filter(e => e.cnsi_type === CF_ENDPOINT_TYPE).map(endpoint => endpoint.guid))
+    );
+  }
+
+  private getEndpointGuidObservable(endpointGuid: string) {
+    return !endpointGuid ? this.getAllEndpointGuids() : of([endpointGuid]);
+  }
+
+  private selectPermission(state: IOrgRoleState | ISpaceRoleState, permission: CfPermissionStrings): boolean {
+    return state ? state[permission] || false : false;
+  }
+
+  private checkAllSpacesInOrg(orgState: IOrgRoleState, endpointSpaces: ISpacesRoleState, permission: CfPermissionStrings) {
+    const spaceGuids = !!orgState && orgState.spaceGuids ? orgState.spaceGuids : [];
+    return spaceGuids.map(spaceGuid => {
+      const space = endpointSpaces[spaceGuid];
+      return space ? space[permission] || false : false;
+    }).some(check => check);
+
+  }
+
+  private getCfEndpointState(endpointGuid: string) {
+    return this.store.select(getCurrentUserCFEndpointRolesState(endpointGuid));
+  }
+
+  public getComplexCheck(
+    permissionConfigs: PermissionConfig[],
+    endpointGuid?: string,
+    orgOrSpaceGuid?: string,
+    spaceGuid?: string
+  ): IPermissionCheckCombiner[] {
+    const groupedChecks = this.groupConfigs(permissionConfigs);
+    return Object.keys(groupedChecks).map((permission: PermissionTypes) => {
+      const configGroup = groupedChecks[permission];
+      const checkCombiner = this.getBaseCheckFromConfig(configGroup, permission, endpointGuid, orgOrSpaceGuid, spaceGuid)
+      if (checkCombiner) {
+        checkCombiner.checks = checkCombiner.checks.map(check$ => this.applyAdminCheck(check$, endpointGuid))
+      }
+      return checkCombiner;
+    });
+  }
+
+
+  private groupConfigs(configs: PermissionConfig[]): IConfigGroups {
+    return configs.reduce((grouped, config) => {
+      const type = this.getGroupType(config);
+      return {
+        ...grouped,
+        [type]: [
+          ...(grouped[type] || []),
+          config
+        ]
+      };
+    }, {});
+  }
+
+  private getGroupType(config: PermissionConfig) {
+    if (config.type === CfPermissionTypes.ORGANIZATION || config.type === CfPermissionTypes.SPACE) {
+      return CHECKER_GROUPS.CF_GROUP;
+    }
+    return config.type;
+  }
+
+
+  private getBaseCheckFromConfig(
+    configGroup: IConfigGroup,
+    permission: CfPermissionTypes | CHECKER_GROUPS | string,
+    endpointGuid?: string,
+    orgOrSpaceGuid?: string,
+    spaceGuid?: string
+  ): IPermissionCheckCombiner {
+    switch (permission) {
+      case CfPermissionTypes.ENDPOINT_SCOPE:
+        return {
+          checks: this.getEndpointScopesChecks(configGroup, endpointGuid),
+        };
+      case CfPermissionTypes.FEATURE_FLAG:
+        return {
+          checks: this.getFeatureFlagChecks(configGroup, endpointGuid),
+          combineType: '&&'
+        };
+      case CHECKER_GROUPS.CF_GROUP:
+        return {
+          checks: this.getCfChecks(configGroup, endpointGuid, orgOrSpaceGuid, spaceGuid)
+        };
+    }
+  }
+
+  public getFallbackCheck(endpointGuid: string, endpointType: string) {
+    return endpointType === CF_ENDPOINT_TYPE ? this.getCfAdminCheck(endpointGuid) : null;
+  };
+
+}
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-roles-fetch.ts b/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-roles-fetch.ts
new file mode 100644
index 0000000000..ec6687ced1
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-roles-fetch.ts
@@ -0,0 +1,218 @@
+import { HttpClient } from '@angular/common/http';
+import { Action, Store } from '@ngrx/store';
+import { combineLatest, Observable, of } from 'rxjs';
+import { catchError, first, map, pairwise, share, skipWhile, switchMap, tap } from 'rxjs/operators';
+
+import { LoggerService } from '../../../core/src/core/logger.service';
+import { AppState } from '../../../store/src/app-state';
+import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
+import {
+  EntityUserRolesEndpoint,
+  EntityUserRolesFetch,
+} from '../../../store/src/entity-request-pipeline/entity-request-pipeline.types';
+import {
+  BaseHttpClientFetcher,
+  flattenPagination,
+  PaginationFlattener,
+} from '../../../store/src/helpers/paginated-request-helpers';
+import { ActionState } from '../../../store/src/reducers/api-request-reducer/types';
+import { connectedEndpointsOfTypesSelector } from '../../../store/src/selectors/endpoint.selectors';
+import { selectPaginationState } from '../../../store/src/selectors/pagination.selectors';
+import { BasePaginatedAction, PaginationEntityState } from '../../../store/src/types/pagination.types';
+import {
+  CfUserRelationTypes,
+  GET_CURRENT_CF_USER_RELATIONS,
+  GET_CURRENT_CF_USER_RELATIONS_FAILED,
+  GET_CURRENT_CF_USER_RELATIONS_SUCCESS,
+  GetCfUserRelations,
+  GetCurrentCfUserRelations,
+  GetCurrentCfUserRelationsComplete,
+} from '../actions/permissions.actions';
+import { cfEntityCatalog } from '../cf-entity-catalog';
+import { CF_ENDPOINT_TYPE } from '../cf-types';
+import { CFResponse } from '../store/types/cf-api.types';
+
+const createEndpointArray = (store: Store<AppState>, endpoints: string[] | EntityUserRolesEndpoint[]): Observable<EntityUserRolesEndpoint[]> => {
+  // If there's no endpoints get all from store. Alternatively fetch specific endpoint id's from store
+  if (!endpoints || !endpoints.length || typeof (endpoints[0]) === 'string') {
+    const endpointIds = endpoints as string[];
+    return store.select(connectedEndpointsOfTypesSelector(CF_ENDPOINT_TYPE)).pipe(
+      first(),
+      map(cfEndpoints => endpointIds.length === 0 ?
+        Object.values(cfEndpoints) :
+        Object.values(cfEndpoints).filter(cfEndpoint => endpointIds.find(endpointId => endpointId === cfEndpoint.guid))
+      ),
+    );
+  }
+  return of(endpoints as EntityUserRolesEndpoint[]);
+}
+
+export const cfUserRolesFetch: EntityUserRolesFetch = (
+  endpoints: string[] | EntityUserRolesEndpoint[],
+  store: Store<AppState>,
+  logService: LoggerService,
+  httpClient: HttpClient
+) => {
+  return createEndpointArray(store, endpoints).pipe(
+    switchMap((cfEndpoints: EntityUserRolesEndpoint[]) => {
+      const isAllAdmins = cfEndpoints.every(endpoint => !!endpoint.user.admin);
+      // If all endpoints are connected as admin, there's no permissions to fetch. So only update the permission state to initialised
+      if (isAllAdmins) {
+        cfEndpoints.forEach(endpoint => store.dispatch(new GetCfUserRelations(endpoint.guid, GET_CURRENT_CF_USER_RELATIONS_SUCCESS)))
+      } else {
+        // If some endpoints are not connected as admin, go out and fetch the current user's specific roles
+        const flagsAndRoleRequests = dispatchRoleRequests(cfEndpoints, store, logService, httpClient);
+        const allRequestsCompleted = handleCfRequests(flagsAndRoleRequests);
+        return combineLatest(allRequestsCompleted).pipe(
+          map(succeeds => succeeds.every(succeeded => !!succeeded)),
+        );
+      }
+      return of(true);
+    })
+  )
+}
+
+interface CfsRequestState {
+  [cfGuid: string]: Observable<boolean>[];
+}
+
+interface IEndpointConnectionInfo {
+  guid: string;
+  userGuid: string;
+}
+
+function dispatchRoleRequests(
+  endpoints: EntityUserRolesEndpoint[],
+  store: Store<AppState>,
+  logService: LoggerService,
+  httpClient: HttpClient
+): CfsRequestState {
+  const requests: CfsRequestState = {};
+
+  // Per endpoint fetch feature flags and user roles (unless admin, where we don't need to), then mark endpoint as initialised
+  endpoints.forEach(endpoint => {
+    if (endpoint.user.admin) {
+      // We don't need permissions for admin users (they can do everything)
+      requests[endpoint.guid] = [of(true)];
+      store.dispatch(new GetCfUserRelations(endpoint.guid, GET_CURRENT_CF_USER_RELATIONS_SUCCESS));
+    } else {
+      // START fetching cf roles for current user
+      store.dispatch(new GetCfUserRelations(endpoint.guid, GET_CURRENT_CF_USER_RELATIONS));
+
+      // Dispatch feature flags fetch actions
+      const ffAction = cfEntityCatalog.featureFlag.actions.getMultiple(endpoint.guid)
+      requests[endpoint.guid] = [createPaginationCompleteWatcher(store, ffAction)];
+      store.dispatch(ffAction);
+
+      // Dispatch requests to fetch roles per role type for current user
+      requests[endpoint.guid].push(...fetchCfUserRoles({ guid: endpoint.guid, userGuid: endpoint.user.guid }, store, httpClient));
+
+      // FINISH fetching cf roles for current user
+      combineLatest(requests[endpoint.guid]).pipe(
+        first(),
+        tap(succeeds => {
+          store.dispatch(new GetCfUserRelations(
+            endpoint.guid,
+            succeeds.every(succeeded => !!succeeded) ? GET_CURRENT_CF_USER_RELATIONS_SUCCESS : GET_CURRENT_CF_USER_RELATIONS_FAILED)
+          );
+        }),
+        catchError(err => {
+          logService.warn('Failed to fetch current user permissions for a cf: ', err);
+          store.dispatch(new GetCfUserRelations(endpoint.guid, GET_CURRENT_CF_USER_RELATIONS_FAILED));
+          return of(err);
+        })
+      ).subscribe();
+    }
+  });
+  return requests;
+}
+
+function handleCfRequests(requests: CfsRequestState): Observable<boolean>[] {
+  const allCompleted: Observable<boolean>[] = [];
+  Object.keys(requests).forEach(cfGuid => {
+    const successes = requests[cfGuid];
+    allCompleted.push(...successes);
+  });
+  return allCompleted;
+}
+
+function fetchCfUserRoles(endpoint: IEndpointConnectionInfo, store: Store<AppState>, httpClient: HttpClient): Observable<boolean>[] {
+  return Object.values(CfUserRelationTypes).map((type: CfUserRelationTypes) => {
+    const relAction = new GetCurrentCfUserRelations(endpoint.userGuid, type, endpoint.guid);
+    return fetchCfUserRole(store, relAction, httpClient);
+  });
+}
+
+class PermissionFlattener extends BaseHttpClientFetcher<CFResponse> implements PaginationFlattener<CFResponse, CFResponse> {
+
+  constructor(httpClient: HttpClient, public url, public requestOptions: { [key: string]: any }) {
+    super(httpClient, url, requestOptions, 'page');
+  }
+  public getTotalPages = (res: CFResponse) => res.total_pages;
+
+  public mergePages = (res: CFResponse[]) => {
+    const firstRes = res.shift();
+    const final = res.reduce((finalRes, currentRes) => {
+      finalRes.resources = [
+        ...finalRes.resources,
+      ];
+      return finalRes;
+    }, firstRes);
+    return final;
+  }
+  public getTotalResults = (res: CFResponse): number => res.total_results;
+  public clearResults = (res: CFResponse) => of(res);
+}
+
+export function fetchCfUserRole(store: Store<AppState>, action: GetCurrentCfUserRelations, httpClient: HttpClient): Observable<boolean> {
+  const url = `pp/v1/proxy/v2/users/${action.guid}/${action.relationType}`;
+  const params = {
+    headers: {
+      'x-cap-cnsi-list': action.endpointGuid,
+      'x-cap-passthrough': 'true'
+    },
+    params: {
+      'results-per-page': '100'
+    }
+  };
+  const get$ = httpClient.get<CFResponse>(
+    url,
+    params
+  );
+  return flattenPagination(
+    (flatAction: Action) => store.dispatch(flatAction),
+    get$,
+    new PermissionFlattener(httpClient, url, params)
+  ).pipe(
+    map(data => {
+      store.dispatch(new GetCurrentCfUserRelationsComplete(action.relationType, action.endpointGuid, data.resources));
+      return true;
+    }),
+    first(),
+    catchError(err => of(false)),
+    share()
+  );
+}
+
+const fetchPaginationStateFromAction = (store: Store<AppState>, action: BasePaginatedAction) => {
+  const entityKey = entityCatalog.getEntityKey(action);
+  return store.select(selectPaginationState(entityKey, action.paginationKey));
+};
+
+/**
+ * Using the given action wait until the associated pagination section changes from busy to not busy
+ */
+const createPaginationCompleteWatcher = (store: Store<AppState>, action: BasePaginatedAction): Observable<boolean> =>
+  fetchPaginationStateFromAction(store, action).pipe(
+    map((paginationState: PaginationEntityState) => {
+      const pageRequest: ActionState =
+        paginationState && paginationState.pageRequests && paginationState.pageRequests[paginationState.currentPage];
+      return pageRequest ? pageRequest.busy : true;
+    }),
+    pairwise(),
+    map(([oldFetching, newFetching]) => {
+      return oldFetching === true && newFetching === false;
+    }),
+    skipWhile(completed => !completed),
+    first(),
+  );
\ No newline at end of file
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 dfb1e5297e..2174658903 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
@@ -3,7 +3,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { Store, StoreModule } from '@ngrx/store';
-import { testSCFEndpointGuid } from '@stratos/store/testing';
+import { testSCFEndpointGuid } from '@stratosui/store/testing';
 
 import { CoreModule } from '../../core/src/core/core.module';
 import { SharedModule } from '../../core/src/shared/shared.module';
@@ -23,7 +23,7 @@ import {
 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';
-import { createUserRoleInOrg } from '../src/store/types/user.types';
+import { createUserRoleInOrg } from '../src/store/types/cf-user.types';
 import { CfUserServiceTestProvider } from './user-service-helper';
 
 export const cfEndpointServiceProviderDeps = [
diff --git a/src/frontend/packages/core/src/app.component.spec.ts b/src/frontend/packages/core/src/app.component.spec.ts
index ef7f9b6321..1894f848e5 100644
--- a/src/frontend/packages/core/src/app.component.spec.ts
+++ b/src/frontend/packages/core/src/app.component.spec.ts
@@ -1,8 +1,8 @@
 import { async, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreTestingModule } from '../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
 import { AppComponent } from './app.component';
 import { LoggedInService } from './logged-in.service';
 import { SharedModule } from './shared/shared.module';
diff --git a/src/frontend/packages/core/src/app.module.ts b/src/frontend/packages/core/src/app.module.ts
index 1cb71ceaa0..7ba9fb46a1 100644
--- a/src/frontend/packages/core/src/app.module.ts
+++ b/src/frontend/packages/core/src/app.module.ts
@@ -1,13 +1,13 @@
-import { NgModule, Injectable } from '@angular/core';
+import { Injectable, NgModule } 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, DefaultRouterStateSerializer } from '@ngrx/router-store';
+import { DefaultRouterStateSerializer, RouterStateSerializer, StoreRouterConnectingModule } from '@ngrx/router-store';
 import { Store } from '@ngrx/store';
 import { debounceTime, filter, withLatestFrom } from 'rxjs/operators';
 
 import { CfAutoscalerModule } from '../../cf-autoscaler/src/cf-autoscaler.module';
-import { CloudFoundryPackageModule } from '../../cloud-foundry/src/cloud-foundry.module';
+import { CloudFoundryPackageModule } from '../../cloud-foundry/src/cloud-foundry-package.module';
 import { SetRecentlyVisitedEntityAction } from '../../store/src/actions/recently-visited.actions';
 import {
   UpdateUserFavoriteMetadataAction,
@@ -35,6 +35,7 @@ import { CustomizationService } from './core/customizations.types';
 import { DynamicExtensionRoutes } from './core/extension/dynamic-extension-routes';
 import { ExtensionService } from './core/extension/extension-service';
 import { getGitHubAPIURL, GITHUB_API_URL } from './core/github.helpers';
+import { CurrentUserPermissionsService } from './core/permissions/current-user-permissions.service';
 import { UserFavoriteManager } from './core/user-favorite-manager';
 import { CustomImportModule } from './custom-import.module';
 import { AboutModule } from './features/about/about.module';
@@ -116,7 +117,8 @@ export class CustomRouterStateSerializer
     SidePanelService,
     { provide: GITHUB_API_URL, useFactory: getGitHubAPIURL },
     { provide: RouterStateSerializer, useClass: CustomRouterStateSerializer }, // Create action for router navigation
-    { provide: RouteReuseStrategy, useClass: CustomReuseStrategy }
+    { provide: RouteReuseStrategy, useClass: CustomReuseStrategy },
+    CurrentUserPermissionsService
   ],
   bootstrap: [AppComponent]
 })
diff --git a/src/frontend/packages/core/src/core/core.module.ts b/src/frontend/packages/core/src/core/core.module.ts
index e3ee91c394..ff8b4eb280 100644
--- a/src/frontend/packages/core/src/core/core.module.ts
+++ b/src/frontend/packages/core/src/core/core.module.ts
@@ -17,7 +17,6 @@ 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';
@@ -85,7 +84,6 @@ import { WindowRef } from './window-ref/window-ref.service';
     PaginationMonitorFactory,
     UserProfileService,
     EntityServiceFactory,
-    CurrentUserPermissionsService,
     {
       provide: APP_TITLE,
       useFactory: appTitleFactory,
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
deleted file mode 100644
index 1d50f368f4..0000000000
--- a/src/frontend/packages/core/src/core/current-user-permissions.checker.ts
+++ /dev/null
@@ -1,317 +0,0 @@
-import { Store } from '@ngrx/store';
-import { combineLatest, Observable, of as observableOf } from 'rxjs';
-import { distinctUntilChanged, filter, map, switchMap } from 'rxjs/operators';
-
-import { CFFeatureFlagTypes, IFeatureFlag } from '../../../cloud-foundry/src/cf-api.types';
-import { cfEntityCatalog } from '../../../cloud-foundry/src/cf-entity-catalog';
-import {
-  getCurrentUserCFEndpointHasScope,
-  getCurrentUserCFEndpointRolesState,
-  getCurrentUserCFGlobalState,
-} from '../../../cloud-foundry/src/store/selectors/cf-current-user-role.selectors';
-import {
-  IOrgRoleState,
-  ISpaceRoleState,
-  ISpacesRoleState,
-} from '../../../cloud-foundry/src/store/types/cf-current-user-roles.types';
-import { GeneralEntityAppState } from '../../../store/src/app-state';
-import {
-  getCurrentUserStratosHasScope,
-  getCurrentUserStratosRole,
-} from '../../../store/src/selectors/current-user-role.selectors';
-import { connectedEndpointsSelector } from '../../../store/src/selectors/endpoint.selectors';
-import {
-  PermissionConfig,
-  PermissionStrings,
-  PermissionTypes,
-  PermissionValues,
-  ScopeStrings,
-} from './current-user-permissions.config';
-
-
-export interface IConfigGroups {
-  [permissionType: string]: IConfigGroup;
-}
-export enum CHECKER_GROUPS {
-  CF_GROUP = '__CF_TYPE__'
-}
-
-export type IConfigGroup = PermissionConfig[];
-export class CurrentUserPermissionsChecker {
-  static readonly ALL_SPACES = 'PERMISSIONS__ALL_SPACES_PLEASE';
-  constructor(private store: Store<GeneralEntityAppState>, ) { }
-  public check(
-    type: PermissionTypes,
-    permission: PermissionValues,
-    endpointGuid?: string,
-    orgOrSpaceGuid?: string,
-    allSpacesWithinOrg = false
-  ) {
-    if (type === PermissionTypes.STRATOS) {
-      return this.store.select(getCurrentUserStratosRole(permission));
-    }
-
-    if (type === PermissionTypes.STRATOS_SCOPE) {
-      return this.store.select(getCurrentUserStratosHasScope(permission as ScopeStrings));
-    }
-
-    if (type === PermissionTypes.ENDPOINT_SCOPE) {
-      if (!endpointGuid) {
-        return observableOf(false);
-      }
-      return this.store.select(getCurrentUserCFEndpointHasScope(endpointGuid, permission as ScopeStrings));
-    }
-
-    if (type === PermissionTypes.ENDPOINT) {
-      return this.store.select(getCurrentUserCFGlobalState(endpointGuid, permission));
-    }
-    return this.getEndpointState(endpointGuid).pipe(
-      filter(state => !!state),
-      map(state => {
-        const permissionString = permission as PermissionStrings;
-        if (allSpacesWithinOrg) {
-          const spaceState = state[PermissionTypes.SPACE];
-          return this.checkAllSpacesInOrg(state[PermissionTypes.ORGANIZATION][orgOrSpaceGuid], spaceState, permissionString);
-        }
-        return this.selectPermission(state[type][orgOrSpaceGuid], permissionString);
-      }),
-      distinctUntilChanged(),
-    );
-  }
-  /**
-   * @param permissionConfig Single permission to be checked
-   */
-  public getSimpleCheck(permissionConfig: PermissionConfig, endpointGuid?: string, orgOrSpaceGuid?: string, spaceGuid?: string) {
-    switch (permissionConfig.type) {
-      case (PermissionTypes.FEATURE_FLAG):
-        return this.getFeatureFlagCheck(permissionConfig, endpointGuid);
-      case (PermissionTypes.ORGANIZATION):
-      case (PermissionTypes.SPACE):
-      case (PermissionTypes.ENDPOINT):
-        return this.getCfCheck(permissionConfig, endpointGuid, orgOrSpaceGuid, spaceGuid);
-      case (PermissionTypes.STRATOS):
-        return this.getInternalCheck(permissionConfig.permission as PermissionStrings);
-      case (PermissionTypes.STRATOS_SCOPE):
-        return this.getInternalScopesCheck(permissionConfig.permission as ScopeStrings);
-      case (PermissionTypes.ENDPOINT_SCOPE):
-        return this.getEndpointScopesCheck(permissionConfig.permission as ScopeStrings, endpointGuid);
-    }
-  }
-
-  private checkAllSpacesInOrg(orgState: IOrgRoleState, endpointSpaces: ISpacesRoleState, permission: PermissionStrings) {
-    const spaceGuids = !!orgState && orgState.spaceGuids ? orgState.spaceGuids : [];
-    return spaceGuids.map(spaceGuid => {
-      const space = endpointSpaces[spaceGuid];
-      return space ? space[permission] || false : false;
-    }).some(check => check);
-  }
-
-  public getInternalChecks(
-    configs: PermissionConfig[]
-  ) {
-    return configs.map(config => {
-      const { permission } = config;
-      return this.getInternalCheck(permission as PermissionStrings);
-    });
-  }
-
-  public getInternalCheck(permission: PermissionStrings) {
-    return this.check(PermissionTypes.STRATOS, permission);
-  }
-
-  public getInternalScopesChecks(
-    configs: PermissionConfig[]
-  ) {
-    return configs.map(config => {
-      const { permission } = config;
-      return this.getInternalScopesCheck(permission as ScopeStrings);
-    });
-  }
-
-  public getEndpointScopesCheck(permission: ScopeStrings, endpointGuid?: string) {
-    const endpointGuids$ = this.getEndpointGuidObservable(endpointGuid);
-    return endpointGuids$.pipe(
-      switchMap(guids => combineLatest(guids.map(guid => this.check(PermissionTypes.ENDPOINT_SCOPE, permission, endpointGuid)))),
-      map(checks => checks.some(check => check)),
-      distinctUntilChanged()
-    );
-  }
-
-  public getEndpointScopesChecks(
-    configs: PermissionConfig[],
-    endpoint?: string
-  ) {
-    return configs.map(config => {
-      const { permission } = config;
-      return this.getEndpointScopesCheck(permission as ScopeStrings, endpoint);
-    });
-  }
-
-  public getInternalScopesCheck(permission: ScopeStrings) {
-    return this.check(PermissionTypes.STRATOS_SCOPE, permission);
-  }
-
-  public getCfChecks(
-    configs: PermissionConfig[],
-    endpointGuid?: string,
-    orgOrSpaceGuid?: string,
-    spaceGuid?: string
-  ): Observable<boolean>[] {
-    return configs.map(config => this.getCfCheck(config, endpointGuid, orgOrSpaceGuid, spaceGuid));
-  }
-
-  public getCfCheck(config: PermissionConfig, endpointGuid?: string, orgOrSpaceGuid?: string, spaceGuid?: string): Observable<boolean> {
-    const { type, permission } = config;
-    const checkAllSpaces = spaceGuid === CurrentUserPermissionsChecker.ALL_SPACES;
-    const actualGuid = type === PermissionTypes.SPACE && spaceGuid && !checkAllSpaces ? spaceGuid : orgOrSpaceGuid;
-    const cfPermissions = permission as PermissionStrings;
-    if (type === PermissionTypes.ENDPOINT || (endpointGuid && actualGuid)) {
-      return this.check(type, cfPermissions, endpointGuid, actualGuid, checkAllSpaces);
-    } else if (!actualGuid) {
-      const endpointGuids$ = this.getEndpointGuidObservable(endpointGuid);
-      return endpointGuids$.pipe(
-        switchMap(guids => combineLatest(guids.map(guid => this.checkAllOfType(guid, type, cfPermissions)))),
-        map(checks => checks.some(check => check)),
-        distinctUntilChanged()
-      );
-    }
-    return observableOf(false);
-  }
-
-  public getFeatureFlagChecks(configs: PermissionConfig[], endpointGuid?: string): Observable<boolean>[] {
-    return configs.map(config => {
-      return this.getFeatureFlagCheck(config, endpointGuid);
-    });
-  }
-
-  public getFeatureFlagCheck(config: PermissionConfig, endpointGuid?: string): Observable<boolean> {
-    const permission = config.permission as CFFeatureFlagTypes;
-    const endpointGuids$ = this.getEndpointGuidObservable(endpointGuid);
-    return endpointGuids$.pipe(
-      switchMap(guids => {
-        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$;
-        return combineLatest(guids.map(createFFObs));
-      }),
-      map(endpointFeatureFlags => endpointFeatureFlags.some(featureFlags => this.checkFeatureFlag(featureFlags, permission))),
-      // startWith(false), // Don't start with anything, this ensures first value out can be trusted. Should never get to the point where
-      // nothing is returned
-      distinctUntilChanged(),
-    );
-  }
-
-  public checkFeatureFlag(featureFlags: IFeatureFlag[], permission: CFFeatureFlagTypes) {
-    const flag = featureFlags.find(ff => ff.name === permission.toString());
-    if (!flag) {
-      return false;
-    }
-    return flag.enabled;
-  }
-
-  public getAdminCheck(endpointGuid: string) {
-    return this.getEndpointState(endpointGuid).pipe(
-      filter(cfPermissions => !!cfPermissions),
-      map(cfPermissions => cfPermissions.global.isAdmin)
-    );
-  }
-
-  public getAdminChecks(endpointGuid?: string) {
-    const endpointGuids$ = this.getEndpointGuidObservable(endpointGuid);
-    return endpointGuids$.pipe(
-      map(guids => guids.map(guid => this.getAdminCheck(guid))),
-      switchMap(checks => this.reduceChecks(checks))
-    );
-  }
-
-  /**
-   * Includes read only admins, global auditors and users that don't have the cloud_controller.write scope
-   */
-  public getReadOnlyCheck(endpointGuid: string) {
-    return this.getEndpointState(endpointGuid).pipe(
-      map(
-        cfPermissions => (
-          cfPermissions && (
-            cfPermissions.global.isGlobalAuditor ||
-            cfPermissions.global.isReadOnlyAdmin ||
-            !cfPermissions.global.canWrite
-          )
-        )
-      ),
-      distinctUntilChanged()
-    );
-  }
-  /**
-   * If no endpoint is passed, check them all
-   */
-  public getReadOnlyChecks(endpointGuid?: string) {
-    const endpointGuids$ = this.getEndpointGuidObservable(endpointGuid);
-    return endpointGuids$.pipe(
-      map(guids => guids.map(guid => this.getReadOnlyCheck(guid))),
-      switchMap(checks => this.reduceChecks(checks, '&&'))
-    );
-  }
-
-  public reduceChecks(checks: Observable<boolean>[], type: '||' | '&&' = '||') {
-    const func = type === '||' ? 'some' : 'every';
-    if (!checks || !checks.length) {
-      return observableOf(true);
-    }
-    return combineLatest(checks).pipe(
-      map(flags => flags[func](flag => flag)),
-      distinctUntilChanged()
-    );
-  }
-
-  public groupConfigs(configs: PermissionConfig[]): IConfigGroups {
-    return configs.reduce((grouped, config) => {
-      const type = this.getGroupType(config);
-      return {
-        ...grouped,
-        [type]: [
-          ...(grouped[type] || []),
-          config
-        ]
-      };
-    }, {});
-  }
-
-  private getGroupType(config: PermissionConfig) {
-    if (config.type === PermissionTypes.ORGANIZATION || config.type === PermissionTypes.SPACE) {
-      return CHECKER_GROUPS.CF_GROUP;
-    }
-    return config.type;
-  }
-
-  private checkAllOfType(endpointGuid: string, type: PermissionTypes, permission: PermissionStrings, orgGuid?: string) {
-    return this.getEndpointState(endpointGuid).pipe(
-      map(state => {
-        if (!state || !state[type]) {
-          return false;
-        }
-        return Object.keys(state[type]).some(guid => {
-          return this.selectPermission(state[type][guid], permission);
-        });
-      })
-    );
-  }
-
-  private getAllEndpointGuids() {
-    return this.store.select(connectedEndpointsSelector).pipe(
-      map(endpoints => Object.values(endpoints).filter(e => e.cnsi_type === 'cf').map(endpoint => endpoint.guid))
-    );
-  }
-
-  private getEndpointGuidObservable(endpointGuid: string) {
-    return !endpointGuid ? this.getAllEndpointGuids() : observableOf([endpointGuid]);
-  }
-
-  private selectPermission(state: IOrgRoleState | ISpaceRoleState, permission: PermissionStrings): boolean {
-    return state ? state[permission] || false : false;
-  }
-
-  private getEndpointState(endpointGuid: string) {
-    return this.store.select(getCurrentUserCFEndpointRolesState(endpointGuid));
-  }
-}
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
deleted file mode 100644
index 3781f1ca24..0000000000
--- a/src/frontend/packages/core/src/core/current-user-permissions.config.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-import { CFFeatureFlagTypes } from '../../../cloud-foundry/src/cf-api.types';
-
-export enum CurrentUserPermissions {
-  APPLICATION_VIEW = 'view.application',
-  APPLICATION_EDIT = 'edit.application',
-  APPLICATION_CREATE = 'create.application',
-  APPLICATION_MANAGE = 'manage.application',
-  APPLICATION_VIEW_ENV_VARS = 'env-vars.view.application',
-  SPACE_VIEW = 'view.space',
-  SPACE_CREATE = 'create.space',
-  SPACE_DELETE = 'delete.space',
-  SPACE_EDIT = 'edit.space',
-  SPACE_CHANGE_ROLES = 'change-roles.space',
-  ROUTE_CREATE = 'create.route',
-  // ROUTE_BINDING_CREATE = 'create.binding.route',
-  QUOTA_CREATE = 'create.quota',
-  QUOTA_EDIT = 'edit.quota',
-  QUOTA_DELETE = 'delete.quota',
-  SPACE_QUOTA_CREATE = 'create.space-quota',
-  SPACE_QUOTA_EDIT = 'edit.space-quota',
-  SPACE_QUOTA_DELETE = 'delete.space-quota',
-  ORGANIZATION_CREATE = 'create.org',
-  ORGANIZATION_DELETE = 'delete.org',
-  ORGANIZATION_EDIT = 'edit.org',
-  ORGANIZATION_SUSPEND = 'suspend.org',
-  ORGANIZATION_CHANGE_ROLES = 'change-roles.org',
-  SERVICE_INSTANCE_DELETE = 'delete.service-instance',
-  SERVICE_INSTANCE_CREATE = 'create.service-instance',
-  SERVICE_BINDING_EDIT = 'edit.service-binding',
-  FIREHOSE_VIEW = 'view-firehose',
-  ENDPOINT_REGISTER = 'register.endpoint',
-  PASSWORD_CHANGE = 'change-password',
-  SERVICE_INSTANCE_EDIT = 'edit.service-instance'
-}
-export type PermissionConfigType = PermissionConfig[] | PermissionConfig | PermissionConfigLink;
-export interface IPermissionConfigs {
-  [permissionString: string]: PermissionConfigType;
-}
-
-export enum PermissionStrings {
-  _GLOBAL_ = 'global',
-  SPACE_MANAGER = 'isManager',
-  SPACE_AUDITOR = 'isAuditor',
-  SPACE_DEVELOPER = 'isDeveloper',
-  ORG_MANAGER = 'isManager',
-  ORG_AUDITOR = 'isAuditor',
-  ORG_BILLING_MANAGER = 'isBillingManager',
-  ORG_USER = 'isUser',
-  STRATOS_ADMIN = 'isAdmin'
-}
-
-export enum ScopeStrings {
-  CF_ADMIN_GROUP = 'cloud_controller.admin',
-  CF_READ_ONLY_ADMIN_GROUP = 'cloud_controller.admin_read_only',
-  CF_ADMIN_GLOBAL_AUDITOR_GROUP = 'cloud_controller.global_auditor',
-  CF_WRITE_SCOPE = 'cloud_controller.write',
-  CF_READ_SCOPE = 'cloud_controller.write',
-  STRATOS_CHANGE_PASSWORD = 'password.write',
-  SCIM_READ = 'scim.read'
-}
-
-export enum PermissionTypes {
-  SPACE = 'spaces',
-  ORGANIZATION = 'organizations',
-  ENDPOINT = 'endpoint',
-  ENDPOINT_SCOPE = 'endpoint-scope',
-  FEATURE_FLAG = 'feature-flag',
-  STRATOS = 'internal',
-  STRATOS_SCOPE = 'internal-scope'
-}
-
-export enum StratosPermissionTypes {
-  ADMIN = 'isAdmin'
-}
-
-export type PermissionValues = StratosPermissionTypes | ScopeStrings | CFFeatureFlagTypes | PermissionStrings;
-export class PermissionConfig {
-  constructor(
-    public type: PermissionTypes,
-    public permission: PermissionValues = PermissionStrings._GLOBAL_
-  ) { }
-}
-export class PermissionConfigLink {
-  constructor(
-    public link: CurrentUserPermissions
-  ) { }
-}
-
-// For each set permissions are checked by permission types of ENDPOINT, ENDPOINT_SCOPE, STRATOS_SCOPE, FEATURE_FLAG or a random bag.
-// Every group result must be true in order for the permission to be true. A group result is true if all or some of it's permissions are
-// true (see `getCheckFromConfig`).
-export const permissionConfigs: IPermissionConfigs = {
-  [CurrentUserPermissions.APPLICATION_VIEW]: [
-    // See #2186
-    new PermissionConfig(PermissionTypes.ENDPOINT_SCOPE, ScopeStrings.CF_READ_ONLY_ADMIN_GROUP),
-    new PermissionConfig(PermissionTypes.ENDPOINT_SCOPE, ScopeStrings.CF_ADMIN_GLOBAL_AUDITOR_GROUP),
-    new PermissionConfig(PermissionTypes.ORGANIZATION, PermissionStrings.ORG_MANAGER),
-    new PermissionConfig(PermissionTypes.SPACE, PermissionStrings.SPACE_MANAGER),
-    new PermissionConfig(PermissionTypes.SPACE, PermissionStrings.SPACE_AUDITOR),
-    new PermissionConfig(PermissionTypes.SPACE, PermissionStrings.SPACE_DEVELOPER)
-  ],
-  [CurrentUserPermissions.APPLICATION_CREATE]: new PermissionConfig(PermissionTypes.SPACE, PermissionStrings.SPACE_DEVELOPER),
-  [CurrentUserPermissions.APPLICATION_MANAGE]: new PermissionConfig(PermissionTypes.SPACE, PermissionStrings.SPACE_DEVELOPER),
-  [CurrentUserPermissions.APPLICATION_EDIT]: new PermissionConfig(PermissionTypes.SPACE, PermissionStrings.SPACE_DEVELOPER),
-  [CurrentUserPermissions.APPLICATION_VIEW_ENV_VARS]: new PermissionConfig(PermissionTypes.SPACE, PermissionStrings.SPACE_DEVELOPER),
-  [CurrentUserPermissions.SPACE_VIEW]: [
-    // See #2186
-    new PermissionConfig(PermissionTypes.ENDPOINT_SCOPE, ScopeStrings.CF_READ_ONLY_ADMIN_GROUP),
-    new PermissionConfig(PermissionTypes.ENDPOINT_SCOPE, ScopeStrings.CF_ADMIN_GLOBAL_AUDITOR_GROUP),
-    new PermissionConfig(PermissionTypes.ORGANIZATION, PermissionStrings.ORG_MANAGER),
-    new PermissionConfig(PermissionTypes.SPACE, PermissionStrings.SPACE_MANAGER),
-    new PermissionConfig(PermissionTypes.SPACE, PermissionStrings.SPACE_AUDITOR),
-    new PermissionConfig(PermissionTypes.SPACE, PermissionStrings.SPACE_DEVELOPER)
-  ],
-  [CurrentUserPermissions.SPACE_CREATE]: new PermissionConfig(PermissionTypes.ORGANIZATION, PermissionStrings.ORG_MANAGER),
-  [CurrentUserPermissions.SPACE_DELETE]: new PermissionConfig(PermissionTypes.ORGANIZATION, PermissionStrings.ORG_MANAGER),
-  [CurrentUserPermissions.SPACE_EDIT]: [
-    new PermissionConfig(PermissionTypes.ORGANIZATION, PermissionStrings.ORG_MANAGER),
-    new PermissionConfig(PermissionTypes.SPACE, PermissionStrings.SPACE_MANAGER),
-  ],
-  [CurrentUserPermissions.SPACE_CHANGE_ROLES]: [
-    new PermissionConfig(PermissionTypes.ORGANIZATION, PermissionStrings.ORG_MANAGER),
-    new PermissionConfig(PermissionTypes.SPACE, PermissionStrings.SPACE_MANAGER)
-  ],
-  // TODO: See #4189. Wire in. Can be org manager?
-  [CurrentUserPermissions.ROUTE_CREATE]: [
-    new PermissionConfig(PermissionTypes.FEATURE_FLAG, CFFeatureFlagTypes.route_creation),
-    new PermissionConfig(PermissionTypes.SPACE, PermissionStrings.SPACE_DEVELOPER)
-  ],
-  [CurrentUserPermissions.QUOTA_CREATE]: new PermissionConfig(PermissionTypes.ENDPOINT_SCOPE, ScopeStrings.CF_ADMIN_GROUP),
-  [CurrentUserPermissions.QUOTA_EDIT]: new PermissionConfig(PermissionTypes.ENDPOINT_SCOPE, ScopeStrings.CF_ADMIN_GROUP),
-  [CurrentUserPermissions.QUOTA_DELETE]: new PermissionConfig(PermissionTypes.ENDPOINT_SCOPE, ScopeStrings.CF_ADMIN_GROUP),
-  [CurrentUserPermissions.SPACE_QUOTA_CREATE]: new PermissionConfig(PermissionTypes.ORGANIZATION, PermissionStrings.ORG_MANAGER),
-  [CurrentUserPermissions.SPACE_QUOTA_EDIT]: new PermissionConfig(PermissionTypes.ORGANIZATION, PermissionStrings.ORG_MANAGER),
-  [CurrentUserPermissions.SPACE_QUOTA_DELETE]: new PermissionConfig(PermissionTypes.ORGANIZATION, PermissionStrings.ORG_MANAGER),
-  [CurrentUserPermissions.ORGANIZATION_CREATE]: [
-    new PermissionConfig(PermissionTypes.FEATURE_FLAG, CFFeatureFlagTypes.user_org_creation),
-    new PermissionConfig(PermissionTypes.ORGANIZATION, PermissionStrings.ORG_MANAGER),
-    new PermissionConfig(PermissionTypes.ORGANIZATION, PermissionStrings.ORG_AUDITOR),
-    new PermissionConfig(PermissionTypes.ORGANIZATION, PermissionStrings.ORG_BILLING_MANAGER),
-    new PermissionConfig(PermissionTypes.ORGANIZATION, PermissionStrings.ORG_USER),
-    new PermissionConfig(PermissionTypes.SPACE, PermissionStrings.SPACE_MANAGER),
-    new PermissionConfig(PermissionTypes.SPACE, PermissionStrings.SPACE_AUDITOR),
-    new PermissionConfig(PermissionTypes.SPACE, PermissionStrings.SPACE_DEVELOPER)
-  ],
-  [CurrentUserPermissions.ORGANIZATION_DELETE]: new PermissionConfig(PermissionTypes.ENDPOINT_SCOPE, ScopeStrings.CF_ADMIN_GROUP),
-  [CurrentUserPermissions.ORGANIZATION_EDIT]: new PermissionConfigLink(CurrentUserPermissions.ORGANIZATION_DELETE),
-  [CurrentUserPermissions.ORGANIZATION_SUSPEND]: new PermissionConfig(PermissionTypes.ENDPOINT_SCOPE, ScopeStrings.CF_ADMIN_GROUP),
-  [CurrentUserPermissions.ORGANIZATION_CHANGE_ROLES]: new PermissionConfig(PermissionTypes.ORGANIZATION, PermissionStrings.ORG_MANAGER),
-  [CurrentUserPermissions.SERVICE_INSTANCE_DELETE]: new PermissionConfig(PermissionTypes.SPACE, PermissionStrings.SPACE_DEVELOPER),
-  [CurrentUserPermissions.SERVICE_INSTANCE_CREATE]: new PermissionConfig(PermissionTypes.SPACE, PermissionStrings.SPACE_DEVELOPER),
-  [CurrentUserPermissions.SERVICE_INSTANCE_EDIT]: new PermissionConfig(PermissionTypes.SPACE, PermissionStrings.SPACE_DEVELOPER),
-  [CurrentUserPermissions.SERVICE_BINDING_EDIT]: new PermissionConfig(PermissionTypes.SPACE, PermissionStrings.SPACE_DEVELOPER),
-  [CurrentUserPermissions.FIREHOSE_VIEW]: [
-    new PermissionConfig(PermissionTypes.ENDPOINT_SCOPE, ScopeStrings.CF_READ_ONLY_ADMIN_GROUP)
-  ],
-  [CurrentUserPermissions.ENDPOINT_REGISTER]: new PermissionConfig(PermissionTypes.STRATOS, PermissionStrings.STRATOS_ADMIN),
-  [CurrentUserPermissions.PASSWORD_CHANGE]: new PermissionConfig(PermissionTypes.STRATOS_SCOPE, ScopeStrings.STRATOS_CHANGE_PASSWORD),
-};
diff --git a/src/frontend/packages/core/src/core/current-user-permissions.service.ts b/src/frontend/packages/core/src/core/current-user-permissions.service.ts
deleted file mode 100644
index be56d540db..0000000000
--- a/src/frontend/packages/core/src/core/current-user-permissions.service.ts
+++ /dev/null
@@ -1,174 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
-import { combineLatest, Observable, of as observableOf } from 'rxjs';
-import { distinctUntilChanged, map, switchMap } from 'rxjs/operators';
-
-import { InternalAppState } from '../../../store/src/app-state';
-import {
-  CHECKER_GROUPS,
-  CurrentUserPermissionsChecker,
-  IConfigGroup,
-  IConfigGroups,
-} from './current-user-permissions.checker';
-import {
-  CurrentUserPermissions,
-  PermissionConfig,
-  PermissionConfigLink,
-  permissionConfigs,
-  PermissionConfigType,
-  PermissionTypes,
-} from './current-user-permissions.config';
-
-interface ICheckCombiner {
-  checks: Observable<boolean>[];
-  combineType?: '&&';
-}
-
-@Injectable()
-export class CurrentUserPermissionsService {
-  private checker: CurrentUserPermissionsChecker;
-  constructor(
-    store: Store<InternalAppState>
-  ) {
-    this.checker = new CurrentUserPermissionsChecker(store);
-  }
-  /**
-   * @param action The action we're going to check the user's access to.
-   * @param endpointGuid If endpointGuid is provided without a  orgOrSpaceGuid the checks will be done across all orgs and
-   * spaces within the cf.
-   * If no endpoint guid is provided we will do the check over all of the endpoint and all orgs/spaces.
-   * @param orgOrSpaceGuid If this is the only param then it will be used as the id to for all permission checks.
-   * @param spaceGuid If this is provided then the orgOrSpaceGuid will be used for org related permission checks and this will be
-   *  used for space related permission checks.
-   */
-  public can(
-    action: CurrentUserPermissions | PermissionConfigType,
-    endpointGuid?: string,
-    orgOrSpaceGuid?: string,
-    spaceGuid?: string
-  ): Observable<boolean> {
-    const actionConfig = this.getConfig(typeof action === 'string' ? permissionConfigs[action] : action);
-    const obs$ = this.getCanObservable(actionConfig, endpointGuid, orgOrSpaceGuid, spaceGuid);
-    return obs$ ? obs$.pipe(
-      distinctUntilChanged(),
-    ) : observableOf(false);
-  }
-
-  private getCanObservable(
-    actionConfig: PermissionConfig[] | PermissionConfig,
-    endpointGuid: string,
-    orgOrSpaceGuid?: string,
-    spaceGuid?: string): Observable<boolean> {
-    if (Array.isArray(actionConfig)) {
-      return this.getComplexPermission(actionConfig, endpointGuid, orgOrSpaceGuid, spaceGuid);
-    } else if (actionConfig) {
-      return this.getSimplePermission(actionConfig, endpointGuid, orgOrSpaceGuid, spaceGuid);
-    } else if (endpointGuid) {
-      return this.checker.getAdminCheck(endpointGuid);
-    }
-    return null;
-  }
-
-  private getSimplePermission(actionConfig: PermissionConfig, endpointGuid?: string, orgOrSpaceGuid?: string, spaceGuid?: string) {
-    const check$ = this.checker.getSimpleCheck(actionConfig, endpointGuid, orgOrSpaceGuid, spaceGuid);
-    if (actionConfig.type === PermissionTypes.ORGANIZATION || actionConfig.type === PermissionTypes.SPACE) {
-      return this.applyAdminCheck(check$, endpointGuid);
-    }
-    return check$;
-  }
-
-  private getComplexPermission(actionConfigs: PermissionConfig[], endpointGuid?: string, orgOrSpaceGuid?: string, spaceGuid?: string) {
-    const groupedChecks = this.checker.groupConfigs(actionConfigs);
-    const checks = this.getChecksFromConfigGroups(groupedChecks, endpointGuid, orgOrSpaceGuid, spaceGuid);
-    return this.combineChecks(checks, endpointGuid);
-  }
-
-  private getChecksFromConfigGroups(groups: IConfigGroups, endpointGuid?: string, orgOrSpaceGuid?: string, spaceGuid?: string) {
-    return Object.keys(groups).map((permission: PermissionTypes) => {
-      return this.getCheckFromConfig(groups[permission], permission, endpointGuid, orgOrSpaceGuid, spaceGuid);
-    });
-  }
-
-  private getCheckFromConfig(
-    configGroup: IConfigGroup,
-    permission: PermissionTypes | CHECKER_GROUPS,
-    endpointGuid?: string,
-    orgOrSpaceGuid?: string,
-    spaceGuid?: string
-  ): ICheckCombiner {
-    switch (permission) {
-      case PermissionTypes.ENDPOINT:
-        return {
-          checks: this.checker.getInternalScopesChecks(configGroup),
-        };
-      case PermissionTypes.ENDPOINT_SCOPE:
-        return {
-          checks: this.checker.getEndpointScopesChecks(configGroup, endpointGuid),
-        };
-      case PermissionTypes.STRATOS_SCOPE:
-        return {
-          checks: this.checker.getInternalScopesChecks(configGroup),
-        };
-      case PermissionTypes.FEATURE_FLAG:
-        return {
-          checks: this.checker.getFeatureFlagChecks(configGroup, endpointGuid),
-          combineType: '&&'
-        };
-      case CHECKER_GROUPS.CF_GROUP:
-        return {
-          checks: this.checker.getCfChecks(configGroup, endpointGuid, orgOrSpaceGuid, spaceGuid)
-        };
-    }
-  }
-
-  private getConfig(config: PermissionConfigType, tries = 0): PermissionConfig[] | PermissionConfig {
-    const linkConfig = config as PermissionConfigLink;
-    if (linkConfig.link) {
-      if (tries >= 20) {
-        // Tried too many times to get permission config, circular reference very likely.
-        return;
-      }
-      ++tries;
-      return this.getLinkedPermissionConfig(linkConfig, tries);
-    } else {
-      return config as PermissionConfig[] | PermissionConfig;
-    }
-  }
-
-  private getLinkedPermissionConfig(linkConfig: PermissionConfigLink, tries = 0) {
-    return this.getConfig(permissionConfigs[linkConfig.link]);
-  }
-
-  private applyAdminCheck(check$: Observable<boolean>, endpointGuid?: string) {
-    const adminCheck$ = this.checker.getAdminChecks(endpointGuid);
-    const readOnlyCheck$ = this.checker.getReadOnlyChecks(endpointGuid);
-    return combineLatest(
-      adminCheck$,
-      readOnlyCheck$
-    ).pipe(
-      distinctUntilChanged(),
-      switchMap(([isAdmin, isReadOnly]) => {
-        if (isAdmin) {
-          return observableOf(true);
-        }
-        if (isReadOnly) {
-          return observableOf(false);
-        }
-        return check$;
-      })
-    );
-  }
-
-  private combineChecks(
-    checkCombiners: ICheckCombiner[],
-    endpointGuid?: string
-  ) {
-    const reducedChecks = checkCombiners.map(combiner => this.checker.reduceChecks(combiner.checks, combiner.combineType));
-    const check$ = combineLatest(reducedChecks).pipe(
-      map(checks => {
-        return checks.every(check => check);
-      })
-    );
-    return this.applyAdminCheck(check$, endpointGuid);
-  }
-}
diff --git a/src/frontend/packages/core/src/core/endpoints.service.spec.ts b/src/frontend/packages/core/src/core/endpoints.service.spec.ts
index 89025b6c3e..006d10ccb7 100644
--- a/src/frontend/packages/core/src/core/endpoints.service.spec.ts
+++ b/src/frontend/packages/core/src/core/endpoints.service.spec.ts
@@ -1,7 +1,7 @@
 import { inject, TestBed } from '@angular/core/testing';
 
 import { CoreTestingModule } from '../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 import { PaginationMonitorFactory } from '../../../store/src/monitors/pagination-monitor.factory';
 import { CoreModule } from './core.module';
 import { EndpointsService } from './endpoints.service';
diff --git a/src/frontend/packages/core/src/core/log-out-dialog/log-out-dialog.component.spec.ts b/src/frontend/packages/core/src/core/log-out-dialog/log-out-dialog.component.spec.ts
index caa7036c91..b497e9540e 100644
--- a/src/frontend/packages/core/src/core/log-out-dialog/log-out-dialog.component.spec.ts
+++ b/src/frontend/packages/core/src/core/log-out-dialog/log-out-dialog.component.spec.ts
@@ -1,10 +1,10 @@
-import { async, ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
+import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Store } from '@ngrx/store';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreTestingModule } from '../../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
 import { SharedModule } from '../../shared/shared.module';
 import { CoreModule } from '../core.module';
 import { LogOutDialogComponent } from './log-out-dialog.component';
diff --git a/src/frontend/packages/core/src/core/logger.service.spec.ts b/src/frontend/packages/core/src/core/logger.service.spec.ts
index 86c39de468..e2f904e060 100644
--- a/src/frontend/packages/core/src/core/logger.service.spec.ts
+++ b/src/frontend/packages/core/src/core/logger.service.spec.ts
@@ -1,7 +1,7 @@
 import { inject, TestBed } from '@angular/core/testing';
 
 import { CoreTestingModule } from '../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 import { LoggerService } from './logger.service';
 
 describe('LoggerService', () => {
diff --git a/src/frontend/packages/core/src/core/permissions/current-user-permissions.config.ts b/src/frontend/packages/core/src/core/permissions/current-user-permissions.config.ts
new file mode 100644
index 0000000000..a91481dd62
--- /dev/null
+++ b/src/frontend/packages/core/src/core/permissions/current-user-permissions.config.ts
@@ -0,0 +1,20 @@
+export type PermissionConfigType = PermissionConfig[] | PermissionConfig | PermissionConfigLink;
+export interface IPermissionConfigs {
+  [permissionString: string]: PermissionConfigType;
+}
+
+export type PermissionTypes = string;
+export type CurrentUserPermissions = string;
+export type ScopeStrings = string;
+export type PermissionValues = string;
+export class PermissionConfig {
+  constructor(
+    public type: PermissionTypes,
+    public permission: PermissionValues,
+  ) { }
+}
+export class PermissionConfigLink {
+  constructor(
+    public link: CurrentUserPermissions
+  ) { }
+}
diff --git a/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.spec.ts b/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.spec.ts
new file mode 100644
index 0000000000..e8e69c7782
--- /dev/null
+++ b/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.spec.ts
@@ -0,0 +1,511 @@
+import { TestBed } from '@angular/core/testing';
+import { createBasicStoreModule, createEntityStoreState, TestStoreEntity } from '@stratosui/store/testing';
+import { first, tap } from 'rxjs/operators';
+
+import { AppState } from '../../../../store/src/app-state';
+import { EntityCatalogTestModule, TEST_CATALOGUE_ENTITIES } from '../../../../store/src/entity-catalog-test.module';
+import { EntityCatalogEntityConfig } from '../../../../store/src/entity-catalog/entity-catalog.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 { PermissionConfig } from './current-user-permissions.config';
+import { CurrentUserPermissionsService } from './current-user-permissions.service';
+import { StratosPermissionStrings, StratosPermissionTypes, StratosScopeStrings } from './stratos-user-permissions.checker';
+
+
+describe('CurrentUserPermissionsService', () => {
+  let service: CurrentUserPermissionsService;
+
+
+  function createStoreState(): Partial<AppState<BaseEntityValues>> {
+    // Data
+    const endpoints: EndpointModel[] = [
+      {
+        guid: '0e934dc8-7ad4-40ff-b85c-53c1b61d2abb',
+        name: 'SCF',
+        cnsi_type: 'cf',
+        api_endpoint: {
+          Scheme: 'https',
+          Opaque: '',
+          User: null,
+          Host: 'api.10.84.93.10.nip.io:8443',
+          Path: '',
+          RawPath: '',
+          ForceQuery: false,
+          RawQuery: '',
+          Fragment: ''
+        },
+        authorization_endpoint: 'https://cf.uaa.10.84.93.10.nip.io:2793',
+        token_endpoint: 'https://cf.uaa.10.84.93.10.nip.io:2793',
+        doppler_logging_endpoint: 'wss://doppler.10.84.93.10.nip.io:4443',
+        skip_ssl_validation: true,
+        user: {
+          guid: '670f4618-525e-4784-a56e-a238a0daf63d',
+          name: 'nathan',
+          admin: false,
+          scopes: [
+            StratosScopeStrings.STRATOS_CHANGE_PASSWORD,
+          ]
+        },
+        metricsAvailable: false,
+        connectionStatus: 'connected',
+        system_shared_token: false,
+        sso_allowed: false
+      },
+      {
+        guid: 'c80420ca-204b-4879-bf69-b6b7a202ad87',
+        name: 'MainSCF',
+        cnsi_type: 'cf',
+        api_endpoint: {
+          Scheme: 'https',
+          Opaque: '',
+          User: null,
+          Host: 'api.10.84.93.55.nip.io:8443',
+          Path: '',
+          RawPath: '',
+          ForceQuery: false,
+          RawQuery: '',
+          Fragment: ''
+        },
+        authorization_endpoint: 'https://cf.uaa.10.84.93.55.nip.io:2793',
+        token_endpoint: 'https://cf.uaa.10.84.93.55.nip.io:2793',
+        doppler_logging_endpoint: 'wss://doppler.10.84.93.55.nip.io:4443',
+        skip_ssl_validation: true,
+        user: {
+          guid: '4389dfd6-6048-4149-8b26-5aa6893ac21d',
+          name: 'admin',
+          admin: true,
+          scopes: [
+            StratosScopeStrings.STRATOS_CHANGE_PASSWORD,
+            StratosScopeStrings.SCIM_READ
+          ]
+        },
+        metricsAvailable: false,
+        connectionStatus: 'connected',
+        system_shared_token: false,
+        sso_allowed: false
+      }
+    ];
+
+
+    // Pagination
+    const pagination: PaginationState = {
+      stratosEndpoint: {
+        'endpoint-list': {
+          currentPage: 1,
+          totalResults: 2,
+          pageCount: 1,
+          ids: {
+            1: endpoints.map(endpoint => endpoint.guid)
+          },
+          pageRequests: {
+            1: {
+              busy: false,
+              error: false,
+              message: ''
+            }
+          },
+          params: {
+            'results-per-page': 50,
+            'order-direction': 'desc',
+            'order-direction-field': 'name',
+            page: 1,
+            q: []
+          },
+          clientPagination: {
+            pageSize: 5,
+            currentPage: 1,
+            filter: {
+              string: '',
+              items: {}
+            },
+            totalResults: 2
+          },
+          maxedState: {}
+        }
+      },
+    };
+
+    // User roles
+    const initialState: Partial<AppState<BaseEntityValues>> = {
+
+    };
+
+
+    // Create request and requestData sections
+    const entityMap = new Map<EntityCatalogEntityConfig, Array<TestStoreEntity | string>>([
+      [
+        endpointEntitySchema,
+        endpoints.map(endpoint => ({
+          guid: endpoint.guid,
+          data: endpoint
+        }))
+      ],
+    ]);
+    const requestAndRequestData = createEntityStoreState(entityMap);
+
+    return {
+      currentUserRoles: {
+        internal: {
+          isAdmin: false,
+          scopes: [
+            StratosScopeStrings.STRATOS_CHANGE_PASSWORD,
+            StratosScopeStrings.SCIM_READ
+          ],
+        },
+        endpoints: {
+          cf: {
+            '0e934dc8-7ad4-40ff-b85c-53c1b61d2abb': {
+              global: {
+                isAdmin: false,
+                isReadOnlyAdmin: false,
+                isGlobalAuditor: false,
+                canRead: true,
+                canWrite: true,
+                scopes: [
+                  'cloud_controller.read',
+                  'password.write',
+                  'cloud_controller.write',
+                  'openid',
+                  'uaa.user'
+                ]
+              },
+              spaces: {
+                '56eb5ecc-7c96-4bb1-bdcc-0c6c3d444dc6': {
+                  orgId: 'abc',
+                  isManager: true,
+                  isAuditor: false,
+                  isDeveloper: true
+                }
+              },
+              organizations: {
+                'd5e50b05-497f-4b3b-9658-a396a592a8ba': {
+                  isManager: false,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                },
+                'c58e7cfd-c765-400a-a473-313fa572d5c4': {
+                  isManager: false,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                }
+              },
+              state: {
+                initialised: true,
+                fetching: false,
+                error: null
+              }
+            },
+            'c80420ca-204b-4879-bf69-b6b7a202ad87': {
+              global: {
+                isAdmin: false,
+                isReadOnlyAdmin: false,
+                isGlobalAuditor: false,
+                canRead: true,
+                canWrite: true,
+                scopes: [
+                  'openid',
+                  'scim.read',
+                  'cloud_controller.admin',
+                  'uaa.user',
+                  'routing.router_groups.read',
+                  'cloud_controller.read',
+                  'password.write',
+                  'cloud_controller.write',
+                  'doppler.firehose',
+                  'scim.write'
+                ]
+              },
+              spaces: {
+                '56eb5ecc-7c96-4bb1-bdcc-0c6c3d444dc6': {
+                  isManager: true,
+                  isAuditor: false,
+                  isDeveloper: true,
+                  orgId: 'abc'
+                },
+                'c6450a21-aa1a-4643-9437-035cc818ea72': {
+                  isManager: true,
+                  isAuditor: false,
+                  isDeveloper: true,
+                  orgId: 'abc'
+                },
+                '86577124-4b64-4ca1-9a78-d904c60505c4': {
+                  isManager: true,
+                  isAuditor: false,
+                  isDeveloper: true,
+                  orgId: 'abc'
+                }
+              },
+              organizations: {
+                '367a49c1-b5dc-44e6-a8cf-84b1f56426a7': {
+                  isManager: true,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                },
+                'dccfedde-be2c-46a6-99cf-c1320ea8cb6d': {
+                  isManager: true,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                },
+                '8a175cad-ff61-436b-8c6f-e5beb13edb5f': {
+                  isManager: true,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                },
+                'd5246255-867b-4f62-9040-346f113f0b7d': {
+                  isManager: true,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                }
+              },
+              state: {
+                initialised: true,
+                fetching: false,
+                error: null
+              }
+            },
+            READ_ONLY_ADMIN: {
+              global: {
+                isAdmin: false,
+                isReadOnlyAdmin: true,
+                isGlobalAuditor: false,
+                canRead: true,
+                canWrite: true,
+                scopes: [
+                  'openid',
+                  'scim.read',
+                  'cloud_controller.admin',
+                  'uaa.user',
+                  'routing.router_groups.read',
+                  'cloud_controller.read',
+                  'password.write',
+                  'cloud_controller.write',
+                  'doppler.firehose',
+                  'scim.write'
+                ]
+              },
+              spaces: {
+                '56eb5ecc-7c96-4bb1-bdcc-0c6c3d444dc6': {
+                  orgId: 'abc',
+                  isManager: true,
+                  isAuditor: false,
+                  isDeveloper: true
+                },
+                'c6450a21-aa1a-4643-9437-035cc818ea72': {
+                  orgId: 'abc',
+                  isManager: true,
+                  isAuditor: false,
+                  isDeveloper: true
+                },
+                '86577124-4b64-4ca1-9a78-d904c60505c4': {
+                  orgId: 'abc',
+                  isManager: true,
+                  isAuditor: false,
+                  isDeveloper: true
+                }
+              },
+              organizations: {
+                '367a49c1-b5dc-44e6-a8cf-84b1f56426a7': {
+                  isManager: true,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                },
+                'dccfedde-be2c-46a6-99cf-c1320ea8cb6d': {
+                  isManager: true,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                },
+                '8a175cad-ff61-436b-8c6f-e5beb13edb5f': {
+                  isManager: true,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                },
+                'd5246255-867b-4f62-9040-346f113f0b7d': {
+                  isManager: true,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                }
+              },
+              state: {
+                initialised: true,
+                fetching: false,
+                error: null
+              }
+            },
+            READ_ONLY_USER: {
+              global: {
+                isAdmin: false,
+                isReadOnlyAdmin: false,
+                isGlobalAuditor: false,
+                canRead: true,
+                canWrite: false,
+                scopes: [
+                  'openid',
+                  'scim.read',
+                  'cloud_controller.admin',
+                  'uaa.user',
+                  'routing.router_groups.read',
+                  'cloud_controller.read',
+                  'password.write',
+                  'cloud_controller.write',
+                  'doppler.firehose',
+                  'scim.write'
+                ]
+              },
+              spaces: {
+                '56eb5ecc-7c96-4bb1-bdcc-0c6c3d444dc6': {
+                  isManager: true,
+                  isAuditor: false,
+                  isDeveloper: true,
+                  orgId: 'abc'
+                },
+                'c6450a21-aa1a-4643-9437-035cc818ea72': {
+                  isManager: true,
+                  isAuditor: false,
+                  isDeveloper: true,
+                  orgId: 'abc'
+                },
+                '86577124-4b64-4ca1-9a78-d904c60505c4': {
+                  isManager: true,
+                  isAuditor: false,
+                  isDeveloper: true,
+                  orgId: 'abc'
+                }
+              },
+              organizations: {
+                '367a49c1-b5dc-44e6-a8cf-84b1f56426a7': {
+                  isManager: true,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                },
+                'dccfedde-be2c-46a6-99cf-c1320ea8cb6d': {
+                  isManager: true,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                },
+                '8a175cad-ff61-436b-8c6f-e5beb13edb5f': {
+                  isManager: true,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                },
+                'd5246255-867b-4f62-9040-346f113f0b7d': {
+                  isManager: true,
+                  isAuditor: false,
+                  isBillingManager: false,
+                  isUser: true,
+                  spaceGuids: []
+                }
+              },
+              state: {
+                initialised: true,
+                fetching: false,
+                error: null
+              }
+            }
+          },
+        },
+        state: {
+          initialised: true,
+          fetching: false,
+          error: null
+        }
+      },
+      requestData: {
+        ...initialState.requestData,
+        ...requestAndRequestData.requestData
+      },
+      pagination: {
+        ...initialState.pagination,
+        ...pagination
+      },
+    };
+  }
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        CurrentUserPermissionsService,
+      ],
+      imports: [
+        {
+          ngModule: EntityCatalogTestModule,
+          providers: [
+            {
+              provide: TEST_CATALOGUE_ENTITIES, useValue: [
+                ...generateStratosEntities(),
+              ]
+            }
+          ]
+        },
+        createBasicStoreModule(createStoreState()),
+        AppTestModule
+      ],
+
+    });
+    service = TestBed.get(CurrentUserPermissionsService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+
+  it('should allow if stratos admin', done => {
+    service.can(new PermissionConfig(StratosPermissionTypes.STRATOS, StratosPermissionStrings.STRATOS_ADMIN)).pipe(
+      tap(can => {
+        expect(can).toBe(false);
+        done();
+      }),
+      first()
+    ).subscribe();
+  });
+
+  it('should allow if has stratos change password scope', done => {
+    service.can(new PermissionConfig(StratosPermissionTypes.STRATOS_SCOPE, StratosScopeStrings.STRATOS_CHANGE_PASSWORD)).pipe(
+      tap(can => {
+        expect(can).toBe(true);
+        done();
+      }),
+      first()
+    ).subscribe();
+
+    service.can([new PermissionConfig(StratosPermissionTypes.STRATOS_SCOPE, StratosScopeStrings.STRATOS_CHANGE_PASSWORD)]).pipe(
+      tap(can => {
+        expect(can).toBe(true);
+        done();
+      }),
+      first()
+    ).subscribe();
+  });
+
+
+});
diff --git a/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.ts b/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.ts
new file mode 100644
index 0000000000..0a7490fb0c
--- /dev/null
+++ b/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.ts
@@ -0,0 +1,197 @@
+import { Inject, Injectable, Optional } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { combineLatest, Observable, of } from 'rxjs';
+import { distinctUntilChanged, map, switchMap } from 'rxjs/operators';
+
+import { InternalAppState } from '../../../../store/src/app-state';
+import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
+import { selectEntity } from '../../../../store/src/selectors/api.selectors';
+import { EndpointModel } from '../../../../store/src/types/endpoint.types';
+import { ENDPOINT_TYPE, STRATOS_ENDPOINT_TYPE } from '../../base-entity-schemas';
+import { LoggerService } from '../logger.service';
+import {
+  CurrentUserPermissions,
+  PermissionConfig,
+  PermissionConfigLink,
+  PermissionConfigType,
+} from './current-user-permissions.config';
+import {
+  BaseCurrentUserPermissionsChecker,
+  ICurrentUserPermissionsChecker,
+  IPermissionCheckCombiner,
+} from './current-user-permissions.types';
+import { StratosUserPermissionsChecker } from './stratos-user-permissions.checker';
+
+
+export const CUSTOM_USER_PERMISSION_CHECKERS = 'custom_user_perm_checkers'
+
+@Injectable()
+export class CurrentUserPermissionsService {
+  private allCheckers: ICurrentUserPermissionsChecker[];
+  constructor(
+    private store: Store<InternalAppState>,
+    @Optional() @Inject(CUSTOM_USER_PERMISSION_CHECKERS) customCheckers: ICurrentUserPermissionsChecker[],
+    private logger: LoggerService
+  ) {
+    // Cannot set default value for parameter as the Optional decorator sets it to null
+    const nullSafeCustomCheckers = customCheckers || [];
+    this.allCheckers = [
+      new StratosUserPermissionsChecker(store),
+      ...nullSafeCustomCheckers
+    ]
+  }
+  /**
+   * @param action The action we're going to check the user's access to.
+   * @param endpointGuid If endpointGuid is provided without a  orgOrSpaceGuid the checks will be done across all orgs and
+   * spaces within the cf.
+   * If no endpoint guid is provided we will do the check over all of the endpoint and all orgs/spaces.
+   * @param orgOrSpaceGuid If this is the only param then it will be used as the id to for all permission checks.
+   * @param spaceGuid If this is provided then the orgOrSpaceGuid will be used for org related permission checks and this will be
+   *  used for space related permission checks.
+   */
+  public can(
+    action: CurrentUserPermissions | PermissionConfigType,
+    endpointGuid?: string,
+    ...args: any[]
+  ): Observable<boolean> {
+    let actionConfig;
+    if (typeof action === 'string') {
+      let permConfigType = this.getPermissionConfig(action);
+      if (!permConfigType) {
+        return of(false); // Logging handled in getPermissionConfig
+      }
+      actionConfig = this.getConfig(permConfigType);
+    } else {
+      actionConfig = this.getConfig(action)
+    }
+    const obs$ = this.getCanObservable(actionConfig, endpointGuid, ...args);
+    return obs$ ?
+      obs$.pipe(distinctUntilChanged()) :
+      of(false);
+  }
+
+  private getCanObservable(
+    actionConfig: PermissionConfig[] | PermissionConfig,
+    endpointGuid: string,
+    ...args: any[]): Observable<boolean> {
+    if (Array.isArray(actionConfig)) {
+      return this.getComplexPermission(actionConfig, endpointGuid, ...args);
+    } else if (actionConfig) {
+      return this.getSimplePermission(actionConfig, endpointGuid, ...args);
+    } else if (endpointGuid) {
+      const key = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, ENDPOINT_TYPE);
+      return this.store.select(selectEntity<EndpointModel>(key, endpointGuid)).pipe(
+        switchMap(endpoint => endpoint ?
+          this.getFallbackPermission(endpointGuid, endpoint.cnsi_type) :
+          of(false)
+        )
+      );
+    }
+    return null;
+  }
+
+  private getSimplePermission(actionConfig: PermissionConfig, endpointGuid: string, ...args: any[]): Observable<boolean> {
+    return this.findChecker<Observable<boolean>>(
+      (checker: ICurrentUserPermissionsChecker) => checker.getSimpleCheck(actionConfig, endpointGuid, ...args),
+      'permissions check',
+      actionConfig.type,
+      of(false)
+    )
+  }
+
+  private getComplexPermission(permissionConfig: PermissionConfig[], endpointGuid?: string, ...args: any[]) {
+    const checks = this.getComplexChecks(permissionConfig, endpointGuid, ...args);
+    return this.combineChecks(checks);
+  }
+
+  private getComplexChecks(
+    permissionConfig: PermissionConfig[],
+    endpointGuid: string,
+    ...args: any[]
+  ): IPermissionCheckCombiner[] {
+    return this.findChecker<IPermissionCheckCombiner[]>(
+      (checker: ICurrentUserPermissionsChecker) => checker.getComplexCheck(permissionConfig, endpointGuid, ...args),
+      'complex permissions check',
+      'a group',
+      [{
+        checks: [of(false)]
+      }]
+    )
+  }
+
+  private getConfig(config: PermissionConfigType, tries = 0): PermissionConfig[] | PermissionConfig {
+    const linkConfig = config as PermissionConfigLink;
+    if (linkConfig.link) {
+      if (tries >= 20) {
+        // Tried too many times to get permission config, circular reference very likely.
+        return;
+      }
+      ++tries;
+      return this.getLinkedPermissionConfig(linkConfig, tries);
+    } else {
+      return config as PermissionConfig[] | PermissionConfig;
+    }
+  }
+
+  private getLinkedPermissionConfig(linkConfig: PermissionConfigLink, tries = 0) {
+    return this.getConfig(this.getPermissionConfig(linkConfig.link), tries);
+  }
+
+  private combineChecks(
+    checkCombiners: IPermissionCheckCombiner[],
+  ) {
+    const reducedChecks = checkCombiners.map(combiner => BaseCurrentUserPermissionsChecker.reduceChecks(combiner.checks, combiner.combineType));
+    return combineLatest(reducedChecks).pipe(
+      map(checks => checks.every(check => check))
+    );
+  }
+
+  private getFallbackPermission(endpointGuid: string, endpointType: string): Observable<boolean> {
+    return this.findChecker<Observable<boolean>>(
+      (checker: ICurrentUserPermissionsChecker) => checker.getFallbackCheck(endpointGuid, endpointType),
+      'fallback permission',
+      'N/A',
+      of(null)
+    )
+  }
+
+  private getPermissionConfig(key: CurrentUserPermissions): PermissionConfigType {
+    return this.findChecker<PermissionConfigType>(
+      (checker: ICurrentUserPermissionsChecker) => checker.getPermissionConfig(key),
+      'permissions checker',
+      key,
+      null
+    )
+  }
+
+  /**
+   * Search through all known checkers for a single result
+   * If none are found log warning (hints at bug/misconfigure).
+   * If more than one is found log warning (hints re bug/misconfigure/devious plugin)
+   */
+  private findChecker<T>(
+    checkFn: (checker: ICurrentUserPermissionsChecker) => T,
+    checkNoun: string,
+    checkType: string,
+    failureValue: T
+  ): T {
+    const res: T[] = [];
+    for (let i = 0; i < this.allCheckers.length; i++) {
+      const checkerRes = checkFn(this.allCheckers[i]);
+      if (checkerRes) {
+        res.push(checkerRes);
+      }
+    }
+    if (res.length == 0) {
+      this.logger.warn(`Permissions: Failed to find a '${checkNoun}' for '${checkType}'. Permission Denied.`);
+      return failureValue;
+    }
+    if (res.length === 1) {
+      return res[0];
+    }
+    if (res.length > 1) {
+      this.logger.warn(`Permissions: Found too many '${checkNoun}' for '${checkType}'. Permission Denied.`);
+      return failureValue;
+    }
+  }
+}
diff --git a/src/frontend/packages/core/src/core/permissions/current-user-permissions.types.ts b/src/frontend/packages/core/src/core/permissions/current-user-permissions.types.ts
new file mode 100644
index 0000000000..1314130007
--- /dev/null
+++ b/src/frontend/packages/core/src/core/permissions/current-user-permissions.types.ts
@@ -0,0 +1,61 @@
+import { combineLatest, Observable, of } from 'rxjs';
+import { distinctUntilChanged, map } from 'rxjs/operators';
+
+import { PermissionConfig, PermissionConfigType, PermissionTypes } from './current-user-permissions.config';
+
+export interface IConfigGroups {
+  [permissionType: string]: IConfigGroup;
+}
+
+export type IConfigGroup = PermissionConfig[];
+
+export type IPermissionCheckCombineTypes = '||' | '&&';
+
+export interface IPermissionCheckCombiner {
+  checks: Observable<boolean>[];
+  combineType?: IPermissionCheckCombineTypes;
+}
+export interface ICurrentUserPermissionsChecker {
+  /**
+   * For the given permission action find the checker configuration that will determine if the user can or cannot do the action
+   * If this is not supported by the the checker null is returned. If another checker also lays claim to the same string the check will
+   * always return denied
+   */
+  getPermissionConfig: (action: string) => PermissionConfigType
+  /**
+   * Simple checks are used when the permission config contains a single thing to check
+   */
+  getSimpleCheck: (
+    permissionConfig: PermissionConfig,
+    endpointGuid?: string,
+    ...args: any[]
+  ) => Observable<boolean>;
+  /**
+   * Used when the permission config contains multiple things to check
+   */
+  getComplexCheck: (
+    permissionConfig: PermissionConfig[],
+    permission: PermissionTypes,
+    ...args: any[]
+  ) => IPermissionCheckCombiner[];
+  /**
+   * If no checker provides simple
+   */
+  getFallbackCheck: (
+    endpointGuid: string,
+    endpointType: string
+  ) => Observable<boolean>;
+}
+
+export abstract class BaseCurrentUserPermissionsChecker {
+  public static reduceChecks(checks: Observable<boolean>[], type: IPermissionCheckCombineTypes = '||') {
+    const func = type === '||' ? 'some' : 'every';
+    if (!checks || !checks.length) {
+      return of(true);
+    }
+    return combineLatest(checks).pipe(
+      map(flags => flags[func](flag => flag)),
+      distinctUntilChanged()
+    );
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/core/permissions/stratos-user-permissions.checker.ts b/src/frontend/packages/core/src/core/permissions/stratos-user-permissions.checker.ts
new file mode 100644
index 0000000000..a0bcb58695
--- /dev/null
+++ b/src/frontend/packages/core/src/core/permissions/stratos-user-permissions.checker.ts
@@ -0,0 +1,131 @@
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+
+import { GeneralEntityAppState } from '../../../../store/src/app-state';
+import {
+  getCurrentUserStratosHasScope,
+  getCurrentUserStratosRole,
+} from '../../../../store/src/selectors/current-user-role.selectors';
+import { IPermissionConfigs, PermissionConfig, PermissionTypes, PermissionValues } from './current-user-permissions.config';
+import {
+  BaseCurrentUserPermissionsChecker,
+  IConfigGroups,
+  ICurrentUserPermissionsChecker,
+  IPermissionCheckCombiner,
+} from './current-user-permissions.types';
+
+
+export enum StratosCurrentUserPermissions {
+  ENDPOINT_REGISTER = 'register.endpoint',
+  PASSWORD_CHANGE = 'change-password',
+}
+
+export enum StratosPermissionStrings {
+  _GLOBAL_ = 'global',
+  STRATOS_ADMIN = 'isAdmin'
+}
+
+
+export enum StratosScopeStrings {
+  STRATOS_CHANGE_PASSWORD = 'password.write',
+  SCIM_READ = 'scim.read'
+}
+
+export enum StratosPermissionTypes {
+  STRATOS = 'internal',
+  STRATOS_SCOPE = 'internal-scope'
+}
+
+// For each set permissions are checked by permission types of ENDPOINT, ENDPOINT_SCOPE, STRATOS_SCOPE, FEATURE_FLAG or a random bag.
+// Every group result must be true in order for the permission to be true. A group result is true if all or some of it's permissions are
+// true (see `getCheckFromConfig`).
+export const stratosPermissionConfigs: IPermissionConfigs = {
+  [StratosCurrentUserPermissions.ENDPOINT_REGISTER]: new PermissionConfig(StratosPermissionTypes.STRATOS, StratosPermissionStrings.STRATOS_ADMIN),
+  [StratosCurrentUserPermissions.PASSWORD_CHANGE]: new PermissionConfig(StratosPermissionTypes.STRATOS_SCOPE, StratosScopeStrings.STRATOS_CHANGE_PASSWORD),
+};
+
+export class StratosUserPermissionsChecker extends BaseCurrentUserPermissionsChecker implements ICurrentUserPermissionsChecker {
+  constructor(private store: Store<GeneralEntityAppState>, ) {
+    super()
+  }
+
+  getPermissionConfig(action: string) {
+    return stratosPermissionConfigs[action];
+  }
+
+  private check(
+    type: PermissionTypes,
+    permission: PermissionValues,
+  ) {
+    if (type === StratosPermissionTypes.STRATOS) {
+      return this.store.select(getCurrentUserStratosRole(permission));
+    }
+
+    if (type === StratosPermissionTypes.STRATOS_SCOPE) {
+      return this.store.select(getCurrentUserStratosHasScope(permission as StratosScopeStrings));
+    }
+  }
+  /**
+   * @param permissionConfig Single permission to be checked
+   */
+  public getSimpleCheck(permissionConfig: PermissionConfig): Observable<boolean> {
+    switch (permissionConfig.type) {
+      case (StratosPermissionTypes.STRATOS):
+        return this.getInternalCheck(permissionConfig.permission as StratosPermissionStrings);
+      case (StratosPermissionTypes.STRATOS_SCOPE):
+        return this.getInternalScopesCheck(permissionConfig.permission as StratosScopeStrings);
+    }
+  }
+
+  private getInternalCheck(permission: StratosPermissionStrings) {
+    return this.check(StratosPermissionTypes.STRATOS, permission);
+  }
+
+  private getInternalScopesChecks(
+    configs: PermissionConfig[]
+  ) {
+    return configs.map(config => {
+      const { permission } = config;
+      return this.getInternalScopesCheck(permission as StratosScopeStrings);
+    });
+  }
+
+  private getInternalScopesCheck(permission: StratosScopeStrings) {
+    return this.check(StratosPermissionTypes.STRATOS_SCOPE, permission);
+  }
+
+  public getComplexCheck(
+    permissionConfig: PermissionConfig[],
+    ...args: any[]
+  ): IPermissionCheckCombiner[] {
+    const groupedChecks = this.groupConfigs(permissionConfig);
+    const res = Object.keys(groupedChecks).map((permission: PermissionTypes) => {
+      const configGroup = groupedChecks[permission];
+      switch (permission) {
+        case StratosPermissionTypes.STRATOS_SCOPE:
+          return {
+            checks: this.getInternalScopesChecks(configGroup),
+          };
+      }
+    })
+    // Checker must handle all configs
+    return res.every(check => !!check) ? res : null;
+  }
+  public getFallbackCheck(endpointGuid: string, endpointType: string): Observable<boolean> {
+    return null;
+  };
+
+  private groupConfigs(configs: PermissionConfig[]): IConfigGroups {
+    return configs.reduce((grouped, config) => {
+      const type = config.type;
+      return {
+        ...grouped,
+        [type]: [
+          ...(grouped[type] || []),
+          config
+        ]
+      };
+    }, {});
+  }
+
+}
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 6be08fe176..7a73600412 100644
--- a/src/frontend/packages/core/src/core/user-favorite-helpers.ts
+++ b/src/frontend/packages/core/src/core/user-favorite-helpers.ts
@@ -10,14 +10,14 @@ export function isEndpointTypeFavorite(favorite: UserFavorite<IFavoriteMetadata>
 // Uses the endpoint definition to get the helper that can look up an entitty
 export function getFavoriteFromEntity<T extends IEntityMetadata = IEntityMetadata>(
   entity,
-  entityKey: string,
+  entityType: string,
   favoritesConfigMapper: FavoritesConfigMapper,
-  entityType: string
+  endpointType: string
 ): UserFavorite<T> {
   // Use entity catalog to get favorite for the given endpoint type
-  const endpoint = entityCatalog.getEndpoint(entityType);
+  const endpoint = entityCatalog.getEndpoint(endpointType);
   if (endpoint && endpoint.definition && endpoint.definition.favoriteFromEntity) {
-    return endpoint.definition.favoriteFromEntity(entity, entityKey, favoritesConfigMapper);
+    return endpoint.definition.favoriteFromEntity(entity, entityType, favoritesConfigMapper);
   }
 
   return null;
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 52e766a9b3..f83b16a256 100644
--- a/src/frontend/packages/core/src/core/user-profile.service.ts
+++ b/src/frontend/packages/core/src/core/user-profile.service.ts
@@ -16,6 +16,7 @@ import { EntityServiceFactory } from '../../../store/src/entity-service-factory.
 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 { SessionData } from '../../../store/src/types/auth.types';
 import { UserProfileInfo, UserProfileInfoEmail, UserProfileInfoUpdates } from '../../../store/src/types/user-profile.types';
 import { userProfileEntitySchema } from '../base-entity-schemas';
 
@@ -69,6 +70,7 @@ export class UserProfileService {
     return this.store.select(s => s.auth).pipe(
       filter((auth: AuthState) => !!(auth && auth.sessionData)),
       map((auth: AuthState) => auth.sessionData),
+      filter((sessionData: SessionData) => !!sessionData.user),
       first(),
       map(data => new FetchUserProfileAction(data.user.guid))
     );
diff --git a/src/frontend/packages/core/src/core/user.service.spec.ts b/src/frontend/packages/core/src/core/user.service.spec.ts
index 33ba397021..6fdaab8b3a 100644
--- a/src/frontend/packages/core/src/core/user.service.spec.ts
+++ b/src/frontend/packages/core/src/core/user.service.spec.ts
@@ -1,7 +1,7 @@
 import { inject, TestBed } from '@angular/core/testing';
 
 import { CoreTestingModule } from '../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 import { SharedModule } from '../shared/shared.module';
 import { CoreModule } from './core.module';
 import { UserService } from './user.service';
diff --git a/src/frontend/packages/core/src/features/about/about-page/about-page.component.spec.ts b/src/frontend/packages/core/src/features/about/about-page/about-page.component.spec.ts
index f2f29ab301..3aea3c6790 100644
--- a/src/frontend/packages/core/src/features/about/about-page/about-page.component.spec.ts
+++ b/src/frontend/packages/core/src/features/about/about-page/about-page.component.spec.ts
@@ -1,9 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createBasicStoreModule } from '@stratosui/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 { AboutPageComponent } from './about-page.component';
diff --git a/src/frontend/packages/core/src/features/about/diagnostics-page/diagnostics-page.component.spec.ts b/src/frontend/packages/core/src/features/about/diagnostics-page/diagnostics-page.component.spec.ts
index 8ab9411e15..c65bac7fc7 100644
--- a/src/frontend/packages/core/src/features/about/diagnostics-page/diagnostics-page.component.spec.ts
+++ b/src/frontend/packages/core/src/features/about/diagnostics-page/diagnostics-page.component.spec.ts
@@ -1,9 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createBasicStoreModule } from '@stratosui/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 { DiagnosticsPageComponent } from './diagnostics-page.component';
diff --git a/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.spec.ts b/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.spec.ts
index 36c9370e92..20023d114b 100644
--- a/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.spec.ts
+++ b/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.spec.ts
@@ -1,8 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { TabNavService } from '../../../../tab-nav.service';
-import { createBasicStoreModule } from '@stratos/store/testing';
 import { CoreModule } from '../../../core/core.module';
 import { SharedModule } from '../../../shared/shared.module';
 import { EulaPageComponent, EulaPageContentComponent } from './eula-page.component';
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 9aa632989f..c409c37976 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
@@ -7,8 +7,8 @@ import { Store } from '@ngrx/store';
 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 { CloseSideNav, DisableMobileNav, EnableMobileNav } from '../../../../../store/src/actions/dashboard-actions';
+import { GetCurrentUsersRelations } from '../../../../../store/src/actions/permissions.actions';
 import { GetUserFavoritesAction } from '../../../../../store/src/actions/user-favourites-actions/get-user-favorites-action';
 import { DashboardOnlyAppState } from '../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
diff --git a/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.spec.ts b/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.spec.ts
index 3099287848..99b1bc3fc1 100644
--- a/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.spec.ts
+++ b/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.spec.ts
@@ -1,8 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
 import { CustomizationService } from '../../../core/customizations.types';
 import { MDAppModule } from '../../../core/md.module';
 import { SideNavComponent } from './side-nav.component';
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 93034184a4..752e290c94 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,7 +4,7 @@ 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 { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
 import { CoreModule } from '../../../core/core.module';
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 d265f5b75b..589e58009c 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,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { createBasicStoreModule } from '@stratos/store/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
 import { CoreModule } from '../../../core/core.module';
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.spec.ts
index 8be52f97f8..c0108afa2d 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.spec.ts
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.spec.ts
@@ -2,10 +2,10 @@ 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 '@stratosui/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 { CreateEndpointBaseStepComponent } from './create-endpoint-base-step.component';
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 0d1c1e7a2c..ee8c879141 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,7 +1,7 @@
 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 { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreTestingModule } from '../../../../../test-framework/core-test.modules';
 import { CoreModule } from '../../../../core/core.module';
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.spec.ts
index 02e8eb1026..4413a91ef7 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.spec.ts
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { createBasicStoreModule } from '@stratos/store/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreTestingModule } from '../../../../../test-framework/core-test.modules';
 import { CoreModule } from '../../../../core/core.module';
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 dda3a78ace..7479b4a0d1 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
@@ -3,7 +3,7 @@ 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 { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { TabNavService } from '../../../../tab-nav.service';
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
diff --git a/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.spec.ts
index da645164b8..2906a26a9d 100644
--- a/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.spec.ts
+++ b/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.spec.ts
@@ -3,15 +3,16 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { StoreModule } from '@ngrx/store';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { appReducers } from '../../../../../store/src/reducers.module';
 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 { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
 import { SharedModule } from '../../../shared/shared.module';
-import { EndpointsPageComponent } from './endpoints-page.component';
 import { SidePanelService } from './../../../shared/services/side-panel.service';
+import { EndpointsPageComponent } from './endpoints-page.component';
 
 describe('EndpointsPageComponent', () => {
   let component: EndpointsPageComponent;
@@ -33,7 +34,7 @@ describe('EndpointsPageComponent', () => {
         ),
         NoopAnimationsModule
       ],
-      providers: [TabNavService, SidePanelService]
+      providers: [TabNavService, SidePanelService, CurrentUserPermissionsService]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.ts b/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.ts
index 969a5a5dd1..7992db8c39 100644
--- a/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.ts
@@ -18,7 +18,6 @@ import { delay, first, map, tap } from 'rxjs/operators';
 import { RouterNav } from '../../../../../store/src/actions/router.actions';
 import { EndpointOnlyAppState } from '../../../../../store/src/app-state';
 import { selectDashboardState } from '../../../../../store/src/selectors/dashboard.selectors';
-import { CurrentUserPermissions } from '../../../core/current-user-permissions.config';
 import { CustomizationService, CustomizationsMetadata } from '../../../core/customizations.types';
 import { EndpointsService } from '../../../core/endpoints.service';
 import {
@@ -26,6 +25,7 @@ import {
   StratosActionMetadata,
   StratosActionType,
 } from '../../../core/extension/extension-service';
+import { StratosCurrentUserPermissions } from '../../../core/permissions/stratos-user-permissions.checker';
 import { safeUnsubscribe } from '../../../core/utils.service';
 import { EndpointListHelper } from '../../../shared/components/list/list-types/endpoint/endpoint-list.helpers';
 import {
@@ -43,7 +43,7 @@ import { ListConfig } from '../../../shared/components/list/list.component.types
   }, EndpointListHelper]
 })
 export class EndpointsPageComponent implements AfterViewInit, OnDestroy, OnInit {
-  public canRegisterEndpoint = CurrentUserPermissions.ENDPOINT_REGISTER;
+  public canRegisterEndpoint = StratosCurrentUserPermissions.ENDPOINT_REGISTER;
   private healthCheckTimeout: number;
 
   @ViewChild('customNoEndpoints', { read: ViewContainerRef, static: true }) customNoEndpointsContainer;
diff --git a/src/frontend/packages/core/src/features/error-page/error-page/error-page.component.spec.ts b/src/frontend/packages/core/src/features/error-page/error-page/error-page.component.spec.ts
index 5972631704..206f02d3d9 100644
--- a/src/frontend/packages/core/src/features/error-page/error-page/error-page.component.spec.ts
+++ b/src/frontend/packages/core/src/features/error-page/error-page/error-page.component.spec.ts
@@ -1,9 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createBasicStoreModule } from '@stratosui/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 { ErrorPageComponent } from './error-page.component';
diff --git a/src/frontend/packages/core/src/features/event-page/events-page/events-page.component.spec.ts b/src/frontend/packages/core/src/features/event-page/events-page/events-page.component.spec.ts
index 1bce50ae14..883569abca 100644
--- a/src/frontend/packages/core/src/features/event-page/events-page/events-page.component.spec.ts
+++ b/src/frontend/packages/core/src/features/event-page/events-page/events-page.component.spec.ts
@@ -1,9 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createBasicStoreModule } from '@stratosui/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 { EventsPageComponent } from './events-page.component';
diff --git a/src/frontend/packages/core/src/features/home/home/home-page.component.spec.ts b/src/frontend/packages/core/src/features/home/home/home-page.component.spec.ts
index 6da28f671d..a456ae097f 100644
--- a/src/frontend/packages/core/src/features/home/home/home-page.component.spec.ts
+++ b/src/frontend/packages/core/src/features/home/home/home-page.component.spec.ts
@@ -2,10 +2,10 @@ 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 '@stratosui/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 { HomePageComponent } from './home-page.component';
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 f0097b1e8e..37500654bb 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,7 +2,7 @@ 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 { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { TabNavService } from '../../../../tab-nav.service';
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
diff --git a/src/frontend/packages/core/src/features/no-endpoints-non-admin/no-endpoints-non-admin.component.spec.ts b/src/frontend/packages/core/src/features/no-endpoints-non-admin/no-endpoints-non-admin.component.spec.ts
index 2e8db8edab..fb688116a9 100644
--- a/src/frontend/packages/core/src/features/no-endpoints-non-admin/no-endpoints-non-admin.component.spec.ts
+++ b/src/frontend/packages/core/src/features/no-endpoints-non-admin/no-endpoints-non-admin.component.spec.ts
@@ -1,9 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createBasicStoreModule } from '@stratosui/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 { NoEndpointsNonAdminComponent } from './no-endpoints-non-admin.component';
diff --git a/src/frontend/packages/core/src/features/setup/local-account-wizard/local-account-wizard.component.spec.ts b/src/frontend/packages/core/src/features/setup/local-account-wizard/local-account-wizard.component.spec.ts
index c2eee31eeb..d76be87a52 100644
--- a/src/frontend/packages/core/src/features/setup/local-account-wizard/local-account-wizard.component.spec.ts
+++ b/src/frontend/packages/core/src/features/setup/local-account-wizard/local-account-wizard.component.spec.ts
@@ -2,7 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
-import { createEmptyStoreModule } from '@stratos/store/testing';
+import { createEmptyStoreModule } from '@stratosui/store/testing';
 
 import { TabNavService } from '../../../../tab-nav.service';
 import { CoreModule } from '../../../core/core.module';
diff --git a/src/frontend/packages/core/src/features/user-profile/edit-profile-info/edit-profile-info.component.spec.ts b/src/frontend/packages/core/src/features/user-profile/edit-profile-info/edit-profile-info.component.spec.ts
index 1b22dc0366..89281e1382 100644
--- a/src/frontend/packages/core/src/features/user-profile/edit-profile-info/edit-profile-info.component.spec.ts
+++ b/src/frontend/packages/core/src/features/user-profile/edit-profile-info/edit-profile-info.component.spec.ts
@@ -2,13 +2,14 @@ import { CommonModule } from '@angular/common';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createBasicStoreModule } from '@stratosui/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 { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
 import { UserProfileService } from '../../../core/user-profile.service';
+import { SharedModule } from '../../../shared/shared.module';
 import { EditProfileInfoComponent } from './edit-profile-info.component';
 
 describe('EditProfileInfoComponent', () => {
@@ -27,7 +28,7 @@ describe('EditProfileInfoComponent', () => {
         CoreTestingModule,
         createBasicStoreModule()
       ],
-      providers: [UserProfileService, TabNavService],
+      providers: [UserProfileService, TabNavService, CurrentUserPermissionsService],
     })
       .compileComponents();
   });
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 8f14434f3a..54194241ee 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
@@ -5,8 +5,8 @@ import { Subscription } from 'rxjs';
 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 { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
+import { StratosCurrentUserPermissions } from '../../../core/permissions/stratos-user-permissions.checker';
 import { UserProfileService } from '../../../core/user-profile.service';
 import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component';
 
@@ -53,7 +53,7 @@ export class EditProfileInfoComponent implements OnInit, OnDestroy {
 
 
   // Only allow password change if user has the 'password.write' group
-  public canChangePassword = this.currentUserPermissionsService.can(CurrentUserPermissions.PASSWORD_CHANGE);
+  public canChangePassword = this.currentUserPermissionsService.can(StratosCurrentUserPermissions.PASSWORD_CHANGE);
 
   public passwordRequired = false;
 
diff --git a/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.spec.ts b/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.spec.ts
index 849f04870e..2c855307de 100644
--- a/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.spec.ts
+++ b/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.spec.ts
@@ -2,13 +2,13 @@ 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 '@stratosui/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 { UserProfileService } from '../../../core/user-profile.service';
+import { SharedModule } from '../../../shared/shared.module';
 import { ProfileInfoComponent } from './profile-info.component';
 
 describe('ProfileInfoComponent', () => {
diff --git a/src/frontend/packages/core/src/logged-in.service.spec.ts b/src/frontend/packages/core/src/logged-in.service.spec.ts
index e910c7d7f3..9d4deef54d 100644
--- a/src/frontend/packages/core/src/logged-in.service.spec.ts
+++ b/src/frontend/packages/core/src/logged-in.service.spec.ts
@@ -1,8 +1,8 @@
 import { inject, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreTestingModule } from '../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
 import { CoreModule } from './core/core.module';
 import { LoggedInService } from './logged-in.service';
 
diff --git a/src/frontend/packages/core/src/shared/components/code-block/code-block.component.spec.ts b/src/frontend/packages/core/src/shared/components/code-block/code-block.component.spec.ts
index 470cba4925..63f1ac0b9d 100644
--- a/src/frontend/packages/core/src/shared/components/code-block/code-block.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/code-block/code-block.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
 import { CoreModule } from '../../../core/core.module';
 import { CopyToClipboardComponent } from '../copy-to-clipboard/copy-to-clipboard.component';
 import { CodeBlockComponent } from './code-block.component';
diff --git a/src/frontend/packages/core/src/shared/components/copy-to-clipboard/copy-to-clipboard.component.spec.ts b/src/frontend/packages/core/src/shared/components/copy-to-clipboard/copy-to-clipboard.component.spec.ts
index 636bd2a970..952c401a0f 100644
--- a/src/frontend/packages/core/src/shared/components/copy-to-clipboard/copy-to-clipboard.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/copy-to-clipboard/copy-to-clipboard.component.spec.ts
@@ -1,5 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { createBasicStoreModule } from '@stratos/store/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
 import { CoreModule } from '../../../core/core.module';
diff --git a/src/frontend/packages/core/src/shared/components/endpoints-missing/endpoints-missing.component.spec.ts b/src/frontend/packages/core/src/shared/components/endpoints-missing/endpoints-missing.component.spec.ts
index c71c11e604..b5687f40e7 100644
--- a/src/frontend/packages/core/src/shared/components/endpoints-missing/endpoints-missing.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/endpoints-missing/endpoints-missing.component.spec.ts
@@ -1,8 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createBasicStoreModule } from '@stratosui/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.module';
 import { EndpointsMissingComponent } from './endpoints-missing.component';
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 93b850ca5e..ed7de6c1dd 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,7 +2,7 @@ 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 { createBasicStoreModule } from '@stratosui/store/testing';
 import { Observable, of } from 'rxjs';
 
 import { EntitySchema } from '../../../../../../../../store/src/helpers/entity-schema';
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 868d8477d4..0aec42062f 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
@@ -25,7 +25,7 @@ export function createMetaCardMenuItemSeparator() {
   return {
     label: '-',
     separator: true,
-    action: () => {}
+    action: () => { }
   };
 }
 
@@ -79,7 +79,7 @@ export class MetaCardComponent implements OnDestroy {
           first(),
           tap(entity => this.favorite = getFavoriteFromEntity(
             entity,
-            entityConfig.schema.key,
+            entityConfig.schema.entityType,
             this.favoritesConfigMapper,
             entityConfig.schema.endpointType
           ))
diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.scss b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.scss
index 7ad3af708e..2912084f8b 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.scss
+++ b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.scss
@@ -58,3 +58,14 @@
     }
   }
 }
+
+.meta-card-item-multiline {
+  align-items: flex-start;
+  display: flex;
+  justify-content: space-between;
+  min-height: 30px;
+  padding: 7px 0 2px;
+  .meta-card-item__value {
+    white-space: unset;
+  }
+}
diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.ts b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.ts
index 3a620e9a56..239b476a02 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-item/meta-card-item.component.ts
@@ -18,6 +18,7 @@ export class MetaCardItemComponent implements OnInit {
     column: 'meta-card-item-column',
     'long-text': 'meta-card-item-long-text',
     'long-text-fixed': 'meta-card-item-long-text-fixed',
+    multiline: 'meta-card-item-multiline',
   };
   itemStyle = 'meta-card-item-row';
   @ContentChild(MetaCardKeyComponent, { static: true })
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-actions/table-cell-actions.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-actions/table-cell-actions.component.spec.ts
index 278e409532..a171fb8dcc 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-actions/table-cell-actions.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-actions/table-cell-actions.component.spec.ts
@@ -1,9 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 import { of as observableOf } from 'rxjs';
 
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { CoreTestingModule } from '../../../../../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
 import { CoreModule } from '../../../../../core/core.module';
 import { IListDataSource } from '../../data-sources-controllers/list-data-source-types';
 import { ListConfig } from '../../list.component.types';
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 6bb2311dfb..762307187d 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,5 +1,5 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { getRowMetadata } from '@stratos/store';
+import { getRowMetadata } from '@stratosui/store';
 
 import { EntitySchema } from '../../../../../../../store/src/helpers/entity-schema';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
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 beb3046000..2bd2fd27d5 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
@@ -12,6 +12,9 @@ import {
 import { MultiActionListEntity } from '../../../../../../../store/src/monitors/pagination-monitor';
 import { coreEndpointListDetailsComponents } from '../../../../../features/endpoints/endpoint-helpers';
 import { IListDataSource } from '../../data-sources-controllers/list-data-source-types';
+import {
+  TableCellEndpointAddressComponent,
+} from '../../list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component';
 import {
   TableCellEndpointDetailsComponent,
 } from '../../list-types/endpoint/table-cell-endpoint-details/table-cell-endpoint-details.component';
@@ -55,6 +58,7 @@ export const listTableCells: Type<TableCellCustom<any>>[] = [
   TableCellSidePanelComponent,
   TableCellIconComponent,
   TableCellExpanderComponent,
+  TableCellEndpointAddressComponent,
   ...coreEndpointListDetailsComponents
 ];
 
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table.component.spec.ts
index 2b463228d6..875a84c668 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table.component.spec.ts
@@ -2,11 +2,11 @@ import { CdkTableModule } from '@angular/cdk/table';
 import { Component, ViewChild } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 import { EMPTY, of as observableOf } from 'rxjs';
 
 import { ListSort } from '../../../../../../store/src/actions/list.actions';
 import { CoreTestingModule } from '../../../../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
 import { CoreModule } from '../../../../core/core.module';
 import { UtilsService } from '../../../../core/utils.service';
 import { SharedModule } from '../../../shared.module';
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.html b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.html
index af9d52a709..e5e6cb868e 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.html
@@ -19,7 +19,8 @@
           -->
         </div>
       </div>
-      <app-copy-to-clipboard #copyToClipboard class="endpoint-card__hidden" [text]="address" tooltip="Copy to clipboard" [showSuccessText]="false"></app-copy-to-clipboard>
+      <app-copy-to-clipboard #copyToClipboard class="endpoint-card__hidden" [text]="address" tooltip="Copy to clipboard"
+        [showSuccessText]="false"></app-copy-to-clipboard>
     </div>
   </app-meta-card-title>
   <app-meta-card-item>
@@ -43,10 +44,10 @@
       </div>
     </app-meta-card-value>
   </app-meta-card-item>
-  <app-meta-card-item *ngIf="hasDetails">
+  <app-meta-card-item [hidden]="!hasDetails">
     <app-meta-card-key>Details</app-meta-card-key>
     <app-meta-card-value>
       <div #endpointDetails></div>
     </app-meta-card-value>
   </app-meta-card-item>
-</app-meta-card>
+</app-meta-card>
\ No newline at end of file
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 22843439b7..581680cd4f 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
@@ -9,8 +9,7 @@ import {
   ViewContainerRef,
 } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { CurrentUserPermissions } from 'frontend/packages/core/src/core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from 'frontend/packages/core/src/core/current-user-permissions.service';
+import { CurrentUserPermissionsService } from 'frontend/packages/core/src/core/permissions/current-user-permissions.service';
 import { AppState } from 'frontend/packages/store/src/app-state';
 import { Observable, of, ReplaySubject, Subscription } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
@@ -64,7 +63,7 @@ export class EndpointCardComponent extends CardCell<EndpointModel> implements On
 
   @Input() component: EndpointListDetailsComponent;
   private endpointDetails: ViewContainerRef;
-  @ViewChild('endpointDetails', { read: ViewContainerRef }) set content(content: ViewContainerRef) {
+  @ViewChild('endpointDetails', { read: ViewContainerRef, static: true }) set content(content: ViewContainerRef) {
     this.endpointDetails = content;
     this.updateInnerComponent();
   }
@@ -107,15 +106,8 @@ export class EndpointCardComponent extends CardCell<EndpointModel> implements On
         can: endpointAction.createVisible(this.rowObs)
       }));
 
-      // Add edit
-      this.cardMenu.push({
-        label: 'Edit endpoint',
-        action: () => this.editEndpoint(),
-        can: this.currentUserPermissionsService.can(CurrentUserPermissions.ENDPOINT_REGISTER)
-      });
-      this.cardMenu.push(createMetaCardMenuItemSeparator());
-
       // Add a copy address to clipboard
+      this.cardMenu.push(createMetaCardMenuItemSeparator());
       this.cardMenu.push({
         label: 'Copy address to Clipboard',
         action: () => this.copyToClipboard.copyToClipboard(),
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 d785fb066b..b621bc2513 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
@@ -5,6 +5,7 @@ import { combineLatest, Observable } from 'rxjs';
 import { map, pairwise } from 'rxjs/operators';
 
 import { DisconnectEndpoint, UnregisterEndpoint } from '../../../../../../../store/src/actions/endpoint.actions';
+import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
 import { ShowSnackBar } from '../../../../../../../store/src/actions/snackBar.actions';
 import { GetSystemInfo } from '../../../../../../../store/src/actions/system.actions';
 import { AppState } from '../../../../../../../store/src/app-state';
@@ -14,9 +15,9 @@ import { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity
 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 { LoggerService } from '../../../../../core/logger.service';
+import { CurrentUserPermissionsService } from '../../../../../core/permissions/current-user-permissions.service';
+import { StratosCurrentUserPermissions } from '../../../../../core/permissions/stratos-user-permissions.checker';
 import {
   ConnectEndpointDialogComponent,
 } from '../../../../../features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component';
@@ -72,7 +73,7 @@ export class EndpointListHelper {
         label: 'Disconnect',
         description: ``, // Description depends on console user permission
         createVisible: (row$: Observable<EndpointModel>) => combineLatest(
-          this.currentUserPermissionsService.can(CurrentUserPermissions.ENDPOINT_REGISTER),
+          this.currentUserPermissionsService.can(StratosCurrentUserPermissions.ENDPOINT_REGISTER),
           row$
         ).pipe(
           map(([isAdmin, row]) => {
@@ -119,7 +120,16 @@ export class EndpointListHelper {
         },
         label: 'Unregister',
         description: 'Remove the endpoint',
-        createVisible: () => this.currentUserPermissionsService.can(CurrentUserPermissions.ENDPOINT_REGISTER)
+        createVisible: () => this.currentUserPermissionsService.can(StratosCurrentUserPermissions.ENDPOINT_REGISTER)
+      },
+      {
+        action: (item) => {
+          const routerLink = `/endpoints/edit/${item.guid}`;
+          this.store.dispatch(new RouterNav({ path: routerLink }));
+        },
+        label: 'Edit endpoint',
+        description: 'Edit the endpoint',
+        createVisible: () => this.currentUserPermissionsService.can(StratosCurrentUserPermissions.ENDPOINT_REGISTER)
       }
     ];
   }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoints-list-config.service.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoints-list-config.service.spec.ts
index 0024d16c78..25c6056137 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoints-list-config.service.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoints-list-config.service.spec.ts
@@ -1,9 +1,10 @@
 import { CommonModule } from '@angular/common';
 import { inject, TestBed } from '@angular/core/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreTestingModule } from '../../../../../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
 import { CoreModule } from '../../../../../core/core.module';
+import { CurrentUserPermissionsService } from '../../../../../core/permissions/current-user-permissions.service';
 import { SharedModule } from '../../../../shared.module';
 import { EndpointListHelper } from './endpoint-list.helpers';
 import { EndpointsListConfigService } from './endpoints-list-config.service';
@@ -11,7 +12,7 @@ import { EndpointsListConfigService } from './endpoints-list-config.service';
 describe('EndpointsListConfigService', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
-      providers: [EndpointsListConfigService, EndpointListHelper],
+      providers: [EndpointsListConfigService, EndpointListHelper, CurrentUserPermissionsService],
       imports: [
         CommonModule,
         CoreModule,
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 fd8d8c57fc..1848861dae 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
@@ -9,7 +9,6 @@ import { EntityMonitorFactory } from '../../../../../../../store/src/monitors/en
 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 { 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';
@@ -17,6 +16,7 @@ import { IListAction, IListConfig, ListViewTypes } from '../../list.component.ty
 import { EndpointCardComponent } from './endpoint-card/endpoint-card.component';
 import { EndpointListHelper } from './endpoint-list.helpers';
 import { EndpointsDataSource } from './endpoints-data-source';
+import { TableCellEndpointAddressComponent } from './table-cell-endpoint-address/table-cell-endpoint-address.component';
 import { TableCellEndpointDetailsComponent } from './table-cell-endpoint-details/table-cell-endpoint-details.component';
 import { TableCellEndpointNameComponent } from './table-cell-endpoint-name/table-cell-endpoint-name.component';
 import { TableCellEndpointStatusComponent } from './table-cell-endpoint-status/table-cell-endpoint-status.component';
@@ -71,9 +71,7 @@ export class EndpointsListConfigService implements IListConfig<EndpointModel> {
     {
       columnId: 'address',
       headerCell: () => 'Address',
-      cellDefinition: {
-        getValue: getFullEndpointApiUrl
-      },
+      cellComponent: TableCellEndpointAddressComponent,
       sort: {
         type: 'sort',
         orderKey: 'address',
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component.html b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component.html
new file mode 100644
index 0000000000..f12d8357db
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component.html
@@ -0,0 +1,5 @@
+<div class="endpoint-address-cell" *ngIf="endpointAddress$ | async as address">
+  <div>{{ address }}</div>
+  <app-copy-to-clipboard class="endpoint-address-cell__copy" [compact]="true" [text]="address" tooltip="Copy to clipboard" [showSuccessText]="false">
+  </app-copy-to-clipboard>
+</div>
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component.scss b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component.scss
new file mode 100644
index 0000000000..8f6f809311
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component.scss
@@ -0,0 +1,8 @@
+.endpoint-address-cell {
+  display: flex;
+
+  &__copy {
+    width: 24px;
+  }
+
+}
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component.spec.ts
new file mode 100644
index 0000000000..1222435209
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component.spec.ts
@@ -0,0 +1,28 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { BaseTestModules } from '../../../../../../../test-framework/core-test.helper';
+import { EndpointListHelper } from '../endpoint-list.helpers';
+import { TableCellEndpointAddressComponent } from './table-cell-endpoint-address.component';
+
+describe('TableCellEndpointAddressComponent', () => {
+  let component: TableCellEndpointAddressComponent;
+  let fixture: ComponentFixture<TableCellEndpointAddressComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [],
+      imports: [...BaseTestModules],
+      providers: [EndpointListHelper]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(TableCellEndpointAddressComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component.ts
new file mode 100644
index 0000000000..32956ffa4b
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component.ts
@@ -0,0 +1,33 @@
+import { Component, Input } from '@angular/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { GetAllEndpoints } from '../../../../../../../../store/src/actions/endpoint.actions';
+import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
+import { EndpointModel } from '../../../../../../../../store/src/types/endpoint.types';
+import { getFullEndpointApiUrl } from '../../../../../../features/endpoints/endpoint-helpers';
+import { TableCellCustom } from '../../../list.types';
+import { RowWithEndpointId } from '../table-cell-endpoint-name/table-cell-endpoint-name.component';
+
+@Component({
+  selector: 'app-table-cell-endpoint-address',
+  templateUrl: './table-cell-endpoint-address.component.html',
+  styleUrls: ['./table-cell-endpoint-address.component.scss']
+})
+export class TableCellEndpointAddressComponent extends TableCellCustom<EndpointModel | RowWithEndpointId>  {
+  public endpointAddress$: Observable<any>;
+
+  constructor(private entityServiceFactory: EntityServiceFactory) {
+    super();
+  }
+
+  @Input('row')
+  set row(row: EndpointModel | RowWithEndpointId) {
+    /* tslint:disable-next-line:no-string-literal */
+    const id = row['endpointId'] || row['guid'];
+    this.endpointAddress$ = this.entityServiceFactory.create(id, new GetAllEndpoints()).waitForEntity$.pipe(
+      map(data => data.entity),
+      map((data: any) => getFullEndpointApiUrl(data))
+    );
+  }
+}
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 6a7ce0ac11..79d01782ed 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,7 +2,7 @@ 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 { createBasicStoreModule } from '@stratosui/store/testing';
 import { BehaviorSubject, of as observableOf } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 
@@ -14,6 +14,7 @@ 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 { CoreModule } from '../../../core/core.module';
+import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
 import { SharedModule } from '../../shared.module';
 import { EndpointCardComponent } from './list-types/endpoint/endpoint-card/endpoint-card.component';
 import { EndpointListHelper } from './list-types/endpoint/endpoint-list.helpers';
@@ -125,7 +126,8 @@ describe('ListComponent', () => {
           // ApplicationStateService,
           PaginationMonitorFactory,
           EntityMonitorFactory,
-          EndpointListHelper
+          EndpointListHelper,
+          CurrentUserPermissionsService
         ],
         imports: [
           CoreModule,
diff --git a/src/frontend/packages/core/src/shared/components/loading-page/loading-page.component.spec.ts b/src/frontend/packages/core/src/shared/components/loading-page/loading-page.component.spec.ts
index a1dba5260d..8a6c026a8a 100644
--- a/src/frontend/packages/core/src/shared/components/loading-page/loading-page.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/loading-page/loading-page.component.spec.ts
@@ -1,12 +1,12 @@
 import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 import { of } from 'rxjs';
 
 import { EntitySchema } from '../../../../../store/src/helpers/entity-schema';
+import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
 import { MDAppModule } from '../../../core/md.module';
-import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { SharedModule } from '../../shared.module';
 import { LoadingPageComponent } from './loading-page.component';
 
diff --git a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.spec.ts b/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.spec.ts
index c5f27babe0..6e783f38c2 100644
--- a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.spec.ts
@@ -2,7 +2,7 @@ import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http'
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { createBasicStoreModule } from '@stratos/store/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
 import { LoggerService } from '../../../core/logger.service';
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 09af467030..6c913ac361 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,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { createBasicStoreModule } from '@stratos/store/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
 import { CoreModule } from '../../../core/core.module';
diff --git a/src/frontend/packages/core/src/shared/components/metrics-parent-range-selector/metrics-parent-range-selector.component.spec.ts b/src/frontend/packages/core/src/shared/components/metrics-parent-range-selector/metrics-parent-range-selector.component.spec.ts
index 92d03659d4..e14b522546 100644
--- a/src/frontend/packages/core/src/shared/components/metrics-parent-range-selector/metrics-parent-range-selector.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/metrics-parent-range-selector/metrics-parent-range-selector.component.spec.ts
@@ -1,10 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
+import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 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 { MetricsRangeSelectorService } from '../../services/metrics-range-selector.service';
 import { DateTimeComponent } from '../date-time/date-time.component';
 import { StartEndDateComponent } from '../start-end-date/start-end-date.component';
diff --git a/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.spec.ts b/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.spec.ts
index df3e79c48c..64d5bd8610 100644
--- a/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.spec.ts
@@ -1,10 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
+import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 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 { MetricsRangeSelectorService } from '../../services/metrics-range-selector.service';
 import { DateTimeComponent } from '../date-time/date-time.component';
 import { StartEndDateComponent } from '../start-end-date/start-end-date.component';
diff --git a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.html b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.html
index 79b2f5296e..84b796dbea 100644
--- a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.html
+++ b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.html
@@ -37,7 +37,7 @@
               |
             </span>
             <button *ngIf="showHistory" class="page-header__menu-button" mat-icon-button [matMenuTriggerFor]="history">
-              <mat-icon class="page-header__nav-toggle">history</mat-icon>
+              <mat-icon class="page-header__nav-toggle">schedule</mat-icon>
             </button>
             <mat-menu #history="matMenu" [overlapTrigger]="false" class="page-header__menu">
               <div class="page-header__history">
diff --git a/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.html b/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.html
index 61b636ae6a..4aa002471d 100644
--- a/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.html
+++ b/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.html
@@ -56,5 +56,5 @@
 </ng-template>
 
 <ng-template #noActivity>
-  <app-no-content-message [mode]="mode" icon="history" [secondLine]="{text: 'Session activity will appear here'}"></app-no-content-message>
+  <app-no-content-message [mode]="mode" icon="schedule" [secondLine]="{text: 'Session activity will appear here'}"></app-no-content-message>
 </ng-template>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.spec.ts b/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.spec.ts
index 9002b55d23..4db2802dc4 100644
--- a/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.spec.ts
@@ -1,9 +1,9 @@
 import { CommonModule } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
 import { CoreModule } from '../../../core/core.module';
 import { RecentEntitiesComponent } from './recent-entities.component';
 
diff --git a/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.spec.ts b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.spec.ts
index 5c14146db8..e09366568c 100644
--- a/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.spec.ts
@@ -2,7 +2,7 @@ import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http'
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { createBasicStoreModule } from '@stratos/store/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
 import { LoggerService } from '../../../core/logger.service';
diff --git a/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.spec.ts b/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.spec.ts
index a0515d7e9e..91ab8b04a2 100644
--- a/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.spec.ts
@@ -1,9 +1,9 @@
 import { CommonModule } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
 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 { SteppersComponent } from './steppers.component';
diff --git a/src/frontend/packages/core/src/shared/global-events.service.spec.ts b/src/frontend/packages/core/src/shared/global-events.service.spec.ts
index 708fcc7104..7359c9a610 100644
--- a/src/frontend/packages/core/src/shared/global-events.service.spec.ts
+++ b/src/frontend/packages/core/src/shared/global-events.service.spec.ts
@@ -1,7 +1,7 @@
 import { TestBed } from '@angular/core/testing';
 
 import { CoreTestingModule } from '../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 import { CoreModule } from '../core/core.module';
 import { GlobalEventService } from './global-events.service';
 import { SharedModule } from './shared.module';
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index b218f0e621..d5ab5af42e 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -278,7 +278,6 @@ import { UserPermissionDirective } from './user-permission.directive';
     UserPermissionDirective,
     BooleanIndicatorComponent,
     TableComponent,
-    UserPermissionDirective,
     CapitalizeFirstPipe,
     RoutingIndicatorComponent,
     DateTimeComponent,
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 6e3ea57118..d1e89790c6 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,8 +1,7 @@
-import { Component, TemplateRef } from '@angular/core';
+import { Component } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { BaseTestModules, generateBaseTestStoreModules } from '../../test-framework/core-test.helper';
-import { UserPermissionDirective } from './user-permission.directive';
+import { BaseTestModules } from '../../test-framework/core-test.helper';
 
 @Component({
   template: `<input type="text" *appUserPermission="">`
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 6cb7102f04..7b633408fb 100644
--- a/src/frontend/packages/core/src/shared/user-permission.directive.ts
+++ b/src/frontend/packages/core/src/shared/user-permission.directive.ts
@@ -1,60 +1,38 @@
 import { Directive, Input, OnDestroy, OnInit, TemplateRef, ViewContainerRef } from '@angular/core';
-import { Store } from '@ngrx/store';
-import { Observable, of as observableOf, Subscription } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
+import { Subscription } from 'rxjs';
 
-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';
+import { PermissionTypes } from '../core/permissions/current-user-permissions.config';
+import { CurrentUserPermissionsService } from '../core/permissions/current-user-permissions.service';
 
 @Directive({
   selector: '[appUserPermission]'
 })
 export class UserPermissionDirective implements OnDestroy, OnInit {
-
   @Input()
-  public appUserPermission: CurrentUserPermissions;
+  public appUserPermission: PermissionTypes;
 
   @Input()
   public appUserPermissionEndpointGuid: string;
 
-  @Input()
-  private appUserPermissionOrganizationGuid: string;
-
-  @Input()
-  private appUserPermissionSpaceGuid: string;
-
   private canSub: Subscription;
 
   constructor(
-    private store: Store<AppState>,
     private templateRef: TemplateRef<any>,
     private viewContainer: ViewContainerRef,
     private currentUserPermissionsService: CurrentUserPermissionsService,
   ) { }
 
   public ngOnInit() {
-    this.canSub = this.waitForEndpointPermissions(this.appUserPermissionEndpointGuid).pipe(
-      switchMap(() => this.currentUserPermissionsService.can(
-        this.appUserPermission,
-        this.appUserPermissionEndpointGuid,
-        this.getOrgOrSpaceGuid(),
-        this.getSpaceGuid()
-      ))
-    ).subscribe(
-      can => {
-        if (can) {
-          this.viewContainer.createEmbeddedView(this.templateRef);
-        } else {
-          this.viewContainer.clear();
-        }
+    this.canSub = this.currentUserPermissionsService.can(
+      this.appUserPermission,
+      this.appUserPermissionEndpointGuid,
+    ).subscribe(can => {
+      if (can) {
+        this.viewContainer.createEmbeddedView(this.templateRef);
+      } else {
+        this.viewContainer.clear();
       }
-    );
-  }
-
-  private waitForEndpointPermissions(endpointGuid: string): Observable<any> {
-    return endpointGuid && endpointGuid.length > 0 ? waitForCFPermissions(this.store, endpointGuid) : observableOf(true);
+    });
   }
 
   public ngOnDestroy() {
@@ -63,19 +41,4 @@ export class UserPermissionDirective implements OnDestroy, OnInit {
     }
   }
 
-  private getOrgOrSpaceGuid() {
-    if (this.appUserPermissionSpaceGuid && !this.appUserPermissionOrganizationGuid) {
-      return this.appUserPermissionSpaceGuid;
-    }
-    return this.appUserPermissionOrganizationGuid;
-  }
-
-  private getSpaceGuid() {
-    if (this.appUserPermissionOrganizationGuid) {
-      return this.appUserPermissionSpaceGuid;
-    }
-    return null;
-  }
-
-
 }
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 99e36a22d7..bad6c14d0f 100644
--- a/src/frontend/packages/core/test-framework/core-test.helper.ts
+++ b/src/frontend/packages/core/test-framework/core-test.helper.ts
@@ -3,12 +3,13 @@ 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 { createBasicStoreModule } from '@stratosui/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 { CurrentUserPermissionsService } from '../src/core/permissions/current-user-permissions.service';
 import {
   ApplicationStateIconComponent,
 } from '../src/shared/components/application-state/application-state-icon/application-state-icon.component';
@@ -35,7 +36,10 @@ import { CoreTestingModule } from './core-test.modules';
 
 
 @NgModule({
-  imports: [CoreModule]
+  imports: [CoreModule],
+  providers: [
+    CurrentUserPermissionsService
+  ]
 })
 export class AppTestModule {
   constructor(
diff --git a/src/frontend/packages/store/src/actions/permissions.actions.ts b/src/frontend/packages/store/src/actions/permissions.actions.ts
new file mode 100644
index 0000000000..0fd84d207b
--- /dev/null
+++ b/src/frontend/packages/store/src/actions/permissions.actions.ts
@@ -0,0 +1,9 @@
+import { Action } from '@ngrx/store';
+
+export const GET_CURRENT_USER_RELATIONS = '[Current User] Get relations';
+export const GET_CURRENT_USER_RELATIONS_SUCCESS = '[Current User] Get relations success';
+export const GET_CURRENT_USER_RELATIONS_FAILED = '[Current User] Get relations failed';
+
+export class GetCurrentUsersRelations implements Action {
+  type = GET_CURRENT_USER_RELATIONS;
+}
\ No newline at end of file
diff --git a/src/frontend/packages/store/src/effects/permissions.effect.ts b/src/frontend/packages/store/src/effects/permissions.effect.ts
new file mode 100644
index 0000000000..bb890b00a7
--- /dev/null
+++ b/src/frontend/packages/store/src/effects/permissions.effect.ts
@@ -0,0 +1,73 @@
+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 { combineLatest, EMPTY, of } from 'rxjs';
+import { catchError, map, switchMap } from 'rxjs/operators';
+
+import { LoggerService } from '../../../core/src/core/logger.service';
+import { CONNECT_ENDPOINTS_SUCCESS, EndpointActionComplete } from '../actions/endpoint.actions';
+import {
+  GET_CURRENT_USER_RELATIONS,
+  GET_CURRENT_USER_RELATIONS_FAILED,
+  GET_CURRENT_USER_RELATIONS_SUCCESS,
+  GetCurrentUsersRelations,
+} from '../actions/permissions.actions';
+import { AppState } from '../app-state';
+import { entityCatalog } from '../entity-catalog/entity-catalog';
+import { EntityUserRolesEndpoint } from '../entity-request-pipeline/entity-request-pipeline.types';
+
+const successAction: Action = { type: GET_CURRENT_USER_RELATIONS_SUCCESS };
+const failedAction: Action = { type: GET_CURRENT_USER_RELATIONS_FAILED };
+
+
+@Injectable()
+export class PermissionsEffects {
+  constructor(
+    private httpClient: HttpClient,
+    private actions$: Actions,
+    private store: Store<AppState>,
+    private logService: LoggerService
+  ) { }
+
+  @Effect() getCurrentUsersPermissions$ = this.actions$.pipe(
+    ofType<GetCurrentUsersRelations>(GET_CURRENT_USER_RELATIONS),
+    switchMap(action => {
+      const allRequestsCompleted = entityCatalog.getAllBaseEndpointTypes().reduce((res, endpointType) => {
+        if (endpointType.definition.userRolesFetch) {
+          res.push(endpointType.definition.userRolesFetch([], this.store, this.logService, this.httpClient));
+        }
+        return res;
+      }, []);
+      return combineLatest(allRequestsCompleted).pipe(
+        switchMap(succeeds => succeeds.every(succeeded => !!succeeded) ? [successAction] : [failedAction])
+      );
+    }),
+    catchError(err => {
+      this.logService.warn('Failed to fetch current user permissions: ', err);
+      return of(failedAction);
+    })
+  );
+
+
+  @Effect() getPermissionForNewlyConnectedEndpoint$ = this.actions$.pipe(
+    ofType<EndpointActionComplete>(CONNECT_ENDPOINTS_SUCCESS),
+    switchMap(action => {
+      const endpointType = entityCatalog.getEndpoint(action.endpointType)
+      if (!endpointType.definition.userRolesFetch) {
+        return EMPTY;
+      }
+      const endpoint: EntityUserRolesEndpoint = {
+        guid: action.guid,
+        user: action.endpoint.user
+      }
+      return endpointType.definition.userRolesFetch([endpoint], this.store, this.logService, this.httpClient).pipe(
+        map(succeeded => succeeded ? successAction : failedAction)
+      );
+    }),
+    catchError(err => {
+      this.logService.warn('Failed to fetch current user permissions after endpoint connected: ', err);
+      return of(failedAction);
+    })
+  );
+}
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 d02ba1eadd..3fa2b47b0a 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
@@ -38,7 +38,7 @@ 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 type KnownActionBuilders<ABC extends OrchestratedActionBuilders> = Pick<ABC, NonOptionalKeys<Pick<ABC, KnownKeys<ABC>>>>;
 
 export interface EntityCatalogBuilders<
   T extends IEntityMetadata = IEntityMetadata,
@@ -301,7 +301,7 @@ export class StratosCatalogEntity<
 
   public getEntitiesEmitHandler(): EntitiesInfoHandler {
     return this.definition.entitiesEmitHandler ||
-      this.definition.endpoint ? this.definition.endpoint.entitiesEmitHandler : null
+      this.definition.endpoint ? this.definition.endpoint.entitiesEmitHandler : null;
   }
 
   public getEntityFetchHandler(): EntityFetchHandler {
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog.ts
index d10b67359f..c6371e3e17 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog.ts
@@ -1,6 +1,9 @@
+import { Action } from '@ngrx/store';
+
 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 { ICurrentUserRolesState } from '../types/current-user-roles.types';
 import { OrchestratedActionBuilders } from './action-orchestrator/action-orchestrator';
 import {
   StratosBaseCatalogEntity,
@@ -200,6 +203,29 @@ class EntityCatalog {
       return allEntityReducers;
     }, {} as ExtraApiReducers<IRequestEntityTypeState<any>>);
   }
+
+  public getAllCurrentUserReducers(state: ICurrentUserRolesState, action: Action): ICurrentUserRolesState {
+    const endpoints = this.getAllEndpointTypes();
+    let oneChanged = false;
+    endpoints.forEach(endpoint => {
+      if (endpoint.definition.userRolesReducer) {
+        const endpointState = endpoint.definition.userRolesReducer(state.endpoints[endpoint.type], action);
+        oneChanged = oneChanged || !!endpointState;
+        if (!!endpointState) {
+          state = {
+            ...state,
+            endpoints: {
+              ...state.endpoints,
+              [endpoint.type]: endpointState
+            }
+          }
+        }
+      }
+    })
+    return oneChanged ? {
+      ...state
+    } : state;
+  }
 }
 
 // Only to be used for tests
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 130194253b..7205f8ff23 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
@@ -12,6 +12,8 @@ import {
   EntitiesInfoHandler,
   EntityFetchHandler,
   EntityInfoHandler,
+  EntityUserRolesFetch,
+  EntityUserRolesReducer,
   PreApiRequest,
   PrePaginationApiRequest,
   SuccessfulApiResponseDataMapper,
@@ -93,8 +95,6 @@ export interface IStratosBaseEntityDefinition<T = EntitySchema | EntityCatalogSc
   readonly entitiesFetchHandler?: EntitiesFetchHandler;
 }
 
-
-
 /**
  * Static information describing a stratos endpoint.
  *
@@ -129,6 +129,14 @@ export interface IStratosEndpointDefinition<T = EntityCatalogSchemas | EntitySch
   readonly favoriteFromEntity?: <M extends IEntityMetadata = IEntityMetadata>(
     entity: any, entityKey: string, favoritesConfigMapper: FavoritesConfigMapper
   ) => UserFavorite<M>;
+  /**
+   * Allows the endpoint to fetch user roles, for example when the user loads Stratos or connects an endpoint of this type
+   */
+  readonly userRolesFetch?: EntityUserRolesFetch
+  /**
+   * Allows the user roles to be stored, updated and removed in the current user permissions section of the store
+   */
+  readonly userRolesReducer?: EntityUserRolesReducer
 }
 
 export interface StratosEndpointExtensionDefinition extends Omit<IStratosEndpointDefinition, 'schema'> { }
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 9302a6a42c..7827aa9952 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,16 +1,20 @@
-import { CF_ENDPOINT_TYPE } from '../../../../cloud-foundry/src/cf-types';
+import { Action } from '@ngrx/store';
+
 import { ClearPaginationOfEntity, ClearPaginationOfType } from '../../actions/pagination.actions';
 import { RecursiveDeleteComplete } from '../../effects/recursive-entity-delete.effect';
 import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { StratosBaseCatalogEntity } from '../../entity-catalog/entity-catalog-entity/entity-catalog-entity';
-import { WrapperRequestActionSuccess } from '../../types/request.types';
+import { ApiRequestTypes } from '../../reducers/api-request-reducer/request-helpers';
+import { EntityRequestAction, WrapperRequestActionSuccess } from '../../types/request.types';
+import { PipelineResult } from '../entity-request-pipeline.types';
+
 
 export function successEntityHandler(
-  actionDispatcher,
+  actionDispatcher: (actionToDispatch: Action) => void,
   catalogEntity: StratosBaseCatalogEntity,
-  requestType,
-  action,
-  result,
+  requestType: ApiRequestTypes,
+  action: EntityRequestAction,
+  result: PipelineResult,
   recursivelyDeleting = false
 ) {
   const entityAction = catalogEntity.getRequestAction('success', action, requestType, result.response);
@@ -29,7 +33,7 @@ export function successEntityHandler(
     if (Array.isArray(action.clearPaginationEntityKeys)) {
       // If clearPaginationEntityKeys is an array then clear the pagination sections regardless of removeEntityOnDelete
       action.clearPaginationEntityKeys.forEach(key => {
-        const entityConfig = entityCatalog.getEntity(CF_ENDPOINT_TYPE, key);
+        const entityConfig = entityCatalog.getEntity(action.endpointType, key);
         actionDispatcher(new ClearPaginationOfType(entityConfig.getSchema()));
       });
     }
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 bc71e61254..46e1d685cd 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
@@ -1,7 +1,8 @@
-import { HttpRequest } from '@angular/common/http';
+import { HttpClient, HttpRequest } from '@angular/common/http';
 import { Action, Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 
+import { LoggerService } from '../../../core/src/core/logger.service';
 import { JetStreamErrorResponse } from '../../../core/src/jetstream.helpers';
 import { AppState, GeneralEntityAppState, InternalAppState } from '../app-state';
 import {
@@ -10,6 +11,7 @@ import {
 } from '../entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { ApiRequestTypes } from '../reducers/api-request-reducer/request-helpers';
 import { EntityInfo, NormalizedResponse } from '../types/api.types';
+import { EndpointUser } from '../types/endpoint.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';
@@ -135,3 +137,17 @@ export type EntitiesInfoHandler = (
 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;
+
+export interface EntityUserRolesEndpoint {
+  user?: EndpointUser;
+  guid?: string;
+}
+
+export type EntityUserRolesFetch = (
+  endpoints: string[] | EntityUserRolesEndpoint[],
+  store: Store<AppState>,
+  logService: LoggerService,
+  httpClient: HttpClient
+) => Observable<boolean>;
+
+export type EntityUserRolesReducer<T = any> = (state: T, action: Action) => T;
\ No newline at end of file
diff --git a/src/frontend/packages/store/src/entity-service.ts b/src/frontend/packages/store/src/entity-service.ts
index 5d583342dd..38f2f1c911 100644
--- a/src/frontend/packages/store/src/entity-service.ts
+++ b/src/frontend/packages/store/src/entity-service.ts
@@ -94,6 +94,9 @@ export class EntityService<T = any> {
     this.waitForEntity$ = this.entityObs$.pipe(
       filter((ent) => {
         const { entityRequestInfo, entity } = ent;
+        // Note - isEntityAvailable does not block on updating, decision taken to ensure we show entity as soon as possible.
+        // This means, in the cf world, entities will be emitted here that are still in the validation process and as such may be missing
+        // required relations
         return this.isEntityAvailable(entity, entityRequestInfo);
       }),
       publishReplay(1),
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 c7a6dadd26..697b731300 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
@@ -22,8 +22,8 @@ export class EntityMonitorFactory {
     entityConfig: EntityCatalogEntityConfig,
     startWithNull = true
   ): EntityMonitor<T> {
-    const { endpointType, entityType } = entityConfig;
-    const cacheKey = id + endpointType + entityType;
+    const { endpointType, entityType, schemaKey, subType } = entityConfig;
+    const cacheKey = id + endpointType + entityType + schemaKey + subType;
     if (this.monitorCache[cacheKey]) {
       return this.monitorCache[cacheKey];
     } else {
diff --git a/src/frontend/packages/store/src/reducers/api-request-reducer/types.ts b/src/frontend/packages/store/src/reducers/api-request-reducer/types.ts
index 65952a2884..8b514a0c4a 100644
--- a/src/frontend/packages/store/src/reducers/api-request-reducer/types.ts
+++ b/src/frontend/packages/store/src/reducers/api-request-reducer/types.ts
@@ -45,7 +45,7 @@ export const defaultDeletingActionState = {
 };
 
 export interface UpdatingSection {
-  _root_: ActionState;
+  [rootUpdatingKey]: ActionState;
   [key: string]: ActionState;
 }
 export interface RequestInfoState {
@@ -61,7 +61,7 @@ export interface RequestInfoState {
 const defaultRequestState = {
   fetching: false,
   updating: {
-    _root_: getDefaultActionState()
+    [rootUpdatingKey]: getDefaultActionState()
   },
   creating: false,
   error: false,
diff --git a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-request-state.reducers.ts b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-request-state.reducers.ts
deleted file mode 100644
index 1deb05551d..0000000000
--- a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-request-state.reducers.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import {
-  GET_CURRENT_USER_CF_RELATIONS,
-  GET_CURRENT_USER_CF_RELATIONS_FAILED,
-  GET_CURRENT_USER_CF_RELATIONS_SUCCESS,
-  GET_CURRENT_USER_RELATIONS,
-  GET_CURRENT_USER_RELATIONS_FAILED,
-  GET_CURRENT_USER_RELATIONS_SUCCESS,
-  GetUserCfRelations,
-} from '../../../../cloud-foundry/src/actions/permissions.actions';
-import { IAllCfRolesState } from '../../../../cloud-foundry/src/store/types/cf-current-user-roles.types';
-import { getDefaultRolesRequestState, RolesRequestState } from '../../types/current-user-roles.types';
-
-export function currentUserRolesRequestStateReducer(state: RolesRequestState = getDefaultRolesRequestState(), type: string) {
-  switch (type) {
-    case GET_CURRENT_USER_RELATIONS:
-    case GET_CURRENT_USER_CF_RELATIONS:
-      return {
-        ...state,
-        fetching: true
-      };
-    case GET_CURRENT_USER_RELATIONS_SUCCESS:
-    case GET_CURRENT_USER_CF_RELATIONS_SUCCESS:
-      return {
-        ...state,
-        initialised: true,
-        fetching: false
-      };
-    case GET_CURRENT_USER_RELATIONS_FAILED:
-    case GET_CURRENT_USER_CF_RELATIONS_FAILED:
-      return {
-        ...state,
-        fetching: false,
-        error: true
-      };
-  }
-}
-
-export function currentUserCfRolesRequestStateReducer(cf: IAllCfRolesState = {}, action: GetUserCfRelations) {
-  const cfGuid = (action as GetUserCfRelations).cfGuid;
-  return {
-    ...cf,
-    [cfGuid]: {
-      ...cf[cfGuid],
-      state: {
-        ...cf[cfGuid].state,
-        ...currentUserRolesRequestStateReducer(cf[cfGuid].state, action.type)
-      }
-    }
-  };
-}
diff --git a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-role-session.reducer.ts b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-role-session.reducer.ts
deleted file mode 100644
index 8e41424bf8..0000000000
--- a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-role-session.reducer.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import {
-  IAllCfRolesState,
-  ICfRolesState,
-  IGlobalRolesState,
-} from '../../../../cloud-foundry/src/store/types/cf-current-user-roles.types';
-import { ScopeStrings } from '../../../../core/src/core/current-user-permissions.config';
-import { VerifiedSession } from '../../actions/auth.actions';
-import { EndpointActionComplete } from '../../actions/endpoint.actions';
-import { SessionUser } from '../../types/auth.types';
-import { getDefaultEndpointRoles, ICurrentUserRolesState } from '../../types/current-user-roles.types';
-import { EndpointUser, INewlyConnectedEndpointInfo } from '../../types/endpoint.types';
-
-interface PartialEndpoint {
-  user: EndpointUser | SessionUser;
-  guid: string;
-}
-
-export function roleInfoFromSessionReducer(
-  state: ICurrentUserRolesState,
-  action: VerifiedSession
-): ICurrentUserRolesState {
-  const { user, endpoints } = action.sessionData;
-  const cfRoles = propagateEndpointsAdminPermissions(state.cf, Object.values(endpoints.cf));
-  return applyInternalScopes(state, cfRoles, user);
-}
-
-export function updateNewlyConnectedEndpoint(
-  state: ICurrentUserRolesState,
-  action: EndpointActionComplete
-): ICurrentUserRolesState {
-  if (action.endpointType !== 'cf') {
-    return state;
-  }
-  const endpoint = action.endpoint as INewlyConnectedEndpointInfo;
-  const cfRoles = propagateEndpointsAdminPermissions(state.cf, [{
-    user: endpoint.user,
-    guid: action.guid
-  }]);
-  return {
-    ...state,
-    cf: cfRoles
-  };
-}
-
-function applyInternalScopes(state: ICurrentUserRolesState, cfRoles: IAllCfRolesState, user?: SessionUser | EndpointUser) {
-  const internalRoles = { ...state.internal };
-  if (user) {
-    internalRoles.scopes = user.scopes || [];
-    // The admin scope is configurable - so look at the flag provided by the backend
-    internalRoles.isAdmin = user.admin;
-  }
-
-  return {
-    ...state,
-    cf: cfRoles,
-    internal: internalRoles
-  };
-}
-
-function propagateEndpointsAdminPermissions(
-  cfState: IAllCfRolesState,
-  endpoints: PartialEndpoint[]
-): IAllCfRolesState {
-  return Object.values(endpoints).reduce((state, endpoint) => {
-    return {
-      ...state,
-      [endpoint.guid]: propagateEndpointAdminPermissions(state[endpoint.guid], endpoint)
-    };
-  }, { ...cfState });
-}
-
-function propagateEndpointAdminPermissions(state: ICfRolesState = getDefaultEndpointRoles(), endpoint: PartialEndpoint) {
-  const scopes = endpoint.user ? endpoint.user.scopes : [];
-  const global = getEndpointRoles(scopes, state.global);
-  return {
-    ...state,
-    global
-  };
-}
-
-function getEndpointRoles(scopes: string[], globalEndpointState: IGlobalRolesState) {
-  const newEndpointState = {
-    ...globalEndpointState,
-    scopes
-  };
-  return scopes.reduce((roles, scope) => {
-    if (scope === ScopeStrings.CF_ADMIN_GROUP) {
-      roles.isAdmin = true;
-    }
-    if (scope === ScopeStrings.CF_READ_ONLY_ADMIN_GROUP) {
-      roles.isReadOnlyAdmin = true;
-    }
-    if (scope === ScopeStrings.CF_ADMIN_GLOBAL_AUDITOR_GROUP) {
-      roles.isGlobalAuditor = true;
-    }
-    if (scope === ScopeStrings.CF_READ_SCOPE) {
-      roles.canRead = true;
-    }
-    if (scope === ScopeStrings.CF_WRITE_SCOPE) {
-      roles.canWrite = true;
-    }
-    return roles;
-  }, newEndpointState);
-}
-
diff --git a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-roles-clear.reducers.ts b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-roles-clear.reducers.ts
deleted file mode 100644
index feb787a9fd..0000000000
--- a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-roles-clear.reducers.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import { EndpointActionComplete } from '../../actions/endpoint.actions';
-import { getDefaultEndpointRoles, ICurrentUserRolesState } from '../../types/current-user-roles.types';
-import { EndpointModel } from '../../types/endpoint.types';
-import { APISuccessOrFailedAction } from '../../types/request.types';
-
-export function removeEndpointRoles(state: ICurrentUserRolesState, action: EndpointActionComplete) {
-  const cfState = {
-    ...state.cf
-  };
-  if (action.endpointType !== 'cf' || !cfState[action.guid]) {
-    return state;
-  }
-  delete cfState[action.guid];
-  return {
-    ...state,
-    cf: cfState
-  };
-}
-
-export function addEndpoint(state: ICurrentUserRolesState, action: EndpointActionComplete) {
-  const endpoint = action.endpoint as EndpointModel;
-  const guid = endpoint.guid;
-  if (action.endpointType !== 'cf' || state[guid]) {
-    return state;
-  }
-  const cfState = {
-    ...state.cf
-  };
-
-  cfState[guid] = getDefaultEndpointRoles();
-  return {
-    ...state,
-    cf: cfState
-  };
-}
-
-export function removeSpaceRoles(state: ICurrentUserRolesState, action: APISuccessOrFailedAction) {
-  const { endpointGuid, guid } = action.apiAction;
-  const removedOrgOrSpaceState = removeOrgOrSpaceRoles(state, endpointGuid as string, guid, 'spaces');
-  return removeSpaceIdFromOrg(state, endpointGuid as string, guid);
-}
-
-function removeSpaceIdFromOrg(state: ICurrentUserRolesState, endpointGuid: string, spaceGuid: string) {
-  const space = state.cf[endpointGuid].spaces[spaceGuid];
-  if (!space) {
-    return state;
-  }
-  const { orgId } = space;
-  return {
-    ...state,
-    cf: {
-      ...state.cf,
-      [endpointGuid]: {
-        ...state.cf[endpointGuid],
-        organizations: {
-          ...state.cf[endpointGuid].organizations,
-          [orgId]: {
-            ...state.cf[endpointGuid].organizations[orgId],
-            spaceGuids: state.cf[endpointGuid].organizations[orgId].spaceGuids.filter(id => id !== spaceGuid)
-          }
-        }
-      }
-    }
-  };
-}
-
-export function removeOrgRoles(state: ICurrentUserRolesState, action: APISuccessOrFailedAction) {
-  const { endpointGuid, guid } = action.apiAction;
-  if (!state.cf[endpointGuid as string].organizations[guid]) {
-    return state;
-  }
-  // const spaceIds = state.cf[endpointGuid].organizations[guid].spaceIds;
-  const spaceIds = [];
-  const newState = removeOrgOrSpaceRoles(state, endpointGuid, guid, 'organizations');
-  return cleanUpOrgSpaces(newState, spaceIds, endpointGuid);
-}
-
-function removeOrgOrSpaceRoles(
-  state: ICurrentUserRolesState,
-  endpointGuid: string,
-  orgOrSpaceId: string,
-  type: 'organizations' | 'spaces'
-) {
-  if (!state.cf[endpointGuid][type][orgOrSpaceId]) {
-    return state;
-  }
-  // Remove orgOrSpaceId
-  const {
-    [orgOrSpaceId]: omit,
-    ...newTypeState
-  } = state.cf[endpointGuid][type];
-
-  const newState = {
-    ...state,
-    cf: {
-      ...state.cf,
-      [endpointGuid]: {
-        ...state.cf[endpointGuid],
-        [type]: newTypeState
-      }
-    }
-  };
-  return newState;
-}
-
-function cleanUpOrgSpaces(state: ICurrentUserRolesState, spaceIds: string[], endpointGuid: string) {
-  if (!spaceIds || spaceIds.length === 0 || !state.cf[endpointGuid]) {
-    return state;
-  }
-  return spaceIds.reduce((newState, spaceId) => {
-    if (newState.cf[endpointGuid].spaces[spaceId]) {
-      delete newState.cf[endpointGuid].spaces[spaceId];
-    }
-    return newState;
-  }, { ...state });
-}
-
-
-
diff --git a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-roles.reducer.spec.ts b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-roles.reducer.spec.ts
index 57018352db..083fe4629f 100644
--- a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-roles.reducer.spec.ts
+++ b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-roles.reducer.spec.ts
@@ -1,74 +1,7 @@
-import {
-  GetCurrentUserRelationsComplete,
-  UserRelationTypes,
-} from '../../../../cloud-foundry/src/actions/permissions.actions';
-import {
-  createOrgRoleStateState,
-} from '../../../../cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-org.reducer';
-import {
-  ICfRolesState,
-  IOrgRoleState,
-  ISpaceRoleState,
-  RoleEntities,
-} from '../../../../cloud-foundry/src/store/types/cf-current-user-roles.types';
-import { getDefaultEndpointRoles, ICurrentUserRolesState, getDefaultRolesRequestState } from '../../types/current-user-roles.types';
+import { getDefaultRolesRequestState, ICurrentUserRolesState } from '../../types/current-user-roles.types';
 import { currentUserRolesReducer } from './current-user-roles.reducer';
 
-const testOrgGuid = 'org-1';
-const testSpaceGuid = 'space-1';
-const generalGuid = 'guid-123';
-const testCFEndpointGuid = 'cf-1';
-
-function getSpaceAction(type: UserRelationTypes, orgGuid: string = testOrgGuid, spaceGuid: string = testSpaceGuid) {
-  return new GetCurrentUserRelationsComplete(
-    type,
-    testCFEndpointGuid,
-    [{ metadata: { guid: spaceGuid, created_at: '1', updated_at: '1', url: '1' }, entity: { organization_guid: orgGuid } }]
-  );
-}
-
-function getOrgAction(type: UserRelationTypes, orgGuid: string = testOrgGuid) {
-  return new GetCurrentUserRelationsComplete(
-    type,
-    testCFEndpointGuid,
-    [{ metadata: { guid: orgGuid, created_at: '1', updated_at: '1', url: '1' }, entity: {} }]
-  );
-}
-
-function getState(
-  orgOrSpace: RoleEntities,
-  allRoles: { guid: string, roles: ISpaceRoleState | IOrgRoleState }[] = [],
-  roles?: ISpaceRoleState | IOrgRoleState
-): ICfRolesState {
-  const baseState = getDefaultEndpointRoles();
-  if (!allRoles.length) {
-    let guid = testSpaceGuid;
-    if (orgOrSpace === RoleEntities.ORGS) {
-      guid = testOrgGuid;
-    }
-    allRoles.push({ guid, roles });
-  }
-  const orgSpaceRoles = {
-    [orgOrSpace]: {}
-  };
-  if (orgOrSpace === RoleEntities.SPACES) {
-    orgSpaceRoles.organizations = {
-      [testOrgGuid]: createOrgRoleStateState()
-    };
-  }
-  allRoles.forEach(role => {
-    orgSpaceRoles[orgOrSpace][role.guid] = role.roles;
-    if (orgOrSpace === RoleEntities.SPACES) {
-      orgSpaceRoles.organizations[testOrgGuid].spaceGuids.push(role.guid);
-    }
-  });
-  return {
-    ...baseState,
-    ...orgSpaceRoles
-  };
-}
-
-describe('currentUserReducer', () => {
+describe('currentUserRolesReducer', () => {
   it('set defaults', () => {
     const state = currentUserRolesReducer(undefined, { type: 'FAKE_ACTION' });
     const expectedState: ICurrentUserRolesState = {
@@ -76,185 +9,9 @@ describe('currentUserReducer', () => {
         isAdmin: false,
         scopes: []
       },
-      cf: {},
+      endpoints: {},
       state: getDefaultRolesRequestState()
     };
     expect(state).toEqual(expectedState);
   });
-  it('should add org manager role to org', () => {
-    const state = currentUserRolesReducer(undefined, getOrgAction(UserRelationTypes.MANAGED_ORGANIZATION));
-    const cfPermissions = state.cf[testCFEndpointGuid];
-    expect(cfPermissions).toEqual(getState(RoleEntities.ORGS, [], {
-      isManager: true,
-      isAuditor: false,
-      isBillingManager: false,
-      isUser: false,
-      spaceGuids: []
-    }));
-  });
-  it('should add org auditor role to org', () => {
-    const state = currentUserRolesReducer(undefined, getOrgAction(UserRelationTypes.AUDITED_ORGANIZATIONS));
-    const cfPermissions = state.cf[testCFEndpointGuid];
-    expect(cfPermissions).toEqual(getState(RoleEntities.ORGS, [], {
-      isManager: false,
-      isAuditor: true,
-      isBillingManager: false,
-      isUser: false,
-      spaceGuids: []
-    }));
-  });
-  it('should add org billing manager role to org', () => {
-    const state = currentUserRolesReducer(undefined, getOrgAction(UserRelationTypes.BILLING_MANAGED_ORGANIZATION));
-    const cfPermissions = state.cf[testCFEndpointGuid];
-    expect(cfPermissions).toEqual(getState(RoleEntities.ORGS, [], {
-      isManager: false,
-      isAuditor: false,
-      isBillingManager: true,
-      isUser: false,
-      spaceGuids: []
-    }));
-  });
-  it('should add org user role to org', () => {
-    const state = currentUserRolesReducer(undefined, getOrgAction(UserRelationTypes.ORGANIZATIONS));
-    const cfPermissions = state.cf[testCFEndpointGuid];
-    expect(cfPermissions).toEqual(getState(RoleEntities.ORGS, [], {
-      isManager: false,
-      isAuditor: false,
-      isBillingManager: false,
-      isUser: true,
-      spaceGuids: []
-    }));
-  });
-
-  it('should retain other org roles', () => {
-    let state = currentUserRolesReducer(undefined, getOrgAction(UserRelationTypes.ORGANIZATIONS));
-    state = currentUserRolesReducer(state, getOrgAction(UserRelationTypes.AUDITED_ORGANIZATIONS, generalGuid));
-    const cfPermissions = state.cf[testCFEndpointGuid];
-    const toEqual = getState(RoleEntities.ORGS, [{
-      guid: testOrgGuid,
-      roles: {
-        isManager: false,
-        isAuditor: false,
-        isBillingManager: false,
-        isUser: true,
-        spaceGuids: []
-      },
-    },
-    {
-      guid: generalGuid,
-      roles: {
-        isManager: false,
-        isAuditor: true,
-        isBillingManager: false,
-        isUser: false,
-        spaceGuids: []
-      }
-    }]);
-    expect(cfPermissions).toEqual(toEqual);
-  });
-
-  it('should retain other space roles', () => {
-    let state = currentUserRolesReducer(undefined, getSpaceAction(UserRelationTypes.SPACES));
-    state = currentUserRolesReducer(state, getSpaceAction(UserRelationTypes.MANAGED_SPACES, generalGuid, generalGuid));
-    const cfPermissions = state.cf[testCFEndpointGuid];
-    const toEqual = getState(RoleEntities.SPACES, [{
-      guid: testSpaceGuid,
-      roles: {
-        orgId: testOrgGuid,
-        isManager: false,
-        isAuditor: false,
-        isDeveloper: true
-      }
-    },
-    {
-      guid: generalGuid,
-      roles: {
-        orgId: generalGuid,
-        isManager: true,
-        isAuditor: false,
-        isDeveloper: false
-      }
-    }]);
-    const orgState = getState(RoleEntities.ORGS, [{
-      guid: testOrgGuid,
-      roles: {
-        isManager: false,
-        isAuditor: false,
-        isBillingManager: false,
-        isUser: false,
-        spaceGuids: [
-          testSpaceGuid
-        ]
-      }
-    },
-    {
-      guid: generalGuid,
-      roles: {
-        isManager: false,
-        isAuditor: false,
-        isBillingManager: false,
-        isUser: false,
-        spaceGuids: [
-          generalGuid
-        ]
-      }
-    }]);
-    toEqual.organizations = orgState.organizations;
-    expect(cfPermissions).toEqual(toEqual);
-  });
-
-  it('should retain other space and org roles', () => {
-    let state = currentUserRolesReducer(undefined, getSpaceAction(UserRelationTypes.SPACES));
-    state = currentUserRolesReducer(state, getSpaceAction(UserRelationTypes.MANAGED_SPACES, generalGuid, generalGuid));
-    state = currentUserRolesReducer(state, getOrgAction(UserRelationTypes.ORGANIZATIONS));
-    state = currentUserRolesReducer(state, getOrgAction(UserRelationTypes.AUDITED_ORGANIZATIONS, generalGuid));
-    const cfPermissions = state.cf[testCFEndpointGuid];
-
-
-    const spaceState = getState(RoleEntities.SPACES, [{
-      guid: testSpaceGuid,
-      roles: {
-        orgId: testOrgGuid,
-        isManager: false,
-        isAuditor: false,
-        isDeveloper: true
-      }
-    },
-    {
-      guid: generalGuid,
-      roles: {
-        orgId: generalGuid,
-        isManager: true,
-        isAuditor: false,
-        isDeveloper: false
-      }
-    }]);
-
-    const orgState = getState(RoleEntities.ORGS, [{
-      guid: testOrgGuid,
-      roles: {
-        isManager: false,
-        isAuditor: false,
-        isBillingManager: false,
-        isUser: true,
-        spaceGuids: [
-          testSpaceGuid
-        ]
-      }
-    },
-    {
-      guid: generalGuid,
-      roles: {
-        isManager: false,
-        isAuditor: true,
-        isBillingManager: false,
-        isUser: false,
-        spaceGuids: [
-          generalGuid
-        ]
-      }
-    }]);
-    spaceState.organizations = orgState.organizations;
-    expect(cfPermissions).toEqual(spaceState);
-  });
 });
diff --git a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-roles.reducer.ts b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-roles.reducer.ts
index a6b8e15508..ad4ffc58b4 100644
--- a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-roles.reducer.ts
+++ b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-roles.reducer.ts
@@ -1,89 +1,96 @@
 import { Action } from '@ngrx/store';
 
-import { DELETE_ORGANIZATION_SUCCESS } from '../../../../cloud-foundry/src/actions/organization.actions';
+import { SESSION_VERIFIED, VerifiedSession } from '../../actions/auth.actions';
 import {
-  GET_CURRENT_USER_CF_RELATIONS,
-  GET_CURRENT_USER_CF_RELATIONS_FAILED,
-  GET_CURRENT_USER_CF_RELATIONS_SUCCESS,
-  GET_CURRENT_USER_RELATION_SUCCESS,
   GET_CURRENT_USER_RELATIONS,
   GET_CURRENT_USER_RELATIONS_FAILED,
   GET_CURRENT_USER_RELATIONS_SUCCESS,
-  GetCurrentUserRelationsComplete,
-  GetUserCfRelations,
-} from '../../../../cloud-foundry/src/actions/permissions.actions';
-import { DELETE_SPACE_SUCCESS } from '../../../../cloud-foundry/src/actions/space.actions';
-import { ADD_ROLE_SUCCESS, REMOVE_ROLE_SUCCESS } from '../../../../cloud-foundry/src/actions/users.actions';
-import {
-  currentUserBaseCFRolesReducer,
-} from '../../../../cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-base-cf-role.reducer';
-import {
-  updateAfterRoleChange,
-} from '../../../../cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-changed.reducers';
-import { SESSION_VERIFIED, VerifiedSession } from '../../actions/auth.actions';
+} from '../../actions/permissions.actions';
+import { entityCatalog } from '../../entity-catalog/entity-catalog';
+import { SessionUser } from '../../types/auth.types';
 import {
-  CONNECT_ENDPOINTS_SUCCESS,
-  DISCONNECT_ENDPOINTS_SUCCESS,
-  EndpointActionComplete,
-  REGISTER_ENDPOINTS_SUCCESS,
-  UNREGISTER_ENDPOINTS_SUCCESS,
-} from '../../actions/endpoint.actions';
-import { getDefaultRolesRequestState, ICurrentUserRolesState } from '../../types/current-user-roles.types';
-import { APISuccessOrFailedAction } from '../../types/request.types';
-import {
-  currentUserCfRolesRequestStateReducer,
-  currentUserRolesRequestStateReducer,
-} from './current-user-request-state.reducers';
-import { roleInfoFromSessionReducer, updateNewlyConnectedEndpoint } from './current-user-role-session.reducer';
-import { addEndpoint, removeEndpointRoles, removeOrgRoles, removeSpaceRoles } from './current-user-roles-clear.reducers';
+  getDefaultRolesRequestState,
+  ICurrentUserRolesState,
+  RolesRequestState,
+} from '../../types/current-user-roles.types';
 
 const getDefaultState = () => ({
   internal: {
     isAdmin: false,
     scopes: []
   },
-  cf: {},
+  endpoints: {},
   state: getDefaultRolesRequestState()
 });
 
 export function currentUserRolesReducer(state: ICurrentUserRolesState = getDefaultState(), action: Action): ICurrentUserRolesState {
+  const stateAfterCoreChanges = coreCurrentUserRolesReducer(state, action);
+  return entityCatalog.getAllCurrentUserReducers(stateAfterCoreChanges, action);
+}
+
+function coreCurrentUserRolesReducer(state: ICurrentUserRolesState, action: Action): ICurrentUserRolesState {
   switch (action.type) {
-    case GET_CURRENT_USER_RELATION_SUCCESS:
+    case GET_CURRENT_USER_RELATIONS:
       return {
         ...state,
-        cf: currentUserBaseCFRolesReducer(state.cf, action as GetCurrentUserRelationsComplete)
+        state: currentUserRolesRequestStateReducer(state.state, RolesRequestStateStage.START)
       };
-    case SESSION_VERIFIED:
-      return roleInfoFromSessionReducer(state, action as VerifiedSession);
-    case REGISTER_ENDPOINTS_SUCCESS:
-      return addEndpoint(state, action as EndpointActionComplete);
-    case CONNECT_ENDPOINTS_SUCCESS:
-      return updateNewlyConnectedEndpoint(state, action as EndpointActionComplete);
-    case DISCONNECT_ENDPOINTS_SUCCESS:
-    case UNREGISTER_ENDPOINTS_SUCCESS:
-      return removeEndpointRoles(state, action as EndpointActionComplete);
-    case DELETE_ORGANIZATION_SUCCESS:
-      return removeOrgRoles(state, action as APISuccessOrFailedAction);
-    case DELETE_SPACE_SUCCESS:
-      return removeSpaceRoles(state, action as APISuccessOrFailedAction);
-    case ADD_ROLE_SUCCESS:
-      return updateAfterRoleChange(state, true, action as APISuccessOrFailedAction);
-    case REMOVE_ROLE_SUCCESS:
-      return updateAfterRoleChange(state, false, action as APISuccessOrFailedAction);
-    case GET_CURRENT_USER_RELATIONS:
     case GET_CURRENT_USER_RELATIONS_SUCCESS:
-    case GET_CURRENT_USER_RELATIONS_FAILED:
       return {
         ...state,
-        state: currentUserRolesRequestStateReducer(state.state, action.type)
+        state: currentUserRolesRequestStateReducer(state.state, RolesRequestStateStage.SUCCESS)
       };
-    case GET_CURRENT_USER_CF_RELATIONS:
-    case GET_CURRENT_USER_CF_RELATIONS_SUCCESS:
-    case GET_CURRENT_USER_CF_RELATIONS_FAILED:
+    case GET_CURRENT_USER_RELATIONS_FAILED:
       return {
         ...state,
-        cf: currentUserCfRolesRequestStateReducer(state.cf, action as GetUserCfRelations)
+        state: currentUserRolesRequestStateReducer(state.state, RolesRequestStateStage.FAILURE)
       };
+    case SESSION_VERIFIED:
+      const svAction = action as VerifiedSession
+      return applyInternalScopes(state, svAction.sessionData.user);
   }
   return state;
 }
+
+export enum RolesRequestStateStage {
+  START,
+  SUCCESS,
+  FAILURE,
+  OTHER
+}
+
+export function currentUserRolesRequestStateReducer(state: RolesRequestState = getDefaultRolesRequestState(), stage: RolesRequestStateStage) {
+  switch (stage) {
+    case RolesRequestStateStage.START:
+      return {
+        ...state,
+        fetching: true
+      };
+    case RolesRequestStateStage.SUCCESS:
+      return {
+        ...state,
+        initialised: true,
+        fetching: false
+      };
+    case RolesRequestStateStage.FAILURE:
+      return {
+        ...state,
+        fetching: false,
+        error: true
+      };
+  }
+}
+
+function applyInternalScopes(state: ICurrentUserRolesState, user: SessionUser): ICurrentUserRolesState {
+  const internalRoles = { ...state.internal };
+  if (user) {
+    internalRoles.scopes = user.scopes || [];
+    // The admin scope is configurable - so look at the flag provided by the backend
+    internalRoles.isAdmin = user.admin;
+  }
+
+  return {
+    ...state,
+    internal: internalRoles
+  };
+}
\ No newline at end of file
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 5f52c49b13..166767e168 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
@@ -1,35 +1,28 @@
 import { compose } from '@ngrx/store';
 
-import { ICfRolesState, RoleEntities } from '../../../cloud-foundry/src/store/types/cf-current-user-roles.types';
-import { PermissionStrings, PermissionValues, ScopeStrings } from '../../../core/src/core/current-user-permissions.config';
+import { PermissionValues } from '../../../core/src/core/permissions/current-user-permissions.config';
+import { StratosScopeStrings } from '../../../core/src/core/permissions/stratos-user-permissions.checker';
 import { CurrentUserRolesAppState } from '../app-state';
 import { ICurrentUserRolesState, IStratosRolesState } from '../types/current-user-roles.types';
+import { UserScopeStrings } from '../types/endpoint.types';
 
 
 export const selectCurrentUserRolesState = (state: CurrentUserRolesAppState) => state.currentUserRoles;
 
-export const selectCurrentUserStratosRolesState = (state: ICurrentUserRolesState) => state.internal;
+const selectCurrentUserStratosRolesState = (state: ICurrentUserRolesState) => state.internal;
 
-export const selectCurrentUserStratosRoles = (role: PermissionValues) => (state: Omit<IStratosRolesState, 'scopes'>) => {
+const selectCurrentUserStratosRoles = (role: PermissionValues) => (state: Omit<IStratosRolesState, 'scopes'>) => {
   // Note - should not cover `scopes`
   return state[role] || false;
 };
 
-export const selectEntityWithRole = (role: PermissionStrings, type: RoleEntities) => (state: ICfRolesState) => {
-  const entityType = state[type];
-  return Object.keys(entityType).filter(entity => entityType[entity][role]);
-};
-
-export const selectCurrentUserRequestState = (state: ICurrentUserRolesState | ICfRolesState) => state.state;
-
-// TODO: CF code in this file - needs to be moved out - #3769
-export const selectCurrentUserCFGlobalHasScopes = (scope: ScopeStrings) => (scopes: ScopeStrings[]) => scopes.includes(scope);
-export const selectCurrentUserCFStratosScopesState = (state: IStratosRolesState) => state.scopes;
+export const selectCurrentUserGlobalHasScopes = (scope: UserScopeStrings) => (scopes: UserScopeStrings[]) => scopes.includes(scope);
+const selectCurrentUserStratosScopesState = (state: IStratosRolesState) => state.scopes;
 
 
 // Top level stratos endpoint role objects
 // ============================
-export const getCurrentUserStratosRolesState = compose(
+const getCurrentUserStratosRolesState = compose(
   selectCurrentUserStratosRolesState,
   selectCurrentUserRolesState
 );
@@ -45,19 +38,10 @@ export const getCurrentUserStratosRole = (role: PermissionValues) => compose(
 
 // Top level stratos endpoint scopes
 // ============================
-export const getCurrentUserStratosHasScope = (scope: ScopeStrings) => compose(
-  selectCurrentUserCFGlobalHasScopes(scope),
-  selectCurrentUserCFStratosScopesState,
+export const getCurrentUserStratosHasScope = (scope: StratosScopeStrings) => compose(
+  selectCurrentUserGlobalHasScopes(scope),
+  selectCurrentUserStratosScopesState,
   getCurrentUserStratosRolesState
 );
 // ============================
 
-
-// Top level request state
-// ============================
-export const getCurrentUserRequestState = compose(
-  selectCurrentUserRequestState,
-  selectCurrentUserRolesState
-);
-// ============================
-
diff --git a/src/frontend/packages/store/src/selectors/endpoint.selectors.ts b/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
index cfcd00d4c9..2846302148 100644
--- a/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
+++ b/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
@@ -1,4 +1,4 @@
-import { compose, createSelector } from '@ngrx/store';
+import { compose } from '@ngrx/store';
 
 import { STRATOS_ENDPOINT_TYPE } from '../../../core/src/base-entity-schemas';
 import { InternalAppState, IRequestEntityTypeState } from '../app-state';
@@ -15,7 +15,7 @@ export const endpointStatusSelector = (state: InternalAppState): EndpointState =
 const endpointEntityKey = EntityCatalogHelpers.buildEntityKey(endpointSchemaKey, STRATOS_ENDPOINT_TYPE);
 export const endpointEntitiesSelector = selectEntities<EndpointModel>(endpointEntityKey);
 
-const endpointOfType = (type: string) =>
+export const endpointOfType = (type: string) =>
   (endpoints: IRequestEntityTypeState<EndpointModel>): IRequestEntityTypeState<EndpointModel> => {
     return Object.values(endpoints || {}).reduce((endpointsOfType, endpoint) => {
       if (endpoint.cnsi_type === type) {
@@ -30,8 +30,6 @@ export const endpointOfTypeSelector = (endpointType: string) => compose(
   endpointEntitiesSelector,
 );
 
-// TODO: Move this #3769
-const cfEndpointEntitiesSelector = endpointOfType('cf');
 
 const getConnectedEndpoints = (endpoints: IRequestEntityTypeState<EndpointModel>) =>
   Object.values(endpoints || {}).reduce((connected, endpoint) => {
@@ -55,15 +53,6 @@ export const connectedEndpointsOfTypesSelector = (endpointType: string) => compo
 );
 
 
-// TODO: Move this #3769
-export const endpointsCFEntitiesSelector = createSelector(
-  endpointEntitiesSelector,
-  cfEndpointEntitiesSelector
-);
-
-// TODO: Move this #3769
-export const endpointsCfEntitiesConnectedSelector = connectedEndpointsOfTypesSelector('cf');
-
 // Single endpoint request information
 export const endpointsEntityRequestSelector = (guid: string) => selectRequestInfo(endpointEntityKey, guid);
 // Single endpoint request data
diff --git a/src/frontend/packages/store/src/selectors/users-roles.selector.ts b/src/frontend/packages/store/src/selectors/users-roles.selector.ts
deleted file mode 100644
index 7c868a7768..0000000000
--- a/src/frontend/packages/store/src/selectors/users-roles.selector.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { compose } from '@ngrx/store';
-
-import { CFAppState } from '../../../cloud-foundry/src/cf-app-state';
-import { IUserPermissionInOrg } from '../../../cloud-foundry/src/store/types/user.types';
-import { UsersRolesState } from '../../../cloud-foundry/src/store/types/users-roles.types';
-
-export const selectUsersRoles = (state: CFAppState): UsersRolesState => state.manageUsersRoles;
-
-const selectUsers = (usersRoles: UsersRolesState) => usersRoles.users;
-export const selectUsersRolesPicked = compose(
-  selectUsers,
-  selectUsersRoles
-);
-
-const selectNewRoles = (usersRoles: UsersRolesState) => usersRoles.newRoles;
-export const selectUsersRolesRoles = compose(
-  selectNewRoles,
-  selectUsersRoles
-);
-
-const selectCfGuid = (usersRoles: UsersRolesState) => usersRoles.cfGuid;
-export const selectUsersRolesCf = compose(
-  selectCfGuid,
-  selectUsersRoles
-);
-
-const selectChanged = (usersRoles: UsersRolesState) => usersRoles.changedRoles;
-export const selectUsersRolesChangedRoles = compose(
-  selectChanged,
-  selectUsersRoles
-);
-
-const selectNewRoleOrgGuid = (newRoles: IUserPermissionInOrg) => newRoles.orgGuid;
-export const selectUsersRolesOrgGuid = compose(
-  selectNewRoleOrgGuid,
-  selectNewRoles,
-  selectUsersRoles
-);
-
-const isRemove = (usersRoles: UsersRolesState) => usersRoles.isRemove;
-export const selectUsersIsRemove = compose(
-  isRemove,
-  selectUsersRoles
-);
-
-const isSetByUsername = (usersRoles: UsersRolesState) => usersRoles.isSetByUsername;
-export const selectUsersIsSetByUsername = compose(
-  isSetByUsername,
-  selectUsersRoles
-);
diff --git a/src/frontend/packages/store/src/store.module.ts b/src/frontend/packages/store/src/store.module.ts
index a29f7e5e41..d66eb95791 100644
--- a/src/frontend/packages/store/src/store.module.ts
+++ b/src/frontend/packages/store/src/store.module.ts
@@ -10,6 +10,7 @@ import { EndpointApiError } from './effects/endpoint-api-errors.effects';
 import { EndpointsEffect } from './effects/endpoint.effects';
 import { MetricsEffect } from './effects/metrics.effects';
 import { PaginationEffects } from './effects/pagination.effects';
+import { PermissionsEffects } from './effects/permissions.effect';
 import { RecursiveDeleteEffect } from './effects/recursive-entity-delete.effect';
 import { RouterEffect } from './effects/router.effects';
 import { SetClientFilterEffect } from './effects/set-client-filter.effect';
@@ -18,7 +19,6 @@ import { SystemEffects } from './effects/system.effects';
 import { UAASetupEffect } from './effects/uaa-setup.effects';
 import { UserFavoritesEffect } from './effects/user-favorites-effect';
 import { UserProfileEffect } from './effects/user-profile.effects';
-import { UsersRolesEffects } from './effects/users-roles.effects';
 import { PipelineHttpClient } from './entity-request-pipeline/pipline-http-client.service';
 import { AppReducersModule } from './reducers.module';
 
@@ -45,9 +45,9 @@ import { AppReducersModule } from './reducers.module';
       SetClientFilterEffect,
       MetricsEffect,
       UserProfileEffect,
-      UsersRolesEffects,
       RecursiveDeleteEffect,
-      UserFavoritesEffect
+      UserFavoritesEffect,
+      PermissionsEffects
     ])
   ]
 })
diff --git a/src/frontend/packages/store/src/types/auth.types.ts b/src/frontend/packages/store/src/types/auth.types.ts
index de78d33feb..5cf7e40f42 100644
--- a/src/frontend/packages/store/src/types/auth.types.ts
+++ b/src/frontend/packages/store/src/types/auth.types.ts
@@ -1,22 +1,17 @@
-import { ScopeStrings } from '../../../core/src/core/current-user-permissions.config';
+import { StratosScopeStrings } from '../../../core/src/core/permissions/stratos-user-permissions.checker';
 
 export interface SessionDataEndpoint {
   guid: string;
   name: string;
   version: string;
-  user: {
-    admin: boolean,
-    guid: string,
-    name: string,
-    scopes: ScopeStrings[];
-  };
+  user: SessionUser;
   type: string;
 }
 export interface SessionUser {
   admin: boolean;
   guid: string;
   name: string;
-  scopes: ScopeStrings[];
+  scopes: StratosScopeStrings[];
 }
 export interface PluginConfig {
   userInvitationsEnabled: 'true' | 'false';
diff --git a/src/frontend/packages/store/src/types/current-user-roles.types.ts b/src/frontend/packages/store/src/types/current-user-roles.types.ts
index c79f4c25e1..90c41efcb4 100644
--- a/src/frontend/packages/store/src/types/current-user-roles.types.ts
+++ b/src/frontend/packages/store/src/types/current-user-roles.types.ts
@@ -1,5 +1,4 @@
-import { IAllCfRolesState, ICfRolesState } from '../../../cloud-foundry/src/store/types/cf-current-user-roles.types';
-import { ScopeStrings } from '../../../core/src/core/current-user-permissions.config';
+import { UserScopeStrings } from './endpoint.types';
 
 export interface RolesRequestState {
   initialised: boolean;
@@ -15,33 +14,15 @@ export function getDefaultRolesRequestState(): RolesRequestState {
   };
 }
 
-export function getDefaultEndpointRoles(): ICfRolesState {
-  return {
-    global: {
-      isAdmin: false,
-      isReadOnlyAdmin: false,
-      isGlobalAuditor: false,
-      canRead: false,
-      canWrite: false,
-      scopes: []
-    },
-    spaces: {
-
-    },
-    organizations: {
-
-    },
-    state: getDefaultRolesRequestState()
-  };
-}
-
 export interface IStratosRolesState {
   isAdmin: boolean;
-  scopes: ScopeStrings[];
+  scopes: UserScopeStrings[];
 }
 
 export interface ICurrentUserRolesState {
   internal: IStratosRolesState;
-  cf: IAllCfRolesState;
+  endpoints: {
+    [endpointType: string]: any
+  }
   state: RolesRequestState;
 }
diff --git a/src/frontend/packages/store/src/types/endpoint.types.ts b/src/frontend/packages/store/src/types/endpoint.types.ts
index aedd7673fd..317c1aab7e 100644
--- a/src/frontend/packages/store/src/types/endpoint.types.ts
+++ b/src/frontend/packages/store/src/types/endpoint.types.ts
@@ -1,5 +1,5 @@
-import { ScopeStrings } from '../../../core/src/core/current-user-permissions.config';
 import { EndpointType } from '../../../core/src/core/extension/extension-types';
+import { StratosScopeStrings } from '../../../core/src/core/permissions/stratos-user-permissions.checker';
 import { MetricsAPITargets, MetricsStratosInfo } from '../actions/metrics-api.actions';
 import { endpointSchemaKey } from '../helpers/entity-factory';
 import { RequestSectionKeys, TRequestTypeKeys } from '../reducers/api-request-reducer/types';
@@ -63,12 +63,14 @@ export interface EndpointModel {
 
 export const SystemSharedUserGuid = '00000000-1111-2222-3333-444444444444';
 
+export type UserScopeStrings = string | StratosScopeStrings;
+
 // Metadata for the user connected to an endpoint
 export interface EndpointUser {
   guid: string;
   name: string;
   admin: boolean;
-  scopes?: ScopeStrings[];
+  scopes?: UserScopeStrings[];
 }
 
 export interface EndpointState {
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 9ad3e9ab30..3dac3230b7 100644
--- a/src/frontend/packages/store/testing/src/store-test-helper.ts
+++ b/src/frontend/packages/store/testing/src/store-test-helper.ts
@@ -7,11 +7,11 @@ import { AppState } from '../../src/app-state';
 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';
+import { getDefaultRequestState, rootUpdatingKey } from '../../src/reducers/api-request-reducer/types';
 import { getDefaultPaginationEntityState } from '../../src/reducers/pagination-reducer/pagination-reducer-reset-pagination';
 import { NormalizedResponse } from '../../src/types/api.types';
 import { SessionData, SessionDataEndpoint } from '../../src/types/auth.types';
-import { getDefaultEndpointRoles, getDefaultRolesRequestState } from '../../src/types/current-user-roles.types';
+import { getDefaultRolesRequestState } from '../../src/types/current-user-roles.types';
 import { EndpointModel } from '../../src/types/endpoint.types';
 import { BaseEntityValues } from '../../src/types/entity.types';
 import { WrapperRequestActionSuccess } from '../../src/types/request.types';
@@ -202,9 +202,7 @@ function getDefaultInitialTestStratosStoreState() {
         isAdmin: false,
         scopes: []
       },
-      cf: {
-        [testSCFEndpointGuid]: getDefaultEndpointRoles()
-      },
+      endpoints: {},
       state: getDefaultRolesRequestState()
     }
   };
@@ -250,7 +248,7 @@ function getDefaultInitialTestStoreState(): AppState<BaseEntityValues> {
         '57ab08d8-86cc-473a-8818-25d5e8d0ea23': {
           fetching: false,
           updating: {
-            _root_: {
+            [rootUpdatingKey]: {
               busy: false,
               error: false,
               message: ''
diff --git a/src/jetstream/go.mod b/src/jetstream/go.mod
index 53e96fbe80..59494917e6 100644
--- a/src/jetstream/go.mod
+++ b/src/jetstream/go.mod
@@ -40,7 +40,7 @@ require (
 	github.com/gorilla/context v1.1.1
 	github.com/gorilla/securecookie v1.1.1
 	github.com/gorilla/sessions v1.1.3
-	github.com/gorilla/websocket v1.4.1
+	github.com/gorilla/websocket v1.4.2
 	github.com/govau/cf-common v0.0.7
 	github.com/jessevdk/go-flags v1.4.0 // indirect
 	github.com/jtolds/gls v4.20.0+incompatible // indirect
diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index 9bf918f27d..a49e701b9a 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -341,12 +341,12 @@ github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyC
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/sessions v1.1.3 h1:uXoZdcdA5XdXF3QzuSlheVRUvjl+1rKY7zBXL68L9RU=
 github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
-github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
-github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY=
 github.com/gosuri/uitable v0.0.1/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
+github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
+github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/govau/cf-common v0.0.7 h1:uhp1P6XM6GGzu1+A4C7LELLX/9mCmH6W5DpJZC0kWmo=
 github.com/govau/cf-common v0.0.7/go.mod h1:5xL/OfE7wxeyHlXb7iei0rAbdQ/5v6dF18BZknPv7NQ=
 github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
@@ -782,7 +782,6 @@ gopkg.in/square/go-jose.v2 v2.2.2 h1:orlkJ3myw8CN1nVQHBFfloD+L3egixIa4FvUP6RosSA
 gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -793,6 +792,8 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81
 helm.sh/helm/v3 v3.0.0 h1:or/9cs1GgfcTQeEnR2CVJNw893/rmqIG1KsNHmUiSFw=
 helm.sh/helm/v3 v3.0.0/go.mod h1:sI7B9yfvMgxtTPMWdk1jSKJ2aa59UyP9qhPydqW6mgo=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/src/test-e2e/cloud-foundry/manage-users-by-username-stepper-e2e.spec.ts b/src/test-e2e/cloud-foundry/manage-users-by-username-stepper-e2e.spec.ts
index 3cbd402994..f72a3d3422 100644
--- a/src/test-e2e/cloud-foundry/manage-users-by-username-stepper-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/manage-users-by-username-stepper-e2e.spec.ts
@@ -1,6 +1,6 @@
 import { browser, by, element, promise } from 'protractor';
 
-import { CfUser } from '../../frontend/packages/cloud-foundry/src/store/types/user.types';
+import { CfUser } from '../../frontend/packages/cloud-foundry/src/store/types/cf-user.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/cloud-foundry/users-removal-e2e.helper.ts b/src/test-e2e/cloud-foundry/users-removal-e2e.helper.ts
index 931679b0a4..a449dddd5f 100644
--- a/src/test-e2e/cloud-foundry/users-removal-e2e.helper.ts
+++ b/src/test-e2e/cloud-foundry/users-removal-e2e.helper.ts
@@ -1,7 +1,7 @@
 import { browser, by, element, promise } from 'protractor';
 import { protractor } from 'protractor/built/ptor';
 
-import { CfUser } from '../../frontend/packages/cloud-foundry/src/store/types/user.types';
+import { CfUser } from '../../frontend/packages/cloud-foundry/src/store/types/cf-user.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/helpers/cf-helpers.ts b/src/test-e2e/helpers/cf-helpers.ts
index e0df19f6f9..a18d65e8d0 100644
--- a/src/test-e2e/helpers/cf-helpers.ts
+++ b/src/test-e2e/helpers/cf-helpers.ts
@@ -10,7 +10,7 @@ import {
   ISpaceQuotaDefinition,
 } 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 { CfUser } from '../../frontend/packages/cloud-foundry/src/store/types/cf-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/tsconfig.json b/src/tsconfig.json
index a3a2d47e41..acd4416c47 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -30,8 +30,8 @@
     ],
     "preserveSymlinks": true,
     "paths": {
-      "@stratos/store": ["frontend/packages/store/src/public-api.ts"],
-      "@stratos/store/testing": ["frontend/packages/store/testing/public-api.ts"]
+      "@stratosui/store": ["frontend/packages/store/src/public-api.ts"],
+      "@stratosui/store/testing": ["frontend/packages/store/testing/public-api.ts"]
     }    
   }
 }
\ No newline at end of file

From e798fc6793c55384df7e7673f3476abe8b6c1c71 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 23 Jun 2020 11:22:09 +0100
Subject: [PATCH 542/648] Indicate which commands are available

---
 deploy/containers/kube-terminal/kubeconsole.bashrc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/deploy/containers/kube-terminal/kubeconsole.bashrc b/deploy/containers/kube-terminal/kubeconsole.bashrc
index e71545ed5a..0a1edfdd56 100644
--- a/deploy/containers/kube-terminal/kubeconsole.bashrc
+++ b/deploy/containers/kube-terminal/kubeconsole.bashrc
@@ -72,5 +72,6 @@ touch "/stratos/.firstrun"
 # Remove any env vars matching KUBERNETES
 unset `compgen -A variable | grep KUBERNETES`
 
-echo "Ready"
+echo 
+echo -e "Ready - ${CYAN}kubectl${RESET} and ${CYAN}helm${RESET} commands are available"
 echo ""

From f34497f1ee6e3cea9967fd456793d0d65f829753 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 23 Jun 2020 11:25:30 +0100
Subject: [PATCH 543/648] Fix merge issue

---
 deploy/kubernetes/imagelist-gen.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/deploy/kubernetes/imagelist-gen.sh b/deploy/kubernetes/imagelist-gen.sh
index 4114e81aae..1605cdb54d 100755
--- a/deploy/kubernetes/imagelist-gen.sh
+++ b/deploy/kubernetes/imagelist-gen.sh
@@ -52,16 +52,16 @@ printf "${CYAN}Chart folder contents:${RESET}\n"
 ls -alR
 echo ""
 
-# Add any customizations
-addCustomizations
-
 helm template -f ${__DIRNAME}/imagelist.values.yaml ${CHART_FOLDER} | grep "image:" | grep --extended --only-matching '([^"/[:space:]]+/)?[^"/[:space:]]+/[^:[:space:]]+:[a-zA-Z0-9\._-]+' | sort | uniq | awk -F'/' '{print $2}' > imagelist.txt
-
 if [ $? -ne 0 ]; then
   echo -e "${BOLD}${RED}ERROR: Failed to render Helm Chart in order to generate image list"
   exit 1
 fi
 
+# Add any customizations to the image list
+# Mainly used if there are unreferenced images that need to be included
+addCustomizations
+
 popd > /dev/null
 
 printf "${CYAN}"

From 53a4b2a2171eec7d620c3d5706e6d5497b73c591 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Tue, 23 Jun 2020 11:27:04 +0100
Subject: [PATCH 544/648] Remove commented-out code

---
 .../src/shared/components/ssh-viewer/ssh-viewer.component.ts    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.ts b/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.ts
index c12df6d6a1..8d9cedccb8 100644
--- a/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.ts
+++ b/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.ts
@@ -68,7 +68,6 @@ export class SshViewerComponent implements OnInit, OnDestroy {
     this.xterm = new Terminal();
     this.xterm.loadAddon(this.xtermFitAddon);
     this.xterm.open(this.container.nativeElement);
-    //    this.xtermFitAddon.fit();
     this.resize();
 
     this.xterm.onKey(e => {
@@ -125,7 +124,6 @@ export class SshViewerComponent implements OnInit, OnDestroy {
           } else {
             console.log('Error')
             const eMsg = this.errorMessage;
-            //this.disconnect();
             this.errorMessage = eMsg;
           }
         },

From d64f5bfff2190377089bea7efba1d614ad29357c Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Tue, 23 Jun 2020 14:50:04 +0100
Subject: [PATCH 545/648] Helm chart updates for --recreate-pods (#382)

* Fix misaligned user button
- fixes #4316

* Temporarily add branch v3.2.1 to travis

* check sso whitelist in more places

Signed-off-by: Ben Berry <ben.berry@gsa.gov>

* refactor sso state checks into single function

Signed-off-by: Ben Berry <ben.berry@gsa.gov>

* Update version

* First pass at changelog (additional SSO fix required)

* Update changelog

* Fix package-lock.json

* Remove v3.2.1 was .travis.taml

* Remove need for --recreate-pods when upgrading

* Add support for helm chart customizations

* Removed change not needed

* Apply recreate-pods fix to SUSE additional containers

Co-authored-by: Richard Cox <richard.cox@suse.com>
Co-authored-by: Ben Berry <ben.berry@gsa.gov>
Co-authored-by: Richard Cox <richard-cox@users.noreply.github.com>
---
 custom-src/deploy/kubernetes/customize-helm.sh              | 6 +++++-
 deploy/kubernetes/console/templates/chartsync.yaml          | 3 +++
 .../console/templates/fdbdoclayer/deployment.yaml           | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/custom-src/deploy/kubernetes/customize-helm.sh b/custom-src/deploy/kubernetes/customize-helm.sh
index 6284fe6c35..e57c571440 100755
--- a/custom-src/deploy/kubernetes/customize-helm.sh
+++ b/custom-src/deploy/kubernetes/customize-helm.sh
@@ -15,6 +15,11 @@ echo "Customizations folder: ${DIR}"
 echo "Chart folder         : ${CHART_PATH}"
 echo ""
 
+# ===========================================================================================
+# Copy our customization helper over the default, empty one
+# ===========================================================================================
+cp "${DIR}/__stratos.tpl" "${CHART_PATH}/templates/__stratos.tpl"
+
 # ===========================================================================================
 # Chart.yaml changes
 # ===========================================================================================
@@ -45,7 +50,6 @@ echo -e "${CYAN}Patching README.md${RESET}"
 sed -i.bak -e 's@Stratos@SUSE Stratos Console@g' ${CHART_PATH}/README.md
 
 # Change first paragraph to include Kubernetes
-console for Cloud Foundry.
 SRC="console for Cloud Foundry."
 DEST="console for Cloud Foundry and Kubernetes."
 sed -i.bak -e 's@'"${SRC}"'@'"${DEST}"'@g' ${CHART_PATH}/README.md
diff --git a/deploy/kubernetes/console/templates/chartsync.yaml b/deploy/kubernetes/console/templates/chartsync.yaml
index 2acedc0bca..1eeab2affd 100644
--- a/deploy/kubernetes/console/templates/chartsync.yaml
+++ b/deploy/kubernetes/console/templates/chartsync.yaml
@@ -34,6 +34,9 @@ spec:
         imagePullPolicy: {{.Values.imagePullPolicy}}
         command: ["/chartrepo"]
         args: ["serve", "--doclayer-url=mongodb://{{ .Release.Name }}-fdbdoclayer:27016", "--cafile=/etc/certs/ca.crt", "--certfile=/etc/certs/tls.crt", "--keyfile=/etc/certs/tls.key"]
+        env:
+        - name: STRATOS_IMAGE_REF
+          value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
         ports:
         - name: endpoint
           containerPort: 8080
diff --git a/deploy/kubernetes/console/templates/fdbdoclayer/deployment.yaml b/deploy/kubernetes/console/templates/fdbdoclayer/deployment.yaml
index 63cdb0e7e8..4a1a02e06d 100644
--- a/deploy/kubernetes/console/templates/fdbdoclayer/deployment.yaml
+++ b/deploy/kubernetes/console/templates/fdbdoclayer/deployment.yaml
@@ -52,6 +52,8 @@ spec:
         image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.fdbdoclayer}}:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         env:
+        - name: STRATOS_IMAGE_REF
+          value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
         - name: FDB_COORDINATOR
           value: {{ .Release.Name }}-fdbdoclayer
         - name: FDB_LISTEN_IP
@@ -88,6 +90,8 @@ spec:
         image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.fdbserver}}:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
         env:
+        - name: STRATOS_IMAGE_REF
+          value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
         - name: FDB_COORDINATOR
           value: {{ .Release.Name }}-fdbdoclayer
         - name: FDB_LISTEN_IP

From 817b72948d9541e58f0370b5e95df6f1b4e4e966 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 23 Jun 2020 15:27:11 +0100
Subject: [PATCH 546/648] Fix unit test compilation

---
 .../kube-terminal/kube-console.component.spec.ts         | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.spec.ts
index 85fda06bf6..8671538bc9 100644
--- a/custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.spec.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.spec.ts
@@ -1,9 +1,10 @@
-import { async, ComponentFixture, TestBed } from './@angular/core/testing';
-import { RouterTestingModule } from './@angular/router/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
+import { ApplicationService } from '../../../../../cloud-foundry/src/features/applications/application.service';
+import { ApplicationServiceMock } from '../../../../../cloud-foundry/test-framework/application-service-helper';
 import { TabNavService } from '../../../../tab-nav.service';
-import { ApplicationServiceMock } from '../../../../test-framework/application-service-helper';
-import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
 import { CoreModule } from '../../../core/core.module';
 import { SharedModule } from '../../../shared/shared.module';
 import { KubeConsoleComponent } from './kube-console.component';

From 3ec93620868aa0eb1b4efba269c56533c2c458a5 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 24 Jun 2020 11:44:44 +0100
Subject: [PATCH 547/648] Bug fix for when terminal is not enabled

---
 src/jetstream/plugins/kubernetes/main.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index 929c610494..2cee120fcc 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -146,7 +146,9 @@ func (c *KubernetesSpecification) Init() error {
 	c.portalProxy.GetConfig().PluginConfig[kubeTerminalPluginConfigSetting] = strconv.FormatBool(c.portalProxy.GetConfig().EnableTechPreview)
 
 	// Kick off the cleanup of any old kube terminal pods
-	c.kubeTerminal.StartCleanup()
+	if c.kubeTerminal != nil {
+		c.kubeTerminal.StartCleanup()
+	}
 
 	return nil
 }
@@ -177,7 +179,9 @@ func (c *KubernetesSpecification) AddSessionGroupRoutes(echoGroup *echo.Group) {
 	echoGroup.GET("/helm/releases/:endpoint/:namespace/:name", c.GetRelease)
 
 	// Kube Terminal
-	echoGroup.GET("/kubeterminal/:guid", c.kubeTerminal.Start)
+	if c.kubeTerminal != nil {
+		echoGroup.GET("/kubeterminal/:guid", c.kubeTerminal.Start)
+	}
 }
 
 func (c *KubernetesSpecification) Info(apiEndpoint string, skipSSLValidation bool) (interfaces.CNSIRecord, interface{}, error) {

From 16326d56fb94a46a8341e26825c94cd32a19d860 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 24 Jun 2020 11:48:18 +0100
Subject: [PATCH 548/648] Only enable if tech preview is on

---
 .../plugins/kubernetes/terminal/terminal.go   | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/terminal/terminal.go b/src/jetstream/plugins/kubernetes/terminal/terminal.go
index a77f792908..83d259147b 100644
--- a/src/jetstream/plugins/kubernetes/terminal/terminal.go
+++ b/src/jetstream/plugins/kubernetes/terminal/terminal.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes/api"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces/config"
 
 	log "github.com/sirupsen/logrus"
@@ -13,13 +13,13 @@ import (
 
 const (
 	serviceAccountTokenFile = "/var/run/secrets/kubernetes.io/serviceaccount/token"
-	serviceHostEnvVar = "KUBERNETES_SERVICE_HOST"
-	servicePortEnvVar = "KUBERNETES_SERVICE_PORT"
+	serviceHostEnvVar       = "KUBERNETES_SERVICE_HOST"
+	servicePortEnvVar       = "KUBERNETES_SERVICE_PORT"
 	// For dev - read token from env var
 	serviceTokenEnvVar = "KUBE_TERMINAL_SERVICE_ACCOUNT_TOKEN"
 
-	stratosRoleLabel = "stratos-role"
-	stratosKubeTerminalRole = "kube-terminal"
+	stratosRoleLabel         = "stratos-role"
+	stratosKubeTerminalRole  = "kube-terminal"
 	stratosSessionAnnotation = "stratos-session"
 
 	consoleContainerName = "kube-terminal"
@@ -27,16 +27,22 @@ const (
 
 // KubeTerminal supports spawning pods to provide a CLI environment to the user
 type KubeTerminal struct {
-	PortalProxy	interfaces.PortalProxy
-	Namespace string `configName:"STRATOS_KUBERNETES_NAMESPACE"`
-	Image     string `configName:"STRATOS_KUBERNETES_TERMINAL_IMAGE"`
-	Token     []byte
-	APIServer string
-	Kube api.Kubernetes
+	PortalProxy interfaces.PortalProxy
+	Namespace   string `configName:"STRATOS_KUBERNETES_NAMESPACE"`
+	Image       string `configName:"STRATOS_KUBERNETES_TERMINAL_IMAGE"`
+	Token       []byte
+	APIServer   string
+	Kube        api.Kubernetes
 }
 
 // NewKubeTerminal checks that the environment is set up to support the Kube Terminal
 func NewKubeTerminal(p interfaces.PortalProxy) *KubeTerminal {
+	// Only enabled in tech preview
+	if !p.GetConfig().EnableTechPreview {
+		log.Info("Kube Terminal not enabled - requires tech preview")
+		return nil
+	}
+
 	kt := &KubeTerminal{
 		PortalProxy: p,
 	}

From cd65b145a8c0cefde02f0a7f77b83d15bde21772 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 24 Jun 2020 16:49:25 +0100
Subject: [PATCH 549/648] Add dev doc and helper setup script

---
 build/tools/kube-terminal-dev.sh | 58 ++++++++++++++++++++++++++++++++
 docs/suse/kube-terminal-dev.md   | 21 ++++++++++++
 2 files changed, 79 insertions(+)
 create mode 100755 build/tools/kube-terminal-dev.sh
 create mode 100644 docs/suse/kube-terminal-dev.md

diff --git a/build/tools/kube-terminal-dev.sh b/build/tools/kube-terminal-dev.sh
new file mode 100755
index 0000000000..2ec5c69c3d
--- /dev/null
+++ b/build/tools/kube-terminal-dev.sh
@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+
+# Colours
+CYAN="\033[96m"
+YELLOW="\033[93m"
+RED="\033[91m"
+RESET="\033[0m"
+BOLD="\033[1m"
+
+# Program Paths:
+PROG=$(basename ${BASH_SOURCE[0]})
+PROG_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+STRATOS_DIR="$( cd "${PROG_DIR}/../.." && pwd )"
+
+echo "Creating Service Account"
+SRC="${STRATOS_DIR}/deploy/kubernetes/console/templates/service-account.yaml"
+
+TEMPFILE=$(mktemp)
+cp $SRC $TEMPFILE
+sed -i.bak '/\s*helm/d' $TEMPFILE
+sed -i.bak '/\s*app\.kubernetes\.io\/version/d' $TEMPFILE
+sed -i.bak '/\s*app\.kubernetes\.io\/instance/d' $TEMPFILE
+sed -i.bak '/\s*{{-/d' $TEMPFILE
+
+kubectl apply -f $TEMPFILE
+
+# Service account should be created - now need to get token
+SECRET=$(kubectl get sa stratos -o json | jq -r '.secrets[0].name')
+TOKEN=$(kubectl get secret $SECRET -o json | jq -r '.data.token')
+echo "Token secret: $SECRET"
+echo "Token         $TOKEN"
+
+rm -f $TEMPFILE
+rm -f $TEMPFILE.bak
+
+# Create a namespace
+NS="stratos-dev"
+kubectl get ns $NS > /dev/null
+if [ $? -ne 0 ]; then
+  kubectl create ns $NS
+fi
+
+CFG=${STRATOS_DIR}/src/jetstream/config.properties
+touch $CFG
+
+echo -e "\n# Kubernetes Terminal Config for dev" >> $CFG
+echo "STRATOS_KUBERNETES_NAMESPACE=stratos-dev" >> $CFG
+echo "STRATOS_KUBERNETES_TERMINAL_IMAGE=splatform/stratos-kube-terminal:dev" >> $CFG
+echo "KUBE_TERMINAL_SERVICE_ACCOUNT_TOKEN=$TOKEN" >> $CFG
+
+MKUBE=$(minikube ip)
+if [ $? -eq 0 ]; then
+  echo "KUBERNETES_SERVICE_HOST=$MKUBE" >> $CFG
+  echo "KUBERNETES_SERVICE_PORT=8443" >> $CFG
+else
+  echo "KUBERNETES_SERVICE_HOST=" >> $CFG
+  echo "KUBERNETES_SERVICE_PORT=8443" >> $CFG
+fi
diff --git a/docs/suse/kube-terminal-dev.md b/docs/suse/kube-terminal-dev.md
new file mode 100644
index 0000000000..fe552b064c
--- /dev/null
+++ b/docs/suse/kube-terminal-dev.md
@@ -0,0 +1,21 @@
+# Enabling the Kubernetes Terminal in local development
+
+You need a Kubernetes cluster with `kubectl` set up and configured with the kubeconfig file.
+
+Run the script `build/tools/kube-terminal-dev.sh`
+
+This script will:
+
+- Create a service account named `stratos`
+- Create a namespace named `stratos-dev`
+- Write environment variables to the `src/jetstream/config.properties` file
+
+If you have minikube running, the configuration for your Kubernetes API Server will be set correctly - otherwise
+you will need to edit the `src/jetstream/config.properties` file and set these two variables:
+
+- `KUBERNETES_SERVICE_HOST`
+- `KUBERNETES_SERVICE_PORT`
+
+The Jetstream backend should be configured.
+
+> Note: Ensure you set `ENABLE_TECH_PREVIEW=true` to enable the Kubernetes Terminal feature.
\ No newline at end of file

From 37f53d56f80f5b530db894ed718862d62659aad6 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Fri, 26 Jun 2020 10:59:00 +0100
Subject: [PATCH 550/648] Add ability to import K8S endpoints from kube config
 file (#381)

* Fix table passing issue

* WIP: Import from kube config file

* Minor tidy ups

* Remove debugging code

* Fix for error message being swallowed

* Improvements to load, add edit name
- tidied up selection component
- move non-ui logic into helper
- move record of clusters into helper
- tidied up config helper
- fixed select all intermediate state on bizare selections & first load
- cleans a lot of table datasource interfaces

* Specific fixes for upstream
- Fix table header alignment
- Fix checkbox table column alignment

* Rename name column component, fix default context selection when invalid

* Tidying up, add skip ssl, fix register of new

* Allow user to skip connect by not suppling user

* Tidying up, set AZK type, fixes

* Minor fixes, subtle edit symbols

* Fix case where cluster is register only but cannot connect, allow user to review final step

* Add detection for EKS

* Remove border between row that's errored and it's errror description row

* Fix unit tests

* Set initial state of skip ssl checkbox given request to kube

* Fix unit tests

* Remove some console.logs

* Multiple small changes/fixes
- tidy up
- remove /kubeconfig.yaml fetch
- fix select all at indeterminate state (should always select all)
- fix apply for auto skip ssl

* Fix connect error status message, change title of register endpoint stepper, minor changes

* Improve table row error
- remove border radius after expansion change
- error rows have large indent to help show associated row
- remove old styles that weren't applied following expansion change

* Spacing

* Changes following review

* Changes following review

* Fix build warning which is silent in dev world

* Fixes following merge

* Fix e2e test

* Add icon for kube config import

Co-authored-by: Richard Cox <richard.cox@suse.com>
---
 .../kube-config-auth.helper.ts                | 158 +++++++++
 .../kube-config-import.component.html         |   3 +
 .../kube-config-import.component.scss         |   8 +
 .../kube-config-import.component.spec.ts      |  29 ++
 .../kube-config-import.component.ts           | 300 ++++++++++++++++++
 ...-config-table-import-status.component.html |   1 +
 ...-config-table-import-status.component.scss |   0
 ...nfig-table-import-status.component.spec.ts |  29 ++
 ...be-config-table-import-status.component.ts |  26 ++
 .../kube-config-registration.component.html   |  11 +
 .../kube-config-registration.component.scss   |   0
 ...kube-config-registration.component.spec.ts |  35 ++
 .../kube-config-registration.component.ts     |   8 +
 .../kube-config-selection.component.html      |  17 +
 .../kube-config-selection.component.scss      |  35 ++
 .../kube-config-selection.component.spec.ts   |  29 ++
 .../kube-config-selection.component.ts        | 210 ++++++++++++
 .../kube-config-table-cert.component.html     |   6 +
 .../kube-config-table-cert.component.scss     |   0
 .../kube-config-table-cert.component.spec.ts  |  33 ++
 .../kube-config-table-cert.component.ts       |  73 +++++
 .../kube-config-table-name.component.html     |   9 +
 .../kube-config-table-name.component.scss     |  12 +
 .../kube-config-table-name.component.spec.ts  |  34 ++
 .../kube-config-table-name.component.ts       |  11 +
 .../kube-config-table-select.component.html   |   1 +
 .../kube-config-table-select.component.scss   |   0
 ...kube-config-table-select.component.spec.ts |  35 ++
 .../kube-config-table-select.component.ts     |  22 ++
 ...onfig-table-sub-type-select.component.html |   3 +
 ...onfig-table-sub-type-select.component.scss |   0
 ...ig-table-sub-type-select.component.spec.ts |  35 ++
 ...-config-table-sub-type-select.component.ts |  33 ++
 ...be-config-table-user-select.component.html |   9 +
 ...be-config-table-user-select.component.scss |   0
 ...config-table-user-select.component.spec.ts |  39 +++
 ...kube-config-table-user-select.component.ts |  31 ++
 .../kube-config.helper.ts                     | 201 ++++++++++++
 .../kube-config.types.ts                      |  99 ++++++
 .../kubernetes/kubernetes-entity-generator.ts |  64 ++--
 .../custom/kubernetes/kubernetes.module.ts    |   6 +-
 .../kubernetes/kubernetes.setup.module.ts     |  40 ++-
 .../frontend/assets/custom/kube_import.png    | Bin 0 -> 13298 bytes
 .../table-cell-edit-variable.component.html   |   3 +-
 .../table-cell-edit-variable.component.scss   |   4 +
 .../cf-quotas-data-source.service.ts          |   2 +-
 .../cf-space-quotas-data-source.service.ts    |   2 +-
 .../packages/core/sass/_all-theme.scss        |   2 +-
 .../core/sass/components/mat-table.scss       |   2 +-
 .../packages/core/src/core/utils.service.ts   |   8 +
 .../src/features/endpoints/connect.service.ts |  19 ++
 .../create-endpoint-base-step.component.html  |   2 +-
 .../create-endpoint-base-step.component.ts    |   9 +-
 .../create-endpoint.component.html            |   8 +-
 .../create-endpoint.component.ts              |  30 +-
 .../app-action-monitor-icon.component.ts      |  11 +-
 .../app-action-monitor.component.html         |   5 +-
 .../app-action-monitor.component.ts           |  18 +-
 .../file-input/file-input.component.html      |   3 +-
 .../file-input/file-input.component.ts        |  15 +-
 .../list-data-source-types.ts                 |  33 +-
 .../table-cell-edit.component.html            |  21 +-
 .../table-cell-edit.component.scss            |  12 +-
 .../table-cell-edit.component.ts              |  23 +-
 .../table-header-select.component.html        |   5 +-
 .../table-row/table-row.component.html        |  12 +-
 .../table-row/table-row.component.scss        |  24 +-
 .../table-row/table-row.component.theme.scss  |  29 +-
 .../table-row/table-row.component.ts          |   9 +
 .../list/list-table/table.component.html      |   2 +-
 .../list/list-table/table.component.scss      |  14 +-
 .../list/list-table/table.component.ts        |   1 +
 .../packages/core/src/shared/shared.module.ts |   4 +-
 .../entity-catalog/entity-catalog.types.ts    |   2 +
 .../api-request-reducer/fail-request.ts       |   2 +-
 .../src/reducers/api-request-reducer/types.ts |   8 +
 .../store/src/selectors/api.selectors.ts      |   4 +-
 src/jetstream/default.config.properties       |   4 +-
 src/jetstream/plugins/kubernetes/main.go      |  32 +-
 src/test-e2e/endpoints/register-dialog.po.ts  |   2 +-
 80 files changed, 1963 insertions(+), 118 deletions(-)
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-auth.helper.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.html
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.scss
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.html
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.scss
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.html
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.scss
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.html
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.scss
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.html
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.scss
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.html
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.scss
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.html
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.scss
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.html
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.scss
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.html
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.scss
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.spec.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config.helper.ts
 create mode 100644 custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config.types.ts
 create mode 100644 custom-src/frontend/assets/custom/kube_import.png

diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-auth.helper.ts b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-auth.helper.ts
new file mode 100644
index 0000000000..4f2c119a4c
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-auth.helper.ts
@@ -0,0 +1,158 @@
+import { ComponentFactoryResolver, Injector } from '@angular/core';
+import { FormBuilder } from '@angular/forms';
+
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
+import { ConnectEndpointData } from '../../../features/endpoints/connect.service';
+import { RowState } from '../../../shared/components/list/data-sources-controllers/list-data-source-types';
+import { KUBERNETES_ENDPOINT_TYPE } from '../kubernetes-entity-factory';
+import { EndpointAuthTypeConfig, IAuthForm } from './../../../core/extension/extension-types';
+import { KubeConfigFileCluster, KubeConfigFileUser } from './kube-config.types';
+
+/**
+ * Auth helper tries to figure out the Kubernetes sub-type and auth to use
+ * based on the kube config file contents
+ */
+export class KubeConfigAuthHelper {
+
+  authTypes: { [name: string]: EndpointAuthTypeConfig } = {};
+
+  public subTypes = [];
+
+  constructor() {
+    const epTypeInfo = entityCatalog.getAllEndpointTypes(false);
+    const k8s = epTypeInfo.find(entity => entity.type === KUBERNETES_ENDPOINT_TYPE);
+    if (k8s && k8s.definition) {
+      const defn = k8s.definition;
+
+      // Collect all of the auth types
+      defn.authTypes.forEach(at => {
+        this.authTypes[at.value] = at;
+      });
+
+      this.subTypes.push({ id: '', name: 'Generic' });
+
+      // Collect all of the auth types for the sub-types
+      defn.subTypes.forEach(st => {
+        if (st.type !== 'config') {
+          this.subTypes.push({ id: st.type, name: st.labelShort });
+        }
+        st.authTypes.forEach(at => {
+          this.authTypes[at.value] = at;
+        });
+      });
+
+      // Sort the subtypes
+      this.subTypes = this.subTypes.sort((a, b) => a.name.localeCompare(b.name));
+    }
+  }
+
+  // Try and parse the authentication metadata
+  public parseAuth(cluster: KubeConfigFileCluster, user: KubeConfigFileUser): RowState {
+
+    // Default subtype is generic Kubernetes
+    cluster._subType = '';
+
+    // Certificate authentication first
+
+    // In-file certificate authentication
+    if (user.user['client-certificate-data'] && user.user['client-key-data']) {
+      // We are good to go - create the form data
+
+      // Default is generic kubernetes
+      let subType = '';
+      const authType = 'kube-cert-auth';
+      if (cluster.cluster.server.indexOf('azmk8s.io') >= 0) {
+        // Probably Azure
+        subType = 'aks';
+        cluster._subType = 'aks';
+      }
+
+      const authData = {
+        authType,
+        subType,
+        values: {
+          cert: user.user['client-certificate-data'],
+          certKey: user.user['client-key-data']
+        }
+      };
+      user._authData = authData;
+      return {};
+    }
+
+    if (user.user['client-certificate'] || user.user['client-key']) {
+      cluster._additionalUserInfo = true;
+      return {
+        message: 'This endpoint will be registered but not connected (additional information is required)',
+        info: true
+      };
+    }
+
+    const authProvider = user.user['auth-provider'];
+
+
+    if (authProvider && authProvider.config) {
+      if (authProvider.config['cmd-path'] && authProvider.config['cmd-path'].indexOf('gcloud') !== -1) {
+        // GKE
+        cluster._subType = 'gke';
+        // Can not connect to GKE - user must do so manually
+        cluster._additionalUserInfo = true;
+        return {
+          message: 'This endpoint will be registered but not connected (additional information is required)',
+          info: true
+        };
+      }
+    }
+
+    if (
+      cluster.cluster.server.indexOf('eks.amazonaws.com') >= 0 ||
+      (user.user.exec && user.user.exec.command && user.user.exec.command === 'aws-iam-authenticator')
+    ) {
+      // Probably EKS
+      cluster._subType = 'eks';
+      cluster._additionalUserInfo = true;
+      return {
+        message: 'This endpoint will be registered but not connected (additional information is required)',
+        info: true
+      };
+    }
+
+    return { message: 'Authentication mechanism is not supported', warning: true };
+  }
+
+  // Use the auto component to get the data in the correct format for connecting to the endpoint
+  public getAuthDataForConnect(resolver: ComponentFactoryResolver, injector: Injector, fb: FormBuilder, user: KubeConfigFileUser)
+    : ConnectEndpointData | null {
+
+    let data = null;
+
+    // Get the component to us
+    if (user && user._authData) {
+      const authType = this.authTypes[user._authData.authType];
+
+      const factory = resolver.resolveComponentFactory<IAuthForm>(authType.component);
+
+      const ref = factory.create(injector);
+
+      const form = fb.group({
+        authType: authType.value,
+        systemShared: false,
+        authValues: fb.group(user._authData.values)
+      });
+
+      ref.instance.formGroup = form;
+
+      // Allow the auth form to supply body content if it needs to
+      const endpointFormInstance = ref.instance as any;
+      if (endpointFormInstance.getBody && endpointFormInstance.getValues) {
+        data = {
+          authType: authType.value,
+          authVal: endpointFormInstance.getValues(user._authData.values),
+          systemShared: false,
+          bodyContent: endpointFormInstance.getBody()
+        };
+      }
+      ref.destroy();
+    }
+    return data;
+  }
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.html b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.html
new file mode 100644
index 0000000000..b78c35d87c
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.html
@@ -0,0 +1,3 @@
+<div class="kubeconfig-import">
+  <app-table [dataSource]="dataSource" [columns]="columns"></app-table>
+</div>
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.scss b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.scss
new file mode 100644
index 0000000000..05510cdc8c
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.scss
@@ -0,0 +1,8 @@
+:host {
+  display: flex;
+  flex: 1;
+}
+
+.kubeconfig-import {
+  flex: 1;
+}
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.spec.ts
new file mode 100644
index 0000000000..a006e2debc
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.spec.ts
@@ -0,0 +1,29 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { KubernetesBaseTestModules } from '../../kubernetes.testing.module';
+import { KubeConfigImportComponent } from './kube-config-import.component';
+
+describe('KubeConfigImportComponent', () => {
+  let component: KubeConfigImportComponent;
+  let fixture: ComponentFixture<KubeConfigImportComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        ...KubernetesBaseTestModules
+      ],
+      declarations: [KubeConfigImportComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubeConfigImportComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts
new file mode 100644
index 0000000000..e5e95dffd5
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts
@@ -0,0 +1,300 @@
+import { Component, ComponentFactoryResolver, Injector, OnDestroy } from '@angular/core';
+import { FormBuilder } from '@angular/forms';
+import { Store } from '@ngrx/store';
+import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'rxjs';
+import { distinctUntilChanged, filter, first, map, pairwise, startWith, withLatestFrom } from 'rxjs/operators';
+
+import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
+import { safeUnsubscribe } from '../../../../core/utils.service';
+import { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
+import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes-entity-factory';
+import { KubeConfigAuthHelper } from '../kube-config-auth.helper';
+import { KubeConfigFileCluster, KubeConfigImportAction, KubeImportState } from '../kube-config.types';
+import { RegisterEndpoint } from './../../../../../../store/src/actions/endpoint.actions';
+import { AppState } from './../../../../../../store/src/app-state';
+import { EndpointsEffect } from './../../../../../../store/src/effects/endpoint.effects';
+import { endpointSchemaKey } from './../../../../../../store/src/helpers/entity-factory';
+import { ActionState } from './../../../../../../store/src/reducers/api-request-reducer/types';
+import { selectUpdateInfo } from './../../../../../../store/src/selectors/api.selectors';
+import { STRATOS_ENDPOINT_TYPE } from './../../../../base-entity-schemas';
+import { EndpointsService } from './../../../../core/endpoints.service';
+import {
+  ConnectEndpointConfig,
+  ConnectEndpointData,
+  ConnectEndpointService,
+} from './../../../../features/endpoints/connect.service';
+import {
+  ITableListDataSource,
+  RowState,
+} from './../../../../shared/components/list/data-sources-controllers/list-data-source-types';
+import { StepOnNextFunction } from './../../../../shared/components/stepper/step/step.component';
+import {
+  KubeConfigTableImportStatusComponent,
+} from './kube-config-table-import-status/kube-config-table-import-status.component';
+
+const REGISTER_ACTION = 'Register endpoint';
+const CONNECT_ACTION = 'Connect endpoint';
+
+@Component({
+  selector: 'app-kube-config-import',
+  templateUrl: './kube-config-import.component.html',
+  styleUrls: ['./kube-config-import.component.scss']
+})
+export class KubeConfigImportComponent implements OnDestroy {
+
+  done = new BehaviorSubject<boolean>(false);
+  done$ = this.done.asObservable();
+  busy = new BehaviorSubject<boolean>(false);
+  busy$ = this.busy.asObservable();
+  data = new BehaviorSubject<KubeConfigImportAction[]>([]);
+  data$ = this.data.asObservable();
+
+  public dataSource: ITableListDataSource<KubeConfigImportAction> = {
+    connect: () => this.data$,
+    disconnect: () => { },
+    // Ensure unique per entry to step (in case user went back step and updated)
+    trackBy: (index, item) => item.cluster.name + this.iteration,
+    isTableLoading$: this.data$.pipe(map(data => !(data && data.length > 0))),
+    getRowState: (row: KubeConfigImportAction): Observable<RowState> => {
+      return row ? row.state.asObservable() : observableOf({});
+    }
+  };
+  public columns: ITableColumn<KubeConfigImportAction>[] = [
+    {
+      columnId: 'action', headerCell: () => 'Action',
+      cellDefinition: {
+        valuePath: 'action'
+      },
+      cellFlex: '1',
+    },
+    {
+      columnId: 'description', headerCell: () => 'Description',
+      cellDefinition: {
+        valuePath: 'description'
+      },
+      cellFlex: '4',
+    },
+    // Right-hand column to show the action progress
+    {
+      columnId: 'monitorState',
+      cellComponent: KubeConfigTableImportStatusComponent,
+      cellConfig: (row) => row.actionState.asObservable(),
+      cellFlex: '0 0 24px'
+    }
+  ];
+
+  subs: Subscription[] = [];
+  applyStarted: boolean;
+  private iteration = 0;
+
+  private endpointEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointSchemaKey);
+  private connectService: ConnectEndpointService;
+
+  constructor(
+    public store: Store<AppState>,
+    public resolver: ComponentFactoryResolver,
+    private injector: Injector,
+    private fb: FormBuilder,
+    private endpointsService: EndpointsService,
+  ) {
+  }
+
+  // Process the next action in the list
+  private processAction(actions: KubeConfigImportAction[]) {
+    if (actions.length === 0) {
+      // We are done
+      this.done.next(true);
+      this.busy.next(false);
+      return;
+    }
+
+    // Get the next action
+    const i = actions.shift();
+    if (i.action === REGISTER_ACTION) {
+      this.doRegister(i, actions);
+    } else if (i.action === CONNECT_ACTION) {
+      this.doConnect(i, actions);
+    } else {
+      // Do the next action
+      this.processAction(actions);
+    }
+  }
+
+  private doRegister(reg: KubeConfigImportAction, next: KubeConfigImportAction[]) {
+    const obs$ = this.registerEndpoint(reg.cluster.name, reg.cluster.cluster.server, reg.cluster.cluster['insecure-skip-tls-verify']);
+    const mainObs$ = this.getUpdatingState(obs$).pipe(
+      startWith({ busy: true, error: false, completed: false })
+    );
+
+    this.subs.push(mainObs$.subscribe(reg.actionState));
+
+    const sub = reg.actionState.subscribe(progress => {
+      // Not sure what the status is used for?
+      reg.status = progress;
+      if (progress.error && progress.message) {
+        // Mark all dependency jobs as skip
+        next.forEach(action => {
+          if (action.depends === reg) {
+            // Mark it as skipped by setting the action to null
+            action.action = null;
+            action.state.next({ message: 'Skipping action as endpoint could not be registered', warning: true });
+          }
+        });
+        reg.state.next({ message: progress.message, error: true });
+      }
+      if (progress.completed) {
+        if (!progress.error) {
+          // If we created okay, then guid is in the message
+          reg.cluster._guid = progress.message;
+        }
+        sub.unsubscribe();
+        // Do the next one
+        this.processAction(next);
+      }
+    });
+    this.subs.push(sub);
+  }
+
+  private doConnect(connect: KubeConfigImportAction, next: KubeConfigImportAction[]) {
+    if (!connect.user) {
+      return;
+    }
+    const helper = new KubeConfigAuthHelper();
+    const data = helper.getAuthDataForConnect(this.resolver, this.injector, this.fb, connect.user);
+    if (data) {
+      const obs$ = this.connectEndpoint(connect, data);
+
+      // Echo obs$ to the behaviour subject
+      this.subs.push(obs$.subscribe(connect.actionState));
+
+      this.subs.push(connect.actionState.pipe(filter(status => status.completed), first()).subscribe(status => {
+        if (status.error) {
+          connect.state.next({ message: status.errorMessage || status.message, error: true });
+        }
+        this.processAction(next);
+      }));
+    }
+  }
+
+  ngOnDestroy() {
+    safeUnsubscribe(...this.subs);
+
+    if (this.connectService) {
+      this.connectService.destroy();
+    }
+  }
+
+  // Register the endpoint
+  private registerEndpoint(name: string, url: string, skipSslValidation: boolean) {
+    const action = new RegisterEndpoint(KUBERNETES_ENDPOINT_TYPE, null, name, url, skipSslValidation, '', '', false);
+    this.store.dispatch(action);
+    const update$ = this.store.select(
+      selectUpdateInfo(this.endpointEntityKey, action.guid(), EndpointsEffect.registeringKey)
+    ).pipe(filter(update => !!update));
+    return update$;
+  }
+
+  // Connect to an endpoint
+  private connectEndpoint(action: KubeConfigImportAction, pData: ConnectEndpointData) {
+    const config: ConnectEndpointConfig = {
+      name: action.cluster.name,
+      guid: action.depends.cluster._guid || action.cluster._guid,
+      type: null,
+      subType: action.user._authData.subType,
+      ssoAllowed: false
+    };
+
+    if (this.connectService) {
+      this.connectService.destroy();
+    }
+    this.connectService = new ConnectEndpointService(this.store, this.endpointsService, config);
+    this.connectService.setData(pData);
+    this.connectService.submit();
+    return this.connectService.getConnectingObservable();
+  }
+
+  // Enter the step - process the list of clusters to import
+  onEnter = (data: KubeConfigFileCluster[]) => {
+    this.applyStarted = false;
+    this.iteration += 1;
+    const imports: KubeConfigImportAction[] = [];
+    data.forEach(item => {
+      if (item._selected) {
+        const register = {
+          action: REGISTER_ACTION,
+          description: `Register "${item.name}" with the URL "${item.cluster.server}"`,
+          cluster: item,
+          state: new BehaviorSubject<RowState>({}),
+          actionState: new BehaviorSubject<any>({}),
+        };
+        // Only include if the endpoint does not already exist
+        if (!item._guid) {
+          imports.push(register);
+        }
+        if (item._additionalUserInfo) {
+          return;
+        }
+        const user = item._users.find(u => u.name === item._user);
+        if (user) {
+          imports.push({
+            action: CONNECT_ACTION,
+            description: `Connect "${item.name}" with the user "${user.name}"`,
+            cluster: item,
+            user,
+            state: new BehaviorSubject<RowState>({}),
+            depends: register,
+            actionState: new BehaviorSubject<any>({}),
+          });
+        }
+      }
+    });
+    this.data.next(imports);
+  }
+
+  // Finish - go back to the endpoints view
+  onNext: StepOnNextFunction = () => {
+    if (this.applyStarted) {
+      // this.store.dispatch(new RouterNav({ path: ['endpoints'] }));
+      return observableOf({ success: true, redirect: true });
+
+    } else {
+      this.applyStarted = true;
+      this.busy.next(true);
+      this.data$.pipe(
+        filter((data => data && data.length > 0)),
+        first()
+      ).subscribe(imports => {
+        // Go through the imports and dispatch the actions to perform them in sequence
+        this.processAction([...imports]);
+      })
+      return observableOf({ success: true, ignoreSuccess: true });
+    }
+  }
+
+  // These two should be somewhere else
+  private getUpdatingState(actionState$: Observable<ActionState>): Observable<KubeImportState> {
+    const completed$ = this.getHasCompletedObservable(actionState$.pipe(map(requestState => requestState.busy)));
+    return actionState$.pipe(
+      pairwise(),
+      withLatestFrom(completed$),
+      map(([[, requestState], completed]) => {
+        return {
+          busy: requestState.busy,
+          error: requestState.error,
+          completed,
+          message: requestState.message,
+        };
+      })
+    );
+  }
+
+  private getHasCompletedObservable(busy$: Observable<boolean>) {
+    return busy$.pipe(
+      distinctUntilChanged(),
+      pairwise(),
+      map(([oldBusy, newBusy]) => oldBusy && !newBusy),
+      startWith(false),
+    );
+  }
+
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.html b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.html
new file mode 100644
index 0000000000..e4b06461a1
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.html
@@ -0,0 +1 @@
+<app-action-monitor-icon *ngIf="state" [state]="state"></app-action-monitor-icon>
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.scss b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.spec.ts
new file mode 100644
index 0000000000..6d2263d935
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.spec.ts
@@ -0,0 +1,29 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
+import { KubeConfigTableImportStatusComponent } from './kube-config-table-import-status.component';
+
+describe('KubeConfigTableImportStatusComponent', () => {
+  let component: KubeConfigTableImportStatusComponent;
+  let fixture: ComponentFixture<KubeConfigTableImportStatusComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        ...KubernetesBaseTestModules
+      ],
+      declarations: [KubeConfigTableImportStatusComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubeConfigTableImportStatusComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.ts b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.ts
new file mode 100644
index 0000000000..08bd785052
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.ts
@@ -0,0 +1,26 @@
+import { Component, Input } from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { KubeConfigFileCluster } from '../../kube-config.types';
+
+@Component({
+  selector: 'app-kube-config-table-import-status',
+  templateUrl: './kube-config-table-import-status.component.html',
+  styleUrls: ['./kube-config-table-import-status.component.scss']
+})
+export class KubeConfigTableImportStatusComponent extends TableCellCustom<KubeConfigFileCluster> {
+
+  public state: Observable<any>;
+
+  constructor() {
+    super();
+  }
+
+  @Input()
+  set config(element) {
+    if (!this.state) {
+      this.state = element(this.row);
+    }
+  }
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.html b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.html
new file mode 100644
index 0000000000..6611b3a683
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.html
@@ -0,0 +1,11 @@
+<app-steppers cancel="/endpoints">
+  <app-step title="Select Config File" [valid]="selector.valid$ | async" [onEnter]="selector.onEnter"
+    [onNext]="selector.onNext">
+    <app-kube-config-selection #selector [applyStarted]="importer.applyStarted"></app-kube-config-selection>
+  </app-step>
+  <app-step title="Review" [onEnter]="importer.onEnter" [canClose]="!importer.applyStarted"
+    [disablePrevious]="importer.busy$ | async" [destructiveStep]="!importer.applyStarted" [onNext]="importer.onNext"
+    [finishButtonText]="importer.applyStarted ? 'Close' : 'Import'">
+    <app-kube-config-import #importer></app-kube-config-import>
+  </app-step>
+</app-steppers>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.scss b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.spec.ts
new file mode 100644
index 0000000000..bfcf2b0024
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.spec.ts
@@ -0,0 +1,35 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { KubernetesBaseTestModules } from '../kubernetes.testing.module';
+import { KubeConfigImportComponent } from './kube-config-import/kube-config-import.component';
+import { KubeConfigRegistrationComponent } from './kube-config-registration.component';
+import { KubeConfigSelectionComponent } from './kube-config-selection/kube-config-selection.component';
+
+describe('KubeConfigRegistrationComponent', () => {
+  let component: KubeConfigRegistrationComponent;
+  let fixture: ComponentFixture<KubeConfigRegistrationComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        ...KubernetesBaseTestModules
+      ],
+      declarations: [
+        KubeConfigRegistrationComponent,
+        KubeConfigSelectionComponent,
+        KubeConfigImportComponent
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubeConfigRegistrationComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.ts b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.ts
new file mode 100644
index 0000000000..1708ec7897
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-kube-config-registration',
+  templateUrl: './kube-config-registration.component.html',
+  styleUrls: ['./kube-config-registration.component.scss']
+})
+export class KubeConfigRegistrationComponent { }
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.html b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.html
new file mode 100644
index 0000000000..77ce84fc8a
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.html
@@ -0,0 +1,17 @@
+<div class="kube-config-select__panel" *ngIf="!(helper.clusters$ | async) else haveClusters">
+  <div class="kube-config-select__upload">
+    <mat-icon class="kube-config-select__icon">insert_drive_file</mat-icon>
+    <h1 class="kube-config-select__title">Select a Kube Config file to import clusters</h1>
+    <div class="kube-config-auth__form">
+      <app-file-input placeholder="kubeconfig" (onFileData)="clustersParse($event)"
+        buttonLabel="Select Kube Config file">
+      </app-file-input>
+    </div>
+  </div>
+</div>
+
+<ng-template #haveClusters>
+  <div class="kube-config-select__table">
+    <app-table [dataSource]="dataSource" [columns]="columns" minRowHeight="57px"></app-table>
+  </div>
+</ng-template>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.scss b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.scss
new file mode 100644
index 0000000000..df0fad3cd0
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.scss
@@ -0,0 +1,35 @@
+:host {
+  display: flex;
+  flex: 1;
+}
+
+.kube-config-select {
+  &__panel {
+    align-items: center;
+    display: flex;
+    flex: 1;
+    justify-content: center;
+  }
+  &__upload {
+    text-align: center;
+  }
+  &__title {
+    font-size: 24px;
+    text-align: center;
+  }
+  &__icon {
+    font-size: 96px;
+    height: 96px;
+    opacity: .7;
+    width: 96px;
+  }
+  &__table {
+    flex: 1;
+  }
+  &__buttons {
+    padding-bottom: 12px;
+    button {
+      margin-right: 24px;
+    }
+  }
+}
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.spec.ts
new file mode 100644
index 0000000000..cc646004a4
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.spec.ts
@@ -0,0 +1,29 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { KubernetesBaseTestModules } from '../../kubernetes.testing.module';
+import { KubeConfigSelectionComponent } from './kube-config-selection.component';
+
+describe('KubeConfigSelectionComponent', () => {
+  let component: KubeConfigSelectionComponent;
+  let fixture: ComponentFixture<KubeConfigSelectionComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        ...KubernetesBaseTestModules
+      ],
+      declarations: [KubeConfigSelectionComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubeConfigSelectionComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts
new file mode 100644
index 0000000000..4a89f59baf
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts
@@ -0,0 +1,210 @@
+import { Component, Input } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { BehaviorSubject, combineLatest, Observable, of as observableOf, of } from 'rxjs';
+import { first, map, switchMap } from 'rxjs/operators';
+
+import { HideSnackBar, ShowSnackBar } from '../../../../../../store/src/actions/snackBar.actions';
+import { AppState } from '../../../../../../store/src/app-state';
+import {
+  TableHeaderSelectComponent,
+} from '../../../../shared/components/list/list-table/table-header-select/table-header-select.component';
+import { KubeConfigHelper } from '../kube-config.helper';
+import { KubeConfigFileCluster } from '../kube-config.types';
+import {
+  ITableListDataSource,
+  RowState,
+} from './../../../../shared/components/list/data-sources-controllers/list-data-source-types';
+import { ITableColumn } from './../../../../shared/components/list/list-table/table.types';
+import { KubeConfigTableCertComponent } from './kube-config-table-cert/kube-config-table-cert.component';
+import { KubeConfigTableName } from './kube-config-table-name/kube-config-table-name.component';
+import { KubeConfigTableSelectComponent } from './kube-config-table-select/kube-config-table-select.component';
+import {
+  KubeConfigTableSubTypeSelectComponent,
+} from './kube-config-table-sub-type-select/kube-config-table-sub-type-select.component';
+import { KubeConfigTableUserSelectComponent } from './kube-config-table-user-select/kube-config-table-user-select.component';
+
+export interface KubeConfigTableListDataSource extends ITableListDataSource<KubeConfigFileCluster> {
+  editRowName: string;
+}
+
+@Component({
+  selector: 'app-kube-config-selection',
+  templateUrl: './kube-config-selection.component.html',
+  styleUrls: ['./kube-config-selection.component.scss'],
+  providers: [
+    KubeConfigHelper
+  ],
+})
+export class KubeConfigSelectionComponent {
+
+  @Input() applyStarted: boolean;
+  public dataSource: KubeConfigTableListDataSource = {
+    connect: () => this.helper.clusters$,
+    disconnect: () => { },
+    trackBy: (index, row) => row.name,
+    isTableLoading$: observableOf(false),
+    getRowState: (row: KubeConfigFileCluster, schemaKey: string): Observable<RowState> => {
+      return row ? row._state.asObservable() : observableOf({});
+    },
+    selectAllIndeterminate: false,
+    selectAllChecked: false,
+    selectAllFilteredRows: () => {
+      // Should always go to true from indeterminate
+      this.dataSource.selectAllChecked = this.dataSource.selectAllIndeterminate ? true : !this.dataSource.selectAllChecked
+      this.dataSource.selectAllIndeterminate = false; // either all off or all on, cannot be indeterminate
+
+      this.helper.clusters$.pipe(
+        first(),
+        switchMap(clusters => combineLatest(clusters.map(cluster => {
+          if (!cluster._invalid) {
+            cluster._selected = this.dataSource.selectAllChecked;
+            return this.helper.checkValidity(cluster).pipe(map(() => cluster));
+          }
+          return of(cluster);
+        }))),
+        first(),
+      ).subscribe(clusters => {
+        this.checkCanGoNext(clusters);
+      })
+    },
+    editRow: null,
+    editRowName: null,
+    startEdit: (c: KubeConfigFileCluster) => {
+      this.dataSource.editRow = c;
+    },
+    saveEdit: () => {
+      this.dataSource.editRow.name = this.dataSource.editRowName;
+      this.helper.update(this.dataSource.editRow);
+      delete this.dataSource.editRowName;
+      delete this.dataSource.editRow;
+    },
+    cancelEdit: () => {
+      delete this.dataSource.editRowName;
+      delete this.dataSource.editRow;
+    },
+    getRowUniqueId: (c: KubeConfigFileCluster) => c ? c._id : null
+  };
+
+  public columns: ITableColumn<KubeConfigFileCluster>[] = [
+    {
+      columnId: 'select',
+      headerCellComponent: TableHeaderSelectComponent,
+      cellComponent: KubeConfigTableSelectComponent,
+      class: 'table-column-select',
+      cellFlex: '0 0 48px'
+    },
+    {
+      columnId: 'name', headerCell: () => 'Name',
+      cellComponent: KubeConfigTableName,
+      cellFlex: '3',
+      class: 'app-table__cell--table-no-v-padding'
+    },
+    {
+      columnId: 'url', headerCell: () => 'URL',
+      cellDefinition: {
+        valuePath: 'cluster.server'
+      },
+      cellFlex: '4',
+    },
+    {
+      columnId: 'type', headerCell: () => 'Type',
+      cellFlex: '1',
+      cellComponent: KubeConfigTableSubTypeSelectComponent
+    },
+    {
+      columnId: 'user', headerCell: () => 'User',
+      cellFlex: '4',
+      cellComponent: KubeConfigTableUserSelectComponent
+    },
+    {
+      columnId: 'cert', headerCell: () => 'Skip SSL Validation',
+      cellFlex: '0 0 62px',
+      class: 'app-table__cell--table-centred',
+      cellComponent: KubeConfigTableCertComponent
+    }
+  ];
+
+  // Is the import data valid?
+  valid = new BehaviorSubject<boolean>(false);
+  valid$ = this.valid.asObservable();
+
+  canSetIntermediate = false;
+
+  constructor(
+    private store: Store<AppState>,
+    public helper: KubeConfigHelper
+  ) {
+    this.helper.clustersChanged = () => this.clustersChanged()
+  }
+
+  // Save data for the next step to know the list of clusters to import
+  onNext = () => this.helper.clusters$.pipe(
+    first(),
+    map(clusters => ({
+      success: true,
+      data: clusters
+    }))
+  )
+
+  clustersParse(cluster: string) {
+    this.store.dispatch(new HideSnackBar());
+    this.helper.parse(cluster).pipe(first()).subscribe(errorString => {
+      if (errorString) {
+        this.store.dispatch(new ShowSnackBar(`Failed to load Kube Config: ${errorString}`, 'Close'))
+      }
+    })
+  }
+
+  onEnter = () => {
+    if (!this.applyStarted) {
+      return;
+    }
+    // Handle back from review step (ensure newly registered endpoints are taken into account)
+    this.helper.updateAll().pipe(first()).subscribe(() => { })
+  }
+
+  // Row changed event - update the next button and selection state
+  clustersChanged() {
+    this.helper.clusters$.pipe(
+      first()
+    ).subscribe(clusters => {
+      this.checkCanGoNext(clusters);
+
+      // Check the select all state
+      let selectedCount = 0;
+      let totalCount = 0;
+      clusters.forEach(i => {
+        if (!i._invalid) {
+          totalCount++;
+          selectedCount += i._selected ? 1 : 0;
+        }
+      });
+
+      if (selectedCount === 0 || totalCount === selectedCount) {
+        this.dataSource.selectAllIndeterminate = false;
+        this.dataSource.selectAllChecked = (selectedCount !== 0);
+      } else {
+        this.dataSource.selectAllIndeterminate = true;
+      }
+    })
+
+  }
+
+  // Can we proceed?
+  checkCanGoNext(clusters: KubeConfigFileCluster[]) {
+    let selected = 0;
+    let okay = 0;
+    clusters.forEach(i => {
+      if (i._selected) {
+        selected++;
+        if (!i._invalid) {
+          okay++;
+        }
+      }
+    });
+
+    // Must be at least one selected and they all must be okay to import
+    this.valid.next(selected > 0 && selected === okay);
+  }
+
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.html b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.html
new file mode 100644
index 0000000000..5d0a8d6faf
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.html
@@ -0,0 +1,6 @@
+<mat-progress-spinner *ngIf="!(initialValue$ | async); else haveInitialValue" diameter="20" mode="indeterminate">
+</mat-progress-spinner>
+<ng-template #haveInitialValue>
+  <mat-checkbox [checked]="(initialValue$ | async).checked" (change)="valueChanged($event.checked)" color="primary">
+  </mat-checkbox>
+</ng-template>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.scss b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.spec.ts
new file mode 100644
index 0000000000..0b1bdaf8b8
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.spec.ts
@@ -0,0 +1,33 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
+import { KubeConfigHelper } from '../../kube-config.helper';
+import { KubeConfigTableCertComponent } from './kube-config-table-cert.component';
+
+describe('KubeConfigTableCertComponent', () => {
+  let component: KubeConfigTableCertComponent;
+  let fixture: ComponentFixture<KubeConfigTableCertComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        ...KubernetesBaseTestModules
+      ],
+      declarations: [KubeConfigTableCertComponent],
+      providers: [
+        KubeConfigHelper
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubeConfigTableCertComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.ts b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.ts
new file mode 100644
index 0000000000..c776a3d0bf
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.ts
@@ -0,0 +1,73 @@
+import { HttpClient, HttpErrorResponse } from '@angular/common/http';
+import { Component, Input } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+import { timeout } from 'rxjs/operators';
+
+import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { KubeConfigHelper } from '../../kube-config.helper';
+import { KubeConfigFileCluster } from '../../kube-config.types';
+
+type CertResponse = {
+  Status: number;
+  Required: boolean;
+  Error: boolean;
+  Message: string;
+}
+
+@Component({
+  selector: 'app-kube-config-table-cert',
+  templateUrl: './kube-config-table-cert.component.html',
+  styleUrls: ['./kube-config-table-cert.component.scss']
+})
+export class KubeConfigTableCertComponent extends TableCellCustom<KubeConfigFileCluster> {
+
+  initialValue = new BehaviorSubject<{
+    checked: boolean
+  }>(null)
+  initialValue$ = this.initialValue.asObservable();
+
+  private pRow: KubeConfigFileCluster;
+  @Input()
+  set row(row: KubeConfigFileCluster) {
+    if (!this.pRow) {
+      this.pRow = row;
+      if (row.cluster['insecure-skip-tls-verify']) {
+        // User has manually specified default skip option
+        this.initialValue.next({
+          checked: true
+        });
+      } else {
+        // Manually check if a cert is required, if so tick by default
+        this.http.get(`/pp/v1/kube/cert?url=${row.cluster.server}`).pipe(
+          timeout(5000),
+        ).subscribe(
+          // Success, no cert required
+          (res: CertResponse) => this.update(res.Required),
+          // Failed, check for specific cert required error
+          (e: HttpErrorResponse) => this.update(false)
+        )
+      }
+    }
+  }
+  get row(): KubeConfigFileCluster {
+    return this.pRow;
+  }
+
+  constructor(
+    private helper: KubeConfigHelper,
+    private http: HttpClient
+  ) {
+    super()
+  }
+
+  private update(checked: boolean) {
+    this.initialValue.next({ checked });
+    this.valueChanged(checked);
+  }
+
+  valueChanged(value) {
+    this.row.cluster['insecure-skip-tls-verify'] = value;
+    this.helper.update(this.row);
+  }
+
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.html b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.html
new file mode 100644
index 0000000000..39cdc6abec
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.html
@@ -0,0 +1,9 @@
+<div class="name">
+  <mat-form-field class="cell-edit-variable"
+    *ngIf="dataSource.getRowUniqueId(row) === dataSource.getRowUniqueId(dataSource.editRow) else value">
+    <input matInput name="envVarValue" [value]="dataSource.editRow?.name"
+      (input)="dataSource.editRowName = $event.target.value" />
+  </mat-form-field>
+  <ng-template #value><span class="cell-value-variable">{{row.name}}</span></ng-template>
+  <app-table-cell-edit [row]="row" [dataSource]="dataSource" subtle="true"></app-table-cell-edit>
+</div>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.scss b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.scss
new file mode 100644
index 0000000000..1d85cadb70
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.scss
@@ -0,0 +1,12 @@
+.name {
+  align-items: center;
+  display: flex;
+
+  .cell-edit-variable {
+    flex: 1;
+  }
+
+  app-table-cell-edit {
+    margin-bottom: 3px;
+  }
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts
new file mode 100644
index 0000000000..c37211591f
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts
@@ -0,0 +1,34 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { IListDataSource } from '../../../../../shared/components/list/data-sources-controllers/list-data-source-types';
+import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
+import { KubeConfigFileCluster } from '../../kube-config.types';
+import { KubeConfigTableName } from './kube-config-table-name.component';
+
+describe('KubeConfigTableName', () => {
+  let component: KubeConfigTableName;
+  let fixture: ComponentFixture<KubeConfigTableName>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        ...KubernetesBaseTestModules
+      ],
+      declarations: [KubeConfigTableName]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubeConfigTableName);
+    component = fixture.componentInstance;
+    component.dataSource = {
+      getRowUniqueId: (row) => ""
+    } as IListDataSource<KubeConfigFileCluster>
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts
new file mode 100644
index 0000000000..576f4c19f2
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+
+import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { KubeConfigFileCluster } from '../../kube-config.types';
+
+@Component({
+  selector: 'app-kube-config-table-name',
+  templateUrl: './kube-config-table-name.component.html',
+  styleUrls: ['./kube-config-table-name.component.scss']
+})
+export class KubeConfigTableName extends TableCellCustom<KubeConfigFileCluster> { }
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.html b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.html
new file mode 100644
index 0000000000..944326f9e6
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.html
@@ -0,0 +1 @@
+<mat-checkbox [disabled]="!!row._invalid" [checked]="!!row._selected" (change)="changed($event)"></mat-checkbox>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.scss b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.spec.ts
new file mode 100644
index 0000000000..3bf72f8139
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.spec.ts
@@ -0,0 +1,35 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
+import { KubeConfigHelper } from '../../kube-config.helper';
+import { KubeConfigFileCluster } from '../../kube-config.types';
+import { KubeConfigTableSelectComponent } from './kube-config-table-select.component';
+
+describe('KubeConfigTableSelectComponent', () => {
+  let component: KubeConfigTableSelectComponent;
+  let fixture: ComponentFixture<KubeConfigTableSelectComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        ...KubernetesBaseTestModules
+      ],
+      declarations: [KubeConfigTableSelectComponent],
+      providers: [
+        KubeConfigHelper
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubeConfigTableSelectComponent);
+    component = fixture.componentInstance;
+    component.row = {} as KubeConfigFileCluster;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.ts b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.ts
new file mode 100644
index 0000000000..b13745ed48
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.ts
@@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+
+import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { KubeConfigHelper } from '../../kube-config.helper';
+import { KubeConfigFileCluster } from '../../kube-config.types';
+
+@Component({
+  selector: 'app-kube-config-table-select',
+  templateUrl: './kube-config-table-select.component.html',
+  styleUrls: ['./kube-config-table-select.component.scss']
+})
+export class KubeConfigTableSelectComponent extends TableCellCustom<KubeConfigFileCluster> {
+
+  constructor(private helper: KubeConfigHelper) {
+    super();
+  }
+  changed(v) {
+    this.row._selected = v.checked;
+    this.helper.update(this.row);
+  }
+
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.html b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.html
new file mode 100644
index 0000000000..92a8d0e90e
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.html
@@ -0,0 +1,3 @@
+<mat-select placeholder="Select type" [(value)]="selected" (selectionChange)="valueChanged($event.value)">
+  <mat-option *ngFor="let type of subTypes" [value]="type.id">{{ type.name }}</mat-option>
+</mat-select>
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.scss b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.spec.ts
new file mode 100644
index 0000000000..c2ce574749
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.spec.ts
@@ -0,0 +1,35 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
+import { KubeConfigHelper } from '../../kube-config.helper';
+import { KubeConfigFileCluster } from '../../kube-config.types';
+import { KubeConfigTableSubTypeSelectComponent } from './kube-config-table-sub-type-select.component';
+
+describe('KubeConfigTableSubTypeSelectComponent', () => {
+  let component: KubeConfigTableSubTypeSelectComponent;
+  let fixture: ComponentFixture<KubeConfigTableSubTypeSelectComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        ...KubernetesBaseTestModules
+      ],
+      declarations: [KubeConfigTableSubTypeSelectComponent],
+      providers: [
+        KubeConfigHelper
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubeConfigTableSubTypeSelectComponent);
+    component = fixture.componentInstance;
+    component.row = {} as KubeConfigFileCluster;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.ts b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.ts
new file mode 100644
index 0000000000..8d487d1bc6
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.ts
@@ -0,0 +1,33 @@
+import { Component, OnInit } from '@angular/core';
+
+import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
+import { KubeConfigAuthHelper } from '../../kube-config-auth.helper';
+import { KubeConfigHelper } from '../../kube-config.helper';
+import { KubeConfigFileCluster } from '../../kube-config.types';
+
+@Component({
+  selector: 'app-kube-config-table-sub-type-select',
+  templateUrl: './kube-config-table-sub-type-select.component.html',
+  styleUrls: ['./kube-config-table-sub-type-select.component.scss']
+})
+export class KubeConfigTableSubTypeSelectComponent extends TableCellCustom<KubeConfigFileCluster> implements OnInit {
+
+  selected: string;
+
+  subTypes: string[];
+
+  constructor(private helper: KubeConfigHelper) {
+    super();
+
+    this.subTypes = new KubeConfigAuthHelper().subTypes;
+  }
+
+  ngOnInit() {
+    this.selected = this.row._subType || '';
+  }
+
+  valueChanged(value) {
+    this.row._subType = value;
+    this.helper.update(this.row);
+  }
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.html b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.html
new file mode 100644
index 0000000000..1c1c629a8a
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.html
@@ -0,0 +1,9 @@
+<div *ngIf="hasUser">
+  <mat-select [(value)]="selected" (selectionChange)="valueChanged($event.value)">
+    <mat-option [value]="''">Register Only</mat-option>
+    <mat-option *ngFor="let user of row._users" [value]="user.name">{{ user.name }}</mat-option>
+  </mat-select>
+</div>
+<div *ngIf="!hasUser">
+  No user found, register only
+</div>
\ No newline at end of file
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.scss b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.spec.ts
new file mode 100644
index 0000000000..3ada12009f
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.spec.ts
@@ -0,0 +1,39 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
+import { KubeConfigHelper } from '../../kube-config.helper';
+import { KubeConfigFileCluster } from '../../kube-config.types';
+import { KubeConfigTableUserSelectComponent } from './kube-config-table-user-select.component';
+
+describe('KubeConfigTableUserSelectComponent', () => {
+  let component: KubeConfigTableUserSelectComponent;
+  let fixture: ComponentFixture<KubeConfigTableUserSelectComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        ...KubernetesBaseTestModules
+      ],
+      declarations: [
+        KubeConfigTableUserSelectComponent,
+      ],
+      providers: [
+        KubeConfigHelper
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubeConfigTableUserSelectComponent);
+    component = fixture.componentInstance;
+    component.row = {
+      _users: []
+    } as KubeConfigFileCluster;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.ts b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.ts
new file mode 100644
index 0000000000..f39471a321
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.ts
@@ -0,0 +1,31 @@
+import { Component, OnInit } from '@angular/core';
+
+import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { KubeConfigHelper } from '../../kube-config.helper';
+import { KubeConfigFileCluster } from '../../kube-config.types';
+
+@Component({
+  selector: 'app-kube-config-table-user-select',
+  templateUrl: './kube-config-table-user-select.component.html',
+  styleUrls: ['./kube-config-table-user-select.component.scss']
+})
+export class KubeConfigTableUserSelectComponent extends TableCellCustom<KubeConfigFileCluster> implements OnInit {
+
+  hasUser = false;
+  selected: string;
+
+  constructor(private helper: KubeConfigHelper) {
+    super();
+  }
+
+  ngOnInit() {
+    this.selected = this.row._user || '';
+    this.hasUser = this.row._users.length > 0;
+  }
+
+  valueChanged(value) {
+    this.row._user = value;
+    this.helper.update(this.row);
+  }
+
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config.helper.ts b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config.helper.ts
new file mode 100644
index 0000000000..645505ea91
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config.helper.ts
@@ -0,0 +1,201 @@
+import { Injectable } from '@angular/core';
+import * as yaml from 'js-yaml';
+import { BehaviorSubject, combineLatest, Observable, of } from 'rxjs';
+import { filter, first, map, tap } from 'rxjs/operators';
+
+import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
+import { EndpointsService } from '../../../core/endpoints.service';
+import { createGuid } from '../../../core/utils.service';
+import { getFullEndpointApiUrl } from '../../../features/endpoints/endpoint-helpers';
+import { RowState } from '../../../shared/components/list/data-sources-controllers/list-data-source-types';
+import { KubeConfigAuthHelper } from './kube-config-auth.helper';
+import { KubeConfigFile, KubeConfigFileCluster } from './kube-config.types';
+
+/**
+ * Helper to parse the kubeconfig and transform it into data
+ * that we can display in a table for selection
+ *
+ * Main issue is we only support one credential per endpoint, so need to format the data
+ * to offer the user ability to select which user to import
+ */
+@Injectable()
+export class KubeConfigHelper {
+
+  authHelper = new KubeConfigAuthHelper();
+
+  clusters = new BehaviorSubject<KubeConfigFileCluster[]>(null)
+  clusters$ = this.clusters.asObservable().pipe(
+    filter(clusters => !!clusters)
+  );
+
+  constructor(
+    public endpointsService: EndpointsService,
+  ) {
+  }
+
+  public clustersChanged: () => void;
+  public update = (cluster: KubeConfigFileCluster) => {
+    this.checkValidity(cluster).subscribe(() => this.clustersChanged());
+  }
+
+  public updateAll(): Observable<any> {
+    return this.clusters$.pipe(
+      tap(clusters => clusters.forEach(cluster => this.update(cluster))),
+    )
+  }
+
+  public parse(config: string): Observable<string> {
+    let doc: KubeConfigFile;
+
+    const clusters: { [name: string]: KubeConfigFileCluster } = {};
+
+    try {
+      doc = yaml.safeLoad(config);
+    } catch (e) {
+      return of(`${e}`);
+    }
+
+    // Need contexts, users and clusters
+    if (!doc || !doc.contexts || !doc.users || !doc.clusters) {
+      return of(`Configuration must have contexts, users and clusters`);
+    }
+
+    // Go through all of the contexts and find the clusters
+    doc.contexts.forEach(ctx => {
+      const cluster = doc.clusters.find(item => item.name === ctx.context.cluster);
+      if (cluster) {
+        // Found the cluster
+        if (!clusters[cluster.name]) {
+          const clstr = {
+            ...cluster,
+            _users: []
+          };
+          clusters[cluster.name] = clstr;
+          clstr._state = new BehaviorSubject<RowState>({});
+        }
+
+        // Get the user
+        const user = doc.users.find(item => item.name === ctx.context.user);
+        if (user) {
+          // Check we don't already have this user (remove duplicates)
+          const users = clusters[cluster.name]._users;
+          if (users.findIndex(usr => usr.name === user.name) === -1) {
+            clusters[cluster.name]._users.push(user);
+            if (ctx.name === doc['current-context']) {
+              // Auto-select this cluster/user if it is the current context
+              clusters[cluster.name]._user = user.name;
+              clusters[cluster.name]._selected = true;
+            }
+          }
+        }
+      }
+    });
+
+    // Go through all clusters, auto-select the user where this is only 1 and check validity
+    const clustersArray = Object.values(clusters);
+    clustersArray.forEach(cluster => {
+      if (cluster._users.length >= 1) {
+        cluster._user = cluster._users[0].name;
+      }
+      cluster._id = createGuid();
+    });
+
+    // Check validity
+    return combineLatest(
+      clustersArray.map(cluster => this.checkValidity(cluster))
+    ).pipe(
+      map(() => {
+        // Notify cluster changes
+        this.clustersChanged();
+        this.clusters.next(Object.values(clusters));
+        return '';
+      })
+    );
+  }
+
+
+  // Check the validity of a cluster for import
+  public checkValidity(cluster: KubeConfigFileCluster): Observable<any> {
+    // Check endpoint name
+    return combineLatest([
+      this.endpointsService.endpoints$,
+      this.clusters.asObservable() // Might be called before we've loaded clusters, so used the non-filtered one
+    ]).pipe(
+      first(),
+      map(([eps, clusters]) => this.validate(Object.values(eps), cluster, clusters))
+    );
+  }
+
+  private validate(endpoints: EndpointModel[], cluster: KubeConfigFileCluster, clusters: KubeConfigFileCluster[]) {
+    cluster._invalid = false;
+    let reset = true;
+
+    const found = endpoints.find(item => item.name === cluster.name);
+    if (found) {
+      // If the URL is the same, then we will just connect to the existing endpoint
+      if (getFullEndpointApiUrl(found) === cluster.cluster.server && !!cluster._user) {
+        cluster._guid = found.guid;
+        cluster._state.next({
+          message: 'This endpoint will be connected and not registered (endpoint is already registered)',
+          info: true
+        });
+        reset = false;
+      } else {
+        // An endpoint with the same name (but different URL) already exists
+        cluster._invalid = true;
+        cluster._state.next({ message: 'An endpoint with this name already exists', warning: true });
+      }
+    } else {
+      // Check endpoint url is not registered with a different name
+      if (endpoints.find(item => getFullEndpointApiUrl(item) === cluster.cluster.server)) {
+        cluster._invalid = true;
+        cluster._state.next({ message: 'An endpoint with this URL already exists', warning: true });
+      }
+    }
+
+    // Check the connection details
+    if (!cluster._invalid && cluster._user) {
+      const user = cluster._users.find(item => item.name === cluster._user);
+      if (user) {
+        const newState = this.authHelper.parseAuth(cluster, user);
+        if (!!newState && !!newState.message) {
+          reset = false;
+          cluster._invalid = newState.error || newState.warning
+          cluster._state.next(newState);
+        }
+      }
+    }
+
+    // Register only (_additionalUserInfo.. specific to text warning) is true
+    // Connect only (endpoint exists) is true
+    // Show special warning
+    if (cluster._additionalUserInfo && cluster._guid) {
+      cluster._invalid = true;
+      reset = true;
+      cluster._state.next({
+        message: 'This endpoint will not be registered or connected (endpoint is already registered, additional information required to connect)',
+        warning: true
+      });
+    }
+
+    if (clusters && !!clusters.find(candidate => candidate.name === cluster.name && candidate._id !== cluster._id)) {
+      cluster._invalid = true;
+      cluster._state.next({ message: 'An endpoint with this name already exists in the config file', warning: true });
+    }
+
+    if (!cluster.name) {
+      cluster._invalid = true;
+      cluster._state.next({ message: 'Cluster must have name', warning: true });
+    }
+
+    // Cluster is valid, so clear any warning or error message
+    if (!cluster._invalid && reset) {
+      cluster._state.next({});
+    }
+
+    // Ensure invalid rows aren't selected (user cannot unselect invalid rows)
+    if (cluster._invalid) {
+      cluster._selected = false;
+    }
+  }
+}
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config.types.ts b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config.types.ts
new file mode 100644
index 0000000000..f2d8b7abde
--- /dev/null
+++ b/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config.types.ts
@@ -0,0 +1,99 @@
+import { Observable, Subject } from 'rxjs';
+
+import { EndpointAuthTypeConfig } from '../../../core/extension/extension-types';
+import { RowState } from '../../../shared/components/list/data-sources-controllers/list-data-source-types';
+import { ActionStatus } from './../../../../../store/src/reducers/api-request-reducer/types';
+
+// Types for a Kubernetes Configuration file
+
+export interface KubeConfigFileCluster {
+  name: string;
+  cluster: {
+    'certificate-authority': string;
+    'certificate-authority-data': string;
+    'insecure-skip-tls-verify': boolean;
+    server: string;
+  };
+  // Selected user to import
+  _user: string;
+  _users: KubeConfigFileUser[];
+  // _onUpdate: (row) => {};
+  // Is the cluster selected for import?
+  _selected: boolean;
+  // Is this cluster invalid? i.e. requires more information
+  _invalid: boolean;
+  // row state
+  _state: Subject<RowState>;
+  // status of import
+  _status: string;
+  // guid of the existing endpoint for this cluster
+  _guid: string;
+  // subtype
+  _subType?: string;
+  // additional info is required in order to connect, hints at register only, though is specific due to warning message
+  _additionalUserInfo: boolean;
+  // unique identifier 
+  _id: string;
+}
+
+export interface KubeConfigFileUser {
+  name: string;
+  user: KubeConfigFileUserDetail;
+  _authData: KubeConfigImportAuthConfig;
+}
+
+export interface KubeConfigFileUserDetail {
+  'client-certificate'?: string;
+  'client-key'?: string;
+  'client-certificate-data'?: string;
+  'client-key-data'?: string;
+  token?: string;
+  exec?: any
+}
+
+export interface KubeConfigFileContext {
+  name: string;
+  context: {
+    cluster: string;
+    user: string;
+  };
+}
+
+export interface KubeConfigFile {
+  apiVersion: string;
+  clusters: KubeConfigFileCluster[];
+  contexts: KubeConfigFileContext[];
+  'current-context': string;
+  kind: string;
+  users: KubeConfigFileUser[];
+}
+
+export interface KubeConfigImportAction {
+  action: string;
+  description: string;
+  cluster: KubeConfigFileCluster;
+  user?: KubeConfigFileUser;
+  status?: ActionStatus;
+  state: Subject<RowState>;
+  actionState$?: Observable<any>;
+  actionState: Subject<any>;
+  depends?: KubeConfigImportAction;
+}
+
+export interface KubeImportState {
+  busy: boolean;
+  error: boolean;
+  completed: boolean;
+  message: string;
+}
+
+export interface EndpointConfig {
+  type: string;
+  authTypes: EndpointAuthTypeConfig[];
+}
+
+export interface KubeConfigImportAuthConfig {
+  subType: string;
+  authType: string;
+  values: { [key: string]: string };
+}
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 eac9f993c0..15e0ea101b 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
@@ -20,6 +20,7 @@ import {
   KubernetesConfigAuthFormComponent,
 } from './auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component';
 import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component';
+import { KubeConfigRegistrationComponent } from './kube-config-registration/kube-config-registration.component';
 import { kubeEntityCatalog } from './kubernetes-entity-catalog';
 import {
   KUBERNETES_ENDPOINT_TYPE,
@@ -129,31 +130,44 @@ export function generateKubernetesEntities(): StratosBaseCatalogEntity[] {
     urlValidation: undefined,
     authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.CERT_AUTH], kubeAuthTypeMap[KubeEndpointAuthTypes.CONFIG]],
     renderPriority: 4,
-    subTypes: [{
-      type: 'caasp',
-      label: 'SUSE CaaS Platform',
-      authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.CONFIG]],
-      logoUrl: '/core/assets/custom/caasp.png',
-      renderPriority: 5
-    }, {
-      type: 'aks',
-      label: 'Azure AKS',
-      authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.CONFIG_AZ]],
-      logoUrl: '/core/assets/custom/aks.svg',
-      renderPriority: 6
-    }, {
-      type: 'eks',
-      label: 'Amazon EKS',
-      authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.AWS_IAM]],
-      logoUrl: '/core/assets/custom/eks.svg',
-      renderPriority: 6
-    }, {
-      type: 'gke',
-      label: 'Google Kubernetes Engine',
-      authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.GKE]],
-      logoUrl: '/core/assets/custom/gke.svg',
-      renderPriority: 6
-    }],
+    subTypes: [
+      {
+        type: 'config',
+        label: 'Import Kubeconfig',
+        authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.CONFIG]],
+        logoUrl: '/core/assets/custom/kube_import.png',
+        renderPriority: 3,
+        registrationComponent: KubeConfigRegistrationComponent,
+      },
+      {
+        type: 'caasp',
+        label: 'SUSE CaaS Platform',
+        labelShort: 'CaaSP',
+        authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.CONFIG]],
+        logoUrl: '/core/assets/custom/caasp.png',
+        renderPriority: 5,
+      }, {
+        type: 'aks',
+        label: 'Azure AKS',
+        labelShort: 'AKS',
+        authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.CONFIG_AZ]],
+        logoUrl: '/core/assets/custom/aks.svg',
+        renderPriority: 6
+      }, {
+        type: 'eks',
+        label: 'Amazon EKS',
+        labelShort: 'EKS',
+        authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.AWS_IAM]],
+        logoUrl: '/core/assets/custom/eks.svg',
+        renderPriority: 6
+      }, {
+        type: 'gke',
+        label: 'Google Kubernetes Engine',
+        labelShort: 'GKE',
+        authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.GKE]],
+        logoUrl: '/core/assets/custom/gke.svg',
+        renderPriority: 6
+      }],
   };
   return [
     generateEndpointEntity(endpointDefinition),
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
index ed05e9af79..0c2111ed22 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
@@ -1,4 +1,3 @@
-/* tslint:disable:max-line-length */
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
@@ -93,6 +92,7 @@ import { KubernetesNodesTabComponent } from './tabs/kubernetes-nodes-tab/kuberne
 import { KubernetesPodsTabComponent } from './tabs/kubernetes-pods-tab/kubernetes-pods-tab.component';
 import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kubernetes-summary.component';
 
+/* tslint:disable:max-line-length */
 
 /* tslint:enable */
 
@@ -146,7 +146,7 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     KubernetesResourceViewerComponent,
     KubeServiceCardComponent,
     KubedashConfigurationComponent,
-    KubernetesPodContainersComponent
+    KubernetesPodContainersComponent,
   ],
   providers: [
     KubernetesService,
@@ -170,7 +170,7 @@ import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kub
     KubernetesPodStatusComponent,
     KubeServiceCardComponent,
     KubernetesResourceViewerComponent,
-    KubernetesPodContainersComponent
+    KubernetesPodContainersComponent,
   ],
   exports: [
     KubernetesResourceViewerComponent
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
index 45f33e0292..03989028b4 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
@@ -14,6 +14,29 @@ import {
   KubernetesConfigAuthFormComponent,
 } from './auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component';
 import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component';
+import { KubeConfigImportComponent } from './kube-config-registration/kube-config-import/kube-config-import.component';
+import {
+  KubeConfigTableImportStatusComponent,
+} from './kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component';
+import { KubeConfigRegistrationComponent } from './kube-config-registration/kube-config-registration.component';
+import {
+  KubeConfigSelectionComponent,
+} from './kube-config-registration/kube-config-selection/kube-config-selection.component';
+import {
+  KubeConfigTableCertComponent,
+} from './kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component';
+import {
+  KubeConfigTableName,
+} from './kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component';
+import {
+  KubeConfigTableSelectComponent,
+} from './kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component';
+import {
+  KubeConfigTableSubTypeSelectComponent,
+} from './kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component';
+import {
+  KubeConfigTableUserSelectComponent,
+} from './kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component';
 import { kubeEntityCatalog } from './kubernetes-entity-catalog';
 import { KUBERNETES_ENDPOINT_TYPE } from './kubernetes-entity-factory';
 import { generateKubernetesEntities } from './kubernetes-entity-generator';
@@ -21,7 +44,6 @@ import { BaseKubeGuid } from './kubernetes-page.types';
 import { KubernetesStoreModule } from './kubernetes.store.module';
 import { KubernetesEndpointService } from './services/kubernetes-endpoint.service';
 
-
 @NgModule({
   imports: [
     EntityCatalogModule.forFeature(generateKubernetesEntities),
@@ -35,6 +57,15 @@ import { KubernetesEndpointService } from './services/kubernetes-endpoint.servic
     KubernetesAWSAuthFormComponent,
     KubernetesConfigAuthFormComponent,
     KubernetesGKEAuthFormComponent,
+    KubeConfigRegistrationComponent,
+    KubeConfigSelectionComponent,
+    KubeConfigImportComponent,
+    KubeConfigTableSelectComponent,
+    KubeConfigTableUserSelectComponent,
+    KubeConfigTableImportStatusComponent,
+    KubeConfigTableSubTypeSelectComponent,
+    KubeConfigTableName,
+    KubeConfigTableCertComponent
   ],
   providers: [
     BaseKubeGuid,
@@ -45,6 +76,13 @@ import { KubernetesEndpointService } from './services/kubernetes-endpoint.servic
     KubernetesAWSAuthFormComponent,
     KubernetesConfigAuthFormComponent,
     KubernetesGKEAuthFormComponent,
+    KubeConfigRegistrationComponent,
+    KubeConfigTableSelectComponent,
+    KubeConfigTableUserSelectComponent,
+    KubeConfigTableImportStatusComponent,
+    KubeConfigTableSubTypeSelectComponent,
+    KubeConfigTableName,
+    KubeConfigTableCertComponent
   ]
 })
 export class KubernetesSetupModule {
diff --git a/custom-src/frontend/assets/custom/kube_import.png b/custom-src/frontend/assets/custom/kube_import.png
new file mode 100644
index 0000000000000000000000000000000000000000..62d9f0bdd2e7037bb9f33580a7829e14dd93d0a1
GIT binary patch
literal 13298
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

literal 0
HcmV?d00001

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.html b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/table-cell-edit-variable/table-cell-edit-variable.component.html
index 9b9fcb9301..3f634c71e4 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/table-cell-edit-variable/table-cell-edit-variable.component.html
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/table-cell-edit-variable/table-cell-edit-variable.component.html
@@ -2,4 +2,5 @@
   <input matInput name="envVarValue" [value]="dataSource.editRow?.value"
     (input)="dataSource.editRow.value = $event.target.value" />
 </mat-form-field>
-<span *ngIf="row.name !== dataSource.editRow?.name" (click)="showPopup()">{{row.value}}</span>
\ No newline at end of file
+<span class="cell-value-variable" *ngIf="row.name !== dataSource.editRow?.name"
+  (click)="showPopup()">{{row.value}}</span>
\ No newline at end of file
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.scss b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/table-cell-edit-variable/table-cell-edit-variable.component.scss
index eb9c8d43a8..6cd7d23bf0 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/table-cell-edit-variable/table-cell-edit-variable.component.scss
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/table-cell-edit-variable/table-cell-edit-variable.component.scss
@@ -7,3 +7,7 @@ mat-form-field {
 .cell-edit-variable {
   width: 100%;
 }
+
+.cell-value-variable {
+  cursor: pointer;
+}
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 f2bf84af31..d5018ccb88 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
@@ -50,7 +50,7 @@ export class CfQuotasDataSourceService extends ListDataSource<APIResource> {
         map(requestInfo => ({
           deleting: requestInfo.deleting.busy,
           error: requestInfo.deleting.error,
-          message: requestInfo.deleting.error ? `Failed to delete quota: ${requestInfo.message}` : null
+          message: requestInfo.deleting.error ? `Failed to delete quota: ${requestInfo.deleting.message}` : null
         }))
       );
     };
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 4a880b804b..ccfb93879a 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
@@ -50,7 +50,7 @@ export class CfOrgSpaceQuotasDataSourceService extends ListDataSource<APIResourc
         map(requestInfo => ({
           deleting: requestInfo.deleting.busy,
           error: requestInfo.deleting.error,
-          message: requestInfo.deleting.error ? `Failed to delete space quota: ${requestInfo.message}` : null
+          message: requestInfo.deleting.error ? `Failed to delete space quota: ${requestInfo.deleting.message}` : null
         }))
       );
     };
diff --git a/src/frontend/packages/core/sass/_all-theme.scss b/src/frontend/packages/core/sass/_all-theme.scss
index 4f657dbc93..9fc21b86f9 100644
--- a/src/frontend/packages/core/sass/_all-theme.scss
+++ b/src/frontend/packages/core/sass/_all-theme.scss
@@ -181,6 +181,6 @@ $side-nav-light-active: #484848;
     $warn: map-get($theme, warn);
     $primary: map-get($theme, primary);
     $white: #fff; // Use default palette for status
-    @return (success: map-get($mat-green, 500), warning: map-get($mat-orange, 500), danger: mat-color($warn), tentative: map-get($mat-grey, 500), busy: mat-color($primary), text: $white, );
+    @return (success: map-get($mat-green, 500), warning: map-get($mat-orange, 500), danger: mat-color($warn), tentative: map-get($mat-grey, 500), busy: mat-color($primary), text: $white, info: map-get($mat-blue, 500));
   }
 }
diff --git a/src/frontend/packages/core/sass/components/mat-table.scss b/src/frontend/packages/core/sass/components/mat-table.scss
index c623288894..6c0d902e78 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-header-cell {
+  .mat-cell, mat-footer-cell, mat-header-cell {
     padding: 10px 10px 10px 0;
   }
 
diff --git a/src/frontend/packages/core/src/core/utils.service.ts b/src/frontend/packages/core/src/core/utils.service.ts
index 415a8f89c6..83de981544 100644
--- a/src/frontend/packages/core/src/core/utils.service.ts
+++ b/src/frontend/packages/core/src/core/utils.service.ts
@@ -349,3 +349,11 @@ export const arraysEqual = (a: any[], b: any[]): boolean => {
   // Falsy/Truthy
   return false;
 };
+
+export const createGuid = (): string => {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
+    var r = Math.random() * 16 | 0,
+      v = c == 'x' ? r : (r & 0x3 | 0x8);
+    return v.toString(16);
+  });
+}
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 015ff5b14d..d4e9dac73d 100644
--- a/src/frontend/packages/core/src/features/endpoints/connect.service.ts
+++ b/src/frontend/packages/core/src/features/endpoints/connect.service.ts
@@ -201,6 +201,25 @@ export class ConnectEndpointService {
     );
   }
 
+  public getConnectingObservable() {
+    return this.isBusy$.pipe(
+      pairwise(),
+      filter(([oldBusy, newBusy]) => {
+        return !(oldBusy === true && newBusy === false);
+      }),
+      withLatestFrom(this.update$),
+      map(([, updateSection]) => ({
+        ...updateSection,
+        completed: !updateSection.busy,
+      })),
+      startWith({
+        busy: true,
+        completed: false,
+        error: false
+      })
+    );
+  }
+
   public destroy() {
     safeUnsubscribe(...this.subs);
   }
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.html b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.html
index 0aa360488a..5a3116dce9 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.html
@@ -1,5 +1,5 @@
 <app-page-header>
-  <h1>Register a new Endpoint</h1>
+  <h1>Register Endpoint</h1>
 </app-page-header>
 <app-steppers [cancel]="'/endpoints'">
   <app-step [hideNextButton]="true">
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-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 85fedb80c1..e354112437 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
@@ -1,16 +1,16 @@
 import { Component } from '@angular/core';
 import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
 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';
+import { IStratosEndpointDefinition } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
+import { selectSessionData } from '../../../../../../store/src/reducers/auth.reducer';
 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';
-import { Observable } from 'rxjs';
-import { IStratosEndpointDefinition } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
 
 interface ICreateEndpointTilesData extends ITileData {
   type: string;
@@ -103,7 +103,8 @@ export class CreateEndpointBaseStepComponent {
                 },
               {
                 type: endpoint.type,
-                parentType: endpoint.parentType
+                parentType: endpoint.parentType,
+                component: endpoint.registrationComponent,
               }
             );
           });
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.html b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.html
index d4a8beb761..076abff82d 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.html
@@ -1,8 +1,8 @@
 <app-page-header>
-  <h1>Register a new Endpoint</h1>
+  <h1>Register Endpoint</h1>
 </app-page-header>
 
-<app-steppers cancel="/endpoints">
+<app-steppers *ngIf="!component; else customComponent" cancel="/endpoints">
   <app-step [title]="'Register'" [valid]="step1.validate | async" [onNext]="step1.onNext" [nextButtonText]="'Register'">
     <app-create-endpoint-cf-step-1 #step1 [finalStep]="!showConnectStep"></app-create-endpoint-cf-step-1>
   </app-step>
@@ -11,4 +11,6 @@ <h1>Register a new Endpoint</h1>
     [finishButtonText]="connect.doConnect ? 'Connect' : 'Finish'">
     <app-create-endpoint-connect #connect></app-create-endpoint-connect>
   </app-step>
-</app-steppers>
\ No newline at end of file
+</app-steppers>
+
+<ng-template #customComponent></ng-template>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.ts b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.ts
index 1bd0f9c07c..d44c7af725 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,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, ViewChild, ViewContainerRef, ComponentRef, OnInit, OnDestroy, ComponentFactory, ComponentFactoryResolver } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
@@ -10,16 +10,40 @@ import { getIdFromRoute } from '../../../core/utils.service';
   templateUrl: './create-endpoint.component.html',
   styleUrls: ['./create-endpoint.component.scss']
 })
-export class CreateEndpointComponent {
+export class CreateEndpointComponent implements OnInit, OnDestroy {
 
   showConnectStep: boolean;
 
-  constructor(activatedRoute: ActivatedRoute) {
+  component: any;
+  @ViewChild('customComponent', { read: ViewContainerRef, static: true }) customComponentContainer;
+  componentRef: ComponentRef<any>;
+
+  constructor(activatedRoute: ActivatedRoute, private resolver: ComponentFactoryResolver) {
     const epType = getIdFromRoute(activatedRoute, 'type');
     const epSubType = getIdFromRoute(activatedRoute, 'subtype');
     const endpoint = entityCatalog.getEndpoint(epType, epSubType);
+
+    this.component = endpoint.definition.registrationComponent;
     this.showConnectStep = !endpoint.definition.unConnectable ?
       endpoint.definition.authTypes && !!endpoint.definition.authTypes.length :
       false;
   }
+
+  ngOnInit() {
+    this.customComponentContainer.clear();
+    if (this.componentRef) {
+      this.componentRef.destroy();
+    }
+    if (this.component) {
+      const factory: ComponentFactory<any> = this.resolver.resolveComponentFactory(this.component);
+      this.componentRef = this.customComponentContainer.createComponent(factory);
+    }
+  }
+
+  ngOnDestroy() {
+    if (this.componentRef) {
+      this.componentRef.destroy();
+    }
+  }
+
 }
diff --git a/src/frontend/packages/core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component.ts b/src/frontend/packages/core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component.ts
index 6637ca8748..fc0663320a 100644
--- a/src/frontend/packages/core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component.ts
+++ b/src/frontend/packages/core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component.ts
@@ -36,7 +36,8 @@ export class ActionMonitorComponentState {
     this.currentState = this.getStateObservable(entityMonitor, monitorState);
   }
 
-  private getStateObservable(entityMonitor: EntityMonitor, monitorState: AppMonitorComponentTypes) {
+  private getStateObservable(entityMonitor: EntityMonitor, monitorState: AppMonitorComponentTypes)
+  : Observable<IApplicationMonitorComponentState> {
     switch (monitorState) {
       case AppMonitorComponentTypes.DELETE:
         return this.getDeletingState(entityMonitor);
@@ -122,6 +123,10 @@ export class ActionMonitorComponentState {
 })
 export class AppActionMonitorIconComponent implements OnInit {
 
+  // State observable - use this instead of creating one
+  @Input()
+  public state: Observable<IApplicationMonitorComponentState>;
+
   @Input()
   public entityKey: string;
 
@@ -143,6 +148,9 @@ export class AppActionMonitorIconComponent implements OnInit {
   constructor(private entityMonitorFactory: EntityMonitorFactory) { }
 
   ngOnInit() {
+    if (this.state) {
+      this.currentState = this.state;
+    } else {
     const state: ActionMonitorComponentState = new ActionMonitorComponentState(
       this.entityMonitorFactory,
       this.id,
@@ -151,5 +159,6 @@ export class AppActionMonitorIconComponent implements OnInit {
       this.updateKey
     );
     this.currentState = state.currentState;
+    }
   }
 }
diff --git a/src/frontend/packages/core/src/shared/components/app-action-monitor/app-action-monitor.component.html b/src/frontend/packages/core/src/shared/components/app-action-monitor/app-action-monitor.component.html
index 6e9a288393..1c9713853c 100644
--- a/src/frontend/packages/core/src/shared/components/app-action-monitor/app-action-monitor.component.html
+++ b/src/frontend/packages/core/src/shared/components/app-action-monitor/app-action-monitor.component.html
@@ -1 +1,4 @@
-<app-table [dataSource]="dataSource" [columns]="allColumns"></app-table>
+<div *ngIf="dataSource.connect(null) | async as data">
+  <app-table [dataSource]="dataSource" [columns]="allColumns" [prominentErrorBar]="data.length > 1">
+  </app-table>
+</div>
\ 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 2895bce18d..345af4a5c6 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
@@ -1,8 +1,7 @@
-import { DataSource } from '@angular/cdk/table';
 import { Component, Input, OnInit } from '@angular/core';
 import { schema } from 'normalizr';
 import { never as observableNever, Observable, of as observableOf } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map, publishReplay, refCount } from 'rxjs/operators';
 
 import { EntitySchema } from '../../../../../store/src/helpers/entity-schema';
 import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
@@ -26,7 +25,7 @@ import { ITableColumn } from '../list/list-table/table.types';
 export class AppActionMonitorComponent<T> implements OnInit {
 
   @Input()
-  private data$: Observable<Array<T>> = observableNever();
+  public data$: Observable<Array<T>> = observableNever();
 
   @Input()
   public entityKey: string;
@@ -58,7 +57,7 @@ export class AppActionMonitorComponent<T> implements OnInit {
   @Input()
   public columns: ITableColumn<T>[] = [];
 
-  public dataSource: DataSource<T>;
+  public dataSource: ITableListDataSource<T>;
 
   public allColumns: ITableColumn<T>[] = [];
 
@@ -82,9 +81,16 @@ export class AppActionMonitorComponent<T> implements OnInit {
       cellFlex: '0 0 24px'
     };
 
+    // Some obs will only ever emit once, once consumed in template this meant table never received emitted data
+    // so wrap in publish replay
+    const replayData = this.data$.pipe(
+      publishReplay(1),
+      refCount()
+    )
+
     this.allColumns = [...this.columns, monitorColumn];
     this.dataSource = {
-      connect: () => this.data$,
+      connect: () => replayData,
       disconnect: () => { },
       trackBy: (index, item) => {
         const fn = monitorColumn.cellConfig(item).getId;
@@ -117,7 +123,7 @@ export class AppActionMonitorComponent<T> implements OnInit {
           })
         );
       }
-    } as ITableListDataSource<T>;
+    };
   }
 
 
diff --git a/src/frontend/packages/core/src/shared/components/file-input/file-input.component.html b/src/frontend/packages/core/src/shared/components/file-input/file-input.component.html
index 195ae17f56..edef8e7b79 100644
--- a/src/frontend/packages/core/src/shared/components/file-input/file-input.component.html
+++ b/src/frontend/packages/core/src/shared/components/file-input/file-input.component.html
@@ -1,6 +1,6 @@
 <div class="file-input" [ngClass]="{'file-input__disabled': disabled}">
   <input [accept]="accept" type="file" (change)="onNativeInputFileSelect($event)" #inputFile hidden />
-  <mat-form-field class="file-input__form-field">
+  <mat-form-field class="file-input__form-field" *ngIf="!buttonLabel">
     <div class="file-input__field" (click)="!disabled && selectFile($event)">
       <div *ngIf="!fileCount" class="file-input__input file-input__none">No file selected</div>
       <div *ngIf="fileCount" class="file-input__input ">{{ name }}</div>
@@ -10,4 +10,5 @@
       </button>
     </div>
   </mat-form-field>
+  <button *ngIf="buttonLabel" (click)="selectFile($event)" mat-button color="primary">{{ buttonLabel }}</button>
 </div>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/file-input/file-input.component.ts b/src/frontend/packages/core/src/shared/components/file-input/file-input.component.ts
index a08b287010..b99327bd0a 100644
--- a/src/frontend/packages/core/src/shared/components/file-input/file-input.component.ts
+++ b/src/frontend/packages/core/src/shared/components/file-input/file-input.component.ts
@@ -28,8 +28,12 @@ export class FileInputComponent implements OnInit, OnDestroy {
 
   @Input() accept: string;
   @Output() onFileSelect: EventEmitter<File> = new EventEmitter();
+  @Output() onFileData: EventEmitter<string> = new EventEmitter();
+
   @Input() fileFormControlName;
 
+  @Input() buttonLabel = '';
+
   private files: File[];
 
   public name = '';
@@ -65,7 +69,9 @@ export class FileInputComponent implements OnInit, OnDestroy {
       this.onFileSelect.emit(this.files[0]);
 
       if (!!this.formGroupControl) {
-        this.handleFormControl(this.files[0]);
+        this.handleFileData(this.files[0], (value) => this.updateFileState(value));
+      } else {
+        this.handleFileData(this.files[0], (value) => this.onFileData.emit(value));
       }
       if (this.files.length > 0) {
         this.name = this.files[0].name;
@@ -79,17 +85,18 @@ export class FileInputComponent implements OnInit, OnDestroy {
     return false;
   }
 
-  handleFormControl(file) {
+  handleFileData(file, done) {
     const reader = new FileReader();
     reader.onload = () => {
-      this.updateFileState(reader.result);
+      done(reader.result);
     };
     reader.onerror = () => {
       // Clear the form and thus make it invalid on error
-      this.updateFileState(null);
+      done(null);
     };
     reader.readAsText(file);
   }
+
   private updateFileState(value: string | ArrayBuffer) {
     this.formGroupControl.control.controls[this.fileFormControlName].setValue(value);
   }
diff --git a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source-types.ts b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source-types.ts
index 4b1af3bd34..96c4b0443e 100644
--- a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source-types.ts
+++ b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source-types.ts
@@ -64,11 +64,29 @@ interface ICoreListDataSource<T> extends DataSource<T> {
   trackBy(index: number, item: T);
 }
 
-export interface ITableListDataSource<T> extends ICoreListDataSource<T> {
+interface ICoreTableListDataSource<T> extends ICoreListDataSource<T> {
+  isTableLoading$?: Observable<boolean>;
+
+  selectAllChecked?: boolean; // Select items - remove once ng-content can exist in md-table
+  selectAllIndeterminate?: boolean; // Select all checkbox as indeterminate
+  selectedRows?: Map<string, T>; // Select items - remove once ng-content can exist in md-table
+  selectedRows$?: ReplaySubject<Map<string, T>>; // Select items - remove once ng-content can exist in md-table
+  selectAllFilteredRows?: () => void; // Select items - remove once ng-content can exist in md-table
+  selectedRowToggle?: (row: T, multiMode?: boolean) => void; // Select items - remove once ng-content can exist in md-table
+  selectClear?: () => void;
+
+  editRow?: T; // Edit items - remove once ng-content can exist in md-table
+  startEdit?: (row: T) => void; // Edit items - remove once ng-content can exist in md-table
+  saveEdit?: () => void; // Edit items - remove once ng-content can exist in md-table
+  cancelEdit?: () => void; // Edit items - remove once ng-content can exist in md-table
+  getRowUniqueId?: getRowUniqueId<T>;
+}
+
+export interface ITableListDataSource<T> extends ICoreTableListDataSource<T> {
   isTableLoading$: Observable<boolean>;
 }
 
-export interface IListDataSource<T> extends ICoreListDataSource<T>, EntityCatalogEntityConfig {
+export interface IListDataSource<T> extends ICoreListDataSource<T>, ICoreTableListDataSource<T>, EntityCatalogEntityConfig {
   pagination$: Observable<PaginationEntityState>;
   isLocal?: boolean;
   localDataFunctions?: ((
@@ -94,20 +112,11 @@ export interface IListDataSource<T> extends ICoreListDataSource<T>, EntityCatalo
   filter$: Observable<ListFilter>;
   sort$: Observable<ListSort>;
 
-  editRow: T; // Edit items - remove once ng-content can exist in md-table
 
-  selectAllChecked: boolean; // Select items - remove once ng-content can exist in md-table
-  selectedRows: Map<string, T>; // Select items - remove once ng-content can exist in md-table
-  selectedRows$: ReplaySubject<Map<string, T>>; // Select items - remove once ng-content can exist in md-table
+
   getRowUniqueId: getRowUniqueId<T>;
   entitySelectConfig?: EntitySelectConfig; // For multi action lists, this is used to configure the entity select.
-  selectAllFilteredRows(); // Select items - remove once ng-content can exist in md-table
-  selectedRowToggle(row: T, multiMode?: boolean); // Select items - remove once ng-content can exist in md-table
-  selectClear();
 
-  startEdit(row: T); // Edit items - remove once ng-content can exist in md-table
-  saveEdit(); // Edit items - remove once ng-content can exist in md-table
-  cancelEdit(); // Edit items - remove once ng-content can exist in md-table
   destroy();
   /**
    * Set's data source specific text filter param
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-edit/table-cell-edit.component.html b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-edit/table-cell-edit.component.html
index 125c4a88fc..7762b74c15 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-edit/table-cell-edit.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-edit/table-cell-edit.component.html
@@ -1,11 +1,14 @@
-<div>
-  <button mat-icon-button *ngIf="row.name !== dataSource.editRow?.name" (click)="dataSource.startEdit(row)" [disabled]="(dataSource.isSelecting$ | async) || (dataSource.isAdding$ | async)">
+<div class="edit" [ngClass]="{'edit--subtle': subtle}">
+  <button mat-icon-button *ngIf="!isEditing() else editing" (click)="dataSource.startEdit(row)"
+    [disabled]="(dataSource.isSelecting$ | async) || (dataSource.isAdding$ | async)">
     <mat-icon>edit</mat-icon>
   </button>
-  <button id="table-cell-edit-done" mat-icon-button *ngIf="row.name === dataSource.editRow?.name" (click)="dataSource.saveEdit()">
-    <mat-icon>done</mat-icon>
-  </button>
-  <button id="table-cell-edit-cancel" mat-icon-button *ngIf="row.name === dataSource.editRow?.name" (click)="dataSource.cancelEdit()">
-    <mat-icon>clear</mat-icon>
-  </button>
-</div>
+  <ng-template #editing>
+    <button id="table-cell-edit-done" mat-icon-button (click)="dataSource.saveEdit()">
+      <mat-icon>done</mat-icon>
+    </button>
+    <button id="table-cell-edit-cancel" mat-icon-button (click)="dataSource.cancelEdit()">
+      <mat-icon>clear</mat-icon>
+    </button>
+  </ng-template>
+</div>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-edit/table-cell-edit.component.scss b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-edit/table-cell-edit.component.scss
index 9681b2e526..e964f6220f 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-edit/table-cell-edit.component.scss
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-edit/table-cell-edit.component.scss
@@ -1,4 +1,14 @@
-div {
+.edit {
   display: flex;
   justify-content: flex-end;
+  &--subtle {
+    .mat-icon-button {
+      font-size: 18px;
+      height: 25px;
+      line-height: 25px;
+      opacity: 60%;
+      padding-left: 5px;
+      width: 35px;
+    }
+  }
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-edit/table-cell-edit.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-edit/table-cell-edit.component.ts
index 5f38b44101..1aa4769a4f 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-edit/table-cell-edit.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-edit/table-cell-edit.component.ts
@@ -1,5 +1,6 @@
-/* tslint:disable:no-access-missing-member https://github.com/mgechev/codelyzer/issues/191*/
-import { Component, OnInit } from '@angular/core';
+import { Component, Input } from '@angular/core';
+
+import { IListDataSource } from '../../data-sources-controllers/list-data-source-types';
 import { TableCellCustom } from '../../list.types';
 
 @Component({
@@ -7,4 +8,20 @@ import { TableCellCustom } from '../../list.types';
   templateUrl: './table-cell-edit.component.html',
   styleUrls: ['./table-cell-edit.component.scss']
 })
-export class TableCellEditComponent<T> extends TableCellCustom<T> { }
+export class TableCellEditComponent<T> extends TableCellCustom<T> {
+
+  @Input()
+  row: T;
+
+  @Input()
+  dataSource: IListDataSource<T>;
+
+  @Input()
+  subtle: boolean;
+
+  isEditing(): boolean {
+    return this.dataSource.editRow ?
+      this.dataSource.getRowUniqueId(this.row) === this.dataSource.getRowUniqueId(this.dataSource.editRow) :
+      false
+  }
+}
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-header-select/table-header-select.component.html b/src/frontend/packages/core/src/shared/components/list/list-table/table-header-select/table-header-select.component.html
index c2f860861e..51c00db460 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-header-select/table-header-select.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-header-select/table-header-select.component.html
@@ -1,2 +1,3 @@
-<mat-checkbox [disabled]="(dataSource.isAdding$ | async)" [checked]="dataSource.selectAllChecked" (change)="dataSource.selectAllFilteredRows()">
-</mat-checkbox>
+<mat-checkbox [disabled]="(dataSource.isAdding$ | async)" [indeterminate]="dataSource.selectAllIndeterminate"
+  [checked]="dataSource.selectAllChecked" (change)="dataSource.selectAllFilteredRows()">
+</mat-checkbox>
\ No newline at end of file
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 be2ec31af4..b715c964f2 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 }">
+  [ngClass]="{'table-row-wrapper__blocked': isBlocked$ | async, 'table-row-wrapper__info': inInfoState$ | 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>
@@ -7,7 +7,7 @@
     </div>
   </div>
   <div role="row" class="table-row"
-    [ngClass]="{'in-expanded-row': !!inExpandedRow, 'has-expanded-row': expandComponent}">
+    [ngClass]="{'in-expanded-row': !!inExpandedRow, 'has-expanded-row': expandComponent, 'has-error-row': errorMessage$ | async}">
     <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]"
@@ -23,8 +23,12 @@
     </div>
   </div>
   <div class="table-row__error mat-row" *ngIf="errorMessage$ | async">
-    <mat-icon class="table-row__error-icon">warning</mat-icon>
-    <div class="table-row__error-message" [innerHTML]="errorMessage$ | async">
+    <div [ngClass]="{'table-row table-row__error-spacer__prominentErrorBar': prominentErrorBar}"
+      class="table-row  table-row table-row__error-spacer"></div>
+    <div class="table-row table-row__error-content">
+      <mat-icon *ngIf="isWarningIcon$ | async" class="table-row__error-icon">warning</mat-icon>
+      <mat-icon *ngIf="!(isWarningIcon$ | async)" class="table-row__error-icon">info</mat-icon>
+      <div class="table-row__error-message" [innerHTML]="errorMessage$ | async"></div>
     </div>
   </div>
 </div>
\ No newline at end of file
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 06621f3b97..535edff498 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
@@ -16,7 +16,8 @@
     }
   }
   &__errored,
-  &__warning {
+  &__warning,
+  &__info {
     .table-row__error {
       display: flex;
     }
@@ -64,14 +65,23 @@
   &__error {
     align-items: center;
     display: none;
+
     &-message {
       flex: 1;
       line-height: 20px;
-      margin: 15px 36px;
+      margin-left: 10px;
       text-align: left;
     }
-    &-icon {
-      padding-left: 24px;
+    &-spacer {
+      align-self: stretch;
+      flex: 0 0 20px;
+      &__prominentErrorBar {
+        flex: 0 0 68px;
+      }
+    }
+    &-content {
+      flex: 1;
+      padding: 0 10px 10px 0;
     }
   }
   &__blocker {
@@ -93,6 +103,7 @@
     }
 
     .table-row__inner__expansion.mat-expansion-panel {
+      border-radius: unset;
       width: 100%;
 
       .table-row__inner__expansion--header {
@@ -108,4 +119,9 @@
   &.in-expanded-row {
     border-left-width: 1px;
   }
+
+  &.has-error-row {
+    // Remove the bottom border if there's an error underneath it
+    border-bottom-width: 0;
+  }
 }
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 0ac4538dad..07be004cb3 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
@@ -2,6 +2,7 @@
   $status-colors: map-get($app-theme, status);
   $error-color: map-get($status-colors, danger);
   $warn-color: map-get($status-colors, warning);
+  $info-color: map-get($status-colors, info);
   $text-color: map-get($status-colors, text);
   $primary: map-get($theme, primary);
   $primary-color: mat-color($primary);
@@ -22,26 +23,24 @@
   }
   .table-row-wrapper {
     &__errored {
-      .table-row {
-        background-color: transparentize($error-color, .9);
-      }
-      .table-row__error {
-        background-color: $error-color;
-        color: $text-color;
-      }
-      .table-row__error-message {
-        a {
-          color: $text-color;
+      .table-row__error-content {
+        mat-icon {
+          color: $error-color;
         }
       }
     }
     &__warning {
-      .table-row {
-        background-color: transparentize($warn-color, .9);
+      .table-row__error-content {
+        mat-icon {
+          color: $warn-color;
+        }
       }
-      .table-row__error {
-        background-color: $warn-color;
-        color: $text-color;
+    }
+    &__info {
+      .table-row__error-content {
+        mat-icon {
+          color: $info-color;
+        }
       }
     }
     &__highlighted {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.ts
index 1c3c08d120..2c8325d488 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.ts
@@ -38,13 +38,16 @@ export class TableRowComponent<T = any> extends CdkRow implements OnInit {
   @Input() minRowHeight: string;
   @Input() inExpandedRow: boolean;
   @Input() rowId: string;
+  @Input() prominentErrorBar: boolean;
 
   public inErrorState$: Observable<boolean>;
   public inWarningState$: Observable<boolean>;
+  public inInfoState$: Observable<boolean>;
   public errorMessage$: Observable<string>;
   public isBlocked$: Observable<boolean>;
   public isHighlighted$: Observable<boolean>;
   public isDeleting$: Observable<boolean>;
+  public isWarningIcon$: Observable<boolean>;
   public defaultMinRowHeight = '50px';
 
   private expandedComponentRef: ComponentRef<any>;
@@ -64,6 +67,9 @@ export class TableRowComponent<T = any> extends CdkRow implements OnInit {
       this.inWarningState$ = this.rowState.pipe(
         map(state => state.warning)
       );
+      this.inInfoState$ = this.rowState.pipe(
+        map(state => state.info)
+      );
       this.errorMessage$ = this.rowState.pipe(
         map(state => state.message)
       );
@@ -76,6 +82,9 @@ export class TableRowComponent<T = any> extends CdkRow implements OnInit {
       this.isDeleting$ = this.rowState.pipe(
         map(state => state.deleting)
       );
+      this.isWarningIcon$ = this.rowState.pipe(
+        map(state => state.error || state.warning)
+      );
     }
 
     // Ensure we 'register' with the expander service. This also helps with page changes
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table.component.html b/src/frontend/packages/core/src/shared/components/list/list-table/table.component.html
index 4bd2ce8004..fe4fa52887 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table.component.html
@@ -37,7 +37,7 @@
         </mat-header-row>
         <app-table-row class="app-table__row" *matRowDef="let row; columns: columnNames;" [rowState]="getRowState(row)"
           [row]="row" [expandComponent]="expandComponent" [inExpandedRow]="inExpandedRow" [minRowHeight]="minRowHeight"
-          [rowId]="dataSource.trackBy(null, row)">
+          [rowId]="dataSource.trackBy(null, row)" [prominentErrorBar]="prominentErrorBar">
         </app-table-row>
       </mat-table>
     </mat-card-content>
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 8c2db26e14..c2dc1fe36a 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
@@ -5,7 +5,6 @@
 mat-cell,
 mat-header-cell {
   flex: 1 1 200px;
-  padding: 10px;
 
   app-table-cell {
     width: 100%;
@@ -88,6 +87,19 @@ mat-header-cell {
       }
     }
 
+    &--table-centred {
+      app-table-cell {
+        align-items: center;
+        display: flex;
+        justify-content: center;
+        text-align: center;
+      }
+    }
+
+    &--table-no-v-padding {
+      padding: 0 10px 0 0;
+    }
+
     &--table-column-additional-padding {
       app-table-cell {
         padding-left: 15px;
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table.component.ts
index 10f0637f6a..ab1af731f3 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table.component.ts
@@ -64,6 +64,7 @@ export class TableComponent<T> implements OnInit, OnDestroy {
   public columnNames: string[];
 
   @Input() minRowHeight: string;
+  @Input() prominentErrorBar: boolean = true;
 
   ngOnInit() {
     if (this.addSelect || this.expandComponent || this.addActions) {
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index d5ab5af42e..b7cc5252d8 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -47,6 +47,7 @@ import { MetaCardItemComponent } from './components/list/list-cards/meta-card/me
 import { MetaCardKeyComponent } from './components/list/list-cards/meta-card/meta-card-key/meta-card-key.component';
 import { MetaCardTitleComponent } from './components/list/list-cards/meta-card/meta-card-title/meta-card-title.component';
 import { MetaCardValueComponent } from './components/list/list-cards/meta-card/meta-card-value/meta-card-value.component';
+import { TableCellEditComponent } from './components/list/list-table/table-cell-edit/table-cell-edit.component';
 import {
   TableCellRequestMonitorIconComponent,
 } from './components/list/list-table/table-cell-request-monitor-icon/table-cell-request-monitor-icon.component';
@@ -310,7 +311,8 @@ import { UserPermissionDirective } from './user-permission.directive';
     SidepanelPreviewComponent,
     TableCellEndpointNameComponent,
     CardProgressOverlayComponent,
-    MaxListMessageComponent
+    MaxListMessageComponent,
+    TableCellEditComponent
   ],
   entryComponents: [
     DialogConfirmComponent,
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 7205f8ff23..7f29f7a188 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
@@ -67,6 +67,7 @@ export interface IStratosBaseEntityDefinition<T = EntitySchema | EntityCatalogSc
   readonly type?: string;
   readonly schema: T;
   readonly label?: string;
+  readonly labelShort?: string;
   readonly labelPlural?: string;
   readonly renderPriority?: number;
   /**
@@ -77,6 +78,7 @@ export interface IStratosBaseEntityDefinition<T = EntitySchema | EntityCatalogSc
   readonly subTypes?: Omit<IStratosBaseEntityDefinition, 'schema' | 'subTypes'>[];
   readonly paginationConfig?: PaginationPageIteratorConfig;
   readonly tableConfig?: EntityTableConfig<any>;
+  readonly registrationComponent?: any;
   /**
    * Hook that will fire before an entity is emitted by an entity service. This could be used, for example, entity validation
    */
diff --git a/src/frontend/packages/store/src/reducers/api-request-reducer/fail-request.ts b/src/frontend/packages/store/src/reducers/api-request-reducer/fail-request.ts
index b62fee8a48..1a3826a515 100644
--- a/src/frontend/packages/store/src/reducers/api-request-reducer/fail-request.ts
+++ b/src/frontend/packages/store/src/reducers/api-request-reducer/fail-request.ts
@@ -26,8 +26,8 @@ export function failRequest(state, action: IFailedRequestAction) {
       busy: false,
       deleted: false,
       error: true,
+      message: action.message
     };
-    requestFailedState.message = action.message;
   } else {
     requestFailedState.fetching = false;
     requestFailedState.error = true;
diff --git a/src/frontend/packages/store/src/reducers/api-request-reducer/types.ts b/src/frontend/packages/store/src/reducers/api-request-reducer/types.ts
index 8b514a0c4a..0f1b724a3e 100644
--- a/src/frontend/packages/store/src/reducers/api-request-reducer/types.ts
+++ b/src/frontend/packages/store/src/reducers/api-request-reducer/types.ts
@@ -14,6 +14,14 @@ export interface ActionState {
   message: string;
 }
 
+// Status of an action
+export interface ActionStatus {
+  busy: boolean;
+  error: boolean;
+  message?: string;
+  completed: boolean;
+}
+
 /**
  * Multi action lists can have different entity types per page
  * We use schemaKey to track this type
diff --git a/src/frontend/packages/store/src/selectors/api.selectors.ts b/src/frontend/packages/store/src/selectors/api.selectors.ts
index 4aecb698d7..b1eaa34938 100644
--- a/src/frontend/packages/store/src/selectors/api.selectors.ts
+++ b/src/frontend/packages/store/src/selectors/api.selectors.ts
@@ -1,8 +1,8 @@
 import { compose } from '@ngrx/store';
 
+import { GeneralEntityAppState, IRequestEntityTypeState as IRequestEntityKeyState, IRequestTypeState } from '../app-state';
 import { EntityCatalogHelpers } from '../entity-catalog/entity-catalog.helper';
 import { EntityCatalogEntityConfig } from '../entity-catalog/entity-catalog.types';
-import { GeneralEntityAppState, IRequestEntityTypeState as IRequestEntityKeyState, IRequestTypeState } from '../app-state';
 import { ActionState, RequestInfoState, UpdatingSection } from '../reducers/api-request-reducer/types';
 import { APIResource } from '../types/api.types';
 
@@ -31,7 +31,7 @@ export const getEntityUpdateSections = (
 export const getUpdateSectionById = (guid: string) => (
   updating
 ): ActionState => {
-  return updating[guid];
+  return updating ? updating[guid] : null;
 };
 
 export function selectUpdateInfo(
diff --git a/src/jetstream/default.config.properties b/src/jetstream/default.config.properties
index e45f461d9d..2a430adb51 100644
--- a/src/jetstream/default.config.properties
+++ b/src/jetstream/default.config.properties
@@ -47,8 +47,8 @@ INVITE_USER_CLIENT_SECRET=
 
 # Use local admin user rather than UAA users
 # AUTH_ENDPOINT_TYPE=local
-# LOCAL_USER=localuser
-# LOCAL_USER_PASSWORD=localuserpass
+# LOCAL_USER=admin
+# LOCAL_USER_PASSWORD=admin
 # LOCAL_USER_SCOPE=stratos.admin
 
 # MariaDB database for local dev
diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index 0ed9278022..4556391650 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -4,8 +4,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"net/http"
 	"net/url"
 	"strconv"
+	"strings"
 
 	"errors"
 
@@ -135,7 +137,7 @@ func (c *KubernetesSpecification) Init() error {
 }
 
 func (c *KubernetesSpecification) AddAdminGroupRoutes(echoGroup *echo.Group) {
-	// no-op
+	echoGroup.GET("/kube/cert", c.RequiresCert)
 }
 
 func (c *KubernetesSpecification) AddSessionGroupRoutes(echoGroup *echo.Group) {
@@ -242,3 +244,31 @@ func parseErrorResponse(body []byte) error {
 
 func (c *KubernetesSpecification) UpdateMetadata(info *interfaces.Info, userGUID string, echoContext echo.Context) {
 }
+
+func (c *KubernetesSpecification) RequiresCert(ec echo.Context) error {
+	url := ec.QueryParam("url")
+
+	log.Debug("Request Kube API Versions")
+	var httpClient = c.portalProxy.GetHttpClient(false)
+	_, err := httpClient.Get(url + "/api")
+	var response struct {
+		Status   int
+		Required bool
+		Error    bool
+		Message  string
+	}
+	if err != nil {
+		if strings.Contains(err.Error(), "x509: certificate") {
+			response.Status = http.StatusOK
+			response.Required = true
+		} else {
+			response.Status = http.StatusInternalServerError
+			response.Error = true
+			response.Message = fmt.Sprintf("Failed to validate Kube certificate requirement: %+v", err)
+		}
+	} else {
+		response.Status = http.StatusOK
+		response.Required = false
+	}
+	return ec.JSON(response.Status, response)
+}
diff --git a/src/test-e2e/endpoints/register-dialog.po.ts b/src/test-e2e/endpoints/register-dialog.po.ts
index 30e52790e7..44423a0d97 100644
--- a/src/test-e2e/endpoints/register-dialog.po.ts
+++ b/src/test-e2e/endpoints/register-dialog.po.ts
@@ -18,7 +18,7 @@ export class RegisterStepper extends Page {
   }
 
   isRegisterDialog(): promise.Promise<boolean> {
-    return this.header.getTitleText().then(title => title === 'Register a new Endpoint');
+    return this.header.getTitleText().then(title => title === 'Register Endpoint');
   }
 
   getName = () => this.form.getFormField('name');

From cd0d6d6be53ceb8f6d9b0f57aa602aea15ce1d8a Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Fri, 26 Jun 2020 11:41:06 +0100
Subject: [PATCH 551/648] Fix dev helper script

---
 build/tools/kube-terminal-dev.sh | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/build/tools/kube-terminal-dev.sh b/build/tools/kube-terminal-dev.sh
index 2ec5c69c3d..ce1ab1549e 100755
--- a/build/tools/kube-terminal-dev.sh
+++ b/build/tools/kube-terminal-dev.sh
@@ -22,24 +22,27 @@ sed -i.bak '/\s*app\.kubernetes\.io\/version/d' $TEMPFILE
 sed -i.bak '/\s*app\.kubernetes\.io\/instance/d' $TEMPFILE
 sed -i.bak '/\s*{{-/d' $TEMPFILE
 
-kubectl apply -f $TEMPFILE
+# Create a namespace
+NS="stratos-dev"
+kubectl get ns $NS > /dev/null 2>&1
+if [ $? -ne 0 ]; then
+  kubectl create ns $NS
+fi
+
+kubectl apply -n $NS -f $TEMPFILE
+USER=stratos-dev-admin-user
+USER=stratos
 
 # Service account should be created - now need to get token
-SECRET=$(kubectl get sa stratos -o json | jq -r '.secrets[0].name')
-TOKEN=$(kubectl get secret $SECRET -o json | jq -r '.data.token')
+SECRET=$(kubectl get -n $NS sa $USER -o json | jq -r '.secrets[0].name')
+TOKEN=$(kubectl get -n $NS secret $SECRET -o json | jq -r '.data.token')
 echo "Token secret: $SECRET"
+TOKEN=$(echo $TOKEN | base64 -d -)
 echo "Token         $TOKEN"
 
 rm -f $TEMPFILE
 rm -f $TEMPFILE.bak
 
-# Create a namespace
-NS="stratos-dev"
-kubectl get ns $NS > /dev/null
-if [ $? -ne 0 ]; then
-  kubectl create ns $NS
-fi
-
 CFG=${STRATOS_DIR}/src/jetstream/config.properties
 touch $CFG
 

From 4c206ad49612fccd897ae7e45f05d6baf277ca6e Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Fri, 26 Jun 2020 14:41:23 +0100
Subject: [PATCH 552/648] Address PR feedback

---
 .../plugins/kubernetes/terminal/cleanup.go         | 14 ++++++++------
 src/jetstream/plugins/kubernetes/terminal/start.go |  3 ---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/terminal/cleanup.go b/src/jetstream/plugins/kubernetes/terminal/cleanup.go
index d1d50aa559..621921e1e5 100644
--- a/src/jetstream/plugins/kubernetes/terminal/cleanup.go
+++ b/src/jetstream/plugins/kubernetes/terminal/cleanup.go
@@ -22,6 +22,8 @@ func (k *KubeTerminal) cleanup() {
 	// Use a random initial wait before cleaning up
 	// If we had more than one backend, this helps to ensure they are not all trying to cleanup at the same time
 	wait := rand.Intn(30)
+	log.Debug("Kubernetes Terminal cleanup will start in %d minutes", wait)
+
 	for {
 		time.Sleep(time.Duration(wait) * time.Minute)
 		log.Debug("Cleaning up stale Kubernetes Terminal pods and secrets ...")
@@ -35,7 +37,7 @@ func (k *KubeTerminal) cleanup() {
 			pods, err := podClient.List(options)
 			if err == nil {
 				for _, pod := range pods.Items {
-					if sessionID, ok := pod.Annotations["stratos-session"]; ok {
+					if sessionID, ok := pod.Annotations[stratosSessionAnnotation]; ok {
 						i, err := strconv.Atoi(sessionID)
 						if err == nil {
 							isValid, err := k.PortalProxy.GetSessionDataStore().IsValidSession(i)
@@ -55,7 +57,7 @@ func (k *KubeTerminal) cleanup() {
 			secrets, err := secretClient.List(options)
 			if err == nil {
 				for _, secret := range secrets.Items {
-					if sessionID, ok := secret.Annotations["stratos-session"]; ok {
+					if sessionID, ok := secret.Annotations[stratosSessionAnnotation]; ok {
 						i, err := strconv.Atoi(sessionID)
 						if err == nil {
 							isValid, err := k.PortalProxy.GetSessionDataStore().IsValidSession(i)
@@ -67,13 +69,13 @@ func (k *KubeTerminal) cleanup() {
 					}
 				}
 			} else {
-				log.Debug("Kube Terminal Cleanup: Could not get secrets")
-				log.Debug(err)
+				log.Warn("Kube Terminal Cleanup: Could not get secrets")
+				log.Warn(err)
 			}
 
 		} else {
-			log.Debug("Kube Terminal Cleanup: Could not get clients")
-			log.Debug(err)
+			log.Warn("Kube Terminal Cleanup: Could not get clients")
+			log.Warn(err)
 		}
 
 		wait = waitPeriod
diff --git a/src/jetstream/plugins/kubernetes/terminal/start.go b/src/jetstream/plugins/kubernetes/terminal/start.go
index d0ac6ac276..63c90fe519 100644
--- a/src/jetstream/plugins/kubernetes/terminal/start.go
+++ b/src/jetstream/plugins/kubernetes/terminal/start.go
@@ -26,7 +26,6 @@ var upgrader = websocket.Upgrader{
 	CheckOrigin: func(r *http.Request) bool { return true },
 }
 
-
 // KeyCode - JSON object that is passed from the front-end to notify of a key press or a term resize
 type KeyCode struct {
 	Key  string `json:"key"`
@@ -103,11 +102,9 @@ func (k *KubeTerminal) Start(c echo.Context) error {
 	// API Endpoint to SSH/exec into a container
 	target := fmt.Sprintf("%s/api/v1/namespaces/%s/pods/%s/exec?command=/bin/bash&stdin=true&stderr=true&stdout=true&tty=true", k.APIServer, k.Namespace, podData.PodName)
 
-	// This dialer does not use the kubeHttpClient  - is it unused?
 	dialer := &websocket.Dialer{
 		TLSClientConfig: &tls.Config{
 			InsecureSkipVerify: true,
-			//Certificates:       []tls.Certificate{cert},
 		},
 	}
 

From 0bb99986c43ad0e81778945f96c814f035f288d8 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Mon, 29 Jun 2020 10:20:40 +0100
Subject: [PATCH 553/648] Merge upstream (#400)

* WIP

* Add theme migration

* File moves

* WIP

* Add theme migration

* Start to make core a separate library

* Tweaks

* WIP

* Fix package imports

* Fix migration script

* First pass at permission effects

* Fix merge issues

* First pass at reducer

* Tidy up logging

* Fix dark theme support

* Final set of cloud-foundry code out of common

* TIdy up and get themable packages working

* Tidy up custom build code

* Tidy ups

* Set defaults when no stratos.yaml file is present

* FIx migrate script for when stratos.yaml not present

* Remove comments

* Disable scss linter from code climate

* Rejig example extensions to be a package for v4 build

* Renames, todos

* Minor fixes

* Fix frontend unit test

* Fix removed e2e target

* Fix unit tests

* Tweaks

* Finish todos

* Fix transition from space summary to app summary page
- an entity service for a space with no org was cached by guid
- an entity service for a space requiring org used cached version
- solution is to make cache id include schema key (determines with/without org)

* Add comment, tidy up rootUpdatingKey

* Fix issue where gitlab summary tab threw errors in console
- fixes #4325

* Push combine of permission configs into checkers
- overcomes some weird change of permission type

* Fix issue where default add/remove setting in change role by username was incorrect
- add/remove radio button default value governed by add/remove feature flags
- when one is set to false the radio button should be disabled and the other selected

* Fix store-test-helper

* Update readme following move to Travis-ci.com

* Ensure the correct key is used metacard favourite info (#4321)

* Fix display of details in endpoint card in endpoint list (#4319)

* Clean default/blocked logic

* Rename @stratos to @stratosui

* FIx references in tsconfig.json

* Revert change to @stratosui in code

* Revert change to @stratosui in code

* Fix endpoint connect

* Fix unit test

* Fix e2e test

* Change following review #1

* Bump github.com/gorilla/websocket from 1.4.1 to 1.4.2 in /src/jetstream (#4199)

* Bump github.com/gorilla/websocket from 1.4.1 to 1.4.2 in /src/jetstream

Bumps [github.com/gorilla/websocket](https://github.com/gorilla/websocket) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/gorilla/websocket/releases)
- [Commits](https://github.com/gorilla/websocket/compare/v1.4.1...v1.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Update go.sum

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>

* Fix errors in console log during setup screens

* Helm: Change default image pull policy to Always

* Add copy address and edit to endpoint list view

* Use icon that is less confusing with refresh

* Change following review #2
- Fix cf package module file name
- Make CUSTOM_USER_PERMISSION_CHECKERS optional
- Remove need to inject CUSTOM_USER_PERMISSION_CHECKERS in multiple cf modules

* Add newline at end for codeclimate

* Tidy up code and add some more comments

* Fix for buildpack filename wrapping on card

* Fix code climate issue

* Fix compilation issues

* Update endpoint-list.helpers.ts

* Improve naming

* Tidy up

* Update .gitignore

* Tidy up. Build tools in dist/tools

* Change following review

* Rename tools to devkit. Add schematics

* More improvements and theme schematic added.

* Bump gopkg.in/yaml.v2 from 2.2.8 to 2.3.0 in /src/jetstream (#4336)

* Bump gopkg.in/yaml.v2 from 2.2.8 to 2.3.0 in /src/jetstream

Bumps [gopkg.in/yaml.v2](https://github.com/go-yaml/yaml) from 2.2.8 to 2.3.0.
- [Release notes](https://github.com/go-yaml/yaml/releases)
- [Commits](https://github.com/go-yaml/yaml/compare/v2.2.8...v2.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* CI bump

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil_macdougall@hotmail.com>

* Remove unused import

* Remove unused import

* [Security] Bump websocket-extensions from 0.1.3 to 0.1.4 (#4356)

Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. **This update includes a security fix.**
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Hide deployment info card if not space developer
- fixes #4322

* Only space developers can create/unmap/delete routes in app routes table
- fixes #4324

* Only Space Developers should be able to change count, terminate or ssh to instances
- fixes #4330

* Permissions: Only Space Developers should be able to create/edit/delete an Autoscaler policy
- fixes #4323

* Users with no developer roles could click on add app button
- fixes #4361

* Fix tests

* Fail CI build if imagelist generation fails

* Org Managers: Disable org role checkboxes in roles stepper if not admin/org manager
- fixes #4332

* Routes List: Filter by org breaks when user is an org auditor
- fixes #4343

* Rename the e2e cf helper file

* Fix autoscaler tab

* Changes following review

* A few minor tidy-ups to help with review

* Fix several space developer permission bugs (#4362)

* Hide deployment info card if not space developer
- fixes #4322

* Only space developers can create/unmap/delete routes in app routes table
- fixes #4324

* Only Space Developers should be able to change count, terminate or ssh to instances
- fixes #4330

* Permissions: Only Space Developers should be able to create/edit/delete an Autoscaler policy
- fixes #4323

* Users with no developer roles could click on add app button
- fixes #4361

* Fix tests

* Fix autoscaler tab

* Changes following review

* Fix service stepper navigation (#4366)

* Fix service stepper navigation on create/edit cancel/sumbit
- create service stepper from app service tab, marketplace service summary, service wall
- edit service stepper from marketplace service instances, service wall instances, space service instances and app service instances lists
- fixes #4052, contrinbutes to #4079, #4051

* Fix subscription leak
- fixes #4295
- code no-longer needed

* Force return location of service stepper, fix table edit of upsi and other improvements

* Fix unit tests

* Fix e2e tests

* Fix e2e tests, add search to marketplace service instances table

* Changes following review

* Move base-entity-* to store package

* Add snackbar

* Remove pathget

* Remove more store -> core dependencies

* Move extension-types to store

* Move favourite mgr and helper from core to store

* Move user fav manager and helper to store package

* More references

* Fix logger service removal

* Fix build

* Address PR feedback

* Fix LoggerService after code moves

* Fix logger service ref

* Fix build issues

* Fix health check import

* Move sortStringify (only used once)

* NonOptionalKeys - only used once

* Move KnownKeys

* Move BrowserStandardEncoder

* Remove last environment link

* Move favourite config mapper

* Remove dependency on StratosScopeStrings

* Move BaseEndpointAuth

* Move StratosTheme

* Move ThemeService

* Move types from utils.service that are only used once in store

* Move PermissionValues

* Move http and jetstream helpers

* Move StyleService

* Move MetricQueryType

* Move getFullEndpointApiUrl

* Move StratosStatus

* Move generateStratosEntities back to core

* Finish store -> core sep

* Address PR feedback

* Fix compilation issue

* Fix merge weirdness

* Merge downstream (#4369)

* src based changes

* changes to ./build

* ./docs

* ./

* Changes following review

* Address PR feedback

* fix build

* whitespace changes

* Fix in core public-api after merge

* Fix duplicated k8s docs

* Typed access to actions and entities via catalog entity: Core Stratos Entities (#4387)

* WIP

* WIP

* WIP

* Endpoint changes

* Fix failure handling during connect on stepper

* Fix favourites

* Removed some TODOs

* Fixes & todos

* Unit test fixes

* Fixes following merge

* Fix cf unit tests

* Changes following review

* Theming improvements for header

* Tweaks, Migration Script Docs & Notes on others (#4389)

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

* Build devkit outside of dist folder

* Ignore example packages when there's a stratos config file

* Add dist-devkit to git ignore

* Changes following review

* Revert change needed downstream... (only needed when suse extension is included)

* Fix after merge

Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil_macdougall@hotmail.com>
---
 .codeclimate.yml                              |   2 +-
 .gitignore                                    |  10 +-
 CHANGELOG.md                                  |   8 +-
 angular.json                                  | 101 +++--
 build/customize-build.js                      | 316 --------------
 build/fe-build.js                             |   3 -
 build/tools/v4-migration/migrate.sh           | 156 +++++++
 .../tools/v4-migration/templates/_index.scss  |   9 +
 .../v4-migration/templates/ext.package.json   |   6 +-
 .../v4-migration/templates/public-api.ts_     |   3 +
 .../v4-migration/templates/theme.package.json |  19 +
 deploy/cloud-foundry/build.sh                 |   1 -
 deploy/kubernetes/README.md                   | 398 +-----------------
 .../packages/backend/pre_packaging            |   1 -
 .../packages/frontend/pre_packaging           |   1 -
 docs/customizing.md                           |  35 +-
 package-lock.json                             | 223 ++++++++--
 package.json                                  |  22 +-
 .../cf-autoscaler/src/cf-autoscaler.module.ts |   3 +-
 .../src/core/autoscaler.module.ts             |   7 -
 ...autoscaler-tab-extension.component.spec.ts |   6 +-
 .../autoscaler-tab-extension.component.ts     |  47 ++-
 ...p-autoscaler-events-config.service.spec.ts |   9 -
 ...cf-app-autoscaler-events-config.service.ts |   3 +-
 ...scaler-metric-chart-list-config.service.ts |   3 +-
 .../src/store/autoscaler-entity-factory.ts    |   4 +-
 .../src/store/autoscaler-entity-generator.ts  |   2 +-
 .../src/store/autoscaler.effects.ts           |   2 +-
 .../packages/cloud-foundry/package.json       |   4 +
 .../cloud-foundry/sass/_all-theme.scss        |  12 +
 .../src/actions/cf-event.actions.ts           |   4 +-
 .../src/actions/cf-metrics.actions.ts         |   2 +-
 .../src/actions/domains.actions.ts            |   4 +-
 .../src/actions/feature-flags.actions.ts      |   4 +-
 .../cloud-foundry/src/actions/stack.action.ts |   4 +-
 .../actions/user-provided-service.actions.ts  |   4 +-
 .../src/actions/users.actions.ts              |   4 +-
 .../cloud-foundry/src/cf-entity-factory.ts    |  36 +-
 .../cloud-foundry/src/cf-entity-generator.ts  |  22 +-
 .../cloud-foundry/src/cf-error-helpers.ts     |   2 +-
 .../cloud-foundry/src/cf-favorites-helpers.ts |   2 +-
 .../src/cloud-foundry-test.module.ts          |   2 +-
 .../entity-relations-list.spec.ts             |   3 +-
 .../entity-relations.tree.spec.ts             |   2 +-
 .../application-delete.component.spec.ts      |   9 -
 ...te-instances-routes-list-config.service.ts |   4 +-
 .../delete-app-instances.component.spec.ts    |   9 -
 .../delete-app-routes.component.spec.ts       |   9 -
 .../applications/application.service.spec.ts  |   9 -
 .../applications/application.service.ts       |  28 +-
 .../application/application-base.component.ts |  24 +-
 .../application-poll.component.spec.ts        |   9 -
 .../application-polling.service.ts            |  15 +-
 .../application-tabs-base.component.spec.ts   |   9 -
 .../application-tabs-base.component.ts        |  15 +-
 .../tabs/build-tab/build-tab.component.html   |   7 +-
 .../build-tab/build-tab.component.spec.ts     |   9 +-
 .../tabs/build-tab/build-tab.component.ts     |  39 +-
 .../log-stream-tab.component.spec.ts          |   9 -
 .../metrics-tab/metrics-tab.component.spec.ts |   9 -
 .../cli-info-application.component.spec.ts    |   9 -
 .../cli-info-application.component.ts         |  13 +-
 .../edit-application.component.spec.ts        |   9 -
 .../create-organization-step.component.ts     |   4 +-
 .../features/cloud-foundry/cf-cell.helpers.ts |   2 +-
 .../src/features/cloud-foundry/cf.helpers.ts  |  10 +-
 .../cli-info-cloud-foundry.component.ts       |   2 +-
 .../cloud-foundry-tabs-base.component.ts      |   2 +-
 .../edit-organization-step.component.ts       |   4 +-
 .../quota-definition-form.component.ts        |   4 +-
 .../cloud-foundry-endpoint.service.ts         |  19 +-
 .../services/cloud-foundry-org-space-quota.ts |   2 +-
 .../cloud-foundry-organization-quota.ts       |   2 +-
 .../services/cloud-foundry-space-quota.ts     |   2 +-
 .../space-quota-definition-form.component.ts  |   4 +-
 .../space-quota-definition.component.spec.ts  |   4 +-
 .../cloud-foundry-cell-base.component.ts      |   2 +-
 .../cloud-foundry-cell-charts.component.ts    |   3 +-
 ...oud-foundry-cell-summary.component.spec.ts |   2 +-
 .../cloud-foundry-cell-summary.component.ts   |   2 +-
 .../cloud-foundry-cell.service.ts             |   3 +-
 ...oud-foundry-organization-base.component.ts |   6 +-
 .../cloud-foundry-space-base.component.ts     |   6 +-
 .../user-invites/user-invite.service.ts       |   7 +-
 .../users/manage-users/cf-roles.service.ts    |   4 +-
 .../service-tabs-base.component.html          |   6 +-
 .../service-tabs-base.component.ts            |  33 +-
 .../service-catalog/services-helper.ts        |   2 +-
 .../service-catalog/services.service.ts       |   4 +-
 .../services-wall.component.html              |   2 +-
 .../services-wall/services-wall.component.ts  |   6 +
 .../services/services-wall.service.ts         |   4 +-
 .../packages/cloud-foundry/src/public_api.ts  |   2 +
 .../src/shared/cf-shared.module.ts            |   6 +-
 ...-service-instance-base-step.component.html |   2 +-
 ...dd-service-instance-base-step.component.ts |  34 +-
 .../add-service-instance/csi-mode.service.ts  |  51 ++-
 .../select-plan-step.component.ts             |   2 +-
 .../specify-details-step.component.ts         |  18 +-
 ...specify-user-provided-details.component.ts |  26 +-
 .../application-instance-chart.component.html |   0
 .../application-instance-chart.component.scss |   0
 ...plication-instance-chart.component.spec.ts |   8 +-
 .../application-instance-chart.component.ts   |  15 +-
 .../card-app-instances.component.html         |  39 +-
 .../card-app-instances.component.ts           |  24 +-
 .../card-app-status.component.ts              |   2 +-
 .../card-app-usage.component.ts               |   2 +-
 .../compact-app-card.component.ts             |   2 +-
 .../card-cf-space-details.component.ts        |   7 +-
 .../cf-role-checkbox.component.ts             |   3 +-
 .../cf-app-instances-config.service.spec.ts   |   9 -
 .../cf-app-instances-config.service.ts        |  28 +-
 .../table-cell-cf-cell.component.ts           |   2 +-
 .../cf-app-routes-list-config.service.ts      |  20 +-
 .../app-service-binding-card.component.ts     |  14 +-
 ...app-service-binding-list-config.service.ts |  16 +-
 ...-app-variables-list-config.service.spec.ts |   9 -
 .../list-types/app/card/card-app.component.ts |   8 +-
 .../cf-buildpacks-data-source.ts              |   4 +-
 .../cf-cell-apps-list-config.service.ts       |   5 +-
 .../cf-cell-apps/cf-cell-apps-source.ts       |  22 +-
 .../cf-endpoints/cf-endpoints-data-source.ts  |   4 +-
 .../cf-org-card/cf-org-card.component.ts      |  14 +-
 .../cf-quotas-data-source.service.ts          |   9 +-
 .../cf-security-groups-data-source.ts         |   4 +-
 .../cf-service-instances-list-config.base.ts  |  21 +-
 .../cf-services/cf-services-data-source.ts    |   4 +-
 .../cf-user-service-instances-list-config.ts  |   8 +-
 .../cf-space-quotas-data-source.service.ts    |  10 +-
 ...s-service-instances-list-config.service.ts |   8 +-
 .../cf-space-card/cf-space-card.component.ts  |  14 +-
 .../table-cell-org-space-role.component.html  |   1 +
 .../service-instances-data-source.ts          |   1 +
 .../service-instances-list-config.service.ts  |  16 +-
 .../service-instance-card.component.ts        |  13 +-
 ...vice-instances-wall-list-config.service.ts |   8 +-
 ...rovided-service-instance-card.component.ts |  13 +-
 .../service-plan-public.component.spec.ts     |   2 +-
 .../service-plan-public.component.ts          |   2 +-
 .../shared/data-services/cf-user.service.ts   |   4 +-
 .../data-services/cloud-foundry.service.ts    |  12 +-
 .../long-running-cf-op.service.ts             |  19 +-
 .../services/application-state.service.ts     |   2 +-
 .../services/cf-org-space-label.service.ts    |   5 +-
 .../current-user-permissions.service.spec.ts  |   6 +-
 .../src/store/reducers/cf-users.reducer.ts    |   3 +-
 .../cf-current-user-role.selectors.ts         |   2 +-
 .../cf-user-permissions-checkers.ts           |   4 +-
 .../user-permissions/cf-user-roles-fetch.ts   |   7 +-
 .../application-service-helper.ts             |   7 +-
 .../test-framework/cf-test-helper.ts          |   2 +-
 .../cloud-foundry-endpoint-service.helper.ts  |   2 +-
 .../packages/core/endpoints-health-checks.ts  |  13 +-
 .../misc/custom/custom-src-routing.module.ts_ |  21 -
 .../core/misc/custom/custom-src.module.ts_    |  16 -
 .../packages/core/misc/custom/custom.scss     |   5 -
 .../packages/core/misc/custom/custom.yaml     |  14 -
 .../packages/core/misc/custom/eula.html       |   7 -
 src/frontend/packages/core/ng-package.json    |   7 +
 src/frontend/packages/core/package.json       |   9 +
 .../packages/core/sass/_all-theme.scss        |  55 +--
 src/frontend/packages/core/sass/colors.scss   |   7 -
 src/frontend/packages/core/sass/theme.scss    |  65 +--
 .../packages/core/src/app.component.ts        |   6 +-
 src/frontend/packages/core/src/app.module.ts  |  36 +-
 .../packages/core/src/base-entity-schemas.ts  |  24 --
 .../packages/core/src/base-entity-types.ts    | 110 -----
 .../endpoints => core}/endpoint-auth.ts       |  18 +-
 .../core/src/core/endpoints.service.spec.ts   |   4 +-
 .../core/src/core/endpoints.service.ts        |   3 +-
 .../entity-favorite-star.component.spec.ts    |   4 +-
 .../entity-favorite-star.component.ts         |   4 +-
 .../src/core/extension/extension-service.ts   |  12 +-
 .../core/src/core/logger.service.spec.ts      |   2 +-
 .../current-user-permissions.config.ts        |   3 +-
 .../current-user-permissions.service.spec.ts  |   6 +-
 .../current-user-permissions.service.ts       |  24 +-
 .../stratos-user-permissions.checker.ts       |   3 +-
 .../stateful-icon.component.spec.ts           |   2 +-
 .../stateful-icon/stateful-icon.component.ts  |   5 +-
 .../core/src/core/user-profile.service.ts     |  66 +--
 .../core/src/core/user.service.spec.ts        |   2 +-
 .../packages/core/src/core/utils.service.ts   |  57 ---
 .../custom-import.module.ts}                  |   3 +-
 .../core/src/environments/environment.prod.ts |   5 +-
 .../core/src/environments/environment.ts      |   5 +-
 .../core/src/features/about/about.module.ts   |   4 +-
 .../about/eula-page/eula-page.component.html  |   2 +-
 .../eula-page/eula-page.component.spec.ts     |   8 +-
 .../about/eula-page/eula-page.component.ts    |  21 +-
 .../dashboard-base.component.scss             |   1 -
 .../dashboard-base.component.ts               |   6 +-
 .../page-side-nav/page-side-nav.component.ts  |   8 +-
 .../side-nav/side-nav.component.theme.scss    |  14 +-
 .../backup-endpoints.service.ts               |   2 +-
 .../backup-endpoints.component.ts             |  22 +-
 .../restore-endpoints.service.ts              |   2 +-
 .../restore-endpoints.component.ts            |   6 +-
 .../credentials-auth-form.component.ts        |   5 +-
 .../auth-forms/none-auth-form.component.ts    |   3 +-
 .../auth-forms/sso-auth-form.component.ts     |   3 +-
 .../connect-endpoint-dialog.component.ts      |  10 +-
 .../connect-endpoint.component.ts             |   5 +-
 .../src/features/endpoints/connect.service.ts |  76 +---
 .../create-endpoint-cf-step-1.component.ts    |  67 +--
 .../create-endpoint-connect.component.ts      |   5 +-
 .../edit-endpoint-step.component.ts           |  47 ++-
 .../features/endpoints/endpoint-helpers.ts    |  10 -
 .../endpoints-page.component.ts               |  13 +-
 .../error-page/error-page.component.ts        |  16 +-
 .../features/home/home/home-page.component.ts |   4 +-
 .../src/features/metrics/metrics.helpers.ts   |   5 +-
 .../metrics/services/metrics-service.ts       |  17 +-
 .../core/src/features/setup/setup.module.ts   |   2 +-
 .../edit-profile-info.component.ts            |   6 +-
 .../profile-info/profile-info.component.ts    |   2 +-
 .../core/{misc/custom => src}/index.html      |   2 +-
 .../packages/core/src/jetstream.helpers.ts    |  70 +--
 src/frontend/packages/core/src/public-api.ts  |  19 +
 .../app-action-monitor-icon.component.spec.ts |   4 +-
 .../application-state-icon.component.ts       |   2 +-
 .../application-state.component.ts            |   2 +-
 .../card-number-metric.component.ts           |   2 +-
 .../card-status/card-status.component.ts      |   2 +-
 .../favorites-entity-list.component.ts        |   4 +-
 .../favorites-global-list.component.ts        |   9 +-
 .../favorites-meta-card.component.ts          |  28 +-
 .../json-viewer/json-viewer.component.ts      |   2 +-
 .../list-data-source.ts                       |   2 +-
 .../local-list-controller.ts                  |   2 +-
 .../meta-card.component.spec.ts               |   8 +-
 .../meta-card-base/meta-card.component.ts     |  22 +-
 .../table-cell-favorite.component.ts          |   2 +-
 ...ell-request-monitor-icon.component.spec.ts |   4 +-
 .../endpoint/base-endpoints-data-source.ts    |  20 +-
 .../endpoint-card/endpoint-card.component.ts  |  20 +-
 .../endpoint/endpoint-data-source.helpers.ts  |   8 +-
 .../endpoint/endpoint-list.helpers.ts         |  61 +--
 .../endpoint/endpoints-data-source.ts         |   4 +-
 .../endpoint/endpoints-list-config.service.ts |   2 +-
 .../table-cell-endpoint-address.component.ts  |  11 +-
 ...table-cell-endpoint-name.component.spec.ts |   4 +-
 .../table-cell-endpoint-name.component.ts     |  28 +-
 ...metrics-parent-range-selector.component.ts |   4 +-
 .../metrics-range-selector.component.ts       |   3 +-
 .../page-header/page-header.component.html    |   2 +-
 .../page-header.component.theme.scss          |  12 +-
 .../page-header/page-header.component.ts      |   4 +-
 .../recent-entities.component.ts              |   4 +-
 .../src/shared/components/user-avatar/md5.ts  |   2 +-
 .../packages/core/src/shared/entity.tokens.ts |   6 +-
 .../src/shared/global-events.service.spec.ts  |   2 +-
 .../core/src/shared/global-events.service.ts  |   2 +-
 .../metrics-range-selector-manager.service.ts |   5 +-
 .../metrics-range-selector.service.ts         |   3 +-
 .../services/metrics-range-selector.types.ts  |   8 +-
 .../src/shared/services/snackbar.service.ts   |  33 ++
 .../packages/core/src/shared/shared.module.ts |   5 -
 src/frontend/packages/core/src/styles.scss    |   1 -
 .../core/test-framework/core-test.modules.ts  |   2 +-
 .../test-framework/entity-service.helper.ts   |  28 --
 src/frontend/packages/core/tsconfig.app.json  |   3 +-
 src/frontend/packages/core/tsconfig.lib.json  |  10 +
 src/frontend/packages/devkit/build.sh         |  21 +
 .../packages/devkit/package-lock.json         |  14 +
 src/frontend/packages/devkit/package.json     |  18 +
 .../packages/devkit/src/build/assets.ts       |  20 +
 .../packages/devkit/src/build/extensions.ts   |  68 +++
 .../devkit/src/build/index.transform.ts       |  82 ++++
 .../packages/devkit/src/build/main.ts         |  42 ++
 .../packages/devkit/src/build/sass.ts         |  88 ++++
 .../devkit/src/builders/builders.json         |  10 +
 .../src/builders/theme.builder.schema.json    |  13 +
 .../devkit/src/builders/theme.builder.ts      |  43 ++
 .../packages/devkit/src/lib/git.metadata.ts   |  37 ++
 src/frontend/packages/devkit/src/lib/log.ts   |  17 +
 .../packages/devkit/src/lib/packages.ts       | 291 +++++++++++++
 .../packages/devkit/src/lib/schematics.ts     | 140 ++++++
 .../packages/devkit/src/lib/stratos.config.ts | 232 ++++++++++
 .../devkit/src/schematics/collection.json     |  10 +
 .../theme/asset-files/README.md.template      |   1 +
 .../theme/asset-files/core}/login-bg.jpg      | Bin
 .../theme/asset-files/core}/logo.png          | Bin
 .../theme/asset-files/core}/nav-logo-icon.png | Bin
 .../theme/asset-files/core}/nav-logo.png      | Bin
 .../schematics/theme/asset-files}/favicon.ico | Bin
 .../theme/files/_index.scss.template          |  12 +
 .../theme/files/package.json.template         |  18 +
 .../theme/files/sass/custom.scss.template     |   1 +
 .../files/sass/mat-colors.scss.template}      |   0
 .../devkit/src/schematics/theme/index.ts      | 110 +++++
 .../theme/loader-files/loading.css.template   |  38 ++
 .../theme/loader-files/loading.html.template  |   3 +
 .../devkit/src/schematics/theme/schema.d.ts   |  25 ++
 .../devkit/src/schematics/theme/schema.json   |  32 ++
 .../devkit/src/schematics/theme/theme-long.md |   1 +
 src/frontend/packages/devkit/tsconfig.json    |  11 +
 .../packages/example-extensions/package.json  |   8 +
 .../src}/acme-login/acme-login.component.html |   0
 .../src}/acme-login/acme-login.component.scss |   1 -
 .../acme-login/acme-login.component.spec.ts   |   0
 .../src}/acme-login/acme-login.component.ts   |   7 +-
 .../acme-support-info.component.html          |   0
 .../acme-support-info.component.scss          |   0
 .../acme-support-info.component.spec.ts       |   0
 .../acme-support-info.component.ts            |   0
 .../app-action-extension.component.html       |   0
 .../app-action-extension.component.scss       |   0
 .../app-action-extension.component.spec.ts    |   0
 .../app-action-extension.component.ts         |   2 +-
 .../app-tab-extension.component.html          |   0
 .../app-tab-extension.component.scss          |   0
 .../app-tab-extension.component.spec.ts       |   0
 .../app-tab-extension.component.ts            |   3 +-
 .../src/example-routing.module.ts             |   4 +-
 .../example-extensions/src/example.module.ts  |  24 +-
 .../example-component/example.component.html  |   0
 .../example-component/example.component.scss  |   0
 .../example-component/example.component.ts    |   0
 .../nav-extension/nav-extension.module.ts     |   9 +-
 .../nav-extension/nav-extension.routing.ts    |   0
 .../example-extensions/src/public-api.ts      |   4 +
 .../packages/example-theme/_index.scss        |   9 +
 .../assets/core/custom/acme_logo.png          | Bin 0 -> 18891 bytes
 .../example-theme/assets/core/eula.html       |   5 +
 .../example-theme/assets/core/login-bg.jpg    | Bin 0 -> 672633 bytes
 .../example-theme/assets/core/logo.png        | Bin 0 -> 15035 bytes
 .../packages/example-theme/assets/favicon.ico | Bin 0 -> 1150 bytes
 .../packages/example-theme/loader/loading.css |  38 ++
 .../example-theme/loader/loading.html         |   3 +
 .../packages/example-theme/package.json       |  17 +
 .../packages/example-theme/sass/custom.scss   |  18 +
 .../sass/custom/acme-colors.scss              |   7 +
 .../example-theme/sass/custom/acme.scss       |  71 ++++
 src/frontend/packages/shared/karma.conf.js    |   8 +
 src/frontend/packages/shared/ng-package.json  |   7 +
 src/frontend/packages/shared/package.json     |  11 +
 .../packages/shared/sass/_all-theme.scss      |   9 +
 .../packages/shared/src/components.module.ts  |  17 +
 .../stratos-title.component.html              |   4 +
 .../stratos-title.component.scss              |  20 +
 .../stratos-title.component.spec.ts           |  25 ++
 .../stratos-title.component.theme.scss        |   6 +
 .../stratos-title/stratos-title.component.ts  |  12 +
 .../packages/shared/src/public-api.ts         |   5 +
 .../packages/shared/tsconfig.lib.json         |  10 +
 .../packages/shared/tsconfig.spec.json        |  17 +
 src/frontend/packages/shared/tslint.json      |  17 +
 src/frontend/packages/store/ng-package.json   |   2 +-
 src/frontend/packages/store/package.json      |   2 +-
 .../store/src/actions/dashboard-actions.ts    |   2 +-
 .../store/src/actions/endpoint.actions.ts     | 196 ++++++---
 .../store/src/actions/metrics-api.actions.ts  |   3 +-
 .../store/src/actions/metrics.actions.ts      |   8 +-
 .../store/src/actions/snackBar.actions.ts     |  28 --
 .../store/src/actions/system.actions.ts       |  28 +-
 .../base-user-favorites-action.ts             |  11 -
 .../get-user-favorites-action.ts              |  30 --
 .../remove-user-favorite-action.ts            |  21 -
 .../save-user-favorite-action.ts              |  25 --
 .../toggle-user-favorite-action.ts            |  13 -
 .../update-user-favorite-metadata-action.ts   |  21 -
 .../src/actions/user-favourites.actions.ts    | 145 +++++++
 .../store/src/actions/user-profile.actions.ts |  39 +-
 .../src/browser-encoder.ts}                   |   9 -
 .../store/src/effects/auth.effects.ts         |  13 +-
 .../store/src/effects/dashboard.effects.ts    |   2 +-
 .../effects/endpoint-api-errors.effects.ts    |   4 +-
 .../store/src/effects/endpoint.effects.ts     | 136 +++---
 .../store/src/effects/permissions.effect.ts   |  10 +-
 .../src/effects/snackBar.effects.spec.ts      |  32 --
 .../store/src/effects/snackBar.effects.ts     |  42 --
 .../store/src/effects/system.effects.ts       |  32 +-
 .../store/src/effects/uaa-setup.effects.ts    |   2 +-
 .../src/effects/user-favorites-effect.ts      |  96 +++--
 .../store/src/effects/user-profile.effects.ts |  98 ++---
 .../packages/store/src/endpoint-utils.ts      |   6 +
 .../entity-catalog-entity-store-helpers.ts    |   7 +-
 .../entity-catalog-entity.ts                  |  20 +-
 .../entity-catalog-entity.types.ts            |  10 +-
 .../entity-catalog-entity/type.helpers.ts     |  46 ++
 .../src/entity-catalog/entity-catalog.spec.ts |  15 +-
 .../src/entity-catalog/entity-catalog.ts      |   6 +-
 .../entity-catalog/entity-catalog.types.ts    |  19 +-
 .../endpoint-errors.handler.ts                |   4 +-
 .../handle-multi-endpoints.pipe.spec.ts       |   2 +-
 .../handle-multi-endpoints.pipe.ts            |   4 +-
 .../jetstream-error.handler.ts                |   4 +-
 .../entity-request-pipeline.ts                |   2 +-
 .../entity-request-pipeline.types.ts          |   4 +-
 .../pipline-http-client.service.ts            |   4 +-
 .../packages/store/src/entity-service.spec.ts |  23 +-
 .../src}/extension-types.ts                   |   0
 .../src}/favorite-config-mapper.ts            |  29 +-
 .../store/src/helpers/entity-factory.ts       |  32 --
 .../src/helpers}/local-list.helpers.ts        |   4 +-
 .../store/src/helpers/store-helpers.ts        |   2 +-
 .../src/helpers/stratos-entity-factory.ts     |  40 ++
 src/frontend/packages/store/src/jetstream.ts  |  78 ++++
 .../store/src/monitors/pagination-monitor.ts  |   4 +-
 src/frontend/packages/store/src/public-api.ts |   3 +
 .../packages/store/src/reducers.module.ts     |  37 +-
 .../api-request-reducer/request-helpers.ts    |   3 +-
 .../recently-visited.reducer.ts               |   7 +-
 .../user-favorites-groups.reducer.spec.ts     |   8 +-
 .../user-favorites-groups.reducer.ts          |   8 +-
 .../store/src/reducers/endpoints.reducer.ts   |  13 +-
 .../store/src/reducers/favorite.reducer.ts    |   8 +-
 .../src/reducers/internal-events.reducer.ts   |  20 +-
 ...agination-reducer-clear-pagination-type.ts |   4 +-
 ...gination-reducer-create-pagination.spec.ts |   2 +-
 .../pagination-reducer-max-reached.ts         |   4 +-
 .../pagination-reducer.helper.ts              |   9 +-
 .../pagination.reducer.spec.ts                |   6 +-
 .../selectors/current-user-role.selectors.ts  |   5 +-
 .../store/src/selectors/endpoint.selectors.ts |   5 +-
 .../selectors/favorite-groups.selectors.ts    |   6 +-
 .../packages/store/src/store.module.ts        |   2 -
 .../store/src/stratos-action-builders.ts      | 198 +++++++++
 .../store/src/stratos-entity-catalog.ts       |  45 ++
 .../store/src/stratos-entity-generator.ts     | 161 +++++++
 .../src/core => store/src}/style.service.ts   |   0
 .../src/core => store/src}/theme.service.ts   |  15 +-
 .../packages/store/src/types/auth.types.ts    |   4 +-
 .../store/src/types/base-metric.types.ts      |   1 -
 .../store/src/types/endpoint.types.ts         |  15 +-
 .../store/src/types/menu-item.types.ts        |  11 +
 .../packages/store/src/types/metric.types.ts  |   5 +
 .../src/types}/shared.types.ts                |   4 +-
 .../packages/store/src/types/system.types.ts  |  13 +-
 .../packages/store/src/types/theme.types.ts   |   5 +
 .../src/types/user-favorite-manager.types.ts  |  27 ++
 .../store/src/types/user-favorites.types.ts   |  11 +-
 .../src}/user-favorite-helpers.ts             |   8 +-
 .../src}/user-favorite-manager.ts             |  58 +--
 .../packages/store/testing/ng-package.json    |   4 +-
 .../store/testing/src/store-test-helper.ts    |   4 +-
 src/frontend/packages/theme/_helper.scss      | 112 +++++
 src/frontend/packages/theme/_index.scss       |   6 +
 .../packages/theme/assets/core/login-bg.jpg   | Bin 0 -> 206493 bytes
 .../packages/theme/assets/core/logo.png       | Bin 0 -> 22715 bytes
 .../theme/assets/core/nav-logo-icon.png       | Bin 0 -> 667 bytes
 .../packages/theme/assets/core/nav-logo.png   | Bin 0 -> 1548 bytes
 .../packages/theme/assets/favicon.ico         | Bin 0 -> 15086 bytes
 .../misc/custom => theme/loader}/loading.css  |   0
 .../misc/custom => theme/loader}/loading.html |   0
 src/frontend/packages/theme/mat-colors.scss   |  28 ++
 .../{core/sass => theme}/mat-themes.scss      |   0
 src/frontend/packages/theme/package.json      |  19 +
 src/jetstream/go.sum                          |  10 +-
 .../plugins/userfavorites/favorites.go        |   8 +-
 .../application-deploy-docker-e2e.spec.ts     |   2 +-
 .../application-deploy-e2e.spec.ts            |   2 +-
 .../application/application-e2e-helpers.ts    |   2 +-
 .../application-routes-e2e.spec.ts            |   2 +-
 .../application/application-view-e2e.spec.ts  |   5 +-
 .../applications/application-wall-e2e.spec.ts |   2 +-
 .../cf-level/manage-org-e2e.spec.ts           |   2 +-
 .../cf-level/manage-quota-e2e.spec.ts         |   2 +-
 .../cloud-foundry-list-cf-e2e.spec.ts         |  24 +-
 .../cloud-foundry/invite-users-e2e.helper.ts  |   2 +-
 ...nage-users-by-username-stepper-e2e.spec.ts |   2 +-
 .../manage-users-stepper-e2e.spec.ts          |   2 +-
 .../org-level/cf-org-delete-e2e.spec.ts       |   5 +-
 .../org-level/manage-space-quota-e2e.spec.ts  |   2 +-
 .../org-level/mange-space-e2e.spec.ts         |   4 +-
 .../org-level/org-invite-user-e2e.spec.ts     |   2 +-
 .../org-level/org-spaces-e2e.spec.ts          |   2 +-
 .../space-level/cf-space-delete-e2e.spec.ts   |  11 +-
 .../space-level/cf-space-level-e2e.spec.ts    |   2 +-
 .../space-level/space-invite-user-e2e.spec.ts |   2 +-
 .../space-level/space-routes-e2e.spec.ts      |   2 +-
 .../cloud-foundry/users-list-e2e.helper.ts    |   2 +-
 .../cloud-foundry/users-removal-e2e.helper.ts |   2 +-
 src/test-e2e/e2e.ts                           |   8 +
 src/test-e2e/endpoints/endpoints-e2e.spec.ts  |  31 +-
 .../{cf-helpers.ts => cf-e2e-helpers.ts}      |   0
 .../create-marketplace-service-instance.po.ts |  10 +-
 .../create-service-instance-e2e.spec.ts       |  13 +-
 ...reate-service-instance-private-e2e.spec.ts |  10 +-
 ...-service-instance-space-scoped-e2e.spec.ts |   9 +-
 .../marketplace/create-service-instance.po.ts |  16 +-
 ...ate-service-instances-bind-app-e2e.spec.ts |   7 +-
 .../create-ups-service-instance.po.ts         |   9 +
 .../delete-service-instance-e2e.spec.ts       |  13 +-
 .../delete-ups-service-instance-e2e.spec.ts   |   8 +-
 .../edit-service-instance-e2e.spec.ts         |   5 +-
 ...place-create-service-instances-e2e.spec.ts | 102 ++---
 .../marketplace/marketplace-instances.po.ts   |  11 +
 .../marketplace-summary-e2e.spec.ts           |   9 +-
 .../marketplace/marketplace-summary.po.ts     |   1 +
 .../marketplace/services-helper-e2e.ts        |   4 +-
 .../marketplace/services-wall-e2e.spec.ts     |   5 +-
 src/test-e2e/marketplace/services-wall.po.ts  |  10 +-
 src/test-e2e/po/invite-users-stepper.po.ts    |   2 +-
 src/test-e2e/po/page.po.ts                    |  25 +-
 src/tsconfig.json                             |   8 +-
 498 files changed, 5151 insertions(+), 3396 deletions(-)
 delete mode 100644 build/customize-build.js
 create mode 100755 build/tools/v4-migration/migrate.sh
 create mode 100644 build/tools/v4-migration/templates/_index.scss
 rename src/frontend/packages/store/testing/package.json => build/tools/v4-migration/templates/ext.package.json (53%)
 create mode 100644 build/tools/v4-migration/templates/public-api.ts_
 create mode 100644 build/tools/v4-migration/templates/theme.package.json
 create mode 100644 src/frontend/packages/cloud-foundry/sass/_all-theme.scss
 rename src/frontend/packages/cloud-foundry/src/{features/applications/application => shared/components}/application-instance-chart/application-instance-chart.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/{features/applications/application => shared/components}/application-instance-chart/application-instance-chart.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/{features/applications/application => shared/components}/application-instance-chart/application-instance-chart.component.spec.ts (74%)
 rename src/frontend/packages/cloud-foundry/src/{features/applications/application => shared/components}/application-instance-chart/application-instance-chart.component.ts (66%)
 delete mode 100644 src/frontend/packages/core/misc/custom/custom-src-routing.module.ts_
 delete mode 100644 src/frontend/packages/core/misc/custom/custom-src.module.ts_
 delete mode 100644 src/frontend/packages/core/misc/custom/custom.scss
 delete mode 100644 src/frontend/packages/core/misc/custom/custom.yaml
 delete mode 100644 src/frontend/packages/core/misc/custom/eula.html
 create mode 100644 src/frontend/packages/core/ng-package.json
 create mode 100644 src/frontend/packages/core/package.json
 delete mode 100644 src/frontend/packages/core/sass/colors.scss
 delete mode 100644 src/frontend/packages/core/src/base-entity-schemas.ts
 delete mode 100644 src/frontend/packages/core/src/base-entity-types.ts
 rename src/frontend/packages/core/src/{features/endpoints => core}/endpoint-auth.ts (60%)
 rename src/frontend/packages/core/{misc/custom/custom.module.ts_ => src/custom-import.module.ts} (57%)
 rename src/frontend/packages/core/{misc/custom => src}/index.html (95%)
 create mode 100644 src/frontend/packages/core/src/public-api.ts
 create mode 100644 src/frontend/packages/core/src/shared/services/snackbar.service.ts
 delete mode 100644 src/frontend/packages/core/test-framework/entity-service.helper.ts
 create mode 100644 src/frontend/packages/core/tsconfig.lib.json
 create mode 100755 src/frontend/packages/devkit/build.sh
 create mode 100644 src/frontend/packages/devkit/package-lock.json
 create mode 100644 src/frontend/packages/devkit/package.json
 create mode 100644 src/frontend/packages/devkit/src/build/assets.ts
 create mode 100644 src/frontend/packages/devkit/src/build/extensions.ts
 create mode 100644 src/frontend/packages/devkit/src/build/index.transform.ts
 create mode 100644 src/frontend/packages/devkit/src/build/main.ts
 create mode 100644 src/frontend/packages/devkit/src/build/sass.ts
 create mode 100644 src/frontend/packages/devkit/src/builders/builders.json
 create mode 100644 src/frontend/packages/devkit/src/builders/theme.builder.schema.json
 create mode 100644 src/frontend/packages/devkit/src/builders/theme.builder.ts
 create mode 100644 src/frontend/packages/devkit/src/lib/git.metadata.ts
 create mode 100644 src/frontend/packages/devkit/src/lib/log.ts
 create mode 100644 src/frontend/packages/devkit/src/lib/packages.ts
 create mode 100644 src/frontend/packages/devkit/src/lib/schematics.ts
 create mode 100644 src/frontend/packages/devkit/src/lib/stratos.config.ts
 create mode 100644 src/frontend/packages/devkit/src/schematics/collection.json
 create mode 100644 src/frontend/packages/devkit/src/schematics/theme/asset-files/README.md.template
 rename src/frontend/packages/{core/misc/custom => devkit/src/schematics/theme/asset-files/core}/login-bg.jpg (100%)
 rename src/frontend/packages/{core/misc/custom => devkit/src/schematics/theme/asset-files/core}/logo.png (100%)
 rename src/frontend/packages/{core/misc/custom => devkit/src/schematics/theme/asset-files/core}/nav-logo-icon.png (100%)
 rename src/frontend/packages/{core/misc/custom => devkit/src/schematics/theme/asset-files/core}/nav-logo.png (100%)
 rename src/frontend/packages/{core/misc/custom => devkit/src/schematics/theme/asset-files}/favicon.ico (100%)
 create mode 100644 src/frontend/packages/devkit/src/schematics/theme/files/_index.scss.template
 create mode 100644 src/frontend/packages/devkit/src/schematics/theme/files/package.json.template
 create mode 100644 src/frontend/packages/devkit/src/schematics/theme/files/sass/custom.scss.template
 rename src/frontend/packages/{core/sass/mat-colors.scss => devkit/src/schematics/theme/files/sass/mat-colors.scss.template} (100%)
 create mode 100644 src/frontend/packages/devkit/src/schematics/theme/index.ts
 create mode 100644 src/frontend/packages/devkit/src/schematics/theme/loader-files/loading.css.template
 create mode 100644 src/frontend/packages/devkit/src/schematics/theme/loader-files/loading.html.template
 create mode 100644 src/frontend/packages/devkit/src/schematics/theme/schema.d.ts
 create mode 100644 src/frontend/packages/devkit/src/schematics/theme/schema.json
 create mode 100644 src/frontend/packages/devkit/src/schematics/theme/theme-long.md
 create mode 100644 src/frontend/packages/devkit/tsconfig.json
 create mode 100644 src/frontend/packages/example-extensions/package.json
 rename {examples/custom-src/frontend/app/custom => src/frontend/packages/example-extensions/src}/acme-login/acme-login.component.html (100%)
 rename {examples/custom-src/frontend/app/custom => src/frontend/packages/example-extensions/src}/acme-login/acme-login.component.scss (96%)
 rename {examples/custom-src/frontend/app/custom => src/frontend/packages/example-extensions/src}/acme-login/acme-login.component.spec.ts (100%)
 rename {examples/custom-src/frontend/app/custom => src/frontend/packages/example-extensions/src}/acme-login/acme-login.component.ts (61%)
 rename {examples/custom-src/frontend/app/custom => src/frontend/packages/example-extensions/src}/acme-support-info/acme-support-info.component.html (100%)
 rename {examples/custom-src/frontend/app/custom => src/frontend/packages/example-extensions/src}/acme-support-info/acme-support-info.component.scss (100%)
 rename {examples/custom-src/frontend/app/custom => src/frontend/packages/example-extensions/src}/acme-support-info/acme-support-info.component.spec.ts (100%)
 rename {examples/custom-src/frontend/app/custom => src/frontend/packages/example-extensions/src}/acme-support-info/acme-support-info.component.ts (100%)
 rename {examples/custom-src/frontend/app/custom => src/frontend/packages/example-extensions/src}/app-action-extension/app-action-extension.component.html (100%)
 rename {examples/custom-src/frontend/app/custom => src/frontend/packages/example-extensions/src}/app-action-extension/app-action-extension.component.scss (100%)
 rename {examples/custom-src/frontend/app/custom => src/frontend/packages/example-extensions/src}/app-action-extension/app-action-extension.component.spec.ts (100%)
 rename {examples/custom-src/frontend/app/custom => src/frontend/packages/example-extensions/src}/app-action-extension/app-action-extension.component.ts (79%)
 rename {examples/custom-src/frontend/app/custom => src/frontend/packages/example-extensions/src}/app-tab-extension/app-tab-extension.component.html (100%)
 rename {examples/custom-src/frontend/app/custom => src/frontend/packages/example-extensions/src}/app-tab-extension/app-tab-extension.component.scss (100%)
 rename {examples/custom-src/frontend/app/custom => src/frontend/packages/example-extensions/src}/app-tab-extension/app-tab-extension.component.spec.ts (100%)
 rename {examples/custom-src/frontend/app/custom => src/frontend/packages/example-extensions/src}/app-tab-extension/app-tab-extension.component.ts (83%)
 rename examples/custom-src/frontend/app/custom/custom-routing.module.ts => src/frontend/packages/example-extensions/src/example-routing.module.ts (80%)
 rename examples/custom-src/frontend/app/custom/custom.module.ts => src/frontend/packages/example-extensions/src/example.module.ts (61%)
 rename {examples/custom-src/frontend/app/custom => src/frontend/packages/example-extensions/src}/nav-extension/example-component/example.component.html (100%)
 rename {examples/custom-src/frontend/app/custom => src/frontend/packages/example-extensions/src}/nav-extension/example-component/example.component.scss (100%)
 rename {examples/custom-src/frontend/app/custom => src/frontend/packages/example-extensions/src}/nav-extension/example-component/example.component.ts (100%)
 rename {examples/custom-src/frontend/app/custom => src/frontend/packages/example-extensions/src}/nav-extension/nav-extension.module.ts (69%)
 rename {examples/custom-src/frontend/app/custom => src/frontend/packages/example-extensions/src}/nav-extension/nav-extension.routing.ts (100%)
 create mode 100644 src/frontend/packages/example-extensions/src/public-api.ts
 create mode 100644 src/frontend/packages/example-theme/_index.scss
 create mode 100644 src/frontend/packages/example-theme/assets/core/custom/acme_logo.png
 create mode 100644 src/frontend/packages/example-theme/assets/core/eula.html
 create mode 100644 src/frontend/packages/example-theme/assets/core/login-bg.jpg
 create mode 100644 src/frontend/packages/example-theme/assets/core/logo.png
 create mode 100644 src/frontend/packages/example-theme/assets/favicon.ico
 create mode 100644 src/frontend/packages/example-theme/loader/loading.css
 create mode 100644 src/frontend/packages/example-theme/loader/loading.html
 create mode 100644 src/frontend/packages/example-theme/package.json
 create mode 100644 src/frontend/packages/example-theme/sass/custom.scss
 create mode 100644 src/frontend/packages/example-theme/sass/custom/acme-colors.scss
 create mode 100644 src/frontend/packages/example-theme/sass/custom/acme.scss
 create mode 100644 src/frontend/packages/shared/karma.conf.js
 create mode 100644 src/frontend/packages/shared/ng-package.json
 create mode 100644 src/frontend/packages/shared/package.json
 create mode 100644 src/frontend/packages/shared/sass/_all-theme.scss
 create mode 100644 src/frontend/packages/shared/src/components.module.ts
 create mode 100644 src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.html
 create mode 100644 src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.scss
 create mode 100644 src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.spec.ts
 create mode 100644 src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.theme.scss
 create mode 100644 src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.ts
 create mode 100644 src/frontend/packages/shared/src/public-api.ts
 create mode 100644 src/frontend/packages/shared/tsconfig.lib.json
 create mode 100644 src/frontend/packages/shared/tsconfig.spec.json
 create mode 100644 src/frontend/packages/shared/tslint.json
 delete mode 100644 src/frontend/packages/store/src/actions/snackBar.actions.ts
 delete mode 100644 src/frontend/packages/store/src/actions/user-favourites-actions/base-user-favorites-action.ts
 delete mode 100644 src/frontend/packages/store/src/actions/user-favourites-actions/get-user-favorites-action.ts
 delete mode 100644 src/frontend/packages/store/src/actions/user-favourites-actions/remove-user-favorite-action.ts
 delete mode 100644 src/frontend/packages/store/src/actions/user-favourites-actions/save-user-favorite-action.ts
 delete mode 100644 src/frontend/packages/store/src/actions/user-favourites-actions/toggle-user-favorite-action.ts
 delete mode 100644 src/frontend/packages/store/src/actions/user-favourites-actions/update-user-favorite-metadata-action.ts
 create mode 100644 src/frontend/packages/store/src/actions/user-favourites.actions.ts
 rename src/frontend/packages/{core/src/helper.ts => store/src/browser-encoder.ts} (72%)
 delete mode 100644 src/frontend/packages/store/src/effects/snackBar.effects.spec.ts
 delete mode 100644 src/frontend/packages/store/src/effects/snackBar.effects.ts
 create mode 100644 src/frontend/packages/store/src/endpoint-utils.ts
 create mode 100644 src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/type.helpers.ts
 rename src/frontend/packages/{core/src/core/extension => store/src}/extension-types.ts (100%)
 rename src/frontend/packages/{core/src/shared/components/favorites-meta-card => store/src}/favorite-config-mapper.ts (85%)
 delete mode 100644 src/frontend/packages/store/src/helpers/entity-factory.ts
 rename src/frontend/packages/{core/src/shared/components/list/data-sources-controllers => store/src/helpers}/local-list.helpers.ts (86%)
 create mode 100644 src/frontend/packages/store/src/helpers/stratos-entity-factory.ts
 create mode 100644 src/frontend/packages/store/src/jetstream.ts
 create mode 100644 src/frontend/packages/store/src/stratos-action-builders.ts
 create mode 100644 src/frontend/packages/store/src/stratos-entity-catalog.ts
 create mode 100644 src/frontend/packages/store/src/stratos-entity-generator.ts
 rename src/frontend/packages/{core/src/core => store/src}/style.service.ts (100%)
 rename src/frontend/packages/{core/src/core => store/src}/theme.service.ts (92%)
 create mode 100644 src/frontend/packages/store/src/types/menu-item.types.ts
 rename src/frontend/packages/{core/src/shared => store/src/types}/shared.types.ts (79%)
 create mode 100644 src/frontend/packages/store/src/types/theme.types.ts
 create mode 100644 src/frontend/packages/store/src/types/user-favorite-manager.types.ts
 rename src/frontend/packages/{core/src/core => store/src}/user-favorite-helpers.ts (75%)
 rename src/frontend/packages/{core/src/core => store/src}/user-favorite-manager.ts (71%)
 create mode 100644 src/frontend/packages/theme/_helper.scss
 create mode 100644 src/frontend/packages/theme/_index.scss
 create mode 100644 src/frontend/packages/theme/assets/core/login-bg.jpg
 create mode 100755 src/frontend/packages/theme/assets/core/logo.png
 create mode 100644 src/frontend/packages/theme/assets/core/nav-logo-icon.png
 create mode 100644 src/frontend/packages/theme/assets/core/nav-logo.png
 create mode 100644 src/frontend/packages/theme/assets/favicon.ico
 rename src/frontend/packages/{core/misc/custom => theme/loader}/loading.css (100%)
 rename src/frontend/packages/{core/misc/custom => theme/loader}/loading.html (100%)
 create mode 100644 src/frontend/packages/theme/mat-colors.scss
 rename src/frontend/packages/{core/sass => theme}/mat-themes.scss (100%)
 create mode 100644 src/frontend/packages/theme/package.json
 rename src/test-e2e/helpers/{cf-helpers.ts => cf-e2e-helpers.ts} (100%)
 create mode 100644 src/test-e2e/marketplace/marketplace-instances.po.ts

diff --git a/.codeclimate.yml b/.codeclimate.yml
index fd65fd830a..801ada6c4e 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -14,7 +14,7 @@ plugins:
   markdownlint:
     enabled: true
   scss-lint:
-    enabled: true
+    enabled: false
 exclude_patterns:
 - "config/"
 - "db/"
diff --git a/.gitignore b/.gitignore
index 21c2a5101c..b34c80c94b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,7 +52,6 @@ environment.dev.ts
 #v1
 *.iml
 docs/src
-lib
 tools/test-backend/config/mock.config.json
 tools/.coverage-karma/
 dev-certs/*
@@ -81,6 +80,7 @@ deploy/ci/travis/temp/
 deploy/kubernetes/console/imagelist.txt
 
 .dist/
+dist-devkit/
 deploy/uaa/tmp/
 src/backend/*/vendor/
 .v8flags*
@@ -96,8 +96,9 @@ src/jetstream/config.properties
 src/jetstream/db/dbconf.yml
 src/jetstream/plugins/monocular/chart-repo/chartrepo
 
-# Customisations
-
+# Customisations - these can be removed in the future
+# Left in for now to prevent these files being checked-in, if they are still present
+# from a previous checkout
 src/frontend/packages/core/favicon.ico
 src/frontend/packages/core/sass/custom.scss
 src/frontend/packages/core/assets/eula.html
@@ -110,6 +111,9 @@ src/frontend/packages/core/assets/custom
 src/frontend/packages/core/sass/custom
 src/frontend/packages/core/src/index.html
 
+# Customisation - generated import module
+src/frontend/packages/core/src/_custom-import.module.ts
+
 # Prebuild package
 
 stratos-frontend-prebuild.zip
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 576954b97b..161b42c8ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -155,7 +155,7 @@ Details:
 
 ## 2.6.1
 
-[Full Changelog](https://github.com/cloudfoundry/stratos/compare/2.6.0...2.6.1)
+[Full Changelog](https://github.com/SUSE/stratos/compare/2.6.0...2.6.1)
 
 This release contains a few fixes:
 
@@ -182,7 +182,7 @@ This release contains two fixes listed below.
 
 ## 2.5.3
 
-[Full Changelog](https://github.com/cloudfoundry-incubator/stratos/compare/2.5.2...2.5.3)
+[Full Changelog](https://github.com/suse/stratos/compare/2.5.2...2.5.3)
 
 This release contains a number of fixes and improvements:
 
@@ -200,7 +200,7 @@ This release contains a number of fixes and improvements:
 
 ## 2.5.2
 
-[Full Changelog](https://github.com/cloudfoundry-incubator/stratos/compare/2.5.1...2.5.2)
+[Full Changelog](https://github.com/suse/stratos/compare/2.5.1...2.5.2)
 
 This release contains a number of fixes and improvements:
 
@@ -222,7 +222,7 @@ This release contains a number of fixes and improvements:
 
 ## 2.5.1
 
-[Full Changelog](https://github.com/cloudfoundry-incubator/stratos/compare/2.5.0...2.5.1)
+[Full Changelog](https://github.com/suse/stratos/compare/2.5.0...2.5.1)
 
 This release contains a number of fixes and improvements:
 
diff --git a/angular.json b/angular.json
index 75d6a32748..caa3bceaa9 100644
--- a/angular.json
+++ b/angular.json
@@ -4,14 +4,17 @@
   "newProjectRoot": "src/frontend/packages",
   "projects": {
     "stratos": {
-      "root": "",
+      "root": "src/frontend/packages",
       "sourceRoot": "src/frontend/packages",
       "projectType": "application",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-builders/custom-webpack:browser",
           "options": {
-            "aot": true,
+            "customWebpackConfig": {
+              "path": "./dist-devkit/build/main.js"
+            },
+            "indexTransform": "./dist-devkit/build/index.transform.js",
             "preserveSymlinks": true,
             "outputPath": "dist",
             "index": "src/frontend/packages/core/src/index.html",
@@ -36,10 +39,6 @@
           },
           "configurations": {
             "production": {
-              "budgets": [{
-                "type": "anyComponentStyle",
-                "maximumWarning": "6kb"
-              }],
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
@@ -57,7 +56,7 @@
           }
         },
         "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
+          "builder": "@angular-builders/custom-webpack:dev-server",
           "options": {
             "aot": true,
             "sslCert": "dev-ssl/server.crt",
@@ -94,36 +93,37 @@
         }
       }
     },
+    "theme": {
+      "root": "src/frontend/packages/theme/",
+      "sourceRoot": "",
+      "projectType": "library",
+      "architect": {
+        "build": {
+          "builder": "./dist-devkit:stratos-theme",
+          "options": {
+            "outputPath": "dist/theme"
+          }
+        }
+      }
+    },
     "core": {
       "root": "src/frontend/packages/core/",
-      "sourceRoot": "src/frontend/packages/core/src",
-      "projectType": "application",
+      "sourceRoot": "src/frontend/packages/core",
+      "projectType": "library",
       "prefix": "app",
       "schematics": {},
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-ng-packagr:build",
           "options": {
-            "aot": true,
             "preserveSymlinks": true,
             "outputPath": "dist/core",
             "index": "src/frontend/packages/core/src/index.html",
             "main": "src/frontend/packages/core/src/main.ts",
             "polyfills": "src/frontend/packages/core/src/polyfills.ts",
             "tsConfig": "src/frontend/packages/core/tsconfig.app.json",
-            "assets": [
-              "src/frontend/packages/core/favicon.ico",
-              "src/frontend/packages/core/assets",
-              {
-                "glob": "**/*",
-                "input": "custom-src/frontend/assets/custom",
-                "output": "/core/assets/custom"
-              }
-            ],
-            "styles": [
-              "src/frontend/packages/core/src/styles.css",
-              "src/frontend/packages/cf-autoscaler/src/styles.css"
-            ],
+            "assets": [],
+            "styles": [],
             "scripts": []
           },
           "configurations": {
@@ -148,23 +148,6 @@
             }
           }
         },
-        "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
-          "options": {
-            "browserTarget": "core:build"
-          },
-          "configurations": {
-            "production": {
-              "browserTarget": "core:build:production"
-            }
-          }
-        },
-        "extract-i18n": {
-          "builder": "@angular-devkit/build-angular:extract-i18n",
-          "options": {
-            "browserTarget": "core:build"
-          }
-        },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
@@ -253,6 +236,37 @@
         }
       }
     },
+    "shared": {
+      "root": "src/frontend/packages/shared",
+      "sourceRoot": "src/frontend/packages/shared/src",
+      "projectType": "library",
+      "prefix": "lib",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-ng-packagr:build",
+          "options": {
+            "tsConfig": "src/frontend/packages/shared/tsconfig.lib.json",
+            "project": "src/frontend/packages/shared/ng-package.json"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/frontend/packages/shared/src/test.ts",
+            "tsConfig": "src/frontend/packages/shared/tsconfig.spec.json",
+            "karmaConfig": "src/frontend/packages/shared/karma.conf.js"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": ["src/tsconfig.json"],
+            "tslintConfig": "src/frontend/packages/shared/tslint.json",
+            "files": ["src/frontend/packages/shared/src/**/*.ts"]
+          }
+        }
+      }
+    },
     "cloud-foundry": {
       "root": "src/frontend/packages/cloud-foundry",
       "sourceRoot": "src/frontend/packages/cloud-foundry/src",
@@ -349,8 +363,5 @@
     "@schematics/angular:directive": {
       "prefix": "app"
     }
-  },
-  "cli": {
-    "_defaultCollection": "@nrwl/angular"
   }
 }
diff --git a/build/customize-build.js b/build/customize-build.js
deleted file mode 100644
index fb98297c18..0000000000
--- a/build/customize-build.js
+++ /dev/null
@@ -1,316 +0,0 @@
-/**
- * Gulp build file for applying cutomizations
- */
-
-/* eslint-disable angular/log,no-console,no-process-env,angular/json-functions,no-sync */
-(function () {
-  'use strict';
-
-  var gulp = require('gulp');
-  var path = require('path');
-  var fs = require('fs-extra');
-  var yaml = require('js-yaml');
-  var replace = require('replace-in-file');
-  var execSync = require('child_process').execSync;
-
-  const CUSTOM_YAML_MANIFEST = path.resolve(__dirname, '../src/frontend/packages/core/misc/custom/custom.yaml');
-  const INDEX_TEMPLATE = path.resolve(__dirname, '../src/frontend/packages/core/misc/custom/index.html');
-  const INDEX_HTML = path.resolve(__dirname, '../src/frontend/packages/core/src/index.html');
-  const CUSTOM_METADATA = path.resolve(__dirname, '../custom-src/stratos.yaml');
-  const GIT_FOLDER = path.resolve(__dirname, '../.git');
-  const GIT_METADATA = path.resolve(__dirname, '../.stratos-git-metadata.json');
-  const INDEX_LOADING_HTML_CUSTOM = path.resolve(__dirname, '../custom-src/frontend/loading.html');
-  const INDEX_LOADING_HTML_DEFAULT = path.resolve(__dirname, '../src/frontend/packages/core/misc/custom/loading.html');
-  const INDEX_LOADING_CSS_CUSTOM = path.resolve(__dirname, '../custom-src/frontend/loading.css');
-  const INDEX_LOADING_CSS_DEFAULT = path.resolve(__dirname, '../src/frontend/packages/core/misc/custom/loading.css');
-
-  // Apply any customizations
-  // Symlink customizations of the default resources for Stratos
-  gulp.task('customize', function (cb) {
-    doShowVersions()
-    doCustomize(false);
-    doGenerateIndexHtml(true);
-    console.log('Finished applying customizations')
-    cb();
-  });
-
-  // Apply defaults instead of any customizations that are available in custom-src
-  gulp.task('customize-default', function (cb) {
-    doCustomize(true);
-    doGenerateIndexHtml(false);
-    console.log('Finished applying default customizations')
-    cb();
-  });
-
-  // Remove all customizations (removes all symlinks as if customize had not been run)
-  gulp.task('customize-reset', function (cb) {
-    doCustomize(true, true);
-    doGenerateIndexHtml(false);
-    console.log('Finished resetting customizations')
-    cb();
-  });
-
-  // Store git metadata so we have it when we are running the the non-git world (Docker)
-  gulp.task('store-git-metadata', function (cb) {
-    storeGitRepositoryMetadata();
-    cb();
-  });
-
-  function doShowVersions() {
-    console.log('Node Version: ' + process.versions.node || 'N/A');
-    try {
-      var response = execSync('npm --v');
-      var npmVersion = response.toString().trim();
-      console.log('NPM Version : ' + npmVersion || 'N/A');
-    } catch (e) {
-      console.log('NPM Version : N/A');
-    }
-  }
-
-  function doCustomize(forceDefaults, reset) {
-    var msg = !forceDefaults ? 'Checking for and applying customizations' : 'Removing customizations and applying defaults';
-    var msg = !reset ? msg : 'Removing all customizations';
-    console.log(msg);
-    var customConfig;
-
-    try {
-      customConfig = yaml.safeLoad(fs.readFileSync(CUSTOM_YAML_MANIFEST, 'utf8'));
-    } catch (e) {
-      console.log('Could not read custom.yaml file');
-      console.log(e);
-      process.exit(1);
-    }
-
-    const baseFolder = path.resolve(__dirname, '../src/frontend/packages/core');
-    const customBaseFolder = path.resolve(__dirname, '../custom-src/frontend');
-    doCustomizeFiles(forceDefaults, reset, customConfig, baseFolder, customBaseFolder);
-    doCustomizeFolders(forceDefaults, reset, customConfig, baseFolder, customBaseFolder);
-    doCustomizeCreateModule(forceDefaults, reset, customConfig, baseFolder, customBaseFolder);
-
-    const backendBaseFolder = path.resolve(__dirname, '../src/jetstream/plugins');
-    const backendCustomBaseFolder = path.resolve(__dirname, '../custom-src/jetstream');
-
-    // There are no defaults for the backend - its the same as removing all of the custom plugins that are there
-    doCustomizeBackend(forceDefaults || reset, backendBaseFolder, backendCustomBaseFolder);
-  };
-
-  function doCustomizeFiles(forceDefaults, reset, customConfig, baseFolder, customBaseFolder) {
-    // This is where we find the default files, if there are no customizations
-    const defaultSrcFolder = path.resolve(__dirname, '../src/frontend/packages/core/misc/custom');
-    // Symlink custom files
-    Object.keys(customConfig.files).forEach(file => {
-      const dest = customConfig.files[file];
-
-      var srcFile = path.join(defaultSrcFolder, file);
-      const destFile = path.join(baseFolder, dest);
-      const customSrcFile = path.join(customBaseFolder, dest);
-
-      // Use the custom file if there is one
-      if (!forceDefaults && fs.existsSync(customSrcFile)) {
-        srcFile = customSrcFile;
-      }
-
-      // Doing an exists check on a symlink will tell if the link dest exists, not the link itself
-      // So try and delete anyway and catch any exception
-      try {
-        const existingLink = fs.readlinkSync(destFile);
-        fs.unlinkSync(destFile);
-      } catch (e) { }
-
-      if (!reset) {
-        fs.symlinkSync(srcFile, destFile);
-        console.log('  + Linking file   : ' + srcFile + ' ==> ' + destFile);
-      }
-    })
-
-  }
-
-  function doCustomizeFolders(forceDefaults, reset, customConfig, baseFolder, customBaseFolder) {
-    // Symlink custom app folders if they are present
-    customConfig.folders.forEach(folder => {
-      var parts = folder.split(':')
-      var src = parts[0];
-      var dest = src;
-      if (parts.length > 1) {
-        dest = parts[1];
-      }
-      var destFolder = path.join(baseFolder, dest);
-      var srcFolder = path.join(customBaseFolder, src);
-      if (fs.existsSync(destFolder)) {
-        fs.unlinkSync(destFolder);
-      }
-      if (!reset && fs.existsSync(srcFolder)) {
-        fs.symlinkSync(srcFolder, destFolder);
-        console.log('  + Linking folder : ' + srcFolder + ' ==> ' + destFolder);
-      }
-    });
-  }
-
-  // Copy the correct custom module to either import the supplied custom module or provide an empty module
-  function doCustomizeCreateModule(forceDefaults, reset, customConfig, baseFolder, customBaseFolder) {
-    const defaultSrcFolder = path.resolve(__dirname, '../src/frontend/packages/core/misc/custom');
-    const destFile = path.join(baseFolder, 'src/custom-import.module.ts');
-    const customModuleFile = path.join(baseFolder, 'src/custom/custom.module.ts');
-    const customRoutingModuleFile = path.join(baseFolder, 'src/custom/custom-routing.module.ts');
-
-    // Delete the existing file if it exists
-    if (fs.existsSync(destFile)) {
-      fs.unlinkSync(destFile)
-    }
-
-    if (!reset) {
-      let srcFile = 'custom.module.ts_';
-      if (fs.existsSync(customModuleFile)) {
-        srcFile = 'custom-src.module.ts_';
-        if (fs.existsSync(customRoutingModuleFile)) {
-          srcFile = 'custom-src-routing.module.ts_';
-          console.log('  + Found custom module with routing');
-        } else {
-          console.log('  + Found custom module without routing');
-        }
-        } else {
-        console.log('  + No custom module found - linking empty custom module');
-      }
-      fs.copySync(path.join(defaultSrcFolder, srcFile), destFile);
-      console.log('  + Copying file   : ' + path.join(defaultSrcFolder, srcFile) + ' ==> ' + destFile);
-    }
-  }
-
-  function doCustomizeBackend(reset, baseFolder, customBaseFolder) {
-    // Symlink custom backend plugin folders if they are present
-    // Get all of the sub-folders in the custom-src/backend folder and symlink
-
-    // Update the git metadata if we can
-    storeGitRepositoryMetadata();
-
-    // Remove all existing symlinks first
-    var existing = fs.readdirSync(baseFolder);
-    existing.forEach(file => {
-      var pluginPath = path.join(baseFolder, file);
-      var stats = fs.lstatSync(pluginPath);
-      if (stats.isSymbolicLink()) {
-        fs.unlinkSync(pluginPath);
-      }
-    })
-
-    if (reset) {
-      // If we are reseting then we are done, just return now
-      return;
-    }
-
-    // Check if we have a customization folder
-    if (!fs.existsSync(customBaseFolder)) {
-      return;
-    }
-
-    // Symlink any custom plugins
-    var plugins = fs.readdirSync(customBaseFolder);
-    plugins.forEach(file => {
-      var srcFolder = path.join(customBaseFolder, file);
-      var stats = fs.statSync(srcFolder);
-      var destFolder = path.join(baseFolder, file);
-      if (stats.isDirectory()) {
-        if (fs.existsSync(destFolder)) {
-          fs.unlinkSync(destFolder);
-        }
-        fs.symlinkSync(srcFolder, destFolder);
-      }
-    })
-  }
-
-  // Generate index.html from template
-  function doGenerateIndexHtml(customize) {
-
-    console.log('  + Generating index.html');
-    // Copy the default
-    fs.copySync(INDEX_TEMPLATE, INDEX_HTML);
-
-    // Read custom metadata if we are customizing and the file is present 
-    var metadata = {};
-    if (customize && fs.existsSync(CUSTOM_METADATA)) {
-      try {
-        metadata = yaml.safeLoad(fs.readFileSync(CUSTOM_METADATA, 'utf8'));
-      } catch (e) {
-        console.log('Could not read stratos.yaml file');
-        console.log(e);
-        process.exit(1);
-      }
-    }
-
-    if (metadata.title) {
-      console.log('  + Overridding title to: "' + metadata.title + '"');
-    }
-
-    // Patch different page title if there is one
-    var title = metadata.title || 'Stratos';
-    replace.sync({ files: INDEX_HTML, from: /@@TITLE@@/g, to: title });
-
-    // Read in the stored Git metadata if it is there, default to empty metadata
-    var gitMetadata = {
-      project: process.env.project || process.env.STRATOS_PROJECT || '',
-      branch: process.env.branch || process.env.STRATOS_BRANCH || '',
-      commit: process.env.commit || process.env.STRATOS_COMMIT || ''
-    };
-
-    if (fs.existsSync(GIT_METADATA)) {
-      gitMetadata = JSON.parse(fs.readFileSync(GIT_METADATA));
-      console.log('  + Project Metadata file read OK');
-    } else {
-      console.log('  + Project Metadata file does not exist');
-    }
-
-    console.log("  + Project Metadata: " + JSON.stringify(gitMetadata));
-
-    // Git Information
-    replace.sync({ files: INDEX_HTML, from: '@@stratos_git_project@@', to: gitMetadata.project });
-    replace.sync({ files: INDEX_HTML, from: '@@stratos_git_branch@@', to: gitMetadata.branch });
-    replace.sync({ files: INDEX_HTML, from: '@@stratos_git_commit@@', to: gitMetadata.commit });
-
-    // Date and Time that the build was made (approximately => it is when this script is run)
-    replace.sync({ files: INDEX_HTML, from: '@@stratos_build_date@@', to: new Date() });
-
-    // Replace loading indicator - HTML
-    let loadingHtmlFile = INDEX_LOADING_HTML_DEFAULT;
-    if (fs.existsSync(INDEX_LOADING_HTML_CUSTOM)) {
-      loadingHtmlFile = INDEX_LOADING_HTML_CUSTOM
-    }
-    const loadingHtml = fs.readFileSync(loadingHtmlFile, 'utf8');
-    replace.sync({ files: INDEX_HTML, from: '<!-- @@LOADING_HTML@@ -->', to: loadingHtml });
-
-    // Replace loading indicator - CSS
-    let loadingCssFile = INDEX_LOADING_CSS_DEFAULT;
-    if (fs.existsSync(INDEX_LOADING_CSS_CUSTOM)) {
-      loadingCssFile = INDEX_LOADING_CSS_CUSTOM
-    }
-    const loadingCss = fs.readFileSync(loadingCssFile, 'utf8');
-    replace.sync({ files: INDEX_HTML, from: '/** @@LOADING_CSS@@ **/', to: loadingCss });
-  }
-
-  // We can only do this if we have a git repository checkout
-  // We'll store this in a file which we will then use - when in environments like Docker, we will run this
-  // in the host environment so that we can pick it up when we're running in the Docker world
-  function storeGitRepositoryMetadata() {
-    // Do we have a git folder?
-    if (!fs.existsSync(GIT_FOLDER)) {
-      console.log('  + Unable to store git repository metadata - .git folder not found');
-      return;
-    }
-    var gitMetadata = {
-      project: execGit('git config --get remote.origin.url'),
-      branch: execGit('git rev-parse --abbrev-ref HEAD'),
-      commit: execGit('git rev-parse HEAD')
-    };
-
-    fs.writeFileSync(GIT_METADATA, JSON.stringify(gitMetadata, null, 2));
-  }
-
-  function execGit(cmd) {
-    try {
-      var response = execSync(cmd + ' 2> /dev/null');
-      return response.toString().trim();
-    } catch (e) {
-      return '';
-    }
-  }
-
-})();
\ No newline at end of file
diff --git a/build/fe-build.js b/build/fe-build.js
index 0542f8942c..75946dd93c 100644
--- a/build/fe-build.js
+++ b/build/fe-build.js
@@ -17,9 +17,6 @@
   var config = require('./gulp.config');
   var paths = config.paths;
 
-  // Import customization tasks
-  require('./customize-build');
-
   // Clean dist dir
   gulp.task('clean', function (next) {
     del(paths.dist + '**/*', {
diff --git a/build/tools/v4-migration/migrate.sh b/build/tools/v4-migration/migrate.sh
new file mode 100755
index 0000000000..0eb8bfd8c0
--- /dev/null
+++ b/build/tools/v4-migration/migrate.sh
@@ -0,0 +1,156 @@
+#!/usr/bin/env bash
+
+# Migrate custom theme and extensions into the new package structure
+
+set -e
+set -o pipefail
+
+# Script folder
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+STRATOS="`cd "${DIR}/../../..";pwd`"
+CUSTOM="${STRATOS}/custom-src"
+TEMPLATES=${DIR}/templates
+
+STRATOS_YML=${STRATOS}/stratos.yaml
+PKGS=${STRATOS}/src/frontend/packages
+
+echo $CUSTOM
+
+function migrateTitle() {
+  if [ -f "${CUSTOM}/stratos.yaml" ]; then
+    DATA=$(cat "${CUSTOM}/stratos.yaml")
+
+    # Make sure we have a Stratos.yaml file
+    touch ${STRATOS_YML}
+
+    TITLE=$(grep -o 'title: .*' ${CUSTOM}/stratos.yaml)
+    sed -i.bak -e '/^title:/d' ${STRATOS_YML}
+    echo -e "${TITLE}" >> ${STRATOS_YML}
+  fi
+}
+
+function migrateTheme() {
+  echo "Looking for custom theme"
+
+  # Custom theme if we have custom-src/frontend/sass/custom.scss
+  CUSTOM_THEME=${CUSTOM}/frontend/sass/custom.scss
+  if [ ! -f ${CUSTOM_THEME} ]; then
+    echo "No custom theme found"
+    return
+  fi
+
+  echo "Custom theme found ... migrating"
+
+  # Create a new package for the theme
+  THEME_DIR=${PKGS}/custom_theme
+
+  rm  -rf ${THEME_DIR}
+  mkdir ${THEME_DIR}
+  mkdir ${THEME_DIR}/sass
+  mkdir -p ${THEME_DIR}/assets/core
+  mkdir -p ${THEME_DIR}/assets/custom
+  mkdir -p ${THEME_DIR}/loader
+
+  cp -R ${CUSTOM}/frontend/sass/* ${THEME_DIR}/sass
+
+  cp ${TEMPLATES}/theme.package.json ${THEME_DIR}/package.json
+  cp ${TEMPLATES}/_index.scss ${THEME_DIR}
+
+  cp ${CUSTOM}/frontend/loading.* ${THEME_DIR}/loader/
+
+  # Update the theme in the top-level stratos.yml
+  sed -i.bak -e 's/theme: .*/theme: \"@custom\/theme\"/g' ${STRATOS_YML}
+
+  # Copy assets
+  cp -R ${CUSTOM}/frontend/assets/* ${THEME_DIR}/assets/core
+  # Favicon
+  cp -R ${CUSTOM}/frontend/favicon.ico ${THEME_DIR}/assets
+
+  # Remove lines from package.json that are not required
+  if [ ! -f "${THEME_DIR}/assets/favicon.ico" ]; then
+    sed -i.bak '/"favicon.ico"$/d' ${THEME_DIR}/package.json
+  fi
+
+  # Loading screen
+  if [ ! -f "${THEME_DIR}/loader/loading.css" ]; then
+    sed -i.bak '/loading.css",$/d' ${THEME_DIR}/package.json
+  fi
+
+  if [ ! -f "${THEME_DIR}/loader/loading.html" ]; then
+    sed -i.bak '/loading.html"$/d' ${THEME_DIR}/package.json
+  fi
+
+  rm -rf ${THEME_DIR}/package.json.bak
+}
+
+function migrateExtensions() {
+  echo "Looking for custom extensions"
+
+  # Custom theme if we have custom-src/frontend/sass/custom.scss
+  CUSTOM_MODULE=${CUSTOM}/frontend/app/custom/custom.module.ts
+  if [ ! -f ${CUSTOM_MODULE} ]; then
+    echo "No custom extensions found"
+    return
+  fi
+
+  echo "Custom extensions found ... migrating"
+
+  # Create a new package for the extension(s)
+  EXT_DIR=${PKGS}/custom_extensions
+
+  rm  -rf ${EXT_DIR}
+  mkdir -p ${EXT_DIR}/src
+  cp ${TEMPLATES}/ext.package.json ${EXT_DIR}/package.json
+  
+  # Copy the source code into the src folder
+  cp -R ${CUSTOM}/frontend/app/custom/ ${EXT_DIR}/src
+  cp ${TEMPLATES}/public-api.ts_ ${EXT_DIR}/src/public-api.ts
+
+  #IMPORT_LINE=$(awk '/imports:/{ print NR; exit }' ${CUSTOM_MODULE}
+
+  sed -i '' "s/imports: \[/imports: \[ StratosComponentsModule,/" ${EXT_DIR}/src/custom.module.ts
+
+  echo "import { StratosComponentsModule } from '@stratosui/shared';" | cat - ${EXT_DIR}/src/custom.module.ts > ${EXT_DIR}/temp.ts
+  mv -f ${EXT_DIR}/temp.ts ${EXT_DIR}/src/custom.module.ts
+
+  if [ -f ${EXT_DIR}/src/custom-routing.module.ts ]; then
+    echo -e "\nexport * from './custom-routing.module';\n" >> ${EXT_DIR}/src/public-api.ts
+
+    sed -i '' "s/_routingModule/routingModule/g" ${EXT_DIR}/package.json
+  fi
+
+  # Need to update the import references as things will have moved
+  pushd ${EXT_DIR}/src
+
+  # Not exhaustive, so extensions developers may need to manually fix imports
+  find . -name "*.ts" | xargs sed -i '' "s@'../../core@'../../../core/src/core@g"
+  find . -name "*.ts" | xargs sed -i '' "s@'../core/core.module@'../../core/src/core/core.module@g"
+  find . -name "*.ts" | xargs sed -i '' "s@'../core/customizations.types@'../../core/src/core/customizations.types@g"
+  find . -name "*.ts" | xargs sed -i '' 's@../core/md.module@../../core/src/core/md.module@g'
+  find . -name "*.ts" | xargs sed -i '' "s@'../shared/shared.module@'../../core/src/shared/shared.module@g"
+  find . -name "*.ts" | xargs sed -i '' "s@'../../../../store/src/app-state@'../../../store/src/app-state@g"
+  find . -name "*.ts" | xargs sed -i '' "s@'../../features/login/login-page/login-page.component@'../../../core/src/features/login/login-page/login-page.component@g"
+
+  popd
+}
+
+pushd "${STRATOS}" > /dev/null
+
+# Look for custom-src folder
+
+
+if [ -d "${CUSTOM}" ]; then
+  echo "Found customizations to migrate"
+else
+  echo "No custom src folder exists - nothing to migrate"
+  popd > /dev/null
+  exit 1
+fi
+
+migrateTitle
+migrateTheme
+migrateExtensions
+
+popd > /dev/null
+
+cat $STRATOS_YML
\ No newline at end of file
diff --git a/build/tools/v4-migration/templates/_index.scss b/build/tools/v4-migration/templates/_index.scss
new file mode 100644
index 0000000000..a8d3f300e1
--- /dev/null
+++ b/build/tools/v4-migration/templates/_index.scss
@@ -0,0 +1,9 @@
+@import '~@stratosui/theme/helper';
+
+// Custom Theme
+@import './sass/custom';
+
+@function stratos-theme() {
+  $theme: stratos-theme-helper($stratos-theme);
+  @return $theme
+}
\ No newline at end of file
diff --git a/src/frontend/packages/store/testing/package.json b/build/tools/v4-migration/templates/ext.package.json
similarity index 53%
rename from src/frontend/packages/store/testing/package.json
rename to build/tools/v4-migration/templates/ext.package.json
index 7dd43ac8c1..e22a84b356 100644
--- a/src/frontend/packages/store/testing/package.json
+++ b/build/tools/v4-migration/templates/ext.package.json
@@ -1,8 +1,12 @@
 {
-  "name": "store/testing",
+  "name": "@custom/extensions",
   "version": "0.0.1",
   "peerDependencies": {
     "@angular/common": "^6.0.0-rc.0 || ^6.0.0",
     "@angular/core": "^6.0.0-rc.0 || ^6.0.0"
+  },
+  "stratos": {
+    "module": "CustomModule",
+    "_routingModule": "CustomRoutingModule"
   }
 }
\ No newline at end of file
diff --git a/build/tools/v4-migration/templates/public-api.ts_ b/build/tools/v4-migration/templates/public-api.ts_
new file mode 100644
index 0000000000..b78971cc53
--- /dev/null
+++ b/build/tools/v4-migration/templates/public-api.ts_
@@ -0,0 +1,3 @@
+// Custom Extensions
+
+export * from './custom.module';
\ No newline at end of file
diff --git a/build/tools/v4-migration/templates/theme.package.json b/build/tools/v4-migration/templates/theme.package.json
new file mode 100644
index 0000000000..a588ac2e99
--- /dev/null
+++ b/build/tools/v4-migration/templates/theme.package.json
@@ -0,0 +1,19 @@
+{
+  "name": "@custom/theme",
+  "version": "0.0.1",
+  "stratos": {
+    "assets": {
+      "assets/core": "core/assets",
+      "assets/favicon.ico": "favicon.ico"
+    },
+    "theme":{
+      "loadingCss": "loader/loading.css",
+      "loadingHtml": "loader/loading.html"
+    }
+  },
+  "peerDependencies": {
+  },
+  "scripts": {
+    "build": "rm -rf ../../../../dist/theme && mkdir -p ../../../../dist/theme && cp -R * ../../../../dist/theme"
+  }
+}
diff --git a/deploy/cloud-foundry/build.sh b/deploy/cloud-foundry/build.sh
index 0d3f2eb8d3..3d89979b33 100755
--- a/deploy/cloud-foundry/build.sh
+++ b/deploy/cloud-foundry/build.sh
@@ -39,7 +39,6 @@ else
   # Build front-end
   log "Fetching front-end dependencies" $CYAN
   npm install
-  npm run customize
 
   log "Building front-end" $CYAN
   npm run build-cf
diff --git a/deploy/kubernetes/README.md b/deploy/kubernetes/README.md
index 10358b4ad5..6d8d583560 100644
--- a/deploy/kubernetes/README.md
+++ b/deploy/kubernetes/README.md
@@ -1,401 +1,15 @@
 # Deploying in Kubernetes
 
-The following guide details how to deploy Stratos in Kubernetes.
+Stratos can be deployed to Kubernetes using [Helm](https://github.com/kubernetes/helm).
 
-<!-- TOC -->
-- [Requirements](#requirements)
-  * [Kubernetes](#kubernetes)
-  * [Helm](#helm)
-  * [Storage Class](#storage-class)
-- [Deploying Stratos](#deploying-stratos)
-  * [Deploy using the Helm repository](#deploy-using-the-helm-repository)
-  * [Deploy using an archive of the Helm Chart](#deploy-using-an-archive-of-the-helm-chart)
-  * [Deploying using the GitHub repository](#deploying-using-the-github-repository)
-- [Accessing the Console](#accessing-the-console)
-- [Advanced Topics](#advanced-topics)
-  * [Using a Load Balancer](#using-a-load-balancer)
-  * [Using an Ingress Controller](#ingress)
-  * [Specifying an External IP](#specifying-an-external-ip)
-  * [Upgrading your deployment](#upgrading-your-deployment)
-  * [Specifying UAA configuration](#specifying-uaa-configuration)
-  * [Configuring a local user account](#configuring-a-local-user-account)
-  * [Specifying a custom Storage Class](#specifying-a-custom-storage-class)
-    + [Providing Storage Class override](#providing-storage-class-override)
-    + [Create a default Storage Class](#create-a-default-storage-class)
-  * [Deploying Stratos with your own TLS certificates](#deploying-stratos-with-your-own-tls-certificates)
-  * [Using with a Secure Image Repostiory](#using-with-a-secure-image-repository)
-  * [Installing Nightly Release](#installing-a-nightly-release)
-<!-- /TOC -->
+As part of the Stratos release process, a Helm chart is generated and added to the release artifacts for a given release. In addition, we maintain a Helm Chart repository that can be used to install Stratos from:
 
-## Requirements
-
-### Kubernetes
+`https://cloudfoundry.github.io/stratos`
 
 You will need a suitable Kubernetes environment and a machine from which to run the deployment commands.
 
-You will need to have the `kubectl` CLI installed and available on your path. It should be appropriately configured to be able to communicate with your Kubernetes environment.
-
-### Helm
-
-We use [Helm](https://github.com/kubernetes/helm) for deploying to Kubernetes.
-
-You will need the latest Helm client installed on the machine from which you are deploying and you will need to install the Helm Server (Tiller) into you Kubernetes environment.
-
-- Download the Helm client for your system from https://github.com/kubernetes/helm/releases.
-For convenience the guide assumes that the helm client has been added to your PATH.
-- To install the Helm server (Tiller) in your Kubernetes environment by running the following command:
-```
-helm init
-```
-
-If you already Helm installed, please make sure it is the latest version. To update your Helm server (Tiller) in your Kubernetes environment after you download the latest Helm release, run the following command:
-```
-helm init --upgrade
-```
-### Storage Class
-
-Stratos uses persistent volumes. In order to deploy it in your Kubernetes environment, you must
-have a storage class available.
-
-Without configuration, the Stratos Helm Chart will use the default storage class. If a default storage
-class is not available, installation will fail.
-
-To check if a `default` storage class exists, you can list your configured storage classes with `kubectl get storageclass`. If no storage class has `(default)` after it, then you need to either specify a storage class override or declare a default storage class for your Kubernetes cluster.
-
-For non-production environments, you may want to use the `hostpath` storage class. See the [SCF instructions](https://github.com/SUSE/scf/wiki/How-to-Install-SCF#choosing-a-storage-class) for details on setting this up. Note that you will need to make this storage class the default storage class, e.g.
-
-```
-kubectl patch storageclass <your-class-name> -p '{"metadata": {"annotations":{"storageclass.kubernetes.io/is-default-class":"true"}}}'
-```
-Where `<your-class-name>` would be `hostpath` if you follow the SCF instructions.
-## Deploying Stratos
-
-You can deploy Stratos from one of three different sources:
-
-1. Using our Helm repository
-1. Using an archive file containing a given release of our Helm chart
-1. Using the latest Helm chart directly from out GitHub repository
-
-> **Note**: By default each deployment method deploys Stratos with its default user authentication mechanism - which requires a UAA. If you wish to use Stratos without the requirement for a UAA component, use the deployment commands from the following section below: [Configuring a local user account](#configuring-a-local-user-account). All other steps for each deployment method remain the same, as detailed in the following sections.
-
-### Deploy using the Helm repository
-
-Add the Helm repository to your helm installation
-```
-helm repo add stratos https://cloudfoundry.github.io/stratos
-```
-Check the repository was successfully added by searching for the `console`
-```
-helm search console 
-NAME                    VERSION DESCRIPTION                       
-stratos/console         0.9.0 A Helm chart for deploying Console
-```
-To install Stratos.
-
-```
-helm install stratos/console --namespace=console --name my-console
-```
-> **Note**: The previous assumes that a storage class exists in the kubernetes cluster that has been marked as `default`. If no such storage class exists, a specific storage class needs to be specified, please see the following section *Specifying a custom Storage Class*. 
-
-> You can change the namespace (--namespace) and the release name (--name) to values of your choice.
-
-This will create a Console instance named `my-console` in a namespace called `console` in your Kubernetes cluster.
-
-After the install, you should be able to access the Console in a web browser by following [the instructions](#accessing-the-console) below.
-
-### Deploy using an archive of the Helm Chart
-
-Helm chart archives are available for Stratos releases from our GitHub repository, under releases - see https://github.com/suse/stratos/releases.
-
-Download the appropriate release `console-helm-chart.X.Y.Z.tgz` from the GitHub repository and unpack the archive to a local folder. The Helm Chart will be extracted to a sub-folder named `console`.
-
-Deploy Stratos with:
-
-```
-helm install console --namespace=console --name my-console
-```
-
-### Deploying using the GitHub repository
-
-> Note: Deploying using the GitHub repository uses the latest Stratos images that are built nightly (tagged `latest`). While these contain the very latest updates, they may contain bugs or instabilities.
-
-Clone the Stratos GitHub repository:
-
-```
-git clone https://github.com/suse/stratos.git
-```
-
-Open a terminal and cd to the `deploy/kubernetes` directory:
-
-```
-$ cd deploy/kubernetes
-```
-
-Run helm install:
-
-```
-$ helm install console --namespace console --name my-console
-```
-
-> You can change the namespace (--namespace) and the release name (--name) to values of your choice.
-
-This will create a Console instance named `my-console` in a namespace called `console` in your Kubernetes cluster.
-
-You should now be able to access the Console in a web browser by following the instructions below.
-
-## Accessing the Console
-
-To check the status of the instance use the following command:
-```
-helm status my-console
-```
-
-> Note: Replace `my-console` with the value you used for the `name` parameter, or if you did not provide one, use the `helm list` command to find the release name that was automatically generated for you.
-
-Once the instance is in `DEPLOYED` state, find the IP address and port that the console is running on:
-
-```
-$ helm status my-console | grep ui-ext
-console-ui-ext        10.0.0.162  192.168.77.1      80:30933/TCP,443:30941/TCP  1m  
-```
-
-In this example, the IP address is `192.168.77.1` and the node-port is `30941`, so the console is accessible on:
-
-`https://192.168.77.1:30941`
-
-The values will be different for your environment.
-
-You can now access the UI.
-
-> You may see a certificate warning which you can safely ignore.
-
-To login use the following credentials detailed [here](../../docs/access.md).
-
-> Note: For some environments like Minikube, you are not given an IP Address - it may show as `<nodes>`. In this case, run `kubectl cluster-info` and use the IP address of your node shown in the output of this command.
-
-## Advanced Topics
-### Using a Load Balancer
-If your Kubernetes deployment supports automatic configuration of a load balancer (e.g. Google Container Engine), specify the parameters `console.service.type=LoadBalancer` when installing.
-
-```
-helm install stratos/console --namespace=console --name my-console --set console.service.type=LoadBalancer
-```
-
-### Using an Ingress Controller
-
-If your Kubernetes Cluster supports Ingress, you can expose Stratos through Ingress by supplying the appropriate ingress configuration when installing.
-
-This configuration is described below:
-
-|Parameter|Description|Default|
-|----|---|---|
-|console.service.ingress.enabled|Enables ingress|false|
-|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.service.ingress.host|The host name that will be used for the Stratos service.||
-|console.service.ingress.secretName|The existing TLS secret that contains the certificate for ingress.||
-
-You must provide `console.service.ingress.host` when enabling ingress.
-
-By default a certificate will be generated for TLS. You can provide your own certificate by creating a secret and specifying this with `console.service.ingress.secretName`.
-
-> Note: If you do not supply `console.service.ingress.host` but do supply `env.DOMAIN` then the host `console.[env.DOMAIN]` will be used.
-
-### Specifying an External IP
-
-If the kubernetes cluster supports external IPs for services (see [ Service External IPs](https://kubernetes.io/docs/concepts/services-networking/service/#external-ips)), then the following arguments can be provided. In this following example the dashboard will be available at `https://192.168.100.100:5000`.
-
-```
-helm install stratos/console --namespace=console --name my-console --set console.service.externalIPs={192.168.100.100} --set console.service.servicePort=5000
-```
-
-### Upgrading your deployment
-
-To upgrade your instance when using the Helm repository, fetch any updates to the repository:
-
-```
-$ helm repo update
-```
-
-To update an instance, the following assumes your instance is called `my-console`, and overrides have been specified in a file called `overrides.yaml`.
-
-```
-$ helm upgrade -f overrides.yaml my-console stratos/console
-```
-
-After the upgrade, perform a `helm list` to ensure your console is the latest version.
-
-
-
-### Specifying UAA configuration
-
-When deploying with SCF, the `scf-config-values.yaml` (see [SCF Wiki link](https://github.com/SUSE/scf/wiki/How-to-Install-SCF#configuring-the-deployment)) can be supplied when installing Stratos.
-```
-$ helm install stratos/console  -f scf-config-values.yaml
-```
-
-Alternatively, you can supply the following configuration. Edit according to your environment and save to a file called `uaa-config.yaml`.
-```
-uaa:
-  protocol: https://
-  port: 2793
-  host: uaa.cf-dev.io
-  consoleClient:  cf
-  consoleClientSecret: 
-  consoleAdminIdentifier: cloud_controller.admin 
-  skipSSLValidation: false
-```
-
-To install Stratos with the above specified configuration:
-```
-$ helm install stratos/console -f uaa-config.yaml
-```
-
-### Configuring a local user account
-
-This allows for deployment without a UAA. To enable the local user account, supply a password for the local user in the deployment command, as follows. All other steps for each deployment method should be followed as in the preceding sections above.
-
-To deploy using our Helm repository:
-
-```
-helm install stratos/console --namespace=console --name my-console --set console.localAdminPassword=<password>
-```
-
-To deploy using an archive file containing a given release of our Helm chart
-
-```
-helm install console --namespace=console --name my-console --set console.localAdminPassword=<password>
-```
-
-To deploy using the latest Helm chart directly from out GitHub repository
-
-```
-$ helm install console --namespace console --name my-console --set console.localAdminPassword=<password>
-```
-
-For console access via the local user account see: [*Accessing the Console*](#accessing-the-console)
-
-### Specifying a custom Storage Class 
-
-If no default storage class has been defined in the Kubernetes cluster. The Stratos helm chart will fail to deploy successfully. To check if a `default` storage class exists, you can list your configured storage classes with `kubectl`. If no storage class has `(default)` after it, then you need to either specify a storage class override or declare a default storage class for your Kubernetes cluster.
-
-#### Providing Storage Class override
-```
-$ kubectl get storageclass
-NAME                TYPE
-ssd                 kubernetes.io/host-path   
-persistent          kubernetes.io/host-path   
-```
-
-For instance to use the storage class `persistent` to deploy Console persistent volume claims, store the following to a file called `override.yaml`.
-
-```
----
-storageClass: persistent
-```
-
-If you want MariaDB to use a specific storage class (which can be different to that used for the other components), then specify the following:
-```
----
-storageClass: persistent
-mariadb:
-  persistence:
-    storageClass: persistent
-```
-
-Run Helm with the override:
-```
-helm install -f override.yaml stratos/console
-```
-
-#### Create a default Storage Class
-Alternatively, you can configure a storage class with `storageclass.kubernetes.io/is-default-class` set to `true`. For instance the following storage class will be declared as the default. If you don't have the `hostpath` provisioner available in your local cluster, please follow the instructions on [link] (https://github.com/kubernetes-incubator/external-storage/tree/master/docs/demo/hostpath-provisioner), to deploy one.
-
-If the hostpath provisioner is available, save the file to `storageclass.yaml`
-
-```
----
-kind: StorageClass
-apiVersion: storage.k8s.io/v1beta1
-metadata:
-  name: default
-  annotations:
-    storageclass.kubernetes.io/is-default-class: "true"
-provisioner: kubernetes.io/host-path # Or whatever the local hostpath provisioner is called
-```
-
-To create it in your kubernetes cluster, execute the following.
-```
-kubectl create -f storageclass.yaml
-```
-
-See [Storage Class documentation] ( https://kubernetes.io/docs/tasks/administer-cluster/change-default-storage-class/) for more insformation.
-
-### Deploying Stratos with your own TLS certificates
-
-By default the console will generate self-signed certificates for demo purposes. To configure Stratos UI to use your provided TLS certificates set the `consoleCert` and `consoleCertKey` overrides.
-
-```
-consoleCert: |
-    -----BEGIN CERTIFICATE-----
-    MIIDXTCCAkWgAwIBAgIJAJooOiQWl1v1MA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
-    ...
-    -----END CERTIFICATE-----
-consoleCertKey: |
-    -----BEGIN PRIVATE KEY-----
-    MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDV9+ySh0xZzM41
-    ....
-    -----END PRIVATE KEY-----
-``` 
-Assuming the above is stored in a file called `override-ssl.yaml`, install the chart with the override specified.
-```
-helm install -f override-ssl.yaml stratos/console --namespace console
-```
-
-### Using with a Secure Image Repository
-If you are deploying the helm chart against images that are hosted in a secure image repository provide the following parameters ( store the following to a file called `docker-registry-secrets.yaml`).
-
-
-```
-kube:
-  registry:
-    hostname: mysecure-dockerregistry.io
-    username: john.appleseed
-    password: sup3rs3cur3
-    # `email` is an optional field
-    email: john.appleseed@foobar.com
-```
-
-Deploy the chart with the provided parameters:
-```
-helm install -f docker-registry-secrets.yaml stratos/console
-```
-
-### Installing a Nightly Release
-Nightly releases are pushed with a `dev` tag. These are strictly for development purposes and should be considered unstable and may contain bugs.
-
-To install the nightly release: 
-
-Update your Helm repositories to ensure you have the latest nightly release information:
-
-```
-helm repo update
-```
-
-List all versions of the console, to determine the tag.
-```
-helm search console -l
-NAME                 CHART VERSION           DESCRIPTION                       
-stratos/console      2.0.0-dev-9a5611dc      A Helm chart for deploying Stratos UI Consoles
-stratos/console      1.0.2                   A Helm chart for deploying Stratos UI Console
-stratos/console      1.0.0                   A Helm chart for deploying Stratos UI Console
-stratos/console      0.9.9                   A Helm chart for deploying Stratos UI Console
-stratos/console      0.9.8                   A Helm chart for deploying Stratos UI Console
-
-```
-Install
+You will need to have both the `kubectl` and `helm` CLIs installed and available on your path. It should be appropriately configured to be able to communicate with your Kubernetes environment.
 
-```
-helm install stratos/console --namespace=console --name my-console --version 2.0.0-dev-9a5611dc
-```
+The Stratos Helm chart contains a `README.md` file that contains installation instructions and configuration documentation.
 
+This document is also available in our GitHub repository here: [README.md](https://github.com/cloudfoundry/stratos/blob/master/deploy/kubernetes/console/README.md).
diff --git a/deploy/stratos-ui-release/packages/backend/pre_packaging b/deploy/stratos-ui-release/packages/backend/pre_packaging
index 99faea2123..ba252553a7 100644
--- a/deploy/stratos-ui-release/packages/backend/pre_packaging
+++ b/deploy/stratos-ui-release/packages/backend/pre_packaging
@@ -10,7 +10,6 @@ curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
 
 # Build backend
 npm install
-npm run customize
 export PATH=$PATH:$PWD/node_modules/.bin
 npm run bosh-build-backend
 
diff --git a/deploy/stratos-ui-release/packages/frontend/pre_packaging b/deploy/stratos-ui-release/packages/frontend/pre_packaging
index c2c28d2215..440e323fa2 100644
--- a/deploy/stratos-ui-release/packages/frontend/pre_packaging
+++ b/deploy/stratos-ui-release/packages/frontend/pre_packaging
@@ -4,7 +4,6 @@ set -e -x
 cd ${BUILD_DIR}/stratos
 
 npm install
-npm run customize
 export PATH=$PATH:$PWD/node_modules/.bin
 npm run build
 
diff --git a/docs/customizing.md b/docs/customizing.md
index 496b7fddb6..e81f9ebabd 100644
--- a/docs/customizing.md
+++ b/docs/customizing.md
@@ -8,11 +8,44 @@ Stratos provides a mechanism for customization - the following customizations ar
 - Adding new functionality
 - Changing the initial loading indicator
 
+# Migrating to Stratos V4 Customization
+In V4 there are breaking customization changes. These changes allow a much improved approach to extensions by opening the door to npm style plugins.
+To aid in migrating we've provided these instructions.
+
+1) Before updating to the latest code...
+    1) Run `npm run customize-reset` to remove all previously created sym links.
+    2) Read through the customization documentation below to get a better understanding of the new process.
+1) Update your codebase with the desired v4 code.
+1) Run `npm install` (only required first time, this will ensure you have the required version of Angular).
+1) Change directory to `./build/tools/v4-migration` and run the migration script `./migrate.sh`.
+    - This will copy your customizations from `custom-src` to a new Angular package `src/frontend/packages/custom_extensions`.
+1) Check that the new package exports your custom module and if applicable your custom-routing module.
+    - The migrate script should do this in `src/frontend/packages/custom_extensions/src/public-api.ts`.
+1) Check that your ts config file defines the public api file.
+    - `src/tsconfig.json` file's `compilerOptions/paths` section should contain something like `"@custom/extensions": ["frontend/packages/custom_extensions/src/public-api.ts"]`.
+1) Check that your new package's package.json defines your custom module and if application custom-routing module.
+    - See `src/frontend/packages/suse_extensions/package.json` file's `stratos` section.
+    - Note your `routingModule` entry label should not have a preceding `_`.
+1) Build Stratos in your usual way, for instance `npm run build`.
+    - It could be that this fails due to TypeScript import issues, if so go through these and fix.
+    - During build time the custom packages will be discovered and output, see section starting `Building with these extensions`. These should contain the modules your require.
+1) Run Stratos your usual way. Ensure you can navigate to all your custom parts.
+1) Once you are happy everything works as intended remove the old `./custom-src` directory and commit you changes.
+
 ## Approach
 
 In order to customize Stratos, you will need to fork the Stratos GitHub repository and apply customizations in your fork. Our aim is to minimize any merge conflicts that might occur when re-basing your fork with the upstream Stratos repository.
 
-All customizations are placed within a top-level folder named `custom-src`. This folder should only exist in forks and will not exist in the main Stratos repository, so any changes made within this folder should be free from merge conflicts.
+<!-- All customizations are placed within a top-level folder named `custom-src`. This folder should only exist in forks and will not exist in the main Stratos repository, so any changes made within this folder should be free from merge conflicts. -->
+Customizations are placed in angular packages in the folder named `src/frontend/packages`. In the future you will be able to host these packages in npm and bring them into Stratos in the usual npm dependency way.
+
+Each package should contain custom Stratos configuration in it's package.json pointing to the modules it will be required to import. 
+
+stratos.yaml
+custom theme
+custom styles
+custom assets
+
 
 The Stratos approach to customization uses symbolic links. We maintain a default set of resources in the folder `src/misc/custom`. When you run `npm install` or when you explicitly run `npm run customize`, a gulp task (in the file `build/fe-build.js`) runs and creates symbolic links, linking the required files to their expected locations withing the `src` folder.
 
diff --git a/package-lock.json b/package-lock.json
index 200d6f47de..eec8e18f4e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,20 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@angular-builders/custom-webpack": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-9.2.0.tgz",
+      "integrity": "sha512-0ivkjENONFm0oNy6hdCod4YaT4dUk80KuP9+eDliWuZIA70yKQgIYMLul0bz6/i+Cm24PaZ2tq4w7kW7AuSMoA==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/architect": ">=0.900.0 < 0.1000.0",
+        "@angular-devkit/build-angular": ">=0.900.0 < 0.1000.0",
+        "@angular-devkit/core": "^9.0.0",
+        "lodash": "^4.17.10",
+        "ts-node": "^8.5.2",
+        "webpack-merge": "^4.2.1"
+      }
+    },
     "@angular-devkit/architect": {
       "version": "0.901.7",
       "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.7.tgz",
@@ -618,6 +632,17 @@
       "resolved": "https://registry.npmjs.org/@angular/router/-/router-9.1.9.tgz",
       "integrity": "sha512-4u+CWMPB4hCkAsFCEzC94YEWT0wVozqGkc/Dortt2hFaqvZpIegg6iJVZlDxuyDjzFYBPnnbTDdgiTTA8ckfuA=="
     },
+    "@apidevtools/json-schema-ref-parser": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.1.tgz",
+      "integrity": "sha512-Qsdz0W0dyK84BuBh5KZATWXOtVDXIF2EeNRzpyWblPUeAmnIokwWcwrpAm5pTPMjuWoIQt9C67X3Af1OlL6oSw==",
+      "dev": true,
+      "requires": {
+        "@jsdevtools/ono": "^7.1.2",
+        "call-me-maybe": "^1.0.1",
+        "js-yaml": "^3.13.1"
+      }
+    },
     "@babel/code-frame": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
@@ -2912,6 +2937,12 @@
         }
       }
     },
+    "@jsdevtools/ono": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.2.tgz",
+      "integrity": "sha512-qS/a24RA5FEoiJS9wiv6Pwg2c/kiUo3IVUQcfeM9JvsR6pM8Yx+yl/6xWYLckZCT5jpLNhslgjiA8p/XcGyMRQ==",
+      "dev": true
+    },
     "@ngrx/effects": {
       "version": "9.2.0",
       "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-9.2.0.tgz",
@@ -3944,6 +3975,12 @@
       "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
       "dev": true
     },
+    "any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
+      "dev": true
+    },
     "anymatch": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
@@ -5250,6 +5287,12 @@
         }
       }
     },
+    "call-me-maybe": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
+      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
+      "dev": true
+    },
     "caller-callsite": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
@@ -5465,6 +5508,20 @@
       "integrity": "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==",
       "dev": true
     },
+    "cli-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-2.0.0.tgz",
+      "integrity": "sha512-a0VZ8LeraW0jTuCkuAGMNufareGHhyZU9z8OGsW0gXd1hZGi1SRuNRXdbGkraBBKnhyUhyebFWnRbp+dIn0f0A==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.1.1",
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.51",
+        "es6-iterator": "^2.0.3",
+        "memoizee": "^0.4.14",
+        "timers-ext": "^0.1.7"
+      }
+    },
     "cli-cursor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
@@ -7113,7 +7170,7 @@
     },
     "duplexer": {
       "version": "0.1.1",
-      "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
       "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
       "dev": true
     },
@@ -7816,7 +7873,7 @@
     },
     "event-stream": {
       "version": "3.3.4",
-      "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
       "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
       "dev": true,
       "requires": {
@@ -8760,7 +8817,6 @@
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
       "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-      "dev": true,
       "optional": true
     },
     "function-bind": {
@@ -10388,6 +10444,12 @@
         "isobject": "^3.0.1"
       }
     },
+    "is-promise": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
+      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
+      "dev": true
+    },
     "is-property": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
@@ -11022,6 +11084,43 @@
       "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
       "dev": true
     },
+    "json-schema-ref-parser": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-9.0.1.tgz",
+      "integrity": "sha512-KLrCjRjW5hMXxsX4osVBWpwixXL9NtICfpyNNS0eHguN5mP/I4UatI7i7PFS8jU94b1NHF4EbirACdCn0RFPBA==",
+      "dev": true,
+      "requires": {
+        "@apidevtools/json-schema-ref-parser": "9.0.1"
+      }
+    },
+    "json-schema-to-typescript": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/json-schema-to-typescript/-/json-schema-to-typescript-9.1.0.tgz",
+      "integrity": "sha512-9/yDXQQyqtRDxohQGRCKht4Wjfg73TALi1yzy651EOo71a6aKFtIm2WUbDWSf8OitFGukUn00dx4t1kg0W6O4Q==",
+      "dev": true,
+      "requires": {
+        "@types/json-schema": "^7.0.4",
+        "cli-color": "^2.0.0",
+        "glob": "^7.1.6",
+        "is-glob": "^4.0.1",
+        "json-schema-ref-parser": "^9.0.1",
+        "json-stringify-safe": "^5.0.1",
+        "lodash": "^4.17.15",
+        "minimist": "^1.2.5",
+        "mkdirp": "^1.0.4",
+        "mz": "^2.7.0",
+        "prettier": "^2.0.5",
+        "stdin": "0.0.1"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        }
+      }
+    },
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -11248,13 +11347,6 @@
             "path-exists": "^4.0.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",
@@ -12017,6 +12109,15 @@
         }
       }
     },
+    "lru-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
+      "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
+      "dev": true,
+      "requires": {
+        "es5-ext": "~0.10.2"
+      }
+    },
     "magic-string": {
       "version": "0.25.7",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
@@ -12140,7 +12241,7 @@
     },
     "map-stream": {
       "version": "0.1.0",
-      "resolved": "http://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
       "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
       "dev": true
     },
@@ -12219,12 +12320,6 @@
           "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
           "dev": true
         },
-        "fsevents": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-          "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-          "optional": true
-        },
         "glob-parent": {
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
@@ -12331,6 +12426,22 @@
         }
       }
     },
+    "memoizee": {
+      "version": "0.4.14",
+      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz",
+      "integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "^0.10.45",
+        "es6-weak-map": "^2.0.2",
+        "event-emitter": "^0.3.5",
+        "is-promise": "^2.1",
+        "lru-queue": "0.1",
+        "next-tick": "1",
+        "timers-ext": "^0.1.5"
+      }
+    },
     "memory-fs": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
@@ -12854,6 +12965,17 @@
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
       "dev": true
     },
+    "mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "dev": true,
+      "requires": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
+    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -14933,7 +15055,7 @@
     },
     "pause-stream": {
       "version": "0.0.11",
-      "resolved": "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
       "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
       "dev": true,
       "requires": {
@@ -15802,6 +15924,12 @@
       "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
       "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
     },
+    "prettier": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz",
+      "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==",
+      "dev": true
+    },
     "pretty-hrtime": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
@@ -18516,7 +18644,7 @@
     },
     "split": {
       "version": "0.3.3",
-      "resolved": "http://registry.npmjs.org/split/-/split-0.3.3.tgz",
+      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
       "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
       "dev": true,
       "requires": {
@@ -18628,6 +18756,12 @@
       "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
       "dev": true
     },
+    "stdin": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/stdin/-/stdin-0.0.1.tgz",
+      "integrity": "sha1-0wQZgarsPf28d6GzjWNy449ftx4=",
+      "dev": true
+    },
     "stealthy-require": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
@@ -18693,7 +18827,7 @@
     },
     "stream-combiner": {
       "version": "0.0.4",
-      "resolved": "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
       "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
       "dev": true,
       "requires": {
@@ -19604,6 +19738,24 @@
       "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
       "dev": true
     },
+    "thenify": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "dev": true,
+      "requires": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
+      "dev": true,
+      "requires": {
+        "thenify": ">= 3.1.0 < 4"
+      }
+    },
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -19651,6 +19803,16 @@
         "setimmediate": "^1.0.4"
       }
     },
+    "timers-ext": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
+      "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
+      "dev": true,
+      "requires": {
+        "es5-ext": "~0.10.46",
+        "next-tick": "1"
+      }
+    },
     "timsort": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
@@ -20657,13 +20819,6 @@
             "to-regex-range": "^5.0.1"
           }
         },
-        "fsevents": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-          "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-          "dev": true,
-          "optional": true
-        },
         "glob-parent": {
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
@@ -20793,13 +20948,6 @@
                 "to-regex": "^3.0.1"
               }
             },
-            "fsevents": {
-              "version": "1.2.13",
-              "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-              "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-              "dev": true,
-              "optional": true
-            },
             "readdirp": {
               "version": "2.2.1",
               "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
@@ -20844,6 +20992,13 @@
             "to-regex-range": "^2.1.0"
           }
         },
+        "fsevents": {
+          "version": "1.2.13",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+          "dev": true,
+          "optional": true
+        },
         "is-binary-path": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
diff --git a/package.json b/package.json
index 8e5d3381a3..17dd16aca8 100644
--- a/package.json
+++ b/package.json
@@ -14,12 +14,12 @@
     "build": "node --max_old_space_size=8192 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",
+    "prebuild-ui": "npm run build && gulp package-prebuild",
     "ng": "ng",
-    "start": "npm run customize && ng serve",
-    "start-high-mem": "npm run customize && node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng serve",
-    "start-dev-high-mem": "npm run customize && node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng serve --aot=false",
-    "start-prod-high-mem": "npm run customize && node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng serve --prod",
+    "start": "ng serve",
+    "start-high-mem": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng serve",
+    "start-dev-high-mem": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng serve --aot=false",
+    "start-prod-high-mem": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng serve --prod",
     "start-dev": "ng serve --aot=false",
     "test-clean": "./build/clean-test-reports.sh",
     "test-reports": "./build/show-test-reports.sh",
@@ -38,11 +38,9 @@
     "headless-e2e": "xvfb-run --server-args='-screen 0 1920x1080x24' protractor ./protractor.conf.js",
     "climate": "codeclimate analyze $(git diff --name-only master)",
     "gate-check": "npm run lint && npm run test-headless",
-    "customize": "gulp customize",
-    "customize-default": "gulp customize-default",
-    "customize-reset": "gulp customize-reset",
     "store-git-metadata": "gulp store-git-metadata",
-    "postinstall": "npm run customize && gulp dev-setup"
+    "postinstall": "gulp dev-setup && npm run build-devkit",
+    "build-devkit": "cd src/frontend/packages/devkit && npm run build"
   },
   "author": "",
   "license": "Apache-2.0",
@@ -96,12 +94,16 @@
     "node": "12.13.0"
   },
   "devDependencies": {
+    "@angular-builders/custom-webpack": "^9.1.0",
+    "@angular-devkit/architect": "^0.901.7",
     "@angular-devkit/build-angular": "~0.901.5",
     "@angular-devkit/build-ng-packagr": "~0.901.5",
+    "@angular-devkit/core": "^9.1.7",
     "@angular-devkit/schematics": "^9.1.5",
     "@angular/cli": "^9.1.5",
     "@angular/compiler-cli": "^9.1.6",
     "@angular/language-service": "^9.1.6",
+    "@schematics/angular": "^9.1.5",
     "@types/jasmine": "^3.5.10",
     "@types/jasminewd2": "~2.0.8",
     "@types/karma": "^5.0.0",
@@ -111,6 +113,7 @@
     "browserstack-local": "^1.4.5",
     "codecov": "^3.6.5",
     "codelyzer": "^5.1.2",
+    "copy-webpack-plugin": "5.1.1",
     "delete": "^1.1.0",
     "fs-extra": "^9.0.0",
     "globby": "^11.0.0",
@@ -122,6 +125,7 @@
     "jasmine-core": "~3.5.0",
     "jasmine-spec-reporter": "~5.0.1",
     "js-yaml": "~3.13.1",
+    "json-schema-to-typescript": "^9.1.0",
     "karma": "~5.0.1",
     "karma-chrome-launcher": "~3.1.0",
     "karma-cli": "~2.0.0",
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 e7463eee23..e470be161e 100644
--- a/src/frontend/packages/cf-autoscaler/src/cf-autoscaler.module.ts
+++ b/src/frontend/packages/cf-autoscaler/src/cf-autoscaler.module.ts
@@ -52,7 +52,6 @@ const customRoutes: Routes = [
   ],
   declarations: [
     AutoscalerTabExtensionComponent
-  ],
-  entryComponents: [AutoscalerTabExtensionComponent]
+  ]
 })
 export class CfAutoscalerModule { }
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 2faabe86af..cb76b829f2 100644
--- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts
+++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts
@@ -83,13 +83,6 @@ import { AutoscalerRoutingModule } from './autoscaler.routing';
   ],
   providers: [
     ApplicationService
-  ],
-  entryComponents: [
-    AppAutoscalerMetricChartCardComponent,
-    AppAutoscalerComboChartComponent,
-    AppAutoscalerComboSeriesVerticalComponent,
-    TableCellAutoscalerEventChangeComponent,
-    TableCellAutoscalerEventStatusComponent
   ]
 })
 export class AutoscalerModule { }
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 eff100853b..b96d66bdb5 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
@@ -15,6 +15,9 @@ import {
 import {
   RunningInstancesComponent,
 } from '../../../../cloud-foundry/src/shared/components/running-instances/running-instances.component';
+import {
+  cfCurrentUserPermissionsService,
+} from '../../../../cloud-foundry/src/user-permissions/cf-user-permissions-checkers';
 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';
@@ -48,7 +51,8 @@ describe('AutoscalerTabExtensionComponent', () => {
       providers: [
         DatePipe,
         { provide: ApplicationService, useClass: ApplicationServiceMock },
-        TabNavService
+        TabNavService,
+        ...cfCurrentUserPermissionsService
       ]
     })
       .compileComponents();
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 dfee79bace..9b3b56c9b2 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
@@ -2,15 +2,25 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
-import { combineLatest, Observable, Subscription } from 'rxjs';
-import { distinctUntilChanged, filter, first, map, pairwise, publishReplay, refCount } from 'rxjs/operators';
+import { combineLatest, Observable, of, Subscription } from 'rxjs';
+import { distinctUntilChanged, filter, first, map, pairwise, publishReplay, refCount, switchMap } from 'rxjs/operators';
 
-import { applicationEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
-import { createEntityRelationPaginationKey } from '../../../../cloud-foundry/src/entity-relations/entity-relations.types';
+import { cfEntityCatalog } from '../../../../cloud-foundry/src/cf-entity-catalog';
+import {
+  applicationEntityType,
+  organizationEntityType,
+  spaceEntityType,
+} from '../../../../cloud-foundry/src/cf-entity-types';
+import {
+  createEntityRelationKey,
+  createEntityRelationPaginationKey,
+} from '../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { ApplicationMonitorService } from '../../../../cloud-foundry/src/features/applications/application-monitor.service';
 import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';
 import { getGuids } from '../../../../cloud-foundry/src/features/applications/application/application-base.component';
+import { CfCurrentUserPermissions } from '../../../../cloud-foundry/src/user-permissions/cf-user-permissions-checkers';
 import { StratosTab, StratosTabType } from '../../../../core/src/core/extension/extension-service';
+import { CurrentUserPermissionsService } from '../../../../core/src/core/permissions/current-user-permissions.service';
 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';
@@ -52,9 +62,32 @@ import { appAutoscalerAppMetricEntityType, autoscalerEntityFactory } from '../..
   link: 'autoscale',
   icon: 'meter',
   iconFont: 'stratos-icons',
-  hidden: (store: Store<AppState>, esf: EntityServiceFactory, activatedRoute: ActivatedRoute) => {
+  hidden: (store: Store<AppState>, esf: EntityServiceFactory, activatedRoute: ActivatedRoute, cups: CurrentUserPermissionsService) => {
     const endpointGuid = getGuids('cf')(activatedRoute) || window.location.pathname.split('/')[2];
-    return isAutoscalerEnabled(endpointGuid, esf).pipe(map(enabled => !enabled));
+    const appGuid = getGuids()(activatedRoute) || window.location.pathname.split('/')[3];
+    const appEntService = cfEntityCatalog.application.store.getEntityService(appGuid, endpointGuid, {
+      includeRelations: [
+        createEntityRelationKey(applicationEntityType, spaceEntityType),
+        createEntityRelationKey(spaceEntityType, organizationEntityType),
+      ],
+      populateMissing: true
+    })
+
+    const canEditApp$ = appEntService.waitForEntity$.pipe(
+      switchMap(app => cups.can(
+        CfCurrentUserPermissions.APPLICATION_EDIT,
+        endpointGuid,
+        app.entity.entity.space.entity.organization_guid,
+        app.entity.entity.space.metadata.guid
+      )),
+    )
+
+    const autoscalerEnabled = isAutoscalerEnabled(endpointGuid, esf);
+
+    return canEditApp$.pipe(
+      switchMap(canEditSpace => canEditSpace ? autoscalerEnabled : of(false)),
+      map(can => !can)
+    )
   }
 })
 @Component({
@@ -130,7 +163,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
     private paginationMonitorFactory: PaginationMonitorFactory,
     private appAutoscalerPolicySnackBar: MatSnackBar,
     private appAutoscalerScalingHistorySnackBar: MatSnackBar,
-    private confirmDialog: ConfirmationDialogService,
+    private confirmDialog: ConfirmationDialogService
   ) { }
 
   ngOnInit() {
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 56fe3b5865..fcfbc0bf81 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
@@ -5,9 +5,6 @@ import { inject, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { createEmptyStoreModule } from '@stratosui/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 {
   generateTestApplicationServiceProvider,
@@ -15,7 +12,6 @@ import {
 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 { generateTestEntityServiceProvider } from '../../../../../core/test-framework/entity-service.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';
@@ -35,11 +31,6 @@ describe('CfAppAutoscalerEventsConfigService', () => {
         EntityServiceFactory,
         EntityMonitorFactory,
         EntityCatalogHelper,
-        generateTestEntityServiceProvider(
-          appGuid,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appGuid, cfGuid)
-        ),
         generateTestApplicationServiceProvider(appGuid, cfGuid),
         HttpClient,
       ],
diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts
index 98d5b15a48..8732d20bfb 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts
+++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts
@@ -8,8 +8,9 @@ import { ApplicationService } from '../../../../../cloud-foundry/src/features/ap
 import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types';
 import { IListConfig, ListConfig, ListViewTypes } from '../../../../../core/src/shared/components/list/list.component.types';
 import { MetricsRangeSelectorService } from '../../../../../core/src/shared/services/metrics-range-selector.service';
-import { ITimeRange, MetricQueryType } from '../../../../../core/src/shared/services/metrics-range-selector.types';
+import { ITimeRange } from '../../../../../core/src/shared/services/metrics-range-selector.types';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { MetricQueryType } from '../../../../../store/src/types/metric.types';
 import { AppAutoscalerEvent } from '../../../store/app-autoscaler.types';
 import { CfAppAutoscalerEventsDataSource } from './cf-app-autoscaler-events-data-source';
 import {
diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts
index 05e19cc82a..a5c3fd8aef 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts
+++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts
@@ -10,9 +10,10 @@ import {
 import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types';
 import { ListViewTypes } from '../../../../../core/src/shared/components/list/list.component.types';
 import { MetricsRangeSelectorService } from '../../../../../core/src/shared/services/metrics-range-selector.service';
-import { ITimeRange, MetricQueryType } from '../../../../../core/src/shared/services/metrics-range-selector.types';
+import { ITimeRange } from '../../../../../core/src/shared/services/metrics-range-selector.types';
 import { ListView } from '../../../../../store/src/actions/list.actions';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { MetricQueryType } from '../../../../../store/src/types/metric.types';
 import { AutoscalerConstants } from '../../../core/autoscaler-helpers/autoscaler-util';
 import { AppScalingTrigger } from '../../../store/app-autoscaler.types';
 import {
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 ecdddc9b8c..13c1ff8089 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,8 +1,8 @@
 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';
+import { metricEntityType } from '../../../store/src/helpers/stratos-entity-factory';
 
 export const appAutoscalerInfoEntityType = 'autoscalerInfo';
 export const appAutoscalerHealthEntityType = 'autoscalerHealth';
@@ -10,7 +10,7 @@ export const appAutoscalerPolicyEntityType = 'autoscalerPolicy';
 export const appAutoscalerPolicyTriggerEntityType = 'autoscalerPolicyTrigger';
 export const appAutoscalerScalingHistoryEntityType = 'autoscalerScalingHistory';
 export const appAutoscalerAppMetricEntityType = 'autoscalerAppMetric';
-export const appAutoscalerCredentialEntityType = 'autoscalerCredential'
+export const appAutoscalerCredentialEntityType = 'autoscalerCredential';
 
 export const AUTOSCALER_ENDPOINT_TYPE = 'autoscaler';
 
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 9e946fca20..4e71099074 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,10 +1,10 @@
 import { IOrgFavMetadata } from '../../../cloud-foundry/src/cf-metadata-types';
-import { metricEntityType } from '../../../core/src/base-entity-schemas';
 import {
   StratosBaseCatalogEntity,
   StratosCatalogEntity,
 } from '../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { IStratosEndpointDefinition } from '../../../store/src/entity-catalog/entity-catalog.types';
+import { metricEntityType } from '../../../store/src/helpers/stratos-entity-factory';
 import { APIResource } from '../../../store/src/types/api.types';
 import { IFavoriteMetadata } from '../../../store/src/types/user-favorites.types';
 import { AppAutoscalerEvent, AppAutoscalerHealth, AppAutoscalerPolicy, AppScalingTrigger } from './app-autoscaler.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 e85527a5cd..98c2e1e7c1 100644
--- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts
+++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts
@@ -7,9 +7,9 @@ import { catchError, mergeMap, withLatestFrom } from 'rxjs/operators';
 
 import { PaginationResponse } from '../../../cloud-foundry/src/store/types/cf-api.types';
 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';
+import { isHttpErrorResponse } from '../../../store/src/jetstream';
 import { ApiRequestTypes } from '../../../store/src/reducers/api-request-reducer/request-helpers';
 import {
   resultPerPageParam,
diff --git a/src/frontend/packages/cloud-foundry/package.json b/src/frontend/packages/cloud-foundry/package.json
index 989436cb0d..844bc32e3a 100644
--- a/src/frontend/packages/cloud-foundry/package.json
+++ b/src/frontend/packages/cloud-foundry/package.json
@@ -4,5 +4,9 @@
   "peerDependencies": {
     "@angular/common": "^6.0.0-rc.0 || ^6.0.0",
     "@angular/core": "^6.0.0-rc.0 || ^6.0.0"
+  },
+  "stratos": {
+    "theming": "sass/_all-theme#apply-theme-stratos-cloud-foundry"
   }
+
 }
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/sass/_all-theme.scss b/src/frontend/packages/cloud-foundry/sass/_all-theme.scss
new file mode 100644
index 0000000000..fd92ae1354
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/sass/_all-theme.scss
@@ -0,0 +1,12 @@
+// Theming for the copmponents in the Cloud Foundry package
+
+@import '../src/features/applications/application-wall/application-wall.component.theme';
+@import '../src/shared/components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component.theme';
+
+@mixin apply-theme-stratos-cloud-foundry($stratos-theme) {
+
+  $theme: map-get($stratos-theme, theme);
+  $app-theme: map-get($stratos-theme, app-theme);
+
+  @include cf-security-group-theme($theme);
+}
diff --git a/src/frontend/packages/cloud-foundry/src/actions/cf-event.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/cf-event.actions.ts
index ad2daf059f..c6bb0e3aff 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/cf-event.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/cf-event.actions.ts
@@ -1,6 +1,6 @@
 import { HttpParams, HttpRequest } from '@angular/common/http';
 
-import { endpointSchemaKey } from '../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../store/src/helpers/stratos-entity-factory';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { cfEntityFactory } from '../cf-entity-factory';
 import { cfEventEntityType } from '../cf-entity-types';
@@ -18,7 +18,7 @@ export class GetAllCfEvents extends CFStartAction implements PaginatedAction {
 
   constructor(public paginationKey: string, public endpointGuid) {
     super();
-    this.paginationKey = this.paginationKey || createEntityRelationPaginationKey(endpointSchemaKey, endpointGuid);
+    this.paginationKey = this.paginationKey || createEntityRelationPaginationKey(endpointEntityType, endpointGuid);
     this.options = new HttpRequest(
       'GET',
       'events',
diff --git a/src/frontend/packages/cloud-foundry/src/actions/cf-metrics.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/cf-metrics.actions.ts
index 4422c703f6..e57065e7f0 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/cf-metrics.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/cf-metrics.actions.ts
@@ -1,5 +1,5 @@
-import { MetricQueryType } from '../../../core/src/shared/services/metrics-range-selector.types';
 import { MetricQueryConfig, MetricsAction, MetricsChartAction } from '../../../store/src/actions/metrics.actions';
+import { MetricQueryType } from '../../../store/src/types/metric.types';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { CF_ENDPOINT_TYPE } from '../cf-types';
 
diff --git a/src/frontend/packages/cloud-foundry/src/actions/domains.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/domains.actions.ts
index 13d4f6d59b..d593428b5f 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/domains.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/domains.actions.ts
@@ -1,6 +1,6 @@
 import { HttpRequest } from '@angular/common/http';
 
-import { endpointSchemaKey } from '../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../store/src/helpers/stratos-entity-factory';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
 import { cfEntityFactory } from '../cf-entity-factory';
@@ -36,7 +36,7 @@ export class FetchAllDomains extends CFStartAction implements PaginatedAction {
       'GET',
       'domains',
     );
-    this.paginationKey = this.paginationKey || createEntityRelationPaginationKey(endpointSchemaKey, endpointGuid);
+    this.paginationKey = this.paginationKey || createEntityRelationPaginationKey(endpointEntityType, endpointGuid);
   }
   actions = [GET_ALL_DOMAIN, GET_ALL_DOMAIN_SUCCESS, GET_ALL_DOMAIN_FAILED];
   entity = [cfEntityFactory(domainEntityType)];
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 6ec461e70b..5c1967a0c1 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,7 +1,7 @@
 import { HttpRequest } from '@angular/common/http';
 
 import { getActions } from '../../../store/src/actions/action.helper';
-import { endpointSchemaKey } from '../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../store/src/helpers/stratos-entity-factory';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { RequestEntityLocation } from '../../../store/src/types/request.types';
 import { cfEntityFactory } from '../cf-entity-factory';
@@ -12,7 +12,7 @@ import { CFStartAction } from './cf-action.types';
 export class GetAllFeatureFlags extends CFStartAction implements PaginatedAction {
   constructor(public endpointGuid: string, public paginationKey: string = null) {
     super();
-    this.paginationKey = this.paginationKey || createEntityRelationPaginationKey(endpointSchemaKey, this.endpointGuid);
+    this.paginationKey = this.paginationKey || createEntityRelationPaginationKey(endpointEntityType, this.endpointGuid);
     this.options = new HttpRequest(
       'GET',
       `config/feature_flags`
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 b4a274ee38..ac77391430 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/stack.action.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/stack.action.ts
@@ -2,7 +2,7 @@ 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 { endpointEntityType } from '../../../store/src/helpers/stratos-entity-factory';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
 import { stackEntityType } from '../cf-entity-types';
@@ -38,7 +38,7 @@ export class GetAllStacks extends CFStartAction implements PaginatedAction {
       'GET',
       'stacks'
     );
-    this.paginationKey = createEntityRelationKey(endpointSchemaKey, endpointGuid);
+    this.paginationKey = createEntityRelationKey(endpointEntityType, endpointGuid);
   }
   paginationKey: string;
   actions = getActions('Stack', 'Fetch all');
diff --git a/src/frontend/packages/cloud-foundry/src/actions/user-provided-service.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/user-provided-service.actions.ts
index 0080cf6962..6ef888f96d 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/user-provided-service.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/user-provided-service.actions.ts
@@ -2,7 +2,7 @@ import { HttpRequest } from '@angular/common/http';
 
 import { getActions } from '../../../store/src/actions/action.helper';
 import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types';
-import { endpointSchemaKey } from '../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../store/src/helpers/stratos-entity-factory';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
 import { cfEntityFactory } from '../cf-entity-factory';
@@ -39,7 +39,7 @@ export class GetAllUserProvidedServices extends CFStartAction implements Paginat
   ) {
     super();
     this.paginationKey = paginationKey || (spaceGuid ? createEntityRelationPaginationKey(spaceEntityType, spaceGuid) :
-      createEntityRelationPaginationKey(endpointSchemaKey, endpointGuid));
+      createEntityRelationPaginationKey(endpointEntityType, endpointGuid));
     this.options = new HttpRequest(
       'GET',
       `user_provided_service_instances`,
diff --git a/src/frontend/packages/cloud-foundry/src/actions/users.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/users.actions.ts
index 40f7d57afc..73d008753b 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/users.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/users.actions.ts
@@ -1,8 +1,8 @@
 import { HttpRequest } from '@angular/common/http';
 
 import { getActions } from '../../../store/src/actions/action.helper';
-import { endpointSchemaKey } from '../../../store/src/helpers/entity-factory';
 import { EntitySchema } from '../../../store/src/helpers/entity-schema';
+import { endpointEntityType } from '../../../store/src/helpers/stratos-entity-factory';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { EntityRequestAction } from '../../../store/src/types/request.types';
 import { cfEntityFactory } from '../cf-entity-factory';
@@ -51,7 +51,7 @@ export class GetAllCfUsersAsAdmin extends CFStartAction implements PaginatedActi
     paginationKey?: string
   ) {
     super();
-    this.paginationKey = paginationKey || createEntityRelationPaginationKey(endpointSchemaKey, endpointGuid);
+    this.paginationKey = paginationKey || createEntityRelationPaginationKey(endpointEntityType, endpointGuid);
     this.options = new HttpRequest(
       'GET',
       'users'
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 1112888031..33bbedf4f7 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-factory.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-factory.ts
@@ -1,5 +1,5 @@
-import { metricEntityType } from '../../core/src/base-entity-schemas';
 import { EntitySchema } from '../../store/src/helpers/entity-schema';
+import { metricEntityType } from '../../store/src/helpers/stratos-entity-factory';
 import { APIResource } from '../../store/src/types/api.types';
 import {
   CFApplicationEntitySchema,
@@ -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 beba13c732..89727e826e 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
@@ -3,10 +3,8 @@ import * as moment from 'moment';
 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 { BaseEndpointAuth } from '../../core/src/core/endpoint-auth';
 import { urlValidationExpression } from '../../core/src/core/utils.service';
-import { BaseEndpointAuth } from '../../core/src/features/endpoints/endpoint-auth';
 import { AppState, GeneralEntityAppState } from '../../store/src/app-state';
 import {
   StratosBaseCatalogEntity,
@@ -14,6 +12,7 @@ import {
   StratosCatalogEntity,
 } from '../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import {
+  EndpointHealthCheck,
   IStratosEntityDefinition,
   StratosEndpointExtensionDefinition,
 } from '../../store/src/entity-catalog/entity-catalog.types';
@@ -22,6 +21,7 @@ import {
 } from '../../store/src/entity-request-pipeline/entity-request-base-handlers/handle-multi-endpoints.pipe';
 import { ActionDispatcher, JetstreamResponse } from '../../store/src/entity-request-pipeline/entity-request-pipeline.types';
 import { EntitySchema } from '../../store/src/helpers/entity-schema';
+import { metricEntityType } from '../../store/src/helpers/stratos-entity-factory';
 import { RequestInfoState } from '../../store/src/reducers/api-request-reducer/types';
 import { selectSessionData } from '../../store/src/reducers/auth.reducer';
 import { APIResource, EntityInfo } from '../../store/src/types/api.types';
@@ -409,7 +409,9 @@ function generateCFQuotaDefinitionEntity(endpointDefinition: StratosEndpointExte
   const definition: IStratosEntityDefinition = {
     type: quotaDefinitionEntityType,
     schema: cfEntityFactory(quotaDefinitionEntityType),
-    endpoint: endpointDefinition
+    endpoint: endpointDefinition,
+    label: 'Organization Quota',
+    labelPlural: 'Organization Quotas',
   };
   cfEntityCatalog.quotaDefinition = new StratosCatalogEntity<
     IBasicCFMetaData,
@@ -451,6 +453,8 @@ function generateCFAppEnvVarEntity(endpointDefinition: StratosEndpointExtensionD
         }
       };
     },
+    label: 'App Env Var',
+    labelPlural: 'App Env Vars',
   };
   cfEntityCatalog.appEnvVar = new StratosCatalogEntity<
     IBasicCFMetaData,
@@ -478,6 +482,8 @@ function generateCFAppSummaryEntity(endpointDefinition: StratosEndpointExtension
     type: appSummaryEntityType,
     schema: cfEntityFactory(appSummaryEntityType),
     endpoint: endpointDefinition,
+    label: 'App Summary',
+    labelPlural: 'App Summaries',
   };
   cfEntityCatalog.appSummary = new StratosCatalogEntity<IBasicCFMetaData, IAppSummary, AppSummaryActionBuilders>(definition, {
     dataReducers: [
@@ -500,7 +506,9 @@ function generateCFSpaceQuotaEntity(endpointDefinition: StratosEndpointExtension
   const definition: IStratosEntityDefinition = {
     type: spaceQuotaEntityType,
     schema: cfEntityFactory(spaceQuotaEntityType),
-    endpoint: endpointDefinition
+    endpoint: endpointDefinition,
+    label: 'Space Quota',
+    labelPlural: 'Space Quotas',
   };
   cfEntityCatalog.spaceQuota = new StratosCatalogEntity<
     IBasicCFMetaData,
@@ -518,7 +526,9 @@ function generateCFPrivateDomainEntity(endpointDefinition: StratosEndpointExtens
   const definition: IStratosEntityDefinition = {
     type: privateDomainsEntityType,
     schema: cfEntityFactory(privateDomainsEntityType),
-    endpoint: endpointDefinition
+    endpoint: endpointDefinition,
+    label: 'Private Domain',
+    labelPlural: 'Private Domains',
   };
   cfEntityCatalog.privateDomain = new StratosCatalogEntity<IBasicCFMetaData, APIResource<IPrivateDomain>>(definition, {
     dataReducers: [
diff --git a/src/frontend/packages/cloud-foundry/src/cf-error-helpers.ts b/src/frontend/packages/cloud-foundry/src/cf-error-helpers.ts
index 73c4b0c0d4..da3efe70ec 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-error-helpers.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-error-helpers.ts
@@ -1,4 +1,4 @@
-import { JetStreamErrorResponse, jetStreamErrorResponseToSafeString } from '../../core/src/jetstream.helpers';
+import { JetStreamErrorResponse, jetStreamErrorResponseToSafeString } from '../../store/src/jetstream';
 
 export interface CfErrorObject {
   code: number;
diff --git a/src/frontend/packages/cloud-foundry/src/cf-favorites-helpers.ts b/src/frontend/packages/cloud-foundry/src/cf-favorites-helpers.ts
index ec23f4125f..8f19d39a21 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-favorites-helpers.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-favorites-helpers.ts
@@ -1,5 +1,5 @@
-import { FavoritesConfigMapper } from '../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
 import { IEntityMetadata } from '../../store/src/entity-catalog/entity-catalog.types';
+import { FavoritesConfigMapper } from '../../store/src/favorite-config-mapper';
 import { UserFavorite } from '../../store/src/types/user-favorites.types';
 import { CfAPIResource } from './store/types/cf-api.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 11769b81a4..99bfc37bbd 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
@@ -3,11 +3,11 @@ import { NgModule } from '@angular/core';
 import { EffectsModule } from '@ngrx/effects';
 
 import { generateASEntities } from '../../cf-autoscaler/src/store/autoscaler-entity-generator';
-import { generateStratosEntities } from '../../core/src/base-entity-types';
 import { getGitHubAPIURL, GITHUB_API_URL } from '../../core/src/core/github.helpers';
 import { LoggerService } from '../../core/src/core/logger.service';
 import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../store/src/entity-catalog.module';
 import { entityCatalog, TestEntityCatalog } from '../../store/src/entity-catalog/entity-catalog';
+import { generateStratosEntities } from '../../store/src/stratos-entity-generator';
 import { testSCFEndpointGuid } from '../../store/testing/public-api';
 import { BaseCfOrgSpaceRouteMock } from '../test-framework/cloud-foundry-endpoint-service.helper';
 import { generateCFEntities } from './cf-entity-generator';
diff --git a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-list.spec.ts b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-list.spec.ts
index 73851810cc..35679dc510 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-list.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-list.spec.ts
@@ -1,6 +1,7 @@
+import { EntitySchema } from '../../../store/src/helpers/entity-schema';
 import { listEntityRelations } from './entity-relations';
 import { createEntityRelationKey, EntityInlineParentAction } from './entity-relations.types';
-import { EntitySchema } from '../../../store/src/helpers/entity-schema';
+
 const endpointType = 'endpointtype1';
 
 describe('Entity Relations - List relations', () => {
diff --git a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations.tree.spec.ts b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations.tree.spec.ts
index 6ce1b9126a..5383e22fbe 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations.tree.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations.tree.spec.ts
@@ -1,5 +1,5 @@
-import { CF_ENDPOINT_TYPE } from '../cf-types';
 import { CFEntitySchema } from '../cf-entity-schema-types';
+import { CF_ENDPOINT_TYPE } from '../cf-types';
 import { fetchEntityTree } from './entity-relations.tree';
 import { createEntityRelationKey, EntityInlineParentAction } from './entity-relations.types';
 
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 7e8ac98783..52aa6ff434 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
@@ -1,12 +1,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 { 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';
 import { ApplicationDeleteComponent } from './application-delete.component';
 
@@ -22,11 +18,6 @@ describe('ApplicationDeleteComponent', () => {
         ApplicationsModule
       ],
       providers: [
-        generateTestEntityServiceProvider(
-          appId,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appId, cfId)
-        ),
         generateTestApplicationServiceProvider(cfId, appId),
         TabNavService
       ]
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 91f805f77c..f8b961dfba 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
@@ -12,7 +12,7 @@ import {
 import { CurrentUserPermissionsService } from '../../../../../../core/src/core/permissions/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 { endpointSchemaKey } from '../../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../../store/src/helpers/stratos-entity-factory';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource } from '../../../../../../store/src/types/api.types';
 import { IServiceBinding } from '../../../../cf-api-svc.types';
@@ -59,7 +59,7 @@ export class AppDeleteServiceInstancesListConfigService extends AppServiceBindin
         const action = cfEntityCatalog.serviceBinding.actions.getAllForServiceInstance(
           serviceBinding.entity.service_instance_guid,
           appService.cfGuid,
-          createEntityRelationPaginationKey(endpointSchemaKey, serviceBindingEntityType),
+          createEntityRelationPaginationKey(endpointEntityType, serviceBindingEntityType),
           {
             includeRelations: [],
           }
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 cc133e9d3b..184b50070a 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
@@ -1,12 +1,8 @@
 import { DatePipe } from '@angular/common';
 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 { 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';
 import {
   ApplicationEnvVarsHelper,
@@ -24,11 +20,6 @@ describe('DeleteAppInstancesComponent', () => {
       declarations: [DeleteAppServiceInstancesComponent],
       imports: generateCfBaseTestModules(),
       providers: [
-        generateTestEntityServiceProvider(
-          appId,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appId, cfId)
-        ),
         generateTestApplicationServiceProvider(cfId, appId),
         ApplicationEnvVarsHelper,
         DatePipe,
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 28b04b412d..7e6b4e0ff6 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
@@ -1,12 +1,8 @@
 import { DatePipe } from '@angular/common';
 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 { 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 {
   ApplicationEnvVarsHelper,
 } from '../../application/application-tabs-base/tabs/build-tab/application-env-vars.service';
@@ -23,11 +19,6 @@ describe('DeleteAppRoutesComponent', () => {
       declarations: [DeleteAppRoutesComponent],
       imports: generateCfBaseTestModules(),
       providers: [
-        generateTestEntityServiceProvider(
-          appId,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appId, cfId)
-        ),
         generateTestApplicationServiceProvider(cfId, appId),
         ApplicationEnvVarsHelper,
         DatePipe,
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 aba0ea3567..23282a262b 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
@@ -1,18 +1,14 @@
 import { inject, TestBed } from '@angular/core/testing';
 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 { ExtensionService } from '../../../../core/src/core/extension/extension-service';
 import { getGitHubAPIURL, GITHUB_API_URL } from '../../../../core/src/core/github.helpers';
-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';
 import { GitSCMService } from '../../shared/data-services/scm/scm.service';
 import { ApplicationStateService } from '../../shared/services/application-state.service';
@@ -33,11 +29,6 @@ describe('ApplicationService', () => {
         generateCfStoreModules()
       ],
       providers: [
-        generateTestEntityServiceProvider(
-          appId,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appId, cfId)
-        ),
         generateTestApplicationServiceProvider(cfId, appId),
         ApplicationStateService,
         ApplicationEnvVarsHelper,
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 d918209f4f..628b8560a4 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
@@ -44,13 +44,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),
+  ]
   );
 }
 
@@ -64,7 +64,7 @@ export interface ApplicationData {
 @Injectable()
 export class ApplicationService {
 
-  private appEntityService: EntityService<APIResource<IApp>>;
+  public entityService: EntityService<APIResource<IApp>>;
   private appSummaryEntityService: EntityService<IAppSummary>;
 
   constructor(
@@ -74,7 +74,7 @@ export class ApplicationService {
     private appStateService: ApplicationStateService,
     private appEnvVarsService: ApplicationEnvVarsHelper,
   ) {
-    this.appEntityService = cfEntityCatalog.application.store.getEntityService(
+    this.entityService = cfEntityCatalog.application.store.getEntityService(
       appGuid,
       cfGuid,
       {
@@ -138,7 +138,7 @@ export class ApplicationService {
 
   private constructCoreObservables() {
     // First set up all the base observables
-    this.app$ = this.appEntityService.waitForEntity$;
+    this.app$ = this.entityService.waitForEntity$;
     const moreWaiting$ = this.app$.pipe(
       filter(entityInfo => !!(entityInfo.entity && entityInfo.entity.entity && entityInfo.entity.entity.cfGuid)),
       map(entityInfo => entityInfo.entity.entity));
@@ -162,9 +162,9 @@ export class ApplicationService {
       filter(org => !!org)
     );
 
-    this.isDeletingApp$ = this.appEntityService.isDeletingEntity$.pipe(publishReplay(1), refCount());
+    this.isDeletingApp$ = this.entityService.isDeletingEntity$.pipe(publishReplay(1), refCount());
 
-    this.waitForAppEntity$ = this.appEntityService.waitForEntity$.pipe(publishReplay(1), refCount());
+    this.waitForAppEntity$ = this.entityService.waitForEntity$.pipe(publishReplay(1), refCount());
 
     this.appSummary$ = this.waitForAppEntity$.pipe(
       switchMap(() => this.appSummaryEntityService.entityObs$),
@@ -231,9 +231,9 @@ export class ApplicationService {
   }
 
   private constructStatusObservables() {
-    this.isFetchingApp$ = this.appEntityService.isFetchingEntity$;
+    this.isFetchingApp$ = this.entityService.isFetchingEntity$;
 
-    this.isUpdatingApp$ = this.appEntityService.entityObs$.pipe(map(a => {
+    this.isUpdatingApp$ = this.entityService.entityObs$.pipe(map(a => {
       const updatingRoot = a.entityRequestInfo.updating[rootUpdatingKey] || { busy: false };
       const updatingSection = a.entityRequestInfo.updating[UpdateExistingApplication.updateKey] || { busy: false };
       return !!updatingRoot.busy || !!updatingSection.busy;
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 a95f69f887..ba7fea321a 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,10 +3,9 @@ import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
-import { APP_GUID, CF_GUID, ENTITY_SERVICE } from '../../../../../core/src/shared/entity.tokens';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
+import { APP_GUID, CF_GUID } from '../../../../../core/src/shared/entity.tokens';
 import { ApplicationStateService } from '../../../shared/services/application-state.service';
-import { ApplicationService, createGetApplicationAction } from '../application.service';
+import { ApplicationService } from '../application.service';
 import { ApplicationEnvVarsHelper } from './application-tabs-base/tabs/build-tab/application-env-vars.service';
 
 export function applicationServiceFactory(
@@ -25,17 +24,6 @@ export function applicationServiceFactory(
   );
 }
 
-export function cfApplicationEntityServiceFactory(
-  cfId: string,
-  id: string,
-  esf: EntityServiceFactory
-) {
-  return esf.create(
-    id,
-    createGetApplicationAction(id, cfId)
-  );
-}
-
 export function getGuids(type?: string) {
   return (activatedRoute: ActivatedRoute) => {
     const { id, endpointId } = activatedRoute.snapshot.params;
@@ -72,13 +60,7 @@ export function getGuids(type?: string) {
         ApplicationStateService,
         ApplicationEnvVarsHelper,
       ]
-    },
-    {
-      provide: ENTITY_SERVICE,
-      useFactory: cfApplicationEntityServiceFactory,
-      deps: [CF_GUID, APP_GUID, EntityServiceFactory]
-    },
-
+    }
   ]
 })
 export class ApplicationBaseComponent {
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 096eebe3f7..d20348cc9f 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,11 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-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';
-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';
@@ -23,11 +19,6 @@ describe('ApplicationPollComponent', () => {
       declarations: [ApplicationPollComponent],
       providers: [
         ApplicationPollingService,
-        generateTestEntityServiceProvider(
-          appId,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appId, cfId)
-        ),
         generateTestApplicationServiceProvider(cfId, appId),
         ApplicationEnvVarsHelper,
         ApplicationStateService,
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 39fd632931..046af5a750 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
@@ -1,15 +1,11 @@
-import { Inject, Injectable, NgZone } from '@angular/core';
+import { Injectable, NgZone } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
 import { first, map, tap } from 'rxjs/operators';
 
 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 { IApp } from '../../../../cf-api.types';
 import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { ApplicationService } from '../../application.service';
 
@@ -19,7 +15,7 @@ export class ApplicationPollingService {
   private pollingSub: Subscription;
   private autoRefreshString = 'auto-refresh';
 
-  public isPolling$ = this.entityService.updatingSection$.pipe(map(
+  public isPolling$ = this.applicationService.entityService.updatingSection$.pipe(map(
     update => update[this.autoRefreshString] && update[this.autoRefreshString].busy
   ));
 
@@ -27,7 +23,6 @@ export class ApplicationPollingService {
 
   constructor(
     public applicationService: ApplicationService,
-    @Inject(ENTITY_SERVICE) private entityService: EntityService<APIResource<IApp>>,
     private store: Store<AppState>,
     private ngZone: NgZone,
   ) {
@@ -54,7 +49,7 @@ export class ApplicationPollingService {
 
     // Auto refresh
     this.ngZone.runOutsideAngular(() => {
-      this.pollingSub = this.entityService
+      this.pollingSub = this.applicationService.entityService
         .poll(10000, this.autoRefreshString).pipe(
           tap(() => this.ngZone.run(() => this.poll(false))))
         .subscribe();
@@ -69,12 +64,12 @@ export class ApplicationPollingService {
     const { cfGuid, appGuid } = this.applicationService;
     if (withApp) {
       const updatingApp = {
-        ...this.entityService.action,
+        ...this.applicationService.entityService.action,
         updatingKey: this.autoRefreshString
       };
       this.store.dispatch(updatingApp);
     }
-    this.entityService.entityObs$.pipe(
+    this.applicationService.entityService.entityObs$.pipe(
       first(),
     ).subscribe(resource => {
       cfEntityCatalog.appSummary.api.get(appGuid, cfGuid);
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 55f591b111..19c49370d4 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
@@ -5,17 +5,13 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { StoreModule } from '@ngrx/store';
 
-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 { getGitHubAPIURL, GITHUB_API_URL } from '../../../../../../core/src/core/github.helpers';
 import { MDAppModule } from '../../../../../../core/src/core/md.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 { 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';
 import { ApplicationTabsBaseComponent } from './application-tabs-base.component';
 import { ApplicationEnvVarsHelper } from './tabs/build-tab/application-env-vars.service';
@@ -44,11 +40,6 @@ describe('ApplicationTabsBaseComponent', () => {
         HttpClientTestingModule
       ],
       providers: [
-        generateTestEntityServiceProvider(
-          appId,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appId, cfId)
-        ),
         generateTestApplicationServiceProvider(cfId, appId),
         ApplicationStateService,
         ApplicationEnvVarsHelper,
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 ca2194ba6e..362c6c37fd 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
@@ -1,4 +1,4 @@
-import { Component, Inject, NgZone, OnDestroy, OnInit } from '@angular/core';
+import { Component, NgZone, OnDestroy, OnInit } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
 import { filter, first, map, startWith, switchMap, withLatestFrom } from 'rxjs/operators';
@@ -15,22 +15,18 @@ import {
   StratosTabType,
 } from '../../../../../../core/src/core/extension/extension-service';
 import { CurrentUserPermissionsService } from '../../../../../../core/src/core/permissions/current-user-permissions.service';
-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 {
-  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 { 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';
-import { EntityService } from '../../../../../../store/src/entity-service';
+import { FavoritesConfigMapper } from '../../../../../../store/src/favorite-config-mapper';
 import { EntitySchema } from '../../../../../../store/src/helpers/entity-schema';
 import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types';
 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 { getFavoriteFromEntity } from '../../../../../../store/src/user-favorite-helpers';
 import { UpdateExistingApplication } from '../../../../actions/application.actions';
 import { IApp, IOrganization, ISpace } from '../../../../cf-api.types';
 import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
@@ -61,7 +57,6 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy {
 
   constructor(
     public applicationService: ApplicationService,
-    @Inject(ENTITY_SERVICE) private entityService: EntityService<APIResource>,
     private store: Store<CFAppState>,
     private endpointsService: EndpointsService,
     private ngZone: NgZone,
@@ -246,7 +241,7 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
-    this.appSub$ = this.entityService.entityMonitor.entityRequest$.subscribe(requestInfo => {
+    this.appSub$ = this.applicationService.entityService.entityMonitor.entityRequest$.subscribe(requestInfo => {
       if (
         requestInfo.deleting.deleted ||
         requestInfo.error
@@ -257,7 +252,7 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy {
 
     this.isFetching$ = this.applicationService.isFetchingApp$;
 
-    this.isBusyUpdating$ = this.entityService.updatingSection$.pipe(
+    this.isBusyUpdating$ = this.applicationService.entityService.updatingSection$.pipe(
       map(updatingSection => {
         const updating = this.updatingSectionBusy(updatingSection.restaging) ||
           this.updatingSectionBusy(updatingSection[UpdateExistingApplication.updateKey]);
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.html b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.html
index a1ceaa6f53..de18350435 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.html
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.html
@@ -149,12 +149,12 @@
           </mat-card-content>
         </mat-card>
       </app-tile>
-      <app-tile id="app-build-tab-deployment-info">
+      <app-tile id="app-build-tab-deployment-info" *ngIf="(deploySource$ | async) as deploySource">
         <mat-card>
           <mat-card-header>
             <mat-card-title>Deployment Info</mat-card-title>
           </mat-card-header>
-          <mat-card-content *ngIf="(deploySource$ | async) as deploySource; else notDeployedFromStratos">
+          <mat-card-content>
             <span [ngSwitch]="deploySource.type">
               <app-metadata-item *ngSwitchCase="'giturl'" icon="code" label="Git Url">
                 <div matTooltip="{{ deploySource.branch + ' ' + (deploySource.commit | slice:0:8)}}"
@@ -183,9 +183,6 @@
               </app-metadata-item>
             </span>
           </mat-card-content>
-          <ng-template #notDeployedFromStratos>
-            <mat-card-content>None</mat-card-content>
-          </ng-template>
         </mat-card>
       </app-tile>
     </app-tile-group>
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 71731cb35b..58a38edbe5 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,17 +6,15 @@ 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 { APP_GUID, CF_GUID, ENTITY_SERVICE } from '../../../../../../../../core/src/shared/entity.tokens';
+import { APP_GUID, CF_GUID } from '../../../../../../../../core/src/shared/entity.tokens';
 import { SharedModule } from '../../../../../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../../../../../core/tab-nav.service';
-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';
 import { ApplicationService } from '../../../../application.service';
-import { cfApplicationEntityServiceFactory } from '../../../application-base.component';
 import { ApplicationPollComponent } from '../../application-poll/application-poll.component';
 import { ApplicationPollingService } from '../../application-polling.service';
 import { ApplicationEnvVarsHelper } from './application-env-vars.service';
@@ -53,11 +51,6 @@ describe('BuildTabComponent', () => {
         TabNavService,
         { provide: CF_GUID, useValue: '' },
         { provide: APP_GUID, useValue: '' },
-        {
-          provide: ENTITY_SERVICE,
-          useFactory: cfApplicationEntityServiceFactory,
-          deps: [CF_GUID, APP_GUID, EntityServiceFactory]
-        },
         ApplicationPollingService
       ]
     })
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 57c88faeb4..5f3574c8d7 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
@@ -1,20 +1,21 @@
-import { Component, Inject, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 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 { combineLatest as observableCombineLatest, Observable, of as observableOf, of } from 'rxjs';
+import { combineLatest, delay, distinct, filter, first, map, mergeMap, startWith, switchMap, tap } from 'rxjs/operators';
 
 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 { getFullEndpointApiUrl } from '../../../../../../../../core/src/features/endpoints/endpoint-helpers';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../../core/src/core/permissions/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 { ENTITY_SERVICE } from '../../../../../../../../core/src/shared/entity.tokens';
 import { ResetPagination } from '../../../../../../../../store/src/actions/pagination.actions';
-import { EntityService } from '../../../../../../../../store/src/entity-service';
+import { getFullEndpointApiUrl } from '../../../../../../../../store/src/endpoint-utils';
 import { ActionState } from '../../../../../../../../store/src/reducers/api-request-reducer/types';
-import { APIResource, EntityInfo } from '../../../../../../../../store/src/types/api.types';
+import { EntityInfo } from '../../../../../../../../store/src/types/api.types';
 import { IAppSummary } from '../../../../../../cf-api.types';
 import { cfEntityCatalog } from '../../../../../../cf-entity-catalog';
 import { GitSCMService, GitSCMType } from '../../../../../../shared/data-services/scm/scm.service';
@@ -62,11 +63,10 @@ export class BuildTabComponent implements OnInit {
     public applicationService: ApplicationService,
     private scmService: GitSCMService,
     private store: Store<CFAppState>,
-    @Inject(ENTITY_SERVICE) private entityService: EntityService<APIResource>,
     private route: ActivatedRoute,
     private router: Router,
     private confirmDialog: ConfirmationDialogService,
-
+    private cups: CurrentUserPermissionsService
   ) { }
 
   cardTwoFetching$: Observable<boolean>;
@@ -88,7 +88,7 @@ export class BuildTabComponent implements OnInit {
         return app.fetching || appSummary.entityRequestInfo.fetching;
       }), distinct());
 
-    this.isBusyUpdating$ = this.entityService.updatingSection$.pipe(
+    this.isBusyUpdating$ = this.applicationService.entityService.updatingSection$.pipe(
       map(updatingSection => {
         const updating = this.updatingSectionBusy(updatingSection.restaging) ||
           this.updatingSectionBusy(updatingSection[UpdateExistingApplication.updateKey]);
@@ -108,8 +108,17 @@ export class BuildTabComponent implements OnInit {
       })
     );
 
-    this.deploySource$ = this.applicationService.applicationStratProject$.pipe(
-      combineLatest(this.applicationService.application$)
+    const canSeeEnvVars$ = this.applicationService.appSpace$.pipe(
+      switchMap(space => this.cups.can(
+        CfCurrentUserPermissions.APPLICATION_VIEW_ENV_VARS,
+        this.applicationService.cfGuid,
+        space.metadata.guid)
+      )
+    )
+
+    const deploySource$ = observableCombineLatest(
+      this.applicationService.applicationStratProject$,
+      this.applicationService.application$
     ).pipe(
       map(([project, app]) => {
         if (!!project) {
@@ -149,6 +158,10 @@ export class BuildTabComponent implements OnInit {
         }
       }),
       startWith({ type: 'loading' })
+    )
+
+    this.deploySource$ = canSeeEnvVars$.pipe(
+      switchMap(canSeeEnvVars => canSeeEnvVars ? deploySource$ : of(null)),
     );
   }
 
@@ -249,7 +262,7 @@ export class BuildTabComponent implements OnInit {
   }
 
   pollEntityService(state, stateString): Observable<any> {
-    return this.entityService
+    return this.applicationService.entityService
       .poll(1000, state).pipe(
         delay(1),
         filter(({ resource }) => {
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 b300ad4f84..03b62309d1 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
@@ -3,18 +3,14 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { StoreModule } from '@ngrx/store';
 
-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 { MDAppModule } from '../../../../../../../../core/src/core/md.module';
 import { LogViewerComponent } from '../../../../../../../../core/src/shared/components/log-viewer/log-viewer.component';
-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';
 import { ApplicationEnvVarsHelper } from '../build-tab/application-env-vars.service';
 import { LogStreamTabComponent } from './log-stream-tab.component';
@@ -41,11 +37,6 @@ describe('LogStreamTabComponent', () => {
         LogStreamTabComponent
       ],
       providers: [
-        generateTestEntityServiceProvider(
-          appId,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appId, cfId)
-        ),
         generateTestApplicationServiceProvider(cfId, appId),
         AppStoreModule,
         ApplicationStateService,
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 6bb64cb28b..42bf58fa38 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
@@ -1,14 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 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 { SharedModule } from '../../../../../../../../core/src/shared/shared.module';
-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';
 import { ApplicationEnvVarsHelper } from '../build-tab/application-env-vars.service';
 import { MetricsTabComponent } from './metrics-tab.component';
@@ -30,11 +26,6 @@ describe('MetricsTabComponent', () => {
       providers: [
         ApplicationStateService,
         ApplicationEnvVarsHelper,
-        generateTestEntityServiceProvider(
-          appId,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appId, cfId)
-        ),
         generateTestApplicationServiceProvider(cfId, appId),
       ]
     })
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 c3ead1317a..ff36e161d2 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
@@ -1,16 +1,12 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 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 { MDAppModule } from '../../../../../core/src/core/md.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 { 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';
 import { ApplicationStateService } from '../../../shared/services/application-state.service';
 import { ApplicationEnvVarsHelper } from '../application/application-tabs-base/tabs/build-tab/application-env-vars.service';
@@ -35,11 +31,6 @@ describe('CliInfoApplicationComponent', () => {
         CloudFoundrySharedModule
       ],
       providers: [
-        generateTestEntityServiceProvider(
-          appId,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appId, cfId)
-        ),
         generateTestApplicationServiceProvider(cfId, appId),
         ApplicationStateService,
         ApplicationEnvVarsHelper,
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.ts
index 9785603d75..1681bae4ad 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.ts
@@ -2,11 +2,10 @@ import { Component, OnInit } from '@angular/core';
 import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
 import { filter, first, map } from 'rxjs/operators';
 
-import { EntityService } from '../../../../../store/src/entity-service';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
-import { getFullEndpointApiUrl } from '../../../../../core/src/features/endpoints/endpoint-helpers';
 import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
-import { GetAllEndpoints } from '../../../../../store/src/actions/endpoint.actions';
+import { getFullEndpointApiUrl } from '../../../../../store/src/endpoint-utils';
+import { EntityService } from '../../../../../store/src/entity-service';
+import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
 import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
 import { CFAppCLIInfoContext } from '../../../shared/components/cli-info/cli-info.component';
 import { ApplicationService } from '../application.service';
@@ -29,7 +28,6 @@ export class CliInfoApplicationComponent implements OnInit {
 
   constructor(
     private applicationService: ApplicationService,
-    private entityServiceFactory: EntityServiceFactory
   ) {
     this.breadcrumbs$ = new BehaviorSubject<IHeaderBreadcrumb[]>([]);
   }
@@ -41,10 +39,7 @@ export class CliInfoApplicationComponent implements OnInit {
   }
 
   private setupObservables(cfGuid: string) {
-    this.cfEndpointEntityService = this.entityServiceFactory.create<EndpointModel>(
-      cfGuid,
-      new GetAllEndpoints()
-    );
+    this.cfEndpointEntityService = stratosEntityCatalog.endpoint.store.getEntityService(cfGuid);
 
     this.context$ = combineLatest(
       this.applicationService.application$,
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 f25b7fa87f..e5de781a2a 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
@@ -4,18 +4,14 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 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 { 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 '../../../../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';
 import { ApplicationService } from '../application.service';
 import { ApplicationEnvVarsHelper } from '../application/application-tabs-base/tabs/build-tab/application-env-vars.service';
@@ -42,11 +38,6 @@ describe('EditApplicationComponent', () => {
       ],
       providers: [
         { provide: ApplicationService, useClass: ApplicationServiceMock },
-        generateTestEntityServiceProvider(
-          appId,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appId, cfId)
-        ),
         generateTestApplicationServiceProvider(cfId, appId),
         ApplicationStateService,
         ApplicationEnvVarsHelper,
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 c5e99f073c..acc4f55a0c 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
@@ -14,7 +14,7 @@ import {
 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';
-import { endpointSchemaKey } from '../../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../../store/src/helpers/stratos-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';
@@ -75,7 +75,7 @@ export class CreateOrganizationStepComponent implements OnInit, OnDestroy {
       tap((o) => this.allOrgs = o)
     );
 
-    const quotaPaginationKey = createEntityRelationPaginationKey(endpointSchemaKey, this.cfGuid);
+    const quotaPaginationKey = createEntityRelationPaginationKey(endpointEntityType, this.cfGuid);
     this.quotaDefinitions$ = cfEntityCatalog.quotaDefinition.store.getPaginationService(
       quotaPaginationKey, this.cfGuid, { includeRelations: [] }
     ).entities$.pipe(
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf-cell.helpers.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf-cell.helpers.ts
index c0673a5c49..375a28581a 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf-cell.helpers.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf-cell.helpers.ts
@@ -3,12 +3,12 @@ import { Observable, of } from 'rxjs';
 import { filter, first, map, publishReplay, refCount, switchMap } from 'rxjs/operators';
 
 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 '../../../../store/src/types/metric.types';
 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';
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 675a1f4758..e6e64456f7 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
@@ -28,9 +28,10 @@ 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 { CFFeatureFlagTypes, ISpace } from '../../cf-api.types';
+import { CFFeatureFlagTypes, IApp, ISpace } from '../../cf-api.types';
 import { cfEntityFactory } from '../../cf-entity-factory';
 import { CFEntityConfig } from '../../cf-types';
+import { ListCfRoute } from '../../shared/components/list/list-types/cf-routes/cf-routes-data-source-base';
 import {
   CfUser,
   CfUserRoleParams,
@@ -350,12 +351,17 @@ export function fetchTotalResults(
   );
 }
 
+type CfOrgSpaceFilterTypes = IApp | ListCfRoute | IServiceInstance;
 export const cfOrgSpaceFilter = (entities: APIResource[], paginationState: PaginationEntityState) => {
   // Filtering is done remotely when maxedResults are hit (see `setMultiFilter`)
   if (!!paginationState.maxedState.isMaxedMode && !paginationState.maxedState.ignoreMaxed) {
     return entities;
   }
 
+  const fetchOrgGuid = (e: APIResource<CfOrgSpaceFilterTypes>): string => {
+    return e.entity.space ? e.entity.space.entity.organization_guid : null;
+  }
+
   // Filter by cf/org/space
   const cfGuid = paginationState.clientPagination.filter.items.cf;
   const orgGuid = paginationState.clientPagination.filter.items.org;
@@ -363,7 +369,7 @@ export const cfOrgSpaceFilter = (entities: APIResource[], paginationState: Pagin
   return !cfGuid && !orgGuid && !spaceGuid ? entities : entities.filter(e => {
     e = extractActualListEntity(e);
     const validCF = !(cfGuid && cfGuid !== e.entity.cfGuid);
-    const validOrg = !(orgGuid && orgGuid !== e.entity.space.entity.organization_guid);
+    const validOrg = !(orgGuid && orgGuid !== fetchOrgGuid(e));
     const validSpace = !(spaceGuid && spaceGuid !== e.entity.space_guid);
     return validCF && validOrg && validSpace;
   });
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 82ddcf4295..3449967904 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,9 +5,9 @@ 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 { getFullEndpointApiUrl } from '../../../../../core/src/features/endpoints/endpoint-helpers';
 import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
 import { RouterNav } from '../../../../../store/src/actions/router.actions';
+import { getFullEndpointApiUrl } from '../../../../../store/src/endpoint-utils';
 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';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts
index 57ddd512a7..c086f9cd86 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts
@@ -13,7 +13,7 @@ import {
 import { CurrentUserPermissionsService } from '../../../../../core/src/core/permissions/current-user-permissions.service';
 import { environment } from '../../../../../core/src/environments/environment.prod';
 import { IPageSideNavTab } from '../../../../../core/src/features/dashboard/page-side-nav/page-side-nav.component';
-import { FavoritesConfigMapper } from '../../../../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
+import { FavoritesConfigMapper } from '../../../../../store/src/favorite-config-mapper';
 import { UserFavoriteEndpoint } from '../../../../../store/src/types/user-favorites.types';
 import { CfCurrentUserPermissions } from '../../../user-permissions/cf-user-permissions-checkers';
 import { CloudFoundryEndpointService } from '../services/cloud-foundry-endpoint.service';
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 cc3e90927d..5a91738c56 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
@@ -11,7 +11,7 @@ import {
 } from '../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
-import { endpointSchemaKey } from '../../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../../store/src/helpers/stratos-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';
@@ -114,7 +114,7 @@ export class EditOrganizationStepComponent implements OnInit, OnDestroy {
     );
     this.fetchOrgsSub = this.allOrgsInEndpoint$.subscribe();
 
-    const quotaPaginationKey = createEntityRelationPaginationKey(endpointSchemaKey, this.cfGuid);
+    const quotaPaginationKey = createEntityRelationPaginationKey(endpointEntityType, this.cfGuid);
     this.quotaDefinitions$ = cfEntityCatalog.quotaDefinition.store.getPaginationService(
       quotaPaginationKey, this.cfGuid, { includeRelations: [] }
     ).entities$.pipe(
diff --git a/src/frontend/packages/cloud-foundry/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
index f271b4ec36..d330a31aec 100644
--- a/src/frontend/packages/cloud-foundry/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
@@ -8,7 +8,7 @@ import { createEntityRelationPaginationKey } from '../../../../../cloud-foundry/
 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 { endpointSchemaKey } from '../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../store/src/helpers/stratos-entity-factory';
 import { IQuotaDefinition } from '../../../cf-api.types';
 
 export interface QuotaFormValues {
@@ -71,7 +71,7 @@ export class QuotaDefinitionFormComponent implements OnInit, OnDestroy {
   }
 
   fetchQuotasDefinitions() {
-    const quotaPaginationKey = createEntityRelationPaginationKey(endpointSchemaKey, this.cfGuid);
+    const quotaPaginationKey = createEntityRelationPaginationKey(endpointEntityType, this.cfGuid);
     const quotaDefinitions$ = cfEntityCatalog.quotaDefinition.store.getPaginationService(quotaPaginationKey, this.cfGuid, {})
       .entities$.pipe(
         filter(o => !!o),
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 7f489dbfb6..eec79aba70 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
@@ -17,13 +17,12 @@ import {
   createEntityRelationPaginationKey,
 } from '../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { CfApplicationState } from '../../../../../cloud-foundry/src/store/types/application.types';
-import { GetAllEndpoints } from '../../../../../store/src/actions/endpoint.actions';
 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 { endpointEntityType } from '../../../../../store/src/helpers/stratos-entity-factory';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { PaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
+import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
 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';
@@ -69,8 +68,8 @@ export class CloudFoundryEndpointService {
 
   static createGetAllOrganizations(cfGuid: string) {
     const paginationKey = cfGuid ?
-      createEntityRelationPaginationKey(endpointSchemaKey, cfGuid)
-      : createEntityRelationPaginationKey(endpointSchemaKey);
+      createEntityRelationPaginationKey(endpointEntityType, cfGuid)
+      : createEntityRelationPaginationKey(endpointEntityType);
     const getAllOrganizationsAction = cfEntityCatalog.org.actions.getMultiple(cfGuid, paginationKey,
       {
         includeRelations: [
@@ -84,8 +83,8 @@ export class CloudFoundryEndpointService {
   }
   static createGetAllOrganizationsLimitedSchema(cfGuid: string) {
     const paginationKey = cfGuid ?
-      createEntityRelationPaginationKey(endpointSchemaKey, cfGuid)
-      : createEntityRelationPaginationKey(endpointSchemaKey);
+      createEntityRelationPaginationKey(endpointEntityType, cfGuid)
+      : createEntityRelationPaginationKey(endpointEntityType);
     const getAllOrganizationsAction = cfEntityCatalog.org.actions.getMultiple(cfGuid, paginationKey,
       {
         includeRelations: [
@@ -138,16 +137,12 @@ export class CloudFoundryEndpointService {
   constructor(
     public activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
     private store: Store<CFAppState>,
-    private entityServiceFactory: EntityServiceFactory,
     private cfUserService: CfUserService,
     private pmf: PaginationMonitorFactory,
   ) {
     this.cfGuid = activeRouteCfOrgSpace.cfGuid;
 
-    this.cfEndpointEntityService = this.entityServiceFactory.create(
-      this.cfGuid,
-      new GetAllEndpoints()
-    );
+    this.cfEndpointEntityService = stratosEntityCatalog.endpoint.store.getEntityService(this.cfGuid);
 
     this.cfInfoEntityService = cfEntityCatalog.cfInfo.store.getEntityService(this.cfGuid)
     this.constructCoreObservables();
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 0e89121107..e02ed1ae30 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
@@ -3,9 +3,9 @@ import { filter, first, map, switchMap } from 'rxjs/operators';
 
 import { truthyIncludingZero } from '../../../../../core/src/core/utils.service';
 import { determineCardStatus } from '../../../../../core/src/shared/components/cards/card-status/card-status.component';
-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 { StratosStatus } from '../../../../../store/src/types/shared.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 932894115e..9c3bcbf845 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,9 +1,9 @@
 import { Observable } from 'rxjs';
 
 import { organizationEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
-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 { StratosStatus } from '../../../../../store/src/types/shared.types';
 import { IApp, IOrganization } from '../../../cf-api.types';
 import { getEntityFlattenedList, getStartedAppInstanceCount } from '../../../cf.helpers';
 import { CloudFoundryEndpointService } from './cloud-foundry-endpoint.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 1be45b3e30..692fad26d8 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,9 +1,9 @@
 import { Observable } from 'rxjs';
 
 import { spaceEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
-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 { StratosStatus } from '../../../../../store/src/types/shared.types';
 import { IApp, ISpace } from '../../../cf-api.types';
 import { getStartedAppInstanceCount } from '../../../cf.helpers';
 import { CloudFoundryEndpointService } from './cloud-foundry-endpoint.service';
diff --git a/src/frontend/packages/cloud-foundry/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
index a6bacfc2c6..5e648aba80 100644
--- a/src/frontend/packages/cloud-foundry/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
@@ -9,7 +9,7 @@ import { createEntityRelationPaginationKey } from '../../../../../cloud-foundry/
 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 { endpointSchemaKey } from '../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../store/src/helpers/stratos-entity-factory';
 import { IQuotaDefinition } from '../../../cf-api.types';
 
 
@@ -65,7 +65,7 @@ export class SpaceQuotaDefinitionFormComponent implements OnInit, OnDestroy {
     this.spaceQuotaDefinitions$ = cfEntityCatalog.spaceQuota.store.getAllInOrganization.getPaginationService(
       this.orgGuid,
       this.cfGuid,
-      createEntityRelationPaginationKey(endpointSchemaKey, this.cfGuid)
+      createEntityRelationPaginationKey(endpointEntityType, this.cfGuid)
     ).entities$
       .pipe(
         filter(o => !!o),
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 6ef73eb96f..ee79e073f2 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
@@ -3,10 +3,10 @@ import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { testSCFEndpoint, testSCFEndpointGuid } from '@stratosui/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 { endpointEntityType, stratosEntityFactory } from '../../../../../store/src/helpers/stratos-entity-factory';
 import { NormalizedResponse } from '../../../../../store/src/types/api.types';
 import { WrapperRequestActionSuccess } from '../../../../../store/src/types/request.types';
 import {
@@ -51,7 +51,7 @@ describe('SpaceQuotaDefinitionComponent', () => {
       .compileComponents();
 
 
-    const stratosEndpointEntityConfig: EntityCatalogEntityConfig = endpointEntitySchema;
+    const stratosEndpointEntityConfig: EntityCatalogEntityConfig = stratosEntityFactory(endpointEntityType);
     const stratosEndpointEntityKey = EntityCatalogHelpers.buildEntityKey(
       stratosEndpointEntityConfig.entityType,
       stratosEndpointEntityConfig.endpointType
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 07a77cddd6..cd137d502e 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,9 +2,9 @@ import { Component } from '@angular/core';
 import { Observable } from 'rxjs';
 import { first, map } from 'rxjs/operators';
 
-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 { metricEntityType } from '../../../../../../../../store/src/helpers/stratos-entity-factory';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import { getActiveRouteCfCellProvider } from '../../../../cf.helpers';
 import { CloudFoundryEndpointService } from '../../../../services/cloud-foundry-endpoint.service';
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.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.ts
index 081ec14430..e43d9ca244 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.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.ts
@@ -4,9 +4,8 @@ import { MetricsConfig } from '../../../../../../../../core/src/shared/component
 import {
   MetricsLineChartConfig,
 } from '../../../../../../../../core/src/shared/components/metrics-chart/metrics-chart.types';
-import { MetricQueryType } from '../../../../../../../../core/src/shared/services/metrics-range-selector.types';
 import { IMetricMatrixResult } from '../../../../../../../../store/src/types/base-metric.types';
-import { IMetricCell } from '../../../../../../../../store/src/types/metric.types';
+import { IMetricCell, MetricQueryType } from '../../../../../../../../store/src/types/metric.types';
 import { CloudFoundryCellService } from '../cloud-foundry-cell.service';
 
 @Component({
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 e8c160cbcf..669e75977b 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
@@ -10,8 +10,8 @@ import {
 import {
   MetricsChartHelpers,
 } from '../../../../../../../../core/src/shared/components/metrics-chart/metrics.component.helpers';
-import { MetricQueryType } from '../../../../../../../../core/src/shared/services/metrics-range-selector.types';
 import { MetricQueryConfig } from '../../../../../../../../store/src/actions/metrics.actions';
+import { MetricQueryType } from '../../../../../../../../store/src/types/metric.types';
 import { generateCfBaseTestModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { FetchCFCellMetricsAction } from '../../../../../../actions/cf-metrics.actions';
 import { ActiveRouteCfCell } from '../../../../cf-page.types';
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.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.ts
index e3427cd79b..2109f6dee5 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.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.ts
@@ -3,7 +3,7 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { ListConfig } from '../../../../../../../../core/src/shared/components/list/list.component.types';
-import { StratosStatus } from '../../../../../../../../core/src/shared/shared.types';
+import { StratosStatus } from '../../../../../../../../store/src/types/shared.types';
 import {
   CfCellHealthListConfigService,
 } from '../../../../../../shared/components/list/list-types/cf-cell-health/cf-cell-health-list-config.service';
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 fb6c1e76ec..708a438723 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
@@ -8,13 +8,12 @@ import { MetricsLineChartConfig } from '../../../../../../../core/src/shared/com
 import {
   MetricsChartHelpers,
 } from '../../../../../../../core/src/shared/components/metrics-chart/metrics.component.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 { EntityServiceFactory } from '../../../../../../../store/src/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { IMetricMatrixResult, IMetrics, IMetricVectorResult } from '../../../../../../../store/src/types/base-metric.types';
-import { IMetricCell } from '../../../../../../../store/src/types/metric.types';
+import { IMetricCell, MetricQueryType } 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-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 0c83c22d0f..f9a24ac961 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,15 +11,13 @@ import {
   StratosActionType,
   StratosTabType,
 } from '../../../../../../../core/src/core/extension/extension-service';
-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 {
-  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 { FavoritesConfigMapper } from '../../../../../../../store/src/favorite-config-mapper';
 import { EntitySchema } from '../../../../../../../store/src/helpers/entity-schema';
 import { UserFavorite } from '../../../../../../../store/src/types/user-favorites.types';
+import { getFavoriteFromEntity } from '../../../../../../../store/src/user-favorite-helpers';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { CfUserService } from '../../../../../shared/data-services/cf-user.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 c8c42c5c5a..5ae190a43b 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,16 +13,14 @@ import {
   StratosActionType,
   StratosTabType,
 } from '../../../../../../../../core/src/core/extension/extension-service';
-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';
-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 { RouterNav } from '../../../../../../../../store/src/actions/router.actions';
+import { FavoritesConfigMapper } from '../../../../../../../../store/src/favorite-config-mapper';
 import { UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
+import { getFavoriteFromEntity } from '../../../../../../../../store/src/user-favorite-helpers';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
 import { CfUserService } from '../../../../../../shared/data-services/cf-user.service';
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 755128bd1b..7331193e11 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
@@ -10,7 +10,7 @@ import { CurrentUserPermissionsService } from '../../../../../core/src/core/perm
 import { environment } from '../../../../../core/src/environments/environment.prod';
 import { ConfirmationDialogConfig } from '../../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../../core/src/shared/components/confirmation-dialog.service';
-import { GetSystemInfo } from '../../../../../store/src/actions/system.actions';
+import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
 import { CfCurrentUserPermissions } from '../../../user-permissions/cf-user-permissions-checkers';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { waitForCFPermissions } from '../cf.helpers';
@@ -57,7 +57,6 @@ interface UserInviteSend {
 export class UserInviteConfigureService {
 
   constructor(
-    private store: Store<CFAppState>,
     private http: HttpClient,
     private snackBar: MatSnackBar,
     private confirmDialog: ConfirmationDialogService,
@@ -70,7 +69,7 @@ export class UserInviteConfigureService {
     const url = `/pp/${proxyAPIVersion}/invite/${cfGUID}`;
     const obs$ = this.http.post(url, formData).pipe(
       map(v => {
-        this.store.dispatch(new GetSystemInfo());
+        stratosEntityCatalog.systemInfo.api.getSystemInfo()
         return {
           error: false
         };
@@ -99,7 +98,7 @@ export class UserInviteConfigureService {
       const url = `/pp/${proxyAPIVersion}/invite/${cfGUID}`;
       this.http.delete(url).pipe(
         map(v => {
-          this.store.dispatch(new GetSystemInfo());
+          stratosEntityCatalog.systemInfo.api.getSystemInfo()
           return {
             error: false,
             errorMessage: ''
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 56a88ed334..faa4668b08 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
@@ -18,7 +18,7 @@ import {
   createEntityRelationPaginationKey,
 } from '../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { CurrentUserPermissionsService } from '../../../../../../core/src/core/permissions/current-user-permissions.service';
-import { endpointSchemaKey } from '../../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../../store/src/helpers/stratos-entity-factory';
 import { APIResource, EntityInfo } from '../../../../../../store/src/types/api.types';
 import { UsersRolesSetChanges } from '../../../../actions/users-roles.actions';
 import { IOrganization, ISpace } from '../../../../cf-api.types';
@@ -239,7 +239,7 @@ export class CfRolesService {
 
   fetchOrgs(cfGuid: string): Observable<APIResource<IOrganization>[]> {
     if (!this.cfOrgs[cfGuid]) {
-      const paginationKey = createEntityRelationPaginationKey(endpointSchemaKey, cfGuid);
+      const paginationKey = createEntityRelationPaginationKey(endpointEntityType, cfGuid);
       const orgs$ = cfEntityCatalog.org.store.getPaginationService(
         cfGuid,
         paginationKey,
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 f6b4c53c11..4a7bb72774 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,11 +1,11 @@
 <app-page-header [tabs]="tabLinks" tabsHeader="Service" [breadcrumbs]="breadcrumbs">
   <div class="app-page-header">
-    {{ getServiceLabel() | async }}
+    {{ serviceLabel$ | async }}
   </div>
   <div class="page-header-right">
     <ng-container *appCfUserPermission="canCreateServiceInstance">
-      <button mat-icon-button name="add-service-instance" [routerLink]="addServiceInstanceLink()"
-        [queryParams]="isServiceSpaceScoped() | async" [disabled]="!(hasVisiblePlans$ | async)">
+      <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>
diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.ts
index 817f55a6e2..763af35529 100644
--- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.ts
@@ -6,6 +6,7 @@ import { map, publishReplay, refCount } from 'rxjs/operators';
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 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 { CSI_CANCEL_URL } from '../../../shared/components/add-service-instance/csi-mode.service';
 import { CfCurrentUserPermissions } from '../../../user-permissions/cf-user-permissions-checkers';
 import { getServiceName } from '../services-helper';
 import { ServicesService } from '../services.service';
@@ -20,6 +21,9 @@ export class ServiceTabsBaseComponent {
   toolTipText$: Observable<string>;
   hasVisiblePlans$: Observable<boolean>;
   servicesSubscription: Subscription;
+  isServiceSpaceScoped$: Observable<any>;
+  addServiceInstanceLink: string[];
+  serviceLabel$: Observable<string>;
 
   tabLinks: IPageSideNavTab[] = [
     {
@@ -59,24 +63,23 @@ export class ServiceTabsBaseComponent {
           return 'Cannot create service instance (no public or visible plans exist for service)';
         }
       }));
-
-  }
-
-  addServiceInstanceLink = () => [
-    '/marketplace',
-    this.servicesService.cfGuid,
-    this.servicesService.serviceGuid,
-    'create'
-  ]
-
-  isServiceSpaceScoped = () => this.servicesService.isSpaceScoped$;
-
-  getServiceLabel = (): Observable<string> => {
-    return this.servicesService.service$.pipe(
+    this.isServiceSpaceScoped$ = this.servicesService.isSpaceScoped$.pipe(
+      map(queryParams => ({
+        ...queryParams,
+        [CSI_CANCEL_URL]: `/marketplace/${this.servicesService.cfGuid}/${this.servicesService.serviceGuid}/instances`
+      }))
+    )
+    this.addServiceInstanceLink = [
+      '/marketplace',
+      this.servicesService.cfGuid,
+      this.servicesService.serviceGuid,
+      'create'
+    ]
+    this.serviceLabel$ = this.servicesService.service$.pipe(
       map(getServiceName),
       publishReplay(1),
       refCount()
-    );
+    )
   }
 
 }
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 9f55596f21..d3fce2628e 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
@@ -5,10 +5,10 @@ import { combineLatest, filter, first, map, share, switchMap } from 'rxjs/operat
 
 import { createEntityRelationPaginationKey } from '../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { getIdFromRoute, safeStringToObj } from '../../../../core/src/core/utils.service';
-import { StratosStatus } from '../../../../core/src/shared/shared.types';
 import { EntityService } from '../../../../store/src/entity-service';
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource } from '../../../../store/src/types/api.types';
+import { StratosStatus } from '../../../../store/src/types/shared.types';
 import {
   IService,
   IServiceBroker,
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 a550800a57..05d65754d3 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
@@ -132,6 +132,7 @@ export class ServicesService {
       map(o => (o.length === 0 ? null : o[0]))
     );
     this.isSpaceScoped$ = this.serviceBroker$.pipe(
+      first(),
       map(o => o ? o.entity.space_guid : null),
       switchMap(spaceGuid => {
         if (!spaceGuid) {
@@ -151,7 +152,8 @@ export class ServicesService {
             })),
           );
         }
-      })
+      }),
+      first()
     );
     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/features/services/services-wall/services-wall.component.html b/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.html
index cf6322f5e7..b47b7c7e12 100644
--- a/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.html
+++ b/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.html
@@ -3,7 +3,7 @@ <h1>Services</h1>
   <div class="page-header-right">
     <ng-container *ngIf="(haveConnectedCf$ | async)">
       <ng-container *appCfUserPermission="canCreateServiceInstance">
-        <button mat-icon-button [routerLink]="'/services/new/'">
+        <button mat-icon-button [routerLink]="'/services/new/'" [queryParams]="location">
           <mat-icon>add</mat-icon>
         </button>
       </ng-container>
diff --git a/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.ts b/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.ts
index 96d806b0c5..be3e78240d 100644
--- a/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.ts
@@ -14,6 +14,7 @@ import {
 } from '../../../../../cloud-foundry/src/shared/data-services/cf-org-space-service.service';
 import { CloudFoundryService } from '../../../../../cloud-foundry/src/shared/data-services/cloud-foundry.service';
 import { ListConfig } from '../../../../../core/src/shared/components/list/list.component.types';
+import { CSI_CANCEL_URL } from '../../../shared/components/add-service-instance/csi-mode.service';
 import { CfCurrentUserPermissions } from '../../../user-permissions/cf-user-permissions-checkers';
 
 @Component({
@@ -35,6 +36,7 @@ export class ServicesWallComponent implements OnDestroy {
   canCreateServiceInstance: CfCurrentUserPermissions;
   initCfOrgSpaceService: Subscription;
   cfIds$: Observable<string[]>;
+  location: { [CSI_CANCEL_URL]: string };
 
   constructor(
     public cloudFoundryService: CloudFoundryService,
@@ -57,6 +59,10 @@ export class ServicesWallComponent implements OnDestroy {
     this.haveConnectedCf$ = cloudFoundryService.connectedCFEndpoints$.pipe(
       map(endpoints => !!endpoints && endpoints.length > 0)
     );
+
+    this.location = {
+      [CSI_CANCEL_URL]: `/services`
+    }
   }
 
   ngOnDestroy(): void {
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 c6ebd18e85..eadc97f032 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
@@ -3,7 +3,7 @@ import { Observable } from 'rxjs';
 import { filter, map, publishReplay, refCount } from 'rxjs/operators';
 
 import { serviceEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
-import { endpointSchemaKey } from '../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../store/src/helpers/stratos-entity-factory';
 import { APIResource } from '../../../../../store/src/types/api.types';
 import { IService } from '../../../cf-api-svc.types';
 import { cfEntityCatalog } from '../../../cf-entity-catalog';
@@ -18,7 +18,7 @@ export class ServicesWallService {
   }
 
   initServicesObservable = () => {
-    const paginationKey = createEntityRelationPaginationKey(endpointSchemaKey);
+    const paginationKey = createEntityRelationPaginationKey(endpointEntityType);
     return cfEntityCatalog.service.store.getPaginationService(null, paginationKey, {}).entities$
   }
 
diff --git a/src/frontend/packages/cloud-foundry/src/public_api.ts b/src/frontend/packages/cloud-foundry/src/public_api.ts
index eef53f2d79..dbe7a16cbd 100644
--- a/src/frontend/packages/cloud-foundry/src/public_api.ts
+++ b/src/frontend/packages/cloud-foundry/src/public_api.ts
@@ -5,3 +5,5 @@
 // export * from './lib/cloud-foundry.service';
 export * from './lib/cloud-foundry.component';
 export * from './lib/cloud-foundry.module';
+
+export * from './cf-api-svc.types';
\ No newline at end of file
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 7da0831fa8..aeef92fd78 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
@@ -5,9 +5,6 @@ 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';
 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';
@@ -23,6 +20,9 @@ import {
 import {
   SpecifyUserProvidedDetailsComponent,
 } from './components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component';
+import {
+  ApplicationInstanceChartComponent,
+} from './components/application-instance-chart/application-instance-chart.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';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component.html
index bdb623280b..20a2ba742b 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component.html
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component.html
@@ -1,7 +1,7 @@
 <app-page-header>
   Choose Service Type
 </app-page-header>
-<app-steppers [cancel]="'/services'">
+<app-steppers [cancel]="cancelUrl">
   <app-step [hideNextButton]="true">
     <div class="select-service-step">
       <h3>Choose service type to {{ bindApp ? 'bind' : 'create' }}</h3>
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component.ts
index 06f9214b75..2daa17cb4a 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component.ts
@@ -1,12 +1,14 @@
 import { Component } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
+import { getIdFromRoute } from '../../../../../../core/src/core/utils.service';
 import { BASE_REDIRECT_QUERY } from '../../../../../../core/src/shared/components/stepper/stepper.types';
 import { TileConfigManager } from '../../../../../../core/src/shared/components/tile/tile-selector.helpers';
 import { ITileConfig, ITileData } from '../../../../../../core/src/shared/components/tile/tile-selector.types';
 import { RouterNav } from '../../../../../../store/src/actions/router.actions';
+import { CSI_CANCEL_URL } from '../csi-mode.service';
 import { SERVICE_INSTANCE_TYPES } from './add-service-instance.types';
 
 interface ICreateServiceTilesData extends ITileData {
@@ -21,6 +23,7 @@ interface ICreateServiceTilesData extends ITileData {
 export class AddServiceInstanceBaseStepComponent {
   private tileManager = new TileConfigManager();
   public serviceType: string;
+  public cancelUrl = '/services';
 
   public tileSelectorConfig = [
     this.tileManager.getNextTileConfig<ICreateServiceTilesData>(
@@ -44,16 +47,39 @@ export class AddServiceInstanceBaseStepComponent {
     this.serviceType = tile ? tile.data.type : null;
     this.pSelectedTile = tile;
     if (tile) {
-      const baseUrl = this.bindApp ? this.router.routerState.snapshot.url : '/services/new';
+      const baseUrl = this.createServiceTileUrl();
       this.store.dispatch(new RouterNav({
         path: `${baseUrl}/${this.serviceType}`,
         query: {
-          [BASE_REDIRECT_QUERY]: baseUrl
+          [BASE_REDIRECT_QUERY]: baseUrl, // 'previous' destination
+          [CSI_CANCEL_URL]: this.cancelUrl // 'cancel' + 'success' destination
         }
       }));
     }
   }
-  constructor(private route: ActivatedRoute, private router: Router, public store: Store<CFAppState>) {
+
+  private cfId: string;
+  private appId: string;
+
+  constructor(
+    private route: ActivatedRoute,
+    public store: Store<CFAppState>
+  ) {
     this.bindApp = !!this.route.snapshot.data.bind;
+    if (this.bindApp) {
+      this.cfId = getIdFromRoute(this.route, 'endpointId');
+      this.appId = getIdFromRoute(this.route, 'id');
+    }
+    this.cancelUrl = this.createCancelUrl();
+  }
+
+  private createServiceTileUrl(): string {
+    return this.bindApp ? `/applications/${this.cfId}/${this.appId}/bind` : '/services/new'
   }
+
+  private createCancelUrl(): string {
+    return this.bindApp ? `/applications/${this.cfId}/${this.appId}/services` : '/services'
+  }
+
+
 }
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 3c4fa72df5..ad65ce4410 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,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { filter, map, pairwise } from 'rxjs/operators';
 
 import { SpaceScopedService } from '../../../../../cloud-foundry/src/features/service-catalog/services.service';
@@ -19,8 +19,23 @@ export const enum CreateServiceFormMode {
   BindServiceInstance = 'bind-service-instance',
 }
 
+/**
+ * Where should the user be taken on cancel (and success). If not supplied will fall back on previous location and then deduced from
+ * params
+ */
+export const CSI_CANCEL_URL = 'cancel'
+
+/**
+ * Used when `CSI_CANCEL_URL` is not supplied
+ */
 export const CANCEL_SPACE_ID_PARAM = 'space-guid';
+/**
+ * Used when `CSI_CANCEL_URL` is not supplied
+ */
 export const CANCEL_ORG_ID_PARAM = 'org-guid';
+/**
+ * Used when `CSI_CANCEL_URL` is not supplied
+ */
 export const CANCEL_USER_PROVIDED = 'up';
 
 interface ViewDetail {
@@ -44,12 +59,16 @@ export class CsiModeService {
 
   private mode: string;
   public viewDetail: ViewDetail;
+  /**
+   * Where should the user be taken on cancel (and success). Taken from url param, previous location or deduced
+   */
   public cancelUrl: string;
   // This property is only used when launching the Create Service Instance Wizard from the Marketplace
   spaceScopedDetails: SpaceScopedService = { isSpaceScoped: false };
 
   constructor(
     private activatedRoute: ActivatedRoute,
+    router: Router
   ) {
     const serviceId = getIdFromRoute(activatedRoute, 'serviceId');
     const serviceInstanceId = getIdFromRoute(activatedRoute, 'serviceInstanceId');
@@ -118,6 +137,7 @@ export class CsiModeService {
         `/cloud-foundry/${cfId}/organizations/${orgGuid}/spaces/${spaceGuid}/${isUserProvided ? 'user-service-instances' : 'service-instances'}`;
     }
 
+    this.updateCancelUrl(this.activatedRoute, router);
   }
 
   getViewDetail = () => this.viewDetail;
@@ -148,4 +168,33 @@ export class CsiModeService {
     );
   }
 
+  private updateCancelUrl(
+    activatedRoute: ActivatedRoute,
+    router: Router
+  ) {
+    // cancelUrl determines where we go on cancel AND success
+    const cancelUrl = activatedRoute.snapshot.queryParamMap.get(CSI_CANCEL_URL);
+    if (cancelUrl) {
+      // Override cancelUrl with what's been passed in (probably came from the service selection pre-step)
+      this.cancelUrl = cancelUrl;
+    } else {
+      // There's some holes with the way cancelUrl in ctor is calculated
+      // - marketplace/service/instances list --> cancel goes to space service instance list
+      // - marketplace/service create instance --> cancel goes to marketplace/service/instance regardless of starting tab
+      // - .. others??
+      // For simplicity always go back to the previous location
+      // - good catch all
+      // - doesn't work that well for marketplace/service create instance --> success (should go to marketplace/service/instance)
+      // - if user has refreshed on stepper (previous url was login) use the old cancelUrl best-guess value
+      const currentNavigation = router.getCurrentNavigation();
+      if (currentNavigation &&
+        currentNavigation.previousNavigation &&
+        currentNavigation.previousNavigation.finalUrl &&
+        currentNavigation.previousNavigation.finalUrl.toString() !== '/login'
+      ) {
+        this.cancelUrl = currentNavigation.previousNavigation.finalUrl.toString();
+      }
+    }
+  }
+
 }
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 961ada73a1..e1b2c4d645 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
@@ -39,8 +39,8 @@ import {
 } from '../../../../../../cloud-foundry/src/store/selectors/create-service-instance.selectors';
 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 { StratosStatus } from '../../../../../../store/src/types/shared.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';
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 80ed214a56..ae2ed8a868 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
@@ -31,7 +31,6 @@ import {
 } from '../../../../../../cloud-foundry/src/actions/create-service-instance.actions';
 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 { 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';
@@ -297,7 +296,7 @@ export class SpecifyDetailsStepComponent implements OnDestroy, AfterContentInit
       this.longRunningOpService.handleLongRunningCreateService(bindApp);
       // Return to app page instead of falling through to service page
       if (bindApp) {
-        return observableOf(this.routeToServices(state.cfGuid, state.bindAppGuid));
+        return observableOf(this.routeToServices());
       }
     } else if (request.error) {
       // The request has errored, report this back
@@ -318,7 +317,7 @@ export class SpecifyDetailsStepComponent implements OnDestroy, AfterContentInit
           } else {
             // Refetch env vars for app, since they have been changed by CF
             cfEntityCatalog.appEnvVar.api.getMultiple(state.bindAppGuid, state.cfGuid);
-            return this.routeToServices(state.cfGuid, state.bindAppGuid);
+            return this.routeToServices();
           }
         })
       );
@@ -356,13 +355,12 @@ export class SpecifyDetailsStepComponent implements OnDestroy, AfterContentInit
     );
   }
 
-  routeToServices = (cfGuid: string = null, appGuid: string = null): StepOnNextResult => {
-    if (this.modeService.isAppServicesMode()) {
-      this.store.dispatch(new RouterNav({ path: ['/applications', cfGuid, appGuid, 'services'] }));
-    } else {
-      this.store.dispatch(new RouterNav({ path: ['/services'] }));
-    }
-    return { success: true };
+  routeToServices = (): StepOnNextResult => {
+    return {
+      success: true,
+      // We should always go back to where we came from, aka 'cancel' location.
+      redirect: true,
+    };
   }
 
   private setServiceInstanceGuid = (request: { creating: boolean; error: boolean; response: { result: any[]; }; }) =>
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 a5d2b02b09..258727a9cc 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
@@ -27,6 +27,7 @@ import { IUserProvidedServiceInstance } from '../../../../cf-api-svc.types';
 import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { AppNameUniqueChecking } from '../../../directives/app-name-unique.directive/app-name-unique.directive';
 import { CloudFoundryUserProvidedServicesService } from '../../../services/cloud-foundry-user-provided-services.service';
+import { AppServiceBindingDataSource } from '../../list/list-types/app-sevice-bindings/app-service-binding-data-source';
 import { CreateServiceFormMode, CsiModeService } from './../csi-mode.service';
 
 const { proxyAPIVersion, cfAPIVersion } = environment;
@@ -38,7 +39,7 @@ const { proxyAPIVersion, cfAPIVersion } = environment;
 export class SpecifyUserProvidedDetailsComponent implements OnDestroy {
 
   constructor(
-    route: ActivatedRoute,
+    private route: ActivatedRoute,
     private upsService: CloudFoundryUserProvidedServicesService,
     public modeService: CsiModeService,
     private store: Store<CFAppState>,
@@ -297,11 +298,24 @@ export class SpecifyUserProvidedDetailsComponent implements OnDestroy {
       this.serviceInstanceId,
       updateData
     ).pipe(
-      map(er => ({
-        success: !er.error,
-        redirect: !er.error,
-        message: `Failed to update service instance: ${er.message}`
-      }))
+      map(er => {
+        if (!er.error) {
+          // Update the application binding list
+          const appId = this.appId || this.route.snapshot.queryParamMap.get('appId');
+          if (appId) {
+            this.store.dispatch(AppServiceBindingDataSource.createGetAllServiceBindings(appId, this.cfGuid));
+          }
+          return {
+            success: true,
+            redirect: true,
+          };
+        }
+        return {
+          success: false,
+          redirect: false,
+          message: `Failed to update service instance: ${er.message}`
+        };
+      })
     );
   }
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/application-instance-chart/application-instance-chart.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.html
rename to src/frontend/packages/cloud-foundry/src/shared/components/application-instance-chart/application-instance-chart.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/application-instance-chart/application-instance-chart.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.scss
rename to src/frontend/packages/cloud-foundry/src/shared/components/application-instance-chart/application-instance-chart.component.scss
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/shared/components/application-instance-chart/application-instance-chart.component.spec.ts
similarity index 74%
rename from src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/application-instance-chart/application-instance-chart.component.spec.ts
index 07fb0f11ed..fc47c9f6b3 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/shared/components/application-instance-chart/application-instance-chart.component.spec.ts
@@ -2,10 +2,10 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 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 { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { CloudFoundrySharedModule } from './../../../../shared/cf-shared.module';
+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 '../../cf-shared.module';
 import { ApplicationInstanceChartComponent } from './application-instance-chart.component';
 
 describe('ApplicationInstanceChartComponent', () => {
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/application-instance-chart/application-instance-chart.component.ts
similarity index 66%
rename from src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/application-instance-chart/application-instance-chart.component.ts
index 5401a177bc..3a54bec82d 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/application-instance-chart/application-instance-chart.component.ts
@@ -1,13 +1,12 @@
 import { Component, Input, OnInit } from '@angular/core';
 
-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 { MetricsChartHelpers } from '../../../../../../core/src/shared/components/metrics-chart/metrics.component.helpers';
-import { MetricQueryType } from '../../../../../../core/src/shared/services/metrics-range-selector.types';
-import { MetricQueryConfig } from '../../../../../../store/src/actions/metrics.actions';
-import { IMetricMatrixResult } from '../../../../../../store/src/types/base-metric.types';
-import { IMetricApplication } from '../../../../../../store/src/types/metric.types';
-import { FetchApplicationMetricsAction } from '../../../../actions/cf-metrics.actions';
+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 { MetricsChartHelpers } from '../../../../../core/src/shared/components/metrics-chart/metrics.component.helpers';
+import { MetricQueryConfig } from '../../../../../store/src/actions/metrics.actions';
+import { IMetricMatrixResult } from '../../../../../store/src/types/base-metric.types';
+import { IMetricApplication, MetricQueryType } from '../../../../../store/src/types/metric.types';
+import { FetchApplicationMetricsAction } from '../../../actions/cf-metrics.actions';
 
 @Component({
   selector: 'app-application-instance-chart',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.html
index bf67158f11..4c5cd00b6f 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.html
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.html
@@ -5,7 +5,8 @@
   </mat-card-header>
   <mat-card-content class="card-app-instances__compact">
     <div *ngIf="!isEditing" class="card-app-instances__large">
-      <app-running-instances [instances]="(appService.application$ | async)?.app.entity?.instances" [cfGuid]="appService.cfGuid" [appGuid]="this.appService.appGuid">
+      <app-running-instances [instances]="(appService.application$ | async)?.app.entity?.instances"
+        [cfGuid]="appService.cfGuid" [appGuid]="this.appService.appGuid">
       </app-running-instances>
     </div>
     <form [hidden]="!isEditing" class="card-app-instances__form">
@@ -14,23 +15,27 @@
       </mat-form-field>
     </form>
   </mat-card-content>
-  <mat-card-actions *ngIf="showActions && (appService.applicationRunning$ | async) && !isEditing" class="card-app-instances__actions">
-    <button (click)="edit()" mat-icon-button [disabled]="appService.isUpdatingApp$ | async">
-          <mat-icon>edit</mat-icon>
+  <ng-container *ngIf="canEditApp$ | async">
+    <mat-card-actions *ngIf="showActions && (appService.applicationRunning$ | async) && !isEditing"
+      class="card-app-instances__actions">
+      <button (click)="edit()" mat-icon-button [disabled]="appService.isUpdatingApp$ | async">
+        <mat-icon>edit</mat-icon>
       </button>
-    <button (click)="scaleDown()" mat-icon-button [disabled]="appService.isUpdatingApp$ | async">
-          <mat-icon>remove_circle_outline</mat-icon>
+      <button (click)="scaleDown()" mat-icon-button [disabled]="appService.isUpdatingApp$ | async">
+        <mat-icon>remove_circle_outline</mat-icon>
       </button>
-    <button (click)="scaleUp()" mat-icon-button [disabled]="appService.isUpdatingApp$ | async">
-          <mat-icon>add_circle_outline</mat-icon>
+      <button (click)="scaleUp()" mat-icon-button [disabled]="appService.isUpdatingApp$ | async">
+        <mat-icon>add_circle_outline</mat-icon>
       </button>
-  </mat-card-actions>
-  <mat-card-actions *ngIf="showActions && isEditing" class="card-app-instances__actions">
-    <button (click)="finishEdit(false)" mat-icon-button [disabled]="appService.isUpdatingApp$ | async">
-          <mat-icon>clear</mat-icon>
+    </mat-card-actions>
+    <mat-card-actions *ngIf="showActions && isEditing" class="card-app-instances__actions">
+      <button (click)="finishEdit(false)" mat-icon-button [disabled]="appService.isUpdatingApp$ | async">
+        <mat-icon>clear</mat-icon>
       </button>
-    <button (click)="finishEdit(true)" mat-icon-button [disabled]="appService.isUpdatingApp$ | async">
-            <mat-icon>done</mat-icon>
-        </button>
-  </mat-card-actions>
-</mat-card>
+      <button (click)="finishEdit(true)" mat-icon-button [disabled]="appService.isUpdatingApp$ | async">
+        <mat-icon>done</mat-icon>
+      </button>
+    </mat-card-actions>
+  </ng-container>
+
+</mat-card>
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.ts
index c3524019b6..6604494482 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.ts
@@ -1,13 +1,15 @@
-import { Component, ElementRef, Input, OnDestroy, OnInit, ViewChild, Renderer2 } from '@angular/core';
+import { Component, ElementRef, Input, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core';
 import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar';
-import { Observable, Subscription } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import { combineLatest, Observable, Subscription } from 'rxjs';
+import { first, map, switchMap } from 'rxjs/operators';
 
 import { AppMetadataTypes } from '../../../../../../cloud-foundry/src/actions/app-metadata.actions';
 import { ApplicationService } from '../../../../../../cloud-foundry/src/features/applications/application.service';
+import { CurrentUserPermissionsService } from '../../../../../../core/src/core/permissions/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 { StratosStatus } from '../../../../../../core/src/shared/shared.types';
+import { StratosStatus } from '../../../../../../store/src/types/shared.types';
+import { CfCurrentUserPermissions } from '../../../../user-permissions/cf-user-permissions-checkers';
 
 const appInstanceScaleToZeroConfirmation = new ConfirmationDialogConfig('Set Instance count to 0',
   'Are you sure you want to set the instance count to 0?', 'Confirm', true);
@@ -28,14 +30,26 @@ export class CardAppInstancesComponent implements OnInit, OnDestroy {
 
   status$: Observable<StratosStatus>;
 
+  public canEditApp$: Observable<boolean>;
+
   constructor(
     public appService: ApplicationService,
     private renderer: Renderer2,
     private confirmDialog: ConfirmationDialogService,
-    private snackBar: MatSnackBar) {
+    private snackBar: MatSnackBar,
+    cups: CurrentUserPermissionsService
+  ) {
     this.status$ = this.appService.applicationState$.pipe(
       map(state => state.indicator)
     );
+    this.canEditApp$ = combineLatest(
+      appService.appOrg$,
+      appService.appSpace$
+    ).pipe(
+      switchMap(([org, space]) =>
+        cups.can(CfCurrentUserPermissions.APPLICATION_EDIT, appService.cfGuid, org.metadata.guid, space.metadata.guid)
+      ))
+
   }
 
   private currentCount = 0;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-status/card-app-status.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-status/card-app-status.component.ts
index def16fda0d..c7e9633951 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-status/card-app-status.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-status/card-app-status.component.ts
@@ -3,7 +3,7 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { ApplicationService } from '../../../../../../cloud-foundry/src/features/applications/application.service';
-import { StratosStatus } from '../../../../../../core/src/shared/shared.types';
+import { StratosStatus } from '../../../../../../store/src/types/shared.types';
 
 @Component({
   selector: 'app-card-app-status',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-usage/card-app-usage.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-usage/card-app-usage.component.ts
index b8dcea269a..8e47a9ab46 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-usage/card-app-usage.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-usage/card-app-usage.component.ts
@@ -7,7 +7,7 @@ import {
 } from '../../../../../../cloud-foundry/src/features/applications/application-monitor.service';
 import { ApplicationService } from '../../../../../../cloud-foundry/src/features/applications/application.service';
 import { pathGet } from '../../../../../../core/src/core/utils.service';
-import { StratosStatus } from '../../../../../../core/src/shared/shared.types';
+import { StratosStatus } from '../../../../../../store/src/types/shared.types';
 
 @Component({
   selector: 'app-card-app-usage',
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 a6c13b1af5..d982f91991 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
@@ -7,7 +7,7 @@ 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 { BREADCRUMB_URL_PARAM } from '../../../../../../../core/src/shared/components/breadcrumbs/breadcrumbs.types';
-import { StratosStatus } from '../../../../../../../core/src/shared/shared.types';
+import { StratosStatus } from '../../../../../../../store/src/types/shared.types';
 import { ApplicationStateData, ApplicationStateService } from '../../../../services/application-state.service';
 
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts
index 1e20e5ab65..555865d96e 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts
@@ -8,8 +8,8 @@ import {
   CloudFoundrySpaceService,
 } from '../../../../../../cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space.service';
 import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
+import { SnackBarService } from '../../../../../../core/src/shared/services/snackbar.service';
 import { RouterNav } from '../../../../../../store/src/actions/router.actions';
-import { ShowReturnSnackBar } from '../../../../../../store/src/actions/snackBar.actions';
 import { AppState } from '../../../../../../store/src/app-state';
 
 @Component({
@@ -24,7 +24,8 @@ export class CardCfSpaceDetailsComponent implements OnDestroy {
   constructor(
     public cfSpaceService: CloudFoundrySpaceService,
     private store: Store<AppState>,
-    private router: Router
+    private router: Router,
+    private snackBarService: SnackBarService
   ) {
     this.allowSshStatus$ = cfSpaceService.allowSsh$.pipe(
       map(status => status === 'false' ? 'Disabled' : 'Enabled')
@@ -34,7 +35,7 @@ export class CardCfSpaceDetailsComponent implements OnDestroy {
   goToOrgQuota() {
     this.quotaLinkSub = this.cfSpaceService.quotaLink$.subscribe(quotaLink => {
       this.store.dispatch(new RouterNav({ path: quotaLink }));
-      this.store.dispatch(new ShowReturnSnackBar('You were switched to an organization', this.router.url, 'Return to space'));
+      this.snackBarService.showReturn('You were switched to an organization', this.router.url, 'Return to space');
     });
   }
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.ts
index 8472dd6633..f2337914c2 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.ts
@@ -46,6 +46,7 @@ export class CfRoleCheckboxComponent implements OnInit, OnDestroy {
 
 
   @Input() cfGuid: string;
+  @Input() orgGuid: string;
   @Input() spaceGuid: string;
   @Input() orgName: string;
   @Input() spaceName: string;
@@ -60,7 +61,6 @@ export class CfRoleCheckboxComponent implements OnInit, OnDestroy {
   sub: Subscription;
   isOrgRole = false;
   disabled = false;
-  orgGuid: string;
 
   private static hasExistingRole(role: string, roles: CfUserRolesSelected, userGuid: string, orgGuid: string, spaceGuid: string): boolean {
     if (roles && roles[userGuid] && roles[userGuid][orgGuid]) {
@@ -266,7 +266,6 @@ export class CfRoleCheckboxComponent implements OnInit, OnDestroy {
       combineLatestOp(this.cfRolesService.newRoles$, users$, canEditRole$, selectUsersIsSetByUsername$),
       filter(([existingRoles, newRoles, users, canEditRole, isSetByUsername]) => !!users.length && !!newRoles.orgGuid)
     ).subscribe(([existingRoles, newRoles, users, canEditRole, isSetByUsername]) => {
-      this.orgGuid = newRoles.orgGuid;
       const { checked, tooltip } = CfRoleCheckboxComponent.getCheckedState(
         this.role, users, existingRoles, newRoles, this.orgGuid, this.spaceGuid);
       this.checked = checked;
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 dd2d9a08a4..3966e4880a 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
@@ -6,15 +6,11 @@ import { testSCFEndpointGuid } from '@stratosui/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 { generateTestEntityServiceProvider } from '../../../../../../../core/test-framework/entity-service.helper';
 import { generateTestApplicationServiceProvider } from '../../../../../../test-framework/application-service-helper';
 import {
   generateCfStoreModules,
   generateTestCfEndpointServiceProvider,
 } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { GetApplication } from '../../../../../actions/application.actions';
-import { cfEntityFactory } from '../../../../../cf-entity-factory';
-import { applicationEntityType } from '../../../../../cf-entity-types';
 import { ApplicationsModule } from '../../../../../features/applications/applications.module';
 import { CfAppInstancesConfigService } from './cf-app-instances-config.service';
 
@@ -27,11 +23,6 @@ describe('CfAppInstancesConfigService', () => {
     TestBed.configureTestingModule({
       providers: [
         CfAppInstancesConfigService,
-        generateTestEntityServiceProvider(
-          appGuid,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appGuid, cfGuid)
-        ),
         generateTestApplicationServiceProvider(appGuid, cfGuid),
         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 1559dfec06..2753ce8909 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
@@ -1,12 +1,15 @@
 import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
 import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
+import { combineLatest as combineLatestObs, Observable } from 'rxjs';
 import { combineLatest, map, switchMap } from 'rxjs/operators';
 
 import { DeleteApplicationInstance } from '../../../../../../../cloud-foundry/src/actions/application.actions';
 import { FetchApplicationMetricsAction } from '../../../../../../../cloud-foundry/src/actions/cf-metrics.actions';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { UtilsService } 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';
@@ -19,14 +22,14 @@ import {
   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';
 import { PaginationMonitorFactory } from '../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { IMetricMatrixResult, IMetrics } from '../../../../../../../store/src/types/base-metric.types';
-import { IMetricApplication } from '../../../../../../../store/src/types/metric.types';
+import { IMetricApplication, MetricQueryType } from '../../../../../../../store/src/types/metric.types';
 import { ApplicationService } from '../../../../../features/applications/application.service';
 import { CfCellHelper } from '../../../../../features/cloud-foundry/cf-cell.helpers';
+import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 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';
@@ -158,7 +161,7 @@ export class CfAppInstancesConfigService implements IListConfig<ListAppInstance>
     },
     label: 'Terminate',
     description: ``, // Description depends on console user permission
-
+    createVisible: () => this.canEditApp$
   };
 
   private listActionSsh: IListAction<any> = {
@@ -182,7 +185,8 @@ export class CfAppInstancesConfigService implements IListConfig<ListAppInstance>
               space.entity.allow_ssh;
           })
         );
-      }))
+      })),
+    createVisible: () => this.canEditApp$
   };
 
   private singleActions = [
@@ -190,6 +194,8 @@ export class CfAppInstancesConfigService implements IListConfig<ListAppInstance>
     this.listActionSsh,
   ];
 
+  private canEditApp$: Observable<boolean>;
+
   constructor(
     private store: Store<CFAppState>,
     private appService: ApplicationService,
@@ -197,7 +203,8 @@ export class CfAppInstancesConfigService implements IListConfig<ListAppInstance>
     private router: Router,
     private confirmDialog: ConfirmationDialogService,
     entityServiceFactory: EntityServiceFactory,
-    paginationMonitorFactory: PaginationMonitorFactory
+    paginationMonitorFactory: PaginationMonitorFactory,
+    cups: CurrentUserPermissionsService
   ) {
     const cellHelper = new CfCellHelper(store, paginationMonitorFactory);
 
@@ -220,6 +227,15 @@ export class CfAppInstancesConfigService implements IListConfig<ListAppInstance>
       this.appService.appGuid,
       this,
     );
+
+    this.canEditApp$ = combineLatestObs(
+      appService.appOrg$,
+      appService.appSpace$
+    ).pipe(
+      switchMap(([org, space]) =>
+        cups.can(CfCurrentUserPermissions.APPLICATION_EDIT, appService.cfGuid, org.metadata.guid, space.metadata.guid)
+      )
+    )
   }
 
   getGlobalActions = () => null;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/table-cell-cf-cell/table-cell-cf-cell.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/table-cell-cf-cell/table-cell-cf-cell.component.ts
index 64ccc8b4f4..651c1b90ac 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/table-cell-cf-cell/table-cell-cf-cell.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/table-cell-cf-cell/table-cell-cf-cell.component.ts
@@ -2,8 +2,8 @@ import { Component, Input, OnDestroy } from '@angular/core';
 import { Observable, Subscription } from 'rxjs';
 import { filter, map, tap } from 'rxjs/operators';
 
-import { EntityService } from '../../../../../../../../store/src/entity-service';
 import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
+import { EntityService } from '../../../../../../../../store/src/entity-service';
 import { IMetricMatrixResult, IMetrics } from '../../../../../../../../store/src/types/base-metric.types';
 import { IMetricCell } from '../../../../../../../../store/src/types/metric.types';
 import { ListAppInstance } from '../app-instance-types';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-routes-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-routes-list-config.service.ts
index a631fac6ae..b69eb4ab15 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-routes-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-routes-list-config.service.ts
@@ -1,7 +1,8 @@
 import { DatePipe } from '@angular/common';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { take } from 'rxjs/operators';
+import { combineLatest } from 'rxjs';
+import { switchMap, take } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import {
@@ -12,6 +13,7 @@ import { IGlobalListAction, IListConfig } from '../../../../../../../core/src/sh
 import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { ApplicationService } from '../../../../../features/applications/application.service';
+import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import { CfAppRoutesListConfigServiceBase } from './cf-app-routes-list-config-base';
 
 
@@ -23,11 +25,12 @@ export class CfAppRoutesListConfigService extends CfAppRoutesListConfigServiceBa
     appService: ApplicationService,
     confirmDialog: ConfirmationDialogService,
     datePipe: DatePipe,
-    currentUserPermissionsService: CurrentUserPermissionsService,
+    private currentUserPermissionsService: CurrentUserPermissionsService,
   ) {
     super(store, appService, confirmDialog, datePipe, currentUserPermissionsService, null, true);
 
     this.setupList(store, appService);
+    this.allowSelection = false; // Allow the multi action visibility to determine this
   }
 
   private setupList(store: Store<CFAppState>, appService: ApplicationService) {
@@ -51,7 +54,18 @@ export class CfAppRoutesListConfigService extends CfAppRoutesListConfigServiceBa
       },
       icon: 'add',
       label: 'Add',
-      description: 'Add new route'
+      description: 'Add new route',
+      visible$: combineLatest(
+        appService.appOrg$,
+        appService.appSpace$
+      ).pipe(
+        switchMap(([org, space]) => this.currentUserPermissionsService.can(
+          CfCurrentUserPermissions.ROUTE_CREATE,
+          appService.cfGuid,
+          org.metadata.guid,
+          space.metadata.guid
+        ))
+      )
     };
     this.getGlobalActions = () => [listActionAddRoute];
   }
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 5f15687925..50fb563f34 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
@@ -8,12 +8,10 @@ import {
   CurrentUserPermissionsService,
 } from '../../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
-import {
-  MetaCardMenuItem,
-} 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 { APIResource, EntityInfo } from '../../../../../../../../store/src/types/api.types';
+import { MenuItem } from '../../../../../../../../store/src/types/menu-item.types';
+import { ComponentEntityMonitorConfig } from '../../../../../../../../store/src/types/shared.types';
 import {
   IService,
   IServiceBinding,
@@ -34,6 +32,7 @@ import {
 import { AppEnvVarsState } from '../../../../../../store/types/app-metadata.types';
 import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-user-permissions-checkers';
 import { ServiceActionHelperService } from '../../../../../data-services/service-action-helper.service';
+import { CSI_CANCEL_URL } from '../../../../add-service-instance/csi-mode.service';
 import { EnvVarViewComponent } from '../../../../env-var-view/env-var-view.component';
 
 
@@ -54,7 +53,7 @@ export class AppServiceBindingCardComponent extends CardCell<APIResource<IServic
     data$: Observable<string>;
     customStyle?: string;
   }[];
-  cardMenu: MetaCardMenuItem[];
+  cardMenu: MenuItem[];
   service$: Observable<EntityInfo<APIResource<IService>> | null>;
   serviceInstance$: Observable<EntityInfo<APIResource<IServiceInstance | IUserProvidedServiceInstance>>>;
   tags$: Observable<AppChip<IServiceInstance | IUserProvidedServiceInstance>[]>;
@@ -241,7 +240,10 @@ export class AppServiceBindingCardComponent extends CardCell<APIResource<IServic
   private edit = () => this.serviceActionHelperService.startEditServiceBindingStepper(
     this.row.entity.service_instance_guid,
     this.appService.cfGuid,
-    { appId: this.appService.appGuid },
+    {
+      appId: this.appService.appGuid,
+      [CSI_CANCEL_URL]: `/applications/${this.appService.cfGuid}/${this.appService.appGuid}/services`
+    },
     this.isUserProvidedServiceInstance
   )
 }
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 68288fa9ec..2d39cd38df 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
@@ -19,12 +19,12 @@ import {
 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 { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import { ServiceActionHelperService } from '../../../../data-services/service-action-helper.service';
+import { CSI_CANCEL_URL } from '../../../add-service-instance/csi-mode.service';
 import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
 import {
   TableCellServiceInstanceTagsComponent,
@@ -57,17 +57,15 @@ 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,
-        { appId: this.appService.appGuid },
+        {
+          appId: this.appService.appGuid,
+          [CSI_CANCEL_URL]: `/applications/${this.appService.cfGuid}/${this.appService.appGuid}/services`
+        },
         !!isUserProvidedServiceInstance(item.entity.service_instance.entity)
-      ).subscribe(res => {
-        if (!res.error) {
-          this.store.dispatch(new GetAppServiceBindings(this.appService.appGuid, this.appService.cfGuid));
-        }
-      });
+      );
     },
     label: 'Edit',
     createVisible: () => this.appService.waitForAppEntity$.pipe(
@@ -104,7 +102,7 @@ export class AppServiceBindingListConfigService extends BaseCfListConfig<APIReso
     return [
       {
         columnId: 'name',
-        headerCell: () => 'Service Instances',
+        headerCell: () => 'Name',
         cellDefinition: {
           getValue: (row) => row.entity.service_instance.entity.name
         },
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 4eea9c86fc..b2a3d64486 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,12 +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 { 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';
-import { applicationEntityType } from '../../../../../cf-entity-types';
 import { ApplicationsModule } from '../../../../../features/applications/applications.module';
 import { CfAppVariablesListConfigService } from './cf-app-variables-list-config.service';
 
@@ -22,11 +18,6 @@ describe('CfAppVariablesListConfigService', () => {
     TestBed.configureTestingModule({
       providers: [
         CfAppVariablesListConfigService,
-        generateTestEntityServiceProvider(
-          appGuid,
-          cfEntityFactory(applicationEntityType),
-          new GetApplication(appGuid, cfGuid)
-        ),
         generateTestApplicationServiceProvider(appGuid, cfGuid)
       ],
       imports: [
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 8236ed5d64..39a18e5336 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,14 +6,12 @@ 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 { getFavoriteFromEntity } from '../../../../../../../../core/src/core/user-favorite-helpers';
-import {
-  FavoritesConfigMapper,
-} from '../../../../../../../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
 import { CardCell } from '../../../../../../../../core/src/shared/components/list/list.types';
-import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../../../../core/src/shared/shared.types';
+import { FavoritesConfigMapper } from '../../../../../../../../store/src/favorite-config-mapper';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../../../../store/src/types/shared.types';
 import { UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
+import { getFavoriteFromEntity } from '../../../../../../../../store/src/user-favorite-helpers';
 import { IApp, ISpace } from '../../../../../../cf-api.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
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 ae5065e46e..fbc40398d9 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
@@ -9,7 +9,7 @@ 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 { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../../../store/src/helpers/stratos-entity-factory';
 import { getRowMetadata } from '../../../../../../../store/src/public-api';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
@@ -17,7 +17,7 @@ import { cfEntityFactory } from '../../../../../cf-entity-factory';
 
 export class CfBuildpacksDataSource extends ListDataSource<APIResource> {
   constructor(store: Store<CFAppState>, cfGuid: string, listConfig?: IListConfig<APIResource>) {
-    const paginationKey = createEntityRelationPaginationKey(endpointSchemaKey, cfGuid);
+    const paginationKey = createEntityRelationPaginationKey(endpointEntityType, cfGuid);
     const action = cfEntityCatalog.buildPack.actions.getMultiple(cfGuid, paginationKey)
     super({
       store,
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 6bc5cdfb94..6d4c6d7b02 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
@@ -5,7 +5,6 @@ import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state'
 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';
@@ -24,9 +23,9 @@ export class CfCellAppsListConfigService extends BaseCfListConfig<CfCellApp> {
     noEntries: 'There are no applications'
   };
 
-  constructor(store: Store<CFAppState>, private activeRouteCfCell: ActiveRouteCfCell, entityServiceFactory: EntityServiceFactory) {
+  constructor(store: Store<CFAppState>, private activeRouteCfCell: ActiveRouteCfCell) {
     super();
-    this.dataSource = new CfCellAppsDataSource(store, activeRouteCfCell.cfGuid, activeRouteCfCell.cellId, this, entityServiceFactory);
+    this.dataSource = new CfCellAppsDataSource(store, activeRouteCfCell.cfGuid, activeRouteCfCell.cellId, this);
   }
 
   getColumns = (): ITableColumn<CfCellApp>[] => [
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 6e834f3121..ba9148a902 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
@@ -2,7 +2,6 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { GetApplication } from '../../../../../../../cloud-foundry/src/actions/application.actions';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import {
   applicationEntityType,
@@ -13,14 +12,13 @@ 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 { IMetricApplication, MetricQueryType } from '../../../../../../../store/src/types/metric.types';
 import { FetchCFMetricsPaginatedAction } from '../../../../../actions/cf-metrics.actions';
 import { IApp } from '../../../../../cf-api.types';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { createEntityRelationKey } from '../../../../../entity-relations/entity-relations.types';
 
@@ -41,7 +39,6 @@ export class CfCellAppsDataSource
     cfGuid: string,
     cellId: string,
     listConfig: IListConfig<CfCellApp>,
-    entityServiceFactory: EntityServiceFactory
   ) {
     const action = new FetchCFMetricsPaginatedAction(
       cellId,
@@ -64,7 +61,7 @@ export class CfCellAppsDataSource
         return response[0].data.result.map(res => ({
           metric: res.metric,
           appGuid: res.metric.application_id,
-          appEntityService: this.createAppEntityService(res.metric.application_id, cfGuid, entityServiceFactory)
+          appEntityService: this.createAppEntityService(res.metric.application_id, cfGuid)
         }));
       }),
       listConfig
@@ -74,15 +71,18 @@ export class CfCellAppsDataSource
 
   private createAppEntityService(
     appGuid: string,
-    cfGuid: string,
-    entityServiceFactory: EntityServiceFactory): Observable<APIResource<IApp>> {
+    cfGuid: string
+  ): Observable<APIResource<IApp>> {
     if (!this.appEntityServices[appGuid]) {
-      this.appEntityServices[appGuid] = entityServiceFactory.create<APIResource<IApp>>(
+      this.appEntityServices[appGuid] = cfEntityCatalog.application.store.getEntityService(
         appGuid,
-        new GetApplication(appGuid, cfGuid, [
+        cfGuid, {
+        includeRelations: [
           createEntityRelationKey(applicationEntityType, spaceEntityType),
           createEntityRelationKey(spaceEntityType, organizationEntityType)
-        ])
+        ],
+        populateMissing: true
+      }
       ).waitForEntity$.pipe(
         map(entityInfo => entityInfo.entity)
       );
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-data-source.ts
index a9e6b2856e..591c35bf58 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-data-source.ts
@@ -9,7 +9,7 @@ import { IListConfig } from '../../../../../../../core/src/shared/components/lis
 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 { GetAllEndpoints } from '../../../../../../../store/src/actions/endpoint.actions';
+import { stratosEntityCatalog } from '../../../../../../../store/src/stratos-entity-catalog';
 import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
 
 export class CFEndpointsDataSource extends BaseEndpointsDataSource {
@@ -22,7 +22,7 @@ export class CFEndpointsDataSource extends BaseEndpointsDataSource {
     entityMonitorFactory: EntityMonitorFactory,
     internalEventMonitorFactory: InternalEventMonitorFactory
   ) {
-    const action = new GetAllEndpoints();
+    const action = stratosEntityCatalog.endpoint.actions.getAll();
     const paginationKey = 'cf-endpoints';
     // We do this here to ensure we sync up with main endpoint table data.
     syncPaginationSection(store, action, paginationKey);
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 c8275787bf..f7e4ff459b 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,24 +8,20 @@ import { organizationEntityType } from '../../../../../../../../cloud-foundry/sr
 import {
   CurrentUserPermissionsService,
 } from '../../../../../../../../core/src/core/permissions/current-user-permissions.service';
-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';
-import {
-  FavoritesConfigMapper,
-} from '../../../../../../../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
-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 { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../../../../core/src/shared/shared.types';
 import { RouterNav } from '../../../../../../../../store/src/actions/router.actions';
+import { FavoritesConfigMapper } from '../../../../../../../../store/src/favorite-config-mapper';
 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 { MenuItem } from '../../../../../../../../store/src/types/menu-item.types';
+import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../../../../store/src/types/shared.types';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
+import { getFavoriteFromEntity } from '../../../../../../../../store/src/user-favorite-helpers';
 import { IApp, IOrganization } from '../../../../../../cf-api.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import { getStartedAppInstanceCount } from '../../../../../../cf.helpers';
@@ -49,7 +45,7 @@ import { CF_ENDPOINT_TYPE } from './../../../../../../cf-types';
   styleUrls: ['./cf-org-card.component.scss']
 })
 export class CfOrgCardComponent extends CardCell<APIResource<IOrganization>> implements OnInit, OnDestroy {
-  cardMenu: MetaCardMenuItem[];
+  cardMenu: MenuItem[];
   orgGuid: string;
   normalisedMemoryUsage: number;
   memoryLimit: string;
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 d5018ccb88..ef96d027fc 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
@@ -11,10 +11,10 @@ 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 { EntityMonitor } from '../../../../../../../store/src/monitors/entity-monitor';
+import { endpointEntityType } from '../../../../../../../store/src/helpers/stratos-entity-factory';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { CFAppState } from '../../../../../cf-app-state';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { quotaDefinitionEntityType } from '../../../../../cf-entity-types';
 import { createEntityRelationPaginationKey } from '../../../../../entity-relations/entity-relations.types';
@@ -22,7 +22,7 @@ import { createEntityRelationPaginationKey } from '../../../../../entity-relatio
 export class CfQuotasDataSourceService extends ListDataSource<APIResource> {
 
   constructor(store: Store<CFAppState>, cfGuid: string, listConfig?: IListConfig<APIResource>) {
-    const quotaPaginationKey = createEntityRelationPaginationKey(endpointSchemaKey, cfGuid);
+    const quotaPaginationKey = createEntityRelationPaginationKey(endpointEntityType, cfGuid);
     const action = new GetQuotaDefinitions(quotaPaginationKey, cfGuid);
 
     super({
@@ -44,8 +44,7 @@ export class CfQuotasDataSourceService extends ListDataSource<APIResource> {
       if (!this.sourceScheme || !row) {
         return of(getDefaultRowState());
       }
-      const entityMonitor = new EntityMonitor(this.store, this.getRowUniqueId(row), this.entityKey, this.sourceScheme);
-      return entityMonitor.entityRequest$.pipe(
+      return cfEntityCatalog.quotaDefinition.store.getEntityMonitor(this.getRowUniqueId(row)).entityRequest$.pipe(
         distinctUntilChanged(),
         map(requestInfo => ({
           deleting: requestInfo.deleting.busy,
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 42b046e9dd..2f0b04583f 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
@@ -10,14 +10,14 @@ 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 { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../../../store/src/helpers/stratos-entity-factory';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 
 export class CfSecurityGroupsDataSource extends ListDataSource<APIResource> {
   constructor(store: Store<CFAppState>, cfGuid: string, listConfig?: IListConfig<APIResource>) {
-    const paginationKey = createEntityRelationPaginationKey(endpointSchemaKey, cfGuid);
+    const paginationKey = createEntityRelationPaginationKey(endpointEntityType, cfGuid);
     const action = cfEntityCatalog.securityGroup.actions.getMultiple(cfGuid, paginationKey, {});
     super({
       store,
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 52b60a12ee..b1ecf9ef80 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
@@ -21,9 +21,10 @@ import {
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { IServiceInstance } from '../../../../../cf-api-svc.types';
+import { isUserProvidedServiceInstance } from '../../../../../features/cloud-foundry/cf.helpers';
 import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 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 { CANCEL_ORG_ID_PARAM, CANCEL_SPACE_ID_PARAM, CSI_CANCEL_URL } from '../../../add-service-instance/csi-mode.service';
 import {
   TableCellAppCfOrgSpaceHeaderComponent,
 } from '../app/table-cell-app-cforgspace-header/table-cell-app-cforgspace-header.component';
@@ -61,7 +62,7 @@ export class CfServiceInstancesListConfigBase implements IListConfig<APIResource
   protected serviceInstanceColumns: ITableColumn<APIResource<IServiceInstance>>[] = [
     {
       columnId: 'name',
-      headerCell: () => 'Service Instance',
+      headerCell: () => 'Name',
       cellDefinition: {
         getValue: (row) => `${row.entity.name}`
       },
@@ -149,10 +150,15 @@ export class CfServiceInstancesListConfigBase implements IListConfig<APIResource
 
   private listActionEdit: IListAction<APIResource> = {
     action: (item: APIResource<IServiceInstance>) =>
-      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
-      }),
+      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,
+          [CSI_CANCEL_URL]: this.rootLocation
+        },
+        !!isUserProvidedServiceInstance(item.entity)),
     label: 'Edit',
     description: 'Edit Service Instance',
     createVisible: (row$: Observable<APIResource<IServiceInstance>>) =>
@@ -176,7 +182,8 @@ export class CfServiceInstancesListConfigBase implements IListConfig<APIResource
     protected store: Store<CFAppState>,
     protected datePipe: DatePipe,
     protected currentUserPermissionsService: CurrentUserPermissionsService,
-    private serviceActionHelperService: ServiceActionHelperService
+    private serviceActionHelperService: ServiceActionHelperService,
+    private rootLocation: string
   ) {
   }
 
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 334d992dd6..58e54ea397 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
@@ -11,7 +11,7 @@ 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 { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
-import { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../../../store/src/helpers/stratos-entity-factory';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginationEntityState } from '../../../../../../../store/src/types/pagination.types';
 import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
@@ -19,7 +19,7 @@ import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 
 export class CfServicesDataSource extends ListDataSource<APIResource> {
   constructor(store: Store<CFAppState>, endpointGuid: string, listConfig?: IListConfig<APIResource>) {
-    const paginationKey = createEntityRelationPaginationKey(endpointSchemaKey);
+    const paginationKey = createEntityRelationPaginationKey(endpointEntityType);
     const getServicesAction = cfEntityCatalog.service.actions.getMultiple(endpointGuid, paginationKey, {});
     super({
       store,
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 9f653f851f..4a9ee537ec 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
@@ -28,6 +28,7 @@ import {
   CANCEL_ORG_ID_PARAM,
   CANCEL_SPACE_ID_PARAM,
   CANCEL_USER_PROVIDED,
+  CSI_CANCEL_URL,
 } from '../../../add-service-instance/csi-mode.service';
 import {
   CfSpacesUserServiceInstancesDataSource,
@@ -64,7 +65,7 @@ export class CfUserServiceInstancesListConfigBase implements IListConfig<APIReso
   protected serviceInstanceColumns: ITableColumn<APIResource<IUserProvidedServiceInstance>>[] = [
     {
       columnId: 'name',
-      headerCell: () => 'Service Instance',
+      headerCell: () => 'Name',
       cellDefinition: {
         getValue: (row) => `${row.entity.name}`
       },
@@ -152,7 +153,8 @@ export class CfUserServiceInstancesListConfigBase implements IListConfig<APIReso
         {
           [CANCEL_SPACE_ID_PARAM]: item.entity.space_guid,
           [CANCEL_ORG_ID_PARAM]: item.entity.space.entity.organization_guid,
-          [CANCEL_USER_PROVIDED]: true
+          [CANCEL_USER_PROVIDED]: true,
+          [CSI_CANCEL_URL]: `/cloud-foundry/${this.cfSpaceService.cfGuid}/organizations/${this.cfSpaceService.orgGuid}/spaces/${this.cfSpaceService.spaceGuid}/service-instances`
         },
         true),
     label: 'Edit',
@@ -176,7 +178,7 @@ export class CfUserServiceInstancesListConfigBase implements IListConfig<APIReso
 
   constructor(
     protected store: Store<CFAppState>,
-    cfSpaceService: CloudFoundrySpaceService,
+    private cfSpaceService: CloudFoundrySpaceService,
     protected datePipe: DatePipe,
     protected currentUserPermissionsService: CurrentUserPermissionsService,
     private serviceActionHelperService: ServiceActionHelperService
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 ccfb93879a..fa308e0b71 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
@@ -10,11 +10,11 @@ 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 { EntityMonitor } from '../../../../../../../store/src/monitors/entity-monitor';
+import { endpointEntityType } from '../../../../../../../store/src/helpers/stratos-entity-factory';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { GetOrganizationSpaceQuotaDefinitions } from '../../../../../actions/quota-definitions.actions';
 import { CFAppState } from '../../../../../cf-app-state';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { spaceQuotaEntityType } from '../../../../../cf-entity-types';
 import { createEntityRelationPaginationKey } from '../../../../../entity-relations/entity-relations.types';
@@ -22,7 +22,7 @@ import { createEntityRelationPaginationKey } from '../../../../../entity-relatio
 export class CfOrgSpaceQuotasDataSourceService extends ListDataSource<APIResource> {
 
   constructor(store: Store<CFAppState>, orgGuid: string, cfGuid: string, listConfig?: IListConfig<APIResource>) {
-    const quotaPaginationKey = createEntityRelationPaginationKey(endpointSchemaKey, cfGuid);
+    const quotaPaginationKey = createEntityRelationPaginationKey(endpointEntityType, cfGuid);
     const action = new GetOrganizationSpaceQuotaDefinitions(quotaPaginationKey, orgGuid, cfGuid);
 
     super({
@@ -44,8 +44,8 @@ export class CfOrgSpaceQuotasDataSourceService extends ListDataSource<APIResourc
       if (!this.sourceScheme || !row) {
         return of(getDefaultRowState());
       }
-      const entityMonitor = new EntityMonitor(this.store, this.getRowUniqueId(row), this.entityKey, this.sourceScheme);
-      return entityMonitor.entityRequest$.pipe(
+
+      return cfEntityCatalog.spaceQuota.store.getEntityMonitor(this.getRowUniqueId(row)).entityRequest$.pipe(
         distinctUntilChanged(),
         map(requestInfo => ({
           deleting: requestInfo.deleting.busy,
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 e87ed733c5..f747341abe 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
@@ -30,7 +30,13 @@ export class CfSpacesServiceInstancesListConfigService extends CfServiceInstance
     datePipe: DatePipe,
     currentUserPermissionsService: CurrentUserPermissionsService,
     serviceActionHelperService: ServiceActionHelperService) {
-    super(store, datePipe, currentUserPermissionsService, serviceActionHelperService);
+    super(
+      store,
+      datePipe,
+      currentUserPermissionsService,
+      serviceActionHelperService,
+      `/cloud-foundry/${cfSpaceService.cfGuid}/organizations/${cfSpaceService.orgGuid}/spaces/${cfSpaceService.spaceGuid}/service-instances`
+    );
     this.dataSource = new CfSpacesServiceInstancesDataSource(cfSpaceService.cfGuid, cfSpaceService.spaceGuid, this.store, this);
     this.serviceInstanceColumns.find(column => column.columnId === 'attachedApps').cellConfig = {
       breadcrumbs: 'space-services'
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 d124f0d47e..322d4bc454 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
@@ -9,24 +9,20 @@ import { ISpaceFavMetadata } from '../../../../../../../../cloud-foundry/src/cf-
 import {
   CurrentUserPermissionsService,
 } from '../../../../../../../../core/src/core/permissions/current-user-permissions.service';
-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';
-import {
-  FavoritesConfigMapper,
-} from '../../../../../../../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
-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 { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../../../../core/src/shared/shared.types';
 import { RouterNav } from '../../../../../../../../store/src/actions/router.actions';
+import { FavoritesConfigMapper } from '../../../../../../../../store/src/favorite-config-mapper';
 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 { MenuItem } from '../../../../../../../../store/src/types/menu-item.types';
+import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../../../../store/src/types/shared.types';
 import { UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
+import { getFavoriteFromEntity } from '../../../../../../../../store/src/user-favorite-helpers';
 import { IApp, ISpace } from '../../../../../../cf-api.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
@@ -49,7 +45,7 @@ import { CfUserService } from '../../../../../data-services/cf-user.service';
   styleUrls: ['./cf-space-card.component.scss']
 })
 export class CfSpaceCardComponent extends CardCell<APIResource<ISpace>> implements OnInit, OnDestroy {
-  cardMenu: MetaCardMenuItem[];
+  cardMenu: MenuItem[];
   spaceGuid: string;
   appInstancesCount: number;
   appInstancesLimit: string;
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.html 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.html
index 76bda159ca..427d921780 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.html
+++ 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.html
@@ -1,4 +1,5 @@
 <app-cf-role-checkbox [cfGuid]="row.entity.cfGuid"
+  [orgGuid]="config.isSpace ? row?.entity.organization?.metadata.guid : row?.metadata.guid"
   [orgName]="config.isSpace ? row?.entity.organization?.entity.name : row?.entity.name"
   [spaceName]="config.isSpace ? row?.entity.name : null" [spaceGuid]="config.isSpace ? row.metadata.guid : ''"
   [role]="config.role"></app-cf-role-checkbox>
\ No newline at end of file
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 b99fead8d1..7c3cc59981 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
@@ -31,6 +31,7 @@ export class ServiceInstancesDataSource extends ListDataSource<APIResource> {
       paginationKey,
       isLocal: true,
       transformEntities: [
+        { type: 'filter', field: 'entity.name' },
         (entities: APIResource[], paginationState: PaginationEntityState) => {
           return entities.filter(e => e.entity.service_guid === serviceGuid);
         }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-instances/service-instances-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-instances/service-instances-list-config.service.ts
index 20878f7924..89c39ee4fa 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-instances/service-instances-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-instances/service-instances-list-config.service.ts
@@ -6,6 +6,7 @@ import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state'
 import {
   CurrentUserPermissionsService,
 } from '../../../../../../../core/src/core/permissions/current-user-permissions.service';
+import { ITableText } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
 import { ServicesService } from '../../../../../features/service-catalog/services.service';
 import { ServiceActionHelperService } from '../../../../data-services/service-action-helper.service';
 import { CfServiceInstancesListConfigBase } from '../cf-services/cf-service-instances-list-config.base';
@@ -20,13 +21,26 @@ import { ServiceInstancesDataSource } from './service-instances-data-source';
 @Injectable()
 export class ServiceInstancesListConfigService extends CfServiceInstancesListConfigBase {
 
+  enableTextFilter = true;
+  text: ITableText = {
+    title: null,
+    filter: 'Search by name',
+    noEntries: 'There are no service instances',
+  };
+
   constructor(
     store: Store<CFAppState>,
     servicesService: ServicesService,
     datePipe: DatePipe,
     currentUserPermissionsService: CurrentUserPermissionsService,
     serviceActionHelperService: ServiceActionHelperService) {
-    super(store, datePipe, currentUserPermissionsService, serviceActionHelperService);
+    super(
+      store,
+      datePipe,
+      currentUserPermissionsService,
+      serviceActionHelperService,
+      `/marketplace/${servicesService.cfGuid}/${servicesService.serviceGuid}/instances`
+    );
     // Remove 'Service' column
     this.serviceInstanceColumns.splice(1, 1);
     this.dataSource = new ServiceInstancesDataSource(servicesService.cfGuid, servicesService.serviceGuid, 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.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts
index 649162074c..640c95bcf2 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
@@ -8,12 +8,10 @@ import {
   CurrentUserPermissionsService,
 } from '../../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
-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 { ComponentEntityMonitorConfig } from '../../../../../../../../core/src/shared/shared.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { MenuItem } from '../../../../../../../../store/src/types/menu-item.types';
+import { ComponentEntityMonitorConfig } from '../../../../../../../../store/src/types/shared.types';
 import { IServiceInstance } from '../../../../../../cf-api-svc.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import {
@@ -25,6 +23,7 @@ import {
 import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-user-permissions-checkers';
 import { ServiceActionHelperService } from '../../../../../data-services/service-action-helper.service';
 import { CfOrgSpaceLabelService } from '../../../../../services/cf-org-space-label.service';
+import { CSI_CANCEL_URL } from '../../../../add-service-instance/csi-mode.service';
 
 @Component({
   selector: 'app-service-instance-card',
@@ -103,7 +102,7 @@ export class ServiceInstanceCardComponent extends CardCell<APIResource<IServiceI
   static done = false;
   serviceInstanceEntity: APIResource<IServiceInstance>;
   cfGuid: string;
-  cardMenu: MetaCardMenuItem[];
+  cardMenu: MenuItem[];
 
   serviceInstanceTags: AppChip[];
   hasMultipleBindings = new BehaviorSubject(true);
@@ -130,7 +129,9 @@ export class ServiceInstanceCardComponent extends CardCell<APIResource<IServiceI
   private edit = () => this.serviceActionHelperService.startEditServiceBindingStepper(
     this.serviceInstanceEntity.metadata.guid,
     this.serviceInstanceEntity.entity.cfGuid,
-    null
+    {
+      [CSI_CANCEL_URL]: '/services'
+    }
   )
 
   getServiceName = () => {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-list-config.service.ts
index f3a4c57132..0f597ef543 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-list-config.service.ts
@@ -70,7 +70,13 @@ export class ServiceInstancesWallListConfigService extends CfServiceInstancesLis
     currentUserPermissionsService: CurrentUserPermissionsService,
     serviceActionHelperService: ServiceActionHelperService
   ) {
-    super(store, datePipe, currentUserPermissionsService, serviceActionHelperService);
+    super(
+      store,
+      datePipe,
+      currentUserPermissionsService,
+      serviceActionHelperService,
+      `/services`
+    );
     const multiFilterConfigs = [
       createCfOrgSpaceFilterConfig('cf', 'Cloud Foundry', this.cfOrgSpaceService.cf),
       createCfOrgSpaceFilterConfig('org', 'Organization', this.cfOrgSpaceService.org),
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 0b2fdcf274..0103bc36be 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
@@ -8,17 +8,16 @@ import {
   CurrentUserPermissionsService,
 } from '../../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
-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 { ComponentEntityMonitorConfig } from '../../../../../../../../core/src/shared/shared.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { MenuItem } from '../../../../../../../../store/src/types/menu-item.types';
+import { ComponentEntityMonitorConfig } from '../../../../../../../../store/src/types/shared.types';
 import { IUserProvidedServiceInstance } from '../../../../../../cf-api-svc.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-user-permissions-checkers';
 import { ServiceActionHelperService } from '../../../../../data-services/service-action-helper.service';
 import { CfOrgSpaceLabelService } from '../../../../../services/cf-org-space-label.service';
+import { CSI_CANCEL_URL } from '../../../../add-service-instance/csi-mode.service';
 
 
 @Component({
@@ -29,7 +28,7 @@ import { CfOrgSpaceLabelService } from '../../../../../services/cf-org-space-lab
 export class UserProvidedServiceInstanceCardComponent extends CardCell<APIResource<IUserProvidedServiceInstance>> {
   serviceInstanceEntity: APIResource<IUserProvidedServiceInstance>;
   cfGuid: string;
-  cardMenu: MetaCardMenuItem[];
+  cardMenu: MenuItem[];
 
   serviceInstanceTags: AppChip[];
   hasMultipleBindings = new BehaviorSubject(true);
@@ -120,7 +119,9 @@ export class UserProvidedServiceInstanceCardComponent extends CardCell<APIResour
   private edit = () => this.serviceActionHelperService.startEditServiceBindingStepper(
     this.serviceInstanceEntity.metadata.guid,
     this.serviceInstanceEntity.entity.cfGuid,
-    null,
+    {
+      [CSI_CANCEL_URL]: '/services'
+    },
     true
   )
 
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 0ecf090c2a..d7788eb41e 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,9 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { of } from 'rxjs';
 
-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 { StratosStatus } from '../../../../../store/src/types/shared.types';
 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';
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 e4e4ba6ef9..8d47ae46c6 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
@@ -6,8 +6,8 @@ import {
   getServicePlanAccessibilityCardStatus,
 } from '../../../../../cloud-foundry/src/features/service-catalog/services-helper';
 import { ServicesService } from '../../../../../cloud-foundry/src/features/service-catalog/services.service';
-import { StratosStatus } from '../../../../../core/src/shared/shared.types';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { StratosStatus } from '../../../../../store/src/types/shared.types';
 import { IServiceBroker, IServicePlan } from '../../../cf-api-svc.types';
 import { cfEntityCatalog } from '../../../cf-entity-catalog';
 
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 30a0022d4b..e797eab3c8 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
@@ -7,10 +7,8 @@ import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
 import { cfUserEntityType, organizationEntityType, spaceEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
 import { createEntityRelationPaginationKey } from '../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { getCurrentUserCFGlobalStates } from '../../../../cloud-foundry/src/store/selectors/cf-current-user-role.selectors';
-import {
-  LocalPaginationHelpers,
-} from '../../../../core/src/shared/components/list/data-sources-controllers/local-list.helpers';
 import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
+import { LocalPaginationHelpers } from '../../../../store/src/helpers/local-list.helpers';
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import {
   getDefaultPaginationEntityState,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/cloud-foundry.service.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/cloud-foundry.service.ts
index fe0acd6e1b..2482601268 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/data-services/cloud-foundry.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/cloud-foundry.service.ts
@@ -1,13 +1,11 @@
 import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
-import { endpointEntitySchema } from '../../../../core/src/base-entity-schemas';
 import { PaginationMonitor } from '../../../../store/src/monitors/pagination-monitor';
+import { stratosEntityCatalog } from '../../../../store/src/stratos-entity-catalog';
 import { APIResource, EntityInfo } from '../../../../store/src/types/api.types';
-import { endpointListKey, EndpointModel } from '../../../../store/src/types/endpoint.types';
+import { EndpointModel } from '../../../../store/src/types/endpoint.types';
 
 @Injectable()
 export class CloudFoundryService {
@@ -18,11 +16,9 @@ export class CloudFoundryService {
   cfEndpointsMonitor: PaginationMonitor<EndpointModel>;
   waitForAppEntity$: Observable<EntityInfo<APIResource>>;
 
-  constructor(
-    store: Store<CFAppState>
-  ) {
+  constructor() {
 
-    this.cfEndpointsMonitor = new PaginationMonitor(store, endpointListKey, endpointEntitySchema, true);
+    this.cfEndpointsMonitor = stratosEntityCatalog.endpoint.store.getPaginationMonitor();
 
     this.cFEndpoints$ = this.cfEndpointsMonitor.currentPage$.pipe(
       map(endpoints => endpoints.filter(e => e.cnsi_type === 'cf'))
diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/long-running-cf-op.service.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/long-running-cf-op.service.ts
index 443247c3a3..acec511ca3 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/data-services/long-running-cf-op.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/long-running-cf-op.service.ts
@@ -2,14 +2,17 @@ import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 
 import { LongRunningOperationsService } from '../../../../core/src/shared/services/long-running-op.service';
-import { ShowSnackBar } from '../../../../store/src/actions/snackBar.actions';
+import { SnackBarService } from '../../../../core/src/shared/services/snackbar.service';
 import { AppState } from '../../../../store/src/app-state';
-import { GetServiceInstance } from '../../actions/service-instances.actions';
+import { cfEntityCatalog } from '../../cf-entity-catalog';
 
 @Injectable()
 export class LongRunningCfOperationsService extends LongRunningOperationsService {
 
-  constructor(store: Store<AppState>) {
+  constructor(
+    store: Store<AppState>,
+    private snackBarService: SnackBarService
+  ) {
     super(store);
   }
 
@@ -17,23 +20,23 @@ export class LongRunningCfOperationsService extends LongRunningOperationsService
     const message = `The operation to create the service instance is taking a long time and will continue in the background.
      Please refresh the service instance list to check it's status
     ${bindApp ? ` and then bind the application via the Application page.` : '.'}`;
-    this.store.dispatch(new ShowSnackBar(message, 'Dismiss'));
+    this.snackBarService.show(message, 'Dismiss');
   }
 
   handleLongRunningUpdateService(serviceInstanceGuid: string, cfGuid: string) {
     const message = `The operation to update the service instance is taking a long time and will continue in the background.
      Please refresh the service instance list to check it's status`;
-    this.store.dispatch(new ShowSnackBar(message, 'Dismiss'));
     // Also attempt to fetch the service instance, this will update the `last operation` value to `update` and `in progress`
-    this.store.dispatch(new GetServiceInstance(serviceInstanceGuid, cfGuid));
+    this.snackBarService.show(message, 'Dismiss');
+    cfEntityCatalog.serviceInstance.api.get(serviceInstanceGuid, cfGuid);
   }
 
   handleLongRunningDeleteService(serviceInstanceGuid: string, cfGuid: string) {
     const message = `The operation to delete the service instance is taking a long time and will continue in the background.
      Please refresh the service instance list to check it's status`;
-    this.store.dispatch(new ShowSnackBar(message, 'Dismiss'));
+    this.snackBarService.show(message, 'Dismiss');
     // Also attempt to fetch the service instance, this will update the `last operation` value to `delete` and `in progress`
-    this.store.dispatch(new GetServiceInstance(serviceInstanceGuid, cfGuid));
+    cfEntityCatalog.serviceInstance.api.get(serviceInstanceGuid, cfGuid);
   }
 
 }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/services/application-state.service.ts b/src/frontend/packages/cloud-foundry/src/shared/services/application-state.service.ts
index 751994c0f0..af5283b27f 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/services/application-state.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/services/application-state.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 
-import { StratosStatus, StratosStatusMetadata } from '../../../../core/src/shared/shared.types';
+import { StratosStatus, StratosStatusMetadata } from '../../../../store/src/types/shared.types';
 import { AppStat } from '../../store/types/app-metadata.types';
 
 export interface ApplicationStateData extends StratosStatusMetadata {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/services/cf-org-space-label.service.ts b/src/frontend/packages/cloud-foundry/src/shared/services/cf-org-space-label.service.ts
index 585f41ed42..36c9cb2e38 100644
--- a/src/frontend/packages/cloud-foundry/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,9 +2,8 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable } from 'rxjs';
 import { filter, first, map } from 'rxjs/operators';
 
-import { STRATOS_ENDPOINT_TYPE } from '../../../../core/src/base-entity-schemas';
 import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
-import { endpointSchemaKey } from '../../../../store/src/helpers/entity-factory';
+import { endpointEntityType, STRATOS_ENDPOINT_TYPE } from '../../../../store/src/helpers/stratos-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';
@@ -33,7 +32,7 @@ export class CfOrgSpaceLabelService {
     private spaceGuid?: string) {
     this.multipleConnectedEndpoints$ = haveMultiConnectedCfs(this.store);
     // FIXME: hide STRATOS_ENDPOINT_TYPE from extensions - STRAT-154
-    const endpointEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointSchemaKey);
+    const endpointEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointEntityType);
 
     this.cf$ = this.store.select<EndpointModel>(selectEntity(endpointEntityKey, this.cfGuid));
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/services/current-user-permissions.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/services/current-user-permissions.service.spec.ts
index 99dcb96deb..ddf7d54350 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/services/current-user-permissions.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/services/current-user-permissions.service.spec.ts
@@ -12,8 +12,6 @@ import {
   CfPermissionTypes,
   CfScopeStrings,
 } from '../../../../cloud-foundry/src/user-permissions/cf-user-permissions-checkers';
-import { endpointEntitySchema } from '../../../../core/src/base-entity-schemas';
-import { generateStratosEntities } from '../../../../core/src/base-entity-types';
 import { PermissionConfig } from '../../../../core/src/core/permissions/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../core/src/core/permissions/current-user-permissions.service';
 import { StratosScopeStrings } from '../../../../core/src/core/permissions/stratos-user-permissions.checker';
@@ -21,6 +19,8 @@ import { AppTestModule } from '../../../../core/test-framework/core-test.helper'
 import { AppState } from '../../../../store/src/app-state';
 import { EntityCatalogTestModule, TEST_CATALOGUE_ENTITIES } from '../../../../store/src/entity-catalog-test.module';
 import { EntityCatalogEntityConfig } from '../../../../store/src/entity-catalog/entity-catalog.types';
+import { endpointEntityType, stratosEntityFactory } from '../../../../store/src/helpers/stratos-entity-factory';
+import { generateStratosEntities } from '../../../../store/src/stratos-entity-generator';
 import { APIResource } from '../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
 import { BaseEntityValues } from '../../../../store/src/types/entity.types';
@@ -588,7 +588,7 @@ describe('CurrentUserPermissionsService with CF checker', () => {
     // Create request and requestData sections
     const entityMap = new Map<EntityCatalogEntityConfig, Array<TestStoreEntity | string>>([
       [
-        endpointEntitySchema,
+        stratosEntityFactory(endpointEntityType),
         endpoints.map(endpoint => ({
           guid: endpoint.guid,
           data: endpoint
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/cf-users.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/cf-users.reducer.ts
index 71079d216e..2395df2ff6 100644
--- a/src/frontend/packages/cloud-foundry/src/store/reducers/cf-users.reducer.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/cf-users.reducer.ts
@@ -12,6 +12,7 @@ import {
 } from '../../actions/users.actions';
 import { IOrganization, ISpace } from '../../cf-api.types';
 import { cfUserEntityType } from '../../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../../cf-types';
 import {
   CfUser,
   CfUserMissingOrgRoles,
@@ -61,7 +62,7 @@ export function cfUserReducer(state: IRequestEntityTypeState<APIResource<CfUser>
 }
 
 export function endpointDisconnectUserReducer(state: IRequestEntityTypeState<APIResource<CfUser>>, action: DisconnectEndpoint) {
-  if (action.endpointType === 'cf') {
+  if (action.endpointType === CF_ENDPOINT_TYPE) {
     switch (action.type) {
       case DISCONNECT_ENDPOINTS_SUCCESS:
         const cfGuid = action.guid;
diff --git a/src/frontend/packages/cloud-foundry/src/store/selectors/cf-current-user-role.selectors.ts b/src/frontend/packages/cloud-foundry/src/store/selectors/cf-current-user-role.selectors.ts
index c3df05ca37..ee2fd00471 100644
--- a/src/frontend/packages/cloud-foundry/src/store/selectors/cf-current-user-role.selectors.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/selectors/cf-current-user-role.selectors.ts
@@ -1,7 +1,7 @@
 import { compose } from '@ngrx/store';
 
-import { PermissionValues } from '../../../../core/src/core/permissions/current-user-permissions.config';
 import {
+  PermissionValues,
   selectCurrentUserGlobalHasScopes,
   selectCurrentUserRolesState,
 } from '../../../../store/src/selectors/current-user-role.selectors';
diff --git a/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-permissions-checkers.ts b/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-permissions-checkers.ts
index b38816caf9..1aead1cd0f 100644
--- a/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-permissions-checkers.ts
+++ b/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-permissions-checkers.ts
@@ -7,7 +7,6 @@ import {
   PermissionConfig,
   PermissionConfigLink,
   PermissionTypes,
-  PermissionValues,
 } from '../../../core/src/core/permissions/current-user-permissions.config';
 import {
   CurrentUserPermissionsService,
@@ -21,6 +20,7 @@ import {
   IPermissionCheckCombiner,
 } from '../../../core/src/core/permissions/current-user-permissions.types';
 import { GeneralEntityAppState } from '../../../store/src/app-state';
+import { PermissionValues } from '../../../store/src/selectors/current-user-role.selectors';
 import { connectedEndpointsSelector } from '../../../store/src/selectors/endpoint.selectors';
 import { CFFeatureFlagTypes, IFeatureFlag } from '../cf-api.types';
 import { cfEntityCatalog } from '../cf-entity-catalog';
@@ -396,7 +396,7 @@ export class CfUserPermissionsChecker extends BaseCurrentUserPermissionsChecker
   }
 
   private getAllEndpointGuids() {
-    return this.store.select(connectedEndpointsSelector).pipe(
+    return this.store.select(connectedEndpointsSelector()).pipe(
       map(endpoints => Object.values(endpoints).filter(e => e.cnsi_type === CF_ENDPOINT_TYPE).map(endpoint => endpoint.guid))
     );
   }
diff --git a/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-roles-fetch.ts b/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-roles-fetch.ts
index ec6687ced1..06340d5496 100644
--- a/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-roles-fetch.ts
+++ b/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-roles-fetch.ts
@@ -3,7 +3,6 @@ import { Action, Store } from '@ngrx/store';
 import { combineLatest, Observable, of } from 'rxjs';
 import { catchError, first, map, pairwise, share, skipWhile, switchMap, tap } from 'rxjs/operators';
 
-import { LoggerService } from '../../../core/src/core/logger.service';
 import { AppState } from '../../../store/src/app-state';
 import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
 import {
@@ -50,7 +49,6 @@ const createEndpointArray = (store: Store<AppState>, endpoints: string[] | Entit
 export const cfUserRolesFetch: EntityUserRolesFetch = (
   endpoints: string[] | EntityUserRolesEndpoint[],
   store: Store<AppState>,
-  logService: LoggerService,
   httpClient: HttpClient
 ) => {
   return createEndpointArray(store, endpoints).pipe(
@@ -61,7 +59,7 @@ export const cfUserRolesFetch: EntityUserRolesFetch = (
         cfEndpoints.forEach(endpoint => store.dispatch(new GetCfUserRelations(endpoint.guid, GET_CURRENT_CF_USER_RELATIONS_SUCCESS)))
       } else {
         // If some endpoints are not connected as admin, go out and fetch the current user's specific roles
-        const flagsAndRoleRequests = dispatchRoleRequests(cfEndpoints, store, logService, httpClient);
+        const flagsAndRoleRequests = dispatchRoleRequests(cfEndpoints, store, httpClient);
         const allRequestsCompleted = handleCfRequests(flagsAndRoleRequests);
         return combineLatest(allRequestsCompleted).pipe(
           map(succeeds => succeeds.every(succeeded => !!succeeded)),
@@ -84,7 +82,6 @@ interface IEndpointConnectionInfo {
 function dispatchRoleRequests(
   endpoints: EntityUserRolesEndpoint[],
   store: Store<AppState>,
-  logService: LoggerService,
   httpClient: HttpClient
 ): CfsRequestState {
   const requests: CfsRequestState = {};
@@ -117,7 +114,7 @@ function dispatchRoleRequests(
           );
         }),
         catchError(err => {
-          logService.warn('Failed to fetch current user permissions for a cf: ', err);
+          console.warn('Failed to fetch current user permissions for a cf: ', err);
           store.dispatch(new GetCfUserRelations(endpoint.guid, GET_CURRENT_CF_USER_RELATIONS_FAILED));
           return of(err);
         })
diff --git a/src/frontend/packages/cloud-foundry/test-framework/application-service-helper.ts b/src/frontend/packages/cloud-foundry/test-framework/application-service-helper.ts
index 6c07e9ba8f..18ed991825 100644
--- a/src/frontend/packages/cloud-foundry/test-framework/application-service-helper.ts
+++ b/src/frontend/packages/cloud-foundry/test-framework/application-service-helper.ts
@@ -1,7 +1,8 @@
 import { Store } from '@ngrx/store';
-import { Observable, of as observableOf } from 'rxjs';
+import { Observable, of as observableOf, of } from 'rxjs';
 import { map } from 'rxjs/internal/operators/map';
 
+import { EntityService } from '../../store/src/entity-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';
@@ -81,6 +82,10 @@ export class ApplicationServiceMock {
   appSpace$: Observable<APIResource<ISpace>> = observableOf(createEntity<ISpace>({} as ISpace));
   applicationRunning$: Observable<boolean> = observableOf(false);
   orgDomains$: Observable<APIResource<IDomain>[]> = observableOf([]);
+  entityService: EntityService<APIResource<IApp<unknown>>> = {
+    waitForEntity$: of({}),
+    updatingSection$: of({})
+  } as EntityService<APIResource<IApp<unknown>>>
 }
 
 export function generateTestApplicationServiceProvider(appGuid: string, cfGuid: string) {
diff --git a/src/frontend/packages/cloud-foundry/test-framework/cf-test-helper.ts b/src/frontend/packages/cloud-foundry/test-framework/cf-test-helper.ts
index 0ef667db7e..c22514e227 100644
--- a/src/frontend/packages/cloud-foundry/test-framework/cf-test-helper.ts
+++ b/src/frontend/packages/cloud-foundry/test-framework/cf-test-helper.ts
@@ -1,7 +1,7 @@
 import { BaseTestModules } from '../../core/test-framework/core-test.helper';
 import { EntityCatalogTestModule, TEST_CATALOGUE_ENTITIES } from '../../store/src/entity-catalog-test.module';
+import { generateStratosEntities } from '../../store/src/stratos-entity-generator';
 import { generateCFEntities } from '../src/cf-entity-generator';
-import { generateStratosEntities } from '../../core/src/base-entity-types';
 
 export const CFBaseTestModules = [
   ...BaseTestModules,
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 2174658903..3fc7ed40e9 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
@@ -114,7 +114,7 @@ export function generateTestCfServiceProvider() {
     useFactory: (
       store: Store<CFAppState>,
     ) => {
-      const appService = new CloudFoundryService(store);
+      const appService = new CloudFoundryService();
       return appService;
     },
     deps: [Store]
diff --git a/src/frontend/packages/core/endpoints-health-checks.ts b/src/frontend/packages/core/endpoints-health-checks.ts
index 2c7624fd76..11e46ae3fc 100644
--- a/src/frontend/packages/core/endpoints-health-checks.ts
+++ b/src/frontend/packages/core/endpoints-health-checks.ts
@@ -1,20 +1,9 @@
 import { Injectable } from '@angular/core';
 
 import { entityCatalog } from '../store/src/entity-catalog/entity-catalog';
+import { EndpointHealthCheck } from '../store/src/entity-catalog/entity-catalog.types';
 import { EndpointModel } from '../store/src/types/endpoint.types';
 
-
-export class EndpointHealthCheck {
-  /**
-   * @param check To show an error, the check should either call a WrapperRequestActionFailed
-   * or kick off a chain that eventually calls a WrapperRequestActionFailed
-   */
-  constructor(
-    public endpointType: string,
-    public check: (endpoint: EndpointModel) => void
-  ) { }
-}
-
 @Injectable({
   providedIn: 'root'
 })
diff --git a/src/frontend/packages/core/misc/custom/custom-src-routing.module.ts_ b/src/frontend/packages/core/misc/custom/custom-src-routing.module.ts_
deleted file mode 100644
index a1f9fa4457..0000000000
--- a/src/frontend/packages/core/misc/custom/custom-src-routing.module.ts_
+++ /dev/null
@@ -1,21 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CustomModule } from './custom/custom.module';
-import { CustomRoutingModule } from './custom/custom-routing.module';
-
-// Default import customization module - DO NOT EDIT
-
-// This file is in the .gitignore - changes will not be flagged
-
-@NgModule({
-  imports: [
-    CustomModule,
-  ]
-})
-export class CustomImportModule { }
-
-@NgModule({
-  imports: [
-    CustomRoutingModule,
-  ]
-})
-export class CustomRoutingImportModule { }
diff --git a/src/frontend/packages/core/misc/custom/custom-src.module.ts_ b/src/frontend/packages/core/misc/custom/custom-src.module.ts_
deleted file mode 100644
index 3e536cc582..0000000000
--- a/src/frontend/packages/core/misc/custom/custom-src.module.ts_
+++ /dev/null
@@ -1,16 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CustomModule } from './custom/custom.module';
-
-// Default import customization module - DO NOT EDIT
-
-// This file is in the .gitignore - changes will not be flagged
-
-@NgModule({
-  imports: [
-    CustomModule,
-  ]
-})
-export class CustomImportModule { }
-
-@NgModule()
-export class CustomRoutingImportModule { }
diff --git a/src/frontend/packages/core/misc/custom/custom.scss b/src/frontend/packages/core/misc/custom/custom.scss
deleted file mode 100644
index f6d83b743c..0000000000
--- a/src/frontend/packages/core/misc/custom/custom.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-// Empty customization file - DO NOT EDIT
-
-// This file is in the .gitignore - changes will not be flagged
-
-// The customization build step will replace this file with the custom one if provided
diff --git a/src/frontend/packages/core/misc/custom/custom.yaml b/src/frontend/packages/core/misc/custom/custom.yaml
deleted file mode 100644
index db58c36ad7..0000000000
--- a/src/frontend/packages/core/misc/custom/custom.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Customization manifest
-
-files:
-  custom.scss: "sass/custom.scss"
-  favicon.ico: "favicon.ico"
-  login-bg.jpg: "assets/login-bg.jpg"
-  logo.png: "assets/logo.png"
-  nav-logo.png: "assets/nav-logo.png"
-  eula.html: "assets/eula.html" 
-
-folders:
-  - "app/custom:src/custom"
-  - "assets/custom"
-  - "sass/custom"
diff --git a/src/frontend/packages/core/misc/custom/eula.html b/src/frontend/packages/core/misc/custom/eula.html
deleted file mode 100644
index dfd92e3d98..0000000000
--- a/src/frontend/packages/core/misc/custom/eula.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!--
-  
-  NO EULA
-
-  This is the default EULA file to ensure there is a eula.html file present
-
--->
diff --git a/src/frontend/packages/core/ng-package.json b/src/frontend/packages/core/ng-package.json
new file mode 100644
index 0000000000..9a348247b8
--- /dev/null
+++ b/src/frontend/packages/core/ng-package.json
@@ -0,0 +1,7 @@
+{
+  "$schema": "../../../../node_modules/ng-packagr/ng-package.schema.json",
+  "dest": "../../../../dist/core",
+  "lib": {
+    "entryFile": "src/public-api.ts"
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/core/package.json b/src/frontend/packages/core/package.json
new file mode 100644
index 0000000000..63f4668511
--- /dev/null
+++ b/src/frontend/packages/core/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "@stratosui/core",
+  "version": "0.0.1",
+  "stratos": {
+    "assets": {
+      "assets": "core/assets"
+    }
+  }
+}
diff --git a/src/frontend/packages/core/sass/_all-theme.scss b/src/frontend/packages/core/sass/_all-theme.scss
index 9fc21b86f9..67ae92ae8b 100644
--- a/src/frontend/packages/core/sass/_all-theme.scss
+++ b/src/frontend/packages/core/sass/_all-theme.scss
@@ -48,7 +48,6 @@
 @import '../src/shared/components/user-avatar/user-avatar.component.theme';
 @import './components/text-status.theme';
 @import './components/hyperlinks.theme';
-@import './mat-themes';
 @import './mat-desktop';
 @import './fonts';
 @import './ansi-colors';
@@ -57,53 +56,28 @@
 
 @import '../../cloud-foundry/src/shared/components/schema-form/schema-form.component.theme';
 @import '../../cloud-foundry/src/features/services/services-wall/services-wall.component.theme';
-@import '../../cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component.theme';
 @import '../../cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.theme';
 @import '../../cloud-foundry/src/features/applications/application/application-base.component.theme';
 @import '../../cloud-foundry/src/features/applications/deploy-application/deploy-application.component.theme';
 @import '../../cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-fs/deploy-application-fs.component.theme';
 @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';
 @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;
-$side-nav-light-bg: #333;
-$side-nav-light-hover: #555;
-$side-nav-light-active: #484848;
-
 // Creates the app theme and applies it to the application
 // $theme = Angular Material Theme
 // $nav-theme - Colors for the Side Nav (optional)
 // $status-theme - Colors for status (optional)
-@mixin app-theme($theme, $nav-theme: null, $status-theme: null) {
-  $background-colors: map-get($theme, background);
-  $foreground-colors: map-get($theme, foreground);
-  $is-dark: map-get($theme, is-dark);
-  $app-background-color: white;
-  $app-background-text-color: rgba(mat-color($foreground-colors, base), .65);
-  $primary: map-get($theme, primary);
-  $accent: map-get($theme, accent);
-  $warn: map-get($theme, warn);
-  $subdued: mat-contrast($primary, 50);
-
-  @if $is-dark == true {
-    $app-background-color: lighten(mat-color($background-colors, background), 10%);
-    $subdued: lighten($subdued, 90);
-  } @else {
-    $app-background-color: darken(mat-color($background-colors, background), 2%);
-    $subdued: lighten($subdued, 50);
-  }
+@mixin app-theme($stratos-theme, $nav-theme: null, $status-theme: null) {
+  $theme: map-get($stratos-theme, theme);
+  $app-theme: map-get($stratos-theme, app-theme);
+  $app-background-color: map-get($app-theme, app-background-color);
 
   html {
     background-color: $app-background-color;
   }
 
-  // App Theme defines a set of colors used by stratos components
-  $app-theme: (app-background-color: $app-background-color, app-background-text-color: rgba(mat-color($foreground-colors, base), .65), side-nav: app-generate-nav-theme($theme, $nav-theme), status: app-generate-status-theme($theme, $status-theme), subdued-color: $subdued, ansi-colors: $ansi-color-palette); // Pass the Material theme and the App Theme to components that need to be themed
   @include dialog-error-theme($theme, $app-theme);
   @include login-page-theme($theme, $app-theme);
   @include side-nav-theme($theme, $app-theme);
@@ -122,7 +96,6 @@ $side-nav-light-active: #484848;
   @include app-hyperlinks($theme, $app-theme);
   @include app-no-content-message-theme($theme, $app-theme);
   @include app-boolean-indicator-theme($theme, $app-theme);
-  @include cf-security-group-theme($theme);
   @include loading-page-theme($theme, $app-theme);
   @include app-log-viewer-theme($theme, $app-theme);
   @include app-deploy-app-theme($theme, $app-theme);
@@ -164,23 +137,3 @@ $side-nav-light-active: #484848;
   @include restore-endpoints-theme($theme, $app-theme);
   @include metrics-component-theme($theme, $app-theme);
 }
-
-@function app-generate-nav-theme($theme, $nav-theme: null) {
-  @if ($nav-theme) {
-    @return $nav-theme;
-  } @else {
-    // Use default palette for side navigation
-    @return (background: $side-nav-light-bg, background-top: $side-nav-light-bg, text: darken($side-nav-light-text, 10%), active: $side-nav-light-active, active-text: $side-nav-light-text, hover: $side-nav-light-hover, hover-text: $side-nav-light-text);
-  }
-}
-
-@function app-generate-status-theme($theme, $status-theme: null) {
-  @if ($status-theme) {
-    @return $status-theme;
-  } @else {
-    $warn: map-get($theme, warn);
-    $primary: map-get($theme, primary);
-    $white: #fff; // Use default palette for status
-    @return (success: map-get($mat-green, 500), warning: map-get($mat-orange, 500), danger: mat-color($warn), tentative: map-get($mat-grey, 500), busy: mat-color($primary), text: $white, info: map-get($mat-blue, 500));
-  }
-}
diff --git a/src/frontend/packages/core/sass/colors.scss b/src/frontend/packages/core/sass/colors.scss
deleted file mode 100644
index 75071fe6ba..0000000000
--- a/src/frontend/packages/core/sass/colors.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-// @import './suse-theme';
-$dark-grey: rgb(95, 95, 95);
-$middle-grey: rgb(167, 169, 172);
-$light-grey: rgb(220, 221, 222);
-// $blue: map-get($suse-blue, 500);
-
-// See here for palette info: https://github.com/angular/material2/blob/master/src/lib/core/theming/_palette.scss
diff --git a/src/frontend/packages/core/sass/theme.scss b/src/frontend/packages/core/sass/theme.scss
index 365cd4750e..11ba592a9f 100644
--- a/src/frontend/packages/core/sass/theme.scss
+++ b/src/frontend/packages/core/sass/theme.scss
@@ -1,45 +1,46 @@
 @import '~@angular/material/theming';
-@import './mat-themes';
 @import './all-theme';
-@import './mat-colors';
 
-// Custom theme support
-@import './custom';
+// Import the theme
+@import '~@stratosui/theme';
 
-body.stratos {
-  .dark-theme {
-    // Dark Theme defaults
-    $dark-primary: mat-palette($mat-blue);
-    $dark-accent: mat-palette($mat-amber, A400, A100, A700);
-    $dark-warn: mat-palette($mat-red);
-    $dark-theme: mat-dark-theme($dark-primary, $dark-accent, $dark-warn);
+$stratos-dark-theme-supported: false !default;
 
-    $stratos-dark-theme: $dark-theme !default;
-    $stratos-dark-nav-theme: null !default;
-    $stratos-dark-status-theme: null !default;
+// Themes - stratos-theme() function must be supplied by the theme
+$stratos-themes: stratos-theme();
 
-    @include angular-material-theme($stratos-dark-theme);
-    @include app-theme($stratos-dark-theme, $stratos-dark-nav-theme, $stratos-dark-status-theme);
+// stratos-theme() can return a single theme rather than a map of default and dark themes
+@if not map-has-key($stratos-themes, 'default') {
+  $tmp: $stratos-themes;
+  $stratos-themes: (
+    default: $tmp
+  )
+}
+
+// Import any custom scss that the theme defines
+@import '~@stratosui/theme/extensions';
+
+// Default theme ( = light theme)
+$stratos-theme: map-get($stratos-themes, default);
+$theme: map-get($stratos-theme, theme);
+
+@if map-has-key($stratos-themes, 'dark') {
+  $stratos-dark-theme-supported: true;
+  $dark-stratos-theme: map-get($stratos-themes, dark);
+  $dark-theme: map-get($dark-stratos-theme, theme);
+
+  body.stratos {
+    .dark-theme {
+      @include angular-material-theme($dark-theme);
+      @include app-theme($dark-stratos-theme);
+    }
   }
 }
 
 .default {
-  // Themes palettes and colors
-  $oss-theme-primary: mat-palette($mat-blue);
-  $oss-theme-accent: mat-palette($mat-blue);
-  $oss-theme-warn: mat-palette($mat-red);
-  $oss-theme: mat-light-theme($oss-theme-primary, $oss-theme-accent, $oss-theme-warn);
-
-  // Default to using the open source theme
-  $stratos-theme: $oss-theme !default;
-  $stratos-nav-theme: null !default;
-  $stratos-status-theme: null !default;
-
-  @include angular-material-theme($stratos-theme);
-  @include app-theme($stratos-theme, $stratos-nav-theme, $stratos-status-theme);
+  @include angular-material-theme($theme);
+  @include app-theme($stratos-theme);
 }
 
-$stratos-dark-theme-supported: true !default;
-
-// Create the theme
+// Import mat-core
 @include mat-core;
diff --git a/src/frontend/packages/core/src/app.component.ts b/src/frontend/packages/core/src/app.component.ts
index 542077cb5e..7e7be0556e 100644
--- a/src/frontend/packages/core/src/app.component.ts
+++ b/src/frontend/packages/core/src/app.component.ts
@@ -1,13 +1,13 @@
-import { AfterContentInit, Component, HostBinding, OnDestroy, OnInit, Inject } from '@angular/core';
+import { DOCUMENT } from '@angular/common';
+import { AfterContentInit, Component, HostBinding, Inject, OnDestroy, OnInit } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { create } from 'rxjs-spy';
 
 import { AuthOnlyAppState } from '../../store/src/app-state';
-import { ThemeService } from './core/theme.service';
+import { ThemeService } from '../../store/src/theme.service';
 import { environment } from './environments/environment';
 import { LoggedInService } from './logged-in.service';
-import { DOCUMENT } from '@angular/common';
 
 @Component({
   selector: 'app-root',
diff --git a/src/frontend/packages/core/src/app.module.ts b/src/frontend/packages/core/src/app.module.ts
index 7ba9fb46a1..24bfcbbe56 100644
--- a/src/frontend/packages/core/src/app.module.ts
+++ b/src/frontend/packages/core/src/app.module.ts
@@ -4,40 +4,40 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { Params, RouteReuseStrategy, RouterStateSnapshot } from '@angular/router';
 import { DefaultRouterStateSerializer, RouterStateSerializer, StoreRouterConnectingModule } from '@ngrx/router-store';
 import { Store } from '@ngrx/store';
+import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 import { debounceTime, filter, withLatestFrom } from 'rxjs/operators';
 
 import { CfAutoscalerModule } from '../../cf-autoscaler/src/cf-autoscaler.module';
 import { CloudFoundryPackageModule } from '../../cloud-foundry/src/cloud-foundry-package.module';
 import { SetRecentlyVisitedEntityAction } from '../../store/src/actions/recently-visited.actions';
-import {
-  UpdateUserFavoriteMetadataAction,
-} 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 { 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 { FavoritesConfigMapper } from '../../store/src/favorite-config-mapper';
+import { endpointEntityType, STRATOS_ENDPOINT_TYPE } from '../../store/src/helpers/stratos-entity-factory';
 import { getAPIRequestDataState, selectEntity } from '../../store/src/selectors/api.selectors';
 import { internalEventStateSelector } from '../../store/src/selectors/internal-events.selectors';
 import { recentlyVisitedSelector } from '../../store/src/selectors/recently-visitied.selectors';
 import { AppStoreModule } from '../../store/src/store.module';
+import { stratosEntityCatalog } from '../../store/src/stratos-entity-catalog';
+import { generateStratosEntities } from '../../store/src/stratos-entity-generator';
 import { EndpointModel } from '../../store/src/types/endpoint.types';
 import { IFavoriteMetadata, UserFavorite } from '../../store/src/types/user-favorites.types';
+import { UserFavoriteManager } from '../../store/src/user-favorite-manager';
 import { TabNavService } from '../tab-nav.service';
 import { XSRFModule } from '../xsrf.module';
 import { AppComponent } from './app.component';
 import { RouteModule } from './app.routing';
-import { STRATOS_ENDPOINT_TYPE } from './base-entity-schemas';
-import { generateStratosEntities } from './base-entity-types';
 import { CoreModule } from './core/core.module';
 import { CustomizationService } from './core/customizations.types';
 import { DynamicExtensionRoutes } from './core/extension/dynamic-extension-routes';
 import { ExtensionService } from './core/extension/extension-service';
 import { getGitHubAPIURL, GITHUB_API_URL } from './core/github.helpers';
 import { CurrentUserPermissionsService } from './core/permissions/current-user-permissions.service';
-import { UserFavoriteManager } from './core/user-favorite-manager';
 import { CustomImportModule } from './custom-import.module';
+import { environment } from './environments/environment';
 import { AboutModule } from './features/about/about.module';
 import { DashboardModule } from './features/dashboard/dashboard.module';
 import { HomeModule } from './features/home/home.module';
@@ -46,7 +46,6 @@ import { NoEndpointsNonAdminComponent } from './features/no-endpoints-non-admin/
 import { SetupModule } from './features/setup/setup.module';
 import { LoggedInService } from './logged-in.service';
 import { CustomReuseStrategy } from './route-reuse-stragegy';
-import { FavoritesConfigMapper } from './shared/components/favorites-meta-card/favorite-config-mapper';
 import { endpointEventKey, GlobalEventData, GlobalEventService } from './shared/global-events.service';
 import { SidePanelService } from './shared/services/side-panel.service';
 import { SharedModule } from './shared/shared.module';
@@ -80,6 +79,18 @@ export class CustomRouterStateSerializer
   }
 }
 
+const storeDebugImports = environment.production ? [] : [
+  StoreDevtoolsModule.instrument({
+    maxAge: 100,
+    logOnly: !environment.production
+  })
+];
+
+@NgModule({
+  imports: storeDebugImports
+})
+class AppStoreDebugModule { }
+
 /**
  * `HttpXsrfTokenExtractor` which retrieves the token from a cookie.
  */
@@ -94,6 +105,7 @@ export class CustomRouterStateSerializer
     RouteModule,
     CloudFoundryPackageModule,
     AppStoreModule,
+    AppStoreDebugModule,
     BrowserModule,
     SharedModule,
     BrowserAnimationsModule,
@@ -159,7 +171,7 @@ export class AppModule {
           if (!backendErrors.length) {
             return res;
           }
-          const entityConfig = entityCatalog.getEntity(STRATOS_ENDPOINT_TYPE, endpointSchemaKey);
+          const entityConfig = entityCatalog.getEntity(STRATOS_ENDPOINT_TYPE, endpointEntityType);
           res.push(new GlobalEventData(true, {
             endpoint: selectEntity<EndpointModel>(entityConfig.entityKey, eventId)(state),
             count: backendErrors.length
@@ -248,7 +260,7 @@ export class AppModule {
 
   private syncFavorite(favorite: UserFavorite<IFavoriteMetadata>, entities: GeneralRequestDataState) {
     if (favorite) {
-      const isEndpoint = (favorite.entityType === endpointSchemaKey);
+      const isEndpoint = (favorite.entityType === endpointEntityType);
       // If the favorite is an endpoint ensure we look in the stratosEndpoint part of the store instead of, for example, cfEndpoint
       const entityKey = isEndpoint ? entityCatalog.getEntityKey({
         ...favorite,
@@ -258,10 +270,10 @@ export class AppModule {
       if (entity) {
         const newMetadata = this.favoritesConfigMapper.getEntityMetadata(favorite, entity);
         if (this.metadataHasChanged(favorite.metadata, newMetadata)) {
-          this.store.dispatch(new UpdateUserFavoriteMetadataAction({
+          stratosEntityCatalog.userFavorite.api.updateFavorite({
             ...favorite,
             metadata: newMetadata
-          }));
+          });
         }
       }
     }
diff --git a/src/frontend/packages/core/src/base-entity-schemas.ts b/src/frontend/packages/core/src/base-entity-schemas.ts
deleted file mode 100644
index 19da225c8b..0000000000
--- a/src/frontend/packages/core/src/base-entity-schemas.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import {
-  endpointSchemaKey,
-  entityFactory,
-  systemInfoSchemaKey,
-  userFavouritesSchemaKey,
-  userProfileSchemaKey,
-} 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';
-
-class StratosEntitySchema extends EntitySchema {
-  constructor(entityType: string) {
-    super(entityType, STRATOS_ENDPOINT_TYPE);
-  }
-}
-
-export const userFavoritesEntitySchema = new StratosEntitySchema(entityFactory(userFavouritesSchemaKey).entityType);
-export const endpointEntitySchema = new StratosEntitySchema(entityFactory(endpointSchemaKey).entityType);
-export const userProfileEntitySchema = new StratosEntitySchema(entityFactory(userProfileSchemaKey).entityType);
-export const systemInfoEntitySchema = new StratosEntitySchema(entityFactory(systemInfoSchemaKey).entityType);
diff --git a/src/frontend/packages/core/src/base-entity-types.ts b/src/frontend/packages/core/src/base-entity-types.ts
deleted file mode 100644
index 15cee657b0..0000000000
--- a/src/frontend/packages/core/src/base-entity-types.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-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,
-  systemInfoEntitySchema,
-  userFavoritesEntitySchema,
-  userProfileEntitySchema,
-} from './base-entity-schemas';
-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.
-//
-
-/**
- * This is used as a fake endpoint type to allow the store to be initiated correctly
- */
-const stratosType = {
-  logoUrl: '',
-  authTypes: [],
-  type: STRATOS_ENDPOINT_TYPE,
-  schema: null
-};
-
-/**
- * DefaultEndpointEntityType is used to represent a general endpoint
- * This should not be used to actually attempt to render an endpoint and is instead used as a way to fill the
- */
-class DefaultEndpointCatalogEntity extends StratosCatalogEntity {
-  constructor() {
-    super({
-      schema: endpointEntitySchema,
-      type: endpointEntitySchema.entityType,
-      endpoint: stratosType,
-    }, {
-      dataReducers: [
-        systemEndpointsReducer
-      ]
-    });
-  }
-}
-
-class UserFavoriteCatalogEntity extends StratosCatalogEntity {
-  constructor() {
-    super({
-      schema: userFavoritesEntitySchema,
-      type: userFavoritesEntitySchema.entityType,
-      endpoint: stratosType,
-    }, {
-      dataReducers: [
-        addOrUpdateUserFavoriteMetadataReducer,
-        deleteUserFavoriteMetadataReducer,
-      ]
-    });
-  }
-}
-
-class UserProfileCatalogEntity extends StratosCatalogEntity {
-  constructor() {
-    super({
-      schema: userProfileEntitySchema,
-      type: userProfileEntitySchema.entityType,
-      endpoint: stratosType,
-    });
-  }
-}
-
-class SystemInfoCatalogEntity extends StratosCatalogEntity {
-  constructor() {
-    super({
-      schema: systemInfoEntitySchema,
-      type: systemInfoEntitySchema.entityType,
-      endpoint: stratosType,
-    });
-  }
-}
-
-export function generateStratosEntities() {
-  return [
-    new DefaultEndpointCatalogEntity(),
-    new SystemInfoCatalogEntity(),
-    new UserFavoriteCatalogEntity(),
-    new UserProfileCatalogEntity(),
-    // TODO: metrics location to be sorted - STRAT-152
-    new StratosCatalogEndpointEntity({
-      type: 'metrics',
-      label: 'Metrics',
-      labelPlural: 'Metrics',
-      tokenSharing: true,
-      logoUrl: '/core/assets/endpoint-icons/metrics.svg',
-      authTypes: [BaseEndpointAuth.UsernamePassword, BaseEndpointAuth.None],
-      renderPriority: 1,
-      listDetailsComponent: MetricsEndpointDetailsComponent,
-    },
-      metadata => `/endpoints/metrics/${metadata.guid}`
-    )
-  ];
-}
-
diff --git a/src/frontend/packages/core/src/features/endpoints/endpoint-auth.ts b/src/frontend/packages/core/src/core/endpoint-auth.ts
similarity index 60%
rename from src/frontend/packages/core/src/features/endpoints/endpoint-auth.ts
rename to src/frontend/packages/core/src/core/endpoint-auth.ts
index 757b0677e5..0fa06e90d1 100644
--- a/src/frontend/packages/core/src/features/endpoints/endpoint-auth.ts
+++ b/src/frontend/packages/core/src/core/endpoint-auth.ts
@@ -1,9 +1,17 @@
-import { EndpointAuthTypeNames } from './endpoint-helpers';
 import { Validators } from '@angular/forms';
-import { EndpointType, EndpointAuthTypeConfig } from '../../core/extension/extension-types';
-import { CredentialsAuthFormComponent } from './connect-endpoint-dialog/auth-forms/credentials-auth-form.component';
-import { SSOAuthFormComponent } from './connect-endpoint-dialog/auth-forms/sso-auth-form.component';
-import { NoneAuthFormComponent } from './connect-endpoint-dialog/auth-forms/none-auth-form.component';
+
+import { EndpointAuthTypeConfig, EndpointType } from '../../../store/src/extension-types';
+import {
+  CredentialsAuthFormComponent,
+} from '../features/endpoints/connect-endpoint-dialog/auth-forms/credentials-auth-form.component';
+import { NoneAuthFormComponent } from '../features/endpoints/connect-endpoint-dialog/auth-forms/none-auth-form.component';
+import { SSOAuthFormComponent } from '../features/endpoints/connect-endpoint-dialog/auth-forms/sso-auth-form.component';
+
+export enum EndpointAuthTypeNames {
+  CREDS = 'creds',
+  SSO = 'sso',
+  NONE = 'none'
+}
 
 export abstract class BaseEndpointAuth {
   static readonly UsernamePassword = {
diff --git a/src/frontend/packages/core/src/core/endpoints.service.spec.ts b/src/frontend/packages/core/src/core/endpoints.service.spec.ts
index 006d10ccb7..3ac576abcd 100644
--- a/src/frontend/packages/core/src/core/endpoints.service.spec.ts
+++ b/src/frontend/packages/core/src/core/endpoints.service.spec.ts
@@ -1,8 +1,8 @@
 import { inject, TestBed } from '@angular/core/testing';
-
-import { CoreTestingModule } from '../../test-framework/core-test.modules';
 import { createBasicStoreModule } from '@stratosui/store/testing';
+
 import { PaginationMonitorFactory } from '../../../store/src/monitors/pagination-monitor.factory';
+import { CoreTestingModule } from '../../test-framework/core-test.modules';
 import { CoreModule } from './core.module';
 import { EndpointsService } from './endpoints.service';
 import { UtilsService } from './utils.service';
diff --git a/src/frontend/packages/core/src/core/endpoints.service.ts b/src/frontend/packages/core/src/core/endpoints.service.ts
index 7160d50652..6354590f8a 100644
--- a/src/frontend/packages/core/src/core/endpoints.service.ts
+++ b/src/frontend/packages/core/src/core/endpoints.service.ts
@@ -7,10 +7,11 @@ 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';
+import { EndpointHealthCheck } from '../../../store/src/entity-catalog/entity-catalog.types';
 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';
-import { EndpointHealthCheck, EndpointHealthChecks } from '../../endpoints-health-checks';
+import { EndpointHealthChecks } from '../../endpoints-health-checks';
 import { endpointHasMetricsByAvailable } from '../features/endpoints/endpoint-helpers';
 import { UserService } from './user.service';
 
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 5aee8a1959..067a4e1f69 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,13 +2,13 @@ import { OverlayContainer } from '@angular/cdk/overlay';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { BehaviorSubject, of } from 'rxjs';
 
+import { FavoritesConfigMapper } from '../../../../store/src/favorite-config-mapper';
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import { IFavoriteMetadata, UserFavorite } from '../../../../store/src/types/user-favorites.types';
+import { UserFavoriteManager } from '../../../../store/src/user-favorite-manager';
 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 { UserFavoriteManager } from '../user-favorite-manager';
 import { EntityFavoriteStarComponent } from './entity-favorite-star.component';
 
 describe('EntityFavoriteStarComponent', () => {
diff --git a/src/frontend/packages/core/src/core/entity-favorite-star/entity-favorite-star.component.ts b/src/frontend/packages/core/src/core/entity-favorite-star/entity-favorite-star.component.ts
index 6487ce3708..c345e7d523 100644
--- a/src/frontend/packages/core/src/core/entity-favorite-star/entity-favorite-star.component.ts
+++ b/src/frontend/packages/core/src/core/entity-favorite-star/entity-favorite-star.component.ts
@@ -2,12 +2,12 @@ import { Component, Input } from '@angular/core';
 import { Observable } from 'rxjs';
 import { first, tap } from 'rxjs/operators';
 
+import { FavoritesConfigMapper } from '../../../../store/src/favorite-config-mapper';
 import { IFavoriteMetadata, UserFavorite } from '../../../../store/src/types/user-favorites.types';
+import { UserFavoriteManager } from '../../../../store/src/user-favorite-manager';
 import { ConfirmationDialogConfig } from '../../shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../shared/components/confirmation-dialog.service';
-import { FavoritesConfigMapper } from '../../shared/components/favorites-meta-card/favorite-config-mapper';
 import { EndpointsService } from '../endpoints.service';
-import { UserFavoriteManager } from '../user-favorite-manager';
 
 @Component({
   selector: 'app-entity-favorite-star',
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 82b7a305ff..c71151f5b7 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, NgModule, ModuleWithProviders } from '@angular/core';
+import { Injectable, ModuleWithProviders, NgModule } from '@angular/core';
 import { ActivatedRoute, Route, Router } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
@@ -6,6 +6,7 @@ import { Observable } from 'rxjs';
 import { AppState, GeneralEntityAppState } from '../../../../store/src/app-state';
 import { EntityServiceFactory } from '../../../../store/src/entity-service-factory.service';
 import { IPageSideNavTab } from '../../features/dashboard/page-side-nav/page-side-nav.component';
+import { CurrentUserPermissionsService } from '../permissions/current-user-permissions.service';
 
 export const extensionsActionRouteKey = 'extensionsActionsKey';
 
@@ -23,7 +24,12 @@ export interface StratosTabMetadata {
   link: string;
   icon?: string;
   iconFont?: string;
-  hidden?: (store: Store<AppState>, esf: EntityServiceFactory, activatedRoute: ActivatedRoute) => Observable<boolean>;
+  hidden?: (
+    store: Store<AppState>,
+    esf: EntityServiceFactory,
+    activatedRoute: ActivatedRoute,
+    cups: CurrentUserPermissionsService
+  ) => Observable<boolean>;
 }
 
 export interface StratosTabMetadataConfig extends StratosTabMetadata {
@@ -97,7 +103,7 @@ function addExtensionTab(tab: StratosTabType, target: any, props: StratosTabMeta
   });
   extensionMetadata.tabs[tab].push({
     ...props
-  });  
+  });
 }
 
 function addExtensionAction(action: StratosActionType, target: any, props: StratosActionMetadata) {
diff --git a/src/frontend/packages/core/src/core/logger.service.spec.ts b/src/frontend/packages/core/src/core/logger.service.spec.ts
index e2f904e060..1720fe0b84 100644
--- a/src/frontend/packages/core/src/core/logger.service.spec.ts
+++ b/src/frontend/packages/core/src/core/logger.service.spec.ts
@@ -1,7 +1,7 @@
 import { inject, TestBed } from '@angular/core/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreTestingModule } from '../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratosui/store/testing';
 import { LoggerService } from './logger.service';
 
 describe('LoggerService', () => {
diff --git a/src/frontend/packages/core/src/core/permissions/current-user-permissions.config.ts b/src/frontend/packages/core/src/core/permissions/current-user-permissions.config.ts
index a91481dd62..9e08107255 100644
--- a/src/frontend/packages/core/src/core/permissions/current-user-permissions.config.ts
+++ b/src/frontend/packages/core/src/core/permissions/current-user-permissions.config.ts
@@ -1,3 +1,5 @@
+import { PermissionValues } from '../../../../store/src/selectors/current-user-role.selectors';
+
 export type PermissionConfigType = PermissionConfig[] | PermissionConfig | PermissionConfigLink;
 export interface IPermissionConfigs {
   [permissionString: string]: PermissionConfigType;
@@ -6,7 +8,6 @@ export interface IPermissionConfigs {
 export type PermissionTypes = string;
 export type CurrentUserPermissions = string;
 export type ScopeStrings = string;
-export type PermissionValues = string;
 export class PermissionConfig {
   constructor(
     public type: PermissionTypes,
diff --git a/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.spec.ts b/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.spec.ts
index e8e69c7782..90d5401db5 100644
--- a/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.spec.ts
+++ b/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.spec.ts
@@ -5,12 +5,12 @@ import { first, tap } from 'rxjs/operators';
 import { AppState } from '../../../../store/src/app-state';
 import { EntityCatalogTestModule, TEST_CATALOGUE_ENTITIES } from '../../../../store/src/entity-catalog-test.module';
 import { EntityCatalogEntityConfig } from '../../../../store/src/entity-catalog/entity-catalog.types';
+import { endpointEntityType, stratosEntityFactory } from '../../../../store/src/helpers/stratos-entity-factory';
+import { generateStratosEntities } from '../../../../store/src/stratos-entity-generator';
 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 { PermissionConfig } from './current-user-permissions.config';
 import { CurrentUserPermissionsService } from './current-user-permissions.service';
 import { StratosPermissionStrings, StratosPermissionTypes, StratosScopeStrings } from './stratos-user-permissions.checker';
@@ -138,7 +138,7 @@ describe('CurrentUserPermissionsService', () => {
     // Create request and requestData sections
     const entityMap = new Map<EntityCatalogEntityConfig, Array<TestStoreEntity | string>>([
       [
-        endpointEntitySchema,
+        stratosEntityFactory(endpointEntityType),
         endpoints.map(endpoint => ({
           guid: endpoint.guid,
           data: endpoint
diff --git a/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.ts b/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.ts
index 0a7490fb0c..4ad096b7c5 100644
--- a/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.ts
+++ b/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.ts
@@ -4,10 +4,7 @@ import { combineLatest, Observable, of } from 'rxjs';
 import { distinctUntilChanged, map, switchMap } from 'rxjs/operators';
 
 import { InternalAppState } from '../../../../store/src/app-state';
-import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
-import { selectEntity } from '../../../../store/src/selectors/api.selectors';
-import { EndpointModel } from '../../../../store/src/types/endpoint.types';
-import { ENDPOINT_TYPE, STRATOS_ENDPOINT_TYPE } from '../../base-entity-schemas';
+import { stratosEntityCatalog } from '../../../../store/src/stratos-entity-catalog';
 import { LoggerService } from '../logger.service';
 import {
   CurrentUserPermissions,
@@ -23,7 +20,7 @@ import {
 import { StratosUserPermissionsChecker } from './stratos-user-permissions.checker';
 
 
-export const CUSTOM_USER_PERMISSION_CHECKERS = 'custom_user_perm_checkers'
+export const CUSTOM_USER_PERMISSION_CHECKERS = 'custom_user_perm_checkers';
 
 @Injectable()
 export class CurrentUserPermissionsService {
@@ -38,7 +35,7 @@ export class CurrentUserPermissionsService {
     this.allCheckers = [
       new StratosUserPermissionsChecker(store),
       ...nullSafeCustomCheckers
-    ]
+    ];
   }
   /**
    * @param action The action we're going to check the user's access to.
@@ -56,13 +53,13 @@ export class CurrentUserPermissionsService {
   ): Observable<boolean> {
     let actionConfig;
     if (typeof action === 'string') {
-      let permConfigType = this.getPermissionConfig(action);
+      const permConfigType = this.getPermissionConfig(action);
       if (!permConfigType) {
         return of(false); // Logging handled in getPermissionConfig
       }
       actionConfig = this.getConfig(permConfigType);
     } else {
-      actionConfig = this.getConfig(action)
+      actionConfig = this.getConfig(action);
     }
     const obs$ = this.getCanObservable(actionConfig, endpointGuid, ...args);
     return obs$ ?
@@ -79,8 +76,7 @@ export class CurrentUserPermissionsService {
     } else if (actionConfig) {
       return this.getSimplePermission(actionConfig, endpointGuid, ...args);
     } else if (endpointGuid) {
-      const key = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, ENDPOINT_TYPE);
-      return this.store.select(selectEntity<EndpointModel>(key, endpointGuid)).pipe(
+      return stratosEntityCatalog.endpoint.store.getEntityMonitor(endpointGuid).entity$.pipe(
         switchMap(endpoint => endpoint ?
           this.getFallbackPermission(endpointGuid, endpoint.cnsi_type) :
           of(false)
@@ -96,7 +92,7 @@ export class CurrentUserPermissionsService {
       'permissions check',
       actionConfig.type,
       of(false)
-    )
+    );
   }
 
   private getComplexPermission(permissionConfig: PermissionConfig[], endpointGuid?: string, ...args: any[]) {
@@ -116,7 +112,7 @@ export class CurrentUserPermissionsService {
       [{
         checks: [of(false)]
       }]
-    )
+    );
   }
 
   private getConfig(config: PermissionConfigType, tries = 0): PermissionConfig[] | PermissionConfig {
@@ -152,7 +148,7 @@ export class CurrentUserPermissionsService {
       'fallback permission',
       'N/A',
       of(null)
-    )
+    );
   }
 
   private getPermissionConfig(key: CurrentUserPermissions): PermissionConfigType {
@@ -161,7 +157,7 @@ export class CurrentUserPermissionsService {
       'permissions checker',
       key,
       null
-    )
+    );
   }
 
   /**
diff --git a/src/frontend/packages/core/src/core/permissions/stratos-user-permissions.checker.ts b/src/frontend/packages/core/src/core/permissions/stratos-user-permissions.checker.ts
index a0bcb58695..db4c382b26 100644
--- a/src/frontend/packages/core/src/core/permissions/stratos-user-permissions.checker.ts
+++ b/src/frontend/packages/core/src/core/permissions/stratos-user-permissions.checker.ts
@@ -5,8 +5,9 @@ import { GeneralEntityAppState } from '../../../../store/src/app-state';
 import {
   getCurrentUserStratosHasScope,
   getCurrentUserStratosRole,
+  PermissionValues,
 } from '../../../../store/src/selectors/current-user-role.selectors';
-import { IPermissionConfigs, PermissionConfig, PermissionTypes, PermissionValues } from './current-user-permissions.config';
+import { IPermissionConfigs, PermissionConfig, PermissionTypes } from './current-user-permissions.config';
 import {
   BaseCurrentUserPermissionsChecker,
   IConfigGroups,
diff --git a/src/frontend/packages/core/src/core/stateful-icon/stateful-icon.component.spec.ts b/src/frontend/packages/core/src/core/stateful-icon/stateful-icon.component.spec.ts
index f258f527ae..1a8cd63bc7 100644
--- a/src/frontend/packages/core/src/core/stateful-icon/stateful-icon.component.spec.ts
+++ b/src/frontend/packages/core/src/core/stateful-icon/stateful-icon.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { StratosStatus } from '../../shared/shared.types';
+import { StratosStatus } from '../../../../store/src/types/shared.types';
 import { MDAppModule } from '../md.module';
 import { StatefulIconComponent } from './stateful-icon.component';
 
diff --git a/src/frontend/packages/core/src/core/stateful-icon/stateful-icon.component.ts b/src/frontend/packages/core/src/core/stateful-icon/stateful-icon.component.ts
index 5ad05aa35d..fdcd63847a 100644
--- a/src/frontend/packages/core/src/core/stateful-icon/stateful-icon.component.ts
+++ b/src/frontend/packages/core/src/core/stateful-icon/stateful-icon.component.ts
@@ -1,5 +1,6 @@
-import { Component, Input, OnInit, TemplateRef, ViewChild } from '@angular/core';
-import { StratosStatus } from '../../shared/shared.types';
+import { Component, Input, TemplateRef } from '@angular/core';
+
+import { StratosStatus } from '../../../../store/src/types/shared.types';
 
 interface IconDefinition {
   icon: string;
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 f83b16a256..0a496d3adc 100644
--- a/src/frontend/packages/core/src/core/user-profile.service.ts
+++ b/src/frontend/packages/core/src/core/user-profile.service.ts
@@ -1,24 +1,15 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { combineLatest, Observable, of as observableOf, of } from 'rxjs';
+import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import { filter, first, map, publishReplay, refCount, switchMap } from 'rxjs/operators';
 
-import {
-  FetchUserProfileAction,
-  UpdateUserPasswordAction,
-  UpdateUserProfileAction,
-} from '../../../store/src/actions/user-profile.actions';
 import { AppState } from '../../../store/src/app-state';
-import { userProfilePasswordUpdatingKey } from '../../../store/src/effects/user-profile.effects';
-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, getDefaultActionState, rootUpdatingKey } from '../../../store/src/reducers/api-request-reducer/types';
+import { ActionState, getDefaultActionState } 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 { stratosEntityCatalog } from '../../../store/src/stratos-entity-catalog';
 import { SessionData } from '../../../store/src/types/auth.types';
 import { UserProfileInfo, UserProfileInfoEmail, UserProfileInfoUpdates } from '../../../store/src/types/user-profile.types';
-import { userProfileEntitySchema } from '../base-entity-schemas';
 
 
 @Injectable()
@@ -32,21 +23,22 @@ export class UserProfileService {
 
   userProfile$: Observable<UserProfileInfo>;
 
-  private stratosUserConfig = entityCatalog.getEntity(userProfileEntitySchema.endpointType, userProfileEntitySchema.entityType);
+  private userGuid$: Observable<string>;
 
   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.userGuid$ = this.store.select(s => s.auth).pipe(
+      filter((auth: AuthState) => !!(auth && auth.sessionData)),
+      map((auth: AuthState) => auth.sessionData),
+      filter((sessionData: SessionData) => !!sessionData.user),
+      first(),
+      map(data => data.user.guid)
+    );
 
-    this.entityService = this.createFetchUserAction().pipe(
+    this.entityService = this.userGuid$.pipe(
       first(),
-      map(action => esf.create<UserProfileInfo>(action.guid, action)),
+      map(userGuid => stratosEntityCatalog.userProfile.store.getEntityService(userGuid)),
       publishReplay(1),
       refCount()
     );
@@ -60,27 +52,16 @@ export class UserProfileService {
       switchMap(service => service.isFetchingEntity$)
     );
 
-    this.isError$ = this.store.select(selectRequestInfo(this.stratosUserConfig.entityKey, FetchUserProfileAction.guid)).pipe(
+    this.isError$ = this.entityService.pipe(
+      switchMap(es => es.entityMonitor.entityRequest$),
       filter(requestInfo => !!requestInfo && !requestInfo.fetching),
       map(requestInfo => requestInfo.error)
-    );
-  }
-
-  private createFetchUserAction(): Observable<FetchUserProfileAction> {
-    return this.store.select(s => s.auth).pipe(
-      filter((auth: AuthState) => !!(auth && auth.sessionData)),
-      map((auth: AuthState) => auth.sessionData),
-      filter((sessionData: SessionData) => !!sessionData.user),
-      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);
-    });
+    this.userGuid$.pipe(first()).subscribe(userGuid => stratosEntityCatalog.userProfile.api.get(userGuid));
   }
 
   getPrimaryEmailAddress(profile: UserProfileInfo): string {
@@ -135,11 +116,8 @@ export class UserProfileService {
     if (profileChanges.emailAddress) {
       this.setPrimaryEmailAddress(updatedProfile, profileChanges.emailAddress);
     }
-    this.store.dispatch(new UpdateUserProfileAction(updatedProfile, profileChanges.currentPassword));
-    const actionState = selectUpdateInfo(this.stratosUserConfig.entityKey,
-      FetchUserProfileAction.guid,
-      rootUpdatingKey);
-    return this.store.select(actionState).pipe(
+
+    return stratosEntityCatalog.userProfile.api.updateProfile<ActionState>(updatedProfile, profileChanges.currentPassword).pipe(
       filter(item => item && !item.busy)
     );
   }
@@ -149,11 +127,7 @@ export class UserProfileService {
       oldPassword: profileChanges.currentPassword,
       password: profileChanges.newPassword
     };
-    this.store.dispatch(new UpdateUserPasswordAction(profile.id, passwordUpdates));
-    const actionState = selectUpdateInfo(this.stratosUserConfig.entityKey,
-      FetchUserProfileAction.guid,
-      userProfilePasswordUpdatingKey);
-    return this.store.select(actionState).pipe(
+    return stratosEntityCatalog.userProfile.api.updatePassword<ActionState>(profile.id, passwordUpdates).pipe(
       filter(item => item && !item.busy)
     );
   }
diff --git a/src/frontend/packages/core/src/core/user.service.spec.ts b/src/frontend/packages/core/src/core/user.service.spec.ts
index 6fdaab8b3a..f831c61b18 100644
--- a/src/frontend/packages/core/src/core/user.service.spec.ts
+++ b/src/frontend/packages/core/src/core/user.service.spec.ts
@@ -1,7 +1,7 @@
 import { inject, TestBed } from '@angular/core/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreTestingModule } from '../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratosui/store/testing';
 import { SharedModule } from '../shared/shared.module';
 import { CoreModule } from './core.module';
 import { UserService } from './user.service';
diff --git a/src/frontend/packages/core/src/core/utils.service.ts b/src/frontend/packages/core/src/core/utils.service.ts
index 83de981544..d3d1c3f837 100644
--- a/src/frontend/packages/core/src/core/utils.service.ts
+++ b/src/frontend/packages/core/src/core/utils.service.ts
@@ -11,56 +11,6 @@ export function getIdFromRoute(activatedRoute: ActivatedRoute, id: string) {
   return null;
 }
 
-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 =
   '^' +
   // protocol identifier
@@ -319,13 +269,6 @@ export const safeUnsubscribe = (...subs: Subscription[]) => {
 export const truthyIncludingZero = (obj: any): boolean => !!obj || obj === 0;
 export const truthyIncludingZeroString = (obj: any): string => truthyIncludingZero(obj) ? obj.toString() : null;
 
-export const sortStringify = (obj: { [key: string]: string | string[] | number }): string => {
-  const keys = Object.keys(obj).sort();
-  return keys.reduce((res, key) => {
-    return res += `${key}-${obj[key]},`;
-  }, '');
-};
-
 /**
  * Real basic, shallow check
  */
diff --git a/src/frontend/packages/core/misc/custom/custom.module.ts_ b/src/frontend/packages/core/src/custom-import.module.ts
similarity index 57%
rename from src/frontend/packages/core/misc/custom/custom.module.ts_
rename to src/frontend/packages/core/src/custom-import.module.ts
index b4118c293d..3d84d8fdec 100644
--- a/src/frontend/packages/core/misc/custom/custom.module.ts_
+++ b/src/frontend/packages/core/src/custom-import.module.ts
@@ -2,7 +2,8 @@ import { NgModule } from '@angular/core';
 
 // Default empty customization module - DO NOT EDIT
 
-// This file is in the .gitignore - changes will not be flagged
+// These modules will be intercepted by the custom webpack configuration
+// They are only here so that on a fresh checkout, both modules are defined
 
 @NgModule()
 export class CustomImportModule { }
diff --git a/src/frontend/packages/core/src/environments/environment.prod.ts b/src/frontend/packages/core/src/environments/environment.prod.ts
index 651a68d984..da8e7d8dbd 100644
--- a/src/frontend/packages/core/src/environments/environment.prod.ts
+++ b/src/frontend/packages/core/src/environments/environment.prod.ts
@@ -1,10 +1,11 @@
+import { cfAPIVersion, proxyAPIVersion } from '../../../store/src/jetstream';
 import { LogLevel } from './../../../store/src/actions/log.actions';
 
 export const environment = {
   production: true,
   logLevel: LogLevel.WARN,
-  proxyAPIVersion: 'v1',
-  cfAPIVersion: 'v2',
+  proxyAPIVersion,
+  cfAPIVersion,
   logToConsole: true,
   logEnableConsoleActions: false,
   showObsDebug: false,
diff --git a/src/frontend/packages/core/src/environments/environment.ts b/src/frontend/packages/core/src/environments/environment.ts
index bb1db6f839..e10f7527a5 100644
--- a/src/frontend/packages/core/src/environments/environment.ts
+++ b/src/frontend/packages/core/src/environments/environment.ts
@@ -1,4 +1,5 @@
 import { LogLevel } from '../../../store/src/actions/log.actions';
+import { cfAPIVersion, proxyAPIVersion } from '../../../store/src/jetstream';
 
 // The file contents for the current environment will overwrite these during build.
 // The build system defaults to the dev environment which uses `environment.ts`, but if you do
@@ -7,8 +8,8 @@ import { LogLevel } from '../../../store/src/actions/log.actions';
 
 export const environment = {
   production: false,
-  proxyAPIVersion: 'v1',
-  cfAPIVersion: 'v2',
+  proxyAPIVersion,
+  cfAPIVersion,
   logLevel: LogLevel.DEBUG,
   logToConsole: true,
   logEnableConsoleActions: false,
diff --git a/src/frontend/packages/core/src/features/about/about.module.ts b/src/frontend/packages/core/src/features/about/about.module.ts
index c71cd11f55..9fe18f06af 100644
--- a/src/frontend/packages/core/src/features/about/about.module.ts
+++ b/src/frontend/packages/core/src/features/about/about.module.ts
@@ -5,8 +5,7 @@ import { SharedModule } from '../../shared/shared.module';
 import { AboutPageComponent } from './about-page/about-page.component';
 import { AboutRoutingModule } from './about.routing';
 import { DiagnosticsPageComponent } from './diagnostics-page/diagnostics-page.component';
-import { EulaPageComponent, EulaPageContentComponent } from './eula-page/eula-page.component';
-
+import { EulaPageComponent } from './eula-page/eula-page.component';
 
 
 @NgModule({
@@ -17,7 +16,6 @@ import { EulaPageComponent, EulaPageContentComponent } from './eula-page/eula-pa
   ],
   declarations: [
     AboutPageComponent,
-    EulaPageContentComponent,
     EulaPageComponent,
     DiagnosticsPageComponent
   ]
diff --git a/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.html b/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.html
index 27791db6f3..3a40946d0b 100644
--- a/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.html
+++ b/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.html
@@ -8,4 +8,4 @@ <h1>EULA</h1>
         </span>
     </div>
 </app-page-header>
-<app-eula-content></app-eula-content>
\ No newline at end of file
+<div [innerHtml]='eulaHtml'></div>
diff --git a/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.spec.ts b/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.spec.ts
index 20023d114b..113aac37d3 100644
--- a/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.spec.ts
+++ b/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.spec.ts
@@ -1,3 +1,5 @@
+import { HttpClientModule } from '@angular/common/http';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { createBasicStoreModule } from '@stratosui/store/testing';
@@ -5,7 +7,7 @@ import { createBasicStoreModule } from '@stratosui/store/testing';
 import { TabNavService } from '../../../../tab-nav.service';
 import { CoreModule } from '../../../core/core.module';
 import { SharedModule } from '../../../shared/shared.module';
-import { EulaPageComponent, EulaPageContentComponent } from './eula-page.component';
+import { EulaPageComponent } from './eula-page.component';
 
 describe('EulaPageComponent', () => {
   let component: EulaPageComponent;
@@ -13,11 +15,13 @@ describe('EulaPageComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [EulaPageComponent, EulaPageContentComponent],
+      declarations: [EulaPageComponent],
       imports: [
         CoreModule,
         RouterTestingModule,
         SharedModule,
+        HttpClientModule,
+        HttpClientTestingModule,
         createBasicStoreModule(),
       ],
       providers: [TabNavService]
diff --git a/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.ts b/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.ts
index 8271e24c66..a93e345bf3 100644
--- a/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.ts
+++ b/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.ts
@@ -1,17 +1,12 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-eula-content',
-  templateUrl: '../../../../assets/eula.html'
-})
-export class EulaPageContentComponent { }
+import { Component } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
 
 @Component({
   selector: 'app-eula-page',
   templateUrl: './eula-page.component.html',
   styleUrls: ['./eula-page.component.scss']
 })
-export class EulaPageComponent implements OnInit {
+export class EulaPageComponent {
 
   public breadcrumbs = [
     {
@@ -19,10 +14,14 @@ export class EulaPageComponent implements OnInit {
     }
   ];
 
-  constructor() { }
-
-  ngOnInit() {
+  public eulaHtml = '';
 
+  // Load the EULA
+  constructor(http: HttpClient) {
+    http.get('/core/assets/eula.html', {responseType: 'text'}).subscribe(
+      html => this.eulaHtml = html,
+      () => this.eulaHtml = 'An error occurred retrieving the EULA'
+    );
   }
 
 }
diff --git a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
index d212cac3c2..26a2d129ce 100644
--- a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
+++ b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
@@ -1,4 +1,3 @@
-@import '../../../../sass/colors';
 @import '../../../../sass/mixins';
 
 $app-sub-header-height: 48px;
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 c409c37976..8310e6723e 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
@@ -9,11 +9,11 @@ import { distinctUntilChanged, filter, map, startWith, withLatestFrom } from 'rx
 
 import { CloseSideNav, DisableMobileNav, EnableMobileNav } from '../../../../../store/src/actions/dashboard-actions';
 import { GetCurrentUsersRelations } from '../../../../../store/src/actions/permissions.actions';
-import { GetUserFavoritesAction } from '../../../../../store/src/actions/user-favourites-actions/get-user-favorites-action';
 import { DashboardOnlyAppState } from '../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
 import { DashboardState } from '../../../../../store/src/reducers/dashboard-reducer';
 import { selectDashboardState } from '../../../../../store/src/selectors/dashboard.selectors';
+import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
 import { TabNavService } from '../../../../tab-nav.service';
 import { CustomizationService } from '../../../core/customizations.types';
 import { EndpointsService } from '../../../core/endpoints.service';
@@ -144,7 +144,7 @@ export class DashboardBaseComponent implements OnInit, OnDestroy, AfterViewInit
     });
 
     this.dispatchRelations();
-    this.store.dispatch(new GetUserFavoritesAction());
+    stratosEntityCatalog.userFavorite.api.getAll();
   }
 
   ngOnDestroy() {
@@ -190,7 +190,7 @@ export class DashboardBaseComponent implements OnInit, OnDestroy, AfterViewInit
           link: path + '/' + route.path
         };
         if (item.requiresEndpointType) {
-          // Upstream always likes to show Cloud Foundry related endpoints - other distributions can chane this behaviour
+          // Upstream always likes to show Cloud Foundry related endpoints - other distributions can change this behaviour
           const alwaysShow = this.cs.get().alwaysShowNavForEndpointTypes ?
             this.cs.get().alwaysShowNavForEndpointTypes(item.requiresEndpointType) : (item.requiresEndpointType === 'cf');
           item.hidden = alwaysShow ? of(false) : this.endpointsService.doesNotHaveConnectedEndpointType(item.requiresEndpointType);
diff --git a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.ts b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.ts
index a91f4bd200..b74dbed831 100644
--- a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.ts
+++ b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.ts
@@ -4,12 +4,15 @@ import { Store } from '@ngrx/store';
 import { Observable, of } from 'rxjs';
 
 import { AppState } from '../../../../../store/src/app-state';
+import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { selectIsMobile } from '../../../../../store/src/selectors/dashboard.selectors';
 import { TabNavService } from '../../../../tab-nav.service';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { StratosTabMetadata } from '../../../core/extension/extension-service';
+import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
 import { IBreadcrumb } from '../../../shared/components/breadcrumbs/breadcrumbs.types';
 
+
+
 export interface IPageSideNavTab extends StratosTabMetadata {
   hidden$?: Observable<boolean>;
 }
@@ -28,7 +31,7 @@ export class PageSideNavComponent implements OnInit {
     }
     this.pTabs = tabs.map(tab => ({
       ...tab,
-      hidden$: tab.hidden$ || (tab.hidden ? tab.hidden(this.store, this.esf, this.activatedRoute) : of(false))
+      hidden$: tab.hidden$ || (tab.hidden ? tab.hidden(this.store, this.esf, this.activatedRoute, this.cups) : of(false))
     }));
   }
   get tabs(): IPageSideNavTab[] {
@@ -45,6 +48,7 @@ export class PageSideNavComponent implements OnInit {
     private store: Store<AppState>,
     private esf: EntityServiceFactory,
     private activatedRoute: ActivatedRoute,
+    private cups: CurrentUserPermissionsService
   ) {
     this.isMobile$ = this.store.select(selectIsMobile);
   }
diff --git a/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.theme.scss b/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.theme.scss
index 7c2b8a671e..e4023c6b4c 100644
--- a/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.theme.scss
+++ b/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.theme.scss
@@ -4,6 +4,17 @@
   $side-nav-colors: map-get($app-theme, side-nav);
   $side-nav-bottom-color: map-get($app-theme, subdued-color);
   $side-nav-hover-color: mat-color($side-nav-colors, hover);
+  $header-span: map-get($app-theme, header-background-span);
+
+  $side-nav-top-background: map-get($side-nav-colors, background);
+  $side-nav-top-foreground: map-get($side-nav-colors, text);
+
+  // Does the header background color span across the top, or is the sidenav background color used for the top-left portion
+  @if $header-span == true {
+    $side-nav-top-background: map-get($app-theme, header-background-color);
+    $side-nav-top-foreground: map-get($app-theme, header-foreground-color);
+  }
+
   .side-nav {
     &__nav-toggle {
       color: mat-color($side-nav-colors, text);
@@ -12,7 +23,8 @@
       background-color: mat-color($side-nav-colors, background);
     }
     &__top {
-      background-color: mat-color($side-nav-colors, background-top);
+      background-color: $side-nav-top-background;
+      color: $side-nav-top-foreground;
     }
     &__item {
       color: mat-color($side-nav-colors, text);
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 5251a66479..2aee2629c1 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,9 +5,9 @@ import { BehaviorSubject, Observable } from 'rxjs';
 import { first, map } from 'rxjs/operators';
 
 import { GeneralEntityAppState } from '../../../../../store/src/app-state';
+import { BrowserStandardEncoder } from '../../../../../store/src/browser-encoder';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
 import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
-import { BrowserStandardEncoder } from '../../../helper';
 import {
   BackupEndpointConfigUI,
   BackupEndpointConnectionTypes,
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 3ad6856b48..9c41ea8a3d 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,17 +1,13 @@
 import { Component } 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 } 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';
-import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
-import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
+import { httpErrorResponseToSafeString } from '../../../../../../store/src/jetstream';
+import { stratosEntityCatalog } from '../../../../../../store/src/stratos-entity-catalog';
 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';
@@ -74,8 +70,6 @@ export class BackupEndpointsComponent {
 
   constructor(
     public service: BackupEndpointsService,
-    private store: Store<AppState>,
-    private paginationMonitorFactory: PaginationMonitorFactory,
     private confirmDialog: ConfirmationDialogService,
   ) {
     this.setupSelectStep();
@@ -84,17 +78,7 @@ export class BackupEndpointsComponent {
 
 
   setupSelectStep() {
-    const action = new GetAllEndpoints();
-    const endpointObs = getPaginationObservables<EndpointModel>({
-      store: this.store,
-      action,
-      paginationMonitor: this.paginationMonitorFactory.create(
-        action.paginationKey,
-        action,
-        true
-      )
-    }, true);
-
+    const endpointObs = stratosEntityCatalog.endpoint.store.getAll.getPaginationService();
 
     const endpoints$ = endpointObs.entities$.pipe(
       filter(entities => !!entities),
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 8fa35048c1..38dee43257 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
@@ -5,10 +5,10 @@ import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
 import { filter, map, switchMap } from 'rxjs/operators';
 
 import { GeneralEntityAppState } from '../../../../../store/src/app-state';
+import { BrowserStandardEncoder } from '../../../../../store/src/browser-encoder';
 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';
 
 interface BackupContent {
   payload: string;
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 c3483dca50..3ddca26bd4 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,10 +5,10 @@ import { Store } from '@ngrx/store';
 import { Observable, of, Subject } from 'rxjs';
 import { first, map } from 'rxjs/operators';
 
-import { GetAllEndpoints } from '../../../../../../store/src/actions/endpoint.actions';
 import { GeneralEntityAppState } from '../../../../../../store/src/app-state';
+import { httpErrorResponseToSafeString } from '../../../../../../store/src/jetstream';
+import { stratosEntityCatalog } from '../../../../../../store/src/stratos-entity-catalog';
 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';
@@ -79,7 +79,7 @@ export class RestoreEndpointsComponent {
     };
 
     const restoreSuccess = () => {
-      this.store.dispatch(new GetAllEndpoints());
+      stratosEntityCatalog.endpoint.api.getAll()
       result.next({
         success: true,
         redirect: true,
diff --git a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/credentials-auth-form.component.ts b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/credentials-auth-form.component.ts
index cdf3c405d0..b585c0ab96 100644
--- a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/credentials-auth-form.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/credentials-auth-form.component.ts
@@ -1,6 +1,7 @@
-import { FormGroup } from '@angular/forms';
 import { Component, Input } from '@angular/core';
-import { IAuthForm } from '../../../../core/extension/extension-types';
+import { FormGroup } from '@angular/forms';
+
+import { IAuthForm } from '../../../../../../store/src/extension-types';
 
 @Component({
   selector: 'app-credentials-auth-form',
diff --git a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/none-auth-form.component.ts b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/none-auth-form.component.ts
index c76f5a954c..3b6bb325ee 100644
--- a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/none-auth-form.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/none-auth-form.component.ts
@@ -1,6 +1,7 @@
 import { Component, Input } from '@angular/core';
 import { FormGroup } from '@angular/forms';
-import { IAuthForm } from '../../../../core/extension/extension-types';
+
+import { IAuthForm } from '../../../../../../store/src/extension-types';
 
 @Component({
   selector: 'app-none-auth-form',
diff --git a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/sso-auth-form.component.ts b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/sso-auth-form.component.ts
index bdac43f89e..83243a24ec 100644
--- a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/sso-auth-form.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/sso-auth-form.component.ts
@@ -1,6 +1,7 @@
 import { Component, Input } from '@angular/core';
 import { FormGroup } from '@angular/forms';
-import { IAuthForm } from '../../../../core/extension/extension-types';
+
+import { IAuthForm } from '../../../../../../store/src/extension-types';
 
 @Component({
   selector: 'app-sso-auth-form',
diff --git a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.ts b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.ts
index 3d0f72fa4c..3a56bdbc23 100644
--- a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.ts
@@ -1,13 +1,11 @@
 import { Component, Inject, OnDestroy } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { Store } from '@ngrx/store';
 import { Subscription } from 'rxjs';
 
-import { ShowSnackBar } from '../../../../../store/src/actions/snackBar.actions';
-import { EndpointOnlyAppState } from '../../../../../store/src/app-state';
 import { EndpointsService } from '../../../core/endpoints.service';
 import { MarkdownPreviewComponent } from '../../../shared/components/markdown-preview/markdown-preview.component';
 import { SidePanelService } from '../../../shared/services/side-panel.service';
+import { SnackBarService } from '../../../shared/services/snackbar.service';
 import { ConnectEndpointConfig, ConnectEndpointService } from '../connect.service';
 
 
@@ -27,14 +25,14 @@ export class ConnectEndpointDialogComponent implements OnDestroy {
   constructor(
     public dialogRef: MatDialogRef<ConnectEndpointDialogComponent>,
     @Inject(MAT_DIALOG_DATA) public data: ConnectEndpointConfig,
-    private store: Store<EndpointOnlyAppState>,
     endpointsService: EndpointsService,
     private sidePanelService: SidePanelService,
+    private snackBarService: SnackBarService,
   ) {
-    this.connectService = new ConnectEndpointService(store, endpointsService, data);
+    this.connectService = new ConnectEndpointService(endpointsService, data);
 
     this.hasConnected = this.connectService.hasConnected$.subscribe(() => {
-      this.store.dispatch(new ShowSnackBar(`Connected endpoint '${this.data.name}'`));
+      this.snackBarService.show(`Connected endpoint '${this.data.name}'`);
       this.dialogRef.close();
     });
   }
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 fc355c4928..0f6bc94595 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
@@ -13,13 +13,12 @@ import {
 } from '@angular/core';
 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';
-import { EndpointAuthTypeConfig, IAuthForm, IEndpointAuthComponent } from '../../../core/extension/extension-types';
+import { EndpointAuthTypeConfig, IAuthForm, IEndpointAuthComponent } from '../../../../../store/src/extension-types';
+import { BaseEndpointAuth } from '../../../core/endpoint-auth';
 import { safeUnsubscribe } from '../../../core/utils.service';
 import { ConnectEndpointConfig, ConnectEndpointData, ConnectEndpointService } from '../connect.service';
-import { BaseEndpointAuth } from '../endpoint-auth';
 
 @Component({
   selector: 'app-connect-endpoint',
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 d4e9dac73d..2ad24a7196 100644
--- a/src/frontend/packages/core/src/features/endpoints/connect.service.ts
+++ b/src/frontend/packages/core/src/features/endpoints/connect.service.ts
@@ -1,4 +1,3 @@
-import { Store } from '@ngrx/store';
 import { combineLatest, Observable, of, Subject, Subscription } from 'rxjs';
 import {
   delay,
@@ -13,18 +12,12 @@ import {
 } from 'rxjs/operators';
 
 import { AuthParams, ConnectEndpoint } from '../../../../store/src/actions/endpoint.actions';
-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';
-import { endpointSchemaKey } from '../../../../store/src/helpers/entity-factory';
+import { EndpointType } from '../../../../store/src/extension-types';
 import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
-import { selectEntity, selectRequestInfo, selectUpdateInfo } from '../../../../store/src/selectors/api.selectors';
+import { stratosEntityCatalog } from '../../../../store/src/stratos-entity-catalog';
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
-import { STRATOS_ENDPOINT_TYPE } from '../../base-entity-schemas';
 import { EndpointsService } from '../../core/endpoints.service';
-import { EndpointType } from '../../core/extension/extension-types';
 import { safeUnsubscribe } from '../../core/utils.service';
 
 export interface ConnectEndpointConfig {
@@ -65,15 +58,12 @@ export class ConnectEndpointService {
   private hasAttemptedConnect: boolean;
   private pData: ConnectEndpointData;
 
-  private endpointEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointSchemaKey);
-
   // We need a delay to ensure the BE has finished registering the endpoint.
   // If we don't do this and if we're quick enough, we can navigate to the application page
   // and end up with an empty list where we should have results.
   private connectDelay = 1000;
 
   constructor(
-    private store: Store<EndpointOnlyAppState>,
     private endpointsService: EndpointsService,
     public config: ConnectEndpointConfig,
   ) {
@@ -87,33 +77,29 @@ export class ConnectEndpointService {
     ).subscribe(([oldVal, newVal]) => {
       if (!newVal.error && (oldVal.busy && !newVal.busy)) {
         // Has finished fetching
-        this.store.dispatch(new GetSystemInfo());
+        stratosEntityCatalog.endpoint.api.get(this.config.guid);
       }
     }));
 
     this.subs.push(this.connected$.pipe(
-      filter(([connected]) => connected),
+      filter(([isConnected]) => isConnected),
       delay(this.connectDelay),
       tap(() => this.hasConnected.next(true)),
-      distinctUntilChanged(([connected], [oldConnected]) => connected && oldConnected),
-    ).subscribe(([connected, endpoint]) => this.endpointsService.checkEndpoint(endpoint))
+      distinctUntilChanged(([isConnected], [oldIsConnected]) => isConnected && oldIsConnected),
+    ).subscribe(([, endpoint]) => this.endpointsService.checkEndpoint(endpoint))
     );
   }
 
   private setupObservables() {
-    this.update$ = this.store.select(
-      this.getUpdateSelector()
-    ).pipe(filter(update => !!update));
+    this.update$ = stratosEntityCatalog.endpoint.store.getEntityMonitor(this.config.guid).getUpdatingSection(ConnectEndpoint.UpdatingKey)
+      .pipe(filter(update => !!update));
 
-    this.fetchingInfo$ = this.store.select(
-      this.getRequestSelector()
-    ).pipe(
+    this.fetchingInfo$ = stratosEntityCatalog.endpoint.store.getEntityMonitor(this.config.guid).entityRequest$.pipe(
       filter(request => !!request),
-      map(request => request.fetching));
+      map(request => request.fetching)
+    );
 
-    this.connected$ = this.store.select(
-      this.getEntitySelector()
-    ).pipe(
+    this.connected$ = stratosEntityCatalog.endpoint.store.getEntityMonitor(this.config.guid).entity$.pipe(
       map(endpoint => {
         const isConnected = !!(endpoint && endpoint.api_endpoint && endpoint.user);
         return [isConnected, endpoint] as [boolean, EndpointModel];
@@ -149,28 +135,6 @@ export class ConnectEndpointService {
     );
   }
 
-  private getUpdateSelector() {
-    return selectUpdateInfo(
-      this.endpointEntityKey,
-      this.config.guid,
-      EndpointsEffect.connectingKey
-    );
-  }
-
-  private getRequestSelector() {
-    return selectRequestInfo(
-      this.endpointEntityKey,
-      SystemEffects.guid
-    );
-  }
-
-  private getEntitySelector() {
-    return selectEntity<EndpointModel>(
-      this.endpointEntityKey,
-      this.config.guid,
-    );
-  }
-
   public setData(data: ConnectEndpointData) {
     this.pData = data;
   }
@@ -179,25 +143,21 @@ export class ConnectEndpointService {
     this.hasAttemptedConnect = true;
     const { authType, authVal, systemShared, bodyContent } = this.pData;
 
-    this.store.dispatch(new ConnectEndpoint(
+    return stratosEntityCatalog.endpoint.api.connect<ActionState>(
       this.config.guid,
       this.config.type,
       authType,
       authVal,
       systemShared,
       bodyContent,
-    ));
-
-    return this.isBusy$.pipe(
+    ).pipe(
       pairwise(),
-      filter(([oldBusy, newBusy]) => {
-        return !(oldBusy === true && newBusy === false);
-      }),
-      withLatestFrom(this.update$),
-      map(([, updateSection]) => ({
+      filter(([oldV, newV]) => oldV.busy && !newV.busy),
+      map(([, newV]) => newV),
+      map(updateSection => ({
         success: !updateSection.error,
         errorMessage: updateSection.message
-      }))
+      })),
     );
   }
 
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 a046dc6b62..96bca56f21 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.ts
@@ -1,27 +1,21 @@
 import { AfterContentInit, Component, Input, ViewChild } from '@angular/core';
 import { NgForm, NgModel } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
-import { Store } from '@ngrx/store';
-import { denormalize } from 'normalizr';
 import { Observable } from 'rxjs';
-import { filter, map, pairwise, withLatestFrom } from 'rxjs/operators';
+import { filter, map, pairwise } from 'rxjs/operators';
 
-import { GetAllEndpoints, RegisterEndpoint } from '../../../../../../store/src/actions/endpoint.actions';
-import { ShowSnackBar } from '../../../../../../store/src/actions/snackBar.actions';
-import { GeneralEntityAppState } from '../../../../../../store/src/app-state';
-import { EndpointsEffect } from '../../../../../../store/src/effects/endpoint.effects';
+import { getFullEndpointApiUrl } from '../../../../../../store/src/endpoint-utils';
 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';
-import { endpointEntitySchema, STRATOS_ENDPOINT_TYPE } from '../../../../base-entity-schemas';
+import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types';
+import { stratosEntityCatalog } from '../../../../../../store/src/stratos-entity-catalog';
 import { getIdFromRoute } from '../../../../core/utils.service';
 import { IStepperStep, StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component';
+import { SnackBarService } from '../../../../shared/services/snackbar.service';
 import { ConnectEndpointConfig } from '../../connect.service';
-import { getFullEndpointApiUrl, getSSOClientRedirectURI } from '../../endpoint-helpers';
+import { getSSOClientRedirectURI } from '../../endpoint-helpers';
 
 /* tslint:disable:no-access-missing-member https://github.com/mgechev/codelyzer/issues/191*/
 @Component({
@@ -58,23 +52,16 @@ export class CreateEndpointCfStep1Component implements IStepperStep, AfterConten
   endpointTypeSupportsSSO = false;
   endpoint: StratosCatalogEndpointEntity;
 
-  private endpointEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointSchemaKey);
-
-  constructor(private store: Store<GeneralEntityAppState>, activatedRoute: ActivatedRoute, ) {
-
-    this.existingEndpoints = store.select(selectPaginationState(this.endpointEntityKey, GetAllEndpoints.storeKey))
-      .pipe(
-        withLatestFrom(store.select(getAPIRequestDataState)),
-        map(([pagination, entities]) => {
-          const pages = Object.values(pagination.ids);
-          const page = [].concat.apply([], pages);
-          const endpoints = page.length ? denormalize(page, [endpointEntitySchema], entities) : [];
-          return {
-            names: endpoints.map(ep => ep.name),
-            urls: endpoints.map(ep => getFullEndpointApiUrl(ep)),
-          };
-        })
-      );
+  constructor(
+    activatedRoute: ActivatedRoute,
+    private snackBarService: SnackBarService
+  ) {
+    this.existingEndpoints = stratosEntityCatalog.endpoint.store.getAll.getPaginationMonitor().currentPage$.pipe(
+      map(endpoints => ({
+        names: endpoints.map(ep => ep.name),
+        urls: endpoints.map(ep => getFullEndpointApiUrl(ep)),
+      }))
+    );
 
     const epType = getIdFromRoute(activatedRoute, 'type');
     const epSubType = getIdFromRoute(activatedRoute, 'subtype');
@@ -87,7 +74,7 @@ export class CreateEndpointCfStep1Component implements IStepperStep, AfterConten
 
   onNext: StepOnNextFunction = () => {
     const { subType, type } = this.endpoint.getTypeAndSubtype();
-    const action = new RegisterEndpoint(
+    return stratosEntityCatalog.endpoint.api.register<ActionState>(
       type,
       subType,
       this.nameField.value,
@@ -96,15 +83,8 @@ export class CreateEndpointCfStep1Component implements IStepperStep, AfterConten
       this.clientIDField ? this.clientIDField.value : '',
       this.clientSecretField ? this.clientSecretField.value : '',
       this.ssoAllowedField ? !!this.ssoAllowedField.value : false,
-    );
-
-    this.store.dispatch(action);
-
-    const update$ = this.store.select(
-      this.getUpdateSelector(action.guid())
-    ).pipe(filter(update => !!update));
-
-    return update$.pipe(pairwise(),
+    ).pipe(
+      pairwise(),
       filter(([oldVal, newVal]) => (oldVal.busy && !newVal.busy)),
       map(([oldVal, newVal]) => newVal),
       map(result => {
@@ -116,7 +96,7 @@ export class CreateEndpointCfStep1Component implements IStepperStep, AfterConten
           ssoAllowed: this.ssoAllowedField ? !!this.ssoAllowedField.value : false
         };
         if (!result.error) {
-          this.store.dispatch(new ShowSnackBar(`Successfully registered '${this.nameField.value}'`));
+          this.snackBarService.show(`Successfully registered '${this.nameField.value}'`);
         }
         const success = !result.error;
         return {
@@ -129,13 +109,6 @@ export class CreateEndpointCfStep1Component implements IStepperStep, AfterConten
     );
   }
 
-  private getUpdateSelector(guid) {
-    return selectUpdateInfo(
-      this.endpointEntityKey,
-      guid,
-      EndpointsEffect.registeringKey,
-    );
-  }
 
   ngAfterContentInit() {
     this.validate = this.form.statusChanges.pipe(
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.ts b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.ts
index 9fc5b74dee..7be71e52aa 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-connect/create-endpoint-connect.component.ts
@@ -1,9 +1,7 @@
 import { Component, OnDestroy } from '@angular/core';
-import { Store } from '@ngrx/store';
 import { Observable, of } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { EndpointOnlyAppState } from '../../../../../../store/src/app-state';
 import { EndpointsService } from '../../../../core/endpoints.service';
 import { MarkdownPreviewComponent } from '../../../../shared/components/markdown-preview/markdown-preview.component';
 import { IStepperStep, StepOnNextResult } from '../../../../shared/components/stepper/step/step.component';
@@ -26,7 +24,6 @@ export class CreateEndpointConnectComponent implements OnDestroy, IStepperStep {
   public doConnect = false;
 
   constructor(
-    private store: Store<EndpointOnlyAppState>,
     private endpointsService: EndpointsService,
     private sidePanelService: SidePanelService,
   ) {
@@ -37,7 +34,7 @@ export class CreateEndpointConnectComponent implements OnDestroy, IStepperStep {
   }
 
   onEnter = (data: ConnectEndpointConfig) => {
-    this.connectService = new ConnectEndpointService(this.store, this.endpointsService, data);
+    this.connectService = new ConnectEndpointService(this.endpointsService, data);
   }
 
   onNext = (): Observable<StepOnNextResult> => this.doConnect ? this.connectService.submit().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 1376e3e6b7..cb6120b12e 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,21 +1,19 @@
 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, first, map, pairwise, switchMap } from 'rxjs/operators';
 
-import { AppState } from '../../../../../../store/src/app-state';
+import { getFullEndpointApiUrl } from '../../../../../../store/src/endpoint-utils';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
-import { selectUpdateInfo } from '../../../../../../store/src/selectors/api.selectors';
+import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types';
+import { stratosEntityCatalog } from '../../../../../../store/src/stratos-entity-catalog';
 import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component';
-import { getFullEndpointApiUrl, getSSOClientRedirectURI } from '../../endpoint-helpers';
-import { UpdateEndpoint } from './../../../../../../store/src/actions/endpoint.actions';
+import { getSSOClientRedirectURI } from '../../endpoint-helpers';
 import {
   EntityCatalogSchemas,
   IStratosEndpointDefinition,
 } from './../../../../../../store/src/entity-catalog/entity-catalog.types';
-import { endpointEntitiesSelector } from './../../../../../../store/src/selectors/endpoint.selectors';
 import { EndpointModel } from './../../../../../../store/src/types/endpoint.types';
 import { getIdFromRoute, safeUnsubscribe } from './../../../../core/utils.service';
 import { IStepperStep } from './../../../../shared/components/stepper/step/step.component';
@@ -41,12 +39,11 @@ export class EditEndpointStepComponent implements OnDestroy, IStepperStep {
   existingEndpoints: Observable<EndpointModelMap>;
   endpoint$: Observable<EndpointModel>;
   definition$: Observable<IStratosEndpointDefinition<EntityCatalogSchemas>>;
-  existingEndpoinNames$: Observable<string[]>;
+  existingEndpointNames$: Observable<string[]>;
   formChangeSub: Subscription;
   setClientInfo = false;
 
   constructor(
-    private store: Store<AppState>,
     activatedRoute: ActivatedRoute,
   ) {
     this.editEndpoint = new FormGroup({
@@ -65,9 +62,14 @@ export class EditEndpointStepComponent implements OnDestroy, IStepperStep {
 
     this.endpointID = getIdFromRoute(activatedRoute, 'id');
 
-    this.existingEndpoints = this.store.select(endpointEntitiesSelector);
+    this.existingEndpoints = stratosEntityCatalog.endpoint.store.getAll.getPaginationMonitor().currentPage$.pipe(
+      map(endpoints => endpoints.reduce((res, endpoint) => {
+        res[endpoint.guid] = endpoint;
+        return res;
+      }, {}))
+    );
 
-    this.existingEndpoinNames$ = this.existingEndpoints.pipe(
+    this.existingEndpointNames$ = this.existingEndpoints.pipe(
       map(endpoints => Object.values(endpoints).filter((ep: EndpointModel) => ep.guid !== this.endpointID)),
       map((endpoints: EndpointModel[]) => endpoints.map(ep => ep.name))
     );
@@ -127,20 +129,19 @@ export class EditEndpointStepComponent implements OnDestroy, IStepperStep {
     return this.endpoint$.pipe(
       first(),
       switchMap(endpoint => {
-        const action = new UpdateEndpoint(
-          endpoint.cnsi_type,
+        return stratosEntityCatalog.endpoint.api.update<ActionState>(
           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(
+          this.endpointID, {
+          endpointType: endpoint.cnsi_type,
+          id: this.endpointID,
+          name: this.editEndpoint.value.name,
+          skipSSL: this.editEndpoint.value.skipSSL,
+          setClientInfo: this.editEndpoint.value.setClientInfo,
+          clientID: this.editEndpoint.value.clientID,
+          clientSecret: this.editEndpoint.value.clientSecret,
+          allowSSO: this.editEndpoint.value.allowSSO,
+        }
+        ).pipe(
           pairwise(),
           filter(([oldV, newV]) => oldV.busy && !newV.busy),
           map(([, newV]) => newV),
diff --git a/src/frontend/packages/core/src/features/endpoints/endpoint-helpers.ts b/src/frontend/packages/core/src/features/endpoints/endpoint-helpers.ts
index 39d567fe8b..10b9a13fff 100644
--- a/src/frontend/packages/core/src/features/endpoints/endpoint-helpers.ts
+++ b/src/frontend/packages/core/src/features/endpoints/endpoint-helpers.ts
@@ -11,10 +11,6 @@ import {
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
 import { EndpointListDetailsComponent } from '../../shared/components/list/list-types/endpoint/endpoint-list.helpers';
 
-export function getFullEndpointApiUrl(endpoint: EndpointModel) {
-  return endpoint && endpoint.api_endpoint ?
-    `${endpoint.api_endpoint.Scheme}://${endpoint.api_endpoint.Host}${endpoint.api_endpoint.Path}` : 'Unknown';
-}
 
 export function getEndpointUsername(endpoint: EndpointModel) {
   return endpoint && endpoint.user ? endpoint.user.name : '-';
@@ -27,12 +23,6 @@ export interface EndpointIcon {
   font: string;
 }
 
-export enum EndpointAuthTypeNames {
-  CREDS = 'creds',
-  SSO = 'sso',
-  NONE = 'none'
-}
-
 // Any initial endpointTypes listDetailsComponent should be added here
 export const coreEndpointListDetailsComponents: Type<EndpointListDetailsComponent>[] = [];
 
diff --git a/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.ts b/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.ts
index 7992db8c39..9ecf211ded 100644
--- a/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.ts
@@ -10,7 +10,6 @@ import {
   ViewChild,
   ViewContainerRef,
 } from '@angular/core';
-import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar';
 import { Store } from '@ngrx/store';
 import { combineLatest, Subscription } from 'rxjs';
 import { delay, first, map, tap } from 'rxjs/operators';
@@ -32,6 +31,7 @@ import {
   EndpointsListConfigService,
 } from '../../../shared/components/list/list-types/endpoint/endpoints-list-config.service';
 import { ListConfig } from '../../../shared/components/list/list.component.types';
+import { SnackBarService } from '../../../shared/services/snackbar.service';
 
 @Component({
   selector: 'app-endpoints-page',
@@ -49,7 +49,6 @@ export class EndpointsPageComponent implements AfterViewInit, OnDestroy, OnInit
   @ViewChild('customNoEndpoints', { read: ViewContainerRef, static: true }) customNoEndpointsContainer;
   customContentComponentRef: ComponentRef<any>;
 
-  private snackBarRef: MatSnackBarRef<SimpleSnackBar>;
   private snackBarText = {
     message: `There are no connected endpoints, connect with your personal credentials to get started.`,
     action: 'Got it'
@@ -62,7 +61,7 @@ export class EndpointsPageComponent implements AfterViewInit, OnDestroy, OnInit
     public store: Store<EndpointOnlyAppState>,
     private ngZone: NgZone,
     private resolver: ComponentFactoryResolver,
-    private snackBar: MatSnackBar,
+    private snackBarService: SnackBarService,
     cs: CustomizationService
   ) {
     this.customizations = cs.get();
@@ -103,10 +102,10 @@ export class EndpointsPageComponent implements AfterViewInit, OnDestroy, OnInit
   }
 
   private showSnackBar(show: boolean) {
-    if (!this.snackBarRef && show) {
-      this.snackBarRef = this.snackBar.open(this.snackBarText.message, this.snackBarText.action, { duration: 20000 });
-    } else if (this.snackBarRef && !show) {
-      this.snackBarRef.dismiss();
+    if (show) {
+      this.snackBarService.show(this.snackBarText.message, this.snackBarText.action, 20000);
+    } else {
+      this.snackBarService.hide();
     }
   }
 
diff --git a/src/frontend/packages/core/src/features/error-page/error-page/error-page.component.ts b/src/frontend/packages/core/src/features/error-page/error-page/error-page.component.ts
index 9b6ab439b4..a404433a5e 100644
--- a/src/frontend/packages/core/src/features/error-page/error-page/error-page.component.ts
+++ b/src/frontend/packages/core/src/features/error-page/error-page/error-page.component.ts
@@ -7,14 +7,13 @@ import { first, map, withLatestFrom } from 'rxjs/operators';
 
 import { SendClearEndpointEventsAction } from '../../../../../store/src/actions/internal-events.actions';
 import { AppState } from '../../../../../store/src/app-state';
-import { endpointSchemaKey } from '../../../../../store/src/helpers/entity-factory';
-import { EntityMonitor } from '../../../../../store/src/monitors/entity-monitor';
+import { endpointEntityType } from '../../../../../store/src/helpers/stratos-entity-factory';
 import { InternalEventMonitorFactory } from '../../../../../store/src/monitors/internal-event-monitor.factory';
+import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
 import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
 import { InternalEventState } from '../../../../../store/src/types/internal-events.types';
 import { getPreviousRoutingState } from '../../../../../store/src/types/routing.type';
-import { endpointEntitySchema } from '../../../base-entity-schemas';
-import { StratosStatus } from '../../../shared/shared.types';
+import { StratosStatus } from '../../../../../store/src/types/shared.types';
 import { eventReturnUrlParam } from '../../event-page/events-page/events-page.component';
 
 @Component({
@@ -36,13 +35,8 @@ export class ErrorPageComponent implements OnInit {
   ngOnInit() {
     const endpointId = this.activatedRoute.snapshot.params.endpointId;
     if (endpointId) {
-      const endpointMonitor = new EntityMonitor<EndpointModel>(
-        this.store,
-        endpointId,
-        endpointEntitySchema.key,
-        endpointEntitySchema
-      );
-      const cfEndpointEventMonitor = this.internalEventMonitorFactory.getMonitor(endpointSchemaKey, of([endpointId]));
+      const endpointMonitor = stratosEntityCatalog.endpoint.store.getEntityMonitor(endpointId);
+      const cfEndpointEventMonitor = this.internalEventMonitorFactory.getMonitor(endpointEntityType, of([endpointId]));
       this.errorDetails$ = cfEndpointEventMonitor.hasErroredOverTimeNoPoll(30).pipe(
         withLatestFrom(endpointMonitor.entity$),
         map(([errors, endpoint]) => {
diff --git a/src/frontend/packages/core/src/features/home/home/home-page.component.ts b/src/frontend/packages/core/src/features/home/home/home-page.component.ts
index 1c3a977d31..6700b83fa3 100644
--- a/src/frontend/packages/core/src/features/home/home/home-page.component.ts
+++ b/src/frontend/packages/core/src/features/home/home/home-page.component.ts
@@ -5,12 +5,12 @@ import { first, map } from 'rxjs/operators';
 
 import { RouterNav } from '../../../../../store/src/actions/router.actions';
 import { AppState, IRequestEntityTypeState } from '../../../../../store/src/app-state';
+import { EntityCatalogHelpers } from '../../../../../store/src/entity-catalog/entity-catalog.helper';
 import { IUserFavoritesGroups } from '../../../../../store/src/types/favorite-groups.types';
 import { UserFavorite } from '../../../../../store/src/types/user-favorites.types';
+import { UserFavoriteManager } from '../../../../../store/src/user-favorite-manager';
 import { EndpointsService } from '../../../core/endpoints.service';
 import { LoggerService } from '../../../core/logger.service';
-import { UserFavoriteManager } from '../../../core/user-favorite-manager';
-import { EntityCatalogHelpers } from '../../../../../store/src/entity-catalog/entity-catalog.helper';
 
 @Component({
   selector: 'app-home-page',
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 fc31d4b577..72dfa2d0c1 100644
--- a/src/frontend/packages/core/src/features/metrics/metrics.helpers.ts
+++ b/src/frontend/packages/core/src/features/metrics/metrics.helpers.ts
@@ -1,7 +1,8 @@
 import { Observable, of as observableOf } from 'rxjs';
 
-import { StratosStatus } from '../../shared/shared.types';
-import { EndpointIcon, getFullEndpointApiUrl } from '../endpoints/endpoint-helpers';
+import { getFullEndpointApiUrl } from '../../../../store/src/endpoint-utils';
+import { StratosStatus } from '../../../../store/src/types/shared.types';
+import { EndpointIcon } from '../endpoints/endpoint-helpers';
 import { entityCatalog } from './../../../../store/src/entity-catalog/entity-catalog';
 import { MetricsEndpointProvider } from './services/metrics-service';
 
diff --git a/src/frontend/packages/core/src/features/metrics/services/metrics-service.ts b/src/frontend/packages/core/src/features/metrics/services/metrics-service.ts
index 9e9076acea..e9391d7fae 100644
--- a/src/frontend/packages/core/src/features/metrics/services/metrics-service.ts
+++ b/src/frontend/packages/core/src/features/metrics/services/metrics-service.ts
@@ -2,12 +2,11 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map, publishReplay, refCount } from 'rxjs/operators';
 
+import { getFullEndpointApiUrl } from '../../../../../store/src/endpoint-utils';
 import { PaginationMonitor } from '../../../../../store/src/monitors/pagination-monitor';
-import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
+import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
 import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
-import { endpointListKey, EndpointModel } from '../../../../../store/src/types/endpoint.types';
-import { endpointEntitySchema } from '../../../base-entity-schemas';
-import { getFullEndpointApiUrl } from '../../endpoints/endpoint-helpers';
+import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
 
 export interface MetricsEndpointProvider {
   provider: EndpointModel;
@@ -22,14 +21,8 @@ export class MetricsService {
   haveNoMetricsEndpoints$: Observable<boolean>;
   haveNoConnectedMetricsEndpoints$: Observable<boolean>;
 
-  constructor(
-    private paginationMonitorFactory: PaginationMonitorFactory
-  ) {
-    this.endpointsMonitor = this.paginationMonitorFactory.create(
-      endpointListKey,
-      endpointEntitySchema,
-      true
-    );
+  constructor() {
+    this.endpointsMonitor = stratosEntityCatalog.endpoint.store.getPaginationMonitor()
 
     this.setupObservables();
   }
diff --git a/src/frontend/packages/core/src/features/setup/setup.module.ts b/src/frontend/packages/core/src/features/setup/setup.module.ts
index cd9593967a..c730116607 100644
--- a/src/frontend/packages/core/src/features/setup/setup.module.ts
+++ b/src/frontend/packages/core/src/features/setup/setup.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 
+import { ThemeService } from '../../../../store/src/theme.service';
 import { CoreModule } from '../../core/core.module';
-import { ThemeService } from '../../core/theme.service';
 import { SharedModule } from '../../shared/shared.module';
 import { DomainMismatchComponent } from './domain-mismatch/domain-mismatch.component';
 import { LocalAccountWizardComponent } from './local-account-wizard/local-account-wizard.component';
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 54194241ee..75aa2b69bf 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,7 +2,7 @@ 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, tap } from 'rxjs/operators';
+import { delay, first, map, take, tap } from 'rxjs/operators';
 
 import { UserProfileInfo, UserProfileInfoUpdates } from '../../../../../store/src/types/user-profile.types';
 import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
@@ -119,8 +119,7 @@ export class EditProfileInfoComponent implements OnInit, OnDestroy {
         updates[key] = this.editProfileForm.value[key];
       }
     }
-    const obs$ = this.userProfileService.updateProfile(this.profile, updates);
-    return obs$.pipe(
+    return this.userProfileService.updateProfile(this.profile, updates).pipe(
       take(1),
       map(([profileResult, passwordResult]) => {
         const okay = !profileResult.error && !passwordResult.error;
@@ -131,6 +130,7 @@ export class EditProfileInfoComponent implements OnInit, OnDestroy {
           message: okay ? '' : `An error occurred whilst updating your profile: ${message}`
         };
       }),
+      delay(300), // Ensure that the profile is updated before fetching to refresh local copy
       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 d5984a3886..915ecd6aea 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
@@ -6,8 +6,8 @@ import { map } from 'rxjs/operators';
 import { SetPollingEnabledAction, SetSessionTimeoutAction } from '../../../../../store/src/actions/dashboard-actions';
 import { DashboardOnlyAppState } from '../../../../../store/src/app-state';
 import { selectDashboardState } from '../../../../../store/src/selectors/dashboard.selectors';
+import { ThemeService } from '../../../../../store/src/theme.service';
 import { UserProfileInfo } from '../../../../../store/src/types/user-profile.types';
-import { ThemeService } from '../../../core/theme.service';
 import { UserProfileService } from '../../../core/user-profile.service';
 import { UserService } from '../../../core/user.service';
 import { SetGravatarEnabledAction } from './../../../../../store/src/actions/dashboard-actions';
diff --git a/src/frontend/packages/core/misc/custom/index.html b/src/frontend/packages/core/src/index.html
similarity index 95%
rename from src/frontend/packages/core/misc/custom/index.html
rename to src/frontend/packages/core/src/index.html
index b6c415d27c..5756ba3e60 100644
--- a/src/frontend/packages/core/misc/custom/index.html
+++ b/src/frontend/packages/core/src/index.html
@@ -11,7 +11,7 @@
   <meta name="stratos_git_branch" content="@@stratos_git_branch@@">
   <meta name="stratos_git_commit" content="@@stratos_git_commit@@">  
   <meta name="stratos_build_date" content="@@stratos_build_date@@">
-  <link rel="icon" type="image/x-icon" href="core/favicon.ico">
+  <link rel="icon" type="image/x-icon" href="favicon.ico">
   <noscript>
     <style>
       .stratos {
diff --git a/src/frontend/packages/core/src/jetstream.helpers.ts b/src/frontend/packages/core/src/jetstream.helpers.ts
index 1a29978099..7de9c29e1e 100644
--- a/src/frontend/packages/core/src/jetstream.helpers.ts
+++ b/src/frontend/packages/core/src/jetstream.helpers.ts
@@ -1,72 +1,4 @@
 import { HttpErrorResponse } from '@angular/common/http';
 
-/**
- * Actual error response from stratos
- */
-export interface JetStreamErrorResponse<T = any> {
-  error: {
-    status: string;
-    statusCode: number;
-  };
-  /**
-   * Actual response from proxied endpoint
-   */
-  errorResponse: T;
-}
+import { isHttpErrorResponse, JetStreamErrorResponse } from '../../store/src/jetstream';
 
-export function isJetstreamError(err: any): JetStreamErrorResponse {
-  return !!(
-    err &&
-    err.error &&
-    err.error.status &&
-    err.error.statusCode &&
-    'errorResponse' in err
-  ) ? err as JetStreamErrorResponse : null;
-}
-
-// TODO It would be nice if the BE could return a unique para for us to check for. #3827
-// There is always a chance that this will return a false positive (more so with extensions).
-export function hasJetStreamError(pages: Partial<JetStreamErrorResponse>[]): JetStreamErrorResponse {
-  if (!pages || !pages.length) {
-    return null;
-  }
-  return pages.find(page => {
-    return isJetstreamError(page);
-  }) as JetStreamErrorResponse;
-}
-
-export function jetStreamErrorResponseToSafeString(response: JetStreamErrorResponse): string {
-  return response.error && response.error.status && response.error.statusCode ?
-    `${response.error.status}. Status Code ${response.error.statusCode}` :
-    null;
-}
-
-export function isHttpErrorResponse(obj: any): HttpErrorResponse {
-  const props = Object.keys(obj);
-  return (
-    props.indexOf('error') >= 0 &&
-    props.indexOf('headers') >= 0 &&
-    props.indexOf('ok') >= 0 &&
-    props.indexOf('status') >= 0 &&
-    props.indexOf('statusText') >= 0 &&
-    props.indexOf('url') >= 0
-  ) ? 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/frontend/packages/core/src/public-api.ts b/src/frontend/packages/core/src/public-api.ts
new file mode 100644
index 0000000000..7da417a02d
--- /dev/null
+++ b/src/frontend/packages/core/src/public-api.ts
@@ -0,0 +1,19 @@
+/*
+ * Public API Surface of core
+ */
+
+// export * from './app.module';
+
+// Extensions
+export * from './core/extension/extension-service';
+
+// Customization
+export * from './core/customizations.types';
+
+// Modules
+export * from './core/core.module';
+export * from './core/md.module';
+export * from './shared/shared.module';
+
+// LoginPageComponent
+export { LoginPageComponent } from './features/login/login-page/login-page.component';
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component.spec.ts b/src/frontend/packages/core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component.spec.ts
index d5e18bd988..571f14e1ee 100644
--- a/src/frontend/packages/core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { endpointEntityType, stratosEntityFactory } from '../../../../../store/src/helpers/stratos-entity-factory';
 import { BaseTestModules } from '../../../../test-framework/core-test.helper';
-import { endpointEntitySchema } from '../../../base-entity-schemas';
 import { AppActionMonitorIconComponent } from './app-action-monitor-icon.component';
 
 describe('AppActionMonitorIconComponent', () => {
@@ -21,7 +21,7 @@ describe('AppActionMonitorIconComponent', () => {
     fixture = TestBed.createComponent(AppActionMonitorIconComponent);
     component = fixture.componentInstance;
     component.id = '1';
-    component.schema = endpointEntitySchema;
+    component.schema = stratosEntityFactory(endpointEntityType);
     fixture.detectChanges();
   });
 
diff --git a/src/frontend/packages/core/src/shared/components/application-state/application-state-icon/application-state-icon.component.ts b/src/frontend/packages/core/src/shared/components/application-state/application-state-icon/application-state-icon.component.ts
index 0172efd67e..32c02fe9ca 100644
--- a/src/frontend/packages/core/src/shared/components/application-state/application-state-icon/application-state-icon.component.ts
+++ b/src/frontend/packages/core/src/shared/components/application-state/application-state-icon/application-state-icon.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 
-import { StratosStatus } from '../../../shared.types';
+import { StratosStatus } from '../../../../../../store/src/types/shared.types';
 
 
 @Component({
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..635c090751 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,7 +2,7 @@ import { Component, Input, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 
-import { StratosStatus, StratosStatusMetadata } from '../../shared.types';
+import { StratosStatus, StratosStatusMetadata } from '../../../../../store/src/types/shared.types';
 
 @Component({
   selector: 'app-application-state',
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 ca4bfcbc57..f0170d28b4 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
@@ -4,8 +4,8 @@ import { BehaviorSubject } from 'rxjs';
 
 import { RouterNav } from '../../../../../../store/src/actions/router.actions';
 import { AppState } from '../../../../../../store/src/app-state';
+import { StratosStatus } from '../../../../../../store/src/types/shared.types';
 import { UtilsService } from '../../../../core/utils.service';
-import { StratosStatus } from '../../../shared.types';
 import { determineCardStatus } from '../card-status/card-status.component';
 
 @Component({
diff --git a/src/frontend/packages/core/src/shared/components/cards/card-status/card-status.component.ts b/src/frontend/packages/core/src/shared/components/cards/card-status/card-status.component.ts
index 7fa6a0607c..eb41e0c7b0 100644
--- a/src/frontend/packages/core/src/shared/components/cards/card-status/card-status.component.ts
+++ b/src/frontend/packages/core/src/shared/components/cards/card-status/card-status.component.ts
@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 import { Observable } from 'rxjs';
 
-import { StratosStatus } from '../../../shared.types';
+import { StratosStatus } from '../../../../../../store/src/types/shared.types';
 
 
 export function determineCardStatus(value: number, limit: number): StratosStatus {
diff --git a/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts b/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts
index d0ea51b21d..06800db5f3 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts
+++ b/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts
@@ -2,8 +2,8 @@ import { Component, Input, OnInit } from '@angular/core';
 import { combineLatest, Observable, ReplaySubject, Subject } from 'rxjs';
 import { distinctUntilChanged, map, scan, startWith } from 'rxjs/operators';
 
-import { IFavoriteEntity } from '../../../core/user-favorite-manager';
-import { FavoritesConfigMapper, IFavoriteTypes } from '../favorites-meta-card/favorite-config-mapper';
+import { FavoritesConfigMapper, IFavoriteTypes } from '../../../../../store/src/favorite-config-mapper';
+import { IFavoriteEntity } from '../../../../../store/src/types/user-favorite-manager.types';
 
 
 @Component({
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 ffd96652f0..f8313df5a2 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
@@ -5,12 +5,9 @@ import { map } from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
 import { getFavoriteInfoObservable } from '../../../../../store/src/helpers/store-helpers';
-import {
-  IFavoriteEntity,
-  IFavoritesInfo,
-  IGroupedFavorites,
-  UserFavoriteManager,
-} from '../../../core/user-favorite-manager';
+import { IFavoriteEntity, IGroupedFavorites } from '../../../../../store/src/types/user-favorite-manager.types';
+import { IFavoritesInfo } from '../../../../../store/src/types/user-favorites.types';
+import { UserFavoriteManager } from '../../../../../store/src/user-favorite-manager';
 
 
 @Component({
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 e95dea1c1a..40d15028a1 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
@@ -1,23 +1,18 @@
 import { Component, Input } from '@angular/core';
-import { Store } from '@ngrx/store';
 import { isObservable, Observable, of as observableOf } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import {
-  RemoveUserFavoriteAction,
-} from '../../../../../store/src/actions/user-favourites-actions/remove-user-favorite-action';
-import { AppState } from '../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
-import { endpointEntitiesSelector } from '../../../../../store/src/selectors/endpoint.selectors';
+import { IFavoritesMetaCardConfig } from '../../../../../store/src/favorite-config-mapper';
+import { stratosEntityFactory, userFavouritesEntityType } from '../../../../../store/src/helpers/stratos-entity-factory';
+import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
+import { MenuItem } from '../../../../../store/src/types/menu-item.types';
+import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../store/src/types/shared.types';
+import { IFavoriteEntity } from '../../../../../store/src/types/user-favorite-manager.types';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../store/src/types/user-favorites.types';
-import { userFavoritesEntitySchema } from '../../../base-entity-schemas';
-import { IFavoriteEntity } from '../../../core/user-favorite-manager';
 import { isEndpointConnected } from '../../../features/endpoints/connect.service';
-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 { IFavoritesMetaCardConfig } from './favorite-config-mapper';
 
 
 @Component({
@@ -64,7 +59,7 @@ export class FavoritesMetaCardComponent {
   public endpointConnected$: Observable<boolean>;
   public name$: Observable<string>;
   public routerLink$: Observable<string>;
-  public actions$: Observable<MetaCardMenuItem[]>;
+  public actions$: Observable<MenuItem[]>;
 
   // Optional icon for the favorite
   public iconUrl$: Observable<string>;
@@ -72,9 +67,7 @@ export class FavoritesMetaCardComponent {
   @Input()
   set favoriteEntity(favoriteEntity: IFavoriteEntity) {
     if (!this.placeholder && favoriteEntity) {
-      const endpoint$ = this.store.select(endpointEntitiesSelector).pipe(
-        map(endpoints => endpoints[favoriteEntity.favorite.endpointId])
-      );
+      const endpoint$ = stratosEntityCatalog.endpoint.store.getEntityMonitor(favoriteEntity.favorite.endpointId).entity$;
       this.endpointConnected$ = endpoint$.pipe(map(endpoint => isEndpointConnected(endpoint)));
       this.actions$ = this.endpointConnected$.pipe(
         map(connected => connected ? this.config.menuItems : [])
@@ -83,7 +76,7 @@ export class FavoritesMetaCardComponent {
       this.favorite = favorite;
       this.metaFavorite = !this.endpoint || (this.endpoint && !this.endpointHasEntities) ? favorite : null;
       this.prettyName = prettyName || 'Unknown';
-      this.entityConfig = new ComponentEntityMonitorConfig(favorite.guid, userFavoritesEntitySchema);
+      this.entityConfig = new ComponentEntityMonitorConfig(favorite.guid, stratosEntityFactory(userFavouritesEntityType));
 
       // If this favorite is an endpoint, lookup the image for it from the entitiy catalog
       if (this.favorite.entityType === 'endpoint') {
@@ -113,7 +106,6 @@ export class FavoritesMetaCardComponent {
   }
 
   constructor(
-    private store: Store<AppState>,
     private confirmDialog: ConfirmationDialogService
   ) { }
 
@@ -131,7 +123,7 @@ export class FavoritesMetaCardComponent {
   }
 
   private removeFavorite = () => {
-    this.store.dispatch(new RemoveUserFavoriteAction(this.favorite));
+    stratosEntityCatalog.userFavorite.api.delete(this.favorite);
   }
 
   public toggleMoreError() {
diff --git a/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.ts b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.ts
index 91583e2005..513619c72b 100644
--- a/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.ts
+++ b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.ts
@@ -122,4 +122,4 @@ export class JsonViewerComponent implements OnChanges {
 
     return segment;
   }
-}
\ No newline at end of file
+}
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 b1fdfc75c7..16ea225294 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
@@ -31,6 +31,7 @@ import { IgnorePaginationMaxedState, SetResultCount } from '../../../../../../st
 import { AppState } from '../../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
 import { EntitySchema } from '../../../../../../store/src/helpers/entity-schema';
+import { LocalPaginationHelpers } from '../../../../../../store/src/helpers/local-list.helpers';
 import { PaginationMonitor } from '../../../../../../store/src/monitors/pagination-monitor';
 import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { PaginatedAction, PaginationEntityState, PaginationParam } from '../../../../../../store/src/types/pagination.types';
@@ -46,7 +47,6 @@ import {
 } from './list-data-source-types';
 import { getDataFunctionList } from './local-filtering-sorting';
 import { LocalListController } from './local-list-controller';
-import { LocalPaginationHelpers } from './local-list.helpers';
 
 export type DataFunctionDefinitionType = 'sort' | 'filter';
 
diff --git a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts
index bb0fb7391f..2d53920886 100644
--- a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts
+++ b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list-controller.ts
@@ -2,10 +2,10 @@ import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import { tag } from 'rxjs-spy/operators/tag';
 import { distinctUntilChanged, map, publishReplay, refCount, switchMap, tap } from 'rxjs/operators';
 
+import { LocalPaginationHelpers } from '../../../../../../store/src/helpers/local-list.helpers';
 import { PaginationEntityState } from '../../../../../../store/src/types/pagination.types';
 import { DataFunction } from './list-data-source';
 import { splitCurrentPage } from './local-list-controller.helpers';
-import { LocalPaginationHelpers } from './local-list.helpers';
 
 export class LocalListController<T = any> {
   public page$: Observable<T[]>;
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 ed7de6c1dd..2ccb12a2be 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
@@ -5,15 +5,15 @@ import { StoreModule } from '@ngrx/store';
 import { createBasicStoreModule } from '@stratosui/store/testing';
 import { Observable, of } from 'rxjs';
 
+import { FavoritesConfigMapper } from '../../../../../../../../store/src/favorite-config-mapper';
 import { EntitySchema } from '../../../../../../../../store/src/helpers/entity-schema';
 import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
+import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../../../../store/src/types/shared.types';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
+import * as favoriteHelpers from '../../../../../../../../store/src/user-favorite-helpers';
+import { UserFavoriteManager } from '../../../../../../../../store/src/user-favorite-manager';
 import { CoreTestingModule } from '../../../../../../../test-framework/core-test.modules';
-import * as favoriteHelpers from '../../../../../../core/user-favorite-helpers';
-import { UserFavoriteManager } from '../../../../../../core/user-favorite-manager';
 import { SharedModule } from '../../../../../shared.module';
-import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../shared.types';
-import { FavoritesConfigMapper } from '../../../../favorites-meta-card/favorite-config-mapper';
 import { MetaCardComponent } from './meta-card.component';
 
 @Component({
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 0aec42062f..59a95244d6 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,25 +2,17 @@ import { Component, ContentChild, ContentChildren, Input, OnDestroy, QueryList }
 import { combineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
 import { first, map, tap } from 'rxjs/operators';
 
+import { FavoritesConfigMapper } from '../../../../../../../../store/src/favorite-config-mapper';
 import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
+import { MenuItem } from '../../../../../../../../store/src/types/menu-item.types';
+import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../../../../store/src/types/shared.types';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
-import { getFavoriteFromEntity } from '../../../../../../core/user-favorite-helpers';
+import { getFavoriteFromEntity } from '../../../../../../../../store/src/user-favorite-helpers';
 import { safeUnsubscribe } from '../../../../../../core/utils.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';
 import { MetaCardTitleComponent } from '../meta-card-title/meta-card-title.component';
 
 
-export interface MetaCardMenuItem {
-  icon?: string;
-  label: string;
-  action: () => void;
-  can?: Observable<boolean>;
-  disabled?: Observable<boolean>;
-  separator?: boolean;
-}
-
 export function createMetaCardMenuItemSeparator() {
   return {
     label: '-',
@@ -89,7 +81,7 @@ export class MetaCardComponent implements OnDestroy {
   }
 
   @Input('actionMenu')
-  set actionMenu(actionMenu: MetaCardMenuItem[]) {
+  set actionMenu(actionMenu: MenuItem[]) {
     if (actionMenu) {
       this.pActionMenu = actionMenu.map(menuItem => {
         if (!menuItem.can) {
@@ -107,7 +99,7 @@ export class MetaCardComponent implements OnDestroy {
       );
     }
   }
-  get actionMenu(): MetaCardMenuItem[] {
+  get actionMenu(): MenuItem[] {
     return this.pActionMenu;
   }
 
@@ -115,7 +107,7 @@ export class MetaCardComponent implements OnDestroy {
 
   public showMenu$: Observable<boolean>;
   public isDeleting$: Observable<boolean> = observableOf(false);
-  private pActionMenu: MetaCardMenuItem[];
+  private pActionMenu: MenuItem[];
 
   constructor(
     private entityMonitorFactory: EntityMonitorFactory,
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-favorite/table-cell-favorite.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-favorite/table-cell-favorite.component.ts
index 93f89e58de..cb239478f9 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-favorite/table-cell-favorite.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-favorite/table-cell-favorite.component.ts
@@ -1,9 +1,9 @@
 import { Component, Input } from '@angular/core';
 
+import { FavoritesConfigMapper } from '../../../../../../../store/src/favorite-config-mapper';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../../../store/src/types/user-favorites.types';
 import { TableCellCustom } from '../../list.types';
 import { ITableColumn } from '../table.types';
-import { FavoritesConfigMapper } from '../../../favorites-meta-card/favorite-config-mapper';
 
 export interface TableCellFavoriteComponentConfig<T, Y extends IFavoriteMetadata> {
   createUserFavorite: (entity: T) => UserFavorite<Y>;
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-request-monitor-icon/table-cell-request-monitor-icon.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-request-monitor-icon/table-cell-request-monitor-icon.component.spec.ts
index 04cb6b4ce1..8dac64962b 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-request-monitor-icon/table-cell-request-monitor-icon.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-request-monitor-icon/table-cell-request-monitor-icon.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { endpointEntityType, stratosEntityFactory } from '../../../../../../../store/src/helpers/stratos-entity-factory';
 import { BaseTestModules } from '../../../../../../test-framework/core-test.helper';
-import { endpointEntitySchema } from '../../../../../base-entity-schemas';
 import { AppMonitorComponentTypes } from '../../../app-action-monitor-icon/app-action-monitor-icon.component';
 import { TableCellRequestMonitorIconComponent } from './table-cell-request-monitor-icon.component';
 
@@ -24,7 +24,7 @@ describe('TableCellRequestMonitorIconComponent', () => {
     component.id = '1';
     component.config = () => ({
       entityKey: '',
-      schema: endpointEntitySchema,
+      schema: stratosEntityFactory(endpointEntityType),
       monitorState: AppMonitorComponentTypes.DELETE
     });
     component.row = {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source.ts
index 7f420a1f8c..afacea4130 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source.ts
@@ -5,14 +5,14 @@ import { map, pairwise, tap, withLatestFrom } from 'rxjs/operators';
 import { GetAllEndpoints } from '../../../../../../../store/src/actions/endpoint.actions';
 import { CreatePagination } from '../../../../../../../store/src/actions/pagination.actions';
 import { AppState } from '../../../../../../../store/src/app-state';
-import { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../../../store/src/helpers/stratos-entity-factory';
 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 { endpointEntitiesSelector } from '../../../../../../../store/src/selectors/endpoint.selectors';
 import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
-import { endpointEntitySchema } from '../../../../../base-entity-schemas';
-import { DataFunctionDefinition, ListDataSource } from '../../data-sources-controllers/list-data-source';
+import { ListDataSource } from '../../data-sources-controllers/list-data-source';
+import { IListDataSourceConfig } from '../../data-sources-controllers/list-data-source-config';
 import { RowsState } from '../../data-sources-controllers/list-data-source-types';
 import { TableRowStateManager } from '../../list-table/table-row/table-row-state-manager';
 import { IListConfig } from '../../list.component.types';
@@ -55,7 +55,7 @@ export class BaseEndpointsDataSource extends ListDataSource<EndpointModel> {
     const { rowStateManager, sub } = rowStateHelper.getRowStateManager(
       paginationMonitorFactory,
       entityMonitorFactory,
-      GetAllEndpoints.storeKey,
+      action.paginationKey,
       action,
       EndpointRowStateSetUpManager,
       false
@@ -99,26 +99,26 @@ export class BaseEndpointsDataSource extends ListDataSource<EndpointModel> {
     rowsState: Observable<RowsState>,
     destroy: () => void,
     refresh: () => void
-  ) {
+  ): IListDataSourceConfig<EndpointModel, EndpointModel> {
     return {
       store,
       action,
-      schema: endpointEntitySchema,
-      getRowUniqueId: object => object.guid,
+      schema: action.entity[0],
+      getRowUniqueId: (object) => action.entity[0].getId(object),
       getEmptyType: () => ({
         name: '',
         system_shared_token: false,
         metricsAvailable: false,
         sso_allowed: false,
       }),
-      paginationKey: GetAllEndpoints.storeKey,
+      paginationKey: action.paginationKey,
       isLocal: true,
       transformEntities: [
         {
           type: 'filter',
           field: 'name'
         },
-      ] as DataFunctionDefinition[],
+      ],
       listConfig,
       rowsState,
       destroy,
@@ -130,7 +130,7 @@ export class BaseEndpointsDataSource extends ListDataSource<EndpointModel> {
     rowStateManager: TableRowStateManager,
     store: Store<AppState>
   ) {
-    const eventMonitor = internalEventMonitorFactory.getMonitor(endpointSchemaKey);
+    const eventMonitor = internalEventMonitorFactory.getMonitor(endpointEntityType);
     return eventMonitor.hasErroredOverTime().pipe(
       withLatestFrom(store.select(endpointEntitiesSelector)),
       tap(([errored, endpoints]) => Object.keys(errored).forEach(id => {
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 581680cd4f..dfdd1548a2 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
@@ -9,28 +9,23 @@ import {
   ViewContainerRef,
 } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { CurrentUserPermissionsService } from 'frontend/packages/core/src/core/permissions/current-user-permissions.service';
 import { AppState } from 'frontend/packages/store/src/app-state';
 import { Observable, of, ReplaySubject, Subscription } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 
+import { getFullEndpointApiUrl } from '../../../../../../../../store/src/endpoint-utils';
 import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog';
 import {
   StratosCatalogEndpointEntity,
 } from '../../../../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { FavoritesConfigMapper } from '../../../../../../../../store/src/favorite-config-mapper';
 import { EndpointModel } from '../../../../../../../../store/src/types/endpoint.types';
+import { MenuItem } from '../../../../../../../../store/src/types/menu-item.types';
+import { StratosStatus } from '../../../../../../../../store/src/types/shared.types';
 import { UserFavoriteEndpoint } from '../../../../../../../../store/src/types/user-favorites.types';
 import { safeUnsubscribe } from '../../../../../../core/utils.service';
-import {
-  coreEndpointListDetailsComponents,
-  getFullEndpointApiUrl,
-} from '../../../../../../features/endpoints/endpoint-helpers';
-import { StratosStatus } from '../../../../../shared.types';
-import { FavoritesConfigMapper } from '../../../../favorites-meta-card/favorite-config-mapper';
-import {
-  createMetaCardMenuItemSeparator,
-  MetaCardMenuItem,
-} from '../../../list-cards/meta-card/meta-card-base/meta-card.component';
+import { coreEndpointListDetailsComponents } from '../../../../../../features/endpoints/endpoint-helpers';
+import { createMetaCardMenuItemSeparator } from '../../../list-cards/meta-card/meta-card-base/meta-card.component';
 import { CardCell } from '../../../list.types';
 import { BaseEndpointsDataSource } from '../base-endpoints-data-source';
 import { EndpointListDetailsComponent, EndpointListHelper } from '../endpoint-list.helpers';
@@ -48,7 +43,7 @@ export class EndpointCardComponent extends CardCell<EndpointModel> implements On
   public rowObs = new ReplaySubject<EndpointModel>();
   public favorite: UserFavoriteEndpoint;
   public address: string;
-  public cardMenu: MetaCardMenuItem[];
+  public cardMenu: MenuItem[];
   public endpointCatalogEntity: StratosCatalogEndpointEntity;
   public hasDetails = true;
   public endpointLink: string = null;
@@ -126,7 +121,6 @@ export class EndpointCardComponent extends CardCell<EndpointModel> implements On
     private endpointListHelper: EndpointListHelper,
     private componentFactoryResolver: ComponentFactoryResolver,
     private favoritesConfigMapper: FavoritesConfigMapper,
-    private currentUserPermissionsService: CurrentUserPermissionsService,
   ) {
     super();
     this.endpointIds$ = this.endpointIds.asObservable();
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-data-source.helpers.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-data-source.helpers.ts
index 3c9cc0c03e..e5862804f9 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-data-source.helpers.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-data-source.helpers.ts
@@ -1,12 +1,12 @@
-
 import { combineLatest } from 'rxjs';
 import { distinctUntilChanged, map, mergeMap, switchMap, tap } from 'rxjs/operators';
 
+import { DisconnectEndpoint } from '../../../../../../../store/src/actions/endpoint.actions';
 import { EntityMonitorFactory } from '../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitor } from '../../../../../../../store/src/monitors/pagination-monitor';
-import { TableRowStateManager } from '../../list-table/table-row/table-row-state-manager';
 import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
-import { EndpointsEffect } from '../../../../../../../store/src/effects/endpoint.effects';
+import { TableRowStateManager } from '../../list-table/table-row/table-row-state-manager';
+
 
 export function EndpointRowStateSetUpManager(
   paginationMonitor: PaginationMonitor<EndpointModel>,
@@ -21,7 +21,7 @@ export function EndpointRowStateSetUpManager(
           .create(entity.guid, paginationMonitor.entityConfig);
         const request$ = entityMonitor.entityRequest$.pipe(
           map(request => {
-            const disconnect = request.updating[EndpointsEffect.disconnectingKey] || { busy: false };
+            const disconnect = request.updating[DisconnectEndpoint.UpdatingKey] || { busy: false };
             const unregister = request.deleting || { busy: false };
             const busy = disconnect.busy || unregister.busy;
             const blocked = unregister.busy;
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 b621bc2513..e1ebaabf50 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,23 +4,19 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable } from 'rxjs';
 import { map, pairwise } from 'rxjs/operators';
 
-import { DisconnectEndpoint, UnregisterEndpoint } from '../../../../../../../store/src/actions/endpoint.actions';
 import { RouterNav } from '../../../../../../../store/src/actions/router.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';
-import { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
-import { selectDeletionInfo, selectUpdateInfo } from '../../../../../../../store/src/selectors/api.selectors';
+import { ActionState } from '../../../../../../../store/src/reducers/api-request-reducer/types';
+import { stratosEntityCatalog } from '../../../../../../../store/src/stratos-entity-catalog';
 import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
-import { STRATOS_ENDPOINT_TYPE } from '../../../../../base-entity-schemas';
 import { LoggerService } from '../../../../../core/logger.service';
 import { CurrentUserPermissionsService } from '../../../../../core/permissions/current-user-permissions.service';
 import { StratosCurrentUserPermissions } from '../../../../../core/permissions/stratos-user-permissions.checker';
 import {
   ConnectEndpointDialogComponent,
 } from '../../../../../features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component';
+import { SnackBarService } from '../../../../services/snackbar.service';
 import { ConfirmationDialogConfig } from '../../../confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../confirmation-dialog.service';
 import { IListAction } from '../../list.component.types';
@@ -43,13 +39,13 @@ function isEndpointListDetailsComponent(obj: any): EndpointListDetailsComponent
 
 @Injectable()
 export class EndpointListHelper {
-  private endpointEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointSchemaKey);
   constructor(
     private store: Store<AppState>,
     private dialog: MatDialog,
     private currentUserPermissionsService: CurrentUserPermissionsService,
     private confirmDialog: ConfirmationDialogService,
     private log: LoggerService,
+    private snackBarService: SnackBarService,
   ) { }
 
   endpointActions(): IListAction<EndpointModel>[] {
@@ -63,10 +59,10 @@ export class EndpointListHelper {
             false
           );
           this.confirmDialog.open(confirmation, () => {
-            this.store.dispatch(new DisconnectEndpoint(item.guid, item.cnsi_type));
-            this.handleUpdateAction(item, EndpointsEffect.disconnectingKey, ([oldVal, newVal]) => {
-              this.store.dispatch(new ShowSnackBar(`Disconnected endpoint '${item.name}'`));
-              this.store.dispatch(new GetSystemInfo());
+            const obs$ = stratosEntityCatalog.endpoint.api.disconnect<ActionState>(item.guid, item.cnsi_type);
+            this.handleAction(obs$, () => {
+              this.snackBarService.show(`Disconnected endpoint '${item.name}'`);
+              stratosEntityCatalog.systemInfo.api.getSystemInfo();
             });
           });
         },
@@ -112,9 +108,9 @@ export class EndpointListHelper {
             true
           );
           this.confirmDialog.open(confirmation, () => {
-            this.store.dispatch(new UnregisterEndpoint(item.guid, item.cnsi_type));
-            this.handleDeleteAction(item, ([oldVal, newVal]) => {
-              this.store.dispatch(new ShowSnackBar(`Unregistered ${item.name}`));
+            const obs$ = stratosEntityCatalog.endpoint.api.unregister<ActionState>(item.guid, item.cnsi_type);
+            this.handleAction(obs$, () => {
+              this.snackBarService.show(`Unregistered ${item.name}`);
             });
           });
         },
@@ -134,31 +130,16 @@ export class EndpointListHelper {
     ];
   }
 
-  private handleUpdateAction(item, effectKey, handleChange) {
-    this.handleAction(selectUpdateInfo(
-      this.endpointEntityKey,
-      item.guid,
-      effectKey,
-    ), handleChange);
-  }
-
-  private handleDeleteAction(item, handleChange) {
-    this.handleAction(selectDeletionInfo(
-      this.endpointEntityKey,
-      item.guid,
-    ), handleChange);
-  }
-
-  private handleAction(storeSelect, handleChange) {
-    const disSub = this.store.select(storeSelect).pipe(
-      pairwise())
-      .subscribe(([oldVal, newVal]) => {
-        // https://github.com/SUSE/stratos/issues/29 Generic way to handle errors ('Failed to disconnect X')
-        if (!newVal.error && (oldVal.busy && !newVal.busy)) {
-          handleChange([oldVal, newVal]);
-          disSub.unsubscribe();
-        }
-      });
+  private handleAction(obs$: Observable<ActionState>, handleChange: ([o, n]: [ActionState, ActionState]) => void) {
+    const disSub = obs$.pipe(
+      pairwise()
+    ).subscribe(([oldVal, newVal]) => {
+      // https://github.com/SUSE/stratos/issues/29 Generic way to handle errors ('Failed to disconnect X')
+      if (!newVal.error && (oldVal.busy && !newVal.busy)) {
+        handleChange([oldVal, newVal]);
+        disSub.unsubscribe();
+      }
+    });
   }
 
   createEndpointDetails(listDetailsComponent: any, container: ViewContainerRef, componentFactoryResolver: ComponentFactoryResolver):
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 1f2999e41b..cdb066f099 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,10 +1,10 @@
 import { Store } from '@ngrx/store';
 
-import { GetAllEndpoints } from '../../../../../../../store/src/actions/endpoint.actions';
 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 { stratosEntityCatalog } from '../../../../../../../store/src/stratos-entity-catalog';
 import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
 import { IListConfig } from '../../list.component.types';
 import { BaseEndpointsDataSource } from './base-endpoints-data-source';
@@ -23,7 +23,7 @@ export class EndpointsDataSource extends BaseEndpointsDataSource {
     super(
       store,
       listConfig,
-      new GetAllEndpoints(),
+      stratosEntityCatalog.endpoint.actions.getAll(),
       null,
       paginationMonitorFactory,
       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 1848861dae..0f091dbd85 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
@@ -5,11 +5,11 @@ import { filter } from 'rxjs/operators';
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
 import { AppState } from '../../../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
+import { FavoritesConfigMapper } from '../../../../../../../store/src/favorite-config-mapper';
 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 { 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';
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component.ts
index 32956ffa4b..0eb0e7d08b 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-address/table-cell-endpoint-address.component.ts
@@ -2,10 +2,9 @@ import { Component, Input } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { GetAllEndpoints } from '../../../../../../../../store/src/actions/endpoint.actions';
-import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
+import { getFullEndpointApiUrl } from '../../../../../../../../store/src/endpoint-utils';
+import { stratosEntityCatalog } from '../../../../../../../../store/src/stratos-entity-catalog';
 import { EndpointModel } from '../../../../../../../../store/src/types/endpoint.types';
-import { getFullEndpointApiUrl } from '../../../../../../features/endpoints/endpoint-helpers';
 import { TableCellCustom } from '../../../list.types';
 import { RowWithEndpointId } from '../table-cell-endpoint-name/table-cell-endpoint-name.component';
 
@@ -17,15 +16,11 @@ import { RowWithEndpointId } from '../table-cell-endpoint-name/table-cell-endpoi
 export class TableCellEndpointAddressComponent extends TableCellCustom<EndpointModel | RowWithEndpointId>  {
   public endpointAddress$: Observable<any>;
 
-  constructor(private entityServiceFactory: EntityServiceFactory) {
-    super();
-  }
-
   @Input('row')
   set row(row: EndpointModel | RowWithEndpointId) {
     /* tslint:disable-next-line:no-string-literal */
     const id = row['endpointId'] || row['guid'];
-    this.endpointAddress$ = this.entityServiceFactory.create(id, new GetAllEndpoints()).waitForEntity$.pipe(
+    this.endpointAddress$ = stratosEntityCatalog.endpoint.store.getEntityService(id).waitForEntity$.pipe(
       map(data => data.entity),
       map((data: any) => getFullEndpointApiUrl(data))
     );
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 02c3cb866a..6813bb19d8 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
@@ -26,7 +26,9 @@ describe('TableCellEndpointNameComponent', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(TableCellEndpointNameComponent);
     component = fixture.componentInstance;
-    component.row = {} as EndpointModel;
+    component.row = {
+      guid: ''
+    } as EndpointModel;
     fixture.detectChanges();
   });
 
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 62928cef55..d3c9c5940a 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
@@ -1,10 +1,10 @@
 import { Component, Input } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/internal/operators/map';
+import { filter } from 'rxjs/operators';
 
-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 { stratosEntityCatalog } from '../../../../../../../../store/src/stratos-entity-catalog';
 import { EndpointModel } from '../../../../../../../../store/src/types/endpoint.types';
 import { EndpointsService } from '../../../../../../core/endpoints.service';
 import { TableCellCustom } from '../../../list.types';
@@ -22,27 +22,19 @@ export class TableCellEndpointNameComponent extends TableCellCustom<EndpointMode
 
   public endpoint$: Observable<any>;
 
-  constructor(
-    private entityServiceFactory: EntityServiceFactory,
-
-  ) {
-    super();
-  }
-
   @Input('row')
   set row(row: EndpointModel | RowWithEndpointId) {
     /* tslint:disable-next-line:no-string-literal */
     const id = row['endpointId'] || row['guid'];
-    this.endpoint$ = this.entityServiceFactory.create(
-      id,
-      new GetAllEndpoints()
-    ).waitForEntity$.pipe(
-      map(data => data.entity),
-      map((data: any) => {
+    this.endpoint$ = stratosEntityCatalog.endpoint.store.getEntityMonitor(id).entity$.pipe(
+      filter(data => !!data),
+      map(data => {
         const ep = entityCatalog.getEndpoint(data.cnsi_type, data.sub_type).definition;
-        data.canShowLink = data.connectionStatus === 'connected' || ep.unConnectable;
-        data.link = EndpointsService.getLinkForEndpoint(data);
-        return data;
+        return {
+          ...data,
+          canShowLink: data.connectionStatus === 'connected' || ep.unConnectable,
+          link: EndpointsService.getLinkForEndpoint(data)
+        };
       })
     );
   }
diff --git a/src/frontend/packages/core/src/shared/components/metrics-parent-range-selector/metrics-parent-range-selector.component.ts b/src/frontend/packages/core/src/shared/components/metrics-parent-range-selector/metrics-parent-range-selector.component.ts
index 9c5dec430a..016031c362 100644
--- a/src/frontend/packages/core/src/shared/components/metrics-parent-range-selector/metrics-parent-range-selector.component.ts
+++ b/src/frontend/packages/core/src/shared/components/metrics-parent-range-selector/metrics-parent-range-selector.component.ts
@@ -1,10 +1,10 @@
 import { AfterContentInit, Component, ContentChildren, OnDestroy, QueryList } from '@angular/core';
 import { Subscription } from 'rxjs';
 
-import { IMetrics } from '../../../../../store/src/types/base-metric.types';
 import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
+import { IMetrics } from '../../../../../store/src/types/base-metric.types';
+import { MetricQueryType } from '../../../../../store/src/types/metric.types';
 import { MetricsRangeSelectorManagerService } from '../../services/metrics-range-selector-manager.service';
-import { MetricQueryType } from '../../services/metrics-range-selector.types';
 import { MetricsChartComponent } from '../metrics-chart/metrics-chart.component';
 
 @Component({
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 d485087726..1fab0c74fc 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
@@ -6,8 +6,9 @@ import { MetricsAction } from '../../../../../store/src/actions/metrics.actions'
 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 { MetricQueryType } from '../../../../../store/src/types/metric.types';
 import { MetricsRangeSelectorManagerService } from '../../services/metrics-range-selector-manager.service';
-import { ITimeRange, MetricQueryType } from '../../services/metrics-range-selector.types';
+import { ITimeRange } from '../../services/metrics-range-selector.types';
 
 @Component({
   selector: 'app-metrics-range-selector',
diff --git a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.html b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.html
index 84b796dbea..387c40e4ba 100644
--- a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.html
+++ b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.html
@@ -3,7 +3,7 @@
     <div class="page-header__inner">
       <div class="page-header">
         <div>
-          <mat-toolbar class="page-header__toolbar" color="primary">
+          <mat-toolbar class="page-header__toolbar">
             <div *ngIf="isMobile$ | async" class="page-header__nav-toggle-wrapper">
               <button mat-icon-button *ngIf="!hideSideNavButton" (click)="toggleSidenav()">
                 <mat-icon class="page-header__nav-toggle">menu</mat-icon>
diff --git a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss
index c4d38813bd..1ee29645e9 100644
--- a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss
@@ -12,6 +12,11 @@
   $menu-background-color: mat-color($background, card);
   $is-dark: map-get($theme, is-dark);
   $username-background: $menu-background-color;
+  $header-background: map-get($app-theme, header-background-color);
+  $header-foreground: map-get($app-theme, header-foreground-color);
+  $underflow-background: map-get($app-theme, underflow-background-color);
+  $underflow-foreground: map-get($app-theme, underflow-foreground-color);
+
   @if $is-dark == true {
     $username-background: lighten($menu-background-color, 5%);
   } @else {
@@ -20,6 +25,10 @@
   $username-color: mat-color($foreground, text);
 
   .page-header {
+    &__toolbar {
+      background-color: $header-background;
+      color: $header-foreground;
+    }
     &__warning-count {
       background-color: mat-color($primary);
       color: mat-contrast($primary, 500);
@@ -34,7 +43,8 @@
       color: $subdued;
     }
     &__underflow {
-      background-color: mat-color($primary);
+      background-color: $underflow-background;
+      color: $underflow-foreground;
     }
     &__divider {
       color: mat-contrast($primary, 500);
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 ce65f784ba..6e836e74b3 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
@@ -10,15 +10,15 @@ import { ToggleSideNav } from '../../../../../store/src/actions/dashboard-action
 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 { FavoritesConfigMapper } from '../../../../../store/src/favorite-config-mapper';
 import { selectIsMobile } from '../../../../../store/src/selectors/dashboard.selectors';
 import { InternalEventSeverity } from '../../../../../store/src/types/internal-events.types';
+import { StratosStatus } from '../../../../../store/src/types/shared.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 { 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';
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 fcd86c1dc6..86af699f5c 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
@@ -5,7 +5,7 @@ import { Observable, of as observableOf } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
-import { endpointSchemaKey } from '../../../../../store/src/helpers/entity-factory';
+import { endpointEntityType } from '../../../../../store/src/helpers/stratos-entity-factory';
 import { endpointEntitiesSelector } from '../../../../../store/src/selectors/endpoint.selectors';
 import { recentlyVisitedSelector } from '../../../../../store/src/selectors/recently-visitied.selectors';
 import {
@@ -29,7 +29,7 @@ class RenderableRecent {
   public mostRecentHit: moment.Moment;
   public subText$: Observable<string>;
   constructor(readonly entity: IRecentlyVisitedEntity, private store: Store<AppState>) {
-    if (entity.entityType === endpointSchemaKey) {
+    if (entity.entityType === endpointEntityType) {
       this.subText$ = observableOf(entity.prettyType);
     } else {
       this.subText$ = this.store.select(endpointEntitiesSelector).pipe(
diff --git a/src/frontend/packages/core/src/shared/components/user-avatar/md5.ts b/src/frontend/packages/core/src/shared/components/user-avatar/md5.ts
index b92c749b30..da9418a3b4 100644
--- a/src/frontend/packages/core/src/shared/components/user-avatar/md5.ts
+++ b/src/frontend/packages/core/src/shared/components/user-avatar/md5.ts
@@ -273,4 +273,4 @@ export class MD5 {
       temp = this.WordToHex(this.a) + this.WordToHex(this.b) + this.WordToHex(this.c) + this.WordToHex(this.d);
       return temp.toLowerCase();
   }
-}
\ No newline at end of file
+}
diff --git a/src/frontend/packages/core/src/shared/entity.tokens.ts b/src/frontend/packages/core/src/shared/entity.tokens.ts
index 76df701c07..0a4b9da0e9 100644
--- a/src/frontend/packages/core/src/shared/entity.tokens.ts
+++ b/src/frontend/packages/core/src/shared/entity.tokens.ts
@@ -1,6 +1,4 @@
-import { InjectionToken, Injectable } from '@angular/core';
-import { EntityService } from '../../../store/src/entity-service';
+import { InjectionToken } from '@angular/core';
+
 export const CF_GUID = new InjectionToken<string>('cfGuid');
 export const APP_GUID = new InjectionToken<string>('appGuid');
-
-export const ENTITY_SERVICE = new InjectionToken<EntityService>(null);
diff --git a/src/frontend/packages/core/src/shared/global-events.service.spec.ts b/src/frontend/packages/core/src/shared/global-events.service.spec.ts
index 7359c9a610..a7629ca2e3 100644
--- a/src/frontend/packages/core/src/shared/global-events.service.spec.ts
+++ b/src/frontend/packages/core/src/shared/global-events.service.spec.ts
@@ -1,7 +1,7 @@
 import { TestBed } from '@angular/core/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreTestingModule } from '../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratosui/store/testing';
 import { CoreModule } from '../core/core.module';
 import { GlobalEventService } from './global-events.service';
 import { SharedModule } from './shared.module';
diff --git a/src/frontend/packages/core/src/shared/global-events.service.ts b/src/frontend/packages/core/src/shared/global-events.service.ts
index fb59101347..ff9675a57e 100644
--- a/src/frontend/packages/core/src/shared/global-events.service.ts
+++ b/src/frontend/packages/core/src/shared/global-events.service.ts
@@ -3,8 +3,8 @@ import { Store } from '@ngrx/store';
 import { BehaviorSubject, combineLatest, Observable, ReplaySubject } from 'rxjs';
 import { debounceTime, distinctUntilChanged, map, publishReplay, refCount, startWith } from 'rxjs/operators';
 
+import { StratosStatus } from '../../../store/src/types/shared.types';
 import { GeneralEntityAppState } from './../../../store/src/app-state';
-import { StratosStatus } from './shared.types';
 
 export type GlobalEventTypes = 'warning' | 'error' | 'process' | 'complete';
 
diff --git a/src/frontend/packages/core/src/shared/services/metrics-range-selector-manager.service.ts b/src/frontend/packages/core/src/shared/services/metrics-range-selector-manager.service.ts
index c424ef13e6..bb8ef4dc09 100644
--- a/src/frontend/packages/core/src/shared/services/metrics-range-selector-manager.service.ts
+++ b/src/frontend/packages/core/src/shared/services/metrics-range-selector-manager.service.ts
@@ -4,10 +4,11 @@ import { Subject, Subscription } from 'rxjs';
 import { debounceTime, takeWhile, tap } from 'rxjs/operators';
 
 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 { IMetrics } from '../../../../store/src/types/base-metric.types';
+import { MetricQueryType } from '../../../../store/src/types/metric.types';
 import { MetricsRangeSelectorService } from './metrics-range-selector.service';
-import { ITimeRange, MetricQueryType } from './metrics-range-selector.types';
+import { ITimeRange } from './metrics-range-selector.types';
 
 @Injectable()
 export class MetricsRangeSelectorManagerService {
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 ee5b4e64c0..9789997fe0 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
@@ -3,7 +3,8 @@ import * as moment from 'moment';
 
 import { MetricQueryConfig, MetricsAction } from '../../../../store/src/actions/metrics.actions';
 import { IMetrics } from '../../../../store/src/types/base-metric.types';
-import { ITimeRange, MetricQueryType, StoreMetricTimeRange } from './metrics-range-selector.types';
+import { MetricQueryType } from '../../../../store/src/types/metric.types';
+import { ITimeRange, StoreMetricTimeRange } from './metrics-range-selector.types';
 
 @Injectable()
 export class MetricsRangeSelectorService {
diff --git a/src/frontend/packages/core/src/shared/services/metrics-range-selector.types.ts b/src/frontend/packages/core/src/shared/services/metrics-range-selector.types.ts
index bb39cc6bca..872a42e0c8 100644
--- a/src/frontend/packages/core/src/shared/services/metrics-range-selector.types.ts
+++ b/src/frontend/packages/core/src/shared/services/metrics-range-selector.types.ts
@@ -1,4 +1,7 @@
 import * as moment from 'moment';
+
+import { MetricQueryType } from '../../../../store/src/types/metric.types';
+
 export type momentTuple = [moment.DurationInputArg1, moment.unitOfTime.DurationConstructor];
 export interface ITimeRange {
   value?: string;
@@ -13,7 +16,4 @@ export interface StoreMetricTimeRange {
   step?: number;
 }
 
-export enum MetricQueryType {
-  QUERY = 'query',
-  RANGE_QUERY = 'query_range',
-}
+
diff --git a/src/frontend/packages/core/src/shared/services/snackbar.service.ts b/src/frontend/packages/core/src/shared/services/snackbar.service.ts
new file mode 100644
index 0000000000..13ba4eb2c6
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/services/snackbar.service.ts
@@ -0,0 +1,33 @@
+import { Injectable } from '@angular/core';
+import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar';
+
+import { SnackBarReturnComponent } from '../components/snackbar-return/snackbar-return.component';
+
+/**
+ * Servicve for showing snackbars
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class SnackBarService {
+
+  constructor(public snackBar: MatSnackBar) {}
+
+  private snackBars: MatSnackBarRef<SimpleSnackBar>[] = [];
+
+  public show(message: string, closeMessage?: string, duration: number = 5000) {
+    this.snackBars.push(this.snackBar.open(message, closeMessage, {
+      duration: closeMessage ? null :duration
+    }));
+  }
+
+  public showReturn(message: string, returnUrl: string, returnLabel: string) {
+    this.snackBars.push(this.snackBar.openFromComponent(SnackBarReturnComponent, {
+      data: { message, returnUrl, returnLabel }
+    }));
+  }
+
+  public hide() {
+    this.snackBars.forEach(snackBar => snackBar.dismiss());
+  }
+}
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index b7cc5252d8..f084315e99 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -314,11 +314,6 @@ import { UserPermissionDirective } from './user-permission.directive';
     MaxListMessageComponent,
     TableCellEditComponent
   ],
-  entryComponents: [
-    DialogConfirmComponent,
-    SnackBarReturnComponent,
-    MarkdownPreviewComponent,
-  ],
   providers: [
     ListConfig,
     EndpointListHelper,
diff --git a/src/frontend/packages/core/src/styles.scss b/src/frontend/packages/core/src/styles.scss
index efc3234fb7..c4e58757d0 100644
--- a/src/frontend/packages/core/src/styles.scss
+++ b/src/frontend/packages/core/src/styles.scss
@@ -1,7 +1,6 @@
 // @import "~@angular/material/prebuilt-themes/indigo-pink.css";
 @import '../sass/fonts';
 @import '../sass/icons';
-@import '../sass/colors';
 @import '../sass/theme';
 @import '../sass/mixins';
 @import '../sass/scroll-bar-measure';
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 f2e0bc6e7a..0110b5e1d5 100644
--- a/src/frontend/packages/core/test-framework/core-test.modules.ts
+++ b/src/frontend/packages/core/test-framework/core-test.modules.ts
@@ -1,8 +1,8 @@
 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';
+import { generateStratosEntities } from '../../store/src/stratos-entity-generator';
 
 @NgModule({
   imports: [
diff --git a/src/frontend/packages/core/test-framework/entity-service.helper.ts b/src/frontend/packages/core/test-framework/entity-service.helper.ts
deleted file mode 100644
index f01fb32974..0000000000
--- a/src/frontend/packages/core/test-framework/entity-service.helper.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Store } from '@ngrx/store';
-import { schema as normalizrSchema } from 'normalizr';
-import { EntityRequestAction } from '../../store/src/types/request.types';
-import { EntityServiceFactory } from '../../store/src/entity-service-factory.service';
-import { ENTITY_SERVICE } from '../src/shared/entity.tokens';
-import { AppState } from '../../store/src/app-state';
-
-export function generateTestEntityServiceProvider(
-  guid: string,
-  schema: normalizrSchema.Entity,
-  action: EntityRequestAction
-) {
-  function useFactory(
-    store: Store<AppState>,
-    entityServiceFactory: EntityServiceFactory
-  ) {
-    return entityServiceFactory.create(
-      guid,
-      action
-    );
-  }
-
-  return {
-    provide: ENTITY_SERVICE,
-    useFactory,
-    deps: [Store, EntityServiceFactory]
-  };
-}
diff --git a/src/frontend/packages/core/tsconfig.app.json b/src/frontend/packages/core/tsconfig.app.json
index 4dbcf96be1..e35700247d 100644
--- a/src/frontend/packages/core/tsconfig.app.json
+++ b/src/frontend/packages/core/tsconfig.app.json
@@ -5,7 +5,8 @@
   },
   "files": [
     "src/main.ts",
-    "src/polyfills.ts"
+    "src/polyfills.ts",
+    "src/_custom-import.module.ts"
   ],
   "include": [
     "src/frontend/packages/**/*.d.ts"
diff --git a/src/frontend/packages/core/tsconfig.lib.json b/src/frontend/packages/core/tsconfig.lib.json
new file mode 100644
index 0000000000..975aec9f97
--- /dev/null
+++ b/src/frontend/packages/core/tsconfig.lib.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../../../tsconfig.lib.json",
+  "compilerOptions": {
+    "outDir": "../../../../dist/core",
+  },
+  "exclude": [
+    "./src/test.ts",
+    "**/*.spec.ts",
+  ]
+}
diff --git a/src/frontend/packages/devkit/build.sh b/src/frontend/packages/devkit/build.sh
new file mode 100755
index 0000000000..a417da73fe
--- /dev/null
+++ b/src/frontend/packages/devkit/build.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+# Build script for devkit
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+ROOT="$( cd "$( dirname "${DIR}" )" && cd ../../.. && pwd )"
+DIST=$ROOT/dist-devkit
+
+echo $DIST
+echo $DIR
+tsc
+if [ $? -eq 0 ]; then
+  echo "Copying supporting files"
+  # cp $DIR/package.json $DIST
+  # cp $DIR/src/schematics/*.json $DIST/schematics/
+  # cp $DIR/src/schematics/theme/*.json $DIST/schematics/theme
+  # cp $DIR/src/builders/*.json $DIST/builders/
+
+  cp $DIR/package.json $DIST
+  rsync -r --exclude=*.ts ${DIR}/src/ ${DIST}/
+fi
+
diff --git a/src/frontend/packages/devkit/package-lock.json b/src/frontend/packages/devkit/package-lock.json
new file mode 100644
index 0000000000..9ce1ec7eaa
--- /dev/null
+++ b/src/frontend/packages/devkit/package-lock.json
@@ -0,0 +1,14 @@
+{
+  "name": "@stratosui/tools",
+  "version": "0.0.1",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "typescript": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.2.tgz",
+      "integrity": "sha512-lmQ4L+J6mnu3xweP8+rOrUwzmN+MRAj7TgtJtDaXE5PMyX2kCrklhg3rvOsOIfNeAWMQWO2F1GPc1kMD2vLAfw==",
+      "dev": true
+    }
+  }
+}
diff --git a/src/frontend/packages/devkit/package.json b/src/frontend/packages/devkit/package.json
new file mode 100644
index 0000000000..88be8dba36
--- /dev/null
+++ b/src/frontend/packages/devkit/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "@stratosui/tools",
+  "version": "0.0.1",
+  "scripts": {
+    "build": "./build.sh",
+    "tsc": "tsc"
+  },
+  "dependencies": {
+    "@angular-devkit/core": "^9.1.7",
+    "@angular-devkit/schematics": "^9.1.7",
+    "typescript": "~3.8.2"
+  },
+  "devDependencies": {
+    "@angular-devkit/architect": "^1.0.0"
+  },
+  "builders": "builders/builders.json",
+  "schematics": "./schematics/collection.json"
+}
diff --git a/src/frontend/packages/devkit/src/build/assets.ts b/src/frontend/packages/devkit/src/build/assets.ts
new file mode 100644
index 0000000000..182f44ae1f
--- /dev/null
+++ b/src/frontend/packages/devkit/src/build/assets.ts
@@ -0,0 +1,20 @@
+import CopyPlugin = require('copy-webpack-plugin');
+
+import { StratosConfig } from '../lib/stratos.config';
+
+// Handler ensures all assets from packages are copied as part of the build
+export class AssetsHandler {
+
+  constructor() {}
+
+  public apply(webpackConfig: any, config: StratosConfig) {
+    const assetsCopyConfig = config.getAssets();
+    if (assetsCopyConfig.length > 0) {
+      // Add a plugin to copy assets - this will ensure we copy the assets from each extension and the theme
+      const plugins = [
+        new CopyPlugin(assetsCopyConfig)
+      ];
+      webpackConfig.plugins = webpackConfig.plugins.concat(plugins);
+    }
+  }
+}
diff --git a/src/frontend/packages/devkit/src/build/extensions.ts b/src/frontend/packages/devkit/src/build/extensions.ts
new file mode 100644
index 0000000000..1b4816edd3
--- /dev/null
+++ b/src/frontend/packages/devkit/src/build/extensions.ts
@@ -0,0 +1,68 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { NormalModuleReplacementPlugin } from 'webpack';
+
+import { StratosConfig } from '../lib/stratos.config';
+
+const importModuleRegex = /src\/frontend\/packages\/core\/src\/custom-import.module.ts/;
+
+/**
+ * Generates the file _custom-import.module.ts containing the code to import
+ * the extensions modules discovered from the packages being included.
+ *
+ * This also adds a module replacement into the build process, so that this generated file
+ * is used instead of the default one in the repository, which does not import
+ * any extensions.
+ */
+
+export class ExtensionsHandler {
+
+  constructor() {}
+
+  // Write out the _custom-import.module.ts file importing all of the required extensions
+  public apply(webpackConfig: any, config: StratosConfig, options: any) {
+
+    // Generate the module file to import the appropriate extensions
+    const dir = path.dirname(options.main);
+    const overrideFile = path.resolve(path.join(dir, './_custom-import.module.ts'));
+
+    fs.writeFileSync(overrideFile, '// This file is auto-generated - DO NOT EDIT\n\n');
+    fs.appendFileSync(overrideFile, 'import { NgModule } from \'@angular/core\';\n');
+
+    const moduleImports = {
+      imports: []
+    };
+
+    const routingMmoduleImports = {
+      imports: []
+    };
+
+    config.getExtensions().forEach(e => {
+      let modules = e.module;
+      moduleImports.imports.push(e.module);
+      if (e.routingModule) {
+        routingMmoduleImports.imports.push(e.routingModule);
+        modules += ', ' + e.routingModule;
+      }
+
+      fs.appendFileSync(overrideFile, 'import { ' + modules + ' } from \'' + e.package + '\';\n');
+    });
+
+    this.writeModule(overrideFile, 'CustomImportModule', moduleImports);
+    this.writeModule(overrideFile, 'CustomRoutingImportModule', routingMmoduleImports);
+
+    webpackConfig.plugins.push(new NormalModuleReplacementPlugin(
+      importModuleRegex,
+      overrideFile
+    ));
+  }
+
+  private writeModule(file: string, name: string, imports: any) {
+    fs.appendFileSync(file, '\n@NgModule(\n');
+    let json = JSON.stringify(imports, null, 2);
+    json = json.replace(/['"]+/g, '');
+    fs.appendFileSync(file, json);
+    fs.appendFileSync(file, ')\n');
+    fs.appendFileSync(file, 'export class ' + name + ' {}\n\n');
+  }
+}
diff --git a/src/frontend/packages/devkit/src/build/index.transform.ts b/src/frontend/packages/devkit/src/build/index.transform.ts
new file mode 100644
index 0000000000..7282558c2b
--- /dev/null
+++ b/src/frontend/packages/devkit/src/build/index.transform.ts
@@ -0,0 +1,82 @@
+import * as fs from 'fs';
+import * as path from 'path';
+
+import { StratosConfig } from '../lib/stratos.config';
+
+/**
+ * Transforms the index.html file
+ *
+ * Adds in the Git metadata
+ * Adds in the custom loader from the theme, if there is one
+ */
+export class IndexHtmlHandler {
+
+  constructor(public config: StratosConfig) {}
+
+  public apply(src: string): string {
+
+    // Patch different page title if there is one
+    const title = this.config.stratosConfig.title || 'Stratos';
+    src = src.replace(/@@TITLE@@/g, title);
+
+    // // Git Information
+    const gitMetadata = this.config.gitMetadata;
+    src = src.replace(/@@stratos_git_project@@/g, gitMetadata.project );
+    src = src.replace(/@@stratos_git_branch@@/g, gitMetadata.branch );
+    src = src.replace(/@@stratos_git_commit@@/g, gitMetadata.commit );
+
+    // // Date and Time that the build was made (approximately => it is when this script is run)
+    src = src.replace(/@@stratos_build_date@@/g, new Date().toString() );
+
+    // Loading view (provided by theme)
+
+    let loadingTheme = this.config.getTheme();
+    const hasTheme = loadingTheme.stratos && loadingTheme.theme;
+
+    // Custom loading indicator should default to the loading screen in the default theme, if custom theme does not have one
+    if (!hasTheme || hasTheme && !loadingTheme.json.stratos.theme.loadingCss) {
+      loadingTheme = this.config.getDefaultTheme();
+    }
+
+    const themePackageJson = loadingTheme.json;
+    const themePackageFolder = loadingTheme.dir;
+    const css = themePackageJson.stratos.theme.loadingCss;
+    const html = themePackageJson.stratos.theme.loadingHtml;
+
+    if (css) {
+      const cssFile = path.resolve(themePackageFolder, css);
+      if (fs.existsSync(cssFile)) {
+        const loadingCss = fs.readFileSync(cssFile, 'utf8');
+        src = src.replace(/\/\*\* @@LOADING_CSS@@ \*\*\//g, loadingCss);
+      }
+    }
+
+    if (html) {
+      const htmlFile = path.resolve(themePackageFolder, html);
+      if (fs.existsSync(htmlFile)) {
+        const loadingHtml = fs.readFileSync(htmlFile, 'utf8');
+        src = src.replace(/<!-- @@LOADING_HTML@@ -->/g, loadingHtml);
+      }
+    }
+    return src;
+  }
+}
+
+interface TargetOptions {
+  configuration?: string;
+  project: string;
+  target: string;
+}
+
+// Transform the index.html
+const indexTransform = (options: TargetOptions, content: string) => {
+
+  // Get the Stratos config - don't log a second time
+  const sConfig = new StratosConfig(__dirname, this.options, false);
+
+  const handler = new IndexHtmlHandler(sConfig);
+  const modified = handler.apply(content);
+  return Promise.resolve(modified);
+};
+
+module.exports = indexTransform;
diff --git a/src/frontend/packages/devkit/src/build/main.ts b/src/frontend/packages/devkit/src/build/main.ts
new file mode 100644
index 0000000000..d5954d0be2
--- /dev/null
+++ b/src/frontend/packages/devkit/src/build/main.ts
@@ -0,0 +1,42 @@
+import { StratosConfig } from '../lib/stratos.config';
+import { AssetsHandler } from './assets';
+import { ExtensionsHandler } from './extensions';
+import { SassHandler } from './sass';
+
+/**
+ * Webpack customizations for Stratos
+ *
+ * The runBuilder function is exported and used as the function to apply
+ * customizations to the Webpack configuration
+ */
+
+class StratosBuilder {
+
+  constructor(public webpackConfig, public options) { }
+
+  public run() {
+    // Read in the Stratos config file if present (and do so config initialization)
+    const sConfig = new StratosConfig(__dirname, this.options);
+
+    // Sass handler for themes and themable packages
+    const sass = new SassHandler();
+    sass.apply(this.webpackConfig, sConfig);
+
+    // Assets from extensions or theme
+    const assets = new AssetsHandler();
+    assets.apply(this.webpackConfig, sConfig);
+
+    // Extensions (code)
+    const ext = new ExtensionsHandler();
+    ext.apply(this.webpackConfig, sConfig, this.options);
+  }
+}
+
+// Apply the Stratos customizations to the webpack configuration
+const runBuilder = (config, options) => {
+  const builder = new StratosBuilder(config, options);
+  builder.run();
+  return config;
+};
+
+module.exports = runBuilder;
diff --git a/src/frontend/packages/devkit/src/build/sass.ts b/src/frontend/packages/devkit/src/build/sass.ts
new file mode 100644
index 0000000000..745a378e36
--- /dev/null
+++ b/src/frontend/packages/devkit/src/build/sass.ts
@@ -0,0 +1,88 @@
+import { StratosConfig } from '../lib/stratos.config';
+
+/**
+ * Sass Handler
+ *
+ * Provides some custom resolution of sass files so that the theming
+ * is applied to components and that the chosen theme is used.
+ *
+ * Essentially intercepts package imports of the form ~@startosui/theme
+ * and ensures the correct packaeg is used.
+ */
+export class SassHandler {
+
+  constructor() { }
+
+  //  Set options on the Webpack sass-loader plugin to use us as a custom importer
+  public apply(webpackConfig: any, config: StratosConfig) {
+    // Find the node-saas plugin and add a custom import resolver
+    webpackConfig.module.rules.forEach(rule => {
+      if (rule.include) {
+        rule.use.forEach(p => {
+          if (p.loader && p.loader.indexOf('sass-loader') > 0) {
+            p.options.sassOptions = {
+              importer: this.customSassImport(config)
+            };
+          }
+        });
+      }
+    });
+  }
+
+  private customSassImport(config: StratosConfig) {
+    const that = this;
+    return (url, resourcePath) => {
+      if (url === '~@stratosui/theme/extensions') {
+        // Generate SCSS to appy theming to the packages that need to be themed
+        return {
+          contents: that.getThemingForPackages(config)
+        };
+      } else if (url === '~@stratosui/theme') {
+        return {
+          file: config.resolvePackage(config.getTheme().name, '_index.scss')
+        };
+      } else if (url.indexOf('~') === 0) {
+        // See if we have an override
+        const pkg = url.substr(1);
+        const pkgParts = pkg.split('/');
+        let pkgName = '';
+        if (pkgParts[0].indexOf('@') === 0) {
+          // Package name has a scope
+          pkgName = pkgParts.shift() + '/' + pkgParts.shift();
+        } else {
+          pkgName = pkgParts.shift();
+        }
+        const pkgPath = pkgParts.join('/');
+        // See if we can resolve the package name
+        const knownPath = config.resolveKnownPackage(pkgName);
+        if (knownPath) {
+          return {
+            file: knownPath + '/_' + pkgPath + '.scss'
+          };
+        }
+      }
+
+      // We could not resolve, so leave to the default resolver
+      return null;
+    };
+  }
+
+  // Generate an import and include for each themable package so that we theme
+  // its components when the application is built.
+  private getThemingForPackages(c: StratosConfig): string {
+    let contents = '';
+    const themedPackages = c.getThemedPackages();
+    themedPackages.forEach(themingConfig => {
+      contents += `@import '${themingConfig.importPath}';\n`;
+    });
+
+    contents += '\n@mixin apply-theme($stratos-theme) {\n';
+    themedPackages.forEach(themingConfig => {
+      contents += `  @include ${themingConfig.mixin}($stratos-theme);\n`;
+    });
+    contents += '}\n';
+
+    return contents;
+  }
+
+}
diff --git a/src/frontend/packages/devkit/src/builders/builders.json b/src/frontend/packages/devkit/src/builders/builders.json
new file mode 100644
index 0000000000..2ad448ceee
--- /dev/null
+++ b/src/frontend/packages/devkit/src/builders/builders.json
@@ -0,0 +1,10 @@
+{
+  "$schema": "@angular-devkit/architect/src/builders-schema.json",
+  "builders": {
+    "stratos-theme": {
+      "implementation": "./theme.builder",
+      "schema": "./theme.builder.schema.json",
+      "description": "Stratos Theme builder"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/devkit/src/builders/theme.builder.schema.json b/src/frontend/packages/devkit/src/builders/theme.builder.schema.json
new file mode 100644
index 0000000000..6b1b7eac48
--- /dev/null
+++ b/src/frontend/packages/devkit/src/builders/theme.builder.schema.json
@@ -0,0 +1,13 @@
+{
+  "id": "StratosThemeBuilderSchema",
+  "title": "Stratos Theme builder",
+  "description": "Timestamp builder options",
+  "properties": {
+    "outputPath": {
+      "type": "string",
+      "description": "Path for the output",
+      "default": "./dist"
+    }
+  }
+}
+  
\ No newline at end of file
diff --git a/src/frontend/packages/devkit/src/builders/theme.builder.ts b/src/frontend/packages/devkit/src/builders/theme.builder.ts
new file mode 100644
index 0000000000..5d133e9d0a
--- /dev/null
+++ b/src/frontend/packages/devkit/src/builders/theme.builder.ts
@@ -0,0 +1,43 @@
+import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
+import { JsonObject } from '@angular-devkit/core';
+import * as FS from 'fs-extra';
+import * as Path from 'path';
+
+import { Packages } from '../lib/packages';
+
+export interface ThemeOptions extends JsonObject {
+  outputPath: string;
+}
+
+export default createBuilder(commandBuilder);
+
+async function commandBuilder(
+  options: ThemeOptions,
+  context: BuilderContext,
+  ): Promise<BuilderOutput> {
+    // A theme 'just' contains assets, so copy these to the dist folder
+    const outPath = Path.join(context.workspaceRoot, options.outputPath);
+
+    // Remove the dist folder and recreate it fresh
+    FS.removeSync(outPath);
+    FS.ensureDir(outPath);
+
+    // Get project root
+    const prjMetadata = await context.getProjectMetadata(context.target);
+
+    // Copy all files from root to the outPath
+
+    FS.copySync(prjMetadata.root, outPath);
+
+    // We can remove scripts from the package.json file
+    const pkgFile = Packages.loadPackageFile(outPath);
+    if (pkgFile !== null) {
+      delete pkgFile.scripts;
+      const pkgFilePath = Path.join(outPath, 'package.json');
+      FS.writeJsonSync(pkgFilePath, pkgFile, { spaces: 2});
+    }
+
+    return Promise.resolve(
+      { success: true}
+    );
+}
diff --git a/src/frontend/packages/devkit/src/lib/git.metadata.ts b/src/frontend/packages/devkit/src/lib/git.metadata.ts
new file mode 100644
index 0000000000..3fcc50d6ed
--- /dev/null
+++ b/src/frontend/packages/devkit/src/lib/git.metadata.ts
@@ -0,0 +1,37 @@
+import * as fs from 'fs';
+import * as path from 'path';
+
+const GIT_METADATA_FILE = '.stratos-git-metadata.json';
+
+/**
+ * Represents the Git Metadata read from the metadata file or the
+ * environment variables.
+ *
+ * This is embedded in the index.html file for diagnostic purposes
+ */
+export class GitMetadata {
+
+  public project: string;
+  public branch: string;
+  public commit: string;
+
+  public exists = false;
+
+  constructor(dir: string) {
+
+    this.project = process.env.project || process.env.STRATOS_PROJECT || '';
+    this.branch = process.env.branch || process.env.STRATOS_BRANCH || '';
+    this.commit = process.env.commit || process.env.STRATOS_COMMIT || '';
+
+    // Try and read the git metadata file
+    const gitMetadataFile = path.join(dir, GIT_METADATA_FILE);
+    if (fs.existsSync(gitMetadataFile)) {
+      const gitMetadata = JSON.parse(fs.readFileSync(gitMetadataFile).toString());
+      this.project = gitMetadata.project;
+      this.branch = gitMetadata.branch;
+      this.commit = gitMetadata.commit;
+      this.exists = true;
+    }
+  }
+
+}
diff --git a/src/frontend/packages/devkit/src/lib/log.ts b/src/frontend/packages/devkit/src/lib/log.ts
new file mode 100644
index 0000000000..8c23c0c0a1
--- /dev/null
+++ b/src/frontend/packages/devkit/src/lib/log.ts
@@ -0,0 +1,17 @@
+let logLevel = 1;
+
+export interface Logger {
+  log(msg: string): void;
+}
+
+export function setLogLevel(level: number) {
+  logLevel = level;
+}
+
+export function debug(msg) {
+  if (logLevel > 0) {
+    console.log(msg);
+  }
+}
+
+
diff --git a/src/frontend/packages/devkit/src/lib/packages.ts b/src/frontend/packages/devkit/src/lib/packages.ts
new file mode 100644
index 0000000000..0cc801f990
--- /dev/null
+++ b/src/frontend/packages/devkit/src/lib/packages.ts
@@ -0,0 +1,291 @@
+import * as fs from 'fs';
+import * as path from 'path';
+
+import { Logger } from './log';
+import { StratosConfig } from './stratos.config';
+
+// Helper for packages
+
+// A set of info for a package
+export interface PackageInfo {
+  name: string;
+  dir: string;
+  stratos: boolean;
+  json: any;
+  ignore: boolean;
+  extension?: ExtensionMetadata;
+  theme: boolean;
+  theming?: ThemingMetadata;
+  assets: AssetMetadata[];
+}
+
+// Basic info for the package.json file that we need
+export interface PackageJson {
+  name: string;
+  stratos?: StratosPakageMetadata;
+  scripts: { [key: string]: string };
+}
+
+// Custom stratos metadata that can be in the package.json file
+export interface StratosPakageMetadata {
+  module?: string;
+  routingModule?: string;
+  ignore?: boolean;
+  theme?: boolean;
+  theming?: string;
+  assets?: { [src: string]: string };
+}
+
+// Theming metadata
+export interface ThemingMetadata {
+  ref: string;
+  package: string;
+  scss: string;
+  mixin: string;
+  importPath: string;
+}
+
+// Extension metadata
+export interface ExtensionMetadata {
+  package: string;
+  module: string;
+  routingModule?: string;
+  themeable?: boolean;
+}
+
+// Assets metadata
+export interface AssetMetadata {
+  from: string;
+  to: string;
+  force: boolean;
+}
+
+// Helpers for getting list of dirs in a dir
+const isDirectory = source => fs.lstatSync(source).isDirectory();
+const getDirectories = source =>
+  fs.readdirSync(source).map(name => path.join(source, name)).filter(isDirectory);
+
+// Default theme to use
+export const DEFAULT_THEME = '@stratosui/theme';
+
+export class Packages {
+
+  public packages: PackageInfo[] = [];
+  public packageMap: Map<string, PackageInfo> = new Map<string, PackageInfo>();
+
+  public pkgReadMap: Map<string, PackageInfo> = new Map<string, PackageInfo>();
+
+  public theme: PackageInfo;
+
+  public logger: Logger;
+
+
+  // Try and find and load a package.json file in the specified folder
+  public static loadPackageFile(dir: string) {
+    const pkgFile = path.join(dir, 'package.json');
+    let pkg = null;
+    if (fs.existsSync(pkgFile)) {
+      try {
+        pkg = JSON.parse(fs.readFileSync(pkgFile, 'utf8').toString());
+      } catch (e) { }
+    }
+    return pkg;
+  }
+
+  constructor(public config: StratosConfig, public nodeModulesFolder: string, public localPackagesFolder) { }
+
+  public setLogger(logger: Logger) {
+    this.logger = logger;
+  }
+
+  public log(msg: string) {
+    if (this.logger) {
+      this.logger.log(msg);
+    }
+  }
+
+  // Look for packages
+  public scan(packageJson: any) {
+    this.pkgReadMap = new Map<string, PackageInfo>();
+
+    if (packageJson.peerDependencies) {
+      Object.keys(packageJson.peerDependencies).forEach(dep => {
+        this.addPackage(dep);
+      });
+    }
+
+    // Read all dependencies
+    if (packageJson.dependencies) {
+      Object.keys(packageJson.dependencies).forEach(dep => {
+        this.addPackage(dep);
+      });
+    }
+
+    // Local folders
+    // Find all local packages in the folder
+    getDirectories(this.localPackagesFolder).forEach(pkgDir => {
+      this.addPackage(pkgDir, true);
+    });
+
+    // Figure out the theme
+    if (!this.config.stratosConfig.theme) {
+      // Theme was not set, so find the first theme that is not the default theme
+      const theme = this.packages.find(pkg => pkg.theme && pkg.name !== DEFAULT_THEME);
+      if (!theme) {
+        this.theme = this.packageMap[DEFAULT_THEME];
+      } else {
+        this.theme = theme;
+      }
+    } else {
+      this.theme = this.packageMap[this.config.stratosConfig.theme];
+    }
+
+    // Ensure that the theme is last in the list, so that its resources are copied last
+    const index = this.packages.findIndex(pkg => pkg.name === this.theme.name);
+    if (index > -1) {
+      const items = this.packages.splice(index, 1);
+      this.packages.push(items[0]);
+    }
+
+    this.log('Packages:');
+    this.packages.forEach(pkg => this.log(` + ${pkg.name}`));
+  }
+
+  public addPackage(pkgName, isLocal = false) {
+    if (this.pkgReadMap[pkgName]) {
+      return;
+    }
+    this.pkgReadMap[pkgName] = true;
+
+    let pkgDir = pkgName;
+    if (!isLocal) {
+      pkgDir = path.join(this.nodeModulesFolder, pkgName);
+    }
+
+    // Read the package file
+    const pkgFile = Packages.loadPackageFile(pkgDir);
+    if (pkgFile !== null) {
+      // Check to see if we should include this package
+      if (this.includePackage(pkgFile)) {
+        // Process all of the peer dependencies first
+        if (pkgFile.peerDependencies) {
+          Object.keys(pkgFile.peerDependencies).forEach(dep => this.addPackage(dep));
+        }
+        const pkg = this.processPackage(pkgFile, pkgDir);
+        this.add(pkg);
+      }
+    }
+  }
+
+  private add(item: PackageInfo) {
+    if (!this.packageMap[item.name]) {
+      // We don't already have this package
+      this.packages.push(item);
+      this.packageMap[item.name] = item;
+    }
+  }
+
+  // Get all of the extensions
+  public getExtensions(): ExtensionMetadata[] {
+    const extensions: ExtensionMetadata[] = [];
+    this.packages.forEach(pkg => {
+      if (pkg.extension) {
+        extensions.push(pkg.extension);
+      }
+    });
+
+    return extensions;
+  }
+
+  // Should we include the specified package?
+  private includePackage(pkg: PackageJson): boolean {
+
+    // Must be a stratos package
+    if (!pkg.stratos) {
+      return false;
+    }
+
+    // If we don't have any explicit includes, then include it
+    if (!this.config.stratosConfig.packages) {
+      return true;
+    }
+
+    // Use the include set if one is specified
+    if (this.config.stratosConfig.packages.include) {
+      return this.config.stratosConfig.packages.include.includes(pkg.name);
+    }
+
+    // Remove any excluded extensions
+    if (this.config.stratosConfig.packages.exclude) {
+      return !this.config.stratosConfig.packages.exclude.includes(pkg.name);
+    }
+
+    return true;
+  }
+
+  // Process the package file and look for Stratos metadata
+  private processPackage(pkg: PackageJson, folder: string): PackageInfo {
+    const info: PackageInfo = {
+      name: pkg.name,
+      dir: folder,
+      stratos: !!pkg.stratos,
+      json: pkg,
+      ignore: pkg.stratos ? pkg.stratos.ignore || false : false,
+      theme: pkg.stratos && pkg.stratos.theme,
+      theming: this.getThemingConfig(pkg, folder),
+      assets: this.getAssets(pkg, folder)
+    };
+
+    // If this is an extension, add extension metadata
+    if (pkg.stratos && pkg.stratos.module) {
+      info.extension = {
+        package: pkg.name,
+        module: pkg.stratos.module,
+        routingModule: pkg.stratos.routingModule
+      };
+    }
+
+    return info;
+  }
+
+  // Get any theming metadata - this allows a package to theme its own components using the theme
+  private getThemingConfig(pkg: PackageJson, packagePath: string): ThemingMetadata {
+    if (pkg.stratos && pkg.stratos.theming) {
+      const refParts = pkg.stratos.theming.split('#');
+      if (refParts.length === 2) {
+        const themingConfig: ThemingMetadata = {
+          ref: pkg.stratos.theming,
+          package: pkg.name,
+          scss: refParts[0],
+          mixin: refParts[1],
+          importPath: path.join(packagePath, refParts[0])
+        };
+        this.log('Found themed package: ' + pkg.name + ' (' + pkg.stratos.theming + ')');
+        return themingConfig;
+      } else {
+        this.log('Invalid theming reference: ' + pkg.stratos.theming);
+      }
+    }
+
+    return null;
+  }
+
+  // Get any assets that the package has
+  private getAssets(pkg: PackageJson, packagePath: string): AssetMetadata[] {
+    const assets: AssetMetadata[] = [];
+    // Check for assets
+    if (pkg.stratos && pkg.stratos.assets) {
+      Object.keys(pkg.stratos.assets).forEach(src => {
+        let abs = path.join(packagePath, src);
+        abs = path.resolve(abs);
+        assets.push({
+          from: abs,
+          to: pkg.stratos.assets[src],
+          force: true
+        });
+      });
+    }
+    return assets.length ? assets : null;
+  }
+
+}
diff --git a/src/frontend/packages/devkit/src/lib/schematics.ts b/src/frontend/packages/devkit/src/lib/schematics.ts
new file mode 100644
index 0000000000..0ff11e421d
--- /dev/null
+++ b/src/frontend/packages/devkit/src/lib/schematics.ts
@@ -0,0 +1,140 @@
+import { normalize, split, tags, virtualFs, workspaces } from '@angular-devkit/core';
+import { Rule, SchematicsException, Tree } from '@angular-devkit/schematics';
+
+
+export const Builders = {
+  Theme: '@stratosui/devkit:stratos-theme'
+}
+
+export const Versions = {
+  Stratos: '0.1.0',
+}
+
+export const ProjectType = {
+  Theme: 'library',
+}
+
+// =========================================================================================================
+// Utilities from the Angular Schema repository
+// =========================================================================================================
+
+// See: https://github.com/angular/angular-cli/blob/master/packages/schematics/angular/utility/validation.ts
+
+export function validateProjectName(projectName: string) {
+  const errorIndex = getRegExpFailPosition(projectName);
+  const unsupportedProjectNames: string[] = [];
+  const packageNameRegex = /^(?:@[a-zA-Z0-9_-]+\/)?[a-zA-Z0-9_-]+$/;
+  if (errorIndex !== null) {
+    const firstMessage = tags.oneLine`
+    Project name "${projectName}" is not valid. New project names must
+    start with a letter, and must contain only alphanumeric characters or dashes.
+    When adding a dash the segment after the dash must also start with a letter.
+    `;
+    const msg = tags.stripIndent`
+    ${firstMessage}
+    ${projectName}
+    ${Array(errorIndex + 1).join(' ') + '^'}
+    `;
+    throw new SchematicsException(msg);
+  } else if (unsupportedProjectNames.indexOf(projectName) !== -1) {
+    throw new SchematicsException(
+      `Project name ${JSON.stringify(projectName)} is not a supported name.`);
+  } else if (!packageNameRegex.test(projectName)) {
+    throw new SchematicsException(`Project name ${JSON.stringify(projectName)} is invalid.`);
+  }
+}
+
+
+function getRegExpFailPosition(str: string): number | null {
+  const isScope = /^@.*\/.*/.test(str);
+  if (isScope) {
+    // Remove starting @
+    str = str.replace(/^@/, '');
+    // Change / to - for validation
+    str = str.replace(/\//g, '-');
+  }
+
+  const parts = str.indexOf('-') >= 0 ? str.split('-') : [str];
+  const matched: string[] = [];
+
+  const projectNameRegexp = /^[a-zA-Z][.0-9a-zA-Z]*(-[.0-9a-zA-Z]*)*$/;
+
+  parts.forEach(part => {
+    if (part.match(projectNameRegexp)) {
+      matched.push(part);
+    }
+  });
+
+  const compare = matched.join('-');
+
+  return (str !== compare) ? compare.length : null;
+}
+
+
+// See: https://github.com/angular/angular-cli/blob/master/packages/schematics/angular/utility/paths.ts
+
+export function relativePathToWorkspaceRoot(projectRoot: string | undefined): string {
+  const normalizedPath = split(normalize(projectRoot || ''));
+
+  if (normalizedPath.length === 0 || !normalizedPath[0]) {
+    return '.';
+  } else {
+    return normalizedPath.map(() => '..').join('/');
+  }
+}
+
+// See: https:// github.com/angular/angular-cli/blob/master/packages/schematics/angular/utility/workspace.ts
+export function updateWorkspace(
+  updater: (workspace: workspaces.WorkspaceDefinition) => void | PromiseLike<void>,
+): Rule;
+export function updateWorkspace(
+  updaterOrWorkspace: workspaces.WorkspaceDefinition
+    | ((workspace: workspaces.WorkspaceDefinition) => void | PromiseLike<void>),
+): Rule {
+  return async (tree: Tree) => {
+    const host = createHost(tree);
+
+    if (typeof updaterOrWorkspace === 'function') {
+
+      const { workspace } = await workspaces.readWorkspace('/', host);
+
+      const result = updaterOrWorkspace(workspace);
+      if (result !== undefined) {
+        await result;
+      }
+
+      await workspaces.writeWorkspace(workspace, host);
+    } else {
+      await workspaces.writeWorkspace(updaterOrWorkspace, host);
+    }
+  };
+}
+
+export async function getWorkspace(tree: Tree, path = '/') {
+  const host = createHost(tree);
+  const { workspace } = await workspaces.readWorkspace(path, host);
+  return workspace;
+}
+
+function createHost(tree: Tree): workspaces.WorkspaceHost {
+  return {
+    async readFile(path: string): Promise<string> {
+      const data = tree.read(path);
+      if (!data) {
+        throw new Error('File not found.');
+      }
+
+      return virtualFs.fileBufferToString(data);
+    },
+    async writeFile(path: string, data: string): Promise<void> {
+      return tree.overwrite(path, data);
+    },
+    async isDirectory(path: string): Promise<boolean> {
+      // approximate a directory check
+      return !tree.exists(path) && tree.getDir(path).subfiles.length > 0;
+    },
+    async isFile(path: string): Promise<boolean> {
+      return tree.exists(path);
+    },
+  };
+}
\ No newline at end of file
diff --git a/src/frontend/packages/devkit/src/lib/stratos.config.ts b/src/frontend/packages/devkit/src/lib/stratos.config.ts
new file mode 100644
index 0000000000..3e47b52281
--- /dev/null
+++ b/src/frontend/packages/devkit/src/lib/stratos.config.ts
@@ -0,0 +1,232 @@
+import * as fs from 'fs';
+import * as yaml from 'js-yaml';
+import * as path from 'path';
+
+import { GitMetadata } from './git.metadata';
+import { Logger } from './log';
+import { AssetMetadata, DEFAULT_THEME, ExtensionMetadata, PackageInfo, Packages, ThemingMetadata } from './packages';
+
+/**
+ * Represents the stratos.yaml file or the defaults if not found
+ *
+ * Also includes related config such as node_modules dirpath and angular.json file path
+ */
+
+export class StratosConfig implements Logger {
+
+  // File paths to a few files we need access to
+  public packageJsonFile: string;
+  public nodeModulesFile: string;
+  public angularJsonFile: string;
+
+  // angular.json contents
+  public angularJson: any;
+
+  // package.json contents
+  public packageJson: any;
+
+  // newProjectRoot from the angular.json file
+  // Used as the directory to check for local packages
+  public newProjectRoot: string;
+
+  // Stratos config file
+  public stratosConfig: any;
+
+  // Git Metadata
+  public gitMetadata: GitMetadata;
+
+  private loggingEnabled = true;
+
+  private packages: Packages;
+
+  constructor(dir: string, options?: any, loggingEnabled = true) {
+    this.angularJsonFile = this.findFileOrFolderInChain(dir, 'angular.json');
+    this.angularJson = JSON.parse(fs.readFileSync(this.angularJsonFile, 'utf8').toString());
+    this.loggingEnabled = loggingEnabled;
+
+    // The Stratos config file is optional - allows overriding default behaviour
+    this.stratosConfig = {};
+    if (this.angularJsonFile) {
+      // Read stratos.yaml if we can
+      const stratosYamlFile = path.join(path.dirname(this.angularJsonFile), 'stratos.yaml');
+      if (fs.existsSync(stratosYamlFile)) {
+        try {
+          this.stratosConfig = yaml.safeLoad(fs.readFileSync(stratosYamlFile, 'utf8'));
+          // this.log(this.stratosConfig);
+          this.log('Read stratos.yaml okay from: ' + stratosYamlFile);
+        } catch (e) {
+          this.log(e);
+        }
+      } else {
+        this.log('Using default configuration');
+      }
+    }
+
+    // Exclude the default packages... unless explicity `include`d
+    this.excludeExamples()
+
+    const mainDir = options ? path.dirname(options.main) : dir;
+
+    this.packageJsonFile = this.findFileOrFolderInChain(mainDir, 'package.json');
+    if (this.packageJsonFile !== null) {
+      this.packageJson = JSON.parse(fs.readFileSync(this.packageJsonFile, 'utf8').toString());
+    }
+
+    this.nodeModulesFile = this.findFileOrFolderInChain(mainDir, 'node_modules');
+
+    this.gitMetadata = new GitMetadata(path.dirname(this.angularJsonFile));
+    // this.log(this.gitMetadata);
+    if (this.gitMetadata.exists) {
+      this.log('Read git metadata file');
+    }
+
+    this.newProjectRoot = this.angularJson.newProjectRoot;
+
+    // Discover all packages
+
+    // Helper to discover and interpret packages
+    this.packages = new Packages(this, this.nodeModulesFile, this.newProjectRoot);
+    this.packages.setLogger(this);
+    this.packages.scan(this.packageJson);
+
+    this.log('Using theme ' + this.packages.theme.name);
+
+    const extensions = this.getExtensions();
+
+    if (extensions.length === 0) {
+      this.log('Building without any extensions');
+    } else {
+      this.log('Building with these extensions:');
+      extensions.forEach(ext => this.log(` + ${ext.package}`));
+    }
+  }
+
+  private excludeExamples() {
+    const examplePackages = ['@example/theme', '@example/extensions']
+    const exclude = [];
+    // Are examples explicitly in the include section?
+    if (this.stratosConfig &&
+      this.stratosConfig.packages &&
+      this.stratosConfig.packages.include &&
+      this.stratosConfig.packages.include.length > 0 // Will check if this is an array
+    ) {
+      examplePackages.forEach(ep => this.addIfMissing(this.stratosConfig.packages.include, ep, exclude))
+    } else {
+      exclude.push(...examplePackages);
+    }
+
+    // No op
+    if (exclude.length < 1) {
+      return;
+    }
+
+    // If examples are not in include section, add them to the exclude
+    if (!this.stratosConfig) {
+      this.stratosConfig = {}
+    }
+    if (!this.stratosConfig.packages) {
+      this.stratosConfig.packages = {}
+    }
+    if (!this.stratosConfig.packages.exclude) {
+      this.stratosConfig.packages.exclude = [];
+    }
+    exclude.forEach(e => this.addIfMissing(this.stratosConfig.packages.exclude, e));
+  }
+
+  private addIfMissing<T = string>(array: T[], entry: T, dest: T[] = array) {
+    if (array.indexOf(entry) < 0) {
+      dest.push(entry)
+    }
+  }
+
+  public log(msg: any) {
+    if (this.loggingEnabled) {
+      console.log(msg);
+    }
+  }
+
+  public getTheme(): PackageInfo {
+    return this.packages.theme;
+  }
+
+  public getDefaultTheme(): PackageInfo {
+    return this.packages.packageMap[DEFAULT_THEME];
+  }
+
+  public getExtensions(): ExtensionMetadata[] {
+    return this.packages.packages.filter(p => !!p.extension).map(pkg => pkg.extension);
+  }
+
+  public getAssets(): AssetMetadata[] {
+    const assets: AssetMetadata[] = [];
+    this.packages.packages.forEach(pkg => {
+      if (pkg.assets) {
+        assets.push(...pkg.assets);
+      }
+    });
+
+    return assets;
+  }
+
+  public getThemedPackages(): ThemingMetadata[] {
+    return this.packages.packages.filter(p => !!p.theming).map(pkg => pkg.theming);
+  }
+
+  public getPackageJsonFolder() {
+    return path.dirname(this.packageJsonFile);
+  }
+
+  public getNodeModulesFolder() {
+    return path.dirname(this.nodeModulesFile);
+  }
+
+  // Go up the directory hierarchy and look for the named file or folder
+  private findFileOrFolderInChain(dir: string, name: string): string {
+    const parent = path.dirname(dir);
+    const itemPath = path.join(dir, name);
+    if (fs.existsSync(itemPath)) {
+      return itemPath;
+    }
+
+    if (parent === dir) {
+      return null;
+    }
+
+    return this.findFileOrFolderInChain(parent, name);
+  }
+
+  // Resolve a known package or return null if not a known package
+  public resolveKnownPackage(pkg: string): string {
+    const p = this.packages.packageMap[pkg];
+    if (p) {
+      let packagePath = p.dir;
+      if (!path.isAbsolute(packagePath)) {
+        packagePath = path.resolve(packagePath);
+      }
+      return packagePath;
+    }
+
+    return null;
+  }
+
+  // Resolve a package to a directory to a file path, if name is given
+  public resolvePackage(pkg: string, name?: string) {
+    let packagePath;
+    const pkgInfo = this.packages.packageMap[pkg];
+    if (pkgInfo) {
+      packagePath = pkgInfo.dir;
+    } else {
+      // Default to getting the package from the node_modules folder
+      packagePath = path.join(this.getNodeModulesFolder(), pkg);
+    }
+
+    if (!path.isAbsolute(packagePath)) {
+      packagePath = path.resolve(packagePath);
+    }
+
+    if (name) {
+      packagePath = path.join(packagePath, name);
+    }
+    return packagePath;
+  }
+}
diff --git a/src/frontend/packages/devkit/src/schematics/collection.json b/src/frontend/packages/devkit/src/schematics/collection.json
new file mode 100644
index 0000000000..77936e3b97
--- /dev/null
+++ b/src/frontend/packages/devkit/src/schematics/collection.json
@@ -0,0 +1,10 @@
+{
+  "$schema": "@angular-devkit/schematics/collection-schema.json",
+  "schematics": {
+    "theme": {
+      "factory": "./theme",
+      "description": "Stratos Theme",
+      "schema": "./theme/schema.json"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/devkit/src/schematics/theme/asset-files/README.md.template b/src/frontend/packages/devkit/src/schematics/theme/asset-files/README.md.template
new file mode 100644
index 0000000000..57e6cf5f22
--- /dev/null
+++ b/src/frontend/packages/devkit/src/schematics/theme/asset-files/README.md.template
@@ -0,0 +1 @@
+# Assets go here
\ No newline at end of file
diff --git a/src/frontend/packages/core/misc/custom/login-bg.jpg b/src/frontend/packages/devkit/src/schematics/theme/asset-files/core/login-bg.jpg
similarity index 100%
rename from src/frontend/packages/core/misc/custom/login-bg.jpg
rename to src/frontend/packages/devkit/src/schematics/theme/asset-files/core/login-bg.jpg
diff --git a/src/frontend/packages/core/misc/custom/logo.png b/src/frontend/packages/devkit/src/schematics/theme/asset-files/core/logo.png
similarity index 100%
rename from src/frontend/packages/core/misc/custom/logo.png
rename to src/frontend/packages/devkit/src/schematics/theme/asset-files/core/logo.png
diff --git a/src/frontend/packages/core/misc/custom/nav-logo-icon.png b/src/frontend/packages/devkit/src/schematics/theme/asset-files/core/nav-logo-icon.png
similarity index 100%
rename from src/frontend/packages/core/misc/custom/nav-logo-icon.png
rename to src/frontend/packages/devkit/src/schematics/theme/asset-files/core/nav-logo-icon.png
diff --git a/src/frontend/packages/core/misc/custom/nav-logo.png b/src/frontend/packages/devkit/src/schematics/theme/asset-files/core/nav-logo.png
similarity index 100%
rename from src/frontend/packages/core/misc/custom/nav-logo.png
rename to src/frontend/packages/devkit/src/schematics/theme/asset-files/core/nav-logo.png
diff --git a/src/frontend/packages/core/misc/custom/favicon.ico b/src/frontend/packages/devkit/src/schematics/theme/asset-files/favicon.ico
similarity index 100%
rename from src/frontend/packages/core/misc/custom/favicon.ico
rename to src/frontend/packages/devkit/src/schematics/theme/asset-files/favicon.ico
diff --git a/src/frontend/packages/devkit/src/schematics/theme/files/_index.scss.template b/src/frontend/packages/devkit/src/schematics/theme/files/_index.scss.template
new file mode 100644
index 0000000000..403e3c6403
--- /dev/null
+++ b/src/frontend/packages/devkit/src/schematics/theme/files/_index.scss.template
@@ -0,0 +1,12 @@
+@import '~@stratosui/theme/helper';
+
+@import './sass/mat-colors';
+@import './sass/custom';
+
+@function stratos-theme() {
+  $theme-primary: mat-palette($mat-blue);
+  $theme-warn: mat-palette($mat-red);
+  $stratos-theme: mat-light-theme($theme-primary, $theme-primary, $theme-warn);
+  $theme: stratos-theme-helper($stratos-theme);
+  @return $theme
+}
\ No newline at end of file
diff --git a/src/frontend/packages/devkit/src/schematics/theme/files/package.json.template b/src/frontend/packages/devkit/src/schematics/theme/files/package.json.template
new file mode 100644
index 0000000000..783f7cb462
--- /dev/null
+++ b/src/frontend/packages/devkit/src/schematics/theme/files/package.json.template
@@ -0,0 +1,18 @@
+{
+  "name": "<%= dasherize(packageName) %>",
+  "version": "0.0.1",
+  "stratos": {<% if(!!includeAssets) { %>
+    "assets": {
+      "assets/core": "core/assets",
+      "assets/favicon.ico": "favicon.ico"
+    }<% if(!!includeLoader) { %>,<% } %><% } %><% if(!!includeLoader) { %>
+    "theme":{
+      "loadingCss": "loader/loading.css",
+      "loadingHtml": "loader/loading.html"
+    }<% } %>
+  },
+  "peerDependencies": {
+    "@stratosui/theme": "^<%= startosLatestVersion %>"
+  }
+}
+
diff --git a/src/frontend/packages/devkit/src/schematics/theme/files/sass/custom.scss.template b/src/frontend/packages/devkit/src/schematics/theme/files/sass/custom.scss.template
new file mode 100644
index 0000000000..7e10c12722
--- /dev/null
+++ b/src/frontend/packages/devkit/src/schematics/theme/files/sass/custom.scss.template
@@ -0,0 +1 @@
+// Place custom styles here
\ No newline at end of file
diff --git a/src/frontend/packages/core/sass/mat-colors.scss b/src/frontend/packages/devkit/src/schematics/theme/files/sass/mat-colors.scss.template
similarity index 100%
rename from src/frontend/packages/core/sass/mat-colors.scss
rename to src/frontend/packages/devkit/src/schematics/theme/files/sass/mat-colors.scss.template
diff --git a/src/frontend/packages/devkit/src/schematics/theme/index.ts b/src/frontend/packages/devkit/src/schematics/theme/index.ts
new file mode 100644
index 0000000000..9a868e1261
--- /dev/null
+++ b/src/frontend/packages/devkit/src/schematics/theme/index.ts
@@ -0,0 +1,110 @@
+import { join, normalize, strings } from '@angular-devkit/core';
+import {
+  apply,
+  applyTemplates,
+  chain,
+  mergeWith,
+  move,
+  Rule,
+  SchematicContext,
+  SchematicsException,
+  Tree,
+  url,
+} from '@angular-devkit/schematics';
+
+import {
+  Builders,
+  getWorkspace,
+  ProjectType,
+  relativePathToWorkspaceRoot,
+  updateWorkspace,
+  validateProjectName,
+} from '../../lib/schematics';
+import { Versions } from './../../lib/schematics';
+import { ThemeOptionsSchema } from './schema';
+
+// Reference: https://github.com/angular/angular-cli/tree/master/packages/schematics/angular
+
+function addThemeToWorkspaceFile(
+  options: ThemeOptionsSchema,
+  projectRoot: string,
+  projectName: string,
+  distRoot: string,
+): Rule {
+  return updateWorkspace(workspace => {
+    if (workspace.projects.size === 0) {
+      workspace.extensions.defaultProject = projectName;
+    }
+
+    workspace.projects.add({
+      name: projectName,
+      root: projectRoot,
+      sourceRoot: `${projectRoot}/src`,
+      projectType: ProjectType.Theme,
+      targets: {
+        build: {
+          builder: Builders.Theme,
+          options: {
+            outputPath: `${distRoot}`,
+          },
+        },
+      }
+    });
+  });
+}
+
+export default function (options: ThemeOptionsSchema): Rule {
+  return async (host: Tree, context: SchematicContext) => {
+    if (!options.name) {
+      throw new SchematicsException(`Invalid options, "name" is required.`);
+    }
+    validateProjectName(options.name);
+
+    // If scoped project (i.e. "@foo/bar"), convert projectDir to "foo/bar".
+    const projectName = options.name;
+    const packageName = strings.dasherize(projectName);
+    let scopeName = null;
+    if (/^@.*\/.*/.test(options.name)) {
+      const [scope, name] = options.name.split('/');
+      scopeName = scope.replace(/^@/, '');
+      options.name = name;
+    }
+
+    const workspace = await getWorkspace(host);
+    const newProjectRoot = workspace.extensions.newProjectRoot as (string | undefined) || '';
+
+    const scopeFolder = scopeName ? strings.dasherize(scopeName) + '/' : '';
+    const folderName = `${scopeFolder}${strings.dasherize(options.name)}`;
+    const projectRoot = join(normalize(newProjectRoot), folderName);
+    const distRoot = `dist/${folderName}`;
+
+    const templateSource = apply(url('./files'), [
+      applyTemplates({
+        ...strings,
+        ...options,
+        packageName,
+        projectRoot,
+        distRoot,
+        relativePathToWorkspaceRoot: relativePathToWorkspaceRoot(projectRoot),
+        folderName,
+        startosLatestVersion: Versions.Stratos,
+      }),
+      move(projectRoot),
+    ]);
+
+    const optional = [];
+    if (options.includeLoader) {
+      optional.push(mergeWith(apply(url('./loader-files'), [ applyTemplates({}), move(`${projectRoot}/loader`)])));
+    }
+    if (options.includeAssets) {
+      optional.push(mergeWith(apply(url('./asset-files'), [ applyTemplates({}), move(`${projectRoot}/assets`)])));
+    }
+
+    return chain([
+      mergeWith(templateSource),
+      ...optional,
+      addThemeToWorkspaceFile(options, projectRoot, projectName, distRoot),
+    ]);
+  };
+}
+
diff --git a/src/frontend/packages/devkit/src/schematics/theme/loader-files/loading.css.template b/src/frontend/packages/devkit/src/schematics/theme/loader-files/loading.css.template
new file mode 100644
index 0000000000..9633b127db
--- /dev/null
+++ b/src/frontend/packages/devkit/src/schematics/theme/loader-files/loading.css.template
@@ -0,0 +1,38 @@
+.stratos-initial-load-spinner-container {
+  align-items: center;
+  background-color: #0D2C40;
+  display: flex;
+  justify-content: center;
+  height: 100%;
+  left: 0;
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+
+.stratos-initial-load-spinner-logo {
+  position: absolute;
+  height: 60px;
+}
+
+.stratos-initial-load-spinner {
+  animation: stratos-initial-load-animate 1s infinite linear;
+  box-sizing: border-box;
+  border: 5px solid rgba(86, 107, 121, 0.45);
+  border-radius: 50%;
+  border-top-color: #00B2E2;
+  display: inline-block;
+  height: 128px;
+  margin: 0 auto;
+  width: 128px;
+}
+
+@keyframes stratos-initial-load-animate {
+  0% {
+    transform: rotate(0deg);
+  }
+
+  100% {
+    transform: rotate(359deg);
+  }
+}
diff --git a/src/frontend/packages/devkit/src/schematics/theme/loader-files/loading.html.template b/src/frontend/packages/devkit/src/schematics/theme/loader-files/loading.html.template
new file mode 100644
index 0000000000..cf66894e7b
--- /dev/null
+++ b/src/frontend/packages/devkit/src/schematics/theme/loader-files/loading.html.template
@@ -0,0 +1,3 @@
+<div class="stratos-initial-load-spinner-container">
+  <i class="stratos-initial-load-spinner"></i>
+</div>
\ No newline at end of file
diff --git a/src/frontend/packages/devkit/src/schematics/theme/schema.d.ts b/src/frontend/packages/devkit/src/schematics/theme/schema.d.ts
new file mode 100644
index 0000000000..394f1321c4
--- /dev/null
+++ b/src/frontend/packages/devkit/src/schematics/theme/schema.d.ts
@@ -0,0 +1,25 @@
+/* tslint:disable */
+/**
+ * This file was automatically generated by json-schema-to-typescript.
+ * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+ * and run json-schema-to-typescript to regenerate this file.
+ */
+
+/**
+ * Creates a new generic Stratos Theme project in the current workspace.
+ */
+export interface ThemeOptionsSchema {
+  /**
+   * The name of the theme.
+   */
+  name?: string;
+  /**
+   * When true, a default set of assets will be included in the theme.
+   */
+  includeAssets?: boolean;
+  /**
+   * When true, a default loading indicator will be included in the theme.
+   */
+  includeLoader?: boolean;
+  [k: string]: unknown;
+}
diff --git a/src/frontend/packages/devkit/src/schematics/theme/schema.json b/src/frontend/packages/devkit/src/schematics/theme/schema.json
new file mode 100644
index 0000000000..ff296e8e2b
--- /dev/null
+++ b/src/frontend/packages/devkit/src/schematics/theme/schema.json
@@ -0,0 +1,32 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "SchematicsTheme",
+  "title": "Theme Options Schema",
+  "type": "object",
+  "description": "Creates a new generic Stratos Theme project in the current workspace.",
+  "long-description": "./theme-long.md",
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "The name of the theme.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What name would you like to use for the theme?"
+    },
+    "includeAssets": {
+      "description": "When true, a default set of assets will be included in the theme.",
+      "type": "boolean",
+      "default": false,
+      "x-prompt": "Include default set of assets?"
+    },
+    "includeLoader": {
+      "description": "When true, a default loading indicator will be included in the theme.",
+      "type": "boolean",
+      "default": false,
+      "x-prompt": "Include a default application loading screen?"
+    }
+  },
+  "required": []
+}
diff --git a/src/frontend/packages/devkit/src/schematics/theme/theme-long.md b/src/frontend/packages/devkit/src/schematics/theme/theme-long.md
new file mode 100644
index 0000000000..1347ed462a
--- /dev/null
+++ b/src/frontend/packages/devkit/src/schematics/theme/theme-long.md
@@ -0,0 +1 @@
+A theme is a type of project that provides a UI theme for Stratos.
\ No newline at end of file
diff --git a/src/frontend/packages/devkit/tsconfig.json b/src/frontend/packages/devkit/tsconfig.json
new file mode 100644
index 0000000000..0a6818d257
--- /dev/null
+++ b/src/frontend/packages/devkit/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "outDir": "../../../../dist-devkit",
+    "target": "es5",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "types": [
+      "node"
+    ]
+  }
+}
diff --git a/src/frontend/packages/example-extensions/package.json b/src/frontend/packages/example-extensions/package.json
new file mode 100644
index 0000000000..736edab2bc
--- /dev/null
+++ b/src/frontend/packages/example-extensions/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@example/extensions",
+  "version": "0.0.1",
+  "stratos": {
+    "module": "ExampleModule",
+    "routingModule": "ExampleRoutingModule"
+  }
+}
diff --git a/examples/custom-src/frontend/app/custom/acme-login/acme-login.component.html b/src/frontend/packages/example-extensions/src/acme-login/acme-login.component.html
similarity index 100%
rename from examples/custom-src/frontend/app/custom/acme-login/acme-login.component.html
rename to src/frontend/packages/example-extensions/src/acme-login/acme-login.component.html
diff --git a/examples/custom-src/frontend/app/custom/acme-login/acme-login.component.scss b/src/frontend/packages/example-extensions/src/acme-login/acme-login.component.scss
similarity index 96%
rename from examples/custom-src/frontend/app/custom/acme-login/acme-login.component.scss
rename to src/frontend/packages/example-extensions/src/acme-login/acme-login.component.scss
index 627f586c0b..0428d529ae 100644
--- a/examples/custom-src/frontend/app/custom/acme-login/acme-login.component.scss
+++ b/src/frontend/packages/example-extensions/src/acme-login/acme-login.component.scss
@@ -1,4 +1,3 @@
-@import '../../../sass/custom/acme-colors';
 .acme-login {
   &__card.mat-card {
     box-shadow: 0 0 20px 9px rgba(0, 0, 0, .2);
diff --git a/examples/custom-src/frontend/app/custom/acme-login/acme-login.component.spec.ts b/src/frontend/packages/example-extensions/src/acme-login/acme-login.component.spec.ts
similarity index 100%
rename from examples/custom-src/frontend/app/custom/acme-login/acme-login.component.spec.ts
rename to src/frontend/packages/example-extensions/src/acme-login/acme-login.component.spec.ts
diff --git a/examples/custom-src/frontend/app/custom/acme-login/acme-login.component.ts b/src/frontend/packages/example-extensions/src/acme-login/acme-login.component.ts
similarity index 61%
rename from examples/custom-src/frontend/app/custom/acme-login/acme-login.component.ts
rename to src/frontend/packages/example-extensions/src/acme-login/acme-login.component.ts
index 6f2402406d..2eb78c1013 100644
--- a/examples/custom-src/frontend/app/custom/acme-login/acme-login.component.ts
+++ b/src/frontend/packages/example-extensions/src/acme-login/acme-login.component.ts
@@ -1,10 +1,7 @@
 import { Component, ViewEncapsulation } from '@angular/core';
 import { Store } from '@ngrx/store';
-
-import { AppState } from '../../../../store/src/app-state';
-import { CustomizationService, CustomizationsMetadata } from '../../core/customizations.types';
-import { StratosLoginComponent } from '../../core/extension/extension-service';
-import { LoginPageComponent } from '../../features/login/login-page/login-page.component';
+import { CustomizationService, CustomizationsMetadata, LoginPageComponent, StratosLoginComponent } from '@stratosui/core';
+import { AppState } from '@stratosui/store';
 
 @StratosLoginComponent()
 @Component({
diff --git a/examples/custom-src/frontend/app/custom/acme-support-info/acme-support-info.component.html b/src/frontend/packages/example-extensions/src/acme-support-info/acme-support-info.component.html
similarity index 100%
rename from examples/custom-src/frontend/app/custom/acme-support-info/acme-support-info.component.html
rename to src/frontend/packages/example-extensions/src/acme-support-info/acme-support-info.component.html
diff --git a/examples/custom-src/frontend/app/custom/acme-support-info/acme-support-info.component.scss b/src/frontend/packages/example-extensions/src/acme-support-info/acme-support-info.component.scss
similarity index 100%
rename from examples/custom-src/frontend/app/custom/acme-support-info/acme-support-info.component.scss
rename to src/frontend/packages/example-extensions/src/acme-support-info/acme-support-info.component.scss
diff --git a/examples/custom-src/frontend/app/custom/acme-support-info/acme-support-info.component.spec.ts b/src/frontend/packages/example-extensions/src/acme-support-info/acme-support-info.component.spec.ts
similarity index 100%
rename from examples/custom-src/frontend/app/custom/acme-support-info/acme-support-info.component.spec.ts
rename to src/frontend/packages/example-extensions/src/acme-support-info/acme-support-info.component.spec.ts
diff --git a/examples/custom-src/frontend/app/custom/acme-support-info/acme-support-info.component.ts b/src/frontend/packages/example-extensions/src/acme-support-info/acme-support-info.component.ts
similarity index 100%
rename from examples/custom-src/frontend/app/custom/acme-support-info/acme-support-info.component.ts
rename to src/frontend/packages/example-extensions/src/acme-support-info/acme-support-info.component.ts
diff --git a/examples/custom-src/frontend/app/custom/app-action-extension/app-action-extension.component.html b/src/frontend/packages/example-extensions/src/app-action-extension/app-action-extension.component.html
similarity index 100%
rename from examples/custom-src/frontend/app/custom/app-action-extension/app-action-extension.component.html
rename to src/frontend/packages/example-extensions/src/app-action-extension/app-action-extension.component.html
diff --git a/examples/custom-src/frontend/app/custom/app-action-extension/app-action-extension.component.scss b/src/frontend/packages/example-extensions/src/app-action-extension/app-action-extension.component.scss
similarity index 100%
rename from examples/custom-src/frontend/app/custom/app-action-extension/app-action-extension.component.scss
rename to src/frontend/packages/example-extensions/src/app-action-extension/app-action-extension.component.scss
diff --git a/examples/custom-src/frontend/app/custom/app-action-extension/app-action-extension.component.spec.ts b/src/frontend/packages/example-extensions/src/app-action-extension/app-action-extension.component.spec.ts
similarity index 100%
rename from examples/custom-src/frontend/app/custom/app-action-extension/app-action-extension.component.spec.ts
rename to src/frontend/packages/example-extensions/src/app-action-extension/app-action-extension.component.spec.ts
diff --git a/examples/custom-src/frontend/app/custom/app-action-extension/app-action-extension.component.ts b/src/frontend/packages/example-extensions/src/app-action-extension/app-action-extension.component.ts
similarity index 79%
rename from examples/custom-src/frontend/app/custom/app-action-extension/app-action-extension.component.ts
rename to src/frontend/packages/example-extensions/src/app-action-extension/app-action-extension.component.ts
index d707ffcb6f..f50d7c65ca 100644
--- a/examples/custom-src/frontend/app/custom/app-action-extension/app-action-extension.component.ts
+++ b/src/frontend/packages/example-extensions/src/app-action-extension/app-action-extension.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { StratosTab, StratosTabType, StratosAction, StratosActionType } from '../../core/extension/extension-service';
+import { StratosAction, StratosActionType } from '@stratosui/core';
 
 @StratosAction({
   type: StratosActionType.Applications,
diff --git a/examples/custom-src/frontend/app/custom/app-tab-extension/app-tab-extension.component.html b/src/frontend/packages/example-extensions/src/app-tab-extension/app-tab-extension.component.html
similarity index 100%
rename from examples/custom-src/frontend/app/custom/app-tab-extension/app-tab-extension.component.html
rename to src/frontend/packages/example-extensions/src/app-tab-extension/app-tab-extension.component.html
diff --git a/examples/custom-src/frontend/app/custom/app-tab-extension/app-tab-extension.component.scss b/src/frontend/packages/example-extensions/src/app-tab-extension/app-tab-extension.component.scss
similarity index 100%
rename from examples/custom-src/frontend/app/custom/app-tab-extension/app-tab-extension.component.scss
rename to src/frontend/packages/example-extensions/src/app-tab-extension/app-tab-extension.component.scss
diff --git a/examples/custom-src/frontend/app/custom/app-tab-extension/app-tab-extension.component.spec.ts b/src/frontend/packages/example-extensions/src/app-tab-extension/app-tab-extension.component.spec.ts
similarity index 100%
rename from examples/custom-src/frontend/app/custom/app-tab-extension/app-tab-extension.component.spec.ts
rename to src/frontend/packages/example-extensions/src/app-tab-extension/app-tab-extension.component.spec.ts
diff --git a/examples/custom-src/frontend/app/custom/app-tab-extension/app-tab-extension.component.ts b/src/frontend/packages/example-extensions/src/app-tab-extension/app-tab-extension.component.ts
similarity index 83%
rename from examples/custom-src/frontend/app/custom/app-tab-extension/app-tab-extension.component.ts
rename to src/frontend/packages/example-extensions/src/app-tab-extension/app-tab-extension.component.ts
index b9af9223ab..d19395ee1b 100644
--- a/examples/custom-src/frontend/app/custom/app-tab-extension/app-tab-extension.component.ts
+++ b/src/frontend/packages/example-extensions/src/app-tab-extension/app-tab-extension.component.ts
@@ -1,6 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-
-import { StratosTab, StratosTabType } from '../../core/extension/extension-service';
+import { StratosTab, StratosTabType } from '@stratosui/core';
 
 @StratosTab({
   icon: 'extension',
diff --git a/examples/custom-src/frontend/app/custom/custom-routing.module.ts b/src/frontend/packages/example-extensions/src/example-routing.module.ts
similarity index 80%
rename from examples/custom-src/frontend/app/custom/custom-routing.module.ts
rename to src/frontend/packages/example-extensions/src/example-routing.module.ts
index d2c405e805..6559ca3ebb 100644
--- a/examples/custom-src/frontend/app/custom/custom-routing.module.ts
+++ b/src/frontend/packages/example-extensions/src/example-routing.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
+import { RouterModule, Routes } from '@angular/router';
 
 const customRoutes: Routes = [{
   path: 'example',
@@ -18,4 +18,4 @@ const customRoutes: Routes = [{
   ],
   declarations: []
 })
-export class CustomRoutingModule { }
+export class ExampleRoutingModule { }
diff --git a/examples/custom-src/frontend/app/custom/custom.module.ts b/src/frontend/packages/example-extensions/src/example.module.ts
similarity index 61%
rename from examples/custom-src/frontend/app/custom/custom.module.ts
rename to src/frontend/packages/example-extensions/src/example.module.ts
index 279ef8a0b3..c64227f931 100644
--- a/examples/custom-src/frontend/app/custom/custom.module.ts
+++ b/src/frontend/packages/example-extensions/src/example.module.ts
@@ -1,17 +1,20 @@
 import { NgModule } from '@angular/core';
+import {
+  CoreModule,
+  CustomizationService,
+  CustomizationsMetadata,
+  ExtensionService,
+  MDAppModule,
+  SharedModule,
+} from '@stratosui/core';
 
-import { CoreModule } from '../core/core.module';
-import { CustomizationService, CustomizationsMetadata } from '../core/customizations.types';
-import { MDAppModule } from '../core/md.module';
-import { SharedModule } from '../shared/shared.module';
 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',
+  copyright: '&copy; 2020 ACME Corp',
   hasEula: true,
   supportInfoComponent: AcmeSupportInfoComponent,
 };
@@ -31,16 +34,9 @@ const AcmeCustomizations: CustomizationsMetadata = {
     AppTabExtensionComponent,
     AppActionExtensionComponent,
     AcmeSupportInfoComponent
-  ],
-  entryComponents: [
-    AcmeLoginComponent,
-    // You must specify the tab and action as an entry components
-    AppTabExtensionComponent,
-    AppActionExtensionComponent,
-    AcmeSupportInfoComponent
   ]
 })
-export class CustomModule {
+export class ExampleModule {
 
   constructor(cs: CustomizationService) {
     cs.set(AcmeCustomizations);
diff --git a/examples/custom-src/frontend/app/custom/nav-extension/example-component/example.component.html b/src/frontend/packages/example-extensions/src/nav-extension/example-component/example.component.html
similarity index 100%
rename from examples/custom-src/frontend/app/custom/nav-extension/example-component/example.component.html
rename to src/frontend/packages/example-extensions/src/nav-extension/example-component/example.component.html
diff --git a/examples/custom-src/frontend/app/custom/nav-extension/example-component/example.component.scss b/src/frontend/packages/example-extensions/src/nav-extension/example-component/example.component.scss
similarity index 100%
rename from examples/custom-src/frontend/app/custom/nav-extension/example-component/example.component.scss
rename to src/frontend/packages/example-extensions/src/nav-extension/example-component/example.component.scss
diff --git a/examples/custom-src/frontend/app/custom/nav-extension/example-component/example.component.ts b/src/frontend/packages/example-extensions/src/nav-extension/example-component/example.component.ts
similarity index 100%
rename from examples/custom-src/frontend/app/custom/nav-extension/example-component/example.component.ts
rename to src/frontend/packages/example-extensions/src/nav-extension/example-component/example.component.ts
diff --git a/examples/custom-src/frontend/app/custom/nav-extension/nav-extension.module.ts b/src/frontend/packages/example-extensions/src/nav-extension/nav-extension.module.ts
similarity index 69%
rename from examples/custom-src/frontend/app/custom/nav-extension/nav-extension.module.ts
rename to src/frontend/packages/example-extensions/src/nav-extension/nav-extension.module.ts
index 167fb93d96..41d79722aa 100644
--- a/examples/custom-src/frontend/app/custom/nav-extension/nav-extension.module.ts
+++ b/src/frontend/packages/example-extensions/src/nav-extension/nav-extension.module.ts
@@ -1,8 +1,8 @@
 import { NgModule } from '@angular/core';
-import { NavExtensionRoutingModule } from './nav-extension.routing';
+import { CoreModule, SharedModule } from '@stratosui/core';
+
 import { ExampleComponent } from './example-component/example.component';
-import { CoreModule } from '../../core/core.module';
-import { SharedModule } from '../../shared/shared.module';
+import { NavExtensionRoutingModule } from './nav-extension.routing';
 
 @NgModule({
   imports: [
@@ -12,9 +12,6 @@ import { SharedModule } from '../../shared/shared.module';
   ],
   declarations: [
     ExampleComponent
-  ],
-  entryComponents: [
-    ExampleComponent
   ]
 })
 export class NavExtensionModule {}
diff --git a/examples/custom-src/frontend/app/custom/nav-extension/nav-extension.routing.ts b/src/frontend/packages/example-extensions/src/nav-extension/nav-extension.routing.ts
similarity index 100%
rename from examples/custom-src/frontend/app/custom/nav-extension/nav-extension.routing.ts
rename to src/frontend/packages/example-extensions/src/nav-extension/nav-extension.routing.ts
diff --git a/src/frontend/packages/example-extensions/src/public-api.ts b/src/frontend/packages/example-extensions/src/public-api.ts
new file mode 100644
index 0000000000..9041d86a30
--- /dev/null
+++ b/src/frontend/packages/example-extensions/src/public-api.ts
@@ -0,0 +1,4 @@
+// Example Extensions
+
+export * from './example.module';
+export * from './example-routing.module';
\ No newline at end of file
diff --git a/src/frontend/packages/example-theme/_index.scss b/src/frontend/packages/example-theme/_index.scss
new file mode 100644
index 0000000000..a8d3f300e1
--- /dev/null
+++ b/src/frontend/packages/example-theme/_index.scss
@@ -0,0 +1,9 @@
+@import '~@stratosui/theme/helper';
+
+// Custom Theme
+@import './sass/custom';
+
+@function stratos-theme() {
+  $theme: stratos-theme-helper($stratos-theme);
+  @return $theme
+}
\ No newline at end of file
diff --git a/src/frontend/packages/example-theme/assets/core/custom/acme_logo.png b/src/frontend/packages/example-theme/assets/core/custom/acme_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..397545f790c3239791281ecd78d225af67dc4507
GIT binary patch
literal 18891
zcmb@NQ+Fjyu!du2f{AV0nb?}xwr%a$m^j(7ZQFJ-!NfLqY@F}>fOB^)s=IHyYOQxY
zUHw*+l7bX60v-Yw7#OmQw7AND`{;jR1PAlqD!GkZ3kHVJU@a!5BqJt9qU7ReVQps)
z1|}Vqng*+;s*N`W@;&>56&aYKBnF}ke87t)A+!sn5T;?Jf`V=!kL%Y`LIX!UC6O3V
zre(tt$JoeUtyfGC5y6E;)Dm8UWpK85zPw)h=6&wjdA-{L`9B|Txqg8ql-L!p5Nd#t
zh$YY>JU<tXjgBlj&w)c(1%lxO4je~@<r*6gfc?FE2jO+an~`^#3aVf11bo-29NrBR
zfaSA<{_HSOfEg@HaLypdFoy`7l-T#7XA4sWpc<Q_EszYBmGXFp*Zp?hM-s}IjY4{s
z^nwE8&zQlYgcQyc-hW_FU{i^x4ysQLoWdsIZz1MZK*)-5LL0Qe#hof`$22Y)?pu=i
z(w!04mgnNr9%c8<z}k*r#wu-U`kp&@*_o6EPS+MhAh|@-kPvv&%jf8>H<I8YqMt;}
zvgPsR2+hzY1(s_cNA?_8W=uW7C(X#`5%W*U0EE)26{zT4(j=w^%^$r@b|SScVtVT+
zWn%79YNkvlY>tb?N2gt|gnYgjViw7Qdr!Qk_Q_=0t4}Br^X%er_xmnm=8}#qOT}Tv
zpT@to@f8W^FM_7-Z&OF0l^Y3+OM%tBECRpN=H#A%BO}^qjU5@|V^4k#>6ZYNwIJgr
zBnV-g{1Br<YsBh6$a+|k<Tf_fN^g+)pdFeJFJ<y|)Fu&84&|;^`d|C%>I|^oTO%2L
zZ=WG&d@z4+c1+(BKulgpU@z0p>7Q6&KgcX=J??#fgP<2i)xk39dC`^s{YDaa><1%D
zfSnXZwj$k0LSupDl6GY3hkOYZMnxbKA<%;0A%QjnL(>9x8SqI!K^X9;$4?1@+(j)1
zAM1yohnNjS++}P3;Sl7z%bE}jeuEbq$jb6V1ocOuu$naTLO2qM>Nt#vs6zrX22z-q
zvl2uK5<Cff3Zi`|LV-y+Qe~)3L0-Y)JoG8u5~M)rTR!P2;RCeffSDHVzffdjxpa8n
zK@lg4ZXAVh;1I79Q8y-2Sk-Qk6FUIB_s331$&IZS2DB0d269OVn-r_^cDa%oKOH=!
zXpIPFzO0gZIgA>9C89elr37-3U{Qk=U1l7YR98Oayt35~A6_5iPB{JWS`qFdzQ3OH
zey3;;+(^(xL98P@rdsJ*zu7FHsfbmBD@HktnT)TEVOUJH7}CPcjR+gSS9$E{JTP0~
zx==PE?Z=*s-W!T|2o#Vlqg_YB_E+0~>j^qAU(;OkUvoKtJ;N&w+8)^7_`i5{gY|(M
z2G<Sc4egBf4afh)fP;au6r~B08>g}(C!lIZb3liII}n#33ptgIr6@&T`6(BLJS;a%
zJ^W08E(1Ii*Ad=N{+B2#GbW=c?N>Z!M%f6zmen1}K<Y?IOxl)AoV24#gCQ0TOPQM_
zvnE?nqF2mc1V}2H)E;j*Y<ICenmo!pa+vB#q#nl~_nl-;oJ(X*6rv4K_16l@H!9z)
z>DSOIQmS>*DbO@lORTi2!Kq9y&??p{^HO(Kf-f^GKdc&7pH%%-?513i7hQO++*3ht
zE_rTzPI(^4rjb!Ft)igLq$XIpS;JpgSZq>;Uel;jqIXmsof2M%yP(zVw$8N<zwWmV
z<jr*DKe;)!%UEPNdCHEjbX6Bn^R9%h{8Ra?)>r;_8L+&t<Wb&IE}$+|l~vBHWLVH^
z_?h%}qj%K7<jU)cc$}O5E)DsQ<uBZdR*AFpLHKBSX<BJtsgi5mvBZoqV`f@}M&&=I
z8dn{$bv1i#``#y}tNZo3Q#v<ApI<#G+cLy||IWkDC!VUEyIsUyu(=hvai4OX3oetN
zvpyz0c$~SP{yDY1h&VktU%3!sBf()oRzZ5gal-|0nBk1#IB?mq5}1{<X~hyq3LHeC
zjf`(ubttF))i<qXUF4bZ%DZL!xjMW}F;cvFSW0VmZZyfgWw~w|&g#ncGhIF7F*A8a
zV5VvMV&<K}3TprhpFxLVTkBkRRQJ06vhl;h+%eU`ef7MdCCNSi5$1yH!jp@Niy+G-
ztE&}5S7@W9wWiha>i3nG$NLr0s_K>4CHIEsYJj_w8!9gc4-)S=9~F-V&l6i}hVeAn
zF(!3vGH_9+j9nowhcKHxN0I0I%;Y-hSmlI`C!RH)8+6m{uc@!uYFkpZ^yfNl*JED(
zy!K$$qs}GZy5MBsvHZ#F%=$9p+<WQ%4=@!tUNv!1)YkND1M(nFiSJVkQf#YBa!hf|
z0I>_{_nGzi^q~d#eye|7fu{%N2NHt!Fvw#?s88X+yCLZjuHuUSh=!v>^dYiCXFza3
z3=)G7^9bk9aAYxL>7&F5Z4~tk7eqD<Wkh*52lo(J4ZeeB9;_L19qJ-0N0TEzCmSW}
zA#0NmjAM&V5_cD$l46do{qu!$@Kcq5{7*})KB2FGf<PSc3SN9nd|X`|vHoe7)AL}E
z#8b>2_LkwaR=3OTGUd740x(;jt}mtM!3=_ml&XNqIGAv<)+C;)5uF}gif21pAbUj*
z<(lalbuLwN+Bf4cQ!Se#{W7zg-J51apoGFa9W=vy&?k>9Es*fW%E)mgy>907+s70}
zkeu|OSy(24>Qt|^#qOw)sGx$ykVgNy8}NLGrkqf&gA|1wqsyL(w&*HmLa|11Hsvx!
zH}}>|<})&p8ch#P?`W1~<~ZS>aR9tuq<f&7t&G#l*?jEqs}j)EtPT1{QG2FU)yCy`
z)&J|;o%15<V)5U1=YWmaZ8!?PDOc-}^>NMA#m-@0g`gpmVaiU|n)!VY@x0JY!0EP0
zmpLfS5qdM&HcTUoGVG^BcA>41&bQXv!QsE+nyn3j)~lVkEv8lffQa|FOp}rQ?ESAC
zQobzDzn++vZ}q-s*Hx4rl(0{z&(crQav^fM&*z}6Ue7{?l1qaQO>fgM$&s|^`1kgA
z2hj8Cj+5}c@Lmuz>?<s>+M6bqCay**!64D(uZMl7hrQaobfIO9Dot#S00A-{vKsih
zvugM1nwrJ(4GokPx$}rPre8i6>2nSLVD7^wC3Q^qoSpPsK9=X;g?5C{+zJmU?#+g1
zLsT*4mr8>z%6YrIiz!Pa*6~)>U4PxUNoC3DE;3{F5%3ndmVQ)EuGybNp4`pK=g#p8
ztuxsX_a*=e`b@3I4q_UxK^{z}m%SKnXOrfAQ`lYnU9*PHJub(U_sfeb=_@+5e0q+(
z#sNiVn(u~LorIlPj=#3;dXC(xYAg-rIySD`m^W`bTwj?kt{;8xL64j9o!|MM%5@Lm
z&jY(d4-t;U<^p&D-PiEPG6Sk%Wt4Lqx$2)5AG$?LB0jBiWuVdf$dmYY-p{%K>~BHV
zgy-P9!o!lMsdbU80d_Heu{Hxn0OyU)iw}V38)Za@ZX2hE_pxj&k6Y423T8WcTcMZU
zr|#)%9JULEu*kS*Zj^0wR0s>8@~(ED@!D}AHw^?H&{H}6EHV7k*XoD(_GHFp>Y_4^
z)lgOghJfp&f({0X0~3yd4D>+++aJWO<7c!Q-BJAcqR4+xR(1p?Jo5{zlp!?-7R-H|
zMT^@$Oc-Y{kqE4{CG}5$Y_^##yK2l*uvT)?#Kd!?)G#jOO^c_COSiepoh|3WB{|so
zm<9h^iW{1cL%Uz}FH@$VfMp@DvrTwa#%XY>{}>kDNm|<#3=Hw-{{}c%W;PBOm|(w*
zxQLn;_*IT~irI?(&PC69+xD}&q?Ke5uFR8G<52@rnq7h&DLGPFwkdIaPAICVlXT#2
z0#rQjhX_f+5IT=6T<GB{X(LY{D;HO*<Y>}p8fTi+LM+3KbmsPRNoSR<cgxYeUtLva
zWmRXFPp5D3s=H!eZRPWI*A(c>|M{!+y^BecoRefeP#6*d8II%s@zDQF0Tm0HFd#N6
zo6F`s@TSG%ymoN(^yMcyxSWjcN`CX%a=`z0=JqRZ!VF<%W`=jF5rJAEyZ%Q#@AnRd
zJ`IN53r@H)Pl99}P;n2FN73(9=TY6PGIh`0Y0lx`Y_V*s%Np^uscWK-*qfLMV-xaZ
z?)hc&T9^xn&xSk%dh{w>6CE)1>Jiiw1Wn>f4!U(LND2yFyLA0j^uLX%^S?ADo>B^!
z0bj4sM-lp{M+U}VGymgE>!)lpI5t2_aA?;{u?)Cgnmrhc-*^;w*$o+ayVCU9S=`vL
zeaPlPoBuN+2V|?NstOw!8Hon)rS>h~Z*RZHR#a%lq6ECm90%_>G8uN`*jZb%TF5Wn
zn6tfl_8c+FwL}&%89At*iR=jJ)1-Um32Y47?N79}MF?a}$AuV~H}L|kE%akz7CpDz
zSAx*S!Vs|mO-)V51!55pv~?>vxp^orpZ=i2vBistqhLKTqs|@EOl8T{gF7!ku%=*^
ze7b|@It|7s;_HXbuPi^_md?y`xCmfYW~NI73b8`6y;L!#h&UOV;>wMaCn@k=EB0F9
zz}TCg7c@8+3=i1$I9Ho=$82h{cp4+}oxZYnxDK8dfX<s6f~vRQS_23Y|A5li5;T0O
z`@WphAc65kM^)~5-vY(mbaE3$xpg5AF<9|Zf*1LbA`Kzo+2n0Z&)Y9T2?cw{Q-frv
zOglse@B)VLONlvRD?3}S<`n`3Pfz9q-|cKiFFtX1Il$((!COPys*=A>?!pGiAeoBa
zvD*lR1Y7jKs{EcF78QN<|DHbMmaZjDS%4rS2}$0vXqg9}Jp=`is&%D@B^Eof<~Hh&
z2}z-6rfgZ*K8UF2_*e20jD5^4jyF)<qAhi)?lKL#038BKG!I#?AE5iLIr3s1OYBy_
zUzTHQkYfnV0e!(dH|Q6@Ys05<vfzVyE*H6dXpd;|<Xw^J+%wC9J1@7gJC$4G^ntu`
zMaRJZu*T8vBAO`R_T$wlV&hX`UBJkvM@XKxW^>zFrJSL&*AU~pKW`wP@cy^-cShYo
z&cLqfZ%K8h)e5o4<<7Ydj($`Lnv+Ma#TRgmKvI@7R5;@GTDt8itaLx&!IZJ9ZD;qj
z+Ul7(ainqR<E3*O)kzRaII=0~p#%Howek4{$v4Xtq8NM)072%8%&u^rd(m3Kd5IM6
zCO?09<}e2}c#L%Y`qtCE=iyZji119rTbNp8;S;+6s8CZK;MmZLf~hDXe(@@Av+$>b
zU_`=xgesqdl)#IyIoW)=9$JzM=UQJs`T+&=Dk$93vt*bxQ)2Lz0x2kW_{bur$x+Xn
z;bxhY*%>533?(SOA&vu^bQzt)+F%7M*WRx@Zn#$1x<Y9jNyE_h4Qu_1isQkYgT4>l
zb}DwpHIxTEX8;Z_sgl;>Xt#tr6FDa&gwa$T_g`g1))yh)?<`0;s#U;-T~$2;eUN)s
z<P%a3V5~dOgki^TodwIf9iDYGx%hrmJ?(1*d*9q0p*Bu+jSIzAFNpW>#gU6c31TGG
z+C6!LvENxn{J7FN6?)oqmDkYSkW#PX%M(Ia;J)qQQoa!u7a_Jh+tB)V^(Ds^xAPxi
zIuor;#7c@8EOuu-p(J~5$ke^e5(%+a>(xO-DEF=Sa-BaaY<rw4&A^vmi)@;PocnFH
zyPYNFO&g<H1g?33iQBdY086)PVoXr)x`9hah){Nd9v7Q@Lg0a;D}7&&rLC5E_94uK
z`TfRed&U;6q}$gAP58l97E0t?E}|rWYdt5{h~yP9;!n8!tCSV!LQiE2Uk0qIC?^|L
z4%C~QHTj;crIW*rS_3oq$r%@OHX=nA(v07JCfE!y=lrgFq7-NME%Oil=a)^?5EBX;
zOH;#%MUHZ>dJe4nw+uPmUvHS<iJDhy>pK`fV1umjKj&qgciW{$$d;gMU&Vj*cxW*!
zVY&Q^W0!YEsvDtZ2zBI4?Zic%1$+GDXmUYml5gJbTy_Ry>@cA-)mDd4?>VYIVeh^9
z<0$T{qYIi7E`~!O=HSo$C(5-Un<Wm`%F;8%);2vmNdtkF*aK{o0$g3qCG%?ELcsZ8
z5$)`3Zl-a^dfG}Hd0X)vF1^?D@vievtiZFUM(=oD)J(WTEgujjYus4mfrut?Au6s*
zdOJ0o?naf{1P0S%hb=6y{tQL5$YOH5`hD(?aEtyOiZqd;ZHwsMCd6+XL$X298IU4*
zNHh{O)akIn^xaj{sanu^9v*@{xFu<_AVwx`4syg{B$1oRXwtylqz?q6g%L=dI^tlz
z`ep5L=o0Wn{8cbyi9<Fm0%c8VBqUw6BPw2F)9)?7+ihzQI$@J~{F%b!N6l;+RJ%E$
z3Mjg3;<=Dz;+XM(DIrX&w6P=lnzo#_BS95`Tpk{>(5Rz1(mbkS*!)r_F;u~}F|(?4
z&<%2ysnYiJ#Iauo1IcXvyr9CddkAn1Q!r%jCzrr4V>$h8yohFN8!y8^;6bkHrXo%q
z2G!o3($<mk`F_<rX7Z6_!Nn)H)f8g|)>gIa-e59LlNKWm6O2yg+F=M`^cmY4*jn|J
zD1@k?xPe_caP`aJe(f#RE_~=pKPTrqnhU8P@B!vcKF)+@(OQ$hf-(;j{&E|*A|ek6
z2k~CNzVHv0<+Vz*_g$Te{T5t}yC9{hOO;ixksc=)2sQ4G5glG|S2jqwo5@K)@REi8
zrLcXg#6g!OqaT&A)#kQ0$k@#t`R_DOR9S!|70$Hmx#=*6VyB!w$Dg66k<EFG&@)9t
z$dL>!h~A5ME`nCqiT6~k%}&{FycV_YWx?N{&FHwp^#m~fbE{Ub7R8_oR{WgBrNd=g
zn_XU63uADJ0GG|$;y0;PDcf4L0N?VKM&y2h>k0qs@v*}C(iLYc>Et=A%!Y8aa0Lr#
zm<7pD{WuU-MDvj_G?zRNW`_zXH!AP(mUc*8iykG<V0$Zx`NWTPM^N?|T1>sMoYhu4
zm#VKXLc42>Ne=KjD=n*`p%TF;S13d8E`ic2i_#Dr-xSOZ8`9I<LF^%YnQRtYLltpX
zIDV~j*aID#bvrR3bGnwuC~kNAn+j^r4WjGEt}Y`Goa3z>fx)F&lOS+%!@kiuw6K^o
zMF$Z4^joI2{pj>B-Q(r)prPs@k9^TyhAw}BQeEQA7eXKol$J>mT_Uj<5_^M}12&ZF
z&$*FFHA)iFFKaB}={M5`d*GxzGk%>x$A0|#XO8vIi#aK4@Hru>RwSG4a;ovJq!*Xt
zk;`|4NG>bm#YVU}<;vh5(nr-Fz}oN8t@Z8g;MwjvBkewsuJ`s%FGudnf~}>wfUkQ&
zMXrr-k*gk(MHX)IW>-~io9|*)vIQAbQ??8R5FB>R?o5G_;Xh@_4SF8aMG@S`eK`WN
zFT`{FiMP*&!j>)?F^CZ3)kWRF2Dok;^Wt0{s7LMd?Afei&2*X-o9F5`CKlGS{Jp6o
zt<5`!wiSHwpPELoSjzU)Sao{Zwf<Fa3O$51{;nX;*n_;+*fIA@EzKXctn;)s-uz(U
z70KU5Ji;>f8D^Z?5V)LIJZX(OkMw-qJxqWkyTj^K`+EV@0fDB*g}wXtE|E@BgG<<6
zHmbKP4-CV6fIoG6Qa#|H*$E~vo~34{G%Zb%by{7k#(eE_e(qC`zpasMz!cL=hQ;s5
zyN}Aa+)E|=B*TnMxmw+59tvGj=??_tnoQ=Ish^q%ZKks^q-rxSCQ?LOj-R4xZ2(|1
z%TW8QpypF&;tErby=%dPKBXzC@)NI4+lSp&l8iE~6;WQ73FoqST4C~EQaf&MwG<VX
zj>QYWKiFsNK5Cd|xTPlFu1!u}t_)dIE@tYG{f|EELD88)S%_eKS-qV$8P|mX$Xl^O
zVC31xuU8{<pdAY^*Z1L~x!&lXs4hD0g&~d@3|&%^>TCV>#KGRC=C2q6Zz8untiDld
zjI)+)tpK@ZeYXS+)}aB#_iJ6i0K^=`y1%tE+8=Ihc$CjOFUO)4Ft>7RNA^Azr3Kgv
z=W{f?T#f~NwAVO0H}Zb3=o9Y?J@h^^!ua)`wA05pCL+_#*#y7_QD((LMEn)bV7OTw
zi79ZBn?i9myh`qDP6fFCgz-!4W`|#pFMQl^89^o8d7h+K-emI`e*j%B<MYNuf5bvB
zgVG7sf}akK?@*HKdVk&aL!zXtrZunN!?$mN%07phWegy)ezqZ!1zVFRztXb<@pED%
zv4al|bX&b$!E3dqdof26RSip>H~w0(;51Kxjk>2kW}?F6aOZj7j(7-mX}!UuyPLma
zOzq$7T(F}EB+H931QPTVyQaxD`TV2X4vBZCPPX>s%F6A!S739<Q&@}(YO>7I&-mT7
z_l%-sNX)*aK|g}`IHr|0_DUe%^^wfnlcLjm!Ia>gMX~QS2P;T|rC231dHwS-xSR~)
z_REQ3I(`+GhI<0!e5X*tp0N*x$7F`cj&n(Bhys$%XO<`OSU&GNupwJXrt27D3eZ=@
zvbX&&KkcC2_f5FZoaWM%i^r#hTqX^?WlI%73%hgW<ecSh9|AKe9U!As00EZl6cKZW
zS>D}9(;8}1Dx>cFT%~$)>^=;KH$xd)#?iz1`J}HxZgVWTl-ek#d>yp$ID8G~!s2}s
zm@!VU7yB^jj5u!{?MfVcK5LN1si!h4)u-T2ysKhUiB?VJa3tJcm3mG@#KlF#7J?zJ
zKDV6?S7lAh6WDg4P=FI`$d2gi(G^W^lF{-T`W5cb{<|S*_p6lRHV)rssXkm7i4a_7
zC|0k0fCMTzM((%|ziD;248t1vT6f0yC{U`Lp4a=ec#}piiBZ%f&!vO7;Cm<qtre|l
zmF*<i<SIjBvGY<8lVm>w&J}$>E89?)9$ilY9z_T+5Rq(Lwle++fskNax@Ow1dKp*!
zMmMkFKhITpqRFHw_e3{=_0`Hn+AbgZIEi&=SX7f2(Jqy~Zwcyt{Kt8&^0>mUuR1ud
z@)`FIazucJum|%)6~`!yVZ2)lnTds3kan2?%eD?=OKhpuMkO2a>@cw6s>6A3kA!D6
zGoMjbpdyL~4NKzI^}baKU3o-kYG|65;e>*al^u_a_~;WYe2`b6@=VK#PaJr?8=1fz
zdhD4HpDpTk`o!}%7UfV!r<3qQRM6AwrCxs5mMogK11a_qx6ibulf7?5#Fz+<HGA(;
zrMYq(M%kCs7*7vIf9u-iHFKfAh-i_bf36~tuX!es0N7@U5=^?H^Gv8C9FSV~-RL)h
z?J#>%sIjqqp|N)med)9nk8JnL8FsA4w#^V*wrWdB46LAsA9AuX5d;Nzwe2is6hWKW
zTUb|q8I)s>tJIBf8xcq64X}lsrJ(~Vgzm4O#8Ca~RW~6V-R6E^(K(WA?lO?1xO;7<
zw^p4s_WYT@TU`PoeKRL)w544)vGpu^f&$f-f^WJkL|31fsgfPl_)zDE?>&at#%qem
zgrpN-_*(uNBSEf+(civse7$GFd#3if+|M)+`(AfM7%BeVT-d5@;nZv{p&UBb(CT%e
zL=?()M1g6VFl%(06KG4-VxPdO+1d(D)`-?=3>!iEBD+fN|0Ue3Q$=WHXJ!mucHgl2
zFrr#kN%hBcERIv#;G*nwi3Mr#s$W7-3Ex}>+yn>Pevk$Os%;V;$^&&D3&ya<Zm&N0
z_kU!UF+0xU<?CQvaD1)-(F;3^=asb5yy+m+WMORK?Hv{6b~T+!e{vn{&UmzS1hf^!
zLCU;hjLD0uZh_>`6I5bTfCg`W(Lm14%r#}wC;6`4yO$pX%(V*>Fw{*Jnd<{{lryH#
z|NHR(gEN+1`^+@lSYO{XGDKmwVuqsJ>Sh?nKl*i5P#pXbQ%b88(p%5N)@Zls&&Sc(
z<(7&2**s<5B-!P)n8;|>Cfu5jtlkLyY^EG9vUJ`jkaNG42(Fg67|+k{9Onm@;SDGe
z9ME4kp?<RjK(=8soY}h>gf7qV;j^U~O;nCbMZY)h+TQMBbxie37zan$x3%M~4O$~3
zhw#&MMFk|aK>%EAFG4M*!eF^J?YGT>@8uMxI<~Or4gLvnwy@^vVmBNm|9AbP?Z)Oq
zV&@61V(?XIbfOkuq0)<fAiGNBh=G=_zP=cAX28Dg&fO~{cnyvi|Gix}Rv%~6Dm~1*
zUTcoIKj_(it}k8MjjN^k!}J{QSb&#ylHS9#9v4+ohhd39r&efK$cDovGls85{BWmD
zty%XF&`Vq}Z_Ls-=`bMBkqgkbkLWkwfv>_g|Kr4PM^dwMp#7T2cb$MFj72SQyC0LN
zWP1^R*K71X1Zch0uDz8@cvZeO_x4DcV+mUs%;=fKO2BGW(R(5d50K1JvA!sry!weh
znEiW=VX%yKZ209OrKP{NUqz^mx!_54*E?T^Jyz&<VS|L@nud=GuNWV{3(_ug{j8#y
zO9$<fU@=KFgG&^wd=xg(S}#o<R`VrhhzRhehf>&Ug&*+Zl+xNP4V+z8IM#XdMmwWx
z0yWNYSgvlcM&Q4+Lbc^7sqwA(<66X2o3^pYU&*cE(4#dZq#|2aTUGU2sCzyb@Ul58
zW>Uyu1GqQi#4v*Qk`)DU-6+u)tYu4ac5_#$H(;ZE=@fp3FuYE=0ida6v%!)2z-9!f
zd9PLz7`4uv%V-;HTDJx{_-=ov`NnI!>(JfY!ON`wnowE4EUCHUGmH~6g$0R|M3V?N
zau`d`I^lV{f7>d5FQ=*<Fjkx%O28|@I7cu3U~GWK3!Je|HNTnLW0oTSd%6<1%LZpR
z0fA3Ma4DI$1qmVTO361m+FuQXU}>DbNs=qoC9rIHq)sKCPT1=um)f4uw`b~%Q*1!R
zAH4MONT2}!`+*F{o+Mo&$-qToIJIm--33j~)HTfEmu^ayZj$D{7)3W&;<(z3pxW;@
z$q<4#Iv7}2by3rA&*G>}T#%=qf<|kC4$@Nk3*FxktLzjD@b_<H_h2N^@2K<wHIDq6
zetsc^9RONAmuKZfC5lCq#_g6i0ol&(2PnL!3JDP)ZUil|zyr4@)XzK>70U$%`X_d*
zkY=V<7luO*sOPFF$&p7(Npk+()wVj^%$d)WqB4><qS>9P%c)DMvXn;&JK*{O99HF{
z&3W1LCnxhob1X*EVdkGE)u&yM1qs(60%)4e1(q}^b>{`WZ<#IzF$E*4)ta=q^vv-0
zO!m>L_1CMe9qf^VcJEC7*^nC6QxVz7kp^4_yKyL~n&nxDCXJ$gE9lA_C}7aVy_T!A
zlH{E?JTHd=dQowIc^h6+wBT2$JY~*5{5|%L&M-xn7sk-Jy8JS*{|nn_lC8aS8y=AS
z1oaIOGCxPzQCKLb!vxzv-7XY8|Kv1qku!qWWcJn8*(I>OtbV&P1lG2{B~LgDo`D<4
zZd#+uGnMDM^Rn6DDx#4*Tfg&N#E-w9%e4ozT=aCoBddqjLlXqbl}IY){Gw!B<CJq>
zXZ&{q_k#aMGGvK(l}fp(QIp1<@~*uaLknkx05NIPs3TkyMQ8zL^u_PZDI)#4JFfM^
zm#XCf1M~@=#}s+bQ4cz@E%{v@@xr0pclFaf)dR6CrRNKXJjU@~smU{rj?lj@OIEKE
zt|})}6*hgIw1vd~4zV#C;x{P9VVB4<h)JRvxN`hpVnQT>2VyDStN{&w<n{s9YWaxc
zBW{WoVi)5&o$u|`w*`Giz<5<~Age5*=j!7NP7WvPxwHNRzp(9dDtp!}tEiURVePM(
zPB&7Lt9zTnKIZt?=h1Mu%GWYpVl@j%Z7`z#N89GvbiN`8HRXW~Y`58$IG7y^6U7<2
z`i~K0i9~w6?@BaQb?$u3YxK}81>?c?LWL=`A4?+&KH3^b7EI71Fx?zBjhm`W_C3Gy
zXlfW{5qfmf%2pMfQJ^D(M%#;dvr4)<u=d^6MfcAAujq}fjQZ|!K+RByVFp^|@rxAR
z6<CiKBR^7gCIbtc>6-@|UvR1oC+rt!MD&O@Ih#|}{%tdUKH&nchSH4_EW(TaCf#UO
zpN8W*z-gU5pd=_7<e*=2**ZpRCxbo9tg{ENJAO?We%-Ba?0k8Ee`OZum?0XGteFt`
z2TTK>`7<Z>^v-5KFmULf>TMW;qC6<&Ar5eb{@v@@UVwGZ7#a{KJM0$pqlwn@KP6z^
z$(wq8AiohKrXSCs=Cp#1<9prr#{Z|eWbpRcjqQ?P4ig?tl=<3I-jd1ol%b+Ep;pX3
zI&Iw*)W$=7xB>t#pSnhghA%oJEaJ<z<nVyweTljJ6?);P;9@+6tElapv@NxAADJ@I
zi=5QaLUee{S5f-#&}$w4_mMk0xC~mjic&5zTm<8Ld5``W&jfXtL4+&$3LGi<_Ws|U
zB>%+x6-F!{{iF41=X^Kp+c4o<8Xb=^vO$k8;uQi@{hq9ev%>}G^rs%LXQ~OlqS-St
zO^q6d4CyN)2=hp>zG0Ws(z))1sF1W7=5fF>k!G1uvGwvFktO(KmC(#B2bEV?OUyNS
z8m7GFaY0Z?@U4ow*q<C$c^sNl^tm^ZQ(+p>xOx%){+Y*IO;y~V`J;vR<dLGmxz$i6
z_f6ZdLb(u@{1x$OqC^}Hd>yYsb>Fwm4r{62>!u%-lWT|Zn`*ri#OJzazYIv%mZqo#
zE~wE-6BM_FU<^%%ix$?XWNP2xuC^wsOX+v0_hvpzV5}*fq6#=iLV7^XtYctZP4_%+
zcU|qS(CS78e9=!5vyyE~<e7(|LL6RFW5?ON)DN=YG9dJl_I(@PJHW2E9|C><4B=&z
z>Iodr!+o`Gs`00BhWoV4Ts`;U^B~{V+F@rc{s)+=>g|DZlkR!W?|rC-pW9Fu9*Aa|
z<fw2M78aI>b~!VC-xJ9(S@<2mo#p=S=!JZ<`^(q+t8qB#shhe+x&uZ;;Wi2cbuqyK
zy;qwm)X76M7}Yv8s)&_k0sBSSfw&S4>@Zk-nI@#%ZUlcSQq|zf5LA3^*&VM^T<LM_
z_}ZE)o0bF{-c(s=z@8IvB$n9-T1*mrTkBgSymd~W8?8+7;K$_$VD#YmM1fGKw;ES5
zb>qgg5BjjD$WA0fmE>J50Y1>k4Ly_6a4Chgy^b;iRjWOkC#!h9qDXHl)wFOvP47xj
zZMV&u9b>_@V~hhbrWC=8_hviGE{GJ!##oV|oj8hSP#TxRGr<4wCi^aebBx{l)Y3Xz
zTbl=&--xn_kU)u|R*wPu&z_f%jDrm{gLgZBsqeY1rNi3Jthnt|UsVMymZQO9uenvL
zzs68Y1NV_U%*og&%*UnAYWsOI=gH10&G{*#g*CI=`Yt;FniFk4g>qq!GGhyZJfd7@
z@w+YoexXW?Bwdm}PGOa<#z`foaej65byIqS;)Qlb?PzC`YIRI;MS^YwM<sf(#>zF5
zl`6hdFoznyQJrwDxn>-zOO(c6KS3ouL*0ubJPv6iPfWVfA;Y6g=U)&<@q+Ik_xOB`
z9-$8{Q%Z>G?kh}=Yo0w9`ZL!?O6$nlt?ybyErd(AX*FHN0%j>fKSP703>*LeiS3ry
zrewj1SnswSkgFxzmnh4rB?(|UoztFl#8Vi-yYgR;j#Wtl*6hjs-n_&#r3A0>NGRpv
zA<1Ia<j)3l<)6jEIN>u7O`RB;wff^&VI#jMTYkAu^c=rIrQF!8PM0k<j=hL{RH_5t
zHg66a38U7K<^#rb(^3<Ej9Q<N$(`Y_PYv6ss*<J8!1ON|tglRYfH8v{(?+0xRY1ma
z>`g6jn5i>yvQhsSbuPALWZN#{mD8PExP#ujmna(F458smwqcsSWW@%0ymH$l9IcK_
z=2c*ZjNr>IKAl<sN<NZwOUs0@Gnk;pu#Wg>&3c*NAS1(l1J|IlLu!SWp*R`=&MACB
z5BTyIWaJ781f5x_5!jCe0%8(UE$qH#xp(Vzc8I>#(q)LXLBlcs7=*R`{SifT(D&1)
z{Hou7W+<xjm?dG8%1~4SA(})h>*}DaN#9UgjNmuE)&M5O*f^g-14mB|j85RY*x_2h
z+P-`9POzXumTdnz*Gg#wQt-eXv4x>K;;c0!KM@#dv&iUe+SWJ<;I`v0(zF32j7;B!
zOy(2(1r*uTMl!Q*x0$W}c=9ZHr2Xs=gG05<zX3|zqBPafG>J8rIDDyQEU2zk_Df$2
ziD|okzpYa#ihEc&I50{9LcWYJRtCgyHe)%#jZlk|>N1U?Tn|N2#y)yRoZ5E{j>6-y
zzN59~h|BRob3o5HtON<~`|0bz!82QBG$TazW-&VJ+XvHT-`Jk>s-m`?+;iXK3<tm<
zg{GCuM!;HdD+?HJvsBFPP$4r82XAM84CS`9E#bG6q~z+f=P;+B;B2^DAF0&9kh^3=
zUC~Q4gQf(|U7G!!PXHXrj}F%kSa1*6ohpW+&19-$U4Fy<un#0VS$z#NDA87!uK1s%
zg*jl_puNw^#$`lsJQ26dpj@h8NtsrfCnpDo9}y9)aF5Y7YtGOl@pm=>qo=}}EA(Q-
zZ}XSbg17L{toigzz{ucTm_*KO5YO<QK8bhT3d{B!xqbI}5yU_f)^APHV8z8c<tHK`
zI>UP1HEGxI3G<DfP0B8b61)FeT|_8d-fsnw{`LOcwOBIiAMJ0jn_t{?n;jdDeSXVf
z7aesaM_UiZ>2Z_2XnVe|X3d&wqIS6+(lw-;eZrr~UYJN!?s`K%;JX_<D<slaJKx@C
zaPaz$i3W8C@R-U}tTnD2_v|VeVc#=tkoP?>SNV2sf)*C+eW%z~@4{2sE=PSY))Bn|
zkcTN0Eu1v)Nfq@&2h=K!CeV%i7QBI}-O8{#V9k<>!%|9c8xT6TfHonTsXrps$v*7j
zNVuWTPk8}nB}Zk<2BDJjA&|7wtHa{->nT))eki1hj|%}cIE}@8m#Vk~G;_yC-mT*p
zLZg+uaZ<J)H&H+Fq=z1-+4-)HU;vG}cH>xOiukXd-3PI_=V$Q3k#XxS)w7v?9;0H$
zs_6A82aSYInTrb>3fT$DbN$paVj*TCpq4AFcLv>*7Mbc|hBI2Ea#EwhFZ(Q`$5=2I
zQdu+{wPEoo6(bmIg~Y}l3M*fMpWChOOFr%Ng9&YyNPIh|^CZ400huuW9@38d(|-K9
z<pl@xhn-uO@i1j<?5efVs9UCqd$9ulSt4N#&J-**1GSIFLc`3wXpMWwWvO$0IsJU-
zVuF9T-#{6Z+H(RK6(7PN)zD6CNv9xM%;se+6pRl<V1^k3e>)}@4$>e!UHQ>eG*G~s
z8s)N2LMmG|NYk3AShjgx!c8btI}v1q(0jt9Zxe#qmA9rlMxb`pmahP9RDXrFtp|bp
z&%PC@<c|i}!e2?!ZOwl=_dt&~zldLBHD-4xk<)CPo<|7Djsq{3KNZDwf(Ndxcs_=@
zy_Fin0uK((gHqqr&nFt#HiXO9)*G`Zp=NC00!yjDcL$9*;*;zdcJFhJTz5EiOMIr*
zRqkykbh%JZi>#CA4<VWT-9k*3*W3j-<+hOKs6?_eI+mATyFl$lIDcv_UXQqqmp?B1
zgSNQ4@xy>8PQ4+Q!D^GaK{nMmLzj-F3m8rLt+LTH=FT-U@m126$B&D!_7^DvWFdgU
zKgyXop@9b0+v6u9rK0SJ6wwp7EU5!8dzFE8nDJQJv|}#>j(4wV4tyTd|5old#r5$=
zd^Uc2*QD%-zH@a};^wv+r__;8*m?R~ict<q{rCR4gMDV(?{!!qwk(-<Xvd&GPgze?
zC^^pcJ+GjQ<DQb4;m===cZN#fG)L4a^ih5Ad=^yhwkjjb&KC4IH-Ns(*5mtXE0EW2
zwubhq&`%2lpjI#qqAKsU{F;7PMJf44M?Qm8UO(GBUaM@j%o_csdX+rL7IET^$WH+3
zK2qYiIL;p=O4TqdYc<$VCy4fnHIe+Su9JK~3|*Se13Wd64~2xh{xecaQ}$kxm8lO3
zZHfLjeTW({JHyv((8tc?l1THz?Xk;8b-N?R4*Sz|oijXsVW(tO+HL4@Mee5=b?7YW
z&oO~!a~$o;IZ0X47fE!(cDOv&#NQ>eMus@=Z@^v(Ze+f&_xCM3R8ZNUPOf+n)+`I;
zin=2<R+-Si9WzXVcprZD3(K#La3;eaz8f2$qYnOb+jYj%A&fam(wn*xjF6|*26Q2i
zy>*nCN(BlS`D>Fkw7?CNUb77oddFSez@J2tprs#$3wHzM+P&T8*z^AR%V*H_kPPp4
z9oE!M>?Enu`{jy>v^TTaIx}V#AbvM#G{JK!1WpL984O$FChQGT)}!E1kHZ1GCJee%
znaA2cv06~X_4*UIyAqRbFFG@&x|EOb7$*(Qaw_-d=puHg65f5<5MF7;!#wO&gG;fh
zD{x?V`2Tg9d@d5nM_ftmz;m0J0jt<PM&CYO%ZmD00#L;bNm;{e)nk)#ib6f%yP)Q*
zEOA=#edBm29pM^5^)072suQw?O!jfvWE{#;wBTdG=Z?9x%jzrWKW&Wmt>%c6w`=C9
z&vKX4wO7rKiSl^(tX4rYRdv01fdWWVK;-?)`gf(}1i!w5C+V&>S!yi!{*I4H`nr_e
z#=I8$E)zJfl|25nRwgrl0`X*l{2fUQ(wS1I1k=M;NW9vge+=CA@aG(TNx00n?x^8*
zWf}))H<#Q}d^nO*8CtRo3kB_8at^-qs?*{zP|^t(;{#6kT+?&Eu_1YoY@eBF+x|$Y
zU+w7m_w-pu6j}k2aeeR#UsMx3xCFSL>F~;%XA5c4Aop>1+5x-}N$0{7&$qLv^_3;g
zKQ~^X@8Tn&Rf(g`Pm={GvllaXhczXrs)@v?pz0++)53v$Bk6zQ+S=l?FRtWs1ie*q
zAzHCHs<eqK51tpkM0UyKK98FvEvRQzX_{3wN6LBnT;=2((fDsG77Sc*xkvno+++(0
zUMp|ti4p$95ef2t??(OX8m#ld*Am#M?yC@q&E`K78CQD%5joJGw<x?j-&g20l43C5
zUN@dI9sH^__l?FW?Am@U{pHy6s6jl~sfYc68U}g!$0z!6E$=XhoD>XZ%9by}ua>*#
zoE&uwE%hb^snOyNcfE3mWCYzx$W8r=(UGPOZmXentillOS20s=U=GgFI~*J@0-C~a
zdHI@MZCz5$z1%|eR(MP^#PRjXWhmAG4&ZM2C{3UU%wPkzLCx~2SJ)>UKUWK%3ccjf
z`({3&O;KUe^kSL}2FYSia&pGvMXz>z145fw6QdW@DF^u)1Hq%6Hy=&dGdq9YfP{r)
zul9$A$}l#wPJsgtthZuJK8FIPsp{XdNtcV6vd(4~K47oxzo9nSOTvMnYFJO+v&wcK
z)knLbtcRf|)@VsG{V=B&>~_|1O31VyuL<jpu1W7Vrh2C08DDr~ce8!oF-<dEeOh0-
zFnQNOK}FNznKJf;`O^!ry16S~4mkVF*!?vUgfxbafKQm=w8QeCI$94pn^l}Ekol63
zu%Vmul)Kr6i~71+>CC$rf$hz&o&7Cde&z4nCnofoeM(fpBN+;f=5B1umAhwU#&D7K
z_p_{Kq4oFLahwVSujo^!5``0&_`(pPp8GUiIu0fjfrn;p+&LIAW&ZSxGwYZqHnpc5
z_~>6>q3=au%gZOm0TRU}0w}pBxiNzf6JKOJa>wXzsYBY;1s<9TSm;q>=>%gA-c!1l
zCwCAIS6BAjfL@ef>Y>A*d}$Whc70B%BP~FRr{&%k79;r*7|nte@m3nHZYpC8Vv{w@
zehybHq+YJ&3qZvF!2&g|TlqU2`|cr`6i-jV=xu$;^drET<43aDmcOLsvE{#%TLu}N
z*z@q36==XCLl7%XJmMJ7WymDqo<LZjcwT)k+tobR-F{-~qQ^q}c7%PV<#G4m`_$U<
z^4i8!f@4)-V3CGq441TA^WgKJ>bJPRF{$!*{YlK|+MkEiLfUBq6VZjg=?D4YC=^%C
zuSLl*Wu7IyozeFMwG}WXCHkWv2D=1m`xQ?lLnk)|d|NLize_&`jAE6<Fbmjv1oJ-n
z4r_bEvpFQcw@B(EW$bHg>drSMR7e-j`%%`Ny$G{a?F_FNFs2h3Ygt||3#auhw~*#l
zz}+;e!n?eU@-f>`o)-p#nNd?bUEOtbb?Mz6A1UF6v*?9(yMLX`de*1XY{tD$UfNZ~
z8|iHH1R;}1HOG`_bEs?(e(P$4+vn?PYdf2||KTtu(2=D83<PrI@lnfX=-)V;*Yy>V
zW9ENh8+eiamyFb%SU`(x@{!(`xwxR`oT5B!r4sbV$Oh;8C-je=3BUVr{Nw!W%`^9>
zvTptgZAYKIFeWnmPD_RuQ&ak6(WCYRcnZ(0ndl}#))cl1LgKHR2xo(vPQ%=6q-8tU
zbH|a>x66s-rm_|?Ug<hEq;1cg_kKviO9_vk<+!@kjMAwo>Lor;chJG^Mydq(lPg|Q
zjveMt5Ldj?TsF*C4&597m&0`_SUBuPlV0p#yCp1;ONbVNyoC(kw*>?iMoi`Y<miNI
zVf=Bajo9J=4&KgGgCvX5<CtIj1O!GfLKXSI*k4zM`T7^6`Dj1N9)zNg;^5%aW0I~T
z4m{J%{FMD^?&&<5Q-dYxQM=a59<3mX*ADR39hqdmIPo&-PtJVGEQ2xDb4_s6FW^V6
z?K&%EQp+P<%I7x0hiiOPOLK<C(j8rMWK5hAI6;6)YBLP*v(6jWpv(=Yxjt6Y<4_ZU
zyQHe;53OvHNeTXAmU@S7r{I&DE;i9dz(>XD2F+F_5TTHLI$iIVc96=q)-QokNFiT^
zz*8qrqoGlGyu8fYZ1NANkfXC*t^D&Zx2NZ`r4ylLQBqte3pX%=4oOEm;QD@o%R=Ah
z>$T$S>}=ZN;#<RSyY3x%aFtp5x`2R`1$K(#AdM-euN7XZK7MoDp`Qds{LC$i#GJ8+
zO@Bz}RC|+bKP(k<&6|zQz(HdySo5g^o1{Mer(#QxZ1_x8Jz{9R##DWzJ6)aE0Q|Lp
zqT6eWMZ6_}ZRcZ!q92`s-k({PE~&X3d@4GV$Z@Kb`?O0c^(yGlOSVsc34=NGTc;oU
zaueJ!)&FJ)GF2&fMrI`B{UKq-61ai*{rDofj@*+)1STPSc$o+MIPnT&Eos=;)Yh)i
zyB+P9-c4;wN<tf-YbOC4crQ;KwUW-9BqVd@_jgBFn@obyyzYT#FR&tMG;p>No80WU
zKX}QkP2(Vnj$G(T-h!(t&iaC!lIx}8@0$mI)w(hl{(2VW`&dncGj1`eUZky{Dl4!V
zAlXi^x0<GhV|yIsA-G|t@eN)b2pBNsWx-l^`u61H&fDD*K}r%rENl%PQ?tdtQ;SVr
z^$&e!bi~lxHc}d0<kVB1O(32HU5c3{`N{?@lS(IC66Z4z^4%PuCRJbKN4eZUB_t*b
z)Vr`b9cAh0nvWQo(7to5P+Zd(9``;q6Ie9{x#e?mAnc$+kVHh~*&+H;{Hj;FVCW}h
zqc5&_>gEVRjc%!Gx`80E#K*c-uz2*p`(YF$G|U<3%v7GCl?rD)r`L{3`hXIl?|K}T
z&4MiEK>k^cYOgm#H^-C=>WrZ5jYsA8@rNrWKx%1g+kHY)*CvPwuMs*q2}n?{jB)W9
zXZ|iHnpA&C{1fBKLUOJE=aXO?iRl>Gy55D~_cFp9u10iKs@v+A>H(nR2^9@|3cR@+
zu`SZ$^<2ls^=<d*2rswA5pRiikz_)!VI$oMqT*~$G$4oT{<xc(xpjLZCz(Ojx(8?J
zf~H7RHAw4W1`4M@L9s%bj5BVfp|!94_8*DTF}a~iUc2mr?il5tIHc4<CZ-<{Na2*u
zjlWfZg(|ck_dblGO_f?>Ufbe~y{KS@YIwZYg@v~Q9zgVcN4iL9TYqUp)L}pbb&-Y}
zbE$v&uKzXeLyQp@0Fr>kbl-731hykQf{KtfTr>WgD6}w+@y}_E8!h@v9hrSfPBtM$
znr?jOC;nOT8y<5#lSOvTMJMGuJrsv<tGb6L+J)5f=ao$6@bahW<u0D-D{jTuM!y3{
z{lm6iMH9UF(@P?l(f8!@H1|!Lc38(sOa_iZ1p~#tf)Ez>Fqx8=^Gc#ku@E8%gHvKd
zoO7s=c+v`n73f^Zv39aIASBjQ-3rs}EHj@LlIL+FKYxuWZ8YrAw=cOjF6|dRixWsf
z;Y+h=P7If4j9A@zHEG^)N}zSl^>}0ya%h?w=yq66If(f;tXysn(A-8ojcI;lReD`|
zvtO7Iwd$MEUIVlf67ieafC`Tl)2D@#sU~Nof?Hw)8EX*3sovHPkCu>(TdcMoDLHjX
zSCy0+JOcmIJI>SEFA11cKy>*HNvsEGjnzcNs0KqO;nF$5jUZ#+bG5#uzP>pH@#WKj
zEBY~nC4?vs)R#~P1j$nIkKpeW=@{l_bzvYw6&icb4Eprr$&}7dNCQP`;fLrxq#&~9
zD7I)f<kFf%A+X*>Nv0K(3~%e>lnrod=HIP%-~^TO^mVngt_1<BwdEhg!_C6g8-{Yj
zCI^0gepddA(c5T2M|faG-_%Es1IO0B5M`X$Z(i6xXiN_>p=?om@;Rd|&%;~a<C-Gg
z4?eP+{Z{=1QOeGL?9)?gTzXE>XiViRf}ivJxQzfFpD??E`qes+2f;d5ei>u4Y{0+-
zlPKb>7~nEuAS@oTkJ(lCEUVTNs#3=hXsc~BcW!ze{J9Zx*nd00%mxQoN}59l)+fPr
zu5CN5hQz5dt=I4`;*#9qY2-rp&J9<8EKOs&mg1x+0Di&zj3(EkVrTcJ*z_%#J?gP|
z$ugP+Dc%SMWF={_*J)mVHAVa&M0deM^}&OP4ZKNZx<L(EC`HfCL*J*3AtpGz$nYLY
zB){YFsHt+-uK$g~vasz*E%Z3Q1NI0tZrG^}XwS?0PxKY7{%K>u@DqQ$!@s;4vq*X%
z_!{!PBnwl$5TvuQ@$u;{a7?_wI8Ph?H@r}FZS`;>g7hb=P*WG`PvpQC&MKvw!d?PU
zOOGE&Kqjgy=GE%C>mE8&;>q7`%<wZHZk}kWeJc-$G!X5~esreAoinnsPVk4wAx@kk
zlwC&CrohWVRJn#g9QS)6Sy4wE=eE&?(3}!C)I`FpHAP-q+bo$j!B@6YgCW3uFAFKo
zJ|r|J_|zMCUh7v`Rj|^ly|cwR3Gs)O0jiI{M758d_}BMU)1z>yd1RT%F{X21v323(
zl>gqjy@LVC(Kbvl{q%o!nsaGrp^vr~=iYVv_hx*j3|dd#gUh~hFb4cd7xvp1wlqlG
zjZ4=c38m@%UuuHmW`v<ul@=BbM%Zr8X!R?n=cn_uzYXBz5TGWwTkV5=3bdbW4_#P8
z&r(}jTluSuBtDnK*ky2jsGhmKFEaP0Cw+0H&G;Chxu-=zysnA2eia%>vwAP_!<IDO
z^nBW&j&ARIsyi0Vc@7~q57IT0DW*V>vYhgI-DuMj<q5c-t3ex=lL<u3C~1+c>~Z%h
z<9l8X{~e>UglQ!OHV1J;(w7YHt>nricqDzElzfboUCK=iY|v8ykzy#*MkFQIVFztY
zHJ1MZjV!50$9BrdTK-BpYOxS<U;UF66;lNSBv}@*PW@tM6A*a+$-R^P>p$-v0|Tav
zT;l5ZSH87>Y$}t2wE76sT|?UmOr+}HrQ#zO^u16cd}a&y?UnU)od%TNbn`wz{Llu&
zgiUi^5^PwB)dp`l$6%cLQ-|5^=cCmQ%}&EF3Cld-cWWPtNoBevJ9(49kp_Qw&m@{;
zOZ0e36td8b5EV7J(Q(mrG&g3f4&SK_#kq6Sx(tb=rW^rZjl!(w2&QQvkS4{jkTIsh
z3vfjZ>Y#p2HuHNs0@BNd%s=K9I|&Wb>LMhDn;o$O>N6nC(murpLp=m+%8uEN#(vj%
zrcOwx6KVZV05%E9_G%Eufq{1Gg0n3x1uS-HurAHOZwxS)0$wn=2ZO}Ksykj%FZPDH
zK)^!3YH`M%tqN7`Ae4**5g3>V5vVKhUe6=k!?#JNUIk%;%Ad<EBLz#B;(j%b&}I@!
zEtE@&Yel=YvaHvs`>T-0x4A~p*-8s00lPYBtx^0g)AaKG_mjba1^4+bbuuMO-ZqvY
zz&{6GIver%0_@*G+A!46>Q3u!BONFNS`jFTG@u~I7K6P(7$5=&pkQpF&d$zqM77%k
z!b#2Bs<>NT&evd8E?^r-k1Z`}+p)Y_ZDa+JocsvMXm0`_cR&HIH+Skrgmz*NX}@;}
ztd>wBRHQ|G5#l@Q(DL@#MNn@JgqB?dPAsn(UBuxWsq6^-qV@np&#u>imJl1kH`lL%
zAu+o?{_CtjJB+HRi0^Cq&C;V_eR3%op_~c7WhGD4vA2G6UAz6=AdKBYY#;KYamqFg
z42%eYIbTGEtYWEtu=@=-4z>`VR<c9|+w{~^PqhY`n*I$lc?UCRh@;igW-9e;Qy?J3
z`39>ExWkde#Uw+ZWxWwrs@2!s{cUdBHjLuq1^lt_a=nH6he1rq86ph%ZdefL6+$7+
zV?&WVTxy_`#h8KR`zM@vIDy-`0im|}L!o~T<@Hnl+bBZ;`91=IkK%y%_!Cb&fhbjo
zBV*|G@+6yv!VoP{)~Asv6vRQx3rBx=b+Ao};0G^ZwU6U+KSoSr>y0<uaNvGYYD0rC
z1chsy6g&Y}jx`wnH3mRVcM5T$v2Zhkc7rHs1#5Wn$tUx^Q>U`8T)b$U^!Wmqxm$4o
z9|D28a6eTjqZCeoie8>&X~=+3Daw+!ts)aBE|+8hxp5>A&YQk?{(P4BTaId|ug{xZ
zTZ?i8o6b@1fOQfpq`BQGBcD%Vt59eko3G(nDS_lzPO_6zSFVggtj0Uv`OZ}Wc54NZ
zwOraW#k^|aT>^R)nprhsoVA{~?$%pNW#|j-#Ow_TLd+ol7^{PAw?RvmPvc#S>MNN~
zrA8pGnr`tGh3)f?24U<oK<g>)#EBD`KRt8i($S8N1g98X0YMawrk{7C%%C5DN16?J
zy(<K*n@K<W?AT$Z&$Vp!4rb&&+_K*Z0kojzRSf+Y@trP!h|6oJMTyms2D{HeF!Lbg
zNiMmMyoYz@@X;6_Adc{=*ZYDiopuFdv116=eW;?|Po16AEqjXCnRC21!VzXOXn*4F
z)>b$o?rxEAQBNO#;DLn`F4w2fiVefd-9>KMLgW(C0dc*9m2HGR|E-oQTb5Zbkmn*r
zi*;_9$S98n-R^O_8tTigtmN0&tb|oPBfG|JH{3vXuU%>o#<hcWc}<0n-gTGtrN<vn
zhTGd`nK9+~(+v_!;A}-0MThGe1QP<@P)Pidm)U<91n!0)#M*F-v3=-@Yz}M8&T)=w
z7Qb)dgE2*Zohx!e<?&o9&n!qQ<C~Xb%@SD;rjA^0n23+v_&Vv(8$~0OpEq_wC%QWF
ze_9%{t*{XrhD)a#+3CWCT=J%ymT(7&vX&%ir&cA!`}Lp<=w?kw>8y1-FIp^~OQN>f
zHl9hdMHKH~97})Q3J0g+gZtkgjDv&iP9^6frn$td{YN0~5a)sXDhS#oL<X@V2p+!(
z^5>8zBxis{_TiR7E_vc9w7<>;83)b&8ex56^!)iX7YEWDb-Dfr?`iMp_ff8Vs^n~_
z!*G6vGUfayf!~FDiHJ>xyk>stIB2ahlRW$H5XU&@wXd*H`5+*J@>Ksu0;v;;gnRPJ
z6{%WXit&VfWlraIa9qK2+*_fn<Gdgv=G_p%NGcY41Q*&wiyyC*qNxSOO|Bi}H8`xZ
zvW|_~UXyQvQ6s%Z5KvfAkV1i=#h*_=5K~}B9Ar(iiZpZSG+bGed&n2n%0j+1zAI+#
z1RTkDGLu<aAR@Yb`YAIvQ}qG@tBwmEqda-QD%zpAm<adeL)B|v7~*&?KP?4hTc+$u
zl}V81X|DNKUU4G*f!KL2*+FDblk6f4PHRb6LfuPS?6huQ(QU~I3zV%oE$Y&FBLQRx
zAF>19>=G;3aD^40=P7<jla}$<I75-=uUTrW7_S-VT}<#NEZjLRGt-W-Bkva>h)xdF
zx*ufg<ogK_27|B}0eQ4!#JDgF=fBNtrehW!fdCd-ID_MDH{GQD48l<fzH?{C$79}=
zm5)<KJ4pRwyw}OYH*tl@C--vj(mrNDM0SqVWHz43{3R>TLT+~U6?poLTu^W{Ea1(X
zgnf%q&U55--o<&aH5|_0@#Z&sFho+kqjFyL`;!PNk3xVw+M-G&VOA(97FG!BIRI6!
zQEviE{2X4r&+<G3F-k2w?Xj#4ZJHYR8mGpJ@fr`nz4zYBHtA#n8DWB1bp)P&6yzDP
zFX`@ypbi4rpSlNOjGz%3#jrL`-f6TwQul&ePU3s+)WAS`J|3S=XS3rV<_HKs%F`>l
zC{Iz@OTYCD!}zG%=Np5snfmHiziJgDhP1c0%Z`wQms?$5f$VlcNE4RZozc|q)av|K
zRC$E!If!Bk7Hm}QhSk$*sLfW2$;(e;h3AV9$C%o|YBCD(Pa<S%ReIedQF|l34j=%J
z?m>-<Z$>W6!I5rU!o`9ZtFf3pd3APo+c9%lDbha9GF-lLC4T3fcM8#J%E#cWDfjl4
zLx&<(DuqB{C?>EmH#1`k!Nu~pnF@r%Imswh<sk#;EDVM4c{P!UG_A`T1W(Av#>bZ+
zqI@xMf<Q=}3ezLQy-5%T<a|dqQGPTAEA*={i%?GNUX$Pk0X>J%3wnO*(W8r7_2qRi
zJdGwaAkct70|E^QG$7z;{Hi#osv8YRH6ZZ400FUm^wYR<<%;bJe~5#QVC70OQ-d(R
z7qFnw#|j9DDA2rxaaBP}9Jro`^36IAVU+fGG}N^fAZz^iZij%B67<pb?Z>hofEct-
zUJ8tgMWR6%-|d*t=%0=75QJDJ5rqgL7>Pt~<kQO~HxwBoOKcS1cQ^=MIU1<}f$vTT
zh!C_=h<(ykK^PUw2M-&m0fFyo2&}VG!h2ij=2HZLJJ*JM@m&poM&}w3Xh5I=fd&K`
i5NJT40fB>u!2bg*(1H5FScF0V0000<MNUMnLSTZC7SVwK

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/example-theme/assets/core/eula.html b/src/frontend/packages/example-theme/assets/core/eula.html
new file mode 100644
index 0000000000..1f2241fe1c
--- /dev/null
+++ b/src/frontend/packages/example-theme/assets/core/eula.html
@@ -0,0 +1,5 @@
+<p>AMCE Corp End User License Agreement</p>
+
+<p>PLEASE READ THIS AGREEMENT CAREFULLY.</p>
+
+<P>This is an exmaple EULA.</P>
diff --git a/src/frontend/packages/example-theme/assets/core/login-bg.jpg b/src/frontend/packages/example-theme/assets/core/login-bg.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2b2e8e42f71ded64e0e3c59253b21e8dd4bcc939
GIT binary patch
literal 672633
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%0AG`FSUDodk3UxywwZP0Hay+XE!H)~av
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

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/example-theme/assets/core/logo.png b/src/frontend/packages/example-theme/assets/core/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..812976391384e6063429b22551978538046cd19c
GIT binary patch
literal 15035
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

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/example-theme/assets/favicon.ico b/src/frontend/packages/example-theme/assets/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..60f452c054d1f20e09e6134830fa80a90dec97f8
GIT binary patch
literal 1150
zcmah}Ye<t(7(P<JQ*m8>1m+)!km!eWQQD97M~f_57b)t84e|nGO)W9aIk7Oqv<4||
zZG+4(TNj&w!<F*_7B1~3>w=AP<s`hM+g!1y^G-k5+QRqaIp^g)&+~rgJMViw#$xyr
z7svRxiRG<kY#n24GY1dx$Wok7QB5L|uuuR<=1_5Ta=4a3KE;wlxuHH^i{VhX=YD!G
zKhfdP4J8tbGmuo038_YjD_wfbc^5pyA#N0{+2$BVa_N4o$xn-lEf=z3egA^XVGhl~
zeTCP*h^j|TD81K+t51#4*&e_+&<Sm?2@Tz?km*&}T5%Y$1?lMfV5b}k+5?~Idud-Q
zS|AX>L%S7{S{dej9?}SB6``ef$lL26)t$$VYq{8XaUZtVo`k07F3LKt2WKv-<e;++
zv!U^~NUA!BnjQn*O^#z?b_%}Vi+K5U3_1ETY*6mOsg`om2sH}RJKRoqIiE~7(uGt*
zK6V@B=y$#beS@sE8Y$&cS{CX{euPc?enH$(1k;!e@t5`@-B1|h$l7bLO`StN=_B?Z
zB=NyHH;F8Z8dD21sIY1wZZCp!b`m0WCQjd06OFXgSO2xM_FFhGSPOA?8Sa1XN6E8h
z#8+padB8-PN{$ul_r>Fe<@+d#2en9O%*L*!GyFXL!TK%tfWqVVLD5!+SKl0z7xR8E
zdR=dDZrFenvm9&NPC(Rh1naqe#PyLV!Twp+Q}3Jm9CjQxlp|G>3sHR*5^hQ%(jSA!
zm;;gSDAMo9G4kURX~X(AB!^;R+U?a1Jw{<?J$4!jkk%?ko}~fW(JuJ@1os?qe@HKY
o=N5WW=nbJpQSYxWk+GRr#-6WQf+~jpCJ6r;kI|aIBMoW)0`L*>j{pDw

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/example-theme/loader/loading.css b/src/frontend/packages/example-theme/loader/loading.css
new file mode 100644
index 0000000000..9633b127db
--- /dev/null
+++ b/src/frontend/packages/example-theme/loader/loading.css
@@ -0,0 +1,38 @@
+.stratos-initial-load-spinner-container {
+  align-items: center;
+  background-color: #0D2C40;
+  display: flex;
+  justify-content: center;
+  height: 100%;
+  left: 0;
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+
+.stratos-initial-load-spinner-logo {
+  position: absolute;
+  height: 60px;
+}
+
+.stratos-initial-load-spinner {
+  animation: stratos-initial-load-animate 1s infinite linear;
+  box-sizing: border-box;
+  border: 5px solid rgba(86, 107, 121, 0.45);
+  border-radius: 50%;
+  border-top-color: #00B2E2;
+  display: inline-block;
+  height: 128px;
+  margin: 0 auto;
+  width: 128px;
+}
+
+@keyframes stratos-initial-load-animate {
+  0% {
+    transform: rotate(0deg);
+  }
+
+  100% {
+    transform: rotate(359deg);
+  }
+}
diff --git a/src/frontend/packages/example-theme/loader/loading.html b/src/frontend/packages/example-theme/loader/loading.html
new file mode 100644
index 0000000000..cf66894e7b
--- /dev/null
+++ b/src/frontend/packages/example-theme/loader/loading.html
@@ -0,0 +1,3 @@
+<div class="stratos-initial-load-spinner-container">
+  <i class="stratos-initial-load-spinner"></i>
+</div>
\ No newline at end of file
diff --git a/src/frontend/packages/example-theme/package.json b/src/frontend/packages/example-theme/package.json
new file mode 100644
index 0000000000..704b682b04
--- /dev/null
+++ b/src/frontend/packages/example-theme/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "@example/theme",
+  "version": "0.0.1",
+  "stratos": {
+    "assets": {
+      "assets/core": "core/assets",
+      "assets/favicon.ico": "favicon.ico"
+    },
+    "theme":{
+      "loadingCss": "loader/loading.css",
+      "loadingHtml": "loader/loading.html"
+    }
+  },
+  "peerDependencies": {
+    "@stratosui/theme": "0.0.1"
+  }
+}
diff --git a/src/frontend/packages/example-theme/sass/custom.scss b/src/frontend/packages/example-theme/sass/custom.scss
new file mode 100644
index 0000000000..e3eb84c38a
--- /dev/null
+++ b/src/frontend/packages/example-theme/sass/custom.scss
@@ -0,0 +1,18 @@
+// Custom ACME Theme
+
+// ACME Primary Material Design pallette
+// From http://mcg.mbitson.com/#!?mcgpalette0=%233f51b5
+$acme-primary: (50: #e8eaf6, 100: #c5cbe9, 200: #9fa8da, 300: #7985cb, 400: #5c6bc0, 500: #3f51b5, 600: #394aae, 700: #3140a5, 800: #29379d, 900: #1b278d, A100: #c6cbff, A200: #939dff, A400: #606eff, A700: #4757ff, contrast: (  50: #000000,  100: #000000,  200: #000000,  300: #000000,  400: #ffffff,  500: #ffffff,  600: #ffffff,  700: #ffffff,  800: #ffffff,  900: #ffffff,  A100: #000000,  A200: #000000,  A400: #ffffff,  A700: #ffffff, ));
+$mat-red: ( 50: #ffebee, 100: #ffcdd2, 200: #ef9a9a, 300: #e57373, 400: #ef5350, 500: #f44336, 600: #e53935, 700: #d32f2f, 800: #c62828, 900: #b71c1c, A100: #ff8a80, A200: #ff5252, A400: #ff1744, A700: #d50000, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: white, A400: white, A700: white, ));
+
+// Common
+$acme-theme-primary: mat-palette($acme-primary);
+$acme-theme-warn: mat-palette($mat-red);
+
+// Dark Theme
+$stratos-dark-theme: mat-dark-theme($acme-theme-primary, $acme-theme-primary, $acme-theme-warn);
+
+// Default Theme
+$stratos-theme: mat-light-theme($acme-theme-primary, $acme-theme-primary, $acme-theme-warn);
+
+@import 'custom/acme';
diff --git a/src/frontend/packages/example-theme/sass/custom/acme-colors.scss b/src/frontend/packages/example-theme/sass/custom/acme-colors.scss
new file mode 100644
index 0000000000..878c2cda32
--- /dev/null
+++ b/src/frontend/packages/example-theme/sass/custom/acme-colors.scss
@@ -0,0 +1,7 @@
+$acme-primary: #00c081;
+$acme-secondary: #00243e;
+$acme-text: #fff;
+$acme-text-gray: #ccc;
+$acme-button-gray: #888;
+$acme-dark-blue: #06253a;
+$acme-blue: #073155;
diff --git a/src/frontend/packages/example-theme/sass/custom/acme.scss b/src/frontend/packages/example-theme/sass/custom/acme.scss
new file mode 100644
index 0000000000..75794ebb6e
--- /dev/null
+++ b/src/frontend/packages/example-theme/sass/custom/acme.scss
@@ -0,0 +1,71 @@
+// Style overrides
+// Acme Brand primary colour
+$acme-primary-color: #035a97;
+
+// Secondary blue colour
+$acme-secondary: #035a97;
+$acme-text: #fff;
+$acme-text-gray: #ccc;
+$acme-dark-blue: #06253a;
+$acme-blue: #073155;
+$acme-side-nav: $acme-secondary;
+$acme-side-nav-active: #003358;
+
+body.stratos {
+  app-page-subheader {
+    .page-subheader {
+      background-color: #fff;
+      color: #333;
+    }
+  }
+
+  .page-header__divider {
+    color: #333;
+  }
+
+  .page-header__menu-button-icon {
+    background-color: $acme-primary-color;
+    color: $acme-text;
+  }
+
+  .mat-tab-nav-bar.mat-primary.mat-background-primary {
+    .mat-tab-links {
+      background-color: #fff;
+      color: #333;
+    }
+    .mat-tab-link {
+      color: #333;
+    }
+    .mat-ink-bar {
+      background-color: $acme-primary-color;
+    }
+  }
+
+  .stratos-title__logo {
+    width: 160px;
+  }
+
+  .page-header .mat-toolbar.mat-primary {
+    background-color: #fff;
+    color: #333;
+  }
+
+  // Use Acme Blue Side Navigation
+  .side-nav,
+  .side-nav__top,
+  .side-nav__item--active:hover {
+    background-color: $acme-side-nav;
+  }
+  .side-nav__item--active,
+  .side-nav__item:hover {
+    background-color: $acme-side-nav-active;
+  }
+  .side-nav__bottom {
+    color: $acme-text-gray;
+  }
+
+  // Show the text Stratos beneath the Acme logo
+  .stratos-title > .stratos-title__header {
+    display: inline-block;
+  }
+}
diff --git a/src/frontend/packages/shared/karma.conf.js b/src/frontend/packages/shared/karma.conf.js
new file mode 100644
index 0000000000..3eb5065e1b
--- /dev/null
+++ b/src/frontend/packages/shared/karma.conf.js
@@ -0,0 +1,8 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+  config.set({
+    ...require('../../../../build/karma.conf.creator.js')('components')(config)
+  })
+}
diff --git a/src/frontend/packages/shared/ng-package.json b/src/frontend/packages/shared/ng-package.json
new file mode 100644
index 0000000000..a8096cce2b
--- /dev/null
+++ b/src/frontend/packages/shared/ng-package.json
@@ -0,0 +1,7 @@
+{
+  "$schema": "../../../../node_modules/ng-packagr/ng-package.schema.json",
+  "dest": "../../../../dist/shared",
+  "lib": {
+    "entryFile": "src/public-api.ts"
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/shared/package.json b/src/frontend/packages/shared/package.json
new file mode 100644
index 0000000000..fd22444357
--- /dev/null
+++ b/src/frontend/packages/shared/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@stratosui/shared",
+  "version": "0.0.1",
+  "peerDependencies": {
+    "@angular/common": "^8.2.9",
+    "@angular/core": "^8.2.9"
+  },
+  "stratos": {
+    "theming": "sass/_all-theme#apply-theme-stratos-shared"
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/shared/sass/_all-theme.scss b/src/frontend/packages/shared/sass/_all-theme.scss
new file mode 100644
index 0000000000..560ebec82e
--- /dev/null
+++ b/src/frontend/packages/shared/sass/_all-theme.scss
@@ -0,0 +1,9 @@
+@import '../src/components/stratos-title//stratos-title.component.theme';
+
+@mixin apply-theme-stratos-shared($stratos-theme) {
+
+  $theme: map-get($stratos-theme, theme);
+  $app-theme: map-get($stratos-theme, app-theme);
+
+  @include stratos-title-component-theme($theme, $app-theme);
+}
diff --git a/src/frontend/packages/shared/src/components.module.ts b/src/frontend/packages/shared/src/components.module.ts
new file mode 100644
index 0000000000..4fd18d9470
--- /dev/null
+++ b/src/frontend/packages/shared/src/components.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { StratosTitleComponent } from './components/stratos-title/stratos-title.component';
+
+@NgModule({
+  imports: [],
+  declarations: [
+    StratosTitleComponent
+  ],
+  exports: [
+    StratosTitleComponent
+  ]
+})
+export class StratosComponentsModule {
+
+  constructor() {}
+
+}
diff --git a/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.html b/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.html
new file mode 100644
index 0000000000..b4864f004d
--- /dev/null
+++ b/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.html
@@ -0,0 +1,4 @@
+<div class="stratos-title">
+  <img class="stratos-title__logo" src="/core/assets/logo.png" />
+  <h1 class="mat-h1 stratos-title__header">{{ title || 'Stratos' }}</h1>
+</div>
diff --git a/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.scss b/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.scss
new file mode 100644
index 0000000000..be2b80bd6e
--- /dev/null
+++ b/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.scss
@@ -0,0 +1,20 @@
+.stratos-title {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  padding-top: 24px;
+  &__logo {
+    align-self: center;
+    padding: 12px 0 16px;
+    width: 240px;
+  }
+  &__header {
+    display: none;
+    font-size: 28px;
+    font-weight: 500;
+    letter-spacing: 2px;
+    margin: 0;
+    text-align: center;
+    text-transform: uppercase;
+  }
+}
diff --git a/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.spec.ts b/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.spec.ts
new file mode 100644
index 0000000000..4bc7ca3078
--- /dev/null
+++ b/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { StratosTitleComponent } from './stratos-title.component';
+
+describe('StratosTitleComponent', () => {
+  let component: StratosTitleComponent;
+  let fixture: ComponentFixture<StratosTitleComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ StratosTitleComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(StratosTitleComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.theme.scss b/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.theme.scss
new file mode 100644
index 0000000000..56e8a4a125
--- /dev/null
+++ b/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.theme.scss
@@ -0,0 +1,6 @@
+@mixin stratos-title-component-theme($theme, $app-theme) {
+  $primary: map-get($theme, primary);
+  .stratos-title {
+    color: mat-color($primary);
+  }
+}
diff --git a/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.ts b/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.ts
new file mode 100644
index 0000000000..b09b6f7d1f
--- /dev/null
+++ b/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.ts
@@ -0,0 +1,12 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+  selector: 'app-stratos-title',
+  templateUrl: './stratos-title.component.html',
+  styleUrls: ['./stratos-title.component.scss']
+})
+export class StratosTitleComponent {
+
+  // Optional title
+  @Input() title: string;
+}
diff --git a/src/frontend/packages/shared/src/public-api.ts b/src/frontend/packages/shared/src/public-api.ts
new file mode 100644
index 0000000000..30b7c87a05
--- /dev/null
+++ b/src/frontend/packages/shared/src/public-api.ts
@@ -0,0 +1,5 @@
+// Stratos Components module
+
+export * from './components.module';
+
+export * from './components/stratos-title/stratos-title.component';
diff --git a/src/frontend/packages/shared/tsconfig.lib.json b/src/frontend/packages/shared/tsconfig.lib.json
new file mode 100644
index 0000000000..29e640092d
--- /dev/null
+++ b/src/frontend/packages/shared/tsconfig.lib.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../../../tsconfig.lib.json",
+  "compilerOptions": {
+    "outDir": "../../../../out-tsc/lib",
+  },
+  "exclude": [
+    "./src/test.ts",
+    "**/*.spec.ts",
+  ]
+}
diff --git a/src/frontend/packages/shared/tsconfig.spec.json b/src/frontend/packages/shared/tsconfig.spec.json
new file mode 100644
index 0000000000..cb4a7be918
--- /dev/null
+++ b/src/frontend/packages/shared/tsconfig.spec.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../../tsconfig.spec.json",
+  "compilerOptions": {
+    "outDir": "../../../../out-tsc/spec",
+    "types": [
+      "jasmine",
+      "node"
+    ]
+  },
+  "files": [
+    "src/test.ts"
+  ],
+  "include": [
+    "**/*.spec.ts",
+    "**/*.d.ts"
+  ]
+}
diff --git a/src/frontend/packages/shared/tslint.json b/src/frontend/packages/shared/tslint.json
new file mode 100644
index 0000000000..6ee5e859e0
--- /dev/null
+++ b/src/frontend/packages/shared/tslint.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../../../tslint.json",
+  "rules": {
+    "directive-selector": [
+      false,
+      "attribute",
+      "lib",
+      "camelCase"
+    ],
+    "component-selector": [
+      false,
+      "element",
+      "lib",
+      "kebab-case"
+    ]
+  }
+}
diff --git a/src/frontend/packages/store/ng-package.json b/src/frontend/packages/store/ng-package.json
index c77901ef24..babd6c3d91 100644
--- a/src/frontend/packages/store/ng-package.json
+++ b/src/frontend/packages/store/ng-package.json
@@ -2,6 +2,6 @@
   "$schema": "../../../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../../../../dist/store",
   "lib": {
-    "entryFile": "src/public_api.ts"
+    "entryFile": "src/public-api.ts"
   }
 }
\ No newline at end of file
diff --git a/src/frontend/packages/store/package.json b/src/frontend/packages/store/package.json
index cb014d0a39..0184d8f74d 100644
--- a/src/frontend/packages/store/package.json
+++ b/src/frontend/packages/store/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "store",
+  "name": "@stratosui/store",
   "version": "0.0.1",
   "peerDependencies": {
     "@angular/common": "^6.0.0-rc.0 || ^6.0.0",
diff --git a/src/frontend/packages/store/src/actions/dashboard-actions.ts b/src/frontend/packages/store/src/actions/dashboard-actions.ts
index 946b291c16..a2bc55101a 100644
--- a/src/frontend/packages/store/src/actions/dashboard-actions.ts
+++ b/src/frontend/packages/store/src/actions/dashboard-actions.ts
@@ -1,7 +1,7 @@
 import { Action } from '@ngrx/store';
 
-import { StratosTheme } from '../../../core/src/core/theme.service';
 import { DashboardState } from '../reducers/dashboard-reducer';
+import { StratosTheme } from '../types/theme.types';
 
 export const OPEN_SIDE_NAV = '[Dashboard] Open side nav';
 export const CLOSE_SIDE_NAV = '[Dashboard] Close side nav';
diff --git a/src/frontend/packages/store/src/actions/endpoint.actions.ts b/src/frontend/packages/store/src/actions/endpoint.actions.ts
index cd4540b8eb..2e4b8404ed 100644
--- a/src/frontend/packages/store/src/actions/endpoint.actions.ts
+++ b/src/frontend/packages/store/src/actions/endpoint.actions.ts
@@ -1,18 +1,20 @@
 import { Action } from '@ngrx/store';
 
-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';
+import { EndpointType } from '../extension-types';
+import { endpointEntityType, STRATOS_ENDPOINT_TYPE, stratosEntityFactory } from '../helpers/stratos-entity-factory';
 import { NormalizedResponse } from '../types/api.types';
 import { endpointListKey, EndpointModel, INewlyConnectedEndpointInfo } from '../types/endpoint.types';
 import { PaginatedAction } from '../types/pagination.types';
+import { EntityRequestAction } from '../types/request.types';
 
 export const GET_ENDPOINTS = '[Endpoints] Get all';
-export const GET_ENDPOINTS_START = '[Endpoints] Get all start';
-export const GET_ENDPOINTS_LOGIN = '[Endpoints] Get all at login';
 export const GET_ENDPOINTS_SUCCESS = '[Endpoints] Get all success';
 export const GET_ENDPOINTS_FAILED = '[Endpoints] Get all failed';
 
+export const GET_ENDPOINT = '[Endpoints] Get';
+export const GET_ENDPOINT_SUCCESS = '[Endpoints] Get success';
+export const GET_ENDPOINT_FAILED = '[Endpoints] Get failed';
+
 export const CONNECT_ENDPOINTS = '[Endpoints] Connect';
 export const CONNECT_ENDPOINTS_SUCCESS = '[Endpoints] Connect succeed';
 export const CONNECT_ENDPOINTS_FAILED = '[Endpoints] Connect failed';
@@ -37,14 +39,45 @@ export class EndpointActionComplete implements Action {
   constructor(
     public type: string,
     public guid: string,
+    /**
+     * Note - The underlying endpoints type (_cf_Endpoint, not _stratos_Endpoint)
+     */
     public endpointType: EndpointType,
     public endpoint: EndpointModel | INewlyConnectedEndpointInfo
   ) { }
 }
 
-export class EndpointAction implements Action {
-  type: string;
-  endpointType: EndpointType;
+export abstract class BaseEndpointAction implements EntityRequestAction {
+  public entityType = endpointEntityType;
+  public endpointType = STRATOS_ENDPOINT_TYPE;
+  public subType = '';
+  public entity = [stratosEntityFactory(endpointEntityType)]
+  constructor(public type: string) { }
+  actions: string[];
+}
+
+export abstract class SingleBaseEndpointAction extends BaseEndpointAction {
+  constructor(
+    actionType: string,
+    public guid: string,
+    /**
+     * The endpoint type of the endpoint
+     *    endpointType = stratos endpoint type... where it will be stored
+     *    endpointsType = specific type of the endpoint type... for instance 'metrics'
+     */
+    public endpointsType?: string
+  ) {
+    super(actionType);
+  }
+}
+
+abstract class MultipleBaseEndpointAction extends BaseEndpointAction implements PaginatedAction {
+  constructor(
+    actionType: string,
+    public paginationKey: string
+  ) {
+    super(actionType);
+  }
 }
 
 // Different Auth Type support for connecting to Endpoints
@@ -60,15 +93,34 @@ export interface AuthParamsToken {
 // All supported auth params types
 export type AuthParams = AuthParamsUsernamePassword | AuthParamsToken;
 
-export class GetAllEndpoints implements PaginatedAction {
+export class GetEndpoint extends SingleBaseEndpointAction {
+  constructor(
+    guid: string,
+  ) {
+    super(
+      GET_ENDPOINT,
+      guid
+    )
+  }
+  actions = [
+    GET_ENDPOINT,
+    GET_ENDPOINT_SUCCESS,
+    GET_ENDPOINT_FAILED
+  ];
+}
+
+export class GetAllEndpoints extends MultipleBaseEndpointAction {
   public static storeKey = endpointListKey;
-  constructor(public login = false) { }
-  entityType = endpointSchemaKey;
-  endpointType = STRATOS_ENDPOINT_TYPE;
-  paginationKey = GetAllEndpoints.storeKey;
-  type = GET_ENDPOINTS;
+  constructor(
+    public login = false
+  ) {
+    super(
+      GET_ENDPOINTS,
+      GetAllEndpoints.storeKey
+    )
+  }
   actions = [
-    GET_ENDPOINTS_START,
+    GET_ENDPOINTS,
     GET_ENDPOINTS_SUCCESS,
     GET_ENDPOINTS_FAILED
   ];
@@ -80,53 +132,82 @@ export class GetAllEndpoints implements PaginatedAction {
   };
 }
 
-export class GetAllEndpointsSuccess implements Action {
-  constructor(public payload: NormalizedResponse<EndpointModel>, public login = false) { }
+export class GetAllEndpointsSuccess extends GetAllEndpoints {
+  constructor(public payload: NormalizedResponse<EndpointModel>, public login = false) {
+    super(login)
+  }
   type = GET_ENDPOINTS_SUCCESS;
 }
 
-export class GetAllEndpointsFailed implements Action {
-  constructor(public message: string, public login = false) { }
-  type = GET_ENDPOINTS_FAILED;
-}
-
-export class ConnectEndpoint extends EndpointAction {
+export class ConnectEndpoint extends SingleBaseEndpointAction {
+  static UpdatingKey = 'connectingKey'
   constructor(
-    public guid: string,
-    public endpointType: EndpointType,
+    guid: string,
+    // Note - should not be called endpointType
+    connectEndpointType: EndpointType,
     public authType: string,
     public authValues: AuthParams,
     public systemShared: boolean,
     public body: string,
   ) {
-    super();
+    super(
+      CONNECT_ENDPOINTS,
+      guid,
+      connectEndpointType
+    );
   }
-  type = CONNECT_ENDPOINTS;
+  updatingKey = ConnectEndpoint.UpdatingKey;
+  actions = [
+    CONNECT_ENDPOINTS,
+    CONNECT_ENDPOINTS_SUCCESS,
+    CONNECT_ENDPOINTS_FAILED
+  ]
 }
 
-export class DisconnectEndpoint extends EndpointAction {
+export class DisconnectEndpoint extends SingleBaseEndpointAction {
+  static UpdatingKey = 'disconnecting'
   constructor(
-    public guid: string,
-    public endpointType: EndpointType,
+    guid: string,
+    // Note - should not be called endpointType
+    disconnectEndpointType: EndpointType,
   ) {
-    super();
+    super(
+      DISCONNECT_ENDPOINTS,
+      guid,
+      disconnectEndpointType
+    );
   }
-  type = DISCONNECT_ENDPOINTS;
+  updatingKey = DisconnectEndpoint.UpdatingKey;
+  actions = [
+    DISCONNECT_ENDPOINTS,
+    DISCONNECT_ENDPOINTS_SUCCESS,
+    DISCONNECT_ENDPOINTS_FAILED
+  ];
 }
 
-export class UnregisterEndpoint extends EndpointAction {
+export class UnregisterEndpoint extends SingleBaseEndpointAction {
   constructor(
-    public guid: string,
-    public endpointType: EndpointType,
+    guid: string,
+    // Note - should not be called endpointType
+    unregisterEndpointType: EndpointType,
   ) {
-    super();
+    super(
+      UNREGISTER_ENDPOINTS,
+      guid,
+      unregisterEndpointType
+    );
   }
-  type = UNREGISTER_ENDPOINTS;
+  actions = [
+    UNREGISTER_ENDPOINTS,
+    UNREGISTER_ENDPOINTS_SUCCESS,
+    UNREGISTER_ENDPOINTS_FAILED
+  ];
 }
 
-export class RegisterEndpoint extends EndpointAction {
+export class RegisterEndpoint extends SingleBaseEndpointAction {
   constructor(
-    public endpointType: EndpointType,
+    // Note - should not be called endpointType
+    registerEndpointType: EndpointType,
     public endpointSubType: string = null,
     public name: string,
     public endpoint: string,
@@ -135,21 +216,24 @@ export class RegisterEndpoint extends EndpointAction {
     public clientSecret = '',
     public ssoAllowed: boolean,
   ) {
-    super();
-  }
-  type = REGISTER_ENDPOINTS;
-
-  public guid(): string {
-    return '<New Endpoint>' + this.name;
+    super(
+      REGISTER_ENDPOINTS,
+      '<New Endpoint>' + name,
+      registerEndpointType
+    );
   }
+  updatingKey = 'registering'
+  actions = [
+    REGISTER_ENDPOINTS,
+    REGISTER_ENDPOINTS_SUCCESS,
+    REGISTER_ENDPOINTS_FAILED
+  ];
 }
 
-export class UpdateEndpoint extends EndpointAction {
-
-  type = UPDATE_ENDPOINT;
-
+export class UpdateEndpoint extends SingleBaseEndpointAction {
   constructor(
-    public endpointType: EndpointType,
+    // Note - should not be called endpointType
+    updateEndpointType: EndpointType,
     public id: string,
     public name: string,
     public skipSSL: boolean,
@@ -158,6 +242,16 @@ export class UpdateEndpoint extends EndpointAction {
     public clientSecret: string,
     public allowSSO: boolean,
   ) {
-    super();
+    super(
+      UPDATE_ENDPOINT,
+      id,
+      updateEndpointType
+    );
   }
+  updatingKey = 'updating'
+  actions = [
+    UPDATE_ENDPOINT,
+    UPDATE_ENDPOINT_SUCCESS,
+    UPDATE_ENDPOINT_FAILED
+  ];
 }
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 2fe8232094..6b084587a6 100644
--- a/src/frontend/packages/store/src/actions/metrics-api.actions.ts
+++ b/src/frontend/packages/store/src/actions/metrics-api.actions.ts
@@ -1,12 +1,11 @@
 import { Action } from '@ngrx/store';
 
-import { environment } from '../../../core/src/environments/environment';
+import { proxyAPIVersion } from '../jetstream';
 
 export const METRIC_API_START = '[Metrics] API Start';
 export const METRIC_API_SUCCESS = '[Metrics] API Success';
 export const METRIC_API_FAILED = '[Metrics] API Failed';
 
-const { proxyAPIVersion } = environment;
 
 export const MetricAPIQueryTypes = {
   TARGETS: 'targets',
diff --git a/src/frontend/packages/store/src/actions/metrics.actions.ts b/src/frontend/packages/store/src/actions/metrics.actions.ts
index 43b068a14d..ac62831049 100644
--- a/src/frontend/packages/store/src/actions/metrics.actions.ts
+++ b/src/frontend/packages/store/src/actions/metrics.actions.ts
@@ -1,14 +1,12 @@
-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 { metricEntityType } from '../helpers/stratos-entity-factory';
+import { proxyAPIVersion } from '../jetstream';
+import { MetricQueryType } from '../types/metric.types';
 import { EntityRequestAction } from '../types/request.types';
 
 export const METRICS_START = '[Metrics] Fetch Start';
 export const METRICS_START_SUCCESS = '[Metrics] Fetch Succeeded';
 export const METRICS_START_FAILED = '[Metrics] Fetch Failed';
 
-const { proxyAPIVersion } = environment;
-
 export interface IMetricQueryConfigParams {
   window?: string;
   [key: string]: string | number;
diff --git a/src/frontend/packages/store/src/actions/snackBar.actions.ts b/src/frontend/packages/store/src/actions/snackBar.actions.ts
deleted file mode 100644
index bee18d3e57..0000000000
--- a/src/frontend/packages/store/src/actions/snackBar.actions.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Action } from '@ngrx/store';
-
-export const SHOW_SNACK_BAR = '[SnackBar] Show';
-export const SHOW_RETURN_SNACK_BAR = '[SnackBar] Show returns';
-export const HIDE_SNACK_BAR = '[SnackBar] Hide';
-
-export class ShowSnackBar implements Action {
-  constructor(
-    public message: string,
-    public closeMessage: string = null
-  ) {
-  }
-  type = SHOW_SNACK_BAR;
-}
-
-export class ShowReturnSnackBar implements Action {
-  constructor(
-    public message: string,
-    public returnRouterUrl: string,
-    public returnLabel: string
-  ) {
-  }
-  type = SHOW_RETURN_SNACK_BAR;
-}
-
-export class HideSnackBar implements Action {
-  type = HIDE_SNACK_BAR;
-}
diff --git a/src/frontend/packages/store/src/actions/system.actions.ts b/src/frontend/packages/store/src/actions/system.actions.ts
index c916b62398..29c9f9410d 100644
--- a/src/frontend/packages/store/src/actions/system.actions.ts
+++ b/src/frontend/packages/store/src/actions/system.actions.ts
@@ -1,27 +1,35 @@
 import { Action } from '@ngrx/store';
 
+import { STRATOS_ENDPOINT_TYPE, stratosEntityFactory, systemInfoEntityType } from '../helpers/stratos-entity-factory';
+import { EntityRequestAction } from '../types/request.types';
 import { SystemInfo } from '../types/system.types';
-import { GetAllEndpoints } from './endpoint.actions';
+import { BaseEndpointAction, GetAllEndpoints } from './endpoint.actions';
 
 export const GET_SYSTEM_INFO = '[System] Get info';
 export const GET_SYSTEM_INFO_SUCCESS = '[System] Get info success';
 export const GET_SYSTEM_INFO_FAILED = '[System] Get info failed';
 
-export class GetSystemInfo implements Action {
-  constructor(public login = false, public associatedAction?: GetAllEndpoints) {
-    if (!associatedAction) {
+export class GetSystemInfo implements EntityRequestAction {
+  static guid = 'info';
+  guid = GetSystemInfo.guid;
+  constructor(public login = false, public associatedAction?: BaseEndpointAction) {
+    if (!this.associatedAction) {
       this.associatedAction = new GetAllEndpoints(login);
     }
   }
+  schemaKey = systemInfoEntityType;
+  entity = [stratosEntityFactory(systemInfoEntityType)]
+  entityType = systemInfoEntityType;
+  endpointType = STRATOS_ENDPOINT_TYPE;
   type = GET_SYSTEM_INFO;
+  actions = [
+    GET_SYSTEM_INFO,
+    GET_SYSTEM_INFO_SUCCESS,
+    GET_SYSTEM_INFO_FAILED
+  ]
 }
 
 export class GetSystemSuccess implements Action {
-  constructor(public payload: SystemInfo, public login = false, public associatedAction: GetAllEndpoints) { }
+  constructor(public payload: SystemInfo, public login = false, public associatedAction: BaseEndpointAction) { }
   type = GET_SYSTEM_INFO_SUCCESS;
 }
-
-export class GetSystemFailed implements Action {
-  type = GET_SYSTEM_INFO_FAILED;
-}
-
diff --git a/src/frontend/packages/store/src/actions/user-favourites-actions/base-user-favorites-action.ts b/src/frontend/packages/store/src/actions/user-favourites-actions/base-user-favorites-action.ts
deleted file mode 100644
index c7bfabd239..0000000000
--- a/src/frontend/packages/store/src/actions/user-favourites-actions/base-user-favorites-action.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Action } from '@ngrx/store';
-
-export class BaseUserFavoritesAction implements Action {
-  constructor(
-    actionType: string,
-  ) {
-    this.type = actionType;
-  }
-  public type: string;
-  public url = '/user-favorites';
-}
diff --git a/src/frontend/packages/store/src/actions/user-favourites-actions/get-user-favorites-action.ts b/src/frontend/packages/store/src/actions/user-favourites-actions/get-user-favorites-action.ts
deleted file mode 100644
index b0b3eed95b..0000000000
--- a/src/frontend/packages/store/src/actions/user-favourites-actions/get-user-favorites-action.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { BaseUserFavoritesAction } from './base-user-favorites-action';
-import { UserFavorite, IFavoriteMetadata } from '../../types/user-favorites.types';
-
-export class GetUserFavoritesAction extends BaseUserFavoritesAction {
-  static ACTION_TYPE = 'GET_USER_FAVORITES';
-  constructor() {
-    super(
-      GetUserFavoritesAction.ACTION_TYPE
-    );
-  }
-}
-
-export class GetUserFavoritesSuccessAction extends BaseUserFavoritesAction {
-  static ACTION_TYPE = 'GET_USER_FAVORITES_SUCCESS';
-  constructor(public favorites: UserFavorite<IFavoriteMetadata>[]) {
-    super(
-      GetUserFavoritesSuccessAction.ACTION_TYPE
-    );
-  }
-}
-
-export class GetUserFavoritesFailedAction extends BaseUserFavoritesAction {
-  static ACTION_TYPE = 'GET_USER_FAVORITES_FAILED';
-  constructor() {
-    super(
-      GetUserFavoritesFailedAction.ACTION_TYPE
-    );
-  }
-}
-
diff --git a/src/frontend/packages/store/src/actions/user-favourites-actions/remove-user-favorite-action.ts b/src/frontend/packages/store/src/actions/user-favourites-actions/remove-user-favorite-action.ts
deleted file mode 100644
index 89bcd7d47e..0000000000
--- a/src/frontend/packages/store/src/actions/user-favourites-actions/remove-user-favorite-action.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { BaseUserFavoritesAction } from './base-user-favorites-action';
-import { UserFavorite, IFavoriteMetadata } from '../../types/user-favorites.types';
-
-export class RemoveUserFavoriteAction extends BaseUserFavoritesAction {
-  static ACTION_TYPE = 'REMOVE_USER_FAVORITE';
-  constructor(public favorite: UserFavorite<IFavoriteMetadata>) {
-    super(
-      RemoveUserFavoriteAction.ACTION_TYPE
-    );
-  }
-}
-
-export class RemoveUserFavoriteSuccessAction extends BaseUserFavoritesAction {
-  static ACTION_TYPE = 'REMOVE_USER_FAVORITE_SUCCESS';
-  constructor(public favorite: UserFavorite<IFavoriteMetadata>) {
-    super(
-      RemoveUserFavoriteSuccessAction.ACTION_TYPE
-    );
-  }
-}
-
diff --git a/src/frontend/packages/store/src/actions/user-favourites-actions/save-user-favorite-action.ts b/src/frontend/packages/store/src/actions/user-favourites-actions/save-user-favorite-action.ts
deleted file mode 100644
index b38c8199de..0000000000
--- a/src/frontend/packages/store/src/actions/user-favourites-actions/save-user-favorite-action.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { IFavoriteMetadata } from './../../types/user-favorites.types';
-import { BaseUserFavoritesAction } from './base-user-favorites-action';
-import { UserFavorite } from '../../types/user-favorites.types';
-
-export class SaveUserFavoriteAction extends BaseUserFavoritesAction {
-  static ACTION_TYPE = 'SAVE_USER_FAVORITE';
-  constructor(
-    public favorite: UserFavorite<IFavoriteMetadata>
-  ) {
-    super(
-      SaveUserFavoriteAction.ACTION_TYPE
-    );
-  }
-}
-
-export class SaveUserFavoriteSuccessAction extends BaseUserFavoritesAction {
-  static ACTION_TYPE = 'SAVE_USER_FAVORITE_SUCCESS';
-  constructor(
-    public favorite: UserFavorite<IFavoriteMetadata>
-  ) {
-    super(
-      SaveUserFavoriteSuccessAction.ACTION_TYPE
-    );
-  }
-}
diff --git a/src/frontend/packages/store/src/actions/user-favourites-actions/toggle-user-favorite-action.ts b/src/frontend/packages/store/src/actions/user-favourites-actions/toggle-user-favorite-action.ts
deleted file mode 100644
index 03a6100d31..0000000000
--- a/src/frontend/packages/store/src/actions/user-favourites-actions/toggle-user-favorite-action.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { BaseUserFavoritesAction } from './base-user-favorites-action';
-import { UserFavorite, IFavoriteMetadata } from '../../types/user-favorites.types';
-
-export class ToggleUserFavoriteAction extends BaseUserFavoritesAction {
-  static ACTION_TYPE = 'TOGGLE_USER_FAVORITE';
-  constructor(
-    public favorite: UserFavorite<IFavoriteMetadata>
-  ) {
-    super(
-      ToggleUserFavoriteAction.ACTION_TYPE
-    );
-  }
-}
diff --git a/src/frontend/packages/store/src/actions/user-favourites-actions/update-user-favorite-metadata-action.ts b/src/frontend/packages/store/src/actions/user-favourites-actions/update-user-favorite-metadata-action.ts
deleted file mode 100644
index 3707f615f1..0000000000
--- a/src/frontend/packages/store/src/actions/user-favourites-actions/update-user-favorite-metadata-action.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { UserFavorite, IFavoriteMetadata } from '../../types/user-favorites.types';
-import { BaseUserFavoritesAction } from './base-user-favorites-action';
-
-export class UpdateUserFavoriteMetadataAction extends BaseUserFavoritesAction {
-  static ACTION_TYPE = 'UPDATE_FAVORITE_METADATA';
-  constructor(public favorite: UserFavorite<IFavoriteMetadata>) {
-    super(
-      UpdateUserFavoriteMetadataAction.ACTION_TYPE
-    );
-  }
-}
-
-export class UpdateUserFavoriteMetadataSuccessAction extends BaseUserFavoritesAction {
-  static ACTION_TYPE = 'UPDATE_FAVORITE_METADATA_SUCCESS';
-  constructor(public favorite: UserFavorite<IFavoriteMetadata>) {
-    super(
-      UpdateUserFavoriteMetadataSuccessAction.ACTION_TYPE
-    );
-  }
-}
-
diff --git a/src/frontend/packages/store/src/actions/user-favourites.actions.ts b/src/frontend/packages/store/src/actions/user-favourites.actions.ts
new file mode 100644
index 0000000000..c4fcfdf744
--- /dev/null
+++ b/src/frontend/packages/store/src/actions/user-favourites.actions.ts
@@ -0,0 +1,145 @@
+import { STRATOS_ENDPOINT_TYPE, stratosEntityFactory, userFavouritesEntityType } from '../helpers/stratos-entity-factory';
+import { PaginatedAction } from '../types/pagination.types';
+import { EntityRequestAction } from '../types/request.types';
+import { IFavoriteMetadata, UserFavorite } from '../types/user-favorites.types';
+
+abstract class BaseUserFavoritesAction implements EntityRequestAction {
+  constructor(
+    actionType: string,
+  ) {
+    this.type = actionType;
+  }
+  public type: string;
+  public url = '/user-favorites';
+
+  public entity = [stratosEntityFactory(userFavouritesEntityType)]
+  public entityType = userFavouritesEntityType;
+  public endpointType = STRATOS_ENDPOINT_TYPE;
+}
+
+
+abstract class BaseSingleUserFavouritesAction extends BaseUserFavoritesAction {
+  constructor(actionType: string, public guid: string) {
+    super(actionType);
+  }
+}
+
+abstract class BaseMultipleUserFavouritesAction extends BaseUserFavoritesAction implements PaginatedAction {
+  guid: string;
+  constructor(actionType: string, public paginationKey: string) {
+    super(actionType);
+  }
+}
+
+
+abstract class BaseSuccessFavouritesAction extends BaseMultipleUserFavouritesAction {
+  constructor(
+    type: string,
+    public favorites: UserFavorite<IFavoriteMetadata>[],
+    paginationKey: string,
+  ) {
+    super(type, paginationKey);
+  }
+}
+
+abstract class BaseSuccessFavouriteAction extends BaseSingleUserFavouritesAction {
+  constructor(
+    type: string,
+    public favorite: UserFavorite<IFavoriteMetadata>,
+  ) {
+    super(type, favorite.guid);
+  }
+}
+
+// --------- 
+
+export class GetUserFavoritesAction extends BaseMultipleUserFavouritesAction {
+  static PAGINATION_KEY = 'user_favourites';
+  static ACTION_TYPE = '[Favorite] Get Favorites';
+  constructor() {
+    super(
+      GetUserFavoritesAction.ACTION_TYPE,
+      GetUserFavoritesAction.PAGINATION_KEY
+    );
+  }
+}
+
+export class GetUserFavoritesSuccessAction extends BaseSuccessFavouritesAction {
+  static ACTION_TYPE = '[Favorite] Get Favorites Success';
+  constructor(favorites: UserFavorite<IFavoriteMetadata>[]) {
+    super(
+      GetUserFavoritesSuccessAction.ACTION_TYPE,
+      favorites,
+      GetUserFavoritesAction.PAGINATION_KEY,
+    );
+  }
+}
+
+export class GetUserFavoritesFailedAction extends BaseMultipleUserFavouritesAction {
+  static ACTION_TYPE = '[Favorite] Get Favorites Failed';
+  constructor() {
+    super(
+      GetUserFavoritesFailedAction.ACTION_TYPE,
+      GetUserFavoritesAction.PAGINATION_KEY
+    );
+  }
+}
+
+// --------- 
+
+export class RemoveUserFavoriteAction extends BaseSingleUserFavouritesAction {
+  static ACTION_TYPE = '[Favorite] Remove Favorite';
+  constructor(public favorite: UserFavorite<IFavoriteMetadata>) {
+    super(
+      RemoveUserFavoriteAction.ACTION_TYPE,
+      favorite.guid,
+    );
+  }
+}
+
+export class RemoveUserFavoriteSuccessAction extends BaseSuccessFavouriteAction {
+  static ACTION_TYPE = '[Favorite] Remove Favorite Success';
+  constructor(favorite: UserFavorite<IFavoriteMetadata>) {
+    super(RemoveUserFavoriteSuccessAction.ACTION_TYPE, favorite)
+  }
+}
+
+// --------- 
+
+export class SaveUserFavoriteAction extends BaseSingleUserFavouritesAction {
+  static ACTION_TYPE = '[Favorite] Save Favorite';
+  constructor(public favorite: UserFavorite<IFavoriteMetadata>) {
+    super(SaveUserFavoriteAction.ACTION_TYPE, favorite.guid);
+  }
+}
+
+export class SaveUserFavoriteSuccessAction extends BaseSuccessFavouriteAction {
+  static ACTION_TYPE = '[Favorite] Save Favorite Success';
+  constructor(favorite: UserFavorite<IFavoriteMetadata>) {
+    super(SaveUserFavoriteSuccessAction.ACTION_TYPE, favorite);
+  }
+}
+
+// --------- 
+
+export class ToggleUserFavoriteAction extends BaseSingleUserFavouritesAction {
+  static ACTION_TYPE = '[Favorite] Toggle Favorite';
+  constructor(public favorite: UserFavorite<IFavoriteMetadata>) {
+    super(ToggleUserFavoriteAction.ACTION_TYPE, favorite.guid);
+  }
+}
+
+// ---------
+export class UpdateUserFavoriteMetadataAction extends BaseSingleUserFavouritesAction {
+  static ACTION_TYPE = '[Favorite] Update Favorite Metadata';
+  constructor(public favorite: UserFavorite<IFavoriteMetadata>) {
+    super(UpdateUserFavoriteMetadataAction.ACTION_TYPE, favorite.guid);
+  }
+}
+
+export class UpdateUserFavoriteMetadataSuccessAction extends BaseSuccessFavouriteAction {
+  static ACTION_TYPE = '[Favorite] Update Favorite Metadata Success';
+  constructor(public favorite: UserFavorite<IFavoriteMetadata>) {
+    super(UpdateUserFavoriteMetadataSuccessAction.ACTION_TYPE, favorite);
+  }
+}
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 00234f772e..c4e25f1eb6 100644
--- a/src/frontend/packages/store/src/actions/user-profile.actions.ts
+++ b/src/frontend/packages/store/src/actions/user-profile.actions.ts
@@ -1,6 +1,5 @@
-import { Action } from '@ngrx/store';
-
-import { userProfileEntitySchema } from '../../../core/src/base-entity-schemas';
+import { STRATOS_ENDPOINT_TYPE, stratosEntityFactory, userProfileEntityType } from '../helpers/stratos-entity-factory';
+import { rootUpdatingKey } from '../reducers/api-request-reducer/types';
 import { EntityRequestAction } from '../types/request.types';
 import { UserProfileInfo, UserProfilePasswordUpdate } from '../types/user-profile.types';
 
@@ -8,21 +7,31 @@ export const GET_USERPROFILE = '[UserProfile] Get';
 export const UPDATE_USERPROFILE = '[UserProfile] Update';
 export const UPDATE_USERPASSWORD = '[UserPassword] Update';
 
-export class FetchUserProfileAction implements EntityRequestAction {
+abstract class BaseProfileAction implements EntityRequestAction {
   static guid = 'userProfile';
-  type = GET_USERPROFILE;
-  constructor(public userGuid: string) { }
-  entityType = userProfileEntitySchema.entityType;
-  endpointType = userProfileEntitySchema.endpointType;
-  guid = FetchUserProfileAction.guid;
+  guid = BaseProfileAction.guid;
+  entityType = userProfileEntityType;
+  endpointType = STRATOS_ENDPOINT_TYPE;
+  entity = [stratosEntityFactory(userProfileEntityType)]
+  constructor(public type: string) { }
+}
+
+export class FetchUserProfileAction extends BaseProfileAction {
+  constructor(public userGuid: string) {
+    super(GET_USERPROFILE);
+  }
 }
 
-export class UpdateUserProfileAction implements Action {
-  type = UPDATE_USERPROFILE;
-  constructor(public profile: UserProfileInfo, public password: string) { }
+export class UpdateUserProfileAction extends BaseProfileAction {
+  constructor(public profile: UserProfileInfo, public password: string) {
+    super(UPDATE_USERPROFILE)
+  }
+  updatingKey = rootUpdatingKey
 }
 
-export class UpdateUserPasswordAction implements Action {
-  type = UPDATE_USERPASSWORD;
-  constructor(public id: string, public passwordChanges: UserProfilePasswordUpdate) { }
+export class UpdateUserPasswordAction extends BaseProfileAction {
+  constructor(public id: string, public passwordChanges: UserProfilePasswordUpdate) {
+    super(UPDATE_USERPASSWORD);
+  }
+  updatingKey = 'password'
 }
diff --git a/src/frontend/packages/core/src/helper.ts b/src/frontend/packages/store/src/browser-encoder.ts
similarity index 72%
rename from src/frontend/packages/core/src/helper.ts
rename to src/frontend/packages/store/src/browser-encoder.ts
index 88cbff36f5..ffdc0584ed 100644
--- a/src/frontend/packages/core/src/helper.ts
+++ b/src/frontend/packages/store/src/browser-encoder.ts
@@ -1,14 +1,5 @@
 import { HttpParameterCodec } from '@angular/common/http';
 
-export function getPath(object: { [key: string]: any }, path: string[]) {
-  try {
-    return path.reduce((o, i) => o[i], object);
-  } catch (err) {
-    return null;
-  }
-}
-
-
 export class BrowserStandardEncoder implements HttpParameterCodec {
   encodeKey(key: string): string {
     return encodeURIComponent(key);
diff --git a/src/frontend/packages/store/src/effects/auth.effects.ts b/src/frontend/packages/store/src/effects/auth.effects.ts
index 38c8883ba8..70f117622a 100644
--- a/src/frontend/packages/store/src/effects/auth.effects.ts
+++ b/src/frontend/packages/store/src/effects/auth.effects.ts
@@ -4,8 +4,6 @@ import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { catchError, map, mergeMap, switchMap, tap } from 'rxjs/operators';
 
-import { LoggerService } from '../../../core/src/core/logger.service';
-import { BrowserStandardEncoder } from '../../../core/src/helper';
 import {
   InvalidSession,
   LOGIN,
@@ -27,9 +25,10 @@ import {
 } from '../actions/auth.actions';
 import { HydrateDashboardStateAction } from '../actions/dashboard-actions';
 import { GET_ENDPOINTS_SUCCESS, GetAllEndpointsSuccess } from '../actions/endpoint.actions';
-import { GetSystemInfo } from '../actions/system.actions';
 import { DispatchOnlyAppState } from '../app-state';
+import { BrowserStandardEncoder } from '../browser-encoder';
 import { getDashboardStateSessionId } from '../helpers/store-helpers';
+import { stratosEntityCatalog } from '../stratos-entity-catalog';
 import { SessionData } from '../types/auth.types';
 
 const SETUP_HEADER = 'stratos-setup-required';
@@ -44,7 +43,6 @@ export class AuthEffect {
     private http: HttpClient,
     private actions$: Actions,
     private store: Store<DispatchOnlyAppState>,
-    private logger: LoggerService
   ) { }
 
   @Effect() loginRequest$ = this.actions$.pipe(
@@ -84,7 +82,10 @@ export class AuthEffect {
           const sessionData = response.body;
           sessionData.sessionExpiresOn = parseInt(response.headers.get('x-cap-session-expires-on'), 10) * 1000;
           this.rehydrateDashboardState(this.store, sessionData);
-          return [new GetSystemInfo(true), new VerifiedSession(sessionData, action.updateEndpoints)];
+          return [
+            stratosEntityCatalog.systemInfo.actions.getSystemInfo(true),
+            new VerifiedSession(sessionData, action.updateEndpoints)
+          ];
         }),
         catchError((err, caught) => {
           let setupMode = false;
@@ -164,7 +165,7 @@ export class AuthEffect {
           const dashboardData = JSON.parse(storage.getItem(sessionId));
           store.dispatch(new HydrateDashboardStateAction(dashboardData));
         } catch (e) {
-          this.logger.warn('Failed to parse user settings from session storage, consider clearing them manually', e);
+          console.warn('Failed to parse user settings from session storage, consider clearing them manually', e);
         }
       }
     }
diff --git a/src/frontend/packages/store/src/effects/dashboard.effects.ts b/src/frontend/packages/store/src/effects/dashboard.effects.ts
index 2d34737508..3e70adb94b 100644
--- a/src/frontend/packages/store/src/effects/dashboard.effects.ts
+++ b/src/frontend/packages/store/src/effects/dashboard.effects.ts
@@ -2,8 +2,8 @@ import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
 import { map } from 'rxjs/operators';
 
-import { ThemeService } from '../../../core/src/core/theme.service';
 import { HYDRATE_DASHBOARD_STATE, HydrateDashboardStateAction } from '../actions/dashboard-actions';
+import { ThemeService } from '../theme.service';
 
 
 @Injectable()
diff --git a/src/frontend/packages/store/src/effects/endpoint-api-errors.effects.ts b/src/frontend/packages/store/src/effects/endpoint-api-errors.effects.ts
index 8aa64ed80f..118abe2282 100644
--- a/src/frontend/packages/store/src/effects/endpoint-api-errors.effects.ts
+++ b/src/frontend/packages/store/src/effects/endpoint-api-errors.effects.ts
@@ -6,7 +6,7 @@ import { map } from 'rxjs/operators';
 import { SendEventAction } from '../actions/internal-events.actions';
 import { RequestTypes } from '../actions/request.actions';
 import { InternalAppState } from '../app-state';
-import { endpointSchemaKey } from '../helpers/entity-factory';
+import { endpointEntityType } from '../helpers/stratos-entity-factory';
 import { InternalEventSeverity } from '../types/internal-events.types';
 import { WrapperRequestActionFailed } from '../types/request.types';
 
@@ -26,7 +26,7 @@ export class EndpointApiError {
         const { eventCode, message, error, url } = internalEndpointError;
         internalEndpointError.endpointIds.forEach(endpoint =>
           this.store.dispatch(
-            new SendEventAction(endpointSchemaKey, endpoint, {
+            new SendEventAction(endpointEntityType, endpoint, {
               eventCode,
               severity: InternalEventSeverity.ERROR,
               message,
diff --git a/src/frontend/packages/store/src/effects/endpoint.effects.ts b/src/frontend/packages/store/src/effects/endpoint.effects.ts
index 3ebaf0694a..6925c05e5c 100644
--- a/src/frontend/packages/store/src/effects/endpoint.effects.ts
+++ b/src/frontend/packages/store/src/effects/endpoint.effects.ts
@@ -4,39 +4,31 @@ import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { catchError, mergeMap } from 'rxjs/operators';
 
-import { STRATOS_ENDPOINT_TYPE } from '../../../core/src/base-entity-schemas';
-import { EndpointType } from '../../../core/src/core/extension/extension-types';
-import { BrowserStandardEncoder } from '../../../core/src/helper';
 import {
   CONNECT_ENDPOINTS,
-  CONNECT_ENDPOINTS_FAILED,
-  CONNECT_ENDPOINTS_SUCCESS,
   ConnectEndpoint,
   DISCONNECT_ENDPOINTS,
-  DISCONNECT_ENDPOINTS_FAILED,
-  DISCONNECT_ENDPOINTS_SUCCESS,
   DisconnectEndpoint,
   EndpointActionComplete,
+  GET_ENDPOINT,
   GET_ENDPOINTS,
   GetAllEndpoints,
   GetAllEndpointsSuccess,
+  GetEndpoint,
   REGISTER_ENDPOINTS,
-  REGISTER_ENDPOINTS_FAILED,
-  REGISTER_ENDPOINTS_SUCCESS,
   RegisterEndpoint,
   UNREGISTER_ENDPOINTS,
-  UNREGISTER_ENDPOINTS_FAILED,
-  UNREGISTER_ENDPOINTS_SUCCESS,
   UnregisterEndpoint,
 } from '../actions/endpoint.actions';
 import { SendClearEventAction } from '../actions/internal-events.actions';
 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 { GET_SYSTEM_INFO_SUCCESS, GetSystemSuccess } from '../actions/system.actions';
 import { DispatchOnlyAppState } from '../app-state';
+import { BrowserStandardEncoder } from '../browser-encoder';
 import { entityCatalog } from '../entity-catalog/entity-catalog';
-import { endpointSchemaKey } from '../helpers/entity-factory';
+import { EndpointType } from '../extension-types';
 import { ApiRequestTypes } from '../reducers/api-request-reducer/request-helpers';
+import { stratosEntityCatalog } from '../stratos-entity-catalog';
 import { NormalizedResponse } from '../types/api.types';
 import { EndpointModel } from '../types/endpoint.types';
 import {
@@ -45,53 +37,51 @@ import {
   WrapperRequestActionFailed,
   WrapperRequestActionSuccess,
 } from '../types/request.types';
-import {
-  UPDATE_ENDPOINT,
-  UPDATE_ENDPOINT_FAILED,
-  UPDATE_ENDPOINT_SUCCESS,
-  UpdateEndpoint,
-} from './../actions/endpoint.actions';
+import { UPDATE_ENDPOINT, UpdateEndpoint } from './../actions/endpoint.actions';
 import { PaginatedAction } from './../types/pagination.types';
 
 
 @Injectable()
 export class EndpointsEffect {
 
-  static connectingKey = 'connecting';
-  static disconnectingKey = 'disconnecting';
-  static registeringKey = 'registering';
-  static updatingKey = 'updating';
-
   constructor(
     private http: HttpClient,
     private actions$: Actions,
     private store: Store<DispatchOnlyAppState>
   ) { }
 
+  @Effect() getEndpoint$ = this.actions$.pipe(
+    ofType<GetEndpoint>(GET_ENDPOINT),
+    mergeMap((action: GetEndpoint) => [
+      stratosEntityCatalog.systemInfo.actions.getSystemInfo(false, action)
+    ])
+  );
+
   @Effect() getAllEndpointsBySystemInfo$ = this.actions$.pipe(
     ofType<GetAllEndpoints>(GET_ENDPOINTS),
-    mergeMap((action: GetAllEndpoints) => [new GetSystemInfo(false, action)])
+    mergeMap((action: GetAllEndpoints) => [
+      stratosEntityCatalog.systemInfo.actions.getSystemInfo(false, action)
+    ])
   );
 
   @Effect() getAllEndpoints$ = this.actions$.pipe(
     ofType<GetSystemSuccess>(GET_SYSTEM_INFO_SUCCESS),
     mergeMap(action => {
-      const endpointEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointSchemaKey);
       const { associatedAction } = action;
-      const actionType = 'fetch';
+      const entityKey = entityCatalog.getEntityKey(associatedAction);
       const endpoints = action.payload.endpoints;
       // Data is an array of endpoints
-      const mappedData = {
+      const mappedData: NormalizedResponse<EndpointModel> = {
         entities: {
-          [endpointEntityKey]: {}
+          [entityKey]: {}
         },
         result: []
-      } as NormalizedResponse<EndpointModel>;
+      };
 
       Object.keys(endpoints).forEach((type: string) => {
         const endpointsForType = endpoints[type];
         Object.values(endpointsForType).forEach(endpointInfo => {
-          mappedData.entities[endpointEntityKey][endpointInfo.guid] = {
+          mappedData.entities[entityKey][endpointInfo.guid] = {
             ...endpointInfo,
             connectionStatus: endpointInfo.user ? 'connected' : 'disconnected',
           };
@@ -102,8 +92,8 @@ export class EndpointsEffect {
       // Order is important. Need to ensure data is written (none cf action success) before we notify everything is loaded
       // (endpoint success)
       return [
-        new WrapperRequestActionSuccess(mappedData, associatedAction, actionType),
-        new GetAllEndpointsSuccess(mappedData, associatedAction.login),
+        new WrapperRequestActionSuccess(mappedData, associatedAction, 'fetch'),
+        new GetAllEndpointsSuccess(mappedData, associatedAction['login']),
       ];
     }));
 
@@ -119,8 +109,6 @@ export class EndpointsEffect {
         return [];
       }
 
-      const apiAction = this.getEndpointUpdateAction(action.guid, action.type, EndpointsEffect.connectingKey);
-
       let fromObject: any;
       let body = action.body as any;
 
@@ -152,12 +140,11 @@ export class EndpointsEffect {
       });
 
       return this.doEndpointAction(
-        apiAction,
+        action,
         '/pp/v1/auth/login/cnsi',
         params,
         null,
-        [CONNECT_ENDPOINTS_SUCCESS, CONNECT_ENDPOINTS_FAILED],
-        action.endpointType,
+        action.endpointsType,
         body,
         response => response && response.error && response.error.error ? response.error.error : 'Could not connect, please try again'
       );
@@ -166,8 +153,6 @@ export class EndpointsEffect {
   @Effect() disconnect$ = this.actions$.pipe(
     ofType<DisconnectEndpoint>(DISCONNECT_ENDPOINTS),
     mergeMap(action => {
-
-      const apiAction = this.getEndpointUpdateAction(action.guid, action.type, EndpointsEffect.disconnectingKey);
       const params: HttpParams = new HttpParams({
         fromObject: {
           cnsi_guid: action.guid
@@ -175,20 +160,17 @@ export class EndpointsEffect {
       });
 
       return this.doEndpointAction(
-        apiAction,
+        action,
         '/pp/v1/auth/logout/cnsi',
         params,
         null,
-        [DISCONNECT_ENDPOINTS_SUCCESS, DISCONNECT_ENDPOINTS_FAILED],
-        action.endpointType
+        action.endpointsType
       );
     }));
 
   @Effect() unregister$ = this.actions$.pipe(
     ofType<UnregisterEndpoint>(UNREGISTER_ENDPOINTS),
     mergeMap(action => {
-
-      const apiAction = this.getEndpointDeleteAction(action.guid, action.type);
       const params: HttpParams = new HttpParams({
         fromObject: {
           cnsi_guid: action.guid
@@ -196,12 +178,11 @@ export class EndpointsEffect {
       });
 
       return this.doEndpointAction(
-        apiAction,
+        action,
         '/pp/v1/unregister',
         params,
         'delete',
-        [UNREGISTER_ENDPOINTS_SUCCESS, UNREGISTER_ENDPOINTS_FAILED],
-        action.endpointType
+        action.endpointsType
       );
     }));
 
@@ -209,7 +190,6 @@ export class EndpointsEffect {
     ofType<RegisterEndpoint>(REGISTER_ENDPOINTS),
     mergeMap(action => {
 
-      const apiAction = this.getEndpointUpdateAction(action.guid(), action.type, EndpointsEffect.registeringKey);
       const paramsObj = {
         cnsi_name: action.name,
         api_endpoint: action.endpoint,
@@ -230,12 +210,11 @@ export class EndpointsEffect {
       });
 
       return this.doEndpointAction(
-        apiAction,
-        '/pp/v1/register/' + action.endpointType,
+        action,
+        '/pp/v1/register/' + action.endpointsType,
         new HttpParams({}),
         'create',
-        [REGISTER_ENDPOINTS_SUCCESS, REGISTER_ENDPOINTS_FAILED],
-        action.endpointType,
+        action.endpointsType,
         body,
         this.processRegisterError
       );
@@ -243,8 +222,7 @@ export class EndpointsEffect {
 
   @Effect() updateEndpoint$ = this.actions$.pipe(
     ofType<UpdateEndpoint>(UPDATE_ENDPOINT),
-    mergeMap(action => {
-      const apiAction = this.getEndpointUpdateAction(action.id, action.type, EndpointsEffect.updatingKey);
+    mergeMap((action: UpdateEndpoint) => {
       const paramsObj = {
         name: action.name,
         skipSSL: action.skipSSL,
@@ -261,12 +239,11 @@ export class EndpointsEffect {
       });
 
       return this.doEndpointAction(
-        apiAction,
+        action,
         '/pp/v1/endpoint/' + action.id,
         new HttpParams({}),
         'update',
-        [UPDATE_ENDPOINT_SUCCESS, UPDATE_ENDPOINT_FAILED],
-        action.endpointType,
+        action.endpointsType,
         body,
         this.processUpdateError
       );
@@ -291,35 +268,20 @@ export class EndpointsEffect {
     }
     return message;
   }
-  private getEndpointUpdateAction(guid: string, type: string, updatingKey: string) {
-    const entityType = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointSchemaKey);
-    return {
-      entityType,
-      guid,
-      type,
-      updatingKey,
-    } as EntityRequestAction;
-  }
-
-  private getEndpointDeleteAction(guid, type) {
-    const entityType = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointSchemaKey);
-    return {
-      entityType,
-      guid,
-      type,
-    } as EntityRequestAction;
-  }
 
+  /**
+   * @param endpointType The underlying endpoints type (_cf_Endpoint, not _stratos_Endpoint)
+   */
   private doEndpointAction(
     apiAction: EntityRequestAction | PaginatedAction,
     url: string,
     params: HttpParams,
     apiActionType: ApiRequestTypes = 'update',
-    actionStrings: [string, string] = [null, null],
-    endpointType: EndpointType = 'cf',
+    endpointType: EndpointType,
     body?: string,
     errorMessageHandler?: (e: any) => string,
   ) {
+
     const endpointEntityKey = entityCatalog.getEntityKey(apiAction);
     this.store.dispatch(new StartRequestAction(apiAction, apiActionType));
     return this.http.post(url, body || {}, {
@@ -328,17 +290,17 @@ export class EndpointsEffect {
       mergeMap((endpoint: EndpointModel) => {
         const actions = [];
         let response: NormalizedResponse<EndpointModel>;
-        if (actionStrings[0]) {
-          actions.push(new EndpointActionComplete(actionStrings[0], apiAction.guid, endpointType, endpoint));
+        if (apiAction.actions[1]) {
+          actions.push(new EndpointActionComplete(apiAction.actions[1], apiAction.guid, endpointType, endpoint));
         }
 
         if (apiActionType === 'delete') {
           actions.push(new ClearPaginationOfEntity(apiAction, apiAction.guid));
-          actions.push(new GetUserFavoritesAction());
+          actions.push(stratosEntityCatalog.userFavorite.actions.getAll());
         }
 
         if (apiActionType === 'create') {
-          actions.push(new GetSystemInfo());
+          actions.push(stratosEntityCatalog.systemInfo.actions.getSystemInfo());
           response = {
             entities: {
               [endpointEntityKey]: {
@@ -350,10 +312,10 @@ export class EndpointsEffect {
         }
 
         if (apiActionType === 'update') {
-          actions.push(new GetSystemInfo());
+          actions.push(stratosEntityCatalog.systemInfo.actions.getSystemInfo());
         }
 
-        if (apiAction.updatingKey === EndpointsEffect.disconnectingKey || apiActionType === 'create' || apiActionType === 'delete'
+        if (apiAction.updatingKey === DisconnectEndpoint.UpdatingKey || apiActionType === 'create' || apiActionType === 'delete'
           || apiActionType === 'update') {
           actions.push(this.clearEndpointInternalEvents(apiAction.guid, endpointEntityKey));
         }
@@ -364,8 +326,8 @@ export class EndpointsEffect {
       ),
       catchError(e => {
         const actions = [];
-        if (actionStrings[1]) {
-          actions.push({ type: actionStrings[1], guid: apiAction.guid });
+        if (apiAction.actions[2]) {
+          actions.push({ type: apiAction.actions[2], guid: apiAction.guid });
         }
         const errorMessage = errorMessageHandler ? errorMessageHandler(e) : 'Could not perform action';
         actions.push(new WrapperRequestActionFailed(errorMessage, apiAction, apiActionType));
diff --git a/src/frontend/packages/store/src/effects/permissions.effect.ts b/src/frontend/packages/store/src/effects/permissions.effect.ts
index bb890b00a7..b9569d4b2e 100644
--- a/src/frontend/packages/store/src/effects/permissions.effect.ts
+++ b/src/frontend/packages/store/src/effects/permissions.effect.ts
@@ -5,7 +5,6 @@ import { Action, Store } from '@ngrx/store';
 import { combineLatest, EMPTY, of } from 'rxjs';
 import { catchError, map, switchMap } from 'rxjs/operators';
 
-import { LoggerService } from '../../../core/src/core/logger.service';
 import { CONNECT_ENDPOINTS_SUCCESS, EndpointActionComplete } from '../actions/endpoint.actions';
 import {
   GET_CURRENT_USER_RELATIONS,
@@ -27,7 +26,6 @@ export class PermissionsEffects {
     private httpClient: HttpClient,
     private actions$: Actions,
     private store: Store<AppState>,
-    private logService: LoggerService
   ) { }
 
   @Effect() getCurrentUsersPermissions$ = this.actions$.pipe(
@@ -35,7 +33,7 @@ export class PermissionsEffects {
     switchMap(action => {
       const allRequestsCompleted = entityCatalog.getAllBaseEndpointTypes().reduce((res, endpointType) => {
         if (endpointType.definition.userRolesFetch) {
-          res.push(endpointType.definition.userRolesFetch([], this.store, this.logService, this.httpClient));
+          res.push(endpointType.definition.userRolesFetch([], this.store, this.httpClient));
         }
         return res;
       }, []);
@@ -44,7 +42,7 @@ export class PermissionsEffects {
       );
     }),
     catchError(err => {
-      this.logService.warn('Failed to fetch current user permissions: ', err);
+      console.warn('Failed to fetch current user permissions: ', err);
       return of(failedAction);
     })
   );
@@ -61,12 +59,12 @@ export class PermissionsEffects {
         guid: action.guid,
         user: action.endpoint.user
       }
-      return endpointType.definition.userRolesFetch([endpoint], this.store, this.logService, this.httpClient).pipe(
+      return endpointType.definition.userRolesFetch([endpoint], this.store, this.httpClient).pipe(
         map(succeeded => succeeded ? successAction : failedAction)
       );
     }),
     catchError(err => {
-      this.logService.warn('Failed to fetch current user permissions after endpoint connected: ', err);
+      console.warn('Failed to fetch current user permissions after endpoint connected: ', err);
       return of(failedAction);
     })
   );
diff --git a/src/frontend/packages/store/src/effects/snackBar.effects.spec.ts b/src/frontend/packages/store/src/effects/snackBar.effects.spec.ts
deleted file mode 100644
index 69c2b8924c..0000000000
--- a/src/frontend/packages/store/src/effects/snackBar.effects.spec.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { inject, TestBed } from '@angular/core/testing';
-import { MatDialog } from '@angular/material/dialog';
-import { Store } from '@ngrx/store';
-
-import { CoreModule } from '../../../core/src/core/core.module';
-import { EndpointsPageComponent } from '../../../core/src/features/endpoints/endpoints-page/endpoints-page.component';
-import { SharedModule } from '../../../core/src/shared/shared.module';
-import { ShowSnackBar } from './../actions/snackBar.actions';
-import { AppStoreModule } from './../store.module';
-
-describe('SnackBarEffect', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [EndpointsPageComponent],
-      imports: [
-        CommonModule,
-        CoreModule,
-        SharedModule,
-        AppStoreModule
-      ]
-    })
-      .compileComponents();
-  });
-
-  it('Should open a dialog', () => {
-    inject([Store, MatDialog], (store: Store<unknown>, dialog: MatDialog) => {
-      store.dispatch(new ShowSnackBar('Test'));
-      expect(dialog.openDialogs[0]).toBeDefined();
-    });
-  });
-});
diff --git a/src/frontend/packages/store/src/effects/snackBar.effects.ts b/src/frontend/packages/store/src/effects/snackBar.effects.ts
deleted file mode 100644
index 5f6a2540e4..0000000000
--- a/src/frontend/packages/store/src/effects/snackBar.effects.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Injectable } from '@angular/core';
-import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar';
-import { Actions, Effect, ofType } from '@ngrx/effects';
-import { map } from 'rxjs/operators';
-
-import { SnackBarReturnComponent } from '../../../core/src/shared/components/snackbar-return/snackbar-return.component';
-import {
-  HIDE_SNACK_BAR,
-  HideSnackBar,
-  SHOW_RETURN_SNACK_BAR,
-  SHOW_SNACK_BAR,
-  ShowReturnSnackBar,
-  ShowSnackBar,
-} from '../actions/snackBar.actions';
-
-
-@Injectable()
-export class SnackBarEffects {
-  constructor(
-    private actions$: Actions,
-    public snackBar: MatSnackBar
-  ) { }
-
-  private snackBars: MatSnackBarRef<SimpleSnackBar>[] = [];
-
-  @Effect({ dispatch: false }) showSnackBar$ = this.actions$.pipe(
-    ofType<ShowSnackBar>(SHOW_SNACK_BAR),
-    map(action => this.snackBars.push(this.snackBar.open(action.message, action.closeMessage, {
-      duration: action.closeMessage ? null : 5000
-    }))));
-
-  @Effect({ dispatch: false }) showReturnSnackBar$ = this.actions$.pipe(
-    ofType<ShowReturnSnackBar>(SHOW_RETURN_SNACK_BAR),
-    map(action => this.snackBars.push(this.snackBar.openFromComponent(SnackBarReturnComponent, {
-      data: { message: action.message, returnUrl: action.returnRouterUrl, returnLabel: action.returnLabel }
-    }))));
-
-  @Effect({ dispatch: false }) hideSnackBar$ = this.actions$.pipe(
-    ofType<HideSnackBar>(HIDE_SNACK_BAR),
-    map(() => this.snackBars.forEach(snackBar => snackBar.dismiss()))
-  );
-}
diff --git a/src/frontend/packages/store/src/effects/system.effects.ts b/src/frontend/packages/store/src/effects/system.effects.ts
index 962280aebb..07eb09bdf5 100644
--- a/src/frontend/packages/store/src/effects/system.effects.ts
+++ b/src/frontend/packages/store/src/effects/system.effects.ts
@@ -4,12 +4,11 @@ import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { catchError, mergeMap } from 'rxjs/operators';
 
-import { EntityRequestAction } from '../types/request.types';
-import { GET_SYSTEM_INFO, GetSystemFailed, GetSystemInfo, GetSystemSuccess } from '../actions/system.actions';
-import { StartRequestAction, WrapperRequestActionFailed, WrapperRequestActionSuccess } from '../types/request.types';
-import { SystemInfo, systemStoreNames } from '../types/system.types';
+import { GET_SYSTEM_INFO, GetSystemInfo, GetSystemSuccess } from '../actions/system.actions';
 import { InternalAppState } from '../app-state';
-import { STRATOS_ENDPOINT_TYPE } from '../../../core/src/base-entity-schemas';
+import { StartRequestAction, WrapperRequestActionFailed, WrapperRequestActionSuccess } from '../types/request.types';
+import { SystemInfo } from '../types/system.types';
+
 
 @Injectable()
 export class SystemEffects {
@@ -19,32 +18,25 @@ export class SystemEffects {
     private store: Store<InternalAppState>
   ) { }
 
-  static guid = 'info';
-
   @Effect() getInfo$ = this.actions$.pipe(
     ofType<GetSystemInfo>(GET_SYSTEM_INFO),
     mergeMap(action => {
-      const apiAction = {
-        entityType: systemStoreNames.type,
-        endpointType: STRATOS_ENDPOINT_TYPE,
-        guid: SystemEffects.guid,
-        type: action.type,
-      } as EntityRequestAction;
-      this.store.dispatch(new StartRequestAction(apiAction));
+      // Associated action with be either get endpoint or get all endpoints/
+      // Start action for those two are dispatched here, as well as error handling
+      // Success actions are handling in the effect associated with GetSystemSuccess
+      this.store.dispatch(new StartRequestAction(action));
       const { associatedAction } = action;
-      const actionType = 'fetch';
-      this.store.dispatch(new StartRequestAction(associatedAction, actionType));
+      this.store.dispatch(new StartRequestAction(associatedAction, 'fetch'));
       return this.httpClient.get('/pp/v1/info').pipe(
         mergeMap((info: SystemInfo) => {
           return [
             new GetSystemSuccess(info, action.login, associatedAction),
-            new WrapperRequestActionSuccess({ entities: {}, result: [] }, apiAction)
+            new WrapperRequestActionSuccess({ entities: {}, result: [] }, action)
           ];
         }), catchError((e) => {
           return [
-            new GetSystemFailed(),
-            new WrapperRequestActionFailed('Could not get system endpoints', associatedAction),
-            new WrapperRequestActionFailed('Could not fetch system info', apiAction)
+            { type: action.actions[2] },
+            new WrapperRequestActionFailed('Could not fetch system info', action)
           ];
         }));
     }));
diff --git a/src/frontend/packages/store/src/effects/uaa-setup.effects.ts b/src/frontend/packages/store/src/effects/uaa-setup.effects.ts
index 9e193e4380..ea7092d69b 100644
--- a/src/frontend/packages/store/src/effects/uaa-setup.effects.ts
+++ b/src/frontend/packages/store/src/effects/uaa-setup.effects.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
 import { catchError, map, switchMap } from 'rxjs/operators';
 
-import { isHttpErrorResponse } from '../../../core/src/jetstream.helpers';
+import { isHttpErrorResponse } from '../jetstream';
 import {
   SETUP_GET_SCOPES,
   SETUP_SAVE_CONFIG,
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 deebce83a7..02240e52af 100644
--- a/src/frontend/packages/store/src/effects/user-favorites-effect.ts
+++ b/src/frontend/packages/store/src/effects/user-favorites-effect.ts
@@ -2,38 +2,29 @@ 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, first, map, mergeMap, switchMap } from 'rxjs/operators';
+import { catchError, first, mergeMap, switchMap } from 'rxjs/operators';
 
-import { userFavoritesEntitySchema } from '../../../core/src/base-entity-schemas';
-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';
 import {
   GetUserFavoritesAction,
   GetUserFavoritesFailedAction,
   GetUserFavoritesSuccessAction,
-} from '../actions/user-favourites-actions/get-user-favorites-action';
-import {
   RemoveUserFavoriteAction,
   RemoveUserFavoriteSuccessAction,
-} from '../actions/user-favourites-actions/remove-user-favorite-action';
-import {
   SaveUserFavoriteAction,
   SaveUserFavoriteSuccessAction,
-} from '../actions/user-favourites-actions/save-user-favorite-action';
-import { ToggleUserFavoriteAction } from '../actions/user-favourites-actions/toggle-user-favorite-action';
-import {
+  ToggleUserFavoriteAction,
   UpdateUserFavoriteMetadataAction,
   UpdateUserFavoriteMetadataSuccessAction,
-} from '../actions/user-favourites-actions/update-user-favorite-metadata-action';
+} from '../actions/user-favourites.actions';
 import { DispatchOnlyAppState } from '../app-state';
+import { entityCatalog } from '../entity-catalog/entity-catalog';
+import { proxyAPIVersion } from '../jetstream';
 import { NormalizedResponse } from '../types/api.types';
-import { PaginatedAction } from '../types/pagination.types';
-import { WrapperRequestActionSuccess } from '../types/request.types';
+import { StartRequestAction, WrapperRequestActionFailed, WrapperRequestActionSuccess } from '../types/request.types';
 import { IFavoriteMetadata, UserFavorite, userFavoritesPaginationKey } from '../types/user-favorites.types';
+import { UserFavoriteManager } from '../user-favorite-manager';
 
-const { proxyAPIVersion } = environment;
 const favoriteUrlPath = `/pp/${proxyAPIVersion}/favorites`;
 
 
@@ -51,11 +42,17 @@ export class UserFavoritesEffect {
   @Effect() saveFavorite = this.actions$.pipe(
     ofType<SaveUserFavoriteAction>(SaveUserFavoriteAction.ACTION_TYPE),
     mergeMap(action => {
+      const actionType = 'update';
+      this.store.dispatch(new StartRequestAction(action, actionType))
       return this.http.post<UserFavorite<IFavoriteMetadata>>(favoriteUrlPath, action.favorite).pipe(
-        mergeMap(newFavorite => {
-          return [
-            new SaveUserFavoriteSuccessAction(newFavorite)
-          ];
+        switchMap(newFavorite => {
+          this.store.dispatch(new WrapperRequestActionSuccess(null, action, actionType));
+          this.store.dispatch(new SaveUserFavoriteSuccessAction(newFavorite));
+          return [];
+        }),
+        catchError(() => {
+          this.store.dispatch(new WrapperRequestActionFailed('Failed to update user favorite', action, actionType));
+          return [];
         })
       );
     })
@@ -64,14 +61,11 @@ export class UserFavoritesEffect {
   @Effect({ dispatch: false }) getFavorite$ = this.actions$.pipe(
     ofType<GetUserFavoritesAction>(GetUserFavoritesAction.ACTION_TYPE),
     switchMap((action: GetUserFavoritesAction) => {
-      const apiAction = {
-        entityType: userFavoritesEntitySchema.entityType,
-        endpointType: userFavoritesEntitySchema.endpointType,
-        type: action.type
-      } as PaginatedAction;
-      const favEntityKey = entityCatalog.getEntityKey(apiAction);
+      const favEntityKey = entityCatalog.getEntityKey(action);
+      const actionType = 'fetch';
+      this.store.dispatch(new StartRequestAction(action, actionType))
       return this.http.get<UserFavorite<IFavoriteMetadata>[]>(favoriteUrlPath).pipe(
-        map(favorites => {
+        switchMap(favorites => {
           const mappedData = favorites.reduce<NormalizedResponse<UserFavorite<IFavoriteMetadata>>>((data, favorite) => {
             const { guid } = favorite;
             if (guid) {
@@ -80,12 +74,14 @@ export class UserFavoritesEffect {
             }
             return data;
           }, { entities: { [favEntityKey]: {} }, result: [] });
-          this.store.dispatch(new WrapperRequestActionSuccess(mappedData, apiAction));
+          this.store.dispatch(new WrapperRequestActionSuccess(mappedData, action, actionType, mappedData.result.length, 1));
           this.store.dispatch(new GetUserFavoritesSuccessAction(favorites));
+          return [];
         }),
-        catchError(e => {
-          this.store.dispatch(new GetUserFavoritesFailedAction());
-          throw e;
+        catchError(() => {
+          this.store.dispatch(new GetUserFavoritesFailedAction())
+          this.store.dispatch(new WrapperRequestActionFailed('Failed to fetch user favorites', action, actionType))
+          return [];
         })
       );
     })
@@ -96,11 +92,11 @@ export class UserFavoritesEffect {
     mergeMap(action =>
       this.userFavoriteManager.getIsFavoriteObservable(action.favorite).pipe(
         first(),
-        map(isFav => {
+        switchMap(isFav => {
           if (isFav) {
-            return new RemoveUserFavoriteAction(action.favorite);
+            return [new RemoveUserFavoriteAction(action.favorite)];
           } else {
-            return new SaveUserFavoriteAction(action.favorite);
+            return [new SaveUserFavoriteAction(action.favorite)];
           }
         })
       )
@@ -109,22 +105,42 @@ export class UserFavoritesEffect {
 
   @Effect({ dispatch: false }) removeFavorite$ = this.actions$.pipe(
     ofType<RemoveUserFavoriteAction>(RemoveUserFavoriteAction.ACTION_TYPE),
-    switchMap((action: RemoveUserFavoriteAction) => {
-      const { guid } = action.favorite;
-      this.store.dispatch(new RemoveUserFavoriteSuccessAction(action.favorite));
-      this.store.dispatch(new ClearPaginationOfEntity(userFavoritesEntitySchema, guid, userFavoritesPaginationKey));
-      return this.http.delete<UserFavorite<IFavoriteMetadata>>(`${favoriteUrlPath}/${guid}`);
+    mergeMap((action: RemoveUserFavoriteAction) => {
+      const actionType = 'update';
+      this.store.dispatch(new StartRequestAction(action, actionType))
+      return this.http.delete<UserFavorite<IFavoriteMetadata>>(`${favoriteUrlPath}/${action.guid}`).pipe(
+        switchMap(() => {
+          this.store.dispatch(new WrapperRequestActionSuccess(null, action));
+          this.store.dispatch(new RemoveUserFavoriteSuccessAction(action.favorite));
+          this.store.dispatch(new ClearPaginationOfEntity(action.entity[0], action.guid, userFavoritesPaginationKey));
+          return [];
+        }),
+        catchError(() => {
+          this.store.dispatch(new WrapperRequestActionFailed('Failed to remove user favorite', action, actionType));
+          return [];
+        })
+      );
     })
   );
 
   @Effect() updateMetadata$ = this.actions$.pipe(
     ofType<UpdateUserFavoriteMetadataAction>(UpdateUserFavoriteMetadataAction.ACTION_TYPE),
     mergeMap((action: UpdateUserFavoriteMetadataAction) => {
+      const actionType = 'update';
+      this.store.dispatch(new StartRequestAction(action, actionType))
       return this.http.post<UserFavorite<IFavoriteMetadata>>(
         `${favoriteUrlPath}/${action.favorite.guid}/metadata`,
         action.favorite.metadata
       ).pipe(
-        map(() => new UpdateUserFavoriteMetadataSuccessAction(action.favorite))
+        switchMap(() => {
+          this.store.dispatch(new WrapperRequestActionSuccess(null, action));
+          this.store.dispatch(new UpdateUserFavoriteMetadataSuccessAction(action.favorite));
+          return [];
+        }),
+        catchError(() => {
+          this.store.dispatch(new WrapperRequestActionFailed('Failed to update user favorite', action, actionType));
+          return [];
+        })
       );
     })
   );
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 745d4e11cc..9c010fee57 100644
--- a/src/frontend/packages/store/src/effects/user-profile.effects.ts
+++ b/src/frontend/packages/store/src/effects/user-profile.effects.ts
@@ -4,8 +4,6 @@ import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { catchError, mergeMap, switchMap } from 'rxjs/operators';
 
-import { userProfileEntitySchema } from '../../../core/src/base-entity-schemas';
-import { environment } from '../../../core/src/environments/environment';
 import {
   FetchUserProfileAction,
   GET_USERPROFILE,
@@ -15,28 +13,15 @@ import {
   UpdateUserProfileAction,
 } from '../actions/user-profile.actions';
 import { entityCatalog } from '../entity-catalog/entity-catalog';
-import { rootUpdatingKey } from '../reducers/api-request-reducer/types';
+import { proxyAPIVersion } from '../jetstream';
 import { UserProfileInfo } from '../types/user-profile.types';
 import { DispatchOnlyAppState } from './../app-state';
-import {
-  EntityRequestAction,
-  StartRequestAction,
-  WrapperRequestActionFailed,
-  WrapperRequestActionSuccess,
-} from './../types/request.types';
-
-
-const { proxyAPIVersion } = environment;
+import { StartRequestAction, WrapperRequestActionFailed, WrapperRequestActionSuccess } from './../types/request.types';
 
-export const userProfilePasswordUpdatingKey = 'password';
 
 @Injectable()
 export class UserProfileEffect {
 
-  stratosUserConfig = entityCatalog.getEntity(userProfileEntitySchema.endpointType, userProfileEntitySchema.entityType);
-  private stratosUserEntityType = userProfileEntitySchema.entityType;
-  private stratosUserEndpointType = userProfileEntitySchema.endpointType;
-
   constructor(
     private actions$: Actions,
     private store: Store<DispatchOnlyAppState>,
@@ -47,85 +32,66 @@ export class UserProfileEffect {
     ofType<FetchUserProfileAction>(GET_USERPROFILE),
     mergeMap(action => {
       this.store.dispatch(new StartRequestAction(action));
+      const entityKey = entityCatalog.getEntityKey(action);
       return this.httpClient.get(`/pp/${proxyAPIVersion}/users/${action.userGuid}`).pipe(
-        mergeMap((info: UserProfileInfo) => {
-          return [
-            new WrapperRequestActionSuccess({
-              entities: { [this.stratosUserConfig.entityKey]: { [action.guid]: info } },
-              result: [action.guid]
-            }, action)
-          ];
-        }), catchError((e) => {
-          return [
-            new WrapperRequestActionFailed('Could not get User Profile Info', action),
-          ];
-        }));
+        mergeMap((info: UserProfileInfo) => [
+          new WrapperRequestActionSuccess({
+            entities: { [entityKey]: { [action.guid]: info } },
+            result: [action.guid]
+          }, action)
+        ]),
+        catchError((e) => [
+          new WrapperRequestActionFailed('Could not get User Profile Info', action),
+        ])
+      );
     }));
 
   @Effect() updateUserProfileInfo$ = this.actions$.pipe(
     ofType<UpdateUserProfileAction>(UPDATE_USERPROFILE),
-    mergeMap(action => {
-      const apiAction = {
-        entityType: this.stratosUserEntityType,
-        endpointType: this.stratosUserEndpointType,
-        guid: FetchUserProfileAction.guid,
-        type: action.type,
-        updatingKey: rootUpdatingKey
-      } as EntityRequestAction;
-      const actionType = 'update';
-      this.store.dispatch(new StartRequestAction(apiAction, actionType));
-      const guid = action.profile.id;
+    mergeMap((action: UpdateUserProfileAction) => {
+      this.store.dispatch(new StartRequestAction(action, 'update'));
+      const userGuid = action.profile.id;
       const version = action.profile.meta.version;
       const headers = { 'If-Match': version.toString() };
       if (action.password) {
         headers['x-stratos-password'] = action.password;
       }
 
-      return this.httpClient.put(`/pp/${proxyAPIVersion}/users/${guid}`, action.profile, { headers }).pipe(
+      return this.httpClient.put(`/pp/${proxyAPIVersion}/users/${userGuid}`, action.profile, { headers }).pipe(
         mergeMap((info: UserProfileInfo) => {
           return [
             new WrapperRequestActionSuccess({
               entities: {},
               result: []
-            }, apiAction),
-          ];
-        }), catchError((e) => {
-          return [
-            new WrapperRequestActionFailed('Could not update User Profile Info', apiAction),
+            }, action),
           ];
-        }));
+        }),
+        catchError((e) => [
+          new WrapperRequestActionFailed('Could not update User Profile Info', action),
+        ]));
     }));
 
   @Effect() updateUserPassword$ = this.actions$.pipe(
     ofType<UpdateUserPasswordAction>(UPDATE_USERPASSWORD),
-    mergeMap(action => {
-      const apiAction = {
-        entityType: this.stratosUserEntityType,
-        endpointType: this.stratosUserEndpointType,
-        guid: FetchUserProfileAction.guid,
-        type: action.type,
-        updatingKey: userProfilePasswordUpdatingKey
-      } as EntityRequestAction;
-      // Use the creating action for password change
-      const actionType = 'update';
-      this.store.dispatch(new StartRequestAction(apiAction, actionType));
-      const guid = action.id;
+    mergeMap((action: UpdateUserPasswordAction) => {
+      this.store.dispatch(new StartRequestAction(action, 'update'));
+      const userGuid = action.id;
       const headers = {
         'x-stratos-password': action.passwordChanges.oldPassword,
         'x-stratos-password-new': action.passwordChanges.password
       };
-      return this.httpClient.put(`/pp/${proxyAPIVersion}/users/${guid}/password`, action.passwordChanges, { headers }).pipe(
+      return this.httpClient.put(`/pp/${proxyAPIVersion}/users/${userGuid}/password`, action.passwordChanges, { headers }).pipe(
         switchMap((info: UserProfileInfo) => {
           return [
             new WrapperRequestActionSuccess({
               entities: {},
               result: []
-            }, apiAction)
-          ];
-        }), catchError((e) => {
-          return [
-            new WrapperRequestActionFailed('Could not update User Password', apiAction),
+            }, action)
           ];
-        }));
+        }),
+        catchError((e) => [
+          new WrapperRequestActionFailed('Could not update User Password', action),
+        ])
+      );
     }));
 }
diff --git a/src/frontend/packages/store/src/endpoint-utils.ts b/src/frontend/packages/store/src/endpoint-utils.ts
new file mode 100644
index 0000000000..00f3677f32
--- /dev/null
+++ b/src/frontend/packages/store/src/endpoint-utils.ts
@@ -0,0 +1,6 @@
+import { EndpointModel } from './types/endpoint.types';
+
+export function getFullEndpointApiUrl(endpoint: EndpointModel) {
+  return endpoint && endpoint.api_endpoint ?
+    `${endpoint.api_endpoint.Scheme}://${endpoint.api_endpoint.Host}${endpoint.api_endpoint.Path}` : 'Unknown';
+}
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 2e88c4f518..0ad7cc9d67 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
@@ -122,6 +122,7 @@ export class EntityCatalogEntityStoreHelpers {
       if (!rAction.guid) {
         throw new Error(`\`${actionKey}\` action for entity \`${rAction.entityType}\` has no guid`);
       }
+
       const entityMonitor = es.getEntityMonitor(
         rAction.guid,
         {
@@ -147,9 +148,9 @@ export class EntityCatalogEntityStoreHelpers {
           schemaKey: '',
           startWithNull: false
         }
-      ): EntityMonitor<Y> =>
-        new EntityMonitor<Y>(EntityCatalogHelpers.GetEntityCatalogHelper().store, entityId, entityKey, getSchema(params.schemaKey), params.startWithNull)
-      ,
+      ): EntityMonitor<Y> => new EntityMonitor<Y>(
+        EntityCatalogHelpers.GetEntityCatalogHelper().store, entityId, entityKey, getSchema(params.schemaKey), params.startWithNull
+      ),
       getEntityService: (
         ...args: Parameters<ABC['get']>
       ): EntityService<Y> => {
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 3fa2b47b0a..61bbc7883e 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
@@ -1,9 +1,7 @@
 import { ActionReducer } from '@ngrx/store';
 
-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 { getFullEndpointApiUrl } from '../../endpoint-utils';
 import {
   EntitiesFetchHandler,
   EntitiesInfoHandler,
@@ -15,6 +13,7 @@ import {
 } 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 { endpointEntityType, STRATOS_ENDPOINT_TYPE, stratosEntityFactory } from '../../helpers/stratos-entity-factory';
 import { EndpointModel } from '../../types/endpoint.types';
 import { APISuccessOrFailedAction, EntityRequestAction } from '../../types/request.types';
 import { IEndpointFavMetadata } from '../../types/user-favorites.types';
@@ -37,6 +36,7 @@ import {
 import { ActionBuilderConfigMapper } from './action-builder-config.mapper';
 import { ActionDispatchers, EntityCatalogEntityStoreHelpers } from './entity-catalog-entity-store-helpers';
 import { EntityCatalogEntityStore } from './entity-catalog-entity.types';
+import { KnownKeys, NonOptionalKeys } from './type.helpers';
 
 export type KnownActionBuilders<ABC extends OrchestratedActionBuilders> = Pick<ABC, NonOptionalKeys<Pick<ABC, KnownKeys<ABC>>>>;
 
@@ -134,8 +134,8 @@ export class StratosBaseCatalogEntity<
       }
       return newSchema;
     }, {
-        default: entitySchemas.default
-      });
+      default: entitySchemas.default
+    });
   }
 
   private getEndpointType(definition: IStratosBaseEntityDefinition) {
@@ -316,7 +316,7 @@ export class StratosCatalogEntity<
 }
 
 export class StratosCatalogEndpointEntity extends StratosBaseCatalogEntity<IEndpointFavMetadata, EndpointModel> {
-  static readonly baseEndpointRender = {
+  static readonly baseEndpointRender: IStratosEntityBuilder<IEndpointFavMetadata, EndpointModel> = {
     getMetadata: endpoint => ({
       name: endpoint.name,
       guid: endpoint.guid,
@@ -332,19 +332,19 @@ export class StratosCatalogEndpointEntity extends StratosBaseCatalogEntity<IEndp
       ['User', (metadata) => metadata.user],
       ['Admin', (metadata) => metadata.admin]
     ]
-  } as IStratosEntityBuilder<IEndpointFavMetadata, EndpointModel>;
+  };
   // This is needed here for typing
   public definition: IStratosEndpointDefinition<EntityCatalogSchemas>;
   constructor(
     entity: StratosEndpointExtensionDefinition | IStratosEndpointDefinition,
     getLink?: (metadata: IEndpointFavMetadata) => string
   ) {
-    const fullEntity = {
+    const fullEntity: IStratosEndpointDefinition = {
       ...entity,
       schema: {
-        default: endpointEntitySchema
+        default: stratosEntityFactory(endpointEntityType)
       }
-    } as IStratosEndpointDefinition;
+    };
     super(fullEntity, {
       entityBuilder: {
         ...StratosCatalogEndpointEntity.baseEndpointRender,
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 0280477e6f..ac6e5e3ae3 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
@@ -1,15 +1,11 @@
-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';
+import { FilteredByNotReturnType, FilteredByReturnType, KnownKeys, NeverKeys } from './type.helpers';
+
 
 /**
  * Core entity and entities access (entity/entities monitors and services)
@@ -105,7 +101,7 @@ export type CustomEntityCatalogEntityStore<Y, ABC extends OrchestratedActionBuil
 
 /**
  * Combine all types of store
- * - CoreEntityCatalogEntityStore (entity and entities store access) 
+ * - CoreEntityCatalogEntityStore (entity and entities store access)
  * - EntityCatalogEntityStoreCollections (per entity custom entities lists)
  * - EntityCatalogEntityStoreSingles (per entity custom entity's)
  */
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/type.helpers.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/type.helpers.ts
new file mode 100644
index 0000000000..92ebfd5d1e
--- /dev/null
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/type.helpers.ts
@@ -0,0 +1,46 @@
+/**
+ * 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;
+
+export type NonOptionalKeys<T extends object> = Exclude<{
+  [K in keyof T]: T extends Record<K, T[K]>
+  ? K
+  : never
+}[keyof T], undefined>
+
+export type OptionalKeys<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>
+
+/**
+ * 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]
+};
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog.spec.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog.spec.ts
index 7f7a44f245..7b2a0f4c5a 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog.spec.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog.spec.ts
@@ -1,14 +1,13 @@
-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 { EntitySchema } from '../helpers/entity-schema';
+import { endpointEntityType, stratosEntityFactory } from '../helpers/stratos-entity-factory';
 import { TestEntityCatalog } from './entity-catalog';
 import { StratosCatalogEndpointEntity, StratosCatalogEntity } from './entity-catalog-entity/entity-catalog-entity';
 import { EntityCatalogSchemas, IStratosEndpointDefinition } from './entity-catalog.types';
 
-describe('EntityCatalogService', () => {
+fdescribe('EntityCatalogService', () => {
   let entityCatalog: TestEntityCatalog;
   function getEndpointDefinition() {
     return {
@@ -18,7 +17,7 @@ describe('EntityCatalogService', () => {
       icon: 'cloud_foundry',
       iconFont: 'stratos-icons',
       logoUrl: '/core/assets/endpoint-icons/cloudfoundry.png',
-      authTypes: [BaseEndpointAuth.UsernamePassword, BaseEndpointAuth.SSO],
+      authTypes: [],
       listDetailsComponent: EndpointListDetailsComponent,
     } as IStratosEndpointDefinition;
   }
@@ -107,7 +106,7 @@ describe('EntityCatalogService', () => {
     expect(catalogEntity.definition).toEqual({
       ...endpoint,
       schema: {
-        default: endpointEntitySchema
+        default: stratosEntityFactory(endpointEntityType)
       }
     });
   });
@@ -124,9 +123,7 @@ describe('EntityCatalogService', () => {
       urlValidation: false,
       unConnectable: true,
       urlValidationRegexString: 'redjecks',
-      authTypes: [
-        BaseEndpointAuth.SSO
-      ]
+      authTypes: []
     };
     const definition = {
       ...endpoint,
@@ -141,7 +138,7 @@ describe('EntityCatalogService', () => {
       iconFont: 'stratos-icons',
       listDetailsComponent: EndpointListDetailsComponent,
       schema: {
-        default: endpointEntitySchema
+        default: stratosEntityFactory(endpointEntityType)
       },
       parentType: endpoint.type
     };
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog.ts
index c6371e3e17..5565256852 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog.ts
@@ -1,7 +1,7 @@
 import { Action } from '@ngrx/store';
 
-import { STRATOS_ENDPOINT_TYPE } from '../../../core/src/base-entity-schemas';
 import { IRequestEntityTypeState } from '../app-state';
+import { STRATOS_ENDPOINT_TYPE } from '../helpers/stratos-entity-factory';
 import { ExtraApiReducers } from '../reducers/api-request-reducers.generator.helpers';
 import { ICurrentUserRolesState } from '../types/current-user-roles.types';
 import { OrchestratedActionBuilders } from './action-orchestrator/action-orchestrator';
@@ -218,10 +218,10 @@ class EntityCatalog {
               ...state.endpoints,
               [endpoint.type]: endpointState
             }
-          }
+          };
         }
       }
-    })
+    });
     return oneChanged ? {
       ...state
     } : state;
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 7f29f7a188..d8af7fe528 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,10 +1,6 @@
 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 { 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 {
   ApiErrorMessageHandler,
@@ -21,7 +17,11 @@ import {
 import {
   PaginationPageIteratorConfig,
 } from '../entity-request-pipeline/pagination-request-base-handlers/pagination-iterator.pipe';
+import { EndpointAuthTypeConfig } from '../extension-types';
+import { FavoritesConfigMapper } from '../favorite-config-mapper';
 import { EntitySchema } from '../helpers/entity-schema';
+import { EndpointModel } from '../types/endpoint.types';
+import { StratosStatus } from '../types/shared.types';
 import { UserFavorite } from '../types/user-favorites.types';
 
 export interface EntityCatalogEntityConfig {
@@ -97,6 +97,17 @@ export interface IStratosBaseEntityDefinition<T = EntitySchema | EntityCatalogSc
   readonly entitiesFetchHandler?: EntitiesFetchHandler;
 }
 
+export class EndpointHealthCheck {
+  /**
+   * @param check To show an error, the check should either call a WrapperRequestActionFailed
+   * or kick off a chain that eventually calls a WrapperRequestActionFailed
+   */
+  constructor(
+    public endpointType: string,
+    public check: (endpoint: EndpointModel) => void
+  ) { }
+}
+
 /**
  * Static information describing a stratos endpoint.
  *
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 8b6fc07532..3f335ec3c5 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,6 +1,6 @@
 import { SendEventAction } from '../../actions/internal-events.actions';
 import { StratosBaseCatalogEntity } from '../../entity-catalog/entity-catalog-entity/entity-catalog-entity';
-import { endpointSchemaKey } from '../../helpers/entity-factory';
+import { endpointEntityType } from '../../helpers/stratos-entity-factory';
 import { ApiRequestTypes } from '../../reducers/api-request-reducer/request-helpers';
 import { InternalEventSeverity, InternalEventStateMetadata } from '../../types/internal-events.types';
 import { APISuccessOrFailedAction, EntityRequestAction } from '../../types/request.types';
@@ -28,7 +28,7 @@ export const endpointErrorsHandlerFactory = (actionDispatcher: ActionDispatcher)
       )
     );
     actionDispatcher(
-      new SendEventAction<InternalEventStateMetadata>(endpointSchemaKey, error.guid, {
+      new SendEventAction<InternalEventStateMetadata>(endpointEntityType, error.guid, {
         eventCode: error.errorCode,
         severity: InternalEventSeverity.ERROR,
         message: errorMessage,
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/handle-multi-endpoints.pipe.spec.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/handle-multi-endpoints.pipe.spec.ts
index 59e448d735..d82d9e77ed 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/handle-multi-endpoints.pipe.spec.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/handle-multi-endpoints.pipe.spec.ts
@@ -1,6 +1,6 @@
 import { of } from 'rxjs';
 
-import { JetStreamErrorResponse } from '../../../../core/src/jetstream.helpers';
+import { JetStreamErrorResponse } from '../../jetstream';
 import { JetstreamResponse } from '../entity-request-pipeline.types';
 import { handleJetstreamResponsePipeFactory, JetstreamError } from './handle-multi-endpoints.pipe';
 
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/handle-multi-endpoints.pipe.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/handle-multi-endpoints.pipe.ts
index 8ae7a743b1..5be8e90170 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/handle-multi-endpoints.pipe.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/handle-multi-endpoints.pipe.ts
@@ -1,8 +1,8 @@
-import { hasJetStreamError, JetStreamErrorResponse } from '../../../../core/src/jetstream.helpers';
+import { NonJetstreamRequestHandler } from '../../entity-catalog/entity-catalog.types';
+import { hasJetStreamError, JetStreamErrorResponse } from '../../jetstream';
 import { PagedJetstreamResponse } from '../entity-request-pipeline.types';
 import { PaginationPageIteratorConfig } from '../pagination-request-base-handlers/pagination-iterator.pipe';
 import { stratosEndpointGuidKey } from '../pipeline.types';
-import { NonJetstreamRequestHandler } from '../../entity-catalog/entity-catalog.types';
 
 /**
  * Generic container for information about an errored request to a specific endpoint
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 d68ddd27ab..5b504a93fa 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,7 +1,7 @@
 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 { endpointEntityType } from '../../helpers/stratos-entity-factory';
 import { ApiRequestTypes, getFailApiRequestActions } from '../../reducers/api-request-reducer/request-helpers';
 import { GLOBAL_EVENT, InternalEventSeverity, InternalEventStateMetadata } from '../../types/internal-events.types';
 import { EntityRequestAction } from '../../types/request.types';
@@ -26,7 +26,7 @@ export function jetstreamErrorHandler(
   if (endpointString) {
     endpointIds.forEach(endpoint =>
       actionDispatcher(
-        new SendEventAction<InternalEventStateMetadata>(endpointSchemaKey, endpoint, {
+        new SendEventAction<InternalEventStateMetadata>(endpointEntityType, endpoint, {
           eventCode: error.status ? error.status + '' : '500',
           severity: InternalEventSeverity.ERROR,
           message: 'Jetstream API request error',
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 2fbc4f3eda..661461c77f 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
@@ -2,11 +2,11 @@ import { Action, Store } from '@ngrx/store';
 import { of } from 'rxjs';
 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 { entityCatalog } from '../entity-catalog/entity-catalog';
 import { StratosBaseCatalogEntity } from '../entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { isHttpErrorResponse } from '../jetstream';
 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 46e1d685cd..d32a05be26 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,13 +2,12 @@ import { HttpClient, HttpRequest } from '@angular/common/http';
 import { Action, Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 
-import { LoggerService } from '../../../core/src/core/logger.service';
-import { JetStreamErrorResponse } from '../../../core/src/jetstream.helpers';
 import { AppState, GeneralEntityAppState, InternalAppState } from '../app-state';
 import {
   StratosBaseCatalogEntity,
   StratosCatalogEndpointEntity,
 } from '../entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { JetStreamErrorResponse } from '../jetstream';
 import { ApiRequestTypes } from '../reducers/api-request-reducer/request-helpers';
 import { EntityInfo, NormalizedResponse } from '../types/api.types';
 import { EndpointUser } from '../types/endpoint.types';
@@ -146,7 +145,6 @@ export interface EntityUserRolesEndpoint {
 export type EntityUserRolesFetch = (
   endpoints: string[] | EntityUserRolesEndpoint[],
   store: Store<AppState>,
-  logService: LoggerService,
   httpClient: HttpClient
 ) => Observable<boolean>;
 
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 863ac58cef..7690f07da1 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
@@ -4,14 +4,12 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 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/entity-catalog-entity';
 import { IStratosEndpointDefinition } from '../entity-catalog/entity-catalog.types';
+import { cfAPIVersion, proxyAPIVersion } from '../jetstream';
 import { connectedEndpointsOfTypesSelector, endpointOfTypeSelector } from '../selectors/endpoint.selectors';
 
-const { proxyAPIVersion, cfAPIVersion } = environment;
-
 @Injectable()
 export class PipelineHttpClient {
 
diff --git a/src/frontend/packages/store/src/entity-service.spec.ts b/src/frontend/packages/store/src/entity-service.spec.ts
index e0e752ada8..ad52aab1fb 100644
--- a/src/frontend/packages/store/src/entity-service.spec.ts
+++ b/src/frontend/packages/store/src/entity-service.spec.ts
@@ -4,9 +4,6 @@ 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';
@@ -18,6 +15,7 @@ import { PipelineResult } from './entity-request-pipeline/entity-request-pipelin
 import { EntityService } from './entity-service';
 import { EntityServiceFactory } from './entity-service-factory.service';
 import { EntitySchema } from './helpers/entity-schema';
+import { STRATOS_ENDPOINT_TYPE } from './helpers/stratos-entity-factory';
 import { EntityMonitor } from './monitors/entity-monitor';
 import { EntityMonitorFactory } from './monitors/entity-monitor.factory.service';
 import { completeApiRequest, startApiRequest } from './reducers/api-request-reducer/request-helpers';
@@ -143,11 +141,6 @@ describe('EntityServiceService', () => {
       providers: [
         EntityServiceFactory,
         EntityMonitorFactory,
-        generateTestEntityServiceProvider(
-          action.guid,
-          entitySchema,
-          action
-        ),
         {
           provide: HttpXhrBackend,
           useClass: HttpTestingController
@@ -170,20 +163,6 @@ describe('EntityServiceService', () => {
     });
   });
 
-  it('should be created', inject([ENTITY_SERVICE], (service: EntityService) => {
-    expect(service).toBeTruthy();
-  }));
-
-  it('should poll', (done) => {
-    inject([ENTITY_SERVICE, HttpXhrBackend], (service: EntityService, mockBackend: HttpTestingController) => {
-      const sub = service.poll(1, '_root_').subscribe(a => {
-        sub.unsubscribe();
-        expect('polled once').toEqual('polled once');
-        done();
-      });
-    })();
-  });
-
   it('should get application', (done) => {
     inject([Store], (store: Store<GeneralAppState>) => {
       const guid = 'GUID123456789x';
diff --git a/src/frontend/packages/core/src/core/extension/extension-types.ts b/src/frontend/packages/store/src/extension-types.ts
similarity index 100%
rename from src/frontend/packages/core/src/core/extension/extension-types.ts
rename to src/frontend/packages/store/src/extension-types.ts
diff --git a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorite-config-mapper.ts b/src/frontend/packages/store/src/favorite-config-mapper.ts
similarity index 85%
rename from src/frontend/packages/core/src/shared/components/favorites-meta-card/favorite-config-mapper.ts
rename to src/frontend/packages/store/src/favorite-config-mapper.ts
index 94e4d2bbd6..8fa3cd6890 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorite-config-mapper.ts
+++ b/src/frontend/packages/store/src/favorite-config-mapper.ts
@@ -1,21 +1,14 @@
 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 { MetaCardMenuItem } from '../list/list-cards/meta-card/meta-card-base/meta-card.component';
+import { entityCatalog } from './entity-catalog/entity-catalog';
+import { StratosBaseCatalogEntity } from './entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { EntityCatalogHelpers } from './entity-catalog/entity-catalog.helper';
+import { IEntityMetadata, IStratosEntityDefinition } from './entity-catalog/entity-catalog.types';
+import { EndpointModel } from './types/endpoint.types';
+import { MenuItem } from './types/menu-item.types';
+import { EntityRequestAction } from './types/request.types';
+import { IFavoriteMetadata, IFavoriteTypeInfo, UserFavorite, UserFavoriteEndpoint } from './types/user-favorites.types';
 
 
 export interface IFavoriteTypes {
@@ -33,7 +26,7 @@ export interface IFavoritesMetaCardConfig {
   lines?: TFavoritesMetaCardLine[];
   routerLink?: string;
   name: string;
-  menuItems?: MetaCardMenuItem[];
+  menuItems?: MenuItem[];
 }
 
 export interface IFavoriteConfig<T, Q extends IFavoriteMetadata> {
@@ -167,13 +160,13 @@ export class FavoritesConfigMapper {
 
   public getFavoriteEndpointFromEntity(
     endpoint: EndpointModel
-  ) {
+  ): UserFavoriteEndpoint {
     return this.getFavoriteFromEntity(
       EntityCatalogHelpers.endpointType,
       endpoint.cnsi_type,
       endpoint.guid,
       endpoint
-    ) as UserFavoriteEndpoint;
+    );
   }
 
 }
diff --git a/src/frontend/packages/store/src/helpers/entity-factory.ts b/src/frontend/packages/store/src/helpers/entity-factory.ts
deleted file mode 100644
index c10311c3de..0000000000
--- a/src/frontend/packages/store/src/helpers/entity-factory.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { EntitySchema } from './entity-schema';
-
-export const userFavouritesSchemaKey = 'userFavorites';
-export const endpointSchemaKey = 'endpoint';
-export const userProfileSchemaKey = 'userProfile';
-export const systemInfoSchemaKey = 'system';
-
-const entityCache: {
-  [key: string]: EntitySchema
-} = {};
-
-// Note - The cache entry is added as a secondary step. This helps keep the child entity definition's clear and easier to spot circular
-// dependencies which would otherwise be hidden (if we assigned directly to entityCache and references via entityCache in other entities)
-const UserFavouritesSchema = new EntitySchema(userFavouritesSchemaKey, null, {}, { idAttribute: 'id' });
-entityCache[userFavouritesSchemaKey] = UserFavouritesSchema;
-
-const SystemInfoSchema = new EntitySchema(systemInfoSchemaKey, null, {}, { idAttribute: 'id' });
-entityCache[systemInfoSchemaKey] = SystemInfoSchema;
-
-const EndpointSchema = new EntitySchema(endpointSchemaKey, null, {}, { idAttribute: 'guid' });
-entityCache[endpointSchemaKey] = EndpointSchema;
-
-const UserProfileInfoSchema = new EntitySchema(userProfileSchemaKey, null, {}, { idAttribute: 'id' });
-entityCache[userProfileSchemaKey] = UserProfileInfoSchema;
-
-export function entityFactory(key: string): EntitySchema {
-  const entity = entityCache[key];
-  if (!entity) {
-    throw new Error(`Unknown entity schema type: ${key}`);
-  }
-  return entity;
-}
diff --git a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list.helpers.ts b/src/frontend/packages/store/src/helpers/local-list.helpers.ts
similarity index 86%
rename from src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list.helpers.ts
rename to src/frontend/packages/store/src/helpers/local-list.helpers.ts
index c84c1c7402..2810937aac 100644
--- a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list.helpers.ts
+++ b/src/frontend/packages/store/src/helpers/local-list.helpers.ts
@@ -1,5 +1,5 @@
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
-import { PaginationEntityState } from '../../../../../../store/src/types/pagination.types';
+import { entityCatalog } from '../entity-catalog/entity-catalog';
+import { PaginationEntityState } from '../types/pagination.types';
 
 export class LocalPaginationHelpers {
 
diff --git a/src/frontend/packages/store/src/helpers/store-helpers.ts b/src/frontend/packages/store/src/helpers/store-helpers.ts
index 15f69e72db..cac7ba4e0a 100644
--- a/src/frontend/packages/store/src/helpers/store-helpers.ts
+++ b/src/frontend/packages/store/src/helpers/store-helpers.ts
@@ -2,11 +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 { APIResource } from '../types/api.types';
+import { IFavoritesInfo } from '../types/user-favorites.types';
 
 
 export function getDashboardStateSessionId(username?: string) {
diff --git a/src/frontend/packages/store/src/helpers/stratos-entity-factory.ts b/src/frontend/packages/store/src/helpers/stratos-entity-factory.ts
new file mode 100644
index 0000000000..1182c576a3
--- /dev/null
+++ b/src/frontend/packages/store/src/helpers/stratos-entity-factory.ts
@@ -0,0 +1,40 @@
+import { EntitySchema } from './entity-schema';
+
+export const userFavouritesEntityType = 'userFavorites';
+export const endpointEntityType = 'endpoint';
+export const userProfileEntityType = 'userProfile';
+export const systemInfoEntityType = 'systemInfo';
+
+export const metricEntityType = 'metrics';
+
+export const STRATOS_ENDPOINT_TYPE = 'stratos';
+
+const entityCache: {
+  [key: string]: EntitySchema
+} = {};
+
+class StratosEntitySchema extends EntitySchema {
+  constructor(entityType: string, idAttribute: string) {
+    super(entityType, STRATOS_ENDPOINT_TYPE, {}, { idAttribute });
+  }
+}
+
+const UserFavouritesSchema = new StratosEntitySchema(userFavouritesEntityType, 'guid');
+entityCache[userFavouritesEntityType] = UserFavouritesSchema;
+
+const SystemInfoSchema = new StratosEntitySchema(systemInfoEntityType, 'guid');
+entityCache[systemInfoEntityType] = SystemInfoSchema;
+
+const EndpointSchema = new StratosEntitySchema(endpointEntityType, 'guid');
+entityCache[endpointEntityType] = EndpointSchema;
+
+const UserProfileInfoSchema = new StratosEntitySchema(userProfileEntityType, 'id');
+entityCache[userProfileEntityType] = UserProfileInfoSchema;
+
+export function stratosEntityFactory(key: string): EntitySchema {
+  const entity = entityCache[key];
+  if (!entity) {
+    throw new Error(`Unknown entity schema type: ${key}`);
+  }
+  return entity;
+}
\ No newline at end of file
diff --git a/src/frontend/packages/store/src/jetstream.ts b/src/frontend/packages/store/src/jetstream.ts
new file mode 100644
index 0000000000..12477fabba
--- /dev/null
+++ b/src/frontend/packages/store/src/jetstream.ts
@@ -0,0 +1,78 @@
+import { HttpErrorResponse } from '@angular/common/http';
+
+// API Version to use when making back-end API requests to Jetstraam
+export const proxyAPIVersion = 'v1';
+
+// CF API Version
+export const cfAPIVersion = 'v2';
+
+/**
+ * Actual error response from stratos
+ */
+export interface JetStreamErrorResponse<T = any> {
+  error: {
+    status: string;
+    statusCode: number;
+  };
+  /**
+   * Actual response from proxied endpoint
+   */
+  errorResponse: T;
+}
+
+export function isHttpErrorResponse(obj: any): HttpErrorResponse {
+  const props = Object.keys(obj);
+  return (
+    props.indexOf('error') >= 0 &&
+    props.indexOf('headers') >= 0 &&
+    props.indexOf('ok') >= 0 &&
+    props.indexOf('status') >= 0 &&
+    props.indexOf('statusText') >= 0 &&
+    props.indexOf('url') >= 0
+  ) ? obj as HttpErrorResponse : null;
+}
+
+export function jetStreamErrorResponseToSafeString(response: JetStreamErrorResponse): string {
+  return response.error && response.error.status && response.error.statusCode ?
+    `${response.error.status}. Status Code ${response.error.statusCode}` :
+    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;
+}
+
+// TODO It would be nice if the BE could return a unique para for us to check for. #3827
+// There is always a chance that this will return a false positive (more so with extensions).
+export function hasJetStreamError(pages: Partial<JetStreamErrorResponse>[]): JetStreamErrorResponse {
+  if (!pages || !pages.length) {
+    return null;
+  }
+  return pages.find(page => {
+    return isJetstreamError(page);
+  }) as JetStreamErrorResponse;
+}
+
+function isJetstreamError(err: any): JetStreamErrorResponse {
+  return !!(
+    err &&
+    err.error &&
+    err.error.status &&
+    err.error.statusCode &&
+    'errorResponse' in err
+  ) ? err as JetStreamErrorResponse : null;
+}
diff --git a/src/frontend/packages/store/src/monitors/pagination-monitor.ts b/src/frontend/packages/store/src/monitors/pagination-monitor.ts
index a55f2910dd..c19b9db3da 100644
--- a/src/frontend/packages/store/src/monitors/pagination-monitor.ts
+++ b/src/frontend/packages/store/src/monitors/pagination-monitor.ts
@@ -14,14 +14,12 @@ import {
   withLatestFrom,
 } from 'rxjs/operators';
 
-import {
-  LocalPaginationHelpers,
-} from '../../../core/src/shared/components/list/data-sources-controllers/local-list.helpers';
 import { AppState, GeneralEntityAppState, GeneralRequestDataState } from '../app-state';
 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 { LocalPaginationHelpers } from '../helpers/local-list.helpers';
 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';
diff --git a/src/frontend/packages/store/src/public-api.ts b/src/frontend/packages/store/src/public-api.ts
index ac373eccf4..1b1787baef 100644
--- a/src/frontend/packages/store/src/public-api.ts
+++ b/src/frontend/packages/store/src/public-api.ts
@@ -4,3 +4,6 @@
 
  // Helpers
  export * from './helpers/store-helpers';
+
+ // App State
+ export { AppState } from './app-state';
\ No newline at end of file
diff --git a/src/frontend/packages/store/src/reducers.module.ts b/src/frontend/packages/store/src/reducers.module.ts
index 23054fd7fb..d5268b68bf 100644
--- a/src/frontend/packages/store/src/reducers.module.ts
+++ b/src/frontend/packages/store/src/reducers.module.ts
@@ -1,10 +1,7 @@
 import { NgModule } from '@angular/core';
 import { ActionReducer, ActionReducerMap, StoreModule } from '@ngrx/store';
-import { StoreDevtoolsModule } from '@ngrx/store-devtools';
-
 import { localStorageSync } from 'ngrx-store-localstorage';
 
-import { environment } from '../../core/src/environments/environment';
 import { getDashboardStateSessionId } from './helpers/store-helpers';
 import { actionHistoryReducer } from './reducers/action-history-reducer';
 import { requestReducer } from './reducers/api-request-reducers.generator';
@@ -71,29 +68,21 @@ export function localStorageSyncReducer(reducer: ActionReducer<any>): ActionRedu
 
   })(reducer);
 }
-const metaReducers = [localStorageSyncReducer];
 
-const storeModule = StoreModule.forRoot(
-  appReducers,
-  {
-    metaReducers,
-    runtimeChecks: {
-      strictStateImmutability: true,
-      strictActionImmutability: false
-    }
-  }
-);
-const imports = environment.production ? [
-  storeModule
-] : [
-    storeModule,
-    StoreDevtoolsModule.instrument({
-      maxAge: 100,
-      logOnly: !environment.production
-    })
-  ];
+const metaReducers = [localStorageSyncReducer];
 
 @NgModule({
-  imports
+  imports: [
+    StoreModule.forRoot(
+      appReducers,
+      {
+        metaReducers,
+        runtimeChecks: {
+          strictStateImmutability: true,
+          strictActionImmutability: false
+        }
+      }
+    )
+  ]
 })
 export class AppReducersModule { }
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 ae52213fd9..900140b12a 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,6 +1,5 @@
 import { Store } from '@ngrx/store';
 
-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';
@@ -82,7 +81,7 @@ export function createRequestStateFromResponse(
 export type ApiRequestTypes = 'fetch' | 'update' | 'create' | 'delete';
 
 export function getRequestTypeFromMethod(action: EntityRequestAction): ApiRequestTypes {
-  let method = pathGet('options.method', action);
+  let method = action.options ? action.options.method : undefined;
   if (typeof method === 'string') {
     method = method.toString().toLowerCase();
     if (method === 'post') {
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 2a83934d21..ead7fd092e 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
@@ -8,11 +8,10 @@ import {
   UNREGISTER_ENDPOINTS_SUCCESS,
 } from '../../actions/endpoint.actions';
 import { AddRecentlyVisitedEntityAction, SetRecentlyVisitedEntityAction } from '../../actions/recently-visited.actions';
+import { entityCatalog } from '../../entity-catalog/entity-catalog';
+import { endpointEntityType, STRATOS_ENDPOINT_TYPE } from '../../helpers/stratos-entity-factory';
 import { IRecentlyVisitedState } from '../../types/recently-visited.types';
 import { addNewHit, cleanRecentsList, getDefaultRecentState } from './recently-visited.reducer.helpers';
-import { entityCatalog } from '../../entity-catalog/entity-catalog';
-import { STRATOS_ENDPOINT_TYPE } from '../../../../core/src/base-entity-schemas';
-import { endpointSchemaKey } from '../../helpers/entity-factory';
 
 export function recentlyVisitedReducer(
   state: IRecentlyVisitedState = getDefaultRecentState(),
@@ -36,7 +35,7 @@ export function recentlyVisitedReducer(
       return cleanRecentsList(state, [removeEndpointAction.guid]);
     case GET_ENDPOINTS_SUCCESS:
       const getAllAction = action as GetAllEndpointsSuccess;
-      const endpointKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointSchemaKey);
+      const endpointKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointEntityType);
       const connectedIds = Object.values(getAllAction.payload.entities[endpointKey]).reduce((ids, endpoint) => {
         if (endpoint.user) {
           ids.push(endpoint.guid);
diff --git a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/user-favorites-groups.reducer.spec.ts b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/user-favorites-groups.reducer.spec.ts
index 0532f4a44d..3afec96484 100644
--- a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/user-favorites-groups.reducer.spec.ts
+++ b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/user-favorites-groups.reducer.spec.ts
@@ -1,13 +1,13 @@
-import { deriveEndpointFavoriteFromFavorite } from '../../../../core/src/core/user-favorite-helpers';
 import {
   GetUserFavoritesAction,
   GetUserFavoritesFailedAction,
   GetUserFavoritesSuccessAction,
-} from '../../actions/user-favourites-actions/get-user-favorites-action';
-import { RemoveUserFavoriteSuccessAction } from '../../actions/user-favourites-actions/remove-user-favorite-action';
-import { SaveUserFavoriteSuccessAction } from '../../actions/user-favourites-actions/save-user-favorite-action';
+  RemoveUserFavoriteSuccessAction,
+  SaveUserFavoriteSuccessAction,
+} from '../../actions/user-favourites.actions';
 import { getDefaultFavoriteGroupsState, IUserFavoritesGroupsState } from '../../types/favorite-groups.types';
 import { IEndpointFavMetadata, UserFavorite } from '../../types/user-favorites.types';
+import { deriveEndpointFavoriteFromFavorite } from '../../user-favorite-helpers';
 import { userFavoriteGroupsReducer } from './user-favorites-groups.reducer';
 
 const endpointFavorite = () => new UserFavorite<IEndpointFavMetadata>(
diff --git a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/user-favorites-groups.reducer.ts b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/user-favorites-groups.reducer.ts
index 342c061f47..463b41c655 100644
--- a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/user-favorites-groups.reducer.ts
+++ b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/user-favorites-groups.reducer.ts
@@ -1,13 +1,12 @@
 import { Action } from '@ngrx/store';
 
-import { deriveEndpointFavoriteFromFavorite, isEndpointTypeFavorite } from '../../../../core/src/core/user-favorite-helpers';
 import {
   GetUserFavoritesAction,
   GetUserFavoritesFailedAction,
   GetUserFavoritesSuccessAction,
-} from '../../actions/user-favourites-actions/get-user-favorites-action';
-import { RemoveUserFavoriteSuccessAction } from '../../actions/user-favourites-actions/remove-user-favorite-action';
-import { SaveUserFavoriteSuccessAction } from '../../actions/user-favourites-actions/save-user-favorite-action';
+  RemoveUserFavoriteSuccessAction,
+  SaveUserFavoriteSuccessAction,
+} from '../../actions/user-favourites.actions';
 import {
   getDefaultFavoriteGroup,
   getDefaultFavoriteGroupsState,
@@ -16,6 +15,7 @@ import {
   IUserFavoritesGroupsState,
 } from '../../types/favorite-groups.types';
 import { IFavoriteMetadata, UserFavorite } from '../../types/user-favorites.types';
+import { deriveEndpointFavoriteFromFavorite, isEndpointTypeFavorite } from '../../user-favorite-helpers';
 
 export function userFavoriteGroupsReducer(
   state: IUserFavoritesGroupsState = getDefaultFavoriteGroupsState(),
diff --git a/src/frontend/packages/store/src/reducers/endpoints.reducer.ts b/src/frontend/packages/store/src/reducers/endpoints.reducer.ts
index 1a5796c694..662f1c0ebb 100644
--- a/src/frontend/packages/store/src/reducers/endpoints.reducer.ts
+++ b/src/frontend/packages/store/src/reducers/endpoints.reducer.ts
@@ -1,11 +1,14 @@
 import { GET_ENDPOINTS, GET_ENDPOINTS_FAILED, GET_ENDPOINTS_SUCCESS } from '../actions/endpoint.actions';
 import { EndpointState } from '../types/endpoint.types';
 
-export function endpointsReducer(state: EndpointState = {
-  loading: false,
-  error: false,
-  message: ''
-},                               action): EndpointState {
+export function endpointsReducer(
+  state: EndpointState = {
+    loading: false,
+    error: false,
+    message: ''
+  },
+  action
+): EndpointState {
   switch (action.type) {
     case GET_ENDPOINTS:
       return { ...state, loading: true, message: '', error: false };
diff --git a/src/frontend/packages/store/src/reducers/favorite.reducer.ts b/src/frontend/packages/store/src/reducers/favorite.reducer.ts
index 31165eb6bd..04a98983be 100644
--- a/src/frontend/packages/store/src/reducers/favorite.reducer.ts
+++ b/src/frontend/packages/store/src/reducers/favorite.reducer.ts
@@ -1,8 +1,8 @@
-import { RemoveUserFavoriteSuccessAction } from '../actions/user-favourites-actions/remove-user-favorite-action';
-import { SaveUserFavoriteSuccessAction } from '../actions/user-favourites-actions/save-user-favorite-action';
 import {
+  RemoveUserFavoriteSuccessAction,
+  SaveUserFavoriteSuccessAction,
   UpdateUserFavoriteMetadataSuccessAction,
-} from '../actions/user-favourites-actions/update-user-favorite-metadata-action';
+} from '../actions/user-favourites.actions';
 import { IRequestEntityTypeState } from '../app-state';
 import { IFavoriteMetadata, UserFavorite } from '../types/user-favorites.types';
 
@@ -27,7 +27,7 @@ export function deleteUserFavoriteMetadataReducer(
 ): IRequestEntityTypeState<UserFavorite<IFavoriteMetadata>> {
   if (action.type === RemoveUserFavoriteSuccessAction.ACTION_TYPE) {
     const {
-      [action.favorite.guid]: deletedFavorite,
+      [action.guid]: deletedFavorite,
       ...newState
     } = state;
     return newState;
diff --git a/src/frontend/packages/store/src/reducers/internal-events.reducer.ts b/src/frontend/packages/store/src/reducers/internal-events.reducer.ts
index c6b2a9ec59..277e067439 100644
--- a/src/frontend/packages/store/src/reducers/internal-events.reducer.ts
+++ b/src/frontend/packages/store/src/reducers/internal-events.reducer.ts
@@ -1,27 +1,27 @@
-import { UPDATE_ENDPOINT_SUCCESS } from './../actions/endpoint.actions';
 import { Action } from '@ngrx/store';
 
+import {
+  CONNECT_ENDPOINTS_SUCCESS,
+  DISCONNECT_ENDPOINTS_SUCCESS,
+  DisconnectEndpoint,
+  UNREGISTER_ENDPOINTS_SUCCESS,
+} from '../actions/endpoint.actions';
 import { SendClearEndpointEventsAction, SendClearEventAction, SendEventAction } from '../actions/internal-events.actions';
+import { endpointEntityType } from '../helpers/stratos-entity-factory';
 import {
+  CLEAR_ENDPOINT_ERROR_EVENTS,
   CLEAR_EVENTS,
   GLOBAL_EVENT,
   InternalEventsState,
   InternalEventState,
   SEND_EVENT,
-  CLEAR_ENDPOINT_ERROR_EVENTS,
 } from '../types/internal-events.types';
-import { endpointSchemaKey } from './../helpers/entity-factory';
-import {
-  DISCONNECT_ENDPOINTS_SUCCESS,
-  DisconnectEndpoint,
-  UNREGISTER_ENDPOINTS_SUCCESS,
-  CONNECT_ENDPOINTS_SUCCESS
-} from '../actions/endpoint.actions';
+import { UPDATE_ENDPOINT_SUCCESS } from './../actions/endpoint.actions';
 
 const defaultState: InternalEventsState = {
   types: {
     [GLOBAL_EVENT]: {},
-    [endpointSchemaKey]: {}
+    [endpointEntityType]: {}
   }
 };
 
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 61cc841a8a..aaf5dafbaf 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,4 +1,4 @@
-import { EndpointAction } from '../../actions/endpoint.actions';
+import { EndpointActionComplete } from '../../actions/endpoint.actions';
 import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { PaginationState } from '../../types/pagination.types';
 import { getDefaultPaginationEntityState } from './pagination-reducer-reset-pagination';
@@ -23,7 +23,7 @@ export function paginationClearAllTypes(state: PaginationState, entityKeys: stri
   }, state);
 }
 
-export function clearEndpointEntities(state: PaginationState, action: EndpointAction) {
+export function clearEndpointEntities(state: PaginationState, action: EndpointActionComplete) {
   const entityKeys = entityCatalog.getAllEntitiesForEndpointType(action.endpointType).map(entity => entity.entityKey);
   if (entityKeys.length > 0) {
     return paginationClearAllTypes(
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 d9c0465284..047f677ad6 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,5 +1,5 @@
-import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { CreatePagination } from '../../actions/pagination.actions';
+import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { PaginationState } from '../../types/pagination.types';
 import { createNewPaginationSection } from './pagination-reducer-create-pagination';
 import { getDefaultPaginationEntityState } from './pagination-reducer-reset-pagination';
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 3d8080a705..906dc3fbe7 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
@@ -1,8 +1,6 @@
-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';
+import { LocalPaginationHelpers } from '../../helpers/local-list.helpers';
 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.helper.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts
index 56a5e0bef4..427a184b21 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
@@ -12,7 +12,6 @@ import {
   tap,
 } from 'rxjs/operators';
 
-import { sortStringify } from '../../../../core/src/core/utils.service';
 import { SetInitialParams } from '../../actions/pagination.actions';
 import { AppState, GeneralEntityAppState } from '../../app-state';
 import { entityCatalog } from '../../entity-catalog/entity-catalog';
@@ -152,6 +151,14 @@ function paginationParamsString(params: PaginationParam): string {
   return sortStringify(clone);
 }
 
+
+function sortStringify(obj: { [key: string]: string | string[] | number }): string {
+  const keys = Object.keys(obj).sort();
+  return keys.reduce((res, key) => {
+    return res += `${key}-${obj[key]},`;
+  }, '');
+}
+
 function shouldFetchNonLocalList(pagination: PaginationEntityState): boolean {
   return !hasError(pagination) && !hasValidOrGettingPage(pagination);
 }
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 d3c48a2ad2..cd0fe5bc3b 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,10 +1,10 @@
 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 { endpointEntityType, STRATOS_ENDPOINT_TYPE, stratosEntityFactory } from '../../helpers/stratos-entity-factory';
 import { PaginatedAction } from '../../types/pagination.types';
 import { StartRequestAction, WrapperRequestActionFailed, WrapperRequestActionSuccess } from '../../types/request.types';
 import { createPaginationReducer } from './pagination.reducer';
@@ -20,8 +20,8 @@ function getReducer() {
 class MockPagAction implements PaginatedAction {
   actions = ['ONE', 'TWO', 'THREE'];
   options = new HttpRequest('GET', 'fake123');
-  entity = endpointEntitySchema;
-  entityType = ENDPOINT_TYPE;
+  entity = stratosEntityFactory(endpointEntityType);
+  entityType = endpointEntityType;
   endpointType = STRATOS_ENDPOINT_TYPE;
   paginationKey = 'PaginationKey';
   type = RequestTypes.START;
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 166767e168..b26832638a 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
@@ -1,11 +1,10 @@
 import { compose } from '@ngrx/store';
 
-import { PermissionValues } from '../../../core/src/core/permissions/current-user-permissions.config';
-import { StratosScopeStrings } from '../../../core/src/core/permissions/stratos-user-permissions.checker';
 import { CurrentUserRolesAppState } from '../app-state';
 import { ICurrentUserRolesState, IStratosRolesState } from '../types/current-user-roles.types';
 import { UserScopeStrings } from '../types/endpoint.types';
 
+export type PermissionValues = string;
 
 export const selectCurrentUserRolesState = (state: CurrentUserRolesAppState) => state.currentUserRoles;
 
@@ -38,7 +37,7 @@ export const getCurrentUserStratosRole = (role: PermissionValues) => compose(
 
 // Top level stratos endpoint scopes
 // ============================
-export const getCurrentUserStratosHasScope = (scope: StratosScopeStrings) => compose(
+export const getCurrentUserStratosHasScope = (scope: UserScopeStrings) => compose(
   selectCurrentUserGlobalHasScopes(scope),
   selectCurrentUserStratosScopesState,
   getCurrentUserStratosRolesState
diff --git a/src/frontend/packages/store/src/selectors/endpoint.selectors.ts b/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
index 2846302148..9f64ad9b11 100644
--- a/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
+++ b/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
@@ -1,9 +1,8 @@
 import { compose } from '@ngrx/store';
 
-import { STRATOS_ENDPOINT_TYPE } from '../../../core/src/base-entity-schemas';
 import { InternalAppState, IRequestEntityTypeState } from '../app-state';
 import { EntityCatalogHelpers } from '../entity-catalog/entity-catalog.helper';
-import { endpointSchemaKey } from '../helpers/entity-factory';
+import { endpointEntityType, STRATOS_ENDPOINT_TYPE } from '../helpers/stratos-entity-factory';
 import { EndpointModel, EndpointState } from '../types/endpoint.types';
 import { selectEntities, selectEntity, selectRequestInfo } from './api.selectors';
 
@@ -12,7 +11,7 @@ export const endpointStatusSelector = (state: InternalAppState): EndpointState =
 
 // All endpoint request data
 // Note - Replacing `buildEntityKey` with `entityCatalog.getEntityKey` will cause circular dependency
-const endpointEntityKey = EntityCatalogHelpers.buildEntityKey(endpointSchemaKey, STRATOS_ENDPOINT_TYPE);
+const endpointEntityKey = EntityCatalogHelpers.buildEntityKey(endpointEntityType, STRATOS_ENDPOINT_TYPE);
 export const endpointEntitiesSelector = selectEntities<EndpointModel>(endpointEntityKey);
 
 export const endpointOfType = (type: string) =>
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 a1b3158b2e..12139d6f78 100644
--- a/src/frontend/packages/store/src/selectors/favorite-groups.selectors.ts
+++ b/src/frontend/packages/store/src/selectors/favorite-groups.selectors.ts
@@ -1,13 +1,13 @@
 import { compose } from '@ngrx/store';
 
-import { STRATOS_ENDPOINT_TYPE, userFavoritesEntitySchema } from '../../../core/src/base-entity-schemas';
-import { deriveEndpointFavoriteFromFavorite } from '../../../core/src/core/user-favorite-helpers';
 import { InternalAppState, IRequestEntityTypeState } from '../app-state';
 import { entityCatalog } from '../entity-catalog/entity-catalog';
+import { STRATOS_ENDPOINT_TYPE, userFavouritesEntityType } from '../helpers/stratos-entity-factory';
 import { IUserFavoriteGroup, IUserFavoritesGroups, IUserFavoritesGroupsState } from '../types/favorite-groups.types';
 import { IFavoriteMetadata, UserFavorite } from '../types/user-favorites.types';
+import { deriveEndpointFavoriteFromFavorite } from '../user-favorite-helpers';
 
-const favoritesEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, userFavoritesEntitySchema.entityType);
+const favoritesEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, userFavouritesEntityType);
 
 export const favoriteEntitiesSelector = (state: InternalAppState):
   IRequestEntityTypeState<UserFavorite<IFavoriteMetadata>> => state.requestData[favoritesEntityKey];
diff --git a/src/frontend/packages/store/src/store.module.ts b/src/frontend/packages/store/src/store.module.ts
index d66eb95791..794355dc3a 100644
--- a/src/frontend/packages/store/src/store.module.ts
+++ b/src/frontend/packages/store/src/store.module.ts
@@ -14,7 +14,6 @@ import { PermissionsEffects } from './effects/permissions.effect';
 import { RecursiveDeleteEffect } from './effects/recursive-entity-delete.effect';
 import { RouterEffect } from './effects/router.effects';
 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 { UserFavoritesEffect } from './effects/user-favorites-effect';
@@ -41,7 +40,6 @@ import { AppReducersModule } from './reducers.module';
       ActionHistoryEffect,
       RouterEffect,
       SystemEffects,
-      SnackBarEffects,
       SetClientFilterEffect,
       MetricsEffect,
       UserProfileEffect,
diff --git a/src/frontend/packages/store/src/stratos-action-builders.ts b/src/frontend/packages/store/src/stratos-action-builders.ts
new file mode 100644
index 0000000000..c64a95cd01
--- /dev/null
+++ b/src/frontend/packages/store/src/stratos-action-builders.ts
@@ -0,0 +1,198 @@
+import {
+  AuthParams,
+  BaseEndpointAction,
+  ConnectEndpoint,
+  DisconnectEndpoint,
+  GetAllEndpoints,
+  GetEndpoint,
+  RegisterEndpoint,
+  UnregisterEndpoint,
+  UpdateEndpoint,
+} from './actions/endpoint.actions';
+import { GetSystemInfo } from './actions/system.actions';
+import {
+  GetUserFavoritesAction,
+  RemoveUserFavoriteAction,
+  SaveUserFavoriteAction,
+  ToggleUserFavoriteAction,
+  UpdateUserFavoriteMetadataAction,
+} from './actions/user-favourites.actions';
+import { FetchUserProfileAction, UpdateUserPasswordAction, UpdateUserProfileAction } from './actions/user-profile.actions';
+import { OrchestratedActionBuilders } from './entity-catalog/action-orchestrator/action-orchestrator';
+import { EndpointType } from './extension-types';
+import { IFavoriteMetadata, UserFavorite } from './types/user-favorites.types';
+import { UserProfileInfo, UserProfilePasswordUpdate } from './types/user-profile.types';
+
+export interface EndpointActionBuilder extends OrchestratedActionBuilders {
+  get: (
+    guid: string,
+  ) => GetEndpoint,
+  getAll: (
+    login?: boolean,
+  ) => GetAllEndpoints,
+  getMultiple: (
+    endpointGuid?: string,
+    paginationKey?: string,
+    args?: { login: boolean }
+  ) => GetAllEndpoints,
+  connect: (
+    guid: string,
+    endpointType: EndpointType,
+    authType: string,
+    authValues: AuthParams,
+    systemShared: boolean,
+    body: string,
+  ) => ConnectEndpoint,
+  disconnect: (
+    guid: string,
+    endpointType: EndpointType,
+  ) => DisconnectEndpoint,
+  unregister: (
+    guid: string,
+    endpointType: EndpointType,
+  ) => UnregisterEndpoint,
+  register: (
+    endpointType: EndpointType,
+    endpointSubType: string,
+    name: string,
+    endpoint: string,
+    skipSslValidation: boolean,
+    clientID?: string,
+    clientSecret?: string,
+    ssoAllowed?: boolean,
+  ) => RegisterEndpoint,
+  update: (
+    guid: string,
+    endpointGuid: string,
+    args: {
+      endpointType: EndpointType,
+      id: string,
+      name: string,
+      skipSSL: boolean,
+      setClientInfo: boolean,
+      clientID: string,
+      clientSecret: string,
+      allowSSO: boolean,
+    }
+  ) => UpdateEndpoint,
+}
+
+export const endpointActionBuilder: EndpointActionBuilder = {
+  get: (guid: string) => new GetEndpoint(guid),
+  getAll: (login: boolean) => new GetAllEndpoints(login),
+  getMultiple: (
+    endpointGuid?: string,
+    paginationKey?: string,
+    args?: { login: boolean }
+  ) => new GetAllEndpoints(args ? args.login : false),
+  connect: (
+    guid: string,
+    endpointType: EndpointType,
+    authType: string,
+    authValues: AuthParams,
+    systemShared: boolean,
+    body: string,
+  ) => new ConnectEndpoint(guid, endpointType, authType, authValues, systemShared, body),
+  disconnect: (guid: string, endpointType: EndpointType) => new DisconnectEndpoint(guid, endpointType),
+  unregister: (guid: string, endpointType: EndpointType) => new UnregisterEndpoint(guid, endpointType),
+  register: (
+    endpointType: EndpointType,
+    endpointSubType: string,
+    name: string,
+    endpoint: string,
+    skipSslValidation: boolean,
+    clientID?: string,
+    clientSecret?: string,
+    ssoAllowed?: boolean,
+  ) => new RegisterEndpoint(
+    endpointType,
+    endpointSubType,
+    name,
+    endpoint,
+    skipSslValidation,
+    clientID,
+    clientSecret,
+    ssoAllowed,
+  ),
+  update: (
+    guid: string,
+    endpointGuid: string,
+    args: {
+      endpointType: EndpointType,
+      // id: string,
+      name: string,
+      skipSSL: boolean,
+      setClientInfo: boolean,
+      clientID: string,
+      clientSecret: string,
+      allowSSO: boolean,
+    }
+  ) => new UpdateEndpoint(
+    args.endpointType,
+    guid,
+    args.name,
+    args.skipSSL,
+    args.setClientInfo,
+    args.clientID,
+    args.clientSecret,
+    args.allowSSO
+  ),
+}
+
+export interface SystemInfoActionBuilder extends OrchestratedActionBuilders {
+  getSystemInfo: (
+    login?: boolean,
+    associatedAction?: BaseEndpointAction
+  ) => GetSystemInfo
+}
+export const systemInfoActionBuilder: SystemInfoActionBuilder = {
+  getSystemInfo: (
+    login?: false,
+    associatedAction?: BaseEndpointAction
+  ) => new GetSystemInfo(login, associatedAction)
+}
+
+export interface UserFavoriteActionBuilder extends OrchestratedActionBuilders {
+  getMultiple: () => GetUserFavoritesAction,
+  getAll: () => GetUserFavoritesAction,
+  delete: (
+    favorite: UserFavorite<IFavoriteMetadata>
+  ) => RemoveUserFavoriteAction,
+  save: (
+    favorite: UserFavorite<IFavoriteMetadata>
+  ) => SaveUserFavoriteAction,
+  toggle: (
+    favorite: UserFavorite<IFavoriteMetadata>
+  ) => ToggleUserFavoriteAction
+  updateFavorite: (
+    favorite: UserFavorite<IFavoriteMetadata>
+  ) => UpdateUserFavoriteMetadataAction
+}
+
+export const userFavoriteActionBuilder: UserFavoriteActionBuilder = {
+  getMultiple: () => new GetUserFavoritesAction(),
+  getAll: () => new GetUserFavoritesAction(),
+  delete: (favorite: UserFavorite<IFavoriteMetadata>) => new RemoveUserFavoriteAction(favorite),
+  save: (favorite: UserFavorite<IFavoriteMetadata>) => new SaveUserFavoriteAction(favorite),
+  toggle: (favorite: UserFavorite<IFavoriteMetadata>) => new ToggleUserFavoriteAction(favorite),
+  updateFavorite: (favorite: UserFavorite<IFavoriteMetadata>) => new UpdateUserFavoriteMetadataAction(favorite)
+}
+
+export interface UserProfileActionBuilder extends OrchestratedActionBuilders {
+  get: (
+    userGuid: string
+  ) => FetchUserProfileAction
+  updateProfile: (
+    profile: UserProfileInfo,
+    password: string
+  ) => UpdateUserProfileAction
+  updatePassword: (
+    guid: string,
+    passwordChanges: UserProfilePasswordUpdate
+  ) => UpdateUserPasswordAction
+}
+export const userProfileActionBuilder: UserProfileActionBuilder = {
+  get: (userGuid: string) => new FetchUserProfileAction(userGuid),
+  updateProfile: (profile: UserProfileInfo, password: string) => new UpdateUserProfileAction(profile, password),
+  updatePassword: (guid: string, passwordChanges: UserProfilePasswordUpdate) => new UpdateUserPasswordAction(guid, passwordChanges)
+}
\ No newline at end of file
diff --git a/src/frontend/packages/store/src/stratos-entity-catalog.ts b/src/frontend/packages/store/src/stratos-entity-catalog.ts
new file mode 100644
index 0000000000..9237a16978
--- /dev/null
+++ b/src/frontend/packages/store/src/stratos-entity-catalog.ts
@@ -0,0 +1,45 @@
+import {
+  StratosCatalogEndpointEntity,
+  StratosCatalogEntity,
+} from './entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import {
+  EndpointActionBuilder,
+  SystemInfoActionBuilder,
+  UserFavoriteActionBuilder,
+  UserProfileActionBuilder,
+} from './stratos-action-builders';
+import { EndpointModel } from './types/endpoint.types';
+import { SystemInfo } from './types/system.types';
+import { UserFavorite } from './types/user-favorites.types';
+import { UserProfileInfo } from './types/user-profile.types';
+
+export class StratosEntityCatalog {
+  endpoint: StratosCatalogEntity<
+    undefined,
+    EndpointModel,
+    EndpointActionBuilder
+  >
+
+  systemInfo: StratosCatalogEntity<
+    undefined,
+    SystemInfo,
+    SystemInfoActionBuilder
+  >
+
+  userFavorite: StratosCatalogEntity<
+    undefined,
+    UserFavorite,
+    UserFavoriteActionBuilder
+  >
+
+  userProfile: StratosCatalogEntity<
+    undefined,
+    UserProfileInfo,
+    UserProfileActionBuilder
+  >
+
+  metricsEndpoint: StratosCatalogEndpointEntity;
+}
+
+export const stratosEntityCatalog = new StratosEntityCatalog();
+
diff --git a/src/frontend/packages/store/src/stratos-entity-generator.ts b/src/frontend/packages/store/src/stratos-entity-generator.ts
new file mode 100644
index 0000000000..0062f4fc4a
--- /dev/null
+++ b/src/frontend/packages/store/src/stratos-entity-generator.ts
@@ -0,0 +1,161 @@
+import { BaseEndpointAuth } from '../../core/src/core/endpoint-auth';
+import {
+  MetricsEndpointDetailsComponent,
+} from '../../core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component';
+import {
+  StratosBaseCatalogEntity,
+  StratosCatalogEndpointEntity,
+  StratosCatalogEntity,
+} from '../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import {
+  endpointEntityType,
+  STRATOS_ENDPOINT_TYPE,
+  stratosEntityFactory,
+  systemInfoEntityType,
+  userFavouritesEntityType,
+  userProfileEntityType,
+} from '../../store/src/helpers/stratos-entity-factory';
+import {
+  addOrUpdateUserFavoriteMetadataReducer,
+  deleteUserFavoriteMetadataReducer,
+} from '../../store/src/reducers/favorite.reducer';
+import { systemEndpointsReducer } from '../../store/src/reducers/system-endpoints.reducer';
+import { EndpointModel } from '../../store/src/types/endpoint.types';
+import { IStratosEntityDefinition } from './entity-catalog/entity-catalog.types';
+import {
+  EndpointActionBuilder,
+  endpointActionBuilder,
+  SystemInfoActionBuilder,
+  systemInfoActionBuilder,
+  UserFavoriteActionBuilder,
+  userFavoriteActionBuilder,
+  UserProfileActionBuilder,
+  userProfileActionBuilder,
+} from './stratos-action-builders';
+import { stratosEntityCatalog } from './stratos-entity-catalog';
+import { SystemInfo } from './types/system.types';
+import { UserFavorite } from './types/user-favorites.types';
+import { UserProfileInfo } from './types/user-profile.types';
+
+export function generateStratosEntities(): StratosBaseCatalogEntity[] {
+  /**
+   * This is used as a fake endpoint type to allow the store to be initiated correctly
+   */
+  const stratosType = {
+    logoUrl: '',
+    authTypes: [],
+    type: STRATOS_ENDPOINT_TYPE,
+    schema: null
+  }
+  return [
+    generateEndpoint(stratosType),
+    generateSystemInfo(stratosType),
+    generateUserFavorite(stratosType),
+    generateUserProfile(stratosType),
+    generateMetricsEndpoint()
+  ]
+}
+
+/**
+ * DefaultEndpointEntityType is used to represent a general endpoint
+ * This should not be used to actually attempt to render an endpoint and is instead used as a way to fill the
+ */
+function generateEndpoint(stratosType) {
+  const definition: IStratosEntityDefinition = {
+    schema: stratosEntityFactory(endpointEntityType),
+    type: endpointEntityType,
+    endpoint: stratosType,
+  }
+  stratosEntityCatalog.endpoint = new StratosCatalogEntity<
+    undefined,
+    EndpointModel,
+    EndpointActionBuilder
+  >(
+    definition,
+    {
+      dataReducers: [
+        systemEndpointsReducer
+      ],
+      actionBuilders: endpointActionBuilder
+    }
+  )
+  return stratosEntityCatalog.endpoint;
+}
+
+function generateSystemInfo(stratosType) {
+  const definition: IStratosEntityDefinition = {
+    schema: stratosEntityFactory(systemInfoEntityType),
+    type: systemInfoEntityType,
+    endpoint: stratosType,
+  }
+  stratosEntityCatalog.systemInfo = new StratosCatalogEntity<
+    undefined,
+    SystemInfo,
+    SystemInfoActionBuilder
+  >(
+    definition,
+    {
+      actionBuilders: systemInfoActionBuilder
+    }
+  )
+  return stratosEntityCatalog.systemInfo;
+}
+
+function generateUserFavorite(stratosType) {
+  const definition: IStratosEntityDefinition = {
+    schema: stratosEntityFactory(userFavouritesEntityType),
+    type: userFavouritesEntityType,
+    endpoint: stratosType,
+  }
+  stratosEntityCatalog.userFavorite = new StratosCatalogEntity<
+    undefined,
+    UserFavorite,
+    UserFavoriteActionBuilder
+  >(
+    definition,
+    {
+      dataReducers: [
+        addOrUpdateUserFavoriteMetadataReducer,
+        deleteUserFavoriteMetadataReducer,
+      ],
+      actionBuilders: userFavoriteActionBuilder
+    }
+  )
+  return stratosEntityCatalog.userFavorite;
+}
+
+function generateUserProfile(stratosType) {
+  const definition: IStratosEntityDefinition = {
+    schema: stratosEntityFactory(userProfileEntityType),
+    type: userProfileEntityType,
+    endpoint: stratosType,
+  }
+  stratosEntityCatalog.userProfile = new StratosCatalogEntity<
+    undefined,
+    UserProfileInfo,
+    UserProfileActionBuilder
+  >(
+    definition,
+    {
+      actionBuilders: userProfileActionBuilder
+    }
+  )
+  return stratosEntityCatalog.userProfile;
+}
+
+function generateMetricsEndpoint() {
+  // TODO: metrics location to be sorted - STRAT-152
+  stratosEntityCatalog.metricsEndpoint = new StratosCatalogEndpointEntity({
+    type: 'metrics',
+    label: 'Metrics',
+    labelPlural: 'Metrics',
+    tokenSharing: true,
+    logoUrl: '/core/assets/endpoint-icons/metrics.svg',
+    authTypes: [BaseEndpointAuth.UsernamePassword, BaseEndpointAuth.None],
+    renderPriority: 1,
+    listDetailsComponent: MetricsEndpointDetailsComponent,
+  },
+    metadata => `/endpoints/metrics/${metadata.guid}`
+  )
+  return stratosEntityCatalog.metricsEndpoint;
+}
diff --git a/src/frontend/packages/core/src/core/style.service.ts b/src/frontend/packages/store/src/style.service.ts
similarity index 100%
rename from src/frontend/packages/core/src/core/style.service.ts
rename to src/frontend/packages/store/src/style.service.ts
diff --git a/src/frontend/packages/core/src/core/theme.service.ts b/src/frontend/packages/store/src/theme.service.ts
similarity index 92%
rename from src/frontend/packages/core/src/core/theme.service.ts
rename to src/frontend/packages/store/src/theme.service.ts
index 2d8efab76a..0e140476b6 100644
--- a/src/frontend/packages/core/src/core/theme.service.ts
+++ b/src/frontend/packages/store/src/theme.service.ts
@@ -2,18 +2,13 @@ import { OverlayContainer } from '@angular/cdk/overlay';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { first, map, filter } from 'rxjs/operators';
+import { filter, first, map } from 'rxjs/operators';
 
-import { SetThemeAction } from '../../../store/src/actions/dashboard-actions';
-import { DashboardOnlyAppState } from '../../../store/src/app-state';
-import { selectDashboardState } from '../../../store/src/selectors/dashboard.selectors';
+import { SetThemeAction } from './actions/dashboard-actions';
+import { DashboardOnlyAppState } from './app-state';
+import { selectDashboardState } from './selectors/dashboard.selectors';
 import { StyleService } from './style.service';
-
-export interface StratosTheme {
-  key: string;
-  label: string;
-  styleName: string;
-}
+import { StratosTheme } from './types/theme.types';
 
 const lightTheme: StratosTheme = {
   key: 'default',
diff --git a/src/frontend/packages/store/src/types/auth.types.ts b/src/frontend/packages/store/src/types/auth.types.ts
index 5cf7e40f42..cef354d888 100644
--- a/src/frontend/packages/store/src/types/auth.types.ts
+++ b/src/frontend/packages/store/src/types/auth.types.ts
@@ -1,5 +1,3 @@
-import { StratosScopeStrings } from '../../../core/src/core/permissions/stratos-user-permissions.checker';
-
 export interface SessionDataEndpoint {
   guid: string;
   name: string;
@@ -11,7 +9,7 @@ export interface SessionUser {
   admin: boolean;
   guid: string;
   name: string;
-  scopes: StratosScopeStrings[];
+  scopes: string[];
 }
 export interface PluginConfig {
   userInvitationsEnabled: 'true' | 'false';
diff --git a/src/frontend/packages/store/src/types/base-metric.types.ts b/src/frontend/packages/store/src/types/base-metric.types.ts
index a281dbb974..0ad9c00358 100644
--- a/src/frontend/packages/store/src/types/base-metric.types.ts
+++ b/src/frontend/packages/store/src/types/base-metric.types.ts
@@ -1,5 +1,4 @@
 import { MetricQueryConfig } from '../actions/metrics.actions';
-import { MetricQueryType } from '../../../core/src/shared/services/metrics-range-selector.types';
 
 export enum MetricResultTypes {
   MATRIX = 'matrix',
diff --git a/src/frontend/packages/store/src/types/endpoint.types.ts b/src/frontend/packages/store/src/types/endpoint.types.ts
index 317c1aab7e..0cf7a86a6a 100644
--- a/src/frontend/packages/store/src/types/endpoint.types.ts
+++ b/src/frontend/packages/store/src/types/endpoint.types.ts
@@ -1,8 +1,5 @@
-import { EndpointType } from '../../../core/src/core/extension/extension-types';
-import { StratosScopeStrings } from '../../../core/src/core/permissions/stratos-user-permissions.checker';
 import { MetricsAPITargets, MetricsStratosInfo } from '../actions/metrics-api.actions';
-import { endpointSchemaKey } from '../helpers/entity-factory';
-import { RequestSectionKeys, TRequestTypeKeys } from '../reducers/api-request-reducer/types';
+import { EndpointType } from '../extension-types';
 
 export const endpointListKey = 'endpoint-list';
 export interface INewlyConnectedEndpointInfo {
@@ -13,14 +10,6 @@ export interface INewlyConnectedEndpointInfo {
   user: EndpointUser;
 }
 
-export const endpointStoreNames: {
-  section: TRequestTypeKeys,
-  type: string
-} = {
-  section: RequestSectionKeys.Other,
-  type: endpointSchemaKey
-};
-
 export interface IApiEndpointInfo {
   ForceQuery: boolean;
   Fragment: string;
@@ -63,7 +52,7 @@ export interface EndpointModel {
 
 export const SystemSharedUserGuid = '00000000-1111-2222-3333-444444444444';
 
-export type UserScopeStrings = string | StratosScopeStrings;
+export type UserScopeStrings = string;
 
 // Metadata for the user connected to an endpoint
 export interface EndpointUser {
diff --git a/src/frontend/packages/store/src/types/menu-item.types.ts b/src/frontend/packages/store/src/types/menu-item.types.ts
new file mode 100644
index 0000000000..bb55c8f11a
--- /dev/null
+++ b/src/frontend/packages/store/src/types/menu-item.types.ts
@@ -0,0 +1,11 @@
+import { Observable } from 'rxjs';
+
+
+export interface MenuItem {
+  icon?: string;
+  label: string;
+  action: () => void;
+  can?: Observable<boolean>;
+  disabled?: Observable<boolean>;
+  separator?: boolean;
+}
diff --git a/src/frontend/packages/store/src/types/metric.types.ts b/src/frontend/packages/store/src/types/metric.types.ts
index 3041f3f369..5bf57f1802 100644
--- a/src/frontend/packages/store/src/types/metric.types.ts
+++ b/src/frontend/packages/store/src/types/metric.types.ts
@@ -22,3 +22,8 @@ export interface IMetricCell {
   job: string;
   origin: string;
 }
+
+export enum MetricQueryType {
+  QUERY = 'query',
+  RANGE_QUERY = 'query_range'
+}
diff --git a/src/frontend/packages/core/src/shared/shared.types.ts b/src/frontend/packages/store/src/types/shared.types.ts
similarity index 79%
rename from src/frontend/packages/core/src/shared/shared.types.ts
rename to src/frontend/packages/store/src/types/shared.types.ts
index a3da5a1e89..a0d38a623e 100644
--- a/src/frontend/packages/core/src/shared/shared.types.ts
+++ b/src/frontend/packages/store/src/types/shared.types.ts
@@ -1,5 +1,5 @@
-import { AppState } from '../../../store/src/app-state';
-import { EntitySchema } from '../../../store/src/helpers/entity-schema';
+import { AppState } from '../app-state';
+import { EntitySchema } from '../helpers/entity-schema';
 
 
 export class ComponentEntityMonitorConfig {
diff --git a/src/frontend/packages/store/src/types/system.types.ts b/src/frontend/packages/store/src/types/system.types.ts
index 2e66f11a2f..a369b88217 100644
--- a/src/frontend/packages/store/src/types/system.types.ts
+++ b/src/frontend/packages/store/src/types/system.types.ts
@@ -1,6 +1,5 @@
-import { RequestSectionKeys, TRequestTypeKeys } from '../reducers/api-request-reducer/types';
-import { EndpointUser, EndpointModel } from './endpoint.types';
-import { entityFactory, systemInfoSchemaKey } from '../helpers/entity-factory';
+import { EndpointModel, EndpointUser } from './endpoint.types';
+
 export interface SystemInfo {
   version: {
     proxy_version: string,
@@ -13,11 +12,3 @@ export interface SystemInfo {
     }
   };
 }
-
-export const systemStoreNames: {
-  section: TRequestTypeKeys,
-  type: string
-} = {
-  section: RequestSectionKeys.Other,
-  type: entityFactory(systemInfoSchemaKey).entityType
-};
diff --git a/src/frontend/packages/store/src/types/theme.types.ts b/src/frontend/packages/store/src/types/theme.types.ts
new file mode 100644
index 0000000000..a31d01e5c3
--- /dev/null
+++ b/src/frontend/packages/store/src/types/theme.types.ts
@@ -0,0 +1,5 @@
+export interface StratosTheme {
+  key: string;
+  label: string;
+  styleName: string;
+}
\ No newline at end of file
diff --git a/src/frontend/packages/store/src/types/user-favorite-manager.types.ts b/src/frontend/packages/store/src/types/user-favorite-manager.types.ts
new file mode 100644
index 0000000000..3b170661a2
--- /dev/null
+++ b/src/frontend/packages/store/src/types/user-favorite-manager.types.ts
@@ -0,0 +1,27 @@
+import { TFavoriteMapperFunction } from '../favorite-config-mapper';
+import { IEndpointFavMetadata, IFavoriteMetadata, UserFavorite } from './user-favorites.types';
+
+export interface IFavoriteEntity {
+  type: string;
+  prettyName: string;
+  cardMapper: TFavoriteMapperFunction<IFavoriteMetadata>;
+  favorite: UserFavorite<IFavoriteMetadata>;
+}
+
+export interface IGroupedFavorites {
+  endpoint: IHydrationResults<IEndpointFavMetadata>;
+  entities: IHydrationResults[];
+}
+
+export interface IAllFavorites {
+  fetching: boolean;
+  error: boolean;
+  entityGroups: IGroupedFavorites[];
+}
+
+export interface IHydrationResults<T extends IFavoriteMetadata = IFavoriteMetadata> {
+  type: string;
+  cardMapper: TFavoriteMapperFunction<any>;
+  prettyName: string;
+  favorite: UserFavorite<T>;
+}
diff --git a/src/frontend/packages/store/src/types/user-favorites.types.ts b/src/frontend/packages/store/src/types/user-favorites.types.ts
index 6dbd7c28fc..b92b043b41 100644
--- a/src/frontend/packages/store/src/types/user-favorites.types.ts
+++ b/src/frontend/packages/store/src/types/user-favorites.types.ts
@@ -1,8 +1,13 @@
 import { IEntityMetadata } from '../entity-catalog/entity-catalog.types';
-import { LoggerService } from '../../../core/src/core/logger.service';
 
 export const userFavoritesPaginationKey = 'userFavorites';
 
+
+export interface IFavoritesInfo {
+  fetching: boolean;
+  error: boolean;
+}
+
 /**
  * A user favorite blueprint. Can be used to fetch the full entity from a particular endpoint.
  */
@@ -76,10 +81,10 @@ export class UserFavorite<T extends IEntityMetadata = IEntityMetadata> implement
       .join(favoriteGuidSeparator);
   }
 
-  static getEntityGuidFromFavoriteGuid(favoriteGuid: string, logger: LoggerService): string {
+  static getEntityGuidFromFavoriteGuid(favoriteGuid: string): string {
     const parts = favoriteGuid.split(favoriteGuidSeparator);
     if (parts.length < 3) {
-      logger.error('Failed to determine entity guid from favorite guid: ', parts);
+      console.error('Failed to determine entity guid from favorite guid: ', parts);
       return null;
     } else if (parts.length === 3) {
       return favoriteGuid.split(favoriteGuidSeparator)[0];
diff --git a/src/frontend/packages/core/src/core/user-favorite-helpers.ts b/src/frontend/packages/store/src/user-favorite-helpers.ts
similarity index 75%
rename from src/frontend/packages/core/src/core/user-favorite-helpers.ts
rename to src/frontend/packages/store/src/user-favorite-helpers.ts
index 7a73600412..84f81be582 100644
--- a/src/frontend/packages/core/src/core/user-favorite-helpers.ts
+++ b/src/frontend/packages/store/src/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 './entity-catalog/entity-catalog';
+import { IEntityMetadata } from './entity-catalog/entity-catalog.types';
+import { FavoritesConfigMapper } from './favorite-config-mapper';
+import { IFavoriteMetadata, UserFavorite } from './types/user-favorites.types';
 
 export function isEndpointTypeFavorite(favorite: UserFavorite<IFavoriteMetadata>) {
   return !favorite.entityId;
diff --git a/src/frontend/packages/core/src/core/user-favorite-manager.ts b/src/frontend/packages/store/src/user-favorite-manager.ts
similarity index 71%
rename from src/frontend/packages/core/src/core/user-favorite-manager.ts
rename to src/frontend/packages/store/src/user-favorite-manager.ts
index 45e4fded8a..a1e0d211e6 100644
--- a/src/frontend/packages/core/src/core/user-favorite-manager.ts
+++ b/src/frontend/packages/store/src/user-favorite-manager.ts
@@ -3,62 +3,28 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable, of } from 'rxjs';
 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 { GeneralEntityAppState, IRequestEntityTypeState } from './app-state';
+import { entityCatalog } from './entity-catalog/entity-catalog';
+import { FavoritesConfigMapper } from './favorite-config-mapper';
+import { endpointEntitiesSelector } from './selectors/endpoint.selectors';
 import {
   errorFetchingFavoritesSelector,
   favoriteEntitiesSelector,
   favoriteGroupsSelector,
   fetchingFavoritesSelector,
-} from '../../../store/src/selectors/favorite-groups.selectors';
-import { isFavorite } from '../../../store/src/selectors/favorite.selectors';
-import { IUserFavoritesGroups } from '../../../store/src/types/favorite-groups.types';
-import { IEndpointFavMetadata, IFavoriteMetadata, UserFavorite } from '../../../store/src/types/user-favorites.types';
-import {
-  FavoritesConfigMapper,
-  TFavoriteMapperFunction,
-} from '../shared/components/favorites-meta-card/favorite-config-mapper';
-import { LoggerService } from './logger.service';
-
-export interface IFavoriteEntity {
-  type: string;
-  prettyName: string;
-  cardMapper: TFavoriteMapperFunction<IFavoriteMetadata>;
-  favorite: UserFavorite<IFavoriteMetadata>;
-}
-
-export interface IGroupedFavorites {
-  endpoint: IHydrationResults<IEndpointFavMetadata>;
-  entities: IHydrationResults[];
-}
-
+} from './selectors/favorite-groups.selectors';
+import { isFavorite } from './selectors/favorite.selectors';
+import { stratosEntityCatalog } from './stratos-entity-catalog';
+import { IUserFavoritesGroups } from './types/favorite-groups.types';
+import { IGroupedFavorites, IHydrationResults } from './types/user-favorite-manager.types';
+import { IEndpointFavMetadata, IFavoriteMetadata, UserFavorite } from './types/user-favorites.types';
 
-export interface IAllFavorites {
-  fetching: boolean;
-  error: boolean;
-  entityGroups: IGroupedFavorites[];
-}
-
-export interface IFavoritesInfo {
-  fetching: boolean;
-  error: boolean;
-}
-
-export interface IHydrationResults<T extends IFavoriteMetadata = IFavoriteMetadata> {
-  type: string;
-  cardMapper: TFavoriteMapperFunction<any>;
-  prettyName: string;
-  favorite: UserFavorite<T>;
-}
 @Injectable({
   providedIn: 'root'
 })
 export class UserFavoriteManager {
   constructor(
     private store: Store<GeneralEntityAppState>,
-    private logger: LoggerService,
     private favoritesConfigMapper: FavoritesConfigMapper
   ) { }
 
@@ -124,7 +90,7 @@ export class UserFavoriteManager {
     if (!endpointFav) {
       return this.store.select(endpointEntitiesSelector).pipe(
         map(endpoints => {
-          const endpointGuid = UserFavorite.getEntityGuidFromFavoriteGuid(endpointFavoriteGuid, this.logger);
+          const endpointGuid = UserFavorite.getEntityGuidFromFavoriteGuid(endpointFavoriteGuid);
           const endpointEntity = endpoints[endpointGuid];
           return this.favoritesConfigMapper.getFavoriteEndpointFromEntity(endpointEntity);
         }),
@@ -162,6 +128,6 @@ export class UserFavoriteManager {
   }
 
   public toggleFavorite(favorite: UserFavorite<IFavoriteMetadata>) {
-    this.store.dispatch(new ToggleUserFavoriteAction(favorite));
+    stratosEntityCatalog.userFavorite.api.toggle(favorite);
   }
 }
diff --git a/src/frontend/packages/store/testing/ng-package.json b/src/frontend/packages/store/testing/ng-package.json
index 87392138a4..bfa6b062cf 100644
--- a/src/frontend/packages/store/testing/ng-package.json
+++ b/src/frontend/packages/store/testing/ng-package.json
@@ -1,7 +1,7 @@
 {
-  "$schema": "../../../../node_modules/ng-packagr/ng-package.schema.json",
+  "$schema": "../../../../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../../../../dist/store/testing",
   "lib": {
-    "entryFile": "public_api.ts"
+    "entryFile": "public-api.ts"
   }
 }
\ No newline at end of file
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 3dac3230b7..98731e61fe 100644
--- a/src/frontend/packages/store/testing/src/store-test-helper.ts
+++ b/src/frontend/packages/store/testing/src/store-test-helper.ts
@@ -2,10 +2,10 @@ import { ModuleWithProviders } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 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';
 import { EntityCatalogEntityConfig } from '../../src/entity-catalog/entity-catalog.types';
+import { endpointEntityType, stratosEntityFactory } from '../../src/helpers/stratos-entity-factory';
 import { appReducers } from '../../src/reducers.module';
 import { getDefaultRequestState, rootUpdatingKey } from '../../src/reducers/api-request-reducer/types';
 import { getDefaultPaginationEntityState } from '../../src/reducers/pagination-reducer/pagination-reducer-reset-pagination';
@@ -396,7 +396,7 @@ export function createEntityStore(entityMap: Map<EntityCatalogEntityConfig, Arra
 }
 
 export function populateStoreWithTestEndpoint(): EndpointModel {
-  const stratosEndpointEntityConfig: EntityCatalogEntityConfig = endpointEntitySchema;
+  const stratosEndpointEntityConfig: EntityCatalogEntityConfig = stratosEntityFactory(endpointEntityType);
   const stratosEndpointEntityKey = entityCatalog.getEntityKey(stratosEndpointEntityConfig);
   const mappedData = {
     entities: {
diff --git a/src/frontend/packages/theme/_helper.scss b/src/frontend/packages/theme/_helper.scss
new file mode 100644
index 0000000000..ba0c49c6c9
--- /dev/null
+++ b/src/frontend/packages/theme/_helper.scss
@@ -0,0 +1,112 @@
+// Stratos Theme Helper
+
+@use "sass:color";
+@import '~@angular/material/theming';
+@import './mat-themes';
+@import './mat-colors';
+
+// Defaults
+$side-nav-light-text: #fff;
+$side-nav-light-bg: #333;
+$side-nav-light-hover: #555;
+$side-nav-light-active: #484848;
+
+// Themes palettes and colors
+
+// Light Theme defaults
+$oss-theme-primary: mat-palette($mat-blue);
+$oss-theme-accent: mat-palette($mat-blue);
+$oss-theme-warn: mat-palette($mat-red);
+$oss-theme: mat-light-theme($oss-theme-primary, $oss-theme-accent, $oss-theme-warn);
+
+// Dark Theme defaults
+$oss-dark-primary: mat-palette($mat-blue);
+$oss-dark-accent: mat-palette($mat-amber, A400, A100, A700);
+$oss-dark-warn: mat-palette($mat-red);
+$oss-dark-theme: mat-dark-theme($oss-dark-primary, $oss-dark-accent, $oss-dark-warn);
+
+@function stratos-default-theme() {
+  @return (
+    default: stratos-default-light-theme(),
+    dark: stratos-default-dark-theme()
+  );
+}
+
+@function stratos-default-dark-theme() {
+  @return stratos-theme-helper($oss-dark-theme);
+}
+
+@function stratos-default-light-theme() {
+  @return stratos-theme-helper($oss-theme);
+}
+
+// Creates the app theme and applies it to the application
+// $theme = Angular Material Theme
+// $nav-theme - Colors for the Side Nav (optional)
+// $status-theme - Colors for status (optional)
+@function stratos-theme-helper($theme: $oss-theme, $nav-theme: null, $status-theme: null) {
+  $background-colors: map-get($theme, background);
+  $foreground-colors: map-get($theme, foreground);
+  $is-dark: map-get($theme, is-dark);
+  $app-background-color: white;
+  $app-background-text-color: rgba(mat-color($foreground-colors, base), .65);
+  $primary: map-get($theme, primary);
+  $accent: map-get($theme, accent);
+  $warn: map-get($theme, warn);
+  $subdued: mat-contrast($primary, 50);
+
+  @if $is-dark == true {
+    $app-background-color: lighten(mat-color($background-colors, background), 10%);
+    $subdued: lighten($subdued, 90);
+  } @else {
+    $app-background-color: darken(mat-color($background-colors, background), 2%);
+    $subdued: lighten($subdued, 50);
+  }
+
+  // Just returns a light theme
+  @return (
+    theme: $theme,
+    app-theme: (
+      app-background-color: $app-background-color,
+      app-background-text-color: rgba(mat-color($foreground-colors, base), .65),
+      side-nav: app-generate-nav-theme($theme, $nav-theme),
+      status: app-generate-status-theme($theme, $status-theme),
+      subdued-color: $subdued,
+      ansi-colors: $ansi-color-palette,
+      header-background-color: mat-color($primary),
+      header-foreground-color: mat-contrast($primary, 500),
+      // Does the header background color span across the top, or is the sidenav background color used for the top-left portion
+      header-background-span: false,
+      // Background colors to use for things like the about page header (underflow)
+      underflow-background-color: mat-color($primary),
+      underflow-foreground-color: mat-contrast($primary, 500)
+    )
+  );
+}
+
+@function app-generate-nav-theme($theme, $nav-theme: null) {
+  @if ($nav-theme) {
+    @return $nav-theme;
+  } @else {
+    // Use default palette for side navigation
+    @return (
+      background: $side-nav-light-bg,
+      text: darken($side-nav-light-text, 10%),
+      active: $side-nav-light-active,
+      active-text: $side-nav-light-text,
+      hover: $side-nav-light-hover, 
+      hover-text: $side-nav-light-text
+    );
+  }
+}
+
+@function app-generate-status-theme($theme, $status-theme: null) {
+  @if ($status-theme) {
+    @return $status-theme;
+  } @else {
+    $warn: map-get($theme, warn);
+    $primary: map-get($theme, primary);
+    $white: #fff; // Use default palette for status
+    @return (success: map-get($mat-green, 500), warning: map-get($mat-orange, 500), danger: mat-color($warn), tentative: map-get($mat-grey, 500), busy: mat-color($primary), text: $white, );
+  }
+}
diff --git a/src/frontend/packages/theme/_index.scss b/src/frontend/packages/theme/_index.scss
new file mode 100644
index 0000000000..691b38f74c
--- /dev/null
+++ b/src/frontend/packages/theme/_index.scss
@@ -0,0 +1,6 @@
+@import './helper';
+
+// This just returns the default open-source theme
+@function stratos-theme() {
+  @return stratos-default-theme();
+}
diff --git a/src/frontend/packages/theme/assets/core/login-bg.jpg b/src/frontend/packages/theme/assets/core/login-bg.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..345d4dfe6dba89f5fa60d5a731d66bd99f768fc3
GIT binary patch
literal 206493
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

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/theme/assets/core/logo.png b/src/frontend/packages/theme/assets/core/logo.png
new file mode 100755
index 0000000000000000000000000000000000000000..ebfb80074108082d3c2f23d2e4044d4173c5f494
GIT binary patch
literal 22715
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

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/theme/assets/core/nav-logo-icon.png b/src/frontend/packages/theme/assets/core/nav-logo-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b728a0fbb832553de791977e7944fdd089f9936
GIT binary patch
literal 667
zcmeAS@N?(olHy`uVBq!ia0vp^nn0|=!3-po6&_0gsjC4#A+A9B=g*(tzJ2=#18j>f
zX-7;2^8Wt)`{TzC2m{Fe|Np;4`8uFVAOi^GlcqxiAzUD-o;C+a{{H>@<;#~0lXpr~
zt_14Uj+g>B3Ml*a>sP_X%|P=ZdWGxOX@`UCVw-hRJ8Y_a^0ZH%K8e<@k<FdQyy})v
z%VwY!zR8DViWadgx+vVWgJJ1ahSfJ2y0-wuc_tj-oOMc|dzVn#HqnL+vUv-+ryf;F
zn8vjFR&w<GP@u<bOM?7@83IHf-`M>3@B0?zZ;PjwE6K969PG<UiE=X1<l$ud_wvT}
zu3`@>%XgO#?Ay9}ewwf0o0m6koY}dwtHf1XaPBnq6b1%H3r`ov5R21KFT3YAJBYA6
zSZL93ko6Alj_>p0j!#JV{r~?G9m}Vi9u$9?JMW9z=1X4u{~OIWdMzy!-zm~-&*hpT
z-8o_H^338co#dcwR)<oRMUiVmXLE}_tY!^3k@)TQ-49Qn7458Vc9m0Dy15~@Wb&+)
zDUwF(BI;!Pmj{cuM!zUg5T4NMB_ki~U-5)3NX@(AhsdKJSB)dvue8<fFaE8%#;G+#
z!E~X<+^<!8Lsw*7i8;Z0Qf%Jjl(tl>)PT~gdv-gWXRlG79Q9z!q$>$Glb>XYYd@E|
z6&j=H8+Uka**R0w?LoPw)Bg4u&Y1DF?U7=$^X@h8dKq`|-E0lHxasDBTLwKp`JA(+
z@po>T`R`F)!kO!H6DC%A*Tt`yx=LDP_O2NU<qz^%#e?E@Udgc%ky*O-$BD~VO1bOr
Yn={_lnV@;m1{4_#p00i_>zopr0LvU+X#fBK

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/theme/assets/core/nav-logo.png b/src/frontend/packages/theme/assets/core/nav-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..a57b9694171ed3068e5bc2038f9aa429048fe8b6
GIT binary patch
literal 1548
zcmX|>3pmqj9LE=PY1rmc3Y~^Av5Hf<L@|xIg>~j~RHwN`om^stid@4+iD@p$Ou00c
za8lHch;tgbq(X}(YMjtq=kC1Ev*+peJpbSOdB5-X`+NV-^M9Uyy1Oeu38n#qKp;wv
z4)_yb%>oZvUK(^_>#+$4WJ|2O3&{>_MIzDc?Ci|U%+k`*=H}+lEl?H~7FJeP!0F=R
z;_~t`Pyma?VhI426tIB;;>N}XP<{enpwG|G14V}Q*3dgwVgNb-Ac7k~2Lo4ESHaal
z1T{A|CjrSQi5Yb84(icW03@aD#{dB0zz;fLNlMbeH2t%Ml4+2fCiR#~z>=V$H(g=|
zDIosL8hPceudjokS{w)H@`bN;0vPI-$^omzR%wOY1E*5#kIKn)z@wPcg7wP9deJo^
zN@Z9*2<p?lo_CDA=+b2$phX=JHXo5%4{iZYrL1Q80v>|asC?szT6~RGXo*5@8=8Cv
zj7q6KzaM-63gv|BZx9q&1-icf?BC-aZZ?|R*6ekbeh7SAt<?V;<-MxQ%P}+Ay1w4u
z&rFVwyr>{2wK!d0%E(N<5*4hkGdtP$@@dVZs?wVm0(@+L-Gh+bm>A;^v^A7bQ~e#L
z`<l7z;^UU0$qD|zK<BfD+6Poh_-Q*cBW0~x%UTFTn&*hek-S@{=;BBfBJv-x0De0u
zN9Pb_Vv9CZDZPDrA1yuIaq>k}Y&TwYoj(-I82b`qTsmrSV0JlSDDak;+aNREC$zR1
z#wsDazA?SR+ssSQ*LqY>9Wz-Vn54|v@3;~V6F#26#tREtG>^FJR(6F2*NA)-Z9J9?
z*X#lY8-017TG*<exkuvU^f&<m%qPwAkMMf9bcGWhs%Vvc(2e0B>tUnA;jJ*m=*iI#
zhM9edLd?B*%afQiaX|~AIoYf$jm^>RY!2l|-qr4z@ioTF1j(ANU9pXl4nz*L+nK+M
z@&2=7WVC!}XsEin+OmRkj+eUbBBZ9E{E*PSlv|Exal_3xK~?Y3AB2nJc+Zg>e?GrB
zEl5QFZ2Gk*+D-4BUr@a+LD`Cyfh1wuyO}fT{;%GAAJ8uEi`h0L<?~35EUOL?m~*}P
zxdEd+`LerjV2W=~P4&;l#tqWjjVeEezL+BESz4geWQ9BYaa4ZB$k$#hGP?qveSbQ-
zXX|O-dFB&FO<>7^hUF8N7GJ85eMqE5zNfcGHKNhpu<Y*1g$r6CB=sQq!xMze`KQBd
z8fr8MCM=8yt{NQkW?iMxXbszSOnzbKzg3@6yiWW}1?_mwFoB`3w7a%EeEvFe%>F8j
z0?R0p*+Dii`KpJjpZic1aa3u4)aB`y$7fxFW$dy1&cwxhW_YGOI+OUV2F0jpr@hXy
z=txUIQg9t}dDo(Z+MVGAr~?ts*683p2B>`*0)t9OM}{6k0ag-{)D?3IuF*JVVxQb(
z=p>pS=&~?)Z$x%X`y*@(gEPHggHz+Wyx7AqS?tzK#J~1w$NnP6(x6atzw<J}Ccj(c
z&DdbFN#S*<0<Fsh)M)xH<6wCe!#wFU+&q;`QfRxB3jLiW^LFXkP2F>k0~s}F6`QP`
zYH)>z#?K4vmkvG<F*|#SNNde_&byYnGu?J*TIV&j{tXK3*2y~LSZjhg0!i2v%Cd6~
zl4mKZWUl6O!{A!?zqk{jMZIO1uzhd7d75f6Fdl;}uf)Kn6cp+KCu3a8S4^8QhC1GN
zz@&`y#0ir39gK;66=&8U6?wc%*o+^4&iw?hQ3*hh-Sm6J@nj`ufeDmY$68^rZJ=_L
zi^}6^k4VBCkq)Ed^mPTcmFL66txf!GH=BRt5Y244N&k+*%MOjVI3#Vv4p)tFtc%|a
z3!MDa;*@u8VCS6gVn}X#Ef41s5E~XdQ&g$OPAu6?jhKMw^A9VTd1Z%7Jxd6AJfU+>
exm&SyYZTZ0Okwl;<rMH&fjHW^;yJeD#Qy=(5m#9N

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/theme/assets/favicon.ico b/src/frontend/packages/theme/assets/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..21f49bc43b08f557f085d0ba170f388e5956373f
GIT binary patch
literal 15086
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

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/core/misc/custom/loading.css b/src/frontend/packages/theme/loader/loading.css
similarity index 100%
rename from src/frontend/packages/core/misc/custom/loading.css
rename to src/frontend/packages/theme/loader/loading.css
diff --git a/src/frontend/packages/core/misc/custom/loading.html b/src/frontend/packages/theme/loader/loading.html
similarity index 100%
rename from src/frontend/packages/core/misc/custom/loading.html
rename to src/frontend/packages/theme/loader/loading.html
diff --git a/src/frontend/packages/theme/mat-colors.scss b/src/frontend/packages/theme/mat-colors.scss
new file mode 100644
index 0000000000..db3f8aeeba
--- /dev/null
+++ b/src/frontend/packages/theme/mat-colors.scss
@@ -0,0 +1,28 @@
+$white: #fff;
+$black: #000;
+
+$black-87-opacity: rgba($black, .87);
+$white-87-opacity: rgba($white, .87);
+$black-12-opacity: rgba($black, .12);
+$white-12-opacity: rgba($white, .12);
+$black-6-opacity: rgba($black, .06);
+$white-6-opacity: rgba($white, .06);
+$mat-red: ( 50: #ffebee, 100: #ffcdd2, 200: #ef9a9a, 300: #e57373, 400: #ef5350, 500: #f44336, 600: #e53935, 700: #d32f2f, 800: #c62828, 900: #b71c1c, A100: #ff8a80, A200: #ff5252, A400: #ff1744, A700: #d50000, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: white, A400: white, A700: white, ));
+$mat-pink: ( 50: #fce4ec, 100: #f8bbd0, 200: #f48fb1, 300: #f06292, 400: #ec407a, 500: #e91e63, 600: #d81b60, 700: #c2185b, 800: #ad1457, 900: #880e4f, A100: #ff80ab, A200: #ff4081, A400: #f50057, A700: #c51162, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: $white-87-opacity, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: white, A400: white, A700: white, ));
+$mat-purple: ( 50: #f3e5f5, 100: #e1bee7, 200: #ce93d8, 300: #ba68c8, 400: #ab47bc, 500: #9c27b0, 600: #8e24aa, 700: #7b1fa2, 800: #6a1b9a, 900: #4a148c, A100: #ea80fc, A200: #e040fb, A400: #d500f9, A700: #a0f, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: white, 400: white, 500: $white-87-opacity, 600: $white-87-opacity, 700: $white-87-opacity, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: white, A400: white, A700: white, ));
+$mat-deep-purple: ( 50: #ede7f6, 100: #d1c4e9, 200: #b39ddb, 300: #9575cd, 400: #7e57c2, 500: #673ab7, 600: #5e35b1, 700: #512da8, 800: #4527a0, 900: #311b92, A100: #b388ff, A200: #7c4dff, A400: #651fff, A700: #6200ea, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: white, 400: white, 500: $white-87-opacity, 600: $white-87-opacity, 700: $white-87-opacity, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: white, A400: $white-87-opacity, A700: $white-87-opacity, ));
+$mat-indigo: ( 50: #e8eaf6, 100: #c5cae9, 200: #9fa8da, 300: #7986cb, 400: #5c6bc0, 500: #3f51b5, 600: #3949ab, 700: #303f9f, 800: #283593, 900: #1a237e, A100: #8c9eff, A200: #536dfe, A400: #3d5afe, A700: #304ffe, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: white, 400: white, 500: $white-87-opacity, 600: $white-87-opacity, 700: $white-87-opacity, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: white, A400: white, A700: $white-87-opacity, ));
+$mat-blue: ( 50: #e3f2fd, 100: #bbdefb, 200: #90caf9, 300: #64b5f6, 400: #42a5f5, 500: #2196f3, 600: #1e88e5, 700: #1976d2, 800: #1565c0, 900: #0d47a1, A100: #82b1ff, A200: #448aff, A400: #2979ff, A700: #2962ff, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: white, A400: white, A700: white, ));
+$mat-light-blue: ( 50: #e1f5fe, 100: #b3e5fc, 200: #81d4fa, 300: #4fc3f7, 400: #29b6f6, 500: #03a9f4, 600: #039be5, 700: #0288d1, 800: #0277bd, 900: #01579b, A100: #80d8ff, A200: #40c4ff, A400: #00b0ff, A700: #0091ea, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: white, 900: $white-87-opacity, A100: $black-87-opacity, A200: $black-87-opacity, A400: $black-87-opacity, A700: white, ));
+$mat-cyan: ( 50: #e0f7fa, 100: #b2ebf2, 200: #80deea, 300: #4dd0e1, 400: #26c6da, 500: #00bcd4, 600: #00acc1, 700: #0097a7, 800: #00838f, 900: #006064, A100: #84ffff, A200: #18ffff, A400: #00e5ff, A700: #00b8d4, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: white, 900: $white-87-opacity, A100: $black-87-opacity, A200: $black-87-opacity, A400: $black-87-opacity, A700: $black-87-opacity, ));
+$mat-teal: ( 50: #e0f2f1, 100: #b2dfdb, 200: #80cbc4, 300: #4db6ac, 400: #26a69a, 500: #009688, 600: #00897b, 700: #00796b, 800: #00695c, 900: #004d40, A100: #a7ffeb, A200: #64ffda, A400: #1de9b6, A700: #00bfa5, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: $black-87-opacity, A400: $black-87-opacity, A700: $black-87-opacity, ));
+$mat-green: ( 50: #e8f5e9, 100: #c8e6c9, 200: #a5d6a7, 300: #81c784, 400: #66bb6a, 500: #4caf50, 600: #43a047, 700: #388e3c, 800: #2e7d32, 900: #1b5e20, A100: #b9f6ca, A200: #69f0ae, A400: #00e676, A700: #00c853, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: $black-87-opacity, A400: $black-87-opacity, A700: $black-87-opacity, ));
+$mat-light-green: ( 50: #f1f8e9, 100: #dcedc8, 200: #c5e1a5, 300: #aed581, 400: #9ccc65, 500: #8bc34a, 600: #7cb342, 700: #689f38, 800: #558b2f, 900: #33691e, A100: #ccff90, A200: #b2ff59, A400: #76ff03, A700: #64dd17, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: $black-87-opacity, 600: $black-87-opacity, 700: white, 800: white, 900: white, A100: $black-87-opacity, A200: $black-87-opacity, A400: $black-87-opacity, A700: $black-87-opacity, ));
+$mat-lime: ( 50: #f9fbe7, 100: #f0f4c3, 200: #e6ee9c, 300: #dce775, 400: #d4e157, 500: #cddc39, 600: #c0ca33, 700: #afb42b, 800: #9e9d24, 900: #827717, A100: #f4ff81, A200: #eeff41, A400: #c6ff00, A700: #aeea00, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: $black-87-opacity, 600: $black-87-opacity, 700: $black-87-opacity, 800: $black-87-opacity, 900: white, A100: $black-87-opacity, A200: $black-87-opacity, A400: $black-87-opacity, A700: $black-87-opacity, ));
+$mat-yellow: ( 50: #fffde7, 100: #fff9c4, 200: #fff59d, 300: #fff176, 400: #ffee58, 500: #ffeb3b, 600: #fdd835, 700: #fbc02d, 800: #f9a825, 900: #f57f17, A100: #ffff8d, A200: #ff0, A400: #ffea00, A700: #ffd600, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: $black-87-opacity, 600: $black-87-opacity, 700: $black-87-opacity, 800: $black-87-opacity, 900: $black-87-opacity, A100: $black-87-opacity, A200: $black-87-opacity, A400: $black-87-opacity, A700: $black-87-opacity, ));
+$mat-amber: ( 50: #fff8e1, 100: #ffecb3, 200: #ffe082, 300: #ffd54f, 400: #ffca28, 500: #ffc107, 600: #ffb300, 700: #ffa000, 800: #ff8f00, 900: #ff6f00, A100: #ffe57f, A200: #ffd740, A400: #ffc400, A700: #ffab00, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: $black-87-opacity, 600: $black-87-opacity, 700: $black-87-opacity, 800: $black-87-opacity, 900: $black-87-opacity, A100: $black-87-opacity, A200: $black-87-opacity, A400: $black-87-opacity, A700: $black-87-opacity, ));
+$mat-orange: ( 50: #fff3e0, 100: #ffe0b2, 200: #ffcc80, 300: #ffb74d, 400: #ffa726, 500: #ff9800, 600: #fb8c00, 700: #f57c00, 800: #ef6c00, 900: #e65100, A100: #ffd180, A200: #ffab40, A400: #ff9100, A700: #ff6d00, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: $black-87-opacity, 600: $black-87-opacity, 700: $black-87-opacity, 800: white, 900: white, A100: $black-87-opacity, A200: $black-87-opacity, A400: $black-87-opacity, A700: black, ));
+$mat-deep-orange: ( 50: #fbe9e7, 100: #ffccbc, 200: #ffab91, 300: #ff8a65, 400: #ff7043, 500: #ff5722, 600: #f4511e, 700: #e64a19, 800: #d84315, 900: #bf360c, A100: #ff9e80, A200: #ff6e40, A400: #ff3d00, A700: #dd2c00, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: white, 900: white, A100: $black-87-opacity, A200: $black-87-opacity, A400: white, A700: white, ));
+$mat-brown: ( 50: #efebe9, 100: #d7ccc8, 200: #bcaaa4, 300: #a1887f, 400: #8d6e63, 500: #795548, 600: #6d4c41, 700: #5d4037, 800: #4e342e, 900: #3e2723, A100: #d7ccc8, A200: #bcaaa4, A400: #8d6e63, A700: #5d4037, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: white, 400: white, 500: $white-87-opacity, 600: $white-87-opacity, 700: $white-87-opacity, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: $black-87-opacity, A400: white, A700: $white-87-opacity, ));
+$mat-grey: ( 50: #fafafa, 100: #f5f5f5, 200: #eee, 300: #e0e0e0, 400: #bdbdbd, 500: #9e9e9e, 600: #757575, 700: #616161, 800: #424242, 900: #212121, A100: #fff, A200: #eee, A400: #bdbdbd, A700: #616161, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: $black-87-opacity, 600: $white-87-opacity, 700: $white-87-opacity, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: $black-87-opacity, A400: $black-87-opacity, A700: $white-87-opacity, ));
+$mat-blue-grey: ( 50: #eceff1, 100: #cfd8dc, 200: #b0bec5, 300: #90a4ae, 400: #78909c, 500: #607d8b, 600: #546e7a, 700: #455a64, 800: #37474f, 900: #263238, A100: #cfd8dc, A200: #b0bec5, A400: #78909c, A700: #455a64, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: white, 500: white, 600: $white-87-opacity, 700: $white-87-opacity, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: $black-87-opacity, A400: white, A700: $white-87-opacity, ));
diff --git a/src/frontend/packages/core/sass/mat-themes.scss b/src/frontend/packages/theme/mat-themes.scss
similarity index 100%
rename from src/frontend/packages/core/sass/mat-themes.scss
rename to src/frontend/packages/theme/mat-themes.scss
diff --git a/src/frontend/packages/theme/package.json b/src/frontend/packages/theme/package.json
new file mode 100644
index 0000000000..c8e9cce11c
--- /dev/null
+++ b/src/frontend/packages/theme/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "@stratosui/theme",
+  "version": "0.0.1",
+  "stratos": {
+    "assets": {
+      "assets/core": "core/assets",
+      "assets/favicon.ico": "favicon.ico"
+    },
+    "theme":{
+      "loadingCss": "loader/loading.css",
+      "loadingHtml": "loader/loading.html"
+    }
+  },
+  "peerDependencies": {
+  },
+  "scripts": {
+    "build": "rm -rf ../../../../dist/theme && mkdir -p ../../../../dist/theme && cp -R * ../../../../dist/theme"
+  }
+}
diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index a49e701b9a..0e5bb28dde 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -341,12 +341,13 @@ github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyC
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/sessions v1.1.3 h1:uXoZdcdA5XdXF3QzuSlheVRUvjl+1rKY7zBXL68L9RU=
 github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
+github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY=
-github.com/gosuri/uitable v0.0.1/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY=
+github.com/gosuri/uitable v0.0.1/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/govau/cf-common v0.0.7 h1:uhp1P6XM6GGzu1+A4C7LELLX/9mCmH6W5DpJZC0kWmo=
 github.com/govau/cf-common v0.0.7/go.mod h1:5xL/OfE7wxeyHlXb7iei0rAbdQ/5v6dF18BZknPv7NQ=
 github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
@@ -782,18 +783,19 @@ gopkg.in/square/go-jose.v2 v2.2.2 h1:orlkJ3myw8CN1nVQHBFfloD+L3egixIa4FvUP6RosSA
 gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 helm.sh/helm/v3 v3.0.0 h1:or/9cs1GgfcTQeEnR2CVJNw893/rmqIG1KsNHmUiSFw=
 helm.sh/helm/v3 v3.0.0/go.mod h1:sI7B9yfvMgxtTPMWdk1jSKJ2aa59UyP9qhPydqW6mgo=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/src/jetstream/plugins/userfavorites/favorites.go b/src/jetstream/plugins/userfavorites/favorites.go
index 7d87db1146..878a95d25a 100644
--- a/src/jetstream/plugins/userfavorites/favorites.go
+++ b/src/jetstream/plugins/userfavorites/favorites.go
@@ -139,7 +139,9 @@ func (uf *UserFavorites) create(c echo.Context) error {
 		return interfaces.NewHTTPShadowError(
 			http.StatusBadRequest,
 			"Failed to save favorite to db",
-			"Failed to save favorite to db")
+			"Failed to save favorite to db %+v",
+			err,
+		)
 	}
 
 	jsonString, err := json.Marshal(updatedFavorite)
@@ -147,7 +149,9 @@ func (uf *UserFavorites) create(c echo.Context) error {
 		return interfaces.NewHTTPShadowError(
 			http.StatusBadRequest,
 			"Failed to Marshal favorite from db",
-			"Failed to Marshal favorite from db")
+			"Failed to Marshal favorite from db %+v",
+			err,
+		)
 	}
 
 	c.Response().Header().Set("Content-Type", "application/json")
diff --git a/src/test-e2e/application/application-deploy-docker-e2e.spec.ts b/src/test-e2e/application/application-deploy-docker-e2e.spec.ts
index 8215178373..84de49c66c 100644
--- a/src/test-e2e/application/application-deploy-docker-e2e.spec.ts
+++ b/src/test-e2e/application/application-deploy-docker-e2e.spec.ts
@@ -1,7 +1,7 @@
 import { browser } from 'protractor';
 
 import { e2e } from '../e2e';
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { ConsoleUserType } from '../helpers/e2e-helpers';
 import { CREATE_APP_DEPLOY_TEST_TYPE, createApplicationDeployTests } from './application-deploy-helper';
 import { ApplicationE2eHelper } from './application-e2e-helpers';
diff --git a/src/test-e2e/application/application-deploy-e2e.spec.ts b/src/test-e2e/application/application-deploy-e2e.spec.ts
index 994fa95c1b..5e07c421b9 100644
--- a/src/test-e2e/application/application-deploy-e2e.spec.ts
+++ b/src/test-e2e/application/application-deploy-e2e.spec.ts
@@ -1,7 +1,7 @@
 import { browser, promise } from 'protractor';
 
 import { e2e } from '../e2e';
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { ConsoleUserType } from '../helpers/e2e-helpers';
 import { ConfirmDialogComponent } from '../po/confirm-dialog';
 import { createApplicationDeployTests } from './application-deploy-helper';
diff --git a/src/test-e2e/application/application-e2e-helpers.ts b/src/test-e2e/application/application-e2e-helpers.ts
index 52646ae9b3..b0800c2432 100644
--- a/src/test-e2e/application/application-e2e-helpers.ts
+++ b/src/test-e2e/application/application-e2e-helpers.ts
@@ -4,7 +4,7 @@ import { IApp, IRoute, ISpace } from '../../frontend/packages/cloud-foundry/src/
 import { APIResource } from '../../frontend/packages/store/src/types/api.types';
 import { e2e, E2ESetup } from '../e2e';
 import { E2EConfigCloudFoundry } from '../e2e.types';
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { CFRequestHelpers } from '../helpers/cf-request-helpers';
 import { E2EHelpers } from '../helpers/e2e-helpers';
 
diff --git a/src/test-e2e/application/application-routes-e2e.spec.ts b/src/test-e2e/application/application-routes-e2e.spec.ts
index 6a0ee1ec60..c90657464e 100644
--- a/src/test-e2e/application/application-routes-e2e.spec.ts
+++ b/src/test-e2e/application/application-routes-e2e.spec.ts
@@ -3,7 +3,7 @@ import { browser, promise, protractor } from 'protractor';
 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';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { ConsoleUserType } from '../helpers/e2e-helpers';
 import { ConfirmDialogComponent } from '../po/confirm-dialog';
 import { ApplicationE2eHelper } from './application-e2e-helpers';
diff --git a/src/test-e2e/application/application-view-e2e.spec.ts b/src/test-e2e/application/application-view-e2e.spec.ts
index e21593514e..48244d2916 100644
--- a/src/test-e2e/application/application-view-e2e.spec.ts
+++ b/src/test-e2e/application/application-view-e2e.spec.ts
@@ -4,7 +4,7 @@ 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';
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../helpers/e2e-helpers';
 import { ApplicationE2eHelper } from './application-e2e-helpers';
 import { ApplicationPageEventsTab } from './po/application-page-events.po';
@@ -135,8 +135,7 @@ describe('Application View -', () => {
       });
 
       it('Deployment Info', () => {
-        appSummary.cardDeployInfo.waitForTitle('Deployment Info');
-        expect(appSummary.cardDeployInfo.getContent()).toBe('None');
+        expect(appSummary.cardDeployInfo.isPresent()).toBeFalsy();
       });
     });
 
diff --git a/src/test-e2e/applications/application-wall-e2e.spec.ts b/src/test-e2e/applications/application-wall-e2e.spec.ts
index fc8f6d3da0..85fa104fa6 100644
--- a/src/test-e2e/applications/application-wall-e2e.spec.ts
+++ b/src/test-e2e/applications/application-wall-e2e.spec.ts
@@ -5,7 +5,7 @@ import { APIResource } from '../../frontend/packages/store/src/types/api.types';
 import { ApplicationE2eHelper } from '../application/application-e2e-helpers';
 import { e2e } from '../e2e';
 import { E2EConfigCloudFoundry } from '../e2e.types';
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../helpers/e2e-helpers';
 import { extendE2ETestTime } from '../helpers/extend-test-helpers';
 import { FormComponent } from '../po/form.po';
diff --git a/src/test-e2e/cloud-foundry/cf-level/manage-org-e2e.spec.ts b/src/test-e2e/cloud-foundry/cf-level/manage-org-e2e.spec.ts
index e6a92dda50..07893a76bb 100644
--- a/src/test-e2e/cloud-foundry/cf-level/manage-org-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/cf-level/manage-org-e2e.spec.ts
@@ -1,7 +1,7 @@
 import { by, element, promise, protractor } from 'protractor';
 
 import { e2e } from '../../e2e';
-import { CFHelpers } from '../../helpers/cf-helpers';
+import { CFHelpers } from '../../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../../helpers/e2e-helpers';
 import { CfOrgLevelPage } from '../org-level/cf-org-level-page.po';
 import { CfTopLevelPage } from './cf-top-level-page.po';
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 e70910bfc2..159cfcb4fd 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
@@ -1,7 +1,7 @@
 import { by, element, promise, protractor } from 'protractor';
 
 import { e2e } from '../../e2e';
-import { CFHelpers } from '../../helpers/cf-helpers';
+import { CFHelpers } from '../../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../../helpers/e2e-helpers';
 import { extendE2ETestTime } from '../../helpers/extend-test-helpers';
 import { TableComponent } from '../../po/table.po';
diff --git a/src/test-e2e/cloud-foundry/cloud-foundry-list-cf-e2e.spec.ts b/src/test-e2e/cloud-foundry/cloud-foundry-list-cf-e2e.spec.ts
index ace82674ac..83b73b37ca 100644
--- a/src/test-e2e/cloud-foundry/cloud-foundry-list-cf-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/cloud-foundry-list-cf-e2e.spec.ts
@@ -1,4 +1,5 @@
-import { e2e } from '../e2e';
+import { CF_ENDPOINT_TYPE } from '../../frontend/packages/cloud-foundry/src/cf-types';
+import { E2E, e2e } from '../e2e';
 import { ConsoleUserType } from '../helpers/e2e-helpers';
 import { ListComponent } from '../po/list.po';
 import { SideNavigation, SideNavMenuItem } from '../po/side-nav.po';
@@ -15,9 +16,24 @@ describe('CF Endpoints Dashboard - ', () => {
         .clearAllEndpoints();
     });
 
-    it('No CF side nav when no CF connected', () => {
-      expect(nav.isMenuItemPresent(SideNavMenuItem.CloudFoundry)).toBeFalsy();
-    });
+    if (!E2E.customization.alwaysShowNavForEndpointTypes || E2E.customization.alwaysShowNavForEndpointTypes(CF_ENDPOINT_TYPE)) {
+      beforeEach(() => {
+        nav.goto(SideNavMenuItem.CloudFoundry);
+        cloudFoundry.loadingIndicator.waitUntilNotShown();
+      });
+
+      it('should be the Endpoints page', () => {
+        expect(cloudFoundry.isActivePage()).toBeTruthy();
+      });
+
+      it('should show the `no registered endpoints` message', () => {
+        expect(cloudFoundry.hasNoCloudFoundryMessage).toBeTruthy();
+      });
+    } else {
+      it('No CF side nav when no CF connected', () => {
+        expect(nav.isMenuItemPresent(SideNavMenuItem.CloudFoundry)).toBeFalsy();
+      });
+    }
   });
 
   describe('Single endpoint - ', () => {
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 2591e7d680..f8b3ac8198 100644
--- a/src/test-e2e/cloud-foundry/invite-users-e2e.helper.ts
+++ b/src/test-e2e/cloud-foundry/invite-users-e2e.helper.ts
@@ -2,7 +2,7 @@ import { browser, promise } from 'protractor';
 
 import { e2e } from '../e2e';
 import { E2EConfigCloudFoundry } from '../e2e.types';
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { ConsoleUserType } from '../helpers/e2e-helpers';
 import { extendE2ETestTime } from '../helpers/extend-test-helpers';
 import { CFUsersListComponent } from '../po/cf-users-list.po';
diff --git a/src/test-e2e/cloud-foundry/manage-users-by-username-stepper-e2e.spec.ts b/src/test-e2e/cloud-foundry/manage-users-by-username-stepper-e2e.spec.ts
index f72a3d3422..637160d806 100644
--- a/src/test-e2e/cloud-foundry/manage-users-by-username-stepper-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/manage-users-by-username-stepper-e2e.spec.ts
@@ -3,7 +3,7 @@ import { browser, by, element, promise } from 'protractor';
 import { CfUser } from '../../frontend/packages/cloud-foundry/src/store/types/cf-user.types';
 import { APIResource } from '../../frontend/packages/store/src/types/api.types';
 import { e2e } from '../e2e';
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../helpers/e2e-helpers';
 import { UaaHelpers } from '../helpers/uaa-helpers';
 import { CFUsersListComponent } from '../po/cf-users-list.po';
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 75d391ab0c..bef96542b2 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
@@ -1,7 +1,7 @@
 import { browser, by, element, protractor } from 'protractor';
 
 import { e2e } from '../e2e';
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { E2EHelpers } from '../helpers/e2e-helpers';
 import { extendE2ETestTime } from '../helpers/extend-test-helpers';
 import { CFUsersListComponent } from '../po/cf-users-list.po';
diff --git a/src/test-e2e/cloud-foundry/org-level/cf-org-delete-e2e.spec.ts b/src/test-e2e/cloud-foundry/org-level/cf-org-delete-e2e.spec.ts
index a5dca278a6..7ce53760c4 100644
--- a/src/test-e2e/cloud-foundry/org-level/cf-org-delete-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/org-level/cf-org-delete-e2e.spec.ts
@@ -1,10 +1,11 @@
 import { by, element, protractor } from 'protractor';
+
 import { e2e } from '../../e2e';
-import { CFHelpers } from '../../helpers/cf-helpers';
+import { CFHelpers } from '../../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../../helpers/e2e-helpers';
-import { CfTopLevelPage } from '../cf-level/cf-top-level-page.po';
 import { CFPage } from '../../po/cf-page.po';
 import { SideNavMenuItem } from '../../po/side-nav.po';
+import { CfTopLevelPage } from '../cf-level/cf-top-level-page.po';
 
 describe('Delete Organization', () => {
   let e2eSetup;
diff --git a/src/test-e2e/cloud-foundry/org-level/manage-space-quota-e2e.spec.ts b/src/test-e2e/cloud-foundry/org-level/manage-space-quota-e2e.spec.ts
index 52bc96cc41..fe7f699afb 100644
--- a/src/test-e2e/cloud-foundry/org-level/manage-space-quota-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/org-level/manage-space-quota-e2e.spec.ts
@@ -1,7 +1,7 @@
 import { by, element, promise, protractor } from 'protractor';
 
 import { e2e } from '../../e2e';
-import { CFHelpers } from '../../helpers/cf-helpers';
+import { CFHelpers } from '../../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../../helpers/e2e-helpers';
 import { extendE2ETestTime } from '../../helpers/extend-test-helpers';
 import { CfOrgLevelPage } from '../org-level/cf-org-level-page.po';
diff --git a/src/test-e2e/cloud-foundry/org-level/mange-space-e2e.spec.ts b/src/test-e2e/cloud-foundry/org-level/mange-space-e2e.spec.ts
index 89fa38c40c..912202fbcd 100644
--- a/src/test-e2e/cloud-foundry/org-level/mange-space-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/org-level/mange-space-e2e.spec.ts
@@ -1,12 +1,12 @@
 import { by, element, promise, protractor } from 'protractor';
 
 import { e2e } from '../../e2e';
-import { CFHelpers } from '../../helpers/cf-helpers';
+import { CFHelpers } from '../../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../../helpers/e2e-helpers';
+import { TableComponent } from '../../po/table.po';
 import { CfSpaceLevelPage } from '../space-level/cf-space-level-page.po';
 import { CfOrgLevelPage } from './cf-org-level-page.po';
 import { SpaceFormPage } from './space-form-page.po';
-import { TableComponent } from '../../po/table.po';
 
 describe('Manage Space', () => {
   let e2eSetup;
diff --git a/src/test-e2e/cloud-foundry/org-level/org-invite-user-e2e.spec.ts b/src/test-e2e/cloud-foundry/org-level/org-invite-user-e2e.spec.ts
index 429622a891..1248a60dae 100644
--- a/src/test-e2e/cloud-foundry/org-level/org-invite-user-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/org-level/org-invite-user-e2e.spec.ts
@@ -1,5 +1,5 @@
 import { E2EConfigCloudFoundry } from '../../e2e.types';
-import { CFHelpers } from '../../helpers/cf-helpers';
+import { CFHelpers } from '../../helpers/cf-e2e-helpers';
 import { CFPage } from '../../po/cf-page.po';
 import { SideNavMenuItem } from '../../po/side-nav.po';
 import { setupInviteUserTests } from '../invite-users-e2e.helper';
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 1ddf2be05e..799c75d439 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
@@ -4,7 +4,7 @@ import { IOrganization } from '../../../frontend/packages/cloud-foundry/src/cf-a
 import { APIResource } from '../../../frontend/packages/store/src/types/api.types';
 import { e2e } from '../../e2e';
 import { E2EConfigCloudFoundry } from '../../e2e.types';
-import { CFHelpers } from '../../helpers/cf-helpers';
+import { CFHelpers } from '../../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../../helpers/e2e-helpers';
 import { ListComponent } from '../../po/list.po';
 import { CfOrgLevelPage } from './cf-org-level-page.po';
diff --git a/src/test-e2e/cloud-foundry/space-level/cf-space-delete-e2e.spec.ts b/src/test-e2e/cloud-foundry/space-level/cf-space-delete-e2e.spec.ts
index 73f017292f..c6dc55efbc 100644
--- a/src/test-e2e/cloud-foundry/space-level/cf-space-delete-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/space-level/cf-space-delete-e2e.spec.ts
@@ -1,14 +1,15 @@
-import { CfOrgLevelPage } from './../org-level/cf-org-level-page.po';
 import { by, element, protractor } from 'protractor';
+
 import { e2e } from '../../e2e';
-import { CFHelpers } from '../../helpers/cf-helpers';
+import { CFHelpers } from '../../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../../helpers/e2e-helpers';
-import { CfTopLevelPage } from '../cf-level/cf-top-level-page.po';
 import { CFPage } from '../../po/cf-page.po';
-import { SideNavMenuItem } from '../../po/side-nav.po';
+import { ConfirmDialogComponent } from '../../po/confirm-dialog';
 import { ListComponent } from '../../po/list.po';
 import { MetaCardTitleType } from '../../po/meta-card.po';
-import { ConfirmDialogComponent } from '../../po/confirm-dialog';
+import { SideNavMenuItem } from '../../po/side-nav.po';
+import { CfTopLevelPage } from '../cf-level/cf-top-level-page.po';
+import { CfOrgLevelPage } from './../org-level/cf-org-level-page.po';
 
 describe('Delete Space', () => {
   let e2eSetup;
diff --git a/src/test-e2e/cloud-foundry/space-level/cf-space-level-e2e.spec.ts b/src/test-e2e/cloud-foundry/space-level/cf-space-level-e2e.spec.ts
index f7b6095de0..5cd14c362e 100644
--- a/src/test-e2e/cloud-foundry/space-level/cf-space-level-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/space-level/cf-space-level-e2e.spec.ts
@@ -2,7 +2,7 @@ import { by, element, protractor } from 'protractor';
 
 import { e2e } from '../../e2e';
 import { E2EConfigCloudFoundry } from '../../e2e.types';
-import { CFHelpers } from '../../helpers/cf-helpers';
+import { CFHelpers } from '../../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../../helpers/e2e-helpers';
 import { extendE2ETestTime } from '../../helpers/extend-test-helpers';
 import { CFPage } from '../../po/cf-page.po';
diff --git a/src/test-e2e/cloud-foundry/space-level/space-invite-user-e2e.spec.ts b/src/test-e2e/cloud-foundry/space-level/space-invite-user-e2e.spec.ts
index 158dc0d4c5..240dbc453d 100644
--- a/src/test-e2e/cloud-foundry/space-level/space-invite-user-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/space-level/space-invite-user-e2e.spec.ts
@@ -1,7 +1,7 @@
 import { promise } from 'protractor';
 
 import { E2EConfigCloudFoundry } from '../../e2e.types';
-import { CFHelpers } from '../../helpers/cf-helpers';
+import { CFHelpers } from '../../helpers/cf-e2e-helpers';
 import { setupInviteUserTests } from '../invite-users-e2e.helper';
 import { CfSpaceLevelPage } from './cf-space-level-page.po';
 
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 386a8bf593..68a726e99a 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
@@ -4,7 +4,7 @@ import { ISpace } from '../../../frontend/packages/cloud-foundry/src/cf-api.type
 import { APIResource } from '../../../frontend/packages/store/src/types/api.types';
 import { e2e } from '../../e2e';
 import { E2EConfigCloudFoundry } from '../../e2e.types';
-import { CFHelpers } from '../../helpers/cf-helpers';
+import { CFHelpers } from '../../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../../helpers/e2e-helpers';
 import { ListComponent } from '../../po/list.po';
 import { CfSpaceLevelPage } from './cf-space-level-page.po';
diff --git a/src/test-e2e/cloud-foundry/users-list-e2e.helper.ts b/src/test-e2e/cloud-foundry/users-list-e2e.helper.ts
index cb4cf82680..656b0eadb5 100644
--- a/src/test-e2e/cloud-foundry/users-list-e2e.helper.ts
+++ b/src/test-e2e/cloud-foundry/users-list-e2e.helper.ts
@@ -3,7 +3,7 @@ import { protractor } from 'protractor/built/ptor';
 
 import { e2e, E2ESetup } from '../e2e';
 import { E2EConfigCloudFoundry } from '../e2e.types';
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../helpers/e2e-helpers';
 import { extendE2ETestTime } from '../helpers/extend-test-helpers';
 import { CFUsersListComponent, UserRoleChip } from '../po/cf-users-list.po';
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 a449dddd5f..92208e98ff 100644
--- a/src/test-e2e/cloud-foundry/users-removal-e2e.helper.ts
+++ b/src/test-e2e/cloud-foundry/users-removal-e2e.helper.ts
@@ -4,7 +4,7 @@ import { protractor } from 'protractor/built/ptor';
 import { CfUser } from '../../frontend/packages/cloud-foundry/src/store/types/cf-user.types';
 import { APIResource } from '../../frontend/packages/store/src/types/api.types';
 import { e2e } from '../e2e';
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { ConsoleUserType, E2EHelpers } from '../helpers/e2e-helpers';
 import { UaaHelpers } from '../helpers/uaa-helpers';
 import { CFUsersListComponent } from '../po/cf-users-list.po';
diff --git a/src/test-e2e/e2e.ts b/src/test-e2e/e2e.ts
index 49318abf03..a4215aaa53 100644
--- a/src/test-e2e/e2e.ts
+++ b/src/test-e2e/e2e.ts
@@ -1,5 +1,6 @@
 import { browser, promise, protractor } from 'protractor';
 
+import { CustomizationsMetadata } from '../frontend/packages/core/src/core/customizations.types';
 import { ConsoleUserType, E2EHelpers } from './helpers/e2e-helpers';
 import { RequestHelpers } from './helpers/request-helpers';
 import { ResetsHelpers } from './helpers/reset-helpers';
@@ -15,6 +16,13 @@ export class E2E {
   // Turn on debug logging for test helpers
   public static DEBUG_LOGGING = !!process.env.STRATOS_E2E_DEBUG || false;
 
+  /**
+   * Temporary location for customization, we should in future look to fetch this a better way from client side code
+  */
+  public static customization: CustomizationsMetadata = {
+    alwaysShowNavForEndpointTypes: (epType) => true
+  }
+
   // General helpers
   public helper = new E2EHelpers();
 
diff --git a/src/test-e2e/endpoints/endpoints-e2e.spec.ts b/src/test-e2e/endpoints/endpoints-e2e.spec.ts
index db63f8fa7c..c954a5869a 100644
--- a/src/test-e2e/endpoints/endpoints-e2e.spec.ts
+++ b/src/test-e2e/endpoints/endpoints-e2e.spec.ts
@@ -1,14 +1,21 @@
 import { browser } from 'protractor';
 
-import { e2e } from '../e2e';
+import { CF_ENDPOINT_TYPE } from '../../frontend/packages/cloud-foundry/src/cf-types';
+import { ApplicationsPage } from '../applications/applications.po';
+import { CfTopLevelPage } from '../cloud-foundry/cf-level/cf-top-level-page.po';
+import { E2E, e2e } from '../e2e';
 import { ConsoleUserType } from '../helpers/e2e-helpers';
 import { MenuComponent } from '../po/menu.po';
 import { SideNavMenuItem } from '../po/side-nav.po';
 import { SnackBarPo } from '../po/snackbar.po';
+import { ServicesPage } from '../services/services.po';
 import { EndpointsPage } from './endpoints.po';
 
 describe('Endpoints', () => {
   const endpointsPage = new EndpointsPage();
+  const applications = new ApplicationsPage();
+  const services = new ServicesPage();
+  const cloudFoundry = new CfTopLevelPage();
 
   describe('Workflow on log in (admin/non-admin + no endpoints/some endpoints) -', () => {
     describe('As Admin -', () => {
@@ -61,10 +68,26 @@ describe('Endpoints', () => {
           expect(endpointsPage.isActivePage()).toBeTruthy();
         });
 
-        it('No CF side nav when no CF connected', () => {
-          expect(endpointsPage.sideNav.isMenuItemPresent(SideNavMenuItem.CloudFoundry)).toBeFalsy();
-        });
+        if (!E2E.customization.alwaysShowNavForEndpointTypes || E2E.customization.alwaysShowNavForEndpointTypes(CF_ENDPOINT_TYPE)) {
+          it('Should show application wall with \'no clusters\' message', () => {
+            endpointsPage.sideNav.goto(SideNavMenuItem.Applications);
+            expect(applications.hasNoCloudFoundryMessage()).toBeTruthy();
+          });
+
+          it('Should show services view with \'no clusters\' message', () => {
+            endpointsPage.sideNav.goto(SideNavMenuItem.Services);
+            expect(services.hasNoCloudFoundryMessage()).toBeTruthy();
+          });
 
+          it('Should show Cloud Foundry view with \'no clusters\' message', () => {
+            endpointsPage.sideNav.goto(SideNavMenuItem.CloudFoundry);
+            expect(cloudFoundry.hasNoCloudFoundryMessage()).toBeTruthy();
+          });
+        } else {
+          it('No CF side nav when no CF connected', () => {
+            expect(endpointsPage.sideNav.isMenuItemPresent(SideNavMenuItem.CloudFoundry)).toBeFalsy();
+          });
+        }
       });
     });
 
diff --git a/src/test-e2e/helpers/cf-helpers.ts b/src/test-e2e/helpers/cf-e2e-helpers.ts
similarity index 100%
rename from src/test-e2e/helpers/cf-helpers.ts
rename to src/test-e2e/helpers/cf-e2e-helpers.ts
diff --git a/src/test-e2e/marketplace/create-marketplace-service-instance.po.ts b/src/test-e2e/marketplace/create-marketplace-service-instance.po.ts
index 993fed4acf..7be967f6d1 100644
--- a/src/test-e2e/marketplace/create-marketplace-service-instance.po.ts
+++ b/src/test-e2e/marketplace/create-marketplace-service-instance.po.ts
@@ -6,9 +6,17 @@ export class CreateMarketplaceServiceInstance extends Page {
 
   public stepper: CreateServiceInstanceStepper;
 
-  constructor(url = '/services/new/service?base-previous-redirect=%2Fservices%2Fnew') {
+  constructor(url = '/services/new/service') {
     super(url);
     this.stepper = new CreateServiceInstanceStepper();
   }
 
+  isActivePage() {
+    return super.isActivePage(true);
+  }
+
+  waitForPage() {
+    return super.waitForPage(undefined, true);
+  }
+
 }
diff --git a/src/test-e2e/marketplace/create-service-instance-e2e.spec.ts b/src/test-e2e/marketplace/create-service-instance-e2e.spec.ts
index 8c1d7d7ec3..b326fe3f48 100644
--- a/src/test-e2e/marketplace/create-service-instance-e2e.spec.ts
+++ b/src/test-e2e/marketplace/create-service-instance-e2e.spec.ts
@@ -29,10 +29,7 @@ describe('Create Service Instance', () => {
     createServiceInstance.waitForPage();
     createMarketplaceServiceInstance = createServiceInstance.selectMarketplace();
     servicesHelperE2E = new ServicesHelperE2E(e2eSetup, createMarketplaceServiceInstance);
-  });
-
-  it('- should reach create service instance page', () => {
-    expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
+    createMarketplaceServiceInstance.waitForPage();
   });
 
   describe('Long running tests - ', () => {
@@ -40,6 +37,8 @@ describe('Create Service Instance', () => {
     extendE2ETestTime(timeout);
 
     it('- should be able to create a service instance', () => {
+      expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
+
       serviceInstanceName = servicesHelperE2E.createServiceInstanceName();
 
       servicesHelperE2E.createService(e2e.secrets.getDefaultCFEndpoint().services.publicService.name, serviceInstanceName);
@@ -51,16 +50,17 @@ describe('Create Service Instance', () => {
   });
 
   it('- should return user to Service summary when cancelled on CFOrgSpace selection', () => {
+    expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
 
     // Select CF/Org/Space
     servicesHelperE2E.setCfOrgSpace();
     createMarketplaceServiceInstance.stepper.cancel();
 
     servicesWall.waitForPage();
-
   });
 
   it('- should return user to Service summary when cancelled on Service selection', () => {
+    expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
 
     // Select CF/Org/Space
     servicesHelperE2E.setCfOrgSpace();
@@ -77,6 +77,7 @@ describe('Create Service Instance', () => {
   });
 
   it('- should return user to Service summary when cancelled on App binding selection', () => {
+    expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
 
     // Select CF/Org/Space
     servicesHelperE2E.setCfOrgSpace();
@@ -97,6 +98,8 @@ describe('Create Service Instance', () => {
   });
 
   it('- should return user to Service summary when cancelled on service instance details', () => {
+    expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
+
     // Select CF/Org/Space
     servicesHelperE2E.setCfOrgSpace();
     createMarketplaceServiceInstance.stepper.next();
diff --git a/src/test-e2e/marketplace/create-service-instance-private-e2e.spec.ts b/src/test-e2e/marketplace/create-service-instance-private-e2e.spec.ts
index 35716683f9..3f81f5b3f0 100644
--- a/src/test-e2e/marketplace/create-service-instance-private-e2e.spec.ts
+++ b/src/test-e2e/marketplace/create-service-instance-private-e2e.spec.ts
@@ -28,10 +28,7 @@ describe('Create Service Instance of Private Service', () => {
     createServiceInstance.navigateTo();
     createServiceInstance.waitForPage();
     createMarketplaceServiceInstance = createServiceInstance.selectMarketplace();
-  });
-
-  it('- should reach create service instance page', () => {
-    expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
+    createMarketplaceServiceInstance.waitForPage();
   });
 
   describe('Long running tests - ', () => {
@@ -39,6 +36,8 @@ describe('Create Service Instance of Private Service', () => {
     extendE2ETestTime(timeout);
 
     it('- should be able to to create a service instance', () => {
+      expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
+
       serviceInstanceName = servicesHelperE2E.createServiceInstanceName();
 
       servicesHelperE2E.createService(e2e.secrets.getDefaultCFEndpoint().services.privateService.name, serviceInstanceName, false);
@@ -51,6 +50,7 @@ describe('Create Service Instance of Private Service', () => {
   });
 
   it('- should return user to Service summary when cancelled on CFOrgSpace selection', () => {
+    expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
 
     // Select CF/Org/Space
     servicesHelperE2E.setCfOrgSpace();
@@ -61,6 +61,7 @@ describe('Create Service Instance of Private Service', () => {
   });
 
   it('- should return user to Service summary when cancelled on Service selection', () => {
+    expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
 
     // Select CF/Org/Space
     servicesHelperE2E.setCfOrgSpace();
@@ -77,6 +78,7 @@ describe('Create Service Instance of Private Service', () => {
   });
 
   it('- should not show service plan if wrong org/space are selected', () => {
+    expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
 
     // Select CF/Org/Space
     servicesHelperE2E.setCfOrgSpace(e2e.secrets.getDefaultCFEndpoint().services.privateService.invalidOrgName,
diff --git a/src/test-e2e/marketplace/create-service-instance-space-scoped-e2e.spec.ts b/src/test-e2e/marketplace/create-service-instance-space-scoped-e2e.spec.ts
index 612e48cdb1..42a9a2f6c0 100644
--- a/src/test-e2e/marketplace/create-service-instance-space-scoped-e2e.spec.ts
+++ b/src/test-e2e/marketplace/create-service-instance-space-scoped-e2e.spec.ts
@@ -27,11 +27,7 @@ describe('Create Service Instance of Space Scoped Service', () => {
     createServiceInstance.waitForPage();
     createMarketplaceServiceInstance = createServiceInstance.selectMarketplace();
     servicesHelperE2E = new ServicesHelperE2E(e2eSetup, createMarketplaceServiceInstance);
-  });
-
-
-  it('- should reach create service instance page', () => {
-    expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
+    createMarketplaceServiceInstance.waitForPage();
   });
 
   describe('Long running tests - ', () => {
@@ -39,6 +35,8 @@ describe('Create Service Instance of Space Scoped Service', () => {
     extendE2ETestTime(timeout);
 
     it('- should be able to to create a service instance', () => {
+      expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
+
       serviceInstanceName = servicesHelperE2E.createServiceInstanceName();
 
       servicesHelperE2E.createService(e2e.secrets.getDefaultCFEndpoint().services.spaceScopedService.name, serviceInstanceName);
@@ -50,6 +48,7 @@ describe('Create Service Instance of Space Scoped Service', () => {
   });
 
   it('- should not show service plan if wrong org/space are selected', () => {
+    expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
 
     // Select CF/Org/Space
     servicesHelperE2E.setCfOrgSpace(e2e.secrets.getDefaultCFEndpoint().services.spaceScopedService.invalidOrgName,
diff --git a/src/test-e2e/marketplace/create-service-instance.po.ts b/src/test-e2e/marketplace/create-service-instance.po.ts
index ee3b61997e..a4cdc26f0d 100644
--- a/src/test-e2e/marketplace/create-service-instance.po.ts
+++ b/src/test-e2e/marketplace/create-service-instance.po.ts
@@ -1,10 +1,10 @@
-
+import {
+  SERVICE_INSTANCE_TYPES,
+} from '../../frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance-base-step/add-service-instance.types';
 import { Page } from '../po/page.po';
 import { BaseCreateServiceInstanceStepper } from './base-create-service-instance-stepper.po';
 import { CreateMarketplaceServiceInstance } from './create-marketplace-service-instance.po';
-import {
-  SERVICE_INSTANCE_TYPES
-} from '../../frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance-base-step/add-service-instance.types';
+
 
 export class CreateServiceInstance extends Page {
 
@@ -23,4 +23,12 @@ export class CreateServiceInstance extends Page {
     super(url);
   }
 
+  isActivePage() {
+    return super.isActivePage(true);
+  }
+
+  waitForPage() {
+    return super.waitForPage(undefined, true);
+  }
+
 }
diff --git a/src/test-e2e/marketplace/create-service-instances-bind-app-e2e.spec.ts b/src/test-e2e/marketplace/create-service-instances-bind-app-e2e.spec.ts
index 2608a7a66e..91eb24e945 100644
--- a/src/test-e2e/marketplace/create-service-instances-bind-app-e2e.spec.ts
+++ b/src/test-e2e/marketplace/create-service-instances-bind-app-e2e.spec.ts
@@ -30,16 +30,15 @@ describe('Create Service Instance with binding', () => {
     createServiceInstance.waitForPage();
     createMarketplaceServiceInstance = createServiceInstance.selectMarketplace();
     servicesHelperE2E = new ServicesHelperE2E(e2eSetup, createMarketplaceServiceInstance, servicesHelperE2E);
-  });
-
-  it('- should reach create service instance page', () => {
-    expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
+    createMarketplaceServiceInstance.waitForPage();
   });
 
   describe('Long running tests - ', () => {
     extendE2ETestTime(100000);
 
     it('- should be able to to create a service instance with binding', () => {
+      expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
+
       serviceInstanceName = servicesHelperE2E.createServiceInstanceName();
 
       const servicesSecrets = e2e.secrets.getDefaultCFEndpoint().services;
diff --git a/src/test-e2e/marketplace/create-ups-service-instance.po.ts b/src/test-e2e/marketplace/create-ups-service-instance.po.ts
index 70801bb031..55c68241a7 100644
--- a/src/test-e2e/marketplace/create-ups-service-instance.po.ts
+++ b/src/test-e2e/marketplace/create-ups-service-instance.po.ts
@@ -10,4 +10,13 @@ export class CreateUserProvidedServiceInstance extends Page {
     super(url);
     this.stepper = new CreateServiceInstanceStepper();
   }
+
+  isActivePage() {
+    return super.isActivePage(true);
+  }
+
+  waitForPage() {
+    return super.waitForPage(undefined, true);
+  }
+
 }
diff --git a/src/test-e2e/marketplace/delete-service-instance-e2e.spec.ts b/src/test-e2e/marketplace/delete-service-instance-e2e.spec.ts
index 98300f1425..aa74438545 100644
--- a/src/test-e2e/marketplace/delete-service-instance-e2e.spec.ts
+++ b/src/test-e2e/marketplace/delete-service-instance-e2e.spec.ts
@@ -1,16 +1,16 @@
 import { e2e } from '../e2e';
 import { ConsoleUserType } from '../helpers/e2e-helpers';
 import { extendE2ETestTime } from '../helpers/extend-test-helpers';
+import { ConfirmDialogComponent } from '../po/confirm-dialog';
+import { ListComponent } from '../po/list.po';
+import { MetaCardTitleType } from '../po/meta-card.po';
 import { CreateMarketplaceServiceInstance } from './create-marketplace-service-instance.po';
 import { CreateServiceInstance } from './create-service-instance.po';
 import { ServicesHelperE2E } from './services-helper-e2e';
 import { ServicesWallPage } from './services-wall.po';
-import { ConfirmDialogComponent } from '../po/confirm-dialog';
-import { MetaCardTitleType } from '../po/meta-card.po';
-import { ListComponent } from '../po/list.po';
 
 // Regression test for:
-// - Deleting a service instance in the services list will delete the service but the list incorerctly shows no services
+// - Deleting a service instance in the services list will delete the service but the list incorrectly shows no services
 describe('Delete Service Instance', () => {
   const createServiceInstance = new CreateServiceInstance();
   let createMarketplaceServiceInstance: CreateMarketplaceServiceInstance;
@@ -41,13 +41,12 @@ describe('Delete Service Instance', () => {
     createServiceInstance.waitForPage();
     createMarketplaceServiceInstance = createServiceInstance.selectMarketplace();
     servicesHelperE2E = new ServicesHelperE2E(e2eSetup, createMarketplaceServiceInstance);
+    createMarketplaceServiceInstance.waitForPage();
   });
 
-  it('should go to create service instance view', () => {
+  it('should be able to create a service instance', () => {
     expect(createMarketplaceServiceInstance.isActivePage()).toBeTruthy();
-  });
 
-  it('should be able to create a service instance', () => {
     const serviceInstanceName = servicesHelperE2E.createServiceInstanceName();
     names.push(serviceInstanceName);
     servicesHelperE2E.createService(e2e.secrets.getDefaultCFEndpoint().services.publicService.name, serviceInstanceName);
diff --git a/src/test-e2e/marketplace/delete-ups-service-instance-e2e.spec.ts b/src/test-e2e/marketplace/delete-ups-service-instance-e2e.spec.ts
index eff4c5be7e..112dec4037 100644
--- a/src/test-e2e/marketplace/delete-ups-service-instance-e2e.spec.ts
+++ b/src/test-e2e/marketplace/delete-ups-service-instance-e2e.spec.ts
@@ -1,13 +1,13 @@
 import { e2e } from '../e2e';
 import { ConsoleUserType } from '../helpers/e2e-helpers';
 import { extendE2ETestTime } from '../helpers/extend-test-helpers';
-import { CreateServiceInstance } from './create-service-instance.po';
-import { ServicesHelperE2E } from './services-helper-e2e';
-import { ServicesWallPage } from './services-wall.po';
 import { ConfirmDialogComponent } from '../po/confirm-dialog';
-import { MetaCardTitleType } from '../po/meta-card.po';
 import { ListComponent } from '../po/list.po';
+import { MetaCardTitleType } from '../po/meta-card.po';
+import { CreateServiceInstance } from './create-service-instance.po';
 import { CreateUserProvidedServiceInstance } from './create-ups-service-instance.po';
+import { ServicesHelperE2E } from './services-helper-e2e';
+import { ServicesWallPage } from './services-wall.po';
 
 describe('Delete Service Instance (User Provided Service)', () => {
   const createServiceInstance = new CreateServiceInstance();
diff --git a/src/test-e2e/marketplace/edit-service-instance-e2e.spec.ts b/src/test-e2e/marketplace/edit-service-instance-e2e.spec.ts
index af583a4409..a169e8ab19 100644
--- a/src/test-e2e/marketplace/edit-service-instance-e2e.spec.ts
+++ b/src/test-e2e/marketplace/edit-service-instance-e2e.spec.ts
@@ -65,7 +65,10 @@ describe('Edit Service Instance', () => {
         menu.waitUntilNotShown();
 
         return browser.getCurrentUrl().then(url => {
-          expect(url.endsWith('edit')).toBeTruthy();
+          const query = url.indexOf('?');
+          const urlWithoutQuery = query >= 0 ? url.substring(0, query) : url;
+          expect(urlWithoutQuery.endsWith('edit')).toBeTruthy();
+
           servicesHelperE2E.setServicePlan(true);
           servicesHelperE2E.createServiceInstance.stepper.next();
 
diff --git a/src/test-e2e/marketplace/marketplace-create-service-instances-e2e.spec.ts b/src/test-e2e/marketplace/marketplace-create-service-instances-e2e.spec.ts
index d520f0da8f..a20621fcfb 100644
--- a/src/test-e2e/marketplace/marketplace-create-service-instances-e2e.spec.ts
+++ b/src/test-e2e/marketplace/marketplace-create-service-instances-e2e.spec.ts
@@ -4,6 +4,7 @@ import { e2e, E2ESetup } from '../e2e';
 import { ConsoleUserType } from '../helpers/e2e-helpers';
 import { extendE2ETestTime } from '../helpers/extend-test-helpers';
 import { CreateMarketplaceServiceInstance } from './create-marketplace-service-instance.po';
+import { MarketplaceInstancesPage } from './marketplace-instances.po';
 import { MarketplaceSummaryPage } from './marketplace-summary.po';
 import { ServicesHelperE2E } from './services-helper-e2e';
 import { ServicesWallPage } from './services-wall.po';
@@ -11,6 +12,7 @@ import { ServicesWallPage } from './services-wall.po';
 describe('Service Instance from Marketplace', () => {
   let setup: E2ESetup;
   const servicesWall = new ServicesWallPage();
+  let servicesInstances: MarketplaceInstancesPage;
   const timeout = 60000;
   let serviceInstanceName: string;
 
@@ -29,7 +31,6 @@ describe('Service Instance from Marketplace', () => {
     beforeAll(() => init(setup, serviceName).then(res => {
       servicesHelperE2E = res.servicesHelper;
       marketplaceSummaryPage = res.summaryPage;
-
     }));
 
     beforeEach(() => {
@@ -37,10 +38,6 @@ describe('Service Instance from Marketplace', () => {
       marketplaceSummaryPage.waitForPage();
     });
 
-    it('- should have an Add Service Instance button', () => {
-      expect(marketplaceSummaryPage.getAddServiceInstanceButton().isPresent()).toBeTruthy();
-    });
-
     describe('Long running test', () => {
       extendE2ETestTime(timeout);
       it('- should be able to create a new service instance', () => {
@@ -66,10 +63,6 @@ describe('Service Instance from Marketplace', () => {
       marketplaceSummaryPage.waitForPage();
     });
 
-    it('- should have an Add Service Instance button', () => {
-      expect(marketplaceSummaryPage.getAddServiceInstanceButton().isPresent()).toBeTruthy();
-    });
-
     describe('Long running test', () => {
       extendE2ETestTime(timeout);
       it('- should be able to create a new service instance', () => {
@@ -95,11 +88,8 @@ describe('Service Instance from Marketplace', () => {
       marketplaceSummaryPage.waitForPage();
     });
 
-    it('- should have an Add Service Instance button', () => {
-      expect(marketplaceSummaryPage.getAddServiceInstanceButton().isPresent()).toBeTruthy();
-    });
-
     describe('Long running test', () => {
+
       extendE2ETestTime(timeout);
       it('- should be able to create a new service instance', () => {
         serviceInstanceName = servicesHelperE2E.createServiceInstanceName();
@@ -109,48 +99,46 @@ describe('Service Instance from Marketplace', () => {
 
     afterAll(() => servicesHelperE2E.cleanUpServiceInstance(serviceInstanceName));
   });
-});
-
-function createService(
-  marketplaceSummaryPage: MarketplaceSummaryPage,
-  servicesHelperE2E: ServicesHelperE2E,
-  serviceName: string,
-  servicesWall: ServicesWallPage,
-  serviceInstanceName: string
-) {
-  const button = marketplaceSummaryPage.header.getIconButton('add');
-  expect(button).toBeDefined();
-  button.then(bt => bt.click());
-  browser.getCurrentUrl().then(url => {
-    expect(url.endsWith('create?isSpaceScoped=false')).toBeTruthy();
-    // Proceed to create a service instance
-    servicesHelperE2E.createService(serviceName, serviceInstanceName, true);
-
-    servicesWall.waitForPage();
-
-    servicesHelperE2E.getServiceCardWithTitle(servicesWall.serviceInstancesList, serviceInstanceName);
-
-  });
-}
-
-function init(
-  setup: E2ESetup,
-  serviceName: string,
-  spaceScoped = false
-) {
-  const defaultCf = e2e.secrets.getDefaultCFEndpoint();
-  const endpointGuid = e2e.helper.getEndpointGuid(e2e.info, defaultCf.name);
-
-  const servicesHelperE2E = new ServicesHelperE2E(setup);
-  return servicesHelperE2E.fetchServices(endpointGuid).then(response => {
-    serviceName = e2e.secrets.getDefaultCFEndpoint().services.publicService.name;
-    const service = response.resources.find(e => e.entity.label === serviceName);
-    const serviceGuid = service.metadata.guid;
-    servicesHelperE2E.setCreateServiceInstance(
-      new CreateMarketplaceServiceInstance('/marketplace/' + endpointGuid + '/' + serviceGuid +
-        '/create?isSpaceScoped=' + (spaceScoped ? 'true' : 'false')));
-    const marketplaceSummaryPage = new MarketplaceSummaryPage(endpointGuid, serviceGuid);
-    return { servicesHelper: servicesHelperE2E, summaryPage: marketplaceSummaryPage };
-  });
-}
 
+  function createService(
+    marketplaceSummaryPage: MarketplaceSummaryPage,
+    servicesHelperE2E: ServicesHelperE2E,
+    serviceName: string,
+    servicesWall: ServicesWallPage,
+    serviceInstanceName: string
+  ) {
+    expect(marketplaceSummaryPage.getAddServiceInstanceButton().isPresent()).toBeTruthy();
+    marketplaceSummaryPage.getAddServiceInstanceButton().click();
+    servicesHelperE2E.createServiceInstance.waitForPage();
+    browser.getCurrentUrl().then(url => {
+      expect(url.indexOf('isSpaceScoped=false') >= 0).toBeTruthy();
+      // Proceed to create a service instance
+      servicesHelperE2E.createService(serviceName, serviceInstanceName, true);
+
+      servicesInstances.waitForPage();
+      servicesInstances.list.header.setSearchText(serviceInstanceName);
+      servicesInstances.list.table.findRow('name', serviceInstanceName, true);
+    });
+  }
+
+  function init(
+    setup: E2ESetup,
+    serviceName: string,
+  ) {
+    const defaultCf = e2e.secrets.getDefaultCFEndpoint();
+    const endpointGuid = e2e.helper.getEndpointGuid(e2e.info, defaultCf.name);
+
+    const servicesHelperE2E = new ServicesHelperE2E(setup);
+    return servicesHelperE2E.fetchServices(endpointGuid).then(response => {
+      serviceName = e2e.secrets.getDefaultCFEndpoint().services.publicService.name;
+      const service = response.resources.find(e => e.entity.label === serviceName);
+      const serviceGuid = service.metadata.guid;
+      servicesHelperE2E.setCreateServiceInstance(
+        new CreateMarketplaceServiceInstance('/marketplace/' + endpointGuid + '/' + serviceGuid + '/create')
+      );
+      servicesInstances = new MarketplaceInstancesPage(endpointGuid, serviceGuid);
+      const marketplaceSummaryPage = new MarketplaceSummaryPage(endpointGuid, serviceGuid);
+      return { servicesHelper: servicesHelperE2E, summaryPage: marketplaceSummaryPage };
+    });
+  }
+});
diff --git a/src/test-e2e/marketplace/marketplace-instances.po.ts b/src/test-e2e/marketplace/marketplace-instances.po.ts
new file mode 100644
index 0000000000..7dc3791d3e
--- /dev/null
+++ b/src/test-e2e/marketplace/marketplace-instances.po.ts
@@ -0,0 +1,11 @@
+import { ListComponent } from '../po/list.po';
+import { Page } from '../po/page.po';
+
+export class MarketplaceInstancesPage extends Page {
+  public list = new ListComponent();
+
+  constructor(cfGuid: string, serviceGuid: string) {
+    super(`/marketplace/${cfGuid}/${serviceGuid}/instances`);
+  }
+
+}
diff --git a/src/test-e2e/marketplace/marketplace-summary-e2e.spec.ts b/src/test-e2e/marketplace/marketplace-summary-e2e.spec.ts
index c48a61a7eb..c3aac96883 100644
--- a/src/test-e2e/marketplace/marketplace-summary-e2e.spec.ts
+++ b/src/test-e2e/marketplace/marketplace-summary-e2e.spec.ts
@@ -1,7 +1,8 @@
-import { MarketplaceSummaryPage } from './marketplace-summary.po';
-import { ConsoleUserType } from '../helpers/e2e-helpers';
-import { e2e } from '../e2e';
 import { browser } from 'protractor';
+
+import { e2e } from '../e2e';
+import { ConsoleUserType } from '../helpers/e2e-helpers';
+import { MarketplaceSummaryPage } from './marketplace-summary.po';
 import { ServicesHelperE2E } from './services-helper-e2e';
 
 describe('Marketplace Summary', () => {
@@ -56,7 +57,7 @@ describe('Marketplace Summary', () => {
       expect(button).toBeDefined();
       button.then(bt => bt.click());
       browser.getCurrentUrl().then(url => {
-        expect(url.endsWith('create?isSpaceScoped=false')).toBeTruthy();
+        expect(url.indexOf('create?isSpaceScoped=false') >= 0).toBeTruthy();
       });
     });
   });
diff --git a/src/test-e2e/marketplace/marketplace-summary.po.ts b/src/test-e2e/marketplace/marketplace-summary.po.ts
index 1f1ffe0c5f..1fc186e42d 100644
--- a/src/test-e2e/marketplace/marketplace-summary.po.ts
+++ b/src/test-e2e/marketplace/marketplace-summary.po.ts
@@ -23,4 +23,5 @@ export class MarketplaceSummaryPage extends Page {
     return element(by.name('add-service-instance'));
   }
 
+
 }
diff --git a/src/test-e2e/marketplace/services-helper-e2e.ts b/src/test-e2e/marketplace/services-helper-e2e.ts
index 7e358eb5f8..00186196e9 100644
--- a/src/test-e2e/marketplace/services-helper-e2e.ts
+++ b/src/test-e2e/marketplace/services-helper-e2e.ts
@@ -4,7 +4,7 @@ import { IServiceInstance } from '../../frontend/packages/cloud-foundry/src/cf-a
 import { CFResponse, createEmptyCfResponse } from '../../frontend/packages/cloud-foundry/src/store/types/cf-api.types';
 import { APIResource } from '../../frontend/packages/store/src/types/api.types';
 import { e2e, E2ESetup } from '../e2e';
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { CFRequestHelpers } from '../helpers/cf-request-helpers';
 import { E2EHelpers } from '../helpers/e2e-helpers';
 import { ListComponent } from '../po/list.po';
@@ -65,7 +65,7 @@ export class ServicesHelperE2E {
 
   deleteServiceInstance = (cfGuid: string, serviceGuid: string, userProvided = false): promise.Promise<CFResponse> => {
     const id = `${cfGuid}:${serviceGuid}`;
-    const url = userProvided ?`user_provided_service_instances/${serviceGuid}?async=false&recursive=true` : `service_instances/${serviceGuid}?async=false&recursive=true`;
+    const url = userProvided ? `user_provided_service_instances/${serviceGuid}?async=false&recursive=true` : `service_instances/${serviceGuid}?async=false&recursive=true`;
     return this.cfRequestHelper.sendCfDelete(
       cfGuid,
       url
diff --git a/src/test-e2e/marketplace/services-wall-e2e.spec.ts b/src/test-e2e/marketplace/services-wall-e2e.spec.ts
index 1fa6c985d8..398471326f 100644
--- a/src/test-e2e/marketplace/services-wall-e2e.spec.ts
+++ b/src/test-e2e/marketplace/services-wall-e2e.spec.ts
@@ -128,8 +128,11 @@ describe('Service Instances Wall', () => {
         expect(editMenuItem.getText()).toEqual('Edit');
         expect(editMenuItem.isEnabled()).toBeTruthy();
         editMenuItem.click();
+
         browser.getCurrentUrl().then(url => {
-          expect(url.endsWith('edit')).toBeTruthy();
+          const query = url.indexOf('?');
+          const urlWithoutQuery = query >= 0 ? url.substring(0, query) : url;
+          expect(urlWithoutQuery.endsWith('edit')).toBeTruthy();
         });
         const createMarketplaceServiceInstance = new CreateMarketplaceServiceInstance();
         createMarketplaceServiceInstance.stepper.cancel();
diff --git a/src/test-e2e/marketplace/services-wall.po.ts b/src/test-e2e/marketplace/services-wall.po.ts
index 9f1229751a..c61219b05c 100644
--- a/src/test-e2e/marketplace/services-wall.po.ts
+++ b/src/test-e2e/marketplace/services-wall.po.ts
@@ -1,4 +1,4 @@
-import { ElementArrayFinder, ElementFinder, promise, element, by } from 'protractor';
+import { by, element, ElementArrayFinder, ElementFinder, promise } from 'protractor';
 
 import { ListComponent } from '../po/list.po';
 import { MetaCard, MetaCardTitleType } from '../po/meta-card.po';
@@ -43,4 +43,12 @@ export class ServicesWallPage extends Page {
       applicationsAttached: items[3].value,
     }));
   }
+
+  isActivePage() {
+    return super.isActivePage(true);
+  }
+
+  waitForPage() {
+    return super.waitForPage(undefined, true);
+  }
 }
diff --git a/src/test-e2e/po/invite-users-stepper.po.ts b/src/test-e2e/po/invite-users-stepper.po.ts
index 5945d300c0..5530ba09de 100644
--- a/src/test-e2e/po/invite-users-stepper.po.ts
+++ b/src/test-e2e/po/invite-users-stepper.po.ts
@@ -1,6 +1,6 @@
 import { by, promise } from 'protractor';
 
-import { CFHelpers } from '../helpers/cf-helpers';
+import { CFHelpers } from '../helpers/cf-e2e-helpers';
 import { E2EHelpers } from '../helpers/e2e-helpers';
 import { RadioGroup } from './radio-group.po';
 import { SnackBarPo } from './snackbar.po';
diff --git a/src/test-e2e/po/page.po.ts b/src/test-e2e/po/page.po.ts
index 533bc147cd..c7bc7d919a 100644
--- a/src/test-e2e/po/page.po.ts
+++ b/src/test-e2e/po/page.po.ts
@@ -43,13 +43,11 @@ export abstract class Page {
     return browser.get(this.navLink);
   }
 
-  isActivePage(): promise.Promise<boolean> {
-    return browser.getCurrentUrl().then(url => url === this.getUrl());
-  }
-
-  isActivePageOrChildPage(): promise.Promise<boolean> {
+  isActivePage(ignoreQuery = false): promise.Promise<boolean> {
     return browser.getCurrentUrl().then(url => {
-      return url.startsWith(this.getUrl());
+      const browserUrl = ignoreQuery ? this.stripQuery(url) : url;
+      const expectedUrl = ignoreQuery ? this.stripQuery(this.getUrl()) : this.getUrl();
+      return browserUrl === expectedUrl;
     });
   }
 
@@ -62,9 +60,15 @@ export abstract class Page {
     });
   }
 
-  waitForPage(timeout = 20000) {
+  waitForPage(timeout = 20000, ignoreQuery = false) {
     expect(this.navLink.startsWith('/')).toBeTruthy('navLink should start with a /');
-    return browser.wait(until.urlIs(this.getUrl()), timeout, `Failed to wait for page with navlink '${this.navLink}'`);
+    if (ignoreQuery) {
+      return browser.wait(() => {
+        return this.isActivePage(true);
+      });
+    } else {
+      return browser.wait(until.urlIs(this.getUrl()), timeout, `Failed to wait for page with navlink '${this.navLink}'`);
+    }
   }
 
   waitForPageDataLoaded(timeout = 20000) {
@@ -82,4 +86,9 @@ export abstract class Page {
     browser.wait(until.urlContains(browser.baseUrl + this.navLink + childPath), 20000);
   }
   private getUrl = () => browser.baseUrl + this.navLink;
+
+  private stripQuery(url: string): string {
+    const queryStarts = url.indexOf('?');
+    return queryStarts >= 0 ? url.substring(0, queryStarts) : url;
+  }
 }
diff --git a/src/tsconfig.json b/src/tsconfig.json
index acd4416c47..e1e22ea606 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -30,8 +30,10 @@
     ],
     "preserveSymlinks": true,
     "paths": {
+      "@stratosui/core": ["frontend/packages/core/src/public-api.ts"],
       "@stratosui/store": ["frontend/packages/store/src/public-api.ts"],
-      "@stratosui/store/testing": ["frontend/packages/store/testing/public-api.ts"]
-    }    
+      "@stratosui/store/testing": ["frontend/packages/store/testing/public-api.ts"],
+      "@example/extensions": ["frontend/packages/example-extensions/src/public-api.ts"]
+    }
   }
-}
\ No newline at end of file
+}

From 669b40ed3e34d8c66282448868371afbe3c01745 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Mon, 29 Jun 2020 12:40:54 +0100
Subject: [PATCH 554/648] Merge upstream (#400)

* WIP

* Add theme migration

* File moves

* WIP

* Add theme migration

* Start to make core a separate library

* Tweaks

* WIP

* Fix package imports

* Fix migration script

* First pass at permission effects

* Fix merge issues

* First pass at reducer

* Tidy up logging

* Fix dark theme support

* Final set of cloud-foundry code out of common

* TIdy up and get themable packages working

* Tidy up custom build code

* Tidy ups

* Set defaults when no stratos.yaml file is present

* FIx migrate script for when stratos.yaml not present

* Remove comments

* Disable scss linter from code climate

* Rejig example extensions to be a package for v4 build

* Renames, todos

* Minor fixes

* Fix frontend unit test

* Fix removed e2e target

* Fix unit tests

* Tweaks

* Finish todos

* Fix transition from space summary to app summary page
- an entity service for a space with no org was cached by guid
- an entity service for a space requiring org used cached version
- solution is to make cache id include schema key (determines with/without org)

* Add comment, tidy up rootUpdatingKey

* Fix issue where gitlab summary tab threw errors in console
- fixes #4325

* Push combine of permission configs into checkers
- overcomes some weird change of permission type

* Fix issue where default add/remove setting in change role by username was incorrect
- add/remove radio button default value governed by add/remove feature flags
- when one is set to false the radio button should be disabled and the other selected

* Fix store-test-helper

* Update readme following move to Travis-ci.com

* Ensure the correct key is used metacard favourite info (#4321)

* Fix display of details in endpoint card in endpoint list (#4319)

* Clean default/blocked logic

* Rename @stratos to @stratosui

* FIx references in tsconfig.json

* Revert change to @stratosui in code

* Revert change to @stratosui in code

* Fix endpoint connect

* Fix unit test

* Fix e2e test

* Change following review #1

* Bump github.com/gorilla/websocket from 1.4.1 to 1.4.2 in /src/jetstream (#4199)

* Bump github.com/gorilla/websocket from 1.4.1 to 1.4.2 in /src/jetstream

Bumps [github.com/gorilla/websocket](https://github.com/gorilla/websocket) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/gorilla/websocket/releases)
- [Commits](https://github.com/gorilla/websocket/compare/v1.4.1...v1.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Update go.sum

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>

* Fix errors in console log during setup screens

* Helm: Change default image pull policy to Always

* Add copy address and edit to endpoint list view

* Use icon that is less confusing with refresh

* Change following review #2
- Fix cf package module file name
- Make CUSTOM_USER_PERMISSION_CHECKERS optional
- Remove need to inject CUSTOM_USER_PERMISSION_CHECKERS in multiple cf modules

* Add newline at end for codeclimate

* Tidy up code and add some more comments

* Fix for buildpack filename wrapping on card

* Fix code climate issue

* Fix compilation issues

* Update endpoint-list.helpers.ts

* Improve naming

* Tidy up

* Update .gitignore

* Tidy up. Build tools in dist/tools

* Change following review

* Rename tools to devkit. Add schematics

* More improvements and theme schematic added.

* Bump gopkg.in/yaml.v2 from 2.2.8 to 2.3.0 in /src/jetstream (#4336)

* Bump gopkg.in/yaml.v2 from 2.2.8 to 2.3.0 in /src/jetstream

Bumps [gopkg.in/yaml.v2](https://github.com/go-yaml/yaml) from 2.2.8 to 2.3.0.
- [Release notes](https://github.com/go-yaml/yaml/releases)
- [Commits](https://github.com/go-yaml/yaml/compare/v2.2.8...v2.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* CI bump

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil_macdougall@hotmail.com>

* Remove unused import

* Remove unused import

* [Security] Bump websocket-extensions from 0.1.3 to 0.1.4 (#4356)

Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. **This update includes a security fix.**
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Hide deployment info card if not space developer
- fixes #4322

* Only space developers can create/unmap/delete routes in app routes table
- fixes #4324

* Only Space Developers should be able to change count, terminate or ssh to instances
- fixes #4330

* Permissions: Only Space Developers should be able to create/edit/delete an Autoscaler policy
- fixes #4323

* Users with no developer roles could click on add app button
- fixes #4361

* Fix tests

* Fail CI build if imagelist generation fails

* Org Managers: Disable org role checkboxes in roles stepper if not admin/org manager
- fixes #4332

* Routes List: Filter by org breaks when user is an org auditor
- fixes #4343

* Rename the e2e cf helper file

* Fix autoscaler tab

* Changes following review

* A few minor tidy-ups to help with review

* Fix several space developer permission bugs (#4362)

* Hide deployment info card if not space developer
- fixes #4322

* Only space developers can create/unmap/delete routes in app routes table
- fixes #4324

* Only Space Developers should be able to change count, terminate or ssh to instances
- fixes #4330

* Permissions: Only Space Developers should be able to create/edit/delete an Autoscaler policy
- fixes #4323

* Users with no developer roles could click on add app button
- fixes #4361

* Fix tests

* Fix autoscaler tab

* Changes following review

* Fix service stepper navigation (#4366)

* Fix service stepper navigation on create/edit cancel/sumbit
- create service stepper from app service tab, marketplace service summary, service wall
- edit service stepper from marketplace service instances, service wall instances, space service instances and app service instances lists
- fixes #4052, contrinbutes to #4079, #4051

* Fix subscription leak
- fixes #4295
- code no-longer needed

* Force return location of service stepper, fix table edit of upsi and other improvements

* Fix unit tests

* Fix e2e tests

* Fix e2e tests, add search to marketplace service instances table

* Changes following review

* Move base-entity-* to store package

* Add snackbar

* Remove pathget

* Remove more store -> core dependencies

* Move extension-types to store

* Move favourite mgr and helper from core to store

* Move user fav manager and helper to store package

* More references

* Fix logger service removal

* Fix build

* Address PR feedback

* Fix LoggerService after code moves

* Fix logger service ref

* Fix build issues

* Fix health check import

* Move sortStringify (only used once)

* NonOptionalKeys - only used once

* Move KnownKeys

* Move BrowserStandardEncoder

* Remove last environment link

* Move favourite config mapper

* Remove dependency on StratosScopeStrings

* Move BaseEndpointAuth

* Move StratosTheme

* Move ThemeService

* Move types from utils.service that are only used once in store

* Move PermissionValues

* Move http and jetstream helpers

* Move StyleService

* Move MetricQueryType

* Move getFullEndpointApiUrl

* Move StratosStatus

* Move generateStratosEntities back to core

* Finish store -> core sep

* Address PR feedback

* Fix compilation issue

* Fix merge weirdness

* Merge downstream (#4369)

* src based changes

* changes to ./build

* ./docs

* ./

* Changes following review

* Address PR feedback

* fix build

* whitespace changes

* Fix in core public-api after merge

* Fix duplicated k8s docs

* Typed access to actions and entities via catalog entity: Core Stratos Entities (#4387)

* WIP

* WIP

* WIP

* Endpoint changes

* Fix failure handling during connect on stepper

* Fix favourites

* Removed some TODOs

* Fixes & todos

* Unit test fixes

* Fixes following merge

* Fix cf unit tests

* Changes following review

* Theming improvements for header

* Tweaks, Migration Script Docs & Notes on others (#4389)

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

* Build devkit outside of dist folder

* Ignore example packages when there's a stratos config file

* Add dist-devkit to git ignore

* Changes following review

* Revert change needed downstream... (only needed when suse extension is included)

* Fix after merge

Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil_macdougall@hotmail.com>

From 767b9c592948228a91140499f59495b27dd7722c Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Mon, 29 Jun 2020 15:28:33 +0100
Subject: [PATCH 555/648] Merge upstream (#402)

* WIP

* Add theme migration

* File moves

* WIP

* Add theme migration

* Start to make core a separate library

* Tweaks

* WIP

* Fix package imports

* Fix migration script

* First pass at permission effects

* Fix merge issues

* First pass at reducer

* Tidy up logging

* Fix dark theme support

* Final set of cloud-foundry code out of common

* TIdy up and get themable packages working

* Tidy up custom build code

* Tidy ups

* Set defaults when no stratos.yaml file is present

* FIx migrate script for when stratos.yaml not present

* Remove comments

* Disable scss linter from code climate

* Rejig example extensions to be a package for v4 build

* Renames, todos

* Minor fixes

* Fix frontend unit test

* Fix removed e2e target

* Fix unit tests

* Tweaks

* Finish todos

* Fix transition from space summary to app summary page
- an entity service for a space with no org was cached by guid
- an entity service for a space requiring org used cached version
- solution is to make cache id include schema key (determines with/without org)

* Add comment, tidy up rootUpdatingKey

* Fix issue where gitlab summary tab threw errors in console
- fixes #4325

* Push combine of permission configs into checkers
- overcomes some weird change of permission type

* Fix issue where default add/remove setting in change role by username was incorrect
- add/remove radio button default value governed by add/remove feature flags
- when one is set to false the radio button should be disabled and the other selected

* Fix store-test-helper

* Update readme following move to Travis-ci.com

* Ensure the correct key is used metacard favourite info (#4321)

* Fix display of details in endpoint card in endpoint list (#4319)

* Clean default/blocked logic

* Rename @stratos to @stratosui

* FIx references in tsconfig.json

* Revert change to @stratosui in code

* Revert change to @stratosui in code

* Fix endpoint connect

* Fix unit test

* Fix e2e test

* Change following review #1

* Bump github.com/gorilla/websocket from 1.4.1 to 1.4.2 in /src/jetstream (#4199)

* Bump github.com/gorilla/websocket from 1.4.1 to 1.4.2 in /src/jetstream

Bumps [github.com/gorilla/websocket](https://github.com/gorilla/websocket) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/gorilla/websocket/releases)
- [Commits](https://github.com/gorilla/websocket/compare/v1.4.1...v1.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Update go.sum

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>

* Fix errors in console log during setup screens

* Helm: Change default image pull policy to Always

* Add copy address and edit to endpoint list view

* Use icon that is less confusing with refresh

* Change following review #2
- Fix cf package module file name
- Make CUSTOM_USER_PERMISSION_CHECKERS optional
- Remove need to inject CUSTOM_USER_PERMISSION_CHECKERS in multiple cf modules

* Add newline at end for codeclimate

* Tidy up code and add some more comments

* Fix for buildpack filename wrapping on card

* Fix code climate issue

* Fix compilation issues

* Update endpoint-list.helpers.ts

* Improve naming

* Tidy up

* Update .gitignore

* Tidy up. Build tools in dist/tools

* Change following review

* Rename tools to devkit. Add schematics

* More improvements and theme schematic added.

* Bump gopkg.in/yaml.v2 from 2.2.8 to 2.3.0 in /src/jetstream (#4336)

* Bump gopkg.in/yaml.v2 from 2.2.8 to 2.3.0 in /src/jetstream

Bumps [gopkg.in/yaml.v2](https://github.com/go-yaml/yaml) from 2.2.8 to 2.3.0.
- [Release notes](https://github.com/go-yaml/yaml/releases)
- [Commits](https://github.com/go-yaml/yaml/compare/v2.2.8...v2.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* CI bump

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil_macdougall@hotmail.com>

* Remove unused import

* Remove unused import

* [Security] Bump websocket-extensions from 0.1.3 to 0.1.4 (#4356)

Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. **This update includes a security fix.**
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Hide deployment info card if not space developer
- fixes #4322

* Only space developers can create/unmap/delete routes in app routes table
- fixes #4324

* Only Space Developers should be able to change count, terminate or ssh to instances
- fixes #4330

* Permissions: Only Space Developers should be able to create/edit/delete an Autoscaler policy
- fixes #4323

* Users with no developer roles could click on add app button
- fixes #4361

* Fix tests

* Fail CI build if imagelist generation fails

* Org Managers: Disable org role checkboxes in roles stepper if not admin/org manager
- fixes #4332

* Routes List: Filter by org breaks when user is an org auditor
- fixes #4343

* Rename the e2e cf helper file

* Fix autoscaler tab

* Changes following review

* A few minor tidy-ups to help with review

* Fix several space developer permission bugs (#4362)

* Hide deployment info card if not space developer
- fixes #4322

* Only space developers can create/unmap/delete routes in app routes table
- fixes #4324

* Only Space Developers should be able to change count, terminate or ssh to instances
- fixes #4330

* Permissions: Only Space Developers should be able to create/edit/delete an Autoscaler policy
- fixes #4323

* Users with no developer roles could click on add app button
- fixes #4361

* Fix tests

* Fix autoscaler tab

* Changes following review

* Fix service stepper navigation (#4366)

* Fix service stepper navigation on create/edit cancel/sumbit
- create service stepper from app service tab, marketplace service summary, service wall
- edit service stepper from marketplace service instances, service wall instances, space service instances and app service instances lists
- fixes #4052, contrinbutes to #4079, #4051

* Fix subscription leak
- fixes #4295
- code no-longer needed

* Force return location of service stepper, fix table edit of upsi and other improvements

* Fix unit tests

* Fix e2e tests

* Fix e2e tests, add search to marketplace service instances table

* Changes following review

* Move base-entity-* to store package

* Add snackbar

* Remove pathget

* Remove more store -> core dependencies

* Move extension-types to store

* Move favourite mgr and helper from core to store

* Move user fav manager and helper to store package

* More references

* Fix logger service removal

* Fix build

* Address PR feedback

* Fix LoggerService after code moves

* Fix logger service ref

* Fix build issues

* Fix health check import

* Move sortStringify (only used once)

* NonOptionalKeys - only used once

* Move KnownKeys

* Move BrowserStandardEncoder

* Remove last environment link

* Move favourite config mapper

* Remove dependency on StratosScopeStrings

* Move BaseEndpointAuth

* Move StratosTheme

* Move ThemeService

* Move types from utils.service that are only used once in store

* Move PermissionValues

* Move http and jetstream helpers

* Move StyleService

* Move MetricQueryType

* Move getFullEndpointApiUrl

* Move StratosStatus

* Move generateStratosEntities back to core

* Finish store -> core sep

* Address PR feedback

* Fix compilation issue

* Fix merge weirdness

* Merge downstream (#4369)

* src based changes

* changes to ./build

* ./docs

* ./

* Changes following review

* Address PR feedback

* fix build

* whitespace changes

* Fix in core public-api after merge

* Fix duplicated k8s docs

* Typed access to actions and entities via catalog entity: Core Stratos Entities (#4387)

* WIP

* WIP

* WIP

* Endpoint changes

* Fix failure handling during connect on stepper

* Fix favourites

* Removed some TODOs

* Fixes & todos

* Unit test fixes

* Fixes following merge

* Fix cf unit tests

* Changes following review

* Theming improvements for header

* Tweaks, Migration Script Docs & Notes on others (#4389)

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

* Build devkit outside of dist folder

* Add dist-devkit to git ignore

* Ignore example packages when there's a stratos config file (#4399)

* Fix CF App Restage (#4393)

* Remove action entityLocation (not used)

* Fix restage
- fixes #4392

* Remove RequestEntityLocation

* Update icons (#4404)

* Update icons

* Update docker icon and optimize other pngs

* Improve resolution of container icon

* Update e2e test for new icons

* Improve theming to reduce need to override in a hacky way (#4407)

* Change following merge

Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil_macdougall@hotmail.com>
---
 .../src/actions/app-metadata.actions.ts       |   3 +-
 .../src/actions/application.actions.ts        |  17 ++--------
 .../src/actions/feature-flags.actions.ts      |   2 --
 .../src/actions/relation.actions.ts           |   4 +--
 .../entity-relations-validate.spec.ts         |   7 +---
 .../src/entity-relations/entity-relations.ts  |   7 +---
 .../processors/org-space-post-processor.ts    |   3 +-
 .../application-tabs-base.component.ts        |   6 ++--
 .../tabs/build-tab/build-tab.component.html   |   8 ++---
 .../tabs/build-tab/build-tab.component.ts     |   1 +
 .../routes-tab/routes-tab.component.html      |   2 +-
 .../cloud-foundry-tabs-base.component.ts      |   4 +--
 .../quota-definition.component.html           |   6 ++--
 .../space-quota-definition.component.html     |   6 ++--
 ...oud-foundry-organization-base.component.ts |  12 ++++---
 .../cloud-foundry-space-base.component.ts     |   5 +--
 ...cloud-foundry-space-summary.component.html |   4 +--
 ...oundry-organization-summary.component.html |  10 +++---
 .../service-summary.component.html            |   4 +--
 .../card-cf-info/card-cf-info.component.html  |   2 +-
 .../table-cell-event-actee.component.ts       |   5 +--
 .../cf-routes/cf-routes-list-config-base.ts   |   2 +-
 .../assets/endpoint-icons/cloudfoundry.png    | Bin 5544 -> 2641 bytes
 .../core/assets/endpoint-icons/docker.png     | Bin 4362 -> 2636 bytes
 .../endpoint-icons/github-logo-light.png      | Bin 4044 -> 1634 bytes
 .../assets/endpoint-icons/github-logo.png     | Bin 4268 -> 1641 bytes
 .../packages/core/sass/_all-theme.scss        |   5 +++
 .../sass/components/hyperlinks.theme.scss     |   8 +++--
 src/frontend/packages/core/src/app.routing.ts |   9 ++---
 .../side-nav/side-nav.component.theme.scss    |   6 ++--
 .../src/features/endpoints/connect.service.ts |  31 +-----------------
 .../intro-screen.component.theme.scss         |  11 +++++++
 .../table-cell-endpoint-status.component.html |   4 +--
 .../user-avatar.component.theme.scss          |  27 +++++++++++++--
 .../user-profile-banner.component.theme.scss  |   4 ++-
 .../packages/devkit/src/lib/packages.ts       |   6 +++-
 .../stratos-title.component.theme.scss        |   6 ++++
 .../packages/store/src/types/request.types.ts |  11 -------
 src/frontend/packages/theme/_helper.scss      |  10 +++++-
 src/test-e2e/endpoints/endpoints.po.ts        |   4 +--
 40 files changed, 131 insertions(+), 131 deletions(-)
 mode change 100644 => 100755 src/frontend/packages/core/assets/endpoint-icons/docker.png
 create mode 100644 src/frontend/packages/core/src/shared/components/intro-screen/intro-screen.component.theme.scss

diff --git a/src/frontend/packages/cloud-foundry/src/actions/app-metadata.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/app-metadata.actions.ts
index 3d1438cb8a..423ca862d2 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/app-metadata.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/app-metadata.actions.ts
@@ -1,7 +1,7 @@
 import { HttpRequest } from '@angular/common/http';
 
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
-import { ICFAction, RequestEntityLocation } from '../../../store/src/types/request.types';
+import { ICFAction } from '../../../store/src/types/request.types';
 import { cfEntityFactory } from '../cf-entity-factory';
 import { appEnvVarsEntityType, applicationEntityType, appStatsEntityType, appSummaryEntityType } from '../cf-entity-types';
 import { createEntityRelationPaginationKey } from '../entity-relations/entity-relations.types';
@@ -39,7 +39,6 @@ export class GetAppStatsAction extends CFStartAction implements PaginatedAction,
     'order-direction': 'desc',
     'order-direction-field': 'index',
   };
-  entityLocation = RequestEntityLocation.ARRAY;
 }
 
 export class GetAppEnvVarsAction extends CFStartAction implements PaginatedAction, ICFAction {
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 a3bd914226..c1cbe2a808 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/application.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/application.actions.ts
@@ -1,4 +1,4 @@
-import { HttpHeaders, HttpParams, HttpRequest } from '@angular/common/http';
+import { HttpParams, HttpRequest } from '@angular/common/http';
 
 import { pick } from '../../../store/src/helpers/reducer.helper';
 import { ActionMergeFunction } from '../../../store/src/types/api.types';
@@ -164,9 +164,6 @@ export class DeleteApplication extends CFStartAction implements ICFAction {
       `apps/${guid}`,
       null,
       {
-        headers: new HttpHeaders({
-          'x-cap-passthrough': 'true'
-        }),
         params: new HttpParams({
           fromObject: {
             recursive: 'true'
@@ -192,12 +189,7 @@ export class DeleteApplicationInstance extends CFStartAction
     this.options = new HttpRequest(
       'DELETE',
       `apps/${appGuid}/instances/${index}`,
-      null,
-      {
-        headers: new HttpHeaders({
-          'x-cap-passthrough': 'true'
-        })
-      }
+      null
     );
     this.guid = `${appGuid}-${index}`;
   }
@@ -215,11 +207,6 @@ export class RestageApplication extends CFStartAction implements ICFAction {
       'POST',
       `apps/${guid}/restage`,
       null,
-      {
-        headers: new HttpHeaders({
-          'x-cap-passthrough': 'true'
-        })
-      }
     );
   }
   actions = [RESTAGE, RESTAGE_SUCCESS, RESTAGE_FAILED];
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 5c1967a0c1..a33b5fa2d7 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
@@ -3,7 +3,6 @@ import { HttpRequest } from '@angular/common/http';
 import { getActions } from '../../../store/src/actions/action.helper';
 import { endpointEntityType } from '../../../store/src/helpers/stratos-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';
@@ -25,7 +24,6 @@ export class GetAllFeatureFlags extends CFStartAction implements PaginatedAction
   actions = getActions('Feature Flags', 'Fetch all');
   options: HttpRequest<any>;
   flattenPagination = true;
-  entityLocation = RequestEntityLocation.ARRAY;
   initialParams = {
     page: 1,
     'order-direction': 'desc',
diff --git a/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts
index b0d2154801..f66094c04e 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts
@@ -2,7 +2,7 @@ import { HttpParams, HttpRequest } from '@angular/common/http';
 
 import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
-import { RequestActionEntity, RequestEntityLocation } from '../../../store/src/types/request.types';
+import { RequestActionEntity } from '../../../store/src/types/request.types';
 import { EntityTreeRelation } from '../entity-relations/entity-relation-tree';
 import { EntityInlineChildAction, EntityInlineParentAction } from '../entity-relations/entity-relations.types';
 import { CFStartAction } from './cf-action.types';
@@ -95,8 +95,6 @@ export class FetchRelationSingleAction extends FetchRelationAction {
       populateMissing,
       url,
     );
-    this.entityLocation = RequestEntityLocation.OBJECT;
     this.entity = child.entity;
   }
-  entityLocation: RequestEntityLocation;
 }
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 2a0f7a07f7..edba884032 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
@@ -9,11 +9,7 @@ import { InternalAppState, IRequestTypeState } from '../../../store/src/app-stat
 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 { EntityRequestAction, WrapperRequestActionSuccess } from '../../../store/src/types/request.types';
 import {
   entityRelationMissingQuotaGuid,
   entityRelationMissingQuotaUrl,
@@ -444,7 +440,6 @@ describe('Entity Relations - validate -', () => {
       const associateAPIAction: EntityRequestAction = {
         endpointGuid: getOrgAction.endpointGuid,
         entity: getOrgAction.entity[0],
-        entityLocation: RequestEntityLocation.OBJECT,
         guid: orgGuid,
         entityType: organizationEntityType,
         type: '[Entity] Associate with parent',
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 2bbdf819b2..1c9e4dca87 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
@@ -17,11 +17,7 @@ import { getAPIRequestDataState, selectEntity, selectRequestInfo } from '../../.
 import { selectPaginationState } from '../../../store/src/selectors/pagination.selectors';
 import { APIResource, NormalizedResponse } from '../../../store/src/types/api.types';
 import { isPaginatedAction, PaginatedAction, PaginationEntityState } from '../../../store/src/types/pagination.types';
-import {
-  EntityRequestAction,
-  RequestEntityLocation,
-  WrapperRequestActionSuccess,
-} from '../../../store/src/types/request.types';
+import { EntityRequestAction, WrapperRequestActionSuccess } from '../../../store/src/types/request.types';
 import { FetchRelationAction, FetchRelationPaginatedAction, FetchRelationSingleAction } from '../actions/relation.actions';
 import { EntityTreeRelation } from './entity-relation-tree';
 import { validationPostProcessor } from './entity-relations-post-processor';
@@ -341,7 +337,6 @@ function associateChildWithParent(
         const parentAction: EntityRequestAction = {
           endpointGuid: action.endpointGuid,
           entity: catalogEntity.getSchema(action.parentEntityConfig.schemaKey),
-          entityLocation: RequestEntityLocation.OBJECT,
           guid: action.parentGuid,
           entityType: action.parentEntityConfig.entityType,
           endpointType: action.parentEntityConfig.endpointType,
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 687e7323be..aa67fe3d59 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
@@ -8,7 +8,7 @@ import { deepMergeState, mergeEntity } from '../../../../store/src/helpers/reduc
 import { selectPaginationState } from '../../../../store/src/selectors/pagination.selectors';
 import { APIResource } from '../../../../store/src/types/api.types';
 import { PaginatedAction, PaginationEntityState } from '../../../../store/src/types/pagination.types';
-import { RequestEntityLocation, WrapperRequestActionSuccess } from '../../../../store/src/types/request.types';
+import { WrapperRequestActionSuccess } from '../../../../store/src/types/request.types';
 import { GetOrganization } from '../../actions/organization.actions';
 import { GetSpace } from '../../actions/space.actions';
 import { getCFEntityKey } from '../../cf-entity-helpers';
@@ -105,7 +105,6 @@ export function orgSpacePostProcess(
       actions: [],
       endpointGuid: action.endpointGuid,
       entity: userCatalogEntity.getSchema(),
-      entityLocation: RequestEntityLocation.ARRAY,
       entityType: userCatalogEntity.definition.type,
       endpointType: CF_ENDPOINT_TYPE,
       type: '[Entity] Post-process Org/Space Users',
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 362c6c37fd..b7af4a19ea 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
@@ -93,9 +93,9 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy {
     );
 
     this.tabLinks = [
-      { link: 'summary', label: 'Summary', icon: 'description' },
-      { link: 'instances', label: 'Instances', icon: 'library_books' },
-      { link: 'routes', label: 'Routes', iconFont: 'stratos-icons', icon: 'network_route' },
+      { link: 'summary', label: 'Summary', iconFont: 'stratos-icons', icon: 'application' },
+      { link: 'instances', label: 'Instances', iconFont: 'stratos-icons', icon: 'application_instance' },
+      { link: 'routes', label: 'Routes', iconFont: 'stratos-icons', icon: 'route' },
       { link: 'log-stream', label: 'Log Stream', icon: 'featured_play_list' },
       { link: 'services', label: 'Services', iconFont: 'stratos-icons', icon: 'service' },
       { link: 'variables', label: 'Variables', icon: 'list', hidden$: appDoesNotHaveEnvVars$ },
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.html b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.html
index de18350435..92cb5b2895 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.html
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.html
@@ -85,7 +85,7 @@
                 <app-metadata-item icon="access_time" label="Modified">
                   {{ appSvc.app.entity.package_updated_at ? (appSvc.app.entity.package_updated_at | date:'medium') : '-' }}
                 </app-metadata-item>
-                <app-metadata-item icon="developer_mode" label="SSH Enabled">{{ sshStatus$ | async }}
+                <app-metadata-item icon="virtual_guest" iconFont="stratos-icons" label="SSH Enabled">{{ sshStatus$ | async }}
                 </app-metadata-item>
               </div>
               <div class="app-metadata__two-cols">
@@ -95,7 +95,7 @@
                 <app-metadata-item icon="service" iconFont="stratos-icons" label="Services">
                   {{(applicationService.appSummary$ | async)?.entity?.services?.length || '0' }}
                 </app-metadata-item>
-                <app-metadata-item icon="network_route" iconFont="stratos-icons" label="Routes">
+                <app-metadata-item icon="route" iconFont="stratos-icons" label="Routes">
                   {{(applicationService.appSummary$ | async)?.entity?.routes?.length || '0' }}
                 </app-metadata-item>
               </div>
@@ -118,7 +118,7 @@
                 <a
                   [routerLink]="['/cloud-foundry/' + appSvc.cf?.guid + '/organizations/' + appOrg.metadata.guid]">{{ appOrg.entity.name }}</a>
               </app-metadata-item>
-              <app-metadata-item *ngIf="applicationService.appSpace$ | async as appSpace" icon="language" label="Space">
+              <app-metadata-item *ngIf="applicationService.appSpace$ | async as appSpace" iconFont="stratos-icons" icon="virtual_space" label="Space">
                 <a
                   [routerLink]="['/cloud-foundry/' + appSvc.cf?.guid + '/organizations/' + appOrg.metadata?.guid + '/spaces/' + appSpace.metadata?.guid]">{{ appSpace.entity.name }}</a>
               </app-metadata-item>
@@ -174,7 +174,7 @@
               <app-metadata-item *ngSwitchCase="'archive'" icon="insert_drive_file" label="File">
                 Deployed from local file
               </app-metadata-item>
-              <app-metadata-item *ngSwitchCase="'docker'" iconFont="stratos-icons" icon="docker" label="Docker Image">
+              <app-metadata-item *ngSwitchCase="'docker'" iconFont="stratos-icons" icon="container" label="Docker Image">
                 <a *ngIf="deploySource.dockerUrl; else noDockerUrl" href="{{ deploySource.dockerUrl }}"
                   rel="noopener noreferrer" target="_blank">
                   {{deploySource.dockerImage}}
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 5f3574c8d7..26f9c2b373 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
@@ -59,6 +59,7 @@ const appRestageConfirmation = new ConfirmationDialogConfig(
 export class BuildTabComponent implements OnInit {
   public isBusyUpdating$: Observable<{ updating: boolean }>;
   public manageAppPermission = CfCurrentUserPermissions.APPLICATION_MANAGE;
+
   constructor(
     public applicationService: ApplicationService,
     private scmService: GitSCMService,
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component.html b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component.html
index 5e7fa187bd..e3a1c506ab 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component.html
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component.html
@@ -1,5 +1,5 @@
 <ng-template #noEntries>
-  <app-no-content-message iconFont="stratos-icons" icon="network_route" [firstLine]="'This application has no routes'" [secondLine]="{
+  <app-no-content-message iconFont="stratos-icons" icon="route" [firstLine]="'This application has no routes'" [secondLine]="{
       text: ''
     }"></app-no-content-message>
 </ng-template>
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts
index c086f9cd86..2818e5005e 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts
@@ -68,7 +68,7 @@ export class CloudFoundryTabsBaseComponent implements OnInit {
 
     // Default tabs + add any tabs from extensions
     this.tabLinks = [
-      { link: 'summary', label: 'Summary', icon: 'description' },
+      { link: 'summary', label: 'Summary', icon: 'cloud_foundry', iconFont: 'stratos-icons' },
       { link: 'organizations', label: 'Organizations', icon: 'organization', iconFont: 'stratos-icons' },
       {
         link: CloudFoundryTabsBaseComponent.cells,
@@ -76,7 +76,7 @@ export class CloudFoundryTabsBaseComponent implements OnInit {
         icon: 'select_all',
         hidden$: cellsHidden$
       },
-      { link: 'routes', label: 'Routes', icon: 'network_route', iconFont: 'stratos-icons', },
+      { link: 'routes', label: 'Routes', icon: 'route', iconFont: 'stratos-icons', },
       {
         link: CloudFoundryTabsBaseComponent.users,
         label: 'Users',
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.html b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.html
index 4f66f23908..71a0a75b8b 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.html
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.html
@@ -46,7 +46,7 @@ <h4 class="quota-definition-base__section-header">Memory</h4>
       <h4 class="quota-definition-base__section-header">Application</h4>
       <app-tile-group>
         <app-tile>
-          <app-card-number-metric labelAtTop="true" icon="apps" label="Maximum Application Instances"
+          <app-card-number-metric labelAtTop="true" icon="application_instance" iconFont="stratos-icons"  label="Maximum Application Instances"
             value="{{ quotaDefinition.entity?.app_instance_limit }}">
           </app-card-number-metric>
         </app-tile>
@@ -74,12 +74,12 @@ <h4 class="quota-definition-base__section-header">Service</h4>
       <h4 class="quota-definition-base__section-header">Routes & Domains</h4>
       <app-tile-group>
         <app-tile>
-          <app-card-number-metric labelAtTop="true" icon="network_route" iconFont="stratos-icons" label="Maximum Routes"
+          <app-card-number-metric labelAtTop="true" icon="route" iconFont="stratos-icons" label="Maximum Routes"
             value="{{ quotaDefinition.entity?.total_routes }}">
           </app-card-number-metric>
         </app-tile>
         <app-tile>
-          <app-card-number-metric labelAtTop="true" icon="network_route" iconFont="stratos-icons"
+          <app-card-number-metric labelAtTop="true" icon="route" iconFont="stratos-icons"
             label="Maximum Reserved Route Ports" value="{{ quotaDefinition.entity?.total_reserved_route_ports }}">
           </app-card-number-metric>
         </app-tile>
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.html b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.html
index cefdf879e6..005b388ef7 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.html
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.html
@@ -45,7 +45,7 @@ <h4 class="quota-definition-base__section-header">Memory</h4>
       <h4 class="quota-definition-base__section-header">Application</h4>
       <app-tile-group>
         <app-tile>
-          <app-card-number-metric labelAtTop="true" icon="apps" label="Maximum Application Instances"
+          <app-card-number-metric labelAtTop="true" icon="application_instance" iconFont="stratos-icons" label="Maximum Application Instances"
             value="{{ quotaDefinition.entity?.app_instance_limit }}">
           </app-card-number-metric>
         </app-tile>
@@ -73,12 +73,12 @@ <h4 class="quota-definition-base__section-header">Service</h4>
       <h4 class="quota-definition-base__section-header">Routes</h4>
       <app-tile-group>
         <app-tile>
-          <app-card-number-metric labelAtTop="true" icon="network_route" iconFont="stratos-icons" label="Maximum Routes"
+          <app-card-number-metric labelAtTop="true" icon="route" iconFont="stratos-icons" label="Maximum Routes"
             value="{{ quotaDefinition.entity?.total_routes }}">
           </app-card-number-metric>
         </app-tile>
         <app-tile>
-          <app-card-number-metric labelAtTop="true" icon="network_route" iconFont="stratos-icons"
+          <app-card-number-metric labelAtTop="true" icon="route" iconFont="stratos-icons"
             label="Maximum Reserved Route Ports" value="{{ quotaDefinition.entity?.total_reserved_route_ports }}">
           </app-card-number-metric>
         </app-tile>
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 f9a24ac961..00792c21cc 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
@@ -46,12 +46,14 @@ export class CloudFoundryOrganizationBaseComponent {
     {
       link: 'summary',
       label: 'Summary',
-      icon: 'description'
+      icon: 'organization',
+      iconFont: 'stratos-icons'
     },
     {
       link: 'spaces',
       label: 'Spaces',
-      icon: 'language'
+      icon: 'virtual_space',
+      iconFont: 'stratos-icons'
     },
     {
       link: 'users',
@@ -61,12 +63,14 @@ export class CloudFoundryOrganizationBaseComponent {
     {
       link: 'quota',
       label: 'Quota',
-      icon: 'data_usage'
+      icon: 'quota',
+      iconFont: 'stratos-icons'
     },
     {
       link: 'space-quota-definitions',
       label: 'Space Quotas',
-      icon: 'data_usage'
+      icon: 'quota',
+      iconFont: 'stratos-icons'
     },
     {
       link: 'events',
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 5ae190a43b..e4b352225d 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
@@ -50,7 +50,8 @@ export class CloudFoundrySpaceBaseComponent implements OnDestroy {
     {
       link: 'summary',
       label: 'Summary',
-      icon: 'description'
+      icon: 'virtual_space',
+      iconFont: 'stratos-icons',
     },
     {
       link: 'apps',
@@ -73,7 +74,7 @@ export class CloudFoundrySpaceBaseComponent implements OnDestroy {
       link: 'routes',
       label: 'Routes',
       iconFont: 'stratos-icons',
-      icon: 'network_route'
+      icon: 'route'
     },
     {
       link: 'users',
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.html 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.html
index a55eb014df..3f8bab4fa0 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.html
+++ 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.html
@@ -34,14 +34,14 @@
           </app-card-number-metric>
         </app-tile>
         <app-tile *ngIf="cfEndpointService.appsPagObs.hasEntities$ | async">
-          <app-card-number-metric icon="content_copy" label="App Instances"
+          <app-card-number-metric icon="application_instance" iconFont="stratos-icons" label="App Instances"
             value="{{ (cfSpaceService.appInstances$ | async) }}"
             limit="{{ (cfSpaceService.quotaDefinition$ | async)?.app_instance_limit}}"></app-card-number-metric>
         </app-tile>
         <app-tile>
           <app-card-number-metric
             link="/cloud-foundry/{{cfSpaceService.cfGuid}}/organizations/{{cfSpaceService.orgGuid}}/spaces/{{cfSpaceService.spaceGuid}}/routes"
-            iconFont="stratos-icons" icon="network_route" label="Routes"
+            iconFont="stratos-icons" icon="route" label="Routes"
             value="{{ (cfSpaceService.routes$ | async)?.length }}"
             limit="{{ (cfSpaceService.quotaDefinition$ | async)?.total_routes}}"></app-card-number-metric>
         </app-tile>
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.html b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.html
index c1565ef97b..c0b58c00cd 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.html
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.html
@@ -27,7 +27,7 @@
       <app-tile-group>
         <app-tile>
           <app-card-number-metric
-            link="/cloud-foundry/{{cfOrgService.cfGuid}}/organizations/{{cfOrgService.orgGuid}}/spaces" icon="language"
+            link="/cloud-foundry/{{cfOrgService.cfGuid}}/organizations/{{cfOrgService.orgGuid}}/spaces" iconFont="stratos-icons" icon="virtual_space"
             label="Spaces" labelSingular="Space" value="{{ (cfOrgService.spaces$ | async)?.length }}">
           </app-card-number-metric>
         </app-tile>
@@ -36,12 +36,12 @@
             value="{{ cfOrgService.appCount$ | async }}"></app-card-number-metric>
         </app-tile>
         <app-tile *ngIf="cfEndpointService.appsPagObs.hasEntities$ | async">
-          <app-card-number-metric icon="content_copy" label="App Instances"
+          <app-card-number-metric icon="application_instance" iconFont="stratos-icons" label="App Instances"
             value="{{ (cfOrgService.appInstances$ | async) }}"
             limit="{{ (cfOrgService.quotaDefinition$ | async)?.app_instance_limit}}"></app-card-number-metric>
         </app-tile>
         <app-tile>
-          <app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Routes"
+          <app-card-number-metric iconFont="stratos-icons" icon="route" label="Routes"
             value="{{ (cfOrgService.routesCount$ | async) }}"
             limit="{{ (cfOrgService.quotaDefinition$ | async)?.total_routes}}"></app-card-number-metric>
         </app-tile>
@@ -58,12 +58,12 @@
             limit="{{ (cfOrgService.quotaDefinition$ | async)?.total_private_domains}}"></app-card-number-metric>
         </app-tile>
         <app-tile>
-          <app-card-number-metric iconFont="stratos-icons" icon="service" label="Service Instances"
+          <app-card-number-metric iconFont="stratos-icons" icon="service_instance" label="Service Instances"
             value="{{ (cfOrgService.serviceInstancesCount$ | async) }}"
             limit="{{ (cfOrgService.quotaDefinition$ | async)?.total_services }}"></app-card-number-metric>
         </app-tile>
         <app-tile *ngIf="(cfOrgService.userProvidedServiceInstancesCount$ | async) > 0">
-          <app-card-number-metric iconFont="stratos-icons" icon="service" label="User Service Instances"
+          <app-card-number-metric iconFont="stratos-icons" icon="service_instance" label="User Service Instances"
             value="{{ (cfOrgService.userProvidedServiceInstancesCount$ | async) }}"></app-card-number-metric>
         </app-tile>
         <app-tile *ngIf="cfEndpointService.appsPagObs.hasEntities$ | async">
diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-summary/service-summary.component.html b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-summary/service-summary.component.html
index def1859710..6b96d855e3 100644
--- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-summary/service-summary.component.html
+++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-summary/service-summary.component.html
@@ -17,10 +17,10 @@
     </ng-template>
     <app-tile-group>
       <app-tile>
-        <app-card-number-metric [link]="serviceInstancesLink" icon="library_books" label="Instances" labelSingular="Instance" value="{{ (instances$ | async)?.length }}"></app-card-number-metric>
+        <app-card-number-metric [link]="serviceInstancesLink" icon="service_instance" iconFont="stratos-icons" label="Instances" labelSingular="Instance" value="{{ (instances$ | async)?.length }}"></app-card-number-metric>
       </app-tile>
       <app-tile>
-        <app-card-number-metric [link]="servicePlansLink" icon="products" iconFont="stratos-icons" label="Service Plans" labelSingular="Service Plan" value="{{ ( servicePlans$ | async)?.length }}"></app-card-number-metric>
+        <app-card-number-metric [link]="servicePlansLink" icon="service_plan" iconFont="stratos-icons" label="Service Plans" labelSingular="Service Plan" value="{{ ( servicePlans$ | async)?.length }}"></app-card-number-metric>
       </app-tile>
     </app-tile-group>
     <app-tile-group>
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.html
index 320c5b5943..ac042adab2 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.html
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.html
@@ -23,7 +23,7 @@
             {{ (cfEndpointService.endpoint$ | async )?.entity.user.name }}
             <span *ngIf="(cfEndpointService.endpoint$ | async )?.entity.user.admin"> (Administrator)</span>
           </app-metadata-item>
-          <app-metadata-item icon="developer_mode" label="SSH Access">
+          <app-metadata-item icon="virtual_guest" iconFont="stratos-icons" label="SSH Access">
             {{ (cfEndpointService.hasSSHAccess$ | async) ? 'Available' : 'Not available'}}</app-metadata-item>
           <app-metadata-item icon="email" label="User Invitation Support">
             <div class="user-invites">
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.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/table-cell-event-actee/table-cell-event-actee.component.ts
index b8f929355c..ebbd8333b3 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/table-cell-event-actee/table-cell-event-actee.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/table-cell-event-actee/table-cell-event-actee.component.ts
@@ -23,7 +23,7 @@ export class TableCellEventActeeComponent extends TableCellCustom<APIResource> {
         icon: 'apps',
       },
       route: {
-        icon: 'network_route',
+        icon: 'route',
         iconFont: 'stratos-icons'
       },
       service: {
@@ -55,7 +55,8 @@ export class TableCellEventActeeComponent extends TableCellCustom<APIResource> {
         icon: 'remove_red_eye',
       },
       space: {
-        icon: 'language',
+        icon: 'virtual_space',
+        iconFont: 'stratos-icons'
       },
       organization: {
         icon: 'organization',
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 b1a7ae262b..63f6c134d3 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
@@ -78,7 +78,7 @@ export abstract class CfRoutesListConfigBase implements IListConfig<APIResource>
     noEntries: 'There are no routes',
     filter: 'Search by Route',
     maxedResults: {
-      icon: 'network_route',
+      icon: 'route',
       iconFont: 'stratos-icons',
       canIgnoreMaxFirstLine: 'Fetching all routes might take a long time',
       cannotIgnoreMaxFirstLine: 'There are too many routes to fetch'
diff --git a/src/frontend/packages/core/assets/endpoint-icons/cloudfoundry.png b/src/frontend/packages/core/assets/endpoint-icons/cloudfoundry.png
index 0c81f62f51e1af3b8f1e2e344a24be184a422b4e..733c676310913cb8b96ba71f6179542591d8ba55 100644
GIT binary patch
literal 2641
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

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

diff --git a/src/frontend/packages/core/assets/endpoint-icons/docker.png b/src/frontend/packages/core/assets/endpoint-icons/docker.png
old mode 100644
new mode 100755
index 5272401a982704818c685c6427ece3d4512d4544..fa544fb7fe4d3eea1539001875ab752d29dbd1e9
GIT binary patch
literal 2636
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
VRS7n~M)~ir3TbL>QfGW4;XggEy4L^z

literal 4362
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
Ef*MeBl>h($

diff --git a/src/frontend/packages/core/assets/endpoint-icons/github-logo-light.png b/src/frontend/packages/core/assets/endpoint-icons/github-logo-light.png
index 192846a12085914cc0e38d9b48036b11d2a4d7c4..bb1892db53b57ad68d5bdd7dc13109db1d0ea88f 100644
GIT binary patch
literal 1634
zcmd6n`9Bj30LJH-Ei%fm8WVEoJ_@;J!>|#Vn~5>kTWw;Wml7*iIj6&sIcDU@<Ss`O
zkt>!+<w$oz%Mr5I>-{g@=kxhK-(R1fo^)57y}0O6Q2+oSj&VS_?VI`^V4?knJbJdU
zuS!?vv*>;A{qNJx|KPDd)Fj3Y=MLCb5MG|x{4?8&euOzSXfaKI%ZO5=RS)Wasx7(b
z*CIJknS6!hfzwptjWuKvXNJ7Mx%p|0*yscR0BC|i*_<WKO-@Bq%JrbY1*rqwNe$}b
zKFvPFi}urRV#oIO!rw~Zrjwk2Qn6u-2E7h?kzogCFZg@vz|$S3w3WtXABC(kD|AID
zzrIR?JJ)JutL&3rwWa+@McYf}xGmnmS@8ACKy^Gz=CarO6aG^lb>!C`(sfqH@4;?w
z4s^bJJ-{!Q7Ozu!H&CE;^b7?QH|TeiVmK+&8g65bvfw4(K5=eRGBbSi6q2Zny|E6K
zuFSyShu(5FYpyf20h*f-JcD|o`bI6P<W0)ybAwIiY$w}hvW(yr%J~@sQRAoV3V`qy
z>+~Gcoma0q>9K){25Q&T-A8x=&T2&_krC%r-2qm2D-6JLcTC@O$nnRB;ww7cb=6`F
zIp}CX8%H*AFeAmXJL+y5+J<@ex0okaN9!wVe!g21Su&6e@{2F39bT*rCL@UT3)`k7
zVg-flcS(2nulWnhNk9ZSK}KC|KEEVj6r?ZABXo1S)D__Uf>ytWF(mj+i-!vz-xXtQ
zVewtYRdO1p7O*AE_T#x<d5H~rceb7q4eJqZ3yV&SJbU>2y!G?gN?6Jw++EWZnn@s`
zaz%CKrG^3sU#~wzrCrTQE@X}jHO@AnL~S*keqha_=OVMqTZDqg3Y8=np&5BN5wUWJ
zN(BDz_@DCl&Zc$9j2jn1K##LReE;rqVSl{8o@1;c<YiEb5^{HZ#AZ1?hgzyAus_od
zD=4ajc~Mx$`*QOv>So-@eMy3!o*b>R<p@O5qK+^lGwB>_BUqLii3VbE+}&-B1E>y3
zf_vE7?Z^J{zBnkj7qCmY09GeKCD<q)TOWZuEcJ)45M8^OL1rC+u_DfIK5qL*(2iAv
zxb!o1qrXz3wWnqc!hxJ1PjUp-AZ?+JngR(lpE;z*s$upO@yL<_k7ncQ_7hPzd|5$%
zt{Ka^ZTIIV*@!xEuXa?5xtaCmDQjp;PV`h8X!Pdik7?97yy)vvPjIUtpwW(&^G#R+
z?d1E%twQGP#)XbDV3vb+U|E|7F5zV?#i5?v!X%DiBSz}+8<FP@E*VM|q)iNaxn`c0
zzL-u~xh2O)|FGC_%_WNv)%Qh}+le{+!ve<J?DHLDK#4&jLf**JVN(&!vb*hHzn&%8
zUnYAu-}6ijvc7~nR6*nEl-lLiI7%V_BP$YdiR8iYl#|_7xzDWmE({@SY9d|p_U`m>
zdz2-b`g)7m7Mh|sfASbYaW)5um@8Z4`;ASG(Fc~5=m($Z7pE|f8K@H>E$bs~F-n4S
zyJrgGOg$S*V@0samWL?8JxQU%)A0A4l!#wPav&ASzOc_A2NP-xx%#sx^NO2gK>xPL
zlw(c_g)9ER{>fX|@GejJ3{CvosN$MsrH?LuNR_+lMd9wOm$ISR^(a)(PC&e{LIEpm
zTyj|EOCb^vpfAi?bCt|hSP3>78hLSQ85&sU@{|F0j01+O1{+<(1cPv9IaPXU41=3|
zOuE?ec!=Goh!)!~u*7^e)H-2?dDjk6m_IofH*rj+(7s&UMB6)i1G_s*>-&iZ*^}y)
zp3}g~9oUYg2dPl{eA65J>Jbr;^zjkn>C^r_zt^_Az?U^QIJ+C)<$?O4cAUku+l$4M
ze)NUYc9ARn0Y9IhLE%AK)H~%xj<3No(q`r=d>UQlAXT?KkWJ+go^@>==zgRp>+ej{
zJ+!l3<LU4HcHz0~PW-Gvg=p+nPG@gcyCnAuWwW%n=|+%?_w_8pn2AAo5uDepEthW+
Xp6lR{`cb^Y{s#jvXdLPRl92o_XNpsj

literal 4044
zcmaJ^c{r4N`<Jyy_FvW-!?DI}3}bD~3`r>aGRl~FEHV3FIF9Vfr0h$`Nq8%zL{iAU
z#5hVRL@G>)Ls=v09p|m{{{A@E`&`%ae82a7eLna7xtD*QbH|<RB*m4*1q1{n?T=tx
z_$Pbk-7U)hqDaUg{-MOed9hrnfviXZ0}w!yr~v@To=gY=TmS+oivAd|5D*a33~}>f
zc{v_4BT~tRgdL0_n@r=g1q3Xt*)#$%6kve@fS?eHC3vy11q=!yS%N){9ifgi3=kZ0
zB$@%ZMmxC?qeF=(64=@bWWhG$2OtA10*FlxqcF|bmf*kQn(^;DZU`9k7lajR3I2~L
zFUR8`43z<Zj17$qh)_5TWP&n;85^NsutOj?6o!Dnpb$9900uKNGBJZ8K|dZaKO2J-
zXy$^o{gI1rS%QOEESebv5*Zn37>O{XGJ+s56bc1_!Xa?D0Uu$&jH0jzYy%2Y<7Wgc
zz$7w4Xsi$_1+){95I_xQS%UdW|5E~)=IHo$U<&g`qxda@un9B>%n%A8lXvR+3(aJ?
z0RNTok7%Y_6b*p508DB)gUFvppvF%!zjyyT(GHNW#tcg(hLZsb%N}b9=6eiDAtW;_
z)&^z+MI%g+7#s|SL!i;da2yVSFot7cHW(x1Pp&<M$s$mQz)x<-f4T7g$u+|;00N83
zaHCSgeopUrFqK7R22*Juj4KkP<47QeP<9-;JI(!}6<~x!03=%ml??i;J7yvOpa5qK
zGciRY;3yOt%2y9Zp<%{07#P$Di8e(+jj-S!T+%;O4o4fojL<e1J{R_nTnJwbWM{Ph
zZ`40s{QcRv{=K+-<L}i6DExhA@E3atd!tuCV6T-u7VX9!oA;B<$aPnW_4YcxzusRz
zL;hvOsuY%fLi&j0XR*_+_MXB=VG<>mv_#18&|;&a6L-1gm36j4%xkt~@|aub48UIJ
z$zhq@B7I*@K=JsszBQ|u#fgozh3$<;UrW}%K3KOv47M8PGaoHmt(#jfMh*TN&0?`K
zaI<Be=jw=1rtq>H*Nnf((zUiD`J>uX-|Jvf&~@?201A-;Py(xizM0Ra%x1Qld{N{*
z;L_VqaCaRIZyty_w^4SdaP+hY@}fFdmut^mu5C&u?4oYNd9u80uF1{Tt|=mSmRnVL
zmAHA{fSb(S;QD#^QyVf+oG4T+T-}mjzAVKpg_YhH3@V*>1YYZ9S7-`l*M2Q<hPuue
zLX%3`ni5fUogO;A1(6QxC3<%8)&s@;78RZOWw&8Lh*G`%@y-EOtxa{@n0<rL7Q=+p
zlr-tN_N3VerK^38_$=gYITg3OF_jqQWjarZga)q|@lwiL+AIrB5vpt6MYJgeWZzCp
zm)#KU`2N*_=k77s^hJ%Sg^K;$xf?%-*YvB!5yD6(yJIZ(_^q&cdivFnVm+kF!N~Zc
zUiz@)ol6_t0yTcFc#&??C6z#GmHX2V2FNBWir}QC+zs)nOc}=mGDY11S;nrN_n;Rc
zqW8$h<BQ52YN*xw_91So2MwZF@jd<Jtrs3VG{ydLU?UAGQk@^tTw;(a)R~g58(4xr
z-}>qJt-O0hICdOjT6Jmm^OAW)J9SfEpQ35%9yW<_^$%0UD}6$*XHEs5@&0!5<A^pH
zSF|p6Xzu9K!xfyAIl6&}l=t@D@N|l)la|Z~B-wiHLy|;vMzKIs5J~o7$0{|Q+qJ9T
z?gK?=xl~J}TXc0&=S$u}EeTWllgm?+Rgcd-wQ&Q65*9z@fp5sdycT&iQ)dddg<d3Y
zPuDJwJdND{n@Zv6pr6Z|EB*yhF8dS4ePu!Or=woTEX^<SHo_W5Ksx@V)B@#1=fK!k
z8L*R|K6|t1re#Yg#vc-0lD@z(RgJ-q3jLD9XHtXZ8aUq&%K;dvVbD~=DgW_OjZ<}a
zW}FELAD#OkyEu^u+Lza?O(YgoS)5;WpH_8JIkaVpI&rz9KzmwAXp!)`Kc?k~N)xH~
zvO{6Mu#DoBTW8=a&_4s7tO)?EZGv`NG~Ur!nY{ilL1tjVx$S3<KaZ5y{ed=#iKqPT
zpP8Avl#Ebd=c7Va578hYPwZ0;Ob=L4lPB+)vQ4KAQI^Gp*CHEl9ys<U-1}|$)`d32
z-ZY6O;9Bv8-JOmSp*LQCSB$BSe%kj^v&u!3{%j5-Ayzr4h^cxVE8LB~bHyXIQ^3dX
zPrElLaVdJv@D(}b*AIQ0#Vs;fO-Ho7{LEq4E8J(e#stC1YtOI6b7MVTX&@D^xve=S
z3)_w*4eGgHs2K3}nAAW%F{>WZQRd0BMQ1O^6a}xk-$MhuEM3<(S~K0oKEDl<pX50B
zYf3-+BanH2*mFYk>VyOServwIXUu+-_H3Wpowmr_xrReUt=aPWcm<oQSxJqZT0RBi
zsM_2C(Q+|tU9zp{11VB^{nL+QA|rX7h6T2dj)#SS%O4nTi(b@dUWt?Prq{l6uSpl(
zJX=}fx8hZic1Qi2WfkBwj_DGSWVd<UZ=K4~+c54jN+lk<;}BLJPhWtsA+xHOww&MY
z4Z|QbAGAh;H1me??(?SQYT^oEzckK#Q1I=PA}IG<;k-z*jvf2RQ*y}ZQ`;3kmn(jX
z5Y8F*Se0(@xK1-)v!zz~7{tpcf2|xIK=@bX<h3Tsi`#mA5c4n@jB7Ag=u;Dp50w}H
zRyxczF}g7HB6v^J<i{Bmu{z-wXR|+stS(8WJEq1;ducd0ovO;G1}7=3zv!d71FK8v
zr_*ij3D-ZU4G2JdDKnO}J(y+KbCUdV8`n`!sIYC*t)Nc%R}}^A)heOQxFx^K;$ivL
zbKTs=mV_0C`>^)}_>9sT`pv}A<coJ7Ms<%Komog}HP0147`jt{xv_{<b}<dlX}3z0
zxg<#S&{JLL+vCxaP;fZ9dSXDDo&B!Exn@(LQy~qYCR`Pojj7jnk0WE|P44@s)e2%1
z?@EQJowq(fg@X0g_1xpcN-5#obF*phz+n+~WBZ$JYh><cG}mdUM4uzq(KP)6#y;sQ
z=(np^h2FY6@hNJkdAn)U;1j1Wy-lh3bXAD<jV`TAUT^<T(Yj98BjwzSZI72uTW47b
zYR`iE<rRJ1`*T&2eVZ!1$rm;43$NpQ7*Ff^r{7;xH(DStvSRY}Y3~-_t3Q8MC^%N)
zq*(Z&KKVGx<+Vl|+oA9rCp*spbBXgjD;w0@uX6rW5`DbfM>(3VbdIy7J(!}o@UgBT
z2l(wFsMA~1>G_0xg<1foUY$JTDt}VBr)R>N6d3be2i541tFFAu!3e)rSKZl(>uZlH
zFa4D(S-dB4F3PjoM6u{Q2VB5z&0domdfcvzlrH%!!LYEuimCop1}NwDMg(<;a9cKY
z>bwKVI*Ox$ccRh_?wrKM3c-$T<z$6#$v?(f+dEahuH2nkvZrut=3$PI=j8d7;~<LE
zhIF{K{n_eofxIw1tJnLl=U>i%3{L9CsyA2yk5kKuuDY8b%wBp>#8=*ov?7Ood-N0~
zDAu~)M&)u&&vd$~(x<m{wQ-3d-#2N^o;q6`16ciAv(gho4(M^Io(~dYlWQ@z1+V^!
zD>J-p?{)z6{>DAz%S+TaZjMaW-3<Kf>fT+iihW6z+m7%vauQmXtn=!h+dC_Gw(c8g
z_;6rqUp({E*uFC(y{d&Lx)rzpmpJ46%rv9IDLc&n(WJ~7e14VWhO%cHezCU9gZE1{
zJOvhs(1wK;ypl8t%PVULi8bK8dvwSL`0bmG=c_iMDHAo>1v?v$<*;A5*}8+qVYp*@
ze}K0g?m`P~hMqLMj<zaXDktd4htwo(P5PbHC&oJaE$+J}>#5d#)=tuR-b(zvsL@U7
zh4kwU&aUyQz9%UMyRZ_GikkzroQdlzA_seV%XhEOzpXzuebfqdxI>z2lF{Dic<Z)l
z{5#gVoK{^2DFN5@sBKnhEHaH9XZw=-z}>>*{^O;}%mk6~@5$}WdW&(-m9)pbkKk_$
z3az`+BVT`Obr)0J-(TL??IY{?lA?2$uCD<NE{3nS-7|mLFV-wxEc-rn@;*=gV{HHK
zg{iI!J&Dt*58LzKWL$*HTx&5ByxRTC^$qk>FyP|<#+Yus*)@N@v{Xa;?$qzB31;WO
zx&b3151u%^el}?Dy6X8%$bdB%I$vL~JEqq3O4F6I;cvIVFHXPb=`Lb<wOp}6yT^;0
zh*ap;2UaF&sQjqd-Jz3VH`CiLMaECQH>|wk&JDLZc(ZU6VHXw7wOo22x-k*8)F=r?
z#@_d^LRf?2tz~N(XlARcU&p(OP1(+Q*0K98T+H-7g#^*Re4b9qtfr?Ujy&0b<eyQA
z+~wETWK~uTQy|=LvI|=<SGk-YPBZj3nTcA8+;0dr;hliTmt2hmUvhIi6fq+`&6TcS
zsN7u9vebO`wNF@FwF}Wv|19B<MB)K)U+z|db0)0H_HY|+k6eSEAf52)u)3R;)3!kd
z{prQt4#0rZJg)M15_W-jeI>i3J+HR+a876j%v8>FZqq9cA~{aE-5bp;y_qUAm&EEB
zX}I>w`!ow-*_D5N(l9#>4DEkW6snmtN)q?Akj}bcu!8!0l&BMR5j5*sMqNM`zC46<
z|9v)bbi`*%es(e<g0&}2qR21U1uq$I-#yF(Gqkl7=DGq0DkWYVy%kpr8*yVlKkX@f
z_N1Ca^)l98S~0F?&WtCy6v<gw+sHb0?fJZ%EhERScTX>+=2C=Gx3u%xod_HOXh9<_
zv8-{Mx3&SD^gIi@uo~U-;vL7RNpJ2Q%#thlLQ+cOAWLnX;xNJaDY(oQ@$7TDcQw6y
zMcd!uhjBwZGQslzkN_91QAf@xFCE;Mos@G-rGgwh#XMn&eXjK3jds@_n=h60c}8x}
z_w@+j!H>oRZk#%xq3%ywjwo`LgA@@KD<2#UT=u$k<-^^_8h7i|Q@^zQ@*cn3XR3s_
zAo#C%$+fE9(ayuPUC0BphK+t7r(II~Uaou-Sqd!c@dmwnBxk45?d{KzRZKL<`Fv)V
ZsK8ky_?39l4gAjkwLQ)WTW#Z?@NW_mBhUZ<

diff --git a/src/frontend/packages/core/assets/endpoint-icons/github-logo.png b/src/frontend/packages/core/assets/endpoint-icons/github-logo.png
index ea6ff545a246caa64074ba809bbc86fcb8589071..a60aafeb054da98d58970f3e4605671e285081e5 100644
GIT binary patch
literal 1641
zcmd6n`#%#30L2$g9z*4sM`X>b64Mw$bGMk#u-W26)@+zZ<~iG~Y|T|(g(2LCWqIGl
zl!i#R@wvJlUGf%+BFa#-lI#8#_wzaDe1ARXmva;2<*KZxqX+;1l+kWTpIy@bv%KtX
zs))ohyQsi;U{Sl&($M@rYud2RWw#|P-p9)qVEFyp3UKhNENH6BO%wwkNpXbeYWDr&
zX(gF&j-U_&FEr$u@9*iZVPF;i${M?0CZAZG){c_d-3~;ckqB(q^w98BY>lNla0YUO
zfL$%TR6kVagQ`m$?_=!X9olDvDv`&EEkpZ~bd8TVMD&YyNUzSRd|VmC{iv9Hn|Q^I
zp>~RDpekEvWUDP^o~qE0OYiVOjIznzEyNQgmTX7bg22WkgP0n`Xv=*(w9su~--ZY!
z(l_Eeb(Q%oQ*<xcb*pGzQu^5;ueWm5uB4#!T1b@tfLDyZGY?X94Ob&4q{N`aXDv>|
zx>lLth3@lJ<k<meC`;#{jbSzIqRrgg-MF-@m^GzjzsMU>*aWFCi`EVAH4q?V4c>=D
zV*OfkD4Wxnw#CVtO~s!1<^>*mJPIz9;Hja#3Mppiu!^j&gt?`;MYUV_)q@?QgZ0P5
zu`7hHzg=!uj$o|JPU!X~x|o<1IL;!ciOP5NOiBrSv8fV4lH&W>0T=1y%&GMrPY(*J
z@U!<%O-q*eQn#{wRqNz2P;x4-7quu_zx7m=^=9Wz>(p9;@OgUpVjd4;gPok!N*W$^
z_0#+EqG&^r^he<Ww;=bQ)Q1gR=PZMBHVJ~@n+Au0B@}m0)i;;i4-=Pja<#A3o2?Oh
z9)xANyu+MgmmffRVe8Vk%EU0Y3xvAMrt85yBt&*pM(8_B?t11!bmiX>`WWG`CI7KH
zaH|o|g_|9B({~>_e8ywYx{l5_b^5NdBJYP>Y5JyM`i%oA3pE(4ysvsr%5CZ7<f_yy
zVxWkALw`BR(vkZizz9Ds2ab8ghMjO%Sv#KiDL5<fT~QmXrvM>(1lIu}ug}uC6D>*^
zqF8XPSalk6uk)HO^=J6VCy`nz%M#F`FvMX4>nm=gQS(K9tylYYb|RP}t;%r_@}(WK
zslWX_4n#D*ZntHt#}FzdcGRrvvK?D^m39Ouv&C8#nzI^3P2R+{_y71}4Ywxw4KBSo
zt%>(|UeHy<^$03DdDJ%M=<Syfvhf}g9J)XO9yqiz+f$lp1nLQEWT}-X&~#JJp9TJI
z+SBu%`3U)(mB#rz&RFggvkHqf=}1a)N-NM#;yLjQ+?4kb5-3seAbqN;DLcRmV5%d`
z#evdv>Mf(aG~*;lx7wWikLLM2uuxO-WMU~L3(VB1|6naCtpTHg?v$r4XVGKBVB>j8
zEZv)V^HrCT`NN_Q3G?I)C$X~B0o{C-Z;l8DXqP&QZf`(G2e#M2un%`WZ@>VY_hfhc
z+QswR2Vru94Eu75HATA-4xn*@-Q|+$uPy2DN)J9!yDKUhEjQz+#|gOy)g}kEj;P0{
znVZWLT*WRt9@=+4<N=R%1RD7&M?wPKy`3+Q=WlpA?PW&`JLXwmTx|Htq)9V@<T2T$
z(0HFf29+tbvdA96hm3W{MQcyS@P{I!MBqox)b`-gz@H0XYF)Lr6mUH>Vagq;9_@5m
zy5`Wdc!*97_m)iqY*Z_OUY8pgIWNDc%J<Hb$-F!Jr+>WGKCTg<@s`t)JXIiT@&QAx
zl%Th`<)2L;KI7$mx0e!R1e~3?Px0C^H2bOG{f_s%(9OTHbRIS`S29(j0~)g-IHx;h
zqjNsJRyr>sID7D@TEdgKQ^ja0B>*HL-wTlImC;<twK)CMg3<jp*+7bYq*M?`ICSh1
zC;(V%b^L{0(M_9Y$)E_M1g*&fEeJu9Mw?PhiPpRkL8E1CePa9B<^C{)bM<%jus2U%
z!Z^QLdxpsqM#b27U0G1TK__NH8fYiCpEl~^KsB&04YSBL{DxVx-NDU7t4XtrfxJML
hf5owOfvKcy(BK_>{bbyx&7s{l2B1-1$Oe~S_P<D}!RG(~

literal 4268
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
XLyRvu{aX3a{{tgEGu={c*U0|?Dtn-9

diff --git a/src/frontend/packages/core/sass/_all-theme.scss b/src/frontend/packages/core/sass/_all-theme.scss
index 67ae92ae8b..950f0d84f3 100644
--- a/src/frontend/packages/core/sass/_all-theme.scss
+++ b/src/frontend/packages/core/sass/_all-theme.scss
@@ -40,6 +40,7 @@
 @import '../src/shared/components/tile-selector-tile/tile-selector-tile.component.theme';
 @import '../src/shared/components/entity-summary-title/entity-summary-title.component.theme';
 @import '../src/shared/components/multiline-title/multiline-title.component.theme';
+@import '../src/shared/components/intro-screen/intro-screen.component.theme';
 @import '../src/features/user-profile/profile-info/profile-info.component.theme';
 @import '../src/core/stateful-icon/stateful-icon.component.theme';
 @import './components/mat-snack-bar.theme';
@@ -65,6 +66,8 @@
 @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';
+
+
 // Creates the app theme and applies it to the application
 // $theme = Angular Material Theme
 // $nav-theme - Colors for the Side Nav (optional)
@@ -136,4 +139,6 @@
   @include app-user-avatar-theme($theme, $app-theme);
   @include restore-endpoints-theme($theme, $app-theme);
   @include metrics-component-theme($theme, $app-theme);
+  @include intro-screen-theme($theme, $app-theme);
+
 }
diff --git a/src/frontend/packages/core/sass/components/hyperlinks.theme.scss b/src/frontend/packages/core/sass/components/hyperlinks.theme.scss
index e0ab11dd8f..471c2b0284 100644
--- a/src/frontend/packages/core/sass/components/hyperlinks.theme.scss
+++ b/src/frontend/packages/core/sass/components/hyperlinks.theme.scss
@@ -1,10 +1,12 @@
 // Hyperlinks
 @mixin app-hyperlinks($theme, $app-theme) {
-  $primary: map-get($theme, primary);
+  $link-color: map-get($app-theme, link-color);
+  $link-active-color: map-get($app-theme, link-active-color);
+
   a {
-    color: mat-color($primary);
+    color: $link-color;
     &:hover {
-      color: mat-color($primary, 700);
+      color: $link-active-color;
     }
   }
 }
diff --git a/src/frontend/packages/core/src/app.routing.ts b/src/frontend/packages/core/src/app.routing.ts
index 7f85939c8b..acd2e1ae0d 100644
--- a/src/frontend/packages/core/src/app.routing.ts
+++ b/src/frontend/packages/core/src/app.routing.ts
@@ -5,18 +5,18 @@ import { RouterModule, Routes } from '@angular/router';
 import { AuthGuardService } from './core/auth-guard.service';
 import { CoreModule } from './core/core.module';
 import { EndpointsService } from './core/endpoints.service';
+import { NotSetupGuardService } from './core/not-setup-guard.service';
 import { PageNotFoundComponentComponent } from './core/page-not-found-component/page-not-found-component.component';
 import { CustomRoutingImportModule } from './custom-import.module';
 import { DashboardBaseComponent } from './features/dashboard/dashboard-base/dashboard-base.component';
 import { HomePageComponent } from './features/home/home/home-page.component';
 import { NoEndpointsNonAdminComponent } from './features/no-endpoints-non-admin/no-endpoints-non-admin.component';
 import { DomainMismatchComponent } from './features/setup/domain-mismatch/domain-mismatch.component';
+import { LocalAccountWizardComponent } from './features/setup/local-account-wizard/local-account-wizard.component';
+import { SetupWelcomeComponent } from './features/setup/setup-welcome/setup-welcome.component';
 import { ConsoleUaaWizardComponent } from './features/setup/uaa-wizard/console-uaa-wizard.component';
 import { UpgradePageComponent } from './features/setup/upgrade-page/upgrade-page.component';
 import { SharedModule } from './shared/shared.module';
-import { NotSetupGuardService } from './core/not-setup-guard.service';
-import { SetupWelcomeComponent } from './features/setup/setup-welcome/setup-welcome.component';
-import { LocalAccountWizardComponent } from './features/setup/local-account-wizard/local-account-wizard.component';
 
 const appRoutes: Routes = [
   { path: '', redirectTo: 'home', pathMatch: 'full' },
@@ -76,7 +76,8 @@ const appRoutes: Routes = [
         data: {
           stratosNavigation: {
             label: 'Endpoints',
-            matIcon: 'settings_ethernet',
+            matIcon: 'endpoints',
+            matIconFont: 'stratos-icons',
             position: 100,
             requiresPersistence: true
           }
diff --git a/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.theme.scss b/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.theme.scss
index e4023c6b4c..b74eb57f55 100644
--- a/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.theme.scss
+++ b/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.theme.scss
@@ -17,7 +17,7 @@
 
   .side-nav {
     &__nav-toggle {
-      color: mat-color($side-nav-colors, text);
+      color: $side-nav-top-foreground;
     }
     &__inner {
       background-color: mat-color($side-nav-colors, background);
@@ -28,7 +28,7 @@
     }
     &__item {
       color: mat-color($side-nav-colors, text);
-      transition: color ease .3s;
+      transition: none;
       &:hover {
         background-color: $side-nav-hover-color;
         color: mat-color($side-nav-colors, hover-text);
@@ -40,7 +40,7 @@
       }
     }
     &__items {
-      color: map-get($app-theme, app-background-text-color);
+      color: mat-color($side-nav-colors, text);
     }
     &__logo-text {
       color: mat-contrast($primary, 500);
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 2ad24a7196..76504957f7 100644
--- a/src/frontend/packages/core/src/features/endpoints/connect.service.ts
+++ b/src/frontend/packages/core/src/features/endpoints/connect.service.ts
@@ -1,15 +1,5 @@
 import { combineLatest, Observable, of, Subject, Subscription } from 'rxjs';
-import {
-  delay,
-  distinctUntilChanged,
-  filter,
-  map,
-  pairwise,
-  startWith,
-  switchMap,
-  tap,
-  withLatestFrom,
-} from 'rxjs/operators';
+import { delay, distinctUntilChanged, filter, map, pairwise, startWith, switchMap, tap } from 'rxjs/operators';
 
 import { AuthParams, ConnectEndpoint } from '../../../../store/src/actions/endpoint.actions';
 import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
@@ -161,25 +151,6 @@ export class ConnectEndpointService {
     );
   }
 
-  public getConnectingObservable() {
-    return this.isBusy$.pipe(
-      pairwise(),
-      filter(([oldBusy, newBusy]) => {
-        return !(oldBusy === true && newBusy === false);
-      }),
-      withLatestFrom(this.update$),
-      map(([, updateSection]) => ({
-        ...updateSection,
-        completed: !updateSection.busy,
-      })),
-      startWith({
-        busy: true,
-        completed: false,
-        error: false
-      })
-    );
-  }
-
   public destroy() {
     safeUnsubscribe(...this.subs);
   }
diff --git a/src/frontend/packages/core/src/shared/components/intro-screen/intro-screen.component.theme.scss b/src/frontend/packages/core/src/shared/components/intro-screen/intro-screen.component.theme.scss
new file mode 100644
index 0000000000..77ece6a973
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/intro-screen/intro-screen.component.theme.scss
@@ -0,0 +1,11 @@
+@mixin intro-screen-theme($theme, $app-theme) {
+  $intro-bg-color: map-get($app-theme, intro-screen-background-color);
+
+  @if $intro-bg-color {
+    // Remove background image from setup screen (e.g. upgrade screen)
+    app-intro-screen > .intro {
+      background-color: $intro-bg-color;
+      background-image: none;
+    }
+  }
+}
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component.html b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component.html
index ad808f4303..e9e474a2b5 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component.html
@@ -2,11 +2,11 @@
   <ng-container *ngIf="connectable; else notConnectable">
     <ng-container *ngIf="row.connectionStatus === 'connected'">
       <span *ngIf="config?.showLabel">Connected </span>
-      <mat-icon>cloud_done</mat-icon>
+      <mat-icon fontSet="stratos-icons">endpoints_connected</mat-icon>
     </ng-container>
     <ng-container *ngIf="row.connectionStatus === 'disconnected'">
       <span *ngIf="config?.showLabel">Disconnected </span>
-      <mat-icon>cloud_off</mat-icon>
+      <mat-icon fontSet="stratos-icons">endpoints_disconnected</mat-icon>
     </ng-container>
     <ng-container *ngIf="row.connectionStatus === 'checking'">
       <span *ngIf="config?.showLabel">Updating </span>
diff --git a/src/frontend/packages/core/src/shared/components/user-avatar/user-avatar.component.theme.scss b/src/frontend/packages/core/src/shared/components/user-avatar/user-avatar.component.theme.scss
index bc5856b7f3..62c8f12e2c 100644
--- a/src/frontend/packages/core/src/shared/components/user-avatar/user-avatar.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/user-avatar/user-avatar.component.theme.scss
@@ -1,10 +1,33 @@
 @mixin app-user-avatar-theme($theme, $app-theme) {
   $primary: map-get($theme, primary);
+  $user-avatar-background-color: map-get($app-theme, user-avatar-background-color);
+  $user-avatar-foreground-color: map-get($app-theme, user-avatar-foreground-color);
+  $user-avatar-underflow-invert-colors: map-get($app-theme, user-avatar-underflow-invert-colors);
+  $user-avatar-header-invert-colors: map-get($app-theme, user-avatar-header-invert-colors);
 
   .user-avatar {
     &__initials {
-      background-color: mat-contrast($primary, 500);
-      color: mat-color($primary);
+      background-color: $user-avatar-background-color;
+      color: $user-avatar-foreground-color;
     }
   }
+
+  @if $user-avatar-underflow-invert-colors {
+    .user-avatar.user-avatar__large {
+      .user-avatar__initials {
+        background-color: $user-avatar-foreground-color;
+        color: $user-avatar-background-color;
+      }
+    }
+  }
+
+  @if $user-avatar-header-invert-colors {
+    .user-avatar {
+      .user-avatar__initials.user-avatar__header {
+        background-color: $user-avatar-foreground-color;
+        color: $user-avatar-background-color;
+      }
+    }
+  }
+
 }
diff --git a/src/frontend/packages/core/src/shared/components/user-profile-banner/user-profile-banner.component.theme.scss b/src/frontend/packages/core/src/shared/components/user-profile-banner/user-profile-banner.component.theme.scss
index e0e10450c4..460ba1399c 100644
--- a/src/frontend/packages/core/src/shared/components/user-profile-banner/user-profile-banner.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/user-profile-banner/user-profile-banner.component.theme.scss
@@ -1,8 +1,10 @@
 @mixin app-user-profile-banner-component-theme($theme, $app-theme) {
   $primary: map-get($theme, primary);
   $foreground: mat-color($primary, default-contrast);
+
   .user-profile-banner {
-    background-color: mat-color($primary);
+    background-color: map-get($app-theme, underflow-background-color);
+    color: map-get($app-theme, underflow-foreground-color);
     &__avatar {
       color: $foreground;
     }
diff --git a/src/frontend/packages/devkit/src/lib/packages.ts b/src/frontend/packages/devkit/src/lib/packages.ts
index 0cc801f990..aa051f26d5 100644
--- a/src/frontend/packages/devkit/src/lib/packages.ts
+++ b/src/frontend/packages/devkit/src/lib/packages.ts
@@ -61,7 +61,11 @@ export interface AssetMetadata {
 }
 
 // Helpers for getting list of dirs in a dir
-const isDirectory = source => fs.lstatSync(source).isDirectory();
+const isDirectory = source => {
+  const realPath = fs.realpathSync(source);
+  const stats = fs.lstatSync(realPath);
+  return stats.isDirectory();
+}
 const getDirectories = source =>
   fs.readdirSync(source).map(name => path.join(source, name)).filter(isDirectory);
 
diff --git a/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.theme.scss b/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.theme.scss
index 56e8a4a125..9b3138909f 100644
--- a/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.theme.scss
+++ b/src/frontend/packages/shared/src/components/stratos-title/stratos-title.component.theme.scss
@@ -1,6 +1,12 @@
 @mixin stratos-title-component-theme($theme, $app-theme) {
   $primary: map-get($theme, primary);
+  $show-title-text: map-get($app-theme, stratos-title-show-text);
   .stratos-title {
     color: mat-color($primary);
+    @if $show-title-text {
+      .stratos-title__header {
+        display: initial;
+      }
+    }
   }
 }
diff --git a/src/frontend/packages/store/src/types/request.types.ts b/src/frontend/packages/store/src/types/request.types.ts
index e1b855210c..ffe6e1d032 100644
--- a/src/frontend/packages/store/src/types/request.types.ts
+++ b/src/frontend/packages/store/src/types/request.types.ts
@@ -18,16 +18,6 @@ export interface RequestAction extends Action, BasePipelineRequestAction, Single
   updatingKey?: string;
 }
 
-/**
- * The entities in the response can live in a few different places. This will tell us where to look in the response to gather the entities
- * @export
- */
-export enum RequestEntityLocation {
-  RESOURCE, // The response is an object and the entities list is within a 'resource' param. Falls back to 'OBJECT' if missing.
-  ARRAY, // The response is an array which contains the entities
-  OBJECT, // The response is the entity
-}
-
 export type RequestActionEntity = EntitySchema | EntitySchema[];
 export interface EntityRequestAction extends EntityCatalogEntityConfig, RequestAction {
   /**
@@ -53,7 +43,6 @@ export interface EntityRequestAction extends EntityCatalogEntityConfig, RequestA
    * For single entity requests
    */
   guid?: string;
-  entityLocation?: RequestEntityLocation;
   /**
    * For delete requests we clear the pagination sections (include all pages) of all list matching the same entity type. In some cases,
    * like local lists, we want to immediately remove that entry instead of clearing the table and refetching all data. This flag allows that
diff --git a/src/frontend/packages/theme/_helper.scss b/src/frontend/packages/theme/_helper.scss
index ba0c49c6c9..7b9015f992 100644
--- a/src/frontend/packages/theme/_helper.scss
+++ b/src/frontend/packages/theme/_helper.scss
@@ -75,11 +75,19 @@ $oss-dark-theme: mat-dark-theme($oss-dark-primary, $oss-dark-accent, $oss-dark-w
       ansi-colors: $ansi-color-palette,
       header-background-color: mat-color($primary),
       header-foreground-color: mat-contrast($primary, 500),
+      stratos-title-show-text: false,
       // Does the header background color span across the top, or is the sidenav background color used for the top-left portion
       header-background-span: false,
       // Background colors to use for things like the about page header (underflow)
       underflow-background-color: mat-color($primary),
-      underflow-foreground-color: mat-contrast($primary, 500)
+      underflow-foreground-color: mat-contrast($primary, 500),
+      link-color: mat-color($primary),
+      link-active-color: mat-color($primary, 700),
+      user-avatar-background-color: mat-color($primary),
+      user-avatar-foreground-color: mat-contrast($primary, 500),
+      user-avatar-underflow-invert-colors: true,
+      user-avatar-header-invert-colors: true,
+      intro-screen-background-color: null
     )
   );
 }
diff --git a/src/test-e2e/endpoints/endpoints.po.ts b/src/test-e2e/endpoints/endpoints.po.ts
index 506039e4c5..b9899f7110 100644
--- a/src/test-e2e/endpoints/endpoints.po.ts
+++ b/src/test-e2e/endpoints/endpoints.po.ts
@@ -39,7 +39,7 @@ export class EndpointCards extends ListCardComponent {
       const url = urlField.replace('content_copy', '').trim();
       return {
         name: t.substring(0, t.indexOf('\n')),
-        connected: m.find(item => item.key === 'Status').value === 'Connected\ncloud_done',
+        connected: m.find(item => item.key === 'Status').value === 'Connected\nendpoints_connected',
         type: t.substring(t.indexOf('\n') + 1, t.length),
         user,
         isAdmin,
@@ -61,7 +61,7 @@ export class EndpointsTable extends ListTableComponent {
     return row.all(by.tagName('app-table-cell')).map(col => col.getText()).then((data: string[]) => {
       return {
         name: data[0],
-        connected: data[1] === 'cloud_done',
+        connected: data[1] === 'endpoints_connected',
         type: data[2],
         user: data[3],
         isAdmin: data[4].indexOf('Yes') !== -1,

From e3f77c6833f397dcbb0b6d8a89a95c30f598d64f Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Mon, 29 Jun 2020 18:56:18 +0100
Subject: [PATCH 556/648] Update suse customization process with V4 build
 (#397)

* WIP

* Add theme migration

* File moves

* WIP

* Add theme migration

* Start to make core a separate library

* Tweaks

* WIP

* Fix package imports

* Fix migration script

* First pass at permission effects

* Fix merge issues

* First pass at reducer

* Tidy up logging

* Fix dark theme support

* Final set of cloud-foundry code out of common

* TIdy up and get themable packages working

* Tidy up custom build code

* Tidy ups

* Set defaults when no stratos.yaml file is present

* FIx migrate script for when stratos.yaml not present

* Remove comments

* Disable scss linter from code climate

* Rejig example extensions to be a package for v4 build

* Renames, todos

* Minor fixes

* Fix frontend unit test

* Fix removed e2e target

* Fix unit tests

* Tweaks

* Finish todos

* Fix transition from space summary to app summary page
- an entity service for a space with no org was cached by guid
- an entity service for a space requiring org used cached version
- solution is to make cache id include schema key (determines with/without org)

* Add comment, tidy up rootUpdatingKey

* Fix issue where gitlab summary tab threw errors in console
- fixes #4325

* Push combine of permission configs into checkers
- overcomes some weird change of permission type

* Fix issue where default add/remove setting in change role by username was incorrect
- add/remove radio button default value governed by add/remove feature flags
- when one is set to false the radio button should be disabled and the other selected

* Fix store-test-helper

* Update readme following move to Travis-ci.com

* Ensure the correct key is used metacard favourite info (#4321)

* Fix display of details in endpoint card in endpoint list (#4319)

* Clean default/blocked logic

* Rename @stratos to @stratosui

* FIx references in tsconfig.json

* Revert change to @stratosui in code

* Revert change to @stratosui in code

* Fix endpoint connect

* Fix unit test

* Fix e2e test

* Change following review #1

* Bump github.com/gorilla/websocket from 1.4.1 to 1.4.2 in /src/jetstream (#4199)

* Bump github.com/gorilla/websocket from 1.4.1 to 1.4.2 in /src/jetstream

Bumps [github.com/gorilla/websocket](https://github.com/gorilla/websocket) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/gorilla/websocket/releases)
- [Commits](https://github.com/gorilla/websocket/compare/v1.4.1...v1.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Update go.sum

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>

* Fix errors in console log during setup screens

* Helm: Change default image pull policy to Always

* Add copy address and edit to endpoint list view

* Use icon that is less confusing with refresh

* Change following review #2
- Fix cf package module file name
- Make CUSTOM_USER_PERMISSION_CHECKERS optional
- Remove need to inject CUSTOM_USER_PERMISSION_CHECKERS in multiple cf modules

* Add newline at end for codeclimate

* Tidy up code and add some more comments

* Fix for buildpack filename wrapping on card

* Fix code climate issue

* Fix compilation issues

* Update endpoint-list.helpers.ts

* Improve naming

* Tidy up

* Update .gitignore

* Tidy up. Build tools in dist/tools

* Change following review

* Rename tools to devkit. Add schematics

* More improvements and theme schematic added.

* Bump gopkg.in/yaml.v2 from 2.2.8 to 2.3.0 in /src/jetstream (#4336)

* Bump gopkg.in/yaml.v2 from 2.2.8 to 2.3.0 in /src/jetstream

Bumps [gopkg.in/yaml.v2](https://github.com/go-yaml/yaml) from 2.2.8 to 2.3.0.
- [Release notes](https://github.com/go-yaml/yaml/releases)
- [Commits](https://github.com/go-yaml/yaml/compare/v2.2.8...v2.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* CI bump

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil_macdougall@hotmail.com>

* Remove unused import

* Remove unused import

* [Security] Bump websocket-extensions from 0.1.3 to 0.1.4 (#4356)

Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. **This update includes a security fix.**
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Hide deployment info card if not space developer
- fixes #4322

* Only space developers can create/unmap/delete routes in app routes table
- fixes #4324

* Only Space Developers should be able to change count, terminate or ssh to instances
- fixes #4330

* Permissions: Only Space Developers should be able to create/edit/delete an Autoscaler policy
- fixes #4323

* Users with no developer roles could click on add app button
- fixes #4361

* Fix tests

* Fail CI build if imagelist generation fails

* Org Managers: Disable org role checkboxes in roles stepper if not admin/org manager
- fixes #4332

* Routes List: Filter by org breaks when user is an org auditor
- fixes #4343

* Rename the e2e cf helper file

* Fix autoscaler tab

* Changes following review

* A few minor tidy-ups to help with review

* Fix several space developer permission bugs (#4362)

* Hide deployment info card if not space developer
- fixes #4322

* Only space developers can create/unmap/delete routes in app routes table
- fixes #4324

* Only Space Developers should be able to change count, terminate or ssh to instances
- fixes #4330

* Permissions: Only Space Developers should be able to create/edit/delete an Autoscaler policy
- fixes #4323

* Users with no developer roles could click on add app button
- fixes #4361

* Fix tests

* Fix autoscaler tab

* Changes following review

* Fix service stepper navigation (#4366)

* Fix service stepper navigation on create/edit cancel/sumbit
- create service stepper from app service tab, marketplace service summary, service wall
- edit service stepper from marketplace service instances, service wall instances, space service instances and app service instances lists
- fixes #4052, contrinbutes to #4079, #4051

* Fix subscription leak
- fixes #4295
- code no-longer needed

* Force return location of service stepper, fix table edit of upsi and other improvements

* Fix unit tests

* Fix e2e tests

* Fix e2e tests, add search to marketplace service instances table

* Changes following review

* Move base-entity-* to store package

* Add snackbar

* Remove pathget

* Remove more store -> core dependencies

* Move extension-types to store

* Move favourite mgr and helper from core to store

* Move user fav manager and helper to store package

* More references

* Fix logger service removal

* Fix build

* Address PR feedback

* Fix LoggerService after code moves

* Fix logger service ref

* Fix build issues

* Fix health check import

* Move sortStringify (only used once)

* NonOptionalKeys - only used once

* Move KnownKeys

* Move BrowserStandardEncoder

* Remove last environment link

* Move favourite config mapper

* Remove dependency on StratosScopeStrings

* Move BaseEndpointAuth

* Move StratosTheme

* Move ThemeService

* Move types from utils.service that are only used once in store

* Move PermissionValues

* Move http and jetstream helpers

* Move StyleService

* Move MetricQueryType

* Move getFullEndpointApiUrl

* Move StratosStatus

* Move generateStratosEntities back to core

* Finish store -> core sep

* Address PR feedback

* Fix compilation issue

* Fix merge weirdness

* Merge downstream (#4369)

* src based changes

* changes to ./build

* ./docs

* ./

* Changes following review

* Address PR feedback

* Changes following first run of script

* Changes following npm install

* Update custom-src to new model
- expose custom module's module's
- Add routing module
- Tweak stratos.config.ts log output
- remove custom-src dir

* update naming... custom extensions --> suse extensions

* fix build

* whitespace changes

* Fix in core public-api after merge

* Fix duplicated k8s docs

* Typed access to actions and entities via catalog entity: Core Stratos Entities (#4387)

* WIP

* WIP

* WIP

* Endpoint changes

* Fix failure handling during connect on stepper

* Fix favourites

* Removed some TODOs

* Fixes & todos

* Unit test fixes

* Fixes following merge

* Fix cf unit tests

* Changes following review

* Fixes following merge from upstream

* Theming improvements for header

* Tweaks, Migration Script Docs & Notes on others (#4389)

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

* Build devkit outside of dist folder

* Ignore example packages when there's a stratos config file

* Add dist-devkit to git ignore

* Changes following review

* Changes following merge

* Update dir names, remove examples folder

* Add back in custom-src deploy content, also add product version to config

* Revert change needed downstream... (only needed when suse extension is included)

* Ignore example packages when there's a stratos config file (#4399)

* Fix CF App Restage (#4393)

* Remove action entityLocation (not used)

* Fix restage
- fixes #4392

* Remove RequestEntityLocation

* Fix after merge

* Move new terminal & config code to plugin, fix more build files

* Update icons (#4404)

* Update icons

* Update docker icon and optimize other pngs

* Improve resolution of container icon

* Update e2e test for new icons

* Improve theming to reduce need to override in a hacky way (#4407)

* Change following merge

* Fix kube config connect after merge, also fix subtype & error on connect

* Fix e2e

* Remove strange merge artifacts

Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil_macdougall@hotmail.com>
---
 README.md                                     |   1 -
 .../kubernetes-node-pods.component.ts         |  14 --
 .../tasks/dev-releases/create-chart-helper.sh |   4 +-
 deploy/ci/tasks/dev-releases/create-chart.yml |   4 +-
 deploy/kubernetes/build.sh                    |   8 +-
 deploy/kubernetes/console/Chart.yaml          |   2 +-
 .../kubernetes/custom}/__stratos.tpl          |   0
 .../kubernetes/custom}/custom-build.sh        |   0
 .../kubernetes/custom}/customize-helm.sh      |   4 +-
 .../kubernetes/custom}/icon.png               | Bin
 .../kubernetes/custom}/imagelist.txt          |   0
 deploy/kubernetes/imagelist-gen.sh            |   4 +-
 docs/customizing.md                           |   2 +-
 .../frontend/assets/custom/acme_logo.png      | Bin 18891 -> 0 bytes
 examples/custom-src/frontend/assets/eula.html |   5 -
 .../custom-src/frontend/assets/login-bg.jpg   | Bin 672633 -> 0 bytes
 examples/custom-src/frontend/assets/logo.png  | Bin 15035 -> 0 bytes
 examples/custom-src/frontend/favicon.ico      | Bin 1150 -> 0 bytes
 examples/custom-src/frontend/loading.css      |  38 ---
 examples/custom-src/frontend/loading.html     |   3 -
 examples/custom-src/frontend/sass/custom.scss |  18 --
 .../frontend/sass/custom/acme-colors.scss     |   7 -
 .../custom-src/frontend/sass/custom/acme.scss |  71 ------
 examples/custom-src/stratos.yaml              |   2 -
 package-lock.json                             | 234 ++++++------------
 .../app-action-monitor-icon.component.ts      |  32 +--
 src/frontend/packages/store/src/jetstream.ts  |   2 +-
 .../packages/suse-extensions/package.json     |  12 +
 .../demo-helper/demo-helper.component.html    |   0
 .../demo-helper/demo-helper.component.scss    |   0
 .../demo-helper/demo-helper.component.spec.ts |   0
 .../demo/demo-helper/demo-helper.component.ts |   2 +-
 .../helm/chart-view/monocular.component.html  |   0
 .../helm/chart-view/monocular.component.scss  |   0
 .../helm/chart-view/monocular.component.ts    |   2 +-
 .../create-release.component.html             |   0
 .../create-release.component.scss             |   0
 .../create-release.component.spec.ts          |   0
 .../create-release.component.ts               |  10 +-
 .../create-release/create-release.module.ts   |   4 +-
 .../src}/custom/helm/helm-entity-catalog.ts   |   0
 .../src}/custom/helm/helm-entity-factory.ts   |   0
 .../src}/custom/helm/helm-entity-generator.ts |   0
 .../src}/custom/helm/helm-testing.module.ts   |   0
 .../src}/custom/helm/helm.module.ts           |   4 +-
 .../src}/custom/helm/helm.routing.ts          |   0
 .../src}/custom/helm/helm.setup.module.ts     |   8 +-
 .../src}/custom/helm/helm.store.module.ts     |   0
 .../monocular-chart-card.component.html       |   0
 .../monocular-chart-card.component.scss       |   0
 .../monocular-chart-card.component.spec.ts    |   0
 .../monocular-chart-card.component.ts         |   2 +-
 .../monocular-charts-data-source.ts           |   6 +-
 .../monocular-charts-list-config.service.ts   |  10 +-
 ...onocular-repository-list-config.service.ts |  37 +--
 .../monocular-repository-list-source.ts       |  14 +-
 .../monocular-tab-base.component.html         |   0
 .../monocular-tab-base.component.scss         |   0
 .../monocular-tab-base.component.spec.ts      |   0
 .../monocular-tab-base.component.ts           |   0
 .../custom/helm/monocular/app.component.scss  |   0
 .../chart-details-info.component.html         |   0
 .../chart-details-info.component.scss         |   0
 .../chart-details-info.component.spec.ts      |   0
 .../chart-details-info.component.ts           |   0
 .../chart-details-readme.component.html       |   0
 .../chart-details-readme.component.scss       |   0
 .../chart-details-readme.component.spec.ts    |   0
 .../chart-details-readme.component.ts         |   0
 .../chart-details-usage.component.html        |   0
 .../chart-details-usage.component.scss        |   0
 .../chart-details-usage.component.spec.ts     |   0
 .../chart-details-usage.component.ts          |   2 +-
 .../chart-details-versions.component.html     |   0
 .../chart-details-versions.component.scss     |   0
 .../chart-details-versions.component.spec.ts  |   0
 .../chart-details-versions.component.ts       |   0
 .../chart-details.component.html              |   0
 .../chart-details.component.scss              |   0
 .../chart-details.component.spec.ts           |   0
 .../chart-details/chart-details.component.ts  |   0
 .../chart-index/chart-index.component.html    |   0
 .../chart-index/chart-index.component.scss    |   0
 .../chart-index/chart-index.component.spec.ts |   0
 .../chart-index/chart-index.component.ts      |   0
 .../chart-item/chart-item.component.html      |   0
 .../chart-item/chart-item.component.scss      |   0
 .../chart-item/chart-item.component.spec.ts   |   0
 .../chart-item/chart-item.component.ts        |   0
 .../chart-list/chart-list.component.html      |   0
 .../chart-list/chart-list.component.scss      |   0
 .../chart-list/chart-list.component.spec.ts   |   0
 .../chart-list/chart-list.component.ts        |   0
 .../monocular/charts/charts.component.html    |   0
 .../monocular/charts/charts.component.scss    |   0
 .../monocular/charts/charts.component.spec.ts |   0
 .../helm/monocular/charts/charts.component.ts |   0
 .../list-filters/list-filters.component.html  |   0
 .../list-filters/list-filters.component.scss  |   0
 .../list-filters.component.spec.ts            |   0
 .../list-filters/list-filters.component.ts    |   0
 .../list-item/list-item.component.html        |   0
 .../list-item/list-item.component.scss        |   0
 .../list-item/list-item.component.spec.ts     |   0
 .../list-item/list-item.component.ts          |   0
 .../monocular/loader/loader.component.html    |   0
 .../monocular/loader/loader.component.scss    |   0
 .../monocular/loader/loader.component.spec.ts |   0
 .../helm/monocular/loader/loader.component.ts |   0
 .../helm/monocular/panel/panel.component.html |   0
 .../helm/monocular/panel/panel.component.scss |   0
 .../monocular/panel/panel.component.spec.ts   |   0
 .../helm/monocular/panel/panel.component.ts   |   0
 .../monocular/shared/models/chart-version.ts  |   0
 .../helm/monocular/shared/models/chart.ts     |   0
 .../monocular/shared/models/maintainer.ts     |   0
 .../helm/monocular/shared/models/repo.ts      |   0
 .../custom/helm/monocular/shared/seo.data.ts  |   0
 .../shared/services/chart.service.mock.ts     |   0
 .../shared/services/charts.service.ts         |   4 +-
 .../shared/services/config.service.ts         |   0
 .../monocular/shared/services/menu.service.ts |   0
 .../shared/services/repos.service.ts          |   4 +-
 .../custom/helm/store/helm.action-builders.ts |   0
 .../src}/custom/helm/store/helm.actions.ts    |   2 +-
 .../src}/custom/helm/store/helm.effects.ts    |   4 +-
 .../src}/custom/helm/store/helm.types.ts      |   0
 .../catalog-tab/catalog-tab.component.html    |   0
 .../catalog-tab/catalog-tab.component.scss    |   0
 .../catalog-tab/catalog-tab.component.spec.ts |   0
 .../tabs/catalog-tab/catalog-tab.component.ts |   4 +-
 .../repository-tab.component.html             |   0
 .../repository-tab.component.scss             |   0
 .../repository-tab.component.spec.ts          |   0
 .../repository-tab.component.ts               |   3 +-
 .../src}/custom/helm/theme.scss               |   0
 .../kubernetes-aws-auth-form.component.html   |   0
 .../kubernetes-aws-auth-form.component.scss   |   0
 ...kubernetes-aws-auth-form.component.spec.ts |   0
 .../kubernetes-aws-auth-form.component.ts     |   6 +-
 .../kubernetes-certs-auth-form.component.html |   0
 .../kubernetes-certs-auth-form.component.scss |   0
 ...bernetes-certs-auth-form.component.spec.ts |   0
 .../kubernetes-certs-auth-form.component.ts   |   4 +-
 ...kubernetes-config-auth-form.component.html |   0
 ...kubernetes-config-auth-form.component.scss |   0
 ...ernetes-config-auth-form.component.spec.ts |   0
 .../kubernetes-config-auth-form.component.ts  |   6 +-
 .../kubernetes-gke-auth-form.component.html   |   0
 .../kubernetes-gke-auth-form.component.scss   |   0
 ...kubernetes-gke-auth-form.component.spec.ts |   0
 .../kubernetes-gke-auth-form.component.ts     |   4 +-
 .../kube-config-auth.helper.ts                |  10 +-
 .../kube-config-import.component.html         |   0
 .../kube-config-import.component.scss         |   0
 .../kube-config-import.component.spec.ts      |   0
 .../kube-config-import.component.ts           |  84 ++++---
 ...-config-table-import-status.component.html |   0
 ...-config-table-import-status.component.scss |   0
 ...nfig-table-import-status.component.spec.ts |   0
 ...be-config-table-import-status.component.ts |   7 +-
 .../kube-config-registration.component.html   |   0
 .../kube-config-registration.component.scss   |   0
 ...kube-config-registration.component.spec.ts |   0
 .../kube-config-registration.component.ts     |   0
 .../kube-config-selection.component.html      |   0
 .../kube-config-selection.component.scss      |   0
 .../kube-config-selection.component.spec.ts   |   0
 .../kube-config-selection.component.ts        |  23 +-
 .../kube-config-table-cert.component.html     |   0
 .../kube-config-table-cert.component.scss     |   0
 .../kube-config-table-cert.component.spec.ts  |   0
 .../kube-config-table-cert.component.ts       |   2 +-
 .../kube-config-table-name.component.html     |   0
 .../kube-config-table-name.component.scss     |   0
 .../kube-config-table-name.component.spec.ts  |   0
 .../kube-config-table-name.component.ts       |   2 +-
 .../kube-config-table-select.component.html   |   0
 .../kube-config-table-select.component.scss   |   0
 ...kube-config-table-select.component.spec.ts |   0
 .../kube-config-table-select.component.ts     |   2 +-
 ...onfig-table-sub-type-select.component.html |   0
 ...onfig-table-sub-type-select.component.scss |   0
 ...ig-table-sub-type-select.component.spec.ts |   0
 ...-config-table-sub-type-select.component.ts |   0
 ...be-config-table-user-select.component.html |   0
 ...be-config-table-user-select.component.scss |   0
 ...config-table-user-select.component.spec.ts |   0
 ...kube-config-table-user-select.component.ts |   2 +-
 .../kube-config.helper.ts                     |   8 +-
 .../kube-config.types.ts                      |  11 +-
 .../kube-terminal/kube-console.component.html |   0
 .../kube-terminal/kube-console.component.scss |   0
 .../kube-console.component.spec.ts            |   0
 .../kube-terminal/kube-console.component.ts   |  10 +-
 .../kubedash-configuration.component.html     |   0
 .../kubedash-configuration.component.scss     |   0
 .../kubedash-configuration.component.spec.ts  |   0
 .../kubedash-configuration.component.ts       |   6 +-
 .../kubernetes-dashboard.component.html       |   0
 .../kubernetes-dashboard.component.scss       |   0
 .../kubernetes-dashboard.component.spec.ts    |   0
 .../kubernetes-dashboard.component.ts         |   8 +-
 .../kubernetes/kubernetes-entity-catalog.ts   |   0
 .../kubernetes/kubernetes-entity-factory.ts   |   2 +-
 .../kubernetes/kubernetes-entity-generator.ts |   4 +-
 .../kubernetes/kubernetes-metrics.helpers.ts  |   0
 .../kubernetes-namespace-pods.component.html  |   0
 .../kubernetes-namespace-pods.component.scss  |   0
 .../kubernetes-namespace-pods.component.ts    |   4 +-
 ...bernetes-namespace-services.component.html |   0
 ...bernetes-namespace-services.component.scss |   0
 ...netes-namespace-services.component.spec.ts |   0
 ...kubernetes-namespace-services.component.ts |   2 +-
 .../kubernetes-namespace.component.html       |   0
 .../kubernetes-namespace.component.scss       |   0
 .../kubernetes-namespace.component.ts         |   2 +-
 ...etes-node-metric-stats-card.component.html |   0
 ...etes-node-metric-stats-card.component.scss |   0
 ...s-node-metric-stats-card.component.spec.ts |   0
 ...rnetes-node-metric-stats-card.component.ts |   9 +-
 ...bernetes-node-metrics-chart.component.html |   0
 ...bernetes-node-metrics-chart.component.scss |   0
 ...netes-node-metrics-chart.component.spec.ts |   0
 ...kubernetes-node-metrics-chart.component.ts |   8 +-
 .../kubernetes-node-metrics.component.html    |   0
 .../kubernetes-node-metrics.component.scss    |   0
 .../kubernetes-node-metrics.component.spec.ts |   0
 .../kubernetes-node-metrics.component.ts      |  16 +-
 ...bernetes-node-simple-metric.component.html |   0
 ...bernetes-node-simple-metric.component.scss |   0
 ...netes-node-simple-metric.component.spec.ts |   0
 ...kubernetes-node-simple-metric.component.ts |   0
 .../kubernetes-node-pods.component.html       |   0
 .../kubernetes-node-pods.component.scss       |   0
 .../kubernetes-node-pods.component.spec.ts    |   0
 .../kubernetes-node-pods.component.ts         |  17 ++
 .../kubernetes-node.component.html            |   0
 .../kubernetes-node.component.scss            |   0
 .../kubernetes-node.component.spec.ts         |   0
 .../kubernetes-node.component.ts              |   4 +-
 .../kubernetes/kubernetes-page.types.ts       |   0
 .../kubernetes-resource-viewer.component.html |   0
 .../kubernetes-resource-viewer.component.scss |   0
 ...bernetes-resource-viewer.component.spec.ts |   0
 .../kubernetes-resource-viewer.component.ts   |   4 +-
 .../kubernetes-tab-base.component.html        |   0
 .../kubernetes-tab-base.component.scss        |   0
 .../kubernetes-tab-base.component.spec.ts     |   0
 .../kubernetes-tab-base.component.ts          |   2 +-
 .../custom/kubernetes/kubernetes.module.ts    |   4 +-
 .../custom/kubernetes/kubernetes.routing.ts   |   0
 .../kubernetes/kubernetes.setup.module.ts     |   8 +-
 .../kubernetes/kubernetes.store.module.ts     |   0
 .../kubernetes/kubernetes.testing.module.ts   |   8 +-
 .../kubernetes/kubernetes.component.html      |   0
 .../kubernetes/kubernetes.component.scss      |   0
 .../kubernetes/kubernetes.component.spec.ts   |   0
 .../kubernetes/kubernetes.component.ts        |   6 +-
 .../list-types/kube-helm-list-types.ts        |   0
 .../kubernetes/list-types/kube-list.helper.ts |   4 +-
 .../kubernetes-endpoints-data-source.ts       |  10 +-
 ...ubernetes-endpoints-list-config.service.ts |  20 +-
 .../kubernetes-labels-cell.component.html     |   0
 .../kubernetes-labels-cell.component.scss     |   0
 .../kubernetes-labels-cell.component.spec.ts  |   4 +-
 .../kubernetes-labels-cell.component.ts       |   4 +-
 .../kubernetes-namespace-pods-data-source.ts  |   4 +-
 ...etes-namespace-pods-list-config.service.ts |   0
 ...bernetes-namespace-services-data-source.ts |   2 +-
 ...-namespace-services-list-config.service.ts |   0
 .../kube-namespace-pod-count.component.html   |   0
 .../kube-namespace-pod-count.component.scss   |   0
 ...kube-namespace-pod-count.component.spec.ts |   0
 .../kube-namespace-pod-count.component.ts     |   9 +-
 .../kubernetes-namespace-link.component.html  |   0
 .../kubernetes-namespace-link.component.scss  |   0
 ...ubernetes-namespace-link.component.spec.ts |   0
 .../kubernetes-namespace-link.component.ts    |   2 +-
 .../kubernetes-namespaces-data-source.ts      |   4 +-
 ...bernetes-namespaces-list-config.service.ts |   6 +-
 .../kubernetes-node-pods-data-source.ts       |   4 +-
 ...ubernetes-node-pods-list-config.service.ts |   0
 .../condition-cell.component.html             |   0
 .../condition-cell.component.scss             |   0
 .../condition-cell.component.spec.ts          |   0
 .../condition-cell.component.ts               |   2 +-
 .../kubernetes-node-capacity.component.html   |   0
 .../kubernetes-node-capacity.component.scss   |   0
 ...kubernetes-node-capacity.component.spec.ts |   0
 .../kubernetes-node-capacity.component.ts     |   5 +-
 .../kubernetes-node-ips.component.html        |   0
 .../kubernetes-node-ips.component.scss        |   0
 .../kubernetes-node-ips.component.spec.ts     |   0
 .../kubernetes-node-ips.component.ts          |   2 +-
 .../kubernetes-node-labels.component.html     |   0
 .../kubernetes-node-labels.component.scss     |   0
 .../kubernetes-node-labels.component.spec.ts  |   0
 .../kubernetes-node-labels.component.ts       |   2 +-
 .../kubernetes-node-link.component.html       |   0
 .../kubernetes-node-link.component.scss       |   0
 .../kubernetes-node-link.component.spec.ts    |   0
 .../kubernetes-node-link.component.ts         |   2 +-
 .../kubernetes-node-pressure.component.html   |   0
 .../kubernetes-node-pressure.component.scss   |   0
 ...kubernetes-node-pressure.component.spec.ts |   0
 ...ernetes-node-pressure.component.theme.scss |   0
 .../kubernetes-node-pressure.component.ts     |   2 +-
 ...ernetes-node-condition-card.component.html |   0
 ...ernetes-node-condition-card.component.scss |   0
 ...etes-node-condition-card.component.spec.ts |   0
 ...ubernetes-node-condition-card.component.ts |   0
 .../kubernetes-node-condition.component.html  |   0
 .../kubernetes-node-condition.component.scss  |   0
 .../kubernetes-node-condition.component.ts    |   0
 .../kubernetes-node-info-card.component.html  |   0
 .../kubernetes-node-info-card.component.scss  |   0
 ...ubernetes-node-info-card.component.spec.ts |   0
 .../kubernetes-node-info-card.component.ts    |   0
 ...ubernetes-node-summary-card.component.html |   0
 ...ubernetes-node-summary-card.component.scss |   0
 ...rnetes-node-summary-card.component.spec.ts |   2 +-
 .../kubernetes-node-summary-card.component.ts |   5 +-
 .../kubernetes-node-summary.component.html    |   0
 .../kubernetes-node-summary.component.scss    |   0
 .../kubernetes-node-summary.component.spec.ts |   0
 .../kubernetes-node-summary.component.ts      |   0
 .../kubernetes-node-tags-card.component.html  |   0
 .../kubernetes-node-tags-card.component.scss  |   0
 ...ubernetes-node-tags-card.component.spec.ts |   0
 .../kubernetes-node-tags-card.component.ts    |   7 +-
 .../kubernetes-nodes-data-source.ts           |   8 +-
 .../kubernetes-nodes-list-config.service.ts   |  10 +-
 .../node-pod-count.component.html             |   0
 .../node-pod-count.component.scss             |   0
 .../node-pod-count.component.spec.ts          |   0
 .../node-pod-count.component.ts               |   4 +-
 .../kubernetes-pod-containers.component.html  |   0
 .../kubernetes-pod-containers.component.scss  |   0
 ...ubernetes-pod-containers.component.spec.ts |   0
 .../kubernetes-pod-containers.component.ts    |  16 +-
 .../kubernetes-pod-status.component.html      |   0
 .../kubernetes-pod-status.component.scss      |   0
 .../kubernetes-pod-status.component.spec.ts   |   0
 .../kubernetes-pod-status.component.ts        |   2 +-
 .../kubernetes-pod-tags.component.html        |   0
 .../kubernetes-pod-tags.component.scss        |   0
 .../kubernetes-pod-tags.component.spec.ts     |   0
 .../kubernetes-pod-tags.component.ts          |   7 +-
 .../kubernetes-pods-data-source.ts            |   4 +-
 .../kubernetes-pods-list-config.service.ts    |   8 +-
 .../kubernetes-service-ports.component.html   |   0
 .../kubernetes-service-ports.component.scss   |   0
 ...kubernetes-service-ports.component.spec.ts |   0
 .../kubernetes-service-ports.component.ts     |   4 +-
 .../kubernetes-service-card.component.html    |   0
 .../kubernetes-service-card.component.scss    |   0
 .../kubernetes-service-card.component.spec.ts |   0
 .../kubernetes-service-card.component.ts      |   0
 .../kubernetes-service-list-config.service.ts |   8 +-
 .../kubernetes-services-data-source.ts        |   4 +-
 .../pod-metrics/pod-metrics.component.html    |   0
 .../pod-metrics/pod-metrics.component.scss    |   0
 .../pod-metrics/pod-metrics.component.spec.ts |   0
 .../pod-metrics/pod-metrics.component.ts      |  16 +-
 .../services/kubernetes-endpoint.service.ts   |   0
 .../services/kubernetes-expanded-state.ts     |   0
 .../services/kubernetes-namespace.service.ts  |   2 +-
 .../services/kubernetes-node.service.ts       |   4 +-
 .../kubernetes/services/kubernetes.service.ts |   5 +-
 .../action-builders/kube.action-builders.ts   |   0
 .../custom/kubernetes/store/kube.getIds.ts    |   2 +-
 .../custom/kubernetes/store/kube.types.ts     |   0
 .../kubernetes/store/kubernetes.actions.ts    |   0
 .../kubernetes/store/kubernetes.effects.ts    |   4 +-
 .../kubernetes-namespaces-tab.component.html  |   0
 .../kubernetes-namespaces-tab.component.scss  |   0
 .../kubernetes-namespaces-tab.component.ts    |   8 +-
 .../kubernetes-nodes-tab.component.html       |   0
 .../kubernetes-nodes-tab.component.scss       |   0
 .../kubernetes-nodes-tab.component.spec.ts    |   0
 .../kubernetes-nodes-tab.component.ts         |   2 +-
 .../kubernetes-pods-tab.component.html        |   0
 .../kubernetes-pods-tab.component.scss        |   0
 .../kubernetes-pods-tab.component.spec.ts     |   0
 .../kubernetes-pods-tab.component.ts          |   4 +-
 .../kubernetes-summary.component.html         |   0
 .../kubernetes-summary.component.scss         |   0
 .../kubernetes-summary.component.spec.ts      |   0
 .../kubernetes-summary.component.theme.scss   |   0
 .../kubernetes-summary.component.ts           |  10 +-
 .../helm-release-card.component.html          |   0
 .../helm-release-card.component.scss          |   0
 .../helm-release-card.component.spec.ts       |   0
 .../helm-release-card.component.ts            |   2 +-
 .../helm-release-pods-list-config.service.ts  |   0
 .../helm-release-pods-list-source.ts          |   0
 ...lm-release-services-list-config.service.ts |   0
 .../helm-release-services-list-source.ts      |   0
 .../helm-releases-list-config.service.ts      |   0
 .../list-types/helm-releases-list-source.ts   |   0
 .../kube-namespaces-filter-config.service.ts  |   0
 .../helm-release-tab-base.component.html      |   0
 .../helm-release-tab-base.component.scss      |   0
 .../helm-release-tab-base.component.spec.ts   |   0
 .../helm-release-tab-base.component.ts        |  15 +-
 .../tabs/helm-release-helper.service.ts       |   0
 .../helm-release-notes-tab.component.html     |   0
 .../helm-release-notes-tab.component.scss     |   0
 .../helm-release-notes-tab.component.spec.ts  |   0
 .../helm-release-notes-tab.component.ts       |   0
 .../helm-release-pods-tab.component.html      |   0
 .../helm-release-pods-tab.component.scss      |   0
 .../helm-release-pods-tab.component.spec.ts   |   0
 .../helm-release-pods-tab.component.ts        |   0
 ...helm-release-resource-graph.component.html |   0
 ...helm-release-resource-graph.component.scss |   0
 ...m-release-resource-graph.component.spec.ts |   0
 .../helm-release-resource-graph.component.ts  |   0
 .../helm-release-services-tab.component.html  |   0
 .../helm-release-services-tab.component.scss  |   0
 ...elm-release-services-tab.component.spec.ts |   0
 .../helm-release-services-tab.component.ts    |   0
 .../helm-release-summary-tab.component.html   |   0
 .../helm-release-summary-tab.component.scss   |   0
 ...helm-release-summary-tab.component.spec.ts |   0
 .../helm-release-summary-tab.component.ts     |   9 +-
 .../helm-release-values-tab.component.html    |   0
 .../helm-release-values-tab.component.scss    |   0
 .../helm-release-values-tab.component.spec.ts |   0
 .../helm-release-values-tab.component.ts      |   0
 .../releases-tab/releases-tab.component.html  |   0
 .../releases-tab/releases-tab.component.scss  |   0
 .../releases-tab.component.spec.ts            |   0
 .../releases-tab/releases-tab.component.ts    |   2 +-
 .../store/workload-action-builders.ts         |   0
 .../store/workloads-entity-factory.ts         |   0
 .../store/workloads-entity-generator.ts       |   0
 .../workloads/store/workloads.actions.ts      |   0
 .../workloads/store/workloads.effects.ts      |   0
 .../workloads/store/workloads.reducers.ts     |   0
 .../workloads/store/workloads.store.module.ts |   0
 .../kubernetes/workloads/workload.types.ts    |   0
 .../workloads/workloads-entity-catalog.ts     |   0
 .../kubernetes/workloads/workloads.module.ts  |   4 +-
 .../kubernetes/workloads/workloads.routing.ts |   0
 .../suse-about-info.component.html            |   0
 .../suse-about-info.component.scss            |   0
 .../suse-about-info.component.ts              |   2 +-
 .../suse-login/suse-login.component.html      |   0
 .../suse-login/suse-login.component.scss      |   3 +-
 .../suse-login/suse-login.component.spec.ts   |   0
 .../custom/suse-login/suse-login.component.ts |   6 +-
 .../src/custom/suse-routing.module.ts         |   2 +-
 .../suse-welcome/suse-welcome.component.html  |   0
 .../suse-welcome/suse-welcome.component.scss  |   2 +-
 .../suse-welcome/suse-welcome.component.ts    |   0
 .../suse-extensions/src/custom/suse.module.ts |  14 +-
 .../suse-extensions/src/public-api.ts         |   4 +
 src/frontend/packages/suse-theme/_index.scss  |   9 +
 .../suse-theme/assets/core}/custom/aks.svg    |   0
 .../assets/core}/custom/app_placeholder.svg   |   0
 .../suse-theme/assets/core}/custom/caasp.png  | Bin
 .../suse-theme/assets/core}/custom/eks.svg    |   0
 .../suse-theme/assets/core}/custom/gke.svg    |   0
 .../suse-theme/assets/core}/custom/helm.svg   |   0
 .../core}/custom/help/en/connecting_gke.md    |   0
 .../assets/core}/custom/kube_import.png       | Bin
 .../assets/core}/custom/kubernetes.svg        |   0
 .../assets/core}/custom/placeholder.png       | Bin
 .../assets/core}/custom/suse_logo.png         | Bin
 .../assets/core}/custom/susecon-logo.svg      |   0
 .../suse-theme/assets/core}/eula.html         |   0
 .../packages/suse-theme/assets/core}/logo.png | Bin
 .../suse-theme/assets/core}/nav-logo-icon.png | Bin
 .../suse-theme/assets/core}/nav-logo.png      | Bin
 .../packages/suse-theme/assets}/favicon.ico   | Bin
 .../packages/suse-theme/loader}/loading.css   |   0
 .../packages/suse-theme/loader}/loading.html  |   0
 src/frontend/packages/suse-theme/package.json |  18 ++
 .../packages/suse-theme}/sass/custom.scss     |   0
 .../suse-theme}/sass/custom/suse-colors.scss  |   0
 .../suse-theme}/sass/custom/suse.scss         |   0
 src/jetstream/go.sum                          |   4 +
 src/test-e2e/e2e.ts                           |   2 +-
 src/tsconfig.json                             |   3 +-
 custom-src/stratos.yaml => stratos.yaml       |   0
 487 files changed, 558 insertions(+), 661 deletions(-)
 delete mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts
 rename {custom-src/deploy/kubernetes => deploy/kubernetes/custom}/__stratos.tpl (100%)
 rename {custom-src/deploy/kubernetes => deploy/kubernetes/custom}/custom-build.sh (100%)
 rename {custom-src/deploy/kubernetes => deploy/kubernetes/custom}/customize-helm.sh (95%)
 rename {custom-src/deploy/kubernetes => deploy/kubernetes/custom}/icon.png (100%)
 rename {custom-src/deploy/kubernetes => deploy/kubernetes/custom}/imagelist.txt (100%)
 delete mode 100644 examples/custom-src/frontend/assets/custom/acme_logo.png
 delete mode 100644 examples/custom-src/frontend/assets/eula.html
 delete mode 100644 examples/custom-src/frontend/assets/login-bg.jpg
 delete mode 100644 examples/custom-src/frontend/assets/logo.png
 delete mode 100644 examples/custom-src/frontend/favicon.ico
 delete mode 100644 examples/custom-src/frontend/loading.css
 delete mode 100644 examples/custom-src/frontend/loading.html
 delete mode 100644 examples/custom-src/frontend/sass/custom.scss
 delete mode 100644 examples/custom-src/frontend/sass/custom/acme-colors.scss
 delete mode 100644 examples/custom-src/frontend/sass/custom/acme.scss
 delete mode 100644 examples/custom-src/stratos.yaml
 create mode 100644 src/frontend/packages/suse-extensions/package.json
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/demo/demo-helper/demo-helper.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/demo/demo-helper/demo-helper.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/demo/demo-helper/demo-helper.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/demo/demo-helper/demo-helper.component.ts (89%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/chart-view/monocular.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/chart-view/monocular.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/chart-view/monocular.component.ts (93%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/create-release/create-release.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/create-release/create-release.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/create-release/create-release.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/create-release/create-release.component.ts (94%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/create-release/create-release.module.ts (69%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/helm-entity-catalog.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/helm-entity-factory.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/helm-entity-generator.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/helm-testing.module.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/helm.module.ts (95%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/helm.routing.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/helm.setup.module.ts (79%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/helm.store.module.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.ts (82%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/list-types/monocular-charts-data-source.ts (81%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/list-types/monocular-charts-list-config.service.ts (90%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/list-types/monocular-repository-list-config.service.ts (81%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/list-types/monocular-repository-list-source.ts (84%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular-tab-base/monocular-tab-base.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular-tab-base/monocular-tab-base.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular-tab-base/monocular-tab-base.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular-tab-base/monocular-tab-base.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/app.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts (94%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-details/chart-details.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-details/chart-details.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-details/chart-details.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-details/chart-details.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-index/chart-index.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-index/chart-index.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-index/chart-index.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-index/chart-index.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-item/chart-item.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-item/chart-item.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-item/chart-item.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-item/chart-item.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-list/chart-list.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-list/chart-list.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-list/chart-list.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/chart-list/chart-list.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/charts/charts.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/charts/charts.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/charts/charts.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/charts/charts.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/list-filters/list-filters.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/list-filters/list-filters.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/list-filters/list-filters.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/list-filters/list-filters.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/list-item/list-item.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/list-item/list-item.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/list-item/list-item.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/list-item/list-item.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/loader/loader.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/loader/loader.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/loader/loader.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/loader/loader.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/panel/panel.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/panel/panel.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/panel/panel.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/panel/panel.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/shared/models/chart-version.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/shared/models/chart.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/shared/models/maintainer.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/shared/models/repo.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/shared/seo.data.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/shared/services/chart.service.mock.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/shared/services/charts.service.ts (98%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/shared/services/config.service.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/shared/services/menu.service.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/monocular/shared/services/repos.service.ts (93%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/store/helm.action-builders.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/store/helm.actions.ts (96%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/store/helm.effects.ts (98%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/store/helm.types.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/tabs/catalog-tab/catalog-tab.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/tabs/catalog-tab/catalog-tab.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/tabs/catalog-tab/catalog-tab.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/tabs/catalog-tab/catalog-tab.component.ts (60%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/tabs/repository-tab/repository-tab.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/tabs/repository-tab/repository-tab.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/tabs/repository-tab/repository-tab.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/tabs/repository-tab/repository-tab.component.ts (80%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/helm/theme.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.ts (71%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts (96%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.ts (76%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.ts (83%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-auth.helper.ts (91%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts (80%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.ts (65%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-registration.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-registration.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-registration.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-registration.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts (90%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.ts (95%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts (78%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.ts (85%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.ts (88%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config.helper.ts (94%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-config-registration/kube-config.types.ts (82%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-terminal/kube-console.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-terminal/kube-console.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-terminal/kube-console.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kube-terminal/kube-console.component.ts (88%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts (95%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts (95%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-entity-catalog.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-entity-factory.ts (97%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-entity-generator.ts (98%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-metrics.helpers.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.ts (76%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.ts (84%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts (93%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.ts (84%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.ts (83%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts (81%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.spec.ts (100%)
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-node/kubernetes-node.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-node/kubernetes-node.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts (91%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-page.types.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts (95%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts (94%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes.module.ts (98%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes.routing.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes.setup.module.ts (92%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes.store.module.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes.testing.module.ts (85%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes/kubernetes.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes/kubernetes.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes/kubernetes.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/kubernetes/kubernetes.component.ts (87%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kube-helm-list-types.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kube-list.helper.ts (88%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts (87%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts (76%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts (84%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.ts (76%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts (84%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts (88%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.ts (81%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.ts (87%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts (82%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts (91%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts (81%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts (89%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.ts (76%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.ts (88%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.ts (85%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts (87%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.theme.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.ts (88%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts (93%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts (88%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.ts (81%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts (85%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts (93%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.ts (81%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts (88%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts (93%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.ts (73%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts (79%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts (93%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts (70%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts (83%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts (79%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/pod-metrics/pod-metrics.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/pod-metrics/pod-metrics.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/pod-metrics/pod-metrics.component.ts (92%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/services/kubernetes-endpoint.service.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/services/kubernetes-expanded-state.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/services/kubernetes-namespace.service.ts (93%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/services/kubernetes-node.service.ts (95%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/services/kubernetes.service.ts (83%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/store/action-builders/kube.action-builders.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/store/kube.getIds.ts (97%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/store/kube.types.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/store/kubernetes.actions.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/store/kubernetes.effects.ts (98%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.ts (58%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.ts (83%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.ts (74%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.theme.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts (97%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts (93%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/list-types/helm-release-pods-list-config.service.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/list-types/helm-release-services-list-config.service.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts (93%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts (95%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/releases-tab/releases-tab.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/releases-tab/releases-tab.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts (92%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/store/workload-action-builders.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/store/workloads-entity-factory.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/store/workloads-entity-generator.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/store/workloads.actions.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/store/workloads.effects.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/store/workloads.reducers.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/store/workloads.store.module.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/workload.types.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/workloads-entity-catalog.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/workloads.module.ts (92%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/kubernetes/workloads/workloads.routing.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/suse-about-info/suse-about-info.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/suse-about-info/suse-about-info.component.scss (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/suse-about-info/suse-about-info.component.ts (92%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/suse-login/suse-login.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/suse-login/suse-login.component.scss (98%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/suse-login/suse-login.component.spec.ts (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/suse-login/suse-login.component.ts (72%)
 rename custom-src/frontend/app/custom/custom-routing.module.ts => src/frontend/packages/suse-extensions/src/custom/suse-routing.module.ts (97%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/suse-welcome/suse-welcome.component.html (100%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/suse-welcome/suse-welcome.component.scss (91%)
 rename {custom-src/frontend/app => src/frontend/packages/suse-extensions/src}/custom/suse-welcome/suse-welcome.component.ts (100%)
 rename custom-src/frontend/app/custom/custom.module.ts => src/frontend/packages/suse-extensions/src/custom/suse.module.ts (84%)
 create mode 100644 src/frontend/packages/suse-extensions/src/public-api.ts
 create mode 100644 src/frontend/packages/suse-theme/_index.scss
 rename {custom-src/frontend/assets => src/frontend/packages/suse-theme/assets/core}/custom/aks.svg (100%)
 rename {custom-src/frontend/assets => src/frontend/packages/suse-theme/assets/core}/custom/app_placeholder.svg (100%)
 rename {custom-src/frontend/assets => src/frontend/packages/suse-theme/assets/core}/custom/caasp.png (100%)
 rename {custom-src/frontend/assets => src/frontend/packages/suse-theme/assets/core}/custom/eks.svg (100%)
 rename {custom-src/frontend/assets => src/frontend/packages/suse-theme/assets/core}/custom/gke.svg (100%)
 rename {custom-src/frontend/assets => src/frontend/packages/suse-theme/assets/core}/custom/helm.svg (100%)
 rename {custom-src/frontend/assets => src/frontend/packages/suse-theme/assets/core}/custom/help/en/connecting_gke.md (100%)
 rename {custom-src/frontend/assets => src/frontend/packages/suse-theme/assets/core}/custom/kube_import.png (100%)
 rename {custom-src/frontend/assets => src/frontend/packages/suse-theme/assets/core}/custom/kubernetes.svg (100%)
 rename {custom-src/frontend/assets => src/frontend/packages/suse-theme/assets/core}/custom/placeholder.png (100%)
 rename {custom-src/frontend/assets => src/frontend/packages/suse-theme/assets/core}/custom/suse_logo.png (100%)
 rename {custom-src/frontend/assets => src/frontend/packages/suse-theme/assets/core}/custom/susecon-logo.svg (100%)
 rename {custom-src/frontend/assets => src/frontend/packages/suse-theme/assets/core}/eula.html (100%)
 rename {custom-src/frontend/assets => src/frontend/packages/suse-theme/assets/core}/logo.png (100%)
 rename {custom-src/frontend/assets => src/frontend/packages/suse-theme/assets/core}/nav-logo-icon.png (100%)
 rename {custom-src/frontend/assets => src/frontend/packages/suse-theme/assets/core}/nav-logo.png (100%)
 rename {custom-src/frontend => src/frontend/packages/suse-theme/assets}/favicon.ico (100%)
 rename {custom-src/frontend => src/frontend/packages/suse-theme/loader}/loading.css (100%)
 rename {custom-src/frontend => src/frontend/packages/suse-theme/loader}/loading.html (100%)
 create mode 100644 src/frontend/packages/suse-theme/package.json
 rename {custom-src/frontend => src/frontend/packages/suse-theme}/sass/custom.scss (100%)
 rename {custom-src/frontend => src/frontend/packages/suse-theme}/sass/custom/suse-colors.scss (100%)
 rename {custom-src/frontend => src/frontend/packages/suse-theme}/sass/custom/suse.scss (100%)
 rename custom-src/stratos.yaml => stratos.yaml (100%)

diff --git a/README.md b/README.md
index d49aa9dec1..d00d11eb12 100644
--- a/README.md
+++ b/README.md
@@ -71,4 +71,3 @@ Tested with Browserstack
 ## License
 
 The work done has been licensed under Apache License 2.0. The license file can be found [here](LICENSE).
-
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts
deleted file mode 100644
index d4b5478234..0000000000
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { ListConfig } from '../../../../shared/components/list/list.component.types';
-import { KubernetesNodePodsListConfigService } from '../../list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service';
-
-@Component({
-  selector: 'app-kubernetes-node-pods',
-  templateUrl: './kubernetes-node-pods.component.html',
-  styleUrls: ['./kubernetes-node-pods.component.scss'],
-  providers: [{
-    provide: ListConfig,
-    useClass: KubernetesNodePodsListConfigService,
-  }]
-})
-export class KubernetesNodePodsComponent {}
diff --git a/deploy/ci/tasks/dev-releases/create-chart-helper.sh b/deploy/ci/tasks/dev-releases/create-chart-helper.sh
index a08c7e13f6..2c8b5218f1 100644
--- a/deploy/ci/tasks/dev-releases/create-chart-helper.sh
+++ b/deploy/ci/tasks/dev-releases/create-chart-helper.sh
@@ -81,8 +81,8 @@ patchHelmChartAppVersion() {
   local CHART_PATH=$1
   local STRATOS_FOLDER=$2
 
-  if [ -f "${STRATOS_FOLDER}/custom-src/stratos.yaml" ]; then
-    PROD_VERSION=$(cat "${STRATOS_FOLDER}/custom-src/stratos.yaml" | grep "productVersion")
+  if [ -f "${STRATOS_FOLDER}/stratos.yaml" ]; then
+    PROD_VERSION=$(cat "${STRATOS_FOLDER}/stratos.yaml" | grep "productVersion")
     if [ ! -z "${PROD_VERSION}" ]; then
       PROD_VERSION=$(echo $PROD_VERSION | grep --extended --only-matching '[0-9\.]+')
       if [ ! -z "${PROD_VERSION}" ]; then
diff --git a/deploy/ci/tasks/dev-releases/create-chart.yml b/deploy/ci/tasks/dev-releases/create-chart.yml
index 043e6be351..9cb8935fd7 100644
--- a/deploy/ci/tasks/dev-releases/create-chart.yml
+++ b/deploy/ci/tasks/dev-releases/create-chart.yml
@@ -38,9 +38,9 @@ run:
       updateHelmDependency
 
       # Run customization script if there is one
-      if [ -f "${STRATOS}/custom-src/deploy/kubernetes/customize-helm.sh" ]; then
+      if [ -f "${STRATOS}/deploy/kubernetes/custom/customize-helm.sh" ]; then
         echo "Applying Helm Chart customizations"
-        ${STRATOS}/custom-src/deploy/kubernetes/customize-helm.sh "${STRATOS}/deploy/kubernetes/console"
+        ${STRATOS}/deploy/kubernetes/custom/customize-helm.sh "${STRATOS}/deploy/kubernetes/console"
       fi
 
       # Generate imagelist
diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
index 1b19bf1408..f838cc3549 100755
--- a/deploy/kubernetes/build.sh
+++ b/deploy/kubernetes/build.sh
@@ -137,8 +137,8 @@ __DIRNAME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 STRATOS_PATH=${__DIRNAME}/../../
 source "${STRATOS_PATH}/deploy/common-build.sh"
 
-if [ -f "${STRATOS_PATH}/custom-src/deploy/kubernetes/custom-build.sh" ]; then
-  source "${STRATOS_PATH}/custom-src/deploy/kubernetes/custom-build.sh"
+if [ -f "${STRATOS_PATH}/deploy/kubernetes/custom/custom-build.sh" ]; then
+  source "${STRATOS_PATH}/deploy/kubernetes/custom/custom-build.sh"
   HAS_CUSTOM_BUILD="true"
 fi
 
@@ -238,9 +238,9 @@ rm -rf "${DEST_HELM_CHART_PATH}/**/*.orig"
 
 # Run customization script if there is one
 # This can do things like provide a custom __stratos.tpl file
-if [ -f "${STRATOS_PATH}/custom-src/deploy/kubernetes/customize-helm.sh" ]; then
+if [ -f "${STRATOS_PATH}/deploy/kubernetes/custom/customize-helm.sh" ]; then
   printf "${YELLOW}${BOLD}Applying Helm Chart customizations${RESET}\n"
-  "${STRATOS_PATH}/custom-src/deploy/kubernetes/customize-helm.sh" "${DEST_HELM_CHART_PATH}"
+  "${STRATOS_PATH}/deploy/kubernetes/custom/customize-helm.sh" "${DEST_HELM_CHART_PATH}"
 fi
 
 # Fetch subcharts
diff --git a/deploy/kubernetes/console/Chart.yaml b/deploy/kubernetes/console/Chart.yaml
index c12c15f631..22538c426e 100644
--- a/deploy/kubernetes/console/Chart.yaml
+++ b/deploy/kubernetes/console/Chart.yaml
@@ -5,4 +5,4 @@ version: 0.1.0
 appVersion: 0.1.0
 sources:
   - https://github.com/cloudfoundry/stratos
-icon: https://github.com/cloudfoundry/stratos/raw/master/deploy/kubernetes/console/icon.png
\ No newline at end of file
+icon: https://raw.githubusercontent.com/cloudfoundry/stratos/master/deploy/kubernetes/console/icon.png
\ No newline at end of file
diff --git a/custom-src/deploy/kubernetes/__stratos.tpl b/deploy/kubernetes/custom/__stratos.tpl
similarity index 100%
rename from custom-src/deploy/kubernetes/__stratos.tpl
rename to deploy/kubernetes/custom/__stratos.tpl
diff --git a/custom-src/deploy/kubernetes/custom-build.sh b/deploy/kubernetes/custom/custom-build.sh
similarity index 100%
rename from custom-src/deploy/kubernetes/custom-build.sh
rename to deploy/kubernetes/custom/custom-build.sh
diff --git a/custom-src/deploy/kubernetes/customize-helm.sh b/deploy/kubernetes/custom/customize-helm.sh
similarity index 95%
rename from custom-src/deploy/kubernetes/customize-helm.sh
rename to deploy/kubernetes/custom/customize-helm.sh
index e57c571440..674ec4f99a 100755
--- a/custom-src/deploy/kubernetes/customize-helm.sh
+++ b/deploy/kubernetes/custom/customize-helm.sh
@@ -30,8 +30,8 @@ echo -e "${CYAN}Patching Chart.yaml${RESET}"
 sed -i.bak -e 's@https://github.com/cloudfoundry/stratos@https://github.com/SUSE/stratos@g' ${CHART_PATH}/Chart.yaml
 
 # Change the URL of the icon to be the SUSE one
-ICON_URL="https://raw.githubusercontent.com/cloudfoundry/stratos/master/deploy/kubernetes/icon.png"
-SUSE_ICON_URL="https://raw.githubusercontent.com/SUSE/stratos/custom-src/deploy/kubernetes/icon.png"
+ICON_URL="https://raw.githubusercontent.com/cloudfoundry/stratos/master/deploy/kubernetes/console/icon.png"
+SUSE_ICON_URL="https://raw.githubusercontent.com/SUSE/stratos/master/deploy/kubernetes/custom/icon.png"
 sed -i.bak -e 's@'"${ICON_URL}"'@'"${SUSE_ICON_URL}"'@g' ${CHART_PATH}/Chart.yaml
 
 SRC="A Helm chart for deploying Stratos UI Console"
diff --git a/custom-src/deploy/kubernetes/icon.png b/deploy/kubernetes/custom/icon.png
similarity index 100%
rename from custom-src/deploy/kubernetes/icon.png
rename to deploy/kubernetes/custom/icon.png
diff --git a/custom-src/deploy/kubernetes/imagelist.txt b/deploy/kubernetes/custom/imagelist.txt
similarity index 100%
rename from custom-src/deploy/kubernetes/imagelist.txt
rename to deploy/kubernetes/custom/imagelist.txt
diff --git a/deploy/kubernetes/imagelist-gen.sh b/deploy/kubernetes/imagelist-gen.sh
index 1605cdb54d..a4bf5e5156 100755
--- a/deploy/kubernetes/imagelist-gen.sh
+++ b/deploy/kubernetes/imagelist-gen.sh
@@ -17,9 +17,9 @@ STRATOS_FOLDER="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd ../../ && pwd )"
 # Add any customizations
 function addCustomizations() {
 
-  if [ -f "${STRATOS_FOLDER}/custom-src/deploy/kubernetes/imagelist.txt" ];then
+  if [ -f "${STRATOS_FOLDER}/deploy/kubernetes/custom/imagelist.txt" ];then
     echo "Including custom imagelist contents"
-    cat "${STRATOS_FOLDER}/custom-src/deploy/kubernetes/imagelist.txt" >> ./imagelist.txt
+    cat "${STRATOS_FOLDER}/deploy/kubernetes/custom/imagelist.txt" >> ./imagelist.txt
 
     # Update version number
     VERSION=$(grep -Po 'consoleVersion: \K(.*)' ./values.yaml)
diff --git a/docs/customizing.md b/docs/customizing.md
index e81f9ebabd..f0defe7d76 100644
--- a/docs/customizing.md
+++ b/docs/customizing.md
@@ -24,7 +24,7 @@ To aid in migrating we've provided these instructions.
 1) Check that your ts config file defines the public api file.
     - `src/tsconfig.json` file's `compilerOptions/paths` section should contain something like `"@custom/extensions": ["frontend/packages/custom_extensions/src/public-api.ts"]`.
 1) Check that your new package's package.json defines your custom module and if application custom-routing module.
-    - See `src/frontend/packages/suse_extensions/package.json` file's `stratos` section.
+    - See `src/frontend/packages/custom_extensions/package.json` file's `stratos` section.
     - Note your `routingModule` entry label should not have a preceding `_`.
 1) Build Stratos in your usual way, for instance `npm run build`.
     - It could be that this fails due to TypeScript import issues, if so go through these and fix.
diff --git a/examples/custom-src/frontend/assets/custom/acme_logo.png b/examples/custom-src/frontend/assets/custom/acme_logo.png
deleted file mode 100644
index 397545f790c3239791281ecd78d225af67dc4507..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/examples/custom-src/frontend/assets/eula.html b/examples/custom-src/frontend/assets/eula.html
deleted file mode 100644
index 1f2241fe1c..0000000000
--- a/examples/custom-src/frontend/assets/eula.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<p>AMCE Corp End User License Agreement</p>
-
-<p>PLEASE READ THIS AGREEMENT CAREFULLY.</p>
-
-<P>This is an exmaple EULA.</P>
diff --git a/examples/custom-src/frontend/assets/login-bg.jpg b/examples/custom-src/frontend/assets/login-bg.jpg
deleted file mode 100644
index 2b2e8e42f71ded64e0e3c59253b21e8dd4bcc939..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 672633
zcmb?>c|6qL_y3(4jAiUgWNZytk}SoHeaoJGE3(THGGiwUl9GK(vP{|Akc6aA8CwWN
zk)^>9vS-Qin|goVeZG(1U*E^?@w?pD>p5r6J+E`_>)t!(oO=&P4krPNfsVcofIuKX
zkMai&r$FG@P_Ih>oI3|3006Xr3UU-sQxJqwRUy28u?|EG!2Zyo03>(;s{im9Q|`YD
zMcSV>|J<Pj=)W9rJOTDErpEkcJzN54Q_m}bR{}h*_zTKONdvT|{yD1O5-H^m7Wo5N
zhWL^`r-G+c^LV=4#cj=~!*7TceJw3VQ*#p?eWSA!LjXWbI{W+kKv@9r^$WzA>uL(x
zp1&Xn|3=Y<5wKG97jbqC@YgUkHTo^{-}@i=e=k2j{m~r^p8PHAFZq85Sl!$MTq(wz
zQrKPG0$hD5_!*_PyZYk-0f1el&`}|Q{=YGSf;n&$1u2-q12{bX!5zP`%RhMR509m}
z7KLYp@=6fS&NvSM81^W1!C+SpiW~%zf~Ec3y!<Hmw_U2Pp3ZI*oJ7HrzP?v};|2;A
zbNL@~JpKoEc6RwI)7jbMFaF0CN=wRvwY>uTeVoJoeE9!)@%0I!^w*z)qFfQ4I6ZU9
zo$YtOUA|)Y7yG#woBT`nqFD4V_6*Xq`WL$fXi@s|pSEt!+J^sPKOf`Y{qjfVB`+QQ
zf3a7fzU99dcg6g#eD{E}7XQ+naTN5Qwn3MzH2%e&?)raahI?At{7Vn^vi>~_{yZz-
zvc+E=!acSA(s4oNe|5fu)A?(oZvds`f7*I_>Hp;q^tAjvlm5tbb^fnz?g6%cb#Qan
zKKn0^yPwrx{rv+q|H}9G`7`eS$Z_}4{YwuBw)opN5NG+9?jLCSw|~5y4StX5KW!=V
z+Y|@_Bg$14oCfmX3;==dp_H)*fYufNFr1f%XP}@4W%jrW>ifA$NeaqJ%b)@HJr{rT
z0I)vtXO2O*X#Y#YQgpyfP{#S=|I(cN0eGGb09Vm}X(B=ZFjK~M!=!5vF8CjLf0hes
zKo6J!2jBtx00qRrNs4yzKnbXWv%mnD084NlH~?4R348$#gn+9c23!ZXKpMyfd7uas
zg9`8%JO%aOC1?fhpd0jqk6;u`f*G&?R=`j2i?Ue4A&d}q2oFR6A_6%9k%gcks*tk~
zBZxWVJj4m&0r7(bL9RmLAh#eHkUYpeNF}5O(g<mVbV5ErK0~G;^N=;jE))huKslg%
z(BsfkP&8BnY6!K2UW9r;vCwenHE0Sn7kVH12>Kk_3hjn|gib;ipqnrNV}NnNgkUFO
zXqXnv1a<*-35J73!4hFPu=}tluoo~QY!EgHTZHXU(NM8d2~wS;QliqMvZ8XO!cs+1
zB~j&3RZu;rdP_A(HAS^TbwJHXjif$7tw^m;ZA<Mz9YTGbI)}Q9x{mrC^+)O%>Yp?;
zG+Z>IGzv6&H0No&X(DKnXbNbmXj*7K(2!_0;cz$)`~+MDZUT3P2g0wz@4z3yU&9CB
zGw^L%23i4HSy~<13$%W;v9vj~4`^S}4$zWmf6=kfiO?z1nb5h>h0&$bmC(JQ>!X{Y
z`$f-6FG{aMZ%OY>A48u@|AhV>{TTf^0|Ub`1`LB4gBJsyA(x?=p@U(HVF$s6kU(f5
z>=8kT6ht|q1@RfN&dA7koKc<e0%IU!3S%YX8^&?QZ6<amDJFd;H>PN&yG+lS2AF;@
z(=m%MYcM-7hco9e*E07pFS5|F9B0vDab}5Pxy#bXGR(5c%FZgoYQpNvn#B5mwUc#@
z4bFC)?JS!c+cmagwl{1fb{IQ~U5nk7J&wJE{T=%Z2MvcPhdzfl$1RS>9K9SXoNSz@
zIjuQEIqz~db53%>xQ=t_bNO(kay{kx#I<{b?})|`_airtJUKFOWQ&`ZTb<jTJCVDJ
z`y=-*k08%kp36MxJoP+Zk5V0#IBIq@<Y?j1cSjd_Ie3+LU3n9EpYnb|LXi?kb7Tav
z7}<l|<m2bl<@4ve!}o@7k)MlSo!^^3i~kk>ya2m^s(_b3mcVO)?}D6y8iGE8xq@#6
zSA>v4dO|@$_k?<dejO7%W_2v~Sk<wwD0&ncbqSS)YD29E3kaVRzAF4s_=^ag2wKEb
z<hBS=Wb3%-ahu}_$Lo*JiE@kTi-wCn6de;|6jKw!irp6*5~mSIi(eKm5bu|ON}Q4K
zl(;L=cLI7s{)E?wf)gJksU<Ozev<bkhfg9-YMcx{`S9eF6ql5dRIF6J)Q?lbr!JgI
zKSexsAbm#KN4i9MREAB)Kqgk^h0L0)gsiLVUD+WyMmZh1Xt@Tt)zc?VyPqyRJ#vQq
z%(*iOXWGu}%PYv^<e$jTD+nt%DdZ~*qdCx~=p=Lph8m-ZiN?Id>?q1B1}Z*PTvj@%
zbXn<v(wwrWvb%DLGD+o_inGc+l}S}WRVP(~>ZF>GnzPz{wQuSubvN}gb+U%IhPTEe
zjUSrQnmElm%`GiOtw^mFZJ4&McA|FgS+=uQXY<aE>m1YZ(0Qn{qI*U+LbpYaTF+1~
zU2j;QPv2F)Qh&uj!64G$ts%nD!Z6S9n~{VO&gjKC=sAOPndiogMU4H7>rH@(zDcIZ
zS5r|_tZ9=OjhU(0U9(wp8S|^=L<@EcM~ep*KP@#aQ!PiW#H@m>+N_za?X4@Vw`{a+
zGHfPoPuWJ=cAr0b-s^nB1^5N)3uPBJ?ata|+s)XYvA=Hr>7wYx(2Jc8M;&||njM)P
zogHhPsGV$_9ysken>gQh-gMD-$#+?C)pEV<y5OenmgP3@uHv5IPQIjaDdW<dhl)q0
z$GoSSXO8EhmzGza*Q&RkcaitjWs}S0mk)hxe5!nDeVu$8{n-32`@Oxwe<k$F2mcfP
z*Zn84ir8%I3eFH$761vj7|;;NL2-I|g2aO2gQkL2gYO1!hggTyhO&nGh4zF=gxw4y
zhwFrwMo>k#MzmcOx*BtJDpDizUKAwCC8{kN6@4vw2Cs{+h@p?U9P>U_IyNJABhDu7
z#WlWb_-mwi-S~&snXcom4<{%k6y2b@;dP_;rrgatHxCls61#3m-^#hQm*kq%l`NB-
zn|zpZDWx}6KD987Ce1JHQ@UDuMFwj|cm^r+T;}sE!K}orjcmv4&YaUZMYrj12i=~`
zHOg(cBYY?A&R(8p-p9L|cdPP|`8V^o3fu|?3e^jr6!8_^D%vG@5k~Im-g|!k`2Cz>
zn&RN%*%Ip#Vkx?`vg~Ntt+M@czw*fn^NP2X3YC=)kPlKHLLUY_oPT8hsQ<C{<Ax_E
zpWLhBs=8GTs)MS(*ErRDdTRKztrlJT<eA8`{5tl!#OILbVb53UJ?keM&NqB$G-zyl
zq4c7zNvf&*rO?Z}&794tujpT0dv*9a{Pkvwf6HR4M=Pn#v2FB??VF*uW^a4n8NTai
z*J*!4)F8g@Q0aKtso2@rh3=~FmhXPvbEc>6{h9Z5z4E=!`xN>b`Z4`4J}7^9HJ~=o
zI;cI^KBPa?{n7a2hfh|YMuzQ&Cr8{y=05v;Ui}jM<<}^FjCw5bE6dlMapd^@3Gs=l
zN%_g<DebAAZx-K1Nv@=Y>453InQOC*vpHk|a^;-t+{<~L`Tp;A-)9#57k({XUt(R#
z{~`9{*|Pd_&x-BJ%qnj6a4l(_XT5ym^hVpJ>E`%P-=Dv>61RD_D|XO3#9f<R@~@CR
z_+IY5`2LFn!-KIy-@`+HXPomNUjRnALN8IGn6+{M7|#R1-VXr1-9Nta9}dVr{yhal
z{!@RG|1bQHKmGd)iVp#bTL7@c17JkC-=);!6wIs+fGMR~sspH;+}{fRDFK({Wd9%t
zLp=c0IfsYq6dw^T4#58K;o-0P!^8bDim&qpfR>;C_~^g6kF8K-|M6*Bwd?SI+W(Ks
zVGCfTrN+SVFvu|gWre_4A%|~)07Z9dieo}4|MEhhFe+*qI4vDL1BIcE1wbJ%7?cV|
zP5nEtf<#ij2UM)oY(g>`H0);1@MBmG*_iZuv?$G*R!;K|E5dRvxL7)Rt|Qz$M@5c{
ziit~{J|nMy#wcoOpViUT(>JiNw6eCLxMZ$w?w33~y}SbggMvds!@}dP#a~ajaWgR^
zGb=micJ7_L`^6=tW#tu>51!UOt9xGG(D<V5&D(eF#E#Ccfx)4VpN2<1f0_D5nx2^@
z&&_{dU0dJS{JFKgv-{gF2!Q=#)?ds1FS}SNc0sAAU{vtmc0r&alnP^|q85^&Vbd^!
zJ7d|8$;QxfXr|w*X{AHSnXhoV;6BiE37?)4S^aI=AItuChQ<CrS@zek|JpSQw0?)&
zlmeyv|0%HFR~QxSccG$K^1D#~r%+rlN};$~a5(MXa!3*KM*^i8<)4<Ciu&(&|7&pg
zl@f@D9)1A`7=$vIV5~q59CYYu-oy4emYx+>YaXK&9CQnI{MH-c8na`;#dGVrvIqWh
zKKbZdy>UCHIKhvEQWhT{Kjoy^VvP0L3SGtLX&grySRh6l4}otF60iaaMsX<;wH=RM
zUZ*LOIs|Wqm3IeAj~RK?+tY)17GKqaXX&Scr!$MXvY|QaFhpR9<f}_M0s9yNR8LE`
z0<GdD&s`g9Y;vsBkLf@zF^RoC0H^B>d~RHjboEk8ku&tGIy&`Y>sS`s`^*mFf`KD*
zJ)BQgkzJi3<1^pBXXp@KZ_K2WH~p^Xo|jEoIAj2S^hWy35sb>bNU{O#e(3bTV%jCm
z&!W%8spOvC;g0F!A;52#=|GlrKJuYarGi)EGUSp34#7o1e~63X#w?y+hq>3p$hA)Q
zx$2FH3m&(X_8#dvnAD+V?~TO85Rs;kqt|>^3&R7+kBxgORKA}+s}hQ;Q$~0Q6aW}w
zx?ZbBAK`#CbEn_-)FHT#$HWWg=`&haXSx_CqQTc2b}Wsr(KSD?oIQRA4|^3>wrtv{
zRtoeR9l4h#4#BWlQ%SV+p6av22T|^aKy4sjD?^q>3{ufEsW*|W91mC*zT{iVt`jjW
zW$x;9!^3&tB4KYLTk}Tijvq6+()JM0Pa{a53N1X_Jt0jxi-mH=V%*e#MJ22(_9dCH
zU<U8&!jn`?D4mcQ*AyJ#k~iPryQw06Uu5d${AisrjcZb*806@g(V0TIdGq_UI~}`2
zN;C&dOw#I=3W||Gj(ox&ef)BAqmMspb_2FnCN<m}3V*ERW!h6-9<ZQ}u(a|Et9+hb
zGz`sSbp&h1)XE#EGEYe1dC>s&rBrW!z*wAU{=g=~>kh)d0Dc<G*f)|@C`x-;POPo!
zELQRLO^X}cFS<P|I#>tLy4<%T+)|tJZi^o`NJ=%%w%5MqyLV1l`}!9g2f}TOK<D4G
z@f|yF@~crT8_k-6Jx5$s-~f*$#P-m@lKHyYDI}KCr{%T$UzPIL&!r_dS@3T_blgn8
zFQwjA-uHUb6}q}EgIOT%aBN+CLls=6GwxW<{|pp)Bt4ld!OpjyIr=u{=Z{VmU1RZf
z3k7R#zR=TJ96k+_3?7x_QXp&lvXm*|Aq!1tDT}z($qZ&(q&Lq;(=|geZUGB}jE<Xi
zz3Ove1nNAoqb8@~fd`87{70032aZ`I>FCuT$=CglAhGS<Ji;Qc9N<R%uxx+n_c8fd
zXD;cvBuE+SsM>G6xAAXeEF$h&rpn-syk_VN2i}#e3BIqoFvL$;#|6R!5&NE565?M%
zJP4fh8UEF4x+gQ$xtt<%{qQRq==V&>&e<t{SvBT^X5lm=TOC?%WTsh69n)Y#VO)6~
zFq~});Q6iyF}lgn<9=I(hFY-WMuSRAx$xtr%hy{M+GWKc#m=2h^1Dom;e*+w(!LBy
z{KgTMPdlE*R0pClTjd$Iw(w(N!hr;uY)w2@SBl=|X2rL}BZBb@9eoC8>5U<M%KSrf
z#ketKymDrHG(89}F?e(rH`*lNsAX`6u@0EEh*r&5b$Zze26Yh2rxt7+E+Hy@h4EED
zPo1<+DwG-fwOMZD!cfb9N3^P0GTOtRO?i?(^oM7|+FpOLimIOy{}6<YIz<Pk6E3k;
znH^iBq&MIBJ@TwN>2i)~i|@kFW+}Vet7E+~F~lkhb#@uq8aLuSSe*i@yS?qao<M3T
zI*Yju!!2BdJve8*emuh|08gXqXYv>*fBTxPE7Bkseh7-f{SzeIqHGJ{<&RaSPjbzw
zVZdbgfGU@C3tQBy##RE|<JS0Kl9Ik^bGZ4#=~TJQ{He3T2unmh8CeunR&rf$OZJp9
zf^~4B4%l2AcnB>GLAv%^rgFPmQLPfoBIk14Zlsm4DFx&OppGEk2JVSL8{*u07Fq;j
z6056Sr~CXOztdexwk7f#{)Clzx1GLjjOIH8`+*RScq>C{;mjD~%#L}9v%ihNDTngB
zYE6OHsXoCQ6(6*?M&2O(l}up>dfr*p$>6PfcDULgKvEmb^H237%}-QzR=9Yj$z~Rm
zuM+4oq*X6IjM>ty<LMaF;5F$|@z(3>(*L=1PU`$~%#N-Rc9Q@@@p8L{?7T+_VrO(?
z3d;w|b^xhP^9C57CO^@b?1veN#d+_K-zjged14mI4Hs=z=t~f>s8AN;AvU8GYw4I4
zUH$rH^1z+8{SSRUc?mP9%CCjZ-<^jtlY-`rOiTRQ<$4uOVI1PT>kXUl4RAUnVl}}D
z!(YrX@$#2U64Tx+9@#~s=~Vb~$mrHHE|qOq^Lf{`tIYv@)fK{~wvf@+&g!(zMr?Ft
zI|lR5$SD)a#_AF#&gTLewZtghs*@;h(Uj&d3!gX5MKQL;Oq}+;6vVu@OJ9&B{zYRx
z$&^Zi`A%FvV)iDKUyr+$1ONQnqi|T!oEXSD(GFVqb_kFuL{m6p0|(VD2<jpssw~Y<
zymcD;PN`d>foHz&G=wfunrF>e2b!v(EzSfqI^cQL_bhP|f+#k|*Y=n2M`n30wSzuR
z2ehlEJ5{WXw8Xcyx0(GL?U=GX!VHc22I(=-{D2ZvW+E#Oouo2H(>^9*RK71_eRk}W
z1GMyymf2J+&8u^t@~e^I)kh0PkPE$GzO(X3gvXgD)z310EaFEy$-?301~m;99iLma
zh~D5$gnPCD)17wg*r&7Yne4hV`O<yL;Wn0u_p~zvzICWe>s64`Fz)9Xl+S>$sK@v0
zraZK%V|H#h5UZ<B4PQN)@eZ9Rwn7SNXxR&^Dt;o_b1P}J@b#4K?L42${F{6#ulpVw
zCc1c&TMK2j4P76Ox=e~wOnaD*4B3}Ez^)9pJARIPb0Ar-bl)_E@XWhN8n`}TChsl$
z%%FG*KQm8gSLk0UNHv0ddD&#Ya;9z^QM2SDki~RsR4qPWs5r8RtS`4?upR$Pc6)e=
zIr+%9gtn$z`zJ0u&GtKaC9uso-44C9)jU)QAAfCi2;5S)C1-}O`An_YEcL{;-nU8-
z;J(meJ`xjiw_z=qfAPEgZj7U6=+@*?N-b?e=*MZ}2IO=GK)s^5yncify_kG&J4WiX
zN)&b8_>4$>hNRzDB!1c-jaFt&B>lvdEz<<x4478cDg>xP7g~$hu424M%#iQFimz@*
z(D!*nly}u?Ncza~T-3L?sC5>R98XFKcX{38Iw`QU`OD=Hv?5=7@m-#ry%mkE-1ac|
zc-~K0=wVY`^1G6Ra6>=4<6Lfn3C48anXmkaKA_t<1k~R9*{>%Fsz>WnTaT6;RY?3K
zqL^^4E{uzJu1G-U7Mh)y=0Cq3a}j+t@c52H(x(&&xes%FL+r66RJl>ODPI5{qq1%c
zPSE`NJO>vXN?%-;i6>Rh=i7J<Xq%Sz!1=(gxvx1+Z!fx3UwAsX9LCq=G>GNMcfB%z
zM~%@tL53eI0RK065t5$aWKLo4(wD@}p9I?Hr<88PtCtd)KJpOB7Dmfyz04|dro~SS
zmPSGd@OZ6j^J9sz+SJ!Po9g+C(~U)Jui*5Lm#*1)is_M*^S~`{r>go3y4R%}G(R6m
zShVca7+ycovR46pb%bwyv|0bUlih0BV(U&*xMgA*mn7XHMg`ssv}-oTWW@(0vRfwu
zI=>Yj69lwm0@2xQ(urKOpw4ptkuG)Zce}^7Zl+PDknfQXq$@~%iu@$yp(a^lrl@8y
zD7tIS1l4aYtd4ig4|vA3v!EfS_K9^^;M7|Ab;R8)=YZix0<95NybBjlsE;|YjFDFW
zg%KXj1`~nQg6#8O(pH*u%e}#q#mQ=rS=3vuB>>~YW-f}Ilz5_RPaY`X!QC4XQwjS)
z@pa5)&@etGuTl;~1?)LI`Vd$tuQhaZ&ZbEuiBtSbp%bX-n)&{e;yH0HYVE$tPIAq|
zh`qYE2HcbWik4adYdYgf{V?Tc?&CU2sb+b}E_xGqy<S}8_f|N3mW*^V_v`XAYgt|t
zgQN<q6q31N>!PRIB?wxb0IHfbJ#O1{wRj=VqSHy2k506nutlIXl$uouC4agr@di&w
zN_`=dx%rM}0v_AK-e+JTh%@u&<^DRS7({>z$clWyOT?wFFRPC|pc&(ja%eU|4ssna
zC&-{%ctooLtS{cN33#p)xc9mM$h|i?QDzt(xM1~JD2}>z9h*5^w7zSJ7voi^a2`o@
zoH20f?A{ys^=gMeqtMw#<^z1S`p5{Ll65+GMhP})sN*4*9rDNgJQ221_VT_Cy<GZE
zfI4%gQ%BnKfDuw6UZ*w2x!@2;I~s-0mSVk{L^BJ^tN6}I%2jkZt;zO;5qI7J?f&ky
zMbt7|KzqOef1Q|AuJuf9W?V|ql$Gt%&a^$K#$?dG#F&nV5oYXb*JO0QDGYf6+Azt#
z$===-_9en&*F65X<5zi{2D#2q_UY1DrMs9`KKRsvI(LX(p;<?_^p;w=cX@fIcu1Wf
z;Ls~=-bSrGzFSGFM9Y|_qlT~+$XUHeXE)Ocso5Vt1m)`l8WUmc>s(vEUK*3f5?w?I
z8@_HPMXSb~)7dN#{M)5XRAa?gYxU9V{wBs75Y2f9rEBS1s?yjbQeO7Aj`I_-xKaOz
z@VIxzU4s%m*v^X+W*r<gW2bQ}8h&4EhRdrQ4M4o$aTBRaof5_zY5IO94(HAg^ovh$
z3o<oqZS*;0yXf!rbRLIDsS6$g)mPaTePg-xK1}g7V@yL3pZjI1j#*45^-<Z@)`*Ip
zBQQzba>BRAI`(!qSZ3No__ueDI^Pb!T*=nrv{=H^h(Yf`!w{J|Hn2Gi`n{rOmsso&
zqUf$@jY`L|c_Wj}>`n+1$JMtUG|9ae&#%Co^#o)@zsn8ag(M#OyNE6$YG9cilTpvw
z&q~@IK(Tv*9%|WkxA#36Vkgs6uY_0egpNGJyVXnwbk1)Fs52%b`h-*N-M*r=)Iw9z
z2wOZbHESps^M`LfbeD~BMhVY6#Zf-YJ{)`aY!c|H$??nDO{@~=+gQ5NQ-U{LJJ4$6
z$I?2ko`YTiog~5ZxTM{WBldhBPO0OcDDqEdgq81?y14u91jPC)=6kHX2Nq%69k5M?
zxM%!ys&yDCG_O9Yy5iNq)4kehypFNIeud#3lu(qp+RbLU(b1iL*u6_$*REtX{8UM}
z(snC81H<F;JsjIX#rn>KvslQ5cmETzDBw%hY3c6Q)J6ArUqHk24=LO0eHr2wG8u0x
zg>-&khpP;lkm)a@>_A0hDlDHoF`iz%PRBtG0|EV;6(X67GxvqvUwuy{7lniTM>se`
z><8(KjV)ku<H65wm|T+75j4-2Mm2-<G`nIwZl?!#&^x!nvAy0y=a5|=?(Z$4U6TMV
zbbi~E+VG~kEQ4Wa3zfKRhGxnR6_l>h$d|=Mt_eW$Cp}aXzQm{4m;G!7OQNY+g(i+&
zh0Ztm?(3+jI&QQ_&Oy1d7~Tktb+~p2jJtoQ<$DpGZec{w9@Q}!_q|4b;>~cir{(%M
z4A#_-jLR!D$zi|lLqk!rXnx>2)c|+=tL>qJ&rUSxj!BQy^}Jp~>#UbD`;!W>a3qrX
ziQ>AAaN)$FuP?h)lqv5MX%le3(H+bnhRvXC=1=mCm*G!bO|O(}wT$a_%Is5FGnuh2
zFrS<X)8fWXRFKv=i+qs^{T&}zzV}$^{VG>xUrwx>ZOgo$+*Lyu!}Q9u^p!)?I0W%s
z416PB^LI%}%pL2L81_lrwO^^%)Rs8E%PmIJ7YJQU#`r*k<N2D>BJys?v5nG=p-&$4
zh7pIbMpUd}3aWO#h}UhZu0w0#g}*!Z#)qn{6b<-utnm#E#IGL()$$!W%&Tl*OH?4C
zR0A9Mu<`Mcg3qR*eZzIYg!iSVpy*|G{KzIbMZ(&%m|^w=VsF$$=_YC7jG0u)$vdi-
z)Wn={5N<fn#``nE8D}qnz4Da>O58E8&X~uQc~3=k!M_oiNi0QVNT70fx163LV+s#J
z!UZ>6?$C=e?t%v8%+#6p7wTp|_dGK8$IO+#LKEN@9yi?)Qa%D>iils{{#N;xO~fPZ
zhw2@2s&~v3HCL3O+c9!1_@P@}exqOA;JH3#3$qvL3CVn$D%vA`@dd0un9~<^Gpz*g
zCn_PWNKUepeL$z38Q9Sq+WF9;yvvVO59tg4lGCDH$*!MmK1z$*hdaQd>RjLFc^q@2
z4rrPs4JVeomdG;K;*Wa`6ChnskPsE8XU%cH_;PFWbjxGq=Lg0+3}Vv?)j!}fCJ}dB
z>#dU*7o)6Tel($duM`K`Y977qi>n{P63Yj2&S$@Y!-5yZ1;}*(b25ADoRkiCGU@f^
zQVXZ(T{f+Z(8;P`SS5LQypks%D*$ie7xuGaKxXDfKebhFnD8Okd=D;MuC^tZHEgub
z3Dm1jT=2n$of^bT@2%-CeJOr>`3{HsNa~#zVvY;e>SKI58fr4m!>ghk5VjZBl(6+k
zrb)<PVdJA6l#T|<_iK{~2Z{SfbiqYKJFgO%X*?XPre5F|J9gV81;db1eowThk^uF0
zb`(Qg=WW2W9D<`b)L19ol$A_x7<s%<B$nkRSI779*B0}}H}vdLgfEu$eIL|$=9JRa
zkMN5b<#s9uqf(+PIE^n^?~nN2N@0fceb@A@siisuL6GknEfpSxvI=fcTB?*pN`~-N
zq!^TZmuo_<N2Inztv7G21phF3I^TD9YqR2Bc72Vzq)hvwze*@&^&e{CPL~g6Dp%<>
z5#6I?qNJ!RoVBeb<Bet3f=+JlMk_w@{g|cw*@}{w=_HluS00^A5|j$L+LH2echIdM
z{bg|nw~|S;#%@3Su>YW)_ryBu#;!S!$mlb^;s%cSE)qVncHWA|@;F9#cNo*F>}wSJ
zHhpNbxJRjRnw(l*S*{&r#3W~Q^~u-#!h;R)ZIo#-e=YI>MwqY9qV*7{c%Qu)l3}^g
zcOiN2X=ry8;V5w0fyU2|s(c^P&bU|;Gg_+6ubInh%!FAO$ZCKIZ(!hcfN9k7)fhBX
zVEUtHvAb`NUgyufaLc5%9)b*Pc0mhus)Ko`y6*x=&%GwhntH)aNKdLHvzO60R50l0
zgXAEN=u^n>KmzUCWZuA?yJ?IU5cbs0y`enInuZO2N+#T8>G>JuDomjSx;JSP(o{cp
z&0eBOnaj(jIw_WNMJ?gxn(!RES-7%CHG#pe)Y)=vSVdz#?;(%muUuB5LHOx}S=V{f
zn^xQswaEOy<sDP%ggchV{eUH_rNqf6V~7=#GOqzcydh%?PQNsab%m$eSiKKvN}Yoi
zI5nl0nr0Ql|8hv9E&mjTZ@;oih9M?4U}BGw;~IjF54Brl=7;A8J-95~BipL`o~T;q
zZuQlF4BLw)&{@`iG}Zj5AcwPg#zKO)5GRX|{#Ob9V9BJ%Szgq{8?e0E6Pg5a%O)O}
zuH67*%?AWAZf@9u7PWKIsyZ#lVjrPov{0jUIWh5cdekMsl#zK0E-R{}=wu)*eO{hi
z&$D3gHodcD>p>dGcs7t>$VT&Hysi8;+38k6vp(hdv3IfWQJRk$eF750vo-3Xa?9W+
z+rHtcsgHP*hoOb%ZD#nw^HM#z{bW_b%AZW7w?{;s2BefXdtS*xlCWuV(S`I^4oBdH
zSR+*69V6_JDcCk^OrTm36XUDNXA&pq5gB7*!-q=GM>$fGyBr=ThCk(X(Lrj7=*<#P
z<r83dy;pB~<1~0AeFr{~=v}+oQu<|tdog_1ob7GAMQ@~HKkTMV=F8Qgbi)QVX_@h&
zd`eJrgQa}76GMQzil#Iy8Go)9JZkiWX)NG9eQN^;c%-8{HIQqEfT)DWd@8CR<&a(S
z(V^o(Zm4cR#3Z7w^jifB%fP4#he!=mx=&2_#Cvl=m80XDCzQsNgnr<s*<ljdaI7kg
z!?~ej-clqv^h8Xo9$zPcenAkd=5MObmeu>z((vkF%3^r=Mh=kV!jHn{nkKo6vZ1j4
zsAmu=BI{DpRZ3<ww5+YNNtU(n%}S-Pee#DCxs2#+ZFYv{)tLT`y*ZGs6T(SSdmG*_
zynYM;O$usxhl(HPqZ2;ROsDg3GU3@#C(w*_Hhz+3Qi_>37U4*1Ni|5n-DQ;I2Tuum
zaNvz$l<Az)y#P$##RvxW@hn*Q-1sKwPb~Q8C}HOf)qP#c$SUh^2_if;33OL8@ENVO
zt;8#D2Sp+Yr(I(s2D6?P-OkKMgzpYMcg31zj<C)}RzNB)Xv_$rd#Bn%E8*SZOL+C=
zy>%1oJo$CID?Rd=h4}D6Kev#(xL74NIBZ^>Ie5pww-<8;O7_T$Sc69!Z*+>haSAB9
zo#;Qtq4)Yt|7MGdC*<G~$}%90>6~^7QTUWfKtFx;s+3%zv9a8H`diaJRPMQ;yov+j
zD8!ql506>4vFeVg_iQ1mNIXk_(Kw^uLZmEzCG-zjLi*s`^O=2*fl&pA^AY7kkZGou
zacWs0t`LyW_jxlrZt9JNcFv}cB_I}QMPU?%bamz&l=zO`bU@)myd2Dna#lfOt28~U
z2B+u>5G#?*Uc_w+Zd87>u^6Nrq9ur`^qsh1)nIxDmY=>nUgBaWBfEw}Q+^b*Z-~KQ
zc$p$fFbJ&UKd(Ud$4juE9_tOzt`nm$eGU@ni&sCfuF2t5vvzW48YE4qf?*5l%&A!J
zsIbWhtE6k@Hc8<dyH@B19M}m*gq%@ax``E<GePF>i$P&be0OeOcwk8fQQ6*__J|dk
zq||vc`-ZiTnKNX#ihnfy`HMd}QZrMtNHM7cc>eqBf^MxOsyt}Z32B!|nUV1R8~0^V
z)2IB%lx(??KErg#e9R}j0B@7d#bK{b(rXSW&ZiB0qx{V;Onc_DqxK;xm1!NqY12;E
z+o=JX>T^Ruvx)us=$T_T6%LlY%rUO#E?Fz_go%2do;8*2P#1LK|Ez2Zds_N4Ll&;F
zH*a`sI=v9R!N2Jsd(VEWmFfd)TNTENdpAFbz(Cv60+mVgdhqsLj#Be?lx&Bs949Qr
zt21^|^lLjfxY`eC)^f)7ny7T%Llh?=(?_eJ+3c9e&kn&UvBhB*kxtlrx1t$!u4*@p
zA4&uAZSrwRNm#>%=dc6Kym-B@L%SRAfDBT!BOH?9-EOaXfZ>xF`FQ--s4FP^z4TWq
z7z)1G{2of;0Bf9CN!7D=V%>Rb2djK`EuYv4*DGJjFW(AP(IA>QY=ESmBOpkSNzSY&
z+m?Ut7k%0b$U4&XcW%}ST7y2-iCLcif){CPWRe@@ctZ3GBNu7qX|{>9G4_0w^$J-w
zzZQ`PT&_d({qn1O1B$}a;TH+aD;3r7UiDF8<3sVTA3vyp`n{DAB9EGdF=KWIm_)el
z4shJL1*wO}P+k;aTI!=i0Pza(G#IeuOOk6ko<${y-A>f({jPvS2Bc)oj#q@iW6uHQ
zYAdl<jk~1rG%;@Gk?VZ#Y?7whb-U}6HXlZ0<0i^K;ZM9AOnQolIGW|$u1K!j6T=}Q
z*m+tp?~e(Za$=KQe<$R{-`sY<2W}G1)?%YVCtX)7Up_U~SS~E^mS5*y5`}%j3tF<t
zFXD7fyc6|=bXwpsIV}rwC(cSIo^M1i4Gjv+s9qWmNAy#h2)_&sLNaHukJpIA+zs?$
z8uL*5^n&MDnBfV2=IC&rn`>FF`BH$$vsVGjlD{z`Aw!(Et$*S204KM(eDO}Kaz!_S
zyu!Z;8x?$mM)$!Qi5I{s-xYOz1xZg_IcDo;)sa;J{B29E;PiN(n)D9-Yc?YR=TU1~
zObnY8uc)ruVJ<4rs3uTU30oMkdcF&aH9Fvqp8VGLS&Gzlpu7^j#C!j3`>=J)ONEE$
zjuzC6U6{2C#?i>m^%U=a*<)Ezy+yhLA3q<u-g-3t>-BrivSXheZ9Dq=5I3}-8A1qJ
z!L4bVU7hGw9X0ocL*Q98atMe5%r153H`NxEl6B7_2#d|nEQH+<0(bE4l(c0`AAX$o
zoC8Av&62`JEukLt8>u%5{4WDl3l_+$BYqcd{|MuLVPE^=d$i^uSUESbjUGL}k~eZy
zaKG6(BO>tF_$bjjy|!1bZT|&l@1!CR3v4W<>~*zCLJ`|bhSe)=p9)pB10H<7tax_A
z@J#8?B8hJH;*hbD1HpC2S#gp{%;g}C+wvd4)Qxiw2dNHTn+!Ay{IuMssD3$mThu1e
z<&!FhcYysIn?2nb0fa+Mr0OD6fiFSTf<>lT`m&FztC*LCrI#)@sbo`a@RIxZOjcwx
zeVX{%forc~WaPOhHA>o3HG1;t>sqy??$XiiAivDER|+zafT_pkXDv`$@)`S|Z;O6T
zz&cjDgh=~g)4w#o2ttX3)(#{MWq+ViP(vbSQXR6kAU4y&sRMbB6k#!ic<izk3z4@8
zYi&m3mX_RB8W>Dfs1mQnM)KbENHw^1s)>rdgS=}BSSlEXQo{DdpN8R=ue>#T>9;{%
z+n4Y%yDP=a*L)6G?@W`pIpvg&TLlc}Tj+LYFds{UB@<T&G!^EDKtXHXU=%|Fg$48U
z<XG(Pzz<3Jeo$eTU#K{U6Lu{!BJYWto8IXVRe^h-8%^MT2Ox<E=`B*#;2Caqv9aP<
z42F+UA%Jx)ShYaBrB;DY?mZCX)ivqL>VO-|jMgd1{Ad*|AKu^q1gDtRc}fyfZl^rp
z2MC5&9)bmn=ZzOXgOIQ0?l5RLy}Bk7em#HlG-$9`gBmMN58_Q5g_+*uJ()Ot?G&jn
zTMGP|<ZrHks`MW5#)r+M8ePhw3h3x7ZxF~vJ*|>Za}Z0uj>G1Az?#9S<s-_FITi8J
z!n0pwRrEH>mA!R)^+>4sbGlArscHE^@4zt{&)(3bLh^X3bj8|jw0*>?UMZ5SqF7{P
zX--_n(_wr_!vYRN5ZPMRB-r4*S=z7I<0hiQ8ywrEuo<{&mV{eS#|C8^wVa*h4x~1p
zeSX1IFNWE;V3$6#0}*9z=~4KZ5~U5sRxkJap95!}16V9k>3Pbw%G{|OMuC9dh>$XL
zf!(hb)=vJNvPU<j*?UbKH5OIoKm)yt`GkyG0{TI^^6FlC!c@Y^d@Ew|`F1){k($9&
zgP55-dDu+mApCVWu*v?QM-puy?9{NZkkNt)gBz6^td*DS$y9NBHD<ThMaD=}fnR^;
zojcteUnvE`$|P#CIb&|h+LB;Tye`PLa0yT5Pp(9plq!m~T#>;QwDfvHgK<o>3%iz@
zoJ{oT_1iH5$@)^WP6J4OY|86tdWA{q$qav>Oi43ByMHypG8El{@0A^boOIGco|lAO
zV7w))PdQ+-;)8bAdD~btB64*AFW$`{?Iql)>;xN}JHa+9Z?<(uuTvuY+Y50^Da&2g
z5X`~Fhx}9Y_s-fw#?~pJCM|(cqBuXPl3SHP8Xhw@Y@}@Ko=DC8wY5<)xK<?@sUeg=
z5DfT~gB4g-zL!I$M3MQy1p0w?qBkr}Us!08b$Q3a#YE(dUijLPy{NeH@<hy0vCnIY
zZp`WtgQ6l07vG*TN-3>?R5303Db>W)ZtJKOsJNarLrCJJiGH-mbyMS|qwz+5?Z%4x
z5}&q7x2AXW?Qf$hda+CDFgcy`2WII>h5CIL$`;pF2mphbj~OU)Z7e9_g*hQfF=O-u
z;S{5k@C_AdMN{fo*|1U@Ze=EE$U^G+cy_w$&2nTlh8r2Tv%!(d%X>Dgen!u~nR$>u
z_nrK_hwoF3^adO^Yab<B$Ts?p1z(97CrgH5euS2$55{rxw05fCi7LCFuH+nONdB@+
zfnP=Z<gb&sF@22~%OIu_Rg?@2p5`P=G563(yhXTGDMug%3(vT@KXbC(BPPF%^~UfE
z9myzGii#wV<GvJd7<D%V52y>A0+|boatrEI61RAKKkw+bET_&}X(a0IR73GR30peh
zk<q;pZFcbI^eKj9s(K!h=;k|{#K8{x8c70Ev%bIpUf3peHdoBPg7paogcn7Vtw(){
zK2R{<dFH%`s#ZR96i<v&dox~oM8nFZ>j&{FcCUF3>RC_QtI@(63DiCjp4)zLk@d&s
z_?f5{NZ8KUG`25i>qf;DVwVR9ZdP}mb2&ucN`b3=!XIx4)RnlyD}B`39?xv58e99b
z-Ff{MGEHx5=|H{mNw*=tB_jd)T?I1d#XwZ#{@iGh+$@Vt?{n^>oVTeFA8l~HT8&;R
z(xAMK_hPg*fhUK>lgQ<K=cMlj&6@uBJagx%bT~Dqa50M89ydZYWw~2a3Up#Mf59Rr
zHB(A<qd3x)UU#EdaF!L*E1{hw(K(^QN!LY%vO<U&8<mfutb!V(Xbky^Cx)vjCq6(P
z`jcLqU4uQFYKi|>6(;ZFXH%>#-A#{4H1c$Nl$RSk(!S<0EXmp_@>EBEX~DX!q0w1L
zC@TjUDYs)v#j0b)^zG4TEFLXdsg`gE9P_e!I$=5`K+k@EY&ElGt7A5YyIb-Wij@Cr
z@2kX#R-x->>=!MDm@VD``{QQNMnF5*O`B`UqoTLB^Jrtel#NTUOqNbrX6qpL;V|2~
z=||`Jo8=Zy$m@SP@dnB5c8lrlmP$>^STKREv^lkVJPb3DvZFe}DbhT0Og~%ayi5-A
z2mi$MM-f2-8XY&MN8NLJqI<ura*xH@104?cp``qLC)YBtpw9Tq@<I187WIo=?>kSn
zz$v|pJ~G9S#KM3E>^rkL`Y18ycD)w+n3g@I51iF3XFA4Iqx8S)@;74$bSGU>ghO&?
zw#cYz(G)d$vmoJmge%Z#P)bnBjR+)h+Ui*-p{>!xC~@sUQfG<`u?xWG=M%xrv2-$Z
zXA8Yv?*Q=$diJsQN_RdRFPfoAplTRt9ndXCBWu~vDOgP^G%><%oN*D2o4IcBENS!S
z4}HoRqyk`j9dYEQG-WSFs5XrW^UlUC{bRv(PGcJMY-vL?YbIm)SQ4Td8E`<E2`p}-
zu^4Nml+crukWoA5+sVBZe}xcK!$zfWLvCBmjggszWo|cDQNqu6I!&WKK9Fv=^^u6(
zNO3=rQ~ugQi4xRb`vZoX0hOlAF&P(qK5TzfYyo|Bw>UqcaN_ni@BH*rx%WmN`l*%(
zc-LSRCB1~z*_$dboqpgT5Kw-!do0rN*A%#?tEvc<u1PrhB~67R<npR*D_cL;bc8H(
zZlMX)w1@IwhFw#xX$vkjJt>KkkGc5>^s=qFR<j+Pr**b~{@QW9E)QYGx06vE9SRS2
zk|tMh=&5M-ce)I^(=0YWoDCJs12W*=;5<tH5ohmD;lQo$lvOepy+)$q`#k!c8MABI
z-#cJ`_g4Bde|1<@DQ5h$AA{Hqkv9}s*f_u2PaUR7=TC^GnZ+!a>(1PbmRC1qBMP(U
z?}rh+(-e^yA%9xH5Ba${=atezoQbs)kka)dKL(aT9%dPD(;IIflM3;cgT_0!TSFTg
zb27X1m)$e3Iz1(4_oCsir_xPtC46xXl6V(`K_!1x+#t}IdwwvgXv9g|ArU`0SzQ}6
zHLqj*adf1N(7wk8HyPA}e~6-~Us(2wy!5<evCg6{jC4yi0C^$}^i9<`91gD0YjOx2
z9?I0;RL(Yk%T9E7xmk%?vt#Wd78#S!+?<fy(xJ@co`)?w9fyEP47%RUy*~xyDqt!#
zg&)r!WA70$mt_}8eG<`sn|177R(1>7i>$WqZHDELem+$+zFy70O@`Hh=)(^O?fh!b
znC$qoS;6zcQT$Muwa0h?Gk<PHy^N1<yV?aZrZXRVO+~TLo8MTjvlpjcDUuxfgS%JJ
zQi{|)f=1yZ|Ew(HOaq@g_yUZ^12RBgsisJdWIS)eW4$uXC>KSyZ+MjLn`+xu^h~bB
zomnqct9F^B!D3+#=N3MbiV6o;iM{;b_rPcX;d`695k)w2(apvQU$iVE+AMxkTSqGv
zhe0V@*6et{x&(*u@E;6;B00dFcI1gl^LL%m<LI48m9uA3c}=Sv6!YS`Bwj0E$f(Ca
z&-RKK9Mky)U6N=2YP@7~v(o0hWrsu@ck6<YniMMOhh&uN043x;J|%#fDZ%w+-`HAM
zI+u)MWBUq7`Lo5p_A33t(3D?Oyd>IRLsD;(@B8c9nQK>zF|A~^WC_)=D_uXydk1F}
zX`FkpnS)QnpwAVgt<lQgZnC4_Ksm^2lj3D#r?34`Ud_9zA8SECZuQjx<7?Dbu5oXi
zb}bklt~Q3cZbiZkvL4FC`U8$Z{0Nb|^U7l&k)8QOX0ZGWtGl^Qw1b5C!<oG}stvfn
z03qe;9gQgCfRrJKvpwfnc<Op$lAf@LP29Y3x+ROoa=&@Xl#X=tQQ(iD)wH@Xn>!%g
zuHN!pDKF-H&o<TMWM-<t({1Hr<dpk(RC0;)U<%G;+p;HgG)3;*c$a48k_idOzzUy%
zsumuzC9^9&zSxvQpfPXoIfQW(&fk_PW(Tj___;}-$-#x__8wU+&v8!j5Pfo1htPBd
zV>Za&P`-l~QqreH^3zVt2BACGe-wYZH|Cm(rNaALGJO<2YmoLp=SNf)cyLe0cH_M?
z|05=qb8?7sbVr}?>N|0ovr76fZuG)?fQhmekWsCZc4F?Hcx-b+qW(Qm8L~w2(MvtL
z<N1`Bo`L<z0x~z8d#jW>oD9timR%)2!Bnz?z*+o}V2X$R{3D1<^}bPkvi?izNw{BJ
zdDVhC>&t6JFHH>6ARQKZ+U~mnDRO(2F*N#qVA>S+6Z*Nc&)91rOL((aCMByy0TK5l
zzwg;q0ws4L79t#YdUB7iIr5zL6CkvvGGBf<NoYBr@~o5ag_z+&Z|O&U4H@Dg91hH8
zso{DQr;&0_7h~FpOt*4Zm#?=-TD5M~%!REy7;v`f=2J@Qr?I<<Qle}~M@M};p~ItY
zg+ay2C7Bx->c{tKyfdhM7GXJ^p1tc)3NWAaZZjqYzq1*?7v-Er*E^UxZ}IX2p*v_{
zQ39QD+_z@6P|q8<G|5O!lFKMAcseK5-7Hpo)Jh3L`*Hjjhtq6c)$H}&fH-0^Pz__#
zrmkJGB*{p(%k<(RT#AIXw$}?=tXv4yRw6n&5&cx9iLVjZq{zqz+HPaC62+Ad-f08_
zGE8}J!c}}n9bh*psqq<FHzm6n)$9}c!mfd~t&@m@IxB$kL^9=8Cgi^5M3n<mszUpu
z(oVpnTTWTR?%(Dy<*w&ZiK(oQ$sJ<~7_XEzr5s`##~;^XjXO20lps)gjuk5JPOmqg
zYH%5ot)s&cu=(!zI~$13Sls42AbR^Y?}%$gWTl;}5trcSIi-V=M00u%JoJfdM3K70
zGoywtZ;G8Opj~=~)hNuINu8aowJz`Vi038-k9uNcwh{=c%@Sv_+UeVwdqOF1%pkbK
z;E6PoTCc>*9(Si=@0hqu&7DW1Rt<ug^NFD;r=5O4zEXCB{pRni5ths`8l9-M3WZLp
zYj}mI(1*tB+{D|&)7%EGPLiR*c>r$^vYZvTyS`C*e9ZM+a>gF(M4}Oop}r8$WJMp+
zBITp{FU_eKs(zT9NbQoTQek*rS_8dETF%!G5f&x3`S47PY5{TQ%n9Mpu1Thn->zM`
z+t)rMq~Bt;$Ya?tO-JT{lj^z%RJ%hMOK}jDN1xq5BoSXR+eh@nhTi$h^*I!%wU^~q
zVp&Dg_f)*m(`{GraZNlMW(&rtym>y*9#ym983I)pcO^s1*Z9qOeYO{wuhk;r5+h`b
zd3Xs+V|f;@&aQKiUsn@oXA|YKjgouio^7dAK9z}ob6ig}wd&J7pRjJ>5<etlwDh8t
ztki&x#$E+POB%<WnsptyZZ>wL1qtc=64p0mE<s4E4VrIJOE|+5H{I&v#IIWlgc)jO
zpb7$aMfb#4-^SqmWCn{2tQ=o<MYxJ4Iw#do|0Mb07=d0Vue30b%PbnW?Ki|Da<fyk
zRD0k>86|pNQ3|fKO1BYRMg~!GuBW{?mK=zZwDWm2ElMw(HdVf}JzUpr2H%zH$wnFC
ztX8JeP`X8vs&xW`)VAv74Hy^_rje8z<^kVsW@s_B4wt_#d{t-mkrRkCl2XF>=Agau
z^4t|2b1yeGD_QHMG$w=32>kd^zjueHH#}z98c2p90){CWMfR}o4X$%4hoFrh<t8Za
zuQ$JJVmWdRPouJ3zH{RPokhNsj5;k1u>-(*y-hhVs3woqc{BZ<2=>h3LbVH_m~#!3
zQ(WMAKP`{oq?1`q?=0UoH|Cv$pXQMi3?=2QXiZHM<`*7Jpw{c;79G#KV~R70^3q5n
zoElz-9fFT$&*2?%DJ5H{A;(^Aj(_G`oe&^@x*giiUT$G_V=F1W6Vozzp!$rkVJ`jq
zR5Q1dT9-6jbUfeTEcJ~(ivv#KJELox6+Nwvom6W|rqHJe0t#jws+*{^xCzYcLr&3P
ziqGj*7&lOK^a{$)Hbv_wxOy4S{ViXZ540;q<T=V%y?nI;Q_X6B>$XH{PzfWz<tI+w
zVry7P%(nCP;A`lk%yU8z0$j~3)L%A_EnW@}SypGwY!dXx2q#`T(k<u;&9)2s0*LUz
zIP<WG19LV0;?v+=be0o|zgePDP7YSstk(Wm*r~=mY8m}b_tg7e&yhi-g#r8ton&!g
z?6b*8@wK-m9rF3>7Wl4fqUegN#V=!a4w^loB{{1d^fEgQ9ZRVTmS4V_>=MF{j=9m6
zU!h7GV!ckQwIUa9rjBfWcfY65@@1@i(Y=Mf=4fhx=OK$9PA%3@4*VTiJry5Vq3Lzu
z{mLp=3f<_dL335-vm_wdGzk0E{P5SWwf@*78e1oUm8zDBZ7Jr(7s}@+Uo#vG^7Gn~
zhW125_HS2?WhQ@#9E{_i8q+<cH6rr_8OiVISo1!yJanRF`y+GP2^I6trM7nOv7Mu9
zN&Gr0(Fm*q^D646`}(4AuAA`J5Q(&MzQ(zL-pd<JQ#2_r4ne%{8R?Y{*Ob$DvBbVT
zdk-{^+J%i}wyV;yhrk#bc)p+>#aK+Yr9(MLiQTp-oGVMwJ$E`<lK=F!%(rF8g7~*9
z^yg02eNFmy*>Kd_vs9m*@s+%>>1u1oykleZipiC2wC=Z%)`(`cDbb}`#_^_mFuoF1
z$z%p^d2CF~&l^LRrqsXhp?@$2zEa)4>)enMcJgs?GM`!?K(ZCb$}BkM2^^&infjZ&
zW-n7+aV%}BW=Tnz2mHCqwjzoqd6J#tt>co1fRa9qbL3U!+>2g0Q}p&q+?Sb@`eFw{
z=qbq(8~gN(M{tQZ4T7xm4tdhDi=lmRp7+tY!;4eDj1C4Ts^M=rR?AzH9oCd=vKaP{
zhJ*}Wv5ZFadr+l+7=o%qM%SL&7ERdWYWjI~|Jl;xtIQ;iTdfZ0Z^u7u@~A&=PPY;M
zZ0s+fHs+&Nv*7TYSAgf&(+>q3GG>LTI#FNZZjUptCXwsJsqHgxx{mkCPz4X>G^nl?
zk8G6_kI@LlQ063a__AVx51Z7_7R>yYhm-JLT@LakS+41bXoFPV8>b;B*l3grXCLBJ
z9SsWZK3ROOXzs2jM5D;ui$BU)G+gzVT03ks)%Y1iXoq8|&lIzyb%F`PgJe~w^-ttr
z(*GXrl56POM%tMznyI2H++abgsHjvxsEUN(`MX%XyIQL)$b-O-J}ffZ(fR$xwv_!9
z=Cq_4xZ{N<M|I#sWF=jm<sHkuQPsj`@q}P(FW^>rEu>EO;lMS0<ml6Pcuc!GY<TU#
zg9o;1$ijf(FC_t)!(*l}OAPgHbo^-{K|j&QV&}PGs7W^CF}Gh#BV~=3M7u~Sa%26l
zbor!^zTu+qG-gR(ZsBlC!+2`_$*YZrK=}jL7?)tI3FQ<G_&*e#i$7EUAIHxOLz>)b
zGPfv~R4%2>byRN2+#@RG79ktC6^2waV{-|uQMs3EatR@qxn)9;dp4Hje!qTy=l2hI
zY##fZ&-?v)JzuW_Zv`jgiIUPh@~3coUayU*zWDPV@%3zF_6QM)zX$24qF}vUs#snp
zS~Ltz)+AKT(z5TDt2li8|Dz)J3a9Im(GrOoVG7**(5PX$6FK-FP-IExiG9(IH<`3j
z)hbneik1s()fV;(!mFsL4}xM)OyxfV^?n`ItBAW<T@zJ(uav&5KX^<Y*tIt6f(Qo4
z@c~AX?y_Q5c!)&9en4U#CGf1V6Ep#<zi94$w{Z>F4;>)#`9P<8f^V%sIPtKt8759H
z^l=SyZzlDE#nnXr{%NM<*Tie5rc8;F00IrdZSdObo@izN15o`sSc<F**!ygIDrR*?
z2q8$@E$lY0eNpU4`o$a(J%tEgUyVV+S?u$WTihOIbVfIXbM+wP{h?~^_K|_*j>Uv&
zOGWZU&EoI0nhr*;qJCoGLgQV?qz5S3#&nh;&}}B#NXbkl7XE~*lK?~M)GHl3EVDm?
zs}|DAG@Hr2YHI<-8%bIB5snyB&dw$~`!mijEq937j19)L>1jTlvT)=vj4*Yue8KJZ
zM+;<^%oR9X5Q6g&kAHfTqlkcxW=7>nJC~;}Jv{SUeb+vE65%x+FhmyIoF^uyvpxEx
zIj`Jg^Z*F(ZNGl&GrB+Z<sBk-T>p5KEJ{A}LG!FN@4NeM6#qsi+-T&12!z`AH1?N$
zB5F;fOtbx_P2~cWgjz$|==xgtshDG=BHs(<kMqn`ani8(h_3`0k`Rkt>c=~lH25V#
z^Lbh%3?>UL22I16?6fL@=u)++FGe7GjmncxLHacD+puV%qygYrx4hs}tz-?XgrPsE
z|0=z5IXQS1i8sXPgsd0z;ik8HOP2Xr!h@vO`>iU~$GFv4U>^i^1$F}nK6ch{%KSS8
zX3gM8TSWf{IJAvNhOqlfCOyZ!j`8IrR|adlt}*)KKAdvUXchOh;(_gtgCBqou&^?r
zU3|O($1u=;bP8-;R|Yx~k3}^X!$kSG>`tf?5dKlYx0m1Zt{61EC>uQ_+{i?65R^=#
z#Qn9+uIhEZLuS58=>J)a7(b*|-Y|-z?(%~!xRJDsZ4avn8Om3nos|0E{KB6h9W^xg
zJO|4AP1rhh(w_^X5NixHJHb3E3tv3q=3jl*fQ0_5X|u6d9WtSSQhKq5^boz>880pF
zPgSoK;=L<yOU+0GqW8L|tr5vAkq6JtqLmTnOD>i-9z(xbJwH-!?G5(QK=B47gUJ2{
zYwAFWa&Jc|a=BfH3ov_sE?r#r*dkIAB>^h!3zy+mCz_=xXgOw7*uGLSzC-p%4dTJM
zM*_F<1{?BL^2DG2zJ!Fb$E|Tl>MAIt6ug%0zQ_;fcwHMjDTy8I%l|YK5)oL(Ya}hO
zg8t?hxNGypQ=;@LGBV+JW8qsvBTz;7CsKHB5J_cDfN>H@7qbV>evy&ho8AHKpz7Ib
ze7Mf8<a}+9Ax5etgkEncWV|Xz)?3)VE)93g5|gDqvRPDIJ$fGI=M9=g1ew@ebCKUR
zQ98-|)E!oztm>6j-qCOENDdv<b?t#C$HaS7#Kj}vdjV5vcjfOJ{{kZEgWJ7av$ukm
zYyfc}Xm;Q8#si&O=Y4W|4QShQj9csrhI1kKn)X|VJfL}~b=K4egPN4fvhFr_O7T34
za~NUcyH&(_fXXE=50C`RbKe+U6!Yk5-H!T*n<t>8ZdLS8UlDw<OAIq%c<+Z59*cKN
z!xWmcv_`a*Na=gu08_WvZ2A~L!_kH&2ZS#ts=XfdmZNAUt$n+CxW2{(ZZog-l$Vpd
zxM-z)uh7-b-ECu1cori<c2P=fPElpU#6WY{%Tkf^!@bs<L9QxLU|oK>aK=+s$S^yq
zU`9yqIU6x&*&OgYPF0I=I$=;E>>l(EPaJ2E?P!ZIZG3!<p>{Ph)vVBaRPY$FY;LY`
z=V4(}-TKX}Ns>C1`cQi{D(tfjrQ@Np)-le=_@Opb7MF>Poio0Lq}u!N;M1wOob3?^
zR@uMm5Y1@dXMk~+|B;t7quD2D1nORk$4bH3-=~HhEO(B;VARY(syjjI{9oY6+kAKU
zw9y-eSAa}*+Eu?_3y+W<V&DP8b30<X@jcad)nMQvV3=^^pDZONYG1Vn<Ra0l8iMhR
z87_(NTZUeqX~*tPPF_U%%8?V6b4X*iq%@Ep@!7QOP`(nGq;GTs6P7<HvZ?ed%^OOo
z*qvGImHNYVVLCXe^NQR8Co_xV-I=n-Mc<;It?hueS0U<#qMR!<x$#afP#>WLRCJ#d
zFD--tLFl<}{N442qXB$sIyH-P78Tz+5m|_4Va6C#wivxpFx?S(%9~*0j3j!D4D@nd
zVX6J*(Q95|&TKI5?9Gy2q)BxpKBc#-1jDj`0QxP@c+Gt>?E+sTfp>1O^u6lKUmGdX
z)3H`S5A1esgeKrqcg1PiznVy1pQ=#d4HDxr<mQf0wmIsFAAd}$7PmQvoP=Z97U!+D
z9bNfqd*C6m>x*$f8M0j4M4i8wrybFw#LHt(EJzgS#!+xX0!7M{vP(y=`{F8Gh#OM`
z>rO#Mxw6^Fm4omJb{s%b{qjJur=JL!(ETBu`ES8U9@oflBE60{PV(zewH>YT>1kd(
zq8Xm@kfzpc)X8nGqMpQ9V`l&~8E?`^kA{$+2}?4??rs{?H$+~iqwvp%lMW}gN&2Tp
zbn7;A;)hIP)oa2R#_=X|Nf==YE%0||%pa4vd6Sv;iCP2IRpB*>20;^~`vr#-e6&)Q
zpF`{du3yTO-0j98d&k&Y6)8*uZ8C0yTQ<6PEWi6@vq@0}-AVZJs6t&lFMZZ7<9ZZU
z0|^*j#nnzvPQrozb266)g)1zJMWS}i{|QG=3^0EZ6dm+&N>9(K)=D~FG()Zue^M#u
zeTeg;msEH9Gi>dDa1>t@f|aiCEDsD^?!y0037=(a?}UPUW#2(trJSz|G;h|X?x#mH
zOR=MXS{8VxCe%gyhrEfnoNywpqu8IC_QsD7iH|T%@<<L+e}HNeK;*Wxn*S89B|Wn0
zZYO*cq@fluhuh&8y7^3oY3kSfd@I%i=mR-Cs@1Gdp~;C`r-K19MXvW&XM$!k=WHPY
zw1#uP2m4CSXBT*Kun{_iz(O-WhI0)7e;+QVxx{M_vvb(do;Ttv5)G#DFI6dd<i@%F
zJul<ULXLN^FE~aHpn2xqS(Cj-d@*}Jr4$?87arNfn2&W;(<W)E*S_W-&U}?b`bv<q
zd+akA*{1sm`HHdAea;)&E?F^E%p*<QpMuPd^if-R6m*vnVCV+G{PKpT(8Ul_DPt>k
zC+XTjZ>2>62H;Fm{6G|`o*Qy00%Y#$h5j|R?pV(bN_FA{Kufjvkg-N)vS2i=roaW(
zHToL%d&`1T@hGAUmKhpqaEX%5USlwgi|Tn3;R3$F8@cD>o^ZFrPzYv;KL)Ne{k6rm
zZ1eNOogXRgm$%!nUd6T;E>&uPB<+Wc*h4F0`JrXfJxIB7{BCp8+8Q_2@!oI?Z78?A
z!b<@1arL5gobOimQ{5m*?0H~jc!kTdeRiGx$vEHqhWVrZz3PDl=*%BQsgP}Kw*rUI
ze?TOIBlnQd;pSrWsW*1v1VD@Zf0QRrqFnMX0A~AOsg%|DwpXi{F-@`vQR#q7WooF!
zfk;zUqDsi-4B<G3z^e!SqQ{S@MiNP0zPeUpX!e}B0#7H!WPN@ui!WD9zlRwW+<LX_
zopnXjBac~Q7dPuDI2P;09n9$=(Ub+NzV#e$$g2z9(kkhJ?BY;nT(Sro2t*goCTZA6
z)T=IHgg7za5xn)fK;Jjc#Cq>`jDph&icRfvrUV99ChGiw?5ehRNml1_CQg5*c(OPS
zp`p`^^IsY9`9OQmBZ2S%$XV0sE7n`q5b?M~*p|&*yE8G`?EXHoUyGJo>^?YVlWhn0
z-6x#jKV((3X<n$_i#?ho^GAJ&R})!+q|6(@^^;VU9h|;_H6=oOAZ@4yT;~M5?u~8Y
zs))TDCz5ZeT|0lYjm@q)KWTr;9+~hnjYp2aBL@0EGg^aklkmJEInPhVw?cZn?y9N4
zfmt)ZEpb0ITjCGoH)>3V+4t<hOFj@Kgyt#Zf6;SJ(GR~Kf`Z7!34;8vg|9Qt;xTc{
zlIZ`<%;^c6ni-z_b7e$EpYhm&+jaJ{Spl>%O!56HML-$FCSALE&osI$7M$4&IJ!<v
zq@+JHv*4sC*mB#B`ge%lq}&{7YTRx0@<2<U7N&g}=*v|Z3;v^tTf_i~a5&!Fc=lR|
z@EvI%o##_ALdLJCM|465tWvKZN}_9n*U6M8&|J-84t~Puj~ZE+L;fgn^l-y5dmu}g
zk}a-weL0I~C~|;*Nu5!oxLsP*#)GuUy%2l}p9SDXlgw-raI^gxKnhL>nV9!B(y}7m
z>4<tQO0ps*vD)Jgj-aC`LizT(UQcEoBc$k&OaNxv|0!X58(VKalP&Rj*1f{G(=Uy`
zrUE_JgBAN5+RK%mvoh%Q`qwR5@^|sm&Z@J~G<x5wIt`f4uK)V^er4iFEeAKO^dJCo
z$FU1w;^g%%dKHR^wObBm;P)EYvNZJ`ugmt|pH6YZ%_C9(Zk~6$dGg3;E5)wq>PFPg
zrrzu84##kJYs5dUe{*nf!8ER@(wUgU34YJDG_HC;KcOm$Yk`i<&D_=+LzV<eZevgJ
zZJ<k|5-bNWHu*|)k)&17;WcjC4Yjka=qS@Bc$oS~q;1vG5f&}HdLDE1(wAu~pnW7m
z?p}0J1H#FFt#DE6NEx7_qZ6iN!trwZGo1BsJ?oJ9^1QsCjA8Jsh33bE&*8pUZGoH%
zv5AUi%*x<Nn?>bFm2BZX`yDW0psaL~<;sPg9RP=F%FW*f<fvxE&L*QTzg01D#vCRq
z8}(>lPq2Eey$uwoe23%=#h(N4&>7lOzs6GNmXS7}N9Jd%d~VGJhPA%Ts2CED$B0da
z+d%HxI`EjI(Yos*O?QcHRCvw#qUnMO!7(B;dMjdQmhesev?ht3IT#1%^K~FrRs_V;
zs36zIhc6##uH|~p%Cz#j?teV(yGeTwmTjw?F*R9DlP(lzvC+4!`&Y6K32v9iw*Wkx
znYZukd-fU1CL5zAo`!w2GAwp@!Gvms6_CA~?&>z&&H)ViIy((^ToC)7UmSe|Rkit5
zBx#=%rrhvw@hs@-sb`mmS$=r#@Yi7aBsIPa>AJi!`S4Um-vhkt-#X#-f9iX)-!ZQ)
z@0*V%l-v*_A3Kw%Nsa@^$GTd47ECr69B;{+7gLU6^)C9-)>i&L!%a8neWjRi6bp;B
zH)cVy@uCu6sm?^n@Z{gqZ;;MOkswaoO&YBnRgji^t@KtYoqyyNdUk}Sz|pQM8@>cL
zH`E%yA3ap#U%jGOJmO&$8P?@bFFL#A3b2;D0z`m6UF8WENui+|IZ(gT{V)W0j7)e9
z#BqPsRClbDUtKNxYt*hw8-S=-rGeinIQPAlhHzGoegEZZ;>YN@Z<k-0PO8uUdnY^b
zMS-J}Me@@}OvTu`e5}?gIQA5^Huc6+OpZy@O9324uO|)R;)s;n<fb|780~to-VN7a
zfJO0V{3M7Vqocz7baV<tIMjIQ+L<@*f9bC!)T6WcG&PK+m-|8RyzzBsOC)vwik#Vq
z&E)iRhJ^aH$5HuD_=N(&I2pc^<3V`cnuLHUVCT|sk4Y6Wy6u&Of8C<O{Q2hY!liR!
zFles7!Dag5dK+pM1Fq9(ZT^QRav$D$4(VW7*t#H^I{s)`t=OxK{Qq=~gZB!QmYxGK
zeTs+Ux$mi+o;Ib`$MB2n^`OV-k1aTq4Nk!d<mEDw=cO)UZ-puGbP22z&C#<~#W$?z
zS~daN?gTl5x{G)<C6$=8kD)AN|Eq3SE*y<stk`(YiIp%VD+2s<15+{$MG7n~?S4%a
zHki*bm1`0k>+uJ%)n}1p%6R6!m-l0nr%YKr_IQq!#gaOi?rq%*1XZe&#@8U%-dS+u
zIXx_q+uB^pySBw#!nS1cUQkxL|Ji2akSdFQnx8JcrZg#dtDV#N;}K1`;!TLmYBZH!
zpe^aT-5plMiQ69^YZga;7=Mf!{E1o!c(MCRv3JSrXWw~mZd{^-IZAB3r0=v8chlLl
zv)KtV_gdnz*OatK+cR|@8^5<A^uVafh(w)Zo+D4iqDV75xBU0zyLTTKG_Lt{)%^$5
z(?vI=A}f}I-d-jjVP%EuOUp<l+*tK&&1DX;p4|AX>pQrIIQv45d<TQvoHi0G$=Czi
z(&#O{PM4Iu1)V%d8VRpT@+E@jZs*@fi1Bf$TIp0dJ5p})Pw#8>&8tnJZZqjJk;l=O
zG$7uQsQ^VMaMf1nQnIifO(1Tfe4kj}arg;L+}NiP-~|^#k3?1KuFK#`^AzLXKJItD
z=lTPF`uQN$&g^TxEeMtYkIXZrAVG%Z?LlmUuJF(`Pj#oadKrARDu2S)AD>y4nmk;W
zO2N9^-_7xGwM8C7cd)1)S<JZK@1LTTdUd`21EL}#njY$22=Cgg)Z=OJT5DLwK6&Y?
zvD18br-&E~2+>bXsc5<`NbaBBRoUX&y|gE`pBpaa`1snEY>C7D&(}KRlN_qgiBBFi
zvH1P&Aw#KA@OG0&o4_wSUMSYno3rT21J$R;MoxFg7U&%mZhxE{Y@HYm+7MqJT4pr*
z++8(K3f(VkSG_NugPhO!Rdt$!Tb<CXeY_CS(f|144|wV+i@?<U|3KruuLil?qi&+?
zt_I6zW$ej<pFB9C2_MdR@bjAIQa=-VX);0LW6|du;~iDlfs=Gc&rt;{+(FUOczVfL
zz8uNb!TDk0#cnYkXRsCG`bX0b?j=V<Eix!|M&-ZN6PyJ?i#u(6CuwO1pR^X0FC}H(
z#(sUHWP;K;Z4fj1*LaphwKiw2Od_ciMLM1Y8Wkr2mk#ho=aC6=bq=+0EkK|*B-i40
zdw|`%%(iTWgf7AM#SFlm$7&?mzXCdtnWM$&>I)<GXPlDpPp~*fgj!0acSSC4SwNSG
zs&w<@zUguSVAm!s1Y;G7Wah$Zay48Q-~vAhGCq0axk&S&i$|^J_4(-j0mvQegq~no
z6vI3jB9dk(bd<G(o3nb{vd|7K`I*G`4wm765u;8^lgNkg90-GTDTjvO$z$y`0FCzP
z_?<|y3CjgcT^Y$yWRHM>znZ+GD}%Vb1gC*Qtf7S7>kH3hqh~XKr$Q31YW`s6t*Tx5
zv(Fmu>&)g}K?qK=cH=_CpMg^^&$NkQYa3)TXc7!un52tE5~;3H=IDa4%l9;X`?sp&
zB14xPfhodq;z%W4YjrS3+3^+sgoeNpNzvG<Sx;4)jqH1WBwb<$p2;329ElX`;H2)X
zi9AU+O7rjK7x;5etF)!k#?^m_^oc{b<{97-NgKNd#5}Hae~5w>?0wTPCXznzvQ}yS
zH0E&Ls0dG&Gc(Ug00c3oNX`c?QZ4J?pA{7D+O`cOV7moi;~$>rDXm~on-T>HN+YLc
zwKnFq`k#!ue?JBl6I%$o$8l<C!Ri7XtsJuReYYZE(_0PIk;jjOiI;UrIYlTv>+<MG
z(4`Nq?)~8~e!F7dO_xW1O~BIo$PNyh9tc)K_`wem%89J_E`hXy_P-JPwr9RBCPdas
zhoQ5$jf)zPfHCW#Ucx8);7IZIX5_<vnm-<Tyzn+U`Mg8#HcJU(Mo{MxlfS3)hvUx5
zsh<dFKRC<V-rjdmCAtN-&sr^LeU$lYZU|RVv<-aYetLG*g8M?JnYBBFj%(AouQnWb
z=46eP30I@;7-sLZ*B`CaA@eZx$b^IXJKQdzl&U2f7Mr}>`|ul}e>zRGfOAO)174LG
z$8Np>4<<t=xS-^&vD<b?8?K+aHWx=oaX5m%nfUtGB7Liu>ruf8iVT7YcDxCQY2z%h
z>Sp%ug$QSjCqr@9kIPZcomKWTO+5(T_p0+2L79D~z;2<y@pB}t<;?Nl0Bj%zF+X@J
zJwD-!kOslz*4F%9!Jt}**>#YheI;Sk@JH3+?Mv&1tz-b^tP5&8qCEDmf2g(ivc=G1
zQaM-eBd1Qd9-2{0RNa$K#E2cF2+6+$?re7XtZP&KsXwakUOH+Sn_Ssb!={BbfDyss
zoD=RC5#gE|oqh28-K93C6Wp&eX=+AdxdN%Tl~gW1o!(*Uv43VHk*iPfk)Gv&Pmw{4
zP(J#uYN|Jt_#Z$+&smN*=GQ3J26E%+Xogeh!vfb>u56qz#m@wm8^T(jC2r)l5g%~Y
z?%VK3JSy3q#|U@&v?qoB*4M(UGeHA4$4<qO$Go+%gZ_9$EkeE31c}QYJVLmgGP2<3
zfA#!(r0S@tfwZ%VkvCK4a|Yn~KncPpmG&seH*cwMQ^?7vs@u%<sD+xjIx*?8_%QR4
zM9V3aFs#Vxak;~CAJpKZ(QPo$9kB~>C6A^I2>=1?2~v8iQ=9@5tGewe07bfFvJb-E
zUp+K>`IlU(tS^(8Xg-C#ZCZD5v(6RyU|3W~=K!3DbOo*D5l$q5+g@)(zBu)FT6_9b
zD~GaNeo~KLjZGDI##I~*`jbVA5Q2F<?)ow<VQ8@Wk2@GNt;~~)q3O-<DTYHGg8TsN
z7S3MfwPmrSW6o2(^u2nbiE6@U$H=ET#%#$?HRo|7?Z?f{HHdyNg#28zrRuS3Y0shL
zHbVf^l1@Y^uxzgDS)dr&;ScXljZY^{|5{1;8o499wO-iQ@KVO}y4)Si?cV@9SBt&2
zmQ#~5%<guIZ!Lv|HSbNmf+Pql_kB(@FsxOl)devB14^*ExR()D8kzbOwESFq{!y*u
zsxA(Dxc)ja0mQ`lf4QY}sk#l<zk_KnkM0QfT0v&jPnRafUIdC8T~f9qH}a$0jvIuW
zsnsU(^TWeG-ROAyMEjkxZ+9aFmqes4w>s6PngEAal#&|3B+>HuUct8?RMU@NIXof9
z)?=D*b)OUdniG9=8@ydyq^(SsRg@-Q-YmvU5;Q@=iDfPMSjphoN&jj;<FnYjG7f?y
z`RdC1BZhm#b@`pO!UV1g?e<RBAf1jyT7+re>Ip;Q<lz_OHb45r$Z%ooM&-#yH&z*^
zOArWAqU)-^zkpH<65*(Spi8MqKJHT}54*=={|!9QVcZB{z>*S~`DnUUeaH^q(}_bo
zLL4n;v6hSnodk(P9o=u7j<ni7hsy3wTpCW9rr6iz9;(zBiyT~8h~T5lxRLa=C~EJr
zP=KH6j?L8*tw(g!+s12vwLOM4Mt~G@R_4J4th@{y()K8FZq|ft@^WNk#yJ?VhO|;|
z`TmTlRSK*h+{T99yB?D*9`(-0_HHP%7Zje3{<c$;^Y)OvCp{UZ1+NRpGi2bwQG_iX
ziJV+#<{vz~Huh`NKmLvRv0`)GEO>gs8M)xSzI<E2yP;Z2K}1FV((!Mx$?zbF*9?97
zZ=1LG20ChESk!gj5C-y*jaT{Wa*kU21;k%K@3-9(H<R?HlV5J9e+26c#|I#RoJJ{@
zykf-Cb{&9`m&fs*@p-!CQD=!Yd7ch>g(<Y(H)Wn5F3fJ%Ut>a-=jXp+rSGTrrtm$X
zG>f7Bz$|oD_X?!N<>a2vkA1Pj)k@H}Z1d|Xle(_8@XyaD4KA~OpmVz1FN}^~AD1T>
z6=>V$kF=jmPd?hA%q=32i@#TW*koZcCf#VK>C>+SGs$$>HHp6>o+rO{4gtPl_1vKX
zC86=mtNAxho&4b#&MPaIlv(V*Wg9sytKzFdpGL_l`%{btcdR)MY222sJqs4!G{oPC
zPYQM@7Xhxq8!~gQ$DJq6!|=}-5>4!a&D`>^?6f!A`r#KNj=~~lF~?8-UiF7hYA)~i
zx7sDgjP)*fQ$3JGXMx7>3y1s9`y-MU8ns^a?`hhYo#dl{(`pqauZlfqy5CqTTfNHZ
zAbTbuv+Q56ZVLa$e~Ibvz*7F9cIAn$u<cf}-3_IN&P$T-q8ArwUc8p}zc213q=*4W
zbr{7u@%%hf>0=w0dF{|n8%^xEmygC$NX+L`orMKJRWCg1!<AB#vQiC}5X=|Vetv$N
z+LesKRpkGH-EejrB~U`14<UGj=LVN{26|rvmnU>Id9OC<F>>r%glg5OtF%XvjN8`w
zB*&K|2la%{Lya(+o+%)hI-`+%Og#KDKicIlEJt(r=Eo3cRV(8~V$hENPjX`0N~?Hb
z2^2R6(o0sHSAxGkik`@7(zyryum7O!^-8UN&!ed<pSRl8NXcxQl4=cvpONH`n?HzD
zV!i~n$e+q`e+YOxWxmNff92h|QsD`hc0{}Zy-Uj+j)l(sq$vIe#F;H`;`#{ke6mt%
z#HBF92*&ohL*Nn7C0?D+Q*S7fF1Q7ChWtvtvBejc8aWcUW%C%Qa#AquA`Dd*?R>g7
zUQZKWs$lP{lYlt5edDsTYHfjDP(N5fV?1Iwpsfni&5SXgx$-q%4s;!EAAGtZop8s4
zwG;a2QJ-=`Vn@?I0rPtt3p0mSO9r4lN*b=x1YHZAj~Vt$zl197H^HdC>dHIStPbtn
zDFXCF)(`*_g$khdx-EhjTh`>G#!GLWc~{-gwa6wSaSUuh7O&mOXB;O?dQ5b<&Q}zh
z^mKbrEmuP>b^U!;r41fB=Z7rUNgOE|a?d;mgVM%(@{{USbQ|`)jOX83*W>*{7;iRm
zQ!pmCurTs0M(~YbWzZ4THl6xHzfdvm>)KHv`TPY9x!64XwQI<PDilm-KL*gn*3X=S
zZiRicOeH5*cwdAQ24td*uZN)jf3?bYBk$BEDsZ%n<17HX*`!|g+$-DMfS5$+fcE@8
zlQlUh#l|F-AF~PuC-cWuqq=tu!S2y#Hr%>-kr^btiWU<$R9l$WbvXqzTY8EB3nC_{
zxZZt*P&2l#RPF!c<&ntmy3eK0lYru^>;vCf0m6Jr3iyA9I8vA*;&D?lzrbp%9Q8<d
z1b@HH={MfA27Qch^4V97i^Q2U2h2*x2-dPf(u7@acaIqV<x-|Tn99|csrxtr?IUx(
zSRtp-om_VMIT<Ujv)PexuX+-YmFo1hEKcc|F`{HO3{(M?k`;Tf$N-7IwOT6sgSe&w
z1aj|NBXSudX!OaZ(5>Nknx@YfF)+7%4gt_in9=$^%>aLN8yL_=;*t^~Onv>rokN&Q
z1@`b~1yV7FPVGGL<&eLcI1K!jxeEZ#%t1vt$vc0k_)VyRfdvk&21WG^3?_!t@#R~p
z%g<L&H#t{udo=}O8zu7fCu++VL9Y&>Q!}3-_T0IJS(a^Q*Y?k&U*a#?r=@7MQnksl
z6+qkTny%6`K><L`m=DF2+mMP^;5$-YWxhu2s2W(GA;=BeEIhu5w93~qU(tz?Q7RPp
zqnLf<5O~XH@rp$iv&3}%s_?%%s}j1eI9ZrK(wDP(NT?3?2c5+eBG$M#p7DhH>r~E_
zKzVsdsuf@}No6<W0Q$;q<-g0Xxpm3JKkbjgqKclj-;5^rl~2dVYDFRsl7Rv>A={@|
zi!iT7NU6#CW?`vPowwtnhsbPND-lVm3&?_rxtr0cww_QE>DkE9puNBNzo&$RY3Qa|
zS_+RvOJ_?IZyQ*dY9P@X3x!5ut>-M$Pi9hqV+HTIWb7|C$R#w|dIOO*&caD_e+>83
zJAh>JH)Pgw-flX4(;J70ulp)+MFMj0@U%Bn0X4gA0W}_`CO9iRwX8_R7(+9cvh6@}
zsebhO$e!YgD3Rs7+Fv4>41C3O&O^&|{`RFk3F!(O4PYg#&fC5o32yvdqeGZ))jXy@
zbDG0^;?@A5u9`$sQwJvtY!T$LDaYnCNo!x}%yyU5%TK0cEqI<B3uJrGVzsu|D9L1U
zHlD+M99CteTVH@wi?11dw6AU~?#!RXMBKp$HD;CZWhv+>F49-?UK)%TfR4+8Ct1C1
zHxV8@lcS|U@q<tL3ETh-eIm&uUhu}W=POdAT-mOMk`7;Mpox48>%DUMM2{m3hTta1
zKY4<IbkLV2G5d;^k=`U;h6EteK2WgT)*rcL?e=_yds2&C0QwQKNFtzul6{l!_()1!
zOuTY(O^-cm3U?7KxdN^svsMq>A}dLFK)!T6i|hVVxkWK&KOG1-&&bp~7egI{t=io+
z{^{I(6*M<Szpn~Tx5jXl8%wWc!MMnGU=WR@4&8dMikw%1bjmwg^^UOJxaUR03fu^z
zDQt-llj09?Ys3BpyGxBDLQ+u{)pNZ&8+ljHPVq3O8|6V@K<S@N;9p21nz=LJ`@ZVF
z@G5}uorni+Y?qcLd`6!cqFNi6|B@j<${Od_7tOs1CvOR(0e{1pU#sDeM;1_nF3HQ;
zWwJzggz~agYlSnx@X^C>7Z7d5-C6um0wseYanpB%giLfq;FwbcIk#;;xL(_<iikoY
zJF%r|d#`}o;c87Aju56O4k$fktvp(1=K$u#`r|{x?~wli@m8xsSDXdTG-~s^=XRYp
z6yjKp($P^mX<K#edla@Fa6E^+R|*yv=N0kcd2mgvqkn_f3bE2DPxrG@w#x=*?KW~X
zWTaE({^(W!=y<}J{*ton)5r0KV|0+A)o2mN!KT>~q1H`kyJXiy6FOi4eIx0W-0aiC
zjoMd|=R3v|4JBy8>t~C5CX|g3@@Lj(p7U|5QdxNH_GT9FjF_%U^HXKiJ3<_)1XE?@
zm*#C3<S7@#jU?39^WKRzdP}yjGr^x7Vl=N?1xHajujVT#oGP7qBAMbkoF|5yT+90h
zDOddls9jOUxPbfFH^UDyei&ID#K8QC6O(KdxZ!vqD*ZyB!vv(sT@}du&sX0!B=>QR
z`NM{*euYCwk1El#)6Q^oyX<-30T9LVNCImz97Kw7O@G4v9<z>?h4f3nv8CCv{xQ<H
ziHTu?l!5{kZ&dP0<+P7oBJiu}RGxD7YLDjf=zvx3${YVg|AgB`fUHD007G=><?si-
zm)ruEy*%S?k$GSr+|34zERJI?K9W@6s5KsW(#^+m(eWB*BEesR$!Vory_fPU*$#eh
zOlj4+b-hr^iC;b~iCP<ZDh9Q9qv{;!9eJn(q40xfw(~_nl2P$J4*h^P{$ld-zF6!*
z!*8tIUfv9ApIb4_{%hNdMqhykrs=Py`LS629Sdkm6;i&~FHBKYIh}!AUw>nArZ#Iq
z(NzZjgv$H`Xa)B2Li_VV;~eBhMN#WhF^Mtl3z}dfLP03pPryF|5HrI=GtK&=cLdj3
zFP%DYL{^1Q^nKu*^zM)!B=$lh`41rv&i7Yy2$#%+{k1jtpub~-SH*N!%L)7k*xdto
zQ`iOC%%9XTk}))Ey^wq;S?q2}(g45Uny8!K5bNMPWV->xUp2O_olDS#4R4KHHKc5Q
z-Jwj}(Os@gH?ty*^1uHNXuQwX`}MI^?Y<=R6Mwe^PPj~Jv=NDn(A=ji%RdYF4>%Tl
z-(solJ%TcP(C3K$(WdWUQ!u%If5~O?#m&bTw&IH(D=mxUqCYI2tQ;X7y3FFJq4TSR
zx_rXh#^>gYe$Dndo%z<n=<FL`dn61Y=jUg{cF4$#ng2Q3Dsp8c9DCOsLf5-7x2H)9
zI9*ZT)8tQd6-;Or?H?OzNWFe<EUAh-kbtxEqJ(Ci4Sx335_{sE;msfT$zpKZm(42*
zUL+n!Io|rEb;Cf{_Z{N4nSdGX)5f>9D6!ElUik+-jjqm2Syb^kr#?{;<v2lsu8$J>
zOlo+FP)zqIwo?zWCs<VzOPl5FX*Wh~Td>8TH5)zmR~M&B{taEYT=O|bt?*L1S;SfO
zQ4TH0Tt~_Hgy5EU*V&f%I5A^j#bo#02&rx`W~<?MWjem(fxo!-!>)yPuF#DpFm7FZ
zBUxDGwHyOf>?i*H3dw69+;K#?CUzkScY@AILnEKAvE%lS?h_g&EB^ze8e9sBbj8BI
z3yuZTn@Y(X#@`z3O5?+AkF?M4whu%c^8a&xp(IY~<4o)$;i7D16<2&K#zOPJetvE7
zc1i>?!u`yO{Lr2FU;2<ixk|%-yPzz%{yyewz{Gj6_TLIxt(l|$0skg;ZT1BBKkV_s
zTBM>rPZz)UIZ;p(DRoSPqS6r;oX}0GUpf89k5A|rf}Qanpt{HrJhJh8KVDb%%Cf*@
zU|Hdxs*M$49Lu%&;c=QQ4LN1YVyR4ea5ofzr0(F}G5_D^=(A^ZkA?T2_L-bG_GQR<
zK+Y$_{GH5K0!4Mdn;1N_j~$cGT3g!M>KaQW&cAzM)ptXEM{rbwor`7;C&zDbvWf6@
zyUs`V=iI)Ol268677%aKx3g}SCh@%Ist=xT4TagKVMcLt;~7oj1x<{>xFF?fq>Z_F
zbt4BsPHQJXLNj80R`nTEWK?e%vc{M;ErcllVt9x4a@L;2>q}XAornW$q%*^*{m~!Y
zt_lg<`AIqAkT#EyU`P%?#8Vn|>s<RtQd0eK<mcM1QlXw!-)c+%u=<@Kt7OmK?i1Cj
z-DU1&;G`+lEDMY!!)bE&I6$a4WuZ#Z^w3K$NGpUKVQMd%jg+#NW>O+uQlb6eUL+b7
z|85;@M(?zUQeE%@1hEU{7hNPP@B*p4Y+~k$0z{+ppQ{r9>sqv;r6<Yi%ti-m;res+
z+Njxy+&_DCm;We09*;M=26W7RyM(f=sDT)*7HI#_|I|<)xo}NixuEtD5Ztr}PNChL
z_iKSDosJxv?Te*%jlPl6bKgIhz61eb<YeWclYah9I_BZ86*vT=$zW@OZwt*!hV#rR
zefndM682nNhR?1BKQdg7Ih-n@^|%9^JoM$)_k**zRDTD{KX}l*njLXQ;M>}vqz<r4
zzuZuG+VDYr()^rh>kSNJ`gOW4a~31Yvhtr^W1_{FBXidDnfWfiP=C59E<SoYp(g~8
zOm2LA=yg#K=mleV8kHzrnJ<0SwEC-<S|~<0hAj%;=J(cTXvNCcu=73{mzQ3VC6b!+
zYBsXC%TeO2Br&9GM3P0hiHiLX>SMaJ)N1R^IOXYVtr|`!$Y$mmpw~7*&7D&0r09)n
zN4ox>3&T(aYu}9W%x7Xd-yf`4mKJLze0}k<^NBBuDVYqxaY*Yr3i*$+k}S02t9T5j
z{6+&9H@x2Pl|~csEhW=-_F2|qXmBgM$5CVdym_xio4jLpX8P@WU;QSubObG>GRLjk
zbrRkZp@+Y(ws3xUag~3WVG870@seF%%0*W=KRn&97h_Qy85B#7-8S|PT(q+exqb4L
z>{IcGUvt}W1vrJ_rP9VW6J#jv;5;z*)Y!Y}iNuPcbY!BM|8UuFzp`XvA~4pU>xV81
z;k%IgW4JZkc3ltKmE`b(<I5rFW-M~asH%^EAe|t))@aqBBpaS>i>iMxVhdD6H!{F!
zWxbFq^`u{46jr~AyjjgoC=tEyUl^-#YJP|XHrj270Q4zC`^`YB?ni5D1!vMOM_t=T
z4|9Vp(-`F!{gO`v=-UH+`Ogz~)kOS8SB(Ax3JIdwZg*`%@T#NXx7kIuC%Y=-r!g1Z
z!u%PPVO-dRG*OvX$f`V@XMJgWa)1AzM+R0CZZE%WbaZ!c0ys!S`>2SsYaKw^<##eE
z&wxokd<a8FZ$IGubldoCE484rn)~R&MSqT5)|r|my`UjlG_jW}wmANM9jQ67`OyD|
zi#|}__c03@g^P1VJQpNNJ?NvJ`93y`u~!8vBO<pSzE@FDy5+>R`+{b|ho=9=@NCRo
z_{vy4yf1=VUjzRkHoQXZk3UJN_Kf=zv@*&lh|78C4&AQE3J-~$j5lnx(oZplCe5OV
zxgMRBd!@$}g})&(j`BeonZ@II3E@ih&9P@i(X!;lbr9&R!yC3q<5uEp{WK|#D{~fK
z5sZo><2LVNc7niosvN#&`mF^p9)v``u3_j>f8?n>Ic28McIl!R{l?Q%nca@50Ke+Z
zJ$~|_WNtS3N$U$0y{~n`<k7bY{yz!oCsSf2{e6SH4eOQ{a6=@o?xYI0!(ZS7V$P@@
zaNxXbYh;_KXxsMB8D5Y2W=DoPf~`>EJ0vv-<MynHw5Zio#D(Z35Fe&#9wbLnS?y|~
zUz|}onv!|oP-n;aR*qZeea{azC;asR)y~fYzbfC|V|S^F6!B~*&iMu$x4SW1Bo5}&
zgCX>)dL7YQy;n|M;^qD!KZw@LxpKVepus<tgqeQMsZ@!wBso?W9CzNltdt@Z03Ge+
zv{ta5&iYCV&juqt7O|-gBRzJ3h8=WHin_4}RLz)MIDxS~w^w*?Y$n}>q|#;wQEg{8
znA6rEvfqxs&F4I3C#L`d++yW$mX0}DX5XSyI{{6m7?@`|af$b-)vFXnTKFOq>^nI1
z_Di)OG~h`7_6b|4eCpgkEvssQlq^>}@-H}+N0mGzaHlUPCFSlfg|YY=tB`i6*yN6l
zWun{H)m6@$&EQjC@3&=_#OJ4Wz~c6EZ3-O-n4^X#tDK1W8K_3!koEOd^QW7K74Cn%
zhB*74Vk410ijn=9-<Wg*bBCPbq8gvyEY~1U8~Amq#>U;oXTCxyx@!7hRd~n)l#C9g
zcKYgiRw=*`((Dq;K`<NoAzr;~EC%UMjacvT`uB83LxIQ_<3e<$`UyzZ%zm>yCd75;
zl%HRqOO<|RNvQKRA@3)tP>2cV+Fau;)^d{V3z{pB`pT2xtV%<)94&e+Cxp#)L!A`p
zTD4g{YdPZJ<f7(UE<HL5NgAB!&;0rnI{C88F2mv~*ARp;E{|pw!%DydJW3w@#`&aF
z)?Fiu1p;}Q>^U3CipU)=hbk3x8xL@}Mz$ebap{V-l7Hy~#$m!S-I@(hjRa)U-4xU~
zq97=wV6Q)Y+8m`KN;2SU=!D3RNYw6xKa?{rb4WW_Ugc#+ui^o1D_KL!?>1ae;wF0b
zpCVx`{>&ulN}|S(lVkxgd756^`|+Ej2wVK2x`v159QjRX+2J>SZxzZRUA|!OW$r)V
z=UYT}jW}yK-Tex%N>U5^*m{cV!`EJCXBE_4xRF^R=ohC(Uc6aXele}-C%5(~5x8E_
zjaZ*<XYM8^Tr>@)r*GN4G`yHtwRlnsxbp|asPYH@XcmX~i&#WqK9D~*${tzT^BfNw
zS>zWvr$9g^QSn&BY~1sc?fP=AY6OE)fWvWn>O-ByiPP8GWue+D%~^YgRivvD>l_k%
zt)X75HOUs%Qm9>Ad;Z@o8I1O3k80-6_n3m?3$aI4Fp~l8|8zW$9LYY747fuG2CF$e
zA<BVe2@|6x<SKs-lsrhiyTrLtu4p|tROf+btpoT_>sz8Vl6HO8+KHh8{Uk+7-pdCk
z3~}|<7I2M1CUkZ^7dlPO-Ztv#=HBe_)8XQup5}|M5bS6()-zk({^`nbPpaFp7En^u
z=7)dElRcmK0e8ndJZPO^Cg25V_Z5|9rjbHD=Hd!!AAgv3^?4TvX_RDb7Ti$vJ#J%J
z-w^vbQOl#4OJgiA9&zo|WJ}qVMg-lOZVHs2NNhXm&cic1ArS@+s_e_<@ia$XjfKu+
zZDtKvG+yjgdsVgtGYLrq1xJZce}fSEOQ0A4dxlrCc=Ja13LCR(j}S`#Xi?XsQsh2J
zs>6H3>;q&;0?3(nA#bJMK4Xlb#DE}nLEe7eT}`zm0%Q%01?v4baL{VJjeity;f9H5
z`9(mz5q81r%3T3Yj~u&Tm&+X>&h5lT3oD$h9&LRT`SaQ1j%2e*@@%vfPliI!!t~RB
zl6v$Eg7P%N56u8=U3G+a$7$y^03X5kD8}|z&8z?S22NkQ?))ZjuVqQ;Ue@F3SDAIV
zaRTSicTuM`wr=hlPJ_{6$At`=u&ihjRurKO16(tciTn2;P1kW}^N<uBPuU2SCGf$X
z<!`*wsV~sprhCJK8fkYn3{0}x82@UtqRYWUZQlHt=t7^S34|+VRURtl4iz3Q)J_7a
z8o?$B-DJqa9O8Q+UI~EVVl$u!6PueTGRvXx^Yc?D*T3mrzBehPi1zjnfgE-95Z52(
zx+d}gV!JM%S!DJ`CLtWnMAO-psr=oTj#)-Mps9gY>IN=c4_137Q`VO#8<MTUkkAUq
zYyYUuWorS@B@`eB-kzs6tp^~H+XEA|P!N)ZNO+wf0(3bS?S59r&A%5#!DjmbeOZpy
z$b(slh<%$5xzqBgHYw|C`R&clE1?u_Tn3)nF(cTfQwx4cpYK9=9!}hrRcralg<ouF
z3Dfd$pK*igB#WI_^)oNg2-(%(X@!dePLivhcr*Lu3)TyGjG6pduj_Z+-=$P_7H0E5
zlrlAptvY&L%buh^4?5Q|YSMBpw6q+)0<p%OWsB^h?l72s^{Tn9J0sbZozQ3j5hFkS
zx6nTFPiJ)=E4YoTEzrj6sM~(muAHC(nl7a9Pwt8r<6DTX1ofuPEN*pUjfy7+wn`~r
zSZtH~ZMt>`KsV2uGau$zHJNP#(=z9Ho<wn@r_zMP{8+AJ`X?QcV?$U3D`3aw6$kKs
zWwk>DSmN}Yi;Rmh;X&D+p;iCWQ;ISYtiJs!i5R;3BN5B37RUs<vGk8eMh}u1Il2nl
zXUL?X?9Q?-<Wm&Ks|s0B{e_S=@Kq^F;_@hMKCdTGZ!k^2I-cZtdPYM<%leXu^q3gL
zWbYn_g($ap(r8?wL>^+QFxgciME?9nppy%9ASjC$p)Tpib>3H75@%+E{n8!&jG%6A
zW~ggrAIb+DYKu>mFEO+FC@o#ZxiM=i(pKXxSH_-A@ZzYLpHY#fKAgiGO;*YkmcT;u
z*p^3Kv1;b&Z3{D*2*G?X{5ZIt#gfs|mnE36!Dc0?YPAQx^)U+ZWvQ}1Ux|I?2<e!&
z7Ihap4-uv^^T0P$DcK8P8~dx2sQkhSo$nfbtzlp8L8dUHJAtBiOv#a%w@p9TM~T3d
zoQfx~I1KM;Xd`N|FTW!($aiu#=>3^wuyp3rA?=uQ9388VIWjLtGi7H%FF2(lHQCU?
zA~^=w+#Bvce{EIQ)*2Ldk2!WeHhdpF5IJv__D-flwwGCNHzsrVEH{qeZ~WS?DFKa`
z#lYLz1EFM65d6!8X(9Jevm`u1$g{<5<rkY8L0doX^O6H&4<TnRWpP48tJK+p68^S%
z&hP<=ogKdFS>Dl64{iSCy}}afR5sEA`ZhvM;6fx6r5$R+cj+Qbq79^3MM8EBF`P&^
zwg0HfS*Xh#d6=Ng9i&x`v8ESs=AV2T(%2<wt{9z}76pK@vNTl(3^S%_hJfgP(`?i(
z0m39oAGIcZ8^z>k=AMPJV^13Q7$RIAjq?NKiCK(L89&5{4MP_UcCEC#qZ_3K+f4G!
ze_pDR--$4db?rDwF9nNTfJ#eSLRga_T4MIed)-NY5SP%5ed>B!g(~=e8#R8uwkshQ
zJwrH^5a8Nrbm?c>Y8hQ#dgr0uZ<G2s52R~U*f+^rj%S+aT-CF)7-2*EN;z-R)?d#R
z1wIG!ivb(?2UiTXSON5sqARkJfVj~mkR|*xagWOnkPBeba^J3AQW$IO_#5iq=K0&^
z+%CQ06j_EWkq!z<FjJsXAmb4C*uP+C)xdy(dcqm;(*sOWJ-3(iHYbsQmZajY%U&^%
zT0F|~naA+@#g!?CG)b6iQjxZSCq;}|mHPU0f2;1YiYF*%)y>!*oLM3(MgnHG2^w_V
zqp|RR+_FJMP88J8;g+gh`GTDvst~~_U=$%48ljo;&VHIn!H0k#h`M@nS*S}Y(&mi(
zLS1zuu&#Z8c*ECjD%u0ScO!b+|5|Lg&m@tQC;25A!pD}eD3fLng$_`3T0G>SR6vz6
z$Uzm1wUgtTjigHyx;yaCm<ZT>b++L2j<1MSQA6F%lVZma+vuKm`SQif7=sxqSC7K-
zI;bABYuMv6Cx~k3Ig-ha1*b{+&_AET8oGo(_V6@^8=LCVe<G*Kc#88JCzZ67f6JY6
z?K#SyNZzvG&_5_8BW(3lq?p@%rAKNtkD|1h4UcW!R|U$VPbYe=Tp=?mjRwIQ(9zl5
zHVJ+7;#OElLBA`Zj3H5|c*E+8KZ&*4YZD$g|Mo}_c*~cTWozXOoA-v9u!qUnqm%iv
z5@D-`ZDfOPtT~PzF%8No2lJ42oh`&Sz<91cCH8j+y}?T^ee)<EW^AM~l=(B4M+IAQ
zfk*mvQGcrT&RP}}8kEj3gUp&7*F>t$Qw73*<>tG-n3f5huARv}+x`y47u+$|n8oGi
z<b&r9VfL@(X9!tH%TWg?f{74TA~#I8qL0D$x%F)8Sq`A+thz$}>vi`-;|{a_@-O+b
zaG2Tgq(>TjkyT=Hy-=}>WLh+gxN6$^;tnteGT^EvY{3|2K0{=`<LjDyu2wHc*)ZhK
zBeLZKw>CAy5c#6hH131+Z9{e26xVz030tw+M6m3Zs8%ESx}aJPDwEGN;qX3_+B3SZ
zxZ>8xoPm|(0Gw_9iaXY2H6}<8vat=oZ5USDFKHA1xUHvG2b5~8SS*f^Nyy$`R8)%w
zbp=<wj>-i)+uy!{=F1QKNP(94KH1FT3K+-hDfe+%U36Y%^rgvmoD&y9PdfLz7~NY6
z5|~17&SSXem!Dc)6r>_q{<GMJt4DnKLxpMUvZsI%Ld5O1_-IZKdF@^fqmNp#f8Y_v
z?Z*2`r3uw-xWQTDXI<w0^c+D`FzK>7e{cmb?z#R4wwC*3c;wln0z{%`nSM9yV;?mV
z(t-5I0`JSS8?tf_*?SotY1J;9AEUI~$tHRVFfpi954E$lJPeh^ZAdb7!ozMa6|^hW
zNEn#~emj9AMZd`gkmr2s{sVUMA-lWqN!RPlXY)TMaZ7CG(}d-hSF5^@f6l)Cid)s6
z`<TC9_*(GZ=j;FO@tfOU@64=x)|~!D_A$@EoBjduZztP6J%~&_F=nq>QWKvRhI6os
zpECRLeI^|EF=E^QVPRg*f|8X8{X4okLLIDZh7CK9?;2a!vx#eTsr}F`@r_%{9Y5-{
z18PQNeT);7{0Y>c4X_93`owYD#_FdRc0U-ZfN$o@eN}C6{ffz5Khw+aU<I;h-SHoc
zznWs71^negk_E=**)+mtiT+hj)N?Y)KG86u?M-z#?ed9V1IWE!NP({vtSgeRqF|jD
z>K`7NxbgL1WYH{vmHS<v7`z?crs%`f`%DI`fBZ}NkBX|4%aNNJq3d9GalPN?XV2!d
ztyXEFlSI~TC@!wkQl`0V*(g?<>p_S}d!xE;5YnT+Sa08U#i%7SvV7Di;iGKJ2Ofl2
zkAD)0u$!@O`C|=1&g_hINTk?DleAniS5CKRU;4doWaF}7&*X7h9HWA#q~X@D4<2T1
zmU?_&RKj~wlN`^Na0Wa7Q-8vuy69jVK7|`TcHgI+{qT_cl~L?#lij}>g_S6_ypC2t
z$y{_>I6!*DZzO_G6bq~tYy86<{Lf_ZHqV~fmW<~V+E?&I9D{Vz)~~P`mS=$Zb2_S6
zOg*)TGyFmLSFromK4REq<LHkwk73KGvEY$LzvL%FV;!G&u|%qGW!iL_!mKz&i{sON
z)<I`PWy8PKUH7dM=fw7e28%v%ScHAN7AQDzLl<q5<x*ojOLg8j)ey&cAyvNr`kj+{
z3dQO}OH7-Q?IHS&tt5lbTO+%t_e@?)oooE&zT3Q$^JL~qT?PJ&GegykFi%l4=hF=f
z?R)p)^_i1}qM9pt*`JJd{J8F_<*hD)X_>|&S}t)1z73O^QcJh~1Asky4Jlr*PxpQB
zp5oL?-UskHLWG-_kTAhfYI%WO?OlxJZg_W1%eH_0mB>KAi|4*RY<)SkuTA7cVie!f
z{a-mZ)UUtLIsQ=O$JEVptFI^WR&&s@Fhp*ta)>mCdSBXPid16J)#JkKCbZ;_Q}~e(
zOHy)+kpddsj@aoZP2v(jN2>5W8Nq&VI~2lV1!e~sp1e*%Lz9fhop-D0kJtAUAVC{C
zyl)PilG^j#_*;Db;l0dC?7%GHkR}kqj=SvczEaj-9QJ4RIz*V_sG|unyreOXp4`a*
z!VStSqpql3znP9iPDao?8<kXDBG=~QuAmV;A?-bCx)l&ax+q?MlDYh*_=q!v5*q6K
z==+HeMW7KR2c4TU?I_a+0wyKzL7s&qX_<7;kuG4hkX{$(H2A6^%l@C)9uKi&<XWVA
z!FK%VXNlBFu;%?d@j6f1b`2v-;+l-xuP7Vj|0p^WN2dQjj(=vDD<W#kTv<6QN3l6a
z<w|a$B=?nMn{%!qCCwZ|XpPF9C={Yh<Yq!q$jY>ko67n9eSZJKj?d@)e!ZU0$HTAi
z+~nx(&J>63n;7=?y3HNC(jYN#rN-MA^O7B+RBQG{Ffody0OBKVzv_f4*^dgd?A=rw
zbyH+IV*Mc(IqKl($nZ*H$nlJ0rzCV{b~h_p@p*zn-nk0}m%nNr%fcEeC;k6?ZUX08
z4GY%%_JkTb3>dhzs$&L4<}RCs<YOP-<DAG9doL%Z*eNWzyAQszKOpW0w7G39@8iyO
z3)Z#Dr=`NArwp=RJ{9Vo0^}Ui2euqztA@oE*S$zvyX)9PEm=#VwA`TA`VjDtrTif8
zd-%qFRC#}OAqFV#vdjVn5EwCySuA6cxCayoepEa8%4ksg(2&<FBY7UGOicR2!dn*J
zb(Tq@!cYBW@yZ>r15IsS;IP({1Y8z<W89pME{_{K+S3Xo(C>nLiyFJd)Sz6Zeo7Y@
z0sW;UmUPe#Z}3OQPi6+o&$)DrS`Y9zaJdL-u0Xc%gn>X+i>E`<K>7U>Q@05t4dRf_
z$->&cpQ39Ou<6~x=LQRX*PiVPbg6bNgG+>D|7mP;JG2e+v%+ujAiuasjs^LT?CQ1+
zZ%F*vmd1CEXfzTG2mj1hV`#y0c|#<uS-f#Mx@v3dGC>Ern#wZ^`vc%d>_y!0*YJ^l
zin+soRaLs+&xuW0sSiIoCFD6nTk0GN(H*@-xGC<}GqoNvv8EGG-#Fsrqd+(kjD<m`
z<r~21{Yybb8aQ17KxW+HvSXP#cz@UE$DmnDESccVn+n&J9UCmo5nGf=K(b7s#-c==
zWO_7fG5sB5ElL68tXXC8O_A)Z_`L>U9z9HAn&o|gCT`BMj2mI}&!9neYQ!C?Bq&cK
zB+x)U&M{2(mRGXtDgC{FoX;6z&vbvx;u4#>Ji27;h@WEM*_uK;F%T+wrrOYg#xLz9
z8VuJw(4J)`1@lO)d3^>u7;!j`SjZ4?cPVhXffYx3i}iI9CN>u?Ip3a9SKl&qYjJSW
z7<kd95R9FxCx-ske=}V6@L2AoBNlU#ejh|`01*FnGs!rk1rRpAnS4xrJzVHPkW@be
zD$iY5CN(c8JNPu(FR4MW=kMa@D#rTB3A5eGBHONt-})B-qY!BmA@PPOK$w3MT_Rem
zN|AK$)S~crTEB8`iMV64T58S^q_HxYQfS@^4_4aGHz9^m?<r=EQXp=Dbmn^B4Z=$k
zOE2AY`6%!JL36Z~Jl<!<-&d3-Y7)K(8o%yf#dD<gT`5rpk90o=w9qvWA(D|EjbY4<
zHu(1N3*jcQVjm;d@+tC$$A|&vb9%0<c2d$jaXZ1*e5bTykkPwK(PZj33)%Z#Te<72
zY~w9mMmM$Hj}1uhNo(?~g*Gv|8JxoGXkmYU_%r3hr{=#1j(UOPf`zl(PU<JWMF1hf
zLmGhe<hFEumbuzPycy8rsX5VLG;#*wWBcPCH3IyjOGn4z9A<DrK@mPV_`z}6nD*8h
zDITMcVZDT4<V#1?OsPnX)f8wd)#Ey$_R`of8X&Hx$AE4KvuX$J0-NBFt14unP$Y6=
z;qq>Wi=Av67g>|=&ujN@iK34!s*>B|o#W}W4py+j2xXV%sJpnR@E{mAa5tP=D2&Aw
z`GbT~flSd}n@!P^=t+9s`(fAZzj+#%e?2J6Kbd76-@iKdx$36#6Rnp@y`{7GXbQ}r
zY1w*hhJ1E%T)EpJjA=^?>x|xsC>|2E7_ulus)3Jl*eGtFU{`BWwrI)gtuk#GQMAET
zlqwjIlc;&vW8JF^S|hb%JIoA?+8deCAJp|5z7MICwT0(Tgk}PKZpIw+*?dCC@oaZw
zorHS}OR;-%+y3zz#kyOPneVfTSzOARdZt0@rNc#Lj;6gDctd-7KtgOuWU*6{&|&#T
z=pbI5=}|Cvyf}^guol(BVA@khS9Dl}&lTr*CMy@^z52KA>XAbY9|RVN&MG~6At-z?
z44ey<eK(&cH4Etd^3Be0(h$aN41Q~@OpEL}<6rzD<534F=d~h&VMdDv)y0?j_a&gJ
zPg|uQ?IlzOsCw#`3qZ4VDSR+sW04Aq$Oa^;tZrw41ZCh5GfthP<9p8mMY=%3KpyI?
z;L_c2c31C5-@fq5{Xd{tE~N(}U6!!SDF2zIDNA<0iHHaWy5TbE;Ae8|dE4b{A5wIC
z^Z<TvPa<)Zd9X7=Ma?+k#d4t~VR2)3KC=3RlV|+>*{^TA7nuzUmo6K-D9EZ&GaF{P
zSO3vzBalo>*GHKd!k>&yjiyoiuR>5+r<@mUKax07vHPziTJZ3ch^a(@8Y~1vr*7_y
zoH`|Fbi6)FAwyicY^8`NL3FaNIc3G%6(21`7YRhEPd)*+ss~wK4Q_GuCyTlHW)%<l
zMsDM1(W6eD7tgPg?>~@p5Lyv2N-tW*9_k_R-Cq>*^WOrsTngaL-fWh0&&wxFF5)zR
zH!<(wBz!La(u3M5?on1x`zINTn;_FaovEtL3BUZFhJ3ko#|TC@mp=nh4L)qP=&AcK
zSn3T;y6M?{@zqX=dy3*hAuwo#fDXtlJDRBLCwwg2;o5(IrVyF6@fZ5mIqSkHd?fs4
z`%mOXi970EwZ(2nO)u{!7(xMRSa>UtWJ2EIWb+90c7#sMoqzmf`j|R&SsG7_sEi8|
zIh~74<aOm?Fe~)cloHA$u^-+as+VGT?Tm9|N;HgpNp(vANW+9>;g%vR!$-cHp`1*?
zT-aL|bD~`I+unFq6Vl(>B6DKMAvQJ=+@lE`lsIKS;BaYtQUi-VPAL4GYvSyfGrIWw
z&q1(t%Q38u#a(uldoYlZt;Z>|`nKu#G|J~>eWNeH)lB*du0X&_`aOC$-p}$FnH4Rx
zZU>tA2B&4e^%miAjuZWnw+Ui3gF{z2vWJ-87wu9`$zRvd5_sB(;Z9)c|0_Cx$}CQB
zz}4TpIenVrSlXW@)g>VAtq3}#MTo_I#?7?u$8UJtV$mDSppmQ_xVO|0ux(z%VEri)
z`R~(y2mNNht@EL|xrKu2q3(&iv`McK=^PE^Q{I5cf^GK}*{o@vhd`UfJD26MUfNE-
zLU+z<-wE;~MS?V#(J`k<y?%+ocq=7Tp|Td(PzC`2=js9i(iI->C%x5&Dyd{R!Dq&H
zQ=cO%W#GCmGn6m93D1}{F`dDR_@n??TADpTSb0)s1CTJNrr&x>Ng&9;_s7LhCcK=d
zK5d-~PN&)M<X_b8mB@p32Bb(CI5VN;aAs@J=&-fUd5|6kp>JM3v9>N9p2ceoZl*gt
zXu(wUT)Oq=%z|SvwUJW#m5qDT14;^Xdi~Zn&A-;AR{BI6Xs(tgys$?9F2^pTRL>7#
z@UDLD_;p2@_URJGFy>UZ4Fp9Tg61EO&o_ry+mC&ISm(b^=z&jMZhymyogo+AdT!Jl
z$l~BOig=Z-w}3om9h?=PclJwJ2%~Lovt%8m5V%%}Q5e}Q@w;}{y$9t1vW}Ax9zCjf
z2&y2q>Ro7DXb@b>Y+~dLTcB9;CI%*tME<D|)y|q9hwil4@PtN5v{B0kO)VXI)cBl*
z2=&Afvt)iC!}{E3dVl3ZXU_PaB7q;5t#hKh9(8@Ip<ts(u6X{1EeFUC8>A4StD-m;
z|1<!;vHWic`a{662f+;{1K;aKrsS&p^BVVkV$QV^0y^n-b?rJTBa~OE?Ka%x={Kj$
zy7j^Ata6%5DJ-Iwm#=HH0)6dqf(IGEaK7dAC6STp>}?Sb?7<%X3&*d<McyiVuBx>2
zlKki`*T(K8GskffQMzd8oi~WRq=G%{x{u~k17{5!jyEkCBqkhd<@Q1&mJ3%ZE|P^#
z;X}Y21E0M|ABjL077oa=G`^YhaNJ>7JtyQgJ3^+nK)dmPB1;+;r^t02qnj6uTtr|L
zKGU8fZkCvJUC>u{_4}KI(Z`&Hy7G03h7fuds9*zMN>rc@I#yFrR-fuz9R;$MQmg+1
z0>Y+AhL7YfJ;ML)%7_&K)s-dZ1*G1{Smn5s8HbRB)zBZ#{ycH=sbsU_3=lo?`K+Q2
zmnkwX6qsG(96Lv&(6eW`PUn+Q4RdCqA1%tI&`b;G-Oh9nZa1%A&Lvfw@!>@yQ-17o
z2{!&djZ8vUxIEywTDCqQ`5;1Xl{~~9=Ww-QV*>=iM4<qqu2-f<>#`6gFsrDaB^SQ#
z+=*L0K{{spYG+SrpwWF3-nLoNCzOMDoF^e*#6*hm7r{)|PiT((t8i9p(@zH*`!X%J
z-T;H9|3-EPXu>TVu<xBR71F*OV)|U)>pa{|KTxqaJR`9Y`c~(hJTfVPM%@GLNsaPo
z%x{0=VkE^nK9F4dH0BZ0;z55qyh{NLEw&L7(Ru~d#2{PpdgkXc9;Z8tqx6l*^1&h8
z0v17itSFusmp|YnT9bQ@zL##8cFmJRd30|%!NKGwwa<2qI=T(k72oF@-;_~XPG2c+
z8A`SB7Q=N7SM~OB@k52ETVQWIO+HF(Z<|8~SK8N}I({9Dvx@@OlpVh=?xbg*whN$g
z)!vi|4HbV0w`^5o|5>C@?-2owonCeLfXeOb51{(y%LV2pLuOr4W7FRrBj!!fETSh#
zqF3ygYZCeOr8B(?YX^m`G%4ey2vmTEu)($BodO4JDt-#g0ImEmcQF4;$h?Sayf|9~
z@6^y7euDo9Fh4$oQsU+8NrK)KND&{=$5g!HXCrD68L{!W+aqgQi|9%3?|(LQ`WQ*V
zGNk$kVS2UL6%<DVe_32`EU>xShs>m0uzJ`B?O_^fgW2XT^;L>6rUGR@i01Z^2k*rD
z7BArJRa$}er3ProW)a`*^B$9wNL%nHe#G%|8#<VOLnhg{-z5$k*~S_9TqwtGKzLDf
zAXu@(cKyt5)QnVx9wW{bLf42YJ@25%$FGcAus|+N66th?4d87yXk8=@)CP-DnQpkk
zm2z*N`6!e(r_Akr706zN4;ryS==6>|<Mn&4at1dc!OEF&?YAj6s9R$zWm<UJOY<v`
zH-03>hZ~asG(Z5~KBheX0a0|#>9_KaQY1n&A~A!pzku2$ZgyCgd%#7L<HBW`jH$1r
zBSht7-8UPHR&Wg{mA3n3A>HEE>Iys~k{KA2auL9I4XO_n056p&h;vA9N@7te_ImVz
zXNl_b*2Lu3cQn){+kr!%5ae)36-U0@;L&<2fIS{%Bn6YP4s1B(Obnl)I<nWaNVk*5
zrq>2c4>hwZSke&!z^hrYVsh|A#?ycP**sVWu1L6^m;QW<a$851x8D$MILnmRTB$)g
z5}FF++X@2kL;{2DkTxsN3*TUDlskEwQVSpa1Xu6+0k!p(Gwx`H0plp}n$j$I0vvOU
z{sk>=!TtR{za&rO%VvhF0>YCU(i`l1pI#8@*IPl*PhA~%=MuaSTr4~{``}H^2@-2n
zbW=KYSYBFE-d_Rwjh1>IlZGGP<&7%h@$Z#Q!)1<UQn!Yi!ntKRWyrAQeevDys*;40
zly}+B74mk(y<{SXpmjN&L}`PZgA=XM!uqilB(vg|_8W6^jG|jXCjStF(KH+Au(#^5
z^Lo|VVgCV`(g)#qaUmrc?J-Q5^7*_B0(cQC49ui_tkp0G+63#S-nuE0nh8A$TlRTJ
zLgZ%>vf^zoIcAD0t94>_bqc~iT>mEZr43xGg?~x3zIElc<<n)6_`!@*pJaDC6w#ad
zQD<7*p`-4Po<0Xu2&AIT9`PRNR?7+w<hJ}9Z9TQtZkT4WOhV#7nGjm_F;aAT?5y?_
zV^H5jS!xa3&}I%swN;q=V1h{zpr1S;0iTqPTfUT0KKL6PW2b+nKNPHcjDg+K*Icyp
zo9t+OU!zI@Z%|`Je2%pj<t7?rIkcVa%?j5i<#1mxhVm`@CdMe~!`b}H8gI8*;Lr0x
zuTv~%VeBmT%ihS#z~SwE@lK&E9x{(TnYI>}<NZ<q4w?S{Rw#`t(Z;WuaNd0hV^99g
z(>(JQWBlazS3vKzQvWYT*p`*kkPTNqnCM-B7-Uzv*bAsn{-hgoAsE4B(q*F~7DxKj
zcBUh}QUUicGiD5!%*f8D<by+Nssk@LoO^&~K*e>dF+q5UzRo`Q|5MJLEK@)m=3Ef6
zQ#lx=P#BnhSSwxquR-3Af;y!bUJkqqWXE8Ex<fr(2=Rx!t4y#qBtyKMnZ!59FDn*M
zi`tUp1MqS5Y+%zEVxMFobuOmKa5&T1d!}stX~owx5C^XOP7~y1oFm+j*cEe`QuHrP
zdzxuIr92Y=TX`l33bk7VjwH`4(1u{FcZI>NysZIKe&4q{{#=IIs9!bt?F?5F63Laz
zd-FZrt+dsuMJepSC>ORQ34qeAD;P6xW75G$w8RQ`fz16~?bSNVd%fWM-*?_uO@t{r
zEgJkEpmA6xIa>R@$l-|vX?R`p>zJx?4Rsn9<Zrd}+zE0~)mMXzJ6fIp@@TtHBVY?o
z#+`XCF#R3`SgX3BZOxOSk;VT@XJg6m=%=-$^gI$@8}A$HSrtAx9{O1sb!Is`KG~zM
z^n(5vt@2_97dzgdFfCj+0^o<U6gv%>5*E(c7CxRw${L330$Cwf?&M|E8ISM%grN1`
zk^WXg9aes;cd3SSLVRUfen&3Oxs65KLXqXkov;cvi%4{m(JDkT@4(?p>Wv)mr}nir
zJLrInMxdLJ`N<Nh|93N?)<{1j1^uH%vxCmv&}7cr0nIp9__h$M6Z-Sr@@QyyT5E{p
z@<CqpiJJ8q_0KUXI(k%BSx>xEDc;oJ6*VEdDDL{d85SjpP-dZUFJ|DWFeCuo1|63v
zTd!fZrWn@wJ__^0|9O#3J%CD+oou@&4^8NjegtO8e~z|D@ds4jvguuWcUhAGuu`{{
zKTM1KNDUC5FzGsOo4QFTv^GlpSz-KBtTcbOayM`<FHB0^x8+9Epw-5$H&6%(N4fip
zxSsmgdi=(|K;4dA9OJ?3cM_{2Ut_MaJWhStkTN#W_<CYy-KBe)09EkVvVIl!YS#+f
zFZ@e1vCf0I@NY=Jqy6dm(W>?C^nSmV?N`@%A1B=&_#kL}ZJVR$id<pkC>gsBh5I2Z
zdQYwT{ZZLL#(k5ii&$)CjjqbHoeY$`U;gy^qW;m@+fIKp3R|+?cZF+az`dnA-}U9Z
zUZL%&?6%9*|7+dRiQGS(63@N){37<#NtA|Bw3nQH<J#p5JJn^-S$CtFIqE+D#D4$`
z;{Q%lE1tjg=C3D1uO7YsJn><r=7C4}q~eaTdz4W8+rRu9b8ZwFHS4L0r@BgBhlYuo
z+hp79K0nM8>?9A8v-LSV?fI{L`QgRQ8j;DisDLndf#7{V7x~a&qsy*|BA@HOOaP*T
zAvcC~`5vt4SM(PP7w>GA2<gm}1!DW7-HAs554%c?j7896@_8*IJ)fuwIDL-@vC*Nv
zuS>jIxf5>z#6*(-Hc8FAG_Q00*v4<z^}$jRhAW5s$sR@iz?IaA{qy&4kzn9`IT^Q2
z{@X89hP+qw_2<4wlDrbz8#YQ`e}DfMt}tW+K_=Z=B6ZKq`+G`Zy>h!8XP#dWECs<;
z-_&3hal^k$Ks=#2cs~AftgJ7Kf3|Kw_A6P!9OX_JIg`TYyG{axAoBse@+YZTk$M|H
zN%FdrckH5q{Pd%73HCRYdhyZr2vO@ibEMa;ij8gJ$k7?k)y6}+*Xpps6LOPtZMWuZ
zk9bSIUW>D(^Xd+(QZ>mkK{LA=%9qp1j>}BqKpH2x$<f>iS}q%}+$7e~=)|UD%g(2k
z1qvn0{68~CA6^QoWra%DLqu{*Qi33lzBLu^m}iDhBu4G}Hwwy)6EmslmLRoC&e1YR
z*F@N~nrH)5)N^s&ohQ<ez9c#B`nRTFD05OHpV2)?EO4f~lZO=*(9n10MFQU~JBrU&
zR<K?yT5!)&oFU*T9{-TUVNZ3z7b*3nT8{Q4ZFh-%Pm&aJ`rX<fS3+U?w_=UvpXff}
z5cMIV-<+*`$73%HY6A|c6S7M&#gO|sZC!mMpqEY=(3a0N)WUU!C^hvnw6JhAteWUs
zM7c&v>DHrzo5$KC#Hf;{ZWJ{E<m8EUc#FlY-ajyXugi5bi$~}SLxI|*A65CWv{U2O
zUj?Ms*Ak7oMyjD=r_lnv9%2%inLx-)7@2bxWiT!sO77e3Eqkq*-ub4P!s{iVf!?eR
zo^?~gKg*KD1m6WU?luJuUnNXFA)ynX%-ki>9FagsYZ535g-(BKIK3EWDK}GXYU!sR
zyYAeHeYTeVc5Nxx8U|MPPC+Pg($n7nXZ8wYDSEim(Sb_RiP#=la`CzAj?hi4E3`AH
z|8T)%0;3Q(b8E+~^$HMp5tVt^P&ub(YCIGfZdk*y5W-(zzt*_w4}?n%D0-m2pHr?B
z%G{J0rhhXlj6^NTyZ?eLffb1>!1>$*vw}Q=($=pH-mcpipEI*_<-&hhotADdz-BJ3
zOJVhdq+5_5C9Br%2^$AbI&ae%(YEfW+dNdgV+qMZ#C@oq&52vJOYYC=e_wm5K*?j;
z+nOr}hsVF|v0d0IsF9Q)0}rusgHf|@w?S);g4Tl8i8nbf8|#4R1jaUw`S!}XfjuyL
z89S?kjDW#6<{Z5nBfGX=PadqlLAfi%M0XJjP7Xe%tr!Z&#%>kCwraRj)gbUKiFmoO
z)RZ!+YC;cZHqEJmiP@d6ZwOzV6e&a<Y}uX}+jz!nuJ?h@Oz*J5IAP0%%VJS7h;{Ql
zXPR8tu3xEizU{N0d->zk@`Yw{d|}B2odHxLx=lBG?}u)L;b4~FjSuHFl5N71?LMTl
z^}$?putw^&yvj}u{aAF>j<upn)D3F4G~3;e=Dm&ka8cgUCoH4Ron4N^IX)HYmmmBL
z#m%i1u7azF;oPQk%}LEb5?GnqC^?eZqik%m7zS15gX?c`PSDup{@?Wt+&_fG7dDhQ
z?wD>LRpAT_!Vk4|V~~W!vCns)e)oLC);=XBTDx0&WHR4g!o5~}l68SQ>&OjvdKsea
z@4z{HZ>d%==4+z@at6`mVHtoxrX-p58W@`#q3h80Vgt+*g0>D$)>*G3y%QKH%A;*C
zrpNR7{K0ax7d4ZzwLR*j(S)a9yMfx;B?YM$1jaKZovJRcW9(#P@XoiS8f*J+l`PYc
zEB>DqDZ;El0s{s_hYnnl8DGr%rmMm$B`Im5;|<E=i?v>MSe85*f7G1v6-1K(`ue!9
zPjXGypcj%YIsNj;1PW}_?#1EruUi+cCbey~DRASGXXx=c8lQ2*S|z*6eBG-fbLL#Y
z^H)#(zBfVTu4A@L?J0&wvG<PGp@IhF`x+GSMPaDSiNbz+t_?#Uv7+QZ<%o<wy&F}}
zDm1)PL#%UmY@noz$aDr_;5tRpKW`v${y7b)h5aRrqtrj(J%Wok@gu_Hjd!kI=<d5j
zl05mzoj4IegdjChePqi4FR{LxmO7pjXR3!3u8L&&m7EPe@gHEz9UroUVMyV!^xuSS
zlr-Ou=FZqHac+_yt56u-KU2+pTQjIYuW2WZ0-Fzf?{UslOW5eRGjc``;&795U6rp*
z?p^F)BdW%Tyl2>5njH|+&=~W;<EJ75C6py>9Y@<JiIzQ+<r&_4@DzSthNnq7N!H8o
zkqu7L!u}`fgq0Pq=GYi!`Twq<Jg&IWB;Y`aum*%B%pka=h5njFo&UzZ<2i+0>@wOe
zKvwY<m>fR-I*c#xYZtBuv8Vhob@JE}N{ChGWdPE=KfhRP`O?9!<W6@-3O`GlWNmhB
zKI=3Ku@BVkXksd4=!#}tLXM3Ks`rYP@>%zG2%B<`MrF4RdhZN0Cy+xG40hwGj$gHT
z=n)Q=Sc!#3T?#TKrchNv_D+v{j$0FZWABp9VZBbXze?@F@^luUGm_<e%;Z~RINUCh
z?YA|IQo#ken<%RB$xHD@NE7}!3_2}Bs`)TbgdSuc95bj`zmhj=Hj<1uEx-PUlTeWR
zqt`T7y(LjC9(0FBR(z4o;A`ixX^;CR{AuxD>hqsnIIV-Zq7_lXkurr9dUjlF8~Bfj
zqxde#dyBL}`#~I-fi8b+a>9s|s9*dNoZ>Dx;I$vf8G$F&;w%EaeRZ**AR;{dclSAd
zVFY-yZ76GEzEzXeDDM9_Gix04MN$<<Wh^q!hPh!hcH->Hr0$_-s1x8dq(8Nzg`oPJ
zoJnUu<|ChTeX~z=;loBry)*}Uij>5SWwGwfiSAws3i|q(<xBNue>0U%HfH_%Eh3XX
zbDp3Bj_H+rPBw9|7XiHU3e5ErPLI!=FS6}Dhx^Z7tiPq;dXCJSL_Hdp{NEWV-Hjg)
z!!U_K7-*l|)!>NW4JI}k=WwDWAcSwBsTPfq3Nf9%<X_Tgd#VkN(x_n1AbRxuxdKGp
zESqGr@K4`O|B5Eqt6alrg-ra_w(3f6FL9*y?L<&tB&@wqsHKpE!R;f}if(+nU9?TX
z*R<bgx$D&##y!h4oUGAXra~gGW`?%+p>(UHcahHss+le(uGy2}x224?6S|>IXAyLX
zkXj&|a&AripKxHaf#hJ`+CSwgBS};H1jYvy2&#OYDUOTj?GnZ@zye>SRG`bvQt6;`
zf$T6LO{Ui<&gzgzEmdrbEDojcW9CNItJW3r6~X$ys#8&4G~GW)<iF4RZO64$->Ws*
zn8YfZ*vrAV6{XBr1)&d=A(LPJi2pJ0pEN=VrE)Oc#p7_((+0Pr_mo@GUfY=WF8vY#
z-*IJWvbfw{3hS@Ir$g;88w}+U0*0sRfh|!V-5+RA^@0@ai+6);yeYcOWIi8Q9TILC
z9l(h|0qK9>bd|@6*HQ`0$Q1@2y_}itB_APQW??H!&ODlBjhXuwQ6i>XyEno_Z%2dF
z)|ZY5o2V|S3u0I0u4kqrISZCq*FegLwpi?5g;=<+;!|L?0I2+a8S5;@t2v;{_D?cV
z<7a7KsXJCBUu_b%9Ay6^1-;I<^Hcy#a366<%Sk{WC1giRecek>J}rC*U9VhjG+*1M
z2il2b)Z#G+PEA=LU}BCi#LW$8ssg^Y&1J6pNxMp`ygnIA3@Pxkg|gL}niK%A)p0i9
z$O4Q_W~Uz#T7-p%Cyd)6WFoRd`1HGE()5o(@Xop2zx*LD6E$jj7E@nQ#e${YM*V!M
z2%BV}guyDoLV3sVf55ZL-F7(22GH?9EI7kEiT-HdDi@}e$Xav@uR;7h)7`GY<q&IL
z;pz3)nWHk%@Et3P5q_B7Z+?b6kxK0Z1_MSCBt2HthXmYriquriLEY~Fpzu%>KlR|9
zVJXpmCOck~F^K)3oL79U_@?Zp-pJ(b_bOan`galF&OsUGb02;EheAb3*7tMw_!JBk
zX9}O6lT-INBuKZ?FTZ{~-+_)B<N@^F=#)=7Y@&_^<_t!7yKl}whab-VrV_w6U4@U?
zSFLPmfYAjG?7l1H{wm@`G`zB!?`KrZaFfs<G|mKg@w|A7=-N6XRuZv^05grhz)WVt
zNs5Us=*mp<ost!1oYKKZmFaalpszm=|IUYhjI|}N{=aL%FEx4^xjB<yTZ+2&+ensv
zq^wkFFky0$0f$D|Ti%ga`@>}=ycAi)%TH#gdM6UWsbJOn#~RORdqaVIGi|<5Zm^Q(
zsoeO5Iz|OkF*ZZ@1S;u`J!LdaJg&=<<>)1Q@(y|i+;=Zy|HWDHLG=~6B6!e)SZNyP
z%%H;i%0=XkKuqBC?y0124-FqGC*LNAqE-h0ea8nO=y@xmgI(2x8B@yim9&2{PAkIe
z$w)-ML+<xza<m^^5#lspQ*@wcbGv{Va6Ow|2DjZBR;4(FERY2pC*yo22_rREfV8Bi
z9!BhS=2`hCT2kgcpcWA8G(|0p+c*&(MG-ayQ#ERGkguSW_hSW@9mAbdkb2yv<PG#Q
zec#1horav5{!BWEtnd^u*bBsh9Wg-HE_M=V0uSaq7|kA*CrNH%r{7EJj?Ty<M^kPN
zdQeIHPA><^7T#E_Ni?kXhse+7^D)Op-hyG}iq2^JuWss$O@sQXFR~{vXol1q8y>%I
z*YHll*shAfoC9Evo+C$`ePJ&|U=kmnP;bSrM8b;%l&^RixQPq>;k>oF-;4`7M5S6h
z%*MbFQqidwa?B(lbJJy8XCQE1ZJ{Pl!q~=w<=5XGFM610#MwY|`EYQAdUs?*yyt4b
z-WSHEG<bqI_Enti2YAtoM__$a3Z`dazyOoV&M=>1Anhj2dJa1r?APob0FLQ&&&W3f
zroHHbHei+HPm|=?bpA4n;o!FJE-<oao^Xeo9=*Xu>o4}Ojx*fegnO&k_iH$Wz_#{Z
zp+qZS;RJFjVDc3uFwP1u7dxKK0=@L>Bg4hC3XoVErL1dj)7Whzz>@w_1k14$dpp35
z%%p;_yQfDoI?V<(yR1J~-RX!|WFG~N^MEERi|Q?9yl$3K_);34F@uyDESOj^M&f$T
z04cLMId=fW=D-=WU_zEDa%bc(XqBFd-`?M-Ottsd12a~uom*Rx%&A2y4+O>+MP{A0
z(*GyU7*-rKQEw1`=b;L)4>go+eE?9NXM~1@*3|erm2Z}R!5b$H`4zq|df<OtlMYs7
z3Cf*E{-v;!hGPAJ6qSloUH<d9^b&p3T$3LH)FEQ@MybK)^f5Fl{Ku1wH*C5UQTW>^
zu<4P08vc`(>@>?iPWyX?m9B{x1)f$%N89(k{=Oz-gI&P#HD_-<Ujw693_CsQVMrv(
zJ7ECzEX(QV$s9YSwL0D}zc7aB;t+l`J7PvEdh}yo0{{TrS;SB7Rcp8OaSVOsTi<Sq
zHaO{mLL^<@`@)bImiNZ4Qb!Lc0v`%Jd$oVkEJON8L8j}8>C-&-x-oNfU2xer6VrSc
z_1krQ!A5Il=Qk-LOyByu#j!pg3Yuv+SoPsBBp}3T3#9Zz5jKtE7sa&b`mz3nfBU)J
zk$cNQp+&kVUkC8Gj0S1PggXki6#Vx~Nyj}s?W&CAv-E*-Xk#{v8?2&CoGHH=3CkK+
zo$AyLtq3U}miGg*M^We^?j~=N(3<(&zv0gD@XOpwgX*>#hIv;^-j_4Wh9AMlzt6~K
zL6CmH5SREd{lR|CkrTxx(m2o$$^FN$kce_TU2CVFSqS3G7aUTZXz_<lUlhT1S*uBm
zKAG$50~+X24D~fk_su5^TovATh>l|{*mcdC9|ShQI*BFait%HtfPUcnyuaQDI;6qP
z4%y>kHybjx@>n#{TW#KY<P1=zI_oN?p(bK|<sRGrQ^|v$k`&mQc)M=9+`1VCiVQEO
zE#(;D63;;vKvYZKSP1PMKai}4+o%})%V#>(!wONqWYjbfH#ODxOKFK(c{-;dVg1lI
z(xF+Zkg$n0Vy57(*U~8wsR}KNs*BqjbJSFvuS&{l<|G*O096iF4zk}HIr@7Q<xF`W
zywf&0v?7HSmA6^$^2J#rqy;x!02GP^f5qy>s>RONXH`u%*^lJP|6kx_9p(Hezingl
ztf(aK2ks+#u(yEa$8*ON6~LnpxsZ5Qkl%weE_o-aTu#ias@VOs(Q;~IuP0e(b*lhK
zyd1`NHQ0=uK5KP3=czzDPdWn4kj^>X@7fTY2Yr6_c!XzjNKs}MxYCCA>iI<h(C+IN
zS%;b3CJ^qVbgS%_9rsk!1jix6Ij;33E0MY;vA-Y{`I3XO8D?EIGQ(v&y&n9C;JwHn
z`La2#;tarjCr<o(V}m2~b$kh+nn@i&iCF!7BAYo&oeY5y<CelX(83Z~e9b(}`U;RO
zaxw+Qs#dqMNo}SgP^-(>K|wzlf~)9Uu1a%*+Xh4p6O<96TR^|m*f#%3P@^&krho6u
z`<Q-py&7GAu6CVD8ZIF{Z^S5M95f)j)iQzdB!G;wZaDzCgTr#CB_4qrj56~|`G1s3
z8Zo5euXyr!Wbf|S!0yL=e8(G~(#oS}^!=HGOYpQ+){p)-caBBIg-v9{c_qR=x1RnF
z@G3m|>cjniH*6FJNC$4uEQv6=offTzG(gA~F|_7=Ix^tFbx8b;NA~CHFWj|ylYc8{
z1vqdk6e<M$;;J$8wP``+th{o;8Rn;JI=<m9D0ef6Rpi{_H9hl|#A3h+v)NOlxbnIQ
zS8=uL*bD6HGc7079xsOJ<@N+D+uA7aPQKJzXA(b)oO2jB{Y^_dgI`bN)-5+B_&Jo1
zE4X(GF<aPEdU?L~G_35~Ew8zYC!gJfM)c}%zE$zPZg1$rnlpuT;xjj@dVUw(vDK5!
zRiJIt!M#Av4V3x8pr+##&25pAbF*scQG=Ro@`w+z>R+c!mt7oY^fGtv5@$9~o;g$V
z=jLp>4I9b+v$4DIG5Co8Rs!2krRRh1)cEtR?H1v*buoTep+&yRZ&<<&X{n|t@){5P
zcqF^9Ouu=Iwh(vd)tW`o<Q`YHo+fd7EvlwuDb&39)~S<4N(jA;c_Ojk=jJ0h-f_W2
zIDa>&2WV9|QHxtTm$1@xUyolXBP!f{y?bI(m_ti1l2|LG7>G_xfA|x1Qe2Z}<_+9Y
zK*eHZ23u{;wu<;<XBa8s{)Kk2bewVm-NYN$CVzY7$Rhn9FZf{9X7DNn%ifTsIGz}5
zFd_ZOn{q?#m`j1j(cN~`3ZZ*0{mO3ZznL9$Z`MHarP=9}k)QB(FFj(y-1Se(_gkO`
zI_yq%UY6$NL$qOn<Ap@#u8YMu{5$@5TCV|TRBH}V?FgQrt-!d2h+_v_)qCs`{bo-8
zwg=Z8ntN4-EIM8G(t+g@tFXkD*{g*@^I1p63p;KiY46+V2Fv9&i%EY@fk@~3`~Cj`
z4M*;RQjPCcFOkF+o4cbin7H#!f1ZQYeg%%}Mril3){L5ahIQXFef(<g-7~@DsueGF
zBUv-tGsCTzSLxi~(Ea3$^KSIYi0#{tH5*NRU#`#L>&2cbakFYr$Tbn^Cr>CRN={0b
zr-sd1n^qc*!aFbPWhP8~d)65F?<*ct!yen`2TzbN?vxtUcOv^!yecjaeO?u&oy<si
z)CgQZ|CD{pMf~O_S8L@hzJKlQZu%>Gt*N_+3YYmeVeA`cUoDcKozYMs89CV*{dil6
zP8kK0-pXNKXCv#1GM1ov()In6XPr8Q@2d{ZhHofrjk<RhSNx7L$az`R>Ep!HwoU1L
z(C4}=)fE`oaer;2wDVabnTkD_%xjH~UFujT=_~uiXidijRDM)kyVoOCDYX{#g-jS)
zv!227sok!Bgh3TrWZco~jFgH?q?u1OH3*TtYApE23$+oy!F!Cne7;t8w*n<P;;bS%
z2tc!_mrmH_LFI2b{w=-P_X0-7Tib670LdjL)W4A^+7ZKU-|RwVHH<rKdPXWBHFIgw
z3x;IVR>uW$Znt4=+u-^-5k<UwpMRe9nY6-Xj-|gZ>2t4qv0>0cj1Bn3=JWvoVe>>K
zCi78Z#g?@V8V=6u51z*=o9kv5;sdDRsjBQ5g%?t*HW##xAl&=S<-xwvneQUkHQ~^t
zZX_7Q1<d3o?z&=bWf!iLzT;Ch_$z0Q?gYI9*{T83;z{*n;g;0Fo%1{0vO+8Tpuu^*
zNYE340E=B%Hit%Zc<(5GtBBFH(N$tR?_%5$TicSQe25Fst4l;rfiUMw{rm@Ct6?TD
zoWn0S$J-eJl-piZ%IH0={$__YelDtKkpfg@8pC-7sM?vO9=5L+)1kDlmFahWZ+Nl+
zAB>kNDpuVQ{2szPgxk&_SSo2M&YH=DMt~aQ*QRUS9K9Kt!74qT5ic!qsUi{Z!k29N
zw-|wOTu2{TD9C@3<^?~Q#m98BCIZ!&EU_{?r|g`4%)jyZZuKnOhs&ux8V6~a@7G5u
z`P-j<Jb;iX)9oN#)`rIgqPZCRWnZQPw}007pAYHgq+c*G_J)H6d+|VH1AOj-eeO5o
zFTt9b^vNOK^S3W?VbFqWLL4giB&HsCjfI7<Ui5IMTX()epYM!lKzYfWzLg(qnB#tt
zccDUCO#lPX@x%ha+a{aTV|aif7;2|GL;LJ5<R^v+#?BPYe11i1dB_Iksyy&P6OeW7
z^7-=d`-(l%ccrJwAw{Yb@m#y>0cZ{>HWpp_@{ab+@#Ao?62uJ3oLmV}cGvC~2lKm{
zosv>f8>Nf&6pl|9aNys(Rs88daMNM_MspzR2+a?Q*+l%HyTrW8)MA_0%g)ru+)?t)
z=q^1A!M2Om`xOSQUQ%mE=)R-@eDfOmhQdmale5i|dESQFz0NzF(n~tt{6{+yB9MnY
zb}Q<7Gb@!7Ltv<#Sf%6H9S7KtM3mL(v=F5P`T9#oyN+c!<zg1*_IS(^QLlC`bzuyZ
z!`Rz90_03(Ewf3MSPKAi-9O9Q6WqIq#%jkQ_7p97ZdNk-4jP_XQ}02oGJ_mWQRc5_
zqn0{N^tCt(*4Z6nMtQ-436!@faD$(;lcWqab{4kNf=v`I9^xKoayjpVoghUV8o_XO
zqt3J;AXY}<t~)~EQq0dqq8I)o1+pFpzNdx2+>|Dh;4#79AyRkk;!93&SE$}=ayo7%
zS7J~`=imKTl`^Z9FDNRnN}kbM@{D4>^{-Dm-V1rPnlZUs^k;ibIfwI5?>2VF8e0_0
z(rKs}&NzDUG_QSQ9jWNFF)<GCd@Krun|Ax@V&@59IsUl;`ikxa+jZ}1waDL572Ym-
zwG&K{CZo=1Z&oPN$bm<<=ENEEygNQfo<(}Ah4&)AZ<d~#-62KX<_9a#k^5S`CAkeT
zs0-cfjLW&?^n0N0ulKvieW~fY*VmWL1XXTvU!S{*{dybxj#V|YtgJ2RD$3ex|Lk|q
zHxn`>-$g+wiS<v;sYr&$<PMt2Xh9GP!?YnrCcLX#kP~5t<xtaaS-4@bz7%tW2TI5<
z3ff@ZqJB|JJ~`*yi|-e+(7t*h(LYP`u5^^TF8zXg|M~ywzq77XV>0B(-&+cKc)s9&
z2H&2Z!Hh#bJx{uLt2sLDUE|dB^Na3%9)Yi`9DEWoxACUfNLDD4U~MKW<+Uj58_baS
z572W!O<aA^<cX}2(RQV_q5p0?y@_r0fBom9PF*g(ty>=AumPpTU!S!{m}b0l@QR{F
zYZAypkc4I1yRUo$03lo!jGI1vS3+zG;S@hu0-NmAu$Ho(>-1lP6b7s<ox4brIG%z)
z{bB49O#4(dj_6WMSXN806%NQg{#-cQ!>)aEvp3_}CLGM?s4DbqnS#}0k_n!O4|oA<
z%$Ex%vsmigdXV%73av2$7cP=y@GoE-Ns5*A(9ZT=V9vm3Wve%jZk=$`q#Ed|)N^S4
zI)LOI=8M?!=Jj(wLO95aqZ__|pu=@tiGIR0rsL6l8tqVh2zs%w^V!6g4jF=)kZHDa
zLJllTJeHX0<f?Zl`NH*YA$;7;60(J*Q8U98RcpmJQTOt>@6&I`OnOxl22`HSL%+K`
znK<+kxY_v~%=!=4AIpLh8hp)BkWnt!b?f10dWuz-{+O+6BT3UsB*Vc=PHVI&9TK+B
z0Pd9)XS>J%1IQ7tN&3qkY5kh9-`5r4tW5;7K_NAUOL5lantAxX)_fOcFY?JJ&xS^^
zYaX;E1ahT=$a(SO`Sk%Io{JKLf<olN=Vut?3-a%UygRM57O!=sGeMx{rL<hNn`}r*
zrv|{-l;y}+l#dM@<GG!dRIV2+b;n4mY2a$Ak!muH_rUHom=qvo4L-HOoDBDk`##dH
z9lUYQ+cTvBjyLUG&qEi1H7j(ddO^@i^`Bfvo4$TOBuU3xxJhr-99s0S`(AD0$=i7C
z!*gQ_(6{_sK*o6G)h(uceR?wcKR^^Ahok7w_Up0nk;XK|t-NX+necD)^&PFGm@Y{|
zGY-?$P$rXxJ#`58u+P9{@OuVWk<g=zF7Y(ZHs(z7Dqm!uww(s3=~f|uUXp4Z3`2|;
zU7aa2vRT#HoMqm9Hvmck47JeE2qO17zqSE;D&vUkw%;$p1;$X`B3=7tiBX$=5~RE9
z#WS%<Xi9IXzy=^vQ?&f=a<rb@7jIlW1sck!`ELKVUxVxw{s{^L;^{Q|M$!8puvr%m
zUSINiAwLv7THEcO<{O4;I-yQ)-G5_#vA9|E0XK96$bwn5WG>rT`8tc*L}eZR)v_oB
zAY?e=q-TeYoeyrp8<_-8V-1<>l@GGA9a9e;b@Ip!Hu!t}EhTB=*=<D3(|p7WgpHPs
zU&V=s$6M5=y4QpqfGR6<rXJy9Hy_H58YL^n=9%Qh6&ihg{JJ4m$=Ai(O`z`ZZ(b{Y
z7UY-VUYJrtK|q9(inNydCPN-1^%#6Y{(1dTNj>+yEKjlF31dz&oav^dCjIht+d4U^
z^=}L>6NF99Kj+Jx6gTJfvCV+lF2&Kps>TaO7Nxz<uQmvaz@aqG!nk9i*eA=^Yf5e<
z*yF{7ad*P>u2PZVe`EXaA5nQ;CVWXYl3*A$s%`vyr2DmkS99da9&yAaGs=UG=4~3p
z+a2@tRbd8c8(twDQhq(whTNA<qz>wd;R!>+tuyxWPxn`5ty$LM00<9g%hgMmE^+cZ
z^e7>GeWIY&hgYh*x*gQWCfkbSpUb4-9jy%?0WO(w-S~4_c-UE2vz~7EVwxy8`}|Yk
zwmKngu};}j`sIDOqb-Uf53Tt>JWDQ0gqyuSx}y9;!dPoYn7|ketZMb`afo|bB;KZ~
ztVJRWH3R~=cKg1=YPtZgQt@wa_2s&5Co(CcE*T*Yg7?o1TkwX6_~^$q74bF-@xubT
zzAX;u31Q_$S^*?0tURW>d!j*Mg65gH3Q3;Y&^J`a^0`*IIf1pS<&EN0j0s+{OrI!l
z{wv<u9dFvo`T8{M!EuPP8h=}n;DJYlpnQyZ#hydCN+X6S^W<zpXfy(I<C(RJ;Zh0e
zwCm~kS?mFVw0h4>b-d0!Z&9`^<Nxe`Bheh?hj}|2C1ziEk*kG_A)ecj=}MhC<g5c{
zdT0LLzA4r0n`@Gmm@H3koU;ac*(#7%M0))8DC8i1<P?NW_*Qjh^|2x=b78<_02RnZ
zfuWgh0oD8-C{ox5z__w`1%_np>5e2dJX|AZgdCAB{BG@n?Nd}J?~_*QZgWU0n|=;x
zp!_^1Nf^D&ZHL>HCW6A?LEyg1JtVFf5TKT`{T_`%td591GpCRN^p9#knKyvfzqiU5
z>!tTMRj4$9dpFstMOhFq+Xgu2;t#RiU~!KEUVhj~Gy>>3a%fhDQ>nV`lEUnJQVS^x
zlq&wXjN;DB(1DJQd^UFan}meU6;$nCRZE8<CL@>aO`LMklepynJLe7-ujC-PVgtEd
z#J}fdCZxvaoX)3_M6ib2qczGip7gSS;JhNfYVCV^A5^U&#w%)p9YKx+Z5zy=0ms{K
z{E(;OT(=z`gnJ}2y4in<xW@$_%qTR;>{q%wq#T5cO?t0WZI^wfT2VyKO7R^TjE2!d
zXS@!Oub`kTJS0+fB}-fu`5LSHLRaAa4FEv2vEt5Deu%ScWTJM!K;O>{6>sl^_V~?#
z^T!?k1FmKimi-$Y{?M4#L4p~wZ86C+{2@)(rh7>eJ}EDhNb2;-B&%F=M4Yi<bLM`u
zgMq6L>Gs~V#dXzZn%<kpaArIQ3+O@Q+7w#dlzv~VZksOU4e0+UlpLJ&_JV3P;RB%W
zpr}M9Z?D?(-4Bx$Ip^qUHxVI3ZwasH)g)wK*+Mg`Mf@%iB+U`p=p|`Bu#gIESTB3I
zFR?I2&mI!tNtdS+Z9tdeyJ3F)0W+6#H+wc2C4Q&xn6Sg7>l5|228}>ov7@UPuc>|G
z$NEqYCUT=lF4gec;?9)Q?z*uAH%rD1tfzLWx4|ZOpM;W6!{>S`+8hx;uAaTONv4?r
zm}|K!ABE4h%-l6yxRe;`9P`2eH%8t1QPSujCQ6x%&UE}_IIOKKqz#)_<octA$V=8G
zfbt#@cqXAK62YeZxU1lPvde}zT=z7i!#yeeJxS&$ShSYYy;{9AZIPTZI6i);n|Xb;
zBsLG}MRwmb%t2V6#tX+n7@%u$VBMQrN+h_oL};)r0oZ2S58V{vM|4?&lj1z<9O<8|
zA#SV*KB@e76yWgwTB<}Ug)u`9csOII>3x`SrtU!FM3%1Kb5Qu{q=0}A`r8O(5hetb
z9{OH3cog+J(BIqFPGEP+NE~Rsa)=f-^K)T91gCnz)>P&$=X@5j5FHLXqgj=iR`}jj
ze;s>RyZQ&f2J`)Y%3Y9!d31dpd&qd-B<Gbg#njjVA2+{>JxGG|Z66vF-^ldtR8JVw
zi@gAp8*G7g?@`_Cm`t+bjKX73B>#Q1dshj~d}UErpShUfrLTthaG}L~4J^9u&b1TN
z7{4&$keg3EYAvG^(yw!D-*G05eoY;?ApReqHo<ItrB?VYtY<_2?Jvk&t|w&6L|BQ{
zjE=y_;^^=1NjvsR!)%ITb+#R2Kjg`a>AKtSrsoMs0%)dWH2r6xq;{@0(p^}6Fz%J(
zxXG-2Ejx4UTZvfCwck1$MLbz{13iumj`Y*ipcpA8Q`VhO_*|`9D;Gy53)ws78{Bfk
zf{>#KA0ZbFXC!zNmb3XF7j<VcSBhy#9A1{Q5L%13+6#DL(W}?^ue%N0c=Eh<ho?P!
zNwR)^*}1nO0_DBBaQQN}ytmjJgtcImdAT8faq~nQt`7*o^+So#pOTK=wzC31II=+H
zvdUVcE*=e+P<>otX<qLR{9l>8)^jlBHVCGJe0^f<<EoL^^-}@O3V*zYHETmr=&e`q
zydp1;5F}VhBdbL)lah0m(-9a?k@y9Bld6iQ-t|OrqKv(b*?FwOH~vl$%L1HtuHi$d
zJX}h@9Af#nw*T=xP}yv_N2J3h1T7eUyUseI+)n;Lbgc>lXHU(!T_Vj!XU>C_Z@(Bw
z19g;5jH@47Gq@;brB(@aeJ(CQe>8I|OTC<RJY62hoUYdY1$ps$R=3M23)hLM5VK+a
zl-+sCElv6}fU=ebJo#mp+;w(*3t!528=m^p4elFJ8ZF8EhHg61skzruQ~Ez(;qdur
zhnGQ;`7bH$+n=uX$or@M<>mn)eZ8cE^|%I_fp6!K_hRNg(Y`l7N5Mxokrm8B?!-xm
znF=Unw&{ix)4_8c2->+5YPN>?f1a)U>%}Iat5Rw@(fennX2+k=-vSE>V+HrBjnyal
zCK!z0IwQjl4^^80E`I&>uOx-R>2J~mW*j}S$lz+a<_KNs+?iUX^inm=Uy7dn->xIW
zY;?iN%w-|M&rld<Kj##ivCS!beoCwK2(bCHG8wK~d*BPI0LZ9Ujf9~J19S3^s@LhS
z@UcFfnPk-a9jAO^%3LWtrg01<4VJ6@xy}n7gjfte(0xZ*x6~*Kk(6%PU=4elP29C)
zi@YZtyZLc<q3NL>3(UfA+8uExLO}D)B{MH~;V9j@tx>hdJt1Ef87u<!u<e612JbDm
zBAb!(1EdhH^?$Je`&a9ht}o3LfD6(|+Xp9i&u<TLXK6IbD9J)QiG}N6%T0aVa9~Ul
zM79OypTC$<XwpTj_Q8iR62^Xh095ji%+5Qr(*FY-FY$|3FjaZgbVmaeqhPuD2#nVV
z`e#|k@je!tlD~kJ=sgm<gkvJN9sco<Yzv8=oymo|DN_u69t)IN4->W91sYSy68oxb
zT0w!rU9^<u*y{j6{<w2vz@DZ>YUXCAzUeDKNyv$VbjYk&7=nQ2ts0xE!cNZP|6i4;
z7DYjJ5y2k-w8SZssM5XPVuU&Hm{|O^5+h};AVnPR$jhg3b}B*mO$KZ|1aEFQb3MOs
z#ZKn#&Aofy{{zTJjra*AlY94VvO}FwTTf1o?O!?2G$Z+JqeUI|a|T)xA|nxlxV0+z
zy|aP!B?lF~r{(W1tZ_KDxMOO60g{@U`Nlv0*)tiD81B`?$h+-Y55x{GzVs3*mX2rY
zjg1vVr6{_aor<*YVf<*7kN0jxOa_b*?<Q^DnzFt@{5<ZOR(i}a0anT<|E<+_LuJl4
zQ9J80n^c?xdP%B&^%>bmm_9u(WNDetTw_|~rK>I997jUtFZj0OPQ=+2g-O3E5lUA(
zNu{SoXKp<2gQEB|+5_gxUdO%5IkdlK{J8dMBQkWcpqAZHDV6xAYop{+Nr8*{x^z2;
zgjMcQm4}$=`QbqLq=TDER=>H8?xFFB{jic_Z+3edZO6l<Dz$~wh9eBaqSJ}MhqY@E
zg#gbuUnw<%S4r_+Lic`J@VgVYz21gr75i~hj#Q)Bn;Vrv85)ZqmJEDoT!PI0)v>HS
zWp`FU15aEN=Cv+gx^eGQ=*ip<fa({FKofhNx`eI?%l+bePV&?zv<f+Cv)c2|XC8{t
zEwO|oa+Yp<vY(>!Q3J=(U5t41?e_3<N~#$2!pK-jWW@az5kFKJ{(l^ucRZE<|Hkj*
z;8>AWPL5HBj3g`0F^>k0>=lu$h$16<@6mB^PDCAtvPV`jK9ZwwY(fYb87Cy!Tfh7J
z`_uV@$2sTie!s?bJ+Fr(ySUX9o3PN;KaX2Dil^q}3`IO|2UfJanXobFTO>FF@_y*9
zQ*+!KA2IH&^KJitGgp^VCjuS2!#_4@vUpJ+Xy%+YhaflNXBpFYyuVy%lJB%aCS9LU
zTF7}ZKdJuV=tIT+J@}Jv=Xmdb?~rZ$ls7Ec{Fr7a5OD7Mno!S&WIfXHM}n0O5X$JY
zQ{nc)!(P%gr$?zH<-7N?y>hSOWRAzOz+DdfN5?`R@ZG)Ky#tQWW5d8B{MV3!>+>h(
z|3V*pxrS0ApZmtz_hiMe-`?SSWS6QOn@jPf7S~ge5YdLw?Yy%|!fzO@{}3mEL!X_>
zUc<zHz<UeQs^`6L?5D=xtupIC@R+|yxbkc|T60U2WK#HZo%?X`Bvxa#DChmlwc)w_
z_?Y!Eoec$}GB@?}BiRlglWwR#mEuk`5?mhiZ4XORaK!_y_GIOymY#n=TMoOb{omK^
zyVKYAgZ)GER+K}j*-w3obT(`zJ9FB~aZG|VG?>u1&HWFcKlukl$5e)>_`3cr+MSwF
zt9rC1b^O>}@F61N%x`gajDVAEaN7O-kai8fLfmQ|?h|qFw7Gx$)O3@Ecg>MRw4v4X
zy#<-}BWEj<!uV@9D!-iQez6*scI2LzvFs(bwNm+<L|kBLBmNa%RI~F)cT0R4{9o{e
z4x(0PM$3F!<N#RnJ!vfnT^S=mzko5Ys}p2Qv(}1tq4!R2yyn|t{y|LJ=jhI#=*}gB
zVZZs^d0gz%8Ut>Coz{&T&pNxr_yn_E{|Ll`$~Vn4-8CD#zu4l$sqd|nSs^#TDL55T
z)g>IOK3%&^AHQV7nPdAl-4q?dc*+?$@v2G(<EbNj7Lv<&MMuk6*Iv^h{BZj~;6?f=
zg6(i{z?(^XdF1D7WC2xVfsrOg#MeUT7j2mN-H2eBKCGx!4fF3*gZYq))OUpA<P0;F
z?M{7#W8j|O1@_lKi|Uy+uav21$}IO-N>J&v(;uU1DEKAsESuU$-MM_%?=<uOJLW5L
zr@!Zy#ONU%0bO9+K%_<ga4jx6`oMu8DqBK7SN*LfpfFQQra?^$l%ezq2fPtw4w;8d
zftluv+TrQ!at5+v@RAIe`NgQ6c~AIpF<LWoq<C_C9xTvgX`a4zy<rA{?SPG>#<w`<
zCtQA~g{4@@3>KKM<3!FS5wCO$(L~U_v2wPFr^$}4jcpHvfqHC62=D#UsN}U@dQ|=5
zVo=cbsX5PM#I29P2Fi`g`$qjbzIHlYv|$i1r+HzWgNa4?J;%CZ<tUkuC}$lxLL5d8
zy-$kLQn!(o??j(|@K%X&tlf(2&|d5V^dXZMy7rzU9{x{AFB$Tk@Zc(QKbmT9)ZWZ^
z$q3{u{c@w6wAlw$|9J#unNw|qDq$$NBmd(vA>(AnCjXQ?w$ejr-?K5Mf)2)?0krzj
z8s|rO@dFdqLjOGxq^5z({9HD^oDj05!(s&RjCI@;Y5CO>m-?>02tLq^A~ppbX9-se
zL?}p>X|2LfWp27`fZ4eb5~{yydb=&rvm0r|4wypf=MFv6W+n}>+eHO@+GXOfN}V?{
zoIT}9oRon%!wf7ZCFPBZH<%zA!5}PMcGk+#G;)(TIk~)D+JO#<b$P}n5XaOx08{;0
z^gtT*ywlKT)?3YR(JZ;w0FQ8&4id_07?_nm4KkusjefG}ddb%Ax8RLc-Tuu{VE%;v
z%R?3oHbHH)<oSkv85HB&rtWscZui-PQXa@&;yUQ~IUIbL^&{qqIhLWi|2H19%VWbj
zJbh!OO2T}GbO>;0R7liq-m)-h&G$AK@}{^%c6d<>jOu0b<~n``(kJ&VCkZZmd@J7C
zNgs=F7n)zyV-0&q(#?Ml<gs&$5QjIrN@$#U3@AF)vpzVN%I#8HGnvnhi5SPtI50Os
zW8|B4nbr4K!UbPanI9C-FO#<;2J2^#YYcaLXUP;c5J7`*`3F=`P3i-<xafluu8{K(
zE{EZgeEE+rv`1(Hf40|652_{xYUdL9`-3BQjv3BCn6OxvM2uuK?a5zlJ=0Nc7C@6B
z9xcoj3h+caOASTk^RnsuLM=c}!&`@7u0UEOQzRCoLV?A)dh@4RAWIW~AAs_s002P>
zm+TKbuEUGGcE%nwpje5-NwMwK8|_bO-WRJPr7aiiK!~yNZ==?wkFTvg(8!CS@g@0_
zzZrYvx-Ptz4JR(b7oe*%uZmbS`OC`$J2XFF5AfJ+bg_MwFv+Ih67p4(=5JuQq;K)D
z#Z>X@g&OzHC$nCy=s#{A|3&5!em6{VzxOavs{BhMxr}_n)(76;Y{PXIGfUmT`wM2j
zf5jzwbd+wvRbU>Tkk%1oqV2h~Goc{m^lYLpax=G8@FQ)ru)tG-L+M#ra~4*F@6-f4
zkML=KB$bMFskv^KR?oNc`+w^debq0!RyIx2RyB9u;(c;<lW*0CU%jMmZ26W<A;YU@
za2qD6482-Tc+r`&Ay1#s+@i-;f?b-;lCIUBE~ww|5JS<6Q&B5!T{-r~k2Y!vPU2x@
zWI);z*2t65{>JJddyRZ{WYp|As`EeKQpxv7A3e+7uwd!-AJnW=%gFWZlDTw8i|2lO
z7wbt2#MCQl?{=50MEE0wr44Oq0$!%~I@dj3vT^e#u>Ml<nIfPIU(wZ?+_`x0Jv!oR
zu`11LnfMzxH7k>N9!}CpExw8WqSnw6&hlQN++dpXC7TY2&;0!6LWs{58@;=M_MZh7
zp#Aa@YVt<4<E$H!SV*>f2I@;t@VPbe()+9SE<H9+&Ir?A=CEy?j~uGFDfy$WbB}5M
z=4LTcDu7lfoAaPQk-yVC!0G`#pb;Y%#bNthBZb${h+m-~&E#f1-(5*{b0eR~Xz*A+
zClEs87&;wT8~9k{_cZxv;7B_4`_HZX%~n`1TJ1d^ocP?=s``!Pca(>PKqJl<Qw5q`
zEzdmSt+?8OREgu0-};P~Jw91^`&P2$g<d6bOLiXhi@LF0AjeB5`;pBnG6pKxECbBH
zGfT9+hH5h~evPd28PKhxf6M#c+cNt*++W~uulU=&O{_G}r9A1WdR02j`LUIt5hWMj
zwuj>(zj@LK2Ent>1WJ1&MG}_hG?TTc&V2MVG?)R9)A1%EG^>b(uvyxanL7*VhfqcE
z$|HX#^DtJ9epjO2bg0`;BAnmW$=eijb|rk<Xhexbj{5=Tu9f%mtsi+cXZvi0j)c*2
zHVt*%D3%#8h?Cu14*Q=rNbNJ&=5~o#BEy@94ovnUAT}S^?z1=KDL*$lNO#HiYHdoo
zHEA<wWBNnbbnZuX)%M@)On;bvLDVz`%<?0QnzB8cQj-tFQtX!rl8Q-I@=q{kxI{HZ
zc5Mxt!=RCKdwocS0Eh1r-b#YXh%}tpZ(a|lAB`_^Z$tw@xII<G>GiwTk)g&PXSX^_
zi?h_Dg*hteN_rmicm<XqJyKX3I5OX#4OmzpXqFC6PNw@cPBk8UY@V4$^Z#e(c)60Q
zV2XLG=O|SQ45+E+=%yF5i*xxl+BHBDr!Z(_Y}fHXPzAES=`!m1!y3$QZ`qvwM2Ezy
z_n38Na$ce*P&*~tdz-z428KxZEZfdxj%HG2>Y1kRMN`7JpJsgy`P0`Oy=V69@YMHy
zJ_l0g_gTRtIRh<i@M5$O`!CJu5zR~_n<~I8MoL@9%4<r=PT3{53Cc7e4iD#tGAQb2
z2EZACXgYqGU#vwK45M^Tx45SC_+lr#<Br|Ds!Qd&dxS-;@m!P$jc<N?`}&z}J=T^#
zlS0bppU6&94LnuAlq#hKdV;PUP~Cd<m~R#Lj1Rp3%zd8^yp+@OeAm!OX<ftZ>=iM)
zI~hxnny~MC;czNSpnAm1w7JdJTF;-}T;w8(c6?;qa7NuKB>Jowv_d)OOZ|hO1Z`CZ
zC3|8$|2Rh~`E+Ew??W4B?HjYQr<<5=_8>y28b^@zXuV_;#AWLa0}RLAp)J^wejXG4
zZ}9Z<tLth08|&s4j9eKOSBE!B{Hj&v9fH`{B{5E2u*CuR{|5BM4K6nbsUOp*Pu-r~
zQtEAu+7tHUNk%+btF8%(1aG(^$=C!s@8II)bx_IcL7hs892UA~$COKq(&>Q?UoO+(
zLdSifZU|8)UT7I$T6fnmY;2`%#MN$4`KBium+&dfen-TV%*lkv3Gc|bo-Aioqs9R$
zT*ad<GJ>CN%ROA4q@AZSVhHUmKOQ=q(=(dfaqA#ZGW<ahU~<D#bI0Z{D&N^f&~*a#
zgQxJJ*=0R$9H0$2q)Iu+$lP@DMg5FmNM+01pXb{vl#mc)iK9h@XY0K-_s6jz2w(^6
z!QP&a642}j$Yp+c=G;RIDGu0Z>F<l(vztEKJR3g3-kRMD^T-ca(P0%32pYDFM&~kY
ze&wlN3Hu{%Uw5@<21=H^Ejl&t7j)JTn)FuvMt*AGZ1_$w-TeYIwa<cy;~ZbAw(<09
zsn?k@U_zNE?B^rwJv8%5C^)#lINoM6^BD$DyXDVFEp6f1S$_@P#{$32s<uUj*{qOV
z{mPy}|5He(-w7<1-BBn><bO<-pMLQ$LGp((&P2jbrE8$*9iXf;dR+{?8o?ekm^lF~
zHnDAAE=)~Nxq4o+<BT>V9hu`n0f1e2=}xU@;t&oVap^lM!qu@}cw!>^V(m|uZBX#Y
zlV817jTfu<4+f#sSIM<ic2l4hqEJ{WT#0XuL=JUDZdPv*qrzG;B>TtDGSCYdz5~o3
z^{@Yknz0>Mi^WPF#4j;u3dj!&)|R&EQn<`^kRP;tG7cP3CV^tjfXFO@fr>(J3#KD<
zto9_30^{?M`(}Myx%5u#uzx_YnOup8R*W5K;TYu3M0+Arc|~Xy=yuqXe*Zd7PYAfS
z?w7oTjE$RV9wCnx$%&+8oaxs@=fckEIS3ot1vyR)i&+>q#@qV5@^0YxfY<DT9S-vy
zBo&DVg8oYdAime1X|>jCa|c|T1UyPD7THQmx%b@D@Fh&uiJY}&;#3cZ3Iu@bRp3@Q
zD$tEtu=dOOUg+BF0(<!3j<dp}mr{ZDIa}?R%c7BdD_Z)1)Iw!%dsQ$y$mlY^Y_<^W
zSih|M>rPbuxoxU$P{VEJoG0u)80O30^ze%Kybq>EoAZx7t@HfK@N$#p@p`k{eb?Q0
z3m-h9_VW1UG6uTU@Ot>$ac}qOR&&TWLZK0%k`i2CK_Rk5+HF@fPt{YD6**aZ8zH3r
z>$N{>z|heoesZLEmR)V-x~m9(CX_;<ZYj7sW^u3uLHfn%>;y(QQ}e{sR@CAEovH7u
z_>s=S&6n4j#{ZWxQfZ=n?UmLkx)a_GV3}!84Gr&kcg7}|U`;GY0j+!*29l^O-T4_%
z+S6(cNr5l01pV&!W)Dl}MrKUuQ25&Aw9`BdfOU`?xDIFVw<DT=XaC&#->KsVH9M0#
zbpZ>`uO8S<0L#RkT$b~f6!;%BbfH>HIlD{MF`gXoKaa7gTqyq6$h4u79?p1r(!z->
zhMigM%R}{+gfdC8(H3e-8@?3tiqA||^CZ-*D$U=e8lB7R5zW1XjU<0roh}P$($R>M
z_%pX)i#3upCRMOX{I3P_`HXyW#TWXDbgi4QUzs-XhOIn=lD`X8ldv`Im?}}-7#4g1
zVZtdCe8Y;>!;7#D5r$W%f=pBEKC?n_oU3|0$c)*&)?B8gsbV@v11U1c0Q_dXnIZiB
z95yT&H~5~O*&^9-wrj`Xue+){V1=#;CH4VQv2aX^Xyn2ni$m=bRdT>=PEbr)Acgn9
zP>eiZV7bLhTv{D@1^DsamE>R~#bhbZBmEWHj9xoxw5jYCa6YX6q;n=h8=lLMp>egF
zxK17!!|~NH_j_`H<&qQ~B*%1kqx2n8s^j9oCykB>A$ZDT7Z53yt*9tX@*?LI@hX?5
zOUaVvlRQ~sa*Q-Ob0HxOE#GiLlr2LnKn%%!*26wE!eS_l!-IFPxg8b=@|hfpfQxk8
zY?wWV{uyV4klaL}6mVtdKpW%&nL$$_%zh%?RW)M(T({}-OQa=Stnynk21)CWzSs16
zW0sfo^=>tD3=8zBeSa<d7iK>gPQ;uEWMzv?Wj=9J%FNfD(>Bp)dqr3NIGUI$=gJ$6
zgAR;F2=@MI^<;j+MyoFIj52%)tuwT7DEPtAJx)(!@SzTs7SCLk0R;4cd*bD>#FqaB
zzV4J%d`(q+h}W(v<TaVZpa5LXy;~OMvoD}6VEnGRl9LR}c`%_%F8=9M%F{|8W2r26
zQuRFf`*jDAi(3DHm#(Ug$KZ}YNcIa|u#!z!y4Rge^R381uTw80t)#I1mHnvzN}ouP
zV{EID=A7XHI2!9iibJ%kcP^71pP4SXiv|L0ERiCQ7P>UV5AZ=g>n5yma$H%h=mnQb
zP%CIuT`D1ZQ!s#5IrP#svHQ(0xfa_U_RdZu{ruHdkiq8qQjAG<*oT|kLK}*Za#ztt
zQ-u$~s61+cS`3|>l{U0w^;N9DT|&*kFlrVw{F{=>*;omdBr^EBuRoQkKnXi#K<jhY
z3<%n3A3s~Nw>@iTTfX9f{6tY6dEV%MNkUYo3q{$^g(Usuj0=BWzwffFZ{{f6^@XQH
zWn*2Z{Q1!s{n6gx&}IMHn2;a9YBbon(ho-5yaKKAy-L6e$eO(GE~q=s^}Ok;p&K=!
z-+L>D=3n$n+4Ny5JOL`~;sNTHLESn(o6gxkb_PBJ!r?>{1-x^Ie3yV4D3w_?6<TO>
z)8y+qR%<dQSUa;T9=CwA%Iv|yQTm;!AI;0<_wyONUaE1J9{A;3cp8!9>fsviu);^T
zBIAGDKETX316+(2o0EXu#^iQUe|HiS6b_qgxm;Ga15{B=aa+XgqAQ7V%4`Je3izP)
z7@EBm8SJqw`0Y|h`2aFh_P1p1lfSv+0Z1>Q_yUaqjg`Ms$={7<wuQ0*kRQI38DWWs
z<*w;oZG}6x_RFD)=lQ0%eGr?5nnqV@^_-+Q#0266e$iPMu#{zkvq>g!+44>@4Pno{
zB;t!gEM+N<2|CZ?5Q5svGp|y5%^;r~6n}411mmY8MDBLuqRA?o8j=kbMoQpoCtE{#
z$=|MK<=N)>1>w_~p8i<U`?CgSV~x#5M)*u6#Xs^}AV5~Y>#g!&NLwP+zpH~Iw|GA7
z+jA}hY=<&nxQIE&=2lIQn}?|$`YP;ge#ycfRLQ2?Tr-;ebVEtS0J~HC=^>HLKT7UL
z_2g*8RjIdnetgH08ktuBO|e05*HwZRqc(Uob{6m@GpS)|U|Q~&mCwKp2A!G?gVxoV
z>DPkG{NkR?UNe)+dIp!Kv_shNUz!2^3nf`O^#J!wl76mWrdZ>ArCWF=JiT*823;tN
zh9TI!z%|!TEwpU_>Sz4L%t&%pp{!`4{r(UG3&f*5NKh8Tg<4>5M5%fi#*||e*$wxH
zu{V0)DhY56-88y4(=!1$_N537mheaGEM0$<cB@{3d}E#8A9gR)UKWJN%WlQV;t_}-
zI&|e=3&i%vwB_w<#v*Pjl{k>r5eE)y6OI*{HZ(rJevqInav7Z7vfmFRRL!6BIaA|;
zJAU_}im5_=*L5RrKc{sx%31s`Lt^Ay{WXu~D{0bJ3Qo1@DRs|wuAb`(+uS$}mz+s-
zx0D_Xm?h`Xu6N(-uUM@|dV&wTsQNro8=aFNTEus6^}cgqOw-LZGsjM9k(xxvN6wEf
z=#IdA7oRaT<!DOjM){`V?D&J-_r(32MGQy4{Ey@xL7ZbVA1u-h)_*txj_8s!&q<?n
z^Z;V``=|)Lzbc0&2L7{O+u^%I9+<K|a+jGISKP1Dp^dP>`NQLZvnrf3g4<noQgS{~
zFysfoE}^?&`e61r-zTSX=nZ*Pf{zhAqwMni+V#AH3SQEBdQ4!eMF^EQ3d~GTOGhE9
zR=4MeBGBk}_ZMW}t{oV5=kCs{ACJL`A6-POvwg`pXpVyw1nrxLzl6CSc&+AyeMl>{
z)RwwvfSrG|x?Mg+M;&-|iYJySh+7s<U}kB#h`r;-J-!b(?$!K!1l4$EYcS(86|Q^u
zX;rVDFxdk{evRLIEf7G}?5a>Q8YIZIrPEh%!2C2i%O@^U_FLLc8EOdMju$vR^r`@-
z1z%e-<-)<8jux2ktGijhyDXWWPO~jGh+LN6zJ3^3^6Tvbxw-U^88Btg@W}$vR{y6v
zQ-`d$JxSKM6OlIgM(kC`v#-SDfiFVObLgJATRbidV0*aPWR8(ySBdTb5p!YpLL5&r
z*UBxQTN_>#c%@}0_XUlbZ{WMsQY>^KKzj7>JRUWY-QZKj2s&#t3PO_S2ci{gET^;s
z;%>?d<|Vg10~~Px?E06x96lKZ+<#Mc@1K152e=9Ci{&H}w&pC}j$Pn+U;bZ8+y})#
zDGyT(S>}I$RKES!VZ;t&OYMVk<S9$f5$bd*=t<DImwulFH$rq6X5y~jHOnG}?$&wx
z^=7HMqY+MbH@7y5c72EQiN7-j1AiracaS?z%I+h#NZ6(y^!*%&5xle?{H`)7L`Y=U
zfA=Nb&!InGU%?%GCA+`=H(S!l*V^|`n^W2LQGd4U@bH^c5{2<9+1pdCT{TZaG-d8V
z$ID~xnN!xe`GHst*T2tqN0a8QhTi(t)^5ZwzwYrB5<hYZzm^$|=*;uqdq3Jz5gr?U
zPF*m>?XPc6+qJlRAMo$<-OiSej%COta;C>a@n(21hGXaV+=gs%CHGel#ePqI&~o-^
z7~Qsj+nF`o+7IHyyK@hb!d`>EeE@-#qw}t2iFMdiS+U@Vmbznvc7cx5Wj)eX1d1*(
z&!OPOCIpEG>2E`S5+lco-kDk?|HVBBc3Kb&Kb%f?H$HCe>*70BbCbJ|cQj(6_A+8~
zf&V(Db-Bq|3u{6tANU>5ymSDd0Quw>I*=_>=o$}h&YXlJd_;JP(@ALBS*VkXhyz7D
zodli9aAB{Jg^ihEUInAt=UZFE2J&a}f{1O~$=5E`U7_xXi&mVAQ-G9~8+1wG2n!>z
zc}jK?gkLAEdBjBbht-ZRbuT~(>W9&*7<N}{6&=y)^gZwvPq@6qzmb;Q^k1keC_4<~
zTMXK!jT?J6u~f|xv=QJ=8^mQP+jwl&Fo}t!rBEl*t=T)yTE<>9wBI)a8anN_xI6xk
zkIj1nbu1Ja5~xMZ0A|IzEgixmPAyqA(iM@7V85Gtx*_7T;$;|!Si~}54_@bj-0XDz
zjV%U9BdltV_70GZk+@8?Rbo3lJgseexfk<h4~pa72B&<54N@)Ayq2?PmH*05ytPEC
zB0L=A$s-WCL?_2ZNCXq@kj1rbw%Wd79#nqmCf-vZI?qK9BOF)9ina>N+nGg35GrW2
zj*vPaFmfJb3dk|4z2E<q-~>tVFwl_#Q_u>l%akMy5ww*4ggiRC=wcCq#=soryoi3?
zkpX5Mzkhn8Dx^SGpC?eN`-aP(I4WHA<Vu0Fk5D>UDAjPgTxEPg+mv&h=a1M(B(+Ev
zSWs;|cRBDcAXZ7AGBRvWP)N&8U>+1ychJ((K#YFa)?bnpVR)jv+xgVd@>gVPuBat+
zacy;Z=j0Jx$xV8)^_e~#X$!Z9tV5Sw^(*Yz(@>2dGysGE=)oy3#07t2g?WpeE|N@#
zw<Lc$9<liOsE4ZJ`R08s;2Gq5+@gG!?xs}J-Tu$<2bMGu&@liLQ-8r4GhN<&gB0tL
zrJh48kg-wl<l<3H^7rXFI0{cYUg?fcPQRS;cG2hi>*Kw*vqtG2HpMKSMGg_(fCn?x
zBfPUL$C+^Ho$N2&+!a6Q$mw+xmBjoMC)X;8@m#iZSGqLPwd%F3bFM74iU?JzEnjBH
zyeIbG^mo?UQakr!?Yi&*-3*?3u7L<E;@HTZ#@tP9iGYXv0nR2q{ojm<Yi7=kGFPOK
zOGGICG;{lKxPcj==O41xf^-vFXAd%8jZ4)z?{^;VJP<-$PO8Z32^jjpPKl{T!tF=!
z*(a_KtrO<C=-Iwc$WvxFgTl;!C7oWckD7_EWaD6};TQLPtoGy->e1p9$44D<ZAV8I
zWxZd2e*1Jkzmk<y3>7ASyTSkbuDwqa8(3?rdIy645343&xw?e@%~0}XAtVurXPzX>
zjsb!ou$HXSliZ$}aicXnTA)RpbTn+S!t^cXaZiakMRkEKr{Hd_f9grxj|V<<${~5M
zSJ&JrX4zJCjQp9qJ6DG%OWtl;vSOnG=@-}oDA46Tm7XX>cM<Sj2Hqtm2AxSt{CJ?*
zovO>od4*kD#it|u<QauvcDp`}+b201S+sb(LTG1|x^v<EoSxH;K#kX6sN2!of_|~s
z8HQo8La#A||33g#x}Y=qQ~b*{(I{UL;<pstIQrpx34hoWGp{r-0^afzv_`UN6gu*8
z7Tf`n30Wx{B>4@f9-8+R^7|qC9D0=mF(UrUMB{|qG}|jteM<ss1As3SG+t_p^G<xr
ze?0)=)fj{9T#iG#N-7o~xhG1#tBPd^T-b*1sKuIp`eaeZU|`t^+)`8A*g7lOCd+&d
zj<h+zG5ZMv!T*4?JA*6}kAhcCr8ZKLqFP$m4$D_o9`=MEM#xKXvj{t%vDL$8h%J*Y
zKfK@&G)7B!=a*q`=)tnpy1Nv=z1dvcuQB*6$!UIMdnx@;_`3U5UUxl0_m{rkzz?cH
zurJU4g0+*i&hu*fjLs>{YNXX~{RTPxZ;o9?@_P*+EIx=mJ(no{;KM~DvnLMT%4{3$
z3iJ-k`Az=WNy*LfU6a%Y6qbREfUEDq9F7_`=jbDp5bQ7`H0n5TsXW1HX1CE(^GR$6
zsMHNQG|O>}z3;&<bzrv`$7sejuNIF|u%WYXu&*;&g=>CX2<b&p4J$pqan@yADL7w~
zU@zQc$F}=9#UN<!&^*gpCh^UI&fRoY7nKf~&^WcGQPw`GCTW+%@7ZH+mFRgSzTqd4
z?kFAm@T`mlBn#4i<J#&F3D5jMLzKjY>2Wvw2R!h0>q->!ZTe5YqPrWIy{4K$TW(j}
zd}NOkExs1H71F30y!)F$00^4y7=DU$No~MwV%5U3X8pk9{b{N)ed(NNHmi&?wNK(I
z7$v<mwPCf)Bq{m?FjU*>v>^@?iAmMGnfPfl(XhV``$u`%<FJFH;iVPmnoa{Qmo>)j
zlQR=Td~YDC6AsmQCo*K+%Kael&F9kjr$|4~fL+*j5p&Fti0qkVY56M12cSzd1wqtt
zf9LmK>RZ+IE?T-+oqBfh6NcL8J#BU8UD1Soj-D~t)W(S$NhgLkO5rB=nsdkfh*K#J
zuc^^;{~FbmY1?n&_X`~3sCKY})pb4RNMxYRAHtJZ`uW_cyqN;UkCeVGFoenc4lJZa
zz#!nkMj6+FGuFxo&#MDR(<1kS%mYMSIYlY-5-f%yf;SaWyU^8xF79(#?mxnws4sZ{
zMlcYhp}BWB@(##$PC`3}Szn2wMgT~$jb*ID;2j0)4Fm=*MB<D*BzX0i@RM&ME6%3K
z6vITgsY2bgZ)2t^R+E#eJGF+7g(K8s{sxvB=APAdck%UmY9b%+;I|6{AP44yY1+bd
z7Poz$%DZ-WLb^m8$F>SA=PVs%KVd9b_zwSaJn=dW9%0vi@%mkw;j3O;+s@9h{Nc~%
zmQ3%)70E;!`!AA&8|3&xId*I-_35Gx7tJ&fld4t0`r8|0<2cp`B4+7wyr5LBw&T*|
z@;rP58~H#z=fo{T(ab1K=0?M3IvwaIFS0&=)zxy7(gPesMaEo<@ot6ui6nTuf&-zF
zaZt}rXUB2D@iIlzv*jM}cq^^>E*p}|aBi`^AK`xQ92UkODUxFo7ClOyMI*C#!}^uv
z<)s%75?BYsiZp1iO3rP0GwV!tcium_!wJS3pSXT<q<6;;#81eQ<$MMT-3r>9`**iS
zwi>F{GmrArmIEX6RO~J0dhKiae&q?o!QLraz0t?Do%@^|FIFiapA+^NeJOHnPoYI#
z`Y!nM&ccO<A1}?_dmMX%33$39<AXEqrwm5aMj7*$71Bkw+ThtaDtz>;{a$3ck3&AB
zgRsKZP7$z&cwTZTuIs|p>fDJEGTqj)h5AHBPm`V90A3TV>a{;OhSB)<^|aO2!s>!}
zqZrx8@P4mS6%<4*ON3cs9UI>dfF(qkzH)a1@yhD(D;m0^C4DI>H@wydukp?>suj=v
zO#tRC`Qqu>{&_;cL7bPV)RNfIfu6k<r1i8Ga_`J1XY3Q=!AS2gW?`PZHkL%ZjBP|g
zVPYk3EeTf7<rf^mNHp1sUHg>&AW)K~a+)r<*eDV?Mh<N<D!iHrjc$b^p)-{VZJZ^J
z<Z+v4d%3Wayv1>f(siC138+h_eCP7Oy^L!jA>DA$ZNtlzCDN%8T=l;xzX$_h#qQGu
zCF)z<yDptY)!R|{5u>9zJXx=5y4x<jfPmnPpfPc`#)~6^$QqURVsF{a^`EbXrkQm7
z&g*^2ho-Ez3!9%wL~T<}19O4gv>TUaoBhuQg2S{%N4Su!q-8ayD-pJ0sBu~vFUK)m
zJ!PE>VhHrP`ABx;fY11Ee3E@+ELCqvY`w-Z(9U<AQt;3z#nVJ{UMvY9I+j}}*eR2J
z_I-=oKgUhM5F19$z6^NGK#=|~D!|<b+*ydqU)X_p@d?F)1}m6lO-n#3dRslKG^?Ly
zmd?#Ce<5wN7(p%?=7GprOW3@B_`13<U$3oPth%2A2s%}W$<S-_S#27g$P$+6Fqc#E
z)~;N{u&XRE1kNs2>%G98eVvFD6MXUG4^MWkJY>31zqnYomXk2v?=ul0z~acI1Vzwt
zC`N0XKQ*Ys%X%4$37cc7%7~z$K;z7j^Iv57jE5q4nzn_-sekdHpWq~x1hXfgY=gqn
z?w~eXU4hvMWj1nSam<m>GhNGSg!etL4s}aQ=t8TR;SEPgZ0>?z$520WGnT*iy0FM_
zT!)8HTL&~0VIb?aa|nIgE_?#PdCPdwU?ayn=qKn~MgugI*hG24d-#BfA8sS1BZ4>4
zoXgI>0Y(TPnA4pqu_2M4r%)9Zw|MDfC;}Y!-o1Q|vXhTokH&D9Tl*l-%ArsK%i(^%
z6{FM!K*uyO7PR8izi0E>X3UZg+Y36T?qk(Xe$hSnPf4eU7y(mF3X(COxhxmB{j&`2
zm7$lhvu1Epq$nhF0ATaYWxh9$o?s6Ejt))FJIdNDw!9RI)qi1r@E2HH-8X`B(~KiQ
z6BZ!$vJ<+{+7CkuZvO-{nvhEiL^ApF+t6mT3Lg7AoFxM0;>^bDEvKFPOPuaI>oJB)
z<uG`}yR)nQX&=c&h^8Q4B@7+U&TGEB8<w>Yq2dBoB$)Gl??ZlUbQVf5-pIo<Q^WM7
zVlHh4&Zj&m(7g2NR>W+S5){MDR2NceFsKa0yH>~0bCaU972-V0d0XkXa682~JAp2|
zL0~Sks6>MnGldp;;@Um9;6)NN4086H_ngwc->m&XOEdL+$|4y42bSl<SV6xs!K_PZ
zH^PCAK#hC1cS6nq+(|bPX=f--+jJ3^T>xMlAmWDEl4hjkN#0s+7mpU;v}NjbaXveC
zWlvZx=*Do@LvZx)44I{y$df^p6-&;Q=;2}YbZamE8?(WCU}{%|xm<5JOJ@TY<YV+0
zE{rsqpNNyjLhGAd`uoH>y-PVn*dNicdMzo6ERb*<x?YKO4;yx1DV_es#tv4%8Qi@3
z$56?k&wb*~6qtyAAAqU$YBUsjxojNv5Afup3{<*R2|ye&SL+$`h<o=pXMPC80$NUx
zdPh*Sa#*7ESyN>GlgbdHnxW}gJ{q}zET&Lt815y-<fDz)oxZ!GyqMXM1V(k6jj_Ll
znZ4zT`0Qf3+Q=6Pxzca`t5<I>{WSq<b)x$<c_AT;qA$|>y#~!>r$9eQ^dP7KChAt#
z{KbOXyGZK38JoYS5|`l*!PA{UI-iEWK^tA5<;2z2>OJ3hUL+peN&xSflJUsZ<6AqO
zJ0(f)aReUdSZ?WKIF!i~CN@G`z1av;CHd~|<}$zduWoM86D*AGrN&-c8i-L-epVRY
zeP&Y2z;!D|?95EAs<(;}^xSO|V|+mOF3;!RC<8Ff;LxZ5%eFF3?V423%A5@y!cMM&
zImS9oHOy#w7lCD`ne@qypr08x>l{SvWSSwfLhpo=r`3AMpf}oB@{PFG(w{cxSK%KS
zVK!jM0ztM%FsFTW`|yI({=<vGEPxiNJAyL<cKuTCXZciSC^RYMF<bTOvI&)6)rpoi
zR`&>!g*XRfoN`XQW$JI|VSvNuNi2R=7!5gEp;pjv9+F5Lj0kNQ-~nlzlLRJspHlB#
z79LME&{iKCN0IZIQGJzmqZ;r<u3rF1@`}qm5db)oUv<d6-(K%)<0)&(V9saSItv;!
z=#$|C2t=qpz%1n!?#;f~s=7rAHcLUeOMO?9O)*?HmS%lvA`^_4=tpRQW&s3;Z7t+d
zuN5yixs{fv;S}q``HUSdr8$Ig03|fRoMd%Bh6EZScpGe!*&L6Ky^`~a^oGBFRlg0V
z+90;fXJo4GB7CX$Ucr%mD8NxIkhZy(OCM+9jKpJY4INK;*1neg9_S8L8S!fWq$RQ`
zqcsgvFU+?j$vRU2QZNw=xnWIyPC*JptnT|4a!8P{SG+xeKN52tnjXh4!@nfOL!vLr
zoy_XMmq#OnkRg*$_b&)p)$JlpadR=ht)_Lvh<696`{SP2u)-{$UrpE3VOR-Q02HX*
zo2^h)PmKcfe3~Pj6xVqFjIFmTuZ1>$O>WSMkKq=Jfi;{@RJ-V4DME<nYI5a>VBV)-
zliD{n)PCT%{Jxpjl#Wvm2%1paI^|UX<G%)klu)!^;o$1$%Fo+b>Y9Y$?SgA{`a=ji
zF26nX7du^-u~07UZrO2jpC-8J%LU@`X|_0IL+20AnFawZ6twEtZQ)jp;&jA(WaMaB
z7IK`NB*z$Vb$z?wW$#%)K0*_<j$zrXrIbntKik$Y#V*RfK~@5S;{pxTc|HD*IXQS4
z+0)SCt-g=Kj?iKrpvy@%_b#GNt~u7~L%2K)ma^P_i&)tA2SR~8wGFzE0nfAZ3(1dO
zP9tJCrgNP|yF8dd6(lD!mn<?Yv>H4-%eVXyTzw5RxGEs&l7=z&m4b;T%!`d1F+5NT
z^AY;dYP@EmI1K4vw-yffAI+2d*xz%3O>lfQDeb1t_(RHRSW7H$TckWfM$8qkJ1v54
z7dF8aQ>`-?qM<|OT^DrcrZzdciwf@g^*kYxs?lqazrb~$X!7V3U*wrCweW1Dhx1t)
z!b8P1r1&MR)qTFcSzRHC&P-aiORQzk2udmymmug+A3WF^Ez47aqJ`R1HYFbPI4;TC
zJ=;c?AT7<-OxnHr14RZI-uA=-yOena{MX{1P|xra=T{FC`5hcvRJY7Wu84y<K9OV+
zC{qC}XBN}D_=Ex=tNIKNrTdwtJab*@d8*$eZV>`Iq3=+2KX2K|yTH}reK0JPTRno7
z?1t}joiTY&O*}(OCHSE!RP`4T>-1IKDYoKt&ZyK&w53k<7qgI+Myj6K#h1No`46>O
z+(M6-ZUp{sqcliw@)YW<yfOAchZ%xFfKR#8|B_5*qyx|k?5?Xz?j6&oA0Ze%^=p5B
zq$I0eDGo3+(;q#I&CehN{k+|w-JqIuY_<<6wK>+<k1P*S9J{0K;~pwn#;!BNDV#=7
z0esdUG^QzbNdLf41U`M(ryaTOdp`g-4Ylm)8<##`6d*TVfZJZWdvckJ%QhMjRW!0?
zv-9m8QaKxb2%8JM^SQ!GXM!#=%4>?af7dJah>BF>OX<Ol#fB)1uI-$;%%30%vAr&3
zNigggInfU`&x0j&{9!TzSTukumU6?27o`GW3%@uXlq_3_CTD4$sm&P>GAwYB_)Py?
z6#>d?t{5o#8Fd08JE{nCT&z)RLZoQQhMf~fWdW)bwK?E%`e{cBFF-j1PVCBu&oebC
zp5>TU(>UCQT$l=cT+0Tb06zP}ABTFwOzUy84zW&8UsQ~WaN}FD?@4|KW`$u;^_&N8
zK<6X6x}EOme(fUA-D6}V#y6#$;elSiC#^)+7Q6f<$p2@JbNyD-npkC}CWea&r0h}Y
zNyp9cMMEXEk6QvXq~#mqZNNb8)zX;BoK#0YW#V@6?yc&DhWk^g;X>~Kdz(qP)6GdD
z=&O@|^+q&C?p)TSq&K!d$X95nz9=>;#>J}>1Y=06m0o#%`D`iJM+!q%ck+M2vfS=n
z|ESjs`C_-`scr)El(%90@aD@!%g)XT7z!rVfH)d^KVwy8&)s2twTXbHm55DO|9KV@
zXknpWTCSyy-d0op@cc&g*157dVP{hw7AQ%QcYy}D6p2lL3~whxYnohM&84Y+GS+4M
zrHt3Mxo~vXdic0YpOR22>7G(O>$^v7sFeN|a((ypT?^4@ajB&Ivke_6H7~0Mc(+<g
zuOa+c@%_g-vRTY|pL#d##_ADTQDw`}r_1|q{$eYhb=iHWH$<CJxjGe7F$m%pcEch8
z6^9njogBJ+H^*dNB!7O|jbc%qSr_ttW%ftYzta<I7cB33PWzD0;}%kETXI(WOp<%W
z3}{=Bjrd)skJerxcDSyyzE0--G67ebL~uT@Ks&GVwTYJ9S0_;+-XYk(&rMpM>uo{Z
z)IkgHOM_-T+>)G*mYPy7h+8^Y-cR`(b?4X8<KnJ(wxr_M38s`o#|necD_dJXbAGRS
zoCYLG+)x!;yt2hc9D_q4+Ptlj($X72B=7wHc^E*MT2$yi(3<cMaCtiUSg-zXVUcpc
z9jc_F&HiJP7aVA+MQ!FBh?uHhXPd=e+1aC?rPjL&s69TWs3VX0HiTk*FP81QS6r2L
zcR4T9_w+yXO|jl`Tnw*W;M9jBaGOUDZe^l2L+<QzUvK$5Gl{ZYJrzvpsgG~hRqfO2
z44v7IFkGL1V7wJMa$)Vul92P8VQs#;tdp|&XRkAH5FC5p;jpL^|DChwUuZFbvaT@J
zWB+~Zk><Yo*iVku=3oPmsofBhI%TPgn2YmV-Fp!^A_IFD)UAEd;Wq@%e>a!0*=+cm
zz-mKZFMDU4JaPYM=-@d?2i*~{Q-Z|-9I%Nplx)?r1=6fw=IJwvm5BNMd^S9GK1u7f
zShw(5<;sKOm1{M<MgC#m*Y$1MuP{Sg`Tvk-bb${dZafM5{miZH=BAgV$0jgh#DSl#
zv(k5TzE8H&@Qv+UOIlkhkW?7BsAh3;fN;jbifK7+PMJwpi@goIWda0BghEOyv&%Z+
z^OgG}g4T=&2UO$~xMtXQ%;1Hw5{e$Jp9T*fk0r-vmRgdwCPx#`xktVq@j2xgHAO^-
zo7~vs_yAmdp)i+cKMXj{2Km!Q-}=4`U}&x;!<x~rguk0jjL*FYgDv0TAl*cRE$r(5
zfS`<LXWiBM{e#0})vb_MYD;Dr=mlr)CFqECtiP}$gf@o@emm#5T3g-02!rqBGI!lI
zRC>%6(78)%2@kTHl(VnNr@>bY=ZwYE@<129AJknc=x8=*cyWTs(pzUC$FvVnz+5zG
z_dmyH`ddOVVTsZzHaHT8wqd^PfSMO8`fw{=qWYz3hS-P^v`!(VSqt-rUEWlS$Z+yi
z@Jj`(=(<g2P2NRM4rt|=P_l$fho=(2OtHfp(h2}qic^=%3I-~cTUyU}E;d7!q_n(h
z+);RcNY^hC6l;(R-yO(aZM^N6F-t29mjsrcW-rw<81`oAJ?m6GHSfRmd&ohv3$Znf
z;P_in);%dw6>&$WKvQUXh5ZWAHUIs`&Eq<kXFpQWeDgU=;*hp#K8N!#x13$KyuJ&z
znM!AIo^S3lL`4#;1^UqM7VjS2s^Q*DwN_I+1+|q~PIsL<F(B@Gt4r00g6nx={xenv
z%TVR5r53QZ)6Qjck{!|+IjwG{wK}l9SK9f8HBP_u1|i8HfCg(UaSXpa$E20^MfM5D
z%N#>{yuL1ESmE;lTfFce97pl*VDrv5IGxFe?|jGJK|;OXT&0~JN66Mnz=XYqBVSn+
z8uh65U3U7yw&U0Z#YdQ8Zc9~v)b<E?!c7KkE`lQ?Ne`z6x{SYdAxJLU#it{SE$`nU
zMPD5HL{r5^w%Yanq9(Q$6Di}$&?%uXjqIxwf_1|5kIR{}Lh0rx)t&tFy^0MYvF>l~
zqFMz{Tz_B8&`yl7jm049hlg{5o)1{Eo8R$ZX&m^$y1b*d9I;3`Y3jcJ4-mh)MdwvN
ze7v($ddHnj$$Rp^p0C<}mMi?Zs{i%k_Z4>*jfB$EgX{!z3XCl>{;Us7STaNZ*kL5K
z3%%Be6NR>RimuWg@TFM5T)0}SxMNU5edhGP507DKmu|wl9<}=a;tk5_C4b```C8Cc
z6-8mwY64mvlw8y)hr`piHe=Gx=5I9i8+@DH+UNKO+*gxku+AFA#>liS$r$jF8)(Q9
zXi_zMt{{DeZ1SuV$45;6*F*N^(sJ%jdYq0UlK2rZ%N+qwHJ6W9_@6NY6cLWJ^OGfx
zI53~}fzfqotG9xBEAo4ZYKaASZyu)fh=o65fRo?xK`8;9A^PIV*$5&TtaMvI0Off)
zm_(d#NVJD6RfIhMLETRH)yhKKXDx(`WZ+RWx^pEo_NEug@|<|*?djK(DtO2OBFwC-
z(4oMlcpBose|1G$Ks`P0)7KkRHaCpk8?=4Dp+I6M4WFLL>;Bu(lKJ8bgd%?wx>Kl9
z_lZ(vpu?pbMtSp+vh}cPHS99UtWM>)=1*@qMR7SiVT%~ObBy9eI4TY^h`DAb`q@MU
z2r$YqN^H|%uSR#SxtTkTE3yX)(}+_9pI3!qPK}n%Ot<vt34cDH>7y7=ZBdE~xrAkJ
zi8AFfg!#+*q@_(1))5@#K2{~i%RMDR`Mn0&7q<Hh?*p&yG>BnCI;T94j}RHcf91yt
zL186tO?U6bhIv&vTGWi5Q%*-teaLgEn1_ru5})IrkX$A;3f%};UjgciTlmP9XWIPL
z{qr+Cii{;b?#g`;LuWaey1u6$BnY7T<-$IknR>VIQ$jD9+L<5O)rto8)KvB^z0K*f
z?km5!#$VMS$-GJm64cNo1ot9sYGR$Cz+a5e^xhu^b$3cu#U+{eh9C904^FFAi3etI
zybkBpsEV((b|*vZ28P2Li9E|p@rKSsT3VwK<lv?cKKNU3a6YT#nTnY!u>eqzNE;zJ
zzYexx_9(LOKQf-=>Jj=A&7~u$LqE@wR{|wY7X|hvA#dRoh3n2ICuO((tXjAtDc>bL
zjtES~JB4hds<07<n_csCeqAuZ`kuK|%x5HnQ7?k;p11`@5SYiV@cd!dJ+Sl2&V#F|
zd=m+jzJA#@<UJf~sW>IGOGB@oDiF#adp7K-ynbq251lCiUAiV+qBVdWqjpcj0Mu)J
z8@g2#hGU(R<`R|cmV2wfCI=JQn=jDz_mxv{nBY5oN|g3Q9dg(Phq|55(0WK-F-(ix
zq#W99+!b;DzF8K1PVnY%IvilHg=DMh)k})KEEea6`5eUO8U?e%!d!LCnvyp%5|1~V
zqdER-M6l7)mMzNXH#b6~YJM+*V;*+7Py@I6)Xgh41`Axei>6Q?Z_iK^7$=rbi88<A
z>fJgZigwRq?h=EqlGDrRqBa?1|FH8fnZ|<TrLC_2r<qv3)IT@A<Zu_}M$GQj5cJl+
zXDMLao%R{Ir07T@9f78J2H~revGelH9i!s9&nO@VCx!aKs@d}52f|l~)LKKHqSmbD
z4)47?g_^rhrS%Wg&Fr4RgyjLuXWCe9p-nT<<@ZApr1m}Mw}v(9s>L{$zTdgI!eoDG
znbM*Xk;tYE0g1Y6p2M+rjw(qZRPx7f4;gti;d+~YngOKXhoDh&)K=29zK>gYp4lVv
zHWA>`{oY{L7fmEHE{WyX>=oXFtJeAOS&pR!IYkAk|0uEe2_lxCuvGj5UeM8P$`WM9
zod!1pA31iO%tui|zOdrhy{ICuu8qL1+(%;{inGN=yCaKizb`Kv*@&BOy5F-L*D<R5
zX-zf+Zxno1p>i9sd%hQPqmxgZZyE!Hx(%c^DX}!&=xh{fW1ioy2^}Z^?$=#r%AS0L
zHp;EQAY16lraGN#rpKikMDY(8Qc!!;Rdc7*fjIh4OI?%!n_1}aSiQng^H$zX#+}=6
zQwrdJd}uUti(X!xMd7uzus~^8_|x1nZMSTk+)cr}i)sNV+SIo@miF~{l|-3Mz+e;&
z_I7HLZNoM;;!*Cu6zTlf5H5AfVP*uV^2+q4H)sCI^d<z=e;2lO_^j;e`{cDaw0NoC
zJhUR5{d0NVBz!(ek?}fThw=uoYj^#X6R{nkQqT2(_E57!y?NtRNN)JQp;OAkwAUv(
z9zo%Ur7w;O+%p-P4@avpr6vY3zU9BJMsx9;^%*M?-0AnhpH=WAm>c>`zrLU;F7@3u
zP-D)*QbYLMf=}ewXc_OxgrdRM<0~_(82TY`JD!I@xD-u&jb$k=5!SJd!cy4=ITsHV
z!Dvv*hn3P^zv5DN8@PBN)N@qiFC3n;idB$CcTK=d$NsjXv{@e3a|JAA7V=T2rP>xi
zrHB+r-buzGdrW7%3jga$7v@Y$=}0R~jkDYY=6SXo)Qxmnf2@Rk9E9GJzYuSrvuaXD
zO+e4rFPd{<i7LwMd7}l__%DKqu4&W-aXJu-6hISZAE_Z#3^M&@x-RV9%rv<YoRhm0
zm!T-k4p}9GIq;aX@|8VYQPu=48B{@Abdim7KEYYI<9S5D-gR@nMoFm4@h%TUcp7o(
z*}&xreL^X&jo=+x`tiwEG4uYQ`JB)3=}<xWNs%oKd*~Z5(dM+an!0s%f47hG;YjHM
z`#g%5gI-={xvMLexmzSOaQjj!<Am9!{;kU{FCW=Rqd;NL*9`qgZloGEm$8o5tO$eZ
zS~n&l71we%s0V##mc%Iw<ndFpUqe=qyDAs}%qOjuLz`2>iVB0jHalnLKPf_Z4a^zw
z-bJDXHbDTk&L#f00C7g37{aET+~Z;2MfWyC>q?_0jBmh>K_h^THFcU|W}=@~tqoUz
zh<H`>4atI9so>z@=ZgMfDxa2ZGvCUyw)yWkx2k{BknCC9hN8E5Alzk$l38K|hmBu;
zk_4BG&1NV&Y&0$AHLf>6h*qG{FAZ_<!$ZJ$1z=s=76zw{9Gb#9HD6>?i-MlrS>kT`
z1=6l}3Y9Y{REHqY30&Z-Vhq{|Sj_c@LfZbK!E{g-JFE~tEG)vWDAw+%MuuAHgW>SS
zcs7bvsqb7m(9Jv3@9BpluIa2)U{n9Je#Xa>cdQ&)GtS_{vjLs(fbztB$Y>s$W)CEN
zIeLF%B0q_7iiHM3SXq(+>I$`0Q(k}^ko<I3!VeBj(=K7N@$->5jtBP=w3qZkh9mO8
zTVTiZRs~Yb1^63ouniFxbnRJ$%s<*zn7NwhNGev_R2u+G_8numl_>i>`e<sNR|Vy_
zIhdWdeK~^Z^MZJX?iSTnL)W_r$srr$RI+Yp<e-ujnylSyRPA7hMh;IzoGr>+e2ovF
zfue0?+_@iBP8+yTHGNCh8`%x2TgL5)h^kIws^F)k2r(Usd0GS?f;ea@a+UvDhBB!d
zK{9pv(IDZBk$BV4?L{^Syc{96^*#;G7L=Ak!-|kiLh{6N+sy$L$hm;7i=ij_HVN)V
z>_g+=-?{*p4ZN)K#0a>avzRghUsyBa%5n%PLaRo$UwR0lOJS&7)~baL6d%Ho7b@4d
zAfq0AIMj8KGm1Yd5S5QpX5fs*zatVt8*`Zz)zQm`CJZK?MPkd8qAYerJiFKEE96CH
zwZoqge3XmM-g1ocqa|yBjH4!6C^WANdns##p>3$7#cd|=39XR~*rUa%k&!qhTghie
zG{LqgWfrjqS5d9>^Od}O(#tLU+Iqn*h2oHV3g+EHdRxZX-FE=g&Q8g!B@Z{!C3@gf
z*b8`up5(ReAWjS?&np*L1Q-Rkij^03I3EEl51zO>F`WH*dp;8Xf!*kMb{hdsVUI<}
zQb2=3GWM)1Qra8#V*n|*b3vEuOmvQquCx=f6S}zC4#?a_+$uKiTJS5aiD>ti=JDGp
z(>3BICZ(t}EReX#<GBo5X^Ey0!G~r{`GiKXS6bej=5Y|pp3uDjmPW~$Sl|vT!oAg_
zkr$3fv-{PXum^F0vw_3qWkG6(b@~GB(3C!{(g-8Q5(ql7nc+9xacmL)$I-d}GyVR5
z{58XnC{bJHymG7@O2aV9S<c5uj){<2IUj};nlW;0Mmg(%QV1c3IZr5Z&S^R4e9Zg%
z`h5QZzqq}2UDxyZc--&Gj|I1-&%};kt$o*sgI7=|bA&g#M&E=#+I#UKQT8tk;N(88
z2XyLD-f>CQy<u9aC>}y?&Wn^Ju*z-ddqzIDO_oLbW4oFm=b4QhP;{4>dj0ZmQgg%I
zyTPgFt%z-e$dr!RthYuC8KaeF%#6sDo-1pnjl}gT<m0Ol*U$#(O;XJ(sL}*23UsjE
zk4E@BLvI(ANDbS&Gjj!j`99xneQ{XPtHQY<I097G8a|Yxl+L73qND$L>aq6cM!`xz
zYv}EJ9{$(6bu?(a$tT|`Zg9bnjuu?swK?9S)#a8Ie&#2pPVftZ%2-b^S5c-sAKZ{y
zO$mLhjcrZ$m&;`2rb_{YoT2cq?}ng`CqQ<+)fB6=L%&@r>sQRqygE*j+S1~h`K|}M
zG^w<pPd`tgFy5<kp>sLnr>5nIkm%J2j%ru;L;;PZ?c%DoC+VxQKqEq}a!<3OxdK+^
zgk`GsHAyPUT`_3MGy}c%sz4#TfP%0&9XcTR={(=)r-pi}N*^mh(6*}>?ErJK<kK*R
zJLEei-k^R`?k*9u#;ixF-*$W{bHZhE6#UJaeyrnlH0H7xLI0%lSr3Z<UF$bxpl6Z9
zSzI*r#ZMm2*NigbV8F(7#``-}M|*2~I{)cah5vvEG2RN+JKsAM+Sr5`^@bm4@OIP2
zQQ`(DnBhdFhUP0l_8V80Off^E7DV@GLa8#Nz{c5;xU#6r9DI7g)W?;4R|?Ka>0^nR
zH=ZEnrX2iG%=p%3ui!2Ix9C%gpYxsk-QHWu(qxoRzHbEAzdwN9#xLZCA~E>8UyTo2
zW1FhdqDM#lIbWnpLSBJVbH1amu0U{z2~#tkJl7@*Spbp8KMRkyROC6Cz|+rvtH^HI
zlI5#&Fod?GCqo)g{GKpL!u8>>CrvP^DRB0jbjtd6VO@_jub;0n*MC64sgE1QswUj+
zvp=3#!RAjy(ggI@u)KMlZNB!WN8WaQMn7qBr#wEkls4iD-~<{^)}>^XA#@<R--=LR
zI#yX-;`1FW`mk;zg5yFJC-e>Ef8#{6H>d=XpORYiC?C_O=87=TJ84eMTvY&vt*orZ
z!T`hvrZ)IzMn=EIHy~hP-@NV@HwyTg-LdsrlAKx)3hDjf079kNRs~+E<O#1h5FGtH
zVqMdP6kO1z16O6t>~rM4njZ81{qWIeyb9@F15QZvjhy)pSea8M`EH-(N|1&`F7z4~
zC<iuCq<O4Cv&lSVwh69F>rBXbe;@F0y=klLg9h%EzD;Rw-DvS|T$LJHbG^5zW}48#
zsH!SJ8Ktc+)9+^BKy__(nw~%P88!Q)DwK^Wr_N?;=h)Is(U->ZQo!?~Sod(<h7Jso
z3p`06K>6Dy4b8RZalBY2^jHnLnDVJ+Qj|zKCoZ;u$hWQ1tE5CJP;(Lo_WK}p?4kJ=
zzA%NSdT62|tMCb5$F}&GD<a_|=)-2@86yr|;iIx9G{}%*mHq8&hXPSYMV(Dp%SP1J
zaVjeL15tu5%pq#&rGzYLqF)7u6`zKU(@^e6+|oor=iiDX;JETP$1HK`bbH|nk&9jM
z*?W+}*vYHNKD&MV=#AVZnos76soXbb1&UC!;I@2zh_>+!Drg&OFPcr_HqYt*iv3rm
zhEQ)&kKD~FNIqBJhdQ6nZ^RbIz4ndqb@HXa&d{)D?7N||ssih}f#pvIwp+Ec+$X!a
zAIg`vyOQ<E`{&IPemwc{BeC=0FY7kz^OH}-Dl$saSmoNUyH2aYjQhXt^($hWo^{c>
zS;CD%uj}kx0nhrodk_6Tw1_m2y`enpF{83oUotu=yK379LBAj5g~rT6oLRzmZ-6Tk
z#yfmJ`Rc^8LJb*?>Jv?~q>NSvt_$AeNCJD~jL@vrow}sXQD=2&A=>8FyE8KGI8BAI
z!y!G_@4tk7d3l=fTiYe>Rx#I!NM8V4$qb&_e-@caw}Mg3Kh7g1XL4a+&lk(q5GdE)
zD|a07xP%cUmhQ|3MT<AgS#C<pItD;`fmUhE`#Cv6u;6|!8`Ef~0g|DF+N75sN!}iY
zRx1KXZVm8{<PZDDqEw6mlGW1%w`F|y9p64nbo9foVc9A)MNum#(({qx{nM0ZX2Zfv
zVR&%gpv9l260XG%{1>5rA^BoL8k2UQ@IgQ>heGn4CQu`mGdNv}k?E=V0@>K`yJh#H
zNi?iacVFiavq?%te6r}ULZfEHG44mx1cjofXRSE*ToTg-<QhBP?q3RRp3`nRw+D(9
zf-pZjKHuL@AkbN!eY*BKUQt0;GpSB=TlLxI)hcLW{eVN@^Y-ush_+wQ+Da=fAS;yZ
zSifSTnNxurO&71?TiBHOc=EgB<z;WDl=kiUn!`72{dc8ohM1$4^OB8CvwCsmHXE1B
zwa)pT%iyzA7j<VY^9yfa@XagdJiXhVjGnf<X<jL=qCuOEp!a{xssFw_F``Y9x0&g>
zK{ry^dN0ptj!iQ+X8E!@n|$ZP<TI>7&%Gb*FML9+r@2`*y{Tu~{bd$)I~vgrtUB|-
zL)~A7n$v0$Vp>FO5^~#h4I3svHgxXV0N;Um@gKY0@)%b%TU@*92fZD>c?XfdaY1Qz
z!=h3KA6jBU+~51LO@%#>9FW7UhMzxj-aAn=(KyrwvyF9<z9MzQab|u?y-<47czSoa
z;{nQS{8x+b86U=-YE@R;Bz3Pf;?~5)J-ka8@9yn<gDSDEglAUbl$jhXY|ol@th#rd
z(c6c5D6QN2?e(00O7rQl*&O}fZ=NYFnyORjgu9j3SF{e91Lx|j|GL{yM@D;WuWSYJ
z))$O<94WLms+-*4zJ1*MA25|8^!N6|U-X@hs!xA)o?kR(4IGndIk=er+k16R2~k<?
z2Tg19N6PkuGaZ@lohUTAP+9l6I$00-rew70s{-+N2o)cH^kpyeQ0>8&lU+-<r42aK
z`u8hdT1tv4Q%bZQG+;>511ZZ=vtUo6lahI`S47cy)fytkee!?LtAsPOc?lSl8o_Za
z^dI0@ws++m&G^^1UE@95L))h7@fgX6ANntOH_S>qad3vVKzEX4(GN3%vyNN8!j8YI
zgMKEDMCeGU*4~ven+I8Ux*v#kxJ$Sb$=S)Y-S2HdRwh~@@K6iSOV?G;Uz<@)bhEsN
zQlbf1V=T<&3oY9_;9dSJ2ZP_Ah)Ebjqen{0?-cak>DIn}x_wu0`pd1SG7VQ!6Y_+o
z9y6BA!zu!nAMfj~3}un?YzP)6et}~_7jx!b#O~|l{DyCV*%O5qDV%aNGzJ0!+=_i1
zG*0PO$%!ZD6;=JVvYNP>kV(=LQVc4UP!Gf;H@bLisow@t5rGp*z1BesiJo3l+D9%j
za*=}^FN1Zuyj2x)<|axy1y`psBH6enw%b7wY7~G%QhZfmo+K>=sgEBa1I_{ThB>RV
zSH_cA^+3E`Xlwc$f`$!5Y%gFr148$G@<_VKFm)-2?yyS|FdN+W9QDDyl#xQJUu>?_
z7T)W?#E2mez;@@!H;v?veNzWn32wu*`?I)|fvjYUlTVx##-jH&_kILOC6-f-9TYmI
z2`Gh+uiprQS66O*OES|ku%k}$NLC!E<&4ojjT@~|H@~I8m)`4tL31W|W`w|hg8OQv
zBUc15{BElL{H?F{FYlaF4~<gznKv0r?7R`(4rgqx8T05!J#~dL|69$V6#%zRw2itY
zCK;W!NTe@V8E42=|G`%@l)W>F6KN9W6L!ooQ~vSlQK4bVV8j)W-UlddT;qYw*%}$C
zP<*9R2H(w{6P;EZDX7{^o>U9u`&p+J{yVL0I<WTvzuD)DgXO~V6`JGU$W2Fopvf6i
zSLJ-VTt5dNkhaaHbo)z5Hm~;2R3W+P@9w`fN<rv$UC~|uZ4<?Dg|=N1Kr-*@3Q3#g
zA|YOE?rO|aKQ(U}Dsmv_y$5Dr^iKaNAqbz2*gEZ##h2tDzD)RU`}e`=PCd6|+WRF^
zpF36Kk8}u31eL)}8+L|SznBhDFnaH$>aBCy#-C(_-zbhvQ2{gnU5S4`gg-0Ws8~E!
zTOPEH`G-DQl*~@}FdpL+v$5+E6|}Gv*~5kPXc8gq_B<i-A;bod7M>}3qRss0OvWUZ
zl7mx@gMWtdTu;k;07+_`K@~gLY{8c$7o?=y#5#*n_(AIIPJTYin^^Nso*I;Rr=K4U
zHi)+*=bbyPX(M~t;D5qp_xEa*w3xhP-Q2052csOu_`wufs8zJ6W|XZB1>e}FA(*X=
zyJ5}rWu!HLzpg8FGP|IhiPXq>2E@XZ8B(66bly!hbS*be<*$Z{l@-Wak@P+{*H}Ny
z82=A29?A+`5l;9I7}*clqJ;x%BiU(FaycE69$u_BqX0X?X!xd}(!n6tQcacx6Cc+Z
z+}tzFmUv39+KbV>f@<%IjF}ew(HhwNvaCYmGH(Az?9}75Ykv8BBQ?<b9QD|aso<>h
zf0$TeJ=QyXILKYzi#CzTv=Z9S0z$|6*K!hX^DYPfPDJ-Atyo@SjvAj$#btiQ20?Tp
zXcGlwyJbn4mbf}_>0Z~xN;{F`^fR?F)|fe6P!oYH5hlpyS81dSsYQQM6rGg0CmSBX
z@2g18v1ec&FIfGqj(muUl`2oLmM2ctFo!ApOcT01p`o&3b{JI{Xc98hfHWgwy~iXj
zJt0Kre1T_|!Y~jUoCAGlIPGzBo?_bx68K_SR?qh7fO~kS{%z!pftyB?bXS_dp~4S5
z6!Tux8KsW#QX2E)f{4A!-*QyxOyxtR!jngj9oRb-^;T#?83l>54;v8xPp<EYM;)ud
ze^nb!T%6W*2|?T8lLBN9@KFy$A9$ymR^LO7O0R5*?bXMr(yvYsWP)F$RHV7xGZ}S8
z@F&8NVaDbo?>c;3b9fle*)7qOl^MZi^#u3P+X|h+)axz%iaX*^Xi3KkDdM!%CyBF+
z)5t5#Jo!g02l!qXpPHl5*~!i<y=;+K{HCk$Oq#H3vR>;w`*HT8^pE~clIQCPH`y0y
zC206g$ttsd!}{M7Qh(!vE7YnP0QHtGd3fBu1Jl@nA$YO)lCLN=c7V<Tqmf}&O~a(M
zO&l9q?lm!mLdp;bVib9%dYKtqNXQO2he~s{Nm*95AZxiGr8;dZ6nu|x?OQv=MM)YV
z$o{g<l@|%DM(8H!S5QH67SiCA>}JP&|F@PK%S#!XoyJ9t5|pkCDlJeWsnQv<p4yHU
z%oJyORTXs=@0%OPSN`=)lAmYg1K-cF7F#nXemqk(ey9;|ctX+NbG^=w*@X1=m&nH^
zH1j{!TQ>5{lvZH>y!>2}pdE}v{g$hyOW=R%b}}(Fu%oFL^b*FO)MW8bG=^KK*?4f@
zLz4d}$A<ti6ZhI@0k&T7il;OMo`QEwYzhzY?N3sPK<+G{Oc9Fktj{>FTA{BavJv4B
zk*a8)DIjaB*Y<lbs=7(_!!6yDA$QeobvOMYVD&lyT%X{??7-zL({rn=%mf7=6>W&H
z`v7`oB;VCdYeb<&v8vnwzZk}1=v_#FN--|58wFDwg}Nywz-Yp<=V3u;ayCc|V$~7c
zTd`)`+=#!UcE=SniwCcILk0IzFkC(}jt&^_Ur&XvFjM{-f70<ntlpUL;k=>SIVsCL
zMT-8*I{<OXGPu7BP1lp{)#*4NN#3J2?!KYo?--m;BHWxe<6ie(OMG`$#o<TZ!@7QU
z_{^7Wb<-p{%b(IQX$Enqgwrn^&!jP;Nna-!#f@a$mlo;t$B*N#gR76f{*lXagWGMM
z<}y`mcfRf8${hm{7=mwIO5$<D?cx+IzF9y0Widx9EyGY+kvZMG^#=a2z_$-K%b0Hx
z(0~Gu62@IUQSfOF_CoT=#d?uDgb^VR1hYHJrA&2kkemOGu01mGODR)A9!L|I-G2LT
z*Hm_clI{wjY-sHK3j)J*QWalfEyssf?y15C`?1RX%d|66yvzbMjWd(t6B(jujwq4*
zvB>E1#sdlo&Bwglr6Os%d7VkFR~zQQpt9Vz7m<AuI){Z{YP6>i!4;5!NzG@2n2(w*
zXOhT7CSWRMd;VR%oQ|M?F9)lovtCD=@$ZRTYtt*gW{h|#tC*C;BCq(zvjJ)r#W#Fd
zbiI!64kh+xS3-8o4FpmoC&YRO$2dMK0|08L)mm}hpistjv`Y1VHc(|QU!{_H^1!2$
zm1l{HJ1fzZj@(YicteVoKsEJFtE~L1iWE?-<fFWOBry&g@>_&1U#e!R#zgi-4|CJ5
zG5gi|)>5+Rm8ay$Z9xayjm58PqCEKJG6?Fvu2DAs0hAxl;{fTX?zy-N?F$r&dlkkd
z%bE$6C3hv|ywhI`Cbg+vc2L;#qfqv(R|lcER&NGH#rCo)#J|Cv_|SE=$io*;{;u<i
z_A|R^(pZLk;~}R3PmCXpS;Ay2S+`?m6GJpfvj1=3xbb}eq}t`Ztimls!U?@TT;lDd
z))<Z;Xp%}+6nJ{J(z?+=h_zDhRbFdLeq3~N@a9Nr^M}$$u;N9jx<12-r@{wjG}QOY
zZI0LdVD>`6K$^{1v115j@RC@k0h1qW;97oD$Cxp{5q8xx=38Ylb6m6|9?MtNBf6r5
zRt>|o+Eyh9=y{bagDq6?mnat}$qkYcG9p2ax81UkQv<y8$b6_4nU<P?F>e6@^Cgw(
z#-bf)3o|hES5yWz7&6|5;CZsgWyh6v3Jp*R@J%$d9)M9kkIm$G#*#%h6YT?fjCrRm
zIwhNZHI__ea5PC3-JL&bl@OE+kKuKPynXY+#1l0X1$WfFWZoFJdk>A|1|cR@5ZVNo
zc{`0g>zLSs2;EtuF-(ctjdsaK;a>i)jD(x<?T1BtCv;7XU+BUTaeMOwR2mZ`T}(!U
z@lM;|%SwB%Um*Qw!KE|BBE~-Wg&U$P=G7a%VHMbuBHEgY8Vs>`AkjzOhVi$s^6*)5
z%@mZjS&%S2Gl-*^f&#~?PC24`b&37Q%dB=e1y<a3>9d5uEk5;(HuZ)?LuZ0$fQ80c
z|CBC3ImA3#zL`us^CPi9^ZA)7j35Is<zGPjM&vsL12In$MK*Mxa5!)G>BFkdL#jH5
zFPUTqT=`p;yI{C)A4!BX_5ct_a~O>GmkA3eLD1I^_cO)6`RO<vy(56rhpL=BtdE=m
z@83hYFr9MQcsUA}Hu{ZzyO8TM;4ysWnyozRa2zuOMP-rdBF~G!NO_bjfYNa$bQwTy
zF*XF=WZv<b@O)Tg`%3!sznL8K6}!&gI%{%^fWxiRI$rP>9Fbp-Rk93E==(=4>l{u*
z#U$cE$K#X_I7W{nfA@oR21g{Q&z*ic>%ACa4!Ldhd`>tRw`ORauvv>Dy&xUtPhin-
zfyE1~*OZVc10d1l?EbD)#o8ZbyjkWs{~u;-4ASi2iR&5uc+%cK<@qF~UOgr8HGDte
z(sM#ZT86iY?n3-iB^Rp;G}QmH^f&YPT|wDvL%ohXickVm0%P$xo`9){%dXyqa$pgs
zyV{zi6lMhT0;BHMoA1*72sO|$pKp<I2IrQQNlM#S0b%nLk_yLpwijnn)QIeBCtTd&
zXqu6yAAm+P-njmi05;>fa|SrL4G%!Tc*4_7wryeD79C8%r>+x|TdqX>k+jmX9IKBo
z$DTYRFI2m+-KJuh>gJ1(ecO0u#ZvENFB@X*nCUGir%s!W!xpeRjPR!j-97%K*=DPR
z^s_G7%r$B^3St1<KVQ_nY*wZ?{zcDh<ihguaWR)h(?H1OR-dU!wJ>OonbYa@EvY0<
z9Yk#ZG5g^5g)+-+j^$bF;#NRFS9gmqDrH-67Q@t@HM~Pf)KWE#!q$5(j@1NRe|(tF
zqpl2m+H9@N6^Q!-GQKM0k!LZ^PnLNFsr4mqZ6h79^eZbXN5xF8n%u(fL)Cn2Jd!S{
z!oINISy<jzDitJI759UISGU&J$<!@i4mak=SToTW38*-dB#F2~jPwuiCTC^XnwY7q
zDkjX<r{XMx#gSYg;m~)cx87VnRpW5{AJF;!)(h;L-9)C0bL|OHES$lV#~`7mqU)3n
z9QjY#yvwPa>vxvc<0dP_!UWZY1Gh#w4-i+}H<7+DAS9g6bo}%6t`1B@g07wTefXM&
z^HkE4W2Ju*5Mh7djeC(3jn94U;uLxzW$2ore#KP9+?RVrFgRR%0n06u|6ygNEvUGv
z)HR6~1qgnUB&W|lN6^4`6u9xx7FPn}ZcKIj6VBpre&39Ry&q{#yjp}N)dk24r|jpB
zcq*9iDa{yIGnvyK`x}CrtOpF>cnLaI*0`nwta7~M27J*AmQ$HeTnRx+V=Y2Md}1;W
zS#3Yh64;ior!xi(8=0_h=11z;I#=Itc5;iv$OQl#Rh<fy-2$DUYD?kSM8n{aK9)F*
z(VC~%AHf&0h+Sg3wK`DZLGZd}yZ;rHM2?=(u>p>^T2c6=L~|@V($gkCl*quiTzk|?
z@qtdl=>nzsJg3iMIdcC79a}1>{L2+aMO}B~260g#QZt?uNXPDxr_x!=OC+N}C}~pP
z%w;mB(Y%j}Z<YBV<0+tl;>rejyui)Gj>K+11>&*b_8BH!7rI!^jVvwBma~X4$Ws3c
zF+Q*Co<XkWJ`-l2w@qoXz@@~O4V!O#a7;0?Q;_zhi41}Zr+i@J*7nsIj#8%JnV79y
zR(Y`!TVuFNMH@H6>=lx&(ejUi<+z?!q?+NOJ7xEpcTyWu?oxC$l{P{^{@P^koz@XY
zGWsk$^NQC7{dxba`oEGZ>mmBe(PvE4+4!(sXL>`RSgw6Uz?qF1xWFxS&sWVtov|}A
z6DAL7Rkt%V#gg6#^ibs%u%|9Eh<eoPzAEIUl^dl=+T0E5jQt;loWt>`wy~+;!$DN#
z&Ei=Gte*gXujyFAoZ}GvN&if;k)JON-Ksq)iv$#gx9IvQ_q9;7kR&`vFjETn;QHb6
zxw6nKujno}i55kbU0N_;rDWL%Fb26F_LGmQyY!-H{Qu8=qY7FxFpM{+Q`X3O*Hh1n
zXl(i*%L=aDm~ztqZ~02E6&m<)<P>_DK9J%BlXne3%=X`kyXz}}Zak`3Fm#6|Db$jJ
zifu=o#&GR3U}Nd|ytcohKa{*(;-CqidV~y)$l2_<Nb}%g<+_evIjSjYw*@gTAzR?7
zrl%-8Qpfdm_EBCBd2sf!^1=C3E6rL(A~Z2PxX;DmPCN78x&u(`@oj(1SD}eH*c6u$
z@q?nkq^I_;#3iM(1-D_`)t}mBuv_H|bSxa0umm2p4>DoL$A~|Yi63-0ctR)<${}Zy
zN(4v{r_p%4561-<b7(<B0iYw}a&M;jY?Eq<rcc;vHC!0Xk_TKn^Du_h*EWMp!*btU
zx;ZJ!UvsI+N3EU(<SSKtE9!z|9F1{#wEmcG62FwDHVi)YEMzgBP;d0Ck64*%@w_~)
zZB=oaAar&|sP=-kfsbmih01MoQ@bz|Ygkz6{4e1IUyH}R!J7*v`T92B7LAc9+pG7P
zEYl2`mi2@M^0tbr>c~DFLUK+iOHHqBMIOt&U%q0vOWP>@UX&Fe0f)g4b`MOLNs04U
zdV^H_l*9y-Ei(nxug@v*`(bBL7MB%X2y+VNjZITP+;95`1PVOLWjWLrN|S{d)o<<%
zl3j1q#@Np#;z_9*q8^GxD4(&2mhCsmFAQ6&D>!6<#fjrVVD_@^C<zwPU!=|Q48!2B
z0U>CFY6(OACtTpe)l>JpJBtkgPoyfFK+Zf3xcsYW_RzAfM0i_#;MEpwv((}C<L8&C
zZ;kmp5F&9O7xg+8!Jd_qe8t0;sMC8E<n<RuzP`pYJvzLv;IU28gl^+^dNr9hB!}~g
zRgHoUjvqlV37dX8(32~sIx>#TiPXS@FwerD$+!A{51!dS2)7iKxx3gdo{SsH`MZKW
zcNzW$nq7@pqFv+HYbXBu!T)j+12I{Hgmw$iUY9SBQbmt9)YR@llfv#ZJ+?4uUxcmW
z*7R4Oi&%=O;Hz@~N%1rdKShgENVLy^#ow-EV3(>`5;5VAAmSM|QR-Z{lqD+&@=9pL
zNoyN<=qe_(9wzuhL@Mq_&3@oN3FwC1F$eo^X*&Dfe}Lv*Q(@8Snu*PL`7z?%zIozK
z(u|T&z{J<oJ=N*jTLIsGT8o-Ki?K*j=-B035c-tZ9Hb_G#QF28f!Omdbh>%DcWrFi
z@T!==?!~#I2b(iHH`o8QRs7z}Q?k16D)%;{X&*;SG`FXZ=ai)NZ>yWUMcjiY{0KPH
z4kA&utv*PSZso6;cDZsFE!p3Tb3DFXM}Un$I9kG8vX+GtyHu<L?2~-)Yt$V5KZb*Y
zWZQKAzB*(KW_{$1gi4YWnOge{(_i^2aAfYwRQMgOYa7Fl&`O7S<vWGUE1b6?>77Bq
z0FQ2>5~N}m*Pi=EqD`Kb0(O^P<hKDHrx@Quz&qn}k!Cqzq2Eh6orN~LdUe}S<RirH
z)n=66WhZpw0+E8BNW&Bl%Llli*0E=wwlG~4PL>CuhQ(b-_?Ufh(-?2?PLKZaZ6-kJ
zk8BWPE$hkGwK3hAF)jdftxGkmK@dx$Wr*#9Qy2YnQvb&Z9}xVZ#xt&ymWgf)Gd45c
zD#WB4>c-&*P?2C)q>MM?RJBEH%lr4-;v_u`%Z&Q$PcK4=L?^BfTm`JZi%lY&{#y&$
zXux{CnVy$PQUb*{EJEmK1_Gp31hHEnrJ~z(`b)+ZrUQ=#8G9L|y2mtiMuC?E&uO3G
z5g4?nrdW-BMsN0+RJD*4mBRQB_;Ca4a^eE{toQ}Z4Qmwgr+06rw{N5C^={dk8Km<U
zB_cvp5f!DaW1eyx@&mnc^H#&XU;=wDxNj0oO%ik~@u(fKit&$9<ncAq2@iJRYnix@
z8-rYHH*<l>G#8cK-o2#X;rfdcw+*C<m0&j1+iG4O>d5KMudxsCYfn1(Dhv_tRouTN
zr10P?B3@&*vx3kpUF88ll5r~zI@4v`BbV~90iCX~+5$lU*Z7;|6DzFaO`A!&I09_k
z1lOT9U+rz(Y}FeYD>Bh?rtg%({|X?A>dK*}f9b~VL0*nLO!->7#@)u9;Teb{=_&5G
zNhYh6qNm-;tA72`QNArxsp>|mx5CFgC(cj$nPIf|OrO{@TL}P2E_q++#yXEF75tMR
z9-YgGZ<i5b2rzGgJlq8h7Vn)vgGF~v+vG12e{6ml8^tx*yvq&0LQol^-(@;hJnsJw
zD4$G7B&jhiUC**VBtP_`WXkx=!0=jlA0s%9_#W=>boV=><>AxhF0W&Kq03$sQuVw{
zy6pnW?i*WWJ!{X^KNb`gIWH92Ri=EoO6-<}Jgg@Yy=9Dn`D$^E)=e!6K7ZiL*uN>T
zngO1MO%K&r!+*+-gevcKUC4>5do+6KxHUl7PC(zh&1(*|(R0KdrFt;58kONrQ2ji_
z1z}+m2EV{JM=f84Ltzbl3~x;~ebu@muej9vImOLf8Z%K!@UnjTFzon59Jtfm(Qo*;
z7jUTaZkHH(n*HqevG&j&J7c0F6iL*{KA-s8rIuRw<?nt%{YXyGcLPMf`!3;oss2TL
zJ42mu4VeIc&Si{ob<dfLyo(9%&H3cs7%@`Ss5r@^#{OXEc27d5kK_pmhR2a7<=b%J
zFTJKQ<%6N`1*T#h`xW%EYfEi<Z}RF@7URFkv<W(gyAb$^15+f4Mr%hM;mCn?^%(5|
zm}aEWq)&BmKYZ3iOvNZjAVS$i+{Lp$bWy*|kbCHwEh_x1La%%a^=X>+$TtZiE`J6!
zB>cr!50WO5wTUK3olFJT=4PSj#<oC&D*gAZbe~PJ&{~qJk!q<{8q=urt!nY;HvCw>
zc$$rP+6gY3l;c|fwgl1c-Kn@<)$mSIS61k<(HNhqM8HLj+Grw<#3HP?s*!P&ms}LN
zb#xy%Ek&D`JCUTw0P|Zhnict8>`v8X8Xe3oiA!b%!5>4{BSGq8g#J6;hWkk?8cEeN
zVu)P!i=VX~UlK2NTCfznBDqu6&ZQDT{SlUD=lf1#zZ$cx{?9Y|K`mkwnWQH!ev}2g
zbZeQcb5z`!f<|tYZrl*#l(aO%wlkIz3k(^|4fZ4*Bjem+c!e)<%pFXEiJ^Q}`GN(b
zH;YEPKX7(5iNlDS|63`op7r&=IjYyLcKib+!lPQCPjO^WjraOkhce=y%6+naAF^rF
zuXT}8C4v(b#I7oz&pOM~t>&OCkjvPnZx)TWEM0Wws{gmQoy#S)dd-&eK`l9YHCSlQ
zri&>*zti_sKrlHc0vta+d>~N@{%{&3Eb?yPhtz)cILVQ{5w8CMfg<Yf??W&AxV<8R
zWp?v>vyiwLq5S3QuFcQK{Q8u+#G-Ijsg!oHN7YijU@4N*@l2yo`izy!!_S61+HSX=
zyzi#g0PfpMCT|HJ+O%S|pHbWzMtY6KCkL*bk8+mHp0mgly3_>!qXKCv;=FycUtbrT
zT_R77uMbWaW610f&gEKQiO^hSM46c^IJpJAX)o)g{~>2QsZr>Kq*(OmlI2ao+gCp@
zJfF&i{^Ea$URbakylU$0fuWIGh;k&ku?<{e^T_j#_m{7>1-A41d!uJc5UT7)Qg+p6
zMY7Mjr3Mg-Irr(#c2%m+7<wni)a<@I>j))Mn}ugYa|Ftr$=@0`lRD)nI10W^DzEo5
z!^5;H$ij%NQT!w+ct&l|_8m60-S4Ycj6pO%^9+AIZZN*W_w{m}X<7oBWwZtar8wCJ
zn9~GOlrQguhV=pTk{v$(@id#yN+PlRFPW!sjk|?8SQPoUwcg!iGP5HZzD5mRH!t3#
zbe)wAH&f0rBrn(wecrJ$Wt%=(9a@e0JcsU*qnicN^gk7iorul+g&yW(nmXBBHkWu@
ze@)z1oU@BxM+DT-c2}^pk8wNbb~FifzUkoTejRprC$@Jj1JLnhV{DWb22m{ne|;E@
zRQ1F4s-mwRQtUL~_tYggM}65J20v;1oV@V#p)~HqY2nBr|3LAh-8b^|(_emh1)O~8
zXMwA9`J<%PFk?Sn|Mo+RB~sGQ&mu}=DjB!R9Xu4`)a`rJaz&;EvH{uNo-ffGW;HtJ
zYe2O`*v(;5kt+hKn_$e~&=8;MRG%}u&?XBLOm)D|_MDOMg0EAco2RKoL!<pU()r(=
z^zIpFe!#T_<3@@y*qxq~s>#24_CA=Q-ka%jZ<uKM0w(cf%FTj`-GZS@OYmp{-&~av
zq*sOH_rDO*Ks@in_!xFTo=@ugGO%JAooF<LU(?!w>aQ~XN$KkO-$S(1I>Cg+G3!g<
z!RH4~wXwTC7^mQ{5cmEPqdvR;fc$nMLT~?La-&2ev|-@Lb7b5htmNHIw*YO#tT;83
zX51VfI^I|o!mHnEaaM$bRb7??4O4fBPB9%ddLAw47LeFwHCoP@-K{IYL}Vb>^>{jV
zp1Pru3z(=d!yOuLoaeho<<c?CZY1BJwPQYEJts`X^t{^@dPf_t|0<qV6<pmr(DW(#
zDw&*86=U8ArKCjm=f*SJXoysBOXs{eL)k9W!|zynto+J%dLhiDja^Dv04Fu?vmDh|
zOzp;3k`k+t#U|_k0~yTm+RZZaH362=%~ny2n%ZK(51cdBE_K)5(R0ik!7@<9?D5(e
z-rbl>V=9hU-xt5t){|Z!;^^W(lTIdg`Zjl86lO!AM=X%*#K*K?`lfJ5&81V~FZe-J
z_&DhweQW-`vHP_?@g7l`kKTUrGz8KwtU><`@^asW?p)SORk`h`zj;-jSTAj1W2p&+
zPtH)>z25mh+#r3w_e*tvJBfFbE6@!+c7#tEjO;Ui6=-v7t|QHqk|bAe!1W9@^Y_5Q
zD$#$@H8b;vC~$eqWek)MWfZd1q*=v0IU)S3GIVS+iYwx@b!#rm9ZK=Z`O3^Ss&AOD
z3P*t$<itfyNmKEvT!0fFd9+v%mpyj&!mi>E6d>O`xCMZQ!||WrV2X>t#<!0yaB;Xm
zr0Ol}s1507*74>^F_}Ocp4M$GjydLYD$GVDvt@jE-^Vn?GrqrdU}<+}I1K`a;vk9I
zbo0bsf{d259lhSrPugdcfVJNiAF5Zp=5eNnbQP1<vDC4vmip+<=f?hT#ksN?RKP@g
zCea>ed(ldsz{UBz`MMUA2s!A39(A~Xy)Qfx#g>k<RI!X}WZqRZQn+PZo%!3Z<*lC}
zuOsEr6g8-0KJ7Y{J)uq}$QOWmsAhI7!o>LaF&yw1PRpBmb5VeQ6M9Fml907hH(JP9
zpuul(7Qq>k%*H&m!*{9Du$)~)1=+w!n;#{*_u*G8H@bN4WP?}R*KZy+0Y@!6G?;*t
zw4UFq_eORw07;RAyKFDt$9e{Rcv(D5u<%!V2D%^Rr3x17cGe!Bz-TKn$->5A0|I;h
zJRc-hHX%KqJoSgTq^xC+uaB-5)ZljfNxyps5k3$f&zIGFEAP(I<UiKdpnRNt*{2xM
zl*bp}x815ci4&1$2c(IcZ7>+cW&ekPj)%*GzzZq&6q6QVs9^A<zQZn1JA#<A*Ab4t
zl{d>a**qi@l64Lz(xY^rxi44gU-M;jCxwz@B=v54?5#+JRE~UlfKsnTc4?mKU!z-!
zcY1hQ5H531`_OH;4*2W=cd%CEC3o9Ih^{Gp9LazdNE6FHs|DShxDh~e$UKTjwfgkz
zAIj~et4~K-n++qodTXboe|oSYUOb7lN$S}ej^YkO&~NvUrmukm(9kzXXm+mmECmPR
zK8%AdwYbHBHgKzBKJx(>hVio~{>Rs@`o<e#PPn0m_Ui-n%AFEE(;=<<yBo+zf?S^q
zNx|%+U2>mYx#sY%ja9UX##ZZDkbOLO+=xoe_bYxIa%gG0JEiW_h+tg1pI?5t#W{D|
z>xY|nvR8Nz{HS(Fsn<54rGfwvh~1&po0IMJKE5s+rw4<{eId!(8ITy0by3L#b)psx
z37#hiqDCU~8|jaisLjObSDm^HXUfdxHCwDd5VC!oDp#dak<x37?1L&c%d&t2|FUb>
zGfv64UM~?IjE}Dfed6kO%S7h*9!lk7FYoN32}=z&u<O-tZPgz0&4MJSNVMwu&w@me
zuZ~zK**Mva^Q;_cUmyXH4az@L>#+=r@C=-oQE5_d?G5%X<`0=Vm<2frHqP<#i{XBL
zzqWE=?mRwov5Typ-!;W}Sf)1Vp2?DZTItOG;&7qkFHv@pzF!UP%30Civ~5+!FNpE}
zzW3^I4C}ecf&BqqK6Tl40iAbZZ%Y@Mh#*!3uus;V;4>oXvOI&gYVdy!(8kg<wG=IU
zxp;%Qj3T}zUl?iVHi24x>*O1rq9o@vY?ZiHU6Edq`brxBo6?T>a!ATB;~Iv8_9&Uv
zyiEnS&~_gnO+IqVfkESmEHi8Fg~1$_<Qq>BYePR@7#iF&(_M=PtmN{a-AAjkVftmt
z_XFK9r2N009~IX!am4L5W03mw_UaRG{h!SOU{H1e3hu*Z7+f(w+iYkHZfLvs+f%1%
zZ~LA3x8?B??KE-lQ_}}ZUw+_6gPUUg%-#(|kSbK@xc=tb<m^se==-1^42z?I68&$X
zEa<lY+J~cb5shnfwZXT^AC5B6v$I>Y{jFRbR7C~xWUeE18)8m_3p*a>1Ot?hig3qd
zWhl|C-2&-I<nHc2IjmC7ja3;iP?5mG9E^)*uxFU&DpJ8lT7OE9{i%QKD`Nxk+SL;^
z=tf#Z0mk6$7zrM*tojkm9=Y+Ki(W`vFn!vEr-V>FHgq>GP7k{wF#d1<tZ9Fj>-~nS
z(Z+4(p4fBFscr0Fd<Bl`JzaeEnuIBS5jo&V@!cr*rUpW|%8N8!YLYC$#dZLqpj?@q
z0$dVHT5rS{S>wF^!Zg;h@CK*$?_M}aA@-Mu%I-J8*1=)n2LlBG;yW^hk=uAMD3X!<
zmdjY^_UB>Qm@#&GPZi}~m`7}1TeGSxOevR@MeOVMm0ksNAGyMTDDGfAH<F=@Bg@I8
zak@~9@MSE><dIbcqw{{x*j$~+qnLa7x<_w8s#-E+=Hi>osK0tNhlp>~x4L8O0yvt{
zeI}>tX>TfVRPKFV?u$C|x^{3S@HL+7&;3bkKW^%}d1BG+cVgv&cLnf!eaurqK|V~|
zz-Gz_<sM0kZJ2o@qP^JHBvB<9-?$WStH{nIEZ}E6bR@wv(Oq~Z@<<r^PxADg4oI!z
zdi;Z{jr*qL0j24e=XJ^HFQBwCb$uXP)bzOgDKsVJpL$!GZJ%iQLLa2ZI+l0jtsi>_
zTtNLc854)3YQw+@0ccYJtgJ0UBa{5IKJU2;8ZfEgXnaOjISy@{f_>4~-107zKVj+h
zQ>`y%3Se>Bn1$kmzM+d(;%MnqSj1))r~8_MQ*idz!BR`oAjX9{2$WK7G5Ceitbo;|
z)5Kl1`OLbO!@%$esTa)m#15OYfc)PEFlX)H2&$Z=5BUXaA~FEfHkIkR+N#-~k{kM@
zB`#xf#m5Mp%URss`_oyMk+V5bm@b#B8btr3sC|FdAsTZ^u2sU!NMY|2p#AFeDou&T
zr|{~x3x8m{0N(VbtUqKZ#xdj|-XbA?-;#uF(^~?mU^hG8NuZdpOMj%yB}YQb;gQji
z{jW(%V$L?vDbeKqg6pThkP(1OG8&P~mYJ^9&ZX?%gZ_wdm1O+P`2NP(Y7q@Pk{o?~
zV#8g4UEmMIuV1@#Di{K85S%5{Q3OtZ2iUA+?}nH+6yQ92oN8uJg5~G^tSh722>#P_
z$U;&zX8ZzjM*H_P-+VV#J>d4)>KisgF@x<44<1EPISNy_!wZ0oqoheJuydWrU7!j{
z=sc>$Jr&+o?NL<9j++R#Li$F~ul{Ixna3t;<evySkVUx+PUTU+)Z>ylYJ@j74kjc=
zgTL{h@JbWvH(RxYGnl3zDTJVDf*AIcx4W0)M&Qg4)#LEe42zo=6`aNSZ%@DGXkspF
zqIZsM9eI405DyVY^cr6zTr{w}|MR973B8i2k4u+_zlJXxN!F5n#u@tt9$Tz*@^`HU
zuOPYK0s5jIyzRbRa@CJ=MQMZ<O4;rA>On_09m7ANUZX#XGy!4XCpU80qqQ5oVX%4n
zC#z&z2Scr>8?Gcmm`CY^7xq224K!s;JvjwYoB2sNYxRhXe@f>M0=s>N7Vl1NG@3^l
z`xy6UR=%Fw;PT&`c==GimT&(<&;qF0rP`jq>d0H}Ffm`?YAlYAtgX7+XQ5={0{QUI
zMq)O{=zqQVS&HDZs}T7#9#?k}KaG;Ku%d8waU!Flv_~rT*g-DGYrtgn?#qNc@rD^J
z_bs}LpQR2eo_%<~H~8=W7(Uhfan1mEwx9k!3WI(HTPInnb9#4PCfaW|?ylS<M@zbc
z>EAw_siLv;cU|FsQrJk{jH7OC)?oLtdO$KF{q$zd2bBnAZL>2`e&~*^V~cJULnPy?
z<ZJBrQgBm-m?p@47GQR(h@_%H$1F*heLt=d&7m}%7cbFu)?cig5%2OrhM>S@1n@#U
z_&PjnoU~WojLj7B-A$A3b4MOTkd3|TLmU|?KQlj3d`wg5MqqHK|ElW;%Iu8V*TL^N
zF}=gaVAqtTKdK8Gnz513)SfWPeiqo!)7Zhy4_EemroijEt)oT!Iv^Lr@GNqT|D_VJ
zbB#T)Y9%4oly>_j*<hb!1IXHfbuL%iA2(N(TquXZ9EL9@H<{$Q1?U2jg_ei8t7|F8
zydAgYEflff<~^5vCaIP%4BxNVbKz}uUiW4oW)Q2A@sQ9BziNSy?IK!N_TJs!mIu4J
z>`B#akbB~Y-R=3j3r&Z)<pTRlDMorIYmQl8G~L;wu|wpZJ(uDv<@hQDdEzUkXCvm1
zvJm}9D&pGbpqE%^&C*i*t+xUiBI$76Ujl<)<nBC~nxU9LF-3mz20n<HT*2z;)bqNO
zq(IfL^^#&9FIjY#>wMK-yxTzY<J&KhUH}Ws_pV75VZ!7C=U<IVT3Na^Zh>j|^O)@~
zNv&u2EL9JnLtwr&TX#c2v0Zx=*SM$!C_%42X%9lfp@2)h;_@@N_IM?p9<kY<Bkb0t
z*9b+1t1ebbC4+o;C5IYtC);lMYNUq$3n2)IQ18z{dY|7v)Io7>Hy)?n!CJW?7*tjK
zZO#^*3L|;>bMN)Q1|sm*1`|_#yf%&3Y?VM*G5e_(NQ;FHg4msh=!<z0bllvTjRR`7
zGC1ef^ma@Z$b&HlbI;v^xOTeE{u>K6(>s?n3@n3BjAW&wQr?qdm#tX{N}!`B^tV`x
z7Ix=f$fl*6*&llPw%BC7j@NmWbayfI6qD}3`IntZ6(W)1$wj0v2|(|ON$FFuq0!ML
zGtDNw0AIP@AG=FG$<E?)FSuX65=b!0NZ^#JhDJ?PtKMf)6z{Pa&d&8ScE~8wQhv?-
zv8;>YUQv9{g!V{4h0#!tmW)XCV@igshQEMZ&$6xihHleny{Rw8U`}Q|H#E6kbn{%7
zn>bE=0(_x5r1*WP&<sS6P2_H3xoht9t;xuu8~^ETmwfzkC0$89pr*8xbvl0wdjFwI
zM~S(|z0owW$l*sIB{;u=kF5PIUsjc-$yU~^QtfpN4IdcEiKPBmSzf(zvX?q5$2#GR
zkR1owtVj6{i9MC47sKQl%X;X05;_Fi<wxqoESdWs7dB5`{zpLEFX(uZv&%2crM7#!
z?MweZ;^Mn2!v`+k0>0a8CLkJ9IGGYN7=^fzdI29XXQpJk*D<h^$p!km(9FNatvP>_
z0{!SFq??!KUZ<Ji8)<6w(u;O>&*ZM81t-w%FRT7rT&R6Ly_)bd(*>KKLWeahnYAox
zgyRSRMo7QIb|wR5Xd_rHmims(k^g#Vlg82#-LoQ{JIkKscVIincJi~6YK9^Y!b45+
z&+LBAF#<=+OM}|pt?8&3I9xz?7Oeg1lsiQo%p%=K*Doe~d?<5NjAYqX?;dytC9pI9
zHZCg=t92|9mQy`f1db;GtwiBME>%1=dg8UZ^f@yuYICH3>klr4h@44Qu`oE}V=K_4
z^xI;KrgRl}ZNx$3F;?1{&-=9rBY%tvywP+d*<HRYncYGp8N-+8KVS0Vgt?w<Ez-&g
z0NwTdF@bTm-Uz8TzAya?r+d~``X133RuTP1vTvc+2gE){+>X`Cq-Pm_R>rMi`DPQl
z+iX_F26Dl8RFTXn@s8R{<l05!h<9F<7t%X@R4Ci(X{vH2d>~y_pWG(PJ*{HG3Kf?5
z{z}J3Y1SpHa$WCyu@{pr40&1o;M==O(;I?6M{F}H*yKz?pYIN*F9uI>J8k81^tWs{
znU`UKwqU%?uJ4^)K>cs762K_?eS09)P$k_E{M;_St~IERwR5U{?-zvJdfkXmSJu1V
z!BxAyThXS28saYYcyNaQX@E0?L&s|hKcM;_K)<%of7|dd;GQCPGW$%9=~|E5gzd;p
z+j;DI?!+*XfjLfn@%mySb6r2mAldsxO=#L>WjQ!=80=lp&sV?AA6>M4Av!D8QRzr6
z!1o3Us4gwWRc<vnU8r<$7~X)&LXlI+VEUjs%s|tX*oEeNJ4(2b%!c_7c=|x`{f)@=
zhs2}PUfxIf8?%5b=@mF3SN#wqaA4haEV*~Pj5pbFZmb*v_sxxN!cZ7Ooela|9<g1%
za4$=y(@)H-L23pFai^*)Z$3PIq}=-U-MMbN$mpc#!861Z63*5r^MBruhp`RNM=!fV
zvaf324Xusp%xI)zTegAoM^k&W!z-<dfBD{hk0d)K$oEtyu`kNSw9|_ZthZjxa5LLo
zsv~!uFqjufFhe0uP}z59Qtm439ZuEPx20dIf6Fe}gsOlH61cbvx#U%)<KGJ?WIehZ
zA+OGHEFAuQvZA5o%ARcm<Wud6=*Ew4?PRx=RhPsR<hoGuO|=;@jG*)ZxFd@Sh-eBt
z<~;6Sars-d6BR$%<Z$%`O0MpMi@~5<8~f9Hw6x{PjShO>r|@e>y8p5--Luturl6+r
zEx9<CIE5Po#S;%U&rJUZEcahE$jtv}rRS_J)mn|*rUL<MLy7wHMOKf(1&A(^17K^V
zu;tuNRoa7VFW<%qbCUkY;9?fkSTKDXg>mu=#<!`~FYR6U7o|S+A)@m7vO($a5qgil
z^B;iN<5AR2z5Fu#Rgn&n`(tm*n#NEUe&CgW^r7y*j0i98U%NX^dttB^<0$2o_eIRH
zh0}wIUA1~_9ePt<%Cf!k+T1P<Kl#s{e}0RupBhN_rsrSKP1@{$i_QH}SQ@>Ub6)F|
z{5kvb8Fj|NfcRmJp&x6=*3!P|`RI+LgvcCI`rZC739+2HXT#x1_-HVqKZMO3g0KRN
z?d>=G-sv!>j*f2|@+xNgW>p7uu8-;PTn_I!j5}&|oWhkq=*{^Kp()pkBN><NS$v1d
z3)b|mbSm^170oH#bJkPZ5-$L5oE5!$**Rp2^D)?#lbN^W%@vPa+6EyiPES`#fp2B_
zRS)(+5()vI0b4#`m$1V$I@9*+?uq|3S^6{2u$aXAvf4#<s49Wkh7GKs*5hpyCv{w1
z|6cozq`;<jU@C%)<+P#daL#F#^m1bk<1ZLX9(_W|!5bO5h@~a7><UT;C1nHLJuiB^
zJfT$cuuj=W6+KN5p5&SGW_cQ+FqX5qXMW*?8em?Fp-h2m3=O?gv0qnOwqS`vpVV%B
zFAUrk+=58KJ}FrXr*u8qS-9<K_4~Te%M%^yy&pb`7Tc17n)Z$D{okqZJrCFE8knP-
zW8uoN7ny#`yPyQeuJ_mNxMgOvoscupqX|!u)RW4r>#BHkM9<D^lmqIg4~DY3OTR>w
zSi#-)X$Ya#y@(h?LerP3<O$=K{s{lycw&yxClTA9%o6A23$U=LMlRhqyR3Rlo$s=9
z6q`U#&Vi+EekGA6Ca_WCQW-WKPK|n%i@-fpe>tCw81_a{V%i(&1N}Ky6Hb=iM5qt`
zZl}Q)!%EVuFRW0;zLa0c5G4e2ZXPw9?@cA^-N}<@K}IJPrI@j#;$?94UxcW#{Jw(u
zj~7`b-A)f{#lbRGQYwX}g^a4{3ufc#S$q{$EbtPd|A-wK+(lTfzPqhE<y4b-LPz?P
zUgs1KY$zW1$hYOqYqlj*9acwfGEIEN+gCcP|9#c)chx3^YkzC2gl7Wna;RkQ)q7{y
zMK}q)T^RNXCvvArm#&Il7%l222v5{LN1NdZrDK40pK`F}Q@!pB+8VHVC<#Bg&=yu2
z`5?~tm-e|3R?a*mqo{n!DyAj;CK2%~<MZbESsq*zuuHFJ2U1G0rl_RP_EC0UNR0kS
zzU~JEO-aWleBukn26B+qWaH|lq|1Er84Q;k@zM5@b)kEW@2*%^oFCL@QS}fqP+*;b
zkXSk)6OQ+eLnhaM&_R7>M}^?c-%fhO8grz;FT6Hx2FjuP+r`Yj?E^Ofw@bTKq1_rg
zZLmFyozc3Sk7&!5TL1Uqrcqd0nc(YO_WZFV_@L;=B<&wSvbMajBRXHcgE!osvs<Nn
zidwU@Z#kMMDs8OV=O`QJPqHZ!FxFVIk*A?#)xM1q#{6)EMqilENpq&43xh7P_Hy(K
ze7H898}!f092JVgGUvEn-?J|_1R$90<A?&2>NJl_zah|^YQ@c{j9!&ZTDYe{<6>y>
z^f)0v5mxj*%;O@{?dWSwWLEYnR}&49pt(3OqX_K2QP4Ujm7VR*1u|>wOLi7pcHnOh
z#Z&wBe2j#c%S?D(kipx~0#Ccq+jifayrAL|HcY-s;^IlL%~uesfXsGVB%d?+H4#c4
zT+bQ&k?AuVa-Zn5LH>+o{>Z0v;1W4Rw8RUO33@0Fp)L-21uFZWkgc5+ebkrFiC!|f
z-uur1y^}QNLx}#Anuy=SbG^Mjry^;ZkUx6=fbF6W8aqiMi}8m2f(Q~jN8Jo0aUj}a
z#I9O5m6#x`cH6t{v}({nUn`G}n>O3J^p#sJ(Std45yoJwb_8LGKv^YN-Y7;1Qn>H_
z2iTVS4}_(0Ulz9Go>w5QFv^AT)PErZ0tIA~_q(a-j&V<+vNPf+$470R-433WMy)SB
zB=R8E!dzf;A(wr&Ry*}QQ})K`PsW^@WsCvpi{XL?RV?xEzgcRlkUQuD+t=*eJ~!cn
z`0ZagvO62wyHhEatu_S#Y3fOT`7}_o+)fA77xpmCoppJ2sE1FE+#mHT`Z04hZ~u>@
zGY^NV|NrnAgRx}`&17tukS$xx*eMLjPLU*Ie<Wkd8U|ToY>{OedhAL<SwbioyNYB>
zG^5F$efRv%_xE>yxH=c-^EvPL>viAHaud7!&i6vuv#7c!qnX<AGgq<AX`UNJ>%#^=
zDVQpP>gtVwJJ`qQJ7h)*m?)rJ80X00MO`W5nVBB=aVv3)YH(BRA3F!-%T2g`>xney
zgB|K6hfhJB0=wb~a&PO<ZWFUS1}XNB9FlOG(HuAE#0Zc9D(0l`d9$|yE7ja;*A*zc
z#-aX-mRiLfejmO2>x}|a$%duGox_GF?(VO9;lN)_-1duqSgPMkC0_7+9HeAc_6yUw
z7((0scKZ$dm3c<2eA2Ut4rUE>4~9B#&Qbq^({B39>rnU;XfuZKT)On8<F&3zCNirq
z*0#6f;Qp#_!eo6wqsA-5goQn?JCY_kjla&%nbi8Sr=)70X0C`?OWDkX(Tv80^3siD
z&AAbm6QHuq`$1rByvIRvN-cB$6+PYhad#_CdY=AQDfD-Nrnv&5JcD@gGg7vuXjnSG
za7byKC9tc<ipBYihf7zCiS1|W$RZ~)mE}uQt^7dWz*l4}B^EKuv$>_{{?n7)9vUJX
zEf#VRHujI@xjG4$|Cel0>T_zDoXbs_i=5`KF28F^wTtaRNTX&UM+=aQiq@}npV)vV
zA9h^xI3qIxwpGo^oNic$73K!-U~m!<NkbgN+U(=|LZb689Y)(Xo^CqWz|WNC4s<Il
zYpjSh+YdMD<uTMCksH=x2Nt?^)@@Hwr@xUbi>TiPjUDVvqM=Xk+n6W7L`?lZHo)#x
zo2c2$79??2(U<iC_<#0rKY2-?VOJDnD*VABrs1z=VL58Wbkkh>_>-fZdLWOO5<+)2
z%>J-ebe;L82S*piHpder{x>LrY}W_p<UP@_8CGp*988<eQ)(iXr~SD;$Exd8h33jE
zw{G#lrcuXucqKg-O?>IgRe)s{k|wgxiVfx5y`&x2UXT+KOLk?E&J0;f+mL-zZ?qFJ
zV93uYo!{{q0YxJYp!+s&9`*C$&UF{IgbF|FfOcDA7BVc0xOh!au32yPQ?N*PuE2<v
z`;`qhd(Ii=O%K=yC=p0e$|;nePBA_XXCw+LxGgXoFntw3ddYU-JIDIVluRKNUIB_S
zg_~y{dkUL;^NM)CkRNoEL?^-w_P1XCL8V(b*+jG2MiXJojPI{t)lSct@sA5C5rTQi
z(ci{1d0fE2qsm7$=F5C3cLT3Ry<O-wWqcQlQ-}Tc?W6-9Ul99&I|3Z6b6_6!>BGf;
zrHQA!EcRZ6BWXvzFC+aD`W?_BI<?LW%)N)viN;Wo+We}y`6u*vafYC3{S?xuFxTsn
z+0B}#_d{9UgNYm-GoW2k)xwqzY)jXGQTfUNbANL`i;$k@c4Teh5w+d+nrp@EdptOy
zgnPusfW@4XH?PGn51Ak^R44p{C$p|xbm*}!|D#$(3rn~Y@Nf`W`z-psZA^I7_F_x=
zLNkOO&;btbzP_G3hgcd4%dh?2eQvy1q-kMAU+|aDncsh~tAu2(7WYZauAn3>(%=Vm
z&J1TVc@#Tt#oTkH<muc^z3{@JydCfI^mlwD3t++C&Dc?FF#UCquzeFJNl8g{@O($M
z?eUp_&K?Hh0Nm-+#fTg9hlShy^LFT~MT8G7pPpVtT}URVqGjm*-F9K0nN05n;Cs76
zP@^qJuX#b;XfNVmL^Yf3DtX5xs#nl*C|!5vh8HuKgb7gS&<VNZf8mN5c&qylI2|5l
z?{U3*)<C2eT`o_+nkQSj21a;8&g_<Rar2a_ql^P<$hcR&rkutfrB5xaSg~XUVNv%7
z0kh{nf~2sp@_T>F&ef(<->k=GEtyRfKPDjEH(0K?kK^MRuVz?zDvLOy6glpmZ&4DF
z#juOhSA^eD-XuF(tardtY|=evSx{N}fUEM^*`1yeab<}#N$rDtd&>)0c>tC*R)QB*
z7ImyAbE|^wZZmT;Nq}e^6g_(QD}6s+-&DdxD?r6`_eD5?^R8=xu!WveTu`>hbRc@z
z7jSsge{PNhL!Zk4&(VkFl(s02f8;Jdi8Mtl9B`=M8%MbsG$Hz@-;^3m7XMzGj?n9V
z5$6Smk!Yi%nSvQRolRVj@91M$BcZ?BZsV|&;O#-+${kaWyVQB>5z1S{1}&|>1BHwp
zw|iN|eFA%Xr3?dC<yWSFLH6DvCMo%rY4;!zS^Xu|`2fhawrxUR9=><z)Rj{8xNbJ^
zwIkP6=C6s%gaP-DFKDc4iD{W!y2(gkTFDwgS7v)y3B!lwC?{JGNubJbmMap31dE8g
zHlR~ZMi&rc<~^#ECYo5b41i1<sRsC(6UAC6v6m3(Z*bDEU`wa7N&s9ZWE)cs$0;Oe
zMWlhVSmYd-k)|!#)QiKd!qT38EjX<Hh!KeoD>U;PmdHrlK1UQ}N}ag_=HzvvINSqG
z5aKl5>h4n(@OQ;TWm3fA^8{&m_Th(NpP3JF2pbE0r{3^;Um4nX%VrD@qS8qxgUHPd
zdeKjzDoT{#+N4o{CA}#KhQNR$UK{hhef#!<nbFawgUD45)xFWsRPJr&*rl&Tlxsl;
zKu_7#S#;372}HF_A8eILI10;$E^Y0Iom6FctN4p&EiC8@4t~UTo8#bsD0*9@Du~O}
zkGw){H%t9>QS_U(=+!6#LuF(-zQ<k~bB-u=4o&0hv7pU76Yc7q1-U;{NE<;OQOA%!
zCXv2;@aqHmQSZWe!hqbnC_zvw_`1SW@#lp_paN%)&_Og$%Iufeuz?KiBG%eo)GX<F
z+P$z>*L~v&<g*!%=C5)=D1`9{79**zfbeUKw(Ch0IK~+Y9DE9eOJ^(?V!6L^vub6U
zN-kUt+;?$I_?I+muNAN+C5+@gbMTp^JI$Nr@x?>QXdCTt?1i4473>Y9T*Iu6j7n;U
zl(DkD06p|_oHSgUsF|Gm<S7S{h*4W`(unw|_1ZwK%dnPM>@!Tr2lOFB1R`P2uCM<r
zOTx3Cp#`sZemz%6=$t*9K4*I&jhX_{=NtAzfv7AxNW>IBmHE<w4Gq?Kwk1q&1+t@X
zl8u7)j}e`+N=jG(Kt9HJpTwrUTUC<%q(0ut_)PmR-+pZa^9;qn36>Tc|0h(289vP#
z%rXHgEE%3N!LF|&{b#=6SWp|k(9<E*drm3Nlg7<yTJ;o5fr-*hDNa^6DR--glOUVI
zs>37b;_0JFmUd3F*j8I~?^e<|{N}+%`f$1F71JS?6?8`^#r3E>BWocg=*Y*-O;S8v
zpUxPWd?vAZ&hAh7s}S^xd7695ms&Jud<WP~qXiaII{0F<hQB`Y05bbp89IX(vxPGa
z0A&PXt1<`vFQhH7=zrVU6d|b3qJ{nf_ERsCl-mtXa6@8M>bG@LwftW9VE+s#>9Aso
zV2Bwt`Tk69B^_V&OiSg!DA1hj=#9%@PTPZSuUR$U=oI&80lb;4UjEcB3L|2UebK1w
zBztEjQ_qF9Ye9H8@<1KU^aT6GA5V5?L2fR}FolAWZI<xART#ByZ;ub#y|V{rZ|9Y0
z9e_8&GM~KEsBbZ5oBM~KnMth7IP}T-|A5t{9-<DT!p7nM0a@6JMQD!+njV&%Sdk^=
zVgRI2^kjjIS3*}dM&0jkF(+q8T9sWM1s7=cn+8K+u1H#;6Gd%f0}&0-A)f#lH<Q5*
z5g#UEAoRg3511iT<qkwk2j82w$^DUCC^^dg1fuv;o)z7#0voHsj28i>%Q}_|wlc2c
z{^6TnV=SK$HMv#vRP{OXu1jWZM1X)CmnX)eR;vJQzEUG{&(%vZP6SiIyeA(J0K<U)
z`b}R5kbQ3F&hXw5Aq*;;UVbX3FMB@f=@1Z|j@dr2eN;LP?}z@>ZJ*QUN#|OL>Ti?!
zb!Lmxw6&X)QHbv?Q@5}Vr<B)#VM~Dk14%g&xD=Jj?p59bPIpw$vTDIm%A`gH*FY5a
z6W|4B@w4I@-6P7@Y{|ueBAQmxPFcNLvAjNNXKTgA=&e8!cjWCSQQ%JX->WeqCc;%F
z{Gn6vtd<rZO4<3nf_TI}f&z!pCrbS|V)(X>vOdSum?7Q61cOFgQWJHbPtZ|P?bfvA
za^zs7Y;Fcx{tmZE%GU7nL~Vh)Y=ynK9^pv)=_plmPn!RA-@wxc`Pp9zS%@|!lI<el
zyA`4+xEDsA@CN+x5c}YVMJXT#$Xe!SZ1&I$Pn$8qR#tz%*?Mb<>YE9ojlYWnrVHJA
zqQ8moE57}7dLZ{_Htj;Q=A3$YqI*`%Ov2H2m5l%<BV6oG8so~V+kPpg!{%E>&|QMR
z_0UYo;pjR%5j)2XxL_Gs=2oH1?tI`t=icVmNBM#hN`}Xp`M^WoyKX}r75lHXGOoP$
zzSYHJ#C)(tTd&&a+u%cn7!Ch`GJ}83j#zh+apv`vjRUawg_khez*5~zY_CNlV|77d
z*ztY^Jsn}18lcIuUI`5~>r8`xs7l#f(myR<K>h$Hn(n7Li+;P{ZYS#E`2LS{4Q<da
z^;~bLskH8U^5`5OJa;(QAql!~&MG1Ab$Ei%MZIeCuh}f47tM2q5zDN;7YrOY0&gR;
zPC`rXNOo&?0JggZ81Tr>RF$30mPn|%N8S9_TC3Jd--__P^5p(K*T>Nr<i^O8xANXC
zxi9?pNjfl4bFViD!JxQfMUKH;kpZfR`WDVbGFa3t&wseQsNRl3)|6RpRD8-TzKh#n
zD5RMIG1G$0cITay(RvoXpC3rPMqeM&oIQJko`!edw}Yl^f8ruqXxHgJ&?a>i{w;z$
zBe?+&i^-z+eVeWif+}7F*Y!fDSABbqHvq!t-J`_;Yb84Ew|Jxf6X2VQxn9UeX3@gx
z(Dv>cNKMyToYVJcN$5~>y@Kz=0-kU492i3gH40PC6B(13PREbi)lOHrp%1pWEYD@>
z4}ZEnaru+R*wbKLzEOcB1!<273A!t-4E>Rd_n&P^Gs@59IroPe2nJAScGSMtSya=R
zHaThFedzaK?CPG4k|A}6#PJ$!^{@jUyNb_0X8#+vQavpv$2-AcAa>t9K<~8k)=ejb
zO$3jlabl&o|IZI;Zusl7oAaH<R=^y#Q>>=c-QYg)gs#jP=j=`jSxO#_pGV!LD|gam
zwDT7(Daz~j=2@t3eg_8~*@5aD>^4fR(b368X>yGQWUu2dYkM~DoYfv(v?y)i@$<qI
zaaz2b$WV{5{Gl5=R*dSKx*biL4$!%F?x@)(R5x!Qzi($9J)AS35>8G5cT-By9GR&r
zAd;?1P0N(0kxoAjn<ZTHwl}?7o<-g{_LjPIi<U9Mp&|po3ogpWuyw$WC>N$UJ^mId
z258>@b0L_<Z5JK=`2nL;`swKphBXf<_%R|fNk&^&A4+=5T!{+2=N2Jgta<jCLnO0F
z=4Fq>4uM}%&`{Uu09bPoM_-%(a1)HE64pkJeixrPL%E)#bmlp=hGzJtQrz|9#a&~}
zpD>#_em-G_h~{A+VY`U!CY}i$^xhKMTs87Z)%1-Z3>iHICV;BG=-L3E<A;J|ta}%h
zh_Wr(X7fQu6TNHEi{5}Y1EF=9R|P*Mf~m^9V33(oE<#A_qWF3?Z6+D**Y`@chv5L6
zaA!J$`94$><Wg&1`nZBXXyeKo%Qq{2*Zl)dABAo;aW;w&f4@;*P8X85P^Ln~Zks(<
zdwPE0jxfBVb9)OJ`391trXjSl6Y^BN(FpFTV>xH%*_i$QdfEU=Xwrg-)_`8Q#RQWX
z8q8EmsC3mVtbtcZ+uQhSpigB>w&S)13y7k3gUe8v*-v<HxL0&TbdO&|f4iRteM2xM
z3e52$2^%p{Vqe={ZHzFw(F!ea<cU|Q`^*Bimb22{@^2#o+<AxXzFfW_S9o!e!g(4a
zKUG%}LwPpryWSSuF}BZT<^ef>Q~drAZ5X;)({S;A+K)HN%+4vA#H$35iY)k>u;(eS
ze*Anr=UO>tYxwQu1RTbscE6X_o?!j9wa|<BCbfsgOu>RZgkiJ2gkO!FP1_j9dy?*+
zw+dxrHzCnkpv!)9<Za~mUTo)eezULU0#!1u20hCmyF>plEa4ATd@`>l#h5AveH79O
zJ3aDw`xC*g1c!D$`R7DAa!`S#t%sK?$49h9MISHU*T#>%m-?%btg92*6UBdLFYB+y
zjkdo##lD9V)s4CH*0J-0oOjL}vI$#+O2cawd8maPE7f;$j2j$FgX9C7p($~o%Iebo
zm-XwjtdFaluALt+Q@s6KR#L(^FmlI&04@T?{)s6QDZh`mEB+?-O7E}5&%KM+Kio?z
zbltmlXvJv>3u*gyF2M?OP1-6wy(kG;cz(#(e&}o1*^{{CRka^xU$s^g@8`2W(GL93
znepwNlK2LX_0sL%N$WRv{O(>7-8Aobx@OEoD}S)ot*3b?wj&7cYr0RqwAZp6iL&mI
z?rD3>hS0H7mZRq{KJX9&-j)o4HbB1Gsd2Y=6`qQ^E4N!`a+IrO#s0AW7JeYB#2v=?
z-o7vBJcKjs+6d`9R=%xp()+U^VR`$|JA_*g`S8?tg}35=PR&0mY-y{1l9rE|#WiEM
zyLoW8ZPwyYT`#hJ>REnhOYFULf7nRv+m~BXUa&sYMT7BtpIdF5%F;+MQ+oBCk6nqc
z?vANgQE%CDASZNa)v{DcGU})9&pa%8xJJ)BYP&M-+joiGa7w!^xPUFM>lGJH>r>qq
zyFG99{G-3WK6PPaL0>4jvO9#fCdRNwW!>qyHL<G61wwsI>*&0L;4<?#EcNWH@mU+l
zkL=s}ny2;o{pFj}f>eyd?(dWzKNrE;Gkm6J%9oB71@fHzwBE0YperX#wQ#l_`=k(B
zGLR&Fn%8i<8?tW<s}|1|+^Cp}mPGe-u6=L!&2~F)X3QF%6`i&rr%oF*g)nDYLL0&M
z+E=0?nUy6`#A15n-;91Snfg-`v-tf{W0veZ`s@Y-(LsfY(QM<qT|Xk@%<<h8VV_yM
z?WVF)(gT#2T%vx-AQa6Pf$NZZ3U*cbRtnNM<9Vmtt|>AC|F!n*l#kR~heYJd0#0sS
z+aVL0X*45~RW_K(-b&fJTVuU<(0r^Rr*{7<;GCK(!c<tJmulTw=$FbV_sC)V#W9W4
zycpG8HHh3zL0I-B?2;MyWjXb2Ci<5o$r~%9%BXlMM4zEc<e;88rPG;e#fp^U>wynN
zR1FNvE9IJ#UxrM!^`Gvw9^LNv{jYILLp_fu=bPxfX|CPb2hxq@PB|S7h6y~v{8p~%
ztTfUw&ysDZ#n_p1^92NSz~$f-%7h4L6yqzS<@FoCGF$<eKq6lCL4KuJc3_?S<7S*&
zF=m4Dm_nqDXn!Wwb5-rsR?TZD{(PFL6e4C5VdT`BFYJ!^$O5+)(?A99_P*Rsw)U+x
z*@(*u`UR8!F}x+<Yik^jj!hBgxzGU=+D=hMM;w@-I#W+Vil>bsZiINMh;k;j8osJn
zB&XT!IG_GP2{DyHX=~T)&9UFGSWqf*XHxFj+ScCQeW704uf;YnXP4RucV{4wVq=+1
z9t~NnrqAp&`tla>6a(q}OD2c5RKLBCkk;C6fx-gOBe$f^C<Po&GP)^x!YYkn_i!xF
z!L4a{+G1i?$FfGR?{PHh7kpBtn&xRQ+{=*vSR^)(|JFaw#aPSkJ)H0@t+AZ8WPkV9
z8TNB>{urt@cY6X;^&@NmmFsc<^>6|dSErxudtKUWJV4?j-Fk1miK`qId7(Jx;iJCl
z?2P0a(ubZ;(k`^@E`M^X`vtRQyH+FfEMqTJ_tA-3Me1F2Mn>I>%$vXew2Cc(!I?%*
zy2yk~g@#|Jyy;G*!rIB`OFOQbzo!fRwz_?#6InGB+NQ)=Bmr0aw)FI9&}VH`8Jm)|
zyC22*C{4pQCi<{>qmCS@jgO}1vfa2$Gu4R!ro*2{N;U?Jf17kNR5Umnkz&tv+GQUu
zsoZS)D5pt&8QxGeTbR2;BefH&d}l&Kc3Ac8n?CZ}5|#gl5aAd;cXgh5dVD$<@~k`)
z7#2$f<sfk!tqJw~)Zea<4i_^0+hYfNl%?p8syda%ABaWv+293-i~ex)y85+D!+_*g
z90J;)Ua_FhSNAsmj=P)L-<vS$DOmYtiII18<d=&B9Ukd{r6jZ`4a|lP7Fg%@E4xmJ
zUCg5}Wf9Rw`0vr*^E2mb%97>8^NjVEE58u>7!_dT0eCXgRo7kn;*5ubmPw6%>+TRn
zP(>9S$JY924<#JGGNmFR77cO9oCPT!1`-Aka0hmpH0^*2FyDAPT+jqo>0@)C>A<qi
zALzZ_>qf61t;q?iY918_h4wBL-t&EU#>(_0CFQEWAFf=qTnt>F*b_1oR+=->xiKH-
zA7j9N^Jcg2zDJJh-;{<gZ*9}rKrRu(V%C=$*w1Hd-yLQgDhYm~IR>A(hYzo{&TD3l
zjRV|q+LR`0Bj!cm)MJ|&^ArtaExdDC*Wc3ivn`$P%It;5^lL=%?%CqXrJn+?m~CJ5
zvmy*-(<|(vdojJzQ`Ogwt2U-&uN1KuCI^x6omB7(vHsMzwgGQaX}%O^bEt#6=(f!L
z%}1x=QlSmY4+k7ax8NPX7F7*!>SgJ1Tkh$;#FACPg8!Z^5<;td(YMn#h!^<u?WtQ;
z<$fY+0~}Z`UbAnrbIe2+<KAmHLQgeIuF~42Yetx!5d;T>=6_?q#H+?YE-$P0b{4U%
zDZG*<cAz-OIhg$<?JXpoLWwDV^Lom2>9lgh3sIN_fgFiCu{YZ|P7?ZCVbzh@8Tx~$
zN!t2TB5K#j`CHAm9p$Iqg5)iteV5i9g*bOhXZ2?!>O(cGDJF=e&aJYZuW07Pn4><`
zbUwlmt3}uY>1xx^i)`na#3f;F!~ittaK|iMJ$*S)K+s(Lylok63hx9cP72RTg%tSD
z5NEl#n{`5T;&_kCZb&{=;9rrb?UcmK^0;Uo*k71y#%4~y;}!4Zy%TZ^><EJpc@`Y5
zm>2LnL}fb~f*&F}VKnIWl0Lt1$y<FXFUw1H%`g-$rSS5x?|8mij$YnS4>lc#mp9ek
z(9Gx<h6)xw2*1Z*S3EPMW5qR(Pnk0|akiB|8L4o29++6rJC(9oXuI&0cyW4AmRF#H
z3z#+zz*9i>r&$e3q4`FWBfJ61*Ws5!#0-I$EG^HMSGoQQ+-OL^urG#!A&(k^N!Oo#
zHs&!Zu_-mqVL947rGORI=Bk6amRU=TYzDCvhmmI99mKp3YH)bqDXtv{mZk2ERZp6*
zK2vKLAlALwn9jBaZ5oyC?;b5XyFb7T5xy7RiJl}XDCX8VhaQqXxqjOGP=4OZ6(_wZ
zc&ElS@G9iDmcKlK9Alvrag4Y7P@SEuig92T9NvAOCnBr<W@<iRa-e*GYx=>T@wL(I
zHGQs&@07k9Iq3)LGpB4=gorE|o(UGW6lXOwYi6$1K2-!+mBqO6UR9u{u<}-|9u}n;
zY2U9}pB_Y~4fx%2rALqBQi5T6poVLae{xtL60h(&wF14=&AzmK$!7hzJ$6T>?%k?A
zbB^BXwqDYj)wH9N9H%#XM2Un>Ba%EDypl4C&&y8o!S0{X2$?1>7aCyyjh%FPCP|3;
zY@>nQ1;;6U$*`4^KTcyoZh8?Nw59w?mBM{bjj+?B*D*t0{Y{!rhLneO7O`{jE84GH
z94$;NX5LEH<QO*G$N(v2qmTc&XQLUY^@}Lmk4owUmT6G%n6xrEjV&$pU?y)~M{&G#
z#7Fmv^lnv9&~!H?h~%Q`|K6Z%%y<w7zPl_t&dE1jVXUdF4X!XMWAv0%+MzMw_DLlf
zfRT9YZb1bI+Q10ok7pf*p=nMz(ozZ~A|*7n{k#3qDDfDRU$C(PuD-|gbF*G))qqSI
z4y*;HjTI2&`w`~;le)KEWV=7BXli&48`#5p&*p(MO3I_p%<SjhxHbc{^3ofdcIB%Z
z*DFPgjSSZfWKk{pgpNyUhUjRQ;{d&C0NZVRPubE%XR%mIZrLw~o)YDhJ`)&xu)UD{
zu!En|!xR8yAZK_%VWfYkv`7WFU@Zwd8(cA=e)NOz$4KY28!WxhAi5L8xjM7nV#r$}
zgN`Dq+>8Mim@OsD9&P5j{)J>nI(gQvnRoRQ5wjLMq`IWfI~adhqI&v64fCeusdMU7
z+d_lMlFf8ojyUuo*jtDUT5k~vV=$lG2fltPgN`)b>u(bcz1Xx)qP5RmbFG?sDy<g|
zhBK2&d4`OQBOqHv?2co`9FLG-nXu3|)b7!~7h>7yI_w`I_@r{jv20JW&U;@5<t0oH
ztSM+$^krnFM4uQr8vL$ETWv6)rMOipG+*E34#l_-Y_tc8wD>KeoPfIC#??m4r%P*A
zFG;3$vsoQ~WK|`RqBG@R$s%TFdX{2jAXodQ&-6e6Tblf7P?6qP?Z7=%*QUuIapA-_
zn~h8d`%TF}VTj?whW#|mvTn9)lRIZm=YHC&h^DG9Y&O~~90BNKj9N)0ntHEI|1`Wf
zH3{Js<}dneq2OPrNbi3Dy5dSP8cHVYMI9_0zJo#2hG&SVTU{}X^0)jwVqoTZU2P&D
zcAhS(<nvf@WI1fs3i_D!10Qv!1DSQSu-Rw9bRUY`f{q9bXhn;QaI4y!tAEX*$xS!{
zwbiJ;xzJ_USowKgt{6-0Fq^w}`^s-9jLIV)<e9!SbMOJ=-j(1$0?H$({Dcrk4Lt*L
zwLHQ)W2*6$o~EPHPnlsI!V<{+&*(i~%tjnGFU2mHE!*A2XvMRO_3K<nPXJ{qII!Wp
zh`ea-1s`70KSffza*=!h{hEh*)%#A8MCX39?|$As2yAmo7LH}wKXzpf60tM`pqBL+
zl-6Cfmn-My>dCGggy+}(r;LGNhGeCjNwL!FjLjmL1l!M6m`;3DZ)HLzTwoY^B9%X5
z{*ct4MqRMn$OdwZheC(&!}I#g|I|7e^lCr&WLC#&EE}=8FswFqV|;b4jp<vk<&!#k
zIH(zT4$Y{o(}Iqbaj&Y_aUmc6EYp!K+u(hcI`XV7K=%5nCOPt{_F(N3HQ>*q=Kc+g
zB#d<7vXaI7XNSLY`2_q46tv5<O-V-9{5%!`$AE^C$-yMuH7lKkPtWXP!Xwav(441J
zBFa+&;`(tV7-^CWWLR$BIUa^2Z$!zabghWGqkDUXowx<6<UEoXq>p2Tcn<mn>2gqb
zTTpzaFNIPpeW~z#o!axC^ILK=HCPv3d$xr)uDb{J?6&T%#X`90^(=i(xOGPl)yaLx
zeE?755w5J5kXQX)c??v>?BmnUhn`4+`$lu?B$(a|)p>Neuj@%4oof?ow-I)Kw_@J;
zVV_DEt;LGjyw6i>oa`ERa{HOwr>4lg|9~@oCj$Eu-{P5GfsVJd^2%~-rm4^<ohCg6
z)*OEAL*#?v7PhLgu4UB{F>nNp6q629V)on6B3%2_T2hPXHqpxlbgbkJ&Op)}oT?=_
zO3y1~wuad!aZDM1z57vV+Tee}2+!k}nxW4v2SR_0{M{*HMHxF^5P{Hl8LzaybxVm;
zZm;e^Lg=GON?gp|g4kZapo-tQeMG~{>fxfX%~C{#7Oe5CovT>e$kB<QjiYv}<=e<e
z+Sga{aUV?}4*Ow+F27!Y<@V4jO|Ux~{uz3AYRKlMHk~_SacuZPqQOrE%C?cRz>Etx
zZHMbDnz}#xk>VxJbr;&aQ^ai4%<Twp+$?WwFV$4b*T3<)7c*=X?rI<IQ<DBh#b2__
z(qM1XiPgK<-pW|>K@lt$F*M6IwKf))TQktbBKdqNpU{%9AEDP%F>}FVv4cRt>+`6}
z*VJQlNch5!?{yZLh)sWVl$XOszG47=^{;KYVYW~+Qm|_{t!Sr+lkKo%s*xD}wY9(P
zYNka95N0Q1#<kkJ%%a`=kT0$qLW=>@=%(uPj`bi>Ic+GT5MYs{Y~^mISGd}75stO&
z{yAp^2?A!<PelGO-6#}}Wtm;43dDqb6zC9-VFkDT)h4IsKk&tX9A@mYeVRA`$}J&=
z?NT9VjtgJ-Tib1y7OY;Z*qqT@6RXxSkoFS47^xC<7Rb&Mo`0-o?eK66dsNzu|2~%g
zqH$gXpr>svSs}DP2@}Ymz5^P+5ekxWk%2yT7qm>5_D5Y;+}fg-#!sY5_!U?7M6^CL
zm;C#h!+;}XIM5{QpX|gJuDtDv;hz7pn73Tz#nK_&I=)ICUK=ClRlgCDhf#&yMETWC
z+kX@-t&Eh<-PrYK37ri-x`us;%L<^CMGc4D`O!=<)Qu-{KkOJFOjj#4M$&(kh~Hf%
z49}%~codNdi5?Np2kvW0a$%Ww2AMrt>nvRe*5<~l<iiuS{X8~d9+ayWI4^J^N`6>f
z_zcQr%`%+CgI#k(REPHkK3AX165oYs+qtKfnKPR8hKSM|M;}`%x+9;Qs$x}A34t$w
zkiahB#lp|(D|P;z23bvfQ>B3Rixx=M!WL@@M8gxA0_jzokV=Ub!VcR~A~Z+)zGP)v
zRl&q8K~@|~W+=b*aa6VC+vkVx%YTc+`@&B`uVSYJQar*=1a-cUbSlc3N$+Dpa9&Fs
zpoBQzjAqoBdH$HsBhuQ8&j%F4Co%9v{B~z0?Ws3vGb4tl4Y*`rH$%l>fGrR=tmrgz
zt4wENOYOar%=Co(8M+7{P#F)gdZoFF8?}PG)7zGmMcbxr4$3R>w2Q+T%%T$&Vk{&j
z)>XEJm9;^v#)|Uu^B{z+8?Vo;T<HZqi-iuIxa%G0(5s@VC)doKg}4Q9{y`P9c9omm
zX4%lVP7&<?+8yO$`6HgXA-$5{tFasEmmAG#86bE>Rz1B7z6Jvq<Ii;}j+YAz{L<dB
z|B+#`!F4!uTSm4Y`({c=eKT5YRh9$@)?(tkgA{ZRqjABZI9F+)RT{;*mIgA%q}R$M
z_v{0^@L9%(9!9CXC+pNGUtHhfp4E*907><0F<5D>Q;#@S))&&9hO<@wRsMdj-HhNS
z#f9Yxxp!wO&FN)^stg}@@ZBxi_ri+um;B28Kqz$n7_Tq%TXJ4La+R%=;&7*pO|l8h
zY8=ZVSU)?bPLbFT?w2uRX<g-H_lwP7K<=}$&26u1B}$<DV?^q2l_{41R}Gx{d|S`V
z#~~`uMBj3-hiW;0^-YiZYu88+^RL8XAp^{ORcUf2jw8P%x!c{!#dNc6RoFk{4ZQ*a
zowjKd@L+hjF(3a+IeTG@h)U+2cz|+ULGM)Fxu2NL!5MVhVD*|&Q)}D=5i?mtNDK72
z8E8B(7YL$mLujQyWN1{U$;0#b@V~p}ds)Rs4Vwm|IL9)B;S3BAi0MebC|!2V?zr&C
zc}DW@gSY{bsj{MDIE8-r{l|N~zn+Eb(2j$en73E>FIW1EIQ5WJH#K?7|GM#1)N~h4
zB-||cFe5&CBI06U^SgVl+C92y9H)g9OVr&Sv~~(!^-wrZ*nZc&V0cb^$S&Q|+)J?5
z|4XHCr`+(5*^>tyf9jRrBuWbH8^~H(-}>}IFh%QVkZS$uzLf7>8vdLRXC_*Ds$6fV
zgl{-YZUfyt6mBndNApfRJnD?I*JPn^t8%tJeGArDZsvMZ9xQyj{<YBhRW{xWiez7D
z@JE2Vu!bw5`uf}2k?_iZB9@dEC0tV$^)(bs*(PPqHGKHg5U~utC#&Ua`QBNbfh`nn
z_$p1916na1_`OJhB>%5i_D(BJun%mjikVCZ0I4S3DOWG9)o#p6TknBZ0KPltz;vV5
zuk^R0>6wcvn)jFXK11YK+#sGh4J756VlPK4wp}3%Bs}sGis#v<Coh7<?}LNVkuM&&
zR<AO4H1a_aM>m=_M^u=OP8&<Dowv(j=6+B7B8f$@=xe(&8X^|4`dmWhnVMwe=@cvG
zz}h>9DcHddEfQ?bn&p|K#OMY$7^^6%{AkpcVYmTE=}s`#cb_MBo25K!8lq)v7jXns
zIzrN<(LaU&YV|d(*eCWEd;Me>S)Y{2XT%9vLp(^r+TO9u)FZ{I=uSxDuyh01@HLK_
zCUc!?W&HyYi8?#DiJR8`&VVBRz`hHX%lpm!n^A|IhW{<%)*NBxP0THcu45(i9_xJ|
zs{ZVGcC~D!m|QVCMtJe&#HE9djM48H_SZZd>+&-zERST-cgyf_c;wDNfiAS;QvmMP
z)XS{KAoD=BPBa?9c>Z!>#eeK#oAAoK9g;f~IEFd>Ip1h?gX>}JwjQI+{h2Q82|LO!
z@L>rWrlS&aNdYp{@4jI)-)>8;BX4VOt~kH1EY}}sSc^*u7|?9I+^u<X>F3W6e`Rk@
z^(D`#bm8MfKo_Y!`!fGk1LoysaUpz~GoU$k4f5-39Qi4sWlH3WR{H+1mL+__nYDbb
zso=p&i)yKps}~1g7B^pa<8PY{d)(t!F|PeLHje5N7PUQy&-BqaUEDw4IMFG;`f)At
zk^=ASLp<p1Sm8g;XX`ar3iuDWp9fE+B0)u2P)$}V;cxEDk71-zk*&nA`7BA3QSKLZ
zeSuP1G(BS~=~M(UwqW~+C(lxHYt+8CqH?0&Pn>PC60t(AqP*6^8<cMhJsa@gX3$`t
zETc7@l8R#ln2jgyJ1cQCOQIN`AtRUe(?HXE(Cc?^LL?n;v<}J^-5MlvJGQtgOK#LG
zT>o?eJ+o<nBDzvPyfVL&a66ZlLKfBHsoa;Oim|;ZNIVJII47Ts(+W_XYGlrgI{WK|
zfoguKaN&SS!nPPGs_uGM;(N&>!EbL*@mSRctWP^>$zoxHb#~1172)x$?Jw5$q=S#n
zFy<P&4_hui`uX;W1BGv0yHsIzY}aq(;=HtPrNRKeGL<Wc{P&-Y_Frquho!z6T-L(g
zETxVBr*wZOa=Sy!da_;VJ^Exwu5{qB5AVGn`&BsP>0M$6V)nZZX0+t^$N$7Bkqakz
zLYk?RN)M5lXKIAYDoJknQe3ZUVi4Fxwly1b$Ge?Fu=2{|e~!RQ>z&~}xx$sphs=u&
z6t4A@ti8q#cJa73ayviq9-_uhLv99e5x$`rCFR?b)a8OheB`iL!_#QmdT^&spm4L$
zrGJj40?)m#!$sG56S8+CWy8<z1dR9CZFoI5IgMCp-eC%jKc6ORJc~UJ^m*?duaH<I
zb8l|(n}i+TvUA0-gGft;wd^aE1fA}YqotRB#QTexO30$BNBbq*)iNrIhOtD=%{3~`
z7JaLen-f<amcg%0Ag8n9|G%EXXLQzV>iHegT>Z#owo8bO`Kb<oJG57ts3$+-&cS9A
zSQR)GsJxQTq_l6HG%Oxw#bhKQS9_3xr;26sv;Fux%ilChfnYvKObcrT!k`U2fy$$!
ziqt2QrVMGY@&g7nEZ@N<dfZs253<OSt@%|oc=;1M@}qszWv%t2Mfb_t)FuGmhz5ZX
z%0cJ$@mnI6Hl_j)HyOuV*;)w;B~9ddVYSbU5yL5z1GXmcoO;hZ@=_A#N<lcQ3n328
z{8!Gi+rj&&L0ki^1DZ%-X^RebTXsuckk!9L4_Wx;k|wn<+O=cOUKR3DA6oQIPZ^vV
zq3DG~C%D{1OK!e8dp}?9!4*l=vT%rX7Ug}@%aXTDoQdx76S!cGm$2L;FZ>@n(GWzp
zoQ{YnLcTijZnE9`xo_BxQ<R7$rvr9|`bwDbm(gt(odoGphc?#FpX9^={vcj~qX}(V
z``)M$N;p&E(uew1qHNVR+K*Rj^J|_jZ7r879%}vI3Jjrldw9uGWoFoWR)+NwGKKpF
z8L(_@Q=gffRvC;byM$&*nhx6D>OgcW4}%#xQYcro_X_z=Oan)S3mW!$^gE}&q=?Ei
zal8}CTo{Qr-YdYFym^!S6+6I<Ps@(j2-S_LbCC+t{U^b-tLmb-`#SkJw21TR=bi$^
z8>xK-h7aiJkewHJC(D3GCU1jg`MFJdmX;%Gj~45Cb-Hx@LNIft+FVh$&2DMuW`Eng
z%K@)@%{55Q=+z0kUq<x%dktFgCMwTL?IjO<Sp1k<Pr^(*`rP1`i5xB54y|w$V%NHp
zb3HowN~tN6Je^Ua1C9zW-FcYh_b6e!PCm5rj}HDM%1NI!q&Ro#Q(BV<DO5g;h(Gv(
zd>VYyzEN>nRWVS&wN^*T(t!Nnz`n44$~5rnv=GAbT@em3q`FmlV{&Zl#xHAOixMVb
z`9P&&=`wH<id9rGwdW%BSgd6SZT#p3Pi8Ti<<07aW_?4YA{;V0<$v1YqieQt#e8oM
zxb6nT?llS?c5Ugz#HP7u+V>RYxgGCIYLU<JqLEw&?wiT__J<~us37tRy9|uH!6TM>
zBh`ts`e!iQd!kvI6q)U42BC{jWs2m*>vvKkTOSNN)dvLMVl|%QO`#M)sUn1EeW82q
zKAs`MCHOT-9hE@H*01_F`eQC1?q&L_{jDaELq_=}uD^zgE)Rl@VBs35^dk3k9ZPUS
zDtkGg_psOcv8kk>WD2cDlxXYfU6Ls?b@oY87Gj~fCHzqITkcn#uKrUk8#jI2cpg4{
zu{1JS>Rs$GATt%Yke)Fj-RP9h`FPyJ<SmDYfp=p{9bHgfXMGLJHD9lx{#|M=-aJLn
zt#kjhge82)SV;>cIvxJ|k9XdLV<@zUjWu*(#ZgH8y3~qPTg0)6j;Z9xQrh~ZTGWb%
zY{N<)-&0pq3`nU<dl(Gf*VQ`We@izvWZV5~NECOY#?Nl(59<&SWj9dzB@QpKk8{^M
z6sas}2%UG7nQzeP;b1j=X&Dt0XMf~hOIvE2Q)6;O+I*b#n>h;zOWV8fKp$XO_Q%E6
zsXT5tuNk@CA5I&=&`1|@2rim>2kPo&fgjhQde)!pMir%Q6mNWcxKi5ku++kUQDdRy
z@TTm>FVla~NgW93ia(YNeXf(yj9&^WYm+}^W&Xf0m?Jsm)s^!UjHhDCP|+*ZOcS&S
zTASmUyQxQWy!ys?*Y&K4FfwE`YkKsIwUeoLhVfU~R|w}y00>LjmQI1{3-f)*$ys#V
z+*sQfy`zuIktV8K^J>o!dB3-@>im9YHTV_GBBuJbwnFcIR^Nw8I*HCmj*)As&JF;R
zxBV@d;eR#Pli@-(tD*i*IHdogKsGM5CVk2j*jh_lvU6t>dAxsDdprpKgE;s{&n#fH
z8fUYS-oh@v5jgnlhZcF(!S+h6Gb|W`R-rt~_!1m+Bm?zON|A^w7#!~_XzJ{6Gwq<3
zMN~cU?Uu~BdvXW-JW!v-cQT+qlkeMdqDwOUVkMdEyrN^@fPx~PubGZ>4JiR1wb42R
z(gz~KZ>-V#x9w(?%Ig*KLCOQQDbA0jnif?p*>#dI*~jES3(Xy|XQ*@Mo4xx3vCgzO
zYUP5%`+<VrIfl$3w18g1UL@!-R_Wf5&y0C=CS6@g!+-YR@Nm>J$m4Y1Kv#5w&VPWi
zTL^Q_omF2)C#Xp4Q;TIm(+pnMh_5F5%W`Z#ran~jvmWmR&hjdK6c67mGXETxi@AzW
z;r(qQYjIsiM|11f%d6i!4fj*-PKP4=4mQ7+8kF8pbKqCiie+5P?TWK^4yI{8=nxd4
zH+(+%bq2Q?u>(YLtHw^Bg#LPbN<<{tnKPh{Udw#JCeZXx)a`p?b(gUX;Ox`G%8|KT
zOckGA6z2J2+LzNmW^z=^oh_>{_f%^w)tsEs^Q-WDN=7H!(=b<<xU!aAnAhm$SoGO*
zAvxIGY?h&Q%ADz<>X7m$JIcoP-814s_i}rV$P`URMmKtm;#&;AOJ}{77+^+v8A?Oq
zbehVqA?v5Q-EEj1A9*A$bccX&Nf46JSIb#YzUi;BSoJB8n{^~5W8ACMhiz35MLE^p
z8Zvh7Bo{?2e$T`p$woIc=li%t!__+i0NadV@cL{~_)KS>!uhgexySjgr*K2s6MiN1
zklyiq$SWL9ElH(buy4%+;8_#1bd}9=*2qh|%rq|7i6SYn>p+fVMGQ)Wt;wr%Q+gk&
zmsU*$Rr^tZkut{(e&J00Esg-yRd3FW=PiiDu2SpPok$h4og;#S1KTS|^OMkUqHAb}
zZYviZLLIB{Datit7uM=v!!nws0gl(-RZ#p_60N^|Cm@eUx_NG!F;D#W{iF{SjWYaL
z7DiEZte5O+b`3CweDeNFKeKNaptEqE>2fV0C5rNPh>*)+J)X@75C_zw&6{uhE0Gn$
z;ydWqG!Qx+GHmW(n$(}Agof1=6>%(Zn9Y^mtAM5r<(S%hX?-aKD|}k9Q+^apg7OtQ
zai3N9LJD=<TUgWQ6^yg>Rb;1=O7c^=>P+Wf>2Ljdh2o77B&4f0QBL+Nr0kPOtEL?w
zE=4lLGffu0IgA_;ECx_<H<&a<<4gHcyG_}&xyv^yy7=DhH#79^a{#{Avfe0KqNNKr
zKPj;oO;X{@CQ;QKaRqC44<4vx8U0pV4PXOk(a8Y6yQyu;E))s)Vs51${ov6`L)sBd
z5FY{v+n>-^%#LW%wcr#`Xh|h?d|^aqQQbkIxw(TnzvjTNMkA#BqHvJAm4^sZY7n8|
zBK8z$YRP8Sn)S;}fBA7qB=-|GnwW$_Qv-J4sFLp)tMag)s5fMB!Wn>^C~ATu{RO#D
za{;6mBynxQ?rU(TAFtlzuhL{=|Jk&;1CZ$TJXGoj$U_^+ziyJ4r@=~lB+~LZSVG)A
zEZMo<n0Ld(NJIvrP8IJ@d&q%LgT}@UMZU?9%y^5Z(ANiVq{|(()RL6-1<{=8=)tSM
zb-#$>DWhGP=gcxPl|PT<U=RbH7FuB^0uZm&jEwA#OTtxotY}!#(%z`M!2S)s!rPYA
ze4h_wCIT307eW+21Wdp$QoI$+PE3i52kj^JmD~)(17hZ2#mB3UEe#{x21xz6rM{U(
zuEwbH&p{@+m9#vcDiv?2SO)N*7pzyA$^0-w)sf92cEp#+zl-=`HL3+G4`yxLhJKpT
zZk_MDhQxzez<l6}gqSRr*<;cB-=|vdH%0X{)53&0#Dcdf1rzn;kh`F|eGj*rp!<!}
z<TrZA(pASdWYW(cwY~I7Qg1Ma+3R~7Ape-ImqR5->3-vrKTO^LePqQx2>K9AnoRMT
zD-7;aiI8DZ+7N3$l7_GBkN(zf%#)BF$&boGIV*K`y0QNW3*Ij4y)cK5L-M$QZJfm_
zcqV?PIO9WM?s_+iR)|;E|N0Q4C*(Rsn8h=2WSRr}aCZ_ytrotL)Jtm|nap=L>eeM6
z<h$*sP|@h6d?3&A^&~4RXdW=K)H(cG?_p2UeVp>ENF{RD-Icx`d-Mk~*OyxUDlFPT
z!a#ZY%=2F9qmyi8+;`^6PBcqewdrs5uZg;AginCf7~4b-L!9puI=zYizBWDCFrYX9
zO2PO3rfd)|W2pTj;5k*qcJ867fHQ5cmh@Jw;92lW@5=s&hC9o&@?@r|DXqrhW->r#
zg?pm#+vO{%8$&<U=LSuF*HhmrZ|_vNvW(pKwS)F*pTrZT$T&7EfTXo=mm4Sa3q$<Y
zTSmY~DUur+oruJzb?19YXus_NHc3q&F30>eA6d+-z}@%xZ<LrpFVfCBP9?NZRg|q;
z)`#0-r6hd)*c%d;Z3;Gom`82uy0t%a<|TD30_8p9cZ*?Ys-Y#r$~8I<V2H^q4FZ=&
z@Z5lI3D3OUsvvvsEH{j>KbFMR|5Pi2ihjA2`HJi67K&t94cJF#-0V+@7oFa8l2$k)
z&#Dz6r_q0-*_j*7R0<id;szE??rnH8*{aOqvKK&%ojX@(3Y`>NDr4Q^ziO<yMh#2-
zc`=si3R*yBt30htr6nwVU)N)ZSOG7TtLP8iY=MTZ_Wb3W<mf-JF#Q#z2e5B2ixXoc
z19h2df&SuQk%9`frtb2_f(E*IzC+U@4@Y}|;GSQl4G~rDwj;&dmIA<2=^+Q~-y32D
zqoi-Aqv5;*O?19D0g-POL``u)X={9`{Y#cvgqs({lwpOqwWB{wLXFI-wWuI~c3_t=
zRdRK>pQ2niZ>Q1QN>4}k>TKHfs7D@mBIB$x*$)mlfIK&&^!Y>`Q?bvua+-q%=Jt-s
zk8Qow%csEz7q?PSCZ<!3;XpF~u+NO6cte=mTNN6;q49c*WD+J{WFTaCM!HmEC?g>U
zq*#zBPx>1#A~tzfaj`@CpcJN0^@0k2EB#n6+n86KlNZYfQYDWnh4x)BR~hde#yeTX
z9{DzRgK;pLKG$`vp<iLN=wlXjnI46hNXp5ZS61qO*@nyihgCu%$+RLc8|WFh&f+B(
z-8fGJ@X0TKVFZ%c_KhLZSzx}qvvGA10RMkg*bez4?g<63%L)X<T<ZR~E%I(eJ4aH{
zlqI@@mYmyl)*LVyDH4dm{F}yQY<m7W40O0e)P5*6fg!m@l?2oM0a{T{$H7R>86Uk6
z6G?6SaF_wy8Q_L;gAgGuj)IRw(C_nFP?lNI0^`T6+j{n&l4SF%-?IwCu(tha^3x=X
zxlaIk^|~wTa;5(`e8omfWs22vc<%exV)thwI%g<6h^_M1%3XX@??G4*AlopPBMq%7
z^BL~hR|!v!bJ7?Hh58GFkwSL8;3oGSB>0UkOON@eJsWvRGEN?0f;e&cc2-&bIt;z^
z^Y6b(eBqe{(sVL_k{3Jw8p|AQgAL*v$A2<*hUDz$wOjV3Kh3<PsHqs$Tg0B-KU+zI
z2|PM;i_*5JOs?oeZ9(4x%35eD_*$J9^|~`F^B;gIqoORE$8j(u-rf{gv9U{0y}M{)
z@z&e5LN7Q9J?w17q~3c&UHN2qqpZ(t)tl&tL)yjbx63|YB*zluUIToj=7qiBHT~1|
zGOiWuv-A<+pdSg)3TNBm$<wlEB!>aQ$AXqYf|UZCrzJKuNl#d?=_?HBLa_L9>AY|^
zZO9Y|x4ARm@q|XEhd(HSeE%&EfsyYIk6aShq5`{Or5v1h5)Ab;pMclAAD=p05D8&G
zVh<}k(*j*qyqeChO1(U6X?rb{ApPV;Ct^6t&DXUI-IZ)2S^kg!zA6h<^`44%n?eeR
zERLj~Yf6%IM)3Zcb%M#=5!NAN<!QU_kd6-zJCk&xo&i_f0yVH*ua=dOhwB!GLWZm+
z{f${e7lf?7z{&rUZ2^p>{KOZb1-4b|lt+b5K>EK`nGlgt(ek5T*+`2k?ys34Z=;@q
z&dUjj_b%AM8*EJ~CUKJG1|Zn<ayB(H>^{2u<(!F#iUrI!MkV#hFs7F#=!?3}Ex;A&
za_r5NZ)Ub12<ZiXJ1|x2y~2iu<czc@gl*Kfug~)uXU|s4yW9}H!GNOwsOq2Yu5yex
zVC;{sGBpQ+iy0W<lO204L_VS-Zo~LLpzT@LXQn4oRx4z_4aQroFzR7(roi#f^`)!7
zg>XbRsH9}$R+)a8;dK!U(<1igo=sLnip6iqQpc{pbAqJLJi6IT19$)Re!?4$`@85P
z*q<Se!GH{Wq!qMoISt+`{0=uVlac7%At{YUFTzUMRu_YFI0A2Qn}VIp%1!axP3+S9
z4;VExeZG4c6B`{Y+Fs?Dql2h}KXx0tNG3}M=`^tZwPYU}tBOzxiczM7f#>yHc5ZzJ
znft2P=ljqZ;@O8Eeg<oM0b9eMFpSY=X16l=f`~c)jvU6}*5?=srdBk=zUB7dpOw~<
z+H}ANY$P<Mr(qSS`q_T!sduh64z&eevu@AKWVe0Aw6gsEWXrklih=Rf@B>^mARnmm
zte#8EWxR%JIa&Wv=s$qH-Ir4j;qxbBJS17L&Eqhy8P=cMj@*o=zKD?9;SiE(m)NzP
zzW%AOG5F)?dU@yVJyV5WKO*L)vPT7}3iPbHJL&8lu;6mU%NNG$Tj&0Lr=`c_Tlt`@
zGyHTd|GA9lbk(K(@6{7O_Fp7!Ha`C`TIjU*Vkc-F-Trs*?XyWSU3dn{1}nY-E426#
zc6~zgre5|=;)gg~wlo<B>U%UT{#3LSR}ph@Fb?JPtD=@QOE#$GE+G!s!~9}_?t4#U
zP&mXI*iu`nJ_E$1?oag&>zRFapH)q%WQJ13YJ8JW9|dJtG1}W|rIB|tGCHPBQ4t})
zh<lEP%@Bl&*aa)Q7iBP3>apJuGz!`7FnuErMVOA#w&Ofsp<f--|GoW^Y`<`&e)0H!
zfGRjLH3O{Yb52RRk}S13-0KC8Cza?a>z~EKC`Ok>*~Jn?eBVu0W(_^~5lt>!yHERD
z#P+!FwqNmu@3J8W>$aimeN()%5HdGVYQG;#)JH&k9!aVS0vVmUt-(cXN6j#aUJQsQ
zUHqbI+zI8vX>-TUyeQin#}<bU35K~J{tX`u6sDj$wd%=%G7!!;nLKl=tXiUPRo?h@
ziMx>hkEC;PXY&95_+}VdNYs{NOim@Iv^kE-sd7F>4iS>m9CMySPR*R6)C?hq2$fTm
z$ze{JLghRS3popO`uy(i_4^0xvg_V`zwg)U`FuQx;s44do5#cib;uLVNyalIS<g%>
zHQ}Z~L#pElX!rwexZtwXFfts*bvNT=g^G{jWU1*+FCDb8dK*)BnU6?}j&6P<_#4mO
znI|<b8X=shKKC7C^Na_XP$V0T;p`zVyl`#!RnE(;FcF}(Z}#%xvy=5Z>CdzD&^wI!
zo7kq>hu*k7C@{MTWohv<*b;K}bD4}X`E*UNg!)<BA50zu?P}*c>SvNo+hp;FQ=F7f
z*8hR5uV%DO!6`r?2JzYNWAxg^0CpZgVP+nbID6Ro*ZJ3uXn*OQ8A0?#11nLn?QKn2
zVn2&?Ms7cv4)_+TK_2yQ7w2I7cp3^ZMTk-td8lL+reiStP~z`$7DcO-Ycav>`ot*i
zo{oCD!0GE28O>USK+or<%@DWh61+c|k^U6&C#o{7i&Px+W{!j7A`3-E%x5hNe4PKV
zCinNR-h+}}ZJD0-?ceXN<-OiQaM5Tq0r)n#YF-fB?YNjZHqkaAW+vzBo~4TF)??RX
z3#(sA2n`LG;^_C5t>bQXNhgN@kI>aS`L$ak=q;;P%yyxe2vOsBk@`UsAJ{=sF38$F
zDjpID%iQP6a`260R_}Q&EV%IL@h47gu87fb>V&q}4;gEx_f(N#8s)v2u^qKNX2j4#
z?6Q-eR|vQAe8qs9UuJ|WfnBRDKP<X>Hm88myv50E)Qd?XDPczlG3QdgECi%5+vz3=
zPa@!Lq)7$tyR10wf~#}v%3YCW8z!{5&;hBYhD{NTB%iXAZLdKRb;8u@=rJ!x9{WF~
ziS8)N4g;HclfpkdWuixZEE_))g2Kc-dBe!Ob@E#78L(r_&c2PxqNl5@=drhz;&Ff7
z^n-UM5BUo6<C<@sCa}=6+k26u(RI}nscw@odrIx0(Vlv><DVD#d0U0eweGijs=#)<
zk?-VfV0exzM>>Z$_6#Mz7Nx>n^WM2ZiE=`az3gnN_x?{tS=Z&U--Ew7t$z;>T+ofA
zKtZm10grkH<){@pKu2Yy_-)c++u`ZrV{VppXcypciIhC5c~!q&lj1;m_~18^8Pvaf
zP>H-4gOw0ni%i(oe6w#n{O^+XokYQ-3$~2<reqWTp^QHpwLQ*cS{#}c>$DKKp}yle
z;w_c63U?6hbS9`W!~nc9;o&m%SN1X2?15=CIXwSaY^1^aNAJl9%a?j>IccLM&a-L6
z0pm#zE&Ir_!mePKt+S#b6`zD$?*Q+CIx+!Twp6p9&5TbPXUVX@$7@bP$35DO`hT|$
zd>&njbXs?^PmM_aeJ$#hgTfQDcLD6ykD}KZ#juKhHSc0yNN;uk&MqOw^#8Y1bbyu$
z%-c!2c`%UhOZcne_0)tKsA#^H9G=h4fa(w<Ygi|7)+~P1lIT$uUX-a@rrqiqPpzdm
zYc7@o!k1<tFmc07#k{{634?~{s<}2g1R6IcznYUq4=RO6KLw@9+?cLdP{l~<fuL_=
z@|Cmv$#ca0D8*%K-h{gZwA75K!|*wlNngfmos~b*V9Cp;Hg^hIGSnE5A60fYRRSt9
z2zlM=qZ0F9{JA;7(XPaZDB17S*4(KKPOi^0iP9{Tl<o4Gzu)I7^YL1)1y8kO0v&H_
z){OmnRqK~;cGbl{FixNLaN^SFTJ`j|9wuFur&$QQ{9@hiBEz2XVlkBo(<2+si5Sk&
zhb(X2#*l8dZRaop>-s975CV;-^T(}%2Q85a?y^R!e@+nelz$4}Ms6~ndFJL>Qf@G?
z6bKNGt47O9%Crm+uBHbRNvInx{rbbLoZ3gbrqWZ<;HOd>fB+5BC(tX~Z_Xe7nM+l|
zpt#`RkpOHq#jEJj&Y#a;AAZ{XZJnWrjEgcP4@Sx9o=C3#l5(QrBG{CIkceHI{EfS$
z`60tLk?cOTIhXS#79YNQ<wa`S!w4&<smc|f;)PI&RUk@*eeuy5r*o;l@5{9du82SA
zUL-Ixi1>Zt?#93C)4Fuzjsppe0-(XtuktQEH%T5vi@{c$=A;v`LWU1nh-Xdh;j9Jb
z;WW$a=8r6huq|GdBot3P88R%MwcuGQ<D2q${HC%;E?Ou^iXEp+%k4D?mW&&;ln)Rj
z0_zm+ur-@*Ap^5(bIgRyoNJ^hV2W-R9-#02S}q@tas2?pK`V~r41Gmh<9ONqnu;(e
zT6)JPQ0h%t+N#HRR-Uj9L_HQ1w3x+H<CO<?_A7bt+mxSju2}=<!X^DA$guw^yQ*{Z
zsRUBqwANQ`9lQU%NB;7bWY4drZWFOHRFFs+;N?4aA#R-We3Ja#Sd`zuQA|hurOB`7
zlQSyMunh9fLAr;+0|DJsaciQ=IP+044Adj|{PJ7Wig5#MD36?Gmj7}=7`#X#eSQkQ
zRP#Jp>M6>adF;;6HdgG?OFSE>)C&*J_NqWlhHX<{-&PuS&V1&}_+`g!(r4np9RX&J
z)P+6p{r=a+RgA*QYmdi{?2`aq_QSzDm#X?Yi65SjDcA7ynNKD{0b!yK$aq%PI*B47
zLLh#f&3&Rra$3qt#BTG808L&Ab*N2^LIlecH5{l_<{;m<nLnaS&D3rKuZdwlK(LMZ
z<h#ERgZgsWOro{bccrPggJl285Fs2KPf*JW&$f8*WB3NLMByZk1KUlfUb}UAvUMpF
zr;7iqm=)cY15)G7x~l>SXo=-ESr?ciDE>N^JHb(DuL<cP2k0DhY*)?Yx}2R5^a@j2
zqeOBCL=g8!x9V-Y%`b-GlLr;-7qnBB7t{N2d^}3OmsBmG1O5vNA&;$uZU4=MQft1K
z<o<rx%w^BbG0}z=y{r+mf2?g(m?<u!pLyp72qomKK-FyPD7zCl#nwFL%Rc<rrh8JF
zmO~4`VmRHADGdU8&evonvXp0_)ecR$qVJI4<fDawt5AHd2CSg4%QWXg+THU=^-cpR
zLBbdHgY@O$)TmD1-Ae%ziQnL9P;2yL;Gp7iR+O~B6SJ?fxj>iXUD5SP6hebfd;i~=
zsqadI!Xs>^d)?t~3$I>8BqI_88`iie@pvL0Jfpez>?hw1zCod^$3{hqo4XWa^l#i1
z`H-7#{qdhL=??_!HaCWAkV4#YNQuV^N)1z0g78T_{XU-AUV6QndivD?g8xiw%6;-;
zZG&CPa)EP9j_npLRkLf|?YtRBy94Yp1fOLxkLf#m#tXmmz5Ms7^Ab7zund$ywd#e?
zhh-8tt5~u~(;=YwExJN|hK<8a8r+)-=Y=}9rCEIZczR6uKaljSRYQE1a<_?2fk`RL
zJ*xPm!+rfeV_uK!Rl)tyk}MS#!<-Ti33ncU#aId^y1u|GH*)}={5`e_M9C@%)|B1u
zV)=^)Wy*`P`l4Nk9yoT);)DvQI>1NjVFvz`MKtH2iE&by=CbBmnfjgCf(3OeOSXy3
zcB&R|FUdVN6TIkMctJlevmc0r4i{Dw=MG(W^beJdI}4zhg~J#GbfNQi<{xnfS=Uoy
zhzEiITJg}Z%Z78I``Iqk>td{~D;)3467B&E?Y1k{{D@&rE+-yicyfy{QW{YTUMVSW
zR}!wP$9;DE%V>P73Dv>8ywK8gfAbd;2VO96MMnJw9qz46XN(~v&VmeEuweMy`+&fi
zW$RMU<NkT$!M~|z^afQM*W=TT(tEeWoris3+y<z_PkV)KA%6bk`qqdE|6d(kS4EVw
zDNeqlUgqh+4IBMRhm~fvO3fXjPJX3sVx%9Fx0cRgS(SJ`YAR0x@qGMfvM<sG3ekRa
zRhI*T&^#t>pD<s~JhRv3+Z=NK4&cDFA^J+7SYG8xr0GBXI~PgIUW?s(5zClJN`}2%
zp}<|60{epo(QC}qR5+xTT`yExxGsJVqz=MBC#GXxoU!@&wyWv98FM1n^(Tl_l1YAj
zP2%X4MI^Vxzyr}KLFx_iGF1v_I+^NL>gHx<x(1*Ty>v0r<!tNA_ZqH>FO0<{k8ug*
zF0s?8<}sxp+pHgt%;bf_(im?~5iAvi_%uJ_yz(dA-R*zOG{IItLR;PHEaBTLHg6H`
z^`77IQxB)@PZkH_0<bgL(-jWQSyQ*f+(0<U7vS2^^gJaIwqc)}X?pc}i8Eu(jjp*d
zU2_eZC)YPW*&`t8DQi2&cU6cOP7AG6&{0gud#aY-g6Wl?0>c>sl8@;<e=qbYXX6a}
zVhP8G8yMf1|AvnHghz!u8f*N#JhOCflIQ|_^6;F4srMG@>?W5CQOl%-W<Uv0)!`2n
z9T+Z2Lz<nI58wDTZ1ve&T7?OBF7F10k#4<Sm0eHWT$fX8_&vYw`a?g*7|pOrV3M+o
zZPVwi+!{}#RtSL@`1eF(TcR{os~+*dSHYH`c52yTlKgFuwKHecGN{D<c`G@YlLjUz
z@0qfxCh@#ST$H`$)dkX!)>I!YtgLdgh7x1`HI-Q98eWqTv}6GI&H`Bj4u(XdR|V30
z8TV@!$Xzx|UF;h}lDHr7zb}!ry2dhfB+XK2jftk#*L4R@G*<{DWhX9^@@0d~?RQzh
zX(h3-dlt%|*;u3y%Sn)~#0xiXmjKkbKW2O3&GnZy{SJqp!oJ#F%AIXq!T`IuBQJ$_
z20YKQR{`ZSUq?Xi%P^x_ztu$gP*BB~FkRhXX0pI29EAUd*1$)^sHKphtFHK94O14T
zaVl@Y?22jFW7WTKP0lOM*L7F#eFXsTS766ZeTG!@xMn%%b}2ip^PdE%KFa)pag*<S
zIzRao9rno|Rqht5`H{OYreGce%Si6AWc-oA=ecBISXshh1>uhcQnVu^-vg?+H<`U~
zR^qBTh+0<&H5BsS79(zpym|%o!gZ!&mmWCiHyN<o23?v^sp{I~&;>z!10DgCL)m`(
z=_N+>wRbA}U|gUXsGLPiOvF$-AC=wWf?CzLNClaiieTn;OV59)J3*#v{o}Omjie6~
zo?f>Jxf+GVoB-uzBmRWP1s=()o%RD0K!<@AZ*)Gy!jT>eYkMQ|c4R=vOJD$tofW}Q
z#ldj5AnnJRt^vkmlyFPLNSJ@X6pyhw*GoQMCK!!S_XK~_&@Ttk|CRU4uVR6Js#Jdo
zI|D@>Zr!%M<~!BCI9%fe%6YAD-Of0WRB#lIZ%rU1rGGkRDSl!9(DuXtS$uP#6T}ua
zUAiG*q9vB3JN!F$cELL=)3x6LmYEfExxe}>WJEmm%+cQ_GD_=poKG)BGeD~#=l+|!
z%=2@Y>L!+#jl5b-knK0?tH1Osx=mbGFsGHf_3mvSF0pynZRxlYG}&ak6K}^Ovq0Lj
zCJ)YCK$&G=mycuAK(~s{i!)7Pjz8($#SETs{dXt>+DcsKfK&jg%6i!jL78sA+Xopb
zAsSSM(f#S-ucZyoqmP}cm3w`f)+R|ZYTD4phv-5!)0-Rx+72=Qx{xGu#SD=$E~ry?
z8QCR^Lo+~gNr7bKcMF7?+tvPolMD@=H-_HmIeJuCCF#Na`~(SVk@~#F)m^jA#4FA<
ziMy-_4zSkm;4W<G7U|%3wVfPCqF42%86r((-Kmz@_(mXWuJKGBj0}+iPNEiDhEH`(
zOt#j{E}Y7<k5dYWir~(X=4;f1i@YM1r*gRW3P%M_<M=hqq$j!Qiv|WR$?vL3nu~Tw
zdH*(P1nWV>$U{WVdtB7MDLAXTo?zntU`Yb<0O`7*m2={Y)d^yD3uxrlu)yZT`S93j
z+{LQb7sks(sx%jmoipD*8;5HBgPF_Xs*1C>MD{8MG6y(a(p?q-OExmhKHxAOvapt3
zb0@Gaa}*%5Meo*M-?JWTp8`bonR)!oOdz-k_%AMJQxGc?0%oIe{tAW&ji5Kq&9})L
zq{Aq$6Ny`bVay1CiDi?1kyBKW#$)u_-7O{Ik<?Eiu3DQ%m#6|J4`sf<!o#C2!Ty}8
za`OC7`}rb9OnH>${S7rS6aeqVSL-Jq0@XMp9Q6l(l3GjRMganOaMt7VBxPdMUlQs+
zkfv;XYgPbPt~;}ht6?L0F;}A9=a<T_yRp4irdp=AL5eGLn+aGUk*eqqiQ2LX3F}Z~
zjM{Tbit%9`8FZRLznx>(ZpAc!NC5i{>@3DC2UM%6DGP2rET^y@cGUjw1A++p_%4ay
zKl)IX=XDpcOryY`LJVT43iuo-#IL7U{ryb6aTh|T9pF2ADWC58u-VBC1uSHq8?ps?
zDND*sEap^VUu1%KcJ>IL*UbQ90R^y7_Q;F0I)3feZcd6wf#ZiBtLL*iqVl7RLXpqg
zU=`0gYzwz-e(~^TX}|>hEM$S~Rp5Oa*Sh0=oMY&mQW9pldbFVBP4EP7T$kvq>`E5%
zXsaz{;tzeH=zAs>hOq0;0-IbuazE0}QT3TvCkp=pi5LO`>P3j0cVMnLke2%{E;_kC
z`<%pPl4E%Z&ZLUuQL1_M92JCUu*}A7$~@*|s)G3VkuB-$vN?w(AC-)7Rs*o8vJ#K)
zj-l!Iw$iCrR4TtFZz|11{E6~p$+``D7fA^G3EHW+V+c9pox>`xU*jl~X<rhUqFPRW
zt*`U<q#Thtk7jk|ZJNvefs?wQ?H@@Xo;IM?eGw*yYFOZ(h%;St|7g~kX=JF&4-d^T
z4)=#xWU}lNT{HMk9b?U(xtSs<PL5xSCdqj^a4|X&{I9G_siz8G7CW*{Ed?2^F{F*L
zGZ*p!f0G$Sbk@o^vbA|4^A`j0yXwX~8)7Lc`U9wwiR`D9qfo*JTzRFIAcb+xqX(7W
zJ`@J<3uUQUX0Os+gz(NV(YLojH}dQfzN?-^aIwk8jfrhWsgD%iXbB8=v8i$L^2{*~
zAwUr-fX6heESsb}UUdG6Gk`k|FQ~pXedl8$LTkDnf-iec_NW0UFP<&QiR7yg!qLHq
z^xF#(LLrpp7g=ZY%*P}&KRsX|G@+nu{J#|pi)?HH5dFH7&IglMBmlQsqa2u55dk|A
zi$93qij?Iul)PskA!wolC_8M~r!w@^0)Kud9az><;1I2{#aparE@E+yDkQhK-n``)
zM4^s>)w51krHRFHpy_9;jfuC|E<RNbOrbNeA;w|YKMP++BmTx+z~u4m2+MLJ`PR(7
z&=^3<p<gW)LBsBSyD-TLmuxYGxUiY&#_53$EB;m{UCvT&JTYieYH+jL3VWzAA`4ff
zeukC-1uau0nl@Pf>#{NI<x`XxG3(JE*_QVooE0cv4=Z&V%+)>WL7MY71Z^tgsb!z8
z^Nr<%%7@VQVex=#{+7SgbNB{<$2;|5<#YaPR1wAtkhfR+W?2oCKw`c@R#?>T(nYC1
zk`10Fn6p$KP6AIv!G_^?%CY#<K%IqUf}3X}2#VhyMwGgb>!4Ar5yK<pkv$j*oZ^dj
zoh?2Ag|c%Q3dZOzkmaM+1_p9>f3%dObZ$&ZHEKs=Zg=sQ)%|IPzs1j@zrYn<uqkaC
z7UBRzEihcvX0Y#@?nnE0%VibwqAkIhGKQ&c`Tc&9Drsy{&l#T|k0kOG7IL1saWc8K
zkdDL?V{VP`2wvqvO=ACO?{DAOGTb`(rnfuFYd@gJ)eOfTBg(+=KjGcez|)1l+VZIc
zoPv*I(>{g0?n}0da|VzcgZh9-GVbia#OB6svc>_>N@e?1!ZwYKrA9Za{7h;8HMtL2
z8yTjV&n3rdWG@?DfTg<mJy#tFE@V4()4wI+LU?pru1qgH?TjhpWSaujsK6~c5Z-g@
zuSAW-@ok#~l9hjZSkEFU54edUm5i?TfNtSZP0UtI(roqXl3_NI)>*da40$I{O-)D%
zt3_Mt)iKM2-fDS=?hLB`2ih+OXWnRnx*XavKU$T9^rrdu#~Er(VUJ`>ywEni-fpgC
z%ZtWiiY~kkfMlq^=?m@x(^8<rPg`2JqO(XZ*Ozz!inww|_lyr?LH#2mJzBQYPpG(G
zg1AbifiW;v_~<j>B`bDN_H|7$!1mE^U0>P1n7g|(e8;%@&`@^8IY#Z<W27wggLD3r
zKeYaq!Jq{&4?l|bgls&Vtw~;uJh{=|IeqenqW8C@#xvip13AjSX@oC@`-SG3fljYK
zi@Z>Ob0yEgxx8I_mKahK*XA3OgxwST{W)zT#%PNF&iCrKuX?kOGkx{Ap`cceg1hzG
zKRbMEz0OH~`d+8yCP6S*0rn(6-`?@dy^XN=_95!DpYrvD*Bst3paXc`=1ZM=Dlqh;
zEIQ0*1UsND3JM4cYTPG%I#sXwvKvZGyjZ#-FZ^cHWz_hl;gA(>y^@7{i^A#(#Nv#q
z86~O0-!Y)$^XX-a)~>2mZ9&;BHO2tx307NDvCI9aSJ;GM?zj1F$$tveL$gdYdEO8n
zzwPAp2H6Dhgb$jM)M>8!;X|yegqgrbG1Ai-mGVvy7|Dj*Stg3!iBwQLfh^&<wSA~)
zW|Y~Q=<YM2WNfSiHU0pq>z?))mqLSrHIrt$l=NIxc_D<Uj~m8!iLKx8LOwc~>ES`A
zC>M;smmL0D#(l!Ay#U=SmW#i@4is2vA&0${-M<57V+Renc=oI+@<#~V&=aJ9Fv`~J
z>->?MJ?*+HTxa8f!jCDNm2RqA&P_Mc@ywlw>MtGjDUKMBe{{S6(hCWGB4CzLO77MK
ze3M4RT-(|?#i`!4^lqG-hA***A*vevM^mQT)!Pt$QEwDzN4&@~H-hm#p~9fXlUDHR
z0cM6m4^)g-`QLHD51hz*&a>PG7pG9H8{OJmLErU#M8|LP2}Cc&Jz6Gr8+-Bbu`3yI
zLXbJ=9t~&9Z-Qa`EiiUezbfcZePa>BxzmzS_Qn^)3l-xgTlrIEebMvpLb0(ETW`Ec
z1`jSJBLzT&yfuOhEW5AG;|V^HDk0Sd0LILZ(u|4`!u#v&LlnZJKWvuyR`V<pV$Q7|
zAdj~(`~Rve-S99N%N(Jsc99r9sx8IXLb{`wwW#GqrYTEh(TxX|A~=!a_@Dch7vntp
zu1R;W+)W2%jvU~RbAp)NEVfx=l)k2J*;gqNFu3r90h7{C=s5Ibscmdj_Ya|YggVwc
zE^rW^kJ`Ww{`&h*lA>_i)z`UC2gQa|W>NE78L!dHriz)916&z4SusbJ;IF+8l|3Hn
z{}Pfxa+BRihFzAMt^@(Yd%AYD*FE($u>?*e-g@gLf5r`7=T3%%*cqt}s-~=dLohOq
z$AapT?pR+SEhM>`j;y?IC;>NXP$~(Wky>_mJoq@QWgvUbNntYy7T6u2vrX~(XY(W+
z^%N4v{f{9Ad>xbjfrvJW!NGnfdpVHNO9o^I4=LfV*Dzt1)*i32CK~cP6Rh6HMcFsk
zpf{WnXf0L^X}V4DEzn|ti<9n@MkBVTZ^8z9anmF4>aNZ%xk@JJ<yGD6S`Smf%weKW
z$+wrW8}6TIGCtKM`4)rESHN{RmR-p7XYUP<4)~RqXvg1EofGfIgxFE$Cd1m#ypE)Q
zR6*j!PSpnV6=y_o9%^%K-j3+VV6vZ?l$3Q?nG4KPiwZyY#a{_~>(FJdXx(H5t1f6Y
zHW22|10`}N1fXjM(x1${zdcy2^8RUZccId|%MyO-CPgdl8eGTOhZgI{<G;V=E+};C
z_6|Y^pnwGqd}T8xU5k5MOECYtjMe5k3MB9UXzj)CH<*Qr>&LD^C#Y#o@3qrs_nxeK
zShTGlzbVt&{`es?!?5<~hgnC_YFay$?lh8qc>2xpiGMV|)SCP2FL(MBAGvm#3pCVi
zz~mZ@TBGBsbI&DRdx1McLQu_M%@Zf^%H(91hu3$taz#1)CdCQ-f$Mmi>}T2Iue*7<
zc2CDq8N4h)d^)~BhscPLz%V>`eTul)()l0gX20N(vfc2jk?jh4bK<PE=Y_`|#S*YY
zb0rR~S05~)(SeW6NOFg}F)lHCa!xBZ{sXZdj`|!5{`P3zNXO;ud`_w~n2u@<>poCV
zWXq`0Zb4teV|!~>{C4z@TG~8fCT@~5AJx!4x3G;Y^9OjT-DuzR^PY3b%KGxlms^jf
zfNj6>cXlJQVkz7bt5{I61HZ&jNuZrdYocq_bASC4CP6BsZ<poSI%mfI{3%g?UH4<I
zV%#q%LNhvFu4)p5?qRM22wSJ>8~mAZD`Ik4VVZk%{>Q!=pI&3CqStAz6R821;d^7L
zK0<T*>C3?3%0B$vsujphXqy&XA%1_-MZ+z_q_M^*C9lw1VHdOm3?(Y~Zr-#HyK-08
z(`RKijnPE1<`lx}odB4UxXQE0EDXqP2+9yW6bL=$;w*}3M{B!IJ^Ve%S3<h{<2p%r
zFUHw_+P6;QcEjw*#@tw;axY2HtIS4VL3{n?f1vSKF%xn-((5MOmwBgB>R;wx+5Qj2
z*Yj6{GI|kF*c{qzylBT-T*j@Sn0hQ3Lu+tq+^PN##0Ea9slR03an(2yJj<iq5zW$I
ze%<2E4XL$%XPlUeQQ~WZO5(N|N8?Av|AFG2V?5`+Ur85<?tk&&Ny_i^?sKxr0f>-0
z)8(QjGJA~bu$w|<Hkq0{TJX<alW$xPM9*X-_PZqrKBBX_)>3?%U-!dYxma-g<rH-t
zI;6okOy$?w3kL5UJ?<`6dTchKpdh?~U+2_wis%c<g5-PrKRW#F@R0N!sqBT0$M=$Q
zr!uKq-E!u3ZVjh$kuYf~$Z%E+_h_2WLRUq<;F-a$i#E98nr10Hc=e%q*!1e3vH{+>
zx`N+*t|2-IP!QD!R2p0^ZTZ-?9LlhCpo<jlqUqXq-e25xKWmT;GkxCS%%%yxhXIDg
zYKe=!T2@my8cmj9umtpuqD~q=5qEa*aTP_fz)3N!(I41Sa*7G8rxj=T_*M%5JY6oe
z`F9<Cw5w}&Qs=zxJa}9!+F^gR?E_^2MRalNSN51c-wX<+g;rIoj*GeH>NH!MNd)NG
zeZ0)-j~zbrgxp))olsITXbVbYUgJB`ObkzVv6wu1F}B%KqNqj2l4-uZ|0<s;PdeOX
zTCa$UUq^(3&IaI4c!&_W2n+LZh6{>j2&Ep(!N4QnLMuGcmwn@0Yt3eMj-!FlKgc2>
z$_rk~qon7r)bT)b>?4sIXXT@5w;F0diH3>>V^9n{Df~x#->caR-X|*+Ob<J=dw|3t
z1Z{or@QnBUJhE$6CHIh`^-7g*YmMe-t4RSnf)W&z>Yb(Hxhow=WV044c(xeZE4BFs
ztFgwV@=|Z-3(F+UjRy08{J<$zpKnTutR;VVuT<w~0NPp`{#PxhS*X-t;rd$xPm0f8
z9Qs!dG2S`LM>#*$=1HDAO{CEe{{zX8b|%8xAHpx6hu(|raK_gSPR<QMhI`X?4VC1G
zZC}X<3X)WY=K^3C35Fpl*Izy%RM~6yxT@Sl8a+{YTV#q~>9(z)XHSqu`DOU;C!>{u
zCLgh~U^LZDS#B!#ieJ=j<;gRE|1qSL330tW4tL=6;L76FQ@^0EeH7k&dID}W>~3Ww
zt;KBb)~`ofPd`lZ=YI>44<yF+0<UL!_w!cXik~=c4s~f~<rwit(Xc;WwbsYl$sbOA
zhmTIy?ACIoMdvN=TUEF<=Xy$<c&8*N7PZN-Eew9OI?nd~^hWEcI_(xh@iNfn&0B2{
z0IDz-i}Wx;07$WbVRrlC`#g=;<8{UQ3qqhzVenPZqIKlr4_m1$)bSo*6T=dZ)I!SV
znjWSgm3ZqCwZ;7%07pq2j#FN&{?ugT01sCJND=R<X-GwNnfoj+82w7aKDJ&aB@sH9
zqi<@#h9VLf%XNBaO=E3Iw5FVvp^tC1!-XA>XWnT))zx8qP*=?92?xi1-%Uye2OP;D
z9%0}DDnA}#m6$cneQ`|YGhq|saPD|uysoRLS#sZ}A##~0wBp!#P_SMRJ+hOGc$ef)
z*6C#p1afuE9Z-Fc#KXAfW9KS$6);F?6ny_hjsLf<K)&;E7)OZji85cPpM}}<#X9>F
z1y92g29!s(2!ShK@A*vyFJu{yz@deV4CRSM%-bLvn=@IHxzC{v*>K4DlEL4YmEj7Z
zoho(zJG0Y&g=AGbK|ZXs0L^z;lcugYnFaQXNDX<@u*kV+O)5Ze{HfIQOd&sYK=ncZ
z%PuwgH?A%KF+C=kg*as(HXG(G>PrmnvU{;F;p>|N$(^cq$^tP^i@g={5{WhkDqIsG
z2-^(yRjAarM*tQ*GbxKr@L7oNoRDlB_Gj&&Vc~r<Mp{~=g*=nPpPeBx#t@2#u=po{
z>w?24#3m9nyMavsD@glXWn}+*mRH;4yQyF)?OXIl4U*T<d=sDAz+*G5`&%4jYwb`7
zG_(RuAFgJ(VXwk>X9e=0mt(*`+VK%ZWQ2KVjx3gv)B_T!Y({28fWi*F3Y!$)j*`_w
z#H@OSQ$UQerZV04n7XRsXlA2;p1Li}StP6rq!sg_%d5}h;$xGic%F-oF2!!o0gH4y
zpXyR3*xh-)5z?(?Zm^9Ia9o%=eEq5EqW(o3?q*gPoyhIAZ75v*Ugi0gP-Gs1`GWP}
zRG#?srMF0RC55*KV6oF%BCRkYcsgbLWWh(#uvqQ{{96q241-{}IQ}a3jC}`(v%SXS
zB}-T%bN9`z=>)tO*2&2U!LrJ-_=Bj?&sDg4<X326lfCKE;=OgodRPK9#wgArpy2>_
zBf!{7XWH^q+Vpdw?aGD8PG+JN?3Brxl0h#VzDOw({a)RL^+#sAHVmG{B1ErN?DQ^T
z949jL<v5h~ycxMd^yZz#e>-m!KTg_JVS%D$D>pfqzWvo&M#*RmiJP@VdMT2TS^Ci<
zPq4^8ksl(<-IZJ+L&pf=_gS7S+ct_fRZ{VYl9L557fhp|^dIlg4d&$~ZMRG2*3}Ej
z8pG?5oW8inTo^}7e}m=K=&~QxQ&QQN^JTNR%DD`eIwWv0okMIv%>*%ICh@GXYC%rj
z&+=Z%kLS<icFL_KkLV!dtsaU6aF!E&d?s%4E*N|MRQ#6gx>3O_;@{#AVy_3QxZ5Nn
zT9C_ls58J26hfx_ECmPt_wBgHR^f>57I<rXASvB%qpU}xSIam4h3=!}AsQD0O*zZe
z0$%CuQudc=;s0VFl>Q^90ODuLQwqAdfSZKH7>QVEhi1=cSc<s>PHue_RdB>+Gl4lK
zxY@<3v^Ir&pG<Mtx9S?lIJW*P<vQZVz5p>6Qf()5VW4HgukxF9rl~9yjFF#ui>%33
zKSOVEb$=ZGC90$$vIn$fl8a9?g9oF+M*-Ez*asd9bA=rKq8?$a@fP${PxByHQyRQ3
zUMt;%pkA_cGnu{z8DbP1fAakBAdN|*34eZCnF5cB-|#a6eRWkyd#@305lfN|dCPyA
zq`*^e2ZrQc%VPIumsu9;{$7-B(m#z;Hv3Yi$0`&xbKLg5N+sTXRd4osUHz92cvYNY
zL-A&8_g~^=I0JA<o6p|YGdKu$4qn4N`5HN|r(U3A?jwzcY*IE$Gi~~(M6XT$17_>*
zKj3iHGX+Jjq0ag*fxyv!pftleL`dx#^^?-I`Y(D)O>-|m&-^uNL}#y0xS4Xa!xyLX
z&*{YvWCnnkdWtXnSm$7F0h;A3(o@%;dkct=>LpZeoOmTYi6yVBnIv+Ag@zz`K4Q9b
z51xV%pqR5Np!G#D<~uZH*4P3r78jE4_zxD~gU=OnqcMiePIum)`EWHlh6H?V8*^`z
zGeC=^4<l||2py?9NVf4-xBrwH9Zjxa|66$;1kMU?1XfQ<9}9>cq?n_i1d7;Xhe&?q
zy%QcN_;R<hDZvR2UosBF@XF<e+->>NprmG%JdoMjN(2vnJMxlxYJZl4+abuTz3ciN
z9nP)9o3NZ7AUpvqgOr?Dv+=yj$B)VkzQde}9#El}Y_oPhpARNOv0wHhxXc3)az9b~
zjCzpS$X~IM>aY2OA*v^QmI0i+dENTw__F?mF?+ov^(UFlTfZ3fL0rwC%hMF<?XZzk
z=U6z=7bCto3+ec?kdi9s0^)Mwq$a7K)w;UA%--(Mz~#ls@9GT!#o5681;bZGuCsla
zNgTd&!<>I^Lw8okyf6f5*&YwVJ_c6Bm{Z9q0k#|MQZoQL=$dShUhgvHjzIh~v+UJy
z$l}fUH}XHpT0ne8O#slQ6JgoY&;PRD^Szpd{fVl;zq(j?Mq+4P79#&!-9J=huMnC%
zIHW_-T<kqpjsPcXKO#Nl-!h=w@<=shy{kiUc>%J@5Q(@ftUf$;_bCgza;*9F5?&r~
zm;?e{nz4o?DF490ldIZODD$_+Q#lY48Xh%Q1e0;<gHhCfB`{N82pR=h#+(sUPq7#R
z?2GvoZ$vc}yTjJ52gtYz20>B6vQ7$oI>`8;b0E(Uk8uNvFw|u{%PxT@fuX_po|$JM
zm&IdoEHc8DmKb_DS`C2ASzpMzDi=HlVUA$IB6ruZoADDWU+$g`K`k0vqY&^_R4-6*
zS>?DrM$rKO$i29N)&LL27~wx24!p_6v-^H2ne4uVM@yg!Sxpr;Nx+X&U-X)Zbjz;1
zA}-uR;BN7y*ev$I_=&>;uYd^=Tr72S4a4m`<3C3Sf&)RH9b)ZJkVf4H{q173&&t$W
zF=={|e|3)~{wKBMmz3pgbJPo5v%D{hyI(h~Vf{q<KC?$?Ke)0{;l5S##4p$ER8XXB
z6%3aM2#Wc>p1)UD*e<r}`)iw}sL>~hgIoJ!M3k4|TmR6jZ^4C7wfr#%T(tW7->#b{
zJD{SfDB+&t98{pVAH_HTdd14^)HB!Ybcfv)4EN(_=O+fl?gwCwb2LhICOcuon8%W>
z_@TJD%Q58WV2DCyoHQ+MY>{Zn_R@b<cb%h0^Zj;Z)f=`BD3V44`YeAHZ*EDPoa#aB
zM+bGK%r$LEOf_cb{?o)__zVLaI78-$8%N&`%d@{uEL@Ix>U$jQXdm$I18%PI+Tgc%
zYQ65yP)EIABavkYO@mcWmS6>qd!qdkXsPk%ZmDo1{el2>9<n)kU}&?*k{iCeQ&wgD
zS7FSDv6vn$4T=-rNWYk~m}Q{#Pxg)O<6_@yZgg$qr%Y$*;(msNNE4-=xAW9FM~pBh
zT_fBS63JwJr3%e#+7T1Ep|6;t)UI=po2Rfu$!GHGpap8*Jgv$~7oSNC5v>L(!SUZX
zdd0Z?c`U4bT{GdlbI#7Lh5HdBX0>TM(vw=NHkr(k;epdqLb2W91+USC9QP9Mr#x-b
zpp8^*lsE^=w6m@U0y7z-AbSJ8$PNvkl^1cd*L9LY&Jz?&oQy!J7jDnt$P6?c0Ey;k
z`rkkO8CyFSylk##<?8WR&lvhfbiG(v9lr{K`5W{C-25>b-nXBHvMSP+4$QJ&1rZcN
z-~KjcpYbzl-C%xOMZmiiln<AhtQ8Z)Skzp{aRRN47(z9X0RE$2YLo`Me@#T+b;Rnv
zrM}NfmVXoLMnR<I-nGY8JwmyIp5QyEdq;hB?P&7h;=9_-kQ+ynLNHfRx*44>jQGB8
zywHti*>baAG%u$|Bj}JxU&L^8OPChIa(cCrHY%*KFlPlA<zUq6yZFIP1!fA<pA%9$
z_^7O#Q{1|TIt6WHV7MO)4=P>l&m__t>-7}e-O}_>Xiciuqim&nIsm47sx4n!x6kl0
zMG6qZn6m!1Q>_y;930e){yb7yr1t|o7`=<$H|^!?tn;Y3wiI3v?#k{!86vO)>m>ei
z;mo=TxNr>h4)MM7X9b=<(9-QI)5yEO%-Nw8Wj$l}SzRUk$uxHy>%Bf5(Yf!<IfT(!
z{R__nGM_ma1HPskB|e>pt*XjHfZXd8qgJXM7+=Po(TVSi-He~yc`dFdC`AN<>;~X&
zP*2Z4L?Ju8v3bj&T`1i}k8GPc>>Kv?0itLoXK^ViN@j_SvkaLtg@l}(xEWZ`a`?w7
z*WA*LCGhqMJSl80(**xM`@<XyN^2W*7I|{IdHL{9cIe?d;j<dp-u>^+?*)Vt0jAD+
z1=l?HUp9U)%uY$bH`<}G-Z=RtyMrsdce_ll(#HE5f=0^ws%DUp)}{cR0iN3zGSE^8
z`s&W_{P~ZKIYZ7@7XaT*n5vA}9G0qCd0CMZg8~n?Y5f9vuyLpcJ_`QdzNJ&t9^CQC
z8c<KD5ISU<75H|(@XPcU)~&nS97r*i27gByXj%7%PK=kZ8?rCRa({32_@s);F}7db
zk4aNQgP-&PO*_G)?Lw{tH@gOT+w|4#L0QzilA^i6c*KEK@>sF(r@-y6Rw%oWhQL4S
zLu_A+=$>#83!~b~>9d2IKL(QCO`6CI&k@^Uyuf=4DR^(g8NiF)^XEUT3RoXIoSY0?
zHrVRhI90E+#4<+=cN;2aH$>vJmbqWQzMGImgUO&oj@Up_Ut1d#$Sl~Uh<il}p?dIX
z=v&PgS&|0jbhBvq4OS8vs64~28-ES}kCZze0uO-VT!UjPIGH^4^Kjvn!~2YufWrB7
zAo@&ts#kM0SkQ2HhcUc(O-G?UGMG*Z(|QUbNXT++>havV%-kPY6xV47#b?Ie!hfm6
zbo=Xnx?+Vx2&+NJjGw^YX3PKGY>9wRrM<CfGDQ~T&OH`JEn0@$!fDa2223wg?_?Qf
z$ef~W^oy7{c8ufBm>)C}YDRUocgwDhLvVwYfw2W9i+1j44s*fJ!0u=AwOgLun1Uf#
zU*pus0!~!LOi7NhR~MVXN%8(yAt8@E`USS-wb#y#Irnw}^3ArE7C5nJ9O|CTt@pnL
z#QI?QO;tlGq+odQg^k}!DC>?$-f}^y&HekD3I=l?<)taMbFuhM!$O|t|AD;!10|gX
z!tJLccO+k|UGrOciTQN+SX^hX`_5<kqpZU)sbmcq;irE^?42^U771nAInl+Fcl1NO
zegLGpM9*<fao?*Fcm+z4kj?M1j!WX&@!BG-`s<%{ubX;tUmBsw=nD>e4x02WY4dn3
zR8}Jg7{#}a?hX4!5A)TD!Q3D#Ki9XbO|+CIEMVb6A=EotpID+ArXP3*3F>P^*!Vrb
z!f0V|#OfrB$05+ZTQ6}Of%GmE3s*z{W91z4>td}Q{cG_=QroPdP>U;w#en89{L3O2
z?Y5TLvrVDJ<eQ$xtzKiLqXq-1-!qjLqRKOO{UP|wiLEk@ODsuG=?$E_l@;f5WvlVT
zU}pGsAv9yKr9X0tg@mCRc|obU?O{@Q5ByP->~JqDMtWt^;*5(>iI26A&{Y(@qLAGP
zd4msSF$fjj{|=S48^wOJ7qW^MZ(D=ALIj&vezFv11(@PMz%D3dn^6tYS0K%5UF+r<
zFc2-(wIf~O)*FS3&=*b867b&?WED81w3D=}HFTQ$D_G^x8XFi6mcGw!Nns!Wvnsr3
zD<C)zV^=6fBUWSXz|}<+;}R@#?rHZf8?Bs^r)RLA;8ilDH{JnJNe^?y6_ogC@A=B4
zY6T+u!M9(A5Jkelw{uNxo!J~<Ea*Y4;^|k<DHpn=9)^3=6doyKPW7xCO>p`YpP-l<
zFgDjrvL?gqhouOILHolnv)E>T#_LDa`9<UQ9L4-f^u2%>fS@CR0re}oLm;el?YZyW
zSu%1y=cOtxcWZj`Y1Y?HA265xN1|V}P;Q4$oV`SVFc7=T7>=vX%+<Fh{nQ)6$IY*s
zQ%X9$1E5Hf;!4+*>c}e1ZsS!QYgX_K%hOA(Vi}weQU`K>2*M|Gs_h4)+dxW#dvfD;
zmf@{Apceq@cpI^^GG3Bs_2{r$^id|2xj=l}eMXF3DYPIORmk<XR&Pdec~Ed<pX-(L
z2YpztY#1I}zuuA_P}U|;D(Cx>0kF@vSJrNw`F3i7qGd}9730xKy~P^K>NQ9Yl@fJ~
zu(mvCR2`Kht}L++LE$2YqrDxNX$L;H(}~{M!;OvNc>;NP16u|P0U$^QPc!N@`;F21
zLp;BN83jb!d^89s!V9y;QPi=+W>FW`%q>_f(PRBz^%yeM?&=v>i!LqV;78Cvx>yJN
zm97q+FS1*+Qj%BNq36|%(sh2lYkU|7MFeAu4xH5;M)m`qgk7G0GKaRDyPu32WRI>N
ziQN5Ja%(onw$@q@V<kcikG&av$w6#0Ru*Aqxh`0Q0;rm5Il}VLtk2IDdOmxdhl(q7
z;CPU!zk@}2RBrt0wzEC{>#-JC&;xc{3TnFV-kcIAw2J^L(YnnOFAaWRB{c5$p112Y
zh0ZRT-E%O>3(jXpn`sS$tgO%X>J36A^|;lymL1h=_AbFpl-*TBBo_K`O;AsW2A|>~
zfITuXv~Nz<1J)(J*vt{v;TLnk={#h>%ISSSep7K}jksk>!_PyuEV^d6#Xb*!fjtR3
zS~7NdxRA0;u1SrSJrvFg$+bN{@!29tF5@g*$XUch!)9gh&8+%0PSSn7dx^R<fC2BS
ziN!OPos{;9J5Gq#T|b#o&hWga#DnUNqBy>4X6P*_y^gtBa7NpmE@xz`FPGN;G+jIN
zVplUL0DF8pQgQa@UdMsjqgCycHn!k2eaz@Z_Zh!HufMSXnX!+<=Gvbzfg_zr-8~ig
zo5sn-inHmt7%DhGL5=iqYwfr8-{mq#`@1b4{#04@TBJ=hAsh=u!eeB&Drd(>g@UF3
z>HpFHU+d?@e<0dSN`dR1_JO<jqrlFx`_(n65`sa?Os%Dqr!f2GT_)$Ma_aH3?IUA~
zRb7(Vw^f(s`WK29Exs&myaP%<eFhTnKMxOwKdT%MuD-u@Q9Q@(pnsEBaR|J;lDfP0
z%l??F?Z70OeC}UcT%@5U1+M|H_Dy)aloYc@IhmxvkpA<clYSYbFCYDx3B{`;2VW~(
zg@W>qlTsJYPnO9B=2DzWZLRP=Vv(Kn7klq_t{%0-06U~?a@`{;?MJ=erGba=k!`u8
z6EPmjJk1yF2El*&b5P4po_t^HqRox<6o-Z7#u7$yzWsSks>n3-k_==t%W|Mt-Lhl<
z)i9Kgx#35xb9-#-YT9GaS)YxhE~isLi`ugiO|eP&WskfYdU-=_+MI{d_ubx+I4zt$
z6$nQwJ`&vV+LQV1l&;M;e`f!3qDu1>xhmdw#*3RBKD?-@OP!_SDG@DTrv>|i+mZeo
zyDJ_W%bjf^#}|y;Mh|b4f12wl+YM>xW0@GguH0$;O|~<>$$?}@Ey%mqEYa8KaY421
zqIaW5=d)wMw9y5*UNVSVKU#Bn$z)H;qx<2^nElS!x>Q%<#axAD#l;uhsHxXW+JAl`
z7<-VU{px_>J$IQxnGY;_a1kX<fK%Z}A)n2z{a7!kpf6cB14;K{{#lenhH=(c92ctT
zl|SR9MBP(mmsOf0&haWJ?=kkRbL#UK^Rxcunr*Qt*1sHb-WHalIqh9wboU;sANPpx
zY@Ga?BLC)O+@J9dx7?fg+PmB<#6U6d=cLpl)<(rOpSIRhu_E05U-vhhED(1uq!-11
zyj5|Ah;XFQHC}6f64N|tI`l&OB9qQEq<yGGhy2me?f`DaZ<MDyz^!)t${(Ht!XAEE
zmF8zK>C^AJzH^GdxG}v{WrqTtrWz*+vwNjpl1q6-SkN24C&*iage(?VSm#f<c=EFh
zJiggjNZZyl+<xt%3!i5_D~8kOivFZ@_Ink7dY?~K(M?_@cFd9@DeCACMAbkf!ZJ2{
zo=ZVu>FZ+C9GxV)-8*N{5CJl^Dg}x}h`$`P{m@D$9|HeC%QsiH=lEQzb0G^b=ihzv
zlTTm8yRxSb!(}3`H)PkmNWHa14F`Q4Sv?+B@yLIi$5kf8Ya+B&a3`1ZlDwE~9iQz#
zU;8!x7#&LEk4lHh@z=fQh4=;IxWj<vMia%zc8)OnxCvkGVaU-V#4aTqaWKTzB9&#Z
zKp5>%l)BU|nL-f?Ig)+Y^G&i*q2fN;d?3J(erb3HvR*kvJz2G-3l>Wp=S_EdeiT01
z;$9#3{bui2&d%dgiE}W2&06#Y9K3eMkgZ*3K5nK-=zfwe<yQ>JtNPRT^XY>}vlh=>
zs5)eN`L@7Ygv*E6C&GWZZdK&Urp_lu^+=Q%$GyL#(R|0$#uIWvFu40B%ZvlCpakf<
z@(1tEhoEef>inJpu7rJVuaSFF$l|}&-e@=|XN5GmA8vIbC~sb>VvylJs1(72QT$Ow
z?l}Xs?G}`Dy}zWKVG;<;M`{;Al0(jMr!Z_yj%o$b|DHdy`F{C1zSOE+mPhjCJQ_`J
ztPv=_G^`PKmJE*kVaj7Rtexmpl_8azB6k|$vv*70m~%;64NR!dm%kv}jT+($2r%SA
zNr{&IEH#Am2TE~sIvPrV#2d@^H)Yuxd8d)G{q^KqKzD3}1aw2FUi|t&%)S*S%2X|V
z#1ula&DGuHD=&QJyZ2Wq-1+zl+ebfwhn2aWn|Wu!b0RHd#d1Dt=I^m(WH(&+ZKxj|
zMZpejbz^PJY|k_|oj`~gum==F2*hYnz#;oWFu~mV+WBWWuo=ZmI75UGPg$vTo{My)
zh^~L=oa-t{O=$aHMX~$VIU7q^xJ+ix{BvxN5Rcb6X=F<-d+0<5dpbVXJ7}4})W#KZ
zyfn8GyRo3CSbLY8QFvHg04#R%Z@{u7pT3&Z%d9HlR9m$MW(lO6OYMybny+`!cZtCu
zk+4-0m0_<lsFjsDoxb-8_sCc8OMO<Sae?0Of8ozPEpj(RCT9;4iV_~w-zwjbNSF4N
zH24ziuxX5`K&q~(Bn29^7emn9Ca_NMAQ-hD{N{vY@`(jl9gvel)0+x8f=?_bHV(Ah
zg={klQ4+!j^ajsdj>Cl)&gEskdORS8M7o1(sW=t%)V@RHKhX5s6RHO0lk~S?<kAtd
zk`x^Lh%qpR@D`n2?gHruebF75=&Nw&6bX~k4B#<-U69mdQy})L84@a%b5IO;A~YYL
z_3_ww{>swVp+yYNrAl<$Z9j^B$}CMG+IPP5#=q4IqYoX30O0a9w}(;hg+5Gj8yn%l
z#LctAWqTfyy=~TnE3yzaCYZkON>c2yFj1x|$xton*<{A{iuLg|<!in|88oJ|h)woL
zFoktL5cAkB`fE@$^}>P!xTO%qNbekdl1J^;C~2@+jp1JF7m64;qk7iN*j<dpQqhC)
zkjHrJH8o7b_5<ee)2y$%&%&0O+#k5Q&@SBP)I;F+x^3>u+V#?cfs@F@6=e2+)Mm0b
z<f$yz>?4t~CMw;u3${RG%kFb<%hguJ{uB;~TDGug%9M{)%;t!W8VpeGf`~UK$2`#S
zozLM2PUB5<{ow2;6-(Nq-l=%-aHq^n##>jT;ZkPL+&{*8<?ipLh5hb5;ks)PqT>+%
z&-N@WffIG~;puvfIm7!O((*g{zN04+4Ep9VQa=Iwg80|kIEC)9yVr|dqMCi;kv_ZV
zrEs1*Z~Q;&qz_n*L0BC_KhpxDT}S4EyJcG~29G^?GH|CGvq@)3<oiv>mY?0;x8_#)
zUqe6<-B=(a%&ujayHT<!K-TN1pdz_f2r*pIyKF^`hI#>Jza`{mutKy0kMG6#$j2}R
zU$m)PBwrYCG};;-=5NTPJ`gk*&^qo`;v=6bm}TV#(B#$^9{iX!>FxK4%=tpQ>=>i5
zP(-j#5mrqjXCBo1wHioe4mr~a4?1tpw>>X8oV7|8<AqvK8bwAXBCe~u%fqr(`*tQf
zV~MnbbpS8Y|5}C=bCqKZ?N3c$&E5p~WyAH#c6hRBU$>zl^P3=7nXqy?^^=~JTLP$%
zDcXwe=Io(B+D3+JF2ojxB_ekHoXZv@(#>$FWlW~f*($~(O9*SBY?xootciWZhlU3%
z@2cYc1F6Qp7)6I(Ma?1sKG(JqSb28z{MC7?AF6D85Tm>64~7cWF>p}UkVOpjzwgIA
zcErPZ6PDtOh5qQ}EH59b><R+aiyUE<fzvh|7^s)=0cB;;ABL)E^4R6=BCxCxcA`{H
zSx<r8a0SD)cPZhIj7{d&{>E)n``GmEr?7RC?>G^5twrjO4D}WtO8?T0%ehlgZARff
zj`lA=h@7x?vEc2Br@kWI@xH5100dXj%mw;Tfac<YpE5`I{%@REE?cJY2A)xRfAY>i
zlR_C}uWi5k<E=u>oLi8Y(coJa-mtk;5Iyoo`xd)`Y`61M-;nX?c#Vi{fjU)!JcZaM
z#_-d8SdjbUru#4Y5Wu^dAj|OuDC187t&_4I@k<$o5)CNCVP&g%a<97KrRiMgJ%hf@
zut|R&I);yPp!{9{yH3ZcuQu894kxF9onh5ya?3MlIcxA?rF3$L7_eT~G${pHTjp$5
z89=hB%cd>3FaO8Uxwtd=|9||RVNN+kP3Dvpp>j$a!%)uWLlKo@(kF*a&Sc0T&737U
zm9uh+LMP-fhnNuM%*LG0=TpD?`}+rW?Yef~yWjWg^?W`as14=-rwO&Jg~?RYPqS^{
z)~GmbT&&}9)$)lEpb6(^Btpn^gY)6__LfeC>Q^o`Y>e=_de)ZgmKYMg&!C&A!vrxW
zdalL>Nnt2Kt!CEz{f*#EAF^lQEy}4jV|-9fnH=-)O}qHq`TYlka|Rv=p6vZXl;jlG
zG|XO=N%#Fs3n?fZ_SoXWh$11a@s@zPNhd+LSD_L}P;Yy~inuycazG!c(0`4;!j`<T
zCGkDb(o9*u^`!?)_~bZ<4PXaa>h^=OC!QC*!qi$B27?5xk<DUjMPhp(r$0S@27AL$
z`&sfXDFFPQGV%?{X-+jEv#RRK<@IhXB2omolMpFiLC!T@s_28~cf&SiS;ccI26`Ff
zIJB;Wjvw?}i@e0R)_#;#(QUO{*S{XcgI*qRJ)(k6s`psg6>su)w`tu3_!_4?UU?ln
zla&U!@;X=x>vU~z7b?vP4qWZ=^2VMMJ<5{R55KKin%`%*Z%w!*F8EDdznbmFS$mP|
z8b*mXoVp%6AAp*M8{QY{E`ZEca=lv0PNFe811I{(t=lU>^Nv}h02yQD@9Gwl7{=bF
zFwuWBO%M@%aJM9x{8UOykfkXhO>{Ekq3>e?mk`d7!3J^)?Bauo@&ZqkJK2y|^(4jN
zg$HtdI5Qlc5>`8qV;HKer@V^HxhDykGM4|JE9eP$MoD-ZF3@HydrD*W=UJZh?7D@J
zY7@uOTwy`@_C*4paqPGS$vejw_U)3C-Xy*D>DCKL=Y4(?p`cA8!YlPbu9v-QMu73%
zuOCLka_Ugsiq|2ZUC|O5_c4`?7UU9<{*Sjzl(l6dpcqr8=fg5AjgwsIwPo62FN#%F
z){WgTpGL&&=&E1(o}YK*i=tSN0aL~zsYa3<nD1wM{^zJDryPCs@WJf_$qu0a>Slr9
zpm|+KE5OSum>tAPJK-x3z<PEG%@;gZdF_dwH#CRuJBfOs6(Q2?Hylh)o@_lXzh92t
zE;Njd7NzZ~7W1f-IPGzmGWPL`3s$P<Y!|cK(?$BxKXL#9uut+2S)(i^h|b`a&-fL2
z98Qg22tD|XG9L}ko255Ut#UYh-}#`xN!%8#1zU($rh#o|Wa3ffh`jdzl_UifNq;3u
zQrNfHt;A}mgmozHrW$Ih0py>5k3eNd!G~K-O-*y5jaD}1UX0F}PHIK`xhwDDrB|I0
z#L$D%-1{#}gbN9m6!tv|uTfDK%YNE(zIo{_%({5sTZ{xG(Gr)*ppERn(oOVoG_*o=
z6MOd8*PkD*8Xmp<ke_;%lTQxjMn=Sb{*Z9!5A}1(sCXu0r2*-<@S4a5*xs^N5Hl?j
z^#McuA^ibucoq_dVB$RoE4rq*67}%Mld-z&F*);&Cy5<1k(93F96A<SQ?A7X&_N<a
zv|=r<g0@mUg2pp%_L2PZY^R@VAq?}|C&R5#e#b5{mo@flDC#jCqJat3kJ01vX!`TX
zL@mc~w{-V)CexDKXwHxF7Y?$w5{)MnDB!Pada^F0MeUzAvJun6<d%KS3@##CytTfi
znV0Q_8_z<<MtiX~5MYRNK$0x<WJ8-tr+a??x7+M!D__<Z?>W7lRrB^cEF@WHvc$E_
z8_y5_TGjH@dk+$>ylE~~M+=aR9|bs=q`vi1{~7`&-Acdwe2uH&`7*l@5+ybErEM*J
zCy^uzuIMYDd2j-anDxwE3e}vSbbV6~hMywgz|cUbtIpk@oS=R3-q=Bi)YtXm{Weu}
zhcFFH`p+>q8j-cCEVqP=RUbZ#kWUkAwm*Zgx4b{Mp(zX)IG1>u1|?3c7aA$Hw@7mk
zuP_0|RZOoPo$a~OMf%<*KJ#EiPOd?a^a)Hq#|QKe0IzMmo_O2PqfVOA71j6;0AXfm
z7rDlsmZUsT1%I(bT(3^<aRS<@u_q7!n-f=aL`QXmQo`nk`ZM0wnvIms=moDS9Dp(M
zy?UvQQ$+!^-K_)5n2McnV_&ItiiOR>Mpv?zEp&DVIQfW4d}jXZ3on{2w2g3)?LJF7
zo8Dy-m&9;>>Y!?*GN3#APHUEN<O>c1ehcX~CzaWs>Gu3VoF{bxiV%4Nao+AGaVXJD
zTtr5z;cBffgm!2dC-X?DO6D((Yje2tole6e0sxLvLEVrN>~8(jViRC@w@flku096e
z691}d#eb)C9jVeT9Ucg6q?Dba*VsBqh=!%kuP$THz`q|iNUb+5kcZ~YFrD$6A-nX6
ze#K<>O@=6Oaq$WDGNjjsPxmE!A?WQ~CT!V&7o@#ge?uw)NxP&L9pBP_Mt0<dtH+Y?
zC<qqmtuky%;DEM;sPr;uzeDpXFv$HN!4N0ckowPswNaQ1eqRQ{5qa}yuYghaL_Zu1
z9PELM1v{N@^(r6K!II*=XKYK2cr0RzISX#_(pM!w(8Q$eEhpurMOz>h{0Bx*y&bSn
ze!KQxA~Fmnc008GX|B3=&Lr#>a+hDU)>WGBz=x=6TjJ`^9)L)4INg5GF&Rw$q&(oF
zbv2EJz3#dyrM|!=jt;S9E5#lJ4j9HuFuDt8PaFpVsWjc&4}plr-By_!y4W^Vw^*fA
zQD&B)!~Uc0*WqD{`@M`!W1#S${s(nrB9=`QlHY^t^*LG~1YAf-LpmjaZ`d2}7_{4+
zHu1PNCg2jg0xh^yVI;l)o!n*gim58Gf4dbD;dQ$RUEpS^Edt=S>59OBn6>PF)uuwA
zZ%M-YXPKu5vfjSoz-!nsKq%!;Q|5@_>dE0KvOVk(P-&odu1H8$#Yw2WnBPpmj>b^G
zi`qTGS{N=_M$i2j#nPxBRl}DdXb;=V{X+FSxh&JKom+d*s$BE2y0Z!fv!7s?B!#{B
zd83Ve382<gYV<#ZJ{+1*kKBM2Dqv5!oX4*Is%O(SQ4F{I2bkviOoDeX!2nrzAwc{>
z^}dC<rrPcO(C7ldCV9rvzr#`QmPF#dW3fU&Kmhu{awO)NetbQqISoo=(4Y&y%>ePr
zZ>BzT?BqfoTs?EUc%QJl+<Lc5%fsxu<35t9k^in)zj&dxiK^UUtW)XoRL5hd*&cPy
z0idd`36~(x)v3^Z32)#OHk31CCY1@iPDfOc%T-IJWjhTj;f=!iy%2V1gzKN!tkX|!
zRwt3SB@Vnz`Qjg1gM^381-D);m8y{=)j3GyAN7}D6R)B#i_h$6J@e_Zer8~@k;W&Z
zW|1cwfo$g!!m9jF5hu67yZ;V=i*vlGQmcj!m{XN{2fZY-cdriG>({NCz-s&}drQ%y
zFRpG_qhnWiteByXFGlhQEmOoE_U$(C_3#7sesgRZ7AY#V#wCCWF}faD&}4eu*%^Fk
zn^@0fawFoHML`4Vy+^wFG6f8@2+IA=(hl59mMmjERNJrRThE@lLQx}0|E~-Rxbnfp
zUsXpd_NeOk>vxf^sjI?!e$?`Ww_@HBJNJq^@f7)^UrH!SJL2?`^fs%_&#({v;w#7h
zb*ew)V)z?uxTjja=Qw>;=}A@6Mtd#O759O!K|vcDA|z?$s;_z(pD{yIX>|vK@$Mlh
zEs5gXT$;`O^Y?x|uKdjJWkKZ5!huJsik{WKDs8prilY0Px;$%G;=U%0ZuZaL&pq&$
z7QRceoqd2>?e*Cz(7&w#d-7y(@`|rZNJo*Lv_gDlBFRKN*>X4O9UR@*<kTp%-~BLv
zSjqIvy@R%9QoooTgu9a>nJU!C0jCni4xM)w-0qklT~f}#7)eDNCpF!Pr#CpYSsYGG
z0`bM#!|9Lldh^NPNj#U8ox#fhP;*pmfEvZ*(V1#_S)E2k4lIi|&i3%*{Us7m6qDRy
z%sii?c%5@nU6aH|;7+WPX!(qXydREK^i6J19%%fryP$C5ZP=1nL4n&*efy0b;FZX`
z&tb3}@-P9Zfn03-@retQq>7%m==w<dMOMEqAWS{Vpzzit$DBN-7tb+=w!af}u&eTD
zPVPNDA=Ht}wyOBvPgGFZdF_-<x^xA66yN%MKATnK4rSB&(_Ygbl!(PdnXScXZG-Y@
zT>;Pg1!ozAUWkIO#x1nK&UAKcuSc6~9*0TEa)xW#-QRs`T<fj`*vCtZ@2>R7%KbTk
zf*?DluT>kkHoT5ulJ2s3N}6uiV<ltV-QB_nQNeT<69Ib#bEJv5D-NPlfduVw`i2j0
zNWMvjw9n^k4rexvFxqoWy?7#V6dP3jr}<e|U>fZt`WnZFC38$If`~X+Z<Az@Z~l4f
zmMASD<YDUH$^hgh*)E7$pQ|Vn9$;B4>W-o?r#i4imhJM6R)HbYhY(VXV36yK2;rdr
zZik~_+^92NTg5To;j}}Jlpnyrkrc#LgnuOA$}6V{00i62oFY1w@u4`@Y=dt*!69Ct
zfYaqgN5c6^mDjLZFO_w$M5`nHb_uhruB3C{&ULtSDd@Riur&-Sx`I3hq`23b|61DD
zER8~w)s8zbR(_K9mPEgi1ZCf&(xFt|OQ>OL<QOq=@!<EZfHRkqfc&g<_|`&*at825
zG5o@1I9dGEkZ;Jh2FkY=A(%AAg!kHX89Cx+cGgX6-Y=2T0>k)buqiY#oaEo<yU|$*
z?-KR`XtZ7?x0U6Vd}VT70-$PAs4g;NGla#2^GKxBiPd#9%_-brXXG~78L|^@$((#5
zl67sE`<Yy`!s$&{@6)}9oWC#IaXR|XvW#0W>Np;z<FS*Fy}*OPYh#(sUSHx^RB)T#
z@%K&Dvz{a^CH|#Zg6kO^3PX>a3)Od?hlrH}_U}5c;?eX%Tt;^;TJAqSjVwHXSM!{f
zKv5AKC#ms1o&qw#)w7)Jx}02gR1C-Z>fI_<{yMoI>(4|*L6?fE%HiyXt1rgf8Lu0z
z;qkbRNpJHrm}uKyMGf^Fk-UmvpBQE~3R#jS{Ki~<C{!dzfHUg}usD&LYr%)@w~gt}
zail%CEKC1Q!ounCkJ>ZZ`WF6_%^AbYvD98pdADnL1lRMgu9FkX{QmAXzimF`p85lD
zo1nHTvVv{blJ#l>98&_i&z-K?Od4g{Mr@<!M>3Aj4`8kq5mp~lW}R?e#<vNhT=VyC
zPKR<JD^(iH&)Hz!e|UF2chtX8=pdu*$^W!JQ}ot}u%v~-4+frs#h7BCnv=^|Ru7KZ
z>VEn#*#0<UHtkGZ6147Zy`Yy>Oc#gikPz4X&W6H&0RP@)M&tJd*e+fThXDj<R+x}9
zZ9?P-Ze*w5h&Zpn8zD0iT|61w;<s#f&5M3b|GIiQ7ss6XIdxZ)7@lCgy=(6mGMKB1
z^zW#Qsac#}K3ObQxy$AAxGeN`=$f(m-c=n!@Z(SFYz^)KmoZn%#kjSm=_8zpzJJKC
z@T2Um5>>|&A<d|YFwEV<>wg#0EDG`^2nM4K0zx2ct3&le2&y|cetP21xR5bA?Iw%H
zaG@-ku2P3|^;AVkd~?wo$X`8u&cn-3XQW~6p2^-NiHK0QF>n3j^aj_vzWvr~I??6H
zw+6SrNtr13+YH8@%!s8LcepPlrbjX6{oIG`>YHqi6zn-5s+Fd-t(muv4sQ1j?=B6M
z`QKZ5Z`Qt$&wK0@!~rq2_E*xiE6q<tfV{o5N#VLh>)R<s(j5X;$;q>>>3{bEhRrte
zxKV&}CZ`Hw!=$0_TbIF}hf&68jj)54hS}dQxF+iQ>^JGDe?T*>;qwg_NSIWMk9eW1
zmx<vaeg6KVKmMncAT@J<sEq%OCX9WMFnU#=ucA)-tlIHEAY8$})00CzMveQCe#fa<
z3b(a1XE{T&yd)VaXuFvG`xub^@yS3ug;>d{<LgmZF)O$e^nFN;|HyuA_eEB=^ur4A
zsEx;4wOPUS3T>zk^~g}81G`=m7mgAB-?#A<<NGE^P!6&*b^nV8xg_f47mwz$DPm8z
zmv!dp^Un6faDS?5$$CMGSI(7dn|GgX5T(vA9?PG)F8`wb!bqLbneF?#{zs9nV;bTk
ziD$$Cm+v00u}$h-1y8b&-+jK=e*GnBUw89<I!XO`ys>vCmwuelK)YtRcV)~Pv-E9~
zkC9KFV}1tM=DA`vw4lr6PmeN2b);8(AZNp)vqrttrGR)ni}UTVXEW1W1)80<=3AAy
zPmOe4IVLFD^3<uy)$PzYnFFnGfo-slIy_Th4@NfSdUWBFkOQ1qTat`{tQ(wm#gh0X
z6M^?8fE{Ql#^+OE<E)PD76Q(9n~Bh#@u}N|ArDQY1eNNvyQCp-dnhkTxaLstO#kCV
zh7M)>O)w}8yH}L+<MqSp*XTrXi}PtJnKVSsQ0>zJ&Y2f1%ge~KF9n?wPW{Y0{Su}|
z9<0y{@u)qqT#x3+jj7wu^x-gB?2%UgS!Z)zh4CfmbdrFgdlVA4Ce4Cif6LFu>_4@?
zC=-!#w{b;umkgepp`p_*J~$+)Nwe7VrPy7{8mL!(g1_)FcC7Qw9i1M!L)|18zkFjm
zcW3M^Pvxd8LjvBSgz`psOUv=ON;95$JEdDt<a2T3X@Vrr(_vjPo10x+pqbaNkq#EU
zf~?>YS04(rYs+(g&CW3{>My&SD%10ph#Y5~>;S<D$t3xfu%V)B7EU_QB-WN3arK+`
zil7z9__nYl_cRrdgehp3DSfJChb}@N%uDkQ_%ul4h}tLGZ%F_=y#O=7_i6V9PS$^#
zQ*0#pNStKbn-t<5uU~YWpU`>8=Xgs+Fy~c(ltv>EqTI{TO9;6A-U+Djmj;dIfwQ^k
z;vP2SPIfQ3WOA+0LTXILh0Wg5im??v)$b9|z8d!jX+eJ3*xV&Kx@RYI0A^bvb9)g~
z9#(&_Sru=F|4w)*<jV++Xj9mRt(W2yH?(6|%;-s4&NJFx3MYY<7GoVAhuk+<#iF#2
zT$A+FPBM=#^{NCUjBI6?KQ%=Owy$DeJ%alw^=dKbX>{h=qb2Iq?-&#&wb5)>#`#HX
zL@H_0Z#J{<v(|-{Q|wYIlH_&HSHgecJ^v~DeT(BgIZ%B)F=GzH%7TJV_THdgIZt-O
z#Tj93-O&IzyhEK*cxfj}E`1=Yo#Aa87hFW)G=**yv3#AoL#BQcuE5hIRTK$((*esV
zu;fkWce*7h=rIFLLxVpWGg^^t%*e)5{Nb!MbK`pIXm<zIL3CF_q9M?|EVI14&;Gcz
zM}hPTd<9Y4YOSsM`tmy0M=P7RG22~;<nhvLv}!$MVkOU)<-7G}kx+t36)gS^gfSsz
z#dJjE^~%;RHRpbTZIX?H)ib0^r-vv{Qp@HZ=PUJ8tJ*rJVCPsla%Yi%S$3u$ee)W-
z&V{8VC^rBX^hZo41v)49gX#L9w$zIT&o@eQK4XiZ{eYM9_O+}TG7c@)c;z+g<4H-O
zz?1uT`UZ3lQQ_B+Z3JyE_9TtN+=J|GgQeuAhlqp=ZDX0I$(Y0mgbz5k{7fKRu8Fl3
zu*ag!{ZSZV=AqBx{H+W(`)5+0X8n-0TDw@$u#pJ!eV&nVmhyDu`|BzmR2(AEZ{B8w
z*K+eZhxiO0ymj`ml;GsS@aUTt8ecy;gUrg4z$AvZWNyJQW-}6rGxaWx!9QJ-+fRaH
zdBhH#l$J^h`8XAb-pT#f+{?zTHZ1oaaX)_SKtdxUvgP_w-N1w4yjMoQn;hS~0Gemu
zldeJm^A;0#yQEmVUW!(8h(Q7n5nDoJeb5T%Zhe=Zy_p|H33e*DmBEs^0>t!VDlozi
zFPwXK`LnI#H8*RygydbQ7pH<H?Tf<js#DF<xPN<-=Si(Z{ee~b<w2zG(URy-e<;fM
zz5jx?-1hsrg6Pf!X|9B+vz1Vk1ktJCUJaj`!a2{|FsBwc6ZvP;=O8v)zU(FDABB3O
z`H@@DY=td;My2_ysqXSKru7dnEA8z)s+6+33Qdex`5e~#k?s=NxaFKO#<ZfB9mJ#k
zQ;|2@uJiQZmchvHT?0(p>`15iPd1KA9Wy#edXdFowODHT2QeECw*)9vR5+mNt!)+B
zOpr15Iur*@94czS_~u@_m`F?;8T;<O&t`%osm}M6wU`LD*5Xi%-l+iI#M4+^8S7r~
z<?p7P#LRHLsLyiF%wC`F6w+Zci*O}~TA}ueQU*1A2T84Pj`L0RX_iU?7WBxqWsiqn
zhsw3JIBz64i74^ys-m~b9Us2EjPUy6Xf)T1NeEyh5pbh}-MKc-8)dN0#ls<tJ+xf_
zx^-g7D&~2`(SKMQP`Jp0?fHF=`PZK1Dqn?%En~MhEJ=${`puUhH&iF|PHFP)&)`2J
zJZ)Y)`#t`Q>%APuZpgYX3h7T>9gBHUbsU`9fSn^j{a^nH`R^wNKKh?0*I3!|RK9<I
z)}K1~KmsW#0UH=_;ocbYZuQQbes|q)J$^7HGnkAd{pP-Z*`G!qOcnGNngHhkx{*0a
zO54;j=_`XjP82<dLqZl5A3!C*$(3?LCuCJ)_$g=_GZMASL_EkebZRj95(~Vt(T^lU
zliWILKCOOkC@Btum>||8%&Xej6jqD?bY@k%xDcOZ_)X}4_O67W0hTvWG)8JUXgN;D
zdsosjPlO~H`sLf|Y3maQR(_El>Vw5JSGAPM!#~=}94>MCEy5r?4yK^?dMEg60FD$*
zJRG#Y#c8v_A_Tkm<^2_?Z>hKSh~3HNL&hysE~ggTPjP{*VX2D=m4~sMfwSdz=WCT(
zmPM{U*eOj<l^1UkY6Z^AK5S2zJVxg^-)y=&f~Aq_6=^OWA`gXF`R}G=^AWRAxval1
zN!D>)*$NXI+lBgJuS0ou0dRGG=Hjh;T5<w_CB9iy0@s737;gdX89Y2=wGmB=O{JZ;
zoMlS2xzGzwYp6BxW1QOl%Nk6M$D0n-Nw9x_ts=l44Rbp6E+@TQ{a`kk#|uP$9iF6o
z$2z1mp(b-2%-%=de%Kc1QU}HfWmG@!2MDyIMX3yLZPKvfcmnezC{JeIfNQ_U^@DkX
zjbfTM6D}1XIt?6zZqGr6*nSvwefiIcq^=x{OK7D{CUzztl_Y3=MH4HV;1r9kk{gWR
zMjHY0BiUu&8nEkkM=cU`5Pd9|4$Q>28V3y_)%8Uq^Dmv@f%aiP)<IoIM~q(Fcf0Hq
z2#=U$au})b&GT1nYs%Rl5y?mUjiQ{#)$<nl8=_Kq(2<InK>|;&uzoT@8^#xDy2c5J
z&)l2M+|=O}a7Iy##vAlKU&DVOg8$~S+S=cpBqF^3x9V}1ag&S}Xg?g?dZ+nNZib2y
z=utkF<SCcWlOe~Et4=H-r!{L0`KER@qv!Vmt!i(y*#g_tf*U{0KD~E(xT3s1Zyp{e
zAdUcC2Qev!`xFPVzV=v+u*ULse)29+aMj-4cfOVL!cD1nbzAi8lW%j7^~u6{*<9|t
zddiFifg(I3O&9}tNW}`xhHr4$S&tqh=;C0VkRBF^qYU7-V=3E-Vv#3f5{hQ&0vnyN
zMR(AS-LPZrun2-l=nn$FO?adu3gg?&ph>>mC}grxNItAj9fKy|p~SHG^^%$7E7nql
z)Wq7Acn2&?5-w6eqCrTt)Q+~Kk)(<$Zkw0?Ne&|$+MA~i8-r<H>?t<GXjf6;t!Sng
zLxL<C-Sg<lRLo-{nDia66XwCI9?TMuW)}^rB!qN}wXW(85VP??B6rY}%<U^`HP7${
z!Z1*xw4O2%50-liM@O@YQ6lt%0oZ@C#1L;{tlgP?y>`$y1XaVzG}!eM@CKi7Cqb6a
zoKs+7NB6e&CRl=-N7j%0b6GyMsqMps>u2ApAZZ9{Ns(rSbc!7lkVP)JCVw+NIlcs(
zMdIH>nHcG+ds{_OuK45XHvdJ#c!!V*GG?~Gso}g_V&c%qKriDj`G~Y;TyG%PqxefQ
zVI*KN9%owPvS-JU^X(6qAl42SO_+&Bi-tx58naWilS$s0)T3A(E4d^S)SQaBnAPL&
zUg~1tG>^?bA*xgO6&-B#a(4o4OL7NW?`Jm|K~8h>Mg&E_L8b_wty5Gn@LTXz)%h=Y
z1Lq`=v-H1>0YLx|y($3B?CTtzw0E8%DW8OtAl*mqsA;2A!>--pt4s5gH`gR75EMYc
z#k!za3z#)H$msGaEpV~_2`~x=3a5thUNwH|k-u&=TW1iIl-1rr)&NnKl{uep4Wk94
zv1dxZ#<&cZMYoGY2Y#w%jv-l>bg19kHUUM4c>uRJr8t)<O}3HdV7aE(RM?7g@397K
zXQ;&@WtXBP9@ww|oXi1gg>P&LXS=W?TK2Ngp)yec8S|#s(V|X~)Xc-J(jbB7o2<yp
zaPR$f+snM|r5iqQaX*xBUFk@kt3}PHrK6L9#wcBD-LOU#P`DC7La*MsHH{*55w|CO
zTAAMXcj+W%?+H-9A=6egzq-znr@i<4Ae*|+*q^ntZ-g!OJ@Xuw0lQcjFYD~U0cph-
z0=46;ZJf+F{qtwuBhz_HQ4+ZlmATAzi8VC)c)Yi<JQEQbL2CT{+xbVXLo}SC6=w7D
zvViMN1hf~I6tq*w)GW_*h3j5+qos;?X0$m34hGxKgvgnVd`(0=F`K7ceBW6mR9@GC
z7N4k41R@-NVmZ2r(1Z0`_e>JbKr6&0l819idi9o%xn)}eA>)}zF}3Hf7|WLRx`G$f
z)miy9<Fg4SisU5ERL!F$5av`n5M+6kUO(C$_GNZOcdI1L*S=>@B^s6qSp};<eKtZ^
z6cO^pbJ5%`>h|$C^Hi+_=GeQh=*6xWUZL)E;?cU90X%(ml=bpP*gs$}m-Y6pTU&R#
zY*9I<3J2-wM{8DLtTXylyU0NQl<t7XWc?()%$m1&pPPh6V{$<KjQDag3xqMNJATGo
z_c`B9nuGwt?||+3h2)2Vu<jo8oH~VWoOnH#*Zo!-fSKIRWtbU*IC44lC4w$ZApDgf
zpiCQZlkVuELPdje?$d82+?0<_NI1I~0WK(VJ%x2qC=g9FfvfbMkLU+kd)MzNiKNsa
zN%%{pw}URJw`Qxb0UYV0#mZ~s{v#=FafmK0CuMmK_6Q`(3;p&U@Dq7SHyde=l1T?k
z4~Zc5Qu30RIVh+K8qk)L`4V0WqTx2e%vvu(nFQ<uBt-fOuZ+ll&7NGx^71|Y;L*5*
zEp#`&jfTx4@S$xPtsO$2Bfz3eVfa+U2f8X}kRt&xi<%krPD4Ta*Wmdnx?X6@)ohb*
z*N$rKq1?8q<f_^CmjodmUbsx3Tv*=s;5LCDMBHNkR_Xez+(**voR=(QtK@IuK=Og*
zLmtaCnkUFeG-^>eGlktQG7{U@2G|#Z26Q5!0!>G8C~YAPhXl?^6L3Q*Q^<OWU;qS6
zIwoemxBZ}yz^qy-Z}^^_mlY0P6Oqa~k_-6+IBr4_aBx<sr<RBe7RBjlKYlV7lo9Rs
zQt(DJ4k<J-WsuPP=13Cq_9l3Za^H(6lE|n;!Z)a*t~u+ak-mv5DE8qn;Q&lxQ!Xo{
z?W~lEIvrdaYw6mi9yUIO@goh+X<NDqG=V|HvnUA!7=#94m4?r;-eH;713%sW+3vY(
z34-+1FTWrx0YdBTC03o3dNxv4V9qAU;uE>dGl4>8g5D+AcJa??*)zzl`VQ3~5%7GA
z&WGYuzMK8hxKQ7L5-KG=9``VHcg)MK%Vl>L?>IB`l-ZxcmRBj9zg4`;kXv!D@zC#@
zLQ&5*W0Yz=!V>vm%;nRvMC5%9EEGi2ra1Wm<lOu^qC5K+Xxv}QQ!mNayGg6iN>R{N
zBj$#dNIU^o>Ui-Ms&^7ghZQ}(O!velp<@D$@GD)gu5WDYfgutX&E>y)0gYe+MCi<Q
zm{X$wu%7eiQ9ZGmI2l&AHR(J3>~*Jk+@`Z|gT8}2+{O~{<3N}KcQkUYvnS}@uh5TD
zx=JkP3q2FiZGdt^cr?v%GQ;{~gWdT&H@(SFg!e=r;oL^#%nQgU*Yr+)WO)2bffLa9
zH1Kn|XB@A)Me*!>4^Ozrtc_Q@#~EnK_~8Rtc$1i<?7Y2dl_&T&X8(m3r|KoMvz>C<
zMXD3MT<b;h+$fA|ERb|Lb~1r=rTau^PHHB-L?v(%XY~`G>3+cr5A(it7A08qg>*az
zdFCUu*#T=PFf3uKj7b=Yg7YMV_`jjbUa_2sH&zY$J*L(-E=e2s7?Ag==9A{`S&Pr)
zbCLoVvSI+v{N%=5nWy@T<AN_I8<ww^%qu;%@4qHryJPw`QUkHCqVwVV47}nC=30qS
zz@vBKD<~=vM+(X*2-Z5h_YY{o{sWx<9_bYANl*PexK3Qnvw4$a(^t;;Y1rq-hZxPf
z+UL-jpN<!ZP1yYyB-^ffxEi|u$mq?TN9WBHI(VZ;!Q)GhbOx`!(M6Xt$uour-&u>C
zf%4z5hNs^@mLP=x6Kb{Okn>R3bF3fvFF#BE6#@drj<1y_UL5PR>F8*Ki3@%BFMpsn
zPFU1(lA63ccd6L)XbJWcdw<dBd5V`Y>+*ob^Pdf}Gurs<954!W`q}7r=de!^WE7?E
z6%B<3qiVYgxS^b~Yv<h1o6HIXfR_E$5-<DQCO=q#;|eu-g$cN+1jd}K5#X@9pD!)A
zO^LXsOs%Ef8tRk-4ZjNR0FE-mkpI)zPiF%N+T6-z5#TrJ^yO7^Cua_1J4?ORzE5g~
z@rC1CW9`=mNH|@!-b{wv@7^^lj;g93f=roAoty|^x(<Y{Ih2s<f_9W19Q6cAEJqz*
zVoA(zv(6OG+&T!&zGU=OTgQtFb7iHFz|yR7=DaxzobouQEhg91uAQw|u)1T_WVDs>
z@fQ>C`Hbfr-Zy7fyd!os8c$LZSX#3$Z)D{PU-uQy{##=D7Bbr)#ODfTX$p;aUa-hQ
zwrSwI%xNQqDhs%sYaBV5G@H)u?Z=1<c*ZOdDP&S4B*}Z%A-Hvt7%7}-e$-#O0yp>W
zA1a!s@RfO<XHGz@pnHOzg3dYa{VVMSJp*PnyU?{l!*bIab3Surr=yGvZK+84vf6UJ
zMvBCc1V7xWS+)JoS*Tc4U<eo3`?V{VZP^lVASMp2QSK0Vxv#^KyYE=Vo@;1i&fJ#B
z<opLHDO)*PrFdk^8Y}$C6rKQsZkP%=wo-ZB9@PVCj=mBL%MHh#V!a(y>C9B4TzE8w
zj^Nnb-zv$ly5+>}rAtNA742Avjt?ZKBJ4x7QIrAtH&)Nbebs3f;ydfr?Q$HSe&jZK
zF&p;>mU)mvH*)I|%6}t4$Pf8N`gQ;kLa_x;@12GUR`>cWW)vYK^Lf5Jwj*eWdW;6;
z%uftf@JN*eza!$obt)nB>R`!DhW8Yebs{iUJ+U#b-*}<5nJnWb3`i6om6UlnLteeS
z9Io4@tu8a2y%TVE9b>31H^3WG8g8Szx|9CurNl}VMJVj(c+Rtu>oPFO5BdOJk+Sr1
zM>G_PO$pVA>Z=0eM^&t8+5t$58Irt?W2nia_f@v#tJN#FA1i#92m6_(jj_|+sS1*u
zKvR$W)9jqV;`h%HOjc*){VfQ_02K{CxD}xw6J%G9e1;ZJ?%yAj`SrEBl1Zty6Nao3
zpKmNl7x2E*q_AJWh4juYLW9GJ*f-w!H`$4@?Fh+6r)+<4Q}n`JFfo&V0sDBv#38Zw
zNq&7LTezELo|2kY_~?@!X%#kddiTRymp|xye3gZTOXN(W%b)%Obj`=_*0FhSL<}H=
zkH3Fhs2)z1NH4sGDNS5m2-+O4D!(if>)<Ox)Sk7YB@ZFD8}l#eRBfhGq9*II%2ud%
zBfv1aap+5j#lf!=c54?hemYs5is^C}puoh{<AtObc6)iuvK2L<p)9b(6K}iLm6)q+
z6c+LgsX(wOMa(WL3XJA#3oiOm`ww6*$P~ngnJ#@e4<&f9h-M!*DATsN!gjbdd(+H&
z-ei3OZM@iRiu&|_t6dEo(XTl4aUCdg7*wF+=s)4j=I0#u>?D8s(UQ>ZH1FQP_>+$h
z=DFu{GS2-2md4%~xhTDQlIOg-8K4Ul{zfj82a{uKyDd3?nXRv|`{S<1{Ecv61-AEN
zKx}~i@$5jbWcB<1+=W}U$HIEIF}oCxk4=mBU^3rt*|4G<^P<Fu8oaw*%)=kx^Iz?S
zuB}d;nuw~1-iiBg#x83l0J(vdDB<7siEe)JdJJXw3sNQUO{r?mAKE_@dwBOdzpas6
zVw!{_D-*MT&I2UZ{hx<E^rAKAJN`;a>#5C?sWh6a04S4)`Bj;Eh1_zkB5F)r$?NRh
zKAyVF@W#^#kgYZt|6%;0g8z@z)(Q5l!@pTsd9^2$I*D0NWv&Dc+?*gt$li~fu3)7&
zNOvghgHPf(%{5sRy)fiy>ej@P6_xeLv4z<hrr>-W_3Tb3WLDF+Jx{1}l3H|UFfB>3
zAV0o0$jzgt@LiNlV{16OtU0bt8)yrO=2stf%w8MGwc?00a60^EjN4wm?O+?@kv0ky
z$zcB;m<cw0M{mKSe7-?ND}9k7pWkS6hCI#wIN-xo+kaK$ruhbQOM_@)r7Vq`d@%cQ
z`s0m;u(Ea+|B+*RksmB~^CkqE-oGTROg%H##S|J=yM_@b?K!_)s%*n-dKKzynDQeS
zY)7d?PB|=ZtB>>UPbaqSq+I*cMElHx<Ykl1r!B(czpXkM{7OVU%r?1=jYG&YW-WuC
zJ|)@NOUpVX|H_<nzjqYG7S(1wP13#S^5DUE@r%To5)_6;n>0n*^wE-~pK5t{*C@ty
z(6f!u<1<$nJqk7jSn>%C*P$3+fl^S(vhyOR4&5WygI;;m#VS@8>-HQi#@t*VFECTb
zK2$kPxXH@LikWv#wc_9Xkiaz=xY>)leKpbO{ZqroBEb2y3z};tkCQZL{SMWi-Dti<
zZ2?wTF16?%aG&&uW=c_Cx#06S$tH&CNuN0Kl4LZvp0U%mf<tgebuMG7Ji>JLr;Cw>
z+=>R`9f~>M(jH7%<U&;|y$NbH?dKMze+>E_e$eeKRerjZ;9oMEr1blYz~>Z{t9$7)
z$Zpk;s+Z(Bj<R|Md4-O%KsMxZHVv<qWn}d#FVUdgIp9LO3YHCKcO2-a_WN>wvwY2^
z^YVZ#KAW9$f|^6OiJu+m5syqsP70GtY$!A_hI#LqN@t{*j^x@$s7n=2=K<7gBRy|8
zX^tYtTT0;L8Q^eA?%1Y<DpRVf0_5K>Y1Xd#uBV=?gsgd!etXzd`l*i%8(bfs3~4>U
zWiWSc{t$>gvtfA&ahlLV&EDr*t!}e_m=~JT;*X@Q?99O`0>h_<JujyO;M!<Oe>nbb
ztI;>g;D47_SWVk5i96I00W_NOh|$2~^7U)Y&~M>9l0u(_zt<K29-N+;aeR$`4TwHj
zkXs1!DgDsOvCcGVQ0@MZ+U0Ooya)jqoi35J+^0GI5c}vvG5n-1cF?Pm!CP_Qtx?0>
z$ixXAW6*Q3l6kZL?mc*;C~W%)V(RQ2wz2U?)x;xJTUS_**S4-VuJf;E^FxcH8(!Yo
z5!dkZW!e6-Q&yH)rD}5>jUB6dre_sb@<|+}4yM}1@@APEpqRvBLgY@HZ%yQjA9iR+
zj&L+d?QMGU<?f_069KU<N$4uCLNe*=PGPmQ(Yexqusm~tFj1#^=$^)6b^}TB%-g%}
zK}q%rsc>3YPp{=Ea{nh#m2<}>m0LsnrCh3e;$-Ay;^ycYn!?v@K;L|0)G1&i-&{p5
zGQq<3ev>m$?s;D<yA&PI-%k3OC+fRMJY-{*A3ikGL)P2-YRg*sE-4%bl!m(BwCNKf
z9jU~TeYwT}FF;jKyp|tX)#bxj;$E}T<A(<~SL8A+{%@5jUu~n{GCkVR@A9}t#FL%e
zmo%eOU3#eh^6k3?0A3uqA^54~-?W8^-A@Z8skisze?l-*0aWOAk)7fx(G07`OCM#8
zO-kk`vM&vp=~@H_ePAAHoGc|yVZjZtH}={aruG0N@eK!qfWT<D!Q>=oPTa);&mH^t
zs;9mtsr7(Q$M#}hS+~!OO{>80`%=4?JyTy204U(2b`)f(MX@Hn#PfBS+eE8a1#+@;
zBq=+F{du;W#8i7rkd`1VONTFnQuxKrP~=zTW#E#^F7ZZV2R^fJYZG%LlTd#?Z9v4K
zP|-xASb^D?nlhruYht-7>*6+bJ69mYC472j%Id*QOZwZm=5P~<IoLIa<-+G*Kc@OJ
zwQ<{fP|BHC%hk_y#Fd|u{Q9l*{g(&!t=I=!NMA%~q;-^yV>L$-gJmTa>{2J-;_om}
zS8LNqJ&hGeUJH7=L`jpt{9^o%SBn4DztJ{ouUle4Qs;*<20zL(9a?G>KHzxYjuw<<
zL5BQ?>frmZA9I)SJ@bILP)J}lm{$uQ9v3{1%(ldrwm0W|)f=^@tA2)<v430OY;U}R
z(ntnH%V89{`Gvez2L;_$hR!c9yp#0il(!Mkk&K?GPJ`SBb(zngED>xYwcaD*_0wSi
zf@yuDIxJ}{&DHxaHY%867=u7BP<BI{{GYbgsaSb6L&-+8z1%=zxAomTZD?Q#)6TL8
zE(GsSEwBuq9_T#7<j8}`>d_PI#Nz|07-|^SE|vzrqFED@Tji#Cx-P4ZMfXJW!|dsj
zGnMc2Qznq55SBOLlS$eN*~+tJ<F<`UJ(2CiG`L7eJi;}*9$IA56Zi8S|Ddz)g=T5j
zh|Ek*S@k=NH8=lUo=TJBe<yH(k(~6mO|HL}`u)E<gDz2jQ^IqV*u!?CbQ>kILmJvX
zI8;k_e-WBBYD9@>HBEB;C~uNFS(CH3bTG{%de_lNTnvO4z15iBki-n%Q}wsS;V26N
z4C@ba_Xp0r<dwM^d^RO6mH+|+Mu@_7U_zvV9+2Rk<7T!0BRe`<XMX?I`<H&3T4En>
zTEAxT@+By3i`?%CdzbTX;Dqeb^b`VE-L^{nRNuIbcv5mV+~qZ2_kuPAdT<*JZu3vi
z!Sw%gAGSWAuNRv=i@m3?oN?;~p6(}v!!oZ+?&F5ar5+A2b>V{?^LQk0J`Z50*jc>b
z9)+&J6d_k|jc}n$#pks5O`sKgzsD!8dJn0V_DaKtzfv2%0hs6*Dq^QFt+9>OX)pug
zM^~J;br94B+YY~Ha5V@3#gEa(vL~jALkC}-`#$=Fa%z9z3lU3Fg@FjHHl$f4JvqsZ
z(#Q($Sa^iY6#15z9kFO)qm(nYy-HC8rdgN!Ywx6sKihBWSY9@hmfwsg_mAfVXnxW_
zZsoFb#4bjVn58p6_c4<0{q02HVd!##!)Eqx8C)B8HBZFIHz43^TA${Ki@B=mr4^?*
ztftL3+}-YlkpRw3CV(T!%S-y_sj;s!1)5e`3Cuy~fd0E-#?$qbd)|9ic$#o-6vlZo
z!!Q~e|1wwNjrw4I%*!9t#Es%5Iqa!`E3)s-F*LOOg+li;Y?vA}O={t@`H37lFd_9U
ztJK&__W3+LD(3*Cia5(Fp(q`6=?5*9&-*T3f@$i#Pu>asd{>i9^cvsVX}$t7iKeyV
zXGOhxxkB$akN>B{7eqZe7;s#{wlGefPSSx2Z&8$O(B}1*2iD1zAZSZTQEwKtU)63g
zn8Rx%<37ufxdyuv=4d*OUkgzf8Gk943zz90Vhiwe43UJa$}wtjZ?&r(nI{$OUSh9}
z2<t|P+FW<Pr{f_XqG0?V-a5f50D6&tG_9Kp5P%Nn+9TbU3Cdi75-sjut9{zeVot1}
zZ&d<Z32Kis>G2@4q|_>4V;7JcE|P7Z_{y4qrq`dOnp-5#{KS_wvneA2civsT-10n9
z=G_1loJe7Lq^s@g0B{q3>4Wi9xXwR-0UT)M+<7Ygl6ZO~yQV|Tm8ybUZUt<|_zKKE
z7(<5D55_KikXoy6q@8LGmuko;&b`!y*CXFAGk@OFe>y=YIQZ`l<q<Ftpcfx78Az@5
zP+dS}-1cfzW5zC-2pQc<q{U(w>S3AN2j;D_m?&2<J?aF=!`m4Z8`ndNJ^?JI;~$X#
z7Eqp|_EC?-;)XkEhoV4Y)C-9;f#(ZB+u*dl^F!1X<wQ~lx?l{h5=Pmxvh=Rz1#DNj
z>n^_RNcpr$U|9$Xg7gtCU=hJI5}r9IXqt#PMbD%rJh~xZY8B{;QbaIO80m@NehQv+
zJDE0YWddK!x%29%5wER^1|z_!8iEcl&=j<XzleU-SDp<7=ht3nbuF7Ma+6XfRVA9~
zyWFazAQ=32e)PaxCYC-kLd<m9H-$R;J^u&z^<(-x%{pKb#K7r%2Ld8w<?p;PaY@aI
zV}0TyaLwN+BL1-#s^pn_Z6+iqbmI}X7LA;fLUS6-`NnXv{#}CtO$PaCR@@BM$z;`P
z!`rAojet6ZYAAnk_Hsg?_mTRf8`<ri!j~aMpmo;h7Y#B$GH)Tx<oUW7E>IZo?n@#G
z-70qTuzLUmI$(J@<X51??Gh&r@F`>JuRdkUB%}-;H~5j}O!j9<I5HpP;;y;AWFuk)
zq(6ago-KqNO}9IGy5OkW%CJZU5OqR>W$_xT*y!Ykc2w}+^wAkn{1>bQRCWI6&#tCZ
zOMl6WR=;1U$@KtD^ZSkjo=H6jn~AZB#va>SY8>%dV(&j-`<))aVl<VaUmW>bUd>BY
z1D?xb(Q)d#T|}d}Vplz;I7KV|E0=J3>35I$znaNy@_`V;=Zs6&x%qsAluemxUJ0L~
z0^9TBx%IWC90XpPvj_N@1BtD&O%91kdP32LY`45@34etCfRp<^g201m)L+)+n&s_-
zbpzyjZWs9fr$JFq)0>~S606q}pn9h8B!=CxNgy{u0d5^+FC)I#Hje5o*CdW$tNoT{
zCTX!5SIn#sZ-=v-d4<XE(c3~C?35tuNj=w|mhZRefKS}iY@hv$lg=E_O`hyW{WUI1
zRe$72+220j(yLFhNP-I0Q4C!h3LkY&m94R&?3^aRC`p64smrGl2`C`4Xn=TWz|OIa
ze!RWIe`kCuuTJgGJI>6U`SHT+x#|?N1Q-@%J*9gvH9%E#khsynzHa|o6iJhxRe)mA
zea%VthcH)HBZm0<!R@*PJvO|F#0Ut;#h&r7=t)5uHYo>Z@+_Ler)qt8x1c~E{X6>N
z8_g2G9S^MN>Dr@%-_<zJuPoG24HPv4D0Ip&ww%V$I3~BZihmMj;i-gs1@%q4@8orX
zVF3++9wYsnEBGcY9uTr7+|Wai*5bJ+@i?wI2}Sv6oY+;{k$%2BK!7509QZuCYgTuZ
z>vMzg*6)<ciExu~TJZN*xvW=soIW29ALV*-;5z1{&ZIitABUuga);o0t<wKmgCRV~
z(Ot?0`J<B0IEvCanz%?x0TLCLIQoF1TxikIq6L!JCrbf;w2I&i&!1-E)LCkO1>eMl
z9&x*3O?g~$7?wv*l9!3S4$v%FjlYvc-Irq{<tX{LmvG-mdWKa#U6;AJylOBTfa9M`
zLj+EO9#S5|U%Dbd@E`aRtl(DcgDbztNlTMp6b^ALXVG;v6}ag#mQ@yR4A3)Doi^I#
z!ZtJI$cDX)QWbQ?BoZ@=#~<|kqDAHHc;~z|*hZ;^^!rvVgva6t0l0>Yn=N%Xh<_D^
z27#9UnMh*!Hlr~d@jdS~SCTx~@<VI9Bdi>~L>@9ivU1n=epg&h)IdSO2empSL$jj>
z5xB+A<I7u0q%tPR4d=N%;1Ioc4A!R(1}4AT@&XSI>xHU^%7F9J*PO%zE;sI~{T3sk
z1^hN6ChCjtawUI@vgSUEI$G~5^TcY>PZ1Bou$;d8pVyQ_w~O%t%qOGn>Vt_ET~=P4
z)84hHIpq_6)(7&?EBL=XFi?@20_5L7j>Ecl^|tsOvNTxK#f}y(T{K<7ZIq)C)S=Dd
z>DQ-|AdI;e;>RUGLMEqNWJsMyT_aunj#JB>`8)TpG}qki#*>dOTH>e07Vwar;>aeM
zrkM7bZ~mY+*d^p$s(T%(RT*7~3u{M#iMaH|*_`Az^j>chh(kOJzGcIEanBSmjAI_R
z{De1gm|xTaFY2z~4Q9C^AjotiieKAS_3TG!^sr5(Y`w#TP$(M^8`33duaGLl2?N)r
z@_OH{J0ZMI-4=F!c4j`oI1tpMXJ2yp0~?hP-C}&Aey;{NYG)PNS%Y0HBmynTBPGlK
zTSwKVy}yp&g{a5fRP5~jjv*NLa(x8Q4!4riJfde{BxQ?4jUJd`_&#NS`dv-j>44ni
zc9AUfJ?w}e90vMh6Vo}PiMz{-W(-y@E{*!(w%*PK;9hEk7cq*IA#E8_MQOgdtmz6q
zzH|Xl6I*-7twnyD(NFPv@Kbw|ToOv+=+HuareqUngo}a$>1XF}bFdC`;!V^(-tLj{
ziXeti+Y3j-MLFuU@tOpA?2;R)4>ckJIAuN!1x=ENH-ft^!Y{Rr2bA{y&nCRc{9D~G
zXWr<K?=xh!7jw{QJ-*@xm;Q40gU!Y{20V_SKo%cSJnkWT%uoq1WJqX7srz}>8+pj8
zAEfl@_apD$VmiW2?f^kyU%9<PzRbQ(F!?D*YR;A$Otra%<qX^^O*-p`!DX9l<g)8L
zB4)$P;r7Q;r<+D!$MmowHn$6lH^n#(N1$+w@JB@*b(zp7LL=Wm7AOOcp!69#Cl!*(
z{%nDKyMA0=lA1$DWAQ6%UEeDjg5KNjp1WgSS;9q^8-?Z=Bzd6%QY{CkM?t+L$;!{E
zcw_+Ny9S(X%Nd651RuXTy7muX)mes8)w%Yx$?7s0ziD22SJb26-m{(L4{byfhx?KL
zfSRjE2!}OKY(vhEhN_o@uUhL;{{UvmYuz@;Ur#j0*w24fU0UGsyvVPbT~%_Ad+$}2
zeidoygp}8R<$;TDJ1nbcWbnJ@aY5*0?)@syrO=||TIy=cWvJfgu9zAXJ<hy$ot^c=
z86oKz)a+NzR$yZ@^kNQA!+-bpWXQ`MMGL~*AU#JS0)u|%VVlL(bSHF2|2Q+8L*(&A
z+gVMN=N9og8a`dm6(+K#ZKUnS`G)Gtb)hpY?ULopE~5I2Y?o39E`yq;Y_f+t><Msu
zy>~vO`%pWyiE=jZS--#c&XqkU%&OSKsr9q*Gm^0ZX6N0~3|phuAs70DTLXuv@h$gB
z4Qpl<BmI`K{nYpuKF6L0*R`G3XsF6xsn6U00h%9qn#4?|<XI71(-jj}pNXvLgS*dc
z*k7Dqp_a5%_|!C5#FbZ`{eH4`b*XEzfxYcr(I4B!+(}vDsl3Yhd29WwJ2?nqmQ?ay
zeyFlK@DFebeXi8Omyvn>OcVA>EZJVIP8Coa`|m*bI2|Kiy636=srsv{c1&q?f^Uv#
z(82A#!23T!qz3=o^yIKs{Xxq9@#R?h$N3J-YyX!2x;WNQE3(Q5w~Y|WQRJJ-n4;3T
zq1Q`MgW7F?opX}hMD}*y$f-o)@g`a5V2J0<yx*Bv-ZOCVq=2~qvN65v$qR+H6ALOd
zu@()UBhlq^OHW?MEJYA<>2OTWqeK@x5Soe`SRdLh9ozu0kIQwK>J_)GHiPMyCxQ(>
zirM2%Gq$^vi^L@u!S&C&E`f*jmc4q+6KLU0g&?Wbu}nM!yxGi6Sp3*8_C$EWVCqxz
zSe6*)x~ms^{W&_hL^MnijWvl<$wXlj5Hp%#(WT<J+QCTAjyQ62))AE|<}~gLfq^z4
zKDpz*OiuYr^DdE_pM6lO-U~X9@}G;BJeRE(E<%RtzxvVU#WH%fWKJz74p3}WUP(J&
zhk2s%{OBK0v;o$@W|<yHe-RB0f-i0r$FNO$xLCnu>Le}})YivZNoniu2hNZ}z?#06
zV3l;8e97u@=$-P7&3Xn#i(N}vlGLPu<NH!Mk}kaQAfq^zVN$ZqWPAtH%P1}LK}6mh
zrirB&Jxa{Y*15==6%r&|mv5>k$X%k!&O`a8|H7w6lq;Fs5&v=#T)$4wl?1?m%_LZ*
zNb33HvIE|tUW*-F-`q*M#2ZzWUb6ItGo;N#D+72(KNIu3x{*;#0J$Ubyy&aHkK5Nz
zWbsgx+PD3}fS`Q4R5EB-`}XuB(wkqRYlQIBV&E7HDjLCJ)WuyCn^Gi#wnb5e-6=W!
zC5pFn`BduPHq{PQw+$7_$ww0m&nV8SveodB?;0LQq3@joYJTvRnr6E91keU><a*Lm
zi`s@a|5GNSmT4!<V6JduA`aDd`Gs`#X>!*HsR1lu^82WRBi}{=*hksa%ZD?EEzSh*
z1-$~&^oWY(cU>wb8w}asar+#Zp5mCxp!A9F7>DJ^p6<@O#F1q@N<|!S1sZtcc&kN!
zY+LnMALbYi%)2u;ZlpM6Ez}7J(2t~4-XNHKJ#I?4vEcR84KuLF?{0RIR*yx>)v~Is
za{d2Sq3FJwB)RzeKgurtA4li?NcH=_@fQcjin1cd%E?w%IGn>F;UIfcWK(wbI*6j<
zaE=IZD6*23LQ?i#A<5Rk3E3+n@9*pL{R7T#uXEq`^Lk#__4szZQ?Aq)LU&It!u@y5
z8+Hs^jqY<U$@Hc#F~f@n^m)?W5BsyZ6W}$`f%66bBo&VFuNCM7ThbdMTQ1G-y_LT9
z&7XhaO`|cLQQ1i}8037f|Mem9eI~rA9-)98Y>I^lhduVY6xJ(n?*pSm_vJnZlwUz2
z?OSx)HB<eoV9dy#C>uLh_O7`jfN!)gmPmDsXN~?!IVg+9qBw2ZXT05bB$8!j$iyfw
zhKfILw0NskZy3t|NUj$igh?aUN)>Yp5D3v%$iU>`FwM708JS(<vb)+Sm7_vOSvX$o
z&82DyL{}6bXr|>l-;d`$*Vrw>Mh?!9SYZ>7cg5*nX;3^YTb=yE9zHtch?_FLbv>B#
zc(^!hX=l<od8p;SzHbQsmU4kMZ$6_8W*xU@6W8e|4b#x)oCF*0KFUw-C9m2z>(09R
zS?|8xO3z=lc)4-^^T&s!n$g)u-OYjs$!Q$|Rf>OxL|N`$3k3XjcJPwaD?^)`CJ%qh
z1hz%KN!rM#oUMPO;1_M~-H`eyzgykHH(ak*dH8W)x@c`7VM>L+L?D6MWA9kX$2{yR
z?NkYkNMJ4iMF^Btyd31REBSfo^Q?)`yNN(SD_L*;_Nnrq58RWz{x)~<>DIJ*&sbUy
z$1Aso#nEQO02z#MdQX9+!FI{^@@z#BcUyYgG>a}DU36UO$5`H`>z4ycC9-(jgugCH
zPQgDU{VcNLZRB20-IWyC?V9E2C3fKa7<a?Tb8lMN79vy04s_BT?)|q#{oQ?x&=Ci4
zlH|ZSpWwDTe*a$>hupiqiUj~7>`JdTL)osXIk+Ptz7g!~6XFivnHJuwB1Kv)TEwea
zOUe0J#m4XM;g}tFw*Fe0rex<;Y(~dU%{*yR;#%XuU1LrizV$!uc&4N_Q|P-<PmcJn
zV0uYy!Fl~W;<%)(>QZ;rU+p1}_%MQaefIo{TWAv4sc(pemV|E*p3U?sjCvb4QS%p(
z1px#F&+u;Zk%;EjijBf@n?&TxE<@}6UvKXljNWEfbA2k$sSI{wvZ?%&wQ}|I<`#k}
zzmTHS-)?|#161bsL~04{gxG6wmCDPp%3WZo_$Q!FF-yFLV~HKdKUcJqZiUm9%pmAR
z_I>Nd|0%?on+^%z4^)9<Mf+h|ZjAA)h3>yzBM+pQjyP%?F-=|?1{rgh0&4C}KIQ=2
zQ@Ik{#lq5I?jcn(t@pjca@8{B1sX#k?p5Rwi<CEo$(W^{7wX~yZ88|pLm>apYq~=5
z_s2tDZWqlzfBYc9qC8+TjYMw{+b~=n`LeA(hs7G0chKw2Sn;$R{n@wKLaY1`bQu<q
zQDKK=ukiGhi|!(~<i6}XWWB$L7A4I_1b8vf?9~O@yiYLsFyjnb{UIYk(#gR1hvaJw
z`n;E2bmz1$5XQjfkO)Fc!R^!O2dN61k0$#N(5h<<hvca;PyDwT<Pe`Fd`cP4j}cWX
zNqy&zQ3>-%;hF15)4xcEXyHZ;qr@QE8~cZsR_9C@v1~eip`s(frEJsA$4^V3J}pJm
zm%kXYzUt=mSzNMAp1L;h&=Q0EBA-5{o`2J%@`~aq(tpFk`IAB9SB>%X;YIZ4ek<cX
z>9)7KYc@R&`93Ux`44~9-Q%uUV0dJLCNQ<|25!QzouT|^JAW-~n52It+|L>>lN?h%
zSPSdkuXy`X{llCTQ2(MXiJKgW>rO?3a~Pf8CtOII#?`EC8*?$L20pp~)u8`?t4z-l
z3A?wlx+dF}((&<p>S`G!3he>Sb+;siZqMQi?&IkxRSvepc}sClrHq#~A!)K{{;@MT
zG|w_K4>!U-y6=+R+Z~tVs<yEz2R!io@?Z0Y&F&-yIEE+kt8}i6$s`tltoMp4^oKg)
zl_?Fr3LjS(qYvk@TX-l1<TEd8xO9k^M-Dtg<F+94qJOKXkPecp!2AX^{Br|2>EhmB
zUK!9i1O`XFKU0}h=M1qw2sR!Xiv&HCY%R{GbIlTV^Y8Dr9$L;YKiK8qW{OjRg&dx(
zE$nuVo8CFo33G=Lq1+Hs179fwG1ea^OAjyOeHPU@)2Mv%i0AFvN8{<}-)t5ve9=yW
z#K7Jzb#<@)PgWti=Dxf}1JPhx`x60!G0-gZ5mxq$8$w*FhNU0pk792y@Sp#_%vipZ
z-n5CA!-$p*AK%Om3l>fm<hqS(^ms0iodmc;xS`zOuL-Unlg>sBsc5Znj)y(nzLbfA
z2aokTFmjO@G=#pRHoWYQbaV<m?PonUE{PC2x9D*Gi0~7W>%G$1q&uZgB)IopAf443
zDFS`($IMe@KbQVYF=P;xjtiJc_4$6SRqjhawnd?!)ZU%Y?PLT^E%xBKHog~C{_}gx
z_eFiWE(_2>QexW_6cXeY%MIYD&kD%n3)JDKxnnmU*vxJHnMh%i(2~<tX6}Qc_ICH?
zS1rEVNPTyi{a_E0Gjs9Bl#}3sjE0UI@}FfBAb!%H35`u+0Q(<R5WI--o3r1+`rZ90
zA7`ED6Dmp|W#G%bKWJwgJiS8w&H1nWMLLH6fCyBC<#Wq-OUm;NgI_}iqAj`|x^rj)
z?36|H;hAjjgeGN&=t8$<4k^hGe-O(t%#*HK=^iObyjDVCumBDC(S~uaIG%ezj~BMB
z!P~&ihwVikw9sX{y=MBTpN4E>;<QwzAu$XWa2JGoSmE6o$H-G0GMd^W8vP#`4u*7j
z-l4WzUI{x@Nj#k{Tl6zD;`3kMu*Owa>}>@$UY00;#e>yKJjmU!{kL>ObMDEDiGK8_
zlcK%`cooV!noi!}5D~bFzxUH;S2v;8wQ_Tv0mx8PL&bF1yPWAhnwn%&7oR7LQ2vrs
zpOr#SW-D<dBcqPYOwj>(3zlr%A$xc5TAR`dnAgs0L}9r%S`|3@Lr#ku>0PEL3@_5c
zz|(bsrP-@#s?(26X9*cAEZvJBgO2O<?@TWzh2CE-;v31lDre||SdM`?MtPlP|1z#^
zXcM!5674)_s8yH9)7u3q8ScceWQ~UvPSSNg=Yow;HEhlg)Au?e7mF}gt{a-WRQJpB
zVz#<Lyoo)5|F3!F_9XYwK8(~nylUaxL^3D1c4rcG8lNIs;2XxO0dnDB|MI)>y2^o}
zLK^4H^Hq};lL?{&{C1;>z7CrkhW=Xa0VBguxU)d&J;93($UAav$oImWqG0bsFABO>
z<W|Sx+Tf^1><ExEhi#CF>JoH_D^@WQXw5&pP{>N;E*RVREgx&EwE8e7;-R|Caj+~b
zKK~PH_k!`q23DUzFAh%HTQ$A?EDh^TNQ!z|aX;#l?J#v$N2B9=F5YKKJl&3{s0icB
z+-w3W%J5_J+D%vA=k8TT-P>>3wTW7{`ma-a<2e_j4+GZ>XP9#*B4zGsgc2yrKhwp1
zpxn}#=kaRKGsm=QdXaejg<TD}>yz1T1mAxE%$OnnzwhTAliSGo?4%ys$8@te@r9*u
z^JjU*=ziSJekt3-GC^GWa5x3g&)9G``{$o#@tXPp6AeZvC!-XxssKSjHJAH8zBR%=
zb81ZOE-DOje`k%B?^Y*o8JIKtfS-qz(E;uJ%^p;(&DA>VhP>vH3;6GBX%6%;C*yAu
zqq++~e{k0ogAK~`h}oFf^wXg+QaHrqy&`o8GWSv03pGpDTl4(Sso>Z3`F<icRn3V&
zH)}o`x>qb@%-9tXQe?@zplDbB20%HvLi{MZ-DJ~_Scd!k&Y7TvpW*Hj;0F#_x}%Yx
znNi0KP5p5N0ooUT9F`H`tPOjhwNI}c>%XpBApnFQZ~(g(tF_6ZyByne+H?Qz$i|fo
zg;n18C7Oy<-|lZ!`l7IdYMZvR)v|+gNl_l(hQKo)0%E?U{O&u?erbhsZqz5#{bEj!
zK3sj@CU{z|%V$@Kq7BP@K`z_$9v_J1RYj-AlbV&!8moq$rKX(ZCn0Z#yjx>ey%Quq
zLq-UP^p&GHwPiQ%4K99t>K(c!BKA~9zh<Fk!Jm-(FSOG4LEtqrvwc>BiRH#PgdW=@
zc``k9c&D=2z8oS#C5&`N>~}_PEpEZ==-K8(bZ{4+iS=9$&jf47-i1fMsBD$Ye@;|p
zHu~Vp<rRF-JVkL~`iVcu|KPQ+A{xRz<3cH^t|%Gb7<tm#?+@B^Bu4R0->A5FYSvrI
z!KjHuZiM4Ve_)g3YOcWf2g}_YZP(e6paZpW`Yqu!!JsqD@H(0u125y5EAd!Eqdc<`
z4QQQ0n27=My1jw*4{B8LGOVyeKCjON9h&4C*DOd2%BVzvN-zT>{^7+1T>7|qVK4TH
z$pN?}DF4(lDD22Sv@(nw?-cfa^}Pu{!&>l9xd6)B$ec`Lo!SWUC^8(&bs1B^q=~-g
zidZBWPkLVRr$&`k9*#$Y?CdvPGPRLd3eWz*y77l`J(h_%j%c^Hn7YDVc>d;%Tli3r
zt#O-%Xa|476X_a}>b!nd3NgKG^;mZXwm_I7br`-GVUv%~jf*DLRToORDM@uJBLv>C
z_5E%z83P&W7KDje!^=?ap0gc-rBj34blwab6?_}GskxC8!1-cDI9g6wJ;CN<Mqij`
z-9>dZm1wm(D(<`So)!o`-C^52J*=j;`gM$hnMEcv{f6JP`Nam4G}$gh_g)zdL*ny~
z-&;1rK^B&x5Vt*>JjqXf7)E8(JoR>&udgFE4y<_-mMdcPD+xZwM&Eq#*0bLB70u9y
zpt`JK(Gf^pAIq_Vn8K~CKOMlm;gpPxPJ6IfYAdB<4<CB-9#bee#gfw)gnEn(3y{~%
z#Qo05^XiKR4BuQVT3cH8DQAJn5y-FpHLZMKPY$lgt64k4o%x?nN7y9>O3LB*vk@mw
zSU7XYS#DtbR8~h5Uwp}&Qw+1|WkTLBVK^1&vJGD$DiJ{vT^QhV0B$?X-R!+#dpO3d
zGE^8m1RRVo^NgX;*!`l`{{U-$QXE#$pGVEsy>w`fq0<O<RY8i03zdpif2Trk#e;Mf
z$*mRlE)B#ZR?%z<vF!85=bXHEwM%Qr>A4c|$LU6*G51(M2!*{0sBvUDZ4|(ZQGb5;
z4%_Hp_#prRAYQ^Ap(HAjt~MB($5BbgeI{2c#3@F~^V5Zb-)jGIU#m%QrHt$k66Vaa
z0$CkN7=BgsFsv^E2+Vn8I2yb@1h!3HK!>Zt1OI;GVZSgOyT&j~u~gzxO$9;@inF<p
z3B2_J8L1oqQ7+7-O7y14P%4pr$^WczrJxUMeNOY}sB|FxQZ5Ch_MFP20WOb=VA*Hq
zkG5ah_KOHN_gd4~lVJ(HDa31N%<2=E3_OdTe-7K5KN&mHtm<(?eI4?Uu!hv<JFJ@6
zHucJKPd1zmfUBK?fn;4q<pqJ}6ASjNJ(Ar#&LXbW@H;}SVOXz3$of2(Cg12Ca9dLA
zD}pl3X^VKx-1#2>p#RBRx@%cK6NQ$HoLl6iUDn3f`=T@`b69D+&nw0W)vT&INYI*>
zLEG6>BQ|`@Kl|Q_Q;;X~HsanfWw#jK6ep$M9o0?}qh@Q+oxSX_8b8|{wr-H|UHB^3
z-G6+kH{JI8w!MD`PV=1o?KEL{m<B`#!xcwZ!cKw;7}$_@AUFmZiwjyeZWm-sm1Cw8
zJUJM&31SI=(s)nBw3yklUY8?6@XzqwZvX?Wz<9Z|f*4lA+|zN{o}|k&7hd$NW7R%D
zGvD(6(iu~Rv$o|u5cAON1EfGBLTvmx8k%#-CUJy`0{x;A{roiap0P{UcgN^0Kcg>V
zpRIW;Of<T5pvSQm{qN<(hvqZ{!Lto$mVEmQ@zV2rH+N@PFX`!rsc+T&%!Krj@bUNP
z<XoUhW5~$V>;1H%NiUp$hax%w>AF$m`F%*B9|mv<7tm{f{}j!}GN7Ozv>ma|13nxs
zX{`Kn2et?<JCcec1(HFBr9Zm!NwYBVw7?y)np|^rAm%%c&@T%Son$THNT%tibBz_|
z4F}hI9wA&`r7EmhLdm56U7#vO{^GgOJ55wzQbD3tIKGRDQaz;VZ>Z+-`=?}FBcrMb
zhe0*hj3NoMo&&fLiyk~iv{U_c-tAPw@F+U-Ai+GNx?b$}OO3|b%7QzlX+zJ1(<TuR
zFn?-o4Z21FP7rx?^Gaga=SF=_GonsFxLNeK7xRM1V1XaIMSDv&ytRaORuk|nr*4#H
z03dPUQMU!n*(8*&1>z_ri^kdTp-#bNto=%*CIfQ-Z~l2b$jM2&*eWzxKAfAHodg4k
zOVzEhyO@3#_IX0@i8+Auap@kcmn0h1>v<5}@&Z#@!_J~WG*$Mcb}aov$8hF@bMph{
z9`(lpS&nBNq_9^E9+>RZfq+8TcWw^Jx>w!cHk=gooBEeRD8oET=Y#buy;(ZGP`aBx
z{>&?0DoMn7CZGW_KT(Nv)Z^0R=@}YBUwW2Ev<N){(5<aY=02yJG-4W}f|U9n&HA5~
zHVvs(2_xa7?E;y>AJxp_qCyV}7-#|&IX{K7WUb!0tu9CYUv><^-;NS*Gx+!i%WC+q
zjPP`1Gwp1)2T7R1@)uPY3<NL4;=|7C;xGb&xJT{5i2d^Thw1W?F#mc)%b-ohkOmBU
z0T4@*Om7w3**{RrOF(5wB;IYx@NXcE$0?7>{n3`)b1T$}^Z$a@Oee{yM4T%C#b#d}
zd6O30k4LqvB^9y+WZ+a*Y?4t;ty6)!RSq5B!{mnSN;jd79@MTGdS?x*t-`=bv_OK@
zZMA#9S^{$+<Kbh@1U_~i0rC0nCGo#N8XbbWfZ=BwDNOWZILpuS-KefJ87R-0mv&#S
z|FCH|$<w-^1)A&s*O*2V)9Tcx!h9)z`>jl^!~*sSVjp=_q}j(<vld=8wr+C1Jc-3D
z!~si$^RNPjCEYIW$c~*KIUeS?04k6M+eTPs=6IdP;TH;wn`FaPkB!6k&}^@cgA*Y5
ztlmS|xZ6#mIT#7u6;@WLYLV-_B6!`%XQjY;NtRPeu4C_qfF6)z1qYgye31J^;Jsk+
z6s(44KID0A;m^G%k55K<$#!2lP)`B$sGmM=>;<q`3Uu#0gDI*4i&hQeMun~2mhy!A
zZv-#}F>UE>_I+^__4}h@Oe2(yc89{rl}0y(Tz=wT8NngB=OB{p1tVi2o%FY65WI7c
za@Wm-N33BJC}14DxMrjC(4BkT;#*2i+FRnR4A9NJZhH2`CYU+qNqjd)x?ILk)QLOa
zSGGVjOMNDL60eW>LWn5e9m4^h#Nn5X!<>5b$y*4pn19F0R1R#uQ-YO3z>momU|?&w
z-^CI*kz;c1Amv>4aMx?-)!|+Kw!3!bnUeaU>5=u9O{I)Gut6aY0chFH<9|D<=Zx;B
zVxd<yeOV&a$9<#Wf0Ko)J?2>#R0>#U^uy_EpF-MwUiuBsmgebp2aCe%-RDy-v~`|-
zfQtG{g;K`PIfp{~yY4~$nk|MQ9d?xLMk7_<XfoM*eVQG&w5%zhWV^XKv?FdFGrT(=
zQQtOAoifQBUaWtzf8()=>|#kXA!yb|3!&OBcdZWUDX`n8S)wjmg>v|N4Vri^@)v)D
z|9ouj>W)CiT_<s^HY0Wi{SXfC9}h3q?7p`D4`B8vhjO=6+!OkmDB@EX!-&!$-#Fvi
zJG9<@{sjFm=TX(gv->}gV~jTvH|EAL82N-f-^~mS({S#qFY!^53twT;BlFuf0@H}4
z(MTDobEdyeYp7bgP*?7?0LcTkwGc*k?d~1BB2@T~KVRFw{uEyL+WsbatnCxu8v+iX
zF)3YbL8->1JLp@7iel;#gc7)rEOhc4bMGIm>Ho?kX`Leae-X|G&Op0PoXF~rlkPK7
zb=X0QL#N8}c<h$%P0aG=hOBBD-^K>Fj3<>wSHGH^Uj|cCs4o}((szpF71?T;F*G|d
z>OurTP=n<D;aGb=JCEWfd?^~{_O9O*P?uwU9_`+I7YTPB@o(>Zq!u)C&J=2;``Au{
z#ss&hrB~n>;2+!lMY8fqOSpU17kgP5W9{=0|1s$Ly;iOqv{We-N_YMES3Xz%a*dC$
zl;#575cThEj9ZGi3FR;ca+_tNybyReDTi5jv}!BsNiTPWbLul>hP32A*Aymg;9rg{
zh$YnJJB)n=%P<RN%FEo;3V^`*94~tJs}m-eCwRdpIKtVfTh;aa8<R;+biCLw<>AGN
zkCAa?*ujj>t?v7#H{X|Er0~xgaRd~|U9Fyq5A-I(tDrf}%(898+M;n`5Ye4CTzDSb
zW0I0f{;H*O618jX=d&*dXt<%?X6lOauw-}D?pqT&A-5O!7UxosE`MN(^yuGpUxB4+
zY#Aoc77FEPImvhX<D*WEAw@<~dGXL6l^6xZ-^P8XFhV>DqyEp!L;|z7DbXDEJ8;Bt
zv?vfGXk6ks41**C<u6PnX(xk8&*BGBn;NDSMX+6+`gb-2>(Y#VzlP%`_bR=2OK6xl
zypd<vWIRR>hztZT0pJqui2Q;5={K1_`p#P@z5Z&)PxU<AwwH<`aXv7L+B_v0c*@lC
z)S5@PyAMr92AZnQU|Yhxy96LB#m|#o4#KG~)5anr7~vOltDOSJ5Xb&w_<btw+bMl|
zfO4xb;z(gt#vy=!+h!0*b+9ep!|(|9Q9p8Xg+(xCIM)Zb%%?SnwiG}jwpzLY^8E3*
zpKgfUb&g^xVZ1+S-Zp$Q1#{h;KeieAM*B!A+<SclZx~a>0j%W7F8BNtRS$tJ1sYeB
zX76qTWGE3+f~MCz)o|{H<eQ4Ga_43ECz#&tX+04`?yYa2Fa8I-s&gK)=&w;%vQ#Sw
zcYCMfak$=W_zjQ6(n(w>gqNu+ad(CC(Rs*LY!K@F3`Y?AJczRd0I@=dwXvsKi<w%*
zKkvdT+57Ye!&6@%D8MMaTSi}_J)3M@jGC8>%QLZmP-Ubua&J?N%Fs_e)I5F&G5j&Y
zY~p&fSwpT19)pr4c?n!sh%HtZb22&}G~_$`DvbsJdI*dWNSm$=%vjn3`%ulf9Tf{0
z<pKr}N60bJAl)NzdLskaX~=$&T`c^G+o+7LU|=^01Vj3=tTgr!<=SC8y>zdVm42Qk
z1_2a?ahIK;(4(7h{15{Uk{;K-A|3npK&0ZrIyc%*3d#-EcT(4F&r<94*ST*Vz@1A4
z-sr%zIsffA8JV`@WB!@9%WHqVz8zSn1gD(NlXPEWu4T%M`Yigd`Js#g!C0Wr6@@Iv
z_sTp}VS`rAs&9RdG4_!~T*yl!kCwg@FIn~7TJF(xGyY6iy<-;0F!?Ill=?_YjN0#U
z%RLt;oHZ*D4}ez5cjomvY}II{1y*VFkkJ<}UzHFywg#Ra;WG)i?<{y>i{6_QEjyzH
zG!zW^m2=+;d^RQ=HLM#nJQL3nfClrWle7T{Xw$Mn<K?ai2ebS#48R<q9-xkTzBM<!
zW|he+f#)6}{z-6ij2R^qS?66l#yHs_*<=ETKtr$zEM<VmudU^{s1q4|^<9OTrridu
z^}+%LtFls#lv9oV^F=d19U>ZHmR~GRWov!a6K31xAaGrC3D07*;)M}1|8R<$Nw`Rr
z0j>i}*1WiI(}{b?PT7T;`!!*|mH0o8U!!}Yp1IJ&89Rg70*!3{%8f5|dV9l(21{{e
zkA))mW1hX!Oa(H==!{;_b}0)J1LzQ|6CWxa@eZ@`vBHGi^p=hEv$dO+vCJ9)MR-}P
zzb<pH_x{iLp5Mx<y(kT6ENTDncBUdxK+4Yo4O}9ro>;t074P2M>k7HF{`WMe;&5+J
zG_56#BWkRUnVhMtZr1v`#ckSS5C+r9M6$71<vT<^s`#n!BJ(a@27Gh;ZZc#=p-_?)
z>b_>nKg+U}wiy8LGymg>@YN$vRi?&hV;N3E?TEdZQ6~O~3XfG5c3^?x6TrfX=zbUa
z;^}_S)R6&`B81kklzyMjAGg;TbrWofiCgtScA8`}IlAC>HZkPn-FFcNpEBkIwcLG1
z>4)TJ{?Uq5x+}PzK_@o6eXsAkOEg~aXLiTxE;gVH5jVF|V17bMSMO{LeK(ddLJ0i0
zx$6`6;vWAF$Cb`ec7fbiA9r@uX#`q!CD%Q*Of`$`6=GR8(^7u^?^wmR$Bzu;m5{8@
zK1(@Ejb4|dKIB;lJilYM7r6kpo)2aGmg@q#FJp$N-qAXI&`ZNPreRs)Nl{eYqh)uI
z@`-f`hL`_2JAd&*&^+S2U2}Bl_3OLPkSQxc7aZyD!G4LZlbyDo5;7Sv{AwvTc;)?!
zJ)NxjtY%3+MEPL$Z*))qjlbidT&cwi32nM%zORr;$QC+z-D}I2H#_=IBb7X{k;f$8
z;GhiI?|CD)MwK(KmNg)B|M0B5^Rsc^8@r|JZ5kw&QROZw(GTvZ0qVv5Q;TIcmZcC#
zu~D%sSp0VXV}@YF8~<JlQ-O3+A^)?J9KKf`S~5)%?8E^u;Sb>^3!3L7<c`kRwO&c7
z75291oeBs;AoJ#$#l06j_*`Ck66GvH!mF5#ekm8YBrcaYW`{_;nH1VA0&9+lVded7
zarnhrsykJ&iE9|X7<o(Y0ik8xvo1I#(q+@hu3#<7sNR-%XcvW@$=oGh#ZZHDtDrlc
zR7cyUk16&eIa=s`x5{fWUw$e2gCy}h6<H0rG$R}g6@6tfgjmn9v0S)U^)hR5t|L*H
zkZLb5JW(iDG4-h0MpEQBz?vDhfk5r8_7*@fD}xBOFV+%>-9-P5jP=;{PAktP!iyfM
zn8?0lC{3|ED0(^Z>i&UAJSS9l9_C{GM-D-2Z{lL`yN-F;)~SDri3lg?k683GRzdy2
z_cAW#j=PS3m>HCBooNwb@pX@T<@^0XoDg%ur4XPczz=E`ADc6P|M`t}d`sw(;*z#9
zoSpQOPr1{}z~%fK!MlK#BoZ=1We%kcJy2FR>Wa;HD3WK9bLaJKqt9<~2n6>5>eK$)
z7?*^blSOXsQk^brL6havVa{Xzl=<HhC5L(Y!u+OBTrJ4)&Eek4OMAF6xJgKm#BAPs
zy=VLj(OMRc`jpiTQXLi39fjKqsr_kbCcQoj%&hl9A{f8yP3bt=dxufu#C`NHvfgV6
z>~wkR#H<1Mh-p4jUQhq)oFAU|9}rwymHs?fbXheHuU8rUM45w;>}+aZ$T7XVIa2}v
zDj<X7kNArp;=J_I^^j_+I?@t*`piGoe-gaUFz!#a>Bi~|`qV!a#j%>4t-0zKM%Qp^
z%c)`fcgqtHJwPBScUz1pbCcdXtzh^0s~Ly%7BX<MGhBk4xI6eGbD)ALuiam=G4Lp~
z8xos)k`tL(&we$fw!dyOICW*naPF_MlArukxlwfHgm;=%pcvuf-t$&|vhv2{h{&MD
zE|->fN94<E*D!ErLhDjG4v>Lz#CY`8Dm>-XJ1gzfbsB1*)$w7V)W37;M(vLkPD#9Y
z<aT^+VMtM?AOsS{f4E`?yh1KQ<WAkkbB!<G)SP*4x8h^x3GqW7Ajo_*qd7h>9hnd(
zt&PXV!JC2?F`~r)%v9@zR#*V{V^QV+%>6WAYb(7w9Dnq1SGob$QKM#kb&vE_=7f0<
z&2gc7s(K^Q=~zfx6YCe?KM#v~U?P>&UpX(yJ*jrY-O_y@50V!j_;b0iU3gmS*U--l
z1mg4L)DkP6gpFE#bZ6!<bSMz?GgR3dl0P;Udu>5-$Y$LnT<gRA8}ZWy__S#iB^xSz
z`Hc&f<wpSeHGL&`IDk-3F>m_R@iw5A=msxsHKc;W9+gg*!KD7I@uc0q`w{GBRQ=~c
zcbdLgS9eR{)o^Z;V(cDB!7%5a{c1~iH)}M#GRt<XJDFZe70(~OH%49hGLa}7+yL$4
zmBlhFU2GJ_e=ifsJ(4|6@5vSd?shY##1Dlp1jI-{UKtM@akW`fZ|Jxm>$dYZQi#zF
z`(=eTn=X6swhc5VO6i8d(Z=ZeiB>l0oid^j@n_###|7`L&WA=cI~pA6LM@DuA9#?l
zyIA>Q)bIqhNxXg%nLChlm2Nikv{+LmI#0PYC}RA%a90zXOy!qK5JxB>ofS$>E0hYL
z3%W<0J_2J7*)aX=-|x93UzKC4sXftG2JskziV~yL^=PF{#_VjRh#y8@X9o4_S#LuE
zv0*fnubhMScb$A|r(Qh|o3<An%qxNYD$d-*c%Kh@U?sasQ(Gv0QaWb%&qpOiiYE_V
z`YG`hkl}IRRJoAer4g$F?H@;Mbqr4@FI~AjZ1!WnFzh+K$t7)T__IA%<)t9etL3X3
zsBxm<GoeR>+QlT=EK2g{7ndzv1zmk*m}w0=aDdT0f2?Xy0mdQVQ`Ad?rxkMY@3ncd
zf_`g2(tik(zT0l<;*xjhy1t2}gqg~AS0U6gqI+$wDP4YAUTNS}KuO?HCiCflg%k#s
zB84({Zo6RR6_u{f<-$USAq55eiMdH3wDZJ*>>^_hSNv@E^^U`CLzJq8;s;Nq>BIod
zvo_h8U6e8eL3w9u!}d!6@n+y@xqSx<W>_+RfT&)@oGF?4o!O&JjBu;AdMVMYm&`|h
zZXZnh>c5HeR(J8;diWzC+#+H3F#hT;rQn~$O$#}$=Sw&0>2f!xpNY^5XxLK_SI@d7
zaV)fw`Lb;!&S>Y&2*%r2?_qkobU7A)eejWPOm#ZDJedyK^TagumZ~85@bLtjY1Wjw
z+nMPZEnqX21#j?V!!W>@bF+(MH;_ns)B44YI8||hp<;_3Hw3`)rG$e@t~@_0W3|gj
z?-ni*Ox*Y7(Cv(YAtod0tPra7`7~NUAIDb|RA!QV-9L7E?iD<-2TsZmO7~pahW^jY
zYoH`Yiws}bGdvEV|FNT%Rjl(xxx1fuR^^;}Z@*2Ck3bPETLnd)d7)uZ(bAGl3vL)|
z_*E+lQ4i6HEb89&gW=f%2J-Io3Y=(28x6#?>Zm_ta$t|VB|vi~t$wEeNL=R-_wAzA
zNxZY<{8DTHeYceEANiAv(+B6@RAT;&ZL?eM)ZU@7Evmkm`3zR_;&ZlMm*!5|lNGhL
zulS@$Oi0!IaD~HNp33WYi$3L;D)sEjI{h&k%tWSd4f>HKZ2}5kuv<<EZwb(a*7y3;
z$g6JN8Ex`IBOoZ1OJF%tRe2<WEKdFQLajJCWG5g%2I{a=HONZ4?tJHNl~T?Sm0Oo#
z;B*NP9euFBm54M6H%IS!yWP_;*^NIYZ&&IXbjhh}e^w_yYnVXbS}m|KS-H#ti+q6_
zU6Qj%Q8HKNqeM)R_h6Gh%_Y*zBc8MMz3KMwg?jqRQLfoK#j#e1FApWP#P%?T>2Gnc
z=FZ0+vUiuZ_?Zn;CV6a|^ZS)2ni<3229-L*QJ>oATUuC3;3q$dF5Lby$fFs&4U279
zuxh=>zGL|+*i>B!o}2n|SunqOcjZgk_E6oPmJrFsw9z<_un8P=qaM6wSHx9D_)ZIF
zXH7*8H?V~R&_FBqY@@;M?8zE(e$`(q*;l;TPLjMSS@TUO|FI9=UGL=++%<tAKg5Y;
zCzs`~KV9v-NsD^hVt5XB2RVe2J9K@%Sq)=gxiE7-$+@oNCMFw%Dorlk*BBn-J}9Pp
zOo02Zh`2g;LlKbiQQ=m>yHDU}MVn{32W9U%5}2{>ArPb^`>F-`BHJL$UBb^M^azyU
zFgJ2zzSkyjcR}^yINgSpEl;Azn|HJ;LcCp-)%|48V<>0htEVNdPW1Lfvbq?Un_wUC
zRW9t1E97q<$A3psuoDa7z>77bA78!r1c@|GMa-L`B+P2QeYk0b<@CAz0?v{D0wC1r
zsb;df@jGlCbF-sDv8VN=aO^iUXcI6uL%Q9@`DkpcqP6ii(uvV~%sAFAtiaU@Jq8}p
z^jL7q1aqt==!+Xio2}w$O)f~<Z}hrM(OKd1sML<%x>_<Y2{ezBj26-ChTH{v^nWx-
zIs*TqKNv`UdRp(oe)Qx&puCR9pvLE6ZWX<3`W%tY-g}a60Cp)i3I#5e0bD0Di|wu0
z)E9W*s6tXXh+)e;XEpDYYGm!qjYur&(*(H>(_&J0|NYeSmf9OxgYn<PHYVNoibl9h
z$kqX9q&vPCd|lahx2%r4<P=$XagRxk6TdVM+RqTW5;R<4XERY@#WcN=G7^Os@~fzG
zncn-rb92RD{%fA4%QbbhXl2C4ehEXI+PA(+4Pl%=n)+fwQ5uW_A$`@bgwUB%orHf6
zQhTtufOAG32-us-B|5`Ip~Vq_V8oEtQfd;^KuuiQeU$lRyzb&_*v>Y{$zH0k<>1)V
zha)rzZGtolc*KUm^Un^dfq04X_t`v}Fd{c8i~D4}T<-t~xfeKJrU3BF<kgfph5L7t
z&BC^LGZ3N^h0K_~8-qtW(O#~qSxcuYSV^wuLpDjm5FWljOQkUXO;H|H7f>QJ^XABB
zSkScZuTV{w2Q|-iYB6q<_R38axhCKz9JjM-0+o98^ukQEx~-XbN?!s+86G3Ghh~6f
z^*e4L#X&g7L9wup?{6cczC=&-)ITWTl+WSFTo0<qMzR9SJZmb!rP1S6LTCn_mJKWC
zDHWEY<uVfvp@)>S6|A7E+=W^|bq7p{R9SLb0aePIQDEl<lbG}#Y`>(u(Z6d!<saB?
zmLAN)<c{KCA?=T+gxr6RzoV>cOfEqtJAWDF4(w9Pjq;!}Y*X%m61@r~8~^n`LLka)
zgI8OIv~>*3{S(<-9N9-eY3N?aZflsF(UOW~Xan9Gw|ENy>dy~mZWH-Va7+2VCf4;*
zAKRr2<y%&}Me9o@us0N(9nF<_dRw;e{{f2znL!^@dvSR`m+^O0Bojix(BF@h!z~Mu
z;2^nwi@8hWbTq?C)N9k!u0L#1O=H|r9Xf0qUExP3zskZMV;Ylab`IXw+|$H%#778x
zHuBwDMROIl-bprBH;Wx%DFD~_l0`2&YGuiY4Sf4fx#jX3A?G%tF0@LZujuohFx^$V
z@1R2ioA#N<hpJ~eKU3l3uZe4N_^@NEAJiFWt~nP%0-0&cw9AxR>y=DZ7lr}_H3|d9
zMAN4>bhF*CQ;@v`VI{tNnV#1Y^*~c3b{MUzc1CpuE{F>K<{UlE1)5`j05SF>w2jNS
z*T_a*9l;RLa(@N1D}#J`K{|mOh=<^KTW(eVqMzFGZihRB6s21V(Z96Ef!9Dr<i?zo
zQoAKA-S;YifNNm2FZ*)G;va9$JYgC}0HEexdo4>>hmoNRYC79wuEC*&Y~kM34nV6r
zv|**LFG|)JGeA~OET~p`mN2>eG7;`yIbSW;y>um1H%PFAA<72`N#mWF#u|*_#Qzz$
zfe(qhM-t^-EzG&ZC~WBx|Gh~(efMp$dIG#wf#`i9fyNIS8O-sG>)T`6XN$cQq3}Rb
zz8>)LTN2t>mj<%G-ih9>GjMuXtt{->QsyQyqR?>s@&0WK%P@y<U=l<|sOJIpxL@O4
zZ;3LzV<Im@mbG6wh|*l7lie@Y8x%NEqY_OA{Q=0})tq8Ha%QjxBGC-S02KIQMzdmf
zGq^=d^fJY{c>S*i{s6*HCnDYx8oyXvII{c7cgIWn?reQZ*?e(~5SsH{F*Cmn)r@vP
zL`0PMsDVD5=)8%Q9Y0t2mQ?AQ6yofQ!a_c1Dhl&(vvDly7+eIGDEQi*#iz=Ae*P1=
z(mzF2)uP(dC%q{jbfiwxw4A4OX;{w3M_q7$1`t?}`rW|(R<FlajUM5K5M3SS6zO_o
z6VKP-$cCV-T9B4EmM&>4cN-RpzN51O1*Ro;$o#?U1v?k(BujXF@6qA<pp+X@9wEqI
z5M;9YTcWv1mm%Zn-N|(v`Ghey!$nqyXidrAO9sL*K2`yVCgUszv~4<^O>By}WYO;p
zoKA{bv~S?)-NKb9C?^ch7uTQCAT=G%>ia(>&nB{rPD2O*QC9oO>FPR@!0n8@j$#co
z(KFSVY%=uopZQgRS;FG25_mcIwZVUPqGERN4Y2~qW^~<gVaEe7npE2H#+;MZoY1<z
z>6!0gqdm$pr_58pBqvc3Z6E)|P-SPd93iKZKy{f%ZT7e<3t0$>GYnI!I|{7-v)&_|
z8=x+q3?y@0V0(1|x9N;8*)CyA5z&|>qNk?{GIgGZG5THJ;-3jFQ!I*b9a5x#-!RyV
z%$y$kw6}L1k2N1;FXBDQRQvL5z9hU%YE+I+6w=^eGI>}=$g{fk^j;B&26_irKl6L+
zzr4U-Sas80yZ_S6<W@tB1QEgfjZ+(r!-pSqYGFI;V+I1dOFjVN!9A|b9IS?4+Lg=t
zT_U>y60l|Dp5!vH6x4_RoT~T4vk`FT)!hJ*N#H6A$T8L`2NfchN02j5^T0GYBXVk2
zp{G8~6?3!({URP~=k#>aeIDGU=0PqFPyZN+Ia!k~FSTd;3EGY$%<Xn|k5KQ^yS<*r
zRPs)eeZg?$AYiOy)R(3W^bD&HRaOL))1{{xBVfsKw||P?E95z|iyd^>wdys@=0i~O
z!-0XY3CXHoj&`2>OXRC{JTJ=@+_|B+X#4T)pBQo3T4D(?I-iofU4;{<JNmP}eNnoq
zvx>{(#QU@=n<Y6ts?Z`gc=w?rn|&{7+WE{=598JPewv(&LEjb?O;dZ`HMa7wS1wol
zcjM}o!^`lhjm4e!zg(N_qWjgEt0EJl2%#^2u`9mxf*z5ppG1x42B)=d*+)e8=hr!O
z|B#O!7ht=2$HC}%qA%0mpvzj{5NjzHzPRT_MSoKuH9)CrgT7|i<0Jk=-P++jT=<vu
zg?pVCYGu5`xE{VF$NjSX3wzw12PQ0Z!M%K?E{{(KexueqK2%Mm9=`uu1@X*>AffIH
z*8F#pehKjP^S=tNaW41F450r$?0l`ibh9F~syLb}dT9QF8i$9!M>NZ~N9)|q-6u~i
z0(6%sko@q&p1QZZ9+6qj=scNn*-jWSqWXQ5QGfd>-QTz5+b3)P0Utu}pKtF#j|Pz{
zY9$h_g<952569kRN;-1*F$pWG<eciX%)fVUzd>z#yZEoZ?${qk16sRKQyE~j4J(^`
z!XP~*CDEOWbMcQ|%^}K**bQjXsX5rkq$qz&9_LiR-&c5GC%St-!7qv<5MTW9bzKtd
zBG&!d%Y4d2Riekt!X;9|6IjqnMQJdjVj`p}AaH%vHq%lT%lHbw%BD#WZKP%pL8=Xt
z{`-TTcdm35By>fo<OiB`sjwxe2KB1#1CxIyly}%0yY$&~miLPvCg>pgNJ=rGU@Xl}
zTtt5Itm8ByV%)WezDD<L{NB#F0+q4U<Fj{}tLOe^y0u-6j`Vy+hNS!y13SS4K=%BS
zi7s3=ae+TnbjFdjYPWzfi;$Il>%vT_aGZ+!2LZQ7R9_4Z?}b7pDzfuEph8JxkA-OU
z1WPxYSP2(qLvEJ*JV52<C6U$S&0!~mDCyU0Mp4b8KRmrWOXH=xuc*+DbPTIn)jC4`
zQCmKrP5ijMT@XP*f+?SK(^m}vnaQ>C%aGA`6}nG_X)2YE25$?82?qk0)ip8d<O=Ky
z4IGOVD$uOM_<+`$0#7Xtj~I__MPij_bin70r~Wj+g=YBeKc+TLWnYv~-<=5on8QQ5
z7frWZZb`ZZ&Lht`8SA{}G{sGD{uB8ULaJd?g_-2saAOF+R)!{wqC6x!T=JD;DdCry
z3{-l0Bs?eWxj|#p0HQlO(3q(dyx>XNet!P>_i-Z-;&@N1wKsRKTFJVl<&XYr8dITE
zS^2vv<2SB)_p|ZV#`Zu;s>mkxpJLuRr`{q(sUB?&0!9sN!nC?w&@zDxZBtEjJ)=CK
zf#m;BLf3mCMQfx=6nU^d_cpUWY3F)~W9;Yi$dCehSvAEO+E&!3T!CGQQ5l_!8_WTA
z%K}4%cHSL|`mp_B^?Ze;TKrX)26qU|F=V4h;d2YN&0xS41gRCU1cV2@<-H<yq&NZn
zN0?7tHgv~TZ60CLGez?qqrYSbAs;fuH?XxMSsIIJotfp8rTItb`^p3f^T<&h#&%%^
z2@4fkcy9iGfX!P0k89BeHOl-YUl%RjWd2^XK+jAf)>v(?)5IW{pN2EXrenh&6**)?
zI~i&#lSRQ`-8}^UK04&m<UZxc+*9dIqWp^UmLm}Wi<p0TP<?CrJ!_roGsU6--&Uux
zn0q9bH4l$(%+Tn*m%Z9~H>_s2$eX0*f?DHVd`g7jTym9rhGHD{K(dF4Qrb1AS9@uV
z8|P80_qekzJ<^3gf>w<+YYJPXM?QEmOPI{pd(?#vuu4-i8S#rs0Cc2ld(-il3-QxX
zweRrvvUGv~%|$EaA=N1HM3aF~+G=$bPHtJ7aoBQoE`cyJLL=Kt)Od6)+_{?X<Yd2e
z^p{&pkGhgcH=nxU0rCzkKnYOl?>!veyQ%0X#+OzZo?-8@4~FgNmOGLw?I~W&d<8rC
zRc~w(Op2-Q7EU2d8E8}Qc~MDKbXiwh(IhOnoHv)fpe;yM(zy>yV<GRcjv>y<0DXmL
zl8`+%?MvZ61TkXIkd0G&w=K~*x616dxKJ=#q9gZG^*Pvr!-nC*FWK(`Lm2KgBLT{)
z0lmw``zF+x$lNMOBc-fd<D<khxb_?{4p4LMieX*0^$FG$S*&LHRVWyK@=t<CSekzu
z<5M2}9B3=8uJclc0VQP>r%!D?A4}0&sEeo4Y@=KG-s_FpS2Q`HPp!6`g;UK;rtLSK
zveA9vH;i6>MMZhpQID&6x+V05-B-G3G%yo$vS<2vU`L@1T@m0{z)U*JDf6otV7YuP
z$?;au#(p=ap}zIRf)A4@6uIC(yxMu84wA7L7T2iV&c>#(yL9mX4_(Y{(gA%%!!c*9
zpf}ixKT&zDnPll{MI$z49bd;jz0<pNSYCYh1y3DKnYzpxns3j{XF=OU=q`c!c;O>G
zRkaat0zQc5^RAU9Ps$3qm+%bVi`ubFV;4+bpmiDuD2N>n+=N!WyGg-he{N)w5ngd<
z+LWJ9H()er58=$tS)}{3sP9Ze!R;@Y``J2tjtgnAga%YbP)hE#eYjnnqtKtkX=CSO
z$N;U1-cQFoV1D^V*}dg%N$SgD6!uO3IHM9fhHk~N0872G5I8?#p_Gg)@BMmRrh;lM
zOcatsJkW@_4%na}f=egh!7PZ$=x_3&4>+cYoZa=`FNFx0RqKb!y26|MST-kzk5?LI
z^*BytQvxtFKCL}a9QmM1zgarqu{PC|T<j<R(MB8ZWeFE&ZqfMM@W5l^j!==WG^@L9
zfTk`)Sd5PDm+scsUe&{qoAd{Kv@TESUjEte6)qhfy8OU}w9?S*HQuX~A$QRNkKr{Z
zHK2yM-_Em+CtX))ObXIw#|BUn+L`|$&crX)xx4#5Shmrw7aC~NwqWgJP=8_@sYFj4
ze86R4=kXBeaL%PR;y-Y*6qn=Pc4jGf&rGgHH7=2NDqgnxUab{b&}z*N9FmbAizSBg
zx5aA~I`kdMPuXF$+}(2mLO9_cS#RMb4(ddH31r`$>EgT`eEB#!!)4ktCqf57UuyLr
zJyU9~@j&1f##8<ikMK1PaTjM??tU-GVmFw5^Q0f9b-Bg6By+kIbh4nlxV<SPPZsK~
z%h&t~slVu63g2eyhQ0lGOZ3(*R%KgGcYS>P2tOtk<aBjtE{oX+oXV98u59WkOr=hK
zF-T(FEHn-NV?c)>kB@OJI}5lcz~1I1q{C}?XyO9Fum~u!x+Q6STdXGn=ZB1B>89VI
z2j%?=T!;Cd*?GL4QzZog9RaG$<PX4PlERkXoaV#Z&&#VR@autQ=xc<I-OctUoh#xL
zcr1ymd{pX`wBd8#<5}O`vlZwH4eoxF>=^2{IoH^1Mdp&6Q~>BsTzbz;!7Fbh1I<wi
zruMZAJWFo$tTYSmC}r{oeQ($^j^xKu*5|TB+3~}rlkf80AAh;!7&vB)3$E5TmUr>A
z_i)Z~>1cK)(#<#5^S$p@x20bC7`uFT;n=_P`IJl;w=goKckmW+)1Wjqf3s}5g^^Ww
zz0=@F9Oo%B^H+ITPpDv7Hx#w&Kl5GGW3dw_v3%Lj&BrE5HA%S2EVWXMnnIA-{U+Dt
z3YS!5;BIkFEdwIV1T!}ZVx)W<K=NuE6)w)20*VY~T7nHPAKmIxy+mDe&MAsm0JCbp
zJqhq&r~3_8o66rOUYph2TySP=mLKw<TH9k45z%T_vuQ<;!C)47wfClNNK*z0-8Vg~
zLCSAq{i2?yJ-~UPjefiImd_d$>OA9qk)?K$xi~>b80n{hin+0eb#|4nQ1@!IFw1*$
z`Pwiy{LrMO+yC!`OMOo6o}iGHW8_oq%S&KtaQKbw+@76WS1qSQcA^Y*^>KhvDNj*t
zy~pA#!joP!+V0vj_WYNXsxV_cxZG?8>z)gpl@Inn5TK*ykISj=J+y2}zwRVK=qiCz
zDvkL5l`pY(!_hs@KFMG_<=V?=7DBq{Bvnm5eGKE0!3jHGsf#c4AAy0Hw!b5atT7?~
zvR>0ove;Uj<Zgia(2wNe#3j#sudKX9ycM?(6pi{znff3t&||qf`{}-ne4TUsz0h?_
znu#BB5}LSEVa7MT%v*R2lJs+s`azkgd~l6+x~7@GAQ>;8-il-~`k~OX80R3LE8*OK
zNE5_E7Onr{6;|11>z#9(xv6kL;Ir=U&v?r2iACt<^SPT77UNwUH<Y2X4M^vL^);~z
z0wy$UZEa|M7mj;Iv_=5wFPXcz^FD5nkm#Pau%OD0Zv<x&q8qjrBcIMj2Pe~fk<mRH
zrgR$PJ+C`qxE1u{gwWGjc#Nu{f2u<`RncT7F?%yuRs<f*=0EAOJ(qvO_BZY5%L_f_
zMF=<h*ly#%ef5$NE3u7Wrw8|WYaQ8i0{qj5ze2W4UF8h9VD4fqFJP5(Ou^?;jP!<6
zSFE&94WAl(<t)-@QeSTf$0?IJR&P0YUBcG<nR0Q329Nv%#r4r_&Xfv*+nSE#5j74{
z6CN!J$}8&=QH#XyOQAFgG#VBr&%C8uyC0IV5yncqS25BrOtb6^<d-^}@lyD&5da=o
z&F`weQ3)|9V;NPHGU>|h0=mp&KG9*;ZGvN5@V|IpKA!yJ;vlu;r^ADgGW=$2H!v~L
zHo-;xAWo2myo3(uR!07cm1ZKJYCZIvjdgTk1j9Be)N+Ac63*hz97<ZQF8pqDbS!f6
zV+9pG%kCdzi`?hqYJD9$SQ=4H?j^e=oql+ch=4amQgnN}<rzGXvG|GDva7Qj113E+
zWx#s{FKs`=(fNofrolT8orssNAXxqi1rvj*dJ)4uOXr-=*cFKIw>8_H0RhlHgy6O=
zh3Ib^^B@@F(enH_!UEj}vcvITQ-C+)Z&q&czKk2PR@~*z)Smu^hEd^QENA2Id&rR$
z!8B-nuqqlM`UCX0dsSt9^naX|+b)yR0*@Pz$Lcslnqv+VLz;H8jsp@*&!{zeTGn*W
zA2FyE<D66hwj1E%D6WIAgPNgRn9uXN+`CURZ+nGlZ#7VjET=Z>b66>HeFb{~+CQ|1
z5tW1y&|Lli)E#(jd0UkaauqAv!CnxZyA5z~Mm+zO8AT{{s_gtWL){K+BQ{!)juy4A
zhXp+8?hqWm$ddefj)uX`G21rpZQD@t-2o%sxZUW-poaFAbwf$M>`q13t!l-XrXg+R
z^|`oUDW=lNf4N<!li6@FgcFtVXFp(&t84K;An3tqFWq8Vz~uqa^l?8<Y*BL~m+uOi
zZlt1O2oj`>7z!ibEGe;XrG1=o<x|{F-RJW|`!YsgpCXEtVez1UXY}8X^Y%%AWV2=@
zx~|K4-ypbKPlK&{Z)tOj^n6Px(Y+OL21A@ffloU>*Kk&Mg%f(;IQIWoQSMUjDQ3_l
zF6xpu$KrE05yPgey9ErxJq6T;QOa)y9%JQzwJ6WN4uO~3#hK7VRCo@M#Q<OW$QjCn
zb2%LaRSa0Ain$(Vtm#jlvS-wOIuIPoK9vZlqz;(}=#;%-ar2(!7SLmN*SRM@T15Ea
zudCCi65HiL)uc#vlV3M|-BqN@yfgaR-kERMS1&qX(jGGHYYRjU=?s;u+#jpvz|xNg
zNg0`8E@$^E-H*kEymGnULvsKDhb<??^xz*yNOPqZ6DL6x_4O4sx7iekJ>9$(+L#kS
zynP@hFMxrp_WiH>e*kUEzYlf`H(HgWX+kfXpWaB0^yT<Jj?TlM%K!c2_i^M{+3Cpc
z9GR6B4(Avtj>^g|WfQWFkr57}=r}m`=up{YB_ou5Y(gn}93*>Z<nz0~zrWzz=W!nA
zzVG*Sy`Ilkf}UIEzbg|ui;nR&Nu7?U=!ck}cx>sPQG?fszi;alc64XQ{0D3qhECjH
zIQaDMt%nEty0;V=zD2EaRuy<5Cvo?Z!mn~^PloiQ^$m8j(XpODt+#fC^m9!Kxh9V$
zG(vdvAiQ2=*dN!WY*vQnqmKiuf#)?4eiffCs?*Wf*C)Ds^j{3jkgQklEIU(iD5cZ$
z&)4#)8-pUc-8F;nPbG_Fk<nZZHU^A|;eKQlj(|N1|3AqUR!09=?s0|B%rSc3?Ye1M
zH};plJlg8$+v;oug%h^sm92!smeut^yWys<cW;}-y7MI_z}x5s^l)50ALje52aBuY
zI43@|JsfY~q{dc3f9|8>hMRb`e^@<<Wx&A+3C+-aCCX#hg@3#csw=-+*d*JFDjB0C
zsC+xYIHfhonNvhbqrtx%x1@Bsg%O?=BBsgJzw5h-pw(Zi$94YGJlyUjsj#Y9P#Nq!
z8FQT4s{HxJr$!wA3o$!{fZxIVm+M>8?@Ojiby6HW=7p~5vG$IP75$c6@nF1qEEe#x
zuOSd0An@h;7@d!}priBWf^-)SSxU{4pqN0xsmvqYl*&tS*EehY|Ku*O#y!}6!+mhu
zq+3dZ2Xk?x;LhgSb-Ps7HWdM$m-n8nK4R4Rz1PKmZR^@adKetEY4zRpTFl`wBoKcc
zY+8<9s=H5{&{fRB#Wzb#zY)k3KOn$4;7!?Gc@Q=vU!@75B{oA65@&uCYqkb>Q7ch{
zmZAHRMjjYSYPj~a6pU|saP9%b@M^pD#sUv&B@RU3&Smv}@~Ymh%O3miAVW}8nxun5
z)(T{Su`7|t2O9GC7#5fYfMZ6BJURuavs;dWTo#$!2u5*@6$WQwa}p9)SMJ~1*x>=m
z>2;}q)fJ0gj$~C=1?{a`o@3t+^op8H$n{TpdaxoeGn?{fF&YpTsawU<IU{z4xoeN~
zLbhS~x+c%k?86SVfjBEWT_cem{$<;+A)?OSJRW)5{8#SnIUGQ{d-?~rG?&`oM!P>>
za_f-$H_&pvYavH4Zn&Cc$2Q$;=dQG{yNYGRgMECnM5tZP{tX(~tBc8Zvp0QFXTBkt
zT(7Ip%sbkDM<tiUcNRL$+4Q`_$kolZ(<LG6#y*?6B&zgevBpaFoeXn3E%jf>(|Q;W
z#^o?|F@FQ5M2DA+zM7o`)MF@rm&hlM0B0660D9lu7lO15&E3(=d;cUL?u9wCaz5zU
zpdp&;8Jvfx+k)5D_Samny$Cm>c-UjPBfkQz$C``cDn=Nk?!s{SxE=l+MLufw2SCb(
zbW_zMJ1cAZek5+r$c2paBC8lZUZd2>W?g?ybgtRxkdfiVQ(0sZ)mf+H<JV4#bJq9e
zmol$eF}I6#28Ep#E7mjSy%$vQ%sDak;`ybhNK4?%+6LF2EJRB?Pa)s`2`2|i1By#h
z&@v|lr@OlTKg<Li&9@`L=`m}06Sk6n`e~RBauz}v8lnvvQX<%sOGl|DA$qJf<klC>
zu=kw3m!hsP>Zjx;4&$$OnLRQ8C(S$kE`dkg<cP?COfc;Jf-dA+*np;7A>VExL{9K1
zp+J;TN|Va_C0F2Af%_}FUSJu$<-J#!V7}ZZ<%QSb3*q{k^|Y0WXFzcQKaw^iB4E%f
zA2{e?qIiiC?wJ&Tniw{^Jsf=tANd$|Upo&#cX2IdZi3?=?+ppj1U4!su~_APMJJP|
z-2JZJhQFR%euJ3bkZ3l?NlH26Ii+l=bx(*W;SvMsdYYSPAz%~|km-HEvs`&R1g&v@
zy6lBei$oVm$Wi2fhvHOyyD0*rSfY`AR*2dFo|pO`5K5+oR1Y_^O}|k9&!NXFnkn6)
zVa@!NdxfvBZ}ZJAjN}2D=zC@el_;EC%fWn6H=O}puh*_%sJg2~0=5}*1niZrAZ#<0
zuLUlvo}T$Y^c142a&atJD}4=p-yOS&&f$8=nPX!nMzH<}R{kaA6L05*ni@TGr?33=
zIS{jf0pPc%ES-$;d+dnn{oOZHff?giYwaDVcWuH*p4R0W;=(nk{Q`KM=Kzt+*@Q^g
zCU<kQz?(nLWbyxi02$<RY+KBGm4eJyTWl2zZ$-z+q!-g`ih)iwu)Q3Hsm7l?xkANR
zVgn4KIV&bJgLM#N)>Ix^7NzxmZ0RLT$My_-d26pQ#h)uIwvUqYTa3n<r1hd!C5jH!
z>B7KmrZ2|A1r+;p@t_ywaBrm>1Igm^S_2L?YckD;Idl?T>ehAeqbQk9jPpr?%><9Z
z!;*xoK(86Dsvf(Sw2PU9gtHsWDV491Dn-6*b3v5*n9_zenTBQ;<eTfydE&J7nqV#!
z1O)!o**3o%nf$Xj_G*u`b~B|%`7npc&=Ol{rxBORsPoTxUYx4CusA4a8E7<S54T_)
zSS~+0$iGpqCecmVB6}yS61-x7(g;`g9s-9RN-eHQhxcV>RJS$ckM<`C`YwrFu)}o$
zwYQWjCy5<o3^%Z5@1nzVIG9|8@EFA|Po9i)Nnh4{nthqT95==_!spdx>NpUv()lFe
z(KkKweB7NZCvZ_I0R$#0bKA;(c@KgV4_@QfIj{|S4`H5A^zwG`ksOEdIRY6tiUU8T
zzG<9Ig0tG*oqv!^`V!$Gimz6$F}tYb>8`>88!~dD>rdNoVN}Kq3;XV6AZVe<+~Q}K
zaRf2U*p3X6?Rpi8&?N+%9~TVP0x+k0*D`C#MGSg;Q1&%8*#Z45zCuCYoqSqRdxNx2
z$3wIt$P`;?L;T4U=uG~=&X(y)Wocwy-ud4QK<t(CFGYaIe?aFn*hQ?P?T$U)I<K)^
zc4u;Pn$R0E_-6Az%X4e~(U3SOEBL82=<)%rmvaS$Q?y^0e$^7mRkNPU7pWFRhUq0W
z`?%*OJzXC#4l?fbd}qrg)=C85{1^iKQY13d7Nb}I5ItA{QTn_mEuK2`?FZ`-cV-`^
zn1{`Tx6f($H=jDkRY=r#Gb>PuXaD{*e#_4Eva9A`(b6w4G(v=|n+a7yy*l+*^=8Ew
zab|?Dh?V<gJPOjhK^%c+SBiSM?;>w!CUnmlZ)-2!PUw0p8?d~c!?5&5Va<|-j`#0v
zk*^u%)UqKZ%7q8kYbQDqIra-h$AQLCX30=RMyy26f#3ihK6^LdB~={0cj_`3%~|-=
znw+h_onIOampbt#?62(SE3ZdpgueM$XIJqX$T=6nZ)e!4XzhcT`5=_o??w&hS{QOV
zJsuX4Ez@)ZaK+M?kA_-5O$pZPya2`Yn2Zsl>1D6>j(->)Tok3vx|1@I-9%UxTpoVs
z7mrX?v|B{)9UIrInF2+L<dW6D82~$vrkr;JIkenHJ6$|ES$+I{;quXFE>`6nGO?vg
zph-M0hNh_7{qH|98qL;{uhT8CpPc<d6Y$mUJ$Q%2OPSA{DgS~Ficc1G&>smbxmy=k
z)md*Dgv$$d{D_lp?Fd6ZZ>kCoDDgD!mDx3BZ-9eQ)w3IPAANKEopiD-w{Nefys>j{
z$p74wE*uFfK}VWsj}HB0jkUAp*-bpty;CWv_^qnxrNI7nEvO=P&wjCU&&MO|K)JR(
z*eEUBA9q7nS(LVX)0g2ugP41yW!ikwBpE~Um<XEhdG#q)|MuT!`B;TaD<&<EPl}rV
zR!{Q8UIcb9X6^7c+5aiaNbLW4qD={9JA<EIAJO`_E%|VG&pfy5<@#=}ha4E?6|oi2
zBz7?zl)v2H{41tg{%TQKf9>PeNjq6JzV4OlgBXxaGgh14En85O1p?P<TcA;8FI&_q
zHd}+4Og%3AjpChQTg8zEKm3haa=Qttl!HG`%6*3Z``&y|Ug{$Vee#9-)5EKme!y*S
z9~rX*>|vaPHoNYo9|^u;-D)^k`g=N@9V>uIY*p6njrtFG5j5AQsmI>Y!roh$LfX+B
zmC+`!4}2SLN}N4h6WtP=Lv$CeDDyWSC#^kRHvc;18zkq|m)Q5f)Q&*XS+#P1(7~*a
zx6lufJKlbPmD^QN9|VHVxE8b|%?iaNC#mvZnVgmFwV2G4+0`M&%&gXGcYee$`Ga#J
z(IH}Z?E|^ttN49JPw_O;MTW~|!FbBpjd!L}C6^YNYWZea-9I58Tih#JAKeptP#G!8
z3buegh{I_u#B0|g6aR^aSvty*EW*|#EUvVA#|Or%q3?fe9WGA;F#ddrF+M*<Q7hm;
zkl7J09Gg~<j(AFo=PdI0V3FG0VjXb6XT<s3{IOuT9(WL3Exs?~iLmY_-W3L4Ik>M_
zNk273<Md?qKrv#`1?wnj*<Ua|@3D-i8wo9gQ&0ptVI||u&8pN+R_k-Xt&?e?yB9Ee
z%KyZp2YI92N97#~RGoj)EJL%F^4Y7-{{thj>p$>t6R-ddMyS}^d(ZxbiB1^Y#IIu$
z@BKBE9Pld_6`&f2(UeV7int)Kq@IF9JPnSEx|A1P#<-qTXf(u9cbJ>V$`j`a6BOGF
zn|_a_PQ+5kZPR!WTgya2P#qJL;rRDu4+_JAai%SP2&q{B2u@)WtM~k=MzzjQ_bHY^
zCqpzz&SuW{=~xk5EiQ!<$wZAVo|QX~-U}mn^&R+T12bH)jL%oH4ju>W$wS2GW!W|M
z(LMs7n979|23{^v0`Wa-&$HZk@kbz&v&Zj(O(Y>~vQDR)gF@sX9PRPXOD1+jCr3;3
zpPU&pbq0nQkMP2F`ojD>xx5qg#XZ=}+Y-p0N~bHpjM%LgaY-auKhUAx^X|#b^WUz_
z7w{|XpSo;KZ_o>cor*>bHfbVBbPVy{pz02N#xrX~^RD|<S~oA9s57{u5w{QSyXdTT
z9rQNum*9FiY6o}yn)eS*b=B=^ogt1H*XJ0OS=zWDlHHfJcWcy9!rC^gD@Vh*aS@j<
z*9rPOLw=Kbf@G_oBID%95~ecuS~O)41U}##z&mrbVNo@GpYOXu!jcy^FOWd|8aEu@
zazY_vqr2vMt+#)&-gjwp<S$OQ-0>a*HTeL0d&0F-0s4h8ehCIAd~H&rLLa$+XP+{h
zo76hI?iZrOSU?QcS=VE|RN;H{nl;&*0LHb!{1a<BzhB|FmiEYsN#m@=OZuF}n}ozM
z(2ZQZX|01O(}4?QKL`_W@*R)xgj*HmoOASn1JqfLAXfdJ+}j#(M@Nc5j<4ETv3n~e
zA&Xi;rILX`8^bR9Nt2spddhpW;Nk(06@BTYMbsQr3FKVGo@u86+N{~hD%<@?*G0?7
zu4c=Rfy|B{FoPNWVbv_MfkWr)dAX==Jjj~RWJt)!fTkFlB@LSIt@}m<meR@+!AEkY
zIf|neSN6oV+uP!$E^DyMUXz_tUxx3iHc8MocB(b(Q$K0_2RIqn_Pxqkp!MDCr@d+J
z=GTHzYCZsqIk8X&k}gqoYc=tw({MuL{?V1xJ}KPIBEgq)cMK%tah$a!Zc3ulIVLeW
zOew-zxc6mh(-^S|#%p#YeaZ8YDtEy=#Oe^U@v!#CNVoQ^H@&q>|4T@UdtX*NuIkMa
zvSd*$KxgM6Yp*xh72U-B6h#t-0Jdm2WwBCFd_1sXP+*ema=uc^(KV8?&6>0f?+i(P
zs(nd10Gj0keT(_Z@=13+)iyS_yw4(ylN2iGjuC_OO5W2Hb};bQ_#;E|@5e+tO^H2s
zAM9eGKgIN`_3gZ;m8|Ht+yW?HLtI`?ux43?t6CS<HzQdK?7DLp61@cOmt0;K4({HJ
zX;kQSzga3F^F7sXI@liuT{YR@zL)A`Gyn)KzzX&Y#MNH}gkINA%~#%1O9o6yvi7p<
zyvcx#`T)anfztf@j3213*e~iY7UCf&o+1Gyi?7eV$YoWE0()!9{{gXPPv+I{5!OJE
zz;}YIrff=+m4MdlA*xR@FOxh`DCm!}hXI$_xlo#f%Krc~V}YCG#2r&v?^@DDp@aX?
z!B?u!jKs*Zg1vl@^)v64o7Q%XisybgddS=rOn51fn|NgM$}s(T_eD6*?R#LS@>#G%
z@8rEB($##STsD}|{^5$@(V0ugKCc98k6bOr>uC2*Gb>UK>fTc8gdjkEvVw>oQT}=S
zM`^eT;_W6yZ?t#5B}|B&$g70@|D#<`!rY0fh@gU|`&3r!<o>MBJ9T}&o5oiRiWO#A
z+NRT=@fmhd-`feD7J3ha>N#JwNYFv3t$o!D8w!y>;Nb3TrXT3D57$R#Q>N3{=<_A)
zZQH@-OedbhPKoG|X*S2ir!QFKhFJ65Z*`~>H*R}UAnHmh2{A;&dJ7F<eZTeW-ksb9
zPxQ>Ak@<udVYCE1pFo6a!KZ+Kamo3sf=|Z(?y9F|r=H)bfX;w_y8V)=mp-?<W3_lv
zN&Pd~?#YYFjbdX@-Kr=kmEGE})0DAKw&Lb{-F7vG7pe(AS@>qz?pQCxX>MAiDoXQQ
zIgwCUQG7FLf3EeAqMDuUlB(B0I=mONXx<nuA4a4<2M+Da7mPXJIhTXt*RL_LlmeJ7
zx&0j5L8*@`)|2Z;mPq@9PKJf@f;+BLSF3LJ_23{9bTc@)QEI4iWdI+$E^=E^8Gf;M
zuz~rX9MM(vs$AeT>?|o}N)E5=OTh#UNnR*(An$B*JD?;sasy|rAtRGufs}~<RO7ES
zJS(F%_~nmGVpD3iwZ6URNk(~5-l7jKJQlwUU2gHq6z}f3uZ)))$KN(q_1T%c6ZWj8
zgHqYGnGx>vvP-5qrn$jUniVxmAXE5^cNjLVwmx{DuoUUU$0yV4GpLb0P}pWWJk>?)
zDT+AhbMNM_qzLRW6;;yI{yN_RKFhvl(OQP1&@3t@cONDq%dFuu16WX#BOTgRRQ5Q?
z)!~x}B64d)RpaVlj|$#v;)6_o2e>aZxfuo=MPa?N?0(;d)^i!PhCejCRD%8Dh*jFd
zu&PCu;4IaJqaV5`&snhJTB?k>(Z^7ey`l?Ooa(GY{o&<y6>O??$c4!t?&Oji9ozO$
zVH19{C3jo^8ZuV%gsoPqKQBdngT?e#7YZ3@xB4IOr+D{zGV0mY)Y&X22uun#<a@)0
z`SQFt5|LI@=E;|W^t=d1J7o};rWx%0mnUAnM3WnLq*Wl3L$U)WHVkQRCA&=QNCqsY
zz9`CGVVV2oG#xo1V?UL?*iYD5-_2@38n|G}<o7jte6K41hl%9(nq~Mb%UQB**KPWl
zfGC;#zXtXd&8-9~;qYL;gXUg}*fyGMZOEn-Uu2YmNT$?=w(+l!x`uArOUxV4uql_}
z0y@>v0xCfx&`E9NGqWtZ*8!Fr);wQdBU$Kll`Y0iWo{ortrNpL8VGyv9EV*Y?$^#t
z>~-l>DS9dJ;pPwLS1MIeQ!q(QW^SZ|swo8eQh&VeiyzN)#h(7MEL#>W5PY^m*2(|X
zIw(`aO!F?GmG}^ywZDHHB2R-9_i%Q%^O1E|kyarr6f|kwu6es?IYkz(kHs5CI_MSF
z{g&%6Xi7Sg)ub)x_hSUhKwzSxO8nb#J*6v^`Xce(l7N<pl~AEnTf!fIHO+qDL1sT`
z$qedphbImH9>BdvW<jc<T_Rs4dR}y65+B_nM4)(IQ8{F0>Pkd}UZpmsXvM<0?wuC6
zYrE^$esNW$(@}l8sHkxHYO{A@;@W%oVGeCLgQ-)Bss7cNs<5oEp{zYv-h*`O+L(ta
z_t{xic!)Yz@x^j~)WND8<4vTWckYwC=6FKzy!yU}zKzB3<6tn9F2-6>jyomSuV>H>
z{h}vXyeKsl@imC;gj#21m%G@fN<WxNK58*fe|B9m3QC}cq<3gLIf?YW(s8`??=+W%
zI_tNrv}yK${+bAJ$*kS0s7EkuOD1b?;b`biQ<SWH;%!=F62qs_WiS36{ikFXcJ%Oj
z+FP*}kl0M<B6IM^?v=qN9j^=PMC)pN;~UF66P0!0D1nF?FY+gmzRm@Gb0-Ha9lydZ
z6+JqAfruE|)1DCuALA>+AmVh+YbuCkQn0n?akSghw%a_S{yhBuV>KU6*gq_^zr|d6
z4b<bW5BBb%9a9|A_o`yFxF0KcvILx6)5FPhoWsp{%Pwh2b2}q;FN(a0cFQ|q4)!|Z
znwWT)AK5NLdDB~STV;SA0eXL@u9UXemOi+dp1i|xgQuI%sQ}D_#NF{tWUcCE?xRLI
zJ22wZo8hn=wIAV6Kc`n}-A<~SNr#BB!l4KhMitL^i|Cg`Yw_;NjaUsTf5}*Z5z+Or
z>8pw7(~cv;4sG0MU`m-;Aj{~-4ys+irA}lkI{VB2Vjbipy12XPGMcUoI|a-Nr**XF
zTOKA*z6wU7(H|$|{l3jI*R06=_6h@^YnzE~c0QK31|t>`+{~(vbwtBP&#G6P*ekSq
z7Nz^)&6aVV+8!ZdmrNz)9*j>Q6Y`(`(lCLyb+;~Oc`7HY>yZz30v@m?c=ol_ko*=z
zVx=T)o@Tq%U1N5=))&_0MS%R#QW;IWH)eoLeQYdQ?ar?b=QR$S;aeCFvoz0uFS3U-
zfi^Se29@-><#JIBcJ}^l&x*Fi%2?{|18s-j00Qt-W~Tm=RPHyJkV;54SV^%9r}}nd
zU{)ccix#%H7th~n+@nD~g^*N}&P^}nRvr~U!zM(z4P*UPaGscB7Vyo`HsFA6v7<ze
z%=Yn`%xKoJ_XJsjDa}3q7e^veX3kP)XCp*UX65hqpTytz$P}g1Z->D6`lM6XXoynI
zoA#3%1@RoS9#<Q}wbsaKmfNR)f}9r>RBy>lird;<z5>ZaTg!9{TD8SkeYAL}AwMEc
zauTw3z?<CH$N2B(%T`BSh!M(6<yB-MzyG6uw5l%n-_TjRh)L4y9$(mWu{2Zc6q65M
zMt#~(`Z-IxC``xg)WN}OiG#tv|7!wMfVA)j2HwvlP@V?EV3<GW;+&@<x(9E#rLB#>
z(brICf%13{a*5H>B}Tcw{w)@RsAcvh>MP|*-F0`DSpfr)N{l(z=tA>QUUgm@&IyUJ
zYkI0l9!#s<Ip>gF?JO^blteU+V*)Jgz66~9R+~aQ?dCANvl-eKEzda~ePJC*%SjBv
zOH@o!7>2A_KPcI-$ki9p+>Wm?CcdOgQ7{eusRYfqaKXsg!%uau-4r^8!N~my$YI6&
zZP~U0MR2sLJg(Un(Lvq^j}SLUmPS303tm{`nsykEpPB@bI(9U6Heyv>PEd1Iiwj()
z2=Yk%_LW?|6kHvf;8c)*`&01(lzNlNE_{vB6haMc2?eJY$gxIUhm(tcIoAGV>hJ7(
zTx@EX<)QSuI$fb-3_BU4rShlqjqSS4ITw%*dx@AidX*R_7*S`?GGf$@r{CWq3Xx&?
z+CISlbM5mIyYc7piSC?7_8Y(nXM>a;PS1Pr!sdf>dF@0jtyc@9Gz>hycxQS4HB0t)
z6dGgy_-}U?&>1&-dlcj|$Y)lva<Odp4*rFD183lN!cg2;!Lp?@T+?o}`drLZY}16^
z$QQ5dI)i-_0xHn#TYmpz6z@Z~mUMV_>QeJ~0TH7@h}$l|_HENws*U+at6jJvXDt;&
zr>8yKq^O(mW1h}Jh_N09^AaLUKV!Db@;#M&r*a7~wD;=q-AMAFJ&ElijHwRKfZkV~
zS+LUkd!=XYs>TtwXKy`>Us}(Le6~NY%K2gjU&C<e=#G~1zi))yL63sK<AP=Z!H?$c
z9d^zS&mLTZyYF|e?5(dq9MM`4IGkfwX!pLJViIE=7#xg~>j*wSH?{ioN<z9>&9mn-
z>dO1&uy2UVOX9W=p!tXhL%UOUDOZ|$wMnM8ZpDY=ccxC3VWRtGbsIj2pQZac&#M*6
zt0jnVYrAZ{<mo4hoR8R-Xym%Zl!K@Xf_VV~$>^U`Xq$ncedy>x*#^b9E=Go1fg1+p
z*DmLqua$p|aT>HpFp(MARCvZ#|Di<7w)DqFQG<l{&X&sVSb3hOUlp>FP^EQ3$AX&*
zI5u;o?M1pEkk$lzBROlAteR{%Ike`soTR;&0`ceDpY`pxtc!M9?EXo|!h-X*T+?WM
zO28|x^JN{+mvwj|2%<AK1K*Vp+oCb!&6eise%3UFT~LfPMqG7xyClFxHsD-vlLU`D
zZ?8-zfP79VW6de}MW|qA`EJSizuf)9=mW~hY~FyXQPgEJl0m4OHlBh1<4^nH-ou;Y
zWlP|=^<?-)V<KdUKSqWGLxH+2^IXSW>;P;^6!u#};dP(q)d7YD8}vEwnD<@W{e9eJ
z>5#{=f#5>c+fcqk-S@ss_p)fV<=$b=`G;@5Nt@$E;aw=;#5S#Pa|hoB3lGZ3Az?+v
z+b};5C?6F5+~@2wiW=Zz1;NvQE<ocD_UmVD)PVlq!@|bycXll+T>$ai)rM|-&o8Re
z>Rz7XiIVl*k8<vgA^1QDxQB|>ZRU^>)<(p+ygqy%{_AmZvmNwD_EP%0Sx@XVEYzk$
z)ihPbu4Ung>e*C<7|jzMr39~t(b_BNO-r^fsiIlXv2C^Ck9J`TnRbZ;ZYdaSx*#&w
z?3bW$W{PSAxU!Mw18%l8^Q-eYO&)(k(5Kl+txr;!gLN;<q2GeFVQ{ql38RIue^!_I
z1*l4Jlkz-X_@}7nFO{GQKIUMT`G6p48G?1fs>$ir4)7kD1sSw@oRlx?2)`N;-&Vuw
z;R1Ns8q?s<DZ$jJ!>!*wN-r-$%K#p5!ga|$?4BE5XU%(Tr|=saN;ce|`5_;xMhx(&
zk$%GYcsVBK?kA?oJJ|<Xkp5dcUv74$uYb}OOfR~HEekR5BEE?QWZ7(K6`+bz7hZ?(
zS2?fv@<Iiq)dw*+wPZ~0YcFe-d1XIABZD+`9%^FZ>c1zDgy7r({uTo*f3)DeZL_{u
z89o3eXk-X;g77jH#Y3p0<w#AJkM`RWAXco`++gtv)lCr<XoG#Y&6k-~ZEgte)v`a_
zSh}ewCZ!KY#JsSqD*HLa`KJCitn3Mmee%z3GRkf!$cwy>z;-YQCai$|p|0XEE8fiV
zqfOIGCIG$;!{nrv2gqXq-ax8=icw~-$MkNNFKS_B-Q<>r2xkN5fa+I#iMwI5fhSCL
z2@jv~u};h)b&`v@c76>O&Zn`eiFJ#<872M&<ImeUO!f%^7kTnyf4}d;=<|aNN%5o6
z^Btan85OZh@hqzKIp==uZ1^<`e1`~8%h9`(z#uMaAm4(#8bW4!Kw|^!J)^UlwrR8X
zR1?_O>2d#A3ih!tgq{A`r64$oI8RqhDl&S4903&^IWjmGFsu8u(OTo_vC|Nv{tdFw
z!;QB*LMAHpxk!mZYr5MC?WdGJt--6cAY=Eb(FJ`JC@pA|U|2S4bZMEypc<b4#KEiS
zujB86uOYBJS?t0+<V$ZFI<DEX|5c=7-^)mPdNwZzF3TUr-=PsUfmXnm%5+Z}J7dxi
zv@H6n`x)KL{<~@6di^=pp~`^wLlU>XG=P#^Jqs?H6$6S4WWr}+5nbgGu_cG<s!8AA
zeiOBL<p}Vy3ycwbk&LYMduU@_go4E@rAH;JhNaoU=07Wb>pu>b=&QP(^bT^^u)aEu
z7n{^$)JB%dYGFGSj_rs4<)ob3nxvK&@Oes1-sOo~Td$R1@@@uv^8pq?fYgRQ7%W#8
zqxtl%p{t`c>)*&sRu*gP2f24bF*5bLvF(R9tZbrd{tX8O-3R8XA^_G#FA}(oz024)
zTwRbD&VWKgR_~<RPTz09$?bwxN8#~2w;yeYC8<oJH)U4*n!2h*A`BO0O*f<qK-vd)
z3JrdmFs+YdJR*LB+t^BLva!D1%>I#LalYO*jW%BMnITbEJ<lQd_k>A(4;j0ve$oBm
z^MFUWBrbvJqe5y!nppTx0vlJ2Qf_S}9gk2qRAqF3l`Pj?6f#O;dm#ozhpnsAL<@hk
zmr}G=&N}`VEY^!9+c$)4Uf*B7z+0$g=0yfySrT$RnDOz_^eY2$XSV@;-nFMf_XY7V
zYvshzy*xRsdi#NSB?<55joYTKxkP#HlQ>#?mZJ_$PNB>`ln`{%38M^FX@yCR2nsh3
zsBUc@-GBG~*44P~YHEsL&s*1bDPJtrLiAo7P#&biRhQ}k{+CQ(MV0HbXhC<b1p>Lz
zD5|e(H9NBa<8>No(AiCE8FjUbBI>!2edlv~Jiff2tZ=yA4YFvo4pas?hs2HW5EEEp
z)?rDd))C{JvG`n*t|ksU%Z!c<*H|~uy^Jp`rAd|wgl_2MFo@J8)e~xank;d_{_7_1
z#Fr#Vca}-PAdURueT{(Z1f(0VzObR?YHG3zN(Ws|DQb6s4^mgJHpo^A%AEVMLdg**
zknb-S2C@|V@Tep8Gha+w&SjYy{y5Yh{k;Os8ZLUnOa!ne3KoWPw7x>9KRTwt{QD1R
zE$L;y-Cl}asrD3KOvuoe!hP+S**dtusr0Cpb?E$L;_;a=MCvk9gIB9bXL;gBmWXRO
zVj^txpgI4xH}hcqaSd>r2YtN#zu`c0sl6u8V%jzA=9w4x`=cWb*?1(!hCm1}GJuUj
zg4_(2*<96RE97#@+Ek(@jH!+$)Td{LXv1yk=)`FBWo+@<ZzdxsxF%)CcPIBqv!swi
zMo=GGBy2o6T(b<E(-`DxpWtz_Y0WAWEq52AnR_N1;Kc8l7snT9#Gi&m5IEx+_4!7G
zh^|q)y<$vna^n`yZoEC8;3#EW6QK5Tt`nU0D#Vz2GA$5xf8-IxHLWAY7C|n2e=ZdC
zsX1qdsWE<neQVU8XL|U-iqTBtTZGGlg!6|QHJ><?-7(CWW;0Fx4uk7VCq}3GjVGcl
zR#5Z5`ntb9`IhtR9K2q#J2hOXiK~EQFVvyb+Q#3G-o$B7huWEsPU=lt8WuV8e=#Ul
zCbiE(MiZ@go~!?B40Q^H`s4qqwUw9p&zKX~#-D|)fv{G17Ym~fj#yJEjk)#lnzXmY
zv+R%02%sU-*XQ~;Yx|+9OiWPP#zyIeb<BAGy?}PFhZChwIMH)$WIEko;aQIt(==P$
zNf~O9AQr~tpL8x}T0|X~wFksiooZhEIgLy5RU>5An01O@sr>8x_UCiuVIGCsMXM4w
zFg70t_FvilKoF&;ozUMgY6q9UJ+}#BeHDUQ{d`E=7h085i@wJE<6BQesX{Twv_NP*
zT(wDZkCB(x|8K1Na&6N?605l13o1FdVfa92^{RH)XY#YTuTkWSTLalFZ{C|fe9$2<
zR2(Cn!x9677UVrku*g*xQZk_XzHWB^qLNfoFl?uwLLzP4dj_*=93z>Q%qjd*BaD!!
zn{4Osv&=Y=6dHdj@l>k28n5WJvk!R6>WRN&m6{is^M2Dv-RqVI+N0w)9GOEl1(FWW
zH^`9ac|VdogZ7p341i@}BK_kxE*6(fge}?rp5%bJCcH3h19<0S70ns}72FZT)6wnb
z-c(V5c_g7XWD{DX3a+FXTMSNf6mi<_Al4ik&9}h|7PP`ZeZYqX$r5Q=0eoOYjAMtI
z;sCHreDgny(zcg1O)<Qk`5gbpd-fy?R+7ws=YPP$eOPQjs9acU+`NYo#l{dKppozj
z=`Iw=S`Y}>fAI;h8N<_@X^wnQd5V7yhFBUVzqhB{BYj1!Mh)_m9@Hfd^cC?D;&#Ds
zz{5P=I3XWPZ`1dVjJ(@a>kM0I10x*On{aSgun-uKS)p+zP{3bEqu8_a*Kw8bZ1qmL
zfTB*k*8pAMs9`k!)T=pdtKI!Vz}A~bRLx&tc8I2tYyrLq%a+V!eBzYhNye_x>>iCW
zUf2@2a-Vf(K)d$nfBObPWfJIDK(d_&On2`&`PB2-5vNX!PqJd0<CSJZA8_`nTgEkd
z5qxs`;B2VPHPw9l1sZp_nx(JOzS<jvl7;7oU76WHhz@(FgNhlNb$7q0u_e5XZ%;H2
zxSq~~vrPQWqBigZNSfqPpZ1g?u$JGT(Uy6%4B$|QD+3ap%?r#eug=&Bc3U}&_wU$y
zB3ck}sWTtMBl>8yBmThdjrQ~2@;98UJlI>oI!x+}H!}mU=LWQwQM`)=GUPX?l@4Ue
zhyuE~By6};+#$}7LFq_)&Oj^??(kI7+Ab@bvT_?AJB{6OKvw>KUz<~?@n|mJu4Q1_
z6Xx-wK=v{)q1`{qf;u+3M^fyD-^a0FC`CE26dH9v)a5_mqQ_v?$TKP8W3A31X}opZ
z^MB%igDJDRZHP5&v0p~mErNs2u2XqoG6wK*Uu&m@s*y2Y|M_4VON2c#%d`NsH`<b)
z@qBc%)ayC_T)ZxKz$f$IV5<y2Hi!OOS@Nw{iYyU?vm25k%~{nYsZTvwyjG44h-7oy
z0Hc|Fmm9C`(p7ij<|kFagcPzy0$Mof)inSdUP*T;Eq>HFtgp3)Ij86!zbA@#LSf2Y
z>~vYX)%mqiy`u_HQ}9;jn!dRn+faq`+ot4UNyT97gYUF{P!BdX{oa){k}UDI@>CQG
zb_4Smd=bpYJv<6cQ0K7ZL043sZ)x!14{mB0)nRte%N0>;jE=8cJ7;-hbKj)u=knqL
zKkUYRo!)u+FSdG1<1DCCF+fI>E7A;-<`C!5{99%^#Y)Btyz}GQeTDW48VUXN5Vry#
zp#=lRa!L?g={uYxzfGI$-G1QK?-!ETj_5&tSd%JmJ|&r(iv*#3U5)w3XV0fon<T^+
z_#cpHq9`$UUsfL@4RrtU2DeZ*H+VHkfe8s`ful0r%xjgc6Pdhq;1bBViezv;9Y$th
zD4hKmGkn?bj({0*8FZd-ls3|-yy8pl^ftL~!n#QNY_+)=s`lVZO;wp4PH$rl->kIP
zp|H>!*(1*9w1nE9^<Gz}kLIDqFX}@+FMm->7Lw(%ft$MLCT6?6=h{yD1_fAT?@&Wy
zW#vya*kem7P9v0{TRFhdDz0Jz$L5fh5U0OgdSnQmBOCgx1s)>egIIobJb1!j#HR}e
zJ1a06o9pYwSg|FYZg+ZhU}uz7W8@0{T7Aa3t31>1MV<7Yd+ilp7fL4#7j`}7g)=H=
zg(NNcKfV%cDM<quu6FA07O_>wT(t3B{RydE1*b9e?`;Px)LRznKuX|}2}x;AR?>Z<
zv%ej$Vo(0NRMsoRwp9T9n`H51&AT7eP?@|F%`_q!23DpsUC+Mue2c57%Vaj2a(rJr
z(O;_W>4jUON=RSKU!G$VJCW%F$5+d}2eS+4<6t?nw~DX6*#Cz5K>Wc5X_{#EcDGO1
z&O;L+`|Qsw0ZLqXP8Ko(OS+BgoeWB|U_!6>ozzIzrXph<3YKkmWE|~%>5DM|m;}$e
zyJR32uV3}rzr~S?dQNwC1(~g(%T0|#{p11?;OH!7yOl%}YV<YP;wt;f-UHRFg#uK`
zH<8c9#j>;Kb2vwdX#z<?0+j&?bjenWychjoPo45r0*xK-`W<mCqq^Mv!JeoT59Qm^
zB?{P{_&bHP3rY*<(Bl$>URB-5)!bN_%knQ-s5B)5!8*B9_#X*BZgRebGX19CkZ7!u
zG74XNULnhi4EG}H9Ljes5${QN?%XLvfMn^(mTI!C#fP~_hhKFiZm(FD>-P@dr_sHq
zU*On$)SmpPnFgj8>|dlh_*p$>xx0B%+Y%J;-7`sW<IQIf(N<IB|Jq&ntlmysqA<rs
z9i;+d8mn>3x;fGwv=Ne*u6?IneEF5njH%c{ufh@Y_G5T4!|ET&Z=3J@ja)fN^iWvJ
zdf0l#^7XwX(iEQenJ1x{)Q^`{o1*@>{~(fxXeF*ljk~qMM`-3`14MKz1@%y;l3tDV
zQs+ir6go>|)x_>?sg=o?>vC~_uJ*p=-z~e@b@VU_x>fekERy_9%BGnhEhM%_J&Vf4
zhR+{g(Z4nZb&<F>tAFo6;O|~Bsp84UrUhT?gm8tZiS?`u?A!SGAG2ZEP4NsAt8y+&
z9rTAChcN4gv<2W$bVZ$~HieijvAjVL!$6c~$uGQyd<s8=w*=DEux(h$m2hZp5ml4r
zy(K$^?_U(o75SJ9M><U|<SZ5UpPRI56yn4iaCgq@P#$alHIUs!UjDw$ZOW{rP=J&c
z;t29XG+n%Wp`Nk86V5~#!g(1|V95&BS8VO3XRb}B55RKJ)b9qvlO^E_i)S`u%8+BY
zZ>66@>>OKPH+~{LEn)@=zww%OQ|iMqt_&0^iA;n|<g4?$Ebg>n`gET5^kKEFS-you
znrvWU**mTre}4FH=+;^H#86*RP9EuW?=5FQ?edAPPM@4re<vt7WWMPg@cJ3zOCJ7w
zXGH6cBbtM?hfW4;MN%p@P5D8RGU|C`qxrGVo78?SF!YY;XTQ`Z+H4hFfQ`8wVShED
z1L|>;F1kz<J0@nY>QW~tBiYi8-W&W6u)6RmFr=SDgZlE?9rQ<;W_CindZ)HV#OSDw
z!~{0gjDy?l?OkhkFrUi;<JZq~nzYiv<=+x!y7se{=xM(3)Ic(o<3FH3b!`h@>_-=%
zeHE{1gHwmkhVHM5%vt=TaL?b2{Zjyt(~$OA`-mGKo>nw9S~*fSawjLcMcTwW1C9k`
zENVP3ZMocq#TL|FALR9sBGl%px>X(7@N=U<S#uF~vP_x*)jY_@m?H15{qsXo568{5
z4OPdkWf*Z`1Uj7NSQnPt;Cr)3=r%pdE}mh1ben{UyxLf$wQI$<%p+k&qHJ{HpCJ!&
z9#~dg^MaTUEm}R#I$f+Y;RoAxKK}@A%<ZR+KmSnO`DkFO^prhoCjcR^FP;qHj%~7+
zDx1>+XziJa^T}>PUvM>PZ09G!406K~X9_eo)i-~V>8B-=iHj|&rfbQ~v?P_i+0d+!
zAA2B1*80NYZgykoU1mHi#A_z(-tGm<=?T@z*oHJ34UHjpKJac<%(6YHm{wj-k3zg@
z=R3QJuXoFJv?fVNOV}sm4)(wtpeW?_8Q0%^e&yNTFCw*Ai)O}RuH|^h0-q^PN4{oQ
zMaHyi9P?_HLklLF5pEwprOmAJm_g6p@wYcoE0h^BfGHGB&)A**rI5}4J@fOtT-0-M
z)YRxQF*`*v<4g8H4Yz0PY)@{An#?mk9Cm$X_|t|kQTJMqBJ&5n7`?V(X-{=NLgk-e
zSe{9!?7FZoeSvo|@)gjG6h{;^K`#4W-xRik7QZ&1=hUXPChdR)6Oc&5$z!kS(re_}
zgI?Zjkze#rdRbtPv48w&7l@OiW)~Gr<4X<YgC^KFBqyLq$ey5vi74r=vv69&h25K~
z8@M~m0IPl;gxdf51$m^~LprS!-RJ#TkERTR35G2iZ!k{0*^xcpEO%X$MF$~dTxAI|
zO^3{Y<<S!@B^Y2=7VLlgop!|i5^Jqf|Fyd+ic=ay6y``RkH%%;9rx};8izfvv5N3i
zeJyA0M1d$ROVV6LC*qTceiy16v`S(y{)09h%HyqAN9Sb;rdb;z4l;YNATYCV_iA}E
zT)3v*j-&_aTK#K_chzuvXYsIW<|W6vY^blcdQRZprkUz=%`lh1gU-dM_Re{>Sxyj<
zD|x;8<a)|<zr_oJg@qPMP<oaWWNm-u%h-42s(g2oF%Hjh*XexfV16JgB@g%!=KFM{
zpX*ygcZ0j>)nAj#P-r&Db|yc#)fltsGk~C{*&Tzy;ZPn7232f2_N*3%E?|d;N7{^p
zt&k^;<=}T;TFK4_e8D~ApYeY_^Hy~V^Bd++^!bNS=@+BZytbEiU9`+w!Mh_vX3F=T
zCAx{tA*>4!Jfed0fd?NRrXQ5tUaX7<a;_u2NNSMm*1~BWc@7<VvsU~XWc<Bq?jgm!
zn(N@21%<ZEy^I|P#YQ&-+!LIK9tjSodrP@GOZ};95o@ULUdZz4x3%o`=4z)1n>rYi
z<bUfM$W0KyoHTjynuiefuqqxf093pQAj+@t=J?{TTra_liN?03j2rx{LSEg-xI5+N
zTN3hvqR}-ViiQ-N0$Y#ApyT-gs{L2oAl?vTktk2?9v#e1uu_rR_@8l$Ya&p)E_>W8
zM@L<!vKZgtv4KK(OXQ?F9!D*lA+Q>)NA??M{J!f(>(`f)`_dgI#iFf*es*{{`yeuE
zdLFfP!OEX+0cpoyrJ8*ITZ)QPeYE)nQFqn(qDk2xNBq;zuW1dES)&=<#30MC$j#CH
z(?G-XBt(S&B0M?ywSBU>wgJPc$$Ea~TKLk?KA^&Ehd_`s)de5e>WbUpHkaItc#mfz
zn`a@38MK4{eLHLW#*>z;WaYk;e)(NID5cam?N=KxQRzanB<<T<KYHeFgZHvrRw~xK
z_PwhJp@r-zpr<#agj5feg_tIK;5->_NSkziNBiZ_gUBj^&pRvdO#b(%+^iimUQ8wj
z6&NT4^$Spo&tYJ&y=CnwL%DM=D!6VyssG9kFeZSZ&!vS@9v`i%b0d$;u4WOZ_risG
zWLeQEdk0+2;Wu@DqXs`<jk`P>A(IBQHV4v-sP)zR06T;CE@!hq(&Bij-`?4FL8U0G
za0>+p+RFj1O={_>^M$Qi@t;kreTs|xYNz%qv)$^_er;^|Rkw^m%_>pXM}M9HAF3r=
zI<3wTl?-%NtZX>hySpj(^^_UU*g|LPvTJFxt2fuL&A`yYew5b7GyzhxZ1LRz#fddb
z-alXc2aLX5cu$VCtowX6aDHE=-DD9gNh5_wY!^hIiT!Oe*rvQLD`@z>@A~T#zt;MZ
zv%4s6Cy|^!2(4&dll+F3wC;Vic<xXEpk2<Vha<f=o6BW~e7@G)UYt9!zVHeL;B;0_
zzjikL2ebvs+E@(u6-Qo;q)q6CZmkbUE^{>0FSrNBMXq12@j~}jZ<B!Iz-9P4A<(bf
zsIn@21KX~l1u^yN^#6nLUO!!Zy|q}ns+Q~no|G@V8gFM)8<2Zs&oMck^pU8R@;E1y
z8@#o8k0k#6k>4#)|4ua{rS*rknV1Qqj8G*ks_Wd#GRf~g*sBHD;Vm~>yy|0B&3IXL
zFwuKsNtOF{>^JwfEM<_$=99YpHRUbWl^I5hl~h&3dXwnn*M(jUaIlb%qPBctI8_si
zsM#`mvDQHiwF|qGYIWU9$bKP_m~#l2{SbhEdpsaL1}9_{(W@GPIOQkLFH9rWB>P0V
z3r0IMN=hh*|8MZy;YO;D+^<|7g^3bz>U%43AAF6XN6w9|?J=Eu$(*MMCDk9j)Jt#v
z<2q8B+*plmd)~$y2b!0ByPW+#xU6vA%2wpy{sW-#u60q<m_OV6k-K=Wy{-?sEHn3#
zV~*4-@8^R1oz4Dd+*c-P)8ZANwMD9@W^W$cy>hz_&gVqd8g{K3UdRaG5|fOGouXrX
z`{A3XldCflcTa2CR(l$NWKo|TmK_h+c?fQHU9EN!g%WcXe$+|Q?Qm6#@n%)R%K7Z~
zE_@rurXo<bmOF6H26DY9e2*smoyu#S_l~=tohqp8lsiuq9q*>7ztI9zzejoqy}5U{
z0rADtIFK1!{JV~)^LaRk>GwP%H=o#jaLMz^B*}l1z(-`yD=As!Y~FQqlP3k>Ygp)T
z>c_@fE4);L?pnM)zjF42N`C4#GrpN+He&BeDN~ijpofsXA9RRJ&K*izKfi>+$#QX0
zex!5dFWw?;P>`XChWGB_if<M_OK7F;uZO8~-)zm66L`brO&GbAaP$y4SL<#>KHJk}
zGZ3Dr{MhZWI-T`Vn<Kttu;`DrJB$X;e_>K)5!vO|2oz-RW|Y|m<Z4P#|LqQHY`BbH
z#!h=LezCOnN<11dbs}p0Y9pJIlt5GS|Ja&u9aL$bNsF(G8ALe)*%IAuWMaxB4%pkf
zK!0MqW_+5nb63!+vp9@{<6~m{6fE=u;M^e$0zenbE*2Oa8>JoD@8aL%>z3n&ix9q{
zNj~ER<tsl5{Pd-wJkkK^Nhi@9E?}k_o1;Q_d*rD;D8Edj@mZA-&oZd7X&Bq8+q;`(
z@3a9D8sD?8KEl69Sze+g(jVl|T^7d+#Qq6Ao?4;0XR6eMs~?{XS(rm&fAODyl}P0X
zEhT^(0}RlC)9g%J_OIx@?!8lq%YFJ%USm-5n_>h4-X`7rXZma=*0g;M-PVZ$w$F5d
zCwJP#u*V5AAOrtSg)sM6fodNgDs}MB`E9E(j#om}!#gI0j{H;x8IlvM1Wxd~*<bat
zK=|YGG%j5<nB47ln9sTw_OpUnVOH=#3QEM`sx&RL8zTc3gzIa=GJ+}D>Shqx1^(uj
zf7g04=4;;Fq_l+H^Y2A5z*)7{c5n7|1oX+^SL8hYa@YY0F0+7A>nXtYy$lN6UeP1G
zQ!9se$`C+SLZ4^S*baCG?zx=qbsGB5I(*dCzwVKg-lcR-{eL4hl_OyY0#TorAmTRR
zSHyQdA}gdC;0=}aP0>P=y#4_tbZ8n&cg)w;_l#?=1vWEz&^Wo(6>L8CXY6EHEBLjv
z%x+DA!6q)2?8uvCp3*ED%VVoXjk~Bp+GRnR`S_~BR_0xz66((rAeOp%Duly0BT}XA
zvOt#khS|P}ZO~JRdcopXsoK^we8FNgE6E11M7{-qWDs+@rmq<hVS>aiJ}t3#$|-@E
z-Wb=`{DEhCH*i|S*hqbLL&$iii?@Q6r{%_F9rnlmO09*M;6KHwgMHG<AhjLe!{uh{
zzqitFVz;F5qZw>&IxX&8)PcL5Z$|LzYDlcddn(;mACT4s3^VA%xh-V|rj=+9Z;%E>
z8mMpH5_Q&pOFAwL?!={FySf3Vn5BZd>66uzgq0z?>>j+Lsi{hOrl>pYDdWq<fw{w%
zd^@P(<45Cnd5;Q|766<J_Ln7pP8eAuhprc0Qz@84&aEw9wwO10^DR#l)Hs%p#SA|>
zWEs+mOg*6#$d9pWa083xiPc~*A5@K<nEMHXzu!cb@2V+}9r3yhJaK3lFLSRZLF6?f
zcsWx;A^iOc_OUtR%g#d9kTI};#D}Q#e&=W^Vqz@ebmh@$RVkcqB6}A!8y7~_n;%9g
z8IF>3jV?!LMJ6s$)ZfFv8SWpw;mz36pm>JE;tk?Ok?@F!HLoF~u|CkUh*VGrBRgA#
z4A;3+R3nD*5>j)aKWb$39@fQw8X=kSbnz_z%pf3<sbbpYg8s+eX7=>93~)%A6Muy=
zAVwpfIiTuNg*T(Ewd(oM%h>z$;gX2-v;TlByOo#%BpoWb49=P)PzPqfX~|9*)3@;A
z{K~|y19&MbTtmQ7Ds3(8@{tLW1|Iq>QsD6rE}+Ev)-I%Oaf?A|54HYJ{GEte1I$a*
zn~#$S&S3tY@4Z>fcRBLtczI;^hP>!ni=9nERy;<=#EP+#Lm!UZgPn@Qi|b6EezYcQ
zG=u-~(d6z&)1@IsW8`eTeLk6LPj)de-l2tZu+Je68<$4=v^gQMK`{G{R=Pc5V-kC$
zzJHiQf5prB3NS;lq_Swk!HG@U5YPJQ;d3`6vC)2)5Oi1~U~x`E$o`@uEMZUJli{Rt
zwUr!=zv*5MlZ`O8Dsc7%5EvM&T0Md4du$)KD|fv&83qu)Gc%uIwbX(n82CbuSJoFF
zNJPVHwC2seU|@kj6JN^0;hzwX&yQZBRI~4t3J#F&?Oa4w@SQjor{J*(Rmt5{av<~G
z^3li((ntBA46&byJNsa!0Bt}!Fvw?E>e_3aa)qRSy>Dko;C&%2v(IT!4$8zlqTaM+
zdC17YhE#{(+wTOas2}U<tj@DCisPDC%Az3|zimW8tOf9>8mJqR>p&>w!aeIQpp~ea
zpR9EtQ!gd!k732>FW$x{=*YSUmv^av%l3pNzf8ZK7&aiHX#bee{0iiO5+Ef=n6(F)
z%<lU^1})(m&z(p*r`q~?fZoS(_Qf(5f42hUA?n73$>QJN9tv1esa}SkUJKLA&>7az
z-LvK#L=vAQ_Gv^hDtMY_ZK&4&0UhMZY9e<Aujq|byU{v)_F4KMD8U2GP6}5L^)NDd
zJ1HZqVk~YmLOAj3ch>Yk_c0gv$>3qoxX0BH#t!*L<`eSNpjs@u)Wl;&^%lL0PZmFp
zl7n5z+neoQqh^@o-+wsO-R6#-TUD>;SiP8F0rFYi{nnP*w`miHzgz~<%<u>c|CEhK
zOb2#bu$bq;N<Ea~yX@b5Zcb&co84W;e%XFlf%t+dOg8`U>zcFs;LxX<Z2wz))=vDc
z-KtX0{r~cA$%^Ivt(@1rjwPG-K3Ey<UUInzSljX{MNHo97W868299+a`7<4i{mXGr
z_#*zd!e3CsljjsOd&Si`%Wk8;NOd)T`79tU3_S9lafh^jr46|>73$`E$#vR=R1x%l
z6rG17)c+sH?;OsGh}`9DWtN%la2%DLm7R>v4mo6xLlm8}B8sE3XEssDIHQn}y*e}5
zdwzeP-#>8k^ZtBZ<N16%<IEl=Za#Ai4M+-#*tzp(1hEswz$qIf_{09ZN?9uS?w9vE
z=NaE%uE~?M-~Hcq?!<|8w61KAlfV7Ngb3|CU^$f!4mg^M!JX<Htr?|uVs!kmt?M_U
z@`9JIUq4k$Up7FV|NFsW<!uvYzG6BNto%4fJCQJN;Hd&g`&&J(sz`TAxAX-K9k`$A
zq7<u^v!cVQgj+YGuIgat9<cT58}^2fu1`HW{V~>i2T`%~_4iDt2%q`rv)&=}Q>zj#
z-)#P>MAFQ@fQ5Rfg|aQJzT59uQ8x=c5$(7^+vNhwu(7jozXmbs?+5+*i$*!RZC>FK
zo<$+bHMdN>qmL^HJi{$d)ZB+F92}s)bk*yMfGmkixaQt3*#<E)(g;rAy<<16MzBu@
z2$LJbW~GH^5BULfk<M|~pS`n|9m?m)%c0BD-3el%<OMyXmX_E4FirZFb9g2K-q^}E
z-_F1dkuv;pUUBGZ{CW!rmr9jhQIN1?Wamk#Y}0ym#MjRX|6dAicu=ni+}b$v?EnV)
z$M#Tf@BL!>1@*L$oYUvI{0_YldivACb-@EPcU?<JZb|MCyaJ@3@<8n_jpLMzB84xs
z#!UhziSgegHkTTzE;UNHK5FJo0g1!<8OUgIuKa`Els;S^R4~@ld?bcJ9gSu=8nW-)
zZtzET*=%P+-FKCJ9pNw`@Db&mThJ#@3oYwL|Mj&<eHVFhBZx5PJ@byy{a8xlxC3P7
z=QV}v(_A+yc3bQWkv2J7G^5Xm?1b_TmIl~u*HQC40Ns89n?Xs0-P-49d?YgudyW=$
zh%xD#ZbMy)94yfQ{|8FdNkQzW0CBDK771tBJkrGK#gN!L;N+IG5Rm{Fp}8l7HgHhK
zv!W9K*2DTVDX}0e;i+^3mi?k9kNl{qICj9Gxsj+hG7(3p<;BDGV`CZZ_uthcN#=<|
zz{+#2qOFmKma0Gr%ki8?Pd;Ltn=_mo_%!K5Y*c5c3D38E0o|)oAJj1`nO|u@GNwKd
zdb|Qix&@8vbiN;L+Rel@a1x8viEK(`Z0TA`K`5IinP+8_vw=?b(oPwU1UlHy(WqW&
zjMhhBm2>`-+<QbV6G68=z*1@^3~>fA*TVs44j$&ja%fDNii|uOVzY9OYf##fZ6R9{
ze#+Tyz`^0&P<Zi$-#daihak*I`T{LNmG^tLCJ@)UdbYZw_~wS>dz8}Yh&n*l%E-vD
z^OO>s1ha>luMtwv0n0TYGd6)kBV3<`%5sf4L5iT*jGUstl!oLdQ4DLlJX#2xM)Fg!
zx6x+PNq(Z!$yuQhc={*4Dtu^}><i<5iMQf6AlSO*p;aTzy7wuDk#n|*XZ7c<ns0mJ
zuX_`}ddhA%Q{_bIU!F_+g$~+1HV(4Vba=}ZuZC*bjK#{b^<f~wS!!bK^VYZF5}JLS
zlg9?sk~QH*=HUZAeF~J-2g084?|6E0AzF01XRAEP%ug?*Fz$2aPGl64aWo&YieX`G
zA~>Yw4JaE<WD0p#`>Vsq_gXGOijX6-=N^kzA-`7iwcq==!i{a?|DcuAv+0!k6PF;7
z#FxoOLxTEmq->-hQ52OJDpF<DCE)nV1ih<ZC%kC3nWyom&H~QT&h0OmWsFyVErR2)
z!9pPyncrWfKflJ}on#Hbz7i`w{{ukUeiv7ZH_0^c&8u|cuU&WMTx6DE6f1xhv<knA
z@o-c#h-~@300Qlw496{z;bJWrAb?8zxv13h&YKsSi^dLPmtJ?nxasA<uKc3$LA3#$
zbdcj~d0R1@KRq91_xY29Ssrfc5&1vA72<*BbBj{JqIUv>g^~d~`d&8e{0I9fKi*Mg
z(whi4B178k&i3=ZK*xL+`U$Px1RahQRGuI;q2bB+N|8(eC46dtM%XV_|8}qZ&`$V(
z{haYH80CF`6O#j<hyl{bD`2lBzyC^4u8C4pWyB+b?ICEW>6lHeZ1%=Ke!&c$1#iry
z`g)b1Q0+Xb@@W9J^iIb(#!s$G4<r0c|3lt}th8`=68mRCKkl$=>UXbQec=HLF3k`X
zgsA8>TY}7}0H3WFUUEi>ly&amiV{fpY;3G_u~qKo%afn00h12Po$=tN6-2HLDSyv@
z^s0>RlmbeDPVFO=wlS>ecGK9U=WrNhHuC6nctBg%oFPEPKO&HKyI`7?Rn=rBfAR0M
zo|iZ9-<wJlU6mz>I`%6C0hg03TwVj89iLfsOc^jj4`#O7_x)-VlT!Ae4HJA<QrA;i
zd07T&bll1trM$FlXy!ZhT&&s0Z|%r{s)Rr(<b!<Cfc44tTklhka*FOYUP+k595d_d
zvFzvE`OLv6hp|7OAFd7L-71!8<M?d||6Uu~<dn4|0zs9{Xa4+hnX4EM6<+Ny4e~O-
z^dszR*F?bT5!h@#mMZ{Gl4(oOjm3qpgq)6~*@9mbX(!P!jyaLUB*s{;m%K_dGbDaE
z2~{CIP&?Gz0JYGmGwkF@a)<n+(fL9sqKL7+oLMd;8$Dn+y#E?Tk&Xt#B3q#_s={!`
zxsAwx_bRtAg3vk$;^enI?Hw0Lgt6D_45A`dX({KOPZV?O;`&@2@*>1F=$X7`+PW2w
zpu=f@0t;_0pXjuPXgZd_=dcWNO3Yf^G?;9CX*ThGa?uobsJeGDJTz7F1-5mMn5&<s
zcs6xdaOY(rSFgPZjHxBLd+r=Jn0wpvcEqz+Q&4{OP{&Rr<+hNP=;K!qv9li<p|WIs
z*B{c4p;H_=@w|M9%TltVJBOw3ofjF38ri`OwS<iQzxrij0~`y{cYKpHyBu0+h&1-I
z5Fy>&&K3bm{6jKt|Lr2(D}B96X<RR-1d|%5mlH>i9|}pt{(!j&2Nu{a4<(167&)`R
zhf5aXECa9)I_Nt$Fo$R2UOlUhv6plfr;2{L_k})(J)Umha9q=SRQxvm(-SNEJMQ^F
zcA@!+g!}<+T20fdKHcEJ`B)Ibty*#~s;1G=;z>%%q|pAH?JgOy43L2zcHI2&U9r&o
z&14h<BlQGwndBw*Sd{exX@9uUiGc+|?WMvK-LS6t`0*055?;IMe8f2GjF!c)S=)U1
zYkg0;aLPD=oB*1T?nG|Rew7cnmG{NbaXM<EAXfQMH6cta)juc8aORVbK70ZyVNU!u
z7pCy)r?;D~@5){E7ZgPcjbd+%komKzTZ`R%0TzAC`aMuxX4e=0fo`w8ihlSkH4W{%
zuN0W98>^Xn|7N{RgE&e41i>Rale)1n;uOv3<3OvL`ev?nKyLslRDsw&iUnuu#FYGz
z|6QcpwRCR`1zVWQ*dA(D@+qK<UoR~=B)RN%?NWt*Z4t7)($c*V2p$+tp6z(DO=hDd
z`S)~-d))y%&;Jxm;<|i>p7KEM{pb~HIcv!PnnF1Siigpo4jo3J9|q?mHuax2<(HJM
z?yIO82E0D_z{flur|XR3*2k!13imra5rjc|cE)!e@!`Ex0jY4*y2Y0DqY0OzIy09v
z<@w>{U#bVzdH5CQ%8tVSK;%AanFV(>Mw*Aa*w6ifrH0Pg4Y7>LtdCFehDmqCdCu$M
z6rj6Fo+`^26!DytYQ=RuK?-d_?;Z`ddGbjjoN0OKY;GnFWc&weX=I>UnS4~>0U$>2
z?R;XD6;jpgn@zy=Tlt-fU;VzZH27!4B0=t!wGXzF*)t!;t<N_+^w-{e*_J5xmUkLT
z5Mf+lQ9AuC_TI%~gJbbZe*?Qf8Hb)H=AWlR^6>z7T<Xw7P&7k2mHxN<2#ud)Rg(99
zDc9rQL#gStZrw)ue8h|kbTRYaN3V6v|HO>z{ejn`+Bk$qlOM*|r)oIA^@`q^(SWb_
z1FT1;cUm`p%L@GmYVxkZc6vhCWTZ2;`@&LKU#Hm}r<j0jjI>sXq0P%R#`Qb)4;|S_
z>)~V!%bW^7nf-Y4CJ6;><$s1fdrLx|U~hz9`c@Th@Wni7>G}(S%_&XzbPxWk)+TY}
z@y2=yg|!F)0=WU%u;lq<65iMbTN^QL$)OlAhiZYLyZZt-j247?lB#u@lEPIx+o|pA
z$#7wUfuJMZt#Kwj?4;PHV#R6G9``Z%$e4jX`AG#2aOb3SlOK*@3(v$pK2X}d>m9Un
zV?N;pn=zJGbhV#ihK-Pvlk>kvV;sFuA+$`K^E(;1zoGhEp|Tp6YMw*){tXt{edfJp
zBJf4_u@J7f2`Ab23*Ygog)f5=?~&p>b#pPNcHV{+DI+y^3kVbnb}Bp<ZOqiZ*`%!H
z->H;$9Dk^~+^`%A^*V1<EBU2yRS4;F9e0QUjI??*j?<cw9+opo<!?TPw{(G=Mu}6v
zuvqdL<1zWkM+$+hKN*N?F}+b&S0(6dU{6RfF_6&+d)SW{xLpW~)=2nl8v~P8k3|A8
z24l>mm+$V6NMes!!7<GDu+)m~>ttkK=*Oyc<q<@-RpM^EERzO9_5t8WHzg2bdp+V2
zNykA=HK82-C^x_THC1VL)Yp1v$9Pve_4)9I_XNmj0c5a9tH5&7Rp$FYhN1$<NDLe@
znqOzhgSu(6NdN8rgvIX8G7xjLY3YJ>xKvVAHfnbWkeVn&%z7dTr>dnKrCONd9rEE0
z-8h}&*c~@SLWA%UYT<%sgyBBB)W1ybt7cr8M=iFBOj{^&+0$E3pC(+!<C8c(>v0N$
zz$duj!|viFYZ>*eM)f$Zg)L1-MlxbyDMGR=H;F%-ZCY#BeBMx1Df#d{jFJEn&T{RQ
zwKAW|@ole?J$A#awYCa>ZkYoHq7_qU3cYzKg|VA2X^a61`Rnpz=zdZc%X^_p#|J$f
z?as_#<;<gO_*aJaPOALiX?s&9d5T|H84|v*RPl^D333n<GjmOyI)U~NE^)1eGPzYO
zy?J$Dh7Q0*iB}j3Vvk-;cLreN-B<#1+IrqoCrsAa^QHs=L!SYY?~GOa5_o#Zl?0S~
zdq|*3r(fh{%el+Bb%m%~ftSenh6BdBsjGa64$MQGPJDK_uD>CkVO>Rj5iknjX9ClA
zHT>c%4#Wf=O3;_PEa&QS*`LGYj>A}mu%fCEQ<%+QN$&K|(FqQcN&*!XmKWIqaLM>%
zKRkcp)eCEJ6iesBgN3<wk4L&9U5KW<)7$l1*|L}YyN`*|{lf-wJ#YW=znf-UXzmdZ
zMzsJALGRgQ(@h=|7x$cZ(ufzw(%@cqNJ6BN{o#f<n<|d`z4l@y-H)^>zXf}y-8D-y
zcaNcuMNRjIGM4#e@lEHbrSMCq>f_cTf;V@vS()6YWLr^?a%*v;i9UaM9iM0^!^g(Y
zX)5Xa-7cdzNVn{gFlu=V0#=fIZq!s^{jRAKzxiEn9egR|((LAH0LERT+1V~x{|#Pr
zm?R^uBT~{*7i>u>vK&SbySD(Dq+lc_q0t@0!&%PJ=S^6~^=sd!_9mW-F2tY^PD8O&
zDQ>>mG;<+;Q{{|g7KXKRGJg&jH!XlO3?RGp!Q}83o;{J)>-Esz@2F~F8Ma$0CwuQ(
z769sgm)jrZ%%5V(aoK125hFb2!as2D(zP=vT%6xfH}D8HCBUD(0=*IOw?!aH@tWx~
z>2HQ)*ZyIEfm5pBuKzH_E`pBak{gy{Bu8Dv76cN3>}XstN}uAw+W10yM=hNqHts1)
zZ^x&9SW$iizFqB6-_Qgp<5%+~y&u0H26|`3`6X^@^yE|ZQ2&i(U(b&8KD|c(CUo~?
zbOzv48qZE%F+8shd-~O{<BNN5UG$!#0yH}N=4nl3O=4tEJ#|=)CKJKCYeLbiYX&xS
zc|C(hjCscl0zIazO?-RGWiz4wAd&LNb+`9H;)?Q>s-OVF;E(IoDiGX7T7Q`9K`EP^
zP)|=0(!^k`iW^$cZ}YpsonZv)^VS1ah%tkD%{i5M29T{XMoU)TSzQJl!VSicdm{1v
zJfG@9mntI$Iz`sxCSO_%bX_z0fWvD-@?r3UwUa+znaACi%x&+*rDI|urI=ehE(HIw
zP-0s?$4)G*1h7^=!(Yyxujj^f!O40ft0b<i$3JB5D}R8cDZEjq%chj8PQ_ahOb65t
z(DAJbLVh}kpqrzJs|0X^sv9oJD`-cn{PUUMd{<u0<LwenJS3&-W)eMg_M3QjD6hZF
zp!0maLA{ah4f#Z(e<x7rui6;<+h~2Q1zRxxc<Dxxp``_$X3xv&F*D*HCRR?w?jpP~
zV;=CAhMTjH*u6|K@z*X91hEL2Q#{|^X@k&(mFcCAm2Kbn5KP?1O5n4#%IfI9yFC&`
zIk)BkN!?$l)yc`IwuYL<Gb|Ge>&~QN^r9e?M4A@Q{v4C|;#tjX_$0!2zu&U^vzEYX
z`vR({7F+ds((;hXf|;R%bLGEOA*R;)83mt(P!2=O@Zm?}>P1Y1@d<i31ycLeb+S*o
z{7p7EA_oZfj<?ZXoVQrO!qlHMOWNq=gosxS3ZytVPbNqivxbLHCH}6x#kBIFrDp89
zh$eSD@_@oIGNz&Q2pbh{kcGk?W6#91cIN60spR!Tm8}jCUbx4XsuhE)<MXC`meB=r
zw@b0_L^*^Uf<MDOzN&QAeL7Xb9lNd75Y;yt4h~A3IsD3d8z=d^i8a!75=EVwZQ>hK
z`Vij1vRe~`NkWn2TS4jW$z90giD^?DyI_}UH?J(S)@Jznxp)?}W~)FVkwu1CmD~Sh
zc-vCDQf?d7+NmCR%Az0G82+4ZtiAijDpv+GRk_FB%I_t<$}&qmHE{RAL3dF%t5CP}
z)WY6+#=%KgqGk7znzG}()Iw^vknf)YI==L_=r8Ui<2~PGG@5U`>0wBD81YCD!SvAK
z>W~$ERedvv7}^vxyrWor1qN~Ez4!vEd{RGFQ4ZQ+u{xv-mP{5+M#~TqkdyIme1(9J
z1*h}E<wTTtHC9j{f9C^HJtlfS0@sLEB#mc-rqq}Rl&!8h{$=4tcNZL#M44}sUKa3L
z8SA+1u+0G~E=Xa2cBx1^z1tlQiDH6Np1KGX-5<=PhO+JH?0_+0OE$n6RykM2`#yYA
z%fo)UMk=4TZ6Iv_=Y4*xpd3oEa|T6e9()aU5=G5{J_#ibW^|Meytbtm2A|7L6yLK%
zllidOh&ewYlNhiRo)dy5qdvCCqvxV1B>lXw&NmJCN~WvAf~$t@uh{ka=s_7*G8pb6
zjCz+u_+!Y{(tw4Bj<}QVkRY{^O{K0s;F$6xQ7cwUMh8b6&)0^lq8N(%t#JDV?h`We
zi!@$d$juW2n$7E@exRc8Bs~od!7pXgFCsL=SV~owF?cfUX8qZE)?jJQQ$*0{B|-#l
zb+Qz6&wdxSrA-`PCcXiz6?MrKo%C)@2kQpv|JrV*-0U3rsafz*txqBAZAL7}<xS!7
zw>5AS<eTC<ABJC5a%rFpCP0fvgy~=D9nI%WfEB*G4Zk%jwGhD!h-iUnzqiK~TkJDP
za-<f&`5O@=v;d-#o*&^5yuXiD@E&~EXpA6ST?M%B1rSFA?|%6DQJ7eYu)fs7jv}CR
zHB#r5{y>2eVuQpuP#}2}MI|vCoL(7R+lBTegoaip%FIREH5NcV1A5&w4JzW@OS3-9
zDwbt`WJ3En(UZ@DLqgwx-HH~?uVnZjm<~^dnsO608N4$x_KPMLi8psd)^_j#D`KrO
zn)t*zL7{7)xOe7#!wBDQirja@Q6Gr_>JYtv8+o(W;$G}#Tt;;le3#WUQ6;O6u>b>2
zwMr-*-lyAcCI^&qzS6ZCty0)=k9GL0^q*Glu{=d7ghCPl#Uh#EDV{8lJkgy1@r*;{
z!!@02#SUf}q>v~*V!hCg@(N(D%l^6RZbcEiNsOHQO>$5>jhXZE<Fy6~g=<v;PK(?}
zWXqCno<TZ65Y?jzJb%^=nR|HLY_4}5f4Wzwt$!H-^B!fOVZcKD`}wd8n_&wKH0J|9
z%w`J0N*G<9y|q1Ar!sH3y%CFoNBd!2I@O=bET*e%z~FF5A>??eMu24himr2jSx?G;
zGsA$YhP?4A3fID<VH9#yRM`{!F`HPAoxS}bMYAdrNI)qMts(vH*owuVy-;TzOmqoz
z0rz;l{Qs1Mu4K>X>xF(y{G22r!Rrh^0aWVdiRn{U{(;YN??6v#5qo?-!XJtabp&w<
z*;E!)ksGd&8a@AT_(0nW>o;SL&zt<mA-4v=9$C5K;de5tm??{WToCkwoBxvdWhe+x
zHe$;qQG2j+@CrUZoG81On^x87V4dj+lyM|cJg|$j6SPg-StjjKxR}`aHGHjj6tLR`
zf@}pp+IXkQx*<Wsi?w1Y44*ty`j;^rj>J1g#mUw7$=wSlCP9z8q{iTGl8D`*71wrM
zdo#Xy<GBiokS{sVF*LZh#pHBsc`|<x&m-R<s@c`GLPkG$Od#(D*b}2FR`-fN>n7mK
zH2WV+WjIX&@WVWN$sg`D`Vt@tcl`;loh!5FGL=H1CUShpN(VeC&lx*^Wl~^JXGn6q
zM^>ppoTV0%KUy~VT>QS3koH)=Vhr#E1R^$bc69t?C2W)E0KHV;?gd8x$BwxO!Y+LE
zh~;}Rr7ui@75_<5m5i>^C#lD>C8l=jX?1m9RD<b~#<>OS4F<h@<JTs)@~cwtx*40m
z_&zdM)oF41(ppptMJ0aOh$~C3AR)LYNAytnO#(-6zc@7bvN4!M9xOd(-UdoIW+afH
zU7Qw9;8-9*!}6C+?`T~X+T=UmP$16vp1Fk6OQ!f>Gh50~{X7@n^Q|;^(<sl<^hTb&
z|NG$X6|U4?*=z&7831O#`Y_<~v)4hNk7Fni0hBe&rQI}sc$;)Tf~8D)U7t9tyn3U}
zd&i#SJr$p;nW!`?TVVdn6aF=j2WlB_N2gQ?xub8Fv5eXfvArwLLvhp_yRZV#oZm}m
zFDZz2g1#38X4zQg%c%ccD3{RFd43k6VElcI8p~=sHrbdF34~{)r4Z+;GekX*n}m^-
zvloQwPu}1Z>h0N40>kst1UA9PUj(9V>5@S-@F!Xa)JcI)nx#~pHXq%TJiGGgK(_Y%
zgKa0mdhnz2?B_O2N0&a1Y*N1-aY{j0PA2)cSBVFTwiaY+c3A7R_qe!@pZFmdZ?~oi
z*b>c8Saw$pjv@}*F0Kv=ZL<(+xGo7lsCy`M_$8&?w{{yZqoXA*hDZMlyA)Q<d&Yh9
z^g*!Z2*7FQK2KNT&puQ6wV2g)t+Vt$(3P)`?Ib|YO<5<@<^#wn@+@kBqjPuG=}&b-
zM^t!}Z&)2w{dw6Q#&Ogaq&Uv}KB#y`cdG=j+z7TgYevx6MOMlgi1!!2duR#7VEZ4P
zr+A<9ed7yjeV`0p9UXN34@BkDe>wQUh=8)W^0n|}9WAYikB`+oE8JCPVjL*hx7#dT
zv$hQ5Csf}(J=fPfdhkIf;$2wulWWA1Ux_{41v7jGf!-WnE-Q}iM4r-ywFWB7h5oEH
z@YkS}NBaB+;#%2WkGsufp44j=!#UC--Af2#i`=yN{U7L`4S<1ve*W@5kefrK+Lq0$
zhix;0?`})ZXI*(w**HCImyjjq5mrAN#f}3y`qIS;pW?zz$;62x*$eu$t#57ZE|lh1
z>dPILThYizrrU_PAb>oaD3tqZ0l=UxeVg6dY+Hx4CA{)UW4jFjiFAS}y!x(t_H{%D
zizi{y3~|JKvGLW&ArAhip@r|^KLc6wQoH^d)^=iQ=(6vDmdZNdtjpzYK5GvH6klD6
zP$aeQt(sQVZI(&-_X9J*q7sMOPJUyN2yapf63Z5)yDXgDkN&AyxYP`Z1Saq~tP)Oi
zvUmVhgyHCwYkU#@2nzD)uaSJylmg=hQ||;l6t<81T%@rb+~im2r;CN610zJh)E-jV
zbIc=*&?ijz%DH8Cb5n!HJg9G&q%OmY{>Cbr7C2f2^n>+$7y$EH-v8MO1#(ikW!Gba
z!is;ijYi;F3l?k(&!-5!tE+q2&;Tw(3T1M@r~-s%22)c;_w&$$>U2tT4)1r0s;nou
zIx3TS+!CukvTTTgYJ->(F;}(3qfHr9CRR@jc}yzdk05wx;0r6EAR-2`5h2@Qfe(nv
z5kpr3yKWO!L1{lhKO?hT?ay)zezrlj&(A~)TDe?15@b77GF5uiCI0H$kk>BQLH$$e
zAF`IfmF#}X`)pPoG=i`$G9<Y}#<|_U3#H-%CZV-%3(y)%Owq!q_sK^FH22L=hW%lk
z8T~cBm1on^GbCMxv4`DANH(ucph=8Hde)L)M!a?A3Kf+hxBuKi!Y8zfc9P~<7vWd^
z<7xKo_=~TCcPnL%yVi)q1qB8Y>6Gos;{h7GXM9#)9B?N-g*3&|m!5Tj=DqP^T1GqS
zJUZkmG%rdppF`Z8c%8t;rIZi|_<4WQo#`tVSKhCwtF}t+)samc0D%n9S}IY`zF7c9
zTTiG_Xmy#D=zBkOXNa>nn{8KsAZjn0Vem7v#VhpjT=MbBP=<tU$#wWqpT2f-ubII8
zR>%^3Bk<vkHyk^sb^EJF{~tckxR1)PeU~btqxtG`g^l~D<zj0e5QrsJu?76~9s{AH
z)C6D1TLhBKuS^0L6^8Yj$=%ECR~m`qfF&Y7oIQQ20d`igrv2+v7acXtKmCV$1^F@s
zRJXx_3AD%#5VDsClL*Uxmi#QN#W+?^X&{GbIkAt%P$ydW+(HP;g9kps$oLywl7-i}
zO`1=u9N3WPAYl>Ssce&fG;D1bYU4X}7z81@PDnC6RuiShk|NhKl1&y};7#>(U{B~1
z5TL4a-D;NtD`MbEKCrypUhRcj(|C$M`n*b)u6$S16SUtYH}=W-(-?!MAKMu0Oy$-d
z_*T2)4-9LBs_<Dz5%eZv3Qq=k^mD7o>btjJ5%XE$oCQYi;YUUS*={n4eOl;>O$-~<
z<kbhaBov@rq9q}XW9XrX$PSCJ1o$VokgfeT00<@MSzGDSu1~+*&t~kJ2mO=MG*FlR
z>(ag*qqVRc@8SA6{m@b6tuW1JX3V;-Y=j<+4Xq9>cLli(-SWjQ_0a|e4q&ezatb%}
zhh0?UUmD~~>0;6Yp`qnR#**SpUOBvOEUK8R-j}@_{O30IKe`MTZF!;$TPQP0^0grO
zomT%n(9j~yg@YA^M2iCGpQgsKs!N(=bl{wU=~Wwvmq^qy;haY3<IM$G`-173pimB$
zO**iuaK-9q{xLg9eOH4=8@KEJFp@NL7BpNcz)ZgaYFX`GN@V&wZxDe*`*S1Dc3gC|
zHwHE5wj;xb1n_KgH^0x*ccUQLl>GAJ+d4fexBdgY=gE|PS2@Uz=*l6b?;Ye!f02PR
zbCxmFYWxQ(OQKS_Wm{yT30k-nrjQUE355w~l{e&TUbs>`Xh9G(i)&tjw8lh}IKh5_
zH2d=CA-Ga#>8|)jq88Ew2?CQt^#V;&;?lQPz>pMZGevtaEiK1(0gGCIocOX2dpbDz
z08}dF>ICL@Dq>1f51J5#LP`3lxx<2AJFRB8VEbFr;X^k_ryNyW923nxMDHQU$+qD$
zYH5!WKZK{A3`#j;DGkzd7L!IR$T+$Ye*Ew{(~*Si)F~oN`{lZP#|{?*^0;1kY`>UQ
zmqkW?*bq1o-5=-f-WrILNZ;cl(JO%`e;5Bt&yr~CWq^B1LFXTec_jSUc$x9>`2x<U
z$1viPIB@x6RtXo?Wq2Y->Kyz=e3albg#8J#KJU3}qS4IwYw6?3#g@5~!#^3+&TTGE
zZmDoU$C%xzr)bO!GI|tBcfD>QiNz}DAr%D2`NP_ffQ7&Sr~m*1u7z{>6;i+Lw;Rk(
zx}D|YVPZ_MB{-HS4SbJup~iwBqjFYsrdr%4i>9h1KM?bP?9dPg(`t1|CEqff*E%qi
zG;H-islE31D;03sK2P(j4vB;KaN!Aga0YYEq0k@|dsR&=R!T9Au;G1XBG6gK_)V>=
zqxK~z37UO|EOe@6Q)ADg3}?20$a#SmDk+9B9&Q!XaXU$E%z=^>>lr+vH$elMnF+9^
zCnz^cg37r?!Gt6D>fP|<eL=K-t~}!ymDoh88hMeK#VdfUoWj%_ob=hz4AvUb<lWs;
z1n%d0EWaA@uYZ<Fm1j0e-sPfCsnNG{CSaco0oGocCbbd<Wk0xQ<uz4$QOZD+<wtvg
zfJuLBf{B;eaQU2y^}Ynt%5vht;_KwDTS&<0Q0%vg^N*&fqELonQkL~uD95E<#V+cb
z3F_13cuycBV#-9a;#GoN<g^*-+o#=@oP?`OM6NqrnfA8QHTuh0h3LN}RW+3Il=}P`
zF=mC6hu3Rs6A6uJV$6ChLOx2^+m2(spR0R^Ku!fGlzg5yNh?%|zW-pK3MSO>p6IG9
z*9^w7(cYN0DA-hB2Gjmt0ei{dA3gv6nSBUVX=fMtvgTbxL_G!gZlfJWub4H*A7U?S
z@uXAAdHX*2=Sqh&WJ6JqWRmnyL$M-BszOsEU$69UNR)<R<>iX_w?}EbKPZD~FtdSb
zSiIL;#zqf+>bNl#?Ky`ipP%<VmSZNpJ;d@0u#xe>Y~oGdu5QAa=)5!*hcE0$;YA&u
zj!fAlfF&eB-;k(43MuBSXZb4gsB1vIfZFb@cm(uNU+93W{lkSWip>!Su`?#>sjd!v
zUaBn<s3Cn9kDyClx=Z|#!L-}msd(|cM@KfwAxf*I8@+}8$tU^Ot3x^I;~lYwKKI$(
zTlkhqIs5&&2I;wV)iH@u@z+v4#-W+yW0UEMf13GBO6?LKm97d!cs*5ES_=3l_$sdJ
z^^UqUetaRzYCuS&?tZF<;x}vcu$WhCWIMgD(GxR&X<eiskvC|~Yo*sn=s;uN?IzPp
zGMV47Q2~g(HhX*!j!ZFhy}I*2$afpGE+$cAlljYO6A`%Ix{k>ylR37neZJFsHQu%G
zIUk$<xmK~nTb*YIg`OM^Vt$?haHT-7<-NP-sgEOi)^7dUCopU1(S}J|#9f+hcbHJS
ztNh59PJH$&M0BPHo@i(u#m%fPgE|l<qMNUoZ$LB!)kFG}zE%`G0V$@Xu8%_U=Wu$*
zxo@8jM|y$}Ya!BMZ<v@{Oc--bXn)UMKgcOvBt+!Q0VYl=AX@Rp$-B2z2%TsA-$Mqz
zc1q#S8uknLQhV;1um9rTNx%2PK6!;+P>B?1B2aaG{JF^+3C9OJL@)#fa*9wTv*%4*
z_qulHej=71*&V!$gXE!s#-1i9R`3od+hjN2vt##v>1eb9R(Pg(Iy|>Li>mvEUh5(e
zHkSlpR(TclPI%lM;r8B4$O9we%L5L!clavy^t6_s<6*Gr*wg3)Lij*dRi%UCV<+71
z*)!6ok7wE^fIeWTucCzPmx;&4`XUiB_B1blF0pz43M6LrRs23(H=un9cXX~hm0m&1
z&Q6r%l=>A}S>{>FvL){Xzg{HbNHXoa|7d8uuTp&KyW*4zdLeQEp!u)j;R^C>4GoF=
zDVH{vKRwZe<+aWyEEQT!|7GB={e$e1C_ZzCQAq!Rf?}%<f)Yj5Ha6wd{Ee<FYEGsK
zXKbI#sxqs;7?=u}920s!B=N%=k7-dpn{yhhDvA41QT-oCylbVexcV}xMQL~M&-*Jn
z+$Elu2AiCEWyH>69}P`8B~Rp3i^65dT=^UL$GHuy!p*<KXa2pLq5m_~PJ?;wR>een
z>zLx91!4*{QO?Y7s15MQyyANKeYZs4R00}WeB~dFQQR{No~=aQH%gt7DUMUjv{2#C
z{kbMu_M|6?>Vrsz?yL=;J{b^nFg!R8`Q**S*P3DpyPd%liXxI%vN`Z)r7Yu~3@2;J
zhcSvUkro#@$?w`xEXQf2t!nHnfKiEQs){BHmuaZ#YyRH)wkOp2&4q!B4`4LqbN9Oq
z$Q#x*eyMx68q0^zka)=zo`7#+29bripQ>N~mXY%lW^QQ1tns7eY)TY$a8ccE_)O7?
zYHqGXvjLGrk6fLE?;RAKkUj)f-mE<u@t|#ad<3bbKjF!m$CM9zy4ke*_&7c@jUhIq
zACA@wJDJ({bxi$jkrOj4`$VRGAq64~T5i_c$IWTZ5hp_*@f$BtJYn2ls1%G|3A0@)
zUL@)*Sk-a@hV>^Ja#UZ$tTeZT-$zv5>8^Px$TLM*HL2m+D!N%}x0{|I;&;KckNlH)
z@Rm4L(*l>Nh#~4oPmhwmmrPDhT5Es)?s?g6kuMym-eiIfF5X<~(h2!9*=udZA2K^F
zxIsz60Syd8IZqb*#Up$p7MW;+_9nh8|Em9{rZ(w8M?&TYX4O6<>Ws*uYO(V;<+EuW
zQ;`-|e3{=>#Ph=oV>az1?ZaD@>V8VGXj-Us8f9|7^pf_*pYg1Jvl5Sjzpm|UXBp80
zk{8j}eX&{`!TloQ+u`_e<>ggFYc0j`0L6LX#e@_kTZB8jTevXWrP%!D#&|Y?lbpiO
z5Ep$*Jpi`ebzApXz<JrZmscw5eO`bt;z|pWax(HdSR+`{0j`){OW~_k0OLV@$b-CI
zZ-tA$x}ps2^S(*tkr5$u>#En^*Chp|u@_<z|2-VOtdJlLum<vBLSOvq!VM(s6}vAl
zKOub*RN9Wk>JndBcqJ|}x5draK&hQj!a}4P2BCvE&WxPnA6UK}4LHIc3wa0i(h?#$
zMkwBlGEUHj>~~WB28AE}b}udaXm6ftYmwuCY6S`tcz=&{zxG#;Tf=TInTp|QC!l<4
zr^3C$Kh3c--7j$B>F~;*iEo8(W*usHh|u67{_YIY)YeT3Hnn+xa0&WKJf9+H!&0;Y
zH;lyN!hb*ylXa(3`T`7F&cGKb?>U;j%e=oA+x8<dlEwrRaKIg+@K9rH=8nr9*#<X(
z1tt=3j`p(ED<4h#v8WTHHH3>F)=I6=vLGo${O@2%r3<Hb+a<U={cM*ytoGmtC#aAU
znnvGUu@#z*62~{bfh4ISANJw;k?STeo^kh>$Nfvv{CR_&pa|01o5NoJ`dI}2-_S+p
zoA3vGbv<4oqKh0L4=w<rDeC9WD~foxjB1~#@54<Ed}8cZ9{vvR8w@qfAQ+GD0`+eo
z7(++rCcUcPD;C{HqvreaxDmIm*Y0tI`h%y@t&`9c4nG&OW!Adb^r+7h5zBWLtaXX~
zp}Yb(aUkImQp~7g{nLVWXQWDdKpuIg>;N(l76<U`n;@hqfO!K-w2G|3t=jaNopH`y
zFtFHdna#U~cF%wsW1n5||K8nK|5@AQpIlx~#J?O4m&qvZkw*k?n|j{rx8zN#&|ZN3
zd3JZZ?$7m}*1Q!3pE@@gNWaL#g~@j2J36xStU<{(OLp6*6enV{YZ%d*?`V9RRzo4W
zxlqgdC4Va2@#TpREyw%>iKl;Q1K;g>BlLv=O#e|jO&8<Erb!|5r-*tcTL1I;1$W5M
z@Rbv@0iG*WY`O_4xF!2^M($5&8R<#onzkchohbWL#bsab#xix>cM6mU07JwMrr{pd
z2WGK?r=4P*GBRM8a5J);LHuDa`e9ojyV~_QwE+Cp=e|g^R9k-j-4nB%6$K?DT>)Di
z`v@2<SKy&XW>_k68UL$#E&Z42{#1pHv<VllAGbD703vb^Ej|{^Zx?X=hw28BS+}$X
z%$GPo0LQzosQ<F$eil_7U-MUsqqS?H9N^>dCUh_V{x-Sg6m6GixD+GB$%WyD>hd&U
zPezGHcUq15z253e9n%@Ki?;Hy;<N2RD5%n5c~ui<wq7m$H#HXPv_AcZ>luElkLBi`
zQTv554)M>FCA9y{P?wHiQ38ZprPh-U`Q6o?fOg1Cx&EwwuS~YhQeZ+<dhwfAZa8Y4
z07=~M6d(Loa&QL%mQ9^*0cC6-5xgHKSaM5SUNcRUgFFeD!Eo!z64BySL+c(tM1@={
zFE{$~b5$IL(0Kb6<QbEU`L4oj1MEoZEM>^DFVm?mm^gbTbzEwfO&f2fp?Xc_j~{|5
zaC(R*1wy=N8ntotK$JE~eui}0(qb;QOLR0n^r*ul%6n-4bi^MY{`vA#c|<-S$qB@x
z=P$HZ%2$0&f$@<)n^0VAQ~F%|*NxDWA<LKkzwA^=@kzMIv$d;qjBZIXoSuK%Kvd$s
zBf>5t2Dhg6`=p1;k4&RyUaGpd@hh4+N~c1~hhl#NdLt*MuJyi6jP&sZhoKRxd!+^K
zBVj&JXbQS&N&nUprUwIuEpyNJ<(LMD2b?(hL1u-Fy|uyWKfCuF@<E&M;}h?p#Is`M
z<({G89`?oPVUUNQU<6S3K#baVmBb}Fh_o_iz6a|Q_&atun$HZzS6aj;Cr=FCCN(vG
zQBz|ADe&(8G!Z~aBXHujY&pv)v}U2DPMU?TBACKYWTy&1tsR-hVqEWwKM*;^wDLxS
zHwhQ)d!)-t=zJhv+i8^JF{9LtJupvz!`!>KKGFqr5as~GL)_7>DI|3Ganm0%<IY~E
zel|xwqT}OKqm~_kvR4wFl3z!cZlq<x+cB%6{UtX$3e&PDj0lzElP`Vce}EK91STfu
zp*0YpPW?Nf>;&)O6Uxko*zMmpW81GJCdvNa>k?Kn-L!uCi4X{c&`24-ej`jx+l%lF
zGWO^)gWODb1R?5wy-htNKhWT`+`RlQSm1Vw%otz76tICc03&Q}Tvyb9WB=;^eX5O2
zVm~J0cJlRD20uNkDhvLaCEfo+UvFVIzNa`OpOuZH&dDRRX&ZC(pt5u69t9FU(y$Sh
zYsQK1jy9-Av)pF0?p~6UpzlH~<)%<vz=Y_DCP``>=8DD*zt09O%acMZ!5NgT9HRR5
zM^U!QEC0|eUon+pjuwv?8s?$-*fp!Yy8goIS_K^mr7Rg=u!-zyr$zJIKp0nDa%oO$
zZf}*Rlmg2r#|PdMb2jxR!W{4J?+Uq7K_?(btl!g^!v(fbq1^Jj&)#0Ti1?_Wg**zl
z6@IB!ZzgQ9V33HRCjl0(H9fU9lc06AqDF=c#~(1<bk>o)+Fl<C55UJ>=8?k&RMK2M
zp9LYCfrIM#VVV3bP$YMh{M1j;UUyqX1fG5wfxRu1XvYY^!1MrHU`24*V?+UVCvl7+
z^O3h=9*bMWi3w+n>6lDJ`>sB{0LIcLjZHoe*WCfqUlL&Bgp7QBpiysyr<!B!#cmh<
z87Fz#TiGt>VNS56mTB=f6Fe9=xn9mF&&HR6FoZ;LYCYLH+$kCO$+Qm378wE<*q5D8
z0*5H~2v6+r0fG=Dw`^>tVANrbRpN?5kW(y(=n}f?H0;Am66J5>SEpWHoKhTG(87H#
znyVW<6Rk)O{$5t(ztY58NG=8G&f9@#0hm7f=nVs76q?>GG~y!`mh6ISR0>aB+i+F;
z*Ix-cu?>vh-NalP=i^UE$S+e#zm3eGxE9+Y>`z03P2zGybg^Zw$@y<jn-+W#NntGv
zpr=*4hw7Vpk!LP9V!n&X2k<SI-^e4#I%>u`fke<>U1dC!TGYKXtZ)~B1Ju6~ilaL<
z=KDRQe}9~rKe!taa`7!iA#YVaxkYg7%G#01eIB<{GDG=n#H^lzH$V|hb>7mBB;k2d
zxLC#h=)Zxq@KkHQWl4FAm+qt_llOC2)n7gho(}KdTgO}qxEq`;CFGRv`m=#8N`hId
z6XILS=|3td(zSksGY%dZd#tvwCtNNEj`69aZjZ|{P|SF^*Pzs8$)A;S*A|yZ%KRIU
zESjXgk<Ao-G$NEzn#)uoqc^Bwhq)^0(ev4KUKJAWhBFE&rQ%RcAV>I9e#e+_ISa|p
zrydkurE^$O=Y%f<&PaZvt~rr8f;YfoysadQxcZVh5-*(*`W&&7Q+D+-6`qrqqF-lT
zdKbiEg>N#TX4SR&T2#h0yx)&ARM35|I?)(22MkSz|FJsC-jZoya>`>V)x9QLBVFxO
z7djgUQjY-;a2!F0LhoKL-ujhsIX_zoc&pLkA;;_T+Z?@+ULcv%|H334;gxRO{uSKH
z{c;d5942qj*BiC+Z45}SD-s|sXa?TG@Z@tmasCl*n6?gBMu5OGanU=>FM<mow1PzE
zdQLmd)=N<a`ak~$Eu&g;wFJZVUe(_h%zC(Pay^60R;?nxsq2(gDldsXvP;e&5C}jH
zQwWTc7DJ0dgyxsZ{IMv5-OsFG0%ZsC$X;+T2*Q~!n5UB0*7Yv`h%Mzuc`V11foCFy
z;llEUYInbizTRGY^UI%7m$gpYAbT9vE{o=8X{oXipbdTNnwwQ^_%X3h{EglO1DdYj
zhF`T6M(Vzi1YZ4~r2EgLF8%F#2|)o$fDo5&Pt=Xy-fwX*fC?=W_Siek9z7X~zz9FZ
zrc#D#K*&m^AXZgJm;}^q4jk(~RA9xX$|s6e^kGjFOK9K=j$}{(;GiP+66AKI8H#Jz
z_h5hZzcSH3nPpeEXVPjhf!ru=L$_Hqu`P(WCE>DiA0-sTX@7<|uLPX}rA(X$45`J=
zO-Zf}{`5D{0Q^O6={8@+@OE{%S3*%LzZU8r-A^r!*RscnPEngSJQu%gwhaCQjb$C&
zt9fS=Kg*^h{mJ?+JYmIiigDdq4a{%aIr=k;G>(xSj!oCP`REF;`#VsIk?j(EoLiN#
zFdufV7B$4{ZKZv5pIR|F3KSZ-X44H_fA}8=YJMg^P;&j33N{`zvt~BvfE^9?2<>oT
z?FRq;K2EamZv`*EE*Go`yPZ`%d&Z%1!N7Uy@Bkg(@gL}w!oR@#txuFt+06&)Nd;c=
zT#wWuR3qbOWs|2yX{`D(e1{hb<0F2#hGmo29{}4mcfb}H97<LXVu_hi8IpYd-uCX%
zvo`1{*7zpjg>&g^Az@;b5_ZaLH~CcmKTzv$<vYU@?z{)cqmZYc)LL>ZH;G*9Z*6y@
ziJc?uBA8Yl`%1#T<%OZoGq9_|`zk%5Ddtey0Bqlbz_%|$S^fsT_**e~+}+YQHFugk
zV3uwsS9nwKLx+;v%mh#RDJFD^w|03wu_Vj`a2rPcdF;cH$X9i$TJt&lM&EvH&uC8_
zMgzLgjX;b>IEOKAddP=-ypgEISdClDV8RhbS6JF?#)YkZWAA#qVof_4m@#(UC_Yb?
zz4F24NZ!v2y!OPW1v+fwo_|YJxxYA_jEd!={*FgPrk0#J9tE8ur~OG=_n$qLsU+7#
z5K)KZuOYp2&&IA84QE^A*1f4t6Dv_zu7j-FG$@14ld2zZ_Bd7(zR)lniFO9sBG|yd
z(G=fMfdsP-?WMjd(KZ7|t9Ax$pNm(fGMr{geV_H-lKeiqrPt^(Z!XDqJ<VQ_&x+|e
zG$L>Z{bf{TTk(S4*R*y2@y#Db;t<X^@3lX7Pp2#k65B{=<$tf}A3exttWc67uXpOP
z%)nM;*J7vZkL=uKBr`pP47?18-@dAdt(*|t3+qOngxzeWZ+7iJ665_RjN`~^Yv#0h
zIzdwiEQIJbV@7He1!6HGagv)K0YNGk9`&c$G0f5C2&F&I5+iB1RlXiJ&js`w*7bA~
zGX$Ywxt8-@b&V|836xwKqP5L<;J)>e;HDJ+?`Xib3d@(gma%(mwlv%MAL!^tc~r2j
zu*^hB>@T)&mSP!rPcVqLCG2D(&N7VgnhF0_)d~KH^;F}G<~;9AVn*f&`X^Jc{Uq4!
zs*7CrZ}q4&d-_lF6gOX6@o5l-?rl~%{7-W~i|Kjde;{Z5aqo7cqxW;1uaxxXi}7pe
z)jH|xy>Eo__6bp*pO8$j=j8(`;Wk^=l9MV2{=XKtHrKW0Cv9FCPUMI_^^ZK2eVD*G
z$^XtlJ-jwsD0E%x*-&6Wgr%{mT(o4)Nc_K%6bsL<{cf?Zq|L@NPADg%iyHsl0>>lk
z{AJiv-ij4pYknKLqtt)LciTe6CS63|e(6xwl{vKwC)?Q+CrqjOF-%V={Jc^iD&z*I
zQ+{EO7!4Lv*WUJ1_#`(nByhUkuZttPdhgiP@s>*GJORk04F3HplE)pW%H?N}1X)u<
z9z*q2^MxHLnScTdYyCv+gc3SvsTBi#i%=HMWQv>O1Z}Q!1z8yC*e_6o;dAfs1=fk>
z4aLkQkzQwH?vQO0ii5#VVU!Y!fe84*immXv7Zg~x{i(FkNql~LSfKU1`vs+pkxKd>
z3W#c2NQ`je?%(6pCMsn+byDKH45&-#LURhp(}GGvlSE}h60M5tOd;V;Z$l-N&xc!|
zXJ1H5F5QC2?j%IGLiTtA`i7OYn`F#zr}oxMGE{gI=NFnOlGQ_F!RgEm;&$1Q6-bU7
z;|4$+;sHTvN^?8X@!NU4BvrO(MpAzB>VUyc7bPgXAA=&hs%vGEQ7cjk;2Hdlw{FfA
zV$tqjrHN=)@Mr!@1cEJT83?M1ga0DD%vdhh6T2(*UZi;UdH3@10K|BT_I#Vh3oX5V
zw^#H@apW3NA!sO7<)%e_w{Y{CNer7xYJSFEC+Hv>icH7b4d9Z8-l>YisUK9Q{yzd1
z3z}2+Qb!4cLd0l^B8y{1E#Tx?CBJOyL=H1%lyHK=wvqaWH=p5x1;V*<ja5kvt9u2l
ziZQ~7=N%w^7Qs0gyg~s~cv9{K<kk}U+oo$0-&K{HQe#&3S(c6q)U~wIcp#X#?R#N&
zr$4%iIAU}=fT62IAG!zuzFfC?nT?FC2y}AxEAsB;R^4?dVLKT^&j1_s_Cb^PiW(V<
zH-sXlrGRJRnqz5tj%tls5{Qw6J2Ga2XC;7Ix`4<b6Cwf&Vv~|>$xWU1UK00i44>p_
zK6lN#z-CAxn090WM_#$(d#B{Vo$Sv6oEGMf8sK<B@<e{M6f1e38|R7a>bJC@mXK#k
z(7*9<f*ntoWZz+QIv$|bQ+1D>4)owgwseTb_pa#cHLS09Xl`%NB<!yQJxRId0-mae
z&BX(Id$7&V1`XI|H<JQ0aBtcFwJa^{?M`OWrXct7<z9XyDLNq%4RSmY65+%Ug)3{o
zYsUz3?t*Fb8IO!vb${p$b)!2T@JI76W(!Bq@nr6}B<5g1w1WZthQ!D%ST_AFVWLQF
zp-~Wa^kn2}BpyOYPA2XxMMY8*Hqrha+9U&mA#!qJT$9gob~bG_LG#s(E&rYavdXz@
zx?x(hb3BB=;<10DUwk<(Bd&=FOOg?}<K-^>^7{M9d{+?UQG8}HG`p+cng#{Ky85oX
zxGejQ$Na@N`?M#@CjUVDXHghQUVp_4t2ta3&y)dmPZ8De>w&XL%rau&6GKOg)d`U{
zkU`^3#WGm6o3e9IkaL4|(IK;<ae$={e{KC5lLH<JZs~`fx%6J4dj%8Zf1~ou`=<)+
z-JKNVLh9;~ErZ&fJ6)#g+@~zLp!?$B!?#Ni0#<l6NyRdT0tApDAj#cibXcaj^O6j$
zg9HpfPn04JPSaTXd=nGNM+4LX<Gmip;NS)$u{lSnl;CVsrzeX0=v=I}^X)>M_8fkY
z2Ri@2LMgkYYzw@we?pYST&W7@VL|a_T{LVO-u#Uyaz757^CRm$xPjFiyTin+O`1N=
zk?6d%5(yE;ZG_;+?4Xw7`l}}-Rk<Bq4eH<$-&DSZ<s<)svvyEdTgF+o50D1lj@`AW
ztyrDf?VppzTxIBK3o4io3M6F*4XfXO&`Rl=Q0IaP4{>nydlez5djH|Vv$V}~R$d^y
z^v(d<`PzjsKGrCy=w~%QugDXr01DyZ;?p-EezYg9-?E{)^4~2^$Rh9PP^p=kgO%u7
zZxm&eus!ruO2F&F)5W|12KGN8g{8=@mk93W-*Xc5zz8q>pC{2&y1AI(74{lUD<+%o
z#8jH3Y<Lau`TTwjDm&Prs;sBR5-4Z8#!Na__Fs92w@}bw{H9ljJKOpl88Rr)>+z5w
zr6FrZ2U^feYJ{xsYH~)P5tSf!=Z?oCF(f213cw?G7qb1Pr<l4(d4(QNCyqUDq0Oko
z<VQ~vLDU(CbG)N+@Ve;9%gD8Xiv3RX(HaJ%b#r&o?rlDT#k!6CV479naeT(5oOO67
zFe-@Qk^Za%)KE$kz!d`Im6&4Tf<Lj1sI_naZIR6=Hs2g-tj-=~q+m<>)Ql=LwLmm#
z2)NB*5u^ZA|4zy3z_i1mlo*l^n_-_-uBum8=X}L}Ih*&EEcy5+pG2>Mc-iKAT#F!7
z=p>Xqr~76x`}cA*^iKfVpSLG%+x?-COHEbEF0J<@lGn0ifC=o`hcE9j1Ev1MO|H1$
z7g%VoBBv^pDuA0&IO_nDfyed#QFI>uR6qU~zt_c$jI1Kph$}N$>0Yjxtc2_pvdOyk
z2p18$b|i6;y=NhW=w5{DV`t}HWM<3!{@%a;;6AwT_kF!y=bYz3e|~{j2)v=EupaO1
z#avNUo3Rp){>g&V73LU-F&kF2Nd?m45loQr@x>N4Y{G!WW0x-!!G8(tCx1=(TE!wU
z>`0G!Js6#HYuTDsKaWeGcMxsIzBeZ-$3D{d7mC2tOPiw07S{&_WMfrZHzFC|7E9UM
zkMgv~Uge4^@TWpQ^xY#u6v84{Oy~kegrqX*oAxW%Ba;gX-egf&G}5>4BjxpUfLBs^
z-EFZRQB5<?t$Y$>p=f%G@@0~WSQuyvxgNQ02uh}5px&MqypS|VDbM5uU+`nhjtDw=
z#WEP;OASN@iB9o&Av%dr?Q=WQDa9SS622A*$W~+P&wCHP@~Ts5JxhT`^ewl3+|>I5
z$}9|4QhHvYi^fLcF28-w8G#L9N7@@)ePrj7W!O&RM7xi+&91`&6J;cJ-pNz6EU`UW
z1l-SvYO`ez#Y0$$y)8TM{G2mg2-f+tS=%!wI<P6NM7OeGY&Sb$th}5FN9Z5Jxr|rh
zKejnGjs(CC%zYlCG*gC^4ItOX=?4ioUw}U_DmQ3swH058;1CE5B<h@n7*o2E+w~Ln
zdG2BOIW^eVP&tvB?oQ|NIX!$k21WVjU1jIfTwf>OJu?^R=-3|99<yiuqCO%ObRli7
zecxk+NwrYQ6LK#S1JoIhC5cLJMcTI{*bR0MzV_)AwWrPBg^nHNf6V2K&(`>&b_%I`
zi(~k&UvO`8a|}_{XN}~tb9Mroe+YF}5|;;hMlCYLJ@X%bNsilfJgxtp^np}<xNd|>
zX%3W~ys{{A6ktI1p}0eG3rj~MWsN301LhmDOw>&tb#lP5Fp=m(^4`-F>)9WxF(Uhz
z+XmjZ6qN24yIiaGD2`okmTCe_=AgpVBSF5RjHf*)+G|E#!z64S?-I@%dXWEMydO9E
zIFh2($Gf-@d&epQ7u96Fu(OJ1RG`!%SLs)P3f-N{t)dSC?|$%SN)c!$3{w7%)wHVh
zVMLU9mhP``+9wZXJi+2<%hzf<4R?gD-*SkX>DzkCtp3XpQVy<9U!RIJ$6KaT4DVq*
zhF1YmwVY_Huu-3Id^#CCJkpqh(FIzh(t!@KRR`H?$-INZx>KlzKr4nK`=fl*fHp1}
zB2(0_z0V(>!}YJB9M~XJ3A30-%yIwi59LWF4>f<2%ya8K*UI3RdVzx_Zb-1+r=<?l
z`z*WQqULJ@%UH~l$dM3Cx;4uMT~`)1Pp?W}?3&yq@X~wx_%ImCqi53;^DL5H&KnzW
zwzb&DnZL)#Km&L1K85HFAB74|X}Q9o>%K8&<GJ~sWbU=SOOcmP<XauGM@>9RB=5Xq
z0147ym+0y!lZrw{p6&>pzev#Z(0Ert<TVI%SZaR75E7alJ8N`slh^8n)67;25uF?n
zGQNL16hRX2wh(Ymu~!n}=W4C`>8k(T<M(UL8>bkI1c*4Og(O%vvFdmfGwTLoq~H!V
z@7Rd*o}t*Kz;b??)wl8g*_-i+NX@>&+j%1tz(~~O-I8rIM9<HRgH}-rL<^+_k>+qs
z4YM9!EJw^o&3>5<rbkAOVdM|~s)(yKn>K2#4DrP!Kn~VcjEV5InSy&Vdu&pgAK)4K
z##wB4sO5GUg3ESRJ|{hVyUnzd?m`PfDtJpNy<ttIA$?1%E;854{H_u4n`o%L>^P*l
z>TGFD+3V1&UEMu9jZ=`^JWV%t^u2fZ?1!*OVlIi}dy=wJ)^fGm&1UH#mifOF3ZEpx
zcWt41j}~VdwwBW#p3{H*y6t18G^qMb4mWomA!jG2Rhl$k7^snI8St=fr2&lKdGD5Z
z^iuZq;Cfn-yQ+^*cr=&d=LhpY+R;BzZ}~M?qh?)@-79_Y!y|>$st+EYJRWV!?ouZI
zbmDsFkQ7WRg(Mv^tW=h>IXo#(DRY-Ffgrl!Ji56;joHqhLu*_1rK!3&)m#+q+s1SJ
z*i?61KMOtnwA)4B7P2zMPPBe~U|?y{<lW=N?y<4(Y*@C8GAG1WS!y0DyZ-|&e)Cat
zsC4X1+rA|3LthCTeJ?eGu=A7s7VK84j}`<83iU64;3Ydpc**~m8DBV<k|RRSZAFlC
z4tIj8eo8xKZjH$&i=(57cOr@GJ1&$~X{&b^DWAQg?a4$?b;Qa$`06yhbGz{fP3z4>
zviYrVl%)4NCp?Va)Me5YQcl^JQ;z7f#~$DcC#$qAI8EvjDJ=29{$wgBPJRvG%kVGg
zPCfhe9cdIa<t&6*g5)^lI2^4Own|BB#@-mgt0mu|bSy&M=Mdzo7+C1$Ebh+KB$+tp
z28$12MfQ?PIm%WKo^*8dONyn{JbOZ+E^++;dqhI%^A&`$8T?l$!G6a_nW~WhNy<6A
z6qzi1@Xk~*tncwOYVd|xBkuJv1ZLC^OPQ@|xy}(5C*jS8K5)qKojXXzS3Dm&Udw#4
zqgtE!jGBhO)!liI(tZZR@471DlsNb-FM~a?;2jg;Sr;YRd?tBT+#^$IL9;S5Uf=#2
zfbLt|aO<t`R8tcDy2NVrswhQDU60ofesob@xXmbvS2vbC(Ol7kag%Cwo4`KDbCxQX
zAFoTW^QNA}^DYJaKh6Ja<4dBi2WoE?k2OFkt|EhPD*86jEs@ef$ad9XIDWe3_i0t~
zVAtDr5(({*Uv>NsH>YW<OTK%2zW?PF!R-UPgh*+W9C%o<Wf^lf^gZsVIxs(d(8<UX
z)~X;+J|U03X-(K_vLDI|-!59C#M&||vqJ=%Iffi(XXf<E!a5@5wTxlWt*1~y?%W}<
zUA-5c`?FGQVUwaQN#1fe%bZcj|HiKf*CjZ$mO^N;B7M?Aa0uR&9fp%U+|>1X78X{S
zv&I^QfIvnJTQ!Dwp_R9FOVQmwK=<Fr&dvLdeb&^3xNs2RXJe0q<U2tM!q?`c7+0qC
zDH<afkct^77s&%iWR4Lia%2s%SDI5JtEBLzv^5|4WmR5-H#~!hPqHnq*esc2W;@Tz
z&?Zl5*N|scUKLpQ9dmt`+wl)4Jq^$Kdv5BeJiMJTP>0>_6R-ytzw-V3REPX2Cr<?l
zuOY5RTrqH6e$(syA1L9AP5ole$Cj0mi+duA{~9!HR$3>1sYK1Cc$@sP3}yUV_s5_!
zkCA@;gyDQAzMEDPMBjVFC4cpq_<V6Q{K4M6zi&VHuYMc%mv620+F3=Wg~reI?F?%5
zI{|t9n9!3L8OO{CPj+UuHy<KL7{lK{*GIpZRGS)j>g<+28@3wUKp_hxlS3LSy{QLN
zB#Aobhk%3V*zy{uPNazt>h#UdjLg!~4ao_0b#>o`dcWs)=d|z3YG2R6m(7W6_YEAv
zcX)B4(_2-ZwoyVJtl|@E{5(P;oI7h{B_f~Ru+McAs8qnI|FbuZC(%ca1;H_rM}7Fv
zquN46SdcMpl0T6Bz=rm98H!~jn($5Xs7Ah9*6Hd@G?eANVU%QQR7g@VYOlMtu3dTw
zN&XtU<7$Qq63NdHZByt#KWF_Nmbm;Gm=NAv!J>YBO85=e5jJdcz@~)wZLSm84%HJ&
z6uuT|C-Hd{k=Q}Ug1C@Lljz?+Tx=x^g+O#T&S)ZvjPtc77SG(&cRFooXAEzLEat48
zPC4-VmN1F`F~P<@)UjRiR@uCapxs)E`9d*Jkh4vB#S>%n`Lmf)5Jb|Q8EV}^+<dMU
z;*g-$rKmh(mN=-caZsK3<T%9dKVI{9?g$XGZrE2_e;{k|{Au;;G;0F+9dF5!=5}gc
zR)~p5m5A)$wVfz*dg>t_aa{8aFAyIO_2p(yn&0?T0}vvvJ0?*Z=t`$zQ}oKJXB{+^
zO$-=8&cHBfQS0H!`$8faEy60luN#`IVkyiV!5Xn`kHV68a@~!dzSM%N|KcM{;uR2Q
zlU*^kr)kex<G!b8mWfsKW;~Q6z+i_wRuOW14oT$K1`p|^({v>XfL~xk=JxbD|G8@N
zZ+!+?5@e3_z(+KTl<xkbIfD3TI%LAEP)eOC8tV-v@E$3}Ja10;HU9GsSHPzfV9dWw
zZJo%h#@zSFIkA=FEbpqr?8fyf);S7r?mT$=|Lu;?Z0_+Ynx9^+vwy!*&hBvL^-oc}
z#np`$qF8<`F%$i=k**GA8**^8Ts0^2OvqWkJH+9t)5<t#=O&z4@?KtB5)Mdvxr;g2
zEjip*o$g1S99No9n8Rt@SOiXP5OA^8g>T+?v>12ywBo510L16=sa16Sdt@KTCrl4E
zUhV&qtT=KV(p+0>;}*C<{Vwo^Oej-e#eUFIbULsS9hdWVBsmFf&hF&duN!SGJl1*m
zMFSj;A)OkhvbDc{KkzLGz@|=!FImm9+Z;x`7X&>-5)CvWhO4fbP@7*fMR~#*(A#}g
zq?eq7&jX_>lszd9MsfW}Jz<HV{yAOrMwo(v8>WpOKPAx8hj8~R!N0Jse@}V2MLJq8
zWR$~4;(tdW0Q3G)dBGjH{X-!zoSS@XQw(~Z%ao#1p}fIp5FzKz437||8)fJUo4XV#
z`t^bE?jP5<!)^%O)#q2!6&}ul=)UV0{QLQ|WjAj;2h6T%!GJtsm}-?~EF0BBN5FMr
zR&z`wn|~_Zr}fcTcIzz>1n+ARK}*hmkUwrx$j6vd_cJ2C=PO7dH;s53>PAWX%UB5i
zd#`GbWIh*NhSk|j6kT{mF62AsJr)YE*#D;)oP%k_DRQ`5d3~=!jUL__q6jWFf5*V4
z?i2O~a!_8Bio0{0zQa6L!)C+Pgr+7u_}WZM7f{m1{CqF|1L)B}j%_4hB5FB3rWR3(
zlUUm=R%aMY80^+0=tSqO8N}V@8`a9_@8+Iw1;AKyH&X-=T!csejG~?i_0Umq7;l6Z
zon5g>7mD7rf??A_7^_Xv9{A5)J8$I&cEHQ0pvT9hj*_;v^o6zDor${eG!uTxKx^_5
zVZ_k<B8i=%g~a6(#635jqWLqu4bIs1_iqBI8g7an<`bV|=6ZuT=BhNl5v(!j(*+A<
z*$CT6>~pV5W9DQRVXUo|a(0|9@J&4lWwZd*ePX%eH0MjOMwC|lqee`9o4ew^%HWv+
zd4?>}aZ|fGW}Gkz8`T{uHi6a_Ms^ISmEK+mZy0e^_oG7WvJVDT%qe0ZXh6tLsDjh|
zHp{{3f@uM$+V~5#A2+B@!=&6E-xc%%&YNu!M;q*E#t3Ms6&-2A)%?GBEKW-6La7==
ztzrL}73TvO`8Eys#M}nS^)F7ILS2(-wGX<1#7IKI^Qv?9#t^LUnH`3^$~>SI0!<$S
z1zeyt9n$QS9U)Vw|74A2O9hc64kFq0?aD1NUm{tF7W5Q5YbG1i#X}xnM0V3Y<fc&?
z8;xNa2)M5@28D$(8NPt*b7*aMcd>$L+V5z8%Kb%H(^E4e8K}&KkTFuBh7aGQEX#tJ
zwFrPdwOQUiSnfoLVYpQw1Da25cMjgr#3O$gdZ!8*TSX~TG6a=Zr>z+0)Tr;Qm4uy-
z8$1<KR|b(u>_Ab;s6d<A&J(XKTwbE@d&W*lO$OF|^pL-ZqRo9z8dRQF$Z+Pv^NSn7
zJ$}U65Rm47YP_`^up?BS1vC4nc&#N;C-Oo#`&BZ3u(oQNcU9OKZo)@P_1gs1cc7v%
z0raz(rST?xY8xmOgIuk$3hvcdsoy-nO)E4;8^j(k?1Ko850UFn?udLd$e>dXZ#m4T
z6sOEDeQ~sI!v8K#Yl#^lnCF@C*hIi2^~zdm8yB>#sZPr1>RaN@Jv-N@d@HiUEHNJ$
zrAay}pL7==CkzBSpws_I8e>c!aqtQwtU~VBC}yD5q?8u!7@-N2kpNvd4>!de{H#En
z!7K^G{o$m-$H|1f&)6$ha|t)$Mq_ec_S$Twdn5P7TJpi@M--oJg#<-z&nSi|TDx0)
zMCDYAgM3u^<lBRpa92i%7i1*6V!tKbU9`)lJ%}}F6fZHoU|RYD=Rz^=pqe9j`ZdpU
zE;|+tZ%MlUj3}6_T}Aovk?iuUhGFV>0Gog5wTcx}k(RYcVhE^~?Q3n8(bX=tkvqB>
za#+N->~uqTc<kUISBFSdTQPR%1_wN42&e9wU6&e+7K67b4tK5LfY#2s%G(+2RA0&d
z>)7#Fm$g%?di|E!i<S}sNIEQAhBM<)y~5MrPC$xGvVlZ66M@F?@8)|`KNh%l6O$(2
zZ*%j0izN;k!{Rd48SnfL<j9)m_O!T#J2taR=Y$7s9LUpCIzI95a57ucm)oqas}B#}
zj6AAcT|55tKTve;|3G#T(Iazz78`4lYhFE>_%B<aO~@~dm93Bd_+!k=c<K=M=5DUr
zow<24URMm9mz@!=xz`PLV-w3PE|f<9{y)u!O4@Ah2Xo#B_&4X!_=iahQ`pde8j;o*
zgnw(lA*ZgK_1ekF-r8~LWu}tjJtqIW8Bu~Y=WdbM^&*SUb1(gcV5#(<ZndQ3sbRCP
z0+n9s{gbmicHc#r;<ztUE`%$C77YZ_7N74?d`T^;w7poTnGckJ@`#Edk7|Dtj9d4V
z5<Uk5Lj;rc^Nm~03=VDW?HOx0)sXjTs^-b94@O)SnPdODR|E+L=+dkyv|dyWR%Q>a
zQ+gA5kgr4t>+iRv0a5BZpxLH}PfYs!3$@vsn2I^niWbYhA6Y0T#*o-;?i`;uUdZ)m
zu<Oip<<p;RTxHPI$^H;3{ox0AL)y;ZT)mTfnx4<oQ1SOmPn;ajMOWUYfjI=HZ_tN!
z#(ZOZc^luu)g~g&S`P*4D6fKR<@^O72FvGEx4zO{8@$aEY2T`-Q(y1@qR(*r0E@Oh
z_|5aWIiw=4I^Q0XKQMq!1*&u`BS$+`!r8-zW-?}aSZ3O!Woc;oIS`7umz9U<zlmG5
zcAt261#RBFBT^pVN}5XFxKGMhD&4)}y!tsa*(g<r-^c%(eN7Wp3gt&0{dsvf`}@{b
zXzBWhhA-N=%?IcmzA(e(#r+6>^GfL-N9j7<m*f9R(3!@%Eo8cLS|C!c{Lk6h-c4X%
z&DrZ|3#D@zjBfAwVO>0z%<i9mq;8wW`Pe)URxb~BC-6aYvzP8a?%d6-`_!+*qDEPh
zgiOPItQe%%`>xDu19v-LSO2I>C54B09`}<Ej%tnnLn%=;yqQf)+%H(qn>sapCCuer
zI=v)gLm6!Hp9-_Rmq6c65JE8fu;XD*UH7%c_gy69n!?k7Ou4Y$(W@hK*2o?|j<dj;
zY=U+Vl_NWmgQ$DdkeE2mpgX0kxn^Q3%XU461H`bH=<oW;@~co1AI&ht2mN=1_K#h?
z<W3--8U&2>o5p=rXzzV#$1GcW4AiYDL6iLE4O_aD2T|Tzf${W@=)3U?u9qQ0us*%=
zXWM_Rf3e=-|4DiQN&>=F3*~d>gU@F`5=M!=+;SvVpQG#iWH0tte0Ag7Pa7XotB3`b
zHtSMrUcCIx_|~T0=JhKtXN8hdN3T_ifZ;v~&>FkaTK46KD`F(+nfG;OTBh}>GZX5<
z-<&VA_SLnHV8F?G>W8C<)`x*K=e_m4&MTS-N1;4}-7O!rfphck9*;JR#HAGEj%y%G
zYXqf#LTg*lGQJDgo@{ZM%QMN8f6l#%P6Z_cU}Ud>;-5&O**tRXi|E<%)HjZGQ`IMW
zys#W0(Hs^+$Y~y6KWS7?uhI6H8Re5OML+86Ly^V<YLK?uRa{BtFRK1>F{VX0cm6~2
z{~j8=`3-hik7B9{vN1_Bj`gtYdB!;}mK3uf_yWz&r3t>QJegVw+%`T(gpZ!x4tld>
zij}#~qHHAn<AqPB%Uga#CWVO+e~TmA1@R&Pc>4VR8U9G^=V(eEni*nJHV)n#fsrm&
zJMW^r&Oxut|H&`&{Cld%ytpYxKVOva;_H}W=7MebE}v!};&@o0oWN$m!~B)e%Rs&|
z?@vO7DFOsL$c|TQi|bm?$<w~#SG*R{?HRFDkk|NN`&;6<^7>>RGfIh~%HU@(d;J8n
zOqYQ8r{^`w0MZ~eEj0V`<PuP-ms<V@s^i(dJ^A%!!7{S_dhHyZX7rU?r6c!+PkC@_
z^~Y&1$`eR&fB}9i^L^uiobd7;@h{GsZKs>xv6l?gu1{XuWcm1x<rCbhi#M`0;${B$
zdofyDF8-QRZ}{Qw%r|tsoGkT~`I<sfh%t%tK2j_cFfDD?G<sjJf5_XlqjWZL!wJ2A
za$L+T!D(8H7(#i`v_|43yd?oFtJ)W8`6IZmac{ye)1&q5wtjv1=IQbW-nd;wd)zl5
zrQ42ytO_H!=NZR35dAQFTL?ShTSV`u@T>Zn-Zc<+o<&@IAXx<PVm<?Mo^@Vg9$nB%
z?&Sh(aDvTCX9PdWzPtc6$uG!z13flV>dHjT&e)L@;yb&5Vf{YJcyDj4_MigZ{9(nL
zHEfHv4IcNJQNr^|EGc^0h_1>sz=uYG8u<gH%0&(D@%RG`R|q*NsgS&bAtJgjMaT}B
zKfOU+Bv2@Lp-_r1rH0xEWQXVnk_n(sfmN{%yv&M)XJd|xiN90Gj2{ILwoNXQAN12P
zA`geuv^_y(f_nrm5YQQD9gyAz;o$BBy4%(;9`cL4Ok?@LL_e0MFbIiG{_D3k8mnn4
zCU<rONah7ms8476JtZO!W4yU6`D>usbpr8Od`UngRVm{sU#cL&7%zJn3XJS}AzPw+
z)NtP}(y2i&x2pMd2`Hx?$bK}nkKY%)MWqN8*Li|nEB^!3TMwl4Hc)K@vS2`@YNP}E
z;L8+*jZV1YgtXU!ilgFutQ=bBUgrI~Q%fuL$uEHa*|jV<g}0urB(O;qXPZSbN&e){
zhn$Vaj6>=UNl8tUMt=7`H)5ctmqHY^?-8%=Ub78`gOnJQv~S)h&0(HfYu?nG73TSh
z*aE`<Z<Soe3#$x~APy+N?XtL=LYF&#oFtu$|D^L}n+%xc7(H``bd0%@hPs$Angk2y
z^p}mV2H1fHgv1wEF4D@$*|`D5N)-NA-_M)na635fUE?IyX1!w5v`4oqs6cB|*vp99
zAUcy?t_yq0lu-S;GP{x1*(t`k;|n3<g^SBc_v7`Ph_kYmc-G(^^s{Ndwb`izG4T0G
zit|qM!YpC(Q)^3#4xJfT4ythO1KqE@F<esy;*xCgzgT}Q+;U(}fPu%?xZX@+ga``1
z#7;D&aXul8ZUBy$2+0rxm>)F=Ud-EeU?iGF{?+!pmL9V0<Vj7fPzPO8rqAelK8j&L
zDAa`*S}*g?l0ease?Ua|B^9zLqwid`hO<Q7TQP(7bpJ)%a1i@aI0c4BtQ$cmy*`y^
zs3S56&{AU=WU=AzsyUL;DYk1h(uc>(S&8!Ef4aKenHO3&r#6+Dn}YPKikw@CHl@Hp
zA(MLA(%Z3Xb5^NZD7R4m8t>8)PF<n1cMPJvb6ZP_L5r*YDny^6dgA-VuRd6qFu(eT
zi+)aM36(lYP!i{xT>FnUc>f)YF$?^Y`w)~!moOVE8%;dDYHHwPZ(z+tIWQ&fmN`i7
z2x!d|awhvkoc+3+>e(pm0d@Hu*6|di*E}TFRo+KQ-dDQql|iS?7gxs9>!S$|AciEF
zTZ(HTNMd@WTy-K;=PJB?`9cVN=@ETQn&xez>!~RS{?A614>Vwz+i4LQ=Kjp;4<(jh
z+?~a$U-l`b+fp7fwj&^1fXcjV4|8kn)(_qs8woYKhvrl_iWSTqTrAc08>#9x`+{Is
zEF$OiOy>MHkcbO}?crU(dCro*myL)BXD{8O+k-&ZR{l(oA9aE#-Aa2r4bqo?SUa|m
zA1kYI&2;BHWZ#9NEA6+jQ4A8^C`p7zsOW34B#vTyj6~LwGz?9wmp3v0-2k|9ywL=U
zT2$HxCPg2b{%)?YOR8HGJhDd3Ddiko(mKvLby8*gv^`3B`{j0w2jWYmQPLv}StlnY
zYH8)JH4bo=^wf(tBl=Xq^W1(j)LZG;Lmum2Y<$#&tc~FAKKEUv`=do^LbI3VYw~#|
zf3vV;^a!0@{DPNIitf%zE8-ZmOYH(KS!RTn{JJiI*Ceh!eZ-sefL8+UF`uHz-Ex(|
z>eJr9_I6c_B2OCl+}Jb!QfaHDk9ABEnm`4q4v>hF0h@Dcnyu7Xa#AGD`)CPH6`Lip
z+o^~&+`QAxZa-T~T1a=G<Tkc+;?RRRx8mK@WzlAlDNiK8xBfCq06p^HXO8XJOIdwp
z!|Kxgyy#&h@SAK=u7yUUu#KMj4A&XG{s($)eZWg={I*0BoaB2{625U$qUZd(B~%ca
zPh=AviZuMmbhTq8b;pz!mMIA1(VckE6e#+|&W>F^06-=G8y1nx93g)7M{Y-%!hr><
zr{j5O%*}2V&z*pZ{e|e{T0=v>EEYaWn+Nln0>(ykJ|W>blkNvYXpUZ2R@)p{;vf`?
zkw9Fy{#6)|(~wlRTihQ6K)i-O9&>(Ku6UIEeiaYU-YPuLz`-8&j+X;*yNrX?n^Or1
z{3xN3ih3&bEgUAtxwKkEW{=kdD<Q6{VGS+TZPsJH%>2a(R(9oR73_rUbrn@nV^t>U
zYYP9`UkC6)XX6H$83R!epElpI@#yW*vZ};86sCTCME=Fi?8n$%8pe0F*C-FI+p{Yp
zi-o^3ZBc3GeTYPG_bk-=UpH!b<Mx4CuFA@j`@`nZ54ZPmBHy)J@aznlU4Q>gm>N5}
za$VC`v{AWe{q#f`^;f?ki33$OQUHxfhNdT(CtH&bjLB&)J4MJIGx20?y+EB~7%WQE
zZh6!){+b<|=G<WKQnE_&_ePWZcjXfm=fAzUH3Nnu_D>x?z_9NZSCxwyWN>Rex&hy1
zTu)CZX-@qS_|d0|5AJmuyUM>iOtWqwHIu~#*neIA(7n!yk|UK1UhJ8t>fCcLnu``V
zj%o+!t6XQal-LhfztHz{(R|w`19;sh;1Omyx)hN^#!%Qo2w+iDvy-S`REIl*0=QmE
zU09h*x&P$gvImFzn30kYfNfVLAy41eHJ}pJUc`^lq>P?b_zK=s5&pC}_lPSm&FDzX
z61kv<BGX+NiLHDF@u_$*TNH(+@O<<#!~wG61C_~_czJa;{ys`S;>t`pjX<hS+B=13
zMlcVnG_$qY&KiX>&M<YL1aD_R%Z7g~zHt%8t*0-){ON03OxpF2PiLRd?Io>6>D7j0
z|Au(d{umtQH{w{wuEEa^E8pK_WNXtj<Lk}i^EQtI20yL**whd1jaE7*YNsxHD|3wP
zhWzP^IeRn3jTt%jmLy~LIV3UHV)oK=z&Ti4a9K5MVSW3h_iagvO6^fdVgn93hRyzL
zFVOz%)MWo^6_Fs*!uyWnd#w)lukCdeS&?DVR>=#o9)X0C`JNmQ#lBuGn|j~+`?N=3
zTJAZmj;P;xg7;c3cM3tyAmg=(d#JzCKk52oj0LZ!NRD;7x!*W#o)#<T$q@B$?1q=m
z0_UQfC4B=6?5~KB{l(#We9YU&bndD#)*s{75Co9FO#R3ArU?ReSf52%Y9Mh8>3mS=
z>Xb$KB<5L^u6ocM`fwX~?FD`|!v9*tsA)^bu=8UO9Q<%x6C~N7*GZJ}sl3-;PbOza
zcUkauH;Gq2JE?#*!u^fyKK{pSx40&fE5w;+vhh=bOsi{YlJYF=z;N)r$o1%?=^?pE
zVe)~A-C!+8_mY^3y2jAl!R+aQ3jAc>YO$9WTc>UU<H^kk*_X>ia!)H}#J(?9PT-mE
zhHE!e<TQS*gGCO@Mb2)TRFl$nCXuOtsmYP<4Ff-A)HN~|7oC(LQ}=_aJz(+<S95dL
zKf}mAI;}rYo2zeBcTN)*S$)_A5-oSIEGg2_2Yx&@Dt}ci=K2<l$8Mxn-e3S-aTguJ
zeAg4O8Z1}Ga}t!F_@XiYJc{FyJHF{7Mz^DsXDVhz6)9hkt!m7}>PNyfiX}AfG+6e{
zxM<pHKJW5?if9pZ&LXrwKEj>eUJhEG&fKZzmo#B!*40(aCuM)-UY+Ubk8E%FXhba^
z8w^J;Dm<2@DQUj$rc4#b`7TDEk*+tjn>02VNuO}MDjG*_1!?X)X_VcnB$N140OF#k
zsup+u?I$J%G*q)Z4+YQX<$ZL+Gv4?IHMl2!cx@}LN|)@T8yY43&tQFwGs7iQM*kNR
zHDw(H=^n1|6x_0Imwl*+n;m>9*_PV4-za&&XvN?S)y**^w@e6Rs}|a&DLdiON$6zX
ztH-hnN7tM5L5{w$sV7VrZzvM%JHGsuriR=m@G&^RD}@5WEC=(wRD4Ho7CS23j?a<Y
z9~U<x(<OCUztncQ8$^~Ez=Ut(r3QU8pml4g@VmvGYS;R<+O%d0sEypMm(Wv!DBMdC
z`HX8*^#hDMBl4ug>26@^WTiP4ACm4E{2S~3`;jEO6D<-7-wn5M%brBso>4*Xdr}$G
zbU~5*3VPNZFFz*8+rryhfB`WBgbzX<3XY^O>g`Pim|F-YJiG=}X%)aA-S#-fZ!XjW
zwH(<Kt0{ySy?bh}7!XSiu=6~NN=`j7?<%(*sJ*PWggp5SylK&lu5L<BjK)zf$(Hk!
zD~QSprl~#gOHCTl<tL~H3)TX1@x<psjZ&?^hgq;zm$$N{7Pg-O1P~CQ%F}1OEp;0G
zQ$8U5C$o>PdIU>$jg7%qsYl=#(^t>(Q!Q6c5BSp%U?V@g)<t5oq?$uR;<Hhv9!Z5@
zs>rkBO=XrvX&r_MMKyj<Jt#dX$ZGQGkD(m2h|~=y_UnnimiBuO`D+h`o@a>#Fb#>8
zAKVouWqd#6K&~&MZvTuo38vJyy(0p7sM2ymnKa+{Z-nCK3MzgDDH2WJ#^Ii<(gn$(
z^R?h{GsCeL*{<v(_1gk=3%xfZr*|dI`}qC`(!@P#vG0#k$Ls1&Sb66IXm(siX<0v4
zl_We8)crKyCx98uwLeYt8hslHU%iPbId%*@2)IA^<i4_A3Gys;-AcBW^zym5eJSNV
z>5BKs3T$x-NZ?&F`c-P=AmGQls85KlQ}kTwKmVHhS4^U!)%M#gR*FNv=Yv4F!t_6k
zZ1=ul0!_v`2A_B@eUh%t0z+2qSRkb}!rKq}S~3@&$Caq+J1YU|{`#=OM#raax@&YF
zGjy5I`>-$)5iZQmC2f)xRMhI|Syk{WU`0D8gEI7BvK;)si7SE@(b{tI1NLxOuULIr
zka2A6fy7J#n_S*#>o6MT#|3OIA-hPP7>$)o`^?QD`TIHHte`B)!=;e%9Pm{7v;h=!
z(GxkDWhU?WhX#>P?NDjY!8N1}+Q?tc7{^N{(MyQM#L|#S+)beOhCiI?-b;V|)EhIO
zwIl=)L~e;*>~$_RMl^>JwrkIgfBq&ypUdE`@2Z{L=6TcW>}MJ%5cPb4lp4=L!S6ra
z9=0rcmH^xy*01Jf^tSTO?=HMT?G6{Sbta)AShMdYday=%-rHuUYH#QDsYtDV?1{6#
z7eV=rWz-?vA#tU!UXU^}bsFOvou_iK**he8D}3k`@gbMV)v{bIor~cd)XWNAX6(x=
zph|`T38aamTd&(6R%qB7WlhW3Mrro<!$2Wqmaz_BZpg@uMfP8}PI@@(B<2DMhF3wg
zpPIOCD#%W;M7^#PZHfv*>_EBXrgE<xAxNC>Jo2Z8TACZ0zN8enJ=C1m?@4S6&)E$g
z3hj(OEN!=Gm@jdhjlV^|FRRDTPE<IbeE3G@muIoCZ(;?ip^=UboO7_5<5yb?=*$fB
z+S(0jpvSNuV{lt)*bOB9sh?ruP~lBK9(oib^`Bf1*~81<9JV30YaAO4p?2R!cc)@?
zV#EV*%Els4cCusK=HGvIt-$jBC-$294|xWuKDlUYn%v6c(AA7m%OAJJ_t{JlVm_gC
zNx0m~FS*hcH}1R2DYwR$%hq+-wJb68vW(Tdtc)7HW^5nlNu-SI<6oaFe`NRP(W9tb
z{jlXAl=GSIbHxu%o6TDn%mC^is)Si>mc8%#Whs0^Df2;>vx546f5)axZ75CojKT4S
z_)$jCu3m?eYu%i3wRGWo_xBu7lyeerCvE!dB;F}fh7UR!2A8DJHO3o$@HPX?_qIn0
zdKMdEV%QutsUnBgKAtzV7Bwp3;uJ!j5_0H^wnG37+@|xIzDOjx*|i(FA?i>iQ=|AF
zOr2Q`ftc3V4b7fP_{HgBKJtE;nvr{vY%Fiw`qi!hW*=)~D{9C7TFNm4dZK*Z1)S}3
zrM;g0H#>0S(G5Z9n%eqvfhtK}k^b{8Il!K=Zk{>-&@t{V>kamFuH@lAtNm2$E8rpy
zO8&b|HPFn{;ZsoxNeRHH>*=gDTeRLVFY11=f8SQ(DW7GJ`;~=QT8=}^@I%}1s8TgE
zE!^`+6~R)&!z&|JrGEeA8*OjxSB9lGbP;EJCci%~va7_Nwvv65_exdxZ%{@A@;Y-R
z+lk~IV>?|XA9GLGWJz6=3eHa3WkX*4XGi5=MLxixr|Qney*PCXGB8$4wII4P6Ymb!
z=LJ8%Nd==q{I5RWYkydGwfEl59~_KOylQfxE(-VrH#^Q98mM}M%fVeW-OFw}?MA{t
ztzAUJS-}U?9;*j}iDVy%DjNR0p1kk1obM#0@Wny188GxhwHeK}`RaXUkK~vBo+^Zm
zhzzs9cfHJ%Cf7$!6i<l<6*sr4qFrefH{~KTktb}PS~uq-0(?S!BQKF>6N33HdNN5k
zqc@%!a3AS)T$4H%OX4qu2%Z`@_>BJGP#PmK=Xa3ew9HBCOr;pY7RfFMPtLEP*dHQG
z&3*|B?kDr$KceM4;2u9yyHFT~i2kyPlFSH2$5Rb>`eI$#P|@l^2nND68v=rU25B~+
z0zvAfJfWpZxmGL^WR?~>*uhoE7-X<UnOAl$#}9OV@_;ALd&9d0nkG3lg8>Zq3sN>@
zuXaupV`;T+s(M{&+9s9-@8hPVV4P7zN5gBMCOsv%zpnf8jfq2|h7KkavVeh0G*Y?@
z|KO!E2*!t8Wn6z3G5?p>IUUzITs89zFXfD6??M1hqli3rtSz`_r+bZ;y9q2Zt8VG~
z0`Gk*ErMY})zLXiJqzTJK6X$vQ1o4sNO>_wf&-`hvx=X6904opD;$bZ7$!BL_)LCy
z?p$`}lf*6KbH;R~T#Y&!14U&R`C^**@35fIj6BaRdyw~P1d`GI1N66BNqR4*d8(N;
zjyG=m`Rt<`DnuY}&OP3n0e`U?+if3>gVtKS8pAV~dP4+D{{`mLd>mLP=FIWF_9qPe
z?0M!5fcl|NfS2vag{x*);h(_^!q;s(*c}3uMyv4aE13bbT1(=9;QLjDBbh-<OaiK_
z)O&8!fUmrkB@Ek_PSY5>aN`hsac~E6FX<QJgiY?DDA;~wDU+xV^d(lLMM_e>&`t|s
z$@^KXJG@sYOF;&KVV4mid{}L~J%$mO(<XE8IIyGJRt6G#ia`pF*fg+V5@=Ju&ikQg
zlynYw<Ud&bSNeoDO<rdVm`qY|?UHtX+NK`<tU3L!7G^o^RQ}X>cv%Vm$w^7n16s$6
zPM@R2nF)M!+hJ!+i=LW0H+KAJcSzNtAbA$v)YUY^eUlAd$II1zaD>t~!`A33!&9e}
zEUG!5wgkIDn21PHB+>ocxHY$j{)ft$gFfZ6s)jxY_bGoq|Ki1RNmf%@R?;=->N5iO
zkp&Hh&7fGIA1$M2dv^V5rMelW8dns^GmL?QdoWOTJd~?~!{J>YoP%<2s&qwj)am(3
zV`OsqA)9%LCoJk3fcz^(=F<yBBk5wip@w7CVl`UAw;MsAlm4<LjyHZezCf4R-;45_
zT5vj+6{|f!5*-|+jN_}<XP{X+x)8~hm#Qa&w}%ita9eM7aGGTvKJ}ARGH9>=2)JYG
zQ->x?scz@KK|nf;-@Bs9junmpYDY7l1n_Y%O1I-aI5=53w*n-Wd^*wc<u94S5>FaQ
zyQ@v#Mzyz<OYb$oxEVx6jsPDCoIw{s=?7TPO<q$oiUx!M_(O=iUYU)quVJ70q7(^1
z26ypT85Sh)RrP)e4PkbLb6ZM)oLhFDf{c<}axJ8wzRl|kNj@CZ=x(n1&4g0PEK%*U
zhdl2gC3>TuSe|m6e)shKN2)ztSLPJy6qV5~RFDRWz1eac16$0#*PXuMk4&gvl}kyO
zi%h+Admwd+chV8!We8S^Tz}k^W@ZMXqLWL{At~uimIjij!cW*w$~cUWYpa4g$zSEk
z<8cjCa0<&$d#ATS!~=027v54O357Q$q2UjtML3$}8F$VO3@@{TX~I56iIXB17atfJ
zj>|C8yQBxb?`{4f=O5GL^yKaA>FCUY06~D9nqd^0CIlYQ#hYNA!9IE<3s;EttHulE
zoIE|Z3%$!SrKP3Le|M(<i1<QGK~R!coW)U#q-@5LOUz13iZkC+^+#O!WZQSa*RHlB
zkUXEE7hJc_9WG2lt8X3qj2tq?&KOm$ST0arO--tD)10gQ$^1jOeETYCFl6eUmBXDj
zWCcmMCm<q-`{5q3r#8l#!;AewZ^|#3eqFzIsO)86ow=nD7dE}&{t|t-VEAa>F8btx
zrSdqUwPiG%XMR(O<+IBz+HWi|FUH!3y{pUS->HI8O~OKFQ>T}&?EYQuogcs36W)76
z(7XBaN@P4M_r2WwR<oj+f|>}q=*iW9NV403s29DS|7%+F`iV}$gO!P)`E6EjqD1;X
zz6e#NFSjmW)#n~pBk4asT~Njneyb;J{3r1ryW8#dip9loasKCd$KQpfBZ8)u)_U*9
zE8Ps2`In%_@yd9Qx_SAYuKvv@m!A7CXJfhE4}O@BN&>tsMl+_bJqI#f4zQq*qrZgW
zfDq>x)H*7+eJT8a9U6%8VGKENTNYHXM63xvSx#L!R)o3wIO@ydP8AdsHp|9P!qSW4
zY#(HkOLd_<li%V;+QEU|>rBngl(x%KD#MJ(O`FF-p~qq0#+f;z-2<3!QTfpDD}?&}
zHCO*g#oc$xsrE1Ee!!2$fWN=7xQ@m=?Gqy8g6-j0{<)~*K)#af6IcMDvpPKT)x*p8
zzgyzq`mAUnuX*|kA8<FMy!IQ4>Risu;?#Yz{uYU51slurqb=FGC?v$xNMa}(pS}_9
z^9psD@$_iW=i}qV-jB_7aBz}(NaWdp4d4!-?{u6E)nppH(Ki70GhQ3_o$CCTaBkUU
z1NEpjk@1HMgZ85I44&|iMc3(hx@0He_sWc)1E^g=c1qxJt>1h;zT3}b^v7Q@bl0?7
zL3RL<{Hsfl-;PXoL_TM9J9F-dVDu=MC4b*eZfo-63U4KT4snjX5N36Nzw*1Dvqw-$
zuI&h=ew)u+krHEUf525(a2Ammpq?#P$Uyk;=ZZ1@#koeNegP5YzXc^(x0SePDKr$m
zn2VD0?g$Iptd3Ua+=uG50ng@aDLZNOYlplJvy(a47|J7#xZC{ffzcqBXpiaweY4uC
zE@*hCgIYs(V)EDeT1bI@KDt$zoxqbRGM|w#zIBr^!zici;3SO7Z_ivB^UVdZ!AiBX
zhs$_eHeE>{nF0N^4}#q!r|AhMj5Rmd$g~qY*%^YMJb4x)kti$%gq$u2Ce^qNSoEWG
za&9`)abhYr6KbB*!oKX^V3y+26Jvzb!p48Tl<xl!5SfER@cNT*<8`xh{2nIa0ZVn;
z+fi<37Qw-RURKmcTcVbrsYIsc-${zLw>r^3o_MiM4Ak?=_Utzw{ortNNMuy7;X)r)
z-b4QnB*q7#A|)}nMjFjt(`3TTz7dG^(R&4)dCkAGrfCrt2-R*49^fo;5`%P3go<`R
z9n-f_m40ab|G&PW;(lfDR14MrfgTPT`xK7hE;nKe3udj<Z8g7s@x|J6g_v4T`ZoW~
zZ5;*?yw=8!D)zhi-t_fd&*4Vr?G5RPOf%9<D02U@>K#MT7N|=_#GM7KTR$KvMF-5x
zV{!Hr-73?pw)X$RGmbkZb7`7sgej?^^dt5&t()^wGrXYLlSmY^@A{CVhy#Luk8}CW
zmig~(mnT&7SZ0oE@+Q2}EjdRgKpkhNR5+0N>Au%gZ6{pQWXaD>v&yzqw|4m8(!nj9
zEor5>L1Wc7iWS57>S#OrAk60X-0hg0FKIAoET!>m3KW&FQXczO0>>r&uj5}xgqPQ}
zsAa^BSD?Mvwo(gAJFTX8t{V5d#v2V5Prpf(rtX)$*bqG?9=`&tGbtAeC65?mBisR)
z_lCve4c?^Z5#QZBtBb;8iW=V)rJlcbKCW#?`JOAf%8l0HreSwXK<EQzDLpRD+TjRn
z-mYFP&A(rQ_q<xac~lHk_jv2o9YXmhTPH-`{SOp7$cF6s?R?0z3q78>Oz(74kiDm|
z6qqE#<>t!AoU0&ylk;D6K-#2gL&34AjX|FvKY!i``10k&fubPr=a75lv1G$6Tfe*T
z<fHto`QY9YM^VcrcLwrIpHZbV``WsV=_@5*^TkJW>nb^RSaXRkqi!o<4>=#l_WKQK
zPYrzFja0pO|6iU&pRz!<jYMX@!b=yYo1;bUuCV7#*-9-2ZJ%fa(F2DiS{>K+wMB4*
zq|g68p98+?Za~bpSDFzqyO7@F+t+);eJ8-|$NTtSHwOZ}PDw$p^Vdh8#&$aSd3dSr
zDdMsTv0fezM3LiKY!f+^GCEi(+6F)oZ>>4=FMJTxSi#1B&+ex>XR<_F^ht|IP*){b
z|BjJot`^USRop;caAY6QvT0<gJU_k`jnmk)xT)UX9&1ONq)gm=2EtywWJV8zNNmWU
zUv<XctQe@}M&o{G?A=c3=v(4(1G&hL;55ROf2bCuyibRg$R0vRXq$-4Uw&+lA5v6)
zRUPgOV(g=fIQm1u;q1g|wa=(BlYFO0H^ez|tk%L_J#WAJ$$q%~qoRE<13P$F&!&eD
z1534J%-YxJ&{!d?vc<=3=pnB%<hJ7|UxEKi3MLdkf~$Ny(Eum&kD(5fuZu<hTuOu1
z))ou2^I6GE<9)|qM$GYcr&`eDcd651BAU~4%vKmVhrJmLcglCHqird`Zo9~Sf#$^{
zH@AreMK1R;%;LE&F(ll(UO#<mIi>>`X+NL(^*;W(C&BRVQ-Q`v!dPUob_Q7;N$JUt
zijvT)b*mxQ4z&g9q%ZESQD8U|=l>!4w@*VyD}^{;tf7G}lKp|ojylj<>SD9?XBx?7
z5oKuk(GW;jwIUdjzL>nJ>oWKx28p6$K)^@`We)BVMuZlbm5h_CU4}yLyfqmRKCsJh
zsvL2+t!w`8`Z&u>d_d#x<bSpiiI2&5FZXcJQXN3w)<|`LdGeR)I90~6z1#Aq%qinX
zu)Waa>h9|n%;#AvHZkWHq+~!S4Pyj?1Wf7q3lIN}tsCJaMS~N9hP8-#`)<ExeZDzp
zYr?pr*Pm%o#9m`fie4ppDm(^ho@3ZKzvS#J`LX))(NTf0kyEE*_VDG0Fpq8|@$_PS
zE1|`KzXS@%Y8ZYHPwE$;H8ga#l>4xuxcynIF_~$xLvp2WC5V!nkaOlQQ@|D}(4f*s
zj|U8&%r{$-Bh&?f;$OQwxTHwMwmlxgsM1~X9Zu^UIIK57bE@Gf!ddFC0&{0jm)i#c
zzkwrEFXJw9Jm582@FQaW)w@5__`p6z_w;pLv%C9)Npe_vLjDeVtXN_miSRDvuO$J<
z9`pB}zNurI`ai@RC-|3e(Uc(I!&=u2)Q}`2(}Ip6vzuz3cKX&bcD>0TlkzM;u7-J%
zIUvcj5T3zt1E%`iNWr8KTDUKNjBP~=fv4Iq*=w*L8|Ir0YM8p$RP_SUg(!(kZKv~X
zf}zh=akDHRWdHK7!hN76Q0+2-B$YM>>F;Yf2T4>Qi+#0DSxc^X5G1);MojZjB*DZ-
zZ+s$XG&t@+_BDw&NslK|p*&qn41NbepZ3HLQmX>A#!u5lIhrV|AbD#QLMN*CZBeDX
zzJG_*c|;uG_57fRD}PUoUBg|wUUY5z+L2UdS^cH=u_;!Rh(v5D<)U;Pl6_;Wbtkwq
zc`TG?uc2>VAplBLxl;xN+(f01gebk~0Eu=j=#tadx=3}993yJ;XBn|__AZc%y=-%F
z{(DVyWR?Rz!ias6n?R-zr=LAoeV)KSn{4euVRLsWTG(Hm_X4Y-E16eA{|GK6tY{C$
zf!Qy-<&8N%cow7K+AF$G*oK2D12!Tl)9|K&^9)E1;OmbxAk(F{M06y5i>m71zv!}u
za(Eu$V1wO8DHRffl2Ku?a!y4-pAyu>w{+zo<0D|c+AOZ-^wjUs<9j(kVqR2ECY0|5
zabDr<8QYI8JDdfk$Hndxj?0H^&yBOpR(jZ~)-BmL*C-5uB(pV%eTIT}8nfMgNMAHl
zI=)}~m2*jRQY7-<CwyF$RStRIcPBVs?OB`(_Gm}1gaI%f{1my1$`9^i=XuB_c{ZVz
zZSdQy>1A8gTqe;v|LiPW=5z$nJ4)5f8}dayU@N$iNgO|qpnNB9*g_DTDiH#wz4eRB
zUoc7>iq2h(Kat6-7fF|5%qkxy5uuAUdLfCA7TwdJLIsVH*lhwVggo)~jSI;bTSE=n
z(BodT02O^-C!JmyBjGG9skm>w<5l%CP#^a-FPo3)!{HsmBR4+;>OuwGeg~fj&f*Ry
z{4-VSV{Njc7^iBG#kRckZu<>{ljs`{@6RunFb$`}Q@={>%O;2Co*P?cRexj<kaSGA
z$kqF!XJNJ+q<hn)gwlt>7z3=5M<Z>ZpKo30+O!}Lh8vD8M9SlezpN(KmZxu4^*`Mi
zJDrG)PqPu9E~mtn^Mbd49vTn0-SaVC0Uy>SG7gixqE!TPNP}sKDNC@cmO^oo{ffYT
znmIggN4wsLqAzG>*6coQ{X3cC<d6<^<&5m>h9teltyX@;%VNw`mKfT>e;8T8;cEkP
zb<Dl>EBek!9ia>v+L~*@lp1bA=Vgq=rj|<Cvd;$zBLD1=_Fd~ofREF<l)~4K-?WD*
zO&YHtEI3Ec*dXR&2!7(t9+K2~8KSO*lk_Z>k6|a}UDZ{X-g4pW&xpGw8)JRl*7x*m
zyv_<<@5nGbfMJQm0+E7=Il7OtcJ(Q(eU#1$;d#~>-AzvSR7H!)VT3DQJyp^FKHqKS
zjeRRTm#o`<l~;_;ZV2BJ`1t8GA{ae)FgBHdw~WtOE%yk3zmt~vB+ThTxSuhTbqv`h
zls<@bYaA?^lbGA8py`{PBVRJQZPYBcd`*x)mDs;V=a#hzkLaEA-9KcDN>yll8{2Jq
z`FnjNN=Xqhq-jQMP24HTT;}?1Z2FVPBh<Bym;O6s)@I;zOX$&)&jD${a|%OG#2VV<
z<zg8=q44rYv`V^p7X6L4n2UfcEAi};cY%=~@XaZszaH=F@A>{w<iWNvF`tx2c#!H*
zO5nx4Y`!z=^j}*F)G&1eJ@Xa9_PJinOh~kK_I&85>ZR>&8=In2;EQ1zB>8v=lA2BP
z^0}6CI|g6tT8~5YA^*toc#U<k(Ty!EXfEsE3mA?cVbkO<UF@YS+eBIIX!(ll%TJD0
zKfGjl491<Q1v>R}f<ciO>aqUre1mVjGa-PFi0;R88@Jf>RvY{7u0P1CbJeK5dj+C=
z&Oc2=*nG!<6VUiTx*DCi*+qjS(?+l$&c!J4np%&}v~Y{iX+kY8H^z1;ytM8Sm&gxC
zUs%A;_SaIuX*Yfpb5OMqN_8f*_{DKn;!&pVO*LJwO1VP8m{69XM`+5i`n1`fzO?Uw
z*7@%K(=RdXfAf0M^`a(^Eu+OYxNkZMn67a8<{T~oz94X80AkuIL!J5Y&*=a3pryR2
zDQ<NwEv5_&SAP{)YQTNmrE`ZBndw=-Gne-?O#}>NtZvQ$jYsJ2svr7;16<>owl^5~
zv3__3B0QURO`ugal`TGNKvo!>Jiv}aPhV<Q|5tKaex6C2b=qdng+Zko7sM`T+!BlX
z&ORaai<UBooW3O&?)Thg$d4+qIV}d8UctZv_yhEGjwvEJCPyA~)ql>AC>7mb69{FH
zjK*EMjn|of{xZdfSnf_$*?^)#kICb=Emc<DwpG!$P3I$LZXt$!*K;N<`{~{*nxDsf
z!PLkxsNfNTwG^0#_dHEsxEzqvBRQSfp%_heA|$`e!-9X!s;{l6g%1UY*r3un*7qh`
zd^bm8`yhTn+x^@*hh>h`90Sl7oF2S4$uE?<2)el)PboD0+bm`+{*R>daA*5{|8@vs
z&(f&aA+1%TNNgQe)t;sHuC294%$C}#D516Ys#TjdR*TxT2~yOG8SC@Q_j&$>9Pi`K
zb>G+Pb)HQFKTW%yK7)P4mJf|}Lb+|pR-y)-^P1C!amKLJkah!gAMP~4cNDmCSDLQ=
zMD=|wXIrm34}*X4r15OFcvk!|B_H#d2xql-kK@+jMT@F}V3A3B1a4cwZ;L;_1XQZn
z9Jc0FNNf?TV@;-__*iaF6Dx2m7qb13ie8q|1a+nf)~JwSUhaq}z(fS4`t%g|Jy^J&
zEc=kRL-dxF*K<tMk+r-qb$Mvfw9JRT|4}wRdjaN>*h=D)BlLBq+2d<_x(Myj;Hp;y
zVbdBnW|~*TXdce^k4vV^HP^de{ziUV>>h(gi)Ycx$TVDP@MmOE?w&;(rhLF+YVV2n
zLO;!y%x6$l*3({mR&HASA&mm=jsKSzKL2$gpRW=B*pOz;-XMTJwySxv%IcZ1P2tEf
zbT?Uj2*wKE38b{Wuk|hZH10<jWy90#0i}h24SJ$7akn0##PvcpEdV4iax&$#8a}dP
z>gdc)>q#5n>NQ*1($ZG-{rBxJhFt14u8(g?Xj(^!{)r7>m%~~1tNzT}HCZXKQw8_J
zM_33Bua>}4_UYzqSWZgqV7OH7btxyd#@R8)*ji*M{Eu$#ao;JFt|YWc<@NjAj%R1(
z=KCbXb3>TJ>j&mE_or)IK{@?GQfnYp0>4HH160VJTy2XsSQMS-vsdONs411?)#b%z
z8kBOp&OX>LGKv~+^}SPQ<K+sZ-XQE0dA&;e8P!{dQ!4p=QW|UMEC&+P&8hq*ihg(S
zOXl%t>4SS<1q0>hRabBMSN42V3TS$blU20ML*)^bcd6dY@*{5b_S!I-7+6YLE+GzC
zV$H}b$epQ*C$eBLW*yod;=R--mZgYW8QNfRG`tzUR1npAoT#D(-p+rS<GiIxFB9H)
zUP?8d7VlVwNh&sONZ7NZ{Tu@x+z(1Dpe6VX6*DZ`I&kjL2BhqBxnMWlCL=j97$hxK
zT-#@*7)s{;87eJ(q$*KCAx&|I8mBB!08AK=b1Yz8|HAS`w<*9%Nj4~DvJ?oae#w$D
z@W$Ojk3GOhPqe6vBo$<-dC#tjC+o+E3K?!k?U+g`Ok|2nxX&iS8Tv-#IsSP&QtdW3
zX(Bt2?_0v!(>as!93{kD0kTkD)@NJy(dguzgyYT6$?-IWZSrDh#T$c4?)WZyuTiu3
z2BgH)p(3v)-G4K;XuNJaQD=Fn6QXCRAoq~sQoqZ3GXA8-C)cHx)m=N#ccaG@(~$J?
zRS`{LlKxCK?&GM;n*vf+UK0JpanCRT0@O%-#3xbv4xl%`bMDfZ?MQH)?p-L;wc<=D
z|HaI{u%i0-*M$VF+a22`o`@x?_S6tS4Tf42e6oF7yYb<cmO$l;NGOf&5X!I9?i(qX
zPi%8zDaKTmk@K%;k6sA*|2-%1NW0B01LJX`-;E4bH-7F+ZG1?%t_oeUY;H;Fc6&H~
zV0rUd&Qh|sK3^wDn|4k^YlNNWF3$`pYY(3mUj9|qrR`(~dqGIM_B*}FX%n?_aq(zQ
zLEB_COpPZ^sDE?jWY_H2s5Xf$$qAN#gtRQ|ZrG}IEcbW%`%!tLz0T@)qUi5j9GMJp
zASK?U<$<(FX>?GhpX0<bXuLLaF(4W5XubGTbr}>H&j>%cdA;yPk!sO}DWI%jP$QLD
zTou;Ms!-AvB+RQny)Rax@WXI%O&RhQ?K7Z>J*+M1y6bPI8>=uP1Ngi16W1uEeoG$|
z&lvRf;FV|WZ}5q%BH&sq=ed0=cYg%u$dJw-0%A#_8=G^bx^^C(!{)!<s?uMF4*&oH
zZ6kZRI0O~fR^Gu94f52M3r4<D*N75<76Gq!XzpruBFTiZg}3MfH?Rme_`GJ`U^GkV
z&-h7ZV|emYQDe5Afu){-bw$f+mpQY{kS|gR6cjN4PuWORMy<^%4^mARg+ytA+&c$r
z8nqhYOn#I-vu;f`d9##Au&uu-dIMGVaH%Ie{t&t|$^IM{r;>BdN6)rknH@k}*#Pt?
zW&62xi7HJ)PgHQ{lR#|Z>zc;NwMd(q(=k?ei6rdlqbYY%c-3ZBaAD~(p`ronuGQFa
zi&K6-^`LK$aI;g$J=U(TYl)Hjxmrh(48Jr=_$mm^jtzafV>dJ;?|(ADTxDxL*J+oc
zR`KeIJK-|4glQr8%bK|+d)|NWHJ~~6N}4I1<Y`%G^W7WxNh>yBPN%KWzM(AWrkQF6
zD+Pp|RwU>O$0zr@4|a>Wx;sJ+gN$-@R1UT@$xQZi7jtQsuBM;+*0U8_Wua9Nyd+nv
zp@voN+%ZrSoNQWR0bx8Y1HagM6K(8?H%;`EnDedle6mq<kgNa@5?9|I=d6{yqfyD3
zwU#KZ#!eM<c{x4ev5XcW7f!sJn0qzOBCL#P0@>`3k<MY75v5g0+{ZPBo+h@6Qu04^
zjBTpYXbKe6Ld8`}1T_pZJppf7Nt3LVexy)}{56Z9@F?{_=UN41aPR@{kN(4feBzWL
z!@lldpM)hqB_dBWDH`fYe&eG=V{k=Bk2Y27%P`Np-dSpF%$HKNU-Uux%(j$n>xBCn
zG{#bfM>`<KN&z|Vvo_O40Cl4VJ_}uN;OS?gFKLf~PiQ9s(D0tiN!u%-IOSzFzL0L(
zX^ok2mX!B2t+;s5+CboQL7f&F`Mz^*<L&%@X7v@Nha&79Mac}aY2mZ;wNJd*+e~!g
znR<cnOUH$3rE%5GG-M=a0Q_v#pgEOqkeWygtz@Zx>t%%c7VZ%ASr)I+K6Qh&jSmcQ
zt~wxWIgeOqm4*PGblW+$%G3>CuUgdGp>=TGNrHEDi0@kpB;JqZ>Zk1gmaKo<iPvvR
zNJiIxf*@W$OcH(VXjjv&l{l1#e(5y(J>*qCH;kEu)jYGzd=Me1FwGgnj+XH<_T*#@
z|1?bE4x3sFy6whFI(^dRwo?8pDzQ5@ZuG{Q*(*Q&W*r1ODlO8j6!)ZJh=COlOq6yS
z#pi3@8>^_UPVFXblC4F?`k2Ap>x$Bkkj6@pgO5mw{K;#9pY?V6cb=w_sc$gc0`CwR
zP&{Gv?m%^~85L$KQ3)heiRB-zr<;GTFU@Y<le<ws>NA)yr?5e=B(|KoIRJBIXjYoP
zLVx&PKGt~MF3n|t!!VH3+|b#*dg+V=nl?fme>ti7y<}<$siYLhA#-z|s3r5GM249k
z!*$PK$UCbC|0wf5DH8>50Jm>_Uc|kLmr!f7?diqlY+OGR>F^*>!8zuF4^B#jyek(r
zS;yo9z(ps(GHWbD{r}8bGPidQM6CHWGBA{#L_F0|2{y|cbzrWCK!ueXml%GtSc;Dk
z2+({K$?+r6f#y{=p&-J*JIQO+ZwH5S)w72U96vf?SY(10Q#^@+O`YE<d65j}#*c9L
z(sp%B672|QGz=2~;TCPThB|QSe{ms5ELZ3&=a;4wa9-Gk4jDlZtbH|yjMc~uPnFRj
zH6IaOEO@}~HO6T<Q4*c;M6Rlp*BNtiS{f^=<P(1=ws3e}t|@h;zeUrs1wB%te>}!9
zx6X?9ruZvyFkj5K!PX+B+;dJ=iPncNLPGZ8L*<^;o-86{Vl4#&)=ErjHSa$s0c+)s
zUl65dCaBs_oLuS`F=X;T2A@!EpOmORiV`!A;^^_h6F40-%UViQnLQiWZj7GHBd^-D
z$o+ubnM&3A#f~UOGIe>0g_%503x*VK1X_7Jv40-PLS~)uSet}tckhXSMsIdq<pphC
zxt@KB=(S@Fe0vO6q7pY~#>FE07?b?Kgct!JiUD8=N<b(Pr0AVcP&~ox_i@Ao2MQLE
zk5>ArE1i;o0K$@kCW&^v>LUbF=IRI7>&GVIJ5n=X?6c!nIhjitD<erH7@?2{-=E(L
z_^G08CHp_F%3tD<7`5!ITI(MM-bP~g?3fZkGf9sIIM4uD_B~V<;lPc^hB!R7M}T;D
z2$k8_PuYabz#!;R+P3Mx1t^bPG8q*^{LxEscRmAT2w`75#l)i$RSwHNl)YL<iaXq3
ztfvpXm+FFiZkbb@<!*!ed|PB2r)D~b9<r>P(5`asn#8kEjY$b_03;%mI4#4f`N^(7
z?G^I9gAXU>?X-my9IT=`PR8)NTB$pZZvQ&m(AtXHFKduLrMU)spbYVjvvF1i+Ud#c
z!>jd|m-ljjq~9Zykt$xO(&N&bIF(jt(qkp8qVD#~=0K{O&nDlMlUd*=mpY_|xTqLS
z`)`g5^SQ|{?vKz?;2$3kl-Ckp9ABA)j)paMR*eU%9!Y-L(G_Sp6Ar(6g<m>XjuHML
z9(Z?N@Cbv^zGgWvRTl}CK4j_>bRCX>&d904veuILGAEc?cyG$-TB`(Xtl9sh@2bc)
zUV=Uj#VzbHHT>|nJ0_I)_)GYxX%dj5XttM=vwO9CrC#yh&ct@kN?i5njh;~X?+(EP
z4gW!Q=o@Pi*RX|TPM2E?1;p*-%GZy3!rxZb^W#oGT(Jz^d(jy3PD@G4bKHzX^*=y(
z%)Yo_&m)h>h8=Io>JHL#=BH0NMO3{(nkO5xq~^VyT#3%>gq>|@S1@6V5^))9aO9gU
z{jS@7h0M%JTOj>*;ppzQrbxPDg_&wIDg5uNBEXrvAg=UB7)>|9uez|S-8IoAebM+m
z@Zwu^LUmX9TkeJ!<<unRioFQYD#dWnY-dRMp~RUiYTsmQ%59qQajUU;YH2P~8{qRR
z^k*>Z4eIMdx`hE}d-7*G%vp)pUDNwhWjAMz;L$K9#h(Z073vP<!;yjc{Qi|Y-w#)|
zr6=ZIeea2v(^Q6^$g4KFZga3P(kjbKd*wP7)Nae((gJQ`s=HW&U;h3N;H*eFFaF2B
z{spRbvv%-XLd78-;$U*9E^iVld11JEK+Bq9J5TuD!E(pFoOuCrHST__93d~w8-fR5
zU;L$<ed{>;=l~pf?=%Rej^3I{0aX?=uYM`B+7iXSuB5}TzAOAEfyn(#1KmOJn7MKL
zh4yOaZ_o9mNHUNQ^}e3ZLQ1%aN)~i1{lw#4OQX1otr~%qsyfNB-1&N`<Kdx@T;-$j
z5$@sSUM(;xgzWXf3Q6ebkRM%k7yxXw<G*U<l~mgl60&*_F;m~L*AfpPqp(ni5T*T<
z7yJTt-x~iCe0MeMPuHs3w>W;4;a0ZCiQf+qm~BhHYncmXIr;!+R<|Az%gChCg0Wgc
zX?d5E`daYAFelGL?W@11pzcWmdBWmgjnKFLWlJApr<}17zk%}SEcTu3&lCOPZyD8f
z=e@zxG75k@oE3bs-g(s@3T)B?Xy<ZvZg20UtZ-y(f8$5`X7$mw34m-*YmI()NMLiN
z7GcZ4E(G?prd7Xw{PW`4NiEfL>iQq|*o$hmfV}MZTJ_0mk-7ro$5o5rJE|u&=Nb(W
z<i9D)1$xvMk1sEeUkP`mJLKgC7o-emTG5BRa4*lfzlc5QWPHSJ4p7@B^obXrl&Fl>
zsd$z`h!*5`uyYKCdVtTyTk=<)irT}?dsSZo<ci@7k;$}(-7$@?Rj<KwLaqhTru+ip
zZPecx)lRM}J+zvi+SE0x?6XCHAjf+1+r%*O7|cb>>J0)dJ98rSn+rE}9|5N70k%CF
z7L37V6;+sEA&zB#6)7j<xVqsa)Wq_~qoMgP+dW7aOVb~hf%4Bf1@H}O8S1j13T_GB
zkuON*4-EHO6FdV>Zp5^k{f9`yNv;Sa9blw(=5!A)SBVTQ;^cap)twt}fCL%sci6^_
z(-0p(*#6L}&{-^>-f=2q9LkMQ^BChvXbYzo<DwaWrG-x(Nkadoeu;rWY41*6pFaYO
zaGrY0hOuR0%CXhj9Hw3S<De%)r=x*}Wz)o&Hd^~)bNY`}^FQwIlMraOqAjA$cx^pV
z0*L6cLLJkB1KuY<PXGCHzGE%RWnsgQ`lFry#(I+Bh<X9dPDHPGOwR4j$Yt|=a;glE
zkrYs@Q}6a|h|6JuR20ZhiGqtr{Vh$8;d~FHr)Q83DX)7)Z*kJkRr(6g_HTfodqp!1
zwS#IxwB~1Ha*pE;O`Gv5pWcDwa<Phe#`tuc>}dg|xbl`XDEaxDjjO;J{cXy<Ek!Lt
zJdto;=o7DQVGp9y-&L2d$m~D6Mih;6_yw$$c|e_pv7WMxD`gyuz_`_>FrxY3;kc@w
zYG^W_NyPSm%lVOeHYxc4K|^Ts>Ln}(59WozPq#i#GAG5!=^k2Y`7i4-R@OuD1gsVU
z1nV9*9^||eW_v(&(L7@v^!iRJI8Kz|K2ZKn;=A$l+S&GMF19d)adQAGFYvU+=s!Sz
z$+_z@QJIVZ`TCR}wlWX?{?0Au4->Ft3tP>a_ic8_*KWF!b?<RP6Os6_g9rv@jf;@t
z&_&BS&i8z?iVkB;J7=N?zqYdQD74i(E_Jv2P77QZZ=|Z+WtbgdF70oBeNohsqnOMQ
z?UhS_Vg(OiYLS=jt#(F@(cz%YodOPdiCo9-mlza{WsZzQj>&76uZn`VM1(!>U_N~Z
zXIbexMZ*63UD-Gb<=Yi<clAOGGP{OW8%{{7o>B-)cfrb^!dpt#E3VL477DM!C+K;j
z&w&Q4kDixE1?Fmc;X13<pzwVI=JVSAq<G6i?R@f!lKGv@M^nzFe7YK`cNosY5eRIO
z#&!5b6M>-qdnOq6;7Ac!(plHtl>SI%_KkZ|s<AEl3BeTIUCd|kReGAju$=u=^^%+h
z$6nndf7Hv&nf^KPXRT!x=cZ*}Sl`170lI5ux-)pr$n&F+9sjF-U$5fU2|0DT>_?vb
zaI?X_pPUf)<nC6<tAs0wu--n!`ffCZaInNt1H1Mbs*Q`lLLX-R`k4!~zpSG040HSP
zOVF&L&|8GlNvOl&59Nc;SEIHjw^q*?14TiK31Yq3Kke(hb|<f2XB<BK&It_GJ)G|T
z&;@b1bZ;wJ8rWKJx%aBiyk|#S=Xa{2%=Q-vG`SvYEW%fgI%w7<L@UDF4R6JT8ukb1
zQ)K0~--qvNs$~hvGQ(;Pe3nb~9>)Vhw6!;t=qZ%?S{LWW9z9JCPq$6G-mX3Kq_TzN
zHV0lAyntHwCa77#`H>Lno#$hNy_8~vMa0X(IHLA9tzbpJnG&^6Y`Mp?`O2ElY`MMt
z$Al-4{2?RXv(X43z|dwggWF$6!93~sVsb;coqPk6)_xsl#aKcAhYRpsS_2Tnh4;h;
zG0&U40R+A&{TCr=1SP~WsOiw3?xaL^#%P83U)MQ#Z7E1x<R2E04`r$d^>B0;Y;XsY
z6V|blxZ=dSRH-V<MK=PxylM+yFo^|(b(?Wsb1ROAT9q^l!_g6#<JpuIElz|2ALr^Z
z+c_)-VL)j=H0|_6qax#VNNj$dbEPhsoZLxd5jUosldIz;{vvB*b<VCBm3Vu5!lU%h
zPz}opO3498KZ6EvilW#3f$V|PZ;kw~f78#?A>`6dDt!j-5k)AtFS(F%cq}a%cv8SG
zZ%qnFGo{eHc(sH0d*O!Rq|+blntkSujEIw|?Cang9E3yN1+FBB6dR{@1km0m(r7??
zlVc7z1CgX{uSRJ>MDH|19!x|I#~(*5M^2>6$v&3-@^A?RA37@_e`*qp?icc>A#|p*
zzJJzY6Ir5_rA+#F)VROYr1*z*EHosb<m>OJ+R%DVkr0_T>qs(9saN4>T3Nba15JD~
zd7Jz~({pJ3zah<i_Q24u@9)@0(0lbRp%urP00e0*Qp!8<Ef96ekRTng=^NocblrCT
zxj4aIm|t5_;6H$V;#5F{c8-N5kT+4jaaV~&!9n(;hy+p@v-``i6-PiSgUwU&HzPF@
zbp{{Xn>i04U~-`bFBllEe~9}V0VgBl19gDX|B^;@q*Bl_tLK##=C0v|++Jv}w8Yjj
z+ZHd@R0ZW#VuVLvo|Opk*90_tfb-)^K!uIni-DBi*@qO88awKnZuM@9DnxSDLF-NI
zo2ocz;==ZDgH3bfC_u<tb{)xJ>lBbO@Fo5YG)&{YmY+B#a`CuVUci*ymP@(yGWE~E
zxD86@OEzbOHew_Ge+PRuMBrJ!BOovr7iM|eqy;2zzRn(%SK{rIu_~zf_s~jP-UWU;
zTsRU%cn5_XD=}sTk7an8z9WgpaAZ&q`$oIrN6D5I(M3-LpWYKYk7dQeubsrndzntD
zW-oO}T*7TO6IJ=X<sau%O@ROS4vi<2I>Qok1F^a5#W|N?(7qi$F~|#ljx8wTb#UY=
z;|l;IV6aYr%csl;t~3OC5ptg^awQ2TK-W|l@uM+j`yhVWam-Yd%oAkMBwHDveBm0h
z=r!gYrU7ujh}*Lu{|msva$XDRRVs`1E~I_UfVEhxpqy>|ZHaWesk~{`q2A6)ruuLD
z_PDSf7vlgOq0Kb_&fn5Uw?hCc&S-|9T0jL(y{3--Q{YKtL9`Ky`jVx$_CXbCTyo%k
ztpg+-G)oeU;bIx)d^zgzHS<1BP25xJlsQyBSxl#(OKF}~oujRMJzhk3$~tylY>cB+
z{sEC%FQjzHLEz$GHgZAIZlT=4cNJjl<a%8?3#vxAZNzCyJ<i^+g50u}B@OXvj>NOi
zxwj4!i?V%tZW?8;L`k<qpz0~O&>S@;d*T#H9$JOmW+?uNDq>}xas)4-L$obNB(1GX
z8f<h2f#7SzBjm5Er%AU(0j{A>S;0U^+J)W^AAdD<Z~E(Bo8kH2^J@e)l4u4li`b?z
zfIvWU0A}K||NifY$DiYnbAxP&UiiRq(jcYd2e02Z*O(gD_rgIt&J$3*;UUUe_MufP
zEAPORq06bRw<n6Nc4KZMy$X0jrut2D&YG=_AEXSh=4UJ4PU~Vq7sv14(L;M{B*jVi
zu%2fAdK4qu>}#N(`;asHywY1uhaBZ0iCkzRGgR?sUByDC^wmDbS-&r^O^D6^<~0&D
z*+3NU=61xCTF|`Lss2CN&>xd~cE|LQi45ezNs}C>^mQ@desl3*<9Kdt+U^Pv#;k#W
zI<t*DBdO7`i+|V-Io`uhc6&Zl=kLd5u+8OFqkrE@TIg~k@k;JK(OmIo19E<nfS_if
zG@d%h;h*09fP<WvfZ)7Z?%+(SbCobU_rRQYTtdYOU&&v(6}~3wy&7F60CdzJ?U<_^
zNdP>xLUqK3VC?VA1E)W!TX|i52id+w2hwUQ{3%ag&~C#iIm~-%2irMr8(RqsuQ>6*
zGXg--2msw}m*B^#y+2}X3l*sn-$Z31N43l0Ti?!FluUk1(X@iWu-ed$S;Y#oh6emo
z*sGu4Z548-e!T@IB~F;Nzy2Vp_{fP}0~_yy44LJ+oR#q6`!4=|L-0X*CLdb+vFao+
zY2sTf$zf}bx-b7)LO<!d$vX7w{HZDvO*^`1*!e4o#+rXOVy5IjTjSPN$DU$@Ld{cV
zK}SFMrvElHo4p~)hEpQ#V-zLEUItgbX<nnH-5_xNY*Ps1<cEL}L2at?r{;D5QHglR
zsd4_3HdNVLu=(xzXZ<>2WwsbCe_*j$$aC%HxChpzN*`d(Xbs?0e*Z-Iwjl33UN3a-
zrEPrpa0`U#blX_uQR^oe!~BmDUY$c5#DR|Eep?ZGK_83SO}3Vi7-#=E+f5PxUHt||
zG6|@{)%@PoC_=u}hs>T3h28yS-VvR;WNPaBEc`e>Yc)b9^p#7l?$fFU^U6nQgC=FH
zRFUChTKDgu3Q?FniGaEYb+GHvKajjXbiEOlA?#uCdhq(FSq$Qw@Y5g{3D^md7?9*!
zjG+@2#!;yafO1o1&N0mS*rk5R#89KFZrNiDUv`_ESIU5oQqkpIcX!@6%ut-9J=$&v
zY-k7#UtopgWKz`B>Kf3KR24XG0=V|Z4mVKw)i%oma^-DNuRp!Tb&O?+VL(m;Z^7(>
zE>CforvZ%o23QA>dms~mn~^GPA%}aVPA<zd)VF^sAF#Wt^W~X~Y0fhT<>N-w1*fG?
zTuCCI=OJhIw`{g(T|xo2b(QjU&qt=`<aWBl+2)Y6#JpB)s$w;%xzUt0RrA_QIBN^t
z!_>7p6>tBc?FHt1KOe~PkO!DMJ6>zC-flPk3;;~kmMjqJnJ+5uqt9M#AxT5}^l)m@
zX_%SJ?_b$`hsMjWvd;4IQmeAR2V<M~pKF(AxaPe5&a2uY!aL$Bpl~=Z4pLZpt*SLy
z{X}>%l{8E&);xYSBtXt9C&gmob?I}dCt|b*g7jKyCj{5XoGn1#N^B%d;OPbv4mee3
zJ5IEtI)MaFXnt%!Sb<BXNH(mFb2$g^Wd_+bKWj_qm$+UL9SK@}LtH*avms$cz2?W5
zJ*a@nlbt#<>XSv^g$mj~mu2tar-04bf=l=v1sCNw>~><i9B@}+ROhO!yYcyf-!i3N
zPPhD78KI(}niOb7pb-QzijjSa5!>sAE~i-Xxl$)6N?euyljPKRD{kS&6aMt7vMo`G
zJrI-XbdPWP<*dyR3x>G$nQ)IsRwz52b<gE=`*X**t@~S6ZKUIjfccRogsUy<V4080
z+5TjdH7&pqZlMM$ZNYIyv202*Cz-ShJ^d-X28_2l0~d%mE)Gdfx{5O#+cl&iD|2ZH
zvm#GPgm{BWCXaFaw~f7CtfGayGfpdWQnIrGA}-<1D+GY=Zm%2_rJinl6-y<zBRb!p
z#uPxj)Kr=aA!1KW?NsdW%^Vsy6_cYO7=Uu?R~^bINjIa|?R(ZJ`(39V&LjkX5iWE2
zheO;JIPX~Gbnx#+El8d+GM6@_VrNN}uez=ok8=8xJqm&*d#e%N=F?5wGOZslSM1O?
z3W{vmfn^O23omm%lLwW>^|$31QLzphQU>PcKiQiomhzPOMZ48wp2-^{5NaLasdRF^
z(^=k{$=TAM9;^Ib!h4ZAxZ_k_72n_bUL=E?&PoDTDMm9oV*{64#RBsuzPvYcJ+6sk
z2Fi-JIs7A%_gaZd=?PJ)ggXouVhiZTG;Mj=)qk)Yn?Xl^yUNn`w*q^|SkKN1D1BSw
z6s35NDbfjp5dZ<_E!bOFoX&D|(^G!yIXJ?W)hyy0Z9#mMN~T>t<}%vJqb8S?j!6Eu
zOg<k@P?ZOIYFEE@&eU2qLg{J@#44NvWh2Fu#{r13T8u`IIm6;lqb=-6%nDzI|57~B
zLIHt9FjRG6d+ec8&X=1$s!Y`jV^!38#&`2ONi%g~1?!I$8ja+w)9t}P?1+AtG_^4H
zLB#`1@n-`Gds{^9P?{w&5d03{d5E)jHFI4LAFs&w+(_K2V+%+U?9rg`<_sY8oZ-Gq
zWLjd#e*nvu=r{?ta#hBIKV6FHsdtVES=+2jhi|gkqxnu|=gP%4zds^uh<dDKfr;>~
z58<)p!vA)7-jU|D<n@<KL(|4Fi5Zg98<~tkzoRyp&9R<JCe){^`{?^IThj5e8L8%Z
zy(YxoGHDBCW6YmyOFy)KD6@YcUH~K^ey`)fI>s54-<Nz(%*;jNmGIICS3=@4t!Tl`
zfe*ozvUnvQMf#bKjS=5A=<7Z=1ogR?mTdT>Gg-(okxovFb>O;Bf`Oc08V1D*eWCN9
zg=S3M7mW}lJ|@U=4hCkc<&po*-lEY<a~3x*?#pV0QMw-zDZI;ZX-h*X$&>ozuGjm5
zA&h}<OEcyRXFDNWOS=;}uYyhs$Ouxcfxu*uLplq8;!pAMv_Z#uUr`$F+bJ_h1+AMF
zMVEZiTXa~XcI>U<#mqB?zh@86sLaFpmadW2)eXcdFHI?H>xT9$H>Zyr*Yo3V6|T*W
zKxpmvvwD`VL%F9Mr#)(3eF(<249Ahf)n;9t#QN?tUlBNFAR5AL{mFlTwW2U5@P7aY
zx|s7V56TO&?MXd<vvcFXzr!Q#oc=G%#pupPF1;=gYlKtwjT4bKV&QfSnl#INoSg_m
znOEBR&+RNuG|V-Y`iHXRuT(r7CfkQ2HaNsa!}0>V`>1Z7_i-pTbhQxd!kIH0X-M0Y
zchI1>17V|I#%(hArC1IrjGguuln;6b_}kf^sE9se>!*i%<PuG`Amk!K1S15?N5BjE
zgz8w24E5{?`^=y8p-B*s^c#ml=kZ?L)xg?8B%@S|gi6wR_7ed4fVtN;0izt;c*V5y
zQuX`8cQai!yvy782&Yf1P=vrwgyI|8?%{5|;0J5x&rCgRbo3+0No<h--s-?9Tc6*h
zY&*{Wub(8c1oO~or&|F>$uZZr%-cp%&CSOFxs5m_-IVqg#XRAfeAlX!J(%}CFNqb?
z{I@-6t%j5lfha?$T@9UFghF?I@!MkCVnHg>PiEn~T(AbD3Pmp#jQuOvH2K-&_g$yQ
zbE9`NVN-8U%Y<Ednf8hDS?Bh(l+S9ut-Od8HO^f6=%EQj3#7IV3BQ>;<n!nfC$}fq
z$rjiv&7F<C>3IiXX_4c!ixcxdgj(W?p9`Q`SB(v?iVRWwi^}+^x6tF0YP|<fN1G>?
z%;kHzRC~|}-l^NBMmeFn2a)Cff-dbSqXFNt6-LQzlx+#(8_D{+3%n```Xv&CR;K*U
zhxZGDY9v7=>*AgUexPz}vC|Km>icF6eYvULf%+%E&!U`W;a1*W=OJRZFPtUQ)ddRk
z)4+prgfKTL>*4&9){4kfug+G*XxEU;r}$0i=N;9@X0=?DyiGVWszztmyn%e{i|O_l
zKI2e%1>NoWa2Jy+(KkXx$%Jy;ycV5CO8ih3njGK;N^-pl5$No?Xb2?XHe*+Y)$UGI
zQSjJV6}`Rs&Ts)7!xa=91Jy<`Fo+-r5jLmEWsm!H5k3~f%S+;WIb#6De=0O$HwNXV
zL=H&SOm;YZ5v2gQX~uJegxn{7U>{9)fZJDit2@qMBs^g%CRDpUwd%8=Fva(c^y+CD
zl_!|m%CQV9XE+_RsHBM$&)f-2lp!$H{2mjxuyU;)?LSkK#@pw|=T(071~E(4Jx!2y
z<I1&4R65Z6G)VnJ|CbWT2ndR|@_8W`&ZA87`=kEkBn-hxxDl=CH!Ws@wrrH-A_pca
zhruFJ?u%LzrO7VC;=cf@y<@}VtQ8hWt-5&uX4_s?$_~Pk%XxV1ecS?MqYn7x>SSa3
zc|v`w$@yx0;|51){yUe{8AZt~gfqFKSW3fpPHVJ4Z5fj?Rjisy|69S_REdK)=(F&T
z=PpHSIP$^m{KImdIL7Q=b5!MkLWYCnm5{Rf=)csq5zg|8I%Xa?DH9hYZ^_$bJ0mXI
z2w#6O<$*)Llq6k@1|cw0TX`+6nl>O$5;|}A*qSDlKs^1(I8h9O{g;S3Z$fDs`|-iW
zl=GvRx-G}W8!h<Ib-P0jZpbH@ok=)C>11#3F|n0RQ?DPebac_%e_*CM;Qfx26)^WL
zq5>x*_K)NME!OIo-=p{MI1B%jHrE#>w~oB$z$nFRwuylr68=8DQl$2MPApckisJFY
z-!uW15!$6Kl8|HYil<FKZp=!QK!9$zA0J@t=Y|d<4!b9`ma6XaN0r^bWRVw4l9IB;
zG#)Z8<6|tmwAtJ*9?foY0-HT9AXEFDtxR=Hlv}nDerb^Q=o53+0sc7v&@-mhL@l<y
z(T-fD^$gfBIEr<=86>(B{3{-tnCAo(Sl-`JNu4TW(M^~G^Ok~ICTg;dI7~HGebSKf
zqcW(IZ7-6CJYV)eM2*{vsEol8kBXhNDlyq2QVQq0rSMC4jvE0pU{%yY)SrxyRa<L(
z!gKMb8@vdCg7O!0XqmXUdA9p^1S%2A^=21cZQDlAds!V8aCN=xblbZx%*i*wVM_@G
z-UV+4w7wP>rnG_O93ch*zw4;80LdC><qWxu6_nwb4ji4)qOeS<WH)<0sk0M>(>uB!
zlWg`(2EZ7^?yZjw{#YVL1vV9Ut2j{@#~=JYqlF<tSym-5O^NXvUzN2roOSbE4Iu_=
z`jQ9i?!K@5FXVxmXvWG{p1cAMKTb62hrO>oJ8~&La=@AZ4_Av~>WCn66)4AEKUh`U
z(d{w-dj1D^UHfQ~N15Yy#Ggg=v2lVCkeowZOz4L?G|Bq*5s`;zhxIB#9(iDxanI+Q
z{^S;h6;@Zi??}bLW4;O?|0io(Y+z~_V-L*4!0@yuMB*yFR6oTfaN%fecmM4d5irD3
z+Roh??JnoNM+qYkZh1O6N~1TNk4&NQfJpe@<tab%&Vt||6q>3=s{IT&TTRJeHz17q
zFbY~zOR;YFd55DtN&oKyk$G`uo~5)oy0AW^uu5J09bh!9RNiYQ)oEV2NsY2F>G6vv
zG4EXw-~s(H`3hA(idJtwud!OfqiA$t+QuR+y*nIxT%4oK65I^=4?w~CODAz{sqZs)
z*6AuTM5){e{{7#-fg=c~^^FtJOI2RRa8zdyYOCVsu__U5d*JaTq8b!(m;on2Ev`49
ztbdbvst@h^7f_$slS`%Efk>At<oecF8YHSv(uRh0n86fo^C!Lyr9J?wrlHu_$pYV2
z367{of-!<9I&bYsUS{z*+R8qbNtZM61+(N43Zf17Lix_yuitJ<*A!`fv>S9jwH_Ue
zO-cG~3_HHwMZe{nDr7V>{UsojC^sgAf%*>anzJtzO;+Lw5@u+?ts$k2XeeLk+)Iy0
zk>U@%^I}u%;->p0VkOgK@MjMH^ReRkF?aVYuavK~n!A5LY<m7lQ20fvc#idJ;~2@{
zEE}gmdp%LsSRtP&>e)Y>j2)CFooi9`DZa?aOzie@m)`U>X9=ljXG_k4r&PHi3Ce50
z2XD;htiJ7&Q&hZoJvQCNZs8)+y>L(NeoD(Dyp3u7F(h?A<PzJd=MjC6?N#h`bqfs(
zw#ViPri%{yE969h^%u?ec+~@bPZhYyq}&Du)hQUHc_A(P&+PrYdBh*^;Ls||>E$f%
z7oRJMwIu3mNWPB$YRue5LX}cq*=jQR2CBn$*U~;%@FsV){%z{|v|ls%vVto$vCpXB
zt|iGev|-Zf!?^}H{<^?+YhSxoVfqC2E||B}+4Gt0S4ZwT#6s?^l5KhQ_V~_gN`gpK
zo9J1wSs4RTCmL{nJ5iCKcwOscl#C)j>XujfTUc!G9QdL<Yk-{X8=zC{wAT3d*C{0N
z$e=}J;xZxX_qI=-wybYp;6Fgi!+)QxuZ%-~hH_uL@Vdt~`}K7vhojPuhXwd`fe<s&
z(5PAbbrOl?1?>B*1!S7r$^GAcaYG*YRRR;U;2>`VO<3tobd^A;je`B4(Z1lt9AVi$
za63$>=aCck)Qv~amA^7<D+t(zeqqLQe<L!o(kA4=Xgh<v%n_NK&m_k&=!xIzoHW5K
zzm4@6O4F&VAKxD^L?F)hCGc@K!iTWl1u@2-ZnJReJMkO2OawnlacIEp=xq0qj;brU
z(>S;pr8Web>Glm}`I{4RmINV0(F~Tj5O}X1$&r`{M|tofMh<a^Lz9}MN`D~r^lEiO
zoL-(u?gzpm+*0R7eVOIeb@Q{ZsOuogQ+DY-(Gl{L<_+2cH&{6@>e|?+@UQPxyaZB)
zu(CtT8o#khYyu{ZU$c6!Rj7DVd5ZP+jwxw31xnV&aAzNbd%#8jMsLKJ#ck7+azU?$
zfSf8dEfKa<VS2&Dc@k=U7pcwn&Ycjs`^AV5W>a(I;n$4f^9QB|qFy(@d-mFYScD9N
z2K`iRyMAr6+_yykqlfJl7Z15~oNw8CRCasjhw1j&dHsxyrEogq(Jq)pycN>2;$D;}
zzgym1ADvvmk?&t8e^c)2HuXw4mFKg&@;Q3|^OT%ufCI&ygz7<a9H?5?S6u%EZXCR_
z>0aPV5VO6aRE7rWO&hzM1Hw_?r&uz_x%fhL4DvrE%LDdaQFBMS>PfWlC2E7wq>prI
zTAjuY{3JH)h<XT>*i5~ml;mQqfH4pEP62GDofl8n_+1jzI~bw2SofRwshrwCCWbvU
z_qNHrg{aws{ih&r{AxlWcr`Fkm$|A@!`-nJt{)xlRY$vw-F+^^RR7SuNAS9`C6Pw`
zjxe>OJNqoBxO8n9p(SjT2~>SRZU6CrmK^x`v^ZhLB=-Sf_u8cY*cY$Pvkw+pyhV5%
z{?cp^r%7$dTYP8;Wz-HM04zn>Ngj0Ytfk}36hAV%zsfvhO=fCL^4Xp!j?SE0dz@T3
zP;h-eB$Znz2n#InKPe!iAJva2z$xzzo>nRfV4PtsTBxr-<|}}HoXKO=Y6on&Dr%#5
ziIMDHp6U#(x^scI;BtnT-YuHKtFG*m>jyUR*>QF3(wr9Q;f2X~uQe6zwjoR$AW%Y3
z;(IG=kENzpP9k5H*_M`>pF(c#(VkufRQDq^JSp3MtE!TSdk9iHlIW>jO3<@zWP}AJ
z7cfd4q5hneMSp7uE=?Qv<7iUME%Y23#O!$8K6*T%5^c%*Elr6MSedRR*6U$;Sb-M4
zA@9q_-nbk#i%6@HsRJBgJI*E3^m(N|KHIqC$T1B-sSwRE>2^{lO6k&2mk54L0l>go
zPp)5>d+R9$`XtJWsc%T98)+UW4DfQK6Xgp%heikV6F<J9tUWWN2UH%@t#1$QzKkz6
zG{G$+y@?L=G~XB0+(jY&mmgMw{F@OJ@TLv@JLb_}s<A2gkTx?VlY16y11kOBy`WZ^
z{IeAHqCrBZgK{GS4Pxb-DDI(yd^?OXR)l3ja6Kt#h0<LMiFL~;8R4_5re+mxwfi9b
z70J_onW>N5rd7r=f|zbz3t%;4SH-^M)-9SO64Hu<ut#or>UuUFc0_lkc^K1jXDGm~
zA%>=n_&yZnNq1WNGc1Ag@C7I6BB7|gp)O~75ZVY3Um7H|TP-K^R^GWeI{0bs!wIh<
zr|X2-_`3x#=G5LFqcyCodmeTZHr(bI6W{Xxn%hg`3e>lM6zl!om(GSc(B0j=q!$O}
z%#8Y+smEK2$8vf89;DMU&i`CH-i@?8^t!vpd^l#NO>;YsB5j^=CBkjY28(gd)fNId
zCFTdw58y+xrV{hrE^=;%ifXeqIJ+j5p{xFw6Ub>TvP(F$kAwb*yDf8nlnjCI_9Y+C
zUr^Kz#GWy8S0lhd51y<!{!{!%*szk4-J~eKb`x2~u43a)VozCDkMsM_CxuHY0Wf#I
zru26t^nrF9g%LCaZJ2|%-KNxa8=5xoa`rIxsO6U8-Pr@W_Z^HaM*2@TC(Oic-?)0}
zPF2#X_*ZpDDmE)#-@%+wO|4J9NpLwwqag3szACbGw2VVty!8-SH(%s1@lv2-H;B(m
zgV@(BGij>l?|gX;N0{-dN(54kZE`uc9vs#zi2o08ldHJ8mj5Sgoqew~I?U;Y&h)~g
za%l61@ZNApyIMdJb)Wyc>^oNH82|!JVkw_E`00h;k*d<WAKf&Pzj!St-RWP@oTa^G
zpMt^%x1`|L0X6f6pZ|Yz`(bpRTw{sfQ!SA43sckSCvP}VozXAnDhkL)I6B^p%B1}j
zXh|;--_Cv8d+;)ox9<td^%zFYREx)9RB5cBywKsnU%)El?7ZZ5J8=ubA&sI9O(&vy
za_>3?RTQ4@(U)~3YK}CZzFsQ-7n^Jg>zYvA#ZOr+Dy;CUjCzw1K|;R*!VP0h#iGHM
zqgm}~K3E~ou)b=wO%=)rRTbcI#lLD^=0V-XabnT|P~<=xbOOwrFD|yq(FWv=tNUrF
zt|hieH+x(*zAoi$kg|lA(*aV%ayq&D;9{^TKO}<-)Lj|1yy3S7f9Ft;@RXPX4LJXc
z{D;p5Z$d}`62k^Y_BPUiS2r#s-r!m|8lXG7kmEDhWkI>&==B5fqHxtsJ{0S7k)p&P
zH$lqqU0Q5+0d#p<PXCHJ+f$nQI8m%;`{`(u^&OFwT|(F=U?UuN`DP0V9u$kQ2wX3)
z1CsA_FSBlV=`}XO{YC+!<AIK|e;>$gpr_4IN<adTjUOrSzIopyD>6}Hu;-*S%RM{z
z53Bl8zvw?1eYr3E$7916J?uVXnC0T*RP)NzyYjMW7Y<19rX3tsLV;-_iX^5l!)5~W
zl_R|7v$y)_GGoUbISWop%w<F*&?-tB`I8e!PMU96N&q`;VE%Ulkt3eGUh!XJlj8;z
z`S<64s)(B@VmluXnl>}a(u?&F7*-N<Xm!FuVRLV`CGcxP9UxxoXTo=4tpIqrRHH=M
zLOjmv!Ylu_Np{mb0Dwj;<d;s?;?D|*Z9O^PSXD9uu&HhAis*`1KCn9L&{*xuJkwm6
zWB%U@wG$cAkA1CU0+aoFPJRGX+`ik6La~0pdft*CeGYmsF<T0nju42aG;Y;<T=JaS
zc52cpC~s%NF1QUJNOUS6CIASCdvt?w%>PEd8|T2~%Wpv@PH-<Hic;*dww@&WOt$XE
z2mR*E?tXoLhpv`5O-cN@XTJcQx%HT0p2{x>%q5vE+N!`S+3ULE)%&=fOoESV;8*V|
zt&E>SlO^{PYroL!JO4;(c^~Mq5=a%VXG{EhN<O5T35m6AIgCEw7SmdobK_$4R$Ysb
z@vS&k)7c|`cWzY=OWFGY5E^aB>yz}QiC!9KS~>h;?4<F&M}+W<JGQG8pm$%qpGXx7
zIXckE=1Kl%WB7h_L#~WBY2XeKl%XTx*qtcxx#(yJ^2Squb*uR}-lvkjThSZ<7}Hw3
zG^iCzFfhvo+X7OKefF;ZlFN0A=uh%p+WocyZ@d1<CK@Ag8{C~J@JI6SY@9$Hp*~1D
z%yT~h793uu+YbaqEy?eMi7K-pYykNB#O{(X8Gw=K@N+j@>)&@@W;E+xr8~3MwXrdP
zw1Q@;?xm%RX@Y(#k%!3KeoY~yQ-Km*NWl4S?l`Ghyx5@SPkaoOC@Z(BhffZQgxY6G
zdl<1dDG5!6y{b${yz20lvC9wBh~Sr<hk+=`WF2?+l&B=sH<Q~JoB;sP=4sE33n)fh
z`Z;w$vwE)$#W`AO_i6lu1~+Ao$KsEG^J222^#un%9H4hKM6tZwi6Y8J16coz(vK#g
z2Vh%ClxDb@gYmkO$>eK}c<0I1x<luZ@i}>2Fj<P$1e>UMc|GOa@aX1eIFmd5!x3cA
z<<=*liYm^nH`_4F4<cqeQzkyxLL((jok(#V+PRZkYgNS(AgwX{_<A7evz$Zi!;kI@
znB}!tflj6CXXKRUl=f*7tyF&uY#|tSE$5f$KkHIwrA`>=Tg>vOEqB}duL>Y3y)gFn
zNxn24ywM}BjT?#i;`ttj`RAo(>oej{>*2>EDXD>{m|A7y(w21fttvjmqMaW3Igrz$
zNoU&!&t2oWpe8iZ*GQ{2R?5@Frq^o6@JDbJ*nVNm6&Q(np>a%1)*d^h%JPH-0aknn
z@8`698D&0S{?=S=47o|ikyVB<i#6bzdZq+fMItsoFs;bD1khCJ#;`7>je&u3zGs!w
zNW6{M0-3-&FE(``09%W@G_(~W^&3vK(NniZs|`Hae{uJ2k^qqt(J0y4a2b2IjL)yK
zN6(~-Vo{~F06PGgfY~d+tZIx7$6Y<->Kn=+PZwRNQ@+SF355KJKpJEo>*r3167CWQ
zBWnt539+`aq3Wo}VR&{*oy<c{>~gg%awyeAc&;iEO1M2v)YqJpl^RMz8*KqhiD8s8
z$5Cx@T$>Gk61J1IYZKYRRRgc@YZCjG?0bzf4d6Z($ersnMgv*>9J~H8FGNnFN+-%j
zHrOOvb=WiRQHyRT=5^n^om|;YB4?~h7}~f$h%Eq|ZJYP0mW5vaz;M@ZmCMJSfk7y>
zD!`_cc}N~fv|)=Ny;oYY5&**m*_dXve>db{ohdGXNi86n?UonI*J$$cBF&Z%v(b9$
z6o5q%EFU`+zPPIJC_BsszKCE!QxOZ#A+a%&D02Vz3O%876rV`3H>p_d{KS9WRqX4J
z*p$0OVmM;i{3o;9Nqr@sWvH0!-K!fp%n4|rg>Q+WofUg|{i>z^#2{A5W|UwRQ2-F7
zZIP?vkXhn7Ghxvq!Z4~Xd;W$^d2ie?a<`|10@hp?VH$2jF-NC~!juMfi{Ec#^ubEa
z@DWTGaCSgNwcwXu0;Ix?o8V<tIc$kPd)b{7$$4%0+?2Y7jJ518SBAcLpVQuo`GgHX
zk<=VR19-GInGP7?vzHn`07G`PwX{+Ie2<yjv10&EtwoL-L1i9WC)+kcwuEd#nIZ*6
zhqyzz<;=81@lq=N(QDj30z;Cls*fU*F)WiFtzXcHi!f%(_w`K*BN)d~=^HFxc!j+1
zXcH8BmDY0<0$3tDd1BODmlou@T-Hucm+rO!@fz3LA<tZ2O87P9S^3@&kPvaRmrJX7
zd15|5+WA#{@j(DzFIV_6e3cdi@GE(_+;^@iRJ?4!+?H2=Z7KDG9SKP@bjbF?E)M$k
z^L$nBu-Zox$2+zt#+JwnF@7?^w0+G!f>zbD7wu7+dP^l1?D2vUoo=SYveN~>l-MV8
zrZeH92g+|vx798)Z<L>X7rdLhQ6mcAa%V@ZhDPqHY5EbOJMd^I1molYOqLh|;<r-x
zUG>!&{@B!Kw$nhO$<%auli+97X+nX)?dt~Ocn)m~CXi>3g*1nc=|`r=zpH$0o^l0*
z`rThhB%_ZHJgxfRoUnn?i{yDg-P;R<k!+ltUQR92eE3j_{n`?<YF|W}#kFS8!YYU5
zjR3)ay--;A6RR`CChDuR@O*E>j@DCc;|(w=&}xN2(UnJs!cfha$bds!TMkoK>C1BX
z$S)PbE#T*^jwP@K#vrsAN_wriebtN+j4IR}K6|@Hg{cew#wjAhIs8^>ewr|<Hq+=g
ziM!|qR2A@0)ARrni*j*3y=5E*+=k5A+3(@Jn;bXCnlv8<g|MoQ=Db8vHd;%aWHM7a
zRD2UW^>_>wuc#a?Tgf<`b|~UTVypY=xnze<Zq1$hf0<(>60eiWD_8zb*gPIa=?k)i
z?sDoz_AKEqb;x|A{sWwprn$QOptkb)+KSc=B_A8VwEM;P^R@4cuUNf9pPvJKH~fG=
z<b3qO8P@hmsDwpajm-<*1F*A&X6{`~e6ZK|fVz)jyxvk8n&lFEd;6#fNeoXxr}XCf
z*pcWvo&fj&Uh<KqwD2bpYW2}&<~yQLM_60gDUAkvZ=b6{$llIm(urHi2565aSA58k
zUBLv$J@tz6YH@#Fr{jAHNBgEs!nbEKdOzvlz1j#G^qt;@@3htR#5k`Z#RT!6il5H(
zQB~?tD?3zVi`EO>hKMI659jGP0>8j~UzLL5QwFQmp>d;dDIV4=re?Wh`g(jKp_xsX
zi;+1&m4Y5irre9*M~NHuiCVG_4d*}jepXe;4{z{WLNSTRBi*cIl9aRhkK*l&s!$Z+
zr#Sh-7As=P$YL@P6ca!A{klFp*=uTij#=bSntF!ta0Sb=H2*Qp4OCE~SAJg}-_#aw
z2+><<_^XkWygx&ugrkK}ge>JjyOuUtQQkG;-5ldZ`Xq;FliX%Vj?BMw?h1&yu6gI{
zy&>ZLKir~!*&>azNWo+^bz1&nhL0eU;d$MvW2)M1XoibfnisLfoRC*dUrK>_@)L+-
zc-n5xFeOf%O;bsvIE5TqW~B{;<r9tonYI%3J0IO#|Nd5nv?Jx}G1P&9k>N(9N^e;`
zI@-<>2JQXOicy&SYWmi^8GDax-v~0VuZ$X)N&bpOm%FxlH^07#`dUNOxs#CE%MR>!
zQIW@$QsP3IxL1Q8IKVRB|3IzQp4fT~?f7Gw?*1hv&v9#h$S;wtp5VLLpk;Eh?=`eN
zU*cB(xPQZGx`&lhJeA1ybTw$b!79VP+t`1R91i4bup1-Dy@^A=)V%C<NR6I5X32cf
z%J&Jj)q~iZ4WB4>Cp~Gksfw#A8;PO|ClFRKX=s9aNWUSDO1$J5wHEV}dIa>GcZ-WQ
z5?(oLG-HJOoWjRg(-UBXHs9}CJ)UGe-!nM)^zY-uLbJtFeJ)mN1BMj{FfGoN?!WQd
z0pDnN8XQ}S--?-oTmJZ8;c6eP-UFf2*R)NU1R*3xeclhN_3ml2AqjKv`<V6geLxEg
za-Z;G4)xm6)|$q167H+1H=XM@QDJrqH-7zkD#6z44sO7{y1P2tawAs@)uqttj)2gt
zrLT@TH&#=pg2GIi`6e^`iOcizciT|TCIYH=Tuk$_P5{K}lDBsGhbGz!sQ&<GxSRUZ
zq&xnh`_3KQYeV@;htYNEUxi5<Gcu2i3#7HAPd24ae|Tb!I7aWej|RVRSKDq^l=wf2
z&chMv|BvIx;gE<BIip<JGNL=2Rc6_<D0|D^^AJhrtduxMvSmd^WQDWIEc0~7*?VMu
zf1lr9;M{%gbD#I?`FcJcf4=E>K1(xi&3v5o_G5lyL&L{<g|7ok^Xj%*cRs#>?S-!|
zoZl;qehcH)g+o#1Q8|;%Wk07?`}#N<;GEqMfIlm0R~V6gP#Gi2r^dn>{_0wz$t7>k
zAz5Z$%QfiD^Vy9sv4V1}JzE>%Uc=siZyUE40APOJzj{y7={M|EvF!sd5C_a}d#XUJ
zApOTci3l~wi678^ZXR5ktja-NU!7z(O-V+j2)6wWIT}K2Za?dOAdVmBt>S$v)-1H^
zfB$jEx@Xy~dQ0ou1G>ihvjB{a?WyyQsLdaP$2kO2Y6uSsBWX2=|Cs}R;XFMq_gw@p
z`hb4*HugVInLHjb3}rYCH9PR!dE0sI-*DS|#ajY?{T|UoYM+YFSFuir_DVh4jW0vz
zvI%(q!fEjhn=DkjmonaFc0Y4V%suKV-NpP)gFV+rZ45-gaP`P}<*vR8Ke%7%&0$6N
z5Fnv_k~l{FAL#Aw0dc;`w!-h7`<ErR#DshT)_yOtqv^_Hy*qu~pQ*0?QNSLpgl0w$
z3EA>CQaMF?A8XWUgyAMer!D%cigqeEq?vRV(t)l^aUK=s{=4{yBN`PVWo4;I&+RAn
zIAiqTK}lX+Xm5lDg;@&TP(FgK43fgtM12x96SHtw=$i6^%d=+a%MGtB<@0~Mv98}e
zPZm$!W#^|x?5>15mYA2_-};JW@Y3McBG^@xtHsIsHeWMHid<E;6kTLq3Lc_x<W>*0
z%ROJEO%bP=uziJ1l|%=ej*nV=w%H6N)C58q=fAz&WjB=a9g;ubIR6m~8tIO_%l)eu
z>O>}EiV{Y~W;GkvEI5aO{z8u4s>$Z&TZ_w!xFh|iJ-xh(leMa~uI%iz3G}ID!{Ak%
zGgX{r>Cem8G&iz07k2OFv1~@YxaJiDl2vry&1^hNx09G1(jEIv92qYc*&ZmSv`af6
z^ZeY+wYwQa>eSg2w5%J^!t0)om$-S#+nAq!eq|8tyN-*_Ypla8Yq0-u5T<ij(?uxO
zrcBSO7f7Q1z`#Qb0fQiC+KjH=pEcq0xkAXG?Z-mjcyF`VL#fG}+?Tb3+iuZPS{qDC
zR=`BnG<D6QwquckAL+Y?6Qt}<9pwpH2U3J*c?m)SypooH{X5|NY`pHwCgW=UYYt>Q
z??p&+5_R*&ujoD%_tTp${*)FOMTsT`C_~V+9*mfhS+TDpu+7IH-NuhTGmc(e4zNk~
zUGJ702|Zi>uxTLdK19oH9R6!qW!=o{X0;`LU-u&e1>u0dE@W)6p~*~grr5l3UN_{F
zQQBxmk9<qAsm=`d`;eS8l)c;+>Cb}cPn=6?wd#Ha5~qv}rlGH%zERS9`7KzXq(JP}
z3`R=B%Bo!d+P5a|l`Gml<}BWrg%1T<M;XTv=dtGdQ85R+eI*k2jbV@O^NYl!hC^I&
z67&lD*T<Fs&)sM#9SQ=(9O*uc^K;?CRT7$6dw4zu@Iw85DJ40Zt?ztBMd%-~{(i@x
zTpqyMJkbM=<?9pF_9#h1UHd-`xCVv&F)*8pXCSJ$$gAB`H)ND@;)|i$EmKt^&e;V?
za)qy{L#AVtp?GYAwH)At^3~iEuA(rvkEQwY@%H?ULOm6%5hX0iOD#<-X2c(4Y&h&_
z@4^-Lf*$bW`3^Gdm)Rm%!R^Gfb<Fs`qrNU0BqM}_5(V3LbhFk|ptfW(8ZEQ@63;&R
z1f%qd%uBwnBd4)f4d?x7DqevOxb*%h$-DLrdYSF5%u0N!9JB~t;``vCu2(-=d4l0v
zX!3;cH=c{gjsB@jw@>p6O|G87zxc>qeZKCpxj4@+(vS=in?fQ(43+IQJnx*BZhZC>
zU^wB}OnG)Ee{SiKZ~f9OrDs~3xVfnfe8g7&3>)K#K^?S)2hfXK>oGgG8$MuDh*_Q8
z)nTlWrUSss!W6h{ts>3{oofE$S?`pT`HwDQV?Ar1-xFa@nEb<BI<XFUDJde9W=*3J
zuU)nGPEobR<a-*%TlFGup0WsGhk?M?(@ZuO6Z0JSQ}!82IhFv^E?xBmo`foDwc07<
z+sg}lIg9b$1U7fG%V&M#2+{c@Mqt7PXo2na+9Na4hK3k})^veFSjN2U>j8~vrD;yS
z&=6z!INBt6bz1J3`RrTwXhsvX_+)kA>%d1{`b+Ch%d#a45q`ik|BeDYgY4!}xAsOs
zTCMh{D`?}d@Th~xp8WrTDs>V`F~<x1P%kFeWIcXuel-#{#}!l}k_K=G^eHwF=Vhw$
zp3=t{ybXCI<&upeD(vgv-abYbap~{+z?lHKQa=R-Hmm=QQ0XPzx4_4~fD8_kbsi#Y
ztI+{HTgcZxH1}2M9NIljSjP~-*UFf&B#bk~SzR5mq45OioujQaoBx*<V{g+?&qvX=
zJ}BH{1Lw!R&53mVFfjX+L;%syFzSHBhehe=`mN9QSA;2x9FJhKifg+`u5XtZIOC3x
z@>r)a8F^vP>3{3PyboG{%$p4sWk+ySRkYI9M4>rh?Zdjk7p|&?T6L+V6x+Rc&!s2t
zHfYqXKEON<b7`U3<x8@`?f6JnjKrwG`zDp)T?X=ral(MbF~6u@k0c&^Vti?7KneA*
zjo2aPjE~Sfw7A@l6y0p&uK*pa8hbwad;x{t|9EvxF@txg?qhZizrgC4(z9siD}v%0
zXBv&Hncz3yYn}Pn*JQUGg_Vawam^7jgIZ4CNhbzL$<{ZZEE<qc!%HtdAhUY;Ow;&N
zYW>^Sdy8-WVVQq4oxcSJuWug~dx1L?R2F}Ge7TcAu(ys5t>(|I%=X`=Y@3c&s8(a)
zqc1K)0S5&u*Rz)8cGx#hL7SvI@jaFSP&=9B%;C6OjUP?#_X!Pc=8}%^GT2YEuNm>Z
zN;}am>$hfO7(n{QBoZ(=ar5A%yU&qr>tP1J0vK60V-ij|&*k_mh52QJ`9Y^X5$Rdt
zA4$ng=^CQ?`%yEk|Hgf8TXJ@;D)OXr3nWfdDVn%f=ovh(%dulMe3`E0y%!DH$ytB)
z%<<!Q>tN+J7SM@TNQn1y<7avUb}4b!$RN8N;<;;TwKl)s4_Q?cJ5#D?l{O-z5xW0;
zF1t*2knGZ}2Q__}N1OgMfDG54izu3|V^`&Txu29lV=bAoIr%MGbWSs&Vi60*gzQhZ
zDz*{|d233~!!ADhJ8!(S`(QFMvi9A}p+Dt@RCfc_(o|A;#H;C9+T>^i_X)ft-_4@<
z+2mh|ekmy_rCojo<|I`nU)_Axw6}K+zPsd*zY)x`e)8N+n4VV>uzwA+cVYlo89ghJ
z=@F-wgU=2^D$=PZexg+OAo9CYtsIyBCxd4}=TuGq=+2(3-=s-@S)=m<yO!y*si+@E
zct6c_CYF*^7&=uG(Z>UC9?NI{U;(xkwnJ0OpB`1xr;@TiE*mvFI7Upb^nFbe#a2i)
z5MyR|8Y^1*^<cs6iuxfG7^dP1aQkstsf9|+K69(EUPNSeDCVtex6apV1U`8^-?1^C
z!XNN%vX7aF%k+~tlZIqlNnEqvLB&@Q^YcO>K*0h0c08-O+9XR0aqfjN(uBJiPL6jz
zfVr<k0_fNz?ePiqu23$s?|`2BhdNCpg@xBMDs+$6m*J&iCCfu1qKw_^WT3C_fjf}r
zHVzvAxmww-3M`7>k#pufB=-<G2(C7r)_8N=Q=qF&A}ndZm@3QNzL)_lDd7~9GLY*2
zySzW+X8s80CO)Dr)wu_$muYnKh|;<fz1>UZBv<1L!0hwArb-WJIhe5r#9Z#urzRiK
zztGstD;xx@Q_MoEioRx8`w~i70Ez=`5590t`V-x@c7>3(y=jU{*kZ4bN_qM)Wej>D
zbi}OPSD`z%AjIdC6fx)8Ia;d8V)DX_6IvG%!4|@lL6x**aFVuac1@6$^f=lEhMEcS
zjk%PGK>QR^{bcUnMx-n>-m`N^AM!r&zi>4=^5qnKVB?E>6|UF-?3O*_K&ufr#HIu|
zI0?S%M#1#TsT=Qw12+%&zv;d7<U;Jv#`4FmP~feM3|p>vK8*SejNp@Cl^Jb3zt@Kq
zOyX^6MC<!8ul%4qh1sHgX3M<dK63u&LY#fw612m1lPI>oZ*-R!mBHIAJ|X&qt6$;V
zK@co%e967;M7m9s^6;ojn(6j7Uo1DI9HbjXdMC{d<V6KfQWEoVjB=+;KV=v!?0Rf{
z+xY-k9-HLLYIh|;Zdr8NWvD**7W#fh*d`d3V+H(Fb*Hivl|W;<h0uFn>7=`7fd{sj
zACfQFthF(6mB{d2WtP12uFqhB=r;dhoB4tszl-H7A`G$6-H{06xK%A<lUr~OXli6`
zVb5cJ_|R?#(0E#@qAIJQLiC&w3#D`Vu%pple{5%+6qq+3Q|TJ{x6gK3gGT_0%F~QD
z>{_%A+>+fv!>kkv`jl;0Yu_lq+~M*-3jhwzhA^!@*&otwgCM$tz~|nEv{bL1Ocjz5
zqzfc9NaU6{38V=<Wm3V16#fzn-@r3Fs2&Z!0G^1<4Y<y~JdN8(F5*UT^7)nUAQJ|(
zzvgW1LB{S=sHC#<HggUy9Teq@-WCG}B;I%e<lD1bTGY~bwKc_WJX4ll5C|CUyE&fI
zfs!UsU+QzEM5Ucy2qRdY(sXr?AmuJZwC5j~(0Mi4JIsdeMW&13_h}v;f@4x<c0W<P
zx_>UQZ^S_&qTqi^W`A4sixgX4%YV;Jhm?N)Xlp>5z_d+qDT6Wo;Dmqz2L=$g-0|OZ
z)Y9@VzSJif?IZwg_Ij^E!*u7}b){`qJ28|7@TJQ<B*jQ>!^qy<UO@a(TNkYr(?`L-
zb&5VbEb-ca^qn4e%plbvshSVjI`X^}^Lc)pnGGo_Tx2yr_=}V>2)1EB8<z?f4d(cw
zaoIW%?+0Dzi+T#)^5px0?8<$=u3UQ&wMPJKx^^+x9XFxT=kb2O&VQZz0IM`^fLA+^
z$?xT>yN*<X&r3fZuX$;%|1%>?U-t0UR&GoY>B3CTWdBt@-?^Bm?OwbyCVnUOiU`y*
zQMXr$ZZYMx;^D=obsn0!<~i1Qj;f9d2>3L@g!mm;)qc+I3^Sq%jX!xy-NWC|<vrf6
zwpQyT^F+AiHDRGG=b!lSX7CRCmJ-e7Zydwx?hrrT#t+YbDOXSEGlXsPD7;C!I1?D3
z+P<;z131*1TqG#DZi_tLQF{BbHt{8DVR3;?YPG&SX(#tx{1U!YK3s%2oWNV{6r*70
zz8!9#FnX6lb3%&~4vRYd+bXIEk8BrIkS`Yf(88-_(_qkYBmNpIvGO>orx#JcIa##)
z#;}A}`s^-b_>Bj@zjFq}%#?wH$A^}%TsAPIyGjeL0)}r^ox>eTNv%6Zk-r5D-U3XA
zU8;GJopB1z119#ewQKGW`P<pOnLMw;$}wkdhy6zp09+l_0uI7mDqX#th`2eScympg
zjZ0to6qf`mK;g4kf~)U^_416!ee)Z`tE`G~)_O~ZAek08bNX++P46M|e^aJPyIOXe
z+=7%hW7{GA-R`hT%%plD`cLPt&W+AYzt!&|KW=Yv758jsqc!nf$}$Ug62G#nH(c+v
zT7Uj#!PxJvX`~EndJfOQ0WYe}alZ37_C<SjraMaQmV*GA^vzf!Sc5j=bvfwyUZ+s}
zZ;5Vzt+zQ@CMr}b&z!2uj%zU32lo<g-n=F4$mY(70Q5ByP3n8<!Ry<G6t@gFJC2SH
zOH$cq_CZ*uW%9XF`fXU)Cp)y0V#{x!%Gz$>vIijLU3SyB-gBvROOGdD3>l@oV@4us
ztJTq3)*M7Axdd5EiMTD^q3T6JoG(g#W%zS<n4{|v{jDVnP6AMU9N908Vh!pifkJ>S
z#5Y&#B)0l7THreQ<+2SEULnV;vxj9=c)EdnNpR8=U`#Xm#@rpkL9Vn~+E!+(>noK-
zb$X{=2sPcIw&$}`3L+LfQ)zgq?-NAcgW`~@_72P`N*qLmfLwY*^--lB2|YUu?p><L
z`(8+^UXgaTT@s~~g{V{@MK`1O6NfffcH{bxT<8e3wa-UTTC_R&poGd$DvD3|laDbD
zzNI6XAnMBHHR~mxW7U_Z;xEt6lFk+1e~b^)r);J=uWQ2vvY(!Y3zgq~cd-gO=tX*O
z8}_~7HA<^rW~F`a<s|aWyA3I=%+|c3>YiBL#xUnQpXSX+MTR*k=3ImX#|AxRt6qzN
z6d5VknWOw+Xb;3TCNdkOb(>m$D53F^4Uqgkno>8TudMZ-hCrr2`;g;cP74AM05oGr
zF;|P}#1*Y8vu)ipeJh2%+D7J3fD$5%M=p&c+`lsFN@973XUDckrjhTK0GhYmj?C>2
z`jQkWdEfIDN^}-%mLC=s3!KS;Q%8}4feJ_Z0+hIXsQ8YA?#1S!15|RJFkH9>Kb2rN
zIf?4AZEWKPXhr;U*M(+jhk?i%S&H_p(f(CTt7ogyfe8u892YN+wO9iA<_u@{XY-@k
zRcf)^vuW7W(Bp&iVo)OUTi%T5^DS--y$EFK)5*IUnvJV?%cBcd{cbK_Xt0;A88{6O
zGE_^J?J@V^qViF!rO?{URija5B~)?;lYqxfW4^`|ngQ+sE*xm}u~*rRfvgDAS*^{K
z-r~fuzI94`ETLMU_!#)#?$D1)nixK2F=rXfDI%J*jCkB-R;N`{5VoTVfE{mzuZ?e0
ze^*FiNWu#AuLSidl}o|uM3%eJ=pZge5KqIF=Jw+rI-8Fl8Cju{Lt{x(JmYAo4pYt*
zb=scuA;zm_4H+kKtY@v^@!WU;frFyYYOICuIy9OxN0uq<)UK+KDoKHSe2aq2mllPO
zxL7N(yZ;}k$tR)oN-S6PxZvS%`4h)in#FtR^bL2^gMoM7woFt~iUw74W4(!9uM%8-
zmzo^(o9#_^$oUU*oR{20sP$xZ#z<e00*QrbtcaI1HoY}3Se^JKH+EY7^zxgw&ZCb!
zaCWVy#wc2aoEPd+I#+WAQnti*q4qX<157JA4}D#j{o}87o(~R5cY_3Q6Ku`b@jfRe
zoFFzBi2zI^4#$_A_O%+`g1`gT*OT=6io!?OUR8SX3DqXf1bmGF3b%*hFCIoOKA_>e
zk__Rl-ZmbX{6Zz%r#JswlXP~$#7cbW(N}P^-!m88$c-ne&QfFFMlC(f1#Y*xtmxyz
z!!EsBDcZqpm6lOsI4Py!(NsHDhtG`sn;7ZCFTw2HE(09_0?8!}JCKM_3Y{j3+UIv;
z4eaG9sDDUE8yi0A=X2~1D6LdD#YS+jVUs*c=WVF<?UJ%^MHR>rwQ)~@GzMq;?xz`c
z0#)ldzD9#yqFJFU;9%jcf(G&mwW8pFS9P}TIjPJim<;e%w9}t~Z+G!1OnJXY=*u(d
z&K{O*Ju&E{ZmvdnrenOLuxV|u(NTi2)Z?2m!XPXZaLfml{tCyr71#%=sbB+$0R1c9
zFICM1{U!&2e8-Hn=4qW8jTgg~V6NqEQRl-@l6bx0(d;a1*KeCO>aEV`YJV;Y%WF)&
zhsB@c5DP;YD7p^yqFhkmm%jqI^<H%r;q#&MP0mexm~Vpk&1t%xM)RGr{(6|u!ST7E
zZkzKaBiTch90NR7rya`p+^;pCcy5vp3!B|)>+N#-@Y)&kK-3=Ql$ZF!3j#G+yxP}Y
zM$^Hhg7Z#VcHN>0C}69t+DI18=vKCiJzZ{?J7#{aA=VUAOWJQYA?>eDH?7(>24z|#
z7dI?Ld@hvRy>NRw?#>#QT-Vh-z|<T$<c6rob7G6kpPrukF;FC2xrgOFbV?b+>5AOG
zv<PLj$oe`HD9#LlF(P=av{(HH5sqKuBJUUL-wxc;4(snF7V*Y<)l0PGy@h>|ZG=lf
zQ<VuJSf=6CglGp5&SS%lLF9op+1+hvLm{Moepn!C)0lcT%9wIjZs$hD=xj>Pi|i27
z59voPS8E;WEpvnd?MWcG3DgN09&|vKodyfyI3C~bI_5+HHf-d@t_rS+Jul&LLvN~{
zB$Vef99+_lj}Q?TENX1_s_Y(%1>kPM0!fu@wnAaGa||z+P73b?4iBTRC)r$tuWkQv
zxY6-|S3W0M1LZ>#!ekW!u>m$ORd?m6_I6O#K9a)&@__}Rx9+@i8t7*g6BO8r|7VFo
zt`%&jv(45szfTjZS76ZOVBq<~9VAfyL%m8V&1>w&L%KUX_yML8yvk%M^JBd@yU-(n
z0qtuI(+D_;SkhY(F<K?`C_$&9h}^AWA}}+B>=v=p3eNrE_VKQWaN5oHYfV#B#Nu-u
zC$4YN{$H8C|9PCkUl=wa;LQ(j6PPKWRr9OI03qDsE0sK{_YZs8W|deZPyT)rBS-l)
z{6>-FrJ*mCWI<M@$RUlrlKUgy3kz&S``85TU8!!PSG}HgU`?^vEpq#D`U9(#*Y*L$
zWBiO-c5Uu<l?oyH$r~o$xg3MhshqbRn78EP?XpR`u}4IOGsiEhK5gvsuLPuDi(n5B
z!vY)vcR%6W9;s(e-p%mX8|mq!)L`hWG{PQiYul$HDK#sU<6nz06T)8c1aC-c{}t;z
zHkd81TM8PX(N}>*KM2cp;yhe8*%W_L7sUy0W9R~2*a`y5>-(gkL9=|5oR}YwOc#hv
z?9=P>l8f0M4>hsCTj+>8W?UYo-%dmgEo5A88-`H|SzakCoe_N?NGJJ9tRX2oAypSX
z+$z8=_!WyxjV=ge4F-oVLHNKk=f}mL_9)I2nXld5$@1#r<@Y5PdMQ&)z)f04ZOu$z
z%#^WYSioj1KJr;vRHMJoot)k=)jQvXOB0*xexW^1Ln8bcYNoqv+49YN@1@_2s%7s;
ziy2QzJKr^74?ildf8ics!STqBFS%6^0YR6Na3|}=TVi}QKN7YUohYwvQa$ebkOlVM
z@<yMHP_Go??x-h!Efv~VXt}~lUdCHTo=&*_;dirl%TBO2x<wT5Qm{Ys(UsdZ7JFVd
ze09U4wF!|35#`+-_8xS<GlBI|@8`q>B&s}b57_EkTA+eD<*oqKVcOf@Kj>iKV^mVh
zI)A{<1bYA$`2A#4(&g=!IMw-Qd#a4Dkqrn?0&YzUwjZqljlRXju4>LMDj{#ru>W){
z{70%=o@VfaRJ=26bL}$<LVRd_BQUVWDm<Z^lhu-iN;!N4#Mejwz9#n9hQB(bIcts&
zu==9?LC32mpWbT{T@v8Q5+>Ad?x5(I?9MH59d)8%@da-RA|A_WC4JPLbwd6KR?J@I
z6Pea=EWcl9C8qqQ4&xJi5q!95de2mT5IH*ebRuKXm~b^WS+b4zX-m)YR4`N|p8dWD
z@0Zr#tYsKB07?iKx{77~LzkZPp&mTcS0kY$2=Yz3Y%P$dNZtQpai`g5N!e5%F(k!G
zaXzdv=w|VdYkDz8s;6S8ZF3q%bj6A*T75ujl1zd&@!0Kv1{JC-%*bO_5IS@}VJdTr
zbK~J$=i9SiP5lDGpOm>8z%UYVXG4dMBJoZ$uXCW+0}pC5G*eiTyR~tk;gvTEA1K<4
zc&2*v1GYAgQM2&l)6snNUX`&BC+E-l0WJ9u|IIG_`rlL1(@jLbYMOV6uLRqt8+!4T
zx~<RjtYxMVw{N>WjSQ~2dT&n9E0CI#4}=Wva(crqeH6Z7GJY>3Kl&dh;>dkJ0aacz
zH;{TiwNO(9h2RxxACeE9SifTKIQ?4W=8{CN<Q>i7sj;F8!6)>Uc6YkkqlHFUf4A6d
zU5lh0(zPf#omjVUU`YMbUH+45E>1r3&1<ACoSd@ZCeV*wn4OjD8GX#}kP~ZZZ4FX~
zKrh_#*!N|cN<CblsRP@n(8Cqh@X$+JW!o9Guc1k`fO3rGI_@!wLXE@-QJ~bie>6d8
zl-6;UD!A;ep;oqrR1RV!hotAr)Sx(fvzp$F3DxNQP1^<mmqP@BTqwNx<13Qryh2@T
z#&WW;IwX5ffwUMzI)q_D49Dp+vE^4g-S`zE0%)WlU^u~#e6U<GEjBLvtNA4iT@>2e
zri=iuQEX3_TnV<PT=y8S^Y8C5-g19$$*9c1**g?oYVpHzm`if@%YPt|MykD^0t*Kv
zIv$Y!eqG{U=t;I%GUXOtAK@9d#xQXY%9xz=0wizWs@0gZ1WuJ(*D)s>IubT?=_dyV
zm9T%?yG0$mH4E(v*UnvcNxRd)^mMdB=5Zqo-q#TujakY-<uYn17<x=s?JH5W68>)g
z6Xd!a`VUmI7t#M8h_MnlaR0rUKeEO|mGh(e7i&B@ZRu8e#TAZZ+)R&xV`~ie&GzY~
z98QY3=Sfh%<sZjKtrvwYw<7-V)_TTYD*U^A`r@VSMN5}Ee(774`t9jC$!R!hNb)@_
zbKi<_)hFH{A+fbnJ(Q6`X0M@iD}VO8pMt246GD2VSuzhv66pQ298GhLj0F!N_yAR&
zna&Rj<-L>8G5LhVTm}*-oKem!`=8_Fb45vSkBVVQ6E1baLmv%2gBOR3<%%n_3L&Wq
z22a!<c-KP-oA5Rnw5<c1z2E75EpJIww>CqSzb)%^luGZgs>q5JwR7Oq*v})KEQ6?r
z%tMrWTt$_Ip=KY0%ye-Utu>DbFot=jfoly^FTH$Yj)M*>Yg?Fubh~Ht6O88+cNU*L
z5n;n0n?<WjPVH5cddU`X;d+5F2gE`_o4&!C?H!Rn3cEl2?1JLr{o(bzpn~RmLBpik
zdwq@5xq#&)5^I+7PebJ!CG7nj!?rDt2h?~#)`T~D(UkW`EpI*G!>`10hG;ea0|+u)
zLhe##PRFMyJK0o8BX86eV-h`A_4F%82yp5w0)W`{pGKc~1WEvLfm~$LWX%EM<+mSl
zQwAuhFTW@$_oIInaqE>-%=haguo@1@*^~AdBPlWun8!a)eB4=8vmda3-%XH1A(M*P
z@>%9S*vH1?q^IjCcpE<Ez}UdlQi9j#YwNnGRMqIs_nYeUkV2VaG-@8~cWGhhgBOyi
z5e@lnTB(LTHz3O*=;~A6@@J`kMdD3o2A>0xoi=3T2N`P(rL@MnJrH8c_rjS&tk%Im
z;Q5#4!y%zAaqIM!o(If{1OG_L-un@?bpd-KoN{sSSq+5<lx;1mddkub9!JJwLpr>!
zGfiAq(?*}7A)d4SG$b<dS==A~cXA+mC84X`6q~6or@mRXqtx@A_L97QX}E9PjSJr2
zNs<C$Q7Gxd^)4{Pg|DAu>JEx(f2{SH9jvA&nm=*ySY-`F+Fji=)RX_Zl>+bKGUGmD
zh_IiGzSc`F-8j)E?1cCc(g4@imqah602m#{M-KueQKW_jmPzqB)7NazwQmHUuQGUb
zLvWyt&QRXS{Xz4G)d7b_$0|_91JL^{Yqfey;bU6w9M`b_K+X=N^F~t0so&=Tj8Iq}
z=Nqzj+wpQiuy$uK#}lmo@F<G^j1~i8J0W||O$n^$jAs05OnLd2^95_P7ZX5rnRsTF
zA`NF~M?H^0M=CC-@+xXZ&!9dlU|uh*D&I_fR4qX&;lCQ~1=^xp&umEfc~-Td39ZxX
zlUz4J3-Vb#Smx@6*d<M2YA3A=(yw8wW)`A0T$69ymF)9%=AzmZz+DL6rIQn7*_@ku
zN8DrMF7N!RY0aety!%Bhp%Y}ykAW5?ws<Nm58&VlaeV7cB_eA23coD5ah=PIcj!}%
z5Nj5Zk6Z%zq_Dq&C>(T6OS!_XuWJv2wjiK5Wn%8O(PP(NLYbl(9M5Nz+m)UvwAG5I
zaD`Yy$=+~ap|EfF`?4h>fI)?WFQ9nycdQn3punztvLxR1+f6l2+MbyV64o1yxlA`}
zxc>Ot_{=B446Zm8svMy5RZgG=rVq_R#3=wcfXFwGXD;U8iWm5_CgplV+}@P_M-b2J
z1!Q<>qbWhv9=%A36(Y3wo|xtuC(@bBo2RuwWS$q|JYrxBALSVpv7xs4_3;k<2qG$@
z2bzZap*LE5#Zxlz3N_yzuwuqkyyg=9_W_5y9Tl#lCdbcSZ6G$jd$H}fZ1as(pW2G=
zRLrS?7cBART)fH{N<&{U2IDfw5clX&&)lC7f4mIXLSCDH{--Mu{4c4R$R;l{*c>hB
zBaOxpfkaH15jWhQ3<~BB_nkT4*S{b6<6@Bmyvw<5%D4fs{X<T<5Egl_$ES#B>keT7
zbZVLMarJ*i2~oJ5$wKM;!L-(3K9(Y6Bz?)vdaho1j27SZ1KxrsAG|wn3ch<kd?&;y
z$x0i9v$;=ON$0-zSs~n6)5G?acBcelG2}u=<sSCU^4H{2-C-kKQO<5j?zn12Cw<$F
z%6i)RB#O6r@T}09mAlIu<C5A7vsaZRr{RI?;G+m6GD~F62+#@u@Jqv>3eFDi=&l})
z-a(K{uTK}3%dF;X=YF?$Le!PA#0Dq<O~jn6pBTOJ>UcdUws&B{-42MFz6l3cb(G!Q
z(Xz#ZTgl37ErY?-lPf5}pUV&^?--l-k-y^y*j>rmw6uSA35|Egv{0Q<V^PDrL>)y7
zo8wIaV~oH)x6(~eiRjkL4wB8K(ZxoNo?b`_v+WDkSU43q_po=(<&o^X;SE1M(d-0`
z0j=$s-4faM;5|yp++jc&CX<hXwgvIeEEl*nY$huhychLN_3jRj99}g1NnLBmNg~^N
z=p#cIUCLOV%#fg1?l}-JkI<(Y)oe<c1rG&ang5M*6@FKDv}VPk;3v+`AGUfpaC$u1
z8e@Csu8VK`UJnk@D4T4B`sdQ)RPzhk#TppM^=#ML03-;B(l=>8v#v2leu}@!qm{gH
zVoYfxFDsc63nXa4Yat_4xix|*Jz(UXPh_Ezk!C5*hT`?yTzh*y%Sq6am(Pi5IH7g!
z@7ZsUGY%E!de?D+6f3OPziAjmGu@x0jhyrs5WwyO7gurJBks?Ab;uy9%W$C>s&uLp
ztoKkv(I^VWf<L~_=ftUiJvB}OVjxT5PABg`1>fKF<&E4)s;sAhB~aOJ{Q%5IZbm`M
z0mGNW?<8aD18uNIM}O}s32k=kaj$(b-4moQPb$|Eb)1*vrNY6Fj&rGe*pwfEl3x5f
z{|}U{O4Zc-GY$qN9TXJ@Ton<5G%+gOS~YosHh6e%0IB#6wE5-pK#GZFVw0HyQ@Lv0
zvPvyuQ5r6TyY=+Y1$XTV3ujg-2EVg<I&v#93qZ(w_J!D{Dx0Mu_&K?BX=o3?^|^yK
zvrqBTA3+pJ@=~G4gvdmH5#iDekmUOM*vVwr>dKri4&M8zEUH^P&Gl9AA4sLb?)HfZ
zf8K9P`QZL&ynIqv0Pkdzkw*&R<8SN{_o+8tJ9>HkflaeiR1fz_K@W;}XOy}Y=c-7c
z@ygb#Um7h;ptC<|<2&TLzEBuc5%qy3W0Sa=hT{OiPmR4_Kdh!ewyj5p{w+$T34hxg
zFCUEE)0F_7uX{|`IloR-X*+p>#h#9v`Bc4O3lD;DAgi_5J|%xu9Vko6sC<G8I^-^W
z=Y9ZI;cQN66-mRx5j^whxmmY-q2anx^WQS6$;>tEAZza!+&6Cywx1w4v9;ATS4kj}
zP`*%euEf&9*tM&nULQE209Wm^g?`Kb0#3u|j?ze;*H{gI=%{3oO(}cmuF$qB`1C<E
zh-x28It4o1)0J<}rHlSGb%cC~mANCvSYjiS*fzxUK`Pyv4(b(>a4DfEdwy>!0utsv
zaZXWO_Q>7ynTU&p$oISQpZ)nOjDaPS7p98YnVIlviJE04-xivnXl^Ur*q>5Tr6d-L
zZs{Hb96o$dS#^N02y%|w{4=DXdmc~;tXciB>fShVb2>r=KX2-u`=>xmyY#jySG+oL
zbuNz<C92%d^KpAv<{RDIO`{J+lVamvR3Gqr1lrg8$WL}PIG}0hmEj_I0R=xYM&u?Z
zi_y1)bG&0@`ODv3Fo&m10lbD9|4hlMvlHwaKkZ#_12%+<D&f;-c_q>m`(C*Kc$L^F
zLlJGU@=O3OFPGG`5VfuQvb4nQ{Y)}A3Y(G?26E=;EkeuwZW{<9v3PGjYth_$A6&qf
zD*gX1!emi93qEZxxu{`%P*Fu@W;;17D$3G{TmI5S3v@2JcV8Zwm`fsE2eyH|79276
zlPW?gVc1BV>*ipo29KG19dYRpDNo)n{Z*2>7)B@`@$c<{?qbrza&?>yy&SMi>B@-X
z3lUTKbfaX&EuT4w(4#K1n$-K&O#xe^v%_<0ONUyq2C5;S8<l#V1?CKI95U?$XR4wl
zymXn$=_`l>j!^HOZe+L6S;xcH?EDmz+}MWg@0-Dm9O5b*_@an$&}M%!Meo5;iOCC9
z6U`GXNBoL#o^TC&(y~%e)MbcCLk4h3^6ekyLUfLmeIScN0Dm1PY}=@VXDIc?0QFcF
z1}{3&)`0@1_AQ?>RZJj!b^QPS6pHm_e4OfMCBG1gb<I!@r}g(UN&kUN%mPx9`jc!h
z)DQR7_GEX=ck%-O?5azALUxa`C>(;r{U}NEn5C?L*vozS?h#wCGH9!F7kJveEDfZW
z%J+@7XocD#TY=i#9O;owtcloO2pN1gGd`A69qi<-aOp2={U%w_M*_He%7A8{N5@SE
zffw#m*vHMAZ41GTe&ggK?#J_Pr8Fd~k}hVCmC}VjbaSGFum?Tha~*!bl1VzvS$3v;
zBno}h;GRmiJysxV{yu;!zMG)DWgKv7tlMHC^p<a{XLGabscn0&RkIHx;{1mo1+5u}
zNDb8%$d8vqpJGEhD9i%hfmE+QVJ_i$n2j$v1S^h{O+~NOKkNp!?La<PtG?cjqyEmj
ztfN}FT&z6%ABbH;FZVpu_|kBwVU|&z+`3m<Wzi%)+IcOK#~B3E#5oPtdSgB+>5dQn
z2WtLZg7SfQA1ZzmErjP%N(8wxYAi!!__F-mVlckZ(wDwke0<FH40QaTK%|@@^plF`
zQB(l*TW%uHuFeW8X&2p{EB>IyzwbZLwQfWqm8yx0iZ`y2TWIKQ3LgiVWVKtmxc>nu
zy@0;7BAOOaC+r235|`F<3P8q~yR(;pw`fH$uep6qshfSF^@VhsTZocuh0%m;CMvQ3
zw_a62c*<XueY?UC!j2$VN>dAVZ!kFkdl}yH4)-LqeuoPhwP|)|mJG6yVg<lOyxHlm
zZ+TH1aSk8kGJLJ>>3SEw)yNylOHLTbdh%v@L5dtmUzCy)#^C+@{wEJxQ)`JI`%^p@
z@PfVXJ#&zHBdxNij#+2Zn!e`~icLPcO1%|K#ygBz5l`>F_2!)?Sf52Eh6YDj(7)md
zVe;_S*K!=18M!8j-_IwY{(S~`VGFOnt<zaIelt~RfTBqfcwW6o?SEJPMxI}9T0Blz
z%tU;#_E|HLLS<aO=D|*Fz4{)e!<+=#ZQI0}QZK~4T#9P$G~A5A=WY(#$<b{&2y5l^
zRK~Xwu#s#nkf8i?l?&{-PFawVvHBf>QSldZ8R+EvyWnVb*(&Q$jL52ItkRAd?>|Aa
z4YL1@*O4v@^sB&!av&eDS0VG3BeKRnJu&jF&}EVk7-t|oyWE<a=(LFW5b0&QCb-jv
z<$buifOKm=_dkONJ$^o$I;|#q{z?=jyIrY3VVT76_X2OnTh`Fj{yT63c*LZ3zetF5
z5waOM0RBW}Y}i9_urrU8$(RQiR|c&Jdy{mQ%3BceuKTa~qsf8PNB=yfq-3j*6R!=n
zt%mfv7yjLO{ZolYGWBma9q*m=6uk`Iia-WN>B;8nKdr7rdM5oYNVWPi)g6*Jl*q6+
z94AxwQoB9+Xm7bck67#8eChwiZAb~~xnk_v>jH~3Y5k!w+dzl~odvMTQbt?(@HG2K
zA5{Kacon&0-aRHx*dcFb6A~YGT(6;uWLb$n{w}fc!hShO1+lsel0UATNQ(XsR4dSC
zH7)QclI5IsH{$i*EOXwThVZ+4@~@)}ChjC^24#du#XP^i-eDo_Y;5=k*T}CUn&I21
z;X9eH4~)rDrOXyGQx;RS9N^s2YibXhPoprz3K7FDmQvniFiL}ezu54pC3Edd-b=v7
zU?Q1euff?zzKZ)-azssy>c5W7>8C_->~r4OLTP|G`40i&T_7z3y1%Dea~=0{w7^!^
z$n!-<fn<ZeJr^+JRl0Bm756MLWD)W9K$+4dP);MR4e#AM2=Aa<!i;lHOAgAr=Dk7?
zOBv~u0N*Y=Vc^OKVF(zbb$GrS-((N*hGC=O$dEKcs$`-N8jWHME<OqDmH-M_@LUQf
zw9UfRt+p|g-H;Tc-k3syr$Idj>}VahK^JIUuhagTOaa8OyaVFwo*5Xebxo)wtptbf
zFpTM$UscA)cZp%c{5@UY6Jtdqh_oh10G;Ft3VU;N(Mq(DyfAe?>TR_jlo7i>a<pj}
zu_ghg>0R^DIzGG*dZtYO1;_`T56GOiQ8&?lrK|)pOGj&ZH0W8qbNUkuU`-u8>T+Ho
zOiP-ka~AJy%`fz<jFeeF@3oAKZi1{CYJBu`g=yX|{w{7ah#KbSNq_lyKCC&eKX60X
z$ivPnzJClB${3tW%aBkp10tl(`h+G&yzBU&!QhRPC`ucycdb(Ae4$DcVaxQw#Ub_X
z$!ET6KjFxr|3C^O)P646@wYUn>KJu3z?JpuI-d8bdl3TI-GjfGe>IP<NodVYVU4&E
z6zr;<<SXO2S_%<uJ5G<HWj+Qw=;5Ua17=SoI3DqW(s!yr`Tc(H-YiQX&#X0Yp2$ys
zBDU1Ilm*{wC)bC7EFx#UVn<>{;s~T;@^to1T@FZiTb*J=N73)T83$9HqVb!0bDVYj
zTPp#$Ke_b#njGoIkentoQ;Ccji!ha=T1v0g$DkvUe>q6(lcO#AiX9d6aAj+OhNyk<
zUN6FshDldanU(ao$&r8HIyGP2PmJD^)4==te)e1yM`>x7z}!&Lb-t$~8*R*#Q5uCm
zVMFgF-PhokW}u{z#Nwp2_yn%GqkF906FG<#T6fbQIVit&=0yB%7-D*Om@i9qJmyjs
zSXz<1WD~Zqm=R3Wm?wg)?Q?d?<r2~pJd3|2!OkQB1o#_sKb2HiN`Klo8&VQ4Fa{mF
z9Ap_Vyxo(#*)6w8RvOE!VHnLjp=T}TaJ2cI>OyhN_`T|$0DV&(apaQQ*U%!Y%F+0F
zLAV#)3k^NfV#d{$V5?;5SVO5cC`+&aH>%X=S%350=eFv-2t0q0?#X7t`*T!F6G=pT
z<kc2GmMBm%OvJ#8hK@tE6Te`SfTCXnbW+=V@Ro>t3++aP`}MU*Dc{k;REGp+?$7cp
znpVn)-t|@dKmCGPhy@orwX#FlOGjjD8<Te8=V8Wy9@!If4o=++e1)2+xuNyb=8nL_
zX%im^--Cz4_m`YO%eIfNS252hsf=9uKcHl~kC*L;enMc;MIe)^KxsxaW0cFQb#a#~
zAm78ozaJS4-~5y`gQfMHeMagcofGaiW(~s;?oks#0QxHZfU@r=JCW*f#`haYx*;Ok
zQ2S-u?FlyRmIaB^{l27<HN8c%N6Echys(`D<Cv&11Tm+tW(hYrTkBn@t6Jh^E~MB$
zl{A&M35dbvtVJ6TSw6`{r9>zpaNG2ezLsmU1ts(v-N7Mo)s#S;N7b9E)y@ZwBXbZA
zzPzEW6It>=D5T^>?*AKgZF3$hnr))sw7(K74hJ2=1^AOHC!<FMt;Dq?6pb0=jueOx
z?D%65HbwW&*flPGG0ab-w0=9xQ6`quZGJK91<AWWy4>Sqs(lEOw+JFs!Cq1w;YW<b
z-ai$;obqdmhkU-KQAbh6((jCq#i%(@z)zwte7A)2C7HeYmtk)G*NU(VpoSrxn^6^t
zy};6eONwRuho$F#3^0iEvoT_-*Sx*(fE@N{SQ&!+ZUTEv^{D#Gr+5WimIf8Zb-<=b
zzZ&w!EG=3Kb^w;iSFX)-8BuVH)Az--2Olrjcy5kzIpEAy91(EDOw>3~Sc+gvc9^Zw
z2a(a$KpWlaSwSE?O;U446>IOK=aG|m)fvL<_p-32p(e%rgO#idepkR|6OB0}-{5*&
zD*m{pNd&>~5p?1`+!9o&)#7%q4ljam5S1LGj*R!kOtiUqhrd4!wa{mUou#PXkie;M
z4%1X$cS0)kU`m+hmag%*++gV3PiBIjj!*fhFwh=(z~=b&wbT3U{SJ8JTw_sb`oRS@
z%~i~4*eDF3$Ko&Y#R$t{LM6mU_-_ffJ(xYwdlH579<eK+vFx&V3aguwFFX0jm-?HJ
z#G<aj8!NT9Q_x{4<Z+Euj1a&m8J!w!ir*bK7~eqCDYUFM9KjJt;my7)O2QJwPxnw&
zvw;*?MmUl6m8~Ar$B@ZBT9YR^x_SoP(zqY%u9}4n*3IfL^X5rNQhJ14%pp%qLO;gI
zqVD_eQSMlW2u)?VOPIBn{3Lp6PqPH1NqowviLexhQymk((K0i`8*q~d2K0agYqSqS
zKFRa)oAqF%%+Jz+sL%5WY!NTp_2z~VoZy0InZeIV`jjAZ=}@PfC4KFV=}C^12=69Z
zGsx9w>2b!Eobo5HJZ2YwSnNeGgQ=RM8thu^8xi0;(R+0G<?9h6&ebk#jQU+JNYJj0
zcOwc9>@%6~_1^9x)qqB&(v=$-+K3*SZN#)L57CkKf?!|P0IT^E8}nKWEgy?yw}jp^
zL}k@Yvo}}D3O@6_x#22Ju19dgH-NbrIa6~nwt&Gt%_fN@u{{eaT%>0?(cfPpetXY0
zO-Wn@4UX0Aqb2W^rrl3-O}lun1R$s1o7dNKI?ea5X^Pc)qv=0Yi&?vrQ()t=v+QUt
zxm$|R)_&lqF8zlx?Jkb0<#(U&?o+!HtevQ0!K*VfrOvQ8EvTG?X39Ho_kL=K({D4G
zWIDjPF61@x31(e`tu|P=ThK+j^0@_LaHks8onLmt`ieDU5l;H4T(Fp^QJX^jbS{MN
zYs?8oN^7}XMbO!%E@cNHYHouCqck^DX3C#wZImbC|D<TGPz>w6Bh~53`B7$9P<?U#
zoI=cDsGhypQ<jpYOc~Mw#TZ(>XsQbo3L~gXG=k9=ZdpnCLCX?$$LKXK5K4OA3AR6c
zw_yCX+gk&F{-!v6V>JL4VHB<LB%1E1FoVm=y*^>fsqyJRBFDX@XkQ+6))bU9#_g`B
zk|pM$>#Iizb}%e~QuPuPaOqDU+mQG&Y>d9AucoiSytF&QTI*Z`d{}7Sd9*F|O1I;-
zCfW&V2a_PC%%?fiWg<)mE6np<8e(Y)f?z=LieZ$V+AGtyWVipwF=V39OSjgg)duFE
ztl4s8`Eznz_ykn)^6ma6s8V>A$@NxKL;Y9A7HjMLV5gY+;vp$-ttx1}@Z?x{fl0p0
z!=WBpurG+>um{BGI&g!rbPZ&k%Jwj^kFuIy7*56r>rnqqxRU<;&Z{qs970M>WcZfv
zu;RqkrNcbIxEmC8guL7n3j|pJ!b|ejy-?27+TtXB%%XpI+oJ=m@e?EgF*-P%u*lZ_
zOHiG8WW#Bjs2?Yg)Et5<N;|}Be-3@g-F$6kUVHd1_d7~+@vR6)?){i3?E;I(SM19g
z`|k0jb+g6Kh9k&n|9*Mhvv3_%@yUD@>yY>)p|tZA7v@1gFL9r(h*f%)Q>~xX@nvsf
zQ(amEi-e|KdK(0T-M1V_84e7;)8J^GMd=`W;x@J`aB$)3=Jva@a_IvThjY8rO!Q|^
z%*2~^rM`DoUSd6yAqvzE7?=E~f$=79o6#hYWj!2PO`>lQzkN+BP_C=t(=-ZHJlM_D
zq5(_mvVZ<qVEVF$U!0TuX@mh<l1~Uhgk6sgp&v<4B|d%_@an`a$gneyM1oq|)z`UZ
zfq6vA`um&v8Ns@3fS{p;PFT+dd)?GSal*xmx`^Vby16yTha-a9m9+_DG1p(qbja0y
z!iv+p8a0M=eQq>ZTc4^TeE%zaFU}|LF0b@8-=s))FE@D#m~Sszdws2$_^8IW^oL;s
z#FTa@IW;7lMpg8SfJLIJfuNcr4E-90vzRGD?g+aT?3cfiyqD>qpIi2lKBeMsC*Wrr
zS<Y*W6A8)-^-sKR%`4(iMMD|4K85u@HPK{vJNQWU-?;xfS_0o97X2QnI|4sPil|Kf
zu}%1ECaqT`+Qm3~zVJX7MKOC+%yWt?pkgl7!8pqQU_=asK*^k2u5YBI<Q~z#NzRdp
zaM1s#B&gU-o-g_s_3K%0!B;JBk59+nwH58^z3^9>05NCC%}*D3JS?NC0~-TnH-%uu
zqK{dSO&5qSY<us67Ms&wrF^%Rn4fvmchD`lz|mH|>Qq;4TCc&N#rHs2YgqB8Sldw{
z>c7#;uE(=IcyB5{w!5+w^C!#b)Nr7scQ?ZfVH<(n%_Ji_Q)RX^z%bmz`BPwLx_@Cu
zpQ3VIE^<R?2XAO|HLI&EXp!J9(xZO%7}D*F{xZtAAn;;g?8Z5((Gh;9e&fNJ=)W}L
zi*I60YZ5bD_n21qS*{+H!9_gjqlO-Y4TK5`e2e_xl-TS|<b7*(?VHjYoMLn8e<1Uz
zdrRYoT&oshqEk$bS-%<3jBVCtX&?W(|Hz!fnorkRmb~+O{y;i7b;}V<(N07LK`OOR
zul#&Qn>j0A6SiUe61qdd0kl!qU+=t6WOfi8?Do;Cpi?}zZF#-3h5LGo86+Dsz6HAH
zy}p1G=}1t>s3<IoJCOOB0%OtsXRy@W=HUAqBz+k^7|NFYZJY(q{p+Em!|y#%TeO#N
z8kPV|S$kK?+@I5v6jh}N=lRg+qDEjLm}K^SWm*$=p*DFpg=Xgt<m!9UZZCY>LdEhI
z|5!8E;%`!_Y+WLl1)R6VM{=U73n36L+z#Xy^<q1{yF97vX#Y&>g{8Ewg?e{|{n;7r
zPz}xtlhVu(Md#B{L0_%_<xVB~Gh%xSZ))F!xjJ!~D_g=VA4o<54PP5oU_)^D#a1Ta
z1~Qkj{Eh?@5W$sHD#tuo0Og2?NE7x)1TTZSG;&=|gKD%m|74u^nA`c_n#DuY5)Qep
z$Ol`?dvRQh(u^f_9<%-7Sn=zo$Jd^-O;Y}rjoy0bDaNA(Uu`=+s{CwQWnvoRg%)Jc
zB66&*i4c{pYG*Q*xp+x&1&KA(UrEEBp_g06Y5pF`Jhqlq<dCJ2J;Im!wXb+mI3`RB
zu~|T|?>A5We$Ira!ptLrY460TOCf=l;kwbRsAPNv?IFFoZitU-Xt*LmY4j7_D+GK^
zZ)&=@R&IWDkjuY!y3Kb6r<DEl&g0jw*n2ui-bv3s`HB$wJ_}2p{fzeg7Y;A0?(zU2
zO`8EwiD9eV-0OE79E>f|(LqSaRDrqe;2FN{w|6h`^z_VFO*KdIgExe0$UDhqW_R!j
z?5Rf|za3I_PxJIb4SaXOlQMhbK^1`!dlq86WZxI7@4L^UM+h#|v&DS06k3}*^&e8>
ze`1H`{F)VSiMf0Ss+wU?kWAGaQbq<1`>vYWKV|2u&ThL}q0&8jX<~ZA`S*!ZFy^`!
zCqGbmG`0EKnCi1H!4M-_K68=)LhTA#Zd-a4RVd|Hns)ujdQvH0`5tt6tSiSr{$cE_
z6afful%$2)kWIb`)pGfKGh5x4Y`yK|v7KD{ukBZBV?wVE0Xl%6rxV4~$ay0gYesXB
zoQYkPa6IGwxKrhept5N7Hwo!TiSQ6d6!WhE`vcCi+`tXJMdQD9*_M)gl%L{(+_K2E
z;ikF)b320^<M>MXq-w#X0|aWvEyr69Y_JlTSbj!##RUnVC=_gqY9GWWWO*n1&~oxc
zd|rJ9kg^%R3L5INX$^-(d^3HF8kL#cX|izLT2Vy#-z|GbpQh!W@|Ak}X`?_z2;-kJ
z9!rBZN_J>egLf?VKZWId&D_N2y^f+jVM7y2zjH%hj`HLltp8*DW@=4)H&b?6b2dU1
za#$Kz!+v7#qjF-&z!Sco(?3}ezi4cd1WK90GFcTkW(lx(VjM3(;HlQIv+<rQDcIB~
z)!YAp!hDczh~<wkg7AmLMt*Lu&(-j5A%3qfoEbfx1kY_uhSEhyqd()y)UvP^lrckL
zPwDhf`)GuY4gX=e<`!%h?Y#j}JOno;GPJ9bsTlU~jd+`3&JyaTV#>Jy^b!{BdqAEn
z)g?8-l<sGtV15wZMPusvCcPR3gX;|yK*To?O7GC@t8!C0!W~DqR7L&RldIXvIT1D7
zpEjkGJBaLRmJ)61`5#H=9Z&Ti{qcKUJK5^WHLs9SxTSl!*DO1GM)rszdyk8VGOtnA
zrLsq6MiL?y$rVCY7nd8d_x%1ozu)gq{_uEQ_cPA>oY#3i(E_}__~2sCLP@M-PYthZ
zFlE?ugf4R@k1u4~^jGHMu4tOE{bC{>G2OAI<Mq?}2J4r9$=-ib+$*CV-dK`o60%NA
zL7-hHfnMp*O8*~`yN*X8yE-1XZ8VcHFYLIdz)H!A8#l`49FO0|Tkm)w2!>i<`^=vz
zZ}5uk<?nvVZz%X!#QZ^<l=jmbq_4kp@BORd+mX!5R{+p!<W(8D41ADADC7aJl6>jq
zimC9?U77D3{lXV9Ta^pT2$9ZKBb5E<R)ttOtQytbz)`0~3NfI~8E{rk?sliZOP5T^
zvDCUI%<Y%J1awIHYKW=ZIC43G_YHq$bc#*8IQfgA>NbuFcXto9SIF>_>1S2C><vcb
zYD7$qX||QbHE`y9EAe=teA-HQM>Ok&pq~DCV>5k>sF|nyb`;PN?x+5$yRirZo_e-l
zi&U#m8wxUfd=wq@`SxMkZG&}p?eqUJ(;|+HWv<Ebd+GXw@U_Agi$QK$oQ8mTJ7j-d
zv;0|RuvbxHP5FLj89ek!rl7q4t^zqE#N~BpIraKeKY{^}<7cY96n9BPlbR$$I=$c$
z+>tV8ErTWXoDKd930++Ic5luv8479(X3|sUn-xcrrF<My$vdh*WQsPV;GraK%I^|L
zSP!`E!+f&ahw*KssAMTOq~oKe)MC)*eoX;6dQVEV<de%?!Z!@~m;1>iKmJlZF)H4M
z0dnDS${aUI4B(37+|DcW9vaPWEtCC$+~NAA0i`QEJZmXEe>)#u#N<a*)prLqqrGP|
z&5Wcwf=qPTF<s{0sn6Pb=_rQ5MVYE5Oy@wS?zga8$#F8Lo$qk^J|BJ$EOIFI8RQi-
zhlGq*^|igo&OEM1axvk=)jE=;HS{9+GNO%zgRW!Y;!yuWdbx_5$6q#eSw;&UW){VR
z5}NT5#=5K<UR785*F#Pnr`{$*eN0vDKkZJ>0RLkvEr*@0BBlV|y5rqVeOsBaSe_%8
zllPJTnR}zxbWfBJ)OyDpUC@iKM_bpZV-yOiL6W&xiA1~brB$sp!v@{~2%o%@mlANI
zL$4lXHbsYccb48(yPmJ9>_xvC3WyBvfF~`7NQ#EZrT8xyeS@K08B`b)Wdy$izdY(C
z&vwDt9q()g1=mwiI%=vx+D<RIXyjt@JSBFSMs6puFD^?GmNDnYcOdlB%MSE(WdK=M
z9`$=khLGN{gdCEMtOjZHIS`@}<p6#CT&5vCi7hIxK;PPgNKR#!{W04>`~lpAPc$v;
zCj?t~w8*DG+nf<J*b>GDgD=kl?*q<Aym)7V&gD*+t2Y64P}&D?b_tw9oLLMZ*Y&L8
zzt(?XQ3?g9x0=eYS{FMFhY%BVN-sv<1420AO&(@1@Wrh#=IEMD#@Mc2p7hBvqrQ<+
zwBTv$Mu=Y_<8`yYLR#D~jy&)5{ewGpa3)FRu=k$&5#l7t$xbx??orNj5uQ-L8BD?+
ze|8~VX-;KykZ8d`^|WfQi_|FpEnQ&3_z4Gn{b;Ur{ak#3y>0_Kqpvo0{{PX1mDJom
zIy64Sp@T+=R9gUkCj46OXul8((rj#3F${<PbJ_gEeONQ6kt=Z4(nYYL8~NO}sPQ%F
z*5a+N;m_vhiffa!ziQeC5H^;kbUl&iO1tH{8l9ZWY(}u3k1q_BTsN=fdOW0Gl6^L#
zKM-L$)eYf0zVJT{-s<R)DEnLc3WX3b6^6w`BhvR*Y>BZ=+2LCg3y%)t?zGHJ?ewm!
z=ize~!{lbznMuBcy_$)R-+u@Q+u!%E#e5bxZrEj49@57s4M}|O{{EJ5e_CyCQ8^P&
zlikcmK;t5dL)cdheq5XGDS~Y`deQ0WDVzt@@NNCr#$CthDoU%+!7&nJerx+59e$^H
z$`W8K+vgG^3LFY|616}UuU$rzA*jFd$$P@Kk42zr{JB}4$^w3SKU818HeU9hr$=`F
z#b7Gcf5zM1WNU__!x71uS|Z=2uD7ZCe6#SAm`DStE!TGzjmjIPk8|^`h@PFA`Xzu|
z)t|av+I(4GsBx8vcL)rx8TqJ5o!zYtO!~l%_~5k@lX-Y-w+tA&HuSSVFEg7imv<#m
z5DDWL#q6$|h5bQ9PB93B4}*By|LPZB)8XhB&F1lrik9d9a394s5wJah5=g_#14GwX
zHCUPs?O2%NOmYZ6A%*f_ZmZz6q*j-wKJY4tvUkpqNlXp_oq;fQ<3;I*Yi-LEUJbs_
z$@@<C-yHO)Tx?-{LS9BaocYjC&w~Lltd=}*#=1pcX2i@W;Q_YbHBE{N{@i=yJqtvW
z+lv!mQVmCN9`5L|@wCEkgN4#Q$8`#%0R|e3+oM<amn!mT1wgX;HRWYJ;<D3k*m{G`
zymfA6XC-r?eY8lRaJ}F{hBPOK0GJ)KVt#P>btbrIY~ShZG3l2@tATA)ClIK_0})#W
zi}&0-UmQZWM*#uF4JtIigvWTV0`YSMMEpwn<v$?r31qpYAb(r06}K=S2xgLY>;){^
zH28tSXZU<n3K^FmANJ9){U@iUsix+GVQgK7e*pfNX;#=hO2E(j&-jiKx9vU=CVd)N
zx-iGJ6=hn&jF3c29hzC(44S!s><vOM0*`@v4tgZjRE9rm1muY!?Byu6acjUjV3Yv$
znNULW$h&wfKSj?pJ#wShN7Fihukp}mWI<V-S<`T3zu0m@)J;&&1mPodWB_?b!=36H
zh11yK{MDTm0O!#czOYTg6fFO46Tg}o;yO0^>nHr{<wE9CK${8ix!))T6=g({4=WX2
zIB$Ti%qy<|J@z3+wmhHNP`^@|#CPx6^^wRm;%zYBH%2ulC#O_8&&E0h1?QBo<fFy8
ze4M$Rf-)T53Lv<$<ux6Tldb;)1r~CG1r!~qnCT4HUaBo6=zW{f7cMCEya6m2g~cqd
z;2wbVcminU6Zda}VOVy(pDS1-arD^uz|Kpy$U9}#9cYwUzlNkul%w{G%m<w<5&`Wd
zb*??Vn!Som3~+8yHFYxLw9f@=cwruBIwcewGdY&39EUP~WW=^2`<DP*_dAanHt5qu
zOvtrrN!w3?O`i^Vea~7deYLWDpC$ERTgjpLvA;ql3D5KD{?h3+g7xnBC(6;%YBI^6
z13$_SXqtbAQFtr<8d=Bz7ZdZF4fla>Jdssh*L@R1azN$Rs7-S(jb1u`z~l>MG^xFw
z965BOpDkUoCld<dD;UWDedsa`KSD>I{H1EU4=1!^H`M%x+-uSl$1|cDy=4Ai+E2${
zFp<jW1ZXJ9m~!;-duwSUdH)rl9x<=mefh#L)r&6d<ebL!L1`Dy6^XQIi0}pM@IyAR
zK`5O`RQdBVWxx;$N&j=Z8It{ZM5s-mKBX-d%1<_z2qf{|+!5OO`U1rR5aua1RclXc
zld_?Z8tPMDgK}4+3mXg~dG=^ss|&nc(8K>brVD=?+Z|dut(502oEU>dgOh!{=Q>{K
zA4%5yo84BpVAwo$pFA@<f>f+taMf<d;?}NQjo@$1B7FbS^h|sSqWV2Ozus<t*7k3S
zQ1U&RPvw_aMx$(jsk4{Hzt$()gact9x)*B?dTnwPUa3;8CX`s)&?YpuqydL7YrxNQ
z7J3a1d6FqN#gj-=v;4$@e`!F_S?prEgW9oi7?}L6UD8kZ#2M=N<kdfmCk)WuWviBq
zqUz+4(qFAVA`Sl3*PLDTy<k{8HME#^qx2+^3Rtbtfa}EW=m*XF+ci@X#Zph#CV5vQ
ze{-GLoq^Bu{R-m0Tn)9F9M_tU-!y0i-mL-wKYVSuBJFwB1+VSikG^-geJplhoxcVM
zem{aedMve(EN+pL_K3Jg8vW3Cu0F1Cu4qAN&JO$gLF%_tvMF3JEhAM0n5Yz?PLEe6
zPt1>TVRYvWN~HHnwI1`YNW{dCL5<H-Z+{Xgy(lP^f4g!Jnlw#UlV!5_<;e-pd3q%2
zFUyOQQL7-U1LBrH@x?9a@>>a?Wvc@nD9At8a|;xejOz*}&5LzppEqVDu9qgp{82k0
zSm&`$EAwTGqKz4RcS$GFp%cUoaEE)xZ{oq*Ei#|P(d9)9M^C_L$x`ybJk0=!^rAUT
z^9_nlV$6KlM>4HMj{opQ$R1qy*Uzy66QRag1FXJiDP&@*5~m{B$*QOIlzcAU&#GSR
zGyR75cmElv>JTS;WT1`&-qrj=Z#d}siAZ?#FOF}Byq+%KwN>|?XAI#ur&Pp|UzrnZ
zt4lqSRSX<G_n__j6-xU0`pXb%Q-|N8!xt@^>-wO@#|}V7mu%wbJ0O?kKo<h?R;Jj2
zU_Q$0_fj|?59nzFXO*a&YLT;8-Z!r3n3p(V9FqK$YDiglU%-!huaNN{QxDq?B_$Vg
zuEdz_I2FZuaIPeuWWCu#Np$vIOIg`3b4k4g=h2+)N1^=|SClWOsgl{>Kkjw&qRQ}T
z=`!FD*gYBJQ3|U|Je!o1C!hWrWu->-3y{Jwz=P(!q^xH5cRN5*v2y(D?K1&xqY7^v
zp}bUb``M+$JpaBQ%FApw&wCJg73mWxrS70u0svg=1hHEttR+XkA@`C#j0{L4h`>1B
zzh}6RO+7J~%;XaiX>5ufN2Nk~eH0c;ZL2{XDrJvk*wUh~;SojKXXXE#442ZgKz<lN
zZg6kgJ_fRWG>Y>}eHxTZ8xBAR0Mrney&n6;nCn@4p6@iWtT=91z8@Y7p)OFtA60TR
zK7M0xH(8%o{IgHhWFIwOh)*P=okeKM9d$5Uaw46`J6hff)1i&xkQ7^ey&E<|h^SN*
zs44J#DwEZq+-Y=wl<h?<$N*AWfV+UYza8R96j;~Wt6FmY_UZ22rPjLszd>(>Oww}Q
zxRLz;H|^}O<oumP<eX3g^$<&`=iDA>#W7R5KGiZxNoDg~;s&3k57)h_Qm8RjhDb5L
zvZ|3PUT3674<B8dz`E_u_OmWZ>IF?FhGX2M#mlbJ&xIhThZJx$5)Yn$r@2v(O}?Ij
z6|KjcK0hRqx|PJ46*ooRYi8X0E}KN)7R6}jhRdHCK<4PHJ9o~8=zhTOavyAt6yjwh
zU)J5V{S4ng5LY%0xLsUkdC2TRb^)>L>4azF)x9_;t>tL-ORRDqKxmd;tWXAxouen%
zL5=VDKakMdU0vy84Huqd4Ld~FT24W~6f1kBb|7z?3UDw?aev;$Q+`uV&GE3hldmM}
zFXNGg)UMA?X6h9IX&_x_1=*@-2{!md{ggkW<uB&y*?leHIj`U1TY9oVn^=vpfOYM1
zKGJDD#19CoEsi(1Zz^B+Z%K$4b~T4n->b|Ei7FU)pL6g}D@${Wj?aNY2WV*YL(z(6
zWAg@i>l@xjfeZC!_HO(+WgDDe0!q?*_~Q1aXCcO4GQZ{;yj3c;PqYlWLU>rPE~ZCj
zOO-bC(Im8+H3eONwSJXx?YRQyo@ZWx_n)bE%`IBA&hcEJu(p5{n-Kqn^a#5rQd_Mb
z`}JSL6$xc%M}Eq9-A%p=*=qoCxt2~eIUD|``Uy3Idq0z{Tp(L|RDm@GfWB8=E?K!h
zNP2FYD?W=tLdn~EZ=1aY{5~6qq~1kmA*oM+%IdT6yOwB_&4ROu?oJP@zVEsCt2rWU
z&NL$`!UHIy_0a*m$TGgw$L8xymr@n2&*f9}+?B@)5E9l+qnQIZdcZolP-XGvx7Ixk
zm-T60)F!drDCyqMJ6|=CozC`c>AfHV|3l4(zpgGn?>)C1BZq4Oyo1Z!&R0Eu_SO*^
zFIUaJh#aW=;drN3wjw4k)~GW*5g)q0o-+_*c%^#D3f}4)=R4`Yo*0hE`84&sjD2~5
zc7}n(7lWZYUN`l+Y30!vrRfG?a*{*r@|S?9s&ikvSiS}C;tHjyeG?b|N?cnr3~kf>
zz}Y%kX1@H?iDSIriRTvFTJJ8&E4K-dg!u6l6vM_RFE6!xzInxPjPmSI9nsI1F_IP+
z)=&p=6MG&V5@KSud!O}Yr+9-?qVL+-n)cPyZ(l^Fs`0aJyuV7;43JW4{l=$#i>?rc
z)Iiey-Uss@HY;fLvyH{e8Bb8!cD{!hr+L@*TGOZ+^p5(5<aT_CrOFbi9Z5H<mq(kT
zI@7@9I2#|j4~UE4sy8|4h|tEQ2eF@8#0s;lNxk$u;V5{)!{LsX3zh~lDei@n`Ss?|
z!%F!|OTv>Kbs(p0Xmo4;g?qH+kTkFidr-x%$dj9f`R!l`rSJAIosw1DkoAoYUVo|n
zU=JQ#<eU&)@h?40AgR0+DXC#5`s_RYr~*fP<{``?I-pM0rEJPccZQ39{AyqLdRaU@
zMM~olMO>e(r&Mf_)9tj(lfYTetZ(!Z5z9@2ITj1)qzgu6O9kxjTA{%)sWM}E<IbCD
zUgj>Fcl6|Z)W^{P*i6_<=9|<)*{2k{fa4M6*sWH(i2pzzl&V#S#u;}i;#y>7vm6P?
zUOM}gxeRRer+c4V%_e^zD}%yHxewM>#$!21_roP|>EklV`JpT!mDIaMul%aWS(Dj)
z+<?x-dwQ<A=#^W5RFUW)_o|{N3#KFgD%hdHZ3H<3@b+<FhnE;ybuEICa&_6ajB0V^
zRaVbS9W-CP7%;6AC|6S8$MvMKUK{?Wv(gnItn`qVgr@|rS~t?a%z8?IqD@}&^_1FT
zKiWN6tB2XKFJ+t)-)S=s%VA}8VC3D=6pBUDYxV)7ZIx83I&oztbsv`SR#as`UGUQp
zD^9keWg64J<}M6MDX5C&lYuEX+oUs1(T;IJb}txx09{<u)}-sE`E@??`su&AC7p^|
zi2H`1G6>kta>vwJHRp3W3aJU|o45>V?UPB7;?W|`sr27z9(O^YqSVnr@Y;j52gbn;
z+Jg%&)B{~69uO}^<la8UJ*@M0+@;)phCKW1xKY7lRgeZBIZ8Kc^^(WDcJ|H}mn9k<
z83m2uTly<HZe^t=X44JdFL!vmkU3f?5d5Dw`LU~iv&?;HJOR(5-=99BUJR1^j@~0|
zjmUcrz3*{BMdHI%I)}%o+0ms%d@FI$RHr{^ZTGW1RV`?@E~t}&RpzB@m+`j;_r)vp
zaDnMS9*>F&IyWk#?Bm9DG8Jaygh-@HJ4fLyFuZhr&1j$MS0dHp?3>D_rjdEuIIaFg
zytK@Qo8>hPH;~2n9s1(nwO&9lf994ogu8bT-!|yYlu1p#Wow<df2V-`fn;BOWmMen
z#zk-2Pu`ttYv(iylb2rm=o&8KgddLyk0R0aZ@ajmLlJ)=AKVTV_Su_x2Gl-U+T!#F
zI>E#E_q?A%%!*!L@lFxHGq*IX6@_EPPg3&s2s>4+AF4V+TLxec#Me)&2uHLUDtH<F
zWtvKb;`*3>Sh~#qsY_00XE6jwvEZoGdh*2m0DeRpPIW^9_g0VLe_7Z0m;2-@49bGk
zdl~x7&@{pnspQfcU#&Z2RVK?;SNo3|4(198qIeQxhy}e!<X&LT>=%Q2mN_q7Y&2*Q
z*$-FJZht3@`?;8%(a*nmMfQyWc|MYr0f_O|OP0EgTV8)~dez-i*l$Ra`y}E{&E@fY
zJG?_3b?v2I&OE#H0;6z+(2-;k{}ju!V9_a^upLPwP6$qBC$3j!@159f!uVZH)#Lh9
z<Z-<2RizrkbBW8#E%<pmw}?O&*7r<g0xpoh8^y)>+H!0?y7t!6z|e-?7!AWf6n>V)
z#y2g;dKNU<{v~T;k5?L+HW?SJskGWf*+xRv@MFz#&AzJaD{1f3z*79%<-N2a;Hc!i
zNr#tKwhfl$`6Xg%={p2=CX&<P+QfLt81Q@lU^V)2>GEdAF9pUaOKQ8|!^4MRW`^Hb
zvWz4>oykso(wK(+i!jsNS8X18Y?y%}_jx<UmmHTm1tJ^u`D1<4EUYf2adiXrlQd#1
z5RMeZxQk?oy<_Ba+L`S84DRqIQ3VrhuputVo}_2)91Xohar#A`dsw+;kXH;G!n^&T
zp*4A7>RF?RHkebZAa{Au8^kt>UM{n?vbI&P{r3o)AS}sqJ+lG8#lt5ZN*cdB9>i(1
zxf%Qil77@fk;)@`4=LqeuAE_f-4yWJxN=sYyY}%f9|qID-qA^L@?}j=J~F|ZKbN_y
zjw)%O!Z*)zpPDMvX`x~|LG+i$P1Vo!R145PBvUu4Yc-NtJ@OJlsC`vUqQB1SFxCf*
zCNuf>h8(_)qIqsihdVe{+q&w5ZIS5x=Pxx1B*8XFqnr7vl@03mp0p=V4*7g*<G=$F
zIfEb*A?hi^7Pd-{>#uzDd?(OZXpsA8WN~j-Sn8|HT^%u+FaLoCLST+C*N@uap#MfM
zdbKO1QOL5JB5}~ERU>v}*R$M0Nc*Go!0j!400e5jaCmm*@PZLs8qwWR?>t-cqEv11
z*|n-EmN+Rj&^E2X&1X>m-_#ymi#G>k5jo^aL-m`wOL=3)=}H;@fsT+Y2gm6L_2*@g
z^9D!k2bO17w>I4T$kH7rnB^K=bD+Qth3Ap0hOK{lynY>J7fuH|vNhf1QkD)#KMbO4
zV&Sg3WUFMFIy)<Y{xJ76N$`6U5P$DE#rZq|q*JAZz-j176t}P^6t!1_t2P|c(+>#Z
zaz|-31w`<TcFEjd!b98aTUJ&Gw)zwsV$n*qunv`Pt6ZuE8vjBmn{a0^$W!JL{nIAU
zDnC=VL?4tJj#?RQHnhog<lHH<d?n}ALs^C{axdP-)&89P8=^2^&&XB#=Ek)=7+)|M
zGMaM|+4+$3dmv4GoD@Z%Onh23Y3|Ehi|Ev6+piJ4V+$>5e*Jfq-gr6Lrtb9{rUI2o
zo_|f7;*}sHqys|pd6su{AuQ8=*p~=_O*}y6j3(^4cH1&fe}Y5xCOao*Xv_pSqEd#<
zCq7-S3fLBAVeL*7b0#x|uv7<kVErbKSkI=F9g6&^z0=cU{-BU6`zLVq5zlMLKXxfk
zt}NoTHizT`YE<)>`v`AG-KN4D23{88sUV4qC3M>R=T~}v7-)8ey+;{Zi)3?p_FbpI
z{Dfns(WHs;qmXHK`p-=Y889U~dB46hiNcxRO`}3z68o=ZbP>4G2cj!BYoyS&=FzKq
zZeSdu5#iOvVj~gX7%hkW*76JvhjQDAFUMP{{~BK)ofS7VF`)Cn1-%~)>kI=hwa*i-
zi1i-R3&>muVM0iuW9;{DXMN>LamdTt<6nsQ*x>94Vd_<J0mV7Cfmmvq7fm-j1)qba
z^J{gToE8gut0v#mG}cMlM`se%fW8!Z%e`CpdCl*EtbN`DB?{-Z*G<DIlD}=H25)QM
ziWU=7V(tAM*DQkQTHfg})hjb#4-JPPZk^NUT>to~(Y|4V4(;499O1W=mb3O<V7o6h
z&wr(pH}V>={k7m~CRxGtMU_^ChzT909!U^_K3_74A*dzK9hV3j>9&<Dil&B;{mPd9
zaEQ~|*TUF+_ZKIoN;QnseaKtBlLfm|SgF!Xrh*opqUknq#m(cB(dWi}=#^JgsG&dv
zzv=^X=bb$0_polT$@YFF7X8@LH{}z|@4^o>%$2tx%q3cSyk8+RIi(ePQ2xcu5Of)*
z$*UI{k@;@tgXt2FCN%{Aq7{wv9Vr{!z5Vha+0^`c6OcAMUcgF8{+wiYFm<(4^sEB^
z2fCIM+=GQq<WI*#qV^BVB7X3EILZ$6>w+}zbK*^6sXYXt=u`#2LI#p7la{n_UQ!`G
z@@9x>w)tab-mg({hP~dSy!VYfl<R}Jg=PP#^Qzp&b(4QneJfD<s&CVc9;Tj;zJ<36
z&FV{prP4wCwI6)k8;F<gj%hpI9x1OLv=f%~qCd{ylV#C0Eq@mk<wv*7O<qjjBYXr|
zs!L}%A7cURn&Nr5uaTDA)j`t$;jkEP?z1FUtLnkU!+V~q7F+to592w~(1Tz}ug^@$
zElLlI1*AMu?M0|@TGRY`s4mZf)OV}*ld>>H(H*iWky~%ciM=lq2}~g3asSy$T5#1M
zj_W=(73i<lqT;*q51ltG-ic51cq$sTC+yz|8>m&=fs<>kS=#r{Dk^m0b_3s+D6mAf
z6utM`Wg9LTF7pXf%p7j33fGFLU+yYgod@ygbQpxk>J{5yio{+i1+ndhhwJZFomwpA
zA8PA;4Fm%{(8mgz>R**1fMT2P1+XNgC9w)Adg8{Zo)jG#wUSI5!dO)=u6a$}u})KB
zm>pO+JzJTcZ&KO0{JY<=?*Q^=yy{k(SFwTDk1XNE(&KMR0-Qxuay!@=&P3+lyuPDA
zmwin+>bZAMtfM)<%szDOXn)-}zA(ztk^80`2<Y-3l^e*@x`L{n{0%uZ1~YvXG11IU
z34=L>j1_*OD&kt~*dsoyc$VhWGb2Od*HgM?(JU)j_1jL5Rsm00IW}&&0yoXn{*=B7
zE-y|63Q2=P?^u*TxD^+EQz6#$*{$V0BJU1nRSTXr|6Al=v+fCV(e^ixKF1EaUeCw3
zjsIbNUC(od2phy^j2eLx1Z}%DhpZZ`O{eD5mn4+INCq@bUlQ`-Uwa$SAxXZ+;o@W&
zx^DS-WeWf3Tw!yRU}78yVMmTUDIe|kO6G!Q&?zVnMFLy$w;y^_HCQ!qlI%#=iY46|
z27~E^{j6yY7jly5vYWh9uPSKF^&eEUJjsUjwitM45pDH>)eVqEvKq9L3>jJo25OIt
zPkmRt6mt`Z@LHHllsCC7s*^fujJdm7GHH3;Es$$v6belGkcHI2B~R%y*cD9-v5}Ia
zLK>p6$5=8Y5&zLgSf)}^S%R(0^Zgl(X=8KF?C0}U&856N{|gh)euA?{sYF!tAM&=*
z_0KZBSFR{D91bA}l<^WA@+)igE=Qtka`2GvH-ks>hg36pu4Ccy!!)I`3~^^o=6QA?
zmI;ti5qO}l`r{>5Wx&YS#-|ydiT%DOnjZCMt735aQML*}Z8f}JjA}T6t>Idx!Hhpq
zzvk#y;3b3tq!+Q{icz>0>xw+)+yM-&{7KfYmW)>4YJydU07~plfdnBC2zvQ9Qc?-M
zYm!S84d!0?r~$_Wqh0s7e7$ph`?Pq1C^buY%o*bl&*{fIU=*rfbP6kEQGDv~zVH3x
zy&)DK#CY-R9}$6B);`{6<!c=GWpeaFXz9=#Q>C|fVDDl(r{wky3+WdgC12;I7jWW;
zGSD>fgdx&~<RN(R0kEXic4nV2u-hB7Zi)~3pe|`_2g#CXt_eFVq*Gstw?qm1uS~RS
zhQ%_{DmrMQPmEb(jViiQS}+%leMJef^-ha$$iz67@6mgHKlWgP^-n~t!1rSo@{Q!R
zWm+2ryMmE|)&y7Q{@y_5xvyA>%Ep?dR9OP>tvTFxgU^xkmNXpkN8gmw^^%8r9AohN
z@&kuV$_lhz&;q>&Ah9I14Z}u1bb3lixp%m*fyc+B_|s{9YBDL$=YfT5Dtq~%?_r$|
z-$-DemSb!`FnWC(g%(u(cfX52RB6m4w79u<3}ufURJv8HPtUGBNO3RQ@SZ3(RcLi~
zJ(%q)q+jY5`P~fj-GRAIh~^}|<2)yQ-3mAjcMtl-zexocsbQg}eiCq54jeNgrk}XO
z3Fe`3L%(nH99#z_?w*)t!xatai*Bh9C`5|xO^2!E;Jseol#$}sPn-*c6R9Do;ETvi
z(0xeVD^F&PNYD0`Qi;9~&>K*olfa!NV5&^LJ&HCS%e2ji!&vMRnvaI5HteYHM>zgU
z*`caJ25o65!~v5v{D^ikk9|M-!v<llsxkiapsc>iMlf(~|FuxGZ0K5?o-1mRgxg_R
z&EccdYd_Rr^?LW%(mK14o&3fx)8mtus1NpmdsQh<=}6qQ^M)etnNjmmO|jM6(fyYG
z-0yum8xGK?+fgmB<TJk-`t$rVPr<g2GzXQOC>IJG4htkIUVJ>KznCn5cznT}G5-22
zC14m#O?#^6+bz{2P|M8=@!PZ=sKI`?iI!Q2-}}Ab^>ibL0qjuSt_6Ucn{7)M$qNGW
z3WrDujjX_pNOd5l5vE34?jl5eplV*}h2kIh@^ZBJ`8`!q7BvkKGF`)UJi3J-T$u>?
zNfWeFH~%ufGn@{i^zgK@`y}r!BjYC!Np3@b3IFStp1H<7?zL+VzN1xVe7byQmei3@
zjBI$NrBsFj=dPk-W2U2p9CI%XTkQ<cB|raj(e8I}$W{jQ43nyf+@kx{hM(>@XvkEk
z|G5PMk6na~=?xaC@IRWV4@tk^g0hK+#f&97@%Na<Q`bp9&d5Z8Tp_|{b68vH?wuA#
z9HNCxfdGO?DMo!?ta(~e?hDA+*j3raGPw;%3pe^ave>P-$S~<|NPY{l4`>7{6@!d$
zvud73T_*GTYMX?4qoVrgcU*nkeU3yW{fm#fY$A__50!!r3HIruIq>+-fIe9twFq9t
zj7}9niv+>f0!{KPHaBXmj-L-K)`%BTMvEWem#HtoUL}&i6DShsMm>7Y6K(`Lq+se+
zl<Bo%V^A=!&cxJkdE>jSkN_<-l?HsTv|d8ydP-j)YkSI?vG@Wt5F78Kiw43MN`t$~
z&cd#-ypfrjxl7bH?69QtVPNm-iBP4s3dxCWdisunZUU~StP|uF2|xnssS~T>RX{%G
z1p~P^rgY@~Ek-4#ADP&;2kkI_`}@9?pte^jBqPL5eizN~ySu;!AWX9~Sp0$xYD#@~
zj0U#U7%jbE(AS`((mVk8SkC(^C7ogC^z07>JxXneD+VNr{awA`VpN(7iC-oJIB=Sx
zEgSBF@EdkV5-~}$hzZdZZMbV>-X1y88+)U!Qs1kJz=%lem1hkZh5&=?0Se?94Ct)3
zRN^%@#u^eSDbIRy;hVWnl>>z%(K+$2k#1g~{%(KZlWcWI{@7)gN$zBM7~AhmT`Ry#
z$V++3qHP=}8iYchVC9*`HPh5#Hx~#K9gcg;sqDgv?(95RfQ)&P<D<gXnbIQcTCP~S
zU7j<qU28x^Ltey%1CXx)vKCY@7&_fWbhi^@;jp)YZ$zED%LRtfOyiV5G&<M;?tW`8
zL?_S^uPC;bVb6mll~ocVI!3S(|AERt2-YCbqLK}rJB}N`<wggg6H_kQF+X|7nzxcQ
zj@L9@;;A%Xi%ZnNU_J?C{wbeL50Qn5>L+|eIhz_b;?yG!tMC2bDVyHSyl~tux0ixW
z$?X#{h;i&SSAU*2&JE3?So%#sesJZn7lF|V(y>>@MHY+#^brxQgq=!nxN=3ydGN{v
zFy=?7U1A4&X&8AAdAW@=aIvq0q`6lKd{~pZbsux?eMcf^7mqsaGHFMJ_c0Z<Nj$%d
z7jLsGrlVMIPQ{sxg!9o~J25c3!OI+kJl5wX?CqB=4a_eb4{d<x_{KmB1~Sf~u&6vB
zFR_ZaHCP<XO|;c3DV{1j%D`zD(Sp%_RM=M&-28stQ3PXUR*?lY!Q%ijrPL<li<`9=
zRG5;y?{)>1!DV0`9o~6+wtSh5eUT0y4x}`{Vg<gJeP^=wL2@g0RI~NB*e?pOGe{71
zLyWhVub7D*#RaeEa3|>rz!h75fONcf$Tu1I+B?Kcbgt6BzaE-K*sH`<wtU^9C!a3A
z12sYHGyF0Ah4j2mSt6;i$C})bg6ap?o?pJX02Eez#Ae`YEO9+%68p^R<E!(GT(NGv
z3j^SEVpN5S`l8rwD0)ZXT;k19EJ=y!Oy?-P>P&w79)q`I^-AD1=NTWSa-I0!^4_BY
zDP9uI7LGw3L4gha&x$cZ_tK$#y;>{4UiI0nh#&mSA8$R6<OK@On1~xHyx%hSPVVJ)
zQh%q84fOHi!cvFw?Vr?@htZ9OX(l0ht7182_xe}8G(O1ho|s<;c8-;fELplXryaGA
z8jA13%oL@YqBmTUlo|Xz?_H&X!0Ibx(14I?L;uB<+MwL-rkqBf8<**6Ol9w~rKjUb
z6X|-Hxv$VCe*b1HkL?$0CL7ep7P6GYWvE*fl-cD%l0%v0?Ly3#JH8bhi9Y(cpylo8
z6o`;EOJofmV(1jzt6AOAhdi8#{P19g8EK$EI@zy5Ohj;4%-!oJv%X3cDk0H&<LA!Z
z^cf43@w|wm=xy77qubx-X+L@_D1lc$;d28^sU$rcr?c&HXv}YN@iNx$XbA)g<9%(5
z`5RuGT|K>E<UN(uxEiM@r{S>;*G$S1n7R-eV`Bw>ytzJh1<Akj3lOrLS8Wsjy)Rtd
z?f1RS6tDhImQ~o}_vR>&7q-P0@B-8D^;?g$taKYRoy3B|s{;9ui;&}qTXp#uyTR~`
zw^f#>9;Y%uOg~J?&UT7+=)1<Y*%vg!g2bEm>~1z9JOb=WTN)uR?L_g<%Zbpwn#p{g
zo`+ZC_xk*6F5CQezY<8#cd3#Aw{U~b!06s}O~syx<H|E#0Ky*f<izy-tZMQ|+*d5i
zkD1++(j{wRm(mpf0bsU{_8;}#a{QLlo9}?*SJ2Ec`vmBLxOb&QW@3^V9+mR0mEfI`
zD@Gz|y&sEyUgYAQJ*5%X*Lzbo>ZGhrf{ext>F;ozWkd|{Z~4xpEOpP@PCIs)%iYz9
zFWSBvll~*7<dTl#jXCLHMeC%C^+@%|hJtm%sc^*jHFujcn(f|KH9C^+>!k@1#K<eb
zLOO0u+C_oKPkz3CRjL%5-?;WQ6tRlaeX4BOx0biqvGTw#J&PL@a9G~sPVa{f4S>&_
zjJl>io1&Xtbe~WuSB}1_BnMtw`=RZ`6A+Wflm~3WsQ+n*0D%&3kaMUiE3d%pToYe{
zK4@zm3F`Z%Y?mB&74MASCOPeRM-7P^)HPam5{$gZ&c(ih=%3Ym5d+t>CP-F*{$52v
z_KH}`MZH}dcReJABekj4eK<ss0<PsEZv*p-?730surJx?Vqo43xls^Z93!$5$V}{-
zBz2>9l}&}6kd%D@B%vk%|KSPs#cQ64TY9pBIk4fWz<kOk|1VXtiPmRa=nj2<vFzoT
zAf8;LA^!Zbg(K&0Oor>Ta>cz~s7IFu8q$We$^Hg1PnK<=RzlYr$!aXH9E~(qFUyMj
zj2YWs0lWhD19;$`p&)P5#in@3$H0zA$3HoscLT{qOca#V7)yy;)lc<o14Hi#V6f7c
z0&|V{xohY6vgqH&JqKCui55sHYV8|Hv*c10eZFliqe|yyLA9*<lb{1yhOB;J3N|!=
zQjC7ETrL^lF(pkq<K64Mu1C+MuH`uK7cqssG1JiWOH0p+LUP3_q_2kG`1Vi?YnbO9
z3-kTct|Ljt$wkY<67l;~ToOwkI7;Wx0CLo&HRzX4QVTaJ;Dn`E5%3xeLHETOhO{U-
z#vFZrkW4Hn<DJEiNcH-=Ss!8wKDAN+u`z3~B=q=cSFNJ;_Fh@RdPUfDtdU&CKr^o<
zlIUx$UF37ST{W5m&^V^_j48QEb`PFLMdz0)-Hmu(Sje~_B9O__oF@i?5MY!$*LdQy
zjV#W-s?4Z>JYf5kKH7s!Wl#}hAHTFHaKrXjNb3zfM~PqZkOZ%cjZpatH5@nf6=q6K
zV!YS>BIXLy=8vOHZ&DS!hPie;tUV|f9x!|*zOUBnC5@P_wx65sX5fg{bzJHs!jaSk
zOLHZ9oqA3!!RRJ~HGTti&<`0wc%kH=1xKGLVIoC$p-Sy~hTYfLjI;s1yZq&)!L`$Z
znQ!8zG?Bt!To7SiOZ^1948VuQIn(otv3ukTmwHpK0^w!7*2qr?g4&9i&BB4H)H3Q(
zD~PJ)f{#S0R;?vKxTSj5Qn{$3l%X5?HeULMMpINrj*SGbWKPFh&F+iCrWyrWkG^Wr
z3v5hJHy`b4js{PfO@bf*I6?7qh|ztKT&8H$g2U12H{WQ~`Y>g#K$_{(FV@VL!(}dB
z4E{(M$uU{~qk&V}`^SdwX8M>f06Wo*GoT7<T9o=U{K7G{y;g%arCm!1Q*M?c;u7W|
z5N#5&-+xf<NwV+q5SDGECtl0CUNoHvkDfj6tbSpoSxl4B0`=)}gpbznMQ4X|M%bqF
zuv+>S=usY@Fa=idh{mDsOXkK4yoN<82LBMaH8b<p*t0HiE2+_r$@g#2K~<}Rg`<Rz
zDg!N5?FAnac^;|V0mdmf%d#cPC?x9zaj%#(P!CK<31%ki%^kx?AppKa^#<HxoF|M1
z67bKifiDQ?KNh!VKEyOMP5x4JA&NqH6-$rJ{NMlZc<l1!o~u_IDDqRGkN3px!9qpw
z)|`VTSx~t*BoBXfnio)#kHv8gI`$det%X24*VBn;Uo+S1qC3T@h%5ukgwB2F{zAP|
z7W8S(FR}!Vs)d^_FJwIbvsrwXEdR4Pf1;{v&$&Fa8@Q@DNUipUC}@wD=-$CuDU6he
zN&W1P`m5C2FxI(bNegfa{1h6xh|Lch88Tv3t3dPMUR0N3)R^OVqh9CTe?ATMtpa>-
zx@h0ON{plpqmABk&sr=)^1Y&H)x11#9tFDc=rfL&eD5un^1g$9Nknwr{-w~BpUzLq
zxM`86$;XPvWe%>mpn8QTJZ?{gc*y<YmDqs0su6`Rm)U79hQQav&WaUwa<N2ZP_G3A
zc*#8~cy;*0^Yu$c*_8S=8uB^{c9BV_Zp#fW{*;#K)8+_r%0#FCrCZY+3e9d#qsfx{
z50v%z!W|o|IKzhkwr9_ORpB(FxMZCK_U-#X_ztq^Z^^3I3LW7j3Lh1SmQI&^*c;wp
zS+cw=D3{G6n|_0_>TaDP)*EQ!T+8>oPq@#GH)gWaXw}k}4q&9+kl9T94<u;RMHcQH
z@)^!%n`9~v^Q22;5?h@3Xg0cD+VPovHviSru%^kv^sXUIB=<7@a%TJV!_FV4eZRkW
zeeO^E5G));q<VfuTsdu^t|<7yAEDbXzTY=pX}o1SRIZQ7kfm!j<0-atIb9bSOs3mP
zOxaB{uO__&c?!G8N?%H3{tp!D-5UgBGWisG-}U>qWd!>%_o8TtFSeE6b|jVC<6te`
z0_`I{FfGfUxX(ZELF2%(=ADq-Z_w0G@JjS=Ncke?>9@>vuo(05oC%)Fl`bza@xtHc
zN%^{5{6O!A4|0nN1#sT*hMe5!Th><7T0T=DG0i`&GG<R&3tnz+27E`mKU`+%-?ap0
za%EdIktuEw4Adu7bW6t8#30Z0&F5+QqB5=Vb~jZX6{Q_*DQ4zJOz0++EQs}A-*C3g
zu7z@0`>oR6XX2JC_WCU}Bai4c0Q2peLK0!D3ViJdz3lmD`Ydx{O<Eg8+4rq{`R-tm
zr`3W@vYO=*Z*?yZYBBQ0dCAg|Q01k~H!nBFYtdX%@~JC$own-R8_Af;^~X*}tm{!*
zQ6du)l`JCdFk!{izBcEy-;2B8aptcS0gvMdtexu@_wy;V*X@_;PyvPDK%XFPUf)TV
zis{CKky-eUMy+e)vfeSnya>mMJx*boH?j3q{URD~;DXuoP=CVr0^%J`nQ0s1>2QS8
z&e*N33fH$pV8vvvvTC?Js;$|S){il{2jO9e)d@!-c|**i^kwf@sijDIN={>iaax^l
zOdOcdZUjCs8*j?O=~Dl^SJ&vHRqz>x<udUJCOnLr6%0)fwo34U^(0734qQ#@@$K)&
z=-aqc*L}h<B$f?P$C@Bqk)BX&P+u=1&$R6^)uTok!3QIVXTH&aOk{vy5>WCdm0DIs
zUUPtl7%Uwa)*()EDzIPQoGYm4$(k^J6QH?lxTO9bN)W&!VO#o`)r7{l2{Uontv9F9
z9Eo|3B@F+9mGXu8{17@a5Rt&^%HNwFy(Ckx70QsjkR0=22EVr4Hs`DXF8bJ<2jr-%
zu3Pvcep?{hP;q!k=+RBCn}PL(8+5*1#4tyyM$#BwqP^aeQF!N9{8V*8F1@~WAYj)~
zIWMYnzbf-##3EC?XU8hbWmO-jYJcgBU8=M0_oV!bg^D9&w>y_wpGFm|y1zP3f$Qx=
zn+XlXl&_`qrH>Aqas<jge=^22DrX4impQIW8(a90?J8R<EWqTE;CTr@uSJf+F~D3h
zJBKxzqc34}xU+@5UVZm4-btSjP8-D>bM^^jexUibfcDnZf{Wjc!WJ&Vp&-ZI66<&#
zk1BT^)i%x>Byco=zmQnUmCM^b`wZXzC@nQE;`xU;DsrMf1i9*-{+D*4TR4DYMtAAY
z(Bp(e4>RhEe@>(=W@(8#)IJ)#jaEha2!)gAKtDo>IhRz=_V?PJZ~aM5CPs{L1Y;Zu
zdDd~Q)Uonk-1RB7ZXUrYkae8YE?eH^LErtiQzSX7Bn;dl-*SU`o%3msz^x&5eQs_@
z3_)9`bjS0awyEw*%j~GWU0PaMhCPC=f7SPUnKeDVwl`&UvhPAZ1EeM!h1&ipO!-Ov
zAa2Md2|&2T(ew04suuRnoG^R$mqW}j_8!d-uQG2!@6i`!vTu14=QfGjI&X?w^RJA$
zPsi=tMbWC;AHIp29;vJHI}&_7n7d44{dxv^lWvY%A&4-MZq)bM>l;(ny3n`V(f4=X
zJexu!Mx`i64v8(>J&KL^Aq^b&*<0N#a7%jTg6bCJ2yPf&+$y_jy*fvVcq6S3=#|jH
zKpMJ-3k_0619x>w6jZ+*gm<!!ATLLy9mZ*iHiL|2M6#bgsJLnt5BZ#UHMO=6#uoKg
zDW3s*>|rM>jN3?n{j-={X9~#g2?W^(@BJ{Y#nN)j=!?g6EI}UA(+jF}krn}-&<CRt
ztCpLk={_QkLaKU5IyfCZG?1WTG(9)1SX!@)F6>EV=--g{L9S?l{~Npb^4WNy9nz)9
zKZbT(NLXyF9j$h5|NJStHcgH3b$}y4%Cuen-!rP|`R9GxBeARNj+J4m^_GrXUvO3$
zTbV`OnYBs8&6nxjGtzUjonQY0U5<R9wB=KJ#)-P%3={u&{_+cSuIS-rqEzg}E0L)B
zgHHku@7Praa!Yyi!(Yz5>v&Pk^1!W_z7zKknyP3dzlix1sXH;~(vsWZf}h5V$TfYg
zd^;8NL{D>A9;;{<P)h>oJA@-_){CbtwOD1TXhBBI<HDr0<TJ>T`SrJt+3$O%HxFo0
zGi|B#A_4Be#7>R>2pR!4OI#Fh)0Tk)G7<o=NU^at?Bdy%-(-4dWn;x4*lF;__BF3E
z>i9K^?h8%86$7d2K}k5`KE)%LmUI=9z>V6FKkTaVkQ-VZF8-{i9XCU@KP1l%{QZ&k
zO0|*oTZLA^Kk0YRhy|B=We9ZMGbj{Sm7~uHW@7##F=wo<^SL@Lv(H`WGdfWS{^MbD
zcO;{=)q0TOH6cX@S{Y*DO1iDW8GNgXBleg{8SCf@<<TP8v=VA-I?nFQA2psL-|t=$
zFO#fUneKodo=o_Q`Ma7T@h|4X*)RFvtO)(i!cCfF?+Lz+{7?~my@sETh%qb{h5EWB
zztG~rZ6gpoC5-fZ4$?4~;fqQ12|1{-__=;|z;;iaVd(`@u_)l|NfQsRfreV?Lv$e0
zB3sq|i#;Brh~Hm5aT0gDbge$M)3b{(s@U=&^1&$SIYshECv_r~H{sz%<22GaRlGx$
z-g*zCl=kCsnyX>yBs^{>SI|d`Iz{=$NkN86QmftFP!?Uv#G2I=xq&(;s~nwia>sc{
z&Z6$1!XqDfSJ>&|oz|M0FMLVW+87;O*6F)HSi5nh(Ed)*6ULRU+1J-0G#D(A1irI$
z!Pg%B-R$M41iNOy?j|5ze)5ZAWk;_p7b_rRO)iLN<huIS_OZoavxO1T?63YAT}~zY
zd|=(>lmhC=o3xRckAT(7JL&FQzHPNDqnxi9qqHP>#6zfnm9Mp7*}OnDX%*I|QCM{)
z`G$jFbctXJ^+x~7pBnvvN((F1Ra?8McF5g9{o#O0#wOwwOPI7$a4WDWr1<%ukd4Xg
zVEbuvqhP)<#Sw_55s$_ap7>KS2usA0wzFn0LPo3}2-_0{i=O4WZ-FnuOd3>m>I|mo
z_{BQykn1@h{MDrII`DE+<Zq&A3F2s&sW0m4B#8MZ{w&n{he?1jJH;nJV$65uaBb6^
zI`usNtuq}>Fp%Tq%PypLPB`e5{Sh5uor+lXjt(#T$SUTXqi$4mmJh~6t-VZ=%F`Yl
z&{Fz}jY=uOw7bni)cDS*EN~crwtML-r&XjpJ1qk|F`saDVw~v^Et4tB<WEFxxPOx9
zQ+8pbtAUSJqec|`72>ByT@(+?OCY7qe%Gt@WaakyfM)1LoyqslcEV}wz(OSf(!6B0
z&}PH-f-##BHRG;=u<k7vcCzy%0ye9EG@&{weph_n`;b{fBHBYtk|RT#NR^-<YP`P9
zpYc+AuFp14pOcvK-<K$9*Kn@fcDR7SC<<fg#KZd{kOH7c%m>itNXp3t7fg)XQJ_iF
z`Ky-(`ah6(<Fv*mZ(S^Po|Eerx@w(F_G82JWjm!p!f3PJjrLRyblUW~2GpcWRJ7(<
zwSwQseF{ngvTX3>Pn=f8-P+(f4xj1oc8Pm@ljYTa{{5{Ke`){%tJ5L~9mmUWxG1f$
zLc69^SUpm(a3ZBzPGQ2QuG}ys!^1#>_r)=ni{-zwF3zre-^5nJ1XVrOFv4ldOz1Am
zH#LN%w>av<Zm)Dvt-yvI^US$k2#fYdjvl979oRZK{p-uVC-%XfhEckgTc$TpjHPfv
z`S!gGr{5DVFeiZ(MjN!>e=yyw$_}5|3F^EZEP_IJ-((PmOv8Zjm5Gi?tFHtCuNSbT
z`0-t2@QtLc03S}r6y09}5)Z9|>)&*@WCtTXmH&B9hW?spNpo^aOW4dnr)&emQfUVi
zi~gg^7~-i0aP0Ud4<xXxGwA5DMES8)Wpv_ScWIt)ae&hLiQ}c2Vc#UX;XosHJz89h
zUGDWDTZw5yOOy9Bu;A~KqXM8$vUm|hnD5E(8wQA{;=_{BR4e4-=-G0KT{qcuHd%)w
zWldu<o>7zJoMi5%{Ryjv)z|aJ|Do)bP|4WK{aEx=net8Coq+kR7!`*9+rdU@4Ctdy
zfJycEO3OO86mc-9Yz{g4<Svv*A52MCz6O3X|0>|L(^aX4^EaQ@{DLqgX_CT!9unnh
zoZM>P8>EyeQ@zCG?C_0c>wo}bri}fxlZs=!#C1L8dL41Eyn2?B5-ZV*Tn)NIZ$uHm
z%8{e#jQ_6|6Pi(t`t?GX39|Nw3M=q>(8$GNvbNK-Z{-}bYc|H2U_#pukP9Y;o+u(c
zuc&9u9}NxD&7oGqX~jp04Ilpb@v8yCvd-`q|Nag_0hi-WIpdq3j-pvhDRbz<Z_bjh
zIppR{>8_{PcFz?hJ2>|po3MPDJy#kMquLYaWh%DxnuI_XTT2JV=TmqB=2cM3m2ptU
ze^sr01}%IYneZ7^NA{<pg}fpDD{IP^ah3*DF<!^<+yDi0ZBvWqL8HtX9=n@7m+waE
z_6n@1-H?^{{<B+-gE<HDcjNRBf9ZUc85q?~q6yxsJlwEzv218*I<2MmcRobH%DUNu
ziA*R{AoD7%@5+9;)#YccsOw)$`NvL%Y3`+5SFtO@dTI8r4T)g|ufN7jav{%Xv>op&
z54J8Ab{#HP-s`I}qwlp!4h8=J=}oZ9pgK3y07Rme2zOXrWBNuU#Go;TZm?Hf9|f6y
znW{^TN>YAm*9@rT!IHZi^|D1YouU(KlViQ}y7!{3mWLLTXR(`>Bku-|P{NLMUc!O>
z>t@2us*39HFF{15hahF=7BA?!Dcz-M(N?7w^Tz4Vs6(luLmKYxaCUjV!fNj=iU$1L
z5U(uLx(CnOd7rmSXcvG9YS8RrZBe3_$dfZ8gd(-OEHtV>ML+opBip2_Ldyz%#`WZ<
zn7NQLQkdqS9zvIKL_1Ad`4Ws3MfTksHZ7j}=>cM5V$nUlxC5)DpDf6r@+Bx`YJP~-
z{?WHa@Wh<|1rOibk>C>N3WBcSffG`-HsJrBNhiR_e2rxfS-Ap$i%w(lT>OTjpA^`m
z(7xHupMPHYa+b5YU~M6u&ilx?Ie|5UMwu>ifB%jqL21e{yu~<KS`W0(ivd*z#oZ2u
zJQcXQHi1#%P-b^@SiWP_<(p@>J@+p8ZZcxn1B3-gAt57G3ju=qgXTv;Yx|}5W;`5J
z{-VeSl;i?n0h8c%litaC&pL#W_qqE(S5UtLrp<f27<V`R6B&}KuVf=*fVlM?1eJ*P
z5(8gl*KG5$NQrzsd1}=9c<kL)AS=s6JL<i+ka#W8n)zMjjCE$J)w{YwURrtFV=8A!
zP}&eMr%8UZxvpu^AvqwccUfMA)2pIa%Vp6gaZ#~AyUH;DvV2<F(R{q3{67?(hd<Ph
zAII<Pm90+Bh!Y`M>CV<L3t3r3Mxv~{>~+ZOoGt0xNw$#eQph+fgzRw~&fa@{f1lr9
zaQArJ-RIu#_v`g~zPLCmw2C}uO`+>z$)VEKH|nrvLINOQZnQBCv`&BRpdJVi+DaiE
zFwL|JQ5)y|O%0Aze@HANh=p8Hz9@3RB)=thN-8Jv5w0#LK01G2cDb=OQBuOcfXaza
zgO|3}dvh@E;<Fgx{?<VjYR==Tt>v=Pqg1U|fAk;Ym0!ISd8V)O?OP5Si0Xu@sBf7Y
zPShT}IGW9QIm4pH>?-!``(F>SJ6GFs(!Ne8JlE5fWcf4bv&RRY&Der(H<VqiByhPu
zHRL?cID0)j&~~Z&!J=MMq!#?RG6Ji)x|w+%we_Ot()n9x*r9Io9(=VeRDOo$LP*=W
ztUbMJHjFQ0`_Pcui>yjdEogQA_vq%_^6i^SQ@N>jXjAzp7#M5VKO%iKKZ@Jw(}`gI
zA8!VuNQ*n&^#%c0+~W7Ahz&B!E<4jaTkA;jORE-rP9mRI9cmSuw$!idDbn+{qUi-W
z1@E=~l!(-R&X}xwKeymC@5iAS?_%|@5x07K4Z-kw;D&iLS1A=#Z{Y^=go}YLAMgj5
zRXPf2Jvyf51%)(5x(F=2_?RYBBt`#_T$^{NJ5xP<BB`Hxvs2|H7*UAvxv))toM8OL
zFyvQ5h?#IVe?uHyFstG5Z95mMCWl&`c53f~URA%%;m?5{iZ(YOQco5(FM=g7BR3T}
z6(xKG-*30+5L`Q)#F&Y2;>dW$<*SgCL(D`Rc@uf#IWqPjO67dRQ!CJvi)W|Bd7f0s
zHFB0&Sp^w}cOH8JDeOZaI9&)XKg_t%-BFK#Qv+A#^SkB64M}C716$Yf`AKW|dtN&^
z|7ARJYu#Ws=slg5Xe|HF045MYu25VHsf0p@q%nQgX#RaRMl4fZ-c%qiz@Uk!34TNF
zzmhs=7BYfdzQ2fuaR~hf(s35WIf$*|^Ru9$Lor8(^hFB9C`<05-T=IRQwj6c_6$+W
zrqk?0)uW3lP}3c?1q$zDEaj&vdy$a$9+aZ?i=c;9d~-e-6f}8oCNAhJ%_gNsun9Dx
zs@Ul?wq^?(gh0Ir9(gv*988XO*#VBuA}R^PpRjkF`C@41=TnG-nZAi#(^eFKbCL=2
zdVq-)be&JWhe{g9^_blsxYU}E;_I-gJFlJ&xd9i0;SE$l%VvLC6RwW{qHTZ??Z+ap
zhKU%!4PCu2U!LkWk&M{y6WD8g?=OP}9U@i-myOrs)hvjAFy8x{d)f4_>2Ha36>MNB
zlmCH|bQ~>4i}9e}*!sg<0Ui4%kkdMPL^DO*D*S<RL#J02l^OursFq=US9g{@k1=@{
zIcn;Zz!dP$;!wm14N54JozBxX;YE$8ekX-gfx-qJI5ojLU+f>8xq5p)IQBu)S)AfW
z3!i>^#{xI$_Bp@7`!7sf?g{iHW#C<yu(-vqhje>T{3ETPt=Rw^YGzk0wMe<Kd-*VC
z-Dp1dExUYD5`m(@^!0p0hv}z*^65~Hi!cB}^gHqH8#;IS(Rs6uWViKM_`@PK`!$0}
z(gB1Uj1+ZRIJ(ztYn!Ke^~*QM_>yE<d_--Y3b!8;d^)2T7=qX|inZ|;8NvB3(SmH9
z;#p;P!ny@*0R?csm?t*LSF8|VgQ<q3&Qx<@%KU&7REca-vxtZa%MNON1d`2Yq#U%4
zBZI(Z2OW-lNCQteoO)1I;zg?aD1CSBQ6O&avkr&Bg4hCtSCuUYaFP1@-#jG`MQRSD
zDphW{{{%t7kHFJzUBGzT4@~9pb(a22s6^Qm4R!@bHEY;qp`^1y%?ie6^iC?s;75k@
zZV-BYBxA3ftCs91zPJPCUW1oZ>e2{@^Vv>%5V>xVAh1L}u64xA6Bi{InM$}H?o0&(
zg&!hme(@Fp^MRpCAf36V3m;<1c;&#0Hx>D;)Ts5QbBSF@j=_JRJH}cX>Ul<{DL&Sp
zJW`==vY9<gj_=Dtpdi)n1MB9r|9~{7gbB;DXa9Q1S<{4vrm_=Cb?H7$Vm@B$8iF4}
zx6C#pmdSl%4Som1SCS8Z-`QTF%~6Mc%ZMpMfN<jDl=Jap^#iFR^f&-*I`xAYIoHGp
zvBE)|_3B2FhkQf<u7L)irQu1__pbDsVTFk-B_|Pjx7ODmD0Nf#fU6fT)SYyzXCgy+
zs~aP)9ykyTh8(}XoJ?d48{;Kv)-Lq%G(WY<NnSyjnI{MLO{`xZUL;8^b9gn2P-Aw0
z5MTS}Jlj4=>j@1_Cl=x_6vhkt&-(XnaLzR@-CHVzS^7a<cv}G2KRh_gNeD_W(Sl|q
z0cdr*;l<AD{sxt#B>`D4Pnf-7PeZcoa^`jdXOK$G_j}xl;k~W1-+KKwkTS|lC*%5D
z$Wz}tFFIf2-fT`68qQX^Jo<g@UPR5^+)9ic2U;mK#dt0wkCnJs8~=;OWjq}}oRUMO
z;k46FPeJgmZrU;jnViS2d4rw}G{bgV9E7NH`CF5btf*z%hJg2P*DQmkHh*GetK5v>
z8*+xX7sm-<Rm)8GV7(gw9~giD1<7G=Ny*$KJJ&%%cOzlGk!*OzHF<L~W;ikI`dn%J
zm(TECdVYGVv&rqywd!q=S^AifR&_S%>YIueT~6ua8|}_frcT!)V1=6eV94$BUw&j#
zZ(6zHLcD2vgRBUQ0yqT@%HOLAU34F0#(#*C^a-8HYLn4uBAVb%2&*<cGOs>$tK2aS
zkq+q=+<NvOXrkcY;o$t1ZTkdxTUiH_WBsSBXLvk5M`*mO_T`tSI)EoA&LA|dF{g3N
z`ht1+lqO_AM*73ty7}g8dku^1udKPIBKHA3pNo|PIs4~7PA3cyw~sz=s~_+U-cGr;
z6I8n5nE-h~pYKKNNBs$LI&%P&d*4^XB{vr{8k}nMYhS{so1p2yz&xz*=~=bvtvBLk
zC2R_zxz}Thmhj>OLc?eB{%)ZTD)#z;-3W8Pr)*l5>}f*#rM#v}soFGqO{-PD<-1Hr
z_qJOOj?Sa^<NpIutJsz=UykY8b@{6^=&}<@=CpeBU6@t&@Sek`@)_H)R~M|I-v@H4
zx8ARpl8SoTA4C~)`RP&x{k+rnToRnrsb;-97Wl*o+RLW9)SKzo@lzmrfA<IVi~c}|
z@r-U|aj6Qd9H<YnO4uq-{}1$HX5!<)<MT2F$A7=TeiL_xamB~qZE-jE#Vw<Jx?OHq
znr<h25AZH8+Q^>SsZ$AkLtc^mi%EI%aP`scH)b!LU7A`XQ1z#FK13_iw~Sy22#Go|
z%P4J5c<GE-;e+DQfu<%m_8{}*GQVY0xe~p&tKtVKcuiHc{Cx8_#8j^HoPcwQ+d4@q
zV^<(TB(I30p+}x&O$9Vz#GfF2Bqqc&I}EtL{tQi%&=m=aX&@J_$HgY$82;6iXH(SY
z&u?sNmF%khHsnhQ5AMvSqxJaEESan+mMlN~fua?$U|)wYLZ~7X4${RLurj0k3Dm%@
z)pjlIUrZu6S<Ofu@K}LNyJ9AU?;3`Bw3>2GbhU{X8#wN_(?5Hqr^~43DFpO~kh6i%
z)Lwqf)MVGFJssWP5c$}c3hU@8?9*Yd3*n{AEF0JP+q{KOM0EmJRYgm8k>?O2eLMb!
z1Y07{m2o42w9LfuGe6pBvFzoC4ELlyFtM`lG~o>!OLgayAeKo6Bwe+!xjc(8?#iUq
zunv+ZqR@#GWb0$GjiF@%y3)U-4=DS4)o}j@Vo(X)|0-b~rD5hE-YAVM067%E7qioS
zP-#yf5QI8K{X76!Jv{e=nT)|u<5A0TAZ?Gz@Lp89vJZyjLz*K<FFcq8cTDPtK-3LO
zS$y;tA2l<Wa^R?!R09ThMI<g$C!~lB_J_dwsUf$Ap8Ilx7SPK}>V`WK*OP>9p4Nz$
zq*4EZpDp)E8LR?vf3&U;GNi#+1zQ|cEqzZq=obS$j;)3NWgXAIMdjfs&w>R}tQXGt
z_+MbmwVA6WvNt5YZK~fGmyusn$4fqJzbaQ={X`{w6^DDHR!vaw(&9;DC8zUM68Vd6
zdvdI8IMwauPFxcMMYhw|zBcop=}F2?*rYN$4O>&!Y`a_Hb&%K#TdjKjLvZl6y;&OA
z-xr<xmamo?AW5<Wn1;!#UE9f{p@A&72kV?rc=RM=%Xq@?;0&}S6X}$>@F7{^v1N=*
zcVtnuFI7^OFBHNKf84CQPrQq2I3R^u;a`QBQCys5ekT>T`)q{nza{((SC^=DKlJ*2
zmtCKup}x=NaJkJaePA|sTJZ*TvJU-C;1RH2&=eM(%1B;(;RAn;V_{0A^`El#y6=(d
z*#fY0F=mib=O4n(zFL#ENnK?!a`MY5!!`4<84#bKID`beV^6r4*)m@M*}-UU3hv`Q
z2{3U9vt4`V>8lT`qjy&-2RPzgA5pKjzH;OgO(hOgw0kYD1uzZNCo_DKL_D})xxCtI
z;J;Vc7T?zTTO-Hp24>!km!2@3$gY!vFlS&TSFuQ&p_U8_LYK|1*K!mkrBZNouzAN9
zUpm?cyttXK=0wy99mn?mO(D3e>vh!OU82V<L$>&uls!KaTDEg(yq<OfzUsHdHHKxX
zAo>X&@2L&NPNlbe?fp7pz}-ap=4Tz!eU9UI1RDX0*xB~u&NoGJ!d$hU?V<1ZJI_vx
zsOKxk!zy+Ni6A+z6@$<;UD-_We|DpBEj~St+e2I?VAyum=@8POpPH*(`x%H>YCL%}
z$$^+9BC(;F)wDm40Rvc`VZg$ZuDPhRu2~n^*#u26&{d_AnAerNv=DwAy<pa?i~_!M
zOnoocDCoNpF4Wz}te#W5cs8*(+qFLtZ`ABwT%$@~QbHv>9~=(jtN5^BTmpN2B}ym>
z6LOnp>`C?cWO6tH_+{Ch2L3B_TQj<WSM6=|)*uQwz4J=gk;t1#ugLY3bVK-pNCf-f
z<%z;R^~S0@!-q<N70Qjl5W#6pywW~z`JL~wR=@j{YFG!lJfC>Mm;1x;z|A}J?YsP*
zT5CVdUY~ok81%6G=E%Cqx>hG3+Eq9+MSE=QFzsTH3={>-;`fXz##P8{W8N4VboM+}
zgC64vIw&N)eIPU>{gvrg|4+G|K#slKMyC{`>dUd!Na0Q~S2QcoP~p9~Y1kOQewa(V
zW<!Q<4|xq1Z7!QQ$mId#>?)m6^XZwjvcLEb04oA@R-Aj+`c;G%=;;!eWmGhPvvpr!
zwAib3Kd-@9SNQ%;A=_2_l@K;5gjmw@rirx<23B3)8mF6>3O|;|$f_qCc^S{s+`OJI
z!qHY8>*Q67kU$`A`$z`<<|#ncdWfKP1s{6KsP|c1+8p<w$|*CJlF`s@m+d%It<RaW
zBqwwl|EY3+;gCS^=~wkch~>f1<sL-}r6|`9`qa3GSs96}@<XJ(0vnB#V7z4Va)YcF
z7mpAJ?(#a(wyVUd`@1gBe2>PZ)uzcnPI~@mTfOk9{7@AQns5X&MTo^$Of`^YF>QZ{
zVZK`KQO%#c+Iy1vKYS>5pBcmY+&z^~h9A}#zgx8YklV5V>ikWiMu_03Pn>TLh<)Jt
z`B&;K1?6_!t2tGx_8E^efAo&8&Uzh0HGqx-)1*Yye^aLN%d6vm{ae!7()6|2>r2@l
zKwV$ncjvOuH0K8>*3Zm(6FWB2gUvt;kOmnT;%(BK9C%A!z)@eZr^ML{N;(Pr7g|-}
zTO0W{xTC29PLftSH!MZSC<Kjuz6X1J`K2S69noR0>`Sc*m?(-GJ8RjGV+tMV=~*<G
zWa#`<0KRm?<y~u=(!V|_Av($*nXmC_PRu}eUOl(_xGw1IZ|Yxs#S79cPJ>43P^xvV
zer<=<r*zYPexS@!(%FuHQZ<E8C$yJ6I6b0CN;cz7L$bC}r!=X|;~zb6<F7i+i5={o
zG<#QZjP(j{;`9?!ty?V1QIPT1tYDq{ecLFGn6C>_Ne1z+%vII#nmnCmH19%;$bCia
zkiGf}RJBKVWYU+V$1r&xG+lV3t}r+8eZ-^CGO}@h8vm)Bj+&XWNq9&i9Y9%i>b4mP
zt{;ttuEk%pyx69du32x_RJptq_-3y&hjgE1<YcK%Py&C|pzR6JbTH3?qh2PI0@&Ql
z;~HP2PQP0h!^c<hlq4MI)Vb2XI#QCfesHF_6xO2BPTa`TzyP%O$4vjloySuKd1#hg
z&g>st5u-SV<u-k4ZIdBf>5mENzmgda_o2@228JeKnPqR5^e5|*E*rw`52`Vh(|bMc
zXQvm-bS&i?Yhn5!Rnap?>ya8M*=Zy2#nAX=@?tNa)~oP3>le%{{tjt~W>rSjZ9=JX
zm^t%Hsrznx9c!&DvP&f?$zC`&e)+W<1EPQCC89*Q)_0SjR5AgcNTlZ3ieFit1Aouz
z)pkl}>=lu11m9Prp`O|IWXnr`pLADBRI&(v<%K0^Hi7o%5_xxniySSp8KTTjdv#xo
zB`WSy(?FA!tuFU@qa>>5vpF-yv&+_k1DvNnD)e?;Ph$zc^wqjdgNy~W|D#U!q!&vW
zVGn)Dj1)D!q@FHndNaAuP#F!>I`az7-E1P9>i5)HYhhK3Kk|T#Ca}!xYTM&rY7AB2
z;B#vi(Lg6o$v?j|0p4+)=asOC84<$#s=vZ1^W~@&t?3yxk={jm%$sFGZ%LN5j>|9z
z7Eeyxl=x!Uok-_T;_AJ`!XRutTr;`J{fasb72j8_E8?!?)6}M5X&szIs`v4mN=<B#
zVLUV?6Wk30LTY8KV@Nf~wUtsFJ4od~P!TmrULC0X^{=>HWqGKQzMXRIE*)f2XA_^n
zjee>t@aI<>BRjF$LV_07F4tySK}tD{;ce6BPL?jB`8t2R^jmZs-b|AifO8&o{P!vX
z`91Q-RI!vXy`>qr<1W>{N=4I|q{TC9UC*_o=fgAXj4>VNM7T*BZ!g^gkSTs#-b?f+
z$&akPyWkDyvwizuua`COpcJKW<q0El;jqg6%a1VI3<oUT--vce&Yg{}4I^VCxrb}K
zSZ2!nC9IOH(82n;!dGopBC1Bz2UT6Oam-*g85-&5uy-a-RW))s(c<<O&(y@EuL2h9
zD;g@{N`cg){cdh{)#=t%FMlU?SvYZL|K0#aBqHYb&lSv_t71hfncB!L3s{C#ED`7n
z?JZ@7HNHrADN$@8Ww*8qbrwx{P6(PqtN-`!!WiiI=t}@>4F7>%g(if+j#jrhXDLHL
znuV%!?X77w(dzZJ51kpgpPPc{4Ffv2@;}6E6;D*)IR2tK&tJuD0XrCC3P)wS;MGYf
zuv1Ih$h`Ef>936h29?m#Pd$;)a(nB&+tfx-?#I{bdy<l|rbYa8le5tx7)Lv7M(=~b
zviBYe&CDe%T3~7wcG;Op6wxqXZch>(l;2^7JDW!T2Wp}-6u78f`7V>(?a;$P*MCLj
z0LF=G_e33^{>!y+xnK=8KV6s8SGa!vB^vfxy{%8xAL!UQux;UI%u^gjwPw66{tPC3
zm(%PUTwcxGxfLz<U{1?#eO>0SUbB^vr3_n_7P)gtb~W=fdbTnA{uB0R9mUZuEX7Pk
zz5cHW8RUd+o<W1FK=^x;z_w>W`ZjgoM}#nGA^P~`n@^tnQ{%73OuUU%d%dRR@$isb
zE|@@mW<7h0&0hy5)uqAsm0bgff8rY!e{O0=&L!%6tZ|+<X8V)qF9h(L8ksgR0sJof
zF9<nAs2+PIBOM=rBgg*?7|A~h)b(o~C2{qWcLC$mv-)+pCYV%PL{PQ_wg7s_Ppk#F
zNdpR!9tv;8d>_jBp6tk5=Q(^5$sH7C@JW*@IQoc#hMxQf>f>3;bo$s5OExmaVC#(h
zNo)=lN=_N#MZ)Ef)1PvI2@6l>B->&>i*&<9M1-Q&fdgKtwWjw~t)D6PIK}6wci*fM
z0><T@RtaCb_<~`FlfPcCym>S2!Uwhh92g<%gL%(PO+RQPW^{BrCo7W&d0s3vH^j7e
zZEy6r?Ig;`ujsY~91w!f3-YxU;5OwqF^Pf6@+VK2J!v~+X-BWTb@%1yv-#J^GHvK0
z;_~{QhuABwj=3;zWw!x^n4}^h&#6YGz>UfN%OKiWf7(W<**iZ<)Tld6qEdSE*$=ZD
z`W0MiBgoN?dA5T8KvrR?Q}bbL>D*UdQ{26<Ka1ZaTefIdr>I1ceFZ6bx=D+heAI5s
zL(b>Z1-peNk9Qp}uVLucHlBe5W7<G!U=^<l1A1jGPv6kw8$lC=IkelmEc`Quu0J92
zMfZ=dAiPz8W=tq6?UQsfP8uyy-Q#<2nwHNBsggTUaCKj-C9CK3zfZK4dU?4<#R#wg
z-9|MukU7=($43NWMQJgsp<`AK$sl-VSA}Gvp{S*^aBTw80oqM)*u47zJB+!ad6=;$
zs1XnV6r2eqc33teR6ON3UYbcU)N}#}^fw1$wRDM`+I(G~AvVYsEO}&m{ZTT4BU(8@
z6$LOfQorGjVKoNUgOH_PX^>MLGh?$bUJu*nI3wDa^)$$X%eG8N3N)ngJRp5Tmqe%d
zM1t?gPf&Aj^HEG>^t?&^*Df}Xav*8doI9??O7b+&JZ#RUdKD&2rXi8D{{yL8iM&UZ
zK;If^*ae?U_)#q0xiiKS!9TsGODdAWbM2`6%O4i5Cb-&JrX5Xi**QZHoo7l+I(EP8
zb(<$c(BPH8!8Tk<L57AIy%fDk*q~~0!+Uw_c42?sUcE#(K(M>=g58nl1r4eZBQO)a
zV2RY1a!z+P)|?D1cl|bu86K01ghty0&*Bk959)yy2-dMC_px>2+{;O3P9n?pyDunQ
zaSd4Y7uxjtB%Qw{Qwc4MN~c2=ylV33&GuHsXK9_jGCFxv>09}Jj9TM-u%cCb-9_pY
z`Um&J3|TY;hed)_qZ@zS7`X!P(cnpn+Z3$`!;mo-X3#59!~ODwzQ6|zR$XBj_HWUb
z?$6$k(nhFO0@*q6!6ADwd+*&_)I%pJOA<O|b8>05y(9Bnee_51YQqpA+EI6N3Oz({
z_V{1lHRtnrsS2($3zCnjzrp~x|Bv|TDK~W$cr@Tbp)46LHP%59%KDY1>Y5?>{4{M!
zqy~v(gdm!VICUs78WWwJK8(0zL!i`jrFd}(RMTH{N&fkVSg`dkRn?+7#mXd~O7<~6
zO=wE5*Xq$wqP2M21jY?kbLO?zX5j9YewTc+-+e_(8xB!RRiIHr-bIM{yPt!AOudD3
zOnC-fo4e*~X&@LxAaeipTGXN1uzxbRL9jK5t}h9+k7w4$NbIc16NfVxucRRV2rqoo
z=}Kv$&b0W9VM!b{(xVe1ogQ9Ky31$x9BdZ-@T~n42V}%kN_T#DVo-4Q5g2BiffEjI
zMP>bDTnQvklv>u+F$!i0b+2Dzb|l#9eW~S5=oTVjwnszwRVB1;z+SS#;k=Yp-4gUt
zLAu|+Q3nwpoepxfWS@{x@^cL@EJDaPpSjS^1nRG>^+eS$pH}m=bA4=3)3KC6fG0im
z%vLt@A-cnCD5`@t78+-safK-Kwh2yO`aoVUS3?8A`$AQNznDu!id7SZoph$pley;0
zaVI^luilTkT%cM-z|pJfP>0!$#5#>0%o!bswG~T>qy{<6G`gm1s7wvYeVytm*I;vZ
zu{M%K<1MlRoU)pMBmK(k8~x{3-C!({OY~|p^FvO?E3ym^xkmSZ#E#lO4zmXW9)H4m
z4MQ3!JNdNbata#4P<*byFG5%Hs|X0~NVu=8+CQj8e9+&kbaqVZ&otJXmmhMz`{s}V
zbwKCNV@~^Na=gEHvwJf129SJ+jRSeQ;7-i9c{`+%fc9W{f!=G`-+*H~PL<v^KiH-A
zidWM2sSta{V@)!Y<@ACZEb`T7(g!W`(;tSf7ozMG!O}!+?w`hO1%D?w3+!uN*5r(3
zB02sDfgcn(zWhujW5F6%vI0awt#_VJvSf@Sg!c9~C;RUsX?3ESk16V8Gl$tNwkePu
z{=<HO&g_Cz3w#29mT=Li2g=mEGD#gaIfPv2JR^h3p}79H%Kj-?VSx@iUx+@+<vgSO
zKiKzQ*ZxvZ1GyM_I>7K(a*Bgm$rEQUV+<>M674EPD@L{tZ?ilKOPl%ua%wjSoHrTw
zk*u%in2lY%cmxtc#_(&+fk6VOb5PNMxS7@#5{_7s@4WElz9l7lMii|(4&3c$`r2-(
z9zb^Sn022yM`_SKJ~r#54;xId3V%YXawsAR>Y3lFT@YcCCF&KPwrspxB-v4;<$?`R
z8dsQg$j>j>y(Uto(SM*J#)*?Sf^p#PL;dtbsWNU)`tm`-!V@N#%tDL<X8W-6sGru4
zY<MT(bUslYOX)YUG_&;**$mg<?d+po5+7qX4td^BR-r5tC}!U<mRz1f^YYG6d{(8#
zl|M}jiU8OMF`pdTS8aOBr{aa2h?E8mc8GLY{`<pO#*>tjxwM?7Ngas$mjIu$NDv$r
zg#^D)pH@5Dk$4fVV7}ANguByYk+NZU`@Mj1a9oQJCTy?Q^;FjGzReqB9UzFP2P(f&
z@51w$i7hk_q4}~QpR9V9V4}+!ny?szALR+*(_Qp_Tf{<4EY{`^UZQ&EZn5o-8RgS}
zI?RlhT3J2q`S?_WOs(2^d)s#X72wC@J%9Hf$e#I51i2QomNOjGC@09Y1eEa9*EjtK
zy8kwXU416&vtfwjvCnzwe<0EVfPhrzyjH(OSc{lFwT(V`ldRx%lwi)`nz@$buqiB~
z=<_9X3K#Y_jJM2cwCl}bK*mt(UFFJCo};nt8B)Sp_w4O$$~ygA{FUF|&DXRQ%RMU;
zdg_#~z58$-Mfh>G;-H)|a*z)sAXC-2{VbmOsUIM=8ZyuOr>-8Aw}DHm795(AnQ7Et
z;;1`zpF#fvy@|U}`2{<Bbkx1w()P`dGItoWPvBY^ywg{>`W`uLKn+bZPx@%jb;cOU
zk1h!ij1;SbfYP6N&7>?3jU-ts;HsjcvsB*XZ7l`Q0EFJ{^P<pKr7j!46#XhqhO*7&
zh<4x3-y2lJk3;&L=tjZMLXdgKybd;vksj3(A4DP^%RQ_&<vVsr1i?2#suzASZ>6oh
z&l!eE!6cJSlXce7I&HzXNdWS#=pWwyK{NU*$6HlCLD^-(?z)Xj=Z~7_C6fmp;MK#c
zs*|@QRDTqg>C;MBr!=4J6H%Gxk>?*SM1$*^^EfS|*c<$sc$=5|VBT#ZK0#_ncY-~*
zJ*TBAi|u%&Ssf81swS3%mhAGsY!L)j!u|U2L&J&7AeJwnUM1+^^3x%chby@sPBuwD
zb<0F``3<Nr>qP3k3$x9Dhg--sKFQzW7b3ReN1T@Ans*L_x;xMvLz`3Y@|*_65&5*V
z4n9_H_g=r1SO21jpC0a=hHR|dTVJ_S)GmW4WviZS|79aCi>s_P!CrD`@q)QD9|sCV
zt4+^Dx>#5FiaR8doWroXC&Nj>mo637bf9G>Hz%?M$;$?DlWxt*6JBuYi1y%9)@nS>
z$D#X*^A28p)T;zTiWNH@My~LMu`F=l^X)7(Vy(hBb4t_A;*j*i1(~xBPFNLT^5V0C
zt+g9&F_Fv<d9+!wPbex_SLWE<+PimUS#<Z+3r_~A0{z@tZXhk9yP;cj!CMk*6@9$B
z{Vbe_zUPxnJvB}#ER8paD!zRp)76*#v(E>qtH`RcYJ~Szpu}iTsLXK`3cx816zeof
z>+Dgh?Mr57T@gW#k>NDn@FKoLM+_aD&u>2PA|w?gj&ZXuNorq1%8%oY#(lE#Iy(46
z<yRj|)J*Gk2aR=-2f2^PNij`*W#UwGcM}s7f$SypLgA=+RHLb>xz7Y2TwLj#OwMOm
zl2Dy@1N--S8bSm5Y4S3Sve~KT1&{_I(L7>ljB0kU8j#Jl5&g9oPda(bn<9uCG|_K;
zL_Hp4-Gp(YhKoqGh;4~Xe{wWCHmew16wb&oj+;eOXNw8O=6{xvB6-iVJwNio_0yD1
zTr-L$+?D?$2a218-NYKwr>tkXHaH#V0B!26EYwLDCXHl$_|rVopw>N*5#2kHcIF(a
zRv=Ilmhiiz#oci#Tvx2z-Bsq#o7oYGPuRbBRv@J6pOkZ!btEO<NuLP{R1jf=nDh2N
z;Sbh58GL%yF=fiNKfgWd05W}@xIP+PU~?L9?$VpQ(S_5-s&2^z_EQyPm|hlJRMx{b
z_<W-1Xhhz17b$O4$4mUa95q_?Q+F!Sb0+dhtFe5H7UNm~@HeR9Rb)Gz-n8M>$zNRW
z%~lV#+2ap9R9J{_&4x26u>e_W^>~e|PR1h7W;H#&1A=ue^QHOg2D&P51jz&0!G9~9
z0PLR5*~_~(S$V=>NFvU8>*8)ISa<;jOEwrLgMg}zE}afrG2Tx4pHhKkhRIFR0pxzu
z7RqmckcB`%h)||Pd%4`OLE12AKW+GB8BW<G{PaK5)W;v*tIH4z>h^D2*>98S5tJIk
zuSNfwe|LDHwPa8!z~BeW7%!=s7_W_MG|_Nj<u5|}xR<5?#nBvWFH6{nSbwM$2MOn&
zh$B&th?Vm|y>v+8Ff@{=>emL+U2O25_W`5&<_rU_KKfRS*#(}~YE>Qonnkdzbit1v
zDegUZVZ-At;}3XBMlnrz2Hq9J;|tR=BhLEypfS~A4iUxB27mB(!R&(6&MEO;Kavs6
zw8w{-&wWA*73+_}x!%H|Z-}AopLHiY{%}TAIjBZjMY%AxMyz;EoXw#jPdS)&Ah=sc
zSXYa_RK>4k;Sa*RYLCOhFi9!vfaq3u-?$RAX3bCk93bQGXEQGNdJPc_;B%Q}y%(P2
z#dT7|9pX=g81i!gYpjMK9_h-P(aF&j+GMB)s#wg|f<W=wHbZ?%IT*WS4Pu_7HgznG
zgRcsd_1C|zoN$NnF&GqwOBg`I;%lS@2`J+2v(3<E%^)hZOCh5^w%k>PV^U|99{l7~
z${qIga5D1*wF9Rze*gRuK_Oennb4AX2JGSCB|*1BuY~;R-ljH0cL&d2(&8H$m78(?
z{+y-h&2pN@@A_?{233}lTW?lEAV=w!P&!q38J??Sx*iQ)*u|eUo%VL-DxJNHW^j7w
z$m07ovu)TBp?S-y2a++T({VFv5{2_h^xG>Re9F3hozKlk>LcPtFI}j?uWIgvHyI{r
ze@hC+rLXGNrlUHTJZ0PEUOl?#&1UFN6F4K}Khk#<?X>v(aQ=#ql%dyPcFA@Qt|&;B
zBK|=g&97Q%?uy)L<AP`EggiW}Kr|t>pZ#q7UDTJ?u@nV=Ztjs)-`OkM#{}BrRa^YQ
z{7%`grjV(J;bF%-R6zItKIgpKIA5AYo5+>eCP)YL5cnRtd{v2f@)y~zS~zgfM897q
zclaCihhwxt97N*uw4MPyY5Y@QDN(8SSW}e<$nde`+aDC)R^Iu5jIUG<n}iEoMCIk!
zxCcF%6MQ>vwl=_PDmh!*fjigeebwIZc#B!9VQ^kI?8A;jtRooXI_1e0a4xDO5k)sG
zIu4$wbEY2J<7s`RCh)2#>tnasq?Rmk!ScJ#pFwp-HCRa7G|y17rF3aGTSkNc*aOLz
zVDRtQWxMi#ZD3mWSBslJ!jRw@tI?;`OJZBF9rpQ2dS_kqkW*G7BJkTzAc!97HQr#|
z*2q8}O15Zdh%&&+Vxwu$^de=F>1Dj~nQyq%qiwk^dI+2$(3Qu)2WYZ#)odLXHOKeS
z<=OPhIB1FFCv$TeA4K`z|3G6Y7tFvEM9XxZ+(2MEGkf_<^d)=y*EZ+5yXHFzhR2l9
zs~>dXlpfYcAta!U{(X>S;j-JMwuEs}DPOt$XN)u$2Y$)jl(~^L>w;IZ57RSU?4G!I
zCwx7NdKLdT>yDo?^rFki_nrFFMn|?IxW|FSd7kLEt%9~Y^+yhKhz_ml5$ivLu*9v)
z%KJui0T<gQtF}L^v`RkvCFn<6Z?!E{pW{{pn7eOq`tj>@h%f1VC4Rbn;X$|@N+Jx7
z0}NK#2C2ASs<Z6G0Eh7g`PtgGgbC*Z$!*S6b+C%_+#_BGzK~82Z;`Qvz}nZZTzv0p
zs)iV({WX-uy(uhngF3!%PuM$4taz<dBfG-5h`TB5R(Yuf%T1=9#8;mMUv&Hj+Cuq!
zb`EqVHBR{c*5^#aG6tE<rh40rwdi}j@O{G{^f_fr+hf`GAn3ea-7#UjQajrGh>z^X
zXJQG-8P%EVJ(a|&b*ps-Vtq3Amgb6vj-C}bDQ&0soaDSjU%zkHhjTpdS7&;QYHAiK
zqocLK-@%lFHP^B9d1jN{yIo;nXY_`<aZ9(w9t(F?=(@`x;WP(*v!?l6m5ZvM_s=>u
z|5)9Utdt99z5x;YRNOW|GjSOXVsXSJAYW2Z;a@kfe=ZVR;DtH}l8s{xQypvq+&kM<
z>k7ou9fV~p_M0ga*KsumJLQ|yH_VkyxA96OZ*H(<`s|Z{c@m}YtYSE3j_)325r)GW
zHhNeE2<P}e@0Nwm`|cMWT8SXfB5-y|iT+R{>J}Yn468QyotbiMqhH%-#P71dIH)hY
z=;46wPJ7#9-N{iEf@|4<quTme<TW!-dXf5b;F&MIC$exYZV%Eci!pgTeOL3*hYP7K
zuk%N$>C@uvQ@?P8-GP$e0@sCO8z5_vw3kh_Y^Lkax=Tou0Y5o*zW#Bcccmi7aeb;j
z0rVe;k(`-o^S~!>Pzo7h1A;G~yUGR>c{+f@sNEOnK?1-gXYTjV;OUSWcqPD>tgiPO
zoY&J(0CS_K$D~XkZojZFx3`R8pf@1^$hSuV6OQs7{+(uh%jlO>Ttc0e?>%iZaNGD6
z__}59#DZ+QemX1})sF=6*A=O}D<RUPG8npl7R)j~z1pP9mwqpOT8>Wj7(p_ox}G5%
z`9A1@r>;o-^3g8V)n%4LqBEt>Nkk<i7|_N7O1l-;7d5z0TzgCKLMS6t{)+kIUTp~f
z4Vi0~w_4bfY}!PCJ~f<x5@AHGY78>*+Zdtd+%ydmeKJwtUhM`ueMJl7q1A>X#9-bh
zkCE*UT3^4Fv_m(RubOnwLh{`rtwhxo*T3Bo6X6vZ+BUbx&&wwJ{WB>V&xKN>RY8>1
z%uMmKq+ddL(KE0&eejcE@1cRobo8vo>pQOx&&8|J>91lpMP7>7{%V-tVc#Yc@iw<P
z>D}q9X=7n}D{Y$6d?>=No@K2o?2w4Um8%|LsQ2b#gzHV^6tLNZ^lM@J7im|~d>%K<
z{pYleo2Vw|Pn~NuiMIhP=a66}m^;w3HQbQCcI2mvp-NJr%e)Zr(Bb(EbnlCGth=;k
zYR&HN*P2ZTO5G>);s=rHJI3<j?qUAG^1TB!nX~rQ_I@#sl<&54KBIjso&1CMe%wU(
z13pKNcKL+9QmORWkAcS-2(Ts)D_#C0q@b@g@WmJ(+ptG3813=9P^Vw3TP~X-!J{>2
zpqH?HJwwWJ<3s6!oi)`%Jba#DaFj3g?gd~ldf)<aVEHUzpc;H?M6*si<j7#+@`9I%
z&J>(%pfkU>SCaS$#?FlsD;o&0H-PgYSydlBj+!w^O+vjjY47)BWdn?ZdTvYc&So5(
zK5L=@VL&CSfT0zr?(nhI^-VGN(6Hb@@bP@6>ol`BEa5|CwV(SLZlGmeQ^=T=PJ;%#
z-l;zDQMqX+c@~w0LmdS&f$+*jl(bZCoguf5rNCrW1J}KzTbcP<(l(ddWk7ppz{}-v
z)A{wRbQIQuu2FXK!gX?vCj!xO$B5s1E2_Fp`RK)J{mbe8u(S>^qllmc#z7UKMu_yM
z#9rpgZ7I<+SC@j|@F9=GAct@f!P0=~;@U@GzfW!$f3?rQ{MV1Yo`rgQxRtmZTA71i
z2-vf*-@B#4F^Cy(?5<cG53>}|LQ`n<@TiXEiLi)uvvJ<sa1N=Gw|Cd%yB);Buy0TQ
zee9%99+a~y-`FzHzoU|LgqEb07ioh{B>8~IjbcL1coYy39cqou`TD9Y+2=Kgk3pum
zOF3nvKo9xld9wMqUbab9@S;d!@Xr7<j%oq@kCDPKSQzF9^+X;250jhjobV5q#a^(i
zw7zM9h5?=u$~MUyX?Go8DcmiEdHOb*@-SQmsJ1BB$-P47$78O=p|zexkX2XH6~h6k
zkYxjNxvEoWG0?v&rB@3V%qWoh+RiCT%l`Fz3_fkNAyR-?a@9!sRLP-_Vbo8-N5hhp
zSQ6<=jR&v3;;wU^g|)skn5<#6_g`<~Q5gCAN0twC3-HW(4TfF#eJR{{EhOz6KcA+F
z6{Y`VPiIJ39>EVaRl0tUY*E2xr(Em#_KozOHntrZ4Cj$zQ&PaYHd%XdbawRin~1<k
zr=}bYi~aYv=ge_fYuJrG_<9Pqpjta<4u-w)xRa?U?b<t;&T-{S#E49g<+Up^)zz31
zZX@)pVV8iGm{+edc?D&1O{XktJ$%D1SC-~dD@cZc=3sTYNRvg~B|di=jf2=P+<$u#
zmV&+b{lSaN#-=^oxS|S82O@z`Va>gF56Rq$wAMXZv@L@03ey>MA!Htd>gU)TPgSV%
zLJ3*;QngutBh_Vq%RIndvAVU9Z!2L;*J>6gzGZ!B=m6402HDqqky<ZZyxS=2&)=bf
z-T;f0i(pX8It+VTLOotLgtaEBwyQXj0lkp2ylOn<x=!u>Rw_C2SlA{NLn@|Q1`tAx
zS@(Fl^j${=Dm|_s!wG@NsNdM&^X(%u_=3g8y{9xm?LPOFHf|Do4AsRu=g^!xYae{1
zA{IdPy~DncNey11HzbEulc(0*+~0I%5$G!tSv*Em+NY0Z2ozI;EdJ^*oLY*Hk`^V<
zRN&r8@6Oe}BeRlvj+^malF6&{-8YE3^f0d>-_<@nP`ZB-<;op7W*?m7gw~kyXqhPs
zMGTY(%3mS4=v)=;?uh6SqKI|~MGRuo(*I7Z$S*JI82j&$2DC*M0N=tef&!!fS#hSG
z=Q)gme^^L2jEO#rDe*HmI#-(5LR1T>vr~+8UZ)t<-tB!FCvNA3E%=2v8J033A}baC
zeobBTkPUlUOoW5bS_Yx#rY<##Yt)hz8Fb1+;d&9fb^@TjAfHl8cW#?rXC||`sYRW8
z{7a)|2Ov92Dd-;GdAv#Bq@pykOeQc1jo9lA{1@20TC#Hh+=GQ80)HWVM0NJ5qae#8
zOA@#zOgpMSi&)m`((U9-D{fW+3r*0!nA<m{+0t+B=>65^6M>@mwnp3Khy<W#C&kqI
z-Kz(gP97huU)woNxHN%eV05o{7&;E}?KdW6Qrp`mRTeqwV^tzM_(38<!SW_gzja@C
z>w*<*DrDHpp(Z&)nMx0eo>$)R`g$v)i`RF<-T({|T%JaY;jbNpc}~cDxnieE6)_Zs
zIc$Or%(TvoEox1$X9SgCWNd##iY4kS50n6e{q#YFKLWgS$y$l-OpkR`0HIYC)uxi8
z>s~8YX~VTET)07$Xmvyb|KOCDtC@CkuOcsjqJ*sdB;wIX2uKIIB@38@Tx;>c31j4&
ziKq9(A<`DlE0PX<PPPfI5$3T4vaqlmHb@#`TwAjf>PSJWpA0S8rHSZ}VmU0NUPTGj
zAep^;l@5q{(lnPmyj8Ormc14m?x&=~Kw1M@0c05Kzw(<?pWi*bv-WAej)9eO{4^1y
zOFRUml{U5R=99L)#Y<{;ZV5S5%kP5jVkcR^DYlA1=I3>xj)G&I?+uU2$yuWN?{v*4
zE;xRICoD#;+J0Ypy-t(B%BtnO)4bpL*~w?^(u8?1o6F0a_f!(Yk-K+4X;0sbggRqb
z5|*EOQ{L|Lor>zBBZKmVU1X9twIJ_ReA;!1wN__wKY*1oIb=ZnN`tj%;~HTrSyj2^
z?_~DX!&aAZ<{uf_(tllsTm2uTK7XcbBaNz6c|w@E=m{1059Auk-aR)nPHw+iR$=eq
zm_E^5BlpK8d)&j`82)AU&6E4j?sWCevo$<&T)p+J>_u_GRtX{COy|6=(J>V5d$s(n
zw;;FnoGtsZ&us2iU!+5@!SbTAktXH$)p3Nb#}BDuQ^%yXpxpmJHFwt6x06rTW@yf6
zXa565eZT*A{i$uM`nJkHOHtdj*3ci-G1wmuk!00J!F*c@2Np+$TkYHxTlopjR8+-(
zt(%gHD_QSR-QmJGF8(TvZYjy7sjb}!v1rowYbRr%DI?#`)k_ZX8`EJfs#6L74PQJ~
zVCM7YxN=$m!poE<ybe))HLdWJb==3o-E{KOr>!RT9{^pkz+uzIC*l<~ae+abbE9ds
zpIp0N?z%PgPI34<NScS?|J)xjo~^`<pf6_F2>pry(sxUmR{};^NfBXHKK!ccX>V3;
zZrm>X;uLP_mh}`OT-((U)MbERLW0y<cnVyy`&6#$`^{P2;jv^E;C?evyX1esv!Qlr
zYxM!u`A?OaG_z!AI8Vij{Lt{<*jxwHpxWgllWv`yftCk+g&LL?BvcCFSzYH`<NXVP
zmkBBy4?KTZ-re!*HFTI6Xka64#D#Rd6Xr24Mf*+Ef5+hGe$8xM;J;2xv_Tzz2q*e?
z67z$-u+=kqS8Z1FtCaq5>Ftnc2Q)tY2FOHxaNub%{`0-=U{6K4vW5n$;X@V{2cEWN
z^Y@P%Kd|%pMmf^MRsEX}cvemxWll-FzFA#2S+IR_bv67>_{yu7!<T1vc6zdL`HU^7
zB)q!8{&J@DN4oVyd@C3eh*hmCb2g~-OD#iOLKB6yly-5ab|bkimQ~6)c}J?Y@7wM4
zCVyV0{b5ab7`OQNB9Vt_D=+xxtE!6W9%k`&2B6=p)yq;TXhl=5xUknJ3A1aJ!&kVt
z>sG-Frw`cZC{4<}wDfn1I314#Pt2TA@?5mt<3LX*GMo$U?XO#6MvP}+NxB`72Sonw
z<_%J(rd(**6kLeopoCjwmv&YPd13r%pWyr9uLn2d=Vm0f_`txCtcXZ{%I*41Pi24)
zuc;1n^<I5vj=kO2#bdzj)~luDKowSsJ!Z0LPyVf=4L;@CBbE<m*H(^6(mPafdJ*&%
z&u%NLR>V(L3ikZKYEpm}zy}_&PC`-iiHtN<UKp%@yONQdKH=N?q#U(ZqA$mhLqfnO
z1+YBq0d}U2x3Xz}30_q8l=q^yUc-|SaU30zRa7}CToEOojxc-P3nbrf@H$4_owgL?
zeZjlB*QQUCxAA!5r44wpR_$l>;CP<lWS433J!cxMRsaS6&&iilq!#`FHqVhlFmw;8
z0`o~UZaOsct`n>EB_YoPqsNiik?xI&7gc*YIbq$t$kr3^c%=X=b@m;IZxjStQ!=7G
z8rCno`~8<Tuy6LgXcNhszno`ttB1(Y5P?<t52O??ZDDn6Dc%s@1dUh;a9)1=`-=$j
zbdtJSALBej=t4_bbcBmg&j-~Bd9r;aLrR!n&l433`4ec^cF$J6$jbI$?-opf0Xt#Q
z=k<FikDC?p)d|}U*ck($sM-ESB0K*-I<SN?s@;G6;=z+h+dtDU#u>#TZ+4!%DNM5y
zn(W}_)Z&ANJ&c+aWYDC^n$T(AXng-{4-AWS?V+>movWwLnl9KbRSdsX<({Gf$`uzi
z<Y$%0b>+TdL#Gmyn<h5o99Jv)n_2WNONF}fLFX#=EZ8N?z(vC+Q&*9g%wdAXIS88I
zQ2V8~r2mRI$I_XFCNv&hq{Rv`v3+O;(TSbmP-Y+8X}dc3m<rHrVgf^D^!F6ZXOk$G
zcG(N-$vZ?>(abq}7WxHxv<?$nd9`UG&vRv`uW}4xVHl=Np#<h@%eB7r3$#BRwu&G9
z1nO{f(=2&Y-;e7qg#xvB*XkgU54B{~ipimh;J+@3^mnIr_jCQ2bZgAxwPX_wA^YlC
zLK3uf;pWq0YxN7ErM7YKGLqCz32m=ld@+5E(m$7nuf9I09uaH_XP}3Gyma3<DweY7
zB#~K0fo>>G;8L2+Jnnd}*TwO*kh(<5@(A?+A(Y10$pPNAZWJ6aPv$Li<@K;~`{v+2
znOqN~TXE)PNBK`DV!^(gQ@+ybS+|9*kMZXsQj<Xo+oQn`o>p4WFfKHFM71OJIW9t#
zVyzA9Vpu91&R!e951>p&BkcEo@M^3zQH02~K<Bx=nVj52#9Qbu9jKuDKeJDX52rQH
zNBQoi#1nrRT(UHccWcEe0-SQw_@3a9{0#o#p<|b--E>t$z_2tD7oe))(7mu;>**jy
zgV$*)@$9;8-p6FkI3pxrI8fMnR+xx<lCPA|UNt*LRbkd?5RuZCr$G0K#fXz0^ag6C
zi0)YURt%aoR3UExwR0u0Rx;1LMSQ#4L;G&iPHxvLw%JNIDz?Ob7WiB+Yd})DKikEY
z;jR*Rf(w<%`XKa}^BZQH7&K(>mrZ3~urW^u5#dMm1(XWhZ(lHiX3favkSz68D`TCQ
zkW)uZhoxiEHSNM8t`$UnuY|`Ia(#(Tz*xZ|+b#n?2{9cL^+C%a_!CS<&RoL2iauab
z49bdzlY9$PI<ai;k789$hd6JY2>2>`0i82y5w{-+uE~apL^~mvTR?%K1S?QOPl?)e
z>l?sdLkdyoym=8SH-qp<byq>E;efigUdJq_V?7GEBCIdSe2uBqWBCU^V31Ee%XXZ1
zreEDJUW<9FRWGLe?v!Qw2;ZpZ_+IWSGdkq8qj%H6y0OUd7sYuhwgL22kiCUFHG=ps
zQ^)=kv1`K_kiNGWb}tIUe^F0AQ4mle)wL~k>vth-?22Ilw4X-(Mr^tf&z<Lf^lE^k
zsv2z3-_dmrGJEzJpxY;1qoE2hLUMB)1s;~L!IL!#ADckIIQ$r_pGGDl>9Q8d`Lkm(
zs!d<UFn#6j9WES|7rtenWby&EK}CmUMF(|$a43^>-gqhhH(-VKpWF>=TJg*Clnid<
zOzi6NrP2W<eEfuHSI=?*-b0RxW1>MYty9c(XGxW?q$fBao7&MX$5`@JGAQc$WGfhd
zw735W%)P^?{zkU5Z+7pn4R-kp)=R`LfP_iu+`lc)7_>D|)Ge5%vA&^h6`zaSNJ<rg
zk1OK?$zcX0eZF>#l@YHt97;7*p$p8+b#OAI9dyWJ9!zlFy>|opTyuVYU_2*doU?&d
zhklb2L33h6J5X`os9no{QnTY+JX7Zin>*kTnRgHy!MBWm)6Pusf6T5SsGc9JDkE=>
ze||&Y8JjY&Gih*kO0v@gqA;{7AfOu=)n)<$*SDl2Y<4k(<tKTg*UVl^Yk4+s^}#of
zhLkC%{p*jH##CQ|?Xenp1<g$Llx(%86VrrX&YGdApBWXN@Fk^yAueSFynawy>iZ`0
z%k>lcEWxqI%oW#-$Ls?V>;jBvHXeQ%Bat!Qef*6A)!f${LS_GcOf1&yTuu&d>?6xP
zU@&(={ZLm#tP^iD>#A5Po>7<+%8-EVL1%{dT8PJ-8h&QD5RvR?mLT0+cXo;`;0eA7
zO9T~j?>qE6o}A9r-x4^xf8@RO?)Q5&rK8d^7lEsPzc|Q0b<LcbH23+N{U6Bvg^^)4
zFD#K>;f|ZelKr=Mq=PXeYmN8oSUZCHWJKf5VjNxO3mtn5uamP~ahy`R0~*BN*%qpx
zUhR7Z?K{1BcH_~#7Q(lYsA}7o?>&6kHNzg%E&=qJj89j3@;7Fm6t+H&CbNS7gx*rG
zjy~hw1a$Zx(q;BXjdQ1`f@}}(7Q78ovDW{~DGTh4_a`<Goj1K;Ukp8E=(DWl3IwCg
zk!J08m0d$${s*d_IlB^i!FYTs(ib?JC1Uk)PCf2sPzN@ilpeP@eq%8Hz0y0GnuJR&
z4C7C1H+;$$JPxXX!F~T?MzGrH&p`w!-d;Tl&;6Z_Vb74^g=D1%_Wji&suck0)$o~#
zuz`NHqu%l#i23%V2VJRh8%-S~JIWS$;8*gN*xGivs}@Xgf~d?Y-%n22BvPI|dhKnM
z`K-HxR1}BXvl5iK9#*t6!a3z?{4rKEv0JiUY6r3KVXEFfAX&H9zuaJJrp3Dc@Aay<
zdnr}kO9)s(t55l$AozlK$11#y=ZpoyCeQa|@nW+F5PZh=%d1ovPetz88zV|v9B4ME
zK{#i1&A8uipF=rQ>&dgQEsv&Bl#yNX{XajyeX51x_TbB-BclRT=kND<bM*`2YZU{L
zTC&Lu<s+MnA%DJ`<+MQ+bue+fd1hpMG{Ndb?C#Nx{N*lC40|+x1{?xPR0V{#F_vq8
zSrErrq+4TF1H#f}*$hXtARF&yck=%zI?K4G+cpeubP3WmN`^F2A|r<)Axd`(2qN9x
zf{J65px_uN-6@UqMx!7h3>a)M=|<A$-TR#neAw^)-}iN$=W(b{eXlvl?^%2X-ait2
z)DaN*IXn=}XZ$#-qa;!(e&K$SCBt|;mptc0xZ{mSZPNk7|1+>J;V&wj*AJzh6@-e{
z)_hsG@qd4SoMrvGCi}YMdMsZAC9%R+J=;~;_wV*I*%!eAmUOHH&=G|aHacjhJtmQo
zvBJ9t2&a4+JZZfdxX%ElhrV-A$r4jS{s+*oMp1L2MA=jzFU~B}P0Niben2<{OH?V8
z=bFx4SEn~pmfk!)j$2IL2;2oaa&MRo@dbvcEhUDun^jhcC$2+{HqY~|muXP-)>|QG
z)8cm=-6%`Kk1@!Z>0W^>(%3)R_A<jKJvCB`uZC(fWD@%sQ~Q_O%bp(fsd?s4r}`AT
zGe53xn(pZS?aU8ygA5C9Z(CR))dYpt@#Q=Liw9Ms0z_HQ1JH|ky14V%@v32!BJGqe
z9YJJXr3*?+%0)Qxtp;x)Ec`047&9kedmE9#&dI4ty!2g`zkokZ8{zhK<-2D@+#^@A
zZCHr48VyV6q8MWO4@yWG>2x?-Aeewu>*kF0U<F_=p`7mtD=_`*qdD=oU&+tY%~jK-
zpja<nBK3I0>oFY_WE19^=+62niQh4@@G`f!gE5B$5wGSM$aB2EY3wXvLCI${A4G(1
zl*G)&(930SMb-Cid=fgcb;KeN!5n+f#D-B8-K0G3Xh#mej(D9DqG*@|Lk;fb<e7*#
zSt|-tAk7%?M$t2L+f#mf%&6%}h60|lBpFDvp_j09en?_yE>>bE2&N39b7TlGu6oiN
z9JO%~lBUhmQ_*3UMwbbXJx+gubd#t=1a40+$4XVoDNu26_K+sS2);uQ^o8PAQ7+93
z!}1Ag6&!DW+#rNYvDZv6AfN*j#b6C^YH!>(>lG&5zOFZ?DgWs1q;o|mF?eoRnDv2E
z4#9jPT>9!0fE3b~rWC#r%m3b~-pnD(-&d{E?YsLlCm5zMM*gQVTUa%8SLbKq`*Eng
zFNp}@h^Vb8Eo%id$e6UG6U&!>WS|T(w|2!#m7~r4X1WZfzPMZROE7rL{o>MH|J0r1
zhq&kHhb~>$Y!n#fCyynnAPmWBG|LL=hp{3!z-4}4dWiO&meIJs+E1fdtydC~Jb_8B
z!aQPO#Y_*fa|HPYhc{yR<ZRhZ_#`*?SJa>6QT%!5$iO)YVn&vfcZ~G#PYPyFs{Hzi
z0s*uF(8AvUT4VH>=T_ZMO%_-`k&-0wV~LgAi70g?*uPy3L3ITR14CupRQ|UG0WL==
zT^e%0Qx2CFb9KxgF|g>}9T;%fTlRY&0vu>?&#zYn5uH<{krO8@R_OP;XR<_J1em#=
zZbwSzmX5gmm(Znp7id~LvGl#PTIN&i0N*(cp+?<0=zA|m`Y)c>2U@ZbuCcd!&?L6;
zz=`D|UIXD`5mz!1L&z{Efj_7``ll$S;kcKWxZE}qN*|&}1f-yASD{?)>#z={qI5W9
z?MvFw@1uWCg<m$2H&-UdA}MD2EBk&EGDbPS1r-eef<C+n+vDuOw2x`tpJ7B1;zcFN
zswFum2%mlJ9!WruJ1L(2%PTi4#zY&+HIb-NmS}eYz#$@qj!wR%pos9PqA8_D?Q<6d
zKndy2N}I$;N1{XQ=+QuvSVpf0U|y#zKw!2m2a%tVj-ZRSi!kZIlY;?jPRhvGz^|g3
z6^3wse}l(s)l}2ZEyNRu2M=*rD9iRT%N4Z)W1BoGrUx6dWP~_6ubkeuTM}?8tD=k^
zAk>|eF4nauLx;D*_K8)}0*Z0a&pP3KxD9fn^cbO~hhUtWZuur(q4T6hm!T__hzv=?
zX!UB-gpmae0_;-~Zr8Uc{$XGp4!!Daj$w?Xt_o$afF8WM3_N2>Qi;ByN%#){6jo0R
zGO7@HjIyj9Pc>So>H8@n(5lG6_k@cgb%XuPU?#{RDWBz=K@!)Mw$FX|mw@MB%0zcB
zyo{U(E&+CoQXP+84Sjh2-tdQ5qYi>8JOmUK<#D8Zwsj!+m#7&~Q0Ln`M3aAf_w~IQ
z+@$ZF#*sIBY7kw_O6||u*9)Vslvvn}#@>uSRu}i~dH(CtB42ySTll^t_q&s**BKA?
zOTmo8i!<F^n*zr!vF+%_v0lId^zY<-)MBsP<Fl_CeEYYh)fo<JvZ;|eeW)I+%PwVx
zD)E$mx+#BHs#VnVqzZI9)HxFk*r*)8_2Hl{LyO2FeMt#Qm}Y(EY$TkA^wl7g5~o~q
zrL<Oi+(Qq0^#bCCPqBWNKTb*5?N~^*-tKZt;EoxmIk(6SL!Y<vhdtF_)0t4@{l1)4
zCt1*v;G!eFrxcg5^oI9jF!AR>WMPK1E)i1(DWKzPO!`pu($snH%hELXWSDoOp{9B@
zPdkTMOtjZCWFK}q9^_x&5><AHz}->FBJT*#v<k2pmk2d*=+u^v#npOBp7F;;Ho0<0
zQDao~WBS^54K%+Yp>sC2ygmK^5HB@8_hhBsfM1kG#&ig?i(v5gg;a@OX*H2pwK<Jc
zyob@z$H*m9H>k*29n5ronVMj3R3XIe$n@;no77%In%Y|!$Jr;a*~05IlmYN-i`iP|
zvo@8SF9PasLLSECxh$QBi~a}riL>l6CT+m;44e?#y;4+fh!hEjlz)`-TWQ=L%0UoY
z?*)3=5HkGLTwgx(e*kB0J5$-wMCBYRQy_eY0FHC$vaWso$%fPPaoPaS0H6&`Dh#O=
zo>Ako58Hs&vk8A1!qDsVqE!xUj|-50`b>$AN(Z=l9ZzwS)L9)Q(9^$-xb+ADpVp4n
z@<xw+S3U5qYj1f&QTW2ob8!{P4A!qHN;7`kYs{ekI3|!+_WWskQ-kDgop1CDnyxEe
zg8Gy5(lv*jzJ+tgAJDe+SgF<tUqwFq@RJ&@R-txCY0^$K-M_K!1MBW{k-s}Z_;Vlo
zna^l0@{T+I0bZQ91pP`!A-s}y7-g?pNdpu?jut2NS74&}0Uc8xg0>Tt{|^A)4mp^#
zF^|8KTjCvf_0H9+s9)uY6(iNCd_@7Be}F?eAG`YVD5cAbHTcx;$ce4a=V3$pM9#uk
zZSqRp>3H>6^DHAO(PkfeoY{kqj&++i?W=xeqg*TNY+j}E^Irxp710;slZ*r<493uZ
z%M-Vq_Wq#4-u~=Yh;%z+UhkTOQgBVxm-u@KW@JJc+WJ3$#D4%1%s*l!y8b^va^Yb}
zF9WkjJNbC$$o3iSo7-v(v=ZP?MU?IBh`GJg9pc|mDqlMu*w~yqpN$=uMhnKO4R>m+
zb~QivlaMn05;yeWGVSn2ydCb&UNi$QbN+gg{pPGtc*GZ0p*zfhJ5(_iXw`mU@Y!$i
zgJ8GMkq36=_s4%UK38<nbHUl&2W2V|MKSJ6B>nxlnD?cxzVrf0(;>!$S`3E4(9a=C
zlU>beFb_k*z~>Nt^5wozXh&Xp#;eVDEQVomh2E{gAu3m{pCyaj+aI+M)j~b{=NlQC
zFsv+|4%ku>FkEKim=-UGCao8oH=_#|2WUR)`E%_&UHo7yEX4U$O+Y3}JG}O%FENU!
z61PeGa+F)I2ZuSYQ*y2#08t%AzH&8R!@vUb<cbqf48rNVdZ634k_5W6|6b8Y@P%h=
zFep<M#Ttw)NvmI;f_%A69jm6;AQ$ZnP<6GJK%q}4oQRsw-fB1<-3jIOp~3ty1#Jrq
zP}&l3s+#Dg;tx4Co1o-Sq0f6YI&i*7f19W;!q;!2dCCA;FIv)=6LH<n>67bE_Bn2L
z5@=^Q+i$c>+{d0nhpe9L;fLeS4>b=p9sF0}YOa+0;m$;>4x-UBB^!iChywgJ&73?w
zN;C|&EB2rio#)^);+U@+T39kM-y%dDf?oScdEJGid}@+#hL%3YU$q=4k-4Z9Pc{2+
z9?%>Pob*=w${Hi_N#o+EbPS)Sx@8mUH5R7XJ4_ZgSsOjWpG`I2<VH90kd1RvqvzyW
zR6I^gS14ZNtp?`dmCK3hrsQmx46Rg;tS;Yx?&(=cSOaudkgbm-Rzwk_uN0+}`^g~M
z+1<)a<Er44bdLA?uiCQPkPIQl41mLDZ@*#iv8ih-72$cx?>EZ-0bV0u|AfEUIAye&
zxoIo9l4a<es$8vA_J&Eey+|>IVc7uLlXG2<fL_HJ9QM#;JS){}$8Z3p{i}+o=Jgia
z0ka8TW(4UlN}Xo<%K8Z*FfudSyZb54M6OMk^UJTd(pF?e#q*t0ttDb3-{X56fR+y^
zTLl*ni(U_N3ICpn4&vkwh(qwIwcV$E>~*VIPi$zQnQ8?dio+bAn_2Fyr46%q2x7ft
z?*&YQqJ>%cEt#JDRny*!y%o<5qAxn$5tVv&ldD@l?9~HADWXY_OUBPU!c-dX_z;UZ
zYV>1#pE<VtjB>C#KX#mSF#wQ%K<YY_Wg~u1=bsaV6hMbhU*tWx^2ly{=WHM?4cb59
zQN-VfYc~CMrvi&^QLwnhWuhZz0$Af0-xq9e$Y6J|ObiCL^e;(yPKhCk>_2Ajy@?Pa
z?;Pc>fTs;?vJ-PARoH?n>>gAXZR?j2KGQ~$Ci5*Gn*g`*J1u_8LM3-w<IQ|P2P|Hn
z0x<asSZJx|L*>usjRpA6E2=O|@>!32DyOAiyzfTH01fF8&S03^-3-m-^)b0OFD5ns
zv5Gxd?AatC|5f-1f3OTXc1XuCdd~oiyru!X%$<1<c9r${-toPW&P$lfNu{3+bccp5
zP0K7NpWO6}hEm_XFXH_m=I0(Z!-eo&OTFOI?Cok>vw4!_7d<9c8&dIJB8}Y|5IO20
zDvctn8)flOXvYw2i*Zjf?tQ%blY4#iE|BNqGPnjV5;8W)uWW+|octSgX`xyLPP&s$
znwepF0tndMeagAEaF*X_nmal!^?<X5@hHo62phZzkJ{!bxl&@NUu_f>?I!aA?LoFr
zSeLfXem2+`+~!7Yhkb%?Cvot->piQXII?^?N&(`fB?pNCClxox^@4x(>6y^K==cOl
z+mP*KPL<WRWphS9)ZLMmF|@u&oA9za=4RT@2n!f><~^@gtQjyIbB;?ESKvhXmXiA+
zb)7f2lLwGqk86o*)7$Ff&9aMi+_eUNE0^X5t?%|-66t?lHAvGkB4t{@e>bgua2KZ-
zJ@OJCWsJwflMvGARm;6IxGmHF$^=vTGlei|;17E!OIHo;_+eFEcbMY@7<#d!8I*0;
z(qhmI9Vyyjmn(CqIaEoOa(F_UM~TKI;&m~t)Dcu7>_Vf5P}@D*#GgX?tv4+J{5*dQ
zGQ_zW%6U>XA4KXSXKl60?HBT*&oM)v1zV5D6TxS+kxb)8rqsO8j}UCVCaE7lK@-%%
zEw4OVj0Rtl8Ob-;$fR2aDe{x%`$KjO?Uu!U-+Xmi?3`}ebrmvoK_J;nWIc?r?tMRO
z2^$&GN%9c4fC*YY4Pu?g<em53Z*9(LTt|@WSw2xWjiVZ3V6R#^sczcQsAU4sY<YSS
zYgf3~!lTahH8*3@Bff0D?_n~vU4;Vd%9nU{q&&A9VNK{2xzMt<0L0Jt&`{wJAb)-L
z*u~1L@^9?NdJPY4T%IswQ{(YoCp)s@(GwhN4ag0DW^!C2ts{x{^2wyVvV}VPf&hhc
zl9|AxA^J7+5C4^{m)xTi<WjU1bUtF$u`F=?s4y&%%T^B5etdUh{YS;FP;!nmz!vAb
zrKL-3P2uY!qM%{QTsl8KE~pt+JRl`vML_xeED1)_yTF{($?m_eev`>X76e|rk<T@o
z`+d*#N@Jlv&`E`~^)LZW=#~dIf=!A$CYA8Y`_S-AettwC`YH0;_-1YjzIn=Wlx;m3
zdIf(V1BD77V;!$(ejqp2)~Gw@Om2@wpvV3Li2Fkn0mqs71@b?G++R*g(MJ|DN&x`D
zium+#fKbW;szT_6(`37Eo5TP}40(PT#0oaCx3RO;=UIMv76v8W6_Q51DS^IA#3OEo
zn{%&om}h}c(o|0X;IBs#oLBfoeRbRTSq#ru{MwX4GK727RZJt2H%<pc2Pde8|Db?>
zyuUwGLqt8%w2g`(V^7h7rIcz}58YpMq*;#@u)Bgqq%4_!Z%$A^CQETfLWAQeznXV5
zh0|1EQa>ti<${P4l+F%d*IFs6&(cOOBtShQRs7)uyF_mTloO>dhY2a5v<#zpFPZje
z@?(8)s^sSlA+)-JYPgwY=i8l<tNWdItyq5-eFWF?yGUt(56@j2rF_hF`USPuDVEkD
z)O93O!ZilQ+N&1!gZk54PsV)(@3kn$ZY@DLd0N%;09>&znPzqQXoY&hau%IpJG1@2
z-y}tmyKS3{hE?9pD}AC#!pfxkOYM}9{v({eaJJb&H`B_eaRg+uaN(rL>i@!*>P0W9
z@XFk#EqWlI>00(&6#E=^54L>wXCz<gpzo$%NUi;#XAx<l>2hz8Q&DVL(ce->H*NQ?
zdKK1Swkwm!95H$li7@;z0{Q*4OFhY_mPDH*O@q&uX-sh)9wrR)_c#hc<saDGo1Zht
z-R_Se5j>1ZxzF~n-XqsLdAM*<ua&~_-reThsDzD$ii&FyU;5Q!3sm=F!dc!;wP#>V
zB41+=`u#tiKX0dQ#SAiYd)PUcgi)C-WIMj+_(1nsx5!`jq7H%z!gl`7tmcIi_Ou6T
zVGfNgJBwdyx~??OxBKl`Q(uPeoZ1w5TpZAAvOTd5`^-b4HFNQ!`@o|14X^wmf|v8=
zQ#99k<6w5fa!hGx{(u5OYno1G&&ly!2<H1g#s_bqlC3ZjhLIR*b?iqz28p1c!_w5*
z?SWj(<k|ZaXZ!Yuj+}K$<-B!QSEo>jaCLOvIWzWSk_x2{#b-Cy5dPmxBv!ZG_Cb*a
zZi@x`+N!!<1)|R`1dk)oYRosC{{cMnf{)Z;{}j3p(209BT=x$Q;z}}gr|-n#sKM#k
zZLO$iXNfBA43d-DVs*FubK#G@wXe+?rQVckj!p4>!#t%O7NyLvf2hlkEUZ1cn$$Y*
zker=ALo?cql_eKkrcv@Ef@>CNO<21>n8y0Xvh{9JD?X16JCWB)UfSw4w&<8a@Wvfn
zY1GBOw+YhusUZ3o6I=#58&=CxI-Kfa8ttDg3B`ZReya7|BkW}*GI~SzGCYK}sM-H1
z02$Lbz>4_Fvu+A<7L4^vjU;?yYfjS$qT>qs`lKiSbjL`Ga@iAUK>E!y#q(8v(dKRG
zBVNkKLw!>I=y)v%9$A!XJ;pWhk@(#))fMr!(iUoj+oTdqmaN9z`I90#ECP<7NaAI&
z!Q^!^@!Gg^)7?^zfe;1P6^WkO3V;SDfxF|%<cRdYxqq)tVrW;YK3V7_OQ)0YEPo<H
z&g@=N<X)wNBWs`aWcZ;1<_X*5{_XaeZO+b&*+SU10JQh~p2ys^WbtnU;Y{Cn{=#(;
zYCMd|KLG9@c75n@`{SeaDWz^2_hp-1f%kRCG(-v#DuTD4bm4o`x!r0>_pez<7eZJV
zaft}n@ff*g#D4zPd6&eS-Pd%2Y5_74s&+FNwQ_*#d*)ppSbuL^Y*i+uke@F77w)^k
zd5}q5mm+c%8$-8XHOM?fMbuScgUNV9iPF`G{{U}xVSZFb9KgPAs5ZbQ)}VgdR_)!(
zw2}JNctj+cOjIyEVS7h>F0geF;ZB_<`w;-3(Asf<t6T3T{|N#Iw+Dad0|vep2c~p_
z65u*G4s>z&-Bd?xl}?qZ%SS%AvfEUf*S)75>A2Rk@2q}t8SKc;lTCzE*PU_RS$}>^
z$9GSHO2F{;jndphtzpZRY5sU>%e2unReu?@Z3H~NL*pp_4v8*ymvcykw|g>oeCo?R
znkGD(E8Ulv_mD~AOM7k}Y^eVr(Fv+@5K3C3c)hij^m5+XAmnyfLk*R92PX~|7dN+Q
z7b)d@gL%!0qEJpBbklT>cPjQBaBRb=_524&bobGfw)ERXFhrV{{Cs@n=k*uoq|gi%
zKB+cuWv8pai1H>t&_{o(l);Zg+!Sr`E-<Hd7PfNWC<()u-$b~t2z`-nmAxZuhptVm
zO<3h{+^*en?r&p!aJg7l_?6#O{nw-M$$iT&&jt<M5X9EVw_r$Vt9hb7R;FKFWAbE>
zRJyvBY1)Vggkx!*qQbh>*IJ}VQOQ2OYZwdI?A`4kmK*7d-MJRRWaB`I{zblF*RgyK
zv+V{9qdsS>$pJaHGX|P<IdCvyh3Dy1YhC($MHZMj%Qo}+Ml7}=#|_U5F`5>}Tt>52
z%8xg_US>hW7YZYlXhz$gX~}K$jn}u*{0ERB)LK)RC;fii`q(FD$Vopuvxl`7B;tHm
zfs*f@exYg<xoh>{cr&}V17GNM!2@sl(0vo8T@fd_CdWe<vb5A&1h^JD()7yTKPFgi
zLiC@D%-!jfi#|HPty`MM<-)Hz*nkGO{eP_HO9j8L>aYx5Ki~5`J&sk%1?0;9(W|Ee
zQi8Ft%jhgfO7XMC=AG3Xi~WFoOn!8hIR6Juz=BmQID{<b4J(TWNI6^kF?Z6;o*(KZ
ziN{-Pl6-SYa(o+Asmf($a`l;clJv;x2L)CG31aHsp;&1(vadd+kaV3!-=O4G;O(Ln
zNFPo)V2=0SMyz<nlc|fMd&>mjX62a63bvM9>_z77vIdgtlri9?8(+$+jw*0Xk1mmg
zHRJi^3jbo*jCN6w^00(dO8B^rpWK3j{1XBY9<cpK^oLBkh9e1VhcXX+HBW39SN@h5
zZBTeV5vr_n{p#iF5g&l`h#YXFbLRbwpPK)XXe5G(mUYW-f2a(gOKmFVGTieVskj3@
zsqVYeYP|jl5YR;bFNa56><hT=x7r1Zln(f>@L>V<-4s|H=mUnut=YZW3+&KJ_VyT&
znb5NfFDYTx_7m@56X(KtE4eK<;<J8-6o|xLPYfUq^dZDJz-Q7&V^<KS0|4bHkIv;8
zA-Vd<u7*RlR#Fhc>15!2P8`s}skm%a3T4vU)NG?2p3EdE2SJN=3?XQT$!dN9qRQ?u
zTviKu(E;2w-78I6QqUUALy=x0uVYTP#^fX_TvTKOkflgO_(sXMCd`WGXXSPQZvzzu
z)F)Opy`Qg~;<PZg25%Tzps#im4zx*XfLkHMJ)4WQCuP_BVuHsF*^pu4EARM=t49gY
z*_p_3L#h7jCJMn>7`s~E)$MU!*i$g9!t>liwC>n=I0dw_ft{0o!bKVOf|+9T26aLC
z(I;1qU+*;300=kx2G#d(b2>9Uc>`vPguy$*=`pz6M@NF1BOShv_I*Z)2w)@D@2ld?
z95_4xAcKZ#-?t7-l&%+$u#}O|S5zTBM6N5UT}UG<bA;GU$Y1pE<7%Q}E3=QEk$PqQ
zWJyC4U+0IgUw7OKU(Q;|w0a%&;o+G4{{R*^>&A!V-<Ogj9@G-S4#cOwUQp_&+;C^T
zP%wi0y0wB?Suaw0(Bkb(I2!~#*Zhh@NGtzU^U?diZ;8#C>x#ZHwV(J$oDSwgcqD%6
zd+bXcC+_qtQ*!<^Al}dPr<5Y5e*}vl_!3~w->h=JzNK2BH*l1F_;<3})FWvrD@MY5
zh_|b)($T=ryPBpM$hkB$VWSE?W0khFyzs`wQrRo^l!03V6PvwVConKjh9Z&KA30R`
zVwByVRBbs-nBVWZtd%|6G#y6iJL<?=3h)P1YOsO8;z%{8i2U&JL>`_JPZ7z<fP_Wf
zQ%~=f_kdfUAeb=DfBRk1Jd&NYRH^)+BTCNeim?rs*JutS6vO&d#b5~8n|04t<%dYW
zeWSw3R`Ox)HgC+8At|eOH70C)LKaGSI?0!4uNC$w@gFdr8dnlFcz?-8j5?r|LVQv!
zA7@I4Ma2Puv<dLtofu-#(9+S4odI%GvcO2K@^?r5-t2or&LZ1vBcyK_p;RUJi;qNx
z_ILaZuHz*sAehzbZqfv^>L}TXId1x5s@qVq{ZnhA?gRtzms!kiSl#*(>I$Hc2uGd^
zs?f(b)+|H#$2=GHWr>h~07G9vJih9Y>~msihbc;K;S>AB><0t2Up?xg!ip!L7^P(8
z=A0u8zmp7l99?^EYTRJ^P_lDu^}ADHi1+Km*=$`w*ryR}A|)uo`Luv`B)#te1sKjP
z|2IwiR+n#7`>cOhMhT}vi%IK&`&P!s(Odn*Gn{YZCF$d0HR!RgsSFw1s+$4Tc=woc
zqHvvWum@djsd)qz>xtJ<REz(tlJfzaFGAxobf!YD6k`pb^Ehfh5hQ1@SMocbo;3>{
z<G<bCZSs_SK!0-5^Ls#QZLwL#Z!V}&e52!QP;}enA(Y)YV_Ba3whTmk1^oB#_Oqi5
zYIYEtbA0P$If3$|$jpQbrH}waMEy)Pur-y@Ryg+S<QY%RtW)(Pu1O0hn~deZ&_))q
z34i(jyKif#LBi~j7-7RzvZGmM^8#p=)gSjk1<{Ze$~T%DvTsiqHJXtPCT^rdNwQ+I
zmYCN`>2OGWEaWCCz-k<{?Oz#-hhYPaF1hC8XKJY7PR_Pzlkm{Jm`T=)s4E-dDA^^(
zv3q`RVOzWV(3E(YR?+xsKo=^5`&C0$p5CyvZnHCs4!QOHS$_lbpyrkq%~9}O6J5K;
zQ<@PJE<{Z3?i#~izw644`~~N;shg~BXFI_5N|Qy(i4Q}|2bY#<q0C*bE`qOQmB5m6
z!u;#St)2jfVZL2<Vn1>Grd|D2Duc(*NRo`X)dz2Os<D=mC+6(AH~R~B8F?07r^j*7
z=<(eV8Nux%=GKHh_IAHpVN)>*T1#cOwcoZb#{3J~C@izp3kg$sv#-)PWQ93h|8!;X
z*+$OB#6qzGmoY^{II+62j_IAS7dzyso_zfu;Q0zA4|rd?_WiZzy8wSf7<<dKlQW%H
z22D<JCcJz;2Exa#CKf%_{VgBva=4G4Wbv>U{e@54je269%^mc|d>PoxVMzDf=`riy
zd;Kx<;se%2zL;TVu?(b>qcdeD0uV|J+H+m~2Uu;{p)Iz4<Rvr!5qqtq;ES%u&*eWb
zCnk^IfNzTa-HpB-YH$`j7sSa%C3!dCfnbd;2<zxKpL-?O!&k4+RrQ!9{I%zU{2WWh
zrVv6c!J#{v^5%nzoKrpOtX@-BLO)^`z(;V<4-LRJXO{FyM#gGfz_Acs+|m6aX}ggm
z_O^5M!SUIh`g-_X<a`aYpB5?iO~h5;-`cio#w#&*uBT6aXmF9!m{|o3^Nj_sb!*Aj
zCN4Mu`tH)P`|sFFX+!BDmxp#|dDzzYR9OWwZ}DLWC+;G^&bNP%$M9?VVauCnS`9bp
z7?B1SHpf=HbAGAy>8{*rHO!wZe#x|;$BCNoi_ksS5`O7maIif4`(HIn%3u$k7!0Va
zX!^l#`eL3XGYu*%+y<$6JAL0!#o*xqvsUTETiI-U0l?1=7EPZd&9*F*%CRWGo2Nb@
zK3DKFCYY!eYdJXEor5nCNe$Dp)F1t`J?UTLkaFj<$vmTYw@-_qfmJWu9y?MlQ|5n}
zQ1!51)P8H7_|7U-%%VX3$q8)=BhpVH_`;E=z+YpsCfsz_nYQT_OZl)Ty}s%pJVva>
z^gca-$L-7GeCe#A;du(`N$)md^H}`Vitf!?)ho_a2^ttIbMx}FW@HL=N6*GFi{lTq
z`E`Kifds<_eQ?Y8V%a82Zp%IUYkKCb&(t(t!Z%;(<u09J<^u|Dj;4P~Qyq?TJIE^<
z!luh7^ywqQ35V74yrx1Xq+u7({R?8?>!nv8NkN7s7XI4#+M}R8gC$nPT$tYlxz>PV
zM?H$CxhI(hyawQBbDt*zTNRX#s4ku2ieBC{3q9ghJH&N!RO^L-A&yE1PfiRKiE^1;
zordafp=OF4eW}OS6&MRzFD87FRCokmje3>`JLbjEXwzqd@ysSi;>n9_T6Iyutuv>E
zcyU71tF?WCGZkM)e(wkm+BNX3LXQG?U(^5Ii@K@knYB_Wmu__`B|GjtxfUyHHFcwu
z2uL&xm~<#*wb^}rn*>|09O9R`Z6Y?x5(;LYU`dlE+JAg)oAe!CQ`V!O1l;*fio_}M
zE~!t5F|2qW;hn;Uhqw3Ro*6HDFNbj~!eh|i05+j9QAZiQ9~j|E)8=>0=JP%y37b#A
z!7%TO<Wsbd#tC1F{Dxec#{TrLLnyrn>Gg$B9W|Pi=UAU9Zw$x*#yWj<|5Qdt?-#4&
z|4Ikrb0JIf7lK}W9BcQ+-H_^pcyGl2YF>6UX?(dL7dK5>a8lu(D(vY<@S_ZQN}oT`
z<SdfR27QzN0f^Fm_!5w9HxiPy83)ff`MZ$=vLONt!jIuAL}Ty=R{saYMF=i+>Wg4t
zl41n1zd5EamSb!%Pml~xiWVmRsvPcTMUHph_-k9&7`6CfaVprEd<mGuID!rb?`kce
zl^&LM8d*`0?mSRFG+Rp>!|&6ke#+cFpZUmN;DW+ZQns|+*9S}KU{f$@45b=Rdc^7_
z^y(lNdROW5&hqO?caqh-mVO2Q3(N<<qL3a#tESrLfPRXG;zik2{Gq2iqH!vE05Myl
z0;;^MU!(&Q3PMCFnHp;{dFpF(44n!hW4O{fy7#F#t_qL|@_-E6$P)7*@Gjp+-n??d
z?$51sAm)UrtYPt3l7uX>Q^D?PUJqHnpIQv(KS)268Gq3b(A~_40qSTT_JHCLzS@ds
zY9D%>+{~{k;Y&myVEF3}*)SP4h%n-W*pUJr$v7EeuTIe|o8~N4q2`$JUvR`Ps;b?1
zg<VfXh<cKH0|fjPu8YMo1^l2t>B+lpExPE%P=uD{OsJV$p5VIfKhRu+Vzg^(tDiB|
z8%T?we3g%hP&|d>LT>n!B^^^3nur~*wp<Su1|2uQ#cSf@^++I)yM@6t<)TYnNxGYH
zyHNJq>8;=8)?xV?`3@85M+d%PP7HM=4>{nUJ15(}_iq}&eXG}p22+E!RQ~{tDM>w=
ze^5JV8ymcW<z@19O#?{$jGIc_Tk5?1ngDXco8t;PzjWXBoh@!=LKz&CM=yL8hla8F
z;VA`eGD&G90Y3r<#nv%manp*nxZIp<7vOKW9*N&13t*VXnTqFOs<*nj1FA4rWo(2V
zimy1u70Zu|El!y7YK3m<zoSlHme${+<s;0-3WgPc#cHSs8>i($d>zZBilB(hXF9LF
zj-9hfDHn77nDjW@-(skhp&<HSfbAFJT!_ppz9-ptkN#4krvHYYU7Fm<H4#=r&@mX;
z|3XQ>mQzkyJfP6`L*I?P$M8{EQGKK^+d$}1hnwPJlbifdXQSFgDc=J_il`I`|GObN
z+LSQtWisG;nwUi_y_Ro1^y#5>;QQlO>2PjiZ1YY?J=Dt131Z54Es$K#GsK&9Jhu~r
zYnoBv^zxAjX?<s^XdmHtxRQL6aGr`CzqjVlf8(>dT*hJJ!R2zs<kjo5`~?8RyMTB-
zF23KScRs4ThMa$iIoP*lwwWZ~nT2N{c3vXBa0sjVll#uueq-rCoXY1$O)fuUH-C`*
zP~lcyVOcLKI#1nt`>Rg+T;ya%p-?D|a-6+0cKcoQkmeNX8g%=~Twzaj;1{ppOxWI}
zV|ecTlH3!k>RpR)v0c8v@eIZNAAecpAB1;}-PL^U2)7YX+yd}~Z7*({I#LJ+X6uZC
zc!-P~xVqSkA;XFj9<j4~K2xn_5)zzlu7mMZX5RpSE&&FF+$?OiRWl>3T#O}<EO?{H
z?(J1Epw+m7S<!xFBwu&|*pJcWJq49vLa#;ENvgYwUi@Ut(Ghy%9TlULSpDT<VKZ}t
z1H@CbO9>;W+XhvNmRh1^vbDlSPL8RKI!cMr_4<;SFQ}0+SPx@b8%jqQ8K$cHwa0Cz
zC0*~<pw)Lx`vji<0DWbjj#k$U^GF)$vUZetBW8DGMZJcv>a@-Ah^yT3wwB@H7pRaI
z9rXSH((+A13e#nmWM`wyVTm4k%YeDIs+nX~|8&7@+XRH8-;GDbqMzVJEDEYFqACX;
z!242HNU{WDGw|L*pPx^J-KZWyK|!;bJiSZd>xO)%Mlo!VZDNkx!^)<}{ux5i$$yHC
zkQpm?Ip^sq@E^cRIueMy5G2O?%VhKN-Foby9K_o7)-#f0m4+zRv#u&)NVZd`IIpfB
zt^ji`o$XvSJ9x@&4zEb=%%aD}_OI}?DgFyOc{)t<sN>}=_=AAqp-rn0wp)?L!tlGc
zOamDO%s&{cpV^KVMLw^*elP`wn_2ej1aM>m4h#fU^?~YnkzF{S-)o~LOiQ+8nkc9#
zDP@c5TfT{I6Q531vP=q?W}LpN<v$+r4>O%oA1e;LMit#O;Di!=RlnR3(;Ce$m}{oP
zzdI?bdBzKtQqQyIBP;q}3Z_p$PO)6q2j?^Y0m%L}g>u<&hpuU303YbQwll&ni5L92
z+O2+z1NuCgy4Dn{I0=8CO5AkvVN?V*DZerSjEx-3r~732>+s~HN4?trSKnZ@(WHu!
z+X4EJ_RM_lS~R+4fwrq_0IZW~lWp-X$+x$4aR{5>5d3eb`@o!-A>rHcs2E(m@fj=~
zSZ4c{qVY4*nQr0h+c+Aw1=B#J!s4{-E+CMoRZ(Xo;&~Z7)I23idwoMPK1(b6wam>W
zpL4I3?t~P+(v|nO(q?%+&uTPba2R-bLgdEc&X`Ls3U&e_I5n0fZh~&IW3X%L^H*na
zhZ)zZhs~d>L&fk}$vn>HmRg_X94TBE<wgOLc@>Lrnd}LVGXilS$ka)CXrRMI)ZnPP
zJ(-ihJAK9JwdwxwB8J15Opk{=8660$hcRcOom2NYYXUz9C-V$wh~b&j<6y4eEe^h|
z>?&Ugo>!|pKQI_*|NExaIqm7)Det00Vs+xX%d23;p>@mK9-*#gf<-gqUs5v8fBvgb
zW)RX5(gxEbSMoG~?k`+1hN+(eYN!dM<!804{b#mBfLorrJ451%+ri|n*Xnydu6gYv
z9tS<M>2F@0Bu`*ABQaPpUDanX`sxkp*R1_#TsMuLyIyL%p{P;axf+1UYCf|{c<|Q-
zXJsQ7AE~E-6b~S^T1iTI&yb}rBs7H^f8Fr6#;*yRTQD6S%Ur|=Z2mB6BPpAZ4)+hZ
zZXH*PU^~i&j%fg3bmfy^0^%R5wQ<}-LJ12f=+fdv3i_GEtK<e0jaw3FcP;1MD~Qi?
zrk(erpzF3#w>eJyp*ifU-D~C}qQ#5j?6gE%DXi@2E35Cu*Dk<#ZT<P8dCopk#TSm9
zNCtgb-R*62OSE_KTVn&hdn~Cev;wUYkLXAduqaAa5|Ip(wh8q%l;Yp*r!+&UO4mQH
zJ5v2F-DayEW|B<5cu4<N>7U}Zp0p9?=M1f2QdD&8rKzSqdfcx;8aTY2Iq%#B(5jc;
z+2SDW*f3P$EmgOkwEU|dQVt_q%z~h&5AT;Oa-ytdFHkFwFelrK%a!Avb^YJo`h1o=
zKVB?XZ8sgFI}TxOvVjWy9_7JZxE)sVW8@$Ij>TulOskyj&t`8*a!`HWhR|IT0M4Y-
z-;6SJuQMfF@No??f7?#4#Z2}{F8nbV9a#!re<cElXjK%gWUW~nZ8M-gzQi4#UT;oS
zV<bO+xfbL0a0vznt3Fd$5b^e%rsjOBXzXk1b~$B^p?<DcrZvBY(M!)OXi-BPP$<o?
znK!2fqv+^&WRZlsrBae+Uz;->4cW!47I}-`5jIVE&6%ib@L3-+9+q)`!a;;t@?uR~
zRy*g?1M<c@IDH(6NtaCvFnf$EO=af}t`3-5J5{N9$A3D@xn9T2J3*azb^HdNlYIz}
z75R;%r`Pv|5HQh!{Bna$uf7NNTEYk~)gKUr0e*uIC29NgycI!oX%OBSFyDf|&S-|T
z41E5t{BO6n_a+D%s+^6}KOE@|y7+-Sct>kl5~@+Ji|?M!-J3?XI?47AU_0+j$$Z)?
zv?<HCb({6x(2~~R@rhRhH~{l$#l{Tsch39Pum?`E(OzAusrsLafa26IZfk87qkbgp
z9TG=F*2qiSxcJJ(f!38)yn@UkhLHSmxGnCX9a%Jm1^}Y!>l=y#nbBs3QYBJ?(<<nL
zukvFwpgHc2c|yPGryel1DMNW$LIhc@&*trvDKou)ST)OBygNN5O-P-}c3+EMwyIlC
z@@4S5QDWXUwJ=V)1V`8JsfV1u-J-+|0{w&CxdbSX4KDX26r}=Yn+lGNA`_&nEP$W<
zt3oGK1FZIM@?Um?WvTnHifLtlG+%(As<zQW1|;Z(kBFG8$gK@wGTu*T``3Rsrx)*k
z$B9XUNvsg~bQn_cq^F8UOL5O}B(KVJRYzUsv~t1gTRVf)J(+bUU2b1`9aO*{)j=I2
z_#YaDb+68Y(s@J59NW#hZ^bkDQWHs!$w+|u`V8Hw;^;NYzdBoAf?H)F9GsjSXp@so
z`_mXwo8i{(j1XrglF<YdfGl&ar8so2tEf4(GAre~Z4SHOjZ@2#A^}2@DVyQSI<wRU
ztbX*Ig5WNzD_B6g<M02>{}NTOU9KHk!M;Afcr@U)|A6O4RnCsQr|kweQrVKG3xsk`
z>MO@>+nyD2t-Ru{9<tDu)$ZN^YSS>ZP8jfbh{{s2>E+y0Y3Sj60LuSBZU`lshlr@T
zgC_ivZITp#gA7X&c19@J9yG~W7kE<c9V{wbCO-G;cwaxaPuD1NT_Cb<q^zF?orpi&
zGf)+SBDJ$4@*9TZZd-5|Mms5_9|!gDzCmOzR6r|zg6E{F;}Z{uA)w>T%?qv>H@4N+
z8Z(BC55@u#M?tunn0xD{HQsl=iwnlT=e5;_|Iu-Ro~m8{pwKT4xz+jDPES6Tj;-$=
zryz(8k4t@G+1chwv!NZ7DPWSH6Q?LREu1->ocMV+?Q<3<YJ)?O6w&AlIRiy!)xX=_
znPRh8#=dhw(aTKgFLxRO$&6tA-r#i0i-<x+?2C7{hnd@(CsofLt|O9OJm-2sDj?qL
zE8Pabr)h^T%56>tejWa}@uCmw_1JdL6LC7}qhXAhbSq>0>R!i4r!JpL>)7a4!%eB$
zm>Lck@6?<o)n&*5A1N3avdvo(LWMaXiuRw@GA68q-dY#EaPcnB+j^ZA0@*}<zo=}P
zyWQWmWWl!80Vj3#@eH4G51AfuX}c0}%QjfL7(khN4Pmh$5R$?`KeT}69w>jIst?+0
zq~{H^iKo~%u>D6;V`KkY*VCKu&e|AuHR1mz*6uAoXct6ZFdLcs%Oi-+B6&bQGzdW9
ztxtO!vi&2%1TJL4Ga+bK#cFxbrb1ufMx^7ue)_SjIlH$nD=Y_dTNjk=R20{{6Q1ie
zU=UhAo}JEiAO0{}6N90HcUODPcXhR2D2%qVzAbF5VG-F+p9A}=BR#~fOdlty3eg{P
z=X5q>z10KHP^8Z4H-1oN_w2tWy8fnjXHp=KjzmF;6N;dqe?gT#<y#LJi#|?=E$Tfc
zQz0|TuuKg|&-}+qpI^LeKM8C%Kl<W02t@7WweqAIdVFa*@H!puN#ReUR&%BP*fU{?
zKjAIH)#9f}6Fb`DPCd+1|JJ}<vdO`33`5nSHk_);PWkSI_FEPr$85ffLrZsOOoYM5
zJv}4%03tMXsJm(Zn#Jvm>L#non;4UQ%XeEs>f5=-WReP4tF7$gTNlkW%*Ab{o01%L
zki}Zap!)f}?p?`4C*8>VSFG16EeB(A(mI`bYy9`^o+*c=LrE6;Lb2+3@V0R`rF!_z
zNDz+a_l@pSsDHoK&-J-)!@CkESB5U#Gxs6c3$x&%6>!Fo87p*hncrf4ZkL=m?##Q1
z`w!r@Ymd`BfPafP6t{ZY8S^`u3O4RJRTEs5`{Ao{j0Cde?k8AaE#dl_@}`9tE8zaz
zWph?|p18Jazp(S=qkena$DJ5~V;0HWofb1P5(N|h<#F-|d+(b0{VHGopKRCZ?6A&m
z#b>^8BWem+3lXPlb)oN6`C)cp>WLtOlo)Jz_kr>LLP_vX;=jU2_otgi9`crPYxYN;
zwiS(rarAG0m9k;VRIw$?U?-21b2s8G_Q&D9fo|sEL(;R<x%>H?ua1UXJAd8ZF89vW
z78Wuq@$Vst(o!Xl#zxAXtFDf-&8jN&>w7*-?)L#O$05WBf(Rh7IZ#_1xI$%RH73y9
zlFVu*Re*0G<M$6h?F65c?%00&+&aT9>9QB8aj<wMb{?`yOC>4Mbfp(+L>Kyw)rNCB
zuj^(aJfyZT@IOGD8rSsml)x*IH2Fdg7g89&A3Cf^dQ=-?cYjZ7xU+0xH6<|=?ce_u
zE*rXuww<|BHtc|TkKgKyHVnkq_q(}qVnS6ys&Qn^N-Ru@FPqrvBqc}rEh$Gjhx$2;
zbpQZ8x02|tXTiA&`9e5~@4}Jqvi<dSP9b<lU&>dT+1!4CY;;;Xv2r>OqT~{80!#*O
z4^;;Fao5r5IVaizC<_^hm4>-Woi72-&UboC$Xp#Oj@1Day<lE_Wxv_V8|0Duf+o{b
zQ<4e<0U6L5OQ9Mu(=D~^QT!osVL(ZaZb+9D#CK3;k9{Qm7!(%*5gM8-xXesIpA^tK
z>Fj)o5Lp!$=R;&$&``E55o46lld{AQ{=JgpYfm0#VMZR{k<gxP*mPn_ryMo-;~2+9
ztZ*>PUe5xQQjzx?TPY7Q`oset8m19s5HDA@bfeAO{@e9fIfP_*noaS2I%|XMe#HAG
z<(}a`ac}h1pOoSkF!jxK*^thzo~lRgl!9dhPTp_&drLb7miHfWZivU);tQ?@j`ZdB
zjW?T(H)pGTt9?j@Xserq3C?Z46gzCApuo*%-(zF``*F=bePRP~4wW#28L==8uzUYd
zg=;&7);b;JRS*6mX5Et|O9a;&V>O(#i8)mzKEGtbiH(Wt&u{&5s>9Fkjm}VL7=~w1
zdV6d!ki4u%gA_u@HA5wYc0ydR`2}m=6&TfAW!i|WQW_Nr*OWV*sUDo4pEH&#njB@R
zAPBIla0`q*!@)rFR~gTBfKitm%uNtUsWSKJ8uFu_0WqZ2!wPi%7Rw_858I#c*uF*k
zRFr;GP@R7PCrCOsojTD`jvCrYZjj$?LSw)g2GVqqttf_Hrzhj#-{b2Sd)Q`Wfum|a
zl>TX6#)$PyNeVo4YL}4x>?}^)@(>Qzx`dw|TtB}4EvpN1@m5y937V!lRfyjT4415L
zU*bis$QWBH&=Az}+UFul-J|VL!#VoC`hC%P2J3?XN_X>kaxdO<v)=19BfMPe7?nSk
zB5R|0?M>bgL!TFZX#O&=-K?|n9k{P%8N>XCvh-rD-A2g7Z$m82Z-_(X?7C8FN_6jo
zmjF~4c8o4%{k33)W_s-)tHsYWFuTdhVgrYOeX<mX1X7IyPSKpznu*g4cd)$d5LCo3
zwrP<GT()gw;q_UyOY8eru{>{8mGR-z_j#Rl1n>BD>G6FE<W1n6Q9v{XJ}f}$Yx$~n
zD}5fh(x2lA@h!sf6TbnkAYWg<PJycAjsAU8T2}D+ue{ngzCg0|jXDGc5G;|~G|`YC
z`kcIpF+6;@pH;+*OrME!Leih8Z6~1|j(gd@l-v+7{YL!QZ_QR2Od?SrLQOiil3QAQ
z^A)vQN=6=#bPv6J0-DpWgO0!Z;l0?hGKcg){u+o5K+}B40xakXJtI+OBv9qd)q4A-
zj^<9bwi!m2zsFUwo?hbSmWzI#vb8raU)WVQl_@HBocwdG()D7lIik>26wUzd!g~zm
zR5y}{$|^;PK`m<a2hgy;Me$MTuB$B~WUP<k4fG#dA*_4(Q<6K})D^=2J#3hrz$!nR
z(L3rvU=L%JfLkv~`W%KM$G=gbEM5+8{x|_SA?t=&o&d#cvb}o}7E`y47yI~4=w70u
zLjqtY6WZ$r8Bu@e@OS%T+W_G%M3BM{vT@mFpsyby{TCu&{4tAc_sErHt(Lb%h(2XY
z7c^aGKP&4~y;#l;<;A$YG)LXt;9=o)lenI}(9_cbimq>H8PrM)`R^#TZ#)>kp5zB!
zp0V6KG8e>0QTeE^k-^7qVKD5Bz*&aR2r&kU;zUUD#{71F(7yzdFAfI_yxvFCP!TXQ
z&63oH^S6f4KILfZV#e0@_?VBvUvNjKWyLqYY>F@!JIke|>rk#kXk@ed3n+Sh8<x3k
z<`tivj)>O~{uQM?o6Gr}c%V}ayar}GP*9}w4xP03BU;p+&^dHqIu3K>VBx%w>lA=>
z{0p%Vk|H;i;4R3m)g0BI4mwYZkY!<FL<=}vE&!J|&y{OMfHHedhE9nAkPWX6l;#_N
zpd&Jd7-?`xFMBS99Se7%OWz{5V;j?}1mS?4sGd_no)}bRJ0xu&A?1tRzfFGUyPxsj
zMmQ370RH-+=x*Y$o{MQC><L-`uxd&%WVV_AG=HijV`Ssb105PX>=dnklC2<H+^EdU
zg0wv0d4n_OtU-<&L#f3SRkeswuggS$P3)V**WAHr)IwoBCzmtoDmG(IX+zZZ{{ajp
zb1SKkzp|W`!U5sDVZ1Yy66piCruJPIM;|z&Jp&&1Oh^a@u>6!ssh>2MreyV=*iaB2
zHOx^CKtj<^Pw%^pxf{wnW&YK2Tz1ftNbUjwml3HH0lWX68Sll`O?}!OI;J_&*Y*#O
zirN&G8;M(W(Gv95hD@H6-I=eMlzs?M?hi-}k8Dw>d7woD!g`@}x96_aKKzRHODTX=
zJV(&`_Z)90d&rl6%1gilQ&+j)o)j?;Zd878_z*RL&o`O8*wuH--qrl9`BKexDE#np
zBku~Z@hy?Du@#wk!GA-kFBUp$W$Kl7i%^G8MITj+N|-?Xtv)u2@YA{cb6c)J%f2(!
zzWbwMO#9KwFDJMQ`Pn;?n=D#U0{@lUNx5KbSWIZ#B<Ij3ylL@W@yEaQUUr2U+L7TQ
z#MQT-si$zVO7m}SU#v6)%xCcLn{okdgk#1~`gf>(zi@tlevInaE3B8WYdBM3wZn19
z<T^|s<}@}{KT9jjIc0(EsxSpD2qKX3L<Kyt<`;tNj)a-V0yyeVdEVW36-_SpNOb7*
zWg&pWk@F?<izrF`S;yB2=}71)(UtP-);qgBUCQp03X3{6C(B`{Vp<nv;8JP}(Q_TP
zz_+Z!@NALNHhA2v#|c&?vKkL#q9o!!-IkjI=*pa)-Y$G@vQ4Z^ZkJGa*6TNh8P=H*
zdCZw7m6h^_siL1C_Qba(A-P~%c7*K?aLaF=B+4K>ymFUWn65U5!DusXA?ph0#_r?$
zLWq$xvg0EeBB<0}uaP_cdLERS0i5g-x04^7zCj3>^bBvq{Qli%IrlGWBq^lPrM&xz
z&5v0`mS1s_$L~Bk3v_^%7jm<=(iLa}M_fjmA?7R+fvFN9&$FOCyf>2<e=B|a@Oy0+
z0iz7I$FUJ~KRz*68OZ~+g;o77{&5s#Xg+24+C~9*{{xH^<+}757SZ{oY5C1@qFyC7
z4u=TJ*aCjLT@$BSb9F?7U=ej@-|7X&4!V?Q=(IRzel^yM2u3MT>!K{aU5K&!_+tAn
zgp~KZg4woH^0lh~gR#02H|dLwy8@t{u>t&-v(33<{7e9-`QXimw5~ekeDkWMIcCIS
z{C)@MWcc#%e4|z+0Q0cqA<!gyuOR9%JIM<q<b&6}qq^bei<dux!rw8vKI*?+VQ`Gz
zHu{)nr7;iOhU?>2QXOiG?Zoyrsj2+^jsrI@3@M(wzFgQcAC;Z}U`b7EsD*NhjR$pj
zhHO(uiX#GBeBZJ*{FY4l4cW!a{3NScZ&k$J139;_h{rvi8}Eb=h4pm2H{1FmF4@HG
zT&({<xSzf1VJR-8SN(TKe>qMat|mNn{h;*8SlVdWXtVB;MgUKzc)Jw>w}&b^s~y^Z
z*L`5w{np{O%F3<i{ul<IdyywE*A73XeD&}!1@AIxlxi)zB!Cj+(;ZJAii>68c$SOw
ztDM`e-c)bfa~_x{`mN=2IsA4H_d>YpeZJ8OY-xE5%&^y`GV0m$IMhC?AueaOu9?rJ
zjzWFTo*(4D{Vu(oY^i#d$kM!UtBthML0<p(GQY8JOPjm5_EX^g{4wt1t_2Zk<*=xX
z3ZHvdL)I5zcV~U!*4=p|P49EIQ5Tdnr(sL^{mVxOnP*xDlyOypO+N!G$>8L)Oht|l
zcz}vG;?!p4_Yy4!C;ZRNQt=&Uu$%vJbe{2SzHb{3K~S|R6{AG0YK>Oy*_y4rR}o6>
zy+=@rMyyg*5^7hiQloZ_*tFE1O^Chs`aSpmd4Io1KFM`n=Y5{X@jY52mI@T=Gs^vz
z7uj6yzI%Hm<Eu#n2{e|f9nfRrpkL{@1h86x1NS?xJN`7j0)!cRFGrZ2{RhH=>;Z`m
zRRO%!Q}OD&a(nZJ(FE~?>${7&1V%vbV3p)G%We}ZWPi0>WlyN1)O$OxgS|-%)1X8t
zg@shH3ngs`H}#vmend9goHMejv#fB%Ft{%AwlTpf?MuAss5fIQmoH22QDxl~<dP-O
zr8B^D=yooMi^|M%P};AD?0NV|_ugCcr#o-OxbzN5XEb)a&=JyW!mS*Nh456-`m;FJ
z^5wS)PhwelmN;obA!Cp6cW4!-bs9vZ{<S=MapvH@PnsnL(G?+5(7Oq$tmN4%%+j9N
zCq$woAqq(f>8~)qCiVpjG&M-@#FDtHtZ4()ub&QEk`P;5(Vj5@q&+&WC*W-3L3#2z
zGv?(q8_5n!|J{X_qd@2R{DU;PB-ykL!Cz}m-0kmI*KR=(Is}vc1iWm~BbslfQ%xps
zc$2^YoVU<6U)^LtvSX=Eim+*QWiE1fYAHf4MqFR%8l2TEe6L>3kfg~T2_7kuTwlEU
z_eq1p^XFsQegk~}o&>6m(DDZG(ca)l?B6XR8K$T)I4j-XfA_g#pW7yOc~7;=XO;;S
zuim42w=(Qs>G5KJ0-;WT|M@qa5xT9|)IuEuG~rbbRCmRA!K=#+Bw%d#-!Y3>^Yd`?
zkFK=Arz1S;SyfqHYKL(E;a>qiRyAxLCQEvNyQe5y{}MYk8Eup|w!=d-x6}JDut!Zk
z8@FGPw?(z~nW+(vN<3D$4u1Rm{tG?A8*81m(n4F)-uV1_0|Cj`8%XK>u{FUt-R2Z3
z(!PPj>y~}<j0+bHc?(iK|0u60VAjg?A-Vq3Ly<t3PalC8BgFbvxPS!(Pv`UheXS$e
zBPUo}mr^7@giO8lNTqk(A_9QMm>WahSjDj%XlyuRr_vQ4NJ-j>k7(DLk_(qx8<8sM
zGg3o}6;)jnpUX8T@WS$TQSX6tYu=|1@3e7Xu7exiORPNT62PO|Y4n|O9JxY2z9al`
z?iTEk#|3dJo{7=fOF{vgV@!|tGQUuRrJy$8!`Hdre;jmpb#f@d$K*yh(_bYs^if_V
z??A#CNwLJmX(B!FIC>`kD4)qO)KP_zy{^;&RvQ5grc6)~Q5;w$dk}5}!U5A+o5#&v
zWr8(sJwAQ75-4Q@a`r<?bT*<B!hW$@_WY##K@HiAPio-0iS7B=pj9K}Cy+@0hKNVJ
z8fL4(lOd^)X!RcNZH7|S0nrrW)(v5(XKth2BfOa@sIV62AeD0q!zgSq)N4&(4#H3!
zLM`SsE1%=6OO?XvIc@2M#0(_3diB0<31CQBQ|AM?OUI=Inf@rz$jL@VkTm_Qk>-CO
zU^C*Z8y+@vS!L)o9=YDF@}nL!A65l9ETUl5s-dgj0IZ55!Jv1yp<hJ8)d=!{Ips@9
z3dlkhU%I)CcFtDHQcAz46Z`}A`v}RAn}*f_rql>JVjh0mjy{>BHcexUeNw&4?dF&p
z!}-~1?{=R<n_xf+>b7CgH~$Nq+}8CHq{y1%HOBs~r0fm3WG`=$qNf`BkYR$V*$e(=
zIt=#e^6!^ne2qBuIdDu9Kps08N{s;$>MU}TGi3vT4k^>xYA?bB^_j%)YyVF5_QH6W
z7gcxMB}pS^BY-ZEqa>fwAPBO#!=zQg-V|$)O!6&;NMx{n5{87>1d0#{P^OJ-xAX2g
zImspOOMKU_0rEm&k~EFp$bPv3=@{>B0!qM=ryd_tkPMR(wf8B%mK4w-ah38PKvAB#
z&uIZ?o=%&!^9S|sJHv|Wk>ji1RH!xdO`I!VQ0tUlZAf}DR$b0TjyQud?8;e%Q)-up
z)@P54=vFmFqZ<eTHjrS7X$Gzr%<LnIGXF~nWAug+tBQ!Jm4jZA$H|Cueh}>#7C#Fp
zNYsl=>1*doYgbSd=$>^7AZo(w6{Mu9&Os#CWWt<?YI-Yqf>et8gVxUtyE_o1FyC9F
z;javgC?Eb#i$ouNXD_4<0>$u^!OKB9Y_(>-OGq1Z@R)<Ks076hS=dcFeQhpraGQ*}
ztX+nVG%RsXBY;vh>?KIY12!i+?MkgSkt(5IajEK4&r@G{SiqL>F_~ys(K`5W#N9b?
zPPu?X3z{tBSQj#ifE{K&lAK@6ExqF_)MyHl<l6Jml{n2Y@>bN#rWwxgw`tYv>5q(u
zQ8_f-0Ng)&4VcYOe%(OGY^A1h)3_FgDviNtlC2)yXD_Z^DHe|Ti+#NyeHrq!QTtNZ
z<>Bl>E`{0CgJ1$%+;BusCj8SYcMZ4p#Qapy)kc84J^^}XMkI)H`334_4Fv_2I?t3Y
zvAfYnTLZKPPzpblr}4%wsFC;*Mh$hVKeTbtVOJ(+()CP{_J<8Nr`y1v{KIUn-5*lW
z@ey%eR-bs3qOlaVt<Ws%38hLk*6-x>t6m>;XJc?yl^nLGv6%q!_39H#kN6<9^3Gt2
z$k@y<d_y)_G=?49SVGbxrCH>OEg}<LqhTr2>qlzk;U)o-nHKn5C0yRE*$d-(_-Z&}
zyJ@+_V`*~xd#g~DVx2Y2^haO;6ojSI&fI;+77vhK+wxiFvv}i@)nU~@FpcIFFo}$+
zyn2G^iU7OH^R4Se2P`LQ$WDTGFL|e@=1`IL6lijSTp5Om?bkK3tY`m7j$t_>&T*nv
zDCARBb>^fnTP$vG#G}9Ern{oT4V#*))&Q@zkph?vs}Wl+`&?)5J0wQuHHl(qleL4S
zh9SUNZc`0as4!(EQMG4#N2DDDmXk)GZyQipSqk(Md>n1r(jIgNBsCP^i50HHTU_+q
z(m#jXNkI_BapWkj)@;`^-=;QFB1FhEog9}xe?$)-bj6%I0z;oVQS-vWAuXxcd9xLL
zb!_<Cl#UW(tx~qY-UkJhEVwE7Sc{tbjbU4JV8^h9(3u~g<&;}L*q|P&_Eu^)w$|Wi
zJ_3HzqOlDUQhV`TQN&kO@zZ!YojSoD9MncK?v6qbzK3WlzvWq4JJBN{sg5PbSq1Id
zPFgh1RZxt2HKpTR&079LCY@Z9b^xPH@I#*|uN$wI5+XIVK_Brf_lU5#nQtQ$s&fU~
ztRQBv7rSI>eryo;VB}{h7*{`T{8GP)<$tp>F8@-NWi=S4>u4l6c7>Uj!%~nlC!eF4
zfLXU<>vwDa5VH`7ls;nbWtA&qzPZ5v;;kV`4q!F{!HbJu^%Ulc4SzlL7H;06_HHua
zaxAu%$LI_fNTjMSbMw<NvSX7<h)dNxQjtZ9)%fPj4*Wr`@wmUt=$uTD^BqrmTJqi<
zi2ThFqBP<pf=^7ffB=?n93~StRdA#oe2sqEXIZ4!zMGvk6=I_Ep!(cyreCDnfCG-w
z;7OHJK+8<nGIWYOVA?B)4TVDePI9TeC698xxot0KD9ym^2F2#JA)GNbi?gb<Skcg?
zAh(tM$PpbCD}3G0ZzshAzD9(5AU2;dVT_8Iyvg+IH!59Z>YW0PI9ZgAfs(Ml?5dT_
zOCWZJ@%s{~3U`f7W$4nQCxdfm9@|r$L#rP_F(3lE;Hdqm(wul}RReDG7V(t25efn>
z|5FoZTV%=|K0KL-h?=#`^&7KW$>)pad)X=ROmtRs39){<7NemJ7rvE@`;R)+EA`d?
zFuC3yW&=^-s;H*%5%(5aCozh3hj$|$QAx3VS34XI4)=>JeWL}ldz7vs!lJLL^Xk>%
zrtW(FQ-%X<4=1R0Ak%&t&XChZ!LBWiDvn-%MH8xbjXJV={pWdVpAsMFYXpaQ#}=f`
z(&PwS87OfA)Bxq`Zz_prb5l@H$<4FLl#N$3cKW|op2c^tZnXQY1&(MEa!3XXHN?-w
z&dM(#rqi>U^pn2b2t6nq<jockQ6Y3#^Y7`_`-(Hw?cGp$`}!;a1#dV^S{hBxlLz&_
z9pS<ub;et?F~B>2;CA~;uprz1!vE&S0VYww;hI6O<^$Hjy}ULfRVN$yA1GjPZ0xY&
zZl=tZx6bXU8{m!IapX)e>58%P<Y7zHtm=MjY2{i*huuxbzDAls&B3^hAVqwtyd;|?
zys|Jt>lL7=0HAyPp&FxGM-ek+8f|-gaU9R<vvztY{Mfnn2S@mgGMGm8wnBq1!kt5v
zuH&_fZ;wl4OjNLHmQV(ef(WT%I%jrmV&Qx@od%{srNU*3E1A!D^u|wn2`qR+<^QLc
zh^iK<yN(>aKGWHsT*6>6R4V^~ViwN7cN+hA^Q{>VM!huwkP`uspTX!xV_mfuCV2y_
z9_ilsjSvVcmg&ae1bzGL{PO8pkpffb{fXm58r@oM^~%R(pM;C_X+T?C9BRtsl{1)W
zj~i-(>u;^Ml-?}s%tUn7$;<z7`)eDfdjDqV@AxB9WS%*zDG`FQxb(@Q)|2;toUt!u
zgM&3V=R09AcM9&3o~P_xm>1}Ve_y+H50wYyjki0n=2yS2QzMpYII9%4Lr8xl#mK@T
z@1C6J>)x>KzquJ{&|u?)dG|hJfF2#pW&1N-#MuAz>uzYO_RVon?1MRa`pJoOM$wd1
zYBIt92R5nBO8p6^Ul$8O{RiS>;fT#V_3ACFr}T+z2nLTW6rr7L<G+8_qKh2&GVA}o
zP5-if#b(a0M;v%sb2K-x4_RxWZdp^Us2x@_Hj^iqs#)sMDnUhkMJ!h(sBb6pA@P0R
zvNl9&caiU?)ZFxUy2``hcdUGuxw<4`v$4p5Iw=V}*%}rdv~HxO#O9hpn;k<M4j+*V
zEW0sEcxIW=PJra{)IsXad$UX$1@B3+2eP;V^c7E1Eh6{3Hj9Gk`YM7A1Dq<^@GF62
zCBnO$;fY%@_|y;%jCu7?m$EFP4D%6I-v$u95^FuXECwAQktyw*gMbiU&@$IhT`l9}
z)PYVDU)?*WQ(s71gS4382OQ(*W*;o4X4UuU=4Vmg-C^8JGuX(qC`h@k*|-drn1tdG
z9`LFYU0Z3xDf*M`OX3&OSTQ*e48Nx#)lJW8n{@iUYcP<ArcUy>oe8@4vrI+Gl2&x(
z_`J25a8xp>;}Y2AsZ4I$V}Wjv1t`d$cfjm3l3gOb_&S!4;7Yx*I=Qa}mu|YO0aDYA
zm`LpW3^`y&D-$!D9sIlpe=XG~HIG71l~`LKgLHq|cy@o3tt^pTV)&DeC_T~tnrf~Z
zi8Aq$YCqnbz$oN^Yi}KD<Sg<*ST@4G`hIjFPowS^2Ux@F>RkSrgTJqqqf$+`c@&n_
zDa&qm&^32h)ijz^$p!lrsW3X{=|kvaJr?eqd$ysZ3HznpgPwES#-wME#Qeq5^_Q2=
zd`eN)nUY3pA@-*|O7cfU%CK}8@5%YIOIjVB^5^8SQoXTq!-Yv;=SSWV=}!H&>0YZ{
zOxnvF)H=3f^%3KLZ8>Ksgd>?fH#v<d$;d+Rdw_A@ZONw9Vew)(8Z65J+T3_k_v=~x
zYpr|^!z*NDtj{D*QTUHQi}gc~S2>j4hKRE4i_;Q5t&%SX%pw7v-?YOG5H$5Gia+Nj
zVl5i(nPffpR+2GcL+upL;SS0u{{_~462ak##A~TDPp(Me>jD9kpA*}^6EZFdjaXUZ
z-0Zln3KX@Xa7s4Dno#+e>et^1txx2Td!n&Iv&FXSS%<rfW*<>9>$C!W@qHW2vP(9>
zQ8N41^$+4E{)l*g>pFnQAvoWeALgizzA_tuKh){vMY{KxY4Gg}O67hM%EuOb;%e|h
z^gJOo%$ZB;@tSS%xl{d8)CJMRp+2yb?G>|;zX-&ql~`GJM@WCs;I0ulmjod_rNb4<
z9X9SZx09w*yfLxWJ46AUPaUf5I=G{T9>n}RfhVWf7U}@Fn{kqa_3oF#f4_^@_IPKz
z0U^cIi?0r6in2)Pf)bjTKz5BJt*Tx}giS+N9<9>nT``>$x9F~fe*E;=okV%Q0pb7J
zSxjxYy-je(`%!hW$Y}X>^!`GlTU@wT*~%2|n@x$obf5inM)8iEg0HIM0_~D-OV<)*
zS_O#JvPCI%Yh=*TReHPV=k^tuW3f%+>}IUVs^616i(&NgjoVji#HATi-5eNvjq<?i
z5Pt`+DKd2^soBs|e4^5PU{zDsjc1@2w8xrBkcIkQU<%br7u!Z8jdX3P8hN#81`^Rt
z-a)dClZCfr-Z&uR20l`LPs`~qW*w&3Mw5bGLUrdJFN*_cL;5HmGz}}~^NZDt;ShEq
zlRKHNX&mF8T{RiQ%2XlvY!hDhtZat5al7I2s3lgGow;atN%j!b+~kXl6XQD>H(qnU
zZ9FVRy#aj4l+Dd!BGHVH_ho&i%}uXU?mbuT&-V|$0blJK9;KC7T7OY>7<^WcjmR6}
z;YwE8MhM~qCKLV{iR7lP<p)KddUhW|vq86L6s4XBXXJQJ(%TErt6NL>4dYqZ;s8Ai
z!VB$G#pF9A?~?f1tip_g#SUn4&skiNL`g4}s3x?(|C`j0RQ;9Ly1w>GN}pmRygB6W
zE~~RO>6z`aRI|Z8{MGMffqV;^C&w>?cZ67|2Z>FF9Qq(JMx^m;Li;W!iNLLP5dI58
zI<xuWOp3XB|CMFpU74UQxSP0|87j!7sqoNVSLdn*5skWwDHTh#s5$wE)%?3-<z{E(
zZEq%#ZU>D_OUbUIz{y>=SAcPj+q{>8;e8kOGi}>+xI~)H06~CMJ^vzYgC0coH>!vI
zl%Af(X-~Y5-Q}#~Yz2@vlmMR~A$;smW4V%OBl$}HH=k;qn?i@ETzOX<R-ttq_U7RL
z)Fu;;<lLDYT%>NZdxTVAeKIlGY$CipcPi%5&^FGS`i9poxE5uWNhsx8Xmms-0L;TI
z(;p{#*PxqG%$~PNXA8ujY46>Z-`>S$S7)E7Md0V|)Rx4?Otig~H0Vzsr#^Uy!Lg*W
zPbcBk505J*$jK!<@9Oz}Y_aX~X6#I;)bh$r@1M7h*|NrYcWuP`KH=e;uN*@Gc}A4`
zna^{FhQ?Zp^?$n7#<yxSSb8KS`?hD9E)th?rg5FEY`(W0Ku&*YbCXg=D4SHpH)x8j
z|9&XeFSg*8JKs4{pp_>9+;l?RKT?HX_2jv~rzLqH`CzK!!VjqZ$7LrWON6bUr4f=h
z5~EY5GiuzlEEYt~F~g(OV6Rm5p|G;$ws#WDzrzpa_bd?NhmMO;-XSJUPB&~#wL0=_
z<oWS*3CRP^ktqM@WF0<C@4mS~XJKifth8F{8N>4Z&u&f{aT#6>swPfrEXiKkslof`
z`P(6NIZGvx+=h{$dq!pmhZoRoOF#MiLiaZk`yEbsHcr_^RH+iCv73uiOLk2zT52M@
zsAq$krq!w&SW2J8%5vXAc%dp*lsfS~`kB|3?rc4eeYV#Q8O2h-Zo<siw|kkwbrghC
zq)6@|Ai9dGwL^`$1cloVhU=E6q*9A_tYe)UUbgPPwsClbe2x@g#d%6%Ls!f1rQ?6Z
z!&CYT;(x<Q)xdQ=#<gpOS)yVpQ0I5v()>%bsy=7voUaTK4sH}R2kCU$-7LcgYFzLu
z!bDEt`N#FggH~?oM5<|tD-B%K`Du&C#r7n|f1Z<U{d*+hP*sM^0GG%G$_-h5FxPNt
z*_x+QPn^9MUH7{Qb*;D--r`&v95&AIq@^+bt}$ztzM}OUH4ch)4q0YO4L`BHM<OJ)
zbi5^Z{=d{ylPbFOD1s073rZk&9gfIr*q!n@H#DBeu$%ifu~kX;;7_ytRg<Sg8ury;
zw-(i-2O+i@Vnk30<wnWA-5B<kFlTlP%P6P?HqbGp$9&F{MwTl2SCVGfLz0Q=^+|8?
zm6Qp76Ml=;9%|Di8Ur&`H>##5jh{I^ft;F*-VUk0W5%vKZuBF;p$*gN2|S4_sv->=
z;(a}WP0krUUsZ@}Z3Jw(N(Z0^YN3wnGkGG9RCf~o4GTqNf7Re&qWW4v4gsN+_lMuO
zqW`cJC1~kLC^fuGf1fV+^r40<^l(E?#?Uy?&EsCk+W;}Ks|tT`4Ir|@pKhA>eKYSC
zQsI7Jq4>~<QZ=S#6s@B-EILzaO7q|EE7WganahDQ*bnakRy_ebJs=z{{1cRLSXqC=
zawZ>SGq6NONCxvu66At#V}(Hhk+Nc0&A+eHKlb~9otH{=1A#-ejhSejJquZKa<hFN
z$!f^NwcoJaPC&Wf*W1r8JmnNRS~;WG0*8Kzi_sfaod?SL0q4i0#p!3*uf%G4Qz;mM
zi?E7S$bb~W*NjDGXAudFQoXaI9PMx<eBC;Kx#>=fZd7?%6Aw78M-=E@Cz|YjvI|(Q
z`8M5h%S;KyQc1+<H_G}X?GFW*TR(9B`_?u&Wf%LWYMVQYg6eCr)47ghFJSF&5~AVi
z;SuZtH}T}L`yf-UU3?RV|4ci!lPuA-FX7g$VzTutdhGpd>sf?)$aLgnR;y~y%U?Km
zdv;N!Qj20HnuG+(3u3<TYCXL@A{QKvPWMtYtIrP0vu5N~=MjU#x%@9oY?A1?yYH4r
zvJQJ~kByB_%E5)il7D{%kx{VRi+FIDF!NnzSxmrYIROZd;_{O^Du2n9$WpF-OS6}S
z3Q2{M=J+93>kwdB)hBBkc2Vy>zLx((-$8x)BQiTxeE0lve5rQ_9!b6B(|~h&e8=mg
z;!s@$9C=7gE$=?>qWt6_|8P7Ad6lFzB711`z&7zItUKNv5w_SB{C92HsUOQ|?{3wJ
zq$vu_y;ZHrl6=MAj&0mTpRLvkfB8^)9;fe<xX>b)s>CQ|C-3Tb`yd)nkY9{#+vOyG
zQ(Rhdth5BQfkTWxs6YR66&)sf`iQ+|7F=%BR7brS@x~{XFLF3MN7Q87r<f_`l$3;h
zzD0f4STjF&fh>fmce5MhHS??us7l5Qvwg1B=c-cdBc;1m$kBAfFo;sky5VB-NeK8B
zMxOIS>Fq;?5m~?EZr^P>G|5j_$9sJvtlQln<49pfSiOoT3+pK)=}(#E++gD6caU&~
z!3gUT&3+M<+-_IYPH~13Pjq&14Q#Q68cDz_6wy&Z^4Y;aGr)LiM^7s_IC6jx(+*}x
z83$s>#Dye8mS~C55clG8r<M<1--p<!T-zx_j<&aTA5DjDh0Q%3g!lkK!v58n>e_$G
zqEph6!aEaWb7?aF$g7G-f~Z3duLXEbZ@Hx$+ycU!UP_n|1%845usT5z4Fio0OQ5|l
ztJ@G-2Nt=zt8r3R{93KU<I$V&ck**%g9aJ2d0aL0U7nu&RJ3se>|GhgV6Tx%fZE?b
z`emm9$Fl7C)N4#(*=Qj!;%`G&5ZHq~tmbON=YarU_Mjxm5<VN19gLg$>l^7_(c7SJ
z;y8cVD76!e0}>umm#s3pp7Nh7EjQvC)=fC9$}gvWAquvxA>}4cR(-ntj9y3^5VZoO
zMuokF1Nq%&!;IMs>xxur^n4hR*=PjO)mb^enbINNXdr4fsa|KrD8D}L7p;_afQV2|
z1EF5K1sIyWnS!J=Gzd3PEA=WwN^XScl6DGeQjb$`vObUo3{^QwKGI*wza&$C;`#F#
zhTDpKy(G2Mgn$xdeG{(B6SWZ~A+rm-peY2I*Q*zkB%4Ha_k_D&UxqWDIcOPErFwvc
z8k>Bs<(!#n8j?x%jjEVJzXx&@Z|VhU5y``AB0J^+uYq8kNB7>m&tx@=<ME-3zF7SR
zj4Xz^=2(@f4Nu{7_>*tC90KWIct0d}8~U<)ZJWDzdOTIR>}ZN=-cu-Ee+jDU?V~fB
zqt%uMf@+V7#WPbT?zQCsDR7l~BP;6~50w9iq;664lB6WxnJqW16}sCp_(BO3Lmh&`
z?VT{1l4p`7KbPdU1l?i9+R)^keC-(?T#!x4r9s+bGJ!g!^Xps7;O{C1+G)4N`x>yM
z1A$5U0^w%<IkiEh9;IW~*9ala)LJ&Y9i0Zd+Ijo&<HQo#WWla!y-}Oc#bu*geXuV~
zl#xB^l6{t5n^_G-L;V7sVo}m=SnYxcjOIhqwP#KK+xH~!-!V!kh}@etr@APIRFGC|
zr#}xGf7ET2Fd><L`3$+z$TOy(S$N_gb?DjHK97YR4_U<BZb+qlQScE+&Q$m;wV5o%
zw}2^T<?HSg(Bt%%+(g&*F4erAb!n500@UE8OoGkI_wBUOA<o%RI=F2O4^M81divhM
zm^;E)DZUDg`)Pv-^P%;;eGncnEF{E`&g!M_s*q=AHXg|#_jOF=fp%%kLq(Dj5+ugD
z)}xACMYYhfSyNjP5*@iFC+9q%a#BdoJj+6)4E0p=xnZnyk?2y8I9bkV#E$wHp=Z?p
z;>AU0Jj;^ru=ialjO16*PycHF){PSHq(fc+bo2i}72ke#2r(mj@f?P}@`PEY^dKKW
zu2{Wn8&R%HV$f=Z@OVnz52IOxmV}5{NC;Y>=o=BZ2Rf&j>kWdpuaC`TwcdZ57muJc
zwZFHEzAh8_@{(qkvHFD@h_;ajdaWRxavKeQE)#d|8Q3=>|5wz;3cX}e|Iwos4^EEA
zWXeu`+&?0YqOin`WhXhC+4;!$Bz<sT^cewo6M*8&DAIkECi&r(UwG%$OA}pw3$`@T
z1hF0wu`z$#?78uP#M*DW;T7y)a5lUJ{x;i^pI`E_Ta`%u99JJa{ZyZ8o`O`JEsjt;
z_9u=gC&<TpIMEY`?DCcg3kiG4_Q>9{Oaw`l(}JB$sN+t=Jv@g*5v^lh1*>KDCpduJ
zX$G_DlHA*3WZc1DZnMzmLBM>FB-i61lc*D+sC9lLOS~u-G!0E);%OfJs>Z@4x;qK5
zX(;2jxv~oe^GhgmeLFU@*tWnkYe@^wn%ynadUk_9@qW-Gj;cnns!3gpKV?3sebp#S
z5F{Ta+Kn_?8GrCtPTHl#|KGyG!r!|tWo3=eM4lns9aH9FbmdH!0*c7qmi${jYiBb(
z@D@E{-`M_U^724HA%MKe+dFLY0E_#0#dLXMat0508Y55FvfHh|;NfKQVlRl^w3BNo
z=;D3SJwtS>NtW8F%aR9U;N}gb!lg(5`+qNuT3G@mEHP)QS3HlatcMeOEpimob9%v~
z@Pn}m!^y|{dgf}zaKUxAG6nlKr-<2)Cnnb!i<b)jF!4)i7W}Phu}3;*nHzuHmwnu*
zU)Z3ZYU+g@c88k;Voolvfqkm;?U`3w%ga+YENgeDjpZDT;{9l7wHWAXzx@1cVb@tQ
zeUEjyqf+w>P)C#eJA1zO<;nO%-<5{el&<eq3mF;9eXI|*x>joD4qxS2v+rrgFBe*b
zkONt?ul2CG!;(y&PtxY68Qu(p(VahEPMQ+$376VWZ0j1CVKe(H>sI-U@jZsN*YTiX
z1#WP_9Wa&qNc(DXjSzWrdyRuRQrPXN$?1a)e+)=hEj)UXrSi+sfa1AOlxdXYmZW@k
zxL@Ier_{>b^+I!asNZ&$XFki8r2x#Q&iZc64E+=J&n%=LCATBjt=>(!x#goIe~A+v
zKDI}r+i=Fh@VIBjZXM&^(<AZ=f4xcTV+pTS>=~L-PdPf*&9kP|ZKIabO$4KP`10CE
za3*d%8QjWUl?^Eeb)z~(>czyYRIhm<UV_`5ZvTPogB_pPNp9y5vr5p)0|#GQ&Br*I
znVHq>MOy5P^j9R(cN6WU4#*NN)x9#7iR+bvqvXmSmmlf78$V)|)YS&*Eml6UGx=^8
z&ri7_!dBFM0`fv1og?b%CYn$pme)%<`Vc1OGm?Y`_DJEm3u<XY3hw9PVi&e%Nze<g
zA)Pm+Ry7%>V~&F2lN@cBKW|6b;9DKZp@`!(G9~t}{Yq|Jbdh6xu!|cxm-G*1n%kb5
zhuH97kiZ&nt6+qrMFErmTCI`w>nhl*Hb(5DU;%t(WZ`N((c!KobH`=olGnOHIex$7
zjVRafDi2Do#rY_pjv(*qS_XVG@LsWv)aGW8!|dJCUz|<joSmq29y3m1fBZ!xmeB3{
zJ1muOPct=W_U4K0cK&5EvBF630|<xPL*WCr-%{AYsU>Qkks~J4H-}XZcN-gp`?j}l
z!d$8(9QFncqer0sfzot~vNi^%!2a5c9tIO1`Jsc_%B~+oJ87|-fVumxx|{y}Lq##4
z7z0ct&rE$`4Lot+pme@Af^OvCYgBK3hOvC6Z9BG5L6<*nhmTEr3PG}TLfG5X&KM(7
zPCKm%8iv#tx_%?&HA!0~iAIjUXow%bjQ~fY6aW<;Gnj5028)Y3CZYMf$FXqKTfSrW
zfmG-)io)HKrb6iD>06m`(O<cJ?eewV^$@{1JRU8Yq%`y1kC^d2Ve#O5O3&{e$oapr
zbhMf2)%gt*7ZV4@Iz0qPWxdTh!)Q~<!tsf{w5cdDE`5)@osdoaAIQ?6iYCVViT$Gt
z68q$kn-=GUK0mfJ*+5;X8S%4ylP~%sE2>>3E5kt}ZGX@<)XG##3>$YAE6o+*^Yhvp
z^iMkYR@krq13h#;uE%f-yr@$;2c!|FH|ch!pE5O|&WuoZ_u_SfP6p}J!gMKJ$iP@-
z<Ck`mOi@n_8;HRau<no<vLSxkI|4%$9Dxr@9ivQDyQFpoRfCU@OW`S+B$o@VT_GU`
zM5Ac7k#j|S3Dll?oREoc78J>My102lE)2`$_1{@j3(q_%C;x{sz53F?+N049gN~AV
z3GtB6Rn22QU)W`+S}i9-sprMlb)4WRUFeSga>C(QO7y~KhW4}|OP`Lu5!qwD#~`k`
zTeQ<W^-B5=oY!L&9!hf(bai-YUHAAqLrX`jrAAy0S8y-LMugg-HmA9eAZJsMcRs?@
zP>fmYwP@-fnGX`ke)`N*rA);25p=Y!IXH|EJy#W<y^px>crbnMxt;Qk@Rb5#=Cd2~
z=pVYAp<z)>u{Nn1)wFl#8A}wF59TeoeiLl;D~*}xyD4TFy8(np(P<8GfoubAPhFF0
zNc`qE1mO@@gbjsj!()_OtF<W=TH5~l4JE(+^su(%Q7&boP*6Doo(jj;8eyK@<L<B^
z76eH_$xt7O!BWXc9Fp+)DOqOrfjxJKlB707XV(>}lSw$tMeQg?py7<!<X0274p2{z
zMts&^hCXW=-#w4ja)dl#Qy;5t@3n4VAx7MX-|hL{3zp(KyoMC#mDs<YZPcca3%2`o
z&lo}4%X<+yMJ=d~Qx(b<51Yp#!wo@ezefS|*saK;)dCu*?ovK8A8O9f-p2Lyj+jNV
z)Mk>$VM2)dw<UT)TI>n<F(~14gunJJZ=VaViBFLXj2~HDy|qOYINp45T9$teZFFxw
z*%BR@_(b{9hbL7h)H{L_1a-fjQ>?M~ly4{#%f5~A<sXI^%pT{#roK%PSo#Q%3xhB5
zY*dtKN$H+Caz2U_l=l=V+WR`-=h+wIdlhT%OKrg4OL{2Se;(?^Dt}>Vl<H(aa@uaI
zZ*!*-@r<LQ5JF$bY?~f*G+=ouAD45cKlJ*2x^y5%%0s3;YfIYL0X^E*f136C%Rr|j
zNeL_(>+=V}xvD-4<6DtMLtwt!dbQKNU=}%@aKYcYUvtx~70-1HhNb_|)V#Ad$WCgO
zevP>MZDW8NMS*44=r$GOw{1#RrPxl});y)Wq~~gYr0Q_Sh@SMtEh642#DL6FA4$wT
zRzs-qRh6jii182*7VOuh_;CDJe1O3ye3FU8P4HbWTNRm_E$|xhiQrZu+d4SiE9-+0
z(C)Tu01zcWR-c^nQv<w*r^ahQ1S+$?Ig{u6Ns~;FF<BG81N4B_2tJoM627ya$ZWrp
zZR2g&D_AW8zpQiu{-FZPSiN1&7!oNHfLy|q%ku%WQAIgW4+UQWDD@db7xROMYyf-d
zrBNM%{4?ZM-wDUDwN+Yly`Z!`^nVWjl0R~vBs)N)!#bl`peDjJq6QjVVTc5eRhk=%
ziN%8>sF}QsKIMzWB>x8@x5G}#HEb&RbfxUCiDL+xig(;P1rvdb_u2({mbcVI6NkBV
zya-zCNqtyeq+?Ilqk5{7QoVJi5aZ8VLr&G6+{m@3ar5CQMJpv50pV$s<98CCyRmMA
zCoybru$)CkEX}{ZQ{PbC=pyBY*Uy8+CrHjtxf@Kjx}1FeH7W7kT6m@T7OZPYhFG1%
zCUVQ`RT`!)B8u;f;nG9rUk-n>u{?}+Q+J8IY4w+-08ezhA;zX1&Qdw15M!P^Uh86|
z&3E~mY&mF{yeDjPICncx{+%#8ds5MIW7B7D4eB|n`ye@0nSXWMX1w+86s}i;VXBI(
zTM&Zf4o0~7XW)lAhYq|Sb{@xxpM37ZU903C+G8jyh=_RTdD}PV`K%Y|&q%+!HB?I|
zEqf}%_jl!A^Iv;2se`CahfHJD;qSIZx9eYDA}aooNvCZdm3$%gYBlSML@_B6VA<6}
zMu@CwyMw{~o;<c4JaKp<;fYA#>gV1>2ifd&%ZHLn=(Cc-mm`N5Ve*Y{0Yux;3z(Ho
z^4X7+hA|L;d#wH+h{42@2_GHu&GsWIm%2rSMgb-8IqUJc7W*LC;$)VN7zt>$q;EOk
zsa!A)8El|3CkpC{^BGpvnZSrpG{Vwz<|DlsK#r))D*zXrk6O^L=^bfoKq3W8*dtF$
z`84vmtu~qrw*{r}Cs=dgrKUvL6Xi~l*ff+580lN$qRZ15Xdl<f==w#ieP@cV3di&*
zMDCmJlV<;#IeXl-9z0ob_>L^9ZQ{o>TJBHoiVzvk;!?@0eS;@+@thxBtsip%LYbuE
zA_2+BwANuEzXs8l%rt`ieeK6oWNQDOJ8GlZn?BrDrK$a%U0{$gL-Qitnp%3|TVnVD
zg|X4EoID3Re3*C8zt28F0Uix%kMCuI`co47iAG?T`e5SK;hDXXjK4U5m}DIDg{ohY
z&qMeuJH%+Lpo6$H_7Myx6(H3oUx0R=)9~S!p=}-O(I(S5zuJ)5q=%_CbxQH3gYl2t
zb+i{X6&)-;%l;Ff`i@C<?E@VT`%F3hu<LUl&g~g&jv~PJ$BK1==d~=<O(nW{8>mbJ
zHhZKon|jTC+;QdP@kRma+sM=w(0zo|Zp}0UUj19AlyEF81>MQYq`bQD$3c(8mIuV;
z$hUF|qS3Pwve=+kTkSF=BU1fWQ16Q4I9lBL^h-u7V~Ji)y+`tBH4^4M$y_%;o9Mlw
z2!o^WNC13t_hM#rD)~2}-Mg~_go`|`*!NvUai<oDK6)^O4#Ywy*jF;&v_88PrEYsj
z^8yFmSIjz)RnZ--@F*f?B=Pzk1fV>;?w%q@fK-eFM7RUc{;`iVR2Gw=Q_3`IGbDLi
zftGP|-}LmStj$$FMcOJ=XF9I&w8Zn7BqueX1f<%6o9X{$^U1U7|3sKY64+mcF8^zb
z3TAsS;zyNQ$F^#7C!0wYP7*z8vLQVAj;c)|wW0trgDW{=1<d<j8{8~9ycT4h{idbO
zI2e;L4Ca{Mlrq?{Ukbl{_2N3!S2$eFOqk?BFUiYVUmoZs!>cR>mI&LX_y|ASH*``m
z7M|x(r|u9ap(VofE}=6e!hKy<y?t3jvIB||za|a56W<CpA7X1CRn8mFunAxDST>ji
zMWBE58Bl(DySKg-!PrI@0pDd<^LboX9VGV9>ctCe$`QNEbc7@3jDPZq(c*;N>2X`^
zjmTej-&?O=ofRMFUFR1i7pI#NsNj$yxP$Dq(1q05yG!Bq`eczGwPJ(1TWL_iw4~-~
z=tbHq;=s!j!PFDh?5SOOM@k(&)LUv*o!p8$u^-r%wtS?;-v3lkj<An7lfo@ICU#>0
zrMWB3t%Wlg!;}nGS*3h{Hp2QI9?~^*68C}Hf^B~&;<*B8n^RjPrWW&VvRi@Z>Q(Mp
zv5qf&)A}6&@n<ww$8mP*N!IL2LlHS`-H)bRbn6cv=8esZvEjj_L0BF0vrElAkDmWP
z(}&#x|B_<vo>VVy8&7AbS3E8&b$dNmEIH^}h`_3(Bss4ae=>|sGm$`vxo8MsHac4W
z$@QC{;vj<&^e+w5C*~eIy_03{goZ&T+TK?FPhg^S{aqd$_PH~nb|U`GKAYBC^2Duz
zHy6JiohJU`fnl$Y`fiRRUSPh{Trr27+`g`fX^qSc{PO5lAmH5C+kJmB^|GmG%JKEV
zeLh(?S6rRTpTeYKIdrj`><iv6!I)C6;p8o)PWF7h)tSJRH@1yA8gt*|ZL|4FPS>+9
zjo%ti2)n0Rd>50S(9n%F1}CdfMS+;8cHYw|h&n(*ppIxStBj}YtIt=f7tV}&{(|h$
zI>0;N%jQF#TLI)EL`G6P+0<<)XUUXGYHn&qZ<-2K9agz(FU`@O@83IrRj?+U!f@FU
zkM>K?BgMk1cwUPA8uVrqOl)_|W>}LWwcl~<`*4MYDiq5J>JQ!SaO)z-*4st&=7;(K
z%372u3WS9P^c75I-sUe8<r0h@p!L>X0Bss*t?qF85=+DY3X{|Ii*ex<)itJ5_C^@h
z#j<yp^ceGaKOlPlJ0ciS8ESY=q`7+W`;(g^oJG-Gl~oY%<RLF8EkY#eUJf<q{Z{=8
zL9kT>5h?^y!lHQ58n_@B>p%qAlAIt#K`KkqbiS?yX{0r1SO+{&aO)nLWlEgKekCDQ
z=7L5$utd0sK_??QeI?FD33L&?*z&+2Zv5%T)S<VpHzOC>ThpbSD%f9C+uL6+x<@Z6
zq>FH0GSbcokH0A3>!&J+Ufj7PAjdc)Ql5DRY1M*O-iP8jfE%w{!U=dif2ei8vyImq
z;wfJ+_NjaeGQ;b`#px3zf|XpKb8O)fK^FbJYdQw1nw!SCdxyX3oTxmX3^zUt&DGvw
zJ`VyTv+8}EADT)d1(Q{T_M;*mPAlNdQm1-1@>=alBEGpzLrSp*>wufk%EJ2kt3o3m
zt2ZJU2v5w)()thsLaVw{OQ5}VK=4YAV{OK92b+>!<rVcc1m=}N>YK5khyDAiMQX^_
z14+G{Mld@BHcA>-5M?;1ZP_;T5s&hTY-bM>ygvGF?#8A<tU5ZY<Lby2F8S5Jk|Fku
zzvDf_l-gt&{%wr24}!MO>#^&!EYv0~n+P?R0LuL4Jrk6`sHs8ftqpOPwm*JCnE7(c
zO<Sf;-v~ygTz)0HW9fsI|FK3_I2YeWbcZTmN{am{jSq5C;oH=V4(n4Yt{5Y<>T7ai
zmY!38IfSmp{YWi10mG>3yKVlDe|Vf~j0_)|qcqZhN1BMkFis9HQTU#<Ay(EoaiHu2
zRXF;R?PmJo(RTNe0^OC;=vc26XV1(?Ec0U)h3S)nkAGHN84h1M^}f2UTKIdc`&XqT
zc5?V!yDyW9UXss!c`n-#8qPFafG#2E|NIGS_|Z_`5P~uzR#yYv?$#bPi?$&q3*_7X
z7Q*kCU?!XlOFeh~JPYHl6h?^7)$>)#7u6PNt>d&l$HsHVeB2#4r0a0K1|TuV72*9S
z?DEE@5h0JOnN!9+ElPBYp(ud*0e&3*XEX@yf)o==dT=`z$2w9JNcf@qJjD+Z)N7aP
z=4aPWO$OpCl{&imX|$R1aX%)d)nG8?@bqJ~WRIG{l5_f8Df_q^#dHj*GE@|1a}14$
z0ci-g3>GeB?yCG$TS_IPz#oD9E)4HHeJV0Dr}29B)DBz^LWbe8_eX80j>`vL(&)FP
zyV^Ly`TChux3-rek;fy}+HwajgprwBC*{|Gtk8b;^;m?HN1QZSyg&CHp)YDYublsI
z<Co0L<6kRxg|^!0hN(T?9)CIOGrL`}`h(K`eGqah{oD{>m&?S`0Bv(=)u^8f=7%ip
z1OF4RCqwhwo#eofDiRJubqNBY)3806gd0m>K<9BLbw>?7gZqW4#v&;B1Y7y`JIU-+
z6;p*JrW2?KWv3U>l*c1W_1KZw&nI)&l@F`;%dp{Gf6L8eWB!yEGD|zDL`FI~aU<|V
zsl8@RX=a+uJWWy?c1v~RH-FlkcF%++uNXQ{91f4H;63kp%v%~feP0o^|IE8X-Z;zq
zJ5@;iRCG2)h;G>AM>z4#AHV_S<+%NFU&TN2Qq)P>u`^Ld_^vabdwIEf^U|jxq!R1y
z!83KayKQ%XKwa6hvTl>=+4pbWeL`R!>FXR+{;7<Pr~(hjdOI(-y4n-7D)I5n?a}D;
zH1Z-nmed|si)X}}UJ>^1U4Myqvv^10eYmhoE7!h6q33j(-sHp8=H#8VuMY59f64}M
zRpk$P%7_m6A9BGVLB}Q2D$C#dy;6Eaf(Vt%uWC4NwK=ri4m7^y1ts5#6lqdEP?aWH
z3--I;dbC&nOa17*Q$+>$^Y`S8R0wS{pE35Ya@mFZB8kj5JclkzyITfJ9%KbB_dl}_
zmj9?%7a{YMK4RIOXj7Bt488UK#id-uC(2t^`KJo}v+2FIk?5ssm$fjVc7HOKg$3TX
zq*MVm^lI+S_@wgS%6E^|k9v*ONI#{Wnb?k~pg>Q?w4>Bs2=E~HPCI3+?ivVx&@|K8
zIl<QM_jrn<fG9Qa_~iGs8PcxA?}o9&WUH@1^x8!0>m#mINqQC+VIQYE0zmHGc>r0Y
zjk+a5bLx}pe;|Kwb8cP`tI|EiTjMDgCd$UrjINHBZxV}(&Yp>Z5wtX!^+%9(E9wuR
zw0?)dREIjG8#~$9h;5|4*{p@NK&C_N_S;r@JMuLaKipoqIyZ{{`KL^!STPwlwq&Z5
zYyeVMD4OH~P!YrOI_pNw$YkuPz&mn+gEhS$1yMYT<r$Wo9~jzu`Lcm@*)xtGc9M3K
z^`gC$j&w1se5G?1Raajb$Dj7w#X<CH>u6WvI@q7f5ZSSf`C?pa)!S|KU?VcB!S2@z
z+JB{Q#YMrKD~1a{ufnpQ4(cc@j}=O+5PlkEtn&Yhqxn2^9uKl{WS4(C9^o4I2%QLh
zJ}xNQ-i`yokzSbKqNYgUwwa2;h5k6=eO3?y)|&=;T;{{Jl9>Pf{0!_}HA9)QxLByv
zdRt<42yGzXN<0Ok2fWdMe3APvFqLfX{&2OW|Aa1Pj)+iIya9Hv^>~sIa#_tL0{yZx
zUki8M;qt>t^0nyxjCYHg{!+qrDthld>6++<1{e)Md^NgD)tr8#JPZ3%r*=d~iNngo
zLRwTc%(v-SuUcY0lX#neh-tL7ozlO7iASDHqZ~(iRZ1h$iNH~kSeEt?sj`WQ`@QE?
zvr`o(5HC(qT(S%y7udMZ)Y$&`3--7#SD~Kj`jx5ue7}d9TKeYkz?55;6O;9h{#=m$
z?XR8`GANNdayrYJTo!@l(F4A2_kxhQhfx8ppo8#T5Y@@m2HX4B7+vJKUICkb9XY;w
z6EN_Waj)0aZJuCLdF?{mRWwHqj`aGNf~@&7BiTEY4FyIr+UXFW2O^LPnQX^|fClCr
zKVu7zhclx0N5Nz=jE;X%G{u?;F8C^#dbJME9KS6zGMGBZLpk^&A$H@E(hP2RDE5^I
z!ot}V<|#>dqN7_E)f4!~l&)xcK;)sfj-nW-`wsZOKfo9yW`QlnO|~1w%k!as$zF6g
z*k2M?9+tl>qx`#!Y`!`k3;`<?2AxKQiY0MN*Sa9-R&g#iL`a{h2(-{z;v+R`CLDQ;
z>D3b4AGDb&*@xvU44s#p<`6TMzRk@ve-gytTX2PyZ13aash6r$9^1MZsAHPbx?WOf
zx!NQi(Q4w9%@w%04+&r;RJsz@t&<AOzBh=bss^y<mw?mOAWz0f+(>+bIdVuM_V*jp
zFQTUiz>_Tj7yh3;Sjm^(w&PKzC+BL;t4Fgubo38>P9tTBfq>Vhy85&sN(U;|z}-W?
zvIpxAgp)gJi9V1x#8S-8Io20DkJkNhR}ruHRgm-{+xH>>H&HV4xSC1ktbJIG_~)08
zV#&!05VjA;SnH5O3*KDj@;Yv2Iyw{!N3b!{Jv&J0BVWq+O++G$I7qi!bhf=6ijEjD
zpQuy+XLWebPUI<P?pFy^S1kT(Tt3J*6j<KISmiYTIJCRmMqts``<v@Vbv^yB6$2hg
z;)>0yT?k?dn7`GvsKyIji6?ek6jo6jUa8WA(kmhB`Jxmu3RezID139&uFS%sr@Rig
z+CBh>+6QCy%Bq@AHq6NIFhqVu@TKEHuEw16SHzurKQRVqU`;tWy*&WnG1Q?xi$!lz
zV9#Gv<V!v{!%1y{R!ciYgGjuv)!_$~z`irGWjOIp;PoaI9r~@KEUGozu;jDwfCZI=
z&pD^|F~;4R_5E-zh-fkU271J)`EhV~eHp^qLnL|iU2csv=WE!H+(-9E2ZP~kYUOv0
zaFHh(WZL2S7L~95{LB?bQw{R;ZK(gx7xS-z{r15iqGIxaMK0DEv}Hb{M>*6?#&_@4
z=yBiCw{qnL!?fWJsDpoWhCGfH8$5OM`(3Z<j9KJztSGvD!sse(xIYiIjpLCeT1)^%
zW(B<SIu{XP^!Awr15_*SD6^F39c(P_9eNG*u1KTP>s6k(=o%TkED?6^Vj{GEjp=nt
z)OEM}O49PRsA8f6bBb84SCR-bSFaCxd_BXkk@8Xr#MIkMa$#)gLHXjAP)-}SJINus
zfv{KBqkPKJDS#bG8{xzp<=XXrdvq(-o6)<SGZWo@1Ty;UG_xr7EH`7sJK}<nFrtO2
z^{8K9e&UwzB*j<ScR&AuzBv99Qvf``{|H3g){l71Z42Fo<<em8#X&&9!G_`<$sfZy
z6iGcj*^UT@Ux{`sm$Pwa@4VKJt~OSu=2-9_MCHKtX{hiIL=;hP;PdyD>@*+UMqP`L
zMWn0v`JQ;ek{_UczhIhdz>QrUZCZe|WAqg=iTZYEw6BaT-kQW;{UCd>w7tGQPVGc|
z#1Xpx_{8xY*Ge^Jd>`dZv(UkEs7Yo=<Slo7X;)Jov;CtXhD-}ekcH2-$ZDq0*T3kh
zI@kRVq@sBDUg#{m3E}e&ihx9Dx0&~&mS3lrZzBug^NrP`a8|x?!jD(A*?r>h>sQa!
zpkZp3|I+mr6!qtyI<n%Tu;-VfAoC4bHlLg7DzSOB+|9A$vVVV{@$yPJuu0-05Z`{k
zfqm1z&!)Rl7ug{vReB#~5tyKvc)9S_2cvR63jU&2mnJld3n(7<Efj_d6GHpdduLO1
zCJTk`h^acth&=TfJy~DhHg+ex@7FDqT&g<RoLtCc`rAAh-)9d>?_~j3Z7vj~>#NU_
z0@<f5Am49rSp1z7erk$yuild~<^Y4<Ur*cBM}{@p`>y^2<#0ifal3w8DGmKgaIl=z
zajA*!Je#HFw~}@TfBcev$?8uu^Fjaa+>~CF&N$7@54oLt8455cG_?C2yA+`iB=$$r
zq2+K+1VY*L&RrZ8Y@D59?+Bvyrja@YCOW<)|02E@SnkM4;`ro((WF`@D`@{j)=1ld
zR7oCoVAro%fT&G`l~l+0G$Y<YimNURy)DeoH()CrJ6(7nHI`GeSZ;!FU=<Gxm0}~T
z{{vk+Q}BmQYa%)+0m<cyiyOo93exzMl!94m6FCqx_;sr3y&p;s^ogfBS;@huTz`(^
z<kY!EtDif5bQe^PZRYi)1rAD|GE`w1RN4yS3CRx&5`&lXENP#L-xm>)Iej84UR#y3
zc__9cCIAM(IdYsiYrYD7&q*+3kCwF$rW&&|OrrOxhgG>cM1Hl11eCpLd{pXs0D#y#
z<RSqjkWzf$NckB7-^3ma3p~h@!nwSigWNNG${yBa$V{grxA~H95G452JJ=Ia_>}9x
z+}FHA;moaJjUFFN=)Rt4I^|&Id8Au$G}8adxw%Kc=%1nrT(A^7H1($wcA3F8);lsZ
z2A<1$af|y(`wNqP+3<F2%lVa{lk&6Bo8p}>7o2ONI&Xx{g>(889)bPCv;{xkFN9*&
znu2uOGkBsqIB&jPlZx<ZkUOS6C(7|GjP=?ze%JeXm00opO_e8^<obqlWOA>6%y~7U
zrDk_=q15Wds7QTWC?aR!%2D#dupBg={_s)Z^@6cnqn|s)j@+iS86ha4v(3p;hzN-(
z&MW))w2yQ5i|xnf?4lQx!)ES|=~=|>_Uy%t!=zH~Wb?K9*Qrm}y2EY4Lb46%n=?hs
zIkc5vJ{VV{AqAb*2FRdQZs;5V(uh0HI{$o<bX}+5&^CR4ECNfzyq@KNvzcA<$8KkR
z!?KdP=FUsdu=pEUt36(UrO#G<)-nzgbFC<PnJVV7)3tQz?UHbovM;k-+z~-JgnRTJ
z&Gq~0|0p^ScQ)TP42Rg1+SDvjdl!kVYVWORYme57QG1t`My#4mLtA_AQEC&LqA03H
zh*5jb-}iq1Kyu_rjyKP9-`91XuzZzV3BdExikuYnSAEDbhfIj9QNWYBpg&Z)1N^ln
z;XfZB(6qM+p>(0V`8LjYYg7!~O|mJ(NfP8zf4%T9oUOWHrtE^FiX1@B85;WXFt?97
zRPDAzUZwnE*3y}Vx#2_6cWT-Ur+7y>F5remU}wQfDVV;xUm)d64E%cWTTb8gaa;&X
z=dS7$9ccU$UoP8!ur0K~aH#SAVWz>vDs169G~T)_3LX1aa8oa|s62e6qmg&Fpj@>o
zd{$9vT8ag<Y8fhANcHcQfrl5$kX)OOkR?tV35}o+ue}ik9DwYh(5WvqKmT#Xa)az4
zpd^)KIlros`Xs8YnKBl)8j-uAfP+-{-vXTi{{KMKY5xjD6LZOL=x^WO(ccJ6*)~m{
zwDOVNHyMuCxlhcJmDmfPk~-^8TDd2xjZk$@sUhtmkE8;v{iR>}W36)3{)LnEfSZZC
zNf@o>+Eb*`L|yFq1nYumvezf3ueZ&JXX($evcxSnWP9}bJh32VeyQuvJ6ZnQYJPt7
zyOSH<p6N36I7g!2c0W^FaxRdWO&Qk(P7+#VT9V1ty2?uOsgHgE86gzjeEqseABPCI
zbx4(k9?S<&U}df(TzppIfemmC?~m7u8Xa!+U~l;Y4J<$xdjU1bj^jZ!jkU0e@9GIF
zS7lFRTS@tE=2159oNgJZ3NA8aha2Ycb!{c-;?S>7|7o)fE35ATG)(wB+QTE=$XtB8
z6UW51aP*~rK1!>0b1c=}YgKrTa<2GXg_nxJN8+efTBVB>Efzsm=aa~H-KrSTwpMaB
z22V(l?|(jW81uQv6^FioUm4foCl)uxy%bUY+5Ru`NANlBa^}YSxpnU1cTJUXgDi)<
z%Q7Oq)gWtHwKld+X#>^29BUTNI!Q|Ise~!bB=6R3(6{1xa-5LpC61-%i<ssjo;d5&
zCo2|3iaiI#FO6b7Mv}WzqP?Hh8oU639Pj8&_i5-dR#;r;O+9Tjd7IoRU*XB8wO@af
zBUQ9iX^QGx6btOr>#TcBJp!gk8$J*d-yiJL&o~pg3(@$l>tWb-vOgA4Ao0f*$(f&&
z6)8T;etApyN?&MqSiT^l&36H{rj%~=o|H`8u-IQnfyI;fhdwWIiGmO2Fb+=|t6guY
zr{TyH39_7p;O(E3i3?4YCVz<AL5uI0W<9vC;~12qPN_kHcXc{Id{{>FO3+iaZ-crO
zHfEq7bF*3(nk&STt?uoE$GLWQb!BECO<+r6yL-$Ru1>Ww^9fv8KZAXUc3OTju4Dip
z0hH>?KY)ONnYX$|)4GkLaSCq+NknocCq6Nhp6T-*ggO?-N{gbbx1my_Olw?;!EoRX
zzS!z5Io$3oTI7CdeaGYE2aXyynIoI6`Q=a1sDF^R=M2M5y!pE9$0(-Wd~`)=03Ezq
zEm`ayX8u5c%jg0a_{Kfuf+E*%yY6V-f`~ix!%DA~e%tVgK^KV>J;n6I#GD#Z#&8_s
z*Ll&JY+Je#f}o)8({Yu%;8|_%RPp9&@bw%~*=;&cRtw}v<pijaVJeU;qiIm*<={gd
zsdoH+1@B-$v{hMCo}n%r4N~IU6qMZ_Qpyl6@3lR}cwX!(GZ}g4bw=y^JXv<&y_$l&
zAt+WjJodv)Heef-Bm1G75^~eNmf4>iTe=KQ@di%w$ePGLFj-Li!B6J~pzm(mY;@yD
zl5QOD;R(Huj;UIAjR2!9@nr%W&erMy5|IrU+*PJa8_AIJ7Sr)#MVUqLwWU&2;`IQ^
z@_xX_Q^B#1cYWi64l7lvi)sZkL*;SMt=+CX(r?!OhygrvlYW4J*PcJUzAnU_%S{|G
zL}b8>{Uz1tJuuc=%^CK8L`9Y2e;}bf4D%r7<&HA_Pw{j8B@$1Cu&Zg>SiXJ`5ddxS
zz1i;3EdG=!_lZPuVUwSo-m-BpQjBCbNuLj&Ac$q18)T=kKB`+vN%5BA5Mww0Ro#eN
zGvPNkibjJSgM8KLNPuERIQ<BVbHyvLQUA%eG!h}&dmV9AV#iEq6yTvGDT5#H#I6<A
zMrB}gWg5K-6XW8HT|V#1Bkwl%n=`^kYh2`3s2$fiDRUHQ7vbn#{`?Am@dF6Ibbk_T
z1%2b>ScP!_=UY$qr-;xYA349$s3DrqL_yG!xStQOeC#n3hW}#898f2_z#=@4<n8sR
z*UJuh+zrgUlwIl8$@vpMF}P?;N=n~-B-L?&BZTx>HC?JfH5~{!Q4V2mt=4ftm?X3o
zZpLseJ0i(lX0ls8<5OiS+=hi+`4wt$Li(lSI7^u2L(s1HYTd<2Ma+=1(_%*=Ucw;Z
ze!7!>EhT;apO^4rOO>u}1m#`x)%5m<$Jn#=09It+mNIpJ3!+7V1RT>@5b(a*bP)zL
zGtto*=G5vA#H@R~?Mkw7ghx|vh=PH^MLnK<SOVVKI!ioTgznT@f)gv%C+JSh6+Fsl
zXvF57ZQ#JTF?<3~(|Le6!@dn+3sxq%CNg>tRs5`ZQnc@nW5Ric9A8a+YfOEr+H{d{
zy!}d?)q7;*x9{=2TW<xtyL!;dI)<4AdA2qGma}ou1?4G^aHv%3&+2?PFAD}JqBFn=
za{9ylV;P-jF&6M-B)wB&yt}6j77NF;00+Mhx=&=3Wo*5P+$x73Et7EinJqg`{aG`Y
z_Znd8?1TV^OAthQvnILxT3>~Ym<`tV1e9{_F%IkGJvhr7Iaa^_5ads9ZvvnJRFmh(
zK44~*lB_^%kMPt%n?!+k{<fEbM0n)QE(!*x#or{<=~3$mYf<TI(UNAgqsjN>P#`&E
zhZU%UVg=r|;vKZ7JpK}s<7V&6>hz?h-x`3vFPc)98};5t(Q`&pEuD-7Db~w9cHm?O
z;^q?sM~<3Hc3VRT_AKn-WHvd9`Jhx~nRZNkU-!GyQl@Bfo3w(yY_M^8P4nVrehH8+
zQBYU>+%cxilk6@u+3J6JIFY2CSQvFqIMB(&w7a$REmbfUZx-aZ?9cJym6JWu`JIqs
zlF_9h*kiy?G?mgDk9m3W+s*YSUM6`T(s3!tBv~#xDrJkQMO1h?9VLtS7bQOVn5h75
zkk;2Ahy>w!Fyd57;_KzBG*-Ur(SD_?Tem~LCnWc_E)(J`f1?<c_}o3fh_fq{1E7w4
z*g(?p-QIWc<ZQLvE3mP0ZII>t&dHUT38~jdX>XFjQxMz)RF?SLSw5IjX}kawZWPgF
zb;lght$OfI?V_&e>5<Kai}4Z8p9z0*AG~3g3Q9L=3O@Qfhr?8?juTif?C}^`z#+64
zChWP=+Sbd84kkr5%Nwf;qgASR58}oJEhj65exV#8h?aQF_hw_o^qcK)Ogonsap2eM
zE~~;Fw~9UXKdWz)cBluOIMEpHnda9bR`KVsQb9dM+&<&G204;sYZ9L9YP{dwQHY}u
zs#m)n>n$V?pk@k;-0=N5ltuD|xsJ)J3h#q~v5xJgXj1GEVX&WEh5dY;XjZuI)GO@O
zX+_FJcI$@CAATB9SSJA@<)kFtgKIuj(gjtFu?c{dUmzwqO|t_udwhMujRpZ1LChdU
zxMql-y}>@!%LvSs*`mX8jaEL(BcRbR)){bCwohkx?^8e~ha^P`vKdEDH}NcAjyna6
zvaNG~twkz+9MK{$DjU#A1~GMlkN5RJUK&Ac?PfOMCf4H#_|Cqu&>1!(>%QjlIRw}A
zA~*eMS0<TdF_f%j8GFiMm7|jwkBw97mudBv4?Y7+S>tJprs{kiiZvrT*qtS2>MSNx
zSaGJIXJh2$MdFf%8Ysw>uG$)*&JGJztO4g+hL2wud(1~-|FJ~D*hm%HqrX(R6F32h
z@t0XC(K;d5_9a@-%<}{-7&mlayy->y!}`{bGTAXGFYhop{1CJEUlADWeyVd)OwxD7
z&n04f1s{pIw$)+WfDZRY&Lk22i752v5%@;=C~z<MSe-(b0M)1hW%(XFomY>f{L=%t
z{<0`sU>m7m4&(Mlq`We6TPcn;T9auTFp@q<g_RpG>Uu~YiQ@{1i^wEVhfx+hdT;;v
zWWk&hRR&nm5-Otx!hd>G-k1M8M>rLLsF5hXJTiEFljjIKM2%UFn}p6K3gM4wDV?;m
zf@J%!ygH%`IfvaS^;hZLmL6RCNa&!Ph*WO$)fKiVjJfK!?tRBDw+yE$a|FQFrU56g
zCYh)UMN0R|905y~CwX(!PYpXXcE&GdanVaHdyPDKbebdUF4RG)4qIOvR=Bc8fa8!U
zx>kraP8}^s#6pjzl0JGbwNdRTGt2p1S`%q)a7VTLQV+y^;mt|dhOVgGUl;=s9G`Gh
zJm-Q!oMNdp38FOtKA?ii4L@%~6z|h}O!kUC5|~2YrASE?Do-xW-}yN74`k4$Lag(P
z`P!Sx)&xXK*TP=#9sQ)cFlWMC%}Y;E=LtCNwAk}Y2DH;WUj5HM1EHYh2rEK|O!Ukn
zmLa6#b_+o&aZ%BZ<+<$h-T`AqXlNbKbo&`0a{8+v(tBj9<8#jjY^_jXM{#fL`SPDj
z*YfOz7!<1ma?$YKqo6<g?-qN<nwjK@U@(V4;Dy(vI7sVXsSQx{(hLnxpD9R=hS0qs
zp=+Z?VbSG5=Yz}kC5un@Y;0*vqdR?5#glNO23!w2FJD_9G*pa^|NiT}CdX-vL1wc>
z;ts1G&D_x}$Qv)#yORzlLj_v37K0Bl+SlPBc+Mph0-x3wnX}eFS4|yK@nQKr5PO=E
zhw%Dj3Fy^XvERtNlA!!cK)m;BcjVkaCWDDX075<;gGdJEN)|mzv;b_Tg4ih4&Ar_I
z-Z9CaF42LVPKU)KgX5~diLZNnH2dj|OTT%6_t{}U^5IDD^-5IAF@0Vpc}qbS-wPu6
zAcubXs4Qu=cB;!!$6?5s@YL5>ERyl_7|{S@av*Q<=^&tm+2I(YVh<m<YRnY;<LV|m
zAVKc{s{Ib1W~U4R(im=v{1*zKM9)V+W%Otug<_W(*oA;&78Fm9-X%sjeHJuTZ$T~!
zm5<hK%)_=vi1pzKt7S2;qIdrypdBEk<*zRfjK=2zOjQo{`(=OZW#1>e<2Ym)EZIUN
zh=HQtJd&r3leT$NwRwEz4A@}ulwAG;v0#b<P0k7r!V8vnjWskyPj`9x&Qe+NzMGIP
z_%b;U3V?SxdS4$etd9S4m!dfuWff&NFylPL07v4&4vF?h;TW<}$vMk^PP~tJprD9`
z$*=UUCVwhWtQqG^yIe_zKDzy)NE#aP({84n;G(JLj<+fGp`xEovnR6yFF~7jzh-}+
z+(+M&D!t~$?+H&L36)jv^+?^B-7!zzDc%j=NxfT@>3Z&Ed9c^yx=?X??@>TgHXP0T
zF>)JzZh1c>;WpwnJ7O6dvEaMB^zHT6@X0p}9QW&?`Q-kO4=Unn>NwX$?D1u6WrI>s
z=Td(R9s@9vk?o=^jomViCHd+X!#-u=_FO!FUArU0f)i?Zb2w>6RKGxvFy@#_@!5uO
zt?=R81MBe%Ufiz1nF3``pG(&g*N?>KCk9NhbwDMQ!0nAML1Mo;E2{(IK*>s2B>Xr2
zi{CngzuIcbt99Im4r-};h;7Oo*OFgP6hX%=>%P+(TYTVl`{rYFuOg)$4^s%;c>CP}
z8k^9#p9x-P4M9B!(PCbBpiv)%vGIc`jo{{McOSa$A?oOob6eL_;i-WHYfYC@7JSXE
zs~<4}+zvQ_w&N}=NAb?zgrDLILKTuk?lhfI$ssPsg*G1qgUFwMaSSU+k6Xcvj>(=C
zhtGI^74&#e>O#CeA5o~3POi*PGP9fWWM~`gkoeZ63bs2X#l-LRFhv>c1_DQo0m^&y
z^yO+(VDcFKljLIYBgBE?3&jSrT?RMA<jp|o9D<cnmg0KZFQ4EZ<b8!?vn}SL6^>S-
zH6(9^rP$frbnuZPsfwAl4IUL)`ymY^-du}yl8qh{f+ze22X;;K6IkRBPZ!?i^V?JY
zWA}~e+|%O}dEN&97{r<K4NR8U-NMUyuK43suh=?a?<k+pLPxNo4bnUB4c5Q#=4j*z
zXp7mIazs7wpKOTlv)SO3j}g6H(W0so_~M<+cYb)RQ4BBB<Ca>zL2Ea!P~9vpZflN^
z6^+AtEn6`O&Bl|~s*gPxqzs9{D0cBh6!x_AP|eBbtCTK$(I471u82Ot<0%-iS6ZrM
zBjqeDkw5aLgrAl+?tX}REZjnRdB1A(;tdlPCsiOTRei0{roH4~S1pTA86hx+7N>KK
ze~7SqZwu@927zaD2%bmZ`M<NBYmuX-oN6tUrR@uMi|BGta%~1`W?mP(RY?B}9_rWa
zLQU*=6Hev}5{s|J2QrN{>amZ_wdCU1m_&VFek1CdX8!%OubEKd%@rkl&f*XtmJ##c
zP2OAkJ5SuhQM(_vCvLaQ#`!9^m&E&>^~_HmvQ9^5a-Mf=UD<uU4gyCe?igA{OG#YP
z1t%{?XPh*A;*R@*IppDUrT%$?`SM?LvClO$Et2V9e9CVMQuodM=-(G%^L6gK)F+Y2
zN&0)tg93T1XFIu8cR-QHKGDkx01dVFM9|hBJkX<h);JAOMQJe{q*f9^U9+RAPIL~M
zdVb66tdtqh2Kt!h^lx+v&Q<mZ^gc`v$T+4XTIBeVYlR*D^ig;Y+b!3R`PA>R=VJLZ
zOVcdJ+*6wdo`SJ)L7i<`N^Ht7jQM*^YLKMZ3k}BEYl4~P@dp0`L90Fi!G_!mevW@S
z*YsT?>8qc^4HyIC;R1oLyFRc@VSYS)@971x^SW=_iIA)&et0iJiK9XEhE?itAK)Uz
z?1hqED+KatTm;b_QQx*TNxb^r8A+QYyslZX;-h%{UI%=xeOghv%HI=EQof@uS9gUx
zjEKJ>J+SDhy%=A;`|&l<Mg9G-(062O5L=!%@t?#3f03mDrqn<jeg~71tJj4n=AY3)
ziKxdN`Ic2tZ-s}Bio2m!fono1)sp-aZ?3=|8w1ZG@x6pQRYl0fC%||*PS^1vTyQ66
z{JoUcdyDp8d+V)Pe4BVFNV+#*knu&xitzewcOPL}T^&A@X$K<@Tzpp1b`i0xCVhi9
z0+`K+T@?UM(E|V;BJZXc&J`a_O3mGI1o{LfHczyXBo=KvdR|_;wD-CNOtD8~Sfu1f
zDR@*n+jR#yRNGlvYHN~Q)N0o%@P!~p2c3m8cooK8@BPKQ8<yQG;vyAVe`3j&&yn>8
zdeT)j!SOb?=5K1v((}2(K5o}^?REoJyoDX4+ze%fR$Xp}arkk|r4)dYi0Pfj)-Zo@
zRJS|7_=7&Zayoc@MiZ;cDAQug%=}gG{0f1GKnkA9basG374nr+7p+#-jCwyDF|dUj
zjYH0)PMu>8_Wi$F<v$r9TC(YvY$7i6(Wo9^Zzzx#^(~|m3QauNIfEa}#*w_NdGd)~
z%Z<(v5$m+50o@}Ed-)~M$Kwg~pPz^HFKG}-qQpy2St1b7n=M;x<2|_h8}Pd*n!mdv
zn^qI#^@%toX?$nvMMZv~&-~0OG=Y&SPW&l+{9zDmd?jHoR?yx5N%r~!gC4;&NQB!^
zGnsU;A@e(>o@6n7_>1$RKyy+~<h;ZvR%W1$`ltkp>tG|+Kkdj1^oE7}j;7w=OA<Y%
z9(1Rwg3OvQq*1P{KlwDgp$>cAQz#}!6LRPOJu%VL-FK#)ron}gZ{UfT)6nwGkA&kf
z_-W<Wr9K_aIKwCE_k}{m*C+rND-a`7(w<`oCM;+7xOzN>ZC1xhQaFIQ*EtOO>;F~M
zuaV7L&3*8Piqw2rdV{^`Md9niZWLZ6@K^kpdOtHmXuBw=y$w6XM)gO4&4pJwGL}_B
z?hBR0%SV!Qfx+^W#PX&xK94h>2>K<x0w3v;M@8bX#RWmf+4E+~8FNNz+cy$b@EF~2
zsVZ{SL@>5uW!Go<M~nLmDXR1>_6dyZ6yoS$+L%FLDmwYXdTIP&4qr?^o&4*_QtY{c
zH{M32dX(5?oi<NsQC2U4!dr4y0gjHV8c;hC^?Ee+E$AtUcm^Ku6_1)_bUIr<wGu8L
zL}7)3z=sOgQN}7R@K;N(AM3Sl$Z0t<uSNaM?at+zFT2e~GVysNCyvH?t?w8QEwRV_
z%1?dvp%`q(Vwx-=A)DKoK!Xo+rVT1_|97MbT4+!vN5_7OLQQIX<NlIs=;+&ojjE|b
z&tbeHtQ=mM6SlRwb{VQ-v1j9)Av5kx(slIWc1U%g7I+mqrg4dTynw%Zy5+`Bl1?Tn
z_synK5(!oC-8Emj;`<V${+TXKjG8kO7zMyO*U+*LkO~qfyDdV8Y7?AkEEe2AF9nK=
znlD6#kgU7YNIL~&+H09Xe8+<JuMYKWNGfe-yqw&G*5Y_xNZem*(mlJH@qM<aUh{>I
zDRe|@Tv<KDp+e=cMSzJ^S2JwTG%1-FLdlfUImRCyLilz;H<L#4DV}SS2LUocU#WF7
zLN?P@L^1dA*n?-r&;$MBhwE?@K^I7Te`hD5fZ`~A249uPh{-jLM11yUP0I70V)yIV
zG>7umkEKHr_t`-<CwG3QKPJ~w%7=%z6W^pN8m_lHG}N`St~C{D3q`7Bko)*l{tFaN
zB?`eYF>z?ywLM7hO&u08S|~Ivx4qv3PW_w3f#&}Z_L^m2hvPE~+p;2jkdp$ajck|t
zzVh&O=Bh<hi`KoO;N&gzfiJq`fEplY_w_w9czjYknXxy&=Oaw^#Gl=F{hs)zcRqcA
zn#lpXK14eXL9w@^-*Kp8M5?QWTl5m<LgKkQ$4J41@AQN5jPr8}ZvUngeHi{o0EX03
z5MqRUk+NrO{I10RO`RzbZ5~_obAOMId;VNUd{ca!0CjEAY-QQ|a&+^C4TFAH0-np+
zC_nl2!7Br_R(z`1kyWKJ^?0M@3H^ZoI+BPv&Y)5;s|ug*h(>nzvHXmk4~x&r0PN<L
z%Ie?aGNvvwvStuJbH8L1QelTtuO^6DSHFc=N#bU1Q$3h$Z?(}@=Fw_Rs?QH{s*&TZ
z`6d}za#x{q&^{vB`y0v^aVuETgj~|qAgg3#t3xYk_e|yMq&i&3Y5}K9S>L3W)3a^`
z&t$o?hQ*BaR}GlQwezd;XgkYT?e(RPn?O`M&-HVXyUBZdYsMtIl%jSl8EW+CRyD}$
zeN=sjCn8SEitpRhLdsL_Yi=k~DqvpyqNkZx6B=p3dlK1u3PI0pS(kQplRMG`asuU9
zsrLohjBs9sX-9k|N~H(Wjj9`<A?QjxXED>A-)MH8UE;JisXPGxIN32s_(Qw#4(>cK
z3`ZSr-E8w5bKNdN1p;}aQiD#*I_Zq69UV4^IdDG+9$A{g-KTViBxGIkFkUZ*zC>?x
zw!;UK(Bio`(|IbG*?H74Xn3K>YpmYRIm3jyQ{9+!IoAkN#pWvLL4N=7f1slgAl75R
zJIfv&OXDeN!$;N@9qyjC$&U-Gx7X3a19_7CA#NEDo@)HwfPQ53&Q{T083S(QV@|xy
z+gPJb`k0hX#gQ94kwKopBRrllx30VwGBrOV`0m*Aei{Et7g#}j=Vohcm;l?a1Cm5*
zDPrizjYrIf9|#P9H9Mq<<=3j@9TZ@t50Wwkm>=2Lvf<`Jg3V4-nW(a`g4B_+DF0ED
z?~;UzJ>o5$i%`tU_)(sNU!tK65y{0JCle6mb;<ep*^Fh_UbV?M<S1m8$M4AUj|Okn
zvZSCm7{tGPpiovUqs7JjQKZ!;Z%ycjPZ%FQLLy(+S)D~=fY?6RzlhmfOLa)46AO+G
z0aW3hEA@6q+=9|{d^>0bC`T;RiRpdHo7nkXPEIP51W+O%P7152X2;{i*W5QL%RrPO
zSgD&LJCb~JhJ$d&G3o(%O8%6~&1*lbnw(u|wZG(6(zkE&CY1o1?mq63-TQ=@(ZAOM
zirIe&$w=J%98hJjSHTz(Gu_IXz6Y+${-(AvR7?Ep<7^%MWdkEA_!yt#WJZ|q0xvMK
z?u9QtrYQYkDJi2YIVRw`N4u`vCXiTE7BGnQek~%HX{z>g@j5^YExi^ADodzwRQIk_
zC&8iK0FdD3CK~-dGwITsZvjQC5jN98hff!s>SE`MV*0&_p~WKp4DZX;#FIW!4`NJG
zPK#5O={*-xmENNBbB}>24caNi%Iq@9x3deQ48^anq<_lpX7nQohK-u447oOibBziH
zed?hh8D!Jg6i}0|leNo4oQ^3dY~nwY@lYq^fHND45ebM*%=f=(g3c2u9zqAf)f`rz
zLt6uXvH8GLwFZTPU8<P|VTB*wex{`1`XS?oJK0sfS4WCZMBY{dDaAUTEe37%38jqt
zSOs_#*9Ie~bX}zA#7jPYE4Kyeqsz)1Q9DKwWxVN}VPD>jkT7#2egD6VvWnjDdlO`k
zUB9e!9=J>u9Cx(knLcs<U%o&jl;8x{a#mm+rRZ_?R@o91Q+t&h1~<!(GfOUiwZL-0
zxX<Aeb~ORMDPg1;Quc_6iUyK$TNdsGQ9g^TX|cL%U<i$G)MQ=7nn1ayqS-iqv?U6D
zQ#w`F`#^cPzM7<H0Vv~jUF#^4Q2Y%HPSTAy-Tu*mVpp3d1KJ&r7E>jH9dZwf=QZ3U
z=sfN5aNxg8<NCh}Ao28tbI><qtAVgxJv_ZXBk#u8K$oWY5)lt-9UB^7!ag!UN}HI^
zw<e3ZdRXNkAF~w?pyRwPXRCRPMCJlr&y!<?W5y@o7r;T5wwlq&G4<&ipJsw|&@SxM
zGtWc>a(qy<PTuJqa=Lb0#LWIXV8lr0Aa5<nr2kbpp9s%Ou}HjYtmE}0e*eX^9c2KG
zk=X%^{qtReri6w+t0YW#u=_wFEaE})+1I6)4UDQAKCK#de<A*bm(eC2U%b*I+Cs=c
zwRd)r1D&a(_59<|9bFBLtg>$m90BrF+VaDuY69e%MTGh!yb8z0ms;|l=I9lOB<S!^
zXZyGO)xvyP+72r3Be_L_wx-xW=6WUY-)qxae{0y<wVbxUcq?n-kYdJMKpwkE${HEg
z8ZzTIG1R(0K_r~~S?ou(9BwI6B>yL-InT+NGhRXYuEC0~wZ#sW{Qf+dXbQ;7DWax4
zDk`7R<3c@qYDIM^d!!1PJ%wjDmiQ@12o4zK@q@t^hq`13R+`&8V9_Coecq;vsqs&c
zZXP#r#4*rPzM2?1J9`JaeE-n*=s;@_=#*w0J|7vb2WdghA(W^?VCzy;O)~tLhU9nV
z>w`&tTyAg)8>(&yA0@IJnbJ=z<<)=3dGNBQieh+;Dn587`|H+BP4=Fblup*J@He%7
z9j%9E;3DR#-k0-AcjSWy;LcgvK&7*1KRxewcb>VX-agF<2h1Lk<}2UaJe482i~V%S
zRC9k9rcmAZX+-#=@J*4-*PJwqp(#&W^HXMBJAqy-)Bc>rhSx4I+a-K`i%@dv|9-Gr
zSRWd+8t5R%@lO7}g|X8|Kji8zX+u-jb?1Q18`YPw?UK_G%LNe!hFVKX2(&=k!G7%C
z9qw(LL`9LCot)5DTAU4K#CluRRHWd)j^8_Xq#g$gD_H5PxG%QnGDdGd4nrvthGV+@
zn3cv_UOY0sV-0u5ogHPQybL;KM0R-XUkJGD)|4s69L!P0zMyW2;J2T+^UxXey4)##
z{Hm*FcF2@_dba3pEcZaCg6rP%8<#`=%G1$TTW`;EGRh=v4B(>1<ANCh?&px4+nfWJ
z&IlscWDPooV)<%%2bD;%5Rm51i(A0QtYdA4gffFV=YgQB{>fTgdtHDXtHNno%W?!&
zI4JOC_k++k3<q5`#6zV~Pwt){zkIrR$Jkgc@H088F0zdxYU`vjPT`@4gL#wSEU)*t
zE^7IF%cK%DrC%n#s4^C&5bIaqK|S#`W5A;^>2Y<w9v7#427Ax!)pVn@c$ZQ}1v6f|
z{jEj`E5~G$Ucrxg!N-%O_d4K_#Jo|69LtKQKBTKD>fy(>(pub+pc~-uQrh=+CUejH
zHD2syz~RwZ=k2Ri>-XFvl_USu?^9)WuqG3SpS;@*F!5js>ett%Z~%g$<_v<F&X!3~
z-jV?}S=61Gj$UMyq>aY=^I8-UWSRP;PgXKO+-oT{FLu3JQ$cb}NjuIo;Tdrb^TM}}
z_6lQaFQiR|O6?2_;yIJPi%&t&T6EUcR6$%(Rxc`A1!TM_Wy9(9rL{ht^NY~gCI|WG
z2Mvsoo)>D6k><#isM7aKPB<VEYR`>?E{r#o+JLp5<KcyUNtED+IR`2xo0y}1_%yn(
zjv_eiPiz)~cEBWR_TW)PeHq20K-0r>3smebCVbKCy{HQDnBg^%w>qVP`yF=<gix+X
zIuoYMgb2I)Fq?)x`MS4~loc(H53h$u!=&Vs71l1hNZ8&(__oF`Oht=&O)s@AoBrI3
z15aH>T$L)Try7Ui9zFV<`jZc`>?jI78#QySyf}tvU}=n=ps4mKP-#|h(QI;}9*9jW
z+q1gy6}|hv2MV%EHA%rcr>yqK7oA2K%11#GL9fI>YE0e8-6WHXU&T=-@88saNG4fB
zcpE^AXDsb6ttHOL0d<8y#F9;oKIgzNA$O$0JG&>!YQFTFhGkfHhs<0~+N8ZI*w#{d
zXg%TT(ukOJ@!;BQgAF-Y?YhZ_Sfxoo;rQa0f6Oof!V_ih+iaUE3rByvRDR#_+up^`
zc2Yz|Ardfx5ujaIQXIhwpyh}(bFXYiC-Zxlp#XmZ|Bck8kRTT4T^yi?5lHH3S~HxZ
zA{Dw$pl9np9vm;yCYbfk<?F8)fVjxj+{7xn3hh1o52QyH#AA~&zAOvE+erxj<l#V}
zht(b^s2Lnn!2kduHO>cP8!G<%)aZf4NcdvZ>1tUY-8m&ifr>LLK0NC0qsq||Z6?+A
z{zKw^I$)cm*znpfleEEpzEpDvMHQY~K_;^err~?`lbI>jwlBR27>UnX)jj7V;BzwU
z;B)j03+kfJzBgSWbH&G_-1Vkk0a%ywi;C<y;&Tf=tw_#;r|eAqcz*I7e-D=}AuWQ}
zxqKA%+K5a&PoiIZ5X1JJGQ6;5hi{d1T@pXfivY-B5%W&`+A63OOYP<=LluutF`u3?
z7Zo$ObbOQ<Sh9W5iJ~~3ExNopd-%(d;VuYFaAbKE94-aSyWCXZS-afSs3;7$$S%ps
z*ZQyg2f6|)35k)niKTME#v9<u7)xZRAa~w4FLz<stBZ^!qb#htdkW$h_)Jng^L=c+
z?WQc<K9s%y#UR+0EF)++j#Ky#{;rZZ!Ext~nYY|bf<hj!#c@Huqi0P~?|eiB!RD;|
zYarip{No}?)8<3Y%kk2yz)xwukO?#Y9AXa>$hS3ae&G9CDBF~YEvU4^!3+;Vm>%)=
zWDK@tL2Fdo(nZk!Lq^8;?__ydJRDnF?GP0+lf}A)XIZ^9PCWDFKE1Oy)d;+ED`)Fo
z=9s#ir_##4ZtCpl3yC(5wE~c>W+ipzH(JCAc=oVRJvIL+>nWBtXF>XvBa7zNR+rR+
z1=-R<ysj}<WrxQu1d;G5=#KsoT3HObmDcwv%aJo)90QZL&&%P}2l4o#C<FUIMr87h
z6vUOUKy;OdbL?tvBdG(OwJ7R=Gj?=3i?tn@rpiMfQ<tJ;KK#rKQ^qcbsHiFM*3QM0
zL};FO3+q}H&Vm6tq76}CqD?{iF5KjlJ%-o4@8X4bEzCK{19Z8sod)tNAD01M;YpDe
zSCG9lcdG9NGUg!PvU|ZJ0K`rEfU-z_Be`(enCKtsno@3pV7Zi*-&_G-^kCXYeS5@_
z^`I}rIo~=PX6UWbbwjM8XZ~iG(wbR#92g>lkX+1f_wZO#&^}66C)n)a8u#Qta-cN5
zQ^f6MhzOL&o<BaQx!nNW{|zu@lZG2Wz_nQHlK5}lI1Cf|i|OA@Es^iv^_%bJF)9Kb
z!g0J+#!6(G%T7Me`&D-SCf)r2DLXDaBq1GKzKV#|<ANA@-5WO;E3?s}Z&vTobo2y4
z*?;jjB!8i48VTxT0&!@AB0-Ud%@JaXA2%*P_C1^<7P78lpT6)xm>!7*@m}JoB+zpF
z>Eaa%d#9pI9nZq<ItXId+{(!yeZD3k8~QDhrRC}>obGKb{$srNU4lqrpzdnxA{VeM
z5Zz^sngCmEJW~~ef+1^Bs(LKpCs<VM0xH}k$ILw7D8-OSzi53k1Rco!d6W8GVp}!k
zQb6$8Y9xaUq$3Mzmw{<egQUd%VP?Yd!n%}JjFLn9;+qEt$<r`LUn-`n_G=}_#BW{k
zl~EvI4xO}qvsF6?uP?1Jq~b+};q4m=_d8On7eu;yhn$bSR{J6eqNJlui$ScN_JP#g
zE!%zI2$VOhjK%7)c(e@P06qJ2s?W2asM9MGhi6*H&IGuo(3Bid-Sy!Ep_Z{p4C_I}
zxOS{6ZHp#BRLlZz_31`oXnA6D#?Uf97GXqtsa>E<A$d%hhdcqC4Zd`5X+qH75Pl^h
zisP+=I3{A=$_SOKU(Q3iG*4i-nN*GU_o`Y8@wS8Zlh&1KDWZm1@sNM6sSJ*1^33lx
zyC8^bq}vh9@fg2``CrHhGsJ(-&9qHZzN6hYIs`mD0iF@BPS!~|+6%|c1)GGn#>ef1
zrWWm=^egF~OgwYy8YEa|*gEY~3PrXXOV9Oy^u_KmfbdrU2g3aUjv%Bm5Vz4aSu-c|
zDb4%bnps9Y2mFgYP2~_#yNu%CazF#Y55xJI5lcB5#Z8XMNTIhvbDTv!co??ZE8{-$
zcouKl&njoTi^oQ#nk-o2+|}`m2%%reOEzkB8FsV0VBVz<pgH&kZ9jfwK{M7LRz$j%
zs&_fISc-y=y5vtnnlsUq)XLa2<c)oWR@>(mvb;CTDBzj=5ieXWUHwuW#EHyDzrJk0
zt(F)03-0jv^x;<akHeJwlfxZv`rCQpmVwMXND7xY06p#awyDWYf`6+teq1#eaUsaj
zeO+O_f{r;1Q8v5Qk14rLxSU%i*BS9}K!!h42H&pP%%ulD_Y<#T!At<Il-Qh#hP`*M
zizOc#2y1a7G8QnGqhW-OLY_}XE-u?QyKp-%QA#!Yi5^lf2^adLx(B&R1=ZD86Ytc*
zk(;#(gX~<*kP~kQ@DZ-#vX4)$EK~0fi^L%FM>PsW;!*M1r8&w_?Y>LAs`yH7QY$j}
zc<P5^*cYzM$RqgeqK_QHWwJi6g|J&d+8P0Z$1HACFt~jcx5S#U7>r~wjZwV{7bP#R
zeOg*100SP{Ltj!?H9<%VC-6g+ePkA!E6wu()yoe|Y*^yFHE_z#O#K`wPn$|gjia|D
zMh$#5r8r?k8jIhk&X&m;vK&w*eV{!s0`!<D98Z;S^!#;+w4u4;#PZ@hXdF0!Rr%{E
z_$iA~$|C=O`kr?%aQFD7){M{`r!6gYdQYAjbp35x;LnI|{yWze&bNlX(|0YWC0wsH
zWoiX#`XzijnYQ+g2{qe)hfCm*BQ@99;(U>Mmd92<b%k`qAzTk3$BRi`-S1jbuOyO7
z5*aU0%V~FeVcXds?A_~KSVOT`oMQfeApMUDk=|&oh+nO!n}xAycHH!os)~0N(=k%r
z(%mp?pp$u5Uq#kdN8TMC`6W0!NMZXT#rR%z2``|kO}q5r@1-~~qY+4-=Z5lDGv5%e
zn?6dpsrJ|yZn4z@=GnI)WD|jZ;;&VRc|m&vFM`&pIJAo!4+gsVSa^d(7^~&|6}E-&
zC<^7&<#NoOfoCdSm%Mpsb;HsY&k_}rnPTKQ?{P)SnV@U;K<(~g5CuFcN!JDFmo<nb
zj&<1MOD(jDv@PfEoPO=Jw{}aBzm5oE+CR>Kf~WFsilu96L#Gx$8fwQhm}G2&z)ChV
zB?(v}faZ0~N|74YymMs?rM_2ND-yo3Hh8W$T~1^weV|H_)F|-;CmgMe@c|qVj!7b0
zXWbC;#aIDJwEo)c)P#iwmOp9mecZ5Pa`?Htt$mI|8#ndS`=a-nqqeqE^+3j{{U(g(
z7Cb5x#H-#uuOI2$lU0~G(rUH4Y~;|_0%UsUqn<i$q{$ir@~M7=@n*^fSS^fILP&_9
zZM&a)F<mih=!nLDAZy_0q0H>%RU{#G`gfj(Ad<^?ATpxU8-DT2_cr%6!-A`D@_j|X
zI12p_<eGLl)B9$ae~_vUvSBu#e+o{S{1$jqAfW@X#iIDeK;y>5n|!n|2eyf{;b`XH
zpCH9Hj%gQWLB@gqf&3wX@=n2Pf5DftCPG&qH%nvfX=pQq@Z^v8zAet^Jb&3aN{Qx7
zK}Ak#=0}a|9x5}<n!|-&gpGKrbUE8a8mvvbAO#7mggXs;Ud0W2EU!)A?Ox1&)v+rc
zCC&|yXNkZ2540(HWdRF$?XNiZEpiBdJ&QVynR6|N(1TJ|PnuL*B5qUD*cYhBefDLP
zwIBA651<iKU$)H610Pgr=ltYuB9}l03&^}^zx!GjDZcVWUwMu#PHX%NluhqZB`<i;
zUyq3E0e@bXx4tGDC9!fa)*@@?1<}+#Pb%!2H>)GUPI>2Ka7@;@Jv){BYhOZ*Ct!V=
zr>ZKE%7lMif(B%(JdD45zjIT{O0j4VBd>8#q}y&nU9VCtj+7x-c9=eeTnEn%p=EE;
zLjFuQ!|$iLHM_n<(hq>!q1+26RWqMewS(^WrqF0dE}pQX?@oud(FFBvHB|D}WZx+G
zI=d9xVkXQb@^e*TCc1Z_HxbvYu9<?579e9APQs~_7Km^M4(*#Gz{JCp?b6HeWeO-i
zh1%Ns5N}WhRc+%eFT7m5na1d=$%<@=^d-^X(CET8jo!cbvAZ8L#iAbu4pG?3F#R(K
zhht`1cw=?DEqyQYF0!w=wy$`mejp_JYMw@VDAe7^+s@{NkNs`Z*uA~J|017*=*Fd@
ztMG}c^t)n?-FqTxJ4v;R#7~KthCH}ys<s?3N_A}ME6Ek#b!qptWI>W+z<UEq?F-&j
zs(&y217~SeU(<TZ)rtcQqz?Cheg!=r9V%#R-`u*N&GXf;*=tUq{4v%+cH>a2v0|{G
z)O~#MWNY;Z6MsS_afI>4)5@75vOIT06&@%EUWr`XyVeUIeObR3d)slX6gaGUXk$%1
z&nB`h=?k(I<7tBEFoTX;G>Tpb-W-Jsg!ePf9P81UdquXU{1R_PdK2sWF3t}84250{
z9;o)-4=h`0EGyfTO)QJA*!SBis7F6iO&*3gStof420weda#;3Bl?B?W1$0l$w!Q>p
z3C5X=*0(U5fqeVJi1>GJGYQyDXe_C+*O-iM<z^2AuLXh6()+jR<-awlqPTFmh2J+i
zKe+^Hhs&cVtCNu|!#@ygyNF|f7KPCW-H6)#8^(Y;(!bXxi}QhRu3voWyxN`T^Wg3m
z7p{L~g2`y=k=`A+J37z^7yMa(C{k>6@sPLSDfl-&>)`)DPO5#&^xn^8JS+w6U5IJl
zYO;`>b@<N?0aM>mEegqP^TStY=8UoJAu}2kUxKK$6c&~@^aFOtx3v1NKmAHB!0O@`
zGXtH5Dx;IiZ~47Bg4s;!0jy$Ob`2Vp1`{Xr_JIZ2c5**aM{N!u3icm0`{p8SbK%Fq
zRYNQRe;{wbhoy{72VP>u{sKjN;Ceg+W!6?sa`PqDJDS+(`3N4L;%29(0b7}@<1_8(
z@_+g={A2K#h3d{S;nFPIkhoZE_v81aus7Tw1`NS61@K3&N|5C5T)?2#Y?rCLG9wXO
z<-S(5G8tu4<70o#UuPX)n`igg_n7tg6n9cSaF!qPNjzD`mbMvhcGG~~?prf;)kmIB
z@=n?%1gsR%e_s&2Dj4l8@@S>N4|gIR<c4*fum<G0W`9-G_{@4l6UY+JJ$-uG4=tA)
z{?PcHOLH!3!HxP194WAqm))DzVovol#35=-e5UAG&VZ*Ice*3iB`p<x?0|mvm}F=M
zh+F&zdiR3vS37s$QbdjGJi{m7^6dZ$iNV({w0is)Hfl;@-z2O5fE{4ce;~S0jcfIr
z@I#CKT$=i?=Y2r7X{Lz6cU^b{arlIEvqqy4*tj?;SM53g1HNl5jRTW2s+J3Q;UYwK
zws+J>UWtsqH}|*sf~P+bGxL0>8aPB(qauO<Aic@cizeLYczM<6IC?TM?_3~|4Qm@_
zqC5maf!pY#Xoa0+T+bnws*lxEqd3D-eM_p55ct(b`_ZqqmxtGVN|eIwEK3(veUcZR
z-G2w_eun>n)g-FxkMq9i*F}LkqmV>`lkLnmRQKl>G|ep!DKD*E1&=)p@y4{S;8zxN
zFIX-#90DBHhyIOM<14D!1j7-&mQ!CxR`hbmI(j*xzc=jmrf%y9O(95`dsszxCcu_2
zI4+3J4NI=&5&5a*-&l}vg#T*CSEUDcW8cF@B%XTAKt!|>iO3z;G{<}><t%vf?#8LD
zZ7K?oS+nBUxH0-qyu92BN_c&uWpb&T9Pz=7{{|Jml=ivfIXogY8-tJQ|K7>PZJmpD
zC;cX4@n!optp*Z8$lzmf>su+ERa1IO%RfHHKn%B1tdoiNhy0+RNPP{vg`$Gss@OZ$
zZYiQBKNuL!A|{LWMHVILqfZOu1$3JyYL2R+@5naU=^imQNoc>Rt&hx{3)%$~JPB8f
zJ&L65IY)f;bNGcawiJ<g*c4<N^-ERDz&9*z3}etNiJJ<Ds|p0Mivy>0!S)BMlxq$W
z=J4Q@GFll_qGKB2;-|QromifUO@thKm|KC()|t1&g1S?3;-}g50q%WPN859Gi{j0B
zsq6*e>Dor0f%tmXYRnM8qTTj=o|uuwGomYE#>^ChCQ_CMn1(@>lbENZEaZ;yZDaHU
zU2<be%CBAf`)i_b^UmqMY~xqVM|hV_dYl7;on+r&iW`j{9_1S?MuA5qOwLE9j#cNi
zOSfY8{LLRwe)5pC9`-mZVI*J`PqYC?YY`X8yBt;~jB6xNz+wX!<=&vnn&B6>(9*}S
z&2nQ75wYP1;-n9vW$2+@kYK7;JF)qO>NWF2wT$i^P-5Ol*)YN9^_$$O>aJkBCwr_S
zM6%w#2s|rNj*qxe%_;kP@pHi;IM%6Z<O?8b?2@X*{q$iZ@yKAm1$)n?VEB~oQ^VvZ
z!_k*1S+Qe4o5Bx$x$zn7R=X6`xB^M05&vZh47UIrVr}s`^!ecXVJ~A06t-3k&b@1Z
zmPKV$FGB9D2U=w$Jq)r2k6mCVOlu1jFOYtbH4fA)cZW91w2?oeuu1*--!q`rA&*S?
z%&6J%V=+uOiDC;@+dNkCJv1K|kt75(;^<tf;?2&IAn&HMRtB?hF3JlY(_jxMvqJ2v
zh56^)?;V!PEfLaM^O8u(s3?<5E6-%QEv`S=7U5j)2<H&kq^$GtHLC(Ct#|XH%gu<4
zzYkNi@#hBE>o1i@;$}8R<;x$JFUP5QT0>j{I1;62dW^n*Kl0*^#aDl}^zxIuAM1Z0
zN(J$!$Z@7<7>94=GyKCYtm8@k?e<fGuFMevcVe6(jy-p*bXg_zd$wak9rgVqY9XL@
zpsoP#*LvBSwr{=)FS3!}<4$+*N~a}`luOy!y_`}Um+B3Fj!8`r+s+nlEm}Iq*j$-)
zd3k0OE-hoCeYy!qo*<*%AQhYQ2^a&+&yy?R>1m#e9=hl-z|9OTKlbpHyi4sCYt2?P
zNtTR+PlQ-Jjd!{CUASIE)sw^qn>Ov3>xG&A#q88jmo%1QhvYFV_yBJC?k$V{QC!U|
z)O4)NU857YcD)bj#DY{<g7y^D1TgJ>E#o<zcuenEDJUr0%v$mrS`k6i`T1zFn{r}i
zUhW;E8Z)nl&J5f6G1UydgK|N@GS7UPnC%Iai{admK;+Vg1?PZ_A-IbSnL63HhUi65
z@O3;4ZD#^OUr>gGoBo<Cm;Urlsg1d3p!JiGcs;A5!%W%V#qJq5FR%cSK&1>j`t3$y
zB#y!Q!*#c_<&ro`{=E)tV3;*Ll2TBAxf)?@6$#~`<2On<uO`6}ckCE`uzZy081MY?
zeoclEX2drpl_l?_?6pU&Dq*=XIGQ8xY+QbA{_8wwfGb+?rNjZI*^be5$r4wn6YRTG
z;y%qHsch)QLX{N+B~I<Ua+t7h6gg>q9ZA=?97&fb=TZWdcj?g1`%pS4o~|qYG>CAH
zAB;lzjs?2_{Nw+ouPyXzTo=YgH`LYX2i(^Vw>6F{fg4-G`WJSq&!x@W1o*+ee~ZgQ
z$Zh+$5fa_ju0TC~nS%0LrGY9S7I_W5n~fW)f!g2*LZU8{f)DM>gK82JclZcPV}e?q
z4Xy-%CxC{EMV{*cNp?Yi3ye)d9dyMWVvf&EPsk{s42jePQO_b5Pj<IZ7C}XB2ld>(
zt)O?_ylxm~CZY<iL_rzkib2L(81r~D)7i<Dg+Y;;_j>|FxtwT(L7|4%&NGH(6~^rQ
z+|iK^kf@27-GWxh%i$JZRH`yFchL%3+)7<Rd8z^bnH6lJ7}U7D=y0^NYt``@DON(c
z5=pPJr*&tROTccEQqaZe-bJtmQ_!ez)vHeZ8L8Z9OQdymU+r0bXreh<;!7Gg_iM`j
z{KbczLRy}A6d<_>lnIwu7>f9X(o0|Suf5F=6^+idm~O@u_#QhIdlsgI7P0s&SSYld
z?OWJc4>&sWJbROJ9K7+>giCWMCbG@(WKG`JggnTZ6B3D+y6_)p{4wc$&cr#={2p*O
zGV%&MU+Bga|Ab(1ThU#Hz2#9+^bDt_4*}|S>BiglVyYkA=(ZszP0TC5_n7qS=#MD0
zS#uhcTR^h&T=DX}tV#9_=2}}UiPbg$jH2BOG1rxi9r&n5HkfYPmiXte{tfGS8Drdf
zyIU4phx9bZ@J!TV+tDbK-(VW|*8><1aeVR9iQur4Hxo|<pk}YJQ7KhPsZY8M38X|@
zB3v%vll4*rm+~`8e4X=9NE$Eze}G53sO6=|oksXwlnKKcP|`jqAu@PjllTGUGVv>n
z-wv(rmQV=l5>5?ksem-nYENF4!WNEY4BW|x9Ji%uI`|_KB<6NbaMh<}-zEBIynMwd
zxC~>an~e0@XfznpSzH2aZaO1!E9@*^8TR-?XyXKK9uhMv)bfFgQpo;^?JjCws_ZGv
zvk8>1(rC3pJ+ogZ^L9+XDLt}&>{Is5w%jrHp8=4`Omg=t&;D15PX!y6UTxLtE=5-)
zMFfND{MMJnfiJ<2i^2um(yuOQQ1_BQ+>N<FpqY<|kxfE2*tAi)HeFKY(1!}d>Nl$7
z&dFMA?hNDfT#i7WkR%Ny3u^x>be1#2@cvz>(0^u+@OqdDW|76h`-4wPed6iK-JOiO
zaWL={-512dljWfJ!STlwj%f@Z2LX@i;RZX1w-{5!-XL6`+&x6#^gfi40F{P79cu}<
zYCKrjUyO)V20uy?*dU^={L?}puF#6U<->Pl9KGBii$rmqKu^BpsTnc3XR!SKww#1v
zDw`CWn~Y;+D`NjFH{-MT_FlB5rvQZe;s+t<nZL*m9|5Ix3^Hb_WJ`1GEu-8A3L?eq
z8-a2Y4V<U5v-1m|z!&hT!?H)55+&&rr1l!d29UKvSA5%n#yjW3`rB1ZZn#{yzgb~R
z6F!UMUl#E{tz??=Ala!6&6|4U@5Z<N{|?ixCck~V+mg^>tu`6>4;1BhmPaN&QnMH|
z`BeSSZ<a{bHI#puj=!5CC|P8NY5Yle`WK!r(KOg%W6*pvFmB+m>O(`Gc7pfqw5~hB
z{gV623~kr%anyYes>iJDQ<~RWfWi8&f*for5v`Yy<hX%nx;axNgDTtb3h5Ba5${AP
z(TzNCP0?FGOQ~;6<Hct_{Er^ojs^&sMc$(=^r^F-k%TA<ZBn{VurB~3Un>wN94fo~
zK#Teu1I5fXH7LAr#ZoUuP49Mgj?YdQ5)SNz){|I}M*o1xUtiC7{K>hgWrq3=vK=Bn
zrjFHAWhAz;F(FbT#?*wngOVLCGShah4Dn&<9=$45+%N*_7);YEq0fxxLY=$&ivc?q
z4h3pnFfx#VD5CcKp}H8ciFx+wwQPS`bv5B!Av|Sqg0L`S2By<YVIbIsMT++sTbn$B
zAl1w`GdeL~bo;w4Gi+O<^Yel%9LrEF1+j5h92LN5x=s?8AHZ-Xzd?UC@Z`gH#U`gc
zs9cRq@7hHc@fKLowzb-;QM@_o^uqu<{QpsO-qCEoZ5R(xYQ-om6?>JcTD5nTD5X~I
z8EVuDwO3HuDnXQ5MT^>ds}e;bRur{ogV=ko-<$XUoRf2seDgf_eO=e*QclhC^<}TQ
z)D_=h^x5(WfPOoc<*AslD&HwDo#ds_>YrdDv6&uz(fZQA()=I@%Z@rOJNVLSwv81b
zAMWCEo<%HNyBXY0AoE7(S+#7&5c9-^&^p}|f$@bl`qDsF;ycun3|FqzQ9ZEJTgU?A
z4|nwronyIIc)E)vbQ6+-Fzj+y!tp-Z;@3OFg?(`N9)<4^?5Og$63=FzwpbubViB+g
z*dSF&{xVG)dN>7AC$M0E?Zm89jkC+?JDk)XEh=t1{XW13%=T+XgYy;h;}hO%L}nPp
zKf1WZ@ldV%b;PJJ_tJ~jv;r$fvaEhDfd%EdzFfW3GuHjw8)}nFpPRogWQh4zCw-9G
z-i*4B-OaGBTkuv*2kSjh6t&mqqgVky#gFo@p1{1L>jGXgi!&hJ9}DgiPT*(MmvVt_
zwyamsedUZF&uGiPytL4HfZTAgUzuk!9;k(alM3hzY;j+<fkd;!<vu3C%d+!7K=nkV
zD6`{rS704_e7Tnz?A0)umlO|84f&{Cb5b>gdq*Vi>2ZFrWmGhHj0l%{6Wmx*YI}7m
zlUaUfHQURwbH1FBUd=hDQW!pX1-kxl^=NOc=gk{u4=!Oz$x5>$AO#EVY1~R`aNXHk
zEtQ6nNA+6EnK%6^jhx$c|9V61FYN;BOegk!n?3U4>#1n1nQNpri?T#X$n)9dv?yj?
zL(dq9sEngC%e~e4>3=xLhv)gU3V`l-C_*W5yyJP>lf9q1qmTaG6SoIYIJyD2wZIdV
z>%ou8pVtVjqij%g;VQiqu1kgi!FA6A-!?d>1m0QF`}FNMH0n0oD##^|CYY|P`NFiy
z!WD^PU{$tlQ?<#79^1D}T0h|HBS*i$TxWBnHidb-{qyi?QXarOkPp!?l8Q)2_wbF1
z7(ROmzQy|bvg18r*D{XF(vFuV=&~UD77l!jXC}{Z_Vp=TP(bxR^wDpOplXadZp469
z?OTDT)v`D}!hD9tA9FQ{jC6@Dl7Pqa?2_?`p01l-uCCn3SLx#5G+s}@8i4gm^0-9*
zWOkoDu1#9QQ%rjo2R5{*xN^pgRgj)=wvoYdwAW4TxV;6#`V!&fzQc)yW{~A2s4zp2
z*CM7dJT?5`<f?;%cr4c~L)0MxQ)tu@cRfQ8bR*(MKonz{{u?CDFh8d9?{6PQg*)x&
zPY4twT&0N|$h{Wy^&@J}t@0$hgHKNqByc1dca0{7ofWG&eiw!$bSSkY_bofYI{90n
ztoZquYK9D61pbapf3<X1Cw4b+SvbhK1;N<3MJ#nLSiE$uQvOTku(HE4KO;&fyb;{A
zl$kAZ3z9m^EXz;@9)`QnDm7mk5`l<jj=A<mS(XrW$YQpm=ss?}N8C>!XHlIgDG!~F
zox$+=VT*L9p%VSRd_R*MIUp~|gWvX;p!k~JHM^XK5<{pIO+<`9bju3hb{9RwkQ_z~
zF*BRlXlJX_eB4CCrhg!pcEp}<k-<&D^s<B^DH-oa8Z~KC4`>m3f3o){cnkS4Q_!yt
z2oPjtA1+BedjGz>jej|>4$+en?jl1-j{h)Y_+T2Zi;o(Rj=}#D42R2wHnJvD(JXnZ
zUU<7@FJo94^3XoS_Mzj=qY^4Bf<v3-7lo%g=-^=AID{pu{~gIx*57r_{dcw~*j*dR
zs@eR6_rE!Nnzx^F+~lTepZsl+Q1kA5E|XSj>Vhdo2Ns)n8ZyVurgFjJovQUC_W$Md
z{T!^0mrO}}jFlw<=XSNlxR4XQK7XG36Cs~8r~lHZi`8R)+IN6Su*5nr-P*2Oovz>{
zUpO(e?x`93iU<NBhT@eD<MJdaTOJXF--~oY6F%VC1362iPFx5Ml^?RS<@6{fik`by
zmNz#!>1R<iaps<132E93-SO~V2z)#S3V|8ak#=F+Rg;n*;09DXFGxo6q{pKjt@2Z{
z=^+$jNB>73`h~9eB8<U{oVo$!WtWk6Cn8NBjnSka-3nK4m1QY-L=LCDMAca3%dy9X
zsi3n9b;<4c!0<bYz7w0rrD?ZzmM%3gBxc($#nBL!3bHi*BrY~pIkxwq#~3N(7LfL*
z-pm)_+w0d5j_Z=@N$Ma)tY~egR$on$gdT;}<)LAJkPq+m@O1YPms87{3RRRitY&BD
z@8?AiBXopK{p7vqJ|;UfrP9qgu4xGwCR{9?;vi&28xJDQY0Js4DW(aKz-HW4B{v2h
z)SMQzt5>vXx7=GX-q2p3P6;6GmLA54XUg5PTZSs$M8uc`?TB)^y2cJi{M}E^?Mg&{
z>nZW5Y`0AOg?MHO5p_rzNN9>>=~Pl9eEW`i;l+_tQ{6<a>7euFTpt>x>ANL7BD&6O
z$PWk`UiMSYJ}M_<u8LV0M!TZyW34fxje)y*Z#D(r)j>)LkxjcC(K8kIfSP2jFUB{@
z7!N)*6><Cr=)n~V9d7T)Wy&d~$1FuCH{^N<PT?i2_<El2oKy1QtJv$VN<Rn48`%Vj
z_x5vbm|OBr5L;Iw|GWqgNjq;b)6;}C6A9Jt4@&({CCm8!FxgQ~-^(KgMkUYwRf>!g
zjeq$CHPvz`%K9S|t}>`Hd}BYq1shr=oE(EyNmR=X{S)Gb+Txn1{C+)_M@}Kv$-AN7
zU~78^znt<0h~@J5*TRHkhL_0AiVc8P2nV|w0k0&SJnjAQQ3W*D5!ljZj!006J+Fr;
z0G~}vKsY}sqAG}f@YK0kj%ZaFui{2L6f(m?AM(N)^!EtSN#S2N%qm5XPA)aFW|sjb
zwUP^?2PLZ`i@}3EIiT6Sz;)wgcy?)&3dfsdTgC+~7FW47X&FNaamy3=E8j$UNL&=i
z92C}JktbSFkQLVs;pI9lB^r7@u*H&-D=DWAYehKA(jZ7|q?5E(14~C9lYzs0Rapec
zLEWJk1vqr!u(XWf6_27M2f`Oq`B3wM`J-YFrwt(|_oj4!R=Dw=${cm}eL$5ke9kQG
zJb<HsSi@IN^>n2ta)AR=A*Em^2Jldj<2xl(>NAT%ovBks^O#7u7?6;2|EuoAV9U4s
zQ<5=r{ng8fc0x5}keHw$5XljasnCCqL`2`9mp%9>k1Qa8T63{VmsysN&ZZ-k>$6CV
z*lc_}ksD%C(DaZS^gI%47bJLGcFWd{o&+@)IkA6y<wAm$N^V@m^~sPc6B`HbOP45C
zqe(nvPs!7?4GdmAyToMs$=#SR?MfvayjG+K1@XPjBQKBlWHzEA_phVLz8L-Sm}du;
zq!%Wk#WeOGK=Vs*s@)XpkiPDXiUkB2L`jI1qf&ScCylgX#J|=K1qFLcuIun%#m;Ms
zT+!ht3SmM!)a)y&CTymHCG7eHeRB(G+JhQJXkxE{9Xrph8JfTwFmeh@{5>Z;XEzlR
z2#3c02Y55{MDw+9jHdP}I4msi2d4driLH(A1p6Ss=Fp^oT-jLYf<A=K3!S-i;E)uh
zulk-Vpme`21_XNQDE%krecapckXd&{XEJ;q=Qy199o}=5i@?i*+R=AQg0Mz|labm=
z*DXI3k>KywUBjTRMinXqS>J<j1?U)EFra3o6|4bgocYM!o?iB9V@esy1UTFYDy41}
zkPuG!86Szd5)LvH;FbY&0qkgi=&%@o+{wLj%Ee=}R+Ciu%m)!wvL$cHvoXnz&(dgb
z%Eg=jyM1C#cg)r$Q@d@*7*4v4!g$sLPTgfY1s|m(`EF-se0s_%xI>UT-8A_=X&v1d
z0Chu1P=pdYUN`#Hz|pJLeYZKxZ}v}^0BGxOl}GhEd`E-StRgr8X}H*rbVnxvu)UTQ
zN73j}v4-i3GzU;{@%FJ43G9deJNyb@zn)|$_)u58Ci;!DZvakKsie==rJqJn_8*dm
z4^RU<3nJS;T32PfJ0;K!T83l1hm@+x#m~l~4DO#ts>yXyq+E<@@^IL@FYif4FI0%@
zs{51CmQxZ@IDj-DUy(0K%PAuYPnt|6QqjC$zxO?h^ou8*35t3mGJede=dt1BkfoAu
z4?uslCSCL&B{=xP`<A+5^A9KP4+hCNqvy4^GYV4VC=cKYIc{4FdFRV={9#&!fY<d^
z9ieXyoxQ+e!N*s^JLl0n%oOZFojARyvJ3~vrw1aK_zMH-MM+6fVpmcbkK#KSwITV)
z<Krrcv#Grk%)f=-bo5v9V+__$tVKiKs>^W73I%>R1(7RljtQvn)IVh>aw*w`hPhSK
zxqO=ugwg*1RXqY#c~TJ)Dm7Y&h$WVN6WqHevR5C!Wo*Zb{-lz1SN75Oj<|o_vG?N}
z{}2GAzV}UD)OVtVcjL{z%t_JSH{xB~YvT(jNAGKuK1ZE155ZIP+*@VtOQ4EXScFA8
z>)AWEVC#mt@`ayiPxx_AL~y{>CN6Kf&Gu;;BJoSj(G{arfn{6aG=M)HFF27hQZZv=
zJ=>@Dmc>qXcRRNb);QWPU#|aAVMn%i?yBSd+O`M&gU5@=_7+cw?5?$-K@+D$Vup@4
zNrD=RNLT#DKX_d4q$319HT9Asq!3{?36MM2bp1(rbe&ww$)io97e*Ds-Q<5w(B87L
z>pQ{s3&@lMGS$oPkf6;fnJ%4YQl`s)ZS;TOdF>;fJW<8@L%8i!Et)U#g5C^R5A2k~
z*cPq#n8*HeY!VQJ)S-F-myVadCIe*JZ(LG>{!B_QvPc!i;n{Ca!(IOjB_6>0hqlCM
zvoDOASf7^rex&fX{h6zqBX2Z5eN}Dw8iF}pMr(fyAX)n1V&U{@g)CtkqpwDEU+(in
z3J_jn73A0>aLjx)v&B>ctUf`$V}xRk^o_7La=YxST$R%C_Tq`ZQ`{*R`mu-9ni*@B
zG_aw-i&4*Z?8=gpKTUwWB_MB&Tr#)f@mKPd*-zX!Tytnyl<czaP4M3m=%uPe@1H1d
zMp;eo_S|IyZy}8|h6iTfIPBS;M)$JsZ|kroFn@2<N**$g$|emuDYjsn0)J@y?ib_)
zYxy$#V6_bOWrY0l;obm=_fOL*F1r1~aFq3H<UI|!StiFjIr%DIEUHgi-?{9RF~)<%
z1!XyAp}@`Y{HQ;9__wb$7d_n%ae`0CN^k5B1;C)^Ir8!N@l?2d&VpBlVnXf?J{G!=
zQ(v@&1WF~xS`j!GWI29yP&w|Cljsllu8MoAveya=-S<bC{YfOzK39*2&L=TQ#no1)
z>-6QOf_lLFhcv!NQpp2(??}yBSnUs?9l<8%x-ks8l?x9{6degUA<h++mkO#Mn#ddh
z+VLxDM?>T=Rc3yfxV})VIpr-KIO~u%005@LNd0)B$Er9JI9a2@+YSWDU(J6l9sBOF
z_OzJwas(MdfGd@zV0=cCoL#l%Q7`ju<cI~nrfIJH$v?)%wP&{(x*df-Z9rK02orIA
zxdxN|n&0{Ln7LnS3w{#`Ts}O1U3vX}+bA8H1RxM7583l8^#U)9G;@;r9GVmRjr$Y2
zd}S29DN(0C1f0)xz!ibq$!Raucas)DDvFr~Uaz;<E2+2F!NO#A0RTk%^1j7k4?%0?
zL$WfgKKXA==i(jngD#~u63#wd+7^ST*&`qe?gzzq(!dmdM12NSjHpH?nC%cU&C$lx
zRaq<l0n!{FptdpRSL=OIe`y-`G`C7=Qk3yCMY8Pr6{dGjW!%fjo!nQ&6H^0uiT@p{
z6|-oWSHk*J+%LAi$+Qz>fpD4ondUsN8PdCw6Mw~%tVc$g=8rbW7MeE2&gQ0*r>Rr0
zF4Go0vDvZ~Dcm9B)?B1<j9>Kc#n=$n7XSyVxew`FAKRfdywCV@Bym=Bz9!)zyK{g)
zrSS+^z)5B76I)&!KV^8Nwny1|j<CWf1#=lIeQs!O8u#x@|8-Rr-t5+fCau|oHpI8U
zonYrC=D`;<K9tN0RMENrh@Dunn4;%fHz*{1l-PpwDtEOddt&%as?9nF`>=T@J%Dj5
z7&N0*RYC5f@7w3;A?3Py_hrE|G|L0ko?6I;?8d{K@wekH>RbHQts#IQ)^*%Ll~3%#
zD}<b47pV|Qpx`5<nD}(f%BXZ3QqeA!DxWhD-yTAT{)Vz@<rH%Zrw!>XK>l@fKcGvS
z(+p-LK@BMl1~%;eww8B_Xefy1m-Am_1n{!U;v;SSZJyR^2X`Y$`gXP`1%b*r$7pNU
zdlKr-`j0|~S;vY+$jME#Il7L^R~YZNoWt<?@cW+md<pj-d{_p9)bTNboVlFi?GMhH
zE`>Y&_&Rw%wxL1`Tsny;TXf)RN3howiI<3_#4^%M1R75uzTtG+spXkH**;qa6Qnc!
z)@P76o$pyhPP1OrYoqTOSH+>)*YSj(p9Z9Bc!~oim5t!?KIC*iByGQ{5O)?%3WEZs
zX;{t`UYGd0{OQ?LH$$N>_TCd0#|4d%lO##xnjp#eMH=WH*yqhEC&$guv~<NCjp?_L
z0cvC^`Rrr9W#3*!(8IVN^eZK?EmtGqL!3?bwihm`0@H|P2umt)4MsoAAv%H1CYf&r
zIh=S?kt15uEjZ(8wdMOaaVoEIXYx;%ZtD0rIIpYPC<DF?jgn=V?Y)crH%Jenp0*Ot
z2*S+zA7hyJ-}iV;{zGr+&?dBQ8A|}5y>dWSK1O|;SyMtp_rfH4euPfEVrD>?HJ#gN
z;hX(tvia{qiwNrB4}FCyF}Z8NOQo9$&f5O~+accsKd3m{f?cLBc1c4Zd<Ru_vU80(
z+WyZgaE8sNRr!^7Ej{)Ro)@E+a>A}#C(fVGh02`e?-g}xR|S$@8jV(#7ci;?6usbY
z`y&hf9N4S!;mIZYr8v=r@;kTjKfu;p(K-k1S*N=)x2wNTs~h8+Lg<*yRED&Oj7wy+
zW*kcD=jmNSUgfm;XPcB)@+GU(uKC12qkm4yI=BCXpE=D^%3^!hWWgb$*-u*Q8?lG<
z<^>{@#GBQ`^6pj^aVJ)P4Uc#O!8dXUy+_?}CGoV!;I%C8IonB8Tcs@P9C|BzV@5h&
z#izV*X-&(5dHA}lr{)Nn8$>SB8z&D1uKv2MCt>=jW$ymRvLDb-mI<p`P6pXK3Lgo>
z0H2^ii+F3xDMi#X0XA-WBrH3rYl4ZdgfUVK@CCy<M7g8&yf0@TpE9VCnx!J#{VOX+
zEG)+0#boQnN=NRA@f>Defywd0hZ6kv!K1~Nu{*waS2A}+aSC=~W%NOzwXRhy#_#sz
zZGopOkIxaomlJpPL;jt{syOdPhKrtUSJ98>Fzp@B*R4R*GYF0GAGonMLaRde6L+7`
z&KSsXq9d;E^`FGP$9rx6eEfTm@mZGU*_*<mSe^#~e3_q`rXMfw07Vc<Dxtq6ZN+Yg
z`94~{zYWbloD*VKoTzk|7n4V$!s>DhL)A*p-dpT1BsOre1ZJ*U&goc;Rr*nHepxAM
zY5hDX@-F*esQc#0W%MO$=##pphPdN*xf^QOUg70<0wUO<-A~3aKl$IY!@<VzPcF)|
z@AdvvEFl$_0>0ZVFGnMZX1WPM)~dWV$)y*fEDo7QwVLsc^dy{1IR$?oldauLdPoho
zQGC2><%Ir&!jRqYCec0F4t7e2X}t~oFi?>8<|ExMdBl4v(qkfv{g@lrE-t5J`a9TC
z?I!6@FN8m}xwBLGdOy-Ut(}RXD!GV+LBeTS<1#C1KV@Ov=J4M8rNq9JJ^^+4I@-L)
zhT^y)W^dPZJ{P30uoPkwY%9o$;>*4cE7LP}C5Dq5IDuNcUA`V6!eL+cxKLh_a%2Ru
zC`ughru;Wd((nUUZHNmmr+8}Q`3YjyG5KmR<Wr#A!?&}nL}0C#X(ygN=;9{z6%jf9
zP9;MK>BVpMos64gLmV-s1e?xGh)xDGH)PH{k8yH!yj{E!tLy_(M+AqMI$nhB4A%f0
zH5jThs1}Jz&4CI>Ao`Zg=+(pGNv5><5&DXRLo1I3tl-0+kFj7on&YF&oS~`86{lFn
z#p(r7Z3-`08W_grbD!AJwsgOKqfBeVNE)B$U;(ILTMY@r<y|RkqsIf>1=Geg<hs=*
zu+7lyI|y>O-KkVT#ur|P+|wUqsXKc)pZ`tKb#JR-ZEBvDfx5qmOv)$Di$rFm;VXLA
z5Qle~w{en^;tqjir>HIYzdw~kEZ;L)L)atjQGBEnKo$U<-u$uK3veGJ4O<}U^)tbc
z8k+!VF^Z-0u?c^JHo1@8S;|fdjd(Kf9USptc0(C{eDbQ5`c8Q=&+b6S1A|F?Hd0OY
z#-z5f-6NmaG)$H@DQ4b`=h_3QDUQE=g&Z=}Hn=YlG}%)dg!jH6992x-aTM}kQ>J{)
zz;nwsJ&Ihbx=g2;C3os>^+U;7;c5kz%2{u1m6D6`Z)s=+zQ$39Lm!<MDrGxZ8Z<t6
zl=C_`Rcazfh-SDnHatE6%&13KsV{g?^d*pwzOyBocAz_E^XdX-{GB}1|FD;@HO*9w
z2qr*x!By8J#|Rq_&8*VMw0M@%-FpGO!35=WW(&yGrXkD0Jv+!b1voj^4Kc3Oz}w5^
z0c6!(jD!c>)T3I%|1d3`q6?~B`5n4BD*;NaCU444WDG5o4uqT(j9e97rW}$)<9_TM
zP30lh)y7!6-|*mRn}Uq4UPO1EFs->KJE!SrG@8DiSrvh<V2#G&vq=^X3Q*3IJF}mf
z^L1j(Iu9T7-_B1)_B9L2;)@PTSG$M&^?2^wB^j(^Hi##sbU(t_oK-y1F|2O*_zXE~
zQy>466N?pTd8rN}R;?dy8=7k?dNZZ5MOg(QSqI#f)YzFVcj95$&hww%lD4`KPt2JC
zr&*HJ^mgSl95^Z@v*A`f14I;Yg8iM?8m9#mR6NGsXqI?>df8&{;p)eQ6Y1pyaA-RV
z6X_M?+KVPlO__$g%`=QWLp_~@#3hdR)hY>6aKG-0cNM%EiNYVHcYVC|ft!e1hB2#Y
z+dGdRjgTe$HR^vkSZ@z&Mo{i1TEw|lZtuu+J!FUic~k9$?`U775E-hS&|qRI66$az
zv`)cux^(8F$&d~io)|0?67=RQ)~VQ?yvy{71mN%Wg}72dUCaH@ryaQa-6iUUsG6VC
zZ&H0~q>rZfdM374#-3hro6q?a0ju{Uba0%pKFJSnRDb5Wz4DX0EAnf8pdvH?c7`AQ
zD=<wmq92^B{utsMkvi~{q4Zi$?&R7n;cu-}ft3!Au)tEheI1+<7v4;`_<Pdw`E^jl
z9|n2*P|Wl%3MK6ezbES31!Im9<VobAb+e%b$y*dwuRniz`LJcg!=uSEzgg>iE`TIS
z`LvHt7ZeOT`c8dz*F@ycgBvpU-Sdx~eA#x4v~Eue3bgs?=VrE1K!%&c$jLj1Ni6fw
zr-w5Y+L0~55N5hMU;5kYTfcngQ(DKUhxM4_8(|qT^jp@Av1s|XipOQAwPD{1Vz!qw
zsensOi%1`3`{9r=iztf%N@v%%F++1J02&lsIxI)OraXkX>HTA{<9TklDYTDU5Repv
z!(SLQ!Xy6sd(A!ikGqQ@zA?~!kt9dU^I>t#2m$GX5xgw@b#gf5#x9Dzid1HbJ|O3!
z!B22nQEf~0d-RUvw##04f}#7&_?)1UTQSqq7;2BH_$@^-CEuGD{`W&AZg;}qdf`y4
z;-T5gX=}}UIEC9}cX6y3FU&~mCl>*lGKLLu-^u+UA&j>?wa&d58Ei9BBA<14*CM$q
zJUQm|Gcrd|7A)5dZecyh*!)?+v+rRDFbPmL{%WG8Pxmqo{|KkAr{H|`ujv_|HGGQt
zb&#d+L%c62d;Hh0whH<bPp0_fi9?LVH>LU)Bnb5xOA0rHtlW0|-wzy)1G<#2mLJG+
z1=~dk(=uZ_<J4<<Cp%HVN<EdX1`j^!>g=5GH4GQ1nfVjbPscm|0T>r)e6&239%>8>
zYe+k<t{Cr0PDGDK)|yw$%eWGGOU}_b6db7z^N_1Hbk7ig8XX~-xT&l55Z!pHB5Df5
z=X5L`7oo?8B_-q(G{v*;B>slCxIJMcKTu-?_9q`)*xkV}%OS(yLbK{fGZ22}=!fN#
zvE(`$E_-yaFHzqveQEK$rtOb7*f*sUSG@`seYV;(&<)oY27q%%S<7%ICI&0CdG^|Z
z9GKa^yiyKQzzALzXfH<h+HFiMo#cIJd^h=gFh>y+MV>a_9r=%4w9$bs7?w4n`nzee
znmMaUqY+x*E~1USQV2FiRzC<|(q&dU-yF?3zHeDkR;CXxMK#J@L5{B;uoSMQk#6KI
zh7Fx7)y+)T-Mf6QN$!vbL}p-`+>vjzw(pwWlZ{nBw=q?^K%`Q8rP&Hi^Z^KNIhM(z
zqeQ;8j}U%VvAH0CN)b&U(NfienOhW=nKQKmzs}TUU*B@=R7@)Ra-S}Ji%=sNy=$_&
zWJjvg^2wQNkxLo#AD}{2%4NNYVRrhu)X`(`Ae){%yeKkJufajR^vBEip)j<PWV|U`
z(euXBsF{^n%QUN_BUVLIZC|pw#r#_a(NVDM1L8JojXISoW5F@zGjxTOFD2LWGxia_
zDPdVabpb_mG-7@|-(_unkbX|CZ3PX;yYMwxJq$AT%4oj{zLr#Fo<|>2O;Gi!vK@Gf
z&nUHQUTruxB~YaIm<fZ0(|`cGf60&2WCutrqox$0>|qgK<)<~K(V7mOsoLwKO*T<*
z#({fTFaw16PgW)6wg~yL99cdAX^{A7KWr%2*L;!seE@5(LR2=ATx)5hg5<<S2b(lC
zYwQ~Z!*wu`P-YY;FhhW=Y}Lv(<eHKT<E70l#LTLPp_*!bPS^``SL$5RN0UU~8Z~w!
zJm>RzVSueLd+8joH_-Nn{4gnhtB6iuIVGWpnED0IFbA{w>^<%yH)(C0zt$i7YsUV)
z>0sH}f11RJ0vv#kyoq4zgnyt1&}L^J$P@2xB*%FSPx~RJcN91>*nH!U(6IBd>h5o~
z83|&{8SkHD-*{}H(B0^PV(DYd;lKJS4H_(&(~N7sFQ!O}#Qi~z#E^f|?ROm6Z}F8c
z3`PsmTm$G=HOTIT`t4}tfscxC-W;|_Wz}xCZn%UzzFqdl`11Dm!~1epcb|1h!jM|B
zM}+ucG8xYwPEMB?wpa<Xkbu%%UoJik($tlHj-WM(h(fE@C~B!gHN)<`7Mz|wu}NS)
zHHp8uuXo2d$45+zB7*qT<<;~}CRodeVP`u6cqx>B6g9s#8xNu%xWl5$jsXNvAcV+R
zK1=LspylKgFYxoJ&Rxu(lPC#_k?Wm#xAk-RzAuv{^1_}T0w~e<igbzX1dXqy=@>qz
z@d`)0r#Qg*o*CKt_0Ex*nRvBfXu>@SEX@9<^u^QuEi6f-5WsP#l6D@IDX>4R=B`K(
ze=872INB0=HaL*Hbh^yYt}YhLfiJ3%w|^sSZx;WSqaZ+TGq>>3XP@aZ$`8-HpGQYc
z^#c4*9Fv2@$Y`y_2h_|@e_J`OJG=8~<9D-zoU>_5SsY_{FGgeXt$VYqA{y%QlwiAY
zU+s|7z9L%O;$JYT%FRpwE51)0x2>Z~tJ&pYxw>zQUk5^?ujv^l+2X^<!+P94zk#>g
zawiTDirR@STv}+(gj}L3?fjS;i`PfoJQ%(bEa37I#hbT4EIjg4V?`ZPe=!r)7%H|6
z+L>3u`~@<MsvAcAkCU@~RF5$NB^$4%ony8H#;*(_-V~Wzpgl!*8z>E@Z#x(u9g*tH
zs$ilu!Ar$$_e^%PlY>2tK(t5HJdSbNH<?a+q-gT*U5L^X7DBp6YT9ZjEL!ND@9@Mw
ztsc4$5lu~3Oi+_(lk2=ttrEABw1xfcd`qsH5sxl$g^@l$jW~v6R&vqrNslS}tpY!1
zzWrnityd9xob|-aMAnJi8QUXVOgIH~M_f41J1IyzhpnJytO2p2-H#G(PV^Mz`hDiy
z1vQ-Y?;G7v<q`)~<?A|+g1wH|9gnM9-*6r)R%U_9_nKNVWtQHxzKhwBWB=|FJ33N%
zGtja3B208xts=0((O;F#0slJ0pH*q|#CfS|t7qw}XeYF`E^17ZeE44MRSR>%#@O5x
zi%r3?CuWIa3s1CN%-#GQOL@89Q}S_$-;WDYZkf`I^hL`1?GA?HLs_qpp@NGcEEV-X
zA+Pje(!^NsD{{mM`}oF$_=LV!zPsM)kUyjPK~wf)AfNBL&H8tjhi^QYQ>eg<;U|z?
z%Rj%1kE9FLMBirw`YzG<Gd@*Gxi10e+eS!EM2`Ln-hLll0X6Ze*XmI55esns0UOdj
z9`t*a=3UF)I|-C^zlCw%gAmV*SK0na^zg1OZnh+Z_<BxmF2UMOTHctERv8QZYIxgV
z$XnyRU=hpa=CDZ@X~nuWY0{mYXq1vZ(R?i5K>Ib$!{yKSY0AgVi;>q`nH_GAcCtM3
zDQ4!*Sa3E<7tY5&40-S18cfE>mY2ah#{ek8bzl8ZaMvj?IV+({mLuDwHYL^0gerAa
zbqenve8McEEm3^XZCHH%A%%DnjiH~%h>(z6p=RyG)_mu)*!NtzT!+8Tzn8^8XDWs6
zk58}H`9v|At{$A@^oa6d&8kM-B9`xEcMKDtMFg^((~R0S@$e+IguG6$Yo}fH<WJ;s
zUQbeaTw#65CqWLeo`fcI3q~HVzp`26|B{`^w!?24M9~;_UVgUon6@SPt2T-vO8&y3
zbd55HxxR6*u$*m@eUQErQzb`GPSvBUm-NDYo)tG0<S63XKMPN_G3PVuL>iO%>DKU8
z58bke$vlQ4obHhfsmDNZ?6)ZnOBzr?&CPJJ<j>B0PCk<BIP#(<8OZ}{ZC-^`^)xxu
z36TAk*mb;~L$g)V)Whsz-Wt9Li<(>Q_|+LccZ|O(EC%xpXYocak8f0mv+n>JzvPc3
zHa}Qyns7z&wrgoCLzC_mby#GYJ(8>q(Y$P)uVsEobjXL4ocwr_7h)&U`-y@jb*fh3
zSkcIZ(pZdYFZ~bwEx~VC6sF@BpZ_158oQaXu<iWl?RA7ostD8o=!o^=fi6F|)>DWc
z$pX{C1gB2BD9IS}V+D&mX>U_t-|*u5AF{k&Q5%AsVwiLJ5uB$!3jVH?vYhXaD!c@w
zNT&qT{AZtrmYT|~-DdswJzgU#8u<<MZ*WN8Ah9nCLRDKf{k8GZEFRoMA=pTv_f=@G
zYU<wVowoAJUd_J4*@X7_2IJW$Bh?Kr@*G8XirBI2LZr5xp4M3+Q@nf}zl7!2$m1CX
z{k$CyhDf@^c&YOIz^78{JLUN>FpAmeXO4e1bidq;_8015DViAd|6FV5FKaY2U%#Yt
z+w_znKi<)^p9FCg$LlS{7x+~h^zyoA1}#2P%=Q5~!y~P!%2r!|M+R+Uj9$G!<7-(s
z0X_k@Q0z+UPbsm&42_8N<(r7{dKaqvdyiK8((Paei;13YeKV?15^WJ#n_wg?WumB1
z%V$)kkB!WC1q9^iQh8qD>Rc@O@ug;|7?4y?4-_U>5)Rje1}0`bsgs+7zl=t)!yxP6
zZ%)QY(Ll0o6{Gc6<8R7dADFtjL;WMZj3k{0i0C4f_ap+Y|1Ie2$rgDo8cH|1MTE6$
z%63v9f^#vOFOpd#>R%0b2P#AomBt&UXU+P*ru<9JKhd_I0aeBeW1RgjRlQP^7G<m$
zMtLWQo*$b+vs>Et_2=HJ^}h6Gik@&A8>EK#+kLNk#dp^;T6TL)SbK-~-Og#2{ao(L
zZW_eczkD=%7*!owT6SfQmBX#cADV=a*lwNdHK#pofv+RzK`JF>q~=cg;sviZ8>pg;
zo#nQtzcMwE*uI6Fou>nl$_1xSNLl*5;zc|blnyWG4hJ7vQEHs_kvP<nN@!~0<B!-&
zAMEhP+OO=Hg-#I!YZJTw16-6YYp&JN?>DMi=OG9UrY&(2CQ;SUD|azD<*_G|w+kCt
zlwk@}&B7t4oK~;PN~&M+*b5v+BU?D%k2F9b+tn|>4#HUyFzgVFTakZp9i^9}AC0$0
zn5(wgZM@muZyr<Dux>k&1*MXm+jg~<d<ZQ@_R?8I*F=-;c%h>?dbgo*6kgH`z97tW
zxV>S44q=<5H3`cXAaa!o{&u+ZN~TDVDJ=l4*z{6O5Yd8bkXLD_>DR3~K$4)8&)q_1
zru#*gex*l_g8es#goD1-Lo)nJSV>HV@JGkjZrQ43j|RV%+s|u(#PYczif`9*8lF@C
z;gu5R6(JAs=%vvMWFNG3ia9$#Ymv#gCt{cl|9*#rR>Z-t-g}aZk7Z_flGo$Fn+?`t
zpXwRYJCE_eT#G6i^a40OTew7)%ug_$kRxg0SW}l#bCTfzBrC0AIXds)_-pew$2C3)
z^Sh-#fXlzgTgK_vf&ENiO*<ZwR?x(b-4at0jtfdoepGWC(o1)MSFzPQ&bI$t^L6Ld
z6W!2vj5@v;;4dBiEuYyBqPR?e;PSZ|MvbUQ1{O@-XK3gg99w4p6-3rV)P?`X)lNLR
zt32We@+L(D@kSAa$haSWv*#hD7&a5}(VRI+gSG{kp(2=^iBXQydQW7*sShieLabRl
zGZb|!I9_jR*v^O^PY{x$K0KfZB_5SSR#Fno#@JBLnH<>*j?{rGv;CEhF5J7;g-@wt
z+P6N&O{SqPpN*DNChAH?kJjX8g{kG_+v7brjbKcM_ndAq#oH|&EF`#4-h+joqlQ9`
zS3904-?~z5-`D#g&do2*6nYgIBEFe2c4(V-@j9<bEWVDpm&1N-)?fLvQLean>fo`1
zjwXl+t`&M?{Efjj2*8jeo|5nj=T=#}q@&UD8imEMZ0CH&%;kzcZI1p)<wK$9dj_*$
zdcl-j9zUCX=P=g@BIC)e&r5yG^I4=O)n&qsL%XPlDo>)CKb;W0smjRQFA_)Tk!J^+
zXcvwU)ewOv6fF8;PnCr0s-GGAHni@elz+(+8kCo^?7ZV4K;Z)a_48p;StG7lO@nY-
zRlNv{s3(U0Ekp9ok?Ut8G}rksmK(c>l*}MfXGgoc;=`b`9T$?B%vY4G>zxiNUq&1B
znIf6EHvcB-CeN(v+$xW~3q|M!DbE5ZlpA#V16~Jo@@pF`@HPM-2WXyy&%iNIE}?=Z
zmP;UXrPi1joQZO?d?PhvmGUR!OCH8P=a?zEIEm=XKl{z47_+6K>}o~%N%-c7k>dO1
z{ut4EdY+L**)EaSB+Id2kvPO7MODxn&1Ra%`^(amY1`Ep4Eh>@TYm<RBA=rA9gliE
z4=m!;w{YuqWJ~e?-J<ew^TK$^L48flDrxd~$F(ed(of-otWDRZ9*SlXKp(!d6*-b0
zGnLhE1E)!nyD&bWozly82L9ySE9!AeTl0;KY_7rBPUPj0CE-rZ-|GQ7ffPAJ4mqUM
zo8T`Yegot^{=s!Qa)MVzMO<tMNb0mqePBfiuFq5e)a3043bFxW6!WJ9;ygQ25GR$O
z4o<_(5;|1Ulr~;uRX-((OzbO{OR#j{Xgk`x7$$Z4%-$V^fh#G{7;Cigp|!y~=ZTwf
z#AwdXTNjH_;n9u4gKe?iLwHZEr&t1!L_lh6_bIiL51Koaocf1uFg`IW=Nfy|^K>QY
z+b3s=H+Fk;!O-VFwe%!MJ6iH6y4YI3hZZ!-gK};r*Y%tXS@{&a{SR^HgHrNRZd@vF
z?NWw~pw`{*XP?JAG7Qo24FfwV-rA9%xK04X^|GsNpDqo7A_O)uX-wZQ5K7>K%dsvJ
ziq3nUkI+^eMCmJf12Fn%IA2gE=VR<G-$TZ*^@`OcZPrc<@DPO~Xp4@kf+OhEvd2FC
z`aZqjmpA|$Qb^QuA(bfLnx<xyA^N8k#-fC(1fFsqOxO#u!zN7%y~OT5O8ktEcuAp1
z7wl*bs+2`t4k$p0EX&8jve+hKWfd0Vb$IQjQdfJgllLqtn<{Mf+s-T1NwOFsWnpPk
zbDa9HdhYADF#Yq>JZcq%m>^X^$Ubf)iHwc_z6*ZbqNFk;+_?G-4QsZ8jUm2<7=QZ;
zora(#SU~k8=lsM`!1D|$`fX7kbmch0^D0ZD-9vsKE+>6zD*=v7ey=LIHo0rYS?h&J
z>B*t3Z))Qe<5K&{9l55kzinH%P%qf^M*mYTS=+O{)#ZE0{{T7}9+2fv#l-s-kj{If
z`Ks*v<~sJuE27{mHiBlO*gkU_dWWy&MXhs^+M?Z_+M4FWsH&fa*FzR@qaD7dpH$NX
z8mB=L-pt-b$q4OLqAedu`c!rfdn`xHxMWYHoY@-3s*=sf2=8GQlrBsQEN06;A>cI2
zZ!farW;b-#hJA|TsE(A#!-%3BPZeJjD`-}Z_q*>I5bdM+P+-c@JArLS7dbGeKYF!q
zq49k1pcGyf&3mVp(<rWhY~G_cz}(~|2eS;Qs02tMwGT(@*VVN~esSkeiWTN2^YRh=
znyEQUT5ea3DFNJ1H8pU3_dwT9W-xiu8Td;9-sLO56X(a91He#Jc^zgt!uSVDG2!CB
z9T}DLGwW70S<2A1X=Fz<VIMb*r!6!1W<2N<#D@m<D1eV9W=GwrIW$C`BPUe?k5TOK
zi;%b<NcDs+h^az=ov2n5aNP*~gy)s)cRv6P<9imR;J=?fvEF@ksatjsSpy-05)2!T
zNhOyDykp+EG;0tkq*aFct8U!`e?+p3K|!9Bva&#8oI9^6@il;dhQ;b|NJ}qwD4Poj
zJYc3FJp7qNVS6~A{gx#81<cF+KID^BG#4<jU+S-GLAOLDU=d%`ev1ovV6F}a?<#yG
zB7jE9h8&aGNETer4cI&_lh0okkQqKL!aiipPyT?O{hH6w44h#P89No9&M)o!3_Yzu
zNY1b*m8!W(v+`Ln`jfC7CQeM`mGpf5S^)J&X=CRD8nq0&$9$?Ec#SSid0H$j!+y8L
zG5bWcmZhwZ=V!VUa#M=~PBDUeTPiui-TpZmRepSNlq@zk7{p(SRPU9S?!>NnI>9PW
z*!c)4q|lhl5<SK43zxkZ3kb0IV8W=Oisc3h{XQbw#|-<GkQwbxd2YaBfM6f_%Mqcp
z+0_?qwB4HdNt8gP7M0uzQ&ovqB);BcJ<&dsMmW8Uqtg=JQSN5_`SvTCJELFcNLbPG
zR2jREz6bGV1o<$h2e2%Ys-!9%n-XK_EsZXC8=W-eUz)HSrBZh?-)YO~2bpA4cNCWo
z(SU7Ksa`(r_ZJaUB&LL-nWAXC{HNvf@Amimd}Aae=`EEr2%Hv%Hu|l+w8J$lz_I;Z
zRcfX?KNY?llG2Vyi2lnbBN;tl4|9uZW2E1rgd%5d+-btC!!{vZ2kwx8f*io2Z+7-8
zli$`~-UK-&+~brGqTqlhZ>rw8&J#bt!)B6#h+L@Na_0D;3Izqg0uM00#>;+Y;;8J$
zu)9LGCu)`{Cxc~uTQ|tV-lTW-yw@0?SO|F4VhJe}PfOF}6!Oh>&c?Ghm&UpjJg5_z
z%}b^Dp2vD5i!HNVzat))sm2>+>B7Rg3<di=;cG+=C@!+s`qM5WS3-~!6=aj;4mA<S
zqx1pv(lptyQ3_y(ThzvbIT)L#?g5y-`-mDH>`<ZOOxw}_@LPB%pm%OaNw&O4r-e;?
z@V==3*H0}7-_2cBtS%e7j^>%lZ?RIqa(3p>=K^=<Oes_R8yZH*WTbNY-|EY_bRRY<
z<sfk+h3>xbtKF@U(gHJXl*HBsiUv9XEGi^{-iLUJ{-A+6(L|y`9dp{-=V%R)sJfaQ
zEh@2eR-iKcn7~}8)NMFVp5@nFND3bqZ19#BCDOOPyh4me1th5Nuo=klvR_MP-h#dx
zbN3+Ap$1tk3jC9hKd{UWC+d0qMFq?CtIsruo%JOsXf#qKqq2Uz1SS^*;&bP@YVk;4
z3llE8+0c5%_e1i4Bp!IGrT1&yEaz#e4z&yLwu2(041z>yFNApCFC*8HHIGwte;SXZ
zU>OW>b&UvD3wRbOpI`kn$H(_tm~LzGgxTL3^R-xSQ3>}8#N)jcIMnbRom|)DPD-!$
zPXRWOjmU{@!yE5eBMKQpQWfGH?Lg5<6fMUW6C+0JHg7#uMd<CDyh-fQvPT#HY73f7
z;w?*;6TjHW4TbGT9``sup#QV4|3R76>?w!|BbP*%tW~@gd^p|ix&LMB{JWd~h~l0G
z-(*j8B)n*pmGh?c`bozK`F{H?t7V^#fCa^X%BLoKne%n^L2S)z5VXEZ5+)dJJj&h4
z8A%i)h!sOTW_-w@+kX><Uy0{t9aZ7HK6KQSBhe#|@+P$(35aJCibfH^!ADgaD#QVZ
z2Fd@%6`zoSb<a(YoFt`l+kea$N_Xi%7TEpX*NON{6JHyV^Cs;Ft7J|fF;RN<?ec-`
z+C_ZPi<l3~XzYaI5qqHW!t?p-+z$7MnYt5>35UPopujq_#+p~%t)h9mK|h9=4r(oQ
z&Bb#zNH`j<70)mye${^;t;YVt@+QB>3Ul>^;FZL2Bkj~@sh4yO%K_wb9<x8$Kk*<Z
ziT1nT?8OlON?ZE}Kf6~0{Tn_Wd2Rh9R;H+~HKqLtgr1D-@va}fHzWFQ`1joIfLNAt
zELmr~XNY{WW%moyBkfC>@M+uHh;6U@uJUl)jpCn%409dj^pSJ<&vyQ4;~puZO8)ra
z%p1xZv74Uz4GCL~jcFS<7M`xA-)MW64?uxyzP5B5xn$u2p^_7$HhW=%$1&S2hg@y7
z8B3Yc;HWB&k=svxiG<<{{*;TS@)k5`UDWjbnbNJE*-DQn7wwYk<=Y=^TCv4dU4b87
zYUGmM42FZRbLz41F~xwgua+iJ%ri||f2itRP|%NF9MbHP%S{$n4A)4N#b(aEmmO0H
z--ne2bUPT{-Xi67{pT<k{Au*mv{!Lpn}x&P%WWS={K%*F?``j2s?A=#9y`Lm)nPg6
zSK`$gE=ZqkD6A+=d%*WQRzmMU`)mF#p13j<AO3tFu{GW<A@O5mcHj10_}xT{iGPWG
zL1JA=1&ce(*E~0aIiQx&BZWW#9ww?{N3Sn1>K0Xudyd4L{pb_bz0iq^o?qL)>hmRd
zsuaw!4-swqaX0bd_s_z0*vY4FLo>w~0u&<ODV`D{bKdz?hVs#f?bRy3+Y3iZg%;M;
zmwV59V{cB09ToY7!JzEMQ$tUWgBAzrC~pd4O4(cC&PdBHwdL=%M>oTuK>OYe`J<|r
zqm@!2rVQwBQ_5QQ*}F=uZ^1M-ejEA2TDDF<=53~eAgcoFhsB$-jJ`v@N2RC1Wd01P
zY4*HTLx&symbKe>Igb4CdZ^%bdN-n*o*oR4L<heu+e*g5J}x@zfqEl{V4V&j*^Y!b
zSF6|7vAG^#+AyDk&;t*R4>XZ8;Nwl4eX@m-u-g6JWC<?oJ^?u{5Q*I8(T!g?Er;CK
z?6OjX8ci3liVxIwRKnOf^YHQ9E8a>=UY5C>+<@fF%9j#++1Ae;JJQT=TWRLiyB@^T
zycLW;E~d*wey-Q}2xp|1y|BZxpspU4r4hUJL|${po`;S|$Zb#%x3<S)<kOUu{d)W9
zsDm+~TZ#QSpM54l;kQRteO*o!sB*>UG_Sa2*SsYnaD{KjPd54cFifkEL-?dYHe40#
zylK26Fp?aa4oyyCFVFyBWyw-z7pWRn%*^|#p3)~wNtehvlv3!mWrJWZ9+EK6e_^i6
z`Z%wO0kk1Qe`*7PtSW@U7dMGiwYr8XDXD<u`Y@j$o^%n9tkdS~q|R760D+ZNQ0dYn
zrhdS!|5lf$UClYME?n|3Wqo}l_raa1rzB06st&y7yj|6H(b-MxbR5y=V{iNqtSKV9
zfX$u;lY8VLG{LXl$$wHTyVJc<124;_mz?!mUahP87xUx5K6XcS^N{VWKV~dXAxL)9
zWDU?Sa;U+eh+?U`!!?tWK7-a;bR7iORA1`Cb*f`c3>pB2fhu~+^%zTq+qE@f4(idO
zi>3gMGsSCRGmkn3GS2LK{#+@sEPT<|E`Up}I8J4j;m5+PbqiJa#0s;xdFgtG8C5bU
zm#3g7#iE#7irLz9G?sn9x3|mAfGLK8T@5&0uUHo7`J(JWgRy~d0Rki2d;Z~=J-i-Z
zH50z{^7iRHps1=U$(BlmaU!<iv3#Eu!E-(@`Qq?eXtOvgs>;>%(QoWKZR3~^<crC0
z$w=(U6FXw&ENzCFhp#UHT*JzOuRh85zU7)u$$lTqb>3pK;hoQ}eX=G$!phau=nNNf
z_t7_mP5c0`x29Ye2bfA<<lk#)Mm|{<-A^I~>Dw$P9`-!*DzdcRCU>Q(-9s^;l`!LQ
z`e(%zEsf5Qm%`_j>^kDmR6q#^uzajk%2^Zi1(w&ZDKUV4nJ<eH1TXqwbjQAs4(Ha0
z@@OnJ$}j@(2#E-E9WQZOQE^62Ujz_GQ8JfLXti@6`5U=oo>=m*t>DsuG=Ih(@kf75
zVY?_aMILtWO~PZ7C|-WlN1wv@lwN9yB$-<_W~Abn;K5G=b$(B&XAp21t6*<$$>S#l
zXk)X1bpoRpgWmJ1r`UBPc2uvXxSl}cgY90sj<-UmgZiT1iu*%i?rw7>n|CcEn%OU4
zmb!nsdmF!*XuUY&d$1)3?63;?S8CZ=<XQs+do-s8@wu`d{0Hdv>Au)c{Ec`iIsflq
zb@`cGqf=ti+H9TUvK=f5mOcKi#^%#^e4oKjPKo6m7Oq75`I?S;_g<G}^KKXO{vI|F
zyFI{=-0qF9$*y2a;C+`7@1FrbtIvrv9Lh~%D0qUnkg8&?gN&v(B?~{Cg)C8Xrqe_Y
z2cS^Lr(IDGDRM)RRcU=FEe5nHFwrPwLS?9U*4n(wnMvIhI7`wf%X>ZqQFMfECMO0r
z6-^Bms?KXX7|HgSH_7D;ky9k4B(Mv~k^D&z9=|=Wz@}rCZ!+M{RJR<Z#y_L-rK7<C
z{iy!$v(%Rgcipok7nAG#&<cyehbG@en;2&|ZlIn3ds$XlUKha8I&P%G#&UAn@<A$6
zj{kw)e}IlAPTw;K`~E`qacKkUzwv8}k?np=9k=?CK^hn#>rPmBGG}f!+nLJl4VezP
zoRBM+k;(eWrr{{JWtoCjnDDdfiRyn#O)^FkrEn1JPl(&cDf$(R!nu6{D0qEoV7Z<}
z@y^GUmGrgWTP~NpnL{oR@0*^NydeY4TRDp=8yif5IsP^<XEdp;NLzAA>*<4!@VUX`
z52#NJRn1@W)ili;E82mGLWE7LLdf4)Bi_`@gh}U_4!z@O#{8P(p#yRNV2@-S(_8_;
z)2ymWJl~#H(pN<MDjnoG8g8Uax)bB1@>^|<n4280#4vC@JYqG1YlaXqzcKk}npOgo
z-`RzeH*O1lsD01k{uUjP%XFVPZBjF<;=+f{A2{8>%$-DWz1tsO=C>YyIG=CgU?yi>
zB+GS7aq)+_Cug5VL_3@~v?vATWo<e@cDQAfHCMT4fJd7cc2`m9HV-LY!D?VrC>=ph
z`Zir={;nNI7vL}+lxva6+LnB{b;L!3&^q5$opc?KcbJ3mO2o{;y?uAI3h${uV6_b-
z3a12r{YIFfJ}muI{dxRS5)BRAe*o(j>}@_4+pL|kI2CdH2>j2QnYM#VVn(lRn>JcG
z8qDz-yZT1Qo|oP_a<V9;spN@4{U!X8#Y2_+52E>`STvdA8C%q6tGAnzpbXyeNS-5o
zxdz>B^d1EZ7iUqCuH#s7(noKDbV<iFMd!wd=gGXOc^ohxcu|zxHxdrZ-7g66WijE`
zKMm{xVpOi(C|dI06iv?z5=vvI$u(iQMGc0Ttd*4(fxW5}&><D<uAaGS6ZNlXKQ3@I
zh9i}%^)tgQGlT3#3Y+;B);#JvGxO+;Z;>n@%UEJl@J-v_%@Q6mie9#-L2%#oxI(7!
zCP2OWMi&4XxCo8B7S>|?43!kO@}}d&HA#V1pJqMaKTNg_l*P4&iBC67Zx=;+&ZTCh
zGyxGRDtpB?-RHvB;wbF#m1~+L1{_OCPaxyQaQQ8Q3Wj-p<v*2*_O_FtuDp%ij2~+<
zti`O<)jJJA>=9a?E!Vf+ym-z3eh{=TOcMii^^sk^d|eyU7A?^Rs}p5GhQFi(BYpJs
zGV-X_$#%VIhDtN6e<38~c8{?oP8l9dk4kq$&z6rVN-#wY_iDQjvn5+#vAF6jg`2mH
zTQzWKA|sf2J^;Et(Ey10^X`8Xorgc0Umu1;Y^gnKR-(2VHDc4+DmE=ut5#8=_6oXa
z#HvkDwQKL9wPQ!^O$Di0Tg~5__g{EE&-0vfzURKL%V*zI&>={kghAmjK4P>8eP$ga
z(MtIGvagP(Gav!sra^B-=!h=rnjro>&rte74n%y8btT{p$hkmOG52TE0V|ENb8B4>
zPa|DUG`@-Z^r0&srC28oE!FI<c3znq)pEbAFQ;S5ErYg+y0VDwS2>z4W*$LmjA57{
zF>C6>NTsQZy4*CSV3$G_GMZ0pV$C)Em?iG@3GQX9BYux{q~PA)*sRf}dMAkl8@p;S
z8?JO<4MAdM-{bA%IjS~*z4)u44k>Q|j0SMc@~aU_0r+gHDh79{CubjfT)&2v6(bq5
zgK>pVTasQ0E_3Cj@@KiIzTw8_bCCkMKqWJvR&^ywh!=G0VjO$+%5(1JqLkbZYL=Z`
z^@&1<IVCK|Xt<gblx_8dyC_wWG~45oFXHjrDve;m+b?ENx$mf|njRqc(p;J7^$VMD
z^KuBw^dV3LAthlL?3=hyVKOW`8gM{)L2xv)mh2dR(~a;rm-?G5R(;%$HK6UDMl}EM
zh51!OeRRbVk$L;%_5;1v!!GAFPDsWC0DxwB<ynOrr-Q#M*i3*zjxh(}i!yY#2>K5Y
zL+!Qw0}&E&`iF?O?c*Tx=RId}8zHfdtv@RDLm7MwNkN{iQRmk%SfO4y{9%*<6R;@a
zQx*GWD(@G(oM2_}uKmmks{0{D(kMR#|LD_NUB`~U7vl<>>Y{_+Snsrl0I~n3=Crb0
zfY_47g?S9f6YeY4{mr<WZooOfhgt1ZiR#+#rs_YyDj|tb{d4!n>o%F+&kbM4a0@q)
z-7ENK@NL>nT;4iP_ru(nlYLu(Nc{ffsJrlyKhw6B@R7^z{ZEb|0UTHmg3N)q<f4X<
zYd*y6Jt9mlK{v<<$8u;g&IR>maw;Dtqa^aRd9tA;-RUihxAemxC9?EBbj6Fl^F2bT
zhP05ND2xoBI&ZS&IWQ~>=Lqz2c@wX5;H$)1Mc+TCQrJsy`>H&Rft`!s;@|!UsEt5|
zh6K-}3P~rhO5bMWEJ5Q+$ev_y9b+3lNml@wdA#k+I-V)-g4!Ypp9-JkIe=H~5gi(G
z<N|N|Zka!ITKG6qT<eziWuoi1`X4Yi-kqLnJU*uUII515xnT4>usr*8Qyl7#R{mF0
zzM~>A^&s~KY%;TdzqMH?@u>3bf;p(Ggi4X>#^#0)*jUZIeDJ=9HDG((Kq8>obJl+G
zRQW2za_2!eb`G!pYbv~(N(3ZylprpBd2AIToFbDYxt@KRtSS)U^7`NX{da{ya?AXU
z@7JD;T;*}tnWA-+$gn@cQ!WW;j@&c9gW`AJrkA@$1*cf;-$Od=$D&}W6=9~oBi{Q5
zdzR@^#kVdfF>Yng)cpAlm@sDQdCSTD;dCUxxVz*;p>$m5XoWVAW^h_L^}r*UAjFRE
zCf~Ac$`91_Ky6W)izTAIhFn^jbA6WVbD#%24N|7OjL=)Gt<Rw_L&j|l$c*Q`DPcd$
zG>Va=uuJa%1jErwEtO@z?#h3D=8K_XMXBWK{c4PKY!W5@Js>bF&v}k1w5pfAwU1f=
zXS@8P+*hUg(l07%Yd2%rixUmBUG$c}KGau9ffKoP0^LX?1=ucqW2fSr8$P`9{9L^%
z)Q|D{iN7#^X&s|0B|_+-S3$B*t_7*7YIV<^loMYVbb`KV>0%YNfA3hl%T1%vPC;?F
zZo`a|0x=hB6;HR0^{In0D99vMLLexFH>q*z%H}Irs?kay=z!>2X!efa*Ot#YtIR-1
zDjUWC-Y2x|bkx`r=cHvD?vStk7wNkzqCowz@v95JnG2P4@;)K%FXXTce(PltG_V`=
zaE&z47bI{_SdohJI&nK@B$scFYrm<d<9u>6v<QIqcF&B)<n&s^k+v_UN^hvWKFVTH
zd?q3T>CS|k;F+$-6NnAWWssEY`Bcvb3g<d}x<|+g{T8defH={9SFS@&HG|Dw@J;TT
zcHSA1Q<nZW)x2kNZ$m3TgH^PfO8S)RgN*R1gmxpd>D}b};coJZuslrrv#Zy038_w6
zs(g6Wk0)DZm7d}P3x1p>-?SP0I(7&-#`1%bOzP6LkqI*Sd-{ygC%|i=COa;f1AK^x
z_}|Z31?&PdKUE7Ul=?XQFWmF0sZ8Um#=kU8<bR<10hH{gPQX+T{1JBJ*V(Wddss$s
zVMYGpb%p*h(XXX>*n>3UG@*g@>!0e+j2`-Ux&3-k(#h5j%;!!ab|)5G=4Xej9}o%r
z(B`Dot88MW_5CamaF9nHIbD_6@icSuVVbYTx1G^3SsWL1ua{9@thazKe3$2k0#`G%
zbC;3;?y1yS2>95A6ZQ7ZRTGxYl(8UOdJF*;iFW=Pc37f*=ZkQCfw<<;E=Bi6aQ~bx
zN_1#NvcFtq%qHp+;%|*}<Q2!`2&Nfr+Y>cAO<t{@A99RHkYC4WV4?Tj<fnz@6dwUi
zOOK8vb`=hvWF97JX~YomTjm)@q72<^DQNyeN)~lVCuuueW_BzJKCK^ZxTZ5u3mkG@
z5rCp&Rn-j7M32?$+<Yuk9wo@4TF%eQj-U82zN!Ac?;uBTB^6gS=scUBQu?^|(g9N<
zl3S?Zl)3hYxc8{7^beC`v2DAuTWh4S!3R9DWN>{Qp&dTAjyou+<YoiYXRyi-X=Nw>
zi+J|5D1$)3r{FqzrVAEu0Pfv9F^}?;H+&9$@!glNN}wuSS-x=ijCk1pP>?}^(-8<j
zqno!zLo8yM--^14$o_664P-A{wPif}^3PVq0#^*H`Zwj$)QYwnXP}W9q>)7}FHXtX
z@!pM3!oP7MhfvZn++J{%-qn8~>D0uZ#w%T_8eg^bjODOP`dH3ZZEGjKn3*4&A$);~
zjZME<0~8asrKMk!x5?mv&l~j;YeRb|mE||TVSVZR?D;Tk>+g)Q6HWh29`nET^1}&0
zjT6XK(QbRbcORr{H2*PARtiws{6r-E*OjVMT*W3X9s46f;YD^SYTK4Z-gJQNk9DQ$
z-E#h(08tg}U7^=)-e$Dj*My0xOaN1$S#tkQKO2Tk6+ey;Ck^sRc#y_E!~*eMoDy-$
zCDcR~W`JI}h2!($`LHtG$1nJ}vp((ypKMt&EN?j7S7TxbT1t*mCRbU!HAB44B`F?E
z;%X)bLaDQ<nl_*IMXJwhY19A+?nPOKcgvQ%3~<EaZ5vgh(?nAoK4=$zG0}VnCjZ{g
z1pW?Wb)fi$7igsEonOQEPP7#m?6{bG3%7u9;8b0tbl4;L$*lY^#TPqI6EOS>sa8cE
za{Qf~RgNntQiH-ugsZjnBhg_Unrz>R;t4LdUs?gON?*0^y&r803r_*DoD=R0%7m){
z^!>cYSe(9cLF<};g#gic36Oi1d%6C?vxLgydZ9{WPr8Q!qyZA-u|3)H;2`bEi%d?8
zY`%q-ia&`GZX3LcoR5+fAPf$RCsfC)*Er(Sv)=D};{}RmxZJJx5i{aPx>rTQ%xa2?
zO@<Mdn_paVlBHN2MzW<2PjR!Rd~Qz27#}9zCgqyRiGY4SV<JBfuOT_kqbID}BwD%#
zk%h-J#{?e>7XtGvMf@viML}fL2^)uRt|O`d?e6M@r*64*lOIw@Mxs9@1!00?-5g_-
z27u&uqFMwH$^-ymGBIIp?35#$A+dE_?*xzv4tu5G-BHQ6GLf?CYr5g|!DrR;USst|
z%ht^0t@-Prwsi6a`o?8{s1ke!6>$&dEfHGkIVrlWA0^9}izUu;!&!d_nrtQTGIB%2
zh8Uj%AMrQ+^-B4`BMHTWXBMW*HD7tDxBQOrfwDnQ045v6NgS-tN2|DLf$Z|iAtwU_
zCe}Zp7d=A{r~@B#MS$uvXmh@~GrG@EPllx#!o(gqvaQH;)#h4_gr}q)sejbaQ4Rnd
zz_yY^E>>=ul^p*AP{Ym$!OYPdNId!bdlPNqr5x*FdH33ydHt|i-j4Pwc3ZLC^dj1Z
zMKT+%xgO#Dnf6Twvp*ef-wf)4prSApe6g3vNtU{bW*c0`s<DgkblwoSUiU*u4-Use
zWnR({Uq}k??|YN!o}TW!uy!NbFodd6kdxqdCSu2vYBfz~cRe9->sBeB5Cv%hsPKKt
zzQ77njU?&*PF+0G7nOlMVvh4Tx@f)f9Nl%{iT7A*_z0625Lgap&A$E#yKR31)==wd
z`aIHN=J<mUXtgo{Q<<VN$R}EG^W`0KWUe@Q+jIh7<c&Vw=Ht43Gq7V<OMYiWLQH3i
ze<g>3tbYMb1iU^i@v=c^IAtT?7{WXs6=co_bQ4{Y900bQlu!o6h{|JNzS}UKXMhZ}
z%e_gjj*dQsh+Oy3$Msn@I1~}q_VoFq>!E8!7$L{lVbWC><Q~W)VCdR>SJgE}E%F2V
zkYnk|T7mbUA`c0+4kh@%ld|6#)<r(j*mh+v9hU|!Xr}-;vQPT<2>^^$R23lKM`+tj
zaFg~sgYZgWx~FHwy_`u36dx_zC<IjB1Sc;>qNkLG=)x*7RfEcEH?BmV?tTq1^RfOH
zgez2iYr+GlvR~jnB_7Tqkvvs4l!LESSRA2k@>E4=41*x&SXKN9Kr2c6`%|!Eo!fwt
z(+Qih;(q|)7S{AXPX|jm34>Ra`pJfOHc*GoAYe@=$*rF#(&Awpf*gvA?B7K2v;%s=
zd;(;H@WniOG2Mz$AHV?6sr>d6;i5?;8fySgo383$wtBY~;=mg=bHW5j9(`<W{D`aB
z$Tw>FANHusf;u#@<fq`V1b<sjr<yWAAQux~XgxRh?Sn7?AYl8W9_6pY{USvlNd<7S
zGGf;0$N2`Ep?Uziwrv5Ba4umU5wO4EFk=(It8=Gg<f-5D=%N0_7R*m~I=aN~;JfP#
zOE3*m7+uVf+Ni`ryoNiFGn-7&P&z5Vkqdh1f9vNgNw``Sf0Uc1e29e-2z>V>KEc_r
zcbbWI7BjzXF;rXKI_MIG|5%AEejTUlky9YRbphSFbjT9PVD%=o!X<B^a`6OJ(qjWh
z#Sg%IP8@gp`|!`~;7`;E5pA=$LZ~w}JC`;nJiP?{*eZtS!3eT3LS5}n^F_fChA4)5
z0X&VCW1#YaR1H(&<hQiZ14pEbhT+aiCCdHl*}-P{T_tK#5;QPw{5*o$Ac@#Fs?A&I
zi+K{meG+aBM<|eBNo3Lm*PgJ+3shY&+d7I>k5U>*q6*_@{@(&&CCTvaW&;DEC%sQL
z^ahYg0ZHm?T{kL48T1)Z;$y|+D8jmZjbQ*heSeIM%-tZoJcA!=@2uiye#$82c7a7(
zeYCV_l}y3ZLpAr*yVmilaoW;Ro8kTlAWhpCX=<DmIXQ|ZB)2QyXgF8MCL*Xc(tP@*
z>lFAx9k+RDo=$VV@J<PyOOSEiqZy~nC5avjEs(jM4F6?&_tTmGP19*QuT#9?l=Bnk
zF47A^0Q#66&_@G#&=;lve=(l?+Q+9mN+CG8k2G95qSN*V1LT(d0E2m=EG-@vJg>Ra
z_W>S@m(sAhq+~+*4uKq6;NIs!X^-w6o_l@gu?m%$+LICEn?8C-n4Cp#giF9XJFq-C
zAq@@HAupd_H4z^XWk-Bh$+pC&?Uo-BFZ8O?zPTt!9v1Q{L3YmqkpwUN_csD9^G{zc
z9Q)pmk}CzDePQ@6oIG{{B#>>&H|o{lamDhN$JWLpB=nva@!(|aO#DXXX2o3O%fuLE
zb5_EukWziWS<{T3K$sQ+xNxqYUrrS}KGGVrqHE~ef{6Mf>BxfdsOEfq{o?^CzM4O+
zpFFYZ*x<y}jY*wf+K6Tf3MI!%VfpoxQ3L*<*)KAfK?NN9Nm)Ch+S0J&Xc*O<XTLL_
zx-|6#w0NiI!d)X9e_Cvi_~rIcXFwI~jk&~KOc^uwUwu`19Hgl8yYUvfS^6T6k$<@F
z(b;>+(pA!dML1T~Hibj;&M+Y*^>$w@5uBJ?dUCd<<=K-pIlSL-d$=G>rr^jI^E_v&
z8^_L}O_J~<x)|2=e#S`PiINs=`jvuL#{gKh&`ffRW%Om%9)s>V*%8(HDjgFjF}8wl
z1y57iud_(N#X&Iw_Y1?+3cNHEqK|{%#67g8ktjmjc%HcD0n=*KZY=F6i;^U+Sb$)f
zR(UFFFK}=20T>e16Ftivy<G7~?E34#MtbCni&x!_$m_P;;|pD`k#!FP2Y%dN&rwBC
z5}B(9MQW&)(q}(2&pG8$WkV@9EaZ#w5sCs3VVWIoR-Lh)n6wF#`F?5Vm_!O0x6v!C
z;1exRdESwNH4FxUF2@$CnH;RD^mVFZqSoIZ!<&E?$rt7sJ%TEO_vV=pgKV-eLQnd_
z)X~jAUbNx^hB6Y}sfHmgNY^nd<K$L*xw?MJi-%s9Sus_jc^)q05zV@+-_mI<YmcLU
zJ2#QEdQ!*XH#kFh+$*STtQ$A#9XCCP5`X}xDB&;tj1^v+%)5|!)v61CkA{Vjxd9R|
zuUG`;L_XUTrw0h~5>n%rCuIzaBi@^yKkUfg&2<Pg*)Uq79l;8k?7}@!Fm_<Oida4%
z4yQ%k?6|4KeM2}>eu_jxCW+rStC(_nQ2?23aaAuiOuxZ=sGoI$%RsEY^$c1*A$Gwu
zx2KM~!O?v-x@@M$tne|0!0RW@n%)VR+XVhJU&oE5QT3}lzdcRFBLK}prbYptgT{yQ
zmL476z-f%(-t_WWA+)72_+G=AalJ1To(oI<$B`WzKl93H{Teq?10l&ud?&_eb)~bj
zJj&a-SBedF`o~UAg1r7)yOJjV0rD~OEc6#|>3qjPjFXd6`ta6sqmHs|iB>{GIcQWD
zFmBx$;%&1SSuG1B+NKHQI##2E)CT?21wZLw*(R?fuM9S!e3`(afgeK=;s|dr4P>KA
zeRl~RB>=_?0AP%bG5GahPCMmp^gHS?gdtQ}E5wNGWp7+NAx;}U-pwQKL=oEqs_7V^
zbbDP4B&`z$sL|;64+q@}{80r>XAj(|VU;ZTTy|uX`<pwb*I2TCw@8Ct+l@^2mP`8?
zDg4*GwKQ_nCbH#|9UuhJ=CU{y^zpb69AzosPCQHAa=$)xdzsoEM2-Kcm_ZkbDaHRZ
zbpMn_pX#L3<QpZM1oKx~r!53Z8>Cw3Rc+Lz{r-p%5B6O^7v=aWc^KQWU-Bf<1fwOC
zRT>;N=PJ$GXp<-}k~eIxSCLmPKMSQs`+~l_YT-8neo20>3JVuxZe@DzLih2y#co-y
zagAVixc!l$@kD{I?1<e`DKB{)_Xm1u@u^{Qpf&sq%Wi{=w>kT=hZfNFg1Dq)`S&6n
zA&1%AhzLDE0e{0ckLrso0%*RbpS!C(Lo6Z4`*o^1b~yL}CpsnUcIKgaj#_->+B-G;
zsr==XQ%H<emNU$p!#i**w||UGrZ-v_EVhni*uQxDDuLV=Yr56@lE3{UGTo}grUr7S
z$B`)BAcSV>*V2GgZTXiP2PggkATK_J`=*RijzcS3o6~EkPaboWH&S8vWVL}lfd>qZ
z3Sh(<YT7L?EHCoq#n`cT2m`JPNRa;h9WskB&qiho$pY>G&cp2F0qoJYU-qJd74DlB
zUQiNma)96EWb+q~pvg;+rBtN19Oyucl01*s8$MI|tzBDV{N7Whbz<L^8`#kwm7MYk
zLjsv!y1%&e%u4~E`Q<EGH<(*q%}iBVVu%ILW<s&E5}O9Aj?Za$K;e4Ms1K*N(d~3(
zzgM@_aY_L0VM4VJY6m@wh*^CAgBbWCj6dd2FkxRk^8$`_PZKuz=VJHUj5EG?XT<JB
zp!?_=tuPxANjce8#|f^gQgKqjVMBXk=F=_FmZh<-8^mMNg#9|tX9*^%-hn4D$A1VN
z7Vr9Jw&Nh3N&L@?RLFJ{>pA^aLuUzhR96F)fl{OVSH?b4t;8%tuff2`mHFoKc;c|q
zY2E{EPS1KBV-(F=h$CcmHA1h;j8Q6u35!SlJ>&d^8|F|N4t<+GyQjP$+QGax(H`_7
z=0AWv+w$DzFFr_5cZd{|o$tcT!AaE?!;AM7o6`F1N>Jmt-Vgr)Uhus0Nh3fvJPY2o
zSqwIZ9!ObTqW|sP`dYQ|xsF=B30J-yULg_><#_0CDZHtsJvc~Y(hPC(<N8T;<8=_8
zYA*Z4yYJp$(Sc8SS2V&0_F_h+u<%-?t|`T7VvhhL@a1Y&eXmGkC||kr_!kS-)ZUNy
z=ONpIC=s6h1UKJMsQ-DKX)k~F-z%+&@k1w33Ugck{Y8%Ak+E#l)YgE!n}&Mb;35?t
zFDVKt&qiJxjC(kJW#*ccM^PZzGdjqFbOBe{;J}6cnV}PGXx6yK+!PJEc7<r<VfOT9
zUw;e?%R#J0<=8KZLFsUwGl$E)t{Xo7O%?UXr$s>Cctrh`8xs&t9+1|SAi;XjiAQ}!
zTI|(pGw6$yQogew58?_WaSDT56cEOcM%%CGVrAi-+>S!`3;_Vpctgdc$i|37zfw7f
z2A_Qk9r0*O?5ObGe1uR+S@%)L1IMfHPm1k#Yu8!;ktKv?Cy;Q}RDnR>PukoNbEF_r
zB#E2Em2yv2@wc&fjNRh=wMVsJPughknei~x0KJa3XI=?`@!pJsykYhoXkv&-4BY}{
z*mqLK!*8CLs9CtKOYWvP==7P%%0?sKoR)rlU85mzEH(-uCjkmH8cIi-URW4geP}y=
z>7!z%=<jq6tO^C)ypnyeNB-THuIn#}C%`8-6tjbU2*6e^Y>S>-vbwK&ftuwZXvCcY
z6nZM(<<4A_9Ow^VkvLU=m*8cY$d_k!57U?u>#?NM8dh-@ls$~M#m5eR|D@j%WfmdD
zwIalkUQOcTtMSOS!Rz+r(Gx#GUd}y{cgE;d`sVoCCgy6FDKD!y;Sl{dADvpczJd<O
zq<nlr4sCAQ{QciKMJZJ>65EE`z>~t@y$bl<G<R^esNR2oP$AwXTl9|;-iIr&miZZ0
zaiq$bkKE5OMs)i&C8Oo{Ci>+kAlHulxaZtjC#05;aGB>~qV{}4hV_|GWlJqcJgI)P
z5G3)a&5AadM=8LUog~$&aUYVMh}JeXFzAmoVQl=R_l1s7Dt*)GxKbI&?00fi-iT6_
z(mIB4dn`b~O2qPPf1^$27rULE{dCogn53@@l+ODJH9v88q5RC>N^|>9Eg?{H)$;)!
z?CF=)C$&$VWu15JnJV{MQE&utbR@=pPv2WKFL}2tKiy8cdEmUCto)J6CvRYHi^RoZ
z8;EEO6?{Ty98TR&9d}!oN>f!a(@weY9m^&lht(7~>?SUJq$spNG4;t!l|;Mp`0I@%
zjfB+9X^*(<;9&YBpYR4}Ha@GnaJ<t-3g>V37L|;XZNmt?l3zreu567ol92=K9qaLH
zUpmy4H!tA8Z-zd)<TPZ`9awgrLW3lkK}z0Koi45x$EcoQ1_iS?7f*&y+09GG43=OL
z8r&cE`gpF%O?^dQPRXRQah?nWIjDo1Qki@_{Z5p~M|HF=$zt5c^;R+*Cvf1LcRFVT
z)ua?;)io$jRZ}?z<4uBhY=>9`KmV%MmHY5phqGih>Bc7pZ8qFWgSm5UOJeRo@+%2b
z(QkCsOXq50W4D2&UL6X@-G7jY?lbq^2eic0vN1?~MJPvN+*7TLXDOm;5A^j%H4ev4
zu*LrY%IX}f<r;%3rp=N}3jEh^W(5+Xe3LH&%F@8YX@kdSU#fe82*CSz`vK^x*@~JB
zuDKbtfJHw>dQp{)1Bf6*9jAM-U9FSIWVz2V(uCJdVxuplW}6r#amV(FLWfOh9a3lK
zJhr!`nsuWq`xvb*0N|WR9oqfN)i6#tn*oK1%ooEb20H$Z+?}O*_O7q_LAQ9XmfC2u
zrf3Jv4S;P_h(*Y;d%)+JW2y)eq2PC$u|753oOEfDFh6+67j@3ycn1UA*_*Eu*F@H7
zx{$3Cz9K765}_eUC^@-uoIWw#t=apKQWn7!pIz;Hkt)TUc(xtObGD;u&L59q5M<ul
zt(FB)&^A+;^oXoxHTvG2I<3PD{TcyphhlOx!lk%KMA10ju$@D^@XdT6iXq&`$H$ve
zKz`KqdB=Y<H!%|xw#&ZYYDHZz*dJyHN4}}->oetJdvTS=vX$#`Y3?f49nD708`=}V
zlji=t8pdHymq5F;+jBY^M(ch=kIziq6Dy!JS2vOZ5bie}3%$bPs`iIxg!mW`U^;Iy
z=vv9VCa?Xy*>rY0j4E2w^PQV#md7Z3utYHk*x;TpE;`$Lrh}GoV-p-$LjOScpO^bL
zN$TIH%Z|_ZV3?xUvoydKXPE>?chDZn{G@6xqrY30V#6{p#GO5LSMyAGp<<zhzqX}I
zoDhYxNNM4NEeir%-~s|FQ?|^B-nx#-NndGTUb%*+_SQr3p{}d~1gxB(*j*Yh=*KfW
zb$nJ%9!kQ{H`l#FoQFf+oD&h^lGiJvOIx#4_imB=(H~8B%-v5B51fCYZdB?iYd=AH
z)h)WY!N4Z2UR4+>h%1^?!h@?Di2j)(H<~)_umR;HBX1;l&2_jpgC1!kL5XPD<M_}`
zgy_f6hI_LNlwAiz1no8~_GC6&qCZ@XTtNA|WAStW{q-)5-k!4jcEshBge8ZKpbLbU
zay7zmE{{R%Q+eyhrWA*^>pbGQQz)ky#k(|Yc4+GlW8?#J<&a}Te+J2SpPc|tKd0cf
zBT}>>6T%m+{{imH?kyT>g#;5&v&~J!uioa$gWs_&VXA>#&Fhmx;K*9r;3GqVjs4r7
zuap!=sF|yd)odDFU_JpI^2yC&bMd{U7D=6~bV3+3kKV~3A<0Qi{=&NHcz`fEc~}h+
z`>gl$;{}43-ZU(ha`nCuB_u&h+r#&?SYtwzE&V|n9d;x-*YL;fB&ej(l3ZGa2s+;k
z<PF%lC7>Y8olVZc|H2R0ao1Pow0vP-=T(kikZAOWqQKtgsI^O$C8+{pe@TqU1TW*{
zjUdtV1gnav(CamuQ$iDRyjJ|LbL_5O9)OM3PIx`fMR-GZ^!J27g{hx)GpHu|T*vDQ
zW)OU+c9+sy;Q63c4OiMd?eNn~3$?tLE28>z5>mA4$z$lL;4Z7o#U7twgzp%E5gvow
zxf`S7*<z>u7yENVE%RPOLwX;7Mk6Q(!-<=S9g5W*Q(AMNTQ7?O62lC0Fw<3qiyuSV
zF`Mj0hB{~X$jqo$@9P6c>C-t=Z;8nv|DU?u1-xNpC`;NVvvgHchhiVCJS>H$w+%2g
znypu}^Iksi$~G^V*jUbb{7sI97eF~0fhIM{6v_8+7~Qf#5=`Idw(zLP*+y|-@shcT
ze_51@J@)l&gWMfYUaR+bGm=$%GwzmM;WoDofmGe&G%$kVx?N#1apX>`6pTY>7UYEG
zQanb!$rFEN#oLlF2#M1cy&cRuJ1z4O>*{ihGkh8YaTFz2{cT<Wk;F8xZYWD)j+71!
z<n&sNX;aCxNBVSBK2x&TTIW6#tL`pk!`|~px>UKp7g`vFLI;yDV`zCS&iJ`4j5({`
z`VnK@cK5}p46**^=jX_Mz@1UDkX$c8_F}Q0{f<ieic6oIh%lu)CJiTWW)vNvseJ+^
ztaZx56wK?%vSlsQX=2G^XSmD;4vPN(5rSM)9}+ktlGUWFAK`6?YYr!cv&HxOO546A
zWm#ntwbktl{N*u{Tqt%=$A<VGm6#(Nk9xAv?L@?1Kj|Ltj}nju0LI+U0hh_W#DYBn
zpNv4bH%_6gG}JCl<4wDs^PwbN!BM(hk-6CAAF4Mcs$Q?>SkE3zyf42}51i1S5XY&F
zxw6!9jM#byQ|#u^%Bs$Lmu`3c%*4*u-O_mcD_pZ)$h{NZYYVCy6Rmal&~y91ynWKf
zDPBrMaMrp@r;}JKZP9|cMxyvontcs?XYM92RQq4nLDTB%C~=j0p)Q9kX}{YUrl|Ex
zURescv2y-4c+2WI$0}+FAp4m^J3n(vqyLZfV4pgd`nK=K-PXh9T79h_;6sp!)t?$V
zZ!W(6?=644C8^FAgDsEr5B1ly_t>w@0?%OFp@D~Fb!%ZJ{t%n(G+MzY-TUfv#PVh|
zvRY*Y<L&XQGrKEQfk_);n+<Q`vfQPQ6VU<iS%<dm4CKaFW|VOHoH97S;7aXw;YAbq
z-blI5PfjKKvZXDb;c@NX3$!O<_xaZ8SVp<ZdAXQ|+7bJ1E0jN9^3d(1!6DNls1NRT
zbjq{_mfLBa5wpIqiLbG@w}AfVK_bb=G*<pRDdA<;(3{+cTnzK7HIEo{%Bw%K?+l!N
z1Aq9Ov%c?8GWdc~^`Q#+ZRav)?UhPFspeIOc1E)hC>SB7j19gq`sa70ur<#l<mu)v
z`@L%a*CU27-420E%Smpkf5u<)te=9r;&YCQ{oxoOAp*T)i~sWP{<6?xoo^iPR`+;`
za*ua<gPE$g-YEQ52V<@!5Bl9a-c|J50Q>u-6ue<FCzc<sMI4!Uby}_8%d@S*XQsdB
z5DxVZZCI0C0>A<@ThIO4QU3ul(o&x{_jxPKI255uI-+3>4Uvwhm3?BhMJY9|o&4DD
z;TPifZDH(N|8k$bXWO$w)R=Igex2N=)VSO9*ghmOv^pg}Eq_SbXe|fX`+TO!-l^nV
zoGO!}RPy*!|B%Evw&F!Y-8)Aqp~owu>Ufo<kympUi3MJ%P(VMM5t~aDCw@oGs-t0I
z8QQjz#SU;Ou6SirAIl<R<$Lb0-A%uPJiIjTP1(;1b-%v!mcBfBIIwTu7#idfVSocF
zUmjmlkr^F5;CnYnO8Nn$qo{5Bv&tPczPUaBXtST1RO!GUcfn}w>gDz2fpEF_cnuD4
zybU+%^klBj-IDzBw}a#R6+ZX)(v<ki^WH$*s1yq!XZk}*H5X_4)nI@0haG9H&eiN6
zz|NK>e@&**eZiL1x2CA#2B<EQLQOHjK0cpt;gY&3$N+g;$CuJU>eCa94$f2^tLSWw
zJ7-=6E;OnCGdFdSmdqL!-_>H3$L8TrOTS2Il)LxmNe+=I#xRYsg!awe4_M^n^j721
z(}jF*@vKHSTL4jnZ7g9%T&6Q#dtu~6P^40=(=X&633)Er@jH_+E+`>s;F?#F&J_D7
ze9l6ET7FIBOy0naaQmO8_i8f?1AGs#H8k2_&MRNb>5v%k3Ohv}&h14O9QW66OZT1*
zmt#bB%Yes$<W9U^Xr7C<sNA=j$NoZgQWWHX6L!_{N?kXfR)d#~(eD<a<j~b~nPA;t
z{#l`AN$Q^2;gB2m2FyY(->(;T_>mXs-q2O!L6TbiH;F9XIAHY<r{DFTk3%H+XZ!s_
zF6ii%YxlRTbvn8<gFvE*R7@2h%KadbKS9X5OlrMpC_7BqRqryA^Bf*D{8b>G$O(K^
z@I#F!{^6hdu3u?|`a6FsxAcWjIel-Kl&Dsu03^Ki4wKyZH@;vSRGuO4L(l+3?sXK0
zsbz|kxV(m%co&yToUVFD=oJSrd}nHmH9kH@`h-~}sj5F=uvxSv>CUbpAQG``oHT&m
z=b!oZV^V6)A3YAH--{0xon;dH^tg{PgWBH8k&PMh#Wg3ieU+OGV47=)kImiP9yUt>
z<@!BsOj091BHTDZKQOYqOw<7ad{pu>L-Q;cg@OE&L7}83S~}R@Pnul?RNQFFm`KgQ
zkdr@($;Lz8dn%g=DI)b`Y~1bc4^w{!^u9&z|Bg+dz}Vc%?~Uh2mb#{~jIoG*P+jf>
ztKiV8FP;T=)J9Z%eq5|*`r1eV<bslXEW0j#W+yp7f9lwQsbcCHti&p~D3L&1qHk6P
z>yaL0Z@nDhoF3mKkA<+|n1$&~z6PnRPak`pPa(D=UQ|3(cO6@U99^uZ5_<2LjVI2{
zch(m!Y>=TnjQ{*Pi?@OEf+YF*>0C?k_KR!jzqB8|8{M)5lxS@eop7#C{xW3p3Uo9g
z0@@E?419M^%5q<|3ii$UlXY;Ifn2W7zb+%J{H%V{Kj!c@qFCk2_1#;^bf7K)oB3-y
zvq4<!aMj!mApcx9I4CJa@R7W#Y~Zz2&}m`o_xDSk%^V-@Sv`2Pz&^r4+!M7lc9U1?
zh!}ob3P#CuN&hv`njUX-7(`I*^{Mm3IYVU6K@a!>{2|QRypi!XG+mY2ZsmEPECwl`
zNAc<L>gf7?(vZ(CDUW*uslxvn9Ci>kE-6dzswErYU2#8$c<>c6Ur1-MNwfF#P!i-9
z&@anm@1<l18G&pkJBezv4NZynD9ka&%?X4RzskPXkfYz1(`~cKG>Hhh8gY3ev_aoB
zcobRyc7x=0qf{Eqo=FXktMxMBHn(B;`S&DM?)U9Ezbt9VdBUTU7jt2HMT3sW_d+!=
zDuf^vEl}AogwWl`!BWOlbHGjaq%pQqLGqVo?q8M}SyLg7Qy>3cm@V{ETXe}}?V;T(
zePl6xi++DsmMdYUHk@x0&)ztwafZ0e%-7vdGNnV&v#dg?3Idc?oo?GE8f}D3q2_G!
zTEUm$52q1^+&;2e6;a)9K1E?v2o)@IB)p8-t|R_4@CHuUvj$FrEv+QBKa_IHl5;v2
z!RlCh#CY*|AbDOtdndsovRy>V9})@HBKEY+4nEt$FwHSr1&PKaHwk}5hK0Q0{tqyo
z0e|y8VuccE?|T$|Z0Cn9dh#qOOt6}tU8=A;5MRAIxnx5%12!;tu;dIHBnLG8tUfLC
ze!8UZ&&^O-dew#DY8D{uDxnn{Kbla4s>kexcQk-l(eKh+X#Y!w%BX+OH`%&;Kmrs~
zeVV^djJfY({uXrDOlb4{Y}fR49o83#Vsc5McFytk<ULvgjeg8q_0CH~=-M`r)L2Ov
z4V%3Ts2=F&&JO5hCC<c#kJK;7YkCl%?MdXX^~Qpbi6rkHi|W`GK94szz7d{Sgpp{d
zDpJfYzcZ9PuffVZ)AevpP@*R{j!(~Nkze0TsVM9y@ibhmYrJ+UNgOc87)nP4{+)QZ
z>XE0;(D%$Vei`hCF(Q}0r1CiEzW*p_u$^YSxi8q|KR~4$$}z~-OXE`3M~!<)$cl8z
zZwE%b#Tw2(xwtU5)oAK2msHdBO|~Wj;_TSbRl4~zZDmg7jww#A&r^Ht#m8$*uH}@t
z-%t}2lM^Ol*qsC$v?^g=g`eD16H=Zjp?Yb*@w=XDBGTZ(m6-L$gRo@n^Vw}!7NQy2
z-=JIb_XY87w<-<qMB4+FZ-=!R8R`zYT~ScnB+^m!CS2k61jmh$u?*s$y?OR8q)<Go
z2(#WaSjMcr4WFfnE)1!ttDP?qs@|K|Rei8y8}>T~y7#SbIJyICL|#=GtXxqtq?x*2
zM@~g+jJmlgFQd+Hvv}LsKX$uIL&je0JfL*I<T5ec;I+<XXvxdzLQqa|T~4v5@P$^|
ze5{M?liUs}J!wxW4HfLbaThfn2~IVU$-niHd`V6y!h5w%RM49vdseI1`>|jW{83q?
zKO%V5i9j#-ykUhzIw=!ZLAO=06%qo8Q~Xo~yrBiHZ}7(|pSOll2=1@z(X)Q?T!gPb
z3fkDp&IL;~>|6x-1m33Hdo9Oi-@IC*{NZ9Pfl^wN^2xg&_DOl+#id`LrfLfMW?y$t
z9F%SZM!gj|rd1!E;`zW#tt54{n2N3D8BAw2=Z(Dw8E%bN3);KhW)FXKTuG^{-C!|K
ze)&Tq`RGi5u&vSyjV<fViRG>|bISHV>k|aTInn(2H0ITz6uBKHEX}7!ES!Lct{y;n
z!>vkjDRph3W!(uugyE4!E5AQ3dNJU9gqNq9x0_q-3R49;{x_MG$mVnkN$T;tG=0*{
zpK(ON#-+_wraXqA3tddi_LkfZukUE2apKS@v)A28jyIkzS6tmoti|8i55hH29D4dv
znqZRV?)~g5M3&mclIa};X9C`F>r$lp*%8TeDV)e-3!g0_f#SO;iRGKa@sv4+2Vz0s
zWHhC~&%(z*Iz6-^(g^59&7uiNY=YoZRoBPmeZozoq-fzgxd%mxa_QqhG%duAuvwMi
zd|Y;YF+hSK0ub$~v6>I4XCnzMYCxeggZN}WfI(M@Ru3igRT8nDop>H2-}(PjlN*UW
z@}s_Q5(OKH5vgWO`t>@lF_?B}{%gSeZ}#dAdu`ZpuiUVS_g+#N<+@LJbfKPu|7RUq
zknXAr(pQaw`Fe_-G@kA9cm!PIn?%{!S(Lu+rhhZJv_Oa)OqqgpK8ALwcz7Bw%seFG
z4mWNH>|j4DC)2S|quiDkTi}AD8}1gQUVJ1dFaHnhJj#%$B|<vkkZTChy3X|r_ty05
zzqzKEbyCeAG9Pyb?!`C@C=;HlrB&+Fsf|%`%@e}k^(MI5i>@>V;CSv$@PjTq1ZXpb
z%!ppEW?#np>OXXPgdHU_S6ANFQ2H48G47uLH{v*XX1u(Y@yUJmYI4(E)fB)pi=_#|
z`VjB_ymFQ!yy0m^K}5p-I-Xq~__IjZLWqwnz=R{4F?Zdy8TkE8Xbt!^4^F4X^S-Wr
zXgAeYJC~iwF=nF}))G#lEj=G6<a#BCvT`6{4qgUT^vCf^DA&y+-q|43jQcw=50}Ot
z537&rUU(~<ZJiW-P5kmV!w|lZ1S5Er1fdQZs~~PdUT$rrKDV3y->(CnULIN=eCCxw
z+O88a(U<BXk$&c1$CmBPy3(R>3dCFSw*KC$uu=&~a@>#Rom>x-r0><wE_p^^yV8e1
z<GQKM1J8eSZK6XPN3DR>_~#2BlxRnPx`zsdy*!gl(02j*>&u25@605=h~;5xgFe{Z
zx$<$JSLie8ww$zlT0@bqG5>;*mt9%%{^10IT;}q4RqUyF{XZEB<_w6Y2RaaAa6C|@
zO0ySu26b&!^jAJwKKEX}XHF$SMgt4~aoX~F!$T6wAzZUWkUYCol`v!HY;AO+)+i|U
zuVQ#_$k~|NN&h5oHX9Wam{qE&iZdn(#>F5w_E=hi$eWn4NhKWz37*^&wfLsglEDUG
zH_J}kkLZe2)UL?_dlTX(T<tZe`q^RA4g=vlryOh)?P~DUS1GdQri|fVgAmams-9JU
zCBOSs>|c$5c|ccTD|9rcW4mP01)SZ|L5<Cb5NtXv(|Q%v;bD1CXFWms@5)K<{RZO9
zEE(<8L&zIoK4ArmmEN&<JROi%n59l!3|g%0jE4_gnrEPo1nVBciGCss70~jkxyNO0
zXEAbO-?cip;fp7PAHvBjnVv_JC-UK<*Rg?%LsgYB?1j723>-`vH^*8@v4hHf5Zv<S
zQ~jgBQTFd;+y$zu3TD1AC)8ml$7_Mj*IWOb3wtP3W`x9i%Jv7TLze&o2$(}q2@`eV
zZ2~qy0obRD(aZ1x&zrG86~k@fhpK*?jEHl1w%ytOdvvBepe%IV5p!MQ*)Po`E}@sZ
zOpl7L6p^Lfb&3$ewPhz(*B|R2?c?7<K!+V2JC<{mxR<Yt_VK)XeMI1k+wcaZBzMXF
z3g5fy8}HB9*$96LH}PQ*=0_|kD3;E*zD0?<yWKKsf9+K<Ovy2i-%uR~;YNf|O~(4k
zQFTdNQBqmwfhT01t^G0BpfR)CDB#ZV)~*^)p#PYRb>WYVY=S$;?~K8d4O7h&Ym%FZ
zyA^BpmQy)|o{yF3Naf{VfZU5TxfKdlVqdzXf2{RtXrpxd$nk&mI?Ug5z&W%S`7gSY
z6Qr{pi%l<0b9Nm#h>n_Q+oI8d+o}rR#S+;DcmoD_#g#8jH3w223sH0THbbGjx9mlv
zWC}WLK|>FWTCakWM-0*&z_l~}tCG!<N;QA6fH3!=MT1YZ93f61-&9RDV2kPpPIJKr
z4q4K|7iBNINl9D?0xn5Zt{zVU(@2-nrW?(^6;W%Y<iho;d6ro#TJ6QUt?sP0%IxhM
z<?GQ3xF?DK?|2$DXHLI86HRys#Ho)DKvaKZ4c+!pzBD1K6I-7V+0=p8xz1hl`%W~x
z9FmA>OAi2vGYxCuvNxJHD@G{k_@~x4bmh&}<1h&d$N#2+_I{&$AsV_1r0If0+Kt|@
z(>$s}Z9r4fpNHez;6+Bj;cPN`@ub(RA$EFuJ)`zFjGoX;_CJxY;P}Y27t8O{t$5h~
z7gHJbPD^ElhJkHPwu+sKHSf}euukU?`AYf63e9<T7$S&guQerD(o@Wac+yw#C{=>j
z^9zH<vQyd9R^bwG6_D+;SnJ6!W{=PHvx~o(_%7|ibzq(a7svL?DLqlWK$;OmK@$u%
zU9Os>(e!|qq(-Ebv<4fo@r>qWP*l+x;`-f3c`kXjl8uIx?(eO6SWV7cLQYarjTt?@
zC#ICF_(gKSTwV-YY>)Ic4)PzO&0;cv@(8*lT>1b6io!@0x<u-Ho=q?D_*;j@)gSf+
ztrCWRROsK8Z>?G+d8s67N)q-kQ~)r+_QnL1*!Qfsb%~J1t4fh|%Htb_7fmkQ!+Y<t
zQps+_bN~siPxpDQ$JQBdrG=wjJfOj*H4W<u9DTz#*Tr2Y6PX)YoroH08&4yI^-G`l
zpsh?aKz1PFxdBX5`=hgH;xu8_VR<9?4433|!~O5Cs!l>2JjVcJDz_4}Cdwgar{AV)
z=>}`XU6TLlKo>BtyP?V>Bs;I@9{*a>Nm_c8(^lQ*Ek(m|eaEm1T1gFoe|5SpC$vM0
z4I6?tHXCbPr==ULU(sn<p|82gC#Rpkjb+YUO(;AlZ%VujFFwty;>)?57k;UQ>vGD*
zvyBq*RG3?*H+^hO=vdQW1%T)g>dL_u6T+=Q{q#mcB1k-2AN<nP^LHaj*?az4CZ{OF
z;8jO1SB7{~vZp<6wX^mZ9_T{kOuHtNPq}B}M;CH7JJ~8Qv`^%DeM!pv{7W$P(JC?*
zTdYz)w-*kp>B|i%Pm16U%FEC$9bD}6D62&1=-b`b=?B~jWQX`+3(ZsI+%#;I5@}FO
zzNmcPG1_N~sJWK}dAk(r26aE%4wiG$*LpzQ5!rmvY)5Vsj6cl#z`>big%OwQVRQK_
zsaUN89ryza#wHUWPC9FWLm43C*CcZJt(oZF03kQ`Snn%@qOSeQ4rV+{A&3fsk{_ef
zT@`ZN$@QAdHl_AcI@;{J2g!Bu`HNCBDgT?QM6+l?lm9!bD1JD~HQ;^UnBkZ-8m5Bb
z+8HaXiFNxG%di`ObbNPy!d7&XB=@=RSL0%;2d4|6=>OiGlO%BF%x~KUAa4Fl%Wm1g
z+H&!ONA_8ti1|Yf3eKgA3E4hHBS-QLe3R{~Un(Onb0vvCPMM`DQ{YwQJg&^4-@dfX
z|FGkgwH&euZRUbibHR;f)Sz#w>7oA1<_N`@&JL2BzZm8w&sTT*-%BuS4_kq7Em-9n
z_aj&J0%Cc3b5zH$t^>KDd})6}Lt1|dK&|!b(Nq)nl5ejJ_v*8E9+!hoFBf&GdUbI{
z%H$qX|0<mw8z%V#Y2V4?qsSt1cs0bjD_Z7lUanh=hLKmoBQ3)xT;<q*u_4HMcly^k
z{V_YeZcHS^TP&s=8`^{ViLLLrf<}E!?`ZiOne9rcs!>qUC@Z2<B%38h+JC<})?rIj
z2#G`&+(#@ho>Om1c(zNlp(Nn2O_D=VE!NM8UBCSk)STIN70?$lB;RG~^zLVkz!5a;
z3AAbe`8`z17`2#2piQ-TEHh2MAuX2=EJEFCJT6$HXvx@^HM(`{W-Rc<i`#ZtMdl3i
z4~ehuKBfl*S+QaS0NfENZVSDRG)u`?5s;)7RV*wbjZm#XJ_&nC7jOJzpu3FsqSjCf
zQ|03(UR8mF^VFtKZfY&WVZex<_ww9`u}DgleC2PiN%M6cacl6>VqRo%x-=;Zw|`4=
z(v@Cc2evUtY2$W`qFtC^J{wDoX~OL-eahdb-fDZ(#T5%sc2ak2`$X7&rYPGv8@lNo
z{+OMX7=^C}Dia_RhMeUD`KZn>(xqc9-wSSq$=KAL2NEnUym7tikR&x+c7$F&!DV=?
zL-OhaRc|^nR}Fx#Y5+Wq^ONCUc4NXT7WJJg2h*s%*x55#SW*YJ_fD37hq#E783q%A
z+NzgR)CSX1?CaXOajhEv0l+)x<;6*Vi?hBLQkzgFW)~>Q^~eCGNWq9Ac6&agJUUds
z*<ZMf=ks%nmkz#2*sTDiYrwazaNoO7^5-n*0J>SREp3gV(wMVa$QhI%MkXiklKW0h
z33}DLK1JFW1%$@s$Mlf_I9G%H?<dSNla#9_u4CE~@?-5>(DEmv!i$nYfQK<GdmY(P
zMDo|+KMRd?i!y@*BrbRZoP`ao4x0BPgg>`2^zk*p#5(4QAc%G-4o&XvAn^SsoH6K&
zY+}mWm&Zr@9i!xsJ8h0!J5rYxnSyH~0)v=4^?k4zReWZG_497|#>jC=FoROnX(bW$
zOzotlG1d$6LR40t5|UDv?S~0<nTQ2U*9(E3fJ%Cw%bQS;97jgaOcG9kBa_eOWqc*A
znnKGN=-3V@u$;aVn}h>ts(rC0YlhtA?vbTDMu{l<4f~ea%Ph_B$R~2?Mou}nsFirz
zZZ09BXDfSkdaA$jBH0a}7HNA)k22*BPrYrN2;F3*gB-CuuiVHYLMSWHWGI<W-VW%S
zI}8tB7?BaLb2@Te;&;r%1)5%hX6^jHl&s3J0USQ@vV{*Yr0B%3<Ki%)Fg5siUex~d
z=HDSYj|W}sI*LRjPLUYs7rE*vi_`}>eRO=;kpo=PXy{*krR48qv9cz*SS6%m=?)<}
zXEMtu*3g%2wLC;GB_UWqebunj!DXm`KUgc1`I^~2=cc`{v7UGikB(2Ljd)hYS#9vc
zVSWhmVI4F~v+F|ghA863&(BH9nk67sI;W=S29q7k3Ge9Ghd)t7B$ZoZ&h(*ynyY=X
zmALJmB=?*i|0va(dac#IZ^&Ms4*|xxdS6pnsljU&UDeL_s^$McIkVTNTJVj4PB-Zm
z`}UM@qkQXD&g{e4aAu_rUTYV1lEkmZeXX)z9Jwfr06f!qYP?wkI*w{it~l_9Ll~?P
zx`WlLQK`EZFH2uLsC63p(h}9Y6R#1Z?2a7s%C^yN4cvSRaR`vJAsX}DS!lRV{@>Wm
z_u3_j6+!-%^*6n5By&Yy3x~f>p<2)F=9~`hb5R=%kQN8hWN^1&3w5I1gI=c^Np@mq
zj<;-|jUA7?|B)hBYQ7lp!9^t<^K7E20Zk(P+T^L$<crT&c<8r(p7|;CIFs~?AZ4tN
zvWUgp%ec`#OHBcRQu0bN#k<u469z5by)97QRovFa<@7hpqnC*nSWR3p=b`zxeRd*7
zPsowBdVG~$Lk)n8C;^WBy`1rVHmtQRkHw^5|98CVv!9}SOo`PzB2Gltbx+5uo9*Q2
z>zxEw=@ilJ!n+b)DvlAfi=q)U(aI%24f!6_OCPH!3e!Fs=$>KbnxGSfZpSKGO@KQ$
zPTNf+p!0b#_o`pH57v{9HX+;2cT{;)ag5A!B?Izl{Uu6j_MG$50{P-lJo1xv!&edp
z?TW{>y#xTIw%Q!qog~_pvI*Pl@LfPZ6bnB2OYjuDv3cl})7tXKYBfHu9Avg9dni>c
z4<c|WWyo?%<uxsumc8XzxY~8D-RHzaD8JCC?*;)ERNoQRJo7ma)P)PMFPFcwIol!-
z4p7W-vZZbYNLC11*>^@c*jP$6)fzr3MdQ1|b#-N4C1yLq{%h_ti1!cSl6Gf|G^9H9
zFex20gfKh77b*YLd+I0BeDLydXUF`9P2d>e61L*0)%(A)&&%Ht_Kuj)@S=hwTIFXC
zJ_Dqv2w1uhBfh%l2BUQY?9{p0>!&J+aHYwz!VU>uJDap87$r2p%eGU(i&`60r}P&b
z^hL{_apF%am|Ids-o*{py6_tb+3$^N0vn6s^53&`hwr^--GoG5m;?P27k{h;DyyGd
zUry|Q>6^ZDe_Ec3AS4!_ykIWui5|K~d)e48@H&q>r%tUW(>mjqj_X;OH+UU+!Vb<2
zuKnXwXJy1!Te7?hSU>J{N!2!r;*V(=rG@{!d{ZuKP~yKre;hWYlufjAny007-}+Uq
zupA}(h5liDrAkA?rqCz%q@Dv^9MUEK#{GTOnQTNNXY*ABN=o@>U#|0bVg9T9sITOX
z2*aQ}sxoJKhu=}5J*>j=81j|l5@4^tb+}$+Vm-G%N>|Cwu_?G+=;`Qi!dDjFF!{Bz
zJOpzr1BU%UYm@wLV4m*1#$~l;QmzFOUlF;HT#x@zbe3UF_iY#+3>YP)AV|ZI5Rg&_
zjFv{aOHvf6G3f@SbCZ%WP&%X}1*I7c0@A&~KuTKjdG~(bhaJcEkKcV?*Lhx@S0D!9
z{FhLMvearKrLhw5Um0WZEUa39<Hg;5J8vuYfSv6<3;pF0xwXh)z#J62AGN|p*p#94
zB~^oQ84!<LvR_B(5C=UtMy_3^(FFW{&U4W`@jY89=d!}+w}RL{mSSPGwU!jVxb4KN
ztKSuI3_<RPVm5`qG5$29V$NeJaaE5<Vv3deyOFH3w7PlI2@TZi{D1CAI<mvY8jO?H
zqMZYrxE?R@w)DL@2-Y-W)^Cj^)5-0*3bO<`e60HEVaJN%3a;q~)&Q?J>(_Gxz~a#%
z1z-RGj{q>=v*@tVh+s?*UBb(OY~>p;{}TFa>Hk^e+x+{so?KD9W%(jf>O3%`7S2wn
z%YjTYOie~*sBcK`#O|%7ZOVHysquQy(CGcJ$<)hmy7Ne=8#H>P{lNs_glr85RVz)m
z6H<2bL$@@~Z_?%IFhOg1b1_;!{-v#xXZ3oPYjEoRy>@FMZJQ?E!~y3azpd)Ccol{-
z_nZmj0D~I>!Oeq$Z{jDPe^tn%?irxVHBTtxouX}LnRVl&Pgaq7{9_2+fDSe@Mz;{i
zR)fnE9Vey)qpKG;)e5T(?KLjDNqoyu@O7y}Oq{!d?=9<Jd#f1>g;u#$1?LzKY0@Fu
zeY2yTtCwM&9qo-xdm?bZHP0wnc_x2X?7NpPe|NG^;~YC#GL4-q?xoEyIS^77FXJzt
zMQ{!qyeoS4j0-tRkO$5DCggiViQZnG{K7DnCRwL(Yz*+Du;Y%!1ess98LMe=!t;Pr
zm=QWJ?f6AgG*lDoNuT?+$ImbGGHG|@$;R*N6c`+u=xu{T!oS@e5Y~Khf(ch}31j$k
ziPHa?qePwbZFrWI<2^E!2+v&otNH_HZR<rGOs>2&scLi(h9(F50T(#6ZWRA{{-xFU
zmFB@P3Rx6=CJ|1tr6<iREnQj??P;nb@T}$H_^;>Lv&NU-o>ox1P-@Er_vG0Eb^}8m
zos_Kk?Ov?4-yuf~Qh$gIIUSXpDrKYQc>8CC#GhvZ@T~IzLX2Ip<DxFmhi&Gke^}R3
z4e#+%F8Xw4aIylgZITcL`^PQ5vJLdzzrapn^*0apmfjos%hmb!_sN+3_~+L-sUjiL
zMau45B_<&sRbtz)vV~@gCdXv7nsYp(ukkpzRjM|aI60(r^Dp2<u*kR^Vi{-1+38~(
zbADY*p1mGEyXIKPlxEie9-dTvxx>x%>dlmgho7j5Bip;L{vs9+ub$fhoA9JHdQbq!
z-g3NKJaLFeY-untc=qILrQ2t_33vR*QiEE>Tkce%(~);+*=~F{zmm>_TN_g$95Kt^
zs5k76R(XM35i><bkyHt27flmCx|Z$EolzNVyz>LYN;3(dwDasNDWDI&LpV2HP50J|
z;oS_i$CmZO6FEbLz81YNFBvvDnj*W<=m$;m^DkGcma6eFoo#fmv&R@hI!@2>NzC4w
zzD7Jn80M3Ls{jYd-G3{dmPu-`Q>f~a)7A#Uk!h$0#U9X>+WQB7N6M%CGx1X?K2y;Y
z1$Kip2Ih9&1ewB1+Y^9|btOe_CrMP3M*x4#!9<0H_LJ_~que+{e~dMuMTL)Vip@}1
zxu;)3kC0}*JS)kZieINtjvCdV)MNiP5zZjpmgAMF@%QI$;@ylBZ2n%a)(qc<s{JP8
zRS8;srs27WM{%01%0uk$aZi9B?r^?gy;0tZ`aq;(6v*MfJ#Jv1rd?VCN#<r2>A-Lj
z2pP7BO$*A>COey!;IzIFn6be=x5KTKl!t~QITumd%5>fv((lR>u}f?%zIR47$E5am
zfx%-u*28SIT%HE4$%H*-`9=F{q?4^Z$#sW-+dBv$HTBu^+t8S7GM+{*L{4aXs?&&`
zG6sZG+97Bf$NuSuqgi8fM7+ocu^^6uNoMSF`Ni3oU~>nMo3PXR_NmNc8Y8-Jg!36w
znVD3`eJU+7fgiSM0q@a}1KvS^6FI5(i+%*qHPMHw4=WI%Lw;1K$}elCn^;Qtv-Iu$
zmHDl5c9$U=it}TkMo~LqlW8aNu4ZBf>pVzK?6gzLq_|k6>h}EcuM*wYlwCahN7Y<+
zIh_%bjD`C-G|Y&wbd%V(9Cp+uDlTOFER<w2bP^$lW?9O$^=1q@PHvlOM9Rs{;4q~N
zlOFP-1(Hzf^18>)I*}_z$$^)@?*=(aN|_3ZIdii{h7l1WvRW40R1b78!&q-@38&?!
zR|o*p(##t$S;wL-1nS5uT^2-S;O5SsTDgl!4fqq7HvJWN@9}MN{&}|-<Y4@_rjvD+
zPP0Pa?vG1H`P;~%rlu=34jar{;@Jzc<T?4`PrIZE2^E=!?(6AuHN`e9CY&kTCT`Ok
z=7l>Su4WxnoPuE628&}Mto#xZ2+DHr`;#2E^%qQ!>glb&#p#B=_}Wa0;irn2sr_;p
zJ`=5-tr+W6I&dr|!<LuRs8?GuinJ^UDH;$N;9`(*jM_H!yNMTz*A~BQ0i1JONS~D+
z@FKK*6o(!NjQVeDo)gQ-@wOz!4shXISO6UGyuk5~isi$du}TB>eIcaIy?8;o1vlZl
z!li1G`<N2jDcza-L@M$}Uz;3qZ*EAXPHGrL&w3jF_@1)rHCYony6K3nm5p~7aW`u&
zo%pg2U|wLbh!APqN5^EV4K93<HccMSaJ6J|%UojA3hJzQoVYgA4aT5Xa70WX_mrYv
zayKfLlHZC?T^?$!Dk_RR#7?P+NzSBgUvD>_rSKknGL}tVPZ&5G3!Qov0%$!8ij57E
zW24iZ1_=jJr=3>NMk`U56Gx@f-#w;-YcUtjimx6LHq-KXI`LoY)E(=TD=lI>vD+qg
zyx-GB7W}!@BvGq~AQbiCwxL?$^cc)*OKnjgG@t(R!Dk^`Xpwp49~$DCgG8UR3IpE$
z4~1$@Ko2!v>Px31|5800MXRtn6`+j_dAf0UfNV260EcgS@<!(fU@=4-NFP~n+F3q$
z)P)&LONKSr__=Qp>eN5qz(q#}DP_ZkbX#*ubZGlZsT|e}{KQ}1>X$W>iJ)MFStQ(`
zKeLmP+w2Xir$QI4q25IPQn}Oz9C8G>p(h4!YUyALOEb+h&^J`blJ&m(TAu=!ae!R7
zXH62}Tl*pg9Y4#$k+rk$nm+y6js0`>VD5qno$ucO%p~I%ZHXvZ;c#z@P<^==>)%GD
zk7N>5Q~mf~DTt|S*{K7oh$JL|=URAng)v4S5vSmm0g@wQSOkXfyJ|&hXNwloA?D-?
zn70?N!cNPF5{y_?jz0ilyEJkbOHtA%-xxHU673kg=k|7Am@x<jFcKp)0eM+=906R@
zi7@a&mF9(Fhq7;YK{8AyS?NLh9IyS48upa_puDftl-eZ=Nkd#_iv_Zpqd~O!1KXyS
zkNgW3JPr$xM_+L4`S2Nj{+XKct)tI2NpyC4OYAKJ(iMWxqYC9(p6ILL@>0DPF51ze
z3!>!OKTJJsDXfu-ChC3SOED#kZw!a6G>|B97GL{R`E2aU!|Lu5%MYY1(b88Pr>9^O
zI_}o2kVe=e7q3ocjKRXa7R8aL5$VCHS7yRiFzJ*2RU*UA63Z7yi{YJ^;jaXA#E5ls
zOI-F>gLw(Hb>onI%){88n(BS*a<4D$y62W7GCjScOeD8X;0i)XW%s-dj}E6H3oBA|
z_|fD>-wNF&sm0E4wBLT83ai_HB#>sK$3^YPpLn)6Uw9<a_v^0weo<^!cu?Rc-&W!T
zvYc~W4TImDW%3PDjZL=R&s!ZAB??y~R!Z*8O<9ROeeHz&7q_K}ZC8{hxQGt;`B}%j
z1Jkxs{sWlYi4dyj>d@`qV&w%Q<isfYUQj&D^WjPuNP3!DWTFJ{8<5_+-ii#cf|*hh
zjb$wOp?tuvN+!a;`$9-lSlEGgm0#0#wf_^opSVCECNSP|1QSnCkA4p+!X!Lix4k>^
z1G#I8qFpzR#{z#<?5@mVI^O2{tG{T1bt$n*puNng@x=;k>+RxD=L*|kUqVjd!@r@P
zS4yywH<#Ogm(ig|MU6>x_3kaJWN2w?`WZi+PdD9vIZ{ZAvl$!Fv#cfo?ClTM3onWU
z*;37rE|uGE%7t`a_EJ!I2;|bt(o!wS*)4Akls0wCIJVtb&2%6ZBO2JGL>TL-uuo<5
z425fd0Hmz##qUK-o2Tjc&%Nho88h08GUJMy<+#VMlw2aGS-J2bqR`wSSOYQyPj0&j
zsL+^H5(vNU4DZA?ye3)s;Z|v}UoMkZ#(z>4=D!-QDCA4D6E${P9J<f;9Um%#Mdf`J
z|Hk2vWMUq&-z^`rvZF{Yo#R&E>dqa9O}_TI{M}-Xs&fPfw*|giFRw2j`>sPBUM`N7
zohtRSmgpS{Zfy;hRHS0UJvX#&^~R+_R`=Naq&Do2`*#(uD$vW_hi4TG;G?7kC4l!x
zAE>Fwm|WgMb6_=3SAdwmS-f$=7ncm{(<}L*z1d}+N+BoNvC-aNTo-y+gdjvWb;UH<
z4rk((7=Myfk^8#28}*NsTx=`Sw;(iFH?XYAiFXes<A2;^)qyi{vE5y10^i7yDl^e3
z#-f~3GHbBl{{Tp%)q2(6*)_V0t4_Z8WU`vz57+^tu2pP!=#M`F`Z59E()&Vf+H;{=
z&sEMniq(Xa{)8OP8vO_Gdq7^eF|ep68x}1<<fw=U7)7N@E~fnbJP+~KHS;43Rhuk>
z>*@_E9p7-iBf_kE308v*AsT(_&5r17xl*EyzP)lFodj$g_9^*U4uFvjhn)?)Rg1ly
z=u_S;fc5=8Km*2(*9%Pu=iJZGJ=}i)UCn$FMe@Z3ZzX`Eta@mW5!II_H)O=~szU+Q
z`9kEv!!N3yk|UWYQP?cJ^KzU>eE#1CnKvwIvT5_pF!!5#j%-XzeR49FlN)ve8$zq@
zP~=oz*xy3&UJnq(BqIMPjN=7B@aXK~4WiHk?1u?74(Ougzgff<!$-)Rg`X1D!_Z1M
zWP<C4QB$>j1l!?RKIz2-oz<ogfE<IwG;vy1Z5<PTu02}aBXK-@SoF#$vJyT^G;sZ<
zGrstm%#HB94)P|#Ss&EX(Td?tSo-|;T?IuQDf<gus-+e3@ES!~-=5XXOZSC9ZhdGi
z2D#Q?iOI0}aA9>>uxf{}I(bRNzu%=UO2=N>A&ZGLA*9AO9TyO3p-}Wn5%<N+z{`)0
z;ABls+j=5`YACBOzZ6VJ&~WEX7YtU~N7j(`AB>IrT>q(czjAUgN+$DClpFh8kwfD8
zc~oyEQJ;wDO^bbv3lepEZ&Sa@+WyC%@7W~|8KY0j20ZdzQi>okF;vacm>osR_^Skl
zkx}A^oym#H9s_`oJp5WQ@LjJs&TzpxDryw+e_ZnGL-yG*HX=ekV$EA+^)Z+Y+0U{M
z+tzdgq~nlpX{ZCRD2}D=qe?IO`si28^Ud5rPFRl97rmoPX{G#f8XcVn$mwt?Yzz4_
zZXt6#7=D4zKPg{-bsXHG>9(fVt`#?@H}Gt@WP|zSU__cH>F}D6sNh^X&8O{K`S+;3
zTbg&GjrVXt#Zw5Y*XGV@@bRIay7;k30;l5IOx^*J>3;y{>R7>bJ*tK5R~eon2Ii4~
zI}x4x0k|Nut){&ff4^`hu6$dGyXCxaom||mv$kN6P#tMH_|mbfY10ND31tlJYNvB|
z^K}0EVX#nHx=tT;jR$(@2J~0Umv2;r;-9?W55@2MX2XL5C_CBWK}LT7V-w#i-j?kZ
zA4PXzc;Nuza7ahB)Zg2Nw;KiOoWl~K_A5}Q8Mq@?Yl{VOg{L(CWXgsO+18HErm8`p
z%4555yHmo6pnAvbla*Zpn;pTOv0o*byfRMNYyNV0`GY=<yfq>Ki(b4m>UqWUD$NfS
zoR3aO`CPs!P*W@^_8LsRSjO{^KdO)HtqHV0_ObBimU(h=0PpOyo3M3cI5$W(T2D_W
zG#!#o$rLTOOZH3}?7~j=T89E0Ip}BB`bMIecW8)-|0iU<>V=O}0<NPAGA%|W;BcL1
zuyXNfDE{riC*|?e)mE>9sMP->TpV-`GoFi!EwZA{IB!B*ig6@$>h6Tht^D~aOEVY8
zO^D!sfLBV$AKn37cY2N|0TGusZ^a8GhRzat8=(xbROkTQnL^1E=Z7t*){px6q(p%L
zNC)R=Q4N!N0tGWkm0pI7FFs-)WSPF#GhB90S(Q^NCZ9U+cxIO9;;cOFd74vJVodQO
zAwZTcGMwl@b{HSr?PLuIksI4kq_jJBe7zR8J}=?q0;UPz^5Bi?*!)me7eR4f^ny#M
z_9CU&s^(e<MPjYfNne|Y7{RcEuq*MOEJVW9kc0dnB4QM5p;|8RSdn3||Iqs>-PZvS
z*W*Tou_x(IPP~X1OG9pL#UC*3EM?(*D$0M=D=$Mb#Avjemiu7HF?RoAzLEEI!deCi
zjmxYoz+>q#&JSF?cIWqFC)!GY2eOPHP6Jd(;8X>BJ%RrK{Jw@ZI_Q%Kx-_bK=}6WQ
zM=SI>ZcGP0#%Mg;#}`M8<IE)b>G&rQi5dsES9{p-p|N<b8$7p(H$_*X)76xhRZ;2^
ztA>>aXc(3k{HdNlmr7k&d)&Es>GX_{^@)CTQKdmxZ2=?kz@Gp%zkD)bcvobAuBL*}
zzR?US74k&(2`){lN!~5ywFku`PL&UAFnvA@&)lSFPZOY)nIjhzd})%j#VaBxL}=xp
zGNAAFdhb(ZPfyG*>K>0VuG#gFIW`y*rtz4G+(+AE-aI#JqY^BBwAQI&cWgfWS-caG
z8)FLM6bAyg$Bhv7o_BR>dkR?QcSBN?60y_af`g42hqMnxdKFE*#fVNAO&z`Thc=4?
zi8zNt^s2Qq`KBJLO*Qc;&5D)0mZQK$n3S}AdUz%Boy0Jo(S*f58DA}BP2N}F3x<(B
zE%wcQj|f7J-5ZKKaC#5AK;5bI@*<P{9qU1M%sDrEWU1H!0H_b@5f0rsY>iRR?vg47
z=v#RT!^RIWt|aEFtsh{UdjNVg(e|Q4Stpy3{8eFw8gv&_9h~=fMExv*-y7?e-^Ah=
z!*#;^M|^v_=t}tuJv9v8X9PZ;DdSHJy+{2W+z{_waaWDSn}~2z1&B}nFq?wb4KT1r
zs<b3%CPtuK<bISFXxBrLjf+ueoZnd3ORe5!?OBHhN%i!#{qqwkS-?K^5|1gOANY9{
zU}m-#U|}OFl87xb5OuQo4LSUsN~AS-k(7jb)d!f|{R8Y5@2pY$!J0&vi5rEYDXa$A
zo%G&$q|Hlek^%-4rotD1%-8VCaT3JBG9Af`H=PDRGJ`a)wBrP$1-G<{Xyoq)iAV<L
zJEqOFvy|?0Ea)XEy?Z7c=ErQap@bQ^W#mN4swB*^6*Ce`q`&$D0)bHaTxco_BR7WL
zZ@*O-bRn4P3%Nhc4hUcq{Bf2qEEi|@m#|y}j}Qw)jz0dj$IQ!}qWeO(Za(wq`TqWW
zJFp$mV(5?dbbvv?=SEhOgxWO~tf%x?wS0pXxMdaxH7K3;G7DnE1Kt6T4lKV_<e`@s
zKZXobpPhh?tHMU?5Sl!##9pn6?BDI82-fX<;g@7b=3boX04FaBjCE)Oc_U><vttHd
zZegFU8i>7>K<2V)i}BXJo4eBSId-0i%ZWy>8v489c%zRS6#zhyzMS!tVptkfKW_@v
zYHRiK6W>PA5ML4{A}x@Z4K?{!fW{v1Dp5*Kq7&-8;%MG-foC{@H<gCbT!7PP3NQcL
zaZm}+^3jR9l{hHT3&PAf8o^v14>oB+x<Pm#Q!ceTn5p=L-HhG`M#96_2d}sQ5P;pg
zUUw;t-dy^X$S~hPHs8ut3w&d0+!x0-@g%c1skDXxeWZXH<u-AsH(j(KCAEiFsI?2g
zTO#B?Kv%`$kCQ9I%}wSn{I5xft(r0IoLIAJOTMI}E=E~hN2833OI$>XtNV|isKbC?
zmeqM5?>tJZVfEM7(|vtEEsy*o6AVJs?8ilnfdE2a+Ww|^t~6;wXqUGdtOEoAUQAC|
zYm$2knzwjRzeNEjL5v^#zh=b$7E|h@5Z2s5C|pk6b(HwCtf@~mg#h@z*XWlugZlDH
zZ>Je_LF0ZqCi^6*QDisy{LuhHdR?uCg6qhs^#m6g-wWAf$1>yDNi8zY9w|>QcFSni
zBNF8u^j>DNg&GrCx-_jImfw;xQ)JEX%MooBHvXJ;w}0y{VdX#d7-H8gBnO+hJ}nbL
zOiP2CGv>1Uhh(dk3eUlb2&IFL5<P#!^Fskr-wPN|Qa&~3@h7D%i0V4kMo?LaUKZOU
zx`ecq;@vQ`5Vyx6@#ZNH`BU;$9V9B6FOCFx^4Z;e6gqBRw&pztKLIkAGi*2ZdGGRr
zxfeg5ap6#QPKc13QYCMyoJTnc=>!CkY`XBiR$9j@Q9p3u(`-|7{iHs|2V6STce5hE
ze-jab2n-V%G;3|kcIS>X78!!Num)1Ykqci5qA*Ppdi6WQ6XIJ(`wks6fp*l$L?UI9
zq45FOJ7@jBLQKmMIl&R|aKgh6-Hz=QHd-XGq%tlv)<C2Y2MZi?6+8x>#P07G)L5FH
ztz4l#Fk`@n`)?+etUB*!zso5KYd)xV$3~>+xjG8+yhY%wdhZJE{4_B_;aMCp)?RP5
zhSX;~m}Gw#RIVn5l{ZGws1dC;h05*Z1kF`>EDmCZf%fdQBmKAjj1Fq8Hra2;jBA!J
zMuS#QpuT%rt3?jSeIiO%K^hX2tBwd-r6wTrpMV|XuX`e)^RE&q2qMQ1ybyL8xf{@Q
zg|!lMsycpfLds=BZFC~Yu^43QI(6UDJ+d|z*PmiHaL~Uq`6uK}Y&#t8PKwC}SLP6x
zC;b4CoSv3fjYD2ObO8nUjwu3&09Y1C<q3gx?$GS>T;;vqlV=Dr0I&3}+_%f$GcA!g
z$sXE4&0{wAp?BPhmxqe){hFH=xU)4Wj(F@2|G@rDsRhlgzs7#h-jmMIBre5L^-)OU
z0i0jerE0Z?6A_U^xfR`XwCy^1flgaH9DU8aUZhx1J^*)D(fWb(!$+)4G-dSyeT$dq
zz|F?5qM~k&h8EiGB7y(`X53|<LoLtb*Nw(!?o#p4d=q<XWGe{n6c)~ruI3<0%$zo7
zOsz()udzzp4FwLYr#>)rMTZOt17(f*vv!)l`JA#V2%88x`xhJAea;FVX%@UB{BM4@
zS{2pHu7KZjm0smzBYIVZ%bZ?};9Q0sn)_K~<DiM}^d)DII#hHEQPCDULE_PO5YnSc
zaxIq+MgTotN7|ARsRxk(%mB0`(in#b(Yg7uJntercY`GbxcF+YA1@SXjQ7zyw!Z$Q
zw79x|k?bAl%gheb^aI+?IYlq_4^p|mvJG#v0#@6~mFH)^OnXic{{(>TncNGT@;kvP
zgSlr3g51Z#%_~Ql{cO~UcJBy%k5aU@2IZp8{!z(ggQ21>;hh#Cu0njXRCH+_IX)jQ
z)8d}b1YtFXB~v)AT&M>*zu_%Rf!*Kl=rM3wQ|be;vC(YS{hXA(;CNBKpvYpq%HgHA
zW9-oUt=T0W<|8J7O9yb9*kY2USC2IZh#H>e2wOB~ujylie!kjfh9|mjiO-}Vtxq!P
zm2-qwf+W&qN43Qa{n_BHUtP6v7VUEh!miE7G+jpw8Xe4AWFbLky?pIwun&dFb71@2
zV&_N6;zx<ef>LDi**9M|`X}ki*V^hwX?|gt_XB+@9(;t$TrjPfy#WQ6kbgFIDI1U;
zg{)GhgtSRg6ro}^rXk@%<>WwcA|M3xgmHJp!~O6g$3$6e76`M2fKND1AKS5by1(Oj
z8;2ty>r!>Ae8z@z0V6wbCmg?(9V^tHDX)w3^Em?=We8>fENVT&Dr+6}&GoKTmn0Lx
zi`L)4;fv5PRO<7+x}+>AF*kP)%0b0=L2F_B!|`hOeRchJ;!T?$h%fadWFnr;`?*<1
zwM6L4QBdW*9R1w(+r#_IlEr%`CLj?(eWtLcb0z=2wr|JFCMvj$lOQ_7;ZcWU8@-wy
z?JbCPTs9dNg%(e4;esvt6@vczbu$nZ($o3zF`@q-v`X`~puRynYdFWZoeNEXWPci%
z{L=K1;+}KuIU$)~`^aK512VxsuL(k?hGkVh6<AeGFf-pgVvp1Jl5slUyLs#VEb&Dn
zK>VCQTNv9gH#Ja^id22Y<_I`$E!$q0uVzJV28dO71xS-nqg~_Uxqe#MBc6uyX7CRu
ztMs$I!)#d1JK9IqLA}1<XpPX>+i8T-Vojvr&`)g$hH%dby0lww?9f1oNrTd@BmVF0
zxtCGcc-SpS3|(c*U7`sYG0!G(Q4lIQkI@fF`Jo~*men!P^`V316hD#28*oIdVa!f<
zWHs3YxfT%o$dbpo<q`>4T43*}n2z1;a>1zu(iGk-%N)5rPq*u0bbGvP7wA~R{KplO
zO?A|p9(N&$E@2zLFSO{6@RVS~H4-O!skeW9J!kR!m=-FO&nwNB9P+}5Uj6O0N-6|;
z6msW{>LXQVD8tHQg*8RwBdH3~Zss}VmJ4rkx4^`y$;D`HM=vt1BY(EQlhWS`{-!=$
zlI;0t$ocun6K6!1Ko?e)Y+bxL6w(L!0r)*AS>H@7krU`{aGnx&By=J^SngK}1ReN|
z2JG|-Q-O!;s-|!oIRpkeQtzRaty3yvzcq)|a>Q)qCg}zBhZHrIKeAX3^ywG-WM}g)
z9b@v?WHI%?3jTDdeBx$Bnq8;x(4P&2a^W+rxYTmW%DA)z<Ow97RYYn+g)1=~$!?Bw
zOonjcpO~(zsWHT!M;%L|S-0fm)4kLX+`?2e)OpJTrO@q%9M5^g5=Irl$SrS0f*JL#
zyHa;KG)&M|PEnyta^>My5V3o>J03=8kznp+kT=l<%y2!zlMm%(vTKfM)u$?LMx4h;
z`?8^zF-?JFnvB&SzY60VNqB(gtw&)+`Wl~GJ`NszPu1;xM7YXB<QrU#xKfz#e!~EM
z{uD)p{xbL7uR~-g4Kotd|Ml_2HD4IpY~B;E62toB4*!|*&w702Q*Z+d_Vsw^8EUS7
zuXto!uZ{+B(cL2h?@6ESobXiGe$Kj2!(!~qmUyKv`H8O5b;4szT9#-4Up*d#ew_?4
z%2<Q9)OmMvv}~J+Y6uvLhu;H~AeJDIN)7j8ZwIKyRX$;}$oV<nRM^_qDsJW#3=J6F
z>?ddyO};uF+5BS5@DZK0g>MB>|Gr79%)!RqS4m9k<oI!HeC*@-ERV&(JX{7qCO$qc
zP&d(9&V_spaNLC8xla0C=#e8djz4fcT{YXhwF_-vu8-GvKj|EgyY!X@qr+sb=WZ&)
zR;ymttn8Y3%Ew@<=^NYEUn6mUOQK-`A<g)>CA~Dy{{ZezceaX)jWliQT%^)*yP;W_
zq8FuFGv-7<_aTljt&6d<)c+UMUUAORcH?bt@`D|}{0kMSbgv(Hc-OT_k%okco~b#s
z&0c&|6Zq*?J<N^vpS0xJr+-6VUaYpyc|MO?%gFUkxpz69?IYr?YNx(m?2mZlA=~!>
zW8zbdN19Iszr>EwFaG<62~4`JEnC)dYMW}1jT5aZPP=#&;QY!LeEzU)ehy`tYUaXd
z?LAM4KMlJg;Qczs{c3F$V%i-Jh%M_42I~EDFyzBWJP4u$-NuikWBN{6dB%*_v$urA
zPyN^)`<3&xa?9ZXrv0v~<q~cJI(_CnygoQWXe5+3G=c`B#nFuS|7dQu;Z^^-7L^Z4
zIeIR8evIao13_n6{_(H9IEZy}nRG)-y}JN+lGI=os+*?U1{?ku|3k-+YE9&P^MfiV
z{pGnpJEe*1c=_{R9==rfr&^u5<wIF2*X6I|eUkX`muC0f*jjH$#9!o@;qN<xD>jd6
zEg*^=i8P`17;E?`=0|ABwb%{%WJ$h{4?WG4D*7@oZ4|PQ=rb04Y@$swXYgh2;_z?G
z*^4)#>zT$8PD<x5QwzLCB?6%FHzNOBt{~grpCRFA@9a2b!}~e@iHvcy&HP?w_y>E#
zruq68*gXQ_+xYYtvu%60mPcxJxJl|>5$+`2f#sFv$isg+d1F5zv;9jw+aJC*{Is@Y
zjyIP6gLR1id9~O0HS2~3W#8yZNHi^k8G1PVgG%kMZ|0pbl%t_0NooI<96ULuC@?f<
z?aDZbgT?acF2ySSAKBAhA2lW!!s6l=^a&ZSrrk%v0N!4`hEwZwNQB#jz^%#O|06jC
zPjQ`$r1Du{i+AGkdHIoPd!@n0_vzs5mF>N}bpM?#Q2zBJXW;WHv&lWI;74m}96tH>
zXKqD7^6=2p4n^iIT0m$zlrBMSF6HAfI_h%0Uc{c8`Y2x{&-Q0m{S&Qzk<S|E_ZP`8
z{GtYKBzK;B7cfOa6S1H&f`%MEgwWK2Q0DvM*=6CMYM-=GF#A_g@P{jQjFsrV7KrZC
z;4(RKd;^w~S#<;>lN(wd7L{o|zr#ELc&}qeb1}B9>3VG0p_3d#IFSaqY@6WdY)2It
zC;**8usmJ$BI1XUJ<B@1Ss0!Z<^g%kILwsv>lAD5feIqPrT}t#z@PkPdVuHpSG0o!
zb5x(?1)lL<?HmQ@qmA0Sh8<zt_nPd9{6yu0rRS<-&sG_{16RW&O+Q=34g_V#IxNzW
z0l<#@)79Pg#7Q!i23~C_hm*nnxKbeyY6CQW=p{0E?wk~L;ZvL8+Te-HmhBZlnB{Wh
ze3!&>C{;2MuaBeB;|vCY_bw2UVmP|5S}vpH-BT;l*HaAIHDhb1r^Vqv*b?D)YR#u;
z%sICtQ;HO~M2h&daxq9G5>st&)Lk;zxWT7F&&C9*QiF6JnD2S04m1Yz>x<p@8k5h%
zP5KeLylb+Ta>b(@VI6EIV=uKd_nlfy<B6MB5hWx+CIc)aN{(bI^&~8#Aq(^QkrX_c
z!bU7ZVg!^VqcG+4yz{4$5qyQ9Ff$^gj?DXo+rnH|yXdqr%aHg*?TUPMuaxd|CAX=a
zo~hmcV}FkG6)#HXy06Nj#KA%&e>CL+&&o~z01rfLXKv*bQ)>bFs}VCLT3=N1a%YBs
zRj|CShWw_cw6=*2C22cNjKNf5AY66omBYx#*Xc0i5z1#9*%xNXOgl&N0UZ0+U#S&L
z2SY<Jc#YxC>?+217w*5BV|ArllGE95-AEG7xRRn*@i=RkX%*=f*LSI5bym$j8VG;W
zhB6WM3IgDg^yss>9)2bl{v=7@`<2B@QBBE2K{w>WCVzwOIbAQW!dw>)P}z|I*-jQb
zv<V=LJHsh-3y=pppWIJ~9FkSx;CTAl`cw>ML6x_-;Sj6zY_f?4_BALu5ZQnFC8+jY
zE6wUK6)AukJ9U0(w3gX#z!sCii6^wXwS<W=4)$qE*<!S+5Qi|DHj}AH$W(;iLvvgP
zCH}aw_-UqOWa40lBNu#Ex_F3$K(S<`CIavCnN7j|P5LUn9v#Mqw1T8rgvIh{x)V21
z6D#1Bi$Ll`N8ndQ4+r7$+MkO3oj{UvXt;t*uIO*0kyp$h1O}mgQu2<(%t6zuRGHWd
z!|Yil=OyQwGiTX6kk!wqO9jKU^CC?(Er>oDpl&v)PPU}?EXs=8VkcGE!aY`NK?^05
z@fqPEZ4V4Nm-?lFUbbW*w<y#4x0$_VBApKKa2XSAb4OKi-TaIJazzkZph+2MZdQsQ
z`~I8AM*Eds?;XkOiH^#%HJjO0ah8RFk(UiJ;nc_FPTbwZWGhCAhubD?>1h$KJKfg2
zVTte#HpeG!3w;$i5iE9+s1t0{#kK1MF#+#Do|O3rRlBcCAmEqWSAF$ygOx4a+Kywz
zvV3x$Oh8)@OVrGnXXrZEIN2x$_Ap0I&XoK+HYV|%8Nu%jxwDBs8b`OCmohD{t1}d&
zf~~9672%h^yQOySe{_t?1aXIVj<MIym(SZkQ@#uG0D>#h#$DI~-w|s2JCzGF`oNof
zcK5UE{E$^L`102V?8CcwVOkwFCodtsrtfd_<ky{!zLx^vD@~q#RTVd%nR_neh>HU%
z6wMGvn#>2J#y2-T;d<L6+BapJ*Qr0rl#eHm%ShB1mmadR-=o1Do*q~vg%S5Vh~X*-
z1(ZP4IN9f<4eJ430U)!%2dK}O(MhkN1VP2L15_gmwUhJTNjd)X?cO5@!y`8~+Dx7=
z8JnEqU(8bSfm~;wXF*my4)1&FB<cKj@A=5NQt-TeF7yx{5ouK%h)vPkF|^D`Q@(zG
zciag%iHw+xZ`e@&+mtmp2a3J5lL#0M{ADL}^KIk>-s>X37t7zStG8hkFhp+g@&MpP
z&XxCa<D?ANltf&wQc9-M%pe0J<l7Gz`V4uvS@694#{@bQb<?L=%y+{McTO%jZMI`1
zM*cTf5`f5@fyj{1^kK&+=uBaCtSc9qSuHHgR|8Rg*KcaONn4y7WEUI#G&2Zxqyaoq
zYnXC+kF|eDAXEb5dYocEbyDW>E1E^gaE{x?YZk+1T;9Z02X6IaSm^%~8dd#-Tstdk
zz`IWk#Or7Mj=8W3DBl_S>mc|3Tk7;NZdiw>PIAMO9~&Pjrw@oFpSKI9g_>Y%PdSU!
zgUVEz7%HOYt?WkqM?obXu8i#xKl_oxhU6W6@I-7LUUL>y?<sS!X+kvv`YbX7n$NxK
z39e`&$*nj-w>f+<Jl81`mgp$=O|57{!6Wp@n0Uac`=fx+Lf{NRPrNh2SIRPIJht&&
z40^=ufq`B*9#)9XFd!O#X$&=cnPU?jFE>%b596_8X}^uncRKbW<pRn)c$$zB73$oo
zkl7x)s44W6#Vlp#GK-cTD-&-sWJ{04=l|u+(Iyd==z#)~>dP((_3FUNmA8@H!qIB4
zHpGvq9oZtbcMJ-@n8V1}o38hELA>)tV%!;19s>J;?7iyzCBT*C7S03(dgN+KXFFrC
zO^c%A-|2{u%Gd?YHpD!ce}QdaTZC~S0#J3Vlf+G0EV}?%4Ow3<A%wWE*9h5zhG50K
z?w8-5q;$JKwYKqJ>6!lIl%GyAHyc(m7J=G(Of8Ng_PRZN!u|!Pv*9#%@#{YT$>v|a
zW6a}3pKt;h;&BdmY)D(`eSNYX3*T(5^r&X_iX1Wdm&rcd{Ok}T^n=1vz_s{9J2cFZ
zHhN@jCFXnJQaYKj#CL&tvUMs>c*<zIPJPew`I_?gx`j9EK_>^d{*_*T>kV?rEgy~)
zjP~<|r?dPA$UylHd{q!f!0^#-{6xC4hyOyKFcfAQh|9(cov`_KGCtBex3W*7Omxa%
zhIC?H?%2T8x{X;(uny(-Q_ZReB}i>zhJ0i*@rv@keV~c7p#nymLhR;ZAbJI>-vy=|
zG-z-0_9i+l*Pv=Kmi??C&M6owUBYc*dQ5Yq$(6{Uv2$9?^aemKbF+JndAXr?!Ta&!
zAflOtnG&!|DkdzMo<y_M!ubxZ$X-kMq*QXdP<T<MY}lA(@*3EgrjSmWPj6U#8u2@C
zV7VtcHF);+0ERrtCqcZ5Q*=Wm)&P!20SC*)s-HBVy|S8v`y5k$2|#AHj6PXA;0nPF
zpwsd;4ok00T<T$tpUmgXlp?Z)_;D-h9(AHl4rU0R@tQ6QW?`+*0b|nm64wZWf-WXG
zNt73SGCuiHY}18ib0ZPWlJpHo3-HszYlwyNAEm-vu^zrKO!OIBTGXgmi2uo+R@5si
zuYQ(Ok{egLoC4X|Z!P>Vwhw1#n+X7`%3o|!Ia$HI-w;6#C>sW6QSUYH@{rIx?6x*h
zBy^YAn@n>RTZ38KQI1_)f8th4J>21#jKb#UlWB@0o)Qvm$^I-)q+V~zm3UyglIQj{
zugl5z3J@=b|8+Z|lQ1*Mkzdy#u}j>-7yz1(SV*!Iuo~j$LLnzvFf*StHg>qSBqaAz
z1}nZH?}DB3a`=;%q%p2sq*(=3_aU??x@|7^hy)+O>eHR%#1`oY+tj?n0tqhnRXTwE
z%HJ)aXY<T^T~%I5zvFf#Cr@@vEi9&b{FzBpg2VjePl$9kN`$ic9qD(F82rI>(HnRJ
z+jS3J8#cu{$WZexC<UIu*SO0ry&vcWvb6Z+@^OHb<^y5;xiX#J@tjr&tdXCz;78wa
zPPme{cj*B40UjOp0}8R{CwqoHto_Rp-T%z#Kprm?X;}O_^fLJYv|-kt>@=Q{3?`z0
z8H8@^1GdLY7?Q-Osg&FH=`a2nd(RH+-bWH&x7;?D6`LCVQUi@D@qI@J(zJ!VCKmK4
zc$w*8=E>W9QuZ;x5k^9Gk;QfwIsR_%MQoeyVEJc1mo$W4iS5TZQS0~OF$2;VrJ447
zV!|WuYJ+Eonz@K!W9)=Atnsfz#fw<)m!8&9=q&aZ>RyA^+5)29CN=~dEOz^!Nq@~a
zF1g(g9aYi*P@Cu(r;}i1VO|ZF#m-z9fYFxwec}TETnc<!L+6DUeGN6B|E#=r{|)%g
zBnqF;X?=PvCqV4f!a)0Np={MY>+k*RE6N}ihs1O{A~`}9?e>QRW8_0x6r#CfXA5%r
zggjNU+(}?e7e~Nm_T&#&NdvrD`KwDyRN3Ml$;#|4f=c8-Mkbr-I=yNZ@7-W%Z#BsF
zM4@T#cXylNk+f7L;36vY9TB)tQzp|+>qKWYEUzoh$ir)P7dD`fI%0%Sv*>mk;4MeT
zv_tUh<$gJD-C65E!-Ise(zrfJsx|>{*Wn>XMwu!f^XYpN?3<f0I4{SmZ(I&kWE7LA
z%A}0efM@J2S8=-+xRL>AvyLa*|LK#Aw?cad`ao2($1jJ&dQw20SCY32pV~iQJ$ZG0
zPTe=Ddu3CbCHfyAFl#$Cak!0Uwt73vZP0cV3uD2Q)K>Ra|9e!@eNn&jlI$8*8~+e7
z9U%2W_Z2qo{zwz}k{E0oqCU|go^~G4$~<Gccg6Y2pVzXf`CC(~CeJ59dTTMR$fZED
z7RB-Baol!{v0zaMupyY@O8nnCJG>(UPW;oMik)`Y{~U@xs&0O_@TNMSOyQ##h=22s
zOdh6zF8!DB(yztdGAl+wPZl8}_iltbCq6!Y#toUl0L?l93pgIEaHK1bFU)J=a`z$B
z6cFh7LZ9sP8X8hauJ6KHlXWnYNQf+aQ#Q-$d)j58221A*0-lt*kMnF?clE%28m<Pe
z`ZD)w94T>|8pEQRc@pu7>`Q>o)57@qajl}I^ayYwK5gMRpW^30i58U&ua+)xfh^G&
zZ?OW=j-j|=i;qvD7-d{XKQt<DrUC2`G1ym*3x^KS4!4{D+lx%HbpIt1)p+GQ!Kd)s
z*IUG+?tUybF8$V`z1UgmsSmqs0W(5tjhvs<yOMA2VWlrWWl&ho^CfSo$)=MaQ$o{o
zVZINMgYg0zCd>}F50?V#S>#TQW=93->~VvAF}%`P=`zQr9M3Fh%*UkO1q5K1VpNc)
zCGzPKn|SnqTUsj7zTOXUPxpJCP6$=tf!!W|i5)y|I`ytlr~Gf<^x6UKS3uN>$T&^m
z6r!g_xlRe7be>iun{~@ZIVOXarq3!ETckAOp9EbC@-$oMI;6aQ`F++6-y}y6+OYQ#
z%MP-j!YL76_q@r7imupek|g>|JUz@^n%Ur6nx(}V0gDA`4{pwak^cgXwQ9fx!q4h*
zdyiXw{0*emC)s9fC=W>4bRppu>4a>@2iIkt4dBVcSwn3l6u0EU`q1mLS;i5f_w4_M
z$iX@<30I?<`x<B4yA5ONXAqV#j(Q@F$D+J1!DNdCJSrKoF^z8ym_DERJ76+dSX&_c
z9Lu>dg9TOcoW1*6%1OPBuRt*QrP|Z$GUSuWH{b8M*dNs=<302gLA)tSig%$fFd3`k
zkKDKbCFtp@UwNcpu?2_zd!F1jJV{7sWPaNl%)zqLdjaZ-KOmB`5^b*u6<qWn&i&M3
zNpgYUwF7X~#VfV!n=%wY0U8762gu~~cd8}59^a_4ol-a2I><K9E~3d?Km5%0HYS^E
zBFu)h?an|A<{1u*`Hzm?1DIz3=-jZ&6Tnc#7R@Z~lbR|}2*<=PM<YIYF-5o1VO}SY
zu!&`UHA;RhCVf`^@Ug_|b9&<@e&{N-6UvTg`-Q}O!@$^OO%MC~sF|5-0s4FxPaI$J
zAA<p2=6-fv_}EEl=n!k&ZlnJg%kk5}ZfPho-7pZ|U&djllsqgROg!h%L!B5J?8tbp
z?}R<GqTv~}M<x(_9I>K+8<%|#3qhL>@HM80C6&D1B2L*bte&&i5&cKF*{AlLZ5!0j
zWWMJ47MJduDJp|TIkExB0!pzHxDQP>YUS1AL*kB;&9;%@jB63$Nghs4f7BKkdf<zH
zA^0EaaM+VR1HPMCR>e;6<^BM6+n|>b)$c%$WJuiPF)G%?S1aHfsN52Ft{R>LAvB5{
z;inJ7Iq%*em?(QBiStF3uD>5IPJVr`DOqQpZPPDppK;ytgd|Q{?e(z0Gtxx0qChV~
z;3Z;=|5Hfwcg?IykB*0|kI}HDQevZ^AduLzj2}2s{U(x|5QX$tR*M(q{l^~Zv+#Bj
z>QfxP$jmCBsv7P8IogobUi8nO>|K9e`7c$?i8_4EjnPu7vtP*5>6&c2!H0W_u_Xw|
z2EFAs`}QP4y2bZ=?1E8w&)p4cy7;WtVIsFT5}RDY&#$m%y3gdU_S8x97r0}YBFTz9
zMkUb+W}#QCP7WM+Ji1!Ci(!vZ)|9)r9DjJlFqc3f-F&58Z8&^uiA6@FbU$%8+FwdD
zV0ENp)KAHZl)*QcGx@>hb6R(vHA*j|-#(-r=k~NLu6&=y_dQ#Jk&@V7e#N#pTy-))
zm`J(uy%Q<9G}Jqk;3I!_Utj6r13rEhx6{Rd0sfzFUwCdt!BroKNt@u&3d@xP4goA}
zzaD(^9&PT5TFD<E=tj>J5AHU9h-N;=xSc-H`U53>e@~x+suhXGfTlC9d${DaUA+3P
zSJ8ne8Zp-&sCkDT2R~)Si}+~1lrqS+qK%um@Sg;HKRB4wSdBcN3D>wxurdUj1VO7W
z!{ag30n%=Xr_j|;X^!6_Mn;|H%asOLz0}CmBvb57?XO4}s8S2R-ND^OVUIEFTZ|1n
z(a$YZY@}q*iM^>{=(hg=GOx<y8n*43ImKnIm@k@b6-0$tb9SsuEj9s?XoH~J(2vvN
zOV6D%cmiJOOWOw85grO;35Oyhxv?o;7XyoJM3YdW=~@p;i|$w&KQY2S2Vqvi!f2?S
zvQj7}O+8erRUt2Hmr5fPRyS}jh#j02z0|6}buNwBP<r<L7en8S<O|$_b)ggL0JI-9
zlk(DS+G#%Y3*VhPr!CI7Rj0&c2@SSnT9{>xRlsCG^GX`Bqt8oxyMw=kGu`}1YW9mi
zG{euAdgPiC1cBgB^K)Lqn`EH7Xy?84)>YZYy+s@cNay(YUAbwINa5TYuSw}q7NkR!
zWGea2tjiPMKQ;`fjrB<nO2H9neY!+!@Ld}D`hTXKSqXe;bBdJ1iUwmOE_u^weB5l)
zhauHQ&C3Srmr?bPgBjHJ+i}y$dBS>|+9XkB3JUyOSoF0YOWDJwPd2ILf`+X_`}*O)
zl@?w(na#3Ai)z#t&yP$);712}V+uEcbmI$4n!XL?F9k@5&AkFJP+CH0U1mZv!#x9S
z?k#53%=vOhFL^;bLgQ)CT#T}=`b@<3h4HWLG*ut)oQtp8u$Sn10dRwmv<|w|ui~a?
z|Nc@0Op&aOvh&+lRs9cemywwo{9M)|`&+o|C0t*V`YW)sp*8tlS5t0-5)_4VlpDKP
zJF;4k;;^9I^x!M7PRF)j!v({))lhaH5iy&%a+d%g6t(#|dveHP<KrVqN7ndo$%yNJ
z_h#Q~nKHg-C|`B^(|hZn=XSV^I8u=5*E|!IJUS54lvUqAD&80Fj8KdeuvxTMcFv+^
zFkeNN#DCcRG9_x^kvC*Y`O}ixgDsJ)pLdHa@TB5MmGo=nTc4jyVd?br8!m3X8W#|L
zLRVq4th2yeQD<V&#%2J~E@i86Ck<KON*9*e7f^(gWyHm6QtdZKK8dX(1;P<+0{UVy
zM(*zxhE&sVEiJj7D_5h$z-yrdjM4z1kHxC}>O0l_Y+i3=497ZzdB_Do12>+!FqHD{
zA9Qw0)mz?D7}G0(iZi`5{2BLDqdbcF&XA<IEf&PwD@0g^wfwS5yh!%<W$%jAC3}-8
zV^VJvQ2ElAxXjKB5Y>TaLmfxLj2E=)8`RV6haBGyN&u*pI`Io9h5Mvm4gEz6$Y1rS
z)Hze5aEAjJ;NS9E%S;hjmIC7r0@}d`2x=LqAe$KMe17gnIq@HWT0?^OB7ii8Q(sQd
z{qg#b021YWjc&RY!?+_X0o)N7pUN~i9U}j*1^!4}e~?e7hFUTMOoW_M?7tDrI2X#3
z`jt<RS>gzA#+3%Mx3m1muUcL?Gn4!74_Kr1^4ZJNA{T7}s(QFO4X<-MJoo`;V_KqQ
zqeTRdCCxxrg*bIS`>+O^D4C=&czSu2e6va3@#z#ZgldeRAYpuNnpw8VpUrH#cJ^WQ
zKfsT%u&>&}XI8zvy}$Go%?qHlV}=D=uUi+XeyP57e}i9C=Cd>2B_yucwFukTj&n$P
zx$Rn%urS3{XX9VVMH+Gp)TjJy;0*Y=!TjSaRknNq(V(=%3D&JU3o7>{WEla8*YVz7
z(zh=y*&B%_R7vX>oRcU(Z)Kk;VVFns*!#|SsNc=z#8OJ8iplu>aZTviJCd>^>8dMc
zjsCOTg3$_|o_DH|@yHWUq%0Idai}YFwSRrFOFRS*0T+wa5QM`&pqpKfd0}$u+XJN@
z%YFmxcaAVUFrp@2Kb7sM5obbB*2Vmy+n`k}JZhLea#zI;D-GF>gr(?NR?dG?K4AZZ
zyxU*fmI;W=B1*pB!kbd|<))*B?N>j+-R5*NYLTIr0|ACh^AqR67;M4rqBIljf>)nI
zAXxqeRrk_4{FRL0>IY*_ubwz^;2V*fd%xd^JZ~!FNadT)mmTb($?e-;!5K#ctbQX;
zfhq>L_#yI>1Mkk1U{A`8Vm;Dl^crkNj-*9uT8tt!PfkkhOrrTSjyAVv+ehA8a}Y9+
zvuGUB!tXANhekbGiQAi*sFez>DZL83m9nNXc#~$8@fzD;3Xla1=A-3pIxdfwOVZ!>
z%nyiVcRbV+(Xjb(c(NBiG`TCaqrd!0XY{k<8<VDc9sMT!lSlimOE_4sf7+P*g?VJg
zVR$|%Gq{m<X@pDRzlocrm=Ob<%159OE4$?4<#a>RxB6BOX03$286dwOkhjFO-yUqx
z8<LBa{U}MlGv)J@>QU)DoZtGm-Vp=}56xO{oAP>S{X+hpZ<;}l$au)OLdIKdy}IYZ
zgW|kT$Ctuv1^bMk|EQvpX;wb^LJvozt3+9E3?tRdfKy%+JBz>X-)nlTNn!Mzkv+i8
zhd1JqGH0wC$>rf~UVSg4A_yF{$0_6?8wigWIIVzN-m}}DWM<}E%lk_DrM4}KMHRpy
z)}6>Xgm|lDW2Yw}jDHPqIqoOS*j>PNwa$cGv>dH#1Lc7G)lfKR?ZPN6fy@Y)oxTq}
z=yxMFl7sKuJW?Kf>l4zXh_drmfQBXUwOX-|pdLNrHa`l15d7M&sQh{2G~`r>j*?~3
z*@Oy(qBY`3Oj#4)p3U!y3ZcOs7<4~IKnL<XG+C9pIlJX<(;0gVrE)UCf-KB^ULi_l
zs<jLOok}+=l*<L2DNU9{wM_dDUHqpt#d=M6*$<;m6_PB{OnB6sH==d?JDKGu6fDbt
zP1z{&zFpK~gM;n7K%b><qRm!OC$_X-YO=o9r9d5MAA^Agb^{tQgT_Fo-3ELFsk|67
zYi|Rt!*b08Sg31T|4I;n@rgLvzy^27QE-c&bKiabe7P9=1I0Mutcy`c#g2C%<_>Ii
z4FL(N`QUZxaCLWXe8C6ioqvXWjs0f`-_?vqUE%76AuyBoh7!f6Tk52(G^ht;aq9~k
z;%&lIYraw8K`87=h40@56@~%Vo}W)kVX36zA|-sPebdgY>0&fQ2mef>UO%fZR><O@
z3F6#Q<PoS2ccdVi%`HSoOXCT!aZA@sW!1+=Rm);BHv|-y(>E(J@fh-Mk}C0}AIC=B
z;{T)Qy#LvJ+b|r0*t3+1ot9d)N@D9kO0A+4t-Wf;9u*X=5kyg~J!;k7qZKn!BZ}Iy
zL27SG@qP3D1Acfu?&rC4UFUfm>+quaC(+N)fxFr}>Xu{a+!f)Ad+J4A@{!@Hcki?`
z`Z5W*!{+DIyM!XlwoWT>GJT)HUeYNS2hSRqZezsrJUvqb1VG=NDcrQY*X0AGo*l_#
z(dSHG{F(&*xSB1GltN(N<X)HeA3bgNNC4s&Pj)W9r&YUh_#JV(P|KI+wBp16h;Sul
z=pSopUn35askC0<_sg|(zQs787p1mudT`pME>-IWPwsyCIc?eZ=4Wa%DaC4A9t0e}
zzmMO^|7U&~vM>4WB7B>;;(q_0!>hY~mF_Rr`2CkTcaqENQF-lBgfuyLQPseQvH6P%
z%LBgXYaZw4IWm6}%Uv#blN>)+H(I^?tt2LL^VgS;<z#c!!g=@q()}Mr(A!x{N(S_|
z?@w*-XDqS#6*;}Nn%=GXDd50~>qt|^WvCtX3zlR-2ku|KeX~eP2I%ip9K;g*8&~el
zZuP(T5Ag0@LpFR&iEbt#IIQIw=<dL*6ZoNwQv{iFUY*{du+sjyC2iCRVej6xfe${c
zHCxYU2}<+c`EJHn+}Y@P$xb}oxvEK+RftzM^j^U;{4l#06ABsIICWGVl#5&c?Tsoh
zHxF8Q{KjYQ&-3P^%w3)KT6*0i((DUzc6R5R-GhC(-k5A{;<^$dsW`+l_L5HJxU{AV
zslolOe;$D%J0VPVynkX8klNb6Iyd#Kt3eHDsU#$YhfWuk?%?&7Dnry_zk^+U`qAbV
z4`v3Qby?G_CR2q==Z<{;`Zr|XgJ{ssvN)^xQM6(TMnF@$@wxsRUwOVw<f+k#|Ll8D
zz-Jn$WKsiw;XU&!U4FWij(a{_sg8YBk2#?DiSyz1P?yfSD?AQ%;-A`h)!jL>^`xop
z{Vkq^ywH-U242|S+;R1nORoLur%my8l#gwxmc-NNzrRJCTs$9b6OO2C_zxi7Jr|?8
znYAhp^6ZJ*DUQ`al;8LobQbmf)<&BzIVn~*pl<%m6N(jAX+5nD80`SxIG4{8S*Wck
zaUn6E2x_@2R{sHFI;1^clQ;HyAW~|4uT-NNgGW*d`s4yZJcI7U5~1Awb|Kx31jgqN
z_qS^!ZhWSVhE2EdUj&>i+kShkxj*`Foq~`*Us%fbzRzk*j=QDA+=i@1Mkn;!H-=!%
zj}^DBPo*w*gh@RuF=uRkfvMQWCx_@ZF<0uW<9_uKMR}?4E0ZY_@7aiX@<5C0B_R9_
z01Il;dMP^H__WiRy13cC;BZDIto>-?#cBFkT(O4`r|{okk!|R4<yfsN#M`A=egyI{
z*y)Sx4ry0YS>YZVI<n@~ZcG#=ovbI(0@Egp0kD-Ip~FfuaXXhsOs(K>ZhG&ehdC~v
zik>=Af0BuLM3=BkPRbX+DV~j7KdvDQLtI{MymS^P7{?Or(niR@0r={&ipgfB-wr`5
zMqVbyVLnvhFP*74{?taIAGhSt?Gmb$*Q+t7>$g!}cC-OhcFEG?&AP^>wIuEhz2sLN
zD$m`BD_495EE$Jrtxr0!E~nhd^2=itov%DyL&+O!LiqXpR7SMe^VtjU-V@87!T+Eh
z*cl}hL$-?R_WbQcY#&@=A#eO{w@$3bX=UstwUtff`h<&u?2O3Kzo`q=6o$6{V&>*l
zTe0jseZ|KN>xv$96DVpr6H+704#KZXB{43XO$yI9)M!yWderr~OgwNWGE8==81Rrj
zWdOmN{rBGxoKGQd1G8tk=FGi{3N$>Zsq)drLkT3lPL;%-(OjUJqa)CoVpk~10D4w#
zTH9*i!T)r7+L}re^r{>A@b`mPgXlZ6(D@b;`(HLE{K>=-s|bzt5Qy_(H2&mw*;ScG
z+K$9;=PqClVh^kLVdkr2(D$&e8!;v}hu6xaseLz6uJD(TnGD%N!g5qf>c-Ys{Sp=5
zeZvp}lA7l~0BPkM<GhoS$paUrIOuzxGVA?uG%Nf@0-3~CM9zmZ@`lO!jtKWN4<UZ~
z1SIsr<d2&Jh%K2GMcQYAnMUdvCJyetPUAlWQjNf|9t~?9VZY_xIf;T^4ItoTs)Y=_
zKa7_T&=wI>{Pb@c8R`Z-I08_&yDaM&<^!-kVHL(j#S|gN(r!1cy%<BtHq6mf7Dd_)
zN{2dN8+C9hDk|b>M2XM3*#w6**LUP<xUVtGw1&vx;En-i2a#|MI4-4s&Zb?aoUoDG
z=2gNlN=i#SZeaG9E?Q2wODyeo*`*AWu-80t51_Ejt}Wx*n5?|rlRW}p5WrZX=k4u@
zaTf8pqB3<-T%dKkM$IrU*SKDFmz#DBg=Nr7vKxEu$R?Y`g3Sw+xlaH5R$&mjpe$^^
zcCNgfXxmMsK;Slv*A!}-R+IQqg<PsVD&-U7PdOj?kruE38DsxT(*KMC`9mMKj~}hA
zDtcO8f_|0NYRT=bYcjK(ebVIO!GnL{8(bYssjcn$*R6_nc)!BRhobT6n>I%@%3i_t
z`%eLyTOJN(MI!MiGDy464OZ#rZ)V(Cw10~z_|CUTESApAY26!Mmk0XnAoWSnw=I(b
zO#csaFRU}Iy6_T@_XB_OqA5}QT2VMud9{o_n7F?4oIPJup__dieWi{ckBjt5sgbJw
zn75V$O!|UA{W5FAecb5|{Q=*FUwFBcSSx0vn^5BD^%R(8yh4oWjr{J>*-S6<v|vL?
zBTl2HM*wXy%~iG$eYc~z{o>c@u^*o-BVv@oah3OqF`+Jy+i6j?kbA%gEMh9Io}pmH
zOcedbQ8>YW+2m0RS|>%}F(AvS^BMNdQ^*=cj{WW-`?7U12?1IDY;5_d#3T+0Sj|S3
zN&NL5rPY^QWfQEi$!YiL0sJHR{NjGyraNr&nokZ~Jtj%i%I6-C9cHTUdU@woubH%w
zO$KPK`x-Mezm|ucT{`EEL^GxPXfI;(O!i2WJkb~>i|Dj~w}%tJMjAX1nQEpANcGrC
zq9fLI&CE_vcHWowa<qwz*Zdc~`D~sSGkwYwTCKYvq;&D#-JNF5$^rXhFzM>faWnL(
z(ymej<lxBZ`)e(>mX*&GDQAq*OFSZtm;$G_D*_35FQpSn`~uX{6Tf<o=jcD27`~9a
z5hma#osawxY34*rNxh$F_-3&2ze3t1F84exnfc4Sa6LWe392Ag%LjcHYW#EwBxAuX
z`(!xNMFs_c)D9(i9pRo~<W=%@#C2hC&gGHmOXn4%Wijc0nNPbAqd7|&dJF1b>Sca#
zrK;VvBT>IePx0AGEu75J&#D)uF5``o2~#N#{F3&UPYSz4mkc1}m5#m6JiCXc@+qq3
z!djm7tCX2hnpFa+C3-Tz%!$#&iL)|Z3Wq~~bjiASY~IGyeyNc5T;5E}Weav{GaP>-
z$wm<?z?!}=@GQqmDYrj{!gR~?G;2n4yAXM8<BeM-6u*>tDU>E1bMB3%3gRm^j$`p8
z|JqE(rz}dp>@<4u>*`%C&6<~S=rm7&-zL+Bo|wAOO#pw4TNN246G^q5OQT(6njl&Y
zN=-q^4xD@qdI1CTNnrfXKUa?nkLUby6Rk*}?pJmrz*IWZXd*mx&L!avv@>KT|Lm&u
zf0QYcoZkA)>#GqBtC4EFU%s?--ky188>tTh=Gtv-3_Iai4Dx5V+9I+@AN`5uN@U%5
z53^%d5Hh(_8j?GDiYs}s=^w!DQDrL-nMFy#4k~$qb`grZ4+Ze*ji=*}k4wU;`WM**
zMX7N8huYv1=;<&_39vSe|0e9yGSc%SGOXgZQ((~y=fhN_+B?Z05?Qm|(H!CR3L))?
z;lBs%mmRh+e(!Kz5Wmiy`SJ2UfC%*b`<K+`)70+v&23jh?*B0G3*bC3cjSGZ_A_6-
z;;ycRs4T|0;G;O>Ai;O>&O+z!t+uHM$5>&tGy}7**8IBLl_Mr+!1iXt%Q7`7Nx5dk
zqo%vO>>Bg62cyd#Tq<{MqlH$Q3U^lB`^mQE--H*d+!6~Mtgug`h!{cqQ4=jaLkmWu
z<SD<~{><ZN3{oX7ey+J?YWkYST*um{$N9&<gX{Z$`AFz4u1Ti8q&bV8T-vWiN7no4
zQ8z!8>P_!8X55q^f}OSx=5q7z|Jy0)fea<d{oS?dY|kl4Iy#>^a@oJxd-E0PFSvGs
zLtV2W&i6f87w2bWL+8W`5uWxy`lxtk!g9cd<#eS{+@_7ypTha8cYh66N*k7#EY#0w
zYx?6yULB~7eE&TD*3=(aBOXXuhsa`jiLeAkyAc{|qCta)RHB+vl)(~NuKRAQdALEZ
z;9%3*`*EY=rq2zVy)2P8{YOFHVLPV1x54kht@w|6hy;K3r_b;izDP=-sBr>ud>>e;
z5BApFo*NW#tA%*!3v(TB47=MVN>%h9w$c`*^dK(FQj$?OhaM3qd^wM?My@pXSRV=5
zC1P!t55w_|CMW@}bF*cI;jB>7{r%x6<1yy@@S61elk^o$m`4_&QYbWOUFvo`8<v#U
z+nFp~+?~GTKaWjNu*~u+3q3YgRbOR@NJ31_Rk>KwRr0c%ic5QbYitFM<`%1*V)-(V
zOiHb=)wBB#)TBQ<hnD*cqv-s0o-(lwuMK|Jlt}uJ5`6<RcH~t)LwgQ%UadVoDL;x&
zKhN4>_z?-`_a|)Wy<<<VBZy^{STpIla>v+mLQ*aZ)$W40PV+!Azpaa#iEF^9)U7_~
zj72?j=17pJOt@-fL86_x0?Z1-=L6Wv)jiM?k5=x5utHTx#3aCAyxl5wmj{qkR5`0~
z)k^;&qe(z2?VRDuN~vb}*Kqv1(=udgNq35m$Tim16p-e~egp|8IkrjZwOhw|_607)
zt*55~B`-=YU$@meK>DMyk;Ll16WU|DK_!p5^_NBh2@#{Tare=)5~zPDZF&s(46*q*
zUrLx&Zm=QRlDDwzl(!><He2v&Un$eryTOaQRRw=selYZA$X*l*rN@%UJHd!&T8ep#
zB`In1&r8NXS+hLk|5)|2)`F*%G(!Tf$CpuzbEZj^zm3-WxG^<}7D{8)gqrkl2p_1_
zKYdr1(&Em_m-!yg)2a3Z&?IR{W!J?CjySiTcwo1VelEllh9Aqz(E#gmX;XmRxr9NS
z!0Nxo%s>2hj7E$@=l#@(a%8sFRUP)R+?t9^M&7gNJ1A{l<>j1WO=;5CyH9u*#r2_y
zii}8c9r!!3rp22P0K;MVuFC-pX!5{iJGw|I6>PApW<D8z^uM)SA+?ALW6^USu7Cdh
zil08hiL4|*ymG*C9-a2OdYAlVi!c=b_rTz(QavlDJ%EOv$!13%E!#W@<$~D;?VKC4
z>IpG)+Vsm#ho`9DAi7ZWVmqpTa3uj%=ij7BB@I&+d9g&f(Q7m0kP&i^{*K|qI61Ud
ziK0=$sY@h@nen2%rogSlGGv^J_jn2P+Lz39K?5br>0X<!TZ`fS%O14KTKdQc#5J&k
zYJAD@$SQ$u86cmOv4whU{5tCPpcdD8GE$wdTTLT(P3IBCGQ`ILW1y$Ur0fg6a@p(}
zl)@Rv{I#^VL%FtTrr_{HuY#Per02#PMa3S`2XM<vpI@9U(=!H-Qm~Yt_vZV%|9cXt
z4l27W-!?1<>m+?^5rL#^W%={2=fBSpYffxAH-Gzj`WSZ!+j{!!R-Zts_#Dy(g+<aV
zJ53v{lOKQiWe*b_(vwcOev`%qA4nCrQ97M{7?OK*Zel78W8hF8%4&xA5ve{a8x3(b
z-)3CyB?4Ovb7<6x<uTvQAS~}{tPaWSa)Uo8vaB+7+_=dfa&qZf`B{5#P3FTa6j;Xl
zw~XLVYa&m8ZJ{!^o|2j09JsUG-p-e?t{lR2@E<_1MAk~89`x#?6v&0}C47KA=gf!W
zu#5gCtpYd^yHI<XXpZ{r{4s{2mS36&cb#3v5BVok5$l*b<*{3IFtGU=^B>@KQnd7?
z>s7Y0{&Hac^R_URYTspy!i7ohULi&WXVsY)MxJz<+6j(ocZO~T;#W-RhZ{1uy|g)r
zYQ!7G++RL^YOB4RyzW|5>3A=^pOZ(VNq<hSaCbycFP!!&Z+{;BO7r`x%;+v33sf-K
zHTz$a-+Q#3+k}7af1@xm!ZX`dCrnKnbv8)(fT-cb79ptkU@At``&Gjm;4jnlZW@XC
zx&~K_`v8nM*&?+&m{B_jZ_MAV`TFNGhdPak5XtcuJYP4ksOhye9~lP!DrQlZ!d@(0
zW|viNeS8Jtd7Y2??LsA>{oXo&t)Ho23O*5UfD`W-lKL^2aultk|3we<vb8MT!i0en
z0()smpVFS1RIU3f@DZM)Uxr+dJR$-3sgXpKf^&a{NKOD%)WHAWtI5-enX?xkk+dh4
z?6itUBeF@Ax}DZd3F545&Hkh}F;7i!F1C{QbwNhE)ex3UdywyOpBDN14{&eRy6Aqp
zqzLRkOW!=|ytgkUH;P5M>O%7r>{JxbDn>P&$2k&Ow2zRj9$8L6z^9Ox4|>JDhEn|b
zMSv)b$kknsxGoRD28LVdRJx%<h#aMhI6z^DpC=j1Uh3_-6zvDst~8gj&njnxTy50a
z)QS6eS1&X7<Q*iJW%k&BBI828jEhGVB(dXNjnIHqc^)}pQx+>nmdo91j8i7~>kA9l
zl&%=f<&L-)Sz9jymxS4EazxI^AF^fK)_`Gw)t){70lv=MVNU#R%E>U4$A%13kyR%j
z^ki1GOnLXqYe-Xvw~@N}p9XqwDDDAfEd!E(!1D}S)oNoD92r_{2iu#}Ugh;Ex_CB9
zsUlc)&YsZ2R-N{D)VWq&{r?$FSHx1>`(ex)oTG;QRChXCl?#M>^Go)uLC|{AbFd1d
z9*)m$9P@HV^eby4dioEyMaBGD(ef@s&gO`yWKwX36wg!V`ffFooFqxwwlow~QR#s=
zH+B|_{)uJj1l-O`-O~UhqYF7Ham&8=`)rTKe-zA8PYBH3(o`}dauJk6j*On(u;t}g
zG~s%->Sa!1X<6nz0YsX8<#n64>=N+u%J1m6%lX(3y)2tzeuN#;0=@R=A|&infr?!%
zRnlsl)RT2BX*kOVHd`r5y8uq3CUWS0Iv-|bEWa$6zE+qb8MZM#caTSq8?H?l6!Oe`
zFW}Q<zzAw`)scoEztekHz523EIe^0hr&=})g6ax6d#TCXa&!pF$Z*A0NOL5Wg{=c*
zS%BM^Y(7Vy?+E~Fde5hO!9Fvq$p^F`3_eKk-#ICJwryk?^js+9jAa?1RV9s7adEe4
z_xkDnj;vXHNos&+0E$ydbR9bT<g=sYLe@nc2T(&2fm?Ajy7?+Y%qi>*IP!Z#0SsTq
z*jM*uBgQw3iyO1v?LDNiY@r^5iJJL&WRd0MP8KK6pGT}UyI4e?4-A|N9hdP2pr!{;
zA9@&<SDZixu0PPX9l0v7Fv)M&7?IbY#19g(0)$C7?<&{gf%f@l#N@2EAi&O97xb(T
z&fcrZ`dzmUKGIb~;wm<W>yNd5(=k9T8om}06Yo7|UJXK9lU&_-ph$gJvi4iAJU(>S
z;%?0RxJ*gx;hhF$5hAus99T6Agr7&hzg?e20MinO_Yx*&O6r|Q0S`1hxjjutg0r^~
zsk?w{zvBEwTu^aX)$LbucNy!~78HS)Kl*wq&a46VX77CZoU`cy@$fGSC4i7-sK84~
ziC>wS;XhZMdz_T!Sp)eNu2e*ILb!3=xYOtM{oB=m<%@%<+4%TxYI=!!g|zQs)=}c5
zkTcSIypqgbacuIng*Ue=84I1F1}jU#p^k!27`(hjpUok0PPLoS?ho}bo(G|io|n`6
z4`AnOY8aE;q`4TO1<VPKnwWV1<;9DFf*xs%uyukP*atqM=nKnpcs-YKgw4GFtIKgV
z|A-%04c$rV&O-}%^C#`FiY}82al<|S^4pW(cbaWshl2p^!uT`609zfkgB^p)ap=I-
z++@+?5GY!3Nr`-$%Umn;FbKD&&JIeq9Oj1kSrxz`O3x|CP$h@ND5H6mpL3qXl61`1
z#b-AJLI_)<#7c7pFEVWo{x$!|QXQ786BXGd_6I!op25UClpA_(rrR3?;i+YM5BAiX
zc$-BaPPGo|Z%%3Kj#tkvMQ;SAuDu;N2d~<J{;1swO<u(N#IK2#y4eKbRA6dJ&=N~6
zZ}%R-^USUuH1uTW+(4H0_bj|7Vf^8HDpP)0q+;rB$mCG%>;_3GB;(;;@`2dNbC5eU
zo*@6D@`Jzd`Vta~Rad!i+A>Ga?m^D!<EVDc-zQ%org=3P$Q$2z^kHSK=H)(ymQw<~
zRR&00YnuB$5ax7gdeQ8k$X?(y+0<4J<zvW<e*GK^WJvlgU4O9sp)}UB`?K;*Ufa3f
zTn>(=_XHq7tR?-y_~_`JT#b!W{f5u)=7wyh6Ng$(!A|#6R4Y`D<hc8pcT{bqDb98V
zxOV#7l*z}2Zui89w-`s$Tx9uBksg`O_9UD?QAgUE&nDDHlZJwkxHT@v+OJ<mEu=lU
zk+-<)2)=8p>5V098UOyCtrKs~@*%4No^FGZ{(ExioGn+cnErkt^HAzZKNS-|1W&vY
z`5-e;t98Rph>XOP1LAOe#pFJAy3M%ENAa!Kr&RO6v0`%vltRlV6BF*5ZLe?r(xd-Q
z$`8*cx7IZo72NqG^@YK}B+O*vhl{X&yS8Q*|ASi&#=L6pR&y`?BMagtgVTOsa5g+0
zxstbjYX^{f>D_34dETd`us1c-(wa~TS|zC`EXpt#(EhS-C70Ih8d}~YzEFk%8<j(~
z2v`m_wfa?=-61$OMwRnWM7L^vbu|^s$@@3&^9{p0N{ih}X7Pa9_SW0R_89^w1-8-C
zZOW&taL<PLkCx4g_R8MlbP1_{Z*l9!aZ#k^`FL^vSOx=swL&dZFOExQuhPxU9~okA
zl}X&)B;$F%q5jn*a(4Ik-ykE|Jb%ae7IA4Tf0pk?LXM)LYVn=VVzb(#p0tqg%mgIc
zVHF#3D_7%rF#{3Dkg6C<S)3gD?sNTF5QY#jng2S)f%7#f3n$Alk70!h3FslPx)%n5
zG_&iQ3#O-kKw|BKkL}H{YQ6B=Nq<eabzBx7dcFpu>%$hdy-1t=qp}>3%z0J9?lhlL
zDmGLS$~SaY*4Mbx_7yGXCFTRS>qbJ=rf$&J%SSeihZirDyK(s&(SIHg2Ke)|mKGT|
zo1ho6TWMn~SwUcCDka`D6ZBY6lf?_m`6f6c<8+La%<vqHa6daJyhQGI{|v$09tUaC
zw&cCe@+(*#F0DGD)9I|&f_T9U3WvgCiCc$}OfY=-3(2bLjwMmL(#8ABX_k_^s<A?;
zBtS*Y<3g8r;}4P`b&(0$dpX}*E<@H!9XV}6GUIi3uD@!^C?0cNs^JYJty(&y(&P20
z11L?!X_gX>B2Yx-$@>*F9<%=e430h|5Pv*2Oi7^6vi9B>dpqG5-l&<<*y6@aZ=W0?
z#Te$D6V@kJlzP2qkQpFPjwGyOh(ao&l7jQkOZ%!)p8F=)KgFuh^jKT_|E`k%J9+<`
z@zu(_@$wFDQ81x)*uH1|vp;%1_g-*mzlE?$ebm;D@sF7&Rg*bx88WKaG}1K1yZ<*7
zjH2cnT?g817qzEo+Rj!{yln#Us3|We=^d9Le5D;@s7&q9d27auS`Slmpgez1zOIc`
z7PZ*PWl;XsKk<3;-8c{rk(9ymDDZaY`YFCVaDKDJK3{60_iI;)?C-VQE(Pk$Kyl8j
zpF%zRP`AtEJvd@M>)<MI*fIOXI;^k!G4F4EfQK-@{pl>IOfCCWVnOT=HpTR3Suo+0
zndiwO*OT9!i{s`CuxnEOhB1aq40FPj!kZ+6xsT{vkVtRMQE`SB1>)?vFsYMNM)BDr
zXI<&Frh^lmSee)nJ*ouC+u>MZir$kh?DE*@fs1j_ej6E|IOVH+j3~fT#5Jkf|GeIL
z7&F%i1e0C`#1h~QOPVj{)%VVH&m9x;Q1o8_B>aT6KNps#?Nhx<@o;qpL*iEhf%An`
zP=FqM(CJ?bZ|0t1SIOLr7|S|;zv=_?xvb@SFah<Y{AE0sBw8m|DmTj>cX-#$|0N@U
z6E{#WNj@Q8Hz#B<sEl|r#I#$JM^59R54rHZX2-q6mzrA)-Zk#Oidcm{Tj$$ozx>_g
z;c-lNleGxn!jO{BpLGKL4{-8}DrWJ5=kVUAh&tRI+EuU<&tYp>GJUMkga@rw$->;z
z^q!A)k{STu5n}$(N3?kS<)%y{0kc}=50Anbsd_}A^~0b1irI6e{))EHzF}S25hI9&
zaZLx?onIJLo^&gux-=Tv4A$35!rgn3fu|cAI(lE}|J`qjLcl5R7-n_k`}7iXOO)x2
z$Fm<?*ny3@80s|3jVl-q`OdsCFit#CzhPW3C|*Yz&h2j*6PBqQ+OnFXjt2*i7uSw8
z9NxPp+>%T^b3^LU{Ir@hCzOJ;e-)Xa9~>l(*~q`}>+o3x41;rhb34d<yt7bn0uRE-
zW$LDMzio#z;V6qCIeEC*L(6a~SHIFxPtL-O-P0-N2Y*1iL`^+gKLV{2eDp$gaU=bZ
za@?uOcDc>+30>!4!(|0ZolxzOeK!c1p?zS<%Bm7)Sr7jMAOwI-%y%EfQ5bM>q9e7h
z9f17%+9$*^JXNOsl+SMVjQtO{=gH)AaM-ML7nDSzYeWcL<;~@16~sRLmSRBgkgCX$
zqEZZhq8|R=_|@;WmU^4o8_^(6a6))aW1+K~{ad+*WH-GBFnvxq4}ZJA#)ndB&t9CK
zC2L0ry=9#-GDcECg%7Hs%a7YFKEL~HyIL(Ik@PLqLeSYk)z~btJ`$v&RsG#Hi`jBW
zUCD<=*+-j1({NpR4@|j>RR#x;G-Zyp(_V4TSrUV5)Uzb>(FE#B6dvEb#cCfpV;gia
zVgInx--{ZYvvl3LrO&ZHm^~KSdoXo$mRI=HXN;5J7NcV9i=Fy*HwHlO+UJ8!U;b3s
zfEDb}iUqg>b2X-lU#0(qo7i^B>o9u(PEO>gU3=W=IzJUPQH_S-Hu@Cl?>fbcd#TT>
zcCHu($;6N=n9i!(MU4Lks5bQwX2iI^l8R^-O40)mZjhC5af32i^{9KuH3%xMMbGQh
zl{3P6{53%UQuHb(4Su5G_5})npcUA%to_&>fjsjtz^ZjU3w9-GOMQUXTf_m*Wj8`+
zhYpiYIWDoVsA;y{NY=a=zSys#?^&#<iBjN#L_=!%*>ZBDU(S!Y2g2V(Ws%{_HpU`Y
zwA{gl+gszXW#agT-gD_*3bi2r<sJOd_T3HF;)i#nI-20b#Ud?A?PN)2mKHl<9)vo}
z{II{Zrnvkr1rmVg<Qmab8i%|uey3aRv(e%SgPvga@WHPmeAzi|;QhaQky@5^V_&-<
z@_m&!;kB!2*lZp_*(vu2vW=V0Qik+9BMQ~Q&Np~a!4ww6UITyb2<O^L4x_nFGqG?V
zac6s@M}ymds|=*Sl6l%bVZG8qrtf)>XSoo2)!I~0C$`5q0;5#~qk<}GZWl>cJYn|5
zb>a0ghmGSz9QCxjfIh^miS9k!!&8{;O(AjUNEq}a&mp4xt9LWn_y`Rml>-{hbha|r
z0R@2PBr~WwmTL<?Rz9<_KLSe6ZRf&ssu>}!pTZ<|3O;^CFc<C~4X6<-0nSv}_C1>9
zC%vHrVU%?0Y*BqW%tpLce)|%`Dtlo9X;&ZSc=TD3w^ij_MSn$O!izn*##ViPsb^a{
zC+rX1C)VP^ytpH8p(Z$9MRp^O#C2P72lY<&i~X_n?IM>VJN-jy(zWTp7*<Czxx3D1
zu05yDX}?J{Hs|CMyo#3Xgo5yp!;p(n`J|Q4*Nj|OiB9``{S2Vf$o<M3@%saenPnY1
z$YxW_2S@(@0IXmqU`g=h<G=1JeXW+P`EC4MumvpO=;HYWX$#wB5bju^Kl||X@qy=C
zW=KHIjA~hlrTgLm-jzO!w{Jp*RY`$(2@JjelTCLbLBYo@aHi1ijs^vyfdK6y76(E%
zl^gH<%#jq$5Wmtddc%9E*gBCy*}?ru7u}ZxI3BnRr20O!&$Rtdwp;jHA`mtwSUWP}
z6NLRPmiCvWL?2NOVa~42cu=(v%a0Brpdve8go5@b?<Cy3+N|59Jf8<_<t*GaEcPmX
zDvJ#j+t-s&z0F+YVKJzt=n(sbN$=Njb8H8lr_-$%t0EE5^eUkYe0~2<n^V;4IDw98
zQskWa{OlOd_iF5$nC=*7`S}29b$3<+N;nx|8f(vg>Z@oR0yd3a-uh_I+Hc&vNP89W
z2QgP1q7Zv2w0bYs`&PO&8~>p!_WXC7mC}PxkXQ2jH$9=RR-milxkRfkiH?qG`H5t!
zqOC^WDW4V|^#6>GyQPN|h!2$nx}VF)SR{p$9&_Ht3)fj8%@l{3=6cjzqOAT{j>u)E
zIidxDJ%l*6OQ=qo#1A#EMnr~qV>qwVTsX|ejt4VWmmto}fFMGr?!jccn7fM2hgjMH
z4A_0+c*}%sxT)!tf?e%M0OQA<K2Ni!ry=1otIVrNRckGN5`nWkF_zt5=7#|Brn;t&
z_VG5fveZV}!%{vt?Glk{EDrdzmRNs};i!V=n~Ip1E?{xn*6Z942tj3s-zs#db(9a9
zZb*jBMLvnb`~h+H>wi-kLYXez@F<7#sp{(jPmZ^An9Zvc#5X(pnuS5*_r0eAb|<yx
za%4gxa`pR>tt==C%Map3*15lhs#IDlNYo1k{N7s;_6R79i~rw0<JWwj{NF#1>4HJn
z#;a)dOcAo4ku-q=T>2S2HHxI(*xXD9TJ}-xg}WsZh9M@cJ<Iro<kej03~(OcBpmaN
zlw!r>LJN4(WN0XM@t%XE<$BlKShpm>9GTB;-dVhbTk1H1PRz$x(VZLxyQCKuF^5xb
z>W>@io}lMCY3+u#+}HV%-MQa!VT%<h*&eTJ7J5T@UxyMC4%8Xrw>RmO-?ub*&1^!;
zo5$xD#6X8rk-*0|uHA6j6p0Ty*XhVsh=U#orV_5mJ0gYYk}|c+uB`?D$K}Z0Oc!yi
z>q|AA&eCP=So&VUO0bIVDTZ(iXEHJM&&{|31FW0sFM+g$?<UH2sLmvWeglKlkwOh^
zk)1a`K?Q*K_z#c<utIIz*f#Nn>`+GV=T=(A?an^_r#!SJn3WTFx!ED(Dgt}UE+h~G
z6g|f9z3Q)kmtb)1c2vUtGc>|E*|I0Uk@ub?54IX;HNze@lNJyAVdaT!R?9CesEk?%
z!OWmC)&Bsiq*+F-6^Bvzoc?pW#ExJml`WMWNso7C@80yrVD<E<^B8O;iXYi1I@H|+
zN`~n-PZlKUYX>c^;jWn<TK_|((WSjdHbVxy==`9ZdzYn}DTR_a!IY&=u#ZcGNJxkS
zee?%JR%)v8=%VF-6AB`omE5}n_8s*8<X-e2z&Y0qz$+i)jZ?voRWHzFGqf5ERJX?3
zYBln6l2&s{R?6wZ$r==4n!y1jVdzVIY+9P8+QNveL6_U`-IVZ2d70W%5&^Sp*S_7r
zeIDMz^htA-o(Nqv;TLArXiXf99)UR!BBoL=CKv^m)-85K8OJY$$9YH)3}|_cOX4aQ
zZ$P?wU;-+Wc+mH{d&AvzP~0dFm{0~FepkG@3rN1*Sj#prhwD18Q>Sp6EqW~>d2qRv
z48e=Gs)=Bgfmg0T2$ULSu-!FJ%^wnM0xQV0V;~dfPV7Cx5qTcVW2SVJpdTLFR*@;E
zIgaR;;a|k~`L&3i^XH#`KO)DrmJ6~+v)j0^XSPwTCM)G04ZA*ckkRUhilKOmK!;s_
zIGd*3uG?Yhxhs|fCpI@SyyipWD5AqGoEM_{eL_Cjzr(9`wMfEX04JF81??-z-^}bc
zc9zMpYlP}fuz%s>JVp&>4c39dtQ@c2)bS*}&f*76lL%N!FX{pDjT9Ny6n0sE{>&~S
zojB~5yrw?{atrpyd!$jo!&G_{K6c4?y$vmF3JDi|PIihzyq4TDXRn_M=Q_RI46<qe
zz5sqiCA{a}9r1U<QN7u0QJuCT;j(qt)kaQ?(Iz!SLA}F6s7Xb33<-IvWPp6L;Zs7n
z#GjReam+~>5N46Nc{ol_6`cFhMSOA>+HwAj*bjpW7AXXXV8jKwV2;4lopZnPQR>iD
z#?ZV2HxCW2LAxB7+`F^Lb#)q11Nn8%T@4JWKdzeQv1k&+J^1dJ7{Co*C6Ir8_gma4
ztx0QC^eDR{0{@L;lTu`;?_JvuNtl|v_NAg}8-$L<GDnX}V?=#p%WS-8E_!yrjBQ|3
zT?NUmJjNM$Ge{7IA=!)%1F^v_$a*coq&qbJ)|bWaMZL5Pb54|>PkG<D^%N`Y(hqvs
z_{ok{`<8mQREVDk6rWdt(D0f3VIJG8L6W1k+`6kW7$G+tgUFKl^DR70W@S0K#utO(
zuI=&f7vtF(`E8M9mjMM|@IuQpOOyE%IkU)BcYQQeRLJtR>8>4*@3P$+@+V8M=FPJG
z`tdUb4f!@W9Y^vv;IQnP-0iRXu@5>{85yCt%V641LVTI)p_t~Ut0cBiZn2vB-FbaE
z&ov=?6dk}v?bQp3$wzjAb>G)Faz8t(5niM`L35<A*8oi27)tg@sP;!se6Yzxv|?Du
z$;M-(V2(Ur$NP965<@blXYtb+nWdHxuV!ci1+&UQifMPdNLb!~0LCSaYq=--3$q3s
z=kE-U{4ahZ?|$o0KhM{I0Wy}oNtB}vOd%%!L7wHx$IHANnZS{7#n6bCLaTOrp-b`r
zp3V%{sGFkE9i`gp+FCIDlv;`9NrAfgIPn)`fxmS;Qsmr}%1%HynKlh`_Wwz|vyMMT
z<-mlywmm>HoENlWb`&JdB)!~BK|~19;Rwl!zanG&1Q(&0xfXUea1QZCs<re_K~I%5
zI%(k#3&=oVKG&tFZ=(JA+O#^Ssu>WxdOV`fi4V3l<LQ)58yHap|9)>1!<mr2EG<Mo
z!=qm;1>PWYKUW9s6TLSkvnJ6$TIM(b2N6eX=VOY=$o>*<AgvzY0(BV|hk$JMzMo+F
zCRi$}Z@{GTRMJ|^s)M;{;1^_;@yP+c*et>7u6c=AO{5<8E-{Bn>A>Jy7SI(d5(=PJ
zX4zUQEgx(A@nf`zv5Sq~qM*8ZA}(W|ZfqVdV#ut;A1S412P0lwxfH-|{|>aZyL5YA
zGD@7xWNv!>O8PmD5Ch{wZcQBMK2#L`#E10BJ2)Y129F<+4|zWZm$!)c=P>)JU00<!
z%DJz71hlN^kVT<rNOW1(2;11Rn1?NXmZ&#xPtS_Y-7@27z-VdA2$Tz_mVS3Z0&qTc
zivOD_+|@ZFjD4dpz8hLGvA=y`n#%89<f`~Zyz)ub3Ec5Hp)Pf{Q#yP(o8%_rd$3Pg
zyp{J*P%BweCeK<vI4A4*7t*!TMpb}LpFULeFGF4in%Jv&xd`dh#sOwFn9rpvstf0>
z#FzrFD*n8h$>=_9yBBf11%39m;cX4y-P;kuhkw*APOu8WP1^_+*I+*LKc5~g=Q}P7
z`9k~kd5)|?eIROoym3cOKGcwuzmxvCE)dgV_1T;2VoMan$tKeghAp{#1!kTIVPFJO
zjrLERqE7N$7spFe9IcizJxMBMb@ytx1>g=LhzAN!jL%A>H1-Cq+L1=FCWV8&W)5&=
z4wbO}H;rHN#I%Ka4G2S!(A|alKV(<l&wnRq9hTkB9FRz0BptBfrgtb|3`Oq8W9Y`;
zaK&+Lepd1lC|Cp!U<`lZOb395f4FPBF;Bd7t-$gevD+XE5os_|utgX(u_1t_l4z|l
z%Wegql^^OJeBU>;Y9k7vTCPN_wegH64r=$T3RA`-t{<B}5V9T0^2Q6P8J>KN=W>kO
zNH+ke^Z5HgPFHzj&nM9hbkGkgbvo{LSbg2xAMe_ciNWr3ERqk&eW(z7*Ee>?;2aYs
zCPGkJD)?5{@m^fHNBa6J8OiqV0k8Cs-Vr3xF#Pg&74|0zCcJ+!PTt#I*xc7CkzEM3
z4#1t1{s#zJb4Lu)gZ)7@JT3=w4crMsG|Ci)k)ZHOgPS9pFU%%yk1Vttp9obGpDdf3
z?W{teKe9M%rVcMf#k}2E7Vm>sPnH>%VpmK#AKuRRw3jASO3F*My}9uzv_?G<3HSUM
zmGFiq8X#5mC$vNobG^@7sP<6*LG1uVEM<hP_8^lrY`w_Dzx5`i+4jI(d!$zg)58a_
zrB=-RO=sW+4ll<KN`XajYwl+2163$ZBbP)ReK?)g&fgdyrbz>!B!X$S@uQkK_J0@{
zFxqgcTJJ-=c-=s4>c2X=fNd!?nUG)uikrN;dbJTps$@PS#SGWpvx@ruIw{YrtD_yP
zKDP0Ba(}(}5aX#;CXY(si2fSf{nnnOwo(wi6u0t0uI_0b&6=Nnn`PDw$RVPO9qh6F
zUH3`57o6g<2gK7-QKOmC%XNxo+&hiu^DNf7fxGc<-kLrivynqw{K#I^-0nfsEto!_
zd=Z|7FznygEUL0>cT12y_X$(uZM4}f@(cT^O%2-f##~mY&J>~ccC?gxlUTeX_0@d+
zK<uA0ta&(DFI#V?&56P>{NC8`7Zd6~y6Bj>6Iifnll7Gm3z-?NyZ9j}-T5IxFVP`=
z`3L#75l?{q@$m+>(u`x5elXrU^(ebfTbXI_1{|Wdu0SiJ$yCPEhKSNp;xM7*B%g-x
zUOhIZUvy2UYXng+2EjI_Dgol{^3e&bnn4syy*VU?)~6+=qhv*Zj8gbTo3T`Z_DUY2
zU6}uZm;<sF{ny}?<|q&lT9i70@`4t>$uqvm!Xyc8R?Y@TQiCHBewH9v)+||9S<io<
zsi0rj%^_6c?tk<joA3=0iWQgVLz8>X{7*uG5u?`OIUoGUN0f2&XBOruaDcz?E^!)R
zAoIwc0S#A4I^WPW$&^?%Z%P?t{uZXEzhW}Iq;pHI*sFJ$bee=YZ|qY1hW>sf{oUjI
z<>fK1@6o*)dRMYdbs!R(ge5Qjz`0}SLnA~K&bwgwBPwRbp6dOQX`a;Y-k3K^!)X3{
z+7ZGN0q_;3U@S_SEDBkYygi#>o=TgS%%r0KGHkQ`L8?qYVGWSS^D#^@=R|C&k4~^{
z1*Pau8wkEwk0-O8buy9FCTAtH)`Oq&xFV1r9U$mH>yRUZ-eIv!Dfa0k34I88Fd^@R
z_gM6?8$4i8Rbws{wGhtqgpEwlGW+Lp@{FiH;Eec<&f6cI;`KhY`z;9yJD>HbpbqZQ
zPdx%3WXtjiCYF`0n=Z9I@2-;F*7r~;)uo~A*^~MJU?sC5iOMRX&jbsY$#_6E=6PKz
zKdNLHgA9U`UOkx<w)M&L{i6XTkxyvz)EL#4Yt-nz)K7NYBxOXN8db1;k1B&Mv@Cy)
z_lGV^0;^Sj?YyeLhx&R_O*XwS_oGg`ET)U+N=5Va*3z8kO7h>nfA<3myJ?uR1KUDB
zp|bKEzK=U94|HE}&^4>ZbaJa%ce0z$ZV-A9E%!WIO;!G-!T72TUxqy%G`$*e*-$!D
zbKBm_&zZ6KngBpdhXr0%<R4LZi*OsKG$(yTFSZPOz2r_G(Q#g6<@6;Xe2F=)s}EC?
z^O$d@k+|()!BZNeO$vpPV}X|gYc70{Ln(maPRhlv^u~DGOs;yQypTJ<t^|SIdfI3%
z@V2c+IRQ<MWRwCmujsumnLF$sZvGo_dZotuf&QDgglFWlb^aYY9KN|&RsP{xKO~42
zx#neoTGCB=5lN}@Mb-)=kyw=OU}?|G#1m}tC7sSTrGJ?m(F{rX4=|NS^QE;tMb!~D
z&`m<<(1(~f{?q?ZV9qv#`_0x+74~=4XprCe>;WcHN`Y66??oBM9RafpI_$*B4KmMx
zc-O0P7cg<{=;J`xi2e$8S+s6;uAvekez?+NP%#Gs*6_|dosa)oGpF}1XOvDOaQ%@9
zIV*W8-_vNZcWl*))hlTZwl;2QW^R$<r)h??a(}M22Du7_%m~ZW%a6gS0icv^#oSkV
zzdS^KeP|%%tD2OTo%XLA_D3WJW!+5p>-jnYc&GQYX~$+?M$@hH1GzK5{Uz|d2(Iro
zA;}2@5Lw~58&BImJ(9-Kv9t@PVtJsX)UdKK$6=|XzcU8p(~1*cI8f)HSMU_IxokA<
zk$mU`c7k|cxfTyi9%zz_!cn?)@^C0If$2r_I!>gg_WaF(38&!{^rX)uX?ydL{D8eR
zq7@IE%U6pAJa2Hyq!@p~SteEsLST5>LVgVl|B#wy(G3O6FXwDi$>MMq#-+F5OqrZ0
z0SuPnc=%b6>Z)NZN`_=)qYpZx0KEAC_%b=G9Tk)E9+IKmeHZVg7f2%gxPI6liF^9>
zJvgL=jK+3mb#>Kgo_18MRGM+jIwcnZPUDFIg}avTKZO)oK_9QZc@~vAVK)Ufpkn#n
zaZ|^W*NaAGz+6uo=u8X4m*Lq9y~C6=@$GIN4+@$Gn97vd3@zpw5cT;qoL!GdP|O(&
zA4+NRYq*WW<HLk#(jZTkL|@@RT#2yC2s+$tqRI4+R0ta-74$<0OO=mVd&EC~$$^{M
zCz9+O)O^JA$&SO`!hysac1R$=JJ%K2T@?c_^o901lcpG;s3>)_uSQR=&0Hd_IV5Kw
zzQUKEB8uMejEVh_O@3?bB_oTk78Y!L(^u}nOob9Tio%e<7y2967o|e2F%QYnGo~^v
zBu3d^lK+Bie$7w9sn_vN+~Tt4aGL&I1xn?8P-t+Dtch<J^@e==>c@F2sRdGqU`dSB
zmq3E@3;@Sfvr5jFb>kwBM0%+<gD}f}xUW}6r{Rn0TlCT;nqC^hpj1=?Wuus7uKbPW
zPcKP7_bd1$HTLEjeP(l`J7i1sUTpG7H)RiYy4DhCy@H=xv3J}f(<aEISq%+6Nm%wh
z#(r^biqm$a5|Ky-U+>rrdjE>IKgulzjM(Y!`=OG;*3EPe%G6}K;g-I$<@({4$Cnj_
z&bxV85z4j9UR*QkkTc<p4O4boaftJ2wb%f^)09x7L}O#dEd3evVUQi|nEWVWoUbpA
z!m0PASoY5C-hUCZ%d#HZv`9w8V(PP|j_yLdN_%bpB%l@&EFY4iBIY5WBw+u+;yemy
zL)Qq$<||*h!fb6HogSR0Bouh~Y5MaVVn&s?n)VyN@+;TNM$=_zMB`zGefM`FK)#*d
z1TtqeHUoh$BI?qlzj2~KpvXjhM!@hFPB_6y^(u@~W&2LxWvAGiZ4R4$7zTVWp4ycs
z?sV=*-8&_l4_v2(!GzReJ+B*~qzg|^y3;=_=U&#`Jye>Z#28$DNS#xlDS?tlD$o1x
z(F-~b;v)bVy7U!=$R_*-<v`_XI^{q0<kDGMAy)tW;Ij+U;P;+YkaW1_=+>=*dqSKr
zEJ^#*+(O<3V2C!EXJib7MCEQAmml6fc3H(>>?1Mu(uB_OV!%&(mnndg;{s;eeV&BC
z{{I`mu+YLX7Z%^CFHW{KqVE};K1)YTTo20?y)1{@!tu&>#U@h9LIYke9?ZS(H_O#s
zKG-=PCg<4PI&**R36cN&FDhL)r|80O!@Ox!*-pBSa``-dV)^v+eu3P#yFJP^g#%Pa
zkXYKNCDaV*gEgF8@6|13OkwaY^I9CB@kdr&UM9p!GjNDyfXjP?inF<7Z8Bv$`m3f%
ztlL|HFRnA~#DK(~)jzJN3{k0r-!6bS3^)L@F*(8Z1R&}^z*quaVouy>C?FJH&*^Cs
zq291*&UpQzFMJ(`^h&`tkPWC3tE($z7M<PcWP~{vi<3Q|XRu3HnS14!QtEZ`Sd3|R
zKHaU|y@5fN)N!EjhW=rdWbt%@RWOk@-%F7#E6X;b$hv=u^(C7(sp|{{h+KXnjs9N5
zK@#=mQ&H4BZ(hPqe;3Kj4f>rTxCGu@hwv<1cbJ51q1k)?tOQw#P=Lt+oTSM9l`-9L
zX2va(ilv~8j2089RKK<*Vxn3+{K;ExzJ?A#)9G@(>COe{E9|`KyLzX@_wV|79<si9
zmVgA{Hv07&AIiMc@<jgWK(ct_Ik|*J!?S+cDa@Cgay~lG#6KAG5T7Be(ZdNj-9?R`
zW}Q#5;<~lRD4}n-m+JgZd`ZCLiqj+?_wK409k%u%VAj8^D_NuYL1keH_O!ZEBVC%K
zlw>I=5Gr&hqQPkxx@d1!)SV^L&!}-m(!{s)*(n?7t`2-&&={GV$MR5V@LZjrZCHUh
z(3>K<QX|j&$03P_Xs_Ta5)x?Q8ZMu1*vEm<NKSr`)BfGCUrmwXUvygKe5#;~vKTk{
za7t<_3Xuc4ueT}I_d$04k;bbO@M``p)BbwJc`c>*_n=qOg>Z06r{@9L6p7V(S%!9L
z3+;N0&6PZQFKC#!h-nH^OXP1YnEg^|%}ZU?ff*WZSdJV*j6ek|y28Wmf32I>&W~GZ
z5|j+FrsU$htbMX$U*cNYNUw+K3F48G3S188QzZWpzuG6hmL2s3>+Gh$#kT-HzOefS
zz>(}ok6t)WK3!%VDyjwT`Sw$3U!0aR+#bW2at9@xV+IaKJ(j(eq))yyUR|yAqGc~D
zXpEoVCT-gWx<<mUjQ>1|Ve;Lkf!$>mONkn<9+%q{r2hR;&oDC0RMZ518;M=PZH@E2
z2tDn;Cu5SxavHsOGh|Iuibm*C6fQ8Hu>RWXVXH*UAm4{wiqoCTa<-DkDs4D~a%HSq
zTf)u>W@9|(7}+R@TPqkA_b8|R0-$i;$gK(s{2Idjy1DIfbR~tz3plSoKe}~<Nn@%c
z*nRM;HMw+4>c4(&cJ*sP*w!Bg^R~8ek33k4xh566)HnZ#QO3e8IC9)i&P%6e2HtwO
zB%KIw;~10zZB74<ulO9|j2>Bi$h&IF(vxyl=L08}coskDmgao6RyNO0<7UT+C(nPX
zk&txyNR|`NfO(b!^9cO?*;;14y9)h~vtNo+6D}l_h%Gjs@Dox_$)~PJC<nj+^wxG`
zc}zmBZNDrv<Ng}5@CyPINla+O#81wj@#1B2McW3^F<us<)(1(?&W&_wy=JQ}KUg-r
zm3;PQSzQQC>a&V&$8g@3oYJZSZqIixN-5FCEDHDuJ!)#MjHX7{9wtkwdc=CGTrj#K
z8=LA{L*9=)tF5IF-#KieUVNS$sB(3;My_|tHBt*Lo{~mJ<6sa-k%fHCySZtfyAxo#
zX#MOXA?4jbzXpE*jO6~#eeyHiWr#Oa69BX^A0SbOw8l@qYDONJ8Qz|l#3X3lDmdKM
zz!_kb8L!G;klR&2nwRWjCMgdO9i;mG)A^aBMiDvQ&jdS)S3ljLiNeq$Pyh-$AYV58
zwPU)GoPRmZOY`?QN1>8uqfBd0vrC$q4gCR<|1Q&gypQa&qNe`1zSsq-zkc^aav^?P
z2po(i^^#t^og1l(iFMvcM_~1<-3%c=V^H#O*6qF3N9>fb%KsRb9-7w<a!a$IFF%|I
zOX@Mw>_y<f6OGn)zE3b)L5y@@6l>`$XLJ1f3o){}FR-7sv}&)e`Z~TiCNmr|^!evv
z{E1^<XXmU2y#yj15`>~}BSBdn|DSuDRGQX)GDdA~I-kO(Ytt6HGy?}lWVA>OHF)Dw
zdDH8kk+<1Iv&#?Y=?S0!57@x)Ly3j}srV+;tg_Tvq2uy?kP-q3g;vtYTaHM2#C_HF
zCLMrjO#iOxf$~3N0Y87oPg=t3++;6<d9x0%Fx+v$HZ9viaa`qB@4okt!=L6}j8L$j
zYDo&*wt2}VJ?w#;2*F!wzYsu%Y61HRsjh!*Xqv27&JZ3<mX)Gakp22`wRS}VcUd91
z=~D8(a>w3@lh!eG+W>U$@Zj)t`3M!5Pxjx$)!(>23UTG1sYeQ+?<7$0o%Bf>9o~Tc
zR#6|#H&MB3rf4l=NPmfHEP$*Za5AF!tMsjpLI&C4fUuVb(&?yLdHE58r#HXLqlD~k
z#%z@k?-v|n76`5fe4r3Q!u5@IvO59^)%ip);t}Z#QILWOw_{bD<<}+&eOVP!xRKp#
z5OB66tf)L$8*ij?zNKfhXrZj@GbBAhs6M}O0A96bcc29sCVTIxV@Jkd3|!MC6l@s6
zrK`5xbb)!$UVGN@AC)o%ty>}~7N`KeBm9c)&G9s8q5pAop7CtI@B2>dky=HQic!*1
ztM;B9M%AoMeN^mPK@p0e6pbKu#b{BZ_Er?F+N*Z$N=VhJUGw{U|Nl=tkq3F@zVGWg
z&*Pv8Bu8_%YvwcFMMw_Zd3L(i$T~AIU7>n7Lv`^%7C9&cz(1bm^}NT8KS3X;ed~gt
zE`uj7O1TU6|7xns?f4ynfRO>U&wkOnM@<52n|Xi9OZBy1jG}!69`$oiGLiRWNcX&H
zRK6DGbQu~+rz9Kep@fXR8Awe_YQ=jiVfEC9JRTML9eM3-?cLj*<js^*GuDsgaqIk)
zEZ?NrBvffa_Vjag*P?(e4m>I7m@JDh(!195lSIYGw{nQY=3avG8Cjt$=*B;fkz9s$
zs<io~<9f1j@gO|{3-c2KumQG+@6q_+hKlN$8htRasV5y8i^+%o4Gf+74zk7xc}7Sj
z1)T=q3X^jS?&MtiDt8{VklwZM>02oH@aVWK`{(*K5ie@L9vbDt&0e)MDotyxz#(_7
zuY*0PP242yg9iZ3k~cT{N4D^ds;9W6LjzMSd1^$G9GO>0CCqLLj91_gs9%`x;8V_Z
ztHf;;O>&oM0xRoKYS0_&*7`4I_1Ne{VJ6c=4?mq6`CNXFng=r_w6G(-m6KAjn?G;e
zxE8w{z<MJpWxmQg*an?``+$;HGEP}8T>w~DT)I-;7iqw%aGgk=S^{{erpc+ms8=NI
z^g*wAtPr$EITZD7_$mEo>7lKJRzClQV3+@armW=+QBtS&atjnXDj^~37-xL<4{9q5
zA2U(}J}l?+)N9|God~&OWeiosM*N6gOuZ(YuhBqjhr9s*weNJa+DATN>PpsBr2HrZ
zbCzZYCvx@m+hwUw7r%%bAVkj<zwqkhWA-3kh)7c5g>rc;NjC&KPKR9|P&dl;ac3yZ
z1^Z3D19?v6q?f)xNb}(pk**|&!mJiu-v;4)<`lRHb!h?wpFIHE`O{9|FD?cj8uMrC
z1t;rkp$}YbU%sn%v!@XJ`;My)8C?0^zR)2RFY&>Vv;sgS@C{HWBwyw|efk#{eg42r
zD7!wcCnd=A)xNf`Z)I;4gyL}5*7EGtSO+o%X87*LR+z*q`YD5q&}(a79E}ES#4z*<
z3dFxB$5l(-(c*Kt(U3m&JW-GVXfOay{wO`(K}d|6>;3^PNHDXB9H0f8lGv1vzlUvw
z4So@8?ik0<ZGree=%@u3+?PBO%2vV3--VlY>|Fiv_;hHk(v9b7;6%gXhT!O!JgM%Q
zZ*K-%kO6#q!;b%gYz+Bh#9u=anor;s0Q2Lf);ZFp%SgLq7pFW^n1&;jTU0lsMsPt`
zCyy9YHb+Ft8pn4(B+?7Zs|Q9(VoA9zg2mRYOwnQ`RtW4FhYAUNxph?eb)1nS3Kflt
zR3tX4odB*Fd6>yJL#+l;5|b3jHXYf&ajCj_e_1aj@LlZy=ua`$Z`OtTg@s{j#E&F)
zQ`;>Sd#0(%iJi1p)$f@DF6nzj3`}LO%Prky6o%1vF34jExu8EU(4s?Lu!6;lM+3P0
z74US{F-lyent8bSJbC#-nB<dbTIh-8ZN-NikrSs&rXJ#jCN2TlG#P~J?Euu2g-$Wj
z*sW_lmgJ^Q^Y`>OIp_}LmMmF&Pmjyi$93WLKKZX8H_i(ZA2ZyWlV)BN(lYM*dZjHJ
zJjZn_%kB|Z2H)`s{N$vJb<XewG+w)3#nX(KXdr2l&E>XYsXed_yaAS<7#VzT7OQ|b
zYUaFAURF<H@6R2OJ%B|xA#ne^G*mS{7W7kH^LTSxTRBF}c*Epj#v{lKg{&$&frD2Q
zs3p78WCi!N7!7S{Nk?-VD2}?nBxP$kI^6fAU?QC1glpfYfY*N3BTw8xig09Z@PT2_
zhZv26Cp&=<;QZd}AKlQn^=Kjex5~+&{7~6<4Y)lU_|soKZ)s}0j*|nbxrz}txH(f{
z9<-7hy04z83-?^?9QFG5sp;mkgh>&ORv8Z+hatJ-fACOOSi!aWzO9k$Hzt}ZUgZ2y
z_Xbb{NGky1Z-GE<=BA~|SfqCe)VGLsVdi@zd;on~VzBPg9`q6F=9Z{dKqONL>s44i
zpG-p8@cOM}ND!h-j-D3F6h7i!m9o~e70aR7rC$IdD<E7B%PJiAyRx-;kRT=++Gcq8
zS(%s=*P!mrJK0h!8cbSJ%Ig?0*~$tb>H9-01d+c5`>H?(%4y*y9x_0p=}Hx6Bteco
z&C~$%fIu>Vc)M;4?n7-HF-LRDW~g__D#jpGA|zx?gblIt$1KC=UQ^;{(DrV;?va8S
z#k20dF6q}$aPZ3`pk0n=NjgnNJ33wzV_D}uv`&e?`UX2S4*MSnR2iBm!$i!t_!1BV
zPPhS<_v<4!(w|MI-Yv0?baEv~QmsVNuDHK5RFkBC2tD7DLT&Gw7AB4)6y_qkL@i(S
zLVqiC3Vw8pXd9V%RG7-wKiB*fUr_vO+ibO^#;RMNtImabZ=Y!~^o1P9wKo|<^R4_U
zEa6IX&$Rx~#iny_EYdFagsUk}Jb|oewubZV(;?D9l)vdO-T$`nctJe*ZpWID)d-VP
zx=t_8H)AngOj9e^#3!cdz`R-%-a{wKLXe~+Fs0t(6PF3dP#61Z2vem4z{+2=56b>-
z+&ISFFlcT~!Oy<aCw|eTolxM&_Ldzc74ZX0cfJ&0{eFG^;@o_B?%goYLe{gI#FWj6
z;s%o>)|z+n;q~1AIuSr`eY;cj%#7c;IqS~b9UmQX%0};DsZ;!_nVL>21~eD1&if?K
zBf`jS&a2KtUI#B^5<m~4Vwz<@9hFWpig<>rWY^-UZ8N*GeIEFL)k}&9&1p^Ok{~W{
zpJ3IUf|m9cCxHP+#IL}QQqq$ls7+%%Pl-5dD<(>+UO~zZV5NU#qG6-^_uGj_m@P%|
z`;!yyjVxV*Zb8*r#_Ne;?hO^SO6)GTlz1N;$_9(X^7?iMM0bI37zhIki*B$dSqG`L
zI2zW>t-FypQZW~H^dy7gAu%$DbOvA-T<Kx)Zr39Y0u{JFsqy27PHwP$uB12Z2@F#e
z-l4pAXX4@q+ea+}TQVOB$zS<Xo2~b=Zc~lIQuv$M0Jyokn+WI6sl|Q=)7<<cwT585
z5IxIr6<*0N4xKEY{utV66sBR)Egb^U9D_-6X@WqaQ@G73T|XItWe2Act6F3o%o^i4
z0FQy?3W?YlayCIFZtu44#JiP}n<LruC1~RTMFM%Q$T{B0^;<ZL0G~@oF@TIidiwZ&
zZ@k<=t4jCv9aXSYaZxvOqau<gINa{kVR?l`B^7M#?<yX@uUwI$TdCJi{}T}XKajtR
z!bR}eG(pSXTjJyHFVUc`<Izp4<OWh%p>Wgv&>K}Sfjbpq?ehwL{Gc1k+9v4jf75U6
zxkQ`fAJ*{l{|`h5B~S3@yM5e9D5iDC;=Zg*#Yx|!yXg8eA4Hy?&Tqh>e;%{kKvW|)
z&kj#Y+cD7zoyvs{6xfJKan;e%GCacX*MQvCL2j7cENQjLF-F$uK!TYH6B4j#+)G`P
z{5FI8JfeSNSG!KbWt3j;H6u{uF*-sf4&+XsjN1wYStSL_LwifV+gL37|3<=K->&Bt
z12BAK`{L(%-^cG^)lvgNn}FG95>N3rcl_3QzOHen7L;~lc~e)WNmOfUE+D4=4{f_?
zlxw1J&GTwXVn=@Oe~+sZZ@v9TgUY+Ni4z{D@K2?33H{zhk^ov<)>Z<yiXev6D8dnO
znIg_h?0qQCFG+gG&>)zhG}{%)FMmnoZJhuZdehZ{_txHkep#p*Rw|($4Ht@V=^<PT
z?U{h3*^?=&rB$JytM-gOg*YjtcfKune(a~aypj$Eitw>cJQt%)j}^C#`~N^eK+2$$
zd(R}3C{H2tTEdQ9ez5sO0Qy@PI?c-Ss!fi9RENwPkMsOd^z09L?Q$IrLJi-O5VI{$
z;7x%UIYMWf1-bYA;zy+ytT~LaLZ>y85%Wi-q?TGY3Y$2Vd$2ATZC($-bK3Hvvydmy
z4_oq^el;(jDkD-?YRke$T@nud7yfuyG^Kb@;G-55(x-nUJk3@A_FQdQMJwdUS4u64
z`~0c#h<@Ybi0?B4jbm<RJK_KAg>B}_pHu;y_Mg(7s=BiI+wkVdpKq`I4BXN=Ixg9H
zXq4<xhb-RdTdSMF>pw(BScG`1IPwXD&Q=pOIJU(R$&OeoxISI&QcFrmZi0Q*Hxp*A
zK%NbgNe|dFjPXv>`1;zzK9`jHu}qI+$j>XfC<8WIuC-)nr>H9AK^^*4wRN8Gan;w7
z2q1PmJRPxMkzMXEdnRT-U>`b;VvttP%x~dJ^PA{UAE{V+VeS3K|LrLI=5^?n%>3P|
zT|}lQJ#{S%;Sfp@>FcK5%sVQ$ZC2I4mwm-x99n2q(^CD{377q=Bnv!S$Imt2$g8{a
zL?7$NqinHt<D1A`z6rhq0gV9h;1y;M)PHZ5tB0(My8#B;692#U3K7PfaI3cIb#X=Q
zNf-ReM+4oT>z+JcJHlUyxbrtY#8eG@N>lA^S#AD%w)AYoU1>@C{YGQ-hoRS=ihRd?
zqwwh=p{LH8vox!Qh}_<b7m_xEZwJIq(0y=Td-cng#gN_enrg{TL=8l>?pclN#+}b%
zLXdsAA0v~SoBbuL0m)C^`>>P13z51i;YX$TzP%O;`*N)X<eHHo?cSEKf0Sg-YpIO$
zatY9HW}b^H_A|_84E}yiH$7uiZoy%1g+Z?$U$k_m@jM58oS0bSgIg|&7p><g{e*?C
z8m5C*V5=MBjtLn8FZ_d!K>fa(N@;1>(m3>rO+<`HpPDu?imJC}iax;J?Nr!K8C}zr
zD(H<CaQ&@;KsJ%@+gn`kY(jZL0wwQrm3E#Tu9goZu{p##{WTS|1^-cIu6P8yo^^X5
zDd8I{MzZJr)UuGK{JSlBuRw`T<KB<HhWRCr`{-8dDMM=d;rBqkN_%sk9?-kNN1jPN
z;OT8d%Lcf4B3&<fMXK=@m%G*x&(TITbJ|NIsN{KyvQ90hl<nv5O?)+s41Dr~r#j>m
zjUEYWwfNmq6dN%t`Tl@nD7l<fG$h7$`?T?(C-gkmO<a_m`Z@)v<(IRlZCG4{pgJ+2
zZjQWTF(>cYw-O)=3DbP@3X4{u`HdznTv6n*h~8r_D^uV*7zyH8c)Cqw6Yjr7B}}*r
zkHUIg1r?WY@T^1GMX9wFh4Pau$-92$4)^Kj&cR?GWls22nh8QDD~rP_0>+1YzY*Ug
zC7<3Ju>emXM?b}d08aV}F%3u}zl?EIlLBzD^VQ+$uzo6OiH%na@IY<gQh!5lf7qg`
z0qrF1OPf|gM_sqM_-=Rp3cU;lZd8HbfQ+=opQ&X@{gZ%#7Cu#7b?u#2)^hzz=;jvl
zK^gXgpxj0bEm!Oxo$a%irGrrMn;iDDr;!mDRi&4O7~fO|Hjf%wL7bF&-t;@zdN`tq
zp(~~3kCZMjxp+6~Eu8HZr)m{Ti#T&U4>r}m74!7=CngJ5QpD&?g@l}oS!TKh(%eXD
z5w$s@v|8gBN19?ydzRtcEs#$MOb0v<o+}UR^b7lS&G)#MW+R<dlIT@<Bn;F?$1&m*
zKUyOaO7dGJp+<(3)%}Ns$++)9mY7b`3gmyFv$|6=9iNj5E~RK?T@&eORb5qTH(PY;
z#rHnI5eYn5!87rC&pNR+B8~c;IQ9^LbnRhW7?3Y1N`{dE&;)ApyX>kYe_IOzv)z<L
zzkLSKY9gSKa`x1Hq$9z0Im*E{*0$`JDFY}3+hqH4RQB;NotMt`KCMyV{zAMs-NVwM
zFCHNR&+C8ba-)_h#|uL+@>=m0HDL<9&vT258}3kt%Wu`7F|P{oQuN!)>e0qlH+8@K
zh!GveM$(`*Mm5c+V7<dRt$LDz`!Mo!GP~F~f8=A~bf7dmv$?!i#CPW>R1E&cPhvzJ
z;<x!uld838xAW@HOBnp1*S);*`p_&rN$rHFa43rq@8(QOiE1k$!?>l7wsmEw1~4|U
zdiF$6HB8ixFcsKB8OwaGT+@FRrZSNqXYS->NC`mmPX&`BOrX!HuouKCRPyN*7-At$
z^Ss^Q!dD`o><q7z*ORxFkqU&*>b+H&!mpbl7DZB16+qZlp8O+X6K|T7o+}x=2D-C-
z&a9m3OY23y`80IwrnIh5*5fqTt;I8PaxZuD2gN7mOE04P7VBB0&|M0fha7tSDSfW1
z3T|9vwbN0mgI-zD57cqG=3Kfaw3Nyn*1-|Z3Qy|1jArjcqdFCiRzI{_zG}o%h5qb8
zQzjO7RG57ZDWYdk_y*7Q34Ez|A!Xnm^f52RC+lgas=@`3sbCOq1&g&Y^~l?j;4OlR
zqm|)b8<u|BIYWk{PK>VifG&f++jCWkJ4arBlN43&vIgDEjrv=W=~b)_Xs|w$>UhG_
z6dK0p3J3d1@YLsTo*sBz8)F^iX}B0MT&X!%x%vsvF27}s{w$w2J=f1>QW><G)x7};
zj`nP(rR2C2|0EAA&X_>Xid~2hi`5$!90k7!OB{PMkzs1Te|Vg0dNP`3D97SC*=$_A
zls@Sw?$B2FuFkX$eTF*RXbtOKwqu(vZ!3{E^!jLa?WQvI?e-WzXsBKhyp*AkD@FB|
z#lLd}k3JqfsKSN=BN&+V<`v__uA^mCxp2iTGjU6due|@}+?W0zg}N&iIS*PCLWfiS
zg`fTTu=6(Rvy!qTzkI4X8dsF~bf)NqO=l@{hKOTIN~9s;0GCyscCKT#FU^vamx)6~
zjlDdq2$J?F8)3BnTZ9%|9xoZoc=@#&lI`mwrNIXtHbB<0h3yH1ttjq}!I>Xd*Vy*M
za)a18;X8fG!AS*zSfXHJk=)W8Ek%%+&+O?5ThQjj`;8@x(BQGotu^TGoKC;P&qMBT
zu*rj9?7&;El^um89~xypTyExSvD|nTRgKU>^B~Bl?eC58O4atm5R-8QM}`7F$vN75
zs(sY*bWSG6qZU(h-xYAqTLM0;f&YOAbEf55M;j2j$6cx`HF3263}2RVBnu}rlN*H-
zNESX+qdz+}W|_K^fI9K0dYT;ORdU^3%byg<7wRD;in6d9II0Yg=XSF_CO8-w?<?D%
zNHX)%_{P-n#(RLEHkmKb^Cq&FK&Ha_nNWo0IAUo#jWG&;q~{gR)<50OeK%xh<qV>D
zyv>C^9trmEwQlBF>p&xJ>0py2bPUvUSo<DGS_Wc$FY7KgA|7=Ivc_(w<<P;m=Odab
zC1=f&Wz(WN`b^|TxUL;Es%{j$)p&TH&*mRc@w#U~>tQDCcx7E*YZGbcdLl1aLrk<w
zO`>=P(xdBJ@P*d&8L3K6?k%Nkr#zr<KF##e=#kJQQg)~uSeWWKO7}!u)MU<<&~7es
zSl>yvVl*fV_?3kg$))Shhs2sy86DhvP`^7uj8r<2wRGhKxAlL~U#J#ch*VBOZ4xZZ
zXCi|zrq4%yH1RY;S4($tBBSV4$Plds@Qg~{NQ7k(2bMGc!?pa2u1p+ghgN+AzgAv;
zW1C)(uE^(7k97ejJdhoiE%k{H#DgSVGP3p-SD48O+wvn!R(3B}eVFY)#42(;jmrZ+
z|FO6XN0j$@_r*wPJ8ip_NT82t1fK)bm~R_|scp|jZm=ZD&Y}?;(VH={K#Vq0x^z29
zl>O`hfV;8EF9q_(F_KPr|CjNn$E+Ek>lj+QNAfP2Wq(EYl}S6v<`OouY?cv!Q19@v
z@$iOo0qXnt;$&yUr8-08i~gORwtvVJO7##Dbc9LWPB-5|0KfR7MrGD_h`YdZ3j?}A
zwU@H7ZD#H%=H)2W_bem1?S@zTKalxbTRSR=UN&KJJ_3^u*-;6Ls*r+t8N&g~oSH{|
zkK}Kqlz1A`&r^==-KZ=?EDJ{v7lz!VfqHmH=VvAYC7hU9qlOFwYaFRKUYS;RXW-xX
z+~%W@Ycf~W=9yBRym3bmXFgXL^YCdJWyhaT=Eu~}YX-T8^m%5)Ef{o=DUp7M6j|Ik
zZER=@X1|~<pBui9ZbHb#O_Tx+I`>{`(R)7!C6zyj+=MDZ;dy^cNbh_rxch6Rd=eOT
zfekq9FO39~PYd7z36x8w`YH&0w97syARYb$kYe3_t<!X^8PpOZoq{(A2B#!y+Hj)W
zIp3~X+qki`bRj)CC6w2-?HbZlzmIj?L7QPQdyJg7gAkHL-W)LUE-NBj@}?%1O@qjd
z-jN=!9J!Nr(abF`|HQEbu&)Z{0=fh1iUsc%zBQ*34>dr-7sHbv)iUK5kIt3bc+BOn
zeK!BT<N&BaFn?isoy~n9-NbrpuBeugMg22)bHkW+;_WW({*c9+uC6|^fJ&ZWRl9yD
z2O<7PUxiFbhqC?F(_GAn`r~NNo##5!FLgR?%Z(FLDHKV>i4+ak&6r|#wtHDh1x<@~
zuv!I@uXdxmO-Oe-GCGNtD-#kG8H6CJN58nNVcDvW=hLF?hr$FeKS(bF-mq8Aj@r@Y
zCZNDk5Ra}PuDyg(c`JPu?=Sv#%$`J42@5LENtcWJvg4g&;}?VQMA$=K?*0!nT|qx7
zER!64I~Zq(0EQZu%BGy@xWc*~tgg8AFJCnzepZo0#^yZ+r=_+1wCwKemhS89yYMkQ
zELOQeBZ*KKedv{XC<ZWNCg$q3ay<Ur7hYk*{bm4;T*fhb|JA})&L3J;b<~>9zPfWv
z3Y5i7k15FVt~02_dOHzuO+Lx57`h&=y;7?GI^;$6wJvHFuefV=&1s6bH+0q>&e3<d
z@L~OLho`$&j3#rTQD4@O1C=Y%TN>~%l`|uRb@~W>lI%B@=34^PanJFZe-uUmjF>J+
z&$aEM`@QbmYYNRi?h$GI=67Sz?H?{^cF#bMv;_dd^~;=%G4!L}_g`8ZK?soF1g#8p
zrDlEipY-#_I7(`0Cqrl`?WTU#ySvm!3;Ck%Oe$>{R9@KCQ7QLuLwnhx_1s{Gz>5~J
z28clX^FnoLf9v&Uh99($R?Qy2h^0u6&#)Pb>vlT#Zbv(58705h(50mEn+=qenG2D=
zk;D<Np3SfTlL`WW2Yc3j^MiNPdg1Y`9YNcCW~zJhASUME*lhf(Y|96d##z#xU1UNC
zE-wKzHRNh?w7UNj>z#5E4DJFZP^x#=$EPjCLVY`3Jf3Ix?!aAOhnMaPXTZ4Y@1j8<
z9G^@|?qQT>lk7Yx-SOOVXu3mnEhSofah?(r)JY4JF|k|;;x}G5yuD$|GNc3BooM3z
z9O|BsK)7}*wtjaivj@Wx0y!k^RiLfu$&xA}HG$I59-6J-sD3{G(n5KWMj@DQpGxx^
zYEzO^B7lf+9{P7!s?umG)eQ~XMfdmG6@S#>u8aS~nOA0$C;8>r;siq~A(4VZUpyAk
z%QVar*l`+&>`<qjP&M>QEA|v4C*Lx2O}4q$wnDBZALbWkJms{p`5sYhYA^6?6p;_^
zegAyysv*rgz+N{obIZwi?PC!5V1_b6*MC|m`dil2Iw<CLPM<RZ>j_*-L#B(coLhr3
z$vXR<13f<<J~>NC!AOs;=|oBNUOP5l4bN5RG<$SQ*N7gT8?`b0$>3&Zx%<V?JcpUD
z(tZ&6kG>~kpO~hleQeF>SrO3>)uV|>G;w1&<y_ywSL%FI-tj;xFoY}FyNt@7b#60w
z&??|<cTy-tLlp%t_KX<^Gq<t&b-=Q_?4H67Sg^EM756?^Py0G2!@Ma=#jXCYJ3c<l
z)o`<oirxCb$d57s52`(Vj8F$W+6q0&f%(o(<tI<yu%R^xjmH8>`AACG=o7P_#78e<
zmbiS9J)IYbfrDKtq$6^LP+hKqIr?W~4Fgg$(pR@vojCnz=^MPD|3#2kr$^t=k|S12
zW8vH87~F*Qu`ALA@QhnA4JTuO%mRu?U{W7(jhRzKavoQ2D?S_`K<<uGw#(ga#kLJp
ztgTQC7>sEFgZIfPyas)J16z{3dX`X}lor}S`l$1LJw<n;gtBM~`t8lUq{iz4l^UID
zSIgG^;<ZC3+QT}DgXaw-GJ>3>NaXFCXv+?W{V;D+AW8k|<Ly`hyq*suZ`dR$UN1(>
z=OjK>YnDhMYi^*s7?n)$JG}{VdAB!Lp3Jp~cS=%+m?FJF{%ZMtbEUf8FJ=32FgCto
z@jFy$MpAw=+y~P|&3F;m*RJ*ed>2wwgOZX9=QmS&Hm+S_6@7|Ke)~yT=N}`EM$3<I
zX5s<)>s2UfVwx&^t+K?7q6%h<(NINi4nJ;8`R|Tr<+}dzy)(txAt(}rO;QGg(T1Pf
zesDsuzFrT(cF=xj<R}#c@8)&HnG-O7d-$V;U%#ju3@U(t`zYs1XgBC^ir2Sn3z%8F
zgA!qL-6DNklIbe&mx5}kBwRm#NF1pr%uJLZH==v(H?=195}x7{SAQX6ih$gWF-MFP
zYCiteXN-#ur^aagiu$9cINDY9>jo<(ncA|yZ1^hoStM3gsDB$U+xo-Ge~I^-(>!1x
z3eQq!QlM2a+bM*})pdo~rY5Z=-gV&d<>+e|CVb(mgFJ|j<`s6~OYa<!oM|_}GCgTu
ziyp*$an#7j_7Uw3gmM`I>)hrFzsjH8xF%248Z*~vg-I`xCuMF<(C%*$OK;rIN^fgr
ze_9gL{gnCQUj$-2x%-_*ZNHRaS{mBlgvLOTigR(ETl)81Rp_<aYQ4xiuEqO<o`ESO
z4ZxPIsP?h&-BXVml_vA!AJ^9k_4v@t2%jjbz2WE9woB;jBlKdFvI@(G%stq7K9<k~
zZ-S{tdvz83_J~}4L4$ubZ|=qz(F{*2UQ^whVaMR9nzXGPu&I8Z<+BVnq_H(nRXPRI
zwC8lTXJ82L9CxPIv*d?Eok@O?(ox&Jk7vH%9yvYHW~-x^<;pP)AlFdl1+OI>ddr=g
zrr}m4N*nIuNQb=&XD1(4!v8mQg;~{lr!LIls70i*-@{#^3-@=Pdjseq1I^QR4fa`b
zh?E&e*4vbZcIo-jjX%PZCjBiRz8?LmOGz1FuD;YqlWzvf;L+BqeKe@#BvjOf>GqGb
z%t1`x_4>15l*RUYDJ=&tD8&O82Il8~^yRnQguQPyQMQ8M$d>%t|B}-lY9qj3kB@tS
z`gCkjoMk%9BdJAkE9AKFQM?t0v4z)<oNrL>QCe=b2IblLs$tG?cBEn_RjBfq)ZI!R
z2?qsxMaqZ>b3Sahe0{i_nn|cy8g+i+&?0|{!U~VV@8FlkvOmHX<_l=Hn~~hjXAGd4
z+vJ@Ladr%iYX5gbR@WRmb8;1B)#S9p2a-xY(@*Fq9D*{>T^0HtXp$CrVMRhtd=a8F
zjT1Dk`I?-|4xZR6Cmv_^i~1!#0qLCl{}eUrLg(<?S1#V5;7jT0h5#6I`ux0rSV}}L
zu<t%9VPtum`Hq!~hWy?uwN_gNPeuI<wXhd~L(OlR+s=Pk>`LRPwuSsvJ^fhG&7wsk
zAH(}ndoy_lSfd4SS_uD%8Zu&Eix^=Zo0yZ!m8>VN5IPW7p?B4016t`O+0e9v5XW&*
z-#P&om<pB<epJHx%%wROb@Oh*^_aU8<Mk|W)79+Q#VrJ@xZO&r8u#Q-S36shVrNrk
zElm?-1?A?>t`)Z6Gv~;+HEx?+rx7PC`Dr~tyyU;-$7m>x&v%xK-b$S<$$t2B*}cqM
zqy%JmW(NE2jVaf!z*s)SuQ#v2lUJtT3{h|2EBDe<cA!@A7s!>~DQrl9;zz7TAHfN^
zQ4_esS*)*i1|%PwM(b^t$<gYVp8TDBUk=qwf)I{}LB>rD$++|HubLJGt7&=3A7A7<
zHJNp5e)+A~2LdnTeT(lu_((-&gr0Y03(CX<BwH`v=IA7?86g+0VlXnlEKN^a7QpAt
zn;7k-(NbU&k^87=e<%gjgrEj&Wk`gd?HQ~B!PYU%qlik(zEBOSKnXRQ>CCvPo*irq
zgY=z3DY}tH*I}n2FF)-q=?c7xtrhy+{v{2!WV`&kgyKt>vloU;U=H`13gwQXa=I0^
zB7%_!CK!Q*>77_HvGm_CfiAc_lEvt9Lts~h0MTOWd^PXQ&DZzc?j2?kBP66!ggIl$
zlWLM<Ghf8>0=-ekX`$~8G`qgJoE~pjPb?~RBiq1JIJvzT!4_hZ_r`-~fPuR_oUjyK
z{NfAyp8pkWQoyxRtkQ07o%X*h$GBL>&do^Xl8eow<zt7v)BvgOFTSybz<iqh48lbJ
z&F@kKK-I34FH^4n6FdL!zki8ZZ?@(F<B`wYr)7IoMjm#a?~t#kCmPV&ouMJdZ;hHh
zA3SAv>i;|zqMT63loJk_iDLgHmk1N2mkHNVW12GGU%IW+^;MkM)F>sPcp)8s#`{R`
zu0XtgtF~yMPY`kJ@Te;Oiur|GVDbE^laEiI1&9=|Il*x(_cmZgxb&uruoBh<8>)O@
zSNQD5@9)0@t32wSr>+HhZ1&22XcS6X!+Pj`rNn1>+i7l$(&QEQx^h_W$X`qNLnGza
zr2wrcUB$ipPc)(R8wZp;pPM!@V3IIoUfb;WERm^OU9yih(fdirjG=3dZuhcOVj5~=
zF3-Er^7H8oI4!a76PAo~Cz&_?&^}LFGF)Wntya(aXp1bpK9`zcy}*`FdVjm+=&0mk
zGKntRokgmfg-iXH4d=Fh$&Vxl5C1-uTwz3w)MFEkc;+P{AF(CB=C?Ur9sBF1G8WAf
zLEeGNM^xos9}QAy1tjN&(so!sZ<Oq773eckGyocZnUNNJE&d~@c|J&}#)gJ%0?!{7
zYvL;>Q;BO>*4>R!nSWxWmchPm$v#9i87CcIy1sGc`fMUsZktl^>?|y`c2I5Qi**Tf
zPRS*(sd{rdBGJZKif+|5A|hRpin5<PKVI3)+F4l{C3bLqjHwyUyJqHWQ=*edRjpr4
z>(kexOJ*0haWmo8nDYs;y;SeP$cTDYIAs-Jclg+9>mYblg-+g4S@tnI#22SNt<&0O
z`;ZmKryy6Zdr4f)s(X`6hmo@j3V|<;Xu^<Dy&iCvntYw+zoQKFMjt*(?hEyw5kE}D
z-iu0;mlEJn`7Rt#^~#r4M#EaD`*xs+*Vib3w=Heb-p00z<3q0Gtk4Woie~?ds;?7u
zja7RTr~CDY>ij_efczrH@~0M9Ac%~YJaZ^1478Ap@bBj@p{jxQqHw`y6FZcnO?_N+
zDqDQaRUJePw$U=rlmW-Z{qu<UNWCc8I+t`oOab(;pIB@QU<`D<0^9yp1Lj0ppy~it
zRbm)O*_LWKmssmtB&^&kZt7?NSw$EPw(hcf0W~5Ul#18QyBUz5)bqGv0&@|d%@o5v
zxig=3#eTGHUQujQQA_RQvBP#fSNUiqAfFK>6dm8A^F~=~4Td<FoE#sPL0yy^v37gq
zmmpjOv81E2>m0NrIZj3f0wXjb;fB-2n$$CFakgdTbwNtCETW7p{nGl<ssOxzwsqeR
zM__&&N$&}F8b}j0^3g&a^%h;D?!K;517XT?KGin3ngZcQre2Rz3cNJRQFEX%2rZ%1
zT0N7YXL#<5cA|<{ZpuHY5K4!oJ$zblC^n)T2%mO;02yu5Yp~#Yv!t%sOFk^A^b*Y@
z#ZnQ;fqg1RUC@h5C9}KWQejbhA<tO{o!+&?itDFd4;DIKr_K{D77bp=LG6~AuSY^b
zfouSH)EB*4KJ0f#GwrxhLZgS4Tj__7Kmu`MtX0cF02pka9+ovW4GLr=H%b$Dq)?Nn
z)4;+5a!As_*AEi(9t1q|tMFXmIUDOT^hmQWXjGtTI&GG10B<|EE`nEjZT9W@A43nO
z$;N|<`dnN6EEuZ3TG<9yNG32;`JqXrvyqw@*d&}dpE&*L8+ZFR7*fA5FE5-ydIsni
zxqW_SD~&EYrG23UUjax}Lh(!2VoXKpI!|$WE-l21s|NVnQr4?j4aNg;peCtu++WHQ
z(!A1L!{L!@QGgm{2g?=~xa`Jgd_#WRX{Oyco74{#^{QZh!rr(nLGexCx9X)bgGVHF
zENzki4?}GovG{pU_{|1yj&>}s=#qQ&d8~x`^{a4(Pqqw9p5vPVmqWel;u1hwrbt(8
zA^Y8(<j198%awrb<^3XxrR^@sKFhrh0<%5slThLCt$CP(hlcijSo1<~D08r`8ioy#
z%$GYuC?QGiPEK2QNqJ>0;)o{(sQ5;cGg=|3G95c*ay5tQS6u;`e#$^T9BPJrj=~Z@
z?qrc9;n`v);1%kIw~<+qaW4aNnb{=KR=qEMGJX3vUECtZxsSwzIb%{NrI;6%NJJqx
z2Y^r+t@=PtRS7E{l>5YME6C2k82ua6J6`@sK<3xCTW@zbs2r1&!>tEdE=z57*Av==
z4|##$r)Nc_Cz1Mz(5J-Yeaowy4hA*~3pXq-*-KQy=e0QPWZu|QJH_X3$(mUECfH~`
zx#GdgKxOr0xRoH4@Lm*-{LZNxFzlkFqz{E`k_@NwB(B97^Gc;ZvQse9<@1MriqxfZ
z#K47k#eFo&Q1kk9L*M%;Mdu|Cf+^@r9VQX|*ROq=fWi>S4&uXSn3C~@&_aztJ|w0{
zdqDbfi=6-I(Z__hb#-S1dqI1ekh34hKb^$jCZ13}VWFo-M}SPnG)1eELQY5pB>fMM
z8Z9kMJBzs1o%bUCUfrsM<!RzVv<m4jx>Ue&F;cF_KH#o`Ah#|L5P$t_Ey<#Dyo1C@
zDJpKq$FEMMRu1PwNL5RMEvu#Zyeg8toJ2OQw<q@rL{%Re_qMRmStsS6K0%`bs-Tj!
zl)lDLEEuuEd0K5qMY>9(uA1Z2@EpA8_K}d@(MNPP-Ry_IfX4|0Fh*b`afZQ_(-sxV
z`s~UvV`_h&ed!8j64Ce;Ty=h8TRO-=B3-(_9)BIa*mpX@^eZAa=PdqqHA~!j%gY8Q
z-_jpU8W+sd_4WVO<$94=FU9+ky-!?@is$u1AZQ0VhfvMlrql15$M2i7-|SCat=>cJ
z_`TE9w`A*o89e@4?Xgx%znx(|$p6B<)xas^<f+6hzy0Ky+>S&|!!*%dP|UTWz*pUe
zg89(l$J2XvDY)Oz<_1Tc29`Bx2<!UBvniLHK<qn63WvkDfjcpeb<aXlKvbUQNQl`1
z`#tf~83oVzFDHwNBf_ZzwYHR8&4SSu&+<X)yaR9YuO$wA_7--+OExLL;Y$3d?LINr
zI98Hcz*9g;SRtxSDc5Q<csWBrV2!O%8ucQl<p+?O=&Xa}gW4!8&WCpGQ90Fk_ppy`
zLKe(U5y8BcV%*D680|FIDFg!1_>B_B%YU{)zfn{c9w2fwpueS`AnotqU&IP<-&liK
zb+C>ZeV~>?3J#jQkD)}>Q*Lzj++7!1NRK1F5_e?mq{V^Na;FMlbz+#e-(nPD|Gfw3
z8g7oRpu1}y$?!BT?TNW;4UH2AsKxUq;IWku)WQtF&Hih$`}SBJqVCXfV}6m^CXao-
zcO^&F*Qoy87n1-gzw=hJcbYrRDi#Z@UBy{G{C6Hiem`ZP%~!kJ+~d7sI3TjFR>cC$
z26dND_EyGTD##Lk^6sGEtj7V?aqEUH@?S(b>bg5*q`rdF@SNfwzp6l|d6U?URKd&R
zoh{l$D&oY2$Wg|(F{r=+nTuwO0;KUAh^=0IKGj~i5p6$S&#14Q6nE1nvzHrK7$432
zyy@9qIs9p$RDl^UeYE0u&ir^F)ssD1*UECPF2P{h%P*%ug*@J{B%2VJWw7&2Rrf0V
zmlZ`g0`1x&aF%=(^l8tgZs3DanS>8mg*fROuC!rZQ);&TF?TJei0{){>>t#|t~r(W
zOB4e2sz#W^`*dDCniV}T&JKh4z?6co(wyfuKwnw5n5G5iCpL%a!IDi<8Y(+Bd8zi#
znQf2zOA1os;!e|Sr~*OALzSn_Z8vz8?upI|IC<tX@3IAzG*I7qQcJ^kcXa<E9O952
zit*!r<I?3Qo}agRw5xkp5B*x1v5t*`$w#^u2(&9DIJG7}e5C!~YTp@>BfnJay^BLt
z`XJ|T8sMYUw}UFUdPVsKZ-E5@3wS-4a!(6Wulv^uc+Jt9tCM_R+}B0svLZ^#@;b{T
z0Z3p4pk*lY^uBd#GL4N|qsT{rNSWu|JC{vS!)h3l3|^RT>FbAG7*=msn3%c7FjCt(
zg3}cgS0H)QrH^aBTAAYGeU{_8daX@GUV!5I9|$faz8BzDZFT(NBV+z&4V;vhn(G7V
zJX8TRU28X0yR*{e#G2L>Z?$mKYQ|S4)f)@9*j}!~Mg=Dip=VEjwKzPRU%NdrB~TT1
z`NrCwnrnNx!yfw4X3YO%RUSM6db`V{ms@cQRB}<e&`PiUBqxW-Kr2YK%o1t8@;?wG
zg>EnO%%y5(JP8up{Cqu0YN4!>NtGTnA?}orJ(@;xf@?L;F{?y06PGfb(90mXu>eQ5
zd>~Zvu(1_Zn5>xq0`a`gRTw>8O$o)+Rvbq&{KE8kkb%Q@)12S6(7W#8bym#qA#a+I
z72m<@ie^sDn~6IlFd^_x>JIL|T)9_dcSkIdKnS;1#MI#R3?AQI{t@$-iGXa^XHU+?
zKdtp}SXs+%WO~7Gp5}OGA+e*C8`Y#jY}Z}4rGu^aC&wHlW&=Oj<R#3#Q`XC(ukczx
zEUrOy+z(TaHVrZfU-V&U+@XaY{`Y+I$w3whUNqSv$_U{+L9FMk*W=M{eMcTgl=JVz
zseds%szF#F$T7m~OudQ!0k&qLv_)vC8CU~~2ni1O_?&0qNYr5KdN1#Io>EWsr-u|6
zz%rXMAIT)Gzrc{br^TZ3zVWm`uvGA)h>6w3iBOg>W_vM7dZ|Q8g)Isy%#aT7D3t<x
zpKcqTKeTzLjbNvqpP3CF$HmfrHRPH7nu0HD{;fOe;m-lDF;w~OIYJ!6UPP&eHggYa
zuUCxBV5OwBBT~j{;PxS?f0I9=UVx3GawC9dbLq!CqdP3Rpwq^@4AEdm7a*w(e1Yv}
zL9BSn0Kq0deW7i(`u*otr%S;RK<mA1-4hQL03EcnYc~bUQySIRJkN3nef=u`;{6v4
zcC{pO)ygRu7YL~|v^^rmYYO~gbh?lI<zx7u_m!Dx%8;3zc4i=VFM@PMFm3UmiClMd
zd#wKSK>ox6<akJ_N*f$QR}G2QR1SZ$T!RSnFCQJ)u`lg>+N;`*9@bVJ+J+@Zm~zYe
zGW&+0;>Ac*@%=a7JZro69;W)Gfh9SuOOVIDkLr-8_;1ORWPwVn_-ZbS!%>5d=%-oK
z!^DQZd3d;xmo6XVP@qLt+y)%1qGOeGtpz5~d<eu`^x5Oq6+Ro+mv*UyGFOeK(a@Q6
z2HG=IPR!nP;QZXO-?egWYlN<!hp70m^HqscvkvmVFE&t>J)nxOb_7XRGlevH$wOA6
zFlB~^rJ0YN+=#atSz04{1tt#4YU2c7R|~zL1;#tw3`bofl9z50x9jxodM5P*3RC!m
z=S?J=dx^6WQf*`AZs39)nGfP4dt8&MnaZ>1Zn!N3^?RJB9A1?933p_kKB<oaqgO%*
z>y>;`lxvF_n$4~D;F(#Mv#E^_3|4yBh+JkqLLPb3Xjm|{xKD%^<_2}d{p3EI4$P8i
zqM~-Ta$tsunm%s@a^%;w=J;ehKR70iXjo?KUwPO^MVx{E6T6!KABg^cpkLl$LraLi
z{|5j23H-rx<E!i-<6C%NNzRqi0)Ya3QdRskjxI5ufjwoSMJ=zG{giR|F3xrOVTvzW
z|HtR3<}>(}={pm12mI%ne>Z?b=Stt@8=IR&ZCV;snD2a`Oi7X#KpCCw{@Qr>2e-4G
zm>q@FHi(+;U~aqie(7qYqhUEtjkDZAIq2Tn3-N*J@!Eb?<4y%FN)<A%HQ)|OIP}vf
zGt2hjs%92ghFfrQZ@7$+Kb%QVZLi~8DdhH1`=D+@;@5_)_2)b$TJw2C@3ns+W{e^~
z#r|`2|K?-jlb;6Td$m|+-B_bKkFJ!bKrcy2s9*k<<DY{V<=<I2kckd+UYt-j^qLA-
z9!-bSBniAKrsaxEHaD1mLg~R3s2Q<4s;c-Y&ikbwIIzwqA5<_5k_*PQOJ1~^A*lIk
zKH3T9)P`+J(BpMhz@u=}yG0vSK2DRj(*t>fWt=TDV50*Crzz&Zr?q<cm2Pi>7OdSu
zUS9Zd{C2Q#9{J{x;<HbaBm!Q$oj$@^=e>qwV`Bd!K^FzV<>dY=Gj^?U6$!Tfgfew(
zogV=_7MA8DE)Kmq(vw3GTsHp&Pn9BHYNFr<g-y>oUAXn>!TL)tp&CeTU0|>(Ojm@r
zs;-UJP<w{)8f{VhDBN(_{{Z4EX)mucJ6f%<g0gU#IHLP-o<1;q60h4#uI>RJ0;kq^
zHOuhz&u!5;)y=oFBmK+-;^bBX?WNlzYq&$hl`<`#*@$o0_KglweT{~WA}&?$CJ*R&
zIe|N({ji5!WNvEUxb>9Cvbp736g#@eTeYFd`ZW_><d=-eXVaoJ@1YHw`h>U^cq=YE
zBnc9Yfq_;aM_rrPNj;QT6U8;G<vj#tWN34bTIv}ln(8Nj+lL{Ou>nxx7v`cz90|3r
zDu>pz!jRDjUtjRX#h=-C)Q~}tmeX7%nSeu+BL11bcsTS&EF*~Q`ZOZq@JL4DPLs$T
zZcX~uH3qqe-3aWJ>c;;--unfn^D_C6&|i48+BeDuYd0QHH3x%F(Ek&FT)Nk|ISN<a
z{|hqvFO~Ug5_=(b$&laKwMU}!Zm+_hZfbQ6w;$HJh)3y)bO{<(TtLCFKrqGP;=JYg
zw^xNUPUcj&f|N^P!no?!>+3h@6EmPoolzU}6(CbrDg~T+GE8@Y&IQ4u8gc+2s@&@P
z#J1mAp2Q%k(Y9WQTxG(PgA00~JOuQ#p7w~_CTjehw>aWuf<3H9J;-3erIPud5%tSt
z&t(cXPAy8*6Gun?e%i_P%3iVJ4A@iAib!^4-t0-@7_fBYd3eyp;7g|&jlks@lC3|n
z)J7v?=evg_7?1c4u>SdwZuDx@D=nRw0FF!uTiENAO|yHqPK~qX9^@|Ss%oo`G$6uL
zuG^xqZOmd6xVtek##zR{5EKkm!nzxIfAb-3+j%2j=d>s#u=1Jz!MF`1C*a6-+4m0<
zqVVV*X~OnJ>vSDsbrDP1#Zm#{V5zRMg1Qx*A}NWarOibVjHng5CDUD;jr#(e8MG$^
z1xri2m0s<C_oh#wg`DfG2*D{Q1S?<M|0(*GIvyhGf?7gh4`wFgok(=z=FV8Jly&_U
zDD-4Kf<Ixnfl&T~FU!h8_<hFF1@P2nz=)b}nJ=H%-&z`t5%gJk)y)0p+iAwD&i9&J
znf7&g*%+Np(94ZsxplL~=bqOeZh@Bfcjwrz1Ddd-d`EdB);R9kc|8}^cAw=U(EwdF
z&Kscp;bvg0JdeHNkdb(sw1gBgn$JwZ>-5kBL(Ujp)+eyH>YN5(7J(wFY6&Yy+sB~^
zZ*`ENNOjMy^LY57H61})i4!^bQICyAawZ~o_S1o#q3EVJ3r^@*JQ)8C1`i22EW_K*
ziROR4J_x5UWld6!r|5HNz|z^xwm#AN)o$U?ywU9cCx~~TR06LUh~J@fIsvt|k|#Qf
ztXpzN0>Hhg&0r*!DQE>1(J$+(42Jmj#Hctn{^+Ny^y|!r4Mi#bC&l;2`iWD_gW$d8
zFL#~NcWgRpdn_;VTOJCk{p9(Qc~qezHuUMl0ty#k0c||V{05I)Gc(rsy4}}_jQAGV
zTe^+`=1B+<Z>aMqjCM`4C&WI_{nJag#ufS^p(xQCl!Dc89@UVk8lMQ_esYeD=#bVg
z44{ft&*5vG5I7%4S7zSJMURH%E)zBILV6z`A%2<v7IIn^9VxTQOnLpNkM}7)T)4i`
zd>a1-x2o00Fnos#6adz^K$k+2d%|WQLfG@h9k4|evA11HD|es2Y=hu=TagSMrHrST
zo-H}yOi8T!x~?l-UGv{(RBjY@qVNEzl}HEbWMiG7I#Dg-diida<B^uwR{|>cA26aF
zxiic8N9qDx?c=-HVGLwH@}0epJ-?qtTQHR?JlMyAbC;)6fA9R*k`gt>s?ClNCy^>V
z#3I+F?{edO+7^PegGZY)gqIZgP0sQBb5YS;QH?g~E6CIJ2usJLM^x^uS^wY)qk?}q
zDD57WfnF&-je%(JbZF|gx9UFQH(!DG*6(3?{*4+22Q@ZuIR!m{pj~N2aBV=`hQ>rV
zfzh&I`Uu%F5nxJG;R*BVAj_Jsuh}~%4jjn6=XnkiLPSN38b00p?%q=~RG!RVa94qf
z8fch&H`UW~b&`H9oi6Aqb*;7Tq}mrih*RlGalJsV*Ele|k>Y-zS@k?!CGWqP1}EL;
zWqb~!uhoTKsx*Sgf(qPk3`E=y7xln#0&(n;UCs#U>!U`}xDYe9giRZcboE6X#~I;p
zC6v~k>c=}VFR@H5$C0ULqs`k8UmqIuVTInQpyh`~pM6fgmic<&WNgZ)TAGDn<YFbK
z&Di(UwHpCDQF%k>DC_GwCv1HcEvu|}cutfcPKk|1nSpYw==ts17`bh>&ueBmXmTl;
zaK(|HEHmETJ;U_CpH6}f;fo#><YRu^<UhTa>u_78Q@4kfypVFr{52!EwFvlsY71%C
zFfH7c5k0!Qqi`ef*Av}uc}{D~KCOL?$1vI8byadD31PBY>l;{pF0T6$uVofk=qWLV
zFoAZxm)@$iZ{Fz?x}<Q~rWutyfJBTiLYT<8!Z7C-`FjFr+z>~)tZ@0FQZA~Ooy|!i
zK@f*7N=m(zsfCK#?ds!Avzi#x(Xq-KLblUBP5hR>n_`guRcMfF_&`g|+|)sdCu$+_
zan1ybj2OGoJ!X;QmNfL7be;ifQ-is=@f;;(yO^faV`WyWpgQZ9vN2t=<Ds&_wWa3u
z<2A%lSgHV#LLdqjxyJIvc&6{Qy>SIeh)NY#UK5?EYXB^F+nOWyeKdE%`J^9Vz6Y6%
z$i5x&?Pi%*TzT20+F!CH<n&*I4g+^5<^mVYgeF&blzZ`C5~&Zmp8ckXwo{@2@=*;`
z=8c?Vlx+iD_qz+$=COb%U}aASlC{I%B!)s@pEX9*$n!KSfI@&@zyvgjFMWH+;{lyP
z*p45TLg~_dUNGrlU!T>oFvh8FF}4f3Y1HTSENsGm#&Ew*_|$TN_LcD7D4fZaqTG1F
zwv|iP*<@Z`5?*}_M5_g3#;N8}5^4Q&TWU^Zg5#O#^xrn)IPt!CDUI1OYi$HpsFzX@
z_ol+-+5KvGCT{z?l`Zi4m27HM{ap=lT^D}d<SH<SPCdRKf}~X#mA$t1y*7qf!bf8+
zwhh^WI3pIzSi7am|JU(3c|s-iZtuB*;C`utjg6CkeZyKOjl<}z&aD;?1`BYF(!#*(
zJH&_%mo6WZ<b1K6yHG_@Euxe0v-qi?7hR`dA|N`>Pttp#h@SE3=b{7LUVA_nCBL=3
z*^jH7|Gol(tvAwu`3cjPdi)=1FlT|cWOH-#zUeJzC{>A~;7k+He$Dfv9-0y2e4(+I
zzwkK8xSDPS;1vq03Wp@4L}cID49W<x_nlJx>Vr3NYllr~HZItz&v|AM&6!%m9tuXx
z&<ZZYitJ&fbG@ba>z*k&^P_ka1i3Jq%V)&t3L7ikn<5=Q3k;xJ2uJV)?^SsKPet3i
zp^<cB?KKYSe!sDlnVG$k=vs|o5x^g)Y+OyFL77NWKG3*fIj0#^HX_bN*Nf*s+k<S+
zqn5|(_**8kjm#}0zYitKc2N;ks3|FV$s8u!!!OA)$`meal8Su1?I{xnn@?=|{}K(g
za%eO`_AIEelqC9%UgU;e)&f<I_l^th&Z&v4neV5AFTRFa<Yj^jcEY1Lk{)q`37F6h
z6!5Wja_g)d(^S^|iGLlN{4n#uR3;_}#&@DNsp%~C-=+9<yyQCPEz{}|6ah6?$o#+Q
ztH}33<<%405CyI?!rzckrOCH4QVKzsmx5fKojpqNpDy21Iu&9wwwMJ8Z0>&#to~vn
ze5E8~xc7GL(7mBD-0<2`$fxx(I9n%9gLD~|+Yq>Y|98E|=4(}DCMhsbOf7NBD&nhs
z-LqH_VZxPZ3^HP3W@rcQ6^!C#D)A5Y^DjmZuX6vD7P>uel1gkz8TB$8{{VD{bkYJa
zigOyL?Glf4{y4tU@=H$X`wkAt8n0h9&0&|MyseF3ww;<x@3%w`4D}*bh`hvi|3}ez
z$3x-&as19YE1OPsN4BhVm#yrwXC#~vS!ZvD2%W>(;wUn+cgU4-HlfHK$0aK}Bj4Zs
z{`H@GoR81v{d&Eh&jQCZh>Uj3N1F5gsM-%|f8w~<zi@TG3Lr6AL^yA&3yol3a2dG@
zy#}C{PVWD#j@e88yhVC{<eycg+nzI>Gw%#nsCUMwl-<jhEO2F1q#<YEgz~iGpN~az
zP-OkU)J)SG0#3G3+*8DM**(V|QX2pR*xHf%J1v($@SGJ)$tEx2{d-dG*ot;Nd}pFT
z!u1f&MgflntO2Uf-)#0yMCHqXDq%-_uC>{5KjY(nQPl=@wk1!v9jGQP`H9_1({9cU
z8n#smhC^kF5mDLIfX8WC2L$rEx<PUnsn%?|TVujWAEcl4|A?ORnA@dc*0!%*L#k&$
zGJUFu9LjF5DI4uSyNG5b)mG7=6GElg5@V$rEE=;babQB|dW-UJ#Wy-$*7k~l(ed+h
zh5Tr$BQK?XBiKU7nD$U4_Sn`|t&RqPIsw2@J}=00gf-8tr*{dWAY@k%^R;|SE35qV
zOG1V6UlX}`rD=|I4LFnDM@tAf1^sF1a&H+Sft#KKM;Whz{d~;kJ_K(MNQ0=o%Sc0I
zDZeh;GIKpb4xC#CgOz1w%D0UkMN`X3pX+?BSaF@<jwHh<_8lFy28J@kLb}-iY3B_K
zvU?gdiW&LbX+PD*R}fFd*5*`&)}_oMc6>p6HDY|S8si8yM<wzjc)tD7#kaDA4+(Fx
z;9U*spsRl`*oP5a4amksHcBXd5r9akai5kgVWufW44i8pu+AratUq^>ugFAE(o<0(
z_VH{`UDlC6`{8`nuZ2_CY5LA=MSGh!ufX(rr}%ER*?T(bhYML;b=1lajw|~KbOF82
z)8({?LI=D@;o(aI<p-?1D{1Y@ugy;cNzzwVLq7<_zQJoFcyL^O{DZnuba!Btfbhor
z7?qYGJ3aHz9pO!YlgJ`6%>3<E4FM<_h_M6#d_ae1^1#2zB>qC<Up~JB#?y%AzXc_|
zP91+foE5^%2QMWqjiZ%)$~H;8kM8`!SnO@|*G)QsrT|ABPLNU!=`P#-$uOy#QNA##
zn<2mu_;R3@x2(+2{UD#$=^?roz^J<Z{Oe6rCtYPY-`~;daM(0O=@V9qyf1H9b1A$J
zWn=rn_OatU$}flTUnfnqb5U_0Mp71+e|GezF3#gUKA3r#GnbJ#$_V`S^HMvmm+1{J
z5&%d88}2~WarVDLm$HBB9XemxW(!F(7j8f}@vCi!tF9<_B~T4p49$mOIS~u5PB@BJ
zRrN>9JH=vmlZlJ%N7&W(mTmTg6DW~;B}%|%TOv)yj8>n1BMgBQM@~pR)ewC4D&La<
z2AS(38!WxMX{&V;3bo7Ok-M<;w|o7V@1fT1gLMSGfzJH3rfsz3hHB?rH%Z6%+OD|k
z9)50q*xX|s;&vtaE*wLfc8DzU#FK9=<-U9AsL09h5^^7Kle`dNT076;x1j~N-hy%}
z8~z`u&^V{Fah@*2`%2ifFx(v3h;LEDZxR4M1^Kq-kdpjjf6sf9v!LPhfjI6w^vhA5
z>n&N_jcB~)o|>|533~1~VaJw?Mv#1*M{d``UZ&so@=e$}=XKXF_Qd1A5EnNo!SlZ(
zC~3JtC2rD?yjl5Udc!k`j=G-MIOvs3pBn1$`efokZ015RX?QR_A!kSeIt_gZtydxg
zdH4W|Zru{-NSDJf%bigV3=Ce?tH0PF8+9__JRC^!=?&z~9dn;{<ch&)r6Bdv(ig7T
z?j^q;&2S_^C5;%l&>?-~?SQr{#lre8EIL&Md&BuGFd{d+wabQXb5p@w4Ut?%K67<s
zYQ4Bo^5#9igpC&{Qf6lIqqb0fJx6jK(({O2$LlI3N{>Q;`r$i{UNY@P6LmmnAyL2G
zytCp=$_%~u+Fo`1sKU8f^k&wW)>U*o;AkOL&U!-oZeC;{j!RAX`gP%t=&VdQ%l<1x
z>|4V{A}4OoK&<D{RB|?R9AG1w)8&{Q{Z6v%T+qe&^88o(F+S3L{nO*6XN`KgW2eXD
z<qHu$P;e2Q!r@PKg*$HMi2y)R%u>Gp#pZ{2!MHO#zZPkQRw*Ave0TNo&X9$h+))+P
z>{~S3#X1&S+I%|7wy8^tiTq{DLbA1BZveDfWvsJqroCGa64P4!9qKywCZxJ1U$;38
zktxw;*VR2HDv&f3HYK#2Gs(aVKA7R;zx87Ta%MmtNWb)EYl}2JaHH^+79)=xTQXEN
z9K$TV3>I>zkU+LB92R=3FDL1;Kh%*#f7kG_V)2_;pRBNvDmvtob2typXT3V41h~C<
z6V@kd%>q!B9SXg0LaK^oElp~<=2{B|o<{{ffEQ+~WTto%Bt~g#=x*Q_j=8$TE+mqA
z6V2bO>?%Xo1y_)OBGAVMt?-<IIUAw3vFS^%+FG*}HaIkN7c41K)FSiEHM3>G83fM_
z+?e7DVjJaOh1D!^+nDPUS%CSJIAIBCXv2w<B063*+3GP_+^VrI`8-y8%c$prw&XGv
z&JcQ)JOS_C(zEZj?hb%BT~+b=7DG_$@)-5<-ml{AOo+B7ZErr)?UN!JVQV9KMCNdK
zNj<m!c$A*bhfe{|VX%j1>Lf?d4BO`?CAwYHpV?%OX1Fg&RiL=ODdr;$B$jk5IR<JA
zuDvCjN)~MuOhIsEUDjdDQ@XinRVKbE3|f6+?x(Ujz_GJ`l}Fqj_<G+vN6KgRjI^hq
z&t^$m;nPv#H_ZUxZKpy?y=(mR?+AZ;UC;?z0BSuSWnQxR+A(#vb;AfpAGB6sXZRpa
zyp0H0^_7k2a{suuM&%lK-X?5M!8%V>l|xq*u!;HcV^_seLQ5fDIb<)G^jP`-3X!Dc
zCVT+V9C1!Wiiry<oT|gmnZhsSj%4`rTcR?bFz2nd+KJc$agGnt&LcDKP>^~TvW+L=
zV+44e>t*-)<JMIEX9VbWtKj<9iSqBJp&DAHg7#!zw!km<<c;P#MAN;O!1(9?0nGVn
z>~&|xSp7QU)MO*n2Kka@MM`w(p4yBm0Kbwz#%D@Lrgl4M&E}TZ>0g9Vz(ME-{rI?$
zw!>@BHougixHk4)lawVxFH6DXGKv^K(lie|r(1HkYK)Pt`TML`rC@N&LPp}}3m5A;
zHR`T5Lb?ego>T4ZoA6%L3cMxMh%^Mz{9H@#%pK>bk+mRA6}pa%#byR1eGSyx^xHw;
z{f^7cL9)Y;xOGhMia%MAe(vLVXz`JG+mY_&^5gGII6Yxq?wrh<sI=5zr3=D!fD*s2
zDcF2|Q)au6#F#g?v3l6FEF%<c-wFIBw_p+TF&i8gsHKoTQwAl3PCdiL-MJKBO<O<_
zIL4Jfom|j*&u_G(4}Y>{J)$6j3Hk8Su<84Rl4#S-IiJt3QflooCFDdCEdm9`^gZl<
z9uqDDD|~|*fOTVh{xcHKY=Ce(#?O&W!yOs2)L-U&5MY7`??16U9F3c4paEH_Y}o0Q
zXl2W{(FQZ|wAT_LTl?lOfw{K^1>X<|slMR!@0G_I1bspSQ&B;0KH1HgcYT^fD?IE4
zXTPoygq-t&baGE7>7K$E;uTDE`x)d=j8S?Sow#^K8wJp?Q4uPQ#0ycbaA;v_3xV=|
zy_x>yAEm}4#aALhq)jOf{Dz6dX`0UMW<%MBg*hb947oCN-)skPbn~shcKXE1F8A40
zdEVj1A0Y{I>4&n%r(Z6ntZNBMVio@ZN}ZStc^bDLis`mXneFkT%P`7-ciVN;_K$Oi
zvm7R{VqyAOR-L&>ei=#~!GAJ+nl~yn;?3P;)z5SGw$YSUy#CY<@ei2<_q;wD8o2Qb
zWL*!8+<x)R!0&5x^x)_{DM>Xuu6_CoSJ2i{J|u3oQuof`GRf+r+%AmGh$;acro&9M
zs2C>X`a{VLjkqaEH!i5_Y%pFOORW2Nr?s`M<L<3b*~6Ud^SldAsL<o;n~l-MPO^`S
zVPZb*_)?Ibl>}nw?hp<@$26kdDhw`nL)Kf}&Hf~N$jwAje~^&%7v^v0E#91^?ej-W
z_Oxh)T$qbGq>qqqk}I<v^Dx$~>SFX034uOsq`m0vC*AzuDn)5meyQDV5!?kmTpnYm
zPKjgw48-{?5P5U21AOFr!#mc{O5p_GpT}2Xb>f>2aE%4u9{w{JIq&Pq63Va~Sqk5)
zF$Q*Rz%>;{Clk6bsng4hmYM(Yj-)$+Wu}>O+7IKnqfBSIY=TRDok{n{KPdy|{$z`&
znv!@8SuHvSovU*qiJX<W9ua!Bes;y?-Tz>Fpq1n4ol2#9PBelNx5VCrutxwtv37sn
znc27O<4fdtPOZZ6H+^lab+jzrUwqejN;Q1$>!cvOY-FdhQdy^#IDAbrwVJGTx);T{
z?RB{HTxaH{Nw?6Ru%F;)8xgZ(*nMv>F>}GuZ{~X+UwagzykX<)yH}I~P~kFi@@PA}
zx3f}IXMQYFuQnX}m%S(0i;6xWIS!QXTKK0{GtO`%eQ$x`Dt*ikw>=w~`RTq+Th=6<
zlM^t}<G%8^$ARfyl4xKuo-W=<ZcGLlninJQBz{X~D4!5O$hQwY-Z#ja_N4D6r03V+
zc*~lfdN{=nYEp1OO$$DE@)oLZo2v7C;*;ja;(UFzH<l{7tZF6WI>WwLh|NM({_Z9<
zM}b>XWqA=OMvYK&NhD@X4ZaZRO0R%GcB_xyyFW+X;4wdT|Ni3kWaH+iEY0%_WbB5;
z3NND2&RrTkAe8#=YcT-Md3y5xpApC2#`67aPJs-1-lgvA8dANjJg4Bz%^qEB$-44o
z1V}#Xpd@SG$Jfc_5}$@QJlG}yIXVz70b^!B?BWx}6LK|X30{ZAcEg9uQ+$T*x)v+t
zK_C=dS&ew|@ox?9H+_E!%tNQcP<Z!bf|vfLevDb_P?F-G(1@si{<d_baF!fPiokwo
zzpANqy*%Ra7b}88ZoaQ|;)>Hn9@abw#%|<0J0MK@t=DS4kZA^7j=Y|qfxLqq_cJJ(
zghrdF-3NTsHq2)o#2dOde&T;;V4WLUOTpM*Il57qdtcOCAg5x*55*AD$C_9I`0A4w
zyDWUpn?a!Lp^f{=#~r?M0y{e`cRY7g?Ec=5h|NdLb5>%*ePbH~fzHtNyu2AQv-?1+
z_5IimP>rF3u1e9p8VjSLP6vZ;*atz%@e#1Kl6cC@SlR4>p?EMSq$L!tWa=2_wQ--j
zl0|(-mG8P)m*T^)HUQp#6M-}Sw-W#(QD$%EFlOm%rWNN@;0C=lv_1Uhik)6Iyl37h
z(%9pQKi$H%uiUD2^>l9qI@4}AFa1;%IVMr8ZZ&UacL>>@yK{+XgOmX!1-KYG#0FV)
zy)M7g9vp2b{6R0R?<Kb<mwnyBate3)_-dd0uy+^4h+N9j4@)DgvYaXV$gR3%Fz(sL
zP4YVBs9PM!n{xURxA}E5>U%`S?b`M&<S&&zMmq4<=;sr`!YQ@k=}%A#ABJnpq!zmX
zkU!gVrSXO``8^Opd!!Bd_Hs(~y*A20F{`vAU;#2VPC2n3H2ErNO=nmaS>6NN`sEvS
z3qF23erye#{F+pz?|x1+pyXh%jyd7yt^OTBx)<W7L54CCx9(;fWUZ4%7DcoJ)|^Sb
z9SMP#L$E<*(onXRy>gHs!_|$dF<{)dF!zm9Bgs>}1u}r?SKX|}3S<k`!{k>;MJ%9S
zC3n|EjOp5`hr&JraEU)q`EK{JKQSfyH#^Umb;?;v(RNb8f}F-R+#8O;7Xe(!+t+7}
z2%muRu@SxAFw_44l8@|(Km7{FoAuu~Fy{4oIZ^`xZY-d_Q)irq&2t~M`6yp^7uci^
z*<0Kr4;m_2N5_^OzSE7qHAG>^q2e0Rk$@w(l9l&K@r81)e!|YKZ(9n6V3eF1Zc`5v
zp~~kcCuEf+7O5+rb-j{kAZh)6*HI;Pe3Byw&%j?}fl^Zg5Sa2W3$zEwa#nf_zgNE}
zGi$Q&81>mS-W3YerU)%O+A=TeY-37uLH;RE2>I;;93-resyC84OAbf0t7cd4sH8#a
zCc_A@BO8*lVZjSuR(JMs>ruU7BcT4b_99<4+c|x`izM;}elK=h`QMASn{&T9adI~*
z-@fqyTzw&ZzmlDUoX=z82Y<=Uw4EMrn=o+*x#HWP11dRuKPq$IQ)bD0b%macD;ZJ7
zwYJ7F*kXK`{QDmq7%Ap>rn?Fjw0jjX6uB<s#qJ8#^K(KaR9{879oW!(5XzxZh(CX;
z82M)OMzoh`))J?Mw0c_WU7jcdY+(U2zAH}@HXrYCRpiPIP_4FrQx+{%PRj9h30u(N
z^|Gv=*~T(y8e@`FT!iN@HjzRd@!FZ1HGCp+-Q-*mT_UWHYmuV@I7Wy)JrMWh7o|nK
zE{_3Q(cqvkCwQHz)J?;Yg-tu3Lm96W;a)pUXDngz$k{{Gv~72c)F)$*G1XerX3>lj
z&;_7a3~OsA8;Wzu{^cou35+3ycD&uICb*B~;a?-&e08CU+W!G6^K$r5&;OX+eLcLg
zk5aku_q<d9X(#Zlc8MS8R^6&gBcYhHh*w=a#a)cAj3@B_I99x2FlP6Zx<>}aRiAz_
zQxv%rb%XFX^HTJ0JdYG#llub=?Had%9)zrQn+qUdxc6BU??3U?l-W1^uX{g(V&=3C
z=adtu@qcQ)y@|HTzSEJeau$UZ7n$^J0&nD4sDgZe#PstSU1xes>MoS7byHaQmrS3}
zCw(ne4~*BkgrPw@o_%5dBa29unTuo^DG!ak4z(a^+>@fPfiDNNHF|w{R>Ww)sMie2
zH!877Q}bRbKi3K)tmiqSIM!GpQj;`_20H6k|HKZfZ0i}hJXRQUC}B##6q4A;tN3=b
zeXH<L8`g3?3jo}jQXT(rZ{yS35bU7__+KB2`v?gfz*lVlH9udE=Tyk~!VjOm%SUWB
zPg3+BX?V0EI&`QGQza%@+6yEt&5G?gE;MowA^_J-65^ryPo$WDhrCoEcZ)<PV5%aw
zb0W_8FDZwLmtz~Vq-<%`83XYojzu=xsXdgAlOy{#u`CA%ub2HOR``Kw^PNma?&4_~
zYhGH26eUL|vo#VG`*lb)_(|KRgLn6)#q+sIdg2Fb*&^(g15F9C17y)iXP8h*IKv6G
zb6Rgn6^2^S^@wn3-s3H3{JM>n^HaW4z-2q$+xw~3m-E|5CKVUo$|7R7?X^Ghy)oS6
zpk*DSN1yLngs%<FquI!$Z>TrNafV+Kqp#T!f(2Bw6f#KMo>l*v+U_{_**MWS0ck8l
z+sl|S*p)6kQ)(!`pcb>Kopn#9=y1AT!T?lDj(K9%(jn15M|FK$;WqXGQ7|&o-SShx
zQ)ot`h>L_J%?_gjS`~Ow^<(YIhA^bZT0o%SLk_AMxJk=seq=#T#Ei64&aSwAR(@iU
ziCM6h0pyDbaIXAYKdGimq#Jl-vNvuFR>m6|OfNU+fX}~>p#jhZkcq4)P(yT=vfca$
z?Dg!BH=jQ0=48Q(`ezj!#<uK|J-YxV60aXUE6m=-{f3s!NsE?T)FJ<r+cC%6OZfFj
zs#Cl8tr{%@;3D!tlvpTGkLaPt+}TTfK~W(Ls!*1GVlhkH)XhzFv<aD?zDNq|bkvfq
zQe+7%=M$^UN6H%dnW$5TIfl<p1swoM(dQt3GM*AnKD6Z2&<?ml+LPnGWGPKwIJW0t
z_Q)#e;*ZG>_zIq<Z+P@`4oh#%fM(=J<K7N3!#RBy;~yNCP%0we?o0ZtC_)XL+<n1F
zE$q&F4#=ol@K-=lzCUQWo!$MBzR)rV;{;DxlN^qc+YwU;#u*2&?xk>&P?i&CMYJVi
zx*K1abJ@Jk6Cv%!=NIPD_P=rcAFUhn3p2>4*ZERRE$D|Tn%F7Geg+K71#II<`Akvg
zr|cWTIqIt|(daf}sR+4(?#89o*9Pd44!@^`68(DH@vccrfy9cf;wPCwmoWwzlv&nI
zfjwX1#@Lc}4P(?$^{8kd6?v0Xq%kJ+(6Dw@jkErzjdr{KNSWLDp@B_}LC95bIe+{@
zx;OWf>a$U4a)~fx$qK{bzb7wygw8M;WdjToHUK6Vj&!6u7vyR@s$!`z;AWE5RpRwS
zDwmV9S4-NrE0nrqnn(MAg&s=d$VtaSq3MFzH_1xdh%7;ej!jQoVKzjNc}k_Z1pNLV
z7RVx{wZ%sQ{o1S6u4|E8X47eR9NU?rkv_hF{a7`&M?Z!**DUGJjq@26bvG*oO>C7)
z7itc8*{=^2(JHagPh%7(KkVCa-iOkb=kkOC^WI4W1#wg9sF~<#qfWMvAv+@Euy@h}
zG1}+FceFgO>hWM(gyoHf!^w`-w-RsiNoTcJ@s{TIG=1OS?Wx>;vFQ^BW_dOpI$zl(
zMwb2Q(+i&uvr#t&-6;gPIBuh0&ST~}tD!zNN0kW@*S%<Xy71=RyOQ%oxRY(mwfhJ;
zeL<%6c*o%;o=%1m!lZ=p!ib<>mZQE0#riV9NKS#TX{5U4rWeQ{snYGWaoCfrcs5Om
zXKw)!6ENZV$tGd94`$8JrL_glt!F^IWu*GUAbayi<X|q9rT8FZ3WDvPjM4S3EqG5R
zGOVz4pJ#+brO932GS<FvsF8I>6W1S97JkyN`n9DPEo!=p$w}u6@X=L?<*S9{jpot)
zbT-RfH+N|EoiF6k1#kxyy*FjA&dW|i3a1n_gm6d5Ssl7FYqn<$fQbpOl~So_l!LdE
z+9W;R0ZVQ_b|RqVu+(3+=dacZK5^Vo`l29~Nz2CAwG1BLd_m3=0OoaR&@ZzGZ!md>
zquU|TGdz|0FJJ2TDG$Yp-C1!K`s~2~7%#iiTGlQ1RkAu2S%uH)P$RJB`%odQCvBQW
zxILu?kpt4O?Wtyp1`-@{&g;HpIpv`&ak*kR%%!L;#UIh+aVTTjY>8Ds`Tv7fopIDR
zg}J6?3P<)S`Zb}5Jb>}TZR><+VnY8;(#QzK%V;Fb(XfU}gzeQ!U8^*RtUVz{hyQ~6
z_&SrGspLK_ua;-I!R-07*#S<d5)15f-$ozKJ`hsFmhltmlol<C#lcgl{0hCA3mBaF
zT=e~cfZ3Y}L0$kiR`<7|@Sh^@hf)IWLL57X*(A4$(~affW_QSWTEqTQl3%txskiM(
z-oBfcwJEB@Kc7LX@X8jL>enQ4d<;3L@Hi5CTNRT)y9&3jMn_4jj#rcE*CQvi8uSjw
zf`^&GINKvsAwl$vnLu-!WtXOjn+S-_KO6keofPEkY~d4WZj1!(ga%Z+G8JGNsXh9`
zq_B=&h>rdd<KIQ<jC84eT)rKffa)YO^eLMx!dR2Vhdk5eb<x3*7_RH2<C1fWB!kCj
zXU_dxHF`t(p+oe%s-C}$n}X5xzTcP+=dz&8n1S+Zcc4@pr{~(+v-)%?uygxweCvek
zK^2|QC+%i}Og>*~`He$@*E)1RcHi7VD!p@}hqaP1qh<9-TF{Az&9G~D#NSKJWiK&I
znq;;8@ymD3qj5UY^vT-yHxGu_-@n4~zUEx#ws;YUgl6ePLx-Gndbv->RF%vo7w2fK
zv6Aa3OfcVA33}t{9qFfdFc_G?Pfx@chNGt$`b4oq9Avr-L|po)<d}iR9|PqB<IZu(
zuXP~+J~?g9ITX7AaJ@8isv6=rU$Uv@%P`@ico=HFzw<L=KP`SLjvNfBZKg<#h|zsM
z-sVaP)xi<2I!T`}^upX~4Sgq*;8`lyBnneRtAVJRt26LiO&c37{aU_04AL_5)89i(
z4Qz+y5#<JH#Vj^3s9@-E5knxSQ_@49hN5tu`bSW6@NWdVAf)PSW^5pt`-r+__l~C7
z!XgbFX&E|JHQ8EMawJY=%(z(Xc7mLkuS^W6Vt-4Q=OfFaoUH_AW!KCum*P<MDWEc4
z*5K})Pjlw+13wgk=44_!iXgSC_<MSXW-mIw2P~dt3~4mwucybN^1A#eEUhdO9&uIH
zUvF{wkt&wyd5Ed^?Gj4wAc)pfb26gvlza~RdY$@9&d*lsuD!|4t!e!-g$H<dd|TUO
z(`9DZd@dWRvagBK&VZ4tajKoSxms+5<_37K0aIT$xN1Ph3**t|c0DMa)0B9H67zE8
zsuyGm8HX1Vw;rlF3yqfe<o?+79P5jgOv$b>qxau8?)s5kmP5=R6z`^nkUq;`(o2O{
zS6%N~Ch^&PT3?*+Gj1hL64Sl|y|&Aw&wgs%&ZOy4QvXGy?1i~7z;A+{p$S>iDyiI*
z_QeM$yTb6!fK&pVy*5jovr*^!xo4-9HuUePRp{--kETJUrbADNg-rWw5rD>vDCpb~
z7HT2EVX2`u33JnrPZd2!Gd{k=ids=(Ih_hv#tD>Ty9u1H4PLEJe4iXhqwx}aWa679
z7Zb#n;e}sEpWN<|(_%uV#C)t8c3KCO@#$IZdU$>|rd6ux3twZniNcn(AjVb43Oaz9
z0&cpNZ7qO0m8WT0|2NE|Pb@qi9B~x~2l3wV&RL;H0c1#`isiI1vEI|H-H;YRSI083
zGz=TJuK|EJHZMlerrA{Jiwt1*5{uFvxrz0SfSpy?GeEL8?8w%K=`tyiIK>bsZ{ezW
z@7ItLYk1mFaxp|G2OZ2uu$bx*6mh`bNlctuZ5OFzwCmOz2}Cybl)Z~*=hpLmK7EK7
zGkiQT!S~<Hb#w@Yctbzpke|ZW(6sQ+$Mf4kofLX{ae~AOFtKpL;(b=mo|z+?!@*F^
z1IEV(mft`bdhcs|p{l91N^2;un5Emlg%YVIie=EU5jvndi56>yX))#dvnv7MK7D$!
zMSX{Uwf(<G%U$%C$8Qs$c!^*>Jvx1TnKPE-*FJUty7RNLJH4+2qoSrSf+{Q)thJms
z>QqShh=|Irw#>vl%`f=H<8fPJH6;z?$!(DV3*V4225}8Kb5#+@#${heKI3?vyHIid
z0GJ*g1X4CUdN(!ZK(<Ghe+(1;{lG}TNoS+LM1tUJ1xKoMsnTYdV*nca!aTCRVMn{x
zx&kk8X$bI8V=E6xDPS|-n}e!9h)j2J0li=(?_oU*DO{2ojV<++nLnz$j_3{Ag<jtg
z^M&G$`!v}Xrf@9MzMV0MvnT`isn6dn3rTg?a*AWY32}~6@6_gwR7T$C${mHFW6{$(
zCGAg^Lqbtu@IRyo7&}v+c9|cyK&8zoJT<@kLF)@suAqmPATZUy&^H9nJ5Ap$DyKID
zT=0=q#kYt*N@>(#%Rr!CPe;D`50LDjjbO<<O5u?PZd?9z%t5}>M|V1{9~Najxx}O5
z$hjIxNE5lM-!v|*S+|oyRxN|dkE>*CdX#uw&QP^VN2sGQ<qnI0uhw-G1HGanVezDy
zG%7NK0`9mFRK9&iR(HIO`)znqdF`Jj$C2$8)Wamp*v-z>>8L8vKcf7A{s_09l;g4L
zWZVj&jZi#L*Zf7gsLefE9X!wGcftgZ|22nsC#N&b>yxx-6{r6JfTlY-$WO0WaP~|O
zNNqV@>RionE#r>ZHrJ^S6bqlu8V13M8tq>k!7L=amQ_%Bp6=R<vP?_*5>IYm?D%BX
zkGn8l51uZN_d`-+XC&QLn#)Iff#>z*qY3%pDv6z8QnZiXm<2tY7c{fHAs=$7C5`u4
z!GKnc2Og)Ma~+bzM`{COp-yO3+9XA_x||y8Jj2h9>%uiaB_g*GWv{FhtDn8EfzMBs
z<#ofP-*C~F0g4(sgd^;~uFxMY$qeOLuYODB(s4K^>KMu429@j)`&&=FBkCVgxYz{&
z=Y?n3$fO1wS`wb=R8F?AvmJ)0e4ee4Fr$lj_weR0w=eK2YP{JJ{V*sVBmE)Lj6r?n
zxQY>C)laqZu+9j;R|>uQ#p(9(ofxl&LWo$GwnxB@viLda#UC>qPM5t(#8<1XZD!L~
zIImf0&y|q_metSHE{Z5(Q=VQ|O@=%R?5|30$DNTxm%!%*&;OX#BKiJwsX8zEU8>BC
zem{ox*O#_0ka{k+ybPawi{~Y>k0*T?r9#QDofqvy$rn<0+I!~R$;2oPRK{s>wuYir
znlD@bX!lu!*1V?ZYgKYD7W@--Fs71uH61SV!?m?D(a1~c*)v<DfdY~$6!E-exlucL
z-6dvVC)!HFIQ@uxVEb>Ov0db?(0utjk)MK}+g#e+-e3Us(4*CfkoLYX_RPh0wT@VB
zFQIrk*Avx(@XJ;46sbiD3fb1HCXELN*Ae1#@_(^=kCq`>Uj(J3i%Gr?yAsaDoA5?m
zVW$yws`dQXBlwmjycJoF*~kSm7gp>}eQ>t!Z4n#f6U6*fem&FdarZR+;bsk^X?jXV
z<h^(GZoEH>?|Mf!tspRdIHgb%=@(}a?-+A@=mLb5$HT+S#Y0>%YE!W&M05%Py8D##
zmDc2Wg8&Z=kInBF3?&`@zvjJ&0CMC{PGXyqX(~PdmKx&8JC#hlfv;9;IX$yKpHx+q
zkw9P<FBqeqhG&IFe2g84n13BG&f8r;CjZ_0_OqTLXOILVKb$XG$;{2qg}wM~sLYO8
z9DZu4G(Naws4;$4HtJQBio0gw-dle$%TjC7TFCmJqW6M2E+fo3h;9M(YnOM27}&v`
z-5mZ@Vxflirs!lfLFi5Nw1|&Jp<nD{Z8KaNCjk;u{GQZ-h<L&LKG&K)MzSiJWZy#j
znR^3L%i|&Fn}`(#x%53Zr`Ba=j-z_tc|9El7>N}YC)Df7WQvH%nN#Ydcb!im#hGMb
ztW}-NJdOQ&`IP;eoF}SN?9V>d@ESHZ4~feRsD4Q)6`g$IQBN6v@9@lX5#_}A{JNWH
z;Z>S;+qLD@5Vu2M9mO9|GkH6UHhY?9!_A=890tazQc(5FNAF+Wd&PbNpHj+C8Nr@c
zLUx@s`xfioc+p9%_J`#c>M;~=_H+C+pcZ(pbaxf)x3C$#AUOGSO_PrQNe+McuLrl<
z{^XRrDAE?aGJ&JJpp~cfwsCIZD>|2b89FlP;I$fUm6F@M4zGtPFg^R+g!E+;VoQzY
z?$7n4dxxicb2lMK?a-uMhcxZX`#B4u1LViH(>J9fDreipDmsubZfx5wu8Jul6C%_5
z*?~e_WQCso&{u?v?v0K8puFd6&`cV-fJ7(GH>>Abm3Cp4c9F#RNGq#tk3MV>8HOeg
z!vRMrzKmO@cM2s41I4r|j&g1A<30|ut4O_}M<b}QF1GuTu}bz9^4~&kYRK}c=}K<=
z`=KnYQx&szI<QOIz~uWIAk1@NTEnYY>IRf4lyEJj5spruL*C`2*UwouTbLCJrQE{0
z!|pbdXFExPAx_n#p5HoY$<mDS@IOE~Mxh`L`IX=b;$E+-Xq8x@4(#WO*N8aBU7PIz
zKj|l;N;TMAxqYGxL@_;b)K_(=WMPYR;p=n!y-2#ZH{QdT-~1utC#-}`TfVHzYB8zN
z=92+m5Tc%cMGE;lzxMSQCO@N@?HYts2!D{dZJze*IZImd=zNM{D4J{d)e}r9ba;S3
z=GPB6z79~?4z|jAk)8j!r;YvsON=J9t5Szna;>!H)hNf6{pRy6JTPN2{;1;o-EogU
zD%jHEPtjJ6oL2sVs7!nr;%{E}ZPkp@J4=kdRH1=u$!gU>Q4h*9&l>FkZ|mAmaJaRm
z>Vgl+&mBGJ8TTJ#^#i~s_cA33^_kH{l=?dW7P%dr9Z}o!B1QHm$*taJhBaYFeE<&%
zruf`Lo4|$i{4n6uJapGc3F{H*VZtG?EJis7TAjYgzh+y3r`*vDu}YPurUvehpOk-J
zWth|`6(mZcwW3s~sufSkz;_}(gtt&4hMf%zyLmr1)zxEH^EAKGZ+t%0HYBMSdb6eR
zG^vmE*7xec*O}bDh7v07ENlTVK&VSR(#d4L>C(d*cr6?rLlTtE{1)A0Z=O4P-?HBB
z69TD)?OuHU^|3lj6(*=DLB+U)<M}@g8?C>x`o1NupdknbhH?k(i0I*Tl3(P!AmwRh
zcL991X(!uB@FtJ1P{&vKUIc8}OndpNLPN_I9QSZyg(dhHT9rCZVV~e2@OG2mZ{kFF
zGEWW0v!>Bdsh~~zhj!H^F1s|TyXeHi4#L##gaD!*d}{o{9ZtigDl_Lx6>)y2>Y>n;
zuY}$Q>(9Rju^{1;P~Tsav7Vtu5~#|XsYUkbdva5sMXTX#hmzmNs3vJ_R~TfWp!B3*
zo0VS0y2XEcol$zZYk6~$yUoKgU!@q8Wqnlt`QMf1Vw1LGksSHRc66n5=>^`Ox%WU@
zkm5@N`+~mQiE;$vab@=XNXO>)(G1jrXix>g)X~YDE2oi(Mi5ivUz*p(@xxF^-9^Ah
z=Uhk7e}BI2<GFr2!)~fpVE2eVFAn~v3S(;%Co@nvqBe{U^5hN+s?2F|JIy)N1p>XG
zTiYk^ep9~NsAuY9BuCvPUr4tYdA~Sz(-&nQ$kW~5c%yIVvD1rNIz670>MH*MUjL}p
zzK2tDd5rmx$iEWFZG>$5?AZh4j*$-G6Cs58?LK*9(3axc^lO&DK)?oXUsY0l3gj{p
zLq)8o7DYsjAC>m;zJKNdrvsE^D*J?b;$X+66scB=J)*P+cPXxjoT?->*yf}8oGNta
zG4Ve@t&!4hyUQ2y(hb$?&zY>F5(k+Hcu2&wtD-iKf#S(O<=-LIMT{yQiI;1Rfbi(B
zLR0gVSeBd1SzjFHgZ=~9+*4dKyv6C7I0X0lH46xXQxK+%cXNZpm9)DJx;l6%sj0f>
zC!hSHlcHHn$-urAu4VU<5t;iYTOO5*`>nf6`kQupnQ_kk<{el~W`2geel0#J;=^06
zB&3$EV5r~J2O1z-He}P%G00gRyxz@IDRRW&WRb4;7)}t3UIveeT~QAMM1Jgz;uenp
zijz;2dzmFr39~Eqr#zYplpJYnF>J`?piw1z=E43aFo91Po;95ecCJJU{$HVtJwGtk
z7B8Mhet&q_P-aVl=uO|=o74Y*mW%$SvInZ&(BGs?yYUs@A%287T!)Uy{ZhRJZ`x)C
z^8BIWfQ>6Ldid%4Nth5RKbsD4yH1c_jcTQ9p9#v=d>fVvB?W33e*R?C-gm4={G1Bf
z&A1Qxqq4*fUOXC*$y$<YMO~8S-XCP=7K_u$=rvkEwwU1UU5od=*1lXA0Ke<uRk`jw
z$v_dcQX9ply2|t~-Qh37KJCpiPjD9g;Un(u*^l|p7oo<}E=$my)1wH4o$KYTaFy5U
ze^d%@W+~0Y31%WttfW24@$+pv9#UiU!GX`;l*{LT#aB+V4h{KU$+Jd8Mr-wT%?MeF
zA2G?coKDoArY{hW{Z>AwxfKORQpZrps3m9|<pZZ`RZj2+<{lf(zvX@{3hFgbCY;-7
zWQh*&UtZ+xz}pIdUyJ1!xRkCs0|-a9HMws}S&(qGc60K!z2F_WXITXlK9G9lhd!Z4
zTiee>e)F-B{bK2j=NI{chfxrx;U}jRn~51&NICjr9_54GQT|MJ75n*t0SA&!L9Zp7
zUfM#g8PNZI%&@G8{e8m(Mf66J13?5vNSk2jaz~}x>iXC{7Wd?q3g$ff?S3>UKBQ3U
zH~57dz~}YE<ljYB+CrlYfkA=fPbHRliR#cvna>PqQvM8*J?JO{{a@p`UG_rqF*9<E
zkraV@Akgj<K{7duW~~g+IUSI4gkso4V~Fp0&AVYh5CT>Br{oio(2%cX6B&G2jaNRH
zQm*tp%=*a(@YNZ>@mBBuk~4IpKe*TVFih1F473E}t{TmiDsI!T%2BE}zeUC7WB<8#
z0rDg#rL#1~%vQX9A%1~u{{zIy{u-x~TMz@NXxci*L)Rw|7v>46U<k<?$pu?SlVAt3
zr{b3hZ|!+?BRbTfMD#y5`5lVE%U|Ek$PATz)wT!MvEKs(CDxIB>289)pvR0~%YV+_
zYhdQp7x$2`IXteCt+39dqLECW@F$Wh8_G{j8G#S_SVFjCoW^aPLhUc7+pMbfd0&Ho
z?JhjsK(ooMk~WxW$KSWxSkS|h3Ysi!2`bC_eqTm+OF-QvYa7a!&Z!15wS1oEaHy|x
zLZzi>Zu;JfR7W-Uu>&mw&OiU+hm!!YDw#?SLEiRY*1<uEULs62S?8w3?hl@{I5R%6
ze;|q@)IWET5p;uWOCKjxb-mBjsIq~&#}P*Mimz}D6q@^dml~2U{YWtp<wR5|P<>i;
z28a=LDjag9C3kMznm#D($?Le+Br4kG*{i^?@ejZg;b#tyzpsHwi_L;TgB*hg!J~!}
zZ3BT^W?~$sNIHhttt3{UU~3#Reel9Z+T)c&m3G23P9Px!rS&Zxox6=aG17}yFtads
zR3O5XVR*YtYwM??Q*Mt0;ixPCkvq&dz(>eh0ON5xixW?AcH#K3Em<G{cdjGZ<OA5n
zcNbMU3#FNR;vUm;n8wbxy1%eM6H-^t2&DZu;21!7+a%}Kp+FW;+GRm)u2`&CIR4}W
z@}sIsGu43ar9E(e7fn(cD{Ng2<Y=sTs>&FJu9I_)g&j@!m$bMr(Tw4!RiiM_D>*ZA
zx}16cZyl<6h^A=NK|bTuok9f;{sUr&hL(W_>Q97N^T<R=oNvGMvK%uiZ3{(uHN^2g
z&Q6%ru&RRELBHO8`gV_O?jsFcphuA`s5PoI5}WzV`abZrLu-Z-fN?voZto49pffN$
zx-CC_nsBl^VgAzZvR-I9pG+6v%I_ovz`xtqw!b?l@}e%<+&I)PZA>oxw_Amx6NAb_
z96w)PfvkL6GIDlSvfr1@iJn1R7JMX#wF9^eN}`Ch6MkEUE|mSo67$a<a_~ueB~kaw
zq2)+M=!AhUG+DG%((OuTuz||7$1U?t0V|BAgFK@W-?GyKxqK*+dr)XU(vYUhP))$x
zn&E19?u%?Or&s>jzKN2>-h2&bOiUzV5DHzxz`eO09Jzw|R7n(yYK={ZN4yEOs<e@h
z4i7cnUG2p}lP7}It(IN!5|hd2r7~2C0I7Vp*!N@k_SyFwaCUs9{6t;uj%py*3Z5U1
zOIs*dARd;Nd}1YMGtOLh=+|9eh`LLB68-Y5BBf35@NsxdgkN-iWK)Obu%%C=FHDI(
zl>XX(;gvC4w6Pklhd^8^&U5kk*ad{8q5&k=TLsX|B3>F!A^*BE9rM1zMo`5@Db~Sd
zc`I#Pc;@&+Gg|rG&*8gw@AAp~Rty*w+`QA*ME%R!r*9T<yt_L+K@nJ!t|dGd7!%m&
z#Cm)cYJqCi{MtiC#pNfFoR3yK*gya7ti@c!eDy7Br7%<5BXED)AcU?L@AkDEhCln<
z1blbc1`48$whVgwN2V~!{ar`^cS1)}!G5a<VjM<rx@KGT_&Oo#_%4C;_z4Z#$MGH?
zc~kf##EJ;Cfm(SC*?_W2*P+ydLUpeZV{Cr7G0-$go{|J-pc^1H|I`LgE2E3KGMti2
z;(r?ikCS5U4+`IGtV_18n`$=wj<}t8rD6NmnijYh`kpTlaOLXXAnSGMK~5!E9fh<V
z>O0-osF<e@!fF4Nb{hV%SpASh$D?8Ff}W)kR$PTB`?20NAl~UNily(k`tFRnKf-II
zOUs}OID>qMyc_jJT}fQEr*Q7(|0^F&^({OuqfLt%E<n@qmianD6mw$to6F(}3ur+`
z2lxj%=~>E@D*f}hxA#mZ-v660RF05+5~`95(H<7h1oM9mjh*`(@%MT8PrF|&Gie!V
zACh?rH$8uHW5Z5s!<w_Kg$@T+=vQCUf;KE#?mgZSxS=Epu&;^qT&@x8W!hzUG^Cf3
zX2ufaS^>MxETl6?4GF9-3HLCeVhB5{Shp^IhEb8pryjR0G_}YX)O#rS&ZR8?d|59l
zVKdE|GWM~@kIc&|vxS&0%<qx|mwLCPM#tT<KBm&lFw1qOK8&U@KUO&jY{9{5b>HxF
zj6(&v0l_<<)g+ZEJU>c`9l~=-Sg*ELF`~;U-1ijflAA_MmS%C~Od#K&4M(vI%An`{
z1%*ap!|Zi$L<}}oQ|#r;>qZ_SGMJGJR6(rhvTB`g<5JEG#d}vp?408dEu3}d?hR2I
z`Ea4?g=fzyev=E`UV3B>Tu8})LrC{XbD^ciwv2lC7n(7~^Q($luc4uXMoykYmoXpc
z3PWZQ{1Uv#f1U#e)vmm7Us2C;TKc60=HTQ<#DD;1Ql8CsM15*BTF9!Hpj%s0+ZMa;
z&_)g80ur`6YB;i}i|IkBXMdB`HNC9h<Oe4w#Rf&%x81&J{WysB1_Q$J5{6T)8|J(s
zQVLwoA+nu{#4-<tOtC@wq<)dZjcCbji=w3UA<J|y=Uf?Y`{oDn=%-Frg+sHxH{C0b
zd9RV7-#J@{Dp_Qr4>`Pu?bSl9g)huB9j&s0pcmI>KfRPtRJR|y3PE|xwzsgyq0zKM
z>N4fD?I7j9mHjV9$6O@L$Pi!GXZSwc&G8zu(os#!@GI;!WBzG7dgp}K=*D20`ua@T
z_*1o~R%>Y*YWndb-BP+R@c&`AtLBe<`clnS7-)oH$Gn+NeZH6w#J=b77+b(^#YyU?
z(obE^zlb)4<FW0^^*XeYfslw{hzKW_8h84R+(n*gP|)q#R2MthouN)*iidf*Lrd->
zj0VlaHdGyD!gh2D(L|?X{_MB$eKIwr)>fG6^(T8{8<+M}R)~|s+aV)8WT-DS=P74J
zaz>-GCw&4<|Fdb#1L9nwo!`yOvRcf?$nYDTp$xEc`^KL8b6Bmr(fNM>FdW`6RPCml
z8(EBVZ=43EECl~B7RCMDi2QS3o)M41WC8TIuVI(%r~1Q;LE=D;vp}YnPcbTpxHVyv
zUQ+BPIT7<5hErl3LW=A(x3)sjT4Q@b0eHWZ=U+eGL@U_{>;%akKUd#JO@4Y%aVf?D
zo9o80-B(9Hk<f?ej6W#7nbwgC8#53g`&e(&2NvyIIZ;jteK`lE-5FwziW}2~fuhfe
zAMA3tULD=0G*WrELP(nx;fI5&wb<leN>sn1Ll?>j&zx)`Woo}YdX*($6&*)ZSqL*j
zJRRhUz`A6JM;`p-7LPmL!U@t&wlj5KJW|i5HVY(IR(8V}RJc3+jDzqQPyc^sZ)E<e
zh8gfR3;*X}9z1?NYMjUB#N5x6{roLrg&*Hau4?$S*#&YA)^PHo=EO<P`r(v+&*SCA
zoO0nQ<a;q-wA`2~$urW@bi~X&q<t&7yq=!SS2paA_Hnt%rjC@w28)DfuXDcv0DKjE
zd{3$Bw)Up*c>BST$Xunbp~3R=E%WJ)wHL7YvmEAe5I+J}WGRqh!usUX;|@=W%8Jy^
z=qyP0^!MoSgVLWVSvi8c02YNqm7MKS>lhc)!w}>i#BqfzG-Wz(xRa7P29D9*r~XYv
z!$~UE17d!!eOIwRlEyFE^*|ud%B;YC4Z$o+Kz^pHNRl#c{P%;P>a1i3E@$TjOH}C^
zfak*hy6M+uvL8>A>oC9@W1`|1dIBj8CPTKT(SOt1uDc14l6{@!kcL-cv?HMzVGwIU
zLFd`<4qv%8EEb3OQ7gg1K9~5)dlA{C2HlY}e)EDwV@&|;Dp4hTrcIdwgUJJR@PxWo
zqHfO;gLXpJF=6KMQyY)W=Ym=kvU$S(sP<=F^j~<~?%e@U7Fdz;`cRAXt*M@tCm-9j
zmiBP<gE-tc52HJ|Y5ug_#yM*=GKxjpPNlS>$E#G1DQB15b?5<^Z-|oXT<g=`f&EQ3
z6y^CK*DM1Lo-#hurQylWa1PEenO6f4Tx&p)BFqJnp9@`*JWJjpo_s99^qvSS5y8Iz
z?9cXi7*3C9JW6dgm3(9k$)|r5<DS8@C<FOZ)j0<s!XQ8-JNK~Um?L(v*wX%|-<UM@
zRjB_-k>tA+$v=6XW8W%~Ko*vw=vjCxsO)JyOP@rtD0A=VVU-s6khBM0$uesGW{yeY
zm9>G7B9ro{b9vimZ>d=cc;M{t)#slQp+@4rIp%_sW(_6M2R0O>R-2p~7>7aw2-v2-
zqd3W1w>`$bZ8BpJzo6s`=086IldFXbUb&rx7a1CAt=EVvOTK%drs*OP%(=Tg=C_@$
zHYu*FNIG!MxpbGlt)Lajq6%cfa|%jy6Vv(`hX9&a=j&S+7D?ckx3V82O;%XcIKk%$
zV}^&vm33WRXfG*&6`~uSi{!)@7$+uC!o{pSm(+bYw4}&B?FzdeLh*iRcVo8z&V}xd
zXP1_NKdunJ<n;YQ<WWvsKDJk{R<&pbPuUd)1(@G|-fEY6{z?;4#QE!i(UazB54=t@
zlHW}@J8En)ysCpI-XMzAOiD1Z?njjfSaFexn!;cCBC1ed3;MzBj%OTl<sj}9ygpgW
z0r$?;xzU+nxKD5;i6L*0V`OzSMcHIHRtlHt{kN8}A-m_M#jUJ28uYZR3M$npd<>O{
zu`^(T>0<a_RQ8LZgrF=w89^ez9)6{~CAt5DC_N9kUH<HFL>CHylB39D|If52kTMI7
z&M3K=_2ZXJ^1z{9?;k^u>n0T6rCy<twZ{Q->cBt4(R)GCW6@EWR!F?iY%(+L-aM%*
zm4EP*S*l-L-u=D2tP<|fio_z1C};0r#=FV#wA42Y^*A|@GB*;JfSfnCgyHmO`=MS(
zn^|rKOsF13!tx)N^~fh#xM3{)I^JOXV*3Nvh0FMo&DvhRi8&AvDIpDR5#|V#6qHy*
zUc~c)%0;qkbU#-xTj5*$7yg*Z`h^GvkoVLFy{sS>K3QQipwBpow?a;$v-|q#NU#jv
z7kEXWwDS#7{!3(6Ei6F7?4ykU^O>{%HrMNpFRu9$et;b;+`Jy%C?h1&DW-KmuM6tU
z);`7aDKNcf86I1>2@z;lwUY*^Cd+C(drSk-BjmrbBg1IP{ml!t=|WX0{n(|qKj;>k
z@8%_9JB>KxHa?~0%;R}_>iFTPfYbf$hfyzk1l*#LRQ3uEEyw@Vz#x_8V*ki*3aj3?
z8l}aM<#S!W3kOrG9|Qvf|5Qn2c|!Djy8GMb^N;Y4({%#Hn`D359C5*XK60Kr+8}+T
zWtIxrUsXPQwqx3CCgzZ^aGzHzA~eh*cFWRK>nyvLO-A#K>Z;M+pB8u#Kvq9JC|{Y9
zX~!rGQU<B&IYMM@<{tF%k6>D^GU@R=8G$&yIAd2<aY4D9pcNTS2zf0Guax&|6r~y0
z``9nNNlLC2$`kTsEcAOwP1EdzRzjmrF(;z`2nhvm&EH8U=QMYuZW)E>&_D#G5DT%}
z=V9jE3c>g5x$;GfXoTAqG0Oiy^5@RE1erc232l|<upZvf{FB{0f0p0%%u0ciMFOdV
z(w9YWL52e5Uytdh3r+4Ddb(2SI#U+tK*yone0olk?jDshP>G+Erm3;mze?Agrxi}I
zCT<i%dnKn9By?QZX}M(6_N#*X`c37RMfn8gd`u`et-*?wjeaI-;kllX9FRL0<W7mZ
z8XQxO)AZz<)5bW7k@CmIT%d4_wi-3h=%YIEj_Tp2z7)j*4XFnVvE9OX`t!jf@Gy23
z1)ny-;|s*D8sC2t*RS5qlPf6>-C0{n$I8S=Lo4eaKVI@hwT@6t^@ARpaY!O)e%_~@
zHEs{N8ht9$koD5O61<YV=L;iEviduZ5^X2ah_my9{{fs>3qH5^!GvVA3wlWQAZD=O
zb>#PFx3o}VS0gl1YUAtYQ`Vgo6xHCKz;OfYUmg+pZj;`|j_`^mrk~^PExa%|B(wut
zg1~oIJL(6pP2Qb78XN}3UKDOwJd}l!T)ejYs{V)xr#!M>?YH^~coB*A%aZ(12E{4N
z3yRN=s5H+*SrpL0c=Be!pwpc=Yh4IwG3&wF2b-KJN=sn~CpYjqM4rB6GQ{t}`$mQP
z9CJFtvlo}9k4-{=wU)eZ8=$*?FMcF;QYv*7rB4viitB8bsZv%jXJ=x{!!0#B52dD_
zEVBX5vEA<BGGmMI;b&h(K1a%=<Bs>u=nGxF#qZ9*o<}Y}jTa74cLehF4Q$PCsolgv
z**lwhba3I7z92%xKlg%9x~$$^YCi{$i8FZ}v~zf=Uu480wGh~qjAdC;2yHuI<!S_a
zMI}P^{%baU%@?C}6gFq8uv!AablI~<OD!Rbz<%epq;A)}AHJv<F}1CK4?iGjpRj_l
zPNYBut(=_|JsNmw<^Tp7YT!ZVd_ORAi!t2f|KsSq<JtQDKOTZurPQn#Evi*otD4xO
zwO6UF_Ffff%_69_)Qp;q(4tn=o~5?f6h+Mtr1sw7^Sj^QzeyfB_nv$1Ip_U8ulMtn
zl*pjIlBqC=tY%P?p(NhPH}B~FevzJxYL+pe{P;S$)3E|{Ns4a{>?OhS(wu$Qe;PRA
zk2qRcu@qyGEcH4dWc=TM_jcPD6PY^B-a5D!wF45Ga3#wD-?<MJ;wIwgpK1Yw*pU0W
z59r%cQXg5p!YLXCDyBH}*xl7xNpav5z%Vc#9ez_sTt`+7B1yuaRn(*ZK%u{{cKVIt
z3UeEP>|MB_#iPYeLslWbC3U&%m6)M;*$74oWaOBlPG&R9ZgDYXNJIDHcx=!JSfILd
zpmH$}EMl57{0%OY-B;?i-{B#>2PpA98L}<xwXbFMYh=s`Z_&-tzg~Mr&1NhiJvj4$
ztE!i~Vr)%mC}#WYCb<BGw}LY}2dR;^bGEX3xc<$$S#2O_A0ot=Uw83jC6Yx}Us#C{
z?|uvMQsU~8PJ%Is1=~!eZ<OF^aO?Ph0#Pl=CzLdmt-P>diO3MjQv26_7cTG1__EZw
zAHia%PVI@vs{e<;Ko7!?if%joG%QsA1%U>UB`NjZX7{TD{rF?Ec+__OYDl>5Ln+^c
z)aN+i|3G%yAN`~LwB33eNs%atZKnBlojm!~q95r@sBAL9Tlg?qa4tGkU?sxNED`=s
zgHs5cU1kBg0+M^KK;H6kHd&ZkNN^ilYiV=M#_Zo65RK@{?WcS|IVMV;GQ{md;k4aS
zQ`Fm>{LC|U?^YY(qMjc<Bso@le{JVfl)be`YEHG|KM=Rn6sa~iVKYwUsTCEy>XX6P
zi^AbYXP<ZVJ70Pl-oq&FWJoW^-U%Sq1fUZH)e>$$TmGzmn7un}Q8!+F>YU(X&pz;Q
zKWmCRgfax4+jsLxLu{-kSHm(94T8QtpCsC}+T7@Uo%_^#0S?Yi51EZC;7uxPB=P$r
zr0k4nFe0%U@^I2{e$cCxiaGXI!J*jB6o+a@?;aqdshUl+Si9CAWs>AqxTw6gfR>q5
zw10c+-~-?tU0~zsN4oDZe9)eo+Il8dKyiE-;*s<3X~rJ{|4D2BHw?VMeN|&WL38}5
zZQf80;{ui=pa6RjRm!djBd}}l)rr1ML8(>D{66EHC94xO?OI)|3%`8eagKw~TVYhO
zvR!uikvxQV^sC4H94*VL71Tw4_1;=<!Bf%B8*FZ7UVO}<4oUxG-%fn1MXyf95rU5S
zj<<%8O5wKk2XeS+F$RfT_y)kmw7g!kRF@tHz7Cqsg<cPGnJIOl5&dSz-I;Kr=OZS8
zK!>J0%0M;5^Yf>y6G1M&^b~2y-m(MIVUzVoXZq(0Ry?S%qxA~((@%}%ypQJqN4AYq
zlZ^6=PiK|^KIZyXv_-F7_@$6fns?0;<bnVLS}l;d_tF9AGhcY(jTQbq?k)>gdk=(2
zLX?0Q1TDTDWGwJOoywW(V{+Ch9_t&tXEf-_EcxE_40M+rdW@%cK)X^|dZcqm8IU>|
zZk%Vg=T>9ajcUf@1ADt?U*YsJzB#vchYsZcbVA3zJ!~$t#<hKvBV#7zqJMu&-~e-S
zxTVxrC7KfZIdAU%c6T=?#iaytB5|Nf$Nq^xIm{8{aBg4xwxRLU?1$sxx;`6u_S5(B
z8+uRD>yqi!S2u=W3YT|TWB-i`q%q49F}2ikVXtDQEI&UsadDj1-{EW!;=mR1D(m`>
z4}6vV@F!KwScQQR*80d|`@Wl_8T!sbLdJ(yUgaw($QNfW;9Pa1zeeqe;$7?SQ|kfU
zkY=;l1~=NshQ?YlA{Lvz^V}1N2dp0<Q<r-H%kw>8S(CrFJ*J}DSlQD7A#NnNQ!!Dy
zWFwdBcFU9?Wfqm9%&(`@biLo&;S`$ALlnD9?rV&mje*cN5(9B^WayAa!;ngjPfaMc
z;r?W_LZrMa9b0a7ZT!D}mhT&JIXpD-2Rjp`twZJ+5n7t9;6h?SsC$h5x7qqzk2Oai
zLa`SNf1E^39v_Gv=Vc@B>diXTx{_Dd`b9G(eaw4{4k0@%2?}bBs}+%i(b8jTVHB4#
zf3!EW)1GTO2?+@*^Jbj?LDCPIN>IY4#S>w~qnvB$U&ru%X@S<7Jvb0DLCYj_jzyN#
zA>XZsIK8SdnLA)l@|F8DY#=5ke!BEc(o!Tg^>-(HctB4rOnFO(*2rcW$=M3y7jS^Y
z2a?{q*SLY`j-$x@BKrtn`G(^{r^?{8HJ*j$SOy%Yh<=TAl`_4H2MXfv#9yEfuq0O-
zv+2t}%w@D1EQ7?42(zo7H0Aq*YYiOYvV5Au<O~Oq?%;0ARX+05e+n&GGNV)nOdkw$
z1;CTwM4BAxK5I*v9j`64-(GC!>)ToTs|5R$-dRu^ycHjWT!`_kWBT~rA%_ruc}6TX
zV@flQn>)ae(p!aU86+ptSp~)j8U8dpYF6YgV&XI8khmK0l&*~G#6-GfLL3fig7M%B
zsi1N(`A2<7fS(&@Rnf=7xGi*ZV##K(VZtV02Ciqq9NRe(w-Ysnb0B4U*R11*xIUzR
zNPRS90N<27A{0Q4$3kAw)Lq>m=?;aF?MxS{g1a5LB)GWzd}R`44hc0Tt=B~mTY(_{
zQ%%`VA?&=RZeqq<DWBr=k|vM7PkDWf?#$lcq7ZZVQ#FE&rH%dkt<lji&$gC&SYg%&
zo`)KFjW$+L8?i)Xv~BEM3Y(Ss-;KbFiR3T@D%wnZ3D@z-Sb3J}$tf1>P(kEPb(hZE
z)VxX%PE>b@#azmUvTBBh;O!)pd7eLz#yhxjBaG=i$Jid;?q=EN5{gL=$+df%<9wHn
zRW4B`XfHED62bEMPu~xHvT~}B`gPY(lseZS;&t7%D%W*$eMoq$3-|hR@Q9ajA`rm9
z!O3X(HIs=6)`M7dg{|r<PC~6hirpQQit0|BnE5VTq4VhYTiH0(eJj51POtw!?eJ*`
zQh)uzn4gy8F0SZkm^Y~q+%wxg^^62;Uga>vjVF^D+x%Fi=pi%S&+;&Z@fq^YZm`eI
zMKC}Ipxwg~W1sW*yvgAZ5>4So%*>Qp@H$kVEjrt(&r7_tMlAdfV4#-ljMuYq-z66+
z8wsr*VIyREd}zZ6(-Z6*e(rM@3*B*)<r)BOJvSMKl<j{T6p7bQS!uYK;eu`*u^QcA
zVd5}>zW#fHjF+Y5A}f_*TIE#Re5m%1F{j8D3wqxV`7zh02ZNH~z>nnIj-71hEzt$<
z+Q192ymwQ>Jqd1t0dcht%am2g%?+P_;LM_i@w^xMwHf-YaMof5$D8qhRZRlFhx23z
z`jcExqMhm{eHZrPj3QoMF~wBXgL8j%AP?&0u)jC6%e|*+D>0@2V9M6RjU(&^J>CHZ
zFkene=v@4{wv#=iea&`hNW(hMU2g-0r6QC3KF@Gr`EVD<TQ^>=V5tv_RzL?Y2_dyP
zJc^O4a@daf0%mbr@7UJJi1$%KSjm_Y$!_GaZ^^h6DsiTnY^_UjsMGR!6$ZqyQZ9>$
zrM*$l?o?;KB=Wr?7Qy#y=BPN1_b)%A?Dx(?LAV^|U@GLEKt|Ij^c@Agueze%A1S+&
zmmIb^5d$*b>*~!Wc!j&U^^U@yHP0{?!APSs1En{4amqN3i-m+5<7=`#hI7;g5*$1&
z8FIgG4&F#H=)^>hamrJLWl2*$ax+Nzu+z5wtA)5`<f$&(L&4~scXHBJlnJ{{uKkvl
zQAxrF0=@VH_gaekv*`QR^GGpOKi{dGp{54=<dy*VTAdJR?*&5|MP+}@RO-<9+*Y^d
znt6G96&aD$;H`rPxf)e)@az9Tx0`s6Yfj5UDMS0Q@Y6Jk2-(lPj8-#l<`)aokMS1f
zgrpv<qhk1KX?3#gT#XCfrX2`u1~1gErmy5qTj1={{yc)sH@$k7x#;eN_Bw=5NnPhh
zP92ubB~VS({J@kal^2rLF%UKq`dZk+@ShhL1;?rd$4Rxcc~5EnJwe1mPgbHgY#J>D
zF;Q%41_QJaxL7omW|z;RNgBL-eVzECz)Fey%l&uV0es14#G}$3F+Kk;d`0)`&tv_7
z6W$4rX$oT#zN%WYgilu-tJQ|<oXML#G7KG)Wi<fex!?pP`HTD-DtvfxNKxx|)JN2p
z0WBhB?J^cQjv<?@%XcY%Z70rY%xNG4s832w<3?w3%PqY%3`)G&?)4|OHjml%E8_3)
z#U649L0#gT{@e)@hrZ>vPkWQyL0TT)qZF@>kuCx08;}zfZL}QH1>SECB-E5!j^mek
z6m<@^Om=3e?Gbl7__(Qk5xDXqYxq~*2F_t6B|ap^_+I7URSZr0BLCHPi00<q@<h>+
zyy7J#Mxh+=nSK7FV6xno_f^|sD~6VW$Tk0k6n{^;?w@vs*%tPJ2+iU{!m_lTq}J}R
zs)`#bfjNX4dN*Z_snma_y#4ucxmJ@9%Mck~jl55Wd~@$MCV7gi6#%cV8LliDT-3v6
zLA+@-rmrx!Tr&bFI4v;`#Lte3-46mkf7;e@#1eQ&L`5wqs!k4F{ggb4i!^y}-0^VO
zB7SJG@}QT~s5<IFAkHX!a>Hc&@3u*dbkaEkBEc#=o>KjIMN`87!eJjH38Z)Q0?tP*
zx5<^63|W)PsW?t}h~;;_nf0+>^w(|Uu~}84RoHdSTWGOP$GuhvHiOh4zn;|4U~X5N
zo=X4yuTTmtnLyIns~we;TClORY9dEOM=Ef#Q~JcOH>xhqe2Sc1&P5>uS43QQ|IV3I
zwNl~xm@E<{-yrY4F^FU?vL&;nnrNe@IphXRS0~<WgCU=E5R7>G8KYcj<RtJ%<M*sh
zJZD-%y;=a|mA*}1PL#m@#}{FA-a;!lJsE$JuBAzRjIAA+KieW|xME}E*>%B~zapi~
zx(#P22wVtTO{}|iG9sMt6XRI%kGl5+{zy+dO8x0DUxj^B<W`q5Mb+*12G4JV#|NFv
zJRP}~G=nhOKz$t2002fUak}<Hqk&JgF<5mn9|$N!cKmv=s?U|PHhg0(UWNhUUM1pR
zF6YMOAefF>zRQiortrBmY7^fkmFIs(%~kw^uXTA)RBPO3;82gn)Y1j{_3-@qlMd8Y
z=?-ji#{0C!6_d#w%N?@XJH;4xz-K{T4gcyluJrDX&;e1)D{aG{H2q?RWH{I|*vRTK
z<tvl-tu)tVTfi>qNSC&!=lAl5^5PPJ$NTJq9ojIt%C51I=m!y@Qsxf2=|4h|YG%F|
z|A^V!S8nL@2a4>gW(#L+4d1PZfoIQMFvQVfOA)czC}Er*g)I+@1IAy7l<7C?jc7B9
z0-glwgrD<^R;!jn{PKrxO<=m%=<PC#`?9YiDMSr2hO*%RF9YboL@~|V%9?6XRN*fN
zJTuKYObEP}Z@w^KU-}78hN4pQp`^(XOkEXXqS5>Plfn;lymmMwT#fe1I=(Jr3zG2n
z0c{+1sX3eP{>yL*8Nl)0HJUCQpfD002-F>{=Gof5Crug2PnXs5KztmVjXF8{R@#&5
zOx91qK~1GRTzH~zb$IliMzDk63Pnj`5GJBO{xU7of;fq;0uI=8=qNdjN)*NA?*om2
zjsovrB!mfzrPnoFW*>*R(2Dge0N>az9`-qSj2)F;eO8aT5#Nz>bX=Gi{eacv9@okh
zGdUg*H@<TvpPP!xlSu6+AT}4omlK1syHf-c+bcR*RpG)CWXEg90z8f}cVvBk&eW3O
zkqOp{GU#b)mY>Nj?y1m-z^(s4>sv}UR6TzMRp;Ioqk;7(svzgH#A?wxPYQfE4CW*l
zt&pP`8T42?5i-3SJ5az8XQFCrR^8_YVu%sg)UPXAJfQec-ufk8^8x!0m{1NW_<15`
z=%%I_IX)Evhi^)DLqG^kpOI}&-_IQ7J<#$ag%p!cU8MKVNcQf>1RzuLwbec1)H!*@
zv|CvYbMs9dqd=$uEs8W4@2g(+L!QzgwVT=Ep?Lp2qHP}%3x^AY+%r?j&-oy3PaiuU
z3ENtLhDwpWerW!wd-irQo<|{LTgDi1OOgdHTd$jw1TZUXv;@e-k6qfFg+O=lj!?p3
z5#I;P?(d`b>65C-L6FHDz&7pLkTctvISqI~xIs8)SF)8mMEEtD4O0x7QEqc+-wil7
z=C1hu{aFQu9wng%+ZyH;*JEm9{=QRpt(AM~5}rf8wB#2V8qi}9^8C8|#<KoQ_F@~L
zOp|i2?4Uva2YTXqG$Uy6xTsD*ODqunp@sXjtkkyQ!>Z_aG2F}YBhtCia^**(>NLGX
zkqT{S>gdZAzaCmKc<VoX3qw;~TCH{5DseM<>6E0pOVB~HQ+~0z_cwZ0X&8pny4cbF
z8T+)+^Z|oUF5GT%tfheU^zuTi<NF(d)4HXE@afTNiM7m6{qB!lUQr}7SqFIv`-<H^
zYEd8O++q@|z|w$h$+m-ttXb@@i{c(i)@WzI+&Xe(O*uJu-&-rBgx;xRUOvXhqBVuq
zj7#|{%;}TiLg0Qw8So2EHQ^FZ7D5pW8iuWDvOjq&oafVj@4W}CTkm%{NZ!1-eMao%
z+yliXU!~qnnhl*90i@>x2yk47MWQ8;M$OHH-ssi+q)^+$@Z`<T6O!;0Sgjw~Ftsf}
zNekiFN`9uh+VhVerrfO$2faQYsVxDs8Z{9q^X&Co-WWMqM)+AKwJj%i>lbkUs@^8Y
zd4Dqz9?&F0P-;Hnm+rFflfvoMe(%ROJx5u43G|@=n$@Y&@_xwA=giRpY0Jjbd3Fg<
zB9=ObW|8B?-<diQS^`P9>M|?&VSJR5!+|XU?S7c_qTDg|2O@4p35Z^GpA=ucOj;@7
z&au-xQ<F_TJ;=OCHnC?W<6UPsqdw5_O)cc9iEFQeRM|>S+Y{^HFs-`Af8QpaKZSa!
zg#IJQgLX#0s)~I1_B4tGcz@x}{6Nw_?3v~<d6i{`mMWJ_p(nZk!if_)e_r|BwlJ{-
z(N2_a4BjVuWTIjf30-Fi*#bCGfFvQtrm8sfQmcY4$~Hv(3xJa~odan_XoLk_AWu|y
z)aB(%1nr!XK8x1WbIByF2T$PZ>fSMLZ(Ob#4RO^XwAd!V$I)qgk9#;0a)xBDSiaBa
zJewa=afoti1$kN1cth?)(m`khVsUbXLN7;xF5M5~-aw<7j1kSX7(CNLqGp#ev<d=J
z(}v<1&W@z2$=G0v12LMOP<k&Ap+P<j<ldxxyOaMRGbjk$5G_ZanUZQ(U+@scu{T^k
zZ1?ObS5q!M6^*kj!=ID?F_p1+CHfI@pP5h0T?s4M8-ogTNfOluvJjZ8#t<1Vagrpe
z(aX$%k$UeYYmgAu6w+J_MpAyKJN{%mhjy5Ym{IrJ=+<`^q2!9Lg9Qc{U*ueybpU`4
zaH-=v8f}7V3`;(sHbQ|rdfD7%Fj}%6Lp=mC49(@dGB(%ks`NHnnu!2>T!WbP)Ymj<
zC{uDDtT9OZ%)LMPOE0kNsfbT2t7kveMMhG^WRb$Rg2wuWOl9u+d2{6<7zeRn<2j+i
z3;XKx$HzkcFww0oCHi-|=*vtumcAh$mee80T1={I5?PEJ9fU7YhVfWkUU;fj+-amM
zZ80PKmeMhyE??z0<3k@N=I2p!DDiDQG58=z^+tPHE&QgAi#vn5_1Ur1)RO6gedc8!
z<v#ku)?p<`jk*`>20ZGHMy{t5UcVU|ROfwP<>iAvJ>filf9sp#YLtmzFM|vyIsH+f
zj>ZU0FrP!gL0<g0L~62!*t2?v@XS=pXz~&brS)fg-C@mGIIclz#-Orf_G|A+owzg4
z6zLy1KU+ubyeXxx_Ko^OATTS?!`2vRzLfgum?*KUq31In31%%}xnlsyyt0<8dFNlN
zu)a6e!jeYmS=;%{DngZ2sp-ZD*;o!BMIbW5EuC!HeduF58Lj94*gMvY*`2k&9P*JE
z04YSqq!7(S|86aseM{+x#)>`hz_>u<@Voa~{;n%Ymuo9b+|m5&Lxaa03|oM@VjTDm
z()*eo^Yhmk>6+GNC2<WdR`DnI%7Z{AO{lrr{xnmttRWvS=yflI^YUKkNV%=DXYsa%
z&ekjqvA`~2DBN96A&s8?NqW+xGjXv2;LjI2SByVk8K}G)=X=}gNT>)-06CZRQrsB)
zrBM**|E73|JR<A^0gC+RK6~shF~fqWQUB7@3I#Y9>p4tn+!7l-lKno$nxY3}$wOqz
zMEa11f}RKy(^S{^QBcTi!XByReAn{HzUJ~{uB*L7j29;%@{09dU1dVtNV$q7nGd60
z-tve<-lQL5&K~ZVF^euQ@fwD4pZmgx7d1mf>clTUE9jV8ZHX}a9w+W9X1$0$%#x@7
z3bQuMMMROU2h8g8^QIU_1Z=kjKAZZ%0aBv|j~^`?P)XFhz5l_%85DuTmdreo^Fv4X
z%?&8=3p&8~uzr!l1dB2C*Pi`!Dmj}J^l9?DuoL)F;hf;CSMA-&!PdoJ1~h~mfjuR3
z?b|PM8BIMM<+yA7*Fi^Z+wM&}L3?Luf+k`#vz7@Ra-mXk?7d9BEB)oh(^QDHSrFvT
z_tKR5YSa2_l58^-4N!9Z)1w^vsK8p`wp)&nU|F7A1xzRlz#@{+=vG>e>+?e+Ms5r$
zoNsyON%xii08t1jj~teuyWG5P3V1PjH3+IxL&Cg2(Fpv`V%dM8;WcvRUT_T^lx;{R
z#Em*1wKAWX?z<Hg*%RGg#WY+*fz_W#uc#T7XgB@?LaRM%UFK<4EEO+hewwsuYykIb
z8wyFVe+rWRtKgF497u-W4|N`v3v$`eiw_*xPEq+<yx7b2%NlmL7JfAN)QLjvq0Bs7
ztYP}1D*kP@(PaF66<ujCROd-o!aySCfeL{>2&kHVwV@;*YhLiO+N*9qsm?c0(5T`Z
z+cYkzd+jIdv{Pa%Jtji`r0RU4GOx~jo*dF4a}+Yy=u*ChbB`|NH;mm_!4MhIzBFfu
zQv?2cQpq9?pMbFVJC5?RQ0xJqd`c*{w6t7ZeLBZMk1t;jpcO-6=f718Hov;hHrSd}
z@r=qB(8du})eF>Ch3e?n7sT2;p@%{fD1^E!MbO*IXyP0_?cb-K5q&;@87z3>TXpK=
zIdGAmA@z&dLxH1>grI+qN~%QYZZNYvoHdF?$%Ndeo$vO^Kc+S)=W(Wyi%_tR6u>)d
zC^dMRdj#eVL`D2icnxi!ION#cgu{0X^p8t=A!$D;h@8C~aL*)D{@Umc!K#)_MBGLT
zEftNxUMzI=^Nm38D{IgEswgEYNuWZERCta4bb6?#`o#01&audMVD^xZL)<T3-KXi9
zjr1V*2gH_STj%r>1BkzF_<kgL6*Oy<F=Gfw@y8xuGQS|@E3!s|eerjhK8)Yx{>kHW
zmvuAVPh%-y(!P*xEV=Cn*HWNW$B-=^C-|X|tEsurhk6ICe%NJ|dY@uOph9}pmb@nr
z<RIiqh*y*;Km;N~DWu(?;_4}}pIk)9HmV(pj-;4Xy}tc?A&2Or$XVX9+mFKmB)6jw
zk7sS~7J3>#X;$-?r8?sQhxJ5ti~KvEMYFz0=%|VhQ>zasaa`V4a!sv`(f#|H!pVoO
z0z`;MIUa3X-UZ*>z9ZR}kGT$J=YtY?@8aGtO@BrE*UucsO>rvMv`7Av0EF37MZ{XP
zx?~qur+FoRGGC%NNnmfG#!7kutDjzO`BLYrw>}0P>P-d);#Z{@|9%hFMpcfdo~iab
z$;mxJkK)g{2|cC32$>&CPY@UfzD14hFpEt-Ha0z%YU)wMO89l<<XL(wm7*4QTK5?;
z==iv^IzTP4_Ncd4z`Hw;SYUnnwaa1^Y#x&3e_z8a@nb{3lk$Hc4-^%I<J{QtV~B2y
zs@+NnT3ej#8Eer03W@Z2GfHI%g+FTsJKsu0Qhwn2aK+ug365{kv9Aj4a$<3|o%9{}
z5A>R2N%1q3SVUMGE4_6?%HL#?UdXlmt?|QF5!s~fpb6cs?c9L&yZkAipeTml{~&d|
zSB=$Da|+sp1sQKvRnrMde(?ozN6UNKK4`jyD$TpSlvym^o|t_frHw9fVY&+q+j~-R
ztKzLpwPv;I-~#fj+G(@M&Q0`ne;Re@Ve8uAYHq~P=)}pE7gS5EBe-y0>DgHM`Go_k
zR{K)>dRQjh`^EAs<h;C3-^5-C<ih*yZaw4QU^k{~x0#h^s+0O{L%9Qw3k4g{+)1-C
za_=L+&~3g8;z8-pE#=PD>G_d+iLy;^v+>-Gd$Y!7u^xOi@f=M9+vvqaNk<|~G#UGs
zFp&)Y@Ap+WMq9qedHM@zo{T#H2MAr4%$4>>CDh2y0F_n@j_wBF>fpG)FHvy%lVSC{
zI#*}@z7d~rfwjKP1RxO5Hqs1zBC=^DhY#5d$I2SnCTt0#eShlVo5KLI@4c8YEAa;)
z>%8!>_{f=w?E871e6Uvdtgi|&``I96<%^F3??GQ<%bl#i*p3AE>KVOpV|vLt0q8z*
z><nqlqi*~7VW0Fqj92MyyoNSK+<W_04AzyWtE=Y4j06~5ePb-a)8VMlQCXnPH_+-0
z4m|yRn6iq}et=9iUSHs-x68QEG^&bIMWb~NE4v?>eN~|(!8U-J39o(#N@&KOZF^`9
ze8{~Yhs!DszQ`P2;O;E(EZ($yXDfr~4m@5nxgB9l$rZ>s)7pzi0EOLlD-p|qjx68^
zoKUuYcYgG3wKEMqkeKX4-hvtxnJsk@4Z21>+Ka=bBomEylb|C0RsJ35-daL8N+bK#
z9Zx)uo(4}n-XY%%8_1vR=!k~l<e-Ob1cjEN+~;iTf)KxeSt@Fw8nfCIF`Z6KMXR+$
zkUvi~ZRZ_uwp1br&jvj>17J&1W~c|--~TS}4N)nUJ{2ip{xF8A^$9p4>=xW>6teTm
ziyPqLmTxYkdz&^!{@2(xm;sgjLs59}LU(|!_V!~c4$oJBRJ^RloxFHn3rnTSe)Q-Q
z%kq19eTCd<R6~hCZ2<#=1l1~EBo?_bsD=JsCE4v82}%K`M1_W8Nwtb6R2nABWU*}W
z!}`{4jF=BU{a@j)!yqI6IdqS&m;R<?;6RRr4^v@9u^?XG)M2{uWdi5rQ{gJLuiCGs
zTU`(v+rdYLPkZKwKlsBMwT^Iaf-=e2wjEu^RXEr{sa6L`8?CJJDP85Vv{0-DHyO@a
z*Zzr4LwC1Oi?6!Yc%7etL4rt~35bm!1t+!;mCP#OjnSkMB-edAO>olTHkGhPu(XOp
z8pn`yl_P?5Rc+a6p?|0}=EpV6EgKyCCottL_W3BsXScrh!<?M*cR34|m8oAoP@`-t
z2I<M#`mtI}c$hs<aGI`v&=HGmJ}VYiM$lDPz=UVx@=&39C;4oZBK9VUU(4HOC67+l
z=EK1sgFhzA$?8oAF-&c(nS6bt$L~l@MF;4@_rtWp?V@s-ESLwlE^R47&9{*oCZaAb
z{_%!MdA7;TC`H2{{~Vf6j|N)qsf$d#=z!alx`y?@R#m9^1^hq`V90bsv{Ldzms_68
z^oZ>L1y+r_CDUKfYJ%z_5PjtxC0^;PX+`Q+Ht{W0!_jY;<nC;52h%(_BssD)gll)z
zsPnIa3(736B;_cJ=1x6K>wiCblsfNWKFv8E!41gxT91~QHoEU$j9Y%Vg|f6|b6RWb
z0Z+8V=>vX=i)>Z9+Q+36J0e?|@`^U~$;MR@TT}B$?<D2n-CDK#L%6YN*Trs}8~;|q
z-<LSihiTsXaa}3k<7u)@eII#`qmFi&+-e%`+ELa}W2kp8uQ(B!c@?DSlE75W{><w3
z*XxUZ$tU$&X9q_-DHl<@RhCy{W49XBO--K8&Y~FWT3B`u8q1%hzMsyd-0HAwddoV4
z`aVm5E`v{B|H#zNpzeF?LnBZ`887Q2i=1y7?s!~xhi~YDh2E>R7dN@qR;E?aR8H4;
z;?n!>P+&4Bh#Qd__2CE}Hs18WS2`T(MLM^y{`w9!KHJL6AJ^hf3bHT$59Ho^pR$gk
zizL7_LvnX`a}Y7+ZP*m?K9=!Krjx*n=$A~oeF>5n?pfkk*&_#JAWD~E6aw9qT$k5x
zHZ1=%%O>*T!zL~+=fK3|TtZK;l}4DKqDWpmUNVMi&{t~p*{8Vn%gqC9#78%Wi`re`
z9l6`rCD%5L`BGnCl9RL3z&wBX$3`<)XT>xE4qlX(cKaPeL*?(1|LIp}zoVn2DV$%<
zez5M2w$6*InAV#u<Ln{iOSmyj-Eg;A?fFDca64QxaoFz<{7p3v=u9D#*$0ClGaU)0
zn^mzD{4WPD?>RK1+qAS3|1MJqkWG$_Vwja9Ii6vtJQKOHy$ecJ<s_u+91oP|`gQ~Z
z<=*7Re<JhsnEYjom748%D;o6-OT_pHbA58YTxl~@?;8cjIuu$F;IJ(dhZJJnj4;2j
zoeIW*TXM3Y*ngx-Pn`BGpQOY}J#=p-K1-K8sf=Qzi#F}rZQJa02l=Y(z7kDAQr!}a
zJf&4uP2W1>+(gH9@|G5c0c1^svjd3hB55aLF9gI;IkmkUv8>!Mez{eY^jv-%Xx_XX
zjr$twx05NgC-QyRmu8az)-B$)?q1WMzSWczG2p|XCPpK-Jo;5C>BB&5!^Ka4Ua4@%
z@**>!G>?gUVBj%G_EooDK(Tn&vZi2X&%lrdeISlI{IKAui`#07=T8Q;B_%%IGWVoh
z|3sKM>+?6c5i~f1uc$lMC6{QN8M~>rb2oMj)V&JKiqvQLtJt8gcrxU$idib<RxqbH
zlxSqP1dODsaG(2!PQEh&{Wuv*242HtTTn>9w#;DfO^j@EiI>-taghf$Jr5t{9NeKO
z7vST)w}B&%egJ~Kr`A~c%*WU<nj72837{-4Y7d5W4#8yvrG7^D&bzh3@x>CT?PE?U
zf{!R~zb&0Vpc7h*DLO9XSE<d(d%N<16Mmj_x@UB+E~{nK2Jz48{1ssV5UY9F|H_(p
z&U=T9b0<9csE8uAGFd=%1;pG@Cf@?oqep4HO?}#b9YnD!xiv;|56Ew1I;cjZGDyfk
z{f=6Xzv7Kuu1S7t&8w3oQ%uM?|5H=@PLPhq`*XaHbbNu7rH;|b7iA=g&tGV=U{Sv@
zb;&&DCyY}1$0%9PM$*{P(Kj*|FQ{;ry_yiTcZAUhdv^ZkFS+0kOUkLEZt+Bb9E&tp
zv*nZar*CzkNo_k4(co1+{o^Cbapsmm{bDBa#+gAnn`mADS*oM4Kg`72lDpzx7;U_E
z^im2B)Bz|OOU7z$J!?|AcOtd<)@K$=#OCfojei!2ZrN)-uov)AGU`>-Qlc7l5^np%
zw!FoU`D0cl^sH`&MKJ(F1+JA@`WigZz*!gbw6z<;7ouwuqp_ugJ{PYq0}+Jk*7RCm
z#H;ONHI-GmY6-NGlV6CeCT>5ZD>JAdgHg+uG=Nx=wnS>pXUNm;6|xPjTF;O%Eg5dE
zX(w1!?JMabM}PFvC}ALm3#`KVEm=_{ye=VagwZ<UN0YURtWxP}!kHV2J#(nm36<Wj
znKGnD(<?7S$oHxml!1WCIfbE7ylHg=74nP-HD!T{jI(tj6mz(i5R^JETCD%+F<Up-
zG5j=W+#{^;hl3LOdcZ<^_&SXEh(4`E&T>1~emR1bfsPEPUwV_QfF<ph^=L6Z`^=f_
z96Y3SK3)pl&0a{~_fa`&lTRoZt@7g1neET;nguby1x^S6XQ+)PDX#%-bdywXs5ESq
z873xGN;IBzbmZr5o55m^ihZr=T1SSoNC34>6f2pq^6Xap2Kn_NMgc_-NM>JNJcjc}
zZfv_(o2`PTtRI0qTZ}DMOqJ^RZ>%E~KZ@}vFK$!t*0<QiW(tpe4D#%T@iwdDTdn=h
z7{v%B@*ogIeqFjULZhuAU=FnC;G3b4UkPem{dh)JCBn|dY@*R4U<aXaiU0G0lm3?_
zE|%WKJG1~`V-{V#j^tlk6T9hIxzkFSpOXJ9)-iVP{J`=zS2-j@qTIILR&pl$pbLgN
zjQRZs%iN*Zh1tUbyBlPNl>ievSW(*S3ToUi-^OXJIs4Pj;Gs2gB$Q=Wl!CLtnQvup
z@}TQ+ElTBgxviJEF^Y3rB4F^wizYtmK<~Ho2T3z)dYUF=wUh9fDM#B^1gS)eS?kcl
z$LV-{Aq6<QpQUz+`srM|W%@Qtw`n58W-_xjaxl((JkfWSfu_}J+*f5um21)e%}O-X
zrF<B0R!AJY_pINuyS<44QXn7Vo^p=r87T8{Fi_SZYyB7Ew(qr)s|?MeD__gjcaMQ%
zSq{WHxXG?=hkpAS++V|$giH+Jr=>X_)-oM45O{b0-|_<U%&#B_6gi{}r4Jgb5gH%R
ze95Artk`<GwiUTHniF$ZK>x7(IpNB@0=&<2*otVtCksok`&&H(!%y;lg7TfsCbXky
zB2mcRM^Zz5`8Rd@>sDc{R9`;f`2x+h*NeveIEN%N-P=duXi%3rOjzdpVsyh+YRSx+
z@8g5nvN`=9@S{OfjhQXMQo*x;-b8=mmvh<@q(Ioi?V%MRN@Y-@{QH*{sdG+AK9v<P
zzWekK<s81bCvQ?lFEyk+rvLqmio67h01n8%cbhx$X>-uZEbkpIVFjD&!tPuv`&Sa{
zB2=m)SZ^YVj92O_(_zr}d{xxAPO0&O2QIDSS7=lRDHqB);l96jaYgrdk6UUu%9`r*
zp5u0%g2<j+W6CVwfoSSS4zE0VDA(r?j3n|FN4p644~mutKxN6=*3~1@=6|3z&DTE_
zKl}&UH5lY=ow#xNMeg2W>4WxHBD7s0g>sW)!m&O&j4$iYQL?5A_of*KaMv%#wiN$z
zwN{+kv^F|5Mb}JBKTZY;%K82D1x)`vNRSA>c}bEcFWd<qlC*hD5**<lJEX3NV0-k`
z8rjNSVWYpc=0-1`$}58bR>&hDaL6on?<q!9O55MRFK*Pw+l1`*C(*Q)+}XctUI&gh
z4Ufkz6_*Z(6;kr{y9^z1whmj%3y<HX$!~8E44@mq6SM8k|ICim4pk~wP<8WjY~T(`
zDG<vv${oMtI{7gnvd%@Y%-dEE2yHu&G4W%)ns?Bvw#Xi1&Q=cYrv^9gC|y}SL#vdF
zz-ILg^ca!hgIXIt&O-J0DkuT=PnMCW_4^}o^+rQ<kB!~Vr8_2VY02;+#tYA^U=@FL
zIK55r8z-3GFOeb|R|t_yge#W5uuS_T<(gAL&zb;obPziDz7l6|e4uF*@mRduM+V!B
zG_c}8Yy5$332ehQ))vC`j!nR-j85cW6gks9Yt6Q!jSYj@7hM7pQd(e^#fl!tMwc4a
z{rUin5=T}+IQA{D1$ip4`gDPxIG}@$<S#2aJO=7k)28S=_-}vI=;156C@ABG<8+J#
zGwj~OtQ$lEWfOElB#r;{tDVpXs7?DYXmY;;YM-blwx#)lVtq=(v1cULS%^isU5!~%
zed-LZA7`_oAFRR7W25HH&JUA^6@EXU?`9)Q;6lm2FVhn~NiXt~<VdWbZvrG#@-4kz
z`1pba41XuJBldx6bc+b1n{T02mlGXcJ3U8hlZUKd#3i+_KJ>)`p2|e-5Z}N;0n1lm
zRVa>>c@4;dP<+7o7@FK!`goh|+DtlV_K-xWEG1q<2NwyVln1Rt&ZIO(`e^EA&31j1
z_`n;$e*TXMe{;;t$>%q{es3ZpkXzYn8npWlhbpDb5vjdo$|uA6p3iR#-!*KDu(d6-
zI%mWk6q*hM*bEFEL#uWr<Mrf=1fxfwPAS>00<ZZe*EHz33NraL{?)gG$Ux_|uTP5i
zxKd*qv0>rwZ)w1|eT4fo?9<yzDm1`CX!X#yS2g+RoqTP~aRr4qj(_@|t8Y=og#xux
zear9qTcC~%^*fuCDzS-_&{ZYm0&URiqr*HSfqfYTpEH<hczhG){Ppb|v>E5$_I)wm
z29OsAt|*Tp?QTpv=d@Tp9f-^xw_S{qjV11$<VAPJBo<eYvE7;J);bb`I+Pm4^EW@(
z?q0$zbGPzzaO>J+rIPKhSj7q#a&R?*AOxkGOfNz*rHpO;9rq=~nl<Gi2jACzaF1)g
zj0f`BN6TXbr+6trrC4$<Z%uy1c{#troA_d{=VzS1bmuNFHP`emLB^>^S<W*v{mWk6
z`mkX|Bcs}0u)wI-%g^CMEQpzgN7jMf1iR}@u^_#$6kfLju*S-Q&@G3dg-;IQv9I$e
z@O*V<1f`0d`RBfa*u3*Z8JCz6;okdHphK?bu`d6DkBZFXVoGi|1&2S2fDyh0GwVv@
zFH@FcOpT|Siv2*ZdfS91V?dsS3wd5QV`tm^uqGOoi*MRJk@U<|OE?U2a!jiGNkiO&
z$HcI?Yu)1O!j=JSi+O18>uM^51_&B{e3(PKX^p4;=1hSh{82jocW>KohO3Br1|3~}
z)Vi&)9ki62WDO?v_<r{pZ0&UUdeHj_>Tz78Q~J|=zgQo9lmk(BeweA``xnaF$P(4l
z3O*mNz4=Dw`R!?TXCSfLGxHhw28TJvLhNug*I&Gl5c&OMeBPLaEDg}K)NjkX!weq%
zHeWz+&Nj4)=mRdJ&Hu<YEeFj6Ivy_YCAUGz_0;wAtzK5>E6{-X9O+%?rb31C?X5Vi
zPYS#7aVZ4QL1cpW{bvsQj?8KjGtw9rG9<2SQYZ!#qrOj2z5cg`K6n9xeH)&f?Ve+7
zf4MB1O;L5ukbd=Avbz*k<D0`H9gDrF3=uyn{H7lLrbKB7bSoo%Nyb+aMMLCv1*L_h
zj_UXZ!W@2bZZql}0Rk8ok&%|<gV=rCsgh!RkkJp;lVTOF;0Np&R7k+F6j~%z`R`Pk
zqQdWZKVq2xL5j?ASWcp>H>*$6b=Y%X--_{NQ0A19-NE%;8bc$908!w=g|m1>CP!1j
zYv?U1??&>}g`t2pg9Ak37pu}HV<-e*ZQU1f$`tS6mu=%u(DK0&ckc30$tBXX;t7fg
zTHiu_zs$ZjQIsZ(Be3%gIAF*xEd__WN2r0kW?^`qymObm4JEF}rq48QQ>=d^Y5D5w
z5TX7XTgJJ8Pqc4K`{LZuEJPTm5cj*#6mP*m{2Yn{1IKaj6wH5ZtP2<Yb6X%O^;1O9
z@}l~PkNyNoc&4X)Rmyobmxzck;%=_m%AAfdyd~ZlE&+Zhmpp8T)7Kh|cXS=>@uXi2
z_hvc5O`aLyTO_2J^!sR0)KK0Dl;Q(L_e;Sm&d>=3j?)qk@a5;uW6^>+EiU)VA2>R+
zp2i#(IpmG$Kg9^Sl8fs@3^&D$tFUITdw04*eSp>1>DSFSCVRu1;$;E3iwp&U-%it7
zPkaI@yI1>HGD=G|E$ct+``9I6;#VLRSI<IeLTAHvP4t;Jt9Sjovaf%6N*z8rVQ_>0
zDo9CRp=Hs^7$J<A_CUtuzt-~uiY-+7@6*_$WH`BU)?vr2rEHlv#@DwtQj~}H&rSEJ
z7OLw=?1EnW+ApJn21bZG$_}<%*GM`G&cg)FmlyhBZ7&_i1|Un;<&mrO7JY4bipOJ{
zT|W_nj}l@oM9O|V7`Vb;^}Rz1P-~O5*#-<396fR>)rv~B!Z3)*9E=^6E&kNMEd39J
zuaj~7-4lAp-IPpB>xH?Q#C3QFZ<S*_ax!z<0pLj{1Kr>y<;pzw#wdS29i_B?8m6D}
zVaONPM~hqFJa=IA5KAzt5OEBayfD*-J1g&VMC%SV5mz?=)?X>bb^03u1CmkJ-}P-_
zyo)xSAqyl{*(*AK%D#c=<IJ_5=_}|Mxp*5iLEy&Oq#&@_qPzvPx%gs%^VVKar$ERm
z^()awhL3vN37gAN$3j9e`r_|3DlUEHZzwiIW8J=XCIM~$JZFILu*`rZ;E%oGh4PTP
zd>~=r5lN!=;!Rkax6_zYgg%cInF!V;Gt&f%zGamdT{}f-v<W|ARneb0xS|Udo4!)0
zk8^n5p`5$st_(h{a7$HaMvkT($A+bR-1u0f_|wC~qk|TcGJH$9ccWWRa>pQ{rt3b9
zxe^$TGa3wI@KfA<{vYU6wCug7NiRwF+uYma)rOzD+gRu1xCO}%p9r-eo6($cMSK~s
zle3`7nVl|pzhu_`;NKg#GqrvFtZxAVwCu=)9iMQbsC77BmQ~zX4MW66u~cujLf;JT
zU&Dc%zwn*ev8kdJ_KZ-9jLJ40JSjkD0b?{`)UAB@IL<+%Spw2o_lvv2`J=zOQV~br
ze;{gG^+Gw~yC&dAMZi<^m@w<zE1^<<_#cQ*{viOl#*6wq_W|K_VzRe1y!zS*cErm!
z!#jE&h~@91&7Y7pED=-knxu7YSP}$%yB%u@+C`!jWv*^ihn?OpAhG>?TCu;fN0k-S
zWg|I%8rqh>Oel<g&ibz&ifk(s1R5O=YjY6EiI|wbP<=?(vp<_fJJl<_392N|SHVT1
zV)8KCccRieg2hApxU-KA6o1kPRHyoM&n7mP>&ah|ooqb&2)`3n{kRX2V#-aWzG2fQ
zVzX-=b}CBlo)GvSh(`V+`I*?m_lFDjl=@P@y>kiHNbJ#<C7=w+pTuTrh^9y|9XT8$
ze}}MJ+z?;I&bws@c>ntRRC}Ok$C>xVdzb&+tc<1h&$r@nNkta}tt;8s=8D52ukR$x
zz?h=E4-B?RC27-24s@M!3%>f{{d;?k^nWi(7w5$84qx0}*e~(|KIYvuAC%fo?o4HN
z^trQpg;hf)C(MF}!z>i5i;lx42W+ep{=cO|UTHlrE2uc>a99X@_`TQLx#6X#cI6#k
z<Dk7O?u}EmT^xy>{fc%t$Mx53o;xk&<7G9X;-XU8xw+=bY#GSo!f(MjNv(4GBYBC%
zvR*vS+gfC17V0GS>?_*;KrZRu{xnIxF~EFmxi&57cqr8We0cxcfpDmU*_0n}6<4P>
zA4O^Pp^FeL0*Bo&o|MnWu0kT_kNN3^w}i^%gAdE_#fqn}8&|Y@1vWh=?A9!e2MX)@
zi=TCia8GEek9RUxYIsi{5J_ypi!s_uFK&<d@Qa<k)HjOnbY|n3lQlRHe%UhnuuQc|
zaYSS->4)?^+Cr5=yl-Id#+6cW%iq)?qe0sj3|#2v7^e7NH6*^jK(B^|;fpM6I_{Bf
zCZ2|FSk))?3VqzEUdcRW;X-gXSEf|yILKl-X?oYX<&+iijSIV`OF{`(%s(MXNzZJq
zm@cKH0{FJAlvvO(I7P5?!q&|f>2hymB`+DD+;D(9Lj3zcAXHcyD`k_RNVkdv&KDIp
zZ0$iJNtK;GOe3*Q>SRLdCl2Y#ZvDxRCwBNz=#fDjK0SfKaDC75ShqL8=^un5tnJ0i
zhfXc;O@NoV5^cz(&tO5F%cZp__xnC#GF5KWJd5v~1T;xb!8~hKH+{Vrg~UoIWNTH4
z=G6&Ht9{m-IVc3jckJ%i5GxA8+FE&cO$&`}u9&YeAchAYzZc=CP-yu{akw^GZTBB2
z@_h@w^jLFQw>ZGsMCi8Wn@7%rD4A=;Al|4)>4rB3ZvD;vCn}nh;F)~a6byc;7c^m&
zX|+G#lro9&`uIzdq(0LemhD^xT=(^`Hme%T*EI<iyO-Z4XRRkYQnf5cm~M-;;_S>*
z!*+e%lURqQ5f6{AqQvo^(mE`HskjjdccCGST4h_bDp$V?fTnD{9=J?@R)hZsdKKOc
zBeEo!&#P%<-Bi+m(;Ayj(H|U@9sEtcV));L-I%Lk+9^ZMCOCO@uT+s%mXgO5JT}pg
zrG3S~41E1dPdb6~uSJB?ZAQkmlH|$LoR>O5hUb?L{sT?U^G-_vX5dd#`)EGOy>r|j
zLERRuPwr+f$Bkr0n_Py4T>I5C5~b&Bp75qN1ioQI{P+^ML3-c@J@HB2axe1qMiVIx
zPW^Qsq+hL>fr!79Nx}oXy9izqYb~9A)oeh5YCUDus@17)+h@=rq#w+yd}dHFzF@Pl
zLz&(I4A;+F(XS<P>d=~s#N0wBL&=fr>Z4_XrCVJYpI2=q>#5F+pbldKlV_8_VHSig
ztj+w#!>Cznk>B_>p`OT&Aa`|~fjU}$!^op$*Jp>s8f>Fq^*H*F%c+&js|jB4P~R^)
z-tE#a+vjSeU^VQkZu9r!i#+rlLn<b9s~h9V!&-xAp+NeH(*EqvuCq#DEGAT~WoSbm
z7!6Tj`0p04i>C`d9u}4R3TAhlzd}2VA>QZfx&c?h0=z(`UOHblx-z+2k*MSVq#n7#
zsm%jc!bbL+%&->)W9KCG%P)+Qm)Aw@o6^&b^K3BAh9IvTmx75L57^C3HFh!@!DYdW
z1l8Edv(2zh_3T{}jaBu8&R^WILR{<}L7|Lzd!ZxNpoJ?2UEm>>sth<y%H5M?iW>`X
z?n%@fQlf?&eyjNOzn+Ao8!3*c1+#f1w;<+2jSVH#L$f3^Z%*7LxQgC#vw3e%wu7bN
zAWUWgTEYv(Q#jofZK>;>1CsJ$@Vig8Qu8+}`mW8y&s7w1t_=m8to~TH+4c1&v8r5X
zMC#Q2A@SPpX$%XlWWU>-2u!KiZ?NsH@j=u)$L#AWma3iuh)v4>wg2$q`U|JZ5w=8j
zCdNj|G0ZWk7*Rltze}4!AzZ{sSm5>`9pXs;%ji%VxXA(QwWgeu-dr9dgPH9`_S{kN
zL0DTCus%OO<LAF(*1wj3dECF)PrnS5NSFkj<R2B%I7<y5-XrJwT<+}Wyi%_BnAgT`
z0<F!@^3HXt662IzP~O|h!MW5joTd&uJs{S`7qC4>^cHzob75I1G+BbK#j06h7N_nY
zu=O}7!b0_m0oXM}V8Ytf8s{#Fk=|Y=#;-<yNO4@N{JK}6aa)OcUDbOy$b*&X`|JPB
zFwfAvlGjLYDt;UjE99vH&W)Z{_LZ=<`ikNDhs5*{@queL#DgWEcTKNok;Ut3Cmkoh
zfDDW<`=*8e`>o{!7^osRSt<|Xva|Hvbz#@{KM;v!L$^sgPLJ3o^VXxk3$b|0zt9F2
zrQ@e}k-HgY7H#t){PJSfE!B^}_OFm*w~`_6WFvd1YW4TD8R@Ggh#9m9xWbkl?EeDp
zH?aj@n5MJO?b7ak(-6<gXbuQKs3jO!LPHzA&Rj77T@vwSdP~T3H#U!+QL@9tY}jV;
z*|5}~*Yy(*Am_B|E`nKUiL`2!3S1a(VTqvQlcL;sS(M#-X4`DB!geUsM{{kyWw=fc
zXbK&M|0eyo(#B>kfQKYezwg~7@6B)60ZI@}`ej`&nqV~sEX*qpPldUE74YOVmPP8g
zDiZ!Q!Ch}5u0{+1O5DQp%VNe-m4(T(?0@$uZdfkb!|;V?0R#*gRu&mEh)Z?6ks7E^
zLFxd3!@D(yfr$=CYbfGZ7*B<Ha%HX5O9B+;>X<)5-iu0q1r#2t?^=1Yo1GO&(D%UD
zdUEik@r6sf_6ig@GN=?j#m)C6&s4Dduf-?-fs{-9#`CBvq#|Dqb>gZ)fQK8W)M;s^
zX4Z=6ou1tRF$S6~Y~Tj)o+xC5;g^R`g`wYd8gY?B8ncldskYD%Q0X0@2hzjv1q-&8
ztj)Vm!kU>irL1{Saxsc4pUJ!Y_J&w^gIKi>@7ddjg_iJ&^mHaF;JG!2K&{6|1y)@M
zsB-cfSAz=JStSk}K5~$Gb*;1oPuw}Z+bR6<PTX#z!%YJ6A9E}k?ohkw8&ZG#L)8Lk
zFb(K(i^0D?1Dj}Qspg>9PlFzcGM4+>hvA?6f#(E#*bI9^n<lBd(q2sa;HJ7jIqzjq
z1Jra>rz~K~tgU;5!AFDegDSKj{tt=zA29TGNGv7VNpqiD*;UkCZWB6w@0#sJpo`j%
zDK3%bjl(2pKG2b{KSoUMJoMGQvV&#sy~2IWFw9-`0KNpakvs^US9zT>d<gou<#od|
zkd6H{mx0r4c=AsHTOaW=qm*0Du7m?x(7<ww09rCUq5siU2puqI@&I$DL8|Va2bN8_
z+fb3wJiHZmqI~I*3v7`iKLIan{^KC8=BS$Ch^?D~cCY=taynfaox5+UCC!<-{^K|1
z$-%n8XL5oAW*jc&<FZ_CPxdDKkZaYW2LF0$?E0mlAr5>$<&w~dF2TaUa!0+e{|%h~
z{dc?~zTh#tJ>kNmy{9moS$uKhj`7TbNPZ;}jWqoKsn^J4TCs-2i(63KjW=Jx<w9L}
zb&OW`863lM?B+*gyxs{qWc@u$KbR%3>g!awzWDJ&;EYw(0W1<i73ApL6275-3fI4)
zHKLGImzt-{nk`Ea`NjKDOqlq89G!PK+wb>>LlCQ|RVr3RZMAC0=&);3d#|=uXzdZy
zs0KleDxtM^ZK{eIiBYj?(-5S#+WYg%_xHE!B3Hcg<UHrR&V7rpX|wn)4v~ga5|oG^
z`R-ql`^Fkg2L&<9llu2=zf14IHRB}L874ABLyr1GjUsv8n5cHF-;vUCX+c1O&w-@d
z+R6+dtC3dg28ph$Tg3Hq<sG2Hg?qsU@gY@he{iP2cSHTjy&_5XhS7)aSDe`DvjR)D
zw!ab#3?NVL-l-zuQQmUJLL%^D_l-TshJuagINqrlJDQIJ{rhsGwkeK2opSC>Gb6h7
z9NKtT#g4&<&`{%NC2U1;a~s4f!ot5yn(v5Q##UanEn>M)i*x!9a6@NIJWjG~79b~b
zcGL||pK3&NlCnPM@f)`NSdUI4q1j2S1YLnY5+5ST<`<Axdt_Q8t+qGd=AZ80cKGsZ
zJUWs7g_kSOxHeY;g)5zy)|6B>0jl47bC0eze{Vl<r~Z*e6iTnfosvGp8bzxMKqJ-d
zyS_wr5325)gvBamMGv}vPysjffSuF3_fSo@h!1QQ@ozmuxgj@IXt>)C#-8^CggS%$
zzPl?23M315BG0F$RDVR3E_Kt-d+&P9W(OnqM6W_9<N=B0(47H#nZe-{cw&%}X|&`t
zAbtABtw>T`;`2(}H1F1>Nxxr+>nHO<U-1PvBUX=q)gJ%*86>h>Z_V{jS&)z!mC)TY
zziDt3;#k>v>is!QUVv(cOx(pEY^Dq3hjJsNW}E^9j^s5fX#bW*2u^Y~X(Mr4(1LOZ
zC>)b^#%x6X@2nKk#h!fhR;IT8))Mb9hgKLkZ$K^F?a8{KlOev<8QQ*Cw>MSj%u>9a
zxHuano5zyXLCK2L4_5CSsQwU1${Z8>rdO@JNu33xRN3QdCH%WE@>w6O`Vp+8Igmjs
zy-lH-7fB`+*^SQMH~vUX_24_hJjmcoqiR3olGYho-udq~QKH;0eUnrkBn5%w3#;Cm
zeM^>m)Qw$vCUceeZ96i&`6TNO$q#MivV$^xO%N)QfsWisMvf|^gh@*1uc5bCz6n<E
zq!t&kbwejje8mMsvl~5QPyqi@JsWOR)JVln7Ri(W?cOq$y8;vY8sw6xEF2d5NFYbz
zS->zWu+FQ!Z7*6{6O(zB^56IkT<jrv+`VA{rMh8<f&A{vG1RUmW0@h_0rjpjS4r;J
zi&0zh`H$R)Rm4B+d7o9{6U)1cItcntrQRR8I?ijAS9OQuSku#1cj;iM6Z@6CoU8Yr
z(^Bp#h0tY?At2^$dLM>Fq^`G5ceeCV#!IHzZ1NC7F3HBU%H%B>8w+!}d%<Q3T?jf*
zTNl<_p*T$o#OF;3TC<B(oz5xcM*tb?eDdD)hu}*he<oCq-6yLv1T1&<{!`=C8{*n1
zS$HhVlKUS(JTJI3hI~uLtF<DHjkw2h{ZvJv0GTf(VPs9Udv<#By6aT;gBtT|9%t}H
z>S^7DA#`9RiS^NKH6Vv<%y_Q1xQPUAU!skj=k<m0lT$YFE)oCCTe$)3oE4<g`gekD
zSXTp82%OStLw+JXhZLL&0=c0%hQE9R<-I?eb)(DhM-_gHWIbh<9omHa68e{UTnF3n
znnsNQo{<-SNe?~QJiV!Vx#+oOpu_=5!>d4Vmch?h+l6I+)7j+%Gn-8Bwd7!B*q)(H
zLh-Zsmld^(BOq@5BN7n<_N-xK{OYPds&k|yxHk+V#pcebeUk^>VigmYccJ5cNhd*s
zeS6*=*ELY|=gSn%#eumW?;xC_LXr?2tL@E=FN=KXm(b9Vl@C3!QWCy=e?ytJjFlJ*
zK6?t{h#;kHa`PvNV(I#1@p*4?JE{|Zawzx~&J)G77IfVMM?+4CAyAdI)NY5jvI@dK
z&?>);-JjbC?+|#iK*aPdBNYQp9Iz7_bP6%NKNP*Od+;mcW?Od@b$+r^!QTrT(WOO3
zcuPhr(J~4p#snV>u{y^cbraaj$31q6Dc`jj0762pBNYMS%57ihsR8N(N9;F^>+Nmk
zW+XOWIfl64bTb>qqR8QS>WW(1BKL!p%oUb*&FI1C_G}@}i^$_L_Lo9G(CpS}Dz1aI
zkdO%AsF6q9#@q^I>AHL5Pgh8U8ARIpncxDD(YN9`-`e(5vsdqDTxdxip&{uAV$?Uj
z3Bc4N@nKj_$mojmI-a{)o4IOSW4xcbOkp8N;o^9pvVK9?;n#g;MiS~!x(?}_WGbRO
zJx#(_YE42a7;Rrn+E(Mu(8eGP*IWc54N62Pa8H%t^{j>}ov9mrp1P5qQ#X&!6D|CF
zeL<0HmZNC$?@vpR0E5L%Ej&_?bjdkKY_mkh)3;E7W)wItU)qn6E9z!>OnRr3eIq$s
znE6Mt)(K*pla3PjM`gXCwkY;vSk{d8f@RxC@W$DJ2T;3+^?-_2$B*(n7=u@8NY1yq
zBHkCH2g8_E<jy!tugpgsUEBA6?QWH*0Y6#8`2^rWk3e?$Nf86*hr@3hyEC5CEu@qI
zqRyv3hS~13WcB`uSL}>#^4sw#w|wS3mi{$t)66=m75Pf>>-zh5c@~FH3(v4;4_4m2
zKIb!#{HQA;{e);oEV_W%xBO`+eZMj(6Xdz9O-GtV8}U~;26Y9?eU7W*;%GaI{0B1K
z_x|D%hu8bfU)TG#(n-LT`vKeFN~dY0`vc}*C8CCEM0ZUPJ@PRLd?`P_IM^asW*aN}
zwz}<7b6KgZ$fW7hZ>vYrGq4@Ip5k&}(%t}E7y%>@W&iL@<ax3d-z)g16CqFE(i#5?
z>eEHW8`79HL9Kq0zx0viwdS9oY*77QV)rwq<!HdKe(MJl)lMHxdX4fW0Z@6eDLuDY
zj4Qi5w_LSnHtQm7TE=Qpk+0_2^{dAwkNQct!bSnx1_D<XW~UZUyks2x{4<d|BSE-`
zrkuVa-h1a?)rV5y;gZJ8t=d3lZ~5>-g&nvc4WfZm$~?T6RRDtDCx*)DGTdgL_`?}g
zP5_xWTJRB$XsA+o)hZ_{7)!)8M3Sp-9akD!Sr6P!1NR0He2hVM3x{W;WaAHq1<UG%
z6qfZPi)C!k%If!@_A9)$apul5;`T;lWe2x<;{L_Vt7Mm=-@w)z?TqsV)p<gk;Rbj$
zmS?%QBxIL-l*<)HmcECFOeNLZ&i%BMPWe`~a1hkBm3&JpN$l$j@eiakM#Q3x@~?EC
zyRD4h+c*U^jyO=Wp9U3CQL36i`_0QW<#c)S=UZ~1yuvX^HCEJj7$dH{0pKaKUnVZn
z`DTfJzN<CGAYtg|r+RU0xBHwz>bWr0VoNS?<G2q<x$Vh+OUd<}009i9>lsh*vXebD
z_xKH%W7L;NtD{X!&@aSR5|%%FDI0(YvTem|YHgYJH7aZ#AbpFI<(MXbDd;V=>X~L_
z)_cZt*B|={et>>8sN(Oyy2<yIKi^(u&*_suiRP1<D*eP7<W=ugR0wKT`S+(FMA;^;
z5(OYjqxVPqPgDbWtli_D=4|oo2lKISgC=q^eoUq+7i%j4Ks?}(fUb(Hv|uF%$#!tq
zu=R8ce#g*;YDs=I(U@{DH6}fs81xb=X=!UYyq_}Uj7aI3Dozv$zs$}3mjatAL-QZ!
z@YUa{&af#zuS2V*giO4!a+zK02ZNoHiI^@AGDve*-6vm1HhDC+#Kv)jWRLG5yKH@>
zY#>7rSIksN&N6;k=c<RS(!m8K*#$Z*pHf;SeImRX)jdG?eARA9CU+~Gd$*d$Qr#%)
z100QlO=WU;b;+cDkxCB60<VrM)7Wv(N^=9zN-2(;6vB+{lbH8uL+R+HJuD|VK$~;$
z{)X5n@{YG!7m=qJ`#f{^+2-HxUj55kf1xklgX_xO*VO(rQBs#S8>~E&{j)ua_?(wb
z3y_|?RvaZQ9!^!0Rp$|v(B;lP0ky1|Z!aC^-WfQeM?+Ofh+&a0E0z$1Xr*w)J`Grs
ztLNgk1F%$hQ*tPLn`E9(pw^y96#>|_o)=rJKS__!byi^iOQFRXl2a@8JEM~2wHYK?
zLc`!Q-+sARwd>q8%t<{z)j+I~PX1~W)8^WiEaY^bFZZ+2^g_O#A%$hY0>m$0;VNny
zG&(h`XGGrPOI#JH3Fg$?>Z&mL58(Vc**(asf45%FBo{~5sYBf@zu;=j7Ry0zLpMoM
zPTuP|ysl5F3@`=$$=4|lB+vZJ(<|rMLsFFVRaH85t|X~Cl}uDkpZS5EgtV!ZHqM+u
zPmQSg9q12QDen-aD3T3m9*PFLcs~#!)hqxe3s=#w;M~%AM99f5oX>q<IHi)FXXy{m
zF3o30Ykoc|vUCi})B<p5@teq>?hSmw*-QRpy2H4f0QM4yCa&+la2xC2TaVNHdG6;9
z2dRa+cj7HKDrhoQ^t|5U2>YC&ZdD?yGI9L+5#|EEz*_dJ7d8~Vn^k=b?Z^BPJ5Tgl
zrX9q)y70j^&YUDi+#@A-?xf3N3fX85<tP<TDsOprTmRy+#*?RBro3b#?O_|09`wb9
z&2V-|y@LKRuz9A;`>%(Y-y&*0X4KS4^PTKarrk%M?A#0YABx9C5Bz;@Bm3?)h(90d
zhwVj8CvuRq$QcCt2~3=_;BQBh#{88|87Vqws{Qbbqn~5lT?50lsBl%mVG<a6_fxzF
z27sf})K}tas(SRK{cXLgX~|L{w4=O0;Ef5-+rn)_zhQN+*=to2GjTEIfs;^IS7WNV
zvt8I<so=f&gAx&&ur8v{yFb*px{(x;Q7Yxwf(lmNSG|~=S9_j%yXaD}LSjKz#+fAH
zSe`pY=A^~qhpSiXc>>lrlvwCaKPO9Tf6MWR1l|hZR*SqF^$8}Cv1E$-`nPS<|J)FH
z+uBAO@>4^Pg<Ht+@b=lo#r4a;AF+!lf-lYB7m^YA8>hnPAbdtMMv8(B1qbeRRnrUK
zaXpxlbM066M17A?_$=O~PTr#|B}L1+DnjcJnmVnjlc-eM0>DHD`Kg%m&?!#t!6dW$
zm>q=of1&8t=En;{f2o+w&4{&<#O_Takn$V9Zk<QDQIQP~LX6dUh-6>Riv6Z!?)(wo
zD#Z{&?fH&HiN{*{(6jk?N_Z4p@u*UancJQIduA8SSQaRyH;0KN4J(}XK2yyfK>$wT
zU^y@Q__2F(c%TBlbTwSir$M9L=wplnF0T?bi?z~i{FXM)uY+3)z`3)pXIw@(`gpNI
z3vcBjhz#PRl62a)veRVAMaNuS)SrE5x8I9RjjhG<Y8v>|T4k)~tUnFPyW_DO+^^)6
zFAKMl-CiAl@fb(AYJlMq<Qn3M*4a6R!^6)#UupnURtleH@?ZnT?rQ-E2=LKS`3^rU
zuLhDJ&fvnJ22u)qGjO#L^>S{P4T(tme$+3e#3ki{(pr)_^&D!wJlrP5m$H|L4IOYv
zF#FO;VvZg%eQSuD%Vt-I#HQ2;u9FVKtSPTrfA32slZauxH9-_#zJ($UGQmlOlp4%|
z1JKPnB>97p6=@>fThA1!kB!aC%LtmG>VhgFayay8?h)}K<1&}E3|m-mK!Evy&4NzP
zS|Xe2fJkoS8}<90Y1r8`ABLN;&c+AtR8-E8Oe*cwc0n<_UXo(N@!R{Tvp9x2+7qkm
z17dlV9cCN9EU^6;uYEMDrx>5$<+$&ivl)=DWEFYO>1}=oXKg;ue}F*c=W8ifO!#g?
z>ocQ=kJ(a&ReKfg$qE;?EFag1>Ng-l!A*IqUm`lMpp7U_VUgD<q7{lRZ~!5ncxsx3
zM&zz+QStDIc=AP^UrduMFMF|6!9F_$oSd@!z3VraSkXf>2IL<3#;C|wH}*)Z0HN_7
zlGkwGK$(^hmH4&X+wEDbI^Vi08<+%fP43psk8`9l^y?y{RmTy%R+)PtdQsYsiW&q*
z7Lv7(`8HqH7!|&5(E9P{t1w3_CoEa<a`IocQ>v50ygGK6f`;3%`@+;~6~wsT)$;2P
z*)hIY>ri?@Bwp{qFc1z>-<yK7^vG<naXgoIQjmv&lzoL*7eAy(CfFoPQQg=tTQM#$
z8?_mx0mZvxTBl6iUeN5RoEu9{G)tpi=4UfL^BnG04=-Bfl19yzYO~Zo`C8<j^2ztc
z{h(4r)`q<WAi<F9KYz4kw#%=D7fBi%fcs}sL&F6F0BxBv(W=tq)Zm&0VYocn^Pgc+
z=AkAB^FcPP@GkCwI@<3=omk&!&}dkUKur*Sx=Cc@>B_@?_Ca4${4E3t7JBPh*SAV$
zU$PIW2kB|P6d|;ssAsbByX@v~Tp=mhZT*TToKR5HgISk^j}V82Xy&g9pi=OpT+0(O
zsj>x%dsGO7GYb0hWRhx97{sCN1|p-4+BDG5$P#V%ETJ_l5e#v-G{3s_m9+akGk@I(
zMKBTa`e3}$K$%{g@RaWrz~VrMaM(?e-qZqQmF&2=q@{Zcr{W9=F(FKf^UZtFb(QjF
zJ2<L!6WRobb4301<@+XJQDz)~#TQh!G57J+x^1tq8kx>Q-3{+_iw<1uQ*6%I>YFDH
zYHlOikV}}kL-YgHUjrB(m)Cr3yOCMU178x&EM~i@4!w+G*`QGAiHCNN?^Wva+hR}6
zEYhQcR*%pHB^1BU-}_lxJ$eKv3?Pl;BLek19G-~`-K*~TQlDERr2(=LlwYMQZP95v
zna${>l;eu{x7J~>{xbNkSd!>wHi$QfK#XqpBiZY0Ky6Re5SmIUCdo@5Z%l0#2Kju1
z`QJtSotwq^g7A~SUndK#y-3VZc17ags=XIxTba%I5{#xo17xp(oEPix2coj66*5nx
z%KF!xEbwsHJZiS0c}1+Zl5}``SzllCSk<b?bILSm2Xi~utNT2kD;t0c-@LMlL{>%{
zWkrLG!&6$O;E=SnmP`-8Y(Krg^kJ!{#J3N+%E2?T<aR_yj<PTGrNycwg*%|xxBZ;v
zTD976a$J5OhjCS6=ru>eDpH9quY7?fRoi_n_;ww}++L6N;t-WPt~2%5ECEovNUMEW
zSQDD|N__CoaL=<YL2Z)(1<=1zYxb~Zq{TfS(TL58YeoOFG2aK89`y-VQ*5eAhltDn
z#qbkYmn;}mESxj?nGq)xAAvH7HUD_1i}0#;uz9u$xpWb|I_qdT@K^inItK~G6MShk
zCDj`$%$rOp-POF9<kFNd>Plf<u_2vbU3PM}5$U^BCzaZ_Z+A30RK;@)j08bRz(jOo
z<r@g;Z63a1M>s{m7m~(s=mrV@=eh%Q-u<6a3S`M0k{5<?<l@eR0NEY3jr0Xm7$3w7
zCPd<^y@)kRhTb&UOX;>v(<Vv}ba!>{4O|J5h_5HEj};>1$>B>1@>|oy{Zxa{9%+a#
zFIAmBY#|wEDss2;jsl5kbDwz+EPuZespWO=iLqI3F31E4n+cFFAQNrxl@@$f&@vnv
zlk4Do@Jn=GYT<o38^a)g7S<vUaYuo|h_KF%StK&>Nf(2{s`qB_afO(7Kmtce04~@6
zPd;Iy8esFTn#S!BfYJthIE@I+$q&wSp#_VptbknzDgMMdpsZTVq7Dhe*kWU10WLST
zFU?T8o%seF(f7A+g0>b$flm^$bopZ4e@0Wva~KpT=l<5-v(z%QruBzYv0;r>sWX<X
zIUp|vKT7G-QC?vkbIN5uiyt&^S4K6>IPCUo16#TB1W7j+ogfzbrM!9bYxwku+GR`3
zq0HNXbmXJ-T-w8l@~!99UaPd}_kRu3h@W(yw_W~dRoF2|yvJ7E!}z%&0|PncRH6nX
zQWn^>H;>EPFcEKDTh#UMUNL@5ZNcE+AToMC|EYR!_FKJAO$XAPpQ5?<xH=TdPzM)6
zRthYSqydz~6ff;Tq%Z&_bU#jNIB`~iHY5)Xpts9#`(qNklWG(EG|EXeAsKy4%wFDi
zGj+@oplsdAr8Br+B0YGh3-0DqiZJJ4ikbi-3@N9-rQLs5?9F0BruXl!_VzOu&c|U-
z?%<IW5)vx8uxB3g_c@5_%IRR}X#n^&zDccx^InVkA!i{}lMia37ivfz`y<BCw8g>9
znMm(AmzVj=pV<Geu!VLtmL&JUf+-D#B7f$^JYPK0i)b^OQzyIW_}lnFG(|2eQ^6p;
zL>&*gxJ)HRCUbVP+*ian4ELv+7;+|zn@~S@Svh_$w>{?YwmIsCzB+3;Gut1*pM+jl
zeAnEMv8S|u`rEs)WB9u+vv*kOe}E{>rcS20&Zf6*Nv_#ipi6@*zH(*S^r_AqqCM_T
zPrw=M(&Voy_t6IrvF~P1Up7A5JeYsIQ>WlOdMBYDwlk4~?|=MM9DQHRqj=_WtA~qu
z{9(J`N^`S1<y&blfcqK<L6}B~jC)0Jcp#(4tR0Xv8UT5$gXG0@*3GX7zW2R9NE;^8
zo+uTVi7pifLC^Za-xrNcBkBr2yPeMn@xcB-g;&zQ;$PY9_n&bTjC6Xmy^Yv+Jlz2w
zqlxevv(QfX68mkz#%O*j4j&#~vKDXkjdXhr+j;hr`7!`$2%bn*=n!t4^JLuy{elMr
zcX7mPx=yKHfacJveUYAZ5*hQlw3>E{0toF9Tfh3nw31wxt*n<?Rr6FETbOW**k29U
zG?Dgb7G85<r6<=VCCl9^K?VJmYAH4M-Cewb19tgw8HOcnJ&ujZ;J$Bp1soHnlA7<*
zse^pOy*|3S7EHl`VphKSG|YChBfOc&2HZI*SC1YZ`@d+gv4$Ak+ZnNZPtsN|9di?0
zDwdQ(M54`L7StDGCR&d6a&&UGSv4^irCs^-SeI!=YwMvn(R!^`r#o=X!x~bb*{ts8
zg5D9B2q)VXlG8d=VZko3r*J{VAD8pdsX~q2lc5k*7<IKJ8?G|AmF>q|(QkTH;j6y_
z8z>c4A54k%Qg!=9w}c;QZfZ(3{l}r9%K&17AYj-Kmp=eyk+NqeW!u%pYO?M=-fh6o
z*w#IJKU<GgOvJGBjG~m#0C4NvET}Od4Vu<#c@Potc9n32nDi5?5`PkADbQsr@QQq5
zr;A$Q01ZI-qdOH;r@kK?o&@b5_h7ums-iz8AR3>96#`f{4kd@U4I-K@w7p(2#m8C9
zI*TAu5i$J=duOIT%ilk1iQx}0JSAhvky!f>7XBIi9Ad=u`a>9H`AO$?>!(|7_TD7@
z8tObJ&{w2eC(iq3{k*Ia@$%<Sf`tv#k8pRd6(&Uq6QX_J9u;%`fTbdd+qK*i#g4ZC
zx?unLuGB0A4nqp%)0bJ=G_!?=R*|zxJyVz86ZEw(v}Jypkn4%*TKf{=#{9ayx8h>7
zV(!!pu8H+|-B=q23H@*lRmE$`{GKcUZePT*UY;Tz8JXeM9CsiskeU4Ns}}(tfHIAc
z359U|;{L=KfnK`Z@=fw#QdMGI#kX%1tH*pP5e92EZ~xR~#ip(83Dmb}z!FlOZ2;2K
zJgWfW@~S@JNlRq*J=&zA_T<HjOD@Hus=u#?!u45`pGao(S`#rrB51bb4c(buXqqad
ziGHS5z0Gf8W9py#x_0WL+^A&D(yulCR@d*p3%T-YG-xLRXk>!P>!mc5l5?lGd+q3B
zw!1WLUI}OE`|5`)?h{8N(-moFu3?$*E26Ct4%pO&xcmp8f2i^k@{RH;vgJDY`vVA<
z)5g?_SPTFi2Yno{HDgZur_Md9YIjcS=#0bx$S6I)1BUfQbXlH-@PBiRP_Ei%78JH{
zAqY&A>PIRTs>Un@(>g)?uuc3tUI4BFXXTKw<DmDOf3MzsIuYKl{=E`Y+SA?B=m8p-
zg!NMqSo+RlPNepY$n`%_^R4nau)jM7vh`~`jhL}KdnDq|(<;VCp`^a4uL#!<+A(di
zr`gyMj9ZbIkJn@D;XF*8m`d+?!a^3oGjr2-bC==W{Ry+%>g2N&5fT1TldwLQ&CaiX
zV#V18oZUHO@;4{kBn-;C`ZcYt>)ZAl1EtyCih#*H1$;4J07wPyt9mz$ICC=}eL@+h
zDrWL>*CexRCs{F&u>Z^8H?kvfJAzkWTVQ#>6L*Jov=H+tC9}P5S|Ee-x>K0odj0nG
zr!+|PoLKiv#v9`Go9!n89Qu5hee_G_qS%)fDjvsS4=}#g#$BM;T`t=Ds^1^5RE@Of
z3!qTE4kEVRNB1!)F74d!q$7G&SQ2@?RPvdW9auknamj_D@*>4wrB13kanl8FLCl3t
zvBS;+H>67R|NCOEU9wK0dP?3fq#V>5A=|5Ms6O|d=#91NwFg<u*UKa{{8%x6n2@hW
zsznkkkb6L{FKovi08$T7r4a9Q=B8H<;%Oeg`aOcrzVrjx(ZS4)xo0|iFe^);B;Z)!
z+u7WG10tp%=XxjW=S7&na1J@`d~>;(Jg_7Lmt0uN^2v1{t34@hwQ2G836C(`Id#;T
z6RWC|UwO}#8QV=$JCo8gbUX7EgwnKu4H?Hq(rSXi>KE2p5e&9fzvxx3&Q?g0)c^HW
zq$3%?L(eztNA=71*MBot_G&|7XJoH+!QAD_|GFvy?dcmEQS4P$Nh9%V0(o7R#6*tk
zj9ni$maF#iwuiZB%=RG7{cT~S;{J@|dFZ6UCF5UDr{|4&7<Ia3vw84sEawfX>9Vgp
zjQ7$OzsMte&j|>`pdCm5O@^5Jg^4&hrMbEt;2qwjWCR8hePyb6<F6QKqAG1|rz2FH
zEpvs&Vs;VZaRz`xeU&b_ORN2eh2Ga+)!mv|x*j&bd=WBtaL6fV<pmLy9_#A!@*k(y
zWA|GvWk#62R8+VK-}AH36Jq@1-LvL3@|LK$1!`RS8J9#5G0VN|B%scXW$yfXjk->q
zb9_hBMTSQ(rK0UbP~WfL-Ai1y6>}E8BPIIov`xTg5SkoGeG^;#gBe?HUzPsk^9le{
zw8Lgd!J(?AIN|ey)9PG`o%daFLU8<$$!K~i+9oDNC%@uzxXn#O)`{SRa|T~rSKcOD
zvpm@U=oGtVd2rL$ER`ASiGRdF+o!Jq;>Nu?-K8hBZq7gXSdEvGoU_;=H;WPg&<~+9
z;@|AYKW;aH(YnqKxl>b$<pK;!f(tjx?4N5MPM1ZX&5OTBxzT8-Nr7uXe*XWPCT%8R
zw^JOYtBkrvMkv|!Xp_&;J_oNZ?%K!PaK=516e?Lz_v-P*&p4otLwsTsBhE@EJSXoz
z%Kgkv<`>a=VR~&E(RK5t=0AW_+h?<&9e`hjVf|HUfb?j<DX}m#m5S&K)qa(I&d1}t
z_LC4GM{ftH{X25G%$fmHmJNV=KM9tgl$SS#bqmPj+*3yCkN4tpyxx<2WE2X(B^97P
zcJ0jPN9u6hDa!+%cYVJ`iqfzo%L$wz9S}94_^ZT<{Ceek^h-~pdjw^#ar#Rnz;dWT
zapa@1FxI-M<jdDCPh5rVlj9Y5VBOdVsx6C_{{W=lCr+Z*<yRKMny@_io_<<aKQdI!
z`9}{_^B-Sw4c4wwk{(c5N*I)$<Il~Yx+hxA4QkUy3RnX{T6|3qb`bjNbU%zENoPT)
z%Cf&tLsbH*wlzsl<j#MK?;c{)(9?w^t0C)GN$GY9=*|G{$AvRT0-J=x-*>jt`3K!G
zZx+rT;gXh)Irp|xAEq8GaRub{QgqFy>FWovT<!^U$G5-Xce$Q%D3xDJkw-seXT!d9
zJbUWsNIyepK@L_h;8?M2WT?eo4;)TfJEB$dwIW^1d<0leBr&@N)TYVwHtEEHniqOI
zFOq@}MV@r{m3d)C{+Q4aafsdbBN4G-E9T=(b>Yy){*as=bw4+LsY;b)WFTXmo$h<P
z_0i10<syaT#(1oHe4Q!@;X3`;gW$0oTV%GNr5+tZGW~F5@#fd_lih@qarm!fO}1nF
zQfI-;4HcwCGYFXnuNh0$fMHG0@@U9Pc}v%e`|T1#G&g^fD<0#2=mHUeWZ^=gcNU=U
zRRLKio|0c*u$+a*r+mQgLk>-}FQwZb<P7lY;mAO>ZG4ANk<*ebTwDz2<->6)xJ{L3
z4;Tj5IyWd^uYA1kDn>p0`7V{#Q#<<%P9?B2a4N-FeC2gYcebkQwMHNfne?~RXtlqv
zKZwiUZ?CiVv>Aq&1OTnR>g*uS%2Q%m3g_4D`|y^8moR18Lvl3*h#+5!d_Q#K&N9z$
z?_IHB$}%2f$Y0x0uHf$DfgRmh-PVrOGv+@H`jyNh_meV}n<u)#A^C=?KTA_ie7->{
zqKBFDI`kz`su>Y07Gb2;L-9?~OMER#ca3G6cT0VVScu$6MbtcwBA=^d6npP6FBvci
zBYVV#3*6Ie$nrJKQKhX>b*J)jrrWx2`PCHeYXI%2pi*_`C?7*%7@aQ%7wM?D3EWei
zZ}wE^XSMxLI3JOJ<G}9S1CX<gNNy$j1+AL9qJQ3^F_`xvqjQ<jG8&PR-1bk@&uvc{
zSEcsqbg$fcds$P%@#0)xDl%WD#lE4x*q!awTY>e}L#%%2K2`0am^6+&_IHDAT{4-A
zn~OulKa4!!AL0$))>NgzKHtdvea0v92aoWtXah$m{37Bi(*hRkFjw-e*Lgk;NzY%o
zVt~2$<dDczoj(oL3#>Q(n)gBExqguszb}b#PHJ28*Nts0bhmX{fl68gl!T%Q@0s4<
zxOlA_zhninbwSH#_kzF~LjTgHVV7$lKjB{l_7|VHQ#NUk$n+Mb0)G-X=|YmJphf0T
zBc(Ypy<fX<=S=uiiu{$S+FJ4`CDH8@PXBmIr;~!O(eEVFLw2B>+M;bh84%R30EtwL
zI6agwojvn^u)S9yPFfVB96gj0(HT`Kc{6giu=#mLe}vh<h@zhw@jOhtuAEe1)UBw!
z(9`wqOI}Iz0}14pom5puMingav^?c70%|u#7hKK$j7e|Vn#<~3i1?NN{*)Wwy%SSZ
zwiX4>*h1@HZ;VA?6*G3eb<{IxLH0mt^zyZHFK%ddkk6Ev+<h(JCWFb+`QD)ut7j&!
z*t`^W9z`pU&OqQjY;4LT$6K16S3gfYuZ(=)a;c9RWQgLxT~iweR7`DYHSynnuo5V=
z_AFy9vBosT8FRd6-vq=RH`PnF#s@97J&%)DU`N})rda}SSl+}=u8dksd5+-khW)~T
zowpL9d+T)17p{y{8<N|l%9`K%<t`^29T(frwwodHn=~r2m!t3(gu~j|cQ<TAI3UEZ
zb!h!Qkc0UIv#B49;ZBk|UA|SE@%?!~=`fxD<-tfGnBGBN;leGW^r{;(_TR)!OeS~Z
zikUF*R(aG2Y%=Heju&(99r_kBJcKZ5{$euXXSZ2cBk%<u>c=1ZktVXKS<Bn4Z#Y_#
z{X*g7!32oy5OO4r^y_Ytz3AW_kia2nVVV)oJROBnax2kt@B#kx!9bd6%eNzyLe$H_
z_pml27A=6Mp&GE(t}}z&Vx+0fH0wpuqJNr!&3}OWm(Meo9I$??w`PDu2-4=rMnm)+
zBoz?eiChhtoOsO2G9&KHw?}tV@ESb@7n0U`@`^G2F1#`|Q{{V38<Sd<^6vqKE|o@=
zzX>!5IlFE@C4xeQM}6h4X9f?8>sIdTKHx*j07GV^Wt{q7kezVVy6UF^Jy~CN4TI7j
z;bj^q)l3`%8o8*ibb4V_Z&>0uScmamS~@FW2lu)5H3C<S;-IQ}?iXf_X|uLY(GPLp
zT(~saSh#&S;j;t~&ksL_YAF5($o(Daf1gH@Un0~$&EvL$+VB&1u~r2AYDx8zfjBd2
zHUwu+{?=3l+THK1E=L(hL(E2s6%yP}%qR0+&TD9dgQ|gTuZNueC7jTAWQ|A(_dXy|
zit>tCGvC>}ftd<Wj=POT7)w|efFt4Mw^u!Wv(bM5c8*3oilUOK*A%Y#J=5!6*2RYA
zG^p*6#ofvl$^`?ITwasDFYE{#sfjH0G@k#ZWPL7;Y-4v`IK`J*QJ6fd_@cldekX#8
z4BnAsV{tQ<DLPoVn~AU0f2E>C<?NQupPS1q;Sja6E%MCAt0arDzT7C9{_(||eh-!b
zuVtPuZNhW_eCaZ=a4vV&PW|YBWcqoaNOx>jqY{viK^<ZLi3joe3N%&nn4^rm9<Xz2
z5Jr?m@g3YXbL4%TOG;m`mG5bu)P-7>fZSJUzwkzPm`0O-67i}R&n9*k#b+x?rz}R<
zAAdXiNsAwSvmW(fXPG2horlC4Ni{;bx|%qi2Vw1Y79RFLY>@|tn%@3d8N*<M&*+9Y
zaO*b-ebBEWD_}a<<|`mJjIqp={MH+|pUlc6G2MJEO>TWJ<TG;2?dWtq69B|j?v|4_
zmGO5RILRIt|ETkS$+N|8^|LhmlWJz2dFQ)U9V6m9Us716y?A@?k!*6Ff69hlI!Rg(
z`WLE3tzQVMvXSrmhuu(e6gbUwgjtmnBzvDL8?3-4-yd1aOvSW>c?94P$wwXlL;Y`9
z?C^9b>jLtBhrBrF7U0DGo{_GXKc8d5?MRBy2yo8SdwpaNyhyW~mOiql81Vf4v$%!u
z(qIT_z-?p^T}L0csI@aPY?uUC#x5|OK2_RkiF-dt3qJe+B8xiM58gU6V!_w5<{5F6
z3Z$PWXCD>Nule6lFYkMV$y}Fs{ow!Wo8a*8VL^_$dQ-$K9jiI+jq98?bPKIQ7StU2
z3X{2MFBTb}{)fyt21P{qsWe>{5)*#U&Nu}63}!3#dP6)lFCX{RUYFm&*gdA?a5ba|
z;<>z-K6KtMwKKY>&PR#~Y=*%NJP{%8#lbB20iz#;k5<YJsznBGxg=st#=fMn%X!)`
zbU8FD;@SJcUoE>4fgDBm?who(^&0>Sh+oXlZ-!OGQnq!n^oo-gxYeNHB1bVj#?Yav
zwVUwLmoXF2vxoEgR`=hiFLJ9r^?Lp9W~ZB-4ce)4T*Gr%xM2Bi1a^e4_PYpO`Z2T1
z_T2$a8hCNx^sRN8IHQJJxX^W0zu^?h+*wn5ByVr-{r0eHy@~H*h7MpB$nkvgKY(Jf
zj}H^~QJkj(Ey)2Ls^f*YxTqtEXG2>kZ3~g@%63h3FA3etOf?D60<1F9m#;KdpY%{M
zHm24=)<TJKc%mv!L~+LEOMFz68<q{nv<d68&g3XH;U6sNyLCt>B{@p>fxI^nCQ|;k
zoz+Pvy<hsu0!xJ0>J{34(W(ikltlYabH_d{9bnHIc;}9gieJ!N8o<YF&DH)HrXiu4
z^VP+lX`Y`Hh`K93mlGfB1AlZ*<4y~Y8UY=Z<Lf*Y5e%O<^{v_X*tu7K&#ZQQdslp}
zrJjOxIGj+}d)A726?E0cCdosa+QlgubrnnEEE%IrVj)%T*u?C0DnNufSckr7jwQDI
zGfjxzncF!o>$-Wd2bVB7b8dq}0D77QVnoErX%sO?JdQ3n#o?I&RaKa&4e@nv=3Qz~
zxxl}_syYF=jwuqeS|e9Uz0uku@?7|W)yYbyuhuLUc;~bb|ERP`TH?DlZrWm8_jE0H
zZN?FP!pEkX1Qf=KP9fbiel~Cgq(zo4C*J!WEfPNB(nEXi4Vc~lTP(HC*t_tvH-FhU
z6c4O@$a6R0jpZQyhX$~p5*~cCF)c6-7kRNE-sA7jBV1w0cZvt1434f|T0cYuCk-Q>
zH#6hthY*(m<){r)N|prv3~GG93jO2M<nT?6Orb!lTeXeRo4Gr{0>YJc0gd*HyO|#_
z_S~<vba75~J84TC<CYNtWb#JSoN<cOnVPIcWzUV$v~elJCg8WJsC&QK9+eqQBaVLo
zhQ{q?HA<GWz&z*CF&Usg$w9@TWsrNi(T+xgQE3smOlH-dK73I{88k}t8FvugJD8Ek
zV*PuK*_3;r5qkEWWN05idMENlYGG{P_7DXZ9so=>u<|!RitVb|0Wk7x&{l;afASAx
zr1bypaQ=vyDz7p>^~{0|H4<kLZ=k9eW|E?zlh-4kl>Jy8lv`3JMpv(cSy*}&U0vzM
z2z%KkVjHoie}%>#We!?2F#4&1Ah8N3H*dW7LW%j`+fCXW92}uX&`W<c_EY5f1dp7Q
z9J|w2G!?!kQqP2yA(c)m1!kup3bM<Huplc9B9mZuU!a#KY=&=sVEnE#$|I^yD<zrK
zOBY{j*GLk;5#(w+brX^)->vLGOKc`v!NrbV%4&Ct2BZ!~jRss@n7(Ju@^(JtbT%4{
zR`ERE+S3{P6x5}e9!&uvf(Akifz_WsT4<|gUZrUn_NI6eSXll_X_=y%l%$B$9pY-o
zam8mx`^DP_H8yo!13S|X_5JyWA4#rB10?)^r;x!mHq@9GOO>B|_A3$$<6L|vkUu=>
z<rPj%f#CD@(*p8MC@4<=pRJQQAL3{MO6f~2JguE(9OgnS>VvsJ;<S}B@-Co|(e`$;
zr&6+=4VW|pxb-~liIaBoTa%ur2Y8i5?Q(o;z+)iq!he8;RiV>ULW)jtFlir$jGrUC
zOJp9^MtrFx!b=}gPSq;42P+Y<ja;**ITl%AxUVC!2=}9noFuOr3GozueO+l6=YND8
zfmS?ir`(dcen=!yi7+h(Q5!4W&FeQj1s~3jmlu4C3L8jJ0Mvdubh)H|nI_~c%KDUy
z_h>Ub<aZHk76_Y~3>vhb0OROOL)7H$^oZX+0nE{AUCOli{b|gBk%|y+HqJ6%H7Ir}
zZ*_Jq)&lHuEbbQ)z@1{%#s=?l8LH9z11eXJG$<%_;0<k$@ma%s3PH}C$J;QOG4CYE
zK)jt}E$Nv3|7`q8`B~E1D$QLtrzyh2t)#H2MpW8#aCWpk`zf}=1~>vj4VpnAfGE4a
zKW6MjJKMFXQS1%5z<D+nnR?rwnsX-@dGZN%VzZdC<euNZtKBX_AmH{u_X#t?A=9>a
zFb#yM(u5A&M1RuhdIpm*|Mzj^UkkFcZ)>Uk=<+1{LsFo$mZdYdFEK+sK)A~3@MpBq
zZ7Ou5R<Y!$1%4(JOY%kCJDiuiB6z+8EGFYQJ-jcYV5*G)?KT_uq5lA=gvS)@I0yfE
z8BC^frcG}MvVxf~6Hsxhe6v>QnOG5Z?$ttViQ*g5_qt}Sx5PH<(|_l~Np|Vax1M%2
zyeVC1CypiucL!z`aCGt9grz(ez_28`%|8j7H4@QDNPKO6!nYcmh+t|xIpT(YvFUl+
zB37>lC;U*oxNaZC&rl%*5oWTS3*dkg?3pQJZ#h7#hn&+E3r5Xyz6>ffOAm1_e83ax
z7kpG<Ec3-Ml@yCI*a!ZJnVdKP<cYat2@bWF0i)G$^woAME)(aD`3~I<k}=mo6={7O
zn5yDA2NLY#2~JG_>5IEdn--X!pM^E+BfcR_f5U}rsEWTCegCG=C0gJ=qLlL)4AU0$
zNar81Ab_sNtPJPonK{-4DIp|j{;1Yc<!Z8f&t?H&FR1)LAL}MCY})WHPf?AO#p{be
zEJbnJ)1V>kfo=uv2YkdD(C`WFdX2W%#Sb=shW==>Rhf9O*T7(te(Il|Tsms>g>=>A
zK_;a;0O8xic2ZH_$MSnQk$3Pb$u~jnp~M!(_(ul?!ZAv4{Ji{zL4wtJ63-iRWw?e~
zsT-Laq{WCs(l6L)Q4RcWr(e+s%v2!s@^i8}*QdJ4OWH};9NOnWp6_ONF0vyMd3s#A
z-~H|BferVkKmZ=KFrkBsAl7)@z7f2dWoI$VwcFP&+sZM4c&G-+gn%q71cCqDu6#J&
z@gLyi(f(^IZurqmhJ@WL=LiMxD=4MZ=cXgV_GU6d)Mt+VhT3RlQJ=#46DN~-^L|n$
zo%;JHMz_$@a$ZVYk}>Bu_^Z2PUnUymd1!8G7z&)f_Dfz>VoS~|bTpamWmd68uitYh
z$<W4!%2I`~7;T|j*cG;H^KvN<sm!8Q8G2uH&F&FNnX1oT=%x1f(R%or9tm*e#Rm9#
z(s_NBSMS0;o=>-pcYQC3acFyRH~OP;v!;GgpukaC&7QMo7r<UxH4IO@q5ZF0$Py>p
z){BtE0p5=uPQ>gy|I(P`b2k_qLp)c3e1Hh%TS;}zFc~*D$nBr_HT*_bHO={y5m+a_
z7BqRoUF>d&Rc2%yEI?E=fZ-iqRjXgVb8LII)w1T;*or?V9F>Lx5He8~;3Ew12Ne4<
z)kSNSAqJ^(7=S&$7WS~L0iS=e@$;V$*tjrL`mBgyp<y6#>sETqwJ4cOJ27u4+Bi16
zBJNAa@~I829R7lF5!NJCnU=WVKOJQnR$gohArQCp(Eb;&=jNsWU22DZfX)8w#>Cc9
zaVz8FlLUSbu!EOU=fxSJ$=IWMY1tA^mUMM|)pi|eH@#&2DZ$!<*Rp;G6$v)e^^nET
z2pKZF=cfO?#Us|u+4iAogi*d<SD{<s7%J2dvtCuOE{S130=r+Bo*G*%C|avXQ0Qt=
z$Zz_iR4;z(<5s2S2H>!?9%2PjtQ18*S28mu=rG(1PESwix;!ZgfJ-Errt>&ZfW6Vm
z?yBQyGg5Y$Kx+N5$;=Tc{a}SX<3$zkp9|u!_Ls*1=kn76YS}4Cef|fB-YVH$d)UdN
z%77C;h@F$n3r6k_Tyi1c*BevmezJx_B6)SWSCv~ksF2A!VtJh&>7GwQcF5kWB7-iB
zNywW2Wjq=_kobevOYINMDZ4e6?pgY>ya)0)y&t6ieX7us#R5JDWH?Yv{_a8-Ngeh#
z`;g&S0elby)sWs6B#rKQ_<hBfGlf$7<oKj~-8*&7LQVj#Y0`CJa&_)apH8th2NDqQ
zsgZ<hUzopoI5{5g)Mv_2r3ncDs@!}aapW@pNQwl$;e-R*FnDDLvk#AmByKa2mY2zd
z)Pb(uNS)|c?^wtf2;u>;Hgqvb=o*lG)wS+UUCCAe70;Y5i$E(5piaEY%bE5u7+-x=
znxUhBMIlw%%BD_UFrQcXMd0|_MkM6>Us2C2W<99*LPc_JE){SforVVTeLku-XDEU#
zdJAq6{Q+bI1f6svaK@b(V9V|zGONy!eHiWM+Yx*v1WD8yEF8#Scj^tHi>ZmsP&DOm
zMo4&T>oICCNQ4mfi*jf_WXuMWKO*Z!6H6{pDYT5!9B2-{t|x8@UtLX(Y2qi$ezwT=
zR^5KH86?osA$@Aj5G#CpCTzhS5P$}5nK?W2ISv4FW8m6o=vTmndo{o=sYX0&hw%gL
z?(7@|3vs_w&_lMOiVo;~o>F`KMLWjIa}jBs)HVc5#o8T{_U}KTVOeZg=Mw;xP=p+#
ztpMLMPd3dQ&G}nJsk#MzK#8kfj~tM2aH&I=|DPz-EMe*+hYs!uWEqsb@ESlTeUXFO
zFdt{}7`)^2iRTDk{tIB#f?QaTNP9@tvIov@@4hOpak7jIsF8Jz+s3)PLE8nD^L~0U
zhX{xTqv(}UZ8sUFdK>Guw7FOC%)vPC9!`Cz2Wh{<?elufuULT^5I$u~@0))h*k7}a
zBM`{8^*8e3sIRdlfm>nWK-a~W>My;rX^B&3+xxw@{HD2wxiRTStD`{ew8g7z(%ZB1
zK(c*<!=sy~yV>kfxo-x#j`?cG-{ru3Iu#Uvf$FHUlhd-|0Yq2)I-e+<{sT$w>CQM@
zAZ@>YNe8g0KQl>3dOUz--U=>pR2HT@*A_cs!{SXdZRAsdOe1PgkYVsj9-*z3DSfSy
zl!zOPO7T7dOts%G&1U-L1ou|xI_g%*uRVw#VAT5Dox=THVJ)FwBYblvDw=b1*l*j0
zo+vYOh5~Lf-YZYv*Zu_bRUqss@Chs769IGXZNW4YG+&WJD1BmHi0@h4lE>^?x>&my
zG9-Xqz6)z(t}`TEAxv8@c*qe*Ydw)d$Z2A3kY=~fE9IR*_;+_*z>W&Est(B8o-%69
zThJ+rha654N<?%l*O~>rd1vIJD`p1fG4db<?D<OBfKrVEqt^f#Tafp8_m0UgG9j`w
z9rhB@w^SgW{{VNmvrN=@PwJ|&qCS5A8SDfUuKfb1+Sr9{dRSU<l!UteY0_Hkza4V2
zw`b@TMDQR2VSC<olc-%upG6A07NoIcXbIO4nO)e&XBX5YDUsr@Q^>w2`wfSH|9|kq
z^i)(YN@ILj;{37;rLO=nWqKxR5#-<TDMd{QpftIe_O#wjtUVPTeBnMy%*_3Y1nM{c
zjd)|k#>w2^-&S`_c&NYFDseRr1Ywk61D;%xX8~136UH1{Njmof({^2hO`Fwb-n0EA
ztZ|r{Ptpi$(GEUtqqf<Pf-Ml2*GNtSC9ppAyp59Q^%Pndv_AaM{uB4U8GX!QnBjF=
zldZeKTiwWIj<WBXFCC5A2OjaZ8cjseWbw6GU2{5ok@|IbwVYrBHwB{%*ed4G@zu&t
zm)jSaEVR}dev7)-wKZSPue2r=I&>Z5j>^jEJQ|;Al?yPPZ(hSA?hRF)-Q#4`n3>w-
zb<+GNNZkqo)BdjyenA9j2eb9JCuZV+2pC+SJ~HCf`Nnnr_8T9#eWQ8%eoSBJa=Om%
z8c#Ka^S8z<ntazy)U$mNH)q1jkY;V&^5=RFKI2pNYiyKjsxH8dwksi<vvZgf!RKDz
z9fNmrfq$kx-L?Li-=0vpdmh&F2b4@Q0#&t2R`}j%!TV{@(<OB?<d~(T!TJl8{y;PL
zhwE^IQYdWCHm)R0a`7oIxy~+G*vz>GQNW2GuXtEvX_0yU3E)g?P($yy^o>S{fbwHv
zcN6VR&So1>EnV)DENn%YNc~#Zq5|Z)z(eWvCcbXFJS}dN<RzkWAv<JDxvRv>L)q(;
zhT1uAR&^x6ZpP-4&{p~NyKlt5lRER>&@5DbPz1Yb1{2XN*7@SY6#*c*8gsn0`vRiG
zci-A%^*r<MXEo2at2YXms=AWhgarVf!nsj0m7#*$Rupz6BBN7=b<cCGP{B=E`_54A
zYw&T=*XT{5%tgrctT0tRd2;Z4Zlw5!+>jV^iK4G*G&Yz5@5m(;{dIXfXHZvHaj5kR
zv7e;uNMDJ-)yqqIpZ%H^!zS87x1CwqzT{x2B$|a;j`an7=AdtcO&J+3guA@d<yo@d
zcwf$(CBJJD(7^}ynvLeDM4HC<>%8RoOsxQ1U%mg8H{}Y_(b|74i(qpEW>BQ{(-$r}
zrI6r@gBEMdyaTv^S99q~VmV0SBWY~ig70{1jQdJya?7#HU%f19Za38!r+?ruNS6&v
zN0=Y<GfF?4)c4hX+zpzTPuVhqG~Bu;#QRu$U6jh<JD%_V2e?+PY=`qPl$LPA%7cF!
z$v;Z!(z+2t5KnpNHT`PvhHc}Q=c!I9<?`JMko;B2sjo8&qF=a${99cRM;9l@WgpZq
zp(e<*d;7knP`_YE#6udZ1zm4e2$X~Dc3vA+&*6d&`l_lWw)>#S;1h^*L~=mksEpRn
zNAl;eJntESY&B{E0n-!&uUZLev$~{qXZVd(60s97V(QiJ#a9DB=Hx-VHzh_j{_)wg
zsb|f7<MFG4ny&I(a;~e_+~pOOrBr;bYLt9mx8?WFA{wheY&nXU?gtc7D#n1-!}M)v
zg-0W{PRAuS#+PoJF^CYgtG&1Mjr-onoI%6OcLI>K=Sr}RR_9u_@**wv)aswTxeSA9
zU3QXMbmr?n1&qX2_A-8KN?yUv2^VIVMody^-aRxT{{s&@ny(}jF?IFT(nb;~dD-R!
zaDa_aNE+Fu)cq_O%g!>SX6a(z4A=K3!oVHmhYaZ3^-j}cpMWa_X=g{&=0d=4DlRf(
zStg$;a-zLeob*Q(!1Q_{=6#EOTeX>~JLo|zb^%qPtAB{8?^J88w{I0owzd>N9GvHn
zTu$Gf)?>;e(jM^fY65GlYas#L%ZB0b$_90rPkwCZ33>LpkZ4du?sVy&IZh3KWj-Lx
z)J^$#6GX7|DY2l*YVj?nBjGFaQ}5ahR!05N0W3R>*U;84bVW{)E?LSOG84Io0^GwB
zo=3XbOvAIoaLL8_&jZ{#Td886oV~h@U*|LbN~fX)HeWVYOQt%S`&Rjm51<#fef0rY
z;xDUhoZ)y~GZw`&*KQIDr-$JFq4F+r3Z1<eZJSzSeCGmWH6h7<^akp-;r+?`d#TRn
zQS*)NwKjlIl9ABgreo`kn(c1Sy{fwO6e;ZfsG}yylbz0aT=`etVS2+>#Wj4j><r|2
z%vi^~Ax$2I978NX503M#y%Ejv_Kr$+)fezePmIP+F1)j})9RU`g1~n+0|-;pSELlZ
z@-g=1T_(+3?Jv3<=Uz+_0Eq|vlGxRtqI829GT&8J+df|k-%$6Ckdit_G7Agcs1brd
zK*%l|r)&!P;mG4+(TR8WX_wE#4m7v^?EW7`=lxIh`^NFZ!Lg!5kz?hEtgJXT4IIiQ
ztHLoV^EfiIBXn>M8P#zRvSp7bWE{ddLfIqdaFXmjKi~KFAMo(QdEfVSU)S||K2s_#
zU5wV4G998OuR7h4oeHuR`<$$ZpLb{2Q5xOYS%GGn>ao!?#E6ava6;Mf0iSd}S7Xz-
z9Y6l!e+;MknmC|MWzw4)Ec>=?QeRa1`2}}qQ_UA|QAf8*S`|5SXr*3a)v4pW6ahF`
zpzTV9%B#F{v~S!^^SJ`;^B2iqnM~k=A?CWiA~s?!4wNU@=MZ5<q;~(*yZ8TOyg$t3
zn;X!%s<x9i**Q?ZiYD^>1n+$n@W`4*a20blf%`NZ1;$ULZkP>aE8i7p^;4dciEQV@
z_=6$%sP#u3n$?W~wHyMxtJiq=qdXnKeSClcxw=v*)V&3f7p%a<X9Kul;YxUQHXPw`
z!Jna$r|gUkNPc}CeK^_d^u9;qs~ZV!T{z{QEedAdwRZp2i{mRh_MzHp!#;H%SxY4q
zw(Eo}R+nv2f9HIfTxYJ<-QV_QLg5ATL3Bi+Bxv-ahU38_gAN5B8*HY9@K)y<jP|5Q
zF=gvn!PhI*qrw5AAcckdZL&5S3c4h~Cbsfu8RegFwLH%bzM0yEnx@5!@DdkoH>GR!
z{!A(FsOy;pP3u1n&niJ()M)TwhGAE$EHRAC6OO?>`n>D-6kUgb98Q4pl9EN6eck--
zYCx)*J42X>w%vYN7>7SX_9t?iuXD{B!jRoeLhyk>NSw`<Z87fUcis|(;AdU6(DU4Q
z|Dz#_WA$Rg8An}{nePwYxM@8^FEc``Er_x*+-zH3*Zgm>Iu82AsR1w-=TRy6h@+Lc
zb)~*@t$A-daQ2HmIvVUzf6#bTx7kC%AJVCla%5pgt9Vx1WCJkYU$x!#b)z@ZLG%Y4
zFl)<i%F}VYU=b5&$R3Yj1Z(TFs@t!6r<ySIsF=RJ_D@CL8Y;yzWqgizQ~28geD&c1
zI)8&zS9dD4t$w&B8Z6)(y0_X?zs*zV;<Q^s155ln^1B^3GTv+csBKAljf*~kV&-u>
ze>i=H-#-7X&X4FBB4x>9@zrqnBbNU_LUwx(HkuoQB5HXDeK)t_6=<JCi;Bbr>rMWd
zPCe}R5|*F#U8@!7(7y+;meoQ`KZy2Ge>B?P9F^~NIftDJ0E%~#F#u-uNQpT2*r8wM
z*WRRW`E5sm0y!E)>x)+U?#=9q!S2>nJIV8TSgagJ(9AZcCp+5aftps9Ok|Q6?xj15
z*P;mzsQWZ9$f)JpN$rQRty~p;uvWI~W=o84l7h($Y>x)ud`vRG1#)yvF-ic;&-Xg8
z^QvIJmBXB8`(<Ak8MHhl2iD_kMi;B}K(wL-_~31U^wsn_*Vf@Rj@zZ_(C5(PqMI7=
z)*8l~=L|(<#G2=%*1bwqK*k2Ve;~S~@YbIf=h;HbYM0Vq^NIwEGf+RFi6%hsGc>7O
zdDBQb74|(a7Xoo(@@<=;9)(y2T5nCmn-1A41kWp+bOiIMf-cT|fyQ6a5IQ@5SXZ{O
zCl1Oq4tm7IEC2wP(N>%<kN96oZxJj-dfD|sJAJ!k!z0F>soT#Sv9$_@{E{3e4Sps=
zd*n|%Zh$<h(f(sr@Uy5H9c@`=vSz$Aqu_va%G>o;2Cua@w)w4?_H;ONDFlW~K4mgl
z95EdE-FgcpGi?}2{IZX62>@%Nb4D~(KLs{ybfw+%rucPCOF?)+5<M)MkRrid!7sUw
z=2WI=wgvI@xHXY8%XS%}B!_ab&|^EzcN~^4Xz2M2!h?(nOFd?WyD4wv=aD(v%eIYz
zTyO0EH8wi_HQw`lksG)Mhi*@wMckh_2r&vp5PmsGCaci69AkS)zCnZN)a8(*E-!CC
ziZARMujGZ6B_cmw@a2XgVnnP%kYN^_@mF*6x*zxX@s+=-D<sH0m&6Ze%oo}wq-RYR
zRgv33k<GB(PT5?4e0QoF%~+j0e5+03j)FuxZF5&hM^P^&Z|-nQIrm;KT_^9!hpEpE
z9QI%J>t%KJ+!InDw^;?!)+7t<VUF2Fa8S-?IJu3lob%w;*U4GLYtNH5nQEQ(`IJZ5
zzz)h$K$zP1(Xhg_0q9|j*ez`E!<k+PLH(E4UIMTZsG#?v$8Vhv#sjH>Jr}~B{P7jK
zs^!<X@er5!J@JQwJju-O<wq6heji*wk+7SO{0&DoZ!b3L@v?ChvwqhM-UDx*Nd1x0
zRHJ??(7U4IjLV0gYl?Voph15*uUMw;u5H2R&t|-V*AQ>x8DzOZ>hyYWnv&mZoRIpb
zS5cqur2Bn+mi4n|ftNFL6HZG^q<nL7o~$m$F*C@jY@pHz<B-Io;EG(!CsP5$w*`UT
zi*LZmfr5}lhx(;728B9Y7feCx7dwZGw9ce_T4aPqKwi7%I}Iii_8X}K94FEAJaiqP
zsI;DtBP;F=?vNKW3;EzJZ;<xvU2)-a742)`^*iSVTT5I&|N4>Pj@66PQ1tHkcW!nD
zom_7S<QiH`y<c-Dg?l!*vWKK<#`ywE%D)`SjhQ!Avgx}iOk3;&HZFPX?0O^Ze<9uy
zF&)@AOSy90;HLtCz9D;>HB4c~Y7c&J{+_z8V442Gx5bYqGaVwj#IOr2b>Rs=A0JEp
zT~m3hvsIwe+Y$uCv;;t^8e3h%i;Up^M$e)rCr8V1JyS7q3@Jc1PrlnaN(`4gELT={
zF&eSA+*?vn=@{de6$#t%Ha5_FWt{!@L0#&kdG8-)I0-RDFd&7kkm0sh`$0anx9FyT
zb?mW`q7~Ei1n(CeqURwq$K$}BqWNk1Ndiny8bF0b0S=l%PWPod`D^}?C8;+5f$D-O
z6^suvD6=kG`JUiy6@luZu%~;O>K~tSgYqLe2X4EMiDLqIcuLasQ`;2jFGLBzfj>EV
zi?L25-n8pKP`?&B$NOZ+?4$Dow^UOhai~C(=4aM??gtsea!H-n!XQwW`J=>IaJN)2
zqRH{a2`cev+)dXD(2rV9L$uMIL9m!rQl|!{`!h(5eY;PoyW^hTMb;)$xM1|VrCHwx
z9%_-glWLpfMKdBpX*0T-mz{}MK)WZ>vG=jtJ|)_>>F8$%gJef~rq6Tjpi`}Sn?sf@
zn)i?FE@~>EQkytC6czGMo_q8%=NXfJ(7I2gizwVd80uaGUnsXfw|RJ><hxK-&GuQ?
zUnR?gt=wuDHslO?cGH>pYPxpNxHAHDkvxXeiA`4K0Is_NC}sF<LMMG^VDqUa#4gn;
zDcm8D`X5Mx;|*@`{QcNCMY1L{g((V`l>=7~NUrDuivu10VeF&<35IF-fsfRT_*U@r
zZKmuYBO2QTFS;Jzow~@q!>VBXgueD>f3sZmR{LZapw3#*f08a{YMDKiwaT!^0OZUB
zbtbP&d(KO7q45+AU>oAM-Ay`s)*^58*qrD)Q0fFFb^d)WD>Qa8ByH8oHF(~)?^1Bj
zG==YvrncG(vyQ8DUa_v4>IAh-eZpA?EVr73CWkLYDpjPvSM19=!o(29SI&4~env|~
z26G;r_UcuVx}~zkG>QEc_$h<vJSN3rZnjeFhu#eduB||?cA-e%CopvFJ`_#Qr40*U
zR2B8Hn9YADiW1LUIzQgwgmH|hCDRf!*qTgl4kh?$nJe7()7G7;Fi#(9&VGRGMUfDK
zo!m?xIy|1S_C&tYqY4IwBGYu)_oHWTm7+6A=znr;{Yu?jcO@)UeOgsT12{i@(U^45
zAUIubp_}>>3|`UcyIWeb$W3@jD>6)-4Mtig%ak*rN2>N$tz;PrF{TEc?0(}@<Ls79
z+*KyC=WXzGF;O`yi3}c-fRU0*_^&B`2T0GE6M<?ry#ap4W6Xg%+vmYCZ1u*jMuR5!
z$CAG`oia+Chq?2*t-K-{Q}?>T*Up9&HBuG0SSJ1S4A#%|pUD)~zw<k@r>iTiLgESk
zfxZ`3-!XXiL_S0Pz0fy^3Hheq`F)?IX$H2KNY2|iv^gbKYRFQQ$EPO>PmiLK?d{_U
z*J9tu`F08^htQ@s7$Yv`@M#G?e8F(~p;dR|%xqELqr{-fhbC|EqRTVK$|v08I3#=3
zb3r6B09~&uo_3O~_F%gnSTw;Mh&}!AY!X8Ja%BwZVBkNfXG%A7HEF0NWD|GBLrf|P
zn(<df`L+hP2#OrvJeUwNuWL+vxE>1$b%7oyD-w4W+Ma5hm$?>uZJWCpBv7t5_vo}H
zbfFE;8LcIoV$$|fk!$2TY~Y1s$viT}`0dT(mW|upX3sureqLk0MQ<51!lz0K4Y@ez
z8khYOQ*3m5?Uc*sjijoCnz90i{6o{6;AwqT@+VaCxnM$yUyB)KQb$z18T|2n$UU`;
zX$GCOP8c>+$Z+SPx`@oVc;UBnZx(Y@fv3-Zpwdqj|1L;&z@(BDKz)=F@^1NxN9^pK
z#P6sKnO<@(?JLlDD!6gK^!Ej;2Fxd69^iHP(bk!#(LXeHW;F5(_odywKM(=Q0Y#?)
zbd49qS+%3%j~-`uy&=n;yr8?{2NqQ)E!LP{85iZ=qvg$2kg3Liph;6+hr>SIK1O*p
z*Efr_K(`#}p|*7R@pSY_Bpxq8#Q>=|^vG^SR$WW*)f?>F$qQHMU?J?l{@2r5`#C$K
zs5o>V16>qh{94po6x-|I#ybW3UY#HnKgDGW2czeru#7ymY9ct7sOcy9uL6c@n9JhQ
z<rU{aRIIw9>I+O2lX4?j{;H+*z?JBf0?lL5QVRG6`eb!KlLNPkZh?Vj`-I2tR#tF}
zoKGL0CjN+56eby4_!8TEPz01&w{X^fpaMA^EqC&)=T5uU8!$i8rFI6Nzyew9pzy66
z{M<(fY>#1E-Zv<wDyV)eZ!leZ1Nt(xL<AR&Xr-HL>bZIiq}JSkrC}9^=*}Wo8IoAW
z?FX0iCOmyP9sGfyj$yrgWKRbvkPgcqtx73$(+_>BaQVF--i3Y3fVS~*($2Q(++IoR
zH@|NtZ_q<@%Vfb(_Qsq2x(yO<9JBLY`B(r3CzkWkj7HqnxMUka2&6>wnZG|5)7Ipz
z^2>Z6pbU(CbUR3VjwOjZyURddfcWTRr2MAFz3n-PyKa1tTu9CSD(QMcu^lO3DuMMn
zYvCJo%G%CK;va7xZw4lDn~$C+>pj!QA-_Cf54+CQIq{$x1HUtaA=_G`%!vG!mK6VB
z8%l>LM95r!=ce`dQS!G;U%KB-pkt0U+Hjp%V{?0Kw$<gFH+a-2<<K(R&MuS5ZH?nc
z+R4$`8+IM05jLe~r4!eT(JSpsF&Ep`WlVhw98nkwK42-oA(IsEBb7vDAbalalYhT!
z6dA498VZ~5{>&bg2r7h<pBeQviXkL{@pq?YU$ICNrW{wM;4K;jz&a$S126KOOf?bo
z_@>fN&{j9R-DRl%uH#Z!M2jjwPc*yhM5zygdCwJWNBvP8$|1cEads4wpaq%}i?q^B
z&sp=?1&cnG7A);(+9QtqDvY*AjL#M<0=<(LM|+TsT!t5KZw+RRd55upHb*{69vFp&
z`fb8-4H$12KE<N_MD7`!0gx>{SY_{o_3DF=9|4sHZ?RY^rwB6nDxdvRp@=1K7V@V<
zpt2iOr|)@SrSbV(I}Ui1BI~c-bH_PF)|?x6L)9TGLE2}Zo4w>A`>G6_Er(&(#{&I6
z(<GGHQx7P7;%P*R4tLrjG8#ClqoN@?S_L8Iu-?ZWJ;-z4B?KZaoIcBcbhDRf8S~7K
zX;GL9w7x>N8+B7gMO2EI%s^7Z;I!RbmTw)>1SA*KMPgTcd2YMd<z@63KiL27;VbP|
zHzAqNTuk#C&m$!M<<EhH2HyQ>I3q`17K_RG-13@39gtfofxe~4l&4(3u<oewp%cWp
zeQ1%fq#tR2XrJ(#Jj=l8)NS6{5`AsT4|9T5MuG@2dH+JJrcCM`dP*<*@CiD0fTy2-
zWaJ%Q@RvnSqEEoF0P*E0T*)Y4=$02giIS@=JALF_-uthTjVozfg2J#%1~@Cfo#g32
z+eU<kuT1hzo>cLe&Sjnb2*4@1FVcOE8rkW7RGpA8!#p0vsUR2@^iQ5}9odMRpOF0t
z)->?s=v+yB6Pf6Y+ZLLUZpH6wr!%wWJPC4}Xkko|!P8PY>$RSg)6B7v<6!jl^-)50
z(0=L0xE(^u2n)HNi#|AwNJl6sZ@Txn@K-5Q#0lD@>vYcij{Neemjn5e;n1|XlczPd
zZ^`Mx-{kwkt>T4n#abg*@|cOLTYI^{YbIQLWT!07sGw1*N#07*)_?&urMZ2-O7dRs
zmXeubPb3yVHfU>DA!7d_zKBfok$iu@=cQn1g<9&?jR_f4C=zuebz*PjU5!Y+`D^#A
zsbt=i_qeI#I<0wy-iLZCDw*3+8SGksI6WliTZN&IE159Jt&ibSxwzx7J@Uyg>$D&{
z^O_1ceLi5BU;^hcgS7-F&zB|!-QhjdH%E}SavAIE8(@WHS`b+xA8Z3cc}LKD_k$r$
z-?u1sDpj*haX3eYoDtcjOo{bGpM{Rx|5qM8aaCFo2*3*O!`$9Ey0VP~B(p}NW37de
ze?zw?>&l6lY)X}K4vm9J%_I;glzsHt6DLp4t=FJL9c|&&o&B=njHp2SYDez*ugt2a
zOo+TdP;>Iqtf)dwQoEopaYN|z89DCPs<TJJQn23)zYmN9k4!N%nzFBNI{ns~G6cob
z?T~r$7H6(XqeW)w8syl*G;4ME8kr!EcVbP62i$(3eW=U!Jxm9C=)dvnvkEW<^jON4
z)P3vUQ&)dBO7t+#BS&u-e{Ho?&>0q}=^5|%hKp3~F?keIcrCK}T-Qf!*rB5~`#4c^
zGg^(1Q=u=GTIw15!HNc}7Cy#5Kas@SS>=Ppvlrz$R1d$lx>z+$-o&V_I<-)}T1+4f
z5v(_+Aqc6?XU<LFX98U}i~)A1p-5f*=Xj&*ykO~03B|P#w5d{xBG>%&Kdt|NLIj<v
zuKcRh8@BJcq|Z2)T`{tZ*|w~AG;gkzKiQO0pkM?!bolycznW7Lw7LA}UTU*x+}<>?
zPcZNAR1;gO_s{!!G|@He)wk9ikb-_#nvPl`jZY0p%oE1JCsJEwXKY5B+Gpn<k2jcr
zo|gZZIXLdR5)sFv7pPe-4FoG3y<8f%rc@aam@5h73<VsI*pr5Ef$;XD$MLPMl(IR#
zpmaO?mG>n#)%)I`*_(tcA>uUzA13VmRUg~w*yv$lN<W`^Q}6K`_RTahQyb7soX;jO
zpOH5T)KXIOy!mVp(FkGi*vjK3!ugswiA%QJeUSmh8ZNXF?MFX}FOxo?oqpo}SZ9nS
zUGA%I`&@ycO>G0mR#mi9bETD4BgJPURoyr2Zw6Kw;!&tA1p-(h9BR&u3-1Ibti;8t
zd3Q7}=Bzw?WhcUQXOmjx%%SiFL`iFhCf22OE*9WEDY&!Ksq3thm!59f*;T&SqsscW
z88hDX2)rsj(4^Wfsm3t@JpP%U7RY5ydc-<)v<ui8{Ef(X#&lTG=9{SH;JAf;*Sz=2
zhwucy4hOP8mMIF#DoL?SL952?7B;XHEPZxCq$(Ikb_m=p-fw(Qg=z(Z^MLZ+a?^nY
zU(7E5jn*W1dR-XX@3$G%2J%x2rF;?Q^B2|0HF%%EAc4fKj;4IiBsDfRNYl;Q(;S=C
zO`OKkEc%?hK*zUZny5VDxHOWsadc_L2SvvlSt`+;FyGcl?h*Q1wf~;N#CVK&%)^~S
zfQ|SH1Vio3&v*1}Xsjj!2Jq#f@H$MV&-z9IH2rVTKZB3<ECtyvDNEBv3OfREisS6V
z^dKKuvuL5W2!|sI;VXXATzg7%3aT&ql!21W8NMsfn(M&t*ac4g+xBl0bG&JOx1NII
zZcy2HQ0A6(!Tzw_JM}I*9f%!zyg5=~a^;ae3r9ZslE@oOYLLJIxI|z%#fys}Y3j)x
z5|S!GF7CO1-yfEs%iiCNxVJ%{vp^L@8PH#Q@_Xx=m~FU)2sMmOslO#Ci^y^5mU1ew
zdDYB_aiwZn?<c<wNg;>^IMCxJe!nT$T5O+IPJX*)GWIKy`?RpK>g{uBm8%r7+GNeI
zUrM&$%HkDO8FP58Nb-m5{!2w}Hl{{iikJDO4^~Gv@fO~K+_7$-#bVft*U5bCXO?u_
zD(1Q(TYZzAbUkVpqy2&@lNAmQJu7i(F#l=o(=f@J_<Ps%9YMUNo#%)LmY06$qWFUP
zFC_hI`fch<cjgZ|D7Y=cUR-W@Nz(*MNzRE?yCG|Et2fwr;E;mZ6UwxE{SQUF&Vt7c
z(Z%iwCEYB%L~h&n+2W!4_wDZi6aVzZ8P?jbOF(y*U49R~yptc^gH)9KB$c(La<RQn
zgEEQl9kGu`(y@ju%qVn<f}lTb^B>oiqm}t0T4xNP+4+ZQI+rpK!&4*{URK{kR8NSI
zL(cGfSf<bA_YyEkpxT6m;KoBOg(dATi?~c1Q3#wSW)|!Eu}JZvIa32x=Cz1IkX5oZ
z;qp5<CZ?g)?<wISR`<1(<!Wmn?Zmet!XQq^R_Z&v6f+X>fGU&S-wvWcEwRq$ei%+Y
zi2lL?qV7<(bEWmYq$9aZWkDbg6XOEG@SM{S0-`Zel(Z)-zfLUj*<O9%9O_DU2FO5S
zUaW=C1R|Ghzj_9mDs6})^iA?j;r;)b6oEK5a+&j(D@4_5U1BBCqq{WCYU^`dp4Rel
z?qXI3Qz_wZJ(1%U-r!4SP5AjwKA-*r*^I<~J}h<kU7gC`==~+^J_xbrb8T7?33|~v
zeth~Yri1&=9sBrk`SyAG;9b?hCq|;uaihrospf4$jMgc+!nH%}oAZJ%v!p%4@n%cR
zkbf@A+6|F-H%7n0sLo0~RL4@mJEP}~(zaF)8x`rIBgoIn-^(J!7awQ?1b6f(`-U&0
zbsd9rzp!|;DOOeMLlm2I@XK;Oww8T)a9{5+5v3jX4A3`Ax||=dltMyxC>p30Q~M%(
z{1*Lp4jaJ&fOtD-2V>xBb$oF+&K%Btiqh#tUc78AsiL-~9{vhMi&S$5ACCITzdRWz
z4qPXHqWyigW?0ocJ@K8wt13#M9kNzFe3*a*sifvLJDRA9&W#Q+CahnXJwI`7NzUPh
zCu;l`vb?r$v4=H!>V0x+=owf$$u`4zNe)<R>9Ir+Vt|MW^i;C1etYf31lX(3lKkBU
zk0#0gkpL?%{7h%<!(M*X0R@vH1SK=GTrUuPs=<nmf=!Qt+pks5oK$D6X<4})TIne!
zt0Ipq{W=-ztB~7TCZG#P$@l5?kQe#%($u#{qGJ9;NRC9?P?GxP72s6Dt&}3@cDH+T
zeQQ)ewJGz%ikw#XwNC|4y&rSNv;@<I#zc{Ib-pl_!7d;qJOwX$$n|+o@KVMts}(=L
zD9CWCu7Nn^biVWVh6(426+B!Q^;6J;ukRGc4zO0gwUK<q76*smfk@%6Tt1OkeG3q=
zxVbl+FDN%9*|3q9!60S&joh5fP1W+gAFBgtt~Sb-<oL0Qsi-kLvbflMVd*aG!#y<q
zhPfJgS=ajJ#{^ub#KX#5*;$8>Mh&!8rLEYD-nqYL4j0J_&*I;{BzUxdIEF$a<%bI|
zU)rx^m*8RBfXEIKXeW&Hu7w?@9}r-7aRJ0h1naOzEtSX0lzSdGnhte`<d(m(rmOT;
zrbyM@;3a!&rL*dL&q>=;-DYxh(;^|2kPwEt>9ZGY^B=#SOZ)wJ)jjtFS@rsqv)lRt
z-&+plS=;cx=IAYIkEkQ_`n%)fd7s2r2`{AFOSESGooB}efoPy8p!dIy0D2py2M_)O
zv2pHMwr&=t*X4L^cv01;=64hZJ)4aR1*dpbSF&Rg4`_Rr52Bdb=HJvbH%loYqV2_A
z>FA+GH^Q@55-RPI0#&v6>ZebikHEOJHa_S)UJ@oCfbjW4C@J-JRo4Mc%a#Gp9<cvO
zd)QmionLFoGYkxU4qU6N(lXy{Wxi>3;=c~_3byW(?mxf#{+fd;&N1UIC`wp^&`B^s
z5x$jG{2Va;-lDgWD@9v;)Q%!)XX|py$S$*~h@aX}WrJ6VAnSUJa^kCJR9ZAm72Zc1
zE`RFanmQ1Gx$f!NM-<FIWc~UJm(OR|{pG+3gO9j8|Lj{M_JRR}oH!eX6P-g8IDVHO
zp*B^VWLoRk*Qg#TI*!hH90K_u(d>CB@9pzu&6U@onCi~A5-D$et=V?r;Z&9+sI=6`
z8|b5?5tmKv_5I2|tANsu>m4uSk<y$R)*pP5lrM=&@E9EGkd3EzcDY$+5``v~ysDAj
zi_$uM>hDXmPEaPbbs54#p9S*aFbohb)2gF}UKf?cRl8cGMRTC~b_QLUr>^~}PBL`X
zBrZ+sL!Zy14~A5|?V3gfNfWtE81F-8L2EU+<(wDL(Yt2Nsdq3n4QmjyaUqL#p(M*=
zjm^^UYa|Q@ovI8$LI0*#{%1MGbV~>7Vz|>7Z*H30)LrLSF7HR@lO|Zh&c4VWj8@<0
z?pSjEjb%6;pXbnJ*jYEP(Sx2=UYmZvYQqI-5}c(CSJvl6|8Pz^Gw1c};m~hXdg;>V
z5qwbzn`-0&j!ISMcuONZYgHcGn&!6I`;6s)d~b&02_GwK$V&3Jm-KO>*l}Sxvbbi*
zXzFzF;o|Maq#DHwLw<Uys>>sZ(hR0|{lyd<q9PG9NyHonA@6kV9;5fUn;_NIX<38b
zQx9|XvKzHE_J)4p+Y+#t<VeA$LA`#lmioc(A9_vOgxA~W=L7x$Pq6U-IdOwLf+ZGD
zqcah9389V#Dw^=*rrzE9nLJ&!m^rpxasB7p1bMFjXTCn-JfzY$f8}0iv-h3&xi4>=
zF0epQ3@(0Q)#hE!v6s!#MZvzED#nn<ohOq2)GRa26~0}SfLq}3f{0zp(df3FiTj0U
zov3yTsq5@aYsSpHD;=wo6}Eln$}YKCI|jQQ1ESV>!ijmKj@%9D2PWNh*F;4D{BS!Q
zqOnN;mHr2EyYt!BCjXO_@JaWEE&!V21X&N%Mm!<?x%!X_Zr113G+DNCK9)&j*0F|p
zYh3KpK(72Mdc$FDvp3)>oS-^SbB-cv_itASDfnDpV!A2#Xpb#Y_a6jsuU0&0#@c&J
z7>Y*HYuV&jq}-Y)S&Vwo-S9g8P&|N+xDg$~X>q_=Ag8eK?)Qgex1_+Yd~5_`9a@TU
z_UE4+?rL^EZl{zN&7vQ2iUg<8cJHrR4!mbWK8plj82Ko_yKIZrE0dVY@UxT%fW4Ro
z1IOyeA>KhRaYCFqi~M{sD910jeFx~aEE<iwX7vU_yb^Gc5C__rR)KW|DSJ_h$El6o
zw^<4|B&Y|vY3$mXDlzbSYf(RJu(9&rsoqn%H_j<0ja+<GWOMBgG;Rd&AApx_(mF!@
zxXi9%@)fCzp?G(U%QkVR^5fE6FGh1jN_q9rTfYjN9Fea0Y+eb6jiE9m18dU<fGSeH
zQX0s{CQk@jIZ_S~AP|CVvY7bbM{Z5h$2dJnHrFT(FJ9PAyHJIvl9AHVBzjSp|22g}
zABDqngj#6VR(QJvUkqqBwl<5Enfi!;(j5&!G<`Jol-Hm4OTjH=VtMCxJ*mi&^5S3r
zdVQSO=;Nl(UnloR8;5=7h|xCu=UqXGO=Syfp5}h3DwY5ZWltuIrhdWjC9m&$)q(k_
z)$1{7qtrwY#r}SzLV1n4QhxZ{Z%7(R4Job(Q0>Z{<9MSHY>)s+F$-L^o<s6!(9!1P
z=WU*{UQ6X={$~>RFxNB{F@f5KpV*c6bg9|Ar57@JkH08zaB7|!o9OC5hbMyvMGZ<L
zBdHfia*)TUZi~;DK1m##!Ar*;gs1?WOo}fExbY?bETy|<b6vLFexPmxJO%8NXa55g
zmrB7*e`Do^GdP%qy#!u8Iz8T=j8yGE7&R#IV6`t}{LM1Y9&L;OhBZf3k~3$S?3b#I
zKy<c=T*N?0->_hS%xIrFH92eFyV{>&Gvw&b0NtStSKqIB9U(vGtri6|GV$AqpuUzA
zh4?@$A85LXp#d&@R&Upj7?CLq7Jq)ttOdouP7xg|`lvRhzj#jXuC&}`l$)@ie9!EB
zTGZjY$;`WPYjPQm>x?RDd;RD-LFQ#LHyurJxdA&Z&_cha9h^*QJgAyc9Lp&*mqK#u
zJ?RQZgAB+sqF7(ekerI=YH=y7-}ePk!e1$0jD2HD$lCI2nu<0dky~PzDduVU(|NvL
zKHffBbja3y=KH){%VVh|w}#n@FDAOtVF|rGoZ6=-JH(Tf=U<nmZ?!ww-N^QXY`UaQ
zgICkqm+dyEXN|7AovU+}$BhD$3@q6WWq|on7MxoB{m|&!$#k*_1^9Xjo&56OejV1!
z=e2(<KP=O+AIthMo;LOo@~A#7xbUH#b?6&gGp4Q-bveXuJ$X_X0$w>}xY-;xi9q5y
zWU9DY<&nuK{C^<BLbS_zW3VF+d7z7a+9mCee9j{ifhVb7bLTN}O<zW@+WUSK+g50&
zW)SK0UjP>kZMdpZdg1e%ZogGQZso_4EJy;Sgt)u#c`+lXa>Cj~iuG11f=|FWtcku>
zz$q!JNrz;b-F2zY(K4VH3}h9dKBEaT_w3n}W54&l$9;8dUv=gb*X&s^`EC0yBa>mQ
zu#z(!H%b=^+LaDN<9-2jIb|Ck@d51Tni64&3lwl#8d;YZL6m%Y|BvN1|F!#{Xi1m>
zW+)?nKn7fJdg&Fnk+o`Qy6rc+Ddz8Qc&+-pTM3%49Drd|!LV)RH#;!&$^1Q*LtSxU
zdh~eUNm*GvW_qsW5SQDLeCc;!bg(e}wBz%=WosYL)pgnNu1g4z<kq?Fz_g)ofnXj<
z5oG*(<0n3`KRdWG(#nx;s2_TuUfv#^-O?-RZ{oxrumLnC%WB4`L%m>dF3IC#TOIpv
z>r3%pFI~LE4BJxGjM6&XD>EvZw(Er67loDE+BvEyq^ptzvov!0E2NmI6*6uaSIY!-
z`5&;BLk9b%u*N~)t&$ruqYkG8e+09nokEK-g*edP$hY#4Z@c0bqVBXtLZU|>4)vXp
z|F*llZu3`cRMt43=Tnv{j<>`LnD-Gi@JR3|4eF<(YX91Tzs`&8!>b3Dq}ywxg#rxz
z=xEd<?{J8D9wE%Hv$cI(F<niD&!nZImVdQOwS=w|oAbZW+fp?09Z)cg0kDm8gz$80
zo7LRNU{CT@2;?a%L>KSNg!q=SY}oFsB(IR=ZFSkh`x^6JuBYR94oVb3SJUIIlg!BF
z)CUIGm%>npXl(C4Ip8Y_*)>wBJC+nl)^iUloLbZ3=i~jWz+oIr{34t7L8o7oWKZSi
z(dkj(K#&C>+NU8;&q@6WwhZ9dJWU?Rr=F0<L{*(Nxdq{*u;uM1ud8lLy^N1q0_@R)
z(Y_(HT)1}cn7aqkyJ}$g>$q8iKEMBBl^n0vavxCd;grJESX?rm2IiMYkaU>Q+dRSo
z?Q~HiX$Ja)$2L>#(FVGfNhI5&Dptj)QT)8yC)<gh4PcbhWutbkdn3pjPJ;JVW-Mqb
z4VY?pmMd3I_kh5{$!fBC3n+3kPx#X84G~9ISLw^J>uy#n`-n#-kYZJhg-BK2@|_i6
zl#e%-E2(<%T_toEuxbN-yrWsB<|i-hmE9Tq1|H*!cY7l2Mqe2ut1dPL&eg|AkjAE>
zr{mxNQ)6WiZX}c5mC)pkt@BghvaOM8hwkw)Bu{jMP?;IVoRbv&Es7_D+h0o@=Exrg
zM#$!%(e(Wvm1>wKkvdEyPMNgr^GqhHM-TjD?A#g6#8|)HbB&tpn92~&F-IR*Dy|Iw
zSyob<D36r73yq&=WK}Ty2uy3Dh|4-qv-;z^NBYGjua`P|E{j#=Zs~(#4mT|h5=l0D
z3l4_7ih3cr?eO`nQ1<<bgL(ly#|kx#TeqyzAORgQ8DwFu;N_fQe1r14ysa!yH}jlA
z>XfAm7S5+tM@K$Qoykpbof1``O5Mmz4ahK?(@fHpiEe$h$Qs)y*)dKx)eMyXe_iTF
z3Jj2m^lPQ8zVtD@)14Zj5lLpzUH2JWA0YpUH8^Hy%BPLfEB<`~e%scFdD!jqEU`?`
z*XAEtd|jy01jZg>#q90U+$LH5y%z($L}%)yYJnXj8*5ht+Iizxd-fmPeKBnO^YzkQ
zig;cJyd4^tr_{o1wa$I9-!;f77K(f-`iXCso9@4#XHlKy7A0A0(t%E&YaI!S$uSjl
zv%oRIK?;-OyiMfsRl0ons(I;rYV)IrQ-`0g%Th#r#wnBX_1Uk42vTHKuIumX#(TJ>
zIi&}`(dL?qGZv)ytqB3J)NluPhW|j)S7hvr;*k7O(Fdx~RJHvNza8D5TU!UH`*MP4
zCA&*eb0umI?FTca>0s_Y5Ya05yv0IYV^i3^^c43=NBFk;5PrX~uFAmTMUKLT4W%tt
zpiL4RtNphJ0vw%y?}{x@{P`X8-f#yebo<c}-tv6eOJ}+NK+0^W4j>!Dbq-g~3#04P
zO>P}s_VR)~D<?85bmo$a;6k)tQSmZMl00mncIx%{5FiWv7O+=IJ0(m<OnRRBYHR(p
z#r$Y+ejyvg;F?l&)2WhAm@WIQhUgY*F2{~ZzKiMh`A&S&fI_&>=E>8o+n!s&Wl8f$
zl&V8G)Y@gM<~Odu%CCX|lpEj5Z(&!@2|Itk?SkY5vVcP(12*zfy?+#cekJ^T>erBk
z)6ovLfeOO;cFDi;CL0-(K}gbN(HtK;KRcLiw*9~?>j^P3tXQBo-|gwGukC)80yBQv
zH@>I+TRJzwRj|{E{8TA9?ZKwy0`YAZBlCe93za@7Q(vEJfnFF}9t2&gN^rG#9Y+z%
zLXN}=ESE8`!DIQ+^d{oTnt%DSZqt{QIJnT^L3+W!u_T=>c<Jqs7YQMrcDAN&deyxt
zgUcBlm7I-wSG8$xw7)L}^_7n~5`_G!eVNu9xWhL|kI#98UcDz3%B%Rj`?44alAQ}s
z8|dCuFIN*Y65`adsoOb4hwY{0Ck<n(sEeu~#`fKlQYOOEy<o-$aN2a@rDaUppQ5LH
z)`66$KiU-_T+@=u%ljgxbac85g4)@4x%+N>|HpFNT^((5z*;1;;6Pk#?!D)0(pYiN
z{er#cH|;@!K3IsXMCU4ShuWjQ16G~iFCCfI?7KkHXISk3fT^+84b9n*w_vXxzg&7r
z9`|iuzv&a=r)z*OK$q2tdRU`nM$*|Wffh_8b8%ymzub2*(Vn0lOSuSs31STkYc5l+
z`6x%9L==hd18bsm8fEN(#d_Hg-!4oJ3ZTrSF$BFc7<=NWl#EUr12XVeg5x!(23ta?
z0^}d)_W1}AQ$sJdtG$J30c><rQvl7lp(UE_7S2;WVP#5llkk&u)wiF|jq}ZH6J>1K
zP-KMG<VpfLU(TgOs-xB)6h!l~dobKhYkk}IeOEARkDEQ8?REH7Y2|qUp?<L2{lspX
zthOMggE$k-F@@jES-KlQ8-NJrRi}hMbu|j2$S^C&xA*mm&LzKL$q-9ke6Jv|+T^uN
zQos0E`fOs3;o8CBvFgeh`*R_WV`!#YDD_3=`Ro4eD`U&ck8SMld9RWuHHsTHiiA|a
z#SD}cV`b&7DK(RQ0YfkELmGI+(Cl-yV$#o)-(|l^)g@0u@|V>jSzsK!f#)#YP%0Ed
zbp&GaZ76NmIX?UP)Te)r-^TgMQR#!%N$T?tmeyAfH$omy9Pi;r7k-SKLhRljTmNEk
zkSr(J-2p@Y!M4IYCL-L{xe!JD;69k)V3hbkL5cV4w6xjQ#7F-QZI>)w)YNJRx2lH0
z4s7}xKrbj@!A@wh)P&OelJ5{#ZOL5?KQ-i+7uEAZ=gDX!+msr%6BBVkgC-8<qbxr*
z2nsO^We!eIkK}b=6r4K^*}Yyn6f?Rb<x#w*YmM=S5~g>ADxPK)UgWXn^UR)sjBJ(9
zD9dvlCXwLhmX}k`zC8KIH7yFu0#S>5W`n?UpKj)rc+a}o48Ud4&EFi|d3(i&EQeW&
zbcVVvgP<Zk@<28lP<T>ougz$gm^G_$I^nF1RI;2ds3vK7)2*C7q32isbX7#O_|fmT
zN2y_?2*c603#sxjG$V3U%TI?Ul){rjuOIC#DiU%+TkL`F6x|2CVM%oKD=3*yS=Q;l
zzK7%I&oo6G$E!d?QKJC)_o3F+vYgt?Uh|}uXif`!gk;{LgY3j_2aq03uSdQYqV==z
zN#jQ*Lc|SfpTmVl0&VW^U62BQ6uYy)OovmnAE%GE`dK=3if~&z)wk<n-MR6-KBj`&
z%lAH-^VCc$Q0Fg<?(o1eF9d&(igk4cL8-JN@bb|R!)w=~!&|(!0adIzy$N^5#&j<N
zRNV8EN*NKaS5~pnqgn~ccRrWdy{YsrsdW(<nfl%D%nr)}C4``KE*b^<UpwD-g&RsA
z7LmDZ{$*N<pTD;wO-Krv{FW#nbwhf1{q5wfAd0XACGF6vH@$c2+D1{N{_VL`#Ol~^
zB)`X1<EYzy#(JvG<7c-=xNGz8>8Gp3{4m@VNLJ$*J*fK=KI+=&m>cKjMAjrig-A)b
zjBoi+D32MYQ2_Brm23y97ORuYlC^)*8z7)>J`M!)b}c9>_dzdRD%m6wOdfsFzVd3I
zp)SU=y0<*yRWZ@oSPyja%u7SQD`S11B!?c3l<W`NQ|>Bkbn#oMJF~KTXwKF&d40Tc
zJ5nEdywK>qMtg#>2k$a4(zNiW9?Z9xmyCjX;a1_ia+(m&BmAb$Mg4PMULv1vv+(ip
zf$8%y*0z3ItD}2#$W5Xk_P{|~>!<rYsnT69a`V2W&HdGU%2S!20iRU3g~|8>7A*Rt
zDM2^XQChR`_m%}OI93>Sw2=Dys-)e{*KbWzxP2h*`o-w$uT@)=N|t;ESP~cu4w?V6
zVp6ek0b}(Kfv0%)=L{ubTY2P99j|syRLZY<8F!x>-#;h0fHeR_xVn&C<<)pbm&lJy
z27M49f0?^t=l1QkC+M)ow=28Nq8sE+bXS+U*VPTt?*m~~S4mQL%_oIx>}#(DO`}Hl
z!ISURBy*FU^O$sLOUoU+rMS{!HqYdFY6+S+NPg_3bIDtzF&cE~cLN8%TcCEOcHv!#
z8kWWBS8O>gqf~z&q^T6YpOl2VLtDcL(6j)K|J6R>CKmtr6E2IqcFNq>pcS3VT^AqP
zOH>8i3X544GNy(-yN<jqhk%GO3|P7lm;z{tVWSN{qF|^R!I!rd(ZqZHTDunHXuql%
zy%qfVBC#f#U=w#c;pvC(@0n)5H_zZfaB7Ofl?2)Df2+*q111bfrP`D5K|5vC_Yb^%
zdL3Xw)*dk0G`F|cEZ40t>>U6(KyiO<2y;o7=;5BW1?PPKfN0Eeda9J-qfKiUk64`s
zL&$*dFoz9R{tQv7Ju&7ZH0kpE7QdJ!lrkD^a#QKT{l(0u{5U*;Nj=0p?e0Iu&|uM-
z<1uV6LRLovbpQa)tlu<vTsdEpp7}&fAG!VqzHHXb9+{Ed%UGT6K&z&W6>0xA(!ga+
z!Y34oysG53A*2$WwRn^PrgDL0y1$1L{qD!skAUf0xKfM+jJiDrA{70qov6q#_<0_W
zYwxA*mzAb=YPquO%5*HZQ@3@__jAWF;aoZu8EKfbasN`^Z(DuR&aUbY_)Wg+9#I7T
z278;;<a&x~tH8lyRfTagR&4fV1`u{Vo5mqGEa$sP9xT)8@81b}zk}9LN0z93jn>?B
zA$23<T5>MuBlS_=-YWH4;jN!7;ItK7`^viYf1r8{HV(m#NXZZbp~hW8a~{>T*Ez%v
z81#NYIP;4S*RsDB&9G!xKVIo~=cC|vZ+bH|IrsSUKgf67n$0dn%o^k?${F-Az@D^X
zb}3Oq==)Ju<kZb?PAewmN7Ah<Tgk#=-GY(A4RW{kh)oL>_rrLKEngnS5(h3Q)`dPN
zYodR>YjbY}rH7UE{1gV3-6eI-PlwY6rd2o`p7X6lt(n}E%W!*q&8Z5BH4z6l^LFcB
z?GdN5)nTRAQ*$4kw=@qc3o^fx$f?^Cw0<}gIdn>6zrdrTElJ29J&LgNZAz*9(?jyp
zQxkfYkn~M|anTY#&qXI3f{Ph+pGx4kyYxt7>moj<<l{KkpvHZLy1O%3tLNgtMKHoC
zktdwlHPvg4?}3mU6h~-J8@G&GpfCNvm8Te)FS@*J=C*W~Jx79993ql*fgbTFfTP;C
zG_+wDNHC2ghSgOYiD!|UQgwCweATFgiJj6P^#k4c@B2l;sm;r05m#avmPL|oEmkqD
z$tjLnv`n*9mQU_hOW$kL9<UhM){ZQbx4kR0w%|p~n;Atm-n1L$j}N@`?si5$&u>47
zhR}bY$2>}zD*X4dUT}crKo>C^>f5vL8dgEIA6Q;2xk4j#9H1OeYu>uC&vi#L`I-p(
z^B(;SHM#20J6w~7HCSK4{Cc^1jcGMsTVWnO)%J{wzCOLIrQ8oH?H;MipB!<cr|q53
zfefwd<7UpP)coTpYYQ-E+zV~lPyPv$$M$a+7`9Ykm#S+vhi{MFJXN+|Q@MK08T~CX
zf*^HJeo(s!Ivf5E)JRMU7uNZ^@hIr)0@)C@X#Bn~y{6tNIcg!wzQ}s_W_NPV=MSIp
zO^s{C``Yep$j2;guTJQSbf&<(=LZa^@*ow_Hl8DoJn4WTeh(*1HGh=Gysu^py8A`g
zhKbP?>(@_R8IaEyL3G)j|6hA}FmWm1*qMVnRvd0YGRdV4*B6w(E)+QT=j#vnrJ<xl
zhL-0-*W25P4oB}MlEs0!V0z;v5nm$qeT3|X;_*Q)y|iMuHxKuG$gfuHpq#A^W1I^~
zjRT!Ss#CtZE-NBOTAGw6ho9t})ju$Lou&;=_EnRhd@3P+ktvH{`^_dVJwe;Nsbs1S
z+N_=$3;bj}`z<Q7^=B#<OhK>1*G?N{TQ%tCYVQXIN6y6m2YQ0p-7DMYx~jie{8T7u
zLR2dT+@SgQW}Q{)t*)K<7_!OZ?O&15f<fV=@$))X7CD*t)Szx<W@|oBUGL$~+bZnS
zQN(-fKUwrXBww(;W{zsfqY_^3mUz+pvFk6s`juc2yx<};;G1|(4P+-X$a4Is!%oM{
z0d3eT85f>&<t7|@7bbJljUMGZ%W!lNPb#;mr4%#loJum_Xi}t~7EP6Egii59P_4>)
z=)Gf&cAXBGJ8b^B2J(xtZ9!d<D~9V(a$Fq5jx63KZ-1OQ+xKeN%6pG)nBMpjwXYPr
zx)|97Mv4T_3yz;&kJ7kmTS0K!^1B>6(+4NR+;@wSaSx)X*)})$R`JQ5MYLO2Z}Zm2
z?$Kbe$9eiy)SQY3*nw>YrP4nNS^SY;Z3ooKpfEHoUnFjPl~o6g^@RZ4HTH$S`isdd
zhdIK?p}_T&3fsCQE(OcjS=$2!EU@@Qs7t#mU0##Sbi4cx4La{WIs~fazH|4vdMySG
zobE@<V#zlBSq<~23&G-nBguHoPBHW@y9Y|jhq20#ppP2bl9I0(uI`oWLSsS1B4-mr
zP}>FhIBS?5BpkhS3a{YHn6!D>V#KtVg~LL0zC@^f$Lm=I(B}t?;Jsn~C#9pdTj@Hu
zH;kTgJ@YK>yDKF5l;PJ=(4OzsPn-~RuDuW$Jd{QV*<9W&n$#D)$nre~LmUA^=}k-=
zEJyCF+?W(*2R)vxWsg*!r-obEsiY0gz+B{IwpE<|aq^ukM~=Ny5AJQ9+YbU`jZwQL
z?^G<A#AJO71QVP2v<~^YuPW#z8#rCX>TxV|rRpIBYKH>L7{1=_?auFErRzXWDMjXc
z2eJqS*aE)-tO4=nom((`8N{sr`Xt8!@J|uZc4A-6vB1sc6ijKpc^%<085Ly3{{`|D
zU|Pn0o~H8wn8m^ErrPA~QfHD`aD%6k%bIty;B5W#S(Vppu*mt-+0G-@3MH~|f~d4@
zd)m@GrO`OVlmTN_;K~qd+$k#L;LejO@JPQoeKfU0#qqa(k#P~`=W+bfi=H6az^|%T
zQ`<|u%!}{1`}V*^KQ$fzY_!!Yj+f-71^%r@VId~{jUjOl(kBdGGWXYkiT!`IZx}X1
zhfUym&c$78v%W!8%21exrnymBG#!XhofppzZU+k)f<9O5y-K2BxR^`^G0*4yDf9&1
zS8lHC5Qzf!qKJ=@8U0P0-jA<GF6xMC*8a+{nv(XBE~iEYU?gKkKw*p^ea4@oeuA-c
zWpD^|Gin@j`mFxnZO<wUT`Sj2GN>H_6b05bq;~PUeKS+)wRm&Gefsgft7YDvuRs^a
zAfO}8LXevzQLO3yqHnk(2RHa=hbPZ*JK8yRj}emr^VOjV&e;vtB_jCpdGAO*M!|Q9
z#(>_`(_UH(;m;-Q5htx>j&3Jz`ty;(B<MumT}n#TmacLHyJJFfkUPcK-a0nSPO+DF
zZJ6}N2m%mKAhTg$cWzL4o|Zl}1l>^EgIZhK!>sLN_4sCqct=4<Q!d-4y#w$4Aqk?k
zI=vrYV?6qK-SL_TE}9qs5^ppqG`^Nf3B*Ruvojn9d5;%U)m{#j_TJJ%n5(nnFA%bJ
zmLdh{wMI0n&0mv-nSo5=^FjjkuE(AgwzVY&@4g70`}^$EyNutt*xqIuC=w)q*gZlS
z6O>YaTaN`SM+8>O*<&senm~Rgy1LSym<rCx!ai87WLkD<2=XLk#ChA*(Mu(K!<W-D
zVt3ohbALuInW{3-eIZzNYI^(K$oZ=8`JN9;n<>@1xvspcdF&2&tey&i$=DABAGB!+
zni;H>vjPPdGMmr7PCJ#n9F?i%@<FDrbxk-Vkg`#J=(YHSl7%hUVhY)Vj5TsIe&&LW
zIho(jy>y5K=Vb1dxOntER!oNkbTgy3D7dZ7dyOtN0isJ-Y*`wXPBXk7eXN=Bly5Jo
z)QTTY(nCxUKiNT?E4pgPe%0UTj$4@gVl)v);WtsUjDl7}_w(6ZEK;x++W!Qf)f>{6
zU0LOS%k-o1ljtX75QMulZefwJ{hN<^OReMPSUtVOAWR|kFY7IYt3?M5Ky~V9UqOAo
zaOV?45SD$7uN_V)Dtvh5MPsG#D|Hob$I#MkvSArYBjc-E7m0I?;z`#cV6aOr={<SE
zbCiaS>s{~Z@@#U}3V_dJPNi<mE|G?n6Xn0&bxdpte@xz7w)tqGAXx>96WKCGK#EtR
zR_!(haQ#b+hX(UV80G6)&>&sO+XXV`_(5l<T4qc=Jl{h`?^`Ha`t#qh!`x08^Ur}S
zO4fg%3D-|wIZn`HTI>fU7{#X{U%FquOv;VN7dygXYQN(`s1J7bQ7H98vo+^{j1CQU
zp)pO5!xcaT7#C!5#v`<vo_}KXGJaLV-j%0AG`FSUDodk3UxywwZP0Hay+XE!H)~av
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

diff --git a/examples/custom-src/frontend/assets/logo.png b/examples/custom-src/frontend/assets/logo.png
deleted file mode 100644
index 812976391384e6063429b22551978538046cd19c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/examples/custom-src/frontend/favicon.ico b/examples/custom-src/frontend/favicon.ico
deleted file mode 100644
index 60f452c054d1f20e09e6134830fa80a90dec97f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1150
zcmah}Ye<t(7(P<JQ*m8>1m+)!km!eWQQD97M~f_57b)t84e|nGO)W9aIk7Oqv<4||
zZG+4(TNj&w!<F*_7B1~3>w=AP<s`hM+g!1y^G-k5+QRqaIp^g)&+~rgJMViw#$xyr
z7svRxiRG<kY#n24GY1dx$Wok7QB5L|uuuR<=1_5Ta=4a3KE;wlxuHH^i{VhX=YD!G
zKhfdP4J8tbGmuo038_YjD_wfbc^5pyA#N0{+2$BVa_N4o$xn-lEf=z3egA^XVGhl~
zeTCP*h^j|TD81K+t51#4*&e_+&<Sm?2@Tz?km*&}T5%Y$1?lMfV5b}k+5?~Idud-Q
zS|AX>L%S7{S{dej9?}SB6``ef$lL26)t$$VYq{8XaUZtVo`k07F3LKt2WKv-<e;++
zv!U^~NUA!BnjQn*O^#z?b_%}Vi+K5U3_1ETY*6mOsg`om2sH}RJKRoqIiE~7(uGt*
zK6V@B=y$#beS@sE8Y$&cS{CX{euPc?enH$(1k;!e@t5`@-B1|h$l7bLO`StN=_B?Z
zB=NyHH;F8Z8dD21sIY1wZZCp!b`m0WCQjd06OFXgSO2xM_FFhGSPOA?8Sa1XN6E8h
z#8+padB8-PN{$ul_r>Fe<@+d#2en9O%*L*!GyFXL!TK%tfWqVVLD5!+SKl0z7xR8E
zdR=dDZrFenvm9&NPC(Rh1naqe#PyLV!Twp+Q}3Jm9CjQxlp|G>3sHR*5^hQ%(jSA!
zm;;gSDAMo9G4kURX~X(AB!^;R+U?a1Jw{<?J$4!jkk%?ko}~fW(JuJ@1os?qe@HKY
o=N5WW=nbJpQSYxWk+GRr#-6WQf+~jpCJ6r;kI|aIBMoW)0`L*>j{pDw

diff --git a/examples/custom-src/frontend/loading.css b/examples/custom-src/frontend/loading.css
deleted file mode 100644
index 9633b127db..0000000000
--- a/examples/custom-src/frontend/loading.css
+++ /dev/null
@@ -1,38 +0,0 @@
-.stratos-initial-load-spinner-container {
-  align-items: center;
-  background-color: #0D2C40;
-  display: flex;
-  justify-content: center;
-  height: 100%;
-  left: 0;
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-
-.stratos-initial-load-spinner-logo {
-  position: absolute;
-  height: 60px;
-}
-
-.stratos-initial-load-spinner {
-  animation: stratos-initial-load-animate 1s infinite linear;
-  box-sizing: border-box;
-  border: 5px solid rgba(86, 107, 121, 0.45);
-  border-radius: 50%;
-  border-top-color: #00B2E2;
-  display: inline-block;
-  height: 128px;
-  margin: 0 auto;
-  width: 128px;
-}
-
-@keyframes stratos-initial-load-animate {
-  0% {
-    transform: rotate(0deg);
-  }
-
-  100% {
-    transform: rotate(359deg);
-  }
-}
diff --git a/examples/custom-src/frontend/loading.html b/examples/custom-src/frontend/loading.html
deleted file mode 100644
index cf66894e7b..0000000000
--- a/examples/custom-src/frontend/loading.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="stratos-initial-load-spinner-container">
-  <i class="stratos-initial-load-spinner"></i>
-</div>
\ No newline at end of file
diff --git a/examples/custom-src/frontend/sass/custom.scss b/examples/custom-src/frontend/sass/custom.scss
deleted file mode 100644
index e3eb84c38a..0000000000
--- a/examples/custom-src/frontend/sass/custom.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-// Custom ACME Theme
-
-// ACME Primary Material Design pallette
-// From http://mcg.mbitson.com/#!?mcgpalette0=%233f51b5
-$acme-primary: (50: #e8eaf6, 100: #c5cbe9, 200: #9fa8da, 300: #7985cb, 400: #5c6bc0, 500: #3f51b5, 600: #394aae, 700: #3140a5, 800: #29379d, 900: #1b278d, A100: #c6cbff, A200: #939dff, A400: #606eff, A700: #4757ff, contrast: (  50: #000000,  100: #000000,  200: #000000,  300: #000000,  400: #ffffff,  500: #ffffff,  600: #ffffff,  700: #ffffff,  800: #ffffff,  900: #ffffff,  A100: #000000,  A200: #000000,  A400: #ffffff,  A700: #ffffff, ));
-$mat-red: ( 50: #ffebee, 100: #ffcdd2, 200: #ef9a9a, 300: #e57373, 400: #ef5350, 500: #f44336, 600: #e53935, 700: #d32f2f, 800: #c62828, 900: #b71c1c, A100: #ff8a80, A200: #ff5252, A400: #ff1744, A700: #d50000, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: white, A400: white, A700: white, ));
-
-// Common
-$acme-theme-primary: mat-palette($acme-primary);
-$acme-theme-warn: mat-palette($mat-red);
-
-// Dark Theme
-$stratos-dark-theme: mat-dark-theme($acme-theme-primary, $acme-theme-primary, $acme-theme-warn);
-
-// Default Theme
-$stratos-theme: mat-light-theme($acme-theme-primary, $acme-theme-primary, $acme-theme-warn);
-
-@import 'custom/acme';
diff --git a/examples/custom-src/frontend/sass/custom/acme-colors.scss b/examples/custom-src/frontend/sass/custom/acme-colors.scss
deleted file mode 100644
index 878c2cda32..0000000000
--- a/examples/custom-src/frontend/sass/custom/acme-colors.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-$acme-primary: #00c081;
-$acme-secondary: #00243e;
-$acme-text: #fff;
-$acme-text-gray: #ccc;
-$acme-button-gray: #888;
-$acme-dark-blue: #06253a;
-$acme-blue: #073155;
diff --git a/examples/custom-src/frontend/sass/custom/acme.scss b/examples/custom-src/frontend/sass/custom/acme.scss
deleted file mode 100644
index 75794ebb6e..0000000000
--- a/examples/custom-src/frontend/sass/custom/acme.scss
+++ /dev/null
@@ -1,71 +0,0 @@
-// Style overrides
-// Acme Brand primary colour
-$acme-primary-color: #035a97;
-
-// Secondary blue colour
-$acme-secondary: #035a97;
-$acme-text: #fff;
-$acme-text-gray: #ccc;
-$acme-dark-blue: #06253a;
-$acme-blue: #073155;
-$acme-side-nav: $acme-secondary;
-$acme-side-nav-active: #003358;
-
-body.stratos {
-  app-page-subheader {
-    .page-subheader {
-      background-color: #fff;
-      color: #333;
-    }
-  }
-
-  .page-header__divider {
-    color: #333;
-  }
-
-  .page-header__menu-button-icon {
-    background-color: $acme-primary-color;
-    color: $acme-text;
-  }
-
-  .mat-tab-nav-bar.mat-primary.mat-background-primary {
-    .mat-tab-links {
-      background-color: #fff;
-      color: #333;
-    }
-    .mat-tab-link {
-      color: #333;
-    }
-    .mat-ink-bar {
-      background-color: $acme-primary-color;
-    }
-  }
-
-  .stratos-title__logo {
-    width: 160px;
-  }
-
-  .page-header .mat-toolbar.mat-primary {
-    background-color: #fff;
-    color: #333;
-  }
-
-  // Use Acme Blue Side Navigation
-  .side-nav,
-  .side-nav__top,
-  .side-nav__item--active:hover {
-    background-color: $acme-side-nav;
-  }
-  .side-nav__item--active,
-  .side-nav__item:hover {
-    background-color: $acme-side-nav-active;
-  }
-  .side-nav__bottom {
-    color: $acme-text-gray;
-  }
-
-  // Show the text Stratos beneath the Acme logo
-  .stratos-title > .stratos-title__header {
-    display: inline-block;
-  }
-}
diff --git a/examples/custom-src/stratos.yaml b/examples/custom-src/stratos.yaml
deleted file mode 100644
index d891b8a09c..0000000000
--- a/examples/custom-src/stratos.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-# Change the page title of the Stratos App
-title: "ACME Stratos"
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index eec8e18f4e..348215c0d1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2512,9 +2512,9 @@
           }
         },
         "@babel/helper-validator-identifier": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
+          "version": "7.10.3",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.3.tgz",
+          "integrity": "sha512-bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw==",
           "dev": true
         },
         "@babel/types": {
@@ -4060,8 +4060,7 @@
     "arr-diff": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
     },
     "arr-filter": {
       "version": "1.1.2",
@@ -4075,8 +4074,7 @@
     "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==",
-      "dev": true
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
     },
     "arr-map": {
       "version": "2.0.2",
@@ -4090,8 +4088,7 @@
     "arr-union": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
     },
     "array-each": {
       "version": "1.0.1",
@@ -4183,8 +4180,7 @@
     "array-unique": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-      "dev": true
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
     },
     "arraybuffer.slice": {
       "version": "0.0.7",
@@ -4268,8 +4264,7 @@
     "assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "dev": true
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
     },
     "ast-types-flow": {
       "version": "0.0.7",
@@ -4340,8 +4335,7 @@
     "atob": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
     },
     "autoprefixer": {
       "version": "9.7.4",
@@ -4532,7 +4526,6 @@
       "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",
@@ -4547,7 +4540,6 @@
           "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"
           }
@@ -4556,7 +4548,6 @@
           "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"
           }
@@ -4565,7 +4556,6 @@
           "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"
           }
@@ -4574,7 +4564,6 @@
           "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",
@@ -5191,7 +5180,6 @@
       "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",
@@ -5460,7 +5448,6 @@
       "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",
@@ -5472,7 +5459,6 @@
           "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"
           }
@@ -5697,7 +5683,6 @@
       "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"
@@ -5786,8 +5771,7 @@
     "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==",
-      "dev": true
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
     },
     "component-inherit": {
       "version": "0.0.3",
@@ -5957,8 +5941,7 @@
     "copy-descriptor": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-      "dev": true
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
     },
     "copy-props": {
       "version": "2.0.4",
@@ -6121,8 +6104,7 @@
     "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
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cosmiconfig": {
       "version": "5.2.1",
@@ -6705,7 +6687,6 @@
       "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"
       }
@@ -6724,8 +6705,7 @@
     "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=",
-      "dev": true
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
     },
     "decompress-response": {
       "version": "3.3.0",
@@ -6853,7 +6833,6 @@
       "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"
@@ -6863,7 +6842,6 @@
           "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"
           }
@@ -6872,7 +6850,6 @@
           "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"
           }
@@ -6881,7 +6858,6 @@
           "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",
@@ -7947,7 +7923,6 @@
       "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",
@@ -7962,7 +7937,6 @@
           "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"
           }
@@ -7971,7 +7945,6 @@
           "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"
           }
@@ -8049,7 +8022,6 @@
       "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"
@@ -8059,7 +8031,6 @@
           "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"
           }
@@ -8081,7 +8052,6 @@
       "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",
@@ -8097,7 +8067,6 @@
           "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"
           }
@@ -8106,7 +8075,6 @@
           "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"
           }
@@ -8115,7 +8083,6 @@
           "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"
           }
@@ -8124,7 +8091,6 @@
           "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"
           }
@@ -8133,7 +8099,6 @@
           "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",
@@ -8601,8 +8566,7 @@
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
     },
     "for-own": {
       "version": "1.0.0",
@@ -8693,7 +8657,6 @@
       "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"
       }
@@ -8782,6 +8745,32 @@
           "requires": {
             "yallist": "^4.0.0"
           }
+        },
+        "normalize-path": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+          "requires": {
+            "remove-trailing-separator": "^1.0.1"
+          }
+        },
+        "readdirp": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+          "requires": {
+            "graceful-fs": "^4.1.11",
+            "micromatch": "^3.1.10",
+            "readable-stream": "^2.0.2"
+          }
+        },
+        "to-regex-range": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+          "requires": {
+            "repeat-string": "^1.6.1"
+          }
         }
       }
     },
@@ -8878,8 +8867,7 @@
     "get-value": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-      "dev": true
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
     },
     "getpass": {
       "version": "0.1.7",
@@ -9247,8 +9235,7 @@
     "graceful-fs": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-      "dev": true
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
     },
     "graphlib": {
       "version": "2.1.8",
@@ -9522,7 +9509,6 @@
       "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",
@@ -9533,7 +9519,6 @@
       "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"
@@ -9543,7 +9528,6 @@
           "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"
           },
@@ -9552,7 +9536,6 @@
               "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"
               }
@@ -9563,7 +9546,6 @@
           "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"
           }
@@ -9987,8 +9969,7 @@
     "inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "ini": {
       "version": "1.3.5",
@@ -10175,7 +10156,6 @@
       "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"
       },
@@ -10184,7 +10164,6 @@
           "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"
           }
@@ -10221,8 +10200,7 @@
     "is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
     },
     "is-callable": {
       "version": "1.1.4",
@@ -10257,7 +10235,6 @@
       "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"
       },
@@ -10266,7 +10243,6 @@
           "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"
           }
@@ -10283,7 +10259,6 @@
       "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",
@@ -10293,8 +10268,7 @@
         "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==",
-          "dev": true
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
         }
       }
     },
@@ -10313,8 +10287,7 @@
     "is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
     },
     "is-extglob": {
       "version": "2.1.1",
@@ -10439,7 +10412,6 @@
       "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"
       }
@@ -10556,8 +10528,7 @@
     "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==",
-      "dev": true
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
     },
     "is-wsl": {
       "version": "2.2.0",
@@ -10577,8 +10548,7 @@
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
     },
     "isbinaryfile": {
       "version": "4.0.6",
@@ -10594,8 +10564,7 @@
     "isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
     },
     "isstream": {
       "version": "0.1.2",
@@ -11449,6 +11418,11 @@
           "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=="
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -11475,6 +11449,11 @@
             "ansi-regex": "^5.0.0"
           }
         },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
+        },
         "to-regex-range": {
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -11728,8 +11707,7 @@
     "kind-of": {
       "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
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
     },
     "klaw-sync": {
       "version": "2.1.0",
@@ -12236,8 +12214,7 @@
     "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-      "dev": true
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
     },
     "map-stream": {
       "version": "0.1.0",
@@ -12249,7 +12226,6 @@
       "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"
       }
@@ -12509,7 +12485,6 @@
       "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",
@@ -12530,7 +12505,6 @@
           "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",
@@ -12548,7 +12522,6 @@
               "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"
               }
@@ -12559,7 +12532,6 @@
           "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",
@@ -12571,7 +12543,6 @@
               "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"
               }
@@ -12582,7 +12553,6 @@
           "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"
           },
@@ -12591,7 +12561,6 @@
               "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"
               }
@@ -12602,7 +12571,6 @@
           "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"
@@ -12864,7 +12832,6 @@
       "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"
@@ -12874,7 +12841,6 @@
           "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"
           }
@@ -12934,8 +12900,7 @@
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
     "multicast-dns": {
       "version": "6.2.3",
@@ -12980,7 +12945,6 @@
       "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",
@@ -14019,7 +13983,6 @@
       "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",
@@ -14030,7 +13993,6 @@
           "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"
           }
@@ -14039,7 +14001,6 @@
           "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"
           }
@@ -14153,7 +14114,6 @@
       "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"
       }
@@ -14287,7 +14247,6 @@
       "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"
       }
@@ -14980,8 +14939,7 @@
     "pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-      "dev": true
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
     },
     "path-browserify": {
       "version": "0.0.1",
@@ -15236,8 +15194,7 @@
     "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=",
-      "dev": true
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
     },
     "postcss": {
       "version": "7.0.27",
@@ -15951,8 +15908,7 @@
     "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==",
-      "dev": true
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
     },
     "process-on-spawn": {
       "version": "1.0.0",
@@ -16552,7 +16508,6 @@
       "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",
@@ -16653,7 +16608,6 @@
       "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"
@@ -16838,20 +16792,17 @@
     "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=",
-      "dev": true
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
     },
     "repeat-element": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
-      "dev": true
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="
     },
     "repeat-string": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
     },
     "replace-ext": {
       "version": "1.0.0",
@@ -17220,8 +17171,7 @@
     "resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "dev": true
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
     },
     "responselike": {
       "version": "1.0.2",
@@ -17245,8 +17195,7 @@
     "ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
     },
     "retry": {
       "version": "0.12.0",
@@ -17578,14 +17527,12 @@
     "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==",
-      "dev": true
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "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"
       }
@@ -17971,7 +17918,6 @@
       "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",
@@ -17983,7 +17929,6 @@
           "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"
           }
@@ -18084,7 +18029,6 @@
       "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",
@@ -18100,7 +18044,6 @@
           "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"
           }
@@ -18109,7 +18052,6 @@
           "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"
           }
@@ -18120,7 +18062,6 @@
       "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",
@@ -18131,7 +18072,6 @@
           "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"
           }
@@ -18140,7 +18080,6 @@
           "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"
           }
@@ -18149,7 +18088,6 @@
           "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"
           }
@@ -18158,7 +18096,6 @@
           "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",
@@ -18171,7 +18108,6 @@
       "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"
       },
@@ -18180,7 +18116,6 @@
           "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"
           }
@@ -18436,7 +18371,6 @@
       "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",
@@ -18466,8 +18400,7 @@
     "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=",
-      "dev": true
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
     },
     "sourcemap-codec": {
       "version": "1.4.8",
@@ -18655,7 +18588,6 @@
       "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"
       }
@@ -18733,7 +18665,6 @@
       "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"
@@ -18743,7 +18674,6 @@
           "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"
           }
@@ -19152,7 +19082,6 @@
       "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"
       }
@@ -19860,7 +19789,6 @@
       "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"
       },
@@ -19869,7 +19797,6 @@
           "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"
           }
@@ -19886,7 +19813,6 @@
       "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",
@@ -20180,7 +20106,6 @@
       "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",
@@ -20287,7 +20212,6 @@
       "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"
@@ -20297,7 +20221,6 @@
           "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",
@@ -20308,7 +20231,6 @@
               "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"
               }
@@ -20318,8 +20240,7 @@
         "has-values": {
           "version": "0.1.4",
           "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-          "dev": true
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
         }
       }
     },
@@ -20413,8 +20334,7 @@
     "urix": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "dev": true
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
     },
     "url": {
       "version": "0.11.0",
@@ -20470,8 +20390,7 @@
     "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
     },
     "user-home": {
       "version": "2.0.0",
@@ -20502,8 +20421,7 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "util-promisify": {
       "version": "2.1.0",
diff --git a/src/frontend/packages/core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component.ts b/src/frontend/packages/core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component.ts
index fc0663320a..a093ea3d6d 100644
--- a/src/frontend/packages/core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component.ts
+++ b/src/frontend/packages/core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component.ts
@@ -14,7 +14,7 @@ export enum AppMonitorComponentTypes {
   FETCHING = 'MONITOR_FETCHING',
 }
 
-export interface IApplicationMonitorComponentState {
+export interface IActionMonitorComponentState {
   busy: boolean;
   error: boolean;
   completed: boolean;
@@ -23,7 +23,7 @@ export interface IApplicationMonitorComponentState {
 
 export class ActionMonitorComponentState {
 
-  public currentState: Observable<IApplicationMonitorComponentState>;
+  public currentState: Observable<IActionMonitorComponentState>;
 
   constructor(
     private entityMonitorFactory: EntityMonitorFactory,
@@ -37,7 +37,7 @@ export class ActionMonitorComponentState {
   }
 
   private getStateObservable(entityMonitor: EntityMonitor, monitorState: AppMonitorComponentTypes)
-  : Observable<IApplicationMonitorComponentState> {
+    : Observable<IActionMonitorComponentState> {
     switch (monitorState) {
       case AppMonitorComponentTypes.DELETE:
         return this.getDeletingState(entityMonitor);
@@ -50,7 +50,7 @@ export class ActionMonitorComponentState {
     }
   }
 
-  private getDeletingState(entityMonitor: EntityMonitor): Observable<IApplicationMonitorComponentState> {
+  private getDeletingState(entityMonitor: EntityMonitor): Observable<IActionMonitorComponentState> {
     return entityMonitor.entityRequest$.pipe(
       map(requestState => ({
         busy: requestState.deleting.busy,
@@ -61,7 +61,7 @@ export class ActionMonitorComponentState {
     );
   }
 
-  private getFetchingState(entityMonitor: EntityMonitor): Observable<IApplicationMonitorComponentState> {
+  private getFetchingState(entityMonitor: EntityMonitor): Observable<IActionMonitorComponentState> {
     const completed$ = this.getHasCompletedObservable(
       entityMonitor.entityRequest$.pipe(
         map(requestState => requestState.fetching),
@@ -82,7 +82,7 @@ export class ActionMonitorComponentState {
 
   private fetchUpdatingState = (requestState: RequestInfoState): ActionState =>
     (requestState.updating[this.updateKey] || { busy: false, error: false, message: '' })
-  private getUpdatingState(entityMonitor: EntityMonitor): Observable<IApplicationMonitorComponentState> {
+  private getUpdatingState(entityMonitor: EntityMonitor): Observable<IActionMonitorComponentState> {
 
 
     const completed$ = this.getHasCompletedObservable(
@@ -125,7 +125,7 @@ export class AppActionMonitorIconComponent implements OnInit {
 
   // State observable - use this instead of creating one
   @Input()
-  public state: Observable<IApplicationMonitorComponentState>;
+  public state: Observable<IActionMonitorComponentState>;
 
   @Input()
   public entityKey: string;
@@ -143,7 +143,7 @@ export class AppActionMonitorIconComponent implements OnInit {
   public updateKey = rootUpdatingKey;
 
   @Output()
-  public currentState: Observable<IApplicationMonitorComponentState>;
+  public currentState: Observable<IActionMonitorComponentState>;
 
   constructor(private entityMonitorFactory: EntityMonitorFactory) { }
 
@@ -151,14 +151,14 @@ export class AppActionMonitorIconComponent implements OnInit {
     if (this.state) {
       this.currentState = this.state;
     } else {
-    const state: ActionMonitorComponentState = new ActionMonitorComponentState(
-      this.entityMonitorFactory,
-      this.id,
-      this.schema,
-      this.monitorState,
-      this.updateKey
-    );
-    this.currentState = state.currentState;
+      const state: ActionMonitorComponentState = new ActionMonitorComponentState(
+        this.entityMonitorFactory,
+        this.id,
+        this.schema,
+        this.monitorState,
+        this.updateKey
+      );
+      this.currentState = state.currentState;
     }
   }
 }
diff --git a/src/frontend/packages/store/src/jetstream.ts b/src/frontend/packages/store/src/jetstream.ts
index 12477fabba..fb8cb84451 100644
--- a/src/frontend/packages/store/src/jetstream.ts
+++ b/src/frontend/packages/store/src/jetstream.ts
@@ -67,7 +67,7 @@ export function hasJetStreamError(pages: Partial<JetStreamErrorResponse>[]): Jet
   }) as JetStreamErrorResponse;
 }
 
-function isJetstreamError(err: any): JetStreamErrorResponse {
+export function isJetstreamError(err: any): JetStreamErrorResponse {
   return !!(
     err &&
     err.error &&
diff --git a/src/frontend/packages/suse-extensions/package.json b/src/frontend/packages/suse-extensions/package.json
new file mode 100644
index 0000000000..c7ba7878a7
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "@suse/extensions",
+  "version": "0.0.1",
+  "peerDependencies": {
+    "@angular/common": "^6.0.0-rc.0 || ^6.0.0",
+    "@angular/core": "^6.0.0-rc.0 || ^6.0.0"
+  },
+  "stratos": {
+    "module": "SuseModule",
+    "routingModule": "SuseRoutingModule"
+  }
+}
diff --git a/custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.html b/src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.html
rename to src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.html
diff --git a/custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.scss b/src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.scss
diff --git a/custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.spec.ts
diff --git a/custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.ts b/src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.ts
similarity index 89%
rename from custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.ts
index 85f2fdbf50..044d47f2c4 100644
--- a/custom-src/frontend/app/custom/demo/demo-helper/demo-helper.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.ts
@@ -3,8 +3,8 @@ import { Component } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { map } from 'rxjs/operators';
 
+import { StratosAction, StratosActionType } from '../../../../../core/src/core/extension/extension-service';
 import { AppState } from '../../../../../store/src/app-state';
-import { StratosAction, StratosActionType } from '../../../core/extension/extension-service';
 
 
 @StratosAction({
diff --git a/custom-src/frontend/app/custom/helm/chart-view/monocular.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/chart-view/monocular.component.html
rename to src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.html
diff --git a/custom-src/frontend/app/custom/helm/chart-view/monocular.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/chart-view/monocular.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.scss
diff --git a/custom-src/frontend/app/custom/helm/chart-view/monocular.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.ts
similarity index 93%
rename from custom-src/frontend/app/custom/helm/chart-view/monocular.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.ts
index 85b081676a..fb74ce9981 100644
--- a/custom-src/frontend/app/custom/helm/chart-view/monocular.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.ts
@@ -1,5 +1,5 @@
-import { ActivatedRoute, Router } from '@angular/router';
 import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 
 @Component({
   selector: 'app-monocular',
diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/create-release/create-release.component.html
rename to src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.html
diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/create-release/create-release.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.scss
diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/create-release/create-release.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.ts
similarity index 94%
rename from custom-src/frontend/app/custom/helm/create-release/create-release.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.ts
index 45793d2149..d830c232f6 100644
--- a/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.ts
@@ -6,12 +6,12 @@ import { ActivatedRoute } from '@angular/router';
 import { BehaviorSubject, combineLatest, Observable, of, Subscription } from 'rxjs';
 import { distinctUntilChanged, filter, first, map, pairwise, startWith, switchMap } from 'rxjs/operators';
 
+import { EndpointsService } from '../../../../../core/src/core/endpoints.service';
+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 { StepOnNextFunction, StepOnNextResult } from '../../../../../core/src/shared/components/stepper/step/step.component';
 import { RequestInfoState } from '../../../../../store/src/reducers/api-request-reducer/types';
-import { EndpointsService } from '../../../core/endpoints.service';
-import { safeUnsubscribe } from '../../../core/utils.service';
-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';
 import { kubeEntityCatalog } from '../../kubernetes/kubernetes-entity-catalog';
 import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes/kubernetes-entity-factory';
 import { KubernetesNamespace } from '../../kubernetes/store/kube.types';
diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.module.ts b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.module.ts
similarity index 69%
rename from custom-src/frontend/app/custom/helm/create-release/create-release.module.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.module.ts
index 336c219ae3..924e790d1e 100644
--- a/custom-src/frontend/app/custom/helm/create-release/create-release.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.module.ts
@@ -1,8 +1,8 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 
-import { CoreModule } from '../../../core/core.module';
-import { SharedModule } from '../../../shared/shared.module';
+import { CoreModule } from '../../../../../core/src/core/core.module';
+import { SharedModule } from '../../../../../core/src/shared/shared.module';
 import { CreateReleaseComponent } from './create-release.component';
 
 
diff --git a/custom-src/frontend/app/custom/helm/helm-entity-catalog.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-catalog.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/helm-entity-catalog.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-catalog.ts
diff --git a/custom-src/frontend/app/custom/helm/helm-entity-factory.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-factory.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/helm-entity-factory.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-factory.ts
diff --git a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-generator.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/helm-entity-generator.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-generator.ts
diff --git a/custom-src/frontend/app/custom/helm/helm-testing.module.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm-testing.module.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/helm-testing.module.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/helm-testing.module.ts
diff --git a/custom-src/frontend/app/custom/helm/helm.module.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm.module.ts
similarity index 95%
rename from custom-src/frontend/app/custom/helm/helm.module.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/helm.module.ts
index 4a375945ae..d03d15582b 100644
--- a/custom-src/frontend/app/custom/helm/helm.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/helm.module.ts
@@ -1,8 +1,8 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 
-import { CoreModule } from '../../core/core.module';
-import { SharedModule } from '../../shared/shared.module';
+import { CoreModule } from '../../../../core/src/core/core.module';
+import { SharedModule } from '../../../../core/src/shared/shared.module';
 import { MonocularChartViewComponent } from './chart-view/monocular.component';
 import { CreateReleaseModule } from './create-release/create-release.module';
 import { HelmRoutingModule } from './helm.routing';
diff --git a/custom-src/frontend/app/custom/helm/helm.routing.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm.routing.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/helm.routing.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/helm.routing.ts
diff --git a/custom-src/frontend/app/custom/helm/helm.setup.module.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm.setup.module.ts
similarity index 79%
rename from custom-src/frontend/app/custom/helm/helm.setup.module.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/helm.setup.module.ts
index b116eee7ce..3070b56567 100644
--- a/custom-src/frontend/app/custom/helm/helm.setup.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/helm.setup.module.ts
@@ -2,13 +2,13 @@ import { CommonModule } from '@angular/common';
 import { NgModule, Optional, SkipSelf } from '@angular/core';
 import { Store } from '@ngrx/store';
 
+import { CoreModule } from '../../../../core/src/core/core.module';
+import { EndpointsService } from '../../../../core/src/core/endpoints.service';
+import { SharedModule } from '../../../../core/src/shared/shared.module';
 import { GetSystemInfo } from '../../../../store/src/actions/system.actions';
 import { AppState } from '../../../../store/src/app-state';
 import { EntityCatalogModule } from '../../../../store/src/entity-catalog.module';
-import { EndpointHealthCheck } from '../../../endpoints-health-checks';
-import { CoreModule } from '../../core/core.module';
-import { EndpointsService } from '../../core/endpoints.service';
-import { SharedModule } from '../../shared/shared.module';
+import { EndpointHealthCheck } from '../../../../store/src/entity-catalog/entity-catalog.types';
 import { HELM_ENDPOINT_TYPE } from './helm-entity-factory';
 import { generateHelmEntities } from './helm-entity-generator';
 import { HelmStoreModule } from './helm.store.module';
diff --git a/custom-src/frontend/app/custom/helm/helm.store.module.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm.store.module.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/helm.store.module.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/helm.store.module.ts
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.html
rename to src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.html
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.scss
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.ts
similarity index 82%
rename from custom-src/frontend/app/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.ts
index 3d0b2e9903..06aa2fa3cb 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 
-import { CardCell } from '../../../../shared/components/list/list.types';
+import { CardCell } from '../../../../../../core/src/shared/components/list/list.types';
 import { MonocularChart } from '../../store/helm.types';
 
 @Component({
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-data-source.ts
similarity index 81%
rename from custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-data-source.ts
index afefeae64e..45e3929eed 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-data-source.ts
@@ -1,9 +1,9 @@
 import { Store } from '@ngrx/store';
 
-import { PaginationEntityState } from '../../../../../store/src//types/pagination.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 { AppState } from '../../../../../store/src/app-state';
-import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
-import { IListConfig } from '../../../shared/components/list/list.component.types';
+import { PaginationEntityState } from '../../../../../store/src/types/pagination.types';
 import { helmEntityCatalog } from '../helm-entity-catalog';
 import { MonocularChart } from '../store/helm.types';
 
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-list-config.service.ts
similarity index 90%
rename from custom-src/frontend/app/custom/helm/list-types/monocular-charts-list-config.service.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-list-config.service.ts
index 551fff9625..5585990f79 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-list-config.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-list-config.service.ts
@@ -4,11 +4,15 @@ import { Store } from '@ngrx/store';
 import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
+import { EndpointsService } from '../../../../../core/src/core/endpoints.service';
+import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types';
+import {
+  IListConfig,
+  IListMultiFilterConfig,
+  ListViewTypes,
+} from '../../../../../core/src/shared/components/list/list.component.types';
 import { ListView } from '../../../../../store/src/actions/list.actions';
 import { AppState } from '../../../../../store/src/app-state';
-import { EndpointsService } from '../../../core/endpoints.service';
-import { ITableColumn } from '../../../shared/components/list/list-table/table.types';
-import { IListConfig, IListMultiFilterConfig, ListViewTypes } from '../../../shared/components/list/list.component.types';
 import { defaultHelmKubeListPageSize } from '../../kubernetes/list-types/kube-helm-list-types';
 import { MonocularChart } from '../store/helm.types';
 import { MonocularChartCardComponent } from './monocular-chart-card/monocular-chart-card.component';
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-repository-list-config.service.ts
similarity index 81%
rename from custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-config.service.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-repository-list-config.service.ts
index c2ff5464a6..879403cb41 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-config.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-repository-list-config.service.ts
@@ -5,31 +5,34 @@ 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';
-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';
 import { pairwise } from 'rxjs/operators';
 
+import { CurrentUserPermissionsService } from '../../../../../core/src/core/permissions/current-user-permissions.service';
+import { StratosCurrentUserPermissions } from '../../../../../core/src/core/permissions/stratos-user-permissions.checker';
+import { environment } from '../../../../../core/src/environments/environment';
+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 {
+  EndpointCardComponent,
+} from '../../../../../core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component';
+import {
+  TableCellEndpointStatusComponent,
+} from '../../../../../core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component';
+import {
+  IListAction,
+  IListConfig,
+  ListViewTypes,
+} from '../../../../../core/src/shared/components/list/list.component.types';
 import { AppState } from '../../../../../store/src/app-state';
+import { getFullEndpointApiUrl } from '../../../../../store/src/endpoint-utils';
+import { endpointEntityType, STRATOS_ENDPOINT_TYPE } from '../../../../../store/src/helpers/stratos-entity-factory';
 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 { STRATOS_ENDPOINT_TYPE } from '../../../base-entity-schemas';
-import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
-import { StratosCurrentUserPermissions } from '../../../core/permissions/stratos-user-permissions.checker';
-import { environment } from '../../../environments/environment';
-import { getFullEndpointApiUrl } from '../../../features/endpoints/endpoint-helpers';
-import { ConfirmationDialogConfig } from '../../../shared/components/confirmation-dialog.config';
-import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service';
-import { ITableColumn } from '../../../shared/components/list/list-table/table.types';
-import {
-  EndpointCardComponent,
-} from '../../../shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component';
-import {
-  TableCellEndpointStatusComponent,
-} from '../../../shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component';
-import { IListAction, IListConfig, ListViewTypes } from '../../../shared/components/list/list.component.types';
 import { defaultHelmKubeListPageSize } from '../../kubernetes/list-types/kube-helm-list-types';
 import { MonocularRepositoryDataSource } from './monocular-repository-list-source';
 
@@ -84,7 +87,7 @@ export class MonocularRepositoryListConfig implements IListConfig<EndpointModel>
     },
   ];
 
-  private endpointEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointSchemaKey);
+  private endpointEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointEntityType);
 
   private listActionSyncRepository: IListAction<EndpointModel> = {
     action: (item: EndpointModel) => {
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-source.ts b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-repository-list-source.ts
similarity index 84%
rename from custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-source.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-repository-list-source.ts
index 59148b3d79..fec0503321 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-source.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-repository-list-source.ts
@@ -2,19 +2,19 @@ import { NgZone } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { interval, Observable, of as observableOf, Subscription } from 'rxjs';
 
+import { safeUnsubscribe } from '../../../../../core/src/core/utils.service';
+import { RowState } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
+import {
+  BaseEndpointsDataSource,
+  syncPaginationSection,
+} from '../../../../../core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source';
+import { IListConfig } from '../../../../../core/src/shared/components/list/list.component.types';
 import { GetAllEndpoints } from '../../../../../store/src/actions/endpoint.actions';
 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 { safeUnsubscribe } from '../../../core/utils.service';
-import { RowState } from '../../../shared/components/list/data-sources-controllers/list-data-source-types';
-import {
-  BaseEndpointsDataSource,
-  syncPaginationSection,
-} from '../../../shared/components/list/list-types/endpoint/base-endpoints-data-source';
-import { IListConfig } from '../../../shared/components/list/list.component.types';
 import { HELM_ENDPOINT_TYPE } from '../helm-entity-factory';
 
 export class MonocularRepositoryDataSource extends BaseEndpointsDataSource {
diff --git a/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.html
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.html
diff --git a/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.scss
diff --git a/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular-tab-base/monocular-tab-base.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/app.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/app.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/app.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/app.component.scss
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.html
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.html
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.scss
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.html
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.html
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.scss
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.scss
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts
similarity index 94%
rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts
index c8c3aa91cf..d6c91d4a44 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts
@@ -3,7 +3,7 @@ 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';
+import { EndpointsService } from '../../../../../../../core/src/core/endpoints.service';
 import { Chart } from '../../shared/models/chart';
 
 @Component({
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.html
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.html
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.scss
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.html
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.html
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.scss
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-index/chart-index.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.html
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-index/chart-index.component.html
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-index/chart-index.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-index/chart-index.component.scss
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-index/chart-index.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-index/chart-index.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-index/chart-index.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-index/chart-index.component.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.html
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.html
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.scss
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-list/chart-list.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.html
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-list/chart-list.component.html
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-list/chart-list.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-list/chart-list.component.scss
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-list/chart-list.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-list/chart-list.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-list/chart-list.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-list/chart-list.component.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/charts/charts.component.html
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.html
diff --git a/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/charts/charts.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.scss
diff --git a/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/charts/charts.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/charts/charts.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.html
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.html
diff --git a/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.scss
diff --git a/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.html
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.html
diff --git a/custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.scss
diff --git a/custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/loader/loader.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/loader/loader.component.html
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.html
diff --git a/custom-src/frontend/app/custom/helm/monocular/loader/loader.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/loader/loader.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.scss
diff --git a/custom-src/frontend/app/custom/helm/monocular/loader/loader.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/loader/loader.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/loader/loader.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/loader/loader.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/panel/panel.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/panel/panel.component.html
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.html
diff --git a/custom-src/frontend/app/custom/helm/monocular/panel/panel.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/panel/panel.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.scss
diff --git a/custom-src/frontend/app/custom/helm/monocular/panel/panel.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/panel/panel.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/panel/panel.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/panel/panel.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/models/chart-version.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/chart-version.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/shared/models/chart-version.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/chart-version.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/models/chart.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/chart.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/shared/models/chart.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/chart.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/models/maintainer.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/maintainer.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/shared/models/maintainer.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/maintainer.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/models/repo.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/repo.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/shared/models/repo.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/repo.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/seo.data.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/seo.data.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/shared/seo.data.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/seo.data.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/services/chart.service.mock.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/chart.service.mock.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/shared/services/chart.service.mock.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/chart.service.mock.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/services/charts.service.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts
similarity index 98%
rename from custom-src/frontend/app/custom/helm/monocular/shared/services/charts.service.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts
index 28f5045b73..c56a82df08 100644
--- a/custom-src/frontend/app/custom/helm/monocular/shared/services/charts.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts
@@ -1,12 +1,12 @@
+import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable, throwError } from 'rxjs';
 import { catchError, map, tap } from 'rxjs/operators';
 
-import { LoggerService } from '../../../../../core/logger.service';
+import { LoggerService } from '../../../../../../../core/src/core/logger.service';
 import { Chart } from '../models/chart';
 import { ChartVersion } from '../models/chart-version';
 import { ConfigService } from './config.service';
-import { HttpClient } from '@angular/common/http';
 
 
 
diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/services/config.service.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/config.service.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/shared/services/config.service.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/config.service.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/services/menu.service.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/menu.service.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/monocular/shared/services/menu.service.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/menu.service.ts
diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/services/repos.service.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/repos.service.ts
similarity index 93%
rename from custom-src/frontend/app/custom/helm/monocular/shared/services/repos.service.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/repos.service.ts
index 05c62d4942..9ac9582e7e 100644
--- a/custom-src/frontend/app/custom/helm/monocular/shared/services/repos.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/repos.service.ts
@@ -1,11 +1,11 @@
+import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable, throwError } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 
-import { LoggerService } from '../../../../../core/logger.service';
+import { LoggerService } from '../../../../../../../core/src/core/logger.service';
 import { RepoAttributes } from '../models/repo';
 import { ConfigService } from './config.service';
-import { HttpClient } from '@angular/common/http';
 
 
 
diff --git a/custom-src/frontend/app/custom/helm/store/helm.action-builders.ts b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.action-builders.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/store/helm.action-builders.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/store/helm.action-builders.ts
diff --git a/custom-src/frontend/app/custom/helm/store/helm.actions.ts b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.actions.ts
similarity index 96%
rename from custom-src/frontend/app/custom/helm/store/helm.actions.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/store/helm.actions.ts
index d0c0db844e..c47e8e47f3 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.actions.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.actions.ts
@@ -1,3 +1,4 @@
+import { PaginatedAction } from '../../../../../store/src/types/pagination.types';
 import { EntityRequestAction } from '../../../../../store/src/types/request.types';
 import {
   HELM_ENDPOINT_TYPE,
@@ -5,7 +6,6 @@ import {
   helmVersionsEntityType,
   monocularChartsEntityType,
 } from '../helm-entity-factory';
-import { PaginatedAction } from './../../../../../store/src/types/pagination.types';
 import { HelmInstallValues } from './helm.types';
 
 export const GET_MONOCULAR_CHARTS = '[Monocular] Get Charts';
diff --git a/custom-src/frontend/app/custom/helm/store/helm.effects.ts b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
similarity index 98%
rename from custom-src/frontend/app/custom/helm/store/helm.effects.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
index 5ec555ade5..b938cd119b 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
@@ -5,10 +5,12 @@ import { Action, Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { catchError, flatMap, mergeMap } from 'rxjs/operators';
 
+import { environment } from '../../../../../core/src/environments/environment';
 import { GET_ENDPOINTS_SUCCESS, GetAllEndpointsSuccess } from '../../../../../store/src/actions/endpoint.actions';
 import { ClearPaginationOfType } from '../../../../../store/src/actions/pagination.actions';
 import { AppState } from '../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
+import { isJetstreamError } from '../../../../../store/src/jetstream';
 import { ApiRequestTypes } from '../../../../../store/src/reducers/api-request-reducer/request-helpers';
 import { NormalizedResponse } from '../../../../../store/src/types/api.types';
 import {
@@ -17,8 +19,6 @@ import {
   WrapperRequestActionFailed,
   WrapperRequestActionSuccess,
 } from '../../../../../store/src/types/request.types';
-import { environment } from '../../../environments/environment';
-import { isJetstreamError } from '../../../jetstream.helpers';
 import { helmEntityCatalog } from '../helm-entity-catalog';
 import { getHelmVersionId, getMonocularChartId, HELM_ENDPOINT_TYPE } from '../helm-entity-factory';
 import {
diff --git a/custom-src/frontend/app/custom/helm/store/helm.types.ts b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.types.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/store/helm.types.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/store/helm.types.ts
diff --git a/custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.html
rename to src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.html
diff --git a/custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.scss
diff --git a/custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.ts
similarity index 60%
rename from custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.ts
index 8df3ae4dad..4628d67ca9 100644
--- a/custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 
-import { ListConfig } from '../../../../shared/components/list/list.component.types';
-import { MonocularChartsListConfig } from './../../list-types/monocular-charts-list-config.service';
+import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
+import { MonocularChartsListConfig } from '../../list-types/monocular-charts-list-config.service';
 
 @Component({
   selector: 'app-catalog-tab',
diff --git a/custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.html
rename to src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.html
diff --git a/custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.scss
diff --git a/custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.spec.ts
diff --git a/custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.ts
similarity index 80%
rename from custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.ts
index 620c2e36a9..cea4439854 100644
--- a/custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
-import { ListConfig } from '../../../../shared/components/list/list.component.types';
+
+import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
 import { MonocularRepositoryListConfig } from '../../list-types/monocular-repository-list-config.service';
 
 @Component({
diff --git a/custom-src/frontend/app/custom/helm/theme.scss b/src/frontend/packages/suse-extensions/src/custom/helm/theme.scss
similarity index 100%
rename from custom-src/frontend/app/custom/helm/theme.scss
rename to src/frontend/packages/suse-extensions/src/custom/helm/theme.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.ts
similarity index 71%
rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.ts
index 1291fb9240..2c67e0049c 100644
--- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.ts
@@ -1,7 +1,9 @@
-import { Component, OnInit, Input } from '@angular/core';
-import { IAuthForm } from '../../../../core/extension/extension-types';
+import { Component, Input } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 
+import { IAuthForm } from '../../../../../../store/src/extension-types';
+
+
 @Component({
   selector: 'app-kubernetes-aws-auth-form',
   templateUrl: './kubernetes-aws-auth-form.component.html',
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts
similarity index 96%
rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts
index 5c0b9042b5..889f8b5a7d 100644
--- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts
@@ -1,7 +1,9 @@
 import { Component, Input } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 
-import { EndpointAuthValues, IEndpointAuthComponent } from '../../../../core/extension/extension-types';
+import { EndpointAuthValues, IEndpointAuthComponent } from '../../../../../../store/src/extension-types';
+
+
 
 @Component({
   selector: 'app-kubernetes-certs-auth-form',
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.ts
similarity index 76%
rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.ts
index f79f554af0..424f0ce2ee 100644
--- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.ts
@@ -1,7 +1,9 @@
-import { EndpointAuthValues, IEndpointAuthComponent } from './../../../../core/extension/extension-types';
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 
+import { EndpointAuthValues, IEndpointAuthComponent } from '../../../../../../store/src/extension-types';
+
+
 @Component({
   selector: 'app-kubernetes-config-auth-form',
   templateUrl: './kubernetes-config-auth-form.component.html',
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.ts
similarity index 83%
rename from custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.ts
index afaeffe204..ef2c74b0ed 100644
--- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.ts
@@ -1,7 +1,9 @@
-import { EndpointAuthValues, IEndpointAuthComponent } from './../../../../core/extension/extension-types';
 import { Component, Input } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 
+import { EndpointAuthValues, IEndpointAuthComponent } from '../../../../../../store/src/extension-types';
+
+
 @Component({
   selector: 'app-kubernetes-gke-auth-form',
   templateUrl: './kubernetes-gke-auth-form.component.html',
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-auth.helper.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-auth.helper.ts
similarity index 91%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-auth.helper.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-auth.helper.ts
index 4f2c119a4c..a179142f57 100644
--- a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-auth.helper.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-auth.helper.ts
@@ -1,11 +1,11 @@
 import { ComponentFactoryResolver, Injector } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
 
+import { ConnectEndpointData } from '../../../../../core/src/features/endpoints/connect.service';
+import { RowState } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
-import { ConnectEndpointData } from '../../../features/endpoints/connect.service';
-import { RowState } from '../../../shared/components/list/data-sources-controllers/list-data-source-types';
+import { EndpointAuthTypeConfig, IAuthForm } from '../../../../../store/src/extension-types';
 import { KUBERNETES_ENDPOINT_TYPE } from '../kubernetes-entity-factory';
-import { EndpointAuthTypeConfig, IAuthForm } from './../../../core/extension/extension-types';
 import { KubeConfigFileCluster, KubeConfigFileUser } from './kube-config.types';
 
 /**
@@ -49,8 +49,8 @@ export class KubeConfigAuthHelper {
   // Try and parse the authentication metadata
   public parseAuth(cluster: KubeConfigFileCluster, user: KubeConfigFileUser): RowState {
 
-    // Default subtype is generic Kubernetes
-    cluster._subType = '';
+    // Default subtype is generic Kubernetes ('') or previously determined/selected sub type
+    cluster._subType = cluster._subType || '';
 
     // Certificate authentication first
 
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts
similarity index 80%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts
index e5e95dffd5..5717a7da2e 100644
--- a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts
@@ -4,30 +4,28 @@ import { Store } from '@ngrx/store';
 import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'rxjs';
 import { distinctUntilChanged, filter, first, map, pairwise, startWith, withLatestFrom } from 'rxjs/operators';
 
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
-import { safeUnsubscribe } from '../../../../core/utils.service';
-import { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
-import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes-entity-factory';
-import { KubeConfigAuthHelper } from '../kube-config-auth.helper';
-import { KubeConfigFileCluster, KubeConfigImportAction, KubeImportState } from '../kube-config.types';
-import { RegisterEndpoint } from './../../../../../../store/src/actions/endpoint.actions';
-import { AppState } from './../../../../../../store/src/app-state';
-import { EndpointsEffect } from './../../../../../../store/src/effects/endpoint.effects';
-import { endpointSchemaKey } from './../../../../../../store/src/helpers/entity-factory';
-import { ActionState } from './../../../../../../store/src/reducers/api-request-reducer/types';
-import { selectUpdateInfo } from './../../../../../../store/src/selectors/api.selectors';
-import { STRATOS_ENDPOINT_TYPE } from './../../../../base-entity-schemas';
-import { EndpointsService } from './../../../../core/endpoints.service';
+import { EndpointsService } from '../../../../../../core/src/core/endpoints.service';
+import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
 import {
   ConnectEndpointConfig,
   ConnectEndpointData,
   ConnectEndpointService,
-} from './../../../../features/endpoints/connect.service';
+} from '../../../../../../core/src/features/endpoints/connect.service';
+import {
+  IActionMonitorComponentState,
+} from '../../../../../../core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component';
 import {
   ITableListDataSource,
   RowState,
-} from './../../../../shared/components/list/data-sources-controllers/list-data-source-types';
-import { StepOnNextFunction } from './../../../../shared/components/stepper/step/step.component';
+} from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
+import { ITableColumn } from '../../../../../../core/src/shared/components/list/list-table/table.types';
+import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
+import { AppState } from '../../../../../../store/src/app-state';
+import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types';
+import { stratosEntityCatalog } from '../../../../../../store/src/stratos-entity-catalog';
+import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes-entity-factory';
+import { KubeConfigAuthHelper } from '../kube-config-auth.helper';
+import { KubeConfigFileCluster, KubeConfigImportAction, KubeImportState } from '../kube-config.types';
 import {
   KubeConfigTableImportStatusComponent,
 } from './kube-config-table-import-status/kube-config-table-import-status.component';
@@ -87,7 +85,6 @@ export class KubeConfigImportComponent implements OnDestroy {
   applyStarted: boolean;
   private iteration = 0;
 
-  private endpointEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointSchemaKey);
   private connectService: ConnectEndpointService;
 
   constructor(
@@ -121,7 +118,12 @@ export class KubeConfigImportComponent implements OnDestroy {
   }
 
   private doRegister(reg: KubeConfigImportAction, next: KubeConfigImportAction[]) {
-    const obs$ = this.registerEndpoint(reg.cluster.name, reg.cluster.cluster.server, reg.cluster.cluster['insecure-skip-tls-verify']);
+    const obs$ = this.registerEndpoint(
+      reg.cluster.name,
+      reg.cluster.cluster.server,
+      reg.cluster.cluster['insecure-skip-tls-verify'],
+      reg.cluster._subType
+    );
     const mainObs$ = this.getUpdatingState(obs$).pipe(
       startWith({ busy: true, error: false, completed: false })
     );
@@ -169,7 +171,7 @@ export class KubeConfigImportComponent implements OnDestroy {
 
       this.subs.push(connect.actionState.pipe(filter(status => status.completed), first()).subscribe(status => {
         if (status.error) {
-          connect.state.next({ message: status.errorMessage || status.message, error: true });
+          connect.state.next({ message: status.message, error: true });
         }
         this.processAction(next);
       }));
@@ -185,21 +187,27 @@ export class KubeConfigImportComponent implements OnDestroy {
   }
 
   // Register the endpoint
-  private registerEndpoint(name: string, url: string, skipSslValidation: boolean) {
-    const action = new RegisterEndpoint(KUBERNETES_ENDPOINT_TYPE, null, name, url, skipSslValidation, '', '', false);
-    this.store.dispatch(action);
-    const update$ = this.store.select(
-      selectUpdateInfo(this.endpointEntityKey, action.guid(), EndpointsEffect.registeringKey)
-    ).pipe(filter(update => !!update));
-    return update$;
+  private registerEndpoint(name: string, url: string, skipSslValidation: boolean, subType: string) {
+    return stratosEntityCatalog.endpoint.api.register<ActionState>(
+      KUBERNETES_ENDPOINT_TYPE,
+      subType,
+      name,
+      url,
+      skipSslValidation,
+      '',
+      '',
+      false
+    ).pipe(
+      filter(update => !!update)
+    );
   }
 
   // Connect to an endpoint
-  private connectEndpoint(action: KubeConfigImportAction, pData: ConnectEndpointData) {
+  private connectEndpoint(action: KubeConfigImportAction, pData: ConnectEndpointData): Observable<IActionMonitorComponentState> {
     const config: ConnectEndpointConfig = {
       name: action.cluster.name,
       guid: action.depends.cluster._guid || action.cluster._guid,
-      type: null,
+      type: KUBERNETES_ENDPOINT_TYPE,
       subType: action.user._authData.subType,
       ssoAllowed: false
     };
@@ -207,10 +215,22 @@ export class KubeConfigImportComponent implements OnDestroy {
     if (this.connectService) {
       this.connectService.destroy();
     }
-    this.connectService = new ConnectEndpointService(this.store, this.endpointsService, config);
+    this.connectService = new ConnectEndpointService(this.endpointsService, config);
     this.connectService.setData(pData);
-    this.connectService.submit();
-    return this.connectService.getConnectingObservable();
+    return this.connectService.submit().pipe(
+      map(updateSection => ({
+        busy: false,
+        error: !updateSection.success,
+        completed: true,
+        message: updateSection.errorMessage
+      })),
+      startWith({
+        message: '',
+        busy: true,
+        completed: false,
+        error: false
+      })
+    );
   }
 
   // Enter the step - process the list of clusters to import
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.ts
similarity index 65%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.ts
index 08bd785052..ee59c019f8 100644
--- a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.ts
@@ -1,7 +1,10 @@
 import { Component, Input } from '@angular/core';
 import { Observable } from 'rxjs';
 
-import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import {
+  IActionMonitorComponentState,
+} from '../../../../../../../core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component';
+import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
 import { KubeConfigFileCluster } from '../../kube-config.types';
 
 @Component({
@@ -11,7 +14,7 @@ import { KubeConfigFileCluster } from '../../kube-config.types';
 })
 export class KubeConfigTableImportStatusComponent extends TableCellCustom<KubeConfigFileCluster> {
 
-  public state: Observable<any>;
+  public state: Observable<IActionMonitorComponentState>;
 
   constructor() {
     super();
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-registration.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-registration.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-registration.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-registration.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-registration.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-registration.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-registration.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-registration.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-registration.component.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts
similarity index 90%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts
index 4a89f59baf..de5d80f1c7 100644
--- a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts
@@ -3,18 +3,18 @@ import { Store } from '@ngrx/store';
 import { BehaviorSubject, combineLatest, Observable, of as observableOf, of } from 'rxjs';
 import { first, map, switchMap } from 'rxjs/operators';
 
-import { HideSnackBar, ShowSnackBar } from '../../../../../../store/src/actions/snackBar.actions';
-import { AppState } from '../../../../../../store/src/app-state';
+import {
+  ITableListDataSource,
+  RowState,
+} from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
 import {
   TableHeaderSelectComponent,
-} from '../../../../shared/components/list/list-table/table-header-select/table-header-select.component';
+} from '../../../../../../core/src/shared/components/list/list-table/table-header-select/table-header-select.component';
+import { ITableColumn } from '../../../../../../core/src/shared/components/list/list-table/table.types';
+import { SnackBarService } from '../../../../../../core/src/shared/services/snackbar.service';
+import { AppState } from '../../../../../../store/src/app-state';
 import { KubeConfigHelper } from '../kube-config.helper';
 import { KubeConfigFileCluster } from '../kube-config.types';
-import {
-  ITableListDataSource,
-  RowState,
-} from './../../../../shared/components/list/data-sources-controllers/list-data-source-types';
-import { ITableColumn } from './../../../../shared/components/list/list-table/table.types';
 import { KubeConfigTableCertComponent } from './kube-config-table-cert/kube-config-table-cert.component';
 import { KubeConfigTableName } from './kube-config-table-name/kube-config-table-name.component';
 import { KubeConfigTableSelectComponent } from './kube-config-table-select/kube-config-table-select.component';
@@ -132,7 +132,8 @@ export class KubeConfigSelectionComponent {
 
   constructor(
     private store: Store<AppState>,
-    public helper: KubeConfigHelper
+    public helper: KubeConfigHelper,
+    private snackbarService: SnackBarService
   ) {
     this.helper.clustersChanged = () => this.clustersChanged()
   }
@@ -147,10 +148,10 @@ export class KubeConfigSelectionComponent {
   )
 
   clustersParse(cluster: string) {
-    this.store.dispatch(new HideSnackBar());
+    this.snackbarService.hide();
     this.helper.parse(cluster).pipe(first()).subscribe(errorString => {
       if (errorString) {
-        this.store.dispatch(new ShowSnackBar(`Failed to load Kube Config: ${errorString}`, 'Close'))
+        this.snackbarService.show(`Failed to load Kube Config: ${errorString}`, 'Close')
       }
     })
   }
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.ts
similarity index 95%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.ts
index c776a3d0bf..c7deb2270d 100644
--- a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.ts
@@ -3,7 +3,7 @@ import { Component, Input } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 import { timeout } from 'rxjs/operators';
 
-import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
 import { KubeConfigHelper } from '../../kube-config.helper';
 import { KubeConfigFileCluster } from '../../kube-config.types';
 
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts
similarity index 78%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts
index 576f4c19f2..2b5420071c 100644
--- a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 
-import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
 import { KubeConfigFileCluster } from '../../kube-config.types';
 
 @Component({
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.ts
similarity index 85%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.ts
index b13745ed48..60f93a1ad9 100644
--- a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 
-import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
 import { KubeConfigHelper } from '../../kube-config.helper';
 import { KubeConfigFileCluster } from '../../kube-config.types';
 
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.ts
similarity index 88%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.ts
index f39471a321..3b174fb27a 100644
--- a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
 import { KubeConfigHelper } from '../../kube-config.helper';
 import { KubeConfigFileCluster } from '../../kube-config.types';
 
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config.helper.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.helper.ts
similarity index 94%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config.helper.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.helper.ts
index 645505ea91..8a9e474340 100644
--- a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config.helper.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.helper.ts
@@ -3,11 +3,11 @@ import * as yaml from 'js-yaml';
 import { BehaviorSubject, combineLatest, Observable, of } from 'rxjs';
 import { filter, first, map, tap } from 'rxjs/operators';
 
+import { EndpointsService } from '../../../../../core/src/core/endpoints.service';
+import { createGuid } from '../../../../../core/src/core/utils.service';
+import { RowState } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
+import { getFullEndpointApiUrl } from '../../../../../store/src/endpoint-utils';
 import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
-import { EndpointsService } from '../../../core/endpoints.service';
-import { createGuid } from '../../../core/utils.service';
-import { getFullEndpointApiUrl } from '../../../features/endpoints/endpoint-helpers';
-import { RowState } from '../../../shared/components/list/data-sources-controllers/list-data-source-types';
 import { KubeConfigAuthHelper } from './kube-config-auth.helper';
 import { KubeConfigFile, KubeConfigFileCluster } from './kube-config.types';
 
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config.types.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.types.ts
similarity index 82%
rename from custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config.types.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.types.ts
index f2d8b7abde..49bd4dbbf3 100644
--- a/custom-src/frontend/app/custom/kubernetes/kube-config-registration/kube-config.types.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.types.ts
@@ -1,7 +1,10 @@
 import { Observable, Subject } from 'rxjs';
 
-import { EndpointAuthTypeConfig } from '../../../core/extension/extension-types';
-import { RowState } from '../../../shared/components/list/data-sources-controllers/list-data-source-types';
+import {
+  IActionMonitorComponentState,
+} from '../../../../../core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component';
+import { RowState } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
+import { EndpointAuthTypeConfig } from '../../../../../store/src/extension-types';
 import { ActionStatus } from './../../../../../store/src/reducers/api-request-reducer/types';
 
 // Types for a Kubernetes Configuration file
@@ -75,8 +78,8 @@ export interface KubeConfigImportAction {
   user?: KubeConfigFileUser;
   status?: ActionStatus;
   state: Subject<RowState>;
-  actionState$?: Observable<any>;
-  actionState: Subject<any>;
+  actionState$?: Observable<IActionMonitorComponentState>;
+  actionState: Subject<IActionMonitorComponentState>;
   depends?: KubeConfigImportAction;
 }
 
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.ts
similarity index 88%
rename from custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.ts
index 643fd02271..cb14bef481 100644
--- a/custom-src/frontend/app/custom/kubernetes/kube-terminal/kube-console.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.ts
@@ -1,13 +1,13 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { NEVER, Observable, Subject, Subscription } from 'rxjs';
+import { NEVER, Observable, Subject } from 'rxjs';
 import websocketConnect, { normalClosureMessage } from 'rxjs-websockets';
-import { catchError, tap, switchMap, map } from 'rxjs/operators';
+import { catchError, map, switchMap, tap } from 'rxjs/operators';
 
-import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types';
-import { SshViewerComponent } from '../../../shared/components/ssh-viewer/ssh-viewer.component';
-import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
+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 { BaseKubeGuid } from '../kubernetes-page.types';
+import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
 import { KubernetesService } from '../services/kubernetes.service';
 
 
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts
similarity index 95%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts
index d7ec27b338..5a0d0a1a0a 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts
@@ -5,13 +5,13 @@ import { ActivatedRoute } from '@angular/router';
 import { BehaviorSubject, Observable, Subscription } from 'rxjs';
 import { distinctUntilChanged, filter, map } from 'rxjs/operators';
 
-import { ConfirmationDialogConfig } from '../../../../shared/components/confirmation-dialog.config';
-import { ConfirmationDialogService } from '../../../../shared/components/confirmation-dialog.service';
+import { ConfirmationDialogConfig } from '../../../../../../core/src/shared/components/confirmation-dialog.config';
+import { ConfirmationDialogService } from '../../../../../../core/src/shared/components/confirmation-dialog.service';
+import { IHeaderBreadcrumb } from '../../../../../../core/src/shared/components/page-header/page-header.types';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
 import { KubernetesService } from '../../services/kubernetes.service';
 import { KubeDashboardStatus } from '../../store/kubernetes.effects';
-import { IHeaderBreadcrumb } from './../../../../shared/components/page-header/page-header.types';
 
 type MessageUpdater = (msg: string) => void;
 
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
similarity index 95%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
index 9a2451b237..0655cfae02 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
@@ -4,11 +4,13 @@ import { ActivatedRoute } from '@angular/router';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types';
+import {
+  EndpointMissingMessageParts,
+} from '../../../../../core/src/shared/components/endpoints-missing/endpoints-missing.component';
+import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
 import { BaseKubeGuid } from '../kubernetes-page.types';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
 import { KubernetesService } from '../services/kubernetes.service';
-import { EndpointMissingMessageParts } from '../../../shared/components/endpoints-missing/endpoints-missing.component';
 
 @Component({
   selector: 'app-kubernetes-dashboard',
@@ -100,7 +102,7 @@ export class KubernetesDashboardTabComponent implements OnInit {
       hasLoaded = true;
       this.errorMsg$.next({
         firstLine: errMsg,
-        secondLine: { text: ''}
+        secondLine: { text: '' }
       });
       this.hasError$.next(true);
     }
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-catalog.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-catalog.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-factory.ts
similarity index 97%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-factory.ts
index a30402dfaa..1fed3c1b20 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-factory.ts
@@ -2,7 +2,7 @@ import { Schema, schema } from 'normalizr';
 
 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 { metricEntityType } from '../../../../store/src/helpers/stratos-entity-factory';
 import {
   getGuidFromKubeDashboardObj,
   getGuidFromKubeDeploymentObj,
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts
similarity index 98%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts
index 15e0ea101b..4dad2ba7e2 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts
@@ -9,9 +9,9 @@ import {
   IStratosEntityDefinition,
   StratosEndpointExtensionDefinition,
 } from '../../../../store/src/entity-catalog/entity-catalog.types';
+import { EndpointAuthTypeConfig, EndpointType } from '../../../../store/src/extension-types';
+import { metricEntityType } from '../../../../store/src/helpers/stratos-entity-factory';
 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 {
   KubernetesCertsAuthFormComponent,
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-metrics.helpers.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-metrics.helpers.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-metrics.helpers.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-metrics.helpers.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.ts
similarity index 76%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.ts
index aa5c59a608..812ad3aaa1 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 
-import { ListConfig } from '../../../../shared/components/list/list.component.types';
+import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
 import {
   KubernetesNamespacePodsListConfigService,
 } from '../../list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service';
@@ -14,4 +14,4 @@ import {
     useClass: KubernetesNamespacePodsListConfigService,
   }]
 })
-export class KubernetesNamespacePodsComponent {}
+export class KubernetesNamespacePodsComponent { }
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.ts
similarity index 84%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.ts
index 09a772cfd7..f8a81aa887 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 
-import { ListConfig } from '../../../../shared/components/list/list.component.types';
+import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
 import {
   KubernetesNamespaceServicesListConfig,
 } from '../../list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service';
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts
similarity index 93%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts
index ebe43a1a09..7a878dd6e7 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts
@@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types';
+import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
 import { BaseKubeGuid } from '../kubernetes-page.types';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
 import { KubernetesNamespaceService } from '../services/kubernetes-namespace.service';
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.ts
similarity index 84%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.ts
index 5e5f3aab43..bfc3ada39c 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.ts
@@ -1,6 +1,7 @@
-import { Component, Input, OnInit, OnDestroy } from '@angular/core';
-import { Observable, of as observableOf, Subscription, observable } from 'rxjs';
-import { KubernetesNodeService, KubeNodeMetric } from '../../../services/kubernetes-node.service';
+import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { Observable, Subscription } from 'rxjs';
+
+import { KubeNodeMetric, KubernetesNodeService } from '../../../services/kubernetes-node.service';
 import { MetricStatistic } from '../../../store/kube.types';
 
 @Component({
@@ -27,7 +28,7 @@ export class KubernetesNodeMetricStatsCardComponent implements OnInit, OnDestroy
   subscriptions: Subscription[] = [];
   constructor(
     public kubeNodeService: KubernetesNodeService
-  ) {}
+  ) { }
 
   ngOnInit() {
     const maxMetric = this.kubeNodeService.setupMetricObservable(this.metric, MetricStatistic.MAXIMUM);
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.ts
similarity index 83%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.ts
index e48a279224..9be744ec76 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.ts
@@ -1,10 +1,12 @@
 import { Component, Input, OnInit } from '@angular/core';
 
-import { MetricsConfig } from '../../../../../shared/components/metrics-chart/metrics-chart.component';
-import { MetricsLineChartConfig } from '../../../../../shared/components/metrics-chart/metrics-chart.types';
+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 {
+  MetricsChartHelpers,
+} from '../../../../../../../core/src/shared/components/metrics-chart/metrics.component.helpers';
 import { IMetricMatrixResult } from '../../../../../../../store/src/types/base-metric.types';
 import { IMetricApplication } from '../../../../../../../store/src/types/metric.types';
-import { MetricsChartHelpers } from '../../../../../shared/components/metrics-chart/metrics.component.helpers';
 import { FetchKubernetesMetricsAction } from '../../../store/kubernetes.actions';
 
 @Component({
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts
similarity index 81%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts
index 592b5e6a32..f91208e9c1 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts
@@ -1,12 +1,16 @@
 import { Component, OnInit } from '@angular/core';
-import { KubernetesNodeService, KubeNodeMetric } from '../../services/kubernetes-node.service';
-import { MetricsLineChartConfig } from '../../../../shared/components/metrics-chart/metrics-chart.types';
-import { MetricsConfig } from '../../../../shared/components/metrics-chart/metrics-chart.component';
-import { IMetricMatrixResult, ChartSeries } from '../../../../../../store/src/types/base-metric.types';
+
+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 {
+  ChartDataTypes,
+  getMetricsChartConfigBuilder,
+} from '../../../../../../core/src/shared/components/metrics-chart/metrics.component.helpers';
+import { ChartSeries, IMetricMatrixResult } from '../../../../../../store/src/types/base-metric.types';
 import { IMetricApplication } from '../../../../../../store/src/types/metric.types';
+import { formatAxisCPUTime, formatCPUTime } from '../../kubernetes-metrics.helpers';
+import { KubeNodeMetric, KubernetesNodeService } from '../../services/kubernetes-node.service';
 import { FetchKubernetesChartMetricsAction } from '../../store/kubernetes.actions';
-import { ChartDataTypes, getMetricsChartConfigBuilder } from '../../../../shared/components/metrics-chart/metrics.component.helpers';
-import { formatCPUTime, formatAxisCPUTime } from '../../kubernetes-metrics.helpers';
 
 @Component({
   selector: 'app-kubernetes-node-metrics',
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts
new file mode 100644
index 0000000000..92d3de996c
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+
+import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
+import {
+  KubernetesNodePodsListConfigService,
+} from '../../list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service';
+
+@Component({
+  selector: 'app-kubernetes-node-pods',
+  templateUrl: './kubernetes-node-pods.component.html',
+  styleUrls: ['./kubernetes-node-pods.component.scss'],
+  providers: [{
+    provide: ListConfig,
+    useClass: KubernetesNodePodsListConfigService,
+  }]
+})
+export class KubernetesNodePodsComponent { }
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts
similarity index 91%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts
index 572a86da86..637ef95cbb 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts
@@ -3,8 +3,8 @@ import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
 import { first, map, tap } from 'rxjs/operators';
 
-import { EndpointsService } from '../../../core/endpoints.service';
-import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types';
+import { EndpointsService } from '../../../../../core/src/core/endpoints.service';
+import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
 import { BaseKubeGuid } from '../kubernetes-page.types';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
 import { KubernetesNodeService } from '../services/kubernetes-node.service';
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-page.types.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-page.types.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-page.types.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-page.types.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
similarity index 95%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
index 1fbe76d824..871f4e9a17 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
@@ -3,8 +3,8 @@ import * as moment from 'moment';
 import { Observable, of } from 'rxjs';
 import { filter, first, map, publishReplay, refCount, switchMap } from 'rxjs/operators';
 
-import { EndpointsService } from '../../../core/endpoints.service';
-import { PreviewableComponent } from '../../../shared/previewable-component';
+import { EndpointsService } from '../../../../../core/src/core/endpoints.service';
+import { PreviewableComponent } from '../../../../../core/src/shared/previewable-component';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
 import { BasicKubeAPIResource, KubeAPIResource } from '../store/kube.types';
 
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
similarity index 94%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
index b61ebc2c76..dc65b7eda1 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
@@ -3,8 +3,8 @@ import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
 import { first, map, startWith } from 'rxjs/operators';
 
+import { FavoritesConfigMapper } from '../../../../../store/src/favorite-config-mapper';
 import { UserFavoriteEndpoint } from '../../../../../store/src/types/user-favorites.types';
-import { FavoritesConfigMapper } from '../../../shared/components/favorites-meta-card/favorite-config-mapper';
 import { BaseKubeGuid } from '../kubernetes-page.types';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
 import { KubernetesService } from '../services/kubernetes.service';
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.module.ts
similarity index 98%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.module.ts
index 57a9ff32eb..faa30bd980 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.module.ts
@@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
-import { CoreModule } from '../../core/core.module';
-import { SharedModule } from '../../shared/shared.module';
+import { CoreModule } from '../../../../core/src/core/core.module';
+import { SharedModule } from '../../../../core/src/shared/shared.module';
 import {
   KubedashConfigurationComponent,
 } from './kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component';
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.routing.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.routing.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.setup.module.ts
similarity index 92%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.setup.module.ts
index 03989028b4..88d75af289 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.setup.module.ts
@@ -1,11 +1,11 @@
 import { CommonModule } from '@angular/common';
 import { NgModule, Optional, SkipSelf } from '@angular/core';
 
+import { CoreModule } from '../../../../core/src/core/core.module';
+import { EndpointsService } from '../../../../core/src/core/endpoints.service';
+import { SharedModule } from '../../../../core/src/shared/shared.module';
 import { EntityCatalogModule } from '../../../../store/src/entity-catalog.module';
-import { EndpointHealthCheck } from '../../../endpoints-health-checks';
-import { CoreModule } from '../../core/core.module';
-import { EndpointsService } from '../../core/endpoints.service';
-import { SharedModule } from '../../shared/shared.module';
+import { EndpointHealthCheck } from '../../../../store/src/entity-catalog/entity-catalog.types';
 import { KubernetesAWSAuthFormComponent } from './auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component';
 import {
   KubernetesCertsAuthFormComponent,
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.store.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.store.module.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes.store.module.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.store.module.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.testing.module.ts
similarity index 85%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.testing.module.ts
index 9185564ccb..82cb57d3e8 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.testing.module.ts
@@ -3,13 +3,13 @@ import { NgModule } from '@angular/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 
+import { generateStratosEntities } from '../../../../core/src/base-entity-types';
+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 { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../../../store/src/entity-catalog.module';
 import { entityCatalog, TestEntityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
 import { createBasicStoreModule } from '../../../../store/testing/public-api';
-import { AppTestModule } from '../../../test-framework/core-test.helper';
-import { generateStratosEntities } from '../../base-entity-types';
-import { CoreModule } from '../../core/core.module';
-import { SharedModule } from '../../shared/shared.module';
 import { HelmReleaseActivatedRouteMock, HelmReleaseGuidMock } from '../helm/helm-testing.module';
 import { generateKubernetesEntities } from './kubernetes-entity-generator';
 import { BaseKubeGuid } from './kubernetes-page.types';
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.ts
similarity index 87%
rename from custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.ts
index 0931336749..9d0c2975f4 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.ts
@@ -3,10 +3,12 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, first, map } from 'rxjs/operators';
 
+import {
+  EndpointListHelper,
+} from '../../../../../core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers';
+import { ListConfig } from '../../../../../core/src/shared/components/list/list.component.types';
 import { RouterNav } from '../../../../../store/src/actions/router.actions';
 import { AppState } from '../../../../../store/src/app-state';
-import { EndpointListHelper } from '../../../shared/components/list/list-types/endpoint/endpoint-list.helpers';
-import { ListConfig } from '../../../shared/components/list/list.component.types';
 import {
   KubernetesEndpointsListConfigService,
 } from '../list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service';
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kube-helm-list-types.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kube-helm-list-types.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kube-helm-list-types.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kube-helm-list-types.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kube-list.helper.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kube-list.helper.ts
similarity index 88%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kube-list.helper.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kube-list.helper.ts
index f63fbb6ae7..5769d1bbee 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kube-list.helper.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kube-list.helper.ts
@@ -1,7 +1,7 @@
 import * as moment from 'moment';
 
-import { DataFunction } from '../../../shared/components/list/data-sources-controllers/list-data-source';
-import { ITableColumn } from '../../../shared/components/list/list-table/table.types';
+import { DataFunction } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
+import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types';
 import { BasicKubeAPIResource, ConditionType, KubernetesNode } from '../store/kube.types';
 
 export function getConditionSort(condition: ConditionType): DataFunction<KubernetesNode> {
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts
similarity index 87%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts
index 5ae3b49a74..b578a4ad05 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts
@@ -1,16 +1,16 @@
 import { Store } from '@ngrx/store';
 
+import {
+  BaseEndpointsDataSource,
+  syncPaginationSection,
+} from '../../../../../../core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source';
+import { IListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
 import { GetAllEndpoints } from '../../../../../../store/src/actions/endpoint.actions';
 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 {
-  BaseEndpointsDataSource,
-  syncPaginationSection,
-} from '../../../../shared/components/list/list-types/endpoint/base-endpoints-data-source';
-import { IListConfig } from '../../../../shared/components/list/list.component.types';
 
 export class KubernetesEndpointsDataSource extends BaseEndpointsDataSource {
 
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
similarity index 76%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
index 39e461d5b5..9115a09569 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
@@ -1,20 +1,22 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 
+import { ITableColumn } from '../../../../../../core/src/shared/components/list/list-table/table.types';
+import {
+  BaseEndpointsDataSource,
+} from '../../../../../../core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source';
+import {
+  EndpointCardComponent,
+} from '../../../../../../core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component';
+import {
+  EndpointsListConfigService,
+} from '../../../../../../core/src/shared/components/list/list-types/endpoint/endpoints-list-config.service';
+import { IListConfig, ListViewTypes } from '../../../../../../core/src/shared/components/list/list.component.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 { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
-import { BaseEndpointsDataSource } from '../../../../shared/components/list/list-types/endpoint/base-endpoints-data-source';
-import {
-  EndpointCardComponent,
-} from '../../../../shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component';
-import {
-  EndpointsListConfigService,
-} from '../../../../shared/components/list/list-types/endpoint/endpoints-list-config.service';
-import { IListConfig, ListViewTypes } from '../../../../shared/components/list/list.component.types';
 import { KubernetesEndpointsDataSource } from './kubernetes-endpoints-data-source';
 
 @Injectable()
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts
similarity index 84%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts
index 4c332d1f29..e70ac26fdf 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { KubernetesStatus } from '../../../../../../../../../custom-src/frontend/app/custom/kubernetes/store/kube.types';
-import { BaseTestModules } from '../../../../../test-framework/core-test.helper';
+import { BaseTestModules } from '../../../../../../core/test-framework/core-test.helper';
+import { KubernetesStatus } from '../../store/kube.types';
 import { KubernetesLabelsCellComponent } from './kubernetes-labels-cell.component';
 
 describe('KubernetesLabelsCellComponent', () => {
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.ts
similarity index 76%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.ts
index 46a6891b28..a22c8018e7 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 
-import { AppChip } from '../../../../shared/components/chips/chips.component';
-import { TableCellCustom } from '../../../../shared/components/list/list.types';
+import { AppChip } from '../../../../../../core/src/shared/components/chips/chips.component';
+import { TableCellCustom } from '../../../../../../core/src/shared/components/list/list.types';
 import { KubeAPIResource } from '../../store/kube.types';
 
 
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
similarity index 84%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
index b5c6dbc2aa..17d13b91a9 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
@@ -1,8 +1,8 @@
 import { Store } from '@ngrx/store';
 
+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 { AppState } from '../../../../../../store/src/app-state';
-import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
-import { IListConfig } from '../../../../shared/components/list/list.component.types';
 import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { kubernetesEntityFactory, kubernetesPodsEntityType } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts
similarity index 88%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts
index beb0626c7e..7ac8f28263 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts
@@ -1,7 +1,7 @@
 import { Store } from '@ngrx/store';
 
+import { IListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
 import { AppState } from '../../../../../../store/src/app-state';
-import { IListConfig } from '../../../../shared/components/list/list.component.types';
 import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubeService } from '../../store/kube.types';
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.ts
similarity index 81%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.ts
index 2d9c5c125f..239363c136 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.ts
@@ -1,9 +1,10 @@
 import { Component, OnInit } from '@angular/core';
-import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
+import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+
+import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
+import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
 import { KubernetesNamespace } from '../../../store/kube.types';
-import { Observable } from 'rxjs';
 
 @Component({
   selector: 'app-kube-namespace-pod-count',
@@ -22,7 +23,7 @@ export class KubeNamespacePodCountComponent extends TableCellCustom<KubernetesNa
   ngOnInit() {
 
     this.podCount$ = this.kubeEndpointService.pods$.pipe(
-      map(pods =>  pods.filter(p => p.metadata.namespace === this.row.metadata.name)),
+      map(pods => pods.filter(p => p.metadata.namespace === this.row.metadata.name)),
       map(p => p.length)
     );
   }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.ts
similarity index 87%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.ts
index 56a6ff0900..e39f0e95ce 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
 import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
 import { KubernetesNamespace } from '../../../store/kube.types';
 
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
similarity index 82%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
index 2c3a375252..76555c46ee 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
@@ -1,9 +1,9 @@
 import { Store } from '@ngrx/store';
 
+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 { getPaginationKey } from '../../../../../../store/src/actions/pagination.actions';
 import { AppState } from '../../../../../../store/src/app-state';
-import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
-import { IListConfig } from '../../../../shared/components/list/list.component.types';
 import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { kubernetesNamespacesEntityType } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
similarity index 91%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
index ebcdedd0dc..58b66774a6 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
@@ -3,12 +3,12 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, first, map, tap } from 'rxjs/operators';
 
+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 { AppState } from '../../../../../../store/src/app-state';
-import { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
-import { IListConfig, ListViewTypes } from '../../../../shared/components/list/list.component.types';
-import { KubernetesNamespace } from '../../../kubernetes/store/kube.types';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
+import { KubernetesNamespace } from '../../store/kube.types';
 import { defaultHelmKubeListPageSize } from '../kube-helm-list-types';
 import { createKubeAgeColumn } from '../kube-list.helper';
 import { KubeNamespacePodCountComponent } from './kube-namespace-pod-count/kube-namespace-pod-count.component';
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
similarity index 81%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
index f89ae7ae9f..746bf5e95a 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
@@ -1,8 +1,8 @@
 import { Store } from '@ngrx/store';
 
+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 { AppState } from '../../../../../../store/src/app-state';
-import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
-import { IListConfig } from '../../../../shared/components/list/list.component.types';
 import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesNodeService } from '../../services/kubernetes-node.service';
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts
similarity index 89%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts
index 55bb13dee8..da889a853f 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
 import { KubernetesNode } from '../../../store/kube.types';
 
 @Component({
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.ts
similarity index 76%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.ts
index bd000ef84d..8b1738b7d0 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.ts
@@ -1,6 +1,7 @@
-import { Component, OnInit, ViewEncapsulation } from '@angular/core';
+import { Component, ViewEncapsulation } from '@angular/core';
+
+import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
 
-import { TableCellCustom } from '../../../../../shared/components/list/list.types';
 
 @Component({
   selector: 'app-kubernetes-node-capacity',
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.ts
similarity index 88%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.ts
index 456cb420cc..d037fbce9e 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
 import { KubernetesAddressExternal, KubernetesAddressInternal, KubernetesNode } from '../../../store/kube.types';
 
 @Component({
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.ts
similarity index 85%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.ts
index 2ee563db06..07f0f35f7a 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
 import { KubernetesNode } from '../../../store/kube.types';
 
 @Component({
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts
similarity index 87%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts
index 21d7d00432..39dc89844f 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
 import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
 import { KubernetesNode } from '../../../store/kube.types';
 
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.theme.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.theme.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.theme.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.theme.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.ts
similarity index 88%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.ts
index 09d1b10b64..1352f25bc6 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
 import { ConditionType, ConditionTypeLabels, KubernetesNode } from '../../../store/kube.types';
 
 @Component({
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts
similarity index 93%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts
index c1a911eac3..b0b76ccb65 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts
@@ -1,9 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { BaseKubeGuid } from '../../../../kubernetes-page.types';
+import { KubernetesBaseTestModules } from '../../../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service';
 import { KubernetesNodeService } from '../../../../services/kubernetes-node.service';
-import { KubernetesBaseTestModules } from './../../../../kubernetes.testing.module';
 import { KubernetesNodeSummaryCardComponent } from './kubernetes-node-summary-card.component';
 
 describe('KubernetesNodeSummaryCardComponent', () => {
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts
similarity index 88%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts
index f50366727d..1f18811511 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts
@@ -1,9 +1,10 @@
 import { Component } from '@angular/core';
 import { Observable } from 'rxjs';
-import { KubernetesNode } from '../../../../store/kube.types';
-import { AppChip } from '../../../../../../shared/components/chips/chips.component';
+
+import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
 import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service';
 import { KubernetesNodeService } from '../../../../services/kubernetes-node.service';
+import { KubernetesNode } from '../../../../store/kube.types';
 
 @Component({
   selector: 'app-kubernetes-node-summary-card',
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.ts
similarity index 81%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.ts
index 4239df39d0..4aa3994061 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.ts
@@ -1,8 +1,9 @@
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
-import { AppChip } from '../../../../../../shared/components/chips/chips.component';
+import { map } from 'rxjs/operators';
+
+import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
 import { KubernetesNodeService } from '../../../../services/kubernetes-node.service';
-import { map, tap } from 'rxjs/operators';
 
 @Component({
   selector: 'app-kubernetes-node-tags-card',
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
similarity index 85%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
index 30678de266..a51fbe5a8d 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
@@ -1,13 +1,13 @@
 import { Store } from '@ngrx/store';
 
-import { getPaginationKey } from '../../../../../../store/src/actions/pagination.actions';
-import { AppState } from '../../../../../../store/src/app-state';
 import {
   DataFunction,
   DataFunctionDefinition,
   ListDataSource,
-} from '../../../../shared/components/list/data-sources-controllers/list-data-source';
-import { IListConfig } from '../../../../shared/components/list/list.component.types';
+} from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
+import { IListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
+import { getPaginationKey } from '../../../../../../store/src/actions/pagination.actions';
+import { AppState } from '../../../../../../store/src/app-state';
 import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { kubernetesNodesEntityType } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
similarity index 93%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
index c4dedf94e2..244d2739e7 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
@@ -1,11 +1,15 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 
+import { DataFunction } from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
+import { ITableColumn } from '../../../../../../core/src/shared/components/list/list-table/table.types';
+import {
+  IListConfig,
+  IListFilter,
+  ListViewTypes,
+} from '../../../../../../core/src/shared/components/list/list.component.types';
 import { AppState } from '../../../../../../store/src/app-state';
 import { PaginationEntityState } from '../../../../../../store/src/types/pagination.types';
-import { DataFunction } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
-import { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
-import { IListConfig, IListFilter, ListViewTypes } from '../../../../shared/components/list/list.component.types';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { ConditionType, KubernetesAddressExternal, KubernetesAddressInternal, KubernetesNode } from '../../store/kube.types';
 import { defaultHelmKubeListPageSize } from '../kube-helm-list-types';
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.ts
similarity index 81%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.ts
index 870883c356..75d4b752a8 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
 import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
 import { KubernetesNode } from '../../../store/kube.types';
 
@@ -23,7 +23,7 @@ export class NodePodCountComponent extends TableCellCustom<KubernetesNode> imple
   ngOnInit() {
 
     this.podCount$ = this.kubeEndpointService.pods$.pipe(
-      map(pods =>  pods.filter(p => p.spec.nodeName === this.row.metadata.name)),
+      map(pods => pods.filter(p => p.spec.nodeName === this.row.metadata.name)),
       map(p => `${p.length} / ${this.row.status.capacity.pods}`)
     );
   }
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts
similarity index 88%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts
index d838567a71..d5b4702542 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts
@@ -4,18 +4,22 @@ import * as moment from 'moment';
 import { of } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
-import { BooleanIndicatorType } from '../../../../../shared/components/boolean-indicator/boolean-indicator.component';
-import { ITableListDataSource } from '../../../../../shared/components/list/data-sources-controllers/list-data-source-types';
+import {
+  BooleanIndicatorType,
+} from '../../../../../../../core/src/shared/components/boolean-indicator/boolean-indicator.component';
+import {
+  ITableListDataSource,
+} from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
 import {
   TableCellBooleanIndicatorComponent,
   TableCellBooleanIndicatorComponentConfig,
-} from '../../../../../shared/components/list/list-table/table-cell-boolean-indicator/table-cell-boolean-indicator.component';
+} from '../../../../../../../core/src/shared/components/list/list-table/table-cell-boolean-indicator/table-cell-boolean-indicator.component';
 import {
   TableCellIconComponent,
   TableCellIconComponentConfig,
-} from '../../../../../shared/components/list/list-table/table-cell-icon/table-cell-icon.component';
-import { ITableColumn } from '../../../../../shared/components/list/list-table/table.types';
-import { CardCell } from '../../../../../shared/components/list/list.types';
+} from '../../../../../../../core/src/shared/components/list/list-table/table-cell-icon/table-cell-icon.component';
+import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
+import { CardCell } from '../../../../../../../core/src/shared/components/list/list.types';
 import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog';
 import { Container, ContainerState, ContainerStatus, InitContainer, KubernetesPod } from '../../../store/kube.types';
 
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
similarity index 93%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
index e4294f09ef..7ba04b0ad1 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 
-import { TableCellCustom } from '../../../../../shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
 import { KubernetesPodExpandedStatusTypes } from '../../../services/kubernetes-expanded-state';
 import { KubernetesPod } from '../../../store/kube.types';
 
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.ts
similarity index 73%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.ts
index 7d1eef9952..92dea65c38 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.ts
@@ -1,7 +1,8 @@
 import { Component, OnInit } from '@angular/core';
-import { TableCellCustom } from '../../../../../shared/components/list/list.types';
-import { AppChip } from '../../../../../shared/components/chips/chips.component';
-import { PodLabel, KubeAPIResource } from '../../../store/kube.types';
+
+import { AppChip } from '../../../../../../../core/src/shared/components/chips/chips.component';
+import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
+import { KubeAPIResource, PodLabel } from '../../../store/kube.types';
 
 @Component({
   selector: 'app-kubernetes-pod-tags',
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
similarity index 79%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
index 57d56cf38a..da0d7f92d2 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
@@ -1,8 +1,8 @@
 import { Store } from '@ngrx/store';
 
+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 { AppState } from '../../../../../../store/src/app-state';
-import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
-import { IListConfig } from '../../../../shared/components/list/list.component.types';
 import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesPod } from '../../store/kube.types';
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
similarity index 93%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
index 0ad59ce8be..0c1c5199e7 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
@@ -5,13 +5,13 @@ import {
 } from 'frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source-types';
 import { of } from 'rxjs';
 
-import { AppState } from '../../../../../../store/src/app-state';
 import {
   TableCellSidePanelComponent,
   TableCellSidePanelConfig,
-} from '../../../../shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component';
-import { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
-import { IListConfig, ListViewTypes } from '../../../../shared/components/list/list.component.types';
+} from '../../../../../../core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component';
+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 { AppState } from '../../../../../../store/src/app-state';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import {
   KubernetesResourceViewerComponent,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
similarity index 70%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
index 5dc2beed7c..2c0cad521b 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 
-import { CardCell } from '../../../../shared/components/list/list.types';
-import { KubeService } from '../../../kubernetes/store/kube.types';
+import { CardCell } from '../../../../../../core/src/shared/components/list/list.types';
+import { KubeService } from '../../store/kube.types';
 
 @Component({
   selector: 'app-kubernetes-service-ports',
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
similarity index 83%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
index c4ab189296..e8615512b2 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
@@ -1,12 +1,12 @@
 import { of } from 'rxjs';
 
-import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
+import { ListDataSource } from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import {
   TableCellSidePanelComponent,
   TableCellSidePanelConfig,
-} from '../../../../shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component';
-import { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
-import { IListConfig, ListViewTypes } from '../../../../shared/components/list/list.component.types';
+} from '../../../../../../core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component';
+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 {
   KubernetesResourceViewerComponent,
   KubernetesResourceViewerConfig,
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts
similarity index 79%
rename from custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts
index 6b02912c88..89f60d414a 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts
@@ -1,10 +1,10 @@
 import { Store } from '@ngrx/store';
 import { OperatorFunction } from 'rxjs';
 
+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 { AppState } from '../../../../../../store/src/app-state';
 import { PaginatedAction } from '../../../../../../store/src/types/pagination.types';
-import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source';
-import { IListConfig } from '../../../../shared/components/list/list.component.types';
 import { KubeService } from '../../store/kube.types';
 
 export class BaseKubernetesServicesDataSource extends ListDataSource<KubeService> {
diff --git a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.ts
similarity index 92%
rename from custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.ts
index 0da0a94369..3fe46c7d38 100644
--- a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.ts
@@ -3,17 +3,17 @@ import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { EntityInfo } from '../../../../../store/src/types/api.types';
-import { ChartSeries, IMetricMatrixResult } from '../../../../../store/src/types/base-metric.types';
-import { IMetricApplication } from '../../../../../store/src/types/metric.types';
-import { getIdFromRoute } from '../../../core/utils.service';
-import { MetricsConfig } from '../../../shared/components/metrics-chart/metrics-chart.component';
-import { MetricsLineChartConfig } from '../../../shared/components/metrics-chart/metrics-chart.types';
+import { getIdFromRoute } from '../../../../../core/src/core/utils.service';
+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 {
   ChartDataTypes,
   getMetricsChartConfigBuilder,
-} from '../../../shared/components/metrics-chart/metrics.component.helpers';
-import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types';
+} from '../../../../../core/src/shared/components/metrics-chart/metrics.component.helpers';
+import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
+import { EntityInfo } from '../../../../../store/src/types/api.types';
+import { ChartSeries, IMetricMatrixResult } from '../../../../../store/src/types/base-metric.types';
+import { IMetricApplication } from '../../../../../store/src/types/metric.types';
 import { kubeEntityCatalog } from '../kubernetes-entity-catalog';
 import { formatAxisCPUTime, formatCPUTime } from '../kubernetes-metrics.helpers';
 import { BaseKubeGuid } from '../kubernetes-page.types';
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-endpoint.service.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-endpoint.service.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-expanded-state.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-expanded-state.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/services/kubernetes-expanded-state.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-expanded-state.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-namespace.service.ts
similarity index 93%
rename from custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-namespace.service.ts
index c4686cf28b..03f3758a06 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-namespace.service.ts
@@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
 import { filter, first, map, publishReplay } from 'rxjs/operators';
 
-import { getIdFromRoute } from '../../../core/utils.service';
+import { getIdFromRoute } from '../../../../../core/src/core/utils.service';
 import { kubeEntityCatalog } from '../kubernetes-entity-catalog';
 import { KubernetesNamespace } from '../store/kube.types';
 import { KubernetesEndpointService } from './kubernetes-endpoint.service';
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-node.service.ts
similarity index 95%
rename from custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-node.service.ts
index 096eb86efa..3dd564f2e0 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-node.service.ts
@@ -4,12 +4,12 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, first, map, shareReplay } from 'rxjs/operators';
 
+import { getIdFromRoute } from '../../../../../core/src/core/utils.service';
 import { MetricQueryConfig, MetricsAction } from '../../../../../store/src/actions/metrics.actions';
 import { AppState } from '../../../../../store/src/app-state';
 import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { EntityInfo } from '../../../../../store/src/types/api.types';
-import { getIdFromRoute } from '../../../core/utils.service';
-import { MetricQueryType } from '../../../shared/services/metrics-range-selector.types';
+import { MetricQueryType } from '../../../../../store/src/types/metric.types';
 import { kubeEntityCatalog } from '../kubernetes-entity-catalog';
 import { KubernetesNode, MetricStatistic } from '../store/kube.types';
 import { FetchKubernetesMetricsAction } from '../store/kubernetes.actions';
diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes.service.ts
similarity index 83%
rename from custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes.service.ts
index 8695c7b9ba..678b9eceed 100644
--- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes.service.ts
@@ -2,11 +2,11 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map, shareReplay } from 'rxjs/operators';
 
+import { endpointEntityType, stratosEntityFactory } from '../../../../../store/src/helpers/stratos-entity-factory';
 import { PaginationMonitor } from '../../../../../store/src/monitors/pagination-monitor';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
 import { endpointListKey, EndpointModel } from '../../../../../store/src/types/endpoint.types';
-import { endpointEntitySchema } from '../../../base-entity-schemas';
 
 @Injectable()
 export class KubernetesService {
@@ -17,9 +17,10 @@ export class KubernetesService {
   constructor(
     private paginationMonitorFactory: PaginationMonitorFactory
   ) {
+    // TODO: RC update with stratos entity catalog
     this.kubeEndpointsMonitor = this.paginationMonitorFactory.create(
       endpointListKey,
-      endpointEntitySchema,
+      stratosEntityFactory(endpointEntityType),
       true
     );
 
diff --git a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/action-builders/kube.action-builders.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/store/action-builders/kube.action-builders.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.getIds.ts
similarity index 97%
rename from custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.getIds.ts
index ef66c673df..f08ff16fb3 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.getIds.ts
@@ -1,4 +1,4 @@
-import { environment } from '../../../environments/environment';
+import { environment } from '../../../../../core/src/environments/environment';
 import {
   BasicKubeAPIResource,
   KubernetesDeployment,
diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.types.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/store/kube.types.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.types.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kubernetes.actions.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kubernetes.actions.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kubernetes.effects.ts
similarity index 98%
rename from custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kubernetes.effects.ts
index 645dc5b91e..5f47b4a890 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kubernetes.effects.ts
@@ -8,16 +8,16 @@ import { connectedEndpointsOfTypesSelector } from 'frontend/packages/store/src/s
 import { of } from 'rxjs';
 import { catchError, first, flatMap, map, mergeMap, switchMap } from 'rxjs/operators';
 
+import { environment } from '../../../../../core/src/environments/environment';
 import { AppState } from '../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
+import { isJetstreamError } from '../../../../../store/src/jetstream';
 import { NormalizedResponse } from '../../../../../store/src/types/api.types';
 import {
   StartRequestAction,
   WrapperRequestActionFailed,
   WrapperRequestActionSuccess,
 } from '../../../../../store/src/types/request.types';
-import { environment } from '../../../environments/environment';
-import { isJetstreamError } from '../../../jetstream.helpers';
 import {
   KUBERNETES_ENDPOINT_TYPE,
   kubernetesDashboardEntityType,
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.ts
similarity index 58%
rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.ts
index 6251e638fb..2611cb9caa 100644
--- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.ts
@@ -1,8 +1,10 @@
 import { Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
-import { KubernetesNamespacesListConfigService } from '../../list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service';
-import { ListConfig } from '../../../../shared/components/list/list.component.types';
+import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
+import {
+  KubernetesNamespacesListConfigService,
+} from '../../list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service';
 
 @Component({
   selector: 'app-kubernetes-namespaces-tab',
@@ -15,5 +17,5 @@ import { ListConfig } from '../../../../shared/components/list/list.component.ty
 })
 export class KubernetesNamespacesTabComponent {
 
-  constructor(private activatedRoute: ActivatedRoute) {}
+  constructor(private activatedRoute: ActivatedRoute) { }
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.ts
similarity index 83%
rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.ts
index 091908c2fe..07b711cc83 100644
--- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 
-import { ListConfig } from '../../../../shared/components/list/list.component.types';
+import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
 import { KubernetesNodesListConfigService } from '../../list-types/kubernetes-nodes/kubernetes-nodes-list-config.service';
 
 @Component({
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.ts
similarity index 74%
rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.ts
index e2a64d7e59..e4f52d8eb5 100644
--- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 
-import { ListConfig } from '../../../../shared/components/list/list.component.types';
+import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
 import { KubernetesPodsListConfigService } from '../../list-types/kubernetes-pods/kubernetes-pods-list-config.service';
 
 @Component({
@@ -12,4 +12,4 @@ import { KubernetesPodsListConfigService } from '../../list-types/kubernetes-pod
     useClass: KubernetesPodsListConfigService,
   }]
 })
-export class KubernetesPodsTabComponent {}
+export class KubernetesPodsTabComponent { }
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.theme.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.theme.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.theme.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.theme.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts
similarity index 97%
rename from custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts
index dbd6642698..7548a95d02 100644
--- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts
@@ -6,16 +6,16 @@ import { Store } from '@ngrx/store';
 import { combineLatest, interval, Observable, Subscription } from 'rxjs';
 import { first, map, startWith } from 'rxjs/operators';
 
+import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
+import {
+  IChartThresholds,
+  ISimpleUsageChartData,
+} from '../../../../../../core/src/shared/components/simple-usage-chart/simple-usage-chart.types';
 import { AppState } from '../../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { getCurrentPageRequestInfo } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
 import { PaginatedAction, PaginationEntityState } from '../../../../../../store/src/types/pagination.types';
-import { safeUnsubscribe } from '../../../../core/utils.service';
-import {
-  IChartThresholds,
-  ISimpleUsageChartData,
-} from '../../../../shared/components/simple-usage-chart/simple-usage-chart.types';
 import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
 
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts
similarity index 93%
rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts
index 49eb16ba5b..fff1bab700 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts
@@ -1,7 +1,7 @@
 import { DatePipe } from '@angular/common';
 import { Component, Input } from '@angular/core';
 
-import { CardCell } from '../../../../../shared/components/list/list.types';
+import { CardCell } from '../../../../../../../core/src/shared/components/list/list.types';
 import { HelmRelease } from '../../workload.types';
 
 @Component({
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-pods-list-config.service.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-config.service.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-pods-list-config.service.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-services-list-config.service.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-config.service.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-services-list-config.service.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
similarity index 93%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
index 3c3721943c..022bb87ddf 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
@@ -5,12 +5,12 @@ import { Observable, Subject, Subscription } from 'rxjs';
 import makeWebSocketObservable, { GetWebSocketResponses } from 'rxjs-websockets';
 import { catchError, map, share, switchMap } from 'rxjs/operators';
 
-import { HideSnackBar, ShowSnackBar } from '../../../../../../../store/src/actions/snackBar.actions';
+import { LoggerService } from '../../../../../../../core/src/core/logger.service';
+import { IPageSideNavTab } from '../../../../../../../core/src/features/dashboard/page-side-nav/page-side-nav.component';
+import { SnackBarService } from '../../../../../../../core/src/shared/services/snackbar.service';
 import { AppState } from '../../../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
 import { EntityRequestAction, WrapperRequestActionSuccess } from '../../../../../../../store/src/types/request.types';
-import { LoggerService } from '../../../../../core/logger.service';
-import { IPageSideNavTab } from '../../../../../features/dashboard/page-side-nav/page-side-nav.component';
 import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog';
 import { KubernetesPodExpandedStatusHelper } from '../../../services/kubernetes-expanded-state';
 import { KubernetesPod, KubeService } from '../../../store/kube.types';
@@ -65,7 +65,8 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
   constructor(
     public helmReleaseHelper: HelmReleaseHelperService,
     private store: Store<AppState>,
-    private logService: LoggerService
+    private logService: LoggerService,
+    private snackbarService: SnackBarService
   ) {
     this.title = this.helmReleaseHelper.releaseTitle;
 
@@ -145,9 +146,7 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
           this.addResource(releaseResourceAction, resources);
         } else if (messageObj.kind === 'ManifestErrors') {
           if (messageObj.data) {
-            this.store.dispatch(
-              new ShowSnackBar('Errors were found when parsing this workload. Not all resources may be shown', 'Dismiss')
-            );
+            this.snackbarService.show('Errors were found when parsing this workload. Not all resources may be shown', 'Dismiss')
           }
         }
       }
@@ -196,6 +195,6 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
 
   ngOnDestroy() {
     this.sub.unsubscribe();
-    this.store.dispatch(new HideSnackBar());
+    this.snackbarService.hide();
   }
 }
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
similarity index 95%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index 759e70acda..3ced3774ae 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -6,11 +6,11 @@ import { ConfirmationDialogConfig } from 'frontend/packages/core/src/shared/comp
 import { ConfirmationDialogService } from 'frontend/packages/core/src/shared/components/confirmation-dialog.service';
 import { ClearPaginationOfType } from 'frontend/packages/store/src/actions/pagination.actions';
 import { RouterNav } from 'frontend/packages/store/src/actions/router.actions';
-import { HideSnackBar, ShowSnackBar } from 'frontend/packages/store/src/actions/snackBar.actions';
 import { AppState } from 'frontend/packages/store/src/app-state';
 import { combineLatest, Observable, ReplaySubject } from 'rxjs';
 import { distinctUntilChanged, filter, first, map, publishReplay, refCount, startWith } from 'rxjs/operators';
 
+import { SnackBarService } from '../../../../../../../../core/src/shared/services/snackbar.service';
 import { endpointsEntityRequestDataSelector } from '../../../../../../../../store/src/selectors/endpoint.selectors';
 import { HelmReleaseChartData, HelmReleaseResource } from '../../../workload.types';
 import { workloadsEntityCatalog } from '../../../workloads-entity-catalog';
@@ -95,7 +95,8 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
     private store: Store<AppState>,
     private confirmDialog: ConfirmationDialogService,
     private httpClient: HttpClient,
-    private logService: LoggerService
+    private logService: LoggerService,
+    private snackbarService: SnackBarService
   ) {
 
     this.isBusy$ = combineLatest([
@@ -197,7 +198,7 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
       this.httpClient.delete(`/pp/v1/helm/releases/${endpointAndName}`).subscribe({
         error: (err: any) => {
           this.endDelete();
-          this.store.dispatch(new ShowSnackBar('Failed to delete release', 'Close'));
+          this.snackbarService.show('Failed to delete release', 'Close');
           this.logService.error('Failed to delete release: ', err);
         },
         complete: () => {
@@ -212,7 +213,7 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
 
   ngOnDestroy() {
     if (this.deleted) {
-      this.store.dispatch(new HideSnackBar());
+      this.snackbarService.hide();
     }
   }
 
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.html
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.scss
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts
similarity index 92%
rename from custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts
index fd8813dbb9..f86ea01624 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts
@@ -5,7 +5,7 @@ import { endpointOfTypeSelector } from 'frontend/packages/store/src/selectors/en
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { ListConfig } from '../../../../shared/components/list/list.component.types';
+import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
 import { HELM_ENDPOINT_TYPE } from '../../../helm/helm-entity-factory';
 import { HelmReleasesListConfig } from '../list-types/helm-releases-list-config.service';
 import { KubernetesNamespacesFilterService } from '../list-types/kube-namespaces-filter-config.service';
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workload-action-builders.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workload-action-builders.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-factory.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-factory.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-generator.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-generator.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-generator.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-generator.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.actions.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.actions.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.effects.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.effects.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.reducers.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.reducers.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.reducers.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.reducers.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.store.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.store.module.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.store.module.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.store.module.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workload.types.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workload.types.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workloads-entity-catalog.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads-entity-catalog.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/workloads-entity-catalog.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads-entity-catalog.ts
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
similarity index 92%
rename from custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
index 6514ee1c00..a9ff97b006 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/workloads.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
@@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { NgxGraphModule } from '@swimlane/ngx-graph';
 
-import { CoreModule } from '../../../core/core.module';
-import { SharedModule } from '../../../shared/shared.module';
+import { CoreModule } from '../../../../../core/src/core/core.module';
+import { SharedModule } from '../../../../../core/src/shared/shared.module';
 import { KubernetesModule } from '../kubernetes.module';
 import { HelmReleaseCardComponent } from './list-types/helm-release-card/helm-release-card.component';
 import { HelmReleaseTabBaseComponent } from './release/helm-release-tab-base/helm-release-tab-base.component';
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workloads.routing.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.routing.ts
similarity index 100%
rename from custom-src/frontend/app/custom/kubernetes/workloads/workloads.routing.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.routing.ts
diff --git a/custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.html b/src/frontend/packages/suse-extensions/src/custom/suse-about-info/suse-about-info.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.html
rename to src/frontend/packages/suse-extensions/src/custom/suse-about-info/suse-about-info.component.html
diff --git a/custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.scss b/src/frontend/packages/suse-extensions/src/custom/suse-about-info/suse-about-info.component.scss
similarity index 100%
rename from custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/suse-about-info/suse-about-info.component.scss
diff --git a/custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.ts b/src/frontend/packages/suse-extensions/src/custom/suse-about-info/suse-about-info.component.ts
similarity index 92%
rename from custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/suse-about-info/suse-about-info.component.ts
index d332fed1be..b67379c282 100644
--- a/custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/suse-about-info/suse-about-info.component.ts
@@ -5,7 +5,7 @@ import { filter, map } from 'rxjs/operators';
 
 import { AppState } from '../../../../store/src/app-state';
 import { AuthState } from '../../../../store/src/reducers/auth.reducer';
-import { SessionData } from './../../../../store/src/types/auth.types';
+import { SessionData } from '../../../../store/src/types/auth.types';
 
 @Component({
   selector: 'app-suse-about-info',
diff --git a/custom-src/frontend/app/custom/suse-login/suse-login.component.html b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/suse-login/suse-login.component.html
rename to src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html
diff --git a/custom-src/frontend/app/custom/suse-login/suse-login.component.scss b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
similarity index 98%
rename from custom-src/frontend/app/custom/suse-login/suse-login.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
index f08c6bd2be..8ea9135bb9 100644
--- a/custom-src/frontend/app/custom/suse-login/suse-login.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
@@ -1,4 +1,5 @@
-@import '../../../sass/custom/suse-colors';
+@import '../../../../suse-theme/sass/custom/suse-colors';
+
 .suse-login {
   align-items: center;
   background-color: $suse-blue;
diff --git a/custom-src/frontend/app/custom/suse-login/suse-login.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.spec.ts
similarity index 100%
rename from custom-src/frontend/app/custom/suse-login/suse-login.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.spec.ts
diff --git a/custom-src/frontend/app/custom/suse-login/suse-login.component.ts b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.ts
similarity index 72%
rename from custom-src/frontend/app/custom/suse-login/suse-login.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.ts
index 8e308820c1..1376343844 100644
--- a/custom-src/frontend/app/custom/suse-login/suse-login.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.ts
@@ -1,10 +1,10 @@
 import { Component, ViewEncapsulation } from '@angular/core';
 import { Store } from '@ngrx/store';
 
+import { CustomizationService, CustomizationsMetadata } from '../../../../core/src/core/customizations.types';
+import { StratosLoginComponent } from '../../../../core/src/core/extension/extension-service';
+import { LoginPageComponent } from '../../../../core/src/features/login/login-page/login-page.component';
 import { AppState } from '../../../../store/src/app-state';
-import { CustomizationService, CustomizationsMetadata } from '../../core/customizations.types';
-import { StratosLoginComponent } from '../../core/extension/extension-service';
-import { LoginPageComponent } from '../../features/login/login-page/login-page.component';
 
 @StratosLoginComponent()
 @Component({
diff --git a/custom-src/frontend/app/custom/custom-routing.module.ts b/src/frontend/packages/suse-extensions/src/custom/suse-routing.module.ts
similarity index 97%
rename from custom-src/frontend/app/custom/custom-routing.module.ts
rename to src/frontend/packages/suse-extensions/src/custom/suse-routing.module.ts
index 59ddebd3b8..efabd4582e 100644
--- a/custom-src/frontend/app/custom/custom-routing.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/suse-routing.module.ts
@@ -54,4 +54,4 @@ const customRoutes: Routes = [
   ],
   declarations: []
 })
-export class CustomRoutingModule { }
+export class SuseRoutingModule { }
diff --git a/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.html b/src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.html
similarity index 100%
rename from custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.html
rename to src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.html
diff --git a/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.scss b/src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.scss
similarity index 91%
rename from custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.scss
index ee42a17333..21b16098cb 100644
--- a/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.scss
@@ -1,4 +1,4 @@
-@import '../../../sass/custom/suse-colors';
+@import '../../../../suse-theme/sass/custom/suse-colors';
 
 .no-endpoints-message {
   color: $suse-button-gray;
diff --git a/custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.ts b/src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.ts
similarity index 100%
rename from custom-src/frontend/app/custom/suse-welcome/suse-welcome.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.ts
diff --git a/custom-src/frontend/app/custom/custom.module.ts b/src/frontend/packages/suse-extensions/src/custom/suse.module.ts
similarity index 84%
rename from custom-src/frontend/app/custom/custom.module.ts
rename to src/frontend/packages/suse-extensions/src/custom/suse.module.ts
index 9c3292afa2..09e8c82911 100644
--- a/custom-src/frontend/app/custom/custom.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/suse.module.ts
@@ -1,10 +1,10 @@
 import { NgModule } from '@angular/core';
 import { Router } from '@angular/router';
 
-import { CoreModule } from '../core/core.module';
-import { CustomizationService, CustomizationsMetadata } from '../core/customizations.types';
-import { MDAppModule } from '../core/md.module';
-import { SharedModule } from '../shared/shared.module';
+import { CoreModule } from '../../../core/src/core/core.module';
+import { CustomizationService, CustomizationsMetadata } from '../../../core/src/core/customizations.types';
+import { MDAppModule } from '../../../core/src/core/md.module';
+import { SharedModule } from '../../../core/src/shared/shared.module';
 import { DemoHelperComponent } from './demo/demo-helper/demo-helper.component';
 import { HelmSetupModule } from './helm/helm.setup.module';
 import { KubernetesSetupModule } from './kubernetes/kubernetes.setup.module';
@@ -42,7 +42,7 @@ const SuseCustomizations: CustomizationsMetadata = {
     DemoHelperComponent,
   ]
 })
-export class CustomModule {
+export class SuseModule {
 
   static init = false;
 
@@ -50,13 +50,13 @@ export class CustomModule {
     cs.set(SuseCustomizations);
 
     // Only update the routes once
-    if (!CustomModule.init) {
+    if (!SuseModule.init) {
       // Override the component used for the login route
       const routeConfig = [...router.config];
       const loginRoute = routeConfig.find(r => r.path === 'login') || {};
       loginRoute.component = SuseLoginComponent;
       router.resetConfig(routeConfig);
-      CustomModule.init = true;
+      SuseModule.init = true;
     }
   }
 }
diff --git a/src/frontend/packages/suse-extensions/src/public-api.ts b/src/frontend/packages/suse-extensions/src/public-api.ts
new file mode 100644
index 0000000000..82ee7d4da7
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/public-api.ts
@@ -0,0 +1,4 @@
+// Custom Extensions
+
+export * from './custom/suse.module'
+export * from './custom/suse-routing.module'
\ No newline at end of file
diff --git a/src/frontend/packages/suse-theme/_index.scss b/src/frontend/packages/suse-theme/_index.scss
new file mode 100644
index 0000000000..a8d3f300e1
--- /dev/null
+++ b/src/frontend/packages/suse-theme/_index.scss
@@ -0,0 +1,9 @@
+@import '~@stratosui/theme/helper';
+
+// Custom Theme
+@import './sass/custom';
+
+@function stratos-theme() {
+  $theme: stratos-theme-helper($stratos-theme);
+  @return $theme
+}
\ No newline at end of file
diff --git a/custom-src/frontend/assets/custom/aks.svg b/src/frontend/packages/suse-theme/assets/core/custom/aks.svg
similarity index 100%
rename from custom-src/frontend/assets/custom/aks.svg
rename to src/frontend/packages/suse-theme/assets/core/custom/aks.svg
diff --git a/custom-src/frontend/assets/custom/app_placeholder.svg b/src/frontend/packages/suse-theme/assets/core/custom/app_placeholder.svg
similarity index 100%
rename from custom-src/frontend/assets/custom/app_placeholder.svg
rename to src/frontend/packages/suse-theme/assets/core/custom/app_placeholder.svg
diff --git a/custom-src/frontend/assets/custom/caasp.png b/src/frontend/packages/suse-theme/assets/core/custom/caasp.png
similarity index 100%
rename from custom-src/frontend/assets/custom/caasp.png
rename to src/frontend/packages/suse-theme/assets/core/custom/caasp.png
diff --git a/custom-src/frontend/assets/custom/eks.svg b/src/frontend/packages/suse-theme/assets/core/custom/eks.svg
similarity index 100%
rename from custom-src/frontend/assets/custom/eks.svg
rename to src/frontend/packages/suse-theme/assets/core/custom/eks.svg
diff --git a/custom-src/frontend/assets/custom/gke.svg b/src/frontend/packages/suse-theme/assets/core/custom/gke.svg
similarity index 100%
rename from custom-src/frontend/assets/custom/gke.svg
rename to src/frontend/packages/suse-theme/assets/core/custom/gke.svg
diff --git a/custom-src/frontend/assets/custom/helm.svg b/src/frontend/packages/suse-theme/assets/core/custom/helm.svg
similarity index 100%
rename from custom-src/frontend/assets/custom/helm.svg
rename to src/frontend/packages/suse-theme/assets/core/custom/helm.svg
diff --git a/custom-src/frontend/assets/custom/help/en/connecting_gke.md b/src/frontend/packages/suse-theme/assets/core/custom/help/en/connecting_gke.md
similarity index 100%
rename from custom-src/frontend/assets/custom/help/en/connecting_gke.md
rename to src/frontend/packages/suse-theme/assets/core/custom/help/en/connecting_gke.md
diff --git a/custom-src/frontend/assets/custom/kube_import.png b/src/frontend/packages/suse-theme/assets/core/custom/kube_import.png
similarity index 100%
rename from custom-src/frontend/assets/custom/kube_import.png
rename to src/frontend/packages/suse-theme/assets/core/custom/kube_import.png
diff --git a/custom-src/frontend/assets/custom/kubernetes.svg b/src/frontend/packages/suse-theme/assets/core/custom/kubernetes.svg
similarity index 100%
rename from custom-src/frontend/assets/custom/kubernetes.svg
rename to src/frontend/packages/suse-theme/assets/core/custom/kubernetes.svg
diff --git a/custom-src/frontend/assets/custom/placeholder.png b/src/frontend/packages/suse-theme/assets/core/custom/placeholder.png
similarity index 100%
rename from custom-src/frontend/assets/custom/placeholder.png
rename to src/frontend/packages/suse-theme/assets/core/custom/placeholder.png
diff --git a/custom-src/frontend/assets/custom/suse_logo.png b/src/frontend/packages/suse-theme/assets/core/custom/suse_logo.png
similarity index 100%
rename from custom-src/frontend/assets/custom/suse_logo.png
rename to src/frontend/packages/suse-theme/assets/core/custom/suse_logo.png
diff --git a/custom-src/frontend/assets/custom/susecon-logo.svg b/src/frontend/packages/suse-theme/assets/core/custom/susecon-logo.svg
similarity index 100%
rename from custom-src/frontend/assets/custom/susecon-logo.svg
rename to src/frontend/packages/suse-theme/assets/core/custom/susecon-logo.svg
diff --git a/custom-src/frontend/assets/eula.html b/src/frontend/packages/suse-theme/assets/core/eula.html
similarity index 100%
rename from custom-src/frontend/assets/eula.html
rename to src/frontend/packages/suse-theme/assets/core/eula.html
diff --git a/custom-src/frontend/assets/logo.png b/src/frontend/packages/suse-theme/assets/core/logo.png
similarity index 100%
rename from custom-src/frontend/assets/logo.png
rename to src/frontend/packages/suse-theme/assets/core/logo.png
diff --git a/custom-src/frontend/assets/nav-logo-icon.png b/src/frontend/packages/suse-theme/assets/core/nav-logo-icon.png
similarity index 100%
rename from custom-src/frontend/assets/nav-logo-icon.png
rename to src/frontend/packages/suse-theme/assets/core/nav-logo-icon.png
diff --git a/custom-src/frontend/assets/nav-logo.png b/src/frontend/packages/suse-theme/assets/core/nav-logo.png
similarity index 100%
rename from custom-src/frontend/assets/nav-logo.png
rename to src/frontend/packages/suse-theme/assets/core/nav-logo.png
diff --git a/custom-src/frontend/favicon.ico b/src/frontend/packages/suse-theme/assets/favicon.ico
similarity index 100%
rename from custom-src/frontend/favicon.ico
rename to src/frontend/packages/suse-theme/assets/favicon.ico
diff --git a/custom-src/frontend/loading.css b/src/frontend/packages/suse-theme/loader/loading.css
similarity index 100%
rename from custom-src/frontend/loading.css
rename to src/frontend/packages/suse-theme/loader/loading.css
diff --git a/custom-src/frontend/loading.html b/src/frontend/packages/suse-theme/loader/loading.html
similarity index 100%
rename from custom-src/frontend/loading.html
rename to src/frontend/packages/suse-theme/loader/loading.html
diff --git a/src/frontend/packages/suse-theme/package.json b/src/frontend/packages/suse-theme/package.json
new file mode 100644
index 0000000000..76385dc742
--- /dev/null
+++ b/src/frontend/packages/suse-theme/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "@suse/theme",
+  "version": "0.0.1",
+  "stratos": {
+    "assets": {
+      "assets/core": "core/assets",
+      "assets/favicon.ico": "favicon.ico"
+    },
+    "theme": {
+      "loadingCss": "loader/loading.css",
+      "loadingHtml": "loader/loading.html"
+    }
+  },
+  "peerDependencies": {},
+  "scripts": {
+    "build": "rm -rf ../../../../dist/theme && mkdir -p ../../../../dist/theme && cp -R * ../../../../dist/theme"
+  }
+}
diff --git a/custom-src/frontend/sass/custom.scss b/src/frontend/packages/suse-theme/sass/custom.scss
similarity index 100%
rename from custom-src/frontend/sass/custom.scss
rename to src/frontend/packages/suse-theme/sass/custom.scss
diff --git a/custom-src/frontend/sass/custom/suse-colors.scss b/src/frontend/packages/suse-theme/sass/custom/suse-colors.scss
similarity index 100%
rename from custom-src/frontend/sass/custom/suse-colors.scss
rename to src/frontend/packages/suse-theme/sass/custom/suse-colors.scss
diff --git a/custom-src/frontend/sass/custom/suse.scss b/src/frontend/packages/suse-theme/sass/custom/suse.scss
similarity index 100%
rename from custom-src/frontend/sass/custom/suse.scss
rename to src/frontend/packages/suse-theme/sass/custom/suse.scss
diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index 0e5bb28dde..f2675b2c00 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -344,6 +344,8 @@ github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY=
+github.com/gosuri/uitable v0.0.1/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY=
@@ -796,6 +798,8 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81
 helm.sh/helm/v3 v3.0.0 h1:or/9cs1GgfcTQeEnR2CVJNw893/rmqIG1KsNHmUiSFw=
 helm.sh/helm/v3 v3.0.0/go.mod h1:sI7B9yfvMgxtTPMWdk1jSKJ2aa59UyP9qhPydqW6mgo=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/src/test-e2e/e2e.ts b/src/test-e2e/e2e.ts
index a4215aaa53..4a8cd7802f 100644
--- a/src/test-e2e/e2e.ts
+++ b/src/test-e2e/e2e.ts
@@ -20,7 +20,7 @@ export class E2E {
    * Temporary location for customization, we should in future look to fetch this a better way from client side code
   */
   public static customization: CustomizationsMetadata = {
-    alwaysShowNavForEndpointTypes: (epType) => true
+    alwaysShowNavForEndpointTypes: (epType) => false
   }
 
   // General helpers
diff --git a/src/tsconfig.json b/src/tsconfig.json
index e1e22ea606..a6be48f071 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -33,7 +33,8 @@
       "@stratosui/core": ["frontend/packages/core/src/public-api.ts"],
       "@stratosui/store": ["frontend/packages/store/src/public-api.ts"],
       "@stratosui/store/testing": ["frontend/packages/store/testing/public-api.ts"],
-      "@example/extensions": ["frontend/packages/example-extensions/src/public-api.ts"]
+      "@example/extensions": ["frontend/packages/example-extensions/src/public-api.ts"],
+      "@suse/extensions": ["frontend/packages/suse-extensions/src/public-api.ts"],
     }
   }
 }
diff --git a/custom-src/stratos.yaml b/stratos.yaml
similarity index 100%
rename from custom-src/stratos.yaml
rename to stratos.yaml

From e6f0513c1535621a66c2e3621e3c9c42f451fc27 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Tue, 30 Jun 2020 09:37:39 +0100
Subject: [PATCH 557/648] Kubernetes icons updates

---
 .../kubernetes-namespace.component.ts         |  2 +-
 .../kubernetes-node.component.ts              |  2 +-
 .../kubernetes-tab-base.component.ts          |  6 +-
 .../kubernetes-node-ips.component.html        |  2 +-
 .../helm-release-tab-base.component.ts        |  2 +-
 .../helm-release-summary-tab.component.ts     | 55 +++++++++++++++++--
 6 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts
index 7a878dd6e7..3847972a17 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts
@@ -33,7 +33,7 @@ import { KubernetesService } from '../services/kubernetes.service';
 export class KubernetesNamespaceComponent {
 
   tabLinks = [
-    { link: 'pods', label: 'Pods', icon: 'adjust' },
+    { link: 'pods', label: 'Pods', icon: 'pod', iconFont: 'stratos-icons'  },
     { link: 'services', label: 'Services', icon: 'service', iconFont: 'stratos-icons' }
   ];
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts
index 637ef95cbb..14b6bb6e3e 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts
@@ -36,7 +36,7 @@ export class KubernetesNodeComponent {
   tabLinks = [
     { link: 'summary', label: 'Summary', icon: 'kubernetes', iconFont: 'stratos-icons' },
     { link: 'metrics', label: 'Metrics', icon: 'equalizer' },
-    { link: 'pods', label: 'Pods', icon: 'adjust' },
+    { link: 'pods', label: 'Pods', icon: 'pod', iconFont: 'stratos-icons' },
   ];
 
   public breadcrumbs$: Observable<IHeaderBreadcrumb[]>;
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
index dc65b7eda1..a24a892eb2 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
@@ -33,9 +33,9 @@ export class KubernetesTabBaseComponent implements OnInit {
 
   tabLinks = [
     { link: 'summary', label: 'Summary', icon: 'kubernetes', iconFont: 'stratos-icons' },
-    { link: 'nodes', label: 'Nodes', icon: 'developer_board' },
-    { link: 'namespaces', label: 'Namespaces', icon: 'language' },
-    { link: 'pods', label: 'Pods', icon: 'adjust' },
+    { link: 'nodes', label: 'Nodes', icon: 'node', iconFont: 'stratos-icons' },
+    { link: 'namespaces', label: 'Namespaces', icon: 'namespace', iconFont: 'stratos-icons' },
+    { link: 'pods', label: 'Pods', icon: 'pod', iconFont: 'stratos-icons' },
   ];
 
   public isFetching$: Observable<boolean>;
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.html
index fb1c936c0a..789d7317dc 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.html
@@ -1 +1 @@
-<mat-icon matTooltip="{{tooltip}}">language</mat-icon>
\ No newline at end of file
+<mat-icon matTooltip="{{tooltip}}" fontSet="stratos-icons">network</mat-icon>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
index 022bb87ddf..9a838e889f 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
@@ -59,7 +59,7 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
     { link: 'values', label: 'Values', icon: 'list' },
     { link: '-', label: 'Resources' },
     // { link: 'graph', label: 'Overview', icon: 'share' },
-    { link: 'pods', label: 'Pods', icon: 'adjust' },
+    { link: 'pods', label: 'Pods', icon: 'pod', iconFont: 'stratos-icons'  },
     { link: 'services', label: 'Services', icon: 'service', iconFont: 'stratos-icons' }
   ];
   constructor(
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index 3ced3774ae..a302a6fd2a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -62,21 +62,64 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
 
 
   public iconMappings = {
+    Namespace: {
+      name: 'namespace',
+      font: 'stratos-icons'
+    },
+    Container: {
+      name: 'container',
+      font: 'stratos-icons'
+    },
+    ClusterRole: {
+      name: 'cluster_role',
+      font: 'stratos-icons'
+    },
+    ClusterRoleBinding: {
+      name: 'cluster_role_binding',
+      font: 'stratos-icons'
+    },
+    Deployment: {
+      name: 'deployment',
+      font: 'stratos-icons'
+    },
+    ReplicaSet: {
+      name: 'replica_set',
+      font: 'stratos-icons'
+    },
     Pod: {
-      name: 'adjust'
+      name: 'pod',
+      font: 'stratos-icons'
+    },
+    Service: {
+      name: 'service',
+      font: 'stratos-icons'
     },
     Role: {
-      name: 'lock'
+      name: 'assignment_ind'
     },
     RoleBinding: {
-      name: 'lock'
+      name: 'role_binding',
+      font: 'stratos-icons'
+    },
+    StatefulSet: {
+      name: 'stateful_set',
+      font: 'stratos-icons'
+    },
+    Ingress: {
+      name: 'ingress',
+      font: 'stratos-icons'
+    },
+    ConfigMap: {
+      name: 'config_map',
+      font: 'stratos-icons'
+    },
+    Secret: {
+      name: 'config_map',
+      font: 'stratos-icons'
     },
     ServiceAccount: {
       name: 'lock'
     },
-    ReplicaSet: {
-      name: 'filter_none'
-    },
     default: {
       name: 'collocation',
       font: 'stratos-icons'

From 8ede6c2f8afbae6f22ed8fb61f7a37d76425c0ca Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 30 Jun 2020 17:29:53 +0100
Subject: [PATCH 558/648] WIP: Suse Theme updated for new brand

---
 .../suse-login/suse-login.component.scss      |  10 +-
 .../suse-welcome/suse-welcome.component.scss  |   4 +-
 src/frontend/packages/suse-theme/_index.scss  |  36 +-
 .../packages/suse-theme/assets/core/logo.png  | Bin 6902 -> 8263 bytes
 .../packages/suse-theme/assets/favicon.ico    | Bin 1150 -> 1150 bytes
 .../work-sans/work-sans-v8-latin-300.eot      | Bin 0 -> 29376 bytes
 .../work-sans/work-sans-v8-latin-300.svg      | 334 ++++++++++++++++++
 .../work-sans/work-sans-v8-latin-300.ttf      | Bin 0 -> 57264 bytes
 .../work-sans/work-sans-v8-latin-300.woff     | Bin 0 -> 30008 bytes
 .../work-sans/work-sans-v8-latin-300.woff2    | Bin 0 -> 24760 bytes
 .../work-sans/work-sans-v8-latin-600.eot      | Bin 0 -> 29597 bytes
 .../work-sans/work-sans-v8-latin-600.svg      | 332 +++++++++++++++++
 .../work-sans/work-sans-v8-latin-600.ttf      | Bin 0 -> 57392 bytes
 .../work-sans/work-sans-v8-latin-600.woff     | Bin 0 -> 30164 bytes
 .../work-sans/work-sans-v8-latin-600.woff2    | Bin 0 -> 24996 bytes
 .../work-sans/work-sans-v8-latin-regular.eot  | Bin 0 -> 28718 bytes
 .../work-sans/work-sans-v8-latin-regular.svg  | 333 +++++++++++++++++
 .../work-sans/work-sans-v8-latin-regular.ttf  | Bin 0 -> 57280 bytes
 .../work-sans/work-sans-v8-latin-regular.woff | Bin 0 -> 29400 bytes
 .../work-sans-v8-latin-regular.woff2          | Bin 0 -> 24212 bytes
 src/frontend/packages/suse-theme/package.json |  10 +-
 .../sass/{custom.scss => colors.scss}         |  28 +-
 .../suse-theme/sass/custom/suse-colors.scss   |   7 -
 .../packages/suse-theme/sass/custom/suse.scss | 124 -------
 .../packages/suse-theme/sass/font.scss        |  41 +++
 .../packages/suse-theme/sass/suse.scss        |  13 +
 26 files changed, 1128 insertions(+), 144 deletions(-)
 mode change 100644 => 100755 src/frontend/packages/suse-theme/assets/favicon.ico
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.eot
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.svg
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.ttf
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.woff
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.woff2
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.eot
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.svg
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.ttf
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.woff
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.woff2
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.eot
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.svg
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.ttf
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.woff
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.woff2
 rename src/frontend/packages/suse-theme/sass/{custom.scss => colors.scss} (63%)
 delete mode 100644 src/frontend/packages/suse-theme/sass/custom/suse-colors.scss
 delete mode 100644 src/frontend/packages/suse-theme/sass/custom/suse.scss
 create mode 100644 src/frontend/packages/suse-theme/sass/font.scss
 create mode 100644 src/frontend/packages/suse-theme/sass/suse.scss

diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
index 8ea9135bb9..705b180b12 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
@@ -1,9 +1,9 @@
-@import '../../../../suse-theme/sass/custom/suse-colors';
+@import '../../../../suse-theme/sass/colors';
 
 .suse-login {
   align-items: center;
   background-color: $suse-blue;
-  border-bottom: 10px solid $suse-primary;
+  border-bottom: 10px solid $suse-primary-color;
   display: flex;
   flex-direction: column;
   width: 100%;
@@ -38,6 +38,7 @@
     padding: 20px 0;
   }
   &__title {
+    font-family: "Work Sans";
     width: 90%;
   }
   &__copyright {
@@ -51,6 +52,7 @@
   }
   &__intro {
     flex: 1;
+    font-family: "Work Sans";
     margin-right: 24px;
   }
   &__box {
@@ -79,13 +81,15 @@
     margin-top: 24px;
   }
   &__headline {
-    color: $suse-primary;
+    color: $suse-primary-color;
+    font-family: "Work Sans";
     font-size: 52px;
     font-weight: 300;
     margin: 0;
   }
   &__tagline {
     color: $suse-text-gray;
+    font-family: "Work Sans";
     font-size: 18px;
     font-weight: 300;
     line-height: 1.5;
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.scss b/src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.scss
index 21b16098cb..c0e5cadd87 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.scss
@@ -1,4 +1,4 @@
-@import '../../../../suse-theme/sass/custom/suse-colors';
+@import '../../../../suse-theme/sass/colors';
 
 .no-endpoints-message {
   color: $suse-button-gray;
@@ -22,7 +22,7 @@
 .messages {
 
   &__title {
-    color: $suse-primary;
+    color: $suse-primary-color;
     font-size: 20px;
     font-weight: normal;
     margin: 20px 0;
diff --git a/src/frontend/packages/suse-theme/_index.scss b/src/frontend/packages/suse-theme/_index.scss
index a8d3f300e1..55a2786697 100644
--- a/src/frontend/packages/suse-theme/_index.scss
+++ b/src/frontend/packages/suse-theme/_index.scss
@@ -1,9 +1,41 @@
 @import '~@stratosui/theme/helper';
 
-// Custom Theme
-@import './sass/custom';
+@import './sass/colors';
+
+// SUSE overrides
+@import './sass/suse';
 
 @function stratos-theme() {
   $theme: stratos-theme-helper($stratos-theme);
+
+  // Modify some of the colors
+  $app-theme: map-get($theme, app-theme);
+  $app-theme: map-merge($app-theme, (
+    header-background-color: $suse-header-bar,
+    header-foreground-color: $suse-text,
+    header-background-span: true,
+    link-color: $suse-link-color,
+    link-active-color: darken($suse-link-color, 10%),
+    stratos-title-show-text: true,
+    underflow-background-color: $suse-primary-color,
+    underflow-foreground-color: $suse-text,
+    user-avatar-background-color: $suse-primary-color,
+    user-avatar-foreground-color: $suse-text,
+    user-avatar-header-invert-colors: false,
+    intro-screen-background-color: $suse-blue,
+    side-nav: (
+      background: $suse-side-nav-bg,
+      text: $suse-side-nav-text,
+      active: $suse-side-nav-active-bg,
+      active-text: $suse-side-nav-active-text,
+      hover: $suse-side-nav-active-bg,
+      hover-text: $suse-side-nav-active-text
+    )
+  ));
+
+  $theme: map-merge($theme, (
+    app-theme: $app-theme
+  ));
+
   @return $theme
 }
\ No newline at end of file
diff --git a/src/frontend/packages/suse-theme/assets/core/logo.png b/src/frontend/packages/suse-theme/assets/core/logo.png
index 7aa8caef5347fa596bd3563e05d0fb0cc65aba66..3196befd97523c5238578d7f28449421e8852794 100644
GIT binary patch
literal 8263
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
FV1i$7KpFr5

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

diff --git a/src/frontend/packages/suse-theme/assets/favicon.ico b/src/frontend/packages/suse-theme/assets/favicon.ico
old mode 100644
new mode 100755
index 60f452c054d1f20e09e6134830fa80a90dec97f8..b40de3b51d8878713806e26f532f0dad5c8d7772
GIT binary patch
literal 1150
zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYI-D@e%qH;>46vPmomG$qxK
zyYEc*sn})kf5G{@{~-F!*GGylGfJxp)M4z}x*DbO>S8q*A4G>{+1Y{gfWV)>zyALN
z!fB`Cc7f#T_gOvIa<iut#QygCqXbCZ+i#B*KztZ*PEhh*d$sZZu}91QufNvv|HkV>
z|ABhe9eKDU3#5L^$>>*;Pekqku^ac>zH>{`@I3Ztg=b)fg(Jue_hbzZnEfXnulj%X
z+2;Sh|NaE~10;?M*X%L-?~$zS4l)C%<`GEUipy31r=Lo|sRyK{a<?JauXE0%|F?;i
z2mt8^fx5j`4{_OrE)KG%^RU-{klP`;A>^$$$DDhP_#XtSKaY%C4>}*;db2m-=9?p~
xAn{dKYBQp8T&<Axj<U%Mf&c#*7?AOCAiwE75c4xIG%!N&0U-Us9911m4*+zg{VD(e

literal 1150
zcmah}Ye<t(7(P<JQ*m8>1m+)!km!eWQQD97M~f_57b)t84e|nGO)W9aIk7Oqv<4||
zZG+4(TNj&w!<F*_7B1~3>w=AP<s`hM+g!1y^G-k5+QRqaIp^g)&+~rgJMViw#$xyr
z7svRxiRG<kY#n24GY1dx$Wok7QB5L|uuuR<=1_5Ta=4a3KE;wlxuHH^i{VhX=YD!G
zKhfdP4J8tbGmuo038_YjD_wfbc^5pyA#N0{+2$BVa_N4o$xn-lEf=z3egA^XVGhl~
zeTCP*h^j|TD81K+t51#4*&e_+&<Sm?2@Tz?km*&}T5%Y$1?lMfV5b}k+5?~Idud-Q
zS|AX>L%S7{S{dej9?}SB6``ef$lL26)t$$VYq{8XaUZtVo`k07F3LKt2WKv-<e;++
zv!U^~NUA!BnjQn*O^#z?b_%}Vi+K5U3_1ETY*6mOsg`om2sH}RJKRoqIiE~7(uGt*
zK6V@B=y$#beS@sE8Y$&cS{CX{euPc?enH$(1k;!e@t5`@-B1|h$l7bLO`StN=_B?Z
zB=NyHH;F8Z8dD21sIY1wZZCp!b`m0WCQjd06OFXgSO2xM_FFhGSPOA?8Sa1XN6E8h
z#8+padB8-PN{$ul_r>Fe<@+d#2en9O%*L*!GyFXL!TK%tfWqVVLD5!+SKl0z7xR8E
zdR=dDZrFenvm9&NPC(Rh1naqe#PyLV!Twp+Q}3Jm9CjQxlp|G>3sHR*5^hQ%(jSA!
zm;;gSDAMo9G4kURX~X(AB!^;R+U?a1Jw{<?J$4!jkk%?ko}~fW(JuJ@1os?qe@HKY
o=N5WW=nbJpQSYxWk+GRr#-6WQf+~jpCJ6r;kI|aIBMoW)0`L*>j{pDw

diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.eot b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.eot
new file mode 100644
index 0000000000000000000000000000000000000000..f42fa58c9cf7f3d1614302a661cc764292da6475
GIT binary patch
literal 29376
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

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.svg b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.svg
new file mode 100644
index 0000000000..dbd591fe80
--- /dev/null
+++ b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.svg
@@ -0,0 +1,334 @@
+<?xml version="1.0" standalone="no"?>
+<!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">
+<defs >
+<font id="WorkSans" horiz-adv-x="597" ><font-face
+    font-family="Work Sans Light"
+    units-per-em="1000"
+    panose-1="0 0 0 0 0 0 0 0 0 0"
+    ascent="930"
+    descent="-243"
+    alphabetic="0" />
+<glyph unicode=" " horiz-adv-x="313" />
+<glyph unicode="!" horiz-adv-x="230" d="M141 660V340L135 190H95L89 340V660H141ZM115 82Q135 82 147 70T160 37Q160 17 148 5T115 -8Q95 -8 83 4T70 37Q70 57 82 69T115 82Z" />
+<glyph unicode="&quot;" horiz-adv-x="327" d="M262 685L248 480H208V685H262ZM129 685L115 480H75V685H129Z" />
+<glyph unicode="#" horiz-adv-x="636" d="M503 660L398 0H354L459 660H503ZM568 237V198H31V237H568ZM279 660L174 0H130L235 660H279ZM605 467V428H68V467H605Z" />
+<glyph unicode="$" horiz-adv-x="602" d="M310 1Q245 1 193 19T103 73T48 156L91 189Q105 143 136 112T212 63T313 46Q395 46 445 79T495 176Q495 217 467 245T371 288L238 317Q179 330 143 352T90 407T73 479Q73 528 101 569T180 635T303 661Q386 661 445 626T537
+518L497 487Q469 555 419 585T297 616Q242 616 203 599T144 551T124 484Q124 454 136 431T176 392T254 364L381 336Q470 317 508 279T546 180Q546 126 516 86T433 24T310 1ZM285 -100V760H328V-100H285Z" />
+<glyph unicode="%" horiz-adv-x="809" d="M163 0L596 660H645L212 0H163ZM189 665Q238 665 271 642T321 579T338 490Q338 441 321 402T271 339T189 316Q141 316 108 339T57 401T40 490Q40 539 56 578T107 641T189 665ZM189 625Q154 625 131 608T97 560T85 490Q85
+451 96 421T131 373T189 356Q225 356 248 373T282 420T293 490Q293 529 282 559T248 607T189 625ZM620 344Q669 344 702 321T752 259T769 169Q769 120 752 81T702 18T620 -5Q572 -5 538 18T487 80T470 169Q470 219 487 258T538 321T620 344ZM620 304Q585 304 562
+287T527 239T515 169Q515 131 526 101T561 53T620 35Q656 35 678 52T712 100T724 169Q724 208 713 238T679 286T620 304Z" />
+<glyph unicode="&amp;" horiz-adv-x="599" d="M247 -10Q187 -10 142 10T72 68T47 154Q47 190 57 219T89 273T143 322T220 367L245 379Q287 403 317 424T364 472T381 537Q381 578 355 601T283 625Q234 625 207 598T180 528Q180 507 185 489T208 444T258 374T346
+259Q404 186 442 140T507 70T556 37T605 28L593 -10Q565 -10 540 -1T485 34T414 108T313 231Q260 298 226 343T171 419T142 475T133 528Q133 566 150 598T202 649T286 668Q328 668 359 653T407 610T425 542Q425 500 409 467T358 406T269 347L248 339Q197 312 163
+287T111 231T94 158Q94 119 115 91T171 47T250 31Q310 31 353 54T428 117L435 125Q466 170 481 230T493 359L537 356Q539 289 523 222T467 102L458 89Q423 44 371 17T247 -10Z" />
+<glyph unicode="&apos;" horiz-adv-x="194" d="M129 685L115 480H75V685H129Z" />
+<glyph unicode="(" horiz-adv-x="305" d="M257 746L285 717Q221 661 182 595T126 452T108 283Q108 192 125 115T182 -29T285 -151L257 -180Q156 -94 107 21T57 283Q57 430 106 545T257 746Z" />
+<glyph unicode=")" horiz-adv-x="305" d="M48 -180L20 -151Q84 -95 123 -29T179 114T197 283Q197 374 180 451T123 595T20 717L48 746Q149 660 198 545T248 283Q248 136 199 21T48 -180Z" />
+<glyph unicode="*" horiz-adv-x="543" d="M282 511L347 436L421 332L388 308L312 410L261 496L271 503L282 511ZM261 511L271 503L282 496L231 410L155 308L122 332L196 436L261 511ZM62 593L183 555L276 516L271 503L267 492L170 514L50 554L62 593ZM293 730V603L284
+503H271H259L250 603V730H293ZM481 593L493 554L373 514L276 492L271 503L267 516L359 555L481 593Z" />
+<glyph unicode="+" horiz-adv-x="604" d="M326 555V73H279V555H326ZM540 339V293H64V339H540Z" />
+<glyph unicode="," horiz-adv-x="220" d="M111 82Q128 82 140 73T159 47T166 9Q166 -17 157 -43T129 -91T80 -128L52 -103Q77 -94 94 -77T121 -39T130 1L127 2Q124 -3 119 -5T104 -8Q95 -8 86 -3T71 12T65 36Q65 49 71 59T88 76T111 82Z" />
+<glyph unicode="-" horiz-adv-x="466" d="M387 291V240H80V291H387Z" />
+<glyph unicode="." horiz-adv-x="220" d="M110 82Q130 82 142 70T155 37Q155 17 143 5T110 -8Q90 -8 78 4T65 37Q65 57 77 69T110 82Z" />
+<glyph unicode="/" horiz-adv-x="396" d="M364 730L79 -70H31L316 730H364Z" />
+<glyph unicode="0" horiz-adv-x="607" d="M304 -10Q191 -10 127 77T63 330Q63 495 127 582T304 670Q417 670 480 583T544 330Q544 165 481 78T304 -10ZM304 35Q365 35 407 68T471 168T493 330Q493 426 471 492T407 591T304 625Q243 625 201 592T136 492T114 330Q114
+235 136 169T200 69T304 35Z" />
+<glyph unicode="1" horiz-adv-x="355" d="M208 0V523Q208 540 208 557T209 593Q177 553 131 525T36 483L23 528Q45 534 72 546T126 577T177 616T213 660H258V0H208Z" />
+<glyph unicode="2" horiz-adv-x="560" d="M65 0V41Q159 115 228 173T343 280T411 375T433 469Q433 540 390 582T271 624Q193 624 147 575T94 444L50 469Q56 530 84 575T159 645T272 670Q321 670 360 656T427 616T470 552T485 469Q485 402 448 339T333 205T138
+46V45Q146 45 158 45T183 46T204 46H506V0H65Z" />
+<glyph unicode="3" horiz-adv-x="550" d="M277 -10Q189 -10 125 31T41 144L90 170Q100 129 124 99T187 53T281 36Q331 36 367 54T424 105T445 183Q445 226 427 254T376 296T295 310Q279 310 266 310T241 307V357Q251 356 262 356T284 356Q357 356 393 391T429
+492Q429 555 390 589T282 624Q215 624 173 593T112 509L65 532Q80 574 111 605T186 653T283 671Q347 671 391 649T458 587T481 497Q481 464 472 436T446 387T406 352T355 334V333Q388 331 414 319T458 287T487 240T497 182Q497 125 469 82T392 15T277 -10Z" />
+<glyph unicode="4" horiz-adv-x="582" d="M369 0V188H41V226Q41 226 41 226T41 226L355 660H419V231H546V188H419V0H369ZM95 231H369V533Q369 553 369 575T371 618H369Q358 597 343 574T314 531L95 231Q95 231 95 231T95 231Z" />
+<glyph unicode="5" horiz-adv-x="560" d="M281 -10Q195 -10 138 28T57 145L105 169Q120 105 164 71T282 36Q334 36 371 56T430 114T452 201Q452 253 432 289T376 346T289 366Q246 366 214 357T159 331T119 292L76 299L111 660H476V614H153L127 358L125 345H126Q150
+373 191 392T296 412Q359 412 405 386T477 313T504 203Q504 155 488 116T442 48T372 5T281 -10Z" />
+<glyph unicode="6" horiz-adv-x="578" d="M316 670Q367 670 404 655T467 611T509 540L462 518Q448 565 412 594T313 624Q260 624 222 599T158 531T122 433T110 316Q110 301 111 284T114 249H117Q124 303 153 337T224 389T310 407Q376 407 423 382T497 309T523
+198Q523 135 496 88T421 16T305 -10Q226 -10 172 31T90 149T63 330Q63 442 96 517T186 631T316 670ZM306 360Q256 360 219 338T161 279T140 198Q140 154 161 118T219 59T304 37Q382 37 426 81T471 200Q471 248 451 284T395 340T306 360Z" />
+<glyph unicode="7" horiz-adv-x="530" d="M32 660H507V614Q425 527 371 431T289 229T256 0H204Q209 119 238 229T325 440T466 628L473 614H32V660Z" />
+<glyph unicode="8" horiz-adv-x="591" d="M295 669Q357 669 403 649T474 591T500 502Q500 445 469 405T383 348V347Q450 330 489 285T529 174Q529 119 500 78T418 13T295 -10Q226 -10 174 13T92 77T62 174Q62 239 102 284T208 347V348Q154 365 123 404T91 502Q91
+553 116 590T188 648T295 669ZM295 623Q226 623 185 590T143 497Q143 439 185 405T295 370Q365 370 406 404T448 497Q448 556 407 589T295 623ZM295 36Q350 36 391 54T454 103T477 178Q477 222 455 254T391 305T295 323Q241 323 200 305T137 255T114 178Q114 135
+136 104T200 54T295 36Z" />
+<glyph unicode="9" horiz-adv-x="593" d="M285 670Q366 670 420 628T502 510T530 330Q530 218 501 143T417 29T286 -10Q204 -10 146 28T66 135L115 160Q130 106 172 71T287 36Q344 36 382 60T443 127T475 226T485 346Q485 364 483 381T479 415H476Q470 359 440
+323T367 270T280 253Q215 253 167 278T91 349T64 457Q64 523 90 570T167 643T285 670ZM286 623Q206 623 161 578T116 456Q116 385 162 343T284 300Q334 300 372 322T431 381T453 464Q453 510 431 545T372 602T286 623Z" />
+<glyph unicode=":" horiz-adv-x="247" d="M124 505Q144 505 156 493T169 460Q169 440 157 428T124 415Q104 415 92 427T79 460Q79 480 91 492T124 505ZM124 82Q144 82 156 70T169 37Q169 17 157 5T124 -8Q104 -8 92 4T79 37Q79 57 91 69T124 82Z" />
+<glyph unicode=";" horiz-adv-x="247" d="M123 82Q140 82 152 73T171 47T178 9Q178 -17 169 -43T141 -91T92 -128L64 -103Q89 -94 106 -77T133 -39T142 1L139 2Q136 -3 131 -5T116 -8Q107 -8 98 -3T83 12T77 36Q77 49 83 59T100 76T123 82ZM124 505Q144 505 156
+493T169 460Q169 440 157 428T124 415Q104 415 92 427T79 460Q79 480 91 492T124 505Z" />
+<glyph unicode="&lt;" horiz-adv-x="604" d="M540 42L80 270V329L540 557V505L121 301L540 95V42Z" />
+<glyph unicode="=" horiz-adv-x="604" d="M529 432V386H75V432H529ZM529 230V184H75V230H529Z" />
+<glyph unicode="&gt;" horiz-adv-x="604" d="M64 557L524 329V270L64 42V94L483 298L64 504V557Z" />
+<glyph unicode="?" horiz-adv-x="510" d="M258 670Q319 670 365 650T437 591T464 500Q464 443 441 403T375 337T271 299V181H220V326Q290 342 332 364T393 418T412 495Q412 554 371 589T255 624Q176 624 132 585T79 476L35 500Q45 552 73 590T147 649T258 670ZM245
+82Q265 82 277 70T289 37Q289 17 277 5T245 -8Q225 -8 213 4T200 37Q200 57 212 69T245 82Z" />
+<glyph unicode="@" horiz-adv-x="930" d="M479 -184Q386 -184 310 -156T179 -74T95 55T66 223Q66 324 98 403T189 539T325 625T491 655Q586 655 657 624T777 540T849 418T874 276Q874 216 859 165T818 76T757 18T684 -3Q633 -3 610 27T591 102Q568 59 525 32T428
+5Q374 5 335 31T274 102T252 204Q252 260 269 308T316 392T387 449T477 469Q522 469 556 452T610 401T635 323L667 460H712L635 131Q633 121 632 112T630 93Q630 58 649 46T689 33Q728 33 761 63T814 148T835 275Q835 344 813 405T747 515T640 590T493 617Q412
+617 343 591T221 514T139 390T109 223Q109 137 136 69T212 -47T330 -120T479 -146Q557 -146 614 -124T709 -71L732 -103Q704 -126 667 -144T584 -173T479 -184ZM438 44Q489 44 529 74T591 156T614 274Q614 326 597 360T549 412T479 429Q441 429 408 412T350 365T311
+295T297 205Q297 155 315 119T365 64T438 44Z" />
+<glyph unicode="A" horiz-adv-x="625" d="M19 0L283 660H342L606 0H553L337 541L313 611H312L288 543L72 0H19ZM136 207V253H487V207H136Z" />
+<glyph unicode="B" horiz-adv-x="632" d="M104 0V660H337Q446 660 499 615T552 485Q552 428 521 388T431 335V334Q495 324 532 282T570 178Q570 94 510 47T337 0H104ZM154 46H347Q432 46 474 80T517 178Q517 243 475 276T347 310H154V46ZM154 356H338Q499 356
+499 485Q499 614 338 614H154V356Z" />
+<glyph unicode="C" horiz-adv-x="669" d="M626 167Q607 112 570 72T480 11T362 -10Q272 -10 205 31T100 149T62 330Q62 435 99 511T203 628T361 670Q428 670 478 652T564 597T617 507L568 484Q545 553 495 588T364 624Q290 624 234 589T146 488T115 330Q115 239
+145 173T232 72T362 36Q442 36 498 74T576 186L626 167Z" />
+<glyph unicode="D" horiz-adv-x="703" d="M312 660Q470 660 555 577T641 335Q641 172 556 86T312 0H104V660H312ZM316 46Q448 46 518 121T589 335Q589 469 519 541T316 614H154V46H316Z" />
+<glyph unicode="E" horiz-adv-x="612" d="M104 0V660H555V614H154V359H471V312H154V46H571V0H104Z" />
+<glyph unicode="F" horiz-adv-x="584" d="M554 614H154V359H471V312H154V0H104V660H554V614Z" />
+<glyph unicode="G" horiz-adv-x="702" d="M365 -10Q272 -10 204 31T99 149T62 330Q62 435 100 511T207 628T366 670Q467 670 529 630T624 508L578 484Q555 553 502 588T366 624Q292 624 235 589T147 487T115 330Q115 239 144 173T230 72T367 36Q422 36 462 53T529
+99T569 164T582 239V276H358V323H629V0H588L586 143L595 141Q571 71 513 31T365 -10Z" />
+<glyph unicode="H" horiz-adv-x="716" d="M612 660V0H562V660H612ZM154 660V0H104V660H154ZM586 359V312H130V359H586Z" />
+<glyph unicode="I" horiz-adv-x="258" d="M154 660V0H104V660H154Z" />
+<glyph unicode="J" horiz-adv-x="534" d="M437 660V218Q437 112 383 51T227 -10Q157 -10 112 17T48 94T40 210L87 221Q75 130 109 83T226 36Q313 36 350 87T387 229V660H437Z" />
+<glyph unicode="K" horiz-adv-x="610" d="M582 660L306 377L298 369L128 196V264L516 660H582ZM154 660V0H104V660H154ZM310 410L589 0H528L270 380L310 410Z" />
+<glyph unicode="L" horiz-adv-x="572" d="M154 46H550V0H104V660H154V46Z" />
+<glyph unicode="M" horiz-adv-x="822" d="M718 660V0H670V492L676 612H675L434 0H388L147 612H146L152 492V0H104V660H179L378 160L411 59H412L444 159L643 660H718Z" />
+<glyph unicode="N" horiz-adv-x="715" d="M611 660V0H549L199 518L150 603H149L152 523V0H104V660H167L516 143L566 57V57L564 137V660H611Z" />
+<glyph unicode="O" horiz-adv-x="732" d="M366 670Q460 670 528 629T633 511T670 330Q670 225 633 149T528 32T366 -10Q273 -10 205 31T99 149T62 330Q62 435 99 511T204 628T366 670ZM366 624Q289 624 233 589T146 487T115 330Q115 239 145 173T232 72T366 36Q444
+36 500 71T587 173T618 330Q618 421 587 487T500 588T366 624Z" />
+<glyph unicode="P" horiz-adv-x="587" d="M323 660Q392 660 442 637T519 570T547 467Q547 406 520 363T442 297T323 273H154V0H104V660H323ZM317 320Q404 320 449 358T494 467Q494 537 449 575T317 614H154V320H317Z" />
+<glyph unicode="Q" horiz-adv-x="732" d="M535 -195Q484 -195 441 -174T372 -109T345 6Q345 12 345 18T346 30L391 29Q390 23 390 18T390 8Q390 -48 409 -82T462 -130T536 -145Q569 -145 598 -136T647 -108L665 -154Q643 -174 608 -184T535 -195ZM366 670Q460
+670 528 629T633 511T670 330Q670 225 633 149T528 32T366 -10Q273 -10 205 31T99 149T62 330Q62 435 99 511T204 628T366 670ZM366 624Q289 624 233 589T146 487T115 330Q115 239 145 173T232 72T366 36Q444 36 500 71T587 173T618 330Q618 421 587 487T500 588T366
+624Z" />
+<glyph unicode="R" horiz-adv-x="640" d="M349 660Q448 660 506 610T565 473Q565 386 506 338T348 289L343 286H154V0H104V660H349ZM348 333Q428 333 470 369T513 473Q513 541 471 577T348 614H154V333H348ZM387 324L600 0H541L345 296L387 324Z" />
+<glyph unicode="S" horiz-adv-x="619" d="M308 670Q399 670 461 634T557 524L515 492Q486 562 434 593T304 624Q245 624 204 606T142 557T121 488Q121 443 150 413T261 364L390 336Q487 315 526 276T566 174Q566 120 535 78T448 13T319 -10Q248 -10 193 9T99 64T43
+150L87 184Q101 137 133 104T214 53T321 36Q377 36 421 51T489 97T514 171Q514 213 485 242T380 286L244 316Q181 330 142 353T86 408T68 482Q68 533 97 575T180 644T308 670Z" />
+<glyph unicode="T" horiz-adv-x="576" d="M554 660V614H313V0H263V614H22V660H554Z" />
+<glyph unicode="U" horiz-adv-x="687" d="M598 660V241Q598 118 532 54T344 -10Q223 -10 156 54T89 241V660H139V251Q139 145 191 91T344 36Q444 36 496 90T548 251V660H598Z" />
+<glyph unicode="V" horiz-adv-x="614" d="M591 660L337 0H278L23 660H77L272 149L307 47L342 149L538 660H591Z" />
+<glyph unicode="W" horiz-adv-x="937" d="M236 0L30 660H82L268 46L440 660H498L671 45L857 660H907L701 0H639L506 463L469 606H468L431 463L298 0H236Z" />
+<glyph unicode="X" horiz-adv-x="566" d="M541 0H483L282 297L78 0H19L255 339L39 660H99L286 381L476 660H533L313 340L541 0Z" />
+<glyph unicode="Y" horiz-adv-x="544" d="M531 660L297 257V0H247V257L13 660H72L201 434L272 309L343 434L472 660H531Z" />
+<glyph unicode="Z" horiz-adv-x="593" d="M88 28L79 46H553V0H43V44L492 632L501 614H52V660H537V616L88 28Z" />
+<glyph unicode="[" horiz-adv-x="311" d="M288 686H129V-124H288V-168H82V730H288V686Z" />
+<glyph unicode="\" horiz-adv-x="396" d="M32 730H80L364 -70H317L32 730Z" />
+<glyph unicode="]" horiz-adv-x="311" d="M23 -124H182V686H23V730H229V-168H23V-124Z" />
+<glyph unicode="^" horiz-adv-x="547" d="M32 355L249 730H298L516 355H464L274 686L84 355H32Z" />
+<glyph unicode="_" horiz-adv-x="520" d="M520 -97V-143H0V-97H520Z" />
+<glyph unicode="`" horiz-adv-x="523" d="M249 741L329 583H288L195 741H249Z" />
+<glyph unicode="a" horiz-adv-x="543" d="M395 329Q395 394 360 430T260 466Q203 466 162 442T101 360L60 386Q82 445 133 477T261 510Q316 510 357 491T422 433T445 338V88Q445 35 493 35Q514 35 529 42L526 2Q509 -7 482 -7Q459 -7 439 2T407 32T394 89V116L408
+117Q399 74 369 46T298 4T218 -10Q171 -10 134 5T76 48T55 119Q55 175 92 209T198 257L405 298V256L223 220Q164 208 135 185T106 123Q106 81 137 58T225 34Q254 34 284 42T339 67T380 111T395 176V329Z" />
+<glyph unicode="b" horiz-adv-x="607" d="M324 -10Q278 -10 239 7T172 56T131 131L138 139L134 0H89V730H139V366L133 375Q153 437 204 473T324 510Q390 510 441 479T522 390T552 250Q552 169 522 111T441 21T324 -10ZM318 34Q403 34 452 92T502 250Q502 350 453
+408T319 466Q267 466 226 440T162 364T139 249Q139 184 162 135T225 60T318 34Z" />
+<glyph unicode="c" horiz-adv-x="543" d="M291 510Q342 510 382 494T450 448T493 375L446 353Q430 407 391 436T290 466Q235 466 193 441T128 367T105 250Q105 183 128 134T192 60T289 34Q331 34 365 48T422 89T452 153L498 137Q485 91 456 58T384 8T290 -10Q222
+-10 169 21T85 110T55 250Q55 331 85 389T169 479T291 510Z" />
+<glyph unicode="d" horiz-adv-x="607" d="M284 -10Q219 -10 167 21T86 110T56 250Q56 333 87 391T171 479T289 510Q358 510 407 473T474 371L468 366V730H518V0H473L470 139L476 141Q467 93 440 59T372 8T284 -10ZM290 34Q343 34 383 60T445 137T468 254Q468 320
+446 367T384 440T292 466Q206 466 156 408T106 250Q106 150 155 92T290 34Z" />
+<glyph unicode="e" horiz-adv-x="557" d="M293 -10Q224 -10 170 21T86 110T55 250Q55 331 85 389T168 479T287 510Q355 510 403 480T477 397T503 273Q503 264 503 256T501 240H86V285H479L454 278Q453 364 409 415T286 466Q232 466 191 441T127 367T104 250Q104
+183 127 134T193 60T292 34Q350 34 391 59T456 128L496 105Q478 69 448 44T379 4T293 -10Z" />
+<glyph unicode="f" horiz-adv-x="359" d="M272 735Q300 735 320 728T353 708L339 668Q326 680 311 685T276 690Q227 690 200 662T173 579V500V482V0H123V584Q123 618 132 646T161 693T208 724T272 735ZM349 500V457H23V500H349Z" />
+<glyph unicode="g" horiz-adv-x="515" d="M503 592L515 548Q514 548 513 548T510 548Q461 548 435 523T408 451L376 467Q376 505 392 533T436 576T499 592Q501 592 501 592T503 592ZM345 51Q419 51 461 20T503 -63Q503 -109 473 -143T389 -196T268 -215Q155 -215
+95 -177T35 -80Q35 -38 65 -7T155 30L151 21Q119 30 95 51T70 111Q70 153 101 179T185 210L238 192H217Q171 189 144 170T116 119Q116 85 142 68T210 51H345ZM268 -173Q327 -173 369 -159T433 -122T456 -69Q456 -34 426 -13T333 8H191Q144 8 113 -14T82 -73Q82
+-118 131 -145T268 -173ZM261 510Q320 510 365 490T436 433T461 347Q461 299 436 262T366 204T261 183Q166 183 113 228T59 347Q59 396 84 432T155 489T261 510ZM261 469Q195 469 153 436T111 347Q111 292 153 258T261 224Q327 224 368 258T410 347Q410 402 369
+435T261 469Z" />
+<glyph unicode="h" horiz-adv-x="598" d="M89 0V730H139V398Q161 451 210 480T323 510Q379 510 422 490T489 428T514 325V0H464V309Q464 390 424 428T318 467Q271 467 231 445T165 382T139 282V0H89Z" />
+<glyph unicode="i" horiz-adv-x="229" d="M114 597Q95 597 84 608T72 639Q72 658 83 669T114 681Q133 681 144 670T156 639Q156 620 145 609T114 597ZM139 500V0H89V500H139Z" />
+<glyph unicode="j" horiz-adv-x="229" d="M114 597Q95 597 84 608T72 639Q72 658 83 669T114 681Q133 681 144 670T156 639Q156 620 145 609T114 597ZM139 500V-57Q139 -112 119 -147T66 -198T-3 -215Q-30 -215 -52 -207T-90 -187L-78 -140Q-65 -152 -46 -159T-4
+-167Q38 -167 63 -139T89 -53V500H139Z" />
+<glyph unicode="k" horiz-adv-x="527" d="M501 500L281 288L269 276L114 126V190L436 500H501ZM139 730V0H89V730H139ZM284 314L509 0H448L243 285L284 314Z" />
+<glyph unicode="l" horiz-adv-x="274" d="M135 730V118Q135 72 151 53T201 34Q222 34 234 37T264 47L257 3Q244 -3 228 -6T191 -10Q138 -10 112 20T85 116V730H135Z" />
+<glyph unicode="m" horiz-adv-x="960" d="M89 0V500H134L137 396Q159 450 208 480T319 510Q384 510 431 479T497 388Q510 426 539 453T607 496T688 511Q740 511 782 491T850 429T876 325V1H826V320Q826 394 787 430T682 467Q635 467 595 445T532 382T508 288V0H458V319Q458
+393 418 429T314 466Q269 466 229 444T164 381T139 283V0H89Z" />
+<glyph unicode="n" horiz-adv-x="598" d="M89 0V500H134L138 375L130 382Q144 423 172 452T239 495T323 510Q379 510 422 489T489 427T514 324V0H464V308Q464 390 424 428T318 466Q271 466 231 445T165 382T139 282V0H89Z" />
+<glyph unicode="o" horiz-adv-x="585" d="M293 510Q363 510 416 479T500 390T531 250Q531 169 501 111T417 21T293 -10Q223 -10 170 21T86 110T55 250Q55 331 85 389T169 479T293 510ZM293 467Q236 467 194 441T129 367T105 250Q105 183 128 134T194 59T293 33Q350
+33 392 59T457 134T481 250Q481 318 458 366T392 441T293 467Z" />
+<glyph unicode="p" horiz-adv-x="607" d="M89 -210V500H134L138 361L131 369Q144 412 171 444T239 493T326 510Q390 510 441 479T522 390T552 250Q552 169 522 111T441 21T324 -10Q255 -10 204 26T133 125L139 134V-210H89ZM318 34Q403 34 452 92T502 250Q502
+350 453 408T320 466Q267 466 227 440T163 365T139 250Q139 185 162 136T225 61T318 34Z" />
+<glyph unicode="q" horiz-adv-x="607" d="M468 -210V146L476 140Q467 92 439 59T371 8T284 -10Q219 -10 167 21T86 110T56 250Q56 333 87 391T171 479T289 510Q335 510 374 493T440 443T477 364L470 363L473 500H518V-210H468ZM290 34Q343 34 382 60T445 136T468
+252Q468 319 446 367T383 440T291 466Q206 466 156 408T106 250Q106 150 155 92T290 34Z" />
+<glyph unicode="r" horiz-adv-x="378" d="M89 0V500H131L137 396Q156 448 198 479T299 510Q319 510 335 506T362 493L350 449Q339 456 326 460T287 464Q249 464 215 441T160 376T139 280V0H89Z" />
+<glyph unicode="s" horiz-adv-x="505" d="M258 -10Q182 -10 124 21T41 110L84 139Q102 89 148 62T262 34Q328 34 365 60T403 129Q403 158 385 179T315 212L198 237Q127 252 96 285T65 367Q65 407 89 439T155 490T255 510Q330 510 379 481T448 392L406 365Q391
+418 351 442T255 466Q213 466 182 454T133 420T115 370Q115 341 135 318T206 283L326 257Q397 242 425 212T453 136Q453 92 429 59T361 8T258 -10Z" />
+<glyph unicode="t" horiz-adv-x="377" d="M172 639V132Q172 85 194 61T260 36Q288 36 309 45T348 73L367 32Q348 13 319 2T254 -10Q215 -10 185 4T139 49T122 125V625L172 639ZM359 500V457H22V500H359Z" />
+<glyph unicode="u" horiz-adv-x="592" d="M265 -10Q213 -10 172 9T108 68T84 170V500H134V182Q134 104 171 69T277 34Q317 34 349 48T405 87T440 144T453 213V500H503V0H458L456 103Q434 50 384 20T265 -10Z" />
+<glyph unicode="v" horiz-adv-x="502" d="M432 500H485L276 0H226L17 500H73L252 52L432 500Z" />
+<glyph unicode="w" horiz-adv-x="809" d="M726 500H781L611 0H561L403 435L248 0H198L28 500H83L224 60L379 500H430L586 60L726 500Z" />
+<glyph unicode="x" horiz-adv-x="504" d="M98 500L265 283L270 277L482 0H419L240 233L233 241L34 500H98ZM467 500L273 245L267 241L84 0H24L238 277L242 279L407 500H467Z" />
+<glyph unicode="y" horiz-adv-x="500" d="M483 500L241 -92Q223 -138 202 -165T155 -203T95 -215Q65 -215 41 -206T-1 -181L15 -138Q30 -156 51 -163T94 -171Q126 -171 151 -153T198 -80L231 0L178 124L20 500H77L230 121L255 54L282 126L429 500H483Z" />
+<glyph unicode="z" horiz-adv-x="505" d="M49 0V39L343 400L395 458L316 457H46V500H451V461L166 109L106 42L196 43H463V0H49Z" />
+<glyph unicode="{" horiz-adv-x="308" d="M274 -180Q225 -180 194 -166T147 -126T132 -62V162Q132 213 104 237T19 261V305Q76 305 104 329T132 404V627Q132 665 147 691T193 732T274 746V705Q225 705 202 686T179 631V400Q179 354 154 324T82 283Q129 272 154
+242T179 166V-65Q179 -101 202 -120T274 -139V-180Z" />
+<glyph unicode="|" horiz-adv-x="207" d="M126 730V-168H82V730H126Z" />
+<glyph unicode="}" horiz-adv-x="308" d="M34 746Q83 746 114 732T161 692T176 628V404Q176 353 204 329T289 305V261Q232 261 204 237T176 162V-61Q176 -99 161 -125T115 -166T34 -180V-139Q83 -139 106 -120T129 -65V166Q129 212 154 242T226 283Q179 294 154
+324T129 400V631Q129 667 106 686T34 705V746Z" />
+<glyph unicode="~" horiz-adv-x="511" d="M468 389Q462 328 434 297T355 266Q321 266 296 277T251 303T209 329T161 340Q131 340 114 320T91 263H43Q49 324 77 355T157 386Q190 386 215 375T261 349T303 323T351 312Q381 312 397 332T421 389H468Z" />
+<glyph unicode="&#xa0;" horiz-adv-x="313" />
+<glyph unicode="&#xa1;" horiz-adv-x="222" d="M85 -160V160L91 310H131L137 160V-160H85ZM111 418Q91 418 79 430T66 463Q66 483 78 495T111 508Q131 508 143 496T156 463Q156 443 144 431T111 418Z" />
+<glyph unicode="&#xa2;" horiz-adv-x="553" d="M297 -10Q226 -10 173 21T91 110T61 250Q61 331 91 389T174 479T299 510Q350 510 389 494T457 448T500 375L453 353Q437 409 397 439T298 469Q212 469 161 411T109 250Q109 181 132 132T197 57T296 31Q338 31 371
+45T428 87T460 153L505 138Q492 92 463 59T392 8T297 -10ZM270 -100V600H312V-100H270Z" />
+<glyph unicode="&#xa3;" horiz-adv-x="598" d="M87 290V331H458V290H87ZM145 -7Q97 -7 70 14T43 69Q43 92 56 110T93 138T151 149Q191 149 219 138T271 109T316 74T365 45T428 33Q473 33 496 59T520 138H561Q561 89 545 57T501 9T433 -7Q394 -7 364 4T307 33T257
+69T207 99T148 111Q121 111 105 100T89 69Q89 50 105 39T150 28Q192 28 215 45T247 92T256 154Q256 194 242 231T199 318Q179 353 167 379T149 430T144 481Q144 539 170 581T241 647T345 670Q421 670 468 631T531 519L488 496Q477 556 441 590T344 625Q273 625
+232 587T190 481Q190 458 194 438T209 394T237 336Q266 284 281 241T296 158Q296 126 288 97T262 44T215 7T145 -7Z" />
+<glyph unicode="&#xa4;" horiz-adv-x="635" d="M318 528Q375 528 419 503T487 434T512 331Q512 272 488 228T419 158T318 132Q260 132 217 157T148 227T123 331Q123 390 148 434T216 503T318 528ZM318 483Q254 483 214 441T173 331Q173 261 213 219T318 177Q382
+177 422 219T462 331Q462 399 422 441T318 483ZM99 581L212 468L179 437L66 548L99 581ZM179 224L211 192L99 78L66 110L179 224ZM455 223L569 110L537 78L423 190L455 223ZM537 581L569 548L457 435L425 468L537 581Z" />
+<glyph unicode="&#xa5;" horiz-adv-x="596" d="M275 0V119H77V155H275V246H77V284H222L263 282L39 660H97L265 361L297 297H299L331 361L499 660H557L333 282L374 284H520V246H320V155H520V119H320V0H275Z" />
+<glyph unicode="&#xa6;" horiz-adv-x="207" d="M126 730V366H82V730H126ZM126 196V-168H82V196H126Z" />
+<glyph unicode="&#xa7;" horiz-adv-x="569" d="M383 138L354 159Q392 162 422 174T471 207T490 259Q490 297 465 320T373 356L252 380Q195 391 161 409T112 455T97 519Q97 562 121 596T189 650T295 670Q364 670 414 647T490 578L451 548Q430 590 390 608T294 627Q223
+627 184 598T145 523Q145 496 155 477T190 445T260 423L379 401Q438 391 472 373T522 330T538 269Q538 235 520 207T467 161T383 138ZM278 -110Q201 -110 150 -85T76 -16L115 15Q133 -25 174 -46T281 -68Q354 -68 393 -38T433 40Q433 78 408 100T329 133L201 158Q142
+170 107 188T55 232T39 295Q39 329 58 355T109 397T182 419L204 401Q173 395 147 383T104 351T87 302Q87 265 115 241T215 201L338 178Q412 164 446 131T480 43Q480 1 457 -34T388 -89T278 -110Z" />
+<glyph unicode="&#xa8;" horiz-adv-x="523" d="M167 671Q185 671 196 660T207 630Q207 612 196 601T167 590Q149 590 138 601T126 630Q126 649 137 660T167 671ZM356 671Q375 671 386 660T397 630Q397 612 386 601T356 590Q338 590 327 601T316 630Q316 649 327
+660T356 671Z" />
+<glyph unicode="&#xa9;" horiz-adv-x="803" d="M402 -10Q301 -10 225 35T107 157T64 330Q64 427 106 503T225 625T402 670Q503 670 578 625T696 504T739 330Q739 234 697 157T579 35T402 -10ZM402 31Q489 31 554 70T657 178T694 330Q694 415 657 482T555 589T401
+629Q315 629 249 590T146 483T109 330Q109 246 146 178T249 71T402 31ZM411 143Q326 143 278 192T229 328Q229 414 277 463T411 513Q469 513 507 488T564 416L526 397Q513 436 484 455T410 475Q346 475 309 436T272 328Q272 259 309 220T410 181Q456 181 488 203T532
+265L568 250Q552 201 511 172T411 143Z" />
+<glyph unicode="&#xaa;" horiz-adv-x="379" d="M145 327Q96 327 67 350T38 413Q38 452 63 474T146 507L270 529V499L161 478Q117 470 100 456T82 415Q82 391 100 377T150 362Q174 362 200 370T245 400T263 457V550Q263 587 241 608T180 630Q142 630 115 614T72
+562L40 580Q53 618 88 641T178 665Q238 665 272 637T307 552V396Q307 376 315 368T339 359Q355 359 363 364L360 334Q354 331 346 329T328 327Q303 327 286 342T268 392V414L277 411Q268 384 248 365T201 337T145 327ZM38 211V246H347V211H38Z" />
+<glyph unicode="&#xab;" horiz-adv-x="440" d="M239 461L103 265L239 69H183L49 265L183 461H239ZM388 461L252 265L388 69H332L198 265L332 461H388Z" />
+<glyph unicode="&#xac;" horiz-adv-x="604" d="M537 318V152H487V318H537ZM537 339V293H67V339H537Z" />
+<glyph unicode="&#xad;" horiz-adv-x="466" d="M387 291V240H80V291H387Z" />
+<glyph unicode="&#xae;" horiz-adv-x="803" d="M402 -10Q301 -10 225 35T107 157T64 330Q64 427 106 503T225 625T402 670Q503 670 578 626T696 504T739 330Q739 234 697 157T579 35T402 -10ZM514 143L408 304L444 319L562 143H514ZM402 31Q489 31 555 70T657
+178T694 330Q694 415 657 482T555 589T402 629Q315 629 249 590T146 483T109 330Q109 246 146 178T249 71T402 31ZM272 143V513H425Q466 513 495 500T539 463T555 403Q555 351 521 322T425 293H315V143H272ZM315 326H425Q468 326 490 345T513 403Q513 442 491 460T425
+479H315V326Z" />
+<glyph unicode="&#xaf;" horiz-adv-x="523" d="M417 642V600H107V642H417Z" />
+<glyph unicode="&#xb0;" horiz-adv-x="418" d="M209 368Q164 368 130 387T76 441T56 519Q56 563 75 597T129 651T209 670Q255 670 289 651T342 598T362 519Q362 475 343 441T289 388T209 368ZM209 409Q258 409 287 440T317 519Q317 567 288 598T209 629Q161 629
+131 598T100 519Q100 471 130 440T209 409Z" />
+<glyph unicode="&#xb1;" horiz-adv-x="604" d="M326 632V132H279V632H326ZM537 406V359H67V406H537ZM537 46V0H67V46H537Z" />
+<glyph unicode="&#xb2;" horiz-adv-x="358" d="M43 333V366Q69 386 94 406T145 447Q185 479 211 506T251 558T264 610Q264 649 241 673T173 698Q129 698 103 671T74 596L34 609Q38 666 75 700T175 735Q219 735 249 719T295 675T311 612Q311 581 294 550T247 489T176
+428Q158 413 140 399T101 369V368Q109 369 124 369T148 370H323V333H43Z" />
+<glyph unicode="&#xb3;" horiz-adv-x="345" d="M167 735Q228 735 261 705T295 628Q295 601 285 581T257 549T218 533V532Q241 531 260 519T292 487T304 439Q304 405 286 380T237 341T166 327Q109 327 74 351T24 421L66 440Q73 404 97 384T166 364Q207 364 232
+385T258 444Q258 483 232 499T162 516Q158 516 154 516T144 515V549Q150 548 153 548T161 548Q200 548 224 567T248 623Q248 658 227 678T166 698Q130 698 107 681T77 632L36 647Q48 690 83 712T167 735Z" />
+<glyph unicode="&#xb4;" horiz-adv-x="600" d="M313 741H368L274 583H233L313 741Z" />
+<glyph unicode="&#xb5;" horiz-adv-x="598" d="M89 -210V500H139V182Q139 108 178 71T282 34Q332 34 371 56T434 119T458 219V500H508V0H466L463 105Q441 53 392 22T279 -10Q233 -10 196 9T139 66V66V-210H89Z" />
+<glyph unicode="&#xb6;" horiz-adv-x="591" d="M280 -100V221Q207 221 152 248T67 325T36 440Q36 506 67 555T156 632T289 660H505V-100H460V618H326V-100H280ZM280 263V618Q219 618 175 596T108 534T84 440Q84 386 107 346T175 285T280 263Z" />
+<glyph unicode="&#xb7;" horiz-adv-x="210" d="M105 402Q125 402 137 390T150 357Q150 337 138 325T105 312Q85 312 73 324T60 357Q60 377 72 389T105 402Z" />
+<glyph unicode="&#xb8;" horiz-adv-x="547" d="M240 4L272 17Q328 -5 350 -35T373 -106Q373 -150 344 -179T268 -209Q237 -209 214 -200T173 -174L187 -137Q204 -152 222 -160T263 -169Q293 -169 312 -150T331 -97Q331 -68 312 -46T240 4Z" />
+<glyph unicode="&#xb9;" horiz-adv-x="229" d="M130 730H169V333H124V612Q124 627 124 645T126 680Q106 657 76 640T15 614V652Q33 657 56 669T99 697T130 730Z" />
+<glyph unicode="&#xba;" horiz-adv-x="362" d="M181 327Q110 327 71 370T32 496Q32 580 71 622T181 665Q252 665 291 623T330 496Q330 413 291 370T181 327ZM42 211V246H320V211H42ZM181 363Q234 363 259 396T285 496Q285 562 260 596T181 630Q128 630 103 596T77
+496Q77 430 102 397T181 363Z" />
+<glyph unicode="&#xbb;" horiz-adv-x="440" d="M201 69L337 265L201 461H257L391 265L257 69H201ZM52 69L188 265L52 461H108L242 265L108 69H52Z" />
+<glyph unicode="&#xbc;" horiz-adv-x="735" d="M130 921H169V524H124V803Q124 818 124 836T126 871Q106 848 76 831T15 805V843Q33 848 56 860T99 888T130 921ZM81 0L552 660H603L132 0H81ZM711 138V105H635V-4H596V105H398V131L584 393H635V138H711ZM442 138H596V295Q596
+310 596 325T598 355H596Q589 344 581 330T564 305L442 138Z" />
+<glyph unicode="&#xbd;" horiz-adv-x="813" d="M130 921H169V524H124V803Q124 818 124 836T126 871Q106 848 76 831T15 805V843Q33 848 56 860T99 888T130 921ZM81 0L552 660H603L132 0H81ZM498 -4V29Q524 49 549 69T600 110Q640 142 666 169T706 221T719 273Q719
+312 696 336T628 361Q584 361 558 334T529 259L489 272Q493 329 530 363T630 398Q674 398 704 382T750 338T766 275Q766 244 749 213T702 152T631 91Q613 76 595 62T556 32V31Q564 32 579 32T603 33H778V-4H498Z" />
+<glyph unicode="&#xbe;" horiz-adv-x="851" d="M167 926Q228 926 261 896T295 819Q295 792 285 772T257 740T218 724V723Q241 722 260 710T292 678T304 630Q304 596 286 571T237 532T166 518Q109 518 74 542T24 612L66 631Q73 595 97 575T166 555Q207 555 232
+576T258 635Q258 674 232 690T162 707Q158 707 154 707T144 706V740Q150 739 153 739T161 739Q200 739 224 758T248 814Q248 849 227 869T166 889Q130 889 107 872T77 823L36 838Q48 881 83 903T167 926ZM197 0L668 660H719L248 0H197ZM828 138V105H752V-4H713V105H515V131L701
+393H752V138H828ZM559 138H713V295Q713 310 713 325T715 355H713Q706 344 698 330T681 305L559 138Z" />
+<glyph unicode="&#xbf;" horiz-adv-x="505" d="M249 -172Q188 -172 142 -152T70 -93T43 -2Q43 55 66 95T132 161T236 199V317H287V172Q217 156 175 134T114 80T95 3Q95 -56 136 -91T252 -126Q331 -126 375 -87T428 22L472 -2Q462 -54 434 -92T360 -151T249 -172ZM262
+416Q242 416 230 428T218 461Q218 481 230 493T262 506Q282 506 294 494T307 461Q307 441 295 429T262 416Z" />
+<glyph unicode="&#xc0;" horiz-adv-x="625" d="M19 0L283 660H342L606 0H553L337 541L313 611H312L288 543L72 0H19ZM136 207V253H487V207H136ZM266 897L336 743H295L213 897H266Z" />
+<glyph unicode="&#xc1;" horiz-adv-x="625" d="M19 0L283 660H342L606 0H553L337 541L313 611H312L288 543L72 0H19ZM136 207V253H487V207H136ZM358 897H411L328 743H287L358 897Z" />
+<glyph unicode="&#xc2;" horiz-adv-x="625" d="M19 0L283 660H342L606 0H553L337 541L313 611H312L288 543L72 0H19ZM136 207V253H487V207H136ZM451 743H403L313 860L223 743H175L285 894H341L451 743Z" />
+<glyph unicode="&#xc3;" horiz-adv-x="625" d="M19 0L283 660H342L606 0H553L337 541L313 611H312L288 543L72 0H19ZM136 207V253H487V207H136ZM483 861Q479 825 467 800T434 763T385 751Q358 751 339 761T305 785T276 808T243 819Q217 819 204 801T183 750H143Q149
+805 174 832T244 860Q269 860 288 850T322 826T351 803T384 792Q411 792 424 810T443 861H483Z" />
+<glyph unicode="&#xc4;" horiz-adv-x="625" d="M19 0L283 660H342L606 0H553L337 541L313 611H312L288 543L72 0H19ZM136 207V253H487V207H136ZM218 831Q236 831 247 820T258 790Q258 772 247 761T218 750Q200 750 189 761T177 790Q177 809 188 820T218 831ZM407
+831Q426 831 437 820T448 790Q448 772 437 761T407 750Q389 750 378 761T367 790Q367 809 378 820T407 831Z" />
+<glyph unicode="&#xc5;" horiz-adv-x="625" d="M19 0L283 660H342L606 0H553L337 541L313 611H312L288 543L72 0H19ZM136 207V253H487V207H136ZM310 828Q357 828 386 800T415 728Q415 684 386 656T310 627Q264 627 235 655T205 728Q205 772 234 800T310 828ZM310
+795Q281 795 262 776T242 728Q242 699 261 680T310 660Q340 660 359 679T379 728Q379 757 360 776T310 795Z" />
+<glyph unicode="&#xc6;" horiz-adv-x="922" d="M495 46H880V0H445V232H196L56 0H-1L401 660H865V614H495V358H783V312H495V46ZM223 279H445V614H426L223 279Z" />
+<glyph unicode="&#xc7;" horiz-adv-x="669" d="M626 167Q607 112 570 72T480 11T362 -10Q272 -10 205 31T100 149T62 330Q62 435 99 511T203 628T361 670Q428 670 478 652T564 597T617 507L568 484Q545 553 495 588T364 624Q290 624 234 589T146 488T115 330Q115
+239 145 173T232 72T362 36Q442 36 498 74T576 186L626 167ZM310 4L342 17Q398 -5 420 -35T443 -106Q443 -150 414 -179T338 -209Q307 -209 284 -200T243 -174L257 -137Q274 -152 292 -160T333 -169Q363 -169 382 -150T401 -97Q401 -68 382 -46T310 4Z" />
+<glyph unicode="&#xc8;" horiz-adv-x="612" d="M104 0V660H555V614H154V359H471V312H154V46H571V0H104ZM286 897L356 743H315L233 897H286Z" />
+<glyph unicode="&#xc9;" horiz-adv-x="612" d="M104 0V660H555V614H154V359H471V312H154V46H571V0H104ZM374 897H427L344 743H303L374 897Z" />
+<glyph unicode="&#xca;" horiz-adv-x="612" d="M104 0V660H555V614H154V359H471V312H154V46H571V0H104ZM468 743H420L330 860L240 743H192L302 894H358L468 743Z" />
+<glyph unicode="&#xcb;" horiz-adv-x="612" d="M104 0V660H555V614H154V359H471V312H154V46H571V0H104ZM235 831Q253 831 264 820T275 790Q275 772 264 761T235 750Q217 750 206 761T194 790Q194 809 205 820T235 831ZM424 831Q443 831 454 820T465 790Q465 772
+454 761T424 750Q406 750 395 761T384 790Q384 809 395 820T424 831Z" />
+<glyph unicode="&#xcc;" horiz-adv-x="258" d="M154 660V0H104V660H154ZM79 897L149 743H108L26 897H79Z" />
+<glyph unicode="&#xcd;" horiz-adv-x="258" d="M154 660V0H104V660H154ZM179 897H232L149 743H108L179 897Z" />
+<glyph unicode="&#xce;" horiz-adv-x="258" d="M154 660V0H104V660H154ZM267 743H219L129 860L39 743H-9L101 894H157L267 743Z" />
+<glyph unicode="&#xcf;" horiz-adv-x="258" d="M55 831Q74 831 85 820T96 790Q96 772 85 761T55 750Q37 750 26 761T15 790Q15 809 26 820T55 831ZM202 831Q221 831 232 820T243 790Q243 772 232 761T202 750Q184 750 173 761T162 790Q162 809 173 820T202 831ZM154
+660V0H104V660H154Z" />
+<glyph unicode="&#xd0;" horiz-adv-x="715" d="M16 311V357H368V311H16ZM324 660Q482 660 567 577T653 335Q653 172 568 86T324 0H116V660H324ZM329 46Q460 46 530 121T601 335Q601 469 531 541T329 614H166V46H329Z" />
+<glyph unicode="&#xd1;" horiz-adv-x="715" d="M611 660V0H549L199 518L150 603H149L152 523V0H104V660H167L516 143L566 57V57L564 137V660H611ZM533 861Q529 825 517 800T484 763T435 751Q408 751 389 761T355 785T326 808T293 819Q267 819 254 801T233 750H193Q199
+805 224 832T294 860Q319 860 338 850T372 826T401 803T434 792Q461 792 474 810T493 861H533Z" />
+<glyph unicode="&#xd2;" horiz-adv-x="732" d="M366 670Q460 670 528 629T633 511T670 330Q670 225 633 149T528 32T366 -10Q273 -10 205 31T99 149T62 330Q62 435 99 511T204 628T366 670ZM366 624Q289 624 233 589T146 487T115 330Q115 239 145 173T232 72T366
+36Q444 36 500 71T587 173T618 330Q618 421 587 487T500 588T366 624ZM317 897L387 743H346L264 897H317Z" />
+<glyph unicode="&#xd3;" horiz-adv-x="732" d="M366 670Q460 670 528 629T633 511T670 330Q670 225 633 149T528 32T366 -10Q273 -10 205 31T99 149T62 330Q62 435 99 511T204 628T366 670ZM366 624Q289 624 233 589T146 487T115 330Q115 239 145 173T232 72T366
+36Q444 36 500 71T587 173T618 330Q618 421 587 487T500 588T366 624ZM411 897H464L381 743H340L411 897Z" />
+<glyph unicode="&#xd4;" horiz-adv-x="732" d="M366 670Q460 670 528 629T633 511T670 330Q670 225 633 149T528 32T366 -10Q273 -10 205 31T99 149T62 330Q62 435 99 511T204 628T366 670ZM366 624Q289 624 233 589T146 487T115 330Q115 239 145 173T232 72T366
+36Q444 36 500 71T587 173T618 330Q618 421 587 487T500 588T366 624ZM504 743H456L366 860L276 743H228L338 894H394L504 743Z" />
+<glyph unicode="&#xd5;" horiz-adv-x="732" d="M366 670Q460 670 528 629T633 511T670 330Q670 225 633 149T528 32T366 -10Q273 -10 205 31T99 149T62 330Q62 435 99 511T204 628T366 670ZM366 624Q289 624 233 589T146 487T115 330Q115 239 145 173T232 72T366
+36Q444 36 500 71T587 173T618 330Q618 421 587 487T500 588T366 624ZM536 861Q532 825 520 800T487 763T438 751Q411 751 392 761T358 785T329 808T296 819Q270 819 257 801T236 750H196Q202 805 227 832T297 860Q322 860 341 850T375 826T404 803T437 792Q464
+792 477 810T496 861H536Z" />
+<glyph unicode="&#xd6;" horiz-adv-x="732" d="M366 670Q460 670 528 629T633 511T670 330Q670 225 633 149T528 32T366 -10Q273 -10 205 31T99 149T62 330Q62 435 99 511T204 628T366 670ZM366 624Q289 624 233 589T146 487T115 330Q115 239 145 173T232 72T366
+36Q444 36 500 71T587 173T618 330Q618 421 587 487T500 588T366 624ZM271 831Q289 831 300 820T311 790Q311 772 300 761T271 750Q253 750 242 761T230 790Q230 809 241 820T271 831ZM460 831Q479 831 490 820T501 790Q501 772 490 761T460 750Q442 750 431 761T420
+790Q420 809 431 820T460 831Z" />
+<glyph unicode="&#xd7;" horiz-adv-x="604" d="M468 114L502 149L135 516L101 481L468 114ZM135 114L502 481L468 516L101 149L135 114Z" />
+<glyph unicode="&#xd8;" horiz-adv-x="732" d="M201 61L172 86L529 589L560 566L201 61ZM87 -34L172 86L201 61L134 -34H87ZM560 566L529 589L598 686H646L560 566ZM366 670Q460 670 528 629T633 511T670 330Q670 225 633 149T528 32T366 -10Q273 -10 205 31T99
+149T62 330Q62 435 99 511T204 628T366 670ZM366 624Q289 624 233 589T146 487T115 330Q115 239 145 173T232 72T366 36Q444 36 500 71T587 173T618 330Q618 421 587 487T500 588T366 624Z" />
+<glyph unicode="&#xd9;" horiz-adv-x="687" d="M598 660V241Q598 118 532 54T344 -10Q223 -10 156 54T89 241V660H139V251Q139 145 191 91T344 36Q444 36 496 90T548 251V660H598ZM323 884L393 730H352L270 884H323Z" />
+<glyph unicode="&#xda;" horiz-adv-x="687" d="M598 660V241Q598 118 532 54T344 -10Q223 -10 156 54T89 241V660H139V251Q139 145 191 91T344 36Q444 36 496 90T548 251V660H598ZM389 865H442L359 711H318L389 865Z" />
+<glyph unicode="&#xdb;" horiz-adv-x="687" d="M598 660V241Q598 118 532 54T344 -10Q223 -10 156 54T89 241V660H139V251Q139 145 191 91T344 36Q444 36 496 90T548 251V660H598ZM482 711H434L344 828L254 711H206L316 862H372L482 711Z" />
+<glyph unicode="&#xdc;" horiz-adv-x="687" d="M598 660V241Q598 118 532 54T344 -10Q223 -10 156 54T89 241V660H139V251Q139 145 191 91T344 36Q444 36 496 90T548 251V660H598ZM249 799Q267 799 278 788T289 758Q289 740 278 729T249 718Q231 718 220 729T208
+758Q208 777 219 788T249 799ZM438 799Q457 799 468 788T479 758Q479 740 468 729T438 718Q420 718 409 729T398 758Q398 777 409 788T438 799Z" />
+<glyph unicode="&#xdd;" horiz-adv-x="544" d="M531 660L297 257V0H247V257L13 660H72L201 434L272 309L343 434L472 660H531ZM317 868H370L287 714H246L317 868Z" />
+<glyph unicode="&#xde;" horiz-adv-x="599" d="M312 534Q431 534 491 484T551 338Q551 244 491 194T312 143H129V189H320Q499 189 499 338Q499 413 455 450T320 488H129V534H312ZM154 660V0H104V660H154Z" />
+<glyph unicode="&#xdf;" horiz-adv-x="588" d="M356 383Q418 381 457 356T515 289T535 195Q535 137 514 91T451 17T348 -10Q303 -10 272 0T222 25L239 67Q260 52 284 44T346 35Q412 35 449 80T486 196Q486 278 440 318T312 359H260V403H306Q376 403 416 445T456
+554Q456 620 415 654T307 689Q219 689 179 638T139 488V0H89V506Q89 576 111 627T183 707T312 735Q376 735 419 712T484 650T507 562Q507 516 489 477T437 412T356 384V383Z" />
+<glyph unicode="&#xe0;" horiz-adv-x="543" d="M395 329Q395 394 360 430T260 466Q203 466 162 442T101 360L60 386Q82 445 133 477T261 510Q316 510 357 491T422 433T445 338V88Q445 35 493 35Q514 35 529 42L526 2Q509 -7 482 -7Q459 -7 439 2T407 32T394 89V116L408
+117Q399 74 369 46T298 4T218 -10Q171 -10 134 5T76 48T55 119Q55 175 92 209T198 257L405 298V256L223 220Q164 208 135 185T106 123Q106 81 137 58T225 34Q254 34 284 42T339 67T380 111T395 176V329ZM207 741L287 583H246L153 741H207Z" />
+<glyph unicode="&#xe1;" horiz-adv-x="543" d="M395 329Q395 394 360 430T260 466Q203 466 162 442T101 360L60 386Q82 445 133 477T261 510Q316 510 357 491T422 433T445 338V88Q445 35 493 35Q514 35 529 42L526 2Q509 -7 482 -7Q459 -7 439 2T407 32T394 89V116L408
+117Q399 74 369 46T298 4T218 -10Q171 -10 134 5T76 48T55 119Q55 175 92 209T198 257L405 298V256L223 220Q164 208 135 185T106 123Q106 81 137 58T225 34Q254 34 284 42T339 67T380 111T395 176V329ZM311 741H366L272 583H231L311 741Z" />
+<glyph unicode="&#xe2;" horiz-adv-x="543" d="M395 329Q395 394 360 430T260 466Q203 466 162 442T101 360L60 386Q82 445 133 477T261 510Q316 510 357 491T422 433T445 338V88Q445 35 493 35Q514 35 529 42L526 2Q509 -7 482 -7Q459 -7 439 2T407 32T394 89V116L408
+117Q399 74 369 46T298 4T218 -10Q171 -10 134 5T76 48T55 119Q55 175 92 209T198 257L405 298V256L223 220Q164 208 135 185T106 123Q106 81 137 58T225 34Q254 34 284 42T339 67T380 111T395 176V329ZM399 579H353L260 701L167 579H121L232 735H288L399 579Z"
+/>
+<glyph unicode="&#xe3;" horiz-adv-x="543" d="M395 329Q395 394 360 430T260 466Q203 466 162 442T101 360L60 386Q82 445 133 477T261 510Q316 510 357 491T422 433T445 338V88Q445 35 493 35Q514 35 529 42L526 2Q509 -7 482 -7Q459 -7 439 2T407 32T394 89V116L408
+117Q399 74 369 46T298 4T218 -10Q171 -10 134 5T76 48T55 119Q55 175 92 209T198 257L405 298V256L223 220Q164 208 135 185T106 123Q106 81 137 58T225 34Q254 34 284 42T339 67T380 111T395 176V329ZM430 701Q426 665 414 640T381 603T332 591Q305 591 286 601T252
+625T223 648T190 659Q164 659 151 641T130 590H90Q96 645 121 672T191 700Q216 700 235 690T269 666T298 643T331 632Q358 632 371 650T390 701H430Z" />
+<glyph unicode="&#xe4;" horiz-adv-x="543" d="M395 329Q395 394 360 430T260 466Q203 466 162 442T101 360L60 386Q82 445 133 477T261 510Q316 510 357 491T422 433T445 338V88Q445 35 493 35Q514 35 529 42L526 2Q509 -7 482 -7Q459 -7 439 2T407 32T394 89V116L408
+117Q399 74 369 46T298 4T218 -10Q171 -10 134 5T76 48T55 119Q55 175 92 209T198 257L405 298V256L223 220Q164 208 135 185T106 123Q106 81 137 58T225 34Q254 34 284 42T339 67T380 111T395 176V329ZM165 671Q183 671 194 660T205 630Q205 612 194 601T165 590Q147
+590 136 601T124 630Q124 649 135 660T165 671ZM354 671Q373 671 384 660T395 630Q395 612 384 601T354 590Q336 590 325 601T314 630Q314 649 325 660T354 671Z" />
+<glyph unicode="&#xe5;" horiz-adv-x="543" d="M395 329Q395 394 360 430T260 466Q203 466 162 442T101 360L60 386Q82 445 133 477T261 510Q316 510 357 491T422 433T445 338V88Q445 35 493 35Q514 35 529 42L526 2Q509 -7 482 -7Q459 -7 439 2T407 32T394 89V116L408
+117Q399 74 369 46T298 4T218 -10Q171 -10 134 5T76 48T55 119Q55 175 92 209T198 257L405 298V256L223 220Q164 208 135 185T106 123Q106 81 137 58T225 34Q254 34 284 42T339 67T380 111T395 176V329ZM257 776Q304 776 333 748T362 676Q362 632 333 604T257 575Q211
+575 182 603T152 676Q152 720 181 748T257 776ZM257 743Q228 743 209 724T189 676Q189 647 208 628T257 608Q287 608 306 627T326 676Q326 705 307 724T257 743Z" />
+<glyph unicode="&#xe6;" horiz-adv-x="885" d="M220 -10Q172 -10 135 5T77 48T55 119Q55 175 92 209T196 257L395 295V329Q395 394 359 430T259 466Q205 466 164 442T101 360L60 386Q76 426 104 453T171 495T258 510Q331 510 379 475T436 365L422 368Q437 412
+466 444T536 493T623 510Q688 510 734 481T805 399T830 281Q830 271 830 263T828 248H445V238Q448 142 496 88T628 34Q681 34 722 59T786 128L826 105Q807 69 778 44T710 4T629 -10Q550 -10 493 31T415 147L430 152Q427 110 407 80T357 29T291 0T220 -10ZM225 34Q256
+34 286 42T341 68T380 114T395 180V252L223 220Q164 208 135 185T106 123Q106 81 137 58T225 34ZM448 292H781Q780 344 761 383T706 444T622 466Q552 466 505 421T448 292Z" />
+<glyph unicode="&#xe7;" horiz-adv-x="543" d="M291 510Q342 510 382 494T450 448T493 375L446 353Q430 407 391 436T290 466Q235 466 193 441T128 367T105 250Q105 183 128 134T192 60T289 34Q331 34 365 48T422 89T452 153L498 137Q485 91 456 58T384 8T290
+-10Q222 -10 169 21T85 110T55 250Q55 331 85 389T169 479T291 510ZM242 4L274 17Q330 -5 352 -35T375 -106Q375 -150 346 -179T270 -209Q239 -209 216 -200T175 -174L189 -137Q206 -152 224 -160T265 -169Q295 -169 314 -150T333 -97Q333 -68 314 -46T242 4Z"
+/>
+<glyph unicode="&#xe8;" horiz-adv-x="557" d="M293 -10Q224 -10 170 21T86 110T55 250Q55 331 85 389T168 479T287 510Q355 510 403 480T477 397T503 273Q503 264 503 256T501 240H86V285H479L454 278Q453 364 409 415T286 466Q232 466 191 441T127 367T104 250Q104
+183 127 134T193 60T292 34Q350 34 391 59T456 128L496 105Q478 69 448 44T379 4T293 -10ZM229 741L309 583H268L175 741H229Z" />
+<glyph unicode="&#xe9;" horiz-adv-x="557" d="M293 -10Q224 -10 170 21T86 110T55 250Q55 331 85 389T168 479T287 510Q355 510 403 480T477 397T503 273Q503 264 503 256T501 240H86V285H479L454 278Q453 364 409 415T286 466Q232 466 191 441T127 367T104 250Q104
+183 127 134T193 60T292 34Q350 34 391 59T456 128L496 105Q478 69 448 44T379 4T293 -10ZM333 741H388L294 583H253L333 741Z" />
+<glyph unicode="&#xea;" horiz-adv-x="557" d="M293 -10Q224 -10 170 21T86 110T55 250Q55 331 85 389T168 479T287 510Q355 510 403 480T477 397T503 273Q503 264 503 256T501 240H86V285H479L454 278Q453 364 409 415T286 466Q232 466 191 441T127 367T104 250Q104
+183 127 134T193 60T292 34Q350 34 391 59T456 128L496 105Q478 69 448 44T379 4T293 -10ZM421 579H375L282 701L189 579H143L254 735H310L421 579Z" />
+<glyph unicode="&#xeb;" horiz-adv-x="557" d="M293 -10Q224 -10 170 21T86 110T55 250Q55 331 85 389T168 479T287 510Q355 510 403 480T477 397T503 273Q503 264 503 256T501 240H86V285H479L454 278Q453 364 409 415T286 466Q232 466 191 441T127 367T104 250Q104
+183 127 134T193 60T292 34Q350 34 391 59T456 128L496 105Q478 69 448 44T379 4T293 -10ZM187 671Q205 671 216 660T227 630Q227 612 216 601T187 590Q169 590 158 601T146 630Q146 649 157 660T187 671ZM376 671Q395 671 406 660T417 630Q417 612 406 601T376
+590Q358 590 347 601T336 630Q336 649 347 660T376 671Z" />
+<glyph unicode="&#xec;" horiz-adv-x="229" d="M139 500V0H89V500H139ZM61 741L141 583H100L7 741H61Z" />
+<glyph unicode="&#xed;" horiz-adv-x="229" d="M139 500V0H89V500H139ZM165 741H220L126 583H85L165 741Z" />
+<glyph unicode="&#xee;" horiz-adv-x="229" d="M139 500V0H89V500H139ZM253 579H207L114 701L21 579H-25L86 735H142L253 579Z" />
+<glyph unicode="&#xef;" horiz-adv-x="229" d="M180 590Q162 590 151 601T139 630Q139 649 150 660T180 671Q199 671 210 660T221 630Q221 612 210 601T180 590ZM48 590Q30 590 19 601T8 630Q8 649 19 660T48 671Q67 671 78 660T89 630Q89 612 78 601T48 590ZM139
+500V0H89V500H139Z" />
+<glyph unicode="&#xf0;" horiz-adv-x="600" d="M293 -10Q220 -10 167 20T86 106T57 238Q57 314 87 369T169 455T288 485Q366 485 416 451T487 358L480 349Q474 421 453 480T399 585T321 668T221 730H294Q348 702 391 662T465 567T513 443T530 286Q530 193 503
+127T423 25T293 -10ZM295 34Q356 34 397 63T460 141T481 248Q481 308 457 351T391 418T294 441Q237 441 196 416T131 346T108 238Q108 143 158 89T295 34ZM217 552L207 591L399 632L421 601L217 552ZM421 601L399 632L531 665L542 628L421 601Z" />
+<glyph unicode="&#xf1;" horiz-adv-x="598" d="M89 0V500H134L138 375L130 382Q144 423 172 452T239 495T323 510Q379 510 422 489T489 427T514 324V0H464V308Q464 390 424 428T318 466Q271 466 231 445T165 382T139 282V0H89ZM476 701Q472 665 460 640T427 603T378
+591Q351 591 332 601T298 625T269 648T236 659Q210 659 197 641T176 590H136Q142 645 167 672T237 700Q262 700 281 690T315 666T344 643T377 632Q404 632 417 650T436 701H476Z" />
+<glyph unicode="&#xf2;" horiz-adv-x="585" d="M293 510Q363 510 416 479T500 390T531 250Q531 169 501 111T417 21T293 -10Q223 -10 170 21T86 110T55 250Q55 331 85 389T169 479T293 510ZM293 467Q236 467 194 441T129 367T105 250Q105 183 128 134T194 59T293
+33Q350 33 392 59T457 134T481 250Q481 318 458 366T392 441T293 467ZM240 739L320 581H279L186 739H240Z" />
+<glyph unicode="&#xf3;" horiz-adv-x="585" d="M293 510Q363 510 416 479T500 390T531 250Q531 169 501 111T417 21T293 -10Q223 -10 170 21T86 110T55 250Q55 331 85 389T169 479T293 510ZM293 467Q236 467 194 441T129 367T105 250Q105 183 128 134T194 59T293
+33Q350 33 392 59T457 134T481 250Q481 318 458 366T392 441T293 467ZM344 739H399L305 581H264L344 739Z" />
+<glyph unicode="&#xf4;" horiz-adv-x="585" d="M293 510Q363 510 416 479T500 390T531 250Q531 169 501 111T417 21T293 -10Q223 -10 170 21T86 110T55 250Q55 331 85 389T169 479T293 510ZM293 467Q236 467 194 441T129 367T105 250Q105 183 128 134T194 59T293
+33Q350 33 392 59T457 134T481 250Q481 318 458 366T392 441T293 467ZM432 577H386L293 699L200 577H154L265 733H321L432 577Z" />
+<glyph unicode="&#xf5;" horiz-adv-x="585" d="M293 510Q363 510 416 479T500 390T531 250Q531 169 501 111T417 21T293 -10Q223 -10 170 21T86 110T55 250Q55 331 85 389T169 479T293 510ZM293 467Q236 467 194 441T129 367T105 250Q105 183 128 134T194 59T293
+33Q350 33 392 59T457 134T481 250Q481 318 458 366T392 441T293 467ZM463 699Q459 663 447 638T414 601T365 589Q338 589 319 599T285 623T256 646T223 657Q197 657 184 639T163 588H123Q129 643 154 670T224 698Q249 698 268 688T302 664T331 641T364 630Q391
+630 404 648T423 699H463Z" />
+<glyph unicode="&#xf6;" horiz-adv-x="585" d="M293 510Q363 510 416 479T500 390T531 250Q531 169 501 111T417 21T293 -10Q223 -10 170 21T86 110T55 250Q55 331 85 389T169 479T293 510ZM293 467Q236 467 194 441T129 367T105 250Q105 183 128 134T194 59T293
+33Q350 33 392 59T457 134T481 250Q481 318 458 366T392 441T293 467ZM198 669Q216 669 227 658T238 628Q238 610 227 599T198 588Q180 588 169 599T157 628Q157 647 168 658T198 669ZM387 669Q406 669 417 658T428 628Q428 610 417 599T387 588Q369 588 358 599T347
+628Q347 647 358 658T387 669Z" />
+<glyph unicode="&#xf7;" horiz-adv-x="604" d="M537 339V293H67V339H537ZM302 170Q322 170 334 158T347 126Q347 106 335 94T302 81Q282 81 270 93T257 126Q257 146 269 158T302 170ZM302 552Q322 552 334 540T347 507Q347 487 335 475T302 462Q282 462 270 474T257
+507Q257 527 269 539T302 552Z" />
+<glyph unicode="&#xf8;" horiz-adv-x="585" d="M293 510Q363 510 416 479T500 390T531 250Q531 169 501 111T417 21T293 -10Q223 -10 170 21T86 110T55 250Q55 331 85 389T169 479T293 510ZM293 467Q236 467 194 441T129 367T105 250Q105 183 128 134T194 59T293
+33Q350 33 392 59T457 134T481 250Q481 318 458 366T392 441T293 467ZM310 -30L744 530H788L354 -30H310Z" />
+<glyph unicode="&#xf9;" horiz-adv-x="592" d="M265 -10Q213 -10 172 9T108 68T84 170V500H134V182Q134 104 171 69T277 34Q317 34 349 48T405 87T440 144T453 213V500H503V0H458L456 103Q434 50 384 20T265 -10ZM241 726L321 568H280L187 726H241Z" />
+<glyph unicode="&#xfa;" horiz-adv-x="592" d="M265 -10Q213 -10 172 9T108 68T84 170V500H134V182Q134 104 171 69T277 34Q317 34 349 48T405 87T440 144T453 213V500H503V0H458L456 103Q434 50 384 20T265 -10ZM345 726H400L306 568H265L345 726Z" />
+<glyph unicode="&#xfb;" horiz-adv-x="592" d="M265 -10Q213 -10 172 9T108 68T84 170V500H134V182Q134 104 171 69T277 34Q317 34 349 48T405 87T440 144T453 213V500H503V0H458L456 103Q434 50 384 20T265 -10ZM433 564H387L294 686L201 564H155L266 720H322L433 564Z" />
+<glyph unicode="&#xfc;" horiz-adv-x="592" d="M265 -10Q213 -10 172 9T108 68T84 170V500H134V182Q134 104 171 69T277 34Q317 34 349 48T405 87T440 144T453 213V500H503V0H458L456 103Q434 50 384 20T265 -10ZM199 656Q217 656 228 645T239 615Q239 597 228
+586T199 575Q181 575 170 586T158 615Q158 634 169 645T199 656ZM388 656Q407 656 418 645T429 615Q429 597 418 586T388 575Q370 575 359 586T348 615Q348 634 359 645T388 656Z" />
+<glyph unicode="&#xfd;" horiz-adv-x="500" d="M483 500L241 -92Q223 -138 202 -165T155 -203T95 -215Q65 -215 41 -206T-1 -181L15 -138Q30 -156 51 -163T94 -171Q126 -171 151 -153T198 -80L231 0L178 124L20 500H77L230 121L255 54L282 126L429 500H483ZM303
+726H358L264 568H223L303 726Z" />
+<glyph unicode="&#xfe;" horiz-adv-x="607" d="M89 -210V730H139V361L133 374Q152 437 204 473T324 510Q390 510 441 479T522 390T552 250Q552 169 522 111T441 21T324 -10Q255 -10 204 26T133 125L139 134V-210H89ZM318 34Q403 34 452 92T502 250Q502 350 453
+408T320 466Q267 466 227 440T163 365T139 250Q139 185 162 136T225 61T318 34Z" />
+<glyph unicode="&#xff;" horiz-adv-x="500" d="M483 500L241 -92Q223 -138 202 -165T155 -203T95 -215Q65 -215 41 -206T-1 -181L15 -138Q30 -156 51 -163T94 -171Q126 -171 151 -153T198 -80L231 0L178 124L20 500H77L230 121L255 54L282 126L429 500H483ZM157
+656Q175 656 186 645T197 615Q197 597 186 586T157 575Q139 575 128 586T116 615Q116 634 127 645T157 656ZM346 656Q365 656 376 645T387 615Q387 597 376 586T346 575Q328 575 317 586T306 615Q306 634 317 645T346 656Z" />
+<glyph unicode="&#x2013;" horiz-adv-x="638" d="M563 289V242H75V289H563Z" />
+<glyph unicode="&#x2014;" horiz-adv-x="979" d="M903 289V242H75V289H903Z" />
+<glyph unicode="&#x2018;" horiz-adv-x="217" d="M108 486Q91 486 79 495T60 521T53 559Q53 585 62 611T90 659T139 696L167 671Q142 662 125 645T98 607T89 567L92 566Q95 571 100 573T115 576Q124 576 133 571T148 556T154 532Q154 519 148 509T131 492T108 486Z" />
+<glyph unicode="&#x2019;" horiz-adv-x="216" d="M113 694Q130 694 142 685T161 659T168 621Q168 595 159 569T131 521T82 484L54 509Q79 518 96 535T123 573T132 613L129 614Q126 609 121 607T106 604Q97 604 88 609T73 624T67 648Q67 661 73 671T90 688T113 694Z" />
+<glyph unicode="&#x201a;" horiz-adv-x="216" d="M113 82Q130 82 142 73T161 47T168 9Q168 -17 159 -43T131 -91T82 -128L54 -103Q79 -94 96 -77T123 -39T132 1L129 2Q126 -3 121 -5T106 -8Q97 -8 88 -3T73 12T67 36Q67 49 73 59T90 76T113 82Z" />
+<glyph unicode="&#x201c;" horiz-adv-x="362" d="M108 486Q91 486 79 495T60 521T53 559Q53 585 62 611T90 659T139 696L167 671Q142 662 125 645T98 607T89 567L92 566Q95 571 100 573T115 576Q124 576 133 571T148 556T154 532Q154 519 148 509T131 492T108
+486ZM254 486Q237 486 225 495T206 521T199 559Q199 585 208 611T236 659T285 696L313 671Q288 662 271 645T244 607T235 567L238 566Q241 571 246 573T261 576Q270 576 279 571T294 556T300 532Q300 519 294 509T277 492T254 486Z" />
+<glyph unicode="&#x201d;" horiz-adv-x="362" d="M113 694Q130 694 142 685T161 659T168 621Q168 595 159 569T131 521T82 484L54 509Q79 518 96 535T123 573T132 613L129 614Q126 609 121 607T106 604Q97 604 88 609T73 624T67 648Q67 661 73 671T90 688T113
+694ZM259 694Q276 694 288 685T307 659T314 621Q314 595 305 569T277 521T228 484L200 509Q225 518 242 535T269 573T278 613L275 614Q272 609 267 607T252 604Q243 604 234 609T219 624T213 648Q213 661 219 671T236 688T259 694Z" />
+<glyph unicode="&#x201e;" horiz-adv-x="362" d="M113 82Q130 82 142 73T161 47T168 9Q168 -17 159 -43T131 -91T82 -128L54 -103Q79 -94 96 -77T123 -39T132 1L129 2Q126 -3 121 -5T106 -8Q97 -8 88 -3T73 12T67 36Q67 49 73 59T90 76T113 82ZM259 82Q276 82
+288 73T307 47T314 9Q314 -17 305 -43T277 -91T228 -128L200 -103Q225 -94 242 -77T269 -39T278 1L275 2Q272 -3 267 -5T252 -8Q243 -8 234 -3T219 12T213 36Q213 49 219 59T236 76T259 82Z" />
+<glyph unicode="&#x2022;" horiz-adv-x="430" d="M215 246Q174 246 147 272T120 338Q120 378 147 404T215 430Q256 430 283 404T310 338Q310 298 284 272T215 246Z" />
+<glyph unicode="&#x2039;" horiz-adv-x="290" d="M239 461L103 265L239 69H183L49 265L183 461H239Z" />
+<glyph unicode="&#x203a;" horiz-adv-x="290" d="M51 69L187 265L51 461H107L241 265L107 69H51Z" />
+</font>
+</defs>
+</svg>
diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.ttf b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..5fdcd056b7d71a0b968b0dd9f7ce0ed2805795e0
GIT binary patch
literal 57264
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
RAELRWd{S2B3YRnD`(NurjT!&|

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.woff b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.woff
new file mode 100644
index 0000000000000000000000000000000000000000..cf6e7ce85261a3d8d35c19404bb083f2384befa8
GIT binary patch
literal 30008
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
Jnl*L+006XGE6@M{

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.woff2 b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..c44811168b1cc6d5953c4b850c7a1e114953da09
GIT binary patch
literal 24760
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
I?x<kRMYXNq1poj5

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.eot b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.eot
new file mode 100644
index 0000000000000000000000000000000000000000..4a81648342a5944f35657cf1130096e6b11931a4
GIT binary patch
literal 29597
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
Rp1oN41BnMQa!RB}FrXi<>I47)

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.svg b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.svg
new file mode 100644
index 0000000000..27f05ee28d
--- /dev/null
+++ b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.svg
@@ -0,0 +1,332 @@
+<?xml version="1.0" standalone="no"?>
+<!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">
+<defs >
+<font id="WorkSans" horiz-adv-x="597" ><font-face
+    font-family="Work Sans SemiBold"
+    units-per-em="1000"
+    panose-1="0 0 0 0 0 0 0 0 0 0"
+    ascent="930"
+    descent="-243"
+    alphabetic="0" />
+<glyph unicode=" " horiz-adv-x="306" />
+<glyph unicode="!" horiz-adv-x="291" d="M217 660V420L200 213H90L73 420V660H217ZM145 145Q184 145 207 124T230 68Q230 32 207 12T145 -9Q106 -9 83 11T60 68Q60 103 83 124T145 145Z" />
+<glyph unicode="&quot;" horiz-adv-x="431" d="M379 682L351 416H257V682H379ZM192 682L164 416H70V682H192Z" />
+<glyph unicode="#" horiz-adv-x="670" d="M555 660L447 0H349L457 660H555ZM603 256V169H24V256H603ZM314 660L206 0H108L215 660H314ZM646 492V405H67V492H646Z" />
+<glyph unicode="$" horiz-adv-x="634" d="M323 1Q257 1 201 17T102 61T29 126L105 216Q127 182 162 158T241 120T331 106Q392 106 427 126T462 185Q462 210 443 228T375 257L235 289Q179 302 139 325T79 381T58 459Q58 517 89 562T179 634T321 661Q408 661 474
+631T587 542L514 459Q474 510 426 533T313 557Q268 557 240 547T199 518T185 477Q185 459 193 445T223 420T288 398L408 371Q502 350 543 310T585 202Q585 138 552 93T460 25T323 1ZM276 -92V752H369V-92H276Z" />
+<glyph unicode="%" horiz-adv-x="908" d="M177 0L622 660H732L287 0H177ZM210 670Q264 670 303 647T364 582T386 484Q386 428 365 387T304 322T210 298Q157 298 117 321T56 386T34 484Q34 540 55 582T117 647T210 670ZM210 575Q188 575 172 565T148 534T140 484Q140
+456 148 436T172 405T210 394Q233 394 248 404T272 435T280 484Q280 513 272 533T249 564T210 575ZM698 362Q751 362 790 339T852 274T874 176Q874 120 852 78T791 13T698 -10Q645 -10 605 13T544 78T522 176Q522 232 543 273T605 338T698 362ZM698 266Q675 266
+660 256T636 225T628 176Q628 148 636 127T659 96T698 85Q721 85 736 95T760 127T768 176Q768 205 760 225T737 255T698 266Z" />
+<glyph unicode="&amp;" horiz-adv-x="638" d="M258 -10Q190 -10 140 11T62 73T34 171Q34 200 42 229T70 284T126 333T217 368L252 382Q293 406 317 425T351 465T362 512Q362 541 344 557T296 574Q262 574 245 555T227 506Q227 489 232 473T254 434T301 372T386
+273Q439 213 474 175T534 118T583 92T637 88L620 -10Q583 -10 554 -4T492 23T418 85T314 195Q250 265 210 312T147 392T116 452T107 509Q107 549 127 586T189 646T297 670Q356 670 394 650T452 597T472 523Q472 482 455 446T399 381T291 328L259 312Q218 291 195
+272T163 232T154 181Q154 152 170 130T213 96T275 84Q325 84 361 101T429 147L444 164Q465 199 477 243T487 344L584 340Q586 276 567 218T507 116L483 93Q448 46 392 18T258 -10Z" />
+<glyph unicode="&apos;" horiz-adv-x="244" d="M192 682L164 416H70V682H192Z" />
+<glyph unicode="(" horiz-adv-x="376" d="M291 741L359 675Q299 621 262 561T209 430T192 276Q192 192 208 122T262 -9T359 -124L291 -191Q180 -108 123 9T65 276Q65 425 122 542T291 741Z" />
+<glyph unicode=")" horiz-adv-x="376" d="M85 -190L17 -124Q77 -70 114 -10T167 121T184 275Q184 359 168 429T114 560T17 675L85 742Q196 659 253 542T311 275Q311 126 254 9T85 -190Z" />
+<glyph unicode="*" horiz-adv-x="582" d="M314 503L397 423L475 318L394 259L318 366L268 469L291 486L314 503ZM268 503L291 486L314 469L264 366L188 259L107 318L186 423L268 503ZM74 609L199 567L300 514L291 486L282 458L169 475L44 514L74 609ZM341 730L339
+599L320 486H291H262L243 599L240 730H341ZM508 609L538 514L413 475L300 458L291 486L282 514L383 567L508 609Z" />
+<glyph unicode="+" horiz-adv-x="604" d="M359 580V63H246V580H359ZM550 374V269H54V374H550Z" />
+<glyph unicode="," horiz-adv-x="281" d="M139 153Q171 153 192 138T224 97T235 40Q235 -1 219 -39T173 -107T107 -154L47 -107Q75 -96 97 -80T136 -44T159 -3L154 0Q149 -3 142 -5T122 -8Q106 -8 90 0T63 25T52 67Q52 94 64 113T96 142T139 153Z" />
+<glyph unicode="-" horiz-adv-x="521" d="M437 324V206H84V324H437Z" />
+<glyph unicode="." horiz-adv-x="281" d="M141 153Q181 153 204 131T228 72Q228 34 205 13T141 -9Q101 -9 78 12T54 72Q54 109 77 131T141 153Z" />
+<glyph unicode="/" horiz-adv-x="456" d="M437 719L147 -70H20L309 719H437Z" />
+<glyph unicode="0" horiz-adv-x="636" d="M318 -10Q191 -10 123 76T54 330Q54 498 122 584T318 670Q445 670 513 584T582 330Q582 162 514 76T318 -10ZM318 101Q361 101 388 125T430 200T444 330Q444 409 430 459T389 534T318 559Q275 559 247 535T206 460T192
+330Q192 251 205 201T247 126T318 101Z" />
+<glyph unicode="1" horiz-adv-x="416" d="M197 0V418Q197 441 197 465T199 516Q165 485 123 462T37 430L19 546Q42 548 70 559T128 587T182 622T220 660H332V0H197Z" />
+<glyph unicode="2" horiz-adv-x="591" d="M65 0V94Q155 154 217 203T318 295T374 376T392 452Q392 498 364 527T285 557Q229 557 198 519T163 411L44 456Q49 524 80 571T166 644T293 670Q353 670 397 653T472 607T516 539T531 460Q531 396 500 339T403 226T238
+108V107Q253 108 274 109T319 110T359 111H541V0H65Z" />
+<glyph unicode="3" horiz-adv-x="589" d="M297 -10Q198 -10 129 31T33 151L163 208Q170 172 186 149T229 113T295 101Q329 101 352 113T389 147T402 198Q402 227 390 246T356 273T298 282Q285 282 274 282T248 279V380Q256 379 264 379T282 378Q338 378 362 400T387
+473Q387 514 363 536T293 559Q245 559 217 536T178 464L55 510Q67 560 101 596T187 651T300 671Q374 671 423 648T498 585T524 493Q524 452 512 424T480 376T439 346T400 334V331Q423 330 447 322T491 296T525 253T538 190Q538 130 507 85T421 15T297 -10Z" />
+<glyph unicode="4" horiz-adv-x="633" d="M366 0V155H44V245Q49 255 58 269T80 303L326 660H491V255H598V155H491V0H366ZM162 255H367V473Q367 494 368 518T370 565H368Q357 543 342 518T313 472L175 274Q172 269 169 265T162 255Z" />
+<glyph unicode="5" horiz-adv-x="582" d="M286 -10Q199 -10 140 26T42 136L166 198Q179 154 207 127T289 100Q326 100 352 113T392 151T407 212Q407 248 394 272T355 309T292 322Q266 322 244 317T203 302T171 274L63 294L104 660H503V549H208L188 388L185 375H187Q208
+399 244 412T328 425Q393 425 439 399T510 327T535 220Q535 163 516 120T463 48T383 5T286 -10Z" />
+<glyph unicode="6" horiz-adv-x="613" d="M335 670Q388 670 431 656T506 610T557 526L441 472Q429 511 402 533T326 556Q292 556 266 540T220 494T191 423T181 331Q181 328 181 325T181 314L184 310Q195 345 222 368T284 402T353 413Q416 413 464 389T540 318T568
+208Q568 142 539 93T456 17T328 -10Q244 -10 183 30T88 145T54 326Q54 441 91 517T192 632T335 670ZM326 312Q293 312 268 299T228 262T213 207Q213 176 228 152T269 114T326 100Q379 100 408 128T438 207Q438 239 425 263T387 299T326 312Z" />
+<glyph unicode="7" horiz-adv-x="591" d="M35 660H558V555Q475 472 426 384T356 201T334 0H197Q197 110 224 211T309 405T456 583L484 547H35V660Z" />
+<glyph unicode="8" horiz-adv-x="623" d="M311 668Q382 668 434 647T515 586T544 490Q544 438 519 400T445 342V341Q503 320 536 280T569 179Q569 121 538 79T449 14T311 -10Q232 -10 175 13T86 79T54 179Q54 239 87 279T179 341V342Q131 361 105 399T79 490Q79
+546 107 585T189 646T311 668ZM312 562Q265 562 238 539T210 475Q210 434 237 411T312 388Q358 388 385 411T413 475Q413 516 386 539T312 562ZM312 97Q350 97 377 108T418 141T433 193Q433 223 419 245T377 278T312 290Q275 290 247 279T204 245T189 193Q189 163
+204 141T246 108T312 97Z" />
+<glyph unicode="9" horiz-adv-x="617" d="M294 670Q382 670 442 630T532 514T563 332Q563 215 530 140T437 27T295 -10Q210 -10 149 26T56 136L183 190Q194 149 221 125T298 100Q337 100 364 115T407 160T431 231T439 325Q439 329 439 332T439 339H435Q424 304
+398 282T337 249T267 238Q204 238 156 263T79 335T51 444Q51 514 81 564T165 642T294 670ZM295 558Q242 558 213 529T183 446Q183 399 213 373T295 346Q328 346 353 359T393 396T407 451Q407 484 393 508T354 545T295 558Z" />
+<glyph unicode=":" horiz-adv-x="300" d="M150 510Q190 510 213 488T237 429Q237 391 214 370T150 348Q110 348 87 369T63 429Q63 466 86 488T150 510ZM150 153Q190 153 213 131T237 72Q237 34 214 13T150 -9Q110 -9 87 12T63 72Q63 109 86 131T150 153Z" />
+<glyph unicode=";" horiz-adv-x="300" d="M148 153Q180 153 201 138T233 97T244 40Q244 -1 228 -39T182 -107T116 -154L56 -107Q84 -96 106 -80T145 -44T168 -3L163 0Q158 -3 151 -5T131 -8Q115 -8 99 0T72 25T61 67Q61 94 73 113T105 142T148 153ZM150 510Q190
+510 213 488T237 429Q237 391 214 370T150 348Q110 348 87 369T63 429Q63 466 86 488T150 510Z" />
+<glyph unicode="&lt;" horiz-adv-x="604" d="M551 14L66 234V361L551 582V450L173 299L551 147V14Z" />
+<glyph unicode="=" horiz-adv-x="604" d="M540 468V366H64V468H540ZM540 257V156H64V257H540Z" />
+<glyph unicode="&gt;" horiz-adv-x="604" d="M53 581L538 361V234L53 13V145L431 296L53 448V581Z" />
+<glyph unicode="?" horiz-adv-x="583" d="M295 670Q365 670 420 650T506 589T538 491Q538 431 513 392T444 332T349 305L342 212H217L218 363Q281 370 319 384T374 420T391 473Q391 511 365 533T286 555Q234 555 203 526T165 442L35 492Q47 544 79 584T164 647T295
+670ZM281 145Q320 145 343 124T366 68Q366 32 343 12T281 -9Q242 -9 219 11T196 68Q196 103 219 124T281 145Z" />
+<glyph unicode="@" horiz-adv-x="941" d="M473 -189Q380 -189 303 -161T169 -79T81 52T50 227Q50 323 83 403T176 541T317 631T494 663Q585 663 658 635T783 554T862 432T890 278Q890 205 872 151T822 62T752 10T676 -7Q612 -7 581 25T552 108Q530 60 487 33T396
+5Q349 5 313 28T256 95T235 197Q235 250 251 298T296 383T365 443T456 465Q489 465 517 453T565 418T592 360L615 456H734L664 155Q662 144 660 134T658 115Q658 88 671 78T705 67Q736 67 762 89T804 158T821 275Q821 346 798 405T731 507T629 572T496 595Q415
+595 348 569T232 495T157 379T130 227Q130 142 156 78T231 -31T342 -97T477 -120Q553 -120 599 -101T681 -59L716 -117Q689 -136 656 -152T578 -179T473 -189ZM446 96Q481 96 508 121T550 187T565 273Q565 304 555 326T526 360T479 372Q450 372 427 358T388 318T363
+263T354 200Q354 167 364 144T396 109T446 96Z" />
+<glyph unicode="A" horiz-adv-x="671" d="M12 0L253 660H418L659 0H516L365 449L335 549H333L305 451L153 0H12ZM154 161V263H516V161H154Z" />
+<glyph unicode="B" horiz-adv-x="672" d="M86 0V660H375Q495 660 552 613T609 480Q609 427 577 386T483 334V333Q552 323 589 281T626 181Q626 96 565 48T385 0H86ZM220 104H373Q429 104 456 127T483 191Q483 233 456 255T373 277H220V104ZM220 383H357Q466 383
+466 468Q466 553 357 553H220V383Z" />
+<glyph unicode="C" horiz-adv-x="683" d="M651 182Q632 118 591 75T494 11T371 -10Q273 -10 202 31T92 148T53 330Q53 436 91 512T201 629T369 670Q437 670 492 652T585 595T642 499L517 446Q500 506 465 531T375 557Q321 557 281 531T218 455T196 330Q196 257
+216 206T277 129T375 103Q429 103 468 132T524 220L651 182Z" />
+<glyph unicode="D" horiz-adv-x="719" d="M341 660Q496 660 581 575T666 330Q666 172 581 86T341 0H86V660H341ZM334 110Q428 110 475 166T523 330Q523 437 476 493T334 550H224V110H334Z" />
+<glyph unicode="E" horiz-adv-x="633" d="M86 0V660H581V549H224V385H505V279H224V111H595V0H86Z" />
+<glyph unicode="F" horiz-adv-x="612" d="M580 549H224V382H505V270H224V0H86V660H580V549Z" />
+<glyph unicode="G" horiz-adv-x="723" d="M357 -10Q266 -10 198 30T91 146T53 329Q53 435 93 511T206 629T377 670Q484 670 550 631T655 508L527 453Q511 506 473 531T378 557Q322 557 281 531T218 454T196 330Q196 255 217 204T279 127T382 101Q415 101 443 109T493
+133T526 174T538 232V247H365V348H657V0H560L550 144L574 127Q552 61 497 26T357 -10Z" />
+<glyph unicode="H" horiz-adv-x="739" d="M653 660V0H515V660H653ZM224 660V0H86V660H224ZM587 389V278H155V389H587Z" />
+<glyph unicode="I" horiz-adv-x="310" d="M224 660V0H86V660H224Z" />
+<glyph unicode="J" horiz-adv-x="599" d="M523 660V243Q523 124 456 57T266 -10Q178 -10 123 22T47 112T39 245L173 269Q161 181 184 142T269 103Q334 103 359 143T385 262V660H523Z" />
+<glyph unicode="K" horiz-adv-x="679" d="M655 660L353 317L342 328L177 141L156 269L495 660H655ZM224 660V0H86V660H224ZM391 432L663 0H505L285 355L391 432Z" />
+<glyph unicode="L" horiz-adv-x="601" d="M224 111H572V0H86V660H224V111Z" />
+<glyph unicode="M" horiz-adv-x="890" d="M804 660V0H680V344L686 537H684L501 0H388L206 537H204L211 344V0H86V660H286L405 300L447 151H449L492 299L610 660H804Z" />
+<glyph unicode="N" horiz-adv-x="739" d="M653 660V0H495L264 388L207 496H206L210 382V0H86V660H243L474 273L531 164H533L529 278V660H653Z" />
+<glyph unicode="O" horiz-adv-x="741" d="M371 670Q469 670 540 629T649 512T688 330Q688 224 650 148T540 31T371 -10Q273 -10 202 31T92 148T53 330Q53 436 91 512T201 629T371 670ZM371 557Q316 557 277 531T217 454T196 330Q196 257 216 206T276 129T371 103Q426
+103 465 129T524 206T545 330Q545 403 525 454T465 531T371 557Z" />
+<glyph unicode="P" horiz-adv-x="646" d="M363 660Q439 660 493 635T576 562T606 447Q606 380 577 333T493 260T363 234H224V0H86V660H363ZM342 343Q404 343 435 369T466 447Q466 499 435 525T342 551H224V343H342Z" />
+<glyph unicode="Q" horiz-adv-x="741" d="M535 -200Q475 -200 427 -180T350 -115T322 -3Q322 13 325 31T337 66L427 80Q420 62 417 48T413 21Q413 -25 430 -49T475 -82T537 -91Q578 -91 607 -82T657 -55L682 -158Q657 -178 616 -189T535 -200ZM371 670Q469 670
+540 629T649 512T688 330Q688 224 650 148T540 31T371 -10Q273 -10 202 31T92 148T53 330Q53 436 91 512T201 629T371 670ZM371 557Q316 557 277 531T217 454T196 330Q196 257 216 206T276 129T371 103Q426 103 465 129T524 206T545 330Q545 403 525 454T465 531T371
+557Z" />
+<glyph unicode="R" horiz-adv-x="680" d="M377 660Q489 660 553 606T617 461Q617 364 553 313T378 261L364 253H222V0H86V660H377ZM361 358Q419 358 447 381T476 454Q476 503 448 526T361 550H222V358H361ZM442 329L656 0H501L324 289L442 329Z" />
+<glyph unicode="S" horiz-adv-x="644" d="M327 670Q417 670 485 639T601 547L524 458Q483 510 435 534T322 559Q280 559 253 548T213 519T200 479Q200 452 221 434T293 403L416 375Q514 353 556 310T599 197Q599 132 565 86T470 15T330 -10Q261 -10 204 6T101
+52T26 119L104 212Q127 180 161 155T238 116T330 101Q371 101 399 110T442 137T457 180Q457 206 440 224T375 253L241 283Q183 297 142 319T79 377T57 462Q57 521 89 568T181 642T327 670Z" />
+<glyph unicode="T" horiz-adv-x="635" d="M608 660V549H387V0H249V549H27V660H608Z" />
+<glyph unicode="U" horiz-adv-x="710" d="M637 660V260Q637 125 565 58T355 -10Q217 -10 145 57T73 260V660H211V266Q211 183 246 143T355 103Q428 103 463 143T498 266V660H637Z" />
+<glyph unicode="V" horiz-adv-x="670" d="M656 660L416 0H255L14 660H160L299 240L337 110L374 239L514 660H656Z" />
+<glyph unicode="W" horiz-adv-x="984" d="M211 0L19 660H166L296 115L428 660H560L694 115L823 660H964L772 0H617L525 360L494 516H492L461 360L370 0H211Z" />
+<glyph unicode="X" horiz-adv-x="640" d="M624 0H460L316 234L174 0H16L243 333L32 660H194L327 438L462 660H612L400 338L624 0Z" />
+<glyph unicode="Y" horiz-adv-x="626" d="M616 660L382 247V0H244V247L10 660H157L263 463L313 359L364 463L470 660H616Z" />
+<glyph unicode="Z" horiz-adv-x="633" d="M156 62L131 110H593V0H44V104L470 598L494 550H52V660H581V556L156 62Z" />
+<glyph unicode="[" horiz-adv-x="375" d="M347 618H206V-67H347V-168H86V719H347V618Z" />
+<glyph unicode="\" horiz-adv-x="456" d="M20 719H147L437 -70H309L20 719Z" />
+<glyph unicode="]" horiz-adv-x="375" d="M28 -67H169V618H28V719H289V-168H28V-67Z" />
+<glyph unicode="^" horiz-adv-x="593" d="M25 355L237 726H356L568 355H443L297 630L150 355H25Z" />
+<glyph unicode="_" horiz-adv-x="539" d="M539 -77V-190H0V-77H539Z" />
+<glyph unicode="`" horiz-adv-x="500" d="M282 742L352 572H250L150 742H282Z" />
+<glyph unicode="a" horiz-adv-x="574" d="M357 319Q357 362 333 386T268 410Q231 410 203 391T162 328L45 364Q62 430 119 470T274 510Q340 510 389 490T465 428T493 325V122Q493 84 529 84Q546 84 561 89L553 4Q527 -9 488 -9Q453 -9 425 3T381 39T365 101V105L389
+109Q383 71 356 45T291 4T211 -10Q160 -10 123 5T66 51T46 125Q46 181 82 216T185 265L373 303L372 218L252 194Q218 187 201 176T183 138Q183 113 201 100T246 87Q267 87 287 92T323 108T348 138T357 184V319Z" />
+<glyph unicode="b" horiz-adv-x="627" d="M366 -10Q320 -10 283 9T221 63T187 141L201 159L193 0H72V719H209V359L196 380Q212 436 257 473T370 510Q430 510 477 479T552 390T580 249Q580 168 553 110T477 21T366 -10ZM325 95Q380 95 411 134T443 250Q443 326
+412 365T326 405Q290 405 264 386T224 332T209 249Q209 201 223 166T264 113T325 95Z" />
+<glyph unicode="c" horiz-adv-x="564" d="M299 510Q366 510 412 491T487 438T528 363L400 317Q390 362 366 385T301 408Q263 408 236 391T195 338T181 249Q181 196 195 161T237 109T302 92Q332 92 353 102T387 133T406 181L530 141Q519 96 489 62T412 9T303 -10Q226
+-10 167 21T76 110T44 250Q44 332 76 390T166 479T299 510Z" />
+<glyph unicode="d" horiz-adv-x="627" d="M261 -10Q199 -10 151 21T75 110T47 249Q47 332 76 390T154 479T266 510Q332 510 375 472T431 374L418 358V719H555V0H432L423 152L439 144Q433 97 408 63T345 9T261 -10ZM301 95Q337 95 363 113T403 168T418 254Q418
+302 404 335T364 387T303 405Q247 405 216 366T184 250Q184 174 215 135T301 95Z" />
+<glyph unicode="e" horiz-adv-x="579" d="M304 -10Q225 -10 167 21T76 110T44 250Q44 332 76 390T165 479T297 510Q373 510 426 480T507 397T535 277Q535 257 534 239T531 207H132V302H471L405 278Q405 341 377 375T296 409Q258 409 231 391T189 338T175 248Q175
+195 190 161T234 109T303 92Q347 92 374 109T416 156L525 114Q509 75 477 47T400 5T304 -10Z" />
+<glyph unicode="f" horiz-adv-x="407" d="M295 729Q330 729 358 722T401 703L382 612Q371 619 357 623T324 627Q285 627 262 610T239 550V481L245 454V0H108V560Q108 602 122 634T161 687T220 718T295 729ZM397 500V398H21V500H397Z" />
+<glyph unicode="g" horiz-adv-x="549" d="M533 619L549 521Q545 521 541 521T531 522Q486 522 463 502T439 445L383 468Q383 508 399 542T446 598T522 619Q524 619 527 619T533 619ZM369 94Q450 94 494 59T538 -39Q538 -96 505 -135T413 -195T275 -215Q146 -215
+87 -179T27 -85Q27 -44 58 -16T163 15L158 -1Q106 8 79 33T51 104Q51 150 86 179T183 214L243 186H229Q186 183 169 169T151 136Q151 115 167 105T215 94H369ZM276 -121Q328 -121 361 -112T411 -89T428 -58Q428 -39 413 -28T359 -16H190Q166 -16 151 -28T135 -61Q135
+-89 172 -105T276 -121ZM277 510Q347 510 398 490T477 431T505 340Q505 288 478 250T399 192T277 171Q166 171 107 216T48 340Q48 393 76 431T155 489T277 510ZM277 424Q237 424 211 402T185 341Q185 302 211 280T277 257Q317 257 342 279T368 341Q368 380 343
+402T277 424Z" />
+<glyph unicode="h" horiz-adv-x="619" d="M72 0V719H209V415Q233 463 275 486T370 510Q422 510 462 490T526 430T550 328V0H413V288Q413 353 388 377T324 402Q295 402 269 389T226 345T209 264V0H72Z" />
+<glyph unicode="i" horiz-adv-x="282" d="M141 572Q98 572 77 590T56 645Q56 682 77 700T141 719Q184 719 205 701T226 645Q226 609 205 591T141 572ZM209 500V0H72V500H209Z" />
+<glyph unicode="j" horiz-adv-x="282" d="M141 572Q98 572 77 590T56 645Q56 682 77 700T141 719Q184 719 205 701T226 645Q226 609 205 591T141 572ZM209 500V-37Q209 -102 186 -141T122 -197T31 -215Q-6 -215 -36 -207T-89 -183L-67 -85Q-55 -95 -37 -101T3
+-108Q34 -108 53 -90T72 -24V500H209Z" />
+<glyph unicode="k" horiz-adv-x="602" d="M581 500L350 259L323 246L173 85L171 231L425 500H581ZM209 719V0H72V719H209ZM369 341L593 0H438L275 261L369 341Z" />
+<glyph unicode="l" horiz-adv-x="319" d="M207 719V154Q207 119 219 105T259 91Q276 91 287 93T315 101L303 11Q286 1 261 -4T210 -10Q137 -10 104 25T70 139V719H207Z" />
+<glyph unicode="m" horiz-adv-x="945" d="M72 0V500H195L200 410Q225 460 268 485T365 510Q419 510 462 485T528 411Q544 444 571 466T631 499T698 510Q747 510 787 490T852 430T876 328V0H739V301Q739 356 715 379T653 402Q623 402 598 387T558 343T543 269V0H406V301Q406
+356 382 379T319 402Q293 402 268 388T226 344T209 265V0H72Z" />
+<glyph unicode="n" horiz-adv-x="619" d="M72 0V500H195L203 350L186 366Q198 415 224 446T287 494T370 510Q422 510 462 490T526 430T550 328V0H413V289Q413 353 388 377T323 402Q295 402 269 389T226 345T209 265V0H72Z" />
+<glyph unicode="o" horiz-adv-x="599" d="M300 510Q376 510 433 479T523 390T556 250Q556 169 524 111T434 21T300 -10Q225 -10 167 21T77 110T44 250Q44 332 76 390T167 479T300 510ZM300 408Q262 408 236 391T195 338T181 250Q181 197 195 162T235 110T300 92Q337
+92 363 109T404 162T418 250Q418 303 404 338T364 390T300 408Z" />
+<glyph unicode="p" horiz-adv-x="627" d="M72 -210V500H195L204 341L187 359Q196 403 220 437T283 490T368 510Q429 510 477 479T552 391T580 251Q580 169 552 111T476 21T365 -10Q299 -10 256 27T196 120L209 141V-210H72ZM325 95Q380 95 411 134T443 250Q443
+326 413 365T327 405Q292 405 266 387T224 334T209 250Q209 203 223 168T263 114T325 95Z" />
+<glyph unicode="q" horiz-adv-x="627" d="M418 -210V156L434 138Q427 93 403 60T343 9T261 -10Q199 -10 151 21T75 110T47 251Q47 334 75 391T154 479T266 510Q312 510 349 491T410 436T440 354L423 344L432 500H555V-210H418ZM301 95Q337 95 363 113T403 167T418
+252Q418 302 404 336T363 387T302 405Q247 405 216 366T184 250Q184 174 215 135T301 95Z" />
+<glyph unicode="r" horiz-adv-x="422" d="M72 0V500H191L200 402Q220 454 258 482T355 510Q372 510 386 507T409 499L393 384Q383 388 369 390T331 392Q301 392 273 378T227 334T209 259V0H72Z" />
+<glyph unicode="s" horiz-adv-x="531" d="M272 -10Q196 -10 134 17T32 93L111 173Q135 137 175 114T270 91Q309 91 332 102T356 139Q356 155 345 166T301 185L213 203Q126 221 90 257T53 352Q53 393 77 429T151 487T273 510Q348 510 403 487T491 417L409 337Q387
+372 352 390T277 409Q249 409 229 403T199 387T189 360Q189 344 203 333T254 313L356 292Q430 277 462 242T494 156Q494 108 469 71T394 12T272 -10Z" />
+<glyph unicode="t" horiz-adv-x="430" d="M249 653V163Q249 127 267 111T318 94Q344 94 362 101T396 122L418 31Q394 12 358 1T282 -10Q232 -10 194 5T134 53T112 141V615L249 653ZM409 500V398H20V500H409Z" />
+<glyph unicode="u" horiz-adv-x="618" d="M246 -10Q196 -10 156 8T93 65T69 168V500H206V201Q206 143 230 121T299 98Q320 98 340 105T375 129T400 170T409 231V500H546V0H424L419 87Q394 37 351 14T246 -10Z" />
+<glyph unicode="v" horiz-adv-x="546" d="M400 500H542L352 0H194L4 500H151L274 105L400 500Z" />
+<glyph unicode="w" horiz-adv-x="876" d="M717 500H863L703 0H545L436 340L331 0H173L13 500H159L259 117L370 500H506L618 117L717 500Z" />
+<glyph unicode="x" horiz-adv-x="569" d="M183 500L315 281L352 282L552 0H393L257 224L216 228L23 500H183ZM549 500L356 231L315 234L169 0H14L221 284L260 279L393 500H549Z" />
+<glyph unicode="y" horiz-adv-x="546" d="M542 500L340 -31Q316 -99 287 -139T219 -197T127 -215Q88 -215 56 -206T-1 -181L28 -82Q47 -97 68 -103T116 -110Q144 -110 164 -98T199 -50L216 -7L161 123L8 500H160L255 200L281 100L312 206L403 500H542Z" />
+<glyph unicode="z" horiz-adv-x="523" d="M43 0V88L265 344L322 401L239 399H45V500H474V412L253 157L196 99L287 101H482V0H43Z" />
+<glyph unicode="{" horiz-adv-x="395" d="M361 -191Q284 -191 238 -175T170 -124T148 -37V124Q148 180 123 204T36 228V323Q97 323 122 347T148 427V589Q148 642 169 675T237 725T361 741V649Q308 649 285 632T262 578V402Q262 351 236 320T158 276Q209 263 235
+232T262 149V-27Q262 -64 285 -81T361 -98V-191Z" />
+<glyph unicode="|" horiz-adv-x="292" d="M206 719V-168H86V719H206Z" />
+<glyph unicode="}" horiz-adv-x="395" d="M34 742Q111 742 157 726T225 675T247 588V427Q247 371 272 347T359 323V228Q298 228 273 204T247 124V-38Q247 -91 226 -124T158 -174T34 -190V-98Q87 -98 110 -81T133 -27V149Q133 200 159 231T237 275Q186 288 160
+319T133 402V578Q133 615 110 632T34 649V742Z" />
+<glyph unicode="~" horiz-adv-x="576" d="M533 410Q528 323 491 278T384 232Q349 232 325 242T282 266T246 290T208 300Q185 300 173 284T155 235H43Q48 323 85 368T193 413Q227 413 251 403T295 379T331 355T369 345Q391 345 404 362T421 410H533Z" />
+<glyph unicode="&#xa0;" horiz-adv-x="306" />
+<glyph unicode="&#xa1;" horiz-adv-x="286" d="M71 -160V80L88 287H198L215 80V-160H71ZM143 355Q104 355 81 376T58 432Q58 468 81 488T143 509Q182 509 205 489T228 432Q228 397 205 376T143 355Z" />
+<glyph unicode="&#xa2;" horiz-adv-x="572" d="M312 -10Q233 -10 174 21T83 110T51 250Q51 332 83 390T173 479T308 510Q375 510 420 491T494 439T535 363L426 320Q415 369 386 394T313 419Q250 419 211 377T172 249Q172 191 190 154T241 99T313 81Q345 81 369
+92T409 125T432 178L537 142Q525 96 495 62T419 9T312 -10ZM261 -100V600H352V-100H261Z" />
+<glyph unicode="&#xa3;" horiz-adv-x="621" d="M62 273V346H477V273H62ZM153 -10Q101 -10 69 14T36 80Q36 108 52 128T96 160T162 172Q204 172 234 164T288 143T333 117T376 95T428 86Q465 86 482 107T499 175L591 167Q595 113 579 73T530 12T451 -10Q412 -10
+380 2T321 31T268 67T216 97T159 109Q137 109 127 102T117 81Q117 66 129 58T159 50Q191 50 206 64T227 103T233 161Q233 204 219 238T172 322Q153 355 141 380T124 428T119 475Q119 533 147 577T227 645T346 670Q435 670 490 629T565 502L453 454Q440 509 415
+537T341 565Q294 565 266 541T237 470Q237 453 240 438T253 403T277 355Q300 311 314 269T329 188Q329 153 319 118T288 54T233 8T153 -10Z" />
+<glyph unicode="&#xa4;" horiz-adv-x="653" d="M327 538Q389 538 437 512T512 438T539 329Q539 268 512 221T437 147T327 120Q265 120 217 147T142 221T114 329Q114 391 141 438T217 511T327 538ZM327 435Q282 435 254 406T226 329Q226 282 254 253T327 223Q371
+223 399 252T427 329Q427 376 399 405T327 435ZM129 607L256 471L186 401L49 526L129 607ZM184 258L254 188L129 51L49 132L184 258ZM470 255L605 132L523 51L399 184L470 255ZM523 607L605 526L472 401L401 472L523 607Z" />
+<glyph unicode="&#xa5;" horiz-adv-x="649" d="M260 0V116H68V173H260V242H68V302H190L244 298L24 660H170L278 446L324 345H326L371 447L479 660H625L405 298L459 302H582V242H389V173H582V116H389V0H260Z" />
+<glyph unicode="&#xa6;" horiz-adv-x="292" d="M206 719V345H86V719H206ZM206 206V-168H86V206H206Z" />
+<glyph unicode="&#xa7;" horiz-adv-x="614" d="M420 113L365 176Q405 180 431 189T469 214T482 250Q482 275 463 292T397 318L235 348Q187 357 154 378T105 429T89 495Q89 547 117 586T196 648T317 670Q394 670 448 645T540 572L461 504Q433 541 396 558T311 576Q255
+576 227 557T199 509Q199 494 206 481T234 459T292 442L406 422Q473 410 512 390T569 342T586 275Q586 232 567 198T511 143T420 113ZM297 -110Q211 -110 149 -83T53 -10L133 60Q156 25 199 4T300 -18Q354 -18 386 0T419 51Q419 72 402 85T344 106L186 138Q132
+149 97 169T44 219T26 291Q26 333 45 363T99 412T178 438L225 378Q193 371 172 361T140 338T129 306Q129 281 150 264T222 237L377 208Q454 194 489 157T525 63Q525 11 498 -28T419 -88T297 -110Z" />
+<glyph unicode="&#xa8;" horiz-adv-x="500" d="M144 705Q179 705 199 687T220 635Q220 603 200 584T144 565Q110 565 90 584T70 635Q70 668 90 686T144 705ZM354 705Q390 705 410 687T430 635Q430 603 410 584T354 565Q320 565 300 584T280 635Q280 668 300 686T354 705Z" />
+<glyph unicode="&#xa9;" horiz-adv-x="790" d="M395 -10Q294 -10 217 34T95 155T51 330Q51 429 95 505T216 626T395 670Q496 670 573 626T694 506T738 330Q738 232 695 155T574 34T395 -10ZM395 67Q473 67 532 101T624 195T657 330Q657 406 624 465T532 559T395
+593Q317 593 258 559T166 466T133 330Q133 255 166 195T258 101T395 67ZM401 140Q313 140 263 191T213 329Q213 416 263 467T401 518Q466 518 508 490T568 413L484 372Q473 399 454 410T404 422Q363 422 339 398T315 329Q315 284 339 260T404 235Q435 235 456 247T489
+288L569 252Q547 196 507 168T401 140Z" />
+<glyph unicode="&#xaa;" horiz-adv-x="418" d="M141 314Q86 314 57 339T27 404Q27 446 53 468T140 502L252 524V475L180 459Q152 453 141 443T129 415Q129 399 140 390T171 381Q187 381 203 386T229 405T240 443V535Q240 561 226 575T186 589Q161 589 141 577T111
+533L28 559Q39 605 79 634T188 663Q265 663 305 631T345 534V410Q345 394 353 387T373 380Q388 380 395 383L387 325Q377 319 365 317T338 314Q300 314 278 334T255 393V411L269 404Q263 379 246 359T202 326T141 314ZM31 169V245H380V169H31Z" />
+<glyph unicode="&#xab;" horiz-adv-x="552" d="M292 461L168 265L292 69H166L41 265L166 461H292ZM510 461L386 265L510 69H384L259 265L384 461H510Z" />
+<glyph unicode="&#xac;" horiz-adv-x="604" d="M545 316V110H429V316H545ZM545 374V269H59V374H545Z" />
+<glyph unicode="&#xad;" horiz-adv-x="521" d="M437 324V206H84V324H437Z" />
+<glyph unicode="&#xae;" horiz-adv-x="790" d="M395 -10Q294 -10 217 34T95 155T51 330Q51 429 95 505T216 626T395 670Q496 670 573 627T694 506T738 330Q738 232 695 155T574 34T395 -10ZM454 148L370 295L446 318L559 148H454ZM395 67Q473 67 532 101T624 195T657
+330Q657 406 624 465T532 559T395 593Q317 593 258 559T166 466T133 330Q133 255 166 195T258 101T395 67ZM250 148V515H416Q456 515 486 500T533 458T551 395Q551 339 512 308T409 276H338V148H250ZM338 339H401Q429 339 445 351T461 391Q461 418 445 430T401
+443H338V339Z" />
+<glyph unicode="&#xaf;" horiz-adv-x="500" d="M425 670V579H75V670H425Z" />
+<glyph unicode="&#xb0;" horiz-adv-x="482" d="M241 313Q184 313 142 335T75 398T51 492Q51 545 75 585T141 648T241 670Q299 670 341 648T408 586T432 492Q432 438 408 398T342 336T241 313ZM241 406Q280 406 304 430T328 492Q328 530 304 554T241 578Q204 578
+180 554T155 492Q155 455 179 431T241 406Z" />
+<glyph unicode="&#xb1;" horiz-adv-x="604" d="M355 648V174H250V648H355ZM550 461V359H54V461H550ZM550 100V0H54V100H550Z" />
+<glyph unicode="&#xb2;" horiz-adv-x="382" d="M33 333V400Q56 414 78 428T123 457Q167 489 193 513T231 558T242 598Q242 623 228 638T184 654Q153 654 136 633T118 571L20 595Q22 660 67 697T187 735Q245 735 281 716T334 668T351 606Q351 579 339 554T301 503T236
+450Q221 440 204 431T168 413V412Q182 413 207 414T250 415H357V333H33Z" />
+<glyph unicode="&#xb3;" horiz-adv-x="373" d="M189 735Q259 735 298 705T337 624Q337 596 326 576T296 545T255 533V530Q280 530 300 520T333 491T345 443Q345 408 324 382T265 342T180 327Q111 327 70 353T14 430L111 463Q116 433 133 419T181 405Q209 405 225
+418T241 456Q241 480 224 490T175 500Q171 500 167 500T158 499V559Q162 558 165 558T172 558Q202 558 217 570T233 606Q233 630 219 642T180 654Q155 654 139 641T118 601L25 629Q36 682 81 708T189 735Z" />
+<glyph unicode="&#xb4;" horiz-adv-x="562" d="M250 742H382L282 572H181L250 742Z" />
+<glyph unicode="&#xb5;" horiz-adv-x="622" d="M72 -210V500H209V204Q209 147 233 123T302 98Q333 98 357 112T397 157T412 238V500H549V0H430L424 87Q402 39 363 15T273 -10Q246 -10 223 -2T182 24L209 62V-210H72Z" />
+<glyph unicode="&#xb6;" horiz-adv-x="715" d="M296 -100V182Q220 183 162 211T70 292T37 420Q37 496 72 550T170 632T317 660H639V-100H526V553H411V-100H296ZM294 289V553Q248 553 216 537T168 491T151 421Q151 380 167 351T216 305T294 289Z" />
+<glyph unicode="&#xb7;" horiz-adv-x="256" d="M129 435Q169 435 192 413T216 354Q216 316 193 295T129 273Q89 273 66 294T42 354Q42 391 65 413T129 435Z" />
+<glyph unicode="&#xb8;" horiz-adv-x="500" d="M189 8L230 34Q302 20 334 -12T367 -93Q367 -147 331 -181T233 -215Q198 -215 175 -207T134 -186L158 -113Q171 -121 185 -127T221 -133Q247 -133 264 -117T281 -71Q281 -47 261 -29T189 8Z" />
+<glyph unicode="&#xb9;" horiz-adv-x="277" d="M143 730H232V333H128V562Q128 575 129 593T131 629Q107 610 78 596T16 577V663Q36 667 61 677T109 701T143 730Z" />
+<glyph unicode="&#xba;" horiz-adv-x="400" d="M200 314Q122 314 75 360T27 488Q27 571 74 617T200 663Q278 663 325 617T372 488Q372 406 325 360T200 314ZM36 169V245H364V169H36ZM200 386Q235 386 251 411T267 488Q267 540 251 566T200 592Q165 592 149 566T133
+488Q133 437 149 412T200 386Z" />
+<glyph unicode="&#xbb;" horiz-adv-x="552" d="M260 69L384 265L260 461H386L511 265L386 69H260ZM42 69L166 265L42 461H168L293 265L168 69H42Z" />
+<glyph unicode="&#xbc;" horiz-adv-x="841" d="M143 921H232V524H128V753Q128 766 129 784T131 820Q107 801 78 787T16 768V854Q36 858 61 868T109 892T143 921ZM111 0L588 660H693L216 0H111ZM825 156V86H761V-4H671V86H471V135L640 393H761V156H825ZM563 156H671V247Q671
+267 672 287T674 325H671Q665 313 657 297T640 268L563 156Z" />
+<glyph unicode="&#xbd;" horiz-adv-x="909" d="M143 921H232V524H128V753Q128 766 129 784T131 820Q107 801 78 787T16 768V854Q36 858 61 868T109 892T143 921ZM111 0L588 660H693L216 0H111ZM560 -4V63Q583 77 605 91T650 120Q694 152 720 176T758 221T769 261Q769
+286 755 301T711 317Q680 317 663 296T645 234L547 258Q549 323 594 360T714 398Q772 398 808 379T861 331T878 269Q878 242 866 217T828 166T763 113Q748 103 731 94T695 76V75Q709 76 734 77T777 78H884V-4H560Z" />
+<glyph unicode="&#xbe;" horiz-adv-x="937" d="M189 926Q259 926 298 896T337 815Q337 787 326 767T296 736T255 724V721Q280 721 300 711T333 682T345 634Q345 599 324 573T265 533T180 518Q111 518 70 544T14 621L111 654Q116 624 133 610T181 596Q209 596 225
+609T241 647Q241 671 224 681T175 691Q171 691 167 691T158 690V750Q162 749 165 749T172 749Q202 749 217 761T233 797Q233 821 219 833T180 845Q155 845 139 832T118 792L25 820Q36 873 81 899T189 926ZM207 0L684 660H789L312 0H207ZM921 156V86H857V-4H767V86H567V135L736
+393H857V156H921ZM659 156H767V247Q767 267 768 287T770 325H767Q761 313 753 297T736 268L659 156Z" />
+<glyph unicode="&#xbf;" horiz-adv-x="580" d="M287 -170Q217 -170 162 -150T76 -89T44 9Q44 69 69 108T138 168T233 195L240 288H365L364 137Q301 130 263 116T208 80T191 27Q191 -11 217 -33T296 -55Q348 -55 379 -26T417 58L547 8Q535 -44 503 -84T418 -147T287
+-170ZM301 355Q262 355 239 376T216 432Q216 468 239 488T301 509Q340 509 363 489T386 432Q386 397 363 376T301 355Z" />
+<glyph unicode="&#xc0;" horiz-adv-x="671" d="M12 0L253 660H418L659 0H516L365 449L335 549H333L305 451L153 0H12ZM154 161V263H516V161H154ZM330 892L393 730H292L204 892H330Z" />
+<glyph unicode="&#xc1;" horiz-adv-x="671" d="M12 0L253 660H418L659 0H516L365 449L335 549H333L305 451L153 0H12ZM154 161V263H516V161H154ZM337 892H463L375 730H274L337 892Z" />
+<glyph unicode="&#xc2;" horiz-adv-x="671" d="M12 0L253 660H418L659 0H516L365 449L335 549H333L305 451L153 0H12ZM154 161V263H516V161H154ZM508 730H405L335 828L265 730H162L266 892H404L508 730Z" />
+<glyph unicode="&#xc3;" horiz-adv-x="671" d="M12 0L253 660H418L659 0H516L365 449L335 549H333L305 451L153 0H12ZM154 161V263H516V161H154ZM526 878Q524 828 509 795T467 745T407 728Q379 728 359 737T325 758T297 779T268 789Q249 789 240 774T226 728H142Q146
+803 178 840T266 878Q293 878 312 869T346 847T372 826T400 817Q420 817 429 832T442 878H526Z" />
+<glyph unicode="&#xc4;" horiz-adv-x="671" d="M12 0L253 660H418L659 0H516L365 449L335 549H333L305 451L153 0H12ZM154 161V263H516V161H154ZM229 865Q264 865 284 847T305 795Q305 763 285 744T229 725Q195 725 175 744T155 795Q155 828 175 846T229 865ZM439
+865Q475 865 495 847T515 795Q515 763 495 744T439 725Q405 725 385 744T365 795Q365 828 385 846T439 865Z" />
+<glyph unicode="&#xc5;" horiz-adv-x="671" d="M12 0L253 660H418L659 0H516L365 449L335 549H333L305 451L153 0H12ZM154 161V263H516V161H154ZM334 844Q395 844 431 811T468 721Q468 665 432 632T334 598Q274 598 237 631T199 721Q199 777 236 810T334 844ZM334
+780Q308 780 291 764T274 721Q274 695 291 679T334 663Q361 663 377 679T394 721Q394 747 378 763T334 780Z" />
+<glyph unicode="&#xc6;" horiz-adv-x="935" d="M563 108H897V0H432V202H234L141 0H0L321 660H883V552H563V384H807V281H563V108ZM274 301H432V555H398L274 301Z" />
+<glyph unicode="&#xc7;" horiz-adv-x="683" d="M651 182Q632 118 591 75T494 11T371 -10Q273 -10 202 31T92 148T53 330Q53 436 91 512T201 629T369 670Q437 670 492 652T585 595T642 499L517 446Q500 506 465 531T375 557Q321 557 281 531T218 455T196 330Q196
+257 216 206T277 129T375 103Q429 103 468 132T524 220L651 182ZM295 8L336 34Q408 20 440 -12T473 -93Q473 -147 437 -181T339 -215Q304 -215 281 -207T240 -186L264 -113Q277 -121 291 -127T327 -133Q353 -133 370 -117T387 -71Q387 -47 367 -29T295 8Z" />
+<glyph unicode="&#xc8;" horiz-adv-x="633" d="M86 0V660H581V549H224V385H505V279H224V111H595V0H86ZM332 892L395 730H294L206 892H332Z" />
+<glyph unicode="&#xc9;" horiz-adv-x="633" d="M86 0V660H581V549H224V385H505V279H224V111H595V0H86ZM332 892H458L370 730H269L332 892Z" />
+<glyph unicode="&#xca;" horiz-adv-x="633" d="M86 0V660H581V549H224V385H505V279H224V111H595V0H86ZM507 730H404L334 828L264 730H161L265 892H403L507 730Z" />
+<glyph unicode="&#xcb;" horiz-adv-x="633" d="M86 0V660H581V549H224V385H505V279H224V111H595V0H86ZM228 865Q263 865 283 847T304 795Q304 763 284 744T228 725Q194 725 174 744T154 795Q154 828 174 846T228 865ZM438 865Q474 865 494 847T514 795Q514 763
+494 744T438 725Q404 725 384 744T364 795Q364 828 384 846T438 865Z" />
+<glyph unicode="&#xcc;" horiz-adv-x="310" d="M224 660V0H86V660H224ZM147 892L210 730H109L21 892H147Z" />
+<glyph unicode="&#xcd;" horiz-adv-x="310" d="M224 660V0H86V660H224ZM163 892H289L201 730H100L163 892Z" />
+<glyph unicode="&#xce;" horiz-adv-x="310" d="M224 660V0H86V660H224ZM328 730H225L155 828L85 730H-18L86 892H224L328 730Z" />
+<glyph unicode="&#xcf;" horiz-adv-x="310" d="M58 865Q93 865 112 847T132 795Q132 763 113 744T58 725Q25 725 6 744T-14 795Q-14 828 5 846T58 865ZM250 865Q285 865 304 847T324 795Q324 763 305 744T250 725Q217 725 198 744T178 795Q178 828 197 846T250
+865ZM224 660V0H86V660H224Z" />
+<glyph unicode="&#xd0;" horiz-adv-x="740" d="M18 280V383H399V280H18ZM362 660Q517 660 601 575T686 330Q686 172 602 86T362 0H107V660H362ZM354 110Q449 110 496 166T544 330Q544 437 497 493T354 550H245V110H354Z" />
+<glyph unicode="&#xd1;" horiz-adv-x="739" d="M653 660V0H495L264 388L207 496H206L210 382V0H86V660H243L474 273L531 164H533L529 278V660H653ZM563 878Q561 828 546 795T504 745T444 728Q416 728 396 737T362 758T334 779T305 789Q286 789 277 774T263 728H179Q183
+803 215 840T303 878Q330 878 349 869T383 847T409 826T437 817Q457 817 466 832T479 878H563Z" />
+<glyph unicode="&#xd2;" horiz-adv-x="741" d="M371 670Q469 670 540 629T649 512T688 330Q688 224 650 148T540 31T371 -10Q273 -10 202 31T92 148T53 330Q53 436 91 512T201 629T371 670ZM371 557Q316 557 277 531T217 454T196 330Q196 257 216 206T276 129T371
+103Q426 103 465 129T524 206T545 330Q545 403 525 454T465 531T371 557ZM362 892L425 730H324L236 892H362Z" />
+<glyph unicode="&#xd3;" horiz-adv-x="741" d="M371 670Q469 670 540 629T649 512T688 330Q688 224 650 148T540 31T371 -10Q273 -10 202 31T92 148T53 330Q53 436 91 512T201 629T371 670ZM371 557Q316 557 277 531T217 454T196 330Q196 257 216 206T276 129T371
+103Q426 103 465 129T524 206T545 330Q545 403 525 454T465 531T371 557ZM373 892H499L411 730H310L373 892Z" />
+<glyph unicode="&#xd4;" horiz-adv-x="741" d="M371 670Q469 670 540 629T649 512T688 330Q688 224 650 148T540 31T371 -10Q273 -10 202 31T92 148T53 330Q53 436 91 512T201 629T371 670ZM371 557Q316 557 277 531T217 454T196 330Q196 257 216 206T276 129T371
+103Q426 103 465 129T524 206T545 330Q545 403 525 454T465 531T371 557ZM544 730H441L371 828L301 730H198L302 892H440L544 730Z" />
+<glyph unicode="&#xd5;" horiz-adv-x="741" d="M371 670Q469 670 540 629T649 512T688 330Q688 224 650 148T540 31T371 -10Q273 -10 202 31T92 148T53 330Q53 436 91 512T201 629T371 670ZM371 557Q316 557 277 531T217 454T196 330Q196 257 216 206T276 129T371
+103Q426 103 465 129T524 206T545 330Q545 403 525 454T465 531T371 557ZM562 878Q560 828 545 795T503 745T443 728Q415 728 395 737T361 758T333 779T304 789Q285 789 276 774T262 728H178Q182 803 214 840T302 878Q329 878 348 869T382 847T408 826T436 817Q456
+817 465 832T478 878H562Z" />
+<glyph unicode="&#xd6;" horiz-adv-x="741" d="M371 670Q469 670 540 629T649 512T688 330Q688 224 650 148T540 31T371 -10Q273 -10 202 31T92 148T53 330Q53 436 91 512T201 629T371 670ZM371 557Q316 557 277 531T217 454T196 330Q196 257 216 206T276 129T371
+103Q426 103 465 129T524 206T545 330Q545 403 525 454T465 531T371 557ZM265 865Q300 865 320 847T341 795Q341 763 321 744T265 725Q231 725 211 744T191 795Q191 828 211 846T265 865ZM475 865Q511 865 531 847T551 795Q551 763 531 744T475 725Q441 725 421
+744T401 795Q401 828 421 846T475 865Z" />
+<glyph unicode="&#xd7;" horiz-adv-x="604" d="M462 85L539 163L142 561L64 483L462 85ZM142 85L539 483L462 561L64 163L142 85Z" />
+<glyph unicode="&#xd8;" horiz-adv-x="741" d="M244 95L196 134L489 544L538 507L244 95ZM72 -31L185 122L235 83L148 -31H72ZM554 525L504 564L593 682H670L554 525ZM371 670Q469 670 540 629T649 512T688 330Q688 224 650 148T540 31T371 -10Q273 -10 202 31T92
+148T53 330Q53 436 91 512T201 629T371 670ZM371 557Q316 557 277 531T217 454T196 330Q196 257 216 206T276 129T371 103Q426 103 465 129T524 206T545 330Q545 403 525 454T465 531T371 557Z" />
+<glyph unicode="&#xd9;" horiz-adv-x="710" d="M637 660V260Q637 125 565 58T355 -10Q217 -10 145 57T73 260V660H211V266Q211 183 246 143T355 103Q428 103 463 143T498 266V660H637ZM353 877L416 715H315L227 877H353Z" />
+<glyph unicode="&#xda;" horiz-adv-x="710" d="M637 660V260Q637 125 565 58T355 -10Q217 -10 145 57T73 260V660H211V266Q211 183 246 143T355 103Q428 103 463 143T498 266V660H637ZM357 877H483L395 715H294L357 877Z" />
+<glyph unicode="&#xdb;" horiz-adv-x="710" d="M637 660V260Q637 125 565 58T355 -10Q217 -10 145 57T73 260V660H211V266Q211 183 246 143T355 103Q428 103 463 143T498 266V660H637ZM528 715H425L355 813L285 715H182L286 877H424L528 715Z" />
+<glyph unicode="&#xdc;" horiz-adv-x="710" d="M637 660V260Q637 125 565 58T355 -10Q217 -10 145 57T73 260V660H211V266Q211 183 246 143T355 103Q428 103 463 143T498 266V660H637ZM249 850Q284 850 304 832T325 780Q325 748 305 729T249 710Q215 710 195 729T175
+780Q175 813 195 831T249 850ZM459 850Q495 850 515 832T535 780Q535 748 515 729T459 710Q425 710 405 729T385 780Q385 813 405 831T459 850Z" />
+<glyph unicode="&#xdd;" horiz-adv-x="626" d="M616 660L382 247V0H244V247L10 660H157L263 463L313 359L364 463L470 660H616ZM315 880H441L353 718H252L315 880Z" />
+<glyph unicode="&#xde;" horiz-adv-x="657" d="M357 553Q482 553 547 498T613 337Q613 232 548 177T357 121H155V230H348Q472 230 472 338Q472 392 441 418T348 444H155V553H357ZM224 660V0H86V660H224Z" />
+<glyph unicode="&#xdf;" horiz-adv-x="636" d="M417 371Q477 371 516 347T574 282T594 193Q594 138 572 92T505 18T388 -10Q342 -10 308 0T256 23L282 118Q297 109 316 102T367 94Q412 94 438 125T464 207Q464 261 433 289T342 317H285L296 419H333Q385 419 412
+449T439 523Q439 571 409 594T332 618Q263 618 236 579T209 457V0H72V474Q72 550 97 606T182 693T339 724Q417 724 469 699T547 633T574 541Q574 501 556 463T503 401T417 373V371Z" />
+<glyph unicode="&#xe0;" horiz-adv-x="574" d="M357 319Q357 362 333 386T268 410Q231 410 203 391T162 328L45 364Q62 430 119 470T274 510Q340 510 389 490T465 428T493 325V122Q493 84 529 84Q546 84 561 89L553 4Q527 -9 488 -9Q453 -9 425 3T381 39T365 101V105L389
+109Q383 71 356 45T291 4T211 -10Q160 -10 123 5T66 51T46 125Q46 181 82 216T185 265L373 303L372 218L252 194Q218 187 201 176T183 138Q183 113 201 100T246 87Q267 87 287 92T323 108T348 138T357 184V319ZM264 742L334 572H232L132 742H264Z" />
+<glyph unicode="&#xe1;" horiz-adv-x="574" d="M357 319Q357 362 333 386T268 410Q231 410 203 391T162 328L45 364Q62 430 119 470T274 510Q340 510 389 490T465 428T493 325V122Q493 84 529 84Q546 84 561 89L553 4Q527 -9 488 -9Q453 -9 425 3T381 39T365 101V105L389
+109Q383 71 356 45T291 4T211 -10Q160 -10 123 5T66 51T46 125Q46 181 82 216T185 265L373 303L372 218L252 194Q218 187 201 176T183 138Q183 113 201 100T246 87Q267 87 287 92T323 108T348 138T357 184V319ZM279 742H411L311 572H210L279 742Z" />
+<glyph unicode="&#xe2;" horiz-adv-x="574" d="M357 319Q357 362 333 386T268 410Q231 410 203 391T162 328L45 364Q62 430 119 470T274 510Q340 510 389 490T465 428T493 325V122Q493 84 529 84Q546 84 561 89L553 4Q527 -9 488 -9Q453 -9 425 3T381 39T365 101V105L389
+109Q383 71 356 45T291 4T211 -10Q160 -10 123 5T66 51T46 125Q46 181 82 216T185 265L373 303L372 218L252 194Q218 187 201 176T183 138Q183 113 201 100T246 87Q267 87 287 92T323 108T348 138T357 184V319ZM456 565H351L276 663L201 565H96L207 736H345L456
+565Z" />
+<glyph unicode="&#xe3;" horiz-adv-x="574" d="M357 319Q357 362 333 386T268 410Q231 410 203 391T162 328L45 364Q62 430 119 470T274 510Q340 510 389 490T465 428T493 325V122Q493 84 529 84Q546 84 561 89L553 4Q527 -9 488 -9Q453 -9 425 3T381 39T365 101V105L389
+109Q383 71 356 45T291 4T211 -10Q160 -10 123 5T66 51T46 125Q46 181 82 216T185 265L373 303L372 218L252 194Q218 187 201 176T183 138Q183 113 201 100T246 87Q267 87 287 92T323 108T348 138T357 184V319ZM467 718Q465 668 450 635T408 585T348 568Q320 568
+300 577T266 598T238 619T209 629Q190 629 181 614T167 568H83Q87 643 119 680T207 718Q234 718 253 709T287 687T313 666T341 657Q361 657 370 672T383 718H467Z" />
+<glyph unicode="&#xe4;" horiz-adv-x="574" d="M357 319Q357 362 333 386T268 410Q231 410 203 391T162 328L45 364Q62 430 119 470T274 510Q340 510 389 490T465 428T493 325V122Q493 84 529 84Q546 84 561 89L553 4Q527 -9 488 -9Q453 -9 425 3T381 39T365 101V105L389
+109Q383 71 356 45T291 4T211 -10Q160 -10 123 5T66 51T46 125Q46 181 82 216T185 265L373 303L372 218L252 194Q218 187 201 176T183 138Q183 113 201 100T246 87Q267 87 287 92T323 108T348 138T357 184V319ZM170 705Q205 705 225 687T246 635Q246 603 226 584T170
+565Q136 565 116 584T96 635Q96 668 116 686T170 705ZM380 705Q416 705 436 687T456 635Q456 603 436 584T380 565Q346 565 326 584T306 635Q306 668 326 686T380 705Z" />
+<glyph unicode="&#xe5;" horiz-adv-x="574" d="M357 319Q357 362 333 386T268 410Q231 410 203 391T162 328L45 364Q62 430 119 470T274 510Q340 510 389 490T465 428T493 325V122Q493 84 529 84Q546 84 561 89L553 4Q527 -9 488 -9Q453 -9 425 3T381 39T365 101V105L389
+109Q383 71 356 45T291 4T211 -10Q160 -10 123 5T66 51T46 125Q46 181 82 216T185 265L373 303L372 218L252 194Q218 187 201 176T183 138Q183 113 201 100T246 87Q267 87 287 92T323 108T348 138T357 184V319ZM274 806Q335 806 371 773T408 683Q408 627 372 594T274
+560Q214 560 177 593T139 683Q139 739 176 772T274 806ZM274 742Q248 742 231 726T214 683Q214 657 231 641T274 625Q301 625 317 641T334 683Q334 709 318 725T274 742Z" />
+<glyph unicode="&#xe6;" horiz-adv-x="887" d="M218 -10Q166 -10 127 5T67 51T45 127Q45 183 81 217T182 264L358 299V318Q358 362 334 386T268 410Q232 410 205 391T163 328L49 364Q55 406 85 439T162 491T268 510Q339 510 390 482T461 397H418Q438 433 467 458T535
+496T617 510Q689 510 739 480T816 397T843 277Q843 260 842 244T839 207H492V207Q492 147 530 120T620 92Q661 92 685 109T724 156L834 114Q818 75 787 47T714 5T622 -10Q540 -10 483 28T402 141L434 140Q429 107 411 80T365 33T299 1T218 -10ZM250 87Q271 87 290
+92T325 109T349 138T358 180V216L253 194Q216 187 201 175T185 138Q185 117 200 102T250 87ZM493 302H712Q711 335 698 359T662 396T609 409Q562 409 532 381T493 302Z" />
+<glyph unicode="&#xe7;" horiz-adv-x="564" d="M299 510Q366 510 412 491T487 438T528 363L400 317Q390 362 366 385T301 408Q263 408 236 391T195 338T181 249Q181 196 195 161T237 109T302 92Q332 92 353 102T387 133T406 181L530 141Q519 96 489 62T412 9T303
+-10Q226 -10 167 21T76 110T44 250Q44 332 76 390T166 479T299 510ZM230 8L271 34Q343 20 375 -12T408 -93Q408 -147 372 -181T274 -215Q239 -215 216 -207T175 -186L199 -113Q212 -121 226 -127T262 -133Q288 -133 305 -117T322 -71Q322 -47 302 -29T230 8Z" />
+<glyph unicode="&#xe8;" horiz-adv-x="578" d="M304 -10Q225 -10 167 21T76 110T44 250Q44 332 76 390T165 479T297 510Q373 510 426 480T507 397T535 277Q535 257 534 239T531 207H132V302H471L405 278Q405 341 377 375T296 409Q258 409 231 391T189 338T175
+248Q175 195 190 161T234 109T303 92Q347 92 374 109T416 156L525 114Q509 75 477 47T400 5T304 -10ZM281 742L351 572H249L149 742H281Z" />
+<glyph unicode="&#xe9;" horiz-adv-x="578" d="M304 -10Q225 -10 167 21T76 110T44 250Q44 332 76 390T165 479T297 510Q373 510 426 480T507 397T535 277Q535 257 534 239T531 207H132V302H471L405 278Q405 341 377 375T296 409Q258 409 231 391T189 338T175
+248Q175 195 190 161T234 109T303 92Q347 92 374 109T416 156L525 114Q509 75 477 47T400 5T304 -10ZM296 742H428L328 572H227L296 742Z" />
+<glyph unicode="&#xea;" horiz-adv-x="578" d="M304 -10Q225 -10 167 21T76 110T44 250Q44 332 76 390T165 479T297 510Q373 510 426 480T507 397T535 277Q535 257 534 239T531 207H132V302H471L405 278Q405 341 377 375T296 409Q258 409 231 391T189 338T175
+248Q175 195 190 161T234 109T303 92Q347 92 374 109T416 156L525 114Q509 75 477 47T400 5T304 -10ZM473 565H368L293 663L218 565H113L224 736H362L473 565Z" />
+<glyph unicode="&#xeb;" horiz-adv-x="578" d="M304 -10Q225 -10 167 21T76 110T44 250Q44 332 76 390T165 479T297 510Q373 510 426 480T507 397T535 277Q535 257 534 239T531 207H132V302H471L405 278Q405 341 377 375T296 409Q258 409 231 391T189 338T175
+248Q175 195 190 161T234 109T303 92Q347 92 374 109T416 156L525 114Q509 75 477 47T400 5T304 -10ZM187 705Q222 705 242 687T263 635Q263 603 243 584T187 565Q153 565 133 584T113 635Q113 668 133 686T187 705ZM397 705Q433 705 453 687T473 635Q473 603 453
+584T397 565Q363 565 343 584T323 635Q323 668 343 686T397 705Z" />
+<glyph unicode="&#xec;" horiz-adv-x="282" d="M209 500V0H72V500H209ZM129 742L199 572H97L-3 742H129Z" />
+<glyph unicode="&#xed;" horiz-adv-x="282" d="M209 500V0H72V500H209ZM144 742H276L176 572H75L144 742Z" />
+<glyph unicode="&#xee;" horiz-adv-x="282" d="M209 500V0H72V500H209ZM321 565H216L141 663L66 565H-39L72 736H210L321 565Z" />
+<glyph unicode="&#xef;" horiz-adv-x="282" d="M231 564Q197 564 178 583T159 635Q159 669 178 687T231 706Q266 706 284 688T303 635Q303 602 285 583T231 564ZM51 564Q17 564 -2 583T-21 635Q-21 669 -2 687T51 706Q85 706 104 688T123 635Q123 602 104 583T51
+564ZM209 500V0H72V500H209Z" />
+<glyph unicode="&#xf0;" horiz-adv-x="610" d="M298 -10Q221 -10 165 19T79 106T49 241Q49 320 79 376T163 461T285 491Q352 491 392 464T453 391L445 385Q436 443 416 490T365 577T289 653T186 725H326Q375 698 417 658T490 564T538 444T556 298Q556 202 525
+133T437 27T298 -10ZM304 92Q344 92 371 111T412 163T426 241Q426 292 412 326T372 377T307 395Q269 395 243 378T202 326T188 241Q188 168 218 130T304 92ZM197 537L184 598L370 635L400 584L197 537ZM422 588L394 639L547 675L562 616L422 588Z" />
+<glyph unicode="&#xf1;" horiz-adv-x="619" d="M72 0V500H195L203 350L186 366Q198 415 224 446T287 494T370 510Q422 510 462 490T526 430T550 328V0H413V289Q413 353 388 377T323 402Q295 402 269 389T226 345T209 265V0H72ZM506 718Q504 668 489 635T447 585T387
+568Q359 568 339 577T305 598T277 619T248 629Q229 629 220 614T206 568H122Q126 643 158 680T246 718Q273 718 292 709T326 687T352 666T380 657Q400 657 409 672T422 718H506Z" />
+<glyph unicode="&#xf2;" horiz-adv-x="599" d="M300 510Q376 510 433 479T523 390T556 250Q556 169 524 111T434 21T300 -10Q225 -10 167 21T77 110T44 250Q44 332 76 390T167 479T300 510ZM300 408Q262 408 236 391T195 338T181 250Q181 197 195 162T235 110T300
+92Q337 92 363 109T404 162T418 250Q418 303 404 338T364 390T300 408ZM288 742L358 572H256L156 742H288Z" />
+<glyph unicode="&#xf3;" horiz-adv-x="599" d="M300 510Q376 510 433 479T523 390T556 250Q556 169 524 111T434 21T300 -10Q225 -10 167 21T77 110T44 250Q44 332 76 390T167 479T300 510ZM300 408Q262 408 236 391T195 338T181 250Q181 197 195 162T235 110T300
+92Q337 92 363 109T404 162T418 250Q418 303 404 338T364 390T300 408ZM303 742H435L335 572H234L303 742Z" />
+<glyph unicode="&#xf4;" horiz-adv-x="599" d="M300 510Q376 510 433 479T523 390T556 250Q556 169 524 111T434 21T300 -10Q225 -10 167 21T77 110T44 250Q44 332 76 390T167 479T300 510ZM300 408Q262 408 236 391T195 338T181 250Q181 197 195 162T235 110T300
+92Q337 92 363 109T404 162T418 250Q418 303 404 338T364 390T300 408ZM480 565H375L300 663L225 565H120L231 736H369L480 565Z" />
+<glyph unicode="&#xf5;" horiz-adv-x="599" d="M300 510Q376 510 433 479T523 390T556 250Q556 169 524 111T434 21T300 -10Q225 -10 167 21T77 110T44 250Q44 332 76 390T167 479T300 510ZM300 408Q262 408 236 391T195 338T181 250Q181 197 195 162T235 110T300
+92Q337 92 363 109T404 162T418 250Q418 303 404 338T364 390T300 408ZM491 718Q489 668 474 635T432 585T372 568Q344 568 324 577T290 598T262 619T233 629Q214 629 205 614T191 568H107Q111 643 143 680T231 718Q258 718 277 709T311 687T337 666T365 657Q385
+657 394 672T407 718H491Z" />
+<glyph unicode="&#xf6;" horiz-adv-x="599" d="M300 510Q376 510 433 479T523 390T556 250Q556 169 524 111T434 21T300 -10Q225 -10 167 21T77 110T44 250Q44 332 76 390T167 479T300 510ZM300 408Q262 408 236 391T195 338T181 250Q181 197 195 162T235 110T300
+92Q337 92 363 109T404 162T418 250Q418 303 404 338T364 390T300 408ZM194 705Q229 705 249 687T270 635Q270 603 250 584T194 565Q160 565 140 584T120 635Q120 668 140 686T194 705ZM404 705Q440 705 460 687T480 635Q480 603 460 584T404 565Q370 565 350 584T330
+635Q330 668 350 686T404 705Z" />
+<glyph unicode="&#xf7;" horiz-adv-x="616" d="M557 374V269H59V374H557ZM308 189Q343 189 363 169T384 113Q384 78 364 58T308 38Q273 38 252 58T231 113Q231 148 252 168T308 189ZM308 605Q343 605 363 585T384 529Q384 494 364 474T308 454Q273 454 252 474T231
+529Q231 564 252 584T308 605Z" />
+<glyph unicode="&#xf8;" horiz-adv-x="599" d="M300 510Q376 510 433 479T523 390T556 250Q556 169 524 111T434 21T300 -10Q225 -10 167 21T77 110T44 250Q44 332 76 390T167 479T300 510ZM300 408Q262 408 236 391T195 338T181 250Q181 197 195 162T235 110T300
+92Q337 92 363 109T404 162T418 250Q418 303 404 338T364 390T300 408ZM305 -27L740 526H807L372 -27H305Z" />
+<glyph unicode="&#xf9;" horiz-adv-x="618" d="M246 -10Q196 -10 156 8T93 65T69 168V500H206V201Q206 143 230 121T299 98Q320 98 340 105T375 129T400 170T409 231V500H546V0H424L419 87Q394 37 351 14T246 -10ZM293 736L363 566H261L161 736H293Z" />
+<glyph unicode="&#xfa;" horiz-adv-x="618" d="M246 -10Q196 -10 156 8T93 65T69 168V500H206V201Q206 143 230 121T299 98Q320 98 340 105T375 129T400 170T409 231V500H546V0H424L419 87Q394 37 351 14T246 -10ZM308 736H440L340 566H239L308 736Z" />
+<glyph unicode="&#xfb;" horiz-adv-x="618" d="M246 -10Q196 -10 156 8T93 65T69 168V500H206V201Q206 143 230 121T299 98Q320 98 340 105T375 129T400 170T409 231V500H546V0H424L419 87Q394 37 351 14T246 -10ZM485 559H380L305 657L230 559H125L236 730H374L485 559Z" />
+<glyph unicode="&#xfc;" horiz-adv-x="618" d="M246 -10Q196 -10 156 8T93 65T69 168V500H206V201Q206 143 230 121T299 98Q320 98 340 105T375 129T400 170T409 231V500H546V0H424L419 87Q394 37 351 14T246 -10ZM199 699Q234 699 254 681T275 629Q275 597 255
+578T199 559Q165 559 145 578T125 629Q125 662 145 680T199 699ZM409 699Q445 699 465 681T485 629Q485 597 465 578T409 559Q375 559 355 578T335 629Q335 662 355 680T409 699Z" />
+<glyph unicode="&#xfd;" horiz-adv-x="546" d="M542 500L340 -31Q316 -99 287 -139T219 -197T127 -215Q88 -215 56 -206T-1 -181L28 -82Q47 -97 68 -103T116 -110Q144 -110 164 -98T199 -50L216 -7L161 123L8 500H160L255 200L281 100L312 206L403 500H542ZM286
+736H418L318 566H217L286 736Z" />
+<glyph unicode="&#xfe;" horiz-adv-x="627" d="M72 -210V719H209V367L196 380Q212 436 257 473T370 510Q430 510 477 479T552 390T580 249Q580 168 552 110T476 21T365 -10Q299 -10 256 27T196 120L209 141V-210H72ZM325 95Q380 95 411 134T443 250Q443 326 413
+365T327 405Q292 405 266 387T224 334T209 250Q209 203 223 168T263 114T325 95Z" />
+<glyph unicode="&#xff;" horiz-adv-x="546" d="M542 500L340 -31Q316 -99 287 -139T219 -197T127 -215Q88 -215 56 -206T-1 -181L28 -82Q47 -97 68 -103T116 -110Q144 -110 164 -98T199 -50L216 -7L161 123L8 500H160L255 200L281 100L312 206L403 500H542ZM177
+699Q212 699 232 681T253 629Q253 597 233 578T177 559Q143 559 123 578T103 629Q103 662 123 680T177 699ZM387 699Q423 699 443 681T463 629Q463 597 443 578T387 559Q353 559 333 578T313 629Q313 662 333 680T387 699Z" />
+<glyph unicode="&#x2013;" horiz-adv-x="681" d="M602 322V209H79V322H602Z" />
+<glyph unicode="&#x2014;" horiz-adv-x="1009" d="M929 322V209H79V322H929Z" />
+<glyph unicode="&#x2018;" horiz-adv-x="280" d="M141 388Q109 388 88 403T56 444T45 501Q45 542 61 580T107 648T173 695L233 648Q205 637 183 621T144 585T121 544L126 541Q131 544 138 546T158 549Q174 549 190 541T217 516T228 474Q228 447 216 428T184 399T141 388Z" />
+<glyph unicode="&#x2019;" horiz-adv-x="280" d="M143 694Q175 694 196 679T228 638T239 581Q239 540 223 502T177 434T111 387L51 434Q79 445 101 461T140 497T163 538L158 541Q153 538 146 536T126 533Q110 533 94 541T67 566T56 608Q56 635 68 654T100 683T143 694Z" />
+<glyph unicode="&#x201a;" horiz-adv-x="274" d="M394 153Q426 153 447 138T479 97T490 40Q490 -1 474 -39T428 -107T362 -154L302 -107Q330 -96 352 -80T391 -44T414 -3L409 0Q404 -3 397 -5T377 -8Q361 -8 345 0T318 25T307 67Q307 94 319 113T351 142T394 153Z" />
+<glyph unicode="&#x201c;" horiz-adv-x="504" d="M141 388Q109 388 88 403T56 444T45 501Q45 542 61 580T107 648T173 695L233 648Q205 637 183 621T144 585T121 544L126 541Q131 544 138 546T158 549Q174 549 190 541T217 516T228 474Q228 447 216 428T184 399T141
+388ZM365 388Q333 388 312 403T280 444T269 501Q269 542 285 580T331 648T397 695L457 648Q429 637 407 621T368 585T345 544L350 541Q355 544 362 546T382 549Q398 549 414 541T441 516T452 474Q452 447 440 428T408 399T365 388Z" />
+<glyph unicode="&#x201d;" horiz-adv-x="504" d="M143 694Q175 694 196 679T228 638T239 581Q239 540 223 502T177 434T111 387L51 434Q79 445 101 461T140 497T163 538L158 541Q153 538 146 536T126 533Q110 533 94 541T67 566T56 608Q56 635 68 654T100 683T143
+694ZM367 694Q399 694 420 679T452 638T463 581Q463 540 447 502T401 434T335 387L275 434Q303 445 325 461T364 497T387 538L382 541Q377 538 370 536T350 533Q334 533 318 541T291 566T280 608Q280 635 292 654T324 683T367 694Z" />
+<glyph unicode="&#x201e;" horiz-adv-x="495" d="M394 153Q426 153 447 138T479 97T490 40Q490 -1 474 -39T428 -107T362 -154L302 -107Q330 -96 352 -80T391 -44T414 -3L409 0Q404 -3 397 -5T377 -8Q361 -8 345 0T318 25T307 67Q307 94 319 113T351 142T394 153ZM359
+153Q391 153 412 138T444 97T455 40Q455 -1 439 -39T393 -107T327 -154L267 -107Q295 -96 317 -80T356 -44T379 -3L374 0Q369 -3 362 -5T342 -8Q326 -8 310 0T283 25T272 67Q272 94 284 113T316 142T359 153Z" />
+<glyph unicode="&#x2022;" horiz-adv-x="430" d="M215 196Q150 196 111 234T72 334Q72 398 111 435T215 473Q281 473 319 436T358 334Q358 272 320 234T215 196Z" />
+<glyph unicode="&#x2039;" horiz-adv-x="333" d="M292 461L168 265L292 69H166L41 265L166 461H292Z" />
+<glyph unicode="&#x203a;" horiz-adv-x="333" d="M41 69L165 265L41 461H167L292 265L167 69H41Z" />
+</font>
+</defs>
+</svg>
diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.ttf b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..cc006ce1bef6327c69f9f53269f6676aa5dcdb37
GIT binary patch
literal 57392
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
BO`8A!

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.woff b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.woff
new file mode 100644
index 0000000000000000000000000000000000000000..5bb719323c03b824bad947f08a5764aeb514ebc2
GIT binary patch
literal 30164
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

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.woff2 b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..142d9fc473536e7355ddac18a1a294d30a071b13
GIT binary patch
literal 24996
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

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.eot b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.eot
new file mode 100644
index 0000000000000000000000000000000000000000..02ec2e0b9ef8d41fdbb932b1aa83dbea1df63a8d
GIT binary patch
literal 28718
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
ZKAw9Fuu}afp1oN41BnMQa!RB}FrZG&Z$SV6

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.svg b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.svg
new file mode 100644
index 0000000000..94ae1d7b83
--- /dev/null
+++ b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.svg
@@ -0,0 +1,333 @@
+<?xml version="1.0" standalone="no"?>
+<!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">
+<defs >
+<font id="WorkSans" horiz-adv-x="597" ><font-face
+    font-family="Work Sans"
+    units-per-em="1000"
+    panose-1="0 0 0 0 0 0 0 0 0 0"
+    ascent="930"
+    descent="-243"
+    alphabetic="0" />
+<glyph unicode=" " horiz-adv-x="341" />
+<glyph unicode="!" horiz-adv-x="272" d="M178 660V374L166 208H106L94 374V660H178ZM136 120Q165 120 183 102T201 55Q201 26 183 8T136 -10Q107 -10 89 8T71 55Q71 84 89 102T136 120Z" />
+<glyph unicode="&quot;" horiz-adv-x="403" d="M339 690L313 443H251V690H339ZM170 690L144 443H82V690H170Z" />
+<glyph unicode="#" horiz-adv-x="639" d="M525 660L415 0H347L457 660H525ZM575 246V185H20V246H575ZM291 660L181 0H113L223 660H291ZM619 476V415H64V476H619Z" />
+<glyph unicode="$" horiz-adv-x="622" d="M317 1Q248 1 195 20T104 71T42 143L110 198Q129 162 158 134T228 90T322 74Q396 74 439 101T483 180Q483 211 463 235T386 273L236 307Q176 321 140 344T88 400T72 471Q72 523 100 566T182 635T311 661Q395 661 456 627T558
+525L493 475Q458 537 413 563T303 589Q251 589 218 575T169 536T153 482Q153 459 162 440T194 407T260 382L399 351Q491 331 527 290T564 187Q564 132 534 90T448 25T317 1ZM279 -100V760H348V-100H279Z" />
+<glyph unicode="%" horiz-adv-x="856" d="M180 0L600 660H676L256 0H180ZM199 670Q248 670 283 648T338 584T358 488Q358 433 339 392T284 329T199 306Q151 306 115 328T60 392T40 488Q40 543 59 584T115 647T199 670ZM199 607Q171 607 151 593T121 553T111 488Q111
+451 121 424T151 383T199 369Q228 369 247 383T277 424T287 488Q287 526 277 552T248 593T199 607ZM657 354Q706 354 741 332T796 268T816 172Q816 117 797 76T742 13T657 -10Q609 -10 573 12T518 76T498 172Q498 227 517 268T573 331T657 354ZM657 291Q629 291
+609 277T579 237T569 172Q569 135 579 108T609 67T657 53Q686 53 705 67T735 108T745 172Q745 210 735 236T706 277T657 291Z" />
+<glyph unicode="&amp;" horiz-adv-x="623" d="M258 -10Q192 -10 145 13T73 76T48 168Q48 200 56 228T84 283T135 332T216 375L258 396Q296 417 321 435T358 476T371 528Q371 563 350 582T291 602Q248 602 228 579T207 524Q207 505 212 488T233 444T283 375T372
+262Q429 192 466 150T529 86T577 57T627 50L607 -10Q578 -10 553 -3T497 27T424 96T318 219Q264 286 228 332T171 410T141 468T132 523Q132 559 149 593T203 648T296 670Q339 670 371 654T421 608T440 537Q440 502 429 471T386 409T292 345L258 332Q206 308 177
+286T136 237T124 175Q124 138 143 111T194 70T266 55Q321 55 359 75T429 132L442 144Q468 185 482 237T492 353L560 347Q564 283 547 221T491 109L476 88Q438 43 384 17T258 -10Z" />
+<glyph unicode="&apos;" horiz-adv-x="234" d="M170 690L144 443H82V690H170Z" />
+<glyph unicode="(" horiz-adv-x="350" d="M275 751L321 705Q255 645 216 579T160 439T143 281Q143 198 160 124T216 -16T321 -143L275 -189Q169 -97 115 21T61 281Q61 422 115 541T275 751Z" />
+<glyph unicode=")" horiz-adv-x="350" d="M75 -189L29 -143Q95 -83 134 -17T190 123T207 281Q207 364 190 438T134 578T29 705L75 751Q181 659 235 541T289 281Q289 140 235 21T75 -189Z" />
+<glyph unicode="*" horiz-adv-x="572" d="M301 506L380 422L450 324L398 286L326 383L271 484L286 495L301 506ZM271 506L286 495L301 484L246 383L174 286L122 324L192 422L271 506ZM72 598L188 562L292 513L286 495L280 477L167 499L53 537L72 598ZM319 730V609L305
+495H286H267L253 609V730H319ZM500 598L519 537L405 499L292 477L286 495L280 513L384 562L500 598Z" />
+<glyph unicode="+" horiz-adv-x="604" d="M340 564V68H265V564H340ZM545 354V279H59V354H545Z" />
+<glyph unicode="," horiz-adv-x="266" d="M133 120Q157 120 173 108T199 74T208 23Q208 -10 197 -42T161 -101T99 -146L57 -107Q84 -98 104 -82T138 -46T155 -5L151 -3Q147 -6 141 -8T123 -10Q111 -10 99 -3T77 17T68 53Q68 71 77 86T100 111T133 120Z" />
+<glyph unicode="-" horiz-adv-x="510" d="M420 303V220H90V303H420Z" />
+<glyph unicode="." horiz-adv-x="266" d="M133 120Q162 120 180 102T198 55Q198 26 180 8T133 -10Q104 -10 86 8T68 55Q68 84 86 102T133 120Z" />
+<glyph unicode="/" horiz-adv-x="437" d="M409 730L103 -70H28L334 730H409Z" />
+<glyph unicode="0" horiz-adv-x="622" d="M311 -10Q199 -10 132 77T65 330Q65 496 132 583T311 670Q424 670 490 583T557 330Q557 164 491 77T311 -10ZM311 62Q364 62 400 92T455 183T474 330Q474 417 456 477T401 567T311 598Q258 598 222 568T167 477T148 330Q148
+243 166 183T221 93T311 62Z" />
+<glyph unicode="1" horiz-adv-x="390" d="M208 0V484Q208 501 208 520T210 561Q176 528 131 504T39 468L18 541Q36 543 63 554T121 583T178 621T218 660H288V0H208Z" />
+<glyph unicode="2" horiz-adv-x="583" d="M74 0V65Q173 138 239 193T346 293T403 378T420 463Q420 522 383 558T280 595Q212 595 171 551T123 432L53 474Q62 532 90 576T167 645T283 670Q334 670 374 655T444 613T488 547T504 463Q504 401 474 342T375 217T188
+73V72Q199 73 218 73T257 74T287 75H518V0H74Z" />
+<glyph unicode="3" horiz-adv-x="583" d="M290 -10Q202 -10 135 31T43 146L123 187Q135 150 156 123T211 80T298 65Q342 65 372 81T418 124T434 188Q434 224 421 248T378 283T302 295Q291 295 278 295T251 292V372Q260 371 268 371T284 371Q357 371 388 399T419
+489Q419 541 387 568T296 595Q233 595 200 568T148 493L72 529Q88 571 120 603T197 653T298 671Q367 671 412 648T479 585T502 499Q502 463 492 435T465 385T425 352T378 335V333Q411 332 436 320T480 288T507 243T517 189Q517 131 489 86T409 16T290 -10Z" />
+<glyph unicode="4" horiz-adv-x="611" d="M366 0V173H44V232Q44 232 44 232T44 232L345 660H446V242H563V173H446V0H366ZM129 242H366V489Q366 515 367 542T370 595H368Q356 570 337 539T302 485L129 242Q129 242 129 242T129 242Z" />
+<glyph unicode="5" horiz-adv-x="582" d="M287 -10Q199 -10 146 30T63 141L141 182Q157 130 190 98T289 65Q335 65 367 82T418 130T436 206Q436 253 420 284T372 332T296 348Q264 348 237 342T187 321T149 284L79 297L118 660H489V585H186L160 377L158 368H160Q184
+393 221 408T311 423Q374 423 420 397T493 322T519 210Q519 159 502 118T454 49T381 5T287 -10Z" />
+<glyph unicode="6" horiz-adv-x="608" d="M323 670Q376 670 415 656T484 611T533 531L459 496Q444 542 411 568T318 595Q275 595 242 574T186 514T152 425T140 315Q140 313 140 309T140 297H144Q155 340 184 366T251 405T325 418Q392 418 442 392T519 318T547
+204Q547 139 519 91T441 16T320 -10Q237 -10 180 34T94 154T65 330Q65 441 99 516T191 631T323 670ZM319 341Q276 341 244 324T193 276T175 205Q175 167 194 136T245 86T319 67Q387 67 425 103T463 205Q463 247 446 277T397 324T319 341Z" />
+<glyph unicode="7" horiz-adv-x="561" d="M40 660H526V585Q443 497 391 405T314 212T290 0H208Q208 111 235 217T319 422T458 605L471 585H40V660Z" />
+<glyph unicode="8" horiz-adv-x="616" d="M308 669Q372 669 419 648T492 589T518 496Q518 445 494 407T425 348V347Q481 326 514 283T548 178Q548 120 518 78T435 13T308 -10Q236 -10 182 13T98 78T68 178Q68 239 101 282T192 347V348Q149 367 124 405T98 496Q98
+550 124 588T197 648T308 669ZM308 594Q250 594 216 566T181 488Q181 439 216 411T308 383Q365 383 400 411T435 488Q435 538 401 566T308 594ZM308 65Q357 65 392 79T446 121T465 186Q465 224 446 251T391 293T308 308Q261 308 226 294T171 252T151 186Q151 149
+170 122T224 80T308 65Z" />
+<glyph unicode="9" horiz-adv-x="617" d="M297 670Q380 670 437 627T523 507T552 330Q552 219 523 144T438 29T298 -10Q216 -10 157 28T69 139L148 181Q164 129 200 97T301 65Q353 65 387 85T442 144T470 237T479 357Q479 359 479 361T479 366H475Q463 321 433
+294T366 254T291 242Q226 242 176 267T98 339T70 448Q70 516 97 565T175 642T297 670ZM298 593Q228 593 191 555T154 447Q154 388 193 354T298 319Q341 319 373 336T424 384T442 455Q442 497 424 528T374 576T298 593Z" />
+<glyph unicode=":" horiz-adv-x="296" d="M148 510Q177 510 195 492T213 445Q213 416 195 398T148 380Q119 380 101 398T83 445Q83 474 101 492T148 510ZM148 120Q177 120 195 102T213 55Q213 26 195 8T148 -10Q119 -10 101 8T83 55Q83 84 101 102T148 120Z" />
+<glyph unicode=";" horiz-adv-x="296" d="M147 120Q171 120 187 108T213 74T222 23Q222 -10 211 -42T175 -101T113 -146L71 -107Q98 -98 118 -82T152 -46T169 -5L165 -3Q161 -6 155 -8T137 -10Q125 -10 113 -3T91 17T82 53Q82 71 91 86T114 111T147 120ZM148 510Q177
+510 195 492T213 445Q213 416 195 398T148 380Q119 380 101 398T83 445Q83 474 101 492T148 510Z" />
+<glyph unicode="&lt;" horiz-adv-x="604" d="M547 28L71 253V346L547 571V489L135 301L547 112V28Z" />
+<glyph unicode="=" horiz-adv-x="604" d="M540 441V366H64V441H540ZM540 241V166H64V241H540Z" />
+<glyph unicode="&gt;" horiz-adv-x="604" d="M57 571L533 346V253L57 28V110L469 298L57 487V571Z" />
+<glyph unicode="?" horiz-adv-x="542" d="M273 670Q337 670 386 650T464 591T492 500Q492 442 467 403T399 342T304 315V208H221V358Q288 368 329 384T389 426T408 490Q408 537 373 566T267 595Q201 595 160 559T110 459L39 500Q50 551 81 589T161 649T273 670ZM261
+120Q290 120 308 102T326 55Q326 26 308 8T261 -10Q232 -10 214 8T196 55Q196 84 214 102T261 120Z" />
+<glyph unicode="@" horiz-adv-x="958" d="M484 -195Q390 -195 313 -165T181 -80T96 52T66 223Q66 320 98 400T190 538T329 628T505 660Q599 660 672 630T795 545T872 421T898 273Q898 208 882 156T836 68T771 12T695 -8Q641 -8 616 20T594 91Q572 49 528 24T437
+-1Q385 -1 346 24T284 93T262 196Q262 252 279 300T326 385T399 442T490 463Q529 463 560 450T612 412T641 353L665 454H736L660 128Q658 118 657 110T655 93Q655 65 669 57T702 48Q738 48 769 73T819 148T839 273Q839 343 816 403T750 507T645 576T508 601Q425
+601 357 575T238 499T161 379T133 223Q133 139 159 73T234 -40T346 -111T484 -136Q569 -136 618 -115T700 -68L735 -117Q708 -138 675 -155T595 -184T484 -195ZM460 60Q502 60 537 87T592 162T613 269Q613 309 599 338T558 384T495 401Q459 401 430 386T379 342T345
+277T333 197Q333 153 348 123T391 76T460 60Z" />
+<glyph unicode="A" horiz-adv-x="660" d="M26 0L283 660H378L634 0H549L361 492L330 584H328L299 495L110 0H26ZM152 183V258H505V183H152Z" />
+<glyph unicode="B" horiz-adv-x="653" d="M108 0V660H343Q460 660 514 611T568 478Q568 428 539 388T457 336V335Q516 324 550 282T585 185Q585 101 522 51T342 0H108ZM188 75H361Q432 75 466 104T501 185Q501 238 467 266T361 295H188V75ZM188 370H344Q484 370
+484 478Q484 585 344 585H188V370Z" />
+<glyph unicode="C" horiz-adv-x="686" d="M640 169Q619 113 580 73T489 11T374 -10Q280 -10 212 31T106 149T68 330Q68 435 105 511T211 628T372 670Q436 670 486 653T571 601T628 516L549 479Q527 536 486 565T378 595Q311 595 260 564T181 473T152 330Q152 247
+179 188T256 97T374 65Q440 65 489 98T560 199L640 169Z" />
+<glyph unicode="D" horiz-adv-x="721" d="M321 660Q476 660 564 575T653 330Q653 171 565 86T321 0H108V660H321ZM329 75Q442 75 505 142T569 330Q569 450 506 517T329 585H188V75H329Z" />
+<glyph unicode="E" horiz-adv-x="638" d="M108 0V660H571V585H188V372H486V297H188V75H586V0H108Z" />
+<glyph unicode="F" horiz-adv-x="610" d="M570 585H188V372H486V297H188V0H108V660H570V585Z" />
+<glyph unicode="G" horiz-adv-x="724" d="M374 -10Q280 -10 212 31T106 149T68 330Q68 435 107 511T218 628T381 670Q479 670 540 633T640 519L567 479Q545 536 498 565T381 595Q314 595 263 564T182 473T152 330Q152 247 177 188T253 97T377 65Q418 65 453 75T515
+107T557 160T572 235V258H362V333H645V0H582L578 123L595 120Q569 58 513 24T374 -10Z" />
+<glyph unicode="H" horiz-adv-x="734" d="M626 660V0H546V660H626ZM188 660V0H108V660H188ZM583 372V297H150V372H583Z" />
+<glyph unicode="I" horiz-adv-x="296" d="M188 660V0H108V660H188Z" />
+<glyph unicode="J" horiz-adv-x="566" d="M465 660V226Q465 115 406 53T241 -10Q167 -10 119 18T53 97T47 218L121 233Q110 148 136 107T238 65Q323 65 354 111T385 246V660H465Z" />
+<glyph unicode="K" horiz-adv-x="656" d="M625 660L337 365L325 352L148 171V279L520 660H625ZM188 660V0H108V660H188ZM345 416L628 0H532L279 371L345 416Z" />
+<glyph unicode="L" horiz-adv-x="598" d="M188 75H566V0H108V660H188V75Z" />
+<glyph unicode="M" horiz-adv-x="854" d="M746 660V0H670V415L679 589H678L461 0H393L176 589H175L184 415V0H108V660H231L376 259L426 94H428L479 258L623 660H746Z" />
+<glyph unicode="N" horiz-adv-x="734" d="M626 660V0H527L251 442L181 566H180L184 466V0H108V660H207L482 220L553 93H554L550 194V660H626Z" />
+<glyph unicode="O" horiz-adv-x="748" d="M374 670Q468 670 536 629T642 511T680 330Q680 225 643 149T537 32T374 -10Q280 -10 212 31T106 149T68 330Q68 435 105 511T211 628T374 670ZM374 595Q306 595 256 564T179 473T152 330Q152 247 179 188T256 97T374
+65Q443 65 492 96T569 187T596 330Q596 413 569 472T493 563T374 595Z" />
+<glyph unicode="P" horiz-adv-x="610" d="M341 660Q408 660 457 636T535 566T563 459Q563 397 535 352T458 283T341 258H188V0H108V660H341ZM329 333Q407 333 443 365T479 459Q479 521 443 553T329 585H188V333H329Z" />
+<glyph unicode="Q" horiz-adv-x="748" d="M534 -195Q483 -195 438 -176T365 -111T336 15Q336 24 336 34T338 55L409 53Q408 43 408 35T407 18Q407 -39 425 -67T472 -104T536 -114Q573 -114 604 -104T654 -77L680 -151Q656 -172 614 -183T534 -195ZM374 670Q468
+670 536 629T642 511T680 330Q680 225 643 149T537 32T374 -10Q280 -10 212 31T106 149T68 330Q68 435 105 511T211 628T374 670ZM374 595Q306 595 256 564T179 473T152 330Q152 247 179 188T256 97T374 65Q443 65 492 96T569 187T596 330Q596 413 569 472T493
+563T374 595Z" />
+<glyph unicode="R" horiz-adv-x="665" d="M358 660Q459 660 520 608T581 467Q581 378 520 329T357 279L350 274H188V0H108V660H358ZM357 349Q428 349 462 378T497 467Q497 526 463 555T357 585H188V349H357ZM403 333L621 0H526L336 289L403 333Z" />
+<glyph unicode="S" horiz-adv-x="641" d="M320 670Q407 670 470 635T575 530L508 478Q471 542 425 568T312 595Q259 595 225 580T174 541T158 485Q158 450 180 424T268 382L411 350Q506 329 543 287T581 181Q581 125 550 82T461 14T327 -10Q255 -10 201 9T107
+62T43 136L113 193Q132 155 162 126T234 81T332 65Q383 65 420 77T478 114T498 174Q498 206 477 231T398 270L243 305Q182 319 145 343T91 401T74 474Q74 527 103 571T188 643T320 670Z" />
+<glyph unicode="T" horiz-adv-x="604" d="M572 660V585H342V0H262V585H32V660H572Z" />
+<glyph unicode="U" horiz-adv-x="708" d="M613 660V246Q613 119 546 55T354 -10Q230 -10 163 54T95 246V660H175V266Q175 163 218 114T354 65Q446 65 489 114T533 266V660H613Z" />
+<glyph unicode="V" horiz-adv-x="648" d="M620 660L370 0H279L28 660H114L282 204L324 73L366 203L534 660H620Z" />
+<glyph unicode="W" horiz-adv-x="961" d="M231 0L36 660H119L282 73L437 660H528L683 71L846 660H925L731 0H632L515 428L481 577H480L446 428L330 0H231Z" />
+<glyph unicode="X" horiz-adv-x="601" d="M569 0H477L298 272L118 0H25L256 336L45 660H139L306 403L475 660H562L348 340L569 0Z" />
+<glyph unicode="Y" horiz-adv-x="572" d="M562 660L326 258V0H246V258L10 660H105L233 434L286 340L339 434L467 660H562Z" />
+<glyph unicode="Z" horiz-adv-x="630" d="M128 46L114 75H575V0H56V71L490 614L504 585H66V660H562V589L128 46Z" />
+<glyph unicode="[" horiz-adv-x="348" d="M315 660H162V-98H315V-168H87V730H315V660Z" />
+<glyph unicode="\" horiz-adv-x="437" d="M28 730H103L409 -70H334L28 730Z" />
+<glyph unicode="]" horiz-adv-x="348" d="M33 -98H186V660H33V730H261V-168H33V-98Z" />
+<glyph unicode="^" horiz-adv-x="560" d="M27 355L242 730H318L533 355H452L280 662L108 355H27Z" />
+<glyph unicode="_" horiz-adv-x="539" d="M539 -97V-172H0V-97H539Z" />
+<glyph unicode="`" horiz-adv-x="500" d="M256 750L332 583H267L169 750H256Z" />
+<glyph unicode="a" horiz-adv-x="566" d="M385 323Q385 379 355 409T270 440Q218 440 182 418T129 345L64 385Q84 441 138 475T272 510Q326 510 370 492T439 436T465 339V97Q465 61 503 61Q522 61 540 66L536 3Q516 -7 484 -7Q455 -7 432 4T396 37T383 94V104L403
+101Q391 62 362 38T297 2T226 -10Q182 -10 144 5T84 50T61 126Q61 182 98 218T203 268L401 307V241L240 208Q191 198 167 180T143 130Q143 99 167 80T237 60Q266 60 292 67T340 90T373 129T385 185V323Z" />
+<glyph unicode="b" horiz-adv-x="627" d="M338 -10Q296 -10 260 5T198 47T159 108L170 122L163 0H93V730H173V387L163 402Q183 449 230 479T339 510Q401 510 453 479T536 390T567 250Q567 169 536 111T452 21T338 -10ZM330 60Q404 60 445 112T487 250Q487 336
+446 388T331 440Q284 440 249 416T193 349T173 248Q173 191 192 149T247 83T330 60Z" />
+<glyph unicode="c" horiz-adv-x="560" d="M300 510Q352 510 391 494T460 448T507 377L431 341Q415 389 383 414T298 440Q248 440 212 418T157 353T138 250Q138 191 157 148T212 83T298 60Q337 60 365 72T412 107T438 163L512 137Q495 91 466 58T395 8T300 -10Q230
+-10 175 21T89 110T58 250Q58 331 89 389T175 479T300 510Z" />
+<glyph unicode="d" horiz-adv-x="627" d="M288 -10Q226 -10 174 21T91 110T60 250Q60 333 93 391T180 479T296 510Q358 510 403 478T464 393L454 386V730H534V0H464L457 121L468 127Q461 83 435 53T370 6T288 -10ZM296 60Q344 60 379 84T434 152T454 257Q454 314
+435 355T381 418T300 440Q224 440 182 388T140 250Q140 164 181 112T296 60Z" />
+<glyph unicode="e" horiz-adv-x="577" d="M302 -10Q231 -10 176 21T89 110T58 250Q58 331 89 389T174 479T297 510Q367 510 416 480T492 399T518 283Q518 266 517 252T514 227H110V298H479L438 290Q438 362 399 401T295 440Q246 440 211 418T156 353T136 250Q136
+191 156 148T212 83T300 60Q355 60 389 81T445 138L508 101Q489 67 460 42T391 4T302 -10Z" />
+<glyph unicode="f" horiz-adv-x="393" d="M296 735Q322 735 345 729T381 712L360 647Q348 655 334 658T303 662Q260 662 236 642T212 576V500V474V0H132V584Q132 617 142 645T172 693T224 724T296 735ZM379 500V431H32V500H379Z" />
+<glyph unicode="g" horiz-adv-x="532" d="M514 592L532 521Q531 521 529 521T525 521Q476 521 450 502T423 439L374 464Q374 503 392 532T441 576T509 592Q510 592 511 592T514 592ZM362 64Q433 64 473 32T513 -55Q513 -104 481 -140T394 -195T271 -215Q153 -215
+95 -175T36 -79Q36 -39 62 -8T152 28L145 13Q111 22 88 43T64 106Q64 147 94 176T185 213L238 186H228Q179 181 159 162T138 119Q138 91 158 78T216 64H362ZM270 -148Q328 -148 365 -136T421 -105T439 -64Q439 -37 418 -21T340 -5H186Q154 -5 132 -21T110 -67Q110
+-104 152 -126T270 -148ZM263 510Q323 510 369 489T442 429T468 341Q468 292 442 254T370 194T263 172Q164 172 111 219T58 341Q58 391 84 429T157 488T263 510ZM263 445Q211 445 176 417T141 341Q141 295 176 266T263 237Q315 237 350 266T385 341Q385 388 350
+416T263 445Z" />
+<glyph unicode="h" horiz-adv-x="619" d="M93 0V730H173V425Q199 470 242 490T336 510Q390 510 434 490T504 427T531 320V0H451V292Q451 375 416 407T328 440Q292 440 256 423T197 368T173 265V0H93Z" />
+<glyph unicode="i" horiz-adv-x="266" d="M133 596Q106 596 90 612T73 656Q73 683 89 699T133 716Q160 716 176 700T193 656Q193 629 177 613T133 596ZM173 500V0H93V500H173Z" />
+<glyph unicode="j" horiz-adv-x="266" d="M133 596Q106 596 90 612T73 656Q73 683 89 699T133 716Q160 716 176 700T193 656Q193 629 177 613T133 596ZM173 500V-51Q173 -113 149 -149T90 -200T21 -215Q-10 -215 -36 -206T-79 -182L-62 -106Q-48 -119 -27 -128T20
+-137Q52 -137 72 -116T93 -43V500H173Z" />
+<glyph unicode="k" horiz-adv-x="567" d="M532 500L316 284L297 265L133 101V201L431 500H532ZM173 730V0H93V730H173ZM323 325L544 0H447L256 280L323 325Z" />
+<glyph unicode="l" horiz-adv-x="306" d="M169 730V127Q169 89 183 75T228 60Q248 60 261 63T296 74L283 4Q267 -3 248 -6T209 -10Q148 -10 119 23T89 124V730H169Z" />
+<glyph unicode="m" horiz-adv-x="953" d="M93 0V500H163L168 422Q195 468 238 489T328 510Q381 510 428 486T500 412Q516 446 545 467T608 499T674 510Q722 510 765 490T837 428T865 320V0H785V312Q785 380 751 410T667 440Q628 440 594 421T540 365T519 274V0H439V312Q439
+380 405 410T321 440Q288 440 254 423T196 367T173 267V0H93Z" />
+<glyph unicode="n" horiz-adv-x="619" d="M93 0V500H163L170 388L157 399Q173 439 200 463T262 499T336 510Q390 510 434 490T504 427T531 320V0H451V292Q451 375 416 407T328 440Q292 440 256 423T197 368T173 266V0H93Z" />
+<glyph unicode="o" horiz-adv-x="600" d="M300 510Q371 510 425 479T511 390T542 250Q542 169 511 111T426 21T300 -10Q230 -10 175 21T89 110T58 250Q58 331 89 389T175 479T300 510ZM300 441Q249 441 213 418T158 353T138 250Q138 191 157 148T213 82T300 59Q351
+59 387 82T442 148T462 250Q462 310 443 352T387 418T300 441Z" />
+<glyph unicode="p" horiz-adv-x="627" d="M93 -210V500H163L170 378L159 392Q172 427 198 453T261 495T341 510Q402 510 453 479T536 390T567 250Q567 169 536 111T452 21T338 -10Q276 -10 230 20T163 98L173 113V-210H93ZM330 60Q404 60 445 112T487 250Q487
+336 447 388T333 440Q285 440 249 417T193 351T173 250Q173 193 192 150T247 84T330 60Z" />
+<glyph unicode="q" horiz-adv-x="627" d="M454 -210V137L468 127Q461 83 435 53T370 6T288 -10Q226 -10 174 21T91 110T60 250Q60 333 93 391T180 479T296 510Q338 510 374 495T435 451T469 383H457L464 500H534V-210H454ZM296 60Q343 60 378 83T434 150T454 253Q454
+313 435 354T380 418T298 440Q224 440 182 388T140 250Q140 164 181 112T296 60Z" />
+<glyph unicode="r" horiz-adv-x="408" d="M93 0V500H158L169 418Q190 464 230 487T329 510Q342 510 357 508T384 500L370 427Q359 431 346 433T309 435Q278 435 247 417T194 363T173 270V0H93Z" />
+<glyph unicode="s" horiz-adv-x="527" d="M273 -10Q200 -10 139 21T44 109L112 158Q134 112 176 86T279 60Q332 60 362 80T392 134Q392 155 379 172T327 198L207 223Q134 238 103 273T71 360Q71 401 94 435T161 489T264 510Q338 510 389 481T465 399L398 355Q381
+399 343 419T264 440Q228 440 203 430T164 403T150 363Q150 341 165 323T221 296L346 270Q416 256 444 224T472 146Q472 99 447 64T377 9T273 -10Z" />
+<glyph unicode="t" horiz-adv-x="419" d="M211 642V138Q211 101 232 83T286 65Q315 65 336 75T374 102L402 35Q379 14 348 2T275 -10Q237 -10 204 3T152 46T131 124V620L211 642ZM393 500V431H31V500H393Z" />
+<glyph unicode="u" horiz-adv-x="617" d="M274 -10Q226 -10 184 8T115 66T88 172V500H168V193Q168 117 201 89T294 60Q322 60 349 69T397 99T431 152T444 228V500H524V0H454L449 76Q423 31 379 11T274 -10Z" />
+<glyph unicode="v" horiz-adv-x="520" d="M424 500H508L300 0H220L12 500H103L261 81L424 500Z" />
+<glyph unicode="w" horiz-adv-x="836" d="M720 500H809L635 0H555L414 398L281 0H201L27 500H116L242 93L378 500H458L594 93L720 500Z" />
+<glyph unicode="x" horiz-adv-x="533" d="M141 500L290 291L295 284L500 0H402L247 217L238 228L41 500H141ZM497 500L299 233H294L122 0H29L247 287H253L403 500H497Z" />
+<glyph unicode="y" horiz-adv-x="516" d="M504 500L269 -84Q250 -133 228 -161T178 -202T114 -215Q80 -215 52 -206T1 -180L23 -110Q43 -128 65 -136T110 -145Q136 -145 159 -129T201 -64L227 1L177 120L18 500H109L234 174L265 85L301 184L418 500H504Z" />
+<glyph unicode="z" horiz-adv-x="534" d="M57 0V61L319 368L382 433L293 431H60V500H471V439L209 132L147 67L244 69H479V0H57Z" />
+<glyph unicode="{" horiz-adv-x="351" d="M304 -189Q245 -189 209 -175T157 -132T140 -65V142Q140 198 115 222T28 246V316Q89 316 114 340T140 420V627Q140 667 156 694T209 736T304 751V686Q255 686 235 673T215 633V413Q215 359 186 326T101 281Q157 269 186
+236T215 149V-71Q215 -98 235 -111T304 -124V-189Z" />
+<glyph unicode="|" horiz-adv-x="243" d="M156 730V-168H87V730H156Z" />
+<glyph unicode="}" horiz-adv-x="351" d="M47 751Q106 751 142 737T194 694T211 627V420Q211 364 236 340T323 316V246Q262 246 237 222T211 142V-65Q211 -105 195 -132T142 -174T47 -189V-124Q96 -124 116 -111T136 -71V149Q136 203 165 236T250 281Q194 293
+165 326T136 413V633Q136 660 116 673T47 686V751Z" />
+<glyph unicode="~" horiz-adv-x="540" d="M497 384Q491 311 459 273T367 235Q333 235 308 246T264 272T225 298T181 309Q155 309 140 289T119 235H43Q49 309 81 346T174 384Q207 384 232 373T277 347T316 321T359 310Q385 310 400 330T421 384H497Z" />
+<glyph unicode="&#xa0;" horiz-adv-x="341" />
+<glyph unicode="&#xa1;" horiz-adv-x="264" d="M90 -160V126L102 292H162L174 126V-160H90ZM132 380Q103 380 85 398T67 445Q67 474 85 492T132 510Q161 510 179 492T197 445Q197 416 179 398T132 380Z" />
+<glyph unicode="&#xa2;" horiz-adv-x="567" d="M310 -10Q239 -10 184 21T98 110T66 250Q66 331 97 389T184 479T310 510Q362 510 401 494T469 448T515 377L439 341Q423 392 390 418T308 445Q236 445 189 394T141 250Q141 188 163 145T222 78T308 55Q345 55 372
+67T419 103T448 163L520 138Q504 92 475 59T405 8T310 -10ZM270 -100V600H337V-100H270Z" />
+<glyph unicode="&#xa3;" horiz-adv-x="620" d="M80 278V343H467V278H80ZM154 -10Q103 -10 74 14T44 76Q44 100 58 120T99 152T166 165Q206 165 235 154T289 127T335 93T381 65T436 54Q479 54 498 77T518 153H583Q583 100 567 64T521 9T447 -10Q410 -10 380 1T322
+30T269 64T217 93T163 105Q139 105 128 98T117 76Q117 60 130 52T164 44Q205 44 224 61T248 106T254 163Q254 204 240 237T197 319Q178 352 166 378T149 427T144 475Q144 535 172 579T247 646T353 670Q432 670 481 632T552 514L483 476Q469 533 440 565T351 597Q290
+597 254 566T218 475Q218 454 221 437T232 399T256 349Q284 297 300 252T316 167Q316 137 309 106T283 49T233 6T154 -10Z" />
+<glyph unicode="&#xa4;" horiz-adv-x="665" d="M333 539Q394 539 441 512T516 438T543 329Q543 268 516 221T442 146T333 118Q272 118 225 145T150 220T122 329Q122 390 149 437T224 512T333 539ZM333 467Q276 467 239 428T202 329Q202 268 239 229T333 190Q389
+190 426 229T463 329Q463 389 426 428T333 467ZM121 591L240 474L189 424L70 540L121 591ZM187 236L237 185L121 66L70 117L187 236ZM476 233L595 117L544 66L425 182L476 233ZM544 591L595 540L479 421L428 472L544 591Z" />
+<glyph unicode="&#xa5;" horiz-adv-x="620" d="M275 0V107H83V162H275V237H83V297H212L256 293L34 660H127L261 417L309 318H311L359 418L493 660H586L364 293L408 297H538V237H345V162H538V107H345V0H275Z" />
+<glyph unicode="&#xa6;" horiz-adv-x="243" d="M156 730V367H87V730H156ZM156 195V-168H87V195H156Z" />
+<glyph unicode="&#xa7;" horiz-adv-x="598" d="M417 138L368 168Q408 169 435 179T477 209T492 253Q492 282 472 305T388 340L244 365Q191 375 158 395T111 444T96 509Q96 556 122 592T197 649T309 670Q379 670 433 645T521 571L459 523Q431 565 394 583T306 601Q242
+601 207 577T171 515Q171 496 178 480T204 453T259 435L400 411Q466 400 502 380T553 333T568 272Q568 240 553 211T505 162T417 138ZM284 -110Q196 -110 141 -81T58 -8L120 43Q141 5 181 -19T289 -43Q356 -43 393 -18T430 50Q430 75 413 93T358 118L189 151Q134
+162 99 181T48 229T31 295Q31 327 47 353T91 396T160 417L195 392Q168 385 148 374T117 347T106 309Q106 280 129 256T212 220L369 192Q442 179 473 142T504 56Q504 9 478 -29T402 -88T284 -110Z" />
+<glyph unicode="&#xa8;" horiz-adv-x="500" d="M153 696Q179 696 194 681T210 639Q210 614 195 598T153 582Q128 582 112 598T96 639Q96 665 112 680T153 696ZM347 696Q373 696 388 681T404 639Q404 614 389 598T347 582Q322 582 306 598T290 639Q290 665 306
+680T347 696Z" />
+<glyph unicode="&#xa9;" horiz-adv-x="820" d="M410 -10Q308 -10 231 35T111 157T68 330Q68 427 111 503T231 625T410 670Q512 670 589 625T709 504T752 330Q752 234 709 157T589 35T410 -10ZM410 55Q491 55 552 91T647 190T681 330Q681 407 647 469T552 568T410
+605Q330 605 269 569T173 470T139 330Q139 253 173 191T268 92T410 55ZM417 143Q332 143 284 192T235 328Q235 414 283 463T417 513Q476 513 515 488T573 418L515 389Q502 421 478 437T416 453Q363 453 333 420T302 328Q302 269 332 236T416 203Q456 203 482 219T522
+270L577 248Q558 199 518 171T417 143Z" />
+<glyph unicode="&#xaa;" horiz-adv-x="382" d="M139 327Q87 327 57 351T27 416Q27 455 51 478T137 512L253 533V488L159 469Q123 462 110 452T97 421Q97 402 111 392T150 381Q170 381 191 387T227 411T242 460V545Q242 576 224 593T175 611Q144 611 118 597T76
+547L27 576Q41 614 78 639T172 665Q237 665 273 636T310 547V407Q310 389 319 383T341 376Q357 376 365 380L360 336Q352 332 342 330T321 327Q289 327 271 345T252 399V414L262 403Q253 382 236 365T194 337T139 327ZM26 201V254H346V201H26Z" />
+<glyph unicode="&#xab;" horiz-adv-x="493" d="M264 461L136 265L264 69H177L51 265L177 461H264ZM441 461L313 265L441 69H354L228 265L354 461H441Z" />
+<glyph unicode="&#xac;" horiz-adv-x="604" d="M545 319V131H465V319H545ZM545 354V279H59V354H545Z" />
+<glyph unicode="&#xad;" horiz-adv-x="510" d="M420 303V220H90V303H420Z" />
+<glyph unicode="&#xae;" horiz-adv-x="820" d="M410 -10Q308 -10 231 35T111 157T68 330Q68 427 111 503T231 625T410 670Q512 670 589 626T709 504T752 330Q752 234 709 157T589 35T410 -10ZM493 143L393 293L448 316L569 143H493ZM410 55Q491 55 552 91T647
+190T681 330Q681 407 647 469T552 568T410 605Q330 605 269 569T173 470T139 330Q139 253 173 191T268 92T410 55ZM269 143V513H421Q463 513 494 499T543 458T561 395Q561 340 522 309T421 277H336V143H269ZM336 328H420Q456 328 475 344T494 395Q494 429 475 445T420
+462H336V328Z" />
+<glyph unicode="&#xaf;" horiz-adv-x="500" d="M414 663V596H86V663H414Z" />
+<glyph unicode="&#xb0;" horiz-adv-x="460" d="M230 340Q181 340 143 361T82 420T60 505Q60 553 82 590T142 649T230 670Q280 670 318 649T378 591T400 505Q400 457 378 420T318 362T230 340ZM230 405Q274 405 302 433T330 505Q330 549 302 577T230 605Q187 605
+159 577T130 505Q130 462 158 434T230 405Z" />
+<glyph unicode="&#xb1;" horiz-adv-x="604" d="M340 640V154H265V640H340ZM545 434V359H59V434H545ZM545 75V0H59V75H545Z" />
+<glyph unicode="&#xb2;" horiz-adv-x="365" d="M39 333V381Q62 398 85 414T131 448Q179 486 206 512T243 560T254 604Q254 636 235 656T177 677Q138 677 116 653T91 584L28 606Q32 667 73 701T180 735Q229 735 261 717T310 670T327 608Q327 579 312 550T264 489T182
+423Q169 414 157 406T130 388V387Q139 388 161 389T194 390H336V333H39Z" />
+<glyph unicode="&#xb3;" horiz-adv-x="362" d="M181 735Q247 735 283 705T319 627Q319 597 307 576T276 545T240 533V532Q260 532 280 522T314 491T328 440Q328 406 309 381T256 341T178 327Q117 327 79 350T24 423L91 453Q97 419 118 402T177 385Q212 385 233
+402T255 450Q255 482 233 494T170 506Q166 506 162 506T153 505V557Q157 556 160 556T167 556Q205 556 225 571T245 616Q245 646 227 661T177 677Q146 677 127 662T101 617L36 640Q49 689 88 712T181 735Z" />
+<glyph unicode="&#xb4;" horiz-adv-x="600" d="M295 750H382L284 583H219L295 750Z" />
+<glyph unicode="&#xb5;" horiz-adv-x="622" d="M93 -210V500H173V194Q173 124 206 92T299 60Q339 60 373 77T428 134T449 237V500H529V0H464L457 81Q432 36 389 13T295 -10Q257 -10 225 2T173 41V41V-210H93Z" />
+<glyph unicode="&#xb6;" horiz-adv-x="657" d="M294 -100V191Q218 191 161 220T73 303T41 425Q41 496 75 549T171 631T315 660H566V-100H496V593H367V-100H294ZM294 258V593Q237 593 198 573T138 514T117 425Q117 373 137 336T197 278T294 258Z" />
+<glyph unicode="&#xb7;" horiz-adv-x="226" d="M113 420Q142 420 160 402T178 355Q178 326 160 308T113 290Q84 290 66 308T48 355Q48 384 66 402T113 420Z" />
+<glyph unicode="&#xb8;" horiz-adv-x="500" d="M207 4L249 29Q308 10 333 -22T358 -99Q358 -147 324 -181T237 -215Q206 -215 183 -207T142 -186L161 -128Q175 -137 190 -144T228 -151Q256 -151 274 -133T292 -81Q292 -55 273 -36T207 4Z" />
+<glyph unicode="&#xb9;" horiz-adv-x="242" d="M127 730H189V333H119V584Q119 598 119 617T121 656Q99 635 70 619T10 598V658Q28 662 51 673T96 699T127 730Z" />
+<glyph unicode="&#xba;" horiz-adv-x="360" d="M180 327Q110 327 67 372T23 496Q23 576 66 620T180 665Q250 665 293 621T337 496Q337 417 294 372T180 327ZM36 201V254H324V201H36ZM180 382Q224 382 245 412T267 496Q267 550 246 580T180 611Q136 611 115 581T93
+496Q93 442 114 412T180 382Z" />
+<glyph unicode="&#xbb;" horiz-adv-x="493" d="M229 69L357 265L229 461H316L442 265L316 69H229ZM52 69L180 265L52 461H139L265 265L139 69H52Z" />
+<glyph unicode="&#xbc;" horiz-adv-x="788" d="M127 921H189V524H119V775Q119 789 119 808T121 847Q99 826 70 810T10 789V849Q28 853 51 864T96 890T127 921ZM88 0L565 660H644L167 0H88ZM768 145V95H697V-4H638V95H439V132L621 393H697V145H768ZM507 145H638V259Q638
+278 639 297T641 335H638Q632 324 623 309T606 281L507 145Z" />
+<glyph unicode="&#xbd;" horiz-adv-x="855" d="M127 921H189V524H119V775Q119 789 119 808T121 847Q99 826 70 810T10 789V849Q28 853 51 864T96 890T127 921ZM88 0L565 660H644L167 0H88ZM529 -4V44Q552 61 575 77T621 111Q669 149 696 175T733 223T744 267Q744
+299 725 319T667 340Q628 340 606 316T581 247L518 269Q522 330 563 364T670 398Q719 398 751 380T800 333T817 271Q817 242 802 213T754 152T672 86Q659 77 647 69T620 51V50Q629 51 651 52T684 53H826V-4H529Z" />
+<glyph unicode="&#xbe;" horiz-adv-x="908" d="M181 926Q247 926 283 896T319 818Q319 788 307 767T276 736T240 724V723Q260 723 280 713T314 682T328 631Q328 597 309 572T256 532T178 518Q117 518 79 541T24 614L91 644Q97 610 118 593T177 576Q212 576 233
+593T255 641Q255 673 233 685T170 697Q166 697 162 697T153 696V748Q157 747 160 747T167 747Q205 747 225 762T245 807Q245 837 227 852T177 868Q146 868 127 853T101 808L36 831Q49 880 88 903T181 926ZM208 0L685 660H764L287 0H208ZM888 145V95H817V-4H758V95H559V132L741
+393H817V145H888ZM627 145H758V259Q758 278 759 297T761 335H758Q752 324 743 309T726 281L627 145Z" />
+<glyph unicode="&#xbf;" horiz-adv-x="537" d="M266 -170Q202 -170 153 -150T75 -91T47 0Q47 58 72 97T140 158T235 185V292H318V142Q251 132 210 116T150 74T131 10Q131 -37 166 -66T272 -95Q338 -95 379 -59T429 41L500 0Q489 -51 458 -89T378 -149T266 -170ZM278
+380Q249 380 231 398T213 445Q213 474 231 492T278 510Q307 510 325 492T343 445Q343 416 325 398T278 380Z" />
+<glyph unicode="&#xc0;" horiz-adv-x="660" d="M26 0L283 660H378L634 0H549L361 492L330 584H328L299 495L110 0H26ZM152 183V258H505V183H152ZM302 902L368 743H304L218 902H302Z" />
+<glyph unicode="&#xc1;" horiz-adv-x="660" d="M26 0L283 660H378L634 0H549L361 492L330 584H328L299 495L110 0H26ZM152 183V258H505V183H152ZM353 902H437L351 743H287L353 902Z" />
+<glyph unicode="&#xc2;" horiz-adv-x="660" d="M26 0L283 660H378L634 0H549L361 492L330 584H328L299 495L110 0H26ZM152 183V258H505V183H152ZM484 743H410L330 850L250 743H176L286 902H374L484 743Z" />
+<glyph unicode="&#xc3;" horiz-adv-x="660" d="M26 0L283 660H378L634 0H549L361 492L330 584H328L299 495L110 0H26ZM152 183V258H505V183H152ZM510 877Q507 833 494 803T457 758T398 743Q370 743 351 753T317 777T290 800T260 811Q238 811 227 793T211 742H148Q153
+808 180 842T261 876Q288 876 307 866T341 842T369 819T397 808Q420 808 431 826T447 877H510Z" />
+<glyph unicode="&#xc4;" horiz-adv-x="660" d="M26 0L283 660H378L634 0H549L361 492L330 584H328L299 495L110 0H26ZM152 183V258H505V183H152ZM233 856Q259 856 274 841T290 799Q290 774 275 758T233 742Q208 742 192 758T176 799Q176 825 192 840T233 856ZM427
+856Q453 856 468 841T484 799Q484 774 469 758T427 742Q402 742 386 758T370 799Q370 825 386 840T427 856Z" />
+<glyph unicode="&#xc5;" horiz-adv-x="660" d="M26 0L283 660H378L634 0H549L361 492L330 584H328L299 495L110 0H26ZM152 183V258H505V183H152ZM328 847Q384 847 418 815T453 729Q453 676 419 643T328 610Q272 610 237 643T202 729Q202 782 237 814T328 847ZM328
+798Q297 798 277 779T257 729Q257 699 277 680T328 660Q359 660 379 679T399 729Q399 759 379 778T328 798Z" />
+<glyph unicode="&#xc6;" horiz-adv-x="954" d="M531 75H902V0H451V213H215L92 0H6L392 660H887V585H531V372H802V297H531V75ZM259 288H451V585H431L259 288Z" />
+<glyph unicode="&#xc7;" horiz-adv-x="686" d="M640 169Q619 113 580 73T489 11T374 -10Q280 -10 212 31T106 149T68 330Q68 435 105 511T211 628T372 670Q436 670 486 653T571 601T628 516L549 479Q527 536 486 565T378 595Q311 595 260 564T181 473T152 330Q152
+247 179 188T256 97T374 65Q440 65 489 98T560 199L640 169ZM317 4L359 29Q418 10 443 -22T468 -99Q468 -147 434 -181T347 -215Q316 -215 293 -207T252 -186L271 -128Q285 -137 300 -144T338 -151Q366 -151 384 -133T402 -81Q402 -55 383 -36T317 4Z" />
+<glyph unicode="&#xc8;" horiz-adv-x="638" d="M108 0V660H571V585H188V372H486V297H188V75H586V0H108ZM317 902L383 743H319L233 902H317Z" />
+<glyph unicode="&#xc9;" horiz-adv-x="638" d="M108 0V660H571V585H188V372H486V297H188V75H586V0H108ZM363 902H447L361 743H297L363 902Z" />
+<glyph unicode="&#xca;" horiz-adv-x="638" d="M108 0V660H571V585H188V372H486V297H188V75H586V0H108ZM494 743H420L340 850L260 743H186L296 902H384L494 743Z" />
+<glyph unicode="&#xcb;" horiz-adv-x="638" d="M108 0V660H571V585H188V372H486V297H188V75H586V0H108ZM243 856Q269 856 284 841T300 799Q300 774 285 758T243 742Q218 742 202 758T186 799Q186 825 202 840T243 856ZM437 856Q463 856 478 841T494 799Q494 774
+479 758T437 742Q412 742 396 758T380 799Q380 825 396 840T437 856Z" />
+<glyph unicode="&#xcc;" horiz-adv-x="296" d="M188 660V0H108V660H188ZM115 902L181 743H117L31 902H115Z" />
+<glyph unicode="&#xcd;" horiz-adv-x="296" d="M188 660V0H108V660H188ZM181 902H265L179 743H115L181 902Z" />
+<glyph unicode="&#xce;" horiz-adv-x="296" d="M188 660V0H108V660H188ZM302 743H228L148 850L68 743H-6L104 902H192L302 743Z" />
+<glyph unicode="&#xcf;" horiz-adv-x="296" d="M62 856Q88 856 103 841T119 799Q119 774 104 758T62 742Q37 742 21 758T5 799Q5 825 21 840T62 856ZM234 856Q260 856 275 841T291 799Q291 774 276 758T234 742Q209 742 193 758T177 799Q177 825 193 840T234 856ZM188
+660V0H108V660H188Z" />
+<glyph unicode="&#xd0;" horiz-adv-x="737" d="M26 296V371H401V296H26ZM337 660Q492 660 580 575T669 330Q669 171 581 86T337 0H124V660H337ZM345 75Q458 75 521 142T585 330Q585 450 522 517T345 585H204V75H345Z" />
+<glyph unicode="&#xd1;" horiz-adv-x="734" d="M626 660V0H527L251 442L181 566H180L184 466V0H108V660H207L482 220L553 93H554L550 194V660H626ZM551 877Q548 833 535 803T498 758T439 743Q411 743 392 753T358 777T331 800T301 811Q279 811 268 793T252 742H189Q194
+808 221 842T302 876Q329 876 348 866T382 842T410 819T438 808Q461 808 472 826T488 877H551Z" />
+<glyph unicode="&#xd2;" horiz-adv-x="748" d="M374 670Q468 670 536 629T642 511T680 330Q680 225 643 149T537 32T374 -10Q280 -10 212 31T106 149T68 330Q68 435 105 511T211 628T374 670ZM374 595Q306 595 256 564T179 473T152 330Q152 247 179 188T256 97T374
+65Q443 65 492 96T569 187T596 330Q596 413 569 472T493 563T374 595ZM341 902L407 743H343L257 902H341Z" />
+<glyph unicode="&#xd3;" horiz-adv-x="748" d="M374 670Q468 670 536 629T642 511T680 330Q680 225 643 149T537 32T374 -10Q280 -10 212 31T106 149T68 330Q68 435 105 511T211 628T374 670ZM374 595Q306 595 256 564T179 473T152 330Q152 247 179 188T256 97T374
+65Q443 65 492 96T569 187T596 330Q596 413 569 472T493 563T374 595ZM397 902H481L395 743H331L397 902Z" />
+<glyph unicode="&#xd4;" horiz-adv-x="748" d="M374 670Q468 670 536 629T642 511T680 330Q680 225 643 149T537 32T374 -10Q280 -10 212 31T106 149T68 330Q68 435 105 511T211 628T374 670ZM374 595Q306 595 256 564T179 473T152 330Q152 247 179 188T256 97T374
+65Q443 65 492 96T569 187T596 330Q596 413 569 472T493 563T374 595ZM528 743H454L374 850L294 743H220L330 902H418L528 743Z" />
+<glyph unicode="&#xd5;" horiz-adv-x="748" d="M374 670Q468 670 536 629T642 511T680 330Q680 225 643 149T537 32T374 -10Q280 -10 212 31T106 149T68 330Q68 435 105 511T211 628T374 670ZM374 595Q306 595 256 564T179 473T152 330Q152 247 179 188T256 97T374
+65Q443 65 492 96T569 187T596 330Q596 413 569 472T493 563T374 595ZM554 877Q551 833 538 803T501 758T442 743Q414 743 395 753T361 777T334 800T304 811Q282 811 271 793T255 742H192Q197 808 224 842T305 876Q332 876 351 866T385 842T413 819T441 808Q464
+808 475 826T491 877H554Z" />
+<glyph unicode="&#xd6;" horiz-adv-x="748" d="M374 670Q468 670 536 629T642 511T680 330Q680 225 643 149T537 32T374 -10Q280 -10 212 31T106 149T68 330Q68 435 105 511T211 628T374 670ZM374 595Q306 595 256 564T179 473T152 330Q152 247 179 188T256 97T374
+65Q443 65 492 96T569 187T596 330Q596 413 569 472T493 563T374 595ZM277 856Q303 856 318 841T334 799Q334 774 319 758T277 742Q252 742 236 758T220 799Q220 825 236 840T277 856ZM471 856Q497 856 512 841T528 799Q528 774 513 758T471 742Q446 742 430 758T414
+799Q414 825 430 840T471 856Z" />
+<glyph unicode="&#xd7;" horiz-adv-x="604" d="M469 97L522 150L134 538L81 485L469 97ZM134 97L522 485L469 538L81 150L134 97Z" />
+<glyph unicode="&#xd8;" horiz-adv-x="748" d="M229 63L183 100L518 580L564 544L229 63ZM88 -37L183 100L229 63L159 -37H88ZM564 544L518 580L590 683H661L564 544ZM374 670Q468 670 536 629T642 511T680 330Q680 225 643 149T537 32T374 -10Q280 -10 212 31T106
+149T68 330Q68 435 105 511T211 628T374 670ZM374 595Q306 595 256 564T179 473T152 330Q152 247 179 188T256 97T374 65Q443 65 492 96T569 187T596 330Q596 413 569 472T493 563T374 595Z" />
+<glyph unicode="&#xd9;" horiz-adv-x="708" d="M613 660V246Q613 119 546 55T354 -10Q230 -10 163 54T95 246V660H175V266Q175 163 218 114T354 65Q446 65 489 114T533 266V660H613ZM331 877L397 718H333L247 877H331Z" />
+<glyph unicode="&#xda;" horiz-adv-x="708" d="M613 660V246Q613 119 546 55T354 -10Q230 -10 163 54T95 246V660H175V266Q175 163 218 114T354 65Q446 65 489 114T533 266V660H613ZM377 877H461L375 718H311L377 877Z" />
+<glyph unicode="&#xdb;" horiz-adv-x="708" d="M613 660V246Q613 119 546 55T354 -10Q230 -10 163 54T95 246V660H175V266Q175 163 218 114T354 65Q446 65 489 114T533 266V660H613ZM508 718H434L354 825L274 718H200L310 877H398L508 718Z" />
+<glyph unicode="&#xdc;" horiz-adv-x="708" d="M613 660V246Q613 119 546 55T354 -10Q230 -10 163 54T95 246V660H175V266Q175 163 218 114T354 65Q446 65 489 114T533 266V660H613ZM257 831Q283 831 298 816T314 774Q314 749 299 733T257 717Q232 717 216 733T200
+774Q200 800 216 815T257 831ZM451 831Q477 831 492 816T508 774Q508 749 493 733T451 717Q426 717 410 733T394 774Q394 800 410 815T451 831Z" />
+<glyph unicode="&#xdd;" horiz-adv-x="572" d="M562 660L326 258V0H246V258L10 660H105L233 434L286 340L339 434L467 660H562ZM309 882H393L307 723H243L309 882Z" />
+<glyph unicode="&#xde;" horiz-adv-x="627" d="M327 542Q450 542 511 489T573 337Q573 239 512 186T327 132H148V207H335Q489 207 489 337Q489 403 451 435T335 467H148V542H327ZM188 660V0H108V660H188Z" />
+<glyph unicode="&#xdf;" horiz-adv-x="617" d="M383 387Q448 387 486 360T542 291T560 204Q560 146 539 98T474 20T363 -10Q315 -10 282 1T234 23L257 91Q275 80 298 72T361 63Q418 63 450 103T483 206Q483 276 445 312T329 349H270V420H319Q384 420 418 457T452
+546Q452 605 415 632T320 660Q236 660 205 613T173 473V0H93V497Q93 566 114 619T187 704T328 735Q398 735 443 710T511 646T534 562Q534 523 518 485T468 420T383 389V387Z" />
+<glyph unicode="&#xe0;" horiz-adv-x="566" d="M385 323Q385 379 355 409T270 440Q218 440 182 418T129 345L64 385Q84 441 138 475T272 510Q326 510 370 492T439 436T465 339V97Q465 61 503 61Q522 61 540 66L536 3Q516 -7 484 -7Q455 -7 432 4T396 37T383 94V104L403
+101Q391 62 362 38T297 2T226 -10Q182 -10 144 5T84 50T61 126Q61 182 98 218T203 268L401 307V241L240 208Q191 198 167 180T143 130Q143 99 167 80T237 60Q266 60 292 67T340 90T373 129T385 185V323ZM242 750L318 583H253L155 750H242Z" />
+<glyph unicode="&#xe1;" horiz-adv-x="566" d="M385 323Q385 379 355 409T270 440Q218 440 182 418T129 345L64 385Q84 441 138 475T272 510Q326 510 370 492T439 436T465 339V97Q465 61 503 61Q522 61 540 66L536 3Q516 -7 484 -7Q455 -7 432 4T396 37T383 94V104L403
+101Q391 62 362 38T297 2T226 -10Q182 -10 144 5T84 50T61 126Q61 182 98 218T203 268L401 307V241L240 208Q191 198 167 180T143 130Q143 99 167 80T237 60Q266 60 292 67T340 90T373 129T385 185V323ZM303 750H390L292 583H227L303 750Z" />
+<glyph unicode="&#xe2;" horiz-adv-x="566" d="M385 323Q385 379 355 409T270 440Q218 440 182 418T129 345L64 385Q84 441 138 475T272 510Q326 510 370 492T439 436T465 339V97Q465 61 503 61Q522 61 540 66L536 3Q516 -7 484 -7Q455 -7 432 4T396 37T383 94V104L403
+101Q391 62 362 38T297 2T226 -10Q182 -10 144 5T84 50T61 126Q61 182 98 218T203 268L401 307V241L240 208Q191 198 167 180T143 130Q143 99 167 80T237 60Q266 60 292 67T340 90T373 129T385 185V323ZM435 576H362L276 691L190 576H117L231 743H321L435 576Z"
+/>
+<glyph unicode="&#xe3;" horiz-adv-x="566" d="M385 323Q385 379 355 409T270 440Q218 440 182 418T129 345L64 385Q84 441 138 475T272 510Q326 510 370 492T439 436T465 339V97Q465 61 503 61Q522 61 540 66L536 3Q516 -7 484 -7Q455 -7 432 4T396 37T383 94V104L403
+101Q391 62 362 38T297 2T226 -10Q182 -10 144 5T84 50T61 126Q61 182 98 218T203 268L401 307V241L240 208Q191 198 167 180T143 130Q143 99 167 80T237 60Q266 60 292 67T340 90T373 129T385 185V323ZM456 717Q453 673 440 643T403 598T344 583Q316 583 297 593T263
+617T236 640T206 651Q184 651 173 633T157 582H94Q99 648 126 682T207 716Q234 716 253 706T287 682T315 659T343 648Q366 648 377 666T393 717H456Z" />
+<glyph unicode="&#xe4;" horiz-adv-x="566" d="M385 323Q385 379 355 409T270 440Q218 440 182 418T129 345L64 385Q84 441 138 475T272 510Q326 510 370 492T439 436T465 339V97Q465 61 503 61Q522 61 540 66L536 3Q516 -7 484 -7Q455 -7 432 4T396 37T383 94V104L403
+101Q391 62 362 38T297 2T226 -10Q182 -10 144 5T84 50T61 126Q61 182 98 218T203 268L401 307V241L240 208Q191 198 167 180T143 130Q143 99 167 80T237 60Q266 60 292 67T340 90T373 129T385 185V323ZM179 696Q205 696 220 681T236 639Q236 614 221 598T179 582Q154
+582 138 598T122 639Q122 665 138 680T179 696ZM373 696Q399 696 414 681T430 639Q430 614 415 598T373 582Q348 582 332 598T316 639Q316 665 332 680T373 696Z" />
+<glyph unicode="&#xe5;" horiz-adv-x="566" d="M385 323Q385 379 355 409T270 440Q218 440 182 418T129 345L64 385Q84 441 138 475T272 510Q326 510 370 492T439 436T465 339V97Q465 61 503 61Q522 61 540 66L536 3Q516 -7 484 -7Q455 -7 432 4T396 37T383 94V104L403
+101Q391 62 362 38T297 2T226 -10Q182 -10 144 5T84 50T61 126Q61 182 98 218T203 268L401 307V241L240 208Q191 198 167 180T143 130Q143 99 167 80T237 60Q266 60 292 67T340 90T373 129T385 185V323ZM273 812Q329 812 363 780T398 694Q398 641 364 608T273 575Q217
+575 182 608T147 694Q147 747 182 779T273 812ZM273 763Q242 763 222 744T202 694Q202 664 222 645T273 625Q304 625 324 644T344 694Q344 724 324 743T273 763Z" />
+<glyph unicode="&#xe6;" horiz-adv-x="895" d="M230 -10Q184 -10 146 5T84 50T61 126Q61 182 97 218T199 267L385 304V323Q385 379 353 409T269 440Q222 440 186 418T129 345L64 385Q80 423 108 451T177 494T267 510Q333 510 382 483T449 394L425 397Q444 433
+473 458T541 496T622 510Q689 510 736 480T810 399T836 283Q836 266 835 252T832 227H466V227Q471 148 515 104T625 60Q675 60 708 81T763 138L826 101Q807 67 778 42T710 4T627 -10Q552 -10 496 25T413 130L438 137Q434 103 415 76T366 30T301 0T230 -10ZM237
+60Q266 60 292 67T340 90T373 129T385 185V237L240 208Q191 198 167 180T143 130Q143 99 167 80T237 60ZM469 298H756Q755 344 737 375T689 423T620 440Q559 440 520 403T469 298Z" />
+<glyph unicode="&#xe7;" horiz-adv-x="560" d="M300 510Q352 510 391 494T460 448T507 377L431 341Q415 389 383 414T298 440Q248 440 212 418T157 353T138 250Q138 191 157 148T212 83T298 60Q337 60 365 72T412 107T438 163L512 137Q495 91 466 58T395 8T300
+-10Q230 -10 175 21T89 110T58 250Q58 331 89 389T175 479T300 510ZM244 4L286 29Q345 10 370 -22T395 -99Q395 -147 361 -181T274 -215Q243 -215 220 -207T179 -186L198 -128Q212 -137 227 -144T265 -151Q293 -151 311 -133T329 -81Q329 -55 310 -36T244 4Z" />
+<glyph unicode="&#xe8;" horiz-adv-x="577" d="M302 -10Q231 -10 176 21T89 110T58 250Q58 331 89 389T174 479T297 510Q367 510 416 480T492 399T518 283Q518 266 517 252T514 227H110V298H479L438 290Q438 362 399 401T295 440Q246 440 211 418T156 353T136
+250Q136 191 156 148T212 83T300 60Q355 60 389 81T445 138L508 101Q489 67 460 42T391 4T302 -10ZM257 750L333 583H268L170 750H257Z" />
+<glyph unicode="&#xe9;" horiz-adv-x="577" d="M302 -10Q231 -10 176 21T89 110T58 250Q58 331 89 389T174 479T297 510Q367 510 416 480T492 399T518 283Q518 266 517 252T514 227H110V298H479L438 290Q438 362 399 401T295 440Q246 440 211 418T156 353T136
+250Q136 191 156 148T212 83T300 60Q355 60 389 81T445 138L508 101Q489 67 460 42T391 4T302 -10ZM318 750H405L307 583H242L318 750Z" />
+<glyph unicode="&#xea;" horiz-adv-x="577" d="M302 -10Q231 -10 176 21T89 110T58 250Q58 331 89 389T174 479T297 510Q367 510 416 480T492 399T518 283Q518 266 517 252T514 227H110V298H479L438 290Q438 362 399 401T295 440Q246 440 211 418T156 353T136
+250Q136 191 156 148T212 83T300 60Q355 60 389 81T445 138L508 101Q489 67 460 42T391 4T302 -10ZM450 576H377L291 691L205 576H132L246 743H336L450 576Z" />
+<glyph unicode="&#xeb;" horiz-adv-x="577" d="M302 -10Q231 -10 176 21T89 110T58 250Q58 331 89 389T174 479T297 510Q367 510 416 480T492 399T518 283Q518 266 517 252T514 227H110V298H479L438 290Q438 362 399 401T295 440Q246 440 211 418T156 353T136
+250Q136 191 156 148T212 83T300 60Q355 60 389 81T445 138L508 101Q489 67 460 42T391 4T302 -10ZM194 696Q220 696 235 681T251 639Q251 614 236 598T194 582Q169 582 153 598T137 639Q137 665 153 680T194 696ZM388 696Q414 696 429 681T445 639Q445 614 430
+598T388 582Q363 582 347 598T331 639Q331 665 347 680T388 696Z" />
+<glyph unicode="&#xec;" horiz-adv-x="266" d="M173 500V0H93V500H173ZM99 750L175 583H110L12 750H99Z" />
+<glyph unicode="&#xed;" horiz-adv-x="266" d="M173 500V0H93V500H173ZM160 750H247L149 583H84L160 750Z" />
+<glyph unicode="&#xee;" horiz-adv-x="266" d="M173 500V0H93V500H173ZM292 576H219L133 691L47 576H-26L88 743H178L292 576Z" />
+<glyph unicode="&#xef;" horiz-adv-x="266" d="M213 582Q187 582 171 598T155 639Q155 665 171 680T213 696Q239 696 254 681T270 639Q270 614 255 598T213 582ZM53 582Q28 582 12 598T-4 639Q-4 665 12 680T53 696Q79 696 95 681T111 639Q111 614 95 598T53 582ZM173
+500V0H93V500H173Z" />
+<glyph unicode="&#xf0;" horiz-adv-x="620" d="M298 -10Q226 -10 173 19T91 105T62 238Q62 315 93 370T177 455T296 485Q358 485 402 464T473 405L465 398Q453 453 432 500T380 587T306 663T205 730H316Q375 696 418 651T489 551T532 430T546 288Q546 201 519
+134T438 28T298 -10ZM302 60Q355 60 392 85T448 150T468 238Q468 293 449 332T393 393T307 415Q257 415 221 394T165 333T145 238Q145 154 187 107T302 60ZM207 533L192 594L392 638L428 590L207 533ZM428 590L392 638L535 678L552 619L428 590Z" />
+<glyph unicode="&#xf1;" horiz-adv-x="619" d="M93 0V500H163L170 388L157 399Q173 439 200 463T262 499T336 510Q390 510 434 490T504 427T531 320V0H451V292Q451 375 416 407T328 440Q292 440 256 423T197 368T173 266V0H93ZM498 717Q495 673 482 643T445 598T386
+583Q358 583 339 593T305 617T278 640T248 651Q226 651 215 633T199 582H136Q141 648 168 682T249 716Q276 716 295 706T329 682T357 659T385 648Q408 648 419 666T435 717H498Z" />
+<glyph unicode="&#xf2;" horiz-adv-x="600" d="M300 510Q371 510 425 479T511 390T542 250Q542 169 511 111T426 21T300 -10Q230 -10 175 21T89 110T58 250Q58 331 89 389T175 479T300 510ZM300 441Q249 441 213 418T158 353T138 250Q138 191 157 148T213 82T300
+59Q351 59 387 82T442 148T462 250Q462 310 443 352T387 418T300 441ZM266 750L342 583H277L179 750H266Z" />
+<glyph unicode="&#xf3;" horiz-adv-x="600" d="M300 510Q371 510 425 479T511 390T542 250Q542 169 511 111T426 21T300 -10Q230 -10 175 21T89 110T58 250Q58 331 89 389T175 479T300 510ZM300 441Q249 441 213 418T158 353T138 250Q138 191 157 148T213 82T300
+59Q351 59 387 82T442 148T462 250Q462 310 443 352T387 418T300 441ZM327 750H414L316 583H251L327 750Z" />
+<glyph unicode="&#xf4;" horiz-adv-x="600" d="M300 510Q371 510 425 479T511 390T542 250Q542 169 511 111T426 21T300 -10Q230 -10 175 21T89 110T58 250Q58 331 89 389T175 479T300 510ZM300 441Q249 441 213 418T158 353T138 250Q138 191 157 148T213 82T300
+59Q351 59 387 82T442 148T462 250Q462 310 443 352T387 418T300 441ZM459 576H386L300 691L214 576H141L255 743H345L459 576Z" />
+<glyph unicode="&#xf5;" horiz-adv-x="600" d="M300 510Q371 510 425 479T511 390T542 250Q542 169 511 111T426 21T300 -10Q230 -10 175 21T89 110T58 250Q58 331 89 389T175 479T300 510ZM300 441Q249 441 213 418T158 353T138 250Q138 191 157 148T213 82T300
+59Q351 59 387 82T442 148T462 250Q462 310 443 352T387 418T300 441ZM480 717Q477 673 464 643T427 598T368 583Q340 583 321 593T287 617T260 640T230 651Q208 651 197 633T181 582H118Q123 648 150 682T231 716Q258 716 277 706T311 682T339 659T367 648Q390
+648 401 666T417 717H480Z" />
+<glyph unicode="&#xf6;" horiz-adv-x="600" d="M300 510Q371 510 425 479T511 390T542 250Q542 169 511 111T426 21T300 -10Q230 -10 175 21T89 110T58 250Q58 331 89 389T175 479T300 510ZM300 441Q249 441 213 418T158 353T138 250Q138 191 157 148T213 82T300
+59Q351 59 387 82T442 148T462 250Q462 310 443 352T387 418T300 441ZM203 696Q229 696 244 681T260 639Q260 614 245 598T203 582Q178 582 162 598T146 639Q146 665 162 680T203 696ZM397 696Q423 696 438 681T454 639Q454 614 439 598T397 582Q372 582 356 598T340
+639Q340 665 356 680T397 696Z" />
+<glyph unicode="&#xf7;" horiz-adv-x="604" d="M545 354V279H59V354H545ZM302 185Q331 185 349 167T367 120Q367 91 349 73T302 55Q273 55 255 73T237 120Q237 149 255 167T302 185ZM302 576Q331 576 349 558T367 511Q367 482 349 464T302 446Q273 446 255 464T237
+511Q237 540 255 558T302 576Z" />
+<glyph unicode="&#xf8;" horiz-adv-x="600" d="M300 510Q371 510 425 479T511 390T542 250Q542 169 511 111T426 21T300 -10Q230 -10 175 21T89 110T58 250Q58 331 89 389T175 479T300 510ZM300 441Q249 441 213 418T158 353T138 250Q138 191 157 148T213 82T300
+59Q351 59 387 82T442 148T462 250Q462 310 443 352T387 418T300 441ZM311 -30L734 530H801L378 -30H311Z" />
+<glyph unicode="&#xf9;" horiz-adv-x="617" d="M274 -10Q226 -10 184 8T115 66T88 172V500H168V193Q168 117 201 89T294 60Q322 60 349 69T397 99T431 152T444 228V500H524V0H454L449 76Q423 31 379 11T274 -10ZM272 740L348 573H283L185 740H272Z" />
+<glyph unicode="&#xfa;" horiz-adv-x="617" d="M274 -10Q226 -10 184 8T115 66T88 172V500H168V193Q168 117 201 89T294 60Q322 60 349 69T397 99T431 152T444 228V500H524V0H454L449 76Q423 31 379 11T274 -10ZM333 740H420L322 573H257L333 740Z" />
+<glyph unicode="&#xfb;" horiz-adv-x="617" d="M274 -10Q226 -10 184 8T115 66T88 172V500H168V193Q168 117 201 89T294 60Q322 60 349 69T397 99T431 152T444 228V500H524V0H454L449 76Q423 31 379 11T274 -10ZM465 566H392L306 681L220 566H147L261 733H351L465 566Z" />
+<glyph unicode="&#xfc;" horiz-adv-x="617" d="M274 -10Q226 -10 184 8T115 66T88 172V500H168V193Q168 117 201 89T294 60Q322 60 349 69T397 99T431 152T444 228V500H524V0H454L449 76Q423 31 379 11T274 -10ZM209 686Q235 686 250 671T266 629Q266 604 251
+588T209 572Q184 572 168 588T152 629Q152 655 168 670T209 686ZM403 686Q429 686 444 671T460 629Q460 604 445 588T403 572Q378 572 362 588T346 629Q346 655 362 670T403 686Z" />
+<glyph unicode="&#xfd;" horiz-adv-x="516" d="M504 500L269 -84Q250 -133 228 -161T178 -202T114 -215Q80 -215 52 -206T1 -180L23 -110Q43 -128 65 -136T110 -145Q136 -145 159 -129T201 -64L227 1L177 120L18 500H109L234 174L265 85L301 184L418 500H504ZM286
+740H373L275 573H210L286 740Z" />
+<glyph unicode="&#xfe;" horiz-adv-x="627" d="M93 -210V730H173V378L163 402Q183 449 230 479T339 510Q401 510 453 479T536 390T567 250Q567 169 536 111T452 21T338 -10Q276 -10 230 20T163 98L173 113V-210H93ZM330 60Q404 60 445 112T487 250Q487 336 447
+388T333 440Q285 440 249 417T193 351T173 250Q173 193 192 150T247 84T330 60Z" />
+<glyph unicode="&#xff;" horiz-adv-x="516" d="M504 500L269 -84Q250 -133 228 -161T178 -202T114 -215Q80 -215 52 -206T1 -180L23 -110Q43 -128 65 -136T110 -145Q136 -145 159 -129T201 -64L227 1L177 120L18 500H109L234 174L265 85L301 184L418 500H504ZM162
+686Q188 686 203 671T219 629Q219 604 204 588T162 572Q137 572 121 588T105 629Q105 655 121 670T162 686ZM356 686Q382 686 397 671T413 629Q413 604 398 588T356 572Q331 572 315 588T299 629Q299 655 315 670T356 686Z" />
+<glyph unicode="&#x2013;" horiz-adv-x="664" d="M582 299V224H82V299H582Z" />
+<glyph unicode="&#x2014;" horiz-adv-x="1014" d="M932 299V224H82V299H932Z" />
+<glyph unicode="&#x2018;" horiz-adv-x="255" d="M128 434Q104 434 88 446T62 480T53 531Q53 564 64 596T100 655T162 700L204 661Q177 652 157 636T123 600T106 559L110 557Q114 560 120 562T138 564Q150 564 162 557T184 537T193 501Q193 483 184 468T161 443T128 434Z" />
+<glyph unicode="&#x2019;" horiz-adv-x="255" d="M131 700Q155 700 171 688T197 654T206 603Q206 570 195 538T159 479T97 434L55 473Q82 482 102 498T136 534T153 575L149 577Q145 574 139 572T121 570Q109 570 97 577T75 597T66 633Q66 651 75 666T98 691T131 700Z" />
+<glyph unicode="&#x201a;" horiz-adv-x="255" d="M387 120Q411 120 427 108T453 74T462 23Q462 -10 451 -42T415 -101T353 -146L311 -107Q338 -98 358 -82T392 -46T409 -5L405 -3Q401 -6 395 -8T377 -10Q365 -10 353 -3T331 17T322 53Q322 71 331 86T354 111T387 120Z" />
+<glyph unicode="&#x201c;" horiz-adv-x="443" d="M128 434Q104 434 88 446T62 480T53 531Q53 564 64 596T100 655T162 700L204 661Q177 652 157 636T123 600T106 559L110 557Q114 560 120 562T138 564Q150 564 162 557T184 537T193 501Q193 483 184 468T161 443T128
+434ZM316 434Q292 434 276 446T250 480T241 531Q241 564 252 596T288 655T350 700L392 661Q365 652 345 636T311 600T294 559L298 557Q302 560 308 562T326 564Q338 564 350 557T372 537T381 501Q381 483 372 468T349 443T316 434Z" />
+<glyph unicode="&#x201d;" horiz-adv-x="443" d="M131 700Q155 700 171 688T197 654T206 603Q206 570 195 538T159 479T97 434L55 473Q82 482 102 498T136 534T153 575L149 577Q145 574 139 572T121 570Q109 570 97 577T75 597T66 633Q66 651 75 666T98 691T131
+700ZM319 700Q343 700 359 688T385 654T394 603Q394 570 383 538T347 479T285 434L243 473Q270 482 290 498T324 534T341 575L337 577Q333 574 327 572T309 570Q297 570 285 577T263 597T254 633Q254 651 263 666T286 691T319 700Z" />
+<glyph unicode="&#x201e;" horiz-adv-x="443" d="M387 120Q411 120 427 108T453 74T462 23Q462 -10 451 -42T415 -101T353 -146L311 -107Q338 -98 358 -82T392 -46T409 -5L405 -3Q401 -6 395 -8T377 -10Q365 -10 353 -3T331 17T322 53Q322 71 331 86T354 111T387
+120ZM319 120Q343 120 359 108T385 74T394 23Q394 -10 383 -42T347 -101T285 -146L243 -107Q270 -98 290 -82T324 -46T341 -5L337 -3Q333 -6 327 -8T309 -10Q297 -10 285 -3T263 17T254 53Q254 71 263 86T286 111T319 120Z" />
+<glyph unicode="&#x2022;" horiz-adv-x="430" d="M215 216Q161 216 126 250T90 337Q90 390 125 424T215 458Q270 458 305 424T340 337Q340 285 305 251T215 216Z" />
+<glyph unicode="&#x2039;" horiz-adv-x="316" d="M264 461L136 265L264 69H177L51 265L177 461H264Z" />
+<glyph unicode="&#x203a;" horiz-adv-x="316" d="M52 69L180 265L52 461H139L265 265L139 69H52Z" />
+</font>
+</defs>
+</svg>
diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.ttf b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..2326e9018ca9e28c6660850e1e2a97dd890e789e
GIT binary patch
literal 57280
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

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.woff b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.woff
new file mode 100644
index 0000000000000000000000000000000000000000..5de8ad6b03dd96b2e624a1f37bca3d7413771453
GIT binary patch
literal 29400
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
Z7OpFYpI!(<Z_1I1p&>W+nl*L+001{5b@%`P

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.woff2 b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..f63457d797c1038e29eacef0ddb0afe9947f24dc
GIT binary patch
literal 24212
zcmY(qV~j4$6FoTg+_7!XGdAwnwr$(CZQHhOTX$^R+V{8r-E6i}Nq6;^?o=x0RG&_}
z$%!%n0R#PKy2(Ju{~PzF|C`hPpSAzR|9`{gzzK-r!i`{o(C1fD7El%j3PFYn5Qol2
zLxO?{xKR#Ru!jxy1OjFQAq9=F1S13wL4+iP3$Vj!nuVNSawY8RQYraMDJMMO>~sgR
zU4XhF<msmhfdffs%2#3X`+G{7!a+Nsv5Ee#{*_@67kxjN21g`>C2)29rO4uzsS@#2
z`*SPX%z8E&KBPss0Pi3=9<P8tN>_(df0tX*cFtv9VuHUm0ksqzZLy6WFV&)YQtDY;
zj`du(oG<@pIRrzMdwRgM>Ahc}BJa4i<Tow1Z*5@pdf&LI3~30xF5S4@sH`bkQj!$k
z7N%F8u`wbIUl(kY&U-oAlNGv<)!FrTh)lJ=99hM9gBnPASa1#Ga<ZKoId$)kd6pZ&
zFp3Q^k9tUXdW$$pmpxwXrigI^D=142SxIs+wZ!HyfY>qZpUx36hMh&0=At4a^*s73
zI$p8?9#>EV2^*U6H0GySy#dPU`!B)a7T;-%<?G@|am5<6i(=R~u>wfRJkLWN+V^tr
z?h?wC(%?g(l)wg4!1$*EOm>?iQ@}8UumLX9(62WKT{cK{JSxzlNouN65CfrhO?BhQ
zLn7;FT!Ui-67RB#isKaRR$_+@dV2&UMl-Y9tA9Ev0cn~@7lJa-@9*XEFMHkZmEY$U
zPU&vzW~LIi#F)fUFnx4_03p4MfABpG;)<p%0Z^4#R5@}k7h2Z$T!utwASxgf28fE#
zH~c!oo$09e6r4W4Zngy|8#Uc-jI45dW?u|lKR_h$Z1dGJb^Ckg^A|L~<usZif|al(
z8@ofJnhFu)T7g_yMvz*ubP_GN?CRie!z#viiCije#*YpzVHiE#FS1-Py$ybwEzO?l
z=hNEDHW7IS^n^rfIieRd@rR42xnw8uhnci1LF<6v0vcnpW!&gX=h!JEX1g`@KDBsf
z##m1OPfLlmGBgdtB*N_$d^~UqB=lA_L9+KH%>|96%Zm8uy1h*r4&v7I?$NDGi{vll
zxI)n4Y~Z3YUD)Mtg$ml5l$Da@>Q+}2y>p6R_wT}q8>l%85VScWDg>blAr&awn7=6Z
z89B=qSc#)=%rgTMuA#C}<RNJd^8%;cV%H>~=V|e&v1=M!!coDU=c}(~@o6`psIp0c
zO0k^4_<|5c0aICR?dHq{9;$qW_~U@74asy3lTj=?)q@svZvxNwk0E42-1qMZpUuwB
zBMc9?vPsV%nF;h!rRDO`@3e&JY4P84R3K8nf5l*wqyeHEN<>z|F<KfLL|Sd0$DT{#
zK)q}5*FAn~@u=W~oPy%5=*%Gru<^1&c|2c>e*{nwPN;~|-(;U2v;VEnxP0HpL5*S>
zL^B`|1tZ?5_g>koqy@JwM}<eqnox(V^WMbeeQy9*5u_J)T+^m#rJ#|04p8Ey+_dw$
zUX}nHZ<6O`(3bTftt?0~C%?TVAOdjx_F%}!0?4rWA*sZK$Y%}>5Cgn+$D`ruz6Cnu
zM>iguLm(ZL{+ZHS-;G(|;(JwA3gNq40a%Zq466A+pW5m3X)RUZ@|%zw+0o5gbfsd1
zQx$q5Qid$o%OqtfEPpHxqc^M0(6YC+{br+bi<onB!z<_kF<;y$G}9RL<Gq|?lxZm7
zA9%W`K3P+GUJ{%h2s}C)|4#mCgjcvO$aUPJ*-U-wP|Z!va8E`Al4ZThHu!)>OxsZT
zGbK6U&Hh&8clRsZ84j3Xh=`QI`T~x=%_ZT{r*7BHo|LNBe@+%p&~E|0oo_t{++-?b
z4~g;<hh%msJk;-P$zZfJ#}xFWy8vTT3q7oouU8oUJN6N&sd8L7znq^xk8F=fW0~l+
zhgS#aPG(MS_JD^*50CCz6^!8Yek~wWP<sEtMbUtu{-l13JqUZ0H?+5`yio+C^$Da9
zw+GUSEW#LUaKr>wS$_uetQZwfqofu8gQj@wEz(VgMZ`y1)@2x+m<B+m#UB>BKkQ37
zZ*IB!kvOKE$F&|eUd9P!x|$~~{Hjd>@Gsy<27czKg8}2jPQ)(`_Dr)1+;}q0v!WO|
zkInTRwjf!AKw{#;Urkbyq|1sbO6(<6W$<U+84&XrxLx*Eu6XuH_7f@rej@gV0|{bE
zauB+}x}c9hkHF#Pjhg`tj^S>8>=nV7D&R87D0{iE(_lmK5oA0HHRwy!t6&_0#0SLZ
z%-*4>24vlO*L58JL8!#Sijm0N!)|SwCTEGdDMT5K##0G201O`0@^VZ)rU6`Z^^HiM
zp@E4K7ZZQSZtB0=+!rN8?0l=m8d0h?n=Znq8g5U^6Fn+ETHiRJtU*l1>*LMLhne;S
z56<rUS-ie`#@pu`%s56F4k#XuMw880O&&<~JY7uo_n-8~QxP-{DM@yqAaOjvJT{)8
zr@HPLdOo|CU+8zfk3w@}LV1&?=ku7`y!ap|aI3I=QmUo~cWFLCXl1}0a$sus(L9<S
ziH6Pv@eS2!=dR$pAcUnLm>KR5i`PH1T+Nex2A2glu+Q!bUp7AqPLI61U#tT(_|rVp
zgjssU`h{V5qs{@Wz_Ib+Z*ECXS$D2vK*}x4Kr%=+XgbNwTpw~0kj8{csn(p1$H#$+
z1%-y%Oe*OH1|~GI`3dHNP3Se7&6o4v#(;iSo)UH~ZJ+yo8ide79E#jno*^ed_jFzF
zxr;BTdm2Bj&jn;_B69|Hks%{68<c&p@GyTDSo}Pv3YJSCxp0;Q#x8YDIG=qkTl;zL
zUG~G^X*=T~`NK#TeTOE9(SU`A{A2lKQmR^)dyY=iWm{J0q0f8c7tEwpaxJ8H9bL(h
zazzT2T7lw<&q`v887A4u{p^Ls0`AV9#iBa-<60x_tDZ&o_y<YJS~7gfR>^@49slCm
zY4?!N_DpDYDDOXfK&SQwtoqnYI%+la|4!GGn0k*^JSgct_A(W~0Tlw3kX$(2Yv_$e
z_qWUy6+A?+K%Np6225a<2r7^;u`voKzfg?_GxUEERG>aoC{*Iqv13QDs!U=rSg1rI
z>3<&8EYC2y%Es2I{naWpo93jZs@9h?6Drno!Rc@?9D!ojHfcBBZMATE`Pc!yQWboW
zazClJ4H+YPoYRO+GtK3@yBIxUA~l8p{MC+IF=HJnN<*#YY5urF>VV!GuH4WPBI3S5
z02v-6AC4$NC3)pFww4bn{J)(g60O;AOq({WTNBk?E~<5fY^|*pt3|5VuDJ>ytGPWL
zJKc)-F~#90;|)l%X6e_E5cWd=dH*<hy~r^yvDp(S(n_VX7(aJl^`nh!;p+or(scIS
znwoO(k-}<tUI(XU5M&5||5vE;0XLgMSs4SF^!^@!D<M{Izsn%Lg&^iY8o$Y(a-*=-
zX(@cltvY@kCO%F>a-7`%8s1%;+R!{7SF_IM;acnF?jZ|bp-Anp0%f3$N}atrN>5;0
z4cr&M!$kIY_j3v4v(-xQ5Q^ue0hZa0_?dp`zaSH5et~_TrNxte`eR*rUcW{Kqnc`*
zeTihZ+xa!TjZ&#^!&X3$CCsW4N=xvMC~KP*=sgnF7<P>U$u`P1v7;UD|LT%=gZM{x
zC;YBndiRw2=yWVaf0(OhM$3V|2z%lU{tqD3DXq>N+I4U^L92OPTR0-jI^)&3-g9~3
z?4XGm2Je~|{)?;pmgw2Ri&O(pxwJ-Z`w#`y*_}>pjmEigyFJ2}v?cb?+`e}AQ|)R$
zQM~&bmhWx%*J@Ii7XVupvbmgdw<#3r9FL^Tb8n_yV^RcOR#8{2&Yi=UC`a64wuMj&
zql|iU?aOWBLsyFw5ibz1H`LIFHczB5_r(V;FZTxq)AL(T+eRj^%h;9O*LM4TO--x0
zEwk6$0!%1W(gy@4Fn{g4@K7OYvp@h|n+DR})MBkH2HUWZt;GU5OUnOluk~JGx<*?U
z-Y8yjeBCyJU{6#=m-c0PXB|c}k{U46B6vEOO*W%9)^OasX5{fw6<*Q9iFUcm4P=6!
z47U>)o<*DfR<aHw{FC=FH_aX;8-TKhlM|<tZvXznAx<PnT0+^dbT32JOotSYnpgr?
zfn=(MYJ-nwkZy|)Qf&AC!A!pVLbby*YP!aMuzM(MB#M&RV!l$U6LvE@s26s+Mv~re
zXtC1t^bZy=XWu8E3-dBq7LSNbDB!{cPzCgsl4Bu@+|G#PLw!SK;`Y@EsDXw%jvGfp
zl1eEW*2|pc{_P18!kfwp8MH?0BePJj&>R9rn^UCE#_k)r^_e3uj`WhKYAT=8L*GNK
zPzrqxS3qM*my<j?0p2G9yGV7RwDkz%2d>Ah23ZYK=8*e%O7E9x<a6I`S)8+CU$Gw8
zfTeI+dqlv7Cq2|53fvhwne+%pFuFHYpS+-z8YXzyo0E7gTz$_T$#qre1yJcElPLt5
z=e6B+`)@1zhv*-Rs;!2`nEonMa*u%^gnXRYa+NW^K6k%=y^I@MD-Lj!jxFqLJ_e0L
zNN$*vobZyZ4<BpKUmR<gO_&`KR2?V_cmP7?RkB;j3ZBumz;W#ClCG9pv+TOhw0FG=
zSlqmac=Avs&&p*N*b1GdeiM~hAo@YTfc_AIg##J-gXKe*_rJR-MZr*~Q=l-z(%^)N
z%KSg+x9zDTdHMVzJlPlW|48NQ4B!NA!So@FTK0hb>p&>T*dUC(p;0TJS+$I9<9r4`
zI=xFIK51-Vk)n}l{#SaqF*b;!Cu2Twm`5U!R^$Su(zP7kv!F~>>zJi~?&svzKpr>K
z$HfmAH%KEvo>KTfe661;yH*+rPu`3fjV8BPEmX;J#p^WtjDwSg$7ZrN-h2<N8U?+B
z(914}1|DTZN=lEkm`=Zja8JeY^d808hB|OY-TBk^hL4D@c`GrlpCEpaO6V_Y<5xDa
zuDJCesQ)R+;dQgA$4I4)vIi9r9#tF{f<X4KY$8lc^NgR&hm6EzGLcTKwp*J)@xMmk
zQyR@wU46q85B}Jn>lxeeP&~<$PP4^gO@Rw|`)r~|i6X5`MDcp&*wVN2Hsk+h@oNts
zqU{*dS;~PYywv~oH2++5-~5w(k>m4kp#FF5)yIkaaf8!Y<YprMe>pZ&P{cqveHa(L
zp;2ZFIM&Cd;$uD@$10P>YN1l5EB1`%GB!8!CgvFwVidw;ygtF=G}CIR=ji-ykloAs
z#Q5Ur3afv8vps?bI-SYJG@Uh0!xp+;F^ynIXCKtgGc))2)E^@Z&~g=n0U{%`Wjp%*
zrl<(pv<nPLB^+LiO6JN|pc8SNNGg@URbv^%mC`EH2{lCf=UQ?=vjCNmiLt4^(TDOS
zqU)AHwQ9w(MRQxy?VJF!9CP?T;#ivHQcEkF!SNm{?=8-^oMT)dP7o)h`-O+4iGsJ1
zx?HmfwDV4aP<XBidz8G@s@!ri>(rWy?i~|KH>6!oACN}(+KjNTa?kjJ5(EpEm!?e+
zbxoy7_W0?O#GBErS{n0be4`H*%w*C~*EA`OsYOO<5Z1OCWlzOSBb`tz9-WKq+rJgz
zH%%WUI@VK-O?k?Mn@A?piq-b$$gh-FVC*%lWEdKpd@0#bik0`tHXxQRQLIp=c2V0_
z=}Wiz?jZ<Rz_go+t~_oU6E)zSWu`|JS;+t5$sLI(2{}$kQBy7RRnaDU{B7sY@NE}%
zTPZlqNU4T|;#q&0ZDQz2cd94vM?yy0C5h<7x{7R^ny8hd3N^qCHNY_IvQ`nF7Ed&$
zQoL0aV5r`E=1l(;?lT_8rPh{CnNcdG-Ecgbv=TrR_W!SU=<Z>aR0aY96F~gW{ec=l
zh8W<6{+b~{g7X1Y!~Czx|6}4J^ip*8R5ew>esi>}+w)J(PN`6IW*Ut)gP=vznV^Y*
z%>UJ!cU&>+GGag-Wp8&6PhMqZrEYf@Z<q|?j=VC*PIzRRrwh`52K*POA1z1fKXJxC
zpChsOuDy)6i{Hb-%+&PH{8#`f7As}}vUCk#k)RNI`7O9qXm)K=CkG@C+D~i?L3dN2
zc2i#To@3C8&uCPpTXsKy$C~e*$z=|Fw(y!<$93RQ$U)rHhXYx<sca8k?@v)|6ydB)
z@M_SlIN&jWJ*S?;V<_bl+Q#H_uxKn{>QruZd!N+pkR9Y3PVsAG&UG3a*A)fi-qe7i
zRIcIwPOzJDK^=R9Z8y#m>^kZHGVWI6?f#@^ej37A>7CgDVC>hp*iGf*rzZj@5Bfi?
zt+7Pv9WgYxa>sJd@|SqMWYrP`iKi=n=pk)wG`Gi~)Z4$`c6gCF*`mXN1LYE_9o~uf
zBiWVZ95e6pST7?VbT8EDWW^448rK?PmN(lGRzy2J{HZnH!wcD_AEkRg$?Op`PYX*A
z+i(9jIqN6B+!V?WAb$^d3E<cW$mTY<9lA_iir_NC*K#WmfK`1Z?jsuqZQ$URS^Dmt
zM98td<0qbdykM}nq=MmySRmIQ_7z|oFXx-)>|BE-T}mRgNTy?I<w`}L`MKW%H9pJu
z=7Xq(Bxc4{MtT&FMuz`UvTv)~{OA25y)XSs$zjz`K9N4XelMqbC3U7?bc%BQD3BaQ
zZP4(a)}(0rTezalmnrvehr4Y%zMB6E&A+t44G&Qr$?nzN-`O{Q9Ne%)g^HMm!vngb
z;HIG_MoEkasFnA$(DHn(+`#3J43k??gtE_TTamEHj;X&c7xeN6wNU>~gvOK@uPM~d
zirDsnq*FB;iGxc_w8AX+A-$sagl+M4mDZY(zrA4z|F6UBgrAl2=N_A^5^@#I(MP|e
z<%-rOfE0C7lV6jxeJ~&#sJ>`8uK6u858K0MVM%NJdI{+~zdK7lPjV;`0bNJ#=kU1E
z%@&BtsvTH^OJVanvlaUcW%37EgdKc?^P^DhO1q)cPqn7k6@iQ$NRyPyA2<3jKFKZI
z^^c@#BibAxy1P<=b1pMpZ|W)&B58Pim<PBy=oe>5^mRTve?|d5z|8NR#ufP6IRMTd
z9}Cg@bqD0bNuvZ3UYu;4uTUV<Ej;s+J(KIXwKw+NDQ%ezgs3OzMK8}iRQLqjzO~i{
z*^IPFwf~B|?kB7GH56zlfTa7_!j+wp&W31RKV^leDZqR9e9HmPQiYrljvR%(P!g=K
zQWw=hwJO@*ry7%q%0{`G6nilqXukrB(sDM#?QN3-05P3{kf%HMV@XQk_h`3ab91>w
zva2ooyO!!qz1xpzYHDoS)h*L$NKUQe<c&>SWs0ac=h`7cPI+j1OAZ0;+QQ80t-4^>
z*9+mi*jJGE<6VUSWCM}!o0kLbfAf2}L|hWr&vO}<?@nXh<(IWM#ky+!{YYepyK{Hc
zmp4fFFL0h822Iv)AB4fRZ^x{%=slJ!rZXXg-BrUB2cv@=+=dIuP*t5$sP8lAbfq?{
z&>Ku=!X5m&`E$JGjQvl_RAA}|DyE$hiS?Mkpbvi5vNX5W(K5nFg0kZpoq1FT{=m~-
z-g6Nv#@%8uUYp}bS&;AS?QxaJ!Oq+;(>_%el}xAq*ku>16<7kk;#rxJfu&s9!L}Tx
zuDe;U0w-;6a@fueg*G~*<i~PlX+|+TNt~<B=Dd+PKr?W_0Wnn)i9l;osARfYA=2z5
zOF%eD)&hRE>%kmChbqqJ3U+Nfx3Bi;sNx*gJm2P=>{(+81dFEhbbqj^Et&W5Gn4t%
zQH2}7*e6j%BqT&(C1V#0Zw~z0Gysc-<TxY%^++j1)AhjuyFrvt+4lN(^To{tksU_H
zH^2dVq=PNj5(~L5MPYx>ZPUB9TJY+`c>n$^-`?*Pvpidos!6cXcvhlx6Xqc&+80r8
zzAM>1|C>kyJmdbKi^Z0FL0lSgWRL4(9La>8J^(h*3a53KR4PP)=p~8mOa7((<^AWb
zy5{>I(v2}>`R=s5jS`$nt!8D|AYt<Mthut5RF72eLvCj0<my+_t)NR{ip&<S16c@b
z=8(wh3is5Z4w((4loaMFdFCvcBxS{7^VP`J%H34WPgOIXsKW6FLO;%+YZAl{(4HS9
z5<WCI5t<#7ub?{vBQz>~q5w#+q!wn6GZBPFVYK6L#*rjbRih$Jm5i!c6jtYkLF$gH
zR%IL&4P3*ds8EjmBqoM7!wwp|^xY;vX`>%PDk!|3mNc=RhsDuAB)h1UYty_&gi>%=
zWPiVa5$uQ*)ts6d+clermGut>eKQM-x+d3n7JDYY9}F;vI2cT^F=F7*urP%-Sc-VU
z6Y}41<c$(3h^csxgj%|3=X1gEMq#uGBsE&KAS_81VyYG6OeQ)<6>-C=#eibnGDrAM
zAZ(W@14dFAz|fm#7Kt7~k>gVvrbW7ed#IHtwgK3vILSMv396n^G?ICB1ZI--Ap3@K
zL8;{c`?fPV^Yq_z6Z8ZR^gS(eBFHFOL3L}!3bIr}+Lq*H7@A-WlN7?L8q@kwZ2VQt
zsco*yH!V9}ejMvP)1sK}9Q(ip2?}uT<77k(?Y*<eDzMs)*;#mYsP32Cc}N0i?}vy@
zv%HSC1K5_jUdQ_xcG=#~*^HEwBm!Ui|8!3#w)y}LL?luHVrbxk1PBNFc+kW>Vhr3v
zT-HzXA~GQe=Y!xrmcS-|(yv#%;^en>3CGm&cwhL5FhIfXqOl{%^4<V=V=uNs;emU2
z;&~!zsRTM{4!DA-O`&!SQ?hMViL@d%tvDzatuYav#@>81s}y1=Nqc4sVE_>OJxivz
zzqA%Loh~96#Aq;+(x!_<`w3zDi6t7}@OsHxI_ZF_q*p%(|C=Br`p#V-n}ZuJUO3zr
z5)f!IqTnAQVZ=e;SbKkxD}4m+b)gILy+iW+-~+W1MC8w`Lw~=2#4uR9d`NB+NvP-%
zW++S=>2syOo|?7fN6*&1`!czFr#rfHGOvO*yM7?3IP{26q%d3_Hz(Iwy;xjkXa5Qw
zLuU!NKnGrtZap{WK@I1+UTXt7F;YuK#d|MQHUHodSXN0H+zBapfJXNY5m)zfSr5e8
zWqh$LufzZG#knyJDEcc8A|d&Mc5f3xlq|Pt3yuIqPYGmhPw3IZ3n@xQUgLCD^1>>&
zI9sRS*R4a%#3wh|s&?w4)TiQwkFZF{kPLQ-T&&<%jJ53K6&OU%^mmktophQxN7hGR
zu>I9m3Z+s6TimG=`L!y(3989$PN0j<3@*`Qz12IKfDMdyLWWpu*#)VyevGdW=U`UG
zHOO)^bF^`6p*7hsBnB7>*PO@YObT533;C7SW*iK_L?tgvZ;Ou!Am{_q7FU+mW+le@
z%9|u3A|olwFFpqRB}8EauLdm;OlSN;ArE9IxJf;Te{&68{@f}OjzXf5H8ViUPscOO
zGOG1B(Xubly!#GX<@KqqQ=o}vTw$T(Km!fkkb4agd$Sm)^}CQj@VRE|cCz7;Sm@J}
zkeQnzF81VoDd}~(5)pSImlFSiCZ;Xd7;1(YLoih(FA~tL!4eqzcw3jm;@?6q8=%bh
z{xG<lZG#xpVt8WcFm44|rb%=Hb4Nkc;|7Kk6@;KWdz{7U-7Z*T<wflOmCXwXtgS&!
z4acUKx&%k886;zXj=pIE$OTRc_+7lKqq5Gc<U<90g$YcY_2!=C>~JgUyETTXQ>YGI
zXdtkq#~3GVP`la~pO;1-cFWf_ZUA)}VhL*|=NG%#8T<xSgI3{(CB&qsQTk^7aaA?+
zyZt5j_4?fw(+koIYy*0Gt6F<p6#MLH>;A+y;r~K0$M3zG<ks^CY6@7X4Qfy0Y^92}
zvbb;hc3qM~2rQ2d(#!Qc@pZRfu~Or4p7~EX2q$jG^9qk6A}uI39Lvpwg{Mo+Mc^N>
zwnCgFogV4CEfLcdx$y}+vV6eUYQ0!4*^*g*X>wb~b&A1kT81KtVH#CWl4cuGUgC|L
zjS~NMh=P{@t5zT=!#uFgu%o&ozeq2P0F&jwGD3B5W;ck{y6KXl@4Whh9q=E5?jgxT
zUFk79ob)H4AmJg@{&ROg0L>KyV}wB;STheXtz5~M6)Zx>+nipsmCy5SDv8!K&wWS7
zK?R0mT;MpAVUTG;-w7Szwe5Yo2$JK=3bq8*)h&U2fKT>UQl>yuEQ5$|I;Btq#o5^{
zad>m46|*l&idS%bH10`y@kwvSqa)<L6gySwTlzKfxytzrIwMT~i-_-|7XV0OaQzHf
z{g#`%Wa`l!!lb$k361*2gUiRANN7mClaxP4Lo~N%O)ze9cqXP)z3L`i$eA{+mFY;0
zAa2+5`L>>Jrms4=RNv0>7xb#z7>#{1Rg4xDDnp8W#-qW~8r(Qf<6e(LQbU%Q9Ogi?
z{c1?nj$S}y4TV##z%UeZ9f%r%z;icGe*c<lO#b^>#8-1v<FI}{3ji3&FyXj%zE=+?
z4cslY-l>U%;uwyRL4qqjVzvvw;!zJ`T3G)CV3N^t(40<B7zvW|nyZh;+oN8D+n++8
z;-O_th4SX8IN<}RL?^FGA_g^=MaW>N#PQFG)2ldYBv5?f9UHdHIy#TZtnlz8u&lNo
zHDqF|BJvp$uLt)*rd61g!s1XY%)XIkYLBJVNMG!dg00U~ioaSBw8(GDF<M|ocfIyU
zDF!T9Y9`3uHPOub55v`_+hqT)+aX$@8Wl20bY05u2{fx$7fD4A(h!!;J~`4py}e_i
z|6n%X=5Cb>fOw%=2nM4<P?<#NjJHxG6gf2mPelosIz|n1(@bPkS@!I|3Om~*JA#H{
z(U692pyq&)n3tx!*C18R*~maMFNl8?9fxKrdSWq<eY{`v=dff+Qtxrol7&yc<^QP&
zk%BQn=FG5-PojvZCeBcs1$gltR+b@9Rhl&ZjU2G~HF;&TtbV2Tq{%R-+)g{JN}+T!
zCfcQC$(~xkD=iUr0!g&30@pSpbEWsO80`*lt?4Fd%~T*FK|B`{z&f`lMWy7RRVJHS
zV*)KL5i1Vf4kUh!Qgxs%N_gQhx|}yN#{-qJ&4@45o<<3Oh;lT*CNHa%?f}w_Ps#e*
z8=n2gnuDH}e?HT7nn8=q_*UR(k0`z<Ojs5lhSSTu_{BaxDlCcxAAiyF4YW5|#9W-_
zv+)!h{+`)v{OqNxp4jg5{Ibu`^7EUaA^U)78vV+eI|wJsCT$6;$AQ&$blV+M?$D$=
zCXOfxflxIO9XuAEmbv+1daGWL=)vdc0z&m@@A&3$2w7M^oNPuyJAS6ek&Hc+grsZY
zxE?T~!wliVOxNV|t4OCDq|=0R;SF^k>r9@k#306$Mh?SbnoI}fR0ag(AcO80ZtUu-
zE<Fqrx|{@t=L^3AXXIp5V(QMGQ;um)7o$(k@CqekhipBI%2xu2tBDnUBWZd`)l|a=
zo6+@|H6oEnFZyPT+|F>7FbzD->{T7JunR~*jlGPBEE-sx&<M{YS8r@g9^L&wu|9!x
z!n=P=>3nugRv=Zg(ScYJprg~kU*&nJsrXY;fU=0)B{9lAGR;%%7W+{_$$;*GH4J_z
zBMQ0OIv#_~Vf=Rl9F^*!9+7Hu<ZOL_^abUPBcvN*ZHbAw5r1gGS6*Ix9zU_M@y=63
zIyzbsA4oJ9DAefKnS6T6xM3j3uAX=`ybU*5aCxNsxKSg|*WUn^!>AAvbi}5+>rgz{
zrNaG<YRsYc;Njxl`))LdbXKo?mx=qLp-_fRTvLTj)_no5iPg=pFS2F#nv{ttS~Xi*
zG-UXOu;&jmuQQHNEE`L@f+XCDqSB+ToM>Xi3=Y1D1%V(5?E0#*Y3Ueed(Gkd?l42Z
z0RH;mj;{!Mv`k8{N+hKX5F1S#WeroKl==oFUBXG6mQ@p{9V(^myQBnzOI{{hNb5AA
zoI+^CzuH>ifAXJB1KN7?`tiayR7Idg8Pz<8Z|*L}z_`!O)C#AuggwGoID6^S$R;je
z8)Ub*xj^}UnnXHi0(qhy-2CPB74{?Z$C)B$5-Nj*&w+}ng^zLef+LYtT)|Yxnlh0W
zScTV+b;O)`7vP22k!^^6veFH_?oBcF#h%ThL&F^2CgS6Kp!2sJ+&x`_28;fZLMXN~
z3n>F7!;}$S#34r^Wh9U_>SDC8n%lkMs~<>fM{wW22?_kQ<DOrO{fdkJ4J5F;<*Ydt
zWX+t2VpUyHIa<lKv6kso7~-emIt&_li9-*6_veX5eEeIN1O)mD!h$bWE*BKx2V`8a
zL9m+77<o-O0f86^l86^5TD(KEa2F^M{l_0k7D<x{655p|6hs&iKHISZeNLAkfT;*M
z(;%=i_~41s;pJe&(OJTnu2fl2O>v8I(-TyFvQ327sPCH)SRts#>}M-D5g(Na$(rz@
zV_6G1%sEt8G2cwl9g9j>3Wg)p!trV$;|IUMW3rJ!r8~${XANH)ql^9?UELBfFe9WP
zW$}-JBXzCC9#i&iR74bl>{aABN-5bGD7DE8se42AP8VfV#y~BB<k_~--qHSgTRBN|
z8LF5KW<s{UQ{(HBNQK_nMWBXy@Wjcmy#ZvbQfPbd1)QrXqns`y<62=dfAGM6LN2>r
zF&uQn(ZuT!VtiygeZR3SUb~K0gM`>Ay~V!4UNB9V`q@3k4AQ<2)LfF0j`AcM4NLOL
z54(Dq1E-HLO(%4R=FWfbT}i>y0ZSqqaRLs*&qq|qA~AoyZvMiYQi@0b(=PXuH_V_x
z=%e#=EJ@@<LK~3|f+7vN_|*-VN#4<nKFuh<DI#JpQb^%V2ehWgdj3J$c=q8l9}<J)
ziRgFb0l!^Y$=jVJ+@dN{O;|zR(GetdhEw#htluQ&9vPyGA0+%fSW{!umzh96#A}PB
zEF&?RGM1^~H<A`~a&gkscfTf^M1N=orOHy%GPbNNLY4@!b|tg&!?IH$w!~5}RW@Lb
zr*)f%2;l7#>%E}bKT`2*3@<geoiEbObJ>l^Dm?_LpGw?bOlKl8=&FSch$14SW$0{G
z|8Du{S(=)tvB~e<i{uy24R&D(9GaFjiW5)kHV5WGP`Kt$nIv))dhTcjc(RnwD9ACE
z)j>3llWSjJU7I&HnCNMWk-3(<yqhjV-ZpnaCHIxl01|H-E}a})76_M&s9IL>@ZSCu
z{h@N+yA`WX<TGvQt%)|+4M@gnXy}WZkf?b(h-A|`PJ6S@*Q9nUvHKVY^P=ZPbqw)i
zVG{T0fC!&dKU|4`ohGmbA;i1(J9aHveiuA?Endl{;xS}1Jz{*F4dIp~0^P9o(IbX7
z7EK;iQ0-X(Dj8e)fq1YM%C>i4LuNoN6|WsD9Lo3^c(keA{HJ%%-n-OTw%rF8GN};A
z3Olzowy5^pa>b*!;G>b#0wBtppt6gsLFOvfl=6>ZAkV_DrLRGk2=^JvyAg|;c;zw7
z>yap4_6=vWfInye8f?LPsiBsHUWZ)6hJ5JJIMcH6m+j4wHGnG%qvMNW(0$&j>i(&&
zT|qQ!pV+AD3DM?bd0%Ix7&j%+>VfoXZ`7n_LhbztBQpFAeRTclv3;;!NVb!9@hp~U
z6+eC<*ZVuIT0XflL3BR!I9mt%787bM;zLtcmK&|)ETEOSU~0A;T--s&RLR3+_?d_d
zoS2BWd()Gsf2m2AWLXEKTiu7fcR`J1Il_^b)l2Qebdp36$wy1$3}EkN=|`tsM;?}x
z4!Ry^!@-|So{m6e7blHA9;}A~<D~Sh#<y;(22asZYl%kf?)BU<^V4A3^o#ld84``M
zULyn4w_3M1UQo2|lrdR0O*lR!q5T;~wWc^LG*KF?{g-9m)8rGCA)}iHau}~T3oF(d
zeC<%;@F3(Addns8ebZ)AWYi*=HY5EYrObC1Mqj+~uqg2q+zRDO^ae+l)x`Y7N!}LD
z$QP@yRtj_Qg_D%iw8x<7D=|jvHhgLJ+%Ok9Kt9k7oqdjK3O<USAo?coP@I&OT5F1>
zct+ovD<pd-rH7r!1xti6Vf1<{_oRA1Cz0VWHBo&UPESctHq@E<z;pGs%;sCHy5kl|
z8tVC+Bm$WkVhWX16b{G4Dr6BU>(Ko3{$e7TtKkEeb9S{X8kcd|>!PyZjCA;yPwCN4
z&=ih|k>`ikXT|9umr%(U=_UrpCsQU>UmbQ7IQra7?Y3HpD5G!Sug`^mMql#nj9BR>
z6Xxx#E9*-V+@X6dgo6h>YNW2pu(~5>*<&Cmp9mqqR<z=Am|P+}BWKX5!D6w{2!}m9
zw9=cI?6Us2bJFp&SqmoXzI@3BvqbjocE`mq>RwA<?pqK~f(Uyw1nkOP$0*b>Q1Vu3
zh+MC++Rs~Jf+uFHT|E}Y-{Vn#WQ?6_w|55z|K&20k2`&^J&*_o4lE}6z8d9P`GL4r
z8H4W#7_2ngfwwODK{eroIU9_NW{3|Jh;^^^YhY7i!)CmNdAj>_2jUN^aw$hScQLW^
zAcy@_o;T4>Fl|jOUgAdLKk^7!<a`>UM0Rc}vPMQBCb)cxBx}Srd>5|sr%{wII)b^o
zpqt|r-e}Z0q$mBw_wT}*OP1!)EJ!rzZM|Fgf2X*2kBz*~d<pT<y_zmpDnC*a+;y??
zP{mMU-Vg_&j?FGPwE;FBGxH@~?aFLiVmPBwHP0-!dsL>Y<eYY|ZOAB=M$>b5Z6En4
z0)c}XgdgO!D>c8o-lYJF=s+=OOAu)v+DzCSV-jtJ&E<pEWnF!RWy8>&6tfEab8)RT
ze|Rt!ejwjcd%gn|O-+?VZIw8IeQ&>i$tXCDIgMJEyn36FabDyMU{p=L>En(28h_ue
z^8~T_yPR5Tg0-3~dgUiYB##?2q7kK<C!f4`=vtt`5(G663ys8jI%7dFdWRVHA2teE
zoB8%yP-T9qD^?^1`=|II_jAMRk*7WwAt!JG3;g^2m*d6_^ILHRVSZytF83jQYo1mG
z6Bh#rS?HEC`olz`@e6wD0M@O;iyFZcY?CIFI`pb6WN~^owp;eWIZpG>5jaHvipbV~
zqhew#!_+@daP?Xcb^++1nXDN64v`M0v8!}X2XuFyW}bGtf?z9}o!(&F4rlL|KX^=#
z&g*;HVX&Y3_ur>~a`zJAUUreRIyh1TfE0LD_r?GD!;x)%<C8CMsFSYaV;QGrFjQEW
zTr#n1FMOS+3Ld;5ec?=A^s!F@u_U*R&{>*$(X!hqHr`$#`8yC|d@tAZB+1LY`nXQe
zNN#~7THb*`@l^ys;oesw3)L(oxxs5EACWjhA70Kl>MrWt(^c~)5xj}edqwH!cmU37
zH`q39j135y-lM}W<iv?s8*Nd+e!)WKTo$ySE*C^+W*~}bLsSu@vwat{kZSFUW_>XF
zy7x4`U(9VThqWA3wpRi^?R=a<!YEd^pasA7N0glgZ0(mH^U=+9!$XfNmzD4XE#9}}
z*_47f38&R_E!rJrU~AveK&`d_wYj}#-q_9@>b-mO9$JAyYPpACc`OjT-oI^bMq>m%
zc}KvIV;&F~F~GrKQPN-E4sGwV!gkVh$^QvL(r>uLAYeN!sF=pNoFTh7!I=+%%3~8c
zs_5>;PNkt4YoXBMpaNXxLN*Z|ylZ&ozIb`OR5J$4G!lxyurT5d*=sV-=5@=*_ETrn
z@GrS_N)Nm~n+#q~c@(){*<3D+ayfzU)b;0?oG5zMUN3kZHVz|WSp@f$E{V&YS9v^m
z1uvg|GCLo)7dSalZI{Q#6a$ayD5azc;vqH=^-g&^Sl^_r?q6oK?-ux}X<}S-l&fws
zUmVLDs0!Hj2>0fW!Z;auxSQvk`@!&*@YQa){jPPF7us!G^>_74VROjpC{=>F*Voqx
z#Q-I|^+7>{@wtjWSl6-1D*UL>R-sze^*s~1hLHXDW4U~tZU9T3m-As4wckKAr&HHH
z?2olynhKzL&h#232c*>6h}VXYJQ&9P82I#PWAm2$o(iBm_c&f*{Ege)-XEGBo{JMt
zoxd)F;T)PZqx<&ioY~Et;N}gVGzuGHm@8&kY?-ZP6O8lxd;xOJjnCA0UJy&&51q}1
zn{F$~d6a1Ua(2IZBG0!WY?|J+FDZ+@3_sSlcipaXL9t7j@Lf*KBo~P2Ez2r$j-R9F
z-D-J!E36E2R-FJhe8m^GA6~78NHbI~E0DUk-?v~lz&V)jeuxJ7&T$BQ6#iDTgad<2
zhx4InzMpqt$r+h(G)K)b$!$T^9k}zrr;P6~5&ZRiCHI1C)oVYU>WuvxUjPfJ1S@HA
z)~ei>o{u*?+mGi5^db|m-<7qCstJO^C832>mhaUux>%a8cnw@fjg*Ux9-gJ6v$=}Q
zSpA8dQ$6malva<*wK%E8`iZor3Nw))E4tVy-i)J8%nD4PpTfm@MyQ;&*thJwq08pi
z<*#aCic!%u-Aoal5k-TVD_w&T+b<0!151G1ndEGxW&4L_cDAf&gmK^zZfoAice=tp
zesr>FSk}oML5i8uVMRh~X6C|)vZEgn-+k9AG>#1U`WcVoX;U}NPUsq@PAl*IdpS^R
z6^M&v7esBhm|0$+BfB}uNN%`{UCi^8cP)J`f@a8B2SDVEE2XSEZf3pF3*%BJF53W-
zW%L3+W{@Rz+wt&53zM0XufzVm@cmJhR+A&5&LWC+Wo0CDbCqGj7`emgEAD=if6Pcu
z8<`e~*7tzvF|6ru|2tPFcT;EQd#69+K6Suo8k)GtWDirn+>7nDxcEnPk3`Hc(mt`*
z)`)V{?_YLk86GS=Y@fnfobl`T3^^cK+Ycja-@EkU<8ht0j1Y~qvnXBnxDK?RqJbB`
zOqpia`PPz~F94Pc%BElp`0CjYrye4ig?@<7S>!|Lii9E|UFKVXA)xOIcEKgSdan8M
zV-p3zmK-nFigO3AT(qZ)ZC0h89(&*FVx@TX{t+BIEX*T2h&9HKB($xgm{=O=T#m&X
zLZ=?mnf$zEx0`g);Fsz&>l1KBf6jY;UBBVgGXMM`NJ2%cXT0F;etXJJv!e|tzm8)!
zHacy{Bfo=|Vye?UD}BwmQ=gsrzOA2{?T!k|v5KvgH+MEoYnbbjq=pklb60yWDCux5
zc$HNs90|H6aFNqdwE3t~os=_*Up^cH?ZP-9{*tSwL{y>#*W1$r)ANWiz|gsul|6IK
z73?Gd6;v7*ra$nKr2k#UZP7Pkxp8KA0O4sS)a8-_+*jbHp76!ASycyUU)D)J8oty+
z6uCvLUm@;lVA9A~3fsaPTj4K@^IY&p@g62&`%x)vqr45H&|8C+cBf1H?WMxiHF4AY
z;U?5GUhAt=;vNx3oOc;)XPZ^<lt$p_E;OtPP<TJLRV{TKBR8YcidN|*S@6<+xq{{S
zJcN4?O3fv5xR;~XFYl$0+EUR?JJXS6_#|s1<~3KH&^82z`f5b3Q(Vt#Zr-@^!4x?X
zPgkzd2ToZO$|uEdqqzndlQC@w0lO5U*+Yw5MpYCRf{?CaUkLr3Q2ENuHQEMK|GLQ#
zXk@5SbUG0ph4Ms;lhZ^ojcS=O#DW5^39>;4yAR$pY|zgV3!U^YU+9m@PsCr~x8(nB
zaE$&YC|9P*F|-}FJ`l|@B&%OsJF6XMBo9`{Zr(D)f`gz7noypfa3}r54k-wbZCc@4
za&^*T^+lUW_bOkyENMdIq&`&1g6}4zP4pZpLh}SOR_j9b^x>0|`)JT_8wC#w&BIvM
zy2I=&aMNoR-4)U~h_O<2HsC09pmA@P9(&{tkt~rKf4n44_*ewoXd`bxwIUHV2?@Hs
zAa3kf2+W(>(K!un^erC02EZs!N2SaBT_#gK*I)Z4eN?jUho5X|iyXkn1t5OY-z(N0
z(3jdCml?GsXp)M+q2>=iv4~WLg9-oJLoTyP;sDK81?K8<zq`}_JNN3hrsS(d=zi%T
zXZiu-wTWGOVpLQntt9Cq*%x*1OvX;^Xw9|;t&*--@bGXjO?M3)r}!Ug$>d`%OcjR<
z)Wq)6R=_O)D*Ga7T*ZJ>*k;wjh!9VM7360em`ZfxX)XRJK`&bhzWkDWB^<p8<yF0b
z6?n_3QtjsT0EVm_<5nTpDlI<0u7IkUC=@3OX`CLmba$l<s#TY2L=gD<M!D<>sSuI-
z`XcqdeGj<)J$Ysv+@)ylR6QNk+*=>5sW*&34M5v|ldx>N5tGMTUYJDP-UddUKVas=
zZV6~3a7#<}4;**3gw&BU7^H$VnT}lLIg8$E_3fKO&sFL$Ff37gjBT{&lXm1Zumtu~
zml-!W>n68X>fo?ucqAN>{r8c`aCrlEX>alIp10nqgJ4R;`E7d@vVCN-dT{&JeC9y8
zeXYwtx@~efr)Am49cc!W(?RvR7F9zt%D8ex)2vmN%k|WF%F{hd>n0fl$?&ykadzO)
z{qUu6^E(XbY%r`vZPGB6((0yjUSot{b{10@urrfTA{mfAF%3&ZoI#=YgTkcv3pEM%
zVIRSG+9kwU3wn6`bPGoBW6P9xh2Ij7`|uGyS?!Ua(a6tN_AkXsMgg`s7IXJV0xNYx
zL<3W=-{2NN_icRK4MS>Hpj`Ubsyz~1im)yeEfq5)hOtP<7SN%2k?-Bl?%$5~-04kT
z2IAPhLLRq@*g$?!yZ4G@AXZfZkyC;AIRZ3frPlQORsQXE!_nlJJui{>CD0#4iRbZp
zwj&N%NKZJ$ykUv!xK9lzW?vEvV~>2i7c=K-?aGWx5?VmfBe~@t4zs?_{Z_79%T9;A
zTm@*wl@(^bZ>ic2y@w$?Z4X5t%)6D(boHt`@!dXzOrMYGuIN=vu6xEjZVhdTVWpWl
zs7ql>B95FZPO3%2$TRYAs&XS#RGP9QWRe;;5}9@~p;wdt5O`eORgCz@3=<%2JR&p|
z>`%qriM{Y2$SBD>Ul^&_z5k1)4fv9#nrV-Z@}PVo@!`3XQ~WJ$R{@|NSGM+aU&~`%
zZewzjjQ0I_Yi}_qainE4j^hnr{Bh~&(P#L@K?!-rn=9e3ri0~iO9nj}Q!I1s{eqgr
zo5q%YZwTsa#!x5U+sS<&YYj{CVbjK9AW@~!EX;nzQVWsCW6o9F_z>#K>fHNv#D19#
zx+Vi>nWD&B!b(#Uu#$gX@+Lg32{4rKDR3=pKT{UDzi)b?+}0Ig=O6FAQN<=qTWGG0
zPfgmz!;v>*Ox*D3%G6k5gIo5`%%M<VQAO!DTA|X2fi!(zQe(x+j42x)Yu-FGyuY_P
zXG}`{*Y-8Mtekgosh2w6h+H;maxxt;Ca|~K{Ci3HzGo^R>giki<=Rk{|6F}T;v9G$
zkf}4(3Cb$1ZT-+r$f2IIFA7%md@mXz6ryHZHCU{=bayc#<a=;P7L&oR??~R^DN;U-
zwwJdFp;kF!_cgiC(;}1Fa?aFSt{?gd8})&a1ivWB_(JgOVU4Fqg7#^Q+p{-PVi7D3
zA7#3{R-9};2i+C%7pQM#`G?5(EcpFrdk&SJ^Lk`ZFOHuODk-Uo8-!(f%+DN>h-$n!
z(xgLA0#m2%E7JJ!0)jzf<n!3Vi8sYkD@St$s4{&3K%5fq6E`ZiMd#LZv$;Z!M4GH$
zLZyTqk?iZ7QI>sZu3&+46<^C(AvpByFch1rJJu>daD^N|%bb@6#0i4wBp|rSi;3A6
z5^~U_o2+vI`)tX7&WjP5?Nuq+f>VuA-mRJP&nuC`JWeyF)IMzZ`XV`fP!tw5i|~fs
zb44?Sov7Y3x?Z;8uQLQ_p%Nt?mr*ZB!AN_zYA|_PL9;48d*~wKPp-Y+bUn$2)%xlw
zY*;8m<`lsFtTDhc9l`yP``Th@X;E)`pXyMMPEw}^ewC%HSr%~dLQGCzo%a+*+Uzf#
zuD#aj4<TeTp<K?28SP0u0j>>5Ymbl@-}y?5G9Ey?^n9w*men-Am2p~l^(yD7>%Oll
z)g!)P8l}az&;01&JgcYq%a(EO_?b6271c{f&z0RlB<On)x^0oDRuc-X&cZKX#=2Eu
z7^UVpr;GJ(+UT~<Q2U@P>2HhoD9cWNB{faZjt)X<?u%6Y9=oJjRK+p!YlrjgZ5<#-
zM>&zr#&jk9A#p8w5c?hkQm6Rw;i50A4|-3>#32-HI^g@J5a7p}o24LBsxZtRsxe#i
zBd&#vKKB%HEE%5GQMNg!@3%80GnX#f%;6Z!KIu{FKU8~&XUtgYe*DLS=+J}VxTXou
z$>RpoWR%57X2d_}aWu`fPFJE$F}$d(<05?HIx=%5o4IIMnn37$MaXg$gxZBDswH0X
z+92X>S5?(#3KCyg#W$+kehA~*ycLvr8#!f`WIDJU&llgteU*)B;d4l-gu#?O6BMcv
z@=rs0m^<3bU&ccx_qFHy{wGYdsT1W&Y7<G<-6;uF4AWb{fK3>?tr|@-MN`uncM7^{
z&VJ&=oOIPB7i!EQD@f%Jzabi@AK&`)ngMpvA_0;)*U;A05h2NN5)nih?~$he!>d+L
z3<#N<-#KB%*T$(Ps;ZTIm}(dYizQfT)bCwb0(nf6LRL54cnXiPOm8};9DM!O(SW|5
z1b>>hCuvz<Ii;zXuMTzYxY<KwH+`a69DD50>AjE_EwR*1?rPghNJ9{JEouXn`m~yS
zoxU6Y`}olyf}SAxF4IY>csl2e7EDH;b=`G$ldsR|He921-h@OJu=es4ZMjIPUtZpR
zaR%WC)N|)5P)rOK;kC;}cwwk@cI)F>&e;qZyTuVGuz_59EL4LS<~CGBJ)&qCi=i?c
zVbTQij)uGJ_x<}R`Tz;RhW35cGka&~)m5uHWRL*y`P7Z_=ed;x<|lBmYCCd;XBFj1
z!gz<x8@ky$KLq7)ZI#E${Y8G7p@caLbQHJ_bj?VixmhvYLV6BF+njZP{yZ%DBaepB
zP|);#fPlt+KZBK38A3fNYj@DIu;$Niy8p5x;}&jMY7ejYn!6!3tItAr&GcHfBG<Um
zWf2}VEz<=MZoVLs5_l!irk{$)L{5%XrDc>hQPeE%O~MP=WqhZA6h?Ckly)=x1wF_T
zK*LglP<zif@yj%-144N=W?IU|wqaxsq$^4h;xGopX+|CD-_A~~H37T`DA~NCxSSgA
zES+CL<{ZECZHC@i;V_H1kXsIh1Awiex%olZ_Gi>kz`RoNZ%f}CW;!kV<pFdB<NOib
z{m?%^E|W&Ks*;5H=yuW*w(pA0+v!{+m)xbSQQ1tCobQHG-&a62r;KXvm+yBPFGX7V
zoW7Z}85bV5<8L7=Nl}#QEB8N)a9=asX*z{pF1`!Q7LuXZ{oiaJS7hJ4Jj)8Lgqk~U
zoP?NP1>gM6ux*-8#I6u3ESa^4Cpql>5-EdcMWVvQ*;haNcHx(@8h2LU!rpM5v09x@
z)Ts&DQ!Bl-SF(aJU5~4k=(|C>3N4dc+i2h2$+Sf$yM1Sj@C<db?Fz@qQ-NFOwizRX
z)M>dC6O?7R%c{33U{$3BYRN~lp&chCcWEj;^!%HlsCMKKYt!B!vbzB0J282PUV3VU
zdtYYcpGhtk{eQ4ReW#~q#`0xRq$a42W>R;j;eHlImiTJSqE%PR_8u3rhkkA!d2M*m
zDXfG9)ipMmNexVO7UipewjTi2U?9`3;;Lc>0xY?Z+*-?eDaG<yZABS{HJ$c@n;8nX
z%=UI^P6WCA?fjmum62f+=SGF*Wf-OnL|PQ2Ik1t8Hj&aNTA^i8?uNN*$UDs5Md?pt
zF^Uj1Ch2B@;A~iTF=Wbggi73a&%Vk<s_FHnx^Pc(fp5V-6dUA3%&DvD&BP18knq$z
zhWlL*&TNW2N~fsdHTEAj^u`|DLa1`AVg^bN4kRjFt&!aSo?7OkTBU;uxrF1|Nk-i&
zN+l<{5;UvSjNDdl=t>>b|CG%WejuRKd);{dUAo5KvoG>{biuqkyH09u^*8F2;YaV*
zSgXL_Ypw737PaC&aBhyn67>6y<!gK6RHN3vdwfs-zXA&$^x;a)_xJ(z<EwM}k{2o}
z7yP-g+zkP5v1Mvk10O^?75QJi<Y6m8RK_d%DyCUi24%W{3oOP}JMZPcs=JLZe}v#N
zhr_K9RTRYzGdd6+iOW7*JiwnCYACJz`si+|E8EgqAyZ?`LgP+y>&}|!&c>$bj-55F
zZ0(Mw#^}z{6c`+FIp+C%k#Hu6k1~SdSUlR;9E<ThQIk(8+Wr22{$_?urtXu~@WC@F
zMnKnqCs#9rPfy{FmaVOGk59&j{lR9A&)y-t!{+LIR%>*{OA!vvV&R-f??>Yv)N@pu
zr`_&BCNpBhHJz_0Ls!-iGh&m7r`mC{H?09aiGLqfc!eUjTrTo>1qvl5NCCdDZcL~E
z#dAgCIbzXDv1pay`DdVCLEu;VV^@|SODgumok%BKDi;(Kv_zeR>R^4H4KmdCD+6-8
zwDE;MjJvP3jWo==*c8+>MW@{T1)`{8(&moN*2TE{r)Dw<s#rY?YBVsU*CSAxihzCe
z;i{@(`r(J9{^UENV|UrK<Vy$hOCteWI;3@IsL3}c^2#y;>I2&xE(cH=&J-M|MqUS6
zcI;PxV!6Yiq5qsMxOKObreaZ|q7zdx$CQjt99RKOg3-w`FGu=fuwdscPoP8Zji-CE
zx+0ASL<QhtKo0?gK1PI?*R}}3@p?q$JB5f5Tw!n{(n6+?;-Iw%+jLEyiFAawH0FRJ
zft>ZajE!!9$<d84(M1ny48uGI49gUTnWdNy7-m+wOU@!KXM+vc{NGEj(cyI@j52yK
z`aYt{cE^}#P<Oyv8goG1ft>U+0c?vr?Uv1Q&=@{OYvP)<2;2h{l(Jv}h$?LpTt)|p
zhsS*rhZ7n(iwyQa(tx)#<`5ub4D@W+_oxwkEDo4g;N^J%uaHG(?jl7IT1V$2+bi($
z7(nmnd{_>_=@y~noB#=C#5}BK%wSr~yaF%J4P3@S_E*XxXHAs-4zxwau`;i>*MmLH
z)IMnv*dsfOF3(HLfIM1(n)*KKGX@Jsw=6mJ-b0HldjR#G3RUWR4E+CzkMjvW$*1@<
zpW(B74(Hc!;FyCwj^hMQ;uKEf49?;lAUdDtVQ-<VzTnFTZA;z&$(n81(6)b7>SFZ}
z@5&XD7#R*+*$Xhz)jfbs4<L`Xle#AXK%-rN-Qi}0`0ck-=j}RE?cChKugPz`LnY$v
z<0bGkMK$VWo~QV<`eh1Q5RLE}XmoW0F!Cd6GVLKS(rdohr+x+e75c8d8k+D?(0J|q
zE7)sITWwbLe9PU+hr5F{<_C~p^UG?Iz$Cw*^9U#=3Yzl>sOpEdbVqBA5L!h2+Q$61
zrBA}|^bYBhD<mu=CR^j<{~BL^+Wr1{3J3>a(V<V5iiY$F^#90<+yCf#pdv4)eFB^9
zPrmo_0|)+rB49ilz#x!E*T|-t8QMEOej|9iJERMG9=An<(r$5Jv&>A07GXlsm`Lli
zz)N*6R?4cwaA>NTMMAitdWuEj*!WD4Q&%@k^%J&@yUd)>eumm8nv$@Fp-f#(HHW5}
zS)`_-)d)E7h#7E$a?^5C%UDJ02iE?w$}ZXcmfytlBFDRc|3RQ+)EH}j8QH}OnFxMB
zm|M{p&h=X(c-M1;z>^LY=CgOt>*6ZL+FwR?$sRpyo@lzt31M?4n|Q|B??*PUomjl{
z6A0EXoE7cT^CUwZ)DQ6ZyRe{YBp!M?2gmA0aaFea^vwMFv9co*G377zXACu>#8E9A
zN?eIwGgO@B2Qlh&)g<yZD)~B*2`p;q`|HEOx-P(k5cYRAHEzOA91bO|62Hdu;uJ2n
zrA}9FB5y+@Ul(;gTjpb2Q2v^60SFvoE~YcaitG6=Z7gnJy3<&#R3DBhaUm~(lbvrk
z*$}-gSvKl;&#tVUn@EKdTqY^HeiR5vJVGtqm_rkH<hfpHkU(K$@t!{5%h(My*^<%S
zCk&4b@G9qgE=&xTlHEBk1nqk;|I*U4HyPbBCWN@r77^4{HHz>2);TDlHB>5LEd6cU
zrg1S)($utcm(@*6yMAz&@u1t!Z+vF=rGbr0pXDdT@*`?v&&zIR7IdbG6O}6ePJXBl
z78%&W5}oE30B(0v6WNg@52zRG#f1hHs?}<jo%xgW>wiAp!27I9@oS=QkdRBt0}6zq
zArj#;xZmyoaK;Rn*@#)L&Qh;Dxn<rvhs@c+VR9QVBKQD7YSYUDo^0!Rna32CvGlZ+
z?ODs7(HV<vC!xm`o_8=q4`70u=ch^FvN!8Bm|-T&ii4-3y3FJfD`8ws)jSGITG*QP
z6CjZeQYg~Qkla_r!QEys>sS_HIIs~1TZ^q6eIXWLu+=!3b8bN}mkl84ce+PcMCXTr
z2F))GPDJ}{Ji8u%kWm8wUokV(KYp|9|Ft4PqtJ6_40g5eKF-IV>K+1a;e+LAwRJpI
z(?Z#wQr9JBR2MmPhVaZd^j%x#G>jQ9p!2~Csk1}xA{1Yko{T&yMmy?Cg5wU9M!V|D
z^L{C;H*<ruRH$OWn;vd`v0XA48Q>U*a7(RDWVZ|ou~X|p)jVNjXWB83hD~LD3U`TO
z%K;bwGOQK=E3gt;ywflcGlH$x-25F(u@bd_g(g+nRWgF|SPsLC0=x^2hLzD-*`2kd
zj!e$ddP8P24QmFI)?uBcDYGJ}(MUuPThTR00?}atma)9L#mqzE6SIM@6Kx!N0SF8A
z|57F-l_KmGv}e6*SmyE%B^8uKhi;g%CYNXtX6#x!i(t4;K{BOH)3G$ddYDZZ#DKFl
z-VZWf4fV0>p!KMl1I4RKI$ZSlnXcO=DDKanX*TU9OGukqP7AG8G~4*9UPc;D<aFdb
z|1lu%@6dX|?7Vx90QT;7py@NE6iA|~gacOrkWe7sknT~6dPox|LnlowdA)AdjIm@A
zjQZt?8MqqBIKUk<&j!KGIwy;e3OXrO84Fy<tpCHjS_GJ27ZB*;V4SE|*4J50S(?Pr
zRF}SM1+4|zOTY7Vk8q)h-gyJ)CyV!RpES(W%D97lg2zv=0wzzqEPYBy2`BVa?o);`
zAw0b0!kkNL7gLcVyt$ihi(B93s!%ix8JlP;4GaBi2XeOWKJLe#>c;6MXjpaBtcH;q
z768NeVb~>J8gxjWg9dZxxs3kew)2FM&1o~mlGCPWUssr2Vr)+&ZWs4mV^U9bMdm2p
zK-YZX$(=!f%>*S20k~U`kyoqy1Xf2ei)3TDy5D3KRz)JzEA`uB>dN0v(69geK_%t`
zk}Ye3qtSx0T0z4viDEMy!c^%ub*#wo^;q65tsg>ux<7;E^`KJQ@-7EQXgletQLnAD
z_IRMh<dZB&sD)%tByp#jh$rnrdrNo)q@0lFu&ivF<4H4#$@wgxCaP!1(%IB0z;~>v
zEz4QbQBhK!oIeGi$WJf1(Mih+`6EE9s4!4z&7?c3ZJYwg0@gBZkS4GSE2A78HcbB7
zmKl=Wq>GjduNdYrfQ29)B4^FC1{Fqb+HQ&PqLLiW#s7+>wIpn#ouoBZnn?2UCjVN&
zJ8$`5X?i7(f$6}k{_PGa<yj!-&i3JTwj216W(BiDQx=rQ1z;)0$t{NfD>iwxShfN~
zpEn;IYEwEE15L{eH}FBEBIeLu11QI~p`Wx0LUu$-(i8*O-DFo$Vr-1<e2Dd}x$ajM
z1KrKi(Xan4$q-lR<%=#GhPze)R$)MCm`i?$lsNMu7V>zt<#`2o`?%Yv+jQ&Orm|Jt
z8B0kc((V!_oJz2Tmz--_+~ZRYGXWJ&0eRMKUBIceJ%O-CV|MA#Ii-M=L5JEpPi>#a
zZPx|qGXh_}XfU=iBNiL%%i9AMXbCnTEwNOo42VT~_`{4in#orBt1zOfx+qOQ7T$uU
z!E*rF{6jAn3n7vi@WJ(RTC7zN(^-`4+Nz9s!bRLeo36*fVH#V|`C8OozH@H!yy%)}
z!n^49#yn7@>$pkY+hZo0fU;;SV=OC`?7)tsi*b^nvAecNDfVxuI5Blunzk)*P+(LB
zjm2?UbYMNMmQ9`5u3W1P#8L}@J;<pC3zn5yYU{P7P>Nf{FZU;9L8B0bUy_vfZf`f(
zyR|6rC_co2_4mw~rroy{fnGg7@$w!$BD8P6^2OulPoJL-tA!M8oh3oWN9aN6YQgpE
z@DL7(+1Y}0>MxvQ+HKs?ljU|+8}q0&X9dFQbn?P>O**V|QHW?VCSbSJaPeJasVOcr
zh5o9*%}MQ*EQ%RVp%YKrcbHX@5w9jUVtd|cfEns|vQ5%xF+?&tW3;|;*ljl!si7~9
zN3E%ErF-tITU;ePxU&Lw(ti%0W=Q^b-KIu(j@PSZ6|=5;5AECJHwkj~%*ycl{^kaS
zX{en~+b*>g=<F)8m<9Uo=g~PcJ)LrYwNq`z5_^8y-%g*YcIGWX`{1ANln##PkO*n2
zZxq@j&%&uBtfLL|BkOMtb;)e%XUR8*WbQ4Zsj9eyE6ej71PU>tL8Yb|m(+FX7nCyX
z1S!vubJqh>VlMi_*Xr%po}YGG8h!fkwI6={hp!)=zWV&t+j;xAdsMQii!7Sg*7*nO
z`uk_3M2r52@_`JvoDN_UHbpAzcxH`Bf$-@jv#u4DfLK`8_|jtFffJj^JjJv0jCh_7
z0zJ)Vzo_R7v2TzwwY~*xfJK-I{eceoKnM4Vm|lBwWFO#gxCi>M=Vw9A0Jq6sp&%~?
z9?Y{*pAVaM{<|`n@r~t{@S6_RJLK45&Y@Ak56HpXLQXN5*en1qs31~P35NK;Cq|NO
zH4@-+Op!B&<eDzv`wXl~4IOy@Hf(#9Er5EOrWdDwyFk%jBCFIwDUxE23F<PcJV(H*
z@F9~Dd+x&Yz*ElXLjVd3-nk%r_H=o<z8nv`jS|s@=0#4!(o`Ampj!()^KFX_%!!D;
zQTSjEFIDc?9o92144gUV2Y}KLz##BydQ!|>WZorlGa%TNlegT?00&jZa}FD@G0C%=
z{aaLs%Ketm=>d>FKy;aZO{<LEktqli3jtFXb&j(O00grvz_Gt0SxVS~EtX8mEqilg
zIo~tQ&Ah(|j+-Xm`gt;Px5gliTNqD8w0y8uN#dWKLz8W5u%<+KVA;=0%x<hj#UVDy
zR!}$ur^MnYUO|^F1Z%FB7f{x0mD=_Nr(kQ0$${vM<8m$vk2lIaaz0G}p^4m#czSBr
z5M`mo!@zjizBy8xqy6-%WUq|y9Kl=1D|v(#x<Gh&A$Z@;i#(0vbiajeM1Il(YMF8f
zYoH$Q(Wu~TS^<IvqOn{BS3Cc;fus6rGc8D^Fl<`TQ1OqLJ00b=tR_QPj~Vr23NYW6
zOB()QQT|p<zeaUw5koP`e0yxh-;o$2qArkw3`jHUES?{Wjpp>zbv8$p1<JB^Ei}l+
zx`KAYbw*vL3PDvONC>9k9)LgKrq(etB|ASu8x6hPDndt$Im6O8vY>Hv5sS~((M##C
zxi+?&mPVwwDojdOwO7_?pq=ixt+!SNIH)VQ(Xtr`nBiKjr2kR%oFn#4!|}`svj&q@
zQ)3Z%<YLGZC0KhH3A~A!449fQ!l5ohHN!@;H!COL841InKQ(DWikRW*C($vhSRh3|
zchUq#ZC|gFr1lBGl-Q6@diH=^2Dx(Sd?}M1hZs5I=)P7BxPP@&5#XlpN+h;R&R4Q{
z3+D&Dg~4S$f(v4vl<5uX<K&-3XY?BHn?<YZb>&#1US#R)_6v(P3h~ZWLu@u8Rm>^h
z7u+t3Bj7&d+A-4w3?p1tu5{@7dPR8eUdP|vw(Cju^RzGx@ulfrJOB~S7@<s)-49MI
zx^Gk}4j*7Uqcy9&8(*~;UfWXjJe-hV6Fe9e@hf+Q`a8#zZxF!k6Va1U4_%`7vkQs@
z)u5F+qDOifp8o5!T<>)p(i!_3Ia?RrBawDMrnpCsi1W)b2e<Ho?3!`_wB|!}KXpw|
zdybF-u`U@gf(wwRR8U(lBVcK7xr;?CuGWk>qL8nU3p371>u5lXU5Ya@c4R!+DrAm^
zA;rdN!aukxDX!9ux1+w(Lp~DNXH%DTULm}(RhQ|~HF@e9o<nDYh;g++;>m1+3QWf{
zzLmk<=u2+9Fl`ouTa2@`V$Hx_QM{Kwulo++-P8JU^Qc6(>Q^+xAv%mSZdf4i3yoyf
zfGKP=-9cot9}Uk*gjZMcq)u%u&%pOQ!1i^}Z~s3bRQ9&F`gN7LgjPP@dMdfMLRIYV
za=z|++;$?l<$!SWkkU`t|5FEk<Xe8yM&6nAE?RJOpJVUQ2G7E?KUZrrPyOnCH_m+8
z*jT371q=`RJOz`@BE6Agjg3xV$fqgMH)YNuiyaR+zQ6_GWT&LJM7;?*E+Ene9zTsR
z!fKM9_so{3vhb7p-QpZ~c$`;{{KRB*qLPuxWJv^W+?sknZ~Y__uZd;d$3ZbVF;+ut
z&oXSsZB>#|&<A9UwpS+_MdPO)bZk0uD_+J19?8>rNi2TubBs<d<HA%|2(NFZ)8aJt
zm8w-(u#5I$-h8hlh@+`j9HW!iaTm22UH9vGLFt-9bXYA1Fe$7%t}w`Q#7S|8&lXG`
z(8)WAj(Aky;npbZpj|4A9lQ?lZJIt}5=d_WiN+O3Q7;sm1uQmcZ>b2xnu`J)+`<1@
z-{zSgoO^_mEt_rbW2xs}zql9xBgMujmoP7$f_{=Jp)}#wOx-}M@zjsrok(>3TkdXb
zt30I^$o4oUxe8Ok(KUA2Q{3DNa_!RdVrCF=c0u8iK`;%;EJn`4;tVeRwLk}D%s)sZ
z%ju%1n7?gkPRhz6vr^9Mi{3H{Ag)_7n@}SP1g`;{LUB={eV+Ah=Y@aN>N{Tzy%PoQ
z-i3q<SM3T6f}w?yM2}^eIfk4eAg1}Hfo^DbsJU_)hm&fL>$w}1zYoBy0A(b=vO#$P
zrI`i+PU6pR2N1V<_3F%e%RZ$C&$DCrjuQL|ee-^Ygx3;Ui0{l50MB}vv*>R2WV}1H
zpty}WjwTCm(jOUv>H1~TC%K#~UKcPJeuWPm*I4pMWuY-X>QO2AM(eL{TEpR$&S1T`
zGRUmG)EhWHuLQ?*Bp@h*Mi^;RyRpOARq8lN5e7>Ab*4D2Ex5lVf_l0C5bBbvG;=;6
z;c(F3JZsa_ap>lS7w`tUh8lc72!z<*H&o-bMj-_bP(@3!A)c=%99<)%lga$VBubL;
zR5uW>A6|&(uW+{f`=g_Qx(7J>g4TeBG;r`3vRfWe*Hw?II$ui`G%z)B6IndJ^$EhV
zMV=Gw74VVjH|1S`$$WJw+^u;oe=r63?CExy<j_@Rmd2DMKk}bF!qXJ31I*W=ZCIXS
znWE_;z>27e!LOWMluuoENdWA_el=$-&f*O$n(5m8l<*UO;?RGEbiwop%9eErbGJuv
zUl&+2>)dq#2b$D(+zY^Q+P?9TZ^P$<rYlV3slUck-^<akIil^f6TC&){2wXA4oZ8@
zyAI(QrCm~V<M7buY4pDWSj>ZG<$4&B&Lpk1%xs7&i1l2U+ICp>?I^1J0-yU{j-2y^
zC3XS=%-y-9sOx;*@AY?X+I79`Pl@9}Ez_@~t4ZpBY5YsQ0)*?JNjCAA=`LitEe0TU
zd!yPKX`O#17xd1o-|g=%f*zwnK*V6kOjC0oc9C_JngW1&KYsM(SUwiV*kKZEwl;ZY
zPw5tgZ$2@R*n(mFSp+~K#5~(<^FlcZIfr(!XhBR^{dX>BD{;C*R|gJJ8|7bt>pp#j
zG)fr9J>hl1Sz(>W=d@k+4Hi2zh7V&eYrvPp;a{q-n{u;Y)we$suCY|h;b@-yCdbco
zJZRLuVsklc0piLe^6vl=(xC<vSs!~biOm{=5tv9B=VFU_M%ND%Lw9%+kNto-BIf3a
zS(%~3q3C9*V5}~_b%t?COstc}elBjYmX{}YfvRF}o{qzr<64xX2$V;nM+HSa8euEZ
zqF9Gs->yn7&|LxW`SbPl_PX21i@LORDl!pdU-uisf|pj!Yd_I(-h<=Ys3`JwkO#Mo
z(V1?!8TjAK3^gIk9YgCMUmDIFEqwJxc8#-ETaz4h@_Izh>_h!siK~=!k1-ls(C4FY
zaIM~zzn*G4Riz$RMu^AXAl^cF?NQHB0p{2L@WGUZD0o;A4GgsIA`Ekj#oj-WI#WWg
zUri13aredR@tfa3>UUqh@r!T%;<J~hhtpxTl)Rp2i63!HUsHt4{P!1#;2Ujw!)7oZ
z7A^&tMVf4ju`coV07T#eI+U0^bb|2Z+x_+^mvJ$LmVRbod?&j%bX}NWCXBL*I7;4T
zIX*!yH5Rigy-p4yKlSh5zsph#y*3*HcW00bK8FX*?cu?acj)BO^0;4qYxOO)XI9yj
z@(Dk@zgw@cC7&X!{R&0|QjRnt*K}ncBLXyyef%Q|K<HKjqX_Sv_uGXU9>>RpE8GA$
z(5e^sW6TUKY$v-hCD$%D2N6TS<MOH!)qsMel7@l-HZ4oZC|!)9J1eu4QiPB0&PREW
zho+cR>NHW7v@d<JkH1yLBs;`bO*aVFP06)Yi4rHDoWO?|1n&4@h=k3K;QM|>`F=pK
zG~a)(_sWc}G*D5oF|0h?E1FC)U=RpI%BR++Oy{?@hA#|d8i>=Yj7Br@z&Q|(?Fh0X
zf@laF4()^Lb1Z2d19IO~SS&j^;EL#xjctaK&42p~z(E?NEL9AB3SpB|=}*&+MFx~g
zLtF>~)YM%wfYRk2`iCc#Q=@sCQEx5t$_Bp@N^$4a12|mex|<Wl+qOuI<&VJ=cA~pY
z<blHno{Sg)m(nsg)Kbx)IuB-LgZOy?0+}6tzv(FdCNKIwULN@h@ZtMBvE=419~@S>
zvC$-{b_f~~00I8{wcaqdBK+@nBB1(LQOwCV#<p;J-*oN4$q5>|LGn(yJf|OXf)_tX
z7cNt-S<r(`@d9Cf`_N;xHPLr6P`0uFK;fl&Ct27OPBBB>nKC>5au4O(0*oG0%v+77
zUWd6gS4E>SyYGH4`o7hG)(fi$>;zos`=-|zz+e0ZnJ7ljf!Mk!2xCWd^_VvtDzV2g
z^`X-;iQ&Q;{CMrIz6Oy5z0GZ4ZGs~#BV({ta%;W%Fwi<ogE9r%i-hg(ITBvbwz**n
zW0bpgD{MV`NoGc_17TgK6c|gHGb^o?fM08`%~IOx)o^D#5LU^kRdFc=xEr+-Q6;7D
zbF<OBr^nn$TUU~YtK`^CYLx8jG_-d~8HAD=Wwn4ZlDug&-T%E3wVb%AY%Kvbh*xXC
zt%YPfy)T$(L`$9WR3S$VO8Q_W92rCDGZ0Ism!DI$a-x+I%6Oz0NJdXYykva!(pD8b
zQfc8qQZ+p5D9{szY>?Mzp&hI^+o^YTDaWL8?o!0k^;D)9tw)vu@#~oRFRxc;Nnh3`
zbp{HAW$%uMHUb+xPrVmRsgOhyjxJ1-?l!uUh2ZmE(=I7zN$hN?wGein*ftPDVU>9D
zIoLPU0wx{`HW<VP)hVXcd?97vY@b}e%=rDl_x-Zg0f}uQ?-bt6MqeS4ceTBE<(z15
zgr=qI_EpYM2NI-WVfhi1Dj4OWQiHWA1qi+*qszQ}Q-WA+k82e9WS|t;Cae=dnLbx=
zz7GV5`KI8iHUq(+#Cj0KeNjlDiy25*^8q{s?K&j4YaK!C%sNttTk9zL2-nfF6R?hh
zP4mOVLb7Z-0(6Of2qnCmAOlQ1V~U`D=^rHN)n~+P?b^&Th{4DpNCZ~q0;e86N3YpB
zmzSYQj{yvw%+{+zN=uJaf}y0&(!v9(7ZTBj?=!$CFkP)(Id(`hsdAp)O{TY$_KzT^
z*zUGdL}qw}WG(@jR7lF$Go(w?uu=enPK^*H2g2P@ed$m|0yA3Zq)f-8EK}O)#2yR-
zDr;%FRg({t-a%<+br7cZq7WclK=XSkL@<A4<jNU%Q<8kh4(aY%0;Tlz=>bwA=`Pa#
z;Hg`8gz}0@1yc=q8E{i>gRFGX?_i5*0LnZ@^_e?<fm3(Pn-M2Iej5LOZ0j$ZfxGk+
zA96tm<b2-7E8>Oeud#$Tx#%sqEJtefTP=QX{OOl_$-!N7XJxm<rEi|N_5WmccsXsu
z&<uF<K=suNz=Ho^z<1vyU%Tp$deu)w^uV+1|F46+1>cSO(~HM*{NI^_{?*q%L^#y<
kNz>mNqkg!X+;LajiP+LBfBCqZ_+S4u)~!Fx2dch%4j-$xp#T5?

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/package.json b/src/frontend/packages/suse-theme/package.json
index 76385dc742..93db23ab00 100644
--- a/src/frontend/packages/suse-theme/package.json
+++ b/src/frontend/packages/suse-theme/package.json
@@ -1,17 +1,19 @@
 {
-  "name": "@suse/theme",
-  "version": "0.0.1",
+  "name": "@susestratos/theme",
+  "version": "1.0.0",
   "stratos": {
     "assets": {
       "assets/core": "core/assets",
-      "assets/favicon.ico": "favicon.ico"
+      "assets/favicon.ico": "favicon.ico",
+      "assets/fonts": "suse/fonts"
     },
     "theme": {
       "loadingCss": "loader/loading.css",
       "loadingHtml": "loader/loading.html"
     }
   },
-  "peerDependencies": {},
+  "peerDependencies": {
+  },
   "scripts": {
     "build": "rm -rf ../../../../dist/theme && mkdir -p ../../../../dist/theme && cp -R * ../../../../dist/theme"
   }
diff --git a/src/frontend/packages/suse-theme/sass/custom.scss b/src/frontend/packages/suse-theme/sass/colors.scss
similarity index 63%
rename from src/frontend/packages/suse-theme/sass/custom.scss
rename to src/frontend/packages/suse-theme/sass/colors.scss
index e59c4bce3d..e8e2d67fb7 100644
--- a/src/frontend/packages/suse-theme/sass/custom.scss
+++ b/src/frontend/packages/suse-theme/sass/colors.scss
@@ -1,6 +1,19 @@
-// Custom SUSE Theme
+@import '~@angular/material/theming';
 
+$white: #fff;
+$black: #000;
 
+$black-87-opacity: rgba($black, .87);
+$white-87-opacity: rgba($white, .87);
+$black-12-opacity: rgba($black, .12);
+$white-12-opacity: rgba($white, .12);
+$black-6-opacity: rgba($black, .06);
+$white-6-opacity: rgba($white, .06);
+
+$suse-secondary: #00243e;
+$suse-text-gray: #ccc;
+$suse-button-gray: #888;
+$suse-dark-blue: #06253A;
 
 // SUSE Primary Material Design pallette
 // From http://mcg.mbitson.com/#!?mcgpalette0=%233f51b5
@@ -13,4 +26,15 @@ $stratos-theme: mat-light-theme($suse-theme-primary, $suse-theme-primary, $suse-
 
 $stratos-dark-theme-supported: false;
 
-@import "custom/suse"
\ No newline at end of file
+// SUSE Brand primary colour
+$suse-primary-color: #30BA78;
+$suse-text: #fff;
+$suse-blue: #073155;
+$suse-header-bar: #0c322c;
+$suse-link-color: #008ACF;
+
+// Side nav
+$suse-side-nav-bg: #f2f2f2;
+$suse-side-nav-text: #000;
+$suse-side-nav-active-bg: $suse-primary-color;
+$suse-side-nav-active-text: #fff;
diff --git a/src/frontend/packages/suse-theme/sass/custom/suse-colors.scss b/src/frontend/packages/suse-theme/sass/custom/suse-colors.scss
deleted file mode 100644
index b444c572fd..0000000000
--- a/src/frontend/packages/suse-theme/sass/custom/suse-colors.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-$suse-primary: #00c081;
-$suse-secondary: #00243e;
-$suse-text: #fff;
-$suse-text-gray: #ccc;
-$suse-button-gray: #888;
-$suse-dark-blue: #06253A;
-$suse-blue: #073155;
\ No newline at end of file
diff --git a/src/frontend/packages/suse-theme/sass/custom/suse.scss b/src/frontend/packages/suse-theme/sass/custom/suse.scss
deleted file mode 100644
index e658d2fad9..0000000000
--- a/src/frontend/packages/suse-theme/sass/custom/suse.scss
+++ /dev/null
@@ -1,124 +0,0 @@
-// *****
-// NOTE
-// *****
-// Having this "theme" file bad practice. We need to work out if we can do without this.
-// Having this file completely sidesteps our theming and angular's component styles, potentially resulting
-// in inconsistent and unexpected styling.
-// This should only be used as a last resort - NJ.
-
-// Style overrides
-// SUSE Brand primary colour
-$suse-primary-color: #00c081;
-// Secondary blue colour
-$suse-secondary: #00243e;
-$suse-text: #fff;
-$suse-text-gray: #ccc;
-$suse-dark-blue: #06253A;
-$suse-blue: #073155;
-$suse-side-nav: $suse-secondary;
-$suse-side-nav-active: #003358;
-
-
-body.stratos {
-  .page-content > .page-header {
-    // Ensure kube icons don't appear above sub header
-    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-    color: #f5f5f5;
-  }
-
-  img.stratos-title__logo {
-    width: 160px;
-  }
-
-  h1.stratos-title__header {
-    display: initial;
-  }
-
-  .page-header .mat-toolbar.mat-primary {
-    background-color: #fff;
-    color: #333;
-  }
-
-  .user-avatar__initials {
-    background-color: $suse-primary-color;
-    color: $suse-text;
-  }
-
-  .user-avatar__large .user-avatar__initials {
-    background-color: $suse-text;
-    color: $suse-primary-color;
-  }  
-
-  .setup .page-header .mat-toolbar.mat-primary {
-    background-color: $suse-primary-color;
-    color: $suse-text;
-  }
-
-  app-page-subheader {
-    .page-subheader {
-      background-color: #fff;
-      color: #333;
-    }
-
-    .mat-tab-nav-bar.mat-background-primary {
-      .mat-tab-links {
-        background-color: #fff;
-        color: #333;
-      }
-
-      .mat-tab-link {
-        color: #333;
-      }
-
-      .mat-ink-bar {
-        background-color: $suse-primary-color;
-      }
-    }
-  }
-
-  // Use SUSE Blue Side Navigation
-  // This is themeable, we really don't need this.
-  .side-nav__inner,
-  .side-nav__top,
-  .side-nav__item--active:hover {
-    background-color: $suse-side-nav;
-  }
-
-  .side-nav__item--active,
-  .side-nav__item:hover {
-    background-color: $suse-side-nav-active;
-  }
-  .side-nav__top {
-    border-color: $suse-side-nav-active;
-  }
-  .side-nav__bottom {
-    color: $suse-text-gray;
-  }
-
-  // Remove green page underflow run on about page
-  app-about-page .page-header__underflow {
-    background-color: transparent;
-  }
-
-  // Remove background image from setup screen (e.g. upgrade screen)
-  app-intro-screen > .intro {
-    background-color: $suse-blue;
-    background-image: none;
-  }
-
-  .page-header__divider {
-    color: #333;
-  }
-
-  .page-header__menu-button-icon {
-    font-size: 30;
-    background-color: $suse-primary-color;
-    color: $suse-text;
-  }
-
-  .dark-theme {
-    .page-content > .page-header {
-      border-bottom: solid 1px rgba(255, 255, 255, 0.12);
-    }
-  }
-}
diff --git a/src/frontend/packages/suse-theme/sass/font.scss b/src/frontend/packages/suse-theme/sass/font.scss
new file mode 100644
index 0000000000..888f488882
--- /dev/null
+++ b/src/frontend/packages/suse-theme/sass/font.scss
@@ -0,0 +1,41 @@
+$work-sans-font-path: '/suse/fonts/work-sans' !default;
+
+/* work-sans-300 - latin */
+@font-face {
+  font-family: 'Work Sans';
+  font-style: normal;
+  font-weight: 300;
+  src: url('#{$work-sans-font-path}/work-sans-v8-latin-300.eot'); /* IE9 Compat Modes */
+  src: local(''),
+       url('#{$work-sans-font-path}/work-sans-v8-latin-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('#{$work-sans-font-path}/work-sans-v8-latin-300.woff2') format('woff2'), /* Super Modern Browsers */
+       url('#{$work-sans-font-path}/work-sans-v8-latin-300.woff') format('woff'), /* Modern Browsers */
+       url('#{$work-sans-font-path}/work-sans-v8-latin-300.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('#{$work-sans-font-path}/work-sans-v8-latin-300.svg#WorkSans') format('svg'); /* Legacy iOS */
+}
+/* work-sans-regular - latin */
+@font-face {
+  font-family: 'Work Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: url('#{$work-sans-font-path}/work-sans-v8-latin-regular.eot'); /* IE9 Compat Modes */
+  src: local(''),
+       url('#{$work-sans-font-path}/work-sans-v8-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('#{$work-sans-font-path}/work-sans-v8-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+       url('#{$work-sans-font-path}/work-sans-v8-latin-regular.woff') format('woff'), /* Modern Browsers */
+       url('#{$work-sans-font-path}/work-sans-v8-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('#{$work-sans-font-path}/work-sans-v8-latin-regular.svg#WorkSans') format('svg'); /* Legacy iOS */
+}
+/* work-sans-600 - latin */
+@font-face {
+  font-family: 'Work Sans';
+  font-style: normal;
+  font-weight: 600;
+  src: url('#{$work-sans-font-path}/work-sans-v8-latin-600.eot'); /* IE9 Compat Modes */
+  src: local(''),
+       url('#{$work-sans-font-path}/work-sans-v8-latin-600.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('#{$work-sans-font-path}/work-sans-v8-latin-600.woff2') format('woff2'), /* Super Modern Browsers */
+       url('#{$work-sans-font-path}/work-sans-v8-latin-600.woff') format('woff'), /* Modern Browsers */
+       url('#{$work-sans-font-path}/work-sans-v8-latin-600.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('#{$work-sans-font-path}/work-sans-v8-latin-600.svg#WorkSans') format('svg'); /* Legacy iOS */
+}
diff --git a/src/frontend/packages/suse-theme/sass/suse.scss b/src/frontend/packages/suse-theme/sass/suse.scss
new file mode 100644
index 0000000000..c0cd8bd604
--- /dev/null
+++ b/src/frontend/packages/suse-theme/sass/suse.scss
@@ -0,0 +1,13 @@
+// Custom SUSE Theme
+
+// Work Sans font
+@import '~../sass/font';
+
+body.stratos {
+
+  // Round buttons
+  button.mat-button {
+    border-radius: 20px;
+  }
+
+}

From c067218f524c950e5a83581efb4716d42f9b5ac9 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Fri, 3 Jul 2020 12:27:01 +0100
Subject: [PATCH 559/648] Final updates. Logo, login screen

---
 .../suse-login/suse-login.component.html      |   2 +-
 .../suse-login/suse-login.component.scss      |   7 +++----
 .../assets/core/custom/suse_logo.png          | Bin 1504 -> 0 bytes
 .../assets/core/custom/suse_logo.svg          |  10 +++++++++
 .../assets/core/custom/susecon-logo.svg       |  19 ------------------
 .../suse-theme/assets/core/nav-logo.png       | Bin 1475 -> 8342 bytes
 .../packages/suse-theme/assets/favicon.ico    | Bin 1150 -> 1150 bytes
 .../packages/suse-theme/loader/loading.css    |   6 +++---
 .../packages/suse-theme/sass/colors.scss      |   1 +
 9 files changed, 18 insertions(+), 27 deletions(-)
 delete mode 100644 src/frontend/packages/suse-theme/assets/core/custom/suse_logo.png
 create mode 100644 src/frontend/packages/suse-theme/assets/core/custom/suse_logo.svg
 delete mode 100644 src/frontend/packages/suse-theme/assets/core/custom/susecon-logo.svg
 mode change 100755 => 100644 src/frontend/packages/suse-theme/assets/favicon.ico

diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html
index 37525447fb..fada407f1b 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html
@@ -37,7 +37,7 @@ <h1 class="suse-login__headline">SUSE<br>Stratos<br>Console</h1>
       <span *ngIf="config.copyright" [innerHTML]="config.copyright"></span>
     </div>
     <div class="suse-login__logo">
-      <a href="https://www.suse.com" target="_blank"><img src="/core/assets/custom/suse_logo.png"></a>
+      <a href="https://www.suse.com" target="_blank"><img src="/core/assets/custom/suse_logo.svg"></a>
     </div>
   </div>
 </div>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
index 705b180b12..5f71f6ef7c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
@@ -2,8 +2,7 @@
 
 .suse-login {
   align-items: center;
-  background-color: $suse-blue;
-  border-bottom: 10px solid $suse-primary-color;
+  background-color: $suse-dark-green;
   display: flex;
   flex-direction: column;
   width: 100%;
@@ -16,7 +15,7 @@
     flex-direction: row;
   }
   &__header {
-    background-color: $suse-secondary;
+    background-color: $suse-dark-green;
     color: $suse-text;
     flex: 0 0 60px;
     font-size: 24px;
@@ -47,7 +46,7 @@
   }
   &__logo {
     img {
-      width: 79px;
+      width: 128px;
     }
   }
   &__intro {
diff --git a/src/frontend/packages/suse-theme/assets/core/custom/suse_logo.png b/src/frontend/packages/suse-theme/assets/core/custom/suse_logo.png
deleted file mode 100644
index d4dfe1e1145b8120839b7f8bf2a94f462551211e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1504
zcmV<61t0o}P)<h;3K|Lk000e1NJLTq003hE001xu1^@s61tG-D000H2Nkl<ZcmeI&
z1B_!^9Dwohv)^0Wwr$(CZQHhO+qP}n-Y&<p@0+AIIXNkBvA5HH$#2oUJvrHbaeF&n
zo;-PSM&G`Di;1cji_N%>cZh&k2wvhkwqY_FBNO}$tXmJYks7{Uo{SD4F?!)L>`^d|
zVlWE8ALpR-1xGOwMe(z{55OD6u@jC?hc9M^w+Bt}ySojd6fQw4eZ*nhfeyXk8`X!9
z9($mrmLn0WAtx#z5Tm2&5PrmHghNZ+Ml!s`Cp^XgbVev*N3}tu#8qgqvFMM;s^Jg3
zLSjVLKPnBP1U^HnO+_a}7J(o<LvloRBdQFd8p5EZ-eD`0o+BR4AhJMI!$>HlcJ)CN
zM+mf7K~%&wM0OOZkQD!-8zP|8(v=611UhK7t0)0q)WC7!SrP)J_vi>eR~>{8j>8qY
zjAr-~iO~pSFcMYp4;mxAs}7?XjP(-7a02(Cm4dMm?NJdeu>fxnguh*J5CM1!xpl~F
z;Q0U07WbgVZljp1J}YWKu8lOT49JJL!tFm`fJQzLe#J&qf{!b|aj$^bY~g}n59lCv
z0p+AKu&=OpOOY3uQ4$T%6(cbmeNZ1c5D-;9SKNitSNx^FeF981R9K^knP<o~l*CW)
zMNHJdQ5fnzeBJSqcrcW93ExvFeZ&~_#bJom6V~YiL%qSjCN9U1gxm&q{eD7hk^Z*2
zP^v2(-v>%h;itdd7uO&+)`C53g4h{%9mZ!U?G`SHC=G%i;=x<*9Fz(OYgK|=Z4360
z03lF{KwNhm#t|re!f*Ij8d3xz8>PR`Q2DZh@a%XFv6>d{V+O<~y5lg~L9CN-${P%^
z*#?HuR$8w&E(n@ixQ}=^FWm18V!7Ke{={o21tO<#y=pLKpfP?z0B%F6n3pHJ4x}l>
z0?`G(NXPwyrBHeff9aUtkQN23@T2~|X{6iJSonTZK#;@8alav*ihUVc%O5F_*UI(&
zwR9lUAQyzA*norh3bBU5{ZnHDLSStP^lNOe_7s<620-kA^zUh~1)*y9B|R7?K?gOJ
zwB|=}`XdaMG*0|xP#lz2hQXgpBhbcuiO;|Xu%$R^eiCFgLSU%ds3sgA3m-w+7=~~{
z@YzoL^1*4?(i~gfNB%%Dv_c2eK{|L#$BluZbXJJxfMHCu<G#wkP@gSW;~oaU-x+WI
z=OOkG@l>v5&tY7F*j>a?xv%jM3qv6-o{2p)^mNp~FkV7zh7J2#4Y4a)JuN;9u@}go
zfni*R*i)pp)4ncfbr_>zsK?lg8R(31NPz$+4P!hE^$2@09UW0t#l9{Gr@9F&;OFJ&
zRGzhj<2uG8kpqX32w$z-*A<LId^7vHiUqKwXYg_6v!gOXVQqopg+vE@&ZvnnSlbuW
zkoTpsw%_CBDl7KE+QL!LfuF#$<ABP2<*{)XOX2-J-$VXG8Fa){?8bdWz*wjC_g!U&
zVca%yTr_E4d-2fBzK*LL#yzxxw^rZie?V%~$34i!$0TddS~zAN#Ez)kS3^96TudXw
zn2%y8AjpLTu6C8UDCCNu0p!w|Sm$@Vh1et;_EiRQc_9zuDSV>JCHs1i%Y%Or0<nwu
z+sI|?)sQP>!@e3rE(c~oOou<T{2v?_eK8*kOjv~=h=t-${W`ND_W;e10I^UBXCQYP
z-ol=GV1b3!AQ)o7_!TW6cNdE+Sa$@{Idc%%po7{L32Xh0hp@IlWRUiCz#dmx`TZ}v
zhuXrVQ}`qZaMUo)KyCN%ue4rTyo99%qnsDnaTvGoxAa*m9BR|yXVk?UjBvyt{)XDN
zA%=-h_S<2ui^%3hb{xiLL^rTrX*`133ZfBaVxXgjF~JIB&<W`+Tt7c%;~s($hNoDK
zs_-#!-!@k4Ycx6{jRmK|rO_7?tdth<Q4=}5OytRvr~d)=dB0-;oE1?30000<MNUMn
GLSTYIU%%D>

diff --git a/src/frontend/packages/suse-theme/assets/core/custom/suse_logo.svg b/src/frontend/packages/suse-theme/assets/core/custom/suse_logo.svg
new file mode 100644
index 0000000000..140888bd1a
--- /dev/null
+++ b/src/frontend/packages/suse-theme/assets/core/custom/suse_logo.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="90" height="30" viewBox="0, 0, 90, 30">
+  <g id="Layer_1">
+    <g>
+      <path d="M33.238,14.348 C33.06,14.466 32.821,14.466 32.643,14.348 C32.351,14.154 32.323,13.748 32.559,13.513 C32.768,13.296 33.114,13.296 33.323,13.513 C33.558,13.748 33.53,14.154 33.238,14.348 M33.936,13.378 C34.208,14.532 33.17,15.571 32.015,15.299 C31.428,15.161 30.961,14.695 30.823,14.107 C30.552,12.953 31.59,11.916 32.744,12.187 C33.331,12.324 33.798,12.79 33.936,13.378 M34.214,16.233 C33.789,16.195 33.805,15.69 34.33,15.743 C34.488,15.759 35.006,15.778 35.14,15.61 C35.201,15.534 35.192,15.387 35.19,15.351 C35.112,13.99 35.021,12.195 33.338,11.426 C32.082,10.852 30.199,9.962 29.404,9.593 C29.219,9.506 29.004,9.644 29.004,9.849 C29.004,10.344 29.027,10.881 29.027,11.57 C29.027,11.702 29.048,11.968 28.996,11.997 C28.947,12.024 28.874,11.822 28.694,11.671 C28.388,11.413 27.97,11.211 27.52,11.004 C26.964,10.749 26.391,10.533 25.808,10.352 C24.633,9.988 23.418,9.764 22.195,9.642 C20.81,9.504 19.4,9.57 18.034,9.852 C15.787,10.318 13.577,11.4 11.9,12.98 C10.87,13.951 10.062,15.329 10.007,16.729 C9.929,18.71 10.484,19.774 11.505,20.87 C13.131,22.617 16.632,22.862 18.05,20.79 C18.688,19.857 18.826,18.592 18.363,17.561 C17.9,16.531 16.836,15.786 15.708,15.748 C14.832,15.719 13.899,16.165 13.564,16.974 C13.307,17.592 13.453,18.356 13.919,18.837 C14.101,19.024 14.347,19.177 14.616,19.117 C14.774,19.082 14.906,18.963 14.93,18.802 C14.966,18.565 14.758,18.412 14.63,18.23 C14.4,17.901 14.447,17.408 14.735,17.129 C14.979,16.894 15.339,16.824 15.678,16.825 C15.993,16.825 16.315,16.882 16.587,17.041 C16.97,17.266 17.224,17.678 17.312,18.113 C17.574,19.414 16.517,20.471 15.082,20.555 C14.349,20.598 13.602,20.405 13.029,19.944 C11.579,18.778 11.224,16.393 12.881,15.12 C14.455,13.911 16.442,14.223 17.613,14.851 C18.55,15.353 19.249,16.175 19.778,17.084 C20.044,17.541 20.27,18.018 20.48,18.503 C20.682,18.97 20.871,19.44 21.276,19.781 C21.543,20.008 21.874,20 22.224,20 L24.226,20 C24.498,20 24.432,19.819 24.314,19.699 C24.049,19.427 23.668,19.366 23.314,19.269 C22.508,19.047 22.59,17.979 22.813,17.979 C23.535,17.979 23.558,18 24.189,17.992 C25.102,17.98 25.377,17.927 26.09,18.191 C26.472,18.332 26.838,18.705 27.077,19.045 C27.202,19.225 27.306,19.398 27.365,19.572 C27.406,19.695 27.459,19.858 27.581,19.923 C27.587,19.927 27.594,19.93 27.601,19.932 C27.824,20.014 28.398,20 28.398,20 L29.455,20 C29.545,20.001 30.339,19.999 30.319,19.91 C30.223,19.486 29.732,19.41 29.359,19.188 C29.014,18.983 28.688,18.75 28.539,18.35 C28.462,18.143 28.508,17.666 28.641,17.492 C28.738,17.367 28.881,17.284 29.035,17.25 C29.205,17.213 29.382,17.245 29.552,17.262 C29.762,17.284 29.969,17.322 30.178,17.348 C30.583,17.4 30.991,17.422 31.398,17.411 C32.07,17.392 32.744,17.284 33.382,17.067 C33.827,16.918 33.848,16.89 34.269,16.68 C34.909,16.36 34.434,16.253 34.214,16.233" fill="#30BA78"/>
+      <path d="M74.969,19.927 C73.874,19.927 72.983,19.036 72.983,17.941 L72.983,12.055 C72.983,10.96 73.874,10.069 74.969,10.069 L79.488,10.069 C79.842,10.069 80.13,10.357 80.13,10.71 C80.13,11.064 79.842,11.352 79.488,11.352 L74.969,11.352 C74.582,11.352 74.267,11.667 74.267,12.055 L74.267,14.372 L78.698,14.372 C79.034,14.372 79.306,14.645 79.306,14.98 C79.306,15.315 79.034,15.588 78.698,15.588 L74.267,15.588 L74.267,17.941 C74.267,18.329 74.582,18.644 74.969,18.644 L79.488,18.644 C79.842,18.644 80.13,18.932 80.13,19.286 C80.13,19.64 79.842,19.927 79.488,19.927 z M54.709,20.057 C53.406,20.057 52.402,19.726 51.725,19.073 C51.049,18.422 50.707,17.442 50.707,16.16 L50.707,10.684 C50.707,10.274 51.04,9.94 51.45,9.94 C51.86,9.94 52.194,10.274 52.194,10.684 L52.194,15.964 C52.194,16.923 52.401,17.642 52.808,18.1 C53.218,18.561 53.857,18.795 54.709,18.795 C55.56,18.795 56.199,18.561 56.609,18.1 C57.016,17.642 57.223,16.923 57.223,15.964 L57.223,10.684 C57.223,10.274 57.557,9.94 57.967,9.94 C58.377,9.94 58.711,10.274 58.711,10.684 L58.711,16.16 C58.711,17.441 58.368,18.421 57.691,19.073 C57.015,19.726 56.012,20.057 54.709,20.057 M65.884,20.057 C64.206,20.057 62.928,19.58 62.086,18.64 C61.842,18.368 61.858,17.948 62.121,17.685 L62.124,17.682 L62.127,17.679 C62.26,17.547 62.438,17.474 62.626,17.474 C62.826,17.474 63.014,17.559 63.143,17.708 C63.378,17.979 63.646,18.2 63.942,18.364 C64.457,18.65 65.106,18.795 65.869,18.795 C66.594,18.795 67.172,18.667 67.587,18.415 C68.015,18.156 68.233,17.783 68.233,17.306 C68.233,16.92 68.036,16.605 67.648,16.371 C67.271,16.144 66.634,15.949 65.701,15.774 C64.795,15.605 64.065,15.394 63.53,15.146 C63.002,14.901 62.613,14.595 62.376,14.235 C62.138,13.878 62.018,13.434 62.018,12.917 C62.018,12.37 62.171,11.866 62.473,11.417 C62.776,10.968 63.221,10.606 63.794,10.341 C64.371,10.075 65.054,9.94 65.824,9.94 C66.724,9.94 67.502,10.105 68.137,10.43 C68.564,10.648 68.95,10.949 69.287,11.324 C69.543,11.611 69.519,12.055 69.232,12.314 C69.103,12.43 68.936,12.494 68.763,12.494 C68.543,12.494 68.34,12.394 68.206,12.221 C68.015,11.973 67.8,11.771 67.567,11.621 C67.135,11.343 66.554,11.202 65.839,11.202 C65.134,11.202 64.577,11.346 64.184,11.63 C63.784,11.919 63.581,12.297 63.581,12.751 C63.581,13.177 63.78,13.52 64.172,13.768 C64.553,14.011 65.213,14.214 66.188,14.389 C67.074,14.548 67.786,14.752 68.305,14.995 C68.818,15.234 69.197,15.535 69.431,15.89 C69.663,16.244 69.781,16.69 69.781,17.216 C69.781,17.781 69.618,18.285 69.297,18.713 C68.974,19.143 68.515,19.478 67.933,19.707 C67.346,19.939 66.657,20.057 65.884,20.057 M43.607,20.059 C41.929,20.059 40.651,19.582 39.809,18.642 C39.565,18.371 39.581,17.951 39.844,17.687 L39.848,17.683 C39.982,17.55 40.16,17.477 40.35,17.477 C40.55,17.477 40.738,17.562 40.866,17.711 C41.1,17.982 41.368,18.202 41.664,18.366 C42.18,18.653 42.829,18.798 43.592,18.798 C44.316,18.798 44.894,18.67 45.311,18.418 C45.739,18.159 45.956,17.786 45.956,17.309 C45.956,16.923 45.759,16.608 45.371,16.374 C44.993,16.147 44.356,15.951 43.424,15.776 C42.518,15.608 41.788,15.396 41.253,15.149 C40.725,14.904 40.336,14.597 40.098,14.238 C39.861,13.881 39.741,13.437 39.741,12.92 C39.741,12.373 39.894,11.869 40.196,11.421 C40.499,10.971 40.944,10.609 41.517,10.344 C42.093,10.078 42.776,9.943 43.547,9.943 C44.447,9.943 45.225,10.108 45.86,10.433 C46.287,10.652 46.674,10.952 47.009,11.327 C47.266,11.614 47.242,12.057 46.955,12.317 C46.826,12.433 46.659,12.497 46.485,12.497 C46.266,12.497 46.063,12.397 45.929,12.224 C45.739,11.976 45.523,11.774 45.29,11.623 C44.857,11.345 44.276,11.205 43.562,11.205 C42.856,11.205 42.3,11.349 41.906,11.633 C41.507,11.923 41.304,12.3 41.304,12.754 C41.304,13.18 41.503,13.522 41.895,13.771 C42.276,14.014 42.935,14.217 43.912,14.392 C44.796,14.551 45.508,14.754 46.029,14.997 C46.542,15.237 46.92,15.539 47.153,15.892 C47.386,16.246 47.504,16.692 47.504,17.219 C47.504,17.784 47.341,18.288 47.02,18.715 C46.697,19.146 46.238,19.481 45.655,19.71 C45.068,19.942 44.379,20.059 43.607,20.059" fill="#FFFFFF"/>
+    </g>
+  </g>
+</svg>
diff --git a/src/frontend/packages/suse-theme/assets/core/custom/susecon-logo.svg b/src/frontend/packages/suse-theme/assets/core/custom/susecon-logo.svg
deleted file mode 100644
index 056b4ead7d..0000000000
--- a/src/frontend/packages/suse-theme/assets/core/custom/susecon-logo.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="230" height="59" viewBox="0 0 230 59">
-    <defs>
-        <path id="a" d="M.18.285h23.675v28.303H.18z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <path fill="#0D2C40" d="M98.417 44.086v-.108c0-7.567 6.038-14.131 13.77-14.131 4.662 0 7.734 2.012 10.17 4.287.212.212.37.583.37.953 0 .74-.583 1.324-1.323 1.324-.319 0-.689-.106-.901-.319-2.172-2.064-4.714-3.81-8.368-3.81-6.144 0-10.91 5.134-10.91 11.592v.104c0 6.511 4.925 11.7 11.122 11.7 3.496 0 6.303-1.695 8.474-3.864.213-.213.477-.424.847-.424.636 0 1.272.635 1.272 1.27 0 .264-.106.582-.317.794-2.702 2.752-5.827 4.657-10.435 4.657-7.786 0-13.77-6.457-13.77-14.025M149.635 44.086v-.108c0-6.509-4.872-11.696-11.122-11.696-6.41 0-11.016 5.24-11.016 11.592v.104c0 6.511 4.872 11.7 11.122 11.7 6.409 0 11.016-5.24 11.016-11.592m-24.946 0v-.108c0-7.567 5.88-14.131 13.93-14.131 7.998 0 13.824 6.458 13.824 14.027v.104c0 7.57-5.88 14.133-13.93 14.133-7.998 0-13.824-6.457-13.824-14.025M156.431 31.594c0-.741.53-1.325 1.271-1.325.742 0 1.324.53 1.324 1.325v3.916c1.801-3.175 4.82-5.663 9.746-5.663 6.833 0 10.804 4.658 10.804 11.115v15.403c0 .794-.528 1.324-1.27 1.324s-1.325-.53-1.325-1.324V41.438c0-5.557-3.124-9.208-8.58-9.208-5.296 0-9.375 4.021-9.375 9.632v14.503c0 .794-.53 1.324-1.271 1.324-.742 0-1.324-.53-1.324-1.324V31.594z"/>
-        <path fill="#02D35F" d="M228.132 19.633c-9.448-15.782-34.398-24.223-42.14-17.052-6.587 6.1-3.825 33.301 9.142 40.764 9.19 5.288 42.033-8.623 32.998-23.712"/>
-        <path fill="#0D2C40" d="M12.3 41.262c-5.91-1.265-5.91-2.507-5.91-3.782 0-1.677 1.71-2.849 4.158-2.849 2.39 0 4.469.787 6.542 2.476a1.25 1.25 0 0 0 1.793-.217l1.67-2.213a1.253 1.253 0 0 0-.217-1.73c-2.928-2.348-5.924-3.396-9.715-3.396-5.475 0-9.604 3.518-9.604 8.255 0 5.7 4.574 7.48 9.526 8.555 5.614 1.183 5.614 2.467 5.614 3.674 0 1.834-1.772 3.065-4.41 3.065-3.024 0-5.306-.947-7.875-3.269a1.255 1.255 0 0 0-1.797.121l-1.78 2.105A1.252 1.252 0 0 0 .419 53.8c3.35 2.99 6.916 4.382 11.219 4.382 5.847 0 9.93-3.47 9.93-8.51 0-5.663-4.95-7.468-9.268-8.409"/>
-        <g transform="translate(23.6 29.63)">
-            <mask id="b" fill="#fff">
-                <use xlink:href="#a"/>
-            </mask>
-            <path fill="#0D2C40" d="M22.602.285h-2.87c-.691 0-1.253.56-1.253 1.253v14.767c0 4.665-2.215 7.13-6.407 7.13-4.203 0-6.517-2.596-6.517-7.311V1.538c0-.693-.561-1.253-1.253-1.253H1.433C.74.285.18.845.18 1.538v14.767C.18 23.882 4.71 28.588 12 28.588c7.311 0 11.855-4.79 11.855-12.501V1.537c0-.692-.562-1.252-1.253-1.252" mask="url(#b)"/>
-        </g>
-        <path fill="#0D2C40" d="M61.64 41.262c-5.91-1.265-5.91-2.507-5.91-3.782 0-1.677 1.71-2.849 4.158-2.849 2.39 0 4.469.787 6.543 2.476a1.252 1.252 0 0 0 1.793-.217l1.669-2.213a1.253 1.253 0 0 0-.216-1.73c-2.929-2.348-5.924-3.396-9.716-3.396-5.475 0-9.604 3.518-9.604 8.255 0 5.7 4.575 7.48 9.527 8.555 5.614 1.183 5.614 2.467 5.614 3.674 0 1.834-1.773 3.065-4.412 3.065-3.023 0-5.305-.947-7.874-3.269a1.256 1.256 0 0 0-1.797.121l-1.78 2.105a1.252 1.252 0 0 0 .124 1.742c3.35 2.99 6.915 4.382 11.218 4.382 5.847 0 9.932-3.47 9.932-8.51 0-5.663-4.952-7.468-9.27-8.409M93.327 52.702H78.895v-6.387h12.617c.693 0 1.253-.56 1.253-1.252v-2.612c0-.691-.56-1.252-1.253-1.252H78.895V35.03h14.251c.692 0 1.253-.56 1.253-1.252v-2.611c0-.693-.56-1.253-1.253-1.253H74.773c-.692 0-1.253.56-1.253 1.253v25.398c0 .692.561 1.252 1.253 1.252h18.554c.692 0 1.253-.56 1.253-1.252v-2.611c0-.693-.561-1.252-1.253-1.252"/>
-        <path fill="#FEFEFE" d="M190.816 17.352c.01.483-.417.881-.953.892-.536.012-.978-.368-.989-.849l-.534-2.366a1.475 1.475 0 1 1 2.95-.065l-.474 2.388zM198.044 29.845V17.393l-1.39.36c-.206.051-.49.103-.696.103-.926 0-1.725-.772-1.725-1.698 0-.798.515-1.467 1.313-1.699l2.55-.746c.746-.206 1.312-.334 1.853-.334h.052c1.08 0 1.956.875 1.956 1.955v14.511c0 1.081-.875 1.956-1.956 1.956a1.955 1.955 0 0 1-1.957-1.956zm14.021 2.11c-2.008 0-3.424-.463-4.763-1.286-.54-.335-.926-.9-.926-1.621 0-1.03.85-1.801 1.879-1.801.386 0 .72.128 1.03.309.927.54 1.75.797 2.883.797 2.215 0 3.399-1.672 3.656-4.09-.875.745-2.085 1.234-3.656 1.234-3.913 0-6.436-2.161-6.436-5.815v-.051c0-3.628 2.806-6.304 6.874-6.304 2.42 0 3.836.592 5.2 1.956 1.288 1.286 2.138 3.242 2.138 6.792v.052c0 5.84-2.755 9.828-7.879 9.828zm.747-9.751c1.957 0 3.09-1.132 3.09-2.676v-.051c0-1.596-1.185-2.753-3.167-2.753-1.957 0-3.064 1.132-3.064 2.727v.051c0 1.596 1.184 2.702 3.141 2.702z"/>
-        <path fill="#0D2C40" d="M183.372 57.396v-2.664h-.997v-.357h2.396v.357h-1v2.664zM185.17 57.396v-3.02h.601l.716 2.138c.066.2.114.348.144.448.034-.11.088-.272.161-.485l.723-2.102h.539v3.021h-.386v-2.528l-.878 2.528h-.36l-.875-2.571v2.571h-.386z"/>
-    </g>
-</svg>
diff --git a/src/frontend/packages/suse-theme/assets/core/nav-logo.png b/src/frontend/packages/suse-theme/assets/core/nav-logo.png
index 10f43b4e05d3f34c2ab44a2afe6c19fe38ccb397..7e907dd3d9304d4d55734591024eeaad80cb08f0 100644
GIT binary patch
literal 8342
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

literal 1475
zcmdUv`8yK~0LSNijfQQK=`A-I+9PkPF-Nmuk{Qd<HO!Ur)=CO*bG&1YiOD%_83}K>
za?{~$N>-Seve)q_y-Xy@nd{xZ@qVA@`~Cd-{ppkL<>?Ai)l~%m03f^@)?3CLS&dZ`
zWJ}~b&&u$~%Y%fIarb|czPhSn+1=yO-kv^yuS)tGbT_D~fHD51wdOkNLuaIp#z#?q
zh<#}Z`P9mE&xwk>E2fLxPqGm<8GiCF;=Rpj7B{P|vd@qJ0L5%P_5{hF|Fuw3z;@EY
zA^v0@Nf%TlV$|HlF<*Y{k_+Grr_@5BMz26XE3JAS-SD0JI`Zd0!cI{CAj3>$BJR6O
zf<mtORQi0iqpwEg+nA;ZSB(eKajN!VYC)lz9ehBL#PL15d%@N&l{yrmZ&L4o-+DhI
zRrzCsxAm%IUsyR)@7&Os#k+dLRL+c@;cfsb2l_50RtMbv6TN52288*ML+GrwaN4)I
z(%MknmQfDR$RZJ&jxyWmJ@BDEMI%EzG5VZVisuhQZ}`CF>Tcwnav12Pv(dxCHfWRA
z^4#I+%b~STQ}}l-SxQxtIJh)AifU;ov8I;|KE}9%;4MNSt+ysZeo?et%ze9G%wtR9
zVoSNgC_i3Mcn7)}oB(ADxGt9y@yF<`b6x0iLfE3oQMqlxW=L;b>;f<aYC{b`gmOIH
zUI5#RG|k?+{lji=E;T5U`e@Y`oy^R!RbQy-7jbh|lIWasfd$BG-%XZRBbwojNcT$R
z3+T_=M&<mWhdx#S8}=K>icpIgj~VV46eluJ3WAevHcBxMl-{GMwTw}Kfu4Q0t`Nsu
zFWWpUrac{{?3}Nf%A!SqEwwYj>_W}+UOK5nCdEBJrh>1hA5u=ajl-`#mm~PPBMb+g
z@VhoV({i&KL#Lk-_OF;2o1pX=^JTF?1dmH=y(;-upOtADX)3nQM$V5=zQv9dDidB!
zL=^YL!eDFrb(NuKbizNm<OeZV4T;^fSJaCD*g>Y8N|Rg&l@IMp-f)%DA8OZEuncUw
z!d83e9R*ewbq#OA?=ohES76SO`9*84<27T)g1Z-(GvOu;_uC)k$4}baZ1$1dx-gEQ
z`Z3p`JO{4Sb}5l65`6@j-)IZ<5hFYQ?R#%F>uwCcvsL3a3qFOoJ4G$a)v3HIq=geZ
zX7^e{I6;HoAUq1Ry1NL~-qw}gLHe*^-F$;x5fF7OY!V`ugk4s@|En|<#i|<adtKYO
z!hAl-(SeFvo^6k1f{S5_*I|1P#3Nk#`duCat*wZy4>kgfAjlH$PPG7kO}sHOpn`bm
zqZnv@UzO-ulQWtvTxdSfpr>~hknT0&Kb``~>x9jj$_L+D90cM%%q=&PYc-jYY;tXU
zUbI=)?QM-iiqHDY{^HZMuK27&tXODYH9Owqt?1M!M-tWaYjDc8l0AC8<q<z2%3wx=
zM^{rK^|odJiT8@?hwViSFCnlvNIC?N*NRMVpit)rDE`@T{3%Q%3$K`6rM<`07*c~=
ztXpD{wG3cvp1M_6nB<h7d}IUJ?>bXl4QC-nbB(hC!GC`~NSQctx@7q3p>8`1q=XC1
zBApJ!#5?Q>R-^BD8bRuaASUh5X7U!*Beaa7>~ydP`(|UB9EQ1e=60_{fujg>T0P<6
zM##mM1in<(eJ!5b0jY*N=C38`s~E6+`;~Yx>28Z@v+)?Lw#8m>iTQjPDxn~=t5~v@
zl)BX7|H~BGV^vf)YCFvR!r0WGD2Y2hcCyY)vvPpt{E4zIGm4V>Z+Ugew8tZkVZR@d
P=?#F#d17lZfyw^?5q=K)

diff --git a/src/frontend/packages/suse-theme/assets/favicon.ico b/src/frontend/packages/suse-theme/assets/favicon.ico
old mode 100755
new mode 100644
index b40de3b51d8878713806e26f532f0dad5c8d7772..d8c1be09e70e446b543c259b242d26a3f462e4fa
GIT binary patch
literal 1150
zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYInf&c&i*8wrHpbps_Vl|<w
z1DOF7BgI~HBj9?!{CxNS`s+jgzyJP(u7)6g_nqngD|Q+DUvNGTOuza12(IV%-=A>y
zzyJUK|N8p_&Id8R{CW@817iRA`wOVz-~VZ+;y~R0_4};;Z@Jk6W`Fzr5v=a*x5r>U
zj5zvm+5fdy8~-1BwEX}2Yc2n80Q~^cbL8O?u=*({qyJAn5ea5D?zjDa`soIs+7<tw
ze7p)a;?|pEaQja@UiJU%v(5iOZU*@WAFkPB_W$FLmtZqs>Q-E?`ak_t0$zQUyA8p5
z=A23Yzvu1@m^c2{?X|+I4`v652HDej*bC@R)UX8krRRu0hB>VVo&RsW*$a%@&tSP#
zS8D(N`}Y@a_W(2CX^;$efb$U<`oLPy@*pYhfal)_><kPIj1Y`$9zHfqJxDJAR;Owb

literal 1150
zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYI-D@e%qH;>46vPmomG$qxK
zyYEc*sn})kf5G{@{~-F!*GGylGfJxp)M4z}x*DbO>S8q*A4G>{+1Y{gfWV)>zyALN
z!fB`Cc7f#T_gOvIa<iut#QygCqXbCZ+i#B*KztZ*PEhh*d$sZZu}91QufNvv|HkV>
z|ABhe9eKDU3#5L^$>>*;Pekqku^ac>zH>{`@I3Ztg=b)fg(Jue_hbzZnEfXnulj%X
z+2;Sh|NaE~10;?M*X%L-?~$zS4l)C%<`GEUipy31r=Lo|sRyK{a<?JauXE0%|F?;i
z2mt8^fx5j`4{_OrE)KG%^RU-{klP`;A>^$$$DDhP_#XtSKaY%C4>}*;db2m-=9?p~
xAn{dKYBQp8T&<Axj<U%Mf&c#*7?AOCAiwE75c4xIG%!N&0U-Us9911m4*+zg{VD(e

diff --git a/src/frontend/packages/suse-theme/loader/loading.css b/src/frontend/packages/suse-theme/loader/loading.css
index 034324c227..8d22c162f3 100644
--- a/src/frontend/packages/suse-theme/loader/loading.css
+++ b/src/frontend/packages/suse-theme/loader/loading.css
@@ -1,6 +1,6 @@
 .stratos-initial-load-spinner-container {
   align-items: center;
-  background-color: #0D2C40;
+  background-color: #f2f2f2;
   display: flex;
   justify-content: center;
   height: 100%;
@@ -16,9 +16,9 @@
 .stratos-initial-load-spinner {
   animation: stratos-initial-load-animate 1s infinite linear;
   box-sizing: border-box;
-  border: 5px solid rgba(86, 107, 121,0.45);
+  border: 5px solid rgba(12, 50, 44, 0.45);
   border-radius: 50%;
-  border-top-color: #00B2E2;
+  border-top-color: #30BA78;
   display: inline-block;
   height: 128px;
   margin: 0 auto;
diff --git a/src/frontend/packages/suse-theme/sass/colors.scss b/src/frontend/packages/suse-theme/sass/colors.scss
index e8e2d67fb7..f1c3a1b897 100644
--- a/src/frontend/packages/suse-theme/sass/colors.scss
+++ b/src/frontend/packages/suse-theme/sass/colors.scss
@@ -30,6 +30,7 @@ $stratos-dark-theme-supported: false;
 $suse-primary-color: #30BA78;
 $suse-text: #fff;
 $suse-blue: #073155;
+$suse-dark-green: #0c322c;
 $suse-header-bar: #0c322c;
 $suse-link-color: #008ACF;
 

From 3de25e681d42fd0a1aeff28905f461354987bc25 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Sat, 4 Jul 2020 14:49:08 +0100
Subject: [PATCH 560/648] Add ability to connect to k3s clusters

---
 .../kube-config-auth.helper.ts                | 25 +++++-
 .../kube-config-import.component.ts           |  3 +
 .../kube-config.types.ts                      |  2 +
 .../kubernetes/kubernetes-entity-generator.ts |  3 +-
 .../plugins/kubernetes/auth/basic_auth.go     | 78 +++++++++++++++++++
 src/jetstream/plugins/kubernetes/auth/cert.go |  2 +-
 src/jetstream/plugins/kubernetes/main.go      |  1 +
 7 files changed, 110 insertions(+), 4 deletions(-)
 create mode 100644 src/jetstream/plugins/kubernetes/auth/basic_auth.go

diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-auth.helper.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-auth.helper.ts
index a179142f57..158d36edd0 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-auth.helper.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-auth.helper.ts
@@ -88,8 +88,6 @@ export class KubeConfigAuthHelper {
     }
 
     const authProvider = user.user['auth-provider'];
-
-
     if (authProvider && authProvider.config) {
       if (authProvider.config['cmd-path'] && authProvider.config['cmd-path'].indexOf('gcloud') !== -1) {
         // GKE
@@ -116,6 +114,20 @@ export class KubeConfigAuthHelper {
       };
     }
 
+    // Username and password auth
+    if (user.user.username && user.user.password) {
+      const authData = {
+        authType: 'creds',
+        subType: '',
+        values: {
+          username: user.user.username,
+          password: user.user.password
+        }
+      };
+      user._authData = authData;
+      return {};
+    }
+
     return { message: 'Authentication mechanism is not supported', warning: true };
   }
 
@@ -150,7 +162,16 @@ export class KubeConfigAuthHelper {
           systemShared: false,
           bodyContent: endpointFormInstance.getBody()
         };
+      } else {
+        // Use values as is
+        data = {
+          authType: authType.value,
+          authVal: user._authData.values,
+          systemShared: false,
+          bodyContent: null
+        };
       }
+
       ref.destroy();
     }
     return data;
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts
index 5717a7da2e..63214444f5 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts
@@ -159,6 +159,7 @@ export class KubeConfigImportComponent implements OnDestroy {
 
   private doConnect(connect: KubeConfigImportAction, next: KubeConfigImportAction[]) {
     if (!connect.user) {
+      connect.state.next({ message: 'Can not connect - not user specified', error: true });
       return;
     }
     const helper = new KubeConfigAuthHelper();
@@ -175,6 +176,8 @@ export class KubeConfigImportComponent implements OnDestroy {
         }
         this.processAction(next);
       }));
+    } else {
+      connect.state.next({ message: 'Can not connect - could not get user auth data', error: true });
     }
   }
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.types.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.types.ts
index 49bd4dbbf3..41cbb80198 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.types.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.types.ts
@@ -52,6 +52,8 @@ export interface KubeConfigFileUserDetail {
   'client-key-data'?: string;
   token?: string;
   exec?: any
+  username?: string;
+  password?: string;
 }
 
 export interface KubeConfigFileContext {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts
index 4dad2ba7e2..32efb48bf7 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts
@@ -1,5 +1,6 @@
 import { Validators } from '@angular/forms';
 
+import { BaseEndpointAuth } from '../../../../core/src/core/endpoint-auth';
 import {
   StratosBaseCatalogEntity,
   StratosCatalogEndpointEntity,
@@ -128,7 +129,7 @@ export function generateKubernetesEntities(): StratosBaseCatalogEntity[] {
     iconFont: 'stratos-icons',
     logoUrl: '/core/assets/custom/kubernetes.svg',
     urlValidation: undefined,
-    authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.CERT_AUTH], kubeAuthTypeMap[KubeEndpointAuthTypes.CONFIG]],
+    authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.CERT_AUTH], kubeAuthTypeMap[KubeEndpointAuthTypes.CONFIG], BaseEndpointAuth.UsernamePassword],
     renderPriority: 4,
     subTypes: [
       {
diff --git a/src/jetstream/plugins/kubernetes/auth/basic_auth.go b/src/jetstream/plugins/kubernetes/auth/basic_auth.go
new file mode 100644
index 0000000000..4a7eaaf1a0
--- /dev/null
+++ b/src/jetstream/plugins/kubernetes/auth/basic_auth.go
@@ -0,0 +1,78 @@
+package auth
+
+import (
+	"encoding/base64"
+	"errors"
+	"fmt"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	"github.com/labstack/echo"
+	log "github.com/sirupsen/logrus"
+	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
+)
+
+const authConnectTypeBasicAuth = "creds"
+
+// KubeBasicAuth is HTTP Basic Authentication
+type KubeBasicAuth struct {
+	portalProxy interfaces.PortalProxy
+}
+
+// InitKubeBasicAuth creates a GKEKubeAuth
+func InitKubeBasicAuth(portalProxy interfaces.PortalProxy) *KubeBasicAuth {
+	return &KubeBasicAuth{portalProxy: portalProxy}
+}
+
+// GetName returns the provider name
+func (c *KubeBasicAuth) GetName() string {
+	return authConnectTypeBasicAuth
+}
+
+func (c *KubeBasicAuth) AddAuthInfo(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error {
+	// Decode the token
+	authString, err := base64.StdEncoding.DecodeString(tokenRec.AuthToken)
+	if err != nil {
+		return err
+	}
+
+	// Password is separated by a colon from the username
+	info.Username = tokenRec.RefreshToken
+	basicAuth := string(authString)
+	info.Password = basicAuth[len(info.Username)+1:]
+
+	return nil
+}
+
+func (c *KubeBasicAuth) FetchToken(cnsiRecord interfaces.CNSIRecord, ec echo.Context) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error) {
+
+	log.Info("FetchToken")
+
+	username := ec.FormValue("username")
+	password := ec.FormValue("password")
+
+	if len(username) == 0 || len(password) == 0 {
+		return nil, &cnsiRecord, errors.New("Needs username and password")
+	}
+
+	authString := fmt.Sprintf("%s:%s", username, password)
+	base64EncodedAuthString := base64.StdEncoding.EncodeToString([]byte(authString))
+
+	tr := &interfaces.TokenRecord{
+		AuthType:     interfaces.AuthTypeHttpBasic,
+		AuthToken:    base64EncodedAuthString,
+		RefreshToken: username,
+	}
+
+	return tr, &cnsiRecord, nil
+}
+
+func (c *KubeBasicAuth) GetUserFromToken(cnsiGUID string, cfTokenRecord *interfaces.TokenRecord) (*interfaces.ConnectedUser, bool) {
+	return &interfaces.ConnectedUser{
+		GUID: "Kube Cert Auth",
+		Name: "Cert Auth",
+	}, true
+}
+
+func (c *KubeBasicAuth) RegisterJetstreamAuthType(portal interfaces.PortalProxy) {
+	// Not needed - 'creds' is built-in
+}
diff --git a/src/jetstream/plugins/kubernetes/auth/cert.go b/src/jetstream/plugins/kubernetes/auth/cert.go
index 68c5b37231..ed59d5d6f6 100644
--- a/src/jetstream/plugins/kubernetes/auth/cert.go
+++ b/src/jetstream/plugins/kubernetes/auth/cert.go
@@ -77,7 +77,7 @@ func (c *CertKubeAuth) extractCerts(ec echo.Context) (*KubeCertificate, error) {
 }
 
 func (c *CertKubeAuth) FetchToken(cnsiRecord interfaces.CNSIRecord, ec echo.Context) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error) {
-	log.Info("FetchCerts")
+	log.Debug("Kube Certs - FetchToken")
 
 	kubeCertAuth, err := c.extractCerts(ec)
 	if err != nil {
diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index 8a9bcee37f..fb374deb69 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -140,6 +140,7 @@ func (c *KubernetesSpecification) Init() error {
 	c.AddAuthProvider(auth.InitOIDCKubeAuth(c.portalProxy))
 	c.AddAuthProvider(auth.InitKubeConfigAuth(c.portalProxy))
 	c.AddAuthProvider(auth.InitKubeTokenAuth(c.portalProxy))
+	c.AddAuthProvider(auth.InitKubeBasicAuth(c.portalProxy))
 
 	// Kube dashboard is enabled by Tech Preview mode
 	c.portalProxy.GetConfig().PluginConfig[kubeDashboardPluginConfigSetting] = strconv.FormatBool(c.portalProxy.GetConfig().EnableTechPreview)

From ed9c6aed8075522698871a901c950f2b77922719 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Sun, 5 Jul 2020 17:32:39 +0100
Subject: [PATCH 561/648] Improve recent and favourites display

---
 .../cloud-foundry/src/cf-entity-generator.ts  |  13 +-
 src/frontend/packages/core/src/app.module.ts  |   4 +-
 .../favorites-meta-card.component.html        |   7 +-
 .../favorites-meta-card.component.scss        |   9 +-
 .../favorites-meta-card.component.ts          |  22 +++
 .../page-header.component.theme.scss          |   3 -
 .../page-header/page-header.component.ts      |   2 +
 .../recent-entities.component.html            |  51 ++----
 .../recent-entities.component.scss            |  11 ++
 .../recent-entities.component.ts              | 165 ++++--------------
 .../src/actions/recently-visited.actions.ts   |  12 +-
 .../entity-catalog/entity-catalog.types.ts    |   1 +
 .../recently-visited.reducer.helpers.ts       | 150 +++++-----------
 .../recently-visited.reducer.ts               |  14 +-
 .../store/src/types/recently-visited.types.ts |  20 +--
 15 files changed, 174 insertions(+), 310 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 89727e826e..07b5489a05 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
@@ -1143,10 +1143,11 @@ function generateCfApplicationEntity(endpointDefinition: StratosEndpointExtensio
     label: 'Application',
     labelPlural: 'Applications',
     endpoint: endpointDefinition,
+    icon: 'apps',
     tableConfig: {
       rowBuilders: [
         ['Name', (entity) => entity.entity.name],
-        ['Creation Date', (entity) => entity.metadata.created_at]
+        ['Created', (entity) => entity.metadata.created_at]
       ]
     }
   };
@@ -1172,7 +1173,7 @@ function generateCfApplicationEntity(endpointDefinition: StratosEndpointExtensio
         getLink: metadata => `/applications/${metadata.cfGuid}/${metadata.guid}/summary`,
         getGuid: metadata => metadata.guid,
         getLines: () => ([
-          ['Creation Date', (meta) => meta.createdAt]
+          ['Created', (meta) => meta.createdAt]
         ])
       },
       actionBuilders: applicationActionBuilder
@@ -1191,6 +1192,8 @@ function generateCfSpaceEntity(endpointDefinition: StratosEndpointExtensionDefin
     label: 'Space',
     labelPlural: 'Spaces',
     endpoint: endpointDefinition,
+    icon: 'virtual_space',
+    iconFont: 'stratos-icons'
   };
   cfEntityCatalog.space = new StratosCatalogEntity<ISpaceFavMetadata, APIResource<ISpace>, SpaceActionBuilders>(
     spaceDefinition,
@@ -1210,7 +1213,7 @@ function generateCfSpaceEntity(endpointDefinition: StratosEndpointExtensionDefin
           createdAt: moment(space.metadata.created_at).format('LLL'),
         }),
         getLines: () => ([
-          ['Creation Date', (meta) => meta.createdAt]
+          ['Created', (meta) => meta.createdAt]
         ]),
         getLink: metadata => `/cloud-foundry/${metadata.cfGuid}/organizations/${metadata.orgGuid}/spaces/${metadata.guid}/summary`,
         getGuid: metadata => metadata.guid
@@ -1227,6 +1230,8 @@ function generateCfOrgEntity(endpointDefinition: StratosEndpointExtensionDefinit
     label: 'Organization',
     labelPlural: 'Organizations',
     endpoint: endpointDefinition,
+    icon: 'organization',
+    iconFont: 'stratos-icons'    
   };
   cfEntityCatalog.org = new StratosCatalogEntity<
     IOrgFavMetadata,
@@ -1252,7 +1257,7 @@ function generateCfOrgEntity(endpointDefinition: StratosEndpointExtensionDefinit
         }),
         getLink: metadata => `/cloud-foundry/${metadata.cfGuid}/organizations/${metadata.guid}`,
         getLines: () => ([
-          ['Creation Date', (meta) => meta.createdAt]
+          ['Created', (meta) => meta.createdAt]
         ]),
         getGuid: metadata => metadata.guid
       }
diff --git a/src/frontend/packages/core/src/app.module.ts b/src/frontend/packages/core/src/app.module.ts
index 37614cdb52..840ed60377 100644
--- a/src/frontend/packages/core/src/app.module.ts
+++ b/src/frontend/packages/core/src/app.module.ts
@@ -231,11 +231,12 @@ export class AppModule {
       }
     );
 
+    // This updates the names of any recents
     debouncedApiRequestData$.pipe(
       withLatestFrom(recents$)
     ).subscribe(
       ([entities, recents]) => {
-        Object.values(recents.entities).forEach(recentEntity => {
+        Object.values(recents).forEach(recentEntity => {
           const mapper = this.favoritesConfigMapper.getMapperFunction(recentEntity);
           const entityKey = entityCatalog.getEntityKey(recentEntity);
           if (entities[entityKey] && entities[entityKey][recentEntity.entityId]) {
@@ -243,6 +244,7 @@ export class AppModule {
             const entityToMetadata = this.favoritesConfigMapper.getEntityMetadata(recentEntity, entity);
             const name = mapper(entityToMetadata).name;
             if (name && name !== recentEntity.name) {
+              // Update the entity name
               this.store.dispatch(new SetRecentlyVisitedEntityAction({
                 ...recentEntity,
                 name
diff --git a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.html b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.html
index d9e2c31a66..3c28d55952 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.html
+++ b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.html
@@ -3,8 +3,11 @@
   [entityConfig]="entityConfig">
   <app-meta-card-title class="fav-meta-card__header">
     <div class="fav-meta-card__header">
-      <div *ngIf="!compact" class="fav-meta-card__icon-panel">
-        <img class="fav-meta-card__icon" *ngIf="iconUrl$ | async as imageUrl" [src]="imageUrl" />
+      <div *ngIf="!compact" class="fav-meta-card__logo-panel">
+        <img class="fav-meta-card__logo" *ngIf="icon.logoUrl" [src]="icon.logoUrl" />
+      </div>
+      <div *ngIf="compact" class="fav-meta-card__icon-panel">
+        <mat-icon class="fav-meta-card__icon" *ngIf="icon.icon && !icon.logoUrl" [fontSet]="icon.iconFont">{{ icon.icon }}</mat-icon>
       </div>
       <div class="fav-meta-card__header-text-panel">
         <h2 class="fav-meta-card__header-text" *ngIf="!compact">
diff --git a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.scss b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.scss
index 7a93a9edb2..0a144cfe98 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.scss
+++ b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.scss
@@ -35,18 +35,21 @@
   }
   &__header {
     display: flex;
-    white-space: nowrap;
   }
-  &__icon-panel {
+  &__logo-panel {
     display: flex;
     justify-content: center;
     width: 56px;
   }
-  &__icon {
+  &__logo {
     height: 48px;
     margin-right: 8px;
     width: auto;
   }
+  &__icon {
+    margin-right: 4px;
+    opacity: .7;
+  }
   &__panel {
     display: flex;
     :first-child {
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 40d15028a1..1b00ca09a0 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
@@ -14,6 +14,12 @@ import { isEndpointConnected } from '../../../features/endpoints/connect.service
 import { ConfirmationDialogConfig } from '../confirmation-dialog.config';
 import { ConfirmationDialogService } from '../confirmation-dialog.service';
 
+interface FavoriteIconData {
+  hasIcon: boolean;
+  icon?: string;
+  iconFont?: string;
+  logoUrl?: string;
+}
 
 @Component({
   selector: 'app-favorites-meta-card',
@@ -64,6 +70,9 @@ export class FavoritesMetaCardComponent {
   // Optional icon for the favorite
   public iconUrl$: Observable<string>;
 
+  // Optional icon for the favorite
+  public icon: FavoriteIconData;
+
   @Input()
   set favoriteEntity(favoriteEntity: IFavoriteEntity) {
     if (!this.placeholder && favoriteEntity) {
@@ -88,6 +97,19 @@ export class FavoritesMetaCardComponent {
         this.iconUrl$ = observableOf('');
       }
 
+      console.log(favoriteEntity);
+      const entityDef = entityCatalog.getEntity(this.favorite.endpointType, this.favorite.entityType);
+      console.log(entityDef);
+
+      this.icon = {
+        hasIcon: !!entityDef.definition.logoUrl || !!entityDef.definition.icon,
+        icon: entityDef.definition.icon,
+        iconFont: entityDef.definition.iconFont,
+        logoUrl: entityDef.definition.logoUrl,
+      };
+
+      console.log(this.icon);
+
       this.setConfirmation(this.prettyName, favorite);
 
       const config = cardMapper && favorite && favorite.metadata ? cardMapper(favorite.metadata) : null;
diff --git a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss
index 1ee29645e9..a66c052f39 100644
--- a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss
@@ -39,9 +39,6 @@
     &__menu-separator {
       background-color: mat-color($foreground, divider);
     }
-    &__history {
-      color: $subdued;
-    }
     &__underflow {
       background-color: $underflow-background;
       color: $underflow-foreground;
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 6e836e74b3..a0ee69b500 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
@@ -2,6 +2,7 @@ import { TemplatePortal } from '@angular/cdk/portal';
 import { AfterViewInit, Component, Input, OnDestroy, TemplateRef, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Store } from '@ngrx/store';
+import * as moment from 'moment';
 import { Observable } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 
@@ -96,6 +97,7 @@ export class PageHeaderComponent implements OnDestroy, AfterViewInit {
         const { name, routerLink } = mapperFunction(favorite.metadata);
         this.store.dispatch(new AddRecentlyVisitedEntityAction({
           guid: favorite.guid,
+          date: moment().valueOf(),
           entityType: favorite.entityType,
           endpointType: favorite.endpointType,
           entityId: favorite.entityId,
diff --git a/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.html b/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.html
index 4aa002471d..70e96a89cc 100644
--- a/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.html
+++ b/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.html
@@ -1,27 +1,7 @@
+<!-- history is set when used in the dropdown menu to only show recent history-->
+
 <mat-card *ngIf="!history && ((hasHits$ | async) === true)">
-  <mat-tab-group dynamicHeight="true" animationDuration="0ms"
-    mat-stretch-tabs>
-    <mat-tab label="Top">
-      <div class="recent-tab" *ngIf="frecentEntities$ | async as frecentEntities">
-        <div *ngIf="frecentEntities && frecentEntities.length > 0" class="recent-entities">
-          <div [routerLink]="countedEntity.entity.routerLink" [ngClass]="{clickable: !!countedEntity.entity.routerLink}"
-            class="recent-entity" *ngFor="let countedEntity of frecentEntities">
-            <a class="recent-entity--name" *ngIf="countedEntity.entity.routerLink as routerLink; else noLink">{{
-              countedEntity.entity.name }}</a>
-            <ng-template #noLink>
-              <div class="recent-entity--name">{{ countedEntity.entity.name }}</div>
-            </ng-template>
-            <div class="type-info">
-              <span>{{ countedEntity.subText$ | async }}</span>
-            </div>
-          </div>
-        </div>
-      </div>
-    </mat-tab>
-    <mat-tab label="Recent">
-      <ng-container *ngTemplateOutlet="historyTemplate"></ng-container>
-    </mat-tab>
-  </mat-tab-group>
+  <ng-container *ngTemplateOutlet="historyTemplate"></ng-container>
 </mat-card>
 
 <ng-container *ngIf="!history && ((hasHits$ | async) === false)">
@@ -39,16 +19,23 @@
     <div *ngIf="recentEntities && recentEntities.length > 0" class="recent-entities">
       <div [routerLink]="countedEntity.entity.routerLink" [ngClass]="{clickable: !!countedEntity.entity.routerLink}"
         class="recent-entity" *ngFor="let countedEntity of recentEntities">
-        <a class="recent-entity--name" *ngIf="countedEntity.entity.routerLink as routerLink; else noLink">{{
-          countedEntity.entity.name }}</a>
-        <ng-template #noLink>
-          <div class="recent-entity--name">{{ countedEntity.entity.name }}</div>
-        </ng-template>
-        <div class="type-info" *ngIf="countedEntity.mostRecentHit">
-          {{ countedEntity.mostRecentHit | amTimeAgo }}
+        <div class="recent-entity__icon-container" *ngIf="countedEntity.icon">
+          <mat-icon class="recent-entity__icon" [fontSet]="countedEntity.iconFont">{{ countedEntity.icon }}</mat-icon>
         </div>
-        <div class="type-info">
-          <span>{{ countedEntity.subText$ | async }}</span>
+        <div>
+          <a class="recent-entity--name" *ngIf="countedEntity.entity.routerLink as routerLink; else noLink">{{
+            countedEntity.entity.name }}</a>
+          <ng-template #noLink>
+            <div class="recent-entity--name">{{ countedEntity.entity.name }}</div>
+          </ng-template>
+          <!-- Don't show the date 
+          <div class="type-info" *ngIf="countedEntity.mostRecentHit">
+            {{ countedEntity.mostRecentHit | amTimeAgo }}
+          </div>
+          -->
+          <div class="type-info">
+            <span>{{ countedEntity.subText$ | async }}</span>
+          </div>
         </div>
       </div>
     </div>
diff --git a/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.scss b/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.scss
index 88f583825a..eb5f3810aa 100644
--- a/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.scss
+++ b/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.scss
@@ -5,6 +5,7 @@ $spacing: 10px;
   opacity: .6;
 }
 .recent-entity {
+  display: flex;
   outline: 0;
   padding: $spacing;
   & + & {
@@ -21,6 +22,16 @@ $spacing: 10px;
   &--name {
     word-break: break-all;
   }
+  &__icon {
+    opacity: .7;
+  }
+  &__icon-container {
+    display: flex;
+    height: 24px;
+    margin-right: 4px;
+    text-align: center;
+    width: 24px;
+  }
 }
 
 .clickable {
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 86af699f5c..21450712c2 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
@@ -1,34 +1,29 @@
 import { Component, Input } from '@angular/core';
 import { Store } from '@ngrx/store';
+import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog';
+import {
+  MAX_RECENT_COUNT,
+} from 'frontend/packages/store/src/reducers/current-user-roles-reducer/recently-visited.reducer.helpers';
 import * as moment from 'moment';
 import { Observable, of as observableOf } from 'rxjs';
-import { filter, map } from 'rxjs/operators';
+import { first, map } from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
 import { endpointEntityType } from '../../../../../store/src/helpers/stratos-entity-factory';
 import { endpointEntitiesSelector } from '../../../../../store/src/selectors/endpoint.selectors';
 import { recentlyVisitedSelector } from '../../../../../store/src/selectors/recently-visitied.selectors';
-import {
-  IEntityHit,
-  IRecentlyVisitedEntity,
-  IRecentlyVisitedState,
-} from '../../../../../store/src/types/recently-visited.types';
-
-
-interface IRelevanceModifier {
-  time: number;
-  modifier: number;
-}
-interface IRelevanceModifiers {
-  high: IRelevanceModifier;
-  medium: IRelevanceModifier;
-  low: IRelevanceModifier;
-}
+import { IRecentlyVisitedEntity } from '../../../../../store/src/types/recently-visited.types';
 
 class RenderableRecent {
   public mostRecentHit: moment.Moment;
   public subText$: Observable<string>;
+  public icon: string;
+  public iconFont: string;
   constructor(readonly entity: IRecentlyVisitedEntity, private store: Store<AppState>) {
+    const catalogEntity = entityCatalog.getEntity(entity.endpointType, entity.entityType);
+    this.icon = catalogEntity.definition.icon;;
+    this.iconFont = catalogEntity.definition.iconFont;
+
     if (entity.entityType === endpointEntityType) {
       this.subText$ = observableOf(entity.prettyType);
     } else {
@@ -44,110 +39,6 @@ class RenderableRecent {
   }
 }
 
-class CountedRecentEntity {
-  public count = 0;
-  public mostRecentHitUnix: number;
-  public guid: string;
-  private checkAndSetDate(date: number) {
-    if (!this.mostRecentHitUnix || date > this.mostRecentHitUnix) {
-      this.mostRecentHitUnix = date;
-    }
-  }
-  public applyHit(hit: IEntityHit, modifier?: number) {
-    const amount = modifier ? 1 * modifier : 1;
-    this.count += amount;
-    this.checkAndSetDate(hit.date);
-  }
-  constructor(hit: IEntityHit) {
-    this.guid = hit.guid;
-    this.checkAndSetDate(hit.date);
-  }
-}
-
-class CountedRecentEntitiesManager {
-  private countedRecentEntities: CountedRecentEntities = {};
-  private relevanceModifiers: IRelevanceModifiers;
-  private renderableRecents: {
-    [guid: string]: RenderableRecent
-  };
-
-  constructor(recentState: IRecentlyVisitedState, private store: Store<AppState>) {
-    const { entities, hits } = recentState;
-    const mostRecentTime = hits[0] ? moment(hits[0].date) : moment();
-
-    this.relevanceModifiers = {
-      high: {
-        time: mostRecentTime.subtract(30, 'minute').unix(),
-        modifier: 2
-      },
-      medium: {
-        time: mostRecentTime.subtract(1, 'day').unix(),
-        modifier: 1.5
-      },
-      low: {
-        time: mostRecentTime.subtract(1, 'week').unix(),
-        modifier: 1
-      }
-    };
-
-    this.renderableRecents = Object.keys(entities).reduce((renderableRecents, recentGuid) => {
-      renderableRecents[recentGuid] = new RenderableRecent(entities[recentGuid], store);
-      return renderableRecents;
-    }, {});
-
-    this.addHits(hits);
-  }
-
-  private addHits(hits: IEntityHit[]) {
-    hits.forEach(hit => {
-      this.addHit(hit);
-    });
-    Object.keys(this.renderableRecents).forEach(
-      guid => {
-        if (this.countedRecentEntities[guid]) {
-          this.renderableRecents[guid].mostRecentHit = moment(this.countedRecentEntities[guid].mostRecentHitUnix);
-        }
-      }
-    );
-  }
-
-  private getModifier(recentEntity: IEntityHit) {
-    if (recentEntity.date < this.relevanceModifiers.low.time) {
-      return this.relevanceModifiers.low.modifier;
-    }
-    if (recentEntity.date < this.relevanceModifiers.medium.time) {
-      return this.relevanceModifiers.medium.modifier;
-    }
-    return this.relevanceModifiers.high.modifier;
-  }
-
-  public addHit(recentEntity: IEntityHit) {
-    const modifier = this.getModifier(recentEntity);
-    if (!this.countedRecentEntities[recentEntity.guid]) {
-      this.countedRecentEntities[recentEntity.guid] = new CountedRecentEntity(recentEntity);
-    }
-    this.countedRecentEntities[recentEntity.guid].applyHit(recentEntity, modifier);
-  }
-
-  private sort(sortKey: 'count' | 'mostRecentHitUnix' = 'count') {
-    const sortedHits = Object.values(this.countedRecentEntities)
-      .sort((countedA, countedB) => countedB[sortKey] - countedA[sortKey])
-      .map(counted => counted);
-    return sortedHits.map(entity => this.renderableRecents[entity.guid]);
-  }
-
-  public getFrecentEntities(): RenderableRecent[] {
-    return this.sort();
-  }
-
-  public getRecentEntities(): RenderableRecent[] {
-    return this.sort('mostRecentHitUnix');
-  }
-}
-interface CountedRecentEntities {
-  [entityId: string]: CountedRecentEntity;
-}
-
 @Component({
   selector: 'app-recent-entities',
   templateUrl: './recent-entities.component.html',
@@ -160,22 +51,30 @@ export class RecentEntitiesComponent {
   @Input() mode: string;
 
   public recentEntities$: Observable<RenderableRecent[]>;
-  public frecentEntities$: Observable<RenderableRecent[]>;
   public hasHits$: Observable<boolean>;
   constructor(store: Store<AppState>) {
     const recentEntities$ = store.select(recentlyVisitedSelector);
-    this.hasHits$ = recentEntities$.pipe(
-      map(recentEntities => recentEntities && !!recentEntities.hits && recentEntities.hits.length > 0)
-    );
-    const entitiesManager$ = recentEntities$.pipe(
-      filter(recentEntities => recentEntities && !!recentEntities.hits && recentEntities.hits.length > 0),
-      map(recentEntities => new CountedRecentEntitiesManager(recentEntities, store)),
-    );
-    this.frecentEntities$ = entitiesManager$.pipe(
-      map(manager => manager.getFrecentEntities()),
+
+    recentEntities$.pipe(first()).subscribe(e => {
+      console.log('recent entities');
+      console.log(e);
+      console.log(Object.keys(e).length);
+    });
+
+    this.recentEntities$ = recentEntities$.pipe(
+      map(entities => Object.values(entities)),
+      map((entities: IRecentlyVisitedEntity[]) => {
+        // Sort them - most recent first
+        // Cap the list at the maximum we can display
+        const sorted = entities.sort((a, b) => b.date - a.date).slice(0, MAX_RECENT_COUNT);
+        return sorted.map(entity => new RenderableRecent(entity, store));
+      })
     );
-    this.recentEntities$ = entitiesManager$.pipe(
-      map(manager => manager.getRecentEntities())
+
+    this.hasHits$ = this.recentEntities$.pipe(
+      map(recentEntities => recentEntities && recentEntities.length > 0)
     );
+
   }
 }
+
diff --git a/src/frontend/packages/store/src/actions/recently-visited.actions.ts b/src/frontend/packages/store/src/actions/recently-visited.actions.ts
index 14dc141893..4da740f100 100644
--- a/src/frontend/packages/store/src/actions/recently-visited.actions.ts
+++ b/src/frontend/packages/store/src/actions/recently-visited.actions.ts
@@ -1,19 +1,11 @@
 import { Action } from '@ngrx/store';
-import * as moment from 'moment';
 
-import { IRecentlyVisitedEntity, IRecentlyVisitedEntityDated } from '../types/recently-visited.types';
+import { IRecentlyVisitedEntity } from '../types/recently-visited.types';
 
 export class AddRecentlyVisitedEntityAction implements Action {
   static ACTION_TYPE = '[Recently visited] Add';
   public type = AddRecentlyVisitedEntityAction.ACTION_TYPE;
-  public date: number;
-  public recentlyVisited: IRecentlyVisitedEntityDated;
-  constructor(recentlyVisited: IRecentlyVisitedEntity) {
-    this.recentlyVisited = {
-      ...recentlyVisited,
-      date: moment().valueOf()
-    };
-  }
+  constructor(public recentlyVisited: IRecentlyVisitedEntity) {}
 }
 
 export class SetRecentlyVisitedEntityAction implements Action {
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 d218f7ba89..21ec6ec6e0 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
@@ -51,6 +51,7 @@ export interface EntityCatalogSchemas {
 export interface IStratosEntityWithIcons {
   icon?: string;
   iconFont?: string;
+  logoUrl?: string;
 }
 
 export interface IEntityMetadata {
diff --git a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/recently-visited.reducer.helpers.ts b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/recently-visited.reducer.helpers.ts
index 435401a404..f1e84bafca 100644
--- a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/recently-visited.reducer.helpers.ts
+++ b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/recently-visited.reducer.helpers.ts
@@ -1,118 +1,64 @@
 import { AddRecentlyVisitedEntityAction } from '../../actions/recently-visited.actions';
-import {
-  IEntityHit,
-  IRecentlyVisitedEntities,
-  IRecentlyVisitedEntity,
-  IRecentlyVisitedEntityDated,
-  IRecentlyVisitedState,
-} from '../../types/recently-visited.types';
+import { IRecentlyVisitedEntity, IRecentlyVisitedState } from '../../types/recently-visited.types';
 
-const MAX_RECENT_COUNT = 100;
+// Maximum number of recent entities to show to the user
+export const MAX_RECENT_COUNT = 100;
 
-function getEntities(entities: IRecentlyVisitedEntities, newHit: IEntityHit, recentlyVisited: IRecentlyVisitedEntityDated) {
-  if (!entities[newHit.guid]) {
-    return {
-      ...entities,
-      [newHit.guid]: recentlyVisited
-    };
-  }
-  return entities;
-}
-
-function trimRecent(hits: IEntityHit[]) {
-  if (shouldTrim(hits)) {
-    return hits.slice(0, MAX_RECENT_COUNT - 1);
-  }
-  return hits;
-}
+// When the recent count goes above this, reduce it back down to the max
+// This avoids us having to constantly trim the list once the max is hit
+// We only ever show the max count number in the lists in the UI
+const FLUSH_RECENT_COUNT = 150;
 
-function shouldTrim(hits: IEntityHit[]) {
-  return hits.length >= MAX_RECENT_COUNT;
+function recentArrayToMap(map: IRecentlyVisitedState, obj: IRecentlyVisitedEntity): IRecentlyVisitedState {
+  map[obj.guid] = obj;
+  return map;
 }
 
-const endpointIdIsInList = () => {
-  const recentCache = {};
-  return (recent: IRecentlyVisitedEntity, endpointGuids: string[]) => {
-    const { endpointId } = recent;
-    const cached = recentCache[endpointId];
-    if (cached === true || cached === false) {
-      return cached;
-    }
-    recentCache[endpointId] = endpointGuids.includes(recent.endpointId);
-    return recentCache[endpointId];
-  };
-};
-
-
-const idExistsInEntityList = (id: string, recents: IRecentlyVisitedEntities) => {
-  return !!recents[id];
-};
-
-export const getDefaultRecentState = () => ({
-  entities: {},
-  hits: []
-});
+// Default recent state is an empty object map
+export const getDefaultRecentState = () => ({});
 
-export function addNewHit(state: IRecentlyVisitedState, action: AddRecentlyVisitedEntityAction): IRecentlyVisitedState {
-  const entities = state.entities;
-  const newHit = {
-    guid: action.recentlyVisited.guid,
-    date: action.recentlyVisited.date
-  } as IEntityHit;
-  const hits = [
-    newHit,
-    ...trimRecent(state.hits),
-  ];
-  const newEntities = getEntities(entities, newHit, action.recentlyVisited);
+// An entity has been 'hit', so update the access date or add it to the recent history
+export function addRecentlyVisitedEntity(state: IRecentlyVisitedState, action: AddRecentlyVisitedEntityAction): IRecentlyVisitedState {
   const newState = {
-    entities: newEntities,
-    hits
+    ...state,
+    [action.recentlyVisited.guid]: action.recentlyVisited
   };
-  return shouldTrim(state.hits) ? cleanEntities(newState) : newState;
+
+  // Trim old data to keep the list in a manageable size
+  return trimRecentsList(newState);
 }
 
-export function cleanRecentsList(state: IRecentlyVisitedState, endpointGuids?: string[], inclusive = false): IRecentlyVisitedState {
-  const isInList = endpointIdIsInList();
-  if (!endpointGuids) {
-    return state;
-  }
-  if (!endpointGuids.length) {
-    return inclusive ? getDefaultRecentState() : state;
+// Ensure the recents list stays at a manageable size
+function trimRecentsList(state: IRecentlyVisitedState): IRecentlyVisitedState {
+  if (Object.keys(state).length > FLUSH_RECENT_COUNT) {
+    // The list size has gone over the flush count
+    const entities = Object.values(state);
+    // Cap the list at the maximum we can display
+    const sorted = entities.sort((a, b) => b.date - a.date).slice(0, MAX_RECENT_COUNT);
+
+    // Turn array back into a map
+    return sorted.reduce(recentArrayToMap, {});
   }
-  const entities = Object.keys(state.entities).reduce((reducedRecents, currentRecentGuid) => {
-    const currentRecent = state.entities[currentRecentGuid];
-    const inList = isInList(currentRecent, endpointGuids);
-    if (
-      (!inList && !inclusive) ||
-      (inList && inclusive)
-    ) {
-      reducedRecents[currentRecentGuid] = currentRecent;
-    }
-    return reducedRecents;
-  }, {});
-  const hits = state.hits.reduce((reducedHits, hit) => {
-    if (idExistsInEntityList(hit.guid, entities)) {
-      reducedHits.push(hit);
-    }
-    return reducedHits;
-  }, []);
-  return {
-    entities,
-    hits
-  };
+  return state;
 }
 
-export function cleanEntities(state: IRecentlyVisitedState) {
-  const entities = Object.keys(state.entities).reduce((reducedRecents, currentRecentGuid) => {
-    const currentRecent = state.entities[currentRecentGuid];
-    const hasHit = state.hits.find(hit => hit.guid === currentRecentGuid);
-    if (hasHit) {
-      reducedRecents[currentRecentGuid] = currentRecent;
-    }
-    return reducedRecents;
+// Update the recents list - either removing any that reference and endpoint in the list OR keeping only those
+// that reference an endpoint in the list
+export function cleanRecentsList(state: IRecentlyVisitedState, endpointGuids: string[], inclusive = false): IRecentlyVisitedState {
+
+  // Turn the guids into a map, for easier lookup of testing if an endpoint shold be kept or not
+  const endpointMap = endpointGuids.reduce((m, obj) => {
+    m[obj] = true;
+    return m;
   }, {});
-  return {
-    entities,
-    hits: state.hits
-  };
+
+  // Filter all of the recent entities
+  const filtered = Object.values(state).filter(entity => {
+    // Was this endpoint in the list?
+    const exists = endpointMap[entity.endpointId];
+    return exists ? inclusive : !inclusive;
+  });
+
+  // Convert the array back into a map
+  return filtered.reduce(recentArrayToMap, {});
 }
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 ead7fd092e..79fd5eaee4 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
@@ -11,7 +11,7 @@ import { AddRecentlyVisitedEntityAction, SetRecentlyVisitedEntityAction } from '
 import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { endpointEntityType, STRATOS_ENDPOINT_TYPE } from '../../helpers/stratos-entity-factory';
 import { IRecentlyVisitedState } from '../../types/recently-visited.types';
-import { addNewHit, cleanRecentsList, getDefaultRecentState } from './recently-visited.reducer.helpers';
+import { addRecentlyVisitedEntity, cleanRecentsList, getDefaultRecentState } from './recently-visited.reducer.helpers';
 
 export function recentlyVisitedReducer(
   state: IRecentlyVisitedState = getDefaultRecentState(),
@@ -19,16 +19,14 @@ export function recentlyVisitedReducer(
 ): IRecentlyVisitedState {
   switch (action.type) {
     case AddRecentlyVisitedEntityAction.ACTION_TYPE:
-      return addNewHit(state, action as AddRecentlyVisitedEntityAction);
+      return addRecentlyVisitedEntity(state, action as AddRecentlyVisitedEntityAction);
     case SetRecentlyVisitedEntityAction.ACTION_TYPE:
       const setAction = action as SetRecentlyVisitedEntityAction;
-      return {
-        hits: state.hits,
-        entities: {
-          ...state.entities,
-          [setAction.recentlyVisited.guid]: setAction.recentlyVisited
-        }
+      const newState = {
+        ...state,
+        [setAction.recentlyVisited.guid]: setAction.recentlyVisited
       };
+      return newState;
     case DISCONNECT_ENDPOINTS_SUCCESS:
     case UNREGISTER_ENDPOINTS_SUCCESS:
       const removeEndpointAction = action as DisconnectEndpoint;
diff --git a/src/frontend/packages/store/src/types/recently-visited.types.ts b/src/frontend/packages/store/src/types/recently-visited.types.ts
index d9f8e12b56..95e581663c 100644
--- a/src/frontend/packages/store/src/types/recently-visited.types.ts
+++ b/src/frontend/packages/store/src/types/recently-visited.types.ts
@@ -1,12 +1,11 @@
 import { IFavoriteTypeInfo } from './user-favorites.types';
 
-export interface IEntityHit {
-  guid: string;
-  date: number;
-}
+// Types used for maintaining the list of recent entities visited by the user
+
 export interface IRecentlyVisitedEntity extends IFavoriteTypeInfo {
   guid: string;
   name: string;
+  date: number;
   entityId: string;
   prettyType: string;
   prettyEndpointType: string;
@@ -14,14 +13,11 @@ export interface IRecentlyVisitedEntity extends IFavoriteTypeInfo {
   routerLink?: string;
 }
 
-export interface IRecentlyVisitedEntities {
-  [guid: string]: IRecentlyVisitedEntity;
-}
-export interface IRecentlyVisitedState {
-  entities: IRecentlyVisitedEntities;
-  hits: IEntityHit[];
+export interface IRecentlyVisitedEntityWithIcon extends IRecentlyVisitedEntity {
+  icon: string;
+  iconFont: string;
 }
 
-export interface IRecentlyVisitedEntityDated extends IRecentlyVisitedEntity {
-  date: number;
+export interface IRecentlyVisitedState {
+  [guid: string]: IRecentlyVisitedEntity;
 }

From c2e713d3ffb710bdb119f12f9c904cfe12b10e6e Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Sun, 5 Jul 2020 17:34:43 +0100
Subject: [PATCH 562/648] Remove debug logging

---
 .../favorites-meta-card/favorites-meta-card.component.ts     | 5 -----
 1 file changed, 5 deletions(-)

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 1b00ca09a0..16797fb932 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
@@ -97,10 +97,7 @@ export class FavoritesMetaCardComponent {
         this.iconUrl$ = observableOf('');
       }
 
-      console.log(favoriteEntity);
       const entityDef = entityCatalog.getEntity(this.favorite.endpointType, this.favorite.entityType);
-      console.log(entityDef);
-
       this.icon = {
         hasIcon: !!entityDef.definition.logoUrl || !!entityDef.definition.icon,
         icon: entityDef.definition.icon,
@@ -108,8 +105,6 @@ export class FavoritesMetaCardComponent {
         logoUrl: entityDef.definition.logoUrl,
       };
 
-      console.log(this.icon);
-
       this.setConfirmation(this.prettyName, favorite);
 
       const config = cardMapper && favorite && favorite.metadata ? cardMapper(favorite.metadata) : null;

From 9581421cd26b988ec7b55cefaad22a969b65e5ba Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Mon, 6 Jul 2020 09:49:50 +0100
Subject: [PATCH 563/648] Remove debug logging/subscription leak

---
 .../recent-entities/recent-entities.component.ts         | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

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 21450712c2..a44f13294b 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
@@ -6,7 +6,7 @@ import {
 } from 'frontend/packages/store/src/reducers/current-user-roles-reducer/recently-visited.reducer.helpers';
 import * as moment from 'moment';
 import { Observable, of as observableOf } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
 import { endpointEntityType } from '../../../../../store/src/helpers/stratos-entity-factory';
@@ -54,13 +54,6 @@ export class RecentEntitiesComponent {
   public hasHits$: Observable<boolean>;
   constructor(store: Store<AppState>) {
     const recentEntities$ = store.select(recentlyVisitedSelector);
-
-    recentEntities$.pipe(first()).subscribe(e => {
-      console.log('recent entities');
-      console.log(e);
-      console.log(Object.keys(e).length);
-    });
-
     this.recentEntities$ = recentEntities$.pipe(
       map(entities => Object.values(entities)),
       map((entities: IRecentlyVisitedEntity[]) => {

From b142e2253a91589eb6127e23295c7d23042c3bc7 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Mon, 6 Jul 2020 09:55:29 +0100
Subject: [PATCH 564/648] Unit test fix

---
 src/frontend/packages/store/testing/src/store-test-helper.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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 98731e61fe..327474a530 100644
--- a/src/frontend/packages/store/testing/src/store-test-helper.ts
+++ b/src/frontend/packages/store/testing/src/store-test-helper.ts
@@ -123,10 +123,7 @@ export const testSessionData: SessionData = {
 
 function getDefaultInitialTestStratosStoreState() {
   return {
-    recentlyVisited: {
-      entities: {},
-      hits: []
-    },
+    recentlyVisited: {},
     userFavoritesGroups: {
       busy: false,
       error: false,

From e6e4fbb166945623c3eb62b8d96e4f23221d963a Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 7 Jul 2020 14:40:25 +0100
Subject: [PATCH 565/648] Fixes after merge

---
 src/frontend/packages/core/src/shared/shared.module.ts   | 4 +++-
 src/frontend/packages/store/src/jetstream.ts             | 2 +-
 .../src/custom/kubernetes/workloads/workloads.module.ts  | 5 ++++-
 src/jetstream/go.sum                                     | 9 +++++----
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index 60241f3d73..e5915d0af6 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -54,6 +54,7 @@ import {
   TableCellSidePanelComponent,
 } from './components/list/list-table/table-cell-side-panel/table-cell-side-panel.component';
 import { TableCellStatusDirective } from './components/list/list-table/table-cell-status.directive';
+import { listTableCells } from './components/list/list-table/table-cell/table-cell.component';
 import { TableComponent } from './components/list/list-table/table.component';
 import { listTableComponents } from './components/list/list-table/table.types';
 import { EndpointCardComponent } from './components/list/list-types/endpoint/endpoint-card/endpoint-card.component';
@@ -310,7 +311,8 @@ import { UserPermissionDirective } from './user-permission.directive';
     SidepanelPreviewComponent,
     TableCellEndpointNameComponent,
     CardProgressOverlayComponent,
-    MaxListMessageComponent
+    MaxListMessageComponent,
+    ...listTableCells
   ],
   providers: [
     ListConfig,
diff --git a/src/frontend/packages/store/src/jetstream.ts b/src/frontend/packages/store/src/jetstream.ts
index 12477fabba..fb8cb84451 100644
--- a/src/frontend/packages/store/src/jetstream.ts
+++ b/src/frontend/packages/store/src/jetstream.ts
@@ -67,7 +67,7 @@ export function hasJetStreamError(pages: Partial<JetStreamErrorResponse>[]): Jet
   }) as JetStreamErrorResponse;
 }
 
-function isJetstreamError(err: any): JetStreamErrorResponse {
+export function isJetstreamError(err: any): JetStreamErrorResponse {
   return !!(
     err &&
     err.error &&
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
index a9ff97b006..5fb855b409 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
@@ -1,4 +1,4 @@
-import { CommonModule } from '@angular/common';
+import { CommonModule, DatePipe } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { NgxGraphModule } from '@swimlane/ngx-graph';
 
@@ -42,6 +42,9 @@ import { WorkloadsRouting } from './workloads.routing';
   ],
   entryComponents: [
     HelmReleaseCardComponent
+  ],
+  providers: [
+    DatePipe
   ]
 })
 export class WorkloadsModule { }
diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index f32c450662..a732781bc0 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -344,11 +344,11 @@ github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY=
-github.com/gosuri/uitable v0.0.1/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY=
+github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY=
+github.com/gosuri/uitable v0.0.1/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/gosuri/uitable v0.0.1/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/govau/cf-common v0.0.7 h1:uhp1P6XM6GGzu1+A4C7LELLX/9mCmH6W5DpJZC0kWmo=
 github.com/govau/cf-common v0.0.7/go.mod h1:5xL/OfE7wxeyHlXb7iei0rAbdQ/5v6dF18BZknPv7NQ=
@@ -785,20 +785,21 @@ gopkg.in/square/go-jose.v2 v2.2.2 h1:orlkJ3myw8CN1nVQHBFfloD+L3egixIa4FvUP6RosSA
 gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
+gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 helm.sh/helm/v3 v3.0.0 h1:or/9cs1GgfcTQeEnR2CVJNw893/rmqIG1KsNHmUiSFw=
 helm.sh/helm/v3 v3.0.0/go.mod h1:sI7B9yfvMgxtTPMWdk1jSKJ2aa59UyP9qhPydqW6mgo=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

From ebb8458071b35e490cf0ca47dbe18d5b47b4798e Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 7 Jul 2020 16:51:45 +0100
Subject: [PATCH 566/648] Add SUSE dark theme - apply custom dark theming to
 helm chart list chart card - create `dark` theme in suse theme, - dark suse
 theme only needed to changes   - core colour theme created with
 `mat-dark-theme` mixin   - custom side nav colours

---
 .../packages/suse-extensions/package.json     |  3 +-
 .../suse-extensions/sass/_all-theme.scss      | 10 +++++
 .../monocular-chart-card.component.theme.scss | 37 +++++++++++++++++++
 src/frontend/packages/suse-theme/_index.scss  | 34 +++++++++++++++--
 .../packages/suse-theme/sass/colors.scss      |  7 +++-
 5 files changed, 86 insertions(+), 5 deletions(-)
 create mode 100644 src/frontend/packages/suse-extensions/sass/_all-theme.scss
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.theme.scss

diff --git a/src/frontend/packages/suse-extensions/package.json b/src/frontend/packages/suse-extensions/package.json
index c7ba7878a7..7b53fee270 100644
--- a/src/frontend/packages/suse-extensions/package.json
+++ b/src/frontend/packages/suse-extensions/package.json
@@ -7,6 +7,7 @@
   },
   "stratos": {
     "module": "SuseModule",
-    "routingModule": "SuseRoutingModule"
+    "routingModule": "SuseRoutingModule",
+    "theming": "sass/_all-theme#apply-theme-suse-extensions"
   }
 }
diff --git a/src/frontend/packages/suse-extensions/sass/_all-theme.scss b/src/frontend/packages/suse-extensions/sass/_all-theme.scss
new file mode 100644
index 0000000000..b6b53feafa
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/sass/_all-theme.scss
@@ -0,0 +1,10 @@
+@import '../src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.theme';
+
+@mixin apply-theme-suse-extensions($stratos-theme) {
+
+  $theme: map-get($stratos-theme, theme);
+  $app-theme: map-get($stratos-theme, app-theme);
+
+  @include monocular-chart-card($theme, $app-theme);
+
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.theme.scss b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.theme.scss
new file mode 100644
index 0000000000..08e40cb3c1
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.theme.scss
@@ -0,0 +1,37 @@
+
+@mixin monocular-chart-card($theme, $app-theme) {
+  $link-color: map-get($app-theme, link-color);
+  $link-active-color: map-get($app-theme, link-active-color);
+
+  $is-dark: map-get($theme, is-dark);
+  @if $is-dark == true {
+    $border-color: $black;
+    $background-color-top: lighten(#3f3f3f, 10);
+    $background-color-bottom: #3f3f3f;
+    $color: $suse-link-color;
+    .list-item {
+      background-color: $background-color-bottom;
+      border-color: $border-color;
+      .list-item-logo {
+        background-color: $background-color-top;
+      }
+      .list-item-info {
+        a {
+          color: $link-color;
+          &:hover {
+            color: $link-active-color;
+          }
+        }
+        border-color: $border-color;
+        .chart-item-info {
+          &__version {
+            color: $link-color;
+          }
+          &__repo:hover {
+            background-color: $background-color-bottom;
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/src/frontend/packages/suse-theme/_index.scss b/src/frontend/packages/suse-theme/_index.scss
index 55a2786697..c53aa198fb 100644
--- a/src/frontend/packages/suse-theme/_index.scss
+++ b/src/frontend/packages/suse-theme/_index.scss
@@ -6,7 +6,14 @@
 @import './sass/suse';
 
 @function stratos-theme() {
-  $theme: stratos-theme-helper($stratos-theme);
+  @return (
+    default: create-suse-theme($stratos-theme),
+    dark: create-suse-dark-theme()
+  );
+}
+
+@function create-suse-theme($base-theme) {
+  $theme: stratos-theme-helper($base-theme);
 
   // Modify some of the colors
   $app-theme: map-get($theme, app-theme);
@@ -37,5 +44,26 @@
     app-theme: $app-theme
   ));
 
-  @return $theme
-}
\ No newline at end of file
+  @return $theme;
+}
+
+@function create-suse-dark-theme() {
+  $theme: create-suse-theme($suse-dark-theme);
+
+  $app-theme: map-get($theme, app-theme);
+  $app-theme: map-merge($app-theme, (
+    side-nav: (
+      background: $suse-dark-side-nav-bg,
+      text: $suse-dark-side-nav-text,
+      active: $suse-dark-side-nav-active-bg,
+      active-text: $suse-dark-side-nav-active-text,
+      hover: $suse-dark-side-nav-active-bg,
+      hover-text: $suse-dark-side-nav-active-text
+    )
+  ));
+
+  $theme: map-merge($theme, (
+    app-theme: $app-theme
+  ));
+  @return $theme;
+}
diff --git a/src/frontend/packages/suse-theme/sass/colors.scss b/src/frontend/packages/suse-theme/sass/colors.scss
index f1c3a1b897..4ffc911ac5 100644
--- a/src/frontend/packages/suse-theme/sass/colors.scss
+++ b/src/frontend/packages/suse-theme/sass/colors.scss
@@ -24,7 +24,7 @@ $suse-theme-primary: mat-palette($suse-primary);
 $suse-theme-warn: mat-palette($mat-red);
 $stratos-theme: mat-light-theme($suse-theme-primary, $suse-theme-primary, $suse-theme-warn);
 
-$stratos-dark-theme-supported: false;
+$suse-dark-theme: mat-dark-theme($suse-theme-primary, $suse-theme-primary, $suse-theme-warn);
 
 // SUSE Brand primary colour
 $suse-primary-color: #30BA78;
@@ -39,3 +39,8 @@ $suse-side-nav-bg: #f2f2f2;
 $suse-side-nav-text: #000;
 $suse-side-nav-active-bg: $suse-primary-color;
 $suse-side-nav-active-text: #fff;
+
+$suse-dark-side-nav-bg: #303030;
+$suse-dark-side-nav-text: #f2f2f2;
+$suse-dark-side-nav-active-bg: darken($suse-primary-color, 15);
+$suse-dark-side-nav-active-text: #f2f2f2;

From 93ae0ee10a9e55a5a4be406f5ceb1d7a1c5c6f05 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 7 Jul 2020 17:08:45 +0100
Subject: [PATCH 567/648] Fix build

---
 package-lock.json | 51843 ++++++++++++++++++--------------------------
 1 file changed, 20988 insertions(+), 30855 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 81f225a18e..eec8e18f4e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,19 +28,6 @@
         "rxjs": "6.5.4"
       },
       "dependencies": {
-        "@angular-devkit/core": {
-          "version": "9.1.7",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.7.tgz",
-          "integrity": "sha512-guvolu9Cl+qYMTtedLZD9wCqustJjdqzJ2psD2C1Sr1LrX9T0mprmDldR/YnhsitThveJEb6sM/0EvqWxoSvKw==",
-          "dev": true,
-          "requires": {
-            "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"
-          }
-        },
         "rxjs": {
           "version": "6.5.4",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
@@ -49,12 +36,6 @@
           "requires": {
             "tslib": "^1.9.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
         }
       }
     },
@@ -127,29 +108,6 @@
         "worker-plugin": "4.0.3"
       },
       "dependencies": {
-        "@angular-devkit/architect": {
-          "version": "0.901.7",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.7.tgz",
-          "integrity": "sha512-yW/PUEqle55QihOFbmeNXaVTodhfeXkteoFDUpz+YpX3xiQDXDtNbIJSzKOQTojtBKdSMKMvZkQLr+RAa7/1EA==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "9.1.7",
-            "rxjs": "6.5.4"
-          }
-        },
-        "@angular-devkit/core": {
-          "version": "9.1.7",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.7.tgz",
-          "integrity": "sha512-guvolu9Cl+qYMTtedLZD9wCqustJjdqzJ2psD2C1Sr1LrX9T0mprmDldR/YnhsitThveJEb6sM/0EvqWxoSvKw==",
-          "dev": true,
-          "requires": {
-            "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"
-          }
-        },
         "core-js": {
           "version": "3.6.4",
           "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
@@ -204,16 +162,6 @@
         "rxjs": "6.5.4"
       },
       "dependencies": {
-        "@angular-devkit/architect": {
-          "version": "0.901.7",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.7.tgz",
-          "integrity": "sha512-yW/PUEqle55QihOFbmeNXaVTodhfeXkteoFDUpz+YpX3xiQDXDtNbIJSzKOQTojtBKdSMKMvZkQLr+RAa7/1EA==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "9.1.7",
-            "rxjs": "6.5.4"
-          }
-        },
         "rxjs": {
           "version": "6.5.4",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
@@ -263,29 +211,6 @@
         "rxjs": "6.5.4"
       },
       "dependencies": {
-        "@angular-devkit/architect": {
-          "version": "0.901.7",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.7.tgz",
-          "integrity": "sha512-yW/PUEqle55QihOFbmeNXaVTodhfeXkteoFDUpz+YpX3xiQDXDtNbIJSzKOQTojtBKdSMKMvZkQLr+RAa7/1EA==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "9.1.7",
-            "rxjs": "6.5.4"
-          }
-        },
-        "@angular-devkit/core": {
-          "version": "9.1.7",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.7.tgz",
-          "integrity": "sha512-guvolu9Cl+qYMTtedLZD9wCqustJjdqzJ2psD2C1Sr1LrX9T0mprmDldR/YnhsitThveJEb6sM/0EvqWxoSvKw==",
-          "dev": true,
-          "requires": {
-            "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"
-          }
-        },
         "rxjs": {
           "version": "6.5.4",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
@@ -294,12 +219,6 @@
           "requires": {
             "tslib": "^1.9.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
         }
       }
     },
@@ -344,19 +263,6 @@
         "rxjs": "6.5.4"
       },
       "dependencies": {
-        "@angular-devkit/core": {
-          "version": "9.1.7",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.7.tgz",
-          "integrity": "sha512-guvolu9Cl+qYMTtedLZD9wCqustJjdqzJ2psD2C1Sr1LrX9T0mprmDldR/YnhsitThveJEb6sM/0EvqWxoSvKw==",
-          "dev": true,
-          "requires": {
-            "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"
-          }
-        },
         "rxjs": {
           "version": "6.5.4",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
@@ -365,12 +271,6 @@
           "requires": {
             "tslib": "^1.9.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
         }
       }
     },
@@ -415,39 +315,6 @@
         "uuid": "7.0.2"
       },
       "dependencies": {
-        "@angular-devkit/architect": {
-          "version": "0.901.7",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.7.tgz",
-          "integrity": "sha512-yW/PUEqle55QihOFbmeNXaVTodhfeXkteoFDUpz+YpX3xiQDXDtNbIJSzKOQTojtBKdSMKMvZkQLr+RAa7/1EA==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "9.1.7",
-            "rxjs": "6.5.4"
-          }
-        },
-        "@angular-devkit/core": {
-          "version": "9.1.7",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.7.tgz",
-          "integrity": "sha512-guvolu9Cl+qYMTtedLZD9wCqustJjdqzJ2psD2C1Sr1LrX9T0mprmDldR/YnhsitThveJEb6sM/0EvqWxoSvKw==",
-          "dev": true,
-          "requires": {
-            "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"
-          }
-        },
-        "@schematics/angular": {
-          "version": "9.1.7",
-          "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.7.tgz",
-          "integrity": "sha512-ld3WcoMWvup04V3OWioQ+AFGQBzz7IDM4Fxc5+Qc3wILWkDJnNkrc4EmJAow96Ab4/T1+Wl1vof3tV4At0BTzA==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "9.1.7",
-            "@angular-devkit/schematics": "9.1.7"
-          }
-        },
         "ansi-colors": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
@@ -478,27 +345,12 @@
             "glob": "^7.1.3"
           }
         },
-        "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
         },
-        "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
-        },
         "uuid": {
           "version": "7.0.2",
           "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.2.tgz",
@@ -979,8 +831,7 @@
       "requires": {
         "@babel/helper-function-name": "^7.10.1",
         "@babel/types": "^7.10.1",
-        "lodash": "^4.17.13" <<
-          << << < HEAD
+        "lodash": "^4.17.13"
       },
       "dependencies": {
         "@babel/code-frame": {
@@ -1066,9 +917,7 @@
       "dev": true,
       "requires": {
         "@babel/traverse": "^7.10.1",
-        "@babel/types": "^7.10.1" ===
-          === = >>>
-          >>> > upstream / master
+        "@babel/types": "^7.10.1"
       },
       "dependencies": {
         "@babel/code-frame": {
@@ -1080,8 +929,7 @@
             "@babel/highlight": "^7.10.1"
           }
         },
-        <<
-        << << < HEAD "@babel/generator": {
+        "@babel/generator": {
           "version": "7.10.2",
           "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz",
           "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==",
@@ -1104,26 +952,11 @@
             "@babel/types": "^7.10.1"
           }
         },
-        ===
-        === =
-        "@babel/helper-function-name": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
-          "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.10.1",
-            "@babel/template": "^7.10.1",
-            "@babel/types": "^7.10.1"
-          }
-        },
-        >>>
-        >>> > upstream / master "@babel/helper-get-function-arity": {
+        "@babel/helper-get-function-arity": {
           "version": "7.10.1",
           "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
           "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
-          <<
-          << << < HEAD "dev": true,
+          "dev": true,
           "requires": {
             "@babel/types": "^7.10.1"
           }
@@ -1132,9 +965,7 @@
           "version": "7.10.1",
           "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
           "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
-          ===
-          === = >>>
-          >>> > upstream / master "dev": true,
+          "dev": true,
           "requires": {
             "@babel/types": "^7.10.1"
           }
@@ -1166,8 +997,7 @@
           "version": "7.10.1",
           "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
           "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
-          <<
-          << << < HEAD "dev": true,
+          "dev": true,
           "requires": {
             "@babel/code-frame": "^7.10.1",
             "@babel/parser": "^7.10.1",
@@ -1188,30753 +1018,21056 @@
             "@babel/types": "^7.10.1",
             "debug": "^4.1.0",
             "globals": "^11.1.0",
-            "lodash": "^4.17.13" ===
-              === =
-              "dev": true,
-            "requires": {
-              "@babel/code-frame": "^7.10.1",
-              "@babel/parser": "^7.10.1",
-              "@babel/types": "^7.10.1" >>>
-                >>> > upstream / master
-            }
-          },
-          "@babel/types": {
-            "version": "7.10.2",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-            "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-validator-identifier": "^7.10.1",
-              "lodash": "^4.17.13",
-              "to-fast-properties": "^2.0.0" <<
-                << << < HEAD
-            }
-          },
-          "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
-          }
-        }
-      },
-      "@babel/helper-function-name": {
-        "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.8.3",
-          "@babel/template": "^7.8.3",
-          "@babel/types": "^7.8.3"
-        }
-      },
-      "@babel/helper-get-function-arity": {
-        "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.8.3"
-        }
-      },
-      "@babel/helper-hoist-variables": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.1.tgz",
-        "integrity": "sha512-vLm5srkU8rI6X3+aQ1rQJyfjvCBLXP8cAGeuw04zeAM2ItKb1e7pmVmLyHb4sDaAYnLL13RHOZPLEtcGZ5xvjg==",
-        "dev": true,
-        "requires": {
-          "@babel/types": "^7.10.1"
-        },
-        "dependencies": {
-          "@babel/helper-validator-identifier": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-            "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-            "dev": true
-          },
-          "@babel/types": {
-            "version": "7.10.2",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-            "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-validator-identifier": "^7.10.1",
-              "lodash": "^4.17.13",
-              "to-fast-properties": "^2.0.0"
-            }
-          }
-        }
-      },
-      "@babel/helper-member-expression-to-functions": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz",
-        "integrity": "sha512-u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g==",
-        "dev": true,
-        "requires": {
-          "@babel/types": "^7.10.1"
-        },
-        "dependencies": {
-          "@babel/helper-validator-identifier": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-            "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-            "dev": true
-          },
-          "@babel/types": {
-            "version": "7.10.2",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-            "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-validator-identifier": "^7.10.1",
-              "lodash": "^4.17.13",
-              "to-fast-properties": "^2.0.0" ===
-                === =
-            }
-          }
-        }
-      },
-      "@babel/helper-explode-assignable-expression": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.1.tgz",
-        "integrity": "sha512-vcUJ3cDjLjvkKzt6rHrl767FeE7pMEYfPanq5L16GRtrXIoznc0HykNW2aEYkcnP76P0isoqJ34dDMFZwzEpJg==",
-        "dev": true,
-        "requires": {
-          "@babel/traverse": "^7.10.1",
-          "@babel/types": "^7.10.1"
-        },
-        "dependencies": {
-          "@babel/code-frame": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-            "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
-            "dev": true,
-            "requires": {
-              "@babel/highlight": "^7.10.1" >>>
-                >>> > upstream / master
-            }
-          }
-        }
-      },
-      "@babel/helper-module-imports": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz",
-        "integrity": "sha512-SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg==",
-        "dev": true,
-        "requires": {
-          "@babel/types": "^7.10.1"
-        },
-        "dependencies": {
-          "@babel/helper-validator-identifier": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-            "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-            "dev": true
-          },
-          <<
-          << << < HEAD "@babel/types": {
-            "version": "7.10.2",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-            "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-validator-identifier": "^7.10.1",
-              ===
-              === =
-              "@babel/generator": {
-                "version": "7.10.2",
-                "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz",
-                "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==",
-                "dev": true,
-                "requires": {
-                  "@babel/types": "^7.10.2",
-                  "jsesc": "^2.5.1",
-                  >>>
-                  >>> > upstream / master "lodash": "^4.17.13",
-                  "to-fast-properties": "^2.0.0"
-                }
-              }
-            }
-          },
-          "@babel/helper-module-transforms": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz",
-            "integrity": "sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-module-imports": "^7.10.1",
-              "@babel/helper-replace-supers": "^7.10.1",
-              "@babel/helper-simple-access": "^7.10.1",
-              "@babel/helper-split-export-declaration": "^7.10.1",
-              "@babel/template": "^7.10.1",
-              "@babel/types": "^7.10.1",
-              "lodash": "^4.17.13"
-            },
-            "dependencies": {
-              "@babel/code-frame": {
-                "version": "7.10.1",
-                "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-                "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
-                "dev": true,
-                "requires": {
-                  "@babel/highlight": "^7.10.1"
-                }
-              },
-              <<
-              << << < HEAD ===
-              === =
-              "@babel/helper-function-name": {
-                "version": "7.10.1",
-                "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
-                "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
-                "dev": true,
-                "requires": {
-                  "@babel/helper-get-function-arity": "^7.10.1",
-                  "@babel/template": "^7.10.1",
-                  "@babel/types": "^7.10.1"
-                }
-              },
-              "@babel/helper-get-function-arity": {
-                "version": "7.10.1",
-                "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
-                "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
-                "dev": true,
-                "requires": {
-                  "@babel/types": "^7.10.1"
-                }
-              },
-              >>>
-              >>> > upstream / master "@babel/helper-split-export-declaration": {
-                "version": "7.10.1",
-                "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
-                "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
-                "dev": true,
-                "requires": {
-                  "@babel/types": "^7.10.1"
-                }
-              },
-              "@babel/helper-validator-identifier": {
-                "version": "7.10.1",
-                "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-                "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-                "dev": true
-              },
-              "@babel/highlight": {
-                "version": "7.10.1",
-                "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
-                "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
-                "dev": true,
-                "requires": {
-                  "@babel/helper-validator-identifier": "^7.10.1",
-                  "chalk": "^2.0.0",
-                  "js-tokens": "^4.0.0"
-                }
-              },
-              "@babel/parser": {
-                "version": "7.10.2",
-                "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
-                "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
-                "dev": true
-              },
-              "@babel/template": {
-                "version": "7.10.1",
-                "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
-                "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
-                <<
-                << << < HEAD "dev": true,
-                "requires": {
-                  "@babel/code-frame": "^7.10.1",
-                  "@babel/parser": "^7.10.1",
-                  "@babel/types": "^7.10.1" ===
-                    === =
-                    "dev": true,
-                  "requires": {
-                    "@babel/code-frame": "^7.10.1",
-                    "@babel/parser": "^7.10.1",
-                    "@babel/types": "^7.10.1"
-                  }
-                },
-                "@babel/traverse": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz",
-                  "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/code-frame": "^7.10.1",
-                    "@babel/generator": "^7.10.1",
-                    "@babel/helper-function-name": "^7.10.1",
-                    "@babel/helper-split-export-declaration": "^7.10.1",
-                    "@babel/parser": "^7.10.1",
-                    "@babel/types": "^7.10.1",
-                    "debug": "^4.1.0",
-                    "globals": "^11.1.0",
-                    "lodash": "^4.17.13" >>>
-                      >>> > upstream / master
-                  }
-                },
-                "@babel/types": {
-                  "version": "7.10.2",
-                  "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-                  "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-validator-identifier": "^7.10.1",
-                    "lodash": "^4.17.13",
-                    "to-fast-properties": "^2.0.0" <<
-                      << << < HEAD
-                  }
-                }
-              }
-            },
-            "@babel/helper-optimise-call-expression": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz",
-              "integrity": "sha512-a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg==",
-              "dev": true,
-              "requires": {
-                "@babel/types": "^7.10.1"
-              },
-              "dependencies": {
-                "@babel/helper-validator-identifier": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-                  "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-                  "dev": true
-                },
-                "@babel/types": {
-                  "version": "7.10.2",
-                  "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-                  "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-validator-identifier": "^7.10.1",
-                    "lodash": "^4.17.13",
-                    "to-fast-properties": "^2.0.0"
-                  }
-                }
-              }
-            },
-            "@babel/helper-plugin-utils": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz",
-              "integrity": "sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==",
-              "dev": true
-            },
-            "@babel/helper-regex": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.1.tgz",
-              "integrity": "sha512-7isHr19RsIJWWLLFn21ubFt223PjQyg1HY7CZEMRr820HttHPpVvrsIN3bUOo44DEfFV4kBXO7Abbn9KTUZV7g==",
-              "dev": true,
-              "requires": {
-                "lodash": "^4.17.13"
-              }
-            },
-            "@babel/helper-remap-async-to-generator": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.1.tgz",
-              "integrity": "sha512-RfX1P8HqsfgmJ6CwaXGKMAqbYdlleqglvVtht0HGPMSsy2V6MqLlOJVF/0Qyb/m2ZCi2z3q3+s6Pv7R/dQuZ6A==",
-              "dev": true,
-              "requires": {
-                "@babel/helper-annotate-as-pure": "^7.10.1",
-                "@babel/helper-wrap-function": "^7.10.1",
-                "@babel/template": "^7.10.1",
-                "@babel/traverse": "^7.10.1",
-                "@babel/types": "^7.10.1" ===
-                  === =
-              }
-            },
-            "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
-            }
+            "lodash": "^4.17.13"
           }
         },
-        "@babel/helper-function-name": {
-          "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==",
+        "@babel/types": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
+          "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
           "dev": true,
           "requires": {
-            "@babel/helper-get-function-arity": "^7.8.3",
-            "@babel/template": "^7.8.3",
-            "@babel/types": "^7.8.3"
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^2.0.0"
           }
         },
-        "@babel/helper-get-function-arity": {
-          "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==",
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.8.3"
+            "ms": "^2.1.1"
           }
         },
-        "@babel/helper-hoist-variables": {
+        "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-function-name": {
+      "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.8.3",
+        "@babel/template": "^7.8.3",
+        "@babel/types": "^7.8.3"
+      }
+    },
+    "@babel/helper-get-function-arity": {
+      "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.8.3"
+      }
+    },
+    "@babel/helper-hoist-variables": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.1.tgz",
+      "integrity": "sha512-vLm5srkU8rI6X3+aQ1rQJyfjvCBLXP8cAGeuw04zeAM2ItKb1e7pmVmLyHb4sDaAYnLL13RHOZPLEtcGZ5xvjg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.10.1"
+      },
+      "dependencies": {
+        "@babel/helper-validator-identifier": {
           "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.1.tgz",
-          "integrity": "sha512-vLm5srkU8rI6X3+aQ1rQJyfjvCBLXP8cAGeuw04zeAM2ItKb1e7pmVmLyHb4sDaAYnLL13RHOZPLEtcGZ5xvjg==",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
+          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
+          "dev": true
+        },
+        "@babel/types": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
+          "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.10.1"
-          },
-          "dependencies": {
-            "@babel/helper-validator-identifier": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-              "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-              "dev": true
-            },
-            "@babel/types": {
-              "version": "7.10.2",
-              "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-              "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-              "dev": true,
-              "requires": {
-                "@babel/helper-validator-identifier": "^7.10.1",
-                "lodash": "^4.17.13",
-                "to-fast-properties": "^2.0.0"
-              }
-            }
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^2.0.0"
           }
-        },
-        "@babel/helper-member-expression-to-functions": {
+        }
+      }
+    },
+    "@babel/helper-member-expression-to-functions": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz",
+      "integrity": "sha512-u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.10.1"
+      },
+      "dependencies": {
+        "@babel/helper-validator-identifier": {
           "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz",
-          "integrity": "sha512-u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g==",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
+          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
+          "dev": true
+        },
+        "@babel/types": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
+          "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.10.1"
-          },
-          "dependencies": {
-            "@babel/helper-validator-identifier": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-              "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-              "dev": true
-            },
-            "@babel/types": {
-              "version": "7.10.2",
-              "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-              "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-              "dev": true,
-              "requires": {
-                "@babel/helper-validator-identifier": "^7.10.1",
-                "lodash": "^4.17.13",
-                "to-fast-properties": "^2.0.0"
-              }
-            }
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
+      }
+    },
+    "@babel/helper-module-imports": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz",
+      "integrity": "sha512-SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.10.1"
+      },
+      "dependencies": {
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
+          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
+          "dev": true
+        },
+        "@babel/types": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
+          "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
+      }
+    },
+    "@babel/helper-module-transforms": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz",
+      "integrity": "sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.10.1",
+        "@babel/helper-replace-supers": "^7.10.1",
+        "@babel/helper-simple-access": "^7.10.1",
+        "@babel/helper-split-export-declaration": "^7.10.1",
+        "@babel/template": "^7.10.1",
+        "@babel/types": "^7.10.1",
+        "lodash": "^4.17.13"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
+          "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.1"
           }
         },
-        "@babel/helper-module-imports": {
+        "@babel/helper-split-export-declaration": {
           "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz",
-          "integrity": "sha512-SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg==",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
+          "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
           "dev": true,
           "requires": {
             "@babel/types": "^7.10.1"
-          },
-          "dependencies": {
-            "@babel/helper-validator-identifier": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-              "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-              "dev": true
-            },
-            "@babel/types": {
-              "version": "7.10.2",
-              "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-              "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-              "dev": true,
-              "requires": {
-                "@babel/helper-validator-identifier": "^7.10.1",
-                "lodash": "^4.17.13",
-                "to-fast-properties": "^2.0.0"
-              }
-            }
           }
         },
-        "@babel/helper-module-transforms": {
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
+          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
+          "dev": true
+        },
+        "@babel/highlight": {
           "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz",
-          "integrity": "sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
+          "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
           "dev": true,
           "requires": {
-            "@babel/helper-module-imports": "^7.10.1",
-            "@babel/helper-replace-supers": "^7.10.1",
-            "@babel/helper-simple-access": "^7.10.1",
-            "@babel/helper-split-export-declaration": "^7.10.1",
-            "@babel/template": "^7.10.1",
-            "@babel/types": "^7.10.1",
-            "lodash": "^4.17.13" >>>
-              >>> > upstream / master
-          },
-          "dependencies": {
-            "@babel/code-frame": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-              "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
-              "dev": true,
-              "requires": {
-                "@babel/highlight": "^7.10.1"
-              }
-            },
-            <<
-            << << < HEAD "@babel/generator": {
-              "version": "7.10.2",
-              "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz",
-              "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==",
-              "dev": true,
-              "requires": {
-                "@babel/types": "^7.10.2",
-                "jsesc": "^2.5.1",
-                "lodash": "^4.17.13",
-                "source-map": "^0.5.0"
-              }
-            },
-            "@babel/helper-function-name": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
-              "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
-              "dev": true,
-              "requires": {
-                "@babel/helper-get-function-arity": "^7.10.1",
-                "@babel/template": "^7.10.1",
-                "@babel/types": "^7.10.1"
-              }
-            },
-            "@babel/helper-get-function-arity": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
-              "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
-              "dev": true,
-              "requires": {
-                "@babel/types": "^7.10.1"
-              }
-            },
-            ===
-            === = >>>
-            >>> > upstream / master "@babel/helper-split-export-declaration": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
-              "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
-              "dev": true,
-              "requires": {
-                "@babel/types": "^7.10.1"
-              }
-            },
-            "@babel/helper-validator-identifier": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-              "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-              "dev": true
-            },
-            "@babel/highlight": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
-              "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
-              "dev": true,
-              "requires": {
-                "@babel/helper-validator-identifier": "^7.10.1",
-                "chalk": "^2.0.0",
-                "js-tokens": "^4.0.0"
-              }
-            },
-            "@babel/parser": {
-              "version": "7.10.2",
-              "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
-              "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
-              "dev": true
-            },
-            "@babel/template": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
-              "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
-              "dev": true,
-              "requires": {
-                "@babel/code-frame": "^7.10.1",
-                "@babel/parser": "^7.10.1",
-                "@babel/types": "^7.10.1"
-              }
-            },
-            <<
-            << << < HEAD "@babel/traverse": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz",
-              "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==",
-              "dev": true,
-              "requires": {
-                "@babel/code-frame": "^7.10.1",
-                "@babel/generator": "^7.10.1",
-                "@babel/helper-function-name": "^7.10.1",
-                "@babel/helper-split-export-declaration": "^7.10.1",
-                "@babel/parser": "^7.10.1",
-                "@babel/types": "^7.10.1",
-                "debug": "^4.1.0",
-                "globals": "^11.1.0",
-                "lodash": "^4.17.13"
-              }
-            },
-            ===
-            === = >>>
-            >>> > upstream / master "@babel/types": {
-              "version": "7.10.2",
-              "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-              "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-              "dev": true,
-              "requires": {
-                "@babel/helper-validator-identifier": "^7.10.1",
-                "lodash": "^4.17.13",
-                "to-fast-properties": "^2.0.0"
-              } <<
-              << << < HEAD
-            },
-            "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
-            }
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
           }
         },
-        "@babel/helper-replace-supers": {
+        "@babel/parser": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
+          "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
+          "dev": true
+        },
+        "@babel/template": {
           "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz",
-          "integrity": "sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
+          "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
           "dev": true,
           "requires": {
-            "@babel/helper-member-expression-to-functions": "^7.10.1",
-            "@babel/helper-optimise-call-expression": "^7.10.1",
-            ===
-            === =
+            "@babel/code-frame": "^7.10.1",
+            "@babel/parser": "^7.10.1",
+            "@babel/types": "^7.10.1"
           }
-        }
-      },
-      "@babel/helper-optimise-call-expression": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz",
-        "integrity": "sha512-a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg==",
-        "dev": true,
-        "requires": {
-          "@babel/types": "^7.10.1"
         },
-        "dependencies": {
-          "@babel/helper-validator-identifier": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-            "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-            "dev": true
-          },
-          "@babel/types": {
-            "version": "7.10.2",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-            "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-validator-identifier": "^7.10.1",
-              "lodash": "^4.17.13",
-              "to-fast-properties": "^2.0.0"
-            }
+        "@babel/types": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
+          "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^2.0.0"
           }
         }
+      }
+    },
+    "@babel/helper-optimise-call-expression": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz",
+      "integrity": "sha512-a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.10.1"
       },
-      "@babel/helper-plugin-utils": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz",
-        "integrity": "sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==",
-        "dev": true
-      },
-      "@babel/helper-regex": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.1.tgz",
-        "integrity": "sha512-7isHr19RsIJWWLLFn21ubFt223PjQyg1HY7CZEMRr820HttHPpVvrsIN3bUOo44DEfFV4kBXO7Abbn9KTUZV7g==",
-        "dev": true,
-        "requires": {
-          "lodash": "^4.17.13"
-        }
-      },
-      "@babel/helper-remap-async-to-generator": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.1.tgz",
-        "integrity": "sha512-RfX1P8HqsfgmJ6CwaXGKMAqbYdlleqglvVtht0HGPMSsy2V6MqLlOJVF/0Qyb/m2ZCi2z3q3+s6Pv7R/dQuZ6A==",
-        "dev": true,
-        "requires": {
-          "@babel/helper-annotate-as-pure": "^7.10.1",
-          "@babel/helper-wrap-function": "^7.10.1",
-          "@babel/template": "^7.10.1",
-          >>>
-          >>> > upstream / master "@babel/traverse": "^7.10.1",
-          "@babel/types": "^7.10.1"
-        },
-        "dependencies": {
-          "@babel/code-frame": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-            "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
-            "dev": true,
-            "requires": {
-              "@babel/highlight": "^7.10.1"
-            }
-          },
-          "@babel/generator": {
-            "version": "7.10.2",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz",
-            "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==",
-            "dev": true,
-            "requires": {
-              "@babel/types": "^7.10.2",
-              "jsesc": "^2.5.1",
-              "lodash": "^4.17.13",
-              "source-map": "^0.5.0"
-            }
-          },
-          "@babel/helper-function-name": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
-            "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-get-function-arity": "^7.10.1",
-              "@babel/template": "^7.10.1",
-              "@babel/types": "^7.10.1"
-            }
-          },
-          "@babel/helper-get-function-arity": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
-            "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
-            "dev": true,
-            "requires": {
-              "@babel/types": "^7.10.1"
-            }
-          },
-          "@babel/helper-split-export-declaration": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
-            "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
-            "dev": true,
-            "requires": {
-              "@babel/types": "^7.10.1"
-            }
-          },
-          "@babel/helper-validator-identifier": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-            "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-            "dev": true
-          },
-          "@babel/highlight": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
-            "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-validator-identifier": "^7.10.1",
-              "chalk": "^2.0.0",
-              "js-tokens": "^4.0.0"
-            }
-          },
-          "@babel/parser": {
-            "version": "7.10.2",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
-            "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
-            "dev": true
-          },
-          "@babel/template": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
-            "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
-            "dev": true,
-            "requires": {
-              "@babel/code-frame": "^7.10.1",
-              "@babel/parser": "^7.10.1",
-              "@babel/types": "^7.10.1"
-            }
-          },
-          "@babel/traverse": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz",
-            "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==",
-            "dev": true,
-            "requires": {
-              "@babel/code-frame": "^7.10.1",
-              "@babel/generator": "^7.10.1",
-              "@babel/helper-function-name": "^7.10.1",
-              "@babel/helper-split-export-declaration": "^7.10.1",
-              "@babel/parser": "^7.10.1",
-              "@babel/types": "^7.10.1",
-              "debug": "^4.1.0",
-              "globals": "^11.1.0",
-              "lodash": "^4.17.13"
-            }
-          },
-          "@babel/types": {
-            "version": "7.10.2",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-            "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-validator-identifier": "^7.10.1",
-              "lodash": "^4.17.13",
-              "to-fast-properties": "^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"
-            }
-          },
-          "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
-          } <<
-          << << < HEAD
-        }
-      },
-      "@babel/helper-simple-access": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz",
-        "integrity": "sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==",
-        "dev": true,
-        "requires": {
-          "@babel/template": "^7.10.1",
-          "@babel/types": "^7.10.1"
-        },
-        "dependencies": {
-          "@babel/code-frame": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-            "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
-            "dev": true,
-            "requires": {
-              "@babel/highlight": "^7.10.1"
-            }
-          },
-          "@babel/helper-validator-identifier": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-            "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-            "dev": true
-          },
-          "@babel/highlight": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
-            "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-validator-identifier": "^7.10.1",
-              "chalk": "^2.0.0",
-              "js-tokens": "^4.0.0"
-            }
-          },
-          "@babel/parser": {
-            "version": "7.10.2",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
-            "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
-            "dev": true
-          },
-          "@babel/template": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
-            "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
-            "dev": true,
-            "requires": {
-              "@babel/code-frame": "^7.10.1",
-              "@babel/parser": "^7.10.1",
-              "@babel/types": "^7.10.1"
-            }
-          },
-          "@babel/types": {
-            "version": "7.10.2",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-            "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-validator-identifier": "^7.10.1",
-              "lodash": "^4.17.13",
-              "to-fast-properties": "^2.0.0"
-            }
+      "dependencies": {
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
+          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
+          "dev": true
+        },
+        "@babel/types": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
+          "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^2.0.0"
           }
         }
+      }
+    },
+    "@babel/helper-plugin-utils": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz",
+      "integrity": "sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==",
+      "dev": true
+    },
+    "@babel/helper-regex": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.1.tgz",
+      "integrity": "sha512-7isHr19RsIJWWLLFn21ubFt223PjQyg1HY7CZEMRr820HttHPpVvrsIN3bUOo44DEfFV4kBXO7Abbn9KTUZV7g==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.13"
+      }
+    },
+    "@babel/helper-remap-async-to-generator": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.1.tgz",
+      "integrity": "sha512-RfX1P8HqsfgmJ6CwaXGKMAqbYdlleqglvVtht0HGPMSsy2V6MqLlOJVF/0Qyb/m2ZCi2z3q3+s6Pv7R/dQuZ6A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.10.1",
+        "@babel/helper-wrap-function": "^7.10.1",
+        "@babel/template": "^7.10.1",
+        "@babel/traverse": "^7.10.1",
+        "@babel/types": "^7.10.1"
       },
-      "@babel/helper-split-export-declaration": {
-        "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.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.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz",
-        "integrity": "sha512-C0MzRGteVDn+H32/ZgbAv5r56f2o1fZSA/rj/TYo8JEJNHg+9BdSmKBUND0shxWRztWhjlT2cvHYuynpPsVJwQ==",
-        "dev": true,
-        "requires": {
-          "@babel/helper-function-name": "^7.10.1",
-          "@babel/template": "^7.10.1",
-          "@babel/traverse": "^7.10.1",
-          ===
-          === =
-        }
-      },
-      "@babel/helper-replace-supers": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz",
-        "integrity": "sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==",
-        "dev": true,
-        "requires": {
-          "@babel/helper-member-expression-to-functions": "^7.10.1",
-          "@babel/helper-optimise-call-expression": "^7.10.1",
-          "@babel/traverse": "^7.10.1",
-          "@babel/types": "^7.10.1"
-        },
-        "dependencies": {
-          "@babel/code-frame": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-            "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
-            "dev": true,
-            "requires": {
-              "@babel/highlight": "^7.10.1"
-            }
-          },
-          "@babel/generator": {
-            "version": "7.10.2",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz",
-            "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==",
-            "dev": true,
-            "requires": {
-              "@babel/types": "^7.10.2",
-              "jsesc": "^2.5.1",
-              "lodash": "^4.17.13",
-              "source-map": "^0.5.0"
-            }
-          },
-          "@babel/helper-function-name": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
-            "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-get-function-arity": "^7.10.1",
-              "@babel/template": "^7.10.1",
-              "@babel/types": "^7.10.1"
-            }
-          },
-          "@babel/helper-get-function-arity": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
-            "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
-            "dev": true,
-            "requires": {
-              "@babel/types": "^7.10.1"
-            }
-          },
-          "@babel/helper-split-export-declaration": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
-            "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
-            "dev": true,
-            "requires": {
-              "@babel/types": "^7.10.1"
-            }
-          },
-          "@babel/helper-validator-identifier": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-            "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-            "dev": true
-          },
-          "@babel/highlight": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
-            "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-validator-identifier": "^7.10.1",
-              "chalk": "^2.0.0",
-              "js-tokens": "^4.0.0"
-            }
-          },
-          "@babel/parser": {
-            "version": "7.10.2",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
-            "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
-            "dev": true
-          },
-          "@babel/template": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
-            "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
-            "dev": true,
-            "requires": {
-              "@babel/code-frame": "^7.10.1",
-              "@babel/parser": "^7.10.1",
-              "@babel/types": "^7.10.1"
-            }
-          },
-          "@babel/traverse": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz",
-            "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==",
-            "dev": true,
-            "requires": {
-              "@babel/code-frame": "^7.10.1",
-              "@babel/generator": "^7.10.1",
-              "@babel/helper-function-name": "^7.10.1",
-              "@babel/helper-split-export-declaration": "^7.10.1",
-              "@babel/parser": "^7.10.1",
-              "@babel/types": "^7.10.1",
-              "debug": "^4.1.0",
-              "globals": "^11.1.0",
-              "lodash": "^4.17.13"
-            }
-          },
-          "@babel/types": {
-            "version": "7.10.2",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-            "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-validator-identifier": "^7.10.1",
-              "lodash": "^4.17.13",
-              "to-fast-properties": "^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"
-            }
-          },
-          "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": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz",
-        "integrity": "sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==",
-        "dev": true,
-        "requires": {
-          "@babel/template": "^7.10.1",
-          >>>
-          >>> > upstream / master "@babel/types": "^7.10.1"
-        },
-        "dependencies": {
-          "@babel/code-frame": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-            "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
-            "dev": true,
-            "requires": {
-              "@babel/highlight": "^7.10.1"
-            }
-          },
-          <<
-          << << < HEAD "@babel/generator": {
-            "version": "7.10.2",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz",
-            "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==",
-            "dev": true,
-            "requires": {
-              "@babel/types": "^7.10.2",
-              "jsesc": "^2.5.1",
-              "lodash": "^4.17.13",
-              "source-map": "^0.5.0"
-            }
-          },
-          "@babel/helper-function-name": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
-            "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-get-function-arity": "^7.10.1",
-              "@babel/template": "^7.10.1",
-              "@babel/types": "^7.10.1"
-            }
-          },
-          "@babel/helper-get-function-arity": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
-            "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
-            "dev": true,
-            "requires": {
-              "@babel/types": "^7.10.1"
-            }
-          },
-          "@babel/helper-split-export-declaration": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
-            "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
-            "dev": true,
-            "requires": {
-              "@babel/types": "^7.10.1"
-            }
-          },
-          ===
-          === = >>>
-          >>> > upstream / master "@babel/helper-validator-identifier": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-            "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-            "dev": true
-          },
-          "@babel/highlight": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
-            "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-validator-identifier": "^7.10.1",
-              "chalk": "^2.0.0",
-              "js-tokens": "^4.0.0"
-            }
-          },
-          "@babel/parser": {
-            "version": "7.10.2",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
-            "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
-            "dev": true
-          },
-          "@babel/template": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
-            "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
-            "dev": true,
-            "requires": {
-              "@babel/code-frame": "^7.10.1",
-              "@babel/parser": "^7.10.1",
-              "@babel/types": "^7.10.1"
-            }
-          },
-          <<
-          << << < HEAD "@babel/traverse": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz",
-            "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==",
-            "dev": true,
-            "requires": {
-              "@babel/code-frame": "^7.10.1",
-              "@babel/generator": "^7.10.1",
-              "@babel/helper-function-name": "^7.10.1",
-              "@babel/helper-split-export-declaration": "^7.10.1",
-              "@babel/parser": "^7.10.1",
-              "@babel/types": "^7.10.1",
-              "debug": "^4.1.0",
-              "globals": "^11.1.0",
-              "lodash": "^4.17.13"
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
+          "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.1"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz",
+          "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.2",
+            "jsesc": "^2.5.1",
+            "lodash": "^4.17.13",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
+          "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.10.1",
+            "@babel/template": "^7.10.1",
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
+          "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
+          "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
+          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
+          "dev": true
+        },
+        "@babel/highlight": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
+          "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
+          "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
+          "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.1",
+            "@babel/parser": "^7.10.1",
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz",
+          "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.1",
+            "@babel/generator": "^7.10.1",
+            "@babel/helper-function-name": "^7.10.1",
+            "@babel/helper-split-export-declaration": "^7.10.1",
+            "@babel/parser": "^7.10.1",
+            "@babel/types": "^7.10.1",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.13"
+          }
+        },
+        "@babel/types": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
+          "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^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"
+          }
+        },
+        "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-replace-supers": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz",
+      "integrity": "sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-member-expression-to-functions": "^7.10.1",
+        "@babel/helper-optimise-call-expression": "^7.10.1",
+        "@babel/traverse": "^7.10.1",
+        "@babel/types": "^7.10.1"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
+          "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.1"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz",
+          "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.2",
+            "jsesc": "^2.5.1",
+            "lodash": "^4.17.13",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
+          "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.10.1",
+            "@babel/template": "^7.10.1",
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
+          "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
+          "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
+          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
+          "dev": true
+        },
+        "@babel/highlight": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
+          "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
+          "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
+          "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.1",
+            "@babel/parser": "^7.10.1",
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz",
+          "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.1",
+            "@babel/generator": "^7.10.1",
+            "@babel/helper-function-name": "^7.10.1",
+            "@babel/helper-split-export-declaration": "^7.10.1",
+            "@babel/parser": "^7.10.1",
+            "@babel/types": "^7.10.1",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.13"
+          }
+        },
+        "@babel/types": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
+          "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^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"
+          }
+        },
+        "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": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz",
+      "integrity": "sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.10.1",
+        "@babel/types": "^7.10.1"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
+          "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.1"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
+          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
+          "dev": true
+        },
+        "@babel/highlight": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
+          "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
+          "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
+          "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.1",
+            "@babel/parser": "^7.10.1",
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/types": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
+          "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "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.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.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz",
+      "integrity": "sha512-C0MzRGteVDn+H32/ZgbAv5r56f2o1fZSA/rj/TYo8JEJNHg+9BdSmKBUND0shxWRztWhjlT2cvHYuynpPsVJwQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.10.1",
+        "@babel/template": "^7.10.1",
+        "@babel/traverse": "^7.10.1",
+        "@babel/types": "^7.10.1"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
+          "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.1"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz",
+          "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.2",
+            "jsesc": "^2.5.1",
+            "lodash": "^4.17.13",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
+          "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.10.1",
+            "@babel/template": "^7.10.1",
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
+          "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
+          "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
+          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
+          "dev": true
+        },
+        "@babel/highlight": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
+          "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
+          "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
+          "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.1",
+            "@babel/parser": "^7.10.1",
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz",
+          "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.1",
+            "@babel/generator": "^7.10.1",
+            "@babel/helper-function-name": "^7.10.1",
+            "@babel/helper-split-export-declaration": "^7.10.1",
+            "@babel/parser": "^7.10.1",
+            "@babel/types": "^7.10.1",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.13"
+          }
+        },
+        "@babel/types": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
+          "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^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"
+          }
+        },
+        "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/helpers": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.1.tgz",
+      "integrity": "sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.10.1",
+        "@babel/traverse": "^7.10.1",
+        "@babel/types": "^7.10.1"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
+          "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.1"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz",
+          "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.2",
+            "jsesc": "^2.5.1",
+            "lodash": "^4.17.13",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
+          "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.10.1",
+            "@babel/template": "^7.10.1",
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
+          "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
+          "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
+          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
+          "dev": true
+        },
+        "@babel/highlight": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
+          "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
+          "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
+          "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.1",
+            "@babel/parser": "^7.10.1",
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz",
+          "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.1",
+            "@babel/generator": "^7.10.1",
+            "@babel/helper-function-name": "^7.10.1",
+            "@babel/helper-split-export-declaration": "^7.10.1",
+            "@babel/parser": "^7.10.1",
+            "@babel/types": "^7.10.1",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.13"
+          }
+        },
+        "@babel/types": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
+          "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^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"
+          }
+        },
+        "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": {
+      "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.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==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/parser": {
+      "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.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.1.tgz",
+      "integrity": "sha512-vzZE12ZTdB336POZjmpblWfNNRpMSua45EYnRigE2XsZxcXcIyly2ixnTJasJE4Zq3U7t2d8rRF7XRUuzHxbOw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/helper-remap-async-to-generator": "^7.10.1",
+        "@babel/plugin-syntax-async-generators": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-dynamic-import": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.1.tgz",
+      "integrity": "sha512-Cpc2yUVHTEGPlmiQzXj026kqwjEQAD9I4ZC16uzdbgWgitg/UHKHLffKNCQZ5+y8jpIZPJcKcwsr2HwPh+w3XA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-json-strings": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.1.tgz",
+      "integrity": "sha512-m8r5BmV+ZLpWPtMY2mOKN7wre6HIO4gfIiV+eOmsnZABNenrt/kzYBwrh+KOfgumSWpnlGs5F70J8afYMSJMBg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/plugin-syntax-json-strings": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-nullish-coalescing-operator": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz",
+      "integrity": "sha512-56cI/uHYgL2C8HVuHOuvVowihhX0sxb3nnfVRzUeVHTWmRHTZrKuAh/OBIMggGU/S1g/1D2CRCXqP+3u7vX7iA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@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.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.1.tgz",
+      "integrity": "sha512-Z+Qri55KiQkHh7Fc4BW6o+QBuTagbOp9txE+4U1i79u9oWlf2npkiDx+Rf3iK3lbcHBuNy9UOkwuR5wOMH3LIQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
+        "@babel/plugin-transform-parameters": "^7.10.1"
+      }
+    },
+    "@babel/plugin-proposal-optional-catch-binding": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz",
+      "integrity": "sha512-VqExgeE62YBqI3ogkGoOJp1R6u12DFZjqwJhqtKc2o5m1YTUuUWnos7bZQFBhwkxIFpWYJ7uB75U7VAPPiKETA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-optional-chaining": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.1.tgz",
+      "integrity": "sha512-dqQj475q8+/avvok72CF3AOSV/SGEcH29zT5hhohqqvvZ2+boQoOr7iGldBG5YXTO2qgCgc2B3WvVLUdbeMlGA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-unicode-property-regex": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.1.tgz",
+      "integrity": "sha512-JjfngYRvwmPwmnbRZyNiPFI8zxCZb8euzbCG/LxyKdeTb59tVciKo9GK9bi6JYKInk1H11Dq9j/zRqIH4KigfQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1"
+      }
+    },
+    "@babel/plugin-syntax-async-generators": {
+      "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.8.0"
+      }
+    },
+    "@babel/plugin-syntax-dynamic-import": {
+      "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.8.0"
+      }
+    },
+    "@babel/plugin-syntax-json-strings": {
+      "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.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.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.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-catch-binding": {
+      "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.8.0"
+      }
+    },
+    "@babel/plugin-syntax-top-level-await": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.1.tgz",
+      "integrity": "sha512-hgA5RYkmZm8FTFT3yu2N9Bx7yVVOKYT6yEdXXo6j2JTm0wNxgqaGeQVaSHRjhfnQbX91DtjFB6McRFSlcJH3xQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1"
+      }
+    },
+    "@babel/plugin-transform-arrow-functions": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz",
+      "integrity": "sha512-6AZHgFJKP3DJX0eCNJj01RpytUa3SOGawIxweHkNX2L6PYikOZmoh5B0d7hIHaIgveMjX990IAa/xK7jRTN8OA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1"
+      }
+    },
+    "@babel/plugin-transform-async-to-generator": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.1.tgz",
+      "integrity": "sha512-XCgYjJ8TY2slj6SReBUyamJn3k2JLUIiiR5b6t1mNCMSvv7yx+jJpaewakikp0uWFQSF7ChPPoe3dHmXLpISkg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/helper-remap-async-to-generator": "^7.10.1"
+      }
+    },
+    "@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.1.tgz",
+      "integrity": "sha512-B7K15Xp8lv0sOJrdVAoukKlxP9N59HS48V1J3U/JGj+Ad+MHq+am6xJVs85AgXrQn4LV8vaYFOB+pr/yIuzW8Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1"
+      }
+    },
+    "@babel/plugin-transform-block-scoping": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.1.tgz",
+      "integrity": "sha512-8bpWG6TtF5akdhIm/uWTyjHqENpy13Fx8chg7pFH875aNLwX8JxIxqm08gmAT+Whe6AOmaTeLPe7dpLbXt+xUw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "lodash": "^4.17.13"
+      }
+    },
+    "@babel/plugin-transform-classes": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.1.tgz",
+      "integrity": "sha512-P9V0YIh+ln/B3RStPoXpEQ/CoAxQIhRSUn7aXqQ+FZJ2u8+oCtjIXR3+X0vsSD8zv+mb56K7wZW1XiDTDGiDRQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.10.1",
+        "@babel/helper-define-map": "^7.10.1",
+        "@babel/helper-function-name": "^7.10.1",
+        "@babel/helper-optimise-call-expression": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/helper-replace-supers": "^7.10.1",
+        "@babel/helper-split-export-declaration": "^7.10.1",
+        "globals": "^11.1.0"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
+          "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.1"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
+          "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.10.1",
+            "@babel/template": "^7.10.1",
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
+          "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
+          "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
+          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
+          "dev": true
+        },
+        "@babel/highlight": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
+          "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
+          "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
+          "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.1",
+            "@babel/parser": "^7.10.1",
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/types": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
+          "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
+      }
+    },
+    "@babel/plugin-transform-computed-properties": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.1.tgz",
+      "integrity": "sha512-mqSrGjp3IefMsXIenBfGcPXxJxweQe2hEIwMQvjtiDQ9b1IBvDUjkAtV/HMXX47/vXf14qDNedXsIiNd1FmkaQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1"
+      }
+    },
+    "@babel/plugin-transform-destructuring": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz",
+      "integrity": "sha512-V/nUc4yGWG71OhaTH705pU8ZSdM6c1KmmLP8ys59oOYbT7RpMYAR3MsVOt6OHL0WzG7BlTU076va9fjJyYzJMA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1"
+      }
+    },
+    "@babel/plugin-transform-dotall-regex": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.1.tgz",
+      "integrity": "sha512-19VIMsD1dp02RvduFUmfzj8uknaO3uiHHF0s3E1OHnVsNj8oge8EQ5RzHRbJjGSetRnkEuBYO7TG1M5kKjGLOA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1"
+      }
+    },
+    "@babel/plugin-transform-duplicate-keys": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.1.tgz",
+      "integrity": "sha512-wIEpkX4QvX8Mo9W6XF3EdGttrIPZWozHfEaDTU0WJD/TDnXMvdDh30mzUl/9qWhnf7naicYartcEfUghTCSNpA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1"
+      }
+    },
+    "@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz",
+      "integrity": "sha512-lr/przdAbpEA2BUzRvjXdEDLrArGRRPwbaF9rvayuHRvdQ7lUTTkZnhZrJ4LE2jvgMRFF4f0YuPQ20vhiPYxtA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1"
+      }
+    },
+    "@babel/plugin-transform-for-of": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz",
+      "integrity": "sha512-US8KCuxfQcn0LwSCMWMma8M2R5mAjJGsmoCBVwlMygvmDUMkTCykc84IqN1M7t+agSfOmLYTInLCHJM+RUoz+w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1"
+      }
+    },
+    "@babel/plugin-transform-function-name": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz",
+      "integrity": "sha512-//bsKsKFBJfGd65qSNNh1exBy5Y9gD9ZN+DvrJ8f7HXr4avE5POW6zB7Rj6VnqHV33+0vXWUwJT0wSHubiAQkw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
+          "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.1"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
+          "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.10.1",
+            "@babel/template": "^7.10.1",
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
+          "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
+          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
+          "dev": true
+        },
+        "@babel/highlight": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
+          "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
+          "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
+          "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.1",
+            "@babel/parser": "^7.10.1",
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/types": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
+          "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
+      }
+    },
+    "@babel/plugin-transform-literals": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz",
+      "integrity": "sha512-qi0+5qgevz1NHLZroObRm5A+8JJtibb7vdcPQF1KQE12+Y/xxl8coJ+TpPW9iRq+Mhw/NKLjm+5SHtAHCC7lAw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1"
+      }
+    },
+    "@babel/plugin-transform-member-expression-literals": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.1.tgz",
+      "integrity": "sha512-UmaWhDokOFT2GcgU6MkHC11i0NQcL63iqeufXWfRy6pUOGYeCGEKhvfFO6Vz70UfYJYHwveg62GS83Rvpxn+NA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1"
+      }
+    },
+    "@babel/plugin-transform-modules-amd": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.1.tgz",
+      "integrity": "sha512-31+hnWSFRI4/ACFr1qkboBbrTxoBIzj7qA69qlq8HY8p7+YCzkCT6/TvQ1a4B0z27VeWtAeJd6pr5G04dc1iHw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      }
+    },
+    "@babel/plugin-transform-modules-commonjs": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz",
+      "integrity": "sha512-AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/helper-simple-access": "^7.10.1",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      }
+    },
+    "@babel/plugin-transform-modules-systemjs": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.1.tgz",
+      "integrity": "sha512-ewNKcj1TQZDL3YnO85qh9zo1YF1CHgmSTlRQgHqe63oTrMI85cthKtZjAiZSsSNjPQ5NCaYo5QkbYqEw1ZBgZA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-hoist-variables": "^7.10.1",
+        "@babel/helper-module-transforms": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      }
+    },
+    "@babel/plugin-transform-modules-umd": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.1.tgz",
+      "integrity": "sha512-EIuiRNMd6GB6ulcYlETnYYfgv4AxqrswghmBRQbWLHZxN4s7mupxzglnHqk9ZiUpDI4eRWewedJJNj67PWOXKA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1"
+      }
+    },
+    "@babel/plugin-transform-named-capturing-groups-regex": {
+      "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": {
+        "@babel/helper-create-regexp-features-plugin": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-new-target": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.1.tgz",
+      "integrity": "sha512-MBlzPc1nJvbmO9rPr1fQwXOM2iGut+JC92ku6PbiJMMK7SnQc1rytgpopveE3Evn47gzvGYeCdgfCDbZo0ecUw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1"
+      }
+    },
+    "@babel/plugin-transform-object-super": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.1.tgz",
+      "integrity": "sha512-WnnStUDN5GL+wGQrJylrnnVlFhFmeArINIR9gjhSeYyvroGhBrSAXYg/RHsnfzmsa+onJrTJrEClPzgNmmQ4Gw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/helper-replace-supers": "^7.10.1"
+      }
+    },
+    "@babel/plugin-transform-parameters": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz",
+      "integrity": "sha512-tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-get-function-arity": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1"
+      },
+      "dependencies": {
+        "@babel/helper-get-function-arity": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
+          "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.1"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
+          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
+          "dev": true
+        },
+        "@babel/types": {
+          "version": "7.10.2",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
+          "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
+      }
+    },
+    "@babel/plugin-transform-property-literals": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.1.tgz",
+      "integrity": "sha512-Kr6+mgag8auNrgEpbfIWzdXYOvqDHZOF0+Bx2xh4H2EDNwcbRb9lY6nkZg8oSjsX+DH9Ebxm9hOqtKW+gRDeNA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1"
+      }
+    },
+    "@babel/plugin-transform-regenerator": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.1.tgz",
+      "integrity": "sha512-B3+Y2prScgJ2Bh/2l9LJxKbb8C8kRfsG4AdPT+n7ixBHIxJaIG8bi8tgjxUMege1+WqSJ+7gu1YeoMVO3gPWzw==",
+      "dev": true,
+      "requires": {
+        "regenerator-transform": "^0.14.2"
+      }
+    },
+    "@babel/plugin-transform-reserved-words": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.1.tgz",
+      "integrity": "sha512-qN1OMoE2nuqSPmpTqEM7OvJ1FkMEV+BjVeZZm9V9mq/x1JLKQ4pcv8riZJMNN3u2AUGl0ouOMjRr2siecvHqUQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1"
+      }
+    },
+    "@babel/plugin-transform-shorthand-properties": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz",
+      "integrity": "sha512-AR0E/lZMfLstScFwztApGeyTHJ5u3JUKMjneqRItWeEqDdHWZwAOKycvQNCasCK/3r5YXsuNG25funcJDu7Y2g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1"
+      }
+    },
+    "@babel/plugin-transform-spread": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz",
+      "integrity": "sha512-8wTPym6edIrClW8FI2IoaePB91ETOtg36dOkj3bYcNe7aDMN2FXEoUa+WrmPc4xa1u2PQK46fUX2aCb+zo9rfw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1"
+      }
+    },
+    "@babel/plugin-transform-sticky-regex": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz",
+      "integrity": "sha512-j17ojftKjrL7ufX8ajKvwRilwqTok4q+BjkknmQw9VNHnItTyMP5anPFzxFJdCQs7clLcWpCV3ma+6qZWLnGMA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/helper-regex": "^7.10.1"
+      }
+    },
+    "@babel/plugin-transform-template-literals": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.1.tgz",
+      "integrity": "sha512-t7B/3MQf5M1T9hPCRG28DNGZUuxAuDqLYS03rJrIk2prj/UV7Z6FOneijhQhnv/Xa039vidXeVbvjK2SK5f7Gg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1"
+      }
+    },
+    "@babel/plugin-transform-typeof-symbol": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.1.tgz",
+      "integrity": "sha512-qX8KZcmbvA23zDi+lk9s6hC1FM7jgLHYIjuLgULgc8QtYnmB3tAVIYkNoKRQ75qWBeyzcoMoK8ZQmogGtC/w0g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.1"
+      }
+    },
+    "@babel/plugin-transform-unicode-regex": {
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz",
+      "integrity": "sha512-Y/2a2W299k0VIUdbqYm9X2qS6fE0CUBhhiPpimK6byy7OJ/kORLlIX+J6UrjgNu5awvs62k+6RSslxhcvVw2Tw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.1"
+      }
+    },
+    "@babel/preset-env": {
+      "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-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
+      }
+    },
+    "@babel/runtime": {
+      "version": "7.10.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz",
+      "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==",
+      "dev": true,
+      "requires": {
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
+    "@babel/template": {
+      "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.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.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.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",
+          "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/types": {
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz",
+      "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.9.0",
+        "lodash": "^4.17.13",
+        "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://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"
+      }
+    },
+    "@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",
+      "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": {
+        "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"
+          }
+        }
+      }
+    },
+    "@jsdevtools/ono": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.2.tgz",
+      "integrity": "sha512-qS/a24RA5FEoiJS9wiv6Pwg2c/kiUo3IVUQcfeM9JvsR6pM8Yx+yl/6xWYLckZCT5jpLNhslgjiA8p/XcGyMRQ==",
+      "dev": true
+    },
+    "@ngrx/effects": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-9.2.0.tgz",
+      "integrity": "sha512-8V09zDIPehGpzgfcgyczelovsVYJvDQhN9wHt37K5A+YCG0CI8nj8FmKokHATwv/S62YqFrOVnr/TZacxpDhBw=="
+    },
+    "@ngrx/router-store": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-9.2.0.tgz",
+      "integrity": "sha512-thu6aU9YWM64oNEk4Srx/mNSeQ2SPJKlTji8MSzfr06qgCMyPSXZBYlfs8HqY+af3eB7XBEhb/4ew4JJ6xC9zw=="
+    },
+    "@ngrx/store": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-9.2.0.tgz",
+      "integrity": "sha512-V8AI3mxbMztVpbZpALkLZYlGkofKcu9GaOCY5e+sZ1VcJ90oxhFjBpnmd6MuVdmhep1XAHALb1B8ZbBFn+xsgQ=="
+    },
+    "@ngrx/store-devtools": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-9.2.0.tgz",
+      "integrity": "sha512-/FvgcpjO4IvwNFnRVoHGikAvckr6fxKf4NgYoTQ9giI8xavolLvuQUHxzH20legi5dgZz34ii2m2g1Q7OxEV8w=="
+    },
+    "@ngtools/webpack": {
+      "version": "9.1.7",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-9.1.7.tgz",
+      "integrity": "sha512-A7VB2I42Kn+7jl0tDKzGNLAoZLWSqkKo9Hg1bmKpvAAIz+DSbq3uV+JWgGgTprM3tn0lfkVgmqk4H17HKwAOcg==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/core": "9.1.7",
+        "enhanced-resolve": "4.1.1",
+        "rxjs": "6.5.4",
+        "webpack-sources": "1.4.3"
+      },
+      "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"
+          }
+        }
+      }
+    },
+    "@nodelib/fs.scandir": {
+      "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.3",
+        "run-parallel": "^1.1.9"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "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.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.3",
+        "fastq": "^1.6.0"
+      }
+    },
+    "@rollup/plugin-commonjs": {
+      "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.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"
+      }
+    },
+    "@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.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.8",
+        "@types/resolve": "0.0.8",
+        "builtin-modules": "^3.1.0",
+        "is-module": "^1.0.0",
+        "resolve": "^1.14.2"
+      },
+      "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"
+          }
+        },
+        "@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"
+          }
+        },
+        "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="
+        },
+        "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="
+        },
+        "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==",
+          "requires": {
+            "sourcemap-codec": "^1.4.4"
+          }
+        },
+        "resolve": {
+          "version": "1.17.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+          "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+          "dev": true,
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        },
+        "rxjs": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
+          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        }
+      }
+    },
+    "@rollup/pluginutils": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.9.tgz",
+      "integrity": "sha512-TLZavlfPAZYI7v33wQh4mTP6zojne14yok3DNSLcjoG/Hirxfkonn6icP5rrNWRn8nZsirJBFFpijVOJzkUHDg==",
+      "dev": true,
+      "requires": {
+        "@types/estree": "0.0.39",
+        "estree-walker": "^1.0.1",
+        "micromatch": "^4.0.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        },
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
+        },
+        "cliui": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+          "requires": {
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.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=="
+        },
+        "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="
+        },
+        "lcid": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+          "requires": {
+            "invert-kv": "^2.0.0"
+          }
+        },
+        "mem": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+          "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+          "requires": {
+            "map-age-cleaner": "^0.1.1",
+            "mimic-fn": "^2.0.0"
+          }
+        },
+        "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"
+          }
+        },
+        "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==",
+          "requires": {
+            "execa": "^1.0.0",
+            "lcid": "^2.0.0",
+            "mem": "^4.0.0"
+          }
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "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=",
+          "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="
+        },
+        "y18n": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
+        },
+        "yargs": {
+          "version": "11.1.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.1.tgz",
+          "integrity": "sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==",
+          "requires": {
+            "cliui": "^4.0.0",
+            "decamelize": "^1.1.1",
+            "find-up": "^2.1.0",
+            "os-locale": "^3.1.0",
+            "require-directory": "^2.1.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^2.0.0",
+            "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=",
+              "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==",
+          "requires": {
+            "camelcase": "^4.1.0"
+          }
+        }
+      }
+    },
+    "@schematics/angular": {
+      "version": "9.1.7",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.7.tgz",
+      "integrity": "sha512-ld3WcoMWvup04V3OWioQ+AFGQBzz7IDM4Fxc5+Qc3wILWkDJnNkrc4EmJAow96Ab4/T1+Wl1vof3tV4At0BTzA==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/core": "9.1.7",
+        "@angular-devkit/schematics": "9.1.7"
+      }
+    },
+    "@schematics/update": {
+      "version": "0.901.7",
+      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.901.7.tgz",
+      "integrity": "sha512-6IpQVFvbu47CrXfqqHAzv2vi7AOdfi1S+SiayXU6FWTeA2wV47H8R60VjxurL8JkDGoVhFgC4+lK6KG++g3dQw==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/core": "9.1.7",
+        "@angular-devkit/schematics": "9.1.7",
+        "@yarnpkg/lockfile": "1.1.0",
+        "ini": "1.3.5",
+        "npm-package-arg": "^8.0.0",
+        "pacote": "9.5.12",
+        "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.4",
+      "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-13.0.4.tgz",
+      "integrity": "sha512-4EvwclbctVQ5VzPBC63DJsg+jwQU/NlR/yQ9ObVH5acefEbS8kupn3cp/gaWftLTQ0jdXqRqycHNkLOQZfa3XQ==",
+      "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"
+      }
+    },
+    "@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",
+      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
+      "dev": true,
+      "requires": {
+        "defer-to-connect": "^1.0.1"
+      }
+    },
+    "@tootallnate/once": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.0.0.tgz",
+      "integrity": "sha512-KYyTT/T6ALPkIRd2Ge080X/BsXvy9O0hcWTtMWkPvwAwF99+vn6Dv4GzrFT/Nn1LePr+FFDbRXXlqmsy9lw2zA==",
+      "dev": true
+    },
+    "@tweenjs/tween.js": {
+      "version": "17.4.0",
+      "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-17.4.0.tgz",
+      "integrity": "sha512-J3fzl1F6wvh8KXVVcIuHN12xi1ZDcPA/0Vix+ZcJYwZWVHUwfIqfvzYXXEw7ybeev6477KCTt9fKydU+ajUqcg=="
+    },
+    "@types/caseless": {
+      "version": "0.12.2",
+      "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz",
+      "integrity": "sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==",
+      "dev": true
+    },
+    "@types/circular-json": {
+      "version": "0.4.0",
+      "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",
+      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
+      "dev": true
+    },
+    "@types/glob": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-VgNIkxK+j7Nz5P7jvUZlRvhuPSmsEfS03b0alKcq5V/STUKAa3Plemsn5mrQUO7am6OErJ4rhGEGJbACclrtRA==",
+      "dev": true,
+      "requires": {
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/jasmine": {
+      "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": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.8.tgz",
+      "integrity": "sha512-d9p31r7Nxk0ZH0U39PTH0hiDlJ+qNVGjlt1ucOoTUptxb2v+Y5VMnsxfwN+i3hK4yQnqBi3FMmoMFcd1JHDxdg==",
+      "dev": true,
+      "requires": {
+        "@types/jasmine": "*"
+      }
+    },
+    "@types/json-schema": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz",
+      "integrity": "sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ==",
+      "dev": true
+    },
+    "@types/karma": {
+      "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/node": "*",
+        "log4js": "^4.0.0"
+      }
+    },
+    "@types/marked": {
+      "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",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+      "dev": true
+    },
+    "@types/moment-timezone": {
+      "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": "13.13.11",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.11.tgz",
+      "integrity": "sha512-FX7mIFKfnGCfq10DGWNhfCNxhACEeqH5uulT6wRRA1KEt7zgLe0HdrAd9/QQkObDqp2Z0KEV3OAmNgs0lTx5tQ==",
+      "dev": true
+    },
+    "@types/normalize-package-data": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+      "dev": true
+    },
+    "@types/q": {
+      "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.4",
+      "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.4.tgz",
+      "integrity": "sha512-W1t1MTKYR8PxICH+A4HgEIPuAC3sbljoEVfyZbeFJJDbr30guDspJri2XOaM2E+Un7ZjrihaDi7cf6fPa2tbgw==",
+      "dev": true,
+      "requires": {
+        "@types/caseless": "*",
+        "@types/node": "*",
+        "@types/tough-cookie": "*",
+        "form-data": "^2.5.0"
+      },
+      "dependencies": {
+        "form-data": {
+          "version": "2.5.1",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
+          "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+          "dev": true,
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.6",
+            "mime-types": "^2.1.12"
+          }
+        }
+      }
+    },
+    "@types/resolve": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz",
+      "integrity": "sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/selenium-webdriver": {
+      "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": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
+      "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
+      "dev": true
+    },
+    "@types/stacktrace-js": {
+      "version": "0.0.32",
+      "resolved": "https://registry.npmjs.org/@types/stacktrace-js/-/stacktrace-js-0.0.32.tgz",
+      "integrity": "sha512-SdxmlrHfO0BxgbBP9HZWMUo2rima8lwMjPiWm6S0dyKkDa5CseamktFhXg8umu3TPVBkSlX6ZoB5uUDJK89yvg=="
+    },
+    "@types/tough-cookie": {
+      "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.8",
+      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.8.tgz",
+      "integrity": "sha512-JHB2/xZlXOjzjBB6fMOpH1eQAfsrpqVVIbneE0Rok16WXwFaznaI5vfg75U5WgGJm7V9W1c4xeRQDjX/zwvghA==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*",
+        "@types/source-list-map": "*",
+        "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
+        }
+      }
+    },
+    "@webassemblyjs/ast": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
+      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5"
+      }
+    },
+    "@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
+      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-api-error": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
+      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-buffer": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
+      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-code-frame": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
+      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/wast-printer": "1.8.5"
+      }
+    },
+    "@webassemblyjs/helper-fsm": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
+      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-module-context": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
+      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "mamacro": "^0.0.3"
+      }
+    },
+    "@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
+      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-wasm-section": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
+      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5"
+      }
+    },
+    "@webassemblyjs/ieee754": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
+      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
+      "dev": true,
+      "requires": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "@webassemblyjs/leb128": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
+      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
+      "dev": true,
+      "requires": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/utf8": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
+      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
+      "dev": true
+    },
+    "@webassemblyjs/wasm-edit": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
+      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/helper-wasm-section": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-opt": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "@webassemblyjs/wast-printer": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wasm-gen": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
+      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wasm-opt": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
+      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wasm-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
+      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wast-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
+      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-code-frame": "1.8.5",
+        "@webassemblyjs/helper-fsm": "1.8.5",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/wast-printer": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
+      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true
+    },
+    "@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true
+    },
+    "@yarnpkg/lockfile": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
+      "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.0.9",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
+      "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
+      "dev": true
+    },
+    "accepts": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "dev": true,
+      "requires": {
+        "mime-types": "~2.1.24",
+        "negotiator": "0.6.2"
+      }
+    },
+    "acorn": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz",
+      "integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==",
+      "dev": true
+    },
+    "acorn-jsx": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
+      "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
+      "dev": true,
+      "requires": {
+        "acorn": "^3.0.4"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
+          "dev": true
+        }
+      }
+    },
+    "adm-zip": {
+      "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": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
+      "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
+      "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==",
+      "dev": true,
+      "requires": {
+        "es6-promisify": "^5.0.0"
+      }
+    },
+    "agentkeepalive": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz",
+      "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==",
+      "dev": true,
+      "requires": {
+        "humanize-ms": "^1.2.1"
+      }
+    },
+    "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": {
+        "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"
+      }
+    },
+    "ajv-errors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
+      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="
+    },
+    "ajv-keywords": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
+      "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ=="
+    },
+    "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,
+      "optional": true
+    },
+    "angular2-virtual-scroll": {
+      "version": "0.4.16",
+      "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.1.0"
+      }
+    },
+    "ansi-align": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
+      "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
+      "dev": true,
+      "requires": {
+        "string-width": "^3.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==",
+          "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==",
+          "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
+        },
+        "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==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.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==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "ansi-colors": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
+      "dev": true
+    },
+    "ansi-escapes": {
+      "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.11.0"
+      }
+    },
+    "ansi-gray": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
+      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
+      "dev": true,
+      "requires": {
+        "ansi-wrap": "0.1.0"
+      }
+    },
+    "ansi-html": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
+      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "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"
+      }
+    },
+    "ansi-wrap": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
+      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
+      "dev": true
+    },
+    "any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
+      "dev": true
+    },
+    "anymatch": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "requires": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      }
+    },
+    "app-root-path": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.2.1.tgz",
+      "integrity": "sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==",
+      "dev": true
+    },
+    "append-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
+      "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
+      "dev": true,
+      "requires": {
+        "buffer-equal": "^1.0.0"
+      }
+    },
+    "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"
+      }
+    },
+    "aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "dev": true
+    },
+    "archy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
+      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
+      "dev": true
+    },
+    "arg": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "dev": true
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "argv": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/argv/-/argv-0.0.2.tgz",
+      "integrity": "sha1-7L0W+JSbFXGDcRsb2jNPN4QBhas=",
+      "dev": true
+    },
+    "aria-query": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz",
+      "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=",
+      "dev": true,
+      "requires": {
+        "ast-types-flow": "0.0.7",
+        "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=",
+      "dev": true
+    },
+    "arr-filter": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
+      "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
+      "dev": true,
+      "requires": {
+        "make-iterator": "^1.0.0"
+      }
+    },
+    "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==",
+      "dev": true
+    },
+    "arr-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
+      "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
+      "dev": true,
+      "requires": {
+        "make-iterator": "^1.0.0"
+      }
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true
+    },
+    "array-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
+      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
+      "dev": true
+    },
+    "array-flatten": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
+      "dev": true
+    },
+    "array-initial": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
+      "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
+      "dev": true,
+      "requires": {
+        "array-slice": "^1.0.0",
+        "is-number": "^4.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "dev": true
+        }
+      }
+    },
+    "array-last": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
+      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
+      "dev": true,
+      "requires": {
+        "is-number": "^4.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "dev": true
+        }
+      }
+    },
+    "array-slice": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
+      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+      "dev": true
+    },
+    "array-sort": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
+      "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
+      "dev": true,
+      "requires": {
+        "default-compare": "^1.0.0",
+        "get-value": "^2.0.6",
+        "kind-of": "^5.0.2"
+      },
+      "dependencies": {
+        "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==",
+          "dev": true
+        }
+      }
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "requires": {
+        "array-uniq": "^1.0.1"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true
+    },
+    "array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+      "dev": true
+    },
+    "arraybuffer.slice": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
+      "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
+      "dev": true
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "dev": true
+    },
+    "asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
+      "dev": true
+    },
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "asn1.js": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "dev": true
+        }
+      }
+    },
+    "assert": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "dev": true,
+      "requires": {
+        "object-assign": "^4.1.1",
+        "util": "0.10.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
+        },
+        "util": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.1"
+          }
+        }
+      }
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "dev": true
+    },
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "dev": true
+    },
+    "ast-types-flow": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+      "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
+      "dev": true
+    },
+    "async": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.14"
+      }
+    },
+    "async-array-reduce": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/async-array-reduce/-/async-array-reduce-0.2.1.tgz",
+      "integrity": "sha1-yL4BCitc0A3qlsgRFgNGk9/dgtE=",
+      "dev": true
+    },
+    "async-done": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
+      "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
+      "dev": true,
+      "requires": {
+        "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==",
+      "dev": true
+    },
+    "async-limiter": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
+      "dev": true
+    },
+    "async-settle": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
+      "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
+      "dev": true,
+      "requires": {
+        "async-done": "^1.2.2"
+      }
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "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",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true
+    },
+    "autoprefixer": {
+      "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.8.3",
+        "caniuse-lite": "^1.0.30001020",
+        "chalk": "^2.4.2",
+        "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "postcss": "^7.0.26",
+        "postcss-value-parser": "^4.0.2"
+      }
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "dev": true
+    },
+    "aws4": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
+      "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==",
+      "dev": true
+    },
+    "axobject-query": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz",
+      "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==",
+      "dev": true,
+      "requires": {
+        "ast-types-flow": "0.0.7"
+      }
+    },
+    "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": {
+        "find-cache-dir": "^2.0.0",
+        "loader-utils": "^1.0.2",
+        "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==",
+          "dev": true,
+          "requires": {
+            "commondir": "^1.0.1",
+            "make-dir": "^2.0.0",
+            "pkg-dir": "^3.0.0"
+          },
+          "dependencies": {
+            "commondir": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+              "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+              "dev": true
+            },
+            "pkg-dir": {
+              "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": {
+          "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"
+          }
+        },
+        "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"
+          }
+        },
+        "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.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": "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
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        }
+      }
+    },
+    "babel-plugin-dynamic-import-node": {
+      "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"
+      }
+    },
+    "bach": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
+      "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
+      "dev": true,
+      "requires": {
+        "arr-filter": "^1.1.1",
+        "arr-flatten": "^1.0.1",
+        "arr-map": "^2.0.0",
+        "array-each": "^1.0.0",
+        "array-initial": "^1.0.0",
+        "array-last": "^1.1.1",
+        "async-done": "^1.2.2",
+        "async-settle": "^1.0.0",
+        "now-and-later": "^2.0.0"
+      }
+    },
+    "backo2": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
+      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "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",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "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"
+          }
+        },
+        "is-accessor-descriptor": {
+          "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"
+          }
+        },
+        "is-data-descriptor": {
+          "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"
+          }
+        },
+        "is-descriptor": {
+          "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",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "base64-arraybuffer": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
+      "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
+      "dev": true
+    },
+    "base64-js": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
+      "dev": true
+    },
+    "base64id": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
+      "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
+      "dev": true
+    },
+    "batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
+      "dev": true
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "dev": true,
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "better-assert": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
+      "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
+      "dev": true,
+      "requires": {
+        "callsite": "1.0.0"
+      }
+    },
+    "big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
+    },
+    "binary-extensions": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+      "dev": true
+    },
+    "blob": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
+      "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==",
+      "dev": true
+    },
+    "blocking-proxy": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/blocking-proxy/-/blocking-proxy-1.0.1.tgz",
+      "integrity": "sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.0"
+      }
+    },
+    "bluebird": {
+      "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": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz",
+      "integrity": "sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==",
+      "dev": true
+    },
+    "body-parser": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "dev": true,
+      "requires": {
+        "bytes": "3.1.0",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "on-finished": "~2.3.0",
+        "qs": "6.7.0",
+        "raw-body": "2.4.0",
+        "type-is": "~1.6.17"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+          "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+          "dev": true
+        },
+        "qs": {
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+          "dev": true
+        }
+      }
+    },
+    "bonjour": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
+      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
+      "dev": true,
+      "requires": {
+        "array-flatten": "^2.1.0",
+        "deep-equal": "^1.0.1",
+        "dns-equal": "^1.0.0",
+        "dns-txt": "^2.0.2",
+        "multicast-dns": "^6.0.1",
+        "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": "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": "^3.0.0",
+        "cli-boxes": "^2.2.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": "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": {
+          "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": "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"
+          }
+        },
+        "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.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+          "dev": 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,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "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"
+      }
+    },
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "requires": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "requires": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "browserify-rsa": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "randombytes": "^2.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "dev": true
+        }
+      }
+    },
+    "browserify-sign": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.0.tgz",
+      "integrity": "sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA==",
+      "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",
+        "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
+        }
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "dev": true,
+      "requires": {
+        "pako": "~1.0.5"
+      }
+    },
+    "browserslist": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz",
+      "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==",
+      "dev": true,
+      "requires": {
+        "caniuse-lite": "^1.0.30001043",
+        "electron-to-chromium": "^1.3.413",
+        "node-releases": "^1.1.53",
+        "pkg-up": "^2.0.0"
+      }
+    },
+    "browserstack": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.5.3.tgz",
+      "integrity": "sha512-AO+mECXsW4QcqC9bxwM29O7qWa7bJT94uBFzeb5brylIQwawuEziwq20dPYbins95GlWzOawgyDNdjYAo32EKg==",
+      "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.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": "^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.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",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "dev": true
+    },
+    "buffer-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
+      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
+      "dev": true
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "dev": true
+    },
+    "buffer-indexof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
+      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
+      "dev": true
+    },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "builtin-modules": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz",
+      "integrity": "sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==",
+      "dev": true
+    },
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true
+    },
+    "builtins": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
+      "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=",
+      "dev": true
+    },
+    "bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+      "dev": true
+    },
+    "cacache": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.0.tgz",
+      "integrity": "sha512-L0JpXHhplbJSiDGzyJJnJCTL7er7NzbBgxzVqLswEb4bO91Zbv17OUMuUeu/q0ZwKn3V+1HM4wb9tO4eVE/K8g==",
+      "dev": true,
+      "requires": {
+        "chownr": "^1.1.2",
+        "fs-minipass": "^2.0.0",
+        "glob": "^7.1.4",
+        "infer-owner": "^1.0.4",
+        "lru-cache": "^5.1.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.7.1",
+        "ssri": "^8.0.0",
+        "tar": "^6.0.1",
+        "unique-filename": "^1.1.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"
+          },
+          "dependencies": {
+            "fs.realpath": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+              "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+              "dev": true
+            },
+            "inflight": {
+              "version": "1.0.6",
+              "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+              "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+              "dev": true,
+              "requires": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+              }
+            }
+          }
+        },
+        "minipass": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
+          "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        }
+      }
+    },
+    "cache-base": {
+      "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",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      }
+    },
+    "cacheable-request": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
+      "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
+      "dev": true,
+      "requires": {
+        "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": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
+          "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "http-cache-semantics": {
+          "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
+        },
+        "lowercase-keys": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+          "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+          "dev": true
+        },
+        "normalize-url": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
+          "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
+          "dev": true
+        },
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        }
+      }
+    },
+    "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
+        }
+      }
+    },
+    "call-me-maybe": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
+      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
+      "dev": true
+    },
+    "caller-callsite": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
+      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
+      "dev": true,
+      "requires": {
+        "callsites": "^2.0.0"
+      }
+    },
+    "caller-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
+      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
+      "dev": true,
+      "requires": {
+        "caller-callsite": "^2.0.0"
+      }
+    },
+    "callsite": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
+      "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=",
+      "dev": true
+    },
+    "callsites": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
+      "dev": true
+    },
+    "camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "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.30001079",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001079.tgz",
+      "integrity": "sha512-2KaYheg0iOY+CMmDuAB3DHehrXhhb4OZU4KBVGDr/YKyYAcpudaiUQ9PJ9rxrPlKEoJ3ATasQ5AN48MqpwS43Q==",
+      "dev": true
+    },
+    "canonical-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/canonical-path/-/canonical-path-1.0.0.tgz",
+      "integrity": "sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==",
+      "dev": true
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "dev": true
+    },
+    "chalk": {
+      "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.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"
+          }
+        }
+      }
+    },
+    "chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+      "dev": true
+    },
+    "chokidar": {
+      "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",
+        "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.4.0"
+      },
+      "dependencies": {
+        "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"
+          }
+        }
+      }
+    },
+    "chownr": {
+      "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": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
+      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "ci-info": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+      "dev": true
+    },
+    "cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "circular-dependency-plugin": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz",
+      "integrity": "sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw==",
+      "dev": true
+    },
+    "circular-json": {
+      "version": "0.5.9",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz",
+      "integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ=="
+    },
+    "class-utils": {
+      "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",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "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"
+          }
+        }
+      }
+    },
+    "clean-css": {
+      "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"
+      },
+      "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
+        }
+      }
+    },
+    "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",
+      "integrity": "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==",
+      "dev": true
+    },
+    "cli-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-2.0.0.tgz",
+      "integrity": "sha512-a0VZ8LeraW0jTuCkuAGMNufareGHhyZU9z8OGsW0gXd1hZGi1SRuNRXdbGkraBBKnhyUhyebFWnRbp+dIn0f0A==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.1.1",
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.51",
+        "es6-iterator": "^2.0.3",
+        "memoizee": "^0.4.14",
+        "timers-ext": "^0.1.7"
+      }
+    },
+    "cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "requires": {
+        "restore-cursor": "^3.1.0"
+      }
+    },
+    "cli-spinners": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.3.0.tgz",
+      "integrity": "sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w==",
+      "dev": true
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+      "dev": true
+    },
+    "cliui": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+      "dev": true,
+      "requires": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
+      },
+      "dependencies": {
+        "wrap-ansi": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+          "dev": true,
+          "requires": {
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1"
+          }
+        }
+      }
+    },
+    "clone": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+      "dev": true
+    },
+    "clone-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
+      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
+      "dev": true
+    },
+    "clone-deep": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+      "dev": true,
+      "requires": {
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
+      }
+    },
+    "clone-response": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
+      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
+      "dev": true,
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
+    "clone-stats": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
+      "dev": true
+    },
+    "cloneable-readable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
+      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "process-nextick-args": "^2.0.0",
+        "readable-stream": "^2.3.5"
+      }
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "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",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "dev": true
+    },
+    "codecov": {
+      "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.3",
+        "js-yaml": "3.13.1",
+        "teeny-request": "6.0.1",
+        "urlgrey": "0.4.4"
+      }
+    },
+    "codelyzer": {
+      "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",
+        "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": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        },
+        "sprintf-js": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
+          "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
+          "dev": true
+        }
+      }
+    },
+    "collection-map": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
+      "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
+      "dev": true,
+      "requires": {
+        "arr-map": "^2.0.2",
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      }
+    },
+    "collection-visit": {
+      "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"
+      }
+    },
+    "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",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "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",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "dev": true
+    },
+    "colors": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+      "dev": true
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
+      "dev": true
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
+    },
+    "compare-versions": {
+      "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": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
+      "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=",
+      "dev": true
+    },
+    "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==",
+      "dev": true
+    },
+    "component-inherit": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
+      "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=",
+      "dev": true
+    },
+    "compressible": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+      "dev": true,
+      "requires": {
+        "mime-db": ">= 1.43.0 < 2"
+      }
+    },
+    "compression": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.5",
+        "bytes": "3.0.0",
+        "compressible": "~2.0.16",
+        "debug": "2.6.9",
+        "on-headers": "~1.0.2",
+        "safe-buffer": "5.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=",
+      "dev": true
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "configstore": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
+      "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
+      "dev": true,
+      "requires": {
+        "dot-prop": "^5.2.0",
+        "graceful-fs": "^4.1.2",
+        "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": "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
+        }
+      }
+    },
+    "connect": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
+      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "finalhandler": "1.1.2",
+        "parseurl": "~1.3.3",
+        "utils-merge": "1.0.1"
+      }
+    },
+    "connect-history-api-fallback": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
+      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
+      "dev": true
+    },
+    "connected-domain": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/connected-domain/-/connected-domain-1.0.0.tgz",
+      "integrity": "sha1-v+dyOMdL5FOnnwy2BY3utPI1jpM=",
+      "dev": true
+    },
+    "console-browserify": {
+      "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",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true
+    },
+    "content-disposition": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "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"
+      }
+    },
+    "cookie": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
+      "dev": true
+    },
+    "cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
+      "dev": true
+    },
+    "copy-concurrently": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1",
+        "fs-write-stream-atomic": "^1.0.8",
+        "iferr": "^0.1.5",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.0"
+      }
+    },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+      "dev": true
+    },
+    "copy-props": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
+      "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
+      "dev": true,
+      "requires": {
+        "each-props": "^1.3.0",
+        "is-plain-object": "^2.0.1"
+      }
+    },
+    "copy-webpack-plugin": {
+      "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": "^12.0.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": "^2.1.2",
+        "webpack-log": "^2.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"
+          }
+        },
+        "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"
+          }
+        },
+        "globby": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
+          "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
+          "dev": true,
+          "requires": {
+            "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"
+          }
+        },
+        "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"
+          }
+        },
+        "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-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.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.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.5",
+        "semver": "7.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+          "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=",
+      "dev": true
+    },
+    "cosmiconfig": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+      "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"
+      },
+      "dependencies": {
+        "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.1",
+            "json-parse-better-errors": "^1.0.1"
+          }
+        }
+      }
+    },
+    "create-ecdh": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
+      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "dev": true
+        }
+      }
+    },
+    "create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "requires": {
+        "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": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "requires": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      }
+    },
+    "crypto-random-string": {
+      "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": {
+      "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": {
+        "inherits": "^2.0.3",
+        "source-map": "^0.6.1",
+        "source-map-resolve": "^0.5.2",
+        "urix": "^0.1.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
+        }
+      }
+    },
+    "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": {
+        "postcss": "^7.0.1",
+        "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"
+          }
+        },
+        "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",
+      "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": "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",
+      "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=",
+      "dev": true
+    },
+    "custom-event": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
+      "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
+      "dev": true
+    },
+    "cyclist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
+      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
+      "dev": true
+    },
+    "d": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "dev": true,
+      "requires": {
+        "es5-ext": "^0.10.50",
+        "type": "^1.0.1"
+      }
+    },
+    "d3-array": {
+      "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.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",
+        "d3-interpolate": "1",
+        "d3-selection": "1",
+        "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.1",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz",
+      "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q=="
+    },
+    "d3-dispatch": {
+      "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.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-ease": {
+      "version": "1.0.6",
+      "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",
+      "integrity": "sha512-TWks25e7t8/cqctxCmxpUuzZN11QxIA7YrMbram94zMQ0PXjE4LVIMe/f6a4+xxL8HQ3OsAFULOINQi1pE62Aw=="
+    },
+    "d3-hierarchy": {
+      "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.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.9",
+      "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",
+      "integrity": "sha512-huz5byJO/6MPpz6Q8d4lg7GgSpTjIZW/l+1MQkzKfu2u8P6hjaXaStOpmyrD6ymKoW87d2QVFCKvSjLwjzx/rA==",
+      "requires": {
+        "d3-array": "1.2.0 - 2",
+        "d3-format": "1",
+        "d3-interpolate": "^1.2.0",
+        "d3-time": "1",
+        "d3-time-format": "2"
+      }
+    },
+    "d3-selection": {
+      "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.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.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.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.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.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",
+        "d3-ease": "1",
+        "d3-interpolate": "1",
+        "d3-selection": "^1.1.0",
+        "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",
+      "integrity": "sha512-JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug==",
+      "dev": true
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "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": "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"
+      }
+    },
+    "debuglog": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
+      "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=",
+      "dev": true
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+    },
+    "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=",
+      "dev": true
+    },
+    "decompress-response": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+      "dev": true,
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
+    "deep-equal": {
+      "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",
+        "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": {
+      "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
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
+    },
+    "deepmerge": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-3.3.0.tgz",
+      "integrity": "sha512-GRQOafGHwMHpjPx9iCvTgpu9NojZ49q794EEL94JVEw6VaeA8XTUyBKvAkOOjBX9oJNiV6G3P+T+tihFjo2TqA=="
+    },
+    "default-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
+      "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^5.0.2"
+      },
+      "dependencies": {
+        "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==",
+          "dev": true
+        }
+      }
+    },
+    "default-gateway": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
+      "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
+      "dev": true,
+      "requires": {
+        "execa": "^1.0.0",
+        "ip-regex": "^2.1.0"
+      }
+    },
+    "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"
+      },
+      "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": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
+      "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.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": {
+      "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.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"
+      },
+      "dependencies": {
+        "is-accessor-descriptor": {
+          "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"
+          }
+        },
+        "is-data-descriptor": {
+          "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"
+          }
+        },
+        "is-descriptor": {
+          "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",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "del": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
+      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+      "dev": true,
+      "requires": {
+        "@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": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+          "dev": true,
+          "requires": {
+            "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": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+              "dev": true
+            }
+          }
+        },
+        "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
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        }
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
+    },
+    "delete": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/delete/-/delete-1.1.0.tgz",
+      "integrity": "sha512-bdhJatRNYsJnOhSRx9Eej3ABBtxQQw/uz2RprpYL5R3jCC2XMYVBcQWwvQLl+iNDk4LCLEKhdIP3uZSqRWi/tw==",
+      "dev": true,
+      "requires": {
+        "async-each": "^1.0.1",
+        "extend-shallow": "^2.0.1",
+        "matched": "^1.0.2",
+        "rimraf": "^2.6.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "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"
+          }
+        }
+      }
+    },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "dev": true
+    },
+    "dependency-graph": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.7.2.tgz",
+      "integrity": "sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==",
+      "dev": true
+    },
+    "des.js": {
+      "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",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+      "dev": true
+    },
+    "detect-file": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
+      "dev": true
+    },
+    "detect-node": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
+      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
+      "dev": true
+    },
+    "dezalgo": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz",
+      "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=",
+      "dev": true,
+      "requires": {
+        "asap": "^2.0.0",
+        "wrappy": "1"
+      }
+    },
+    "di": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
+      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
+      "dev": true
+    },
+    "diff": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz",
+      "integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==",
+      "dev": true
+    },
+    "diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "dev": true
+        }
+      }
+    },
+    "dir-glob": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
+      "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
+      "dev": true,
+      "requires": {
+        "path-type": "^3.0.0"
+      }
+    },
+    "dns-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
+      "dev": true
+    },
+    "dns-packet": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
+      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "dev": true,
+      "requires": {
+        "ip": "^1.1.0",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "dns-txt": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
+      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
+      "dev": true,
+      "requires": {
+        "buffer-indexof": "^1.0.0"
+      }
+    },
+    "doctrine": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+      "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2",
+        "isarray": "^1.0.0"
+      }
+    },
+    "dom-serialize": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
+      "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
+      "dev": true,
+      "requires": {
+        "custom-event": "~1.0.0",
+        "ent": "~2.2.0",
+        "extend": "^3.0.0",
+        "void-elements": "^2.0.0"
+      }
+    },
+    "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.5",
+      "resolved": "https://registry.npmjs.org/domino/-/domino-2.1.5.tgz",
+      "integrity": "sha512-vMDo7f6ogUV9PkzmxXLiXzJkJZqU09Le4C40mj+HmAGS/2FPmdetoNOQZXpu2kekn0GJKvtwKMAVoruTj60Xww=="
+    },
+    "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": "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": "^2.0.0"
+      },
+      "dependencies": {
+        "is-obj": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
+          "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
+          "dev": true
+        }
+      }
+    },
+    "duplexer": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
+      "dev": true
+    },
+    "duplexer3": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+      "dev": true
+    },
+    "duplexify": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "each-props": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
+      "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
+      "dev": true,
+      "requires": {
+        "is-plain-object": "^2.0.1",
+        "object.defaults": "^1.1.0"
+      }
+    },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "dev": true,
+      "requires": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+      "dev": true
+    },
+    "electron-to-chromium": {
+      "version": "1.3.465",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.465.tgz",
+      "integrity": "sha512-K/lUeT3NLAsJ5SHRDhK3/zd0tw7OUllYD8w+fTOXm6ljCPsp2qq+vMzxpLo8u1M27ZjZAjRbsA6rirvne2nAMQ==",
+      "dev": true
+    },
+    "elliptic": {
+      "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",
+        "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"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "dev": true
+        }
+      }
+    },
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
+    },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "dev": true
+    },
+    "encoding": {
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
+      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
+      "dev": true,
+      "requires": {
+        "iconv-lite": "~0.4.13"
+      }
+    },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "engine.io": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz",
+      "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.4",
+        "base64id": "1.0.0",
+        "cookie": "0.3.1",
+        "debug": "~3.1.0",
+        "engine.io-parser": "~2.1.0",
+        "ws": "~3.3.1"
+      },
+      "dependencies": {
+        "cookie": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+          "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
+          "dev": true
+        },
+        "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": {
+            "ms": "2.0.0"
+          }
+        },
+        "ws": {
+          "version": "3.3.3",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+          "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+          "dev": true,
+          "requires": {
+            "async-limiter": "~1.0.0",
+            "safe-buffer": "~5.1.0",
+            "ultron": "~1.1.0"
+          }
+        }
+      }
+    },
+    "engine.io-client": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
+      "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
+      "dev": true,
+      "requires": {
+        "component-emitter": "1.2.1",
+        "component-inherit": "0.0.3",
+        "debug": "~3.1.0",
+        "engine.io-parser": "~2.1.1",
+        "has-cors": "1.1.0",
+        "indexof": "0.0.1",
+        "parseqs": "0.0.5",
+        "parseuri": "0.0.5",
+        "ws": "~3.3.1",
+        "xmlhttprequest-ssl": "~1.5.4",
+        "yeast": "0.1.2"
+      },
+      "dependencies": {
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+          "dev": true
+        },
+        "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": {
+            "ms": "2.0.0"
+          }
+        },
+        "ws": {
+          "version": "3.3.3",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+          "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+          "dev": true,
+          "requires": {
+            "async-limiter": "~1.0.0",
+            "safe-buffer": "~5.1.0",
+            "ultron": "~1.1.0"
+          }
+        }
+      }
+    },
+    "engine.io-parser": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz",
+      "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==",
+      "dev": true,
+      "requires": {
+        "after": "0.8.2",
+        "arraybuffer.slice": "~0.0.7",
+        "base64-arraybuffer": "0.1.5",
+        "blob": "0.0.5",
+        "has-binary2": "~1.0.2"
+      }
+    },
+    "enhanced-resolve": {
+      "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.5.0",
+        "tapable": "^1.0.0"
+      }
+    },
+    "ent": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
+      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
+      "dev": true
+    },
+    "entities": {
+      "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": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz",
+      "integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=",
+      "dev": true
+    },
+    "errno": {
+      "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"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "error-stack-parser": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.4.tgz",
+      "integrity": "sha512-fZ0KkoxSjLFmhW5lHbUT3tLwy3nX1qEzMYo8koY1vrsAco53CMT1djnBSeC/wUjTEZRhZl9iRw7PaMaxfJ4wzQ==",
+      "requires": {
+        "stackframe": "^1.1.0"
+      }
+    },
+    "es-abstract": {
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.14.2.tgz",
+      "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.0.0",
+        "string.prototype.trimright": "^2.0.0"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
+      "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"
+      }
+    },
+    "es5-ext": {
+      "version": "0.10.51",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.51.tgz",
+      "integrity": "sha512-oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ==",
+      "dev": true,
+      "requires": {
+        "es6-iterator": "~2.0.3",
+        "es6-symbol": "~3.1.1",
+        "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",
+      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "es6-map": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
+      "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "~0.10.14",
+        "es6-iterator": "~2.0.1",
+        "es6-set": "~0.1.5",
+        "es6-symbol": "~3.1.1",
+        "event-emitter": "~0.3.5"
+      }
+    },
+    "es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
+      "dev": true
+    },
+    "es6-promisify": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
+      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
+      "dev": true,
+      "requires": {
+        "es6-promise": "^4.0.3"
+      }
+    },
+    "es6-set": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
+      "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "~0.10.14",
+        "es6-iterator": "~2.0.1",
+        "es6-symbol": "3.1.1",
+        "event-emitter": "~0.3.5"
+      },
+      "dependencies": {
+        "es6-symbol": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+          "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+          "dev": true,
+          "requires": {
+            "d": "1",
+            "es5-ext": "~0.10.14"
+          }
+        }
+      }
+    },
+    "es6-symbol": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.2.tgz",
+      "integrity": "sha512-/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ==",
+      "dev": true,
+      "requires": {
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.51"
+      }
+    },
+    "es6-weak-map": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
+      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "^0.10.46",
+        "es6-iterator": "^2.0.3",
+        "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",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+      "dev": true
+    },
+    "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=",
+      "dev": true
+    },
+    "escodegen": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
+      "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
+      "dev": true,
+      "requires": {
+        "esprima": "^2.7.1",
+        "estraverse": "^1.9.1",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1",
+        "source-map": "~0.2.0"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+          "dev": true
+        },
+        "estraverse": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
+          "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
+          "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "amdefine": ">=0.0.4"
+          }
+        }
+      }
+    },
+    "escope": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
+      "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
+      "dev": true,
+      "requires": {
+        "es6-map": "^0.1.3",
+        "es6-weak-map": "^2.0.1",
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "eslint": {
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-2.13.1.tgz",
+      "integrity": "sha1-5MyPoPAJ+4KaquI4VaKTYL4fbBE=",
+      "dev": true,
+      "requires": {
+        "chalk": "^1.1.3",
+        "concat-stream": "^1.4.6",
+        "debug": "^2.1.1",
+        "doctrine": "^1.2.2",
+        "es6-map": "^0.1.3",
+        "escope": "^3.6.0",
+        "espree": "^3.1.6",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^1.1.1",
+        "glob": "^7.0.3",
+        "globals": "^9.2.0",
+        "ignore": "^3.1.2",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^0.12.0",
+        "is-my-json-valid": "^2.10.0",
+        "is-resolvable": "^1.0.0",
+        "js-yaml": "^3.5.1",
+        "json-stable-stringify": "^1.0.0",
+        "levn": "^0.3.0",
+        "lodash": "^4.0.0",
+        "mkdirp": "^0.5.0",
+        "optionator": "^0.8.1",
+        "path-is-absolute": "^1.0.0",
+        "path-is-inside": "^1.0.1",
+        "pluralize": "^1.2.1",
+        "progress": "^1.1.8",
+        "require-uncached": "^1.0.2",
+        "shelljs": "^0.6.0",
+        "strip-json-comments": "~1.0.1",
+        "table": "^3.7.8",
+        "text-table": "~0.2.0",
+        "user-home": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-escapes": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
+          "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=",
+          "dev": true
+        },
+        "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"
+          }
+        },
+        "cli-cursor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
+          "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
+          "dev": true,
+          "requires": {
+            "restore-cursor": "^1.0.1"
+          }
+        },
+        "figures": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+          "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
+          "dev": true,
+          "requires": {
+            "escape-string-regexp": "^1.0.5",
+            "object-assign": "^4.1.0"
+          }
+        },
+        "globals": {
+          "version": "9.18.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+          "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+          "dev": true
+        },
+        "inquirer": {
+          "version": "0.12.0",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
+          "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
+          "dev": true,
+          "requires": {
+            "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": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+          "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
+          "dev": true
+        },
+        "restore-cursor": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
+          "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
+          "dev": true,
+          "requires": {
+            "exit-hook": "^1.0.0",
+            "onetime": "^1.0.0"
+          }
+        },
+        "run-async": {
+          "version": "0.1.0",
+          "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
+          "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
+          "dev": true,
+          "requires": {
+            "once": "^1.3.0"
+          }
+        },
+        "shelljs": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.6.1.tgz",
+          "integrity": "sha1-7GIRvtGSBEIIj+D3Cyg3Iy7SyKg=",
+          "dev": true
+        },
+        "strip-json-comments": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
+          "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=",
+          "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
+        }
+      }
+    },
+    "eslint-scope": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "espree": {
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
+      "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
+      "dev": true,
+      "requires": {
+        "acorn": "^5.5.0",
+        "acorn-jsx": "^3.0.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "5.7.3",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+          "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+          "dev": true
+        }
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true
+    },
+    "esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^4.1.0"
+      }
+    },
+    "estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true
+    },
+    "estree-walker": {
+      "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": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true
+    },
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "dev": true
+    },
+    "event-emitter": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "~0.10.14"
+      }
+    },
+    "event-stream": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+      "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
+      "dev": true,
+      "requires": {
+        "duplexer": "~0.1.1",
+        "from": "~0",
+        "map-stream": "~0.1.0",
+        "pause-stream": "0.0.11",
+        "split": "0.3",
+        "stream-combiner": "~0.0.4",
+        "through": "~2.3.1"
+      }
+    },
+    "eventemitter3": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz",
+      "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==",
+      "dev": true
+    },
+    "events": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.1.0.tgz",
+      "integrity": "sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==",
+      "dev": true
+    },
+    "eventsource": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
+      "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
+      "dev": true,
+      "requires": {
+        "original": "^1.0.0"
+      }
+    },
+    "evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "requires": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "requires": {
+        "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": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+      "dev": true
+    },
+    "exit-hook": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
+      "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=",
+      "dev": true
+    },
+    "expand-brackets": {
+      "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",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "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"
+          }
+        },
+        "extend-shallow": {
+          "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"
+          }
+        }
+      }
+    },
+    "expand-tilde": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+      "dev": true,
+      "requires": {
+        "homedir-polyfill": "^1.0.1"
+      }
+    },
+    "express": {
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
+      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.7",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.19.0",
+        "content-disposition": "0.5.3",
+        "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",
+        "fresh": "0.5.2",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.5",
+        "qs": "6.7.0",
+        "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",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "array-flatten": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+          "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+          "dev": true
+        },
+        "qs": {
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+          "dev": true
+        }
+      }
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
+    },
+    "extend-shallow": {
+      "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"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "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"
+          }
+        }
+      }
+    },
+    "external-editor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+      "dev": true,
+      "requires": {
+        "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",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "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"
+          }
+        },
+        "extend-shallow": {
+          "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"
+          }
+        },
+        "is-accessor-descriptor": {
+          "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"
+          }
+        },
+        "is-data-descriptor": {
+          "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"
+          }
+        },
+        "is-descriptor": {
+          "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",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "dev": true
+    },
+    "fancy-log": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+      "dev": true,
+      "requires": {
+        "ansi-gray": "^0.1.1",
+        "color-support": "^1.1.3",
+        "parse-node-version": "^1.0.0",
+        "time-stamp": "^1.0.0"
+      }
+    },
+    "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=="
+    },
+    "fast-glob": {
+      "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.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": {
+        "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"
+          }
+        },
+        "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"
+          }
+        }
+      }
+    },
+    "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=="
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "fastparse": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
+      "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
+      "dev": true
+    },
+    "fastq": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
+      "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==",
+      "dev": true,
+      "requires": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "faye-websocket": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+      "dev": true,
+      "requires": {
+        "websocket-driver": ">=0.5.1"
+      }
+    },
+    "figgy-pudding": {
+      "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.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"
+      }
+    },
+    "file-entry-cache": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-1.3.1.tgz",
+      "integrity": "sha1-RMYepgeuS+nBQC9B9EJwy/4zT/g=",
+      "dev": true,
+      "requires": {
+        "flat-cache": "^1.2.1",
+        "object-assign": "^4.0.1"
+      }
+    },
+    "file-loader": {
+      "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": "^2.0.0",
+        "schema-utils": "^2.6.5"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
+          "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
+          "dev": true,
+          "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"
+          }
+        },
+        "loader-utils": {
+          "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": "^2.1.2"
+          }
+        },
+        "schema-utils": {
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
+          "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.4",
+            "ajv": "^6.12.2",
+            "ajv-keywords": "^3.4.1"
+          }
+        }
+      }
+    },
+    "fileset": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz",
+      "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=",
+      "dev": true,
+      "requires": {
+        "glob": "^7.0.3",
+        "minimatch": "^3.0.3"
+      }
+    },
+    "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"
+      }
+    },
+    "finalhandler": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "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"
+      }
+    },
+    "find-cache-dir": {
+      "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.2",
+        "pkg-dir": "^4.1.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"
+          }
+        },
+        "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"
+          }
+        },
+        "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
+        },
+        "pkg-dir": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+          "dev": true,
+          "requires": {
+            "find-up": "^4.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
+        }
+      }
+    },
+    "find-parent-dir": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.0.tgz",
+      "integrity": "sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=",
+      "dev": true
+    },
+    "find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "requires": {
+        "locate-path": "^2.0.0"
+      }
+    },
+    "findup-sync": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
+      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
+      "dev": true,
+      "requires": {
+        "detect-file": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
+      },
+      "dependencies": {
+        "expand-tilde": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+          "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+          "dev": true,
+          "requires": {
+            "homedir-polyfill": "^1.0.1"
+          }
+        },
+        "global-modules": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+          "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+          "dev": true,
+          "requires": {
+            "global-prefix": "^1.0.1",
+            "is-windows": "^1.0.1",
+            "resolve-dir": "^1.0.0"
+          }
+        },
+        "global-prefix": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+          "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+          "dev": true,
+          "requires": {
+            "expand-tilde": "^2.0.2",
+            "homedir-polyfill": "^1.0.1",
+            "ini": "^1.3.4",
+            "is-windows": "^1.0.1",
+            "which": "^1.2.14"
+          }
+        },
+        "resolve-dir": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+          "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+          "dev": true,
+          "requires": {
+            "expand-tilde": "^2.0.0",
+            "global-modules": "^1.0.0"
+          }
+        }
+      }
+    },
+    "fined": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
+      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "^2.0.2",
+        "is-plain-object": "^2.0.3",
+        "object.defaults": "^1.1.0",
+        "object.pick": "^1.2.0",
+        "parse-filepath": "^1.0.1"
+      },
+      "dependencies": {
+        "expand-tilde": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+          "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+          "dev": true,
+          "requires": {
+            "homedir-polyfill": "^1.0.1"
+          }
+        }
+      }
+    },
+    "flagged-respawn": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
+      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
+      "dev": true
+    },
+    "flat-cache": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
+      "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
+      "dev": true,
+      "requires": {
+        "circular-json": "^0.3.1",
+        "graceful-fs": "^4.1.2",
+        "rimraf": "~2.6.2",
+        "write": "^0.2.1"
+      },
+      "dependencies": {
+        "circular-json": {
+          "version": "0.3.3",
+          "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
+          "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
+          "dev": true
+        },
+        "rimraf": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    },
+    "flatted": {
+      "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": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
+      }
+    },
+    "follow-redirects": {
+      "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"
+      },
+      "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"
+          }
+        },
+        "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
+        }
+      }
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "for-own": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+      "dev": true,
+      "requires": {
+        "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",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true
+    },
+    "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.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "dev": true
+    },
+    "fragment-cache": {
+      "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"
+      }
+    },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "dev": true
+    },
+    "from": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
+      "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
+      "dev": true
+    },
+    "from2": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "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",
+      "integrity": "sha1-91mDufL0E75ljJPf172M5AePXNs=",
+      "dev": true,
+      "requires": {
+        "js-yaml": "^3.4.6"
+      }
+    },
+    "fs-extra": {
+      "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": "^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": "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": "^3.0.0"
+      },
+      "dependencies": {
+        "minipass": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
+          "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        }
+      }
+    },
+    "fs-mkdirp-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
+      "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.11",
+        "through2": "^2.0.3"
+      }
+    },
+    "fs-write-stream-atomic": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "iferr": "^0.1.5",
+        "imurmurhash": "^0.1.4",
+        "readable-stream": "1 || 2"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "fsevents": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+      "optional": true
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "generate-function": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz",
+      "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==",
+      "dev": true,
+      "requires": {
+        "is-property": "^1.0.2"
+      }
+    },
+    "generate-object-property": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
+      "dev": true,
+      "requires": {
+        "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",
+      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
+      "dev": 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
+    },
+    "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",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "requires": {
+        "pump": "^3.0.0"
+      }
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.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"
+      }
+    },
+    "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"
+      },
+      "dependencies": {
+        "is-glob": {
+          "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"
+          }
+        }
+      }
+    },
+    "glob-stream": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
+      "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
+      "dev": true,
+      "requires": {
+        "extend": "^3.0.0",
+        "glob": "^7.1.1",
+        "glob-parent": "^3.1.0",
+        "is-negated-glob": "^1.0.0",
+        "ordered-read-streams": "^1.0.0",
+        "pumpify": "^1.3.5",
+        "readable-stream": "^2.1.5",
+        "remove-trailing-separator": "^1.0.1",
+        "to-absolute-glob": "^2.0.0",
+        "unique-stream": "^2.0.2"
+      }
+    },
+    "glob-watcher": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.3.tgz",
+      "integrity": "sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==",
+      "dev": true,
+      "requires": {
+        "anymatch": "^2.0.0",
+        "async-done": "^1.2.0",
+        "chokidar": "^2.0.0",
+        "is-negated-glob": "^1.0.0",
+        "just-debounce": "^1.0.0",
+        "object.defaults": "^1.1.0"
+      },
+      "dependencies": {
+        "anymatch": {
+          "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"
+          }
+        },
+        "braces": {
+          "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",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          }
+        },
+        "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"
+          },
+          "dependencies": {
+            "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
+            }
+          }
+        },
+        "extend-shallow": {
+          "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"
+          }
+        },
+        "fill-range": {
+          "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",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          }
+        },
+        "fsevents": {
+          "version": "1.2.13",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+          "dev": true,
+          "optional": true
+        },
+        "is-binary-path": {
+          "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"
+          }
+        },
+        "is-number": {
+          "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"
+          }
+        },
+        "kind-of": {
+          "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"
+          }
+        },
+        "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"
+          }
+        },
+        "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.1.11",
+            "micromatch": "^3.1.10",
+            "readable-stream": "^2.0.2"
+          }
+        },
+        "to-regex-range": {
+          "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"
+          }
+        }
+      }
+    },
+    "global-dirs": {
+      "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.5"
+      }
+    },
+    "global-modules": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "dev": true,
+      "requires": {
+        "global-prefix": "^1.0.1",
+        "is-windows": "^1.0.1",
+        "resolve-dir": "^1.0.0"
+      }
+    },
+    "global-prefix": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
+      }
+    },
+    "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
+    },
+    "globby": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz",
+      "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
+      "dev": true,
+      "requires": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.1.1",
+        "ignore": "^5.1.4",
+        "merge2": "^1.3.0",
+        "slash": "^3.0.0"
+      },
+      "dependencies": {
+        "array-union": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+          "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+          "dev": true
+        },
+        "dir-glob": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+          "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+          "dev": true,
+          "requires": {
+            "path-type": "^4.0.0"
+          }
+        },
+        "ignore": {
+          "version": "5.1.8",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+          "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+          "dev": true
+        },
+        "path-type": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+          "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+          "dev": true
+        },
+        "slash": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+          "dev": true
+        }
+      }
+    },
+    "globule": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz",
+      "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==",
+      "dev": true,
+      "requires": {
+        "glob": "~7.1.1",
+        "lodash": "~4.17.10",
+        "minimatch": "~3.0.2"
+      }
+    },
+    "glogg": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
+      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
+      "dev": true,
+      "requires": {
+        "sparkles": "^1.0.0"
+      }
+    },
+    "gonzales-pe-sl": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/gonzales-pe-sl/-/gonzales-pe-sl-4.2.3.tgz",
+      "integrity": "sha1-aoaLw4BkXxQf7rBCxvl/zHG1n+Y=",
+      "dev": true,
+      "requires": {
+        "minimist": "1.1.x"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
+          "integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=",
+          "dev": true
+        }
+      }
+    },
+    "got": {
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
+      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
+      "dev": true,
+      "requires": {
+        "@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.4",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+      "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",
+      "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
+      "dev": true,
+      "requires": {
+        "glob-watcher": "^5.0.3",
+        "gulp-cli": "^2.2.0",
+        "undertaker": "^1.2.1",
+        "vinyl-fs": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-colors": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+          "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+          "dev": true,
+          "requires": {
+            "ansi-wrap": "^0.1.0"
+          }
+        },
+        "gulp-cli": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
+          "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
+          "dev": true,
+          "requires": {
+            "ansi-colors": "^1.0.1",
+            "archy": "^1.0.0",
+            "array-sort": "^1.0.0",
+            "color-support": "^1.1.3",
+            "concat-stream": "^1.6.0",
+            "copy-props": "^2.0.1",
+            "fancy-log": "^1.3.2",
+            "gulplog": "^1.0.0",
+            "interpret": "^1.4.0",
+            "isobject": "^3.0.1",
+            "liftoff": "^3.1.0",
+            "matchdep": "^2.0.0",
+            "mute-stdout": "^1.0.0",
+            "pretty-hrtime": "^1.0.0",
+            "replace-homedir": "^1.0.0",
+            "semver-greatest-satisfied-range": "^1.1.0",
+            "v8flags": "^3.2.0",
+            "yargs": "^7.1.0"
+          }
+        },
+        "interpret": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+          "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+          "dev": true
+        },
+        "v8flags": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
+          "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
+          "dev": true,
+          "requires": {
+            "homedir-polyfill": "^1.0.1"
+          }
+        }
+      }
+    },
+    "gulp-zip": {
+      "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",
+        "plugin-error": "^1.0.1",
+        "through2": "^3.0.1",
+        "vinyl": "^2.1.0",
+        "yazl": "^2.5.1"
+      },
+      "dependencies": {
+        "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=="
+        },
+        "get-stream": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
+          "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.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=="
+        },
+        "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=="
+        },
+        "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",
+            "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=="
+        },
+        "supports-color": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "through2": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
+          "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "2 || 3"
+          }
+        }
+      }
+    },
+    "gulplog": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
+      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
+      "dev": true,
+      "requires": {
+        "glogg": "^1.0.0"
+      }
+    },
+    "handle-thing": {
+      "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": {
+      "version": "4.7.6",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz",
+      "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==",
+      "dev": true,
+      "requires": {
+        "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": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "dev": true
+    },
+    "har-validator": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.5.5",
+        "har-schema": "^2.0.0"
+      }
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-ansi": {
+      "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"
+      }
+    },
+    "has-binary2": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
+      "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
+      "dev": true,
+      "requires": {
+        "isarray": "2.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
+          "dev": true
+        }
+      }
+    },
+    "has-cors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
+      "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
+    "has-glob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-glob/-/has-glob-1.0.0.tgz",
+      "integrity": "sha1-mqqe7b/7G6OZCnsAEPtnjuAIEgc=",
+      "dev": true,
+      "requires": {
+        "is-glob": "^3.0.0"
+      },
+      "dependencies": {
+        "is-glob": {
+          "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"
+          }
+        }
+      }
+    },
+    "has-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+      "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",
+        "isobject": "^3.0.0"
+      }
+    },
+    "has-values": {
+      "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"
+      },
+      "dependencies": {
+        "is-number": {
+          "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"
+          },
+          "dependencies": {
+            "kind-of": {
+              "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"
+              }
+            }
+          }
+        },
+        "kind-of": {
+          "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"
+          }
+        }
+      }
+    },
+    "has-yarn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
+      "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
+      "dev": true
+    },
+    "hash-base": {
+      "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.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": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "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",
+      "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",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "requires": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "homedir-polyfill": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "requires": {
+        "parse-passwd": "^1.0.0"
+      }
+    },
+    "hosted-git-info": {
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz",
+      "integrity": "sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==",
+      "dev": true
+    },
+    "hpack.js": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "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.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": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
+    },
+    "http-deceiver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
+      "dev": true
+    },
+    "http-errors": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "dev": true,
+      "requires": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.1",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.0"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        }
+      }
+    },
+    "http-proxy": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+      "dev": true,
+      "requires": {
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "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==",
+      "dev": true,
+      "requires": {
+        "agent-base": "4",
+        "debug": "3.1.0"
+      },
+      "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": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "http-proxy-middleware": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
+      "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
+      "dev": true,
+      "requires": {
+        "http-proxy": "^1.17.0",
+        "is-glob": "^4.0.0",
+        "lodash": "^4.17.11",
+        "micromatch": "^3.1.10"
+      }
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      }
+    },
+    "https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+      "dev": true
+    },
+    "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"
+      },
+      "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"
+          }
+        },
+        "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
+        }
+      }
+    },
+    "humanize-ms": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
+      "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=",
+      "dev": true,
+      "requires": {
+        "ms": "^2.0.0"
+      }
+    },
+    "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,
+      "requires": {
+        "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",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+      "dev": true
+    },
+    "iferr": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
+      "dev": true
+    },
+    "ignore": {
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+      "dev": true
+    },
+    "ignore-walk": {
+      "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"
+      }
+    },
+    "image-size": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
+      "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
+      "dev": true,
+      "optional": true
+    },
+    "immediate": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=",
+      "dev": true
+    },
+    "immer": {
+      "version": "6.0.9",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-6.0.9.tgz",
+      "integrity": "sha512-SyCYnAuiRf67Lvk0VkwFvwtDoEiCMjeamnHvRfnVDyc7re1/rQrNxuL+jJ7lA3WvdC4uznrvbmm+clJ9+XXatg=="
+    },
+    "import-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
+      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
+      "dev": true,
+      "requires": {
+        "import-from": "^2.1.0"
+      }
+    },
+    "import-fresh": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
+      "dev": true,
+      "requires": {
+        "caller-path": "^2.0.0",
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "import-from": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
+      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "import-lazy": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
+      "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=",
+      "dev": true
+    },
+    "import-local": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
+      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+      "dev": true,
+      "requires": {
+        "pkg-dir": "^3.0.0",
+        "resolve-cwd": "^2.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "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",
+      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
+      "dev": true
+    },
+    "infer-owner": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "dev": true
+    },
+    "injection-js": {
+      "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": "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": "^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.4.0",
+        "rxjs": "^6.5.3",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6"
+      },
+      "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
+        },
+        "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
+        },
+        "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"
+          }
+        },
+        "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"
+          }
+        }
+      }
+    },
+    "internal-ip": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
+      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
+      "dev": true,
+      "requires": {
+        "default-gateway": "^4.2.0",
+        "ipaddr.js": "^1.9.0"
+      }
+    },
+    "intersect": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/intersect/-/intersect-1.0.1.tgz",
+      "integrity": "sha1-MyZQ4QhU2MCsWMGSvcJ6i/fnoww="
+    },
+    "invariant": {
+      "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"
+      }
+    },
+    "invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+      "dev": true
+    },
+    "ip": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
+      "dev": true
+    },
+    "ip-regex": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
+      "dev": true
+    },
+    "ipaddr.js": {
+      "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": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
+      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+      "dev": true,
+      "requires": {
+        "is-relative": "^1.0.0",
+        "is-windows": "^1.0.1"
+      }
+    },
+    "is-absolute-url": {
+      "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": {
+      "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"
+      },
+      "dependencies": {
+        "kind-of": {
+          "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"
+          }
+        }
+      }
+    },
+    "is-arguments": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
+      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
+      "dev": true
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "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==",
+      "requires": {
+        "binary-extensions": "^2.0.0"
+      },
+      "dependencies": {
+        "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=="
+        }
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "is-callable": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
+      "dev": true
+    },
+    "is-ci": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "dev": true,
+      "requires": {
+        "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",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "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"
+          }
+        }
+      }
+    },
+    "is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "dev": true
+    },
+    "is-descriptor": {
+      "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",
+        "kind-of": "^5.0.0"
+      },
+      "dependencies": {
+        "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==",
+          "dev": true
+        }
+      }
+    },
+    "is-directory": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+      "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",
+      "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="
+    },
+    "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,
+      "requires": {
+        "number-is-nan": "^1.0.0"
+      }
+    },
+    "is-glob": {
+      "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-installed-globally": {
+      "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",
+        "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-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
+      "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
+      "dev": true
+    },
+    "is-my-ip-valid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz",
+      "integrity": "sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==",
+      "dev": true
+    },
+    "is-my-json-valid": {
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.0.tgz",
+      "integrity": "sha512-XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA==",
+      "dev": true,
+      "requires": {
+        "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": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
+      "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
+      "dev": true
+    },
+    "is-npm": {
+      "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": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
+    },
+    "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": {
+      "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"
+      }
+    },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
+    },
+    "is-plain-object": {
+      "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"
+      }
+    },
+    "is-promise": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
+      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
+      "dev": true
+    },
+    "is-property": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
+      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
+      "dev": true
+    },
+    "is-reference": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.0.tgz",
+      "integrity": "sha512-ZVxq+5TkOx6GQdnoMm2aRdCKADdcrOWXLGzGT+vIA8DMpqEJaRk5AL1bS80zJ2bjHunVmjdzfCt0e4BymIEqKQ==",
+      "dev": true,
+      "requires": {
+        "@types/estree": "0.0.44"
+      },
+      "dependencies": {
+        "@types/estree": {
+          "version": "0.0.44",
+          "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.44.tgz",
+          "integrity": "sha512-iaIVzr+w2ZJ5HkidlZ3EJM8VTZb2MJLCjw3V+505yVts0gRC4UMvjw0d1HPtGqI/HQC/KdsYtayfzl+AXY2R8g==",
+          "dev": true
+        }
+      }
+    },
+    "is-regex": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.1"
+      }
+    },
+    "is-relative": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+      "dev": true,
+      "requires": {
+        "is-unc-path": "^1.0.0"
+      }
+    },
+    "is-resolvable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
+      "dev": true
+    },
+    "is-running": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-running/-/is-running-2.1.0.tgz",
+      "integrity": "sha1-MKc/9cw4VOT8JUkICen1q/jeCeA=",
+      "dev": true
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+    },
+    "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",
+      "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.0"
+      }
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
+    "is-unc-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+      "dev": true,
+      "requires": {
+        "unc-path-regex": "^0.1.2"
+      }
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "dev": true
+    },
+    "is-valid-glob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
+      "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
+      "dev": true
+    },
+    "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==",
+      "dev": true
+    },
+    "is-wsl": {
+      "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",
+      "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
+      "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "isbinaryfile": {
+      "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",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+    },
+    "isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
+    "istanbul": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
+      "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
+      "dev": true,
+      "requires": {
+        "abbrev": "1.0.x",
+        "async": "1.x",
+        "escodegen": "1.8.x",
+        "esprima": "2.7.x",
+        "glob": "^5.0.15",
+        "handlebars": "^4.0.1",
+        "js-yaml": "3.x",
+        "mkdirp": "0.5.x",
+        "nopt": "3.x",
+        "once": "1.x",
+        "resolve": "1.1.x",
+        "supports-color": "^3.1.0",
+        "which": "^1.1.1",
+        "wordwrap": "^1.0.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        },
+        "esprima": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+          "dev": true
+        },
+        "glob": {
+          "version": "5.0.15",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+          "dev": true,
+          "requires": {
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "2 || 3",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "resolve": {
+          "version": "1.1.7",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+          "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-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"
+      },
+      "dependencies": {
+        "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": {
+            "@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-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": {
+            "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": "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": "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": "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",
+        "@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-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",
+      "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==",
+      "dev": true,
+      "requires": {
+        "istanbul-lib-coverage": "^2.0.5",
+        "make-dir": "^2.1.0",
+        "supports-color": "^6.1.0"
+      },
+      "dependencies": {
+        "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-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"
+      },
+      "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"
+          }
+        },
+        "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": "3.0.2",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
+      "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
+      "dev": true,
+      "requires": {
+        "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": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.8.0.tgz",
+      "integrity": "sha1-awicChFXax8W3xG4AUbZHU6Lij4=",
+      "dev": true,
+      "requires": {
+        "exit": "^0.1.2",
+        "glob": "^7.0.6",
+        "jasmine-core": "~2.8.0"
+      },
+      "dependencies": {
+        "jasmine-core": {
+          "version": "2.8.0",
+          "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.8.0.tgz",
+          "integrity": "sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=",
+          "dev": true
+        }
+      }
+    },
+    "jasmine-core": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.5.0.tgz",
+      "integrity": "sha512-nCeAiw37MIMA9w9IXso7bRaLl+c/ef3wnxsoSAlYrzS+Ot0zTG6nU8G/cIfGkqpkjX2wNaIW9RFG0TwIFnG6bA==",
+      "dev": true
+    },
+    "jasmine-spec-reporter": {
+      "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.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": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.2.0.tgz",
+      "integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
+      "dev": true
+    },
+    "jest-worker": {
+      "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": "^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-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true
+    },
+    "jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true
+    },
+    "json-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
+      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
+      "dev": true
+    },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "dev": true
+    },
+    "json-schema-ref-parser": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-9.0.1.tgz",
+      "integrity": "sha512-KLrCjRjW5hMXxsX4osVBWpwixXL9NtICfpyNNS0eHguN5mP/I4UatI7i7PFS8jU94b1NHF4EbirACdCn0RFPBA==",
+      "dev": true,
+      "requires": {
+        "@apidevtools/json-schema-ref-parser": "9.0.1"
+      }
+    },
+    "json-schema-to-typescript": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/json-schema-to-typescript/-/json-schema-to-typescript-9.1.0.tgz",
+      "integrity": "sha512-9/yDXQQyqtRDxohQGRCKht4Wjfg73TALi1yzy651EOo71a6aKFtIm2WUbDWSf8OitFGukUn00dx4t1kg0W6O4Q==",
+      "dev": true,
+      "requires": {
+        "@types/json-schema": "^7.0.4",
+        "cli-color": "^2.0.0",
+        "glob": "^7.1.6",
+        "is-glob": "^4.0.1",
+        "json-schema-ref-parser": "^9.0.1",
+        "json-stringify-safe": "^5.0.1",
+        "lodash": "^4.17.15",
+        "minimist": "^1.2.5",
+        "mkdirp": "^1.0.4",
+        "mz": "^2.7.0",
+        "prettier": "^2.0.5",
+        "stdin": "0.0.1"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        }
+      }
+    },
+    "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=="
+    },
+    "json-stable-stringify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
+      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^6.0.2"
+      }
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
+    "json3": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
+      "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==",
+      "dev": true
+    },
+    "json5": {
+      "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.5"
+      }
+    },
+    "jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "jsonparse": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
+      "dev": true
+    },
+    "jsonpointer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
+      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
+      "dev": true
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "jszip": {
+      "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",
+        "pako": "~1.0.2",
+        "readable-stream": "~2.3.6",
+        "set-immediate-shim": "~1.0.1"
+      }
+    },
+    "just-debounce": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz",
+      "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=",
+      "dev": true
+    },
+    "karma": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-5.0.1.tgz",
+      "integrity": "sha512-xrDGtZ0mykEQjx1BUHOP1ITi39MDsCGocmSvLJWHxUQpxuKwxk3ZUrC6HI2VWh1plLC6+7cA3B19m12yzO/FRw==",
+      "dev": true,
+      "requires": {
+        "body-parser": "^1.16.1",
+        "braces": "^3.0.2",
+        "chokidar": "^3.0.0",
+        "colors": "^1.1.0",
+        "connect": "^3.6.0",
+        "di": "^0.0.1",
+        "dom-serialize": "^2.2.0",
+        "flatted": "^2.0.0",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.1.2",
+        "http-proxy": "^1.13.0",
+        "isbinaryfile": "^4.0.2",
+        "lodash": "^4.17.14",
+        "log4js": "^4.0.0",
+        "mime": "^2.3.1",
+        "minimatch": "^3.0.2",
+        "qjobs": "^1.1.4",
+        "range-parser": "^1.2.0",
+        "rimraf": "^2.6.0",
+        "socket.io": "2.1.1",
+        "source-map": "^0.6.1",
+        "tmp": "0.0.33",
+        "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",
+          "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+          "dev": true,
+          "requires": {
+            "normalize-path": "^3.0.0",
+            "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": "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",
+          "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"
+          }
+        },
+        "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": {
+            "is-glob": "^4.0.1"
+          }
+        },
+        "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": {
+            "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",
+          "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+          "dev": true
+        },
+        "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.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",
+          "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==",
+          "dev": true,
+          "requires": {
+            "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",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "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"
+          }
+        }
+      }
+    },
+    "karma-chrome-launcher": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.1.0.tgz",
+      "integrity": "sha512-3dPs/n7vgz1rxxtynpzZTvb9y/GIaW8xjAwcIGttLbycqoFtI7yo1NGnQi6oFTherRE+GIhCAHZC4vEqWGhNvg==",
+      "dev": true,
+      "requires": {
+        "which": "^1.2.1"
+      }
+    },
+    "karma-cli": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/karma-cli/-/karma-cli-2.0.0.tgz",
+      "integrity": "sha512-1Kb28UILg1ZsfqQmeELbPzuEb5C6GZJfVIk0qOr8LNYQuYWmAaqP16WpbpKEjhejDrDYyYOwwJXSZO6u7q5Pvw==",
+      "dev": true,
+      "requires": {
+        "resolve": "^1.3.3"
+      }
+    },
+    "karma-coverage-istanbul-reporter": {
+      "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=="
+        },
+        "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.7",
+          "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.1.7.tgz",
+          "integrity": "sha512-LYTOa2UrYFyJ/aSczZi/6lBykVMjCCvUmT64gOe+jPZFy4w6FYfPGqFT2IiQ2BxVHHDOvCD7qrIXb0EOh4uGWw==",
+          "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.5",
+            "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-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": {
+            "html-escaper": "^2.0.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==",
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0"
+          }
+        },
+        "normalize-url": {
+          "version": "1.9.1",
+          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
+          "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
+          "requires": {
+            "object-assign": "^4.0.1",
+            "prepend-http": "^1.0.0",
+            "query-string": "^4.1.0",
+            "sort-keys": "^1.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
+        },
+        "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": "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.5.0"
+      }
+    },
+    "karma-jasmine-html-reporter": {
+      "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": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz",
+      "integrity": "sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==",
+      "dev": true,
+      "requires": {
+        "source-map-support": "^0.5.5"
+      }
+    },
+    "karma-spec-reporter": {
+      "version": "0.0.32",
+      "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.32.tgz",
+      "integrity": "sha1-LpxyB+pyZ3EmAln4K+y1QyCeRAo=",
+      "dev": true,
+      "requires": {
+        "colors": "^1.1.2"
+      }
+    },
+    "keyv": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
+      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
+      "dev": true,
+      "requires": {
+        "json-buffer": "3.0.0"
+      }
+    },
+    "killable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
+      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==",
+      "dev": true
+    },
+    "kind-of": {
+      "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": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-2.1.0.tgz",
+      "integrity": "sha1-PTvNhgDnv971MjHHOf8FOu1WDkQ=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.11"
+      }
+    },
+    "known-css-properties": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.3.0.tgz",
+      "integrity": "sha512-QMQcnKAiQccfQTqtBh/qwquGZ2XK/DXND1jrcN9M8gMMy99Gwla7GQjndVUsEqIaRyP6bsFRuhwRj5poafBGJQ==",
+      "dev": true
+    },
+    "last-run": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
+      "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
+      "dev": true,
+      "requires": {
+        "default-resolution": "^2.0.0",
+        "es6-weak-map": "^2.0.1"
+      }
+    },
+    "latest-version": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
+      "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
+      "dev": true,
+      "requires": {
+        "package-json": "^6.3.0"
+      }
+    },
+    "lazystream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
+      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^2.0.5"
+      }
+    },
+    "lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "dev": true,
+      "requires": {
+        "invert-kv": "^1.0.0"
+      }
+    },
+    "lead": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
+      "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
+      "dev": true,
+      "requires": {
+        "flush-write-stream": "^1.0.2"
+      }
+    },
+    "less": {
+      "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",
+        "errno": "^0.1.1",
+        "graceful-fs": "^4.1.2",
+        "image-size": "~0.5.0",
+        "mime": "^1.4.1",
+        "mkdirp": "^0.5.0",
+        "promise": "^7.1.1",
+        "request": "^2.83.0",
+        "source-map": "~0.6.0",
+        "tslib": "^1.10.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,
+          "optional": true
+        }
+      }
+    },
+    "less-loader": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-5.0.0.tgz",
+      "integrity": "sha512-bquCU89mO/yWLaUq0Clk7qCsKhsF/TZpJUzETRvJa9KSVEL9SO3ovCvdEHISBhrC81OwC8QSVX7E0bzElZj9cg==",
+      "dev": true,
+      "requires": {
+        "clone": "^2.1.1",
+        "loader-utils": "^1.1.0",
+        "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",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        }
+      }
+    },
+    "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": {
+        "leven": "^3.1.0"
+      }
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      }
+    },
+    "license-webpack-plugin": {
+      "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",
+        "webpack-sources": "^1.2.0"
+      }
+    },
+    "lie": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+      "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+      "dev": true,
+      "requires": {
+        "immediate": "~3.0.5"
+      }
+    },
+    "liftoff": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
+      "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
+      "dev": true,
+      "requires": {
+        "extend": "^3.0.0",
+        "findup-sync": "^3.0.0",
+        "fined": "^1.0.1",
+        "flagged-respawn": "^1.0.0",
+        "is-plain-object": "^2.0.4",
+        "object.map": "^1.0.0",
+        "rechoir": "^0.6.2",
+        "resolve": "^1.1.7"
+      }
+    },
+    "lines-and-columns": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
+      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
+      "dev": true
+    },
+    "load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      },
+      "dependencies": {
+        "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=="
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY="
+        }
+      }
+    },
+    "loader-runner": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
+      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
+      "dev": true
+    },
+    "loader-utils": {
+      "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": "^2.1.2"
+      }
+    },
+    "locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "requires": {
+        "p-locate": "^2.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=="
+    },
+    "lodash-es": {
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz",
+      "integrity": "sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ=="
+    },
+    "lodash.capitalize": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz",
+      "integrity": "sha1-+CbJtOKoUR2E46yinbBeGk87cqk=",
+      "dev": true
+    },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "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",
+      "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": "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"
+      },
+      "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
+        },
+        "type-fest": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+          "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="
+        }
+      }
+    },
+    "loglevel": {
+      "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": {
+      "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": "^3.0.0 || ^4.0.0"
+      }
+    },
+    "lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+      "dev": true
+    },
+    "lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "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
+        }
+      }
+    },
+    "lru-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
+      "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
+      "dev": true,
+      "requires": {
+        "es5-ext": "~0.10.2"
+      }
+    },
+    "magic-string": {
+      "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"
+      }
+    },
+    "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"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        }
+      }
+    },
+    "make-error": {
+      "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.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": "^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",
+        "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"
+      },
+      "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"
+          }
+        },
+        "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": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
+      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^6.0.2"
+      }
+    },
+    "mamacro": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
+      "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
+      "dev": true
+    },
+    "map-age-cleaner": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+      "requires": {
+        "p-defer": "^1.0.0"
+      }
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "dev": true
+    },
+    "map-stream": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+      "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
+      "dev": true
+    },
+    "map-visit": {
+      "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"
+      }
+    },
+    "mappy-breakpoints": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/mappy-breakpoints/-/mappy-breakpoints-0.2.3.tgz",
+      "integrity": "sha1-55ZqFe6louprSJXSW364It199Fs="
+    },
+    "marked": {
+      "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",
+      "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
+      "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
+      "dev": true,
+      "requires": {
+        "findup-sync": "^2.0.0",
+        "micromatch": "^3.0.4",
+        "resolve": "^1.4.0",
+        "stack-trace": "0.0.10"
+      },
+      "dependencies": {
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "chokidar": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz",
+          "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==",
+          "requires": {
+            "anymatch": "~3.1.1",
+            "braces": "~3.0.2",
+            "fsevents": "~2.1.2",
+            "glob-parent": "~5.1.0",
+            "is-binary-path": "~2.1.0",
+            "normalize-path": "~3.0.0",
+            "readdirp": "~3.4.0"
+          }
+        },
+        "expand-tilde": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+          "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+          "requires": {
+            "homedir-polyfill": "^1.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==",
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "findup-sync": {
+          "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
+        },
+        "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=="
+        },
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "requires": {
+            "is-extglob": "^2.1.0"
+          }
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
+        },
+        "mime": {
+          "version": "2.4.6",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
+          "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.0.0.tgz",
+          "integrity": "sha512-PiVO95TKvhiwgSwg1IdLYlCTdul38yZxZMIcnDSFIBUm4BNZha2qpQ4GpJ++15bHoKDtrW2D69lMfFwdFYtNZQ=="
+        },
+        "readdirp": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
+          "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+          "requires": {
+            "picomatch": "^2.2.1"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        },
+        "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==",
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
+      }
+    },
+    "matched": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/matched/-/matched-1.0.2.tgz",
+      "integrity": "sha512-7ivM1jFZVTOOS77QsR+TtYHH0ecdLclMkqbf5qiJdX2RorqfhsL65QHySPZgDE0ZjHoh+mQUNHTanNXIlzXd0Q==",
+      "dev": true,
+      "requires": {
+        "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": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "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",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "dev": true
+    },
+    "mem": {
+      "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",
+        "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
+        }
+      }
+    },
+    "memoizee": {
+      "version": "0.4.14",
+      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz",
+      "integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "^0.10.45",
+        "es6-weak-map": "^2.0.2",
+        "event-emitter": "^0.3.5",
+        "is-promise": "^2.1",
+        "lru-queue": "0.1",
+        "next-tick": "1",
+        "timers-ext": "^0.1.5"
+      }
+    },
+    "memory-fs": {
+      "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",
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "memorystream": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
+      "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=",
+      "dev": true
+    },
+    "merge": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
+      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==",
+      "dev": true
+    },
+    "merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "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",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+      "dev": true
+    },
+    "micromatch": {
+      "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",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "dependencies": {
+        "braces": {
+          "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",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "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"
+              }
             }
+          }
+        },
+        "fill-range": {
+          "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",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
           },
-          ===
-          === = >>>
-          >>> > upstream / master "@babel/types": {
-            "version": "7.10.2",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-            "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-validator-identifier": "^7.10.1",
-              "lodash": "^4.17.13",
-              "to-fast-properties": "^2.0.0"
-            } <<
-            << << < HEAD
+          "dependencies": {
+            "extend-shallow": {
+              "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"
+              }
+            }
+          }
+        },
+        "is-number": {
+          "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"
           },
-          "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"
+          "dependencies": {
+            "kind-of": {
+              "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"
+              }
             }
+          }
+        },
+        "to-regex-range": {
+          "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"
+          }
+        }
+      }
+    },
+    "miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "dev": true
+        }
+      }
+    },
+    "mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "dev": true
+    },
+    "mime-db": {
+      "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.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.43.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
+    },
+    "mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "dev": true
+    },
+    "mini-css-extract-plugin": {
+      "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": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "minimatch": {
+      "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"
+      }
+    },
+    "minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+    },
+    "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": {
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.0"
+      },
+      "dependencies": {
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
+        }
+      }
+    },
+    "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"
+      },
+      "dependencies": {
+        "minipass": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
+          "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.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"
+      },
+      "dependencies": {
+        "minipass": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
+          "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.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"
+      },
+      "dependencies": {
+        "minipass": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
+          "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        }
+      }
+    },
+    "minizlib": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.0.tgz",
+      "integrity": "sha512-EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA==",
+      "dev": true,
+      "requires": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "dependencies": {
+        "minipass": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
+          "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        }
+      }
+    },
+    "mississippi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+      "dev": true,
+      "requires": {
+        "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"
+      }
+    },
+    "mixin-deep": {
+      "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"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "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"
+          }
+        }
+      }
+    },
+    "mkdirp": {
+      "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"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "dev": true
+        }
+      }
+    },
+    "mktemp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/mktemp/-/mktemp-1.0.0.tgz",
+      "integrity": "sha512-2duBeS0A75x0M3sCoY0R1TiLsYfIBUtNBNWS++eo+bX/ObVqzblqnEQhlaepoBOLD14wklsV3cYxZ68o5qYO8A==",
+      "dev": true
+    },
+    "moment": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+    },
+    "moment-timezone": {
+      "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"
+      }
+    },
+    "move-concurrently": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1",
+        "copy-concurrently": "^1.0.0",
+        "fs-write-stream-atomic": "^1.0.8",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.3"
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "multicast-dns": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
+      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
+      "dev": true,
+      "requires": {
+        "dns-packet": "^1.3.1",
+        "thunky": "^1.0.2"
+      }
+    },
+    "multicast-dns-service-types": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
+      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
+      "dev": true
+    },
+    "mute-stdout": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
+      "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
+      "dev": true
+    },
+    "mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+      "dev": true
+    },
+    "mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "dev": true,
+      "requires": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
+    },
+    "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.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      }
+    },
+    "negotiator": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "dev": true
+    },
+    "neo-async": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
+      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
+      "dev": true
+    },
+    "next-tick": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
+      "dev": true
+    },
+    "ng-packagr": {
+      "version": "9.1.5",
+      "resolved": "https://registry.npmjs.org/ng-packagr/-/ng-packagr-9.1.5.tgz",
+      "integrity": "sha512-biuNfM15uLkCW+Vvj8bnuwjX37oX7j5icGm+l71FhM6ydlEl+Cl7PdFXpy9rrIlKFYlYRiPiiiWazGwVGn1icQ==",
+      "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.7.6",
+        "browserslist": "^4.12.0",
+        "chalk": "^4.0.0",
+        "chokidar": "^3.2.1",
+        "clean-css": "^4.1.11",
+        "commander": "^4.0.0",
+        "fs-extra": "^9.0.0",
+        "glob": "^7.1.2",
+        "injection-js": "^2.2.1",
+        "less": "^3.10.3",
+        "node-sass-tilde-importer": "^1.0.0",
+        "postcss": "^7.0.18",
+        "postcss-url": "^8.0.0",
+        "read-pkg-up": "^5.0.0",
+        "rimraf": "^3.0.0",
+        "rollup": "2.7.5",
+        "rollup-plugin-sourcemaps": "^0.6.0",
+        "rxjs": "^6.5.0",
+        "sass": "^1.23.0",
+        "stylus": "^0.54.7",
+        "terser": "^4.3.8",
+        "update-notifier": "^4.0.0"
+      },
+      "dependencies": {
+        "autoprefixer": {
+          "version": "9.8.0",
+          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.0.tgz",
+          "integrity": "sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==",
+          "dev": true,
+          "requires": {
+            "browserslist": "^4.12.0",
+            "caniuse-lite": "^1.0.30001061",
+            "chalk": "^2.4.2",
+            "normalize-range": "^0.1.2",
+            "num2fraction": "^1.2.2",
+            "postcss": "^7.0.30",
+            "postcss-value-parser": "^4.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
-          }
-        }
-      },
-      "@babel/helpers": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.1.tgz",
-        "integrity": "sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==",
-        "dev": true,
-        "requires": {
-          "@babel/template": "^7.10.1",
-          "@babel/traverse": "^7.10.1",
-          "@babel/types": "^7.10.1"
-        },
-        "dependencies": {
-          "@babel/code-frame": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-            "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
-            "dev": true,
-            "requires": {
-              "@babel/highlight": "^7.10.1"
+          "dependencies": {
+            "chalk": {
+              "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.3.0"
+              }
+            },
+            "postcss": {
+              "version": "7.0.32",
+              "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
+              "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==",
+              "dev": true,
+              "requires": {
+                "chalk": "^2.4.2",
+                "source-map": "^0.6.1",
+                "supports-color": "^6.1.0"
+              },
+              "dependencies": {
+                "supports-color": {
+                  "version": "6.1.0",
+                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+                  "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+                  "dev": true,
+                  "requires": {
+                    "has-flag": "^3.0.0"
+                  }
+                }
+              }
             }
+          }
+        },
+        "chalk": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           },
-          "@babel/generator": {
-            "version": "7.10.2",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz",
-            "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==",
-            "dev": true,
-            "requires": {
-              "@babel/types": "^7.10.2",
-              "jsesc": "^2.5.1",
-              "lodash": "^4.17.13",
-              "source-map": "^0.5.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"
+              }
+            },
+            "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"
+              }
             }
+          }
+        },
+        "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": "4.1.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+          "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+          "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==",
+          "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.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": "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",
+          "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
+          "dev": true,
+          "requires": {
+            "@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": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+          "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"
+          }
+        },
+        "read-pkg-up": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-5.0.0.tgz",
+          "integrity": "sha512-XBQjqOBtTzyol2CpsQOw8LHV0XbDZVG7xMMjmXAJomlVY03WOBRmYgDJETlvcg0H63AJvPRwT7GFi5rvOzUOKg==",
+          "dev": true,
+          "requires": {
+            "find-up": "^3.0.0",
+            "read-pkg": "^5.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"
+          }
+        },
+        "rollup": {
+          "version": "2.7.5",
+          "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.7.5.tgz",
+          "integrity": "sha512-xQSM8uzhgtF6tTnTVEvOQThrcG3LPUP3T/4l4EukzDp0kbTY1QRDuXjiwtYzs9odKj9Bj/PccRG6viFfS7DmCQ==",
+          "dev": true,
+          "requires": {
+            "fsevents": "~2.1.2"
+          }
+        },
+        "rollup-plugin-sourcemaps": {
+          "version": "0.6.2",
+          "resolved": "https://registry.npmjs.org/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.6.2.tgz",
+          "integrity": "sha512-9AwTKg3yRykwzemfLt71ySe0LvrAci+bpsOL1LaTYFk5BX4HF6X7DQfpHa74ANfSja3hyjiQkXCR8goSOnW//Q==",
+          "dev": true,
+          "requires": {
+            "@rollup/pluginutils": "^3.0.9",
+            "source-map-resolve": "^0.6.0"
+          }
+        },
+        "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
+        },
+        "source-map-resolve": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
+          "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
+          "dev": true,
+          "requires": {
+            "atob": "^2.1.2",
+            "decode-uri-component": "^0.2.0"
+          }
+        },
+        "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"
+          }
+        },
+        "type-fest": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+          "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+          "dev": true
+        }
+      }
+    },
+    "ngrx-store-localstorage": {
+      "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.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"
+      }
+    },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+    },
+    "node-fetch": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
+      "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",
+      "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==",
+      "dev": true
+    },
+    "node-libs-browser": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+      "dev": true,
+      "requires": {
+        "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.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.0",
+        "vm-browserify": "^1.0.1"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true
+        }
+      }
+    },
+    "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
+    },
+    "node-sass-tilde-importer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz",
+      "integrity": "sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==",
+      "dev": true,
+      "requires": {
+        "find-parent-dir": "^0.3.0"
+      }
+    },
+    "nopt": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+      "dev": true,
+      "requires": {
+        "abbrev": "1"
+      }
+    },
+    "normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "requires": {
+        "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": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
+    },
+    "normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+      "dev": true
+    },
+    "normalize-url": {
+      "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.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",
+      "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
+      "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.2"
+      }
+    },
+    "npm-bundled": {
+      "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.3.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+          "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": "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": "^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.3.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+          "dev": true
+        }
+      }
+    },
+    "npm-packlist": {
+      "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": {
+        "ignore-walk": "^3.0.1",
+        "npm-bundled": "^1.0.1",
+        "npm-normalize-package-bin": "^1.0.1"
+      }
+    },
+    "npm-pick-manifest": {
+      "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": {
+        "npm-install-checks": "^4.0.0",
+        "npm-package-arg": "^8.0.0",
+        "semver": "^7.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "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.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",
+        "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": {
+        "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.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        }
+      }
+    },
+    "npm-run-all": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
+      "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "chalk": "^2.4.1",
+        "cross-spawn": "^6.0.5",
+        "memorystream": "^0.3.1",
+        "minimatch": "^3.0.4",
+        "pidtree": "^0.3.0",
+        "read-pkg": "^3.0.0",
+        "shell-quote": "^1.6.1",
+        "string.prototype.padend": "^3.0.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "dev": true,
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "load-json-file": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^4.0.0",
+            "pify": "^3.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "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.1",
+            "json-parse-better-errors": "^1.0.1"
+          }
+        },
+        "read-pkg": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^4.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^3.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        }
+      }
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "requires": {
+        "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",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "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",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+      "dev": true
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
+    "object-component": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
+      "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=",
+      "dev": true
+    },
+    "object-copy": {
+      "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",
+        "kind-of": "^3.0.3"
+      },
+      "dependencies": {
+        "define-property": {
+          "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"
+          }
+        },
+        "kind-of": {
+          "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"
+          }
+        }
+      }
+    },
+    "object-inspect": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
+      "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==",
+      "dev": true
+    },
+    "object-is": {
+      "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.2.0",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+          "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+          "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+          "dev": true,
+          "requires": {
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "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",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "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"
+      }
+    },
+    "object.assign": {
+      "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",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
+      }
+    },
+    "object.defaults": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
+      "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
+      "dev": true,
+      "requires": {
+        "array-each": "^1.0.1",
+        "array-slice": "^1.0.0",
+        "for-own": "^1.0.0",
+        "isobject": "^3.0.0"
+      }
+    },
+    "object.getownpropertydescriptors": {
+      "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.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.2.0",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+          "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+          "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+          "dev": true,
+          "requires": {
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "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": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
+      "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
+      "dev": true,
+      "requires": {
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      }
+    },
+    "object.pick": {
+      "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"
+      }
+    },
+    "object.reduce": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
+      "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
+      "dev": true,
+      "requires": {
+        "for-own": "^1.0.0",
+        "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.2.0",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+          "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+          "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+          "dev": true,
+          "requires": {
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "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",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+      "dev": true
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "dev": true,
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "dev": true
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "onetime": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
+      "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "^2.1.0"
+      }
+    },
+    "open": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.0.3.tgz",
+      "integrity": "sha512-sP2ru2v0P290WFfv49Ap8MF6PkzGNnGlAwHweB4WR4mr5d2d0woiCluUeJ218w7/+PmoBy9JmYgD5A4mLcWOFA==",
+      "dev": true,
+      "requires": {
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
+      }
+    },
+    "opn": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
+      "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
+      "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": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+      "dev": true,
+      "requires": {
+        "minimist": "~0.0.1",
+        "wordwrap": "~0.0.2"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.10",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
+          "dev": true
+        },
+        "wordwrap": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+          "dev": true
+        }
+      }
+    },
+    "optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dev": true,
+      "requires": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      }
+    },
+    "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",
+      "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "original": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
+      "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
+      "dev": true,
+      "requires": {
+        "url-parse": "^1.4.3"
+      }
+    },
+    "os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+      "dev": true
+    },
+    "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
+    },
+    "os-locale": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+      "dev": true,
+      "requires": {
+        "lcid": "^1.0.0"
+      }
+    },
+    "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
+    },
+    "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",
+      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
+      "dev": true
+    },
+    "p-defer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww="
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
+    },
+    "p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "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=",
+      "requires": {
+        "p-limit": "^1.1.0"
+      }
+    },
+    "p-map": {
+      "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",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
+      "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
+      "dev": true,
+      "requires": {
+        "retry": "^0.12.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="
+    },
+    "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",
+      "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
+      "dev": true,
+      "requires": {
+        "got": "^9.6.0",
+        "registry-auth-token": "^4.0.0",
+        "registry-url": "^5.0.0",
+        "semver": "^6.2.0"
+      },
+      "dependencies": {
+        "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==",
+          "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==",
+          "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",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "pacote": {
+      "version": "9.5.12",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.12.tgz",
+      "integrity": "sha512-BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ==",
+      "dev": true,
+      "requires": {
+        "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",
+        "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",
+        "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": {
+        "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"
+          }
+        },
+        "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"
+          }
+        },
+        "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
+        }
+      }
+    },
+    "pako": {
+      "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": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
+      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
+      "dev": true,
+      "requires": {
+        "cyclist": "^1.0.1",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.1.5"
+      }
+    },
+    "parse-asn1": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
+      "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
+      "dev": true,
+      "requires": {
+        "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": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
+      "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
+      "dev": true,
+      "requires": {
+        "is-absolute": "^1.0.0",
+        "map-cache": "^0.2.0",
+        "path-root": "^0.1.1"
+      }
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "dev": true,
+      "requires": {
+        "error-ex": "^1.2.0"
+      }
+    },
+    "parse-node-version": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
+      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
+      "dev": true
+    },
+    "parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY="
+    },
+    "parse5": {
+      "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": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
+      "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
+      "dev": true,
+      "requires": {
+        "better-assert": "~1.0.0"
+      }
+    },
+    "parseuri": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
+      "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
+      "dev": true,
+      "requires": {
+        "better-assert": "~1.0.0"
+      }
+    },
+    "parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "dev": true
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "dev": true
+    },
+    "path-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+      "dev": true
+    },
+    "path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "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="
+    },
+    "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
+    },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+      "dev": true
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
+    },
+    "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==",
+      "dev": true
+    },
+    "path-root": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
+      "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
+      "dev": true,
+      "requires": {
+        "path-root-regex": "^0.1.0"
+      }
+    },
+    "path-root-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
+      "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
+      "dev": true
+    },
+    "path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
+      "dev": true
+    },
+    "path-type": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+      "dev": true,
+      "requires": {
+        "pify": "^3.0.0"
+      }
+    },
+    "pause-stream": {
+      "version": "0.0.11",
+      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+      "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
+      "dev": true,
+      "requires": {
+        "through": "~2.3"
+      }
+    },
+    "pbkdf2": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz",
+      "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==",
+      "dev": true,
+      "requires": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+      "dev": true
+    },
+    "picomatch": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
+    },
+    "pidtree": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.0.tgz",
+      "integrity": "sha512-9CT4NFlDcosssyg8KVFltgokyKZIFjoBxw8CTGy+5F38Y1eQWrt8tRayiUOXE+zVKQnYu5BR8JjCtvK3BcnBhg==",
+      "dev": true
+    },
+    "pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+      "dev": true
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "requires": {
+        "pinkie": "^2.0.0"
+      }
+    },
+    "pkg-dir": {
+      "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"
+      },
+      "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.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": "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": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^1.0.1",
+        "arr-diff": "^4.0.0",
+        "arr-union": "^3.1.0",
+        "extend-shallow": "^3.0.2"
+      },
+      "dependencies": {
+        "ansi-colors": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+          "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+          "dev": true,
+          "requires": {
+            "ansi-wrap": "^0.1.0"
+          }
+        }
+      }
+    },
+    "pluralize": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz",
+      "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=",
+      "dev": true
+    },
+    "portfinder": {
+      "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",
+        "debug": "^3.1.1",
+        "mkdirp": "^0.5.1"
+      },
+      "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"
+          }
+        },
+        "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
+        }
+      }
+    },
+    "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=",
+      "dev": true
+    },
+    "postcss": {
+      "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",
+        "source-map": "^0.6.1",
+        "supports-color": "^6.1.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
+        }
+      }
+    },
+    "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",
+      "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.1",
+        "postcss-value-parser": "^3.2.3",
+        "read-cache": "^1.0.0",
+        "resolve": "^1.1.7"
+      },
+      "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-load-config": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz",
+      "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "^5.0.0",
+        "import-cwd": "^2.0.0"
+      }
+    },
+    "postcss-loader": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
+      "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "postcss": "^7.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-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",
+      "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": {
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "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==",
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "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==",
+          "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=="
+        },
+        "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": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-url/-/postcss-url-8.0.0.tgz",
+      "integrity": "sha512-E2cbOQ5aii2zNHh8F6fk1cxls7QVFZjLPSrqvmiza8OuXLzIpErij8BDS5Y3STPfJgpIMNCPEr8JlKQWEoozUw==",
+      "dev": true,
+      "requires": {
+        "mime": "^2.3.1",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.0",
+        "postcss": "^7.0.2",
+        "xxhashjs": "^0.2.1"
+      },
+      "dependencies": {
+        "mime": {
+          "version": "2.4.6",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
+          "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-value-parser": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
+      "dev": true
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true
+    },
+    "prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
+    },
+    "prettier": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz",
+      "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==",
+      "dev": true
+    },
+    "pretty-hrtime": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
+      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
+      "dev": true
+    },
+    "private": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+      "dev": true
+    },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true
+    },
+    "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==",
+      "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",
+      "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
+      "dev": true
+    },
+    "promise": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
+      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "asap": "~2.0.3"
+      }
+    },
+    "promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+      "dev": true
+    },
+    "promise-retry": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz",
+      "integrity": "sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=",
+      "dev": true,
+      "requires": {
+        "err-code": "^1.0.0",
+        "retry": "^0.10.0"
+      },
+      "dependencies": {
+        "retry": {
+          "version": "0.10.1",
+          "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
+          "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=",
+          "dev": true
+        }
+      }
+    },
+    "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",
+      "integrity": "sha512-7pMAolv8Ah1yJIqaorDTzACtn3gk7BamVKPTeO5lqIGOrfosjPgXFx/z1dqSI+m5EeZc2GMJHPr5DYlodujDNA==",
+      "dev": true,
+      "requires": {
+        "@types/q": "^0.0.32",
+        "@types/selenium-webdriver": "^3.0.0",
+        "blocking-proxy": "^1.0.0",
+        "browserstack": "^1.5.1",
+        "chalk": "^1.1.3",
+        "glob": "^7.0.3",
+        "jasmine": "2.8.0",
+        "jasminewd2": "^2.1.0",
+        "optimist": "~0.6.0",
+        "q": "1.4.1",
+        "saucelabs": "^1.5.0",
+        "selenium-webdriver": "3.6.0",
+        "source-map-support": "~0.4.0",
+        "webdriver-js-extender": "2.1.0",
+        "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",
+          "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"
+          }
+        },
+        "del": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
+          "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
+          "dev": true,
+          "requires": {
+            "globby": "^5.0.0",
+            "is-path-cwd": "^1.0.0",
+            "is-path-in-cwd": "^1.0.0",
+            "object-assign": "^4.0.1",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0",
+            "rimraf": "^2.2.8"
+          }
+        },
+        "globby": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+          "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
+          "dev": true,
+          "requires": {
+            "array-union": "^1.0.1",
+            "arrify": "^1.0.0",
+            "glob": "^7.0.3",
+            "object-assign": "^4.0.1",
+            "pify": "^2.0.0",
+            "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",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
+        "q": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
+          "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=",
+          "dev": true
+        },
+        "source-map-support": {
+          "version": "0.4.18",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+          "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+          "dev": true,
+          "requires": {
+            "source-map": "^0.5.6"
+          }
+        },
+        "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
+        },
+        "webdriver-manager": {
+          "version": "12.1.7",
+          "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.7.tgz",
+          "integrity": "sha512-XINj6b8CYuUYC93SG3xPkxlyUc3IJbD6Vvo75CVGuG9uzsefDzWQrhz0Lq8vbPxtb4d63CZdYophF8k8Or/YiA==",
+          "dev": true,
+          "requires": {
+            "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"
+          }
+        }
+      }
+    },
+    "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",
+      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
+      "dev": true,
+      "requires": {
+        "forwarded": "~0.1.2",
+        "ipaddr.js": "1.9.1"
+      }
+    },
+    "prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true
+    },
+    "ps-node": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/ps-node/-/ps-node-0.1.6.tgz",
+      "integrity": "sha1-mvZ6mdex0BMuUaUDCZ04qNKs4sM=",
+      "dev": true,
+      "requires": {
+        "table-parser": "^0.1.3"
+      }
+    },
+    "ps-tree": {
+      "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"
+      }
+    },
+    "psl": {
+      "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": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "dev": true
+        }
+      }
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "pumpify": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "dev": true,
+      "requires": {
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
+      },
+      "dependencies": {
+        "pump": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        }
+      }
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "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",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
+      "dev": true
+    },
+    "qjobs": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
+      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "dev": true
+    },
+    "query-string": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
+      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
+      "requires": {
+        "object-assign": "^4.1.0",
+        "strict-uri-encode": "^1.0.0"
+      }
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "dev": true
+    },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true
+    },
+    "querystringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
+      "dev": true
+    },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "dev": true
+    },
+    "raw-body": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "dev": true,
+      "requires": {
+        "bytes": "3.1.0",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+          "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+          "dev": true
+        }
+      }
+    },
+    "raw-loader": {
+      "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.2.3",
+        "schema-utils": "^2.5.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"
+          }
+        }
+      }
+    },
+    "rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "dev": true,
+      "requires": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      }
+    },
+    "read-cache": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+      "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
+      "dev": true,
+      "requires": {
+        "pify": "^2.3.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "read-package-json": {
+      "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",
+        "npm-normalize-package-bin": "^1.0.0"
+      }
+    },
+    "read-package-tree": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz",
+      "integrity": "sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==",
+      "dev": true,
+      "requires": {
+        "read-package-json": "^2.0.0",
+        "readdir-scoped-modules": "^1.0.0",
+        "util-promisify": "^2.1.0"
+      }
+    },
+    "read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "dev": true,
+      "requires": {
+        "load-json-file": "^1.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^1.0.0"
+      },
+      "dependencies": {
+        "path-type": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "dev": true,
+      "requires": {
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+          "dev": true,
+          "requires": {
+            "path-exists": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+          "dev": true,
+          "requires": {
+            "pinkie-promise": "^2.0.0"
+          }
+        }
+      }
+    },
+    "readable-stream": {
+      "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",
+        "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"
+      }
+    },
+    "readdir-scoped-modules": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz",
+      "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==",
+      "dev": true,
+      "requires": {
+        "debuglog": "^1.0.1",
+        "dezalgo": "^1.0.0",
+        "graceful-fs": "^4.1.2",
+        "once": "^1.3.0"
+      }
+    },
+    "readdirp": {
+      "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.2.1"
+      }
+    },
+    "readline2": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
+      "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
+      "dev": true,
+      "requires": {
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "mute-stream": "0.0.5"
+      },
+      "dependencies": {
+        "mute-stream": {
+          "version": "0.0.5",
+          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
+          "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=",
+          "dev": true
+        }
+      }
+    },
+    "rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+      "dev": true,
+      "requires": {
+        "resolve": "^1.1.6"
+      }
+    },
+    "reflect-metadata": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
+      "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
+      "dev": true
+    },
+    "regenerate": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
+      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
+      "dev": true
+    },
+    "regenerate-unicode-properties": {
+      "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.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.4",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz",
+      "integrity": "sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.8.4",
+        "private": "^0.1.8"
+      }
+    },
+    "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"
+      }
+    },
+    "regexp.prototype.flags": {
+      "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.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.2.0",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+          "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+          "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+          "dev": true,
+          "requires": {
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "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.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.2.0",
+        "regjsgen": "^0.5.1",
+        "regjsparser": "^0.6.4",
+        "unicode-match-property-ecmascript": "^1.0.4",
+        "unicode-match-property-value-ecmascript": "^1.2.0"
+      }
+    },
+    "registry-auth-token": {
+      "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"
+      }
+    },
+    "registry-url": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
+      "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
+      "dev": true,
+      "requires": {
+        "rc": "^1.2.8"
+      }
+    },
+    "regjsgen": {
+      "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.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
+        }
+      }
+    },
+    "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",
+      "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
+      "dev": true,
+      "requires": {
+        "is-buffer": "^1.1.5",
+        "is-utf8": "^0.2.1"
+      }
+    },
+    "remove-bom-stream": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
+      "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
+      "dev": true,
+      "requires": {
+        "remove-bom-buffer": "^3.0.0",
+        "safe-buffer": "^5.1.0",
+        "through2": "^2.0.3"
+      }
+    },
+    "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=",
+      "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==",
+      "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=",
+      "dev": true
+    },
+    "replace-ext": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+      "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
+      "dev": true
+    },
+    "replace-homedir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
+      "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
+      "dev": true,
+      "requires": {
+        "homedir-polyfill": "^1.0.1",
+        "is-absolute": "^1.0.0",
+        "remove-trailing-separator": "^1.1.0"
+      }
+    },
+    "replace-in-file": {
+      "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": "^3.0.0",
+        "glob": "^7.1.6",
+        "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"
+          }
+        },
+        "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": "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"
+          }
+        },
+        "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
+        },
+        "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
+        },
+        "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"
+          }
+        },
+        "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"
+          }
+        }
+      }
+    },
+    "request": {
+      "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",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.3",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.5.0",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      }
+    },
+    "request-promise-core": {
+      "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.15"
+      }
+    },
+    "request-promise-native": {
+      "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.3",
+        "stealthy-require": "^1.1.1",
+        "tough-cookie": "^2.3.3"
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+    },
+    "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
+    },
+    "require-uncached": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
+      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
+      "dev": true,
+      "requires": {
+        "caller-path": "^0.1.0",
+        "resolve-from": "^1.0.0"
+      },
+      "dependencies": {
+        "caller-path": {
+          "version": "0.1.0",
+          "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
+          "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
+          "dev": true,
+          "requires": {
+            "callsites": "^0.2.0"
+          }
+        },
+        "callsites": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
+          "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
+          "dev": true
+        },
+        "resolve-from": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
+          "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
+          "dev": true
+        }
+      }
+    },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
+      "dev": true
+    },
+    "reselect": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.0.0.tgz",
+      "integrity": "sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA=="
+    },
+    "resolve": {
+      "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"
+      }
+    },
+    "resolve-cwd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "resolve-dir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "dev": true
+    },
+    "resolve-options": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
+      "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
+      "dev": true,
+      "requires": {
+        "value-or-function": "^3.0.0"
+      }
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+      "dev": true
+    },
+    "responselike": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
+      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
+      "dev": true,
+      "requires": {
+        "lowercase-keys": "^1.0.0"
+      }
+    },
+    "restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "requires": {
+        "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==",
+      "dev": true
+    },
+    "retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
+      "dev": true
+    },
+    "reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true
+    },
+    "rfdc": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz",
+      "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": "2.1.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.1.0.tgz",
+      "integrity": "sha512-gfE1455AEazVVTJoeQtcOq/U6GSxwoj4XPSWVsuWmgIxj7sBQNLDOSA82PbdMe+cP8ql8fR1jogPFe8Wg8g4SQ==",
+      "dev": true,
+      "requires": {
+        "fsevents": "~2.1.2"
+      }
+    },
+    "run-async": {
+      "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",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
+      "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==",
+      "dev": true
+    },
+    "run-queue": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
+      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1"
+      }
+    },
+    "rx-lite": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz",
+      "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=",
+      "dev": true
+    },
+    "rxjs": {
+      "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"
+      }
+    },
+    "rxjs-spy": {
+      "version": "7.5.1",
+      "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.0",
+        "error-stack-parser": "^2.0.1",
+        "stacktrace-gps": "^3.0.2"
+      }
+    },
+    "rxjs-tslint": {
+      "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",
+        "tslint": "^5.9.1",
+        "tsutils": "^2.25.0",
+        "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",
+          "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"
+          }
+        },
+        "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"
+          }
+        }
+      }
+    },
+    "rxjs-websockets": {
+      "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",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "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"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "sass": {
+      "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"
+      }
+    },
+    "sass-lint": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/sass-lint/-/sass-lint-1.13.1.tgz",
+      "integrity": "sha512-DSyah8/MyjzW2BWYmQWekYEKir44BpLqrCFsgs9iaWiVTcwZfwXHF586hh3D1n+/9ihUNMfd8iHAyb9KkGgs7Q==",
+      "dev": true,
+      "requires": {
+        "commander": "^2.8.1",
+        "eslint": "^2.7.0",
+        "front-matter": "2.1.2",
+        "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": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
+          "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^3.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        },
+        "jsonfile": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
+          "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.6"
+          }
+        },
+        "util": {
+          "version": "0.10.4",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+          "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3"
+          }
+        }
+      }
+    },
+    "sass-loader": {
+      "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.2.3",
+        "neo-async": "^2.6.1",
+        "schema-utils": "^2.6.1",
+        "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"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "saucelabs": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.5.0.tgz",
+      "integrity": "sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==",
+      "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": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
+    },
+    "schema-utils": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
+      "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
+      "dev": true,
+      "requires": {
+        "@types/json-schema": "^7.0.4",
+        "ajv": "^6.12.2",
+        "ajv-keywords": "^3.4.1"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
+          "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
+          "dev": true,
+          "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"
+          }
+        }
+      }
+    },
+    "select-hose": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
+      "dev": true
+    },
+    "selenium-webdriver": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz",
+      "integrity": "sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==",
+      "dev": true,
+      "requires": {
+        "jszip": "^3.1.3",
+        "rimraf": "^2.5.4",
+        "tmp": "0.0.30",
+        "xml2js": "^0.4.17"
+      },
+      "dependencies": {
+        "tmp": {
+          "version": "0.0.30",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz",
+          "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=",
+          "dev": true,
+          "requires": {
+            "os-tmpdir": "~1.0.1"
+          }
+        }
+      }
+    },
+    "selfsigned": {
+      "version": "1.10.7",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz",
+      "integrity": "sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==",
+      "dev": true,
+      "requires": {
+        "node-forge": "0.9.0"
+      }
+    },
+    "semver": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
+    },
+    "semver-diff": {
+      "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": "^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": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/semver-dsl/-/semver-dsl-1.0.1.tgz",
+      "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=",
+      "dev": true,
+      "requires": {
+        "semver": "^5.3.0"
+      }
+    },
+    "semver-greatest-satisfied-range": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
+      "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
+      "dev": true,
+      "requires": {
+        "sver-compat": "^1.5.0"
+      }
+    },
+    "semver-intersect": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/semver-intersect/-/semver-intersect-1.4.0.tgz",
+      "integrity": "sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==",
+      "dev": true,
+      "requires": {
+        "semver": "^5.0.0"
+      }
+    },
+    "send": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "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",
+        "fresh": "0.5.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"
+      },
+      "dependencies": {
+        "ms": {
+          "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
+        }
+      }
+    },
+    "serialize-javascript": {
+      "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": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
+      },
+      "dependencies": {
+        "http-errors": {
+          "version": "1.6.3",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+          "dev": true,
+          "requires": {
+            "depd": "~1.1.2",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.1.0",
+            "statuses": ">= 1.4.0 < 2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        },
+        "setprototypeof": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+          "dev": true
+        }
+      }
+    },
+    "serve-static": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "dev": true,
+      "requires": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.17.1"
+      }
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+    },
+    "set-immediate-shim": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
+      "dev": true
+    },
+    "set-value": {
+      "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",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "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"
+          }
+        }
+      }
+    },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "setprototypeof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
+      "dev": true
+    },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "shallow-clone": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^6.0.2"
+      }
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+    },
+    "shell-quote": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
+      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==",
+      "dev": true
+    },
+    "signal-exit": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
+    },
+    "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",
+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+      "dev": true
+    },
+    "slice-ansi": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
+      "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
+      "dev": true
+    },
+    "smart-buffer": {
+      "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": {
+      "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",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "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"
+          }
+        },
+        "extend-shallow": {
+          "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"
+          }
+        }
+      }
+    },
+    "snapdragon-node": {
+      "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",
+        "snapdragon-util": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "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"
+          }
+        },
+        "is-accessor-descriptor": {
+          "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"
+          }
+        },
+        "is-data-descriptor": {
+          "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"
+          }
+        },
+        "is-descriptor": {
+          "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",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "snapdragon-util": {
+      "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"
+      },
+      "dependencies": {
+        "kind-of": {
+          "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"
+          }
+        }
+      }
+    },
+    "socket.io": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
+      "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
+      "dev": true,
+      "requires": {
+        "debug": "~3.1.0",
+        "engine.io": "~3.2.0",
+        "has-binary2": "~1.0.2",
+        "socket.io-adapter": "~1.1.0",
+        "socket.io-client": "2.1.1",
+        "socket.io-parser": "~3.2.0"
+      },
+      "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": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "socket.io-adapter": {
+      "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": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
+      "integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==",
+      "dev": true,
+      "requires": {
+        "backo2": "1.0.2",
+        "base64-arraybuffer": "0.1.5",
+        "component-bind": "1.0.0",
+        "component-emitter": "1.2.1",
+        "debug": "~3.1.0",
+        "engine.io-client": "~3.2.0",
+        "has-binary2": "~1.0.2",
+        "has-cors": "1.1.0",
+        "indexof": "0.0.1",
+        "object-component": "0.0.3",
+        "parseqs": "0.0.5",
+        "parseuri": "0.0.5",
+        "socket.io-parser": "~3.2.0",
+        "to-array": "0.1.4"
+      },
+      "dependencies": {
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+          "dev": true
+        },
+        "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": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "socket.io-parser": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
+      "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==",
+      "dev": true,
+      "requires": {
+        "component-emitter": "1.2.1",
+        "debug": "~3.1.0",
+        "isarray": "2.0.1"
+      },
+      "dependencies": {
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+          "dev": true
+        },
+        "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": {
+            "ms": "2.0.0"
+          }
+        },
+        "isarray": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
+          "dev": true
+        }
+      }
+    },
+    "sockjs": {
+      "version": "0.3.20",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz",
+      "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==",
+      "dev": true,
+      "requires": {
+        "faye-websocket": "^0.10.0",
+        "uuid": "^3.4.0",
+        "websocket-driver": "0.6.5"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+          "dev": true
+        }
+      }
+    },
+    "sockjs-client": {
+      "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",
+        "eventsource": "^1.0.7",
+        "faye-websocket": "~0.11.1",
+        "inherits": "^2.0.3",
+        "json3": "^3.3.2",
+        "url-parse": "^1.4.3"
+      },
+      "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"
+          }
+        },
+        "faye-websocket": {
+          "version": "0.11.3",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
+          "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
+          "dev": true,
+          "requires": {
+            "websocket-driver": ">=0.5.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
+        }
+      }
+    },
+    "socks": {
+      "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.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==",
+      "dev": true,
+      "requires": {
+        "agent-base": "~4.2.1",
+        "socks": "~2.3.2"
+      },
+      "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==",
+          "dev": true,
+          "requires": {
+            "es6-promisify": "^5.0.0"
+          }
+        }
+      }
+    },
+    "sort-keys": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
+      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
+      "requires": {
+        "is-plain-obj": "^1.0.0"
+      }
+    },
+    "source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
+    "source-map": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
+      "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI="
+    },
+    "source-map-loader": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.4.tgz",
+      "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==",
+      "dev": true,
+      "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": {
+      "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"
+      }
+    },
+    "source-map-support": {
+      "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",
+        "source-map": "^0.6.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
+        }
+      }
+    },
+    "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=",
+      "dev": true
+    },
+    "sourcemap-codec": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
+    },
+    "sparkles": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
+      "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",
+      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+      "dev": true,
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
+      "dev": true
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "dev": true,
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
+      "dev": true
+    },
+    "spdy": {
+      "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",
+        "handle-thing": "^2.0.0",
+        "http-deceiver": "^1.2.7",
+        "select-hose": "^2.0.0",
+        "spdy-transport": "^3.0.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.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
+        }
+      }
+    },
+    "spdy-transport": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.0",
+        "detect-node": "^2.0.4",
+        "hpack.js": "^2.1.6",
+        "obuf": "^1.1.2",
+        "readable-stream": "^3.0.6",
+        "wbuf": "^1.7.3"
+      },
+      "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
+        },
+        "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"
+          }
+        }
+      }
+    },
+    "speed-measure-webpack-plugin": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz",
+      "integrity": "sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.0.1"
+      }
+    },
+    "split": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
+      "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
+      "dev": true,
+      "requires": {
+        "through": "2"
+      }
+    },
+    "split-string": {
+      "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"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "sshpk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "dev": true,
+      "requires": {
+        "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": {
+      "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": {
+        "minipass": "^3.1.1"
+      },
+      "dependencies": {
+        "minipass": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
+          "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        }
+      }
+    },
+    "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",
+      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
+      "dev": true
+    },
+    "stackframe": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.1.0.tgz",
+      "integrity": "sha512-Vx6W1Yvy+AM1R/ckVwcHQHV147pTPBKWCRLrXMuPrFVfvBUc3os7PR1QLIWCMhPpRg5eX9ojzbQIMLGBwyLjqg=="
+    },
+    "stacktrace-gps": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-3.0.3.tgz",
+      "integrity": "sha512-51Rr7dXkyFUKNmhY/vqZWK+EvdsfFSRiQVtgHTFlAdNIYaDD7bVh21yBHXaNWAvTD+w+QSjxHg7/v6Tz4veExA==",
+      "requires": {
+        "source-map": "0.5.6",
+        "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"
+      },
+      "dependencies": {
+        "define-property": {
+          "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"
+          }
+        }
+      }
+    },
+    "statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "dev": true
+    },
+    "stdin": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/stdin/-/stdin-0.0.1.tgz",
+      "integrity": "sha1-0wQZgarsPf28d6GzjWNy449ftx4=",
+      "dev": true
+    },
+    "stealthy-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
+      "dev": true
+    },
+    "stratos-protractor-reporter": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/stratos-protractor-reporter/-/stratos-protractor-reporter-1.2.3.tgz",
+      "integrity": "sha512-e87eX4LB+KLVOfEF/TeWpNYM9aQFJTO+jsslym7zCZLYd8xlNWZUjmUf00J0DWn7YpoNGdjv0wzkKPcXJ2c5uw==",
+      "dev": true,
+      "requires": {
+        "circular-json": "^0.3.1",
+        "fs-extra": "^3.0.1",
+        "klaw-sync": "^2.1.0",
+        "mkdirp": "~0.3.5",
+        "underscore": "~1.6.0"
+      },
+      "dependencies": {
+        "circular-json": {
+          "version": "0.3.3",
+          "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
+          "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
+          "dev": true
+        },
+        "fs-extra": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
+          "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^3.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "jsonfile": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
+          "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.6"
+          }
+        },
+        "mkdirp": {
+          "version": "0.3.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
+          "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc=",
+          "dev": true
+        }
+      }
+    },
+    "stream-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+      "dev": true,
+      "requires": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "stream-combiner": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+      "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
+      "dev": true,
+      "requires": {
+        "duplexer": "~0.1.1"
+      }
+    },
+    "stream-each": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "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",
+      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
+      "dev": true
+    },
+    "stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "dev": true,
+      "requires": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "stream-shift": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
+      "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"
+          }
+        },
+        "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",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
+      }
+    },
+    "strict-uri-encode": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
+    },
+    "string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "dev": true,
+      "requires": {
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
+      }
+    },
+    "string.prototype.padend": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz",
+      "integrity": "sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA=",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.4.3",
+        "function-bind": "^1.0.2"
+      }
+    },
+    "string.prototype.trimend": {
+      "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",
+        "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.2.0",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+          "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+          "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+          "dev": true,
+          "requires": {
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "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",
+      "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1"
+      }
+    },
+    "string.prototype.trimright": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz",
+      "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1"
+      }
+    },
+    "string.prototype.trimstart": {
+      "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",
+        "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.2.0",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+          "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+          "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+          "dev": true,
+          "requires": {
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "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",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "strip-ansi": {
+      "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"
+      }
+    },
+    "strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "dev": true,
+      "requires": {
+        "is-utf8": "^0.2.0"
+      }
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
+    },
+    "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
+    },
+    "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",
+      "integrity": "sha512-rlkH7X/22yuwFYK357fMN/BxYOorfnfq0eD7+vqlemSK4wEcejFF1dg4zxP0euBW8NrYx2WZzZ8PPFevr7D+Kw==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.2.3",
+        "schema-utils": "^2.6.4"
+      },
+      "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"
+          }
+        }
+      }
+    },
+    "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": {
+        "browserslist": "^4.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"
+          }
+        },
+        "sax": {
+          "version": "0.5.8",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz",
+          "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE="
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+        },
+        "source-map": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
+        }
+      }
+    },
+    "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": {
+            "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
+        }
+      }
+    },
+    "stylus-loader": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
+      "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
+      "dev": true,
+      "requires": {
+        "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": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "sver-compat": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
+      "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
+      "dev": true,
+      "requires": {
+        "es6-iterator": "^2.0.1",
+        "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",
+      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
+      "dev": true
+    },
+    "table": {
+      "version": "3.8.3",
+      "resolved": "https://registry.npmjs.org/table/-/table-3.8.3.tgz",
+      "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=",
+      "dev": true,
+      "requires": {
+        "ajv": "^4.7.0",
+        "ajv-keywords": "^1.0.0",
+        "chalk": "^1.1.1",
+        "lodash": "^4.0.0",
+        "slice-ansi": "0.0.4",
+        "string-width": "^2.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "4.11.8",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+          "dev": true,
+          "requires": {
+            "co": "^4.6.0",
+            "json-stable-stringify": "^1.0.1"
+          }
+        },
+        "ajv-keywords": {
+          "version": "1.5.1",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz",
+          "integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw=",
+          "dev": true
+        },
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "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"
+          }
+        },
+        "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
+        },
+        "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"
           },
-          "@babel/helper-function-name": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
-            "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-get-function-arity": "^7.10.1",
-              "@babel/template": "^7.10.1",
-              "@babel/types": "^7.10.1"
+          "dependencies": {
+            "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"
+              }
             }
+          }
+        },
+        "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
+        }
+      }
+    },
+    "table-parser": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/table-parser/-/table-parser-0.1.3.tgz",
+      "integrity": "sha1-BEHPzhallIFoTCfRtaZ/8VpDx7A=",
+      "dev": true,
+      "requires": {
+        "connected-domain": "^1.0.0"
+      }
+    },
+    "tapable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+      "dev": true
+    },
+    "tar": {
+      "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": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^3.0.0",
+        "minizlib": "^2.1.0",
+        "mkdirp": "^1.0.3",
+        "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
+        },
+        "minipass": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
+          "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        }
+      }
+    },
+    "teeny-request": {
+      "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": {
+        "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"
           },
-          "@babel/helper-get-function-arity": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
-            "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
-            "dev": true,
-            "requires": {
-              "@babel/types": "^7.10.1"
+          "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": {
+      "version": "0.9.9",
+      "resolved": "https://registry.npmjs.org/temp-fs/-/temp-fs-0.9.9.tgz",
+      "integrity": "sha1-gHFzBDeHByDpQxUy/igUNk+IA9c=",
+      "dev": true,
+      "requires": {
+        "rimraf": "~2.5.2"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.5.4",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
+          "integrity": "sha1-loAAk8vxoMhr2VtGJUZ1NcKd+gQ=",
+          "dev": true,
+          "requires": {
+            "glob": "^7.0.5"
+          }
+        }
+      }
+    },
+    "term-size": {
+      "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.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
+        }
+      }
+    },
+    "terser-webpack-plugin": {
+      "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": "^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.4.3",
+        "webpack-sources": "^1.4.3"
+      },
+      "dependencies": {
+        "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": {
+            "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"
+          }
+        },
+        "minipass": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
+          "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.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-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"
+          }
+        }
+      }
+    },
+    "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",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "thenify": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "dev": true,
+      "requires": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
+      "dev": true,
+      "requires": {
+        "thenify": ">= 3.1.0 < 4"
+      }
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "through2-filter": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
+      "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
+      "dev": true,
+      "requires": {
+        "through2": "~2.0.0",
+        "xtend": "~4.0.0"
+      }
+    },
+    "thunky": {
+      "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": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
+      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
+      "dev": true
+    },
+    "timers-browserify": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
+      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
+      "dev": true,
+      "requires": {
+        "setimmediate": "^1.0.4"
+      }
+    },
+    "timers-ext": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
+      "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
+      "dev": true,
+      "requires": {
+        "es5-ext": "~0.10.46",
+        "next-tick": "1"
+      }
+    },
+    "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",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
+    "to-absolute-glob": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
+      "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
+      "dev": true,
+      "requires": {
+        "is-absolute": "^1.0.0",
+        "is-negated-glob": "^1.0.0"
+      }
+    },
+    "to-array": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
+      "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=",
+      "dev": true
+    },
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
+    },
+    "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
+    },
+    "to-object-path": {
+      "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"
+      },
+      "dependencies": {
+        "kind-of": {
+          "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"
+          }
+        }
+      }
+    },
+    "to-readable-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
+      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
+      "dev": true
+    },
+    "to-regex": {
+      "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",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.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": {
+        "is-number": "^7.0.0"
+      }
+    },
+    "to-through": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
+      "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
+      "dev": true,
+      "requires": {
+        "through2": "^2.0.3"
+      }
+    },
+    "toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "dev": true
+    },
+    "tough-cookie": {
+      "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.28",
+        "punycode": "^2.1.1"
+      }
+    },
+    "transformation-matrix": {
+      "version": "1.15.3",
+      "resolved": "https://registry.npmjs.org/transformation-matrix/-/transformation-matrix-1.15.3.tgz",
+      "integrity": "sha512-ThJH58GNFKhCw3gIoOtwf3tNwuYjbyEeiGdeq4mNMYWdJctnI896KUqn6PVt7jmNVepqa1bcKQtnMB1HtjsDMA=="
+    },
+    "tree-kill": {
+      "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.7",
+      "resolved": "https://registry.npmjs.org/ts-md5/-/ts-md5-1.2.7.tgz",
+      "integrity": "sha512-emODogvKGWi1KO1l9c6YxLMBn6CEH3VrH5mVPIyOtxBG52BvV4jP3GWz6bOZCz61nLgBc3ffQYE4+EHfCD+V7w=="
+    },
+    "ts-node": {
+      "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.1.1"
+      }
+    },
+    "tslib": {
+      "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.2",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.2.tgz",
+      "integrity": "sha512-UyNrLdK3E0fQG/xWNqAFAC5ugtFyPO4JJR1KyyfQAyzR8W0fTRrC91A8Wej4BntFzcvETdCSDa/4PnNYJQLYiA==",
+      "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.3",
+        "resolve": "^1.3.2",
+        "semver": "^5.3.0",
+        "tslib": "^1.10.0",
+        "tsutils": "^2.29.0"
+      },
+      "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
+        },
+        "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"
+          }
+        }
+      }
+    },
+    "tsutils": {
+      "version": "2.29.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
+      "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.8.1"
+      }
+    },
+    "tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true
+    },
+    "type": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+      "dev": true
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2"
+      }
+    },
+    "type-fest": {
+      "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": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dev": true,
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      }
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "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.8.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz",
+      "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.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",
+      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
+      "dev": true
+    },
+    "unc-path-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+      "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
+      "dev": true
+    },
+    "underscore": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
+      "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=",
+      "dev": true
+    },
+    "undertaker": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.1.tgz",
+      "integrity": "sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "^1.0.1",
+        "arr-map": "^2.0.0",
+        "bach": "^1.0.0",
+        "collection-map": "^1.0.0",
+        "es6-weak-map": "^2.0.1",
+        "last-run": "^1.1.0",
+        "object.defaults": "^1.0.0",
+        "object.reduce": "^1.0.0",
+        "undertaker-registry": "^1.0.0"
+      }
+    },
+    "undertaker-registry": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
+      "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
+      "dev": true
+    },
+    "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==",
+      "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.4"
+      }
+    },
+    "unicode-match-property-value-ecmascript": {
+      "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.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": {
+      "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",
+        "is-extendable": "^0.1.1",
+        "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",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "dev": true,
+      "requires": {
+        "unique-slug": "^2.0.0"
+      }
+    },
+    "unique-slug": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+      "dev": true,
+      "requires": {
+        "imurmurhash": "^0.1.4"
+      }
+    },
+    "unique-stream": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
+      "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
+      "dev": true,
+      "requires": {
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "through2-filter": "^3.0.0"
+      }
+    },
+    "unique-string": {
+      "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": "^2.0.0"
+      }
+    },
+    "universal-analytics": {
+      "version": "0.4.20",
+      "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.20.tgz",
+      "integrity": "sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.0.0",
+        "request": "^2.88.0",
+        "uuid": "^3.0.0"
+      },
+      "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"
+          }
+        },
+        "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
+        }
+      }
+    },
+    "universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "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",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "dev": true,
+      "requires": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "has-value": {
+          "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",
+            "isobject": "^2.0.0"
           },
-          "@babel/helper-split-export-declaration": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
-            "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
-            "dev": true,
-            "requires": {
-              "@babel/types": "^7.10.1"
+          "dependencies": {
+            "isobject": {
+              "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"
+              }
             }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "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==",
+      "dev": true
+    },
+    "update-notifier": {
+      "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": "^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.3.1",
+        "is-npm": "^4.0.0",
+        "is-yarn-global": "^0.3.0",
+        "latest-version": "^5.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==",
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "dev": true
+    },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+          "dev": true
+        }
+      }
+    },
+    "url-parse": {
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
+      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+      "dev": true,
+      "requires": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "url-parse-lax": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
+      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
+      "dev": true,
+      "requires": {
+        "prepend-http": "^2.0.0"
+      },
+      "dependencies": {
+        "prepend-http": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+          "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
+          "dev": true
+        }
+      }
+    },
+    "urlgrey": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/urlgrey/-/urlgrey-0.4.4.tgz",
+      "integrity": "sha1-iS/pWWCAXoVRnxzUOJ8stMu3ZS8=",
+      "dev": true
+    },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true
+    },
+    "user-home": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz",
+      "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=",
+      "dev": true,
+      "requires": {
+        "os-homedir": "^1.0.0"
+      }
+    },
+    "util": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        }
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "util-promisify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/util-promisify/-/util-promisify-2.1.0.tgz",
+      "integrity": "sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=",
+      "dev": true,
+      "requires": {
+        "object.getownpropertydescriptors": "^2.0.3"
+      }
+    },
+    "util.promisify": {
+      "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.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.2.0",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+          "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+          "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+          "dev": true,
+          "requires": {
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "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": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+      "dev": true
+    },
+    "uuid": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
+      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==",
+      "dev": true
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "requires": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "validate-npm-package-name": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
+      "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
+      "dev": true,
+      "requires": {
+        "builtins": "^1.0.3"
+      }
+    },
+    "value-or-function": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
+      "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=",
+      "dev": true
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "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",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "vinyl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
+      "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
+      "dev": true,
+      "requires": {
+        "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": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
+      "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
+      "dev": true,
+      "requires": {
+        "fs-mkdirp-stream": "^1.0.0",
+        "glob-stream": "^6.1.0",
+        "graceful-fs": "^4.0.0",
+        "is-valid-glob": "^1.0.0",
+        "lazystream": "^1.0.0",
+        "lead": "^1.0.0",
+        "object.assign": "^4.0.4",
+        "pumpify": "^1.3.5",
+        "readable-stream": "^2.3.3",
+        "remove-bom-buffer": "^3.0.0",
+        "remove-bom-stream": "^1.2.0",
+        "resolve-options": "^1.1.0",
+        "through2": "^2.0.0",
+        "to-through": "^2.0.0",
+        "value-or-function": "^3.0.0",
+        "vinyl": "^2.0.0",
+        "vinyl-sourcemap": "^1.1.0"
+      },
+      "dependencies": {
+        "is-valid-glob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
+          "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
+          "dev": true
+        }
+      }
+    },
+    "vinyl-sourcemap": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
+      "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
+      "dev": true,
+      "requires": {
+        "append-buffer": "^1.0.2",
+        "convert-source-map": "^1.5.0",
+        "graceful-fs": "^4.1.6",
+        "normalize-path": "^2.1.1",
+        "now-and-later": "^2.0.0",
+        "remove-bom-buffer": "^3.0.0",
+        "vinyl": "^2.0.0"
+      },
+      "dependencies": {
+        "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"
+          }
+        }
+      }
+    },
+    "vm-browserify": {
+      "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": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
+      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
+      "dev": true
+    },
+    "watchpack": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz",
+      "integrity": "sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==",
+      "dev": true,
+      "requires": {
+        "chokidar": "^3.4.0",
+        "graceful-fs": "^4.1.2",
+        "neo-async": "^2.5.0",
+        "watchpack-chokidar2": "^2.0.0"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+          "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "normalize-path": "^3.0.0",
+            "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,
+          "optional": 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,
+          "optional": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "chokidar": {
+          "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,
+          "optional": 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.4.0"
+          }
+        },
+        "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,
+          "optional": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "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,
+          "optional": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        },
+        "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,
+          "optional": true,
+          "requires": {
+            "binary-extensions": "^2.0.0"
+          }
+        },
+        "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,
+          "optional": true
+        },
+        "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,
+          "optional": true
+        },
+        "readdirp": {
+          "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,
+          "optional": true,
+          "requires": {
+            "picomatch": "^2.2.1"
+          }
+        },
+        "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,
+          "optional": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
+      }
+    },
+    "watchpack-chokidar2": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
+      "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chokidar": "^2.1.8"
+      },
+      "dependencies": {
+        "chokidar": {
+          "version": "2.1.8",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+          "dev": true,
+          "optional": 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"
           },
-          "@babel/helper-validator-identifier": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-            "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-            "dev": true
-          },
-          "@babel/highlight": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
-            "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-validator-identifier": "^7.10.1",
-              "chalk": "^2.0.0",
-              "js-tokens": "^4.0.0"
+          "dependencies": {
+            "anymatch": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+              "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "micromatch": "^3.1.4",
+                "normalize-path": "^2.1.1"
+              },
+              "dependencies": {
+                "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,
+                  "optional": true,
+                  "requires": {
+                    "remove-trailing-separator": "^1.0.1"
+                  }
+                }
+              }
+            },
+            "braces": {
+              "version": "2.3.2",
+              "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+              "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "arr-flatten": "^1.1.0",
+                "array-unique": "^0.3.2",
+                "extend-shallow": "^2.0.1",
+                "fill-range": "^4.0.0",
+                "isobject": "^3.0.1",
+                "repeat-element": "^1.1.2",
+                "snapdragon": "^0.8.1",
+                "snapdragon-node": "^2.0.1",
+                "split-string": "^3.0.2",
+                "to-regex": "^3.0.1"
+              }
+            },
+            "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,
+              "optional": true,
+              "requires": {
+                "graceful-fs": "^4.1.11",
+                "micromatch": "^3.1.10",
+                "readable-stream": "^2.0.2"
+              }
+            },
+            "upath": {
+              "version": "1.2.0",
+              "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+              "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+              "dev": true,
+              "optional": true
             }
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          }
+        },
+        "fsevents": {
+          "version": "1.2.13",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+          "dev": true,
+          "optional": true
+        },
+        "is-binary-path": {
+          "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,
+          "optional": true,
+          "requires": {
+            "binary-extensions": "^1.0.0"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        },
+        "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,
+          "optional": true
+        },
+        "to-regex-range": {
+          "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,
+          "optional": true,
+          "requires": {
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
+          }
+        }
+      }
+    },
+    "wbuf": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+      "dev": true,
+      "requires": {
+        "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",
+      "integrity": "sha512-TOMFWtQdxzjWp8qx4DAraTWTsdhxVSiWa6NkPFSaPtZ1diKUxTn4yTix73A1euG1WbSOMMPcY51cnjTIHrGtDA=="
+    },
+    "webcola": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/webcola/-/webcola-3.4.0.tgz",
+      "integrity": "sha512-4BiLXjXw3SJHo3Xd+rF+7fyClT6n7I+AR6TkBqyQ4kTsePSAMDLRCXY1f3B/kXJeP9tYn4G1TblxTO+jAt0gaw==",
+      "requires": {
+        "d3-dispatch": "^1.0.3",
+        "d3-drag": "^1.0.4",
+        "d3-shape": "^1.3.5",
+        "d3-timer": "^1.0.5"
+      }
+    },
+    "webdriver-js-extender": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz",
+      "integrity": "sha512-lcUKrjbBfCK6MNsh7xaY2UAUmZwe+/ib03AjVOpFobX4O7+83BUveSrLfU0Qsyb1DaKJdQRbuU+kM9aZ6QUhiQ==",
+      "dev": true,
+      "requires": {
+        "@types/selenium-webdriver": "^3.0.0",
+        "selenium-webdriver": "^3.0.1"
+      }
+    },
+    "webpack": {
+      "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",
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/wasm-edit": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "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.3",
+        "watchpack": "^1.6.0",
+        "webpack-sources": "^1.4.1"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+          "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
+          "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"
+          }
+        },
+        "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.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": {
+            "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"
           },
-          "@babel/parser": {
-            "version": "7.10.2",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
-            "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
-            "dev": true
-          },
-          "@babel/template": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
-            "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
-            "dev": true,
-            "requires": {
-              "@babel/code-frame": "^7.10.1",
-              "@babel/parser": "^7.10.1",
-              "@babel/types": "^7.10.1"
+          "dependencies": {
+            "worker-farm": {
+              "version": "1.7.0",
+              "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
+              "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
+              "dev": true,
+              "requires": {
+                "errno": "~0.1.7"
+              }
             }
+          }
+        }
+      }
+    },
+    "webpack-dev-middleware": {
+      "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.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.6",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
+          "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
+          "dev": true
+        }
+      }
+    },
+    "webpack-dev-server": {
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz",
+      "integrity": "sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==",
+      "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.3.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.8",
+        "opn": "^5.5.0",
+        "p-retry": "^3.0.1",
+        "portfinder": "^1.0.26",
+        "schema-utils": "^1.0.0",
+        "selfsigned": "^1.10.7",
+        "semver": "^6.3.0",
+        "serve-index": "^1.9.1",
+        "sockjs": "0.3.20",
+        "sockjs-client": "1.4.0",
+        "spdy": "^4.0.2",
+        "strip-ansi": "^3.0.1",
+        "supports-color": "^6.1.0",
+        "url": "^0.11.0",
+        "webpack-dev-middleware": "^3.7.2",
+        "webpack-log": "^2.0.0",
+        "ws": "^6.2.1",
+        "yargs": "^13.3.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==",
+          "dev": true
+        },
+        "anymatch": {
+          "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"
           },
-          "@babel/traverse": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz",
-            "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==",
-            "dev": true,
-            "requires": {
-              "@babel/code-frame": "^7.10.1",
-              "@babel/generator": "^7.10.1",
-              "@babel/helper-function-name": "^7.10.1",
-              "@babel/helper-split-export-declaration": "^7.10.1",
-              "@babel/parser": "^7.10.1",
-              "@babel/types": "^7.10.1",
-              "debug": "^4.1.0",
-              "globals": "^11.1.0",
-              "lodash": "^4.17.13"
+          "dependencies": {
+            "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"
+              }
             }
+          }
+        },
+        "braces": {
+          "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",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          }
+        },
+        "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"
+          }
+        },
+        "cliui": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+          "dev": true,
+          "requires": {
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
           },
-          "@babel/types": {
-            "version": "7.10.2",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-            "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-validator-identifier": "^7.10.1",
-              "lodash": "^4.17.13",
-              "to-fast-properties": "^2.0.0"
+          "dependencies": {
+            "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"
+              }
             }
+          }
+        },
+        "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"
+          }
+        },
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+          "dev": true
+        },
+        "extend-shallow": {
+          "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"
+          }
+        },
+        "fill-range": {
+          "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",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          }
+        },
+        "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": "1.2.13",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+          "dev": true,
+          "optional": 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-binary-path": {
+          "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"
+          }
+        },
+        "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
+        },
+        "is-number": {
+          "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"
+          }
+        },
+        "kind-of": {
+          "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"
+          }
+        },
+        "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"
+          }
+        },
+        "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": "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
+        },
+        "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.1.11",
+            "micromatch": "^3.1.10",
+            "readable-stream": "^2.0.2"
+          }
+        },
+        "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",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "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==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.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"
+          "dependencies": {
+            "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"
+              }
             }
-          },
-          "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": {
-        "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.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==",
-            "dev": true
-          }
-        }
-      },
-      "@babel/parser": {
-        "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.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.1.tgz",
-        "integrity": "sha512-vzZE12ZTdB336POZjmpblWfNNRpMSua45EYnRigE2XsZxcXcIyly2ixnTJasJE4Zq3U7t2d8rRF7XRUuzHxbOw==",
-        "dev": true,
-        "requires": {
-          "@babel/helper-plugin-utils": "^7.10.1",
-          "@babel/helper-remap-async-to-generator": "^7.10.1",
-          "@babel/plugin-syntax-async-generators": "^7.8.0"
-        }
-      },
-      "@babel/plugin-proposal-dynamic-import": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.1.tgz",
-        "integrity": "sha512-Cpc2yUVHTEGPlmiQzXj026kqwjEQAD9I4ZC16uzdbgWgitg/UHKHLffKNCQZ5+y8jpIZPJcKcwsr2HwPh+w3XA==",
-        "dev": true,
-        "requires": {
-          "@babel/helper-plugin-utils": "^7.10.1",
-          "@babel/plugin-syntax-dynamic-import": "^7.8.0"
-        }
-      },
-      "@babel/plugin-proposal-json-strings": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.1.tgz",
-        "integrity": "sha512-m8r5BmV+ZLpWPtMY2mOKN7wre6HIO4gfIiV+eOmsnZABNenrt/kzYBwrh+KOfgumSWpnlGs5F70J8afYMSJMBg==",
-        "dev": true,
-        "requires": {
-          "@babel/helper-plugin-utils": "^7.10.1",
-          "@babel/plugin-syntax-json-strings": "^7.8.0"
-        }
-      },
-      "@babel/plugin-proposal-nullish-coalescing-operator": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz",
-        "integrity": "sha512-56cI/uHYgL2C8HVuHOuvVowihhX0sxb3nnfVRzUeVHTWmRHTZrKuAh/OBIMggGU/S1g/1D2CRCXqP+3u7vX7iA==",
-        "dev": true,
-        "requires": {
-          "@babel/helper-plugin-utils": "^7.10.1",
-          "@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.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.1.tgz",
-        "integrity": "sha512-Z+Qri55KiQkHh7Fc4BW6o+QBuTagbOp9txE+4U1i79u9oWlf2npkiDx+Rf3iK3lbcHBuNy9UOkwuR5wOMH3LIQ==",
-        "dev": true,
-        "requires": {
-          "@babel/helper-plugin-utils": "^7.10.1",
-          "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-          "@babel/plugin-transform-parameters": "^7.10.1"
-        }
-      },
-      "@babel/plugin-proposal-optional-catch-binding": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz",
-        "integrity": "sha512-VqExgeE62YBqI3ogkGoOJp1R6u12DFZjqwJhqtKc2o5m1YTUuUWnos7bZQFBhwkxIFpWYJ7uB75U7VAPPiKETA==",
-        "dev": true,
-        "requires": {
-          "@babel/helper-plugin-utils": "^7.10.1",
-          "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
-        }
-      },
-      "@babel/plugin-proposal-optional-chaining": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.1.tgz",
-        "integrity": "sha512-dqQj475q8+/avvok72CF3AOSV/SGEcH29zT5hhohqqvvZ2+boQoOr7iGldBG5YXTO2qgCgc2B3WvVLUdbeMlGA==",
-        "dev": true,
-        "requires": {
-          "@babel/helper-plugin-utils": "^7.10.1",
-          "@babel/plugin-syntax-optional-chaining": "^7.8.0"
-        }
-      },
-      "@babel/plugin-proposal-unicode-property-regex": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.1.tgz",
-        "integrity": "sha512-JjfngYRvwmPwmnbRZyNiPFI8zxCZb8euzbCG/LxyKdeTb59tVciKo9GK9bi6JYKInk1H11Dq9j/zRqIH4KigfQ==",
-        "dev": true,
-        "requires": {
-          "@babel/helper-create-regexp-features-plugin": "^7.10.1",
-          "@babel/helper-plugin-utils": "^7.10.1"
-        }
-      },
-      "@babel/plugin-syntax-async-generators": {
-        "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.8.0"
-        }
-      },
-      "@babel/plugin-syntax-dynamic-import": {
-        "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.8.0"
-        }
-      },
-      "@babel/plugin-syntax-json-strings": {
-        "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.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.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==",
-        ===
-        === =
+          }
+        },
+        "to-regex-range": {
+          "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"
+          }
+        },
+        "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
+        },
+        "yargs": {
+          "version": "13.3.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+          "dev": true,
+          "requires": {
+            "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.2"
+          }
+        },
+        "yargs-parser": {
+          "version": "13.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
       }
-    }
-  },
-  "@babel/helper-split-export-declaration": {
-    "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.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.10.1",
-    "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz",
-    "integrity": "sha512-C0MzRGteVDn+H32/ZgbAv5r56f2o1fZSA/rj/TYo8JEJNHg+9BdSmKBUND0shxWRztWhjlT2cvHYuynpPsVJwQ==",
-    "dev": true,
-    "requires": {
-      "@babel/helper-function-name": "^7.10.1",
-      "@babel/template": "^7.10.1",
-      "@babel/traverse": "^7.10.1",
-      "@babel/types": "^7.10.1"
-    },
-    "dependencies": {
-      "@babel/code-frame": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-        "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
-        "dev": true,
-        "requires": {
-          "@babel/highlight": "^7.10.1"
-        }
-      },
-      "@babel/generator": {
-        "version": "7.10.2",
-        "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz",
-        "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==",
-        "dev": true,
-        "requires": {
-          "@babel/types": "^7.10.2",
-          "jsesc": "^2.5.1",
-          "lodash": "^4.17.13",
-          "source-map": "^0.5.0"
-        }
-      },
-      "@babel/helper-function-name": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
-        "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
-        "dev": true,
-        "requires": {
-          "@babel/helper-get-function-arity": "^7.10.1",
-          "@babel/template": "^7.10.1",
-          "@babel/types": "^7.10.1"
-        }
-      },
-      "@babel/helper-get-function-arity": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
-        "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
-        "dev": true,
-        "requires": {
-          "@babel/types": "^7.10.1"
-        }
-      },
-      "@babel/helper-split-export-declaration": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
-        "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
-        "dev": true,
-        "requires": {
-          "@babel/types": "^7.10.1"
-        }
-      },
-      "@babel/helper-validator-identifier": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-        "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-        "dev": true
-      },
-      "@babel/highlight": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
-        "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
-        "dev": true,
-        "requires": {
-          "@babel/helper-validator-identifier": "^7.10.1",
-          "chalk": "^2.0.0",
-          "js-tokens": "^4.0.0"
-        }
-      },
-      "@babel/parser": {
-        "version": "7.10.2",
-        "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
-        "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
-        "dev": true
-      },
-      "@babel/template": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
-        "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
-        "dev": true,
-        "requires": {
-          "@babel/code-frame": "^7.10.1",
-          "@babel/parser": "^7.10.1",
-          "@babel/types": "^7.10.1"
-        }
-      },
-      "@babel/traverse": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz",
-        "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==",
-        "dev": true,
-        "requires": {
-          "@babel/code-frame": "^7.10.1",
-          "@babel/generator": "^7.10.1",
-          "@babel/helper-function-name": "^7.10.1",
-          "@babel/helper-split-export-declaration": "^7.10.1",
-          "@babel/parser": "^7.10.1",
-          "@babel/types": "^7.10.1",
-          "debug": "^4.1.0",
-          "globals": "^11.1.0",
-          "lodash": "^4.17.13"
-        }
-      },
-      "@babel/types": {
-        "version": "7.10.2",
-        "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-        "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-        "dev": true,
-        "requires": {
-          "@babel/helper-validator-identifier": "^7.10.1",
-          "lodash": "^4.17.13",
-          "to-fast-properties": "^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"
-        }
-      },
-      "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
+    },
+    "webpack-log": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
+      "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^3.0.0",
+        "uuid": "^3.3.2"
+      }
+    },
+    "webpack-merge": {
+      "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.15"
+      }
+    },
+    "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.0",
+        "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
+        }
+      }
+    },
+    "webpack-subresource-integrity": {
+      "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-sources": "^1.3.0"
+      }
+    },
+    "websocket-driver": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
+      "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
+      "dev": true,
+      "requires": {
+        "websocket-extensions": ">=0.1.1"
+      }
+    },
+    "websocket-extensions": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+      "dev": true
+    },
+    "when": {
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz",
+      "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=",
+      "dev": true
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "which-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+      "dev": true
+    },
+    "widest-line": {
+      "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": "^4.0.0"
+      },
+      "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
+        },
+        "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
+        },
+        "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"
+          }
+        }
+      }
+    },
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true
+    },
+    "wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+      "dev": true
+    },
+    "worker-plugin": {
+      "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"
+      },
+      "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": {
+      "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==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.0",
+        "string-width": "^3.0.0",
+        "strip-ansi": "^5.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==",
+          "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==",
+          "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
+        },
+        "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==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.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==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "write": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
+      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+      "dev": true,
+      "requires": {
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "write-file-atomic": {
+      "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": {
+        "imurmurhash": "^0.1.4",
+        "is-typedarray": "^1.0.0",
+        "signal-exit": "^3.0.2",
+        "typedarray-to-buffer": "^3.1.5"
+      }
+    },
+    "ws": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+      "dev": true,
+      "requires": {
+        "async-limiter": "~1.0.0"
+      }
+    },
+    "xdg-basedir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
+      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
+      "dev": true
+    },
+    "xhr2": {
+      "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",
+      "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",
+        "xmlbuilder": "~11.0.0"
+      }
+    },
+    "xmlbuilder": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+      "dev": true
+    },
+    "xmlhttprequest-ssl": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
+      "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=",
+      "dev": true
+    },
+    "xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true
+    },
+    "xterm": {
+      "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",
+      "resolved": "https://registry.npmjs.org/xterm-addon-fit/-/xterm-addon-fit-0.3.0.tgz",
+      "integrity": "sha512-kvkiqHVrnMXgyCH9Xn0BOBJ7XaWC/4BgpSWQy3SueqximgW630t/QOankgqkvk11iTOCwWdAY9DTyQBXUMN3lw=="
+    },
+    "xxhashjs": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/xxhashjs/-/xxhashjs-0.2.2.tgz",
+      "integrity": "sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==",
+      "dev": true,
+      "requires": {
+        "cuint": "^0.2.2"
       }
-    }
-  },
-  "@babel/helpers": {
-    "version": "7.10.1",
-    "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.1.tgz",
-    "integrity": "sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==",
-    "dev": true,
-    "requires": {
-      "@babel/template": "^7.10.1",
-      "@babel/traverse": "^7.10.1",
-      "@babel/types": "^7.10.1"
-    },
-    "dependencies": {
-      "@babel/code-frame": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-        "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
-        "dev": true,
-        "requires": {
-          "@babel/highlight": "^7.10.1"
-        }
-      },
-      "@babel/generator": {
-        "version": "7.10.2",
-        "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz",
-        "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==",
-        "dev": true,
-        "requires": {
-          "@babel/types": "^7.10.2",
-          "jsesc": "^2.5.1",
-          "lodash": "^4.17.13",
-          "source-map": "^0.5.0"
-        }
-      },
-      "@babel/helper-function-name": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
-        "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
-        "dev": true,
-        "requires": {
-          "@babel/helper-get-function-arity": "^7.10.1",
-          "@babel/template": "^7.10.1",
-          "@babel/types": "^7.10.1"
-        }
-      },
-      "@babel/helper-get-function-arity": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
-        "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
-        "dev": true,
-        "requires": {
-          "@babel/types": "^7.10.1"
-        }
-      },
-      "@babel/helper-split-export-declaration": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
-        "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
-        "dev": true,
-        "requires": {
-          "@babel/types": "^7.10.1"
-        }
-      },
-      "@babel/helper-validator-identifier": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-        "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-        "dev": true
-      },
-      "@babel/highlight": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
-        "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
-        "dev": true,
-        "requires": {
-          "@babel/helper-validator-identifier": "^7.10.1",
-          "chalk": "^2.0.0",
-          "js-tokens": "^4.0.0"
-        }
-      },
-      "@babel/parser": {
-        "version": "7.10.2",
-        "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
-        "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
-        "dev": true
-      },
-      "@babel/template": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
-        "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
-        "dev": true,
-        "requires": {
-          "@babel/code-frame": "^7.10.1",
-          "@babel/parser": "^7.10.1",
-          "@babel/types": "^7.10.1"
-        }
-      },
-      "@babel/traverse": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz",
-        "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==",
-        "dev": true,
-        "requires": {
-          "@babel/code-frame": "^7.10.1",
-          "@babel/generator": "^7.10.1",
-          "@babel/helper-function-name": "^7.10.1",
-          "@babel/helper-split-export-declaration": "^7.10.1",
-          "@babel/parser": "^7.10.1",
-          "@babel/types": "^7.10.1",
-          "debug": "^4.1.0",
-          "globals": "^11.1.0",
-          "lodash": "^4.17.13"
-        }
-      },
-      "@babel/types": {
-        "version": "7.10.2",
-        "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-        "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-        "dev": true,
-        "requires": {
-          "@babel/helper-validator-identifier": "^7.10.1",
-          "lodash": "^4.17.13",
-          "to-fast-properties": "^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"
-        }
-      },
-      "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
+    },
+    "y18n": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "dev": true
+    },
+    "yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "yargs": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
+      "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
+      "dev": true,
+      "requires": {
+        "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": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true
+        },
+        "get-caller-file": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+          "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+          "dev": true
+        },
+        "require-main-filename": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+          "dev": true
+        },
+        "y18n": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+          "dev": true
+        }
       }
-    }
-  },
-  "@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.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==",
-        "dev": true
+    },
+    "yargs-parser": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
+      "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+      "dev": true,
+      "requires": {
+        "camelcase": "^3.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true
+        }
       }
-    }
-  },
-  "@babel/parser": {
-    "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.10.1",
-    "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.1.tgz",
-    "integrity": "sha512-vzZE12ZTdB336POZjmpblWfNNRpMSua45EYnRigE2XsZxcXcIyly2ixnTJasJE4Zq3U7t2d8rRF7XRUuzHxbOw==",
-    "dev": true,
-    "requires": {
-      "@babel/helper-plugin-utils": "^7.10.1",
-      "@babel/helper-remap-async-to-generator": "^7.10.1",
-      "@babel/plugin-syntax-async-generators": "^7.8.0"
-    }
-  },
-  "@babel/plugin-proposal-dynamic-import": {
-    "version": "7.10.1",
-    "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.1.tgz",
-    "integrity": "sha512-Cpc2yUVHTEGPlmiQzXj026kqwjEQAD9I4ZC16uzdbgWgitg/UHKHLffKNCQZ5+y8jpIZPJcKcwsr2HwPh+w3XA==",
-    "dev": true,
-    "requires": {
-      "@babel/helper-plugin-utils": "^7.10.1",
-      "@babel/plugin-syntax-dynamic-import": "^7.8.0"
-    }
-  },
-  "@babel/plugin-proposal-json-strings": {
-    "version": "7.10.1",
-    "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.1.tgz",
-    "integrity": "sha512-m8r5BmV+ZLpWPtMY2mOKN7wre6HIO4gfIiV+eOmsnZABNenrt/kzYBwrh+KOfgumSWpnlGs5F70J8afYMSJMBg==",
-    "dev": true,
-    "requires": {
-      "@babel/helper-plugin-utils": "^7.10.1",
-      "@babel/plugin-syntax-json-strings": "^7.8.0"
-    }
-  },
-  "@babel/plugin-proposal-nullish-coalescing-operator": {
-    "version": "7.10.1",
-    "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz",
-    "integrity": "sha512-56cI/uHYgL2C8HVuHOuvVowihhX0sxb3nnfVRzUeVHTWmRHTZrKuAh/OBIMggGU/S1g/1D2CRCXqP+3u7vX7iA==",
-    "dev": true,
-    "requires": {
-      "@babel/helper-plugin-utils": "^7.10.1",
-      "@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.10.1",
-    "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.1.tgz",
-    "integrity": "sha512-Z+Qri55KiQkHh7Fc4BW6o+QBuTagbOp9txE+4U1i79u9oWlf2npkiDx+Rf3iK3lbcHBuNy9UOkwuR5wOMH3LIQ==",
-    "dev": true,
-    "requires": {
-      "@babel/helper-plugin-utils": "^7.10.1",
-      "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-      "@babel/plugin-transform-parameters": "^7.10.1"
-    }
-  },
-  "@babel/plugin-proposal-optional-catch-binding": {
-    "version": "7.10.1",
-    "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz",
-    "integrity": "sha512-VqExgeE62YBqI3ogkGoOJp1R6u12DFZjqwJhqtKc2o5m1YTUuUWnos7bZQFBhwkxIFpWYJ7uB75U7VAPPiKETA==",
-    "dev": true,
-    "requires": {
-      "@babel/helper-plugin-utils": "^7.10.1",
-      "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
-    }
-  },
-  "@babel/plugin-proposal-optional-chaining": {
-    "version": "7.10.1",
-    "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.1.tgz",
-    "integrity": "sha512-dqQj475q8+/avvok72CF3AOSV/SGEcH29zT5hhohqqvvZ2+boQoOr7iGldBG5YXTO2qgCgc2B3WvVLUdbeMlGA==",
-    "dev": true,
-    "requires": {
-      "@babel/helper-plugin-utils": "^7.10.1",
-      "@babel/plugin-syntax-optional-chaining": "^7.8.0"
-    }
-  },
-  "@babel/plugin-proposal-unicode-property-regex": {
-    "version": "7.10.1",
-    "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.1.tgz",
-    "integrity": "sha512-JjfngYRvwmPwmnbRZyNiPFI8zxCZb8euzbCG/LxyKdeTb59tVciKo9GK9bi6JYKInk1H11Dq9j/zRqIH4KigfQ==",
-    "dev": true,
-    "requires": {
-      "@babel/helper-create-regexp-features-plugin": "^7.10.1",
-      "@babel/helper-plugin-utils": "^7.10.1"
-    }
-  },
-  "@babel/plugin-syntax-async-generators": {
-    "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==",
-    >>>
-    >>> > upstream / master "dev": true,
-    "requires": {
-      "@babel/helper-plugin-utils": "^7.8.0"
-    }
-  },
-  <<
-  << << < HEAD "@babel/plugin-syntax-optional-catch-binding": {
-    "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==",
-    ===
-    === =
-    "@babel/plugin-syntax-dynamic-import": {
-      "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==",
-      >>>
-      >>> > upstream / master "dev": true,
+    },
+    "yazl": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
+      "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "buffer-crc32": "~0.2.3"
       }
     },
-    <<
-    << << < HEAD "@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==",
-      ===
-      === =
-      "@babel/plugin-syntax-json-strings": {
-        "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==",
-        >>>
-        >>> > upstream / master "dev": true,
-        "requires": {
-          "@babel/helper-plugin-utils": "^7.8.0"
-        }
-      },
-      <<
-      << << < HEAD "@babel/plugin-syntax-top-level-await": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.1.tgz",
-        "integrity": "sha512-hgA5RYkmZm8FTFT3yu2N9Bx7yVVOKYT6yEdXXo6j2JTm0wNxgqaGeQVaSHRjhfnQbX91DtjFB6McRFSlcJH3xQ==",
-        "dev": true,
-        "requires": {
-          "@babel/helper-plugin-utils": "^7.10.1"
-        }
-      },
-      "@babel/plugin-transform-arrow-functions": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz",
-        "integrity": "sha512-6AZHgFJKP3DJX0eCNJj01RpytUa3SOGawIxweHkNX2L6PYikOZmoh5B0d7hIHaIgveMjX990IAa/xK7jRTN8OA==",
-        "dev": true,
-        "requires": {
-          "@babel/helper-plugin-utils": "^7.10.1"
-        }
-      },
-      "@babel/plugin-transform-async-to-generator": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.1.tgz",
-        "integrity": "sha512-XCgYjJ8TY2slj6SReBUyamJn3k2JLUIiiR5b6t1mNCMSvv7yx+jJpaewakikp0uWFQSF7ChPPoe3dHmXLpISkg==",
-        "dev": true,
-        "requires": {
-          "@babel/helper-module-imports": "^7.10.1",
-          "@babel/helper-plugin-utils": "^7.10.1",
-          "@babel/helper-remap-async-to-generator": "^7.10.1"
-        }
-      },
-      "@babel/plugin-transform-block-scoped-functions": {
-        "version": "7.10.1",
-        "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.1.tgz",
-        "integrity": "sha512-B7K15Xp8lv0sOJrdVAoukKlxP9N59HS48V1J3U/JGj+Ad+MHq+am6xJVs85AgXrQn4LV8vaYFOB+pr/yIuzW8Q==",
-        "dev": true,
-        "requires": {
-          ===
-          === =
-          "@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.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.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.8.0"
-            }
-          },
-          "@babel/plugin-syntax-optional-catch-binding": {
-            "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.8.0"
-            }
-          },
-          "@babel/plugin-syntax-top-level-await": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.1.tgz",
-            "integrity": "sha512-hgA5RYkmZm8FTFT3yu2N9Bx7yVVOKYT6yEdXXo6j2JTm0wNxgqaGeQVaSHRjhfnQbX91DtjFB6McRFSlcJH3xQ==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-plugin-utils": "^7.10.1"
-            }
-          },
-          "@babel/plugin-transform-arrow-functions": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz",
-            "integrity": "sha512-6AZHgFJKP3DJX0eCNJj01RpytUa3SOGawIxweHkNX2L6PYikOZmoh5B0d7hIHaIgveMjX990IAa/xK7jRTN8OA==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-plugin-utils": "^7.10.1"
-            }
-          },
-          "@babel/plugin-transform-async-to-generator": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.1.tgz",
-            "integrity": "sha512-XCgYjJ8TY2slj6SReBUyamJn3k2JLUIiiR5b6t1mNCMSvv7yx+jJpaewakikp0uWFQSF7ChPPoe3dHmXLpISkg==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-module-imports": "^7.10.1",
-              "@babel/helper-plugin-utils": "^7.10.1",
-              "@babel/helper-remap-async-to-generator": "^7.10.1"
-            }
-          },
-          "@babel/plugin-transform-block-scoped-functions": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.1.tgz",
-            "integrity": "sha512-B7K15Xp8lv0sOJrdVAoukKlxP9N59HS48V1J3U/JGj+Ad+MHq+am6xJVs85AgXrQn4LV8vaYFOB+pr/yIuzW8Q==",
-            "dev": true,
-            "requires": {
-              >>>
-              >>> > upstream / master "@babel/helper-plugin-utils": "^7.10.1"
-            }
-          },
-          "@babel/plugin-transform-block-scoping": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.1.tgz",
-            "integrity": "sha512-8bpWG6TtF5akdhIm/uWTyjHqENpy13Fx8chg7pFH875aNLwX8JxIxqm08gmAT+Whe6AOmaTeLPe7dpLbXt+xUw==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-plugin-utils": "^7.10.1",
-              "lodash": "^4.17.13"
-            }
-          },
-          "@babel/plugin-transform-classes": {
-            "version": "7.10.1",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.1.tgz",
-            "integrity": "sha512-P9V0YIh+ln/B3RStPoXpEQ/CoAxQIhRSUn7aXqQ+FZJ2u8+oCtjIXR3+X0vsSD8zv+mb56K7wZW1XiDTDGiDRQ==",
-            "dev": true,
-            "requires": {
-              "@babel/helper-annotate-as-pure": "^7.10.1",
-              "@babel/helper-define-map": "^7.10.1",
-              "@babel/helper-function-name": "^7.10.1",
-              "@babel/helper-optimise-call-expression": "^7.10.1",
-              "@babel/helper-plugin-utils": "^7.10.1",
-              "@babel/helper-replace-supers": "^7.10.1",
-              "@babel/helper-split-export-declaration": "^7.10.1",
-              "globals": "^11.1.0"
-            },
-            "dependencies": {
-              "@babel/code-frame": {
-                "version": "7.10.1",
-                "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-                "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
-                <<
-                << << < HEAD "dev": true,
-                "requires": {
-                  "@babel/highlight": "^7.10.1"
-                }
-              },
-              "@babel/helper-function-name": {
-                "version": "7.10.1",
-                "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
-                "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
-                "dev": true,
-                "requires": {
-                  "@babel/helper-get-function-arity": "^7.10.1",
-                  "@babel/template": "^7.10.1",
-                  "@babel/types": "^7.10.1"
-                }
-              },
-              "@babel/helper-get-function-arity": {
-                "version": "7.10.1",
-                "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
-                "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
-                "dev": true,
-                "requires": {
-                  "@babel/types": "^7.10.1"
-                }
-              },
-              "@babel/helper-split-export-declaration": {
-                "version": "7.10.1",
-                "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
-                "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
-                "dev": true,
-                "requires": {
-                  "@babel/types": "^7.10.1"
-                }
-              },
-              "@babel/helper-validator-identifier": {
-                "version": "7.10.1",
-                "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-                "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-                "dev": true
-              },
-              "@babel/highlight": {
-                "version": "7.10.1",
-                "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
-                "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
-                "dev": true,
-                "requires": {
-                  "@babel/helper-validator-identifier": "^7.10.1",
-                  "chalk": "^2.0.0",
-                  "js-tokens": "^4.0.0"
-                }
-              },
-              "@babel/parser": {
-                "version": "7.10.2",
-                "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
-                "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
-                "dev": true
-              },
-              "@babel/template": {
-                "version": "7.10.1",
-                "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
-                "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
-                "dev": true,
-                "requires": {
-                  "@babel/code-frame": "^7.10.1",
-                  "@babel/parser": "^7.10.1",
-                  "@babel/types": "^7.10.1"
-                }
-              },
-              "@babel/types": {
-                "version": "7.10.2",
-                "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-                "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-                "dev": true,
-                "requires": {
-                  ===
-                  === =
-                  "dev": true,
-                  "requires": {
-                    "@babel/highlight": "^7.10.1"
-                  }
-                },
-                "@babel/helper-function-name": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
-                  "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-get-function-arity": "^7.10.1",
-                    "@babel/template": "^7.10.1",
-                    "@babel/types": "^7.10.1"
-                  }
-                },
-                "@babel/helper-get-function-arity": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
-                  "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/types": "^7.10.1"
-                  }
-                },
-                "@babel/helper-split-export-declaration": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
-                  "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/types": "^7.10.1"
-                  }
-                },
-                "@babel/helper-validator-identifier": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-                  "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-                  "dev": true
-                },
-                "@babel/highlight": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
-                  "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-validator-identifier": "^7.10.1",
-                    "chalk": "^2.0.0",
-                    "js-tokens": "^4.0.0"
-                  }
-                },
-                "@babel/parser": {
-                  "version": "7.10.2",
-                  "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
-                  "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
-                  "dev": true
-                },
-                "@babel/template": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
-                  "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/code-frame": "^7.10.1",
-                    "@babel/parser": "^7.10.1",
-                    "@babel/types": "^7.10.1"
-                  }
-                },
-                "@babel/types": {
-                  "version": "7.10.2",
-                  "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-                  "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-validator-identifier": "^7.10.1",
-                    "lodash": "^4.17.13",
-                    "to-fast-properties": "^2.0.0"
-                  }
-                }
-              }
-            },
-            "@babel/plugin-transform-computed-properties": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.1.tgz",
-              "integrity": "sha512-mqSrGjp3IefMsXIenBfGcPXxJxweQe2hEIwMQvjtiDQ9b1IBvDUjkAtV/HMXX47/vXf14qDNedXsIiNd1FmkaQ==",
-              "dev": true,
-              "requires": {
-                "@babel/helper-plugin-utils": "^7.10.1"
-              }
-            },
-            "@babel/plugin-transform-destructuring": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz",
-              "integrity": "sha512-V/nUc4yGWG71OhaTH705pU8ZSdM6c1KmmLP8ys59oOYbT7RpMYAR3MsVOt6OHL0WzG7BlTU076va9fjJyYzJMA==",
-              "dev": true,
-              "requires": {
-                "@babel/helper-plugin-utils": "^7.10.1"
-              }
-            },
-            "@babel/plugin-transform-dotall-regex": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.1.tgz",
-              "integrity": "sha512-19VIMsD1dp02RvduFUmfzj8uknaO3uiHHF0s3E1OHnVsNj8oge8EQ5RzHRbJjGSetRnkEuBYO7TG1M5kKjGLOA==",
-              "dev": true,
-              "requires": {
-                "@babel/helper-create-regexp-features-plugin": "^7.10.1",
-                "@babel/helper-plugin-utils": "^7.10.1"
-              }
-            },
-            "@babel/plugin-transform-duplicate-keys": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.1.tgz",
-              "integrity": "sha512-wIEpkX4QvX8Mo9W6XF3EdGttrIPZWozHfEaDTU0WJD/TDnXMvdDh30mzUl/9qWhnf7naicYartcEfUghTCSNpA==",
-              "dev": true,
-              "requires": {
-                "@babel/helper-plugin-utils": "^7.10.1"
-              }
-            },
-            "@babel/plugin-transform-exponentiation-operator": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz",
-              "integrity": "sha512-lr/przdAbpEA2BUzRvjXdEDLrArGRRPwbaF9rvayuHRvdQ7lUTTkZnhZrJ4LE2jvgMRFF4f0YuPQ20vhiPYxtA==",
-              "dev": true,
-              "requires": {
-                "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.1",
-                "@babel/helper-plugin-utils": "^7.10.1"
-              }
-            },
-            "@babel/plugin-transform-for-of": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz",
-              "integrity": "sha512-US8KCuxfQcn0LwSCMWMma8M2R5mAjJGsmoCBVwlMygvmDUMkTCykc84IqN1M7t+agSfOmLYTInLCHJM+RUoz+w==",
-              "dev": true,
-              "requires": {
-                "@babel/helper-plugin-utils": "^7.10.1"
-              }
-            },
-            "@babel/plugin-transform-function-name": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz",
-              "integrity": "sha512-//bsKsKFBJfGd65qSNNh1exBy5Y9gD9ZN+DvrJ8f7HXr4avE5POW6zB7Rj6VnqHV33+0vXWUwJT0wSHubiAQkw==",
-              "dev": true,
-              "requires": {
-                "@babel/helper-function-name": "^7.10.1",
-                "@babel/helper-plugin-utils": "^7.10.1"
-              },
-              "dependencies": {
-                "@babel/code-frame": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-                  "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/highlight": "^7.10.1"
-                  }
-                },
-                "@babel/helper-function-name": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
-                  "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-get-function-arity": "^7.10.1",
-                    "@babel/template": "^7.10.1",
-                    "@babel/types": "^7.10.1"
-                  }
-                },
-                "@babel/helper-get-function-arity": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
-                  "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/types": "^7.10.1"
-                  }
-                },
-                "@babel/helper-validator-identifier": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-                  "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-                  "dev": true
-                },
-                "@babel/highlight": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
-                  "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-validator-identifier": "^7.10.1",
-                    "chalk": "^2.0.0",
-                    "js-tokens": "^4.0.0"
-                  }
-                },
-                "@babel/parser": {
-                  "version": "7.10.2",
-                  "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
-                  "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
-                  "dev": true
-                },
-                "@babel/template": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
-                  "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/code-frame": "^7.10.1",
-                    "@babel/parser": "^7.10.1",
-                    "@babel/types": "^7.10.1"
-                  }
-                },
-                "@babel/types": {
-                  "version": "7.10.2",
-                  "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-                  "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-                  "dev": true,
-                  "requires": {
-                    >>>
-                    >>> > upstream / master "@babel/helper-validator-identifier": "^7.10.1",
-                    "lodash": "^4.17.13",
-                    "to-fast-properties": "^2.0.0"
-                  }
-                }
-              }
-            },
-            <<
-            << << < HEAD "@babel/plugin-transform-computed-properties": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.1.tgz",
-              "integrity": "sha512-mqSrGjp3IefMsXIenBfGcPXxJxweQe2hEIwMQvjtiDQ9b1IBvDUjkAtV/HMXX47/vXf14qDNedXsIiNd1FmkaQ==",
-              "dev": true,
-              "requires": {
-                "@babel/helper-plugin-utils": "^7.10.1"
-              }
-            },
-            "@babel/plugin-transform-destructuring": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz",
-              "integrity": "sha512-V/nUc4yGWG71OhaTH705pU8ZSdM6c1KmmLP8ys59oOYbT7RpMYAR3MsVOt6OHL0WzG7BlTU076va9fjJyYzJMA==",
-              "dev": true,
-              "requires": {
-                "@babel/helper-plugin-utils": "^7.10.1"
-              }
-            },
-            "@babel/plugin-transform-dotall-regex": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.1.tgz",
-              "integrity": "sha512-19VIMsD1dp02RvduFUmfzj8uknaO3uiHHF0s3E1OHnVsNj8oge8EQ5RzHRbJjGSetRnkEuBYO7TG1M5kKjGLOA==",
-              "dev": true,
-              "requires": {
-                "@babel/helper-create-regexp-features-plugin": "^7.10.1",
-                "@babel/helper-plugin-utils": "^7.10.1"
-              }
-            },
-            "@babel/plugin-transform-duplicate-keys": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.1.tgz",
-              "integrity": "sha512-wIEpkX4QvX8Mo9W6XF3EdGttrIPZWozHfEaDTU0WJD/TDnXMvdDh30mzUl/9qWhnf7naicYartcEfUghTCSNpA==",
-              "dev": true,
-              "requires": {
-                "@babel/helper-plugin-utils": "^7.10.1"
-              }
-            },
-            "@babel/plugin-transform-exponentiation-operator": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz",
-              "integrity": "sha512-lr/przdAbpEA2BUzRvjXdEDLrArGRRPwbaF9rvayuHRvdQ7lUTTkZnhZrJ4LE2jvgMRFF4f0YuPQ20vhiPYxtA==",
-              "dev": true,
-              "requires": {
-                "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.1",
-                "@babel/helper-plugin-utils": "^7.10.1"
-              }
-            },
-            "@babel/plugin-transform-for-of": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz",
-              "integrity": "sha512-US8KCuxfQcn0LwSCMWMma8M2R5mAjJGsmoCBVwlMygvmDUMkTCykc84IqN1M7t+agSfOmLYTInLCHJM+RUoz+w==",
-              "dev": true,
-              "requires": {
-                "@babel/helper-plugin-utils": "^7.10.1"
-              }
-            },
-            "@babel/plugin-transform-function-name": {
-              "version": "7.10.1",
-              "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz",
-              "integrity": "sha512-//bsKsKFBJfGd65qSNNh1exBy5Y9gD9ZN+DvrJ8f7HXr4avE5POW6zB7Rj6VnqHV33+0vXWUwJT0wSHubiAQkw==",
-              "dev": true,
-              "requires": {
-                "@babel/helper-function-name": "^7.10.1",
-                "@babel/helper-plugin-utils": "^7.10.1"
-              },
-              "dependencies": {
-                "@babel/code-frame": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-                  "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/highlight": "^7.10.1"
-                  }
-                },
-                "@babel/helper-function-name": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
-                  "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-get-function-arity": "^7.10.1",
-                    "@babel/template": "^7.10.1",
-                    "@babel/types": "^7.10.1"
-                  }
-                },
-                ===
-                === =
-                "@babel/plugin-transform-literals": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz",
-                  "integrity": "sha512-qi0+5qgevz1NHLZroObRm5A+8JJtibb7vdcPQF1KQE12+Y/xxl8coJ+TpPW9iRq+Mhw/NKLjm+5SHtAHCC7lAw==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-plugin-utils": "^7.10.1"
-                  }
-                },
-                "@babel/plugin-transform-member-expression-literals": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.1.tgz",
-                  "integrity": "sha512-UmaWhDokOFT2GcgU6MkHC11i0NQcL63iqeufXWfRy6pUOGYeCGEKhvfFO6Vz70UfYJYHwveg62GS83Rvpxn+NA==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-plugin-utils": "^7.10.1"
-                  }
-                },
-                "@babel/plugin-transform-modules-amd": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.1.tgz",
-                  "integrity": "sha512-31+hnWSFRI4/ACFr1qkboBbrTxoBIzj7qA69qlq8HY8p7+YCzkCT6/TvQ1a4B0z27VeWtAeJd6pr5G04dc1iHw==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-module-transforms": "^7.10.1",
-                    "@babel/helper-plugin-utils": "^7.10.1",
-                    "babel-plugin-dynamic-import-node": "^2.3.3"
-                  }
-                },
-                "@babel/plugin-transform-modules-commonjs": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz",
-                  "integrity": "sha512-AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-module-transforms": "^7.10.1",
-                    "@babel/helper-plugin-utils": "^7.10.1",
-                    "@babel/helper-simple-access": "^7.10.1",
-                    "babel-plugin-dynamic-import-node": "^2.3.3"
-                  }
-                },
-                "@babel/plugin-transform-modules-systemjs": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.1.tgz",
-                  "integrity": "sha512-ewNKcj1TQZDL3YnO85qh9zo1YF1CHgmSTlRQgHqe63oTrMI85cthKtZjAiZSsSNjPQ5NCaYo5QkbYqEw1ZBgZA==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-hoist-variables": "^7.10.1",
-                    "@babel/helper-module-transforms": "^7.10.1",
-                    "@babel/helper-plugin-utils": "^7.10.1",
-                    "babel-plugin-dynamic-import-node": "^2.3.3"
-                  }
-                },
-                "@babel/plugin-transform-modules-umd": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.1.tgz",
-                  "integrity": "sha512-EIuiRNMd6GB6ulcYlETnYYfgv4AxqrswghmBRQbWLHZxN4s7mupxzglnHqk9ZiUpDI4eRWewedJJNj67PWOXKA==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-module-transforms": "^7.10.1",
-                    "@babel/helper-plugin-utils": "^7.10.1"
-                  }
-                },
-                "@babel/plugin-transform-named-capturing-groups-regex": {
-                  "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": {
-                    "@babel/helper-create-regexp-features-plugin": "^7.8.3"
-                  }
-                },
-                "@babel/plugin-transform-new-target": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.1.tgz",
-                  "integrity": "sha512-MBlzPc1nJvbmO9rPr1fQwXOM2iGut+JC92ku6PbiJMMK7SnQc1rytgpopveE3Evn47gzvGYeCdgfCDbZo0ecUw==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-plugin-utils": "^7.10.1"
-                  }
-                },
-                "@babel/plugin-transform-object-super": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.1.tgz",
-                  "integrity": "sha512-WnnStUDN5GL+wGQrJylrnnVlFhFmeArINIR9gjhSeYyvroGhBrSAXYg/RHsnfzmsa+onJrTJrEClPzgNmmQ4Gw==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-plugin-utils": "^7.10.1",
-                    "@babel/helper-replace-supers": "^7.10.1"
-                  }
-                },
-                "@babel/plugin-transform-parameters": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz",
-                  "integrity": "sha512-tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-get-function-arity": "^7.10.1",
-                    "@babel/helper-plugin-utils": "^7.10.1"
-                  },
-                  "dependencies": {
-                    >>>
-                    >>> > upstream / master "@babel/helper-get-function-arity": {
-                      "version": "7.10.1",
-                      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
-                      "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
-                      <<
-                      << << < HEAD "dev": true,
-                      "requires": {
-                        "@babel/types": "^7.10.1"
-                      }
-                    },
-                    "@babel/helper-validator-identifier": {
-                      "version": "7.10.1",
-                      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-                      "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-                      "dev": true
-                    },
-                    "@babel/highlight": {
-                      "version": "7.10.1",
-                      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
-                      "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
-                      "dev": true,
-                      "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.1",
-                        "chalk": "^2.0.0",
-                        "js-tokens": "^4.0.0"
-                      }
-                    },
-                    "@babel/parser": {
-                      "version": "7.10.2",
-                      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
-                      "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
-                      "dev": true
-                    },
-                    "@babel/template": {
-                      "version": "7.10.1",
-                      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
-                      "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
-                      "dev": true,
-                      "requires": {
-                        "@babel/code-frame": "^7.10.1",
-                        "@babel/parser": "^7.10.1",
-                        "@babel/types": "^7.10.1"
-                      }
-                    },
-                    ===
-                    === =
-                    "dev": true,
-                    "requires": {
-                      "@babel/types": "^7.10.1"
-                    }
-                  },
-                  "@babel/helper-validator-identifier": {
-                    "version": "7.10.1",
-                    "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-                    "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-                    "dev": true
-                  },
-                  >>>
-                  >>> > upstream / master "@babel/types": {
-                    "version": "7.10.2",
-                    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-                    "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-                    "dev": true,
-                    "requires": {
-                      "@babel/helper-validator-identifier": "^7.10.1",
-                      "lodash": "^4.17.13",
-                      "to-fast-properties": "^2.0.0"
-                    }
-                  }
-                }
-              },
-              <<
-              << << < HEAD "@babel/plugin-transform-literals": {
-                "version": "7.10.1",
-                "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz",
-                "integrity": "sha512-qi0+5qgevz1NHLZroObRm5A+8JJtibb7vdcPQF1KQE12+Y/xxl8coJ+TpPW9iRq+Mhw/NKLjm+5SHtAHCC7lAw==",
-                ===
-                === =
-                "@babel/plugin-transform-property-literals": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.1.tgz",
-                  "integrity": "sha512-Kr6+mgag8auNrgEpbfIWzdXYOvqDHZOF0+Bx2xh4H2EDNwcbRb9lY6nkZg8oSjsX+DH9Ebxm9hOqtKW+gRDeNA==",
-                  >>>
-                  >>> > upstream / master "dev": true,
-                  "requires": {
-                    "@babel/helper-plugin-utils": "^7.10.1"
-                  }
-                },
-                <<
-                << << < HEAD "@babel/plugin-transform-member-expression-literals": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.1.tgz",
-                  "integrity": "sha512-UmaWhDokOFT2GcgU6MkHC11i0NQcL63iqeufXWfRy6pUOGYeCGEKhvfFO6Vz70UfYJYHwveg62GS83Rvpxn+NA==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-plugin-utils": "^7.10.1"
-                  }
-                },
-                "@babel/plugin-transform-modules-amd": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.1.tgz",
-                  "integrity": "sha512-31+hnWSFRI4/ACFr1qkboBbrTxoBIzj7qA69qlq8HY8p7+YCzkCT6/TvQ1a4B0z27VeWtAeJd6pr5G04dc1iHw==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-module-transforms": "^7.10.1",
-                    "@babel/helper-plugin-utils": "^7.10.1",
-                    "babel-plugin-dynamic-import-node": "^2.3.3"
-                  }
-                },
-                "@babel/plugin-transform-modules-commonjs": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz",
-                  "integrity": "sha512-AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-module-transforms": "^7.10.1",
-                    "@babel/helper-plugin-utils": "^7.10.1",
-                    "@babel/helper-simple-access": "^7.10.1",
-                    "babel-plugin-dynamic-import-node": "^2.3.3"
-                  }
-                },
-                "@babel/plugin-transform-modules-systemjs": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.1.tgz",
-                  "integrity": "sha512-ewNKcj1TQZDL3YnO85qh9zo1YF1CHgmSTlRQgHqe63oTrMI85cthKtZjAiZSsSNjPQ5NCaYo5QkbYqEw1ZBgZA==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-hoist-variables": "^7.10.1",
-                    "@babel/helper-module-transforms": "^7.10.1",
-                    "@babel/helper-plugin-utils": "^7.10.1",
-                    "babel-plugin-dynamic-import-node": "^2.3.3"
-                  }
-                },
-                "@babel/plugin-transform-modules-umd": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.1.tgz",
-                  "integrity": "sha512-EIuiRNMd6GB6ulcYlETnYYfgv4AxqrswghmBRQbWLHZxN4s7mupxzglnHqk9ZiUpDI4eRWewedJJNj67PWOXKA==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-module-transforms": "^7.10.1",
-                    "@babel/helper-plugin-utils": "^7.10.1"
-                  }
-                },
-                "@babel/plugin-transform-named-capturing-groups-regex": {
-                  "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": {
-                    "@babel/helper-create-regexp-features-plugin": "^7.8.3"
-                  }
-                },
-                "@babel/plugin-transform-new-target": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.1.tgz",
-                  "integrity": "sha512-MBlzPc1nJvbmO9rPr1fQwXOM2iGut+JC92ku6PbiJMMK7SnQc1rytgpopveE3Evn47gzvGYeCdgfCDbZo0ecUw==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-plugin-utils": "^7.10.1"
-                  }
-                },
-                "@babel/plugin-transform-object-super": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.1.tgz",
-                  "integrity": "sha512-WnnStUDN5GL+wGQrJylrnnVlFhFmeArINIR9gjhSeYyvroGhBrSAXYg/RHsnfzmsa+onJrTJrEClPzgNmmQ4Gw==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-plugin-utils": "^7.10.1",
-                    "@babel/helper-replace-supers": "^7.10.1"
-                  }
-                },
-                "@babel/plugin-transform-parameters": {
-                  "version": "7.10.1",
-                  "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz",
-                  "integrity": "sha512-tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg==",
-                  "dev": true,
-                  "requires": {
-                    "@babel/helper-get-function-arity": "^7.10.1",
-                    "@babel/helper-plugin-utils": "^7.10.1"
-                  },
-                  "dependencies": {
-                    "@babel/helper-get-function-arity": {
-                      "version": "7.10.1",
-                      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
-                      "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
-                      "dev": true,
-                      "requires": {
-                        "@babel/types": "^7.10.1"
-                      }
-                    },
-                    "@babel/helper-validator-identifier": {
-                      "version": "7.10.3",
-                      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.3.tgz",
-                      "integrity": "sha512-bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw==",
-                      "dev": true
-                    },
-                    "@babel/types": {
-                      "version": "7.10.2",
-                      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-                      "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-                      "dev": true,
-                      "requires": {
-                        "@babel/helper-validator-identifier": "^7.10.1",
-                        "lodash": "^4.17.13",
-                        "to-fast-properties": "^2.0.0" ===
-                          === =
-                          "@babel/plugin-transform-regenerator": {
-                            "version": "7.10.1",
-                            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.1.tgz",
-                            "integrity": "sha512-B3+Y2prScgJ2Bh/2l9LJxKbb8C8kRfsG4AdPT+n7ixBHIxJaIG8bi8tgjxUMege1+WqSJ+7gu1YeoMVO3gPWzw==",
-                            "dev": true,
-                            "requires": {
-                              "regenerator-transform": "^0.14.2"
-                            }
-                          },
-                        "@babel/plugin-transform-reserved-words": {
-                          "version": "7.10.1",
-                          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.1.tgz",
-                          "integrity": "sha512-qN1OMoE2nuqSPmpTqEM7OvJ1FkMEV+BjVeZZm9V9mq/x1JLKQ4pcv8riZJMNN3u2AUGl0ouOMjRr2siecvHqUQ==",
-                          "dev": true,
-                          "requires": {
-                            "@babel/helper-plugin-utils": "^7.10.1"
-                          }
-                        },
-                        "@babel/plugin-transform-shorthand-properties": {
-                          "version": "7.10.1",
-                          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz",
-                          "integrity": "sha512-AR0E/lZMfLstScFwztApGeyTHJ5u3JUKMjneqRItWeEqDdHWZwAOKycvQNCasCK/3r5YXsuNG25funcJDu7Y2g==",
-                          "dev": true,
-                          "requires": {
-                            "@babel/helper-plugin-utils": "^7.10.1"
-                          }
-                        },
-                        "@babel/plugin-transform-spread": {
-                          "version": "7.10.1",
-                          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz",
-                          "integrity": "sha512-8wTPym6edIrClW8FI2IoaePB91ETOtg36dOkj3bYcNe7aDMN2FXEoUa+WrmPc4xa1u2PQK46fUX2aCb+zo9rfw==",
-                          "dev": true,
-                          "requires": {
-                            "@babel/helper-plugin-utils": "^7.10.1"
-                          }
-                        },
-                        "@babel/plugin-transform-sticky-regex": {
-                          "version": "7.10.1",
-                          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz",
-                          "integrity": "sha512-j17ojftKjrL7ufX8ajKvwRilwqTok4q+BjkknmQw9VNHnItTyMP5anPFzxFJdCQs7clLcWpCV3ma+6qZWLnGMA==",
-                          "dev": true,
-                          "requires": {
-                            "@babel/helper-plugin-utils": "^7.10.1",
-                            "@babel/helper-regex": "^7.10.1"
-                          }
-                        },
-                        "@babel/plugin-transform-template-literals": {
-                          "version": "7.10.1",
-                          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.1.tgz",
-                          "integrity": "sha512-t7B/3MQf5M1T9hPCRG28DNGZUuxAuDqLYS03rJrIk2prj/UV7Z6FOneijhQhnv/Xa039vidXeVbvjK2SK5f7Gg==",
-                          "dev": true,
-                          "requires": {
-                            "@babel/helper-annotate-as-pure": "^7.10.1",
-                            "@babel/helper-plugin-utils": "^7.10.1"
-                          }
-                        },
-                        "@babel/plugin-transform-typeof-symbol": {
-                          "version": "7.10.1",
-                          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.1.tgz",
-                          "integrity": "sha512-qX8KZcmbvA23zDi+lk9s6hC1FM7jgLHYIjuLgULgc8QtYnmB3tAVIYkNoKRQ75qWBeyzcoMoK8ZQmogGtC/w0g==",
-                          "dev": true,
-                          "requires": {
-                            "@babel/helper-plugin-utils": "^7.10.1"
-                          }
-                        },
-                        "@babel/plugin-transform-unicode-regex": {
-                          "version": "7.10.1",
-                          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz",
-                          "integrity": "sha512-Y/2a2W299k0VIUdbqYm9X2qS6fE0CUBhhiPpimK6byy7OJ/kORLlIX+J6UrjgNu5awvs62k+6RSslxhcvVw2Tw==",
-                          "dev": true,
-                          "requires": {
-                            "@babel/helper-create-regexp-features-plugin": "^7.10.1",
-                            "@babel/helper-plugin-utils": "^7.10.1"
-                          }
-                        },
-                        "@babel/preset-env": {
-                          "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-plugin-utils": "^7.0.0",
-                            "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-                            "@babel/plugin-transform-dotall-regex": "^7.4.4",
-                            "@babel/types": "^7.4.4",
-                            "esutils": "^2.0.2"
-                          }
-                        },
-                        "@babel/runtime": {
-                          "version": "7.10.2",
-                          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz",
-                          "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==",
-                          "dev": true,
-                          "requires": {
-                            "regenerator-runtime": "^0.13.4"
-                          }
-                        },
-                        "@babel/template": {
-                          "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.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" >>>
-                                  >>> > upstream / master
-                              }
-                            }
-                          }
-                        },
-                        <<
-                        << << < HEAD "@babel/plugin-transform-property-literals": {
-                          "version": "7.10.1",
-                          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.1.tgz",
-                          "integrity": "sha512-Kr6+mgag8auNrgEpbfIWzdXYOvqDHZOF0+Bx2xh4H2EDNwcbRb9lY6nkZg8oSjsX+DH9Ebxm9hOqtKW+gRDeNA==",
-                          "dev": true,
-                          "requires": {
-                            "@babel/helper-plugin-utils": "^7.10.1"
-                          }
-                        },
-                        "@babel/plugin-transform-regenerator": {
-                          "version": "7.10.1",
-                          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.1.tgz",
-                          "integrity": "sha512-B3+Y2prScgJ2Bh/2l9LJxKbb8C8kRfsG4AdPT+n7ixBHIxJaIG8bi8tgjxUMege1+WqSJ+7gu1YeoMVO3gPWzw==",
-                          "dev": true,
-                          "requires": {
-                            "regenerator-transform": "^0.14.2"
-                          }
-                        },
-                        "@babel/plugin-transform-reserved-words": {
-                          "version": "7.10.1",
-                          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.1.tgz",
-                          "integrity": "sha512-qN1OMoE2nuqSPmpTqEM7OvJ1FkMEV+BjVeZZm9V9mq/x1JLKQ4pcv8riZJMNN3u2AUGl0ouOMjRr2siecvHqUQ==",
-                          "dev": true,
-                          "requires": {
-                            "@babel/helper-plugin-utils": "^7.10.1"
-                          }
-                        },
-                        "@babel/plugin-transform-shorthand-properties": {
-                          "version": "7.10.1",
-                          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz",
-                          "integrity": "sha512-AR0E/lZMfLstScFwztApGeyTHJ5u3JUKMjneqRItWeEqDdHWZwAOKycvQNCasCK/3r5YXsuNG25funcJDu7Y2g==",
-                          "dev": true,
-                          "requires": {
-                            "@babel/helper-plugin-utils": "^7.10.1"
-                          }
-                        },
-                        "@babel/plugin-transform-spread": {
-                          "version": "7.10.1",
-                          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz",
-                          "integrity": "sha512-8wTPym6edIrClW8FI2IoaePB91ETOtg36dOkj3bYcNe7aDMN2FXEoUa+WrmPc4xa1u2PQK46fUX2aCb+zo9rfw==",
-                          "dev": true,
-                          "requires": {
-                            "@babel/helper-plugin-utils": "^7.10.1"
-                          }
-                        },
-                        "@babel/plugin-transform-sticky-regex": {
-                          "version": "7.10.1",
-                          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz",
-                          "integrity": "sha512-j17ojftKjrL7ufX8ajKvwRilwqTok4q+BjkknmQw9VNHnItTyMP5anPFzxFJdCQs7clLcWpCV3ma+6qZWLnGMA==",
-                          "dev": true,
-                          "requires": {
-                            "@babel/helper-plugin-utils": "^7.10.1",
-                            "@babel/helper-regex": "^7.10.1"
-                          }
-                        },
-                        "@babel/plugin-transform-template-literals": {
-                          "version": "7.10.1",
-                          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.1.tgz",
-                          "integrity": "sha512-t7B/3MQf5M1T9hPCRG28DNGZUuxAuDqLYS03rJrIk2prj/UV7Z6FOneijhQhnv/Xa039vidXeVbvjK2SK5f7Gg==",
-                          "dev": true,
-                          "requires": {
-                            "@babel/helper-annotate-as-pure": "^7.10.1",
-                            "@babel/helper-plugin-utils": "^7.10.1"
-                          }
-                        },
-                        "@babel/plugin-transform-typeof-symbol": {
-                          "version": "7.10.1",
-                          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.1.tgz",
-                          "integrity": "sha512-qX8KZcmbvA23zDi+lk9s6hC1FM7jgLHYIjuLgULgc8QtYnmB3tAVIYkNoKRQ75qWBeyzcoMoK8ZQmogGtC/w0g==",
-                          "dev": true,
-                          "requires": {
-                            "@babel/helper-plugin-utils": "^7.10.1"
-                          }
-                        },
-                        "@babel/plugin-transform-unicode-regex": {
-                          "version": "7.10.1",
-                          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz",
-                          "integrity": "sha512-Y/2a2W299k0VIUdbqYm9X2qS6fE0CUBhhiPpimK6byy7OJ/kORLlIX+J6UrjgNu5awvs62k+6RSslxhcvVw2Tw==",
-                          "dev": true,
-                          "requires": {
-                            "@babel/helper-create-regexp-features-plugin": "^7.10.1",
-                            "@babel/helper-plugin-utils": "^7.10.1"
-                          }
-                        },
-                        "@babel/preset-env": {
-                          "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-plugin-utils": "^7.0.0",
-                            "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-                            "@babel/plugin-transform-dotall-regex": "^7.4.4",
-                            "@babel/types": "^7.4.4",
-                            "esutils": "^2.0.2"
-                          }
-                        },
-                        "@babel/runtime": {
-                          "version": "7.10.2",
-                          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz",
-                          "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==",
-                          "dev": true,
-                          "requires": {
-                            "regenerator-runtime": "^0.13.4"
-                          }
-                        },
-                        "@babel/template": {
-                          "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.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.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.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",
-                              "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/types": {
-                          "version": "7.9.0",
-                          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz",
-                          "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==",
-                          "dev": true,
-                          "requires": {
-                            "@babel/helper-validator-identifier": "^7.9.0",
-                            "lodash": "^4.17.13",
-                            "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://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"
-                          }
-                        },
-                        "@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",
-                          "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": {
-                            "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"
-                              }
-                            }
-                          }
-                        },
-                        "@jsdevtools/ono": {
-                          "version": "7.1.2",
-                          "resolved": "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.2.tgz",
-                          "integrity": "sha512-qS/a24RA5FEoiJS9wiv6Pwg2c/kiUo3IVUQcfeM9JvsR6pM8Yx+yl/6xWYLckZCT5jpLNhslgjiA8p/XcGyMRQ==",
-                          "dev": true
-                        },
-                        "@ngrx/effects": {
-                          "version": "9.2.0",
-                          "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-9.2.0.tgz",
-                          "integrity": "sha512-8V09zDIPehGpzgfcgyczelovsVYJvDQhN9wHt37K5A+YCG0CI8nj8FmKokHATwv/S62YqFrOVnr/TZacxpDhBw=="
-                        },
-                        "@ngrx/router-store": {
-                          "version": "9.2.0",
-                          "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-9.2.0.tgz",
-                          "integrity": "sha512-thu6aU9YWM64oNEk4Srx/mNSeQ2SPJKlTji8MSzfr06qgCMyPSXZBYlfs8HqY+af3eB7XBEhb/4ew4JJ6xC9zw=="
-                        },
-                        "@ngrx/store": {
-                          "version": "9.2.0",
-                          "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-9.2.0.tgz",
-                          "integrity": "sha512-V8AI3mxbMztVpbZpALkLZYlGkofKcu9GaOCY5e+sZ1VcJ90oxhFjBpnmd6MuVdmhep1XAHALb1B8ZbBFn+xsgQ=="
-                        },
-                        "@ngrx/store-devtools": {
-                          "version": "9.2.0",
-                          "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-9.2.0.tgz",
-                          "integrity": "sha512-/FvgcpjO4IvwNFnRVoHGikAvckr6fxKf4NgYoTQ9giI8xavolLvuQUHxzH20legi5dgZz34ii2m2g1Q7OxEV8w=="
-                        },
-                        "@ngtools/webpack": {
-                          "version": "9.1.7",
-                          "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-9.1.7.tgz",
-                          "integrity": "sha512-A7VB2I42Kn+7jl0tDKzGNLAoZLWSqkKo9Hg1bmKpvAAIz+DSbq3uV+JWgGgTprM3tn0lfkVgmqk4H17HKwAOcg==",
-                          "dev": true,
-                          "requires": {
-                            "@angular-devkit/core": "9.1.7",
-                            "enhanced-resolve": "4.1.1",
-                            "rxjs": "6.5.4",
-                            "webpack-sources": "1.4.3"
-                          },
-                          "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": {
-                                ===
-                                === =
-                                "@babel/traverse": {
-                                  "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.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",
-                                      "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/types": {
-                                  "version": "7.9.0",
-                                  "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz",
-                                  "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==",
-                                  "dev": true,
-                                  "requires": {
-                                    "@babel/helper-validator-identifier": "^7.9.0",
-                                    "lodash": "^4.17.13",
-                                    "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://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"
-                                  }
-                                },
-                                "@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",
-                                  "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": {
-                                    "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"
-                                      }
-                                    }
-                                  }
-                                },
-                                "@jsdevtools/ono": {
-                                  "version": "7.1.2",
-                                  "resolved": "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.2.tgz",
-                                  "integrity": "sha512-qS/a24RA5FEoiJS9wiv6Pwg2c/kiUo3IVUQcfeM9JvsR6pM8Yx+yl/6xWYLckZCT5jpLNhslgjiA8p/XcGyMRQ==",
-                                  "dev": true
-                                },
-                                "@ngrx/effects": {
-                                  "version": "9.2.0",
-                                  "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-9.2.0.tgz",
-                                  "integrity": "sha512-8V09zDIPehGpzgfcgyczelovsVYJvDQhN9wHt37K5A+YCG0CI8nj8FmKokHATwv/S62YqFrOVnr/TZacxpDhBw=="
-                                },
-                                "@ngrx/router-store": {
-                                  "version": "9.2.0",
-                                  "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-9.2.0.tgz",
-                                  "integrity": "sha512-thu6aU9YWM64oNEk4Srx/mNSeQ2SPJKlTji8MSzfr06qgCMyPSXZBYlfs8HqY+af3eB7XBEhb/4ew4JJ6xC9zw=="
-                                },
-                                "@ngrx/store": {
-                                  "version": "9.2.0",
-                                  "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-9.2.0.tgz",
-                                  "integrity": "sha512-V8AI3mxbMztVpbZpALkLZYlGkofKcu9GaOCY5e+sZ1VcJ90oxhFjBpnmd6MuVdmhep1XAHALb1B8ZbBFn+xsgQ=="
-                                },
-                                "@ngrx/store-devtools": {
-                                  "version": "9.2.0",
-                                  "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-9.2.0.tgz",
-                                  "integrity": "sha512-/FvgcpjO4IvwNFnRVoHGikAvckr6fxKf4NgYoTQ9giI8xavolLvuQUHxzH20legi5dgZz34ii2m2g1Q7OxEV8w=="
-                                },
-                                "@ngtools/webpack": {
-                                  "version": "9.1.7",
-                                  "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-9.1.7.tgz",
-                                  "integrity": "sha512-A7VB2I42Kn+7jl0tDKzGNLAoZLWSqkKo9Hg1bmKpvAAIz+DSbq3uV+JWgGgTprM3tn0lfkVgmqk4H17HKwAOcg==",
-                                  "dev": true,
-                                  "requires": {
-                                    "@angular-devkit/core": "9.1.7",
-                                    "enhanced-resolve": "4.1.1",
-                                    "rxjs": "6.5.4",
-                                    "webpack-sources": "1.4.3"
-                                  },
-                                  "dependencies": {
-                                    "@angular-devkit/core": {
-                                      "version": "9.1.7",
-                                      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.7.tgz",
-                                      "integrity": "sha512-guvolu9Cl+qYMTtedLZD9wCqustJjdqzJ2psD2C1Sr1LrX9T0mprmDldR/YnhsitThveJEb6sM/0EvqWxoSvKw==",
-                                      "dev": true,
-                                      "requires": {
-                                        "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"
-                                      }
-                                    },
-                                    "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"
-                                      }
-                                    },
-                                    "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
-                                    }
-                                  }
-                                },
-                                "@nodelib/fs.scandir": {
-                                  "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.3",
-                                    "run-parallel": "^1.1.9"
-                                  }
-                                },
-                                "@nodelib/fs.stat": {
-                                  "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.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.3",
-                                    "fastq": "^1.6.0"
-                                  }
-                                },
-                                "@rollup/plugin-commonjs": {
-                                  "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.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"
-                                  }
-                                },
-                                "@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.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.8",
-                                    "@types/resolve": "0.0.8",
-                                    "builtin-modules": "^3.1.0",
-                                    "is-module": "^1.0.0",
-                                    "resolve": "^1.14.2"
-                                  },
-                                  "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"
-                                      }
-                                    },
-                                    "@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"
-                                      }
-                                    },
-                                    "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="
-                                    },
-                                    "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="
-                                    },
-                                    "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==",
-                                      "requires": {
-                                        "sourcemap-codec": "^1.4.4"
-                                      }
-                                    },
-                                    "resolve": {
-                                      "version": "1.17.0",
-                                      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-                                      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-                                      "dev": true,
-                                      "requires": {
-                                        "path-parse": "^1.0.6"
-                                      }
-                                    },
-                                    "rxjs": {
-                                      "version": "6.4.0",
-                                      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-                                      "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
-                                      "requires": {
-                                        >>>
-                                        >>> > upstream / master "tslib": "^1.9.0"
-                                      }
-                                    }
-                                  }
-                                },
-                                <<
-                                << << < HEAD "@nodelib/fs.scandir": {
-                                  "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.3",
-                                    "run-parallel": "^1.1.9"
-                                  }
-                                },
-                                "@nodelib/fs.stat": {
-                                  "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.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.3",
-                                    "fastq": "^1.6.0"
-                                  }
-                                },
-                                "@rollup/plugin-commonjs": {
-                                  "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.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"
-                                  }
-                                },
-                                "@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.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.8",
-                                    "@types/resolve": "0.0.8",
-                                    "builtin-modules": "^3.1.0",
-                                    "is-module": "^1.0.0",
-                                    "resolve": "^1.14.2"
-                                  },
-                                  "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"
-                                      }
-                                    },
-                                    "@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"
-                                      }
-                                    },
-                                    "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="
-                                    },
-                                    "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="
-                                    },
-                                    "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==",
-                                      "requires": {
-                                        "sourcemap-codec": "^1.4.4"
-                                      }
-                                    },
-                                    "resolve": {
-                                      "version": "1.17.0",
-                                      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-                                      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-                                      "dev": true,
-                                      "requires": {
-                                        "path-parse": "^1.0.6"
-                                      }
-                                    },
-                                    "rxjs": {
-                                      "version": "6.4.0",
-                                      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-                                      "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
-                                      "requires": {
-                                        "tslib": "^1.9.0"
-                                      }
-                                    }
-                                  }
-                                },
-                                "@rollup/pluginutils": {
-                                  "version": "3.0.9",
-                                  "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.9.tgz",
-                                  "integrity": "sha512-TLZavlfPAZYI7v33wQh4mTP6zojne14yok3DNSLcjoG/Hirxfkonn6icP5rrNWRn8nZsirJBFFpijVOJzkUHDg==",
-                                  "dev": true,
-                                  "requires": {
-                                    ===
-                                    === =
-                                    "@rollup/pluginutils": {
-                                      "version": "3.0.9",
-                                      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.9.tgz",
-                                      "integrity": "sha512-TLZavlfPAZYI7v33wQh4mTP6zojne14yok3DNSLcjoG/Hirxfkonn6icP5rrNWRn8nZsirJBFFpijVOJzkUHDg==",
-                                      "dev": true,
-                                      "requires": {
-                                        >>>
-                                        >>> > upstream / master "@types/estree": "0.0.39",
-                                        "estree-walker": "^1.0.1",
-                                        "micromatch": "^4.0.2"
-                                      },
-                                      "dependencies": {
-                                        "ansi-regex": {
-                                          "version": "3.0.0",
-                                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-                                          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-                                        },
-                                        "camelcase": {
-                                          "version": "4.1.0",
-                                          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-                                          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
-                                        },
-                                        "cliui": {
-                                          "version": "4.1.0",
-                                          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-                                          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
-                                          "requires": {
-                                            "string-width": "^2.1.1",
-                                            "strip-ansi": "^4.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=="
-                                        },
-                                        "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="
-                                        },
-                                        "lcid": {
-                                          "version": "2.0.0",
-                                          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-                                          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
-                                          <<
-                                          << << < HEAD "requires": {
-                                            "invert-kv": "^2.0.0"
-                                          }
-                                        },
-                                        "mem": {
-                                          "version": "4.3.0",
-                                          "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
-                                          "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
-                                          "requires": {
-                                            "map-age-cleaner": "^0.1.1",
-                                            "mimic-fn": "^2.0.0"
-                                          }
-                                        },
-                                        "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"
-                                          }
-                                        },
-                                        "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==",
-                                          "requires": {
-                                            "execa": "^1.0.0",
-                                            "lcid": "^2.0.0",
-                                            "mem": "^4.0.0"
-                                          }
-                                        },
-                                        "string-width": {
-                                          "version": "2.1.1",
-                                          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-                                          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-                                          "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=",
-                                          "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="
-                                        },
-                                        "y18n": {
-                                          "version": "3.2.1",
-                                          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-                                          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
-                                        },
-                                        "yargs": {
-                                          "version": "11.1.1",
-                                          "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.1.tgz",
-                                          "integrity": "sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==",
-                                          "requires": {
-                                            "cliui": "^4.0.0",
-                                            "decamelize": "^1.1.1",
-                                            "find-up": "^2.1.0",
-                                            "os-locale": "^3.1.0",
-                                            "require-directory": "^2.1.1",
-                                            "set-blocking": "^2.0.0",
-                                            "string-width": "^2.0.0",
-                                            "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=",
-                                              "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==",
-                                          "requires": {
-                                            "camelcase": "^4.1.0"
-                                          }
-                                        }
-                                      }
-                                    },
-                                    "@schematics/angular": {
-                                      "version": "9.1.7",
-                                      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.7.tgz",
-                                      "integrity": "sha512-ld3WcoMWvup04V3OWioQ+AFGQBzz7IDM4Fxc5+Qc3wILWkDJnNkrc4EmJAow96Ab4/T1+Wl1vof3tV4At0BTzA==",
-                                      "dev": true,
-                                      "requires": {
-                                        "@angular-devkit/core": "9.1.7",
-                                        "@angular-devkit/schematics": "9.1.7"
-                                      }
-                                    },
-                                    "@schematics/update": {
-                                      "version": "0.901.7",
-                                      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.901.7.tgz",
-                                      "integrity": "sha512-6IpQVFvbu47CrXfqqHAzv2vi7AOdfi1S+SiayXU6FWTeA2wV47H8R60VjxurL8JkDGoVhFgC4+lK6KG++g3dQw==",
-                                      "dev": true,
-                                      "requires": {
-                                        "@angular-devkit/core": "9.1.7",
-                                        "@angular-devkit/schematics": "9.1.7",
-                                        "@yarnpkg/lockfile": "1.1.0",
-                                        "ini": "1.3.5",
-                                        "npm-package-arg": "^8.0.0",
-                                        "pacote": "9.5.12",
-                                        "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.4",
-                                      "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-13.0.4.tgz",
-                                      "integrity": "sha512-4EvwclbctVQ5VzPBC63DJsg+jwQU/NlR/yQ9ObVH5acefEbS8kupn3cp/gaWftLTQ0jdXqRqycHNkLOQZfa3XQ==",
-                                      "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"
-                                      }
-                                    },
-                                    "@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",
-                                      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
-                                      "dev": true,
-                                      "requires": {
-                                        "defer-to-connect": "^1.0.1"
-                                      }
-                                    },
-                                    "@tootallnate/once": {
-                                      "version": "1.0.0",
-                                      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.0.0.tgz",
-                                      "integrity": "sha512-KYyTT/T6ALPkIRd2Ge080X/BsXvy9O0hcWTtMWkPvwAwF99+vn6Dv4GzrFT/Nn1LePr+FFDbRXXlqmsy9lw2zA==",
-                                      "dev": true
-                                    },
-                                    "@tweenjs/tween.js": {
-                                      "version": "17.4.0",
-                                      "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-17.4.0.tgz",
-                                      "integrity": "sha512-J3fzl1F6wvh8KXVVcIuHN12xi1ZDcPA/0Vix+ZcJYwZWVHUwfIqfvzYXXEw7ybeev6477KCTt9fKydU+ajUqcg=="
-                                    },
-                                    "@types/caseless": {
-                                      "version": "0.12.2",
-                                      "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz",
-                                      "integrity": "sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==",
-                                      "dev": true
-                                    },
-                                    "@types/circular-json": {
-                                      "version": "0.4.0",
-                                      "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",
-                                      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
-                                      "dev": true
-                                    },
-                                    "@types/glob": {
-                                      "version": "7.1.2",
-                                      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.2.tgz",
-                                      "integrity": "sha512-VgNIkxK+j7Nz5P7jvUZlRvhuPSmsEfS03b0alKcq5V/STUKAa3Plemsn5mrQUO7am6OErJ4rhGEGJbACclrtRA==",
-                                      "dev": true,
-                                      "requires": {
-                                        "@types/minimatch": "*",
-                                        "@types/node": "*"
-                                      }
-                                    },
-                                    "@types/jasmine": {
-                                      "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": {
-                                      "version": "2.0.8",
-                                      "resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.8.tgz",
-                                      "integrity": "sha512-d9p31r7Nxk0ZH0U39PTH0hiDlJ+qNVGjlt1ucOoTUptxb2v+Y5VMnsxfwN+i3hK4yQnqBi3FMmoMFcd1JHDxdg==",
-                                      "dev": true,
-                                      "requires": {
-                                        "@types/jasmine": "*"
-                                      }
-                                    },
-                                    "@types/json-schema": {
-                                      "version": "7.0.5",
-                                      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz",
-                                      "integrity": "sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ==",
-                                      "dev": true
-                                    },
-                                    "@types/karma": {
-                                      "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/node": "*",
-                                        "log4js": "^4.0.0"
-                                      }
-                                    },
-                                    "@types/marked": {
-                                      "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",
-                                      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
-                                      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
-                                      "dev": true
-                                    },
-                                    "@types/moment-timezone": {
-                                      "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": "13.13.11",
-                                      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.11.tgz",
-                                      "integrity": "sha512-FX7mIFKfnGCfq10DGWNhfCNxhACEeqH5uulT6wRRA1KEt7zgLe0HdrAd9/QQkObDqp2Z0KEV3OAmNgs0lTx5tQ==",
-                                      "dev": true
-                                    },
-                                    "@types/normalize-package-data": {
-                                      "version": "2.4.0",
-                                      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-                                      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
-                                      "dev": true
-                                    },
-                                    "@types/q": {
-                                      "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.4",
-                                      "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.4.tgz",
-                                      "integrity": "sha512-W1t1MTKYR8PxICH+A4HgEIPuAC3sbljoEVfyZbeFJJDbr30guDspJri2XOaM2E+Un7ZjrihaDi7cf6fPa2tbgw==",
-                                      "dev": true,
-                                      "requires": {
-                                        "@types/caseless": "*",
-                                        "@types/node": "*",
-                                        "@types/tough-cookie": "*",
-                                        "form-data": "^2.5.0"
-                                      },
-                                      "dependencies": {
-                                        "form-data": {
-                                          "version": "2.5.1",
-                                          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
-                                          "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
-                                          "dev": true,
-                                          "requires": {
-                                            "asynckit": "^0.4.0",
-                                            "combined-stream": "^1.0.6",
-                                            "mime-types": "^2.1.12"
-                                          }
-                                        }
-                                      }
-                                    },
-                                    "@types/resolve": {
-                                      "version": "0.0.8",
-                                      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz",
-                                      "integrity": "sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==",
-                                      "dev": true,
-                                      "requires": {
-                                        "@types/node": "*"
-                                      }
-                                    },
-                                    "@types/selenium-webdriver": {
-                                      "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": {
-                                      "version": "0.1.2",
-                                      "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
-                                      "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
-                                      "dev": true
-                                    },
-                                    "@types/stacktrace-js": {
-                                      "version": "0.0.32",
-                                      "resolved": "https://registry.npmjs.org/@types/stacktrace-js/-/stacktrace-js-0.0.32.tgz",
-                                      "integrity": "sha512-SdxmlrHfO0BxgbBP9HZWMUo2rima8lwMjPiWm6S0dyKkDa5CseamktFhXg8umu3TPVBkSlX6ZoB5uUDJK89yvg=="
-                                    },
-                                    "@types/tough-cookie": {
-                                      "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.8",
-                                      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.8.tgz",
-                                      "integrity": "sha512-JHB2/xZlXOjzjBB6fMOpH1eQAfsrpqVVIbneE0Rok16WXwFaznaI5vfg75U5WgGJm7V9W1c4xeRQDjX/zwvghA==",
-                                      "dev": true,
-                                      "requires": {
-                                        "@types/node": "*",
-                                        "@types/source-list-map": "*",
-                                        "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
-                                        }
-                                      }
-                                    },
-                                    "@webassemblyjs/ast": {
-                                      "version": "1.8.5",
-                                      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
-                                      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
-                                      "dev": true,
-                                      "requires": {
-                                        "@webassemblyjs/helper-module-context": "1.8.5",
-                                        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-                                        "@webassemblyjs/wast-parser": "1.8.5"
-                                      }
-                                    },
-                                    "@webassemblyjs/floating-point-hex-parser": {
-                                      "version": "1.8.5",
-                                      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
-                                      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
-                                      "dev": true
-                                    },
-                                    "@webassemblyjs/helper-api-error": {
-                                      "version": "1.8.5",
-                                      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
-                                      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
-                                      "dev": true
-                                    },
-                                    "@webassemblyjs/helper-buffer": {
-                                      "version": "1.8.5",
-                                      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
-                                      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
-                                      "dev": true
-                                    },
-                                    "@webassemblyjs/helper-code-frame": {
-                                      "version": "1.8.5",
-                                      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
-                                      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
-                                      "dev": true,
-                                      "requires": {
-                                        "@webassemblyjs/wast-printer": "1.8.5"
-                                      }
-                                    },
-                                    "@webassemblyjs/helper-fsm": {
-                                      "version": "1.8.5",
-                                      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
-                                      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
-                                      "dev": true
-                                    },
-                                    "@webassemblyjs/helper-module-context": {
-                                      "version": "1.8.5",
-                                      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
-                                      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
-                                      "dev": true,
-                                      "requires": {
-                                        "@webassemblyjs/ast": "1.8.5",
-                                        "mamacro": "^0.0.3"
-                                      }
-                                    },
-                                    "@webassemblyjs/helper-wasm-bytecode": {
-                                      "version": "1.8.5",
-                                      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
-                                      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
-                                      "dev": true
-                                    },
-                                    "@webassemblyjs/helper-wasm-section": {
-                                      "version": "1.8.5",
-                                      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
-                                      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
-                                      "dev": true,
-                                      "requires": {
-                                        "@webassemblyjs/ast": "1.8.5",
-                                        "@webassemblyjs/helper-buffer": "1.8.5",
-                                        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-                                        "@webassemblyjs/wasm-gen": "1.8.5"
-                                      }
-                                    },
-                                    "@webassemblyjs/ieee754": {
-                                      "version": "1.8.5",
-                                      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
-                                      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
-                                      "dev": true,
-                                      "requires": {
-                                        "@xtuc/ieee754": "^1.2.0"
-                                      }
-                                    },
-                                    "@webassemblyjs/leb128": {
-                                      "version": "1.8.5",
-                                      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
-                                      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
-                                      "dev": true,
-                                      "requires": {
-                                        "@xtuc/long": "4.2.2"
-                                      }
-                                    },
-                                    "@webassemblyjs/utf8": {
-                                      "version": "1.8.5",
-                                      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
-                                      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
-                                      "dev": true
-                                    },
-                                    "@webassemblyjs/wasm-edit": {
-                                      "version": "1.8.5",
-                                      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
-                                      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
-                                      "dev": true,
-                                      "requires": {
-                                        "@webassemblyjs/ast": "1.8.5",
-                                        "@webassemblyjs/helper-buffer": "1.8.5",
-                                        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-                                        "@webassemblyjs/helper-wasm-section": "1.8.5",
-                                        "@webassemblyjs/wasm-gen": "1.8.5",
-                                        "@webassemblyjs/wasm-opt": "1.8.5",
-                                        "@webassemblyjs/wasm-parser": "1.8.5",
-                                        "@webassemblyjs/wast-printer": "1.8.5"
-                                      }
-                                    },
-                                    "@webassemblyjs/wasm-gen": {
-                                      "version": "1.8.5",
-                                      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
-                                      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
-                                      "dev": true,
-                                      "requires": {
-                                        "@webassemblyjs/ast": "1.8.5",
-                                        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-                                        "@webassemblyjs/ieee754": "1.8.5",
-                                        "@webassemblyjs/leb128": "1.8.5",
-                                        "@webassemblyjs/utf8": "1.8.5"
-                                      }
-                                    },
-                                    "@webassemblyjs/wasm-opt": {
-                                      "version": "1.8.5",
-                                      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
-                                      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
-                                      "dev": true,
-                                      "requires": {
-                                        "@webassemblyjs/ast": "1.8.5",
-                                        "@webassemblyjs/helper-buffer": "1.8.5",
-                                        "@webassemblyjs/wasm-gen": "1.8.5",
-                                        "@webassemblyjs/wasm-parser": "1.8.5"
-                                      }
-                                    },
-                                    "@webassemblyjs/wasm-parser": {
-                                      "version": "1.8.5",
-                                      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
-                                      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
-                                      "dev": true,
-                                      "requires": {
-                                        "@webassemblyjs/ast": "1.8.5",
-                                        "@webassemblyjs/helper-api-error": "1.8.5",
-                                        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-                                        "@webassemblyjs/ieee754": "1.8.5",
-                                        "@webassemblyjs/leb128": "1.8.5",
-                                        "@webassemblyjs/utf8": "1.8.5"
-                                      }
-                                    },
-                                    "@webassemblyjs/wast-parser": {
-                                      "version": "1.8.5",
-                                      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
-                                      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
-                                      "dev": true,
-                                      "requires": {
-                                        "@webassemblyjs/ast": "1.8.5",
-                                        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
-                                        "@webassemblyjs/helper-api-error": "1.8.5",
-                                        "@webassemblyjs/helper-code-frame": "1.8.5",
-                                        "@webassemblyjs/helper-fsm": "1.8.5",
-                                        "@xtuc/long": "4.2.2"
-                                      }
-                                    },
-                                    "@webassemblyjs/wast-printer": {
-                                      "version": "1.8.5",
-                                      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
-                                      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
-                                      "dev": true,
-                                      "requires": {
-                                        "@webassemblyjs/ast": "1.8.5",
-                                        "@webassemblyjs/wast-parser": "1.8.5",
-                                        "@xtuc/long": "4.2.2"
-                                      }
-                                    },
-                                    "@xtuc/ieee754": {
-                                      "version": "1.2.0",
-                                      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-                                      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-                                      "dev": true
-                                    },
-                                    "@xtuc/long": {
-                                      "version": "4.2.2",
-                                      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-                                      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-                                      "dev": true
-                                    },
-                                    "@yarnpkg/lockfile": {
-                                      "version": "1.1.0",
-                                      "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
-                                      "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.0.9",
-                                      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-                                      "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
-                                      "dev": true
-                                    },
-                                    "accepts": {
-                                      "version": "1.3.7",
-                                      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-                                      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
-                                      "dev": true,
-                                      "requires": {
-                                        "mime-types": "~2.1.24",
-                                        "negotiator": "0.6.2"
-                                      }
-                                    },
-                                    "acorn": {
-                                      "version": "7.2.0",
-                                      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz",
-                                      "integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==",
-                                      "dev": true
-                                    },
-                                    "acorn-jsx": {
-                                      "version": "3.0.1",
-                                      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
-                                      "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
-                                      "dev": true,
-                                      "requires": {
-                                        "acorn": "^3.0.4"
-                                      },
-                                      "dependencies": {
-                                        "acorn": {
-                                          "version": "3.3.0",
-                                          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-                                          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
-                                          "dev": true
-                                        }
-                                      }
-                                    },
-                                    "adm-zip": {
-                                      "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": {
-                                      "version": "0.8.2",
-                                      "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
-                                      "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
-                                      "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==",
-                                      "dev": true,
-                                      "requires": {
-                                        "es6-promisify": "^5.0.0"
-                                      }
-                                    },
-                                    "agentkeepalive": {
-                                      "version": "3.5.2",
-                                      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz",
-                                      "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==",
-                                      "dev": true,
-                                      "requires": {
-                                        "humanize-ms": "^1.2.1"
-                                      }
-                                    },
-                                    "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": {
-                                        "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"
-                                      }
-                                    },
-                                    "ajv-errors": {
-                                      "version": "1.0.1",
-                                      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
-                                      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="
-                                    },
-                                    "ajv-keywords": {
-                                      "version": "3.4.1",
-                                      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
-                                      "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ=="
-                                    },
-                                    "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=",
-                                      ===
-                                      === =
-                                      "requires": {
-                                        "invert-kv": "^2.0.0"
-                                      }
-                                    },
-                                    "mem": {
-                                      "version": "4.3.0",
-                                      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
-                                      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
-                                      "requires": {
-                                        "map-age-cleaner": "^0.1.1",
-                                        "mimic-fn": "^2.0.0"
-                                      }
-                                    },
-                                    "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"
-                                      }
-                                    },
-                                    "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==",
-                                      "requires": {
-                                        "execa": "^1.0.0",
-                                        "lcid": "^2.0.0",
-                                        "mem": "^4.0.0"
-                                      }
-                                    },
-                                    "string-width": {
-                                      "version": "2.1.1",
-                                      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-                                      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-                                      "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=",
-                                      "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="
-                                    },
-                                    "y18n": {
-                                      "version": "3.2.1",
-                                      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-                                      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
-                                    },
-                                    "yargs": {
-                                      "version": "11.1.1",
-                                      "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.1.tgz",
-                                      "integrity": "sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==",
-                                      "requires": {
-                                        "cliui": "^4.0.0",
-                                        "decamelize": "^1.1.1",
-                                        "find-up": "^2.1.0",
-                                        "os-locale": "^3.1.0",
-                                        "require-directory": "^2.1.1",
-                                        "set-blocking": "^2.0.0",
-                                        "string-width": "^2.0.0",
-                                        "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=",
-                                          "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==",
-                                      "requires": {
-                                        "camelcase": "^4.1.0"
-                                      }
-                                    }
-                                  }
-                                },
-                                "@schematics/angular": {
-                                  "version": "9.1.7",
-                                  "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.7.tgz",
-                                  "integrity": "sha512-ld3WcoMWvup04V3OWioQ+AFGQBzz7IDM4Fxc5+Qc3wILWkDJnNkrc4EmJAow96Ab4/T1+Wl1vof3tV4At0BTzA==",
-                                  "dev": true,
-                                  "requires": {
-                                    "@angular-devkit/core": "9.1.7",
-                                    "@angular-devkit/schematics": "9.1.7"
-                                  },
-                                  "dependencies": {
-                                    "@angular-devkit/schematics": {
-                                      "version": "9.1.7",
-                                      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.7.tgz",
-                                      "integrity": "sha512-oeHPJePBcPp/bd94jHQeFUnft93PGF5iJiKV9szxqS8WWC5OMZ5eK7icRY0PwvLyfenspAZxdZcNaqJqPMul5A==",
-                                      "dev": true,
-                                      "requires": {
-                                        "@angular-devkit/core": "9.1.7",
-                                        "ora": "4.0.3",
-                                        "rxjs": "6.5.4"
-                                      }
-                                    },
-                                    "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"
-                                      }
-                                    }
-                                  }
-                                },
-                                "@schematics/update": {
-                                  "version": "0.901.7",
-                                  "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.901.7.tgz",
-                                  "integrity": "sha512-6IpQVFvbu47CrXfqqHAzv2vi7AOdfi1S+SiayXU6FWTeA2wV47H8R60VjxurL8JkDGoVhFgC4+lK6KG++g3dQw==",
-                                  "dev": true,
-                                  "requires": {
-                                    "@angular-devkit/core": "9.1.7",
-                                    "@angular-devkit/schematics": "9.1.7",
-                                    "@yarnpkg/lockfile": "1.1.0",
-                                    "ini": "1.3.5",
-                                    "npm-package-arg": "^8.0.0",
-                                    "pacote": "9.5.12",
-                                    "rxjs": "6.5.4",
-                                    "semver": "7.1.3",
-                                    "semver-intersect": "1.4.0"
-                                  },
-                                  "dependencies": {
-                                    "@angular-devkit/core": {
-                                      "version": "9.1.7",
-                                      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.7.tgz",
-                                      "integrity": "sha512-guvolu9Cl+qYMTtedLZD9wCqustJjdqzJ2psD2C1Sr1LrX9T0mprmDldR/YnhsitThveJEb6sM/0EvqWxoSvKw==",
-                                      "dev": true,
-                                      "requires": {
-                                        "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"
-                                      }
-                                    },
-                                    "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
-                                    },
-                                    "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
-                                    }
-                                  }
-                                },
-                                "@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.4",
-                                  "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-13.0.4.tgz",
-                                  "integrity": "sha512-4EvwclbctVQ5VzPBC63DJsg+jwQU/NlR/yQ9ObVH5acefEbS8kupn3cp/gaWftLTQ0jdXqRqycHNkLOQZfa3XQ==",
-                                  "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": {
-                                  "version": "1.1.2",
-                                  "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
-                                  "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
-                                  "dev": true,
-                                  "requires": {
-                                    "defer-to-connect": "^1.0.1"
-                                  }
-                                },
-                                "@tootallnate/once": {
-                                  "version": "1.0.0",
-                                  "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.0.0.tgz",
-                                  "integrity": "sha512-KYyTT/T6ALPkIRd2Ge080X/BsXvy9O0hcWTtMWkPvwAwF99+vn6Dv4GzrFT/Nn1LePr+FFDbRXXlqmsy9lw2zA==",
-                                  "dev": true
-                                },
-                                "@tweenjs/tween.js": {
-                                  "version": "17.4.0",
-                                  "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-17.4.0.tgz",
-                                  "integrity": "sha512-J3fzl1F6wvh8KXVVcIuHN12xi1ZDcPA/0Vix+ZcJYwZWVHUwfIqfvzYXXEw7ybeev6477KCTt9fKydU+ajUqcg=="
-                                },
-                                "@types/caseless": {
-                                  "version": "0.12.2",
-                                  "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz",
-                                  "integrity": "sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==",
-                                  "dev": true
-                                },
-                                "@types/circular-json": {
-                                  "version": "0.4.0",
-                                  "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",
-                                  "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
-                                  "dev": true
-                                },
-                                "@types/glob": {
-                                  "version": "7.1.2",
-                                  "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.2.tgz",
-                                  "integrity": "sha512-VgNIkxK+j7Nz5P7jvUZlRvhuPSmsEfS03b0alKcq5V/STUKAa3Plemsn5mrQUO7am6OErJ4rhGEGJbACclrtRA==",
-                                  "dev": true,
-                                  "requires": {
-                                    "@types/minimatch": "*",
-                                    "@types/node": "*"
-                                  }
-                                },
-                                "@types/jasmine": {
-                                  "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": {
-                                  "version": "2.0.8",
-                                  "resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.8.tgz",
-                                  "integrity": "sha512-d9p31r7Nxk0ZH0U39PTH0hiDlJ+qNVGjlt1ucOoTUptxb2v+Y5VMnsxfwN+i3hK4yQnqBi3FMmoMFcd1JHDxdg==",
-                                  "dev": true,
-                                  "requires": {
-                                    "@types/jasmine": "*"
-                                  }
-                                },
-                                "@types/json-schema": {
-                                  "version": "7.0.5",
-                                  "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz",
-                                  "integrity": "sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ==",
-                                  "dev": true
-                                },
-                                "@types/karma": {
-                                  "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/node": "*",
-                                    "log4js": "^4.0.0"
-                                  }
-                                },
-                                "@types/marked": {
-                                  "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",
-                                  "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
-                                  "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
-                                  "dev": true
-                                },
-                                "@types/moment-timezone": {
-                                  "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": "13.13.11",
-                                  "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.11.tgz",
-                                  "integrity": "sha512-FX7mIFKfnGCfq10DGWNhfCNxhACEeqH5uulT6wRRA1KEt7zgLe0HdrAd9/QQkObDqp2Z0KEV3OAmNgs0lTx5tQ==",
-                                  "dev": true
-                                },
-                                "@types/normalize-package-data": {
-                                  "version": "2.4.0",
-                                  "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-                                  "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
-                                  "dev": true
-                                },
-                                "@types/q": {
-                                  "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.4",
-                                  "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.4.tgz",
-                                  "integrity": "sha512-W1t1MTKYR8PxICH+A4HgEIPuAC3sbljoEVfyZbeFJJDbr30guDspJri2XOaM2E+Un7ZjrihaDi7cf6fPa2tbgw==",
-                                  "dev": true,
-                                  "requires": {
-                                    "@types/caseless": "*",
-                                    "@types/node": "*",
-                                    "@types/tough-cookie": "*",
-                                    "form-data": "^2.5.0"
-                                  },
-                                  "dependencies": {
-                                    "form-data": {
-                                      "version": "2.5.1",
-                                      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
-                                      "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
-                                      "dev": true,
-                                      "requires": {
-                                        "asynckit": "^0.4.0",
-                                        "combined-stream": "^1.0.6",
-                                        "mime-types": "^2.1.12"
-                                      }
-                                    }
-                                  }
-                                },
-                                "@types/resolve": {
-                                  "version": "0.0.8",
-                                  "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz",
-                                  "integrity": "sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==",
-                                  "dev": true,
-                                  "requires": {
-                                    "@types/node": "*"
-                                  }
-                                },
-                                "@types/selenium-webdriver": {
-                                  "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": {
-                                  "version": "0.1.2",
-                                  "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
-                                  "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
-                                  "dev": true
-                                },
-                                "@types/stacktrace-js": {
-                                  "version": "0.0.32",
-                                  "resolved": "https://registry.npmjs.org/@types/stacktrace-js/-/stacktrace-js-0.0.32.tgz",
-                                  "integrity": "sha512-SdxmlrHfO0BxgbBP9HZWMUo2rima8lwMjPiWm6S0dyKkDa5CseamktFhXg8umu3TPVBkSlX6ZoB5uUDJK89yvg=="
-                                },
-                                "@types/tough-cookie": {
-                                  "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.8",
-                                  "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.8.tgz",
-                                  "integrity": "sha512-JHB2/xZlXOjzjBB6fMOpH1eQAfsrpqVVIbneE0Rok16WXwFaznaI5vfg75U5WgGJm7V9W1c4xeRQDjX/zwvghA==",
-                                  "dev": true,
-                                  "requires": {
-                                    "@types/node": "*",
-                                    "@types/source-list-map": "*",
-                                    "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
-                                    }
-                                  }
-                                },
-                                "@webassemblyjs/ast": {
-                                  "version": "1.8.5",
-                                  "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
-                                  "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
-                                  "dev": true,
-                                  "requires": {
-                                    "@webassemblyjs/helper-module-context": "1.8.5",
-                                    "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-                                    "@webassemblyjs/wast-parser": "1.8.5"
-                                  }
-                                },
-                                "@webassemblyjs/floating-point-hex-parser": {
-                                  "version": "1.8.5",
-                                  "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
-                                  "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
-                                  "dev": true
-                                },
-                                "@webassemblyjs/helper-api-error": {
-                                  "version": "1.8.5",
-                                  "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
-                                  "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
-                                  "dev": true
-                                },
-                                "@webassemblyjs/helper-buffer": {
-                                  "version": "1.8.5",
-                                  "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
-                                  "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
-                                  "dev": true
-                                },
-                                "@webassemblyjs/helper-code-frame": {
-                                  "version": "1.8.5",
-                                  "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
-                                  "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
-                                  "dev": true,
-                                  "requires": {
-                                    "@webassemblyjs/wast-printer": "1.8.5"
-                                  }
-                                },
-                                "@webassemblyjs/helper-fsm": {
-                                  "version": "1.8.5",
-                                  "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
-                                  "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
-                                  "dev": true
-                                },
-                                "@webassemblyjs/helper-module-context": {
-                                  "version": "1.8.5",
-                                  "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
-                                  "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
-                                  "dev": true,
-                                  "requires": {
-                                    "@webassemblyjs/ast": "1.8.5",
-                                    "mamacro": "^0.0.3"
-                                  }
-                                },
-                                "@webassemblyjs/helper-wasm-bytecode": {
-                                  "version": "1.8.5",
-                                  "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
-                                  "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
-                                  "dev": true
-                                },
-                                "@webassemblyjs/helper-wasm-section": {
-                                  "version": "1.8.5",
-                                  "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
-                                  "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
-                                  "dev": true,
-                                  "requires": {
-                                    "@webassemblyjs/ast": "1.8.5",
-                                    "@webassemblyjs/helper-buffer": "1.8.5",
-                                    "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-                                    "@webassemblyjs/wasm-gen": "1.8.5"
-                                  }
-                                },
-                                "@webassemblyjs/ieee754": {
-                                  "version": "1.8.5",
-                                  "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
-                                  "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
-                                  "dev": true,
-                                  "requires": {
-                                    "@xtuc/ieee754": "^1.2.0"
-                                  }
-                                },
-                                "@webassemblyjs/leb128": {
-                                  "version": "1.8.5",
-                                  "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
-                                  "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
-                                  "dev": true,
-                                  "requires": {
-                                    "@xtuc/long": "4.2.2"
-                                  }
-                                },
-                                "@webassemblyjs/utf8": {
-                                  "version": "1.8.5",
-                                  "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
-                                  "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
-                                  "dev": true
-                                },
-                                "@webassemblyjs/wasm-edit": {
-                                  "version": "1.8.5",
-                                  "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
-                                  "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
-                                  "dev": true,
-                                  "requires": {
-                                    "@webassemblyjs/ast": "1.8.5",
-                                    "@webassemblyjs/helper-buffer": "1.8.5",
-                                    "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-                                    "@webassemblyjs/helper-wasm-section": "1.8.5",
-                                    "@webassemblyjs/wasm-gen": "1.8.5",
-                                    "@webassemblyjs/wasm-opt": "1.8.5",
-                                    "@webassemblyjs/wasm-parser": "1.8.5",
-                                    "@webassemblyjs/wast-printer": "1.8.5"
-                                  }
-                                },
-                                "@webassemblyjs/wasm-gen": {
-                                  "version": "1.8.5",
-                                  "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
-                                  "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
-                                  "dev": true,
-                                  "requires": {
-                                    "@webassemblyjs/ast": "1.8.5",
-                                    "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-                                    "@webassemblyjs/ieee754": "1.8.5",
-                                    "@webassemblyjs/leb128": "1.8.5",
-                                    "@webassemblyjs/utf8": "1.8.5"
-                                  }
-                                },
-                                "@webassemblyjs/wasm-opt": {
-                                  "version": "1.8.5",
-                                  "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
-                                  "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
-                                  "dev": true,
-                                  "requires": {
-                                    "@webassemblyjs/ast": "1.8.5",
-                                    "@webassemblyjs/helper-buffer": "1.8.5",
-                                    "@webassemblyjs/wasm-gen": "1.8.5",
-                                    "@webassemblyjs/wasm-parser": "1.8.5"
-                                  }
-                                },
-                                "@webassemblyjs/wasm-parser": {
-                                  "version": "1.8.5",
-                                  "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
-                                  "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
-                                  "dev": true,
-                                  "requires": {
-                                    "@webassemblyjs/ast": "1.8.5",
-                                    "@webassemblyjs/helper-api-error": "1.8.5",
-                                    "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-                                    "@webassemblyjs/ieee754": "1.8.5",
-                                    "@webassemblyjs/leb128": "1.8.5",
-                                    "@webassemblyjs/utf8": "1.8.5"
-                                  }
-                                },
-                                "@webassemblyjs/wast-parser": {
-                                  "version": "1.8.5",
-                                  "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
-                                  "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
-                                  "dev": true,
-                                  "requires": {
-                                    "@webassemblyjs/ast": "1.8.5",
-                                    "@webassemblyjs/floating-point-hex-parser": "1.8.5",
-                                    "@webassemblyjs/helper-api-error": "1.8.5",
-                                    "@webassemblyjs/helper-code-frame": "1.8.5",
-                                    "@webassemblyjs/helper-fsm": "1.8.5",
-                                    "@xtuc/long": "4.2.2"
-                                  }
-                                },
-                                "@webassemblyjs/wast-printer": {
-                                  "version": "1.8.5",
-                                  "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
-                                  "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
-                                  "dev": true,
-                                  "requires": {
-                                    "@webassemblyjs/ast": "1.8.5",
-                                    "@webassemblyjs/wast-parser": "1.8.5",
-                                    "@xtuc/long": "4.2.2"
-                                  }
-                                },
-                                "@xtuc/ieee754": {
-                                  "version": "1.2.0",
-                                  "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-                                  "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-                                  "dev": true
-                                },
-                                "@xtuc/long": {
-                                  "version": "4.2.2",
-                                  "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-                                  "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-                                  "dev": true
-                                },
-                                "@yarnpkg/lockfile": {
-                                  "version": "1.1.0",
-                                  "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
-                                  "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.0.9",
-                                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-                                  "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
-                                  "dev": true
-                                },
-                                "accepts": {
-                                  "version": "1.3.7",
-                                  "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-                                  "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
-                                  "dev": true,
-                                  "requires": {
-                                    "mime-types": "~2.1.24",
-                                    "negotiator": "0.6.2"
-                                  }
-                                },
-                                "acorn": {
-                                  "version": "7.2.0",
-                                  "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz",
-                                  "integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==",
-                                  "dev": true
-                                },
-                                "acorn-jsx": {
-                                  "version": "3.0.1",
-                                  "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
-                                  "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
-                                  "dev": true,
-                                  "requires": {
-                                    "acorn": "^3.0.4"
-                                  },
-                                  "dependencies": {
-                                    "acorn": {
-                                      "version": "3.3.0",
-                                      "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-                                      "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
-                                      "dev": true
-                                    }
-                                  }
-                                },
-                                "adm-zip": {
-                                  "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": {
-                                  "version": "0.8.2",
-                                  "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
-                                  "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
-                                  "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==",
-                                  "dev": true,
-                                  "requires": {
-                                    "es6-promisify": "^5.0.0"
-                                  }
-                                },
-                                "agentkeepalive": {
-                                  "version": "3.5.2",
-                                  "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz",
-                                  "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==",
-                                  "dev": true,
-                                  "requires": {
-                                    "humanize-ms": "^1.2.1"
-                                  }
-                                },
-                                "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": {
-                                    "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"
-                                  }
-                                },
-                                "ajv-errors": {
-                                  "version": "1.0.1",
-                                  "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
-                                  "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="
-                                },
-                                "ajv-keywords": {
-                                  "version": "3.4.1",
-                                  "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
-                                  "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ=="
-                                },
-                                "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,
-                                  "optional": true
-                                },
-                                "angular2-virtual-scroll": {
-                                  "version": "0.4.16",
-                                  "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.1.0"
-                                  }
-                                },
-                                "ansi-align": {
-                                  "version": "3.0.0",
-                                  "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
-                                  "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
-                                  "dev": true,
-                                  "requires": {
-                                    "string-width": "^3.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==",
-                                      "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==",
-                                      "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
-                                    },
-                                    "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==",
-                                      "dev": true,
-                                      "requires": {
-                                        "emoji-regex": "^7.0.1",
-                                        "is-fullwidth-code-point": "^2.0.0",
-                                        "strip-ansi": "^5.1.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==",
-                                      "dev": true,
-                                      "requires": {
-                                        "ansi-regex": "^4.1.0"
-                                      }
-                                    }
-                                  }
-                                },
-                                "ansi-colors": {
-                                  "version": "3.2.4",
-                                  "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-                                  "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
-                                  "dev": true
-                                },
-                                "ansi-escapes": {
-                                  "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.11.0"
-                                  }
-                                },
-                                "ansi-gray": {
-                                  "version": "0.1.1",
-                                  "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
-                                  "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
-                                  "dev": true,
-                                  "requires": {
-                                    "ansi-wrap": "0.1.0"
-                                  }
-                                },
-                                "ansi-html": {
-                                  "version": "0.0.7",
-                                  "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-                                  "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
-                                  "dev": true
-                                },
-                                "ansi-regex": {
-                                  "version": "2.1.1",
-                                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-                                  "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"
-                                  }
-                                },
-                                "ansi-wrap": {
-                                  "version": "0.1.0",
-                                  "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-                                  "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
-                                  "dev": true
-                                },
-                                "any-promise": {
-                                  "version": "1.3.0",
-                                  "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-                                  "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
-                                  "dev": true
-                                },
-                                "anymatch": {
-                                  "version": "3.1.1",
-                                  "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-                                  "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-                                  "requires": {
-                                    "normalize-path": "^3.0.0",
-                                    "picomatch": "^2.0.4"
-                                  }
-                                },
-                                "app-root-path": {
-                                  "version": "2.2.1",
-                                  "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.2.1.tgz",
-                                  "integrity": "sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==",
-                                  "dev": true
-                                },
-                                "append-buffer": {
-                                  "version": "1.0.2",
-                                  "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
-                                  "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
-                                  "dev": true,
-                                  "requires": {
-                                    "buffer-equal": "^1.0.0"
-                                  }
-                                },
-                                "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"
-                                  }
-                                },
-                                "aproba": {
-                                  "version": "1.2.0",
-                                  "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-                                  "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-                                  "dev": true
-                                },
-                                "archy": {
-                                  "version": "1.0.0",
-                                  "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-                                  "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
-                                  "dev": true
-                                },
-                                "arg": {
-                                  "version": "4.1.3",
-                                  "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-                                  "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-                                  "dev": true
-                                },
-                                "argparse": {
-                                  "version": "1.0.10",
-                                  "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-                                  "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-                                  "dev": true,
-                                  "requires": {
-                                    "sprintf-js": "~1.0.2"
-                                  }
-                                },
-                                "argv": {
-                                  "version": "0.0.2",
-                                  "resolved": "https://registry.npmjs.org/argv/-/argv-0.0.2.tgz",
-                                  "integrity": "sha1-7L0W+JSbFXGDcRsb2jNPN4QBhas=",
-                                  "dev": true
-                                },
-                                "aria-query": {
-                                  "version": "3.0.0",
-                                  "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz",
-                                  "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=",
-                                  "dev": true,
-                                  "requires": {
-                                    "ast-types-flow": "0.0.7",
-                                    "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=",
-                                  "dev": true
-                                },
-                                "arr-filter": {
-                                  "version": "1.1.2",
-                                  "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
-                                  "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
-                                  "dev": true,
-                                  "requires": {
-                                    "make-iterator": "^1.0.0"
-                                  }
-                                },
-                                "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==",
-                                  "dev": true
-                                },
-                                "arr-map": {
-                                  "version": "2.0.2",
-                                  "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
-                                  "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
-                                  "dev": true,
-                                  "requires": {
-                                    "make-iterator": "^1.0.0"
-                                  }
-                                },
-                                "arr-union": {
-                                  "version": "3.1.0",
-                                  "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-                                  "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-                                  "dev": true
-                                },
-                                "array-each": {
-                                  "version": "1.0.1",
-                                  "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-                                  "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
-                                  "dev": true
-                                },
-                                "array-flatten": {
-                                  "version": "2.1.2",
-                                  "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-                                  "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
-                                  "dev": true
-                                },
-                                "array-initial": {
-                                  "version": "1.1.0",
-                                  "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
-                                  "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
-                                  >>>
-                                  >>> > upstream / master "dev": true,
-                                  "optional": true
-                                },
-                                "angular2-virtual-scroll": {
-                                  "version": "0.4.16",
-                                  "resolved": "https://registry.npmjs.org/angular2-virtual-scroll/-/angular2-virtual-scroll-0.4.16.tgz",
-                                  "integrity": "sha512-6NWk0DjCh4ebU8+LgfBoKYyp3McxDA/k5vTnEiV32VpVnyhN//eThZpVpggI1D2fJBqgTAY09C8v++qXHHLP7A==",
-                                  "requires": {
-                                    <<
-                                    << << < HEAD "@tweenjs/tween.js": "^17.1.0"
-                                  }
-                                },
-                                "ansi-align": {
-                                  "version": "3.0.0",
-                                  "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
-                                  "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
-                                  "dev": true,
-                                  "requires": {
-                                    "string-width": "^3.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==",
-                                      "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==",
-                                      "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
-                                    },
-                                    "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==",
-                                      "dev": true,
-                                      "requires": {
-                                        "emoji-regex": "^7.0.1",
-                                        "is-fullwidth-code-point": "^2.0.0",
-                                        "strip-ansi": "^5.1.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==",
-                                      "dev": true,
-                                      "requires": {
-                                        "ansi-regex": "^4.1.0"
-                                      }
-                                    }
-                                  }
-                                },
-                                "ansi-colors": {
-                                  "version": "3.2.4",
-                                  "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-                                  "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
-                                  "dev": true
-                                },
-                                "ansi-escapes": {
-                                  "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.11.0"
-                                  }
-                                },
-                                "ansi-gray": {
-                                  "version": "0.1.1",
-                                  "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
-                                  "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
-                                  "dev": true,
-                                  "requires": {
-                                    "ansi-wrap": "0.1.0"
-                                  }
-                                },
-                                "ansi-html": {
-                                  "version": "0.0.7",
-                                  "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-                                  "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
-                                  "dev": true
-                                },
-                                "ansi-regex": {
-                                  "version": "2.1.1",
-                                  "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-                                  "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"
-                                  }
-                                },
-                                "ansi-wrap": {
-                                  "version": "0.1.0",
-                                  "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-                                  "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
-                                  "dev": true
-                                },
-                                "any-promise": {
-                                  "version": "1.3.0",
-                                  "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-                                  "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
-                                  "dev": true
-                                },
-                                "anymatch": {
-                                  "version": "3.1.1",
-                                  "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-                                  "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-                                  "requires": {
-                                    "normalize-path": "^3.0.0",
-                                    "picomatch": "^2.0.4"
-                                  }
-                                },
-                                "app-root-path": {
-                                  "version": "2.2.1",
-                                  "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.2.1.tgz",
-                                  "integrity": "sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==",
-                                  "dev": true
-                                },
-                                "append-buffer": {
-                                  "version": "1.0.2",
-                                  "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
-                                  "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
-                                  "dev": true,
-                                  "requires": {
-                                    "buffer-equal": "^1.0.0"
-                                  }
-                                },
-                                "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"
-                                  }
-                                },
-                                "aproba": {
-                                  "version": "1.2.0",
-                                  "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-                                  "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-                                  "dev": true
-                                },
-                                "archy": {
-                                  "version": "1.0.0",
-                                  "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-                                  "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
-                                  "dev": true
-                                },
-                                "arg": {
-                                  "version": "4.1.3",
-                                  "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-                                  "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-                                  "dev": true
-                                },
-                                "argparse": {
-                                  "version": "1.0.10",
-                                  "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-                                  "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-                                  "dev": true,
-                                  "requires": {
-                                    "sprintf-js": "~1.0.2"
-                                  }
-                                },
-                                "argv": {
-                                  "version": "0.0.2",
-                                  "resolved": "https://registry.npmjs.org/argv/-/argv-0.0.2.tgz",
-                                  "integrity": "sha1-7L0W+JSbFXGDcRsb2jNPN4QBhas=",
-                                  "dev": true
-                                },
-                                "aria-query": {
-                                  "version": "3.0.0",
-                                  "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz",
-                                  "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=",
-                                  "dev": true,
-                                  "requires": {
-                                    "ast-types-flow": "0.0.7",
-                                    "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="
-                                },
-                                "arr-filter": {
-                                  "version": "1.1.2",
-                                  "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
-                                  "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
-                                  "dev": true,
-                                  "requires": {
-                                    "make-iterator": "^1.0.0"
-                                  }
-                                },
-                                "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=="
-                                },
-                                "arr-map": {
-                                  "version": "2.0.2",
-                                  "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
-                                  "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
-                                  "dev": true,
-                                  "requires": {
-                                    "make-iterator": "^1.0.0"
-                                  }
-                                },
-                                "arr-union": {
-                                  "version": "3.1.0",
-                                  "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-                                  "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
-                                },
-                                "array-each": {
-                                  "version": "1.0.1",
-                                  "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-                                  "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
-                                  "dev": true
-                                },
-                                "array-flatten": {
-                                  "version": "2.1.2",
-                                  "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-                                  "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
-                                  "dev": true
-                                },
-                                "array-initial": {
-                                  "version": "1.1.0",
-                                  "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
-                                  "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
-                                  "dev": true,
-                                  "requires": {
-                                    "array-slice": "^1.0.0",
-                                    "is-number": "^4.0.0"
-                                  },
-                                  "dependencies": {
-                                    "is-number": {
-                                      "version": "4.0.0",
-                                      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-                                      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-                                      "dev": true
-                                    }
-                                  }
-                                },
-                                "array-last": {
-                                  "version": "1.3.0",
-                                  "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
-                                  "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
-                                  "dev": true,
-                                  "requires": {
-                                    "is-number": "^4.0.0"
-                                  },
-                                  "dependencies": {
-                                    "is-number": {
-                                      "version": "4.0.0",
-                                      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-                                      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-                                      ===
-                                      === =
-                                      "array-slice": "^1.0.0",
-                                      "is-number": "^4.0.0"
-                                    },
-                                    "dependencies": {
-                                      "is-number": {
-                                        "version": "4.0.0",
-                                        "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-                                        "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-                                        "dev": true
-                                      }
-                                    }
-                                  },
-                                  "array-last": {
-                                    "version": "1.3.0",
-                                    "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
-                                    "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
-                                    "dev": true,
-                                    "requires": {
-                                      "is-number": "^4.0.0"
-                                    },
-                                    "dependencies": {
-                                      "is-number": {
-                                        "version": "4.0.0",
-                                        "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-                                        "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-                                        "dev": true
-                                      }
-                                    }
-                                  },
-                                  "array-slice": {
-                                    "version": "1.1.0",
-                                    "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-                                    "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
-                                    "dev": true
-                                  },
-                                  "array-sort": {
-                                    "version": "1.0.0",
-                                    "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
-                                    "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
-                                    "dev": true,
-                                    "requires": {
-                                      "default-compare": "^1.0.0",
-                                      "get-value": "^2.0.6",
-                                      "kind-of": "^5.0.2"
-                                    },
-                                    "dependencies": {
-                                      "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==",
-                                        "dev": true
-                                      }
-                                    }
-                                  },
-                                  "array-union": {
-                                    "version": "1.0.2",
-                                    "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-                                    "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-                                    "dev": true,
-                                    "requires": {
-                                      "array-uniq": "^1.0.1"
-                                    }
-                                  },
-                                  "array-uniq": {
-                                    "version": "1.0.3",
-                                    "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-                                    "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-                                    "dev": true
-                                  },
-                                  "array-unique": {
-                                    "version": "0.3.2",
-                                    "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-                                    "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-                                    "dev": true
-                                  },
-                                  "arraybuffer.slice": {
-                                    "version": "0.0.7",
-                                    "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
-                                    "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
-                                    "dev": true
-                                  },
-                                  "arrify": {
-                                    "version": "1.0.1",
-                                    "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-                                    "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-                                    "dev": true
-                                  },
-                                  "asap": {
-                                    "version": "2.0.6",
-                                    "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-                                    "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
-                                    "dev": true
-                                  },
-                                  "asn1": {
-                                    "version": "0.2.4",
-                                    "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-                                    "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-                                    "dev": true,
-                                    "requires": {
-                                      "safer-buffer": "~2.1.0"
-                                    }
-                                  },
-                                  "asn1.js": {
-                                    "version": "4.10.1",
-                                    "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-                                    "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
-                                    "dev": true,
-                                    "requires": {
-                                      "bn.js": "^4.0.0",
-                                      "inherits": "^2.0.1",
-                                      "minimalistic-assert": "^1.0.0"
-                                    },
-                                    "dependencies": {
-                                      "bn.js": {
-                                        "version": "4.11.9",
-                                        "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-                                        "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-                                        "dev": true
-                                      }
-                                    }
-                                  },
-                                  "assert": {
-                                    "version": "1.5.0",
-                                    "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-                                    "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
-                                    "dev": true,
-                                    "requires": {
-                                      "object-assign": "^4.1.1",
-                                      "util": "0.10.3"
-                                    },
-                                    "dependencies": {
-                                      "inherits": {
-                                        "version": "2.0.1",
-                                        "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-                                        "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-                                        "dev": true
-                                      },
-                                      "util": {
-                                        "version": "0.10.3",
-                                        "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-                                        "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-                                        "dev": true,
-                                        "requires": {
-                                          "inherits": "2.0.1"
-                                        }
-                                      }
-                                    }
-                                  },
-                                  "assert-plus": {
-                                    "version": "1.0.0",
-                                    "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-                                    "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-                                    "dev": true
-                                  },
-                                  "assign-symbols": {
-                                    "version": "1.0.0",
-                                    "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-                                    "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-                                    "dev": true
-                                  },
-                                  "ast-types-flow": {
-                                    "version": "0.0.7",
-                                    "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-                                    "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
-                                    "dev": true
-                                  },
-                                  "async": {
-                                    "version": "2.6.3",
-                                    "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-                                    "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
-                                    "dev": true,
-                                    "requires": {
-                                      "lodash": "^4.17.14"
-                                    }
-                                  },
-                                  "async-array-reduce": {
-                                    "version": "0.2.1",
-                                    "resolved": "https://registry.npmjs.org/async-array-reduce/-/async-array-reduce-0.2.1.tgz",
-                                    "integrity": "sha1-yL4BCitc0A3qlsgRFgNGk9/dgtE=",
-                                    "dev": true
-                                  },
-                                  "async-done": {
-                                    "version": "1.3.2",
-                                    "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
-                                    "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
-                                    "dev": true,
-                                    "requires": {
-                                      "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==",
-                                    "dev": true
-                                  },
-                                  "async-limiter": {
-                                    "version": "1.0.1",
-                                    "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-                                    "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
-                                    "dev": true
-                                  },
-                                  "async-settle": {
-                                    "version": "1.0.0",
-                                    "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
-                                    "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
-                                    "dev": true,
-                                    "requires": {
-                                      "async-done": "^1.2.2"
-                                    }
-                                  },
-                                  "asynckit": {
-                                    "version": "0.4.0",
-                                    "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-                                    "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",
-                                    "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-                                    "dev": true
-                                  },
-                                  "autoprefixer": {
-                                    "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.8.3",
-                                      "caniuse-lite": "^1.0.30001020",
-                                      "chalk": "^2.4.2",
-                                      "normalize-range": "^0.1.2",
-                                      "num2fraction": "^1.2.2",
-                                      "postcss": "^7.0.26",
-                                      "postcss-value-parser": "^4.0.2"
-                                    }
-                                  },
-                                  "aws-sign2": {
-                                    "version": "0.7.0",
-                                    "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-                                    "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-                                    "dev": true
-                                  },
-                                  "aws4": {
-                                    "version": "1.9.1",
-                                    "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
-                                    "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==",
-                                    "dev": true
-                                  },
-                                  "axobject-query": {
-                                    "version": "2.0.2",
-                                    "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz",
-                                    "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==",
-                                    "dev": true,
-                                    "requires": {
-                                      "ast-types-flow": "0.0.7"
-                                    }
-                                  },
-                                  "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": {
-                                      "find-cache-dir": "^2.0.0",
-                                      "loader-utils": "^1.0.2",
-                                      "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==",
-                                        "dev": true,
-                                        "requires": {
-                                          "commondir": "^1.0.1",
-                                          "make-dir": "^2.0.0",
-                                          "pkg-dir": "^3.0.0"
-                                        },
-                                        "dependencies": {
-                                          "commondir": {
-                                            "version": "1.0.1",
-                                            "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-                                            "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-                                            "dev": true
-                                          },
-                                          "pkg-dir": {
-                                            "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": {
-                                        "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"
-                                        }
-                                      },
-                                      "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"
-                                        }
-                                      },
-                                      "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.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": "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
-                                      },
-                                      "pify": {
-                                        "version": "4.0.1",
-                                        "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-                                        "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-                                        >>>
-                                        >>> > upstream / master "dev": true
-                                      }
-                                    }
-                                  },
-                                  <<
-                                  << << < HEAD "array-slice": {
-                                    "version": "1.1.0",
-                                    "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-                                    "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
-                                    "dev": true
-                                  },
-                                  "array-sort": {
-                                    "version": "1.0.0",
-                                    "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
-                                    "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
-                                    "dev": true,
-                                    "requires": {
-                                      "default-compare": "^1.0.0",
-                                      "get-value": "^2.0.6",
-                                      "kind-of": "^5.0.2"
-                                    },
-                                    "dependencies": {
-                                      "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==",
-                                        "dev": true
-                                      }
-                                    }
-                                  },
-                                  "array-union": {
-                                    "version": "1.0.2",
-                                    "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-                                    "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-                                    "dev": true,
-                                    "requires": {
-                                      "array-uniq": "^1.0.1"
-                                    }
-                                  },
-                                  "array-uniq": {
-                                    "version": "1.0.3",
-                                    "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-                                    "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-                                    "dev": true
-                                  },
-                                  "array-unique": {
-                                    "version": "0.3.2",
-                                    "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-                                    "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
-                                  },
-                                  "arraybuffer.slice": {
-                                    "version": "0.0.7",
-                                    "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
-                                    "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
-                                    "dev": true
-                                  },
-                                  "arrify": {
-                                    "version": "1.0.1",
-                                    "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-                                    "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-                                    "dev": true
-                                  },
-                                  "asap": {
-                                    "version": "2.0.6",
-                                    "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-                                    "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
-                                    "dev": true
-                                  },
-                                  "asn1": {
-                                    "version": "0.2.4",
-                                    "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-                                    "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-                                    "dev": true,
-                                    "requires": {
-                                      "safer-buffer": "~2.1.0"
-                                    }
-                                  },
-                                  "asn1.js": {
-                                    "version": "4.10.1",
-                                    "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-                                    "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
-                                    "dev": true,
-                                    "requires": {
-                                      "bn.js": "^4.0.0",
-                                      "inherits": "^2.0.1",
-                                      "minimalistic-assert": "^1.0.0"
-                                    },
-                                    "dependencies": {
-                                      "bn.js": {
-                                        "version": "4.11.9",
-                                        "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-                                        "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-                                        "dev": true
-                                      }
-                                    }
-                                  },
-                                  "assert": {
-                                    "version": "1.5.0",
-                                    "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-                                    "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
-                                    "dev": true,
-                                    "requires": {
-                                      "object-assign": "^4.1.1",
-                                      "util": "0.10.3"
-                                    },
-                                    "dependencies": {
-                                      "inherits": {
-                                        "version": "2.0.1",
-                                        "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-                                        "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-                                        "dev": true
-                                      },
-                                      "util": {
-                                        "version": "0.10.3",
-                                        "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-                                        "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-                                        "dev": true,
-                                        "requires": {
-                                          "inherits": "2.0.1" ===
-                                            === =
-                                            "babel-plugin-dynamic-import-node": {
-                                              "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"
-                                              }
-                                            },
-                                          "bach": {
-                                            "version": "1.2.0",
-                                            "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
-                                            "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
-                                            "dev": true,
-                                            "requires": {
-                                              "arr-filter": "^1.1.1",
-                                              "arr-flatten": "^1.0.1",
-                                              "arr-map": "^2.0.0",
-                                              "array-each": "^1.0.0",
-                                              "array-initial": "^1.0.0",
-                                              "array-last": "^1.1.1",
-                                              "async-done": "^1.2.2",
-                                              "async-settle": "^1.0.0",
-                                              "now-and-later": "^2.0.0"
-                                            }
-                                          },
-                                          "backo2": {
-                                            "version": "1.0.2",
-                                            "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
-                                            "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
-                                            "dev": true
-                                          },
-                                          "balanced-match": {
-                                            "version": "1.0.0",
-                                            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-                                            "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",
-                                              "component-emitter": "^1.2.1",
-                                              "define-property": "^1.0.0",
-                                              "isobject": "^3.0.1",
-                                              "mixin-deep": "^1.2.0",
-                                              "pascalcase": "^0.1.1"
-                                            },
-                                            "dependencies": {
-                                              "define-property": {
-                                                "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"
-                                                }
-                                              },
-                                              "is-accessor-descriptor": {
-                                                "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"
-                                                }
-                                              },
-                                              "is-data-descriptor": {
-                                                "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"
-                                                }
-                                              },
-                                              "is-descriptor": {
-                                                "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",
-                                                  "kind-of": "^6.0.2" >>>
-                                                    >>> > upstream / master
-                                                }
-                                              }
-                                            }
-                                          },
-                                          <<
-                                          << << < HEAD "assert-plus": {
-                                            "version": "1.0.0",
-                                            "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-                                            "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-                                            "dev": true
-                                          },
-                                          "assign-symbols": {
-                                            "version": "1.0.0",
-                                            "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-                                            "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
-                                          },
-                                          "ast-types-flow": {
-                                            "version": "0.0.7",
-                                            "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-                                            "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
-                                            "dev": true
-                                          },
-                                          "async": {
-                                            "version": "2.6.3",
-                                            "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-                                            "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
-                                            "dev": true,
-                                            "requires": {
-                                              "lodash": "^4.17.14"
-                                            }
-                                          },
-                                          "async-array-reduce": {
-                                            "version": "0.2.1",
-                                            "resolved": "https://registry.npmjs.org/async-array-reduce/-/async-array-reduce-0.2.1.tgz",
-                                            "integrity": "sha1-yL4BCitc0A3qlsgRFgNGk9/dgtE=",
-                                            "dev": true
-                                          },
-                                          "async-done": {
-                                            "version": "1.3.2",
-                                            "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
-                                            "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
-                                            "dev": true,
-                                            "requires": {
-                                              "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==",
-                                            "dev": true
-                                          },
-                                          "async-limiter": {
-                                            "version": "1.0.1",
-                                            "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-                                            "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
-                                            "dev": true
-                                          },
-                                          "async-settle": {
-                                            "version": "1.0.0",
-                                            "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
-                                            "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
-                                            "dev": true,
-                                            "requires": {
-                                              "async-done": "^1.2.2"
-                                            }
-                                          },
-                                          "asynckit": {
-                                            "version": "0.4.0",
-                                            "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-                                            "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",
-                                            "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
-                                          },
-                                          "autoprefixer": {
-                                            "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.8.3",
-                                              "caniuse-lite": "^1.0.30001020",
-                                              "chalk": "^2.4.2",
-                                              "normalize-range": "^0.1.2",
-                                              "num2fraction": "^1.2.2",
-                                              "postcss": "^7.0.26",
-                                              "postcss-value-parser": "^4.0.2"
-                                            }
-                                          },
-                                          "aws-sign2": {
-                                            "version": "0.7.0",
-                                            "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-                                            "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-                                            "dev": true
-                                          },
-                                          "aws4": {
-                                            "version": "1.9.1",
-                                            "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
-                                            "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==",
-                                            "dev": true
-                                          },
-                                          "axobject-query": {
-                                            "version": "2.0.2",
-                                            "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz",
-                                            "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==",
-                                            "dev": true,
-                                            "requires": {
-                                              "ast-types-flow": "0.0.7"
-                                            }
-                                          },
-                                          "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": {
-                                              "find-cache-dir": "^2.0.0",
-                                              "loader-utils": "^1.0.2",
-                                              "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==",
-                                                "dev": true,
-                                                "requires": {
-                                                  "commondir": "^1.0.1",
-                                                  "make-dir": "^2.0.0",
-                                                  "pkg-dir": "^3.0.0"
-                                                },
-                                                "dependencies": {
-                                                  "commondir": {
-                                                    "version": "1.0.1",
-                                                    "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-                                                    "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-                                                    "dev": true
-                                                  },
-                                                  "pkg-dir": {
-                                                    "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": {
-                                                "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"
-                                                }
-                                              },
-                                              "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"
-                                                }
-                                              },
-                                              "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.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": "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
-                                              },
-                                              "pify": {
-                                                "version": "4.0.1",
-                                                "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-                                                "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-                                                ===
-                                                === =
-                                                "base64-arraybuffer": {
-                                                  "version": "0.1.5",
-                                                  "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
-                                                  "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
-                                                  "dev": true
-                                                },
-                                                "base64-js": {
-                                                  "version": "1.3.1",
-                                                  "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-                                                  "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
-                                                  "dev": true
-                                                },
-                                                "base64id": {
-                                                  "version": "1.0.0",
-                                                  "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
-                                                  "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
-                                                  "dev": true
-                                                },
-                                                "batch": {
-                                                  "version": "0.6.1",
-                                                  "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-                                                  "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
-                                                  "dev": true
-                                                },
-                                                "bcrypt-pbkdf": {
-                                                  "version": "1.0.2",
-                                                  "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-                                                  "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-                                                  "dev": true,
-                                                  "requires": {
-                                                    "tweetnacl": "^0.14.3"
-                                                  }
-                                                },
-                                                "better-assert": {
-                                                  "version": "1.0.2",
-                                                  "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
-                                                  "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
-                                                  "dev": true,
-                                                  "requires": {
-                                                    "callsite": "1.0.0"
-                                                  }
-                                                },
-                                                "big.js": {
-                                                  "version": "5.2.2",
-                                                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-                                                  "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
-                                                },
-                                                "binary-extensions": {
-                                                  "version": "1.13.1",
-                                                  "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-                                                  "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-                                                  "dev": true
-                                                },
-                                                "blob": {
-                                                  "version": "0.0.5",
-                                                  "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
-                                                  "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==",
-                                                  "dev": true
-                                                },
-                                                "blocking-proxy": {
-                                                  "version": "1.0.1",
-                                                  "resolved": "https://registry.npmjs.org/blocking-proxy/-/blocking-proxy-1.0.1.tgz",
-                                                  "integrity": "sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==",
-                                                  "dev": true,
-                                                  "requires": {
-                                                    "minimist": "^1.2.0"
-                                                  }
-                                                },
-                                                "bluebird": {
-                                                  "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": {
-                                                  "version": "5.1.2",
-                                                  "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz",
-                                                  "integrity": "sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==",
-                                                  "dev": true
-                                                },
-                                                "body-parser": {
-                                                  "version": "1.19.0",
-                                                  "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-                                                  "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
-                                                  "dev": true,
-                                                  "requires": {
-                                                    "bytes": "3.1.0",
-                                                    "content-type": "~1.0.4",
-                                                    "debug": "2.6.9",
-                                                    "depd": "~1.1.2",
-                                                    "http-errors": "1.7.2",
-                                                    "iconv-lite": "0.4.24",
-                                                    "on-finished": "~2.3.0",
-                                                    "qs": "6.7.0",
-                                                    "raw-body": "2.4.0",
-                                                    "type-is": "~1.6.17"
-                                                  },
-                                                  "dependencies": {
-                                                    "bytes": {
-                                                      "version": "3.1.0",
-                                                      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-                                                      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
-                                                      "dev": true
-                                                    },
-                                                    "qs": {
-                                                      "version": "6.7.0",
-                                                      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-                                                      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-                                                      "dev": true
-                                                    }
-                                                  }
-                                                },
-                                                "bonjour": {
-                                                  "version": "3.5.0",
-                                                  "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
-                                                  "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
-                                                  "dev": true,
-                                                  "requires": {
-                                                    "array-flatten": "^2.1.0",
-                                                    "deep-equal": "^1.0.1",
-                                                    "dns-equal": "^1.0.0",
-                                                    "dns-txt": "^2.0.2",
-                                                    "multicast-dns": "^6.0.1",
-                                                    "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": "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": "^3.0.0",
-                                                    "cli-boxes": "^2.2.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": "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": {
-                                                      "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": "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"
-                                                      }
-                                                    },
-                                                    "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.8.1",
-                                                      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-                                                      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-                                                      >>>
-                                                      >>> > upstream / master "dev": true
-                                                    }
-                                                  }
-                                                },
-                                                <<
-                                                << << < HEAD "babel-plugin-dynamic-import-node": {
-                                                  "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"
-                                                  }
-                                                },
-                                                "bach": {
-                                                  "version": "1.2.0",
-                                                  "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
-                                                  "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
-                                                  "dev": true,
-                                                  "requires": {
-                                                    "arr-filter": "^1.1.1",
-                                                    "arr-flatten": "^1.0.1",
-                                                    "arr-map": "^2.0.0",
-                                                    "array-each": "^1.0.0",
-                                                    "array-initial": "^1.0.0",
-                                                    "array-last": "^1.1.1",
-                                                    "async-done": "^1.2.2",
-                                                    "async-settle": "^1.0.0",
-                                                    "now-and-later": "^2.0.0"
-                                                  }
-                                                },
-                                                "backo2": {
-                                                  "version": "1.0.2",
-                                                  "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
-                                                  "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
-                                                  "dev": true
-                                                },
-                                                "balanced-match": {
-                                                  "version": "1.0.0",
-                                                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-                                                  "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==",
-                                                  "requires": {
-                                                    "cache-base": "^1.0.1",
-                                                    "class-utils": "^0.3.5",
-                                                    "component-emitter": "^1.2.1",
-                                                    "define-property": "^1.0.0",
-                                                    "isobject": "^3.0.1",
-                                                    "mixin-deep": "^1.2.0",
-                                                    "pascalcase": "^0.1.1"
-                                                  },
-                                                  "dependencies": {
-                                                    "define-property": {
-                                                      "version": "1.0.0",
-                                                      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-                                                      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-                                                      "requires": {
-                                                        "is-descriptor": "^1.0.0"
-                                                      }
-                                                    },
-                                                    "is-accessor-descriptor": {
-                                                      "version": "1.0.0",
-                                                      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-                                                      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-                                                      "requires": {
-                                                        "kind-of": "^6.0.0"
-                                                      }
-                                                    },
-                                                    "is-data-descriptor": {
-                                                      "version": "1.0.0",
-                                                      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-                                                      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-                                                      "requires": {
-                                                        "kind-of": "^6.0.0"
-                                                      }
-                                                    },
-                                                    "is-descriptor": {
-                                                      "version": "1.0.2",
-                                                      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-                                                      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-                                                      "requires": {
-                                                        "is-accessor-descriptor": "^1.0.0",
-                                                        "is-data-descriptor": "^1.0.0",
-                                                        "kind-of": "^6.0.2"
-                                                      }
-                                                    }
-                                                  }
-                                                },
-                                                "base64-arraybuffer": {
-                                                  "version": "0.1.5",
-                                                  "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
-                                                  "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
-                                                  "dev": true
-                                                },
-                                                "base64-js": {
-                                                  "version": "1.3.1",
-                                                  "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-                                                  "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
-                                                  "dev": true
-                                                },
-                                                "base64id": {
-                                                  "version": "1.0.0",
-                                                  "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
-                                                  "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
-                                                  "dev": true
-                                                },
-                                                "batch": {
-                                                  "version": "0.6.1",
-                                                  "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-                                                  "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
-                                                  "dev": true
-                                                },
-                                                "bcrypt-pbkdf": {
-                                                  "version": "1.0.2",
-                                                  "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-                                                  "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-                                                  "dev": true,
-                                                  "requires": {
-                                                    "tweetnacl": "^0.14.3"
-                                                  }
-                                                },
-                                                "better-assert": {
-                                                  "version": "1.0.2",
-                                                  "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
-                                                  "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
-                                                  "dev": true,
-                                                  "requires": {
-                                                    "callsite": "1.0.0"
-                                                  }
-                                                },
-                                                "big.js": {
-                                                  "version": "5.2.2",
-                                                  "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-                                                  "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
-                                                },
-                                                "binary-extensions": {
-                                                  "version": "1.13.1",
-                                                  "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-                                                  "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-                                                  "dev": true
-                                                },
-                                                "blob": {
-                                                  "version": "0.0.5",
-                                                  "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
-                                                  "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==",
-                                                  "dev": true
-                                                },
-                                                "blocking-proxy": {
-                                                  "version": "1.0.1",
-                                                  "resolved": "https://registry.npmjs.org/blocking-proxy/-/blocking-proxy-1.0.1.tgz",
-                                                  "integrity": "sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==",
-                                                  "dev": true,
-                                                  "requires": {
-                                                    "minimist": "^1.2.0"
-                                                  }
-                                                },
-                                                "bluebird": {
-                                                  "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": {
-                                                  "version": "5.1.2",
-                                                  "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz",
-                                                  "integrity": "sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==",
-                                                  "dev": true
-                                                },
-                                                "body-parser": {
-                                                  "version": "1.19.0",
-                                                  "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-                                                  "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
-                                                  "dev": true,
-                                                  "requires": {
-                                                    "bytes": "3.1.0",
-                                                    "content-type": "~1.0.4",
-                                                    "debug": "2.6.9",
-                                                    "depd": "~1.1.2",
-                                                    "http-errors": "1.7.2",
-                                                    "iconv-lite": "0.4.24",
-                                                    "on-finished": "~2.3.0",
-                                                    "qs": "6.7.0",
-                                                    "raw-body": "2.4.0",
-                                                    "type-is": "~1.6.17"
-                                                  },
-                                                  "dependencies": {
-                                                    "bytes": {
-                                                      "version": "3.1.0",
-                                                      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-                                                      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
-                                                      "dev": true
-                                                    },
-                                                    "qs": {
-                                                      "version": "6.7.0",
-                                                      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-                                                      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-                                                      "dev": true
-                                                    }
-                                                  }
-                                                },
-                                                "bonjour": {
-                                                  "version": "3.5.0",
-                                                  "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
-                                                  "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
-                                                  "dev": true,
-                                                  "requires": {
-                                                    "array-flatten": "^2.1.0",
-                                                    "deep-equal": "^1.0.1",
-                                                    "dns-equal": "^1.0.0",
-                                                    "dns-txt": "^2.0.2",
-                                                    "multicast-dns": "^6.0.1",
-                                                    "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": "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": "^3.0.0",
-                                                    "cli-boxes": "^2.2.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": "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": {
-                                                      "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": "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"
-                                                      }
-                                                    },
-                                                    "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.8.1",
-                                                      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-                                                      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-                                                      ===
-                                                      === =
-                                                      "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,
-                                                        "requires": {
-                                                          "balanced-match": "^1.0.0",
-                                                          "concat-map": "0.0.1"
-                                                        }
-                                                      },
-                                                      "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"
-                                                        }
-                                                      },
-                                                      "brorand": {
-                                                        "version": "1.1.0",
-                                                        "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-                                                        "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
-                                                        "dev": true
-                                                      },
-                                                      "browserify-aes": {
-                                                        "version": "1.2.0",
-                                                        "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-                                                        "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-                                                        "dev": true,
-                                                        "requires": {
-                                                          "buffer-xor": "^1.0.3",
-                                                          "cipher-base": "^1.0.0",
-                                                          "create-hash": "^1.1.0",
-                                                          "evp_bytestokey": "^1.0.3",
-                                                          "inherits": "^2.0.1",
-                                                          "safe-buffer": "^5.0.1"
-                                                        }
-                                                      },
-                                                      "browserify-cipher": {
-                                                        "version": "1.0.1",
-                                                        "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-                                                        "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-                                                        "dev": true,
-                                                        "requires": {
-                                                          "browserify-aes": "^1.0.4",
-                                                          "browserify-des": "^1.0.0",
-                                                          "evp_bytestokey": "^1.0.0"
-                                                        }
-                                                      },
-                                                      "browserify-des": {
-                                                        "version": "1.0.2",
-                                                        "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-                                                        "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-                                                        "dev": true,
-                                                        "requires": {
-                                                          "cipher-base": "^1.0.1",
-                                                          "des.js": "^1.0.0",
-                                                          "inherits": "^2.0.1",
-                                                          "safe-buffer": "^5.1.2"
-                                                        }
-                                                      },
-                                                      "browserify-rsa": {
-                                                        "version": "4.0.1",
-                                                        "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-                                                        "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
-                                                        "dev": true,
-                                                        "requires": {
-                                                          "bn.js": "^4.1.0",
-                                                          "randombytes": "^2.0.1"
-                                                        },
-                                                        "dependencies": {
-                                                          "bn.js": {
-                                                            "version": "4.11.9",
-                                                            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-                                                            "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-                                                            "dev": true
-                                                          }
-                                                        }
-                                                      },
-                                                      "browserify-sign": {
-                                                        "version": "4.2.0",
-                                                        "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.0.tgz",
-                                                        "integrity": "sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA==",
-                                                        "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",
-                                                          "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
-                                                          }
-                                                        }
-                                                      },
-                                                      "browserify-zlib": {
-                                                        "version": "0.2.0",
-                                                        "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-                                                        "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-                                                        "dev": true,
-                                                        "requires": {
-                                                          "pako": "~1.0.5"
-                                                        }
-                                                      },
-                                                      "browserslist": {
-                                                        "version": "4.12.0",
-                                                        "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz",
-                                                        "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==",
-                                                        "dev": true,
-                                                        "requires": {
-                                                          "caniuse-lite": "^1.0.30001043",
-                                                          "electron-to-chromium": "^1.3.413",
-                                                          "node-releases": "^1.1.53",
-                                                          "pkg-up": "^2.0.0"
-                                                        }
-                                                      },
-                                                      "browserstack": {
-                                                        "version": "1.5.3",
-                                                        "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.5.3.tgz",
-                                                        "integrity": "sha512-AO+mECXsW4QcqC9bxwM29O7qWa7bJT94uBFzeb5brylIQwawuEziwq20dPYbins95GlWzOawgyDNdjYAo32EKg==",
-                                                        "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==",
-                                                            >>>
-                                                            >>> > upstream / master "dev": true
-                                                          }
-                                                        }
-                                                      },
-                                                      <<
-                                                      << << < HEAD "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,
-                                                        "requires": {
-                                                          "balanced-match": "^1.0.0",
-                                                          "concat-map": "0.0.1"
-                                                        }
-                                                      },
-                                                      "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"
-                                                        }
-                                                      },
-                                                      "brorand": {
-                                                        "version": "1.1.0",
-                                                        "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-                                                        "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
-                                                        "dev": true
-                                                      },
-                                                      "browserify-aes": {
-                                                        "version": "1.2.0",
-                                                        "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-                                                        "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-                                                        "dev": true,
-                                                        "requires": {
-                                                          "buffer-xor": "^1.0.3",
-                                                          "cipher-base": "^1.0.0",
-                                                          "create-hash": "^1.1.0",
-                                                          "evp_bytestokey": "^1.0.3",
-                                                          "inherits": "^2.0.1",
-                                                          "safe-buffer": "^5.0.1"
-                                                        }
-                                                      },
-                                                      "browserify-cipher": {
-                                                        "version": "1.0.1",
-                                                        "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-                                                        "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-                                                        "dev": true,
-                                                        "requires": {
-                                                          "browserify-aes": "^1.0.4",
-                                                          "browserify-des": "^1.0.0",
-                                                          "evp_bytestokey": "^1.0.0"
-                                                        }
-                                                      },
-                                                      "browserify-des": {
-                                                        "version": "1.0.2",
-                                                        "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-                                                        "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-                                                        "dev": true,
-                                                        "requires": {
-                                                          "cipher-base": "^1.0.1",
-                                                          "des.js": "^1.0.0",
-                                                          "inherits": "^2.0.1",
-                                                          "safe-buffer": "^5.1.2"
-                                                        }
-                                                      },
-                                                      "browserify-rsa": {
-                                                        "version": "4.0.1",
-                                                        "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-                                                        "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
-                                                        "dev": true,
-                                                        "requires": {
-                                                          "bn.js": "^4.1.0",
-                                                          "randombytes": "^2.0.1"
-                                                        },
-                                                        "dependencies": {
-                                                          "bn.js": {
-                                                            "version": "4.11.9",
-                                                            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-                                                            "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-                                                            "dev": true
-                                                          }
-                                                        }
-                                                      },
-                                                      "browserify-sign": {
-                                                        "version": "4.2.0",
-                                                        "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.0.tgz",
-                                                        "integrity": "sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA==",
-                                                        "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",
-                                                          "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
-                                                          }
-                                                        }
-                                                      },
-                                                      "browserify-zlib": {
-                                                        "version": "0.2.0",
-                                                        "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-                                                        "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-                                                        "dev": true,
-                                                        "requires": {
-                                                          "pako": "~1.0.5"
-                                                        }
-                                                      },
-                                                      "browserslist": {
-                                                        "version": "4.12.0",
-                                                        "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz",
-                                                        "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==",
-                                                        "dev": true,
-                                                        "requires": {
-                                                          "caniuse-lite": "^1.0.30001043",
-                                                          "electron-to-chromium": "^1.3.413",
-                                                          "node-releases": "^1.1.53",
-                                                          "pkg-up": "^2.0.0"
-                                                        }
-                                                      },
-                                                      "browserstack": {
-                                                        "version": "1.5.3",
-                                                        "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.5.3.tgz",
-                                                        "integrity": "sha512-AO+mECXsW4QcqC9bxwM29O7qWa7bJT94uBFzeb5brylIQwawuEziwq20dPYbins95GlWzOawgyDNdjYAo32EKg==",
-                                                        "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.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": "^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==",
-                                                            ===
-                                                            === =
-                                                            "browserstack-local": {
-                                                              "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": "^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.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",
-                                                                "ieee754": "^1.1.4",
-                                                                "isarray": "^1.0.0"
-                                                              }
-                                                            },
-                                                            "buffer-crc32": {
-                                                              "version": "0.2.13",
-                                                              "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-                                                              "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-                                                              "dev": true
-                                                            },
-                                                            "buffer-equal": {
-                                                              "version": "1.0.0",
-                                                              "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-                                                              "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
-                                                              "dev": true
-                                                            },
-                                                            "buffer-from": {
-                                                              "version": "1.1.1",
-                                                              "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-                                                              "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-                                                              "dev": true
-                                                            },
-                                                            "buffer-indexof": {
-                                                              "version": "1.1.1",
-                                                              "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
-                                                              "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
-                                                              "dev": true
-                                                            },
-                                                            "buffer-xor": {
-                                                              "version": "1.0.3",
-                                                              "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-                                                              "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-                                                              "dev": true
-                                                            },
-                                                            "builtin-modules": {
-                                                              "version": "3.1.0",
-                                                              "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz",
-                                                              "integrity": "sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==",
-                                                              "dev": true
-                                                            },
-                                                            "builtin-status-codes": {
-                                                              "version": "3.0.0",
-                                                              "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-                                                              "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-                                                              "dev": true
-                                                            },
-                                                            "builtins": {
-                                                              "version": "1.0.3",
-                                                              "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
-                                                              "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=",
-                                                              "dev": true
-                                                            },
-                                                            "bytes": {
-                                                              "version": "3.0.0",
-                                                              "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-                                                              "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-                                                              "dev": true
-                                                            },
-                                                            "cacache": {
-                                                              "version": "15.0.0",
-                                                              "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.0.tgz",
-                                                              "integrity": "sha512-L0JpXHhplbJSiDGzyJJnJCTL7er7NzbBgxzVqLswEb4bO91Zbv17OUMuUeu/q0ZwKn3V+1HM4wb9tO4eVE/K8g==",
-                                                              "dev": true,
-                                                              "requires": {
-                                                                "chownr": "^1.1.2",
-                                                                "fs-minipass": "^2.0.0",
-                                                                "glob": "^7.1.4",
-                                                                "infer-owner": "^1.0.4",
-                                                                "lru-cache": "^5.1.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.7.1",
-                                                                "ssri": "^8.0.0",
-                                                                "tar": "^6.0.1",
-                                                                "unique-filename": "^1.1.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"
-                                                                  },
-                                                                  "dependencies": {
-                                                                    "fs.realpath": {
-                                                                      "version": "1.0.0",
-                                                                      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-                                                                      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-                                                                      "dev": true
-                                                                    },
-                                                                    "inflight": {
-                                                                      "version": "1.0.6",
-                                                                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-                                                                      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "once": "^1.3.0",
-                                                                        "wrappy": "1"
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                },
-                                                                "minipass": {
-                                                                  "version": "3.1.3",
-                                                                  "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-                                                                  "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
-                                                                  "dev": true,
-                                                                  "requires": {
-                                                                    "yallist": "^4.0.0"
-                                                                  }
-                                                                },
-                                                                "mkdirp": {
-                                                                  "version": "1.0.4",
-                                                                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-                                                                  "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-                                                                  "dev": true
-                                                                }
-                                                              }
-                                                            },
-                                                            "cache-base": {
-                                                              "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",
-                                                                "get-value": "^2.0.6",
-                                                                "has-value": "^1.0.0",
-                                                                "isobject": "^3.0.1",
-                                                                "set-value": "^2.0.0",
-                                                                "to-object-path": "^0.3.0",
-                                                                "union-value": "^1.0.0",
-                                                                "unset-value": "^1.0.0"
-                                                              }
-                                                            },
-                                                            "cacheable-request": {
-                                                              "version": "6.1.0",
-                                                              "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
-                                                              "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
-                                                              "dev": true,
-                                                              "requires": {
-                                                                "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": {
-                                                                  "version": "5.1.0",
-                                                                  "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-                                                                  "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
-                                                                  "dev": true,
-                                                                  "requires": {
-                                                                    "pump": "^3.0.0"
-                                                                  }
-                                                                },
-                                                                "http-cache-semantics": {
-                                                                  "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
-                                                                },
-                                                                "lowercase-keys": {
-                                                                  "version": "2.0.0",
-                                                                  "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-                                                                  "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-                                                                  "dev": true
-                                                                },
-                                                                "normalize-url": {
-                                                                  "version": "4.5.0",
-                                                                  "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
-                                                                  "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
-                                                                  "dev": true
-                                                                },
-                                                                "pump": {
-                                                                  "version": "3.0.0",
-                                                                  "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-                                                                  "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-                                                                  "dev": true,
-                                                                  "requires": {
-                                                                    "end-of-stream": "^1.1.0",
-                                                                    "once": "^1.3.1"
-                                                                  }
-                                                                }
-                                                              }
-                                                            },
-                                                            "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==",
-                                                                  >>>
-                                                                  >>> > upstream / master "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
-                                                                }
-                                                              }
-                                                            },
-                                                            <<
-                                                            << << < HEAD "buffer": {
-                                                              "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",
-                                                                "ieee754": "^1.1.4",
-                                                                "isarray": "^1.0.0"
-                                                              }
-                                                            },
-                                                            "buffer-crc32": {
-                                                              "version": "0.2.13",
-                                                              "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-                                                              "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-                                                              "dev": true
-                                                            },
-                                                            "buffer-equal": {
-                                                              "version": "1.0.0",
-                                                              "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-                                                              "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
-                                                              "dev": true
-                                                            },
-                                                            "buffer-from": {
-                                                              "version": "1.1.1",
-                                                              "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-                                                              "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-                                                              "dev": true
-                                                            },
-                                                            "buffer-indexof": {
-                                                              "version": "1.1.1",
-                                                              "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
-                                                              "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
-                                                              "dev": true
-                                                            },
-                                                            "buffer-xor": {
-                                                              "version": "1.0.3",
-                                                              "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-                                                              "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-                                                              "dev": true
-                                                            },
-                                                            "builtin-modules": {
-                                                              "version": "3.1.0",
-                                                              "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz",
-                                                              "integrity": "sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==",
-                                                              "dev": true
-                                                            },
-                                                            "builtin-status-codes": {
-                                                              "version": "3.0.0",
-                                                              "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-                                                              "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-                                                              "dev": true
-                                                            },
-                                                            "builtins": {
-                                                              "version": "1.0.3",
-                                                              "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
-                                                              "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=",
-                                                              "dev": true
-                                                            },
-                                                            "bytes": {
-                                                              "version": "3.0.0",
-                                                              "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-                                                              "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-                                                              "dev": true
-                                                            },
-                                                            "cacache": {
-                                                              "version": "15.0.0",
-                                                              "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.0.tgz",
-                                                              "integrity": "sha512-L0JpXHhplbJSiDGzyJJnJCTL7er7NzbBgxzVqLswEb4bO91Zbv17OUMuUeu/q0ZwKn3V+1HM4wb9tO4eVE/K8g==",
-                                                              "dev": true,
-                                                              "requires": {
-                                                                "chownr": "^1.1.2",
-                                                                "fs-minipass": "^2.0.0",
-                                                                "glob": "^7.1.4",
-                                                                "infer-owner": "^1.0.4",
-                                                                "lru-cache": "^5.1.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.7.1",
-                                                                "ssri": "^8.0.0",
-                                                                "tar": "^6.0.1",
-                                                                "unique-filename": "^1.1.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"
-                                                                  },
-                                                                  "dependencies": {
-                                                                    "fs.realpath": {
-                                                                      "version": "1.0.0",
-                                                                      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-                                                                      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-                                                                      "dev": true
-                                                                    },
-                                                                    "inflight": {
-                                                                      "version": "1.0.6",
-                                                                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-                                                                      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "once": "^1.3.0",
-                                                                        "wrappy": "1"
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                },
-                                                                "minipass": {
-                                                                  "version": "3.1.3",
-                                                                  "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-                                                                  "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
-                                                                  "dev": true,
-                                                                  "requires": {
-                                                                    "yallist": "^4.0.0"
-                                                                  }
-                                                                },
-                                                                "mkdirp": {
-                                                                  "version": "1.0.4",
-                                                                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-                                                                  "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-                                                                  "dev": true
-                                                                }
-                                                              }
-                                                            },
-                                                            "cache-base": {
-                                                              "version": "1.0.1",
-                                                              "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-                                                              "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-                                                              "requires": {
-                                                                "collection-visit": "^1.0.0",
-                                                                "component-emitter": "^1.2.1",
-                                                                "get-value": "^2.0.6",
-                                                                "has-value": "^1.0.0",
-                                                                "isobject": "^3.0.1",
-                                                                "set-value": "^2.0.0",
-                                                                "to-object-path": "^0.3.0",
-                                                                "union-value": "^1.0.0",
-                                                                "unset-value": "^1.0.0"
-                                                              }
-                                                            },
-                                                            "cacheable-request": {
-                                                              "version": "6.1.0",
-                                                              "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
-                                                              "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
-                                                              "dev": true,
-                                                              "requires": {
-                                                                "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": {
-                                                                  "version": "5.1.0",
-                                                                  "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-                                                                  "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
-                                                                  "dev": true,
-                                                                  "requires": {
-                                                                    "pump": "^3.0.0"
-                                                                  }
-                                                                },
-                                                                "http-cache-semantics": {
-                                                                  "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
-                                                                },
-                                                                "lowercase-keys": {
-                                                                  "version": "2.0.0",
-                                                                  "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-                                                                  "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-                                                                  "dev": true
-                                                                },
-                                                                "normalize-url": {
-                                                                  "version": "4.5.0",
-                                                                  "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
-                                                                  "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
-                                                                  "dev": true
-                                                                },
-                                                                "pump": {
-                                                                  "version": "3.0.0",
-                                                                  "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-                                                                  "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-                                                                  "dev": true,
-                                                                  "requires": {
-                                                                    "end-of-stream": "^1.1.0",
-                                                                    "once": "^1.3.1" ===
-                                                                      === =
-                                                                      "call-me-maybe": {
-                                                                        "version": "1.0.1",
-                                                                        "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
-                                                                        "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
-                                                                        "dev": true
-                                                                      },
-                                                                    "caller-callsite": {
-                                                                      "version": "2.0.0",
-                                                                      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
-                                                                      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "callsites": "^2.0.0"
-                                                                      }
-                                                                    },
-                                                                    "caller-path": {
-                                                                      "version": "2.0.0",
-                                                                      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-                                                                      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "caller-callsite": "^2.0.0"
-                                                                      }
-                                                                    },
-                                                                    "callsite": {
-                                                                      "version": "1.0.0",
-                                                                      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
-                                                                      "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=",
-                                                                      "dev": true
-                                                                    },
-                                                                    "callsites": {
-                                                                      "version": "2.0.0",
-                                                                      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-                                                                      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
-                                                                      "dev": true
-                                                                    },
-                                                                    "camelcase": {
-                                                                      "version": "5.3.1",
-                                                                      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-                                                                      "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.30001079",
-                                                                      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001079.tgz",
-                                                                      "integrity": "sha512-2KaYheg0iOY+CMmDuAB3DHehrXhhb4OZU4KBVGDr/YKyYAcpudaiUQ9PJ9rxrPlKEoJ3ATasQ5AN48MqpwS43Q==",
-                                                                      "dev": true
-                                                                    },
-                                                                    "canonical-path": {
-                                                                      "version": "1.0.0",
-                                                                      "resolved": "https://registry.npmjs.org/canonical-path/-/canonical-path-1.0.0.tgz",
-                                                                      "integrity": "sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==",
-                                                                      "dev": true
-                                                                    },
-                                                                    "caseless": {
-                                                                      "version": "0.12.0",
-                                                                      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-                                                                      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-                                                                      "dev": true
-                                                                    },
-                                                                    "chalk": {
-                                                                      "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.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"
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    "chardet": {
-                                                                      "version": "0.7.0",
-                                                                      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-                                                                      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-                                                                      "dev": true
-                                                                    },
-                                                                    "chokidar": {
-                                                                      "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",
-                                                                        "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.4.0"
-                                                                      },
-                                                                      "dependencies": {
-                                                                        "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"
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    "chownr": {
-                                                                      "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": {
-                                                                      "version": "1.0.2",
-                                                                      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
-                                                                      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "tslib": "^1.9.0"
-                                                                      }
-                                                                    },
-                                                                    "ci-info": {
-                                                                      "version": "2.0.0",
-                                                                      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-                                                                      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-                                                                      "dev": true
-                                                                    },
-                                                                    "cipher-base": {
-                                                                      "version": "1.0.4",
-                                                                      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-                                                                      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "inherits": "^2.0.1",
-                                                                        "safe-buffer": "^5.0.1"
-                                                                      }
-                                                                    },
-                                                                    "circular-dependency-plugin": {
-                                                                      "version": "5.2.0",
-                                                                      "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz",
-                                                                      "integrity": "sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw==",
-                                                                      "dev": true
-                                                                    },
-                                                                    "circular-json": {
-                                                                      "version": "0.5.9",
-                                                                      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz",
-                                                                      "integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ=="
-                                                                    },
-                                                                    "class-utils": {
-                                                                      "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",
-                                                                        "isobject": "^3.0.0",
-                                                                        "static-extend": "^0.1.1"
-                                                                      },
-                                                                      "dependencies": {
-                                                                        "define-property": {
-                                                                          "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" >>>
-                                                                              >>> > upstream / master
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    <<
-                                                                    << << < HEAD "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
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    "call-me-maybe": {
-                                                                      "version": "1.0.1",
-                                                                      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
-                                                                      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
-                                                                      "dev": true
-                                                                    },
-                                                                    "caller-callsite": {
-                                                                      "version": "2.0.0",
-                                                                      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
-                                                                      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "callsites": "^2.0.0"
-                                                                      }
-                                                                    },
-                                                                    "caller-path": {
-                                                                      "version": "2.0.0",
-                                                                      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-                                                                      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "caller-callsite": "^2.0.0"
-                                                                      }
-                                                                    },
-                                                                    "callsite": {
-                                                                      "version": "1.0.0",
-                                                                      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
-                                                                      "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=",
-                                                                      "dev": true
-                                                                    },
-                                                                    "callsites": {
-                                                                      "version": "2.0.0",
-                                                                      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-                                                                      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
-                                                                      "dev": true
-                                                                    },
-                                                                    "camelcase": {
-                                                                      "version": "5.3.1",
-                                                                      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-                                                                      "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.30001079",
-                                                                      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001079.tgz",
-                                                                      "integrity": "sha512-2KaYheg0iOY+CMmDuAB3DHehrXhhb4OZU4KBVGDr/YKyYAcpudaiUQ9PJ9rxrPlKEoJ3ATasQ5AN48MqpwS43Q==",
-                                                                      "dev": true
-                                                                    },
-                                                                    "canonical-path": {
-                                                                      "version": "1.0.0",
-                                                                      "resolved": "https://registry.npmjs.org/canonical-path/-/canonical-path-1.0.0.tgz",
-                                                                      "integrity": "sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==",
-                                                                      "dev": true
-                                                                    },
-                                                                    "caseless": {
-                                                                      "version": "0.12.0",
-                                                                      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-                                                                      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-                                                                      "dev": true
-                                                                    },
-                                                                    "chalk": {
-                                                                      "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.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"
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    "chardet": {
-                                                                      "version": "0.7.0",
-                                                                      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-                                                                      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-                                                                      "dev": true
-                                                                    },
-                                                                    "chokidar": {
-                                                                      "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",
-                                                                        "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.4.0"
-                                                                      },
-                                                                      "dependencies": {
-                                                                        "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"
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    "chownr": {
-                                                                      "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": {
-                                                                      "version": "1.0.2",
-                                                                      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
-                                                                      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "tslib": "^1.9.0"
-                                                                      }
-                                                                    },
-                                                                    "ci-info": {
-                                                                      "version": "2.0.0",
-                                                                      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-                                                                      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-                                                                      "dev": true
-                                                                    },
-                                                                    "cipher-base": {
-                                                                      "version": "1.0.4",
-                                                                      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-                                                                      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "inherits": "^2.0.1",
-                                                                        "safe-buffer": "^5.0.1"
-                                                                      }
-                                                                    },
-                                                                    "circular-dependency-plugin": {
-                                                                      "version": "5.2.0",
-                                                                      "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz",
-                                                                      "integrity": "sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw==",
-                                                                      "dev": true
-                                                                    },
-                                                                    "circular-json": {
-                                                                      "version": "0.5.9",
-                                                                      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz",
-                                                                      "integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ=="
-                                                                    },
-                                                                    "class-utils": {
-                                                                      "version": "0.3.6",
-                                                                      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-                                                                      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-                                                                      "requires": {
-                                                                        "arr-union": "^3.1.0",
-                                                                        "define-property": "^0.2.5",
-                                                                        "isobject": "^3.0.0",
-                                                                        "static-extend": "^0.1.1"
-                                                                      },
-                                                                      "dependencies": {
-                                                                        "define-property": {
-                                                                          "version": "0.2.5",
-                                                                          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-                                                                          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-                                                                          "requires": {
-                                                                            "is-descriptor": "^0.1.0"
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    "clean-css": {
-                                                                      "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"
-                                                                      },
-                                                                      "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
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    "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",
-                                                                      "integrity": "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==",
-                                                                      "dev": true
-                                                                    },
-                                                                    "cli-color": {
-                                                                      "version": "2.0.0",
-                                                                      "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-2.0.0.tgz",
-                                                                      "integrity": "sha512-a0VZ8LeraW0jTuCkuAGMNufareGHhyZU9z8OGsW0gXd1hZGi1SRuNRXdbGkraBBKnhyUhyebFWnRbp+dIn0f0A==",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "ansi-regex": "^2.1.1",
-                                                                        "d": "^1.0.1",
-                                                                        "es5-ext": "^0.10.51",
-                                                                        "es6-iterator": "^2.0.3",
-                                                                        "memoizee": "^0.4.14",
-                                                                        "timers-ext": "^0.1.7"
-                                                                      }
-                                                                    },
-                                                                    "cli-cursor": {
-                                                                      "version": "3.1.0",
-                                                                      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-                                                                      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "restore-cursor": "^3.1.0"
-                                                                      }
-                                                                    },
-                                                                    "cli-spinners": {
-                                                                      "version": "2.3.0",
-                                                                      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.3.0.tgz",
-                                                                      "integrity": "sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w==",
-                                                                      "dev": true
-                                                                    },
-                                                                    "cli-width": {
-                                                                      "version": "2.2.0",
-                                                                      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
-                                                                      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
-                                                                      "dev": true
-                                                                    },
-                                                                    "cliui": {
-                                                                      "version": "3.2.0",
-                                                                      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-                                                                      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "string-width": "^1.0.1",
-                                                                        "strip-ansi": "^3.0.1",
-                                                                        "wrap-ansi": "^2.0.0"
-                                                                      },
-                                                                      "dependencies": {
-                                                                        "wrap-ansi": {
-                                                                          "version": "2.1.0",
-                                                                          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-                                                                          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-                                                                          "dev": true,
-                                                                          "requires": {
-                                                                            "string-width": "^1.0.1",
-                                                                            "strip-ansi": "^3.0.1"
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    "clone": {
-                                                                      "version": "2.1.2",
-                                                                      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-                                                                      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
-                                                                      "dev": true
-                                                                    },
-                                                                    "clone-buffer": {
-                                                                      "version": "1.0.0",
-                                                                      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-                                                                      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
-                                                                      "dev": true
-                                                                    },
-                                                                    "clone-deep": {
-                                                                      "version": "4.0.1",
-                                                                      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-                                                                      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "is-plain-object": "^2.0.4",
-                                                                        "kind-of": "^6.0.2",
-                                                                        "shallow-clone": "^3.0.0"
-                                                                      }
-                                                                    },
-                                                                    "clone-response": {
-                                                                      "version": "1.0.2",
-                                                                      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-                                                                      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "mimic-response": "^1.0.0"
-                                                                      }
-                                                                    },
-                                                                    "clone-stats": {
-                                                                      "version": "1.0.0",
-                                                                      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-                                                                      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-                                                                      "dev": true
-                                                                    },
-                                                                    "cloneable-readable": {
-                                                                      "version": "1.1.3",
-                                                                      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
-                                                                      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "inherits": "^2.0.1",
-                                                                        "process-nextick-args": "^2.0.0",
-                                                                        "readable-stream": "^2.3.5"
-                                                                      }
-                                                                    },
-                                                                    "co": {
-                                                                      "version": "4.6.0",
-                                                                      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-                                                                      "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",
-                                                                      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-                                                                      "dev": true
-                                                                    },
-                                                                    "codecov": {
-                                                                      "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.3",
-                                                                        "js-yaml": "3.13.1",
-                                                                        "teeny-request": "6.0.1",
-                                                                        "urlgrey": "0.4.4"
-                                                                      }
-                                                                    },
-                                                                    "codelyzer": {
-                                                                      "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",
-                                                                        "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": {
-                                                                          "version": "0.5.7",
-                                                                          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-                                                                          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-                                                                          "dev": true
-                                                                        },
-                                                                        "sprintf-js": {
-                                                                          "version": "1.1.2",
-                                                                          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
-                                                                          "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
-                                                                          "dev": true
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    "collection-map": {
-                                                                      "version": "1.0.0",
-                                                                      "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
-                                                                      "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "arr-map": "^2.0.2",
-                                                                        "for-own": "^1.0.0",
-                                                                        "make-iterator": "^1.0.0"
-                                                                      }
-                                                                    },
-                                                                    "collection-visit": {
-                                                                      "version": "1.0.0",
-                                                                      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-                                                                      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-                                                                      "requires": {
-                                                                        "map-visit": "^1.0.0",
-                                                                        "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",
-                                                                      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "color-name": "1.1.3"
-                                                                      }
-                                                                    },
-                                                                    "color-name": {
-                                                                      "version": "1.1.3",
-                                                                      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-                                                                      "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",
-                                                                      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-                                                                      "dev": true
-                                                                    },
-                                                                    "colors": {
-                                                                      "version": "1.1.2",
-                                                                      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-                                                                      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-                                                                      "dev": true
-                                                                    },
-                                                                    "combined-stream": {
-                                                                      "version": "1.0.8",
-                                                                      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-                                                                      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "delayed-stream": "~1.0.0"
-                                                                      }
-                                                                    },
-                                                                    "commander": {
-                                                                      "version": "2.20.0",
-                                                                      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
-                                                                      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
-                                                                      "dev": true
-                                                                    },
-                                                                    "commondir": {
-                                                                      "version": "1.0.1",
-                                                                      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-                                                                      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-                                                                      "dev": true
-                                                                    },
-                                                                    "compare-versions": {
-                                                                      "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": {
-                                                                      "version": "1.0.0",
-                                                                      "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
-                                                                      "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=",
-                                                                      "dev": true
-                                                                    },
-                                                                    "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=="
-                                                                    },
-                                                                    "component-inherit": {
-                                                                      "version": "0.0.3",
-                                                                      "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
-                                                                      "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=",
-                                                                      "dev": true
-                                                                    },
-                                                                    "compressible": {
-                                                                      "version": "2.0.18",
-                                                                      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-                                                                      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "mime-db": ">= 1.43.0 < 2"
-                                                                      }
-                                                                    },
-                                                                    "compression": {
-                                                                      "version": "1.7.4",
-                                                                      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-                                                                      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "accepts": "~1.3.5",
-                                                                        "bytes": "3.0.0",
-                                                                        "compressible": "~2.0.16",
-                                                                        "debug": "2.6.9",
-                                                                        "on-headers": "~1.0.2",
-                                                                        "safe-buffer": "5.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=",
-                                                                      "dev": true
-                                                                    },
-                                                                    "concat-stream": {
-                                                                      "version": "1.6.2",
-                                                                      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-                                                                      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "buffer-from": "^1.0.0",
-                                                                        "inherits": "^2.0.3",
-                                                                        "readable-stream": "^2.2.2",
-                                                                        "typedarray": "^0.0.6"
-                                                                      }
-                                                                    },
-                                                                    "configstore": {
-                                                                      "version": "5.0.1",
-                                                                      "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
-                                                                      "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "dot-prop": "^5.2.0",
-                                                                        "graceful-fs": "^4.1.2",
-                                                                        "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": "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
-                                                                        }
-                                                                      }
-                                                                    },
-                                                                    "connect": {
-                                                                      "version": "3.7.0",
-                                                                      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
-                                                                      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "debug": "2.6.9",
-                                                                        "finalhandler": "1.1.2",
-                                                                        "parseurl": "~1.3.3",
-                                                                        "utils-merge": "1.0.1"
-                                                                      }
-                                                                    },
-                                                                    "connect-history-api-fallback": {
-                                                                      "version": "1.6.0",
-                                                                      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-                                                                      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
-                                                                      "dev": true
-                                                                    },
-                                                                    "connected-domain": {
-                                                                      "version": "1.0.0",
-                                                                      "resolved": "https://registry.npmjs.org/connected-domain/-/connected-domain-1.0.0.tgz",
-                                                                      "integrity": "sha1-v+dyOMdL5FOnnwy2BY3utPI1jpM=",
-                                                                      "dev": true
-                                                                    },
-                                                                    "console-browserify": {
-                                                                      "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",
-                                                                      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-                                                                      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-                                                                      "dev": true
-                                                                    },
-                                                                    "content-disposition": {
-                                                                      "version": "0.5.3",
-                                                                      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-                                                                      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "safe-buffer": "5.1.2"
-                                                                      }
-                                                                    },
-                                                                    "content-type": {
-                                                                      "version": "1.0.4",
-                                                                      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-                                                                      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-                                                                      "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"
-                                                                      }
-                                                                    },
-                                                                    "cookie": {
-                                                                      "version": "0.4.0",
-                                                                      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-                                                                      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
-                                                                      "dev": true
-                                                                    },
-                                                                    "cookie-signature": {
-                                                                      "version": "1.0.6",
-                                                                      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-                                                                      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
-                                                                      "dev": true
-                                                                    },
-                                                                    "copy-concurrently": {
-                                                                      "version": "1.0.5",
-                                                                      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-                                                                      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "aproba": "^1.1.1",
-                                                                        "fs-write-stream-atomic": "^1.0.8",
-                                                                        "iferr": "^0.1.5",
-                                                                        "mkdirp": "^0.5.1",
-                                                                        "rimraf": "^2.5.4",
-                                                                        "run-queue": "^1.0.0"
-                                                                      }
-                                                                    },
-                                                                    "copy-descriptor": {
-                                                                      "version": "0.1.1",
-                                                                      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-                                                                      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
-                                                                    },
-                                                                    "copy-props": {
-                                                                      "version": "2.0.4",
-                                                                      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
-                                                                      "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
-                                                                      "dev": true,
-                                                                      "requires": {
-                                                                        "each-props": "^1.3.0",
-                                                                        "is-plain-object": "^2.0.1"
-                                                                      }
-                                                                    },
-                                                                    "copy-webpack-plugin": {
-                                                                      "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": "^12.0.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": "^2.1.2",
-                                                                        "webpack-log": "^2.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"
-                                                                          }
-                                                                        },
-                                                                        "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"
-                                                                          }
-                                                                        },
-                                                                        "globby": {
-                                                                          "version": "7.1.1",
-                                                                          "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
-                                                                          "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
-                                                                          "dev": true,
-                                                                          "requires": {
-                                                                            "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"
-                                                                          }
-                                                                        },
-                                                                        "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"
-                                                                          }
-                                                                        },
-                                                                        "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-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" ===
-                                                                              === =
-                                                                              "clean-css": {
-                                                                                "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"
-                                                                                },
-                                                                                "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
-                                                                                  }
-                                                                                }
-                                                                              },
-                                                                            "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",
-                                                                              "integrity": "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==",
-                                                                              "dev": true
-                                                                            },
-                                                                            "cli-color": {
-                                                                              "version": "2.0.0",
-                                                                              "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-2.0.0.tgz",
-                                                                              "integrity": "sha512-a0VZ8LeraW0jTuCkuAGMNufareGHhyZU9z8OGsW0gXd1hZGi1SRuNRXdbGkraBBKnhyUhyebFWnRbp+dIn0f0A==",
-                                                                              "dev": true,
-                                                                              "requires": {
-                                                                                "ansi-regex": "^2.1.1",
-                                                                                "d": "^1.0.1",
-                                                                                "es5-ext": "^0.10.51",
-                                                                                "es6-iterator": "^2.0.3",
-                                                                                "memoizee": "^0.4.14",
-                                                                                "timers-ext": "^0.1.7"
-                                                                              }
-                                                                            },
-                                                                            "cli-cursor": {
-                                                                              "version": "3.1.0",
-                                                                              "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-                                                                              "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-                                                                              "dev": true,
-                                                                              "requires": {
-                                                                                "restore-cursor": "^3.1.0"
-                                                                              }
-                                                                            },
-                                                                            "cli-spinners": {
-                                                                              "version": "2.3.0",
-                                                                              "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.3.0.tgz",
-                                                                              "integrity": "sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w==",
-                                                                              "dev": true
-                                                                            },
-                                                                            "cli-width": {
-                                                                              "version": "2.2.0",
-                                                                              "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
-                                                                              "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
-                                                                              "dev": true
-                                                                            },
-                                                                            "cliui": {
-                                                                              "version": "3.2.0",
-                                                                              "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-                                                                              "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-                                                                              "dev": true,
-                                                                              "requires": {
-                                                                                "string-width": "^1.0.1",
-                                                                                "strip-ansi": "^3.0.1",
-                                                                                "wrap-ansi": "^2.0.0"
-                                                                              },
-                                                                              "dependencies": {
-                                                                                "wrap-ansi": {
-                                                                                  "version": "2.1.0",
-                                                                                  "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-                                                                                  "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-                                                                                  "dev": true,
-                                                                                  "requires": {
-                                                                                    "string-width": "^1.0.1",
-                                                                                    "strip-ansi": "^3.0.1"
-                                                                                  }
-                                                                                }
-                                                                              }
-                                                                            },
-                                                                            "clone": {
-                                                                              "version": "2.1.2",
-                                                                              "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-                                                                              "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
-                                                                              "dev": true
-                                                                            },
-                                                                            "clone-buffer": {
-                                                                              "version": "1.0.0",
-                                                                              "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-                                                                              "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
-                                                                              "dev": true
-                                                                            },
-                                                                            "clone-deep": {
-                                                                              "version": "4.0.1",
-                                                                              "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-                                                                              "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-                                                                              "dev": true,
-                                                                              "requires": {
-                                                                                "is-plain-object": "^2.0.4",
-                                                                                "kind-of": "^6.0.2",
-                                                                                "shallow-clone": "^3.0.0"
-                                                                              }
-                                                                            },
-                                                                            "clone-response": {
-                                                                              "version": "1.0.2",
-                                                                              "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-                                                                              "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
-                                                                              "dev": true,
-                                                                              "requires": {
-                                                                                "mimic-response": "^1.0.0"
-                                                                              }
-                                                                            },
-                                                                            "clone-stats": {
-                                                                              "version": "1.0.0",
-                                                                              "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-                                                                              "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-                                                                              "dev": true
-                                                                            },
-                                                                            "cloneable-readable": {
-                                                                              "version": "1.1.3",
-                                                                              "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
-                                                                              "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
-                                                                              "dev": true,
-                                                                              "requires": {
-                                                                                "inherits": "^2.0.1",
-                                                                                "process-nextick-args": "^2.0.0",
-                                                                                "readable-stream": "^2.3.5"
-                                                                              }
-                                                                            },
-                                                                            "co": {
-                                                                              "version": "4.6.0",
-                                                                              "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-                                                                              "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",
-                                                                              "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-                                                                              "dev": true
-                                                                            },
-                                                                            "codecov": {
-                                                                              "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.3",
-                                                                                "js-yaml": "3.13.1",
-                                                                                "teeny-request": "6.0.1",
-                                                                                "urlgrey": "0.4.4"
-                                                                              }
-                                                                            },
-                                                                            "codelyzer": {
-                                                                              "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",
-                                                                                "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": {
-                                                                                  "version": "0.5.7",
-                                                                                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-                                                                                  "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-                                                                                  "dev": true
-                                                                                },
-                                                                                "sprintf-js": {
-                                                                                  "version": "1.1.2",
-                                                                                  "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
-                                                                                  "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
-                                                                                  "dev": true
-                                                                                }
-                                                                              }
-                                                                            },
-                                                                            "collection-map": {
-                                                                              "version": "1.0.0",
-                                                                              "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
-                                                                              "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
-                                                                              "dev": true,
-                                                                              "requires": {
-                                                                                "arr-map": "^2.0.2",
-                                                                                "for-own": "^1.0.0",
-                                                                                "make-iterator": "^1.0.0"
-                                                                              }
-                                                                            },
-                                                                            "collection-visit": {
-                                                                              "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"
-                                                                              }
-                                                                            },
-                                                                            "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",
-                                                                              "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-                                                                              "dev": true,
-                                                                              "requires": {
-                                                                                "color-name": "1.1.3"
-                                                                              }
-                                                                            },
-                                                                            "color-name": {
-                                                                              "version": "1.1.3",
-                                                                              "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-                                                                              "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",
-                                                                              "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-                                                                              "dev": true
-                                                                            },
-                                                                            "colors": {
-                                                                              "version": "1.1.2",
-                                                                              "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-                                                                              "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-                                                                              "dev": true
-                                                                            },
-                                                                            "combined-stream": {
-                                                                              "version": "1.0.8",
-                                                                              "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-                                                                              "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-                                                                              "dev": true,
-                                                                              "requires": {
-                                                                                "delayed-stream": "~1.0.0"
-                                                                              }
-                                                                            },
-                                                                            "commander": {
-                                                                              "version": "2.20.0",
-                                                                              "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
-                                                                              "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
-                                                                              "dev": true
-                                                                            },
-                                                                            "commondir": {
-                                                                              "version": "1.0.1",
-                                                                              "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-                                                                              "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-                                                                              "dev": true
-                                                                            },
-                                                                            "compare-versions": {
-                                                                              "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": {
-                                                                              "version": "1.0.0",
-                                                                              "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
-                                                                              "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=",
-                                                                              "dev": true
-                                                                            },
-                                                                            "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==",
-                                                                              "dev": true
-                                                                            },
-                                                                            "component-inherit": {
-                                                                              "version": "0.0.3",
-                                                                              "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
-                                                                              "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=",
-                                                                              "dev": true
-                                                                            },
-                                                                            "compressible": {
-                                                                              "version": "2.0.18",
-                                                                              "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-                                                                              "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-                                                                              "dev": true,
-                                                                              "requires": {
-                                                                                "mime-db": ">= 1.43.0 < 2"
-                                                                              }
-                                                                            },
-                                                                            "compression": {
-                                                                              "version": "1.7.4",
-                                                                              "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-                                                                              "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-                                                                              "dev": true,
-                                                                              "requires": {
-                                                                                "accepts": "~1.3.5",
-                                                                                "bytes": "3.0.0",
-                                                                                "compressible": "~2.0.16",
-                                                                                "debug": "2.6.9",
-                                                                                "on-headers": "~1.0.2",
-                                                                                "safe-buffer": "5.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=",
-                                                                              "dev": true
-                                                                            },
-                                                                            "concat-stream": {
-                                                                              "version": "1.6.2",
-                                                                              "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-                                                                              "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-                                                                              "dev": true,
-                                                                              "requires": {
-                                                                                "buffer-from": "^1.0.0",
-                                                                                "inherits": "^2.0.3",
-                                                                                "readable-stream": "^2.2.2",
-                                                                                "typedarray": "^0.0.6"
-                                                                              }
-                                                                            },
-                                                                            "configstore": {
-                                                                              "version": "5.0.1",
-                                                                              "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
-                                                                              "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
-                                                                              "dev": true,
-                                                                              "requires": {
-                                                                                "dot-prop": "^5.2.0",
-                                                                                "graceful-fs": "^4.1.2",
-                                                                                "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": "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
-                                                                                }
-                                                                              }
-                                                                            },
-                                                                            "connect": {
-                                                                              "version": "3.7.0",
-                                                                              "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
-                                                                              "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
-                                                                              "dev": true,
-                                                                              "requires": {
-                                                                                "debug": "2.6.9",
-                                                                                "finalhandler": "1.1.2",
-                                                                                "parseurl": "~1.3.3",
-                                                                                "utils-merge": "1.0.1"
-                                                                              }
-                                                                            },
-                                                                            "connect-history-api-fallback": {
-                                                                              "version": "1.6.0",
-                                                                              "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-                                                                              "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
-                                                                              "dev": true
-                                                                            },
-                                                                            "connected-domain": {
-                                                                              "version": "1.0.0",
-                                                                              "resolved": "https://registry.npmjs.org/connected-domain/-/connected-domain-1.0.0.tgz",
-                                                                              "integrity": "sha1-v+dyOMdL5FOnnwy2BY3utPI1jpM=",
-                                                                              "dev": true
-                                                                            },
-                                                                            "console-browserify": {
-                                                                              "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",
-                                                                              "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-                                                                              "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-                                                                              "dev": true
-                                                                            },
-                                                                            "content-disposition": {
-                                                                              "version": "0.5.3",
-                                                                              "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-                                                                              "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
-                                                                              "dev": true,
-                                                                              "requires": {
-                                                                                "safe-buffer": "5.1.2"
-                                                                              }
-                                                                            },
-                                                                            "content-type": {
-                                                                              "version": "1.0.4",
-                                                                              "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-                                                                              "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-                                                                              "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"
-                                                                              }
-                                                                            },
-                                                                            "cookie": {
-                                                                              "version": "0.4.0",
-                                                                              "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-                                                                              "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
-                                                                              "dev": true
-                                                                            },
-                                                                            "cookie-signature": {
-                                                                              "version": "1.0.6",
-                                                                              "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-                                                                              "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
-                                                                              "dev": true
-                                                                            },
-                                                                            "copy-concurrently": {
-                                                                              "version": "1.0.5",
-                                                                              "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-                                                                              "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
-                                                                              "dev": true,
-                                                                              "requires": {
-                                                                                "aproba": "^1.1.1",
-                                                                                "fs-write-stream-atomic": "^1.0.8",
-                                                                                "iferr": "^0.1.5",
-                                                                                "mkdirp": "^0.5.1",
-                                                                                "rimraf": "^2.5.4",
-                                                                                "run-queue": "^1.0.0"
-                                                                              }
-                                                                            },
-                                                                            "copy-descriptor": {
-                                                                              "version": "0.1.1",
-                                                                              "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-                                                                              "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-                                                                              "dev": true
-                                                                            },
-                                                                            "copy-props": {
-                                                                              "version": "2.0.4",
-                                                                              "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
-                                                                              "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
-                                                                              "dev": true,
-                                                                              "requires": {
-                                                                                "each-props": "^1.3.0",
-                                                                                "is-plain-object": "^2.0.1"
-                                                                              }
-                                                                            },
-                                                                            "copy-webpack-plugin": {
-                                                                              "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": "^12.0.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": "^2.1.2",
-                                                                                "webpack-log": "^2.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"
-                                                                                  }
-                                                                                },
-                                                                                "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"
-                                                                                  }
-                                                                                },
-                                                                                "globby": {
-                                                                                  "version": "7.1.1",
-                                                                                  "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
-                                                                                  "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
-                                                                                  "dev": true,
-                                                                                  "requires": {
-                                                                                    "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"
-                                                                                  }
-                                                                                },
-                                                                                "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"
-                                                                                  }
-                                                                                },
-                                                                                "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-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.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.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.5",
-                                                                                "semver": "7.0.0"
-                                                                              },
-                                                                              "dependencies": {
-                                                                                "semver": {
-                                                                                  "version": "7.0.0",
-                                                                                  "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-                                                                                  "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-                                                                                  "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=",
-                                                                              "dev": true
-                                                                            },
-                                                                            "cosmiconfig": {
-                                                                              "version": "5.2.1",
-                                                                              "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-                                                                              "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"
-                                                                              },
-                                                                              "dependencies": {
-                                                                                "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.1",
-                                                                                    "json-parse-better-errors": "^1.0.1" >>>
-                                                                                      >>> > upstream / master
-                                                                                  }
-                                                                                }
-                                                                              }
-                                                                            },
-                                                                            <<
-                                                                            << << < HEAD "core-js": {
-                                                                              "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.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.5",
-                                                                                "semver": "7.0.0"
-                                                                              },
-                                                                              "dependencies": {
-                                                                                "semver": {
-                                                                                  "version": "7.0.0",
-                                                                                  "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-                                                                                  "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-                                                                                  ===
-                                                                                  === =
-                                                                                  "create-ecdh": {
-                                                                                    "version": "4.0.3",
-                                                                                    "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-                                                                                    "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
-                                                                                    "dev": true,
-                                                                                    "requires": {
-                                                                                      "bn.js": "^4.1.0",
-                                                                                      "elliptic": "^6.0.0"
-                                                                                    },
-                                                                                    "dependencies": {
-                                                                                      "bn.js": {
-                                                                                        "version": "4.11.9",
-                                                                                        "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-                                                                                        "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-                                                                                        >>>
-                                                                                        >>> > upstream / master "dev": true
-                                                                                      }
-                                                                                    }
-                                                                                  },
-                                                                                  <<
-                                                                                  << << < HEAD "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="
-                                                                                  },
-                                                                                  "cosmiconfig": {
-                                                                                    "version": "5.2.1",
-                                                                                    "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-                                                                                    "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"
-                                                                                    },
-                                                                                    "dependencies": {
-                                                                                      "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.1",
-                                                                                          "json-parse-better-errors": "^1.0.1"
-                                                                                        }
-                                                                                      }
-                                                                                    }
-                                                                                  },
-                                                                                  "create-ecdh": {
-                                                                                    "version": "4.0.3",
-                                                                                    "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-                                                                                    "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
-                                                                                    "dev": true,
-                                                                                    "requires": {
-                                                                                      "bn.js": "^4.1.0",
-                                                                                      "elliptic": "^6.0.0"
-                                                                                    },
-                                                                                    "dependencies": {
-                                                                                      "bn.js": {
-                                                                                        "version": "4.11.9",
-                                                                                        "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-                                                                                        "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-                                                                                        "dev": true
-                                                                                      }
-                                                                                    }
-                                                                                  },
-                                                                                  "create-hash": {
-                                                                                    "version": "1.2.0",
-                                                                                    "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-                                                                                    "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-                                                                                    "dev": true,
-                                                                                    "requires": {
-                                                                                      "cipher-base": "^1.0.1",
-                                                                                      "inherits": "^2.0.1",
-                                                                                      "md5.js": "^1.3.4",
-                                                                                      "ripemd160": "^2.0.1",
-                                                                                      "sha.js": "^2.4.0"
-                                                                                    }
-                                                                                  },
-                                                                                  "create-hmac": {
-                                                                                    "version": "1.1.7",
-                                                                                    "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-                                                                                    "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-                                                                                    "dev": true,
-                                                                                    "requires": {
-                                                                                      "cipher-base": "^1.0.3",
-                                                                                      "create-hash": "^1.1.0",
-                                                                                      "inherits": "^2.0.1",
-                                                                                      "ripemd160": "^2.0.0",
-                                                                                      "safe-buffer": "^5.0.1",
-                                                                                      "sha.js": "^2.4.8"
-                                                                                    }
-                                                                                  },
-                                                                                  ===
-                                                                                  === =
-                                                                                  "create-hash": {
-                                                                                    "version": "1.2.0",
-                                                                                    "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-                                                                                    "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-                                                                                    "dev": true,
-                                                                                    "requires": {
-                                                                                      "cipher-base": "^1.0.1",
-                                                                                      "inherits": "^2.0.1",
-                                                                                      "md5.js": "^1.3.4",
-                                                                                      "ripemd160": "^2.0.1",
-                                                                                      "sha.js": "^2.4.0"
-                                                                                    }
-                                                                                  },
-                                                                                  "create-hmac": {
-                                                                                    "version": "1.1.7",
-                                                                                    "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-                                                                                    "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-                                                                                    "dev": true,
-                                                                                    "requires": {
-                                                                                      "cipher-base": "^1.0.3",
-                                                                                      "create-hash": "^1.1.0",
-                                                                                      "inherits": "^2.0.1",
-                                                                                      "ripemd160": "^2.0.0",
-                                                                                      "safe-buffer": "^5.0.1",
-                                                                                      "sha.js": "^2.4.8"
-                                                                                    }
-                                                                                  },
-                                                                                  >>>
-                                                                                  >>> > upstream / master "cross-spawn": {
-                                                                                    "version": "6.0.5",
-                                                                                    "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-                                                                                    "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-                                                                                    "requires": {
-                                                                                      "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": {
-                                                                                    "version": "3.12.0",
-                                                                                    "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-                                                                                    "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-                                                                                    "dev": true,
-                                                                                    "requires": {
-                                                                                      "browserify-cipher": "^1.0.0",
-                                                                                      "browserify-sign": "^4.0.0",
-                                                                                      "create-ecdh": "^4.0.0",
-                                                                                      "create-hash": "^1.1.0",
-                                                                                      "create-hmac": "^1.1.0",
-                                                                                      "diffie-hellman": "^5.0.0",
-                                                                                      "inherits": "^2.0.1",
-                                                                                      "pbkdf2": "^3.0.3",
-                                                                                      "public-encrypt": "^4.0.0",
-                                                                                      "randombytes": "^2.0.0",
-                                                                                      "randomfill": "^1.0.3"
-                                                                                    }
-                                                                                  },
-                                                                                  "crypto-random-string": {
-                                                                                    "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": {
-                                                                                    "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": {
-                                                                                      "inherits": "^2.0.3",
-                                                                                      "source-map": "^0.6.1",
-                                                                                      "source-map-resolve": "^0.5.2",
-                                                                                      "urix": "^0.1.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
-                                                                                      }
-                                                                                    }
-                                                                                  },
-                                                                                  "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==",
-                                                                                    <<
-                                                                                    << << < HEAD "dev": true,
-                                                                                    "requires": {
-                                                                                      "postcss": "^7.0.1",
-                                                                                      "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"
-                                                                                        }
-                                                                                      },
-                                                                                      "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",
-                                                                                    "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": {
-                                                                                      ===
-                                                                                      === =
-                                                                                      "dev": true,
-                                                                                      "requires": {
-                                                                                        "postcss": "^7.0.1",
-                                                                                        "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"
-                                                                                          }
-                                                                                        },
-                                                                                        "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",
-                                                                                      "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": {
-                                                                                        >>>
-                                                                                        >>> > upstream / master "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": "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",
-                                                                                      "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=",
-                                                                                      "dev": true
-                                                                                    },
-                                                                                    "custom-event": {
-                                                                                      "version": "1.0.1",
-                                                                                      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
-                                                                                      "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
-                                                                                      "dev": true
-                                                                                    },
-                                                                                    "cyclist": {
-                                                                                      "version": "1.0.1",
-                                                                                      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
-                                                                                      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
-                                                                                      "dev": true
-                                                                                    },
-                                                                                    "d": {
-                                                                                      "version": "1.0.1",
-                                                                                      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-                                                                                      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-                                                                                      "dev": true,
-                                                                                      "requires": {
-                                                                                        "es5-ext": "^0.10.50",
-                                                                                        "type": "^1.0.1"
-                                                                                      }
-                                                                                    },
-                                                                                    "d3-array": {
-                                                                                      "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.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",
-                                                                                        "d3-interpolate": "1",
-                                                                                        "d3-selection": "1",
-                                                                                        "d3-transition": "1"
-                                                                                      }
-                                                                                    },
-                                                                                    <<
-                                                                                    << << < HEAD "d3-collection": {
-                                                                                      "version": "1.0.7",
-                                                                                      "resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.7.tgz",
-                                                                                      "integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A=="
-                                                                                    },
-                                                                                    ===
-                                                                                    === = >>>
-                                                                                    >>> > upstream / master "d3-color": {
-                                                                                      "version": "1.4.1",
-                                                                                      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz",
-                                                                                      "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q=="
-                                                                                    },
-                                                                                    "d3-dispatch": {
-                                                                                      "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.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-ease": {
-                                                                                      "version": "1.0.6",
-                                                                                      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.6.tgz",
-                                                                                      "integrity": "sha512-SZ/lVU7LRXafqp7XtIcBdxnWl8yyLpgOmzAk0mWBI9gXNzLDx5ybZgnRbH9dN/yY5tzVBqCQ9avltSnqVwessQ=="
-                                                                                    },
-                                                                                    <<
-                                                                                    << << < HEAD "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",
-                                                                                      "integrity": "sha512-TWks25e7t8/cqctxCmxpUuzZN11QxIA7YrMbram94zMQ0PXjE4LVIMe/f6a4+xxL8HQ3OsAFULOINQi1pE62Aw=="
-                                                                                    },
-                                                                                    "d3-hierarchy": {
-                                                                                      "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.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.9",
-                                                                                      "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",
-                                                                                      "integrity": "sha512-huz5byJO/6MPpz6Q8d4lg7GgSpTjIZW/l+1MQkzKfu2u8P6hjaXaStOpmyrD6ymKoW87d2QVFCKvSjLwjzx/rA==",
-                                                                                      "requires": {
-                                                                                        "d3-array": "1.2.0 - 2",
-                                                                                        "d3-format": "1",
-                                                                                        "d3-interpolate": "^1.2.0",
-                                                                                        "d3-time": "1",
-                                                                                        "d3-time-format": "2"
-                                                                                      }
-                                                                                    },
-                                                                                    "d3-selection": {
-                                                                                      "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.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.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.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.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.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",
-                                                                                        "d3-ease": "1",
-                                                                                        "d3-interpolate": "1",
-                                                                                        "d3-selection": "^1.1.0",
-                                                                                        "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",
-                                                                                      "integrity": "sha512-JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug==",
-                                                                                      "dev": true
-                                                                                    },
-                                                                                    "dashdash": {
-                                                                                      "version": "1.14.1",
-                                                                                      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-                                                                                      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-                                                                                      "dev": true,
-                                                                                      "requires": {
-                                                                                        "assert-plus": "^1.0.0"
-                                                                                      }
-                                                                                    },
-                                                                                    "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": "2.6.9",
-                                                                                      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-                                                                                      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-                                                                                      "requires": {
-                                                                                        "ms": "2.0.0"
-                                                                                      }
-                                                                                    },
-                                                                                    "debuglog": {
-                                                                                      "version": "1.0.1",
-                                                                                      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
-                                                                                      "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=",
-                                                                                      "dev": true
-                                                                                    },
-                                                                                    "decamelize": {
-                                                                                      "version": "1.2.0",
-                                                                                      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-                                                                                      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
-                                                                                    },
-                                                                                    "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="
-                                                                                    },
-                                                                                    ===
-                                                                                    === =
-                                                                                    "d3-format": {
-                                                                                      "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.9",
-                                                                                      "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz",
-                                                                                      "integrity": "sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ=="
-                                                                                    },
-                                                                                    "d3-interpolate": {
-                                                                                      "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.9",
-                                                                                      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz",
-                                                                                      "integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="
-                                                                                    },
-                                                                                    "d3-scale": {
-                                                                                      "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 - 2",
-                                                                                        "d3-format": "1",
-                                                                                        "d3-interpolate": "^1.2.0",
-                                                                                        "d3-time": "1",
-                                                                                        "d3-time-format": "2"
-                                                                                      }
-                                                                                    },
-                                                                                    "d3-selection": {
-                                                                                      "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.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.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.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.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.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",
-                                                                                        "d3-ease": "1",
-                                                                                        "d3-interpolate": "1",
-                                                                                        "d3-selection": "^1.1.0",
-                                                                                        "d3-timer": "1"
-                                                                                      }
-                                                                                    },
-                                                                                    "damerau-levenshtein": {
-                                                                                      "version": "1.0.6",
-                                                                                      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz",
-                                                                                      "integrity": "sha512-JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug==",
-                                                                                      "dev": true
-                                                                                    },
-                                                                                    "dashdash": {
-                                                                                      "version": "1.14.1",
-                                                                                      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-                                                                                      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-                                                                                      "dev": true,
-                                                                                      "requires": {
-                                                                                        "assert-plus": "^1.0.0"
-                                                                                      }
-                                                                                    },
-                                                                                    "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": "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"
-                                                                                      }
-                                                                                    },
-                                                                                    "debuglog": {
-                                                                                      "version": "1.0.1",
-                                                                                      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
-                                                                                      "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=",
-                                                                                      "dev": true
-                                                                                    },
-                                                                                    "decamelize": {
-                                                                                      "version": "1.2.0",
-                                                                                      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-                                                                                      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
-                                                                                    },
-                                                                                    "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=",
-                                                                                      "dev": true
-                                                                                    },
-                                                                                    >>>
-                                                                                    >>> > upstream / master "decompress-response": {
-                                                                                      "version": "3.3.0",
-                                                                                      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-                                                                                      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
-                                                                                      "dev": true,
-                                                                                      "requires": {
-                                                                                        "mimic-response": "^1.0.0"
-                                                                                      }
-                                                                                    },
-                                                                                    "deep-equal": {
-                                                                                      "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",
-                                                                                        "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": {
-                                                                                      "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
-                                                                                    },
-                                                                                    "deep-is": {
-                                                                                      "version": "0.1.3",
-                                                                                      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-                                                                                      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-                                                                                      "dev": true
-                                                                                    },
-                                                                                    "deepmerge": {
-                                                                                      "version": "3.3.0",
-                                                                                      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-3.3.0.tgz",
-                                                                                      "integrity": "sha512-GRQOafGHwMHpjPx9iCvTgpu9NojZ49q794EEL94JVEw6VaeA8XTUyBKvAkOOjBX9oJNiV6G3P+T+tihFjo2TqA=="
-                                                                                    },
-                                                                                    "default-compare": {
-                                                                                      "version": "1.0.0",
-                                                                                      "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
-                                                                                      "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
-                                                                                      "dev": true,
-                                                                                      "requires": {
-                                                                                        "kind-of": "^5.0.2"
-                                                                                      },
-                                                                                      "dependencies": {
-                                                                                        "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==",
-                                                                                          "dev": true
-                                                                                        }
-                                                                                      }
-                                                                                    },
-                                                                                    "default-gateway": {
-                                                                                      "version": "4.2.0",
-                                                                                      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
-                                                                                      "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
-                                                                                      "dev": true,
-                                                                                      "requires": {
-                                                                                        "execa": "^1.0.0",
-                                                                                        "ip-regex": "^2.1.0"
-                                                                                      }
-                                                                                    },
-                                                                                    "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"
-                                                                                      },
-                                                                                      "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": {
-                                                                                      "version": "2.0.0",
-                                                                                      "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
-                                                                                      "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.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": {
-                                                                                      "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.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==",
-                                                                                      <<
-                                                                                      << << < HEAD ===
-                                                                                      === =
-                                                                                      "dev": true,
-                                                                                      >>>
-                                                                                      >>> > upstream / master "requires": {
-                                                                                        "is-descriptor": "^1.0.2",
-                                                                                        "isobject": "^3.0.1"
-                                                                                      },
-                                                                                      "dependencies": {
-                                                                                        "is-accessor-descriptor": {
-                                                                                          "version": "1.0.0",
-                                                                                          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-                                                                                          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-                                                                                          <<
-                                                                                          << << < HEAD ===
-                                                                                          === =
-                                                                                          "dev": true,
-                                                                                          >>>
-                                                                                          >>> > upstream / master "requires": {
-                                                                                            "kind-of": "^6.0.0"
-                                                                                          }
-                                                                                        },
-                                                                                        "is-data-descriptor": {
-                                                                                          "version": "1.0.0",
-                                                                                          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-                                                                                          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-                                                                                          <<
-                                                                                          << << < HEAD ===
-                                                                                          === =
-                                                                                          "dev": true,
-                                                                                          >>>
-                                                                                          >>> > upstream / master "requires": {
-                                                                                            "kind-of": "^6.0.0"
-                                                                                          }
-                                                                                        },
-                                                                                        "is-descriptor": {
-                                                                                          "version": "1.0.2",
-                                                                                          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-                                                                                          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-                                                                                          <<
-                                                                                          << << < HEAD ===
-                                                                                          === =
-                                                                                          "dev": true,
-                                                                                          >>>
-                                                                                          >>> > upstream / master "requires": {
-                                                                                            "is-accessor-descriptor": "^1.0.0",
-                                                                                            "is-data-descriptor": "^1.0.0",
-                                                                                            "kind-of": "^6.0.2"
-                                                                                          }
-                                                                                        }
-                                                                                      }
-                                                                                    },
-                                                                                    "del": {
-                                                                                      "version": "4.1.1",
-                                                                                      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-                                                                                      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
-                                                                                      "dev": true,
-                                                                                      "requires": {
-                                                                                        "@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": {
-                                                                                          "version": "6.1.0",
-                                                                                          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-                                                                                          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-                                                                                          "dev": true,
-                                                                                          "requires": {
-                                                                                            "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": {
-                                                                                              "version": "2.3.0",
-                                                                                              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-                                                                                              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-                                                                                              "dev": true
-                                                                                            }
-                                                                                          }
-                                                                                        },
-                                                                                        "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
-                                                                                        },
-                                                                                        "pify": {
-                                                                                          "version": "4.0.1",
-                                                                                          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-                                                                                          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-                                                                                          "dev": true
-                                                                                        }
-                                                                                      }
-                                                                                    },
-                                                                                    "delayed-stream": {
-                                                                                      "version": "1.0.0",
-                                                                                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-                                                                                      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-                                                                                      "dev": true
-                                                                                    },
-                                                                                    "delete": {
-                                                                                      "version": "1.1.0",
-                                                                                      "resolved": "https://registry.npmjs.org/delete/-/delete-1.1.0.tgz",
-                                                                                      "integrity": "sha512-bdhJatRNYsJnOhSRx9Eej3ABBtxQQw/uz2RprpYL5R3jCC2XMYVBcQWwvQLl+iNDk4LCLEKhdIP3uZSqRWi/tw==",
-                                                                                      "dev": true,
-                                                                                      "requires": {
-                                                                                        "async-each": "^1.0.1",
-                                                                                        "extend-shallow": "^2.0.1",
-                                                                                        "matched": "^1.0.2",
-                                                                                        "rimraf": "^2.6.1"
-                                                                                      },
-                                                                                      "dependencies": {
-                                                                                        "extend-shallow": {
-                                                                                          "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"
-                                                                                          }
-                                                                                        }
-                                                                                      }
-                                                                                    },
-                                                                                    "depd": {
-                                                                                      "version": "1.1.2",
-                                                                                      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-                                                                                      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-                                                                                      "dev": true
-                                                                                    },
-                                                                                    "dependency-graph": {
-                                                                                      "version": "0.7.2",
-                                                                                      "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.7.2.tgz",
-                                                                                      "integrity": "sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==",
-                                                                                      "dev": true
-                                                                                    },
-                                                                                    "des.js": {
-                                                                                      "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",
-                                                                                        "minimalistic-assert": "^1.0.0"
-                                                                                      }
-                                                                                    },
-                                                                                    "destroy": {
-                                                                                      "version": "1.0.4",
-                                                                                      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-                                                                                      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
-                                                                                      <<
-                                                                                      << << < HEAD "dev": true
-                                                                                    },
-                                                                                    "detect-file": {
-                                                                                      "version": "1.0.0",
-                                                                                      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-                                                                                      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
-                                                                                      "dev": true
-                                                                                    },
-                                                                                    "detect-node": {
-                                                                                      "version": "2.0.4",
-                                                                                      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
-                                                                                      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
-                                                                                      "dev": true
-                                                                                    },
-                                                                                    "dezalgo": {
-                                                                                      "version": "1.0.3",
-                                                                                      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz",
-                                                                                      "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=",
-                                                                                      "dev": true,
-                                                                                      "requires": {
-                                                                                        "asap": "^2.0.0",
-                                                                                        "wrappy": "1"
-                                                                                      }
-                                                                                    },
-                                                                                    "di": {
-                                                                                      "version": "0.0.1",
-                                                                                      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
-                                                                                      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
-                                                                                      "dev": true
-                                                                                    },
-                                                                                    "diff": {
-                                                                                      "version": "4.0.1",
-                                                                                      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz",
-                                                                                      "integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==",
-                                                                                      "dev": true
-                                                                                    },
-                                                                                    "diffie-hellman": {
-                                                                                      "version": "5.0.3",
-                                                                                      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-                                                                                      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-                                                                                      "dev": true,
-                                                                                      "requires": {
-                                                                                        "bn.js": "^4.1.0",
-                                                                                        "miller-rabin": "^4.0.0",
-                                                                                        "randombytes": "^2.0.0"
-                                                                                      },
-                                                                                      "dependencies": {
-                                                                                        "bn.js": {
-                                                                                          "version": "4.11.9",
-                                                                                          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-                                                                                          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-                                                                                          "dev": true
-                                                                                        }
-                                                                                      }
-                                                                                    },
-                                                                                    "dir-glob": {
-                                                                                      "version": "2.2.2",
-                                                                                      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
-                                                                                      "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
-                                                                                      "dev": true,
-                                                                                      "requires": {
-                                                                                        "path-type": "^3.0.0"
-                                                                                      }
-                                                                                    },
-                                                                                    "dns-equal": {
-                                                                                      "version": "1.0.0",
-                                                                                      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-                                                                                      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
-                                                                                      "dev": true
-                                                                                    },
-                                                                                    "dns-packet": {
-                                                                                      "version": "1.3.1",
-                                                                                      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
-                                                                                      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
-                                                                                      "dev": true,
-                                                                                      "requires": {
-                                                                                        "ip": "^1.1.0",
-                                                                                        "safe-buffer": "^5.0.1"
-                                                                                      }
-                                                                                    },
-                                                                                    "dns-txt": {
-                                                                                      "version": "2.0.2",
-                                                                                      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
-                                                                                      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
-                                                                                      "dev": true,
-                                                                                      "requires": {
-                                                                                        "buffer-indexof": "^1.0.0"
-                                                                                      }
-                                                                                    },
-                                                                                    "doctrine": {
-                                                                                      "version": "1.5.0",
-                                                                                      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-                                                                                      "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-                                                                                      "dev": true,
-                                                                                      "requires": {
-                                                                                        "esutils": "^2.0.2",
-                                                                                        "isarray": "^1.0.0"
-                                                                                      }
-                                                                                    },
-                                                                                    "dom-serialize": {
-                                                                                      "version": "2.2.1",
-                                                                                      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
-                                                                                      "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
-                                                                                      "dev": true,
-                                                                                      "requires": {
-                                                                                        "custom-event": "~1.0.0",
-                                                                                        "ent": "~2.2.0",
-                                                                                        "extend": "^3.0.0",
-                                                                                        "void-elements": "^2.0.0"
-                                                                                      }
-                                                                                    },
-                                                                                    "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.5",
-                                                                                      "resolved": "https://registry.npmjs.org/domino/-/domino-2.1.5.tgz",
-                                                                                      "integrity": "sha512-vMDo7f6ogUV9PkzmxXLiXzJkJZqU09Le4C40mj+HmAGS/2FPmdetoNOQZXpu2kekn0GJKvtwKMAVoruTj60Xww=="
-                                                                                    },
-                                                                                    "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": "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": "^2.0.0"
-                                                                                      },
-                                                                                      "dependencies": {
-                                                                                        "is-obj": {
-                                                                                          "version": "2.0.0",
-                                                                                          "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-                                                                                          "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-                                                                                          ===
-                                                                                          === =
-                                                                                          "dev": true
-                                                                                        },
-                                                                                        "detect-file": {
-                                                                                          "version": "1.0.0",
-                                                                                          "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-                                                                                          "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
-                                                                                          "dev": true
-                                                                                        },
-                                                                                        "detect-node": {
-                                                                                          "version": "2.0.4",
-                                                                                          "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
-                                                                                          "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
-                                                                                          "dev": true
-                                                                                        },
-                                                                                        "dezalgo": {
-                                                                                          "version": "1.0.3",
-                                                                                          "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz",
-                                                                                          "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=",
-                                                                                          "dev": true,
-                                                                                          "requires": {
-                                                                                            "asap": "^2.0.0",
-                                                                                            "wrappy": "1"
-                                                                                          }
-                                                                                        },
-                                                                                        "di": {
-                                                                                          "version": "0.0.1",
-                                                                                          "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
-                                                                                          "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
-                                                                                          "dev": true
-                                                                                        },
-                                                                                        "diff": {
-                                                                                          "version": "4.0.1",
-                                                                                          "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz",
-                                                                                          "integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==",
-                                                                                          "dev": true
-                                                                                        },
-                                                                                        "diffie-hellman": {
-                                                                                          "version": "5.0.3",
-                                                                                          "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-                                                                                          "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-                                                                                          "dev": true,
-                                                                                          "requires": {
-                                                                                            "bn.js": "^4.1.0",
-                                                                                            "miller-rabin": "^4.0.0",
-                                                                                            "randombytes": "^2.0.0"
-                                                                                          },
-                                                                                          "dependencies": {
-                                                                                            "bn.js": {
-                                                                                              "version": "4.11.9",
-                                                                                              "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-                                                                                              "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-                                                                                              "dev": true
-                                                                                            }
-                                                                                          }
-                                                                                        },
-                                                                                        "dir-glob": {
-                                                                                          "version": "2.2.2",
-                                                                                          "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
-                                                                                          "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
-                                                                                          "dev": true,
-                                                                                          "requires": {
-                                                                                            "path-type": "^3.0.0"
-                                                                                          }
-                                                                                        },
-                                                                                        "dns-equal": {
-                                                                                          "version": "1.0.0",
-                                                                                          "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-                                                                                          "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
-                                                                                          "dev": true
-                                                                                        },
-                                                                                        "dns-packet": {
-                                                                                          "version": "1.3.1",
-                                                                                          "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
-                                                                                          "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
-                                                                                          "dev": true,
-                                                                                          "requires": {
-                                                                                            "ip": "^1.1.0",
-                                                                                            "safe-buffer": "^5.0.1"
-                                                                                          }
-                                                                                        },
-                                                                                        "dns-txt": {
-                                                                                          "version": "2.0.2",
-                                                                                          "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
-                                                                                          "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
-                                                                                          "dev": true,
-                                                                                          "requires": {
-                                                                                            "buffer-indexof": "^1.0.0"
-                                                                                          }
-                                                                                        },
-                                                                                        "doctrine": {
-                                                                                          "version": "1.5.0",
-                                                                                          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-                                                                                          "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-                                                                                          "dev": true,
-                                                                                          "requires": {
-                                                                                            "esutils": "^2.0.2",
-                                                                                            "isarray": "^1.0.0"
-                                                                                          }
-                                                                                        },
-                                                                                        "dom-serialize": {
-                                                                                          "version": "2.2.1",
-                                                                                          "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
-                                                                                          "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
-                                                                                          "dev": true,
-                                                                                          "requires": {
-                                                                                            "custom-event": "~1.0.0",
-                                                                                            "ent": "~2.2.0",
-                                                                                            "extend": "^3.0.0",
-                                                                                            "void-elements": "^2.0.0"
-                                                                                          }
-                                                                                        },
-                                                                                        "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==",
-                                                                                              >>>
-                                                                                              >>> > upstream / master "dev": true
-                                                                                            }
-                                                                                          }
-                                                                                        },
-                                                                                        <<
-                                                                                        << << < HEAD "duplexer": {
-                                                                                          "version": "0.1.1",
-                                                                                          "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
-                                                                                          "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
-                                                                                          "dev": true
-                                                                                        },
-                                                                                        "duplexer3": {
-                                                                                          "version": "0.1.4",
-                                                                                          "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-                                                                                          "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
-                                                                                          "dev": true
-                                                                                        },
-                                                                                        "duplexify": {
-                                                                                          "version": "3.7.1",
-                                                                                          "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-                                                                                          "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-                                                                                          "dev": true,
-                                                                                          "requires": {
-                                                                                            "end-of-stream": "^1.0.0",
-                                                                                            "inherits": "^2.0.1",
-                                                                                            "readable-stream": "^2.0.0",
-                                                                                            "stream-shift": "^1.0.0"
-                                                                                          }
-                                                                                        },
-                                                                                        "each-props": {
-                                                                                          "version": "1.3.2",
-                                                                                          "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
-                                                                                          "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
-                                                                                          "dev": true,
-                                                                                          "requires": {
-                                                                                            "is-plain-object": "^2.0.1",
-                                                                                            "object.defaults": "^1.1.0"
-                                                                                          }
-                                                                                        },
-                                                                                        "ecc-jsbn": {
-                                                                                          "version": "0.1.2",
-                                                                                          "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-                                                                                          "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-                                                                                          "dev": true,
-                                                                                          "requires": {
-                                                                                            ===
-                                                                                            === =
-                                                                                            "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.5",
-                                                                                              "resolved": "https://registry.npmjs.org/domino/-/domino-2.1.5.tgz",
-                                                                                              "integrity": "sha512-vMDo7f6ogUV9PkzmxXLiXzJkJZqU09Le4C40mj+HmAGS/2FPmdetoNOQZXpu2kekn0GJKvtwKMAVoruTj60Xww=="
-                                                                                            },
-                                                                                            "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": "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": "^2.0.0"
-                                                                                              },
-                                                                                              "dependencies": {
-                                                                                                "is-obj": {
-                                                                                                  "version": "2.0.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-                                                                                                  "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-                                                                                                  "dev": true
-                                                                                                }
-                                                                                              }
-                                                                                            },
-                                                                                            "duplexer": {
-                                                                                              "version": "0.1.1",
-                                                                                              "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
-                                                                                              "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
-                                                                                              "dev": true
-                                                                                            },
-                                                                                            "duplexer3": {
-                                                                                              "version": "0.1.4",
-                                                                                              "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-                                                                                              "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
-                                                                                              "dev": true
-                                                                                            },
-                                                                                            "duplexify": {
-                                                                                              "version": "3.7.1",
-                                                                                              "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-                                                                                              "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "end-of-stream": "^1.0.0",
-                                                                                                "inherits": "^2.0.1",
-                                                                                                "readable-stream": "^2.0.0",
-                                                                                                "stream-shift": "^1.0.0"
-                                                                                              }
-                                                                                            },
-                                                                                            "each-props": {
-                                                                                              "version": "1.3.2",
-                                                                                              "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
-                                                                                              "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "is-plain-object": "^2.0.1",
-                                                                                                "object.defaults": "^1.1.0"
-                                                                                              }
-                                                                                            },
-                                                                                            "ecc-jsbn": {
-                                                                                              "version": "0.1.2",
-                                                                                              "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-                                                                                              "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                >>>
-                                                                                                >>> > upstream / master "jsbn": "~0.1.0",
-                                                                                                "safer-buffer": "^2.1.0"
-                                                                                              }
-                                                                                            },
-                                                                                            "ee-first": {
-                                                                                              "version": "1.1.1",
-                                                                                              "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-                                                                                              "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-                                                                                              "dev": true
-                                                                                            },
-                                                                                            "electron-to-chromium": {
-                                                                                              "version": "1.3.465",
-                                                                                              "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.465.tgz",
-                                                                                              "integrity": "sha512-K/lUeT3NLAsJ5SHRDhK3/zd0tw7OUllYD8w+fTOXm6ljCPsp2qq+vMzxpLo8u1M27ZjZAjRbsA6rirvne2nAMQ==",
-                                                                                              "dev": true
-                                                                                            },
-                                                                                            "elliptic": {
-                                                                                              "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",
-                                                                                                "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"
-                                                                                              },
-                                                                                              "dependencies": {
-                                                                                                "bn.js": {
-                                                                                                  "version": "4.11.9",
-                                                                                                  "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-                                                                                                  "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-                                                                                                  "dev": true
-                                                                                                }
-                                                                                              }
-                                                                                            },
-                                                                                            "emoji-regex": {
-                                                                                              "version": "8.0.0",
-                                                                                              "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-                                                                                              "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-                                                                                            },
-                                                                                            "emojis-list": {
-                                                                                              "version": "3.0.0",
-                                                                                              "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-                                                                                              "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
-                                                                                            },
-                                                                                            "encodeurl": {
-                                                                                              "version": "1.0.2",
-                                                                                              "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-                                                                                              "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-                                                                                              "dev": true
-                                                                                            },
-                                                                                            "encoding": {
-                                                                                              "version": "0.1.12",
-                                                                                              "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
-                                                                                              "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "iconv-lite": "~0.4.13"
-                                                                                              }
-                                                                                            },
-                                                                                            "end-of-stream": {
-                                                                                              "version": "1.4.4",
-                                                                                              "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-                                                                                              "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-                                                                                              "requires": {
-                                                                                                "once": "^1.4.0"
-                                                                                              }
-                                                                                            },
-                                                                                            "engine.io": {
-                                                                                              "version": "3.2.1",
-                                                                                              "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz",
-                                                                                              "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "accepts": "~1.3.4",
-                                                                                                "base64id": "1.0.0",
-                                                                                                "cookie": "0.3.1",
-                                                                                                "debug": "~3.1.0",
-                                                                                                "engine.io-parser": "~2.1.0",
-                                                                                                "ws": "~3.3.1"
-                                                                                              },
-                                                                                              "dependencies": {
-                                                                                                "cookie": {
-                                                                                                  "version": "0.3.1",
-                                                                                                  "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-                                                                                                  "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "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": {
-                                                                                                    "ms": "2.0.0"
-                                                                                                  }
-                                                                                                },
-                                                                                                "ws": {
-                                                                                                  "version": "3.3.3",
-                                                                                                  "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-                                                                                                  "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "async-limiter": "~1.0.0",
-                                                                                                    "safe-buffer": "~5.1.0",
-                                                                                                    "ultron": "~1.1.0"
-                                                                                                  }
-                                                                                                }
-                                                                                              }
-                                                                                            },
-                                                                                            "engine.io-client": {
-                                                                                              "version": "3.2.1",
-                                                                                              "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
-                                                                                              "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "component-emitter": "1.2.1",
-                                                                                                "component-inherit": "0.0.3",
-                                                                                                "debug": "~3.1.0",
-                                                                                                "engine.io-parser": "~2.1.1",
-                                                                                                "has-cors": "1.1.0",
-                                                                                                "indexof": "0.0.1",
-                                                                                                "parseqs": "0.0.5",
-                                                                                                "parseuri": "0.0.5",
-                                                                                                "ws": "~3.3.1",
-                                                                                                "xmlhttprequest-ssl": "~1.5.4",
-                                                                                                "yeast": "0.1.2"
-                                                                                              },
-                                                                                              "dependencies": {
-                                                                                                "component-emitter": {
-                                                                                                  "version": "1.2.1",
-                                                                                                  "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-                                                                                                  "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "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": {
-                                                                                                    "ms": "2.0.0"
-                                                                                                  }
-                                                                                                },
-                                                                                                "ws": {
-                                                                                                  "version": "3.3.3",
-                                                                                                  "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-                                                                                                  "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "async-limiter": "~1.0.0",
-                                                                                                    "safe-buffer": "~5.1.0",
-                                                                                                    "ultron": "~1.1.0"
-                                                                                                  }
-                                                                                                }
-                                                                                              }
-                                                                                            },
-                                                                                            "engine.io-parser": {
-                                                                                              "version": "2.1.3",
-                                                                                              "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz",
-                                                                                              "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "after": "0.8.2",
-                                                                                                "arraybuffer.slice": "~0.0.7",
-                                                                                                "base64-arraybuffer": "0.1.5",
-                                                                                                "blob": "0.0.5",
-                                                                                                "has-binary2": "~1.0.2"
-                                                                                              }
-                                                                                            },
-                                                                                            "enhanced-resolve": {
-                                                                                              "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.5.0",
-                                                                                                "tapable": "^1.0.0"
-                                                                                              }
-                                                                                            },
-                                                                                            "ent": {
-                                                                                              "version": "2.2.0",
-                                                                                              "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-                                                                                              "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
-                                                                                              "dev": true
-                                                                                            },
-                                                                                            "entities": {
-                                                                                              "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": {
-                                                                                              "version": "1.1.2",
-                                                                                              "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz",
-                                                                                              "integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=",
-                                                                                              "dev": true
-                                                                                            },
-                                                                                            "errno": {
-                                                                                              "version": "0.1.7",
-                                                                                              "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-                                                                                              "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
-                                                                                              <<
-                                                                                              << << < HEAD "dev": true,
-                                                                                              "requires": {
-                                                                                                "prr": "~1.0.1"
-                                                                                              }
-                                                                                            },
-                                                                                            "error-ex": {
-                                                                                              "version": "1.3.2",
-                                                                                              "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-                                                                                              "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "is-arrayish": "^0.2.1"
-                                                                                              }
-                                                                                            },
-                                                                                            "error-stack-parser": {
-                                                                                              "version": "2.0.4",
-                                                                                              "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.4.tgz",
-                                                                                              "integrity": "sha512-fZ0KkoxSjLFmhW5lHbUT3tLwy3nX1qEzMYo8koY1vrsAco53CMT1djnBSeC/wUjTEZRhZl9iRw7PaMaxfJ4wzQ==",
-                                                                                              "requires": {
-                                                                                                "stackframe": "^1.1.0"
-                                                                                              }
-                                                                                            },
-                                                                                            "es-abstract": {
-                                                                                              "version": "1.14.2",
-                                                                                              "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.14.2.tgz",
-                                                                                              "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.0.0",
-                                                                                                "string.prototype.trimright": "^2.0.0"
-                                                                                              }
-                                                                                            },
-                                                                                            "es-to-primitive": {
-                                                                                              "version": "1.2.0",
-                                                                                              "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
-                                                                                              "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"
-                                                                                              }
-                                                                                            },
-                                                                                            "es5-ext": {
-                                                                                              "version": "0.10.51",
-                                                                                              "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.51.tgz",
-                                                                                              "integrity": "sha512-oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ==",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "es6-iterator": "~2.0.3",
-                                                                                                "es6-symbol": "~3.1.1",
-                                                                                                "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",
-                                                                                              "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "d": "1",
-                                                                                                "es5-ext": "^0.10.35",
-                                                                                                "es6-symbol": "^3.1.1"
-                                                                                              }
-                                                                                            },
-                                                                                            "es6-map": {
-                                                                                              "version": "0.1.5",
-                                                                                              "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
-                                                                                              "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "d": "1",
-                                                                                                "es5-ext": "~0.10.14",
-                                                                                                "es6-iterator": "~2.0.1",
-                                                                                                "es6-set": "~0.1.5",
-                                                                                                "es6-symbol": "~3.1.1",
-                                                                                                "event-emitter": "~0.3.5"
-                                                                                              }
-                                                                                            },
-                                                                                            "es6-promise": {
-                                                                                              "version": "4.2.8",
-                                                                                              "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-                                                                                              "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
-                                                                                              "dev": true
-                                                                                            },
-                                                                                            "es6-promisify": {
-                                                                                              "version": "5.0.0",
-                                                                                              "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
-                                                                                              "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "es6-promise": "^4.0.3"
-                                                                                              }
-                                                                                            },
-                                                                                            "es6-set": {
-                                                                                              "version": "0.1.5",
-                                                                                              "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
-                                                                                              "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "d": "1",
-                                                                                                "es5-ext": "~0.10.14",
-                                                                                                "es6-iterator": "~2.0.1",
-                                                                                                "es6-symbol": "3.1.1",
-                                                                                                "event-emitter": "~0.3.5"
-                                                                                              },
-                                                                                              "dependencies": {
-                                                                                                "es6-symbol": {
-                                                                                                  "version": "3.1.1",
-                                                                                                  "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
-                                                                                                  "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "d": "1",
-                                                                                                    "es5-ext": "~0.10.14"
-                                                                                                  }
-                                                                                                }
-                                                                                              }
-                                                                                            },
-                                                                                            "es6-symbol": {
-                                                                                              "version": "3.1.2",
-                                                                                              "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.2.tgz",
-                                                                                              "integrity": "sha512-/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ==",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "d": "^1.0.1",
-                                                                                                "es5-ext": "^0.10.51"
-                                                                                              }
-                                                                                            },
-                                                                                            "es6-weak-map": {
-                                                                                              "version": "2.0.3",
-                                                                                              "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
-                                                                                              "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "d": "1",
-                                                                                                "es5-ext": "^0.10.46",
-                                                                                                "es6-iterator": "^2.0.3",
-                                                                                                "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",
-                                                                                              "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-                                                                                              "dev": true
-                                                                                            },
-                                                                                            "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=",
-                                                                                              "dev": true
-                                                                                            },
-                                                                                            "escodegen": {
-                                                                                              "version": "1.8.1",
-                                                                                              "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
-                                                                                              "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "esprima": "^2.7.1",
-                                                                                                "estraverse": "^1.9.1",
-                                                                                                "esutils": "^2.0.2",
-                                                                                                "optionator": "^0.8.1",
-                                                                                                "source-map": "~0.2.0"
-                                                                                              },
-                                                                                              "dependencies": {
-                                                                                                "esprima": {
-                                                                                                  "version": "2.7.3",
-                                                                                                  "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-                                                                                                  "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "estraverse": {
-                                                                                                  "version": "1.9.3",
-                                                                                                  "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
-                                                                                                  "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "source-map": {
-                                                                                                  "version": "0.2.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
-                                                                                                  "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
-                                                                                                  "dev": true,
-                                                                                                  "optional": true,
-                                                                                                  "requires": {
-                                                                                                    "amdefine": ">=0.0.4"
-                                                                                                  }
-                                                                                                }
-                                                                                              }
-                                                                                            },
-                                                                                            "escope": {
-                                                                                              "version": "3.6.0",
-                                                                                              "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
-                                                                                              "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "es6-map": "^0.1.3",
-                                                                                                "es6-weak-map": "^2.0.1",
-                                                                                                "esrecurse": "^4.1.0",
-                                                                                                "estraverse": "^4.1.1"
-                                                                                              }
-                                                                                            },
-                                                                                            "eslint": {
-                                                                                              "version": "2.13.1",
-                                                                                              "resolved": "https://registry.npmjs.org/eslint/-/eslint-2.13.1.tgz",
-                                                                                              "integrity": "sha1-5MyPoPAJ+4KaquI4VaKTYL4fbBE=",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "chalk": "^1.1.3",
-                                                                                                "concat-stream": "^1.4.6",
-                                                                                                "debug": "^2.1.1",
-                                                                                                "doctrine": "^1.2.2",
-                                                                                                "es6-map": "^0.1.3",
-                                                                                                "escope": "^3.6.0",
-                                                                                                "espree": "^3.1.6",
-                                                                                                "estraverse": "^4.2.0",
-                                                                                                "esutils": "^2.0.2",
-                                                                                                "file-entry-cache": "^1.1.1",
-                                                                                                "glob": "^7.0.3",
-                                                                                                "globals": "^9.2.0",
-                                                                                                "ignore": "^3.1.2",
-                                                                                                "imurmurhash": "^0.1.4",
-                                                                                                "inquirer": "^0.12.0",
-                                                                                                "is-my-json-valid": "^2.10.0",
-                                                                                                "is-resolvable": "^1.0.0",
-                                                                                                "js-yaml": "^3.5.1",
-                                                                                                "json-stable-stringify": "^1.0.0",
-                                                                                                "levn": "^0.3.0",
-                                                                                                "lodash": "^4.0.0",
-                                                                                                "mkdirp": "^0.5.0",
-                                                                                                "optionator": "^0.8.1",
-                                                                                                "path-is-absolute": "^1.0.0",
-                                                                                                "path-is-inside": "^1.0.1",
-                                                                                                "pluralize": "^1.2.1",
-                                                                                                "progress": "^1.1.8",
-                                                                                                "require-uncached": "^1.0.2",
-                                                                                                "shelljs": "^0.6.0",
-                                                                                                "strip-json-comments": "~1.0.1",
-                                                                                                "table": "^3.7.8",
-                                                                                                "text-table": "~0.2.0",
-                                                                                                "user-home": "^2.0.0"
-                                                                                              },
-                                                                                              "dependencies": {
-                                                                                                "ansi-escapes": {
-                                                                                                  "version": "1.4.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
-                                                                                                  "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "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": {
-                                                                                                    "prr": "~1.0.1"
-                                                                                                  }
-                                                                                                },
-                                                                                                "error-ex": {
-                                                                                                  "version": "1.3.2",
-                                                                                                  "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-                                                                                                  "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "is-arrayish": "^0.2.1"
-                                                                                                  }
-                                                                                                },
-                                                                                                "error-stack-parser": {
-                                                                                                  "version": "2.0.4",
-                                                                                                  "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.4.tgz",
-                                                                                                  "integrity": "sha512-fZ0KkoxSjLFmhW5lHbUT3tLwy3nX1qEzMYo8koY1vrsAco53CMT1djnBSeC/wUjTEZRhZl9iRw7PaMaxfJ4wzQ==",
-                                                                                                  "requires": {
-                                                                                                    "stackframe": "^1.1.0"
-                                                                                                  }
-                                                                                                },
-                                                                                                "es-abstract": {
-                                                                                                  "version": "1.14.2",
-                                                                                                  "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.14.2.tgz",
-                                                                                                  "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.0.0",
-                                                                                                    "string.prototype.trimright": "^2.0.0"
-                                                                                                  }
-                                                                                                },
-                                                                                                "es-to-primitive": {
-                                                                                                  "version": "1.2.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
-                                                                                                  "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"
-                                                                                                  }
-                                                                                                },
-                                                                                                "es5-ext": {
-                                                                                                  "version": "0.10.51",
-                                                                                                  "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.51.tgz",
-                                                                                                  "integrity": "sha512-oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "es6-iterator": "~2.0.3",
-                                                                                                    "es6-symbol": "~3.1.1",
-                                                                                                    "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",
-                                                                                                  "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "d": "1",
-                                                                                                    "es5-ext": "^0.10.35",
-                                                                                                    "es6-symbol": "^3.1.1"
-                                                                                                  }
-                                                                                                },
-                                                                                                "es6-map": {
-                                                                                                  "version": "0.1.5",
-                                                                                                  "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
-                                                                                                  "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "d": "1",
-                                                                                                    "es5-ext": "~0.10.14",
-                                                                                                    "es6-iterator": "~2.0.1",
-                                                                                                    "es6-set": "~0.1.5",
-                                                                                                    "es6-symbol": "~3.1.1",
-                                                                                                    "event-emitter": "~0.3.5"
-                                                                                                  }
-                                                                                                },
-                                                                                                "es6-promise": {
-                                                                                                  "version": "4.2.8",
-                                                                                                  "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-                                                                                                  "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "es6-promisify": {
-                                                                                                  "version": "5.0.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
-                                                                                                  "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "es6-promise": "^4.0.3"
-                                                                                                  }
-                                                                                                },
-                                                                                                "es6-set": {
-                                                                                                  "version": "0.1.5",
-                                                                                                  "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
-                                                                                                  "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "d": "1",
-                                                                                                    "es5-ext": "~0.10.14",
-                                                                                                    "es6-iterator": "~2.0.1",
-                                                                                                    "es6-symbol": "3.1.1",
-                                                                                                    "event-emitter": "~0.3.5"
-                                                                                                  },
-                                                                                                  "dependencies": {
-                                                                                                    "es6-symbol": {
-                                                                                                      "version": "3.1.1",
-                                                                                                      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
-                                                                                                      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-                                                                                                      "dev": true,
-                                                                                                      "requires": {
-                                                                                                        "d": "1",
-                                                                                                        "es5-ext": "~0.10.14"
-                                                                                                      }
-                                                                                                    }
-                                                                                                  }
-                                                                                                },
-                                                                                                "es6-symbol": {
-                                                                                                  "version": "3.1.2",
-                                                                                                  "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.2.tgz",
-                                                                                                  "integrity": "sha512-/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "d": "^1.0.1",
-                                                                                                    "es5-ext": "^0.10.51"
-                                                                                                  }
-                                                                                                },
-                                                                                                "es6-weak-map": {
-                                                                                                  "version": "2.0.3",
-                                                                                                  "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
-                                                                                                  "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "d": "1",
-                                                                                                    "es5-ext": "^0.10.46",
-                                                                                                    "es6-iterator": "^2.0.3",
-                                                                                                    "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",
-                                                                                                  "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "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=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "escodegen": {
-                                                                                                  "version": "1.8.1",
-                                                                                                  "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
-                                                                                                  "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "esprima": "^2.7.1",
-                                                                                                    "estraverse": "^1.9.1",
-                                                                                                    "esutils": "^2.0.2",
-                                                                                                    "optionator": "^0.8.1",
-                                                                                                    "source-map": "~0.2.0"
-                                                                                                  },
-                                                                                                  "dependencies": {
-                                                                                                    "esprima": {
-                                                                                                      "version": "2.7.3",
-                                                                                                      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-                                                                                                      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
-                                                                                                      "dev": true
-                                                                                                    },
-                                                                                                    "estraverse": {
-                                                                                                      "version": "1.9.3",
-                                                                                                      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
-                                                                                                      "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
-                                                                                                      "dev": true
-                                                                                                    },
-                                                                                                    "source-map": {
-                                                                                                      "version": "0.2.0",
-                                                                                                      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
-                                                                                                      "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
-                                                                                                      >>>
-                                                                                                      >>> > upstream / master "dev": true,
-                                                                                                      "optional": true,
-                                                                                                      "requires": {
-                                                                                                        <<
-                                                                                                        << << < HEAD "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"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "cli-cursor": {
-                                                                                                      "version": "1.0.2",
-                                                                                                      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
-                                                                                                      "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
-                                                                                                      "dev": true,
-                                                                                                      "requires": {
-                                                                                                        "restore-cursor": "^1.0.1"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "figures": {
-                                                                                                      "version": "1.7.0",
-                                                                                                      "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-                                                                                                      "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-                                                                                                      "dev": true,
-                                                                                                      "requires": {
-                                                                                                        "escape-string-regexp": "^1.0.5",
-                                                                                                        "object-assign": "^4.1.0"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "globals": {
-                                                                                                      "version": "9.18.0",
-                                                                                                      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-                                                                                                      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-                                                                                                      "dev": true
-                                                                                                    },
-                                                                                                    "inquirer": {
-                                                                                                      "version": "0.12.0",
-                                                                                                      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
-                                                                                                      "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
-                                                                                                      "dev": true,
-                                                                                                      "requires": {
-                                                                                                        "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": {
-                                                                                                      "version": "1.1.0",
-                                                                                                      "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-                                                                                                      "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-                                                                                                      "dev": true
-                                                                                                    },
-                                                                                                    "restore-cursor": {
-                                                                                                      "version": "1.0.1",
-                                                                                                      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
-                                                                                                      "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
-                                                                                                      "dev": true,
-                                                                                                      "requires": {
-                                                                                                        "exit-hook": "^1.0.0",
-                                                                                                        "onetime": "^1.0.0"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "run-async": {
-                                                                                                      "version": "0.1.0",
-                                                                                                      "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
-                                                                                                      "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
-                                                                                                      "dev": true,
-                                                                                                      "requires": {
-                                                                                                        "once": "^1.3.0"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "shelljs": {
-                                                                                                      "version": "0.6.1",
-                                                                                                      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.6.1.tgz",
-                                                                                                      "integrity": "sha1-7GIRvtGSBEIIj+D3Cyg3Iy7SyKg=",
-                                                                                                      "dev": true
-                                                                                                    },
-                                                                                                    ===
-                                                                                                    === =
-                                                                                                    "amdefine": ">=0.0.4"
-                                                                                                  }
-                                                                                                }
-                                                                                              }
-                                                                                            },
-                                                                                            "escope": {
-                                                                                              "version": "3.6.0",
-                                                                                              "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
-                                                                                              "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "es6-map": "^0.1.3",
-                                                                                                "es6-weak-map": "^2.0.1",
-                                                                                                "esrecurse": "^4.1.0",
-                                                                                                "estraverse": "^4.1.1"
-                                                                                              }
-                                                                                            },
-                                                                                            "eslint": {
-                                                                                              "version": "2.13.1",
-                                                                                              "resolved": "https://registry.npmjs.org/eslint/-/eslint-2.13.1.tgz",
-                                                                                              "integrity": "sha1-5MyPoPAJ+4KaquI4VaKTYL4fbBE=",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "chalk": "^1.1.3",
-                                                                                                "concat-stream": "^1.4.6",
-                                                                                                "debug": "^2.1.1",
-                                                                                                "doctrine": "^1.2.2",
-                                                                                                "es6-map": "^0.1.3",
-                                                                                                "escope": "^3.6.0",
-                                                                                                "espree": "^3.1.6",
-                                                                                                "estraverse": "^4.2.0",
-                                                                                                "esutils": "^2.0.2",
-                                                                                                "file-entry-cache": "^1.1.1",
-                                                                                                "glob": "^7.0.3",
-                                                                                                "globals": "^9.2.0",
-                                                                                                "ignore": "^3.1.2",
-                                                                                                "imurmurhash": "^0.1.4",
-                                                                                                "inquirer": "^0.12.0",
-                                                                                                "is-my-json-valid": "^2.10.0",
-                                                                                                "is-resolvable": "^1.0.0",
-                                                                                                "js-yaml": "^3.5.1",
-                                                                                                "json-stable-stringify": "^1.0.0",
-                                                                                                "levn": "^0.3.0",
-                                                                                                "lodash": "^4.0.0",
-                                                                                                "mkdirp": "^0.5.0",
-                                                                                                "optionator": "^0.8.1",
-                                                                                                "path-is-absolute": "^1.0.0",
-                                                                                                "path-is-inside": "^1.0.1",
-                                                                                                "pluralize": "^1.2.1",
-                                                                                                "progress": "^1.1.8",
-                                                                                                "require-uncached": "^1.0.2",
-                                                                                                "shelljs": "^0.6.0",
-                                                                                                "strip-json-comments": "~1.0.1",
-                                                                                                "table": "^3.7.8",
-                                                                                                "text-table": "~0.2.0",
-                                                                                                "user-home": "^2.0.0"
-                                                                                              },
-                                                                                              "dependencies": {
-                                                                                                "ansi-escapes": {
-                                                                                                  "version": "1.4.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
-                                                                                                  "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "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"
-                                                                                                  }
-                                                                                                },
-                                                                                                "cli-cursor": {
-                                                                                                  "version": "1.0.2",
-                                                                                                  "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
-                                                                                                  "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "restore-cursor": "^1.0.1"
-                                                                                                  }
-                                                                                                },
-                                                                                                "figures": {
-                                                                                                  "version": "1.7.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-                                                                                                  "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "escape-string-regexp": "^1.0.5",
-                                                                                                    "object-assign": "^4.1.0"
-                                                                                                  }
-                                                                                                },
-                                                                                                "globals": {
-                                                                                                  "version": "9.18.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-                                                                                                  "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "inquirer": {
-                                                                                                  "version": "0.12.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
-                                                                                                  "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "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": {
-                                                                                                  "version": "1.1.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-                                                                                                  "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "restore-cursor": {
-                                                                                                  "version": "1.0.1",
-                                                                                                  "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
-                                                                                                  "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "exit-hook": "^1.0.0",
-                                                                                                    "onetime": "^1.0.0"
-                                                                                                  }
-                                                                                                },
-                                                                                                "run-async": {
-                                                                                                  "version": "0.1.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
-                                                                                                  "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "once": "^1.3.0"
-                                                                                                  }
-                                                                                                },
-                                                                                                "shelljs": {
-                                                                                                  "version": "0.6.1",
-                                                                                                  "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.6.1.tgz",
-                                                                                                  "integrity": "sha1-7GIRvtGSBEIIj+D3Cyg3Iy7SyKg=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                >>>
-                                                                                                >>> > upstream / master "strip-json-comments": {
-                                                                                                  "version": "1.0.4",
-                                                                                                  "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
-                                                                                                  "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=",
-                                                                                                  "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
-                                                                                                }
-                                                                                              }
-                                                                                            },
-                                                                                            "eslint-scope": {
-                                                                                              "version": "4.0.3",
-                                                                                              "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-                                                                                              "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "esrecurse": "^4.1.0",
-                                                                                                "estraverse": "^4.1.1"
-                                                                                              }
-                                                                                            },
-                                                                                            "espree": {
-                                                                                              "version": "3.5.4",
-                                                                                              "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
-                                                                                              "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "acorn": "^5.5.0",
-                                                                                                "acorn-jsx": "^3.0.0"
-                                                                                              },
-                                                                                              "dependencies": {
-                                                                                                "acorn": {
-                                                                                                  "version": "5.7.3",
-                                                                                                  "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
-                                                                                                  "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
-                                                                                                  "dev": true
-                                                                                                }
-                                                                                              }
-                                                                                            },
-                                                                                            "esprima": {
-                                                                                              "version": "4.0.1",
-                                                                                              "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-                                                                                              "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-                                                                                              "dev": true
-                                                                                            },
-                                                                                            "esrecurse": {
-                                                                                              "version": "4.2.1",
-                                                                                              "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-                                                                                              "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "estraverse": "^4.1.0"
-                                                                                              }
-                                                                                            },
-                                                                                            "estraverse": {
-                                                                                              "version": "4.3.0",
-                                                                                              "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-                                                                                              "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-                                                                                              "dev": true
-                                                                                            },
-                                                                                            "estree-walker": {
-                                                                                              "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": {
-                                                                                              "version": "2.0.3",
-                                                                                              "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-                                                                                              "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-                                                                                              <<
-                                                                                              << << < HEAD "dev": true
-                                                                                            },
-                                                                                            "etag": {
-                                                                                              "version": "1.8.1",
-                                                                                              "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-                                                                                              "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-                                                                                              "dev": true
-                                                                                            },
-                                                                                            "event-emitter": {
-                                                                                              "version": "0.3.5",
-                                                                                              "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-                                                                                              "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "d": "1",
-                                                                                                "es5-ext": "~0.10.14"
-                                                                                              }
-                                                                                            },
-                                                                                            "event-stream": {
-                                                                                              "version": "3.3.4",
-                                                                                              "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
-                                                                                              "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "duplexer": "~0.1.1",
-                                                                                                "from": "~0",
-                                                                                                "map-stream": "~0.1.0",
-                                                                                                "pause-stream": "0.0.11",
-                                                                                                "split": "0.3",
-                                                                                                "stream-combiner": "~0.0.4",
-                                                                                                "through": "~2.3.1"
-                                                                                              }
-                                                                                            },
-                                                                                            "eventemitter3": {
-                                                                                              "version": "4.0.4",
-                                                                                              "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz",
-                                                                                              "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==",
-                                                                                              "dev": true
-                                                                                            },
-                                                                                            "events": {
-                                                                                              "version": "3.1.0",
-                                                                                              "resolved": "https://registry.npmjs.org/events/-/events-3.1.0.tgz",
-                                                                                              "integrity": "sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==",
-                                                                                              "dev": true
-                                                                                            },
-                                                                                            "eventsource": {
-                                                                                              "version": "1.0.7",
-                                                                                              "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
-                                                                                              "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "original": "^1.0.0"
-                                                                                              }
-                                                                                            },
-                                                                                            "evp_bytestokey": {
-                                                                                              "version": "1.0.3",
-                                                                                              "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-                                                                                              "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "md5.js": "^1.3.4",
-                                                                                                "safe-buffer": "^5.1.1"
-                                                                                              }
-                                                                                            },
-                                                                                            "execa": {
-                                                                                              "version": "1.0.0",
-                                                                                              "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-                                                                                              "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-                                                                                              "requires": {
-                                                                                                ===
-                                                                                                === =
-                                                                                                "dev": true
-                                                                                              },
-                                                                                              "etag": {
-                                                                                                "version": "1.8.1",
-                                                                                                "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-                                                                                                "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-                                                                                                "dev": true
-                                                                                              },
-                                                                                              "event-emitter": {
-                                                                                                "version": "0.3.5",
-                                                                                                "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-                                                                                                "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-                                                                                                "dev": true,
-                                                                                                "requires": {
-                                                                                                  "d": "1",
-                                                                                                  "es5-ext": "~0.10.14"
-                                                                                                }
-                                                                                              },
-                                                                                              "event-stream": {
-                                                                                                "version": "3.3.4",
-                                                                                                "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
-                                                                                                "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
-                                                                                                "dev": true,
-                                                                                                "requires": {
-                                                                                                  "duplexer": "~0.1.1",
-                                                                                                  "from": "~0",
-                                                                                                  "map-stream": "~0.1.0",
-                                                                                                  "pause-stream": "0.0.11",
-                                                                                                  "split": "0.3",
-                                                                                                  "stream-combiner": "~0.0.4",
-                                                                                                  "through": "~2.3.1"
-                                                                                                }
-                                                                                              },
-                                                                                              "eventemitter3": {
-                                                                                                "version": "4.0.4",
-                                                                                                "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz",
-                                                                                                "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==",
-                                                                                                "dev": true
-                                                                                              },
-                                                                                              "events": {
-                                                                                                "version": "3.1.0",
-                                                                                                "resolved": "https://registry.npmjs.org/events/-/events-3.1.0.tgz",
-                                                                                                "integrity": "sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==",
-                                                                                                "dev": true
-                                                                                              },
-                                                                                              "eventsource": {
-                                                                                                "version": "1.0.7",
-                                                                                                "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
-                                                                                                "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
-                                                                                                "dev": true,
-                                                                                                "requires": {
-                                                                                                  "original": "^1.0.0"
-                                                                                                }
-                                                                                              },
-                                                                                              "evp_bytestokey": {
-                                                                                                "version": "1.0.3",
-                                                                                                "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-                                                                                                "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-                                                                                                "dev": true,
-                                                                                                "requires": {
-                                                                                                  "md5.js": "^1.3.4",
-                                                                                                  "safe-buffer": "^5.1.1"
-                                                                                                }
-                                                                                              },
-                                                                                              "execa": {
-                                                                                                "version": "1.0.0",
-                                                                                                "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-                                                                                                "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-                                                                                                "requires": {
-                                                                                                  >>>
-                                                                                                  >>> > upstream / master "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": {
-                                                                                                "version": "0.1.2",
-                                                                                                "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-                                                                                                "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-                                                                                                "dev": true
-                                                                                              },
-                                                                                              "exit-hook": {
-                                                                                                "version": "1.1.1",
-                                                                                                "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
-                                                                                                "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=",
-                                                                                                "dev": true
-                                                                                              },
-                                                                                              "expand-brackets": {
-                                                                                                "version": "2.1.4",
-                                                                                                "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-                                                                                                "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-                                                                                                <<
-                                                                                                << << < HEAD ===
-                                                                                                === =
-                                                                                                "dev": true,
-                                                                                                >>>
-                                                                                                >>> > upstream / master "requires": {
-                                                                                                  "debug": "^2.3.3",
-                                                                                                  "define-property": "^0.2.5",
-                                                                                                  "extend-shallow": "^2.0.1",
-                                                                                                  "posix-character-classes": "^0.1.0",
-                                                                                                  "regex-not": "^1.0.0",
-                                                                                                  "snapdragon": "^0.8.1",
-                                                                                                  "to-regex": "^3.0.1"
-                                                                                                },
-                                                                                                "dependencies": {
-                                                                                                  "define-property": {
-                                                                                                    "version": "0.2.5",
-                                                                                                    "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-                                                                                                    "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-                                                                                                    <<
-                                                                                                    << << < HEAD ===
-                                                                                                    === =
-                                                                                                    "dev": true,
-                                                                                                    >>>
-                                                                                                    >>> > upstream / master "requires": {
-                                                                                                      "is-descriptor": "^0.1.0"
-                                                                                                    }
-                                                                                                  },
-                                                                                                  "extend-shallow": {
-                                                                                                    "version": "2.0.1",
-                                                                                                    "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                                                                                                    "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                                                                                                    <<
-                                                                                                    << << < HEAD ===
-                                                                                                    === =
-                                                                                                    "dev": true,
-                                                                                                    >>>
-                                                                                                    >>> > upstream / master "requires": {
-                                                                                                      "is-extendable": "^0.1.0"
-                                                                                                    }
-                                                                                                  }
-                                                                                                }
-                                                                                              },
-                                                                                              "expand-tilde": {
-                                                                                                "version": "2.0.2",
-                                                                                                "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-                                                                                                "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-                                                                                                "dev": true,
-                                                                                                "requires": {
-                                                                                                  "homedir-polyfill": "^1.0.1" <<
-                                                                                                    << << < HEAD
-                                                                                                }
-                                                                                              },
-                                                                                              "express": {
-                                                                                                "version": "4.17.1",
-                                                                                                "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-                                                                                                "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
-                                                                                                "dev": true,
-                                                                                                "requires": {
-                                                                                                  "accepts": "~1.3.7",
-                                                                                                  "array-flatten": "1.1.1",
-                                                                                                  "body-parser": "1.19.0",
-                                                                                                  "content-disposition": "0.5.3",
-                                                                                                  "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",
-                                                                                                  "fresh": "0.5.2",
-                                                                                                  "merge-descriptors": "1.0.1",
-                                                                                                  "methods": "~1.1.2",
-                                                                                                  "on-finished": "~2.3.0",
-                                                                                                  "parseurl": "~1.3.3",
-                                                                                                  "path-to-regexp": "0.1.7",
-                                                                                                  "proxy-addr": "~2.0.5",
-                                                                                                  "qs": "6.7.0",
-                                                                                                  "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",
-                                                                                                  "utils-merge": "1.0.1",
-                                                                                                  "vary": "~1.1.2"
-                                                                                                },
-                                                                                                "dependencies": {
-                                                                                                  "array-flatten": {
-                                                                                                    "version": "1.1.1",
-                                                                                                    "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-                                                                                                    "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-                                                                                                    "dev": true
-                                                                                                  },
-                                                                                                  "qs": {
-                                                                                                    "version": "6.7.0",
-                                                                                                    "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-                                                                                                    "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-                                                                                                    "dev": true
-                                                                                                  }
-                                                                                                }
-                                                                                              },
-                                                                                              "extend": {
-                                                                                                "version": "3.0.2",
-                                                                                                "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-                                                                                                "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-                                                                                                "dev": true
-                                                                                              },
-                                                                                              "extend-shallow": {
-                                                                                                "version": "3.0.2",
-                                                                                                "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-                                                                                                "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-                                                                                                "requires": {
-                                                                                                  "assign-symbols": "^1.0.0",
-                                                                                                  "is-extendable": "^1.0.1"
-                                                                                                },
-                                                                                                "dependencies": {
-                                                                                                  "is-extendable": {
-                                                                                                    "version": "1.0.1",
-                                                                                                    "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-                                                                                                    "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-                                                                                                    "requires": {
-                                                                                                      "is-plain-object": "^2.0.4"
-                                                                                                    }
-                                                                                                  }
-                                                                                                }
-                                                                                              },
-                                                                                              "external-editor": {
-                                                                                                "version": "3.1.0",
-                                                                                                "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-                                                                                                "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-                                                                                                "dev": true,
-                                                                                                "requires": {
-                                                                                                  "chardet": "^0.7.0",
-                                                                                                  "iconv-lite": "^0.4.24",
-                                                                                                  "tmp": "^0.0.33"
-                                                                                                }
-                                                                                              },
-                                                                                              ===
-                                                                                              === =
-                                                                                            }
-                                                                                          },
-                                                                                          "express": {
-                                                                                            "version": "4.17.1",
-                                                                                            "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-                                                                                            "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
-                                                                                            "dev": true,
-                                                                                            "requires": {
-                                                                                              "accepts": "~1.3.7",
-                                                                                              "array-flatten": "1.1.1",
-                                                                                              "body-parser": "1.19.0",
-                                                                                              "content-disposition": "0.5.3",
-                                                                                              "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",
-                                                                                              "fresh": "0.5.2",
-                                                                                              "merge-descriptors": "1.0.1",
-                                                                                              "methods": "~1.1.2",
-                                                                                              "on-finished": "~2.3.0",
-                                                                                              "parseurl": "~1.3.3",
-                                                                                              "path-to-regexp": "0.1.7",
-                                                                                              "proxy-addr": "~2.0.5",
-                                                                                              "qs": "6.7.0",
-                                                                                              "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",
-                                                                                              "utils-merge": "1.0.1",
-                                                                                              "vary": "~1.1.2"
-                                                                                            },
-                                                                                            "dependencies": {
-                                                                                              "array-flatten": {
-                                                                                                "version": "1.1.1",
-                                                                                                "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-                                                                                                "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-                                                                                                "dev": true
-                                                                                              },
-                                                                                              "qs": {
-                                                                                                "version": "6.7.0",
-                                                                                                "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-                                                                                                "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-                                                                                                "dev": true
-                                                                                              }
-                                                                                            }
-                                                                                          },
-                                                                                          "extend": {
-                                                                                            "version": "3.0.2",
-                                                                                            "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-                                                                                            "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-                                                                                            "dev": true
-                                                                                          },
-                                                                                          "extend-shallow": {
-                                                                                            "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"
-                                                                                            },
-                                                                                            "dependencies": {
-                                                                                              "is-extendable": {
-                                                                                                "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"
-                                                                                                }
-                                                                                              }
-                                                                                            }
-                                                                                          },
-                                                                                          "external-editor": {
-                                                                                            "version": "3.1.0",
-                                                                                            "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-                                                                                            "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-                                                                                            "dev": true,
-                                                                                            "requires": {
-                                                                                              "chardet": "^0.7.0",
-                                                                                              "iconv-lite": "^0.4.24",
-                                                                                              "tmp": "^0.0.33"
-                                                                                            }
-                                                                                          },
-                                                                                          >>>
-                                                                                          >>> > upstream / master "extglob": {
-                                                                                            "version": "2.0.4",
-                                                                                            "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-                                                                                            "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-                                                                                            <<
-                                                                                            << << < HEAD ===
-                                                                                            === =
-                                                                                            "dev": true,
-                                                                                            >>>
-                                                                                            >>> > upstream / master "requires": {
-                                                                                              "array-unique": "^0.3.2",
-                                                                                              "define-property": "^1.0.0",
-                                                                                              "expand-brackets": "^2.1.4",
-                                                                                              "extend-shallow": "^2.0.1",
-                                                                                              "fragment-cache": "^0.2.1",
-                                                                                              "regex-not": "^1.0.0",
-                                                                                              "snapdragon": "^0.8.1",
-                                                                                              "to-regex": "^3.0.1"
-                                                                                            },
-                                                                                            "dependencies": {
-                                                                                              "define-property": {
-                                                                                                "version": "1.0.0",
-                                                                                                "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-                                                                                                "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-                                                                                                <<
-                                                                                                << << < HEAD "requires": {
-                                                                                                  "is-descriptor": "^1.0.0"
-                                                                                                }
-                                                                                              },
-                                                                                              "extend-shallow": {
-                                                                                                "version": "2.0.1",
-                                                                                                "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                                                                                                "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                                                                                                "requires": {
-                                                                                                  "is-extendable": "^0.1.0"
-                                                                                                }
-                                                                                              },
-                                                                                              ===
-                                                                                              === =
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "is-descriptor": "^1.0.0"
-                                                                                              }
-                                                                                            },
-                                                                                            "extend-shallow": {
-                                                                                              "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"
-                                                                                              }
-                                                                                            },
-                                                                                            >>>
-                                                                                            >>> > upstream / master "is-accessor-descriptor": {
-                                                                                              "version": "1.0.0",
-                                                                                              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-                                                                                              "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-                                                                                              <<
-                                                                                              << << < HEAD ===
-                                                                                              === =
-                                                                                              "dev": true,
-                                                                                              >>>
-                                                                                              >>> > upstream / master "requires": {
-                                                                                                "kind-of": "^6.0.0"
-                                                                                              }
-                                                                                            },
-                                                                                            "is-data-descriptor": {
-                                                                                              "version": "1.0.0",
-                                                                                              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-                                                                                              "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-                                                                                              <<
-                                                                                              << << < HEAD "requires": {
-                                                                                                "kind-of": "^6.0.0"
-                                                                                              }
-                                                                                            },
-                                                                                            "is-descriptor": {
-                                                                                              "version": "1.0.2",
-                                                                                              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-                                                                                              "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-                                                                                              "requires": {
-                                                                                                "is-accessor-descriptor": "^1.0.0",
-                                                                                                "is-data-descriptor": "^1.0.0",
-                                                                                                "kind-of": "^6.0.2"
-                                                                                              }
-                                                                                            }
-                                                                                          }
-                                                                                        },
-                                                                                        "extsprintf": {
-                                                                                          "version": "1.3.0",
-                                                                                          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-                                                                                          "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-                                                                                          "dev": true
-                                                                                        },
-                                                                                        "fancy-log": {
-                                                                                          "version": "1.3.3",
-                                                                                          "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
-                                                                                          "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
-                                                                                          "dev": true,
-                                                                                          "requires": {
-                                                                                            "ansi-gray": "^0.1.1",
-                                                                                            "color-support": "^1.1.3",
-                                                                                            "parse-node-version": "^1.0.0",
-                                                                                            "time-stamp": "^1.0.0"
-                                                                                          }
-                                                                                        },
-                                                                                        "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=="
-                                                                                        },
-                                                                                        "fast-glob": {
-                                                                                          "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.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": {
-                                                                                            "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"
-                                                                                              }
-                                                                                            },
-                                                                                            "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" ===
-                                                                                                  === =
-                                                                                                  "dev": true,
-                                                                                                "requires": {
-                                                                                                  "kind-of": "^6.0.0"
-                                                                                                }
-                                                                                              },
-                                                                                              "is-descriptor": {
-                                                                                                "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",
-                                                                                                  "kind-of": "^6.0.2" >>>
-                                                                                                    >>> > upstream / master
-                                                                                                }
-                                                                                              }
-                                                                                            }
-                                                                                          },
-                                                                                          <<
-                                                                                          << << < HEAD "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=="
-                                                                                          },
-                                                                                          "fast-levenshtein": {
-                                                                                            "version": "2.0.6",
-                                                                                            "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-                                                                                            "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-                                                                                            "dev": true
-                                                                                          },
-                                                                                          "fastparse": {
-                                                                                            "version": "1.1.2",
-                                                                                            "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
-                                                                                            "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
-                                                                                            "dev": true
-                                                                                          },
-                                                                                          "fastq": {
-                                                                                            "version": "1.8.0",
-                                                                                            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
-                                                                                            "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==",
-                                                                                            "dev": true,
-                                                                                            "requires": {
-                                                                                              "reusify": "^1.0.4"
-                                                                                            }
-                                                                                          },
-                                                                                          "faye-websocket": {
-                                                                                            "version": "0.10.0",
-                                                                                            "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
-                                                                                            "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
-                                                                                            "dev": true,
-                                                                                            "requires": {
-                                                                                              "websocket-driver": ">=0.5.1"
-                                                                                            }
-                                                                                          },
-                                                                                          "figgy-pudding": {
-                                                                                            "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.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"
-                                                                                            }
-                                                                                          },
-                                                                                          "file-entry-cache": {
-                                                                                            "version": "1.3.1",
-                                                                                            "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-1.3.1.tgz",
-                                                                                            "integrity": "sha1-RMYepgeuS+nBQC9B9EJwy/4zT/g=",
-                                                                                            "dev": true,
-                                                                                            "requires": {
-                                                                                              "flat-cache": "^1.2.1",
-                                                                                              "object-assign": "^4.0.1"
-                                                                                            }
-                                                                                          },
-                                                                                          "file-loader": {
-                                                                                            "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": "^2.0.0",
-                                                                                              "schema-utils": "^2.6.5"
-                                                                                            },
-                                                                                            "dependencies": {
-                                                                                              "ajv": {
-                                                                                                "version": "6.12.2",
-                                                                                                "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
-                                                                                                "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
-                                                                                                "dev": true,
-                                                                                                "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"
-                                                                                                }
-                                                                                              },
-                                                                                              "loader-utils": {
-                                                                                                "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": "^2.1.2"
-                                                                                                }
-                                                                                              },
-                                                                                              "schema-utils": {
-                                                                                                "version": "2.7.0",
-                                                                                                "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-                                                                                                "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
-                                                                                                "dev": true,
-                                                                                                "requires": {
-                                                                                                  "@types/json-schema": "^7.0.4",
-                                                                                                  "ajv": "^6.12.2",
-                                                                                                  "ajv-keywords": "^3.4.1"
-                                                                                                }
-                                                                                              }
-                                                                                            }
-                                                                                          },
-                                                                                          "fileset": {
-                                                                                            "version": "2.0.3",
-                                                                                            "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz",
-                                                                                            "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=",
-                                                                                            "dev": true,
-                                                                                            "requires": {
-                                                                                              "glob": "^7.0.3",
-                                                                                              "minimatch": "^3.0.3"
-                                                                                            }
-                                                                                          },
-                                                                                          "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"
-                                                                                            }
-                                                                                          },
-                                                                                          "finalhandler": {
-                                                                                            "version": "1.1.2",
-                                                                                            "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-                                                                                            "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-                                                                                            "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"
-                                                                                            }
-                                                                                          },
-                                                                                          "find-cache-dir": {
-                                                                                            "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.2",
-                                                                                              "pkg-dir": "^4.1.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"
-                                                                                                }
-                                                                                              },
-                                                                                              "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"
-                                                                                                }
-                                                                                              },
-                                                                                              "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
-                                                                                              },
-                                                                                              ===
-                                                                                              === =
-                                                                                              "extsprintf": {
-                                                                                                "version": "1.3.0",
-                                                                                                "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-                                                                                                "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-                                                                                                "dev": true
-                                                                                              },
-                                                                                              "fancy-log": {
-                                                                                                "version": "1.3.3",
-                                                                                                "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
-                                                                                                "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
-                                                                                                "dev": true,
-                                                                                                "requires": {
-                                                                                                  "ansi-gray": "^0.1.1",
-                                                                                                  "color-support": "^1.1.3",
-                                                                                                  "parse-node-version": "^1.0.0",
-                                                                                                  "time-stamp": "^1.0.0"
-                                                                                                }
-                                                                                              },
-                                                                                              "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=="
-                                                                                              },
-                                                                                              "fast-glob": {
-                                                                                                "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.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": {
-                                                                                                  "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"
-                                                                                                    }
-                                                                                                  },
-                                                                                                  "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"
-                                                                                                    }
-                                                                                                  }
-                                                                                                }
-                                                                                              },
-                                                                                              "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=="
-                                                                                              },
-                                                                                              "fast-levenshtein": {
-                                                                                                "version": "2.0.6",
-                                                                                                "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-                                                                                                "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-                                                                                                "dev": true
-                                                                                              },
-                                                                                              "fastparse": {
-                                                                                                "version": "1.1.2",
-                                                                                                "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
-                                                                                                "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
-                                                                                                "dev": true
-                                                                                              },
-                                                                                              "fastq": {
-                                                                                                "version": "1.8.0",
-                                                                                                "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
-                                                                                                "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==",
-                                                                                                "dev": true,
-                                                                                                "requires": {
-                                                                                                  "reusify": "^1.0.4"
-                                                                                                }
-                                                                                              },
-                                                                                              "faye-websocket": {
-                                                                                                "version": "0.10.0",
-                                                                                                "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
-                                                                                                "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
-                                                                                                "dev": true,
-                                                                                                "requires": {
-                                                                                                  "websocket-driver": ">=0.5.1"
-                                                                                                }
-                                                                                              },
-                                                                                              "figgy-pudding": {
-                                                                                                "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.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"
-                                                                                                }
-                                                                                              },
-                                                                                              "file-entry-cache": {
-                                                                                                "version": "1.3.1",
-                                                                                                "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-1.3.1.tgz",
-                                                                                                "integrity": "sha1-RMYepgeuS+nBQC9B9EJwy/4zT/g=",
-                                                                                                "dev": true,
-                                                                                                "requires": {
-                                                                                                  "flat-cache": "^1.2.1",
-                                                                                                  "object-assign": "^4.0.1"
-                                                                                                }
-                                                                                              },
-                                                                                              "file-loader": {
-                                                                                                "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": "^2.0.0",
-                                                                                                  "schema-utils": "^2.6.5"
-                                                                                                },
-                                                                                                "dependencies": {
-                                                                                                  "ajv": {
-                                                                                                    "version": "6.12.2",
-                                                                                                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
-                                                                                                    "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
-                                                                                                    "dev": true,
-                                                                                                    "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"
-                                                                                                    }
-                                                                                                  },
-                                                                                                  "loader-utils": {
-                                                                                                    "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": "^2.1.2"
-                                                                                                    }
-                                                                                                  },
-                                                                                                  "schema-utils": {
-                                                                                                    "version": "2.7.0",
-                                                                                                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-                                                                                                    "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
-                                                                                                    "dev": true,
-                                                                                                    "requires": {
-                                                                                                      "@types/json-schema": "^7.0.4",
-                                                                                                      "ajv": "^6.12.2",
-                                                                                                      "ajv-keywords": "^3.4.1"
-                                                                                                    }
-                                                                                                  }
-                                                                                                }
-                                                                                              },
-                                                                                              "fileset": {
-                                                                                                "version": "2.0.3",
-                                                                                                "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz",
-                                                                                                "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=",
-                                                                                                "dev": true,
-                                                                                                "requires": {
-                                                                                                  "glob": "^7.0.3",
-                                                                                                  "minimatch": "^3.0.3"
-                                                                                                }
-                                                                                              },
-                                                                                              "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"
-                                                                                                }
-                                                                                              },
-                                                                                              "finalhandler": {
-                                                                                                "version": "1.1.2",
-                                                                                                "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-                                                                                                "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-                                                                                                "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"
-                                                                                                }
-                                                                                              },
-                                                                                              "find-cache-dir": {
-                                                                                                "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.2",
-                                                                                                  "pkg-dir": "^4.1.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"
-                                                                                                    }
-                                                                                                  },
-                                                                                                  "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"
-                                                                                                    }
-                                                                                                  },
-                                                                                                  "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
-                                                                                                  },
-                                                                                                  >>>
-                                                                                                  >>> > upstream / master "pkg-dir": {
-                                                                                                    "version": "4.2.0",
-                                                                                                    "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-                                                                                                    "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-                                                                                                    "dev": true,
-                                                                                                    "requires": {
-                                                                                                      "find-up": "^4.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
-                                                                                                  }
-                                                                                                }
-                                                                                              },
-                                                                                              "find-parent-dir": {
-                                                                                                "version": "0.3.0",
-                                                                                                "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.0.tgz",
-                                                                                                "integrity": "sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=",
-                                                                                                "dev": true
-                                                                                              },
-                                                                                              "find-up": {
-                                                                                                "version": "2.1.0",
-                                                                                                "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-                                                                                                "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-                                                                                                "requires": {
-                                                                                                  "locate-path": "^2.0.0"
-                                                                                                }
-                                                                                              },
-                                                                                              "findup-sync": {
-                                                                                                "version": "3.0.0",
-                                                                                                "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
-                                                                                                "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
-                                                                                                "dev": true,
-                                                                                                "requires": {
-                                                                                                  "detect-file": "^1.0.0",
-                                                                                                  "is-glob": "^4.0.0",
-                                                                                                  "micromatch": "^3.0.4",
-                                                                                                  "resolve-dir": "^1.0.1"
-                                                                                                },
-                                                                                                "dependencies": {
-                                                                                                  "expand-tilde": {
-                                                                                                    "version": "2.0.2",
-                                                                                                    "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-                                                                                                    "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-                                                                                                    "dev": true,
-                                                                                                    "requires": {
-                                                                                                      "homedir-polyfill": "^1.0.1"
-                                                                                                    }
-                                                                                                  },
-                                                                                                  "global-modules": {
-                                                                                                    "version": "1.0.0",
-                                                                                                    "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-                                                                                                    "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-                                                                                                    "dev": true,
-                                                                                                    "requires": {
-                                                                                                      "global-prefix": "^1.0.1",
-                                                                                                      "is-windows": "^1.0.1",
-                                                                                                      "resolve-dir": "^1.0.0"
-                                                                                                    }
-                                                                                                  },
-                                                                                                  "global-prefix": {
-                                                                                                    "version": "1.0.2",
-                                                                                                    "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-                                                                                                    "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-                                                                                                    "dev": true,
-                                                                                                    "requires": {
-                                                                                                      "expand-tilde": "^2.0.2",
-                                                                                                      "homedir-polyfill": "^1.0.1",
-                                                                                                      "ini": "^1.3.4",
-                                                                                                      "is-windows": "^1.0.1",
-                                                                                                      "which": "^1.2.14"
-                                                                                                    }
-                                                                                                  },
-                                                                                                  "resolve-dir": {
-                                                                                                    "version": "1.0.1",
-                                                                                                    "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-                                                                                                    "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
-                                                                                                    <<
-                                                                                                    << << < HEAD "dev": true,
-                                                                                                    "requires": {
-                                                                                                      "expand-tilde": "^2.0.0",
-                                                                                                      "global-modules": "^1.0.0"
-                                                                                                    }
-                                                                                                  }
-                                                                                                }
-                                                                                              },
-                                                                                              "fined": {
-                                                                                                "version": "1.2.0",
-                                                                                                "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
-                                                                                                "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
-                                                                                                "dev": true,
-                                                                                                "requires": {
-                                                                                                  "expand-tilde": "^2.0.2",
-                                                                                                  "is-plain-object": "^2.0.3",
-                                                                                                  "object.defaults": "^1.1.0",
-                                                                                                  "object.pick": "^1.2.0",
-                                                                                                  "parse-filepath": "^1.0.1"
-                                                                                                },
-                                                                                                "dependencies": {
-                                                                                                  "expand-tilde": {
-                                                                                                    "version": "2.0.2",
-                                                                                                    "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-                                                                                                    "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-                                                                                                    "dev": true,
-                                                                                                    "requires": {
-                                                                                                      "homedir-polyfill": "^1.0.1" ===
-                                                                                                        === =
-                                                                                                        "dev": true,
-                                                                                                      "requires": {
-                                                                                                        "expand-tilde": "^2.0.0",
-                                                                                                        "global-modules": "^1.0.0"
-                                                                                                      }
-                                                                                                    }
-                                                                                                  }
-                                                                                                },
-                                                                                                "fined": {
-                                                                                                  "version": "1.2.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
-                                                                                                  "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "expand-tilde": "^2.0.2",
-                                                                                                    "is-plain-object": "^2.0.3",
-                                                                                                    "object.defaults": "^1.1.0",
-                                                                                                    "object.pick": "^1.2.0",
-                                                                                                    "parse-filepath": "^1.0.1"
-                                                                                                  },
-                                                                                                  "dependencies": {
-                                                                                                    "expand-tilde": {
-                                                                                                      "version": "2.0.2",
-                                                                                                      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-                                                                                                      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-                                                                                                      "dev": true,
-                                                                                                      "requires": {
-                                                                                                        "homedir-polyfill": "^1.0.1"
-                                                                                                      }
-                                                                                                    }
-                                                                                                  }
-                                                                                                },
-                                                                                                "flagged-respawn": {
-                                                                                                  "version": "1.0.1",
-                                                                                                  "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
-                                                                                                  "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "flat-cache": {
-                                                                                                  "version": "1.3.4",
-                                                                                                  "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
-                                                                                                  "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "circular-json": "^0.3.1",
-                                                                                                    "graceful-fs": "^4.1.2",
-                                                                                                    "rimraf": "~2.6.2",
-                                                                                                    "write": "^0.2.1"
-                                                                                                  },
-                                                                                                  "dependencies": {
-                                                                                                    "circular-json": {
-                                                                                                      "version": "0.3.3",
-                                                                                                      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-                                                                                                      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-                                                                                                      "dev": true
-                                                                                                    },
-                                                                                                    "rimraf": {
-                                                                                                      "version": "2.6.3",
-                                                                                                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-                                                                                                      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-                                                                                                      "dev": true,
-                                                                                                      "requires": {
-                                                                                                        "glob": "^7.1.3"
-                                                                                                      }
-                                                                                                    }
-                                                                                                  }
-                                                                                                },
-                                                                                                "flatted": {
-                                                                                                  "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": {
-                                                                                                  "version": "1.1.1",
-                                                                                                  "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-                                                                                                  "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "inherits": "^2.0.3",
-                                                                                                    "readable-stream": "^2.3.6"
-                                                                                                  }
-                                                                                                },
-                                                                                                "follow-redirects": {
-                                                                                                  "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"
-                                                                                                  },
-                                                                                                  "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"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "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
-                                                                                                    }
-                                                                                                  }
-                                                                                                },
-                                                                                                "for-in": {
-                                                                                                  "version": "1.0.2",
-                                                                                                  "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-                                                                                                  "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "for-own": {
-                                                                                                  "version": "1.0.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-                                                                                                  "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "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",
-                                                                                                  "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "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.6",
-                                                                                                    "mime-types": "^2.1.12"
-                                                                                                  }
-                                                                                                },
-                                                                                                "forwarded": {
-                                                                                                  "version": "0.1.2",
-                                                                                                  "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-                                                                                                  "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "fragment-cache": {
-                                                                                                  "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"
-                                                                                                  }
-                                                                                                },
-                                                                                                "fresh": {
-                                                                                                  "version": "0.5.2",
-                                                                                                  "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-                                                                                                  "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "from": {
-                                                                                                  "version": "0.1.7",
-                                                                                                  "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
-                                                                                                  "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "from2": {
-                                                                                                  "version": "2.3.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-                                                                                                  "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "inherits": "^2.0.1",
-                                                                                                    "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",
-                                                                                                  "integrity": "sha1-91mDufL0E75ljJPf172M5AePXNs=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "js-yaml": "^3.4.6"
-                                                                                                  }
-                                                                                                },
-                                                                                                "fs-extra": {
-                                                                                                  "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": "^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": "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": "^3.0.0"
-                                                                                                  },
-                                                                                                  "dependencies": {
-                                                                                                    "minipass": {
-                                                                                                      "version": "3.1.3",
-                                                                                                      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-                                                                                                      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
-                                                                                                      "dev": true,
-                                                                                                      "requires": {
-                                                                                                        "yallist": "^4.0.0"
-                                                                                                      }
-                                                                                                    }
-                                                                                                  }
-                                                                                                },
-                                                                                                "fs-mkdirp-stream": {
-                                                                                                  "version": "1.0.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
-                                                                                                  "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "graceful-fs": "^4.1.11",
-                                                                                                    "through2": "^2.0.3"
-                                                                                                  }
-                                                                                                },
-                                                                                                "fs-write-stream-atomic": {
-                                                                                                  "version": "1.0.10",
-                                                                                                  "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
-                                                                                                  "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "graceful-fs": "^4.1.2",
-                                                                                                    "iferr": "^0.1.5",
-                                                                                                    "imurmurhash": "^0.1.4",
-                                                                                                    "readable-stream": "1 || 2"
-                                                                                                  }
-                                                                                                },
-                                                                                                "fs.realpath": {
-                                                                                                  "version": "1.0.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-                                                                                                  "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "fsevents": {
-                                                                                                  "version": "2.1.3",
-                                                                                                  "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-                                                                                                  "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-                                                                                                  "dev": true,
-                                                                                                  "optional": true
-                                                                                                },
-                                                                                                "function-bind": {
-                                                                                                  "version": "1.1.1",
-                                                                                                  "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-                                                                                                  "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "generate-function": {
-                                                                                                  "version": "2.3.1",
-                                                                                                  "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz",
-                                                                                                  "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "is-property": "^1.0.2"
-                                                                                                  }
-                                                                                                },
-                                                                                                "generate-object-property": {
-                                                                                                  "version": "1.2.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-                                                                                                  "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "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",
-                                                                                                  "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
-                                                                                                  "dev": 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
-                                                                                                },
-                                                                                                "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",
-                                                                                                  "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-                                                                                                  "requires": {
-                                                                                                    "pump": "^3.0.0"
-                                                                                                  }
-                                                                                                },
-                                                                                                "get-value": {
-                                                                                                  "version": "2.0.6",
-                                                                                                  "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-                                                                                                  "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "getpass": {
-                                                                                                  "version": "0.1.7",
-                                                                                                  "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-                                                                                                  "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "assert-plus": "^1.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"
-                                                                                                  }
-                                                                                                },
-                                                                                                "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"
-                                                                                                  },
-                                                                                                  "dependencies": {
-                                                                                                    "is-glob": {
-                                                                                                      "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"
-                                                                                                      }
-                                                                                                    }
-                                                                                                  }
-                                                                                                },
-                                                                                                "glob-stream": {
-                                                                                                  "version": "6.1.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
-                                                                                                  "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "extend": "^3.0.0",
-                                                                                                    "glob": "^7.1.1",
-                                                                                                    "glob-parent": "^3.1.0",
-                                                                                                    "is-negated-glob": "^1.0.0",
-                                                                                                    "ordered-read-streams": "^1.0.0",
-                                                                                                    "pumpify": "^1.3.5",
-                                                                                                    "readable-stream": "^2.1.5",
-                                                                                                    "remove-trailing-separator": "^1.0.1",
-                                                                                                    "to-absolute-glob": "^2.0.0",
-                                                                                                    "unique-stream": "^2.0.2"
-                                                                                                  }
-                                                                                                },
-                                                                                                "glob-watcher": {
-                                                                                                  "version": "5.0.3",
-                                                                                                  "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.3.tgz",
-                                                                                                  "integrity": "sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "anymatch": "^2.0.0",
-                                                                                                    "async-done": "^1.2.0",
-                                                                                                    "chokidar": "^2.0.0",
-                                                                                                    "is-negated-glob": "^1.0.0",
-                                                                                                    "just-debounce": "^1.0.0",
-                                                                                                    "object.defaults": "^1.1.0"
-                                                                                                  },
-                                                                                                  "dependencies": {
-                                                                                                    "anymatch": {
-                                                                                                      "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"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "braces": {
-                                                                                                      "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",
-                                                                                                        "extend-shallow": "^2.0.1",
-                                                                                                        "fill-range": "^4.0.0",
-                                                                                                        "isobject": "^3.0.1",
-                                                                                                        "repeat-element": "^1.1.2",
-                                                                                                        "snapdragon": "^0.8.1",
-                                                                                                        "snapdragon-node": "^2.0.1",
-                                                                                                        "split-string": "^3.0.2",
-                                                                                                        "to-regex": "^3.0.1"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "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"
-                                                                                                      },
-                                                                                                      "dependencies": {
-                                                                                                        "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
-                                                                                                        }
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "extend-shallow": {
-                                                                                                      "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"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "fill-range": {
-                                                                                                      "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",
-                                                                                                        "repeat-string": "^1.6.1",
-                                                                                                        "to-regex-range": "^2.1.0"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "fsevents": {
-                                                                                                      "version": "1.2.13",
-                                                                                                      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-                                                                                                      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-                                                                                                      "dev": true,
-                                                                                                      "optional": true
-                                                                                                    },
-                                                                                                    "is-binary-path": {
-                                                                                                      "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"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "is-number": {
-                                                                                                      "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"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "kind-of": {
-                                                                                                      "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"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "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"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "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.1.11",
-                                                                                                        "micromatch": "^3.1.10",
-                                                                                                        "readable-stream": "^2.0.2"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "to-regex-range": {
-                                                                                                      "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"
-                                                                                                      }
-                                                                                                    }
-                                                                                                  }
-                                                                                                },
-                                                                                                "global-dirs": {
-                                                                                                  "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.5"
-                                                                                                  }
-                                                                                                },
-                                                                                                "global-modules": {
-                                                                                                  "version": "1.0.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-                                                                                                  "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "global-prefix": "^1.0.1",
-                                                                                                    "is-windows": "^1.0.1",
-                                                                                                    "resolve-dir": "^1.0.0"
-                                                                                                  }
-                                                                                                },
-                                                                                                "global-prefix": {
-                                                                                                  "version": "1.0.2",
-                                                                                                  "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-                                                                                                  "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "expand-tilde": "^2.0.2",
-                                                                                                    "homedir-polyfill": "^1.0.1",
-                                                                                                    "ini": "^1.3.4",
-                                                                                                    "is-windows": "^1.0.1",
-                                                                                                    "which": "^1.2.14"
-                                                                                                  }
-                                                                                                },
-                                                                                                "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
-                                                                                                },
-                                                                                                "globby": {
-                                                                                                  "version": "11.0.1",
-                                                                                                  "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz",
-                                                                                                  "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "array-union": "^2.1.0",
-                                                                                                    "dir-glob": "^3.0.1",
-                                                                                                    "fast-glob": "^3.1.1",
-                                                                                                    "ignore": "^5.1.4",
-                                                                                                    "merge2": "^1.3.0",
-                                                                                                    "slash": "^3.0.0"
-                                                                                                  },
-                                                                                                  "dependencies": {
-                                                                                                    "array-union": {
-                                                                                                      "version": "2.1.0",
-                                                                                                      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-                                                                                                      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-                                                                                                      "dev": true
-                                                                                                    },
-                                                                                                    "dir-glob": {
-                                                                                                      "version": "3.0.1",
-                                                                                                      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-                                                                                                      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-                                                                                                      "dev": true,
-                                                                                                      "requires": {
-                                                                                                        "path-type": "^4.0.0"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "ignore": {
-                                                                                                      "version": "5.1.8",
-                                                                                                      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-                                                                                                      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
-                                                                                                      "dev": true
-                                                                                                    },
-                                                                                                    "path-type": {
-                                                                                                      "version": "4.0.0",
-                                                                                                      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-                                                                                                      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-                                                                                                      "dev": true
-                                                                                                    },
-                                                                                                    "slash": {
-                                                                                                      "version": "3.0.0",
-                                                                                                      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-                                                                                                      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-                                                                                                      "dev": true
-                                                                                                    }
-                                                                                                  }
-                                                                                                },
-                                                                                                "globule": {
-                                                                                                  "version": "1.3.2",
-                                                                                                  "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz",
-                                                                                                  "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "glob": "~7.1.1",
-                                                                                                    "lodash": "~4.17.10",
-                                                                                                    "minimatch": "~3.0.2"
-                                                                                                  }
-                                                                                                },
-                                                                                                "glogg": {
-                                                                                                  "version": "1.0.2",
-                                                                                                  "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
-                                                                                                  "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "sparkles": "^1.0.0"
-                                                                                                  }
-                                                                                                },
-                                                                                                "gonzales-pe-sl": {
-                                                                                                  "version": "4.2.3",
-                                                                                                  "resolved": "https://registry.npmjs.org/gonzales-pe-sl/-/gonzales-pe-sl-4.2.3.tgz",
-                                                                                                  "integrity": "sha1-aoaLw4BkXxQf7rBCxvl/zHG1n+Y=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "minimist": "1.1.x"
-                                                                                                  },
-                                                                                                  "dependencies": {
-                                                                                                    "minimist": {
-                                                                                                      "version": "1.1.3",
-                                                                                                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
-                                                                                                      "integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=",
-                                                                                                      "dev": true
-                                                                                                    }
-                                                                                                  }
-                                                                                                },
-                                                                                                "got": {
-                                                                                                  "version": "9.6.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
-                                                                                                  "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "@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.4",
-                                                                                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-                                                                                                  "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "gulp": {
-                                                                                                  "version": "4.0.2",
-                                                                                                  "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
-                                                                                                  "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "glob-watcher": "^5.0.3",
-                                                                                                    "gulp-cli": "^2.2.0",
-                                                                                                    "undertaker": "^1.2.1",
-                                                                                                    "vinyl-fs": "^3.0.0"
-                                                                                                  },
-                                                                                                  "dependencies": {
-                                                                                                    "ansi-colors": {
-                                                                                                      "version": "1.1.0",
-                                                                                                      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-                                                                                                      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-                                                                                                      "dev": true,
-                                                                                                      "requires": {
-                                                                                                        "ansi-wrap": "^0.1.0"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "gulp-cli": {
-                                                                                                      "version": "2.3.0",
-                                                                                                      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
-                                                                                                      "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
-                                                                                                      "dev": true,
-                                                                                                      "requires": {
-                                                                                                        "ansi-colors": "^1.0.1",
-                                                                                                        "archy": "^1.0.0",
-                                                                                                        "array-sort": "^1.0.0",
-                                                                                                        "color-support": "^1.1.3",
-                                                                                                        "concat-stream": "^1.6.0",
-                                                                                                        "copy-props": "^2.0.1",
-                                                                                                        "fancy-log": "^1.3.2",
-                                                                                                        "gulplog": "^1.0.0",
-                                                                                                        "interpret": "^1.4.0",
-                                                                                                        "isobject": "^3.0.1",
-                                                                                                        "liftoff": "^3.1.0",
-                                                                                                        "matchdep": "^2.0.0",
-                                                                                                        "mute-stdout": "^1.0.0",
-                                                                                                        "pretty-hrtime": "^1.0.0",
-                                                                                                        "replace-homedir": "^1.0.0",
-                                                                                                        "semver-greatest-satisfied-range": "^1.1.0",
-                                                                                                        "v8flags": "^3.2.0",
-                                                                                                        "yargs": "^7.1.0"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "interpret": {
-                                                                                                      "version": "1.4.0",
-                                                                                                      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-                                                                                                      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
-                                                                                                      "dev": true
-                                                                                                    },
-                                                                                                    "v8flags": {
-                                                                                                      "version": "3.2.0",
-                                                                                                      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
-                                                                                                      "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
-                                                                                                      "dev": true,
-                                                                                                      "requires": {
-                                                                                                        "homedir-polyfill": "^1.0.1"
-                                                                                                      }
-                                                                                                    }
-                                                                                                  }
-                                                                                                },
-                                                                                                "gulp-zip": {
-                                                                                                  "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",
-                                                                                                    "plugin-error": "^1.0.1",
-                                                                                                    "through2": "^3.0.1",
-                                                                                                    "vinyl": "^2.1.0",
-                                                                                                    "yazl": "^2.5.1"
-                                                                                                  },
-                                                                                                  "dependencies": {
-                                                                                                    "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=="
-                                                                                                    },
-                                                                                                    "get-stream": {
-                                                                                                      "version": "5.1.0",
-                                                                                                      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-                                                                                                      "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
-                                                                                                      "dev": true,
-                                                                                                      "requires": {
-                                                                                                        "pump": "^3.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=="
-                                                                                                    },
-                                                                                                    "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=="
-                                                                                                    },
-                                                                                                    "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",
-                                                                                                        "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=="
-                                                                                                    },
-                                                                                                    "supports-color": {
-                                                                                                      "version": "7.1.0",
-                                                                                                      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                                                                                                      "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                                                                                                      "requires": {
-                                                                                                        "has-flag": "^4.0.0"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "through2": {
-                                                                                                      "version": "3.0.1",
-                                                                                                      "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
-                                                                                                      "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
-                                                                                                      "dev": true,
-                                                                                                      "requires": {
-                                                                                                        "readable-stream": "2 || 3"
-                                                                                                      }
-                                                                                                    }
-                                                                                                  }
-                                                                                                },
-                                                                                                "gulplog": {
-                                                                                                  "version": "1.0.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-                                                                                                  "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "glogg": "^1.0.0"
-                                                                                                  }
-                                                                                                },
-                                                                                                "handle-thing": {
-                                                                                                  "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": {
-                                                                                                  "version": "4.7.6",
-                                                                                                  "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz",
-                                                                                                  "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "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": {
-                                                                                                  "version": "2.0.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-                                                                                                  "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "har-validator": {
-                                                                                                  "version": "5.1.3",
-                                                                                                  "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-                                                                                                  "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "ajv": "^6.5.5",
-                                                                                                    "har-schema": "^2.0.0"
-                                                                                                  }
-                                                                                                },
-                                                                                                "has": {
-                                                                                                  "version": "1.0.3",
-                                                                                                  "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-                                                                                                  "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "function-bind": "^1.1.1"
-                                                                                                  }
-                                                                                                },
-                                                                                                "has-ansi": {
-                                                                                                  "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"
-                                                                                                  }
-                                                                                                },
-                                                                                                "has-binary2": {
-                                                                                                  "version": "1.0.3",
-                                                                                                  "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
-                                                                                                  "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "isarray": "2.0.1"
-                                                                                                  },
-                                                                                                  "dependencies": {
-                                                                                                    "isarray": {
-                                                                                                      "version": "2.0.1",
-                                                                                                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
-                                                                                                      "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
-                                                                                                      "dev": true
-                                                                                                    }
-                                                                                                  }
-                                                                                                },
-                                                                                                "has-cors": {
-                                                                                                  "version": "1.1.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
-                                                                                                  "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "has-flag": {
-                                                                                                  "version": "3.0.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-                                                                                                  "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "has-glob": {
-                                                                                                  "version": "1.0.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/has-glob/-/has-glob-1.0.0.tgz",
-                                                                                                  "integrity": "sha1-mqqe7b/7G6OZCnsAEPtnjuAIEgc=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "is-glob": "^3.0.0"
-                                                                                                  },
-                                                                                                  "dependencies": {
-                                                                                                    "is-glob": {
-                                                                                                      "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"
-                                                                                                      }
-                                                                                                    }
-                                                                                                  }
-                                                                                                },
-                                                                                                "has-symbols": {
-                                                                                                  "version": "1.0.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
-                                                                                                  "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",
-                                                                                                    "isobject": "^3.0.0"
-                                                                                                  }
-                                                                                                },
-                                                                                                "has-values": {
-                                                                                                  "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"
-                                                                                                  },
-                                                                                                  "dependencies": {
-                                                                                                    "is-number": {
-                                                                                                      "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"
-                                                                                                      },
-                                                                                                      "dependencies": {
-                                                                                                        "kind-of": {
-                                                                                                          "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"
-                                                                                                          }
-                                                                                                        }
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "kind-of": {
-                                                                                                      "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"
-                                                                                                      }
-                                                                                                    }
-                                                                                                  }
-                                                                                                },
-                                                                                                "has-yarn": {
-                                                                                                  "version": "2.1.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
-                                                                                                  "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "hash-base": {
-                                                                                                  "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.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": {
-                                                                                                  "version": "1.1.7",
-                                                                                                  "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-                                                                                                  "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "inherits": "^2.0.3",
-                                                                                                    "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",
-                                                                                                  "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",
-                                                                                                  "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "hash.js": "^1.0.3",
-                                                                                                    "minimalistic-assert": "^1.0.0",
-                                                                                                    "minimalistic-crypto-utils": "^1.0.1"
-                                                                                                  }
-                                                                                                },
-                                                                                                "homedir-polyfill": {
-                                                                                                  "version": "1.0.3",
-                                                                                                  "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-                                                                                                  "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-                                                                                                  "requires": {
-                                                                                                    "parse-passwd": "^1.0.0"
-                                                                                                  }
-                                                                                                },
-                                                                                                "hosted-git-info": {
-                                                                                                  "version": "2.8.4",
-                                                                                                  "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz",
-                                                                                                  "integrity": "sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "hpack.js": {
-                                                                                                  "version": "2.1.6",
-                                                                                                  "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-                                                                                                  "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "inherits": "^2.0.1",
-                                                                                                    "obuf": "^1.0.0",
-                                                                                                    "readable-stream": "^2.0.1",
-                                                                                                    "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.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": {
-                                                                                                  "version": "2.0.2",
-                                                                                                  "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-                                                                                                  "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "http-deceiver": {
-                                                                                                  "version": "1.2.7",
-                                                                                                  "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-                                                                                                  "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "http-errors": {
-                                                                                                  "version": "1.7.2",
-                                                                                                  "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-                                                                                                  "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "depd": "~1.1.2",
-                                                                                                    "inherits": "2.0.3",
-                                                                                                    "setprototypeof": "1.1.1",
-                                                                                                    "statuses": ">= 1.5.0 < 2",
-                                                                                                    "toidentifier": "1.0.0"
-                                                                                                  },
-                                                                                                  "dependencies": {
-                                                                                                    "inherits": {
-                                                                                                      "version": "2.0.3",
-                                                                                                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                                                                                                      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                                                                                                      "dev": true
-                                                                                                    }
-                                                                                                  }
-                                                                                                },
-                                                                                                "http-proxy": {
-                                                                                                  "version": "1.18.1",
-                                                                                                  "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-                                                                                                  "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "eventemitter3": "^4.0.0",
-                                                                                                    "follow-redirects": "^1.0.0",
-                                                                                                    "requires-port": "^1.0.0"
-                                                                                                  }
-                                                                                                },
-                                                                                                "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==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "agent-base": "4",
-                                                                                                    "debug": "3.1.0"
-                                                                                                  },
-                                                                                                  "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": {
-                                                                                                        "ms": "2.0.0"
-                                                                                                      }
-                                                                                                    }
-                                                                                                  }
-                                                                                                },
-                                                                                                "http-proxy-middleware": {
-                                                                                                  "version": "0.19.1",
-                                                                                                  "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
-                                                                                                  "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "http-proxy": "^1.17.0",
-                                                                                                    "is-glob": "^4.0.0",
-                                                                                                    "lodash": "^4.17.11",
-                                                                                                    "micromatch": "^3.1.10"
-                                                                                                  }
-                                                                                                },
-                                                                                                "http-signature": {
-                                                                                                  "version": "1.2.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-                                                                                                  "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "assert-plus": "^1.0.0",
-                                                                                                    "jsprim": "^1.2.2",
-                                                                                                    "sshpk": "^1.7.0"
-                                                                                                  }
-                                                                                                },
-                                                                                                "https-browserify": {
-                                                                                                  "version": "1.0.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-                                                                                                  "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "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"
-                                                                                                  },
-                                                                                                  "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"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "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
-                                                                                                    }
-                                                                                                  }
-                                                                                                },
-                                                                                                "humanize-ms": {
-                                                                                                  "version": "1.2.1",
-                                                                                                  "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
-                                                                                                  "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "ms": "^2.0.0"
-                                                                                                  }
-                                                                                                },
-                                                                                                "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,
-                                                                                                  "requires": {
-                                                                                                    "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",
-                                                                                                  "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "iferr": {
-                                                                                                  "version": "0.1.5",
-                                                                                                  "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
-                                                                                                  "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "ignore": {
-                                                                                                  "version": "3.3.10",
-                                                                                                  "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-                                                                                                  "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "ignore-walk": {
-                                                                                                  "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"
-                                                                                                  }
-                                                                                                },
-                                                                                                "image-size": {
-                                                                                                  "version": "0.5.5",
-                                                                                                  "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
-                                                                                                  "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
-                                                                                                  "dev": true,
-                                                                                                  "optional": true
-                                                                                                },
-                                                                                                "immediate": {
-                                                                                                  "version": "3.0.6",
-                                                                                                  "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
-                                                                                                  "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "immer": {
-                                                                                                  "version": "6.0.9",
-                                                                                                  "resolved": "https://registry.npmjs.org/immer/-/immer-6.0.9.tgz",
-                                                                                                  "integrity": "sha512-SyCYnAuiRf67Lvk0VkwFvwtDoEiCMjeamnHvRfnVDyc7re1/rQrNxuL+jJ7lA3WvdC4uznrvbmm+clJ9+XXatg=="
-                                                                                                },
-                                                                                                "import-cwd": {
-                                                                                                  "version": "2.1.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
-                                                                                                  "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "import-from": "^2.1.0"
-                                                                                                  }
-                                                                                                },
-                                                                                                "import-fresh": {
-                                                                                                  "version": "2.0.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-                                                                                                  "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "caller-path": "^2.0.0",
-                                                                                                    "resolve-from": "^3.0.0"
-                                                                                                  }
-                                                                                                },
-                                                                                                "import-from": {
-                                                                                                  "version": "2.1.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
-                                                                                                  "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "resolve-from": "^3.0.0"
-                                                                                                  }
-                                                                                                },
-                                                                                                "import-lazy": {
-                                                                                                  "version": "2.1.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
-                                                                                                  "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "import-local": {
-                                                                                                  "version": "2.0.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-                                                                                                  "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "pkg-dir": "^3.0.0",
-                                                                                                    "resolve-cwd": "^2.0.0"
-                                                                                                  }
-                                                                                                },
-                                                                                                "imurmurhash": {
-                                                                                                  "version": "0.1.4",
-                                                                                                  "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-                                                                                                  "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",
-                                                                                                  "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "infer-owner": {
-                                                                                                  "version": "1.0.4",
-                                                                                                  "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-                                                                                                  "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "inflight": {
-                                                                                                  "version": "1.0.6",
-                                                                                                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-                                                                                                  "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "once": "^1.3.0",
-                                                                                                    "wrappy": "1"
-                                                                                                  }
-                                                                                                },
-                                                                                                "inherits": {
-                                                                                                  "version": "2.0.4",
-                                                                                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-                                                                                                  "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "ini": {
-                                                                                                  "version": "1.3.5",
-                                                                                                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-                                                                                                  "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "injection-js": {
-                                                                                                  "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": "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": "^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.4.0",
-                                                                                                    "rxjs": "^6.5.3",
-                                                                                                    "string-width": "^4.1.0",
-                                                                                                    "strip-ansi": "^6.0.0",
-                                                                                                    "through": "^2.3.6"
-                                                                                                  },
-                                                                                                  "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" >>>
-                                                                                                          >>> > upstream / master
-                                                                                                      }
-                                                                                                    }
-                                                                                                  }
-                                                                                                },
-                                                                                                "flagged-respawn": {
-                                                                                                  "version": "1.0.1",
-                                                                                                  "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
-                                                                                                  "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "flat-cache": {
-                                                                                                  "version": "1.3.4",
-                                                                                                  "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
-                                                                                                  "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "circular-json": "^0.3.1",
-                                                                                                    "graceful-fs": "^4.1.2",
-                                                                                                    "rimraf": "~2.6.2",
-                                                                                                    "write": "^0.2.1"
-                                                                                                  },
-                                                                                                  "dependencies": {
-                                                                                                    "circular-json": {
-                                                                                                      "version": "0.3.3",
-                                                                                                      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-                                                                                                      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-                                                                                                      "dev": true
-                                                                                                    },
-                                                                                                    "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"
-                                                                                                      } <<
-                                                                                                      << << < HEAD
-                                                                                                    }
-                                                                                                  }
-                                                                                                },
-                                                                                                "flatted": {
-                                                                                                  "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": {
-                                                                                                  "version": "1.1.1",
-                                                                                                  "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-                                                                                                  "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "inherits": "^2.0.3",
-                                                                                                    "readable-stream": "^2.3.6"
-                                                                                                  }
-                                                                                                },
-                                                                                                "follow-redirects": {
-                                                                                                  "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"
-                                                                                                  },
-                                                                                                  "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"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "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
-                                                                                                    }
-                                                                                                  }
-                                                                                                },
-                                                                                                "for-in": {
-                                                                                                  "version": "1.0.2",
-                                                                                                  "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-                                                                                                  "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
-                                                                                                },
-                                                                                                "for-own": {
-                                                                                                  "version": "1.0.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-                                                                                                  "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "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",
-                                                                                                  "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "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.6",
-                                                                                                    "mime-types": "^2.1.12"
-                                                                                                  }
-                                                                                                },
-                                                                                                "forwarded": {
-                                                                                                  "version": "0.1.2",
-                                                                                                  "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-                                                                                                  "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "fragment-cache": {
-                                                                                                  "version": "0.2.1",
-                                                                                                  "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-                                                                                                  "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-                                                                                                  "requires": {
-                                                                                                    "map-cache": "^0.2.2"
-                                                                                                  }
-                                                                                                },
-                                                                                                "fresh": {
-                                                                                                  "version": "0.5.2",
-                                                                                                  "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-                                                                                                  "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "from": {
-                                                                                                  "version": "0.1.7",
-                                                                                                  "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
-                                                                                                  "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "from2": {
-                                                                                                  "version": "2.3.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-                                                                                                  "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "inherits": "^2.0.1",
-                                                                                                    "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",
-                                                                                                  "integrity": "sha1-91mDufL0E75ljJPf172M5AePXNs=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "js-yaml": "^3.4.6"
-                                                                                                  }
-                                                                                                },
-                                                                                                "fs-extra": {
-                                                                                                  "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": "^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": "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": "^3.0.0"
-                                                                                                  },
-                                                                                                  "dependencies": {
-                                                                                                    "minipass": {
-                                                                                                      "version": "3.1.3",
-                                                                                                      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-                                                                                                      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
-                                                                                                      "dev": true,
-                                                                                                      "requires": {
-                                                                                                        "yallist": "^4.0.0"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "normalize-path": {
-                                                                                                      "version": "2.1.1",
-                                                                                                      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-                                                                                                      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-                                                                                                      "requires": {
-                                                                                                        "remove-trailing-separator": "^1.0.1"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "readdirp": {
-                                                                                                      "version": "2.2.1",
-                                                                                                      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-                                                                                                      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-                                                                                                      "requires": {
-                                                                                                        "graceful-fs": "^4.1.11",
-                                                                                                        "micromatch": "^3.1.10",
-                                                                                                        "readable-stream": "^2.0.2"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "to-regex-range": {
-                                                                                                      "version": "2.1.1",
-                                                                                                      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-                                                                                                      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-                                                                                                      "requires": {
-                                                                                                        "repeat-string": "^1.6.1"
-                                                                                                      }
-                                                                                                    }
-                                                                                                  }
-                                                                                                },
-                                                                                                "fs-mkdirp-stream": {
-                                                                                                  "version": "1.0.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
-                                                                                                  "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "graceful-fs": "^4.1.11",
-                                                                                                    "through2": "^2.0.3"
-                                                                                                  }
-                                                                                                },
-                                                                                                "fs-write-stream-atomic": {
-                                                                                                  "version": "1.0.10",
-                                                                                                  "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
-                                                                                                  "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "graceful-fs": "^4.1.2",
-                                                                                                    "iferr": "^0.1.5",
-                                                                                                    "imurmurhash": "^0.1.4",
-                                                                                                    "readable-stream": "1 || 2"
-                                                                                                  }
-                                                                                                },
-                                                                                                "fs.realpath": {
-                                                                                                  "version": "1.0.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-                                                                                                  "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "fsevents": {
-                                                                                                  "version": "2.1.3",
-                                                                                                  "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-                                                                                                  "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-                                                                                                  "optional": true
-                                                                                                },
-                                                                                                "function-bind": {
-                                                                                                  "version": "1.1.1",
-                                                                                                  "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-                                                                                                  "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "generate-function": {
-                                                                                                  "version": "2.3.1",
-                                                                                                  "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz",
-                                                                                                  "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==",
-                                                                                                  ===
-                                                                                                  === =
-                                                                                                },
-                                                                                                "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": "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": "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"
-                                                                                                  }
-                                                                                                },
-                                                                                                "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"
-                                                                                                  }
-                                                                                                }
-                                                                                              }
-                                                                                            },
-                                                                                            "internal-ip": {
-                                                                                              "version": "4.3.0",
-                                                                                              "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
-                                                                                              "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
-                                                                                              >>>
-                                                                                              >>> > upstream / master "dev": true,
-                                                                                              "requires": {
-                                                                                                "default-gateway": "^4.2.0",
-                                                                                                "ipaddr.js": "^1.9.0"
-                                                                                              }
-                                                                                            },
-                                                                                            "intersect": {
-                                                                                              "version": "1.0.1",
-                                                                                              "resolved": "https://registry.npmjs.org/intersect/-/intersect-1.0.1.tgz",
-                                                                                              "integrity": "sha1-MyZQ4QhU2MCsWMGSvcJ6i/fnoww="
-                                                                                            },
-                                                                                            "invariant": {
-                                                                                              "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"
-                                                                                              }
-                                                                                            },
-                                                                                            "invert-kv": {
-                                                                                              "version": "1.0.0",
-                                                                                              "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-                                                                                              "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-                                                                                              "dev": true
-                                                                                            },
-                                                                                            "ip": {
-                                                                                              "version": "1.1.5",
-                                                                                              "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-                                                                                              "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
-                                                                                              "dev": true
-                                                                                            },
-                                                                                            <<
-                                                                                            << << < HEAD "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
-                                                                                            },
-                                                                                            "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",
-                                                                                              "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-                                                                                              "requires": {
-                                                                                                "pump": "^3.0.0"
-                                                                                              }
-                                                                                            },
-                                                                                            "get-value": {
-                                                                                              "version": "2.0.6",
-                                                                                              "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-                                                                                              "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
-                                                                                            },
-                                                                                            "getpass": {
-                                                                                              "version": "0.1.7",
-                                                                                              "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-                                                                                              "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "assert-plus": "^1.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"
-                                                                                              }
-                                                                                            },
-                                                                                            "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"
-                                                                                              },
-                                                                                              "dependencies": {
-                                                                                                "is-glob": {
-                                                                                                  "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"
-                                                                                                  }
-                                                                                                }
-                                                                                              }
-                                                                                            },
-                                                                                            "glob-stream": {
-                                                                                              "version": "6.1.0",
-                                                                                              "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
-                                                                                              "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "extend": "^3.0.0",
-                                                                                                "glob": "^7.1.1",
-                                                                                                "glob-parent": "^3.1.0",
-                                                                                                "is-negated-glob": "^1.0.0",
-                                                                                                "ordered-read-streams": "^1.0.0",
-                                                                                                "pumpify": "^1.3.5",
-                                                                                                "readable-stream": "^2.1.5",
-                                                                                                "remove-trailing-separator": "^1.0.1",
-                                                                                                "to-absolute-glob": "^2.0.0",
-                                                                                                "unique-stream": "^2.0.2"
-                                                                                              }
-                                                                                            },
-                                                                                            "glob-watcher": {
-                                                                                              "version": "5.0.3",
-                                                                                              "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.3.tgz",
-                                                                                              "integrity": "sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==",
-                                                                                              "dev": true,
-                                                                                              "requires": {
-                                                                                                "anymatch": "^2.0.0",
-                                                                                                "async-done": "^1.2.0",
-                                                                                                "chokidar": "^2.0.0",
-                                                                                                "is-negated-glob": "^1.0.0",
-                                                                                                "just-debounce": "^1.0.0",
-                                                                                                "object.defaults": "^1.1.0"
-                                                                                              },
-                                                                                              "dependencies": {
-                                                                                                "anymatch": {
-                                                                                                  "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"
-                                                                                                  }
-                                                                                                },
-                                                                                                "braces": {
-                                                                                                  "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",
-                                                                                                    "extend-shallow": "^2.0.1",
-                                                                                                    "fill-range": "^4.0.0",
-                                                                                                    "isobject": "^3.0.1",
-                                                                                                    "repeat-element": "^1.1.2",
-                                                                                                    "snapdragon": "^0.8.1",
-                                                                                                    "snapdragon-node": "^2.0.1",
-                                                                                                    "split-string": "^3.0.2",
-                                                                                                    "to-regex": "^3.0.1"
-                                                                                                  }
-                                                                                                },
-                                                                                                "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"
-                                                                                                  },
-                                                                                                  "dependencies": {
-                                                                                                    "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
-                                                                                                    }
-                                                                                                  }
-                                                                                                },
-                                                                                                "extend-shallow": {
-                                                                                                  "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"
-                                                                                                  }
-                                                                                                },
-                                                                                                "fill-range": {
-                                                                                                  "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",
-                                                                                                    "repeat-string": "^1.6.1",
-                                                                                                    "to-regex-range": "^2.1.0"
-                                                                                                  }
-                                                                                                },
-                                                                                                "fsevents": {
-                                                                                                  "version": "1.2.13",
-                                                                                                  "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-                                                                                                  "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-                                                                                                  "dev": true,
-                                                                                                  "optional": true
-                                                                                                },
-                                                                                                "is-binary-path": {
-                                                                                                  "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"
-                                                                                                  }
-                                                                                                },
-                                                                                                "is-number": {
-                                                                                                  "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"
-                                                                                                  }
-                                                                                                },
-                                                                                                ===
-                                                                                                === =
-                                                                                                "ip-regex": {
-                                                                                                  "version": "2.1.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-                                                                                                  "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
-                                                                                                  "dev": true
-                                                                                                },
-                                                                                                "ipaddr.js": {
-                                                                                                  "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": {
-                                                                                                  "version": "1.0.0",
-                                                                                                  "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-                                                                                                  "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
-                                                                                                  "dev": true,
-                                                                                                  "requires": {
-                                                                                                    "is-relative": "^1.0.0",
-                                                                                                    "is-windows": "^1.0.1"
-                                                                                                  }
-                                                                                                },
-                                                                                                "is-absolute-url": {
-                                                                                                  "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": {
-                                                                                                  "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"
-                                                                                                  },
-                                                                                                  "dependencies": {
-                                                                                                    >>>
-                                                                                                    >>> > upstream / master "kind-of": {
-                                                                                                      "version": "3.2.2",
-                                                                                                      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                                                                                                      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                                                                                                      <<
-                                                                                                      << << < HEAD "dev": true,
-                                                                                                      "requires": {
-                                                                                                        "is-buffer": "^1.1.5"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "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"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "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.1.11",
-                                                                                                        "micromatch": "^3.1.10",
-                                                                                                        "readable-stream": "^2.0.2"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "to-regex-range": {
-                                                                                                      "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" ===
-                                                                                                          === =
-                                                                                                          "dev": true,
-                                                                                                        "requires": {
-                                                                                                          "is-buffer": "^1.1.5" >>>
-                                                                                                            >>> > upstream / master
-                                                                                                        }
-                                                                                                      }
-                                                                                                    }
-                                                                                                  },
-                                                                                                  <<
-                                                                                                  << << < HEAD "global-dirs": {
-                                                                                                    "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,
-                                                                                                    ===
-                                                                                                    === =
-                                                                                                    "is-arguments": {
-                                                                                                      "version": "1.0.4",
-                                                                                                      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
-                                                                                                      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
-                                                                                                      "dev": true
-                                                                                                    },
-                                                                                                    "is-arrayish": {
-                                                                                                      "version": "0.2.1",
-                                                                                                      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-                                                                                                      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-                                                                                                      "dev": true
-                                                                                                    },
-                                                                                                    "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==",
-                                                                                                      >>>
-                                                                                                      >>> > upstream / master "requires": {
-                                                                                                        "binary-extensions": "^2.0.0"
-                                                                                                      },
-                                                                                                      "dependencies": {
-                                                                                                        "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=="
-                                                                                                        }
-                                                                                                      }
-                                                                                                    },
-                                                                                                    "is-buffer": {
-                                                                                                      "version": "1.1.6",
-                                                                                                      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-                                                                                                      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-                                                                                                      "dev": true
-                                                                                                    },
-                                                                                                    "is-callable": {
-                                                                                                      "version": "1.1.4",
-                                                                                                      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
-                                                                                                      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
-                                                                                                      "dev": true
-                                                                                                    },
-                                                                                                    "is-ci": {
-                                                                                                      "version": "2.0.0",
-                                                                                                      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-                                                                                                      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-                                                                                                      "dev": true,
-                                                                                                      "requires": {
-                                                                                                        "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"
-                                                                                                      }
-                                                                                                    },
-                                                                                                    <<
-                                                                                                    << << < HEAD "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
-                                                                                                    },
-                                                                                                    "globby": {
-                                                                                                      "version": "11.0.1",
-                                                                                                      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz",
-                                                                                                      "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
-                                                                                                      ===
-                                                                                                      === =
-                                                                                                      "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=",
-                                                                                                        >>>
-                                                                                                        >>> > upstream / master "dev": true,
-                                                                                                        "requires": {
-                                                                                                          "kind-of": "^3.0.2"
-                                                                                                        },
-                                                                                                        "dependencies": {
-                                                                                                          <<
-                                                                                                          << << < HEAD "array-union": {
-                                                                                                            "version": "2.1.0",
-                                                                                                            "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-                                                                                                            "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-                                                                                                            "dev": true
-                                                                                                          },
-                                                                                                          "dir-glob": {
-                                                                                                            "version": "3.0.1",
-                                                                                                            "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-                                                                                                            "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-                                                                                                            "dev": true,
-                                                                                                            "requires": {
-                                                                                                              "path-type": "^4.0.0"
-                                                                                                            }
-                                                                                                          },
-                                                                                                          "ignore": {
-                                                                                                            "version": "5.1.8",
-                                                                                                            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-                                                                                                            "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
-                                                                                                            "dev": true
-                                                                                                          },
-                                                                                                          "path-type": {
-                                                                                                            "version": "4.0.0",
-                                                                                                            "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-                                                                                                            "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-                                                                                                            "dev": true
-                                                                                                          },
-                                                                                                          "slash": {
-                                                                                                            "version": "3.0.0",
-                                                                                                            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-                                                                                                            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-                                                                                                            ===
-                                                                                                            === =
-                                                                                                            "kind-of": {
-                                                                                                              "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"
-                                                                                                              }
-                                                                                                            }
-                                                                                                          }
-                                                                                                        },
-                                                                                                        "is-date-object": {
-                                                                                                          "version": "1.0.1",
-                                                                                                          "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-                                                                                                          "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
-                                                                                                          "dev": true
-                                                                                                        },
-                                                                                                        "is-descriptor": {
-                                                                                                          "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",
-                                                                                                            "kind-of": "^5.0.0"
-                                                                                                          },
-                                                                                                          "dependencies": {
-                                                                                                            "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==",
-                                                                                                              >>>
-                                                                                                              >>> > upstream / master "dev": true
-                                                                                                            }
-                                                                                                          }
-                                                                                                        },
-                                                                                                        <<
-                                                                                                        << << < HEAD "globule": {
-                                                                                                          "version": "1.3.2",
-                                                                                                          "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz",
-                                                                                                          "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==",
-                                                                                                          ===
-                                                                                                          === =
-                                                                                                          "is-directory": {
-                                                                                                            "version": "0.3.1",
-                                                                                                            "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-                                                                                                            "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",
-                                                                                                            "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="
-                                                                                                          },
-                                                                                                          "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=",
-                                                                                                            >>>
-                                                                                                            >>> > upstream / master "dev": true,
-                                                                                                            "requires": {
-                                                                                                              "number-is-nan": "^1.0.0"
-                                                                                                            }
-                                                                                                          },
-                                                                                                          "is-glob": {
-                                                                                                            "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-installed-globally": {
-                                                                                                            "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",
-                                                                                                              "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-module": {
-                                                                                                            "version": "1.0.0",
-                                                                                                            "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
-                                                                                                            "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
-                                                                                                            "dev": true
-                                                                                                          },
-                                                                                                          "is-my-ip-valid": {
-                                                                                                            "version": "1.0.0",
-                                                                                                            "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz",
-                                                                                                            "integrity": "sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==",
-                                                                                                            "dev": true
-                                                                                                          },
-                                                                                                          "is-my-json-valid": {
-                                                                                                            "version": "2.20.0",
-                                                                                                            "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.0.tgz",
-                                                                                                            "integrity": "sha512-XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA==",
-                                                                                                            "dev": true,
-                                                                                                            "requires": {
-                                                                                                              "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"
-                                                                                                            }
-                                                                                                          },
-                                                                                                          <<
-                                                                                                          << << < HEAD "graceful-fs": {
-                                                                                                            "version": "4.2.4",
-                                                                                                            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-                                                                                                            "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
-                                                                                                          },
-                                                                                                          "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"
-                                                                                                            } ===
-                                                                                                            === =
-                                                                                                            "is-negated-glob": {
-                                                                                                              "version": "1.0.0",
-                                                                                                              "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
-                                                                                                              "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
-                                                                                                              "dev": true >>>
-                                                                                                                >>> > upstream / master
-                                                                                                            },
-                                                                                                            "is-npm": {
-                                                                                                              "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": {
-                                                                                                              "version": "7.0.0",
-                                                                                                              "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-                                                                                                              "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-                                                                                                              "dev": true
-                                                                                                            },
-                                                                                                            "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": {
-                                                                                                                <<
-                                                                                                                << << < HEAD "glob-watcher": "^5.0.3",
-                                                                                                                "gulp-cli": "^2.2.0",
-                                                                                                                "undertaker": "^1.2.1",
-                                                                                                                "vinyl-fs": "^3.0.0"
-                                                                                                              },
-                                                                                                              "dependencies": {
-                                                                                                                "ansi-colors": {
-                                                                                                                  "version": "1.1.0",
-                                                                                                                  "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-                                                                                                                  "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-                                                                                                                  "dev": true,
-                                                                                                                  "requires": {
-                                                                                                                    "ansi-wrap": "^0.1.0"
-                                                                                                                  }
-                                                                                                                },
-                                                                                                                "gulp-cli": {
-                                                                                                                  "version": "2.3.0",
-                                                                                                                  "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
-                                                                                                                  "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
-                                                                                                                  "dev": true,
-                                                                                                                  "requires": {
-                                                                                                                    "ansi-colors": "^1.0.1",
-                                                                                                                    "archy": "^1.0.0",
-                                                                                                                    "array-sort": "^1.0.0",
-                                                                                                                    "color-support": "^1.1.3",
-                                                                                                                    "concat-stream": "^1.6.0",
-                                                                                                                    "copy-props": "^2.0.1",
-                                                                                                                    "fancy-log": "^1.3.2",
-                                                                                                                    "gulplog": "^1.0.0",
-                                                                                                                    "interpret": "^1.4.0",
-                                                                                                                    "isobject": "^3.0.1",
-                                                                                                                    "liftoff": "^3.1.0",
-                                                                                                                    "matchdep": "^2.0.0",
-                                                                                                                    "mute-stdout": "^1.0.0",
-                                                                                                                    "pretty-hrtime": "^1.0.0",
-                                                                                                                    "replace-homedir": "^1.0.0",
-                                                                                                                    "semver-greatest-satisfied-range": "^1.1.0",
-                                                                                                                    "v8flags": "^3.2.0",
-                                                                                                                    "yargs": "^7.1.0"
-                                                                                                                  }
-                                                                                                                },
-                                                                                                                "interpret": {
-                                                                                                                  "version": "1.4.0",
-                                                                                                                  "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-                                                                                                                  "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
-                                                                                                                  "dev": true
-                                                                                                                },
-                                                                                                                "v8flags": {
-                                                                                                                  "version": "3.2.0",
-                                                                                                                  "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
-                                                                                                                  "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
-                                                                                                                  "dev": true,
-                                                                                                                  "requires": {
-                                                                                                                    "homedir-polyfill": "^1.0.1"
-                                                                                                                  }
-                                                                                                                } ===
-                                                                                                                === =
-                                                                                                                "is-path-inside": "^2.1.0" >>>
-                                                                                                                  >>> > upstream / master
-                                                                                                              }
-                                                                                                            },
-                                                                                                            "is-path-inside": {
-                                                                                                              "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": {
-                                                                                                                <<
-                                                                                                                << << < HEAD "get-stream": "^5.1.0",
-                                                                                                                "plugin-error": "^1.0.1",
-                                                                                                                "through2": "^3.0.1",
-                                                                                                                "vinyl": "^2.1.0",
-                                                                                                                "yazl": "^2.5.1"
-                                                                                                              },
-                                                                                                              "dependencies": {
-                                                                                                                "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=="
-                                                                                                                },
-                                                                                                                "get-stream": {
-                                                                                                                  "version": "5.1.0",
-                                                                                                                  "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-                                                                                                                  "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
-                                                                                                                  "dev": true,
-                                                                                                                  "requires": {
-                                                                                                                    "pump": "^3.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=="
-                                                                                                                },
-                                                                                                                "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=="
-                                                                                                                },
-                                                                                                                "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",
-                                                                                                                    "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=="
-                                                                                                                },
-                                                                                                                "supports-color": {
-                                                                                                                  "version": "7.1.0",
-                                                                                                                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                                                                                                                  "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                                                                                                                  "requires": {
-                                                                                                                    "has-flag": "^4.0.0"
-                                                                                                                  }
-                                                                                                                },
-                                                                                                                "through2": {
-                                                                                                                  "version": "3.0.1",
-                                                                                                                  "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
-                                                                                                                  "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
-                                                                                                                  "dev": true,
-                                                                                                                  "requires": {
-                                                                                                                    "readable-stream": "2 || 3"
-                                                                                                                  }
-                                                                                                                } ===
-                                                                                                                === =
-                                                                                                                "path-is-inside": "^1.0.2" >>>
-                                                                                                                  >>> > upstream / master
-                                                                                                              }
-                                                                                                            },
-                                                                                                            "is-plain-obj": {
-                                                                                                              "version": "1.1.0",
-                                                                                                              "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-                                                                                                              "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
-                                                                                                            },
-                                                                                                            "is-plain-object": {
-                                                                                                              "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"
-                                                                                                              }
-                                                                                                            },
-                                                                                                            "is-promise": {
-                                                                                                              "version": "2.2.2",
-                                                                                                              "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-                                                                                                              "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
-                                                                                                              "dev": true
-                                                                                                            },
-                                                                                                            <<
-                                                                                                            << << < HEAD "handlebars": {
-                                                                                                              "version": "4.7.6",
-                                                                                                              "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz",
-                                                                                                              "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==",
-                                                                                                              "dev": true,
-                                                                                                              "requires": {
-                                                                                                                "minimist": "^1.2.5",
-                                                                                                                "neo-async": "^2.6.0",
-                                                                                                                "source-map": "^0.6.1",
-                                                                                                                "uglify-js": "^3.1.4",
-                                                                                                                "wordwrap": "^1.0.0" ===
-                                                                                                                  === =
-                                                                                                                  "is-property": {
-                                                                                                                    "version": "1.0.2",
-                                                                                                                    "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-                                                                                                                    "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
-                                                                                                                    "dev": true
-                                                                                                                  },
-                                                                                                                "is-reference": {
-                                                                                                                  "version": "1.2.0",
-                                                                                                                  "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.0.tgz",
-                                                                                                                  "integrity": "sha512-ZVxq+5TkOx6GQdnoMm2aRdCKADdcrOWXLGzGT+vIA8DMpqEJaRk5AL1bS80zJ2bjHunVmjdzfCt0e4BymIEqKQ==",
-                                                                                                                  "dev": true,
-                                                                                                                  "requires": {
-                                                                                                                    "@types/estree": "0.0.44" >>>
-                                                                                                                      >>> > upstream / master
-                                                                                                                  },
-                                                                                                                  "dependencies": {
-                                                                                                                    "@types/estree": {
-                                                                                                                      "version": "0.0.44",
-                                                                                                                      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.44.tgz",
-                                                                                                                      "integrity": "sha512-iaIVzr+w2ZJ5HkidlZ3EJM8VTZb2MJLCjw3V+505yVts0gRC4UMvjw0d1HPtGqI/HQC/KdsYtayfzl+AXY2R8g==",
-                                                                                                                      "dev": true
-                                                                                                                    }
-                                                                                                                  }
-                                                                                                                },
-                                                                                                                "is-regex": {
-                                                                                                                  "version": "1.0.4",
-                                                                                                                  "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-                                                                                                                  "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
-                                                                                                                  "dev": true,
-                                                                                                                  "requires": {
-                                                                                                                    "has": "^1.0.1"
-                                                                                                                  }
-                                                                                                                },
-                                                                                                                "is-relative": {
-                                                                                                                  "version": "1.0.0",
-                                                                                                                  "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-                                                                                                                  "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
-                                                                                                                  "dev": true,
-                                                                                                                  "requires": {
-                                                                                                                    "is-unc-path": "^1.0.0"
-                                                                                                                  }
-                                                                                                                },
-                                                                                                                "is-resolvable": {
-                                                                                                                  "version": "1.1.0",
-                                                                                                                  "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-                                                                                                                  "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
-                                                                                                                  "dev": true
-                                                                                                                },
-                                                                                                                "is-running": {
-                                                                                                                  "version": "2.1.0",
-                                                                                                                  "resolved": "https://registry.npmjs.org/is-running/-/is-running-2.1.0.tgz",
-                                                                                                                  "integrity": "sha1-MKc/9cw4VOT8JUkICen1q/jeCeA=",
-                                                                                                                  "dev": true
-                                                                                                                },
-                                                                                                                "is-stream": {
-                                                                                                                  "version": "1.1.0",
-                                                                                                                  "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-                                                                                                                  "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-                                                                                                                },
-                                                                                                                "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",
-                                                                                                                  "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
-                                                                                                                  "dev": true,
-                                                                                                                  "requires": {
-                                                                                                                    "has-symbols": "^1.0.0"
-                                                                                                                  }
-                                                                                                                },
-                                                                                                                "is-typedarray": {
-                                                                                                                  "version": "1.0.0",
-                                                                                                                  "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-                                                                                                                  "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-                                                                                                                  "dev": true
-                                                                                                                },
-                                                                                                                "is-unc-path": {
-                                                                                                                  "version": "1.0.0",
-                                                                                                                  "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-                                                                                                                  "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
-                                                                                                                  "dev": true,
-                                                                                                                  "requires": {
-                                                                                                                    "unc-path-regex": "^0.1.2"
-                                                                                                                  }
-                                                                                                                },
-                                                                                                                "is-utf8": {
-                                                                                                                  "version": "0.2.1",
-                                                                                                                  "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-                                                                                                                  "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-                                                                                                                  "dev": true
-                                                                                                                },
-                                                                                                                "is-valid-glob": {
-                                                                                                                  "version": "1.0.0",
-                                                                                                                  <<
-                                                                                                                  << << < HEAD "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-                                                                                                                  "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-                                                                                                                  ===
-                                                                                                                  === =
-                                                                                                                  "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
-                                                                                                                  "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
-                                                                                                                  "dev": true
-                                                                                                                },
-                                                                                                                "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==",
-                                                                                                                  "dev": true
-                                                                                                                },
-                                                                                                                "is-wsl": {
-                                                                                                                  "version": "2.2.0",
-                                                                                                                  "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-                                                                                                                  "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-                                                                                                                  "dev": true,
-                                                                                                                  >>>
-                                                                                                                  >>> > upstream / master "requires": {
-                                                                                                                    "is-docker": "^2.0.0"
-                                                                                                                  }
-                                                                                                                },
-                                                                                                                "is-yarn-global": {
-                                                                                                                  "version": "0.3.0",
-                                                                                                                  "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
-                                                                                                                  "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==",
-                                                                                                                  "dev": true
-                                                                                                                },
-                                                                                                                "isarray": {
-                                                                                                                  "version": "1.0.0",
-                                                                                                                  <<
-                                                                                                                  << << < HEAD "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-                                                                                                                  "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-                                                                                                                  ===
-                                                                                                                  === =
-                                                                                                                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-                                                                                                                  "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-                                                                                                                  "dev": true
-                                                                                                                },
-                                                                                                                "isbinaryfile": {
-                                                                                                                  "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",
-                                                                                                                  "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-                                                                                                                  "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-                                                                                                                },
-                                                                                                                "isobject": {
-                                                                                                                  "version": "3.0.1",
-                                                                                                                  "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-                                                                                                                  "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-                                                                                                                  "dev": true
-                                                                                                                },
-                                                                                                                "isstream": {
-                                                                                                                  "version": "0.1.2",
-                                                                                                                  "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-                                                                                                                  "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-                                                                                                                  "dev": true
-                                                                                                                },
-                                                                                                                "istanbul": {
-                                                                                                                  "version": "0.4.5",
-                                                                                                                  "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
-                                                                                                                  "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
-                                                                                                                  "dev": true,
-                                                                                                                  >>>
-                                                                                                                  >>> > upstream / master "requires": {
-                                                                                                                    "abbrev": "1.0.x",
-                                                                                                                    "async": "1.x",
-                                                                                                                    "escodegen": "1.8.x",
-                                                                                                                    "esprima": "2.7.x",
-                                                                                                                    "glob": "^5.0.15",
-                                                                                                                    "handlebars": "^4.0.1",
-                                                                                                                    "js-yaml": "3.x",
-                                                                                                                    "mkdirp": "0.5.x",
-                                                                                                                    "nopt": "3.x",
-                                                                                                                    "once": "1.x",
-                                                                                                                    "resolve": "1.1.x",
-                                                                                                                    "supports-color": "^3.1.0",
-                                                                                                                    "which": "^1.1.1",
-                                                                                                                    "wordwrap": "^1.0.0"
-                                                                                                                  },
-                                                                                                                  "dependencies": {
-                                                                                                                    <<
-                                                                                                                    << << < HEAD "is-number": {
-                                                                                                                      "version": "3.0.0",
-                                                                                                                      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-                                                                                                                      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-                                                                                                                      "requires": {
-                                                                                                                        "kind-of": "^3.0.2"
-                                                                                                                      },
-                                                                                                                      "dependencies": {
-                                                                                                                        "kind-of": {
-                                                                                                                          "version": "3.2.2",
-                                                                                                                          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                                                                                                                          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                                                                                                                          "requires": {
-                                                                                                                            "is-buffer": "^1.1.5"
-                                                                                                                          }
-                                                                                                                        }
-                                                                                                                      }
-                                                                                                                    },
-                                                                                                                    "kind-of": {
-                                                                                                                      "version": "4.0.0",
-                                                                                                                      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-                                                                                                                      "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-                                                                                                                      ===
-                                                                                                                      === =
-                                                                                                                      "async": {
-                                                                                                                        "version": "1.5.2",
-                                                                                                                        "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-                                                                                                                        "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-                                                                                                                        "dev": true
-                                                                                                                      },
-                                                                                                                      "esprima": {
-                                                                                                                        "version": "2.7.3",
-                                                                                                                        "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-                                                                                                                        "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
-                                                                                                                        "dev": true
-                                                                                                                      },
-                                                                                                                      "glob": {
-                                                                                                                        "version": "5.0.15",
-                                                                                                                        "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                                                                                                                        "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-                                                                                                                        "dev": true,
-                                                                                                                        "requires": {
-                                                                                                                          "inflight": "^1.0.4",
-                                                                                                                          "inherits": "2",
-                                                                                                                          "minimatch": "2 || 3",
-                                                                                                                          "once": "^1.3.0",
-                                                                                                                          "path-is-absolute": "^1.0.0"
-                                                                                                                        }
-                                                                                                                      },
-                                                                                                                      "has-flag": {
-                                                                                                                        "version": "1.0.0",
-                                                                                                                        "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-                                                                                                                        "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-                                                                                                                        "dev": true
-                                                                                                                      },
-                                                                                                                      "resolve": {
-                                                                                                                        "version": "1.1.7",
-                                                                                                                        "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-                                                                                                                        "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-                                                                                                                        "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,
-                                                                                                                        >>>
-                                                                                                                        >>> > upstream / master "requires": {
-                                                                                                                          "has-flag": "^1.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"
-                                                                                                                    },
-                                                                                                                    "dependencies": {
-                                                                                                                      "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": {
-                                                                                                                          "@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-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": {
-                                                                                                                          "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
-                                                                                                                      }
-                                                                                                                    }
-                                                                                                                  },
-                                                                                                                  <<
-                                                                                                                  << << < HEAD "hash.js": {
-                                                                                                                    "version": "1.1.7",
-                                                                                                                    "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-                                                                                                                    "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-                                                                                                                    "dev": true,
-                                                                                                                    "requires": {
-                                                                                                                      "inherits": "^2.0.3",
-                                                                                                                      "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",
-                                                                                                                    "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",
-                                                                                                                    "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-                                                                                                                    "dev": true,
-                                                                                                                    "requires": {
-                                                                                                                      "hash.js": "^1.0.3",
-                                                                                                                      "minimalistic-assert": "^1.0.0",
-                                                                                                                      "minimalistic-crypto-utils": "^1.0.1"
-                                                                                                                    }
-                                                                                                                  },
-                                                                                                                  "homedir-polyfill": {
-                                                                                                                    "version": "1.0.3",
-                                                                                                                    "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-                                                                                                                    "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-                                                                                                                    "requires": {
-                                                                                                                      "parse-passwd": "^1.0.0"
-                                                                                                                    }
-                                                                                                                  },
-                                                                                                                  "hosted-git-info": {
-                                                                                                                    "version": "2.8.4",
-                                                                                                                    "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz",
-                                                                                                                    "integrity": "sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==",
-                                                                                                                    ===
-                                                                                                                    === =
-                                                                                                                    "istanbul-lib-coverage": {
-                                                                                                                      "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==",
-                                                                                                                      >>>
-                                                                                                                      >>> > upstream / master "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"
-                                                                                                                      }
-                                                                                                                    },
-                                                                                                                    <<
-                                                                                                                    << << < HEAD "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.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": {
-                                                                                                                      "version": "2.0.2",
-                                                                                                                      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-                                                                                                                      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-                                                                                                                      "dev": true
-                                                                                                                    },
-                                                                                                                    "http-deceiver": {
-                                                                                                                      "version": "1.2.7",
-                                                                                                                      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-                                                                                                                      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
-                                                                                                                      "dev": true
-                                                                                                                    },
-                                                                                                                    "http-errors": {
-                                                                                                                      "version": "1.7.2",
-                                                                                                                      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-                                                                                                                      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
-                                                                                                                      ===
-                                                                                                                      === =
-                                                                                                                      "istanbul-lib-instrument": {
-                                                                                                                        "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==",
-                                                                                                                        >>>
-                                                                                                                        >>> > upstream / master "dev": true,
-                                                                                                                        "requires": {
-                                                                                                                          "@babel/core": "^7.7.5",
-                                                                                                                          "@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
-                                                                                                                          }
-                                                                                                                        }
-                                                                                                                      },
-                                                                                                                      <<
-                                                                                                                      << << < HEAD "http-proxy": {
-                                                                                                                        "version": "1.18.1",
-                                                                                                                        "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-                                                                                                                        "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-                                                                                                                        "dev": true,
-                                                                                                                        "requires": {
-                                                                                                                          "eventemitter3": "^4.0.0",
-                                                                                                                          "follow-redirects": "^1.0.0",
-                                                                                                                          "requires-port": "^1.0.0"
-                                                                                                                        }
-                                                                                                                      },
-                                                                                                                      "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==",
-                                                                                                                        ===
-                                                                                                                        === =
-                                                                                                                        "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==",
-                                                                                                                          >>>
-                                                                                                                          >>> > upstream / master "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",
-                                                                                                                          "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==",
-                                                                                                                          "dev": true,
-                                                                                                                          "requires": {
-                                                                                                                            "istanbul-lib-coverage": "^2.0.5",
-                                                                                                                            "make-dir": "^2.1.0",
-                                                                                                                            "supports-color": "^6.1.0"
-                                                                                                                          },
-                                                                                                                          "dependencies": {
-                                                                                                                            "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-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"
-                                                                                                                          },
-                                                                                                                          "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"
-                                                                                                                              }
-                                                                                                                            },
-                                                                                                                            "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": "3.0.2",
-                                                                                                                          "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
-                                                                                                                          "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
-                                                                                                                          "dev": true,
-                                                                                                                          "requires": {
-                                                                                                                            "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": {
-                                                                                                                          "version": "2.8.0",
-                                                                                                                          "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.8.0.tgz",
-                                                                                                                          "integrity": "sha1-awicChFXax8W3xG4AUbZHU6Lij4=",
-                                                                                                                          "dev": true,
-                                                                                                                          "requires": {
-                                                                                                                            "exit": "^0.1.2",
-                                                                                                                            "glob": "^7.0.6",
-                                                                                                                            "jasmine-core": "~2.8.0"
-                                                                                                                          },
-                                                                                                                          "dependencies": {
-                                                                                                                            "jasmine-core": {
-                                                                                                                              "version": "2.8.0",
-                                                                                                                              "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.8.0.tgz",
-                                                                                                                              "integrity": "sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=",
-                                                                                                                              "dev": true
-                                                                                                                            }
-                                                                                                                          }
-                                                                                                                        },
-                                                                                                                        "jasmine-core": {
-                                                                                                                          "version": "3.5.0",
-                                                                                                                          "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.5.0.tgz",
-                                                                                                                          "integrity": "sha512-nCeAiw37MIMA9w9IXso7bRaLl+c/ef3wnxsoSAlYrzS+Ot0zTG6nU8G/cIfGkqpkjX2wNaIW9RFG0TwIFnG6bA==",
-                                                                                                                          "dev": true
-                                                                                                                        },
-                                                                                                                        "jasmine-spec-reporter": {
-                                                                                                                          "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.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": {
-                                                                                                                          "version": "2.2.0",
-                                                                                                                          "resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.2.0.tgz",
-                                                                                                                          "integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
-                                                                                                                          "dev": true
-                                                                                                                        },
-                                                                                                                        "jest-worker": {
-                                                                                                                          "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": "^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-tokens": {
-                                                                                                                          "version": "4.0.0",
-                                                                                                                          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-                                                                                                                          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-                                                                                                                          "dev": true
-                                                                                                                        },
-                                                                                                                        "js-yaml": {
-                                                                                                                          "version": "3.13.1",
-                                                                                                                          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-                                                                                                                          "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
-                                                                                                                          "dev": true,
-                                                                                                                          "requires": {
-                                                                                                                            "argparse": "^1.0.7",
-                                                                                                                            "esprima": "^4.0.0"
-                                                                                                                          }
-                                                                                                                        },
-                                                                                                                        "jsbn": {
-                                                                                                                          "version": "0.1.1",
-                                                                                                                          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-                                                                                                                          "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-                                                                                                                          "dev": true
-                                                                                                                        },
-                                                                                                                        "jsesc": {
-                                                                                                                          "version": "2.5.2",
-                                                                                                                          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-                                                                                                                          "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-                                                                                                                          "dev": true
-                                                                                                                        },
-                                                                                                                        "json-buffer": {
-                                                                                                                          "version": "3.0.0",
-                                                                                                                          "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-                                                                                                                          "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
-                                                                                                                          "dev": true
-                                                                                                                        },
-                                                                                                                        "json-parse-better-errors": {
-                                                                                                                          "version": "1.0.2",
-                                                                                                                          "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-                                                                                                                          "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-                                                                                                                          "dev": true
-                                                                                                                        },
-                                                                                                                        <<
-                                                                                                                        << << < HEAD "immer": {
-                                                                                                                          "version": "6.0.9",
-                                                                                                                          "resolved": "https://registry.npmjs.org/immer/-/immer-6.0.9.tgz",
-                                                                                                                          "integrity": "sha512-SyCYnAuiRf67Lvk0VkwFvwtDoEiCMjeamnHvRfnVDyc7re1/rQrNxuL+jJ7lA3WvdC4uznrvbmm+clJ9+XXatg==" ===
-                                                                                                                            === =
-                                                                                                                            "json-schema": {
-                                                                                                                              "version": "0.2.3",
-                                                                                                                              "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-                                                                                                                              "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-                                                                                                                              "dev": true >>>
-                                                                                                                                >>> > upstream / master
-                                                                                                                            },
-                                                                                                                          "json-schema-ref-parser": {
-                                                                                                                            "version": "9.0.1",
-                                                                                                                            "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-9.0.1.tgz",
-                                                                                                                            "integrity": "sha512-KLrCjRjW5hMXxsX4osVBWpwixXL9NtICfpyNNS0eHguN5mP/I4UatI7i7PFS8jU94b1NHF4EbirACdCn0RFPBA==",
-                                                                                                                            "dev": true,
-                                                                                                                            "requires": {
-                                                                                                                              "@apidevtools/json-schema-ref-parser": "9.0.1"
-                                                                                                                            }
-                                                                                                                          },
-                                                                                                                          "json-schema-to-typescript": {
-                                                                                                                            "version": "9.1.0",
-                                                                                                                            "resolved": "https://registry.npmjs.org/json-schema-to-typescript/-/json-schema-to-typescript-9.1.0.tgz",
-                                                                                                                            "integrity": "sha512-9/yDXQQyqtRDxohQGRCKht4Wjfg73TALi1yzy651EOo71a6aKFtIm2WUbDWSf8OitFGukUn00dx4t1kg0W6O4Q==",
-                                                                                                                            "dev": true,
-                                                                                                                            "requires": {
-                                                                                                                              "@types/json-schema": "^7.0.4",
-                                                                                                                              "cli-color": "^2.0.0",
-                                                                                                                              "glob": "^7.1.6",
-                                                                                                                              "is-glob": "^4.0.1",
-                                                                                                                              "json-schema-ref-parser": "^9.0.1",
-                                                                                                                              "json-stringify-safe": "^5.0.1",
-                                                                                                                              "lodash": "^4.17.15",
-                                                                                                                              "minimist": "^1.2.5",
-                                                                                                                              "mkdirp": "^1.0.4",
-                                                                                                                              "mz": "^2.7.0",
-                                                                                                                              "prettier": "^2.0.5",
-                                                                                                                              "stdin": "0.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"
-                                                                                                                                }
-                                                                                                                              },
-                                                                                                                              "mkdirp": {
-                                                                                                                                "version": "1.0.4",
-                                                                                                                                "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-                                                                                                                                "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-                                                                                                                                "dev": true
-                                                                                                                              }
-                                                                                                                            }
-                                                                                                                          },
-                                                                                                                          "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=="
-                                                                                                                          },
-                                                                                                                          "json-stable-stringify": {
-                                                                                                                            "version": "1.0.1",
-                                                                                                                            "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-                                                                                                                            "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
-                                                                                                                            "dev": true,
-                                                                                                                            "requires": {
-                                                                                                                              "kind-of": "^6.0.2"
-                                                                                                                            }
-                                                                                                                          },
-                                                                                                                          "json-stable-stringify-without-jsonify": {
-                                                                                                                            "version": "1.0.1",
-                                                                                                                            "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-                                                                                                                            "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-                                                                                                                            "dev": true
-                                                                                                                          },
-                                                                                                                          "json-stringify-safe": {
-                                                                                                                            "version": "5.0.1",
-                                                                                                                            "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-                                                                                                                            "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-                                                                                                                            "dev": true
-                                                                                                                          },
-                                                                                                                          "json3": {
-                                                                                                                            "version": "3.3.3",
-                                                                                                                            "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
-                                                                                                                            "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==",
-                                                                                                                            "dev": true
-                                                                                                                          },
-                                                                                                                          "json5": {
-                                                                                                                            "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.5"
-                                                                                                                            }
-                                                                                                                          },
-                                                                                                                          "jsonfile": {
-                                                                                                                            "version": "4.0.0",
-                                                                                                                            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-                                                                                                                            "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-                                                                                                                            "dev": true,
-                                                                                                                            "requires": {
-                                                                                                                              "graceful-fs": "^4.1.6"
-                                                                                                                            }
-                                                                                                                          },
-                                                                                                                          "jsonparse": {
-                                                                                                                            "version": "1.3.1",
-                                                                                                                            "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-                                                                                                                            "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
-                                                                                                                            "dev": true
-                                                                                                                          },
-                                                                                                                          "jsonpointer": {
-                                                                                                                            "version": "4.0.1",
-                                                                                                                            "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
-                                                                                                                            "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
-                                                                                                                            "dev": true
-                                                                                                                          },
-                                                                                                                          "jsprim": {
-                                                                                                                            "version": "1.4.1",
-                                                                                                                            "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-                                                                                                                            "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-                                                                                                                            "dev": true,
-                                                                                                                            "requires": {
-                                                                                                                              "assert-plus": "1.0.0",
-                                                                                                                              "extsprintf": "1.3.0",
-                                                                                                                              "json-schema": "0.2.3",
-                                                                                                                              "verror": "1.10.0"
-                                                                                                                            }
-                                                                                                                          },
-                                                                                                                          <<
-                                                                                                                          << << < HEAD "inherits": {
-                                                                                                                            "version": "2.0.4",
-                                                                                                                            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-                                                                                                                            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-                                                                                                                          },
-                                                                                                                          "ini": {
-                                                                                                                            "version": "1.3.5",
-                                                                                                                            "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-                                                                                                                            "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
-                                                                                                                            "dev": true ===
-                                                                                                                              === =
-                                                                                                                              "jszip": {
-                                                                                                                                "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",
-                                                                                                                                  "pako": "~1.0.2",
-                                                                                                                                  "readable-stream": "~2.3.6",
-                                                                                                                                  "set-immediate-shim": "~1.0.1"
-                                                                                                                                } >>>
-                                                                                                                                >>> > upstream / master
-                                                                                                                              },
-                                                                                                                            "just-debounce": {
-                                                                                                                              "version": "1.0.0",
-                                                                                                                              "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz",
-                                                                                                                              "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=",
-                                                                                                                              "dev": true
-                                                                                                                            },
-                                                                                                                            "karma": {
-                                                                                                                              "version": "5.0.1",
-                                                                                                                              "resolved": "https://registry.npmjs.org/karma/-/karma-5.0.1.tgz",
-                                                                                                                              "integrity": "sha512-xrDGtZ0mykEQjx1BUHOP1ITi39MDsCGocmSvLJWHxUQpxuKwxk3ZUrC6HI2VWh1plLC6+7cA3B19m12yzO/FRw==",
-                                                                                                                              "dev": true,
-                                                                                                                              "requires": {
-                                                                                                                                "body-parser": "^1.16.1",
-                                                                                                                                "braces": "^3.0.2",
-                                                                                                                                "chokidar": "^3.0.0",
-                                                                                                                                "colors": "^1.1.0",
-                                                                                                                                "connect": "^3.6.0",
-                                                                                                                                "di": "^0.0.1",
-                                                                                                                                "dom-serialize": "^2.2.0",
-                                                                                                                                "flatted": "^2.0.0",
-                                                                                                                                "glob": "^7.1.1",
-                                                                                                                                "graceful-fs": "^4.1.2",
-                                                                                                                                "http-proxy": "^1.13.0",
-                                                                                                                                "isbinaryfile": "^4.0.2",
-                                                                                                                                "lodash": "^4.17.14",
-                                                                                                                                "log4js": "^4.0.0",
-                                                                                                                                "mime": "^2.3.1",
-                                                                                                                                "minimatch": "^3.0.2",
-                                                                                                                                "qjobs": "^1.1.4",
-                                                                                                                                "range-parser": "^1.2.0",
-                                                                                                                                "rimraf": "^2.6.0",
-                                                                                                                                "socket.io": "2.1.1",
-                                                                                                                                "source-map": "^0.6.1",
-                                                                                                                                "tmp": "0.0.33",
-                                                                                                                                "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",
-                                                                                                                                  "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-                                                                                                                                  "dev": true,
-                                                                                                                                  "requires": {
-                                                                                                                                    "normalize-path": "^3.0.0",
-                                                                                                                                    "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": "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",
-                                                                                                                                  "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"
-                                                                                                                                  }
-                                                                                                                                },
-                                                                                                                                "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
-                                                                                                                                },
-                                                                                                                                "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"
-                                                                                                                                  }
-                                                                                                                                },
-                                                                                                                                "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": {
-                                                                                                                                    "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",
-                                                                                                                                  "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
-                                                                                                                                  "dev": true
-                                                                                                                                },
-                                                                                                                                "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.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",
-                                                                                                                                  "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==",
-                                                                                                                                  "dev": true,
-                                                                                                                                  "requires": {
-                                                                                                                                    "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,
-                                                                                                                                  <<
-                                                                                                                                  << << < HEAD "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"
-                                                                                                                                  }
-                                                                                                                                }
-                                                                                                                              }
-                                                                                                                            },
-                                                                                                                            "internal-ip": {
-                                                                                                                              "version": "4.3.0",
-                                                                                                                              "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
-                                                                                                                              "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
-                                                                                                                              "dev": true,
-                                                                                                                              "requires": {
-                                                                                                                                "default-gateway": "^4.2.0",
-                                                                                                                                "ipaddr.js": "^1.9.0"
-                                                                                                                              }
-                                                                                                                            },
-                                                                                                                            "intersect": {
-                                                                                                                              "version": "1.0.1",
-                                                                                                                              "resolved": "https://registry.npmjs.org/intersect/-/intersect-1.0.1.tgz",
-                                                                                                                              "integrity": "sha1-MyZQ4QhU2MCsWMGSvcJ6i/fnoww="
-                                                                                                                            },
-                                                                                                                            "invariant": {
-                                                                                                                              "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"
-                                                                                                                              }
-                                                                                                                            },
-                                                                                                                            "invert-kv": {
-                                                                                                                              "version": "1.0.0",
-                                                                                                                              "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-                                                                                                                              "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-                                                                                                                              "dev": true
-                                                                                                                            },
-                                                                                                                            "ip": {
-                                                                                                                              "version": "1.1.5",
-                                                                                                                              "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-                                                                                                                              "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
-                                                                                                                              "dev": true
-                                                                                                                            },
-                                                                                                                            "ip-regex": {
-                                                                                                                              "version": "2.1.0",
-                                                                                                                              "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-                                                                                                                              "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
-                                                                                                                              "dev": true
-                                                                                                                            },
-                                                                                                                            "ipaddr.js": {
-                                                                                                                              "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": {
-                                                                                                                              "version": "1.0.0",
-                                                                                                                              "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-                                                                                                                              "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
-                                                                                                                              "dev": true,
-                                                                                                                              "requires": {
-                                                                                                                                "is-relative": "^1.0.0",
-                                                                                                                                "is-windows": "^1.0.1"
-                                                                                                                              }
-                                                                                                                            },
-                                                                                                                            "is-absolute-url": {
-                                                                                                                              "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": {
-                                                                                                                              "version": "0.1.6",
-                                                                                                                              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-                                                                                                                              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-                                                                                                                              "requires": {
-                                                                                                                                "kind-of": "^3.0.2"
-                                                                                                                              },
-                                                                                                                              "dependencies": {
-                                                                                                                                "kind-of": {
-                                                                                                                                  "version": "3.2.2",
-                                                                                                                                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                                                                                                                                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                                                                                                                                  ===
-                                                                                                                                  === = >>>
-                                                                                                                                  >>> > upstream / master "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": {
-                                                                                                                                    "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"
-                                                                                                                                  }
-                                                                                                                                }
-                                                                                                                              }
-                                                                                                                            },
-                                                                                                                            <<
-                                                                                                                            << << < HEAD "is-arguments": {
-                                                                                                                              "version": "1.0.4",
-                                                                                                                              "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
-                                                                                                                              "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
-                                                                                                                              "dev": true
-                                                                                                                            },
-                                                                                                                            "is-arrayish": {
-                                                                                                                              "version": "0.2.1",
-                                                                                                                              "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-                                                                                                                              "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-                                                                                                                              "dev": true
-                                                                                                                            },
-                                                                                                                            "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==",
-                                                                                                                              "requires": {
-                                                                                                                                "binary-extensions": "^2.0.0"
-                                                                                                                              },
-                                                                                                                              "dependencies": {
-                                                                                                                                "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=="
-                                                                                                                                }
-                                                                                                                              }
-                                                                                                                            },
-                                                                                                                            "is-buffer": {
-                                                                                                                              "version": "1.1.6",
-                                                                                                                              "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-                                                                                                                              "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
-                                                                                                                            },
-                                                                                                                            "is-callable": {
-                                                                                                                              "version": "1.1.4",
-                                                                                                                              "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
-                                                                                                                              "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
-                                                                                                                              "dev": true
-                                                                                                                            },
-                                                                                                                            "is-ci": {
-                                                                                                                              ===
-                                                                                                                              === =
-                                                                                                                              "karma-chrome-launcher": {
-                                                                                                                                "version": "3.1.0",
-                                                                                                                                "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.1.0.tgz",
-                                                                                                                                "integrity": "sha512-3dPs/n7vgz1rxxtynpzZTvb9y/GIaW8xjAwcIGttLbycqoFtI7yo1NGnQi6oFTherRE+GIhCAHZC4vEqWGhNvg==",
-                                                                                                                                "dev": true,
-                                                                                                                                "requires": {
-                                                                                                                                  "which": "^1.2.1"
-                                                                                                                                }
-                                                                                                                              },
-                                                                                                                              "karma-cli": {
-                                                                                                                                >>>
-                                                                                                                                >>> > upstream / master "version": "2.0.0",
-                                                                                                                                "resolved": "https://registry.npmjs.org/karma-cli/-/karma-cli-2.0.0.tgz",
-                                                                                                                                "integrity": "sha512-1Kb28UILg1ZsfqQmeELbPzuEb5C6GZJfVIk0qOr8LNYQuYWmAaqP16WpbpKEjhejDrDYyYOwwJXSZO6u7q5Pvw==",
-                                                                                                                                "dev": true,
-                                                                                                                                "requires": {
-                                                                                                                                  "resolve": "^1.3.3"
-                                                                                                                                }
-                                                                                                                              },
-                                                                                                                              <<
-                                                                                                                              << << < HEAD "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=",
-                                                                                                                                ===
-                                                                                                                                === =
-                                                                                                                                "karma-coverage-istanbul-reporter": {
-                                                                                                                                  "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,
-                                                                                                                                  >>>
-                                                                                                                                  >>> > upstream / master "requires": {
-                                                                                                                                    "istanbul-api": "^2.1.6",
-                                                                                                                                    "minimatch": "^3.0.4"
-                                                                                                                                  },
-                                                                                                                                  "dependencies": {
-                                                                                                                                    <<
-                                                                                                                                    << << < HEAD "kind-of": {
-                                                                                                                                      "version": "3.2.2",
-                                                                                                                                      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                                                                                                                                      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                                                                                                                                      ===
-                                                                                                                                      === =
-                                                                                                                                      "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,
-                                                                                                                                        >>>
-                                                                                                                                        >>> > upstream / master "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=="
-                                                                                                                                      },
-                                                                                                                                      "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.7",
-                                                                                                                                        "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.1.7.tgz",
-                                                                                                                                        "integrity": "sha512-LYTOa2UrYFyJ/aSczZi/6lBykVMjCCvUmT64gOe+jPZFy4w6FYfPGqFT2IiQ2BxVHHDOvCD7qrIXb0EOh4uGWw==",
-                                                                                                                                        "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.5",
-                                                                                                                                          "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-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": {
-                                                                                                                                          "html-escaper": "^2.0.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==",
-                                                                                                                                        "requires": {
-                                                                                                                                          "big.js": "^5.2.2",
-                                                                                                                                          "emojis-list": "^3.0.0"
-                                                                                                                                        }
-                                                                                                                                      },
-                                                                                                                                      "normalize-url": {
-                                                                                                                                        "version": "1.9.1",
-                                                                                                                                        "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
-                                                                                                                                        "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
-                                                                                                                                        "requires": {
-                                                                                                                                          "object-assign": "^4.0.1",
-                                                                                                                                          "prepend-http": "^1.0.0",
-                                                                                                                                          "query-string": "^4.1.0",
-                                                                                                                                          "sort-keys": "^1.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
-                                                                                                                                      },
-                                                                                                                                      "strip-bom": {
-                                                                                                                                        "version": "3.0.0",
-                                                                                                                                        "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-                                                                                                                                        "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-                                                                                                                                        "dev": true
-                                                                                                                                      }
-                                                                                                                                    }
-                                                                                                                                  },
-                                                                                                                                  <<
-                                                                                                                                  << << < HEAD "is-date-object": {
-                                                                                                                                    "version": "1.0.1",
-                                                                                                                                    "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-                                                                                                                                    "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
-                                                                                                                                    "dev": true
-                                                                                                                                  },
-                                                                                                                                  "is-descriptor": {
-                                                                                                                                    "version": "0.1.6",
-                                                                                                                                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-                                                                                                                                    "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-                                                                                                                                    "requires": {
-                                                                                                                                      "is-accessor-descriptor": "^0.1.6",
-                                                                                                                                      "is-data-descriptor": "^0.1.4",
-                                                                                                                                      "kind-of": "^5.0.0"
-                                                                                                                                    },
-                                                                                                                                    "dependencies": {
-                                                                                                                                      "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=="
-                                                                                                                                      }
-                                                                                                                                    }
-                                                                                                                                  },
-                                                                                                                                  "is-directory": {
-                                                                                                                                    "version": "0.3.1",
-                                                                                                                                    "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-                                                                                                                                    "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",
-                                                                                                                                    "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
-                                                                                                                                  },
-                                                                                                                                  "is-extglob": {
-                                                                                                                                    "version": "2.1.1",
-                                                                                                                                    "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-                                                                                                                                    "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" ===
-                                                                                                                                      === =
-                                                                                                                                      "karma-jasmine": {
-                                                                                                                                        "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.5.0"
-                                                                                                                                        }
-                                                                                                                                      },
-                                                                                                                                    "karma-jasmine-html-reporter": {
-                                                                                                                                      "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 >>>
-                                                                                                                                        >>> > upstream / master
-                                                                                                                                    },
-                                                                                                                                    "karma-source-map-support": {
-                                                                                                                                      "version": "1.4.0",
-                                                                                                                                      "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz",
-                                                                                                                                      "integrity": "sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==",
-                                                                                                                                      "dev": true,
-                                                                                                                                      "requires": {
-                                                                                                                                        "source-map-support": "^0.5.5"
-                                                                                                                                      }
-                                                                                                                                    },
-                                                                                                                                    "karma-spec-reporter": {
-                                                                                                                                      "version": "0.0.32",
-                                                                                                                                      "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.32.tgz",
-                                                                                                                                      "integrity": "sha1-LpxyB+pyZ3EmAln4K+y1QyCeRAo=",
-                                                                                                                                      "dev": true,
-                                                                                                                                      "requires": {
-                                                                                                                                        "colors": "^1.1.2"
-                                                                                                                                      }
-                                                                                                                                    },
-                                                                                                                                    "keyv": {
-                                                                                                                                      "version": "3.1.0",
-                                                                                                                                      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
-                                                                                                                                      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
-                                                                                                                                      "dev": true,
-                                                                                                                                      "requires": {
-                                                                                                                                        "json-buffer": "3.0.0"
-                                                                                                                                      }
-                                                                                                                                    },
-                                                                                                                                    "killable": {
-                                                                                                                                      "version": "1.0.1",
-                                                                                                                                      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
-                                                                                                                                      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==",
-                                                                                                                                      "dev": true
-                                                                                                                                    },
-                                                                                                                                    "kind-of": {
-                                                                                                                                      "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": {
-                                                                                                                                      "version": "2.1.0",
-                                                                                                                                      "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-2.1.0.tgz",
-                                                                                                                                      "integrity": "sha1-PTvNhgDnv971MjHHOf8FOu1WDkQ=",
-                                                                                                                                      "dev": true,
-                                                                                                                                      "requires": {
-                                                                                                                                        "graceful-fs": "^4.1.11"
-                                                                                                                                      }
-                                                                                                                                    },
-                                                                                                                                    "known-css-properties": {
-                                                                                                                                      "version": "0.3.0",
-                                                                                                                                      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.3.0.tgz",
-                                                                                                                                      "integrity": "sha512-QMQcnKAiQccfQTqtBh/qwquGZ2XK/DXND1jrcN9M8gMMy99Gwla7GQjndVUsEqIaRyP6bsFRuhwRj5poafBGJQ==",
-                                                                                                                                      "dev": true
-                                                                                                                                    },
-                                                                                                                                    <<
-                                                                                                                                    << << < HEAD "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
-                                                                                                                                    },
-                                                                                                                                    "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==",
-                                                                                                                                      ===
-                                                                                                                                      === =
-                                                                                                                                      "last-run": {
-                                                                                                                                        "version": "1.1.1",
-                                                                                                                                        "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
-                                                                                                                                        "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
-                                                                                                                                        "dev": true,
-                                                                                                                                        "requires": {
-                                                                                                                                          "default-resolution": "^2.0.0",
-                                                                                                                                          "es6-weak-map": "^2.0.1"
-                                                                                                                                        }
-                                                                                                                                      },
-                                                                                                                                      "latest-version": {
-                                                                                                                                        "version": "5.1.0",
-                                                                                                                                        "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
-                                                                                                                                        "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
-                                                                                                                                        >>>
-                                                                                                                                        >>> > upstream / master "dev": true,
-                                                                                                                                        "requires": {
-                                                                                                                                          "package-json": "^6.3.0"
-                                                                                                                                        }
-                                                                                                                                      },
-                                                                                                                                      "lazystream": {
-                                                                                                                                        "version": "1.0.0",
-                                                                                                                                        "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-                                                                                                                                        "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
-                                                                                                                                        "dev": true,
-                                                                                                                                        "requires": {
-                                                                                                                                          "readable-stream": "^2.0.5"
-                                                                                                                                        }
-                                                                                                                                      },
-                                                                                                                                      <<
-                                                                                                                                      << << < HEAD "is-plain-obj": {
-                                                                                                                                        "version": "1.1.0",
-                                                                                                                                        "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-                                                                                                                                        "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
-                                                                                                                                      },
-                                                                                                                                      "is-plain-object": {
-                                                                                                                                        "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==",
-                                                                                                                                        ===
-                                                                                                                                        === =
-                                                                                                                                        "lcid": {
-                                                                                                                                          "version": "1.0.0",
-                                                                                                                                          "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-                                                                                                                                          "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-                                                                                                                                          "dev": true,
-                                                                                                                                          >>>
-                                                                                                                                          >>> > upstream / master "requires": {
-                                                                                                                                            "invert-kv": "^1.0.0"
-                                                                                                                                          }
-                                                                                                                                        },
-                                                                                                                                        <<
-                                                                                                                                        << << < HEAD "is-promise": {
-                                                                                                                                          "version": "2.2.2",
-                                                                                                                                          "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-                                                                                                                                          "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
-                                                                                                                                          "dev": true
-                                                                                                                                        },
-                                                                                                                                        "is-property": {
-                                                                                                                                          "version": "1.0.2",
-                                                                                                                                          "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-                                                                                                                                          "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
-                                                                                                                                          "dev": true
-                                                                                                                                        },
-                                                                                                                                        "is-reference": {
-                                                                                                                                          "version": "1.2.0",
-                                                                                                                                          "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.0.tgz",
-                                                                                                                                          "integrity": "sha512-ZVxq+5TkOx6GQdnoMm2aRdCKADdcrOWXLGzGT+vIA8DMpqEJaRk5AL1bS80zJ2bjHunVmjdzfCt0e4BymIEqKQ==",
-                                                                                                                                          "dev": true,
-                                                                                                                                          "requires": {
-                                                                                                                                            "@types/estree": "0.0.44"
-                                                                                                                                          },
-                                                                                                                                          "dependencies": {
-                                                                                                                                            "@types/estree": {
-                                                                                                                                              "version": "0.0.44",
-                                                                                                                                              "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.44.tgz",
-                                                                                                                                              "integrity": "sha512-iaIVzr+w2ZJ5HkidlZ3EJM8VTZb2MJLCjw3V+505yVts0gRC4UMvjw0d1HPtGqI/HQC/KdsYtayfzl+AXY2R8g==",
-                                                                                                                                              "dev": true
-                                                                                                                                            } ===
-                                                                                                                                            === =
-                                                                                                                                            "lead": {
-                                                                                                                                              "version": "1.0.0",
-                                                                                                                                              "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
-                                                                                                                                              "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
-                                                                                                                                              "dev": true,
-                                                                                                                                              "requires": {
-                                                                                                                                                "flush-write-stream": "^1.0.2" >>>
-                                                                                                                                                  >>> > upstream / master
-                                                                                                                                              }
-                                                                                                                                            },
-                                                                                                                                            "less": {
-                                                                                                                                              "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",
-                                                                                                                                                "errno": "^0.1.1",
-                                                                                                                                                "graceful-fs": "^4.1.2",
-                                                                                                                                                "image-size": "~0.5.0",
-                                                                                                                                                "mime": "^1.4.1",
-                                                                                                                                                "mkdirp": "^0.5.0",
-                                                                                                                                                "promise": "^7.1.1",
-                                                                                                                                                "request": "^2.83.0",
-                                                                                                                                                "source-map": "~0.6.0",
-                                                                                                                                                "tslib": "^1.10.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,
-                                                                                                                                                  "optional": true
-                                                                                                                                                }
-                                                                                                                                              }
-                                                                                                                                            },
-                                                                                                                                            "less-loader": {
-                                                                                                                                              "version": "5.0.0",
-                                                                                                                                              "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-5.0.0.tgz",
-                                                                                                                                              "integrity": "sha512-bquCU89mO/yWLaUq0Clk7qCsKhsF/TZpJUzETRvJa9KSVEL9SO3ovCvdEHISBhrC81OwC8QSVX7E0bzElZj9cg==",
-                                                                                                                                              "dev": true,
-                                                                                                                                              "requires": {
-                                                                                                                                                "clone": "^2.1.1",
-                                                                                                                                                "loader-utils": "^1.1.0",
-                                                                                                                                                "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",
-                                                                                                                                                  "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-                                                                                                                                                  "dev": true
-                                                                                                                                                }
-                                                                                                                                              }
-                                                                                                                                            },
-                                                                                                                                            <<
-                                                                                                                                            << << < HEAD "is-stream": {
-                                                                                                                                              "version": "1.1.0",
-                                                                                                                                              "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-                                                                                                                                              "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" ===
-                                                                                                                                                === =
-                                                                                                                                                "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 >>>
-                                                                                                                                                    >>> > upstream / master
-                                                                                                                                                },
-                                                                                                                                              "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": {
-                                                                                                                                                  "leven": "^3.1.0"
-                                                                                                                                                }
-                                                                                                                                              },
-                                                                                                                                              "levn": {
-                                                                                                                                                "version": "0.3.0",
-                                                                                                                                                "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-                                                                                                                                                "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-                                                                                                                                                "dev": true,
-                                                                                                                                                "requires": {
-                                                                                                                                                  "prelude-ls": "~1.1.2",
-                                                                                                                                                  "type-check": "~0.3.2"
-                                                                                                                                                }
-                                                                                                                                              },
-                                                                                                                                              "license-webpack-plugin": {
-                                                                                                                                                "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",
-                                                                                                                                                  "webpack-sources": "^1.2.0"
-                                                                                                                                                }
-                                                                                                                                              },
-                                                                                                                                              <<
-                                                                                                                                              << << < HEAD "is-utf8": {
-                                                                                                                                                "version": "0.2.1",
-                                                                                                                                                "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-                                                                                                                                                "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-                                                                                                                                                "dev": true
-                                                                                                                                              },
-                                                                                                                                              "is-valid-glob": {
-                                                                                                                                                "version": "1.0.0",
-                                                                                                                                                "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
-                                                                                                                                                "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
-                                                                                                                                                "dev": true
-                                                                                                                                              },
-                                                                                                                                              "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=="
-                                                                                                                                              },
-                                                                                                                                              "is-wsl": {
-                                                                                                                                                "version": "2.2.0",
-                                                                                                                                                "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-                                                                                                                                                "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-                                                                                                                                                ===
-                                                                                                                                                === =
-                                                                                                                                                "lie": {
-                                                                                                                                                  "version": "3.3.0",
-                                                                                                                                                  "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
-                                                                                                                                                  "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
-                                                                                                                                                  >>>
-                                                                                                                                                  >>> > upstream / master "dev": true,
-                                                                                                                                                  "requires": {
-                                                                                                                                                    "immediate": "~3.0.5"
-                                                                                                                                                  }
-                                                                                                                                                },
-                                                                                                                                                <<
-                                                                                                                                                << << < HEAD "is-yarn-global": {
-                                                                                                                                                  "version": "0.3.0",
-                                                                                                                                                  "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
-                                                                                                                                                  "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==",
-                                                                                                                                                  "dev": true
-                                                                                                                                                },
-                                                                                                                                                "isarray": {
-                                                                                                                                                  "version": "1.0.0",
-                                                                                                                                                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-                                                                                                                                                  "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-                                                                                                                                                },
-                                                                                                                                                "isbinaryfile": {
-                                                                                                                                                  "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",
-                                                                                                                                                  "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-                                                                                                                                                  "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-                                                                                                                                                },
-                                                                                                                                                "isobject": {
-                                                                                                                                                  "version": "3.0.1",
-                                                                                                                                                  "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-                                                                                                                                                  "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
-                                                                                                                                                },
-                                                                                                                                                "isstream": {
-                                                                                                                                                  "version": "0.1.2",
-                                                                                                                                                  "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-                                                                                                                                                  "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-                                                                                                                                                  "dev": true
-                                                                                                                                                },
-                                                                                                                                                "istanbul": {
-                                                                                                                                                  "version": "0.4.5",
-                                                                                                                                                  "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
-                                                                                                                                                  "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
-                                                                                                                                                  "dev": true,
-                                                                                                                                                  "requires": {
-                                                                                                                                                    "abbrev": "1.0.x",
-                                                                                                                                                    "async": "1.x",
-                                                                                                                                                    "escodegen": "1.8.x",
-                                                                                                                                                    "esprima": "2.7.x",
-                                                                                                                                                    "glob": "^5.0.15",
-                                                                                                                                                    "handlebars": "^4.0.1",
-                                                                                                                                                    "js-yaml": "3.x",
-                                                                                                                                                    "mkdirp": "0.5.x",
-                                                                                                                                                    "nopt": "3.x",
-                                                                                                                                                    "once": "1.x",
-                                                                                                                                                    "resolve": "1.1.x",
-                                                                                                                                                    "supports-color": "^3.1.0",
-                                                                                                                                                    "which": "^1.1.1",
-                                                                                                                                                    "wordwrap": "^1.0.0"
-                                                                                                                                                  },
-                                                                                                                                                  "dependencies": {
-                                                                                                                                                    "async": {
-                                                                                                                                                      "version": "1.5.2",
-                                                                                                                                                      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-                                                                                                                                                      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-                                                                                                                                                      "dev": true
-                                                                                                                                                    },
-                                                                                                                                                    "esprima": {
-                                                                                                                                                      "version": "2.7.3",
-                                                                                                                                                      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-                                                                                                                                                      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
-                                                                                                                                                      "dev": true
-                                                                                                                                                    },
-                                                                                                                                                    "glob": {
-                                                                                                                                                      "version": "5.0.15",
-                                                                                                                                                      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-                                                                                                                                                      "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-                                                                                                                                                      "dev": true,
-                                                                                                                                                      "requires": {
-                                                                                                                                                        "inflight": "^1.0.4",
-                                                                                                                                                        "inherits": "2",
-                                                                                                                                                        "minimatch": "2 || 3",
-                                                                                                                                                        "once": "^1.3.0",
-                                                                                                                                                        "path-is-absolute": "^1.0.0"
-                                                                                                                                                      }
-                                                                                                                                                    },
-                                                                                                                                                    "has-flag": {
-                                                                                                                                                      "version": "1.0.0",
-                                                                                                                                                      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-                                                                                                                                                      "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-                                                                                                                                                      "dev": true
-                                                                                                                                                    },
-                                                                                                                                                    "resolve": {
-                                                                                                                                                      "version": "1.1.7",
-                                                                                                                                                      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-                                                                                                                                                      "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-                                                                                                                                                      "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"
-                                                                                                                                                      }
-                                                                                                                                                    } ===
-                                                                                                                                                    === =
-                                                                                                                                                    "liftoff": {
-                                                                                                                                                      "version": "3.1.0",
-                                                                                                                                                      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
-                                                                                                                                                      "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
-                                                                                                                                                      "dev": true,
-                                                                                                                                                      "requires": {
-                                                                                                                                                        "extend": "^3.0.0",
-                                                                                                                                                        "findup-sync": "^3.0.0",
-                                                                                                                                                        "fined": "^1.0.1",
-                                                                                                                                                        "flagged-respawn": "^1.0.0",
-                                                                                                                                                        "is-plain-object": "^2.0.4",
-                                                                                                                                                        "object.map": "^1.0.0",
-                                                                                                                                                        "rechoir": "^0.6.2",
-                                                                                                                                                        "resolve": "^1.1.7" >>>
-                                                                                                                                                          >>> > upstream / master
-                                                                                                                                                      }
-                                                                                                                                                    },
-                                                                                                                                                    "lines-and-columns": {
-                                                                                                                                                      "version": "1.1.6",
-                                                                                                                                                      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-                                                                                                                                                      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
-                                                                                                                                                      "dev": true
-                                                                                                                                                    },
-                                                                                                                                                    "load-json-file": {
-                                                                                                                                                      "version": "1.1.0",
-                                                                                                                                                      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-                                                                                                                                                      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-                                                                                                                                                      "dev": true,
-                                                                                                                                                      "requires": {
-                                                                                                                                                        "graceful-fs": "^4.1.2",
-                                                                                                                                                        "parse-json": "^2.2.0",
-                                                                                                                                                        "pify": "^2.0.0",
-                                                                                                                                                        "pinkie-promise": "^2.0.0",
-                                                                                                                                                        "strip-bom": "^2.0.0"
-                                                                                                                                                      },
-                                                                                                                                                      "dependencies": {
-                                                                                                                                                        "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=="
-                                                                                                                                                        },
-                                                                                                                                                        "pify": {
-                                                                                                                                                          "version": "2.3.0",
-                                                                                                                                                          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-                                                                                                                                                          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-                                                                                                                                                          "dev": true
-                                                                                                                                                        },
-                                                                                                                                                        "supports-color": {
-                                                                                                                                                          "version": "3.2.3",
-                                                                                                                                                          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-                                                                                                                                                          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY="
-                                                                                                                                                        }
-                                                                                                                                                      }
-                                                                                                                                                    },
-                                                                                                                                                    "loader-runner": {
-                                                                                                                                                      "version": "2.4.0",
-                                                                                                                                                      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
-                                                                                                                                                      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
-                                                                                                                                                      "dev": true
-                                                                                                                                                    },
-                                                                                                                                                    "loader-utils": {
-                                                                                                                                                      "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": "^2.1.2"
-                                                                                                                                                      }
-                                                                                                                                                    },
-                                                                                                                                                    "locate-path": {
-                                                                                                                                                      "version": "2.0.0",
-                                                                                                                                                      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-                                                                                                                                                      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-                                                                                                                                                      "requires": {
-                                                                                                                                                        "p-locate": "^2.0.0",
-                                                                                                                                                        "path-exists": "^3.0.0"
-                                                                                                                                                      }
-                                                                                                                                                    },
-                                                                                                                                                    <<
-                                                                                                                                                    << << < HEAD "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",
-                                                                                                                                                      "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==",
-                                                                                                                                                      ===
-                                                                                                                                                      === =
-                                                                                                                                                      "lodash": {
-                                                                                                                                                        "version": "4.17.15",
-                                                                                                                                                        "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-                                                                                                                                                        "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-                                                                                                                                                        "dev": true
-                                                                                                                                                      },
-                                                                                                                                                      "lodash-es": {
-                                                                                                                                                        "version": "4.17.15",
-                                                                                                                                                        "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz",
-                                                                                                                                                        "integrity": "sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ=="
-                                                                                                                                                      },
-                                                                                                                                                      "lodash.capitalize": {
-                                                                                                                                                        "version": "4.2.1",
-                                                                                                                                                        "resolved": "https://registry.npmjs.org/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz",
-                                                                                                                                                        "integrity": "sha1-+CbJtOKoUR2E46yinbBeGk87cqk=",
-                                                                                                                                                        "dev": true
-                                                                                                                                                      },
-                                                                                                                                                      "lodash.clonedeep": {
-                                                                                                                                                        "version": "4.5.0",
-                                                                                                                                                        "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-                                                                                                                                                        "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",
-                                                                                                                                                        "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==",
-                                                                                                                                                        >>>
-                                                                                                                                                        >>> > upstream / master "dev": true,
-                                                                                                                                                        "requires": {
-                                                                                                                                                          "chalk": "^2.4.2"
-                                                                                                                                                        }
-                                                                                                                                                      },
-                                                                                                                                                      "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"
-                                                                                                                                                        },
-                                                                                                                                                        "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
-                                                                                                                                                          },
-                                                                                                                                                          "type-fest": {
-                                                                                                                                                            "version": "0.6.0",
-                                                                                                                                                            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-                                                                                                                                                            "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="
-                                                                                                                                                          }
-                                                                                                                                                        }
-                                                                                                                                                      },
-                                                                                                                                                      "loglevel": {
-                                                                                                                                                        "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": {
-                                                                                                                                                        "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": "^3.0.0 || ^4.0.0"
-                                                                                                                                                        }
-                                                                                                                                                      },
-                                                                                                                                                      "lowercase-keys": {
-                                                                                                                                                        "version": "1.0.1",
-                                                                                                                                                        "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-                                                                                                                                                        "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-                                                                                                                                                        "dev": true
-                                                                                                                                                      },
-                                                                                                                                                      "lru-cache": {
-                                                                                                                                                        "version": "5.1.1",
-                                                                                                                                                        "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-                                                                                                                                                        "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-                                                                                                                                                        "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
-                                                                                                                                                          }
-                                                                                                                                                        }
-                                                                                                                                                      },
-                                                                                                                                                      "lru-queue": {
-                                                                                                                                                        "version": "0.1.0",
-                                                                                                                                                        "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
-                                                                                                                                                        "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
-                                                                                                                                                        "dev": true,
-                                                                                                                                                        "requires": {
-                                                                                                                                                          "es5-ext": "~0.10.2"
-                                                                                                                                                        }
-                                                                                                                                                      },
-                                                                                                                                                      "magic-string": {
-                                                                                                                                                        "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"
-                                                                                                                                                        }
-                                                                                                                                                      },
-                                                                                                                                                      "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"
-                                                                                                                                                        },
-                                                                                                                                                        "dependencies": {
-                                                                                                                                                          "pify": {
-                                                                                                                                                            "version": "4.0.1",
-                                                                                                                                                            "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-                                                                                                                                                            "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-                                                                                                                                                            "dev": true
-                                                                                                                                                          }
-                                                                                                                                                        }
-                                                                                                                                                      },
-                                                                                                                                                      "make-error": {
-                                                                                                                                                        "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.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": "^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",
-                                                                                                                                                          "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"
-                                                                                                                                                        },
-                                                                                                                                                        "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"
-                                                                                                                                                            }
-                                                                                                                                                          },
-                                                                                                                                                          "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"
-                                                                                                                                                            }
-                                                                                                                                                          }
-                                                                                                                                                        }
-                                                                                                                                                      },
-                                                                                                                                                      <<
-                                                                                                                                                      << << < HEAD "js-tokens": {
-                                                                                                                                                        "version": "4.0.0",
-                                                                                                                                                        "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-                                                                                                                                                        "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-                                                                                                                                                        "dev": true
-                                                                                                                                                      },
-                                                                                                                                                      "js-yaml": {
-                                                                                                                                                        "version": "3.13.1",
-                                                                                                                                                        "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-                                                                                                                                                        "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
-                                                                                                                                                        "dev": true,
-                                                                                                                                                        "requires": {
-                                                                                                                                                          "argparse": "^1.0.7",
-                                                                                                                                                          "esprima": "^4.0.0"
-                                                                                                                                                        }
-                                                                                                                                                      },
-                                                                                                                                                      "jsbn": {
-                                                                                                                                                        "version": "0.1.1",
-                                                                                                                                                        "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-                                                                                                                                                        "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-                                                                                                                                                        "dev": true
-                                                                                                                                                      },
-                                                                                                                                                      "jsesc": {
-                                                                                                                                                        "version": "2.5.2",
-                                                                                                                                                        "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-                                                                                                                                                        "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-                                                                                                                                                        "dev": true
-                                                                                                                                                      },
-                                                                                                                                                      "json-buffer": {
-                                                                                                                                                        "version": "3.0.0",
-                                                                                                                                                        "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-                                                                                                                                                        "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
-                                                                                                                                                        "dev": true
-                                                                                                                                                      },
-                                                                                                                                                      "json-parse-better-errors": {
-                                                                                                                                                        "version": "1.0.2",
-                                                                                                                                                        "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-                                                                                                                                                        "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-                                                                                                                                                        "dev": true
-                                                                                                                                                      },
-                                                                                                                                                      "json-schema": {
-                                                                                                                                                        "version": "0.2.3",
-                                                                                                                                                        "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-                                                                                                                                                        "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-                                                                                                                                                        "dev": true
-                                                                                                                                                      },
-                                                                                                                                                      "json-schema-ref-parser": {
-                                                                                                                                                        "version": "9.0.1",
-                                                                                                                                                        "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-9.0.1.tgz",
-                                                                                                                                                        "integrity": "sha512-KLrCjRjW5hMXxsX4osVBWpwixXL9NtICfpyNNS0eHguN5mP/I4UatI7i7PFS8jU94b1NHF4EbirACdCn0RFPBA==",
-                                                                                                                                                        "dev": true,
-                                                                                                                                                        "requires": {
-                                                                                                                                                          "@apidevtools/json-schema-ref-parser": "9.0.1"
-                                                                                                                                                        }
-                                                                                                                                                      },
-                                                                                                                                                      "json-schema-to-typescript": {
-                                                                                                                                                        "version": "9.1.0",
-                                                                                                                                                        "resolved": "https://registry.npmjs.org/json-schema-to-typescript/-/json-schema-to-typescript-9.1.0.tgz",
-                                                                                                                                                        "integrity": "sha512-9/yDXQQyqtRDxohQGRCKht4Wjfg73TALi1yzy651EOo71a6aKFtIm2WUbDWSf8OitFGukUn00dx4t1kg0W6O4Q==",
-                                                                                                                                                        "dev": true,
-                                                                                                                                                        "requires": {
-                                                                                                                                                          "@types/json-schema": "^7.0.4",
-                                                                                                                                                          "cli-color": "^2.0.0",
-                                                                                                                                                          "glob": "^7.1.6",
-                                                                                                                                                          "is-glob": "^4.0.1",
-                                                                                                                                                          "json-schema-ref-parser": "^9.0.1",
-                                                                                                                                                          "json-stringify-safe": "^5.0.1",
-                                                                                                                                                          "lodash": "^4.17.15",
-                                                                                                                                                          "minimist": "^1.2.5",
-                                                                                                                                                          "mkdirp": "^1.0.4",
-                                                                                                                                                          "mz": "^2.7.0",
-                                                                                                                                                          "prettier": "^2.0.5",
-                                                                                                                                                          "stdin": "0.0.1"
-                                                                                                                                                        },
-                                                                                                                                                        "dependencies": {
-                                                                                                                                                          "mkdirp": {
-                                                                                                                                                            "version": "1.0.4",
-                                                                                                                                                            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-                                                                                                                                                            "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-                                                                                                                                                            "dev": true
-                                                                                                                                                          }
-                                                                                                                                                        }
-                                                                                                                                                      },
-                                                                                                                                                      "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=="
-                                                                                                                                                      },
-                                                                                                                                                      "json-stable-stringify": {
-                                                                                                                                                        ===
-                                                                                                                                                        === =
-                                                                                                                                                        "make-iterator": {
-                                                                                                                                                          >>>
-                                                                                                                                                          >>> > upstream / master "version": "1.0.1",
-                                                                                                                                                          "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-                                                                                                                                                          "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
-                                                                                                                                                          "dev": true,
-                                                                                                                                                          "requires": {
-                                                                                                                                                            "kind-of": "^6.0.2"
-                                                                                                                                                          }
-                                                                                                                                                        },
-                                                                                                                                                        "mamacro": {
-                                                                                                                                                          "version": "0.0.3",
-                                                                                                                                                          "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
-                                                                                                                                                          "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
-                                                                                                                                                          "dev": true
-                                                                                                                                                        },
-                                                                                                                                                        "map-age-cleaner": {
-                                                                                                                                                          "version": "0.1.3",
-                                                                                                                                                          "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-                                                                                                                                                          "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-                                                                                                                                                          "requires": {
-                                                                                                                                                            "p-defer": "^1.0.0"
-                                                                                                                                                          }
-                                                                                                                                                        },
-                                                                                                                                                        <<
-                                                                                                                                                        << << < HEAD "jsonparse": {
-                                                                                                                                                          "version": "1.3.1",
-                                                                                                                                                          "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-                                                                                                                                                          "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
-                                                                                                                                                          ===
-                                                                                                                                                          === =
-                                                                                                                                                          "map-cache": {
-                                                                                                                                                            "version": "0.2.2",
-                                                                                                                                                            "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-                                                                                                                                                            "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-                                                                                                                                                            >>>
-                                                                                                                                                            >>> > upstream / master "dev": true
-                                                                                                                                                          },
-                                                                                                                                                          "map-stream": {
-                                                                                                                                                            "version": "0.1.0",
-                                                                                                                                                            "resolved": "http://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
-                                                                                                                                                            "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
-                                                                                                                                                            "dev": true
-                                                                                                                                                          },
-                                                                                                                                                          "map-visit": {
-                                                                                                                                                            "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"
-                                                                                                                                                            }
-                                                                                                                                                          },
-                                                                                                                                                          "mappy-breakpoints": {
-                                                                                                                                                            "version": "0.2.3",
-                                                                                                                                                            "resolved": "https://registry.npmjs.org/mappy-breakpoints/-/mappy-breakpoints-0.2.3.tgz",
-                                                                                                                                                            "integrity": "sha1-55ZqFe6louprSJXSW364It199Fs="
-                                                                                                                                                          },
-                                                                                                                                                          "marked": {
-                                                                                                                                                            "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",
-                                                                                                                                                            "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
-                                                                                                                                                            "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
-                                                                                                                                                            "dev": true,
-                                                                                                                                                            "requires": {
-                                                                                                                                                              "findup-sync": "^2.0.0",
-                                                                                                                                                              "micromatch": "^3.0.4",
-                                                                                                                                                              "resolve": "^1.4.0",
-                                                                                                                                                              "stack-trace": "0.0.10"
-                                                                                                                                                            },
-                                                                                                                                                            "dependencies": {
-                                                                                                                                                              "braces": {
-                                                                                                                                                                "version": "3.0.2",
-                                                                                                                                                                "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-                                                                                                                                                                "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-                                                                                                                                                                "requires": {
-                                                                                                                                                                  "fill-range": "^7.0.1"
-                                                                                                                                                                }
-                                                                                                                                                              },
-                                                                                                                                                              "chokidar": {
-                                                                                                                                                                "version": "3.4.0",
-                                                                                                                                                                "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz",
-                                                                                                                                                                "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==",
-                                                                                                                                                                "requires": {
-                                                                                                                                                                  "anymatch": "~3.1.1",
-                                                                                                                                                                  "braces": "~3.0.2",
-                                                                                                                                                                  "fsevents": "~2.1.2",
-                                                                                                                                                                  "glob-parent": "~5.1.0",
-                                                                                                                                                                  "is-binary-path": "~2.1.0",
-                                                                                                                                                                  "normalize-path": "~3.0.0",
-                                                                                                                                                                  <<
-                                                                                                                                                                  << << < HEAD "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",
-                                                                                                                                                                "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"
-                                                                                                                                                                }
-                                                                                                                                                              },
-                                                                                                                                                              "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": {
-                                                                                                                                                                  "is-glob": "^4.0.1"
-                                                                                                                                                                }
-                                                                                                                                                              },
-                                                                                                                                                              "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": {
-                                                                                                                                                                  "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",
-                                                                                                                                                                "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
-                                                                                                                                                                "dev": true
-                                                                                                                                                              },
-                                                                                                                                                              "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.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",
-                                                                                                                                                                "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==",
-                                                                                                                                                                "dev": true,
-                                                                                                                                                                "requires": {
-                                                                                                                                                                  "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
-                                                                                                                                                              },
-                                                                                                                                                              "semver": {
-                                                                                                                                                                "version": "6.3.0",
-                                                                                                                                                                "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                                                                                                                                                                "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-                                                                                                                                                              },
-                                                                                                                                                              "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" ===
-                                                                                                                                                                    === =
-                                                                                                                                                                    "readdirp": "~3.4.0" >>>
-                                                                                                                                                                    >>> > upstream / master
-                                                                                                                                                                }
-                                                                                                                                                              },
-                                                                                                                                                              "expand-tilde": {
-                                                                                                                                                                "version": "2.0.2",
-                                                                                                                                                                "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-                                                                                                                                                                "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-                                                                                                                                                                "requires": {
-                                                                                                                                                                  "homedir-polyfill": "^1.0.1"
-                                                                                                                                                                }
-                                                                                                                                                              },
-                                                                                                                                                              <<
-                                                                                                                                                              << << < HEAD "strip-bom": {
-                                                                                                                                                                "version": "3.0.0",
-                                                                                                                                                                "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-                                                                                                                                                                "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
-                                                                                                                                                              },
-                                                                                                                                                              "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,
-                                                                                                                                                                ===
-                                                                                                                                                                === =
-                                                                                                                                                                "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==",
-                                                                                                                                                                  >>>
-                                                                                                                                                                  >>> > upstream / master "requires": {
-                                                                                                                                                                    "to-regex-range": "^5.0.1"
-                                                                                                                                                                  }
-                                                                                                                                                                },
-                                                                                                                                                                "findup-sync": {
-                                                                                                                                                                  "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
-                                                                                                                                                                },
-                                                                                                                                                                "fsevents": {
-                                                                                                                                                                  "version": "2.1.3",
-                                                                                                                                                                  "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-                                                                                                                                                                  "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-                                                                                                                                                                  "optional": 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=="
-                                                                                                                                                                },
-                                                                                                                                                                "is-glob": {
-                                                                                                                                                                  "version": "3.1.0",
-                                                                                                                                                                  "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-                                                                                                                                                                  "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-                                                                                                                                                                  "requires": {
-                                                                                                                                                                    "is-extglob": "^2.1.0"
-                                                                                                                                                                  }
-                                                                                                                                                                },
-                                                                                                                                                                "is-number": {
-                                                                                                                                                                  "version": "7.0.0",
-                                                                                                                                                                  "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-                                                                                                                                                                  "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
-                                                                                                                                                                },
-                                                                                                                                                                "mime": {
-                                                                                                                                                                  "version": "2.4.6",
-                                                                                                                                                                  "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
-                                                                                                                                                                  "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="
-                                                                                                                                                                },
-                                                                                                                                                                "normalize-path": {
-                                                                                                                                                                  "version": "3.0.0",
-                                                                                                                                                                  "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.0.0.tgz",
-                                                                                                                                                                  "integrity": "sha512-PiVO95TKvhiwgSwg1IdLYlCTdul38yZxZMIcnDSFIBUm4BNZha2qpQ4GpJ++15bHoKDtrW2D69lMfFwdFYtNZQ=="
-                                                                                                                                                                },
-                                                                                                                                                                "readdirp": {
-                                                                                                                                                                  "version": "3.4.0",
-                                                                                                                                                                  "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
-                                                                                                                                                                  "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
-                                                                                                                                                                  "requires": {
-                                                                                                                                                                    "picomatch": "^2.2.1"
-                                                                                                                                                                  }
-                                                                                                                                                                },
-                                                                                                                                                                "source-map": {
-                                                                                                                                                                  "version": "0.6.1",
-                                                                                                                                                                  "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                                                                                                                                                                  "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-                                                                                                                                                                },
-                                                                                                                                                                "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==",
-                                                                                                                                                                  "requires": {
-                                                                                                                                                                    "is-number": "^7.0.0"
-                                                                                                                                                                  }
-                                                                                                                                                                }
-                                                                                                                                                              }
-                                                                                                                                                            },
-                                                                                                                                                            "matched": {
-                                                                                                                                                              "version": "1.0.2",
-                                                                                                                                                              "resolved": "https://registry.npmjs.org/matched/-/matched-1.0.2.tgz",
-                                                                                                                                                              "integrity": "sha512-7ivM1jFZVTOOS77QsR+TtYHH0ecdLclMkqbf5qiJdX2RorqfhsL65QHySPZgDE0ZjHoh+mQUNHTanNXIlzXd0Q==",
-                                                                                                                                                              "dev": true,
-                                                                                                                                                              "requires": {
-                                                                                                                                                                "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": {
-                                                                                                                                                              "version": "1.3.5",
-                                                                                                                                                              "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-                                                                                                                                                              "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-                                                                                                                                                              "dev": true,
-                                                                                                                                                              "requires": {
-                                                                                                                                                                "hash-base": "^3.0.0",
-                                                                                                                                                                "inherits": "^2.0.1",
-                                                                                                                                                                "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",
-                                                                                                                                                              "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-                                                                                                                                                              "dev": true
-                                                                                                                                                            },
-                                                                                                                                                            "mem": {
-                                                                                                                                                              "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": {
-                                                                                                                                                                <<
-                                                                                                                                                                << << < HEAD "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=="
-                                                                                                                                                                },
-                                                                                                                                                                "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.7",
-                                                                                                                                                                  "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.1.7.tgz",
-                                                                                                                                                                  "integrity": "sha512-LYTOa2UrYFyJ/aSczZi/6lBykVMjCCvUmT64gOe+jPZFy4w6FYfPGqFT2IiQ2BxVHHDOvCD7qrIXb0EOh4uGWw==",
-                                                                                                                                                                  "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.5",
-                                                                                                                                                                    "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-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": {
-                                                                                                                                                                    "html-escaper": "^2.0.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==",
-                                                                                                                                                                  "requires": {
-                                                                                                                                                                    "big.js": "^5.2.2",
-                                                                                                                                                                    "emojis-list": "^3.0.0"
-                                                                                                                                                                  }
-                                                                                                                                                                },
-                                                                                                                                                                "normalize-url": {
-                                                                                                                                                                  "version": "1.9.1",
-                                                                                                                                                                  "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
-                                                                                                                                                                  "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
-                                                                                                                                                                  "requires": {
-                                                                                                                                                                    "object-assign": "^4.0.1",
-                                                                                                                                                                    "prepend-http": "^1.0.0",
-                                                                                                                                                                    "query-string": "^4.1.0",
-                                                                                                                                                                    "sort-keys": "^1.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
-                                                                                                                                                                },
-                                                                                                                                                                "strip-bom": {
-                                                                                                                                                                  "version": "3.0.0",
-                                                                                                                                                                  "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-                                                                                                                                                                  "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-                                                                                                                                                                  ===
-                                                                                                                                                                  === =
-                                                                                                                                                                  "map-age-cleaner": "^0.1.3",
-                                                                                                                                                                  "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==",
-                                                                                                                                                                    >>>
-                                                                                                                                                                    >>> > upstream / master "dev": true
-                                                                                                                                                                  }
-                                                                                                                                                                }
-                                                                                                                                                              },
-                                                                                                                                                              "memoizee": {
-                                                                                                                                                                "version": "0.4.14",
-                                                                                                                                                                "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz",
-                                                                                                                                                                "integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==",
-                                                                                                                                                                "dev": true,
-                                                                                                                                                                "requires": {
-                                                                                                                                                                  "d": "1",
-                                                                                                                                                                  "es5-ext": "^0.10.45",
-                                                                                                                                                                  "es6-weak-map": "^2.0.2",
-                                                                                                                                                                  "event-emitter": "^0.3.5",
-                                                                                                                                                                  "is-promise": "^2.1",
-                                                                                                                                                                  "lru-queue": "0.1",
-                                                                                                                                                                  "next-tick": "1",
-                                                                                                                                                                  "timers-ext": "^0.1.5"
-                                                                                                                                                                }
-                                                                                                                                                              },
-                                                                                                                                                              "memory-fs": {
-                                                                                                                                                                "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",
-                                                                                                                                                                  "readable-stream": "^2.0.1"
-                                                                                                                                                                }
-                                                                                                                                                              },
-                                                                                                                                                              "memorystream": {
-                                                                                                                                                                "version": "0.3.1",
-                                                                                                                                                                "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
-                                                                                                                                                                "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=",
-                                                                                                                                                                "dev": true
-                                                                                                                                                              },
-                                                                                                                                                              "merge": {
-                                                                                                                                                                "version": "1.2.1",
-                                                                                                                                                                "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
-                                                                                                                                                                "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==",
-                                                                                                                                                                "dev": true
-                                                                                                                                                              },
-                                                                                                                                                              "merge-descriptors": {
-                                                                                                                                                                "version": "1.0.1",
-                                                                                                                                                                "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-                                                                                                                                                                "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",
-                                                                                                                                                                "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-                                                                                                                                                                "dev": true
-                                                                                                                                                              },
-                                                                                                                                                              "merge2": {
-                                                                                                                                                                "version": "1.4.1",
-                                                                                                                                                                "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-                                                                                                                                                                "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-                                                                                                                                                                "dev": true
-                                                                                                                                                              },
-                                                                                                                                                              "methods": {
-                                                                                                                                                                "version": "1.1.2",
-                                                                                                                                                                "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-                                                                                                                                                                "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-                                                                                                                                                                "dev": true
-                                                                                                                                                              },
-                                                                                                                                                              "micromatch": {
-                                                                                                                                                                "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",
-                                                                                                                                                                  "braces": "^2.3.1",
-                                                                                                                                                                  "define-property": "^2.0.2",
-                                                                                                                                                                  "extend-shallow": "^3.0.2",
-                                                                                                                                                                  "extglob": "^2.0.4",
-                                                                                                                                                                  "fragment-cache": "^0.2.1",
-                                                                                                                                                                  "kind-of": "^6.0.2",
-                                                                                                                                                                  "nanomatch": "^1.2.9",
-                                                                                                                                                                  "object.pick": "^1.3.0",
-                                                                                                                                                                  "regex-not": "^1.0.0",
-                                                                                                                                                                  "snapdragon": "^0.8.1",
-                                                                                                                                                                  "to-regex": "^3.0.2"
-                                                                                                                                                                },
-                                                                                                                                                                "dependencies": {
-                                                                                                                                                                  "braces": {
-                                                                                                                                                                    "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",
-                                                                                                                                                                      "extend-shallow": "^2.0.1",
-                                                                                                                                                                      "fill-range": "^4.0.0",
-                                                                                                                                                                      "isobject": "^3.0.1",
-                                                                                                                                                                      "repeat-element": "^1.1.2",
-                                                                                                                                                                      "snapdragon": "^0.8.1",
-                                                                                                                                                                      "snapdragon-node": "^2.0.1",
-                                                                                                                                                                      "split-string": "^3.0.2",
-                                                                                                                                                                      "to-regex": "^3.0.1"
-                                                                                                                                                                    },
-                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                      "extend-shallow": {
-                                                                                                                                                                        "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"
-                                                                                                                                                                        }
-                                                                                                                                                                      }
-                                                                                                                                                                    }
-                                                                                                                                                                  },
-                                                                                                                                                                  "fill-range": {
-                                                                                                                                                                    "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",
-                                                                                                                                                                      "repeat-string": "^1.6.1",
-                                                                                                                                                                      "to-regex-range": "^2.1.0"
-                                                                                                                                                                    },
-                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                      "extend-shallow": {
-                                                                                                                                                                        "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"
-                                                                                                                                                                        }
-                                                                                                                                                                      }
-                                                                                                                                                                    }
-                                                                                                                                                                  },
-                                                                                                                                                                  "is-number": {
-                                                                                                                                                                    "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"
-                                                                                                                                                                    },
-                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                      "kind-of": {
-                                                                                                                                                                        "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"
-                                                                                                                                                                        }
-                                                                                                                                                                      }
-                                                                                                                                                                    }
-                                                                                                                                                                  },
-                                                                                                                                                                  "to-regex-range": {
-                                                                                                                                                                    "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"
-                                                                                                                                                                    }
-                                                                                                                                                                  }
-                                                                                                                                                                }
-                                                                                                                                                              },
-                                                                                                                                                              "miller-rabin": {
-                                                                                                                                                                "version": "4.0.1",
-                                                                                                                                                                "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-                                                                                                                                                                "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-                                                                                                                                                                "dev": true,
-                                                                                                                                                                "requires": {
-                                                                                                                                                                  "bn.js": "^4.0.0",
-                                                                                                                                                                  "brorand": "^1.0.1"
-                                                                                                                                                                },
-                                                                                                                                                                "dependencies": {
-                                                                                                                                                                  "bn.js": {
-                                                                                                                                                                    "version": "4.11.9",
-                                                                                                                                                                    "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-                                                                                                                                                                    "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-                                                                                                                                                                    "dev": true
-                                                                                                                                                                  }
-                                                                                                                                                                }
-                                                                                                                                                              },
-                                                                                                                                                              <<
-                                                                                                                                                              << << < HEAD "killable": {
-                                                                                                                                                                "version": "1.0.1",
-                                                                                                                                                                "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
-                                                                                                                                                                "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==",
-                                                                                                                                                                "dev": true
-                                                                                                                                                              },
-                                                                                                                                                              "kind-of": {
-                                                                                                                                                                "version": "6.0.3",
-                                                                                                                                                                "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-                                                                                                                                                                "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" ===
-                                                                                                                                                                  === =
-                                                                                                                                                                  "mime": {
-                                                                                                                                                                    "version": "1.6.0",
-                                                                                                                                                                    "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-                                                                                                                                                                    "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-                                                                                                                                                                    "dev": true >>>
-                                                                                                                                                                      >>> > upstream / master
-                                                                                                                                                                  },
-                                                                                                                                                                "mime-db": {
-                                                                                                                                                                  "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.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.43.0"
-                                                                                                                                                                  }
-                                                                                                                                                                },
-                                                                                                                                                                "mimic-fn": {
-                                                                                                                                                                  "version": "2.1.0",
-                                                                                                                                                                  "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-                                                                                                                                                                  "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
-                                                                                                                                                                },
-                                                                                                                                                                "mimic-response": {
-                                                                                                                                                                  "version": "1.0.1",
-                                                                                                                                                                  "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-                                                                                                                                                                  "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-                                                                                                                                                                  "dev": true
-                                                                                                                                                                },
-                                                                                                                                                                "mini-css-extract-plugin": {
-                                                                                                                                                                  "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": {
-                                                                                                                                                                  "version": "1.0.1",
-                                                                                                                                                                  "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-                                                                                                                                                                  "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-                                                                                                                                                                  "dev": true
-                                                                                                                                                                },
-                                                                                                                                                                "minimalistic-crypto-utils": {
-                                                                                                                                                                  "version": "1.0.1",
-                                                                                                                                                                  "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-                                                                                                                                                                  "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-                                                                                                                                                                  "dev": true
-                                                                                                                                                                },
-                                                                                                                                                                "minimatch": {
-                                                                                                                                                                  "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"
-                                                                                                                                                                  }
-                                                                                                                                                                },
-                                                                                                                                                                "minimist": {
-                                                                                                                                                                  "version": "1.2.5",
-                                                                                                                                                                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-                                                                                                                                                                  "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-                                                                                                                                                                },
-                                                                                                                                                                "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": {
-                                                                                                                                                                    "safe-buffer": "^5.1.2",
-                                                                                                                                                                    "yallist": "^3.0.0"
-                                                                                                                                                                  },
-                                                                                                                                                                  "dependencies": {
-                                                                                                                                                                    "yallist": {
-                                                                                                                                                                      "version": "3.1.1",
-                                                                                                                                                                      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-                                                                                                                                                                      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-                                                                                                                                                                      "dev": true
-                                                                                                                                                                    }
-                                                                                                                                                                  }
-                                                                                                                                                                },
-                                                                                                                                                                "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"
-                                                                                                                                                                  },
-                                                                                                                                                                  "dependencies": {
-                                                                                                                                                                    "minipass": {
-                                                                                                                                                                      "version": "3.1.3",
-                                                                                                                                                                      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-                                                                                                                                                                      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
-                                                                                                                                                                      "dev": true,
-                                                                                                                                                                      "requires": {
-                                                                                                                                                                        "yallist": "^4.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"
-                                                                                                                                                                  },
-                                                                                                                                                                  "dependencies": {
-                                                                                                                                                                    <<
-                                                                                                                                                                    << << < HEAD "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=="
-                                                                                                                                                                    },
-                                                                                                                                                                    "pify": {
-                                                                                                                                                                      "version": "2.3.0",
-                                                                                                                                                                      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-                                                                                                                                                                      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-                                                                                                                                                                      "dev": true
-                                                                                                                                                                    },
-                                                                                                                                                                    "supports-color": {
-                                                                                                                                                                      "version": "3.2.3",
-                                                                                                                                                                      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-                                                                                                                                                                      "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=" ===
-                                                                                                                                                                        === =
-                                                                                                                                                                        "minipass": {
-                                                                                                                                                                          "version": "3.1.3",
-                                                                                                                                                                          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-                                                                                                                                                                          "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
-                                                                                                                                                                          "dev": true,
-                                                                                                                                                                          "requires": {
-                                                                                                                                                                            "yallist": "^4.0.0"
-                                                                                                                                                                          } >>>
-                                                                                                                                                                          >>> > upstream / master
-                                                                                                                                                                        }
-                                                                                                                                                                    }
-                                                                                                                                                                  },
-                                                                                                                                                                  "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"
-                                                                                                                                                                    },
-                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                      "minipass": {
-                                                                                                                                                                        "version": "3.1.3",
-                                                                                                                                                                        "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-                                                                                                                                                                        "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
-                                                                                                                                                                        "dev": true,
-                                                                                                                                                                        "requires": {
-                                                                                                                                                                          "yallist": "^4.0.0"
-                                                                                                                                                                        }
-                                                                                                                                                                      }
-                                                                                                                                                                    }
-                                                                                                                                                                  },
-                                                                                                                                                                  <<
-                                                                                                                                                                  << << < HEAD "locate-path": {
-                                                                                                                                                                    "version": "2.0.0",
-                                                                                                                                                                    "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-                                                                                                                                                                    "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-                                                                                                                                                                    ===
-                                                                                                                                                                    === =
-                                                                                                                                                                    "minizlib": {
-                                                                                                                                                                      "version": "2.1.0",
-                                                                                                                                                                      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.0.tgz",
-                                                                                                                                                                      "integrity": "sha512-EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA==",
-                                                                                                                                                                      "dev": true,
-                                                                                                                                                                      >>>
-                                                                                                                                                                      >>> > upstream / master "requires": {
-                                                                                                                                                                        "minipass": "^3.0.0",
-                                                                                                                                                                        "yallist": "^4.0.0"
-                                                                                                                                                                      },
-                                                                                                                                                                      "dependencies": {
-                                                                                                                                                                        "minipass": {
-                                                                                                                                                                          "version": "3.1.3",
-                                                                                                                                                                          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-                                                                                                                                                                          "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
-                                                                                                                                                                          "dev": true,
-                                                                                                                                                                          "requires": {
-                                                                                                                                                                            "yallist": "^4.0.0"
-                                                                                                                                                                          }
-                                                                                                                                                                        }
-                                                                                                                                                                      }
-                                                                                                                                                                    },
-                                                                                                                                                                    <<
-                                                                                                                                                                    << << < HEAD "lodash": {
-                                                                                                                                                                      "version": "4.17.15",
-                                                                                                                                                                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-                                                                                                                                                                      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
-                                                                                                                                                                    },
-                                                                                                                                                                    "lodash-es": {
-                                                                                                                                                                      "version": "4.17.15",
-                                                                                                                                                                      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz",
-                                                                                                                                                                      "integrity": "sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ=="
-                                                                                                                                                                    },
-                                                                                                                                                                    "lodash.capitalize": {
-                                                                                                                                                                      "version": "4.2.1",
-                                                                                                                                                                      "resolved": "https://registry.npmjs.org/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz",
-                                                                                                                                                                      "integrity": "sha1-+CbJtOKoUR2E46yinbBeGk87cqk=",
-                                                                                                                                                                      "dev": true
-                                                                                                                                                                    },
-                                                                                                                                                                    "lodash.clonedeep": {
-                                                                                                                                                                      "version": "4.5.0",
-                                                                                                                                                                      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-                                                                                                                                                                      "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",
-                                                                                                                                                                      "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": {
-                                                                                                                                                                      ===
-                                                                                                                                                                      === =
-                                                                                                                                                                      "mississippi": {
-                                                                                                                                                                        >>>
-                                                                                                                                                                        >>> > upstream / master "version": "3.0.0",
-                                                                                                                                                                        "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-                                                                                                                                                                        "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-                                                                                                                                                                        "dev": true,
-                                                                                                                                                                        "requires": {
-                                                                                                                                                                          "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"
-                                                                                                                                                                        }
-                                                                                                                                                                      },
-                                                                                                                                                                      "mixin-deep": {
-                                                                                                                                                                        "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"
-                                                                                                                                                                        },
-                                                                                                                                                                        "dependencies": {
-                                                                                                                                                                          "is-extendable": {
-                                                                                                                                                                            "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"
-                                                                                                                                                                            }
-                                                                                                                                                                          }
-                                                                                                                                                                        }
-                                                                                                                                                                      },
-                                                                                                                                                                      "mkdirp": {
-                                                                                                                                                                        "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"
-                                                                                                                                                                        },
-                                                                                                                                                                        "dependencies": {
-                                                                                                                                                                          "minimist": {
-                                                                                                                                                                            "version": "0.0.8",
-                                                                                                                                                                            "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-                                                                                                                                                                            "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-                                                                                                                                                                            "dev": true
-                                                                                                                                                                          },
-                                                                                                                                                                          "type-fest": {
-                                                                                                                                                                            "version": "0.6.0",
-                                                                                                                                                                            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-                                                                                                                                                                            "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="
-                                                                                                                                                                          }
-                                                                                                                                                                        }
-                                                                                                                                                                      },
-                                                                                                                                                                      "mktemp": {
-                                                                                                                                                                        "version": "1.0.0",
-                                                                                                                                                                        "resolved": "https://registry.npmjs.org/mktemp/-/mktemp-1.0.0.tgz",
-                                                                                                                                                                        "integrity": "sha512-2duBeS0A75x0M3sCoY0R1TiLsYfIBUtNBNWS++eo+bX/ObVqzblqnEQhlaepoBOLD14wklsV3cYxZ68o5qYO8A==",
-                                                                                                                                                                        "dev": true
-                                                                                                                                                                      },
-                                                                                                                                                                      "moment": {
-                                                                                                                                                                        "version": "2.24.0",
-                                                                                                                                                                        "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
-                                                                                                                                                                        "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
-                                                                                                                                                                      },
-                                                                                                                                                                      "moment-timezone": {
-                                                                                                                                                                        "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"
-                                                                                                                                                                        }
-                                                                                                                                                                      },
-                                                                                                                                                                      "move-concurrently": {
-                                                                                                                                                                        "version": "1.0.1",
-                                                                                                                                                                        "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-                                                                                                                                                                        "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
-                                                                                                                                                                        "dev": true,
-                                                                                                                                                                        "requires": {
-                                                                                                                                                                          "aproba": "^1.1.1",
-                                                                                                                                                                          "copy-concurrently": "^1.0.0",
-                                                                                                                                                                          "fs-write-stream-atomic": "^1.0.8",
-                                                                                                                                                                          "mkdirp": "^0.5.1",
-                                                                                                                                                                          "rimraf": "^2.5.4",
-                                                                                                                                                                          "run-queue": "^1.0.3"
-                                                                                                                                                                        }
-                                                                                                                                                                      },
-                                                                                                                                                                      "ms": {
-                                                                                                                                                                        "version": "2.0.0",
-                                                                                                                                                                        "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-                                                                                                                                                                        "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-                                                                                                                                                                        "dev": true
-                                                                                                                                                                      },
-                                                                                                                                                                      "multicast-dns": {
-                                                                                                                                                                        "version": "6.2.3",
-                                                                                                                                                                        "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
-                                                                                                                                                                        "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
-                                                                                                                                                                        "dev": true,
-                                                                                                                                                                        "requires": {
-                                                                                                                                                                          "dns-packet": "^1.3.1",
-                                                                                                                                                                          "thunky": "^1.0.2"
-                                                                                                                                                                        }
-                                                                                                                                                                      },
-                                                                                                                                                                      "multicast-dns-service-types": {
-                                                                                                                                                                        "version": "1.1.0",
-                                                                                                                                                                        "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
-                                                                                                                                                                        "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
-                                                                                                                                                                        "dev": true
-                                                                                                                                                                      },
-                                                                                                                                                                      "mute-stdout": {
-                                                                                                                                                                        "version": "1.0.1",
-                                                                                                                                                                        "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
-                                                                                                                                                                        "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
-                                                                                                                                                                        "dev": true
-                                                                                                                                                                      },
-                                                                                                                                                                      "mute-stream": {
-                                                                                                                                                                        "version": "0.0.8",
-                                                                                                                                                                        "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-                                                                                                                                                                        "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-                                                                                                                                                                        "dev": true
-                                                                                                                                                                      },
-                                                                                                                                                                      <<
-                                                                                                                                                                      << << < HEAD "lru-queue": {
-                                                                                                                                                                        "version": "0.1.0",
-                                                                                                                                                                        "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
-                                                                                                                                                                        "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
-                                                                                                                                                                        "dev": true,
-                                                                                                                                                                        "requires": {
-                                                                                                                                                                          "es5-ext": "~0.10.2"
-                                                                                                                                                                        }
-                                                                                                                                                                      },
-                                                                                                                                                                      "magic-string": {
-                                                                                                                                                                        "version": "0.25.7",
-                                                                                                                                                                        "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
-                                                                                                                                                                        "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
-                                                                                                                                                                        ===
-                                                                                                                                                                        === =
-                                                                                                                                                                        "mz": {
-                                                                                                                                                                          "version": "2.7.0",
-                                                                                                                                                                          "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
-                                                                                                                                                                          "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
-                                                                                                                                                                          >>>
-                                                                                                                                                                          >>> > upstream / master "dev": true,
-                                                                                                                                                                          "requires": {
-                                                                                                                                                                            "any-promise": "^1.0.0",
-                                                                                                                                                                            "object-assign": "^4.0.1",
-                                                                                                                                                                            "thenify-all": "^1.0.0"
-                                                                                                                                                                          }
-                                                                                                                                                                        },
-                                                                                                                                                                        "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.0",
-                                                                                                                                                                            "snapdragon": "^0.8.1",
-                                                                                                                                                                            "to-regex": "^3.0.1"
-                                                                                                                                                                          }
-                                                                                                                                                                        },
-                                                                                                                                                                        "negotiator": {
-                                                                                                                                                                          "version": "0.6.2",
-                                                                                                                                                                          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-                                                                                                                                                                          "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
-                                                                                                                                                                          "dev": true
-                                                                                                                                                                        },
-                                                                                                                                                                        "neo-async": {
-                                                                                                                                                                          "version": "2.6.1",
-                                                                                                                                                                          "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
-                                                                                                                                                                          "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
-                                                                                                                                                                          "dev": true
-                                                                                                                                                                        },
-                                                                                                                                                                        "next-tick": {
-                                                                                                                                                                          "version": "1.0.0",
-                                                                                                                                                                          "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-                                                                                                                                                                          "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-                                                                                                                                                                          "dev": true
-                                                                                                                                                                        },
-                                                                                                                                                                        "ng-packagr": {
-                                                                                                                                                                          "version": "9.1.5",
-                                                                                                                                                                          "resolved": "https://registry.npmjs.org/ng-packagr/-/ng-packagr-9.1.5.tgz",
-                                                                                                                                                                          "integrity": "sha512-biuNfM15uLkCW+Vvj8bnuwjX37oX7j5icGm+l71FhM6ydlEl+Cl7PdFXpy9rrIlKFYlYRiPiiiWazGwVGn1icQ==",
-                                                                                                                                                                          "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.7.6",
-                                                                                                                                                                            "browserslist": "^4.12.0",
-                                                                                                                                                                            "chalk": "^4.0.0",
-                                                                                                                                                                            "chokidar": "^3.2.1",
-                                                                                                                                                                            "clean-css": "^4.1.11",
-                                                                                                                                                                            "commander": "^4.0.0",
-                                                                                                                                                                            "fs-extra": "^9.0.0",
-                                                                                                                                                                            "glob": "^7.1.2",
-                                                                                                                                                                            "injection-js": "^2.2.1",
-                                                                                                                                                                            "less": "^3.10.3",
-                                                                                                                                                                            "node-sass-tilde-importer": "^1.0.0",
-                                                                                                                                                                            "postcss": "^7.0.18",
-                                                                                                                                                                            "postcss-url": "^8.0.0",
-                                                                                                                                                                            "read-pkg-up": "^5.0.0",
-                                                                                                                                                                            "rimraf": "^3.0.0",
-                                                                                                                                                                            "rollup": "2.7.5",
-                                                                                                                                                                            "rollup-plugin-sourcemaps": "^0.6.0",
-                                                                                                                                                                            "rxjs": "^6.5.0",
-                                                                                                                                                                            "sass": "^1.23.0",
-                                                                                                                                                                            "stylus": "^0.54.7",
-                                                                                                                                                                            "terser": "^4.3.8",
-                                                                                                                                                                            "update-notifier": "^4.0.0"
-                                                                                                                                                                          },
-                                                                                                                                                                          "dependencies": {
-                                                                                                                                                                            "autoprefixer": {
-                                                                                                                                                                              "version": "9.8.0",
-                                                                                                                                                                              "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.0.tgz",
-                                                                                                                                                                              "integrity": "sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==",
-                                                                                                                                                                              "dev": true,
-                                                                                                                                                                              "requires": {
-                                                                                                                                                                                "browserslist": "^4.12.0",
-                                                                                                                                                                                "caniuse-lite": "^1.0.30001061",
-                                                                                                                                                                                "chalk": "^2.4.2",
-                                                                                                                                                                                "normalize-range": "^0.1.2",
-                                                                                                                                                                                "num2fraction": "^1.2.2",
-                                                                                                                                                                                "postcss": "^7.0.30",
-                                                                                                                                                                                "postcss-value-parser": "^4.1.0"
-                                                                                                                                                                              },
-                                                                                                                                                                              "dependencies": {
-                                                                                                                                                                                "chalk": {
-                                                                                                                                                                                  "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.3.0"
-                                                                                                                                                                                  }
-                                                                                                                                                                                },
-                                                                                                                                                                                "postcss": {
-                                                                                                                                                                                  "version": "7.0.32",
-                                                                                                                                                                                  "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
-                                                                                                                                                                                  "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==",
-                                                                                                                                                                                  "dev": true,
-                                                                                                                                                                                  "requires": {
-                                                                                                                                                                                    "chalk": "^2.4.2",
-                                                                                                                                                                                    "source-map": "^0.6.1",
-                                                                                                                                                                                    "supports-color": "^6.1.0"
-                                                                                                                                                                                  },
-                                                                                                                                                                                  "dependencies": {
-                                                                                                                                                                                    "supports-color": {
-                                                                                                                                                                                      "version": "6.1.0",
-                                                                                                                                                                                      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-                                                                                                                                                                                      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-                                                                                                                                                                                      "dev": true,
-                                                                                                                                                                                      "requires": {
-                                                                                                                                                                                        "has-flag": "^3.0.0"
-                                                                                                                                                                                      }
-                                                                                                                                                                                    }
-                                                                                                                                                                                  }
-                                                                                                                                                                                }
-                                                                                                                                                                              }
-                                                                                                                                                                            },
-                                                                                                                                                                            "chalk": {
-                                                                                                                                                                              "version": "4.1.0",
-                                                                                                                                                                              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                                                                                                                                                                              "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                                                                                                                                                                              "dev": true,
-                                                                                                                                                                              "requires": {
-                                                                                                                                                                                "ansi-styles": "^4.1.0",
-                                                                                                                                                                                "supports-color": "^7.1.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"
-                                                                                                                                                                                  }
-                                                                                                                                                                                },
-                                                                                                                                                                                "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"
-                                                                                                                                                                                  }
-                                                                                                                                                                                }
-                                                                                                                                                                              }
-                                                                                                                                                                            },
-                                                                                                                                                                            <<
-                                                                                                                                                                            << << < HEAD "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==",
-                                                                                                                                                                              ===
-                                                                                                                                                                              === =
-                                                                                                                                                                              "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==",
-                                                                                                                                                                                >>>
-                                                                                                                                                                                >>> > upstream / master "dev": true
-                                                                                                                                                                              },
-                                                                                                                                                                              "commander": {
-                                                                                                                                                                                "version": "4.1.1",
-                                                                                                                                                                                "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
-                                                                                                                                                                                "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
-                                                                                                                                                                                "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==",
-                                                                                                                                                                                "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.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": "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",
-                                                                                                                                                                                "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
-                                                                                                                                                                                "dev": true,
-                                                                                                                                                                                "requires": {
-                                                                                                                                                                                  "@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": {
-                                                                                                                                                                                "version": "5.2.0",
-                                                                                                                                                                                "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-                                                                                                                                                                                "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"
-                                                                                                                                                                                } <<
-                                                                                                                                                                                << << < HEAD
-                                                                                                                                                                              }
-                                                                                                                                                                            }
-                                                                                                                                                                          },
-                                                                                                                                                                          "make-iterator": {
-                                                                                                                                                                            "version": "1.0.1",
-                                                                                                                                                                            "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-                                                                                                                                                                            "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
-                                                                                                                                                                            "dev": true,
-                                                                                                                                                                            "requires": {
-                                                                                                                                                                              "kind-of": "^6.0.2"
-                                                                                                                                                                            }
-                                                                                                                                                                          },
-                                                                                                                                                                          "mamacro": {
-                                                                                                                                                                            "version": "0.0.3",
-                                                                                                                                                                            "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
-                                                                                                                                                                            "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
-                                                                                                                                                                            "dev": true
-                                                                                                                                                                          },
-                                                                                                                                                                          "map-age-cleaner": {
-                                                                                                                                                                            "version": "0.1.3",
-                                                                                                                                                                            "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-                                                                                                                                                                            "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-                                                                                                                                                                            "requires": {
-                                                                                                                                                                              "p-defer": "^1.0.0"
-                                                                                                                                                                            }
-                                                                                                                                                                          },
-                                                                                                                                                                          "map-cache": {
-                                                                                                                                                                            "version": "0.2.2",
-                                                                                                                                                                            "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-                                                                                                                                                                            "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
-                                                                                                                                                                          },
-                                                                                                                                                                          "map-stream": {
-                                                                                                                                                                            "version": "0.1.0",
-                                                                                                                                                                            "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
-                                                                                                                                                                            "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
-                                                                                                                                                                            "dev": true
-                                                                                                                                                                          },
-                                                                                                                                                                          "map-visit": {
-                                                                                                                                                                            "version": "1.0.0",
-                                                                                                                                                                            "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-                                                                                                                                                                            "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-                                                                                                                                                                            "requires": {
-                                                                                                                                                                              "object-visit": "^1.0.0"
-                                                                                                                                                                            }
-                                                                                                                                                                          },
-                                                                                                                                                                          "mappy-breakpoints": {
-                                                                                                                                                                            "version": "0.2.3",
-                                                                                                                                                                            "resolved": "https://registry.npmjs.org/mappy-breakpoints/-/mappy-breakpoints-0.2.3.tgz",
-                                                                                                                                                                            "integrity": "sha1-55ZqFe6louprSJXSW364It199Fs="
-                                                                                                                                                                          },
-                                                                                                                                                                          "marked": {
-                                                                                                                                                                            "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",
-                                                                                                                                                                            "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
-                                                                                                                                                                            "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
-                                                                                                                                                                            "dev": true,
-                                                                                                                                                                            "requires": {
-                                                                                                                                                                              "findup-sync": "^2.0.0",
-                                                                                                                                                                              "micromatch": "^3.0.4",
-                                                                                                                                                                              "resolve": "^1.4.0",
-                                                                                                                                                                              "stack-trace": "0.0.10"
-                                                                                                                                                                            },
-                                                                                                                                                                            "dependencies": {
-                                                                                                                                                                              "braces": {
-                                                                                                                                                                                "version": "3.0.2",
-                                                                                                                                                                                "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-                                                                                                                                                                                "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-                                                                                                                                                                                "requires": {
-                                                                                                                                                                                  "fill-range": "^7.0.1"
-                                                                                                                                                                                }
-                                                                                                                                                                              },
-                                                                                                                                                                              "chokidar": {
-                                                                                                                                                                                "version": "3.4.0",
-                                                                                                                                                                                "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz",
-                                                                                                                                                                                "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==",
-                                                                                                                                                                                "requires": {
-                                                                                                                                                                                  "anymatch": "~3.1.1",
-                                                                                                                                                                                  "braces": "~3.0.2",
-                                                                                                                                                                                  "fsevents": "~2.1.2",
-                                                                                                                                                                                  "glob-parent": "~5.1.0",
-                                                                                                                                                                                  "is-binary-path": "~2.1.0",
-                                                                                                                                                                                  "normalize-path": "~3.0.0",
-                                                                                                                                                                                  "readdirp": "~3.4.0"
-                                                                                                                                                                                }
-                                                                                                                                                                              },
-                                                                                                                                                                              "expand-tilde": {
-                                                                                                                                                                                "version": "2.0.2",
-                                                                                                                                                                                "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-                                                                                                                                                                                "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-                                                                                                                                                                                "requires": {
-                                                                                                                                                                                  "homedir-polyfill": "^1.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==",
-                                                                                                                                                                                "requires": {
-                                                                                                                                                                                  "to-regex-range": "^5.0.1"
-                                                                                                                                                                                }
-                                                                                                                                                                              },
-                                                                                                                                                                              "findup-sync": {
-                                                                                                                                                                                "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
-                                                                                                                                                                              },
-                                                                                                                                                                              "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=="
-                                                                                                                                                                              },
-                                                                                                                                                                              "is-glob": {
-                                                                                                                                                                                "version": "3.1.0",
-                                                                                                                                                                                "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-                                                                                                                                                                                "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-                                                                                                                                                                                ===
-                                                                                                                                                                                === =
-                                                                                                                                                                              },
-                                                                                                                                                                              "read-pkg-up": {
-                                                                                                                                                                                "version": "5.0.0",
-                                                                                                                                                                                "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-5.0.0.tgz",
-                                                                                                                                                                                "integrity": "sha512-XBQjqOBtTzyol2CpsQOw8LHV0XbDZVG7xMMjmXAJomlVY03WOBRmYgDJETlvcg0H63AJvPRwT7GFi5rvOzUOKg==",
-                                                                                                                                                                                "dev": true,
-                                                                                                                                                                                "requires": {
-                                                                                                                                                                                  "find-up": "^3.0.0",
-                                                                                                                                                                                  "read-pkg": "^5.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"
-                                                                                                                                                                                }
-                                                                                                                                                                              },
-                                                                                                                                                                              "rollup": {
-                                                                                                                                                                                "version": "2.7.5",
-                                                                                                                                                                                "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.7.5.tgz",
-                                                                                                                                                                                "integrity": "sha512-xQSM8uzhgtF6tTnTVEvOQThrcG3LPUP3T/4l4EukzDp0kbTY1QRDuXjiwtYzs9odKj9Bj/PccRG6viFfS7DmCQ==",
-                                                                                                                                                                                "dev": true,
-                                                                                                                                                                                "requires": {
-                                                                                                                                                                                  "fsevents": "~2.1.2"
-                                                                                                                                                                                }
-                                                                                                                                                                              },
-                                                                                                                                                                              "rollup-plugin-sourcemaps": {
-                                                                                                                                                                                "version": "0.6.2",
-                                                                                                                                                                                "resolved": "https://registry.npmjs.org/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.6.2.tgz",
-                                                                                                                                                                                "integrity": "sha512-9AwTKg3yRykwzemfLt71ySe0LvrAci+bpsOL1LaTYFk5BX4HF6X7DQfpHa74ANfSja3hyjiQkXCR8goSOnW//Q==",
-                                                                                                                                                                                "dev": true,
-                                                                                                                                                                                "requires": {
-                                                                                                                                                                                  "@rollup/pluginutils": "^3.0.9",
-                                                                                                                                                                                  "source-map-resolve": "^0.6.0"
-                                                                                                                                                                                }
-                                                                                                                                                                              },
-                                                                                                                                                                              "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
-                                                                                                                                                                              },
-                                                                                                                                                                              "source-map-resolve": {
-                                                                                                                                                                                "version": "0.6.0",
-                                                                                                                                                                                "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
-                                                                                                                                                                                "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
-                                                                                                                                                                                "dev": true,
-                                                                                                                                                                                >>>
-                                                                                                                                                                                >>> > upstream / master "requires": {
-                                                                                                                                                                                  "atob": "^2.1.2",
-                                                                                                                                                                                  "decode-uri-component": "^0.2.0"
-                                                                                                                                                                                }
-                                                                                                                                                                              },
-                                                                                                                                                                              <<
-                                                                                                                                                                              << << < HEAD "is-number": {
-                                                                                                                                                                                "version": "7.0.0",
-                                                                                                                                                                                "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-                                                                                                                                                                                "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
-                                                                                                                                                                              },
-                                                                                                                                                                              "mime": {
-                                                                                                                                                                                "version": "2.4.6",
-                                                                                                                                                                                "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
-                                                                                                                                                                                "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="
-                                                                                                                                                                              },
-                                                                                                                                                                              "normalize-path": {
-                                                                                                                                                                                "version": "3.0.0",
-                                                                                                                                                                                "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.0.0.tgz",
-                                                                                                                                                                                "integrity": "sha512-PiVO95TKvhiwgSwg1IdLYlCTdul38yZxZMIcnDSFIBUm4BNZha2qpQ4GpJ++15bHoKDtrW2D69lMfFwdFYtNZQ=="
-                                                                                                                                                                              },
-                                                                                                                                                                              "readdirp": {
-                                                                                                                                                                                "version": "3.4.0",
-                                                                                                                                                                                "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
-                                                                                                                                                                                "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
-                                                                                                                                                                                "requires": {
-                                                                                                                                                                                  "picomatch": "^2.2.1"
-                                                                                                                                                                                }
-                                                                                                                                                                              },
-                                                                                                                                                                              "source-map": {
-                                                                                                                                                                                "version": "0.6.1",
-                                                                                                                                                                                "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                                                                                                                                                                                "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-                                                                                                                                                                              },
-                                                                                                                                                                              "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==",
-                                                                                                                                                                                "requires": {
-                                                                                                                                                                                  "is-number": "^7.0.0" ===
-                                                                                                                                                                                    === =
-                                                                                                                                                                                    "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" >>>
-                                                                                                                                                                                          >>> > upstream / master
-                                                                                                                                                                                      }
-                                                                                                                                                                                    },
-                                                                                                                                                                                  "type-fest": {
-                                                                                                                                                                                    "version": "0.6.0",
-                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-                                                                                                                                                                                    "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                  }
-                                                                                                                                                                                }
-                                                                                                                                                                              },
-                                                                                                                                                                              <<
-                                                                                                                                                                              << << < HEAD "memoizee": {
-                                                                                                                                                                                "version": "0.4.14",
-                                                                                                                                                                                "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz",
-                                                                                                                                                                                "integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==",
-                                                                                                                                                                                "dev": true,
-                                                                                                                                                                                "requires": {
-                                                                                                                                                                                  "d": "1",
-                                                                                                                                                                                  "es5-ext": "^0.10.45",
-                                                                                                                                                                                  "es6-weak-map": "^2.0.2",
-                                                                                                                                                                                  "event-emitter": "^0.3.5",
-                                                                                                                                                                                  "is-promise": "^2.1",
-                                                                                                                                                                                  "lru-queue": "0.1",
-                                                                                                                                                                                  "next-tick": "1",
-                                                                                                                                                                                  "timers-ext": "^0.1.5"
-                                                                                                                                                                                }
-                                                                                                                                                                              },
-                                                                                                                                                                              "memory-fs": {
-                                                                                                                                                                                "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,
-                                                                                                                                                                                ===
-                                                                                                                                                                                === =
-                                                                                                                                                                                "ngrx-store-localstorage": {
-                                                                                                                                                                                  "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==",
-                                                                                                                                                                                  >>>
-                                                                                                                                                                                  >>> > upstream / master "requires": {
-                                                                                                                                                                                    "deepmerge": "^3.2.0"
-                                                                                                                                                                                  }
-                                                                                                                                                                                },
-                                                                                                                                                                                "ngx-moment": {
-                                                                                                                                                                                  "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"
-                                                                                                                                                                                  }
-                                                                                                                                                                                },
-                                                                                                                                                                                <<
-                                                                                                                                                                                << << < HEAD "merge-stream": {
-                                                                                                                                                                                  "version": "2.0.0",
-                                                                                                                                                                                  "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-                                                                                                                                                                                  "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-                                                                                                                                                                                  "dev": true
-                                                                                                                                                                                },
-                                                                                                                                                                                "merge2": {
-                                                                                                                                                                                  "version": "1.4.1",
-                                                                                                                                                                                  "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-                                                                                                                                                                                  "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-                                                                                                                                                                                  "dev": true ===
-                                                                                                                                                                                    === =
-                                                                                                                                                                                    "nice-try": {
-                                                                                                                                                                                      "version": "1.0.5",
-                                                                                                                                                                                      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-                                                                                                                                                                                      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" >>>
-                                                                                                                                                                                        >>> > upstream / master
-                                                                                                                                                                                    },
-                                                                                                                                                                                  "node-fetch": {
-                                                                                                                                                                                    "version": "2.6.0",
-                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
-                                                                                                                                                                                    "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==",
-                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                  },
-                                                                                                                                                                                  <<
-                                                                                                                                                                                  << << < HEAD "micromatch": {
-                                                                                                                                                                                    "version": "3.1.10",
-                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-                                                                                                                                                                                    "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                      "arr-diff": "^4.0.0",
-                                                                                                                                                                                      "array-unique": "^0.3.2",
-                                                                                                                                                                                      "braces": "^2.3.1",
-                                                                                                                                                                                      "define-property": "^2.0.2",
-                                                                                                                                                                                      "extend-shallow": "^3.0.2",
-                                                                                                                                                                                      "extglob": "^2.0.4",
-                                                                                                                                                                                      "fragment-cache": "^0.2.1",
-                                                                                                                                                                                      "kind-of": "^6.0.2",
-                                                                                                                                                                                      "nanomatch": "^1.2.9",
-                                                                                                                                                                                      "object.pick": "^1.3.0",
-                                                                                                                                                                                      "regex-not": "^1.0.0",
-                                                                                                                                                                                      "snapdragon": "^0.8.1",
-                                                                                                                                                                                      "to-regex": "^3.0.2"
-                                                                                                                                                                                    },
-                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                      "braces": {
-                                                                                                                                                                                        "version": "2.3.2",
-                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-                                                                                                                                                                                        "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                          "arr-flatten": "^1.1.0",
-                                                                                                                                                                                          "array-unique": "^0.3.2",
-                                                                                                                                                                                          "extend-shallow": "^2.0.1",
-                                                                                                                                                                                          "fill-range": "^4.0.0",
-                                                                                                                                                                                          "isobject": "^3.0.1",
-                                                                                                                                                                                          "repeat-element": "^1.1.2",
-                                                                                                                                                                                          "snapdragon": "^0.8.1",
-                                                                                                                                                                                          "snapdragon-node": "^2.0.1",
-                                                                                                                                                                                          "split-string": "^3.0.2",
-                                                                                                                                                                                          "to-regex": "^3.0.1"
-                                                                                                                                                                                        },
-                                                                                                                                                                                        "dependencies": {
-                                                                                                                                                                                          "extend-shallow": {
-                                                                                                                                                                                            "version": "2.0.1",
-                                                                                                                                                                                            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                                                                                                                                                                                            "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                                                                                                                                                                                            "requires": {
-                                                                                                                                                                                              "is-extendable": "^0.1.0"
-                                                                                                                                                                                            }
-                                                                                                                                                                                          }
-                                                                                                                                                                                        }
-                                                                                                                                                                                      },
-                                                                                                                                                                                      "fill-range": {
-                                                                                                                                                                                        "version": "4.0.0",
-                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-                                                                                                                                                                                        "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                          "extend-shallow": "^2.0.1",
-                                                                                                                                                                                          "is-number": "^3.0.0",
-                                                                                                                                                                                          "repeat-string": "^1.6.1",
-                                                                                                                                                                                          "to-regex-range": "^2.1.0"
-                                                                                                                                                                                        },
-                                                                                                                                                                                        "dependencies": {
-                                                                                                                                                                                          "extend-shallow": {
-                                                                                                                                                                                            "version": "2.0.1",
-                                                                                                                                                                                            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                                                                                                                                                                                            "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                                                                                                                                                                                            "requires": {
-                                                                                                                                                                                              "is-extendable": "^0.1.0"
-                                                                                                                                                                                            }
-                                                                                                                                                                                          }
-                                                                                                                                                                                        }
-                                                                                                                                                                                      },
-                                                                                                                                                                                      "is-number": {
-                                                                                                                                                                                        "version": "3.0.0",
-                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-                                                                                                                                                                                        "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                          "kind-of": "^3.0.2"
-                                                                                                                                                                                        },
-                                                                                                                                                                                        "dependencies": {
-                                                                                                                                                                                          "kind-of": {
-                                                                                                                                                                                            "version": "3.2.2",
-                                                                                                                                                                                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                                                                                                                                                                                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                                                                                                                                                                                            "requires": {
-                                                                                                                                                                                              "is-buffer": "^1.1.5"
-                                                                                                                                                                                            }
-                                                                                                                                                                                          }
-                                                                                                                                                                                        }
-                                                                                                                                                                                      },
-                                                                                                                                                                                      "to-regex-range": {
-                                                                                                                                                                                        "version": "2.1.1",
-                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-                                                                                                                                                                                        "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                          "is-number": "^3.0.0",
-                                                                                                                                                                                          "repeat-string": "^1.6.1"
-                                                                                                                                                                                        }
-                                                                                                                                                                                      } ===
-                                                                                                                                                                                      === =
-                                                                                                                                                                                      "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" >>>
-                                                                                                                                                                                            >>> > upstream / master
-                                                                                                                                                                                        }
-                                                                                                                                                                                      },
-                                                                                                                                                                                      "node-forge": {
-                                                                                                                                                                                        "version": "0.9.0",
-                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz",
-                                                                                                                                                                                        "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==",
-                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                      },
-                                                                                                                                                                                      "node-libs-browser": {
-                                                                                                                                                                                        "version": "2.2.1",
-                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-                                                                                                                                                                                        "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
-                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                          "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.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.0",
-                                                                                                                                                                                          "vm-browserify": "^1.0.1"
-                                                                                                                                                                                        },
-                                                                                                                                                                                        "dependencies": {
-                                                                                                                                                                                          <<
-                                                                                                                                                                                          << << < HEAD "bn.js": {
-                                                                                                                                                                                            "version": "4.11.9",
-                                                                                                                                                                                            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-                                                                                                                                                                                            "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-                                                                                                                                                                                            ===
-                                                                                                                                                                                            === =
-                                                                                                                                                                                            "punycode": {
-                                                                                                                                                                                              "version": "1.4.1",
-                                                                                                                                                                                              "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-                                                                                                                                                                                              "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-                                                                                                                                                                                              >>>
-                                                                                                                                                                                              >>> > upstream / master "dev": true
-                                                                                                                                                                                            }
-                                                                                                                                                                                          }
-                                                                                                                                                                                        },
-                                                                                                                                                                                        "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"
-                                                                                                                                                                                          }
-                                                                                                                                                                                        },
-                                                                                                                                                                                        <<
-                                                                                                                                                                                        << << < HEAD "mimic-fn": {
-                                                                                                                                                                                          "version": "2.1.0",
-                                                                                                                                                                                          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-                                                                                                                                                                                          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
-                                                                                                                                                                                        },
-                                                                                                                                                                                        "mimic-response": {
-                                                                                                                                                                                          "version": "1.0.1",
-                                                                                                                                                                                          "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-                                                                                                                                                                                          "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-                                                                                                                                                                                          ===
-                                                                                                                                                                                          === =
-                                                                                                                                                                                          "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==",
-                                                                                                                                                                                            >>>
-                                                                                                                                                                                            >>> > upstream / master "dev": true
-                                                                                                                                                                                          },
-                                                                                                                                                                                          "node-sass-tilde-importer": {
-                                                                                                                                                                                            "version": "1.0.2",
-                                                                                                                                                                                            "resolved": "https://registry.npmjs.org/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz",
-                                                                                                                                                                                            "integrity": "sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==",
-                                                                                                                                                                                            "dev": true,
-                                                                                                                                                                                            "requires": {
-                                                                                                                                                                                              "find-parent-dir": "^0.3.0"
-                                                                                                                                                                                            }
-                                                                                                                                                                                          },
-                                                                                                                                                                                          "nopt": {
-                                                                                                                                                                                            "version": "3.0.6",
-                                                                                                                                                                                            "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-                                                                                                                                                                                            "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-                                                                                                                                                                                            "dev": true,
-                                                                                                                                                                                            "requires": {
-                                                                                                                                                                                              "abbrev": "1"
-                                                                                                                                                                                            }
-                                                                                                                                                                                          },
-                                                                                                                                                                                          "normalize-package-data": {
-                                                                                                                                                                                            "version": "2.5.0",
-                                                                                                                                                                                            "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-                                                                                                                                                                                            "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-                                                                                                                                                                                            "dev": true,
-                                                                                                                                                                                            "requires": {
-                                                                                                                                                                                              "hosted-git-info": "^2.1.4",
-                                                                                                                                                                                              "resolve": "^1.10.0",
-                                                                                                                                                                                              "semver": "2 || 3 || 4 || 5",
-                                                                                                                                                                                              "validate-npm-package-license": "^3.0.1"
-                                                                                                                                                                                            }
-                                                                                                                                                                                          },
-                                                                                                                                                                                          <<
-                                                                                                                                                                                          << << < HEAD "minimist": {
-                                                                                                                                                                                            "version": "1.2.5",
-                                                                                                                                                                                            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-                                                                                                                                                                                            "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-                                                                                                                                                                                          },
-                                                                                                                                                                                          "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": {
-                                                                                                                                                                                              "safe-buffer": "^5.1.2",
-                                                                                                                                                                                              "yallist": "^3.0.0"
-                                                                                                                                                                                            },
-                                                                                                                                                                                            "dependencies": {
-                                                                                                                                                                                              "yallist": {
-                                                                                                                                                                                                "version": "3.1.1",
-                                                                                                                                                                                                "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-                                                                                                                                                                                                "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-                                                                                                                                                                                                "dev": true
-                                                                                                                                                                                              } ===
-                                                                                                                                                                                              === =
-                                                                                                                                                                                              "normalize-path": {
-                                                                                                                                                                                                "version": "3.0.0",
-                                                                                                                                                                                                "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-                                                                                                                                                                                                "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
-                                                                                                                                                                                              },
-                                                                                                                                                                                              "normalize-range": {
-                                                                                                                                                                                                "version": "0.1.2",
-                                                                                                                                                                                                "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-                                                                                                                                                                                                "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-                                                                                                                                                                                                "dev": true
-                                                                                                                                                                                              },
-                                                                                                                                                                                              "normalize-url": {
-                                                                                                                                                                                                "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.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",
-                                                                                                                                                                                                "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
-                                                                                                                                                                                                "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
-                                                                                                                                                                                                "dev": true,
-                                                                                                                                                                                                "requires": {
-                                                                                                                                                                                                  "once": "^1.3.2" >>>
-                                                                                                                                                                                                    >>> > upstream / master
-                                                                                                                                                                                                }
-                                                                                                                                                                                              },
-                                                                                                                                                                                              "npm-bundled": {
-                                                                                                                                                                                                "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": {
-                                                                                                                                                                                                  <<
-                                                                                                                                                                                                  << << < HEAD "minipass": "^3.0.0"
-                                                                                                                                                                                                },
-                                                                                                                                                                                                "dependencies": {
-                                                                                                                                                                                                  "minipass": {
-                                                                                                                                                                                                    "version": "3.1.3",
-                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-                                                                                                                                                                                                    "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
-                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                      "yallist": "^4.0.0"
-                                                                                                                                                                                                    }
-                                                                                                                                                                                                  } ===
-                                                                                                                                                                                                  === =
-                                                                                                                                                                                                  "npm-normalize-package-bin": "^1.0.1" >>>
-                                                                                                                                                                                                    >>> > upstream / master
-                                                                                                                                                                                                }
-                                                                                                                                                                                              },
-                                                                                                                                                                                              "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": {
-                                                                                                                                                                                                  <<
-                                                                                                                                                                                                  << << < HEAD "minipass": "^3.0.0"
-                                                                                                                                                                                                },
-                                                                                                                                                                                                "dependencies": {
-                                                                                                                                                                                                  "minipass": {
-                                                                                                                                                                                                    "version": "3.1.3",
-                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-                                                                                                                                                                                                    "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
-                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                      "yallist": "^4.0.0"
-                                                                                                                                                                                                    } ===
-                                                                                                                                                                                                    === =
-                                                                                                                                                                                                    "semver": "^7.1.1"
-                                                                                                                                                                                                  },
-                                                                                                                                                                                                  "dependencies": {
-                                                                                                                                                                                                    "semver": {
-                                                                                                                                                                                                      "version": "7.3.2",
-                                                                                                                                                                                                      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-                                                                                                                                                                                                      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-                                                                                                                                                                                                      "dev": true >>>
-                                                                                                                                                                                                        >>> > upstream / master
-                                                                                                                                                                                                    }
-                                                                                                                                                                                                  }
-                                                                                                                                                                                                },
-                                                                                                                                                                                                "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": "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": {
-                                                                                                                                                                                                    <<
-                                                                                                                                                                                                    << << < HEAD "minipass": "^3.0.0"
-                                                                                                                                                                                                  },
-                                                                                                                                                                                                  "dependencies": {
-                                                                                                                                                                                                    "minipass": {
-                                                                                                                                                                                                      "version": "3.1.3",
-                                                                                                                                                                                                      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-                                                                                                                                                                                                      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
-                                                                                                                                                                                                      "dev": true,
-                                                                                                                                                                                                      "requires": {
-                                                                                                                                                                                                        "yallist": "^4.0.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.3.2",
-                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-                                                                                                                                                                                                        "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-                                                                                                                                                                                                        "dev": true >>>
-                                                                                                                                                                                                          >>> > upstream / master
-                                                                                                                                                                                                      }
-                                                                                                                                                                                                    }
-                                                                                                                                                                                                  },
-                                                                                                                                                                                                  "npm-packlist": {
-                                                                                                                                                                                                    "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": {
-                                                                                                                                                                                                      <<
-                                                                                                                                                                                                      << << < HEAD "minipass": "^3.0.0",
-                                                                                                                                                                                                      "yallist": "^4.0.0"
-                                                                                                                                                                                                    },
-                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                      "minipass": {
-                                                                                                                                                                                                        "version": "3.1.3",
-                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-                                                                                                                                                                                                        "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
-                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                          "yallist": "^4.0.0"
-                                                                                                                                                                                                        }
-                                                                                                                                                                                                      } ===
-                                                                                                                                                                                                      === =
-                                                                                                                                                                                                      "ignore-walk": "^3.0.1",
-                                                                                                                                                                                                      "npm-bundled": "^1.0.1",
-                                                                                                                                                                                                      "npm-normalize-package-bin": "^1.0.1" >>>
-                                                                                                                                                                                                        >>> > upstream / master
-                                                                                                                                                                                                    }
-                                                                                                                                                                                                  },
-                                                                                                                                                                                                  "npm-pick-manifest": {
-                                                                                                                                                                                                    "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": {
-                                                                                                                                                                                                      <<
-                                                                                                                                                                                                      << << < HEAD "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"
-                                                                                                                                                                                                    }
-                                                                                                                                                                                                  },
-                                                                                                                                                                                                  "mixin-deep": {
-                                                                                                                                                                                                    "version": "1.3.2",
-                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-                                                                                                                                                                                                    "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-                                                                                                                                                                                                    ===
-                                                                                                                                                                                                    === =
-                                                                                                                                                                                                    "npm-install-checks": "^4.0.0",
-                                                                                                                                                                                                    "npm-package-arg": "^8.0.0",
-                                                                                                                                                                                                    "semver": "^7.0.0"
-                                                                                                                                                                                                  },
-                                                                                                                                                                                                  "dependencies": {
-                                                                                                                                                                                                    "semver": {
-                                                                                                                                                                                                      "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.4",
-                                                                                                                                                                                                  "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.4.tgz",
-                                                                                                                                                                                                  "integrity": "sha512-6jb34hX/iYNQebqWUHtU8YF6Cjb1H6ouTFPClYsyiW6lpFkljTpdeftm53rRojtja1rKAvKNIIiTS5Sjpw4wsA==",
-                                                                                                                                                                                                  "dev": true,
-                                                                                                                                                                                                  >>>
-                                                                                                                                                                                                  >>> > upstream / master "requires": {
-                                                                                                                                                                                                    "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": {
-                                                                                                                                                                                                    <<
-                                                                                                                                                                                                    << << < HEAD "is-extendable": {
-                                                                                                                                                                                                      "version": "1.0.1",
-                                                                                                                                                                                                      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-                                                                                                                                                                                                      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-                                                                                                                                                                                                      ===
-                                                                                                                                                                                                      === =
-                                                                                                                                                                                                      "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,
-                                                                                                                                                                                                        >>>
-                                                                                                                                                                                                        >>> > upstream / master "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.1",
-                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-                                                                                                                                                                                                        "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                      }
-                                                                                                                                                                                                    }
-                                                                                                                                                                                                  },
-                                                                                                                                                                                                  "npm-run-all": {
-                                                                                                                                                                                                    "version": "4.1.5",
-                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
-                                                                                                                                                                                                    "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==",
-                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                      "ansi-styles": "^3.2.1",
-                                                                                                                                                                                                      "chalk": "^2.4.1",
-                                                                                                                                                                                                      "cross-spawn": "^6.0.5",
-                                                                                                                                                                                                      "memorystream": "^0.3.1",
-                                                                                                                                                                                                      "minimatch": "^3.0.4",
-                                                                                                                                                                                                      "pidtree": "^0.3.0",
-                                                                                                                                                                                                      "read-pkg": "^3.0.0",
-                                                                                                                                                                                                      "shell-quote": "^1.6.1",
-                                                                                                                                                                                                      "string.prototype.padend": "^3.0.0"
-                                                                                                                                                                                                    },
-                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                      "cross-spawn": {
-                                                                                                                                                                                                        "version": "6.0.5",
-                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-                                                                                                                                                                                                        "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                          "nice-try": "^1.0.4",
-                                                                                                                                                                                                          "path-key": "^2.0.1",
-                                                                                                                                                                                                          "semver": "^5.5.0",
-                                                                                                                                                                                                          "shebang-command": "^1.2.0",
-                                                                                                                                                                                                          "which": "^1.2.9"
-                                                                                                                                                                                                        }
-                                                                                                                                                                                                      },
-                                                                                                                                                                                                      "load-json-file": {
-                                                                                                                                                                                                        "version": "4.0.0",
-                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-                                                                                                                                                                                                        "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                          "graceful-fs": "^4.1.2",
-                                                                                                                                                                                                          "parse-json": "^4.0.0",
-                                                                                                                                                                                                          "pify": "^3.0.0",
-                                                                                                                                                                                                          "strip-bom": "^3.0.0"
-                                                                                                                                                                                                        }
-                                                                                                                                                                                                      },
-                                                                                                                                                                                                      "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.1",
-                                                                                                                                                                                                          "json-parse-better-errors": "^1.0.1"
-                                                                                                                                                                                                        }
-                                                                                                                                                                                                      },
-                                                                                                                                                                                                      "read-pkg": {
-                                                                                                                                                                                                        "version": "3.0.0",
-                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-                                                                                                                                                                                                        "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                          "load-json-file": "^4.0.0",
-                                                                                                                                                                                                          "normalize-package-data": "^2.3.2",
-                                                                                                                                                                                                          "path-type": "^3.0.0"
-                                                                                                                                                                                                        }
-                                                                                                                                                                                                      },
-                                                                                                                                                                                                      "strip-bom": {
-                                                                                                                                                                                                        "version": "3.0.0",
-                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-                                                                                                                                                                                                        "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                      }
-                                                                                                                                                                                                    }
-                                                                                                                                                                                                  },
-                                                                                                                                                                                                  <<
-                                                                                                                                                                                                  << << < HEAD "mktemp": {
-                                                                                                                                                                                                    "version": "1.0.0",
-                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/mktemp/-/mktemp-1.0.0.tgz",
-                                                                                                                                                                                                    "integrity": "sha512-2duBeS0A75x0M3sCoY0R1TiLsYfIBUtNBNWS++eo+bX/ObVqzblqnEQhlaepoBOLD14wklsV3cYxZ68o5qYO8A==",
-                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                  },
-                                                                                                                                                                                                  "moment": {
-                                                                                                                                                                                                    "version": "2.24.0",
-                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
-                                                                                                                                                                                                    "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
-                                                                                                                                                                                                  },
-                                                                                                                                                                                                  "moment-timezone": {
-                                                                                                                                                                                                    "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"
-                                                                                                                                                                                                    }
-                                                                                                                                                                                                  },
-                                                                                                                                                                                                  "move-concurrently": {
-                                                                                                                                                                                                    "version": "1.0.1",
-                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-                                                                                                                                                                                                    "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
-                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                      "aproba": "^1.1.1",
-                                                                                                                                                                                                      "copy-concurrently": "^1.0.0",
-                                                                                                                                                                                                      "fs-write-stream-atomic": "^1.0.8",
-                                                                                                                                                                                                      "mkdirp": "^0.5.1",
-                                                                                                                                                                                                      "rimraf": "^2.5.4",
-                                                                                                                                                                                                      "run-queue": "^1.0.3"
-                                                                                                                                                                                                    }
-                                                                                                                                                                                                  },
-                                                                                                                                                                                                  "ms": {
-                                                                                                                                                                                                    "version": "2.0.0",
-                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-                                                                                                                                                                                                    "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-                                                                                                                                                                                                  },
-                                                                                                                                                                                                  "multicast-dns": {
-                                                                                                                                                                                                    "version": "6.2.3",
-                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
-                                                                                                                                                                                                    "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
-                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                      "dns-packet": "^1.3.1",
-                                                                                                                                                                                                      "thunky": "^1.0.2"
-                                                                                                                                                                                                    }
-                                                                                                                                                                                                  },
-                                                                                                                                                                                                  "multicast-dns-service-types": {
-                                                                                                                                                                                                    "version": "1.1.0",
-                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
-                                                                                                                                                                                                    "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
-                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                  },
-                                                                                                                                                                                                  "mute-stdout": {
-                                                                                                                                                                                                    "version": "1.0.1",
-                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
-                                                                                                                                                                                                    "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
-                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                  },
-                                                                                                                                                                                                  "mute-stream": {
-                                                                                                                                                                                                    "version": "0.0.8",
-                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-                                                                                                                                                                                                    "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                  },
-                                                                                                                                                                                                  "mz": {
-                                                                                                                                                                                                    "version": "2.7.0",
-                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
-                                                                                                                                                                                                    "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
-                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                      "any-promise": "^1.0.0",
-                                                                                                                                                                                                      "object-assign": "^4.0.1",
-                                                                                                                                                                                                      "thenify-all": "^1.0.0"
-                                                                                                                                                                                                    }
-                                                                                                                                                                                                  },
-                                                                                                                                                                                                  "nanomatch": {
-                                                                                                                                                                                                    "version": "1.2.13",
-                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-                                                                                                                                                                                                    "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-                                                                                                                                                                                                    ===
-                                                                                                                                                                                                    === =
-                                                                                                                                                                                                    "npm-run-path": {
-                                                                                                                                                                                                      "version": "2.0.2",
-                                                                                                                                                                                                      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-                                                                                                                                                                                                      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-                                                                                                                                                                                                      "requires": {
-                                                                                                                                                                                                        "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,
-                                                                                                                                                                                                      >>>
-                                                                                                                                                                                                      >>> > upstream / master "requires": {
-                                                                                                                                                                                                        "boolbase": "~1.0.0"
-                                                                                                                                                                                                      }
-                                                                                                                                                                                                    },
-                                                                                                                                                                                                    "num2fraction": {
-                                                                                                                                                                                                      "version": "1.2.2",
-                                                                                                                                                                                                      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-                                                                                                                                                                                                      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
-                                                                                                                                                                                                      "dev": true
-                                                                                                                                                                                                    },
-                                                                                                                                                                                                    "number-is-nan": {
-                                                                                                                                                                                                      "version": "1.0.1",
-                                                                                                                                                                                                      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-                                                                                                                                                                                                      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
-                                                                                                                                                                                                      "dev": true
-                                                                                                                                                                                                    },
-                                                                                                                                                                                                    <<
-                                                                                                                                                                                                    << << < HEAD "ng-packagr": {
-                                                                                                                                                                                                      "version": "9.1.5",
-                                                                                                                                                                                                      "resolved": "https://registry.npmjs.org/ng-packagr/-/ng-packagr-9.1.5.tgz",
-                                                                                                                                                                                                      "integrity": "sha512-biuNfM15uLkCW+Vvj8bnuwjX37oX7j5icGm+l71FhM6ydlEl+Cl7PdFXpy9rrIlKFYlYRiPiiiWazGwVGn1icQ==",
-                                                                                                                                                                                                      "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.7.6",
-                                                                                                                                                                                                        "browserslist": "^4.12.0",
-                                                                                                                                                                                                        "chalk": "^4.0.0",
-                                                                                                                                                                                                        "chokidar": "^3.2.1",
-                                                                                                                                                                                                        "clean-css": "^4.1.11",
-                                                                                                                                                                                                        "commander": "^4.0.0",
-                                                                                                                                                                                                        "fs-extra": "^9.0.0",
-                                                                                                                                                                                                        "glob": "^7.1.2",
-                                                                                                                                                                                                        "injection-js": "^2.2.1",
-                                                                                                                                                                                                        "less": "^3.10.3",
-                                                                                                                                                                                                        "node-sass-tilde-importer": "^1.0.0",
-                                                                                                                                                                                                        "postcss": "^7.0.18",
-                                                                                                                                                                                                        "postcss-url": "^8.0.0",
-                                                                                                                                                                                                        "read-pkg-up": "^5.0.0",
-                                                                                                                                                                                                        "rimraf": "^3.0.0",
-                                                                                                                                                                                                        "rollup": "2.7.5",
-                                                                                                                                                                                                        "rollup-plugin-sourcemaps": "^0.6.0",
-                                                                                                                                                                                                        "rxjs": "^6.5.0",
-                                                                                                                                                                                                        "sass": "^1.23.0",
-                                                                                                                                                                                                        "stylus": "^0.54.7",
-                                                                                                                                                                                                        "terser": "^4.3.8",
-                                                                                                                                                                                                        "update-notifier": "^4.0.0"
-                                                                                                                                                                                                      },
-                                                                                                                                                                                                      "dependencies": {
-                                                                                                                                                                                                        "autoprefixer": {
-                                                                                                                                                                                                          "version": "9.8.0",
-                                                                                                                                                                                                          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.0.tgz",
-                                                                                                                                                                                                          "integrity": "sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==",
-                                                                                                                                                                                                          "dev": true,
-                                                                                                                                                                                                          "requires": {
-                                                                                                                                                                                                            "browserslist": "^4.12.0",
-                                                                                                                                                                                                            "caniuse-lite": "^1.0.30001061",
-                                                                                                                                                                                                            "chalk": "^2.4.2",
-                                                                                                                                                                                                            "normalize-range": "^0.1.2",
-                                                                                                                                                                                                            "num2fraction": "^1.2.2",
-                                                                                                                                                                                                            "postcss": "^7.0.30",
-                                                                                                                                                                                                            "postcss-value-parser": "^4.1.0"
-                                                                                                                                                                                                          },
-                                                                                                                                                                                                          "dependencies": {
-                                                                                                                                                                                                            "chalk": {
-                                                                                                                                                                                                              "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.3.0"
-                                                                                                                                                                                                              }
-                                                                                                                                                                                                            },
-                                                                                                                                                                                                            "postcss": {
-                                                                                                                                                                                                              "version": "7.0.32",
-                                                                                                                                                                                                              "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
-                                                                                                                                                                                                              "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==",
-                                                                                                                                                                                                              "dev": true,
-                                                                                                                                                                                                              "requires": {
-                                                                                                                                                                                                                "chalk": "^2.4.2",
-                                                                                                                                                                                                                "source-map": "^0.6.1",
-                                                                                                                                                                                                                "supports-color": "^6.1.0"
-                                                                                                                                                                                                              },
-                                                                                                                                                                                                              "dependencies": {
-                                                                                                                                                                                                                "supports-color": {
-                                                                                                                                                                                                                  "version": "6.1.0",
-                                                                                                                                                                                                                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-                                                                                                                                                                                                                  "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-                                                                                                                                                                                                                  "dev": true,
-                                                                                                                                                                                                                  "requires": {
-                                                                                                                                                                                                                    "has-flag": "^3.0.0"
-                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                }
-                                                                                                                                                                                                              }
-                                                                                                                                                                                                            }
-                                                                                                                                                                                                          }
-                                                                                                                                                                                                        },
-                                                                                                                                                                                                        "chalk": {
-                                                                                                                                                                                                          "version": "4.1.0",
-                                                                                                                                                                                                          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                                                                                                                                                                                                          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-                                                                                                                                                                                                          "dev": true,
-                                                                                                                                                                                                          "requires": {
-                                                                                                                                                                                                            "ansi-styles": "^4.1.0",
-                                                                                                                                                                                                            "supports-color": "^7.1.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"
-                                                                                                                                                                                                              }
-                                                                                                                                                                                                            },
-                                                                                                                                                                                                            "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"
-                                                                                                                                                                                                              }
-                                                                                                                                                                                                            } ===
-                                                                                                                                                                                                            === =
-                                                                                                                                                                                                            "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" >>>
-                                                                                                                                                                                                                      >>> > upstream / master
-                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                },
-                                                                                                                                                                                                                "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",
-                                                                                                                                                                                                                  <<
-                                                                                                                                                                                                                  << << < HEAD "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
-                                                                                                                                                                                                                  "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
-                                                                                                                                                                                                                  "dev": true
-                                                                                                                                                                                                                },
-                                                                                                                                                                                                                "find-up": {
-                                                                                                                                                                                                                  ===
-                                                                                                                                                                                                                  === =
-                                                                                                                                                                                                                  "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": {
-                                                                                                                                                                                                                  >>>
-                                                                                                                                                                                                                  >>> > upstream / master "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"
-                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                },
-                                                                                                                                                                                                                <<
-                                                                                                                                                                                                                << << < HEAD "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.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": {
-                                                                                                                                                                                                                  ===
-                                                                                                                                                                                                                  === =
-                                                                                                                                                                                                                  "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": {
-                                                                                                                                                                                                                    >>>
-                                                                                                                                                                                                                    >>> > upstream / master "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"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  <<
-                                                                                                                                                                                                                  << << < HEAD "rimraf": {
-                                                                                                                                                                                                                    "version": "3.0.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-                                                                                                                                                                                                                    ===
-                                                                                                                                                                                                                    === =
-                                                                                                                                                                                                                    "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==",
-                                                                                                                                                                                                                      >>>
-                                                                                                                                                                                                                      >>> > upstream / master "dev": true,
-                                                                                                                                                                                                                      "requires": {
-                                                                                                                                                                                                                        "p-locate": "^4.1.0"
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    <<
-                                                                                                                                                                                                                    << << < HEAD "rollup": {
-                                                                                                                                                                                                                      "version": "2.7.5",
-                                                                                                                                                                                                                      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.7.5.tgz",
-                                                                                                                                                                                                                      "integrity": "sha512-xQSM8uzhgtF6tTnTVEvOQThrcG3LPUP3T/4l4EukzDp0kbTY1QRDuXjiwtYzs9odKj9Bj/PccRG6viFfS7DmCQ==",
-                                                                                                                                                                                                                      ===
-                                                                                                                                                                                                                      === =
-                                                                                                                                                                                                                      "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==",
-                                                                                                                                                                                                                        >>>
-                                                                                                                                                                                                                        >>> > upstream / master "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "semver": "^6.0.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      <<
-                                                                                                                                                                                                                      << << < HEAD "rollup-plugin-sourcemaps": {
-                                                                                                                                                                                                                        "version": "0.6.2",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.6.2.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-9AwTKg3yRykwzemfLt71ySe0LvrAci+bpsOL1LaTYFk5BX4HF6X7DQfpHa74ANfSja3hyjiQkXCR8goSOnW//Q==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "@rollup/pluginutils": "^3.0.9",
-                                                                                                                                                                                                                          "source-map-resolve": "^0.6.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "source-map-resolve": {
-                                                                                                                                                                                                                        "version": "0.6.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "atob": "^2.1.2",
-                                                                                                                                                                                                                          "decode-uri-component": "^0.2.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "type-fest": {
-                                                                                                                                                                                                                        "version": "0.6.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "ngrx-store-localstorage": {
-                                                                                                                                                                                                                    "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.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"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "nice-try": {
-                                                                                                                                                                                                                    "version": "1.0.5",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "node-fetch": {
-                                                                                                                                                                                                                    "version": "2.6.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
-                                                                                                                                                                                                                    "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",
-                                                                                                                                                                                                                    "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "node-libs-browser": {
-                                                                                                                                                                                                                    "version": "2.2.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "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.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.0",
-                                                                                                                                                                                                                      "vm-browserify": "^1.0.1"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "punycode": {
-                                                                                                                                                                                                                        "version": "1.4.1",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "node-sass-tilde-importer": {
-                                                                                                                                                                                                                    "version": "1.0.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "find-parent-dir": "^0.3.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "nopt": {
-                                                                                                                                                                                                                    "version": "3.0.6",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "abbrev": "1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "normalize-package-data": {
-                                                                                                                                                                                                                    "version": "2.5.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "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": "3.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "normalize-range": {
-                                                                                                                                                                                                                    "version": "0.1.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "normalize-url": {
-                                                                                                                                                                                                                    "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.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",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "once": "^1.3.2"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "npm-bundled": {
-                                                                                                                                                                                                                    "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.3.2",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-                                                                                                                                                                                                                        "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": "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": "^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.3.2",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "npm-packlist": {
-                                                                                                                                                                                                                    "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": {
-                                                                                                                                                                                                                      "ignore-walk": "^3.0.1",
-                                                                                                                                                                                                                      "npm-bundled": "^1.0.1",
-                                                                                                                                                                                                                      "npm-normalize-package-bin": "^1.0.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "npm-pick-manifest": {
-                                                                                                                                                                                                                    "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": {
-                                                                                                                                                                                                                      "npm-install-checks": "^4.0.0",
-                                                                                                                                                                                                                      "npm-package-arg": "^8.0.0",
-                                                                                                                                                                                                                      "semver": "^7.0.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "semver": {
-                                                                                                                                                                                                                        "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.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",
-                                                                                                                                                                                                                      "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": {
-                                                                                                                                                                                                                      "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.1",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "npm-run-all": {
-                                                                                                                                                                                                                    "version": "4.1.5",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "ansi-styles": "^3.2.1",
-                                                                                                                                                                                                                      "chalk": "^2.4.1",
-                                                                                                                                                                                                                      "cross-spawn": "^6.0.5",
-                                                                                                                                                                                                                      "memorystream": "^0.3.1",
-                                                                                                                                                                                                                      "minimatch": "^3.0.4",
-                                                                                                                                                                                                                      "pidtree": "^0.3.0",
-                                                                                                                                                                                                                      "read-pkg": "^3.0.0",
-                                                                                                                                                                                                                      "shell-quote": "^1.6.1",
-                                                                                                                                                                                                                      "string.prototype.padend": "^3.0.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "cross-spawn": {
-                                                                                                                                                                                                                        "version": "6.0.5",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "nice-try": "^1.0.4",
-                                                                                                                                                                                                                          "path-key": "^2.0.1",
-                                                                                                                                                                                                                          "semver": "^5.5.0",
-                                                                                                                                                                                                                          "shebang-command": "^1.2.0",
-                                                                                                                                                                                                                          "which": "^1.2.9"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "load-json-file": {
-                                                                                                                                                                                                                        "version": "4.0.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "graceful-fs": "^4.1.2",
-                                                                                                                                                                                                                          "parse-json": "^4.0.0",
-                                                                                                                                                                                                                          "pify": "^3.0.0",
-                                                                                                                                                                                                                          "strip-bom": "^3.0.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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.1",
-                                                                                                                                                                                                                          "json-parse-better-errors": "^1.0.1"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "read-pkg": {
-                                                                                                                                                                                                                        "version": "3.0.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "load-json-file": "^4.0.0",
-                                                                                                                                                                                                                          "normalize-package-data": "^2.3.2",
-                                                                                                                                                                                                                          "path-type": "^3.0.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "strip-bom": {
-                                                                                                                                                                                                                        "version": "3.0.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "npm-run-path": {
-                                                                                                                                                                                                                    "version": "2.0.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "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",
-                                                                                                                                                                                                                    "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "number-is-nan": {
-                                                                                                                                                                                                                    "version": "1.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-                                                                                                                                                                                                                    "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
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      ===
-                                                                                                                                                                                                                      === =
-                                                                                                                                                                                                                      "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
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      >>>
-                                                                                                                                                                                                                      >>> > upstream / master "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",
-                                                                                                                                                                                                                    "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "object-assign": {
-                                                                                                                                                                                                                    "version": "4.1.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "object-component": {
-                                                                                                                                                                                                                    "version": "0.0.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "object-copy": {
-                                                                                                                                                                                                                    "version": "0.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "copy-descriptor": "^0.1.0",
-                                                                                                                                                                                                                      "define-property": "^0.2.5",
-                                                                                                                                                                                                                      "kind-of": "^3.0.3"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "define-property": {
-                                                                                                                                                                                                                        "version": "0.2.5",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "is-descriptor": "^0.1.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "kind-of": {
-                                                                                                                                                                                                                        "version": "3.2.2",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "is-buffer": "^1.1.5"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "object-inspect": {
-                                                                                                                                                                                                                    "version": "1.6.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "object-is": {
-                                                                                                                                                                                                                    "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.2.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "is-regex": {
-                                                                                                                                                                                                                        "version": "1.1.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "has-symbols": "^1.0.1"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-                                                                                                                                                                                                                    "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=",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "isobject": "^3.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "object.assign": {
-                                                                                                                                                                                                                    "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",
-                                                                                                                                                                                                                      "has-symbols": "^1.0.0",
-                                                                                                                                                                                                                      "object-keys": "^1.0.11"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "object.defaults": {
-                                                                                                                                                                                                                    "version": "1.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "array-each": "^1.0.1",
-                                                                                                                                                                                                                      "array-slice": "^1.0.0",
-                                                                                                                                                                                                                      "for-own": "^1.0.0",
-                                                                                                                                                                                                                      "isobject": "^3.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "object.getownpropertydescriptors": {
-                                                                                                                                                                                                                    "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.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.2.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "is-regex": {
-                                                                                                                                                                                                                        "version": "1.1.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "has-symbols": "^1.0.1"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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": {
-                                                                                                                                                                                                                    "version": "1.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "for-own": "^1.0.0",
-                                                                                                                                                                                                                      "make-iterator": "^1.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "object.pick": {
-                                                                                                                                                                                                                    "version": "1.3.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "isobject": "^3.0.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "object.reduce": {
-                                                                                                                                                                                                                    "version": "1.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "for-own": "^1.0.0",
-                                                                                                                                                                                                                      "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.2.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "is-regex": {
-                                                                                                                                                                                                                        "version": "1.1.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "has-symbols": "^1.0.1"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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",
-                                                                                                                                                                                                                    "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "on-finished": {
-                                                                                                                                                                                                                    "version": "2.3.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "ee-first": "1.1.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "on-headers": {
-                                                                                                                                                                                                                    "version": "1.0.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "once": {
-                                                                                                                                                                                                                    "version": "1.4.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "wrappy": "1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "onetime": {
-                                                                                                                                                                                                                    "version": "5.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "mimic-fn": "^2.1.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "open": {
-                                                                                                                                                                                                                    "version": "7.0.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/open/-/open-7.0.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-sP2ru2v0P290WFfv49Ap8MF6PkzGNnGlAwHweB4WR4mr5d2d0woiCluUeJ218w7/+PmoBy9JmYgD5A4mLcWOFA==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "is-docker": "^2.0.0",
-                                                                                                                                                                                                                      "is-wsl": "^2.1.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "opn": {
-                                                                                                                                                                                                                    "version": "5.5.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
-                                                                                                                                                                                                                    "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": {
-                                                                                                                                                                                                                    "version": "0.6.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "minimist": "~0.0.1",
-                                                                                                                                                                                                                      "wordwrap": "~0.0.2"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "minimist": {
-                                                                                                                                                                                                                        "version": "0.0.10",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "wordwrap": {
-                                                                                                                                                                                                                        "version": "0.0.3",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "optionator": {
-                                                                                                                                                                                                                    "version": "0.8.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "deep-is": "~0.1.3",
-                                                                                                                                                                                                                      "fast-levenshtein": "~2.0.6",
-                                                                                                                                                                                                                      "levn": "~0.3.0",
-                                                                                                                                                                                                                      "prelude-ls": "~1.1.2",
-                                                                                                                                                                                                                      "type-check": "~0.3.2",
-                                                                                                                                                                                                                      "word-wrap": "~1.2.3"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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",
-                                                                                                                                                                                                                    "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "readable-stream": "^2.0.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "original": {
-                                                                                                                                                                                                                    "version": "1.0.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "url-parse": "^1.4.3"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "os-browserify": {
-                                                                                                                                                                                                                    "version": "0.3.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "os-locale": {
-                                                                                                                                                                                                                    "version": "1.4.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "lcid": "^1.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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",
-                                                                                                                                                                                                                    "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "p-defer": {
-                                                                                                                                                                                                                    "version": "1.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "p-finally": {
-                                                                                                                                                                                                                    "version": "1.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "p-limit": {
-                                                                                                                                                                                                                    "version": "1.3.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-                                                                                                                                                                                                                    "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=",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "p-limit": "^1.1.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "p-map": {
-                                                                                                                                                                                                                    "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",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "retry": "^0.12.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="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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",
-                                                                                                                                                                                                                    "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "got": "^9.6.0",
-                                                                                                                                                                                                                      "registry-auth-token": "^4.0.0",
-                                                                                                                                                                                                                      "registry-url": "^5.0.0",
-                                                                                                                                                                                                                      "semver": "^6.2.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "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==",
-                                                                                                                                                                                                                        "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==",
-                                                                                                                                                                                                                        "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",
-                                                                                                                                                                                                                        "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "pacote": {
-                                                                                                                                                                                                                    "version": "9.5.12",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.12.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "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",
-                                                                                                                                                                                                                      "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",
-                                                                                                                                                                                                                      "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": {
-                                                                                                                                                                                                                      "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "pako": {
-                                                                                                                                                                                                                    "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": {
-                                                                                                                                                                                                                    "version": "1.2.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "cyclist": "^1.0.1",
-                                                                                                                                                                                                                      "inherits": "^2.0.3",
-                                                                                                                                                                                                                      "readable-stream": "^2.1.5"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "parse-asn1": {
-                                                                                                                                                                                                                    "version": "5.1.5",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "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": {
-                                                                                                                                                                                                                    "version": "1.0.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "is-absolute": "^1.0.0",
-                                                                                                                                                                                                                      "map-cache": "^0.2.0",
-                                                                                                                                                                                                                      "path-root": "^0.1.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "parse-json": {
-                                                                                                                                                                                                                    "version": "2.2.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "error-ex": "^1.2.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "parse-node-version": {
-                                                                                                                                                                                                                    "version": "1.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "parse-passwd": {
-                                                                                                                                                                                                                    "version": "1.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "parse5": {
-                                                                                                                                                                                                                    "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": {
-                                                                                                                                                                                                                    "version": "0.0.5",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "better-assert": "~1.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "parseuri": {
-                                                                                                                                                                                                                    "version": "0.0.5",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "better-assert": "~1.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "parseurl": {
-                                                                                                                                                                                                                    "version": "1.3.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "pascalcase": {
-                                                                                                                                                                                                                    "version": "0.1.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "path-browserify": {
-                                                                                                                                                                                                                    "version": "0.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "path-dirname": {
-                                                                                                                                                                                                                    "version": "1.0.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-                                                                                                                                                                                                                    "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="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "path-is-inside": {
-                                                                                                                                                                                                                    "version": "1.0.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "path-key": {
-                                                                                                                                                                                                                    "version": "2.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "path-root": {
-                                                                                                                                                                                                                    "version": "0.1.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "path-root-regex": "^0.1.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "path-root-regex": {
-                                                                                                                                                                                                                    "version": "0.1.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "path-to-regexp": {
-                                                                                                                                                                                                                    "version": "0.1.7",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "path-type": {
-                                                                                                                                                                                                                    "version": "3.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "pify": "^3.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "pause-stream": {
-                                                                                                                                                                                                                    "version": "0.0.11",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "through": "~2.3"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "pbkdf2": {
-                                                                                                                                                                                                                    "version": "3.1.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "create-hash": "^1.1.2",
-                                                                                                                                                                                                                      "create-hmac": "^1.1.4",
-                                                                                                                                                                                                                      "ripemd160": "^2.0.1",
-                                                                                                                                                                                                                      "safe-buffer": "^5.0.1",
-                                                                                                                                                                                                                      "sha.js": "^2.4.8"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "performance-now": {
-                                                                                                                                                                                                                    "version": "2.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "picomatch": {
-                                                                                                                                                                                                                    "version": "2.2.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "pidtree": {
-                                                                                                                                                                                                                    "version": "0.3.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-9CT4NFlDcosssyg8KVFltgokyKZIFjoBxw8CTGy+5F38Y1eQWrt8tRayiUOXE+zVKQnYu5BR8JjCtvK3BcnBhg==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "pify": {
-                                                                                                                                                                                                                    "version": "3.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "pinkie": {
-                                                                                                                                                                                                                    "version": "2.0.4",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "pinkie-promise": {
-                                                                                                                                                                                                                    "version": "2.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "pinkie": "^2.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "pkg-dir": {
-                                                                                                                                                                                                                    "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"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "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.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": "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": {
-                                                                                                                                                                                                                    "version": "1.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "ansi-colors": "^1.0.1",
-                                                                                                                                                                                                                      "arr-diff": "^4.0.0",
-                                                                                                                                                                                                                      "arr-union": "^3.1.0",
-                                                                                                                                                                                                                      "extend-shallow": "^3.0.2"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "ansi-colors": {
-                                                                                                                                                                                                                        "version": "1.1.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "ansi-wrap": "^0.1.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "pluralize": {
-                                                                                                                                                                                                                    "version": "1.2.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "portfinder": {
-                                                                                                                                                                                                                    "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",
-                                                                                                                                                                                                                      "debug": "^3.1.1",
-                                                                                                                                                                                                                      "mkdirp": "^0.5.1"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "postcss": {
-                                                                                                                                                                                                                    "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",
-                                                                                                                                                                                                                      "source-map": "^0.6.1",
-                                                                                                                                                                                                                      "supports-color": "^6.1.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
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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",
-                                                                                                                                                                                                                    "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "postcss": "^7.0.1",
-                                                                                                                                                                                                                      "postcss-value-parser": "^3.2.3",
-                                                                                                                                                                                                                      "read-cache": "^1.0.0",
-                                                                                                                                                                                                                      "resolve": "^1.1.7"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "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-load-config": {
-                                                                                                                                                                                                                    "version": "2.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "cosmiconfig": "^5.0.0",
-                                                                                                                                                                                                                      "import-cwd": "^2.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "postcss-loader": {
-                                                                                                                                                                                                                    "version": "3.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "loader-utils": "^1.1.0",
-                                                                                                                                                                                                                      "postcss": "^7.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-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",
-                                                                                                                                                                                                                    "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": {
-                                                                                                                                                                                                                      "find-up": {
-                                                                                                                                                                                                                        "version": "3.0.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-                                                                                                                                                                                                                        "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==",
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "p-locate": "^3.0.0",
-                                                                                                                                                                                                                          "path-exists": "^3.0.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "p-limit": {
-                                                                                                                                                                                                                        "version": "2.3.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-                                                                                                                                                                                                                        "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==",
-                                                                                                                                                                                                                        "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=="
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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": {
-                                                                                                                                                                                                                    "version": "8.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/postcss-url/-/postcss-url-8.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-E2cbOQ5aii2zNHh8F6fk1cxls7QVFZjLPSrqvmiza8OuXLzIpErij8BDS5Y3STPfJgpIMNCPEr8JlKQWEoozUw==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "mime": "^2.3.1",
-                                                                                                                                                                                                                      "minimatch": "^3.0.4",
-                                                                                                                                                                                                                      "mkdirp": "^0.5.0",
-                                                                                                                                                                                                                      "postcss": "^7.0.2",
-                                                                                                                                                                                                                      "xxhashjs": "^0.2.1"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "mime": {
-                                                                                                                                                                                                                        "version": "2.4.6",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "postcss-value-parser": {
-                                                                                                                                                                                                                    "version": "4.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "prelude-ls": {
-                                                                                                                                                                                                                    "version": "1.1.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "prepend-http": {
-                                                                                                                                                                                                                    "version": "1.0.4",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "prettier": {
-                                                                                                                                                                                                                    "version": "2.0.5",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "pretty-hrtime": {
-                                                                                                                                                                                                                    "version": "1.0.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "private": {
-                                                                                                                                                                                                                    "version": "0.1.8",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "process": {
-                                                                                                                                                                                                                    "version": "0.11.10",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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=="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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",
-                                                                                                                                                                                                                    "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "promise": {
-                                                                                                                                                                                                                    "version": "7.3.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "optional": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "asap": "~2.0.3"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "promise-inflight": {
-                                                                                                                                                                                                                    "version": "1.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "promise-retry": {
-                                                                                                                                                                                                                    "version": "1.1.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "err-code": "^1.0.0",
-                                                                                                                                                                                                                      "retry": "^0.10.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "retry": {
-                                                                                                                                                                                                                        "version": "0.10.1",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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",
-                                                                                                                                                                                                                    "integrity": "sha512-7pMAolv8Ah1yJIqaorDTzACtn3gk7BamVKPTeO5lqIGOrfosjPgXFx/z1dqSI+m5EeZc2GMJHPr5DYlodujDNA==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "@types/q": "^0.0.32",
-                                                                                                                                                                                                                      "@types/selenium-webdriver": "^3.0.0",
-                                                                                                                                                                                                                      "blocking-proxy": "^1.0.0",
-                                                                                                                                                                                                                      "browserstack": "^1.5.1",
-                                                                                                                                                                                                                      "chalk": "^1.1.3",
-                                                                                                                                                                                                                      "glob": "^7.0.3",
-                                                                                                                                                                                                                      "jasmine": "2.8.0",
-                                                                                                                                                                                                                      "jasminewd2": "^2.1.0",
-                                                                                                                                                                                                                      "optimist": "~0.6.0",
-                                                                                                                                                                                                                      "q": "1.4.1",
-                                                                                                                                                                                                                      "saucelabs": "^1.5.0",
-                                                                                                                                                                                                                      "selenium-webdriver": "3.6.0",
-                                                                                                                                                                                                                      "source-map-support": "~0.4.0",
-                                                                                                                                                                                                                      "webdriver-js-extender": "2.1.0",
-                                                                                                                                                                                                                      "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",
-                                                                                                                                                                                                                        "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "del": {
-                                                                                                                                                                                                                        "version": "2.2.2",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "globby": "^5.0.0",
-                                                                                                                                                                                                                          "is-path-cwd": "^1.0.0",
-                                                                                                                                                                                                                          "is-path-in-cwd": "^1.0.0",
-                                                                                                                                                                                                                          "object-assign": "^4.0.1",
-                                                                                                                                                                                                                          "pify": "^2.0.0",
-                                                                                                                                                                                                                          "pinkie-promise": "^2.0.0",
-                                                                                                                                                                                                                          "rimraf": "^2.2.8"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "globby": {
-                                                                                                                                                                                                                        "version": "5.0.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "array-union": "^1.0.1",
-                                                                                                                                                                                                                          "arrify": "^1.0.0",
-                                                                                                                                                                                                                          "glob": "^7.0.3",
-                                                                                                                                                                                                                          "object-assign": "^4.0.1",
-                                                                                                                                                                                                                          "pify": "^2.0.0",
-                                                                                                                                                                                                                          "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",
-                                                                                                                                                                                                                        "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "q": {
-                                                                                                                                                                                                                        "version": "1.4.1",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "source-map-support": {
-                                                                                                                                                                                                                        "version": "0.4.18",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "source-map": "^0.5.6"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "webdriver-manager": {
-                                                                                                                                                                                                                        "version": "12.1.7",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.7.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-XINj6b8CYuUYC93SG3xPkxlyUc3IJbD6Vvo75CVGuG9uzsefDzWQrhz0Lq8vbPxtb4d63CZdYophF8k8Or/YiA==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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",
-                                                                                                                                                                                                                    "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "forwarded": "~0.1.2",
-                                                                                                                                                                                                                      "ipaddr.js": "1.9.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "prr": {
-                                                                                                                                                                                                                    "version": "1.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "ps-node": {
-                                                                                                                                                                                                                    "version": "0.1.6",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/ps-node/-/ps-node-0.1.6.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-mvZ6mdex0BMuUaUDCZ04qNKs4sM=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "table-parser": "^0.1.3"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "ps-tree": {
-                                                                                                                                                                                                                    "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"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "psl": {
-                                                                                                                                                                                                                    "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": {
-                                                                                                                                                                                                                    "version": "4.0.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "bn.js": "^4.1.0",
-                                                                                                                                                                                                                      "browserify-rsa": "^4.0.0",
-                                                                                                                                                                                                                      "create-hash": "^1.1.0",
-                                                                                                                                                                                                                      "parse-asn1": "^5.0.0",
-                                                                                                                                                                                                                      "randombytes": "^2.0.1",
-                                                                                                                                                                                                                      "safe-buffer": "^5.1.2"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "bn.js": {
-                                                                                                                                                                                                                        "version": "4.11.9",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "pump": {
-                                                                                                                                                                                                                    "version": "3.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "end-of-stream": "^1.1.0",
-                                                                                                                                                                                                                      "once": "^1.3.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "pumpify": {
-                                                                                                                                                                                                                    "version": "1.5.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "duplexify": "^3.6.0",
-                                                                                                                                                                                                                      "inherits": "^2.0.3",
-                                                                                                                                                                                                                      "pump": "^2.0.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "pump": {
-                                                                                                                                                                                                                        "version": "2.0.1",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "end-of-stream": "^1.1.0",
-                                                                                                                                                                                                                          "once": "^1.3.1"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "punycode": {
-                                                                                                                                                                                                                    "version": "2.1.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-                                                                                                                                                                                                                    "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",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "qjobs": {
-                                                                                                                                                                                                                    "version": "1.2.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "qs": {
-                                                                                                                                                                                                                    "version": "6.5.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "query-string": {
-                                                                                                                                                                                                                    "version": "4.3.4",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "object-assign": "^4.1.0",
-                                                                                                                                                                                                                      "strict-uri-encode": "^1.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "querystring": {
-                                                                                                                                                                                                                    "version": "0.2.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "querystring-es3": {
-                                                                                                                                                                                                                    "version": "0.2.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "querystringify": {
-                                                                                                                                                                                                                    "version": "2.1.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "randombytes": {
-                                                                                                                                                                                                                    "version": "2.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "safe-buffer": "^5.1.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "randomfill": {
-                                                                                                                                                                                                                    "version": "1.0.4",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "randombytes": "^2.0.5",
-                                                                                                                                                                                                                      "safe-buffer": "^5.1.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "range-parser": {
-                                                                                                                                                                                                                    "version": "1.2.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "raw-body": {
-                                                                                                                                                                                                                    "version": "2.4.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "bytes": "3.1.0",
-                                                                                                                                                                                                                      "http-errors": "1.7.2",
-                                                                                                                                                                                                                      "iconv-lite": "0.4.24",
-                                                                                                                                                                                                                      "unpipe": "1.0.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "bytes": {
-                                                                                                                                                                                                                        "version": "3.1.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "raw-loader": {
-                                                                                                                                                                                                                    "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.2.3",
-                                                                                                                                                                                                                      "schema-utils": "^2.5.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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "rc": {
-                                                                                                                                                                                                                    "version": "1.2.8",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "deep-extend": "^0.6.0",
-                                                                                                                                                                                                                      "ini": "~1.3.0",
-                                                                                                                                                                                                                      "minimist": "^1.2.0",
-                                                                                                                                                                                                                      "strip-json-comments": "~2.0.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "read-cache": {
-                                                                                                                                                                                                                    "version": "1.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "pify": "^2.3.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "pify": {
-                                                                                                                                                                                                                        "version": "2.3.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "read-package-json": {
-                                                                                                                                                                                                                    "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",
-                                                                                                                                                                                                                      "npm-normalize-package-bin": "^1.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "read-package-tree": {
-                                                                                                                                                                                                                    "version": "5.3.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "read-package-json": "^2.0.0",
-                                                                                                                                                                                                                      "readdir-scoped-modules": "^1.0.0",
-                                                                                                                                                                                                                      "util-promisify": "^2.1.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "read-pkg": {
-                                                                                                                                                                                                                    "version": "1.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "load-json-file": "^1.0.0",
-                                                                                                                                                                                                                      "normalize-package-data": "^2.3.2",
-                                                                                                                                                                                                                      "path-type": "^1.0.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "path-type": {
-                                                                                                                                                                                                                        "version": "1.1.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "graceful-fs": "^4.1.2",
-                                                                                                                                                                                                                          "pify": "^2.0.0",
-                                                                                                                                                                                                                          "pinkie-promise": "^2.0.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "pify": {
-                                                                                                                                                                                                                        "version": "2.3.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "read-pkg-up": {
-                                                                                                                                                                                                                    "version": "1.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "find-up": "^1.0.0",
-                                                                                                                                                                                                                      "read-pkg": "^1.0.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "find-up": {
-                                                                                                                                                                                                                        "version": "1.1.2",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "path-exists": "^2.0.0",
-                                                                                                                                                                                                                          "pinkie-promise": "^2.0.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "path-exists": {
-                                                                                                                                                                                                                        "version": "2.1.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "pinkie-promise": "^2.0.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "readable-stream": {
-                                                                                                                                                                                                                    "version": "2.3.6",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "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"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "readdir-scoped-modules": {
-                                                                                                                                                                                                                    "version": "1.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "debuglog": "^1.0.1",
-                                                                                                                                                                                                                      "dezalgo": "^1.0.0",
-                                                                                                                                                                                                                      "graceful-fs": "^4.1.2",
-                                                                                                                                                                                                                      "once": "^1.3.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "readdirp": {
-                                                                                                                                                                                                                    "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.2.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "readline2": {
-                                                                                                                                                                                                                    "version": "1.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "code-point-at": "^1.0.0",
-                                                                                                                                                                                                                      "is-fullwidth-code-point": "^1.0.0",
-                                                                                                                                                                                                                      "mute-stream": "0.0.5"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "mute-stream": {
-                                                                                                                                                                                                                        "version": "0.0.5",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "rechoir": {
-                                                                                                                                                                                                                    "version": "0.6.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "resolve": "^1.1.6"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "reflect-metadata": {
-                                                                                                                                                                                                                    "version": "0.1.13",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "regenerate": {
-                                                                                                                                                                                                                    "version": "1.4.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "regenerate-unicode-properties": {
-                                                                                                                                                                                                                    "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.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.4",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "@babel/runtime": "^7.8.4",
-                                                                                                                                                                                                                      "private": "^0.1.8"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "regex-not": {
-                                                                                                                                                                                                                    "version": "1.0.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "extend-shallow": "^3.0.2",
-                                                                                                                                                                                                                      "safe-regex": "^1.1.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "regexp.prototype.flags": {
-                                                                                                                                                                                                                    "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.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.2.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "is-regex": {
-                                                                                                                                                                                                                        "version": "1.1.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "has-symbols": "^1.0.1"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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.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.2.0",
-                                                                                                                                                                                                                      "regjsgen": "^0.5.1",
-                                                                                                                                                                                                                      "regjsparser": "^0.6.4",
-                                                                                                                                                                                                                      "unicode-match-property-ecmascript": "^1.0.4",
-                                                                                                                                                                                                                      "unicode-match-property-value-ecmascript": "^1.2.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "registry-auth-token": {
-                                                                                                                                                                                                                    "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"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "registry-url": {
-                                                                                                                                                                                                                    "version": "5.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "rc": "^1.2.8"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "regjsgen": {
-                                                                                                                                                                                                                    "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.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
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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",
-                                                                                                                                                                                                                    "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "is-buffer": "^1.1.5",
-                                                                                                                                                                                                                      "is-utf8": "^0.2.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "remove-bom-stream": {
-                                                                                                                                                                                                                    "version": "1.2.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "remove-bom-buffer": "^3.0.0",
-                                                                                                                                                                                                                      "safe-buffer": "^5.1.0",
-                                                                                                                                                                                                                      "through2": "^2.0.3"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "repeat-element": {
-                                                                                                                                                                                                                    "version": "1.1.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "repeat-string": {
-                                                                                                                                                                                                                    "version": "1.6.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "replace-ext": {
-                                                                                                                                                                                                                    "version": "1.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "replace-homedir": {
-                                                                                                                                                                                                                    "version": "1.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "homedir-polyfill": "^1.0.1",
-                                                                                                                                                                                                                      "is-absolute": "^1.0.0",
-                                                                                                                                                                                                                      "remove-trailing-separator": "^1.1.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "replace-in-file": {
-                                                                                                                                                                                                                    "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": "^3.0.0",
-                                                                                                                                                                                                                      "glob": "^7.1.6",
-                                                                                                                                                                                                                      "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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": "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "request": {
-                                                                                                                                                                                                                    "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",
-                                                                                                                                                                                                                      "aws4": "^1.8.0",
-                                                                                                                                                                                                                      "caseless": "~0.12.0",
-                                                                                                                                                                                                                      "combined-stream": "~1.0.6",
-                                                                                                                                                                                                                      "extend": "~3.0.2",
-                                                                                                                                                                                                                      "forever-agent": "~0.6.1",
-                                                                                                                                                                                                                      "form-data": "~2.3.2",
-                                                                                                                                                                                                                      "har-validator": "~5.1.3",
-                                                                                                                                                                                                                      "http-signature": "~1.2.0",
-                                                                                                                                                                                                                      "is-typedarray": "~1.0.0",
-                                                                                                                                                                                                                      "isstream": "~0.1.2",
-                                                                                                                                                                                                                      "json-stringify-safe": "~5.0.1",
-                                                                                                                                                                                                                      "mime-types": "~2.1.19",
-                                                                                                                                                                                                                      "oauth-sign": "~0.9.0",
-                                                                                                                                                                                                                      "performance-now": "^2.1.0",
-                                                                                                                                                                                                                      "qs": "~6.5.2",
-                                                                                                                                                                                                                      "safe-buffer": "^5.1.2",
-                                                                                                                                                                                                                      "tough-cookie": "~2.5.0",
-                                                                                                                                                                                                                      "tunnel-agent": "^0.6.0",
-                                                                                                                                                                                                                      "uuid": "^3.3.2"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "request-promise-core": {
-                                                                                                                                                                                                                    "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.15"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "request-promise-native": {
-                                                                                                                                                                                                                    "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.3",
-                                                                                                                                                                                                                      "stealthy-require": "^1.1.1",
-                                                                                                                                                                                                                      "tough-cookie": "^2.3.3"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "require-directory": {
-                                                                                                                                                                                                                    "version": "2.1.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "require-uncached": {
-                                                                                                                                                                                                                    "version": "1.0.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "caller-path": "^0.1.0",
-                                                                                                                                                                                                                      "resolve-from": "^1.0.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "caller-path": {
-                                                                                                                                                                                                                        "version": "0.1.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "callsites": "^0.2.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "callsites": {
-                                                                                                                                                                                                                        "version": "0.2.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "resolve-from": {
-                                                                                                                                                                                                                        "version": "1.0.1",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "requires-port": {
-                                                                                                                                                                                                                    "version": "1.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "reselect": {
-                                                                                                                                                                                                                    "version": "4.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA=="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "resolve": {
-                                                                                                                                                                                                                    "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"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "resolve-cwd": {
-                                                                                                                                                                                                                    "version": "2.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "resolve-from": "^3.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "resolve-dir": {
-                                                                                                                                                                                                                    "version": "1.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "expand-tilde": "^2.0.0",
-                                                                                                                                                                                                                      "global-modules": "^1.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "resolve-from": {
-                                                                                                                                                                                                                    "version": "3.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "resolve-options": {
-                                                                                                                                                                                                                    "version": "1.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "value-or-function": "^3.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "resolve-url": {
-                                                                                                                                                                                                                    "version": "0.2.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "responselike": {
-                                                                                                                                                                                                                    "version": "1.0.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "lowercase-keys": "^1.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "restore-cursor": {
-                                                                                                                                                                                                                    "version": "3.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "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=="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "retry": {
-                                                                                                                                                                                                                    "version": "0.12.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "reusify": {
-                                                                                                                                                                                                                    "version": "1.0.4",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "rfdc": {
-                                                                                                                                                                                                                    "version": "1.1.4",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz",
-                                                                                                                                                                                                                    "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": "2.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-gfE1455AEazVVTJoeQtcOq/U6GSxwoj4XPSWVsuWmgIxj7sBQNLDOSA82PbdMe+cP8ql8fR1jogPFe8Wg8g4SQ==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "fsevents": "~2.1.2"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "run-async": {
-                                                                                                                                                                                                                    "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",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "run-queue": {
-                                                                                                                                                                                                                    "version": "1.0.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "aproba": "^1.1.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "rx-lite": {
-                                                                                                                                                                                                                    "version": "3.1.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "rxjs": {
-                                                                                                                                                                                                                    "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"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "rxjs-spy": {
-                                                                                                                                                                                                                    "version": "7.5.1",
-                                                                                                                                                                                                                    "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.0",
-                                                                                                                                                                                                                      "error-stack-parser": "^2.0.1",
-                                                                                                                                                                                                                      "stacktrace-gps": "^3.0.2"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "rxjs-tslint": {
-                                                                                                                                                                                                                    "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",
-                                                                                                                                                                                                                      "tslint": "^5.9.1",
-                                                                                                                                                                                                                      "tsutils": "^2.25.0",
-                                                                                                                                                                                                                      "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",
-                                                                                                                                                                                                                        "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "rxjs-websockets": {
-                                                                                                                                                                                                                    "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",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "safe-regex": {
-                                                                                                                                                                                                                    "version": "1.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "ret": "~0.1.10"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "safer-buffer": {
-                                                                                                                                                                                                                    "version": "2.1.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "sass": {
-                                                                                                                                                                                                                    "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"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "sass-lint": {
-                                                                                                                                                                                                                    "version": "1.13.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/sass-lint/-/sass-lint-1.13.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-DSyah8/MyjzW2BWYmQWekYEKir44BpLqrCFsgs9iaWiVTcwZfwXHF586hh3D1n+/9ihUNMfd8iHAyb9KkGgs7Q==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "commander": "^2.8.1",
-                                                                                                                                                                                                                      "eslint": "^2.7.0",
-                                                                                                                                                                                                                      "front-matter": "2.1.2",
-                                                                                                                                                                                                                      "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": {
-                                                                                                                                                                                                                        "version": "3.0.1",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "graceful-fs": "^4.1.2",
-                                                                                                                                                                                                                          "jsonfile": "^3.0.0",
-                                                                                                                                                                                                                          "universalify": "^0.1.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "inherits": {
-                                                                                                                                                                                                                        "version": "2.0.3",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "jsonfile": {
-                                                                                                                                                                                                                        "version": "3.0.1",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "graceful-fs": "^4.1.6"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "util": {
-                                                                                                                                                                                                                        "version": "0.10.4",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "inherits": "2.0.3"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "sass-loader": {
-                                                                                                                                                                                                                    "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.2.3",
-                                                                                                                                                                                                                      "neo-async": "^2.6.1",
-                                                                                                                                                                                                                      "schema-utils": "^2.6.1",
-                                                                                                                                                                                                                      "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "semver": {
-                                                                                                                                                                                                                        "version": "6.3.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "saucelabs": {
-                                                                                                                                                                                                                    "version": "1.5.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.5.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==",
-                                                                                                                                                                                                                    "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": "1.2.4",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "schema-utils": {
-                                                                                                                                                                                                                    "version": "2.7.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "@types/json-schema": "^7.0.4",
-                                                                                                                                                                                                                      "ajv": "^6.12.2",
-                                                                                                                                                                                                                      "ajv-keywords": "^3.4.1"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "ajv": {
-                                                                                                                                                                                                                        "version": "6.12.2",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "select-hose": {
-                                                                                                                                                                                                                    "version": "2.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "selenium-webdriver": {
-                                                                                                                                                                                                                    "version": "3.6.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "jszip": "^3.1.3",
-                                                                                                                                                                                                                      "rimraf": "^2.5.4",
-                                                                                                                                                                                                                      "tmp": "0.0.30",
-                                                                                                                                                                                                                      "xml2js": "^0.4.17"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "tmp": {
-                                                                                                                                                                                                                        "version": "0.0.30",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "os-tmpdir": "~1.0.1"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "selfsigned": {
-                                                                                                                                                                                                                    "version": "1.10.7",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "node-forge": "0.9.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "semver": {
-                                                                                                                                                                                                                    "version": "5.6.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "semver-diff": {
-                                                                                                                                                                                                                    "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": "^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": {
-                                                                                                                                                                                                                    "version": "1.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/semver-dsl/-/semver-dsl-1.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "semver": "^5.3.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "semver-greatest-satisfied-range": {
-                                                                                                                                                                                                                    "version": "1.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "sver-compat": "^1.5.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "semver-intersect": {
-                                                                                                                                                                                                                    "version": "1.4.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/semver-intersect/-/semver-intersect-1.4.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "semver": "^5.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "send": {
-                                                                                                                                                                                                                    "version": "0.17.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
-                                                                                                                                                                                                                    "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",
-                                                                                                                                                                                                                      "fresh": "0.5.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"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "ms": {
-                                                                                                                                                                                                                        "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
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "serialize-javascript": {
-                                                                                                                                                                                                                    "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": {
-                                                                                                                                                                                                                    "version": "1.9.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "accepts": "~1.3.4",
-                                                                                                                                                                                                                      "batch": "0.6.1",
-                                                                                                                                                                                                                      "debug": "2.6.9",
-                                                                                                                                                                                                                      "escape-html": "~1.0.3",
-                                                                                                                                                                                                                      "http-errors": "~1.6.2",
-                                                                                                                                                                                                                      "mime-types": "~2.1.17",
-                                                                                                                                                                                                                      "parseurl": "~1.3.2"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "http-errors": {
-                                                                                                                                                                                                                        "version": "1.6.3",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "depd": "~1.1.2",
-                                                                                                                                                                                                                          "inherits": "2.0.3",
-                                                                                                                                                                                                                          "setprototypeof": "1.1.0",
-                                                                                                                                                                                                                          "statuses": ">= 1.4.0 < 2"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "inherits": {
-                                                                                                                                                                                                                        "version": "2.0.3",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "setprototypeof": {
-                                                                                                                                                                                                                        "version": "1.1.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "serve-static": {
-                                                                                                                                                                                                                    "version": "1.14.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "encodeurl": "~1.0.2",
-                                                                                                                                                                                                                      "escape-html": "~1.0.3",
-                                                                                                                                                                                                                      "parseurl": "~1.3.3",
-                                                                                                                                                                                                                      "send": "0.17.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "set-blocking": {
-                                                                                                                                                                                                                    "version": "2.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "set-immediate-shim": {
-                                                                                                                                                                                                                    "version": "1.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "set-value": {
-                                                                                                                                                                                                                    "version": "2.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "extend-shallow": "^2.0.1",
-                                                                                                                                                                                                                      "is-extendable": "^0.1.1",
-                                                                                                                                                                                                                      "is-plain-object": "^2.0.3",
-                                                                                                                                                                                                                      "split-string": "^3.0.1"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "extend-shallow": {
-                                                                                                                                                                                                                        "version": "2.0.1",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "is-extendable": "^0.1.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "setimmediate": {
-                                                                                                                                                                                                                    "version": "1.0.5",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "setprototypeof": {
-                                                                                                                                                                                                                    "version": "1.1.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "sha.js": {
-                                                                                                                                                                                                                    "version": "2.4.11",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "inherits": "^2.0.1",
-                                                                                                                                                                                                                      "safe-buffer": "^5.0.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "shallow-clone": {
-                                                                                                                                                                                                                    "version": "3.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "kind-of": "^6.0.2"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "shebang-command": {
-                                                                                                                                                                                                                    "version": "1.2.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "shebang-regex": "^1.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "shebang-regex": {
-                                                                                                                                                                                                                    "version": "1.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "shell-quote": {
-                                                                                                                                                                                                                    "version": "1.7.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "signal-exit": {
-                                                                                                                                                                                                                    "version": "3.0.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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",
-                                                                                                                                                                                                                    "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "slice-ansi": {
-                                                                                                                                                                                                                    "version": "0.0.4",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "smart-buffer": {
-                                                                                                                                                                                                                    "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": {
-                                                                                                                                                                                                                    "version": "0.8.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "base": "^0.11.1",
-                                                                                                                                                                                                                      "debug": "^2.2.0",
-                                                                                                                                                                                                                      "define-property": "^0.2.5",
-                                                                                                                                                                                                                      "extend-shallow": "^2.0.1",
-                                                                                                                                                                                                                      "map-cache": "^0.2.2",
-                                                                                                                                                                                                                      "source-map": "^0.5.6",
-                                                                                                                                                                                                                      "source-map-resolve": "^0.5.0",
-                                                                                                                                                                                                                      "use": "^3.1.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "define-property": {
-                                                                                                                                                                                                                        "version": "0.2.5",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "is-descriptor": "^0.1.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "extend-shallow": {
-                                                                                                                                                                                                                        "version": "2.0.1",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "is-extendable": "^0.1.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "snapdragon-node": {
-                                                                                                                                                                                                                    "version": "2.1.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "define-property": "^1.0.0",
-                                                                                                                                                                                                                      "isobject": "^3.0.0",
-                                                                                                                                                                                                                      "snapdragon-util": "^3.0.1"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "define-property": {
-                                                                                                                                                                                                                        "version": "1.0.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "is-descriptor": "^1.0.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "is-accessor-descriptor": {
-                                                                                                                                                                                                                        "version": "1.0.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "kind-of": "^6.0.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "is-data-descriptor": {
-                                                                                                                                                                                                                        "version": "1.0.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "kind-of": "^6.0.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "is-descriptor": {
-                                                                                                                                                                                                                        "version": "1.0.2",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "is-accessor-descriptor": "^1.0.0",
-                                                                                                                                                                                                                          "is-data-descriptor": "^1.0.0",
-                                                                                                                                                                                                                          "kind-of": "^6.0.2"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "snapdragon-util": {
-                                                                                                                                                                                                                    "version": "3.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "kind-of": "^3.2.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "kind-of": {
-                                                                                                                                                                                                                        "version": "3.2.2",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "is-buffer": "^1.1.5"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "socket.io": {
-                                                                                                                                                                                                                    "version": "2.1.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "debug": "~3.1.0",
-                                                                                                                                                                                                                      "engine.io": "~3.2.0",
-                                                                                                                                                                                                                      "has-binary2": "~1.0.2",
-                                                                                                                                                                                                                      "socket.io-adapter": "~1.1.0",
-                                                                                                                                                                                                                      "socket.io-client": "2.1.1",
-                                                                                                                                                                                                                      "socket.io-parser": "~3.2.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "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": {
-                                                                                                                                                                                                                          "ms": "2.0.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "socket.io-adapter": {
-                                                                                                                                                                                                                    "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": {
-                                                                                                                                                                                                                    "version": "2.1.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "backo2": "1.0.2",
-                                                                                                                                                                                                                      "base64-arraybuffer": "0.1.5",
-                                                                                                                                                                                                                      "component-bind": "1.0.0",
-                                                                                                                                                                                                                      "component-emitter": "1.2.1",
-                                                                                                                                                                                                                      "debug": "~3.1.0",
-                                                                                                                                                                                                                      "engine.io-client": "~3.2.0",
-                                                                                                                                                                                                                      "has-binary2": "~1.0.2",
-                                                                                                                                                                                                                      "has-cors": "1.1.0",
-                                                                                                                                                                                                                      "indexof": "0.0.1",
-                                                                                                                                                                                                                      "object-component": "0.0.3",
-                                                                                                                                                                                                                      "parseqs": "0.0.5",
-                                                                                                                                                                                                                      "parseuri": "0.0.5",
-                                                                                                                                                                                                                      "socket.io-parser": "~3.2.0",
-                                                                                                                                                                                                                      "to-array": "0.1.4"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "component-emitter": {
-                                                                                                                                                                                                                        "version": "1.2.1",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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": {
-                                                                                                                                                                                                                          "ms": "2.0.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "socket.io-parser": {
-                                                                                                                                                                                                                    "version": "3.2.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "component-emitter": "1.2.1",
-                                                                                                                                                                                                                      "debug": "~3.1.0",
-                                                                                                                                                                                                                      "isarray": "2.0.1"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "component-emitter": {
-                                                                                                                                                                                                                        "version": "1.2.1",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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": {
-                                                                                                                                                                                                                          "ms": "2.0.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "isarray": {
-                                                                                                                                                                                                                        "version": "2.0.1",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "sockjs": {
-                                                                                                                                                                                                                    "version": "0.3.20",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "faye-websocket": "^0.10.0",
-                                                                                                                                                                                                                      "uuid": "^3.4.0",
-                                                                                                                                                                                                                      "websocket-driver": "0.6.5"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "uuid": {
-                                                                                                                                                                                                                        "version": "3.4.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "sockjs-client": {
-                                                                                                                                                                                                                    "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",
-                                                                                                                                                                                                                      "eventsource": "^1.0.7",
-                                                                                                                                                                                                                      "faye-websocket": "~0.11.1",
-                                                                                                                                                                                                                      "inherits": "^2.0.3",
-                                                                                                                                                                                                                      "json3": "^3.3.2",
-                                                                                                                                                                                                                      "url-parse": "^1.4.3"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "faye-websocket": {
-                                                                                                                                                                                                                        "version": "0.11.3",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "websocket-driver": ">=0.5.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
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "socks": {
-                                                                                                                                                                                                                    "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.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==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "agent-base": "~4.2.1",
-                                                                                                                                                                                                                      "socks": "~2.3.2"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "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==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "es6-promisify": "^5.0.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "sort-keys": {
-                                                                                                                                                                                                                    "version": "1.1.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "is-plain-obj": "^1.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "source-list-map": {
-                                                                                                                                                                                                                    "version": "2.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "source-map": {
-                                                                                                                                                                                                                    "version": "0.5.6",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "source-map-loader": {
-                                                                                                                                                                                                                    "version": "0.2.4",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.4.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "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": {
-                                                                                                                                                                                                                    "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==",
-                                                                                                                                                                                                                    <<
-                                                                                                                                                                                                                    << << < HEAD ===
-                                                                                                                                                                                                                    === =
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    >>>
-                                                                                                                                                                                                                    >>> > upstream / master "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"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "source-map-support": {
-                                                                                                                                                                                                                    "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",
-                                                                                                                                                                                                                      "source-map": "^0.6.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
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "sourcemap-codec": {
-                                                                                                                                                                                                                    "version": "1.4.8",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "sparkles": {
-                                                                                                                                                                                                                    "version": "1.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
-                                                                                                                                                                                                                    "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",
-                                                                                                                                                                                                                    "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "spdx-expression-parse": "^3.0.0",
-                                                                                                                                                                                                                      "spdx-license-ids": "^3.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "spdx-exceptions": {
-                                                                                                                                                                                                                    "version": "2.2.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "spdx-expression-parse": {
-                                                                                                                                                                                                                    "version": "3.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "spdx-exceptions": "^2.1.0",
-                                                                                                                                                                                                                      "spdx-license-ids": "^3.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "spdx-license-ids": {
-                                                                                                                                                                                                                    "version": "3.0.5",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "spdy": {
-                                                                                                                                                                                                                    "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",
-                                                                                                                                                                                                                      "handle-thing": "^2.0.0",
-                                                                                                                                                                                                                      "http-deceiver": "^1.2.7",
-                                                                                                                                                                                                                      "select-hose": "^2.0.0",
-                                                                                                                                                                                                                      "spdy-transport": "^3.0.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.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
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "spdy-transport": {
-                                                                                                                                                                                                                    "version": "3.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "debug": "^4.1.0",
-                                                                                                                                                                                                                      "detect-node": "^2.0.4",
-                                                                                                                                                                                                                      "hpack.js": "^2.1.6",
-                                                                                                                                                                                                                      "obuf": "^1.1.2",
-                                                                                                                                                                                                                      "readable-stream": "^3.0.6",
-                                                                                                                                                                                                                      "wbuf": "^1.7.3"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "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
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "speed-measure-webpack-plugin": {
-                                                                                                                                                                                                                    "version": "1.3.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "chalk": "^2.0.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "split": {
-                                                                                                                                                                                                                    "version": "0.3.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "through": "2"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "split-string": {
-                                                                                                                                                                                                                    "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==",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "extend-shallow": "^3.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "sprintf-js": {
-                                                                                                                                                                                                                    "version": "1.0.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "sshpk": {
-                                                                                                                                                                                                                    "version": "1.16.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "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": {
-                                                                                                                                                                                                                    "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": {
-                                                                                                                                                                                                                      "minipass": "^3.1.1"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "minipass": {
-                                                                                                                                                                                                                        "version": "3.1.3",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "yallist": "^4.0.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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",
-                                                                                                                                                                                                                    "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "stackframe": {
-                                                                                                                                                                                                                    "version": "1.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-Vx6W1Yvy+AM1R/ckVwcHQHV147pTPBKWCRLrXMuPrFVfvBUc3os7PR1QLIWCMhPpRg5eX9ojzbQIMLGBwyLjqg=="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "stacktrace-gps": {
-                                                                                                                                                                                                                    "version": "3.0.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-3.0.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-51Rr7dXkyFUKNmhY/vqZWK+EvdsfFSRiQVtgHTFlAdNIYaDD7bVh21yBHXaNWAvTD+w+QSjxHg7/v6Tz4veExA==",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "source-map": "0.5.6",
-                                                                                                                                                                                                                      "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=",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "define-property": "^0.2.5",
-                                                                                                                                                                                                                      "object-copy": "^0.1.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "define-property": {
-                                                                                                                                                                                                                        "version": "0.2.5",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "is-descriptor": "^0.1.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "statuses": {
-                                                                                                                                                                                                                    "version": "1.5.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "stdin": {
-                                                                                                                                                                                                                    "version": "0.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/stdin/-/stdin-0.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-0wQZgarsPf28d6GzjWNy449ftx4=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "stealthy-require": {
-                                                                                                                                                                                                                    "version": "1.1.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "stratos-protractor-reporter": {
-                                                                                                                                                                                                                    "version": "1.2.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/stratos-protractor-reporter/-/stratos-protractor-reporter-1.2.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-e87eX4LB+KLVOfEF/TeWpNYM9aQFJTO+jsslym7zCZLYd8xlNWZUjmUf00J0DWn7YpoNGdjv0wzkKPcXJ2c5uw==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "circular-json": "^0.3.1",
-                                                                                                                                                                                                                      "fs-extra": "^3.0.1",
-                                                                                                                                                                                                                      "klaw-sync": "^2.1.0",
-                                                                                                                                                                                                                      "mkdirp": "~0.3.5",
-                                                                                                                                                                                                                      "underscore": "~1.6.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "circular-json": {
-                                                                                                                                                                                                                        "version": "0.3.3",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "fs-extra": {
-                                                                                                                                                                                                                        "version": "3.0.1",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "graceful-fs": "^4.1.2",
-                                                                                                                                                                                                                          "jsonfile": "^3.0.0",
-                                                                                                                                                                                                                          "universalify": "^0.1.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "jsonfile": {
-                                                                                                                                                                                                                        "version": "3.0.1",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "graceful-fs": "^4.1.6"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "mkdirp": {
-                                                                                                                                                                                                                        "version": "0.3.5",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "stream-browserify": {
-                                                                                                                                                                                                                    "version": "2.0.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "inherits": "~2.0.1",
-                                                                                                                                                                                                                      "readable-stream": "^2.0.2"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "stream-combiner": {
-                                                                                                                                                                                                                    "version": "0.0.4",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "duplexer": "~0.1.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "stream-each": {
-                                                                                                                                                                                                                    "version": "1.2.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "end-of-stream": "^1.1.0",
-                                                                                                                                                                                                                      "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",
-                                                                                                                                                                                                                    "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "stream-http": {
-                                                                                                                                                                                                                    "version": "2.8.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "builtin-status-codes": "^3.0.0",
-                                                                                                                                                                                                                      "inherits": "^2.0.1",
-                                                                                                                                                                                                                      "readable-stream": "^2.3.6",
-                                                                                                                                                                                                                      "to-arraybuffer": "^1.0.0",
-                                                                                                                                                                                                                      "xtend": "^4.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "stream-shift": {
-                                                                                                                                                                                                                    "version": "1.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
-                                                                                                                                                                                                                    "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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",
-                                                                                                                                                                                                                        "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "strict-uri-encode": {
-                                                                                                                                                                                                                    "version": "1.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "string-width": {
-                                                                                                                                                                                                                    "version": "1.0.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "code-point-at": "^1.0.0",
-                                                                                                                                                                                                                      "is-fullwidth-code-point": "^1.0.0",
-                                                                                                                                                                                                                      "strip-ansi": "^3.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "string.prototype.padend": {
-                                                                                                                                                                                                                    "version": "3.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "define-properties": "^1.1.2",
-                                                                                                                                                                                                                      "es-abstract": "^1.4.3",
-                                                                                                                                                                                                                      "function-bind": "^1.0.2"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "string.prototype.trimend": {
-                                                                                                                                                                                                                    "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",
-                                                                                                                                                                                                                      "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.2.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "is-regex": {
-                                                                                                                                                                                                                        "version": "1.1.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "has-symbols": "^1.0.1"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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",
-                                                                                                                                                                                                                    "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "define-properties": "^1.1.3",
-                                                                                                                                                                                                                      "function-bind": "^1.1.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "string.prototype.trimright": {
-                                                                                                                                                                                                                    "version": "2.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "define-properties": "^1.1.3",
-                                                                                                                                                                                                                      "function-bind": "^1.1.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "string.prototype.trimstart": {
-                                                                                                                                                                                                                    "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",
-                                                                                                                                                                                                                      "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.2.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "is-regex": {
-                                                                                                                                                                                                                        "version": "1.1.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "has-symbols": "^1.0.1"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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",
-                                                                                                                                                                                                                    "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "safe-buffer": "~5.1.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "strip-ansi": {
-                                                                                                                                                                                                                    "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"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "strip-bom": {
-                                                                                                                                                                                                                    "version": "2.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "is-utf8": "^0.2.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "strip-eof": {
-                                                                                                                                                                                                                    "version": "1.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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",
-                                                                                                                                                                                                                    "integrity": "sha512-rlkH7X/22yuwFYK357fMN/BxYOorfnfq0eD7+vqlemSK4wEcejFF1dg4zxP0euBW8NrYx2WZzZ8PPFevr7D+Kw==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "loader-utils": "^1.2.3",
-                                                                                                                                                                                                                      "schema-utils": "^2.6.4"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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": {
-                                                                                                                                                                                                                      "browserslist": "^4.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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "sax": {
-                                                                                                                                                                                                                        "version": "0.5.8",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE="
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "semver": {
-                                                                                                                                                                                                                        "version": "6.3.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "source-map": {
-                                                                                                                                                                                                                        "version": "0.7.3",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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": {
-                                                                                                                                                                                                                          "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
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "stylus-loader": {
-                                                                                                                                                                                                                    "version": "3.0.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "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": {
-                                                                                                                                                                                                                    "version": "6.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "has-flag": "^3.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "sver-compat": {
-                                                                                                                                                                                                                    "version": "1.5.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "es6-iterator": "^2.0.1",
-                                                                                                                                                                                                                      "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",
-                                                                                                                                                                                                                    "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "table": {
-                                                                                                                                                                                                                    "version": "3.8.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/table/-/table-3.8.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "ajv": "^4.7.0",
-                                                                                                                                                                                                                      "ajv-keywords": "^1.0.0",
-                                                                                                                                                                                                                      "chalk": "^1.1.1",
-                                                                                                                                                                                                                      "lodash": "^4.0.0",
-                                                                                                                                                                                                                      "slice-ansi": "0.0.4",
-                                                                                                                                                                                                                      "string-width": "^2.0.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "ajv": {
-                                                                                                                                                                                                                        "version": "4.11.8",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "co": "^4.6.0",
-                                                                                                                                                                                                                          "json-stable-stringify": "^1.0.1"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "ajv-keywords": {
-                                                                                                                                                                                                                        "version": "1.5.1",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "ansi-regex": {
-                                                                                                                                                                                                                        "version": "3.0.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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"
-                                                                                                                                                                                                                        },
-                                                                                                                                                                                                                        "dependencies": {
-                                                                                                                                                                                                                          "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"
-                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                          }
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "table-parser": {
-                                                                                                                                                                                                                    "version": "0.1.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/table-parser/-/table-parser-0.1.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-BEHPzhallIFoTCfRtaZ/8VpDx7A=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "connected-domain": "^1.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "tapable": {
-                                                                                                                                                                                                                    "version": "1.1.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "tar": {
-                                                                                                                                                                                                                    "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": "^2.0.0",
-                                                                                                                                                                                                                      "fs-minipass": "^2.0.0",
-                                                                                                                                                                                                                      "minipass": "^3.0.0",
-                                                                                                                                                                                                                      "minizlib": "^2.1.0",
-                                                                                                                                                                                                                      "mkdirp": "^1.0.3",
-                                                                                                                                                                                                                      "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
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "minipass": {
-                                                                                                                                                                                                                        "version": "3.1.3",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "yallist": "^4.0.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "mkdirp": {
-                                                                                                                                                                                                                        "version": "1.0.4",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "teeny-request": {
-                                                                                                                                                                                                                    "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": {
-                                                                                                                                                                                                                      "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": {
-                                                                                                                                                                                                                    "version": "0.9.9",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/temp-fs/-/temp-fs-0.9.9.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-gHFzBDeHByDpQxUy/igUNk+IA9c=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "rimraf": "~2.5.2"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "rimraf": {
-                                                                                                                                                                                                                        "version": "2.5.4",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-loAAk8vxoMhr2VtGJUZ1NcKd+gQ=",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "glob": "^7.0.5"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "term-size": {
-                                                                                                                                                                                                                    "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.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
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "terser-webpack-plugin": {
-                                                                                                                                                                                                                    "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": "^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.4.3",
-                                                                                                                                                                                                                      "webpack-sources": "^1.4.3"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "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": {
-                                                                                                                                                                                                                          "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "minipass": {
-                                                                                                                                                                                                                        "version": "3.1.3",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "yallist": "^4.0.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-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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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",
-                                                                                                                                                                                                                    "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "thenify": {
-                                                                                                                                                                                                                    <<
-                                                                                                                                                                                                                    << << < HEAD "version": "3.3.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
-                                                                                                                                                                                                                    ===
-                                                                                                                                                                                                                    === =
-                                                                                                                                                                                                                    "version": "3.3.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=",
-                                                                                                                                                                                                                    >>>
-                                                                                                                                                                                                                    >>> > upstream / master "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "any-promise": "^1.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "thenify-all": {
-                                                                                                                                                                                                                    "version": "1.6.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "thenify": ">= 3.1.0 < 4"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "through": {
-                                                                                                                                                                                                                    "version": "2.3.8",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "through2": {
-                                                                                                                                                                                                                    "version": "2.0.5",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "readable-stream": "~2.3.6",
-                                                                                                                                                                                                                      "xtend": "~4.0.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "through2-filter": {
-                                                                                                                                                                                                                    "version": "3.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "through2": "~2.0.0",
-                                                                                                                                                                                                                      "xtend": "~4.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "thunky": {
-                                                                                                                                                                                                                    "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": {
-                                                                                                                                                                                                                    "version": "1.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "timers-browserify": {
-                                                                                                                                                                                                                    "version": "2.0.11",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "setimmediate": "^1.0.4"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "timers-ext": {
-                                                                                                                                                                                                                    "version": "0.1.7",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "es5-ext": "~0.10.46",
-                                                                                                                                                                                                                      "next-tick": "1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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",
-                                                                                                                                                                                                                    "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "os-tmpdir": "~1.0.2"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "to-absolute-glob": {
-                                                                                                                                                                                                                    "version": "2.0.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "is-absolute": "^1.0.0",
-                                                                                                                                                                                                                      "is-negated-glob": "^1.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "to-array": {
-                                                                                                                                                                                                                    "version": "0.1.4",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "to-arraybuffer": {
-                                                                                                                                                                                                                    "version": "1.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "to-object-path": {
-                                                                                                                                                                                                                    "version": "0.3.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "kind-of": "^3.0.2"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "kind-of": {
-                                                                                                                                                                                                                        "version": "3.2.2",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "is-buffer": "^1.1.5"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "to-readable-stream": {
-                                                                                                                                                                                                                    "version": "1.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "to-regex": {
-                                                                                                                                                                                                                    "version": "3.0.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "define-property": "^2.0.2",
-                                                                                                                                                                                                                      "extend-shallow": "^3.0.2",
-                                                                                                                                                                                                                      "regex-not": "^1.0.2",
-                                                                                                                                                                                                                      "safe-regex": "^1.1.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": {
-                                                                                                                                                                                                                      "is-number": "^7.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "to-through": {
-                                                                                                                                                                                                                    "version": "2.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "through2": "^2.0.3"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "toidentifier": {
-                                                                                                                                                                                                                    "version": "1.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "tough-cookie": {
-                                                                                                                                                                                                                    "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.28",
-                                                                                                                                                                                                                      "punycode": "^2.1.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "transformation-matrix": {
-                                                                                                                                                                                                                    "version": "1.15.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/transformation-matrix/-/transformation-matrix-1.15.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-ThJH58GNFKhCw3gIoOtwf3tNwuYjbyEeiGdeq4mNMYWdJctnI896KUqn6PVt7jmNVepqa1bcKQtnMB1HtjsDMA=="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "tree-kill": {
-                                                                                                                                                                                                                    "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.7",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/ts-md5/-/ts-md5-1.2.7.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-emODogvKGWi1KO1l9c6YxLMBn6CEH3VrH5mVPIyOtxBG52BvV4jP3GWz6bOZCz61nLgBc3ffQYE4+EHfCD+V7w=="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "ts-node": {
-                                                                                                                                                                                                                    "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.1.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "tslib": {
-                                                                                                                                                                                                                    "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.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-UyNrLdK3E0fQG/xWNqAFAC5ugtFyPO4JJR1KyyfQAyzR8W0fTRrC91A8Wej4BntFzcvETdCSDa/4PnNYJQLYiA==",
-                                                                                                                                                                                                                    "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.3",
-                                                                                                                                                                                                                      "resolve": "^1.3.2",
-                                                                                                                                                                                                                      "semver": "^5.3.0",
-                                                                                                                                                                                                                      "tslib": "^1.10.0",
-                                                                                                                                                                                                                      "tsutils": "^2.29.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "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
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "tsutils": {
-                                                                                                                                                                                                                    "version": "2.29.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "tslib": "^1.8.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "tty-browserify": {
-                                                                                                                                                                                                                    "version": "0.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "tunnel-agent": {
-                                                                                                                                                                                                                    "version": "0.6.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "safe-buffer": "^5.0.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "tweetnacl": {
-                                                                                                                                                                                                                    "version": "0.14.5",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "type": {
-                                                                                                                                                                                                                    "version": "1.2.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "type-check": {
-                                                                                                                                                                                                                    "version": "0.3.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "prelude-ls": "~1.1.2"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "type-fest": {
-                                                                                                                                                                                                                    "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": {
-                                                                                                                                                                                                                    "version": "1.6.18",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "media-typer": "0.3.0",
-                                                                                                                                                                                                                      "mime-types": "~2.1.24"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "typedarray": {
-                                                                                                                                                                                                                    "version": "0.0.6",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-                                                                                                                                                                                                                    "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.8.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz",
-                                                                                                                                                                                                                    "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.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",
-                                                                                                                                                                                                                    "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "unc-path-regex": {
-                                                                                                                                                                                                                    "version": "0.1.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "underscore": {
-                                                                                                                                                                                                                    "version": "1.6.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "undertaker": {
-                                                                                                                                                                                                                    "version": "1.2.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "arr-flatten": "^1.0.1",
-                                                                                                                                                                                                                      "arr-map": "^2.0.0",
-                                                                                                                                                                                                                      "bach": "^1.0.0",
-                                                                                                                                                                                                                      "collection-map": "^1.0.0",
-                                                                                                                                                                                                                      "es6-weak-map": "^2.0.1",
-                                                                                                                                                                                                                      "last-run": "^1.1.0",
-                                                                                                                                                                                                                      "object.defaults": "^1.0.0",
-                                                                                                                                                                                                                      "object.reduce": "^1.0.0",
-                                                                                                                                                                                                                      "undertaker-registry": "^1.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "undertaker-registry": {
-                                                                                                                                                                                                                    "version": "1.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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==",
-                                                                                                                                                                                                                    "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.4"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "unicode-match-property-value-ecmascript": {
-                                                                                                                                                                                                                    "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.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": {
-                                                                                                                                                                                                                    "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==",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "arr-union": "^3.1.0",
-                                                                                                                                                                                                                      "get-value": "^2.0.6",
-                                                                                                                                                                                                                      "is-extendable": "^0.1.1",
-                                                                                                                                                                                                                      "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",
-                                                                                                                                                                                                                    "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "unique-slug": "^2.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "unique-slug": {
-                                                                                                                                                                                                                    "version": "2.0.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "imurmurhash": "^0.1.4"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "unique-stream": {
-                                                                                                                                                                                                                    "version": "2.3.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "json-stable-stringify-without-jsonify": "^1.0.1",
-                                                                                                                                                                                                                      "through2-filter": "^3.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "unique-string": {
-                                                                                                                                                                                                                    "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": "^2.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "universal-analytics": {
-                                                                                                                                                                                                                    "version": "0.4.20",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.20.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "debug": "^3.0.0",
-                                                                                                                                                                                                                      "request": "^2.88.0",
-                                                                                                                                                                                                                      "uuid": "^3.0.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "universalify": {
-                                                                                                                                                                                                                    "version": "0.1.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "unpipe": {
-                                                                                                                                                                                                                    "version": "1.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-                                                                                                                                                                                                                    "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",
-                                                                                                                                                                                                                    "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "has-value": "^0.3.1",
-                                                                                                                                                                                                                      "isobject": "^3.0.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "has-value": {
-                                                                                                                                                                                                                        "version": "0.3.1",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "get-value": "^2.0.3",
-                                                                                                                                                                                                                          "has-values": "^0.1.4",
-                                                                                                                                                                                                                          "isobject": "^2.0.0"
-                                                                                                                                                                                                                        },
-                                                                                                                                                                                                                        "dependencies": {
-                                                                                                                                                                                                                          "isobject": {
-                                                                                                                                                                                                                            "version": "2.1.0",
-                                                                                                                                                                                                                            "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-                                                                                                                                                                                                                            "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-                                                                                                                                                                                                                            "requires": {
-                                                                                                                                                                                                                              "isarray": "1.0.0"
-                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                          }
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "has-values": {
-                                                                                                                                                                                                                        "version": "0.1.4",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "upath": {
-                                                                                                                                                                                                                    "version": "1.2.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "update-notifier": {
-                                                                                                                                                                                                                    "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": "^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.3.1",
-                                                                                                                                                                                                                      "is-npm": "^4.0.0",
-                                                                                                                                                                                                                      "is-yarn-global": "^0.3.0",
-                                                                                                                                                                                                                      "latest-version": "^5.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==",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "punycode": "^2.1.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "urix": {
-                                                                                                                                                                                                                    "version": "0.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "url": {
-                                                                                                                                                                                                                    "version": "0.11.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "punycode": "1.3.2",
-                                                                                                                                                                                                                      "querystring": "0.2.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "punycode": {
-                                                                                                                                                                                                                        "version": "1.3.2",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "url-parse": {
-                                                                                                                                                                                                                    "version": "1.4.7",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "querystringify": "^2.1.1",
-                                                                                                                                                                                                                      "requires-port": "^1.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "url-parse-lax": {
-                                                                                                                                                                                                                    "version": "3.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "prepend-http": "^2.0.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "prepend-http": {
-                                                                                                                                                                                                                        "version": "2.0.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "urlgrey": {
-                                                                                                                                                                                                                    "version": "0.4.4",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/urlgrey/-/urlgrey-0.4.4.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-iS/pWWCAXoVRnxzUOJ8stMu3ZS8=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "use": {
-                                                                                                                                                                                                                    "version": "3.1.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "user-home": {
-                                                                                                                                                                                                                    "version": "2.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "os-homedir": "^1.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "util": {
-                                                                                                                                                                                                                    "version": "0.11.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "inherits": "2.0.3"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "inherits": {
-                                                                                                                                                                                                                        "version": "2.0.3",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "util-deprecate": {
-                                                                                                                                                                                                                    "version": "1.0.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "util-promisify": {
-                                                                                                                                                                                                                    "version": "2.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/util-promisify/-/util-promisify-2.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "object.getownpropertydescriptors": "^2.0.3"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "util.promisify": {
-                                                                                                                                                                                                                    "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.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.2.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "is-regex": {
-                                                                                                                                                                                                                        "version": "1.1.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "has-symbols": "^1.0.1"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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": {
-                                                                                                                                                                                                                    "version": "1.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "uuid": {
-                                                                                                                                                                                                                    "version": "3.3.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "validate-npm-package-license": {
-                                                                                                                                                                                                                    "version": "3.0.4",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "spdx-correct": "^3.0.0",
-                                                                                                                                                                                                                      "spdx-expression-parse": "^3.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "validate-npm-package-name": {
-                                                                                                                                                                                                                    "version": "3.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "builtins": "^1.0.3"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "value-or-function": {
-                                                                                                                                                                                                                    "version": "3.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "vary": {
-                                                                                                                                                                                                                    "version": "1.1.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-                                                                                                                                                                                                                    "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",
-                                                                                                                                                                                                                    "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "assert-plus": "^1.0.0",
-                                                                                                                                                                                                                      "core-util-is": "1.0.2",
-                                                                                                                                                                                                                      "extsprintf": "^1.2.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "vinyl": {
-                                                                                                                                                                                                                    "version": "2.2.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "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": {
-                                                                                                                                                                                                                    "version": "3.0.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "fs-mkdirp-stream": "^1.0.0",
-                                                                                                                                                                                                                      "glob-stream": "^6.1.0",
-                                                                                                                                                                                                                      "graceful-fs": "^4.0.0",
-                                                                                                                                                                                                                      "is-valid-glob": "^1.0.0",
-                                                                                                                                                                                                                      "lazystream": "^1.0.0",
-                                                                                                                                                                                                                      "lead": "^1.0.0",
-                                                                                                                                                                                                                      "object.assign": "^4.0.4",
-                                                                                                                                                                                                                      "pumpify": "^1.3.5",
-                                                                                                                                                                                                                      "readable-stream": "^2.3.3",
-                                                                                                                                                                                                                      "remove-bom-buffer": "^3.0.0",
-                                                                                                                                                                                                                      "remove-bom-stream": "^1.2.0",
-                                                                                                                                                                                                                      "resolve-options": "^1.1.0",
-                                                                                                                                                                                                                      "through2": "^2.0.0",
-                                                                                                                                                                                                                      "to-through": "^2.0.0",
-                                                                                                                                                                                                                      "value-or-function": "^3.0.0",
-                                                                                                                                                                                                                      "vinyl": "^2.0.0",
-                                                                                                                                                                                                                      "vinyl-sourcemap": "^1.1.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "is-valid-glob": {
-                                                                                                                                                                                                                        "version": "1.0.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "vinyl-sourcemap": {
-                                                                                                                                                                                                                    "version": "1.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "append-buffer": "^1.0.2",
-                                                                                                                                                                                                                      "convert-source-map": "^1.5.0",
-                                                                                                                                                                                                                      "graceful-fs": "^4.1.6",
-                                                                                                                                                                                                                      "normalize-path": "^2.1.1",
-                                                                                                                                                                                                                      "now-and-later": "^2.0.0",
-                                                                                                                                                                                                                      "remove-bom-buffer": "^3.0.0",
-                                                                                                                                                                                                                      "vinyl": "^2.0.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "vm-browserify": {
-                                                                                                                                                                                                                    "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": {
-                                                                                                                                                                                                                    "version": "2.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "watchpack": {
-                                                                                                                                                                                                                    "version": "1.7.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "chokidar": "^3.4.0",
-                                                                                                                                                                                                                      "graceful-fs": "^4.1.2",
-                                                                                                                                                                                                                      "neo-async": "^2.5.0",
-                                                                                                                                                                                                                      "watchpack-chokidar2": "^2.0.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "anymatch": {
-                                                                                                                                                                                                                        "version": "3.1.1",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "optional": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "normalize-path": "^3.0.0",
-                                                                                                                                                                                                                          "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,
-                                                                                                                                                                                                                        "optional": 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,
-                                                                                                                                                                                                                        "optional": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "fill-range": "^7.0.1"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "chokidar": {
-                                                                                                                                                                                                                        "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,
-                                                                                                                                                                                                                        "optional": 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.4.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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,
-                                                                                                                                                                                                                        "optional": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "to-regex-range": "^5.0.1"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      <<
-                                                                                                                                                                                                                      << << < HEAD ===
-                                                                                                                                                                                                                      === =
-                                                                                                                                                                                                                      "fsevents": {
-                                                                                                                                                                                                                        "version": "2.1.3",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "optional": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      >>>
-                                                                                                                                                                                                                      >>> > upstream / master "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,
-                                                                                                                                                                                                                        "optional": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "is-glob": "^4.0.1"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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,
-                                                                                                                                                                                                                        "optional": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "binary-extensions": "^2.0.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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,
-                                                                                                                                                                                                                        "optional": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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,
-                                                                                                                                                                                                                        "optional": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "readdirp": {
-                                                                                                                                                                                                                        "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,
-                                                                                                                                                                                                                        "optional": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "picomatch": "^2.2.1"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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,
-                                                                                                                                                                                                                        "optional": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "is-number": "^7.0.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "watchpack-chokidar2": {
-                                                                                                                                                                                                                    "version": "2.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "optional": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "chokidar": "^2.1.8"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "chokidar": {
-                                                                                                                                                                                                                        "version": "2.1.8",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "optional": 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"
-                                                                                                                                                                                                                        },
-                                                                                                                                                                                                                        "dependencies": {
-                                                                                                                                                                                                                          "anymatch": {
-                                                                                                                                                                                                                            "version": "2.0.0",
-                                                                                                                                                                                                                            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-                                                                                                                                                                                                                            "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-                                                                                                                                                                                                                            "dev": true,
-                                                                                                                                                                                                                            "optional": true,
-                                                                                                                                                                                                                            "requires": {
-                                                                                                                                                                                                                              "micromatch": "^3.1.4",
-                                                                                                                                                                                                                              "normalize-path": "^2.1.1"
-                                                                                                                                                                                                                            },
-                                                                                                                                                                                                                            "dependencies": {
-                                                                                                                                                                                                                              "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,
-                                                                                                                                                                                                                                "optional": true,
-                                                                                                                                                                                                                                "requires": {
-                                                                                                                                                                                                                                  "remove-trailing-separator": "^1.0.1"
-                                                                                                                                                                                                                                }
-                                                                                                                                                                                                                              }
-                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                          },
-                                                                                                                                                                                                                          "braces": {
-                                                                                                                                                                                                                            "version": "2.3.2",
-                                                                                                                                                                                                                            "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-                                                                                                                                                                                                                            "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-                                                                                                                                                                                                                            "dev": true,
-                                                                                                                                                                                                                            "optional": true,
-                                                                                                                                                                                                                            "requires": {
-                                                                                                                                                                                                                              "arr-flatten": "^1.1.0",
-                                                                                                                                                                                                                              "array-unique": "^0.3.2",
-                                                                                                                                                                                                                              "extend-shallow": "^2.0.1",
-                                                                                                                                                                                                                              "fill-range": "^4.0.0",
-                                                                                                                                                                                                                              "isobject": "^3.0.1",
-                                                                                                                                                                                                                              "repeat-element": "^1.1.2",
-                                                                                                                                                                                                                              "snapdragon": "^0.8.1",
-                                                                                                                                                                                                                              "snapdragon-node": "^2.0.1",
-                                                                                                                                                                                                                              "split-string": "^3.0.2",
-                                                                                                                                                                                                                              "to-regex": "^3.0.1"
-                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                          },
-                                                                                                                                                                                                                          <<
-                                                                                                                                                                                                                          << << < HEAD ===
-                                                                                                                                                                                                                          === =
-                                                                                                                                                                                                                          "fsevents": {
-                                                                                                                                                                                                                            "version": "1.2.13",
-                                                                                                                                                                                                                            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-                                                                                                                                                                                                                            "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-                                                                                                                                                                                                                            "dev": true,
-                                                                                                                                                                                                                            "optional": true
-                                                                                                                                                                                                                          },
-                                                                                                                                                                                                                          >>>
-                                                                                                                                                                                                                          >>> > upstream / master "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,
-                                                                                                                                                                                                                            "optional": true,
-                                                                                                                                                                                                                            "requires": {
-                                                                                                                                                                                                                              "graceful-fs": "^4.1.11",
-                                                                                                                                                                                                                              "micromatch": "^3.1.10",
-                                                                                                                                                                                                                              "readable-stream": "^2.0.2"
-                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                          },
-                                                                                                                                                                                                                          "upath": {
-                                                                                                                                                                                                                            "version": "1.2.0",
-                                                                                                                                                                                                                            "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-                                                                                                                                                                                                                            "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-                                                                                                                                                                                                                            "dev": true,
-                                                                                                                                                                                                                            "optional": true
-                                                                                                                                                                                                                          }
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "extend-shallow": {
-                                                                                                                                                                                                                        "version": "2.0.1",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "optional": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "is-extendable": "^0.1.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "fill-range": {
-                                                                                                                                                                                                                        "version": "4.0.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "optional": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "extend-shallow": "^2.0.1",
-                                                                                                                                                                                                                          "is-number": "^3.0.0",
-                                                                                                                                                                                                                          "repeat-string": "^1.6.1",
-                                                                                                                                                                                                                          "to-regex-range": "^2.1.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      <<
-                                                                                                                                                                                                                      << << < HEAD "fsevents": {
-                                                                                                                                                                                                                        "version": "1.2.13",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "optional": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      ===
-                                                                                                                                                                                                                      === = >>>
-                                                                                                                                                                                                                      >>> > upstream / master "is-binary-path": {
-                                                                                                                                                                                                                        "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,
-                                                                                                                                                                                                                        "optional": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "binary-extensions": "^1.0.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "is-number": {
-                                                                                                                                                                                                                        "version": "3.0.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "optional": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "kind-of": "^3.0.2"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "kind-of": {
-                                                                                                                                                                                                                        "version": "3.2.2",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "optional": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "is-buffer": "^1.1.5"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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,
-                                                                                                                                                                                                                        "optional": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "to-regex-range": {
-                                                                                                                                                                                                                        "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,
-                                                                                                                                                                                                                        "optional": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "is-number": "^3.0.0",
-                                                                                                                                                                                                                          "repeat-string": "^1.6.1"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "wbuf": {
-                                                                                                                                                                                                                    "version": "1.7.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "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",
-                                                                                                                                                                                                                    "integrity": "sha512-TOMFWtQdxzjWp8qx4DAraTWTsdhxVSiWa6NkPFSaPtZ1diKUxTn4yTix73A1euG1WbSOMMPcY51cnjTIHrGtDA=="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "webcola": {
-                                                                                                                                                                                                                    "version": "3.4.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/webcola/-/webcola-3.4.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-4BiLXjXw3SJHo3Xd+rF+7fyClT6n7I+AR6TkBqyQ4kTsePSAMDLRCXY1f3B/kXJeP9tYn4G1TblxTO+jAt0gaw==",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "d3-dispatch": "^1.0.3",
-                                                                                                                                                                                                                      "d3-drag": "^1.0.4",
-                                                                                                                                                                                                                      "d3-shape": "^1.3.5",
-                                                                                                                                                                                                                      "d3-timer": "^1.0.5"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "webdriver-js-extender": {
-                                                                                                                                                                                                                    "version": "2.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-lcUKrjbBfCK6MNsh7xaY2UAUmZwe+/ib03AjVOpFobX4O7+83BUveSrLfU0Qsyb1DaKJdQRbuU+kM9aZ6QUhiQ==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "@types/selenium-webdriver": "^3.0.0",
-                                                                                                                                                                                                                      "selenium-webdriver": "^3.0.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "webpack": {
-                                                                                                                                                                                                                    "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",
-                                                                                                                                                                                                                      "@webassemblyjs/helper-module-context": "1.8.5",
-                                                                                                                                                                                                                      "@webassemblyjs/wasm-edit": "1.8.5",
-                                                                                                                                                                                                                      "@webassemblyjs/wasm-parser": "1.8.5",
-                                                                                                                                                                                                                      "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.3",
-                                                                                                                                                                                                                      "watchpack": "^1.6.0",
-                                                                                                                                                                                                                      "webpack-sources": "^1.4.1"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "acorn": {
-                                                                                                                                                                                                                        "version": "6.4.1",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
-                                                                                                                                                                                                                        "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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.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": {
-                                                                                                                                                                                                                          "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"
-                                                                                                                                                                                                                        },
-                                                                                                                                                                                                                        "dependencies": {
-                                                                                                                                                                                                                          "worker-farm": {
-                                                                                                                                                                                                                            "version": "1.7.0",
-                                                                                                                                                                                                                            "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
-                                                                                                                                                                                                                            "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
-                                                                                                                                                                                                                            "dev": true,
-                                                                                                                                                                                                                            "requires": {
-                                                                                                                                                                                                                              "errno": "~0.1.7"
-                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                          }
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "webpack-dev-middleware": {
-                                                                                                                                                                                                                    "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.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.6",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "webpack-dev-server": {
-                                                                                                                                                                                                                    "version": "3.11.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==",
-                                                                                                                                                                                                                    "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.3.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.8",
-                                                                                                                                                                                                                      "opn": "^5.5.0",
-                                                                                                                                                                                                                      "p-retry": "^3.0.1",
-                                                                                                                                                                                                                      "portfinder": "^1.0.26",
-                                                                                                                                                                                                                      "schema-utils": "^1.0.0",
-                                                                                                                                                                                                                      "selfsigned": "^1.10.7",
-                                                                                                                                                                                                                      "semver": "^6.3.0",
-                                                                                                                                                                                                                      "serve-index": "^1.9.1",
-                                                                                                                                                                                                                      "sockjs": "0.3.20",
-                                                                                                                                                                                                                      "sockjs-client": "1.4.0",
-                                                                                                                                                                                                                      "spdy": "^4.0.2",
-                                                                                                                                                                                                                      "strip-ansi": "^3.0.1",
-                                                                                                                                                                                                                      "supports-color": "^6.1.0",
-                                                                                                                                                                                                                      "url": "^0.11.0",
-                                                                                                                                                                                                                      "webpack-dev-middleware": "^3.7.2",
-                                                                                                                                                                                                                      "webpack-log": "^2.0.0",
-                                                                                                                                                                                                                      "ws": "^6.2.1",
-                                                                                                                                                                                                                      "yargs": "^13.3.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==",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "anymatch": {
-                                                                                                                                                                                                                        "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"
-                                                                                                                                                                                                                        },
-                                                                                                                                                                                                                        "dependencies": {
-                                                                                                                                                                                                                          "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"
-                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                          }
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "braces": {
-                                                                                                                                                                                                                        "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",
-                                                                                                                                                                                                                          "extend-shallow": "^2.0.1",
-                                                                                                                                                                                                                          "fill-range": "^4.0.0",
-                                                                                                                                                                                                                          "isobject": "^3.0.1",
-                                                                                                                                                                                                                          "repeat-element": "^1.1.2",
-                                                                                                                                                                                                                          "snapdragon": "^0.8.1",
-                                                                                                                                                                                                                          "snapdragon-node": "^2.0.1",
-                                                                                                                                                                                                                          "split-string": "^3.0.2",
-                                                                                                                                                                                                                          "to-regex": "^3.0.1"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "cliui": {
-                                                                                                                                                                                                                        "version": "5.0.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "string-width": "^3.1.0",
-                                                                                                                                                                                                                          "strip-ansi": "^5.2.0",
-                                                                                                                                                                                                                          "wrap-ansi": "^5.1.0"
-                                                                                                                                                                                                                        },
-                                                                                                                                                                                                                        "dependencies": {
-                                                                                                                                                                                                                          "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"
-                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                          }
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "emoji-regex": {
-                                                                                                                                                                                                                        "version": "7.0.3",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "extend-shallow": {
-                                                                                                                                                                                                                        "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "fill-range": {
-                                                                                                                                                                                                                        "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",
-                                                                                                                                                                                                                          "repeat-string": "^1.6.1",
-                                                                                                                                                                                                                          "to-regex-range": "^2.1.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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": "1.2.13",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "optional": 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-binary-path": {
-                                                                                                                                                                                                                        "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "is-number": {
-                                                                                                                                                                                                                        "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "kind-of": {
-                                                                                                                                                                                                                        "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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": "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
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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.1.11",
-                                                                                                                                                                                                                          "micromatch": "^3.1.10",
-                                                                                                                                                                                                                          "readable-stream": "^2.0.2"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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",
-                                                                                                                                                                                                                        "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                                                                                                                                                                                                                        "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==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "emoji-regex": "^7.0.1",
-                                                                                                                                                                                                                          "is-fullwidth-code-point": "^2.0.0",
-                                                                                                                                                                                                                          "strip-ansi": "^5.1.0"
-                                                                                                                                                                                                                        },
-                                                                                                                                                                                                                        "dependencies": {
-                                                                                                                                                                                                                          "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"
-                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                          }
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "to-regex-range": {
-                                                                                                                                                                                                                        "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "yargs": {
-                                                                                                                                                                                                                        "version": "13.3.2",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "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.2"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "yargs-parser": {
-                                                                                                                                                                                                                        "version": "13.1.2",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "camelcase": "^5.0.0",
-                                                                                                                                                                                                                          "decamelize": "^1.2.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "webpack-log": {
-                                                                                                                                                                                                                    "version": "2.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "ansi-colors": "^3.0.0",
-                                                                                                                                                                                                                      "uuid": "^3.3.2"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "webpack-merge": {
-                                                                                                                                                                                                                    "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.15"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "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.0",
-                                                                                                                                                                                                                      "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
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "webpack-subresource-integrity": {
-                                                                                                                                                                                                                    "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-sources": "^1.3.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "websocket-driver": {
-                                                                                                                                                                                                                    "version": "0.6.5",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "websocket-extensions": ">=0.1.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "websocket-extensions": {
-                                                                                                                                                                                                                    "version": "0.1.4",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "when": {
-                                                                                                                                                                                                                    "version": "3.6.4",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "which": {
-                                                                                                                                                                                                                    "version": "1.3.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "isexe": "^2.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "which-module": {
-                                                                                                                                                                                                                    "version": "1.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "widest-line": {
-                                                                                                                                                                                                                    "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": "^4.0.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "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
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "word-wrap": {
-                                                                                                                                                                                                                    "version": "1.2.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "wordwrap": {
-                                                                                                                                                                                                                    "version": "1.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "worker-plugin": {
-                                                                                                                                                                                                                    "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"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "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": {
-                                                                                                                                                                                                                    "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==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "ansi-styles": "^3.2.0",
-                                                                                                                                                                                                                      "string-width": "^3.0.0",
-                                                                                                                                                                                                                      "strip-ansi": "^5.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==",
-                                                                                                                                                                                                                        "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==",
-                                                                                                                                                                                                                        "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
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "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==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "emoji-regex": "^7.0.1",
-                                                                                                                                                                                                                          "is-fullwidth-code-point": "^2.0.0",
-                                                                                                                                                                                                                          "strip-ansi": "^5.1.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==",
-                                                                                                                                                                                                                        "dev": true,
-                                                                                                                                                                                                                        "requires": {
-                                                                                                                                                                                                                          "ansi-regex": "^4.1.0"
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "wrappy": {
-                                                                                                                                                                                                                    "version": "1.0.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "write": {
-                                                                                                                                                                                                                    "version": "0.2.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "mkdirp": "^0.5.1"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "write-file-atomic": {
-                                                                                                                                                                                                                    "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": {
-                                                                                                                                                                                                                      "imurmurhash": "^0.1.4",
-                                                                                                                                                                                                                      "is-typedarray": "^1.0.0",
-                                                                                                                                                                                                                      "signal-exit": "^3.0.2",
-                                                                                                                                                                                                                      "typedarray-to-buffer": "^3.1.5"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "ws": {
-                                                                                                                                                                                                                    "version": "6.2.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "async-limiter": "~1.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "xdg-basedir": {
-                                                                                                                                                                                                                    "version": "4.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "xhr2": {
-                                                                                                                                                                                                                    "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",
-                                                                                                                                                                                                                    "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",
-                                                                                                                                                                                                                      "xmlbuilder": "~11.0.0"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "xmlbuilder": {
-                                                                                                                                                                                                                    "version": "11.0.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "xmlhttprequest-ssl": {
-                                                                                                                                                                                                                    "version": "1.5.5",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "xtend": {
-                                                                                                                                                                                                                    "version": "4.0.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "xterm": {
-                                                                                                                                                                                                                    "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",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/xterm-addon-fit/-/xterm-addon-fit-0.3.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-kvkiqHVrnMXgyCH9Xn0BOBJ7XaWC/4BgpSWQy3SueqximgW630t/QOankgqkvk11iTOCwWdAY9DTyQBXUMN3lw=="
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "xxhashjs": {
-                                                                                                                                                                                                                    "version": "0.2.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/xxhashjs/-/xxhashjs-0.2.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "cuint": "^0.2.2"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "y18n": {
-                                                                                                                                                                                                                    "version": "4.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "yallist": {
-                                                                                                                                                                                                                    "version": "4.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "yargs": {
-                                                                                                                                                                                                                    "version": "7.1.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "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": {
-                                                                                                                                                                                                                        "version": "3.0.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "get-caller-file": {
-                                                                                                                                                                                                                        "version": "1.0.3",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-                                                                                                                                                                                                                        "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "require-main-filename": {
-                                                                                                                                                                                                                        "version": "1.0.1",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      },
-                                                                                                                                                                                                                      "y18n": {
-                                                                                                                                                                                                                        "version": "3.2.1",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "yargs-parser": {
-                                                                                                                                                                                                                    "version": "5.0.0",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "camelcase": "^3.0.0"
-                                                                                                                                                                                                                    },
-                                                                                                                                                                                                                    "dependencies": {
-                                                                                                                                                                                                                      "camelcase": {
-                                                                                                                                                                                                                        "version": "3.0.0",
-                                                                                                                                                                                                                        "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-                                                                                                                                                                                                                        "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-                                                                                                                                                                                                                        "dev": true
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "yazl": {
-                                                                                                                                                                                                                    "version": "2.5.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
-                                                                                                                                                                                                                    "dev": true,
-                                                                                                                                                                                                                    "requires": {
-                                                                                                                                                                                                                      "buffer-crc32": "~0.2.3"
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "yeast": {
-                                                                                                                                                                                                                    "version": "0.1.2",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
-                                                                                                                                                                                                                    "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "yn": {
-                                                                                                                                                                                                                    "version": "3.1.1",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-                                                                                                                                                                                                                    "dev": true
-                                                                                                                                                                                                                  },
-                                                                                                                                                                                                                  "zone.js": {
-                                                                                                                                                                                                                    "version": "0.10.3",
-                                                                                                                                                                                                                    "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz",
-                                                                                                                                                                                                                    "integrity": "sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg=="
-                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                }
-                                                                                                                                                                                                              }
+    "yeast": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
+      "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=",
+      "dev": true
+    },
+    "yn": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "dev": true
+    },
+    "zone.js": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz",
+      "integrity": "sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg=="
+    }
+  }
+}

From f60026f699e6e07b1fd7614ed77b36b4e08b5d4e Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Wed, 8 Jul 2020 10:55:18 +0100
Subject: [PATCH 568/648] Fix typo in error message

---
 .../kube-config-import/kube-config-import.component.ts          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts
index 63214444f5..a330b5a994 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts
@@ -159,7 +159,7 @@ export class KubeConfigImportComponent implements OnDestroy {
 
   private doConnect(connect: KubeConfigImportAction, next: KubeConfigImportAction[]) {
     if (!connect.user) {
-      connect.state.next({ message: 'Can not connect - not user specified', error: true });
+      connect.state.next({ message: 'Can not connect - no user specified', error: true });
       return;
     }
     const helper = new KubeConfigAuthHelper();

From 205080b0d4c0dd29f8785a6f0c002a312418d1aa Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 8 Jul 2020 12:12:18 +0100
Subject: [PATCH 569/648] Address PR feedback

---
 src/jetstream/plugins/kubernetes/auth/basic_auth.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/auth/basic_auth.go b/src/jetstream/plugins/kubernetes/auth/basic_auth.go
index 4a7eaaf1a0..ecca261783 100644
--- a/src/jetstream/plugins/kubernetes/auth/basic_auth.go
+++ b/src/jetstream/plugins/kubernetes/auth/basic_auth.go
@@ -68,8 +68,9 @@ func (c *KubeBasicAuth) FetchToken(cnsiRecord interfaces.CNSIRecord, ec echo.Con
 
 func (c *KubeBasicAuth) GetUserFromToken(cnsiGUID string, cfTokenRecord *interfaces.TokenRecord) (*interfaces.ConnectedUser, bool) {
 	return &interfaces.ConnectedUser{
-		GUID: "Kube Cert Auth",
-		Name: "Cert Auth",
+		// RefreshjToken is the username
+		GUID: fmt.Sprintf("%s-%s", cnsiGUID, cfTokenRecord.RefreshToken),
+		Name: cfTokenRecord.RefreshToken,
 	}, true
 }
 

From 5cacfd25d43d809f70daace3e9a31fb012146dcc Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 8 Jul 2020 13:34:19 +0100
Subject: [PATCH 570/648] Update login screen colors

---
 .../suse-extensions/assets/suse_login_logo.svg     | 10 ++++++++++
 src/frontend/packages/suse-extensions/package.json |  9 ++++++---
 .../custom/suse-login/suse-login.component.html    |  2 +-
 .../custom/suse-login/suse-login.component.scss    | 14 ++++++++------
 src/frontend/packages/suse-theme/package.json      |  2 +-
 src/frontend/packages/suse-theme/sass/colors.scss  |  2 ++
 src/tsconfig.json                                  |  2 +-
 7 files changed, 29 insertions(+), 12 deletions(-)
 create mode 100644 src/frontend/packages/suse-extensions/assets/suse_login_logo.svg

diff --git a/src/frontend/packages/suse-extensions/assets/suse_login_logo.svg b/src/frontend/packages/suse-extensions/assets/suse_login_logo.svg
new file mode 100644
index 0000000000..7b8bbf809e
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/assets/suse_login_logo.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="270" height="90" viewBox="0, 0, 270, 90">
+  <g id="Layer_1">
+    <g>
+      <path d="M238.462,55.726 L224.907,55.726 C223.862,55.726 223.011,54.876 223.011,53.83 L223.011,46.982 L236.095,46.982 C237.219,46.982 238.131,46.071 238.131,44.946 C238.131,43.821 237.219,42.909 236.095,42.909 L223.011,42.909 L223.011,36.17 C223.011,35.124 223.862,34.273 224.907,34.273 L238.462,34.273 C239.642,34.273 240.6,33.318 240.6,32.137 C240.6,30.957 239.642,30 238.462,30 L224.907,30 C221.507,30 218.738,32.767 218.738,36.17 L218.738,53.83 C218.738,57.232 221.507,59.999 224.907,59.999 L238.462,59.999 C239.642,59.999 240.6,59.044 240.6,57.864 C240.6,56.683 239.642,55.726 238.462,55.726 M198.602,42.965 C195.736,42.45 193.743,41.842 192.628,41.132 C191.511,40.423 190.953,39.466 190.953,38.259 C190.953,36.963 191.526,35.898 192.672,35.068 C193.819,34.24 195.433,33.824 197.516,33.824 C199.628,33.824 201.317,34.23 202.585,35.046 C203.267,35.485 203.888,36.068 204.448,36.798 C205.274,37.866 206.833,38.008 207.837,37.104 C208.784,36.25 208.867,34.786 208.015,33.836 C206.987,32.688 205.818,31.779 204.508,31.109 C202.561,30.113 200.215,29.616 197.471,29.616 C195.117,29.616 193.058,30.022 191.294,30.837 C189.529,31.651 188.177,32.753 187.243,34.14 C186.307,35.529 185.84,37.067 185.84,38.757 C185.84,40.356 186.208,41.713 186.949,42.829 C187.687,43.947 188.873,44.881 190.502,45.635 C192.13,46.39 194.317,47.023 197.063,47.536 C199.809,48.05 201.732,48.637 202.833,49.301 C203.935,49.965 204.485,50.839 204.485,51.924 C204.485,53.283 203.875,54.332 202.651,55.071 C201.431,55.81 199.748,56.18 197.606,56.18 C195.343,56.18 193.45,55.758 191.926,54.912 C191.056,54.429 190.277,53.789 189.587,52.992 C188.719,51.985 187.161,51.961 186.222,52.901 L186.214,52.911 C185.354,53.769 185.288,55.162 186.099,56.066 C188.681,58.948 192.533,60.388 197.651,60.388 C200.004,60.388 202.079,60.033 203.875,59.324 C205.67,58.616 207.063,57.598 208.059,56.271 C209.056,54.943 209.554,53.404 209.554,51.653 C209.554,50.025 209.192,48.66 208.468,47.559 C207.743,46.458 206.59,45.537 205.005,44.799 C203.422,44.059 201.287,43.448 198.602,42.965 M131.77,42.974 C128.904,42.459 126.913,41.85 125.797,41.141 C124.68,40.432 124.123,39.474 124.123,38.266 C124.123,36.97 124.696,35.906 125.842,35.077 C126.989,34.248 128.603,33.832 130.685,33.832 C132.795,33.832 134.486,34.24 135.753,35.054 C136.437,35.493 137.058,36.077 137.618,36.806 C138.442,37.876 140.002,38.017 141.006,37.113 C141.954,36.258 142.036,34.794 141.184,33.845 C140.156,32.696 138.986,31.787 137.677,31.117 C135.731,30.122 133.384,29.624 130.639,29.624 C128.286,29.624 126.227,30.031 124.463,30.845 C122.697,31.659 121.347,32.762 120.412,34.15 C119.477,35.537 119.009,37.075 119.009,38.765 C119.009,40.364 119.377,41.723 120.118,42.837 C120.857,43.954 122.042,44.891 123.67,45.644 C125.299,46.399 127.487,47.032 130.232,47.545 C132.977,48.058 134.9,48.647 136.002,49.31 C137.103,49.973 137.654,50.848 137.654,51.934 C137.654,53.292 137.043,54.34 135.822,55.079 C134.599,55.819 132.917,56.188 130.776,56.188 C128.512,56.188 126.618,55.766 125.095,54.92 C124.226,54.438 123.446,53.798 122.758,53.001 C121.89,51.993 120.331,51.97 119.39,52.911 L119.383,52.919 C118.523,53.777 118.457,55.17 119.268,56.074 C121.85,58.957 125.701,60.396 130.821,60.396 C133.174,60.396 135.248,60.042 137.043,59.333 C138.838,58.625 140.233,57.605 141.229,56.278 C142.225,54.952 142.722,53.411 142.722,51.662 C142.722,50.033 142.36,48.669 141.636,47.567 C140.911,46.465 139.759,45.546 138.173,44.807 C136.59,44.067 134.456,43.457 131.77,42.974 M176.343,32.059 L176.343,48.487 C176.343,52.408 175.302,55.372 173.221,57.379 C171.139,59.386 168.107,60.388 164.126,60.388 C160.142,60.388 157.11,59.386 155.028,57.379 C152.947,55.372 151.907,52.408 151.907,48.487 L151.907,32.059 C151.907,30.709 152.999,29.616 154.349,29.616 C155.698,29.616 156.794,30.709 156.794,32.059 L156.794,47.898 C156.794,50.735 157.389,52.824 158.581,54.166 C159.773,55.508 161.62,56.18 164.126,56.18 C166.63,56.18 168.476,55.508 169.668,54.166 C170.86,52.824 171.456,50.735 171.456,47.898 L171.456,32.059 C171.456,30.709 172.551,29.616 173.899,29.616 C175.249,29.616 176.343,30.709 176.343,32.059" fill="#0C322C"/>
+      <path d="M101.408,42.16 C101.003,42.429 100.461,42.429 100.055,42.16 C99.391,41.719 99.327,40.797 99.863,40.264 C100.339,39.771 101.124,39.771 101.6,40.263 C102.135,40.797 102.07,41.719 101.408,42.16 M103.344,39.473 C104.116,42.757 101.164,45.71 97.88,44.938 C96.208,44.546 94.881,43.219 94.488,41.548 C93.718,38.266 96.669,35.315 99.952,36.084 C101.623,36.475 102.951,37.801 103.344,39.473 M81.232,57.135 C81.607,57.674 81.919,58.195 82.094,58.716 C82.218,59.086 82.377,59.574 82.742,59.77 C82.762,59.781 82.78,59.791 82.802,59.797 C83.472,60.041 85.195,60 85.195,60 L88.364,60 C88.635,60.004 91.016,59.997 90.956,59.731 C90.669,58.458 89.197,58.23 88.076,57.564 C87.043,56.948 86.063,56.25 85.619,55.049 C85.387,54.429 85.524,52.999 85.923,52.478 C86.214,52.101 86.643,51.851 87.104,51.75 C87.615,51.641 88.145,51.735 88.656,51.787 C89.286,51.851 89.908,51.965 90.536,52.043 C91.748,52.201 92.972,52.264 94.194,52.231 C96.211,52.175 98.233,51.854 100.145,51.202 C101.48,50.754 102.795,50.148 103.93,49.305 C105.22,48.346 104.881,48.436 103.573,48.57 C102.007,48.73 100.427,48.754 98.856,48.661 C97.39,48.576 95.944,48.403 94.618,47.722 C93.574,47.183 92.677,46.643 91.849,45.808 C91.725,45.682 91.648,45.314 91.875,45.079 C92.095,44.851 92.561,44.983 92.704,45.105 C94.148,46.312 96.302,47.306 98.532,47.414 C99.738,47.474 100.911,47.496 102.118,47.444 C102.721,47.416 103.631,47.42 104.236,47.414 C104.548,47.41 105.399,47.5 105.558,47.169 C105.606,47.073 105.602,46.962 105.598,46.854 C105.421,42.028 105.064,36.585 100.014,34.278 C96.246,32.555 90.597,29.886 88.211,28.779 C87.658,28.516 87.011,28.932 87.011,29.548 C87.011,31.16 87.093,33.476 87.094,35.584 C85.951,34.42 84.026,33.685 82.559,33.011 C80.893,32.247 79.173,31.599 77.423,31.054 C73.9,29.963 70.254,29.291 66.587,28.927 C62.428,28.512 58.199,28.711 54.104,29.557 C47.36,30.955 40.731,34.198 35.699,38.941 C32.61,41.851 30.186,45.988 30.022,50.187 C29.788,56.13 31.453,59.321 34.513,62.61 C39.393,67.852 49.896,68.586 54.15,62.37 C56.064,59.572 56.479,55.777 55.09,52.684 C53.701,49.593 50.508,47.359 47.123,47.245 C44.496,47.158 41.697,48.494 40.69,50.923 C39.922,52.778 40.359,55.07 41.758,56.51 C42.303,57.072 43.041,57.532 43.847,57.352 C44.322,57.246 44.719,56.889 44.791,56.407 C44.897,55.696 44.275,55.235 43.892,54.689 C43.201,53.704 43.341,52.225 44.206,51.388 C44.936,50.681 46.017,50.472 47.033,50.475 C47.979,50.477 48.946,50.646 49.762,51.123 C50.909,51.798 51.671,53.034 51.935,54.34 C52.722,58.243 49.549,61.414 45.247,61.663 C43.046,61.793 40.806,61.215 39.088,59.832 C34.737,56.332 33.671,49.178 38.644,45.359 C43.365,41.734 49.325,42.668 52.839,44.552 C55.651,46.059 57.747,48.525 59.335,51.251 C60.132,52.622 60.811,54.055 61.441,55.51 C62.047,56.909 62.614,58.319 63.827,59.344 C64.63,60.024 65.621,60 66.673,60 L72.678,60 C73.494,60 73.295,59.456 72.943,59.096 C72.147,58.282 71.003,58.098 69.944,57.807 C67.523,57.141 67.77,53.936 68.44,53.936 C70.604,53.936 70.672,54.001 72.568,53.977 C75.304,53.939 76.132,53.78 78.272,54.571 C79.416,54.995 80.515,56.113 81.232,57.135" fill="#30BA78"/>
+    </g>
+  </g>
+</svg>
diff --git a/src/frontend/packages/suse-extensions/package.json b/src/frontend/packages/suse-extensions/package.json
index c7ba7878a7..a039d07e1b 100644
--- a/src/frontend/packages/suse-extensions/package.json
+++ b/src/frontend/packages/suse-extensions/package.json
@@ -1,12 +1,15 @@
 {
-  "name": "@suse/extensions",
-  "version": "0.0.1",
+  "name": "@susestratos/extensions",
+  "version": "0.0.0",
   "peerDependencies": {
     "@angular/common": "^6.0.0-rc.0 || ^6.0.0",
     "@angular/core": "^6.0.0-rc.0 || ^6.0.0"
   },
   "stratos": {
     "module": "SuseModule",
-    "routingModule": "SuseRoutingModule"
+    "routingModule": "SuseRoutingModule",
+    "assets": {
+      "assets": "core/assets/custom"
+    }
   }
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html
index fada407f1b..4b3fad4d7e 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html
@@ -37,7 +37,7 @@ <h1 class="suse-login__headline">SUSE<br>Stratos<br>Console</h1>
       <span *ngIf="config.copyright" [innerHTML]="config.copyright"></span>
     </div>
     <div class="suse-login__logo">
-      <a href="https://www.suse.com" target="_blank"><img src="/core/assets/custom/suse_logo.svg"></a>
+      <a href="https://www.suse.com" target="_blank"><img src="/core/assets/custom/suse_login_logo.svg"></a>
     </div>
   </div>
 </div>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
index 5f71f6ef7c..62ccddf629 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
@@ -2,7 +2,8 @@
 
 .suse-login {
   align-items: center;
-  background-color: $suse-dark-green;
+  background-color: $suse-gray;
+  color: $suse-gray-fg;
   display: flex;
   flex-direction: column;
   width: 100%;
@@ -41,7 +42,7 @@
     width: 90%;
   }
   &__copyright {
-    color: $suse-text-gray;
+    color: $suse-gray-fg;
     flex: 1;
   }
   &__logo {
@@ -65,11 +66,12 @@
     display: flex;
     flex-direction: column;
     .mat-form-field:not(.mat-form-field-invalid).mat-form-field-appearance-legacy {
+      color: $suse-gray-fg;
       .mat-form-field-label {
-        color: $suse-text-gray;
+        color: $suse-gray-fg;
       }
       .mat-form-field-underline {
-        background-color: $suse-text-gray;
+        background-color: $suse-gray-fg;
       }
     }
   }
@@ -87,7 +89,7 @@
     margin: 0;
   }
   &__tagline {
-    color: $suse-text-gray;
+    color: $suse-gray-fg;
     font-family: "Work Sans";
     font-size: 18px;
     font-weight: 300;
@@ -100,7 +102,7 @@
     transition: opacity 250ms linear;
   }
   &__form-title {
-    color: $suse-text;
+    color: $suse-gray-fg;
     font-size: 30px;
     font-weight: 300;
     margin-bottom: 24px;
diff --git a/src/frontend/packages/suse-theme/package.json b/src/frontend/packages/suse-theme/package.json
index 93db23ab00..3ccb7df39c 100644
--- a/src/frontend/packages/suse-theme/package.json
+++ b/src/frontend/packages/suse-theme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@susestratos/theme",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "stratos": {
     "assets": {
       "assets/core": "core/assets",
diff --git a/src/frontend/packages/suse-theme/sass/colors.scss b/src/frontend/packages/suse-theme/sass/colors.scss
index f1c3a1b897..255c4c4c87 100644
--- a/src/frontend/packages/suse-theme/sass/colors.scss
+++ b/src/frontend/packages/suse-theme/sass/colors.scss
@@ -33,6 +33,8 @@ $suse-blue: #073155;
 $suse-dark-green: #0c322c;
 $suse-header-bar: #0c322c;
 $suse-link-color: #008ACF;
+$suse-gray: #f2f2f2;
+$suse-gray-fg: #333;
 
 // Side nav
 $suse-side-nav-bg: #f2f2f2;
diff --git a/src/tsconfig.json b/src/tsconfig.json
index a6be48f071..f2cdf8c68d 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -34,7 +34,7 @@
       "@stratosui/store": ["frontend/packages/store/src/public-api.ts"],
       "@stratosui/store/testing": ["frontend/packages/store/testing/public-api.ts"],
       "@example/extensions": ["frontend/packages/example-extensions/src/public-api.ts"],
-      "@suse/extensions": ["frontend/packages/suse-extensions/src/public-api.ts"],
+      "@susestratos/extensions": ["frontend/packages/suse-extensions/src/public-api.ts"],
     }
   }
 }

From 371788fe081168ff4f7ceabf1a90c099850b88de Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 8 Jul 2020 14:35:45 +0100
Subject: [PATCH 571/648] Light & Dark mode changes following review - dark
 mode - update link colour - dark mode - update colour scheme, including
 primary dark mode green - dark mode - update page side nav active colours -
 dark mode - remove border betwen side nav and content - dark mode - make side
 nav background darker - light mode - update standard colour pallet given suse
 primary colour

---
 .../page-side-nav.component.theme.scss        |  5 ++++
 .../monocular-chart-card.component.theme.scss |  7 +++--
 src/frontend/packages/suse-theme/_index.scss  |  6 ++++-
 .../packages/suse-theme/sass/colors.scss      | 27 ++++++++++++++-----
 .../packages/suse-theme/sass/suse.scss        |  4 +++
 5 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.theme.scss b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.theme.scss
index d7c1ebb669..193c3fb671 100644
--- a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.theme.scss
+++ b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.theme.scss
@@ -11,6 +11,7 @@
   $side-nav-bottom-color: map-get($app-theme, subdued-color);
   $background-color:  map-get($app-theme, app-background-color);
   $darker-background-color:  darken($background-color, 4%);
+  $is-dark: map-get($theme, is-dark);
 
   .page-side-nav {
     background-color: $background-color;
@@ -27,6 +28,10 @@
       &--active {
         background-color: transparentize($primary-color, .9);
         color: $primary-color;
+        @if $is-dark == true {
+          background-color: transparentize($primary-color, .8);
+          color: mat-contrast($primary, 500);
+        }
       }
     }
     &__items-header {
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.theme.scss b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.theme.scss
index 08e40cb3c1..ad1ada5b5c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.theme.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.theme.scss
@@ -3,11 +3,14 @@
   $link-color: map-get($app-theme, link-color);
   $link-active-color: map-get($app-theme, link-active-color);
 
+  $side-nav: map-get($app-theme, side-nav);
+  $side-nav-bg: map-get($side-nav, background);
+
   $is-dark: map-get($theme, is-dark);
   @if $is-dark == true {
     $border-color: $black;
-    $background-color-top: lighten(#3f3f3f, 10);
-    $background-color-bottom: #3f3f3f;
+    $background-color-top: lighten($side-nav-bg, 10);
+    $background-color-bottom: $side-nav-bg;
     $color: $suse-link-color;
     .list-item {
       background-color: $background-color-bottom;
diff --git a/src/frontend/packages/suse-theme/_index.scss b/src/frontend/packages/suse-theme/_index.scss
index c53aa198fb..4ee0c30016 100644
--- a/src/frontend/packages/suse-theme/_index.scss
+++ b/src/frontend/packages/suse-theme/_index.scss
@@ -52,6 +52,10 @@
 
   $app-theme: map-get($theme, app-theme);
   $app-theme: map-merge($app-theme, (
+    link-color: $suse-dark-link-color,
+    link-active-color: darken($suse-dark-link-color, 10%),
+    underflow-background-color: $suse-dark-primary-color,
+    user-avatar-background-color: $suse-dark-primary-color,
     side-nav: (
       background: $suse-dark-side-nav-bg,
       text: $suse-dark-side-nav-text,
@@ -59,7 +63,7 @@
       active-text: $suse-dark-side-nav-active-text,
       hover: $suse-dark-side-nav-active-bg,
       hover-text: $suse-dark-side-nav-active-text
-    )
+    ),
   ));
 
   $theme: map-merge($theme, (
diff --git a/src/frontend/packages/suse-theme/sass/colors.scss b/src/frontend/packages/suse-theme/sass/colors.scss
index 4ffc911ac5..483e5a0055 100644
--- a/src/frontend/packages/suse-theme/sass/colors.scss
+++ b/src/frontend/packages/suse-theme/sass/colors.scss
@@ -16,18 +16,19 @@ $suse-button-gray: #888;
 $suse-dark-blue: #06253A;
 
 // SUSE Primary Material Design pallette
-// From http://mcg.mbitson.com/#!?mcgpalette0=%233f51b5
-$suse-primary: (50: #e0f7f0, 100: #b3ecd9, 200: #80e0c0, 300: #4dd3a7, 400: #26c994, 500: #00c081, 600: #00ba79, 700: #00b26e, 800: #00aa64, 900: #009c51, A100: #c7ffe0, A200: #94ffc4, A400: #61ffa8, A700: #47ff9a, contrast: (50: #000, 100: #000, 200: #000, 300: #000, 400: #000, 500: #fff, 600: #fff, 700: #fff, 800: #fff, 900: #fff, A100: #000, A200: #000, A400: #000, A700: #000));
+// Note - this should be accessed by themes using `map-get(map-get($theme, primary), default)`
+$suse-primary-color-hardcoded: #30BA78;
+
+// From http://mcg.mbitson.com/#!?mcgpalette0=%233f51b5 with $suse-primary-color-hardcoded
+$suse-primary: (50: #e6f7ef, 100: #c1ead7, 200: #98ddbc, 300: #6ecfa1, 400: #4fc48c, 500: #30ba78, 600: #2bb370, 700: #24ab65, 800: #1ea35b, 900: #139448, A100: #c7ffdc, A200: #94ffbc, A400: #61ff9c, A700: #47ff8c, contrast: (50: #000, 100: #000, 200: #000, 300: #000, 400: #000, 500: #000, 600: #000, 700: #fff, 800: #fff, 900: #fff, A100: #000, A200: #000, A400: #000, A700: #000));
 $mat-red: ( 50: #ffebee, 100: #ffcdd2, 200: #ef9a9a, 300: #e57373, 400: #ef5350, 500: #f44336, 600: #e53935, 700: #d32f2f, 800: #c62828, 900: #b71c1c, A100: #ff8a80, A200: #ff5252, A400: #ff1744, A700: #d50000, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: white, A400: white, A700: white, ));
 
 $suse-theme-primary: mat-palette($suse-primary);
 $suse-theme-warn: mat-palette($mat-red);
 $stratos-theme: mat-light-theme($suse-theme-primary, $suse-theme-primary, $suse-theme-warn);
 
-$suse-dark-theme: mat-dark-theme($suse-theme-primary, $suse-theme-primary, $suse-theme-warn);
-
 // SUSE Brand primary colour
-$suse-primary-color: #30BA78;
+$suse-primary-color: map-get(map-get($stratos-theme, primary), default);
 $suse-text: #fff;
 $suse-blue: #073155;
 $suse-dark-green: #0c322c;
@@ -40,7 +41,19 @@ $suse-side-nav-text: #000;
 $suse-side-nav-active-bg: $suse-primary-color;
 $suse-side-nav-active-text: #fff;
 
-$suse-dark-side-nav-bg: #303030;
+// Dark Theme
+$suse-dark-primary-color-hardcoded: #1f8253;
+// From http://mcg.mbitson.com/#!?mcgpalette0=%233f51b5 with $suse-dark-primary-color-hardcoded
+$suse-dark-primary: (50: #e4f0ea, 100: #bcdacb, 200: #8fc1a9, 300: #62a887, 400: #41956d, 500: #1f8253, 600: #1b7a4c, 700: #176f42, 800: #126539, 900: #0a5229, A100: #87ffb5, A200: #54ff95, A400: #21ff76, A700: #08ff66, contrast: (50: #000, 100: #000, 200: #000, 300: #000, 400: #fff, 500: #fff, 600: #fff, 700: #fff, 800: #fff, 900: #fff, A100: #000, A200: #000, A400: #000, A700: #000,));
+$suse-dark-theme-primary: mat-palette($suse-dark-primary);
+$suse-dark-theme: mat-dark-theme($suse-dark-theme-primary, $suse-dark-theme-primary, $suse-theme-warn);
+
+$suse-dark-primary-color: map-get(map-get($suse-dark-theme, primary), default);
+
+$suse-dark-background: map-get(map-get($suse-dark-theme, background), background);
+$suse-dark-side-nav-bg: lighten($suse-dark-background, 1);
 $suse-dark-side-nav-text: #f2f2f2;
-$suse-dark-side-nav-active-bg: darken($suse-primary-color, 15);
+$suse-dark-side-nav-active-bg: $suse-dark-primary-color;
 $suse-dark-side-nav-active-text: #f2f2f2;
+
+$suse-dark-link-color: lighten($suse-link-color, 20)
diff --git a/src/frontend/packages/suse-theme/sass/suse.scss b/src/frontend/packages/suse-theme/sass/suse.scss
index c0cd8bd604..543ee4fa78 100644
--- a/src/frontend/packages/suse-theme/sass/suse.scss
+++ b/src/frontend/packages/suse-theme/sass/suse.scss
@@ -10,4 +10,8 @@ body.stratos {
     border-radius: 20px;
   }
 
+  .dark-theme mat-drawer.mat-drawer-side {
+    // Border right added only in dark mode, applied to whole vertical drawer covering main page and header
+    border-right: none;
+  }
 }

From a6c3f1248b9f09e124c270b16cd6d58a8178734e Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 8 Jul 2020 16:57:26 +0100
Subject: [PATCH 572/648] FIx issues with HttpBasic auth type

---
 src/jetstream/plugins/kubernetes/auth/basic_auth.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/jetstream/plugins/kubernetes/auth/basic_auth.go b/src/jetstream/plugins/kubernetes/auth/basic_auth.go
index ecca261783..40b655d4ad 100644
--- a/src/jetstream/plugins/kubernetes/auth/basic_auth.go
+++ b/src/jetstream/plugins/kubernetes/auth/basic_auth.go
@@ -12,6 +12,7 @@ import (
 )
 
 const authConnectTypeBasicAuth = "creds"
+const authTypeHttpBasic = "HttpBasic"
 
 // KubeBasicAuth is HTTP Basic Authentication
 type KubeBasicAuth struct {
@@ -75,5 +76,13 @@ func (c *KubeBasicAuth) GetUserFromToken(cnsiGUID string, cfTokenRecord *interfa
 }
 
 func (c *KubeBasicAuth) RegisterJetstreamAuthType(portal interfaces.PortalProxy) {
-	// Not needed - 'creds' is built-in
+	// Register auth type with Jetstream - use the same as the HttpBasic auth
+
+	auth := c.portalProxy.GetAuthProvider(authTypeHttpBasic)
+	if auth.Handler != nil {
+		c.portalProxy.AddAuthProvider(c.GetName(), interfaces.AuthProvider{
+			Handler:  auth.Handler,
+			UserInfo: auth.UserInfo,
+		})
+	}
 }

From dd6afcfaff1c3b5d2718294a3c476089df030770 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 8 Jul 2020 17:08:57 +0100
Subject: [PATCH 573/648] Tweaks following review

---
 .../core/src/features/home/home/home-page.component.scss   | 2 +-
 .../favorites-meta-card/favorites-meta-card.component.scss | 7 ++++++-
 .../page-header/page-header.component.theme.scss           | 3 +++
 .../recent-entities/recent-entities.component.scss         | 1 -
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/frontend/packages/core/src/features/home/home/home-page.component.scss b/src/frontend/packages/core/src/features/home/home/home-page.component.scss
index 6b80879bf6..3e0d7d0cf6 100644
--- a/src/frontend/packages/core/src/features/home/home/home-page.component.scss
+++ b/src/frontend/packages/core/src/features/home/home/home-page.component.scss
@@ -15,7 +15,7 @@ $page-padding: 20px;
   flex: 1;
   flex-direction: column;
   margin: 0 -#{$page-padding} -#{$page-padding};
-  padding: 24px;
+  padding: 20px;
   @include breakpoint(tablet) {
     margin: -#{$page-padding} -#{$page-padding} -#{$page-padding} $page-padding;
   }
diff --git a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.scss b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.scss
index 0a144cfe98..b020eb2d28 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.scss
+++ b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.scss
@@ -38,7 +38,7 @@
   }
   &__logo-panel {
     display: flex;
-    justify-content: center;
+    justify-content: left;
     width: 56px;
   }
   &__logo {
@@ -50,6 +50,11 @@
     margin-right: 4px;
     opacity: .7;
   }
+  &__icon-panel {
+    display: flex;
+    justify-content: left;
+    width: 36px;
+  }
   &__panel {
     display: flex;
     :first-child {
diff --git a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss
index a66c052f39..977a08ef11 100644
--- a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.theme.scss
@@ -39,6 +39,9 @@
     &__menu-separator {
       background-color: mat-color($foreground, divider);
     }
+    &__history {
+      color: mat-color($foreground, text);
+    }
     &__underflow {
       background-color: $underflow-background;
       color: $underflow-foreground;
diff --git a/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.scss b/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.scss
index eb5f3810aa..316df10a25 100644
--- a/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.scss
+++ b/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.scss
@@ -39,7 +39,6 @@ $spacing: 10px;
 }
 
 .recent-tab {
-  padding-top: $spacing;
   &.standalone {
     padding-top: 0;
   }

From 14479c518a5467d17280f66175e8919747cf21e5 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Thu, 9 Jul 2020 10:06:49 +0100
Subject: [PATCH 574/648] Merge upstream (#406)

* WIP

* Add theme migration

* File moves

* WIP

* Add theme migration

* Start to make core a separate library

* Tweaks

* WIP

* Fix package imports

* Fix migration script

* First pass at permission effects

* Fix merge issues

* First pass at reducer

* Tidy up logging

* Fix dark theme support

* Final set of cloud-foundry code out of common

* TIdy up and get themable packages working

* Tidy up custom build code

* Tidy ups

* Set defaults when no stratos.yaml file is present

* FIx migrate script for when stratos.yaml not present

* Remove comments

* Disable scss linter from code climate

* Rejig example extensions to be a package for v4 build

* Renames, todos

* Minor fixes

* Fix frontend unit test

* Fix removed e2e target

* Fix unit tests

* Tweaks

* Finish todos

* Fix transition from space summary to app summary page
- an entity service for a space with no org was cached by guid
- an entity service for a space requiring org used cached version
- solution is to make cache id include schema key (determines with/without org)

* Add comment, tidy up rootUpdatingKey

* Fix issue where gitlab summary tab threw errors in console
- fixes #4325

* Push combine of permission configs into checkers
- overcomes some weird change of permission type

* Fix issue where default add/remove setting in change role by username was incorrect
- add/remove radio button default value governed by add/remove feature flags
- when one is set to false the radio button should be disabled and the other selected

* Fix store-test-helper

* Update readme following move to Travis-ci.com

* Ensure the correct key is used metacard favourite info (#4321)

* Fix display of details in endpoint card in endpoint list (#4319)

* Clean default/blocked logic

* Rename @stratos to @stratosui

* FIx references in tsconfig.json

* Revert change to @stratosui in code

* Revert change to @stratosui in code

* Fix endpoint connect

* Fix unit test

* Fix e2e test

* Change following review #1

* Bump github.com/gorilla/websocket from 1.4.1 to 1.4.2 in /src/jetstream (#4199)

* Bump github.com/gorilla/websocket from 1.4.1 to 1.4.2 in /src/jetstream

Bumps [github.com/gorilla/websocket](https://github.com/gorilla/websocket) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/gorilla/websocket/releases)
- [Commits](https://github.com/gorilla/websocket/compare/v1.4.1...v1.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Update go.sum

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>

* Fix errors in console log during setup screens

* Helm: Change default image pull policy to Always

* Add copy address and edit to endpoint list view

* Use icon that is less confusing with refresh

* Change following review #2
- Fix cf package module file name
- Make CUSTOM_USER_PERMISSION_CHECKERS optional
- Remove need to inject CUSTOM_USER_PERMISSION_CHECKERS in multiple cf modules

* Add newline at end for codeclimate

* Tidy up code and add some more comments

* Fix for buildpack filename wrapping on card

* Fix code climate issue

* Fix compilation issues

* Update endpoint-list.helpers.ts

* Improve naming

* Tidy up

* Update .gitignore

* Tidy up. Build tools in dist/tools

* Change following review

* Rename tools to devkit. Add schematics

* More improvements and theme schematic added.

* Bump gopkg.in/yaml.v2 from 2.2.8 to 2.3.0 in /src/jetstream (#4336)

* Bump gopkg.in/yaml.v2 from 2.2.8 to 2.3.0 in /src/jetstream

Bumps [gopkg.in/yaml.v2](https://github.com/go-yaml/yaml) from 2.2.8 to 2.3.0.
- [Release notes](https://github.com/go-yaml/yaml/releases)
- [Commits](https://github.com/go-yaml/yaml/compare/v2.2.8...v2.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* CI bump

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil_macdougall@hotmail.com>

* Remove unused import

* Remove unused import

* [Security] Bump websocket-extensions from 0.1.3 to 0.1.4 (#4356)

Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. **This update includes a security fix.**
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Hide deployment info card if not space developer
- fixes #4322

* Only space developers can create/unmap/delete routes in app routes table
- fixes #4324

* Only Space Developers should be able to change count, terminate or ssh to instances
- fixes #4330

* Permissions: Only Space Developers should be able to create/edit/delete an Autoscaler policy
- fixes #4323

* Users with no developer roles could click on add app button
- fixes #4361

* Fix tests

* Fail CI build if imagelist generation fails

* Org Managers: Disable org role checkboxes in roles stepper if not admin/org manager
- fixes #4332

* Routes List: Filter by org breaks when user is an org auditor
- fixes #4343

* Rename the e2e cf helper file

* Fix autoscaler tab

* Changes following review

* A few minor tidy-ups to help with review

* Fix several space developer permission bugs (#4362)

* Hide deployment info card if not space developer
- fixes #4322

* Only space developers can create/unmap/delete routes in app routes table
- fixes #4324

* Only Space Developers should be able to change count, terminate or ssh to instances
- fixes #4330

* Permissions: Only Space Developers should be able to create/edit/delete an Autoscaler policy
- fixes #4323

* Users with no developer roles could click on add app button
- fixes #4361

* Fix tests

* Fix autoscaler tab

* Changes following review

* Fix service stepper navigation (#4366)

* Fix service stepper navigation on create/edit cancel/sumbit
- create service stepper from app service tab, marketplace service summary, service wall
- edit service stepper from marketplace service instances, service wall instances, space service instances and app service instances lists
- fixes #4052, contrinbutes to #4079, #4051

* Fix subscription leak
- fixes #4295
- code no-longer needed

* Force return location of service stepper, fix table edit of upsi and other improvements

* Fix unit tests

* Fix e2e tests

* Fix e2e tests, add search to marketplace service instances table

* Changes following review

* Move base-entity-* to store package

* Add snackbar

* Remove pathget

* Remove more store -> core dependencies

* Move extension-types to store

* Move favourite mgr and helper from core to store

* Move user fav manager and helper to store package

* More references

* Fix logger service removal

* Fix build

* Address PR feedback

* Fix LoggerService after code moves

* Fix logger service ref

* Fix build issues

* Fix health check import

* Move sortStringify (only used once)

* NonOptionalKeys - only used once

* Move KnownKeys

* Move BrowserStandardEncoder

* Remove last environment link

* Move favourite config mapper

* Remove dependency on StratosScopeStrings

* Move BaseEndpointAuth

* Move StratosTheme

* Move ThemeService

* Move types from utils.service that are only used once in store

* Move PermissionValues

* Move http and jetstream helpers

* Move StyleService

* Move MetricQueryType

* Move getFullEndpointApiUrl

* Move StratosStatus

* Move generateStratosEntities back to core

* Finish store -> core sep

* Address PR feedback

* Fix compilation issue

* Fix merge weirdness

* Merge downstream (#4369)

* src based changes

* changes to ./build

* ./docs

* ./

* Changes following review

* Address PR feedback

* fix build

* whitespace changes

* Fix in core public-api after merge

* Fix duplicated k8s docs

* Typed access to actions and entities via catalog entity: Core Stratos Entities (#4387)

* WIP

* WIP

* WIP

* Endpoint changes

* Fix failure handling during connect on stepper

* Fix favourites

* Removed some TODOs

* Fixes & todos

* Unit test fixes

* Fixes following merge

* Fix cf unit tests

* Changes following review

* Theming improvements for header

* Tweaks, Migration Script Docs & Notes on others (#4389)

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

* Build devkit outside of dist folder

* Add dist-devkit to git ignore

* Ignore example packages when there's a stratos config file (#4399)

* Fix CF App Restage (#4393)

* Remove action entityLocation (not used)

* Fix restage
- fixes #4392

* Remove RequestEntityLocation

* Update icons (#4404)

* Update icons

* Update docker icon and optimize other pngs

* Improve resolution of container icon

* Update e2e test for new icons

* Improve theming to reduce need to override in a hacky way (#4407)

* Reduce icon size in page sub-header (#4411)

* Move out remaining items in cf & autoscaler from core to own packages, improve code splitting (#4412)

* Move out cf themese from _all-theme & remove custom cf table sort/filter field widths

* Move cf routes out of app.routing & move out cf route modules from cf package module (fixes code splitting)

* Fix autoscaler e2e test

* Split out CF modules and router imports into custom module

* Create cf-autoscaler package & routing modules
- note - CfAutoscalerModule is imported in CfAutoscalerPackageModule
- note - AutoscalerModule should be brought back into CfAutoscalerModule (stepper is lazy loaded.. but content missing elsewhere)

* Fix autoscaler e2e test #2

* Fix app autoscaler tab widgets, import using package name

* Move CfAutoscalerModule (app AS tab) out of always loaded AS package into lazy loaded app module

* Add comments, fix e2e test following app-running-instance change

* Allow routes to be applied to stratos navigation root without appearing in side nav

* Fix app-card-app-usage on app AS tab
- only seen when policy does not contain metrics restrictions
- fixes by bringing in CloudFoundrySharedModule again to CfAutoscalerModule
- means an also use app-running-instances again
- i've checked the chunks & sizes, they're similar as before

* Move CloudFoundrySharedModule out of CloudFoundryPackageModule

* Add comments

* Bring back in smaller search/sort input fields in main lists

* Bring back lost styling

* Use smaller page header on desktop browsers (#4418)

* Use smaller page header on desktop browsers

* Change tooltip appear time

* Fix issue where theming is not applied to extensions (#4420)

* Allow ng build to be un from any subfolder (#4422)

* Fix responsiveness of app instances card (#4423)

* Fix script to work in Jenkins (#4425)

* Build: Add support for packages in orgs (#4427)

* Allow ng build to be un from any subfolder

* Add support for packages in orgs

* Fixes after merge

* Fix build

Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil_macdougall@hotmail.com>
---
 angular.json                                  |   1 -
 package-lock.json                             | 234 ++++++++++++------
 .../packages/cf-autoscaler/package.json       |   7 +-
 .../cf-autoscaler/sass/_all-theme.scss        |   8 +
 .../src/cf-autoscaler-package.module.ts       |  17 ++
 .../src/cf-autoscaler-routing.module.ts       |  23 ++
 .../cf-autoscaler/src/cf-autoscaler.module.ts |  36 +--
 .../src/core/autoscaler.module.ts             |  13 +-
 .../edit-autoscaler-policy-step4.theme.scss}  |   0
 .../packages/cf-autoscaler/src/public_api.ts  |   5 +-
 .../packages/cloud-foundry/package.json       |   7 +-
 .../cloud-foundry/sass/_all-theme.scss        |  15 ++
 .../packages/cloud-foundry/sass/mixins.scss   |  20 ++
 .../src/cloud-foundry-package.module.ts       |  18 +-
 .../src/cloud-foundry-routing.module.ts       |  64 +++++
 .../src/cloud-foundry-test.module.ts          |   2 +-
 .../application-wall.component.theme.scss     |  11 +-
 .../application-base.component.theme.scss     |   5 -
 .../applications/applications.module.ts       |   6 +-
 ...ule.ts => cloud-foundry-section.module.ts} |  11 +-
 ...ng.ts => cloud-foundry-section.routing.ts} |   2 +-
 .../manage-users/cf-roles.service.spec.ts     |   6 +-
 .../service-catalog-page.component.theme.scss |  11 +-
 .../service-catalog/service-catalog.module.ts |   5 +-
 .../services-wall.component.theme.scss        |  10 +-
 .../src/features/services/services.module.ts  |   5 +-
 .../packages/cloud-foundry/src/public_api.ts  |   5 +-
 .../src/shared/cf-shared.module.ts            |   7 -
 .../card-app-instances.component.scss         |   1 -
 .../card-cf-info/card-cf-info.component.ts    |   4 +-
 .../src/store/cloud-foundry.store.module.ts   |   7 +
 .../packages/core/sass/_all-theme.scss        |  14 --
 .../packages/core/sass/mat-desktop.scss       |  36 ++-
 src/frontend/packages/core/sass/theme.scss    |   5 +
 src/frontend/packages/core/src/app.module.ts  |   4 -
 src/frontend/packages/core/src/app.routing.ts |  51 ----
 .../src/core/extension/extension-service.ts   |   2 +-
 .../side-nav/side-nav.component.html          |   1 +
 .../dashboard/side-nav/side-nav.component.ts  |   2 +-
 .../packages/core/src/shared/shared.module.ts |   4 +-
 src/frontend/packages/devkit/build.sh         |  11 +-
 .../packages/devkit/package-lock.json         |   2 +-
 src/frontend/packages/devkit/package.json     |   2 +-
 .../packages/devkit/src/build/extensions.ts   |   4 +-
 .../packages/devkit/src/lib/packages.ts       |   7 +-
 .../packages/devkit/src/lib/stratos.config.ts |  15 +-
 .../theme/files/package.json.template         |   8 +-
 .../kubernetes/workloads/workloads.module.ts  |   5 +-
 src/jetstream/go.sum                          |   8 +-
 .../po/card-autoscaler-default.po.ts          |   3 +-
 src/test-e2e/e2e.ts                           |   2 +-
 src/tsconfig.json                             |   4 +-
 52 files changed, 465 insertions(+), 291 deletions(-)
 create mode 100644 src/frontend/packages/cf-autoscaler/sass/_all-theme.scss
 create mode 100644 src/frontend/packages/cf-autoscaler/src/cf-autoscaler-package.module.ts
 create mode 100644 src/frontend/packages/cf-autoscaler/src/cf-autoscaler-routing.module.ts
 rename src/frontend/packages/cf-autoscaler/src/{styles.scss => features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.theme.scss} (100%)
 create mode 100644 src/frontend/packages/cloud-foundry/sass/mixins.scss
 create mode 100644 src/frontend/packages/cloud-foundry/src/cloud-foundry-routing.module.ts
 delete mode 100644 src/frontend/packages/cloud-foundry/src/features/applications/application/application-base.component.theme.scss
 rename src/frontend/packages/cloud-foundry/src/features/cloud-foundry/{cloud-foundry.module.ts => cloud-foundry-section.module.ts} (97%)
 rename src/frontend/packages/cloud-foundry/src/features/cloud-foundry/{cloud-foundry.routing.ts => cloud-foundry-section.routing.ts} (99%)

diff --git a/angular.json b/angular.json
index caa3bceaa9..b557dc7a20 100644
--- a/angular.json
+++ b/angular.json
@@ -32,7 +32,6 @@
             ],
             "styles": [
               "src/frontend/packages/core/src/styles.scss",
-              "src/frontend/packages/cf-autoscaler/src/styles.scss",
               "node_modules/xterm/css/xterm.css"
             ],
             "scripts": []
diff --git a/package-lock.json b/package-lock.json
index 348215c0d1..eec8e18f4e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2512,9 +2512,9 @@
           }
         },
         "@babel/helper-validator-identifier": {
-          "version": "7.10.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.3.tgz",
-          "integrity": "sha512-bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw==",
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
+          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
           "dev": true
         },
         "@babel/types": {
@@ -4060,7 +4060,8 @@
     "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",
@@ -4074,7 +4075,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",
@@ -4088,7 +4090,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",
@@ -4180,7 +4183,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",
@@ -4264,7 +4268,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",
@@ -4335,7 +4340,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.7.4",
@@ -4526,6 +4532,7 @@
       "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",
@@ -4540,6 +4547,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"
           }
@@ -4548,6 +4556,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"
           }
@@ -4556,6 +4565,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"
           }
@@ -4564,6 +4574,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",
@@ -5180,6 +5191,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",
@@ -5448,6 +5460,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",
@@ -5459,6 +5472,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"
           }
@@ -5683,6 +5697,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"
@@ -5771,7 +5786,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",
@@ -5941,7 +5957,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",
@@ -6104,7 +6121,8 @@
     "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",
@@ -6687,6 +6705,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"
       }
@@ -6705,7 +6724,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",
@@ -6833,6 +6853,7 @@
       "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"
@@ -6842,6 +6863,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"
           }
@@ -6850,6 +6872,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"
           }
@@ -6858,6 +6881,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",
@@ -7923,6 +7947,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",
@@ -7937,6 +7962,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"
           }
@@ -7945,6 +7971,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"
           }
@@ -8022,6 +8049,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"
@@ -8031,6 +8059,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"
           }
@@ -8052,6 +8081,7 @@
       "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",
@@ -8067,6 +8097,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"
           }
@@ -8075,6 +8106,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"
           }
@@ -8083,6 +8115,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"
           }
@@ -8091,6 +8124,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"
           }
@@ -8099,6 +8133,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",
@@ -8566,7 +8601,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",
@@ -8657,6 +8693,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"
       }
@@ -8745,32 +8782,6 @@
           "requires": {
             "yallist": "^4.0.0"
           }
-        },
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "requires": {
-            "remove-trailing-separator": "^1.0.1"
-          }
-        },
-        "readdirp": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-          "requires": {
-            "graceful-fs": "^4.1.11",
-            "micromatch": "^3.1.10",
-            "readable-stream": "^2.0.2"
-          }
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "requires": {
-            "repeat-string": "^1.6.1"
-          }
         }
       }
     },
@@ -8867,7 +8878,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",
@@ -9235,7 +9247,8 @@
     "graceful-fs": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+      "dev": true
     },
     "graphlib": {
       "version": "2.1.8",
@@ -9509,6 +9522,7 @@
       "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",
@@ -9519,6 +9533,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"
@@ -9528,6 +9543,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"
           },
@@ -9536,6 +9552,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"
               }
@@ -9546,6 +9563,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"
           }
@@ -9969,7 +9987,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",
@@ -10156,6 +10175,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"
       },
@@ -10164,6 +10184,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"
           }
@@ -10200,7 +10221,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",
@@ -10235,6 +10257,7 @@
       "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"
       },
@@ -10243,6 +10266,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"
           }
@@ -10259,6 +10283,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",
@@ -10268,7 +10293,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
         }
       }
     },
@@ -10287,7 +10313,8 @@
     "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",
@@ -10412,6 +10439,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"
       }
@@ -10528,7 +10556,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": "2.2.0",
@@ -10548,7 +10577,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": "4.0.6",
@@ -10564,7 +10594,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",
@@ -11418,11 +11449,6 @@
           "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=="
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -11449,11 +11475,6 @@
             "ansi-regex": "^5.0.0"
           }
         },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
-        },
         "to-regex-range": {
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -11707,7 +11728,8 @@
     "kind-of": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true
     },
     "klaw-sync": {
       "version": "2.1.0",
@@ -12214,7 +12236,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",
@@ -12226,6 +12249,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"
       }
@@ -12485,6 +12509,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",
@@ -12505,6 +12530,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",
@@ -12522,6 +12548,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"
               }
@@ -12532,6 +12559,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",
@@ -12543,6 +12571,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"
               }
@@ -12553,6 +12582,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"
           },
@@ -12561,6 +12591,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"
               }
@@ -12571,6 +12602,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"
@@ -12832,6 +12864,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"
@@ -12841,6 +12874,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"
           }
@@ -12900,7 +12934,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",
@@ -12945,6 +12980,7 @@
       "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",
@@ -13983,6 +14019,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",
@@ -13993,6 +14030,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"
           }
@@ -14001,6 +14039,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"
           }
@@ -14114,6 +14153,7 @@
       "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"
       }
@@ -14247,6 +14287,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"
       }
@@ -14939,7 +14980,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",
@@ -15194,7 +15236,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.27",
@@ -15908,7 +15951,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
     },
     "process-on-spawn": {
       "version": "1.0.0",
@@ -16508,6 +16552,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",
@@ -16608,6 +16653,7 @@
       "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"
@@ -16792,17 +16838,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
     },
     "replace-ext": {
       "version": "1.0.0",
@@ -17171,7 +17220,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",
@@ -17195,7 +17245,8 @@
     "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",
@@ -17527,12 +17578,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"
       }
@@ -17918,6 +17971,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",
@@ -17929,6 +17983,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"
           }
@@ -18029,6 +18084,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",
@@ -18044,6 +18100,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"
           }
@@ -18052,6 +18109,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"
           }
@@ -18062,6 +18120,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",
@@ -18072,6 +18131,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"
           }
@@ -18080,6 +18140,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"
           }
@@ -18088,6 +18149,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"
           }
@@ -18096,6 +18158,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",
@@ -18108,6 +18171,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"
       },
@@ -18116,6 +18180,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"
           }
@@ -18371,6 +18436,7 @@
       "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",
@@ -18400,7 +18466,8 @@
     "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.8",
@@ -18588,6 +18655,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"
       }
@@ -18665,6 +18733,7 @@
       "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"
@@ -18674,6 +18743,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"
           }
@@ -19082,6 +19152,7 @@
       "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"
       }
@@ -19789,6 +19860,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"
       },
@@ -19797,6 +19869,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"
           }
@@ -19813,6 +19886,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",
@@ -20106,6 +20180,7 @@
       "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",
@@ -20212,6 +20287,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"
@@ -20221,6 +20297,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",
@@ -20231,6 +20308,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"
               }
@@ -20240,7 +20318,8 @@
         "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
         }
       }
     },
@@ -20334,7 +20413,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",
@@ -20390,7 +20470,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",
@@ -20421,7 +20502,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",
diff --git a/src/frontend/packages/cf-autoscaler/package.json b/src/frontend/packages/cf-autoscaler/package.json
index 5258e6ebc3..0c833ab0ae 100644
--- a/src/frontend/packages/cf-autoscaler/package.json
+++ b/src/frontend/packages/cf-autoscaler/package.json
@@ -1,8 +1,13 @@
 {
-  "name": "cf-autoscaler",
+  "name": "@stratosui/cf-autoscaler",
   "version": "0.0.1",
   "peerDependencies": {
     "@angular/common": "^6.0.0-rc.0 || ^6.0.0",
     "@angular/core": "^6.0.0-rc.0 || ^6.0.0"
+  },
+  "stratos": {
+    "module": "CfAutoscalerPackageModule",
+    "routingModule": "CfAutoscalerRoutingModule",
+    "theming": "sass/_all-theme#apply-theme-stratos-autoscaler"
   }
 }
diff --git a/src/frontend/packages/cf-autoscaler/sass/_all-theme.scss b/src/frontend/packages/cf-autoscaler/sass/_all-theme.scss
new file mode 100644
index 0000000000..8a54bf0ff5
--- /dev/null
+++ b/src/frontend/packages/cf-autoscaler/sass/_all-theme.scss
@@ -0,0 +1,8 @@
+@import '../src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.theme';
+
+@mixin apply-theme-stratos-autoscaler($stratos-theme) {
+
+  $theme: map-get($stratos-theme, theme);
+  $app-theme: map-get($stratos-theme, app-theme);
+
+}
diff --git a/src/frontend/packages/cf-autoscaler/src/cf-autoscaler-package.module.ts b/src/frontend/packages/cf-autoscaler/src/cf-autoscaler-package.module.ts
new file mode 100644
index 0000000000..adf5c8b4cb
--- /dev/null
+++ b/src/frontend/packages/cf-autoscaler/src/cf-autoscaler-package.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { EffectsModule } from '@ngrx/effects';
+
+import { EntityCatalogModule } from '../../store/src/entity-catalog.module';
+import { generateASEntities } from './store/autoscaler-entity-generator';
+import { AutoscalerEffects } from './store/autoscaler.effects';
+
+@NgModule({
+  imports: [
+    EntityCatalogModule.forFeature(generateASEntities),
+    EffectsModule.forFeature([
+      AutoscalerEffects
+    ]),
+  ],
+})
+export class CfAutoscalerPackageModule { }
+
diff --git a/src/frontend/packages/cf-autoscaler/src/cf-autoscaler-routing.module.ts b/src/frontend/packages/cf-autoscaler/src/cf-autoscaler-routing.module.ts
new file mode 100644
index 0000000000..85f4dcbb8e
--- /dev/null
+++ b/src/frontend/packages/cf-autoscaler/src/cf-autoscaler-routing.module.ts
@@ -0,0 +1,23 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+
+// Things in this path include add/edit policy stepper, policy metrics page and policy events page
+// They're include like this to ensure those parts are lazy loaded.
+// The core application policy tab is included via CfAutoscalerModule, which is imported in the Application Module
+const customRoutes: Routes = [
+  {
+    path: 'autoscaler',
+    loadChildren: () => import('./core/autoscaler.module').then(m => m.AutoscalerModule),
+    data: {
+      // Required to place content in the mat-drawer-content/.page-content container
+      stratosNavigationPage: true
+    },
+  },
+];
+
+@NgModule({
+  imports: [
+    RouterModule.forRoot(customRoutes),
+  ],
+})
+export class CfAutoscalerRoutingModule { }
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 e470be161e..95b411929b 100644
--- a/src/frontend/packages/cf-autoscaler/src/cf-autoscaler.module.ts
+++ b/src/frontend/packages/cf-autoscaler/src/cf-autoscaler.module.ts
@@ -1,36 +1,15 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-import { EffectsModule } from '@ngrx/effects';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
-import { of } from 'rxjs';
+import { ExtensionService } from 'frontend/packages/core/src/core/extension/extension-service';
 
 import { CloudFoundrySharedModule } from '../../cloud-foundry/src/shared/cf-shared.module';
 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 { 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';
-import { AutoscalerEffects } from './store/autoscaler.effects';
-import { ExtensionService } from 'frontend/packages/core/src/core/extension/extension-service';
+import { CardAutoscalerDefaultComponent } from './shared/card-autoscaler-default/card-autoscaler-default.component';
 
-// FIXME Work out why we need this and remove it.
-const customRoutes: Routes = [
-  {
-    path: 'autoscaler',
-    loadChildren: () => import('./core/autoscaler.module').then(m => m.AutoscalerModule),
-    data: {
-      stratosNavigation: {
-        text: 'Applications',
-        matIcon: 'apps',
-        position: 20,
-        hidden: of(true)
-      }
-    },
-  },
-];
 
 @NgModule({
   imports: [
@@ -38,20 +17,15 @@ const customRoutes: Routes = [
     CommonModule,
     SharedModule,
     MDAppModule,
-    NgxChartsModule,
     CloudFoundrySharedModule,
-    AutoscalerModule,
-    RouterModule.forRoot(customRoutes),
-    EntityCatalogModule.forFeature(generateASEntities),
-    EffectsModule.forFeature([
-      AutoscalerEffects
-    ]),
+    NgxChartsModule,
     ExtensionService.declare([
       AutoscalerTabExtensionComponent,
     ])
   ],
   declarations: [
-    AutoscalerTabExtensionComponent
+    CardAutoscalerDefaultComponent,
+    AutoscalerTabExtensionComponent,
   ]
 })
 export class CfAutoscalerModule { }
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 cb76b829f2..4a92214407 100644
--- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts
+++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts
@@ -1,7 +1,11 @@
+import { DatePipe } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
 import { ApplicationService } from '../../../cloud-foundry/src/features/applications/application.service';
+import {
+  ApplicationEnvVarsHelper,
+} from '../../../cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service';
 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';
@@ -26,7 +30,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 { CardAutoscalerDefaultComponent } from '../shared/card-autoscaler-default/card-autoscaler-default.component';
 import {
   TableCellAutoscalerEventChangeIconPipe,
 } from '../shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe';
@@ -69,7 +72,6 @@ import { AutoscalerRoutingModule } from './autoscaler.routing';
     EditAutoscalerPolicyStep3Component,
     EditAutoscalerPolicyStep4Component,
     EditAutoscalerCredentialComponent,
-    CardAutoscalerDefaultComponent,
     AppAutoscalerMetricChartCardComponent,
     AppAutoscalerComboChartComponent,
     AppAutoscalerComboSeriesVerticalComponent,
@@ -78,11 +80,10 @@ import { AutoscalerRoutingModule } from './autoscaler.routing';
     TableCellAutoscalerEventStatusIconPipe,
     TableCellAutoscalerEventChangeIconPipe,
   ],
-  exports: [
-    CardAutoscalerDefaultComponent
-  ],
   providers: [
-    ApplicationService
+    ApplicationService,
+    ApplicationEnvVarsHelper,
+    DatePipe
   ]
 })
 export class AutoscalerModule { }
diff --git a/src/frontend/packages/cf-autoscaler/src/styles.scss b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.theme.scss
similarity index 100%
rename from src/frontend/packages/cf-autoscaler/src/styles.scss
rename to src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.theme.scss
diff --git a/src/frontend/packages/cf-autoscaler/src/public_api.ts b/src/frontend/packages/cf-autoscaler/src/public_api.ts
index 24160374d0..56ee5fc0d6 100644
--- a/src/frontend/packages/cf-autoscaler/src/public_api.ts
+++ b/src/frontend/packages/cf-autoscaler/src/public_api.ts
@@ -2,5 +2,6 @@
  * Public API Surface of cloud-foundry
  */
 
-// export * from './lib/cloud-foundry.service';
-export * from './lib/cf-autoscaler.module';
+export * from './cf-autoscaler-package.module';
+export * from './cf-autoscaler-routing.module';
+export * from './core/autoscaler-helpers/autoscaler-available';
diff --git a/src/frontend/packages/cloud-foundry/package.json b/src/frontend/packages/cloud-foundry/package.json
index 844bc32e3a..370dd15236 100644
--- a/src/frontend/packages/cloud-foundry/package.json
+++ b/src/frontend/packages/cloud-foundry/package.json
@@ -1,12 +1,13 @@
 {
-  "name": "cloud-foundry",
+  "name": "@stratosui/cloud-foundry",
   "version": "0.0.1",
   "peerDependencies": {
     "@angular/common": "^6.0.0-rc.0 || ^6.0.0",
     "@angular/core": "^6.0.0-rc.0 || ^6.0.0"
   },
   "stratos": {
+    "module": "CloudFoundryPackageModule",
+    "routingModule": "CloudFoundryRoutingModule",
     "theming": "sass/_all-theme#apply-theme-stratos-cloud-foundry"
   }
-
-}
\ No newline at end of file
+}
diff --git a/src/frontend/packages/cloud-foundry/sass/_all-theme.scss b/src/frontend/packages/cloud-foundry/sass/_all-theme.scss
index fd92ae1354..b344095253 100644
--- a/src/frontend/packages/cloud-foundry/sass/_all-theme.scss
+++ b/src/frontend/packages/cloud-foundry/sass/_all-theme.scss
@@ -1,7 +1,16 @@
 // Theming for the copmponents in the Cloud Foundry package
 
+
 @import '../src/features/applications/application-wall/application-wall.component.theme';
+@import '../src/features/services/services-wall/services-wall.component.theme';
+@import '../src/features/service-catalog/service-catalog-page/service-catalog-page.component.theme';
+
 @import '../src/shared/components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component.theme';
+@import '../src/shared/components/schema-form/schema-form.component.theme';
+@import '../src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.theme';
+@import '../src/features/applications/deploy-application/deploy-application.component.theme';
+@import '../src/features/applications/deploy-application/deploy-application-step2/deploy-application-fs/deploy-application-fs.component.theme';
+@import '../src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.theme';
 
 @mixin apply-theme-stratos-cloud-foundry($stratos-theme) {
 
@@ -9,4 +18,10 @@
   $app-theme: map-get($stratos-theme, app-theme);
 
   @include cf-security-group-theme($theme);
+  @include app-schema-form-theme($theme, $app-theme);
+  @include cf-admin-add-user-warning($theme, $app-theme);
+  @include app-deploy-app-theme($theme, $app-theme);
+  @include app-deploy-app-fs-component-theme($theme, $app-theme);
+  @include app-cloud-foundry-firehose-theme($theme, $app-theme);
+
 }
diff --git a/src/frontend/packages/cloud-foundry/sass/mixins.scss b/src/frontend/packages/cloud-foundry/sass/mixins.scss
new file mode 100644
index 0000000000..6d4ec43454
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/sass/mixins.scss
@@ -0,0 +1,20 @@
+@mixin apply-smaller-list-input {
+
+  @include breakpoint(phablet) {
+    .list-component__header__right-filter {
+      width: 140px;
+    }
+    .list-component__header__right-sort {
+      width: 120px;
+    }
+  }
+
+  @include breakpoint(laptop) {
+    .list-component__header__right-filter {
+      width: inherit;
+    }
+    .list-component__header__right-sort {
+      width: inherit;
+    }
+  }
+}
diff --git a/src/frontend/packages/cloud-foundry/src/cloud-foundry-package.module.ts b/src/frontend/packages/cloud-foundry/src/cloud-foundry-package.module.ts
index 6e088679f4..410bbe7b18 100644
--- a/src/frontend/packages/cloud-foundry/src/cloud-foundry-package.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/cloud-foundry-package.module.ts
@@ -5,14 +5,10 @@ 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 { generateCFEntities } from './cf-entity-generator';
-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 { 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';
+import { GitSCMService } from './shared/data-services/scm/scm.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';
@@ -24,18 +20,7 @@ import { cfCurrentUserPermissionsService } from './user-permissions/cf-user-perm
     CommonModule,
     SharedModule,
     MDAppModule,
-    ApplicationsModule,
-    CloudFoundryModule,
-    ServiceCatalogModule,
-    ServicesModule,
     CloudFoundryStoreModule,
-    // FIXME: Ensure that anything lazy loaded is not included here - #3675
-    CloudFoundrySharedModule,
-    // FIXME: Move cf effects into cf module - #3675
-    // EffectsModule.for Root([
-    //   PermissionsEffects,
-    //   PermissionEffects
-    // ])
   ],
   providers: [
     ...cfCurrentUserPermissionsService,
@@ -44,6 +29,7 @@ import { cfCurrentUserPermissionsService } from './user-permissions/cf-user-perm
     ServiceActionHelperService,
     LongRunningCfOperationsService,
     CloudFoundryUserProvidedServicesService,
+    GitSCMService,
   ]
 })
 export class CloudFoundryPackageModule { }
diff --git a/src/frontend/packages/cloud-foundry/src/cloud-foundry-routing.module.ts b/src/frontend/packages/cloud-foundry/src/cloud-foundry-routing.module.ts
new file mode 100644
index 0000000000..0266310650
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/cloud-foundry-routing.module.ts
@@ -0,0 +1,64 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+
+const customRoutes: Routes = [
+  {
+    path: 'applications',
+    loadChildren: () => import('./features/applications/applications.module').then(m => m.ApplicationsModule),
+    data: {
+      stratosNavigation: {
+        label: 'Applications',
+        matIcon: 'apps',
+        requiresEndpointType: 'cf',
+        position: 20
+      }
+    },
+  },
+  {
+    path: 'marketplace',
+    loadChildren: () => import('./features/service-catalog/service-catalog.module')
+      .then(m => m.ServiceCatalogModule),
+    data: {
+      stratosNavigation: {
+        label: 'Marketplace',
+        matIcon: 'store',
+        requiresEndpointType: 'cf',
+        position: 30
+      }
+    },
+  },
+  {
+    path: 'services',
+    loadChildren: () => import('./features/services/services.module').then(m => m.ServicesModule),
+    data: {
+      stratosNavigation: {
+        label: 'Services',
+        matIcon: 'service',
+        matIconFont: 'stratos-icons',
+        requiresEndpointType: 'cf',
+        position: 40
+      }
+    },
+  },
+  {
+    path: 'cloud-foundry',
+    loadChildren: () => import('./features/cloud-foundry/cloud-foundry-section.module').then(m => m.CloudFoundrySectionModule),
+    data: {
+      stratosNavigation: {
+        label: 'Cloud Foundry',
+        matIcon: 'cloud_foundry',
+        matIconFont: 'stratos-icons',
+        requiresEndpointType: 'cf',
+        position: 50
+      }
+    },
+  },
+]
+
+@NgModule({
+  imports: [
+    RouterModule.forRoot(customRoutes),
+  ],
+  declarations: []
+})
+export class CloudFoundryRoutingModule { }
\ No newline at end of file
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 99bfc37bbd..5bb932f851 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
@@ -29,7 +29,7 @@ import { CloudFoundryStoreModule } from './store/cloud-foundry.store.module';
             return [
               ...generateCFEntities(),
               ...generateStratosEntities(),
-              ...generateASEntities(), // FIXME: CF should not depend on autoscaler. See #3916
+              ...generateASEntities(), // FIXME: Remove hard link between cf and autoscaler packages #4416
             ];
           }
         }
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-wall/application-wall.component.theme.scss b/src/frontend/packages/cloud-foundry/src/features/applications/application-wall/application-wall.component.theme.scss
index 81840ebdad..053873e20b 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application-wall/application-wall.component.theme.scss
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-wall/application-wall.component.theme.scss
@@ -1,9 +1,6 @@
-// For the App Wall, reduce the size of the filter and sort
+@import '../../../../sass/mixins';
+
 .app-wall {
-  .list-component__header__right-filter {
-    width: 140px;
-  }
-  .list-component__header__right-sort {
-    width: 120px;
-  }
+  @include apply-smaller-list-input;
 }
+
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-base.component.theme.scss b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-base.component.theme.scss
deleted file mode 100644
index 8d1f7fa03d..0000000000
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-base.component.theme.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@mixin app-base-page-theme($theme, $app-theme) {
-  .summary__nav {
-    //background-color: map-get($app-theme, app-background-color);
-  }
-}
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 ce3afe8842..ce590dbaa6 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
@@ -1,6 +1,7 @@
 import { DatePipe } from '@angular/common';
 import { NgModule } from '@angular/core';
 
+import { CfAutoscalerModule } from '../../../../cf-autoscaler/src/cf-autoscaler.module';
 import { CoreModule } from '../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
 import { CloudFoundrySharedModule } from '../../shared/cf-shared.module';
@@ -38,12 +39,15 @@ import { AddRoutesComponent } from './routes/add-routes/add-routes.component';
 import { MapRoutesComponent } from './routes/map-routes/map-routes.component';
 import { SshApplicationComponent } from './ssh-application/ssh-application.component';
 
+
 @NgModule({
   imports: [
     CoreModule,
     SharedModule,
     ApplicationsRoutingModule,
-    CloudFoundrySharedModule
+    CloudFoundrySharedModule,
+    // FIXME: Remove hard link between cf and autoscaler packages #4416
+    CfAutoscalerModule
   ],
   declarations: [
     ApplicationWallComponent,
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-section.module.ts
similarity index 97%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.module.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-section.module.ts
index 76e9e15ff3..ca523e3b30 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-section.module.ts
@@ -1,8 +1,10 @@
+import { CommonModule, DatePipe } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
 import { CoreModule } from '../../../../core/src/core/core.module';
+import { MDAppModule } from '../../../../core/src/public-api';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
 import { CloudFoundrySharedModule } from '../../shared/cf-shared.module';
 import {
@@ -21,8 +23,8 @@ import { CreateSpaceStepComponent } from './add-space/create-space-step/create-s
 import { ActiveRouteCfCell, ActiveRouteCfOrgSpace } from './cf-page.types';
 import { CliInfoCloudFoundryComponent } from './cli-info-cloud-foundry/cli-info-cloud-foundry.component';
 import { CloudFoundryBaseComponent } from './cloud-foundry-base/cloud-foundry-base.component';
+import { CloudFoundrySectionRoutingModule } from './cloud-foundry-section.routing';
 import { CloudFoundryTabsBaseComponent } from './cloud-foundry-tabs-base/cloud-foundry-tabs-base.component';
-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';
@@ -135,9 +137,11 @@ import { RemoveUserComponent } from './users/remove-user/remove-user.component';
 
 @NgModule({
   imports: [
+    CommonModule,
     CoreModule,
     SharedModule,
-    CloudFoundryRoutingModule,
+    MDAppModule,
+    CloudFoundrySectionRoutingModule,
     RouterModule,
     NgxChartsModule,
     CloudFoundrySharedModule
@@ -228,9 +232,10 @@ import { RemoveUserComponent } from './users/remove-user/remove-user.component';
     CloudFoundryCellService,
     UserInviteService,
     UserInviteConfigureService,
+    DatePipe
   ],
   entryComponents: [
     UserInviteConfigurationDialogComponent
   ]
 })
-export class CloudFoundryModule { }
+export class CloudFoundrySectionModule { }
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-section.routing.ts
similarity index 99%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.routing.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-section.routing.ts
index cdfcacbe8b..258d2b2163 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-section.routing.ts
@@ -427,4 +427,4 @@ const cloudFoundry: Routes = [{
 @NgModule({
   imports: [RouterModule.forChild(cloudFoundry)]
 })
-export class CloudFoundryRoutingModule { }
+export class CloudFoundrySectionRoutingModule { }
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.spec.ts
index 14e0a46dd7..90e369eeec 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.spec.ts
@@ -1,12 +1,12 @@
+import { HttpClientModule } from '@angular/common/http';
 import { inject, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
 import { SharedModule } from '../../../../../../core/src/shared/shared.module';
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { CfUserService } from '../../../../shared/data-services/cf-user.service';
-import { CloudFoundryModule } from '../../cloud-foundry.module';
+import { CloudFoundrySectionModule } from '../../cloud-foundry-section.module';
 import { CfRolesService } from './cf-roles.service';
-import { HttpClientModule } from '@angular/common/http';
 
 describe('CfRolesService', () => {
   beforeEach(() => {
@@ -14,7 +14,7 @@ describe('CfRolesService', () => {
       imports: [
         ...generateCfStoreModules(),
         SharedModule,
-        CloudFoundryModule,
+        CloudFoundrySectionModule,
         HttpClientModule,
         RouterTestingModule
       ],
diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog-page/service-catalog-page.component.theme.scss b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog-page/service-catalog-page.component.theme.scss
index d2b75ca4fd..34874c1bd6 100644
--- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog-page/service-catalog-page.component.theme.scss
+++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog-page/service-catalog-page.component.theme.scss
@@ -1,9 +1,6 @@
-// For the Services Catalog, reduce the size of the filter and sort
+@import '../../../../sass/mixins';
+
 .marketplace {
-  .list-component__header__right-filter {
-    width: 140px;
-  }
-  .list-component__header__right-sort {
-    width: 120px;
-  }
+  @include apply-smaller-list-input;
 }
+
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 a959216d92..f2d5dec61b 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
@@ -1,4 +1,4 @@
-import { CommonModule } from '@angular/common';
+import { CommonModule, DatePipe } from '@angular/common';
 import { NgModule } from '@angular/core';
 
 import { CoreModule } from '../../../../core/src/core/core.module';
@@ -33,6 +33,9 @@ import { ServiceTabsBaseComponent } from './service-tabs-base/service-tabs-base.
   ],
   exports: [
     ServiceTabsBaseComponent,
+  ],
+  providers: [
+    DatePipe
   ]
 })
 export class ServiceCatalogModule { }
diff --git a/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.theme.scss b/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.theme.scss
index 73f218c996..ef6a14c026 100644
--- a/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.theme.scss
+++ b/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.theme.scss
@@ -1,9 +1,5 @@
-// For the Services Wall, reduce the size of the filter and sort
+@import '../../../../sass/mixins';
+
 .services-wall {
-  .list-component__header__right-filter {
-    width: 140px;
-  }
-  .list-component__header__right-sort {
-    width: 120px;
-  }
+  @include apply-smaller-list-input;
 }
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 628dced999..0680c4e2ff 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
@@ -1,4 +1,4 @@
-import { CommonModule } from '@angular/common';
+import { CommonModule, DatePipe } from '@angular/common';
 import { NgModule } from '@angular/core';
 
 import {
@@ -27,6 +27,9 @@ import { ServicesRoutingModule } from './services.routing';
     ServicesWallComponent,
     DetachServiceInstanceComponent,
     DetachAppsComponent
+  ],
+  providers: [
+    DatePipe
   ]
 })
 export class ServicesModule { }
diff --git a/src/frontend/packages/cloud-foundry/src/public_api.ts b/src/frontend/packages/cloud-foundry/src/public_api.ts
index dbe7a16cbd..0d517d9617 100644
--- a/src/frontend/packages/cloud-foundry/src/public_api.ts
+++ b/src/frontend/packages/cloud-foundry/src/public_api.ts
@@ -2,8 +2,7 @@
  * Public API Surface of cloud-foundry
  */
 
-// export * from './lib/cloud-foundry.service';
-export * from './lib/cloud-foundry.component';
-export * from './lib/cloud-foundry.module';
+export * from './cloud-foundry-package.module';
+export * from './cloud-foundry-routing.module';
 
 export * from './cf-api-svc.types';
\ No newline at end of file
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 aeef92fd78..faca9700ab 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
@@ -202,15 +202,11 @@ import { ServiceIconComponent } from './components/service-icon/service-icon.com
 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 { CfUserPermissionDirective } from './directives/cf-user-permission/cf-user-permission.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,
@@ -267,8 +263,6 @@ const cfListCards: Type<CardCell<any>>[] = [
   UserProvidedServiceInstanceCardComponent,
 ];
 
-// listTableCells.push();
-
 @NgModule({
   imports: [
     CommonModule,
@@ -378,7 +372,6 @@ const cfListCards: Type<CardCell<any>>[] = [
   ],
   providers: [
     ApplicationStateService,
-    GitSCMService,
     CloudFoundryUserProvidedServicesService
   ]
 })
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.scss
index 968da2d3a6..0678a84db3 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.scss
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.scss
@@ -5,7 +5,6 @@
 
   &__compact {
     margin-bottom: 0;
-    position: absolute;
   }
 
   &__actions {
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 503ac52c40..89afc74d73 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,10 +1,10 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
+import { fetchAutoscalerInfo } from '@stratosui/cf-autoscaler';
 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';
@@ -16,7 +16,6 @@ import {
   UserInviteService,
 } from '../../../../features/cloud-foundry/user-invites/user-invite.service';
 
-
 @Component({
   selector: 'app-card-cf-info',
   templateUrl: './card-cf-info.component.html',
@@ -50,6 +49,7 @@ export class CardCfInfoComponent implements OnInit, OnDestroy {
     );
 
     // FIXME: CF should not depend on autoscaler. See #3916
+    // FIXME: Remove hard link between cf and autoscaler packages #4416
     this.autoscalerVersion$ = fetchAutoscalerInfo(this.cfEndpointService.cfGuid, this.esf).pipe(
       map(e => e.entityRequestInfo.error ?
         null :
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 f2c9b707bd..700bf7c0a7 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
@@ -1,6 +1,7 @@
 import { NgModule } from '@angular/core';
 import { EffectsModule } from '@ngrx/effects';
 
+import { ActiveRouteCfOrgSpace } from '../features/cloud-foundry/cf-page.types';
 import { CloudFoundryReducersModule } from './cloud-foundry.reducers.module';
 import { AppVariablesEffect } from './effects/app-variables.effects';
 import { AppEffects } from './effects/app.effects';
@@ -30,6 +31,12 @@ import { UsersRolesEffects } from './effects/users-roles.effects';
       CfValidateEffects,
       UsersRolesEffects
     ])
+  ],
+  providers: [
+    {
+      provide: ActiveRouteCfOrgSpace,
+      useValue: {}
+    },
   ]
 })
 export class CloudFoundryStoreModule { }
diff --git a/src/frontend/packages/core/sass/_all-theme.scss b/src/frontend/packages/core/sass/_all-theme.scss
index 950f0d84f3..c611d62d9a 100644
--- a/src/frontend/packages/core/sass/_all-theme.scss
+++ b/src/frontend/packages/core/sass/_all-theme.scss
@@ -55,14 +55,6 @@
 @import '../src/shared/components/favorites-global-list/favorites-global-list.component.theme';
 @import '../src/shared/components/favorites-meta-card/favorites-meta-card.component.theme';
 
-@import '../../cloud-foundry/src/shared/components/schema-form/schema-form.component.theme';
-@import '../../cloud-foundry/src/features/services/services-wall/services-wall.component.theme';
-@import '../../cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.theme';
-@import '../../cloud-foundry/src/features/applications/application/application-base.component.theme';
-@import '../../cloud-foundry/src/features/applications/deploy-application/deploy-application.component.theme';
-@import '../../cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-fs/deploy-application-fs.component.theme';
-@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 '../../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';
@@ -88,7 +80,6 @@
   @include display-value-theme($theme, $app-theme);
   @include steppers-theme($theme, $app-theme);
   @include list-theme($theme, $app-theme);
-  @include app-base-page-theme($theme, $app-theme);
   @include app-mat-snack-bar-theme($theme, $app-theme);
   @include ngx-charts-gauge($theme, $app-theme);
   @include app-text-status-theme($theme, $app-theme);
@@ -101,8 +92,6 @@
   @include app-boolean-indicator-theme($theme, $app-theme);
   @include loading-page-theme($theme, $app-theme);
   @include app-log-viewer-theme($theme, $app-theme);
-  @include app-deploy-app-theme($theme, $app-theme);
-  @include app-cloud-foundry-firehose-theme($theme, $app-theme);
   @include app-card-number-metric-theme($theme, $app-theme);
   @include app-card-boolean-metric-theme($theme, $app-theme);
   @include app-dot-content($theme, $app-theme);
@@ -111,12 +100,10 @@
   @include app-page-header-events($theme, $app-theme);
   @include app-user-profile-banner-component-theme($theme, $app-theme);
   @include action-monitor-icon-theme($theme, $app-theme);
-  @include app-deploy-app-fs-component-theme($theme, $app-theme);
   @include app-upload-progress-indicator-component-theme($theme, $app-theme);
   @include page-404($theme, $app-theme);
   @include about-page-theme($theme, $app-theme);
   @include meta-card-component($theme, $app-theme);
-  @include app-schema-form-theme($theme, $app-theme);
   @include start-end-theme($theme, $app-theme);
   @include metrics-chart-theme($theme, $app-theme);
   @include metrics-range-selector-theme($theme, $app-theme);
@@ -130,7 +117,6 @@
   @include favorites-global-list-theme($theme, $app-theme);
   @include favorites-meta-card-theme($theme, $app-theme);
   @include page-side-nav-theme($theme, $app-theme);
-  @include cf-admin-add-user-warning($theme, $app-theme);
   @include entity-summary-title-theme($theme, $app-theme);
   @include app-meta-card-item-theme($theme, $app-theme);
   @include error-page-theme($theme, $app-theme);
diff --git a/src/frontend/packages/core/sass/mat-desktop.scss b/src/frontend/packages/core/sass/mat-desktop.scss
index ba52598bfd..f47438d989 100644
--- a/src/frontend/packages/core/sass/mat-desktop.scss
+++ b/src/frontend/packages/core/sass/mat-desktop.scss
@@ -2,8 +2,9 @@
 // See: https://material.io/guidelines/components/menus.html#menus-specs
 
 $desktop-font-size: 14px;
-$desktop-menu-item-height: 36px;
+$desktop-menu-item-height: 32px;
 $desktop-menu-vertical-padding: 8px;
+$desktop-page-header-height: 48px;
 
 // Remove 1px border
 $desktop-toggle-button-item-height: $desktop-menu-item-height - 2px;
@@ -73,4 +74,37 @@ $desktop-toggle-button-item-height: $desktop-menu-item-height - 2px;
     font-size: $desktop-font-size;
     height: 56px;
   }
+
+  // Smaller icons in the Toolbars in the page sub-nav
+  .page-header-sub-nav {
+    mat-icon {
+      font-size: 18px;
+      height: 18px;
+      width: 18px;
+    }
+
+    .mat-icon-button {
+      line-height: 34px;
+      height: 34px;
+      width: 34px;
+      mat-icon {
+        // Also stops the wobble on the refresh icon
+        line-height: normal;
+      }
+    }
+  }
+
+  // Smaller page header
+  .page-header .page-header__toolbar {
+    height: $desktop-page-header-height;
+  }
+
+  .dashboard .dashboard__inner {
+    height: calc(100% - #{$desktop-page-header-height});
+  }
+
+  .side-nav .side-nav__top {
+    flex: 0 0 $desktop-page-header-height;
+    height: $desktop-page-header-height;
+  }
 }
diff --git a/src/frontend/packages/core/sass/theme.scss b/src/frontend/packages/core/sass/theme.scss
index 11ba592a9f..87818dfd16 100644
--- a/src/frontend/packages/core/sass/theme.scss
+++ b/src/frontend/packages/core/sass/theme.scss
@@ -18,6 +18,7 @@ $stratos-themes: stratos-theme();
 }
 
 // Import any custom scss that the theme defines
+// This import defines the mixin 'apply-theme'
 @import '~@stratosui/theme/extensions';
 
 // Default theme ( = light theme)
@@ -33,6 +34,8 @@ $theme: map-get($stratos-theme, theme);
     .dark-theme {
       @include angular-material-theme($dark-theme);
       @include app-theme($dark-stratos-theme);
+      // Apply theme to extensions
+      @include apply-theme($dark-stratos-theme);
     }
   }
 }
@@ -40,6 +43,8 @@ $theme: map-get($stratos-theme, theme);
 .default {
   @include angular-material-theme($theme);
   @include app-theme($stratos-theme);
+  // Apply theme to extensions
+  @include apply-theme($stratos-theme);
 }
 
 // Import mat-core
diff --git a/src/frontend/packages/core/src/app.module.ts b/src/frontend/packages/core/src/app.module.ts
index 24bfcbbe56..37614cdb52 100644
--- a/src/frontend/packages/core/src/app.module.ts
+++ b/src/frontend/packages/core/src/app.module.ts
@@ -7,8 +7,6 @@ import { Store } from '@ngrx/store';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 import { debounceTime, filter, withLatestFrom } from 'rxjs/operators';
 
-import { CfAutoscalerModule } from '../../cf-autoscaler/src/cf-autoscaler.module';
-import { CloudFoundryPackageModule } from '../../cloud-foundry/src/cloud-foundry-package.module';
 import { SetRecentlyVisitedEntityAction } from '../../store/src/actions/recently-visited.actions';
 import { GeneralEntityAppState, GeneralRequestDataState } from '../../store/src/app-state';
 import { EntityCatalogModule } from '../../store/src/entity-catalog.module';
@@ -103,7 +101,6 @@ class AppStoreDebugModule { }
   imports: [
     EntityCatalogModule.forFeature(generateStratosEntities),
     RouteModule,
-    CloudFoundryPackageModule,
     AppStoreModule,
     AppStoreDebugModule,
     BrowserModule,
@@ -118,7 +115,6 @@ class AppStoreDebugModule { }
     AboutModule,
     CustomImportModule,
     XSRFModule,
-    CfAutoscalerModule
   ],
   providers: [
     CustomizationService,
diff --git a/src/frontend/packages/core/src/app.routing.ts b/src/frontend/packages/core/src/app.routing.ts
index acd2e1ae0d..9441eb4583 100644
--- a/src/frontend/packages/core/src/app.routing.ts
+++ b/src/frontend/packages/core/src/app.routing.ts
@@ -59,18 +59,6 @@ const appRoutes: Routes = [
         }
       },
       { path: 'entity-list', loadChildren: () => import('./api-driven-views/api-driven-views.module').then(m => m.ApiDrivenViewsModule) },
-      {
-        path: 'applications',
-        loadChildren: () => import('../../cloud-foundry/src/features/applications/applications.module').then(m => m.ApplicationsModule),
-        data: {
-          stratosNavigation: {
-            label: 'Applications',
-            matIcon: 'apps',
-            requiresEndpointType: 'cf',
-            position: 20
-          }
-        },
-      },
       {
         path: 'endpoints',
         data: {
@@ -90,45 +78,6 @@ const appRoutes: Routes = [
           path: '',
           loadChildren: () => import('./features/endpoints/endpoints.module').then(m => m.EndpointsModule),
         }]
-      },    
-      {
-        path: 'marketplace',
-        loadChildren: () => import('../../cloud-foundry/src/features/service-catalog/service-catalog.module')
-          .then(m => m.ServiceCatalogModule),
-        data: {
-          stratosNavigation: {
-            label: 'Marketplace',
-            matIcon: 'store',
-            requiresEndpointType: 'cf',
-            position: 30
-          }
-        },
-      },
-      {
-        path: 'services',
-        loadChildren: () => import('../../cloud-foundry/src/features/services/services.module').then(m => m.ServicesModule),
-        data: {
-          stratosNavigation: {
-            label: 'Services',
-            matIcon: 'service',
-            matIconFont: 'stratos-icons',
-            requiresEndpointType: 'cf',
-            position: 40
-          }
-        },
-      },
-      {
-        path: 'cloud-foundry',
-        loadChildren: () => import('../../cloud-foundry/src/features/cloud-foundry/cloud-foundry.module').then(m => m.CloudFoundryModule),
-        data: {
-          stratosNavigation: {
-            label: 'Cloud Foundry',
-            matIcon: 'cloud_foundry',
-            matIconFont: 'stratos-icons',
-            requiresEndpointType: 'cf',
-            position: 50
-          }
-        },
       },
       { path: 'about', loadChildren: () => import('./features/about/about.module').then(m => m.AboutModule) },
       { path: 'user-profile', loadChildren: () => import('./features/user-profile/user-profile.module').then(m => m.UserProfileModule) },
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 c71151f5b7..b43f57a0bf 100644
--- a/src/frontend/packages/core/src/core/extension/extension-service.ts
+++ b/src/frontend/packages/core/src/core/extension/extension-service.ts
@@ -178,7 +178,7 @@ export class ExtensionService {
   }
 
   private moveExtensionRoute(routeConfig: Route[], dashboardRoute: Route): boolean {
-    const index = routeConfig.findIndex(r => !!r.data && !!r.data.stratosNavigation);
+    const index = routeConfig.findIndex(r => !!r.data && (!!r.data.stratosNavigation || r.data.stratosNavigationPage));
     if (index >= 0) {
       const removed = routeConfig.splice(index, 1);
       dashboardRoute.children = dashboardRoute.children.concat(removed);
diff --git a/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.html b/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.html
index 688f7b37a6..42b179688b 100644
--- a/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.html
+++ b/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.html
@@ -15,6 +15,7 @@
     <ul class="side-nav__items">
       <li *ngFor="let tab of tabs">
         <a *ngIf="!tab.hidden || !(tab.hidden | async)" [matTooltip]="tab.label" matTooltipPosition="right"
+          [matTooltipShowDelay]="500"
           [matTooltipDisabled]="!iconMode" class="side-nav__item" [routerLink]="[tab.link]"
           [routerLinkActive]="['side-nav__item--active']">
           <mat-icon class="side-nav__item-icon" [fontSet]="tab.matIconFont">{{ tab.matIcon }}</mat-icon> <span
diff --git a/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.ts b/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.ts
index 981436de47..aaa4ece632 100644
--- a/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.ts
+++ b/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.ts
@@ -6,8 +6,8 @@ import { buffer, debounceTime, filter, map } from 'rxjs/operators';
 import { ActionHistoryDump } from '../../../../../store/src/actions/action-history.actions';
 import { ToggleSideNav } from '../../../../../store/src/actions/dashboard-actions';
 import { AppState } from '../../../../../store/src/app-state';
-import { CustomizationService, CustomizationsMetadata } from '../../../core/customizations.types';
 import { TabNavItem } from '../../../../tab-nav.types';
+import { CustomizationService, CustomizationsMetadata } from '../../../core/customizations.types';
 
 export const SIDENAV_COPYRIGHT = new InjectionToken<string>('Optional copyright string for side nav');
 
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index f084315e99..e5915d0af6 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -47,7 +47,6 @@ import { MetaCardItemComponent } from './components/list/list-cards/meta-card/me
 import { MetaCardKeyComponent } from './components/list/list-cards/meta-card/meta-card-key/meta-card-key.component';
 import { MetaCardTitleComponent } from './components/list/list-cards/meta-card/meta-card-title/meta-card-title.component';
 import { MetaCardValueComponent } from './components/list/list-cards/meta-card/meta-card-value/meta-card-value.component';
-import { TableCellEditComponent } from './components/list/list-table/table-cell-edit/table-cell-edit.component';
 import {
   TableCellRequestMonitorIconComponent,
 } from './components/list/list-table/table-cell-request-monitor-icon/table-cell-request-monitor-icon.component';
@@ -55,6 +54,7 @@ import {
   TableCellSidePanelComponent,
 } from './components/list/list-table/table-cell-side-panel/table-cell-side-panel.component';
 import { TableCellStatusDirective } from './components/list/list-table/table-cell-status.directive';
+import { listTableCells } from './components/list/list-table/table-cell/table-cell.component';
 import { TableComponent } from './components/list/list-table/table.component';
 import { listTableComponents } from './components/list/list-table/table.types';
 import { EndpointCardComponent } from './components/list/list-types/endpoint/endpoint-card/endpoint-card.component';
@@ -312,7 +312,7 @@ import { UserPermissionDirective } from './user-permission.directive';
     TableCellEndpointNameComponent,
     CardProgressOverlayComponent,
     MaxListMessageComponent,
-    TableCellEditComponent
+    ...listTableCells
   ],
   providers: [
     ListConfig,
diff --git a/src/frontend/packages/devkit/build.sh b/src/frontend/packages/devkit/build.sh
index a417da73fe..8aaa9f8b3b 100755
--- a/src/frontend/packages/devkit/build.sh
+++ b/src/frontend/packages/devkit/build.sh
@@ -3,19 +3,14 @@
 # Build script for devkit
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 ROOT="$( cd "$( dirname "${DIR}" )" && cd ../../.. && pwd )"
-DIST=$ROOT/dist-devkit
+DIST="$ROOT/dist-devkit"
 
 echo $DIST
 echo $DIR
 tsc
 if [ $? -eq 0 ]; then
   echo "Copying supporting files"
-  # cp $DIR/package.json $DIST
-  # cp $DIR/src/schematics/*.json $DIST/schematics/
-  # cp $DIR/src/schematics/theme/*.json $DIST/schematics/theme
-  # cp $DIR/src/builders/*.json $DIST/builders/
-
-  cp $DIR/package.json $DIST
-  rsync -r --exclude=*.ts ${DIR}/src/ ${DIST}/
+  cp "$DIR/package.json" "$DIST"
+  rsync -r --exclude=*.ts "${DIR}/src/" "${DIST}/"
 fi
 
diff --git a/src/frontend/packages/devkit/package-lock.json b/src/frontend/packages/devkit/package-lock.json
index 9ce1ec7eaa..58e8edd2f2 100644
--- a/src/frontend/packages/devkit/package-lock.json
+++ b/src/frontend/packages/devkit/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "@stratosui/tools",
+  "name": "@stratosui/devkit",
   "version": "0.0.1",
   "lockfileVersion": 1,
   "requires": true,
diff --git a/src/frontend/packages/devkit/package.json b/src/frontend/packages/devkit/package.json
index 88be8dba36..e16bd4f8fe 100644
--- a/src/frontend/packages/devkit/package.json
+++ b/src/frontend/packages/devkit/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@stratosui/tools",
+  "name": "@stratosui/devkit",
   "version": "0.0.1",
   "scripts": {
     "build": "./build.sh",
diff --git a/src/frontend/packages/devkit/src/build/extensions.ts b/src/frontend/packages/devkit/src/build/extensions.ts
index 1b4816edd3..cbd7d43090 100644
--- a/src/frontend/packages/devkit/src/build/extensions.ts
+++ b/src/frontend/packages/devkit/src/build/extensions.ts
@@ -17,13 +17,13 @@ const importModuleRegex = /src\/frontend\/packages\/core\/src\/custom-import.mod
 
 export class ExtensionsHandler {
 
-  constructor() {}
+  constructor() { }
 
   // Write out the _custom-import.module.ts file importing all of the required extensions
   public apply(webpackConfig: any, config: StratosConfig, options: any) {
 
     // Generate the module file to import the appropriate extensions
-    const dir = path.dirname(options.main);
+    const dir = path.join(config.rootDir, path.dirname(options.main));
     const overrideFile = path.resolve(path.join(dir, './_custom-import.module.ts'));
 
     fs.writeFileSync(overrideFile, '// This file is auto-generated - DO NOT EDIT\n\n');
diff --git a/src/frontend/packages/devkit/src/lib/packages.ts b/src/frontend/packages/devkit/src/lib/packages.ts
index aa051f26d5..6e0f3a8c02 100644
--- a/src/frontend/packages/devkit/src/lib/packages.ts
+++ b/src/frontend/packages/devkit/src/lib/packages.ts
@@ -128,7 +128,12 @@ export class Packages {
     // Local folders
     // Find all local packages in the folder
     getDirectories(this.localPackagesFolder).forEach(pkgDir => {
-      this.addPackage(pkgDir, true);
+      const pkgFile = Packages.loadPackageFile(pkgDir);
+      if (pkgFile !== null) {
+        this.addPackage(pkgDir, true);
+      } else {
+        getDirectories(pkgDir).forEach(pDir => this.addPackage(pDir, true));
+      }
     });
 
     // Figure out the theme
diff --git a/src/frontend/packages/devkit/src/lib/stratos.config.ts b/src/frontend/packages/devkit/src/lib/stratos.config.ts
index 3e47b52281..29b93bc091 100644
--- a/src/frontend/packages/devkit/src/lib/stratos.config.ts
+++ b/src/frontend/packages/devkit/src/lib/stratos.config.ts
@@ -19,6 +19,8 @@ export class StratosConfig implements Logger {
   public nodeModulesFile: string;
   public angularJsonFile: string;
 
+  public rootDir: string;
+
   // angular.json contents
   public angularJson: any;
 
@@ -44,6 +46,9 @@ export class StratosConfig implements Logger {
     this.angularJson = JSON.parse(fs.readFileSync(this.angularJsonFile, 'utf8').toString());
     this.loggingEnabled = loggingEnabled;
 
+    // Top-level folder
+    this.rootDir = path.dirname(this.angularJsonFile);
+
     // The Stratos config file is optional - allows overriding default behaviour
     this.stratosConfig = {};
     if (this.angularJsonFile) {
@@ -65,22 +70,20 @@ export class StratosConfig implements Logger {
     // Exclude the default packages... unless explicity `include`d
     this.excludeExamples()
 
-    const mainDir = options ? path.dirname(options.main) : dir;
-
-    this.packageJsonFile = this.findFileOrFolderInChain(mainDir, 'package.json');
+    this.packageJsonFile = this.findFileOrFolderInChain(this.rootDir, 'package.json');
     if (this.packageJsonFile !== null) {
       this.packageJson = JSON.parse(fs.readFileSync(this.packageJsonFile, 'utf8').toString());
     }
 
-    this.nodeModulesFile = this.findFileOrFolderInChain(mainDir, 'node_modules');
+    this.nodeModulesFile = this.findFileOrFolderInChain(this.rootDir, 'node_modules');
 
-    this.gitMetadata = new GitMetadata(path.dirname(this.angularJsonFile));
+    this.gitMetadata = new GitMetadata(this.rootDir);
     // this.log(this.gitMetadata);
     if (this.gitMetadata.exists) {
       this.log('Read git metadata file');
     }
 
-    this.newProjectRoot = this.angularJson.newProjectRoot;
+    this.newProjectRoot = path.join(this.rootDir, this.angularJson.newProjectRoot);
 
     // Discover all packages
 
diff --git a/src/frontend/packages/devkit/src/schematics/theme/files/package.json.template b/src/frontend/packages/devkit/src/schematics/theme/files/package.json.template
index 783f7cb462..bf54063648 100644
--- a/src/frontend/packages/devkit/src/schematics/theme/files/package.json.template
+++ b/src/frontend/packages/devkit/src/schematics/theme/files/package.json.template
@@ -5,11 +5,13 @@
     "assets": {
       "assets/core": "core/assets",
       "assets/favicon.ico": "favicon.ico"
-    }<% if(!!includeLoader) { %>,<% } %><% } %><% if(!!includeLoader) { %>
-    "theme":{
+    },<% } %><% if(!!includeLoader) { %>
+    "theme": {
       "loadingCss": "loader/loading.css",
       "loadingHtml": "loader/loading.html"
-    }<% } %>
+    }<% } else { %>
+    "theme": {}
+    <% } %>
   },
   "peerDependencies": {
     "@stratosui/theme": "^<%= startosLatestVersion %>"
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
index a9ff97b006..5fb855b409 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
@@ -1,4 +1,4 @@
-import { CommonModule } from '@angular/common';
+import { CommonModule, DatePipe } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { NgxGraphModule } from '@swimlane/ngx-graph';
 
@@ -42,6 +42,9 @@ import { WorkloadsRouting } from './workloads.routing';
   ],
   entryComponents: [
     HelmReleaseCardComponent
+  ],
+  providers: [
+    DatePipe
   ]
 })
 export class WorkloadsModule { }
diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index f2675b2c00..a732781bc0 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -344,11 +344,11 @@ github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY=
-github.com/gosuri/uitable v0.0.1/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY=
+github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY=
+github.com/gosuri/uitable v0.0.1/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/gosuri/uitable v0.0.1/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/govau/cf-common v0.0.7 h1:uhp1P6XM6GGzu1+A4C7LELLX/9mCmH6W5DpJZC0kWmo=
 github.com/govau/cf-common v0.0.7/go.mod h1:5xL/OfE7wxeyHlXb7iei0rAbdQ/5v6dF18BZknPv7NQ=
@@ -792,14 +792,14 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
+gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 helm.sh/helm/v3 v3.0.0 h1:or/9cs1GgfcTQeEnR2CVJNw893/rmqIG1KsNHmUiSFw=
 helm.sh/helm/v3 v3.0.0/go.mod h1:sI7B9yfvMgxtTPMWdk1jSKJ2aa59UyP9qhPydqW6mgo=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/src/test-e2e/application/po/card-autoscaler-default.po.ts b/src/test-e2e/application/po/card-autoscaler-default.po.ts
index caab933f2e..b0267fb648 100644
--- a/src/test-e2e/application/po/card-autoscaler-default.po.ts
+++ b/src/test-e2e/application/po/card-autoscaler-default.po.ts
@@ -1,7 +1,6 @@
-import { by, element, ElementFinder, promise, protractor } from 'protractor';
+import { by, element, ElementFinder, promise } from 'protractor';
 
 import { Component } from '../../po/component.po';
-import { CreateAutoscalerPolicy } from './create-autoscaler-policy.po'
 
 export class CardAutoscalerDefault extends Component {
 
diff --git a/src/test-e2e/e2e.ts b/src/test-e2e/e2e.ts
index 4a8cd7802f..7334314f40 100644
--- a/src/test-e2e/e2e.ts
+++ b/src/test-e2e/e2e.ts
@@ -20,7 +20,7 @@ export class E2E {
    * Temporary location for customization, we should in future look to fetch this a better way from client side code
   */
   public static customization: CustomizationsMetadata = {
-    alwaysShowNavForEndpointTypes: (epType) => false
+    alwaysShowNavForEndpointTypes: (epType) => false // Should match implementation in suse.module
   }
 
   // General helpers
diff --git a/src/tsconfig.json b/src/tsconfig.json
index a6be48f071..e8defdabb9 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -33,8 +33,10 @@
       "@stratosui/core": ["frontend/packages/core/src/public-api.ts"],
       "@stratosui/store": ["frontend/packages/store/src/public-api.ts"],
       "@stratosui/store/testing": ["frontend/packages/store/testing/public-api.ts"],
-      "@example/extensions": ["frontend/packages/example-extensions/src/public-api.ts"],
       "@suse/extensions": ["frontend/packages/suse-extensions/src/public-api.ts"],
+      "@stratosui/cloud-foundry": ["frontend/packages/cloud-foundry/src/public_api.ts"],
+      "@stratosui/cf-autoscaler": ["frontend/packages/cf-autoscaler/src/public_api.ts"],
+      "@example/extensions": ["frontend/packages/example-extensions/src/public-api.ts"],
     }
   }
 }

From b4f9fe2908f49e4e9868bc182e05f5bfdab2924e Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 9 Jul 2020 10:58:50 +0100
Subject: [PATCH 575/648] Changes following review - favourite & recent icon
 changes

---
 .../favorites-meta-card/favorites-meta-card.component.scss     | 2 +-
 .../components/recent-entities/recent-entities.component.scss  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.scss b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.scss
index b020eb2d28..91e9b98d85 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.scss
+++ b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.scss
@@ -53,7 +53,7 @@
   &__icon-panel {
     display: flex;
     justify-content: left;
-    width: 36px;
+    width: 32px;
   }
   &__panel {
     display: flex;
diff --git a/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.scss b/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.scss
index 316df10a25..dd660731ee 100644
--- a/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.scss
+++ b/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.scss
@@ -28,9 +28,8 @@ $spacing: 10px;
   &__icon-container {
     display: flex;
     height: 24px;
-    margin-right: 4px;
     text-align: center;
-    width: 24px;
+    width: 32px;
   }
 }
 

From 65509d6eb60159f7a06de22b75d5f99feb54de67 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Thu, 9 Jul 2020 11:23:33 +0100
Subject: [PATCH 576/648] Fix config generation for k3s. Move assets

---
 .../core => suse-extensions/assets}/custom/aks.svg  |   0
 .../assets}/custom/app_placeholder.svg              |   0
 .../assets}/custom/caasp.png                        | Bin
 .../core => suse-extensions/assets}/custom/eks.svg  |   0
 .../core => suse-extensions/assets}/custom/gke.svg  |   0
 .../core => suse-extensions/assets}/custom/helm.svg |   0
 .../assets}/custom/help/en/connecting_gke.md        |   0
 .../packages/suse-extensions/assets/custom/k3s.svg  |   7 +++++++
 .../assets}/custom/kube_import.png                  | Bin
 .../assets}/custom/kubernetes.svg                   |   0
 .../assets}/custom/placeholder.png                  | Bin
 .../assets/{ => custom}/suse_login_logo.svg         |   0
 .../assets}/custom/suse_logo.svg                    |   0
 src/frontend/packages/suse-extensions/package.json  |   2 +-
 .../kubernetes/kubernetes-entity-generator.ts       |  11 +++++++++--
 .../kubernetes-summary.component.html               |   2 +-
 src/jetstream/plugins/kubernetes/auth/basic_auth.go |   2 +-
 17 files changed, 19 insertions(+), 5 deletions(-)
 rename src/frontend/packages/{suse-theme/assets/core => suse-extensions/assets}/custom/aks.svg (100%)
 rename src/frontend/packages/{suse-theme/assets/core => suse-extensions/assets}/custom/app_placeholder.svg (100%)
 rename src/frontend/packages/{suse-theme/assets/core => suse-extensions/assets}/custom/caasp.png (100%)
 rename src/frontend/packages/{suse-theme/assets/core => suse-extensions/assets}/custom/eks.svg (100%)
 rename src/frontend/packages/{suse-theme/assets/core => suse-extensions/assets}/custom/gke.svg (100%)
 rename src/frontend/packages/{suse-theme/assets/core => suse-extensions/assets}/custom/helm.svg (100%)
 rename src/frontend/packages/{suse-theme/assets/core => suse-extensions/assets}/custom/help/en/connecting_gke.md (100%)
 create mode 100755 src/frontend/packages/suse-extensions/assets/custom/k3s.svg
 rename src/frontend/packages/{suse-theme/assets/core => suse-extensions/assets}/custom/kube_import.png (100%)
 rename src/frontend/packages/{suse-theme/assets/core => suse-extensions/assets}/custom/kubernetes.svg (100%)
 rename src/frontend/packages/{suse-theme/assets/core => suse-extensions/assets}/custom/placeholder.png (100%)
 rename src/frontend/packages/suse-extensions/assets/{ => custom}/suse_login_logo.svg (100%)
 rename src/frontend/packages/{suse-theme/assets/core => suse-extensions/assets}/custom/suse_logo.svg (100%)

diff --git a/src/frontend/packages/suse-theme/assets/core/custom/aks.svg b/src/frontend/packages/suse-extensions/assets/custom/aks.svg
similarity index 100%
rename from src/frontend/packages/suse-theme/assets/core/custom/aks.svg
rename to src/frontend/packages/suse-extensions/assets/custom/aks.svg
diff --git a/src/frontend/packages/suse-theme/assets/core/custom/app_placeholder.svg b/src/frontend/packages/suse-extensions/assets/custom/app_placeholder.svg
similarity index 100%
rename from src/frontend/packages/suse-theme/assets/core/custom/app_placeholder.svg
rename to src/frontend/packages/suse-extensions/assets/custom/app_placeholder.svg
diff --git a/src/frontend/packages/suse-theme/assets/core/custom/caasp.png b/src/frontend/packages/suse-extensions/assets/custom/caasp.png
similarity index 100%
rename from src/frontend/packages/suse-theme/assets/core/custom/caasp.png
rename to src/frontend/packages/suse-extensions/assets/custom/caasp.png
diff --git a/src/frontend/packages/suse-theme/assets/core/custom/eks.svg b/src/frontend/packages/suse-extensions/assets/custom/eks.svg
similarity index 100%
rename from src/frontend/packages/suse-theme/assets/core/custom/eks.svg
rename to src/frontend/packages/suse-extensions/assets/custom/eks.svg
diff --git a/src/frontend/packages/suse-theme/assets/core/custom/gke.svg b/src/frontend/packages/suse-extensions/assets/custom/gke.svg
similarity index 100%
rename from src/frontend/packages/suse-theme/assets/core/custom/gke.svg
rename to src/frontend/packages/suse-extensions/assets/custom/gke.svg
diff --git a/src/frontend/packages/suse-theme/assets/core/custom/helm.svg b/src/frontend/packages/suse-extensions/assets/custom/helm.svg
similarity index 100%
rename from src/frontend/packages/suse-theme/assets/core/custom/helm.svg
rename to src/frontend/packages/suse-extensions/assets/custom/helm.svg
diff --git a/src/frontend/packages/suse-theme/assets/core/custom/help/en/connecting_gke.md b/src/frontend/packages/suse-extensions/assets/custom/help/en/connecting_gke.md
similarity index 100%
rename from src/frontend/packages/suse-theme/assets/core/custom/help/en/connecting_gke.md
rename to src/frontend/packages/suse-extensions/assets/custom/help/en/connecting_gke.md
diff --git a/src/frontend/packages/suse-extensions/assets/custom/k3s.svg b/src/frontend/packages/suse-extensions/assets/custom/k3s.svg
new file mode 100755
index 0000000000..1f4cd9d50b
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/assets/custom/k3s.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg viewBox="0 20 100 80" width="100" height="100" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <style>.cls-1{fill:#384745;}.cls-2{fill:#ffc61c;}</style>
+  </defs>
+  <path class="cls-2" d="M 82.227 25.849 L 16.651 25.849 C 11.794 25.863 7.86 29.797 7.846 34.653 L 7.846 85.17 C 7.86 90.027 11.794 93.961 16.651 93.975 L 82.227 93.975 C 87.084 93.961 91.017 90.027 91.031 85.17 L 91.031 34.653 C 91.017 29.797 87.084 25.863 82.227 25.849 Z M 42.996 75.389 L 26.993 84.689 C 24.142 86.346 20.568 84.295 20.559 80.999 C 20.554 79.469 21.366 78.053 22.689 77.284 L 38.693 67.984 C 41.542 66.325 45.117 68.372 45.13 71.669 C 45.135 73.202 44.322 74.62 42.996 75.389 Z M 49.292 61.219 L 49.273 61.219 C 46.907 61.209 44.999 59.284 45.009 56.919 L 45.089 38.482 C 45.1 36.125 47.014 34.218 49.371 34.218 L 49.391 34.218 C 51.756 34.229 53.664 36.154 53.654 38.519 L 53.574 56.955 C 53.563 59.313 51.649 61.219 49.292 61.219 Z M 77.608 83.126 C 76.426 85.175 73.807 85.877 71.759 84.693 L 55.731 75.44 C 52.875 73.794 52.871 69.674 55.725 68.023 C 57.052 67.255 58.687 67.255 60.014 68.023 L 76.041 77.276 C 78.089 78.459 78.791 81.078 77.608 83.126 Z" style=""/>
+</svg>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-theme/assets/core/custom/kube_import.png b/src/frontend/packages/suse-extensions/assets/custom/kube_import.png
similarity index 100%
rename from src/frontend/packages/suse-theme/assets/core/custom/kube_import.png
rename to src/frontend/packages/suse-extensions/assets/custom/kube_import.png
diff --git a/src/frontend/packages/suse-theme/assets/core/custom/kubernetes.svg b/src/frontend/packages/suse-extensions/assets/custom/kubernetes.svg
similarity index 100%
rename from src/frontend/packages/suse-theme/assets/core/custom/kubernetes.svg
rename to src/frontend/packages/suse-extensions/assets/custom/kubernetes.svg
diff --git a/src/frontend/packages/suse-theme/assets/core/custom/placeholder.png b/src/frontend/packages/suse-extensions/assets/custom/placeholder.png
similarity index 100%
rename from src/frontend/packages/suse-theme/assets/core/custom/placeholder.png
rename to src/frontend/packages/suse-extensions/assets/custom/placeholder.png
diff --git a/src/frontend/packages/suse-extensions/assets/suse_login_logo.svg b/src/frontend/packages/suse-extensions/assets/custom/suse_login_logo.svg
similarity index 100%
rename from src/frontend/packages/suse-extensions/assets/suse_login_logo.svg
rename to src/frontend/packages/suse-extensions/assets/custom/suse_login_logo.svg
diff --git a/src/frontend/packages/suse-theme/assets/core/custom/suse_logo.svg b/src/frontend/packages/suse-extensions/assets/custom/suse_logo.svg
similarity index 100%
rename from src/frontend/packages/suse-theme/assets/core/custom/suse_logo.svg
rename to src/frontend/packages/suse-extensions/assets/custom/suse_logo.svg
diff --git a/src/frontend/packages/suse-extensions/package.json b/src/frontend/packages/suse-extensions/package.json
index a039d07e1b..69d5c72f27 100644
--- a/src/frontend/packages/suse-extensions/package.json
+++ b/src/frontend/packages/suse-extensions/package.json
@@ -9,7 +9,7 @@
     "module": "SuseModule",
     "routingModule": "SuseRoutingModule",
     "assets": {
-      "assets": "core/assets/custom"
+      "assets": "core/assets"
     }
   }
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts
index 32efb48bf7..fcaa2b860b 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts
@@ -65,7 +65,7 @@ const enum KubeEndpointAuthTypes {
   CONFIG = 'kubeconfig',
   CONFIG_AZ = 'kubeconfig-az',
   AWS_IAM = 'aws-iam',
-  GKE = 'gke-auth'
+  GKE = 'gke-auth',
 }
 
 const kubeAuthTypeMap: { [type: string]: EndpointAuthTypeConfig } = {
@@ -168,7 +168,14 @@ export function generateKubernetesEntities(): StratosBaseCatalogEntity[] {
         authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.GKE]],
         logoUrl: '/core/assets/custom/gke.svg',
         renderPriority: 6
-      }],
+      }, {
+        type: 'k3s',
+        label: 'K3S',
+        labelShort: 'k3S',
+        authTypes: [BaseEndpointAuth.UsernamePassword],
+        logoUrl: '/core/assets/custom/k3s.svg',
+        renderPriority: 6
+      }]
   };
   return [
     generateEndpointEntity(endpointDefinition),
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
index 4f3165dbe8..d13d1c2b45 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
@@ -5,7 +5,7 @@
       <span class="kube-details__button">View Dashboard</span>
     </button>
     <button *ngIf="kubeEndpointService.kubeTerminalEnabled$ | async" [routerLink]="kubeTerminalLink" mat-button>
-      <mat-icon>desktop_windows</mat-icon>
+      <mat-icon fontSet="stratos-icons">terminal</mat-icon>
       <span class="kube-details__button">Open Terminal</span>
     </button>
   </app-page-sub-nav>
diff --git a/src/jetstream/plugins/kubernetes/auth/basic_auth.go b/src/jetstream/plugins/kubernetes/auth/basic_auth.go
index 40b655d4ad..6d245e5bc0 100644
--- a/src/jetstream/plugins/kubernetes/auth/basic_auth.go
+++ b/src/jetstream/plugins/kubernetes/auth/basic_auth.go
@@ -59,7 +59,7 @@ func (c *KubeBasicAuth) FetchToken(cnsiRecord interfaces.CNSIRecord, ec echo.Con
 	base64EncodedAuthString := base64.StdEncoding.EncodeToString([]byte(authString))
 
 	tr := &interfaces.TokenRecord{
-		AuthType:     interfaces.AuthTypeHttpBasic,
+		AuthType:     authConnectTypeBasicAuth,
 		AuthToken:    base64EncodedAuthString,
 		RefreshToken: username,
 	}

From 149a024a117f0c3214fc773b9bcc1b591d139922 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 9 Jul 2020 15:12:18 +0100
Subject: [PATCH 577/648] Fix typo

---
 .../src/custom/kubernetes/kubernetes-entity-generator.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts
index fcaa2b860b..1d8dc13dac 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts
@@ -171,7 +171,7 @@ export function generateKubernetesEntities(): StratosBaseCatalogEntity[] {
       }, {
         type: 'k3s',
         label: 'K3S',
-        labelShort: 'k3S',
+        labelShort: 'K3S',
         authTypes: [BaseEndpointAuth.UsernamePassword],
         logoUrl: '/core/assets/custom/k3s.svg',
         renderPriority: 6

From 0c5f318fc4017be16fa4ab2002af3577bbde9263 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Thu, 9 Jul 2020 15:24:22 +0100
Subject: [PATCH 578/648] Suse Theme updated for new brand (#404)

* WIP: Suse Theme updated for new brand

* Final updates. Logo, login screen

* Update login screen colors

Co-authored-by: Richard Cox <richard.cox@suse.com>
---
 .../assets/suse_login_logo.svg                |  10 +
 .../packages/suse-extensions/package.json     |   9 +-
 .../suse-login/suse-login.component.html      |   2 +-
 .../suse-login/suse-login.component.scss      |  27 +-
 .../suse-welcome/suse-welcome.component.scss  |   4 +-
 src/frontend/packages/suse-theme/_index.scss  |  36 +-
 .../assets/core/custom/suse_logo.png          | Bin 1504 -> 0 bytes
 .../assets/core/custom/suse_logo.svg          |  10 +
 .../assets/core/custom/susecon-logo.svg       |  19 -
 .../packages/suse-theme/assets/core/logo.png  | Bin 6902 -> 8263 bytes
 .../suse-theme/assets/core/nav-logo.png       | Bin 1475 -> 8342 bytes
 .../packages/suse-theme/assets/favicon.ico    | Bin 1150 -> 1150 bytes
 .../work-sans/work-sans-v8-latin-300.eot      | Bin 0 -> 29376 bytes
 .../work-sans/work-sans-v8-latin-300.svg      | 334 ++++++++++++++++++
 .../work-sans/work-sans-v8-latin-300.ttf      | Bin 0 -> 57264 bytes
 .../work-sans/work-sans-v8-latin-300.woff     | Bin 0 -> 30008 bytes
 .../work-sans/work-sans-v8-latin-300.woff2    | Bin 0 -> 24760 bytes
 .../work-sans/work-sans-v8-latin-600.eot      | Bin 0 -> 29597 bytes
 .../work-sans/work-sans-v8-latin-600.svg      | 332 +++++++++++++++++
 .../work-sans/work-sans-v8-latin-600.ttf      | Bin 0 -> 57392 bytes
 .../work-sans/work-sans-v8-latin-600.woff     | Bin 0 -> 30164 bytes
 .../work-sans/work-sans-v8-latin-600.woff2    | Bin 0 -> 24996 bytes
 .../work-sans/work-sans-v8-latin-regular.eot  | Bin 0 -> 28718 bytes
 .../work-sans/work-sans-v8-latin-regular.svg  | 333 +++++++++++++++++
 .../work-sans/work-sans-v8-latin-regular.ttf  | Bin 0 -> 57280 bytes
 .../work-sans/work-sans-v8-latin-regular.woff | Bin 0 -> 29400 bytes
 .../work-sans-v8-latin-regular.woff2          | Bin 0 -> 24212 bytes
 .../packages/suse-theme/loader/loading.css    |   6 +-
 src/frontend/packages/suse-theme/package.json |  10 +-
 .../sass/{custom.scss => colors.scss}         |  31 +-
 .../suse-theme/sass/custom/suse-colors.scss   |   7 -
 .../packages/suse-theme/sass/custom/suse.scss | 124 -------
 .../packages/suse-theme/sass/font.scss        |  41 +++
 .../packages/suse-theme/sass/suse.scss        |  13 +
 src/tsconfig.json                             |   2 +-
 35 files changed, 1171 insertions(+), 179 deletions(-)
 create mode 100644 src/frontend/packages/suse-extensions/assets/suse_login_logo.svg
 delete mode 100644 src/frontend/packages/suse-theme/assets/core/custom/suse_logo.png
 create mode 100644 src/frontend/packages/suse-theme/assets/core/custom/suse_logo.svg
 delete mode 100644 src/frontend/packages/suse-theme/assets/core/custom/susecon-logo.svg
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.eot
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.svg
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.ttf
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.woff
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.woff2
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.eot
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.svg
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.ttf
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.woff
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.woff2
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.eot
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.svg
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.ttf
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.woff
 create mode 100644 src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.woff2
 rename src/frontend/packages/suse-theme/sass/{custom.scss => colors.scss} (61%)
 delete mode 100644 src/frontend/packages/suse-theme/sass/custom/suse-colors.scss
 delete mode 100644 src/frontend/packages/suse-theme/sass/custom/suse.scss
 create mode 100644 src/frontend/packages/suse-theme/sass/font.scss
 create mode 100644 src/frontend/packages/suse-theme/sass/suse.scss

diff --git a/src/frontend/packages/suse-extensions/assets/suse_login_logo.svg b/src/frontend/packages/suse-extensions/assets/suse_login_logo.svg
new file mode 100644
index 0000000000..7b8bbf809e
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/assets/suse_login_logo.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="270" height="90" viewBox="0, 0, 270, 90">
+  <g id="Layer_1">
+    <g>
+      <path d="M238.462,55.726 L224.907,55.726 C223.862,55.726 223.011,54.876 223.011,53.83 L223.011,46.982 L236.095,46.982 C237.219,46.982 238.131,46.071 238.131,44.946 C238.131,43.821 237.219,42.909 236.095,42.909 L223.011,42.909 L223.011,36.17 C223.011,35.124 223.862,34.273 224.907,34.273 L238.462,34.273 C239.642,34.273 240.6,33.318 240.6,32.137 C240.6,30.957 239.642,30 238.462,30 L224.907,30 C221.507,30 218.738,32.767 218.738,36.17 L218.738,53.83 C218.738,57.232 221.507,59.999 224.907,59.999 L238.462,59.999 C239.642,59.999 240.6,59.044 240.6,57.864 C240.6,56.683 239.642,55.726 238.462,55.726 M198.602,42.965 C195.736,42.45 193.743,41.842 192.628,41.132 C191.511,40.423 190.953,39.466 190.953,38.259 C190.953,36.963 191.526,35.898 192.672,35.068 C193.819,34.24 195.433,33.824 197.516,33.824 C199.628,33.824 201.317,34.23 202.585,35.046 C203.267,35.485 203.888,36.068 204.448,36.798 C205.274,37.866 206.833,38.008 207.837,37.104 C208.784,36.25 208.867,34.786 208.015,33.836 C206.987,32.688 205.818,31.779 204.508,31.109 C202.561,30.113 200.215,29.616 197.471,29.616 C195.117,29.616 193.058,30.022 191.294,30.837 C189.529,31.651 188.177,32.753 187.243,34.14 C186.307,35.529 185.84,37.067 185.84,38.757 C185.84,40.356 186.208,41.713 186.949,42.829 C187.687,43.947 188.873,44.881 190.502,45.635 C192.13,46.39 194.317,47.023 197.063,47.536 C199.809,48.05 201.732,48.637 202.833,49.301 C203.935,49.965 204.485,50.839 204.485,51.924 C204.485,53.283 203.875,54.332 202.651,55.071 C201.431,55.81 199.748,56.18 197.606,56.18 C195.343,56.18 193.45,55.758 191.926,54.912 C191.056,54.429 190.277,53.789 189.587,52.992 C188.719,51.985 187.161,51.961 186.222,52.901 L186.214,52.911 C185.354,53.769 185.288,55.162 186.099,56.066 C188.681,58.948 192.533,60.388 197.651,60.388 C200.004,60.388 202.079,60.033 203.875,59.324 C205.67,58.616 207.063,57.598 208.059,56.271 C209.056,54.943 209.554,53.404 209.554,51.653 C209.554,50.025 209.192,48.66 208.468,47.559 C207.743,46.458 206.59,45.537 205.005,44.799 C203.422,44.059 201.287,43.448 198.602,42.965 M131.77,42.974 C128.904,42.459 126.913,41.85 125.797,41.141 C124.68,40.432 124.123,39.474 124.123,38.266 C124.123,36.97 124.696,35.906 125.842,35.077 C126.989,34.248 128.603,33.832 130.685,33.832 C132.795,33.832 134.486,34.24 135.753,35.054 C136.437,35.493 137.058,36.077 137.618,36.806 C138.442,37.876 140.002,38.017 141.006,37.113 C141.954,36.258 142.036,34.794 141.184,33.845 C140.156,32.696 138.986,31.787 137.677,31.117 C135.731,30.122 133.384,29.624 130.639,29.624 C128.286,29.624 126.227,30.031 124.463,30.845 C122.697,31.659 121.347,32.762 120.412,34.15 C119.477,35.537 119.009,37.075 119.009,38.765 C119.009,40.364 119.377,41.723 120.118,42.837 C120.857,43.954 122.042,44.891 123.67,45.644 C125.299,46.399 127.487,47.032 130.232,47.545 C132.977,48.058 134.9,48.647 136.002,49.31 C137.103,49.973 137.654,50.848 137.654,51.934 C137.654,53.292 137.043,54.34 135.822,55.079 C134.599,55.819 132.917,56.188 130.776,56.188 C128.512,56.188 126.618,55.766 125.095,54.92 C124.226,54.438 123.446,53.798 122.758,53.001 C121.89,51.993 120.331,51.97 119.39,52.911 L119.383,52.919 C118.523,53.777 118.457,55.17 119.268,56.074 C121.85,58.957 125.701,60.396 130.821,60.396 C133.174,60.396 135.248,60.042 137.043,59.333 C138.838,58.625 140.233,57.605 141.229,56.278 C142.225,54.952 142.722,53.411 142.722,51.662 C142.722,50.033 142.36,48.669 141.636,47.567 C140.911,46.465 139.759,45.546 138.173,44.807 C136.59,44.067 134.456,43.457 131.77,42.974 M176.343,32.059 L176.343,48.487 C176.343,52.408 175.302,55.372 173.221,57.379 C171.139,59.386 168.107,60.388 164.126,60.388 C160.142,60.388 157.11,59.386 155.028,57.379 C152.947,55.372 151.907,52.408 151.907,48.487 L151.907,32.059 C151.907,30.709 152.999,29.616 154.349,29.616 C155.698,29.616 156.794,30.709 156.794,32.059 L156.794,47.898 C156.794,50.735 157.389,52.824 158.581,54.166 C159.773,55.508 161.62,56.18 164.126,56.18 C166.63,56.18 168.476,55.508 169.668,54.166 C170.86,52.824 171.456,50.735 171.456,47.898 L171.456,32.059 C171.456,30.709 172.551,29.616 173.899,29.616 C175.249,29.616 176.343,30.709 176.343,32.059" fill="#0C322C"/>
+      <path d="M101.408,42.16 C101.003,42.429 100.461,42.429 100.055,42.16 C99.391,41.719 99.327,40.797 99.863,40.264 C100.339,39.771 101.124,39.771 101.6,40.263 C102.135,40.797 102.07,41.719 101.408,42.16 M103.344,39.473 C104.116,42.757 101.164,45.71 97.88,44.938 C96.208,44.546 94.881,43.219 94.488,41.548 C93.718,38.266 96.669,35.315 99.952,36.084 C101.623,36.475 102.951,37.801 103.344,39.473 M81.232,57.135 C81.607,57.674 81.919,58.195 82.094,58.716 C82.218,59.086 82.377,59.574 82.742,59.77 C82.762,59.781 82.78,59.791 82.802,59.797 C83.472,60.041 85.195,60 85.195,60 L88.364,60 C88.635,60.004 91.016,59.997 90.956,59.731 C90.669,58.458 89.197,58.23 88.076,57.564 C87.043,56.948 86.063,56.25 85.619,55.049 C85.387,54.429 85.524,52.999 85.923,52.478 C86.214,52.101 86.643,51.851 87.104,51.75 C87.615,51.641 88.145,51.735 88.656,51.787 C89.286,51.851 89.908,51.965 90.536,52.043 C91.748,52.201 92.972,52.264 94.194,52.231 C96.211,52.175 98.233,51.854 100.145,51.202 C101.48,50.754 102.795,50.148 103.93,49.305 C105.22,48.346 104.881,48.436 103.573,48.57 C102.007,48.73 100.427,48.754 98.856,48.661 C97.39,48.576 95.944,48.403 94.618,47.722 C93.574,47.183 92.677,46.643 91.849,45.808 C91.725,45.682 91.648,45.314 91.875,45.079 C92.095,44.851 92.561,44.983 92.704,45.105 C94.148,46.312 96.302,47.306 98.532,47.414 C99.738,47.474 100.911,47.496 102.118,47.444 C102.721,47.416 103.631,47.42 104.236,47.414 C104.548,47.41 105.399,47.5 105.558,47.169 C105.606,47.073 105.602,46.962 105.598,46.854 C105.421,42.028 105.064,36.585 100.014,34.278 C96.246,32.555 90.597,29.886 88.211,28.779 C87.658,28.516 87.011,28.932 87.011,29.548 C87.011,31.16 87.093,33.476 87.094,35.584 C85.951,34.42 84.026,33.685 82.559,33.011 C80.893,32.247 79.173,31.599 77.423,31.054 C73.9,29.963 70.254,29.291 66.587,28.927 C62.428,28.512 58.199,28.711 54.104,29.557 C47.36,30.955 40.731,34.198 35.699,38.941 C32.61,41.851 30.186,45.988 30.022,50.187 C29.788,56.13 31.453,59.321 34.513,62.61 C39.393,67.852 49.896,68.586 54.15,62.37 C56.064,59.572 56.479,55.777 55.09,52.684 C53.701,49.593 50.508,47.359 47.123,47.245 C44.496,47.158 41.697,48.494 40.69,50.923 C39.922,52.778 40.359,55.07 41.758,56.51 C42.303,57.072 43.041,57.532 43.847,57.352 C44.322,57.246 44.719,56.889 44.791,56.407 C44.897,55.696 44.275,55.235 43.892,54.689 C43.201,53.704 43.341,52.225 44.206,51.388 C44.936,50.681 46.017,50.472 47.033,50.475 C47.979,50.477 48.946,50.646 49.762,51.123 C50.909,51.798 51.671,53.034 51.935,54.34 C52.722,58.243 49.549,61.414 45.247,61.663 C43.046,61.793 40.806,61.215 39.088,59.832 C34.737,56.332 33.671,49.178 38.644,45.359 C43.365,41.734 49.325,42.668 52.839,44.552 C55.651,46.059 57.747,48.525 59.335,51.251 C60.132,52.622 60.811,54.055 61.441,55.51 C62.047,56.909 62.614,58.319 63.827,59.344 C64.63,60.024 65.621,60 66.673,60 L72.678,60 C73.494,60 73.295,59.456 72.943,59.096 C72.147,58.282 71.003,58.098 69.944,57.807 C67.523,57.141 67.77,53.936 68.44,53.936 C70.604,53.936 70.672,54.001 72.568,53.977 C75.304,53.939 76.132,53.78 78.272,54.571 C79.416,54.995 80.515,56.113 81.232,57.135" fill="#30BA78"/>
+    </g>
+  </g>
+</svg>
diff --git a/src/frontend/packages/suse-extensions/package.json b/src/frontend/packages/suse-extensions/package.json
index c7ba7878a7..a039d07e1b 100644
--- a/src/frontend/packages/suse-extensions/package.json
+++ b/src/frontend/packages/suse-extensions/package.json
@@ -1,12 +1,15 @@
 {
-  "name": "@suse/extensions",
-  "version": "0.0.1",
+  "name": "@susestratos/extensions",
+  "version": "0.0.0",
   "peerDependencies": {
     "@angular/common": "^6.0.0-rc.0 || ^6.0.0",
     "@angular/core": "^6.0.0-rc.0 || ^6.0.0"
   },
   "stratos": {
     "module": "SuseModule",
-    "routingModule": "SuseRoutingModule"
+    "routingModule": "SuseRoutingModule",
+    "assets": {
+      "assets": "core/assets/custom"
+    }
   }
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html
index 37525447fb..4b3fad4d7e 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html
@@ -37,7 +37,7 @@ <h1 class="suse-login__headline">SUSE<br>Stratos<br>Console</h1>
       <span *ngIf="config.copyright" [innerHTML]="config.copyright"></span>
     </div>
     <div class="suse-login__logo">
-      <a href="https://www.suse.com" target="_blank"><img src="/core/assets/custom/suse_logo.png"></a>
+      <a href="https://www.suse.com" target="_blank"><img src="/core/assets/custom/suse_login_logo.svg"></a>
     </div>
   </div>
 </div>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
index 8ea9135bb9..62ccddf629 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
@@ -1,9 +1,9 @@
-@import '../../../../suse-theme/sass/custom/suse-colors';
+@import '../../../../suse-theme/sass/colors';
 
 .suse-login {
   align-items: center;
-  background-color: $suse-blue;
-  border-bottom: 10px solid $suse-primary;
+  background-color: $suse-gray;
+  color: $suse-gray-fg;
   display: flex;
   flex-direction: column;
   width: 100%;
@@ -16,7 +16,7 @@
     flex-direction: row;
   }
   &__header {
-    background-color: $suse-secondary;
+    background-color: $suse-dark-green;
     color: $suse-text;
     flex: 0 0 60px;
     font-size: 24px;
@@ -38,19 +38,21 @@
     padding: 20px 0;
   }
   &__title {
+    font-family: "Work Sans";
     width: 90%;
   }
   &__copyright {
-    color: $suse-text-gray;
+    color: $suse-gray-fg;
     flex: 1;
   }
   &__logo {
     img {
-      width: 79px;
+      width: 128px;
     }
   }
   &__intro {
     flex: 1;
+    font-family: "Work Sans";
     margin-right: 24px;
   }
   &__box {
@@ -64,11 +66,12 @@
     display: flex;
     flex-direction: column;
     .mat-form-field:not(.mat-form-field-invalid).mat-form-field-appearance-legacy {
+      color: $suse-gray-fg;
       .mat-form-field-label {
-        color: $suse-text-gray;
+        color: $suse-gray-fg;
       }
       .mat-form-field-underline {
-        background-color: $suse-text-gray;
+        background-color: $suse-gray-fg;
       }
     }
   }
@@ -79,13 +82,15 @@
     margin-top: 24px;
   }
   &__headline {
-    color: $suse-primary;
+    color: $suse-primary-color;
+    font-family: "Work Sans";
     font-size: 52px;
     font-weight: 300;
     margin: 0;
   }
   &__tagline {
-    color: $suse-text-gray;
+    color: $suse-gray-fg;
+    font-family: "Work Sans";
     font-size: 18px;
     font-weight: 300;
     line-height: 1.5;
@@ -97,7 +102,7 @@
     transition: opacity 250ms linear;
   }
   &__form-title {
-    color: $suse-text;
+    color: $suse-gray-fg;
     font-size: 30px;
     font-weight: 300;
     margin-bottom: 24px;
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.scss b/src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.scss
index 21b16098cb..c0e5cadd87 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.scss
@@ -1,4 +1,4 @@
-@import '../../../../suse-theme/sass/custom/suse-colors';
+@import '../../../../suse-theme/sass/colors';
 
 .no-endpoints-message {
   color: $suse-button-gray;
@@ -22,7 +22,7 @@
 .messages {
 
   &__title {
-    color: $suse-primary;
+    color: $suse-primary-color;
     font-size: 20px;
     font-weight: normal;
     margin: 20px 0;
diff --git a/src/frontend/packages/suse-theme/_index.scss b/src/frontend/packages/suse-theme/_index.scss
index a8d3f300e1..55a2786697 100644
--- a/src/frontend/packages/suse-theme/_index.scss
+++ b/src/frontend/packages/suse-theme/_index.scss
@@ -1,9 +1,41 @@
 @import '~@stratosui/theme/helper';
 
-// Custom Theme
-@import './sass/custom';
+@import './sass/colors';
+
+// SUSE overrides
+@import './sass/suse';
 
 @function stratos-theme() {
   $theme: stratos-theme-helper($stratos-theme);
+
+  // Modify some of the colors
+  $app-theme: map-get($theme, app-theme);
+  $app-theme: map-merge($app-theme, (
+    header-background-color: $suse-header-bar,
+    header-foreground-color: $suse-text,
+    header-background-span: true,
+    link-color: $suse-link-color,
+    link-active-color: darken($suse-link-color, 10%),
+    stratos-title-show-text: true,
+    underflow-background-color: $suse-primary-color,
+    underflow-foreground-color: $suse-text,
+    user-avatar-background-color: $suse-primary-color,
+    user-avatar-foreground-color: $suse-text,
+    user-avatar-header-invert-colors: false,
+    intro-screen-background-color: $suse-blue,
+    side-nav: (
+      background: $suse-side-nav-bg,
+      text: $suse-side-nav-text,
+      active: $suse-side-nav-active-bg,
+      active-text: $suse-side-nav-active-text,
+      hover: $suse-side-nav-active-bg,
+      hover-text: $suse-side-nav-active-text
+    )
+  ));
+
+  $theme: map-merge($theme, (
+    app-theme: $app-theme
+  ));
+
   @return $theme
 }
\ No newline at end of file
diff --git a/src/frontend/packages/suse-theme/assets/core/custom/suse_logo.png b/src/frontend/packages/suse-theme/assets/core/custom/suse_logo.png
deleted file mode 100644
index d4dfe1e1145b8120839b7f8bf2a94f462551211e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1504
zcmV<61t0o}P)<h;3K|Lk000e1NJLTq003hE001xu1^@s61tG-D000H2Nkl<ZcmeI&
z1B_!^9Dwohv)^0Wwr$(CZQHhO+qP}n-Y&<p@0+AIIXNkBvA5HH$#2oUJvrHbaeF&n
zo;-PSM&G`Di;1cji_N%>cZh&k2wvhkwqY_FBNO}$tXmJYks7{Uo{SD4F?!)L>`^d|
zVlWE8ALpR-1xGOwMe(z{55OD6u@jC?hc9M^w+Bt}ySojd6fQw4eZ*nhfeyXk8`X!9
z9($mrmLn0WAtx#z5Tm2&5PrmHghNZ+Ml!s`Cp^XgbVev*N3}tu#8qgqvFMM;s^Jg3
zLSjVLKPnBP1U^HnO+_a}7J(o<LvloRBdQFd8p5EZ-eD`0o+BR4AhJMI!$>HlcJ)CN
zM+mf7K~%&wM0OOZkQD!-8zP|8(v=611UhK7t0)0q)WC7!SrP)J_vi>eR~>{8j>8qY
zjAr-~iO~pSFcMYp4;mxAs}7?XjP(-7a02(Cm4dMm?NJdeu>fxnguh*J5CM1!xpl~F
z;Q0U07WbgVZljp1J}YWKu8lOT49JJL!tFm`fJQzLe#J&qf{!b|aj$^bY~g}n59lCv
z0p+AKu&=OpOOY3uQ4$T%6(cbmeNZ1c5D-;9SKNitSNx^FeF981R9K^knP<o~l*CW)
zMNHJdQ5fnzeBJSqcrcW93ExvFeZ&~_#bJom6V~YiL%qSjCN9U1gxm&q{eD7hk^Z*2
zP^v2(-v>%h;itdd7uO&+)`C53g4h{%9mZ!U?G`SHC=G%i;=x<*9Fz(OYgK|=Z4360
z03lF{KwNhm#t|re!f*Ij8d3xz8>PR`Q2DZh@a%XFv6>d{V+O<~y5lg~L9CN-${P%^
z*#?HuR$8w&E(n@ixQ}=^FWm18V!7Ke{={o21tO<#y=pLKpfP?z0B%F6n3pHJ4x}l>
z0?`G(NXPwyrBHeff9aUtkQN23@T2~|X{6iJSonTZK#;@8alav*ihUVc%O5F_*UI(&
zwR9lUAQyzA*norh3bBU5{ZnHDLSStP^lNOe_7s<620-kA^zUh~1)*y9B|R7?K?gOJ
zwB|=}`XdaMG*0|xP#lz2hQXgpBhbcuiO;|Xu%$R^eiCFgLSU%ds3sgA3m-w+7=~~{
z@YzoL^1*4?(i~gfNB%%Dv_c2eK{|L#$BluZbXJJxfMHCu<G#wkP@gSW;~oaU-x+WI
z=OOkG@l>v5&tY7F*j>a?xv%jM3qv6-o{2p)^mNp~FkV7zh7J2#4Y4a)JuN;9u@}go
zfni*R*i)pp)4ncfbr_>zsK?lg8R(31NPz$+4P!hE^$2@09UW0t#l9{Gr@9F&;OFJ&
zRGzhj<2uG8kpqX32w$z-*A<LId^7vHiUqKwXYg_6v!gOXVQqopg+vE@&ZvnnSlbuW
zkoTpsw%_CBDl7KE+QL!LfuF#$<ABP2<*{)XOX2-J-$VXG8Fa){?8bdWz*wjC_g!U&
zVca%yTr_E4d-2fBzK*LL#yzxxw^rZie?V%~$34i!$0TddS~zAN#Ez)kS3^96TudXw
zn2%y8AjpLTu6C8UDCCNu0p!w|Sm$@Vh1et;_EiRQc_9zuDSV>JCHs1i%Y%Or0<nwu
z+sI|?)sQP>!@e3rE(c~oOou<T{2v?_eK8*kOjv~=h=t-${W`ND_W;e10I^UBXCQYP
z-ol=GV1b3!AQ)o7_!TW6cNdE+Sa$@{Idc%%po7{L32Xh0hp@IlWRUiCz#dmx`TZ}v
zhuXrVQ}`qZaMUo)KyCN%ue4rTyo99%qnsDnaTvGoxAa*m9BR|yXVk?UjBvyt{)XDN
zA%=-h_S<2ui^%3hb{xiLL^rTrX*`133ZfBaVxXgjF~JIB&<W`+Tt7c%;~s($hNoDK
zs_-#!-!@k4Ycx6{jRmK|rO_7?tdth<Q4=}5OytRvr~d)=dB0-;oE1?30000<MNUMn
GLSTYIU%%D>

diff --git a/src/frontend/packages/suse-theme/assets/core/custom/suse_logo.svg b/src/frontend/packages/suse-theme/assets/core/custom/suse_logo.svg
new file mode 100644
index 0000000000..140888bd1a
--- /dev/null
+++ b/src/frontend/packages/suse-theme/assets/core/custom/suse_logo.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="90" height="30" viewBox="0, 0, 90, 30">
+  <g id="Layer_1">
+    <g>
+      <path d="M33.238,14.348 C33.06,14.466 32.821,14.466 32.643,14.348 C32.351,14.154 32.323,13.748 32.559,13.513 C32.768,13.296 33.114,13.296 33.323,13.513 C33.558,13.748 33.53,14.154 33.238,14.348 M33.936,13.378 C34.208,14.532 33.17,15.571 32.015,15.299 C31.428,15.161 30.961,14.695 30.823,14.107 C30.552,12.953 31.59,11.916 32.744,12.187 C33.331,12.324 33.798,12.79 33.936,13.378 M34.214,16.233 C33.789,16.195 33.805,15.69 34.33,15.743 C34.488,15.759 35.006,15.778 35.14,15.61 C35.201,15.534 35.192,15.387 35.19,15.351 C35.112,13.99 35.021,12.195 33.338,11.426 C32.082,10.852 30.199,9.962 29.404,9.593 C29.219,9.506 29.004,9.644 29.004,9.849 C29.004,10.344 29.027,10.881 29.027,11.57 C29.027,11.702 29.048,11.968 28.996,11.997 C28.947,12.024 28.874,11.822 28.694,11.671 C28.388,11.413 27.97,11.211 27.52,11.004 C26.964,10.749 26.391,10.533 25.808,10.352 C24.633,9.988 23.418,9.764 22.195,9.642 C20.81,9.504 19.4,9.57 18.034,9.852 C15.787,10.318 13.577,11.4 11.9,12.98 C10.87,13.951 10.062,15.329 10.007,16.729 C9.929,18.71 10.484,19.774 11.505,20.87 C13.131,22.617 16.632,22.862 18.05,20.79 C18.688,19.857 18.826,18.592 18.363,17.561 C17.9,16.531 16.836,15.786 15.708,15.748 C14.832,15.719 13.899,16.165 13.564,16.974 C13.307,17.592 13.453,18.356 13.919,18.837 C14.101,19.024 14.347,19.177 14.616,19.117 C14.774,19.082 14.906,18.963 14.93,18.802 C14.966,18.565 14.758,18.412 14.63,18.23 C14.4,17.901 14.447,17.408 14.735,17.129 C14.979,16.894 15.339,16.824 15.678,16.825 C15.993,16.825 16.315,16.882 16.587,17.041 C16.97,17.266 17.224,17.678 17.312,18.113 C17.574,19.414 16.517,20.471 15.082,20.555 C14.349,20.598 13.602,20.405 13.029,19.944 C11.579,18.778 11.224,16.393 12.881,15.12 C14.455,13.911 16.442,14.223 17.613,14.851 C18.55,15.353 19.249,16.175 19.778,17.084 C20.044,17.541 20.27,18.018 20.48,18.503 C20.682,18.97 20.871,19.44 21.276,19.781 C21.543,20.008 21.874,20 22.224,20 L24.226,20 C24.498,20 24.432,19.819 24.314,19.699 C24.049,19.427 23.668,19.366 23.314,19.269 C22.508,19.047 22.59,17.979 22.813,17.979 C23.535,17.979 23.558,18 24.189,17.992 C25.102,17.98 25.377,17.927 26.09,18.191 C26.472,18.332 26.838,18.705 27.077,19.045 C27.202,19.225 27.306,19.398 27.365,19.572 C27.406,19.695 27.459,19.858 27.581,19.923 C27.587,19.927 27.594,19.93 27.601,19.932 C27.824,20.014 28.398,20 28.398,20 L29.455,20 C29.545,20.001 30.339,19.999 30.319,19.91 C30.223,19.486 29.732,19.41 29.359,19.188 C29.014,18.983 28.688,18.75 28.539,18.35 C28.462,18.143 28.508,17.666 28.641,17.492 C28.738,17.367 28.881,17.284 29.035,17.25 C29.205,17.213 29.382,17.245 29.552,17.262 C29.762,17.284 29.969,17.322 30.178,17.348 C30.583,17.4 30.991,17.422 31.398,17.411 C32.07,17.392 32.744,17.284 33.382,17.067 C33.827,16.918 33.848,16.89 34.269,16.68 C34.909,16.36 34.434,16.253 34.214,16.233" fill="#30BA78"/>
+      <path d="M74.969,19.927 C73.874,19.927 72.983,19.036 72.983,17.941 L72.983,12.055 C72.983,10.96 73.874,10.069 74.969,10.069 L79.488,10.069 C79.842,10.069 80.13,10.357 80.13,10.71 C80.13,11.064 79.842,11.352 79.488,11.352 L74.969,11.352 C74.582,11.352 74.267,11.667 74.267,12.055 L74.267,14.372 L78.698,14.372 C79.034,14.372 79.306,14.645 79.306,14.98 C79.306,15.315 79.034,15.588 78.698,15.588 L74.267,15.588 L74.267,17.941 C74.267,18.329 74.582,18.644 74.969,18.644 L79.488,18.644 C79.842,18.644 80.13,18.932 80.13,19.286 C80.13,19.64 79.842,19.927 79.488,19.927 z M54.709,20.057 C53.406,20.057 52.402,19.726 51.725,19.073 C51.049,18.422 50.707,17.442 50.707,16.16 L50.707,10.684 C50.707,10.274 51.04,9.94 51.45,9.94 C51.86,9.94 52.194,10.274 52.194,10.684 L52.194,15.964 C52.194,16.923 52.401,17.642 52.808,18.1 C53.218,18.561 53.857,18.795 54.709,18.795 C55.56,18.795 56.199,18.561 56.609,18.1 C57.016,17.642 57.223,16.923 57.223,15.964 L57.223,10.684 C57.223,10.274 57.557,9.94 57.967,9.94 C58.377,9.94 58.711,10.274 58.711,10.684 L58.711,16.16 C58.711,17.441 58.368,18.421 57.691,19.073 C57.015,19.726 56.012,20.057 54.709,20.057 M65.884,20.057 C64.206,20.057 62.928,19.58 62.086,18.64 C61.842,18.368 61.858,17.948 62.121,17.685 L62.124,17.682 L62.127,17.679 C62.26,17.547 62.438,17.474 62.626,17.474 C62.826,17.474 63.014,17.559 63.143,17.708 C63.378,17.979 63.646,18.2 63.942,18.364 C64.457,18.65 65.106,18.795 65.869,18.795 C66.594,18.795 67.172,18.667 67.587,18.415 C68.015,18.156 68.233,17.783 68.233,17.306 C68.233,16.92 68.036,16.605 67.648,16.371 C67.271,16.144 66.634,15.949 65.701,15.774 C64.795,15.605 64.065,15.394 63.53,15.146 C63.002,14.901 62.613,14.595 62.376,14.235 C62.138,13.878 62.018,13.434 62.018,12.917 C62.018,12.37 62.171,11.866 62.473,11.417 C62.776,10.968 63.221,10.606 63.794,10.341 C64.371,10.075 65.054,9.94 65.824,9.94 C66.724,9.94 67.502,10.105 68.137,10.43 C68.564,10.648 68.95,10.949 69.287,11.324 C69.543,11.611 69.519,12.055 69.232,12.314 C69.103,12.43 68.936,12.494 68.763,12.494 C68.543,12.494 68.34,12.394 68.206,12.221 C68.015,11.973 67.8,11.771 67.567,11.621 C67.135,11.343 66.554,11.202 65.839,11.202 C65.134,11.202 64.577,11.346 64.184,11.63 C63.784,11.919 63.581,12.297 63.581,12.751 C63.581,13.177 63.78,13.52 64.172,13.768 C64.553,14.011 65.213,14.214 66.188,14.389 C67.074,14.548 67.786,14.752 68.305,14.995 C68.818,15.234 69.197,15.535 69.431,15.89 C69.663,16.244 69.781,16.69 69.781,17.216 C69.781,17.781 69.618,18.285 69.297,18.713 C68.974,19.143 68.515,19.478 67.933,19.707 C67.346,19.939 66.657,20.057 65.884,20.057 M43.607,20.059 C41.929,20.059 40.651,19.582 39.809,18.642 C39.565,18.371 39.581,17.951 39.844,17.687 L39.848,17.683 C39.982,17.55 40.16,17.477 40.35,17.477 C40.55,17.477 40.738,17.562 40.866,17.711 C41.1,17.982 41.368,18.202 41.664,18.366 C42.18,18.653 42.829,18.798 43.592,18.798 C44.316,18.798 44.894,18.67 45.311,18.418 C45.739,18.159 45.956,17.786 45.956,17.309 C45.956,16.923 45.759,16.608 45.371,16.374 C44.993,16.147 44.356,15.951 43.424,15.776 C42.518,15.608 41.788,15.396 41.253,15.149 C40.725,14.904 40.336,14.597 40.098,14.238 C39.861,13.881 39.741,13.437 39.741,12.92 C39.741,12.373 39.894,11.869 40.196,11.421 C40.499,10.971 40.944,10.609 41.517,10.344 C42.093,10.078 42.776,9.943 43.547,9.943 C44.447,9.943 45.225,10.108 45.86,10.433 C46.287,10.652 46.674,10.952 47.009,11.327 C47.266,11.614 47.242,12.057 46.955,12.317 C46.826,12.433 46.659,12.497 46.485,12.497 C46.266,12.497 46.063,12.397 45.929,12.224 C45.739,11.976 45.523,11.774 45.29,11.623 C44.857,11.345 44.276,11.205 43.562,11.205 C42.856,11.205 42.3,11.349 41.906,11.633 C41.507,11.923 41.304,12.3 41.304,12.754 C41.304,13.18 41.503,13.522 41.895,13.771 C42.276,14.014 42.935,14.217 43.912,14.392 C44.796,14.551 45.508,14.754 46.029,14.997 C46.542,15.237 46.92,15.539 47.153,15.892 C47.386,16.246 47.504,16.692 47.504,17.219 C47.504,17.784 47.341,18.288 47.02,18.715 C46.697,19.146 46.238,19.481 45.655,19.71 C45.068,19.942 44.379,20.059 43.607,20.059" fill="#FFFFFF"/>
+    </g>
+  </g>
+</svg>
diff --git a/src/frontend/packages/suse-theme/assets/core/custom/susecon-logo.svg b/src/frontend/packages/suse-theme/assets/core/custom/susecon-logo.svg
deleted file mode 100644
index 056b4ead7d..0000000000
--- a/src/frontend/packages/suse-theme/assets/core/custom/susecon-logo.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="230" height="59" viewBox="0 0 230 59">
-    <defs>
-        <path id="a" d="M.18.285h23.675v28.303H.18z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <path fill="#0D2C40" d="M98.417 44.086v-.108c0-7.567 6.038-14.131 13.77-14.131 4.662 0 7.734 2.012 10.17 4.287.212.212.37.583.37.953 0 .74-.583 1.324-1.323 1.324-.319 0-.689-.106-.901-.319-2.172-2.064-4.714-3.81-8.368-3.81-6.144 0-10.91 5.134-10.91 11.592v.104c0 6.511 4.925 11.7 11.122 11.7 3.496 0 6.303-1.695 8.474-3.864.213-.213.477-.424.847-.424.636 0 1.272.635 1.272 1.27 0 .264-.106.582-.317.794-2.702 2.752-5.827 4.657-10.435 4.657-7.786 0-13.77-6.457-13.77-14.025M149.635 44.086v-.108c0-6.509-4.872-11.696-11.122-11.696-6.41 0-11.016 5.24-11.016 11.592v.104c0 6.511 4.872 11.7 11.122 11.7 6.409 0 11.016-5.24 11.016-11.592m-24.946 0v-.108c0-7.567 5.88-14.131 13.93-14.131 7.998 0 13.824 6.458 13.824 14.027v.104c0 7.57-5.88 14.133-13.93 14.133-7.998 0-13.824-6.457-13.824-14.025M156.431 31.594c0-.741.53-1.325 1.271-1.325.742 0 1.324.53 1.324 1.325v3.916c1.801-3.175 4.82-5.663 9.746-5.663 6.833 0 10.804 4.658 10.804 11.115v15.403c0 .794-.528 1.324-1.27 1.324s-1.325-.53-1.325-1.324V41.438c0-5.557-3.124-9.208-8.58-9.208-5.296 0-9.375 4.021-9.375 9.632v14.503c0 .794-.53 1.324-1.271 1.324-.742 0-1.324-.53-1.324-1.324V31.594z"/>
-        <path fill="#02D35F" d="M228.132 19.633c-9.448-15.782-34.398-24.223-42.14-17.052-6.587 6.1-3.825 33.301 9.142 40.764 9.19 5.288 42.033-8.623 32.998-23.712"/>
-        <path fill="#0D2C40" d="M12.3 41.262c-5.91-1.265-5.91-2.507-5.91-3.782 0-1.677 1.71-2.849 4.158-2.849 2.39 0 4.469.787 6.542 2.476a1.25 1.25 0 0 0 1.793-.217l1.67-2.213a1.253 1.253 0 0 0-.217-1.73c-2.928-2.348-5.924-3.396-9.715-3.396-5.475 0-9.604 3.518-9.604 8.255 0 5.7 4.574 7.48 9.526 8.555 5.614 1.183 5.614 2.467 5.614 3.674 0 1.834-1.772 3.065-4.41 3.065-3.024 0-5.306-.947-7.875-3.269a1.255 1.255 0 0 0-1.797.121l-1.78 2.105A1.252 1.252 0 0 0 .419 53.8c3.35 2.99 6.916 4.382 11.219 4.382 5.847 0 9.93-3.47 9.93-8.51 0-5.663-4.95-7.468-9.268-8.409"/>
-        <g transform="translate(23.6 29.63)">
-            <mask id="b" fill="#fff">
-                <use xlink:href="#a"/>
-            </mask>
-            <path fill="#0D2C40" d="M22.602.285h-2.87c-.691 0-1.253.56-1.253 1.253v14.767c0 4.665-2.215 7.13-6.407 7.13-4.203 0-6.517-2.596-6.517-7.311V1.538c0-.693-.561-1.253-1.253-1.253H1.433C.74.285.18.845.18 1.538v14.767C.18 23.882 4.71 28.588 12 28.588c7.311 0 11.855-4.79 11.855-12.501V1.537c0-.692-.562-1.252-1.253-1.252" mask="url(#b)"/>
-        </g>
-        <path fill="#0D2C40" d="M61.64 41.262c-5.91-1.265-5.91-2.507-5.91-3.782 0-1.677 1.71-2.849 4.158-2.849 2.39 0 4.469.787 6.543 2.476a1.252 1.252 0 0 0 1.793-.217l1.669-2.213a1.253 1.253 0 0 0-.216-1.73c-2.929-2.348-5.924-3.396-9.716-3.396-5.475 0-9.604 3.518-9.604 8.255 0 5.7 4.575 7.48 9.527 8.555 5.614 1.183 5.614 2.467 5.614 3.674 0 1.834-1.773 3.065-4.412 3.065-3.023 0-5.305-.947-7.874-3.269a1.256 1.256 0 0 0-1.797.121l-1.78 2.105a1.252 1.252 0 0 0 .124 1.742c3.35 2.99 6.915 4.382 11.218 4.382 5.847 0 9.932-3.47 9.932-8.51 0-5.663-4.952-7.468-9.27-8.409M93.327 52.702H78.895v-6.387h12.617c.693 0 1.253-.56 1.253-1.252v-2.612c0-.691-.56-1.252-1.253-1.252H78.895V35.03h14.251c.692 0 1.253-.56 1.253-1.252v-2.611c0-.693-.56-1.253-1.253-1.253H74.773c-.692 0-1.253.56-1.253 1.253v25.398c0 .692.561 1.252 1.253 1.252h18.554c.692 0 1.253-.56 1.253-1.252v-2.611c0-.693-.561-1.252-1.253-1.252"/>
-        <path fill="#FEFEFE" d="M190.816 17.352c.01.483-.417.881-.953.892-.536.012-.978-.368-.989-.849l-.534-2.366a1.475 1.475 0 1 1 2.95-.065l-.474 2.388zM198.044 29.845V17.393l-1.39.36c-.206.051-.49.103-.696.103-.926 0-1.725-.772-1.725-1.698 0-.798.515-1.467 1.313-1.699l2.55-.746c.746-.206 1.312-.334 1.853-.334h.052c1.08 0 1.956.875 1.956 1.955v14.511c0 1.081-.875 1.956-1.956 1.956a1.955 1.955 0 0 1-1.957-1.956zm14.021 2.11c-2.008 0-3.424-.463-4.763-1.286-.54-.335-.926-.9-.926-1.621 0-1.03.85-1.801 1.879-1.801.386 0 .72.128 1.03.309.927.54 1.75.797 2.883.797 2.215 0 3.399-1.672 3.656-4.09-.875.745-2.085 1.234-3.656 1.234-3.913 0-6.436-2.161-6.436-5.815v-.051c0-3.628 2.806-6.304 6.874-6.304 2.42 0 3.836.592 5.2 1.956 1.288 1.286 2.138 3.242 2.138 6.792v.052c0 5.84-2.755 9.828-7.879 9.828zm.747-9.751c1.957 0 3.09-1.132 3.09-2.676v-.051c0-1.596-1.185-2.753-3.167-2.753-1.957 0-3.064 1.132-3.064 2.727v.051c0 1.596 1.184 2.702 3.141 2.702z"/>
-        <path fill="#0D2C40" d="M183.372 57.396v-2.664h-.997v-.357h2.396v.357h-1v2.664zM185.17 57.396v-3.02h.601l.716 2.138c.066.2.114.348.144.448.034-.11.088-.272.161-.485l.723-2.102h.539v3.021h-.386v-2.528l-.878 2.528h-.36l-.875-2.571v2.571h-.386z"/>
-    </g>
-</svg>
diff --git a/src/frontend/packages/suse-theme/assets/core/logo.png b/src/frontend/packages/suse-theme/assets/core/logo.png
index 7aa8caef5347fa596bd3563e05d0fb0cc65aba66..3196befd97523c5238578d7f28449421e8852794 100644
GIT binary patch
literal 8263
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
FV1i$7KpFr5

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

diff --git a/src/frontend/packages/suse-theme/assets/core/nav-logo.png b/src/frontend/packages/suse-theme/assets/core/nav-logo.png
index 10f43b4e05d3f34c2ab44a2afe6c19fe38ccb397..7e907dd3d9304d4d55734591024eeaad80cb08f0 100644
GIT binary patch
literal 8342
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

literal 1475
zcmdUv`8yK~0LSNijfQQK=`A-I+9PkPF-Nmuk{Qd<HO!Ur)=CO*bG&1YiOD%_83}K>
za?{~$N>-Seve)q_y-Xy@nd{xZ@qVA@`~Cd-{ppkL<>?Ai)l~%m03f^@)?3CLS&dZ`
zWJ}~b&&u$~%Y%fIarb|czPhSn+1=yO-kv^yuS)tGbT_D~fHD51wdOkNLuaIp#z#?q
zh<#}Z`P9mE&xwk>E2fLxPqGm<8GiCF;=Rpj7B{P|vd@qJ0L5%P_5{hF|Fuw3z;@EY
zA^v0@Nf%TlV$|HlF<*Y{k_+Grr_@5BMz26XE3JAS-SD0JI`Zd0!cI{CAj3>$BJR6O
zf<mtORQi0iqpwEg+nA;ZSB(eKajN!VYC)lz9ehBL#PL15d%@N&l{yrmZ&L4o-+DhI
zRrzCsxAm%IUsyR)@7&Os#k+dLRL+c@;cfsb2l_50RtMbv6TN52288*ML+GrwaN4)I
z(%MknmQfDR$RZJ&jxyWmJ@BDEMI%EzG5VZVisuhQZ}`CF>Tcwnav12Pv(dxCHfWRA
z^4#I+%b~STQ}}l-SxQxtIJh)AifU;ov8I;|KE}9%;4MNSt+ysZeo?et%ze9G%wtR9
zVoSNgC_i3Mcn7)}oB(ADxGt9y@yF<`b6x0iLfE3oQMqlxW=L;b>;f<aYC{b`gmOIH
zUI5#RG|k?+{lji=E;T5U`e@Y`oy^R!RbQy-7jbh|lIWasfd$BG-%XZRBbwojNcT$R
z3+T_=M&<mWhdx#S8}=K>icpIgj~VV46eluJ3WAevHcBxMl-{GMwTw}Kfu4Q0t`Nsu
zFWWpUrac{{?3}Nf%A!SqEwwYj>_W}+UOK5nCdEBJrh>1hA5u=ajl-`#mm~PPBMb+g
z@VhoV({i&KL#Lk-_OF;2o1pX=^JTF?1dmH=y(;-upOtADX)3nQM$V5=zQv9dDidB!
zL=^YL!eDFrb(NuKbizNm<OeZV4T;^fSJaCD*g>Y8N|Rg&l@IMp-f)%DA8OZEuncUw
z!d83e9R*ewbq#OA?=ohES76SO`9*84<27T)g1Z-(GvOu;_uC)k$4}baZ1$1dx-gEQ
z`Z3p`JO{4Sb}5l65`6@j-)IZ<5hFYQ?R#%F>uwCcvsL3a3qFOoJ4G$a)v3HIq=geZ
zX7^e{I6;HoAUq1Ry1NL~-qw}gLHe*^-F$;x5fF7OY!V`ugk4s@|En|<#i|<adtKYO
z!hAl-(SeFvo^6k1f{S5_*I|1P#3Nk#`duCat*wZy4>kgfAjlH$PPG7kO}sHOpn`bm
zqZnv@UzO-ulQWtvTxdSfpr>~hknT0&Kb``~>x9jj$_L+D90cM%%q=&PYc-jYY;tXU
zUbI=)?QM-iiqHDY{^HZMuK27&tXODYH9Owqt?1M!M-tWaYjDc8l0AC8<q<z2%3wx=
zM^{rK^|odJiT8@?hwViSFCnlvNIC?N*NRMVpit)rDE`@T{3%Q%3$K`6rM<`07*c~=
ztXpD{wG3cvp1M_6nB<h7d}IUJ?>bXl4QC-nbB(hC!GC`~NSQctx@7q3p>8`1q=XC1
zBApJ!#5?Q>R-^BD8bRuaASUh5X7U!*Beaa7>~ydP`(|UB9EQ1e=60_{fujg>T0P<6
zM##mM1in<(eJ!5b0jY*N=C38`s~E6+`;~Yx>28Z@v+)?Lw#8m>iTQjPDxn~=t5~v@
zl)BX7|H~BGV^vf)YCFvR!r0WGD2Y2hcCyY)vvPpt{E4zIGm4V>Z+Ugew8tZkVZR@d
P=?#F#d17lZfyw^?5q=K)

diff --git a/src/frontend/packages/suse-theme/assets/favicon.ico b/src/frontend/packages/suse-theme/assets/favicon.ico
index 60f452c054d1f20e09e6134830fa80a90dec97f8..d8c1be09e70e446b543c259b242d26a3f462e4fa 100644
GIT binary patch
literal 1150
zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYInf&c&i*8wrHpbps_Vl|<w
z1DOF7BgI~HBj9?!{CxNS`s+jgzyJP(u7)6g_nqngD|Q+DUvNGTOuza12(IV%-=A>y
zzyJUK|N8p_&Id8R{CW@817iRA`wOVz-~VZ+;y~R0_4};;Z@Jk6W`Fzr5v=a*x5r>U
zj5zvm+5fdy8~-1BwEX}2Yc2n80Q~^cbL8O?u=*({qyJAn5ea5D?zjDa`soIs+7<tw
ze7p)a;?|pEaQja@UiJU%v(5iOZU*@WAFkPB_W$FLmtZqs>Q-E?`ak_t0$zQUyA8p5
z=A23Yzvu1@m^c2{?X|+I4`v652HDej*bC@R)UX8krRRu0hB>VVo&RsW*$a%@&tSP#
zS8D(N`}Y@a_W(2CX^;$efb$U<`oLPy@*pYhfal)_><kPIj1Y`$9zHfqJxDJAR;Owb

literal 1150
zcmah}Ye<t(7(P<JQ*m8>1m+)!km!eWQQD97M~f_57b)t84e|nGO)W9aIk7Oqv<4||
zZG+4(TNj&w!<F*_7B1~3>w=AP<s`hM+g!1y^G-k5+QRqaIp^g)&+~rgJMViw#$xyr
z7svRxiRG<kY#n24GY1dx$Wok7QB5L|uuuR<=1_5Ta=4a3KE;wlxuHH^i{VhX=YD!G
zKhfdP4J8tbGmuo038_YjD_wfbc^5pyA#N0{+2$BVa_N4o$xn-lEf=z3egA^XVGhl~
zeTCP*h^j|TD81K+t51#4*&e_+&<Sm?2@Tz?km*&}T5%Y$1?lMfV5b}k+5?~Idud-Q
zS|AX>L%S7{S{dej9?}SB6``ef$lL26)t$$VYq{8XaUZtVo`k07F3LKt2WKv-<e;++
zv!U^~NUA!BnjQn*O^#z?b_%}Vi+K5U3_1ETY*6mOsg`om2sH}RJKRoqIiE~7(uGt*
zK6V@B=y$#beS@sE8Y$&cS{CX{euPc?enH$(1k;!e@t5`@-B1|h$l7bLO`StN=_B?Z
zB=NyHH;F8Z8dD21sIY1wZZCp!b`m0WCQjd06OFXgSO2xM_FFhGSPOA?8Sa1XN6E8h
z#8+padB8-PN{$ul_r>Fe<@+d#2en9O%*L*!GyFXL!TK%tfWqVVLD5!+SKl0z7xR8E
zdR=dDZrFenvm9&NPC(Rh1naqe#PyLV!Twp+Q}3Jm9CjQxlp|G>3sHR*5^hQ%(jSA!
zm;;gSDAMo9G4kURX~X(AB!^;R+U?a1Jw{<?J$4!jkk%?ko}~fW(JuJ@1os?qe@HKY
o=N5WW=nbJpQSYxWk+GRr#-6WQf+~jpCJ6r;kI|aIBMoW)0`L*>j{pDw

diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.eot b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.eot
new file mode 100644
index 0000000000000000000000000000000000000000..f42fa58c9cf7f3d1614302a661cc764292da6475
GIT binary patch
literal 29376
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

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.svg b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.svg
new file mode 100644
index 0000000000..dbd591fe80
--- /dev/null
+++ b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.svg
@@ -0,0 +1,334 @@
+<?xml version="1.0" standalone="no"?>
+<!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">
+<defs >
+<font id="WorkSans" horiz-adv-x="597" ><font-face
+    font-family="Work Sans Light"
+    units-per-em="1000"
+    panose-1="0 0 0 0 0 0 0 0 0 0"
+    ascent="930"
+    descent="-243"
+    alphabetic="0" />
+<glyph unicode=" " horiz-adv-x="313" />
+<glyph unicode="!" horiz-adv-x="230" d="M141 660V340L135 190H95L89 340V660H141ZM115 82Q135 82 147 70T160 37Q160 17 148 5T115 -8Q95 -8 83 4T70 37Q70 57 82 69T115 82Z" />
+<glyph unicode="&quot;" horiz-adv-x="327" d="M262 685L248 480H208V685H262ZM129 685L115 480H75V685H129Z" />
+<glyph unicode="#" horiz-adv-x="636" d="M503 660L398 0H354L459 660H503ZM568 237V198H31V237H568ZM279 660L174 0H130L235 660H279ZM605 467V428H68V467H605Z" />
+<glyph unicode="$" horiz-adv-x="602" d="M310 1Q245 1 193 19T103 73T48 156L91 189Q105 143 136 112T212 63T313 46Q395 46 445 79T495 176Q495 217 467 245T371 288L238 317Q179 330 143 352T90 407T73 479Q73 528 101 569T180 635T303 661Q386 661 445 626T537
+518L497 487Q469 555 419 585T297 616Q242 616 203 599T144 551T124 484Q124 454 136 431T176 392T254 364L381 336Q470 317 508 279T546 180Q546 126 516 86T433 24T310 1ZM285 -100V760H328V-100H285Z" />
+<glyph unicode="%" horiz-adv-x="809" d="M163 0L596 660H645L212 0H163ZM189 665Q238 665 271 642T321 579T338 490Q338 441 321 402T271 339T189 316Q141 316 108 339T57 401T40 490Q40 539 56 578T107 641T189 665ZM189 625Q154 625 131 608T97 560T85 490Q85
+451 96 421T131 373T189 356Q225 356 248 373T282 420T293 490Q293 529 282 559T248 607T189 625ZM620 344Q669 344 702 321T752 259T769 169Q769 120 752 81T702 18T620 -5Q572 -5 538 18T487 80T470 169Q470 219 487 258T538 321T620 344ZM620 304Q585 304 562
+287T527 239T515 169Q515 131 526 101T561 53T620 35Q656 35 678 52T712 100T724 169Q724 208 713 238T679 286T620 304Z" />
+<glyph unicode="&amp;" horiz-adv-x="599" d="M247 -10Q187 -10 142 10T72 68T47 154Q47 190 57 219T89 273T143 322T220 367L245 379Q287 403 317 424T364 472T381 537Q381 578 355 601T283 625Q234 625 207 598T180 528Q180 507 185 489T208 444T258 374T346
+259Q404 186 442 140T507 70T556 37T605 28L593 -10Q565 -10 540 -1T485 34T414 108T313 231Q260 298 226 343T171 419T142 475T133 528Q133 566 150 598T202 649T286 668Q328 668 359 653T407 610T425 542Q425 500 409 467T358 406T269 347L248 339Q197 312 163
+287T111 231T94 158Q94 119 115 91T171 47T250 31Q310 31 353 54T428 117L435 125Q466 170 481 230T493 359L537 356Q539 289 523 222T467 102L458 89Q423 44 371 17T247 -10Z" />
+<glyph unicode="&apos;" horiz-adv-x="194" d="M129 685L115 480H75V685H129Z" />
+<glyph unicode="(" horiz-adv-x="305" d="M257 746L285 717Q221 661 182 595T126 452T108 283Q108 192 125 115T182 -29T285 -151L257 -180Q156 -94 107 21T57 283Q57 430 106 545T257 746Z" />
+<glyph unicode=")" horiz-adv-x="305" d="M48 -180L20 -151Q84 -95 123 -29T179 114T197 283Q197 374 180 451T123 595T20 717L48 746Q149 660 198 545T248 283Q248 136 199 21T48 -180Z" />
+<glyph unicode="*" horiz-adv-x="543" d="M282 511L347 436L421 332L388 308L312 410L261 496L271 503L282 511ZM261 511L271 503L282 496L231 410L155 308L122 332L196 436L261 511ZM62 593L183 555L276 516L271 503L267 492L170 514L50 554L62 593ZM293 730V603L284
+503H271H259L250 603V730H293ZM481 593L493 554L373 514L276 492L271 503L267 516L359 555L481 593Z" />
+<glyph unicode="+" horiz-adv-x="604" d="M326 555V73H279V555H326ZM540 339V293H64V339H540Z" />
+<glyph unicode="," horiz-adv-x="220" d="M111 82Q128 82 140 73T159 47T166 9Q166 -17 157 -43T129 -91T80 -128L52 -103Q77 -94 94 -77T121 -39T130 1L127 2Q124 -3 119 -5T104 -8Q95 -8 86 -3T71 12T65 36Q65 49 71 59T88 76T111 82Z" />
+<glyph unicode="-" horiz-adv-x="466" d="M387 291V240H80V291H387Z" />
+<glyph unicode="." horiz-adv-x="220" d="M110 82Q130 82 142 70T155 37Q155 17 143 5T110 -8Q90 -8 78 4T65 37Q65 57 77 69T110 82Z" />
+<glyph unicode="/" horiz-adv-x="396" d="M364 730L79 -70H31L316 730H364Z" />
+<glyph unicode="0" horiz-adv-x="607" d="M304 -10Q191 -10 127 77T63 330Q63 495 127 582T304 670Q417 670 480 583T544 330Q544 165 481 78T304 -10ZM304 35Q365 35 407 68T471 168T493 330Q493 426 471 492T407 591T304 625Q243 625 201 592T136 492T114 330Q114
+235 136 169T200 69T304 35Z" />
+<glyph unicode="1" horiz-adv-x="355" d="M208 0V523Q208 540 208 557T209 593Q177 553 131 525T36 483L23 528Q45 534 72 546T126 577T177 616T213 660H258V0H208Z" />
+<glyph unicode="2" horiz-adv-x="560" d="M65 0V41Q159 115 228 173T343 280T411 375T433 469Q433 540 390 582T271 624Q193 624 147 575T94 444L50 469Q56 530 84 575T159 645T272 670Q321 670 360 656T427 616T470 552T485 469Q485 402 448 339T333 205T138
+46V45Q146 45 158 45T183 46T204 46H506V0H65Z" />
+<glyph unicode="3" horiz-adv-x="550" d="M277 -10Q189 -10 125 31T41 144L90 170Q100 129 124 99T187 53T281 36Q331 36 367 54T424 105T445 183Q445 226 427 254T376 296T295 310Q279 310 266 310T241 307V357Q251 356 262 356T284 356Q357 356 393 391T429
+492Q429 555 390 589T282 624Q215 624 173 593T112 509L65 532Q80 574 111 605T186 653T283 671Q347 671 391 649T458 587T481 497Q481 464 472 436T446 387T406 352T355 334V333Q388 331 414 319T458 287T487 240T497 182Q497 125 469 82T392 15T277 -10Z" />
+<glyph unicode="4" horiz-adv-x="582" d="M369 0V188H41V226Q41 226 41 226T41 226L355 660H419V231H546V188H419V0H369ZM95 231H369V533Q369 553 369 575T371 618H369Q358 597 343 574T314 531L95 231Q95 231 95 231T95 231Z" />
+<glyph unicode="5" horiz-adv-x="560" d="M281 -10Q195 -10 138 28T57 145L105 169Q120 105 164 71T282 36Q334 36 371 56T430 114T452 201Q452 253 432 289T376 346T289 366Q246 366 214 357T159 331T119 292L76 299L111 660H476V614H153L127 358L125 345H126Q150
+373 191 392T296 412Q359 412 405 386T477 313T504 203Q504 155 488 116T442 48T372 5T281 -10Z" />
+<glyph unicode="6" horiz-adv-x="578" d="M316 670Q367 670 404 655T467 611T509 540L462 518Q448 565 412 594T313 624Q260 624 222 599T158 531T122 433T110 316Q110 301 111 284T114 249H117Q124 303 153 337T224 389T310 407Q376 407 423 382T497 309T523
+198Q523 135 496 88T421 16T305 -10Q226 -10 172 31T90 149T63 330Q63 442 96 517T186 631T316 670ZM306 360Q256 360 219 338T161 279T140 198Q140 154 161 118T219 59T304 37Q382 37 426 81T471 200Q471 248 451 284T395 340T306 360Z" />
+<glyph unicode="7" horiz-adv-x="530" d="M32 660H507V614Q425 527 371 431T289 229T256 0H204Q209 119 238 229T325 440T466 628L473 614H32V660Z" />
+<glyph unicode="8" horiz-adv-x="591" d="M295 669Q357 669 403 649T474 591T500 502Q500 445 469 405T383 348V347Q450 330 489 285T529 174Q529 119 500 78T418 13T295 -10Q226 -10 174 13T92 77T62 174Q62 239 102 284T208 347V348Q154 365 123 404T91 502Q91
+553 116 590T188 648T295 669ZM295 623Q226 623 185 590T143 497Q143 439 185 405T295 370Q365 370 406 404T448 497Q448 556 407 589T295 623ZM295 36Q350 36 391 54T454 103T477 178Q477 222 455 254T391 305T295 323Q241 323 200 305T137 255T114 178Q114 135
+136 104T200 54T295 36Z" />
+<glyph unicode="9" horiz-adv-x="593" d="M285 670Q366 670 420 628T502 510T530 330Q530 218 501 143T417 29T286 -10Q204 -10 146 28T66 135L115 160Q130 106 172 71T287 36Q344 36 382 60T443 127T475 226T485 346Q485 364 483 381T479 415H476Q470 359 440
+323T367 270T280 253Q215 253 167 278T91 349T64 457Q64 523 90 570T167 643T285 670ZM286 623Q206 623 161 578T116 456Q116 385 162 343T284 300Q334 300 372 322T431 381T453 464Q453 510 431 545T372 602T286 623Z" />
+<glyph unicode=":" horiz-adv-x="247" d="M124 505Q144 505 156 493T169 460Q169 440 157 428T124 415Q104 415 92 427T79 460Q79 480 91 492T124 505ZM124 82Q144 82 156 70T169 37Q169 17 157 5T124 -8Q104 -8 92 4T79 37Q79 57 91 69T124 82Z" />
+<glyph unicode=";" horiz-adv-x="247" d="M123 82Q140 82 152 73T171 47T178 9Q178 -17 169 -43T141 -91T92 -128L64 -103Q89 -94 106 -77T133 -39T142 1L139 2Q136 -3 131 -5T116 -8Q107 -8 98 -3T83 12T77 36Q77 49 83 59T100 76T123 82ZM124 505Q144 505 156
+493T169 460Q169 440 157 428T124 415Q104 415 92 427T79 460Q79 480 91 492T124 505Z" />
+<glyph unicode="&lt;" horiz-adv-x="604" d="M540 42L80 270V329L540 557V505L121 301L540 95V42Z" />
+<glyph unicode="=" horiz-adv-x="604" d="M529 432V386H75V432H529ZM529 230V184H75V230H529Z" />
+<glyph unicode="&gt;" horiz-adv-x="604" d="M64 557L524 329V270L64 42V94L483 298L64 504V557Z" />
+<glyph unicode="?" horiz-adv-x="510" d="M258 670Q319 670 365 650T437 591T464 500Q464 443 441 403T375 337T271 299V181H220V326Q290 342 332 364T393 418T412 495Q412 554 371 589T255 624Q176 624 132 585T79 476L35 500Q45 552 73 590T147 649T258 670ZM245
+82Q265 82 277 70T289 37Q289 17 277 5T245 -8Q225 -8 213 4T200 37Q200 57 212 69T245 82Z" />
+<glyph unicode="@" horiz-adv-x="930" d="M479 -184Q386 -184 310 -156T179 -74T95 55T66 223Q66 324 98 403T189 539T325 625T491 655Q586 655 657 624T777 540T849 418T874 276Q874 216 859 165T818 76T757 18T684 -3Q633 -3 610 27T591 102Q568 59 525 32T428
+5Q374 5 335 31T274 102T252 204Q252 260 269 308T316 392T387 449T477 469Q522 469 556 452T610 401T635 323L667 460H712L635 131Q633 121 632 112T630 93Q630 58 649 46T689 33Q728 33 761 63T814 148T835 275Q835 344 813 405T747 515T640 590T493 617Q412
+617 343 591T221 514T139 390T109 223Q109 137 136 69T212 -47T330 -120T479 -146Q557 -146 614 -124T709 -71L732 -103Q704 -126 667 -144T584 -173T479 -184ZM438 44Q489 44 529 74T591 156T614 274Q614 326 597 360T549 412T479 429Q441 429 408 412T350 365T311
+295T297 205Q297 155 315 119T365 64T438 44Z" />
+<glyph unicode="A" horiz-adv-x="625" d="M19 0L283 660H342L606 0H553L337 541L313 611H312L288 543L72 0H19ZM136 207V253H487V207H136Z" />
+<glyph unicode="B" horiz-adv-x="632" d="M104 0V660H337Q446 660 499 615T552 485Q552 428 521 388T431 335V334Q495 324 532 282T570 178Q570 94 510 47T337 0H104ZM154 46H347Q432 46 474 80T517 178Q517 243 475 276T347 310H154V46ZM154 356H338Q499 356
+499 485Q499 614 338 614H154V356Z" />
+<glyph unicode="C" horiz-adv-x="669" d="M626 167Q607 112 570 72T480 11T362 -10Q272 -10 205 31T100 149T62 330Q62 435 99 511T203 628T361 670Q428 670 478 652T564 597T617 507L568 484Q545 553 495 588T364 624Q290 624 234 589T146 488T115 330Q115 239
+145 173T232 72T362 36Q442 36 498 74T576 186L626 167Z" />
+<glyph unicode="D" horiz-adv-x="703" d="M312 660Q470 660 555 577T641 335Q641 172 556 86T312 0H104V660H312ZM316 46Q448 46 518 121T589 335Q589 469 519 541T316 614H154V46H316Z" />
+<glyph unicode="E" horiz-adv-x="612" d="M104 0V660H555V614H154V359H471V312H154V46H571V0H104Z" />
+<glyph unicode="F" horiz-adv-x="584" d="M554 614H154V359H471V312H154V0H104V660H554V614Z" />
+<glyph unicode="G" horiz-adv-x="702" d="M365 -10Q272 -10 204 31T99 149T62 330Q62 435 100 511T207 628T366 670Q467 670 529 630T624 508L578 484Q555 553 502 588T366 624Q292 624 235 589T147 487T115 330Q115 239 144 173T230 72T367 36Q422 36 462 53T529
+99T569 164T582 239V276H358V323H629V0H588L586 143L595 141Q571 71 513 31T365 -10Z" />
+<glyph unicode="H" horiz-adv-x="716" d="M612 660V0H562V660H612ZM154 660V0H104V660H154ZM586 359V312H130V359H586Z" />
+<glyph unicode="I" horiz-adv-x="258" d="M154 660V0H104V660H154Z" />
+<glyph unicode="J" horiz-adv-x="534" d="M437 660V218Q437 112 383 51T227 -10Q157 -10 112 17T48 94T40 210L87 221Q75 130 109 83T226 36Q313 36 350 87T387 229V660H437Z" />
+<glyph unicode="K" horiz-adv-x="610" d="M582 660L306 377L298 369L128 196V264L516 660H582ZM154 660V0H104V660H154ZM310 410L589 0H528L270 380L310 410Z" />
+<glyph unicode="L" horiz-adv-x="572" d="M154 46H550V0H104V660H154V46Z" />
+<glyph unicode="M" horiz-adv-x="822" d="M718 660V0H670V492L676 612H675L434 0H388L147 612H146L152 492V0H104V660H179L378 160L411 59H412L444 159L643 660H718Z" />
+<glyph unicode="N" horiz-adv-x="715" d="M611 660V0H549L199 518L150 603H149L152 523V0H104V660H167L516 143L566 57V57L564 137V660H611Z" />
+<glyph unicode="O" horiz-adv-x="732" d="M366 670Q460 670 528 629T633 511T670 330Q670 225 633 149T528 32T366 -10Q273 -10 205 31T99 149T62 330Q62 435 99 511T204 628T366 670ZM366 624Q289 624 233 589T146 487T115 330Q115 239 145 173T232 72T366 36Q444
+36 500 71T587 173T618 330Q618 421 587 487T500 588T366 624Z" />
+<glyph unicode="P" horiz-adv-x="587" d="M323 660Q392 660 442 637T519 570T547 467Q547 406 520 363T442 297T323 273H154V0H104V660H323ZM317 320Q404 320 449 358T494 467Q494 537 449 575T317 614H154V320H317Z" />
+<glyph unicode="Q" horiz-adv-x="732" d="M535 -195Q484 -195 441 -174T372 -109T345 6Q345 12 345 18T346 30L391 29Q390 23 390 18T390 8Q390 -48 409 -82T462 -130T536 -145Q569 -145 598 -136T647 -108L665 -154Q643 -174 608 -184T535 -195ZM366 670Q460
+670 528 629T633 511T670 330Q670 225 633 149T528 32T366 -10Q273 -10 205 31T99 149T62 330Q62 435 99 511T204 628T366 670ZM366 624Q289 624 233 589T146 487T115 330Q115 239 145 173T232 72T366 36Q444 36 500 71T587 173T618 330Q618 421 587 487T500 588T366
+624Z" />
+<glyph unicode="R" horiz-adv-x="640" d="M349 660Q448 660 506 610T565 473Q565 386 506 338T348 289L343 286H154V0H104V660H349ZM348 333Q428 333 470 369T513 473Q513 541 471 577T348 614H154V333H348ZM387 324L600 0H541L345 296L387 324Z" />
+<glyph unicode="S" horiz-adv-x="619" d="M308 670Q399 670 461 634T557 524L515 492Q486 562 434 593T304 624Q245 624 204 606T142 557T121 488Q121 443 150 413T261 364L390 336Q487 315 526 276T566 174Q566 120 535 78T448 13T319 -10Q248 -10 193 9T99 64T43
+150L87 184Q101 137 133 104T214 53T321 36Q377 36 421 51T489 97T514 171Q514 213 485 242T380 286L244 316Q181 330 142 353T86 408T68 482Q68 533 97 575T180 644T308 670Z" />
+<glyph unicode="T" horiz-adv-x="576" d="M554 660V614H313V0H263V614H22V660H554Z" />
+<glyph unicode="U" horiz-adv-x="687" d="M598 660V241Q598 118 532 54T344 -10Q223 -10 156 54T89 241V660H139V251Q139 145 191 91T344 36Q444 36 496 90T548 251V660H598Z" />
+<glyph unicode="V" horiz-adv-x="614" d="M591 660L337 0H278L23 660H77L272 149L307 47L342 149L538 660H591Z" />
+<glyph unicode="W" horiz-adv-x="937" d="M236 0L30 660H82L268 46L440 660H498L671 45L857 660H907L701 0H639L506 463L469 606H468L431 463L298 0H236Z" />
+<glyph unicode="X" horiz-adv-x="566" d="M541 0H483L282 297L78 0H19L255 339L39 660H99L286 381L476 660H533L313 340L541 0Z" />
+<glyph unicode="Y" horiz-adv-x="544" d="M531 660L297 257V0H247V257L13 660H72L201 434L272 309L343 434L472 660H531Z" />
+<glyph unicode="Z" horiz-adv-x="593" d="M88 28L79 46H553V0H43V44L492 632L501 614H52V660H537V616L88 28Z" />
+<glyph unicode="[" horiz-adv-x="311" d="M288 686H129V-124H288V-168H82V730H288V686Z" />
+<glyph unicode="\" horiz-adv-x="396" d="M32 730H80L364 -70H317L32 730Z" />
+<glyph unicode="]" horiz-adv-x="311" d="M23 -124H182V686H23V730H229V-168H23V-124Z" />
+<glyph unicode="^" horiz-adv-x="547" d="M32 355L249 730H298L516 355H464L274 686L84 355H32Z" />
+<glyph unicode="_" horiz-adv-x="520" d="M520 -97V-143H0V-97H520Z" />
+<glyph unicode="`" horiz-adv-x="523" d="M249 741L329 583H288L195 741H249Z" />
+<glyph unicode="a" horiz-adv-x="543" d="M395 329Q395 394 360 430T260 466Q203 466 162 442T101 360L60 386Q82 445 133 477T261 510Q316 510 357 491T422 433T445 338V88Q445 35 493 35Q514 35 529 42L526 2Q509 -7 482 -7Q459 -7 439 2T407 32T394 89V116L408
+117Q399 74 369 46T298 4T218 -10Q171 -10 134 5T76 48T55 119Q55 175 92 209T198 257L405 298V256L223 220Q164 208 135 185T106 123Q106 81 137 58T225 34Q254 34 284 42T339 67T380 111T395 176V329Z" />
+<glyph unicode="b" horiz-adv-x="607" d="M324 -10Q278 -10 239 7T172 56T131 131L138 139L134 0H89V730H139V366L133 375Q153 437 204 473T324 510Q390 510 441 479T522 390T552 250Q552 169 522 111T441 21T324 -10ZM318 34Q403 34 452 92T502 250Q502 350 453
+408T319 466Q267 466 226 440T162 364T139 249Q139 184 162 135T225 60T318 34Z" />
+<glyph unicode="c" horiz-adv-x="543" d="M291 510Q342 510 382 494T450 448T493 375L446 353Q430 407 391 436T290 466Q235 466 193 441T128 367T105 250Q105 183 128 134T192 60T289 34Q331 34 365 48T422 89T452 153L498 137Q485 91 456 58T384 8T290 -10Q222
+-10 169 21T85 110T55 250Q55 331 85 389T169 479T291 510Z" />
+<glyph unicode="d" horiz-adv-x="607" d="M284 -10Q219 -10 167 21T86 110T56 250Q56 333 87 391T171 479T289 510Q358 510 407 473T474 371L468 366V730H518V0H473L470 139L476 141Q467 93 440 59T372 8T284 -10ZM290 34Q343 34 383 60T445 137T468 254Q468 320
+446 367T384 440T292 466Q206 466 156 408T106 250Q106 150 155 92T290 34Z" />
+<glyph unicode="e" horiz-adv-x="557" d="M293 -10Q224 -10 170 21T86 110T55 250Q55 331 85 389T168 479T287 510Q355 510 403 480T477 397T503 273Q503 264 503 256T501 240H86V285H479L454 278Q453 364 409 415T286 466Q232 466 191 441T127 367T104 250Q104
+183 127 134T193 60T292 34Q350 34 391 59T456 128L496 105Q478 69 448 44T379 4T293 -10Z" />
+<glyph unicode="f" horiz-adv-x="359" d="M272 735Q300 735 320 728T353 708L339 668Q326 680 311 685T276 690Q227 690 200 662T173 579V500V482V0H123V584Q123 618 132 646T161 693T208 724T272 735ZM349 500V457H23V500H349Z" />
+<glyph unicode="g" horiz-adv-x="515" d="M503 592L515 548Q514 548 513 548T510 548Q461 548 435 523T408 451L376 467Q376 505 392 533T436 576T499 592Q501 592 501 592T503 592ZM345 51Q419 51 461 20T503 -63Q503 -109 473 -143T389 -196T268 -215Q155 -215
+95 -177T35 -80Q35 -38 65 -7T155 30L151 21Q119 30 95 51T70 111Q70 153 101 179T185 210L238 192H217Q171 189 144 170T116 119Q116 85 142 68T210 51H345ZM268 -173Q327 -173 369 -159T433 -122T456 -69Q456 -34 426 -13T333 8H191Q144 8 113 -14T82 -73Q82
+-118 131 -145T268 -173ZM261 510Q320 510 365 490T436 433T461 347Q461 299 436 262T366 204T261 183Q166 183 113 228T59 347Q59 396 84 432T155 489T261 510ZM261 469Q195 469 153 436T111 347Q111 292 153 258T261 224Q327 224 368 258T410 347Q410 402 369
+435T261 469Z" />
+<glyph unicode="h" horiz-adv-x="598" d="M89 0V730H139V398Q161 451 210 480T323 510Q379 510 422 490T489 428T514 325V0H464V309Q464 390 424 428T318 467Q271 467 231 445T165 382T139 282V0H89Z" />
+<glyph unicode="i" horiz-adv-x="229" d="M114 597Q95 597 84 608T72 639Q72 658 83 669T114 681Q133 681 144 670T156 639Q156 620 145 609T114 597ZM139 500V0H89V500H139Z" />
+<glyph unicode="j" horiz-adv-x="229" d="M114 597Q95 597 84 608T72 639Q72 658 83 669T114 681Q133 681 144 670T156 639Q156 620 145 609T114 597ZM139 500V-57Q139 -112 119 -147T66 -198T-3 -215Q-30 -215 -52 -207T-90 -187L-78 -140Q-65 -152 -46 -159T-4
+-167Q38 -167 63 -139T89 -53V500H139Z" />
+<glyph unicode="k" horiz-adv-x="527" d="M501 500L281 288L269 276L114 126V190L436 500H501ZM139 730V0H89V730H139ZM284 314L509 0H448L243 285L284 314Z" />
+<glyph unicode="l" horiz-adv-x="274" d="M135 730V118Q135 72 151 53T201 34Q222 34 234 37T264 47L257 3Q244 -3 228 -6T191 -10Q138 -10 112 20T85 116V730H135Z" />
+<glyph unicode="m" horiz-adv-x="960" d="M89 0V500H134L137 396Q159 450 208 480T319 510Q384 510 431 479T497 388Q510 426 539 453T607 496T688 511Q740 511 782 491T850 429T876 325V1H826V320Q826 394 787 430T682 467Q635 467 595 445T532 382T508 288V0H458V319Q458
+393 418 429T314 466Q269 466 229 444T164 381T139 283V0H89Z" />
+<glyph unicode="n" horiz-adv-x="598" d="M89 0V500H134L138 375L130 382Q144 423 172 452T239 495T323 510Q379 510 422 489T489 427T514 324V0H464V308Q464 390 424 428T318 466Q271 466 231 445T165 382T139 282V0H89Z" />
+<glyph unicode="o" horiz-adv-x="585" d="M293 510Q363 510 416 479T500 390T531 250Q531 169 501 111T417 21T293 -10Q223 -10 170 21T86 110T55 250Q55 331 85 389T169 479T293 510ZM293 467Q236 467 194 441T129 367T105 250Q105 183 128 134T194 59T293 33Q350
+33 392 59T457 134T481 250Q481 318 458 366T392 441T293 467Z" />
+<glyph unicode="p" horiz-adv-x="607" d="M89 -210V500H134L138 361L131 369Q144 412 171 444T239 493T326 510Q390 510 441 479T522 390T552 250Q552 169 522 111T441 21T324 -10Q255 -10 204 26T133 125L139 134V-210H89ZM318 34Q403 34 452 92T502 250Q502
+350 453 408T320 466Q267 466 227 440T163 365T139 250Q139 185 162 136T225 61T318 34Z" />
+<glyph unicode="q" horiz-adv-x="607" d="M468 -210V146L476 140Q467 92 439 59T371 8T284 -10Q219 -10 167 21T86 110T56 250Q56 333 87 391T171 479T289 510Q335 510 374 493T440 443T477 364L470 363L473 500H518V-210H468ZM290 34Q343 34 382 60T445 136T468
+252Q468 319 446 367T383 440T291 466Q206 466 156 408T106 250Q106 150 155 92T290 34Z" />
+<glyph unicode="r" horiz-adv-x="378" d="M89 0V500H131L137 396Q156 448 198 479T299 510Q319 510 335 506T362 493L350 449Q339 456 326 460T287 464Q249 464 215 441T160 376T139 280V0H89Z" />
+<glyph unicode="s" horiz-adv-x="505" d="M258 -10Q182 -10 124 21T41 110L84 139Q102 89 148 62T262 34Q328 34 365 60T403 129Q403 158 385 179T315 212L198 237Q127 252 96 285T65 367Q65 407 89 439T155 490T255 510Q330 510 379 481T448 392L406 365Q391
+418 351 442T255 466Q213 466 182 454T133 420T115 370Q115 341 135 318T206 283L326 257Q397 242 425 212T453 136Q453 92 429 59T361 8T258 -10Z" />
+<glyph unicode="t" horiz-adv-x="377" d="M172 639V132Q172 85 194 61T260 36Q288 36 309 45T348 73L367 32Q348 13 319 2T254 -10Q215 -10 185 4T139 49T122 125V625L172 639ZM359 500V457H22V500H359Z" />
+<glyph unicode="u" horiz-adv-x="592" d="M265 -10Q213 -10 172 9T108 68T84 170V500H134V182Q134 104 171 69T277 34Q317 34 349 48T405 87T440 144T453 213V500H503V0H458L456 103Q434 50 384 20T265 -10Z" />
+<glyph unicode="v" horiz-adv-x="502" d="M432 500H485L276 0H226L17 500H73L252 52L432 500Z" />
+<glyph unicode="w" horiz-adv-x="809" d="M726 500H781L611 0H561L403 435L248 0H198L28 500H83L224 60L379 500H430L586 60L726 500Z" />
+<glyph unicode="x" horiz-adv-x="504" d="M98 500L265 283L270 277L482 0H419L240 233L233 241L34 500H98ZM467 500L273 245L267 241L84 0H24L238 277L242 279L407 500H467Z" />
+<glyph unicode="y" horiz-adv-x="500" d="M483 500L241 -92Q223 -138 202 -165T155 -203T95 -215Q65 -215 41 -206T-1 -181L15 -138Q30 -156 51 -163T94 -171Q126 -171 151 -153T198 -80L231 0L178 124L20 500H77L230 121L255 54L282 126L429 500H483Z" />
+<glyph unicode="z" horiz-adv-x="505" d="M49 0V39L343 400L395 458L316 457H46V500H451V461L166 109L106 42L196 43H463V0H49Z" />
+<glyph unicode="{" horiz-adv-x="308" d="M274 -180Q225 -180 194 -166T147 -126T132 -62V162Q132 213 104 237T19 261V305Q76 305 104 329T132 404V627Q132 665 147 691T193 732T274 746V705Q225 705 202 686T179 631V400Q179 354 154 324T82 283Q129 272 154
+242T179 166V-65Q179 -101 202 -120T274 -139V-180Z" />
+<glyph unicode="|" horiz-adv-x="207" d="M126 730V-168H82V730H126Z" />
+<glyph unicode="}" horiz-adv-x="308" d="M34 746Q83 746 114 732T161 692T176 628V404Q176 353 204 329T289 305V261Q232 261 204 237T176 162V-61Q176 -99 161 -125T115 -166T34 -180V-139Q83 -139 106 -120T129 -65V166Q129 212 154 242T226 283Q179 294 154
+324T129 400V631Q129 667 106 686T34 705V746Z" />
+<glyph unicode="~" horiz-adv-x="511" d="M468 389Q462 328 434 297T355 266Q321 266 296 277T251 303T209 329T161 340Q131 340 114 320T91 263H43Q49 324 77 355T157 386Q190 386 215 375T261 349T303 323T351 312Q381 312 397 332T421 389H468Z" />
+<glyph unicode="&#xa0;" horiz-adv-x="313" />
+<glyph unicode="&#xa1;" horiz-adv-x="222" d="M85 -160V160L91 310H131L137 160V-160H85ZM111 418Q91 418 79 430T66 463Q66 483 78 495T111 508Q131 508 143 496T156 463Q156 443 144 431T111 418Z" />
+<glyph unicode="&#xa2;" horiz-adv-x="553" d="M297 -10Q226 -10 173 21T91 110T61 250Q61 331 91 389T174 479T299 510Q350 510 389 494T457 448T500 375L453 353Q437 409 397 439T298 469Q212 469 161 411T109 250Q109 181 132 132T197 57T296 31Q338 31 371
+45T428 87T460 153L505 138Q492 92 463 59T392 8T297 -10ZM270 -100V600H312V-100H270Z" />
+<glyph unicode="&#xa3;" horiz-adv-x="598" d="M87 290V331H458V290H87ZM145 -7Q97 -7 70 14T43 69Q43 92 56 110T93 138T151 149Q191 149 219 138T271 109T316 74T365 45T428 33Q473 33 496 59T520 138H561Q561 89 545 57T501 9T433 -7Q394 -7 364 4T307 33T257
+69T207 99T148 111Q121 111 105 100T89 69Q89 50 105 39T150 28Q192 28 215 45T247 92T256 154Q256 194 242 231T199 318Q179 353 167 379T149 430T144 481Q144 539 170 581T241 647T345 670Q421 670 468 631T531 519L488 496Q477 556 441 590T344 625Q273 625
+232 587T190 481Q190 458 194 438T209 394T237 336Q266 284 281 241T296 158Q296 126 288 97T262 44T215 7T145 -7Z" />
+<glyph unicode="&#xa4;" horiz-adv-x="635" d="M318 528Q375 528 419 503T487 434T512 331Q512 272 488 228T419 158T318 132Q260 132 217 157T148 227T123 331Q123 390 148 434T216 503T318 528ZM318 483Q254 483 214 441T173 331Q173 261 213 219T318 177Q382
+177 422 219T462 331Q462 399 422 441T318 483ZM99 581L212 468L179 437L66 548L99 581ZM179 224L211 192L99 78L66 110L179 224ZM455 223L569 110L537 78L423 190L455 223ZM537 581L569 548L457 435L425 468L537 581Z" />
+<glyph unicode="&#xa5;" horiz-adv-x="596" d="M275 0V119H77V155H275V246H77V284H222L263 282L39 660H97L265 361L297 297H299L331 361L499 660H557L333 282L374 284H520V246H320V155H520V119H320V0H275Z" />
+<glyph unicode="&#xa6;" horiz-adv-x="207" d="M126 730V366H82V730H126ZM126 196V-168H82V196H126Z" />
+<glyph unicode="&#xa7;" horiz-adv-x="569" d="M383 138L354 159Q392 162 422 174T471 207T490 259Q490 297 465 320T373 356L252 380Q195 391 161 409T112 455T97 519Q97 562 121 596T189 650T295 670Q364 670 414 647T490 578L451 548Q430 590 390 608T294 627Q223
+627 184 598T145 523Q145 496 155 477T190 445T260 423L379 401Q438 391 472 373T522 330T538 269Q538 235 520 207T467 161T383 138ZM278 -110Q201 -110 150 -85T76 -16L115 15Q133 -25 174 -46T281 -68Q354 -68 393 -38T433 40Q433 78 408 100T329 133L201 158Q142
+170 107 188T55 232T39 295Q39 329 58 355T109 397T182 419L204 401Q173 395 147 383T104 351T87 302Q87 265 115 241T215 201L338 178Q412 164 446 131T480 43Q480 1 457 -34T388 -89T278 -110Z" />
+<glyph unicode="&#xa8;" horiz-adv-x="523" d="M167 671Q185 671 196 660T207 630Q207 612 196 601T167 590Q149 590 138 601T126 630Q126 649 137 660T167 671ZM356 671Q375 671 386 660T397 630Q397 612 386 601T356 590Q338 590 327 601T316 630Q316 649 327
+660T356 671Z" />
+<glyph unicode="&#xa9;" horiz-adv-x="803" d="M402 -10Q301 -10 225 35T107 157T64 330Q64 427 106 503T225 625T402 670Q503 670 578 625T696 504T739 330Q739 234 697 157T579 35T402 -10ZM402 31Q489 31 554 70T657 178T694 330Q694 415 657 482T555 589T401
+629Q315 629 249 590T146 483T109 330Q109 246 146 178T249 71T402 31ZM411 143Q326 143 278 192T229 328Q229 414 277 463T411 513Q469 513 507 488T564 416L526 397Q513 436 484 455T410 475Q346 475 309 436T272 328Q272 259 309 220T410 181Q456 181 488 203T532
+265L568 250Q552 201 511 172T411 143Z" />
+<glyph unicode="&#xaa;" horiz-adv-x="379" d="M145 327Q96 327 67 350T38 413Q38 452 63 474T146 507L270 529V499L161 478Q117 470 100 456T82 415Q82 391 100 377T150 362Q174 362 200 370T245 400T263 457V550Q263 587 241 608T180 630Q142 630 115 614T72
+562L40 580Q53 618 88 641T178 665Q238 665 272 637T307 552V396Q307 376 315 368T339 359Q355 359 363 364L360 334Q354 331 346 329T328 327Q303 327 286 342T268 392V414L277 411Q268 384 248 365T201 337T145 327ZM38 211V246H347V211H38Z" />
+<glyph unicode="&#xab;" horiz-adv-x="440" d="M239 461L103 265L239 69H183L49 265L183 461H239ZM388 461L252 265L388 69H332L198 265L332 461H388Z" />
+<glyph unicode="&#xac;" horiz-adv-x="604" d="M537 318V152H487V318H537ZM537 339V293H67V339H537Z" />
+<glyph unicode="&#xad;" horiz-adv-x="466" d="M387 291V240H80V291H387Z" />
+<glyph unicode="&#xae;" horiz-adv-x="803" d="M402 -10Q301 -10 225 35T107 157T64 330Q64 427 106 503T225 625T402 670Q503 670 578 626T696 504T739 330Q739 234 697 157T579 35T402 -10ZM514 143L408 304L444 319L562 143H514ZM402 31Q489 31 555 70T657
+178T694 330Q694 415 657 482T555 589T402 629Q315 629 249 590T146 483T109 330Q109 246 146 178T249 71T402 31ZM272 143V513H425Q466 513 495 500T539 463T555 403Q555 351 521 322T425 293H315V143H272ZM315 326H425Q468 326 490 345T513 403Q513 442 491 460T425
+479H315V326Z" />
+<glyph unicode="&#xaf;" horiz-adv-x="523" d="M417 642V600H107V642H417Z" />
+<glyph unicode="&#xb0;" horiz-adv-x="418" d="M209 368Q164 368 130 387T76 441T56 519Q56 563 75 597T129 651T209 670Q255 670 289 651T342 598T362 519Q362 475 343 441T289 388T209 368ZM209 409Q258 409 287 440T317 519Q317 567 288 598T209 629Q161 629
+131 598T100 519Q100 471 130 440T209 409Z" />
+<glyph unicode="&#xb1;" horiz-adv-x="604" d="M326 632V132H279V632H326ZM537 406V359H67V406H537ZM537 46V0H67V46H537Z" />
+<glyph unicode="&#xb2;" horiz-adv-x="358" d="M43 333V366Q69 386 94 406T145 447Q185 479 211 506T251 558T264 610Q264 649 241 673T173 698Q129 698 103 671T74 596L34 609Q38 666 75 700T175 735Q219 735 249 719T295 675T311 612Q311 581 294 550T247 489T176
+428Q158 413 140 399T101 369V368Q109 369 124 369T148 370H323V333H43Z" />
+<glyph unicode="&#xb3;" horiz-adv-x="345" d="M167 735Q228 735 261 705T295 628Q295 601 285 581T257 549T218 533V532Q241 531 260 519T292 487T304 439Q304 405 286 380T237 341T166 327Q109 327 74 351T24 421L66 440Q73 404 97 384T166 364Q207 364 232
+385T258 444Q258 483 232 499T162 516Q158 516 154 516T144 515V549Q150 548 153 548T161 548Q200 548 224 567T248 623Q248 658 227 678T166 698Q130 698 107 681T77 632L36 647Q48 690 83 712T167 735Z" />
+<glyph unicode="&#xb4;" horiz-adv-x="600" d="M313 741H368L274 583H233L313 741Z" />
+<glyph unicode="&#xb5;" horiz-adv-x="598" d="M89 -210V500H139V182Q139 108 178 71T282 34Q332 34 371 56T434 119T458 219V500H508V0H466L463 105Q441 53 392 22T279 -10Q233 -10 196 9T139 66V66V-210H89Z" />
+<glyph unicode="&#xb6;" horiz-adv-x="591" d="M280 -100V221Q207 221 152 248T67 325T36 440Q36 506 67 555T156 632T289 660H505V-100H460V618H326V-100H280ZM280 263V618Q219 618 175 596T108 534T84 440Q84 386 107 346T175 285T280 263Z" />
+<glyph unicode="&#xb7;" horiz-adv-x="210" d="M105 402Q125 402 137 390T150 357Q150 337 138 325T105 312Q85 312 73 324T60 357Q60 377 72 389T105 402Z" />
+<glyph unicode="&#xb8;" horiz-adv-x="547" d="M240 4L272 17Q328 -5 350 -35T373 -106Q373 -150 344 -179T268 -209Q237 -209 214 -200T173 -174L187 -137Q204 -152 222 -160T263 -169Q293 -169 312 -150T331 -97Q331 -68 312 -46T240 4Z" />
+<glyph unicode="&#xb9;" horiz-adv-x="229" d="M130 730H169V333H124V612Q124 627 124 645T126 680Q106 657 76 640T15 614V652Q33 657 56 669T99 697T130 730Z" />
+<glyph unicode="&#xba;" horiz-adv-x="362" d="M181 327Q110 327 71 370T32 496Q32 580 71 622T181 665Q252 665 291 623T330 496Q330 413 291 370T181 327ZM42 211V246H320V211H42ZM181 363Q234 363 259 396T285 496Q285 562 260 596T181 630Q128 630 103 596T77
+496Q77 430 102 397T181 363Z" />
+<glyph unicode="&#xbb;" horiz-adv-x="440" d="M201 69L337 265L201 461H257L391 265L257 69H201ZM52 69L188 265L52 461H108L242 265L108 69H52Z" />
+<glyph unicode="&#xbc;" horiz-adv-x="735" d="M130 921H169V524H124V803Q124 818 124 836T126 871Q106 848 76 831T15 805V843Q33 848 56 860T99 888T130 921ZM81 0L552 660H603L132 0H81ZM711 138V105H635V-4H596V105H398V131L584 393H635V138H711ZM442 138H596V295Q596
+310 596 325T598 355H596Q589 344 581 330T564 305L442 138Z" />
+<glyph unicode="&#xbd;" horiz-adv-x="813" d="M130 921H169V524H124V803Q124 818 124 836T126 871Q106 848 76 831T15 805V843Q33 848 56 860T99 888T130 921ZM81 0L552 660H603L132 0H81ZM498 -4V29Q524 49 549 69T600 110Q640 142 666 169T706 221T719 273Q719
+312 696 336T628 361Q584 361 558 334T529 259L489 272Q493 329 530 363T630 398Q674 398 704 382T750 338T766 275Q766 244 749 213T702 152T631 91Q613 76 595 62T556 32V31Q564 32 579 32T603 33H778V-4H498Z" />
+<glyph unicode="&#xbe;" horiz-adv-x="851" d="M167 926Q228 926 261 896T295 819Q295 792 285 772T257 740T218 724V723Q241 722 260 710T292 678T304 630Q304 596 286 571T237 532T166 518Q109 518 74 542T24 612L66 631Q73 595 97 575T166 555Q207 555 232
+576T258 635Q258 674 232 690T162 707Q158 707 154 707T144 706V740Q150 739 153 739T161 739Q200 739 224 758T248 814Q248 849 227 869T166 889Q130 889 107 872T77 823L36 838Q48 881 83 903T167 926ZM197 0L668 660H719L248 0H197ZM828 138V105H752V-4H713V105H515V131L701
+393H752V138H828ZM559 138H713V295Q713 310 713 325T715 355H713Q706 344 698 330T681 305L559 138Z" />
+<glyph unicode="&#xbf;" horiz-adv-x="505" d="M249 -172Q188 -172 142 -152T70 -93T43 -2Q43 55 66 95T132 161T236 199V317H287V172Q217 156 175 134T114 80T95 3Q95 -56 136 -91T252 -126Q331 -126 375 -87T428 22L472 -2Q462 -54 434 -92T360 -151T249 -172ZM262
+416Q242 416 230 428T218 461Q218 481 230 493T262 506Q282 506 294 494T307 461Q307 441 295 429T262 416Z" />
+<glyph unicode="&#xc0;" horiz-adv-x="625" d="M19 0L283 660H342L606 0H553L337 541L313 611H312L288 543L72 0H19ZM136 207V253H487V207H136ZM266 897L336 743H295L213 897H266Z" />
+<glyph unicode="&#xc1;" horiz-adv-x="625" d="M19 0L283 660H342L606 0H553L337 541L313 611H312L288 543L72 0H19ZM136 207V253H487V207H136ZM358 897H411L328 743H287L358 897Z" />
+<glyph unicode="&#xc2;" horiz-adv-x="625" d="M19 0L283 660H342L606 0H553L337 541L313 611H312L288 543L72 0H19ZM136 207V253H487V207H136ZM451 743H403L313 860L223 743H175L285 894H341L451 743Z" />
+<glyph unicode="&#xc3;" horiz-adv-x="625" d="M19 0L283 660H342L606 0H553L337 541L313 611H312L288 543L72 0H19ZM136 207V253H487V207H136ZM483 861Q479 825 467 800T434 763T385 751Q358 751 339 761T305 785T276 808T243 819Q217 819 204 801T183 750H143Q149
+805 174 832T244 860Q269 860 288 850T322 826T351 803T384 792Q411 792 424 810T443 861H483Z" />
+<glyph unicode="&#xc4;" horiz-adv-x="625" d="M19 0L283 660H342L606 0H553L337 541L313 611H312L288 543L72 0H19ZM136 207V253H487V207H136ZM218 831Q236 831 247 820T258 790Q258 772 247 761T218 750Q200 750 189 761T177 790Q177 809 188 820T218 831ZM407
+831Q426 831 437 820T448 790Q448 772 437 761T407 750Q389 750 378 761T367 790Q367 809 378 820T407 831Z" />
+<glyph unicode="&#xc5;" horiz-adv-x="625" d="M19 0L283 660H342L606 0H553L337 541L313 611H312L288 543L72 0H19ZM136 207V253H487V207H136ZM310 828Q357 828 386 800T415 728Q415 684 386 656T310 627Q264 627 235 655T205 728Q205 772 234 800T310 828ZM310
+795Q281 795 262 776T242 728Q242 699 261 680T310 660Q340 660 359 679T379 728Q379 757 360 776T310 795Z" />
+<glyph unicode="&#xc6;" horiz-adv-x="922" d="M495 46H880V0H445V232H196L56 0H-1L401 660H865V614H495V358H783V312H495V46ZM223 279H445V614H426L223 279Z" />
+<glyph unicode="&#xc7;" horiz-adv-x="669" d="M626 167Q607 112 570 72T480 11T362 -10Q272 -10 205 31T100 149T62 330Q62 435 99 511T203 628T361 670Q428 670 478 652T564 597T617 507L568 484Q545 553 495 588T364 624Q290 624 234 589T146 488T115 330Q115
+239 145 173T232 72T362 36Q442 36 498 74T576 186L626 167ZM310 4L342 17Q398 -5 420 -35T443 -106Q443 -150 414 -179T338 -209Q307 -209 284 -200T243 -174L257 -137Q274 -152 292 -160T333 -169Q363 -169 382 -150T401 -97Q401 -68 382 -46T310 4Z" />
+<glyph unicode="&#xc8;" horiz-adv-x="612" d="M104 0V660H555V614H154V359H471V312H154V46H571V0H104ZM286 897L356 743H315L233 897H286Z" />
+<glyph unicode="&#xc9;" horiz-adv-x="612" d="M104 0V660H555V614H154V359H471V312H154V46H571V0H104ZM374 897H427L344 743H303L374 897Z" />
+<glyph unicode="&#xca;" horiz-adv-x="612" d="M104 0V660H555V614H154V359H471V312H154V46H571V0H104ZM468 743H420L330 860L240 743H192L302 894H358L468 743Z" />
+<glyph unicode="&#xcb;" horiz-adv-x="612" d="M104 0V660H555V614H154V359H471V312H154V46H571V0H104ZM235 831Q253 831 264 820T275 790Q275 772 264 761T235 750Q217 750 206 761T194 790Q194 809 205 820T235 831ZM424 831Q443 831 454 820T465 790Q465 772
+454 761T424 750Q406 750 395 761T384 790Q384 809 395 820T424 831Z" />
+<glyph unicode="&#xcc;" horiz-adv-x="258" d="M154 660V0H104V660H154ZM79 897L149 743H108L26 897H79Z" />
+<glyph unicode="&#xcd;" horiz-adv-x="258" d="M154 660V0H104V660H154ZM179 897H232L149 743H108L179 897Z" />
+<glyph unicode="&#xce;" horiz-adv-x="258" d="M154 660V0H104V660H154ZM267 743H219L129 860L39 743H-9L101 894H157L267 743Z" />
+<glyph unicode="&#xcf;" horiz-adv-x="258" d="M55 831Q74 831 85 820T96 790Q96 772 85 761T55 750Q37 750 26 761T15 790Q15 809 26 820T55 831ZM202 831Q221 831 232 820T243 790Q243 772 232 761T202 750Q184 750 173 761T162 790Q162 809 173 820T202 831ZM154
+660V0H104V660H154Z" />
+<glyph unicode="&#xd0;" horiz-adv-x="715" d="M16 311V357H368V311H16ZM324 660Q482 660 567 577T653 335Q653 172 568 86T324 0H116V660H324ZM329 46Q460 46 530 121T601 335Q601 469 531 541T329 614H166V46H329Z" />
+<glyph unicode="&#xd1;" horiz-adv-x="715" d="M611 660V0H549L199 518L150 603H149L152 523V0H104V660H167L516 143L566 57V57L564 137V660H611ZM533 861Q529 825 517 800T484 763T435 751Q408 751 389 761T355 785T326 808T293 819Q267 819 254 801T233 750H193Q199
+805 224 832T294 860Q319 860 338 850T372 826T401 803T434 792Q461 792 474 810T493 861H533Z" />
+<glyph unicode="&#xd2;" horiz-adv-x="732" d="M366 670Q460 670 528 629T633 511T670 330Q670 225 633 149T528 32T366 -10Q273 -10 205 31T99 149T62 330Q62 435 99 511T204 628T366 670ZM366 624Q289 624 233 589T146 487T115 330Q115 239 145 173T232 72T366
+36Q444 36 500 71T587 173T618 330Q618 421 587 487T500 588T366 624ZM317 897L387 743H346L264 897H317Z" />
+<glyph unicode="&#xd3;" horiz-adv-x="732" d="M366 670Q460 670 528 629T633 511T670 330Q670 225 633 149T528 32T366 -10Q273 -10 205 31T99 149T62 330Q62 435 99 511T204 628T366 670ZM366 624Q289 624 233 589T146 487T115 330Q115 239 145 173T232 72T366
+36Q444 36 500 71T587 173T618 330Q618 421 587 487T500 588T366 624ZM411 897H464L381 743H340L411 897Z" />
+<glyph unicode="&#xd4;" horiz-adv-x="732" d="M366 670Q460 670 528 629T633 511T670 330Q670 225 633 149T528 32T366 -10Q273 -10 205 31T99 149T62 330Q62 435 99 511T204 628T366 670ZM366 624Q289 624 233 589T146 487T115 330Q115 239 145 173T232 72T366
+36Q444 36 500 71T587 173T618 330Q618 421 587 487T500 588T366 624ZM504 743H456L366 860L276 743H228L338 894H394L504 743Z" />
+<glyph unicode="&#xd5;" horiz-adv-x="732" d="M366 670Q460 670 528 629T633 511T670 330Q670 225 633 149T528 32T366 -10Q273 -10 205 31T99 149T62 330Q62 435 99 511T204 628T366 670ZM366 624Q289 624 233 589T146 487T115 330Q115 239 145 173T232 72T366
+36Q444 36 500 71T587 173T618 330Q618 421 587 487T500 588T366 624ZM536 861Q532 825 520 800T487 763T438 751Q411 751 392 761T358 785T329 808T296 819Q270 819 257 801T236 750H196Q202 805 227 832T297 860Q322 860 341 850T375 826T404 803T437 792Q464
+792 477 810T496 861H536Z" />
+<glyph unicode="&#xd6;" horiz-adv-x="732" d="M366 670Q460 670 528 629T633 511T670 330Q670 225 633 149T528 32T366 -10Q273 -10 205 31T99 149T62 330Q62 435 99 511T204 628T366 670ZM366 624Q289 624 233 589T146 487T115 330Q115 239 145 173T232 72T366
+36Q444 36 500 71T587 173T618 330Q618 421 587 487T500 588T366 624ZM271 831Q289 831 300 820T311 790Q311 772 300 761T271 750Q253 750 242 761T230 790Q230 809 241 820T271 831ZM460 831Q479 831 490 820T501 790Q501 772 490 761T460 750Q442 750 431 761T420
+790Q420 809 431 820T460 831Z" />
+<glyph unicode="&#xd7;" horiz-adv-x="604" d="M468 114L502 149L135 516L101 481L468 114ZM135 114L502 481L468 516L101 149L135 114Z" />
+<glyph unicode="&#xd8;" horiz-adv-x="732" d="M201 61L172 86L529 589L560 566L201 61ZM87 -34L172 86L201 61L134 -34H87ZM560 566L529 589L598 686H646L560 566ZM366 670Q460 670 528 629T633 511T670 330Q670 225 633 149T528 32T366 -10Q273 -10 205 31T99
+149T62 330Q62 435 99 511T204 628T366 670ZM366 624Q289 624 233 589T146 487T115 330Q115 239 145 173T232 72T366 36Q444 36 500 71T587 173T618 330Q618 421 587 487T500 588T366 624Z" />
+<glyph unicode="&#xd9;" horiz-adv-x="687" d="M598 660V241Q598 118 532 54T344 -10Q223 -10 156 54T89 241V660H139V251Q139 145 191 91T344 36Q444 36 496 90T548 251V660H598ZM323 884L393 730H352L270 884H323Z" />
+<glyph unicode="&#xda;" horiz-adv-x="687" d="M598 660V241Q598 118 532 54T344 -10Q223 -10 156 54T89 241V660H139V251Q139 145 191 91T344 36Q444 36 496 90T548 251V660H598ZM389 865H442L359 711H318L389 865Z" />
+<glyph unicode="&#xdb;" horiz-adv-x="687" d="M598 660V241Q598 118 532 54T344 -10Q223 -10 156 54T89 241V660H139V251Q139 145 191 91T344 36Q444 36 496 90T548 251V660H598ZM482 711H434L344 828L254 711H206L316 862H372L482 711Z" />
+<glyph unicode="&#xdc;" horiz-adv-x="687" d="M598 660V241Q598 118 532 54T344 -10Q223 -10 156 54T89 241V660H139V251Q139 145 191 91T344 36Q444 36 496 90T548 251V660H598ZM249 799Q267 799 278 788T289 758Q289 740 278 729T249 718Q231 718 220 729T208
+758Q208 777 219 788T249 799ZM438 799Q457 799 468 788T479 758Q479 740 468 729T438 718Q420 718 409 729T398 758Q398 777 409 788T438 799Z" />
+<glyph unicode="&#xdd;" horiz-adv-x="544" d="M531 660L297 257V0H247V257L13 660H72L201 434L272 309L343 434L472 660H531ZM317 868H370L287 714H246L317 868Z" />
+<glyph unicode="&#xde;" horiz-adv-x="599" d="M312 534Q431 534 491 484T551 338Q551 244 491 194T312 143H129V189H320Q499 189 499 338Q499 413 455 450T320 488H129V534H312ZM154 660V0H104V660H154Z" />
+<glyph unicode="&#xdf;" horiz-adv-x="588" d="M356 383Q418 381 457 356T515 289T535 195Q535 137 514 91T451 17T348 -10Q303 -10 272 0T222 25L239 67Q260 52 284 44T346 35Q412 35 449 80T486 196Q486 278 440 318T312 359H260V403H306Q376 403 416 445T456
+554Q456 620 415 654T307 689Q219 689 179 638T139 488V0H89V506Q89 576 111 627T183 707T312 735Q376 735 419 712T484 650T507 562Q507 516 489 477T437 412T356 384V383Z" />
+<glyph unicode="&#xe0;" horiz-adv-x="543" d="M395 329Q395 394 360 430T260 466Q203 466 162 442T101 360L60 386Q82 445 133 477T261 510Q316 510 357 491T422 433T445 338V88Q445 35 493 35Q514 35 529 42L526 2Q509 -7 482 -7Q459 -7 439 2T407 32T394 89V116L408
+117Q399 74 369 46T298 4T218 -10Q171 -10 134 5T76 48T55 119Q55 175 92 209T198 257L405 298V256L223 220Q164 208 135 185T106 123Q106 81 137 58T225 34Q254 34 284 42T339 67T380 111T395 176V329ZM207 741L287 583H246L153 741H207Z" />
+<glyph unicode="&#xe1;" horiz-adv-x="543" d="M395 329Q395 394 360 430T260 466Q203 466 162 442T101 360L60 386Q82 445 133 477T261 510Q316 510 357 491T422 433T445 338V88Q445 35 493 35Q514 35 529 42L526 2Q509 -7 482 -7Q459 -7 439 2T407 32T394 89V116L408
+117Q399 74 369 46T298 4T218 -10Q171 -10 134 5T76 48T55 119Q55 175 92 209T198 257L405 298V256L223 220Q164 208 135 185T106 123Q106 81 137 58T225 34Q254 34 284 42T339 67T380 111T395 176V329ZM311 741H366L272 583H231L311 741Z" />
+<glyph unicode="&#xe2;" horiz-adv-x="543" d="M395 329Q395 394 360 430T260 466Q203 466 162 442T101 360L60 386Q82 445 133 477T261 510Q316 510 357 491T422 433T445 338V88Q445 35 493 35Q514 35 529 42L526 2Q509 -7 482 -7Q459 -7 439 2T407 32T394 89V116L408
+117Q399 74 369 46T298 4T218 -10Q171 -10 134 5T76 48T55 119Q55 175 92 209T198 257L405 298V256L223 220Q164 208 135 185T106 123Q106 81 137 58T225 34Q254 34 284 42T339 67T380 111T395 176V329ZM399 579H353L260 701L167 579H121L232 735H288L399 579Z"
+/>
+<glyph unicode="&#xe3;" horiz-adv-x="543" d="M395 329Q395 394 360 430T260 466Q203 466 162 442T101 360L60 386Q82 445 133 477T261 510Q316 510 357 491T422 433T445 338V88Q445 35 493 35Q514 35 529 42L526 2Q509 -7 482 -7Q459 -7 439 2T407 32T394 89V116L408
+117Q399 74 369 46T298 4T218 -10Q171 -10 134 5T76 48T55 119Q55 175 92 209T198 257L405 298V256L223 220Q164 208 135 185T106 123Q106 81 137 58T225 34Q254 34 284 42T339 67T380 111T395 176V329ZM430 701Q426 665 414 640T381 603T332 591Q305 591 286 601T252
+625T223 648T190 659Q164 659 151 641T130 590H90Q96 645 121 672T191 700Q216 700 235 690T269 666T298 643T331 632Q358 632 371 650T390 701H430Z" />
+<glyph unicode="&#xe4;" horiz-adv-x="543" d="M395 329Q395 394 360 430T260 466Q203 466 162 442T101 360L60 386Q82 445 133 477T261 510Q316 510 357 491T422 433T445 338V88Q445 35 493 35Q514 35 529 42L526 2Q509 -7 482 -7Q459 -7 439 2T407 32T394 89V116L408
+117Q399 74 369 46T298 4T218 -10Q171 -10 134 5T76 48T55 119Q55 175 92 209T198 257L405 298V256L223 220Q164 208 135 185T106 123Q106 81 137 58T225 34Q254 34 284 42T339 67T380 111T395 176V329ZM165 671Q183 671 194 660T205 630Q205 612 194 601T165 590Q147
+590 136 601T124 630Q124 649 135 660T165 671ZM354 671Q373 671 384 660T395 630Q395 612 384 601T354 590Q336 590 325 601T314 630Q314 649 325 660T354 671Z" />
+<glyph unicode="&#xe5;" horiz-adv-x="543" d="M395 329Q395 394 360 430T260 466Q203 466 162 442T101 360L60 386Q82 445 133 477T261 510Q316 510 357 491T422 433T445 338V88Q445 35 493 35Q514 35 529 42L526 2Q509 -7 482 -7Q459 -7 439 2T407 32T394 89V116L408
+117Q399 74 369 46T298 4T218 -10Q171 -10 134 5T76 48T55 119Q55 175 92 209T198 257L405 298V256L223 220Q164 208 135 185T106 123Q106 81 137 58T225 34Q254 34 284 42T339 67T380 111T395 176V329ZM257 776Q304 776 333 748T362 676Q362 632 333 604T257 575Q211
+575 182 603T152 676Q152 720 181 748T257 776ZM257 743Q228 743 209 724T189 676Q189 647 208 628T257 608Q287 608 306 627T326 676Q326 705 307 724T257 743Z" />
+<glyph unicode="&#xe6;" horiz-adv-x="885" d="M220 -10Q172 -10 135 5T77 48T55 119Q55 175 92 209T196 257L395 295V329Q395 394 359 430T259 466Q205 466 164 442T101 360L60 386Q76 426 104 453T171 495T258 510Q331 510 379 475T436 365L422 368Q437 412
+466 444T536 493T623 510Q688 510 734 481T805 399T830 281Q830 271 830 263T828 248H445V238Q448 142 496 88T628 34Q681 34 722 59T786 128L826 105Q807 69 778 44T710 4T629 -10Q550 -10 493 31T415 147L430 152Q427 110 407 80T357 29T291 0T220 -10ZM225 34Q256
+34 286 42T341 68T380 114T395 180V252L223 220Q164 208 135 185T106 123Q106 81 137 58T225 34ZM448 292H781Q780 344 761 383T706 444T622 466Q552 466 505 421T448 292Z" />
+<glyph unicode="&#xe7;" horiz-adv-x="543" d="M291 510Q342 510 382 494T450 448T493 375L446 353Q430 407 391 436T290 466Q235 466 193 441T128 367T105 250Q105 183 128 134T192 60T289 34Q331 34 365 48T422 89T452 153L498 137Q485 91 456 58T384 8T290
+-10Q222 -10 169 21T85 110T55 250Q55 331 85 389T169 479T291 510ZM242 4L274 17Q330 -5 352 -35T375 -106Q375 -150 346 -179T270 -209Q239 -209 216 -200T175 -174L189 -137Q206 -152 224 -160T265 -169Q295 -169 314 -150T333 -97Q333 -68 314 -46T242 4Z"
+/>
+<glyph unicode="&#xe8;" horiz-adv-x="557" d="M293 -10Q224 -10 170 21T86 110T55 250Q55 331 85 389T168 479T287 510Q355 510 403 480T477 397T503 273Q503 264 503 256T501 240H86V285H479L454 278Q453 364 409 415T286 466Q232 466 191 441T127 367T104 250Q104
+183 127 134T193 60T292 34Q350 34 391 59T456 128L496 105Q478 69 448 44T379 4T293 -10ZM229 741L309 583H268L175 741H229Z" />
+<glyph unicode="&#xe9;" horiz-adv-x="557" d="M293 -10Q224 -10 170 21T86 110T55 250Q55 331 85 389T168 479T287 510Q355 510 403 480T477 397T503 273Q503 264 503 256T501 240H86V285H479L454 278Q453 364 409 415T286 466Q232 466 191 441T127 367T104 250Q104
+183 127 134T193 60T292 34Q350 34 391 59T456 128L496 105Q478 69 448 44T379 4T293 -10ZM333 741H388L294 583H253L333 741Z" />
+<glyph unicode="&#xea;" horiz-adv-x="557" d="M293 -10Q224 -10 170 21T86 110T55 250Q55 331 85 389T168 479T287 510Q355 510 403 480T477 397T503 273Q503 264 503 256T501 240H86V285H479L454 278Q453 364 409 415T286 466Q232 466 191 441T127 367T104 250Q104
+183 127 134T193 60T292 34Q350 34 391 59T456 128L496 105Q478 69 448 44T379 4T293 -10ZM421 579H375L282 701L189 579H143L254 735H310L421 579Z" />
+<glyph unicode="&#xeb;" horiz-adv-x="557" d="M293 -10Q224 -10 170 21T86 110T55 250Q55 331 85 389T168 479T287 510Q355 510 403 480T477 397T503 273Q503 264 503 256T501 240H86V285H479L454 278Q453 364 409 415T286 466Q232 466 191 441T127 367T104 250Q104
+183 127 134T193 60T292 34Q350 34 391 59T456 128L496 105Q478 69 448 44T379 4T293 -10ZM187 671Q205 671 216 660T227 630Q227 612 216 601T187 590Q169 590 158 601T146 630Q146 649 157 660T187 671ZM376 671Q395 671 406 660T417 630Q417 612 406 601T376
+590Q358 590 347 601T336 630Q336 649 347 660T376 671Z" />
+<glyph unicode="&#xec;" horiz-adv-x="229" d="M139 500V0H89V500H139ZM61 741L141 583H100L7 741H61Z" />
+<glyph unicode="&#xed;" horiz-adv-x="229" d="M139 500V0H89V500H139ZM165 741H220L126 583H85L165 741Z" />
+<glyph unicode="&#xee;" horiz-adv-x="229" d="M139 500V0H89V500H139ZM253 579H207L114 701L21 579H-25L86 735H142L253 579Z" />
+<glyph unicode="&#xef;" horiz-adv-x="229" d="M180 590Q162 590 151 601T139 630Q139 649 150 660T180 671Q199 671 210 660T221 630Q221 612 210 601T180 590ZM48 590Q30 590 19 601T8 630Q8 649 19 660T48 671Q67 671 78 660T89 630Q89 612 78 601T48 590ZM139
+500V0H89V500H139Z" />
+<glyph unicode="&#xf0;" horiz-adv-x="600" d="M293 -10Q220 -10 167 20T86 106T57 238Q57 314 87 369T169 455T288 485Q366 485 416 451T487 358L480 349Q474 421 453 480T399 585T321 668T221 730H294Q348 702 391 662T465 567T513 443T530 286Q530 193 503
+127T423 25T293 -10ZM295 34Q356 34 397 63T460 141T481 248Q481 308 457 351T391 418T294 441Q237 441 196 416T131 346T108 238Q108 143 158 89T295 34ZM217 552L207 591L399 632L421 601L217 552ZM421 601L399 632L531 665L542 628L421 601Z" />
+<glyph unicode="&#xf1;" horiz-adv-x="598" d="M89 0V500H134L138 375L130 382Q144 423 172 452T239 495T323 510Q379 510 422 489T489 427T514 324V0H464V308Q464 390 424 428T318 466Q271 466 231 445T165 382T139 282V0H89ZM476 701Q472 665 460 640T427 603T378
+591Q351 591 332 601T298 625T269 648T236 659Q210 659 197 641T176 590H136Q142 645 167 672T237 700Q262 700 281 690T315 666T344 643T377 632Q404 632 417 650T436 701H476Z" />
+<glyph unicode="&#xf2;" horiz-adv-x="585" d="M293 510Q363 510 416 479T500 390T531 250Q531 169 501 111T417 21T293 -10Q223 -10 170 21T86 110T55 250Q55 331 85 389T169 479T293 510ZM293 467Q236 467 194 441T129 367T105 250Q105 183 128 134T194 59T293
+33Q350 33 392 59T457 134T481 250Q481 318 458 366T392 441T293 467ZM240 739L320 581H279L186 739H240Z" />
+<glyph unicode="&#xf3;" horiz-adv-x="585" d="M293 510Q363 510 416 479T500 390T531 250Q531 169 501 111T417 21T293 -10Q223 -10 170 21T86 110T55 250Q55 331 85 389T169 479T293 510ZM293 467Q236 467 194 441T129 367T105 250Q105 183 128 134T194 59T293
+33Q350 33 392 59T457 134T481 250Q481 318 458 366T392 441T293 467ZM344 739H399L305 581H264L344 739Z" />
+<glyph unicode="&#xf4;" horiz-adv-x="585" d="M293 510Q363 510 416 479T500 390T531 250Q531 169 501 111T417 21T293 -10Q223 -10 170 21T86 110T55 250Q55 331 85 389T169 479T293 510ZM293 467Q236 467 194 441T129 367T105 250Q105 183 128 134T194 59T293
+33Q350 33 392 59T457 134T481 250Q481 318 458 366T392 441T293 467ZM432 577H386L293 699L200 577H154L265 733H321L432 577Z" />
+<glyph unicode="&#xf5;" horiz-adv-x="585" d="M293 510Q363 510 416 479T500 390T531 250Q531 169 501 111T417 21T293 -10Q223 -10 170 21T86 110T55 250Q55 331 85 389T169 479T293 510ZM293 467Q236 467 194 441T129 367T105 250Q105 183 128 134T194 59T293
+33Q350 33 392 59T457 134T481 250Q481 318 458 366T392 441T293 467ZM463 699Q459 663 447 638T414 601T365 589Q338 589 319 599T285 623T256 646T223 657Q197 657 184 639T163 588H123Q129 643 154 670T224 698Q249 698 268 688T302 664T331 641T364 630Q391
+630 404 648T423 699H463Z" />
+<glyph unicode="&#xf6;" horiz-adv-x="585" d="M293 510Q363 510 416 479T500 390T531 250Q531 169 501 111T417 21T293 -10Q223 -10 170 21T86 110T55 250Q55 331 85 389T169 479T293 510ZM293 467Q236 467 194 441T129 367T105 250Q105 183 128 134T194 59T293
+33Q350 33 392 59T457 134T481 250Q481 318 458 366T392 441T293 467ZM198 669Q216 669 227 658T238 628Q238 610 227 599T198 588Q180 588 169 599T157 628Q157 647 168 658T198 669ZM387 669Q406 669 417 658T428 628Q428 610 417 599T387 588Q369 588 358 599T347
+628Q347 647 358 658T387 669Z" />
+<glyph unicode="&#xf7;" horiz-adv-x="604" d="M537 339V293H67V339H537ZM302 170Q322 170 334 158T347 126Q347 106 335 94T302 81Q282 81 270 93T257 126Q257 146 269 158T302 170ZM302 552Q322 552 334 540T347 507Q347 487 335 475T302 462Q282 462 270 474T257
+507Q257 527 269 539T302 552Z" />
+<glyph unicode="&#xf8;" horiz-adv-x="585" d="M293 510Q363 510 416 479T500 390T531 250Q531 169 501 111T417 21T293 -10Q223 -10 170 21T86 110T55 250Q55 331 85 389T169 479T293 510ZM293 467Q236 467 194 441T129 367T105 250Q105 183 128 134T194 59T293
+33Q350 33 392 59T457 134T481 250Q481 318 458 366T392 441T293 467ZM310 -30L744 530H788L354 -30H310Z" />
+<glyph unicode="&#xf9;" horiz-adv-x="592" d="M265 -10Q213 -10 172 9T108 68T84 170V500H134V182Q134 104 171 69T277 34Q317 34 349 48T405 87T440 144T453 213V500H503V0H458L456 103Q434 50 384 20T265 -10ZM241 726L321 568H280L187 726H241Z" />
+<glyph unicode="&#xfa;" horiz-adv-x="592" d="M265 -10Q213 -10 172 9T108 68T84 170V500H134V182Q134 104 171 69T277 34Q317 34 349 48T405 87T440 144T453 213V500H503V0H458L456 103Q434 50 384 20T265 -10ZM345 726H400L306 568H265L345 726Z" />
+<glyph unicode="&#xfb;" horiz-adv-x="592" d="M265 -10Q213 -10 172 9T108 68T84 170V500H134V182Q134 104 171 69T277 34Q317 34 349 48T405 87T440 144T453 213V500H503V0H458L456 103Q434 50 384 20T265 -10ZM433 564H387L294 686L201 564H155L266 720H322L433 564Z" />
+<glyph unicode="&#xfc;" horiz-adv-x="592" d="M265 -10Q213 -10 172 9T108 68T84 170V500H134V182Q134 104 171 69T277 34Q317 34 349 48T405 87T440 144T453 213V500H503V0H458L456 103Q434 50 384 20T265 -10ZM199 656Q217 656 228 645T239 615Q239 597 228
+586T199 575Q181 575 170 586T158 615Q158 634 169 645T199 656ZM388 656Q407 656 418 645T429 615Q429 597 418 586T388 575Q370 575 359 586T348 615Q348 634 359 645T388 656Z" />
+<glyph unicode="&#xfd;" horiz-adv-x="500" d="M483 500L241 -92Q223 -138 202 -165T155 -203T95 -215Q65 -215 41 -206T-1 -181L15 -138Q30 -156 51 -163T94 -171Q126 -171 151 -153T198 -80L231 0L178 124L20 500H77L230 121L255 54L282 126L429 500H483ZM303
+726H358L264 568H223L303 726Z" />
+<glyph unicode="&#xfe;" horiz-adv-x="607" d="M89 -210V730H139V361L133 374Q152 437 204 473T324 510Q390 510 441 479T522 390T552 250Q552 169 522 111T441 21T324 -10Q255 -10 204 26T133 125L139 134V-210H89ZM318 34Q403 34 452 92T502 250Q502 350 453
+408T320 466Q267 466 227 440T163 365T139 250Q139 185 162 136T225 61T318 34Z" />
+<glyph unicode="&#xff;" horiz-adv-x="500" d="M483 500L241 -92Q223 -138 202 -165T155 -203T95 -215Q65 -215 41 -206T-1 -181L15 -138Q30 -156 51 -163T94 -171Q126 -171 151 -153T198 -80L231 0L178 124L20 500H77L230 121L255 54L282 126L429 500H483ZM157
+656Q175 656 186 645T197 615Q197 597 186 586T157 575Q139 575 128 586T116 615Q116 634 127 645T157 656ZM346 656Q365 656 376 645T387 615Q387 597 376 586T346 575Q328 575 317 586T306 615Q306 634 317 645T346 656Z" />
+<glyph unicode="&#x2013;" horiz-adv-x="638" d="M563 289V242H75V289H563Z" />
+<glyph unicode="&#x2014;" horiz-adv-x="979" d="M903 289V242H75V289H903Z" />
+<glyph unicode="&#x2018;" horiz-adv-x="217" d="M108 486Q91 486 79 495T60 521T53 559Q53 585 62 611T90 659T139 696L167 671Q142 662 125 645T98 607T89 567L92 566Q95 571 100 573T115 576Q124 576 133 571T148 556T154 532Q154 519 148 509T131 492T108 486Z" />
+<glyph unicode="&#x2019;" horiz-adv-x="216" d="M113 694Q130 694 142 685T161 659T168 621Q168 595 159 569T131 521T82 484L54 509Q79 518 96 535T123 573T132 613L129 614Q126 609 121 607T106 604Q97 604 88 609T73 624T67 648Q67 661 73 671T90 688T113 694Z" />
+<glyph unicode="&#x201a;" horiz-adv-x="216" d="M113 82Q130 82 142 73T161 47T168 9Q168 -17 159 -43T131 -91T82 -128L54 -103Q79 -94 96 -77T123 -39T132 1L129 2Q126 -3 121 -5T106 -8Q97 -8 88 -3T73 12T67 36Q67 49 73 59T90 76T113 82Z" />
+<glyph unicode="&#x201c;" horiz-adv-x="362" d="M108 486Q91 486 79 495T60 521T53 559Q53 585 62 611T90 659T139 696L167 671Q142 662 125 645T98 607T89 567L92 566Q95 571 100 573T115 576Q124 576 133 571T148 556T154 532Q154 519 148 509T131 492T108
+486ZM254 486Q237 486 225 495T206 521T199 559Q199 585 208 611T236 659T285 696L313 671Q288 662 271 645T244 607T235 567L238 566Q241 571 246 573T261 576Q270 576 279 571T294 556T300 532Q300 519 294 509T277 492T254 486Z" />
+<glyph unicode="&#x201d;" horiz-adv-x="362" d="M113 694Q130 694 142 685T161 659T168 621Q168 595 159 569T131 521T82 484L54 509Q79 518 96 535T123 573T132 613L129 614Q126 609 121 607T106 604Q97 604 88 609T73 624T67 648Q67 661 73 671T90 688T113
+694ZM259 694Q276 694 288 685T307 659T314 621Q314 595 305 569T277 521T228 484L200 509Q225 518 242 535T269 573T278 613L275 614Q272 609 267 607T252 604Q243 604 234 609T219 624T213 648Q213 661 219 671T236 688T259 694Z" />
+<glyph unicode="&#x201e;" horiz-adv-x="362" d="M113 82Q130 82 142 73T161 47T168 9Q168 -17 159 -43T131 -91T82 -128L54 -103Q79 -94 96 -77T123 -39T132 1L129 2Q126 -3 121 -5T106 -8Q97 -8 88 -3T73 12T67 36Q67 49 73 59T90 76T113 82ZM259 82Q276 82
+288 73T307 47T314 9Q314 -17 305 -43T277 -91T228 -128L200 -103Q225 -94 242 -77T269 -39T278 1L275 2Q272 -3 267 -5T252 -8Q243 -8 234 -3T219 12T213 36Q213 49 219 59T236 76T259 82Z" />
+<glyph unicode="&#x2022;" horiz-adv-x="430" d="M215 246Q174 246 147 272T120 338Q120 378 147 404T215 430Q256 430 283 404T310 338Q310 298 284 272T215 246Z" />
+<glyph unicode="&#x2039;" horiz-adv-x="290" d="M239 461L103 265L239 69H183L49 265L183 461H239Z" />
+<glyph unicode="&#x203a;" horiz-adv-x="290" d="M51 69L187 265L51 461H107L241 265L107 69H51Z" />
+</font>
+</defs>
+</svg>
diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.ttf b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..5fdcd056b7d71a0b968b0dd9f7ce0ed2805795e0
GIT binary patch
literal 57264
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
RAELRWd{S2B3YRnD`(NurjT!&|

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.woff b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.woff
new file mode 100644
index 0000000000000000000000000000000000000000..cf6e7ce85261a3d8d35c19404bb083f2384befa8
GIT binary patch
literal 30008
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
Jnl*L+006XGE6@M{

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.woff2 b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-300.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..c44811168b1cc6d5953c4b850c7a1e114953da09
GIT binary patch
literal 24760
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
I?x<kRMYXNq1poj5

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.eot b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.eot
new file mode 100644
index 0000000000000000000000000000000000000000..4a81648342a5944f35657cf1130096e6b11931a4
GIT binary patch
literal 29597
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
Rp1oN41BnMQa!RB}FrXi<>I47)

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.svg b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.svg
new file mode 100644
index 0000000000..27f05ee28d
--- /dev/null
+++ b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.svg
@@ -0,0 +1,332 @@
+<?xml version="1.0" standalone="no"?>
+<!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">
+<defs >
+<font id="WorkSans" horiz-adv-x="597" ><font-face
+    font-family="Work Sans SemiBold"
+    units-per-em="1000"
+    panose-1="0 0 0 0 0 0 0 0 0 0"
+    ascent="930"
+    descent="-243"
+    alphabetic="0" />
+<glyph unicode=" " horiz-adv-x="306" />
+<glyph unicode="!" horiz-adv-x="291" d="M217 660V420L200 213H90L73 420V660H217ZM145 145Q184 145 207 124T230 68Q230 32 207 12T145 -9Q106 -9 83 11T60 68Q60 103 83 124T145 145Z" />
+<glyph unicode="&quot;" horiz-adv-x="431" d="M379 682L351 416H257V682H379ZM192 682L164 416H70V682H192Z" />
+<glyph unicode="#" horiz-adv-x="670" d="M555 660L447 0H349L457 660H555ZM603 256V169H24V256H603ZM314 660L206 0H108L215 660H314ZM646 492V405H67V492H646Z" />
+<glyph unicode="$" horiz-adv-x="634" d="M323 1Q257 1 201 17T102 61T29 126L105 216Q127 182 162 158T241 120T331 106Q392 106 427 126T462 185Q462 210 443 228T375 257L235 289Q179 302 139 325T79 381T58 459Q58 517 89 562T179 634T321 661Q408 661 474
+631T587 542L514 459Q474 510 426 533T313 557Q268 557 240 547T199 518T185 477Q185 459 193 445T223 420T288 398L408 371Q502 350 543 310T585 202Q585 138 552 93T460 25T323 1ZM276 -92V752H369V-92H276Z" />
+<glyph unicode="%" horiz-adv-x="908" d="M177 0L622 660H732L287 0H177ZM210 670Q264 670 303 647T364 582T386 484Q386 428 365 387T304 322T210 298Q157 298 117 321T56 386T34 484Q34 540 55 582T117 647T210 670ZM210 575Q188 575 172 565T148 534T140 484Q140
+456 148 436T172 405T210 394Q233 394 248 404T272 435T280 484Q280 513 272 533T249 564T210 575ZM698 362Q751 362 790 339T852 274T874 176Q874 120 852 78T791 13T698 -10Q645 -10 605 13T544 78T522 176Q522 232 543 273T605 338T698 362ZM698 266Q675 266
+660 256T636 225T628 176Q628 148 636 127T659 96T698 85Q721 85 736 95T760 127T768 176Q768 205 760 225T737 255T698 266Z" />
+<glyph unicode="&amp;" horiz-adv-x="638" d="M258 -10Q190 -10 140 11T62 73T34 171Q34 200 42 229T70 284T126 333T217 368L252 382Q293 406 317 425T351 465T362 512Q362 541 344 557T296 574Q262 574 245 555T227 506Q227 489 232 473T254 434T301 372T386
+273Q439 213 474 175T534 118T583 92T637 88L620 -10Q583 -10 554 -4T492 23T418 85T314 195Q250 265 210 312T147 392T116 452T107 509Q107 549 127 586T189 646T297 670Q356 670 394 650T452 597T472 523Q472 482 455 446T399 381T291 328L259 312Q218 291 195
+272T163 232T154 181Q154 152 170 130T213 96T275 84Q325 84 361 101T429 147L444 164Q465 199 477 243T487 344L584 340Q586 276 567 218T507 116L483 93Q448 46 392 18T258 -10Z" />
+<glyph unicode="&apos;" horiz-adv-x="244" d="M192 682L164 416H70V682H192Z" />
+<glyph unicode="(" horiz-adv-x="376" d="M291 741L359 675Q299 621 262 561T209 430T192 276Q192 192 208 122T262 -9T359 -124L291 -191Q180 -108 123 9T65 276Q65 425 122 542T291 741Z" />
+<glyph unicode=")" horiz-adv-x="376" d="M85 -190L17 -124Q77 -70 114 -10T167 121T184 275Q184 359 168 429T114 560T17 675L85 742Q196 659 253 542T311 275Q311 126 254 9T85 -190Z" />
+<glyph unicode="*" horiz-adv-x="582" d="M314 503L397 423L475 318L394 259L318 366L268 469L291 486L314 503ZM268 503L291 486L314 469L264 366L188 259L107 318L186 423L268 503ZM74 609L199 567L300 514L291 486L282 458L169 475L44 514L74 609ZM341 730L339
+599L320 486H291H262L243 599L240 730H341ZM508 609L538 514L413 475L300 458L291 486L282 514L383 567L508 609Z" />
+<glyph unicode="+" horiz-adv-x="604" d="M359 580V63H246V580H359ZM550 374V269H54V374H550Z" />
+<glyph unicode="," horiz-adv-x="281" d="M139 153Q171 153 192 138T224 97T235 40Q235 -1 219 -39T173 -107T107 -154L47 -107Q75 -96 97 -80T136 -44T159 -3L154 0Q149 -3 142 -5T122 -8Q106 -8 90 0T63 25T52 67Q52 94 64 113T96 142T139 153Z" />
+<glyph unicode="-" horiz-adv-x="521" d="M437 324V206H84V324H437Z" />
+<glyph unicode="." horiz-adv-x="281" d="M141 153Q181 153 204 131T228 72Q228 34 205 13T141 -9Q101 -9 78 12T54 72Q54 109 77 131T141 153Z" />
+<glyph unicode="/" horiz-adv-x="456" d="M437 719L147 -70H20L309 719H437Z" />
+<glyph unicode="0" horiz-adv-x="636" d="M318 -10Q191 -10 123 76T54 330Q54 498 122 584T318 670Q445 670 513 584T582 330Q582 162 514 76T318 -10ZM318 101Q361 101 388 125T430 200T444 330Q444 409 430 459T389 534T318 559Q275 559 247 535T206 460T192
+330Q192 251 205 201T247 126T318 101Z" />
+<glyph unicode="1" horiz-adv-x="416" d="M197 0V418Q197 441 197 465T199 516Q165 485 123 462T37 430L19 546Q42 548 70 559T128 587T182 622T220 660H332V0H197Z" />
+<glyph unicode="2" horiz-adv-x="591" d="M65 0V94Q155 154 217 203T318 295T374 376T392 452Q392 498 364 527T285 557Q229 557 198 519T163 411L44 456Q49 524 80 571T166 644T293 670Q353 670 397 653T472 607T516 539T531 460Q531 396 500 339T403 226T238
+108V107Q253 108 274 109T319 110T359 111H541V0H65Z" />
+<glyph unicode="3" horiz-adv-x="589" d="M297 -10Q198 -10 129 31T33 151L163 208Q170 172 186 149T229 113T295 101Q329 101 352 113T389 147T402 198Q402 227 390 246T356 273T298 282Q285 282 274 282T248 279V380Q256 379 264 379T282 378Q338 378 362 400T387
+473Q387 514 363 536T293 559Q245 559 217 536T178 464L55 510Q67 560 101 596T187 651T300 671Q374 671 423 648T498 585T524 493Q524 452 512 424T480 376T439 346T400 334V331Q423 330 447 322T491 296T525 253T538 190Q538 130 507 85T421 15T297 -10Z" />
+<glyph unicode="4" horiz-adv-x="633" d="M366 0V155H44V245Q49 255 58 269T80 303L326 660H491V255H598V155H491V0H366ZM162 255H367V473Q367 494 368 518T370 565H368Q357 543 342 518T313 472L175 274Q172 269 169 265T162 255Z" />
+<glyph unicode="5" horiz-adv-x="582" d="M286 -10Q199 -10 140 26T42 136L166 198Q179 154 207 127T289 100Q326 100 352 113T392 151T407 212Q407 248 394 272T355 309T292 322Q266 322 244 317T203 302T171 274L63 294L104 660H503V549H208L188 388L185 375H187Q208
+399 244 412T328 425Q393 425 439 399T510 327T535 220Q535 163 516 120T463 48T383 5T286 -10Z" />
+<glyph unicode="6" horiz-adv-x="613" d="M335 670Q388 670 431 656T506 610T557 526L441 472Q429 511 402 533T326 556Q292 556 266 540T220 494T191 423T181 331Q181 328 181 325T181 314L184 310Q195 345 222 368T284 402T353 413Q416 413 464 389T540 318T568
+208Q568 142 539 93T456 17T328 -10Q244 -10 183 30T88 145T54 326Q54 441 91 517T192 632T335 670ZM326 312Q293 312 268 299T228 262T213 207Q213 176 228 152T269 114T326 100Q379 100 408 128T438 207Q438 239 425 263T387 299T326 312Z" />
+<glyph unicode="7" horiz-adv-x="591" d="M35 660H558V555Q475 472 426 384T356 201T334 0H197Q197 110 224 211T309 405T456 583L484 547H35V660Z" />
+<glyph unicode="8" horiz-adv-x="623" d="M311 668Q382 668 434 647T515 586T544 490Q544 438 519 400T445 342V341Q503 320 536 280T569 179Q569 121 538 79T449 14T311 -10Q232 -10 175 13T86 79T54 179Q54 239 87 279T179 341V342Q131 361 105 399T79 490Q79
+546 107 585T189 646T311 668ZM312 562Q265 562 238 539T210 475Q210 434 237 411T312 388Q358 388 385 411T413 475Q413 516 386 539T312 562ZM312 97Q350 97 377 108T418 141T433 193Q433 223 419 245T377 278T312 290Q275 290 247 279T204 245T189 193Q189 163
+204 141T246 108T312 97Z" />
+<glyph unicode="9" horiz-adv-x="617" d="M294 670Q382 670 442 630T532 514T563 332Q563 215 530 140T437 27T295 -10Q210 -10 149 26T56 136L183 190Q194 149 221 125T298 100Q337 100 364 115T407 160T431 231T439 325Q439 329 439 332T439 339H435Q424 304
+398 282T337 249T267 238Q204 238 156 263T79 335T51 444Q51 514 81 564T165 642T294 670ZM295 558Q242 558 213 529T183 446Q183 399 213 373T295 346Q328 346 353 359T393 396T407 451Q407 484 393 508T354 545T295 558Z" />
+<glyph unicode=":" horiz-adv-x="300" d="M150 510Q190 510 213 488T237 429Q237 391 214 370T150 348Q110 348 87 369T63 429Q63 466 86 488T150 510ZM150 153Q190 153 213 131T237 72Q237 34 214 13T150 -9Q110 -9 87 12T63 72Q63 109 86 131T150 153Z" />
+<glyph unicode=";" horiz-adv-x="300" d="M148 153Q180 153 201 138T233 97T244 40Q244 -1 228 -39T182 -107T116 -154L56 -107Q84 -96 106 -80T145 -44T168 -3L163 0Q158 -3 151 -5T131 -8Q115 -8 99 0T72 25T61 67Q61 94 73 113T105 142T148 153ZM150 510Q190
+510 213 488T237 429Q237 391 214 370T150 348Q110 348 87 369T63 429Q63 466 86 488T150 510Z" />
+<glyph unicode="&lt;" horiz-adv-x="604" d="M551 14L66 234V361L551 582V450L173 299L551 147V14Z" />
+<glyph unicode="=" horiz-adv-x="604" d="M540 468V366H64V468H540ZM540 257V156H64V257H540Z" />
+<glyph unicode="&gt;" horiz-adv-x="604" d="M53 581L538 361V234L53 13V145L431 296L53 448V581Z" />
+<glyph unicode="?" horiz-adv-x="583" d="M295 670Q365 670 420 650T506 589T538 491Q538 431 513 392T444 332T349 305L342 212H217L218 363Q281 370 319 384T374 420T391 473Q391 511 365 533T286 555Q234 555 203 526T165 442L35 492Q47 544 79 584T164 647T295
+670ZM281 145Q320 145 343 124T366 68Q366 32 343 12T281 -9Q242 -9 219 11T196 68Q196 103 219 124T281 145Z" />
+<glyph unicode="@" horiz-adv-x="941" d="M473 -189Q380 -189 303 -161T169 -79T81 52T50 227Q50 323 83 403T176 541T317 631T494 663Q585 663 658 635T783 554T862 432T890 278Q890 205 872 151T822 62T752 10T676 -7Q612 -7 581 25T552 108Q530 60 487 33T396
+5Q349 5 313 28T256 95T235 197Q235 250 251 298T296 383T365 443T456 465Q489 465 517 453T565 418T592 360L615 456H734L664 155Q662 144 660 134T658 115Q658 88 671 78T705 67Q736 67 762 89T804 158T821 275Q821 346 798 405T731 507T629 572T496 595Q415
+595 348 569T232 495T157 379T130 227Q130 142 156 78T231 -31T342 -97T477 -120Q553 -120 599 -101T681 -59L716 -117Q689 -136 656 -152T578 -179T473 -189ZM446 96Q481 96 508 121T550 187T565 273Q565 304 555 326T526 360T479 372Q450 372 427 358T388 318T363
+263T354 200Q354 167 364 144T396 109T446 96Z" />
+<glyph unicode="A" horiz-adv-x="671" d="M12 0L253 660H418L659 0H516L365 449L335 549H333L305 451L153 0H12ZM154 161V263H516V161H154Z" />
+<glyph unicode="B" horiz-adv-x="672" d="M86 0V660H375Q495 660 552 613T609 480Q609 427 577 386T483 334V333Q552 323 589 281T626 181Q626 96 565 48T385 0H86ZM220 104H373Q429 104 456 127T483 191Q483 233 456 255T373 277H220V104ZM220 383H357Q466 383
+466 468Q466 553 357 553H220V383Z" />
+<glyph unicode="C" horiz-adv-x="683" d="M651 182Q632 118 591 75T494 11T371 -10Q273 -10 202 31T92 148T53 330Q53 436 91 512T201 629T369 670Q437 670 492 652T585 595T642 499L517 446Q500 506 465 531T375 557Q321 557 281 531T218 455T196 330Q196 257
+216 206T277 129T375 103Q429 103 468 132T524 220L651 182Z" />
+<glyph unicode="D" horiz-adv-x="719" d="M341 660Q496 660 581 575T666 330Q666 172 581 86T341 0H86V660H341ZM334 110Q428 110 475 166T523 330Q523 437 476 493T334 550H224V110H334Z" />
+<glyph unicode="E" horiz-adv-x="633" d="M86 0V660H581V549H224V385H505V279H224V111H595V0H86Z" />
+<glyph unicode="F" horiz-adv-x="612" d="M580 549H224V382H505V270H224V0H86V660H580V549Z" />
+<glyph unicode="G" horiz-adv-x="723" d="M357 -10Q266 -10 198 30T91 146T53 329Q53 435 93 511T206 629T377 670Q484 670 550 631T655 508L527 453Q511 506 473 531T378 557Q322 557 281 531T218 454T196 330Q196 255 217 204T279 127T382 101Q415 101 443 109T493
+133T526 174T538 232V247H365V348H657V0H560L550 144L574 127Q552 61 497 26T357 -10Z" />
+<glyph unicode="H" horiz-adv-x="739" d="M653 660V0H515V660H653ZM224 660V0H86V660H224ZM587 389V278H155V389H587Z" />
+<glyph unicode="I" horiz-adv-x="310" d="M224 660V0H86V660H224Z" />
+<glyph unicode="J" horiz-adv-x="599" d="M523 660V243Q523 124 456 57T266 -10Q178 -10 123 22T47 112T39 245L173 269Q161 181 184 142T269 103Q334 103 359 143T385 262V660H523Z" />
+<glyph unicode="K" horiz-adv-x="679" d="M655 660L353 317L342 328L177 141L156 269L495 660H655ZM224 660V0H86V660H224ZM391 432L663 0H505L285 355L391 432Z" />
+<glyph unicode="L" horiz-adv-x="601" d="M224 111H572V0H86V660H224V111Z" />
+<glyph unicode="M" horiz-adv-x="890" d="M804 660V0H680V344L686 537H684L501 0H388L206 537H204L211 344V0H86V660H286L405 300L447 151H449L492 299L610 660H804Z" />
+<glyph unicode="N" horiz-adv-x="739" d="M653 660V0H495L264 388L207 496H206L210 382V0H86V660H243L474 273L531 164H533L529 278V660H653Z" />
+<glyph unicode="O" horiz-adv-x="741" d="M371 670Q469 670 540 629T649 512T688 330Q688 224 650 148T540 31T371 -10Q273 -10 202 31T92 148T53 330Q53 436 91 512T201 629T371 670ZM371 557Q316 557 277 531T217 454T196 330Q196 257 216 206T276 129T371 103Q426
+103 465 129T524 206T545 330Q545 403 525 454T465 531T371 557Z" />
+<glyph unicode="P" horiz-adv-x="646" d="M363 660Q439 660 493 635T576 562T606 447Q606 380 577 333T493 260T363 234H224V0H86V660H363ZM342 343Q404 343 435 369T466 447Q466 499 435 525T342 551H224V343H342Z" />
+<glyph unicode="Q" horiz-adv-x="741" d="M535 -200Q475 -200 427 -180T350 -115T322 -3Q322 13 325 31T337 66L427 80Q420 62 417 48T413 21Q413 -25 430 -49T475 -82T537 -91Q578 -91 607 -82T657 -55L682 -158Q657 -178 616 -189T535 -200ZM371 670Q469 670
+540 629T649 512T688 330Q688 224 650 148T540 31T371 -10Q273 -10 202 31T92 148T53 330Q53 436 91 512T201 629T371 670ZM371 557Q316 557 277 531T217 454T196 330Q196 257 216 206T276 129T371 103Q426 103 465 129T524 206T545 330Q545 403 525 454T465 531T371
+557Z" />
+<glyph unicode="R" horiz-adv-x="680" d="M377 660Q489 660 553 606T617 461Q617 364 553 313T378 261L364 253H222V0H86V660H377ZM361 358Q419 358 447 381T476 454Q476 503 448 526T361 550H222V358H361ZM442 329L656 0H501L324 289L442 329Z" />
+<glyph unicode="S" horiz-adv-x="644" d="M327 670Q417 670 485 639T601 547L524 458Q483 510 435 534T322 559Q280 559 253 548T213 519T200 479Q200 452 221 434T293 403L416 375Q514 353 556 310T599 197Q599 132 565 86T470 15T330 -10Q261 -10 204 6T101
+52T26 119L104 212Q127 180 161 155T238 116T330 101Q371 101 399 110T442 137T457 180Q457 206 440 224T375 253L241 283Q183 297 142 319T79 377T57 462Q57 521 89 568T181 642T327 670Z" />
+<glyph unicode="T" horiz-adv-x="635" d="M608 660V549H387V0H249V549H27V660H608Z" />
+<glyph unicode="U" horiz-adv-x="710" d="M637 660V260Q637 125 565 58T355 -10Q217 -10 145 57T73 260V660H211V266Q211 183 246 143T355 103Q428 103 463 143T498 266V660H637Z" />
+<glyph unicode="V" horiz-adv-x="670" d="M656 660L416 0H255L14 660H160L299 240L337 110L374 239L514 660H656Z" />
+<glyph unicode="W" horiz-adv-x="984" d="M211 0L19 660H166L296 115L428 660H560L694 115L823 660H964L772 0H617L525 360L494 516H492L461 360L370 0H211Z" />
+<glyph unicode="X" horiz-adv-x="640" d="M624 0H460L316 234L174 0H16L243 333L32 660H194L327 438L462 660H612L400 338L624 0Z" />
+<glyph unicode="Y" horiz-adv-x="626" d="M616 660L382 247V0H244V247L10 660H157L263 463L313 359L364 463L470 660H616Z" />
+<glyph unicode="Z" horiz-adv-x="633" d="M156 62L131 110H593V0H44V104L470 598L494 550H52V660H581V556L156 62Z" />
+<glyph unicode="[" horiz-adv-x="375" d="M347 618H206V-67H347V-168H86V719H347V618Z" />
+<glyph unicode="\" horiz-adv-x="456" d="M20 719H147L437 -70H309L20 719Z" />
+<glyph unicode="]" horiz-adv-x="375" d="M28 -67H169V618H28V719H289V-168H28V-67Z" />
+<glyph unicode="^" horiz-adv-x="593" d="M25 355L237 726H356L568 355H443L297 630L150 355H25Z" />
+<glyph unicode="_" horiz-adv-x="539" d="M539 -77V-190H0V-77H539Z" />
+<glyph unicode="`" horiz-adv-x="500" d="M282 742L352 572H250L150 742H282Z" />
+<glyph unicode="a" horiz-adv-x="574" d="M357 319Q357 362 333 386T268 410Q231 410 203 391T162 328L45 364Q62 430 119 470T274 510Q340 510 389 490T465 428T493 325V122Q493 84 529 84Q546 84 561 89L553 4Q527 -9 488 -9Q453 -9 425 3T381 39T365 101V105L389
+109Q383 71 356 45T291 4T211 -10Q160 -10 123 5T66 51T46 125Q46 181 82 216T185 265L373 303L372 218L252 194Q218 187 201 176T183 138Q183 113 201 100T246 87Q267 87 287 92T323 108T348 138T357 184V319Z" />
+<glyph unicode="b" horiz-adv-x="627" d="M366 -10Q320 -10 283 9T221 63T187 141L201 159L193 0H72V719H209V359L196 380Q212 436 257 473T370 510Q430 510 477 479T552 390T580 249Q580 168 553 110T477 21T366 -10ZM325 95Q380 95 411 134T443 250Q443 326
+412 365T326 405Q290 405 264 386T224 332T209 249Q209 201 223 166T264 113T325 95Z" />
+<glyph unicode="c" horiz-adv-x="564" d="M299 510Q366 510 412 491T487 438T528 363L400 317Q390 362 366 385T301 408Q263 408 236 391T195 338T181 249Q181 196 195 161T237 109T302 92Q332 92 353 102T387 133T406 181L530 141Q519 96 489 62T412 9T303 -10Q226
+-10 167 21T76 110T44 250Q44 332 76 390T166 479T299 510Z" />
+<glyph unicode="d" horiz-adv-x="627" d="M261 -10Q199 -10 151 21T75 110T47 249Q47 332 76 390T154 479T266 510Q332 510 375 472T431 374L418 358V719H555V0H432L423 152L439 144Q433 97 408 63T345 9T261 -10ZM301 95Q337 95 363 113T403 168T418 254Q418
+302 404 335T364 387T303 405Q247 405 216 366T184 250Q184 174 215 135T301 95Z" />
+<glyph unicode="e" horiz-adv-x="579" d="M304 -10Q225 -10 167 21T76 110T44 250Q44 332 76 390T165 479T297 510Q373 510 426 480T507 397T535 277Q535 257 534 239T531 207H132V302H471L405 278Q405 341 377 375T296 409Q258 409 231 391T189 338T175 248Q175
+195 190 161T234 109T303 92Q347 92 374 109T416 156L525 114Q509 75 477 47T400 5T304 -10Z" />
+<glyph unicode="f" horiz-adv-x="407" d="M295 729Q330 729 358 722T401 703L382 612Q371 619 357 623T324 627Q285 627 262 610T239 550V481L245 454V0H108V560Q108 602 122 634T161 687T220 718T295 729ZM397 500V398H21V500H397Z" />
+<glyph unicode="g" horiz-adv-x="549" d="M533 619L549 521Q545 521 541 521T531 522Q486 522 463 502T439 445L383 468Q383 508 399 542T446 598T522 619Q524 619 527 619T533 619ZM369 94Q450 94 494 59T538 -39Q538 -96 505 -135T413 -195T275 -215Q146 -215
+87 -179T27 -85Q27 -44 58 -16T163 15L158 -1Q106 8 79 33T51 104Q51 150 86 179T183 214L243 186H229Q186 183 169 169T151 136Q151 115 167 105T215 94H369ZM276 -121Q328 -121 361 -112T411 -89T428 -58Q428 -39 413 -28T359 -16H190Q166 -16 151 -28T135 -61Q135
+-89 172 -105T276 -121ZM277 510Q347 510 398 490T477 431T505 340Q505 288 478 250T399 192T277 171Q166 171 107 216T48 340Q48 393 76 431T155 489T277 510ZM277 424Q237 424 211 402T185 341Q185 302 211 280T277 257Q317 257 342 279T368 341Q368 380 343
+402T277 424Z" />
+<glyph unicode="h" horiz-adv-x="619" d="M72 0V719H209V415Q233 463 275 486T370 510Q422 510 462 490T526 430T550 328V0H413V288Q413 353 388 377T324 402Q295 402 269 389T226 345T209 264V0H72Z" />
+<glyph unicode="i" horiz-adv-x="282" d="M141 572Q98 572 77 590T56 645Q56 682 77 700T141 719Q184 719 205 701T226 645Q226 609 205 591T141 572ZM209 500V0H72V500H209Z" />
+<glyph unicode="j" horiz-adv-x="282" d="M141 572Q98 572 77 590T56 645Q56 682 77 700T141 719Q184 719 205 701T226 645Q226 609 205 591T141 572ZM209 500V-37Q209 -102 186 -141T122 -197T31 -215Q-6 -215 -36 -207T-89 -183L-67 -85Q-55 -95 -37 -101T3
+-108Q34 -108 53 -90T72 -24V500H209Z" />
+<glyph unicode="k" horiz-adv-x="602" d="M581 500L350 259L323 246L173 85L171 231L425 500H581ZM209 719V0H72V719H209ZM369 341L593 0H438L275 261L369 341Z" />
+<glyph unicode="l" horiz-adv-x="319" d="M207 719V154Q207 119 219 105T259 91Q276 91 287 93T315 101L303 11Q286 1 261 -4T210 -10Q137 -10 104 25T70 139V719H207Z" />
+<glyph unicode="m" horiz-adv-x="945" d="M72 0V500H195L200 410Q225 460 268 485T365 510Q419 510 462 485T528 411Q544 444 571 466T631 499T698 510Q747 510 787 490T852 430T876 328V0H739V301Q739 356 715 379T653 402Q623 402 598 387T558 343T543 269V0H406V301Q406
+356 382 379T319 402Q293 402 268 388T226 344T209 265V0H72Z" />
+<glyph unicode="n" horiz-adv-x="619" d="M72 0V500H195L203 350L186 366Q198 415 224 446T287 494T370 510Q422 510 462 490T526 430T550 328V0H413V289Q413 353 388 377T323 402Q295 402 269 389T226 345T209 265V0H72Z" />
+<glyph unicode="o" horiz-adv-x="599" d="M300 510Q376 510 433 479T523 390T556 250Q556 169 524 111T434 21T300 -10Q225 -10 167 21T77 110T44 250Q44 332 76 390T167 479T300 510ZM300 408Q262 408 236 391T195 338T181 250Q181 197 195 162T235 110T300 92Q337
+92 363 109T404 162T418 250Q418 303 404 338T364 390T300 408Z" />
+<glyph unicode="p" horiz-adv-x="627" d="M72 -210V500H195L204 341L187 359Q196 403 220 437T283 490T368 510Q429 510 477 479T552 391T580 251Q580 169 552 111T476 21T365 -10Q299 -10 256 27T196 120L209 141V-210H72ZM325 95Q380 95 411 134T443 250Q443
+326 413 365T327 405Q292 405 266 387T224 334T209 250Q209 203 223 168T263 114T325 95Z" />
+<glyph unicode="q" horiz-adv-x="627" d="M418 -210V156L434 138Q427 93 403 60T343 9T261 -10Q199 -10 151 21T75 110T47 251Q47 334 75 391T154 479T266 510Q312 510 349 491T410 436T440 354L423 344L432 500H555V-210H418ZM301 95Q337 95 363 113T403 167T418
+252Q418 302 404 336T363 387T302 405Q247 405 216 366T184 250Q184 174 215 135T301 95Z" />
+<glyph unicode="r" horiz-adv-x="422" d="M72 0V500H191L200 402Q220 454 258 482T355 510Q372 510 386 507T409 499L393 384Q383 388 369 390T331 392Q301 392 273 378T227 334T209 259V0H72Z" />
+<glyph unicode="s" horiz-adv-x="531" d="M272 -10Q196 -10 134 17T32 93L111 173Q135 137 175 114T270 91Q309 91 332 102T356 139Q356 155 345 166T301 185L213 203Q126 221 90 257T53 352Q53 393 77 429T151 487T273 510Q348 510 403 487T491 417L409 337Q387
+372 352 390T277 409Q249 409 229 403T199 387T189 360Q189 344 203 333T254 313L356 292Q430 277 462 242T494 156Q494 108 469 71T394 12T272 -10Z" />
+<glyph unicode="t" horiz-adv-x="430" d="M249 653V163Q249 127 267 111T318 94Q344 94 362 101T396 122L418 31Q394 12 358 1T282 -10Q232 -10 194 5T134 53T112 141V615L249 653ZM409 500V398H20V500H409Z" />
+<glyph unicode="u" horiz-adv-x="618" d="M246 -10Q196 -10 156 8T93 65T69 168V500H206V201Q206 143 230 121T299 98Q320 98 340 105T375 129T400 170T409 231V500H546V0H424L419 87Q394 37 351 14T246 -10Z" />
+<glyph unicode="v" horiz-adv-x="546" d="M400 500H542L352 0H194L4 500H151L274 105L400 500Z" />
+<glyph unicode="w" horiz-adv-x="876" d="M717 500H863L703 0H545L436 340L331 0H173L13 500H159L259 117L370 500H506L618 117L717 500Z" />
+<glyph unicode="x" horiz-adv-x="569" d="M183 500L315 281L352 282L552 0H393L257 224L216 228L23 500H183ZM549 500L356 231L315 234L169 0H14L221 284L260 279L393 500H549Z" />
+<glyph unicode="y" horiz-adv-x="546" d="M542 500L340 -31Q316 -99 287 -139T219 -197T127 -215Q88 -215 56 -206T-1 -181L28 -82Q47 -97 68 -103T116 -110Q144 -110 164 -98T199 -50L216 -7L161 123L8 500H160L255 200L281 100L312 206L403 500H542Z" />
+<glyph unicode="z" horiz-adv-x="523" d="M43 0V88L265 344L322 401L239 399H45V500H474V412L253 157L196 99L287 101H482V0H43Z" />
+<glyph unicode="{" horiz-adv-x="395" d="M361 -191Q284 -191 238 -175T170 -124T148 -37V124Q148 180 123 204T36 228V323Q97 323 122 347T148 427V589Q148 642 169 675T237 725T361 741V649Q308 649 285 632T262 578V402Q262 351 236 320T158 276Q209 263 235
+232T262 149V-27Q262 -64 285 -81T361 -98V-191Z" />
+<glyph unicode="|" horiz-adv-x="292" d="M206 719V-168H86V719H206Z" />
+<glyph unicode="}" horiz-adv-x="395" d="M34 742Q111 742 157 726T225 675T247 588V427Q247 371 272 347T359 323V228Q298 228 273 204T247 124V-38Q247 -91 226 -124T158 -174T34 -190V-98Q87 -98 110 -81T133 -27V149Q133 200 159 231T237 275Q186 288 160
+319T133 402V578Q133 615 110 632T34 649V742Z" />
+<glyph unicode="~" horiz-adv-x="576" d="M533 410Q528 323 491 278T384 232Q349 232 325 242T282 266T246 290T208 300Q185 300 173 284T155 235H43Q48 323 85 368T193 413Q227 413 251 403T295 379T331 355T369 345Q391 345 404 362T421 410H533Z" />
+<glyph unicode="&#xa0;" horiz-adv-x="306" />
+<glyph unicode="&#xa1;" horiz-adv-x="286" d="M71 -160V80L88 287H198L215 80V-160H71ZM143 355Q104 355 81 376T58 432Q58 468 81 488T143 509Q182 509 205 489T228 432Q228 397 205 376T143 355Z" />
+<glyph unicode="&#xa2;" horiz-adv-x="572" d="M312 -10Q233 -10 174 21T83 110T51 250Q51 332 83 390T173 479T308 510Q375 510 420 491T494 439T535 363L426 320Q415 369 386 394T313 419Q250 419 211 377T172 249Q172 191 190 154T241 99T313 81Q345 81 369
+92T409 125T432 178L537 142Q525 96 495 62T419 9T312 -10ZM261 -100V600H352V-100H261Z" />
+<glyph unicode="&#xa3;" horiz-adv-x="621" d="M62 273V346H477V273H62ZM153 -10Q101 -10 69 14T36 80Q36 108 52 128T96 160T162 172Q204 172 234 164T288 143T333 117T376 95T428 86Q465 86 482 107T499 175L591 167Q595 113 579 73T530 12T451 -10Q412 -10
+380 2T321 31T268 67T216 97T159 109Q137 109 127 102T117 81Q117 66 129 58T159 50Q191 50 206 64T227 103T233 161Q233 204 219 238T172 322Q153 355 141 380T124 428T119 475Q119 533 147 577T227 645T346 670Q435 670 490 629T565 502L453 454Q440 509 415
+537T341 565Q294 565 266 541T237 470Q237 453 240 438T253 403T277 355Q300 311 314 269T329 188Q329 153 319 118T288 54T233 8T153 -10Z" />
+<glyph unicode="&#xa4;" horiz-adv-x="653" d="M327 538Q389 538 437 512T512 438T539 329Q539 268 512 221T437 147T327 120Q265 120 217 147T142 221T114 329Q114 391 141 438T217 511T327 538ZM327 435Q282 435 254 406T226 329Q226 282 254 253T327 223Q371
+223 399 252T427 329Q427 376 399 405T327 435ZM129 607L256 471L186 401L49 526L129 607ZM184 258L254 188L129 51L49 132L184 258ZM470 255L605 132L523 51L399 184L470 255ZM523 607L605 526L472 401L401 472L523 607Z" />
+<glyph unicode="&#xa5;" horiz-adv-x="649" d="M260 0V116H68V173H260V242H68V302H190L244 298L24 660H170L278 446L324 345H326L371 447L479 660H625L405 298L459 302H582V242H389V173H582V116H389V0H260Z" />
+<glyph unicode="&#xa6;" horiz-adv-x="292" d="M206 719V345H86V719H206ZM206 206V-168H86V206H206Z" />
+<glyph unicode="&#xa7;" horiz-adv-x="614" d="M420 113L365 176Q405 180 431 189T469 214T482 250Q482 275 463 292T397 318L235 348Q187 357 154 378T105 429T89 495Q89 547 117 586T196 648T317 670Q394 670 448 645T540 572L461 504Q433 541 396 558T311 576Q255
+576 227 557T199 509Q199 494 206 481T234 459T292 442L406 422Q473 410 512 390T569 342T586 275Q586 232 567 198T511 143T420 113ZM297 -110Q211 -110 149 -83T53 -10L133 60Q156 25 199 4T300 -18Q354 -18 386 0T419 51Q419 72 402 85T344 106L186 138Q132
+149 97 169T44 219T26 291Q26 333 45 363T99 412T178 438L225 378Q193 371 172 361T140 338T129 306Q129 281 150 264T222 237L377 208Q454 194 489 157T525 63Q525 11 498 -28T419 -88T297 -110Z" />
+<glyph unicode="&#xa8;" horiz-adv-x="500" d="M144 705Q179 705 199 687T220 635Q220 603 200 584T144 565Q110 565 90 584T70 635Q70 668 90 686T144 705ZM354 705Q390 705 410 687T430 635Q430 603 410 584T354 565Q320 565 300 584T280 635Q280 668 300 686T354 705Z" />
+<glyph unicode="&#xa9;" horiz-adv-x="790" d="M395 -10Q294 -10 217 34T95 155T51 330Q51 429 95 505T216 626T395 670Q496 670 573 626T694 506T738 330Q738 232 695 155T574 34T395 -10ZM395 67Q473 67 532 101T624 195T657 330Q657 406 624 465T532 559T395
+593Q317 593 258 559T166 466T133 330Q133 255 166 195T258 101T395 67ZM401 140Q313 140 263 191T213 329Q213 416 263 467T401 518Q466 518 508 490T568 413L484 372Q473 399 454 410T404 422Q363 422 339 398T315 329Q315 284 339 260T404 235Q435 235 456 247T489
+288L569 252Q547 196 507 168T401 140Z" />
+<glyph unicode="&#xaa;" horiz-adv-x="418" d="M141 314Q86 314 57 339T27 404Q27 446 53 468T140 502L252 524V475L180 459Q152 453 141 443T129 415Q129 399 140 390T171 381Q187 381 203 386T229 405T240 443V535Q240 561 226 575T186 589Q161 589 141 577T111
+533L28 559Q39 605 79 634T188 663Q265 663 305 631T345 534V410Q345 394 353 387T373 380Q388 380 395 383L387 325Q377 319 365 317T338 314Q300 314 278 334T255 393V411L269 404Q263 379 246 359T202 326T141 314ZM31 169V245H380V169H31Z" />
+<glyph unicode="&#xab;" horiz-adv-x="552" d="M292 461L168 265L292 69H166L41 265L166 461H292ZM510 461L386 265L510 69H384L259 265L384 461H510Z" />
+<glyph unicode="&#xac;" horiz-adv-x="604" d="M545 316V110H429V316H545ZM545 374V269H59V374H545Z" />
+<glyph unicode="&#xad;" horiz-adv-x="521" d="M437 324V206H84V324H437Z" />
+<glyph unicode="&#xae;" horiz-adv-x="790" d="M395 -10Q294 -10 217 34T95 155T51 330Q51 429 95 505T216 626T395 670Q496 670 573 627T694 506T738 330Q738 232 695 155T574 34T395 -10ZM454 148L370 295L446 318L559 148H454ZM395 67Q473 67 532 101T624 195T657
+330Q657 406 624 465T532 559T395 593Q317 593 258 559T166 466T133 330Q133 255 166 195T258 101T395 67ZM250 148V515H416Q456 515 486 500T533 458T551 395Q551 339 512 308T409 276H338V148H250ZM338 339H401Q429 339 445 351T461 391Q461 418 445 430T401
+443H338V339Z" />
+<glyph unicode="&#xaf;" horiz-adv-x="500" d="M425 670V579H75V670H425Z" />
+<glyph unicode="&#xb0;" horiz-adv-x="482" d="M241 313Q184 313 142 335T75 398T51 492Q51 545 75 585T141 648T241 670Q299 670 341 648T408 586T432 492Q432 438 408 398T342 336T241 313ZM241 406Q280 406 304 430T328 492Q328 530 304 554T241 578Q204 578
+180 554T155 492Q155 455 179 431T241 406Z" />
+<glyph unicode="&#xb1;" horiz-adv-x="604" d="M355 648V174H250V648H355ZM550 461V359H54V461H550ZM550 100V0H54V100H550Z" />
+<glyph unicode="&#xb2;" horiz-adv-x="382" d="M33 333V400Q56 414 78 428T123 457Q167 489 193 513T231 558T242 598Q242 623 228 638T184 654Q153 654 136 633T118 571L20 595Q22 660 67 697T187 735Q245 735 281 716T334 668T351 606Q351 579 339 554T301 503T236
+450Q221 440 204 431T168 413V412Q182 413 207 414T250 415H357V333H33Z" />
+<glyph unicode="&#xb3;" horiz-adv-x="373" d="M189 735Q259 735 298 705T337 624Q337 596 326 576T296 545T255 533V530Q280 530 300 520T333 491T345 443Q345 408 324 382T265 342T180 327Q111 327 70 353T14 430L111 463Q116 433 133 419T181 405Q209 405 225
+418T241 456Q241 480 224 490T175 500Q171 500 167 500T158 499V559Q162 558 165 558T172 558Q202 558 217 570T233 606Q233 630 219 642T180 654Q155 654 139 641T118 601L25 629Q36 682 81 708T189 735Z" />
+<glyph unicode="&#xb4;" horiz-adv-x="562" d="M250 742H382L282 572H181L250 742Z" />
+<glyph unicode="&#xb5;" horiz-adv-x="622" d="M72 -210V500H209V204Q209 147 233 123T302 98Q333 98 357 112T397 157T412 238V500H549V0H430L424 87Q402 39 363 15T273 -10Q246 -10 223 -2T182 24L209 62V-210H72Z" />
+<glyph unicode="&#xb6;" horiz-adv-x="715" d="M296 -100V182Q220 183 162 211T70 292T37 420Q37 496 72 550T170 632T317 660H639V-100H526V553H411V-100H296ZM294 289V553Q248 553 216 537T168 491T151 421Q151 380 167 351T216 305T294 289Z" />
+<glyph unicode="&#xb7;" horiz-adv-x="256" d="M129 435Q169 435 192 413T216 354Q216 316 193 295T129 273Q89 273 66 294T42 354Q42 391 65 413T129 435Z" />
+<glyph unicode="&#xb8;" horiz-adv-x="500" d="M189 8L230 34Q302 20 334 -12T367 -93Q367 -147 331 -181T233 -215Q198 -215 175 -207T134 -186L158 -113Q171 -121 185 -127T221 -133Q247 -133 264 -117T281 -71Q281 -47 261 -29T189 8Z" />
+<glyph unicode="&#xb9;" horiz-adv-x="277" d="M143 730H232V333H128V562Q128 575 129 593T131 629Q107 610 78 596T16 577V663Q36 667 61 677T109 701T143 730Z" />
+<glyph unicode="&#xba;" horiz-adv-x="400" d="M200 314Q122 314 75 360T27 488Q27 571 74 617T200 663Q278 663 325 617T372 488Q372 406 325 360T200 314ZM36 169V245H364V169H36ZM200 386Q235 386 251 411T267 488Q267 540 251 566T200 592Q165 592 149 566T133
+488Q133 437 149 412T200 386Z" />
+<glyph unicode="&#xbb;" horiz-adv-x="552" d="M260 69L384 265L260 461H386L511 265L386 69H260ZM42 69L166 265L42 461H168L293 265L168 69H42Z" />
+<glyph unicode="&#xbc;" horiz-adv-x="841" d="M143 921H232V524H128V753Q128 766 129 784T131 820Q107 801 78 787T16 768V854Q36 858 61 868T109 892T143 921ZM111 0L588 660H693L216 0H111ZM825 156V86H761V-4H671V86H471V135L640 393H761V156H825ZM563 156H671V247Q671
+267 672 287T674 325H671Q665 313 657 297T640 268L563 156Z" />
+<glyph unicode="&#xbd;" horiz-adv-x="909" d="M143 921H232V524H128V753Q128 766 129 784T131 820Q107 801 78 787T16 768V854Q36 858 61 868T109 892T143 921ZM111 0L588 660H693L216 0H111ZM560 -4V63Q583 77 605 91T650 120Q694 152 720 176T758 221T769 261Q769
+286 755 301T711 317Q680 317 663 296T645 234L547 258Q549 323 594 360T714 398Q772 398 808 379T861 331T878 269Q878 242 866 217T828 166T763 113Q748 103 731 94T695 76V75Q709 76 734 77T777 78H884V-4H560Z" />
+<glyph unicode="&#xbe;" horiz-adv-x="937" d="M189 926Q259 926 298 896T337 815Q337 787 326 767T296 736T255 724V721Q280 721 300 711T333 682T345 634Q345 599 324 573T265 533T180 518Q111 518 70 544T14 621L111 654Q116 624 133 610T181 596Q209 596 225
+609T241 647Q241 671 224 681T175 691Q171 691 167 691T158 690V750Q162 749 165 749T172 749Q202 749 217 761T233 797Q233 821 219 833T180 845Q155 845 139 832T118 792L25 820Q36 873 81 899T189 926ZM207 0L684 660H789L312 0H207ZM921 156V86H857V-4H767V86H567V135L736
+393H857V156H921ZM659 156H767V247Q767 267 768 287T770 325H767Q761 313 753 297T736 268L659 156Z" />
+<glyph unicode="&#xbf;" horiz-adv-x="580" d="M287 -170Q217 -170 162 -150T76 -89T44 9Q44 69 69 108T138 168T233 195L240 288H365L364 137Q301 130 263 116T208 80T191 27Q191 -11 217 -33T296 -55Q348 -55 379 -26T417 58L547 8Q535 -44 503 -84T418 -147T287
+-170ZM301 355Q262 355 239 376T216 432Q216 468 239 488T301 509Q340 509 363 489T386 432Q386 397 363 376T301 355Z" />
+<glyph unicode="&#xc0;" horiz-adv-x="671" d="M12 0L253 660H418L659 0H516L365 449L335 549H333L305 451L153 0H12ZM154 161V263H516V161H154ZM330 892L393 730H292L204 892H330Z" />
+<glyph unicode="&#xc1;" horiz-adv-x="671" d="M12 0L253 660H418L659 0H516L365 449L335 549H333L305 451L153 0H12ZM154 161V263H516V161H154ZM337 892H463L375 730H274L337 892Z" />
+<glyph unicode="&#xc2;" horiz-adv-x="671" d="M12 0L253 660H418L659 0H516L365 449L335 549H333L305 451L153 0H12ZM154 161V263H516V161H154ZM508 730H405L335 828L265 730H162L266 892H404L508 730Z" />
+<glyph unicode="&#xc3;" horiz-adv-x="671" d="M12 0L253 660H418L659 0H516L365 449L335 549H333L305 451L153 0H12ZM154 161V263H516V161H154ZM526 878Q524 828 509 795T467 745T407 728Q379 728 359 737T325 758T297 779T268 789Q249 789 240 774T226 728H142Q146
+803 178 840T266 878Q293 878 312 869T346 847T372 826T400 817Q420 817 429 832T442 878H526Z" />
+<glyph unicode="&#xc4;" horiz-adv-x="671" d="M12 0L253 660H418L659 0H516L365 449L335 549H333L305 451L153 0H12ZM154 161V263H516V161H154ZM229 865Q264 865 284 847T305 795Q305 763 285 744T229 725Q195 725 175 744T155 795Q155 828 175 846T229 865ZM439
+865Q475 865 495 847T515 795Q515 763 495 744T439 725Q405 725 385 744T365 795Q365 828 385 846T439 865Z" />
+<glyph unicode="&#xc5;" horiz-adv-x="671" d="M12 0L253 660H418L659 0H516L365 449L335 549H333L305 451L153 0H12ZM154 161V263H516V161H154ZM334 844Q395 844 431 811T468 721Q468 665 432 632T334 598Q274 598 237 631T199 721Q199 777 236 810T334 844ZM334
+780Q308 780 291 764T274 721Q274 695 291 679T334 663Q361 663 377 679T394 721Q394 747 378 763T334 780Z" />
+<glyph unicode="&#xc6;" horiz-adv-x="935" d="M563 108H897V0H432V202H234L141 0H0L321 660H883V552H563V384H807V281H563V108ZM274 301H432V555H398L274 301Z" />
+<glyph unicode="&#xc7;" horiz-adv-x="683" d="M651 182Q632 118 591 75T494 11T371 -10Q273 -10 202 31T92 148T53 330Q53 436 91 512T201 629T369 670Q437 670 492 652T585 595T642 499L517 446Q500 506 465 531T375 557Q321 557 281 531T218 455T196 330Q196
+257 216 206T277 129T375 103Q429 103 468 132T524 220L651 182ZM295 8L336 34Q408 20 440 -12T473 -93Q473 -147 437 -181T339 -215Q304 -215 281 -207T240 -186L264 -113Q277 -121 291 -127T327 -133Q353 -133 370 -117T387 -71Q387 -47 367 -29T295 8Z" />
+<glyph unicode="&#xc8;" horiz-adv-x="633" d="M86 0V660H581V549H224V385H505V279H224V111H595V0H86ZM332 892L395 730H294L206 892H332Z" />
+<glyph unicode="&#xc9;" horiz-adv-x="633" d="M86 0V660H581V549H224V385H505V279H224V111H595V0H86ZM332 892H458L370 730H269L332 892Z" />
+<glyph unicode="&#xca;" horiz-adv-x="633" d="M86 0V660H581V549H224V385H505V279H224V111H595V0H86ZM507 730H404L334 828L264 730H161L265 892H403L507 730Z" />
+<glyph unicode="&#xcb;" horiz-adv-x="633" d="M86 0V660H581V549H224V385H505V279H224V111H595V0H86ZM228 865Q263 865 283 847T304 795Q304 763 284 744T228 725Q194 725 174 744T154 795Q154 828 174 846T228 865ZM438 865Q474 865 494 847T514 795Q514 763
+494 744T438 725Q404 725 384 744T364 795Q364 828 384 846T438 865Z" />
+<glyph unicode="&#xcc;" horiz-adv-x="310" d="M224 660V0H86V660H224ZM147 892L210 730H109L21 892H147Z" />
+<glyph unicode="&#xcd;" horiz-adv-x="310" d="M224 660V0H86V660H224ZM163 892H289L201 730H100L163 892Z" />
+<glyph unicode="&#xce;" horiz-adv-x="310" d="M224 660V0H86V660H224ZM328 730H225L155 828L85 730H-18L86 892H224L328 730Z" />
+<glyph unicode="&#xcf;" horiz-adv-x="310" d="M58 865Q93 865 112 847T132 795Q132 763 113 744T58 725Q25 725 6 744T-14 795Q-14 828 5 846T58 865ZM250 865Q285 865 304 847T324 795Q324 763 305 744T250 725Q217 725 198 744T178 795Q178 828 197 846T250
+865ZM224 660V0H86V660H224Z" />
+<glyph unicode="&#xd0;" horiz-adv-x="740" d="M18 280V383H399V280H18ZM362 660Q517 660 601 575T686 330Q686 172 602 86T362 0H107V660H362ZM354 110Q449 110 496 166T544 330Q544 437 497 493T354 550H245V110H354Z" />
+<glyph unicode="&#xd1;" horiz-adv-x="739" d="M653 660V0H495L264 388L207 496H206L210 382V0H86V660H243L474 273L531 164H533L529 278V660H653ZM563 878Q561 828 546 795T504 745T444 728Q416 728 396 737T362 758T334 779T305 789Q286 789 277 774T263 728H179Q183
+803 215 840T303 878Q330 878 349 869T383 847T409 826T437 817Q457 817 466 832T479 878H563Z" />
+<glyph unicode="&#xd2;" horiz-adv-x="741" d="M371 670Q469 670 540 629T649 512T688 330Q688 224 650 148T540 31T371 -10Q273 -10 202 31T92 148T53 330Q53 436 91 512T201 629T371 670ZM371 557Q316 557 277 531T217 454T196 330Q196 257 216 206T276 129T371
+103Q426 103 465 129T524 206T545 330Q545 403 525 454T465 531T371 557ZM362 892L425 730H324L236 892H362Z" />
+<glyph unicode="&#xd3;" horiz-adv-x="741" d="M371 670Q469 670 540 629T649 512T688 330Q688 224 650 148T540 31T371 -10Q273 -10 202 31T92 148T53 330Q53 436 91 512T201 629T371 670ZM371 557Q316 557 277 531T217 454T196 330Q196 257 216 206T276 129T371
+103Q426 103 465 129T524 206T545 330Q545 403 525 454T465 531T371 557ZM373 892H499L411 730H310L373 892Z" />
+<glyph unicode="&#xd4;" horiz-adv-x="741" d="M371 670Q469 670 540 629T649 512T688 330Q688 224 650 148T540 31T371 -10Q273 -10 202 31T92 148T53 330Q53 436 91 512T201 629T371 670ZM371 557Q316 557 277 531T217 454T196 330Q196 257 216 206T276 129T371
+103Q426 103 465 129T524 206T545 330Q545 403 525 454T465 531T371 557ZM544 730H441L371 828L301 730H198L302 892H440L544 730Z" />
+<glyph unicode="&#xd5;" horiz-adv-x="741" d="M371 670Q469 670 540 629T649 512T688 330Q688 224 650 148T540 31T371 -10Q273 -10 202 31T92 148T53 330Q53 436 91 512T201 629T371 670ZM371 557Q316 557 277 531T217 454T196 330Q196 257 216 206T276 129T371
+103Q426 103 465 129T524 206T545 330Q545 403 525 454T465 531T371 557ZM562 878Q560 828 545 795T503 745T443 728Q415 728 395 737T361 758T333 779T304 789Q285 789 276 774T262 728H178Q182 803 214 840T302 878Q329 878 348 869T382 847T408 826T436 817Q456
+817 465 832T478 878H562Z" />
+<glyph unicode="&#xd6;" horiz-adv-x="741" d="M371 670Q469 670 540 629T649 512T688 330Q688 224 650 148T540 31T371 -10Q273 -10 202 31T92 148T53 330Q53 436 91 512T201 629T371 670ZM371 557Q316 557 277 531T217 454T196 330Q196 257 216 206T276 129T371
+103Q426 103 465 129T524 206T545 330Q545 403 525 454T465 531T371 557ZM265 865Q300 865 320 847T341 795Q341 763 321 744T265 725Q231 725 211 744T191 795Q191 828 211 846T265 865ZM475 865Q511 865 531 847T551 795Q551 763 531 744T475 725Q441 725 421
+744T401 795Q401 828 421 846T475 865Z" />
+<glyph unicode="&#xd7;" horiz-adv-x="604" d="M462 85L539 163L142 561L64 483L462 85ZM142 85L539 483L462 561L64 163L142 85Z" />
+<glyph unicode="&#xd8;" horiz-adv-x="741" d="M244 95L196 134L489 544L538 507L244 95ZM72 -31L185 122L235 83L148 -31H72ZM554 525L504 564L593 682H670L554 525ZM371 670Q469 670 540 629T649 512T688 330Q688 224 650 148T540 31T371 -10Q273 -10 202 31T92
+148T53 330Q53 436 91 512T201 629T371 670ZM371 557Q316 557 277 531T217 454T196 330Q196 257 216 206T276 129T371 103Q426 103 465 129T524 206T545 330Q545 403 525 454T465 531T371 557Z" />
+<glyph unicode="&#xd9;" horiz-adv-x="710" d="M637 660V260Q637 125 565 58T355 -10Q217 -10 145 57T73 260V660H211V266Q211 183 246 143T355 103Q428 103 463 143T498 266V660H637ZM353 877L416 715H315L227 877H353Z" />
+<glyph unicode="&#xda;" horiz-adv-x="710" d="M637 660V260Q637 125 565 58T355 -10Q217 -10 145 57T73 260V660H211V266Q211 183 246 143T355 103Q428 103 463 143T498 266V660H637ZM357 877H483L395 715H294L357 877Z" />
+<glyph unicode="&#xdb;" horiz-adv-x="710" d="M637 660V260Q637 125 565 58T355 -10Q217 -10 145 57T73 260V660H211V266Q211 183 246 143T355 103Q428 103 463 143T498 266V660H637ZM528 715H425L355 813L285 715H182L286 877H424L528 715Z" />
+<glyph unicode="&#xdc;" horiz-adv-x="710" d="M637 660V260Q637 125 565 58T355 -10Q217 -10 145 57T73 260V660H211V266Q211 183 246 143T355 103Q428 103 463 143T498 266V660H637ZM249 850Q284 850 304 832T325 780Q325 748 305 729T249 710Q215 710 195 729T175
+780Q175 813 195 831T249 850ZM459 850Q495 850 515 832T535 780Q535 748 515 729T459 710Q425 710 405 729T385 780Q385 813 405 831T459 850Z" />
+<glyph unicode="&#xdd;" horiz-adv-x="626" d="M616 660L382 247V0H244V247L10 660H157L263 463L313 359L364 463L470 660H616ZM315 880H441L353 718H252L315 880Z" />
+<glyph unicode="&#xde;" horiz-adv-x="657" d="M357 553Q482 553 547 498T613 337Q613 232 548 177T357 121H155V230H348Q472 230 472 338Q472 392 441 418T348 444H155V553H357ZM224 660V0H86V660H224Z" />
+<glyph unicode="&#xdf;" horiz-adv-x="636" d="M417 371Q477 371 516 347T574 282T594 193Q594 138 572 92T505 18T388 -10Q342 -10 308 0T256 23L282 118Q297 109 316 102T367 94Q412 94 438 125T464 207Q464 261 433 289T342 317H285L296 419H333Q385 419 412
+449T439 523Q439 571 409 594T332 618Q263 618 236 579T209 457V0H72V474Q72 550 97 606T182 693T339 724Q417 724 469 699T547 633T574 541Q574 501 556 463T503 401T417 373V371Z" />
+<glyph unicode="&#xe0;" horiz-adv-x="574" d="M357 319Q357 362 333 386T268 410Q231 410 203 391T162 328L45 364Q62 430 119 470T274 510Q340 510 389 490T465 428T493 325V122Q493 84 529 84Q546 84 561 89L553 4Q527 -9 488 -9Q453 -9 425 3T381 39T365 101V105L389
+109Q383 71 356 45T291 4T211 -10Q160 -10 123 5T66 51T46 125Q46 181 82 216T185 265L373 303L372 218L252 194Q218 187 201 176T183 138Q183 113 201 100T246 87Q267 87 287 92T323 108T348 138T357 184V319ZM264 742L334 572H232L132 742H264Z" />
+<glyph unicode="&#xe1;" horiz-adv-x="574" d="M357 319Q357 362 333 386T268 410Q231 410 203 391T162 328L45 364Q62 430 119 470T274 510Q340 510 389 490T465 428T493 325V122Q493 84 529 84Q546 84 561 89L553 4Q527 -9 488 -9Q453 -9 425 3T381 39T365 101V105L389
+109Q383 71 356 45T291 4T211 -10Q160 -10 123 5T66 51T46 125Q46 181 82 216T185 265L373 303L372 218L252 194Q218 187 201 176T183 138Q183 113 201 100T246 87Q267 87 287 92T323 108T348 138T357 184V319ZM279 742H411L311 572H210L279 742Z" />
+<glyph unicode="&#xe2;" horiz-adv-x="574" d="M357 319Q357 362 333 386T268 410Q231 410 203 391T162 328L45 364Q62 430 119 470T274 510Q340 510 389 490T465 428T493 325V122Q493 84 529 84Q546 84 561 89L553 4Q527 -9 488 -9Q453 -9 425 3T381 39T365 101V105L389
+109Q383 71 356 45T291 4T211 -10Q160 -10 123 5T66 51T46 125Q46 181 82 216T185 265L373 303L372 218L252 194Q218 187 201 176T183 138Q183 113 201 100T246 87Q267 87 287 92T323 108T348 138T357 184V319ZM456 565H351L276 663L201 565H96L207 736H345L456
+565Z" />
+<glyph unicode="&#xe3;" horiz-adv-x="574" d="M357 319Q357 362 333 386T268 410Q231 410 203 391T162 328L45 364Q62 430 119 470T274 510Q340 510 389 490T465 428T493 325V122Q493 84 529 84Q546 84 561 89L553 4Q527 -9 488 -9Q453 -9 425 3T381 39T365 101V105L389
+109Q383 71 356 45T291 4T211 -10Q160 -10 123 5T66 51T46 125Q46 181 82 216T185 265L373 303L372 218L252 194Q218 187 201 176T183 138Q183 113 201 100T246 87Q267 87 287 92T323 108T348 138T357 184V319ZM467 718Q465 668 450 635T408 585T348 568Q320 568
+300 577T266 598T238 619T209 629Q190 629 181 614T167 568H83Q87 643 119 680T207 718Q234 718 253 709T287 687T313 666T341 657Q361 657 370 672T383 718H467Z" />
+<glyph unicode="&#xe4;" horiz-adv-x="574" d="M357 319Q357 362 333 386T268 410Q231 410 203 391T162 328L45 364Q62 430 119 470T274 510Q340 510 389 490T465 428T493 325V122Q493 84 529 84Q546 84 561 89L553 4Q527 -9 488 -9Q453 -9 425 3T381 39T365 101V105L389
+109Q383 71 356 45T291 4T211 -10Q160 -10 123 5T66 51T46 125Q46 181 82 216T185 265L373 303L372 218L252 194Q218 187 201 176T183 138Q183 113 201 100T246 87Q267 87 287 92T323 108T348 138T357 184V319ZM170 705Q205 705 225 687T246 635Q246 603 226 584T170
+565Q136 565 116 584T96 635Q96 668 116 686T170 705ZM380 705Q416 705 436 687T456 635Q456 603 436 584T380 565Q346 565 326 584T306 635Q306 668 326 686T380 705Z" />
+<glyph unicode="&#xe5;" horiz-adv-x="574" d="M357 319Q357 362 333 386T268 410Q231 410 203 391T162 328L45 364Q62 430 119 470T274 510Q340 510 389 490T465 428T493 325V122Q493 84 529 84Q546 84 561 89L553 4Q527 -9 488 -9Q453 -9 425 3T381 39T365 101V105L389
+109Q383 71 356 45T291 4T211 -10Q160 -10 123 5T66 51T46 125Q46 181 82 216T185 265L373 303L372 218L252 194Q218 187 201 176T183 138Q183 113 201 100T246 87Q267 87 287 92T323 108T348 138T357 184V319ZM274 806Q335 806 371 773T408 683Q408 627 372 594T274
+560Q214 560 177 593T139 683Q139 739 176 772T274 806ZM274 742Q248 742 231 726T214 683Q214 657 231 641T274 625Q301 625 317 641T334 683Q334 709 318 725T274 742Z" />
+<glyph unicode="&#xe6;" horiz-adv-x="887" d="M218 -10Q166 -10 127 5T67 51T45 127Q45 183 81 217T182 264L358 299V318Q358 362 334 386T268 410Q232 410 205 391T163 328L49 364Q55 406 85 439T162 491T268 510Q339 510 390 482T461 397H418Q438 433 467 458T535
+496T617 510Q689 510 739 480T816 397T843 277Q843 260 842 244T839 207H492V207Q492 147 530 120T620 92Q661 92 685 109T724 156L834 114Q818 75 787 47T714 5T622 -10Q540 -10 483 28T402 141L434 140Q429 107 411 80T365 33T299 1T218 -10ZM250 87Q271 87 290
+92T325 109T349 138T358 180V216L253 194Q216 187 201 175T185 138Q185 117 200 102T250 87ZM493 302H712Q711 335 698 359T662 396T609 409Q562 409 532 381T493 302Z" />
+<glyph unicode="&#xe7;" horiz-adv-x="564" d="M299 510Q366 510 412 491T487 438T528 363L400 317Q390 362 366 385T301 408Q263 408 236 391T195 338T181 249Q181 196 195 161T237 109T302 92Q332 92 353 102T387 133T406 181L530 141Q519 96 489 62T412 9T303
+-10Q226 -10 167 21T76 110T44 250Q44 332 76 390T166 479T299 510ZM230 8L271 34Q343 20 375 -12T408 -93Q408 -147 372 -181T274 -215Q239 -215 216 -207T175 -186L199 -113Q212 -121 226 -127T262 -133Q288 -133 305 -117T322 -71Q322 -47 302 -29T230 8Z" />
+<glyph unicode="&#xe8;" horiz-adv-x="578" d="M304 -10Q225 -10 167 21T76 110T44 250Q44 332 76 390T165 479T297 510Q373 510 426 480T507 397T535 277Q535 257 534 239T531 207H132V302H471L405 278Q405 341 377 375T296 409Q258 409 231 391T189 338T175
+248Q175 195 190 161T234 109T303 92Q347 92 374 109T416 156L525 114Q509 75 477 47T400 5T304 -10ZM281 742L351 572H249L149 742H281Z" />
+<glyph unicode="&#xe9;" horiz-adv-x="578" d="M304 -10Q225 -10 167 21T76 110T44 250Q44 332 76 390T165 479T297 510Q373 510 426 480T507 397T535 277Q535 257 534 239T531 207H132V302H471L405 278Q405 341 377 375T296 409Q258 409 231 391T189 338T175
+248Q175 195 190 161T234 109T303 92Q347 92 374 109T416 156L525 114Q509 75 477 47T400 5T304 -10ZM296 742H428L328 572H227L296 742Z" />
+<glyph unicode="&#xea;" horiz-adv-x="578" d="M304 -10Q225 -10 167 21T76 110T44 250Q44 332 76 390T165 479T297 510Q373 510 426 480T507 397T535 277Q535 257 534 239T531 207H132V302H471L405 278Q405 341 377 375T296 409Q258 409 231 391T189 338T175
+248Q175 195 190 161T234 109T303 92Q347 92 374 109T416 156L525 114Q509 75 477 47T400 5T304 -10ZM473 565H368L293 663L218 565H113L224 736H362L473 565Z" />
+<glyph unicode="&#xeb;" horiz-adv-x="578" d="M304 -10Q225 -10 167 21T76 110T44 250Q44 332 76 390T165 479T297 510Q373 510 426 480T507 397T535 277Q535 257 534 239T531 207H132V302H471L405 278Q405 341 377 375T296 409Q258 409 231 391T189 338T175
+248Q175 195 190 161T234 109T303 92Q347 92 374 109T416 156L525 114Q509 75 477 47T400 5T304 -10ZM187 705Q222 705 242 687T263 635Q263 603 243 584T187 565Q153 565 133 584T113 635Q113 668 133 686T187 705ZM397 705Q433 705 453 687T473 635Q473 603 453
+584T397 565Q363 565 343 584T323 635Q323 668 343 686T397 705Z" />
+<glyph unicode="&#xec;" horiz-adv-x="282" d="M209 500V0H72V500H209ZM129 742L199 572H97L-3 742H129Z" />
+<glyph unicode="&#xed;" horiz-adv-x="282" d="M209 500V0H72V500H209ZM144 742H276L176 572H75L144 742Z" />
+<glyph unicode="&#xee;" horiz-adv-x="282" d="M209 500V0H72V500H209ZM321 565H216L141 663L66 565H-39L72 736H210L321 565Z" />
+<glyph unicode="&#xef;" horiz-adv-x="282" d="M231 564Q197 564 178 583T159 635Q159 669 178 687T231 706Q266 706 284 688T303 635Q303 602 285 583T231 564ZM51 564Q17 564 -2 583T-21 635Q-21 669 -2 687T51 706Q85 706 104 688T123 635Q123 602 104 583T51
+564ZM209 500V0H72V500H209Z" />
+<glyph unicode="&#xf0;" horiz-adv-x="610" d="M298 -10Q221 -10 165 19T79 106T49 241Q49 320 79 376T163 461T285 491Q352 491 392 464T453 391L445 385Q436 443 416 490T365 577T289 653T186 725H326Q375 698 417 658T490 564T538 444T556 298Q556 202 525
+133T437 27T298 -10ZM304 92Q344 92 371 111T412 163T426 241Q426 292 412 326T372 377T307 395Q269 395 243 378T202 326T188 241Q188 168 218 130T304 92ZM197 537L184 598L370 635L400 584L197 537ZM422 588L394 639L547 675L562 616L422 588Z" />
+<glyph unicode="&#xf1;" horiz-adv-x="619" d="M72 0V500H195L203 350L186 366Q198 415 224 446T287 494T370 510Q422 510 462 490T526 430T550 328V0H413V289Q413 353 388 377T323 402Q295 402 269 389T226 345T209 265V0H72ZM506 718Q504 668 489 635T447 585T387
+568Q359 568 339 577T305 598T277 619T248 629Q229 629 220 614T206 568H122Q126 643 158 680T246 718Q273 718 292 709T326 687T352 666T380 657Q400 657 409 672T422 718H506Z" />
+<glyph unicode="&#xf2;" horiz-adv-x="599" d="M300 510Q376 510 433 479T523 390T556 250Q556 169 524 111T434 21T300 -10Q225 -10 167 21T77 110T44 250Q44 332 76 390T167 479T300 510ZM300 408Q262 408 236 391T195 338T181 250Q181 197 195 162T235 110T300
+92Q337 92 363 109T404 162T418 250Q418 303 404 338T364 390T300 408ZM288 742L358 572H256L156 742H288Z" />
+<glyph unicode="&#xf3;" horiz-adv-x="599" d="M300 510Q376 510 433 479T523 390T556 250Q556 169 524 111T434 21T300 -10Q225 -10 167 21T77 110T44 250Q44 332 76 390T167 479T300 510ZM300 408Q262 408 236 391T195 338T181 250Q181 197 195 162T235 110T300
+92Q337 92 363 109T404 162T418 250Q418 303 404 338T364 390T300 408ZM303 742H435L335 572H234L303 742Z" />
+<glyph unicode="&#xf4;" horiz-adv-x="599" d="M300 510Q376 510 433 479T523 390T556 250Q556 169 524 111T434 21T300 -10Q225 -10 167 21T77 110T44 250Q44 332 76 390T167 479T300 510ZM300 408Q262 408 236 391T195 338T181 250Q181 197 195 162T235 110T300
+92Q337 92 363 109T404 162T418 250Q418 303 404 338T364 390T300 408ZM480 565H375L300 663L225 565H120L231 736H369L480 565Z" />
+<glyph unicode="&#xf5;" horiz-adv-x="599" d="M300 510Q376 510 433 479T523 390T556 250Q556 169 524 111T434 21T300 -10Q225 -10 167 21T77 110T44 250Q44 332 76 390T167 479T300 510ZM300 408Q262 408 236 391T195 338T181 250Q181 197 195 162T235 110T300
+92Q337 92 363 109T404 162T418 250Q418 303 404 338T364 390T300 408ZM491 718Q489 668 474 635T432 585T372 568Q344 568 324 577T290 598T262 619T233 629Q214 629 205 614T191 568H107Q111 643 143 680T231 718Q258 718 277 709T311 687T337 666T365 657Q385
+657 394 672T407 718H491Z" />
+<glyph unicode="&#xf6;" horiz-adv-x="599" d="M300 510Q376 510 433 479T523 390T556 250Q556 169 524 111T434 21T300 -10Q225 -10 167 21T77 110T44 250Q44 332 76 390T167 479T300 510ZM300 408Q262 408 236 391T195 338T181 250Q181 197 195 162T235 110T300
+92Q337 92 363 109T404 162T418 250Q418 303 404 338T364 390T300 408ZM194 705Q229 705 249 687T270 635Q270 603 250 584T194 565Q160 565 140 584T120 635Q120 668 140 686T194 705ZM404 705Q440 705 460 687T480 635Q480 603 460 584T404 565Q370 565 350 584T330
+635Q330 668 350 686T404 705Z" />
+<glyph unicode="&#xf7;" horiz-adv-x="616" d="M557 374V269H59V374H557ZM308 189Q343 189 363 169T384 113Q384 78 364 58T308 38Q273 38 252 58T231 113Q231 148 252 168T308 189ZM308 605Q343 605 363 585T384 529Q384 494 364 474T308 454Q273 454 252 474T231
+529Q231 564 252 584T308 605Z" />
+<glyph unicode="&#xf8;" horiz-adv-x="599" d="M300 510Q376 510 433 479T523 390T556 250Q556 169 524 111T434 21T300 -10Q225 -10 167 21T77 110T44 250Q44 332 76 390T167 479T300 510ZM300 408Q262 408 236 391T195 338T181 250Q181 197 195 162T235 110T300
+92Q337 92 363 109T404 162T418 250Q418 303 404 338T364 390T300 408ZM305 -27L740 526H807L372 -27H305Z" />
+<glyph unicode="&#xf9;" horiz-adv-x="618" d="M246 -10Q196 -10 156 8T93 65T69 168V500H206V201Q206 143 230 121T299 98Q320 98 340 105T375 129T400 170T409 231V500H546V0H424L419 87Q394 37 351 14T246 -10ZM293 736L363 566H261L161 736H293Z" />
+<glyph unicode="&#xfa;" horiz-adv-x="618" d="M246 -10Q196 -10 156 8T93 65T69 168V500H206V201Q206 143 230 121T299 98Q320 98 340 105T375 129T400 170T409 231V500H546V0H424L419 87Q394 37 351 14T246 -10ZM308 736H440L340 566H239L308 736Z" />
+<glyph unicode="&#xfb;" horiz-adv-x="618" d="M246 -10Q196 -10 156 8T93 65T69 168V500H206V201Q206 143 230 121T299 98Q320 98 340 105T375 129T400 170T409 231V500H546V0H424L419 87Q394 37 351 14T246 -10ZM485 559H380L305 657L230 559H125L236 730H374L485 559Z" />
+<glyph unicode="&#xfc;" horiz-adv-x="618" d="M246 -10Q196 -10 156 8T93 65T69 168V500H206V201Q206 143 230 121T299 98Q320 98 340 105T375 129T400 170T409 231V500H546V0H424L419 87Q394 37 351 14T246 -10ZM199 699Q234 699 254 681T275 629Q275 597 255
+578T199 559Q165 559 145 578T125 629Q125 662 145 680T199 699ZM409 699Q445 699 465 681T485 629Q485 597 465 578T409 559Q375 559 355 578T335 629Q335 662 355 680T409 699Z" />
+<glyph unicode="&#xfd;" horiz-adv-x="546" d="M542 500L340 -31Q316 -99 287 -139T219 -197T127 -215Q88 -215 56 -206T-1 -181L28 -82Q47 -97 68 -103T116 -110Q144 -110 164 -98T199 -50L216 -7L161 123L8 500H160L255 200L281 100L312 206L403 500H542ZM286
+736H418L318 566H217L286 736Z" />
+<glyph unicode="&#xfe;" horiz-adv-x="627" d="M72 -210V719H209V367L196 380Q212 436 257 473T370 510Q430 510 477 479T552 390T580 249Q580 168 552 110T476 21T365 -10Q299 -10 256 27T196 120L209 141V-210H72ZM325 95Q380 95 411 134T443 250Q443 326 413
+365T327 405Q292 405 266 387T224 334T209 250Q209 203 223 168T263 114T325 95Z" />
+<glyph unicode="&#xff;" horiz-adv-x="546" d="M542 500L340 -31Q316 -99 287 -139T219 -197T127 -215Q88 -215 56 -206T-1 -181L28 -82Q47 -97 68 -103T116 -110Q144 -110 164 -98T199 -50L216 -7L161 123L8 500H160L255 200L281 100L312 206L403 500H542ZM177
+699Q212 699 232 681T253 629Q253 597 233 578T177 559Q143 559 123 578T103 629Q103 662 123 680T177 699ZM387 699Q423 699 443 681T463 629Q463 597 443 578T387 559Q353 559 333 578T313 629Q313 662 333 680T387 699Z" />
+<glyph unicode="&#x2013;" horiz-adv-x="681" d="M602 322V209H79V322H602Z" />
+<glyph unicode="&#x2014;" horiz-adv-x="1009" d="M929 322V209H79V322H929Z" />
+<glyph unicode="&#x2018;" horiz-adv-x="280" d="M141 388Q109 388 88 403T56 444T45 501Q45 542 61 580T107 648T173 695L233 648Q205 637 183 621T144 585T121 544L126 541Q131 544 138 546T158 549Q174 549 190 541T217 516T228 474Q228 447 216 428T184 399T141 388Z" />
+<glyph unicode="&#x2019;" horiz-adv-x="280" d="M143 694Q175 694 196 679T228 638T239 581Q239 540 223 502T177 434T111 387L51 434Q79 445 101 461T140 497T163 538L158 541Q153 538 146 536T126 533Q110 533 94 541T67 566T56 608Q56 635 68 654T100 683T143 694Z" />
+<glyph unicode="&#x201a;" horiz-adv-x="274" d="M394 153Q426 153 447 138T479 97T490 40Q490 -1 474 -39T428 -107T362 -154L302 -107Q330 -96 352 -80T391 -44T414 -3L409 0Q404 -3 397 -5T377 -8Q361 -8 345 0T318 25T307 67Q307 94 319 113T351 142T394 153Z" />
+<glyph unicode="&#x201c;" horiz-adv-x="504" d="M141 388Q109 388 88 403T56 444T45 501Q45 542 61 580T107 648T173 695L233 648Q205 637 183 621T144 585T121 544L126 541Q131 544 138 546T158 549Q174 549 190 541T217 516T228 474Q228 447 216 428T184 399T141
+388ZM365 388Q333 388 312 403T280 444T269 501Q269 542 285 580T331 648T397 695L457 648Q429 637 407 621T368 585T345 544L350 541Q355 544 362 546T382 549Q398 549 414 541T441 516T452 474Q452 447 440 428T408 399T365 388Z" />
+<glyph unicode="&#x201d;" horiz-adv-x="504" d="M143 694Q175 694 196 679T228 638T239 581Q239 540 223 502T177 434T111 387L51 434Q79 445 101 461T140 497T163 538L158 541Q153 538 146 536T126 533Q110 533 94 541T67 566T56 608Q56 635 68 654T100 683T143
+694ZM367 694Q399 694 420 679T452 638T463 581Q463 540 447 502T401 434T335 387L275 434Q303 445 325 461T364 497T387 538L382 541Q377 538 370 536T350 533Q334 533 318 541T291 566T280 608Q280 635 292 654T324 683T367 694Z" />
+<glyph unicode="&#x201e;" horiz-adv-x="495" d="M394 153Q426 153 447 138T479 97T490 40Q490 -1 474 -39T428 -107T362 -154L302 -107Q330 -96 352 -80T391 -44T414 -3L409 0Q404 -3 397 -5T377 -8Q361 -8 345 0T318 25T307 67Q307 94 319 113T351 142T394 153ZM359
+153Q391 153 412 138T444 97T455 40Q455 -1 439 -39T393 -107T327 -154L267 -107Q295 -96 317 -80T356 -44T379 -3L374 0Q369 -3 362 -5T342 -8Q326 -8 310 0T283 25T272 67Q272 94 284 113T316 142T359 153Z" />
+<glyph unicode="&#x2022;" horiz-adv-x="430" d="M215 196Q150 196 111 234T72 334Q72 398 111 435T215 473Q281 473 319 436T358 334Q358 272 320 234T215 196Z" />
+<glyph unicode="&#x2039;" horiz-adv-x="333" d="M292 461L168 265L292 69H166L41 265L166 461H292Z" />
+<glyph unicode="&#x203a;" horiz-adv-x="333" d="M41 69L165 265L41 461H167L292 265L167 69H41Z" />
+</font>
+</defs>
+</svg>
diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.ttf b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..cc006ce1bef6327c69f9f53269f6676aa5dcdb37
GIT binary patch
literal 57392
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
BO`8A!

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.woff b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.woff
new file mode 100644
index 0000000000000000000000000000000000000000..5bb719323c03b824bad947f08a5764aeb514ebc2
GIT binary patch
literal 30164
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

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.woff2 b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-600.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..142d9fc473536e7355ddac18a1a294d30a071b13
GIT binary patch
literal 24996
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

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.eot b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.eot
new file mode 100644
index 0000000000000000000000000000000000000000..02ec2e0b9ef8d41fdbb932b1aa83dbea1df63a8d
GIT binary patch
literal 28718
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
ZKAw9Fuu}afp1oN41BnMQa!RB}FrZG&Z$SV6

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.svg b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.svg
new file mode 100644
index 0000000000..94ae1d7b83
--- /dev/null
+++ b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.svg
@@ -0,0 +1,333 @@
+<?xml version="1.0" standalone="no"?>
+<!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">
+<defs >
+<font id="WorkSans" horiz-adv-x="597" ><font-face
+    font-family="Work Sans"
+    units-per-em="1000"
+    panose-1="0 0 0 0 0 0 0 0 0 0"
+    ascent="930"
+    descent="-243"
+    alphabetic="0" />
+<glyph unicode=" " horiz-adv-x="341" />
+<glyph unicode="!" horiz-adv-x="272" d="M178 660V374L166 208H106L94 374V660H178ZM136 120Q165 120 183 102T201 55Q201 26 183 8T136 -10Q107 -10 89 8T71 55Q71 84 89 102T136 120Z" />
+<glyph unicode="&quot;" horiz-adv-x="403" d="M339 690L313 443H251V690H339ZM170 690L144 443H82V690H170Z" />
+<glyph unicode="#" horiz-adv-x="639" d="M525 660L415 0H347L457 660H525ZM575 246V185H20V246H575ZM291 660L181 0H113L223 660H291ZM619 476V415H64V476H619Z" />
+<glyph unicode="$" horiz-adv-x="622" d="M317 1Q248 1 195 20T104 71T42 143L110 198Q129 162 158 134T228 90T322 74Q396 74 439 101T483 180Q483 211 463 235T386 273L236 307Q176 321 140 344T88 400T72 471Q72 523 100 566T182 635T311 661Q395 661 456 627T558
+525L493 475Q458 537 413 563T303 589Q251 589 218 575T169 536T153 482Q153 459 162 440T194 407T260 382L399 351Q491 331 527 290T564 187Q564 132 534 90T448 25T317 1ZM279 -100V760H348V-100H279Z" />
+<glyph unicode="%" horiz-adv-x="856" d="M180 0L600 660H676L256 0H180ZM199 670Q248 670 283 648T338 584T358 488Q358 433 339 392T284 329T199 306Q151 306 115 328T60 392T40 488Q40 543 59 584T115 647T199 670ZM199 607Q171 607 151 593T121 553T111 488Q111
+451 121 424T151 383T199 369Q228 369 247 383T277 424T287 488Q287 526 277 552T248 593T199 607ZM657 354Q706 354 741 332T796 268T816 172Q816 117 797 76T742 13T657 -10Q609 -10 573 12T518 76T498 172Q498 227 517 268T573 331T657 354ZM657 291Q629 291
+609 277T579 237T569 172Q569 135 579 108T609 67T657 53Q686 53 705 67T735 108T745 172Q745 210 735 236T706 277T657 291Z" />
+<glyph unicode="&amp;" horiz-adv-x="623" d="M258 -10Q192 -10 145 13T73 76T48 168Q48 200 56 228T84 283T135 332T216 375L258 396Q296 417 321 435T358 476T371 528Q371 563 350 582T291 602Q248 602 228 579T207 524Q207 505 212 488T233 444T283 375T372
+262Q429 192 466 150T529 86T577 57T627 50L607 -10Q578 -10 553 -3T497 27T424 96T318 219Q264 286 228 332T171 410T141 468T132 523Q132 559 149 593T203 648T296 670Q339 670 371 654T421 608T440 537Q440 502 429 471T386 409T292 345L258 332Q206 308 177
+286T136 237T124 175Q124 138 143 111T194 70T266 55Q321 55 359 75T429 132L442 144Q468 185 482 237T492 353L560 347Q564 283 547 221T491 109L476 88Q438 43 384 17T258 -10Z" />
+<glyph unicode="&apos;" horiz-adv-x="234" d="M170 690L144 443H82V690H170Z" />
+<glyph unicode="(" horiz-adv-x="350" d="M275 751L321 705Q255 645 216 579T160 439T143 281Q143 198 160 124T216 -16T321 -143L275 -189Q169 -97 115 21T61 281Q61 422 115 541T275 751Z" />
+<glyph unicode=")" horiz-adv-x="350" d="M75 -189L29 -143Q95 -83 134 -17T190 123T207 281Q207 364 190 438T134 578T29 705L75 751Q181 659 235 541T289 281Q289 140 235 21T75 -189Z" />
+<glyph unicode="*" horiz-adv-x="572" d="M301 506L380 422L450 324L398 286L326 383L271 484L286 495L301 506ZM271 506L286 495L301 484L246 383L174 286L122 324L192 422L271 506ZM72 598L188 562L292 513L286 495L280 477L167 499L53 537L72 598ZM319 730V609L305
+495H286H267L253 609V730H319ZM500 598L519 537L405 499L292 477L286 495L280 513L384 562L500 598Z" />
+<glyph unicode="+" horiz-adv-x="604" d="M340 564V68H265V564H340ZM545 354V279H59V354H545Z" />
+<glyph unicode="," horiz-adv-x="266" d="M133 120Q157 120 173 108T199 74T208 23Q208 -10 197 -42T161 -101T99 -146L57 -107Q84 -98 104 -82T138 -46T155 -5L151 -3Q147 -6 141 -8T123 -10Q111 -10 99 -3T77 17T68 53Q68 71 77 86T100 111T133 120Z" />
+<glyph unicode="-" horiz-adv-x="510" d="M420 303V220H90V303H420Z" />
+<glyph unicode="." horiz-adv-x="266" d="M133 120Q162 120 180 102T198 55Q198 26 180 8T133 -10Q104 -10 86 8T68 55Q68 84 86 102T133 120Z" />
+<glyph unicode="/" horiz-adv-x="437" d="M409 730L103 -70H28L334 730H409Z" />
+<glyph unicode="0" horiz-adv-x="622" d="M311 -10Q199 -10 132 77T65 330Q65 496 132 583T311 670Q424 670 490 583T557 330Q557 164 491 77T311 -10ZM311 62Q364 62 400 92T455 183T474 330Q474 417 456 477T401 567T311 598Q258 598 222 568T167 477T148 330Q148
+243 166 183T221 93T311 62Z" />
+<glyph unicode="1" horiz-adv-x="390" d="M208 0V484Q208 501 208 520T210 561Q176 528 131 504T39 468L18 541Q36 543 63 554T121 583T178 621T218 660H288V0H208Z" />
+<glyph unicode="2" horiz-adv-x="583" d="M74 0V65Q173 138 239 193T346 293T403 378T420 463Q420 522 383 558T280 595Q212 595 171 551T123 432L53 474Q62 532 90 576T167 645T283 670Q334 670 374 655T444 613T488 547T504 463Q504 401 474 342T375 217T188
+73V72Q199 73 218 73T257 74T287 75H518V0H74Z" />
+<glyph unicode="3" horiz-adv-x="583" d="M290 -10Q202 -10 135 31T43 146L123 187Q135 150 156 123T211 80T298 65Q342 65 372 81T418 124T434 188Q434 224 421 248T378 283T302 295Q291 295 278 295T251 292V372Q260 371 268 371T284 371Q357 371 388 399T419
+489Q419 541 387 568T296 595Q233 595 200 568T148 493L72 529Q88 571 120 603T197 653T298 671Q367 671 412 648T479 585T502 499Q502 463 492 435T465 385T425 352T378 335V333Q411 332 436 320T480 288T507 243T517 189Q517 131 489 86T409 16T290 -10Z" />
+<glyph unicode="4" horiz-adv-x="611" d="M366 0V173H44V232Q44 232 44 232T44 232L345 660H446V242H563V173H446V0H366ZM129 242H366V489Q366 515 367 542T370 595H368Q356 570 337 539T302 485L129 242Q129 242 129 242T129 242Z" />
+<glyph unicode="5" horiz-adv-x="582" d="M287 -10Q199 -10 146 30T63 141L141 182Q157 130 190 98T289 65Q335 65 367 82T418 130T436 206Q436 253 420 284T372 332T296 348Q264 348 237 342T187 321T149 284L79 297L118 660H489V585H186L160 377L158 368H160Q184
+393 221 408T311 423Q374 423 420 397T493 322T519 210Q519 159 502 118T454 49T381 5T287 -10Z" />
+<glyph unicode="6" horiz-adv-x="608" d="M323 670Q376 670 415 656T484 611T533 531L459 496Q444 542 411 568T318 595Q275 595 242 574T186 514T152 425T140 315Q140 313 140 309T140 297H144Q155 340 184 366T251 405T325 418Q392 418 442 392T519 318T547
+204Q547 139 519 91T441 16T320 -10Q237 -10 180 34T94 154T65 330Q65 441 99 516T191 631T323 670ZM319 341Q276 341 244 324T193 276T175 205Q175 167 194 136T245 86T319 67Q387 67 425 103T463 205Q463 247 446 277T397 324T319 341Z" />
+<glyph unicode="7" horiz-adv-x="561" d="M40 660H526V585Q443 497 391 405T314 212T290 0H208Q208 111 235 217T319 422T458 605L471 585H40V660Z" />
+<glyph unicode="8" horiz-adv-x="616" d="M308 669Q372 669 419 648T492 589T518 496Q518 445 494 407T425 348V347Q481 326 514 283T548 178Q548 120 518 78T435 13T308 -10Q236 -10 182 13T98 78T68 178Q68 239 101 282T192 347V348Q149 367 124 405T98 496Q98
+550 124 588T197 648T308 669ZM308 594Q250 594 216 566T181 488Q181 439 216 411T308 383Q365 383 400 411T435 488Q435 538 401 566T308 594ZM308 65Q357 65 392 79T446 121T465 186Q465 224 446 251T391 293T308 308Q261 308 226 294T171 252T151 186Q151 149
+170 122T224 80T308 65Z" />
+<glyph unicode="9" horiz-adv-x="617" d="M297 670Q380 670 437 627T523 507T552 330Q552 219 523 144T438 29T298 -10Q216 -10 157 28T69 139L148 181Q164 129 200 97T301 65Q353 65 387 85T442 144T470 237T479 357Q479 359 479 361T479 366H475Q463 321 433
+294T366 254T291 242Q226 242 176 267T98 339T70 448Q70 516 97 565T175 642T297 670ZM298 593Q228 593 191 555T154 447Q154 388 193 354T298 319Q341 319 373 336T424 384T442 455Q442 497 424 528T374 576T298 593Z" />
+<glyph unicode=":" horiz-adv-x="296" d="M148 510Q177 510 195 492T213 445Q213 416 195 398T148 380Q119 380 101 398T83 445Q83 474 101 492T148 510ZM148 120Q177 120 195 102T213 55Q213 26 195 8T148 -10Q119 -10 101 8T83 55Q83 84 101 102T148 120Z" />
+<glyph unicode=";" horiz-adv-x="296" d="M147 120Q171 120 187 108T213 74T222 23Q222 -10 211 -42T175 -101T113 -146L71 -107Q98 -98 118 -82T152 -46T169 -5L165 -3Q161 -6 155 -8T137 -10Q125 -10 113 -3T91 17T82 53Q82 71 91 86T114 111T147 120ZM148 510Q177
+510 195 492T213 445Q213 416 195 398T148 380Q119 380 101 398T83 445Q83 474 101 492T148 510Z" />
+<glyph unicode="&lt;" horiz-adv-x="604" d="M547 28L71 253V346L547 571V489L135 301L547 112V28Z" />
+<glyph unicode="=" horiz-adv-x="604" d="M540 441V366H64V441H540ZM540 241V166H64V241H540Z" />
+<glyph unicode="&gt;" horiz-adv-x="604" d="M57 571L533 346V253L57 28V110L469 298L57 487V571Z" />
+<glyph unicode="?" horiz-adv-x="542" d="M273 670Q337 670 386 650T464 591T492 500Q492 442 467 403T399 342T304 315V208H221V358Q288 368 329 384T389 426T408 490Q408 537 373 566T267 595Q201 595 160 559T110 459L39 500Q50 551 81 589T161 649T273 670ZM261
+120Q290 120 308 102T326 55Q326 26 308 8T261 -10Q232 -10 214 8T196 55Q196 84 214 102T261 120Z" />
+<glyph unicode="@" horiz-adv-x="958" d="M484 -195Q390 -195 313 -165T181 -80T96 52T66 223Q66 320 98 400T190 538T329 628T505 660Q599 660 672 630T795 545T872 421T898 273Q898 208 882 156T836 68T771 12T695 -8Q641 -8 616 20T594 91Q572 49 528 24T437
+-1Q385 -1 346 24T284 93T262 196Q262 252 279 300T326 385T399 442T490 463Q529 463 560 450T612 412T641 353L665 454H736L660 128Q658 118 657 110T655 93Q655 65 669 57T702 48Q738 48 769 73T819 148T839 273Q839 343 816 403T750 507T645 576T508 601Q425
+601 357 575T238 499T161 379T133 223Q133 139 159 73T234 -40T346 -111T484 -136Q569 -136 618 -115T700 -68L735 -117Q708 -138 675 -155T595 -184T484 -195ZM460 60Q502 60 537 87T592 162T613 269Q613 309 599 338T558 384T495 401Q459 401 430 386T379 342T345
+277T333 197Q333 153 348 123T391 76T460 60Z" />
+<glyph unicode="A" horiz-adv-x="660" d="M26 0L283 660H378L634 0H549L361 492L330 584H328L299 495L110 0H26ZM152 183V258H505V183H152Z" />
+<glyph unicode="B" horiz-adv-x="653" d="M108 0V660H343Q460 660 514 611T568 478Q568 428 539 388T457 336V335Q516 324 550 282T585 185Q585 101 522 51T342 0H108ZM188 75H361Q432 75 466 104T501 185Q501 238 467 266T361 295H188V75ZM188 370H344Q484 370
+484 478Q484 585 344 585H188V370Z" />
+<glyph unicode="C" horiz-adv-x="686" d="M640 169Q619 113 580 73T489 11T374 -10Q280 -10 212 31T106 149T68 330Q68 435 105 511T211 628T372 670Q436 670 486 653T571 601T628 516L549 479Q527 536 486 565T378 595Q311 595 260 564T181 473T152 330Q152 247
+179 188T256 97T374 65Q440 65 489 98T560 199L640 169Z" />
+<glyph unicode="D" horiz-adv-x="721" d="M321 660Q476 660 564 575T653 330Q653 171 565 86T321 0H108V660H321ZM329 75Q442 75 505 142T569 330Q569 450 506 517T329 585H188V75H329Z" />
+<glyph unicode="E" horiz-adv-x="638" d="M108 0V660H571V585H188V372H486V297H188V75H586V0H108Z" />
+<glyph unicode="F" horiz-adv-x="610" d="M570 585H188V372H486V297H188V0H108V660H570V585Z" />
+<glyph unicode="G" horiz-adv-x="724" d="M374 -10Q280 -10 212 31T106 149T68 330Q68 435 107 511T218 628T381 670Q479 670 540 633T640 519L567 479Q545 536 498 565T381 595Q314 595 263 564T182 473T152 330Q152 247 177 188T253 97T377 65Q418 65 453 75T515
+107T557 160T572 235V258H362V333H645V0H582L578 123L595 120Q569 58 513 24T374 -10Z" />
+<glyph unicode="H" horiz-adv-x="734" d="M626 660V0H546V660H626ZM188 660V0H108V660H188ZM583 372V297H150V372H583Z" />
+<glyph unicode="I" horiz-adv-x="296" d="M188 660V0H108V660H188Z" />
+<glyph unicode="J" horiz-adv-x="566" d="M465 660V226Q465 115 406 53T241 -10Q167 -10 119 18T53 97T47 218L121 233Q110 148 136 107T238 65Q323 65 354 111T385 246V660H465Z" />
+<glyph unicode="K" horiz-adv-x="656" d="M625 660L337 365L325 352L148 171V279L520 660H625ZM188 660V0H108V660H188ZM345 416L628 0H532L279 371L345 416Z" />
+<glyph unicode="L" horiz-adv-x="598" d="M188 75H566V0H108V660H188V75Z" />
+<glyph unicode="M" horiz-adv-x="854" d="M746 660V0H670V415L679 589H678L461 0H393L176 589H175L184 415V0H108V660H231L376 259L426 94H428L479 258L623 660H746Z" />
+<glyph unicode="N" horiz-adv-x="734" d="M626 660V0H527L251 442L181 566H180L184 466V0H108V660H207L482 220L553 93H554L550 194V660H626Z" />
+<glyph unicode="O" horiz-adv-x="748" d="M374 670Q468 670 536 629T642 511T680 330Q680 225 643 149T537 32T374 -10Q280 -10 212 31T106 149T68 330Q68 435 105 511T211 628T374 670ZM374 595Q306 595 256 564T179 473T152 330Q152 247 179 188T256 97T374
+65Q443 65 492 96T569 187T596 330Q596 413 569 472T493 563T374 595Z" />
+<glyph unicode="P" horiz-adv-x="610" d="M341 660Q408 660 457 636T535 566T563 459Q563 397 535 352T458 283T341 258H188V0H108V660H341ZM329 333Q407 333 443 365T479 459Q479 521 443 553T329 585H188V333H329Z" />
+<glyph unicode="Q" horiz-adv-x="748" d="M534 -195Q483 -195 438 -176T365 -111T336 15Q336 24 336 34T338 55L409 53Q408 43 408 35T407 18Q407 -39 425 -67T472 -104T536 -114Q573 -114 604 -104T654 -77L680 -151Q656 -172 614 -183T534 -195ZM374 670Q468
+670 536 629T642 511T680 330Q680 225 643 149T537 32T374 -10Q280 -10 212 31T106 149T68 330Q68 435 105 511T211 628T374 670ZM374 595Q306 595 256 564T179 473T152 330Q152 247 179 188T256 97T374 65Q443 65 492 96T569 187T596 330Q596 413 569 472T493
+563T374 595Z" />
+<glyph unicode="R" horiz-adv-x="665" d="M358 660Q459 660 520 608T581 467Q581 378 520 329T357 279L350 274H188V0H108V660H358ZM357 349Q428 349 462 378T497 467Q497 526 463 555T357 585H188V349H357ZM403 333L621 0H526L336 289L403 333Z" />
+<glyph unicode="S" horiz-adv-x="641" d="M320 670Q407 670 470 635T575 530L508 478Q471 542 425 568T312 595Q259 595 225 580T174 541T158 485Q158 450 180 424T268 382L411 350Q506 329 543 287T581 181Q581 125 550 82T461 14T327 -10Q255 -10 201 9T107
+62T43 136L113 193Q132 155 162 126T234 81T332 65Q383 65 420 77T478 114T498 174Q498 206 477 231T398 270L243 305Q182 319 145 343T91 401T74 474Q74 527 103 571T188 643T320 670Z" />
+<glyph unicode="T" horiz-adv-x="604" d="M572 660V585H342V0H262V585H32V660H572Z" />
+<glyph unicode="U" horiz-adv-x="708" d="M613 660V246Q613 119 546 55T354 -10Q230 -10 163 54T95 246V660H175V266Q175 163 218 114T354 65Q446 65 489 114T533 266V660H613Z" />
+<glyph unicode="V" horiz-adv-x="648" d="M620 660L370 0H279L28 660H114L282 204L324 73L366 203L534 660H620Z" />
+<glyph unicode="W" horiz-adv-x="961" d="M231 0L36 660H119L282 73L437 660H528L683 71L846 660H925L731 0H632L515 428L481 577H480L446 428L330 0H231Z" />
+<glyph unicode="X" horiz-adv-x="601" d="M569 0H477L298 272L118 0H25L256 336L45 660H139L306 403L475 660H562L348 340L569 0Z" />
+<glyph unicode="Y" horiz-adv-x="572" d="M562 660L326 258V0H246V258L10 660H105L233 434L286 340L339 434L467 660H562Z" />
+<glyph unicode="Z" horiz-adv-x="630" d="M128 46L114 75H575V0H56V71L490 614L504 585H66V660H562V589L128 46Z" />
+<glyph unicode="[" horiz-adv-x="348" d="M315 660H162V-98H315V-168H87V730H315V660Z" />
+<glyph unicode="\" horiz-adv-x="437" d="M28 730H103L409 -70H334L28 730Z" />
+<glyph unicode="]" horiz-adv-x="348" d="M33 -98H186V660H33V730H261V-168H33V-98Z" />
+<glyph unicode="^" horiz-adv-x="560" d="M27 355L242 730H318L533 355H452L280 662L108 355H27Z" />
+<glyph unicode="_" horiz-adv-x="539" d="M539 -97V-172H0V-97H539Z" />
+<glyph unicode="`" horiz-adv-x="500" d="M256 750L332 583H267L169 750H256Z" />
+<glyph unicode="a" horiz-adv-x="566" d="M385 323Q385 379 355 409T270 440Q218 440 182 418T129 345L64 385Q84 441 138 475T272 510Q326 510 370 492T439 436T465 339V97Q465 61 503 61Q522 61 540 66L536 3Q516 -7 484 -7Q455 -7 432 4T396 37T383 94V104L403
+101Q391 62 362 38T297 2T226 -10Q182 -10 144 5T84 50T61 126Q61 182 98 218T203 268L401 307V241L240 208Q191 198 167 180T143 130Q143 99 167 80T237 60Q266 60 292 67T340 90T373 129T385 185V323Z" />
+<glyph unicode="b" horiz-adv-x="627" d="M338 -10Q296 -10 260 5T198 47T159 108L170 122L163 0H93V730H173V387L163 402Q183 449 230 479T339 510Q401 510 453 479T536 390T567 250Q567 169 536 111T452 21T338 -10ZM330 60Q404 60 445 112T487 250Q487 336
+446 388T331 440Q284 440 249 416T193 349T173 248Q173 191 192 149T247 83T330 60Z" />
+<glyph unicode="c" horiz-adv-x="560" d="M300 510Q352 510 391 494T460 448T507 377L431 341Q415 389 383 414T298 440Q248 440 212 418T157 353T138 250Q138 191 157 148T212 83T298 60Q337 60 365 72T412 107T438 163L512 137Q495 91 466 58T395 8T300 -10Q230
+-10 175 21T89 110T58 250Q58 331 89 389T175 479T300 510Z" />
+<glyph unicode="d" horiz-adv-x="627" d="M288 -10Q226 -10 174 21T91 110T60 250Q60 333 93 391T180 479T296 510Q358 510 403 478T464 393L454 386V730H534V0H464L457 121L468 127Q461 83 435 53T370 6T288 -10ZM296 60Q344 60 379 84T434 152T454 257Q454 314
+435 355T381 418T300 440Q224 440 182 388T140 250Q140 164 181 112T296 60Z" />
+<glyph unicode="e" horiz-adv-x="577" d="M302 -10Q231 -10 176 21T89 110T58 250Q58 331 89 389T174 479T297 510Q367 510 416 480T492 399T518 283Q518 266 517 252T514 227H110V298H479L438 290Q438 362 399 401T295 440Q246 440 211 418T156 353T136 250Q136
+191 156 148T212 83T300 60Q355 60 389 81T445 138L508 101Q489 67 460 42T391 4T302 -10Z" />
+<glyph unicode="f" horiz-adv-x="393" d="M296 735Q322 735 345 729T381 712L360 647Q348 655 334 658T303 662Q260 662 236 642T212 576V500V474V0H132V584Q132 617 142 645T172 693T224 724T296 735ZM379 500V431H32V500H379Z" />
+<glyph unicode="g" horiz-adv-x="532" d="M514 592L532 521Q531 521 529 521T525 521Q476 521 450 502T423 439L374 464Q374 503 392 532T441 576T509 592Q510 592 511 592T514 592ZM362 64Q433 64 473 32T513 -55Q513 -104 481 -140T394 -195T271 -215Q153 -215
+95 -175T36 -79Q36 -39 62 -8T152 28L145 13Q111 22 88 43T64 106Q64 147 94 176T185 213L238 186H228Q179 181 159 162T138 119Q138 91 158 78T216 64H362ZM270 -148Q328 -148 365 -136T421 -105T439 -64Q439 -37 418 -21T340 -5H186Q154 -5 132 -21T110 -67Q110
+-104 152 -126T270 -148ZM263 510Q323 510 369 489T442 429T468 341Q468 292 442 254T370 194T263 172Q164 172 111 219T58 341Q58 391 84 429T157 488T263 510ZM263 445Q211 445 176 417T141 341Q141 295 176 266T263 237Q315 237 350 266T385 341Q385 388 350
+416T263 445Z" />
+<glyph unicode="h" horiz-adv-x="619" d="M93 0V730H173V425Q199 470 242 490T336 510Q390 510 434 490T504 427T531 320V0H451V292Q451 375 416 407T328 440Q292 440 256 423T197 368T173 265V0H93Z" />
+<glyph unicode="i" horiz-adv-x="266" d="M133 596Q106 596 90 612T73 656Q73 683 89 699T133 716Q160 716 176 700T193 656Q193 629 177 613T133 596ZM173 500V0H93V500H173Z" />
+<glyph unicode="j" horiz-adv-x="266" d="M133 596Q106 596 90 612T73 656Q73 683 89 699T133 716Q160 716 176 700T193 656Q193 629 177 613T133 596ZM173 500V-51Q173 -113 149 -149T90 -200T21 -215Q-10 -215 -36 -206T-79 -182L-62 -106Q-48 -119 -27 -128T20
+-137Q52 -137 72 -116T93 -43V500H173Z" />
+<glyph unicode="k" horiz-adv-x="567" d="M532 500L316 284L297 265L133 101V201L431 500H532ZM173 730V0H93V730H173ZM323 325L544 0H447L256 280L323 325Z" />
+<glyph unicode="l" horiz-adv-x="306" d="M169 730V127Q169 89 183 75T228 60Q248 60 261 63T296 74L283 4Q267 -3 248 -6T209 -10Q148 -10 119 23T89 124V730H169Z" />
+<glyph unicode="m" horiz-adv-x="953" d="M93 0V500H163L168 422Q195 468 238 489T328 510Q381 510 428 486T500 412Q516 446 545 467T608 499T674 510Q722 510 765 490T837 428T865 320V0H785V312Q785 380 751 410T667 440Q628 440 594 421T540 365T519 274V0H439V312Q439
+380 405 410T321 440Q288 440 254 423T196 367T173 267V0H93Z" />
+<glyph unicode="n" horiz-adv-x="619" d="M93 0V500H163L170 388L157 399Q173 439 200 463T262 499T336 510Q390 510 434 490T504 427T531 320V0H451V292Q451 375 416 407T328 440Q292 440 256 423T197 368T173 266V0H93Z" />
+<glyph unicode="o" horiz-adv-x="600" d="M300 510Q371 510 425 479T511 390T542 250Q542 169 511 111T426 21T300 -10Q230 -10 175 21T89 110T58 250Q58 331 89 389T175 479T300 510ZM300 441Q249 441 213 418T158 353T138 250Q138 191 157 148T213 82T300 59Q351
+59 387 82T442 148T462 250Q462 310 443 352T387 418T300 441Z" />
+<glyph unicode="p" horiz-adv-x="627" d="M93 -210V500H163L170 378L159 392Q172 427 198 453T261 495T341 510Q402 510 453 479T536 390T567 250Q567 169 536 111T452 21T338 -10Q276 -10 230 20T163 98L173 113V-210H93ZM330 60Q404 60 445 112T487 250Q487
+336 447 388T333 440Q285 440 249 417T193 351T173 250Q173 193 192 150T247 84T330 60Z" />
+<glyph unicode="q" horiz-adv-x="627" d="M454 -210V137L468 127Q461 83 435 53T370 6T288 -10Q226 -10 174 21T91 110T60 250Q60 333 93 391T180 479T296 510Q338 510 374 495T435 451T469 383H457L464 500H534V-210H454ZM296 60Q343 60 378 83T434 150T454 253Q454
+313 435 354T380 418T298 440Q224 440 182 388T140 250Q140 164 181 112T296 60Z" />
+<glyph unicode="r" horiz-adv-x="408" d="M93 0V500H158L169 418Q190 464 230 487T329 510Q342 510 357 508T384 500L370 427Q359 431 346 433T309 435Q278 435 247 417T194 363T173 270V0H93Z" />
+<glyph unicode="s" horiz-adv-x="527" d="M273 -10Q200 -10 139 21T44 109L112 158Q134 112 176 86T279 60Q332 60 362 80T392 134Q392 155 379 172T327 198L207 223Q134 238 103 273T71 360Q71 401 94 435T161 489T264 510Q338 510 389 481T465 399L398 355Q381
+399 343 419T264 440Q228 440 203 430T164 403T150 363Q150 341 165 323T221 296L346 270Q416 256 444 224T472 146Q472 99 447 64T377 9T273 -10Z" />
+<glyph unicode="t" horiz-adv-x="419" d="M211 642V138Q211 101 232 83T286 65Q315 65 336 75T374 102L402 35Q379 14 348 2T275 -10Q237 -10 204 3T152 46T131 124V620L211 642ZM393 500V431H31V500H393Z" />
+<glyph unicode="u" horiz-adv-x="617" d="M274 -10Q226 -10 184 8T115 66T88 172V500H168V193Q168 117 201 89T294 60Q322 60 349 69T397 99T431 152T444 228V500H524V0H454L449 76Q423 31 379 11T274 -10Z" />
+<glyph unicode="v" horiz-adv-x="520" d="M424 500H508L300 0H220L12 500H103L261 81L424 500Z" />
+<glyph unicode="w" horiz-adv-x="836" d="M720 500H809L635 0H555L414 398L281 0H201L27 500H116L242 93L378 500H458L594 93L720 500Z" />
+<glyph unicode="x" horiz-adv-x="533" d="M141 500L290 291L295 284L500 0H402L247 217L238 228L41 500H141ZM497 500L299 233H294L122 0H29L247 287H253L403 500H497Z" />
+<glyph unicode="y" horiz-adv-x="516" d="M504 500L269 -84Q250 -133 228 -161T178 -202T114 -215Q80 -215 52 -206T1 -180L23 -110Q43 -128 65 -136T110 -145Q136 -145 159 -129T201 -64L227 1L177 120L18 500H109L234 174L265 85L301 184L418 500H504Z" />
+<glyph unicode="z" horiz-adv-x="534" d="M57 0V61L319 368L382 433L293 431H60V500H471V439L209 132L147 67L244 69H479V0H57Z" />
+<glyph unicode="{" horiz-adv-x="351" d="M304 -189Q245 -189 209 -175T157 -132T140 -65V142Q140 198 115 222T28 246V316Q89 316 114 340T140 420V627Q140 667 156 694T209 736T304 751V686Q255 686 235 673T215 633V413Q215 359 186 326T101 281Q157 269 186
+236T215 149V-71Q215 -98 235 -111T304 -124V-189Z" />
+<glyph unicode="|" horiz-adv-x="243" d="M156 730V-168H87V730H156Z" />
+<glyph unicode="}" horiz-adv-x="351" d="M47 751Q106 751 142 737T194 694T211 627V420Q211 364 236 340T323 316V246Q262 246 237 222T211 142V-65Q211 -105 195 -132T142 -174T47 -189V-124Q96 -124 116 -111T136 -71V149Q136 203 165 236T250 281Q194 293
+165 326T136 413V633Q136 660 116 673T47 686V751Z" />
+<glyph unicode="~" horiz-adv-x="540" d="M497 384Q491 311 459 273T367 235Q333 235 308 246T264 272T225 298T181 309Q155 309 140 289T119 235H43Q49 309 81 346T174 384Q207 384 232 373T277 347T316 321T359 310Q385 310 400 330T421 384H497Z" />
+<glyph unicode="&#xa0;" horiz-adv-x="341" />
+<glyph unicode="&#xa1;" horiz-adv-x="264" d="M90 -160V126L102 292H162L174 126V-160H90ZM132 380Q103 380 85 398T67 445Q67 474 85 492T132 510Q161 510 179 492T197 445Q197 416 179 398T132 380Z" />
+<glyph unicode="&#xa2;" horiz-adv-x="567" d="M310 -10Q239 -10 184 21T98 110T66 250Q66 331 97 389T184 479T310 510Q362 510 401 494T469 448T515 377L439 341Q423 392 390 418T308 445Q236 445 189 394T141 250Q141 188 163 145T222 78T308 55Q345 55 372
+67T419 103T448 163L520 138Q504 92 475 59T405 8T310 -10ZM270 -100V600H337V-100H270Z" />
+<glyph unicode="&#xa3;" horiz-adv-x="620" d="M80 278V343H467V278H80ZM154 -10Q103 -10 74 14T44 76Q44 100 58 120T99 152T166 165Q206 165 235 154T289 127T335 93T381 65T436 54Q479 54 498 77T518 153H583Q583 100 567 64T521 9T447 -10Q410 -10 380 1T322
+30T269 64T217 93T163 105Q139 105 128 98T117 76Q117 60 130 52T164 44Q205 44 224 61T248 106T254 163Q254 204 240 237T197 319Q178 352 166 378T149 427T144 475Q144 535 172 579T247 646T353 670Q432 670 481 632T552 514L483 476Q469 533 440 565T351 597Q290
+597 254 566T218 475Q218 454 221 437T232 399T256 349Q284 297 300 252T316 167Q316 137 309 106T283 49T233 6T154 -10Z" />
+<glyph unicode="&#xa4;" horiz-adv-x="665" d="M333 539Q394 539 441 512T516 438T543 329Q543 268 516 221T442 146T333 118Q272 118 225 145T150 220T122 329Q122 390 149 437T224 512T333 539ZM333 467Q276 467 239 428T202 329Q202 268 239 229T333 190Q389
+190 426 229T463 329Q463 389 426 428T333 467ZM121 591L240 474L189 424L70 540L121 591ZM187 236L237 185L121 66L70 117L187 236ZM476 233L595 117L544 66L425 182L476 233ZM544 591L595 540L479 421L428 472L544 591Z" />
+<glyph unicode="&#xa5;" horiz-adv-x="620" d="M275 0V107H83V162H275V237H83V297H212L256 293L34 660H127L261 417L309 318H311L359 418L493 660H586L364 293L408 297H538V237H345V162H538V107H345V0H275Z" />
+<glyph unicode="&#xa6;" horiz-adv-x="243" d="M156 730V367H87V730H156ZM156 195V-168H87V195H156Z" />
+<glyph unicode="&#xa7;" horiz-adv-x="598" d="M417 138L368 168Q408 169 435 179T477 209T492 253Q492 282 472 305T388 340L244 365Q191 375 158 395T111 444T96 509Q96 556 122 592T197 649T309 670Q379 670 433 645T521 571L459 523Q431 565 394 583T306 601Q242
+601 207 577T171 515Q171 496 178 480T204 453T259 435L400 411Q466 400 502 380T553 333T568 272Q568 240 553 211T505 162T417 138ZM284 -110Q196 -110 141 -81T58 -8L120 43Q141 5 181 -19T289 -43Q356 -43 393 -18T430 50Q430 75 413 93T358 118L189 151Q134
+162 99 181T48 229T31 295Q31 327 47 353T91 396T160 417L195 392Q168 385 148 374T117 347T106 309Q106 280 129 256T212 220L369 192Q442 179 473 142T504 56Q504 9 478 -29T402 -88T284 -110Z" />
+<glyph unicode="&#xa8;" horiz-adv-x="500" d="M153 696Q179 696 194 681T210 639Q210 614 195 598T153 582Q128 582 112 598T96 639Q96 665 112 680T153 696ZM347 696Q373 696 388 681T404 639Q404 614 389 598T347 582Q322 582 306 598T290 639Q290 665 306
+680T347 696Z" />
+<glyph unicode="&#xa9;" horiz-adv-x="820" d="M410 -10Q308 -10 231 35T111 157T68 330Q68 427 111 503T231 625T410 670Q512 670 589 625T709 504T752 330Q752 234 709 157T589 35T410 -10ZM410 55Q491 55 552 91T647 190T681 330Q681 407 647 469T552 568T410
+605Q330 605 269 569T173 470T139 330Q139 253 173 191T268 92T410 55ZM417 143Q332 143 284 192T235 328Q235 414 283 463T417 513Q476 513 515 488T573 418L515 389Q502 421 478 437T416 453Q363 453 333 420T302 328Q302 269 332 236T416 203Q456 203 482 219T522
+270L577 248Q558 199 518 171T417 143Z" />
+<glyph unicode="&#xaa;" horiz-adv-x="382" d="M139 327Q87 327 57 351T27 416Q27 455 51 478T137 512L253 533V488L159 469Q123 462 110 452T97 421Q97 402 111 392T150 381Q170 381 191 387T227 411T242 460V545Q242 576 224 593T175 611Q144 611 118 597T76
+547L27 576Q41 614 78 639T172 665Q237 665 273 636T310 547V407Q310 389 319 383T341 376Q357 376 365 380L360 336Q352 332 342 330T321 327Q289 327 271 345T252 399V414L262 403Q253 382 236 365T194 337T139 327ZM26 201V254H346V201H26Z" />
+<glyph unicode="&#xab;" horiz-adv-x="493" d="M264 461L136 265L264 69H177L51 265L177 461H264ZM441 461L313 265L441 69H354L228 265L354 461H441Z" />
+<glyph unicode="&#xac;" horiz-adv-x="604" d="M545 319V131H465V319H545ZM545 354V279H59V354H545Z" />
+<glyph unicode="&#xad;" horiz-adv-x="510" d="M420 303V220H90V303H420Z" />
+<glyph unicode="&#xae;" horiz-adv-x="820" d="M410 -10Q308 -10 231 35T111 157T68 330Q68 427 111 503T231 625T410 670Q512 670 589 626T709 504T752 330Q752 234 709 157T589 35T410 -10ZM493 143L393 293L448 316L569 143H493ZM410 55Q491 55 552 91T647
+190T681 330Q681 407 647 469T552 568T410 605Q330 605 269 569T173 470T139 330Q139 253 173 191T268 92T410 55ZM269 143V513H421Q463 513 494 499T543 458T561 395Q561 340 522 309T421 277H336V143H269ZM336 328H420Q456 328 475 344T494 395Q494 429 475 445T420
+462H336V328Z" />
+<glyph unicode="&#xaf;" horiz-adv-x="500" d="M414 663V596H86V663H414Z" />
+<glyph unicode="&#xb0;" horiz-adv-x="460" d="M230 340Q181 340 143 361T82 420T60 505Q60 553 82 590T142 649T230 670Q280 670 318 649T378 591T400 505Q400 457 378 420T318 362T230 340ZM230 405Q274 405 302 433T330 505Q330 549 302 577T230 605Q187 605
+159 577T130 505Q130 462 158 434T230 405Z" />
+<glyph unicode="&#xb1;" horiz-adv-x="604" d="M340 640V154H265V640H340ZM545 434V359H59V434H545ZM545 75V0H59V75H545Z" />
+<glyph unicode="&#xb2;" horiz-adv-x="365" d="M39 333V381Q62 398 85 414T131 448Q179 486 206 512T243 560T254 604Q254 636 235 656T177 677Q138 677 116 653T91 584L28 606Q32 667 73 701T180 735Q229 735 261 717T310 670T327 608Q327 579 312 550T264 489T182
+423Q169 414 157 406T130 388V387Q139 388 161 389T194 390H336V333H39Z" />
+<glyph unicode="&#xb3;" horiz-adv-x="362" d="M181 735Q247 735 283 705T319 627Q319 597 307 576T276 545T240 533V532Q260 532 280 522T314 491T328 440Q328 406 309 381T256 341T178 327Q117 327 79 350T24 423L91 453Q97 419 118 402T177 385Q212 385 233
+402T255 450Q255 482 233 494T170 506Q166 506 162 506T153 505V557Q157 556 160 556T167 556Q205 556 225 571T245 616Q245 646 227 661T177 677Q146 677 127 662T101 617L36 640Q49 689 88 712T181 735Z" />
+<glyph unicode="&#xb4;" horiz-adv-x="600" d="M295 750H382L284 583H219L295 750Z" />
+<glyph unicode="&#xb5;" horiz-adv-x="622" d="M93 -210V500H173V194Q173 124 206 92T299 60Q339 60 373 77T428 134T449 237V500H529V0H464L457 81Q432 36 389 13T295 -10Q257 -10 225 2T173 41V41V-210H93Z" />
+<glyph unicode="&#xb6;" horiz-adv-x="657" d="M294 -100V191Q218 191 161 220T73 303T41 425Q41 496 75 549T171 631T315 660H566V-100H496V593H367V-100H294ZM294 258V593Q237 593 198 573T138 514T117 425Q117 373 137 336T197 278T294 258Z" />
+<glyph unicode="&#xb7;" horiz-adv-x="226" d="M113 420Q142 420 160 402T178 355Q178 326 160 308T113 290Q84 290 66 308T48 355Q48 384 66 402T113 420Z" />
+<glyph unicode="&#xb8;" horiz-adv-x="500" d="M207 4L249 29Q308 10 333 -22T358 -99Q358 -147 324 -181T237 -215Q206 -215 183 -207T142 -186L161 -128Q175 -137 190 -144T228 -151Q256 -151 274 -133T292 -81Q292 -55 273 -36T207 4Z" />
+<glyph unicode="&#xb9;" horiz-adv-x="242" d="M127 730H189V333H119V584Q119 598 119 617T121 656Q99 635 70 619T10 598V658Q28 662 51 673T96 699T127 730Z" />
+<glyph unicode="&#xba;" horiz-adv-x="360" d="M180 327Q110 327 67 372T23 496Q23 576 66 620T180 665Q250 665 293 621T337 496Q337 417 294 372T180 327ZM36 201V254H324V201H36ZM180 382Q224 382 245 412T267 496Q267 550 246 580T180 611Q136 611 115 581T93
+496Q93 442 114 412T180 382Z" />
+<glyph unicode="&#xbb;" horiz-adv-x="493" d="M229 69L357 265L229 461H316L442 265L316 69H229ZM52 69L180 265L52 461H139L265 265L139 69H52Z" />
+<glyph unicode="&#xbc;" horiz-adv-x="788" d="M127 921H189V524H119V775Q119 789 119 808T121 847Q99 826 70 810T10 789V849Q28 853 51 864T96 890T127 921ZM88 0L565 660H644L167 0H88ZM768 145V95H697V-4H638V95H439V132L621 393H697V145H768ZM507 145H638V259Q638
+278 639 297T641 335H638Q632 324 623 309T606 281L507 145Z" />
+<glyph unicode="&#xbd;" horiz-adv-x="855" d="M127 921H189V524H119V775Q119 789 119 808T121 847Q99 826 70 810T10 789V849Q28 853 51 864T96 890T127 921ZM88 0L565 660H644L167 0H88ZM529 -4V44Q552 61 575 77T621 111Q669 149 696 175T733 223T744 267Q744
+299 725 319T667 340Q628 340 606 316T581 247L518 269Q522 330 563 364T670 398Q719 398 751 380T800 333T817 271Q817 242 802 213T754 152T672 86Q659 77 647 69T620 51V50Q629 51 651 52T684 53H826V-4H529Z" />
+<glyph unicode="&#xbe;" horiz-adv-x="908" d="M181 926Q247 926 283 896T319 818Q319 788 307 767T276 736T240 724V723Q260 723 280 713T314 682T328 631Q328 597 309 572T256 532T178 518Q117 518 79 541T24 614L91 644Q97 610 118 593T177 576Q212 576 233
+593T255 641Q255 673 233 685T170 697Q166 697 162 697T153 696V748Q157 747 160 747T167 747Q205 747 225 762T245 807Q245 837 227 852T177 868Q146 868 127 853T101 808L36 831Q49 880 88 903T181 926ZM208 0L685 660H764L287 0H208ZM888 145V95H817V-4H758V95H559V132L741
+393H817V145H888ZM627 145H758V259Q758 278 759 297T761 335H758Q752 324 743 309T726 281L627 145Z" />
+<glyph unicode="&#xbf;" horiz-adv-x="537" d="M266 -170Q202 -170 153 -150T75 -91T47 0Q47 58 72 97T140 158T235 185V292H318V142Q251 132 210 116T150 74T131 10Q131 -37 166 -66T272 -95Q338 -95 379 -59T429 41L500 0Q489 -51 458 -89T378 -149T266 -170ZM278
+380Q249 380 231 398T213 445Q213 474 231 492T278 510Q307 510 325 492T343 445Q343 416 325 398T278 380Z" />
+<glyph unicode="&#xc0;" horiz-adv-x="660" d="M26 0L283 660H378L634 0H549L361 492L330 584H328L299 495L110 0H26ZM152 183V258H505V183H152ZM302 902L368 743H304L218 902H302Z" />
+<glyph unicode="&#xc1;" horiz-adv-x="660" d="M26 0L283 660H378L634 0H549L361 492L330 584H328L299 495L110 0H26ZM152 183V258H505V183H152ZM353 902H437L351 743H287L353 902Z" />
+<glyph unicode="&#xc2;" horiz-adv-x="660" d="M26 0L283 660H378L634 0H549L361 492L330 584H328L299 495L110 0H26ZM152 183V258H505V183H152ZM484 743H410L330 850L250 743H176L286 902H374L484 743Z" />
+<glyph unicode="&#xc3;" horiz-adv-x="660" d="M26 0L283 660H378L634 0H549L361 492L330 584H328L299 495L110 0H26ZM152 183V258H505V183H152ZM510 877Q507 833 494 803T457 758T398 743Q370 743 351 753T317 777T290 800T260 811Q238 811 227 793T211 742H148Q153
+808 180 842T261 876Q288 876 307 866T341 842T369 819T397 808Q420 808 431 826T447 877H510Z" />
+<glyph unicode="&#xc4;" horiz-adv-x="660" d="M26 0L283 660H378L634 0H549L361 492L330 584H328L299 495L110 0H26ZM152 183V258H505V183H152ZM233 856Q259 856 274 841T290 799Q290 774 275 758T233 742Q208 742 192 758T176 799Q176 825 192 840T233 856ZM427
+856Q453 856 468 841T484 799Q484 774 469 758T427 742Q402 742 386 758T370 799Q370 825 386 840T427 856Z" />
+<glyph unicode="&#xc5;" horiz-adv-x="660" d="M26 0L283 660H378L634 0H549L361 492L330 584H328L299 495L110 0H26ZM152 183V258H505V183H152ZM328 847Q384 847 418 815T453 729Q453 676 419 643T328 610Q272 610 237 643T202 729Q202 782 237 814T328 847ZM328
+798Q297 798 277 779T257 729Q257 699 277 680T328 660Q359 660 379 679T399 729Q399 759 379 778T328 798Z" />
+<glyph unicode="&#xc6;" horiz-adv-x="954" d="M531 75H902V0H451V213H215L92 0H6L392 660H887V585H531V372H802V297H531V75ZM259 288H451V585H431L259 288Z" />
+<glyph unicode="&#xc7;" horiz-adv-x="686" d="M640 169Q619 113 580 73T489 11T374 -10Q280 -10 212 31T106 149T68 330Q68 435 105 511T211 628T372 670Q436 670 486 653T571 601T628 516L549 479Q527 536 486 565T378 595Q311 595 260 564T181 473T152 330Q152
+247 179 188T256 97T374 65Q440 65 489 98T560 199L640 169ZM317 4L359 29Q418 10 443 -22T468 -99Q468 -147 434 -181T347 -215Q316 -215 293 -207T252 -186L271 -128Q285 -137 300 -144T338 -151Q366 -151 384 -133T402 -81Q402 -55 383 -36T317 4Z" />
+<glyph unicode="&#xc8;" horiz-adv-x="638" d="M108 0V660H571V585H188V372H486V297H188V75H586V0H108ZM317 902L383 743H319L233 902H317Z" />
+<glyph unicode="&#xc9;" horiz-adv-x="638" d="M108 0V660H571V585H188V372H486V297H188V75H586V0H108ZM363 902H447L361 743H297L363 902Z" />
+<glyph unicode="&#xca;" horiz-adv-x="638" d="M108 0V660H571V585H188V372H486V297H188V75H586V0H108ZM494 743H420L340 850L260 743H186L296 902H384L494 743Z" />
+<glyph unicode="&#xcb;" horiz-adv-x="638" d="M108 0V660H571V585H188V372H486V297H188V75H586V0H108ZM243 856Q269 856 284 841T300 799Q300 774 285 758T243 742Q218 742 202 758T186 799Q186 825 202 840T243 856ZM437 856Q463 856 478 841T494 799Q494 774
+479 758T437 742Q412 742 396 758T380 799Q380 825 396 840T437 856Z" />
+<glyph unicode="&#xcc;" horiz-adv-x="296" d="M188 660V0H108V660H188ZM115 902L181 743H117L31 902H115Z" />
+<glyph unicode="&#xcd;" horiz-adv-x="296" d="M188 660V0H108V660H188ZM181 902H265L179 743H115L181 902Z" />
+<glyph unicode="&#xce;" horiz-adv-x="296" d="M188 660V0H108V660H188ZM302 743H228L148 850L68 743H-6L104 902H192L302 743Z" />
+<glyph unicode="&#xcf;" horiz-adv-x="296" d="M62 856Q88 856 103 841T119 799Q119 774 104 758T62 742Q37 742 21 758T5 799Q5 825 21 840T62 856ZM234 856Q260 856 275 841T291 799Q291 774 276 758T234 742Q209 742 193 758T177 799Q177 825 193 840T234 856ZM188
+660V0H108V660H188Z" />
+<glyph unicode="&#xd0;" horiz-adv-x="737" d="M26 296V371H401V296H26ZM337 660Q492 660 580 575T669 330Q669 171 581 86T337 0H124V660H337ZM345 75Q458 75 521 142T585 330Q585 450 522 517T345 585H204V75H345Z" />
+<glyph unicode="&#xd1;" horiz-adv-x="734" d="M626 660V0H527L251 442L181 566H180L184 466V0H108V660H207L482 220L553 93H554L550 194V660H626ZM551 877Q548 833 535 803T498 758T439 743Q411 743 392 753T358 777T331 800T301 811Q279 811 268 793T252 742H189Q194
+808 221 842T302 876Q329 876 348 866T382 842T410 819T438 808Q461 808 472 826T488 877H551Z" />
+<glyph unicode="&#xd2;" horiz-adv-x="748" d="M374 670Q468 670 536 629T642 511T680 330Q680 225 643 149T537 32T374 -10Q280 -10 212 31T106 149T68 330Q68 435 105 511T211 628T374 670ZM374 595Q306 595 256 564T179 473T152 330Q152 247 179 188T256 97T374
+65Q443 65 492 96T569 187T596 330Q596 413 569 472T493 563T374 595ZM341 902L407 743H343L257 902H341Z" />
+<glyph unicode="&#xd3;" horiz-adv-x="748" d="M374 670Q468 670 536 629T642 511T680 330Q680 225 643 149T537 32T374 -10Q280 -10 212 31T106 149T68 330Q68 435 105 511T211 628T374 670ZM374 595Q306 595 256 564T179 473T152 330Q152 247 179 188T256 97T374
+65Q443 65 492 96T569 187T596 330Q596 413 569 472T493 563T374 595ZM397 902H481L395 743H331L397 902Z" />
+<glyph unicode="&#xd4;" horiz-adv-x="748" d="M374 670Q468 670 536 629T642 511T680 330Q680 225 643 149T537 32T374 -10Q280 -10 212 31T106 149T68 330Q68 435 105 511T211 628T374 670ZM374 595Q306 595 256 564T179 473T152 330Q152 247 179 188T256 97T374
+65Q443 65 492 96T569 187T596 330Q596 413 569 472T493 563T374 595ZM528 743H454L374 850L294 743H220L330 902H418L528 743Z" />
+<glyph unicode="&#xd5;" horiz-adv-x="748" d="M374 670Q468 670 536 629T642 511T680 330Q680 225 643 149T537 32T374 -10Q280 -10 212 31T106 149T68 330Q68 435 105 511T211 628T374 670ZM374 595Q306 595 256 564T179 473T152 330Q152 247 179 188T256 97T374
+65Q443 65 492 96T569 187T596 330Q596 413 569 472T493 563T374 595ZM554 877Q551 833 538 803T501 758T442 743Q414 743 395 753T361 777T334 800T304 811Q282 811 271 793T255 742H192Q197 808 224 842T305 876Q332 876 351 866T385 842T413 819T441 808Q464
+808 475 826T491 877H554Z" />
+<glyph unicode="&#xd6;" horiz-adv-x="748" d="M374 670Q468 670 536 629T642 511T680 330Q680 225 643 149T537 32T374 -10Q280 -10 212 31T106 149T68 330Q68 435 105 511T211 628T374 670ZM374 595Q306 595 256 564T179 473T152 330Q152 247 179 188T256 97T374
+65Q443 65 492 96T569 187T596 330Q596 413 569 472T493 563T374 595ZM277 856Q303 856 318 841T334 799Q334 774 319 758T277 742Q252 742 236 758T220 799Q220 825 236 840T277 856ZM471 856Q497 856 512 841T528 799Q528 774 513 758T471 742Q446 742 430 758T414
+799Q414 825 430 840T471 856Z" />
+<glyph unicode="&#xd7;" horiz-adv-x="604" d="M469 97L522 150L134 538L81 485L469 97ZM134 97L522 485L469 538L81 150L134 97Z" />
+<glyph unicode="&#xd8;" horiz-adv-x="748" d="M229 63L183 100L518 580L564 544L229 63ZM88 -37L183 100L229 63L159 -37H88ZM564 544L518 580L590 683H661L564 544ZM374 670Q468 670 536 629T642 511T680 330Q680 225 643 149T537 32T374 -10Q280 -10 212 31T106
+149T68 330Q68 435 105 511T211 628T374 670ZM374 595Q306 595 256 564T179 473T152 330Q152 247 179 188T256 97T374 65Q443 65 492 96T569 187T596 330Q596 413 569 472T493 563T374 595Z" />
+<glyph unicode="&#xd9;" horiz-adv-x="708" d="M613 660V246Q613 119 546 55T354 -10Q230 -10 163 54T95 246V660H175V266Q175 163 218 114T354 65Q446 65 489 114T533 266V660H613ZM331 877L397 718H333L247 877H331Z" />
+<glyph unicode="&#xda;" horiz-adv-x="708" d="M613 660V246Q613 119 546 55T354 -10Q230 -10 163 54T95 246V660H175V266Q175 163 218 114T354 65Q446 65 489 114T533 266V660H613ZM377 877H461L375 718H311L377 877Z" />
+<glyph unicode="&#xdb;" horiz-adv-x="708" d="M613 660V246Q613 119 546 55T354 -10Q230 -10 163 54T95 246V660H175V266Q175 163 218 114T354 65Q446 65 489 114T533 266V660H613ZM508 718H434L354 825L274 718H200L310 877H398L508 718Z" />
+<glyph unicode="&#xdc;" horiz-adv-x="708" d="M613 660V246Q613 119 546 55T354 -10Q230 -10 163 54T95 246V660H175V266Q175 163 218 114T354 65Q446 65 489 114T533 266V660H613ZM257 831Q283 831 298 816T314 774Q314 749 299 733T257 717Q232 717 216 733T200
+774Q200 800 216 815T257 831ZM451 831Q477 831 492 816T508 774Q508 749 493 733T451 717Q426 717 410 733T394 774Q394 800 410 815T451 831Z" />
+<glyph unicode="&#xdd;" horiz-adv-x="572" d="M562 660L326 258V0H246V258L10 660H105L233 434L286 340L339 434L467 660H562ZM309 882H393L307 723H243L309 882Z" />
+<glyph unicode="&#xde;" horiz-adv-x="627" d="M327 542Q450 542 511 489T573 337Q573 239 512 186T327 132H148V207H335Q489 207 489 337Q489 403 451 435T335 467H148V542H327ZM188 660V0H108V660H188Z" />
+<glyph unicode="&#xdf;" horiz-adv-x="617" d="M383 387Q448 387 486 360T542 291T560 204Q560 146 539 98T474 20T363 -10Q315 -10 282 1T234 23L257 91Q275 80 298 72T361 63Q418 63 450 103T483 206Q483 276 445 312T329 349H270V420H319Q384 420 418 457T452
+546Q452 605 415 632T320 660Q236 660 205 613T173 473V0H93V497Q93 566 114 619T187 704T328 735Q398 735 443 710T511 646T534 562Q534 523 518 485T468 420T383 389V387Z" />
+<glyph unicode="&#xe0;" horiz-adv-x="566" d="M385 323Q385 379 355 409T270 440Q218 440 182 418T129 345L64 385Q84 441 138 475T272 510Q326 510 370 492T439 436T465 339V97Q465 61 503 61Q522 61 540 66L536 3Q516 -7 484 -7Q455 -7 432 4T396 37T383 94V104L403
+101Q391 62 362 38T297 2T226 -10Q182 -10 144 5T84 50T61 126Q61 182 98 218T203 268L401 307V241L240 208Q191 198 167 180T143 130Q143 99 167 80T237 60Q266 60 292 67T340 90T373 129T385 185V323ZM242 750L318 583H253L155 750H242Z" />
+<glyph unicode="&#xe1;" horiz-adv-x="566" d="M385 323Q385 379 355 409T270 440Q218 440 182 418T129 345L64 385Q84 441 138 475T272 510Q326 510 370 492T439 436T465 339V97Q465 61 503 61Q522 61 540 66L536 3Q516 -7 484 -7Q455 -7 432 4T396 37T383 94V104L403
+101Q391 62 362 38T297 2T226 -10Q182 -10 144 5T84 50T61 126Q61 182 98 218T203 268L401 307V241L240 208Q191 198 167 180T143 130Q143 99 167 80T237 60Q266 60 292 67T340 90T373 129T385 185V323ZM303 750H390L292 583H227L303 750Z" />
+<glyph unicode="&#xe2;" horiz-adv-x="566" d="M385 323Q385 379 355 409T270 440Q218 440 182 418T129 345L64 385Q84 441 138 475T272 510Q326 510 370 492T439 436T465 339V97Q465 61 503 61Q522 61 540 66L536 3Q516 -7 484 -7Q455 -7 432 4T396 37T383 94V104L403
+101Q391 62 362 38T297 2T226 -10Q182 -10 144 5T84 50T61 126Q61 182 98 218T203 268L401 307V241L240 208Q191 198 167 180T143 130Q143 99 167 80T237 60Q266 60 292 67T340 90T373 129T385 185V323ZM435 576H362L276 691L190 576H117L231 743H321L435 576Z"
+/>
+<glyph unicode="&#xe3;" horiz-adv-x="566" d="M385 323Q385 379 355 409T270 440Q218 440 182 418T129 345L64 385Q84 441 138 475T272 510Q326 510 370 492T439 436T465 339V97Q465 61 503 61Q522 61 540 66L536 3Q516 -7 484 -7Q455 -7 432 4T396 37T383 94V104L403
+101Q391 62 362 38T297 2T226 -10Q182 -10 144 5T84 50T61 126Q61 182 98 218T203 268L401 307V241L240 208Q191 198 167 180T143 130Q143 99 167 80T237 60Q266 60 292 67T340 90T373 129T385 185V323ZM456 717Q453 673 440 643T403 598T344 583Q316 583 297 593T263
+617T236 640T206 651Q184 651 173 633T157 582H94Q99 648 126 682T207 716Q234 716 253 706T287 682T315 659T343 648Q366 648 377 666T393 717H456Z" />
+<glyph unicode="&#xe4;" horiz-adv-x="566" d="M385 323Q385 379 355 409T270 440Q218 440 182 418T129 345L64 385Q84 441 138 475T272 510Q326 510 370 492T439 436T465 339V97Q465 61 503 61Q522 61 540 66L536 3Q516 -7 484 -7Q455 -7 432 4T396 37T383 94V104L403
+101Q391 62 362 38T297 2T226 -10Q182 -10 144 5T84 50T61 126Q61 182 98 218T203 268L401 307V241L240 208Q191 198 167 180T143 130Q143 99 167 80T237 60Q266 60 292 67T340 90T373 129T385 185V323ZM179 696Q205 696 220 681T236 639Q236 614 221 598T179 582Q154
+582 138 598T122 639Q122 665 138 680T179 696ZM373 696Q399 696 414 681T430 639Q430 614 415 598T373 582Q348 582 332 598T316 639Q316 665 332 680T373 696Z" />
+<glyph unicode="&#xe5;" horiz-adv-x="566" d="M385 323Q385 379 355 409T270 440Q218 440 182 418T129 345L64 385Q84 441 138 475T272 510Q326 510 370 492T439 436T465 339V97Q465 61 503 61Q522 61 540 66L536 3Q516 -7 484 -7Q455 -7 432 4T396 37T383 94V104L403
+101Q391 62 362 38T297 2T226 -10Q182 -10 144 5T84 50T61 126Q61 182 98 218T203 268L401 307V241L240 208Q191 198 167 180T143 130Q143 99 167 80T237 60Q266 60 292 67T340 90T373 129T385 185V323ZM273 812Q329 812 363 780T398 694Q398 641 364 608T273 575Q217
+575 182 608T147 694Q147 747 182 779T273 812ZM273 763Q242 763 222 744T202 694Q202 664 222 645T273 625Q304 625 324 644T344 694Q344 724 324 743T273 763Z" />
+<glyph unicode="&#xe6;" horiz-adv-x="895" d="M230 -10Q184 -10 146 5T84 50T61 126Q61 182 97 218T199 267L385 304V323Q385 379 353 409T269 440Q222 440 186 418T129 345L64 385Q80 423 108 451T177 494T267 510Q333 510 382 483T449 394L425 397Q444 433
+473 458T541 496T622 510Q689 510 736 480T810 399T836 283Q836 266 835 252T832 227H466V227Q471 148 515 104T625 60Q675 60 708 81T763 138L826 101Q807 67 778 42T710 4T627 -10Q552 -10 496 25T413 130L438 137Q434 103 415 76T366 30T301 0T230 -10ZM237
+60Q266 60 292 67T340 90T373 129T385 185V237L240 208Q191 198 167 180T143 130Q143 99 167 80T237 60ZM469 298H756Q755 344 737 375T689 423T620 440Q559 440 520 403T469 298Z" />
+<glyph unicode="&#xe7;" horiz-adv-x="560" d="M300 510Q352 510 391 494T460 448T507 377L431 341Q415 389 383 414T298 440Q248 440 212 418T157 353T138 250Q138 191 157 148T212 83T298 60Q337 60 365 72T412 107T438 163L512 137Q495 91 466 58T395 8T300
+-10Q230 -10 175 21T89 110T58 250Q58 331 89 389T175 479T300 510ZM244 4L286 29Q345 10 370 -22T395 -99Q395 -147 361 -181T274 -215Q243 -215 220 -207T179 -186L198 -128Q212 -137 227 -144T265 -151Q293 -151 311 -133T329 -81Q329 -55 310 -36T244 4Z" />
+<glyph unicode="&#xe8;" horiz-adv-x="577" d="M302 -10Q231 -10 176 21T89 110T58 250Q58 331 89 389T174 479T297 510Q367 510 416 480T492 399T518 283Q518 266 517 252T514 227H110V298H479L438 290Q438 362 399 401T295 440Q246 440 211 418T156 353T136
+250Q136 191 156 148T212 83T300 60Q355 60 389 81T445 138L508 101Q489 67 460 42T391 4T302 -10ZM257 750L333 583H268L170 750H257Z" />
+<glyph unicode="&#xe9;" horiz-adv-x="577" d="M302 -10Q231 -10 176 21T89 110T58 250Q58 331 89 389T174 479T297 510Q367 510 416 480T492 399T518 283Q518 266 517 252T514 227H110V298H479L438 290Q438 362 399 401T295 440Q246 440 211 418T156 353T136
+250Q136 191 156 148T212 83T300 60Q355 60 389 81T445 138L508 101Q489 67 460 42T391 4T302 -10ZM318 750H405L307 583H242L318 750Z" />
+<glyph unicode="&#xea;" horiz-adv-x="577" d="M302 -10Q231 -10 176 21T89 110T58 250Q58 331 89 389T174 479T297 510Q367 510 416 480T492 399T518 283Q518 266 517 252T514 227H110V298H479L438 290Q438 362 399 401T295 440Q246 440 211 418T156 353T136
+250Q136 191 156 148T212 83T300 60Q355 60 389 81T445 138L508 101Q489 67 460 42T391 4T302 -10ZM450 576H377L291 691L205 576H132L246 743H336L450 576Z" />
+<glyph unicode="&#xeb;" horiz-adv-x="577" d="M302 -10Q231 -10 176 21T89 110T58 250Q58 331 89 389T174 479T297 510Q367 510 416 480T492 399T518 283Q518 266 517 252T514 227H110V298H479L438 290Q438 362 399 401T295 440Q246 440 211 418T156 353T136
+250Q136 191 156 148T212 83T300 60Q355 60 389 81T445 138L508 101Q489 67 460 42T391 4T302 -10ZM194 696Q220 696 235 681T251 639Q251 614 236 598T194 582Q169 582 153 598T137 639Q137 665 153 680T194 696ZM388 696Q414 696 429 681T445 639Q445 614 430
+598T388 582Q363 582 347 598T331 639Q331 665 347 680T388 696Z" />
+<glyph unicode="&#xec;" horiz-adv-x="266" d="M173 500V0H93V500H173ZM99 750L175 583H110L12 750H99Z" />
+<glyph unicode="&#xed;" horiz-adv-x="266" d="M173 500V0H93V500H173ZM160 750H247L149 583H84L160 750Z" />
+<glyph unicode="&#xee;" horiz-adv-x="266" d="M173 500V0H93V500H173ZM292 576H219L133 691L47 576H-26L88 743H178L292 576Z" />
+<glyph unicode="&#xef;" horiz-adv-x="266" d="M213 582Q187 582 171 598T155 639Q155 665 171 680T213 696Q239 696 254 681T270 639Q270 614 255 598T213 582ZM53 582Q28 582 12 598T-4 639Q-4 665 12 680T53 696Q79 696 95 681T111 639Q111 614 95 598T53 582ZM173
+500V0H93V500H173Z" />
+<glyph unicode="&#xf0;" horiz-adv-x="620" d="M298 -10Q226 -10 173 19T91 105T62 238Q62 315 93 370T177 455T296 485Q358 485 402 464T473 405L465 398Q453 453 432 500T380 587T306 663T205 730H316Q375 696 418 651T489 551T532 430T546 288Q546 201 519
+134T438 28T298 -10ZM302 60Q355 60 392 85T448 150T468 238Q468 293 449 332T393 393T307 415Q257 415 221 394T165 333T145 238Q145 154 187 107T302 60ZM207 533L192 594L392 638L428 590L207 533ZM428 590L392 638L535 678L552 619L428 590Z" />
+<glyph unicode="&#xf1;" horiz-adv-x="619" d="M93 0V500H163L170 388L157 399Q173 439 200 463T262 499T336 510Q390 510 434 490T504 427T531 320V0H451V292Q451 375 416 407T328 440Q292 440 256 423T197 368T173 266V0H93ZM498 717Q495 673 482 643T445 598T386
+583Q358 583 339 593T305 617T278 640T248 651Q226 651 215 633T199 582H136Q141 648 168 682T249 716Q276 716 295 706T329 682T357 659T385 648Q408 648 419 666T435 717H498Z" />
+<glyph unicode="&#xf2;" horiz-adv-x="600" d="M300 510Q371 510 425 479T511 390T542 250Q542 169 511 111T426 21T300 -10Q230 -10 175 21T89 110T58 250Q58 331 89 389T175 479T300 510ZM300 441Q249 441 213 418T158 353T138 250Q138 191 157 148T213 82T300
+59Q351 59 387 82T442 148T462 250Q462 310 443 352T387 418T300 441ZM266 750L342 583H277L179 750H266Z" />
+<glyph unicode="&#xf3;" horiz-adv-x="600" d="M300 510Q371 510 425 479T511 390T542 250Q542 169 511 111T426 21T300 -10Q230 -10 175 21T89 110T58 250Q58 331 89 389T175 479T300 510ZM300 441Q249 441 213 418T158 353T138 250Q138 191 157 148T213 82T300
+59Q351 59 387 82T442 148T462 250Q462 310 443 352T387 418T300 441ZM327 750H414L316 583H251L327 750Z" />
+<glyph unicode="&#xf4;" horiz-adv-x="600" d="M300 510Q371 510 425 479T511 390T542 250Q542 169 511 111T426 21T300 -10Q230 -10 175 21T89 110T58 250Q58 331 89 389T175 479T300 510ZM300 441Q249 441 213 418T158 353T138 250Q138 191 157 148T213 82T300
+59Q351 59 387 82T442 148T462 250Q462 310 443 352T387 418T300 441ZM459 576H386L300 691L214 576H141L255 743H345L459 576Z" />
+<glyph unicode="&#xf5;" horiz-adv-x="600" d="M300 510Q371 510 425 479T511 390T542 250Q542 169 511 111T426 21T300 -10Q230 -10 175 21T89 110T58 250Q58 331 89 389T175 479T300 510ZM300 441Q249 441 213 418T158 353T138 250Q138 191 157 148T213 82T300
+59Q351 59 387 82T442 148T462 250Q462 310 443 352T387 418T300 441ZM480 717Q477 673 464 643T427 598T368 583Q340 583 321 593T287 617T260 640T230 651Q208 651 197 633T181 582H118Q123 648 150 682T231 716Q258 716 277 706T311 682T339 659T367 648Q390
+648 401 666T417 717H480Z" />
+<glyph unicode="&#xf6;" horiz-adv-x="600" d="M300 510Q371 510 425 479T511 390T542 250Q542 169 511 111T426 21T300 -10Q230 -10 175 21T89 110T58 250Q58 331 89 389T175 479T300 510ZM300 441Q249 441 213 418T158 353T138 250Q138 191 157 148T213 82T300
+59Q351 59 387 82T442 148T462 250Q462 310 443 352T387 418T300 441ZM203 696Q229 696 244 681T260 639Q260 614 245 598T203 582Q178 582 162 598T146 639Q146 665 162 680T203 696ZM397 696Q423 696 438 681T454 639Q454 614 439 598T397 582Q372 582 356 598T340
+639Q340 665 356 680T397 696Z" />
+<glyph unicode="&#xf7;" horiz-adv-x="604" d="M545 354V279H59V354H545ZM302 185Q331 185 349 167T367 120Q367 91 349 73T302 55Q273 55 255 73T237 120Q237 149 255 167T302 185ZM302 576Q331 576 349 558T367 511Q367 482 349 464T302 446Q273 446 255 464T237
+511Q237 540 255 558T302 576Z" />
+<glyph unicode="&#xf8;" horiz-adv-x="600" d="M300 510Q371 510 425 479T511 390T542 250Q542 169 511 111T426 21T300 -10Q230 -10 175 21T89 110T58 250Q58 331 89 389T175 479T300 510ZM300 441Q249 441 213 418T158 353T138 250Q138 191 157 148T213 82T300
+59Q351 59 387 82T442 148T462 250Q462 310 443 352T387 418T300 441ZM311 -30L734 530H801L378 -30H311Z" />
+<glyph unicode="&#xf9;" horiz-adv-x="617" d="M274 -10Q226 -10 184 8T115 66T88 172V500H168V193Q168 117 201 89T294 60Q322 60 349 69T397 99T431 152T444 228V500H524V0H454L449 76Q423 31 379 11T274 -10ZM272 740L348 573H283L185 740H272Z" />
+<glyph unicode="&#xfa;" horiz-adv-x="617" d="M274 -10Q226 -10 184 8T115 66T88 172V500H168V193Q168 117 201 89T294 60Q322 60 349 69T397 99T431 152T444 228V500H524V0H454L449 76Q423 31 379 11T274 -10ZM333 740H420L322 573H257L333 740Z" />
+<glyph unicode="&#xfb;" horiz-adv-x="617" d="M274 -10Q226 -10 184 8T115 66T88 172V500H168V193Q168 117 201 89T294 60Q322 60 349 69T397 99T431 152T444 228V500H524V0H454L449 76Q423 31 379 11T274 -10ZM465 566H392L306 681L220 566H147L261 733H351L465 566Z" />
+<glyph unicode="&#xfc;" horiz-adv-x="617" d="M274 -10Q226 -10 184 8T115 66T88 172V500H168V193Q168 117 201 89T294 60Q322 60 349 69T397 99T431 152T444 228V500H524V0H454L449 76Q423 31 379 11T274 -10ZM209 686Q235 686 250 671T266 629Q266 604 251
+588T209 572Q184 572 168 588T152 629Q152 655 168 670T209 686ZM403 686Q429 686 444 671T460 629Q460 604 445 588T403 572Q378 572 362 588T346 629Q346 655 362 670T403 686Z" />
+<glyph unicode="&#xfd;" horiz-adv-x="516" d="M504 500L269 -84Q250 -133 228 -161T178 -202T114 -215Q80 -215 52 -206T1 -180L23 -110Q43 -128 65 -136T110 -145Q136 -145 159 -129T201 -64L227 1L177 120L18 500H109L234 174L265 85L301 184L418 500H504ZM286
+740H373L275 573H210L286 740Z" />
+<glyph unicode="&#xfe;" horiz-adv-x="627" d="M93 -210V730H173V378L163 402Q183 449 230 479T339 510Q401 510 453 479T536 390T567 250Q567 169 536 111T452 21T338 -10Q276 -10 230 20T163 98L173 113V-210H93ZM330 60Q404 60 445 112T487 250Q487 336 447
+388T333 440Q285 440 249 417T193 351T173 250Q173 193 192 150T247 84T330 60Z" />
+<glyph unicode="&#xff;" horiz-adv-x="516" d="M504 500L269 -84Q250 -133 228 -161T178 -202T114 -215Q80 -215 52 -206T1 -180L23 -110Q43 -128 65 -136T110 -145Q136 -145 159 -129T201 -64L227 1L177 120L18 500H109L234 174L265 85L301 184L418 500H504ZM162
+686Q188 686 203 671T219 629Q219 604 204 588T162 572Q137 572 121 588T105 629Q105 655 121 670T162 686ZM356 686Q382 686 397 671T413 629Q413 604 398 588T356 572Q331 572 315 588T299 629Q299 655 315 670T356 686Z" />
+<glyph unicode="&#x2013;" horiz-adv-x="664" d="M582 299V224H82V299H582Z" />
+<glyph unicode="&#x2014;" horiz-adv-x="1014" d="M932 299V224H82V299H932Z" />
+<glyph unicode="&#x2018;" horiz-adv-x="255" d="M128 434Q104 434 88 446T62 480T53 531Q53 564 64 596T100 655T162 700L204 661Q177 652 157 636T123 600T106 559L110 557Q114 560 120 562T138 564Q150 564 162 557T184 537T193 501Q193 483 184 468T161 443T128 434Z" />
+<glyph unicode="&#x2019;" horiz-adv-x="255" d="M131 700Q155 700 171 688T197 654T206 603Q206 570 195 538T159 479T97 434L55 473Q82 482 102 498T136 534T153 575L149 577Q145 574 139 572T121 570Q109 570 97 577T75 597T66 633Q66 651 75 666T98 691T131 700Z" />
+<glyph unicode="&#x201a;" horiz-adv-x="255" d="M387 120Q411 120 427 108T453 74T462 23Q462 -10 451 -42T415 -101T353 -146L311 -107Q338 -98 358 -82T392 -46T409 -5L405 -3Q401 -6 395 -8T377 -10Q365 -10 353 -3T331 17T322 53Q322 71 331 86T354 111T387 120Z" />
+<glyph unicode="&#x201c;" horiz-adv-x="443" d="M128 434Q104 434 88 446T62 480T53 531Q53 564 64 596T100 655T162 700L204 661Q177 652 157 636T123 600T106 559L110 557Q114 560 120 562T138 564Q150 564 162 557T184 537T193 501Q193 483 184 468T161 443T128
+434ZM316 434Q292 434 276 446T250 480T241 531Q241 564 252 596T288 655T350 700L392 661Q365 652 345 636T311 600T294 559L298 557Q302 560 308 562T326 564Q338 564 350 557T372 537T381 501Q381 483 372 468T349 443T316 434Z" />
+<glyph unicode="&#x201d;" horiz-adv-x="443" d="M131 700Q155 700 171 688T197 654T206 603Q206 570 195 538T159 479T97 434L55 473Q82 482 102 498T136 534T153 575L149 577Q145 574 139 572T121 570Q109 570 97 577T75 597T66 633Q66 651 75 666T98 691T131
+700ZM319 700Q343 700 359 688T385 654T394 603Q394 570 383 538T347 479T285 434L243 473Q270 482 290 498T324 534T341 575L337 577Q333 574 327 572T309 570Q297 570 285 577T263 597T254 633Q254 651 263 666T286 691T319 700Z" />
+<glyph unicode="&#x201e;" horiz-adv-x="443" d="M387 120Q411 120 427 108T453 74T462 23Q462 -10 451 -42T415 -101T353 -146L311 -107Q338 -98 358 -82T392 -46T409 -5L405 -3Q401 -6 395 -8T377 -10Q365 -10 353 -3T331 17T322 53Q322 71 331 86T354 111T387
+120ZM319 120Q343 120 359 108T385 74T394 23Q394 -10 383 -42T347 -101T285 -146L243 -107Q270 -98 290 -82T324 -46T341 -5L337 -3Q333 -6 327 -8T309 -10Q297 -10 285 -3T263 17T254 53Q254 71 263 86T286 111T319 120Z" />
+<glyph unicode="&#x2022;" horiz-adv-x="430" d="M215 216Q161 216 126 250T90 337Q90 390 125 424T215 458Q270 458 305 424T340 337Q340 285 305 251T215 216Z" />
+<glyph unicode="&#x2039;" horiz-adv-x="316" d="M264 461L136 265L264 69H177L51 265L177 461H264Z" />
+<glyph unicode="&#x203a;" horiz-adv-x="316" d="M52 69L180 265L52 461H139L265 265L139 69H52Z" />
+</font>
+</defs>
+</svg>
diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.ttf b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..2326e9018ca9e28c6660850e1e2a97dd890e789e
GIT binary patch
literal 57280
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

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.woff b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.woff
new file mode 100644
index 0000000000000000000000000000000000000000..5de8ad6b03dd96b2e624a1f37bca3d7413771453
GIT binary patch
literal 29400
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
Z7OpFYpI!(<Z_1I1p&>W+nl*L+001{5b@%`P

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.woff2 b/src/frontend/packages/suse-theme/assets/fonts/work-sans/work-sans-v8-latin-regular.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..f63457d797c1038e29eacef0ddb0afe9947f24dc
GIT binary patch
literal 24212
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

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/loader/loading.css b/src/frontend/packages/suse-theme/loader/loading.css
index 034324c227..8d22c162f3 100644
--- a/src/frontend/packages/suse-theme/loader/loading.css
+++ b/src/frontend/packages/suse-theme/loader/loading.css
@@ -1,6 +1,6 @@
 .stratos-initial-load-spinner-container {
   align-items: center;
-  background-color: #0D2C40;
+  background-color: #f2f2f2;
   display: flex;
   justify-content: center;
   height: 100%;
@@ -16,9 +16,9 @@
 .stratos-initial-load-spinner {
   animation: stratos-initial-load-animate 1s infinite linear;
   box-sizing: border-box;
-  border: 5px solid rgba(86, 107, 121,0.45);
+  border: 5px solid rgba(12, 50, 44, 0.45);
   border-radius: 50%;
-  border-top-color: #00B2E2;
+  border-top-color: #30BA78;
   display: inline-block;
   height: 128px;
   margin: 0 auto;
diff --git a/src/frontend/packages/suse-theme/package.json b/src/frontend/packages/suse-theme/package.json
index 76385dc742..3ccb7df39c 100644
--- a/src/frontend/packages/suse-theme/package.json
+++ b/src/frontend/packages/suse-theme/package.json
@@ -1,17 +1,19 @@
 {
-  "name": "@suse/theme",
-  "version": "0.0.1",
+  "name": "@susestratos/theme",
+  "version": "0.0.0",
   "stratos": {
     "assets": {
       "assets/core": "core/assets",
-      "assets/favicon.ico": "favicon.ico"
+      "assets/favicon.ico": "favicon.ico",
+      "assets/fonts": "suse/fonts"
     },
     "theme": {
       "loadingCss": "loader/loading.css",
       "loadingHtml": "loader/loading.html"
     }
   },
-  "peerDependencies": {},
+  "peerDependencies": {
+  },
   "scripts": {
     "build": "rm -rf ../../../../dist/theme && mkdir -p ../../../../dist/theme && cp -R * ../../../../dist/theme"
   }
diff --git a/src/frontend/packages/suse-theme/sass/custom.scss b/src/frontend/packages/suse-theme/sass/colors.scss
similarity index 61%
rename from src/frontend/packages/suse-theme/sass/custom.scss
rename to src/frontend/packages/suse-theme/sass/colors.scss
index e59c4bce3d..255c4c4c87 100644
--- a/src/frontend/packages/suse-theme/sass/custom.scss
+++ b/src/frontend/packages/suse-theme/sass/colors.scss
@@ -1,6 +1,19 @@
-// Custom SUSE Theme
+@import '~@angular/material/theming';
 
+$white: #fff;
+$black: #000;
 
+$black-87-opacity: rgba($black, .87);
+$white-87-opacity: rgba($white, .87);
+$black-12-opacity: rgba($black, .12);
+$white-12-opacity: rgba($white, .12);
+$black-6-opacity: rgba($black, .06);
+$white-6-opacity: rgba($white, .06);
+
+$suse-secondary: #00243e;
+$suse-text-gray: #ccc;
+$suse-button-gray: #888;
+$suse-dark-blue: #06253A;
 
 // SUSE Primary Material Design pallette
 // From http://mcg.mbitson.com/#!?mcgpalette0=%233f51b5
@@ -13,4 +26,18 @@ $stratos-theme: mat-light-theme($suse-theme-primary, $suse-theme-primary, $suse-
 
 $stratos-dark-theme-supported: false;
 
-@import "custom/suse"
\ No newline at end of file
+// SUSE Brand primary colour
+$suse-primary-color: #30BA78;
+$suse-text: #fff;
+$suse-blue: #073155;
+$suse-dark-green: #0c322c;
+$suse-header-bar: #0c322c;
+$suse-link-color: #008ACF;
+$suse-gray: #f2f2f2;
+$suse-gray-fg: #333;
+
+// Side nav
+$suse-side-nav-bg: #f2f2f2;
+$suse-side-nav-text: #000;
+$suse-side-nav-active-bg: $suse-primary-color;
+$suse-side-nav-active-text: #fff;
diff --git a/src/frontend/packages/suse-theme/sass/custom/suse-colors.scss b/src/frontend/packages/suse-theme/sass/custom/suse-colors.scss
deleted file mode 100644
index b444c572fd..0000000000
--- a/src/frontend/packages/suse-theme/sass/custom/suse-colors.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-$suse-primary: #00c081;
-$suse-secondary: #00243e;
-$suse-text: #fff;
-$suse-text-gray: #ccc;
-$suse-button-gray: #888;
-$suse-dark-blue: #06253A;
-$suse-blue: #073155;
\ No newline at end of file
diff --git a/src/frontend/packages/suse-theme/sass/custom/suse.scss b/src/frontend/packages/suse-theme/sass/custom/suse.scss
deleted file mode 100644
index e658d2fad9..0000000000
--- a/src/frontend/packages/suse-theme/sass/custom/suse.scss
+++ /dev/null
@@ -1,124 +0,0 @@
-// *****
-// NOTE
-// *****
-// Having this "theme" file bad practice. We need to work out if we can do without this.
-// Having this file completely sidesteps our theming and angular's component styles, potentially resulting
-// in inconsistent and unexpected styling.
-// This should only be used as a last resort - NJ.
-
-// Style overrides
-// SUSE Brand primary colour
-$suse-primary-color: #00c081;
-// Secondary blue colour
-$suse-secondary: #00243e;
-$suse-text: #fff;
-$suse-text-gray: #ccc;
-$suse-dark-blue: #06253A;
-$suse-blue: #073155;
-$suse-side-nav: $suse-secondary;
-$suse-side-nav-active: #003358;
-
-
-body.stratos {
-  .page-content > .page-header {
-    // Ensure kube icons don't appear above sub header
-    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-    color: #f5f5f5;
-  }
-
-  img.stratos-title__logo {
-    width: 160px;
-  }
-
-  h1.stratos-title__header {
-    display: initial;
-  }
-
-  .page-header .mat-toolbar.mat-primary {
-    background-color: #fff;
-    color: #333;
-  }
-
-  .user-avatar__initials {
-    background-color: $suse-primary-color;
-    color: $suse-text;
-  }
-
-  .user-avatar__large .user-avatar__initials {
-    background-color: $suse-text;
-    color: $suse-primary-color;
-  }  
-
-  .setup .page-header .mat-toolbar.mat-primary {
-    background-color: $suse-primary-color;
-    color: $suse-text;
-  }
-
-  app-page-subheader {
-    .page-subheader {
-      background-color: #fff;
-      color: #333;
-    }
-
-    .mat-tab-nav-bar.mat-background-primary {
-      .mat-tab-links {
-        background-color: #fff;
-        color: #333;
-      }
-
-      .mat-tab-link {
-        color: #333;
-      }
-
-      .mat-ink-bar {
-        background-color: $suse-primary-color;
-      }
-    }
-  }
-
-  // Use SUSE Blue Side Navigation
-  // This is themeable, we really don't need this.
-  .side-nav__inner,
-  .side-nav__top,
-  .side-nav__item--active:hover {
-    background-color: $suse-side-nav;
-  }
-
-  .side-nav__item--active,
-  .side-nav__item:hover {
-    background-color: $suse-side-nav-active;
-  }
-  .side-nav__top {
-    border-color: $suse-side-nav-active;
-  }
-  .side-nav__bottom {
-    color: $suse-text-gray;
-  }
-
-  // Remove green page underflow run on about page
-  app-about-page .page-header__underflow {
-    background-color: transparent;
-  }
-
-  // Remove background image from setup screen (e.g. upgrade screen)
-  app-intro-screen > .intro {
-    background-color: $suse-blue;
-    background-image: none;
-  }
-
-  .page-header__divider {
-    color: #333;
-  }
-
-  .page-header__menu-button-icon {
-    font-size: 30;
-    background-color: $suse-primary-color;
-    color: $suse-text;
-  }
-
-  .dark-theme {
-    .page-content > .page-header {
-      border-bottom: solid 1px rgba(255, 255, 255, 0.12);
-    }
-  }
-}
diff --git a/src/frontend/packages/suse-theme/sass/font.scss b/src/frontend/packages/suse-theme/sass/font.scss
new file mode 100644
index 0000000000..888f488882
--- /dev/null
+++ b/src/frontend/packages/suse-theme/sass/font.scss
@@ -0,0 +1,41 @@
+$work-sans-font-path: '/suse/fonts/work-sans' !default;
+
+/* work-sans-300 - latin */
+@font-face {
+  font-family: 'Work Sans';
+  font-style: normal;
+  font-weight: 300;
+  src: url('#{$work-sans-font-path}/work-sans-v8-latin-300.eot'); /* IE9 Compat Modes */
+  src: local(''),
+       url('#{$work-sans-font-path}/work-sans-v8-latin-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('#{$work-sans-font-path}/work-sans-v8-latin-300.woff2') format('woff2'), /* Super Modern Browsers */
+       url('#{$work-sans-font-path}/work-sans-v8-latin-300.woff') format('woff'), /* Modern Browsers */
+       url('#{$work-sans-font-path}/work-sans-v8-latin-300.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('#{$work-sans-font-path}/work-sans-v8-latin-300.svg#WorkSans') format('svg'); /* Legacy iOS */
+}
+/* work-sans-regular - latin */
+@font-face {
+  font-family: 'Work Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: url('#{$work-sans-font-path}/work-sans-v8-latin-regular.eot'); /* IE9 Compat Modes */
+  src: local(''),
+       url('#{$work-sans-font-path}/work-sans-v8-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('#{$work-sans-font-path}/work-sans-v8-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+       url('#{$work-sans-font-path}/work-sans-v8-latin-regular.woff') format('woff'), /* Modern Browsers */
+       url('#{$work-sans-font-path}/work-sans-v8-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('#{$work-sans-font-path}/work-sans-v8-latin-regular.svg#WorkSans') format('svg'); /* Legacy iOS */
+}
+/* work-sans-600 - latin */
+@font-face {
+  font-family: 'Work Sans';
+  font-style: normal;
+  font-weight: 600;
+  src: url('#{$work-sans-font-path}/work-sans-v8-latin-600.eot'); /* IE9 Compat Modes */
+  src: local(''),
+       url('#{$work-sans-font-path}/work-sans-v8-latin-600.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('#{$work-sans-font-path}/work-sans-v8-latin-600.woff2') format('woff2'), /* Super Modern Browsers */
+       url('#{$work-sans-font-path}/work-sans-v8-latin-600.woff') format('woff'), /* Modern Browsers */
+       url('#{$work-sans-font-path}/work-sans-v8-latin-600.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('#{$work-sans-font-path}/work-sans-v8-latin-600.svg#WorkSans') format('svg'); /* Legacy iOS */
+}
diff --git a/src/frontend/packages/suse-theme/sass/suse.scss b/src/frontend/packages/suse-theme/sass/suse.scss
new file mode 100644
index 0000000000..c0cd8bd604
--- /dev/null
+++ b/src/frontend/packages/suse-theme/sass/suse.scss
@@ -0,0 +1,13 @@
+// Custom SUSE Theme
+
+// Work Sans font
+@import '~../sass/font';
+
+body.stratos {
+
+  // Round buttons
+  button.mat-button {
+    border-radius: 20px;
+  }
+
+}
diff --git a/src/tsconfig.json b/src/tsconfig.json
index e8defdabb9..0ee21fc3d1 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -33,10 +33,10 @@
       "@stratosui/core": ["frontend/packages/core/src/public-api.ts"],
       "@stratosui/store": ["frontend/packages/store/src/public-api.ts"],
       "@stratosui/store/testing": ["frontend/packages/store/testing/public-api.ts"],
-      "@suse/extensions": ["frontend/packages/suse-extensions/src/public-api.ts"],
       "@stratosui/cloud-foundry": ["frontend/packages/cloud-foundry/src/public_api.ts"],
       "@stratosui/cf-autoscaler": ["frontend/packages/cf-autoscaler/src/public_api.ts"],
       "@example/extensions": ["frontend/packages/example-extensions/src/public-api.ts"],
+      "@susestratos/extensions": ["frontend/packages/suse-extensions/src/public-api.ts"],
     }
   }
 }

From 0543700a183b4dd0f64220484a84a03db444f985 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Fri, 10 Jul 2020 11:28:05 +0100
Subject: [PATCH 579/648] Update kube dashboard version, allow download link to
 be configurable (#409)

* Fixes after merge

* Fix build

* Update Kube Dashboard, allow download link to be configurable
- Default download link updated to v2.0.3
- Can configured link by setting env var `STRATOS_KUBERNETES_DASHBOARD_IMAGE`
- Can configure env var in helm via `console.kubeDashboardImage`
- Kube Dashboard now expanded by default (to show namespace drop down)

* Fix after merge

* Changes following review

* Fix expand of kube dashboard header by default

* Revert package-lock.json to master version
---
 deploy/kubernetes/console/README.md           |   2 +-
 .../console/templates/deployment.yaml         |   4 -
 deploy/kubernetes/console/values.yaml         |   3 +
 deploy/kubernetes/custom/__stratos.tpl        |   4 +-
 package-lock.json                             | 325 ++++--------------
 .../kubernetes-dashboard.component.ts         |   4 +-
 src/jetstream/default.config.properties       |   5 +-
 .../plugins/kubernetes/dashboard/configure.go |  16 +-
 .../plugins/kubernetes/install_release.go     |   3 +
 9 files changed, 101 insertions(+), 265 deletions(-)

diff --git a/deploy/kubernetes/console/README.md b/deploy/kubernetes/console/README.md
index cc4a7399d4..3e156e249e 100644
--- a/deploy/kubernetes/console/README.md
+++ b/deploy/kubernetes/console/README.md
@@ -310,7 +310,7 @@ helm install my-console stratos/console --namespace=console --set console.localA
 
 In some scenarios it is useful to be able to add custom annotations and/or labels to the Kubernetes resources that the Stratos Helm chart creates.
 
-The Stratos Helm chart exposes a number of Helm chart values that cabe specified in order to do this - they are:
+The Stratos Helm chart exposes a number of Helm chart values that can be specified in order to do this - they are:
 
 |Parameter|Description|Default|
 |----|---|---|
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 8dbef8dc25..05a92ef3e2 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -81,10 +81,6 @@ spec:
           value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
         - name: STRATOS_HELM_RELEASE
           value: "{{ .Release.Name }}"
-        - name: STRATOS_KUBERNETES_NAMESPACE
-          value: "{{ .Release.Namespace }}"
-        - name: STRATOS_KUBERNETES_TERMINAL_IMAGE
-          value: "{{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/stratos-kube-terminal:{{.Values.consoleVersion}}"
         - name: DB_USER
           valueFrom:
             secretKeyRef:
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index dd4b40cbdf..2335e6ccbb 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -108,6 +108,9 @@ console:
 
   # Node Selector for console Pod
   nodeSelector: {}
+
+  # Download link when installing the Kubernetes Dashboard in a targetted Kube Endpoint
+  kubeDashboardImage:
   
 images:
   console: stratos-console
diff --git a/deploy/kubernetes/custom/__stratos.tpl b/deploy/kubernetes/custom/__stratos.tpl
index 4999b0e2cb..732932914d 100644
--- a/deploy/kubernetes/custom/__stratos.tpl
+++ b/deploy/kubernetes/custom/__stratos.tpl
@@ -13,7 +13,9 @@
 - name: SYNC_SERVER_URL
   value: "http://{{ .Release.Name }}-chartsync:8080"
 - name: STRATOS_KUBERNETES_NAMESPACE
-  value: "{{ .Release.Namespace }}"  
+  value: "{{ .Release.Namespace }}"
 - name: STRATOS_KUBERNETES_TERMINAL_IMAGE
   value: "{{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/stratos-kube-terminal:{{.Values.consoleVersion}}"
+- name: STRATOS_KUBERNETES_DASHBOARD_IMAGE
+  value: "{{.Values.console.kubeDashboardImage}}"
 {{- end }}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 1376614766..8a0a8847d4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,20 +4,6 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
-    "@angular-builders/custom-webpack": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-9.1.0.tgz",
-      "integrity": "sha512-Dek6KxNUFBELKqNRO4Im5JIP0/rZF4HmvgA8X+RyqOd9cyDxk16A441WlqTqy3UKX8lcbf6C9RcR5D2dI1ZATQ==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/architect": ">=0.900.0 < 0.1000.0",
-        "@angular-devkit/build-angular": ">=0.900.0 < 0.1000.0",
-        "@angular-devkit/core": "^9.0.0",
-        "lodash": "^4.17.10",
-        "ts-node": "^8.5.2",
-        "webpack-merge": "^4.2.1"
-      }
-    },
     "@angular-devkit/architect": {
       "version": "0.901.7",
       "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.7.tgz",
@@ -632,17 +618,6 @@
       "resolved": "https://registry.npmjs.org/@angular/router/-/router-9.1.9.tgz",
       "integrity": "sha512-4u+CWMPB4hCkAsFCEzC94YEWT0wVozqGkc/Dortt2hFaqvZpIegg6iJVZlDxuyDjzFYBPnnbTDdgiTTA8ckfuA=="
     },
-    "@apidevtools/json-schema-ref-parser": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.1.tgz",
-      "integrity": "sha512-Qsdz0W0dyK84BuBh5KZATWXOtVDXIF2EeNRzpyWblPUeAmnIokwWcwrpAm5pTPMjuWoIQt9C67X3Af1OlL6oSw==",
-      "dev": true,
-      "requires": {
-        "@jsdevtools/ono": "^7.1.2",
-        "call-me-maybe": "^1.0.1",
-        "js-yaml": "^3.13.1"
-      }
-    },
     "@babel/code-frame": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
@@ -2798,12 +2773,6 @@
         }
       }
     },
-    "@jsdevtools/ono": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.2.tgz",
-      "integrity": "sha512-qS/a24RA5FEoiJS9wiv6Pwg2c/kiUo3IVUQcfeM9JvsR6pM8Yx+yl/6xWYLckZCT5jpLNhslgjiA8p/XcGyMRQ==",
-      "dev": true
-    },
     "@ngrx/effects": {
       "version": "9.2.0",
       "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-9.2.0.tgz",
@@ -2836,19 +2805,6 @@
         "webpack-sources": "1.4.3"
       },
       "dependencies": {
-        "@angular-devkit/core": {
-          "version": "9.1.7",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.7.tgz",
-          "integrity": "sha512-guvolu9Cl+qYMTtedLZD9wCqustJjdqzJ2psD2C1Sr1LrX9T0mprmDldR/YnhsitThveJEb6sM/0EvqWxoSvKw==",
-          "dev": true,
-          "requires": {
-            "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"
-          }
-        },
         "rxjs": {
           "version": "6.5.4",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
@@ -2857,12 +2813,6 @@
           "requires": {
             "tslib": "^1.9.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
         }
       }
     },
@@ -3155,28 +3105,6 @@
       "requires": {
         "@angular-devkit/core": "9.1.7",
         "@angular-devkit/schematics": "9.1.7"
-      },
-      "dependencies": {
-        "@angular-devkit/schematics": {
-          "version": "9.1.7",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.7.tgz",
-          "integrity": "sha512-oeHPJePBcPp/bd94jHQeFUnft93PGF5iJiKV9szxqS8WWC5OMZ5eK7icRY0PwvLyfenspAZxdZcNaqJqPMul5A==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "9.1.7",
-            "ora": "4.0.3",
-            "rxjs": "6.5.4"
-          }
-        },
-        "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"
-          }
-        }
       }
     },
     "@schematics/update": {
@@ -3196,19 +3124,6 @@
         "semver-intersect": "1.4.0"
       },
       "dependencies": {
-        "@angular-devkit/core": {
-          "version": "9.1.7",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.7.tgz",
-          "integrity": "sha512-guvolu9Cl+qYMTtedLZD9wCqustJjdqzJ2psD2C1Sr1LrX9T0mprmDldR/YnhsitThveJEb6sM/0EvqWxoSvKw==",
-          "dev": true,
-          "requires": {
-            "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"
-          }
-        },
         "rxjs": {
           "version": "6.5.4",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
@@ -3223,12 +3138,6 @@
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz",
           "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==",
           "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
         }
       }
     },
@@ -3256,6 +3165,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",
@@ -3884,12 +3811,6 @@
       "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
       "dev": true
     },
-    "any-promise": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
-      "dev": true
-    },
     "anymatch": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
@@ -5211,12 +5132,6 @@
         }
       }
     },
-    "call-me-maybe": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
-      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
-      "dev": true
-    },
     "caller-callsite": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
@@ -5432,20 +5347,6 @@
       "integrity": "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==",
       "dev": true
     },
-    "cli-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-2.0.0.tgz",
-      "integrity": "sha512-a0VZ8LeraW0jTuCkuAGMNufareGHhyZU9z8OGsW0gXd1hZGi1SRuNRXdbGkraBBKnhyUhyebFWnRbp+dIn0f0A==",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^2.1.1",
-        "d": "^1.0.1",
-        "es5-ext": "^0.10.51",
-        "es6-iterator": "^2.0.3",
-        "memoizee": "^0.4.14",
-        "timers-ext": "^0.1.7"
-      }
-    },
     "cli-cursor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
@@ -6471,6 +6372,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.1",
       "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz",
@@ -6495,6 +6401,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",
@@ -6518,6 +6435,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",
@@ -6574,6 +6496,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",
@@ -9145,6 +9076,14 @@
       "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
       "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",
@@ -10331,12 +10270,6 @@
         "isobject": "^3.0.1"
       }
     },
-    "is-promise": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
-      "dev": true
-    },
     "is-property": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
@@ -10971,57 +10904,6 @@
       "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
       "dev": true
     },
-    "json-schema-ref-parser": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-9.0.1.tgz",
-      "integrity": "sha512-KLrCjRjW5hMXxsX4osVBWpwixXL9NtICfpyNNS0eHguN5mP/I4UatI7i7PFS8jU94b1NHF4EbirACdCn0RFPBA==",
-      "dev": true,
-      "requires": {
-        "@apidevtools/json-schema-ref-parser": "9.0.1"
-      }
-    },
-    "json-schema-to-typescript": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/json-schema-to-typescript/-/json-schema-to-typescript-9.1.0.tgz",
-      "integrity": "sha512-9/yDXQQyqtRDxohQGRCKht4Wjfg73TALi1yzy651EOo71a6aKFtIm2WUbDWSf8OitFGukUn00dx4t1kg0W6O4Q==",
-      "dev": true,
-      "requires": {
-        "@types/json-schema": "^7.0.4",
-        "cli-color": "^2.0.0",
-        "glob": "^7.1.6",
-        "is-glob": "^4.0.1",
-        "json-schema-ref-parser": "^9.0.1",
-        "json-stringify-safe": "^5.0.1",
-        "lodash": "^4.17.15",
-        "minimist": "^1.2.5",
-        "mkdirp": "^1.0.4",
-        "mz": "^2.7.0",
-        "prettier": "^2.0.5",
-        "stdin": "0.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"
-          }
-        },
-        "mkdirp": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-          "dev": true
-        }
-      }
-    },
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -11892,8 +11774,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",
@@ -12018,15 +11899,6 @@
         }
       }
     },
-    "lru-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
-      "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
-      "dev": true,
-      "requires": {
-        "es5-ext": "~0.10.2"
-      }
-    },
     "magic-string": {
       "version": "0.25.7",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
@@ -12341,22 +12213,6 @@
         }
       }
     },
-    "memoizee": {
-      "version": "0.4.14",
-      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz",
-      "integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.45",
-        "es6-weak-map": "^2.0.2",
-        "event-emitter": "^0.3.5",
-        "is-promise": "^2.1",
-        "lru-queue": "0.1",
-        "next-tick": "1",
-        "timers-ext": "^0.1.5"
-      }
-    },
     "memory-fs": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
@@ -12880,17 +12736,6 @@
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
       "dev": true
     },
-    "mz": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
-      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
-      "dev": true,
-      "requires": {
-        "any-promise": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "thenify-all": "^1.0.0"
-      }
-    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -15839,12 +15684,6 @@
       "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
       "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
     },
-    "prettier": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz",
-      "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==",
-      "dev": true
-    },
     "pretty-hrtime": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
@@ -18671,12 +18510,6 @@
       "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
       "dev": true
     },
-    "stdin": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/stdin/-/stdin-0.0.1.tgz",
-      "integrity": "sha1-0wQZgarsPf28d6GzjWNy449ftx4=",
-      "dev": true
-    },
     "stealthy-require": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
@@ -19653,24 +19486,6 @@
       "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
       "dev": true
     },
-    "thenify": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz",
-      "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=",
-      "dev": true,
-      "requires": {
-        "any-promise": "^1.0.0"
-      }
-    },
-    "thenify-all": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
-      "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
-      "dev": true,
-      "requires": {
-        "thenify": ">= 3.1.0 < 4"
-      }
-    },
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -19718,16 +19533,6 @@
         "setimmediate": "^1.0.4"
       }
     },
-    "timers-ext": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
-      "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
-      "dev": true,
-      "requires": {
-        "es5-ext": "~0.10.46",
-        "next-tick": "1"
-      }
-    },
     "timsort": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
@@ -19843,6 +19648,11 @@
         "punycode": "^2.1.1"
       }
     },
+    "transformation-matrix": {
+      "version": "1.15.3",
+      "resolved": "https://registry.npmjs.org/transformation-matrix/-/transformation-matrix-1.15.3.tgz",
+      "integrity": "sha512-ThJH58GNFKhCw3gIoOtwf3tNwuYjbyEeiGdeq4mNMYWdJctnI896KUqn6PVt7jmNVepqa1bcKQtnMB1HtjsDMA=="
+    },
     "tree-kill": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
@@ -20989,6 +20799,17 @@
       "resolved": "https://registry.npmjs.org/web-animations-js/-/web-animations-js-2.3.2.tgz",
       "integrity": "sha512-TOMFWtQdxzjWp8qx4DAraTWTsdhxVSiWa6NkPFSaPtZ1diKUxTn4yTix73A1euG1WbSOMMPcY51cnjTIHrGtDA=="
     },
+    "webcola": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/webcola/-/webcola-3.4.0.tgz",
+      "integrity": "sha512-4BiLXjXw3SJHo3Xd+rF+7fyClT6n7I+AR6TkBqyQ4kTsePSAMDLRCXY1f3B/kXJeP9tYn4G1TblxTO+jAt0gaw==",
+      "requires": {
+        "d3-dispatch": "^1.0.3",
+        "d3-drag": "^1.0.4",
+        "d3-shape": "^1.3.5",
+        "d3-timer": "^1.0.5"
+      }
+    },
     "webdriver-js-extender": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz",
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
index 0655cfae02..f54541c1b2 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
@@ -50,7 +50,7 @@ export class KubernetesDashboardTabComponent implements OnInit {
   href = '';
   isLoading$ = new BehaviorSubject<boolean>(true);
   hasError$ = new BehaviorSubject<boolean>(false);
-  expanded = false;
+  expanded = true;
 
   private loadCheckTries = 0;
   private haveSetupEventLister = false;
@@ -126,7 +126,7 @@ export class KubernetesDashboardTabComponent implements OnInit {
 
     if (hasLoaded) {
       this.isLoading$.next(false);
-      this.toggle(false);
+      this.toggle(true);
     }
 
   }
diff --git a/src/jetstream/default.config.properties b/src/jetstream/default.config.properties
index 2a430adb51..e6466f8004 100644
--- a/src/jetstream/default.config.properties
+++ b/src/jetstream/default.config.properties
@@ -73,4 +73,7 @@ INVITE_USER_CLIENT_SECRET=
 #SYNC_SERVER_URL=http://127.0.0.1:8080"
 
 # Simplify development with FDB (value is port of FDB server: 27016 for FDB, 27017 for MongoDB)
-#FDB_LOCAL_DEV=27017
\ No newline at end of file
+#FDB_LOCAL_DEV=27017
+
+# Download link when installing the Kubernetes Dashboard in a targetted Kube Endpoint
+# STRATOS_KUBERNETES_DASHBOARD_IMAGE=
\ No newline at end of file
diff --git a/src/jetstream/plugins/kubernetes/dashboard/configure.go b/src/jetstream/plugins/kubernetes/dashboard/configure.go
index 41bcafae81..ed648b29d0 100644
--- a/src/jetstream/plugins/kubernetes/dashboard/configure.go
+++ b/src/jetstream/plugins/kubernetes/dashboard/configure.go
@@ -14,7 +14,7 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
-const dashboardInstallYAMLDownloadURL = "https://raw.githubusercontent.com/kubernetes/dashboard/v2.0.0-rc2/aio/deploy/recommended.yaml"
+const dashboardInstallYAMLDownloadURL = "https://raw.githubusercontent.com/kubernetes/dashboard/v2.0.3/aio/deploy/recommended.yaml"
 
 // Service Account definition - as per kube dashboard docs
 const serviceAccountDefinition = `{
@@ -43,7 +43,7 @@ const clusterRoleBindingDefinition = `{
 		"apiGroup": "rbac.authorization.k8s.io",
 		"kind": "ClusterRole",
 		"name": "cluster-admin"
-	}, 
+	},
 	"subjects": [
 		{
 			"kind": "ServiceAccount",
@@ -147,10 +147,18 @@ func addErrorMessage(msg, prefix string, response *interfaces.CNSIRequest, err e
 // InstallDashboard will install the dashboard into a Kubernetes cluster
 func InstallDashboard(p interfaces.PortalProxy, endpointGUID, userGUID string) error {
 	// Download the Yaml for the dashboard
-	log.Debugf("InstallDashboardL %s", dashboardInstallYAMLDownloadURL)
+	kubeDashboardImage := p.Env().String("STRATOS_KUBERNETES_DASHBOARD_IMAGE", "")
+	if len(kubeDashboardImage) == 0 {
+		kubeDashboardImage = dashboardInstallYAMLDownloadURL
+	}
+
+	log.Debugf("InstallDashboard: %s", kubeDashboardImage)
 
 	http := p.GetHttpClient(false)
-	resp, err := http.Get(dashboardInstallYAMLDownloadURL)
+	resp, err := http.Get(kubeDashboardImage)
+	if err != nil {
+		return fmt.Errorf("Could not download YAML to install the dashboard: %+v", err)
+	}
 	if resp.StatusCode != 200 {
 		return fmt.Errorf("Could not download YAML to install the dashboard: %s", resp.Status)
 	}
diff --git a/src/jetstream/plugins/kubernetes/install_release.go b/src/jetstream/plugins/kubernetes/install_release.go
index 0548fac69d..0505f51f06 100644
--- a/src/jetstream/plugins/kubernetes/install_release.go
+++ b/src/jetstream/plugins/kubernetes/install_release.go
@@ -65,6 +65,9 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 	// NWM: Should we look up Helm Repository endpoint and use the value from that
 	httpClient := c.portalProxy.GetHttpClient(false)
 	resp, err := httpClient.Get(downloadURL)
+	if err != nil {
+		return interfaces.NewJetstreamErrorf("Could not download Chart Archive: %s", err)
+	}
 	if resp.StatusCode != 200 {
 		return interfaces.NewJetstreamErrorf("Could not download Chart Archive: %s", resp.Status)
 	}

From 864f650488d0114e52e51f654b1cf9f204c222db Mon Sep 17 00:00:00 2001
From: Michal Jura <mjura@users.noreply.github.com>
Date: Mon, 20 Jul 2020 12:15:25 +0200
Subject: [PATCH 580/648] Insecure tlsv10 and tlsv11 ciphers in Stratos UI,
 bsc#1173295 (#411)

---
 deploy/containers/nginx/conf/nginx.dev.conf | 5 +++--
 deploy/containers/nginx/conf/nginx.k8s.conf | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/deploy/containers/nginx/conf/nginx.dev.conf b/deploy/containers/nginx/conf/nginx.dev.conf
index 05a2573e92..23719b11b9 100644
--- a/deploy/containers/nginx/conf/nginx.dev.conf
+++ b/deploy/containers/nginx/conf/nginx.dev.conf
@@ -47,8 +47,9 @@ http {
 
         ssl_certificate             /etc/secrets/server.crt;
         ssl_certificate_key         /etc/secrets/server.key;
-        ssl_protocols               TLSv1 TLSv1.1 TLSv1.2;
-        ssl_ciphers                 HIGH:!aNULL:!MD5;
+        ssl_protocols               TLSv1.2 TLSv1.3;
+        ssl_ciphers                 ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384;
+        ssl_prefer_server_ciphers   on;
 
         client_max_body_size        50M;
 
diff --git a/deploy/containers/nginx/conf/nginx.k8s.conf b/deploy/containers/nginx/conf/nginx.k8s.conf
index 2d15a1c960..620b3fd3e3 100644
--- a/deploy/containers/nginx/conf/nginx.k8s.conf
+++ b/deploy/containers/nginx/conf/nginx.k8s.conf
@@ -47,8 +47,9 @@ http {
 
         ssl_certificate             /CONSOLE_CERT_PATH/tls.crt;
         ssl_certificate_key         /CONSOLE_CERT_PATH/tls.key;
-        ssl_protocols               TLSv1 TLSv1.1 TLSv1.2;
-        ssl_ciphers                 HIGH:!aNULL:!MD5;
+        ssl_protocols               TLSv1.2 TLSv1.3;
+        ssl_ciphers                 ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384;
+        ssl_prefer_server_ciphers   on;
 
         client_max_body_size        50M;
 

From 8f68d22572c8ee91601e1acd2d7dce5c6e0f2641 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Fri, 24 Jul 2020 08:57:05 +0100
Subject: [PATCH 581/648] Merge upstream (#414)

* Improve recent and favourites display (#4421)

* Improve recent and favourites display

* Remove debug logging

* Remove debug logging/subscription leak

* Unit test fix

* Tweaks following review

* Changes following review
- favourite & recent icon changes

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

* Add line-height to favourite and recent entity labels (#4438)

- missed out from another PR following review

* Autoscaler e2e tests: Give better failure error when the test can't find the scaling row (#4424)

* Improve autoscaler e2e tests

* Remove duplicate fail statement

* Helm Chart: Remove encryption key volume (#4355)

* Remove encryption key volume

* Remove encrpytion key volume migration from config-init job

* Improve the logout experience (#4439)

* Add support for including breaking changes in the changelog

* Improve the logout experience

* Fix unit tests

* Add request for version info to github issues template (#4443)

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Fix log out page when there's a custom log in page

* Fix log out page given previous commit changes

Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
---
 deploy/ci/travis/e2e-build-script.sh          |  19 +--
 deploy/ci/travis/e2e-mc-helper.sh             |   3 +-
 deploy/containers/config-init/config-init.sh  |  30 +----
 .../console/templates/config-init.yaml        |  16 ---
 .../kubernetes/console/templates/volumes.yaml |  27 +---
 docs/issue_template.md                        |   8 +-
 package-lock.json                             | 115 ++++++++++--------
 .../packages/core/sass/_all-theme.scss        |   3 +-
 .../packages/core/sass/mat-desktop.scss       |   9 ++
 src/frontend/packages/core/src/app.routing.ts |  16 ++-
 .../src/core/extension/extension-service.ts   |   3 +-
 .../log-out-dialog.component.spec.ts          |  15 ++-
 .../log-out-dialog.component.ts               |  10 +-
 src/frontend/packages/core/src/favicon.ico    | Bin 15086 -> 0 bytes
 .../core/src/features/login/login.module.ts   |   8 +-
 .../core/src/features/login/login.routing.ts  |  15 ---
 .../logout-page/logout-page.component.html    |  17 +++
 .../logout-page/logout-page.component.scss    |  14 +++
 .../logout-page/logout-page.component.spec.ts |  42 +++++++
 .../logout-page/logout-page.component.ts      |  35 ++++++
 .../profile-info/profile-info.component.scss  |   4 +-
 .../app-action-monitor.component.html         |   2 +-
 .../app-action-monitor.component.ts           |  10 +-
 .../favorites-entity-list.component.html      |   2 +-
 .../favorites-entity-list.component.ts        |   9 +-
 .../favorites-global-list.component.html      |   3 +-
 .../favorites-meta-card.component.scss        |   1 +
 .../json-viewer.component.theme.scss          |  15 +++
 .../page-header/page-header.component.ts      |   3 +-
 .../recent-entities.component.scss            |   1 +
 .../store/src/reducers/auth.reducer.ts        |   6 +
 .../suse-extensions/src/custom/suse.module.ts |  16 +--
 src/frontend/packages/suse-theme/_index.scss  |   2 +-
 .../application-autoscaler-e2e.spec.ts        |  11 ++
 34 files changed, 299 insertions(+), 191 deletions(-)
 delete mode 100644 src/frontend/packages/core/src/favicon.ico
 delete mode 100644 src/frontend/packages/core/src/features/login/login.routing.ts
 create mode 100644 src/frontend/packages/core/src/features/login/logout-page/logout-page.component.html
 create mode 100644 src/frontend/packages/core/src/features/login/logout-page/logout-page.component.scss
 create mode 100644 src/frontend/packages/core/src/features/login/logout-page/logout-page.component.spec.ts
 create mode 100644 src/frontend/packages/core/src/features/login/logout-page/logout-page.component.ts
 create mode 100644 src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.theme.scss

diff --git a/deploy/ci/travis/e2e-build-script.sh b/deploy/ci/travis/e2e-build-script.sh
index 48f58af62f..757bd7dd42 100755
--- a/deploy/ci/travis/e2e-build-script.sh
+++ b/deploy/ci/travis/e2e-build-script.sh
@@ -50,6 +50,7 @@ function tryGetExistingBuild() {
   fi
 }
 
+# Need S3 endpoint - if we don't have it, we don't have the Travis env vars
 if [ -n "${AWS_ENDPOINT}" ]; then
   tryGetExistingBuild
 fi
@@ -68,14 +69,16 @@ else
   npm run build
   npm run build-backend
 
-  set +e
-  tar cvfz ${GZIP_NAME} dist/* src/jetstream/jetstream
+  # Only try to upload if we have the S3 configuration
+  if [ -n "${AWS_ENDPOINT}" ]; then
+    set +e
+    tar cvfz ${GZIP_NAME} dist/* src/jetstream/jetstream
 
-  # Upload
-  mc cp -q --insecure ${GZIP_NAME} ${MC_HOST}/${S3_BUILDS_BUCKET}
-
-  # Ignore error from uploading - should not fail build if we can't upload the build archive
-  # This just means we won't be able to us this cache next build
-  exit 0
+    # Upload
+    mc cp -q --insecure ${GZIP_NAME} ${MC_HOST}/${S3_BUILDS_BUCKET}
 
+    # Ignore error from uploading - should not fail build if we can't upload the build archive
+    # This just means we won't be able to us this cache next build
+    echo "Uploaded builds"
+  fi
 fi
diff --git a/deploy/ci/travis/e2e-mc-helper.sh b/deploy/ci/travis/e2e-mc-helper.sh
index 4dbb3109b6..5201e0a46f 100644
--- a/deploy/ci/travis/e2e-mc-helper.sh
+++ b/deploy/ci/travis/e2e-mc-helper.sh
@@ -1,6 +1,7 @@
 # Helper for mc command
 
-mc version > /dev/null
+# Check if mc command is available (don't log error if it is not)
+mc version > /dev/null 2>&1
 if [ $? -eq 0 ]; then
   echo "mc command already installed and confgiured"
 else
diff --git a/deploy/containers/config-init/config-init.sh b/deploy/containers/config-init/config-init.sh
index 31c7ac8876..d5bc58a4b5 100755
--- a/deploy/containers/config-init/config-init.sh
+++ b/deploy/containers/config-init/config-init.sh
@@ -11,10 +11,6 @@ echo "RELEASE_NAME                : ${RELEASE_NAME}"
 echo "RELEASE_REVISION            : ${RELEASE_REVISION}"
 echo "IS_UPGRADE                  : ${IS_UPGRADE}"
 echo "CONSOLE_TLS_SECRET_NAME     : ${CONSOLE_TLS_SECRET_NAME}"
-echo "ENCRYPTION_KEY_VOLUME       : ${ENCRYPTION_KEY_VOLUME}"
-echo "ENCRYPTION_KEY_FILENAME     : ${ENCRYPTION_KEY_FILENAME}"
-echo "CONSOLE_PROXY_CERT_PATH     : ${CONSOLE_PROXY_CERT_PATH}"
-echo "CONSOLE_PROXY_CERT_KEY_PATH : ${CONSOLE_PROXY_CERT_KEY_PATH}"
 echo ""
 echo "============================================"
 echo ""
@@ -44,15 +40,6 @@ EOF
 }
 
 function generateCert {
-  if [ -n "${CONSOLE_PROXY_CERT_PATH}" ] && [ -n "${CONSOLE_PROXY_CERT_KEY_PATH}" ]; then
-    if [ -f "${CONSOLE_PROXY_CERT_PATH}" ] && [ -f "${CONSOLE_PROXY_CERT_KEY_PATH}" ]; then
-      echo "Found existing certificate on encryption key volume - going to use it"
-      CERT_CRT=$(cat ${CONSOLE_PROXY_CERT_PATH} | base64 -w 0)
-      CERT_KEY=$(cat ${CONSOLE_PROXY_CERT_KEY_PATH} | base64 -w 0)
-      return
-    fi
-  fi
-
   echo "Using cert generator to generate a self-signed certificate ..."
   export CERTS_PATH=./certs
   export DEV_CERTS_DOMAIN=tls
@@ -97,20 +84,9 @@ if [ $EXISTS -eq 0 ]; then
 else
   echo "Fresh installation - generating a new Encryption Key secret"
 
-  # Migrate existing key from the legacy encryption key volume if there is one
-  if [ ${ENCRYPTION_KEY_VOLUME} -a ${ENCRYPTION_KEY_FILENAME} ]; then
-    ekFile="${ENCRYPTION_KEY_VOLUME}/${ENCRYPTION_KEY_FILENAME}"
-    if [ -f "${ekFile}" ]; then
-      echo "Found encryption key file on the legacy encryption key volume"
-      KEY=$(cat ${ekFile} | base64 -w 0)
-    fi
-  fi
-
-  if [ -z $KEY ]; then
-    # Generate a random encryption key
-    echo "Generating a new Encryption Key ..."
-    KEY=$(openssl enc -aes-256-cbc -k secret -P -md sha1 | grep key | cut -d '=' -f2 | base64 -w 0)
-  fi
+  # Generate a random encryption key
+  echo "Generating a new Encryption Key ..."
+  KEY=$(openssl enc -aes-256-cbc -k secret -P -md sha1 | grep key | cut -d '=' -f2 | base64 -w 0)
 
   # We will create a new secret for the encryption key
   cat << EOF > create-key-secret.yaml
diff --git a/deploy/kubernetes/console/templates/config-init.yaml b/deploy/kubernetes/console/templates/config-init.yaml
index 0cc82ee389..6ed17f1e88 100644
--- a/deploy/kubernetes/console/templates/config-init.yaml
+++ b/deploy/kubernetes/console/templates/config-init.yaml
@@ -118,26 +118,14 @@ spec:
           value: "{{ .Chart.AppVersion }}"
         - name: "HELM_CHART"
           value:  "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-        - name: ENCRYPTION_KEY_VOLUME
-          value: "/{{ .Release.Name }}-encryption-key-volume"
-        - name: ENCRYPTION_KEY_FILENAME
-          value: key
         - name: CONSOLE_TLS_SECRET_NAME
           value: "{{ default "" .Values.console.tlsSecretName }}"
-        - name: CONSOLE_PROXY_CERT_PATH
-          value: "/{{ .Release.Name }}-encryption-key-volume/console.crt"
-        - name: CONSOLE_PROXY_CERT_KEY_PATH
-          value: "/{{ .Release.Name }}-encryption-key-volume/console.key"
         image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{default "stratos-config-init" .Values.images.configInit}}:{{.Values.consoleVersion}}
         command: ["/config-init.sh"]
         imagePullPolicy: {{.Values.imagePullPolicy}}
         livenessProbe: ~
         name: "config-init"
         readinessProbe: ~
-        volumeMounts:
-          - mountPath: "/{{ .Release.Name }}-encryption-key-volume"
-            name: "{{ .Release.Name }}-encryption-key-volume"
-            readOnly: true
       {{- if and .Values.kube.registry.username .Values.kube.registry.password }}
       imagePullSecrets:
       - name: {{.Values.dockerRegistrySecret}}
@@ -147,10 +135,6 @@ spec:
       serviceAccountName: "config-init"
       {{- end }}
       terminationGracePeriodSeconds: 600
-      volumes:
-      - name: "{{ .Release.Name }}-encryption-key-volume"
-        persistentVolumeClaim:
-          claimName: "{{ .Release.Name }}-encryption-key-volume"
 ---
 {{- if .Values.autoCleanup }}
 # Cleanup job will delete the created secret when the release is deleted
diff --git a/deploy/kubernetes/console/templates/volumes.yaml b/deploy/kubernetes/console/templates/volumes.yaml
index 9e0c9b3500..5483e79ae9 100644
--- a/deploy/kubernetes/console/templates/volumes.yaml
+++ b/deploy/kubernetes/console/templates/volumes.yaml
@@ -1,31 +1,6 @@
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: "{{ .Release.Name }}-encryption-key-volume"
-  labels:
-    app.kubernetes.io/name: "stratos"
-    app.kubernetes.io/instance: "{{ .Release.Name }}"
-    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "console-encryption-volume"
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-  annotations:
-  {{- if .Values.storageClass }}
-    volume.beta.kubernetes.io/storage-class: {{ .Values.storageClass | quote }}
-  {{- else if .Values.kube.storage_class.persistent }}
-    volume.beta.kubernetes.io/storage-class: {{ .Values.kube.storage_class.persistent | quote }}
-  {{- else }}
-    volume.alpha.kubernetes.io/storage-class: default
-  {{- end }}
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 20Mi
----
 {{- if (not .Values.mariadb.external) }}
 {{- if and .Values.mariadb.persistence.enabled (not .Values.mariadb.persistence.existingClaim) }}
+---
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
diff --git a/docs/issue_template.md b/docs/issue_template.md
index 9950dfe804..dffaf1add3 100644
--- a/docs/issue_template.md
+++ b/docs/issue_template.md
@@ -1,4 +1,8 @@
 <!--- For bugs and general issues -->
+### Stratos Version
+<!-- What version of Stratos does this related to? -->
+<!-- Version information can be seen in the `About` page reached via the User Icon top right -->
+<!-- If directly using code which branch, commit, etc did the source come from, what repository was it cloned from? -->
 ### Frontend Deployment type
 <!--- Where is the frontend deployed? -->
 <!--- Put an 'x' in one of the boxes below.  -->
@@ -21,11 +25,11 @@
 
 ### Actual behaviour
 
-### Steps to reproduce the behavior
+### Steps to reproduce the behaviour
 
 ### Log output covering before error and any error statements
 ```
-Insert log hereCopy
+Insert your log here
 ```
 
 
diff --git a/package-lock.json b/package-lock.json
index 8a0a8847d4..fdfea562d5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6995,7 +6995,7 @@
     },
     "duplexer": {
       "version": "0.1.1",
-      "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
       "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
       "dev": true
     },
@@ -7698,7 +7698,7 @@
     },
     "event-stream": {
       "version": "3.3.4",
-      "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
       "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
       "dev": true,
       "requires": {
@@ -10808,6 +10808,66 @@
       "integrity": "sha512-nCeAiw37MIMA9w9IXso7bRaLl+c/ef3wnxsoSAlYrzS+Ot0zTG6nU8G/cIfGkqpkjX2wNaIW9RFG0TwIFnG6bA==",
       "dev": true
     },
+    "jasmine-protractor-browser-log-reporter": {
+      "version": "github:cf-stratos/jasmine-protractor-browser-log-reporter#5c9170221db6562f6f2eb128f0652e1c3cf2d668",
+      "from": "github:cf-stratos/jasmine-protractor-browser-log-reporter",
+      "dev": true,
+      "requires": {
+        "chalk": "^4.1.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": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "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"
+          }
+        }
+      }
+    },
     "jasmine-spec-reporter": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-5.0.1.tgz",
@@ -12022,7 +12082,7 @@
     },
     "map-stream": {
       "version": "0.1.0",
-      "resolved": "http://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
       "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
       "dev": true
     },
@@ -14815,7 +14875,7 @@
     },
     "pause-stream": {
       "version": "0.0.11",
-      "resolved": "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
       "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
       "dev": true,
       "requires": {
@@ -15915,49 +15975,6 @@
         }
       }
     },
-    "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",
@@ -18398,7 +18415,7 @@
     },
     "split": {
       "version": "0.3.3",
-      "resolved": "http://registry.npmjs.org/split/-/split-0.3.3.tgz",
+      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
       "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
       "dev": true,
       "requires": {
@@ -18575,7 +18592,7 @@
     },
     "stream-combiner": {
       "version": "0.0.4",
-      "resolved": "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
       "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
       "dev": true,
       "requires": {
diff --git a/src/frontend/packages/core/sass/_all-theme.scss b/src/frontend/packages/core/sass/_all-theme.scss
index c611d62d9a..c929676d41 100644
--- a/src/frontend/packages/core/sass/_all-theme.scss
+++ b/src/frontend/packages/core/sass/_all-theme.scss
@@ -18,7 +18,7 @@
 @import '../src/shared/components/list/list-table/table-row/table-row.component.theme';
 @import '../src/shared/components/no-content-message/no-content-message.component.theme';
 @import '../src/shared/components/boolean-indicator/boolean-indicator.component.theme';
-
+@import '../src/shared/components/json-viewer/json-viewer.component.theme';
 @import '../src/shared/components/loading-page/loading-page.component.theme';
 @import '../src/shared/components/log-viewer/log-viewer.component.theme';
 @import '../src/shared/components/chips/chips.component.theme';
@@ -126,5 +126,6 @@
   @include restore-endpoints-theme($theme, $app-theme);
   @include metrics-component-theme($theme, $app-theme);
   @include intro-screen-theme($theme, $app-theme);
+  @include app-json-view-theme($theme, $app-theme);
 
 }
diff --git a/src/frontend/packages/core/sass/mat-desktop.scss b/src/frontend/packages/core/sass/mat-desktop.scss
index f47438d989..3538518e13 100644
--- a/src/frontend/packages/core/sass/mat-desktop.scss
+++ b/src/frontend/packages/core/sass/mat-desktop.scss
@@ -107,4 +107,13 @@ $desktop-toggle-button-item-height: $desktop-menu-item-height - 2px;
     flex: 0 0 $desktop-page-header-height;
     height: $desktop-page-header-height;
   }
+
+  mat-drawer.dashboard__side_preview {
+    top: $desktop-page-header-height;
+    height: calc(100vw - #{$desktop-page-header-height} - 1px);
+  }
+
+  app-profile-info .user-profile {
+    top: $desktop-page-header-height;
+  }
 }
diff --git a/src/frontend/packages/core/src/app.routing.ts b/src/frontend/packages/core/src/app.routing.ts
index 9441eb4583..2020929d92 100644
--- a/src/frontend/packages/core/src/app.routing.ts
+++ b/src/frontend/packages/core/src/app.routing.ts
@@ -10,6 +10,8 @@ import { PageNotFoundComponentComponent } from './core/page-not-found-component/
 import { CustomRoutingImportModule } from './custom-import.module';
 import { DashboardBaseComponent } from './features/dashboard/dashboard-base/dashboard-base.component';
 import { HomePageComponent } from './features/home/home/home-page.component';
+import { LoginPageComponent } from './features/login/login-page/login-page.component';
+import { LogoutPageComponent } from './features/login/logout-page/logout-page.component';
 import { NoEndpointsNonAdminComponent } from './features/no-endpoints-non-admin/no-endpoints-non-admin.component';
 import { DomainMismatchComponent } from './features/setup/domain-mismatch/domain-mismatch.component';
 import { LocalAccountWizardComponent } from './features/setup/local-account-wizard/local-account-wizard.component';
@@ -40,7 +42,19 @@ const appRoutes: Routes = [
   },
   { path: 'upgrade', component: UpgradePageComponent },
   { path: 'domainMismatch', component: DomainMismatchComponent },
-  { path: 'login', loadChildren: () => import('./features/login/login.module').then(m => m.LoginModule) },
+  {
+    path: 'login',
+    children: [
+      {
+        path: '',
+        component: LoginPageComponent
+      },
+      {
+        path: 'logout',
+        component: LogoutPageComponent
+      },
+    ]
+  },
   {
     path: '',
     component: DashboardBaseComponent,
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 b43f57a0bf..c2d198c7d6 100644
--- a/src/frontend/packages/core/src/core/extension/extension-service.ts
+++ b/src/frontend/packages/core/src/core/extension/extension-service.ts
@@ -167,7 +167,8 @@ export class ExtensionService {
 
     if (extensionMetadata.loginComponent) {
       // Override the component used for the login route
-      const loginRoute = routeConfig.find(r => r.path === 'login') || {};
+      const loginRouteRoot = routeConfig.find(r => r.path === 'login') || { children: [] };
+      const loginRoute = loginRouteRoot.children.find(c => c.path === '');
       loginRoute.component = extensionMetadata.loginComponent;
       needsReset = true;
     }
diff --git a/src/frontend/packages/core/src/core/log-out-dialog/log-out-dialog.component.spec.ts b/src/frontend/packages/core/src/core/log-out-dialog/log-out-dialog.component.spec.ts
index b497e9540e..7d15220d14 100644
--- a/src/frontend/packages/core/src/core/log-out-dialog/log-out-dialog.component.spec.ts
+++ b/src/frontend/packages/core/src/core/log-out-dialog/log-out-dialog.component.spec.ts
@@ -1,19 +1,21 @@
 import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { Store } from '@ngrx/store';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreTestingModule } from '../../../test-framework/core-test.modules';
 import { SharedModule } from '../../shared/shared.module';
 import { CoreModule } from '../core.module';
+import { RouteModule } from './../../app.routing';
 import { LogOutDialogComponent } from './log-out-dialog.component';
 
 describe('LogOutDialogComponent', () => {
   let component: LogOutDialogComponent;
   let fixture: ComponentFixture<LogOutDialogComponent>;
   let element: HTMLElement;
-  let store: any;
+  let router: any;
 
   class MatDialogRefMock {
   }
@@ -30,6 +32,8 @@ describe('LogOutDialogComponent', () => {
       ],
       imports: [
         CoreModule,
+        RouterTestingModule,
+        RouteModule,
         SharedModule,
         MatDialogModule,
         NoopAnimationsModule,
@@ -42,7 +46,7 @@ describe('LogOutDialogComponent', () => {
 
   beforeEach(() => {
     fixture = TestBed.createComponent(LogOutDialogComponent);
-    store = TestBed.get(Store);
+    router = TestBed.get(Router);
     component = fixture.componentInstance;
     fixture.detectChanges();
     element = fixture.nativeElement;
@@ -52,8 +56,8 @@ describe('LogOutDialogComponent', () => {
     expect(component).toBeTruthy();
   });
 
-  it('should dispatch logout action after countdown', fakeAsync(() => {
-    const spy = spyOn(store, 'dispatch');
+  it('should naivgate after countdown', fakeAsync(() => {
+    const spy = spyOn(router, 'navigate');
 
     component.data = {
       expiryDate: Date.now() + 1000,
@@ -65,6 +69,7 @@ describe('LogOutDialogComponent', () => {
     expect(spy).not.toHaveBeenCalled();
     tick(1500);
     expect(spy).toHaveBeenCalled();
+    expect(spy).toHaveBeenCalledWith(['/login/logout']);
   }));
 
   afterEach(() => {
diff --git a/src/frontend/packages/core/src/core/log-out-dialog/log-out-dialog.component.ts b/src/frontend/packages/core/src/core/log-out-dialog/log-out-dialog.component.ts
index 477fc342d5..34574f7c51 100644
--- a/src/frontend/packages/core/src/core/log-out-dialog/log-out-dialog.component.ts
+++ b/src/frontend/packages/core/src/core/log-out-dialog/log-out-dialog.component.ts
@@ -1,12 +1,9 @@
 import { Component, Inject, OnDestroy, OnInit, Optional } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { Store } from '@ngrx/store';
+import { Router } from '@angular/router';
 import { interval, Subscription } from 'rxjs';
 import { tap } from 'rxjs/operators';
 
-import { Logout } from '../../../../store/src/actions/auth.actions';
-import { GeneralEntityAppState } from '../../../../store/src/app-state';
-
 @Component({
   selector: 'app-log-out-dialog',
   templateUrl: './log-out-dialog.component.html',
@@ -16,7 +13,8 @@ export class LogOutDialogComponent implements OnInit, OnDestroy {
   constructor(
     public dialogRef: MatDialogRef<LogOutDialogComponent>,
     @Optional() @Inject(MAT_DIALOG_DATA) public data: any,
-    private store: Store<GeneralEntityAppState>) { }
+    private router: Router
+  ) { }
 
   private autoLogout: Subscription;
   private countDown: number;
@@ -33,7 +31,7 @@ export class LogOutDialogComponent implements OnInit, OnDestroy {
           this.countDown = this.calcCountdown();
           if (this.countDown <= 0) {
             this.autoLogout.unsubscribe();
-            this.store.dispatch(new Logout());
+            this.router.navigate(['/login/logout']);
           } else {
             this.percentage = ((this.countdownTotal - this.countDown) / this.countdownTotal) * 100;
           }
diff --git a/src/frontend/packages/core/src/favicon.ico b/src/frontend/packages/core/src/favicon.ico
deleted file mode 100644
index 21f49bc43b08f557f085d0ba170f388e5956373f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/src/frontend/packages/core/src/features/login/login.module.ts b/src/frontend/packages/core/src/features/login/login.module.ts
index 5655c0d3a8..64649d97ad 100644
--- a/src/frontend/packages/core/src/features/login/login.module.ts
+++ b/src/frontend/packages/core/src/features/login/login.module.ts
@@ -3,17 +3,17 @@ import { NgModule } from '@angular/core';
 import { CoreModule } from '../../core/core.module';
 import { SharedModule } from '../../shared/shared.module';
 import { LoginPageComponent } from './login-page/login-page.component';
-import { LoginRoutingModule } from './login.routing';
+import { LogoutPageComponent } from './logout-page/logout-page.component';
 
 
 @NgModule({
   imports: [
     CoreModule,
-    SharedModule,
-    LoginRoutingModule
+    SharedModule
   ],
   declarations: [
-    LoginPageComponent
+    LoginPageComponent,
+    LogoutPageComponent
   ]
 })
 export class LoginModule { }
diff --git a/src/frontend/packages/core/src/features/login/login.routing.ts b/src/frontend/packages/core/src/features/login/login.routing.ts
deleted file mode 100644
index 1ecf12b3d0..0000000000
--- a/src/frontend/packages/core/src/features/login/login.routing.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-
-import { LoginPageComponent } from './login-page/login-page.component';
-
-const loginRoutes: Routes = [
-  { path: '', component: LoginPageComponent, }
-];
-
-@NgModule({
-  imports: [
-    RouterModule.forChild(loginRoutes),
-  ]
-})
-export class LoginRoutingModule { }
diff --git a/src/frontend/packages/core/src/features/login/logout-page/logout-page.component.html b/src/frontend/packages/core/src/features/login/logout-page/logout-page.component.html
new file mode 100644
index 0000000000..e0a4606837
--- /dev/null
+++ b/src/frontend/packages/core/src/features/login/logout-page/logout-page.component.html
@@ -0,0 +1,17 @@
+<app-intro-screen id="app-login-page" class="logout">
+  <mat-card class="logout__card">
+    <app-stratos-title></app-stratos-title>
+    <div class="logout__body" *ngIf="error$ | async; else loading">
+      <div class="logout__msg">An error occurred logging out</div>
+      <button (click)="reload()" color="primary" mat-raised-button mat-button>Reload</button>
+    </div>
+    <ng-template #loading>
+      <div class="logout__body">
+        <div class="logout__msg">Logging out</div>
+        <div id="logout__loading" class="logout__loading">
+          <mat-progress-bar mode="indeterminate"></mat-progress-bar>
+        </div>
+      </div>
+    </ng-template>
+  </mat-card>
+</app-intro-screen>
diff --git a/src/frontend/packages/core/src/features/login/logout-page/logout-page.component.scss b/src/frontend/packages/core/src/features/login/logout-page/logout-page.component.scss
new file mode 100644
index 0000000000..c1b0168e6d
--- /dev/null
+++ b/src/frontend/packages/core/src/features/login/logout-page/logout-page.component.scss
@@ -0,0 +1,14 @@
+.logout {
+  &__card {
+    padding: 0;
+    width: 300px;
+  }
+  &__body {
+    padding: 24px;
+    text-align: center;    
+  }
+  &__msg {
+    font-size: 18px;
+    padding-bottom: 20px;
+  }
+}
diff --git a/src/frontend/packages/core/src/features/login/logout-page/logout-page.component.spec.ts b/src/frontend/packages/core/src/features/login/logout-page/logout-page.component.spec.ts
new file mode 100644
index 0000000000..fff7bac83e
--- /dev/null
+++ b/src/frontend/packages/core/src/features/login/logout-page/logout-page.component.spec.ts
@@ -0,0 +1,42 @@
+import { CommonModule } from '@angular/common';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { CoreModule } from '@angular/flex-layout';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
+import { StoreModule } from '@ngrx/store';
+
+import { appReducers } from '../../../../../store/src/reducers.module';
+import { SharedModule } from '../../../public-api';
+import { LogoutPageComponent } from './logout-page.component';
+
+describe('LogoutPageComponent', () => {
+  let component: LogoutPageComponent;
+  let fixture: ComponentFixture<LogoutPageComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ LogoutPageComponent ],
+      imports: [
+        CommonModule,
+        CoreModule,
+        SharedModule,
+        RouterTestingModule,
+        NoopAnimationsModule,
+        StoreModule.forRoot(
+          appReducers
+        )
+      ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(LogoutPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/core/src/features/login/logout-page/logout-page.component.ts b/src/frontend/packages/core/src/features/login/logout-page/logout-page.component.ts
new file mode 100644
index 0000000000..ed30fc6c6d
--- /dev/null
+++ b/src/frontend/packages/core/src/features/login/logout-page/logout-page.component.ts
@@ -0,0 +1,35 @@
+import { Component, OnInit } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { Logout } from '../../../../../store/src/actions/auth.actions';
+import { AppState } from '../../../../../store/src/app-state';
+
+@Component({
+  selector: 'app-logout-page',
+  templateUrl: './logout-page.component.html',
+  styleUrls: ['./logout-page.component.scss']
+})
+export class LogoutPageComponent implements OnInit {
+
+  public error$: Observable<boolean>;
+
+  constructor(private store: Store<AppState>) {
+    this.error$ = this.store.select(s => s.auth).pipe(
+      map(auth => auth.error)
+    );
+  }
+
+  ngOnInit() {
+    // Dispatch the logout action after 1 second - give the logging out screen time to show
+    setTimeout(() => {
+      this.store.dispatch(new Logout());
+    }, 1000)
+  }
+
+  reload() {
+    window.location.assign(window.location.origin);
+  }
+
+}
diff --git a/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.scss b/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.scss
index 0c5079208e..ba56f7161a 100644
--- a/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.scss
+++ b/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.scss
@@ -1,5 +1,3 @@
-@import '../../../../sass/mat-desktop';
-
 $user-profile-avatar-size: 48px;
 
 .user-profile {
@@ -9,7 +7,7 @@ $user-profile-avatar-size: 48px;
   left: 0;
   position: absolute;
   right: 0;
-  top: $desktop-page-header-height;
+  top: 56px;
   mat-card:not(:first-child) {
     margin-top: 24px;
   }
diff --git a/src/frontend/packages/core/src/shared/components/app-action-monitor/app-action-monitor.component.html b/src/frontend/packages/core/src/shared/components/app-action-monitor/app-action-monitor.component.html
index 1c9713853c..a13bfa2bf3 100644
--- a/src/frontend/packages/core/src/shared/components/app-action-monitor/app-action-monitor.component.html
+++ b/src/frontend/packages/core/src/shared/components/app-action-monitor/app-action-monitor.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="dataSource.connect(null) | async as data">
+<div *ngIf="replayData$ | async as data">
   <app-table [dataSource]="dataSource" [columns]="allColumns" [prominentErrorBar]="data.length > 1">
   </app-table>
 </div>
\ 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 345af4a5c6..84b00b4d77 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
@@ -27,6 +27,8 @@ export class AppActionMonitorComponent<T> implements OnInit {
   @Input()
   public data$: Observable<Array<T>> = observableNever();
 
+  public replayData$: Observable<Array<T>>;
+
   @Input()
   public entityKey: string;
 
@@ -81,16 +83,16 @@ export class AppActionMonitorComponent<T> implements OnInit {
       cellFlex: '0 0 24px'
     };
 
-    // Some obs will only ever emit once, once consumed in template this meant table never received emitted data
-    // so wrap in publish replay
-    const replayData = this.data$.pipe(
+    // Some data$ obs only ever emit once. If we subscribed directly to this then that emit would be consumed and will not be available
+    // in the data source connect subscription. So wrap it in a replay to ensure the last emitted value is available 
+    this.replayData$ = this.data$.pipe(
       publishReplay(1),
       refCount()
     )
 
     this.allColumns = [...this.columns, monitorColumn];
     this.dataSource = {
-      connect: () => replayData,
+      connect: () => this.replayData$,
       disconnect: () => { },
       trackBy: (index, item) => {
         const fn = monitorColumn.cellConfig(item).getId;
diff --git a/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.html b/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.html
index ab46c56ea4..450f368b5f 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.html
+++ b/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.html
@@ -20,7 +20,7 @@
       [endpointDisconnected]="endpointDisconnected"></app-favorites-meta-card>
   </div>
   <ng-container *ngIf="(searchedEntities$ | async) as searchedEntities">
-    <button class="favorite-entity-list__expand-button" *ngIf="searchedEntities.length > minLimit"
+    <button class="favorite-entity-list__expand-button" *ngIf="searchedEntities.length > minLimit && !autoExpand"
       (click)="toggleExpand()" mat-icon-button>
       <mat-icon *ngIf="(limitToggle$ | async) === null">expand_less</mat-icon>
       <mat-icon *ngIf="(limitToggle$ | async) !== null">expand_more</mat-icon>
diff --git a/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts b/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts
index 06800db5f3..ff7bccbc37 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts
+++ b/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts
@@ -13,7 +13,7 @@ import { IFavoriteEntity } from '../../../../../store/src/types/user-favorite-ma
 })
 export class FavoritesEntityListComponent implements OnInit {
 
-  constructor(private favoritesConfigMapper: FavoritesConfigMapper) { }
+  constructor(private favoritesConfigMapper: FavoritesConfigMapper) {}
 
   @Input()
   set entities(favoriteEntities: IFavoriteEntity[]) {
@@ -30,6 +30,9 @@ export class FavoritesEntityListComponent implements OnInit {
   @Input()
   public endpointDisconnected = false;
 
+  @Input()
+  public autoExpand = false;
+
   @Input()
   set endpointTypes(types: string[] | string) {
     if (!this.favoriteTypes) {
@@ -144,5 +147,9 @@ export class FavoritesEntityListComponent implements OnInit {
       map(([nameSearch, type, entities]) => entities.length === 0 && (!!nameSearch || !!type)),
       startWith(false)
     );
+
+    if (this.autoExpand) {
+      this.toggleExpand();
+    }
   }
 }
diff --git a/src/frontend/packages/core/src/shared/components/favorites-global-list/favorites-global-list.component.html b/src/frontend/packages/core/src/shared/components/favorites-global-list/favorites-global-list.component.html
index 4d9fb7f213..394ead2585 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-global-list/favorites-global-list.component.html
+++ b/src/frontend/packages/core/src/shared/components/favorites-global-list/favorites-global-list.component.html
@@ -8,12 +8,13 @@
         }"></app-no-content-message>
       </div>
       <div class="favorite-list__group"
-        *ngFor="let favGroup of entityGroups;trackBy: trackByEndpointId; last as isLast">
+        *ngFor="let favGroup of entityGroups;trackBy: trackByEndpointId; last as isLast; count as count">
         <app-favorites-meta-card class="favorite-list__endpoint-card" [endpoint]="true"
           [endpointHasEntities]="favGroup.entities && favGroup.entities.length > 0"
           [favoriteEntity]="favGroup.endpoint"></app-favorites-meta-card>
         <app-favorites-entity-list *ngIf="favGroup.entities && favGroup.entities.length" class="favorite-list__entities"
           [endpointTypes]="favGroup.endpoint.favorite.endpointType" [entities]="favGroup.entities"
+          [autoExpand]="count === 1"
           [showFilters]="showFilters"></app-favorites-entity-list>
         <div *ngIf="favGroup.entities && favGroup.entities.length && !isLast" class="favorite-list__seperator"></div>
       </div>
diff --git a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.scss b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.scss
index 91e9b98d85..84f88ba55f 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.scss
+++ b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.scss
@@ -2,6 +2,7 @@
   min-height: 160px;
   outline: none;
   &__header-text {
+    line-height: 24px;
     margin-top: 0;
   }
   &__type {
diff --git a/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.theme.scss b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.theme.scss
new file mode 100644
index 0000000000..d1b982ae10
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/json-viewer/json-viewer.component.theme.scss
@@ -0,0 +1,15 @@
+@mixin app-json-view-theme($theme, $app-theme) {
+  $is-dark: map-get($theme, is-dark);
+
+  @if $is-dark == true {
+    // Keep this simple, otherwise there's a LOT of overrides.
+    // Additionally would need to bring in the non-dark mode colours to ensure the selectors work
+    app-json-viewer {
+      // There can be child json-viewers, ensure this only applies to the top level
+      &:not([root='false']) {
+        background-color: #ffffffeb;
+        border-radius: 3px;
+      }
+    }
+  }
+}
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 a0ee69b500..46be7b2b61 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
@@ -6,7 +6,6 @@ import * as moment from 'moment';
 import { Observable } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 
-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';
@@ -142,7 +141,7 @@ export class PageHeaderComponent implements OnDestroy, AfterViewInit {
   }
 
   logout() {
-    this.store.dispatch(new Logout());
+    this.router.navigate(['/login/logout']);
   }
 
   public toggleSidenav() {
diff --git a/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.scss b/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.scss
index dd660731ee..41dac047dd 100644
--- a/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.scss
+++ b/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.scss
@@ -20,6 +20,7 @@ $spacing: 10px;
   }
 
   &--name {
+    line-height: 24px;
     word-break: break-all;
   }
   &__icon {
diff --git a/src/frontend/packages/store/src/reducers/auth.reducer.ts b/src/frontend/packages/store/src/reducers/auth.reducer.ts
index c8ae1c2dd7..e06f551e5a 100644
--- a/src/frontend/packages/store/src/reducers/auth.reducer.ts
+++ b/src/frontend/packages/store/src/reducers/auth.reducer.ts
@@ -3,6 +3,7 @@ import {
   LOGIN_FAILED,
   LOGIN_SUCCESS,
   LoginFailed,
+  LOGOUT_FAILED,
   RESET_AUTH,
   SESSION_INVALID,
   SESSION_VERIFIED,
@@ -12,6 +13,7 @@ import { RouterActions, RouterNav } from '../actions/router.actions';
 import { GET_SYSTEM_INFO_SUCCESS } from '../actions/system.actions';
 import { AuthOnlyAppState } from '../app-state';
 import { SessionData } from '../types/auth.types';
+import { LogoutFailed } from './../actions/auth.actions';
 import { RouterRedirect } from './routing.reducer';
 
 export interface AuthUser {
@@ -51,6 +53,10 @@ export function authReducer(state: AuthState = defaultState, action): AuthState
     case LOGIN_FAILED:
       const loginFailed = action as LoginFailed;
       return { ...state, error: true, errorResponse: loginFailed.error, loggingIn: false, loggedIn: false };
+    case LOGOUT_FAILED:
+      const logoutFailed = action as LogoutFailed;
+      console.error(logoutFailed.error);
+      return { ...state, loggingIn: false, loggedIn: true, error: true, errorResponse: logoutFailed.error };
     case VERIFY_SESSION:
       return { ...state, error: false, errorResponse: undefined, verifying: true };
     case SESSION_VERIFIED:
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse.module.ts b/src/frontend/packages/suse-extensions/src/custom/suse.module.ts
index 09e8c82911..e0d45321b1 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/suse.module.ts
@@ -1,5 +1,4 @@
 import { NgModule } from '@angular/core';
-import { Router } from '@angular/router';
 
 import { CoreModule } from '../../../core/src/core/core.module';
 import { CustomizationService, CustomizationsMetadata } from '../../../core/src/core/customizations.types';
@@ -43,20 +42,7 @@ const SuseCustomizations: CustomizationsMetadata = {
   ]
 })
 export class SuseModule {
-
-  static init = false;
-
-  constructor(router: Router, cs: CustomizationService) {
+  constructor(cs: CustomizationService) {
     cs.set(SuseCustomizations);
-
-    // Only update the routes once
-    if (!SuseModule.init) {
-      // Override the component used for the login route
-      const routeConfig = [...router.config];
-      const loginRoute = routeConfig.find(r => r.path === 'login') || {};
-      loginRoute.component = SuseLoginComponent;
-      router.resetConfig(routeConfig);
-      SuseModule.init = true;
-    }
   }
 }
diff --git a/src/frontend/packages/suse-theme/_index.scss b/src/frontend/packages/suse-theme/_index.scss
index 4ee0c30016..4c2b94668c 100644
--- a/src/frontend/packages/suse-theme/_index.scss
+++ b/src/frontend/packages/suse-theme/_index.scss
@@ -29,7 +29,7 @@
     user-avatar-background-color: $suse-primary-color,
     user-avatar-foreground-color: $suse-text,
     user-avatar-header-invert-colors: false,
-    intro-screen-background-color: $suse-blue,
+    intro-screen-background-color: $suse-gray,
     side-nav: (
       background: $suse-side-nav-bg,
       text: $suse-side-nav-text,
diff --git a/src/test-e2e/application/application-autoscaler-e2e.spec.ts b/src/test-e2e/application/application-autoscaler-e2e.spec.ts
index e4c148492f..c2656ac9a4 100644
--- a/src/test-e2e/application/application-autoscaler-e2e.spec.ts
+++ b/src/test-e2e/application/application-autoscaler-e2e.spec.ts
@@ -479,6 +479,8 @@ describe('Autoscaler -', () => {
       }
 
       function waitForRow() {
+        // Timeout after 32 attempts (each 5 seconds, which is just under 3 minutes)
+        let retries = 32;
         const sub = timer(5000, 5000).pipe(
           switchMap(() => promise.all<boolean | number>([
             findRow(),
@@ -492,15 +494,24 @@ describe('Autoscaler -', () => {
             console.log(`${moment().toString()}: Waiting for event row: Skip actions... list is refreshing`);
             return;
           }
+          retries--;
           if (foundRow) {
             console.log(`${moment().toString()}: Waiting for event row: Found row!`);
             sub.unsubscribe();
           } else {
             console.log(`${moment().toString()}: Waiting for event row: manually refreshing list`);
             eventPageBase.list.header.refresh();
+            if (retries === 0) {
+              sub.unsubscribe();
+            }
           }
         });
         browser.wait(() => sub.closed);
+        // Fail the test if the retry count made it down to 0
+        if (retries === 0) {
+          e2e.debugLog('Timed out waiting for event row');
+          fail('Timed out waiting for event row');
+        }
       }
 
       it('Go to events page', () => {

From 8cde7b627cce568edf247aa603705e089f1fb4d7 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Fri, 24 Jul 2020 14:01:31 +0100
Subject: [PATCH 582/648] Patch 2.7.0 image to update nginx SSL configuration
 (#412)

* Patch 2.7.0 image

* Move patch files to better place
---
 deploy/suse/patches/nginx/Dockerfile |  4 ++
 deploy/suse/patches/nginx/README.md  |  3 ++
 deploy/suse/patches/nginx/build.sh   |  3 ++
 deploy/suse/patches/nginx/nginx.conf | 76 ++++++++++++++++++++++++++++
 4 files changed, 86 insertions(+)
 create mode 100644 deploy/suse/patches/nginx/Dockerfile
 create mode 100644 deploy/suse/patches/nginx/README.md
 create mode 100755 deploy/suse/patches/nginx/build.sh
 create mode 100644 deploy/suse/patches/nginx/nginx.conf

diff --git a/deploy/suse/patches/nginx/Dockerfile b/deploy/suse/patches/nginx/Dockerfile
new file mode 100644
index 0000000000..9b8cf0af03
--- /dev/null
+++ b/deploy/suse/patches/nginx/Dockerfile
@@ -0,0 +1,4 @@
+FROM registry.suse.com/cap/stratos-console:2.7.0-35f5964bd-cap
+
+COPY ./nginx.conf /etc/nginx/nginx.conf
+RUN echo "Stratos 2.7.1 NGINX configuration patch" > /patches.log
diff --git a/deploy/suse/patches/nginx/README.md b/deploy/suse/patches/nginx/README.md
new file mode 100644
index 0000000000..d6418e6ad5
--- /dev/null
+++ b/deploy/suse/patches/nginx/README.md
@@ -0,0 +1,3 @@
+# 2.7.0 Patch
+
+These files were used to create a patch for 2.7.0 that fixes the TLS ciphers used by nginx.
\ No newline at end of file
diff --git a/deploy/suse/patches/nginx/build.sh b/deploy/suse/patches/nginx/build.sh
new file mode 100755
index 0000000000..0214b442bd
--- /dev/null
+++ b/deploy/suse/patches/nginx/build.sh
@@ -0,0 +1,3 @@
+
+docker build -f Dockerfile . -t registry.suse.com/cap-staging/stratos-console-1:2.7.0-35f5964bd-cap
+docker push registry.suse.com/cap-staging/stratos-console-1:2.7.0-35f5964bd-cap
diff --git a/deploy/suse/patches/nginx/nginx.conf b/deploy/suse/patches/nginx/nginx.conf
new file mode 100644
index 0000000000..eb33fc4fed
--- /dev/null
+++ b/deploy/suse/patches/nginx/nginx.conf
@@ -0,0 +1,76 @@
+worker_processes 2;
+
+events {
+    worker_connections              4096;
+    use                             epoll;
+}
+
+http {
+
+    upstream portalproxy {
+        least_conn;
+        server                      localhost:3003;
+        keepalive                   32;
+    }
+
+    include                         mime.types;
+    default_type                    application/octet-stream;
+    keepalive_timeout               70;
+    proxy_read_timeout              200;
+    sendfile                        off;
+    tcp_nopush                      on;
+    tcp_nodelay                     on;
+    gzip                            on;
+    gzip_min_length                 1000;
+    gzip_proxied                    any;
+    gzip_types                      text/plain text/html text/css text/xml
+                                    application/x-javascript application/xml
+                                    application/atom+xml text/javascript;
+
+    proxy_next_upstream             error;
+
+    map $http_upgrade $connection_upgrade {
+        default upgrade;
+        ''      '';
+    }
+
+    ssl_session_cache               shared:SSL:10m;
+    ssl_session_timeout             10m;
+
+    server {
+        listen                      80;
+        return                      301 https://$host$request_uri;
+    }
+
+    server {
+        listen                      443 ssl;
+
+        ssl_certificate             /ENCRYPTION_KEY_VOLUME/console.crt;
+        ssl_certificate_key         /ENCRYPTION_KEY_VOLUME/console.key;
+        ssl_protocols               TLSv1.2 TLSv1.3;
+        ssl_ciphers                 ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384;
+        ssl_prefer_server_ciphers   on;        
+
+        client_max_body_size        50M;
+
+        location /pp/ {
+            proxy_pass_header       Server;
+            proxy_set_header        Host $http_host;
+            proxy_redirect          off;
+            proxy_set_header        X-Real-IP $remote_addr;
+            proxy_set_header        X-Scheme $scheme;
+            proxy_pass              https://portalproxy/pp/;
+            proxy_intercept_errors  on;
+            proxy_http_version      1.1;
+            proxy_set_header        Upgrade $http_upgrade;
+            proxy_set_header        Connection $connection_upgrade;
+        }
+
+        location / {
+            root                    /usr/share/nginx/html;
+            add_header Cache-Control no-cache;
+            add_header X-Frame-Options SAMEORIGIN;
+            try_files $uri$args $uri$args/ /index.html;
+        }
+    }
+}
\ No newline at end of file

From 72986426b3f25c25df2a7a7a921579dd263b459d Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Fri, 24 Jul 2020 14:31:55 +0100
Subject: [PATCH 583/648] Merge upstream - #2 (#416)

* Improve recent and favourites display (#4421)

* Improve recent and favourites display

* Remove debug logging

* Remove debug logging/subscription leak

* Unit test fix

* Tweaks following review

* Changes following review
- favourite & recent icon changes

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

* Add line-height to favourite and recent entity labels (#4438)

- missed out from another PR following review

* Autoscaler e2e tests: Give better failure error when the test can't find the scaling row (#4424)

* Improve autoscaler e2e tests

* Remove duplicate fail statement

* Helm Chart: Remove encryption key volume (#4355)

* Remove encryption key volume

* Remove encrpytion key volume migration from config-init job

* Improve the logout experience (#4439)

* Add support for including breaking changes in the changelog

* Improve the logout experience

* Fix unit tests

* Add request for version info to github issues template (#4443)

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Convert scripts to nodejs so they work on Windows (#4462)

* Convert scripts to js so they work on Windows

* Improve initial developer experience

* Fix scss compile on windows

* Fix windows build

* Use fs not fs-extra where possible (can work without npm install)

* Remove gulp

* Cleaner fixes for Windows

* Reset

* Fix whitespace

* Address PR feedback

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

* Shorten file paths containing `cloudfoundry`/`cloud-foundry` (#4466)

* Fix 'too long' file paths

* Fix build issues

* Convert scripts to js so they work on Windows

* Fix scss compile on windows

* Improve initial developer experience

* Fix scss compile on windows

* Fix windows build

* Use fs not fs-extra where possible (can work without npm install)

* Remove gulp

* Cleaner fixes for Windows

* Reset

* Fix whitespace

* Fix merge

Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>

* Fix log out page when there's a custom log in page

* Fix log out page given previous commit changes

Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
---
 build/clean-symlinks.js                       | 40 +++++++++
 build/clean-symlinks.sh                       | 28 -------
 build/dev-setup.js                            | 30 +++++++
 build/fe-build.js                             | 82 -------------------
 build/gulp.config.js                          | 14 ----
 build/prebuild-zip.js                         | 16 ++++
 build/store-git-metadata.js                   | 38 +++++++++
 deploy/ci/travis/check-e2e-pr.sh              |  4 +-
 .../packages/backend/pre_packaging            |  2 +-
 docs/developers-guide.md                      |  4 +-
 gulpfile.js                                   |  4 -
 package-lock.json                             | 31 +++----
 package.json                                  | 19 ++---
 .../cloud-foundry/sass/_all-theme.scss        |  4 +-
 .../src/actions/quota-definitions.actions.ts  |  2 +-
 .../src/cloud-foundry-routing.module.ts       |  2 +-
 .../src/cloud-foundry-test.module.ts          |  2 +-
 .../quota-definition.action-builders.ts       |  2 +-
 .../space-quota.action-builders.ts            |  2 +-
 .../application-delete.component.ts           |  2 +-
 ...te-instances-routes-list-config.service.ts |  2 +-
 .../instances-tab/instances-tab.component.ts  |  4 +-
 .../add-edit-space-step-base.ts               | 10 +--
 .../add-organization.component.html           |  0
 .../add-organization.component.scss           |  0
 .../add-organization.component.spec.ts        |  0
 .../add-organization.component.ts             |  0
 .../create-organization-step.component.html   |  0
 .../create-organization-step.component.scss   |  0
 ...create-organization-step.component.spec.ts |  0
 .../create-organization-step.component.ts     | 12 ++-
 .../add-quota/add-quota.component.html        |  0
 .../add-quota/add-quota.component.scss        |  0
 .../add-quota/add-quota.component.spec.ts     |  0
 .../add-quota/add-quota.component.ts          |  0
 .../create-quota-step.component.html          |  0
 .../create-quota-step.component.scss          |  0
 .../create-quota-step.component.spec.ts       |  0
 .../create-quota-step.component.ts            |  6 +-
 .../add-space-quota.component.html            |  0
 .../add-space-quota.component.scss            |  0
 .../add-space-quota.component.spec.ts         |  0
 .../add-space-quota.component.ts              |  0
 .../create-space-quota-step.component.html    |  0
 .../create-space-quota-step.component.scss    |  0
 .../create-space-quota-step.component.spec.ts |  0
 .../create-space-quota-step.component.ts      |  6 +-
 .../add-space/add-space.component.html        |  0
 .../add-space/add-space.component.scss        |  0
 .../add-space/add-space.component.spec.ts     |  0
 .../add-space/add-space.component.ts          |  0
 .../create-space-step.component.html          |  0
 .../create-space-step.component.scss          |  0
 .../create-space-step.component.spec.ts       |  0
 .../create-space-step.component.ts            |  2 +-
 .../{cloud-foundry => cf}/cf-cell.helpers.ts  |  2 +-
 .../{cloud-foundry => cf}/cf-page.types.ts    |  0
 .../{cloud-foundry => cf}/cf.helpers.ts       | 14 ++--
 .../cli-info-cloud-foundry.component.html     |  0
 .../cli-info-cloud-foundry.component.scss     |  0
 .../cli-info-cloud-foundry.component.spec.ts  |  0
 .../cli-info-cloud-foundry.component.ts       |  4 +-
 .../cloud-foundry-base.component.html         |  0
 .../cloud-foundry-base.component.scss         |  0
 .../cloud-foundry-base.component.spec.ts      |  0
 .../cloud-foundry-base.component.ts           |  0
 .../cloud-foundry-section.module.ts           | 68 ++++++++-------
 .../cloud-foundry-section.routing.ts          | 64 +++++++--------
 .../cloud-foundry-tabs-base.component.html    |  0
 .../cloud-foundry-tabs-base.component.scss    |  0
 .../cloud-foundry-tabs-base.component.spec.ts |  0
 .../cloud-foundry-tabs-base.component.ts      |  0
 .../cloud-foundry.component.html              |  0
 .../cloud-foundry.component.scss              |  0
 .../cloud-foundry.component.spec.ts           |  0
 .../cloud-foundry/cloud-foundry.component.ts  |  2 +-
 .../edit-organization-step.component.html     |  0
 .../edit-organization-step.component.scss     |  0
 .../edit-organization-step.component.spec.ts  |  0
 .../edit-organization-step.component.ts       |  8 +-
 .../edit-organization.component.html          |  0
 .../edit-organization.component.scss          |  0
 .../edit-organization.component.spec.ts       |  0
 .../edit-organization.component.ts            |  0
 .../edit-quota-step.component.html            |  0
 .../edit-quota-step.component.scss            |  0
 .../edit-quota-step.component.spec.ts         |  2 +-
 .../edit-quota-step.component.ts              |  6 +-
 .../edit-quota/edit-quota.component.html      |  0
 .../edit-quota/edit-quota.component.scss      |  0
 .../edit-quota/edit-quota.component.spec.ts   |  0
 .../edit-quota/edit-quota.component.ts        |  0
 .../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        |  6 +-
 .../edit-space-quota.component.html           |  0
 .../edit-space-quota.component.scss           |  0
 .../edit-space-quota.component.spec.ts        |  0
 .../edit-space-quota.component.ts             |  0
 .../edit-space-step.component.html            |  0
 .../edit-space-step.component.scss            |  0
 .../edit-space-step.component.spec.ts         |  0
 .../edit-space-step.component.ts              |  2 +-
 .../edit-space/edit-space.component.html      |  0
 .../edit-space/edit-space.component.scss      |  0
 .../edit-space/edit-space.component.spec.ts   |  0
 .../edit-space/edit-space.component.ts        |  0
 .../quota-definition-base.component.scss      |  0
 .../quota-definition-base.component.ts        |  0
 .../quota-definition-form.component.html      |  0
 .../quota-definition-form.component.scss      |  0
 .../quota-definition-form.component.ts        |  8 +-
 .../quota-definition.component.html           |  0
 .../quota-definition.component.scss           |  0
 .../quota-definition.component.spec.ts        |  0
 .../quota-definition.component.ts             |  0
 .../cloud-foundry-endpoint.service.ts         | 28 +++----
 .../services/cloud-foundry-org-space-quota.ts |  0
 .../cloud-foundry-organization-quota.ts       |  2 +-
 .../cloud-foundry-organization.service.ts     | 16 ++--
 .../services/cloud-foundry-space-quota.ts     |  2 +-
 .../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  |  8 +-
 .../space-quota-definition.component.html     |  0
 .../space-quota-definition.component.scss     |  0
 .../space-quota-definition.component.spec.ts  |  0
 .../space-quota-definition.component.ts       |  0
 .../cf-admin-add-user-warning.component.html  |  0
 .../cf-admin-add-user-warning.component.scss  |  0
 ...f-admin-add-user-warning.component.spec.ts |  0
 ...dmin-add-user-warning.component.theme.scss |  0
 .../cf-admin-add-user-warning.component.ts    |  4 +-
 .../cloud-foundry-build-packs.component.html  |  0
 .../cloud-foundry-build-packs.component.scss  |  0
 ...loud-foundry-build-packs.component.spec.ts |  0
 .../cloud-foundry-build-packs.component.ts    |  0
 .../cloud-foundry-cell-apps.component.html    |  0
 .../cloud-foundry-cell-apps.component.scss    |  0
 .../cloud-foundry-cell-apps.component.spec.ts |  0
 .../cloud-foundry-cell-apps.component.ts      |  0
 .../cloud-foundry-cell-base.component.html    |  0
 .../cloud-foundry-cell-base.component.scss    |  0
 .../cloud-foundry-cell-base.component.spec.ts |  0
 .../cloud-foundry-cell-base.component.ts      |  0
 .../cloud-foundry-cell-charts.component.html  |  0
 .../cloud-foundry-cell-charts.component.scss  |  0
 ...loud-foundry-cell-charts.component.spec.ts |  0
 .../cloud-foundry-cell-charts.component.ts    |  0
 .../cloud-foundry-cell-summary.component.html |  0
 .../cloud-foundry-cell-summary.component.scss |  0
 ...oud-foundry-cell-summary.component.spec.ts |  0
 .../cloud-foundry-cell-summary.component.ts   |  0
 .../cloud-foundry-cell.service.ts             |  0
 .../cloud-foundry-cells.component.html        |  0
 .../cloud-foundry-cells.component.scss        |  0
 .../cloud-foundry-cells.component.spec.ts     |  0
 .../cloud-foundry-cells.component.ts          |  0
 .../cloud-foundry-events.component.html       |  0
 .../cloud-foundry-events.component.scss       |  0
 .../cloud-foundry-events.component.spec.ts    |  0
 .../cloud-foundry-events.component.ts         |  0
 ...cloud-foundry-feature-flags.component.html |  0
 ...cloud-foundry-feature-flags.component.scss |  0
 ...ud-foundry-feature-flags.component.spec.ts |  0
 .../cloud-foundry-feature-flags.component.ts  |  0
 .../cloud-foundry-firehose-formatter.ts       |  0
 .../cloud-foundry-firehose.component.html     |  0
 .../cloud-foundry-firehose.component.scss     |  0
 .../cloud-foundry-firehose.component.spec.ts  |  0
 ...loud-foundry-firehose.component.theme.scss |  0
 .../cloud-foundry-firehose.component.ts       |  0
 .../cloud-foundry-firehose.types.ts           |  0
 ...y-organization-space-quotas.component.html |  0
 ...y-organization-space-quotas.component.scss |  0
 ...rganization-space-quotas.component.spec.ts |  0
 ...dry-organization-space-quotas.component.ts |  0
 ...ud-foundry-invite-user-link.component.html |  0
 ...ud-foundry-invite-user-link.component.scss |  0
 ...foundry-invite-user-link.component.spec.ts |  0
 ...loud-foundry-invite-user-link.component.ts |  0
 ...d-foundry-organization-base.component.html |  0
 ...d-foundry-organization-base.component.scss |  0
 ...oundry-organization-base.component.spec.ts |  0
 ...oud-foundry-organization-base.component.ts |  4 +-
 ...foundry-organization-events.component.html |  0
 ...foundry-organization-events.component.scss |  0
 ...ndry-organization-events.component.spec.ts |  0
 ...d-foundry-organization-events.component.ts |  0
 ...foundry-organization-spaces.component.html |  0
 ...foundry-organization-spaces.component.scss |  0
 ...ndry-organization-spaces.component.spec.ts |  0
 ...d-foundry-organization-spaces.component.ts |  0
 .../cloud-foundry-space-base.component.html   |  0
 .../cloud-foundry-space-base.component.scss   |  0
 ...cloud-foundry-space-base.component.spec.ts |  0
 .../cloud-foundry-space-base.component.ts     |  6 +-
 .../cloud-foundry-space-apps.component.html   |  0
 .../cloud-foundry-space-apps.component.scss   |  0
 ...cloud-foundry-space-apps.component.spec.ts |  0
 .../cloud-foundry-space-apps.component.ts     |  0
 .../cloud-foundry-space-events.component.html |  0
 .../cloud-foundry-space-events.component.scss |  0
 ...oud-foundry-space-events.component.spec.ts |  0
 .../cloud-foundry-space-events.component.ts   |  0
 .../cloud-foundry-space-routes.component.html |  0
 .../cloud-foundry-space-routes.component.scss |  0
 ...oud-foundry-space-routes.component.spec.ts |  0
 .../cloud-foundry-space-routes.component.ts   |  0
 ...dry-space-service-instances.component.html |  0
 ...dry-space-service-instances.component.scss |  0
 ...-space-service-instances.component.spec.ts |  0
 ...undry-space-service-instances.component.ts |  0
 ...cloud-foundry-space-summary.component.html |  0
 ...cloud-foundry-space-summary.component.scss |  0
 ...ud-foundry-space-summary.component.spec.ts |  0
 .../cloud-foundry-space-summary.component.ts  |  0
 ...pace-user-service-instances.component.html |  0
 ...pace-user-service-instances.component.scss |  0
 ...e-user-service-instances.component.spec.ts |  0
 ...-space-user-service-instances.component.ts |  0
 .../cloud-foundry-space-users.component.html  |  0
 .../cloud-foundry-space-users.component.scss  |  0
 ...loud-foundry-space-users.component.spec.ts |  4 +-
 .../cloud-foundry-space-users.component.ts    |  0
 ...oundry-organization-summary.component.html |  0
 ...oundry-organization-summary.component.scss |  0
 ...dry-organization-summary.component.spec.ts |  0
 ...-foundry-organization-summary.component.ts |  2 +-
 ...-foundry-organization-users.component.html |  0
 ...-foundry-organization-users.component.scss |  0
 ...undry-organization-users.component.spec.ts |  4 +-
 ...ud-foundry-organization-users.component.ts |  0
 ...cloud-foundry-organizations.component.html |  0
 ...cloud-foundry-organizations.component.scss |  0
 ...ud-foundry-organizations.component.spec.ts |  0
 .../cloud-foundry-organizations.component.ts  |  0
 .../cloud-foundry-quotas.component.html       |  0
 .../cloud-foundry-quotas.component.scss       |  0
 .../cloud-foundry-quotas.component.spec.ts    | 10 +--
 .../cloud-foundry-quotas.component.ts         |  0
 .../cloud-foundry-routes.component.html       |  0
 .../cloud-foundry-routes.component.scss       |  0
 .../cloud-foundry-routes.component.spec.ts    |  0
 .../cloud-foundry-routes.component.ts         |  0
 ...oud-foundry-security-groups.component.html |  0
 ...oud-foundry-security-groups.component.scss |  0
 ...-foundry-security-groups.component.spec.ts |  0
 ...cloud-foundry-security-groups.component.ts |  0
 .../cloud-foundry-stacks.component.html       |  0
 .../cloud-foundry-stacks.component.scss       |  0
 .../cloud-foundry-stacks.component.spec.ts    |  0
 .../cloud-foundry-stacks.component.ts         |  0
 .../cloud-foundry-summary-tab.component.html  |  0
 .../cloud-foundry-summary-tab.component.scss  |  0
 ...loud-foundry-summary-tab.component.spec.ts |  0
 .../cloud-foundry-summary-tab.component.ts    |  2 +-
 .../cloud-foundry-users.component.html        |  0
 .../cloud-foundry-users.component.scss        |  0
 .../cloud-foundry-users.component.spec.ts     |  0
 .../cloud-foundry-users.component.ts          |  6 +-
 ...invite-configuration-dialog.component.html | 16 +++-
 ...invite-configuration-dialog.component.scss |  0
 ...r-invite-configuration-dialog.component.ts |  1 +
 .../user-invites/user-invite.service.ts       |  2 +-
 .../invite-users-create.component.html        |  0
 .../invite-users-create.component.scss        |  0
 .../invite-users-create.component.spec.ts     |  0
 .../invite-users-create.component.ts          |  0
 .../invite-users/invite-users.component.html  |  0
 .../invite-users/invite-users.component.scss  |  0
 .../invite-users.component.spec.ts            |  0
 .../invite-users/invite-users.component.ts    |  0
 .../manage-users/cf-roles.service.spec.ts     |  0
 .../users/manage-users/cf-roles.service.ts    |  8 +-
 .../manage-users-confirm.component.html       |  0
 .../manage-users-confirm.component.scss       |  0
 .../manage-users-confirm.component.spec.ts    |  0
 .../manage-users-confirm.component.ts         |  0
 .../manage-users-modify.component.html        |  0
 .../manage-users-modify.component.scss        |  0
 .../manage-users-modify.component.spec.ts     |  0
 .../manage-users-modify.component.ts          |  0
 .../space-roles-list-wrapper.component.html   |  0
 .../space-roles-list-wrapper.component.scss   |  0
 ...space-roles-list-wrapper.component.spec.ts |  0
 .../space-roles-list-wrapper.component.ts     |  0
 .../manage-users-select.component.html        |  0
 .../manage-users-select.component.scss        |  0
 .../manage-users-select.component.spec.ts     |  0
 .../manage-users-select.component.ts          |  0
 .../manage-users-set-usernames.component.html |  0
 .../manage-users-set-usernames.component.scss |  0
 ...nage-users-set-usernames.component.spec.ts |  0
 .../manage-users-set-usernames.component.ts   |  0
 .../manage-users/manage-users.component.html  |  0
 .../manage-users/manage-users.component.scss  |  0
 .../manage-users.component.spec.ts            |  0
 .../manage-users/manage-users.component.ts    |  0
 .../remove-user/remove-user.component.html    |  0
 .../remove-user/remove-user.component.scss    |  0
 .../remove-user/remove-user.component.spec.ts |  2 +-
 .../remove-user/remove-user.component.ts      |  0
 .../service-catalog-page.component.ts         |  2 +-
 .../service-catalog/services-helper.ts        |  2 +-
 .../card-cf-info.component.spec.ts            |  2 +-
 .../card-cf-info/card-cf-info.component.ts    |  9 +-
 ...card-cf-org-user-details.component.spec.ts |  4 +-
 .../card-cf-org-user-details.component.ts     |  8 +-
 .../card-cf-recent-apps.component.spec.ts     |  2 +-
 .../card-cf-recent-apps.component.ts          |  5 +-
 .../compact-app-card.component.spec.ts        |  2 +-
 .../compact-app-card.component.ts             |  2 +-
 .../card-cf-space-details.component.spec.ts   |  2 +-
 .../card-cf-space-details.component.ts        |  4 +-
 .../card-cf-user-info.component.ts            |  4 +-
 .../cf-role-checkbox.component.spec.ts        |  4 +-
 .../cf-role-checkbox.component.ts             |  4 +-
 ...loud-foundry-events-list.component.spec.ts |  4 +-
 .../cf-app-instances-config.service.ts        |  2 +-
 .../app-service-binding-card.component.ts     |  2 +-
 ...app-service-binding-list-config.service.ts |  2 +-
 .../list-types/app/cf-apps-data-source.ts     |  4 +-
 .../cf-buildpacks-list-config.service.spec.ts |  2 +-
 .../cf-buildpacks-list-config.service.ts      |  2 +-
 .../cf-cell-apps-list-config.service.ts       |  2 +-
 .../cf-cell-health-list-config.service.ts     |  4 +-
 .../cf-cells/cf-cells-list-config.service.ts  |  4 +-
 .../types/cf-all-events-config.service.ts     |  4 +-
 .../types/cf-org-events-config.service.ts     |  4 +-
 .../types/cf-space-events-config.service.ts   |  2 +-
 ...-feature-flags-list-config.service.spec.ts |  2 +-
 .../cf-feature-flags-list-config.service.ts   |  2 +-
 .../cf-org-users-list-config.service.spec.ts  | 10 +--
 .../cf-org-users-list-config.service.ts       |  6 +-
 .../cf-org-card/cf-org-card.component.ts      | 12 +--
 .../cf-orgs/cf-orgs-data-source.service.ts    |  2 +-
 .../cf-orgs/cf-orgs-list-config.service.ts    |  2 +-
 .../cf-quotas-list-config.service.ts          |  2 +-
 .../cf-routes/cf-routes-data-source-base.ts   |  2 +-
 .../cf-routes-list-config.service.ts          |  2 +-
 ...cell-route-apps-attached.component.spec.ts |  2 +-
 .../cf-security-groups-card.component.spec.ts |  2 +-
 .../cf-security-groups-card.component.ts      |  4 +-
 ...ecurity-groups-list-config.service.spec.ts |  2 +-
 .../cf-security-groups-list-config.service.ts |  2 +-
 .../cf-select-users-list-config.service.ts    |  4 +-
 .../cf-service-instances-list-config.base.ts  |  2 +-
 .../cf-services-list-config.service.spec.ts   |  2 +-
 .../cf-services-list-config.service.ts        |  4 +-
 .../cf-user-service-instances-list-config.ts  |  2 +-
 .../cf-space-apps-data-source.service.ts      |  2 +-
 .../cf-space-apps-list-config.service.spec.ts |  2 +-
 .../cf-space-apps-list-config.service.ts      |  2 +-
 .../cf-space-quotas-list-config.service.ts    |  2 +-
 ...f-space-routes-list-config.service.spec.ts |  2 +-
 .../cf-space-routes-list-config.service.ts    |  2 +-
 ...cf-space-users-list-config.service.spec.ts | 12 ++-
 .../cf-space-users-list-config.service.ts     |  8 +-
 ...s-service-instances-list-config.service.ts |  2 +-
 .../cf-space-card.component.spec.ts           |  4 +-
 .../cf-space-card/cf-space-card.component.ts  | 10 +--
 .../cf-spaces-list-config.service.ts          |  4 +-
 .../cf-stacks-list-config.service.spec.ts     |  2 +-
 .../cf-stacks-list-config.service.ts          |  2 +-
 ...f-users-space-roles-data-source.service.ts |  2 +-
 ...able-cell-org-space-role.component.spec.ts |  4 +-
 .../table-cell-select-org.component.spec.ts   |  4 +-
 .../table-cell-select-org.component.ts        |  4 +-
 .../cf-org-permission-cell.component.ts       |  2 +-
 .../list-types/cf-users/cf-permission-cell.ts |  4 +-
 .../cf-space-permission-cell.component.ts     |  2 +-
 .../cf-user-list-config.service.spec.ts       |  8 +-
 .../cf-users/cf-user-list-config.service.ts   |  4 +-
 ...vice-instances-wall-list-config.service.ts |  2 +-
 .../shared/data-services/cf-user.service.ts   |  4 +-
 .../app-name-unique.directive.spec.ts         |  2 +-
 .../cf-user-permission.directive.ts           |  2 +-
 .../services/cf-org-space-label.service.ts    |  2 +-
 ...-foundry-user-provided-services.service.ts |  2 +-
 .../src/store/cloud-foundry.store.module.ts   |  2 +-
 .../src/store/effects/users-roles.effects.ts  |  2 +-
 .../cloud-foundry-endpoint-service.helper.ts  |  9 +-
 .../cloud-foundry-space.service.mock.ts       |  2 +-
 .../create-endpoint-cf-step-1.component.html  |  6 +-
 .../create-endpoint-cf-step-1.component.ts    |  1 +
 .../edit-endpoint-step.component.html         | 14 +++-
 .../edit-endpoint-step.component.ts           |  1 +
 .../console-uaa-wizard.component.html         | 14 +++-
 .../console-uaa-wizard.component.ts           |  9 +-
 src/frontend/packages/devkit/build.js         | 27 ++++++
 src/frontend/packages/devkit/build.sh         | 16 ----
 src/frontend/packages/devkit/package.json     |  2 +-
 .../packages/devkit/src/build/extensions.ts   | 16 +++-
 .../packages/devkit/src/build/sass.ts         |  5 +-
 .../packages/devkit/src/lib/packages.ts       |  2 +-
 src/jetstream/config.dev                      | 55 +++++++++++++
 ...fault.config.properties => config.example} |  2 +-
 src/jetstream/main.go                         |  5 +-
 .../application-autoscaler-e2e.spec.ts        | 70 ++++++++++++----
 src/test-e2e/po/form.po.ts                    |  2 -
 src/test-e2e/po/list.po.ts                    |  6 +-
 404 files changed, 652 insertions(+), 579 deletions(-)
 create mode 100644 build/clean-symlinks.js
 delete mode 100755 build/clean-symlinks.sh
 create mode 100644 build/dev-setup.js
 delete mode 100644 build/fe-build.js
 delete mode 100644 build/gulp.config.js
 create mode 100644 build/prebuild-zip.js
 create mode 100644 build/store-git-metadata.js
 delete mode 100644 gulpfile.js
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-edit-space-step-base.ts (89%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-organization/add-organization.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-organization/add-organization.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-organization/add-organization.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-organization/add-organization.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-organization/create-organization-step/create-organization-step.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-organization/create-organization-step/create-organization-step.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-organization/create-organization-step/create-organization-step.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-organization/create-organization-step/create-organization-step.component.ts (89%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-quota/add-quota.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-quota/add-quota.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-quota/add-quota.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-quota/add-quota.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-quota/create-quota-step/create-quota-step.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-quota/create-quota-step/create-quota-step.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-quota/create-quota-step/create-quota-step.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-quota/create-quota-step/create-quota-step.component.ts (83%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-space-quota/add-space-quota.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-space-quota/add-space-quota.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-space-quota/add-space-quota.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-space-quota/add-space-quota.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-space-quota/create-space-quota-step/create-space-quota-step.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-space-quota/create-space-quota-step/create-space-quota-step.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-space-quota/create-space-quota-step/create-space-quota-step.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts (86%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-space/add-space.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-space/add-space.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-space/add-space.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-space/add-space.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-space/create-space-step/create-space-step.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-space/create-space-step/create-space-step.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-space/create-space-step/create-space-step.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/add-space/create-space-step/create-space-step.component.ts (97%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/cf-cell.helpers.ts (96%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/cf-page.types.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/cf.helpers.ts (96%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/cli-info-cloud-foundry/cli-info-cloud-foundry.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/cli-info-cloud-foundry/cli-info-cloud-foundry.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/cli-info-cloud-foundry/cli-info-cloud-foundry.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts (96%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/cloud-foundry-base/cloud-foundry-base.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/cloud-foundry-base/cloud-foundry-base.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/cloud-foundry-base/cloud-foundry-base.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/cloud-foundry-base/cloud-foundry-base.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/cloud-foundry-section.module.ts (68%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/cloud-foundry-section.routing.ts (76%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/cloud-foundry/cloud-foundry.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/cloud-foundry/cloud-foundry.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/cloud-foundry/cloud-foundry.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/cloud-foundry/cloud-foundry.component.ts (94%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-organization/edit-organization-step/edit-organization-step.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-organization/edit-organization-step/edit-organization-step.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-organization/edit-organization-step/edit-organization-step.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-organization/edit-organization-step/edit-organization-step.component.ts (94%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-organization/edit-organization.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-organization/edit-organization.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-organization/edit-organization.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-organization/edit-organization.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-quota/edit-quota-step/edit-quota-step.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-quota/edit-quota-step/edit-quota-step.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts (93%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-quota/edit-quota-step/edit-quota-step.component.ts (88%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-quota/edit-quota.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-quota/edit-quota.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-quota/edit-quota.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-quota/edit-quota.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts (93%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts (89%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-space-quota/edit-space-quota.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-space-quota/edit-space-quota.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-space-quota/edit-space-quota.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-space-quota/edit-space-quota.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-space/edit-space-step/edit-space-step.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-space/edit-space-step/edit-space-step.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-space/edit-space-step/edit-space-step.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-space/edit-space-step/edit-space-step.component.ts (98%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-space/edit-space.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-space/edit-space.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-space/edit-space.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/edit-space/edit-space.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/quota-definition-base/quota-definition-base.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/quota-definition-base/quota-definition-base.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/quota-definition-form/quota-definition-form.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/quota-definition-form/quota-definition-form.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/quota-definition-form/quota-definition-form.component.ts (88%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/quota-definition/quota-definition.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/quota-definition/quota-definition.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/quota-definition/quota-definition.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/quota-definition/quota-definition.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/services/cloud-foundry-endpoint.service.ts (95%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/services/cloud-foundry-org-space-quota.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/services/cloud-foundry-organization-quota.ts (95%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/services/cloud-foundry-organization.service.ts (98%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/services/cloud-foundry-space-quota.ts (95%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/services/cloud-foundry-space.service.ts (98%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/space-quota-definition-form/space-quota-definition-form.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/space-quota-definition-form/space-quota-definition-form.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/space-quota-definition-form/space-quota-definition-form.component.ts (88%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/space-quota-definition/space-quota-definition.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/space-quota-definition/space-quota-definition.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/space-quota-definition/space-quota-definition.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/space-quota-definition/space-quota-definition.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.theme.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.ts (87%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-build-packs => cf/tabs/cf-build-packs}/cloud-foundry-build-packs.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-build-packs => cf/tabs/cf-build-packs}/cloud-foundry-build-packs.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-build-packs => cf/tabs/cf-build-packs}/cloud-foundry-build-packs.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-build-packs => cf/tabs/cf-build-packs}/cloud-foundry-build-packs.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-cells => cf/tabs/cf-cells}/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-cells => cf/tabs/cf-cells}/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-cells => cf/tabs/cf-cells}/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-cells => cf/tabs/cf-cells}/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-cells => cf/tabs/cf-cells}/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-cells => cf/tabs/cf-cells}/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-cells => cf/tabs/cf-cells}/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-cells => cf/tabs/cf-cells}/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-cells => cf/tabs/cf-cells}/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-cells => cf/tabs/cf-cells}/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-cells => cf/tabs/cf-cells}/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-cells => cf/tabs/cf-cells}/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-cells => cf/tabs/cf-cells}/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-cells => cf/tabs/cf-cells}/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-cells => cf/tabs/cf-cells}/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-cells => cf/tabs/cf-cells}/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-cells => cf/tabs/cf-cells}/cloud-foundry-cell/cloud-foundry-cell.service.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-cells => cf/tabs/cf-cells}/cloud-foundry-cells.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-cells => cf/tabs/cf-cells}/cloud-foundry-cells.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-cells => cf/tabs/cf-cells}/cloud-foundry-cells.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-cells => cf/tabs/cf-cells}/cloud-foundry-cells.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-events => cf/tabs/cf-events}/cloud-foundry-events.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-events => cf/tabs/cf-events}/cloud-foundry-events.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-events => cf/tabs/cf-events}/cloud-foundry-events.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-events => cf/tabs/cf-events}/cloud-foundry-events.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-feature-flags => cf/tabs/cf-feature-flags}/cloud-foundry-feature-flags.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-feature-flags => cf/tabs/cf-feature-flags}/cloud-foundry-feature-flags.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-feature-flags => cf/tabs/cf-feature-flags}/cloud-foundry-feature-flags.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-feature-flags => cf/tabs/cf-feature-flags}/cloud-foundry-feature-flags.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-firehose => cf/tabs/cf-firehose}/cloud-foundry-firehose-formatter.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-firehose => cf/tabs/cf-firehose}/cloud-foundry-firehose.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-firehose => cf/tabs/cf-firehose}/cloud-foundry-firehose.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-firehose => cf/tabs/cf-firehose}/cloud-foundry-firehose.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-firehose => cf/tabs/cf-firehose}/cloud-foundry-firehose.component.theme.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-firehose => cf/tabs/cf-firehose}/cloud-foundry-firehose.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-firehose => cf/tabs/cf-firehose}/cloud-foundry-firehose.types.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organization-space-quotas => cf/tabs/cf-organization-space-quotas}/cloud-foundry-organization-space-quotas.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organization-space-quotas => cf/tabs/cf-organization-space-quotas}/cloud-foundry-organization-space-quotas.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organization-space-quotas => cf/tabs/cf-organization-space-quotas}/cloud-foundry-organization-space-quotas.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organization-space-quotas => cf/tabs/cf-organization-space-quotas}/cloud-foundry-organization-space-quotas.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link => cf/tabs/cf-organizations/cf-invite-user-link}/cloud-foundry-invite-user-link.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link => cf/tabs/cf-organizations/cf-invite-user-link}/cloud-foundry-invite-user-link.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link => cf/tabs/cf-organizations/cf-invite-user-link}/cloud-foundry-invite-user-link.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link => cf/tabs/cf-organizations/cf-invite-user-link}/cloud-foundry-invite-user-link.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base => cf/tabs/cf-organizations/cf-organization-base}/cloud-foundry-organization-base.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base => cf/tabs/cf-organizations/cf-organization-base}/cloud-foundry-organization-base.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base => cf/tabs/cf-organizations/cf-organization-base}/cloud-foundry-organization-base.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base => cf/tabs/cf-organizations/cf-organization-base}/cloud-foundry-organization-base.component.ts (95%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-events => cf/tabs/cf-organizations/cf-organization-events}/cloud-foundry-organization-events.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-events => cf/tabs/cf-organizations/cf-organization-events}/cloud-foundry-organization-events.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-events => cf/tabs/cf-organizations/cf-organization-events}/cloud-foundry-organization-events.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-events => cf/tabs/cf-organizations/cf-organization-events}/cloud-foundry-organization-events.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/cloud-foundry-organization-spaces.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/cloud-foundry-organization-spaces.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/cloud-foundry-organization-spaces.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/cloud-foundry-organization-spaces.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/cloud-foundry-space-base/cloud-foundry-space-base.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/cloud-foundry-space-base/cloud-foundry-space-base.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/cloud-foundry-space-base/cloud-foundry-space-base.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/cloud-foundry-space-base/cloud-foundry-space-base.component.ts (95%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts (93%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces => cf/tabs/cf-organizations/cf-organization-spaces}/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary => cf/tabs/cf-organizations/cf-organization-summary}/cloud-foundry-organization-summary.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary => cf/tabs/cf-organizations/cf-organization-summary}/cloud-foundry-organization-summary.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary => cf/tabs/cf-organizations/cf-organization-summary}/cloud-foundry-organization-summary.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary => cf/tabs/cf-organizations/cf-organization-summary}/cloud-foundry-organization-summary.component.ts (97%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users => cf/tabs/cf-organizations/cf-organization-users}/cloud-foundry-organization-users.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users => cf/tabs/cf-organizations/cf-organization-users}/cloud-foundry-organization-users.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users => cf/tabs/cf-organizations/cf-organization-users}/cloud-foundry-organization-users.component.spec.ts (92%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users => cf/tabs/cf-organizations/cf-organization-users}/cloud-foundry-organization-users.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations => cf/tabs/cf-organizations}/cloud-foundry-organizations.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations => cf/tabs/cf-organizations}/cloud-foundry-organizations.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations => cf/tabs/cf-organizations}/cloud-foundry-organizations.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-organizations => cf/tabs/cf-organizations}/cloud-foundry-organizations.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-quotas => cf/tabs/cf-quotas}/cloud-foundry-quotas.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-quotas => cf/tabs/cf-quotas}/cloud-foundry-quotas.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-quotas => cf/tabs/cf-quotas}/cloud-foundry-quotas.component.spec.ts (71%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-quotas => cf/tabs/cf-quotas}/cloud-foundry-quotas.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-routes => cf/tabs/cf-routes}/cloud-foundry-routes.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-routes => cf/tabs/cf-routes}/cloud-foundry-routes.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-routes => cf/tabs/cf-routes}/cloud-foundry-routes.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-routes => cf/tabs/cf-routes}/cloud-foundry-routes.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-security-groups => cf/tabs/cf-security-groups}/cloud-foundry-security-groups.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-security-groups => cf/tabs/cf-security-groups}/cloud-foundry-security-groups.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-security-groups => cf/tabs/cf-security-groups}/cloud-foundry-security-groups.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-security-groups => cf/tabs/cf-security-groups}/cloud-foundry-security-groups.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-stacks => cf/tabs/cf-stacks}/cloud-foundry-stacks.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-stacks => cf/tabs/cf-stacks}/cloud-foundry-stacks.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-stacks => cf/tabs/cf-stacks}/cloud-foundry-stacks.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-stacks => cf/tabs/cf-stacks}/cloud-foundry-stacks.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-summary-tab => cf/tabs/cf-summary-tab}/cloud-foundry-summary-tab.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-summary-tab => cf/tabs/cf-summary-tab}/cloud-foundry-summary-tab.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-summary-tab => cf/tabs/cf-summary-tab}/cloud-foundry-summary-tab.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-summary-tab => cf/tabs/cf-summary-tab}/cloud-foundry-summary-tab.component.ts (93%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-users => cf/tabs/cf-users}/cloud-foundry-users.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-users => cf/tabs/cf-users}/cloud-foundry-users.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-users => cf/tabs/cf-users}/cloud-foundry-users.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry/tabs/cloud-foundry-users => cf/tabs/cf-users}/cloud-foundry-users.component.ts (84%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/user-invites/configuration-dialog/user-invite-configuration-dialog.component.html (63%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/user-invites/configuration-dialog/user-invite-configuration-dialog.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/user-invites/configuration-dialog/user-invite-configuration-dialog.component.ts (98%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/user-invites/user-invite.service.ts (98%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/invite-users/invite-users-create/invite-users-create.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/invite-users/invite-users-create/invite-users-create.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/invite-users/invite-users-create/invite-users-create.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/invite-users/invite-users-create/invite-users-create.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/invite-users/invite-users.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/invite-users/invite-users.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/invite-users/invite-users.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/invite-users/invite-users.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/cf-roles.service.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/cf-roles.service.ts (99%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/manage-users-confirm/manage-users-confirm.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/manage-users-confirm/manage-users-confirm.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/manage-users-confirm/manage-users-confirm.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/manage-users-confirm/manage-users-confirm.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/manage-users-modify/manage-users-modify.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/manage-users-modify/manage-users-modify.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/manage-users-modify/manage-users-modify.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/manage-users-modify/manage-users-modify.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/manage-users-select/manage-users-select.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/manage-users-select/manage-users-select.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/manage-users-select/manage-users-select.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/manage-users-select/manage-users-select.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/manage-users.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/manage-users.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/manage-users.component.spec.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/manage-users/manage-users.component.ts (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/remove-user/remove-user.component.html (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/remove-user/remove-user.component.scss (100%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/remove-user/remove-user.component.spec.ts (96%)
 rename src/frontend/packages/cloud-foundry/src/features/{cloud-foundry => cf}/users/remove-user/remove-user.component.ts (100%)
 create mode 100644 src/frontend/packages/devkit/build.js
 delete mode 100755 src/frontend/packages/devkit/build.sh
 create mode 100644 src/jetstream/config.dev
 rename src/jetstream/{default.config.properties => config.example} (98%)

diff --git a/build/clean-symlinks.js b/build/clean-symlinks.js
new file mode 100644
index 0000000000..9ae0c0aed1
--- /dev/null
+++ b/build/clean-symlinks.js
@@ -0,0 +1,40 @@
+// Clean any symlinks from a pre 4.0 Stratos
+// These are no longer used for customization and need to be removed
+
+// Implemented as a single script here so that it works on Windows, Linux and Mac
+
+const path = require('path');
+const fs = require('fs');
+
+// __dirname is the folder where build.js is located
+const STRATOS_DIR= path.resolve(__dirname, '..');
+
+function processFile(filepath) {
+  if (fs.existsSync(filepath)) {
+    const stats = fs.lstatSync(filepath);
+    if (stats.isSymbolicLink()) {
+      console.log(`Removing symlink ${filepath}`);
+      fs.unlinkSync(filepath);
+    }
+  }
+}
+
+function processFolder(dir) {
+  if (!fs.existsSync(dir)) {
+    return
+  }
+  fs.readdirSync(dir).forEach( f => {
+    let dirPath = path.join(dir, f);
+    const realPath = fs.realpathSync(dirPath);
+    const stats = fs.lstatSync(realPath);
+    if (stats.isDirectory()) {
+      processFolder(dirPath);
+    } else {
+      processFile(dirPath);
+    }
+  });
+};
+
+processFolder(path.join(STRATOS_DIR, 'src', 'frontend', 'packages', 'core', 'sass'));
+processFolder(path.join(STRATOS_DIR, 'src', 'frontend', 'packages', 'core', 'assets'));
+processFile(path.join(STRATOS_DIR, 'src', 'frontend', 'packages', 'core', 'favicon.ico'));
diff --git a/build/clean-symlinks.sh b/build/clean-symlinks.sh
deleted file mode 100755
index 0ff35b104b..0000000000
--- a/build/clean-symlinks.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-# Clean any symlinks from a pre 4.0 Stratos
-# These are no longer used for customization and need to be removed
-
-set -euo pipefail
-
-# Script folder
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-STRATOS="`cd "${DIR}/..";pwd`"
-
-function processFile {
-  filename=$1
-  if [ -L "$filename" ]; then
-    echo Removing symlink $filename
-    rm $filename
-  fi
-}
-
-function processFolder {
-  for filename in $1; do
-    processFile $filename
-  done
-}
-
-processFolder "${STRATOS}/src/frontend/packages/core/sass/*.*"
-processFolder "${STRATOS}/src/frontend/packages/core/assets/*.*"
-processFile "${STRATOS}/src/frontend/packages/core/favicon.ico"
diff --git a/build/dev-setup.js b/build/dev-setup.js
new file mode 100644
index 0000000000..77a7d6abc1
--- /dev/null
+++ b/build/dev-setup.js
@@ -0,0 +1,30 @@
+// Copy files required for developer quick start
+// Implemented as a single script here so that it works on Windows, Linux and Mac
+
+const path = require('path');
+const fs = require('fs');
+
+// __dirname is the folder where build.js is located
+const STRATOS_DIR= path.resolve(__dirname, '..');
+
+// Only copy files if they are not already there - just make sure initial versions are in place for developer
+
+// Proxy config file
+const PROXY_CONF = path.join(STRATOS_DIR, 'proxy.conf.js');
+if (!fs.existsSync(PROXY_CONF)) {
+  let err = fs.copyFileSync(path.join(__dirname, 'proxy.conf.localdev.js'), PROXY_CONF);
+  if (err) {
+    console.log(err);
+  }
+}
+
+// config.properties
+const BACKEND_DIR = path.join(STRATOS_DIR, 'src', 'jetstream');
+const BACKEND_CONF = path.join(BACKEND_DIR, 'config.properties');
+const BACKEND_CONF_DEV = path.join(BACKEND_DIR, 'config.dev');
+if (!fs.existsSync(BACKEND_CONF)) {
+  let err = fs.copyFileSync(BACKEND_CONF_DEV, BACKEND_CONF);
+  if (err) {
+    console.log(err);
+  }
+}
diff --git a/build/fe-build.js b/build/fe-build.js
deleted file mode 100644
index 75946dd93c..0000000000
--- a/build/fe-build.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Gulp build file for Angular 2 Front End UI Code
- */
-/* eslint-disable angular/log,no-console,no-process-env,angular/json-functions,no-sync */
-(function () {
-  'use strict';
-
-  var gulp = require('gulp');
-  // var _ = require('lodash');
-  var del = require('delete');
-  var spawn = require('child_process').spawn;
-  var path = require('path');
-  var os = require('os');
-  var zip = require('gulp-zip');
-  var fs = require('fs-extra');
-
-  var config = require('./gulp.config');
-  var paths = config.paths;
-
-  // Clean dist dir
-  gulp.task('clean', function (next) {
-    del(paths.dist + '**/*', {
-      force: true
-    }, next);
-  });
-
-  // Package pre-built UI for the buildpack to detect
-  gulp.task('package-prebuild', function () {
-    return gulp.src('dist/**/*')
-      .pipe(zip('stratos-frontend-prebuild.zip'))
-      .pipe(gulp.dest('.'))
-  });
-
-  gulp.task('dev-setup', function (cb) {
-    // Copy proxy.conf.js so the front-end is all ready to go against a local backend - if not already exsiting
-    var proxyConf = path.resolve(__dirname, '../proxy.conf.js');
-    var localProxyConf = path.resolve(__dirname, './proxy.conf.localdev.js');
-    if (!fs.existsSync(proxyConf)) {
-      fs.copySync(localProxyConf, proxyConf);
-    }
-    cb();
-  });
-
-  // Legacy task name
-  gulp.task('clean:dist', gulp.series('clean'));
-
-  gulp.task('ng-build', function (cb) {
-    var rootFolder = path.resolve(__dirname, '..');
-    var cmd = 'npm';
-    var windowsEnvironment = os.platform().startsWith('win');
-    if (windowsEnvironment) {
-      cmd = 'npm.cmd';
-    }
-    var child = spawn(cmd, ['run', 'build'], {
-      cwd: rootFolder
-    });
-    child.stdout.on('data', function (data) {
-      console.log(data.toString());
-    });
-    child.stderr.on('data', function (data) {
-      console.log(data.toString());
-    });
-    child.on('error', function (err) {
-      console.log(err);
-      cb(err);
-    });
-    child.on('close', function (code) {
-      var err = code === 0 ? undefined : 'Build exited with code: ' + code;
-      cb(err);
-    });
-  });
-
-  // Production build
-  gulp.task('build', gulp.series(
-    'clean',
-    'ng-build'
-  ));
-
-  // Default task is to build for production
-  gulp.task('default', gulp.series('build'));
-
-})();
diff --git a/build/gulp.config.js b/build/gulp.config.js
deleted file mode 100644
index 683b24bbb0..0000000000
--- a/build/gulp.config.js
+++ /dev/null
@@ -1,14 +0,0 @@
-(function () {
-  'use strict';
-
-  // This stores all the configuration information for Gulp
-  var paths = {
-    dist: './dist/',
-    ui: './ui'
-  };
-
-  // Now returned as an object so require always returns same object
-  module.exports = {
-    paths: paths
-  };
-})();
diff --git a/build/prebuild-zip.js b/build/prebuild-zip.js
new file mode 100644
index 0000000000..6fb3253396
--- /dev/null
+++ b/build/prebuild-zip.js
@@ -0,0 +1,16 @@
+// Zip the dist folder
+// Implemented as a single script here so that it works on Windows, Linux and Mac
+
+const path = require('path');
+const fs = require('fs');
+const AdmZip = require('adm-zip');
+
+// __dirname is the folder where build.js is located
+const STRATOS_DIR= path.resolve(__dirname, '..');
+const DIST_DIR= path.join(STRATOS_DIR, 'dist');
+const ZIP_FILE= path.join(STRATOS_DIR, 'stratos-frontend-prebuild.zip');
+
+var zip = new AdmZip();
+
+zip.addLocalFolder(DIST_DIR);
+zip.writeZip(path.join(ZIP_FILE));
\ No newline at end of file
diff --git a/build/store-git-metadata.js b/build/store-git-metadata.js
new file mode 100644
index 0000000000..36825cd654
--- /dev/null
+++ b/build/store-git-metadata.js
@@ -0,0 +1,38 @@
+// Generate the git metadata file
+
+// Implemented as a single script here so that it works on Windows, Linux and Mac
+
+const path = require('path');
+const fs = require('fs');
+const execSync = require('child_process').execSync;
+
+// __dirname is the folder where build.js is located
+const STRATOS_DIR = path.resolve(__dirname, '..');
+const GIT_FOLDER = path.join(STRATOS_DIR, '.git');
+const GIT_METADATA = path.join(STRATOS_DIR, '.stratos-git-metadata.json');
+
+function execGit(cmd) {
+  try {
+    var response = execSync(cmd);
+    return response.toString().trim();
+  } catch (e) {
+    console.log(e)
+    return '';
+  }
+}
+
+// We can only do this if we have a git repository checkout
+// We'll store this in a file which we will then use - when in environments like Docker, we will run this
+// in the host environment so that we can pick it up when we're running in the Docker world
+// Do we have a git folder?
+if (!fs.existsSync(GIT_FOLDER)) {
+  console.log('  + Unable to store git repository metadata - .git folder not found');
+  return;
+}
+var gitMetadata = {
+  project: execGit('git config --get remote.origin.url'),
+  branch: execGit('git rev-parse --abbrev-ref HEAD'),
+  commit: execGit('git rev-parse HEAD')
+};
+
+fs.writeFileSync(GIT_METADATA, JSON.stringify(gitMetadata, null, 2));
diff --git a/deploy/ci/travis/check-e2e-pr.sh b/deploy/ci/travis/check-e2e-pr.sh
index 89ab5b6346..5ba336a72c 100755
--- a/deploy/ci/travis/check-e2e-pr.sh
+++ b/deploy/ci/travis/check-e2e-pr.sh
@@ -2,8 +2,8 @@
 
 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')
+    echo "Checking labels on ${TRAVIS_REPO_SLUG} #${TRAVIS_PULL_REQUEST}"
+    LABEL=$(curl -s "https://api.github.com/repos/${TRAVIS_REPO_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
diff --git a/deploy/stratos-ui-release/packages/backend/pre_packaging b/deploy/stratos-ui-release/packages/backend/pre_packaging
index ba252553a7..65abaaabb3 100644
--- a/deploy/stratos-ui-release/packages/backend/pre_packaging
+++ b/deploy/stratos-ui-release/packages/backend/pre_packaging
@@ -11,7 +11,7 @@ curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
 # Build backend
 npm install
 export PATH=$PATH:$PWD/node_modules/.bin
-npm run bosh-build-backend
+npm run build-backend
 
 find ../stratos/deploy -type d   ! -path '../stratos/deploy' ! -path '*/db' -maxdepth 1 |  xargs rm -rf
 
diff --git a/docs/developers-guide.md b/docs/developers-guide.md
index eb36575687..9d9929d16e 100644
--- a/docs/developers-guide.md
+++ b/docs/developers-guide.md
@@ -212,7 +212,7 @@ db provider this can be done by deleting `src/jetstream/console-database.db`
 
 #### Configure by Environment Variables and/or Config File
 
-By default, the configuration in file `src/jetstream/default.config.properties` will be used. These can be changed by environment variables
+By default, the configuration in file `src/jetstream/config.properties` will be used. These can be changed by environment variables
 or an overrides file.
 
 ##### Environment variable
@@ -238,7 +238,7 @@ If you have a custom uaa, ensure you have set the following environment variable
 
 ##### Config File
 
-To easily persist configuration settings copy `src/jetstream/default.config.properties` to `src/jetstream/config.properties`. The backend will load its
+To easily persist configuration settings copy `src/jetstream/config.example` to `src/jetstream/config.properties`. The backend will load its
 configuration from this file in preference to the default config file, if it exists. You can also modify individual configuration settings
 by setting the corresponding environment variable.
 
diff --git a/gulpfile.js b/gulpfile.js
deleted file mode 100644
index d5e126f981..0000000000
--- a/gulpfile.js
+++ /dev/null
@@ -1,4 +0,0 @@
-(function () {
-  'use strict';
-  require('./build/fe-build');
-})();
diff --git a/package-lock.json b/package-lock.json
index fdfea562d5..ae80a769d8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3193,9 +3193,9 @@
       }
     },
     "@tootallnate/once": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.0.0.tgz",
-      "integrity": "sha512-KYyTT/T6ALPkIRd2Ge080X/BsXvy9O0hcWTtMWkPvwAwF99+vn6Dv4GzrFT/Nn1LePr+FFDbRXXlqmsy9lw2zA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
       "dev": true
     },
     "@tweenjs/tween.js": {
@@ -3630,9 +3630,9 @@
       }
     },
     "adm-zip": {
-      "version": "0.4.14",
-      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.14.tgz",
-      "integrity": "sha512-/9aQCnQHF+0IiCl0qhXoK7qs//SwYE7zX8lsr/DNk1BRAHYxeLZPL4pguwK29gUEqasYQjqPtEpDRSWEkdHn9g==",
+      "version": "0.4.16",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.16.tgz",
+      "integrity": "sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg==",
       "dev": true
     },
     "after": {
@@ -5464,9 +5464,9 @@
       "dev": true
     },
     "codecov": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.7.0.tgz",
-      "integrity": "sha512-uIixKofG099NbUDyzRk1HdGtaG8O+PBUAg3wfmjwXw2+ek+PZp+puRvbTohqrVfuudaezivJHFgTtSC3M8MXww==",
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.7.1.tgz",
+      "integrity": "sha512-JHWxyPTkMLLJn9SmKJnwAnvY09kg2Os2+Ux+GG7LwZ9g8gzDDISpIN5wAsH1UBaafA/yGcd3KofMaorE8qd6Lw==",
       "dev": true,
       "requires": {
         "argv": "0.0.2",
@@ -11832,9 +11832,10 @@
       }
     },
     "lodash": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+      "version": "4.17.19",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+      "dev": true
     },
     "lodash-es": {
       "version": "4.17.15",
@@ -19302,9 +19303,9 @@
       },
       "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==",
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.1.tgz",
+          "integrity": "sha512-01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg==",
           "dev": true,
           "requires": {
             "debug": "4"
diff --git a/package.json b/package.json
index 53e0ea9544..32d6ab56b1 100644
--- a/package.json
+++ b/package.json
@@ -8,13 +8,13 @@
     "build-chartsync": "./build/chartsync-build.sh",
     "full-build-dev": "npm run build-dev; npm run build-backend",
     "fetch-backend-deps": "./build/bk-fetch-deps.sh",
-    "bosh-build-backend": "gulp bosh-build-backend",
     "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=1500 --gc_interval=100 node_modules/@angular/cli/bin/ng build --prod",
     "build-dev": "ng build --dev",
-    "prebuild-ui": "npm run build && gulp package-prebuild",
+    "prebuild-ui": "npm run build && npm run prebuild-zip",
+    "prebuild-zip": "node build/prebuild-zip.js",
     "ng": "ng",
     "start": "ng serve",
     "start-high-mem": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng serve",
@@ -38,10 +38,11 @@
     "headless-e2e": "xvfb-run --server-args='-screen 0 1920x1080x24' protractor ./protractor.conf.js",
     "climate": "codeclimate analyze $(git diff --name-only master)",
     "gate-check": "npm run lint && npm run test-headless",
-    "store-git-metadata": "gulp store-git-metadata",
-    "postinstall": "gulp dev-setup && npm run build-devkit && npm run clean-symlinks",
+    "store-git-metadata": "node build/store-git-metadata.js",
+    "postinstall": "npm run dev-setup && npm run build-devkit && npm run clean-symlinks && npm run store-git-metadata",
     "build-devkit": "cd src/frontend/packages/devkit && npm run build",
-    "clean-symlinks": "./build/clean-symlinks.sh"
+    "clean-symlinks": "node build/clean-symlinks.js",
+    "dev-setup": "node build/dev-setup.js"
   },
   "author": "",
   "license": "Apache-2.0",
@@ -111,15 +112,14 @@
     "@types/node": "^13.11.1",
     "@types/request": "^2.48.4",
     "acorn": "^7.1.1",
+    "adm-zip": "^0.4.16",
     "browserstack-local": "^1.4.5",
-    "codecov": "^3.6.5",
+    "codecov": "^3.7.1",
     "codelyzer": "^5.1.2",
     "copy-webpack-plugin": "5.1.1",
     "delete": "^1.1.0",
     "fs-extra": "^9.0.0",
     "globby": "^11.0.0",
-    "gulp": "^4.0.2",
-    "gulp-zip": "^5.0.1",
     "istanbul": "^0.4.5",
     "istanbul-api": "2.1.6",
     "istanbul-reports": "3.0.2",
@@ -136,7 +136,7 @@
     "karma-jasmine-html-reporter": "^1.5.3",
     "karma-spec-reporter": "0.0.32",
     "kind-of": "^6.0.3",
-    "lodash": "^4.17.13",
+    "lodash": "^4.17.19",
     "mem": "6.1.0",
     "mktemp": "^1.0.0",
     "ng-packagr": "^9.1.1",
@@ -145,7 +145,6 @@
     "protractor": "^5.4.3",
     "ps-node": "^0.1.6",
     "q": "^1.4.1",
-    "replace-in-file": "^5.0.2",
     "request": "^2.88.2",
     "request-promise-native": "^1.0.8",
     "rxjs-tslint": "^0.1.8",
diff --git a/src/frontend/packages/cloud-foundry/sass/_all-theme.scss b/src/frontend/packages/cloud-foundry/sass/_all-theme.scss
index b344095253..8818f59d8a 100644
--- a/src/frontend/packages/cloud-foundry/sass/_all-theme.scss
+++ b/src/frontend/packages/cloud-foundry/sass/_all-theme.scss
@@ -7,10 +7,10 @@
 
 @import '../src/shared/components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component.theme';
 @import '../src/shared/components/schema-form/schema-form.component.theme';
-@import '../src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.theme';
+@import '../src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.theme';
 @import '../src/features/applications/deploy-application/deploy-application.component.theme';
 @import '../src/features/applications/deploy-application/deploy-application-step2/deploy-application-fs/deploy-application-fs.component.theme';
-@import '../src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.theme';
+@import '../src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.theme';
 
 @mixin apply-theme-stratos-cloud-foundry($stratos-theme) {
 
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 e06451854c..84ddf52a57 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
@@ -7,7 +7,7 @@ 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 { QuotaFormValues } from '../features/cf/quota-definition-form/quota-definition-form.component';
 import { CFStartAction } from './cf-action.types';
 
 export const GET_QUOTA_DEFINITION = '[QuotaDefinition] Get one';
diff --git a/src/frontend/packages/cloud-foundry/src/cloud-foundry-routing.module.ts b/src/frontend/packages/cloud-foundry/src/cloud-foundry-routing.module.ts
index 0266310650..61bfb111fb 100644
--- a/src/frontend/packages/cloud-foundry/src/cloud-foundry-routing.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/cloud-foundry-routing.module.ts
@@ -42,7 +42,7 @@ const customRoutes: Routes = [
   },
   {
     path: 'cloud-foundry',
-    loadChildren: () => import('./features/cloud-foundry/cloud-foundry-section.module').then(m => m.CloudFoundrySectionModule),
+    loadChildren: () => import('./features/cf/cloud-foundry-section.module').then(m => m.CloudFoundrySectionModule),
     data: {
       stratosNavigation: {
         label: 'Cloud Foundry',
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 5bb932f851..2bc284c36c 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
@@ -11,7 +11,7 @@ import { generateStratosEntities } from '../../store/src/stratos-entity-generato
 import { testSCFEndpointGuid } from '../../store/testing/public-api';
 import { BaseCfOrgSpaceRouteMock } from '../test-framework/cloud-foundry-endpoint-service.helper';
 import { generateCFEntities } from './cf-entity-generator';
-import { ActiveRouteCfOrgSpace } from './features/cloud-foundry/cf-page.types';
+import { ActiveRouteCfOrgSpace } from './features/cf/cf-page.types';
 import { CfUserService } from './shared/data-services/cf-user.service';
 import { LongRunningCfOperationsService } from './shared/data-services/long-running-cf-op.service';
 import { GitSCMService } from './shared/data-services/scm/scm.service';
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 4641cb90da..4576dd019f 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
@@ -6,7 +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';
+import { QuotaFormValues } from '../features/cf/quota-definition-form/quota-definition-form.component';
 
 export interface QuotaDefinitionActionBuilder extends OrchestratedActionBuilders {
   get: (
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 68d96b2c80..aec68cfd2e 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
@@ -8,7 +8,7 @@ import {
   UpdateSpaceQuotaDefinition,
 } from '../actions/quota-definitions.actions';
 import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator';
-import { QuotaFormValues } from '../features/cloud-foundry/quota-definition-form/quota-definition-form.component';
+import { QuotaFormValues } from '../features/cf/quota-definition-form/quota-definition-form.component';
 
 export interface SpaceQuotaDefinitionActionBuilders extends OrchestratedActionBuilders {
   get: (
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 956f90192e..b12daa358f 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
@@ -47,7 +47,7 @@ import {
 import {
   TableCellTCPRouteComponent,
 } from '../../../shared/components/list/list-types/cf-routes/table-cell-tcproute/table-cell-tcproute.component';
-import { isServiceInstance, isUserProvidedServiceInstance } from '../../cloud-foundry/cf.helpers';
+import { isServiceInstance, isUserProvidedServiceInstance } from '../../cf/cf.helpers';
 import { ApplicationService } from '../application.service';
 
 
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 f8b961dfba..f3db600307 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
@@ -21,7 +21,7 @@ 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 { fetchTotalResults } from '../../../cloud-foundry/cf.helpers';
+import { fetchTotalResults } from '../../../cf/cf.helpers';
 import { ApplicationService } from '../../application.service';
 
 @Injectable()
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/instances-tab/instances-tab.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/instances-tab/instances-tab.component.ts
index bff084c141..a9be4072a6 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/instances-tab/instances-tab.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/instances-tab/instances-tab.component.ts
@@ -5,8 +5,8 @@ import { CF_GUID } from '../../../../../../../../core/src/shared/entity.tokens';
 import {
   CfAppInstancesConfigService,
 } from '../../../../../../shared/components/list/list-types/app-instance/cf-app-instances-config.service';
-import { ActiveRouteCfOrgSpace } from '../../../../../cloud-foundry/cf-page.types';
-import { CloudFoundryEndpointService } from '../../../../../cloud-foundry/services/cloud-foundry-endpoint.service';
+import { ActiveRouteCfOrgSpace } from '../../../../../cf/cf-page.types';
+import { CloudFoundryEndpointService } from '../../../../../cf/services/cloud-foundry-endpoint.service';
 import { ApplicationMonitorService } from '../../../../application-monitor.service';
 
 @Component({
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/cf/add-edit-space-step-base.ts
similarity index 89%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-edit-space-step-base.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-edit-space-step-base.ts
index b625a0b8a0..b40983c572 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/cf/add-edit-space-step-base.ts
@@ -4,14 +4,14 @@ import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
 import { filter, first, map, tap } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
-import { organizationEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
-import { createEntityRelationPaginationKey } from '../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { StepOnNextResult } from '../../../../core/src/shared/components/stepper/step/step.component';
 import { getPaginationKey } from '../../../../store/src/actions/pagination.actions';
 import { APIResource } from '../../../../store/src/types/api.types';
 import { ISpaceQuotaDefinition } from '../../cf-api.types';
+import { CFAppState } from '../../cf-app-state';
 import { cfEntityCatalog } from '../../cf-entity-catalog';
+import { organizationEntityType } from '../../cf-entity-types';
+import { createEntityRelationPaginationKey } from '../../entity-relations/entity-relations.types';
 import { ActiveRouteCfOrgSpace } from './cf-page.types';
 
 export class AddEditSpaceStepBase {
@@ -35,8 +35,8 @@ export class AddEditSpaceStepBase {
       this.orgGuid,
       this.cfGuid,
       getPaginationKey(organizationEntityType, this.orgGuid), {
-        flatten: true,
-      }
+      flatten: true,
+    }
     ).entities$.pipe(
       filter(spaces => !!spaces),
       map(spaces => spaces.map(space => space.entity.name)),
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/add-organization.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/add-organization/add-organization.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/add-organization.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-organization/add-organization.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/add-organization.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/add-organization/add-organization.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/add-organization.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-organization/add-organization.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/add-organization.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-organization/add-organization.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/add-organization.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-organization/add-organization.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/add-organization.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-organization/add-organization.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/add-organization.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-organization/add-organization.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/add-organization/create-organization-step/create-organization-step.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-organization/create-organization-step/create-organization-step.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/add-organization/create-organization-step/create-organization-step.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-organization/create-organization-step/create-organization-step.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-organization/create-organization-step/create-organization-step.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-organization/create-organization-step/create-organization-step.component.spec.ts
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/cf/add-organization/create-organization-step/create-organization-step.component.ts
similarity index 89%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-organization/create-organization-step/create-organization-step.component.ts
index acc4f55a0c..c13b3bdef2 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/cf/add-organization/create-organization-step/create-organization-step.component.ts
@@ -5,22 +5,20 @@ import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
 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 } 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 { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
 import { endpointEntityType } from '../../../../../../store/src/helpers/stratos-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 { CreateOrganization } from '../../../../actions/organization.actions';
 import { IOrganization, IOrgQuotaDefinition } from '../../../../cf-api.types';
+import { CFAppState } from '../../../../cf-app-state';
 import { cfEntityCatalog } from '../../../../cf-entity-catalog';
+import { organizationEntityType } from '../../../../cf-entity-types';
 import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
+import { createEntityRelationPaginationKey } from '../../../../entity-relations/entity-relations.types';
+import { selectCfRequestInfo } from '../../../../store/selectors/api.selectors';
 import { CloudFoundryEndpointService } from '../../services/cloud-foundry-endpoint.service';
 
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/add-quota/add-quota.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-quota/add-quota.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/add-quota/add-quota.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-quota/add-quota.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-quota/add-quota.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-quota/add-quota.component.spec.ts
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/cf/add-quota/add-quota.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-quota/add-quota.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/add-quota/create-quota-step/create-quota-step.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-quota/create-quota-step/create-quota-step.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/add-quota/create-quota-step/create-quota-step.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-quota/create-quota-step/create-quota-step.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-quota/create-quota-step/create-quota-step.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-quota/create-quota-step/create-quota-step.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-quota/create-quota-step/create-quota-step.component.ts
similarity index 83%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-quota/create-quota-step/create-quota-step.component.ts
index 772a75ba57..d5fbe9dbfd 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/add-quota/create-quota-step/create-quota-step.component.ts
@@ -3,11 +3,11 @@ import { FormGroup } from '@angular/forms';
 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 { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
+import { cfEntityCatalog } from '../../../../cf-entity-catalog';
+import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
+import { getActiveRouteCfOrgSpaceProvider } from '../../cf.helpers';
 import { QuotaDefinitionFormComponent } from '../../quota-definition-form/quota-definition-form.component';
 
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/add-space-quota.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/add-space-quota.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/add-space-quota.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/add-space-quota.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/add-space-quota.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/add-space-quota.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/add-space-quota.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/add-space-quota.component.ts
diff --git a/src/frontend/packages/cloud-foundry/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/cf/add-space-quota/create-space-quota-step/create-space-quota-step.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/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/cf/add-space-quota/create-space-quota-step/create-space-quota-step.component.html
diff --git a/src/frontend/packages/cloud-foundry/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/cf/add-space-quota/create-space-quota-step/create-space-quota-step.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/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/cf/add-space-quota/create-space-quota-step/create-space-quota-step.component.scss
diff --git a/src/frontend/packages/cloud-foundry/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/cf/add-space-quota/create-space-quota-step/create-space-quota-step.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/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/cf/add-space-quota/create-space-quota-step/create-space-quota-step.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/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/cf/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts
similarity index 86%
rename from src/frontend/packages/cloud-foundry/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/cf/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts
index af6f0b51e1..6d3214c331 100644
--- a/src/frontend/packages/cloud-foundry/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/cf/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts
@@ -3,13 +3,13 @@ import { ActivatedRoute } from '@angular/router';
 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 { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
 import { APIResource } from '../../../../../../store/src/types/api.types';
 import { IQuotaDefinition } from '../../../../cf-api.types';
+import { cfEntityCatalog } from '../../../../cf-entity-catalog';
+import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
+import { getActiveRouteCfOrgSpaceProvider } from '../../cf.helpers';
 import { SpaceQuotaDefinitionFormComponent } from '../../space-quota-definition-form/space-quota-definition-form.component';
 
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/add-space.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/add-space/add-space.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/add-space.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space/add-space.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/add-space.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/add-space/add-space.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/add-space.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space/add-space.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/add-space.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-space/add-space.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/add-space.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space/add-space.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/add-space.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-space/add-space.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/add-space.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space/add-space.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/add-space/create-space-step/create-space-step.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space/create-space-step/create-space-step.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/add-space/create-space-step/create-space-step.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space/create-space-step/create-space-step.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-space/create-space-step/create-space-step.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space/create-space-step/create-space-step.component.spec.ts
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/cf/add-space/create-space-step/create-space-step.component.ts
similarity index 97%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space/create-space-step/create-space-step.component.ts
index 8d2f3e6d96..5f85a93af3 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/cf/add-space/create-space-step/create-space-step.component.ts
@@ -5,9 +5,9 @@ import { Store } from '@ngrx/store';
 import { Subscription } from 'rxjs';
 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';
 import { RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
+import { CFAppState } from '../../../../cf-app-state';
 import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { AddEditSpaceStepBase } from '../../add-edit-space-step-base';
 import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf-cell.helpers.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cf-cell.helpers.ts
similarity index 96%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf-cell.helpers.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/cf-cell.helpers.ts
index 375a28581a..5362fa9b69 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf-cell.helpers.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/cf-cell.helpers.ts
@@ -11,7 +11,7 @@ import { IMetrics } from '../../../../store/src/types/base-metric.types';
 import { MetricQueryType } from '../../../../store/src/types/metric.types';
 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';
+import { CellMetrics } from './tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell.service';
 
 export class CfCellHelper {
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf-page.types.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cf-page.types.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf-page.types.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/cf-page.types.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cf.helpers.ts
similarity index 96%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/cf.helpers.ts
index e6e64456f7..a4ddeb40cf 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/cf.helpers.ts
@@ -3,14 +3,6 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable } from 'rxjs';
 import { filter, first, map, publishReplay, refCount, switchMap, tap } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
-import { getCFEntityKey } from '../../../../cloud-foundry/src/cf-entity-helpers';
-import { applicationEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
-import {
-  getCurrentUserCFEndpointRolesState,
-} from '../../../../cloud-foundry/src/store/selectors/cf-current-user-role.selectors';
-import { ICfRolesState } from '../../../../cloud-foundry/src/store/types/cf-current-user-roles.types';
-import { UserRoleLabels } from '../../../../cloud-foundry/src/store/types/users-roles.types';
 import { PermissionConfig } from '../../../../core/src/core/permissions/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../core/src/core/permissions/current-user-permissions.service';
 import { getIdFromRoute, pathGet } from '../../../../core/src/core/utils.service';
@@ -29,9 +21,14 @@ 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 { CFFeatureFlagTypes, IApp, ISpace } from '../../cf-api.types';
+import { CFAppState } from '../../cf-app-state';
 import { cfEntityFactory } from '../../cf-entity-factory';
+import { getCFEntityKey } from '../../cf-entity-helpers';
+import { applicationEntityType } from '../../cf-entity-types';
 import { CFEntityConfig } from '../../cf-types';
 import { ListCfRoute } from '../../shared/components/list/list-types/cf-routes/cf-routes-data-source-base';
+import { getCurrentUserCFEndpointRolesState } from '../../store/selectors/cf-current-user-role.selectors';
+import { ICfRolesState } from '../../store/types/cf-current-user-roles.types';
 import {
   CfUser,
   CfUserRoleParams,
@@ -40,6 +37,7 @@ import {
   UserRoleInOrg,
   UserRoleInSpace,
 } from '../../store/types/cf-user.types';
+import { UserRoleLabels } from '../../store/types/users-roles.types';
 import { CfCurrentUserPermissions, CfPermissionTypes } from '../../user-permissions/cf-user-permissions-checkers';
 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.html b/src/frontend/packages/cloud-foundry/src/features/cf/cli-info-cloud-foundry/cli-info-cloud-foundry.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/cli-info-cloud-foundry/cli-info-cloud-foundry.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/cli-info-cloud-foundry/cli-info-cloud-foundry.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/cli-info-cloud-foundry/cli-info-cloud-foundry.component.scss
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/cf/cli-info-cloud-foundry/cli-info-cloud-foundry.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/cli-info-cloud-foundry/cli-info-cloud-foundry.component.spec.ts
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/cf/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
similarity index 96%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
index 3449967904..1f0eb737b6 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/cf/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
@@ -3,8 +3,6 @@ import { Store } from '@ngrx/store';
 import { BehaviorSubject, combineLatest, Observable, of as observableOf } from 'rxjs';
 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 { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
 import { RouterNav } from '../../../../../store/src/actions/router.actions';
 import { getFullEndpointApiUrl } from '../../../../../store/src/endpoint-utils';
@@ -12,6 +10,8 @@ import { APIResource, EntityInfo } from '../../../../../store/src/types/api.type
 import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
 import { getPreviousRoutingState } from '../../../../../store/src/types/routing.type';
 import { IOrganization, ISpace } from '../../../cf-api.types';
+import { CFAppState } from '../../../cf-app-state';
+import { CFAppCLIInfoContext } from '../../../shared/components/cli-info/cli-info.component';
 import {
   CloudFoundryUserProvidedServicesService,
 } from '../../../shared/services/cloud-foundry-user-provided-services.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-base/cloud-foundry-base.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-base/cloud-foundry-base.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-base/cloud-foundry-base.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-base/cloud-foundry-base.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-base/cloud-foundry-base.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-base/cloud-foundry-base.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-base/cloud-foundry-base.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-base/cloud-foundry-base.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-base/cloud-foundry-base.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-base/cloud-foundry-base.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-base/cloud-foundry-base.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-base/cloud-foundry-base.component.spec.ts
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/cf/cloud-foundry-base/cloud-foundry-base.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-base/cloud-foundry-base.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-base/cloud-foundry-base.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-section.module.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-section.module.ts
similarity index 68%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-section.module.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-section.module.ts
index ca523e3b30..aa22c90c69 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-section.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-section.module.ts
@@ -41,80 +41,76 @@ import { CloudFoundryOrganizationService } from './services/cloud-foundry-organi
 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';
+import { CloudFoundryBuildPacksComponent } from './tabs/cf-build-packs/cloud-foundry-build-packs.component';
 import {
   CloudFoundryCellAppsComponent,
-} from './tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component';
+} from './tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component';
 import {
   CloudFoundryCellBaseComponent,
-} from './tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component';
+} from './tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component';
 import {
   CloudFoundryCellChartsComponent,
-} from './tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component';
+} from './tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component';
 import {
   CloudFoundryCellSummaryComponent,
-} from './tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component';
-import { CloudFoundryCellService } from './tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service';
-import { CloudFoundryCellsComponent } from './tabs/cloud-foundry-cells/cloud-foundry-cells.component';
-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';
+} from './tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component';
+import { CloudFoundryCellService } from './tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell.service';
+import { CloudFoundryCellsComponent } from './tabs/cf-cells/cloud-foundry-cells.component';
+import { CloudFoundryEventsComponent } from './tabs/cf-events/cloud-foundry-events.component';
+import { CloudFoundryFeatureFlagsComponent } from './tabs/cf-feature-flags/cloud-foundry-feature-flags.component';
+import { CloudFoundryFirehoseComponent } from './tabs/cf-firehose/cloud-foundry-firehose.component';
 import {
   CloudFoundryOrganizationSpaceQuotasComponent,
-} from './tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component';
+} from './tabs/cf-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';
+} from './tabs/cf-organizations/cf-invite-user-link/cloud-foundry-invite-user-link.component';
 import {
   CloudFoundryOrganizationBaseComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component';
+} from './tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component';
 import {
   CloudFoundryOrganizationEventsComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component';
+} from './tabs/cf-organizations/cf-organization-events/cloud-foundry-organization-events.component';
 import {
   CloudFoundryOrganizationSpacesComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component';
+} from './tabs/cf-organizations/cf-organization-spaces/cloud-foundry-organization-spaces.component';
 import {
   CloudFoundrySpaceBaseComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component';
+} from './tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component';
 import {
   CloudFoundrySpaceAppsComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component';
+} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component';
 import {
   CloudFoundrySpaceEventsComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component';
+} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component';
 import {
   CloudFoundrySpaceRoutesComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component';
+} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component';
 import {
   CloudFoundrySpaceServiceInstancesComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component';
+} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component';
 import {
   CloudFoundrySpaceSummaryComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component';
+} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component';
 import {
   CloudFoundrySpaceUserServiceInstancesComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component';
+} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component';
 import {
   CloudFoundrySpaceUsersComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component';
+} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component';
 import {
   CloudFoundryOrganizationSummaryComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component';
+} from './tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component';
 import {
   CloudFoundryOrganizationUsersComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component';
-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,
-} from './tabs/cloud-foundry-security-groups/cloud-foundry-security-groups.component';
-import { CloudFoundryStacksComponent } from './tabs/cloud-foundry-stacks/cloud-foundry-stacks.component';
-import { CloudFoundrySummaryTabComponent } from './tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component';
-import { CloudFoundryUsersComponent } from './tabs/cloud-foundry-users/cloud-foundry-users.component';
+} from './tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component';
+import { CloudFoundryOrganizationsComponent } from './tabs/cf-organizations/cloud-foundry-organizations.component';
+import { CloudFoundryQuotasComponent } from './tabs/cf-quotas/cloud-foundry-quotas.component';
+import { CloudFoundryRoutesComponent } from './tabs/cf-routes/cloud-foundry-routes.component';
+import { CloudFoundrySecurityGroupsComponent } from './tabs/cf-security-groups/cloud-foundry-security-groups.component';
+import { CloudFoundryStacksComponent } from './tabs/cf-stacks/cloud-foundry-stacks.component';
+import { CloudFoundrySummaryTabComponent } from './tabs/cf-summary-tab/cloud-foundry-summary-tab.component';
+import { CloudFoundryUsersComponent } from './tabs/cf-users/cloud-foundry-users.component';
 import {
   UserInviteConfigurationDialogComponent,
 } from './user-invites/configuration-dialog/user-invite-configuration-dialog.component';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-section.routing.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-section.routing.ts
similarity index 76%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-section.routing.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-section.routing.ts
index 258d2b2163..b8b6a008f3 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-section.routing.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-section.routing.ts
@@ -20,76 +20,72 @@ import { EditSpaceQuotaComponent } from './edit-space-quota/edit-space-quota.com
 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';
-import { CloudFoundryBuildPacksComponent } from './tabs/cloud-foundry-build-packs/cloud-foundry-build-packs.component';
+import { CloudFoundryBuildPacksComponent } from './tabs/cf-build-packs/cloud-foundry-build-packs.component';
 import {
   CloudFoundryCellAppsComponent,
-} from './tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component';
+} from './tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component';
 import {
   CloudFoundryCellBaseComponent,
-} from './tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component';
+} from './tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component';
 import {
   CloudFoundryCellChartsComponent,
-} from './tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component';
+} from './tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component';
 import {
   CloudFoundryCellSummaryComponent,
-} from './tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component';
-import { CloudFoundryCellsComponent } from './tabs/cloud-foundry-cells/cloud-foundry-cells.component';
-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';
+} from './tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component';
+import { CloudFoundryCellsComponent } from './tabs/cf-cells/cloud-foundry-cells.component';
+import { CloudFoundryEventsComponent } from './tabs/cf-events/cloud-foundry-events.component';
+import { CloudFoundryFeatureFlagsComponent } from './tabs/cf-feature-flags/cloud-foundry-feature-flags.component';
+import { CloudFoundryFirehoseComponent } from './tabs/cf-firehose/cloud-foundry-firehose.component';
 import {
   CloudFoundryOrganizationSpaceQuotasComponent,
-} from './tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component';
+} from './tabs/cf-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';
+} from './tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component';
 import {
   CloudFoundryOrganizationEventsComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component';
+} from './tabs/cf-organizations/cf-organization-events/cloud-foundry-organization-events.component';
 import {
   CloudFoundryOrganizationSpacesComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component';
+} from './tabs/cf-organizations/cf-organization-spaces/cloud-foundry-organization-spaces.component';
 import {
   CloudFoundrySpaceBaseComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component';
+} from './tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component';
 import {
   CloudFoundrySpaceAppsComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component';
+} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component';
 import {
   CloudFoundrySpaceEventsComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component';
+} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component';
 import {
   CloudFoundrySpaceRoutesComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component';
+} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component';
 import {
   CloudFoundrySpaceServiceInstancesComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component';
+} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component';
 import {
   CloudFoundrySpaceSummaryComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component';
+} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component';
 import {
   CloudFoundrySpaceUserServiceInstancesComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component';
+} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component';
 import {
   CloudFoundrySpaceUsersComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component';
+} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component';
 import {
   CloudFoundryOrganizationSummaryComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component';
+} from './tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component';
 import {
   CloudFoundryOrganizationUsersComponent,
-} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component';
-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,
-} from './tabs/cloud-foundry-security-groups/cloud-foundry-security-groups.component';
-import { CloudFoundryStacksComponent } from './tabs/cloud-foundry-stacks/cloud-foundry-stacks.component';
-import { CloudFoundrySummaryTabComponent } from './tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component';
-import { CloudFoundryUsersComponent } from './tabs/cloud-foundry-users/cloud-foundry-users.component';
+} from './tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component';
+import { CloudFoundryOrganizationsComponent } from './tabs/cf-organizations/cloud-foundry-organizations.component';
+import { CloudFoundryQuotasComponent } from './tabs/cf-quotas/cloud-foundry-quotas.component';
+import { CloudFoundryRoutesComponent } from './tabs/cf-routes/cloud-foundry-routes.component';
+import { CloudFoundrySecurityGroupsComponent } from './tabs/cf-security-groups/cloud-foundry-security-groups.component';
+import { CloudFoundryStacksComponent } from './tabs/cf-stacks/cloud-foundry-stacks.component';
+import { CloudFoundrySummaryTabComponent } from './tabs/cf-summary-tab/cloud-foundry-summary-tab.component';
+import { CloudFoundryUsersComponent } from './tabs/cf-users/cloud-foundry-users.component';
 import { InviteUsersComponent } from './users/invite-users/invite-users.component';
 import { UsersRolesComponent } from './users/manage-users/manage-users.component';
 import { RemoveUserComponent } from './users/remove-user/remove-user.component';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry/cloud-foundry.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry/cloud-foundry.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry/cloud-foundry.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry/cloud-foundry.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry/cloud-foundry.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry/cloud-foundry.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry/cloud-foundry.component.ts
similarity index 94%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry/cloud-foundry.component.ts
index 716ad78c4a..e1b4af53cb 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry/cloud-foundry.component.ts
@@ -3,9 +3,9 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { first, map } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import { ListConfig } from '../../../../../core/src/shared/components/list/list.component.types';
 import { RouterNav } from '../../../../../store/src/actions/router.actions';
+import { CFAppState } from '../../../cf-app-state';
 import {
   CFEndpointsListConfigService,
 } from '../../../shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization-step/edit-organization-step.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization-step/edit-organization-step.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization-step/edit-organization-step.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization-step/edit-organization-step.component.scss
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/cf/edit-organization/edit-organization-step/edit-organization-step.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization-step/edit-organization-step.component.spec.ts
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/cf/edit-organization/edit-organization-step/edit-organization-step.component.ts
similarity index 94%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization-step/edit-organization-step.component.ts
index 5a91738c56..9d206f596b 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/cf/edit-organization/edit-organization-step/edit-organization-step.component.ts
@@ -4,11 +4,6 @@ import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
 import { filter, map, pairwise, take, tap } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
-import { organizationEntityType } 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 { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { endpointEntityType } from '../../../../../../store/src/helpers/stratos-entity-factory';
@@ -17,8 +12,11 @@ import { ActionState } from '../../../../../../store/src/reducers/api-request-re
 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 { CFAppState } from '../../../../cf-app-state';
 import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../cf-entity-factory';
+import { organizationEntityType } from '../../../../cf-entity-types';
+import { createEntityRelationPaginationKey } from '../../../../entity-relations/entity-relations.types';
 import {
   CloudFoundryUserProvidedServicesService,
 } from '../../../../shared/services/cloud-foundry-user-provided-services.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization.component.scss
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/cf/edit-organization/edit-organization.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota-step/edit-quota-step.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota-step/edit-quota-step.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota-step/edit-quota-step.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota-step/edit-quota-step.component.scss
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/cf/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts
similarity index 93%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts
index 3267ef2916..1216c269d4 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/cf/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts
@@ -1,8 +1,8 @@
 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 { 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-quota/edit-quota-step/edit-quota-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota-step/edit-quota-step.component.ts
similarity index 88%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota-step/edit-quota-step.component.ts
index 822c25a51a..01c463628d 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota-step/edit-quota-step.component.ts
@@ -4,15 +4,15 @@ import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
 import { filter, first, 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 { 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 { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types';
 import { APIResource } from '../../../../../../store/src/types/api.types';
 import { IOrgQuotaDefinition } from '../../../../cf-api.types';
+import { cfEntityCatalog } from '../../../../cf-entity-catalog';
+import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
+import { getActiveRouteCfOrgSpaceProvider } from '../../cf.helpers';
 import { QuotaDefinitionFormComponent } from '../../quota-definition-form/quota-definition-form.component';
 
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota.component.ts
diff --git a/src/frontend/packages/cloud-foundry/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/cf/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/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/cf/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.html
diff --git a/src/frontend/packages/cloud-foundry/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/cf/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/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/cf/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.scss
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/cf/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts
similarity index 93%
rename from src/frontend/packages/cloud-foundry/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/cf/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts
index 052372456f..3b26f9d45b 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/cf/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts
@@ -1,8 +1,8 @@
 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 { 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/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
similarity index 89%
rename from src/frontend/packages/cloud-foundry/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/cf/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
index 30746139e2..8c0123ad3d 100644
--- a/src/frontend/packages/cloud-foundry/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/cf/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
@@ -4,15 +4,15 @@ import { Store } from '@ngrx/store';
 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 { 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 { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types';
 import { APIResource } from '../../../../../../store/src/types/api.types';
 import { ISpaceQuotaDefinition } from '../../../../cf-api.types';
+import { cfEntityCatalog } from '../../../../cf-entity-catalog';
+import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
+import { getActiveRouteCfOrgSpaceProvider } from '../../cf.helpers';
 import { SpaceQuotaDefinitionFormComponent } from '../../space-quota-definition-form/space-quota-definition-form.component';
 
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space-step/edit-space-step.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space-step/edit-space-step.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space-step/edit-space-step.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space-step/edit-space-step.component.scss
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/cf/edit-space/edit-space-step/edit-space-step.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space-step/edit-space-step.component.spec.ts
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/cf/edit-space/edit-space-step/edit-space-step.component.ts
similarity index 98%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space-step/edit-space-step.component.ts
index ab2f460630..b4930646e2 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/cf/edit-space/edit-space-step/edit-space-step.component.ts
@@ -5,9 +5,9 @@ import { Store } from '@ngrx/store';
 import { Observable, of, Subscription } from 'rxjs';
 import { filter, map, pairwise, switchMap, take, tap } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types';
+import { CFAppState } from '../../../../cf-app-state';
 import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { AddEditSpaceStepBase } from '../../add-edit-space-step-base';
 import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space.component.scss
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/cf/edit-space/edit-space.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space.component.spec.ts
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/cf/edit-space/edit-space.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-base/quota-definition-base.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/quota-definition-base/quota-definition-base.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-base/quota-definition-base.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/quota-definition-base/quota-definition-base.component.scss
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/cf/quota-definition-base/quota-definition-base.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-base/quota-definition-base.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/quota-definition-base/quota-definition-base.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/quota-definition-form/quota-definition-form.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/quota-definition-form/quota-definition-form.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/quota-definition-form/quota-definition-form.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/quota-definition-form/quota-definition-form.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/quota-definition-form/quota-definition-form.component.ts
similarity index 88%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/quota-definition-form/quota-definition-form.component.ts
index d330a31aec..778a19c696 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/quota-definition-form/quota-definition-form.component.ts
@@ -3,13 +3,13 @@ import { AbstractControl, FormControl, FormGroup, ValidatorFn, Validators } from
 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 { safeUnsubscribe } from '../../../../../core/src/core/utils.service';
 import { endpointEntityType } from '../../../../../store/src/helpers/stratos-entity-factory';
 import { IQuotaDefinition } from '../../../cf-api.types';
+import { cfEntityCatalog } from '../../../cf-entity-catalog';
+import { createEntityRelationPaginationKey } from '../../../entity-relations/entity-relations.types';
+import { ActiveRouteCfOrgSpace } from '../cf-page.types';
+import { getActiveRouteCfOrgSpaceProvider } from '../cf.helpers';
 
 export interface QuotaFormValues {
   name: string;
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/quota-definition/quota-definition.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/quota-definition/quota-definition.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/quota-definition/quota-definition.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/quota-definition/quota-definition.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/quota-definition/quota-definition.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/quota-definition/quota-definition.component.spec.ts
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/cf/quota-definition/quota-definition.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/quota-definition/quota-definition.component.ts
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/cf/services/cloud-foundry-endpoint.service.ts
similarity index 95%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/services/cloud-foundry-endpoint.service.ts
index eec79aba70..2a26f72b91 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/cf/services/cloud-foundry-endpoint.service.ts
@@ -3,20 +3,6 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, first, map, publishReplay, refCount } from 'rxjs/operators';
 
-import { GetAllApplications } from '../../../../../cloud-foundry/src/actions/application.actions';
-import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
-import {
-  domainEntityType,
-  organizationEntityType,
-  privateDomainsEntityType,
-  quotaDefinitionEntityType,
-  spaceEntityType,
-} from '../../../../../cloud-foundry/src/cf-entity-types';
-import {
-  createEntityRelationKey,
-  createEntityRelationPaginationKey,
-} from '../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { CfApplicationState } from '../../../../../cloud-foundry/src/store/types/application.types';
 import { EntityService } from '../../../../../store/src/entity-service';
 import { endpointEntityType } from '../../../../../store/src/helpers/stratos-entity-factory';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
@@ -26,13 +12,27 @@ import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-ca
 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 { GetAllApplications } from '../../../actions/application.actions';
 import { GetAllRoutes } from '../../../actions/route.actions';
 import { GetSpaceRoutes } from '../../../actions/space.actions';
 import { IApp, ICfV2Info, IOrganization, ISpace } from '../../../cf-api.types';
+import { CFAppState } from '../../../cf-app-state';
 import { cfEntityCatalog } from '../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../cf-entity-factory';
+import {
+  domainEntityType,
+  organizationEntityType,
+  privateDomainsEntityType,
+  quotaDefinitionEntityType,
+  spaceEntityType,
+} from '../../../cf-entity-types';
+import {
+  createEntityRelationKey,
+  createEntityRelationPaginationKey,
+} from '../../../entity-relations/entity-relations.types';
 import { CfUserService } from '../../../shared/data-services/cf-user.service';
 import { QParam, QParamJoiners } from '../../../shared/q-param';
+import { CfApplicationState } from '../../../store/types/application.types';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { fetchTotalResults } from '../cf.helpers';
 
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/cf/services/cloud-foundry-org-space-quota.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-org-space-quota.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/services/cloud-foundry-org-space-quota.ts
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/cf/services/cloud-foundry-organization-quota.ts
similarity index 95%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization-quota.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/services/cloud-foundry-organization-quota.ts
index 9c3bcbf845..20ddb603d7 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/cf/services/cloud-foundry-organization-quota.ts
@@ -1,10 +1,10 @@
 import { Observable } from 'rxjs';
 
-import { organizationEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
 import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { APIResource } from '../../../../../store/src/types/api.types';
 import { StratosStatus } from '../../../../../store/src/types/shared.types';
 import { IApp, IOrganization } from '../../../cf-api.types';
+import { organizationEntityType } from '../../../cf-entity-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/cf/services/cloud-foundry-organization.service.ts
similarity index 98%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization.service.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/services/cloud-foundry-organization.service.ts
index 07848a222f..52db165c63 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/cf/services/cloud-foundry-organization.service.ts
@@ -4,14 +4,6 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, map, publishReplay, refCount, switchMap } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
-import {
-  domainEntityType,
-  organizationEntityType,
-  privateDomainsEntityType,
-  quotaDefinitionEntityType,
-  spaceEntityType,
-} from '../../../../../cloud-foundry/src/cf-entity-types';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
 import {
@@ -22,7 +14,15 @@ import {
   ISpace,
   ISpaceQuotaDefinition,
 } from '../../../cf-api.types';
+import { CFAppState } from '../../../cf-app-state';
 import { cfEntityCatalog } from '../../../cf-entity-catalog';
+import {
+  domainEntityType,
+  organizationEntityType,
+  privateDomainsEntityType,
+  quotaDefinitionEntityType,
+  spaceEntityType,
+} from '../../../cf-entity-types';
 import { getEntityFlattenedList, getStartedAppInstanceCount } from '../../../cf.helpers';
 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/cf/services/cloud-foundry-space-quota.ts
similarity index 95%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space-quota.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/services/cloud-foundry-space-quota.ts
index 692fad26d8..e10bbc9337 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/cf/services/cloud-foundry-space-quota.ts
@@ -1,10 +1,10 @@
 import { Observable } from 'rxjs';
 
-import { spaceEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
 import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { APIResource } from '../../../../../store/src/types/api.types';
 import { StratosStatus } from '../../../../../store/src/types/shared.types';
 import { IApp, ISpace } from '../../../cf-api.types';
+import { spaceEntityType } from '../../../cf-entity-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/cf/services/cloud-foundry-space.service.ts
similarity index 98%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space.service.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/services/cloud-foundry-space.service.ts
index f3faadd465..656508eb2c 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/cf/services/cloud-foundry-space.service.ts
@@ -3,7 +3,11 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable, of } from 'rxjs';
 import { filter, map, publishReplay, refCount, switchMap } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
+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 { CFAppState } from '../../../cf-app-state';
+import { cfEntityCatalog } from '../../../cf-entity-catalog';
 import {
   applicationEntityType,
   routeEntityType,
@@ -11,11 +15,7 @@ import {
   serviceInstancesEntityType,
   spaceEntityType,
   spaceQuotaEntityType,
-} from '../../../../../cloud-foundry/src/cf-entity-types';
-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 { cfEntityCatalog } from '../../../cf-entity-catalog';
+} from '../../../cf-entity-types';
 import { getStartedAppInstanceCount } from '../../../cf.helpers';
 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/space-quota-definition-form/space-quota-definition-form.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition-form/space-quota-definition-form.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition-form/space-quota-definition-form.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition-form/space-quota-definition-form.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition-form/space-quota-definition-form.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition-form/space-quota-definition-form.component.ts
similarity index 88%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition-form/space-quota-definition-form.component.ts
index 5e648aba80..67b37496eb 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition-form/space-quota-definition-form.component.ts
@@ -4,13 +4,13 @@ import { ActivatedRoute } from '@angular/router';
 import { Observable, 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 { safeUnsubscribe } from '../../../../../core/src/core/utils.service';
 import { endpointEntityType } from '../../../../../store/src/helpers/stratos-entity-factory';
 import { IQuotaDefinition } from '../../../cf-api.types';
+import { cfEntityCatalog } from '../../../cf-entity-catalog';
+import { createEntityRelationPaginationKey } from '../../../entity-relations/entity-relations.types';
+import { ActiveRouteCfOrgSpace } from '../cf-page.types';
+import { getActiveRouteCfOrgSpaceProvider } from '../cf.helpers';
 
 
 @Component({
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition/space-quota-definition.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition/space-quota-definition.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition/space-quota-definition.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition/space-quota-definition.component.scss
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/cf/space-quota-definition/space-quota-definition.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition/space-quota-definition.component.spec.ts
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/cf/space-quota-definition/space-quota-definition.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition/space-quota-definition.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.theme.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.theme.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.theme.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.theme.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.ts
similarity index 87%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.ts
index 7cb9cae72d..6a87f4f761 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.ts
@@ -3,8 +3,8 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, map, switchMap } from 'rxjs/operators';
 
-import { GetAllCfUsersAsAdmin } from '../../../../../../cloud-foundry/src/actions/users.actions';
-import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
+import { GetAllCfUsersAsAdmin } from '../../../../actions/users.actions';
+import { CFAppState } from '../../../../cf-app-state';
 import { CfUserService } from '../../../../shared/data-services/cf-user.service';
 import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
 import { waitForCFPermissions } from '../../cf.helpers';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-build-packs/cloud-foundry-build-packs.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-build-packs/cloud-foundry-build-packs.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-build-packs/cloud-foundry-build-packs.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-build-packs/cloud-foundry-build-packs.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-build-packs/cloud-foundry-build-packs.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-build-packs/cloud-foundry-build-packs.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-build-packs/cloud-foundry-build-packs.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-build-packs/cloud-foundry-build-packs.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-build-packs/cloud-foundry-build-packs.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-build-packs/cloud-foundry-build-packs.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-build-packs/cloud-foundry-build-packs.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-build-packs/cloud-foundry-build-packs.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-build-packs/cloud-foundry-build-packs.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-build-packs/cloud-foundry-build-packs.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-build-packs/cloud-foundry-build-packs.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-build-packs/cloud-foundry-build-packs.component.ts
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.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.html
similarity index 100%
rename from 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.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.html
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.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.scss
similarity index 100%
rename from 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.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.scss
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/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.spec.ts
similarity index 100%
rename from 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
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.spec.ts
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.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.ts
similarity index 100%
rename from 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.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.ts
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.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.html
similarity index 100%
rename from 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.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.html
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.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.scss
similarity index 100%
rename from 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.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.scss
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/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.spec.ts
similarity index 100%
rename from 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
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.spec.ts
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/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.ts
similarity index 100%
rename from 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
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.ts
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.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.html
similarity index 100%
rename from 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.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.html
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.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.scss
similarity index 100%
rename from 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.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.scss
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/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.spec.ts
similarity index 100%
rename from 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
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.spec.ts
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.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.ts
similarity index 100%
rename from 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.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.ts
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.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.html
similarity index 100%
rename from 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.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.html
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.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.scss
similarity index 100%
rename from 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.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.scss
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/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.spec.ts
similarity index 100%
rename from 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
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.spec.ts
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.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.ts
similarity index 100%
rename from 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.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.ts
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/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell.service.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell.service.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cells.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cells.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cells.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cells.component.scss
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/cf/tabs/cf-cells/cloud-foundry-cells.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cells.component.spec.ts
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/cf/tabs/cf-cells/cloud-foundry-cells.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cells.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-events/cloud-foundry-events.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-events/cloud-foundry-events.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-events/cloud-foundry-events.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-events/cloud-foundry-events.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-events/cloud-foundry-events.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-events/cloud-foundry-events.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-events/cloud-foundry-events.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-events/cloud-foundry-events.component.scss
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/cf/tabs/cf-events/cloud-foundry-events.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-events/cloud-foundry-events.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-events/cloud-foundry-events.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-events/cloud-foundry-events.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-events/cloud-foundry-events.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-events/cloud-foundry-events.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-events/cloud-foundry-events.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-feature-flags/cloud-foundry-feature-flags.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-feature-flags/cloud-foundry-feature-flags.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-feature-flags/cloud-foundry-feature-flags.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-feature-flags/cloud-foundry-feature-flags.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-feature-flags/cloud-foundry-feature-flags.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-feature-flags/cloud-foundry-feature-flags.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-feature-flags/cloud-foundry-feature-flags.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-feature-flags/cloud-foundry-feature-flags.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-feature-flags/cloud-foundry-feature-flags.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-feature-flags/cloud-foundry-feature-flags.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-feature-flags/cloud-foundry-feature-flags.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-feature-flags/cloud-foundry-feature-flags.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-feature-flags/cloud-foundry-feature-flags.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-feature-flags/cloud-foundry-feature-flags.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-feature-flags/cloud-foundry-feature-flags.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-feature-flags/cloud-foundry-feature-flags.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose-formatter.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose-formatter.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose-formatter.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose-formatter.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.theme.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.theme.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.theme.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.theme.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.types.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.types.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.types.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.types.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organization-space-quotas/cloud-foundry-organization-space-quotas.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organization-space-quotas/cloud-foundry-organization-space-quotas.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organization-space-quotas/cloud-foundry-organization-space-quotas.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organization-space-quotas/cloud-foundry-organization-space-quotas.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organization-space-quotas/cloud-foundry-organization-space-quotas.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organization-space-quotas/cloud-foundry-organization-space-quotas.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organization-space-quotas/cloud-foundry-organization-space-quotas.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organization-space-quotas/cloud-foundry-organization-space-quotas.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-invite-user-link/cloud-foundry-invite-user-link.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-invite-user-link/cloud-foundry-invite-user-link.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-invite-user-link/cloud-foundry-invite-user-link.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-invite-user-link/cloud-foundry-invite-user-link.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-invite-user-link/cloud-foundry-invite-user-link.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-invite-user-link/cloud-foundry-invite-user-link.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-invite-user-link/cloud-foundry-invite-user-link.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-invite-user-link/cloud-foundry-invite-user-link.component.ts
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.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component.html
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.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component.scss
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/cf/tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component.spec.ts
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/cf/tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component.ts
similarity index 95%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component.ts
index 00792c21cc..682da43532 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/cf/tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component.ts
@@ -2,8 +2,6 @@ import { Component } from '@angular/core';
 import { Observable } from 'rxjs';
 import { filter, first, map } from 'rxjs/operators';
 
-import { organizationEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
-import { IOrgFavMetadata } from '../../../../../../../cloud-foundry/src/cf-metadata-types';
 import {
   getActionsFromExtensions,
   getTabsFromExtensions,
@@ -19,6 +17,8 @@ import { EntitySchema } from '../../../../../../../store/src/helpers/entity-sche
 import { UserFavorite } from '../../../../../../../store/src/types/user-favorites.types';
 import { getFavoriteFromEntity } from '../../../../../../../store/src/user-favorite-helpers';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
+import { organizationEntityType } from '../../../../../cf-entity-types';
+import { IOrgFavMetadata } from '../../../../../cf-metadata-types';
 import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { CfUserService } from '../../../../../shared/data-services/cf-user.service';
 import {
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.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-events/cloud-foundry-organization-events.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-events/cloud-foundry-organization-events.component.html
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.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-events/cloud-foundry-organization-events.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-events/cloud-foundry-organization-events.component.scss
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/cf/tabs/cf-organizations/cf-organization-events/cloud-foundry-organization-events.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-events/cloud-foundry-organization-events.component.spec.ts
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.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-events/cloud-foundry-organization-events.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-events/cloud-foundry-organization-events.component.ts
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.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-organization-spaces.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-organization-spaces.component.html
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.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-organization-spaces.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-organization-spaces.component.scss
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/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-organization-spaces.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-organization-spaces.component.spec.ts
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.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-organization-spaces.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-organization-spaces.component.ts
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.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.html
similarity index 100%
rename from 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.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.html
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.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.scss
similarity index 100%
rename from 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.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.scss
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/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.spec.ts
similarity index 100%
rename from 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
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.spec.ts
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/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts
similarity index 95%
rename from 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
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts
index e4b352225d..c1cea96630 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/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts
@@ -3,9 +3,6 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable, of, Subscription } from 'rxjs';
 import { first, map, 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 {
   getActionsFromExtensions,
   getTabsFromExtensions,
@@ -21,7 +18,10 @@ import { RouterNav } from '../../../../../../../../store/src/actions/router.acti
 import { FavoritesConfigMapper } from '../../../../../../../../store/src/favorite-config-mapper';
 import { UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
 import { getFavoriteFromEntity } from '../../../../../../../../store/src/user-favorite-helpers';
+import { CFAppState } from '../../../../../../cf-app-state';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
+import { spaceEntityType } from '../../../../../../cf-entity-types';
+import { ISpaceFavMetadata } from '../../../../../../cf-metadata-types';
 import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
 import { CfUserService } from '../../../../../../shared/data-services/cf-user.service';
 import {
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.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.html
similarity index 100%
rename from 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.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.html
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.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.scss
similarity index 100%
rename from 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.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.scss
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/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.spec.ts
similarity index 100%
rename from 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
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.spec.ts
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.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.ts
similarity index 100%
rename from 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.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.ts
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.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.html
similarity index 100%
rename from 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.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.html
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.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.scss
similarity index 100%
rename from 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.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.scss
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/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.spec.ts
similarity index 100%
rename from 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
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.spec.ts
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.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.ts
similarity index 100%
rename from 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.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.ts
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.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.html
similarity index 100%
rename from 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.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.html
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.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.scss
similarity index 100%
rename from 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.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.scss
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/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.spec.ts
similarity index 100%
rename from 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
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.spec.ts
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.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.ts
similarity index 100%
rename from 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.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.ts
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.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.html
similarity index 100%
rename from 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.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.html
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.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.scss
similarity index 100%
rename from 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.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.scss
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/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.spec.ts
similarity index 100%
rename from 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
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.spec.ts
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.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.ts
similarity index 100%
rename from 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.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.ts
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.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.html
similarity index 100%
rename from 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.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.html
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.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.scss
similarity index 100%
rename from 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.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.scss
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/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts
similarity index 100%
rename from 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
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts
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/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.ts
similarity index 100%
rename from 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
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.ts
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.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.html
similarity index 100%
rename from 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.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.html
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.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.scss
similarity index 100%
rename from 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.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.scss
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/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.spec.ts
similarity index 100%
rename from 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
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.spec.ts
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.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.ts
similarity index 100%
rename from 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.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.ts
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.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.html
similarity index 100%
rename from 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.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.html
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.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.scss
similarity index 100%
rename from 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.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.scss
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/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts
similarity index 93%
rename from 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
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts
index 3e7cbb2f19..0df268c9e1 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/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts
@@ -12,9 +12,7 @@ import { CloudFoundrySpaceServiceMock } from '../../../../../../../../test-frame
 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';
-import {
-  CloudFoundryInviteUserLinkComponent,
-} from '../../../cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component';
+import { CloudFoundryInviteUserLinkComponent } from '../../../cf-invite-user-link/cloud-foundry-invite-user-link.component';
 import { CloudFoundrySpaceUsersComponent } from './cloud-foundry-space-users.component';
 
 describe('CloudFoundrySpaceUsersComponent', () => {
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/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.ts
similarity index 100%
rename from 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
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.ts
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.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component.html
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.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component.scss
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/cf/tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component.spec.ts
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/cf/tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component.ts
similarity index 97%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component.ts
index 163a261a4a..2d9867947f 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/cf/tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component.ts
@@ -4,12 +4,12 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable } from 'rxjs';
 import { filter, first, map, pairwise, startWith, tap } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 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 { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
 import { selectDeletionInfo } from '../../../../../../../store/src/selectors/api.selectors';
+import { CFAppState } from '../../../../../cf-app-state';
 import { organizationEntityType } from '../../../../../cf-entity-types';
 import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
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.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component.html
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.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component.scss
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/cf/tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component.spec.ts
similarity index 92%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component.spec.ts
index 352fc409a2..8c989eab9b 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/cf/tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component.spec.ts
@@ -10,9 +10,7 @@ import {
 } 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 {
-  CloudFoundryInviteUserLinkComponent,
-} from '../cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component';
+import { CloudFoundryInviteUserLinkComponent } from '../cf-invite-user-link/cloud-foundry-invite-user-link.component';
 import { CloudFoundryOrganizationUsersComponent } from './cloud-foundry-organization-users.component';
 
 describe('CloudFoundryOrganizationUsersComponent', () => {
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/cf/tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organizations.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cloud-foundry-organizations.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organizations.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cloud-foundry-organizations.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organizations.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cloud-foundry-organizations.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organizations.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cloud-foundry-organizations.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organizations.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cloud-foundry-organizations.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organizations.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cloud-foundry-organizations.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organizations.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cloud-foundry-organizations.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organizations.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cloud-foundry-organizations.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-quotas/cloud-foundry-quotas.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-quotas/cloud-foundry-quotas.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-quotas/cloud-foundry-quotas.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-quotas/cloud-foundry-quotas.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-quotas/cloud-foundry-quotas.component.spec.ts
similarity index 71%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-quotas/cloud-foundry-quotas.component.spec.ts
index 45606154a2..75913ddedf 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-quotas/cloud-foundry-quotas.component.spec.ts
@@ -1,14 +1,10 @@
 import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import {
-  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,
-} from '../../../../../../cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper';
 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 { CfOrgsListConfigService } from '../../../../shared/components/list/list-types/cf-orgs/cf-orgs-list-config.service';
 import { CloudFoundryQuotasComponent } from './cloud-foundry-quotas.component';
 
 describe('CloudFoundryQuotasComponent', () => {
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-quotas/cloud-foundry-quotas.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-quotas/cloud-foundry-quotas.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-routes/cloud-foundry-routes.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-routes/cloud-foundry-routes.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-routes/cloud-foundry-routes.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-routes/cloud-foundry-routes.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-routes/cloud-foundry-routes.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-routes/cloud-foundry-routes.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-routes/cloud-foundry-routes.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-routes/cloud-foundry-routes.component.scss
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/cf/tabs/cf-routes/cloud-foundry-routes.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-routes/cloud-foundry-routes.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-routes/cloud-foundry-routes.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-routes/cloud-foundry-routes.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-routes/cloud-foundry-routes.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-routes/cloud-foundry-routes.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-routes/cloud-foundry-routes.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-security-groups/cloud-foundry-security-groups.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-security-groups/cloud-foundry-security-groups.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-security-groups/cloud-foundry-security-groups.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-security-groups/cloud-foundry-security-groups.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-security-groups/cloud-foundry-security-groups.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-security-groups/cloud-foundry-security-groups.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-security-groups/cloud-foundry-security-groups.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-security-groups/cloud-foundry-security-groups.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-security-groups/cloud-foundry-security-groups.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-security-groups/cloud-foundry-security-groups.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-security-groups/cloud-foundry-security-groups.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-security-groups/cloud-foundry-security-groups.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-security-groups/cloud-foundry-security-groups.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-security-groups/cloud-foundry-security-groups.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-security-groups/cloud-foundry-security-groups.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-security-groups/cloud-foundry-security-groups.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-stacks/cloud-foundry-stacks.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-stacks/cloud-foundry-stacks.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-stacks/cloud-foundry-stacks.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-stacks/cloud-foundry-stacks.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-stacks/cloud-foundry-stacks.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-stacks/cloud-foundry-stacks.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-stacks/cloud-foundry-stacks.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-stacks/cloud-foundry-stacks.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-stacks/cloud-foundry-stacks.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-stacks/cloud-foundry-stacks.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-stacks/cloud-foundry-stacks.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-stacks/cloud-foundry-stacks.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-stacks/cloud-foundry-stacks.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-stacks/cloud-foundry-stacks.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-stacks/cloud-foundry-stacks.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-stacks/cloud-foundry-stacks.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-summary-tab/cloud-foundry-summary-tab.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-summary-tab/cloud-foundry-summary-tab.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-summary-tab/cloud-foundry-summary-tab.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-summary-tab/cloud-foundry-summary-tab.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-summary-tab/cloud-foundry-summary-tab.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-summary-tab/cloud-foundry-summary-tab.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-summary-tab/cloud-foundry-summary-tab.component.ts
similarity index 93%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-summary-tab/cloud-foundry-summary-tab.component.ts
index 6012c16f79..09c6a63b9f 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-summary-tab/cloud-foundry-summary-tab.component.ts
@@ -3,7 +3,7 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable } from 'rxjs';
 import { filter, map, startWith } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
+import { CFAppState } from '../../../../cf-app-state';
 import { goToAppWall } from '../../cf.helpers';
 import { CloudFoundryEndpointService } from '../../services/cloud-foundry-endpoint.service';
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-users/cloud-foundry-users.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-users/cloud-foundry-users.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-users/cloud-foundry-users.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-users/cloud-foundry-users.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-users/cloud-foundry-users.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-users/cloud-foundry-users.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-users/cloud-foundry-users.component.ts
similarity index 84%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-users/cloud-foundry-users.component.ts
index f184bf4ec8..d8f4896ffa 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-users/cloud-foundry-users.component.ts
@@ -2,14 +2,12 @@ import { Component } from '@angular/core';
 import { Router } from '@angular/router';
 import { Store } from '@ngrx/store';
 
-import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
 import { CurrentUserPermissionsService } from '../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
+import { CFAppState } from '../../../../cf-app-state';
+import { CfUserListConfigService } from '../../../../shared/components/list/list-types/cf-users/cf-user-list-config.service';
 import { CfUserService } from '../../../../shared/data-services/cf-user.service';
 import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
-import {
-  CfUserListConfigService,
-} from './../../../../shared/components/list/list-types/cf-users/cf-user-list-config.service';
 
 @Component({
   selector: 'app-cloud-foundry-users',
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/configuration-dialog/user-invite-configuration-dialog.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/user-invites/configuration-dialog/user-invite-configuration-dialog.component.html
similarity index 63%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/configuration-dialog/user-invite-configuration-dialog.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/user-invites/configuration-dialog/user-invite-configuration-dialog.component.html
index ed13ca63d5..2e9dc254aa 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/configuration-dialog/user-invite-configuration-dialog.component.html
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/user-invites/configuration-dialog/user-invite-configuration-dialog.component.html
@@ -1,5 +1,7 @@
 <div class="connection-dialog__loading-wrapper">
-  <mat-progress-bar class="connection-dialog__loading" [color]="(connectingError$ | async) && !(isBusy$ | async) ? 'warn' : 'primary'" [mode]="(isBusy$ | async) ? 'indeterminate' : 'solid'">
+  <mat-progress-bar class="connection-dialog__loading"
+    [color]="(connectingError$ | async) && !(isBusy$ | async) ? 'warn' : 'primary'"
+    [mode]="(isBusy$ | async) ? 'indeterminate' : 'solid'">
   </mat-progress-bar>
 </div>
 <div class="connection-dialog">
@@ -15,13 +17,19 @@ <h2 mat-dialog-title>
         <input matInput placeholder="Client ID" formControlName="clientID">
       </mat-form-field>
       <mat-form-field>
-        <input matInput placeholder="Client Secret" type="password" formControlName="clientSecret">
+        <input matInput placeholder="Client Secret" type="password" formControlName="clientSecret"
+          [type]="!showSecret ? 'password' : 'text'">
+        <button mat-icon-button matSuffix (click)="showSecret = !showSecret" [attr.aria-label]="'Hide Secret'"
+          [attr.aria-pressed]="!showSecret" type='button'>
+          <mat-icon>{{!showSecret ? 'visibility_off' : 'visibility'}}</mat-icon>
+        </button>
       </mat-form-field>
     </mat-dialog-content>
-    <app-dialog-error message="Could not connect, please try again." [show]="connectingError$ | async"></app-dialog-error>
+    <app-dialog-error message="Could not connect, please try again." [show]="connectingError$ | async">
+    </app-dialog-error>
     <mat-dialog-actions class="connection-dialog__actions">
       <button [mat-dialog-close]="true" mat-button color="warn">Cancel</button>
       <button type="submit" [disabled]="!endpointForm.valid" mat-button color="primary">Configure</button>
     </mat-dialog-actions>
   </form>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/configuration-dialog/user-invite-configuration-dialog.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/user-invites/configuration-dialog/user-invite-configuration-dialog.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/configuration-dialog/user-invite-configuration-dialog.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/user-invites/configuration-dialog/user-invite-configuration-dialog.component.scss
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/cf/user-invites/configuration-dialog/user-invite-configuration-dialog.component.ts
similarity index 98%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/configuration-dialog/user-invite-configuration-dialog.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/user-invites/configuration-dialog/user-invite-configuration-dialog.component.ts
index ba3d856575..638704cc9b 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/cf/user-invites/configuration-dialog/user-invite-configuration-dialog.component.ts
@@ -37,6 +37,7 @@ export class UserInviteConfigurationDialogComponent {
   public connectDelay = 1000;
 
   guid: string;
+  public showSecret = false;
 
   constructor(
     public fb: FormBuilder,
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/cf/user-invites/user-invite.service.ts
similarity index 98%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/user-invite.service.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/user-invites/user-invite.service.ts
index 7331193e11..da7ba84675 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/cf/user-invites/user-invite.service.ts
@@ -5,12 +5,12 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import { catchError, filter, map, switchMap } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import { CurrentUserPermissionsService } from '../../../../../core/src/core/permissions/current-user-permissions.service';
 import { environment } from '../../../../../core/src/environments/environment.prod';
 import { ConfirmationDialogConfig } from '../../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../../core/src/shared/components/confirmation-dialog.service';
 import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
+import { CFAppState } from '../../../cf-app-state';
 import { CfCurrentUserPermissions } from '../../../user-permissions/cf-user-permissions-checkers';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { waitForCFPermissions } from '../cf.helpers';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users-create/invite-users-create.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users-create/invite-users-create.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users-create/invite-users-create.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users-create/invite-users-create.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users-create/invite-users-create.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users-create/invite-users-create.component.spec.ts
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/cf/users/invite-users/invite-users-create/invite-users-create.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users-create/invite-users-create.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users.component.spec.ts
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/cf/users/invite-users/invite-users.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/cf-roles.service.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/cf-roles.service.spec.ts
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/cf/users/manage-users/cf-roles.service.ts
similarity index 99%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/cf-roles.service.ts
index faa4668b08..db59e58a77 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/cf/users/manage-users/cf-roles.service.ts
@@ -13,10 +13,6 @@ import {
   switchMap,
 } from 'rxjs/operators';
 
-import {
-  createEntityRelationKey,
-  createEntityRelationPaginationKey,
-} from '../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { CurrentUserPermissionsService } from '../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { endpointEntityType } from '../../../../../../store/src/helpers/stratos-entity-factory';
 import { APIResource, EntityInfo } from '../../../../../../store/src/types/api.types';
@@ -25,6 +21,10 @@ import { IOrganization, ISpace } from '../../../../cf-api.types';
 import { CFAppState } from '../../../../cf-app-state';
 import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { organizationEntityType, spaceEntityType } from '../../../../cf-entity-types';
+import {
+  createEntityRelationKey,
+  createEntityRelationPaginationKey,
+} from '../../../../entity-relations/entity-relations.types';
 import { CfUserService } from '../../../../shared/data-services/cf-user.service';
 import { createDefaultOrgRoles, createDefaultSpaceRoles } from '../../../../store/reducers/cf-users-roles.reducer';
 import {
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-confirm/manage-users-confirm.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-confirm/manage-users-confirm.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-confirm/manage-users-confirm.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-confirm/manage-users-confirm.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-confirm/manage-users-confirm.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-confirm/manage-users-confirm.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-confirm/manage-users-confirm.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-confirm/manage-users-confirm.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-confirm/manage-users-confirm.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-confirm/manage-users-confirm.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-confirm/manage-users-confirm.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-confirm/manage-users-confirm.component.spec.ts
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/cf/users/manage-users/manage-users-confirm/manage-users-confirm.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-confirm/manage-users-confirm.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-confirm/manage-users-confirm.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/manage-users-modify.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/manage-users-modify.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/manage-users-modify.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/manage-users-modify.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/manage-users-modify.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/manage-users-modify.component.spec.ts
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/cf/users/manage-users/manage-users-modify/manage-users-modify.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/manage-users-modify.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-select/manage-users-select.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-select/manage-users-select.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-select/manage-users-select.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-select/manage-users-select.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-select/manage-users-select.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-select/manage-users-select.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-select/manage-users-select.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-select/manage-users-select.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-select/manage-users-select.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-select/manage-users-select.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-select/manage-users-select.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-select/manage-users-select.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-select/manage-users-select.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-select/manage-users-select.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-select/manage-users-select.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-select/manage-users-select.component.ts
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/cf/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.scss
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.spec.ts
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/cf/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users.component.scss
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/cf/users/manage-users/manage-users.component.spec.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users.component.spec.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/remove-user/remove-user.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/users/remove-user/remove-user.component.html
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/remove-user/remove-user.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/remove-user/remove-user.component.html
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/remove-user/remove-user.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/users/remove-user/remove-user.component.scss
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/remove-user/remove-user.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/remove-user/remove-user.component.scss
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/cf/users/remove-user/remove-user.component.spec.ts
similarity index 96%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/remove-user/remove-user.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/remove-user/remove-user.component.spec.ts
index 5879a847df..dc025ef094 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/cf/users/remove-user/remove-user.component.spec.ts
@@ -10,7 +10,7 @@ import { TabNavService } from '../../../../../../core/tab-nav.service';
 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 '../manage-users//cf-roles.service';
+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';
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/remove-user/remove-user.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/remove-user/remove-user.component.ts
similarity index 100%
rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/remove-user/remove-user.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cf/users/remove-user/remove-user.component.ts
diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog-page/service-catalog-page.component.ts b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog-page/service-catalog-page.component.ts
index ba66604b3a..0a2e54631b 100644
--- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog-page/service-catalog-page.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog-page/service-catalog-page.component.ts
@@ -7,7 +7,7 @@ import {
   CfServicesListConfigService,
 } from '../../../shared/components/list/list-types/cf-services/cf-services-list-config.service';
 import { CloudFoundryService } from '../../../shared/data-services/cloud-foundry.service';
-import { getActiveRouteCfOrgSpaceProvider } from '../../cloud-foundry/cf.helpers';
+import { getActiveRouteCfOrgSpaceProvider } from '../../cf/cf.helpers';
 
 @Component({
   selector: 'app-service-catalog-page',
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 d3fce2628e..21db362ed1 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
@@ -22,7 +22,7 @@ import { CFAppState } from '../../cf-app-state';
 import { cfEntityCatalog } from '../../cf-entity-catalog';
 import { organizationEntityType, servicePlanEntityType, spaceEntityType } from '../../cf-entity-types';
 import { QParam, QParamJoiners } from '../../shared/q-param';
-import { fetchTotalResults } from '../cloud-foundry/cf.helpers';
+import { fetchTotalResults } from '../cf/cf.helpers';
 import { ServicePlanAccessibility } from './services.service';
 
 export const getSvcAvailability = (
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.spec.ts
index 8cff3346aa..68f6a9d59e 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.spec.ts
@@ -12,7 +12,7 @@ import {
   generateCfBaseTestModulesNoShared,
   generateTestCfEndpointService,
 } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { UserInviteService } from '../../../../features/cloud-foundry/user-invites/user-invite.service';
+import { UserInviteService } from '../../../../features/cf/user-invites/user-invite.service';
 import { CardCfInfoComponent } from './card-cf-info.component';
 
 describe('CardCfInfoComponent', () => {
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 89afc74d73..8be8e3f5cb 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
@@ -7,14 +7,11 @@ import { map, tap } from 'rxjs/operators';
 
 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 { CloudFoundryEndpointService } from '../../../../features/cf/services/cloud-foundry-endpoint.service';
 import {
   UserInviteConfigurationDialogComponent,
-} from '../../../../features/cloud-foundry/user-invites/configuration-dialog/user-invite-configuration-dialog.component';
-import {
-  UserInviteConfigureService,
-  UserInviteService,
-} from '../../../../features/cloud-foundry/user-invites/user-invite.service';
+} from '../../../../features/cf/user-invites/configuration-dialog/user-invite-configuration-dialog.component';
+import { UserInviteConfigureService, UserInviteService } from '../../../../features/cf/user-invites/user-invite.service';
 
 @Component({
   selector: 'app-card-cf-info',
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 7b9e5540dd..45b086bc37 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
@@ -16,9 +16,7 @@ import {
   generateTestCfEndpointServiceProvider,
 } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { CloudFoundryOrganizationServiceMock } from '../../../../../test-framework/cloud-foundry-organization.service.mock';
-import {
-  CloudFoundryOrganizationService,
-} from '../../../../features/cloud-foundry/services/cloud-foundry-organization.service';
+import { CloudFoundryOrganizationService } from '../../../../features/cf/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';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-org-user-details/card-cf-org-user-details.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-org-user-details/card-cf-org-user-details.component.ts
index 151fbfb9c4..6fe1eda951 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-org-user-details/card-cf-org-user-details.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-org-user-details/card-cf-org-user-details.component.ts
@@ -1,12 +1,8 @@
 import { Component } from '@angular/core';
 
-import {
-  CloudFoundryEndpointService,
-} from '../../../../../../cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service';
-import {
-  CloudFoundryOrganizationService,
-} from '../../../../../../cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization.service';
 import { CfUserService } from '../../../../../../cloud-foundry/src/shared/data-services/cf-user.service';
+import { CloudFoundryEndpointService } from '../../../../features/cf/services/cloud-foundry-endpoint.service';
+import { CloudFoundryOrganizationService } from '../../../../features/cf/services/cloud-foundry-organization.service';
 
 @Component({
   selector: 'app-card-cf-org-user-details',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.spec.ts
index e05382f2c2..b93ba4295a 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.spec.ts
@@ -16,7 +16,7 @@ import {
   generateActiveRouteCfOrgSpaceMock,
   generateCfBaseTestModulesNoShared,
 } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { CloudFoundryEndpointService } from '../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
+import { CloudFoundryEndpointService } from '../../../../features/cf/services/cloud-foundry-endpoint.service';
 import { CfUserService } from '../../../data-services/cf-user.service';
 import { CardCfRecentAppsComponent } from './card-cf-recent-apps.component';
 import { CompactAppCardComponent } from './compact-app-card/compact-app-card.component';
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 6edd6010ab..136fc16ee1 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
@@ -4,13 +4,10 @@ import { Observable } from 'rxjs';
 import { filter, first, map, tap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
-import {
-  appDataSort,
-  CloudFoundryEndpointService,
-} from '../../../../../../cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service';
 import { APIResource } from '../../../../../../store/src/types/api.types';
 import { IApp } from '../../../../cf-api.types';
 import { cfEntityCatalog } from '../../../../cf-entity-catalog';
+import { appDataSort, CloudFoundryEndpointService } from '../../../../features/cf/services/cloud-foundry-endpoint.service';
 
 const RECENT_ITEMS_COUNT = 10;
 
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 8054860739..d6655a60b1 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
@@ -7,7 +7,7 @@ import {
   ApplicationStateIconPipe,
 } from '../../../../../../../core/src/shared/components/application-state/application-state-icon/application-state-icon.pipe';
 import { generateCfBaseTestModulesNoShared } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
+import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types';
 import { ApplicationStateService } from '../../../../services/application-state.service';
 import { CompactAppCardComponent } from './compact-app-card.component';
 
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 d982f91991..456ba80949 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
@@ -5,9 +5,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 { BREADCRUMB_URL_PARAM } from '../../../../../../../core/src/shared/components/breadcrumbs/breadcrumbs.types';
 import { StratosStatus } from '../../../../../../../store/src/types/shared.types';
+import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types';
 import { ApplicationStateData, ApplicationStateService } from '../../../../services/application-state.service';
 
 
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 11aadb41a3..72fc9fc91e 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
@@ -10,7 +10,7 @@ import { MetadataItemComponent } from '../../../../../../core/src/shared/compone
 import { EntityMonitorFactory } from '../../../../../../store/src/monitors/entity-monitor.factory.service';
 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 { CloudFoundrySpaceService } from '../../../../features/cf/services/cloud-foundry-space.service';
 import { CardCfSpaceDetailsComponent } from './card-cf-space-details.component';
 
 describe('CardCfSpaceDetailsComponent', () => {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts
index 555865d96e..ab6ed99ffe 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts
@@ -4,13 +4,11 @@ import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import {
-  CloudFoundrySpaceService,
-} from '../../../../../../cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space.service';
 import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
 import { SnackBarService } from '../../../../../../core/src/shared/services/snackbar.service';
 import { RouterNav } from '../../../../../../store/src/actions/router.actions';
 import { AppState } from '../../../../../../store/src/app-state';
+import { CloudFoundrySpaceService } from '../../../../features/cf/services/cloud-foundry-space.service';
 
 @Component({
   selector: 'app-card-cf-space-details',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-user-info/card-cf-user-info.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-user-info/card-cf-user-info.component.ts
index 3c6ac6c1c6..86ed14b167 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-user-info/card-cf-user-info.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-user-info/card-cf-user-info.component.ts
@@ -1,8 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import {
-  CloudFoundryEndpointService,
-} from '../../../../../../cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service';
+import { CloudFoundryEndpointService } from '../../../../features/cf/services/cloud-foundry-endpoint.service';
 
 @Component({
   selector: 'app-card-cf-user-info',
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 a1620f3c8e..e7ade5e7bd 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
@@ -7,8 +7,8 @@ import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-m
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { generateCfStoreModules } from '../../../../test-framework/cloud-foundry-endpoint-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 { ActiveRouteCfOrgSpace } from '../../../features/cf/cf-page.types';
+import { CfRolesService } from '../../../features/cf/users/manage-users/cf-roles.service';
 import { CfRoleCheckboxComponent } from './cf-role-checkbox.component';
 
 describe('CfRoleCheckboxComponent', () => {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.ts
index f2337914c2..a7d949e8dd 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.ts
@@ -7,8 +7,8 @@ import { UsersRolesSetOrgRole, UsersRolesSetSpaceRole } from '../../../../../clo
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import { CfUserRolesSelected } from '../../../../../cloud-foundry/src/store/types/users-roles.types';
 import { CurrentUserPermissionsService } from '../../../../../core/src/core/permissions/current-user-permissions.service';
-import { canUpdateOrgSpaceRoles } from '../../../features/cloud-foundry/cf.helpers';
-import { CfRolesService } from '../../../features/cloud-foundry/users/manage-users/cf-roles.service';
+import { canUpdateOrgSpaceRoles } from '../../../features/cf/cf.helpers';
+import { CfRolesService } from '../../../features/cf/users/manage-users/cf-roles.service';
 import {
   selectCfUsersIsRemove,
   selectCfUsersIsSetByUsername,
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 90b3c30f3f..97f86c96a9 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
@@ -2,8 +2,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ListConfig } from '../../../../../core/src/shared/components/list/list.component.types';
 import { CFBaseTestModules } from '../../../../test-framework/cf-test-helper';
-import { ActiveRouteCfOrgSpace } from '../../../features/cloud-foundry/cf-page.types';
-import { CloudFoundryEndpointService } from '../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
+import { ActiveRouteCfOrgSpace } from '../../../features/cf/cf-page.types';
+import { CloudFoundryEndpointService } from '../../../features/cf/services/cloud-foundry-endpoint.service';
 import { CfUserService } from '../../data-services/cf-user.service';
 import { CfAllEventsConfigService } from '../list/list-types/cf-events/types/cf-all-events-config.service';
 import { CloudFoundryEventsListComponent } from './cloud-foundry-events-list.component';
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 2753ce8909..a06230eeb0 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
@@ -28,7 +28,7 @@ import { PaginationMonitorFactory } from '../../../../../../../store/src/monitor
 import { IMetricMatrixResult, IMetrics } from '../../../../../../../store/src/types/base-metric.types';
 import { IMetricApplication, MetricQueryType } from '../../../../../../../store/src/types/metric.types';
 import { ApplicationService } from '../../../../../features/applications/application.service';
-import { CfCellHelper } from '../../../../../features/cloud-foundry/cf-cell.helpers';
+import { CfCellHelper } from '../../../../../features/cf/cf-cell.helpers';
 import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import { ListAppInstance } from './app-instance-types';
 import { CfAppInstancesDataSource } from './cf-app-instances-data-source';
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 50fb563f34..23b66083dc 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
@@ -22,7 +22,7 @@ import { cfEntityCatalog } from '../../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import { serviceBindingEntityType } from '../../../../../../cf-entity-types';
 import { ApplicationService } from '../../../../../../features/applications/application.service';
-import { isUserProvidedServiceInstance } from '../../../../../../features/cloud-foundry/cf.helpers';
+import { isUserProvidedServiceInstance } from '../../../../../../features/cf/cf.helpers';
 import {
   getServiceBrokerName,
   getServiceName,
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 2d39cd38df..5197f7db8b 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
@@ -21,7 +21,7 @@ import { RouterNav } from '../../../../../../../store/src/actions/router.actions
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { IServiceBinding } from '../../../../../cf-api-svc.types';
 import { ApplicationService } from '../../../../../features/applications/application.service';
-import { isServiceInstance, isUserProvidedServiceInstance } from '../../../../../features/cloud-foundry/cf.helpers';
+import { isServiceInstance, isUserProvidedServiceInstance } from '../../../../../features/cf/cf.helpers';
 import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import { ServiceActionHelperService } from '../../../../data-services/service-action-helper.service';
 import { CSI_CANCEL_URL } from '../../../add-service-instance/csi-mode.service';
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 0e4e9e1269..137f9073dd 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
@@ -5,6 +5,7 @@ import { tag } from 'rxjs-spy/operators/tag';
 import { debounceTime, delay, distinctUntilChanged, map, withLatestFrom } from 'rxjs/operators';
 
 import { GetAllApplications } from '../../../../../../../cloud-foundry/src/actions/application.actions';
+import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import {
   applicationEntityType,
   organizationEntityType,
@@ -27,10 +28,9 @@ 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 { cfOrgSpaceFilter } from '../../../../../features/cloud-foundry/cf.helpers';
+import { cfOrgSpaceFilter } from '../../../../../features/cf/cf.helpers';
 import { CFListDataSource } from '../../../../cf-list-data-source';
 import { createCfOrSpaceMultipleFilterFn } from '../../../../data-services/cf-org-space-service.service';
-import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 
 export class CfAppsDataSource extends CFListDataSource<APIResource> {
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-list-config.service.spec.ts
index bc239c35ee..b5c46666f8 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-list-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-list-config.service.spec.ts
@@ -1,7 +1,7 @@
 import { inject, TestBed } from '@angular/core/testing';
 
 import { generateCfBaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
+import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types';
 import { CfBuildpacksListConfigService } from './cf-buildpacks-list-config.service';
 
 describe('CfBuildpacksListConfigService', () => {
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 779c9cbcad..911eb5a927 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
@@ -5,7 +5,7 @@ import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state'
 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 { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types';
 import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
 import { CfBuildpackCardComponent } from './cf-buildpack-card/cf-buildpack-card.component';
 import { CfBuildpacksDataSource } from './cf-buildpacks-data-source';
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 6d4c6d7b02..7cdbeb0e4a 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
@@ -7,7 +7,7 @@ import { ListViewTypes } from '../../../../../../../core/src/shared/components/l
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
 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 { ActiveRouteCfCell } from '../../../../../features/cf/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-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 86bb2ee270..51e4e54f65 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
@@ -17,10 +17,10 @@ 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 { CfCellHelper } from '../../../../../features/cf/cf-cell.helpers';
 import {
   CloudFoundryCellService,
-} from '../../../../../features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service';
+} from '../../../../../features/cf/tabs/cf-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';
 
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 019ab20631..783f2b148f 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
@@ -17,8 +17,8 @@ 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 { CfCellHelper } from '../../../../../features/cf/cf-cell.helpers';
+import { ActiveRouteCfCell } from '../../../../../features/cf/cf-page.types';
 import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
 import { CfCellsDataSource } from './cf-cells-data-source';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/types/cf-all-events-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/types/cf-all-events-config.service.ts
index c1a013b7a4..5e5667be57 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/types/cf-all-events-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/types/cf-all-events-config.service.ts
@@ -4,9 +4,7 @@ import { Store } from '@ngrx/store';
 import { IListConfig } from '../../../../../../../../core/src/shared/components/list/list.component.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { CFAppState } from '../../../../../../cf-app-state';
-import {
-  CloudFoundryEndpointService,
-} from '../../../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
+import { CloudFoundryEndpointService } from '../../../../../../features/cf/services/cloud-foundry-endpoint.service';
 import { CfEventsConfigService } from '../cf-events-config.service';
 
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/types/cf-org-events-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/types/cf-org-events-config.service.ts
index 0897130e93..087cc0e4bc 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/types/cf-org-events-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/types/cf-org-events-config.service.ts
@@ -4,9 +4,7 @@ import { Store } from '@ngrx/store';
 import { IListConfig } from '../../../../../../../../core/src/shared/components/list/list.component.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { CFAppState } from '../../../../../../cf-app-state';
-import {
-  CloudFoundryOrganizationService,
-} from '../../../../../../features/cloud-foundry/services/cloud-foundry-organization.service';
+import { CloudFoundryOrganizationService } from '../../../../../../features/cf/services/cloud-foundry-organization.service';
 import { CfEventsConfigService } from '../cf-events-config.service';
 
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/types/cf-space-events-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/types/cf-space-events-config.service.ts
index e792419597..c665577e32 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/types/cf-space-events-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/types/cf-space-events-config.service.ts
@@ -4,7 +4,7 @@ import { Store } from '@ngrx/store';
 import { IListConfig } from '../../../../../../../../core/src/shared/components/list/list.component.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { CFAppState } from '../../../../../../cf-app-state';
-import { CloudFoundrySpaceService } from '../../../../../../features/cloud-foundry/services/cloud-foundry-space.service';
+import { CloudFoundrySpaceService } from '../../../../../../features/cf/services/cloud-foundry-space.service';
 import { CfEventsConfigService } from '../cf-events-config.service';
 
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-list-config.service.spec.ts
index be0423ce3a..8349afd1ca 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-list-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-list-config.service.spec.ts
@@ -1,7 +1,7 @@
 import { inject, TestBed } from '@angular/core/testing';
 
 import { generateCfBaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
+import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types';
 import { CfFeatureFlagsListConfigService } from './cf-feature-flags-list-config.service';
 
 describe('CfFeatureFlagsListConfigService', () => {
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 f943e373ad..e332ca154d 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
@@ -6,7 +6,7 @@ import { ITableColumn } from '../../../../../../../core/src/shared/components/li
 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 { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types';
 import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
 import { CfFeatureFlagsDataSource } from './cf-feature-flags-data-source';
 import {
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 10944e2dd7..361466c74f 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
@@ -11,12 +11,10 @@ import {
 import {
   CloudFoundryOrganizationServiceMock,
 } 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 {
-  CloudFoundryOrganizationService,
-} from '../../../../../features/cloud-foundry/services/cloud-foundry-organization.service';
-import { UserInviteService } from '../../../../../features/cloud-foundry/user-invites/user-invite.service';
+import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types';
+import { CloudFoundryEndpointService } from '../../../../../features/cf/services/cloud-foundry-endpoint.service';
+import { CloudFoundryOrganizationService } from '../../../../../features/cf/services/cloud-foundry-organization.service';
+import { UserInviteService } from '../../../../../features/cf/user-invites/user-invite.service';
 import { CfOrgUsersListConfigService } from './cf-org-users-list-config.service';
 
 describe('CfOrgUsersListConfigService', () => {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-org-users/cf-org-users-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-org-users/cf-org-users-list-config.service.ts
index 4d125e2cca..5a49886ad2 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-org-users/cf-org-users-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-org-users/cf-org-users-list-config.service.ts
@@ -6,10 +6,8 @@ import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state'
 import {
   CurrentUserPermissionsService,
 } from '../../../../../../../core/src/core/permissions/current-user-permissions.service';
-import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
-import {
-  CloudFoundryOrganizationService,
-} from '../../../../../features/cloud-foundry/services/cloud-foundry-organization.service';
+import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types';
+import { CloudFoundryOrganizationService } from '../../../../../features/cf/services/cloud-foundry-organization.service';
 import { CfUser } from '../../../../../store/types/cf-user.types';
 import { CfUserService } from '../../../../data-services/cf-user.service';
 import { CfUserListConfigService } from '../cf-users/cf-user-list-config.service';
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 f7e4ff459b..fee067f62f 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
@@ -25,14 +25,10 @@ import { getFavoriteFromEntity } from '../../../../../../../../store/src/user-fa
 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,
-} from '../../../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
-import { OrgQuotaHelper } from '../../../../../../features/cloud-foundry/services/cloud-foundry-organization-quota';
-import {
-  createOrgQuotaDefinition,
-} from '../../../../../../features/cloud-foundry/services/cloud-foundry-organization.service';
+import { getOrgRolesString } from '../../../../../../features/cf/cf.helpers';
+import { CloudFoundryEndpointService } from '../../../../../../features/cf/services/cloud-foundry-endpoint.service';
+import { OrgQuotaHelper } from '../../../../../../features/cf/services/cloud-foundry-organization-quota';
+import { createOrgQuotaDefinition } from '../../../../../../features/cf/services/cloud-foundry-organization.service';
 import { createUserRoleInOrg } from '../../../../../../store/types/cf-user.types';
 import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-user-permissions-checkers';
 import { CfUserService } from '../../../../../data-services/cf-user.service';
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 f0c23e0d95..86c11ed8c3 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
@@ -9,7 +9,7 @@ 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 { CloudFoundryEndpointService } from '../../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
+import { CloudFoundryEndpointService } from '../../../../../features/cf/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-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 4ab0ef44aa..3986f60290 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
@@ -5,7 +5,7 @@ import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state'
 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 { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types';
 import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
 import { CfOrgCardComponent } from './cf-org-card/cf-org-card.component';
 import { CfOrgsDataSourceService } from './cf-orgs-data-source.service';
diff --git a/src/frontend/packages/cloud-foundry/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
index d4e001d8aa..448a927339 100644
--- a/src/frontend/packages/cloud-foundry/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
@@ -5,7 +5,6 @@ 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';
@@ -19,6 +18,7 @@ import { IListAction, ListViewTypes } from '../../../../../../../core/src/shared
 import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { IQuotaDefinition } from '../../../../../cf-api.types';
+import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types';
 import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import { CfQuotasDataSourceService } from './cf-quotas-data-source.service';
 import { TableCellQuotaComponent } from './table-cell-quota/table-cell-quota.component';
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 f176f59556..ae52336a7e 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
@@ -23,7 +23,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 } from '../../../../../features/cloud-foundry/cf.helpers';
+import { cfOrgSpaceFilter } from '../../../../../features/cf/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-routes/cf-routes-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-list-config.service.ts
index 9767322990..f800809ecf 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-list-config.service.ts
@@ -14,7 +14,7 @@ import {
   IListMultiFilterConfig,
 } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { CloudFoundryEndpointService } from '../../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
+import { CloudFoundryEndpointService } from '../../../../../features/cf/services/cloud-foundry-endpoint.service';
 import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import {
   CfOrgSpaceDataService,
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 9ac357c8b7..a63b3659e7 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
@@ -5,7 +5,7 @@ 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 { CloudFoundrySpaceService } from '../../../../../../features/cf/services/cloud-foundry-space.service';
 import { TableCellRouteAppsAttachedComponent } from './table-cell-route-apps-attached.component';
 
 describe('TableCellRouteAppsAttachedComponent', () => {
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.spec.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.spec.ts
index 434dd70394..78c76495df 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.spec.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.spec.ts
@@ -9,7 +9,7 @@ import {
   generateCfBaseTestModulesNoShared,
   generateTestCfEndpointService,
 } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { ActiveRouteCfOrgSpace } from '../../../../../../features/cloud-foundry/cf-page.types';
+import { ActiveRouteCfOrgSpace } from '../../../../../../features/cf/cf-page.types';
 import { CfSecurityGroupsCardComponent } from './cf-security-groups-card.component';
 
 describe('CfSecurityGroupsCardComponent', () => {
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 a93e2e1137..3b3853c13f 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
@@ -4,9 +4,7 @@ import { AppChip } from '../../../../../../../../core/src/shared/components/chip
 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';
+import { CloudFoundryEndpointService } from '../../../../../../features/cf/services/cloud-foundry-endpoint.service';
 
 @Component({
   selector: 'app-cf-security-groups-card',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-list-config.service.spec.ts
index a4f651e5f1..0e54db9f11 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-list-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-list-config.service.spec.ts
@@ -1,7 +1,7 @@
 import { inject, TestBed } from '@angular/core/testing';
 
 import { generateCfBaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
+import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types';
 import { CfSecurityGroupsListConfigService } from './cf-security-groups-list-config.service';
 
 describe('CfSecurityGroupsListConfigService', () => {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-list-config.service.ts
index 6dc824717b..8a95b10189 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-list-config.service.ts
@@ -4,7 +4,7 @@ import { Store } from '@ngrx/store';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
+import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types';
 import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
 import { CfSecurityGroupsCardComponent } from './cf-security-groups-card/cf-security-groups-card.component';
 import { CfSecurityGroupsDataSource } from './cf-security-groups-data-source';
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 10ee7b1abb..9e074d09d6 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
@@ -22,8 +22,8 @@ import { PaginationMonitor } from '../../../../../../../store/src/monitors/pagin
 import { PaginationMonitorFactory } from '../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
-import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
-import { waitForCFPermissions } from '../../../../../features/cloud-foundry/cf.helpers';
+import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types';
+import { waitForCFPermissions } from '../../../../../features/cf/cf.helpers';
 import { CfUser, CfUserMissingRoles } from '../../../../../store/types/cf-user.types';
 import { CfUserService } from '../../../../data-services/cf-user.service';
 import { CfSelectUsersDataSourceService } from './cf-select-users-data-source.service';
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 b1ecf9ef80..2ed4424106 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
@@ -21,7 +21,7 @@ import {
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { IServiceInstance } from '../../../../../cf-api-svc.types';
-import { isUserProvidedServiceInstance } from '../../../../../features/cloud-foundry/cf.helpers';
+import { isUserProvidedServiceInstance } from '../../../../../features/cf/cf.helpers';
 import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import { ServiceActionHelperService } from '../../../../data-services/service-action-helper.service';
 import { CANCEL_ORG_ID_PARAM, CANCEL_SPACE_ID_PARAM, CSI_CANCEL_URL } from '../../../add-service-instance/csi-mode.service';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.spec.ts
index 78df4dfe9b..32f9fd4c6b 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.spec.ts
@@ -1,7 +1,7 @@
 import { inject, TestBed } from '@angular/core/testing';
 
 import { generateCfBaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
+import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types';
 import { CfServicesListConfigService } from './cf-services-list-config.service';
 
 describe('CfServicesListConfigService', () => {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts
index 90fdcad893..13e12ea854 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts
@@ -14,8 +14,8 @@ import { ListView } from '../../../../../../../store/src/actions/list.actions';
 import { connectedEndpointsOfTypesSelector } from '../../../../../../../store/src/selectors/endpoint.selectors';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
-import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
-import { haveMultiConnectedCfs } from '../../../../../features/cloud-foundry/cf.helpers';
+import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types';
+import { haveMultiConnectedCfs } from '../../../../../features/cf/cf.helpers';
 import { CfOrgSpaceItem, createCfOrgSpaceFilterConfig } from '../../../../data-services/cf-org-space-service.service';
 import { CfServiceCardComponent } from './cf-service-card/cf-service-card.component';
 import { CfServicesDataSource } from './cf-services-data-source';
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 4a9ee537ec..f66bdff76a 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
@@ -21,7 +21,7 @@ import {
 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 { CloudFoundrySpaceService } from '../../../../../features/cf/services/cloud-foundry-space.service';
 import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 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-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 b858a197ed..de8d5b25d0 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
@@ -13,7 +13,7 @@ import { IListConfig } from '../../../../../../../core/src/shared/components/lis
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
-import { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/services/cloud-foundry-space.service';
+import { CloudFoundrySpaceService } from '../../../../../features/cf/services/cloud-foundry-space.service';
 
 export class CfSpaceAppsDataSource extends ListDataSource<APIResource> {
   constructor(store: Store<CFAppState>, cfSpaceService: CloudFoundrySpaceService, listConfig?: IListConfig<APIResource>) {
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 81ce704340..07ea411246 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
@@ -3,7 +3,7 @@ import { inject, TestBed } from '@angular/core/testing';
 
 import { generateCfBaseTestModules } 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 { CloudFoundrySpaceService } from '../../../../../features/cf/services/cloud-foundry-space.service';
 import { CfSpaceAppsListConfigService } from './cf-space-apps-list-config.service';
 
 describe('CfSpaceAppsListConfigService', () => {
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 60065a1ebb..0140384461 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
@@ -18,7 +18,7 @@ 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 { CloudFoundrySpaceService } from '../../../../../features/cf/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';
 import { CfSpaceAppsDataSource } from './cf-space-apps-data-source.service';
diff --git a/src/frontend/packages/cloud-foundry/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
index fd78c9a3fd..69350aed0c 100644
--- a/src/frontend/packages/cloud-foundry/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
@@ -15,7 +15,7 @@ import { APIResource } from '../../../../../../../store/src/types/api.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 { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types';
 import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
 import { QUOTA_FROM_LIST } from '../cf-quotas/cf-quotas-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 7f8531ebd3..1819bf3f93 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
@@ -3,7 +3,7 @@ import { inject, TestBed } from '@angular/core/testing';
 
 import { generateCfBaseTestModules } 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 { CloudFoundrySpaceService } from '../../../../../features/cf/services/cloud-foundry-space.service';
 import { CfSpaceRoutesListConfigService } from './cf-space-routes-list-config.service';
 
 describe('CfSpaceRoutesListConfigService', () => {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-list-config.service.ts
index 0090a576fb..9a54d91cdc 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-list-config.service.ts
@@ -10,7 +10,7 @@ import {
 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 { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/services/cloud-foundry-space.service';
+import { CloudFoundrySpaceService } from '../../../../../features/cf/services/cloud-foundry-space.service';
 import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import { CfRoutesListConfigBase } from '../cf-routes/cf-routes-list-config-base';
 import { CfSpaceRoutesDataSource } from './cf-space-routes-data-source';
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 17b9e153bf..ab5cf5744e 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
@@ -6,13 +6,11 @@ import {
   CloudFoundryOrganizationServiceMock,
 } 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 {
-  CloudFoundryOrganizationService,
-} from '../../../../../features/cloud-foundry/services/cloud-foundry-organization.service';
-import { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/services/cloud-foundry-space.service';
-import { UserInviteService } from '../../../../../features/cloud-foundry/user-invites/user-invite.service';
+import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types';
+import { CloudFoundryEndpointService } from '../../../../../features/cf/services/cloud-foundry-endpoint.service';
+import { CloudFoundryOrganizationService } from '../../../../../features/cf/services/cloud-foundry-organization.service';
+import { CloudFoundrySpaceService } from '../../../../../features/cf/services/cloud-foundry-space.service';
+import { UserInviteService } from '../../../../../features/cf/user-invites/user-invite.service';
 import { CfUserService } from '../../../../data-services/cf-user.service';
 import { CfSpaceUsersListConfigService } from './cf-space-users-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.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service.ts
index 0484f50f82..84ce162b93 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service.ts
@@ -6,11 +6,9 @@ import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state'
 import {
   CurrentUserPermissionsService,
 } from '../../../../../../../core/src/core/permissions/current-user-permissions.service';
-import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
-import {
-  CloudFoundryOrganizationService,
-} from '../../../../../features/cloud-foundry/services/cloud-foundry-organization.service';
-import { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/services/cloud-foundry-space.service';
+import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types';
+import { CloudFoundryOrganizationService } from '../../../../../features/cf/services/cloud-foundry-organization.service';
+import { CloudFoundrySpaceService } from '../../../../../features/cf/services/cloud-foundry-space.service';
 import { CfUser } from '../../../../../store/types/cf-user.types';
 import { CfUserService } from '../../../../data-services/cf-user.service';
 import { CfUserListConfigService } from '../cf-users/cf-user-list-config.service';
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 f747341abe..61361c6697 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
@@ -9,7 +9,7 @@ import {
 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 { CloudFoundrySpaceService } from '../../../../../features/cf/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';
 import { CfSpacesServiceInstancesDataSource } from './cf-spaces-service-instances-data-source';
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 f780e7ce4d..6f137e7428 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
@@ -13,9 +13,7 @@ import {
   generateTestCfEndpointServiceProvider,
   generateTestCfUserServiceProvider,
 } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import {
-  CloudFoundryOrganizationService,
-} from '../../../../../../features/cloud-foundry/services/cloud-foundry-organization.service';
+import { CloudFoundryOrganizationService } from '../../../../../../features/cf/services/cloud-foundry-organization.service';
 import { CfOrgSpaceDataService } from '../../../../../data-services/cf-org-space-service.service';
 import {
   CloudFoundryUserProvidedServicesService,
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 322d4bc454..784692eab6 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
@@ -27,15 +27,13 @@ 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 {
-  CloudFoundryEndpointService,
-} from '../../../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
+import { getSpaceRolesString } from '../../../../../../features/cf/cf.helpers';
+import { CloudFoundryEndpointService } from '../../../../../../features/cf/services/cloud-foundry-endpoint.service';
 import {
   CloudFoundryOrganizationService,
   createSpaceQuotaDefinition,
-} from '../../../../../../features/cloud-foundry/services/cloud-foundry-organization.service';
-import { SpaceQuotaHelper } from '../../../../../../features/cloud-foundry/services/cloud-foundry-space-quota';
+} from '../../../../../../features/cf/services/cloud-foundry-organization.service';
+import { SpaceQuotaHelper } from '../../../../../../features/cf/services/cloud-foundry-space-quota';
 import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-user-permissions-checkers';
 import { CfUserService } from '../../../../../data-services/cf-user.service';
 
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 4571a58385..5af34c8602 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
@@ -7,9 +7,7 @@ import { IListConfig, ListViewTypes } from '../../../../../../../core/src/shared
 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';
+import { CloudFoundryOrganizationService } from '../../../../../features/cf/services/cloud-foundry-organization.service';
 import { CfSpaceCardComponent } from './cf-space-card/cf-space-card.component';
 import { CfSpacesDataSourceService } from './cf-spaces-data-source.service';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-stacks/cf-stacks-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-stacks/cf-stacks-list-config.service.spec.ts
index f037cfcc5f..3d9c00c8d7 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-stacks/cf-stacks-list-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-stacks/cf-stacks-list-config.service.spec.ts
@@ -1,7 +1,7 @@
 import { inject, TestBed } from '@angular/core/testing';
 
 import { generateCfBaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
+import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types';
 import { CfStacksListConfigService } from './cf-stacks-list-config.service';
 
 describe('CfStacksListConfigService', () => {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-stacks/cf-stacks-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-stacks/cf-stacks-list-config.service.ts
index 4e89132e0f..1601fd041c 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-stacks/cf-stacks-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-stacks/cf-stacks-list-config.service.ts
@@ -4,7 +4,7 @@ import { Store } from '@ngrx/store';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
+import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types';
 import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
 import { CfStacksCardComponent } from './cf-stacks-card/cf-stacks-card.component';
 import { CfStacksDataSource } from './cf-stacks-data-source';
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 83128b8b1c..b7e9a14566 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
@@ -19,7 +19,7 @@ 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 { CfRolesService } from '../../../../../features/cloud-foundry/users/manage-users/cf-roles.service';
+import { CfRolesService } from '../../../../../features/cf/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-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 7fe7843b9a..b6130d172c 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
@@ -9,8 +9,8 @@ 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';
+import { ActiveRouteCfOrgSpace } from '../../../../../../features/cf/cf-page.types';
+import { CfRolesService } from '../../../../../../features/cf/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';
 
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 cd24bca07c..6990244c14 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
@@ -7,8 +7,8 @@ import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors
 import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-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 { ActiveRouteCfOrgSpace } from '../../../../../../features/cf/cf-page.types';
+import { CfRolesService } from '../../../../../../features/cf/users/manage-users/cf-roles.service';
 import { CfUserService } from '../../../../../data-services/cf-user.service';
 import { TableCellSelectOrgComponent } from './table-cell-select-org.component';
 
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 4d11410056..1af855c8b6 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
@@ -8,8 +8,8 @@ import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-sta
 import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.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 { CfRolesService } from '../../../../../../features/cloud-foundry/users/manage-users/cf-roles.service';
+import { ActiveRouteCfOrgSpace } from '../../../../../../features/cf/cf-page.types';
+import { CfRolesService } from '../../../../../../features/cf/users/manage-users/cf-roles.service';
 import { selectCfUsersRolesOrgGuid } from '../../../../../../store/selectors/cf-users-roles.selector';
 
 @Component({
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 76825b3388..05653c251e 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
@@ -16,7 +16,7 @@ import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/
 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 { getOrgRoles } from '../../../../../../features/cf/cf.helpers';
 import { CfUser, IUserPermissionInOrg, OrgUserRoleNames } from '../../../../../../store/types/cf-user.types';
 import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-user-permissions-checkers';
 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-permission-cell.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-permission-cell.ts
index 7c325a8325..458162a84b 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, Directive } from '@angular/core';
+import { Directive, Input } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
 import { filter, first, map, switchMap } from 'rxjs/operators';
@@ -11,7 +11,7 @@ import { ConfirmationDialogService } from '../../../../../../../core/src/shared/
 import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
 import { selectSessionData } from '../../../../../../../store/src/reducers/auth.reducer';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { IUserRole } from '../../../../../features/cloud-foundry/cf.helpers';
+import { IUserRole } from '../../../../../features/cf/cf.helpers';
 import { CfUser } from '../../../../../store/types/cf-user.types';
 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 6aa867410f..ba82dc8bb6 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
@@ -16,7 +16,7 @@ import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/
 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 { getSpaceRoles } from '../../../../../../features/cf/cf.helpers';
 import { CfUser, IUserPermissionInSpace, SpaceUserRoleNames } from '../../../../../../store/types/cf-user.types';
 import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-user-permissions-checkers';
 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.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.spec.ts
index 19f56eb01a..9e35b16f7b 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
@@ -14,11 +14,9 @@ import {
   CloudFoundryOrganizationServiceMock,
 } 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 '../../../../../features/cloud-foundry/services/cloud-foundry-organization.service';
-import { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/services/cloud-foundry-space.service';
+import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types';
+import { CloudFoundryOrganizationService } from '../../../../../features/cf/services/cloud-foundry-organization.service';
+import { CloudFoundrySpaceService } from '../../../../../features/cf/services/cloud-foundry-space.service';
 import { CfUserService } from '../../../../data-services/cf-user.service';
 import { CfUserListConfigService } from './cf-user-list-config.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 23f7f500b9..143a4c32e6 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
@@ -23,7 +23,7 @@ import { selectPaginationState } from '../../../../../../../store/src/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 { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types';
 import {
   canUpdateOrgSpaceRoles,
   createCfOrgSpaceSteppersUrl,
@@ -32,7 +32,7 @@ import {
   hasRoleWithinSpace,
   hasSpaceRoleWithinOrg,
   waitForCFPermissions,
-} from '../../../../../features/cloud-foundry/cf.helpers';
+} from '../../../../../features/cf/cf.helpers';
 import { CfUser } from '../../../../../store/types/cf-user.types';
 import { CfUserPermissionsChecker } from '../../../../../user-permissions/cf-user-permissions-checkers';
 import { CfUserService } from './../../../../data-services/cf-user.service';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-list-config.service.ts
index 0f597ef543..2c76635469 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-list-config.service.ts
@@ -22,7 +22,7 @@ import {
   ListViewTypes,
 } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
-import { cfOrgSpaceFilter } from '../../../../../features/cloud-foundry/cf.helpers';
+import { cfOrgSpaceFilter } from '../../../../../features/cf/cf.helpers';
 import { CfOrgSpaceDataService, createCfOrgSpaceFilterConfig } from '../../../../data-services/cf-org-space-service.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/data-services/cf-user.service.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-user.service.ts
index e797eab3c8..01e167c8e2 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
@@ -23,7 +23,7 @@ import { PaginatedAction } from '../../../../store/src/types/pagination.types';
 import { IOrganization, ISpace } from '../../cf-api.types';
 import { cfEntityCatalog } from '../../cf-entity-catalog';
 import { cfEntityFactory } from '../../cf-entity-factory';
-import { ActiveRouteCfOrgSpace } from '../../features/cloud-foundry/cf-page.types';
+import { ActiveRouteCfOrgSpace } from '../../features/cf/cf-page.types';
 import {
   fetchTotalResults,
   filterEntitiesByGuid,
@@ -35,7 +35,7 @@ import {
   isSpaceDeveloper,
   isSpaceManager,
   waitForCFPermissions,
-} from '../../features/cloud-foundry/cf.helpers';
+} from '../../features/cf/cf.helpers';
 import { selectCfPaginationState } from '../../store/selectors/pagination.selectors';
 import {
   CfUser,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/directives/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
index 51a8e0ee13..c8ec0fdd99 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/directives/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
@@ -14,7 +14,7 @@ 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 { ActiveRouteCfOrgSpace } from '../../../features/cf/cf-page.types';
 import { CfUserService } from '../../data-services/cf-user.service';
 import { AppNameUniqueDirective } from './app-name-unique.directive';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/directives/cf-user-permission/cf-user-permission.directive.ts b/src/frontend/packages/cloud-foundry/src/shared/directives/cf-user-permission/cf-user-permission.directive.ts
index 283767d5f4..8e6406738f 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/directives/cf-user-permission/cf-user-permission.directive.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/directives/cf-user-permission/cf-user-permission.directive.ts
@@ -5,7 +5,7 @@ import { switchMap } from 'rxjs/operators';
 
 import { CurrentUserPermissionsService } from '../../../../../core/src/core/permissions/current-user-permissions.service';
 import { AppState } from '../../../../../store/src/app-state';
-import { waitForCFPermissions } from '../../../features/cloud-foundry/cf.helpers';
+import { waitForCFPermissions } from '../../../features/cf/cf.helpers';
 import { CfCurrentUserPermissions } from '../../../user-permissions/cf-user-permissions-checkers';
 
 @Directive({
diff --git a/src/frontend/packages/cloud-foundry/src/shared/services/cf-org-space-label.service.ts b/src/frontend/packages/cloud-foundry/src/shared/services/cf-org-space-label.service.ts
index 36c9cb2e38..7fb63eafc2 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/services/cf-org-space-label.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/services/cf-org-space-label.service.ts
@@ -10,7 +10,7 @@ import { EndpointModel } from '../../../../store/src/types/endpoint.types';
 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 { haveMultiConnectedCfs } from '../../features/cf/cf.helpers';
 import { selectCfEntity } from '../../store/selectors/api.selectors';
 
 export class CfOrgSpaceLabelService {
diff --git a/src/frontend/packages/cloud-foundry/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
index a90fbb0a94..3ebc0e70b6 100644
--- a/src/frontend/packages/cloud-foundry/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
@@ -17,7 +17,7 @@ import { CFAppState } from '../../cf-app-state';
 import { cfEntityCatalog } from '../../cf-entity-catalog';
 import { organizationEntityType, spaceEntityType } from '../../cf-entity-types';
 import { createEntityRelationPaginationKey } from '../../entity-relations/entity-relations.types';
-import { fetchTotalResults } from '../../features/cloud-foundry/cf.helpers';
+import { fetchTotalResults } from '../../features/cf/cf.helpers';
 import { QParam, QParamJoiners } from '../q-param';
 
 
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 700bf7c0a7..0d49b902db 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
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { EffectsModule } from '@ngrx/effects';
 
-import { ActiveRouteCfOrgSpace } from '../features/cloud-foundry/cf-page.types';
+import { ActiveRouteCfOrgSpace } from '../features/cf/cf-page.types';
 import { CloudFoundryReducersModule } from './cloud-foundry.reducers.module';
 import { AppVariablesEffect } from './effects/app-variables.effects';
 import { AppEffects } from './effects/app.effects';
diff --git a/src/frontend/packages/cloud-foundry/src/store/effects/users-roles.effects.ts b/src/frontend/packages/cloud-foundry/src/store/effects/users-roles.effects.ts
index 7ed0d48c09..c75fb997b0 100644
--- a/src/frontend/packages/cloud-foundry/src/store/effects/users-roles.effects.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/effects/users-roles.effects.ts
@@ -4,7 +4,7 @@ import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import {
   ManageUsersSetUsernamesHelper,
-} from 'frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component';
+} from 'frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component';
 import { combineLatest as observableCombineLatest, combineLatest, Observable, of as observableOf, of } from 'rxjs';
 import { catchError, filter, first, map, mergeMap, pairwise, switchMap, tap, withLatestFrom } from 'rxjs/operators';
 
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 3fc7ed40e9..7a99f5dd9b 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
@@ -14,12 +14,9 @@ import { PaginationMonitorFactory } from '../../store/src/monitors/pagination-mo
 import { appReducers } from '../../store/src/reducers.module';
 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 {
-  UserInviteConfigureService,
-  UserInviteService,
-} from '../src/features/cloud-foundry/user-invites/user-invite.service';
+import { ActiveRouteCfOrgSpace } from '../src/features/cf/cf-page.types';
+import { CloudFoundryEndpointService } from '../src/features/cf/services/cloud-foundry-endpoint.service';
+import { UserInviteConfigureService, UserInviteService } from '../src/features/cf/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';
diff --git a/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-space.service.mock.ts b/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-space.service.mock.ts
index 385bf3b793..37e33ce7bd 100644
--- a/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-space.service.mock.ts
+++ b/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-space.service.mock.ts
@@ -1,6 +1,6 @@
 import { Observable, of as observableOf } from 'rxjs';
 
-import { CloudFoundrySpaceService } from '../src/features/cloud-foundry/services/cloud-foundry-space.service';
+import { CloudFoundrySpaceService } from '../src/features/cf/services/cloud-foundry-space.service';
 
 export class CloudFoundrySpaceServiceMock {
 
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.html b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.html
index fe95b7a420..234764c826 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.html
@@ -22,7 +22,11 @@ <h1 class="create-endpoint__section-title">Advanced Information (Optional)</h1>
     </mat-form-field>
     <mat-form-field>
       <input matInput id="client_secret" name="client_secret" ngModel #clientSecretField="ngModel"
-        placeholder="Client Secret">
+        placeholder="Client Secret" [type]="!show ? 'password' : 'text'">
+      <button mat-icon-button matSuffix (click)="show = !show" [attr.aria-label]="'Hide Secret'"
+        [attr.aria-pressed]="!show">
+        <mat-icon>{{!show ? 'visibility_off' : 'visibility'}}</mat-icon>
+      </button>
     </mat-form-field>
   </div>
   <div *ngIf="endpointTypeSupportsSSO" class="create-endpoint__sso">
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 96bca56f21..a1aaf71d57 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
@@ -51,6 +51,7 @@ export class CreateEndpointCfStep1Component implements IStepperStep, AfterConten
 
   endpointTypeSupportsSSO = false;
   endpoint: StratosCatalogEndpointEntity;
+  show = false;
 
   constructor(
     activatedRoute: ActivatedRoute,
diff --git a/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.html b/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.html
index fd059d3a3d..f58d96c145 100644
--- a/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.html
@@ -15,14 +15,20 @@ <h1 class="edit-endpoint__section-title">{{definition.label}} Information</h1>
     <div *ngIf="showAdvancedFields" class="edit-endpoint__section">
       <h1 class="edit-endpoint__section-title">Advanced Information (Optional)</h1>
 
-      <mat-checkbox matInput name="setClientInfo" formControlName="setClientInfo">Update Client ID and Client Secret</mat-checkbox>
-  
+      <mat-checkbox matInput name="setClientInfo" formControlName="setClientInfo">Update Client ID and Client Secret
+      </mat-checkbox>
+
       <mat-form-field>
         <input matInput id="client_id" name="client_id" formControlName="clientID" placeholder="Client ID" required>
         <mat-error *ngIf="clientID.errors && clientID.errors.required">Client ID is required</mat-error>
       </mat-form-field>
       <mat-form-field>
-        <input matInput id="client_secret" name="client_secret" formControlName="clientSecret" placeholder="Client Secret">
+        <input matInput id="client_secret" name="client_secret" formControlName="clientSecret"
+          placeholder="Client Secret" [type]="!show ? 'password' : 'text'">
+        <button mat-icon-button matSuffix (click)="show = !show" [attr.aria-label]="'Hide Secret'"
+          [attr.aria-pressed]="!show">
+          <mat-icon>{{!show ? 'visibility_off' : 'visibility'}}</mat-icon>
+        </button>
       </mat-form-field>
     </div>
     <div *ngIf="endpointTypeSupportsSSO" class="edit-endpoint__sso">
@@ -36,4 +42,4 @@ <h1 class="edit-endpoint__section-title">Advanced Information (Optional)</h1>
       </div>
     </div>
   </form>
-</div>
+</div>
\ No newline at end of file
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 cb6120b12e..e447f535f7 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
@@ -42,6 +42,7 @@ export class EditEndpointStepComponent implements OnDestroy, IStepperStep {
   existingEndpointNames$: Observable<string[]>;
   formChangeSub: Subscription;
   setClientInfo = false;
+  show = false;
 
   constructor(
     activatedRoute: ActivatedRoute,
diff --git a/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.html b/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.html
index 8eab0cb6ab..21b3273bdf 100644
--- a/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.html
+++ b/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.html
@@ -20,7 +20,12 @@ <h1>{{title}} Setup with Cloud Foundry UAA</h1>
                 <input matInput formControlName="clientId" placeholder="Client ID">
               </mat-form-field>
               <mat-form-field>
-                <input matInput formControlName="clientSecret" placeholder="Client Secret">
+                <input matInput formControlName="clientSecret" placeholder="Client Secret"
+                  [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>
             </div>
             <p class="uaa-wizard__form-section">Enter the username and password of an admin user (this is used to
@@ -31,7 +36,12 @@ <h1>{{title}} Setup with Cloud Foundry UAA</h1>
                 <input matInput formControlName="adminUsername" placeholder="Admin Username">
               </mat-form-field>
               <mat-form-field>
-                <input matInput type="password" formControlName="adminPassword" placeholder="Admin Password">
+                <input matInput type="password" formControlName="adminPassword" placeholder="Admin Password"
+                  [type]="!showPassword ? 'password' : 'text'">
+                <button mat-icon-button matSuffix (click)="showPassword = !showPassword"
+                  [attr.aria-label]="'Hide password'" [attr.aria-pressed]="!showPassword">
+                  <mat-icon>{{!showPassword ? 'visibility_off' : 'visibility'}}</mat-icon>
+                </button>
               </mat-form-field>
             </div>
             <!-- Single Sign-on -->
diff --git a/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.ts b/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.ts
index d1e360bfa5..677d623ea1 100644
--- a/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.ts
+++ b/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.ts
@@ -1,16 +1,16 @@
-import { Component, OnInit, ViewEncapsulation, Inject } from '@angular/core';
+import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { Store } from '@ngrx/store';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { delay, filter, map, skipWhile, take } from 'rxjs/operators';
 
 import { VerifySession } from '../../../../../store/src/actions/auth.actions';
+import { SetupConsoleGetScopes, SetupSaveConfig } from '../../../../../store/src/actions/setup.actions';
 import { InternalAppState } from '../../../../../store/src/app-state';
 import { AuthState } from '../../../../../store/src/reducers/auth.reducer';
 import { UAASetupState } from '../../../../../store/src/types/uaa-setup.types';
-import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component';
-import { SetupConsoleGetScopes, SetupSaveConfig } from '../../../../../store/src/actions/setup.actions';
 import { APP_TITLE } from '../../../core/core.types';
+import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component';
 import { getSSOClientRedirectURI } from '../../endpoints/endpoint-helpers';
 
 @Component({
@@ -35,6 +35,9 @@ export class ConsoleUaaWizardComponent implements OnInit {
   selectedScope = '';
   applyingSetup$ = new BehaviorSubject<boolean>(false);
 
+  public show = false;
+  public showPassword = false;
+
   uaaFormNext: StepOnNextFunction = () => {
     this.store.dispatch(new SetupConsoleGetScopes({
       uaa_endpoint: this.uaaForm.get('apiUrl').value,
diff --git a/src/frontend/packages/devkit/build.js b/src/frontend/packages/devkit/build.js
new file mode 100644
index 0000000000..7bbcf1dba5
--- /dev/null
+++ b/src/frontend/packages/devkit/build.js
@@ -0,0 +1,27 @@
+// Copy extra files needed as part of the devkit build
+// Implemented as a single script here so that it works on Windows, Linux and Mac
+
+const path = require('path');
+const fs = require('fs-extra');
+
+console.log('Copying devkit files');
+
+// __dirname is the folder where build.js is located
+const STRATOS_DIR= path.resolve(__dirname, '..', '..', '..', '..');
+const DEVKIT_DIST_DIR= path.join(STRATOS_DIR, 'dist-devkit');
+
+let err = fs.copySync(path.join(__dirname, 'package.json'), path.join(DEVKIT_DIST_DIR, 'package.json'));
+if (err) {
+  console.log(err);
+}
+err =fs.copySync(path.join(__dirname, 'src'), path.join(DEVKIT_DIST_DIR), {
+  overwrite: true,
+  dereference: true,
+  preserveTimestamps: true,
+  filter: function(file) {
+   return !file.endsWith('.ts');
+  }
+});
+if (err) {
+  console.log(err);
+}
diff --git a/src/frontend/packages/devkit/build.sh b/src/frontend/packages/devkit/build.sh
deleted file mode 100755
index 8aaa9f8b3b..0000000000
--- a/src/frontend/packages/devkit/build.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-# Build script for devkit
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-ROOT="$( cd "$( dirname "${DIR}" )" && cd ../../.. && pwd )"
-DIST="$ROOT/dist-devkit"
-
-echo $DIST
-echo $DIR
-tsc
-if [ $? -eq 0 ]; then
-  echo "Copying supporting files"
-  cp "$DIR/package.json" "$DIST"
-  rsync -r --exclude=*.ts "${DIR}/src/" "${DIST}/"
-fi
-
diff --git a/src/frontend/packages/devkit/package.json b/src/frontend/packages/devkit/package.json
index e16bd4f8fe..e27689fbd3 100644
--- a/src/frontend/packages/devkit/package.json
+++ b/src/frontend/packages/devkit/package.json
@@ -2,7 +2,7 @@
   "name": "@stratosui/devkit",
   "version": "0.0.1",
   "scripts": {
-    "build": "./build.sh",
+    "build": "tsc && node build.js",
     "tsc": "tsc"
   },
   "dependencies": {
diff --git a/src/frontend/packages/devkit/src/build/extensions.ts b/src/frontend/packages/devkit/src/build/extensions.ts
index cbd7d43090..26f7e8af26 100644
--- a/src/frontend/packages/devkit/src/build/extensions.ts
+++ b/src/frontend/packages/devkit/src/build/extensions.ts
@@ -1,11 +1,13 @@
 import * as fs from 'fs';
 import * as path from 'path';
-import { NormalModuleReplacementPlugin } from 'webpack';
 
+import { NormalModuleReplacementPlugin } from 'webpack';
 import { StratosConfig } from '../lib/stratos.config';
 
 const importModuleRegex = /src\/frontend\/packages\/core\/src\/custom-import.module.ts/;
 
+const isWindows = process.platform === 'win32';
+
 /**
  * Generates the file _custom-import.module.ts containing the code to import
  * the extensions modules discovered from the packages being included.
@@ -51,8 +53,18 @@ export class ExtensionsHandler {
     this.writeModule(overrideFile, 'CustomImportModule', moduleImports);
     this.writeModule(overrideFile, 'CustomRoutingImportModule', routingMmoduleImports);
 
+    let regex;
+    // On windows, use an absolute path with backslashes escaped
+    if (isWindows) {
+      let p = path.resolve(path.join(dir, 'custom-import.module.ts'));
+      p = p.replace(/\\/g, '\\\\');
+      regex = new RegExp(p);
+    } else {
+      regex = importModuleRegex
+    }
+
     webpackConfig.plugins.push(new NormalModuleReplacementPlugin(
-      importModuleRegex,
+      regex,
       overrideFile
     ));
   }
diff --git a/src/frontend/packages/devkit/src/build/sass.ts b/src/frontend/packages/devkit/src/build/sass.ts
index 745a378e36..5a1dcf8aa8 100644
--- a/src/frontend/packages/devkit/src/build/sass.ts
+++ b/src/frontend/packages/devkit/src/build/sass.ts
@@ -1,3 +1,4 @@
+import * as path from 'path';
 import { StratosConfig } from '../lib/stratos.config';
 
 /**
@@ -52,12 +53,12 @@ export class SassHandler {
         } else {
           pkgName = pkgParts.shift();
         }
-        const pkgPath = pkgParts.join('/');
+        const pkgPath = pkgParts.join(path.sep);
         // See if we can resolve the package name
         const knownPath = config.resolveKnownPackage(pkgName);
         if (knownPath) {
           return {
-            file: knownPath + '/_' + pkgPath + '.scss'
+            file: path.join(knownPath, pkgPath + '.scss')
           };
         }
       }
diff --git a/src/frontend/packages/devkit/src/lib/packages.ts b/src/frontend/packages/devkit/src/lib/packages.ts
index 6e0f3a8c02..eb16284148 100644
--- a/src/frontend/packages/devkit/src/lib/packages.ts
+++ b/src/frontend/packages/devkit/src/lib/packages.ts
@@ -267,7 +267,7 @@ export class Packages {
           package: pkg.name,
           scss: refParts[0],
           mixin: refParts[1],
-          importPath: path.join(packagePath, refParts[0])
+          importPath: '~' + pkg.name + '/' + refParts[0]
         };
         this.log('Found themed package: ' + pkg.name + ' (' + pkg.stratos.theming + ')');
         return themingConfig;
diff --git a/src/jetstream/config.dev b/src/jetstream/config.dev
new file mode 100644
index 0000000000..a98e5c3ec3
--- /dev/null
+++ b/src/jetstream/config.dev
@@ -0,0 +1,55 @@
+# ===============================================
+# Stratos Default Backend Developer Configuration
+# ===============================================
+
+# Database connectivity environment variables
+DATABASE_PROVIDER=sqlite
+HTTP_CONNECTION_TIMEOUT_IN_SECS=10
+HTTP_CLIENT_TIMEOUT_IN_SECS=30
+HTTP_CLIENT_TIMEOUT_MUTATING_IN_SECS=120
+HTTP_CLIENT_TIMEOUT_LONGRUNNING_IN_SECS=600
+SKIP_SSL_VALIDATION=true
+CONSOLE_PROXY_TLS_ADDRESS=:5443
+CONSOLE_CLIENT=console
+CF_CLIENT=cf
+UAA_ENDPOINT=
+CONSOLE_ADMIN_SCOPE=stratos.admin
+CF_ADMIN_ROLE=cloud_controller.admin
+ALLOWED_ORIGINS=http://nginx
+SESSION_STORE_SECRET=stratos_development
+CONSOLE_PROXY_CERT_PATH=../../dev-ssl/server.crt
+CONSOLE_PROXY_CERT_KEY_PATH=../../dev-ssl/server.key
+ENCRYPTION_KEY=B374A26A71490437AA024E4FADD5B497FDFF1A8EA6FF12F6FB65AF2720B59CCF
+SQLITE_KEEP_DB=true
+UI_PATH=../../dist
+
+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
+ENABLE_TECH_PREVIEW=true
+
+# Override the default max list size. When hit we won't fetch all results for the given list
+#UI_LIST_MAX_SIZE=600
+# If the max list size is hit allow the user to load all results anyway. Defaults to false
+#UI_LIST_ALLOW_LOAD_MAXED=false
+
+# User Invites
+SMTP_FROM_ADDRESS=Stratos<invite@stratos.com>
+SMTP_HOST=127.0.0.1
+SMTP_PASSWORD=
+SMTP_PORT=1025
+SMTP_USER=
+TEMPLATE_DIR=./templates
+INVITE_USER_CLIENT_ID=
+INVITE_USER_CLIENT_SECRET=
+
+# Use local admin user rather than UAA users
+AUTH_ENDPOINT_TYPE=local
+LOCAL_USER=admin
+LOCAL_USER_PASSWORD=admin
+LOCAL_USER_SCOPE=stratos.admin
diff --git a/src/jetstream/default.config.properties b/src/jetstream/config.example
similarity index 98%
rename from src/jetstream/default.config.properties
rename to src/jetstream/config.example
index e6466f8004..69d9110c8b 100644
--- a/src/jetstream/default.config.properties
+++ b/src/jetstream/config.example
@@ -8,7 +8,7 @@ SKIP_SSL_VALIDATION=true
 CONSOLE_PROXY_TLS_ADDRESS=:5443
 CONSOLE_CLIENT=console
 CF_CLIENT=cf
-UAA_ENDPOINT=http://localhost:8080
+UAA_ENDPOINT=
 CONSOLE_ADMIN_SCOPE=stratos.admin
 CF_ADMIN_ROLE=cloud_controller.admin
 ALLOWED_ORIGINS=http://nginx
diff --git a/src/jetstream/main.go b/src/jetstream/main.go
index f6f90c60c6..955f6f0000 100644
--- a/src/jetstream/main.go
+++ b/src/jetstream/main.go
@@ -10,7 +10,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"math/rand"	
+	"math/rand"
 	"net"
 	"net/http"
 	"os"
@@ -90,9 +90,6 @@ func getEnvironmentLookup() *env.VarSet {
 	// Fallback to a "config.properties" files in our directory
 	envLookup.AppendSource(config.NewConfigFileLookup("./config.properties"))
 
-	// Fall back to "default.config.properties" in our directory
-	envLookup.AppendSource(config.NewConfigFileLookup("./default.config.properties"))
-
 	// Fallback to individual files in the "/etc/secrets" directory
 	envLookup.AppendSource(config.NewSecretsDirLookup("/etc/secrets"))
 
diff --git a/src/test-e2e/application/application-autoscaler-e2e.spec.ts b/src/test-e2e/application/application-autoscaler-e2e.spec.ts
index c2656ac9a4..8eb872fd73 100644
--- a/src/test-e2e/application/application-autoscaler-e2e.spec.ts
+++ b/src/test-e2e/application/application-autoscaler-e2e.spec.ts
@@ -9,6 +9,7 @@ import { extendE2ETestTime } from '../helpers/extend-test-helpers';
 import { LocaleHelper } from '../locale.helper';
 import { CFPage } from '../po/cf-page.po';
 import { ConfirmDialogComponent } from '../po/confirm-dialog';
+import { TableData } from '../po/list.po';
 import { CREATE_APP_DEPLOY_TEST_TYPE, createApplicationDeployTests } from './application-deploy-helper';
 import { ApplicationE2eHelper } from './application-e2e-helpers';
 import { ApplicationPageAutoscalerTab } from './po/application-page-autoscaler.po';
@@ -39,6 +40,19 @@ describe('Autoscaler -', () => {
 
   const { testAppName, appDetails } = createApplicationDeployTests(CREATE_APP_DEPLOY_TEST_TYPE.GIT_URL);
 
+  // Scaling rules for the policy.
+  // Note - these should not result in scaling events during the test (we only expect one scaling event due to a schedule)
+  const memoryUtilThreshold = '90';
+  const memoryUtilOperator = '>=';
+  const memoryUtilBreach = '160';
+
+  const throughputOperator = '>=';
+  const throughputThreshold = '100'
+  const throughputAdjustment = '10';
+  const throughputAdjustmentType = '% instances';
+
+  const memoryUsedThreshold = '500';
+
   describe('Tab Tests -', () => {
     beforeAll(() => {
       // Should be deployed, no web-socket open, so we can wait for angular again
@@ -123,9 +137,9 @@ describe('Autoscaler -', () => {
       expect(createPolicy.stepper.canNext()).toBeFalsy();
       // Fill in form -- valid inputs
       createPolicy.stepper.getStepperForm().fill({ metric_type: 'memoryutil' });
-      createPolicy.stepper.getStepperForm().fill({ operator: '>=' });
-      createPolicy.stepper.getStepperForm().fill({ threshold: '60' });
-      createPolicy.stepper.getStepperForm().fill({ breach_duration_secs: '60' });
+      createPolicy.stepper.getStepperForm().fill({ operator: memoryUtilOperator });
+      createPolicy.stepper.getStepperForm().fill({ threshold: memoryUtilThreshold });
+      createPolicy.stepper.getStepperForm().fill({ breach_duration_secs: memoryUtilBreach });
       expect(createPolicy.stepper.getMatErrorsCount()).toBe(0);
       expect(createPolicy.stepper.getDoneButtonDisabledStatus()).toBe(null);
       // Fill in form -- invalid inputs
@@ -140,20 +154,22 @@ describe('Autoscaler -', () => {
       expect(createPolicy.stepper.getDoneButtonDisabledStatus()).toBe(null);
       createPolicy.stepper.clickDoneButton();
 
+
       // Click [Add] button
       createPolicy.stepper.clickAddButton();
       expect(createPolicy.stepper.getRuleTilesCount()).toBe(2);
       expect(createPolicy.stepper.canNext()).toBeFalsy();
       // Fill in form -- valid inputs
       createPolicy.stepper.getStepperForm().fill({ metric_type: 'throughput' });
+      createPolicy.stepper.getStepperForm().fill({ operator: throughputOperator, threshold: throughputThreshold });
       expect(createPolicy.stepper.getMatErrorsCount()).toBe(0);
       expect(createPolicy.stepper.getDoneButtonDisabledStatus()).toBe(null);
       // Fill in form -- invalid inputs
-      createPolicy.stepper.getStepperForm().fill({ adjustment: '10' });
+      createPolicy.stepper.getStepperForm().fill({ adjustment: throughputAdjustment });
       expect(createPolicy.stepper.getMatErrorsCount()).toBe(1);
       expect(createPolicy.stepper.getDoneButtonDisabledStatus()).toBe('true');
       // Fill in form -- fix invalid inputs
-      createPolicy.stepper.getStepperForm().fill({ adjustment_type: '% instances' });
+      createPolicy.stepper.getStepperForm().fill({ adjustment_type: throughputAdjustmentType });
       expect(createPolicy.stepper.getMatErrorsCount()).toBe(0);
       expect(createPolicy.stepper.getDoneButtonDisabledStatus()).toBe(null);
       createPolicy.stepper.clickDoneButton();
@@ -281,11 +297,11 @@ describe('Autoscaler -', () => {
 
           expect(appAutoscaler.tableTriggers.getTableRowsCount()).toBe(2);
           expect(appAutoscaler.tableTriggers.getTableRowCellContent(0, 0)).toBe('memoryutil');
-          expect(appAutoscaler.tableTriggers.getTableRowCellContent(0, 1)).toBe('>=60 % for 60 secs.');
+          expect(appAutoscaler.tableTriggers.getTableRowCellContent(0, 1)).toBe(`${memoryUtilOperator}${memoryUtilThreshold} % for ${memoryUtilBreach} secs.`);
           expect(appAutoscaler.tableTriggers.getTableRowCellContent(0, 2)).toBe('+2 instances');
           expect(appAutoscaler.tableTriggers.getTableRowCellContent(1, 0)).toBe('throughput');
-          expect(appAutoscaler.tableTriggers.getTableRowCellContent(1, 1)).toBe('<=10rps for 120 secs.');
-          expect(appAutoscaler.tableTriggers.getTableRowCellContent(1, 2)).toBe('-10% instances');
+          expect(appAutoscaler.tableTriggers.getTableRowCellContent(1, 1)).toBe(`${throughputOperator}${throughputThreshold}rps for 120 secs.`);
+          expect(appAutoscaler.tableTriggers.getTableRowCellContent(1, 2)).toBe(`+${throughputAdjustment}${throughputAdjustmentType}`);
 
           expect(appAutoscaler.tableSchedules.getScheduleTableTitleText()).toBe('Scheduled Limit Rules in UTC');
           expect(appAutoscaler.tableSchedules.getRecurringTableRowsCount()).toBe(1);
@@ -349,7 +365,14 @@ describe('Autoscaler -', () => {
 
     it('Should pass ScalingRules Step', () => {
       createPolicy.stepper.clickAddButton();
+      createPolicy.stepper.getStepperForm().getControlsMap().then(map => {
+        expect(map['metric_type'].value).toBe('memoryused')
+      });
+      createPolicy.stepper.getStepperForm().fill({ threshold: memoryUsedThreshold });
+      expect(createPolicy.stepper.getMatErrorsCount()).toBe(0);
+      expect(createPolicy.stepper.getDoneButtonDisabledStatus()).toBe(null);
       createPolicy.stepper.clickDoneButton();
+
       expect(createPolicy.stepper.canNext()).toBeTruthy();
       createPolicy.stepper.next();
     });
@@ -396,7 +419,7 @@ describe('Autoscaler -', () => {
           expect(appAutoscaler.cardMetric.getMetricChartTitleText(2)).toContain('memoryused');
           expect(appAutoscaler.tableTriggers.getTableRowsCount()).toBe(3);
           expect(appAutoscaler.tableTriggers.getTableRowCellContent(2, 0)).toBe('memoryused');
-          expect(appAutoscaler.tableTriggers.getTableRowCellContent(2, 1)).toBe('<=10MB for 120 secs.');
+          expect(appAutoscaler.tableTriggers.getTableRowCellContent(2, 1)).toBe(`<=${memoryUsedThreshold}MB for 120 secs.`);
           expect(appAutoscaler.tableTriggers.getTableRowCellContent(2, 2)).toBe('-1 instances');
 
           expect(appAutoscaler.tableSchedules.getRecurringTableRowsCount()).toBe(0);
@@ -447,7 +470,7 @@ describe('Autoscaler -', () => {
   describe('Autoscaler Event Page - ', () => {
     const loggingPrefix = 'AutoScaler Event Table:';
     let eventPageBase: PageAutoscalerEventBase;
-    describe('From autoscaler event card', () => {
+    describe('From autoscaler event card - ', () => {
       beforeAll(() => {
         const appAutoscaler = new ApplicationPageAutoscalerTab(appDetails.cfGuid, appDetails.appGuid);
         appAutoscaler.goToAutoscalerTab();
@@ -482,27 +505,38 @@ describe('Autoscaler -', () => {
         // Timeout after 32 attempts (each 5 seconds, which is just under 3 minutes)
         let retries = 32;
         const sub = timer(5000, 5000).pipe(
-          switchMap(() => promise.all<boolean | number>([
+          switchMap(() => promise.all<boolean | number | TableData[]>([
             findRow(),
-            eventPageBase.list.header.isRefreshing()
+            eventPageBase.list.header.isRefreshing(),
+            eventPageBase.list.table.getTableData()
           ]))
-        ).subscribe(([foundRow, isRefreshing]) => {
+        ).subscribe(([foundRow, isRefreshing, tableData]: [boolean, number, TableData[]]) => {
           // 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
+          const time = moment().toString()
+          console.log(`${time}: Table Data: `, tableData);
+
           if (isRefreshing) {
-            console.log(`${moment().toString()}: Waiting for event row: Skip actions... list is refreshing`);
+            console.log(`${time}: Waiting for event row: Skip actions... list is refreshing`);
             return;
           }
           retries--;
           if (foundRow) {
-            console.log(`${moment().toString()}: Waiting for event row: Found row!`);
+            console.log(`${time}: Waiting for event row: Found row!`);
             sub.unsubscribe();
           } else {
-            console.log(`${moment().toString()}: Waiting for event row: manually refreshing list`);
-            eventPageBase.list.header.refresh();
             if (retries === 0) {
+              // Fail the test if the retry count made it down to 0
+              e2e.debugLog('Timed out waiting for event row');
+              fail('Timed out waiting for event row');
               sub.unsubscribe();
+            } else {
+              console.log(`${time}: Waiting for event row: manually refreshing list`);
+              eventPageBase.list.header.refresh();
+            if (retries === 0) {
+              sub.unsubscribe();
+            }
             }
           }
         });
@@ -534,7 +568,7 @@ describe('Autoscaler -', () => {
         browser.wait(ApplicationPageAutoscalerTab.detect()
           .then(appAutoscaler => {
             appAutoscaler.tableEvents.clickRefreshButton();
-            expect(appAutoscaler.tableEvents.getTableRowsCount()).toBe(1);
+            expect(appAutoscaler.tableEvents.getTableRowsCount()).toBe(1, 'Expected rows to be one, could be extremely late event reporting');
             expect(appAutoscaler.tableEvents.getTableRowCellContent(0, 0)).toBe('Instances scaled up from 1 to 2');
             expect(appAutoscaler.tableEvents.getTableRowCellContent(0, 1))
               .toBe('schedule starts with instance min 2, instance max 10 and instance min initial 2 limited by min instances 2');
diff --git a/src/test-e2e/po/form.po.ts b/src/test-e2e/po/form.po.ts
index 4ba0f71622..1e676db7ac 100644
--- a/src/test-e2e/po/form.po.ts
+++ b/src/test-e2e/po/form.po.ts
@@ -1,10 +1,8 @@
-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;
 
diff --git a/src/test-e2e/po/list.po.ts b/src/test-e2e/po/list.po.ts
index 4b1d2a9e43..b6f163ad0a 100644
--- a/src/test-e2e/po/list.po.ts
+++ b/src/test-e2e/po/list.po.ts
@@ -14,6 +14,10 @@ export interface CardMetadata {
   click: () => void;
 }
 
+export interface TableData {
+  [columnHeader: string]: string
+}
+
 // Page Object for the List Table View
 export class ListTableComponent extends Component {
 
@@ -59,7 +63,7 @@ export class ListTableComponent extends Component {
     });
   }
 
-  getTableData(): promise.Promise<{ [columnHeader: string]: string }[]> {
+  getTableData(): promise.Promise<TableData[]> {
     return this.getTableDataRaw().then(tableData => {
       const table = [];
       tableData.rows.forEach((row: string[]) => {

From 4717ba6bdac569794a9640f6306a097db1146f95 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Fri, 24 Jul 2020 15:23:47 +0100
Subject: [PATCH 584/648] Security observability (#398)

* Work in progress Analysis tools

* Thursday updates

* Friday fixes and improvements

* Friday code

* Separate analyzers into a separate container

* Wire in analyzers container in the Helm chart

* Hide analysis UI features when not enabled

* Fix sidepanel bug with fallback metadata

* Bug fix for change in way tab links are hidden

* Remove debug logging

* Add refresh button to report selector drop down. Change no reports icon

* Add support for adding breadcrumbs in the sub nav bar

* Fix unit tests

* Fix format issues

* Final front-end unit test fixes

* Fix issues when deploying via Helm with mariadb

* Analyzers container fix. Allow helm chart to be packaged.

* Build script fixes

* Remove file

* WIP: Add support for Clair image scanning

* Use klar

* Remove binary

* Add clair helm chart for dev

* Fixes

* USe end var for clair server address

* Latest updates

* Improvements

* Minor fixes

* Tweak

* Fix 1.16 detecton issue with the analyzers

* Chart fixes

* Changes following first run of script

* Changes following npm install

* Update custom-src to new model
- expose custom module's module's
- Add routing module
- Tweak stratos.config.ts log output
- remove custom-src dir

* update naming... custom extensions --> suse extensions

* A few tidyups to help review

* Fix build issue due to merge

* Fixes following merge from upstream

* Remove clair from this PR

* Ignore example packages when there's a stratos config file

* Changes following review

* Changes following merge

* Update dir names, remove examples folder

* Add back in custom-src deploy content, also add product version to config

* Revert change needed downstream... (only needed when suse extension is included)

* Remove unused wip report viewers

* Fix after merge

* Move new terminal & config code to plugin, fix more build files

* Fix imports and add doc

* Fix compilation issues

* Change following merge

* Tweaks to logging

* Fix bug where report can not be deleted

* Fix kube config connect after merge, also fix subtype & error on connect

* Fix e2e

* Improve drop-down menu

* Remove strange merge artifacts

* Remove build file

* Fix graph overview

* Numerous improvements to graph parsing and presentation

* Remove logging. Add no reports message to workload analysis

* Add support for CRDs. KubeCF renders correctly.

* Allow which engines are enabled to be configured

* Fix issue where reports are not filtered by endpoint

* Minor changes following review

* Fixes for a few more issues

* Add Analyzers image build to Concourse CI

* Multiple small fixes
- fix text search in analysis list
- fix title of links in analysers info page
- handle slow connections by only polling analysis list when not already

* Fix kubeGuid for helm world

* Add AnalysisReportRunnerComponent
- Still need to add this to other places

* Delete reports when endpoint is unregistered

* Buf fixes. Use breadcrumbs in sub-nav

* Add run analysis button to workload analyis and graph tabs

* Fix select of overlay in workload graphs page

* Change default sort order of analysis list to age

* Ensure table cell links update on row change

* Align table action's icon better

* Use a side panel for analyzer info

* Add actions/effects for all used analyis actions
- Add new ResetPaginationOfType action, like ResetPagination but applies to all types
- Allows user to refresh reports list after kicking off new report on namespace & workload tabs
- Handle missing report param in reports returned from get all reports

* Remove some console.logs, converted some to console.info

* Update Kube Dashboard, allow download link to be configurable
- Default download link updated to v2.0.3
- Can configured link by setting env var `STRATOS_KUBERNETES_DASHBOARD_IMAGE`
- Can configure env var in helm via `console.kubeDashboardImage`
- Kube Dashboard now expanded by default (to show namespace drop down)

* Fix after merge

* Changes following review

* Fix expand of kube dashboard header by default

* Changes following review

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* WIP Wire in alerts to workload graph
- need to understand if namespace should be checked when matching node/resource to alert
- need to apply correct colour

* Fix workload security analysis overlay slide in

* Hide analysis headers info in tech preview & tie in tech preview check to analysisService.hideAnalysis$
- Q should the backend plugins be available in tech preview, see TODO

* Hide the Workload Graph view if in tech preview

* Fix disable of analysis plugin when tech preview is switched off

* Adderss PR feedback

* Minor tidy ups, fix analysis in graph
- apply typing to many places
- handle kube resources that we fail to fetch/parse
- wire in analysis overlay to graphs and resource slide in

* Remove debug code

Co-authored-by: Richard Cox <richard.cox@suse.com>
---
 .gitignore                                    |   1 +
 deploy/ci/suse-console-dev-releases.yml       |  26 +-
 .../console/templates/analyzers.yaml          |  62 ++++
 deploy/kubernetes/console/values.yaml         |   2 +
 deploy/kubernetes/custom/__stratos.tpl        |   2 +
 deploy/kubernetes/custom/custom-build.sh      |   5 +
 docs/extensions.md                            |   2 +-
 ...terminal-dev.md => suse-extensions-dev.md} |  22 +-
 package-lock.json                             | 347 ++++++++++++++----
 .../application-tabs-base.component.ts        |   2 +-
 .../sass/components/text-status.theme.scss    |   9 +
 .../packages/core/sass/mat-desktop.scss       |   7 +
 .../dashboard-base.component.html             |  14 +-
 .../dashboard-base.component.scss             |  36 +-
 .../dashboard-base.component.ts               |   9 +-
 .../page-side-nav/page-side-nav.component.ts  |   3 +-
 .../card-number-metric.component.html         |  14 +
 .../card-number-metric.component.scss         |  22 ++
 .../card-number-metric.component.theme.scss   |  20 +-
 .../card-number-metric.component.ts           |  47 ++-
 .../app-table-cell-default.component.ts       |   6 +-
 .../table-cell-actions.component.html         |   5 +-
 .../page-sub-nav/page-sub-nav.component.ts    |   9 +-
 .../ssh-viewer/ssh-viewer.component.ts        |  22 +-
 .../src/shared/services/session.service.ts    |  20 +
 .../src/shared/services/snackbar.service.ts   |  15 +-
 .../packages/core/src/shared/shared.module.ts |   2 +
 src/frontend/packages/core/tab-nav.service.ts |  17 +-
 .../store/src/actions/pagination.actions.ts   |   8 +
 .../entity-pagination-request-pipeline.ts     |   2 +-
 .../pagination-reducer-create-pagination.ts   |   2 +-
 .../pagination-reducer-reset-pagination.ts    |  70 +++-
 .../pagination-reducer/pagination.reducer.ts  |   5 +
 .../suse-extensions/sass/_all-theme.scss      |   6 +
 .../analysis-report-runner.component.html     |  18 +
 .../analysis-report-runner.component.scss     |   0
 .../analysis-report-runner.component.spec.ts  |  25 ++
 .../analysis-report-runner.component.ts       |  49 +++
 .../analysis-report-selector.component.html   |  22 ++
 .../analysis-report-selector.component.scss   |   3 +
 ...analysis-report-selector.component.spec.ts |  38 ++
 .../analysis-report-selector.component.ts     |  87 +++++
 .../analysis-report-viewer.component.html     |   1 +
 .../analysis-report-viewer.component.scss     |   0
 .../analysis-report-viewer.component.spec.ts  |  29 ++
 .../analysis-report-viewer.component.ts       |  76 ++++
 .../kube-score-report-viewer.component.html   |  18 +
 .../kube-score-report-viewer.component.scss   |  23 ++
 ...kube-score-report-viewer.component.spec.ts |  38 ++
 .../kube-score-report-viewer.component.ts     |  53 +++
 .../popeye-report-viewer.component.html       |  60 +++
 .../popeye-report-viewer.component.scss       |  43 +++
 .../popeye-report-viewer.component.spec.ts    |  38 ++
 .../popeye-report-viewer.component.ts         |  59 +++
 .../resource-alert-preview.component.html     |   5 +
 .../resource-alert-preview.component.scss     |  14 +
 .../resource-alert-preview.component.spec.ts  |  34 ++
 .../resource-alert-preview.component.ts       |  23 ++
 .../resource-alert-view.component.html        |  16 +
 .../resource-alert-view.component.scss        |  14 +
 .../resource-alert-view.component.spec.ts     |  38 ++
 .../resource-alert-view.component.ts          |  46 +++
 .../kubernetes/kubernetes-entity-catalog.ts   |   3 +
 .../kubernetes/kubernetes-entity-factory.ts   |   8 +
 .../kubernetes/kubernetes-entity-generator.ts |  16 +
 ...s-namespace-analysis-report.component.html |  13 +
 ...s-namespace-analysis-report.component.scss |   0
 ...amespace-analysis-report.component.spec.ts |  46 +++
 ...tes-namespace-analysis-report.component.ts |  50 +++
 .../kubernetes-namespace.component.ts         |  18 +-
 .../kubernetes-resource-viewer.component.html |   7 +-
 ...bernetes-resource-viewer.component.spec.ts |   3 +-
 .../kubernetes-resource-viewer.component.ts   |  56 ++-
 .../kubernetes-tab-base.component.ts          |  23 +-
 .../custom/kubernetes/kubernetes.module.ts    |  62 +++-
 .../custom/kubernetes/kubernetes.routing.ts   |  23 +-
 .../kubernetes/kubernetes.store.module.ts     |   4 +-
 .../analysis-reports-list-config.service.ts   | 123 +++++++
 .../analysis-reports-list-source.ts           |  63 ++++
 .../analysis-status-cell.component.html       |   8 +
 .../analysis-status-cell.component.scss       |  22 ++
 .../analysis-status-cell.component.spec.ts    |  32 ++
 .../analysis-status-cell.component.ts         |  16 +
 .../kubernetes-labels-cell.component.spec.ts  |   2 +-
 .../services/analysis-report.types.ts         |  22 ++
 .../services/kubernetes.analysis.service.ts   | 164 +++++++++
 .../kubernetes/services/kubernetes.service.ts |  19 +-
 .../services/kubescore-report.helper.ts       |  57 +++
 .../services/popeye-report.helper.ts          |  69 ++++
 .../kubernetes/services/route.helper.ts       |  11 +
 .../action-builders/kube.action-builders.ts   |  39 ++
 .../kubernetes/store/analysis.effects.ts      | 264 +++++++++++++
 .../kubernetes/store/anaylsis.actions.ts      |  69 ++++
 .../custom/kubernetes/store/kube.getIds.ts    |   2 +-
 .../src/custom/kubernetes/store/kube.types.ts |  27 ++
 .../kubernetes/store/kubernetes.actions.ts    |   3 -
 .../kubernetes/store/kubernetes.effects.ts    |   2 +-
 .../analysis-info-card.component.html         |   4 +
 .../analysis-info-card.component.scss         |  21 ++
 .../analysis-info-card.component.spec.ts      |  29 ++
 .../analysis-info-card.component.theme.scss   |  21 ++
 .../analysis-info-card.component.ts           |  55 +++
 .../kubernetes-analysis-info.component.html   |   7 +
 .../kubernetes-analysis-info.component.scss   |   5 +
 ...kubernetes-analysis-info.component.spec.ts |  38 ++
 .../kubernetes-analysis-info.component.ts     |  23 ++
 .../kubernetes-analysis-report.component.html |   7 +
 .../kubernetes-analysis-report.component.scss |  43 +++
 ...bernetes-analysis-report.component.spec.ts |  32 ++
 ...netes-analysis-report.component.theme.scss |  13 +
 .../kubernetes-analysis-report.component.ts   |  80 ++++
 .../kubernetes-analysis-tab.component.html    |   5 +
 .../kubernetes-analysis-tab.component.scss    |   0
 .../kubernetes-analysis-tab.component.spec.ts |  42 +++
 .../kubernetes-analysis-tab.component.ts      |  24 ++
 .../helm-release-tab-base.component.spec.ts   |   9 +-
 .../helm-release-tab-base.component.ts        |  50 +--
 .../workloads/release/icon-helper.ts          |  77 ++++
 .../helm-release-analysis-tab.component.html  |  12 +
 .../helm-release-analysis-tab.component.scss  |   0
 ...elm-release-analysis-tab.component.spec.ts |  42 +++
 .../helm-release-analysis-tab.component.ts    |  42 +++
 .../tabs/helm-release-helper.service.ts       |   4 +-
 ...helm-release-resource-graph.component.html |  51 ++-
 ...helm-release-resource-graph.component.scss |   6 +
 ...m-release-resource-graph.component.spec.ts |   9 +-
 .../helm-release-resource-graph.component.ts  | 171 +++++++--
 .../helm-release-summary-tab.component.html   |  15 +-
 ...helm-release-summary-tab.component.spec.ts |  14 +-
 .../helm-release-summary-tab.component.ts     | 162 ++++----
 .../store/workloads-entity-factory.ts         |   4 +-
 .../store/workloads-entity-generator.ts       |   4 +-
 .../kubernetes/workloads/workload.types.ts    |  40 +-
 .../workloads/workloads-entity-catalog.ts     |   4 +-
 .../kubernetes/workloads/workloads.module.ts  |   2 +
 .../kubernetes/workloads/workloads.routing.ts |   4 +-
 .../assets/core/custom/kubescore.md           |   7 +
 .../assets/core/custom/kubescore.png          | Bin 0 -> 36127 bytes
 .../suse-theme/assets/core/custom/popeye.md   |   7 +
 .../suse-theme/assets/core/custom/popeye.png  | Bin 0 -> 124519 bytes
 .../suse-theme/assets/core/custom/sonobuoy.md |   5 +
 .../assets/core/custom/sonobuoy.png           | Bin 0 -> 46789 bytes
 .../assets/core/custom/sonobuoy.svg           |  81 ++++
 src/frontend/packages/theme/_helper.scss      |   2 +-
 src/jetstream/config.example                  |   5 +-
 src/jetstream/go.mod                          |   1 +
 src/jetstream/go.sum                          |  14 +
 src/jetstream/load_plugins.go                 |   3 +
 .../analysis/20200210105400_Analysis.go       |  43 +++
 .../plugins/analysis/container/Dockerfile     |  61 +++
 .../plugins/analysis/container/go.mod         |  12 +
 .../plugins/analysis/container/go.sum         |  48 +++
 .../plugins/analysis/container/kubescore.go   |  59 +++
 .../plugins/analysis/container/main.go        | 171 +++++++++
 .../plugins/analysis/container/popeye.go      | 108 ++++++
 .../plugins/analysis/container/routes.go      |  90 +++++
 .../plugins/analysis/container/run.go         | 130 +++++++
 .../container/scripts/kubescore-runner.sh     |  16 +
 .../container/scripts/sonobuoy-runner.sh      |  19 +
 .../plugins/analysis/container/sonobuoy.go_   |  92 +++++
 .../plugins/analysis/container/status.go      |  74 ++++
 .../plugins/analysis/container/types.go       |  48 +++
 src/jetstream/plugins/analysis/list.go        | 228 ++++++++++++
 src/jetstream/plugins/analysis/main.go        | 139 +++++++
 src/jetstream/plugins/analysis/run.go         | 188 ++++++++++
 src/jetstream/plugins/analysis/status.go      | 109 ++++++
 .../analysis/store/analysis_store_db.go       | 164 +++++++++
 src/jetstream/plugins/analysis/store/main.go  |  39 ++
 .../plugins/kubernetes/endpoint_config.go     |  19 +-
 .../plugins/kubernetes/get_release.go         |   2 +-
 src/jetstream/plugins/kubernetes/go.mod       |   1 -
 src/jetstream/plugins/kubernetes/go.sum       |  23 +-
 .../plugins/kubernetes/helm/graph.go          |  38 +-
 .../plugins/kubernetes/helm/release.go        | 140 +++++--
 174 files changed, 6005 insertions(+), 409 deletions(-)
 create mode 100644 deploy/kubernetes/console/templates/analyzers.yaml
 rename docs/suse/{kube-terminal-dev.md => suse-extensions-dev.md} (60%)
 create mode 100644 src/frontend/packages/core/src/shared/services/session.service.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.html
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.scss
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.spec.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.html
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.scss
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.spec.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.html
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.scss
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.spec.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.html
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.scss
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.spec.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.html
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.scss
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.spec.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.html
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.scss
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.spec.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.html
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.scss
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.spec.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.html
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.scss
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.spec.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-reports-list-config.service.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-reports-list-source.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.html
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.scss
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.spec.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/services/analysis-report.types.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes.analysis.service.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubescore-report.helper.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/services/popeye-report.helper.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/services/route.helper.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/store/analysis.effects.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/store/anaylsis.actions.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.html
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.scss
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.spec.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.theme.scss
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.html
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.scss
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.spec.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.html
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.scss
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.spec.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.theme.scss
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.html
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.scss
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.spec.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/icon-helper.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.html
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.scss
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.spec.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.ts
 create mode 100644 src/frontend/packages/suse-theme/assets/core/custom/kubescore.md
 create mode 100644 src/frontend/packages/suse-theme/assets/core/custom/kubescore.png
 create mode 100644 src/frontend/packages/suse-theme/assets/core/custom/popeye.md
 create mode 100644 src/frontend/packages/suse-theme/assets/core/custom/popeye.png
 create mode 100644 src/frontend/packages/suse-theme/assets/core/custom/sonobuoy.md
 create mode 100644 src/frontend/packages/suse-theme/assets/core/custom/sonobuoy.png
 create mode 100644 src/frontend/packages/suse-theme/assets/core/custom/sonobuoy.svg
 create mode 100644 src/jetstream/plugins/analysis/20200210105400_Analysis.go
 create mode 100644 src/jetstream/plugins/analysis/container/Dockerfile
 create mode 100644 src/jetstream/plugins/analysis/container/go.mod
 create mode 100644 src/jetstream/plugins/analysis/container/go.sum
 create mode 100644 src/jetstream/plugins/analysis/container/kubescore.go
 create mode 100644 src/jetstream/plugins/analysis/container/main.go
 create mode 100644 src/jetstream/plugins/analysis/container/popeye.go
 create mode 100644 src/jetstream/plugins/analysis/container/routes.go
 create mode 100644 src/jetstream/plugins/analysis/container/run.go
 create mode 100755 src/jetstream/plugins/analysis/container/scripts/kubescore-runner.sh
 create mode 100755 src/jetstream/plugins/analysis/container/scripts/sonobuoy-runner.sh
 create mode 100644 src/jetstream/plugins/analysis/container/sonobuoy.go_
 create mode 100644 src/jetstream/plugins/analysis/container/status.go
 create mode 100644 src/jetstream/plugins/analysis/container/types.go
 create mode 100644 src/jetstream/plugins/analysis/list.go
 create mode 100644 src/jetstream/plugins/analysis/main.go
 create mode 100644 src/jetstream/plugins/analysis/run.go
 create mode 100644 src/jetstream/plugins/analysis/status.go
 create mode 100644 src/jetstream/plugins/analysis/store/analysis_store_db.go
 create mode 100644 src/jetstream/plugins/analysis/store/main.go

diff --git a/.gitignore b/.gitignore
index b34c80c94b..fd305dfd93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -95,6 +95,7 @@ src/jetstream/console-database.db
 src/jetstream/config.properties
 src/jetstream/db/dbconf.yml
 src/jetstream/plugins/monocular/chart-repo/chartrepo
+src/jetstream/plugins/analysis/container/analyzers
 
 # Customisations - these can be removed in the future
 # Left in for now to prevent these files being checked-in, if they are still present
diff --git a/deploy/ci/suse-console-dev-releases.yml b/deploy/ci/suse-console-dev-releases.yml
index ef2247a720..be33e148f5 100644
--- a/deploy/ci/suse-console-dev-releases.yml
+++ b/deploy/ci/suse-console-dev-releases.yml
@@ -66,12 +66,18 @@ resources:
     password: ((docker-password))
     repository: ((docker-repository))/stratos-chartsync
 - name: kube-terminal-image
-    type: docker-image
-    source:
-      username: ((docker-username))
-      password: ((docker-password))
-      repository: ((docker-repository))/stratos-kube-terminal
-  
+  type: docker-image
+  source:
+    username: ((docker-username))
+    password: ((docker-password))
+    repository: ((docker-repository))/stratos-kube-terminal
+- name: analyzers-image
+  type: docker-image
+  source:
+    username: ((docker-username))
+    password: ((docker-password))
+    repository: ((docker-repository))/stratos-analyzers
+    
 # Artifacts
 - name: image-tag
   type: s3
@@ -199,6 +205,14 @@ jobs:
           tag: image-tag/v2-alpha-tag
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))
+      - put: analyzers-image
+        params:
+          dockerfile: stratos/src/jetstream/plugins/analysis/container/Dockerfile
+          build: stratos/src/jetstream/plugins/analysis/container/
+          tag: image-tag/v2-alpha-tag
+          patch_base_reg: ((patch-base-reg))
+          patch_base_tag: ((patch-base-tag))
+
 - name: create-chart
   plan:
   - get: stratos
diff --git a/deploy/kubernetes/console/templates/analyzers.yaml b/deploy/kubernetes/console/templates/analyzers.yaml
new file mode 100644
index 0000000000..ca4d5a0d6d
--- /dev/null
+++ b/deploy/kubernetes/console/templates/analyzers.yaml
@@ -0,0 +1,62 @@
+---
+{{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major (trimSuffix "+" .Capabilities.KubeVersion.Minor) )}}
+apiVersion: apps/v1
+{{- else }}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Deployment
+metadata:
+  name: stratos-analyzers
+  labels:
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "stratos-analyzers"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: "stratos"
+      app.kubernetes.io/component: "stratos-analyzers"
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: "stratos"
+        app.kubernetes.io/instance: "{{ .Release.Name }}"
+        app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+        app.kubernetes.io/component: "stratos-analyzers"
+        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+        app: "{{ .Release.Name }}"
+    spec:
+      containers:
+      - name: analyzers
+        image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/stratos-analyzers:{{.Values.consoleVersion}}
+        imagePullPolicy: {{.Values.imagePullPolicy}}
+        ports:
+        - name: api
+          containerPort: 8090
+        env:
+        - name: ANALYSIS_SCRIPTS_DIR
+          value: "/scripts"
+        - name: ANALYSIS_REPORTS_DIR
+          value: "/reports"
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: "{{ .Release.Name }}-analyzers"
+  labels:
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "stratos-analyzers-service"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+spec:
+  type: ClusterIP
+  ports:
+  - name: analyzers
+    port: 8090
+    targetPort: 8090
+  selector:
+    app: "{{ .Release.Name }}"
+    app.kubernetes.io/component: "stratos-analyzers"
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index 2335e6ccbb..5dbf69f47d 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -57,6 +57,7 @@ console:
       servicePort: 80
       # nodePort: 30001
 
+
   # Name of config map that provides the template files for user invitation emails
   templatesConfigMapName:
 
@@ -120,6 +121,7 @@ images:
   fdbserver: stratos-fdbserver
   fdbdoclayer: stratos-fdbdoclayer
   chartsync: stratos-chartsync
+  analyzers: stratos-analyzers
 
 # Specify which storage class should be used for PVCs
 #storageClass: default
diff --git a/deploy/kubernetes/custom/__stratos.tpl b/deploy/kubernetes/custom/__stratos.tpl
index 732932914d..d5eb091928 100644
--- a/deploy/kubernetes/custom/__stratos.tpl
+++ b/deploy/kubernetes/custom/__stratos.tpl
@@ -12,6 +12,8 @@
   value: "mongodb://{{ .Release.Name }}-fdbdoclayer:27016"
 - name: SYNC_SERVER_URL
   value: "http://{{ .Release.Name }}-chartsync:8080"
+- name: ANALYSIS_SERVICES_API
+  value: "http://{{ .Release.Name }}-analyzers:8090"
 - name: STRATOS_KUBERNETES_NAMESPACE
   value: "{{ .Release.Namespace }}"
 - name: STRATOS_KUBERNETES_TERMINAL_IMAGE
diff --git a/deploy/kubernetes/custom/custom-build.sh b/deploy/kubernetes/custom/custom-build.sh
index 35d6202755..b44f9fbd41 100644
--- a/deploy/kubernetes/custom/custom-build.sh
+++ b/deploy/kubernetes/custom/custom-build.sh
@@ -25,4 +25,9 @@ function custom_image_build() {
   # Build and push an image for the Kubernetes Terminal
   log "-- Building/publishing Kubernetes Terminal"
   patchAndPushImage stratos-kube-terminal Dockerfile.kubeterminal "${STRATOS_PATH}/deploy/containers/kube-terminal"
+  
+  # Analzyers container
+  log "-- Building/publishing Stratos Analyzers"
+  patchAndPushImage stratos-analyzers Dockerfile "${STRATOS_PATH}/src/jetstream/plugins/analysis/container"
+ 
 }
\ No newline at end of file
diff --git a/docs/extensions.md b/docs/extensions.md
index 918c25df18..64c182e6a0 100644
--- a/docs/extensions.md
+++ b/docs/extensions.md
@@ -174,7 +174,7 @@ First, create the custom-src folder structure - from the top-level of the Strato
 
 ```
 mkdir -p custom-src/frontend/app/custom
-mkdir -p custom-src/frontend/assets/custom
+mkdir -p /frontend/assets/custom
 ```
 
 Next, run the customize task:
diff --git a/docs/suse/kube-terminal-dev.md b/docs/suse/suse-extensions-dev.md
similarity index 60%
rename from docs/suse/kube-terminal-dev.md
rename to docs/suse/suse-extensions-dev.md
index fe552b064c..9ac1e4e7b3 100644
--- a/docs/suse/kube-terminal-dev.md
+++ b/docs/suse/suse-extensions-dev.md
@@ -18,4 +18,24 @@ you will need to edit the `src/jetstream/config.properties` file and set these t
 
 The Jetstream backend should be configured.
 
-> Note: Ensure you set `ENABLE_TECH_PREVIEW=true` to enable the Kubernetes Terminal feature.
\ No newline at end of file
+> Note: Ensure you set `ENABLE_TECH_PREVIEW=true` to enable the Kubernetes Terminal feature.
+
+
+# Enabling Security Obvervability Analyzers in local development
+
+You need to build the docker image for the analyzers container.
+
+```
+cd src/jetstream/plugins/analysis/container
+docker build . -t stratos-analyzers
+```
+
+Now run this container - this will provide the analysis engines to Stratos:
+
+`docker run -d -p 8090:8090 stratos-analyzers`
+
+Edit your Jetstream `config.properties` file and add the following lines:
+
+```
+ANALYSIS_SERVICES_API=http://127.0.0.1:8090
+```
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index ae80a769d8..8bbb6d91b2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1610,9 +1610,9 @@
       }
     },
     "@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==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
       "dev": true
     },
     "@babel/helper-wrap-function": {
@@ -1756,6 +1756,146 @@
         }
       }
     },
+    "@babel/helpers": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz",
+      "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.10.4",
+        "@babel/traverse": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.4"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.4.tgz",
+          "integrity": "sha512-toLIHUIAgcQygFZRAQcsLQV3CBuX6yOIru1kJk/qqqvcRmZrYe6WavZTSG+bB8MxhnL9YPf+pKQfuiP161q7ng==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4",
+            "jsesc": "^2.5.1",
+            "lodash": "^4.17.13",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.10.4",
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz",
+          "integrity": "sha512-pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+          "dev": true
+        },
+        "@babel/highlight": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.4.tgz",
+          "integrity": "sha512-8jHII4hf+YVDsskTF6WuMB3X4Eh+PsUkC2ljq22so5rHvH+T8BzyL94VOdyFLNR8tBSVXOTbNHOKpR4TfRxVtA==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/parser": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.4.tgz",
+          "integrity": "sha512-aSy7p5THgSYm4YyxNGz6jZpXf+Ok40QF3aA2LyIONkDHpAcJzDUqlCKXv6peqYUs2gmic849C/t2HKw2a2K20Q==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/generator": "^7.10.4",
+            "@babel/helper-function-name": "^7.10.4",
+            "@babel/helper-split-export-declaration": "^7.10.4",
+            "@babel/parser": "^7.10.4",
+            "@babel/types": "^7.10.4",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.13"
+          }
+        },
+        "@babel/types": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.4.tgz",
+          "integrity": "sha512-UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^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"
+          }
+        },
+        "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": {
       "version": "7.5.0",
       "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
@@ -2163,11 +2303,7 @@
         "@babel/code-frame": {
           "version": "7.10.1",
           "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-          "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.10.1"
-          }
+          "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw=="
         },
         "@babel/helper-function-name": {
           "version": "7.10.1",
@@ -2181,58 +2317,110 @@
           }
         },
         "@babel/helper-get-function-arity": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
-          "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.10.1"
+            "@babel/types": "^7.10.4"
           }
         },
         "@babel/helper-validator-identifier": {
           "version": "7.10.1",
           "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-          "dev": true
+          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw=="
         },
         "@babel/highlight": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
-          "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
-          "dev": true,
+          "version": "7.9.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+          "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.1",
+            "@babel/helper-validator-identifier": "^7.9.0",
             "chalk": "^2.0.0",
             "js-tokens": "^4.0.0"
           }
         },
         "@babel/parser": {
-          "version": "7.10.2",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
-          "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.4.tgz",
+          "integrity": "sha512-8jHII4hf+YVDsskTF6WuMB3X4Eh+PsUkC2ljq22so5rHvH+T8BzyL94VOdyFLNR8tBSVXOTbNHOKpR4TfRxVtA==",
           "dev": true
         },
         "@babel/template": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
-          "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.10.1",
-            "@babel/parser": "^7.10.1",
-            "@babel/types": "^7.10.1"
+            "@babel/code-frame": "^7.10.4",
+            "@babel/parser": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          },
+          "dependencies": {
+            "@babel/code-frame": {
+              "version": "7.10.4",
+              "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+              "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+              "dev": true,
+              "requires": {
+                "@babel/highlight": "^7.10.4"
+              }
+            },
+            "@babel/helper-validator-identifier": {
+              "version": "7.10.4",
+              "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+              "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+              "dev": true
+            },
+            "@babel/highlight": {
+              "version": "7.10.4",
+              "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+              "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+              "dev": true,
+              "requires": {
+                "@babel/helper-validator-identifier": "^7.10.4",
+                "chalk": "^2.0.0",
+                "js-tokens": "^4.0.0"
+              }
+            }
           }
         },
         "@babel/types": {
-          "version": "7.10.2",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-          "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.4.tgz",
+          "integrity": "sha512-UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.1",
+            "@babel/helper-validator-identifier": "^7.10.4",
             "lodash": "^4.17.13",
             "to-fast-properties": "^2.0.0"
+          },
+          "dependencies": {
+            "@babel/helper-validator-identifier": {
+              "version": "7.10.4",
+              "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+              "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+              "dev": true
+            }
+          }
+        },
+        "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.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=="
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         }
       }
     },
@@ -2398,7 +2586,7 @@
       "integrity": "sha512-AR0E/lZMfLstScFwztApGeyTHJ5u3JUKMjneqRItWeEqDdHWZwAOKycvQNCasCK/3r5YXsuNG25funcJDu7Y2g==",
       "dev": true,
       "requires": {
-        "regenerator-transform": "^0.14.2"
+        "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
     "@babel/plugin-transform-spread": {
@@ -2436,7 +2624,6 @@
       "integrity": "sha512-qX8KZcmbvA23zDi+lk9s6hC1FM7jgLHYIjuLgULgc8QtYnmB3tAVIYkNoKRQ75qWBeyzcoMoK8ZQmogGtC/w0g==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.1",
         "@babel/helper-plugin-utils": "^7.10.1"
       }
     },
@@ -2642,6 +2829,14 @@
         "@babel/helper-validator-identifier": "^7.9.0",
         "lodash": "^4.17.13",
         "to-fast-properties": "^2.0.0"
+      },
+      "dependencies": {
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+          "dev": true
+        }
       }
     },
     "@cfstratos/ajsf-core": {
@@ -2858,12 +3053,12 @@
       }
     },
     "@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==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.1.0.tgz",
+      "integrity": "sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==",
       "dev": true,
       "requires": {
-        "@rollup/pluginutils": "^3.0.4"
+        "@rollup/pluginutils": "^3.0.8"
       }
     },
     "@rollup/plugin-node-resolve": {
@@ -3445,12 +3640,6 @@
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
       "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
       "dev": true,
-      "optional": true
-    },
-    "angular2-virtual-scroll": {
-      "version": "0.4.16",
-      "resolved": "https://registry.npmjs.org/angular2-virtual-scroll/-/angular2-virtual-scroll-0.4.16.tgz",
-      "integrity": "sha512-6NWk0DjCh4ebU8+LgfBoKYyp3McxDA/k5vTnEiV32VpVnyhN//eThZpVpggI1D2fJBqgTAY09C8v++qXHHLP7A==",
       "requires": {
         "@webassemblyjs/ast": "1.8.5",
         "@webassemblyjs/helper-buffer": "1.8.5",
@@ -3800,7 +3989,6 @@
       "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"
       }
@@ -4078,6 +4266,16 @@
           "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
           "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=="
+        },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
+        },
         "util": {
           "version": "0.10.3",
           "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
@@ -4086,21 +4284,6 @@
           "requires": {
             "inherits": "2.0.1"
           }
-        },
-        "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.8.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-          "dev": true
         }
       }
     },
@@ -4763,6 +4946,25 @@
         "safe-buffer": "^5.2.0"
       },
       "dependencies": {
+        "lowercase-keys": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+          "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="
+        },
+        "normalize-url": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
+          "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ=="
+        },
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        },
         "readable-stream": {
           "version": "3.6.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -5090,16 +5292,6 @@
           "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
           "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
           "dev": true
-        },
-        "pump": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
         }
       }
     },
@@ -5202,7 +5394,6 @@
       "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",
@@ -5213,7 +5404,6 @@
           "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"
           }
@@ -5542,7 +5732,6 @@
       "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"
       }
@@ -5550,8 +5739,7 @@
     "color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
     "color-string": {
       "version": "1.5.3",
@@ -7410,8 +7598,7 @@
     "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=",
-      "dev": true
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "escodegen": {
       "version": "1.8.1",
@@ -9315,8 +9502,7 @@
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
     },
     "has-glob": {
       "version": "1.0.0",
@@ -10921,8 +11107,7 @@
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "js-yaml": {
       "version": "3.13.1",
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 b7af4a19ea..12db72f9ba 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
@@ -89,7 +89,7 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy {
       switchMap(space => this.currentUserPermissionsService.can(CfCurrentUserPermissions.APPLICATION_VIEW_ENV_VARS,
         this.applicationService.cfGuid, space.metadata.guid)
       ),
-      map(can => !can)
+      map(can => !can),
     );
 
     this.tabLinks = [
diff --git a/src/frontend/packages/core/sass/components/text-status.theme.scss b/src/frontend/packages/core/sass/components/text-status.theme.scss
index 68b3d1821b..a054375175 100644
--- a/src/frontend/packages/core/sass/components/text-status.theme.scss
+++ b/src/frontend/packages/core/sass/components/text-status.theme.scss
@@ -6,6 +6,7 @@
   $status-warning: map-get($status-colors, warning);
   $status-danger: map-get($status-colors, danger);
   $status-tentative: map-get($status-colors, tentative);
+  $status-info: map-get($status-colors, info);
 
   .text-success {
     color: $status-success;
@@ -23,6 +24,10 @@
     color: $status-tentative;
   }
 
+  .text-info {
+    color: $status-info;
+  }
+
   // Border colors
 
   .border-success {
@@ -41,4 +46,8 @@
     border-color: $status-tentative;
   }
 
+  .border-info {
+    border-color: $status-info;
+  }  
+
 }
diff --git a/src/frontend/packages/core/sass/mat-desktop.scss b/src/frontend/packages/core/sass/mat-desktop.scss
index 3538518e13..cf474347e0 100644
--- a/src/frontend/packages/core/sass/mat-desktop.scss
+++ b/src/frontend/packages/core/sass/mat-desktop.scss
@@ -17,6 +17,13 @@ $desktop-toggle-button-item-height: $desktop-menu-item-height - 2px;
     line-height: $desktop-menu-item-height;
     min-width: 128px;
     padding: 0 24px;
+
+    &.hasIcon {
+      padding-left: 16px;
+      .mat-icon {
+        margin-right: 12px;
+      }
+    }
   }
 
   .mat-menu-panel {
diff --git a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.html b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.html
index 2c4b59dc38..d7ca4b06f5 100644
--- a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.html
+++ b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.html
@@ -16,10 +16,18 @@
           </div>
           <div class="dashboard__main">
             <div *ngIf="subNavData$ | async as data">
-              <div class="page-header-sub-nav" *ngIf="data[0] || data[1]">
+              <div class="page-header-sub-nav" *ngIf="data[0] || data[1] || data[3]">
                 <div class="page-header-sub-nav__container">
-                  <div *ngIf="data[0] as activeTabLabel" class="page-header-sub-nav__title">
-                    {{ activeTabLabel }}
+                  <div *ngIf="data[0] && !data[3]" class="page-header-sub-nav__title">
+                    {{ data[0] }}
+                  </div>
+                  <div *ngIf="data[3] as breadcrumbs" class="page-header-sub-nav__breadcrumbs">
+                    <ng-container *ngFor="let breadcrumbDef of breadcrumbs; last as isLast">
+                      <span class="page-header-sub-nav__breadcrumb page-header-sub-nav__breadcrumb-link" *ngIf="breadcrumbDef.routerLink"
+                        [routerLink]="breadcrumbDef.routerLink">{{ breadcrumbDef.value }}</span>
+                      <span class="page-header-sub-nav__breadcrumb page-header-sub-nav__breadcrumb-nolink" *ngIf="!breadcrumbDef.routerLink">{{ breadcrumbDef.value }}</span>
+                      <mat-icon *ngIf="!isLast" class="page-header-sub-nav__breadcrumb-separator">chevron_right</mat-icon>
+                    </ng-container>
                   </div>
                   <ng-container *ngIf="data[1] as portal" [cdkPortalOutlet]="portal"></ng-container>
                 </div>
diff --git a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
index 26a2d129ce..34b3de01a3 100644
--- a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
+++ b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.scss
@@ -79,6 +79,11 @@ $app-header-height: 56px;
 }
 
 .page-header-sub-nav {
+  $breadcrumb-opacity: .7;
+  $breadcrumb-hover-opacity: 1;
+  $breadcrumb-padding: 3px;
+  $font-size: 20px;
+
   align-items: center;
   border-bottom: 1px solid rgba(0, 0, 0, .1);
   display: flex;
@@ -91,7 +96,6 @@ $app-header-height: 56px;
   }
   &__title {
     display: none;
-    $font-size: 20px;
     font-size: $font-size;
     font-weight: bold;
     line-height: $font-size;
@@ -106,4 +110,34 @@ $app-header-height: 56px;
     opacity: .6;
     width: 100%;
   }
+  &__breadcrumb {
+    font-size: $font-size;
+    font-weight: bold;
+    line-height: $font-size;
+  }
+  &__breadcrumb,
+  &__breadcrumb-separator {
+    opacity: $breadcrumb-opacity;
+  }
+  &__breadcrumb-separator {
+    font-size: 24px;
+    margin: 0 $breadcrumb-padding;
+    user-select: none;
+  }
+  &__breadcrumbs {
+    align-items: center;
+    display: flex;
+    justify-content: center;
+  }
+  &__breadcrumb-nolink {
+    opacity: $breadcrumb-hover-opacity;
+  }
+  &__breadcrumb-link {
+    cursor: pointer;
+    outline: none;
+    &:hover {
+      opacity: $breadcrumb-hover-opacity;
+    }
+  }
+
 }
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 8310e6723e..42a8998120 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
@@ -17,7 +17,9 @@ import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-ca
 import { TabNavService } from '../../../../tab-nav.service';
 import { CustomizationService } from '../../../core/customizations.types';
 import { EndpointsService } from '../../../core/endpoints.service';
+import { IHeaderBreadcrumbLink } from '../../../shared/components/page-header/page-header.types';
 import { SidePanelService } from '../../../shared/services/side-panel.service';
+import { IPageSideNavTab } from '../page-side-nav/page-side-nav.component';
 import { PageHeaderService } from './../../../core/page-header-service/page-header.service';
 import { SideNavItem } from './../side-nav/side-nav.component';
 
@@ -30,7 +32,7 @@ import { SideNavItem } from './../side-nav/side-nav.component';
 
 export class DashboardBaseComponent implements OnInit, OnDestroy, AfterViewInit {
   public activeTabLabel$: Observable<string>;
-  public subNavData$: Observable<[string, Portal<any>]>;
+  public subNavData$: Observable<[string, Portal<any>, IPageSideNavTab, IHeaderBreadcrumbLink[]]>;
   public isMobile$: Observable<boolean>;
   public sideNavMode$: Observable<string>;
   public sideNavMode: string;
@@ -133,8 +135,9 @@ export class DashboardBaseComponent implements OnInit, OnDestroy, AfterViewInit
       this.tabNavService.getCurrentTabHeaderObservable().pipe(
         startWith(null)
       ),
-      this.tabNavService.tabSubNav$
-    );
+      this.tabNavService.tabSubNav$,
+      this.tabNavService.tabSubNavBreadcrumbs$
+    ).pipe(map(([tabNav, tabSubNav, tabSubNavBreadcrumb]) => [tabNav ? tabNav.label : null, tabSubNav, tabNav, tabSubNavBreadcrumb]));
 
     // Register all health checks for endpoint types that support this
     entityCatalog.getAllEndpointTypes().forEach(epType => {
diff --git a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.ts b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.ts
index b74dbed831..bab4cd21dc 100644
--- a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.ts
+++ b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.ts
@@ -10,6 +10,7 @@ import { TabNavService } from '../../../../tab-nav.service';
 import { StratosTabMetadata } from '../../../core/extension/extension-service';
 import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
 import { IBreadcrumb } from '../../../shared/components/breadcrumbs/breadcrumbs.types';
+import { map } from 'rxjs/operators';
 
 
 
@@ -54,7 +55,7 @@ export class PageSideNavComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.activeTab$ = this.tabNavService.getCurrentTabHeaderObservable();
+    this.activeTab$ = this.tabNavService.getCurrentTabHeaderObservable().pipe(map(item => item ? item.label : null));
   }
 
 }
diff --git a/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.html b/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.html
index ea0067edbc..b0747565c1 100644
--- a/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.html
+++ b/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.html
@@ -14,6 +14,20 @@
         </div>
         <div class="number-metric-card__label">{{ labelSingular && value === '1' ? labelSingular : label }}</div>
       </div>
+      <div class="number-metric-card__alerts" *ngIf="alertInfo" (click)="alertsClicked()">
+        <div *ngIf="alertInfo.info" class="number-metric-card__alert-badge number-metric-card__alert-badge-info">
+          <mat-icon>info</mat-icon>
+          {{ alertInfo.info }}
+        </div>
+        <div *ngIf="alertInfo.warning" class="number-metric-card__alert-badge number-metric-card__alert-badge-warning">
+          <mat-icon>warning</mat-icon>
+          <div>{{ alertInfo.warning }}</div>
+        </div>
+        <div *ngIf="alertInfo.error" class="number-metric-card__alert-badge number-metric-card__alert-badge-error">
+          <mat-icon>error</mat-icon>
+          {{ alertInfo.error }}
+        </div>
+      </div>
     </mat-card>
   </div>
 </ng-template>
diff --git a/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.scss b/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.scss
index 482e94a189..78aa3599eb 100644
--- a/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.scss
+++ b/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.scss
@@ -40,4 +40,26 @@
   &__limit {
     font-size: 18px;
   }
+  &__alerts {
+    cursor: pointer;
+    display: flex;
+    flex: 0;
+    flex-direction: column;
+  }
+  &__alert-badge {
+    align-items: center;
+    border-radius: 4px;
+    color: #fff;
+    display: flex;
+    font-size: 14px;
+    margin-bottom: 2px;
+    padding: 2px 4px;
+
+    &> mat-icon {
+      font-size: 16px;
+      height: 16px;
+      margin-right: 2px;
+      width: 16x;
+    }
+  }
 }
diff --git a/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.theme.scss b/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.theme.scss
index eba218e2e2..2493db6d56 100644
--- a/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.theme.scss
@@ -1,6 +1,12 @@
 @mixin app-card-number-metric-theme($theme, $app-theme) {
   $status-colors: map-get($app-theme, status);
   $subdued: mat-color($app-theme, subdued-color);
+
+  $status-colors: map-get($app-theme, status);
+  $status-warning: map-get($status-colors, warning);
+  $status-danger: map-get($status-colors, danger);
+  $status-info: map-get($status-colors, info);
+
   .number-metric-card {
     &__icon,
     &__anchor,
@@ -9,4 +15,16 @@
       color: $subdued;
     }
   }
-}
+
+  .number-metric-card__alert-badge {
+    &-error {
+      background-color: $status-danger;
+    }
+    &-info {
+      background-color: $status-info;
+    }
+    &-warning {
+      background-color: $status-warning;
+    }
+  }
+}
\ No newline at end of file
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 f0170d28b4..fa02ab447e 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
@@ -1,4 +1,4 @@
-import { Component, Input, OnChanges, OnInit } from '@angular/core';
+import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { BehaviorSubject } from 'rxjs';
 
@@ -8,6 +8,14 @@ import { StratosStatus } from '../../../../../../store/src/types/shared.types';
 import { UtilsService } from '../../../../core/utils.service';
 import { determineCardStatus } from '../card-status/card-status.component';
 
+enum AlertLevel {
+  OK = 0,
+  Info,
+  Warning,
+  Error,
+  Unknown,
+}
+
 @Component({
   selector: 'app-card-number-metric',
   templateUrl: './card-number-metric.component.html',
@@ -26,6 +34,16 @@ export class CardNumberMetricComponent implements OnInit, OnChanges {
   @Input() textOnly = false;
   @Input() labelAtTop = false;
   @Input() link: () => void | string;
+  @Output() showAlerts = new EventEmitter<any>();
+
+  @Input('alerts')
+  set alerts(alerts) {
+    if (alerts) {
+      this.processAlerts(alerts);
+    }
+  }
+
+  alertInfo: any;
 
   formattedValue: string;
   formattedLimit: string;
@@ -102,4 +120,31 @@ export class CardNumberMetricComponent implements OnInit, OnChanges {
       this.link();
     }
   }
+
+  processAlerts(alerts) {
+    this.alertInfo = {
+      info: 0,
+      warning: 0,
+      error: 0
+    };
+
+    alerts.forEach((alert) => {
+      switch (alert.level as AlertLevel) {
+        case AlertLevel.Warning:
+          this.alertInfo.warning++;
+          break;
+        case AlertLevel.Error:
+          this.alertInfo.error++;
+          break;
+        case AlertLevel.Info:
+          this.alertInfo.info++;
+          break;
+      }
+    });
+  }
+
+  public alertsClicked() {
+    this.showAlerts.emit(this.alertInfo);
+  }
+
 }
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 979c260eb6..5d12e93d83 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, Observable } from 'rxjs';
+import { Observable, Subscription } from 'rxjs';
 
 import { objectHelper } from '../../../../../core/helper-classes/object.helpers';
 import { pathGet } from '../../../../../core/utils.service';
@@ -22,6 +22,7 @@ export class TableCellDefaultComponent<T> extends TableCellCustom<T> implements
     this.pRow = row;
     if (row) {
       this.setValue(row, this.schemaKey);
+      this.setSyncLink();
     }
   }
 
@@ -32,6 +33,7 @@ export class TableCellDefaultComponent<T> extends TableCellCustom<T> implements
     this.pSchemaKey = schemaKey;
     if (this.row) {
       this.setValue(this.row, schemaKey);
+      this.setSyncLink();
     }
   }
 
@@ -63,7 +65,7 @@ export class TableCellDefaultComponent<T> extends TableCellCustom<T> implements
   }
 
   private setSyncLink() {
-    if (!this.cellDefinition.getLink) {
+    if (!this.cellDefinition || !this.cellDefinition.getLink) {
       return;
     }
     const linkValue = this.cellDefinition.getLink(this.row);
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-actions/table-cell-actions.component.html b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-actions/table-cell-actions.component.html
index 01680e8f60..107f5c8149 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-actions/table-cell-actions.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-actions/table-cell-actions.component.html
@@ -3,8 +3,9 @@
 </button>
 <mat-menu #menu="matMenu" [xPosition]="'before'" [yPosition]="'below'">
   <ng-container *ngFor="let action of actions">
-    <button class="table-cell-actions__button" mat-menu-item *ngIf="obs.visible[action.label] | async" (click)="action.action(row)"
-      [disabled]="!(obs.enabled[action.label] | async)" matTooltip="{{action.description}}" matTooltipShowDelay="2000">
+    <button class="table-cell-actions__button" mat-menu-item *ngIf="obs.visible[action.label] | async"
+      (click)="action.action(row)" [disabled]="!(obs.enabled[action.label] | async)" matTooltip="{{action.description}}"
+      matTooltipShowDelay="2000" [ngClass]="{'hasIcon': !!action.icon}">
       <mat-icon *ngIf="!!action.icon">{{action.icon}}</mat-icon>
       <span>{{action.label}}</span>
     </button>
diff --git a/src/frontend/packages/core/src/shared/components/page-sub-nav/page-sub-nav.component.ts b/src/frontend/packages/core/src/shared/components/page-sub-nav/page-sub-nav.component.ts
index 3ca1675980..8c66274b02 100644
--- a/src/frontend/packages/core/src/shared/components/page-sub-nav/page-sub-nav.component.ts
+++ b/src/frontend/packages/core/src/shared/components/page-sub-nav/page-sub-nav.component.ts
@@ -1,7 +1,8 @@
 import { TemplatePortal } from '@angular/cdk/portal';
-import { AfterViewInit, Component, OnDestroy, TemplateRef, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, Input, OnDestroy, TemplateRef, ViewChild } from '@angular/core';
 
 import { TabNavService } from '../../../../tab-nav.service';
+import { IHeaderBreadcrumbLink } from '../page-header/page-header.types';
 
 @Component({
   selector: 'app-page-sub-nav',
@@ -9,6 +10,12 @@ import { TabNavService } from '../../../../tab-nav.service';
   styleUrls: ['./page-sub-nav.component.scss']
 })
 export class PageSubNavComponent implements AfterViewInit, OnDestroy {
+
+  @Input('breadcrumbs')
+  set breadcrumbs(crumbs: IHeaderBreadcrumbLink[]) {
+    this.tabNavService.setSubNavBreadcrumbs(crumbs);
+  }
+  
   @ViewChild('subNavTmpl', { static: true }) subNavTmpl: TemplateRef<any>;
 
   constructor(private tabNavService: TabNavService) { }
diff --git a/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.ts b/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.ts
index 8d9cedccb8..8c075008f8 100644
--- a/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.ts
+++ b/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.ts
@@ -122,7 +122,7 @@ export class SshViewerComponent implements OnInit, OnDestroy {
               this.xterm.write(String.fromCharCode(parseInt(c, 16)));
             }
           } else {
-            console.log('Error')
+            console.error('Error: ', this.errorMessage)
             const eMsg = this.errorMessage;
             this.errorMessage = eMsg;
           }
@@ -145,17 +145,17 @@ export class SshViewerComponent implements OnInit, OnDestroy {
       parseInt(chars[1], 16) === 93 &&
       parseInt(chars[2], 16) === 50 &&
       parseInt(chars[3], 16) === 59) {
-        let title = '';
-        for (let i = 4; i < chars.length - 1; i++) {
-          title += String.fromCharCode(parseInt(chars[i], 16));
-        }
-        if (title.length > 0 && title.charAt(0) === '!') {
-          this.errorMessage = title.substr(1);
-          console.log(this.errorMessage);
-          return true;
-        }
-        this.message = title;
+      let title = '';
+      for (let i = 4; i < chars.length - 1; i++) {
+        title += String.fromCharCode(parseInt(chars[i], 16));
       }
+      if (title.length > 0 && title.charAt(0) === '!') {
+        this.errorMessage = title.substr(1);
+        console.error(this.errorMessage);
+        return true;
+      }
+      this.message = title;
+    }
     return false;
   }
 }
diff --git a/src/frontend/packages/core/src/shared/services/session.service.ts b/src/frontend/packages/core/src/shared/services/session.service.ts
new file mode 100644
index 0000000000..1c133f2106
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/services/session.service.ts
@@ -0,0 +1,20 @@
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { first, map } from 'rxjs/operators';
+
+import { GeneralEntityAppState } from '../../../../store/src/app-state';
+import { selectSessionData } from '../../../../store/src/reducers/auth.reducer';
+
+@Injectable()
+export class SessionService {
+
+  constructor(private store: Store<GeneralEntityAppState>) { }
+
+  isTechPreview(): Observable<boolean> {
+    return this.store.select(selectSessionData()).pipe(
+      first(),
+      map(sessionData => sessionData.config.enableTechPreview || false)
+    )
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/services/snackbar.service.ts b/src/frontend/packages/core/src/shared/services/snackbar.service.ts
index 13ba4eb2c6..bfa94ce28e 100644
--- a/src/frontend/packages/core/src/shared/services/snackbar.service.ts
+++ b/src/frontend/packages/core/src/shared/services/snackbar.service.ts
@@ -4,26 +4,31 @@ import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/s
 import { SnackBarReturnComponent } from '../components/snackbar-return/snackbar-return.component';
 
 /**
- * Servicve for showing snackbars
+ * Service for showing snackbars
  */
 @Injectable({
   providedIn: 'root',
 })
 export class SnackBarService {
 
-  constructor(public snackBar: MatSnackBar) {}
+  constructor(public snackBar: MatSnackBar) { }
 
   private snackBars: MatSnackBarRef<SimpleSnackBar>[] = [];
 
   public show(message: string, closeMessage?: string, duration: number = 5000) {
     this.snackBars.push(this.snackBar.open(message, closeMessage, {
-      duration: closeMessage ? null :duration
+      duration: closeMessage ? null : duration
     }));
   }
 
-  public showReturn(message: string, returnUrl: string, returnLabel: string) {
+  public showReturn(message: string, returnUrl: string | string[], returnLabel: string, duration?: number) {
     this.snackBars.push(this.snackBar.openFromComponent(SnackBarReturnComponent, {
-      data: { message, returnUrl, returnLabel }
+      duration,
+      data: {
+        message,
+        returnUrl,
+        returnLabel,
+      }
     }));
   }
 
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index e5915d0af6..160c4d90a7 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -117,6 +117,7 @@ import { UsageBytesPipe } from './pipes/usage-bytes.pipe';
 import { ValuesPipe } from './pipes/values.pipe';
 import { LongRunningOperationsService } from './services/long-running-op.service';
 import { MetricsRangeSelectorService } from './services/metrics-range-selector.service';
+import { SessionService } from './services/session.service';
 import { UserPermissionDirective } from './user-permission.directive';
 
 
@@ -322,6 +323,7 @@ import { UserPermissionDirective } from './user-permission.directive';
     InternalEventMonitorFactory,
     MetricsRangeSelectorService,
     LongRunningOperationsService,
+    SessionService
   ]
 })
 export class SharedModule { }
diff --git a/src/frontend/packages/core/tab-nav.service.ts b/src/frontend/packages/core/tab-nav.service.ts
index fbdad8cad7..d11ed06666 100644
--- a/src/frontend/packages/core/tab-nav.service.ts
+++ b/src/frontend/packages/core/tab-nav.service.ts
@@ -5,6 +5,7 @@ import { asapScheduler, BehaviorSubject, combineLatest, Observable, Subject } fr
 import { filter, map, observeOn, publishReplay, refCount, startWith } from 'rxjs/operators';
 
 import { IPageSideNavTab } from './src/features/dashboard/page-side-nav/page-side-nav.component';
+import { IHeaderBreadcrumbLink } from './src/shared/components/page-header/page-header.types';
 
 
 @Injectable()
@@ -21,6 +22,9 @@ export class TabNavService {
   private tabSubNavSubject: BehaviorSubject<Portal<any>>;
   public tabSubNav$: Observable<Portal<any>>;
 
+  private tabSubNavBreadcrumbsSubject: BehaviorSubject<IHeaderBreadcrumbLink[]>;
+  public tabSubNavBreadcrumbs$: Observable<IHeaderBreadcrumbLink[]>;
+
   private pageHeaderSubject: BehaviorSubject<Portal<any>>;
   public pageHeader$: Observable<Portal<any>>;
 
@@ -36,6 +40,10 @@ export class TabNavService {
     this.tabSubNavSubject.next(portal);
   }
 
+  public setSubNavBreadcrumbs(breadcrumbs: IHeaderBreadcrumbLink[]) {
+    this.tabSubNavBreadcrumbsSubject.next(breadcrumbs);
+  }
+
   public setPageHeader(portal: Portal<any>) {
     this.pageHeaderSubject.next(portal);
   }
@@ -43,12 +51,13 @@ export class TabNavService {
   public clear() {
     this.tabNavsSubject.next(undefined);
     this.tabHeaderSubject.next(undefined);
-    this.tabSubNavSubject.next(undefined);
+    this.clearSubNav();
     this.pageHeaderSubject.next(undefined);
   }
 
   public clearSubNav() {
     this.tabSubNavSubject.next(undefined);
+    this.tabSubNavBreadcrumbsSubject.next(undefined);
   }
 
   public getCurrentTabHeaderObservable() {
@@ -63,7 +72,7 @@ export class TabNavService {
     );
   }
 
-  public getCurrentTabHeader = (tabs: IPageSideNavTab[]) => {
+  private getCurrentTabHeader = (tabs: IPageSideNavTab[]) => {
     if (!tabs) {
       return null;
     }
@@ -74,7 +83,7 @@ export class TabNavService {
     if (!activeTab) {
       return null;
     }
-    return activeTab.label;
+    return activeTab;
   }
 
   private observeSubject(subject: Subject<any>) {
@@ -93,6 +102,8 @@ export class TabNavService {
     this.tabHeader$ = this.observeSubject(this.tabHeaderSubject);
     this.tabSubNavSubject = new BehaviorSubject(undefined);
     this.tabSubNav$ = this.observeSubject(this.tabSubNavSubject);
+    this.tabSubNavBreadcrumbsSubject = new BehaviorSubject(undefined);
+    this.tabSubNavBreadcrumbs$ = this.observeSubject(this.tabSubNavBreadcrumbsSubject);
     this.pageHeaderSubject = new BehaviorSubject(undefined);
     this.pageHeader$ = this.observeSubject(this.pageHeaderSubject);
   }
diff --git a/src/frontend/packages/store/src/actions/pagination.actions.ts b/src/frontend/packages/store/src/actions/pagination.actions.ts
index b36603d1e6..0a6f540eec 100644
--- a/src/frontend/packages/store/src/actions/pagination.actions.ts
+++ b/src/frontend/packages/store/src/actions/pagination.actions.ts
@@ -6,6 +6,7 @@ import { PaginationClientFilter, PaginationParam } from '../types/pagination.typ
 export const CLEAR_PAGINATION_OF_TYPE = '[Pagination] Clear all pages of type';
 export const CLEAR_PAGINATION_OF_ENTITY = '[Pagination] Clear pagination of entity';
 export const RESET_PAGINATION = '[Pagination] Reset pagination';
+export const RESET_PAGINATION_OF_TYPE = '[Pagination] Reset pagination of type';
 export const CREATE_PAGINATION = '[Pagination] Create pagination';
 export const CLEAR_PAGES = '[Pagination] Clear pages only';
 export const SET_PAGE = '[Pagination] Set page';
@@ -57,6 +58,13 @@ export class ResetPagination extends BasePaginationAction implements Action {
   type = RESET_PAGINATION;
 }
 
+export class ResetPaginationOfType extends BasePaginationAction implements Action {
+  constructor(pEntityConfig: Partial<EntityCatalogEntityConfig>) {
+    super(pEntityConfig);
+  }
+  type = RESET_PAGINATION_OF_TYPE;
+}
+
 export class CreatePagination extends BasePaginationAction implements Action {
   /**
    * @param seed The pagination key for the section we should use as a seed when creating the new pagination section.
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 fa82840e99..509b5f661d 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
@@ -109,7 +109,7 @@ export const basePaginatedRequestPipeline: EntityRequestPipeline = (
     );
 
   // Keep, helpful for debugging below chain via tap
-  // const debug = (val, location) => console.log(`${entity.endpointType}:${entity.entityKey}:${location}: `, val);
+  // const debug = (val, location) => console.warn(`${entity.endpointType}:${entity.entityKey}:${location}: `, val);
 
   return getRequestObjectObservable(request).pipe(
     first(),
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 7e57e52957..a34f1d65cb 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,6 +1,6 @@
+import { CreatePagination } from '../../actions/pagination.actions';
 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';
 import { spreadClientPagination } from './pagination-reducer.helper';
 
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 603b2b767f..18c1566775 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
@@ -37,26 +37,68 @@ export function getDefaultPaginationEntityState(ignoreMaxed?: boolean): Paginati
   };
 }
 
-export function paginationResetPagination(state: PaginationState, action: ResetPagination): PaginationState {
+
+export function paginationResetPagination(state: PaginationState, action: ResetPagination, allTypes = false): PaginationState {
   const entityKey = entityCatalog.getEntityKey(action.entityConfig);
-  if (!state[entityKey] || !state[entityKey][action.paginationKey]) {
+
+  if (!state[entityKey]) {
     return state;
   }
-  const { ids, pageRequests, pageCount, currentPage, totalResults } = getDefaultPaginationEntityState();
+
+  const entityState = allTypes ?
+    paginationResetAllPaginationSections(state, entityKey) :
+    paginationResetPaginationSection(state, action.paginationKey, entityKey);
+
+  if (!entityState) {
+    return state;
+  }
+
   const newState = { ...state };
-  const entityState = {
-    ...newState[entityKey],
-    [action.paginationKey]: {
-      ...newState[entityKey][action.paginationKey],
-      ids,
-      pageRequests,
-      pageCount,
-      currentPage,
-      totalResults,
-    }
-  } as PaginationEntityTypeState;
   return {
     ...newState,
     [entityKey]: entityState
   };
 }
+
+/**
+ * Reset all pagination sections of an entity type
+ */
+function paginationResetAllPaginationSections(state: PaginationState, entityKey: string): PaginationEntityTypeState {
+  return Object.entries(state[entityKey]).reduce((res, [paginationKey, paginationSection]) => {
+    res[paginationKey] = paginationResetPaginationState(paginationSection);
+    return res;
+  }, {} as PaginationEntityTypeState);
+}
+
+/**
+ * Reset a single pagination section of an entity type
+ */
+function paginationResetPaginationSection(state: PaginationState, paginationKey: string, entityKey: string): PaginationEntityTypeState {
+
+  const paginationSection = state[entityKey][paginationKey]
+  if (!paginationSection) {
+    return;
+  }
+
+  const entityState: PaginationEntityTypeState = {
+    ...state[entityKey],
+    [paginationKey]: paginationResetPaginationState(paginationSection)
+  };
+  return entityState;
+}
+
+/**
+ * Reset a pagination section (retain initial/user sort/filter/etc)
+ */
+function paginationResetPaginationState(oldEntityState: PaginationEntityState) {
+  const { ids, pageRequests, pageCount, currentPage, totalResults } = getDefaultPaginationEntityState();
+  const entityState: PaginationEntityState = {
+    ...oldEntityState,
+    ids,
+    pageRequests,
+    pageCount,
+    currentPage,
+    totalResults,
+  }
+  return entityState;
+}
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 f39aa853f0..d24616c794 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
@@ -14,6 +14,7 @@ import {
   IgnorePaginationMaxedState,
   REMOVE_PARAMS,
   RESET_PAGINATION,
+  RESET_PAGINATION_OF_TYPE,
   SET_CLIENT_FILTER,
   SET_CLIENT_FILTER_KEY,
   SET_CLIENT_PAGE,
@@ -121,6 +122,10 @@ function paginate(action, state = {}, updatePagination) {
     return paginationResetPagination(state, action);
   }
 
+  if (action.type === RESET_PAGINATION_OF_TYPE && !action.keepPages) {
+    return paginationResetPagination(state, action, true);
+  }
+
   if (action.type === CLEAR_PAGINATION_OF_TYPE) {
     const clearAction = action as ClearPaginationOfType;
     const clearEntityType = entityCatalog.getEntityKey(clearAction.entityConfig.endpointType, clearAction.entityConfig.entityType);
diff --git a/src/frontend/packages/suse-extensions/sass/_all-theme.scss b/src/frontend/packages/suse-extensions/sass/_all-theme.scss
index b6b53feafa..9f21f4317f 100644
--- a/src/frontend/packages/suse-extensions/sass/_all-theme.scss
+++ b/src/frontend/packages/suse-extensions/sass/_all-theme.scss
@@ -1,3 +1,7 @@
+// Theming for the copmponents in the Kubernetes package
+
+@import '../src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.theme';
+@import '../src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.theme';
 @import '../src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.theme';
 
 @mixin apply-theme-suse-extensions($stratos-theme) {
@@ -5,6 +9,8 @@
   $theme: map-get($stratos-theme, theme);
   $app-theme: map-get($stratos-theme, app-theme);
 
+  @include kube-analysis-report-theme($theme, $app-theme);
+  @include kube-analysis-card-theme($theme, $app-theme);
   @include monocular-chart-card($theme, $app-theme);
 
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.html
new file mode 100644
index 0000000000..6bfa187493
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.html
@@ -0,0 +1,18 @@
+<ng-container *ngIf="canShow$ | async">
+  <div *ngIf="analyzers$ | async as analyzers">
+    <mat-menu #appMenu="matMenu">
+      <button (click)="runAnalysis(analyzer.id)" mat-menu-item
+        *ngFor="let analyzer of analyzers">{{ analyzer.name }}</button>
+    </mat-menu>
+
+    <button mat-button [matMenuTriggerFor]="appMenu" *ngIf="analyzers.length > 0">
+      <span>Run Analysis</span>
+      <mat-icon>arrow_drop_down</mat-icon>
+    </button>
+
+    <button (click)="showAnalyzersInfo()" mat-button *ngIf="analyzers.length > 0">
+      <mat-icon>help_outline</mat-icon>
+      <span>Analyzer Info</span>
+    </button>
+  </div>
+</ng-container>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.spec.ts
new file mode 100644
index 0000000000..f2d53545a3
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AnalysisReportRunnerComponent } from './analysis-report-runner.component';
+
+describe('AnalysisReportRunnerComponent', () => {
+  let component: AnalysisReportRunnerComponent;
+  let fixture: ComponentFixture<AnalysisReportRunnerComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AnalysisReportRunnerComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AnalysisReportRunnerComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.ts
new file mode 100644
index 0000000000..e14601dd36
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.ts
@@ -0,0 +1,49 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { SidePanelService } from 'frontend/packages/core/src/shared/services/side-panel.service';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { KubernetesAnalysisService, KubernetesAnalysisType } from '../../services/kubernetes.analysis.service';
+import {
+  KubernetesAnalysisInfoComponent,
+} from '../../tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component';
+
+@Component({
+  selector: 'app-analysis-report-runner',
+  templateUrl: './analysis-report-runner.component.html',
+  styleUrls: ['./analysis-report-runner.component.scss']
+})
+export class AnalysisReportRunnerComponent implements OnInit {
+
+  canShow$: Observable<boolean>;
+  analyzers$: Observable<KubernetesAnalysisType[]>;
+  @Input() kubeId: string;
+  @Input() namespace: string;
+  @Input() app: string;
+
+  constructor(
+    public analysisService: KubernetesAnalysisService,
+    private sidePanelService: SidePanelService,
+  ) {
+    this.canShow$ = analysisService.hideAnalysis$.pipe(map(h => !h));
+  }
+
+  public runAnalysis(id: string) {
+    this.analysisService.run(id, this.kubeId, this.namespace, this.app);
+  }
+
+  ngOnInit(): void {
+    if (this.namespace) {
+      this.analyzers$ = this.analysisService.namespaceAnalyzers$
+    } else {
+      this.analyzers$ = this.analysisService.analyzers$;
+    }
+  }
+
+  showAnalyzersInfo() {
+    this.sidePanelService.showModal(KubernetesAnalysisInfoComponent, {
+      analyzers$: this.analysisService.analyzers$
+    });
+  }
+
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.html
new file mode 100644
index 0000000000..4c13aaac65
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.html
@@ -0,0 +1,22 @@
+<ng-container *ngIf="canShow$ | async">
+  <div *ngIf="analyzers$ | async as analyzers">
+    <mat-menu #appMenu="matMenu">
+      <button (click)="onSelected(analyzer)" mat-menu-item
+        *ngFor="let analyzer of analyzers">{{ analyzer.title }}</button>
+      <mat-divider class="analysis-menu-divider" *ngIf="analyzers.length > 0"></mat-divider>
+      <button (click)="refreshReports($event)" mat-menu-item>Refresh</button>
+    </mat-menu>
+
+    <!--
+      See #417
+      Note - it would be good to only show if there's no reports `*ngIf="analyzers.length > 0"`. However this causes
+      issues when arriving on an empty page and kicking off a run. The call to refresh the list returns too quickly and 
+      doesn't contain the new report. This leaves user with no way to see report/refresh reports list
+    -->
+    <button mat-button [matMenuTriggerFor]="appMenu">
+      <span>{{ prompt }}</span>
+      <span *ngIf="selection">: {{ selection.title }}</span>
+      <mat-icon>arrow_drop_down</mat-icon>
+    </button>
+  </div>
+</ng-container>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.scss
new file mode 100644
index 0000000000..2cd2769879
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.scss
@@ -0,0 +1,3 @@
+.analysis-menu-divider {
+  margin: 4px 0;
+}
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.spec.ts
new file mode 100644
index 0000000000..d23be84d77
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.spec.ts
@@ -0,0 +1,38 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { MDAppModule } from './../../../../core/md.module';
+
+import { AnalysisReportSelectorComponent } from './analysis-report-selector.component';
+import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
+import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
+import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../kubernetes.testing.module';
+
+describe('AnalysisReportSelectorComponent', () => {
+  let component: AnalysisReportSelectorComponent;
+  let fixture: ComponentFixture<AnalysisReportSelectorComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AnalysisReportSelectorComponent ],
+      imports: [
+        KubernetesBaseTestModules,
+        MDAppModule
+      ],
+      providers: [
+        KubernetesAnalysisService,
+        KubernetesEndpointService,
+        KubeBaseGuidMock,
+      ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AnalysisReportSelectorComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.ts
new file mode 100644
index 0000000000..ffb13fa10c
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.ts
@@ -0,0 +1,87 @@
+import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
+import * as moment from 'moment';
+import { Observable, Subscription } from 'rxjs';
+import { map, tap } from 'rxjs/operators';
+
+import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
+import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
+import { AnalysisReport } from '../../store/kube.types';
+
+@Component({
+  selector: 'app-analysis-report-selector',
+  templateUrl: './analysis-report-selector.component.html',
+  styleUrls: ['./analysis-report-selector.component.scss']
+})
+export class AnalysisReportSelectorComponent implements OnInit, OnDestroy {
+
+  public selection = { title: 'None' };
+
+  public canShow$: Observable<boolean>;
+  public analyzers$: Observable<AnalysisReport[]>;
+
+  @Input() endpoint;
+  @Input() path;
+  @Input() prompt = 'Overlay Analysis';
+  @Input() allowNone = true;
+  @Input() autoSelect;
+
+  @Output() selected = new EventEmitter<any>();
+  @Output() reportCount = new EventEmitter<number>();
+
+  autoSelected = false;
+
+  subs: Subscription[] = [];
+
+  constructor(public analysisService: KubernetesAnalysisService) {
+    this.canShow$ = analysisService.hideAnalysis$.pipe(map(h => !h));
+  }
+
+  ngOnInit() {
+    this.analyzers$ = this.analysisService.getByPath(this.endpoint, this.path).pipe(
+      map(reports => {
+        const res = [];
+        if (this.allowNone) {
+          res.push({ title: 'None' });
+        }
+        if (reports) {
+          reports.forEach(r => {
+            const c = { ...r };
+            const title = c.type.substr(0, 1).toUpperCase() + c.type.substr(1);
+            const age = moment(c.created).fromNow(true);
+            c.title = `${title} (${age})`;
+            res.push(c);
+          });
+        }
+        this.reportCount.next(res.length);
+        return res;
+      }),
+      tap(reports => {
+        if (!this.autoSelected && this.autoSelect && reports.length > 0) {
+          this.onSelected(reports[0]);
+        }
+      })
+    )
+  }
+
+
+  // Selection changed
+  public onSelected(d) {
+    this.selection = d;
+    if (!d.id) {
+      this.selected.emit(null);
+    } else {
+      this.selected.next(d);
+    }
+  }
+
+  public refreshReports($event: MouseEvent) {
+    this.analysisService.getByPath(this.endpoint, this.path, true)
+    $event.preventDefault();
+    $event.cancelBubble = true;
+  }
+
+  ngOnDestroy() {
+    safeUnsubscribe(...this.subs)
+  }
+
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.html
new file mode 100644
index 0000000000..c527914e5a
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.html
@@ -0,0 +1 @@
+<template #reportViewer></template>
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.spec.ts
new file mode 100644
index 0000000000..ed39ab0acf
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.spec.ts
@@ -0,0 +1,29 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AnalysisReportViewerComponent } from './analysis-report-viewer.component';
+import { KubernetesBaseTestModules } from '../kubernetes.testing.module';
+
+describe('AnalysisReportViewerComponent', () => {
+  let component: AnalysisReportViewerComponent;
+  let fixture: ComponentFixture<AnalysisReportViewerComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AnalysisReportViewerComponent ],
+      imports: [
+        KubernetesBaseTestModules,
+      ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AnalysisReportViewerComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.ts
new file mode 100644
index 0000000000..735ff9b6ce
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.ts
@@ -0,0 +1,76 @@
+import {
+  Component,
+  ComponentFactoryResolver,
+  ComponentRef,
+  Input,
+  OnDestroy,
+  Type,
+  ViewChild,
+  ViewContainerRef,
+} from '@angular/core';
+
+import { AnalysisReport } from '../store/kube.types';
+import { KubeScoreReportViewerComponent } from './kube-score-report-viewer/kube-score-report-viewer.component';
+import { PopeyeReportViewerComponent } from './popeye-report-viewer/popeye-report-viewer.component';
+
+export interface IReportViewer {
+  report: AnalysisReport;
+}
+
+@Component({
+  selector: 'app-analysis-report-viewer',
+  templateUrl: './analysis-report-viewer.component.html',
+  styleUrls: ['./analysis-report-viewer.component.scss']
+})
+export class AnalysisReportViewerComponent implements OnDestroy {
+
+  // Component reference for the dynamically created auth form
+  @ViewChild('reportViewer', { read: ViewContainerRef, static: true })
+  public container: ViewContainerRef;
+  private reportComponentRef: ComponentRef<IReportViewer>;
+
+  private id: string;
+
+  @Input('report')
+  set report(report: AnalysisReport) {
+    if (report === null || report.id === this.id) {
+      return;
+    }
+    this.id = report.id;
+    this.updateReport(report);
+  }
+
+  constructor(private resolver: ComponentFactoryResolver) { }
+
+  updateReport(report) {
+    switch (report.format) {
+      case 'popeye':
+        this.createComponent(PopeyeReportViewerComponent, report);
+        break;
+      case 'kubescore':
+        this.createComponent(KubeScoreReportViewerComponent, report);
+        break;
+    }
+  }
+
+  // Dynamically create the component for the report type type
+  createComponent(component: Type<IReportViewer>, report: AnalysisReport) {
+    if (!component || !this.container) {
+      return;
+    }
+
+    if (this.reportComponentRef) {
+      this.reportComponentRef.destroy();
+    }
+    const factory = this.resolver.resolveComponentFactory<IReportViewer>(component);
+    this.reportComponentRef = this.container.createComponent<IReportViewer>(factory);
+    // this.reportComponentRef.instance.setReport(report);
+    this.reportComponentRef.instance.report = report;
+  }
+
+  ngOnDestroy() {
+    if (this.reportComponentRef) {
+      this.reportComponentRef.destroy();
+    }
+  }
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.html
new file mode 100644
index 0000000000..a5dfac6b45
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.html
@@ -0,0 +1,18 @@
+<div *ngFor="let group of processed" class="report__group">
+  <div class="report__group-name">{{ group._name }}</div>
+  <div *ngFor="let check of group._checks" class="report__checks">
+    <div class="report__check">
+      <div [ngSwitch]="check.Grade" class="report__icon">
+        <mat-icon class="text-success" *ngSwitchCase="10">check_circle</mat-icon>
+        <mat-icon class="text-info" *ngSwitchCase="7">info</mat-icon>
+        <mat-icon class="text-warning" *ngSwitchCase="5">warning</mat-icon>
+        <mat-icon class="text-danger" *ngSwitchCase="1">error</mat-icon>
+        <mat-icon class="text-tentative" *ngSwitchDefault>help_outline</mat-icon>
+      </div>
+    <div class="report__check-name">{{ check.Check.Name }}</div>
+    </div>
+    <div *ngFor="let comment of check.Comments" class="report__comment">
+      <div>{{ comment.Summary }}</div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.scss
new file mode 100644
index 0000000000..6c76b78b25
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.scss
@@ -0,0 +1,23 @@
+.report {
+  &__group {
+    margin-bottom: 10px;
+  }
+  &__group-name {
+    font-weight: bold;
+    padding: 4px 0;
+  }
+  &__check {
+    align-items: center;
+    display: flex;
+    flex-direction: row;
+    margin-left: 10px;
+  }
+  &__icon {
+    margin-right: 4px;
+  }
+  &__comment {
+    display: list-item;
+    list-style: square;
+    margin-left: 58px;
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.spec.ts
new file mode 100644
index 0000000000..a93f22f618
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.spec.ts
@@ -0,0 +1,38 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { MDAppModule } from './../../../../core/md.module';
+
+import { KubeScoreReportViewerComponent } from './kube-score-report-viewer.component';
+import { KubernetesBaseTestModules, KubeBaseGuidMock } from '../../kubernetes.testing.module';
+import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
+import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
+
+describe('KubeScoreReportViewerComponent', () => {
+  let component: KubeScoreReportViewerComponent;
+  let fixture: ComponentFixture<KubeScoreReportViewerComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ KubeScoreReportViewerComponent ],
+      imports: [
+        KubernetesBaseTestModules,
+        MDAppModule
+      ],
+      providers: [
+        KubernetesAnalysisService,
+        KubernetesEndpointService,
+        KubeBaseGuidMock,
+      ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubeScoreReportViewerComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.ts
new file mode 100644
index 0000000000..0a53ea6921
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.ts
@@ -0,0 +1,53 @@
+import { Component, OnInit } from '@angular/core';
+
+import { IReportViewer } from '../analysis-report-viewer.component';
+
+@Component({
+  selector: 'app-kube-score-report-viewer',
+  templateUrl: './kube-score-report-viewer.component.html',
+  styleUrls: ['./kube-score-report-viewer.component.scss']
+})
+export class KubeScoreReportViewerComponent implements OnInit, IReportViewer {
+
+  /*
+    Kube Score grading
+
+    See: https://github.com/zegl/kube-score/blob/eca7bda47f5b3c523a0f41945cb1adda0a4e2e2e/scorecard/scorecard.go
+    GradeCritical Grade = 1
+    GradeWarning  Grade = 5
+    GradeAlmostOK Grade = 7
+    GradeAllOK    Grade = 10
+  */
+
+  report: any;
+  processed: any;
+
+  constructor() { }
+
+  ngOnInit() {
+    this.processed = [];
+    // Turn the report into an array
+    if (this.report) {
+      Object.keys(this.report.report).forEach(key => {
+        const filtered = this.filter(this.report.report[key]);
+        if (filtered.length > 0) {
+          this.processed.push({
+            ...this.report.report[key],
+            _checks: filtered,
+            _name: key,
+          });
+        }
+      });
+    }
+  }
+
+  public filter(report) {
+    const filtered = [];
+    report.Checks.forEach(r => {
+      if (r.Grade !== 10 && !r.Skipped) {
+        filtered.push(r);
+      }
+    });
+    return filtered;
+  }
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.html
new file mode 100644
index 0000000000..6b198581cf
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.html
@@ -0,0 +1,60 @@
+<div *ngIf="processed">
+  <div class="report__report-header">
+    <div class="report__title">Report</div>
+    <div class="report__stat">
+      <div>Score</div>
+      <div class="report__score">{{processed.popeye.score }}</div>
+    </div>
+    <div class="report__stat">
+      <div>Grade</div>
+      <div class="report__grade">{{processed.popeye.grade }}</div>
+    </div>
+  </div>
+
+  <div *ngFor="let section of processed.popeye.sanitizers">
+    <div *ngIf="!section.hide">
+      <div class="report__header">
+        <div class="report__title">{{ section.sanitizer }}</div>
+        <div class="report__stat">
+          <div>OK</div>
+          <div class="report__grade">{{section.tally.ok }}</div>
+        </div>
+        <div class="report__stat">
+          <div>Info</div>
+          <div class="report__grade">{{section.tally.info }}</div>
+        </div>
+        <div class="report__stat">
+          <div>Warning</div>
+          <div class="report__grade">{{section.tally.warning }}</div>
+        </div>
+        <div class="report__stat">
+          <div>Error</div>
+          <div class="report__grade">{{section.tally.error }}</div>
+        </div>
+        <div class="report__stat">
+          <div>Score</div>
+          <div class="report__score">{{section.tally.score }}</div>
+        </div>
+      </div>
+
+      <!-- Eack key in issues is a group of issues -->
+      <table width="100%" class="report__table" cellpadding="4">
+        <tr *ngFor="let group of section.groups">
+          <td class="report__table-name" width="40%">{{ group.name }}</td>
+          <td>
+            <div *ngFor="let issue of group.issues" class="report__issue">
+              <div [ngSwitch]="issue.level" class="report__icon">
+                <mat-icon class="text-success" *ngSwitchCase="0">check_circle</mat-icon>
+                <mat-icon class="text-info" *ngSwitchCase="1">info</mat-icon>
+                <mat-icon class="text-warning" *ngSwitchCase="2">warning</mat-icon>
+                <mat-icon class="text-danger" *ngSwitchCase="3">error</mat-icon>
+                <mat-icon class="text-tentative" *ngSwitchDefault>help_outline</mat-icon>
+              </div>
+              {{ issue.message }}
+            </div>
+          </td>
+        </tr>
+      </table>
+    </div>
+  </div>
+</div>
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.scss
new file mode 100644
index 0000000000..f70ee0c2c3
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.scss
@@ -0,0 +1,43 @@
+.report {
+  &__report-header {
+    align-items: center;
+    display: flex;
+    margin-bottom: 8px;
+  }
+  &__header {
+    align-items: center;
+    display: flex;
+  }
+  &__title {
+    flex: 1;
+  }
+  &__stat {
+    display: flex;
+    flex-direction: column;
+    padding: 5px 12px;
+    &>div:first-child {
+      opacity: 0.8;
+    }
+  }
+  &__score {
+    flex: 0;
+    font-size: 20px;
+  }
+  &__grade {
+    flex: 0;
+    font-size: 20px;
+  }
+  &__table {
+    margin-left: 20px;
+  }
+  &__issue {
+    align-items: center;
+    display: flex;
+  }
+  &__icon {
+    padding-right: 4px;
+  }
+  &__table-name {
+    vertical-align: top;
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.spec.ts
new file mode 100644
index 0000000000..ccbe5c5081
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.spec.ts
@@ -0,0 +1,38 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { MDAppModule } from './../../../../core/md.module';
+
+import { PopeyeReportViewerComponent } from './popeye-report-viewer.component';
+import { KubernetesBaseTestModules, KubeBaseGuidMock } from '../../kubernetes.testing.module';
+import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
+import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
+
+describe('PopeyeReportViewerComponent', () => {
+  let component: PopeyeReportViewerComponent;
+  let fixture: ComponentFixture<PopeyeReportViewerComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ PopeyeReportViewerComponent ],
+      imports: [
+        KubernetesBaseTestModules,
+        MDAppModule
+      ],
+      providers: [
+        KubernetesAnalysisService,
+        KubernetesEndpointService,
+        KubeBaseGuidMock,
+      ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PopeyeReportViewerComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.ts
new file mode 100644
index 0000000000..1537046212
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.ts
@@ -0,0 +1,59 @@
+import { Component, OnInit } from '@angular/core';
+
+import { IReportViewer } from '../analysis-report-viewer.component';
+
+@Component({
+  selector: 'app-popeye-report-viewer',
+  templateUrl: './popeye-report-viewer.component.html',
+  styleUrls: ['./popeye-report-viewer.component.scss']
+})
+export class PopeyeReportViewerComponent implements OnInit, IReportViewer {
+
+  report: any;
+  processed: any;
+
+  ngOnInit() {
+    this.processed = this.apply(this.report);
+  }
+
+  private apply(response) {
+    if (response) {
+      // In order to supplement the sanitizers with extra properties need to create new obj (see spread below and `reduce`)
+      response = {
+        ...response,
+        report: {
+          ...response.report,
+          popeye: {
+            ...response.report.popeye
+          }
+        }
+      }
+      // Make the response easier to render
+      response.report.popeye.sanitizers = response.report.popeye.sanitizers.reduce((ss, oldS) => {
+        const s = { ...oldS }
+        const groups = [];
+        let totalIssues = 0;
+        if (s.issues) {
+          Object.keys(s.issues).forEach(key => {
+            const issues = s.issues[key];
+            totalIssues += issues.length;
+            if (issues.length > 0) {
+              groups.push({
+                name: key,
+                issues
+              });
+            }
+          });
+          s.hide = totalIssues === 0;
+        } else {
+          s.hide = true;
+        }
+        s.groups = groups;
+        ss.push(s);
+        return ss;
+      }, []);
+
+      return response.report;
+    }
+  }
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.html
new file mode 100644
index 0000000000..0e7a5b9605
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.html
@@ -0,0 +1,5 @@
+<app-sidepanel-preview title="{{title}}">
+  <div *ngIf="resource">
+    <app-resource-alert-view [alerts]="resource"></app-resource-alert-view>  
+  </div>
+</app-sidepanel-preview>
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.scss
new file mode 100644
index 0000000000..d7d483462b
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.scss
@@ -0,0 +1,14 @@
+.alert {
+  &__info {
+    align-items: center;
+    display: flex;
+    margin: 4px 20px;
+  }
+  &__icon {
+    margin-right: 8px;
+  }
+  &__group {
+    font-weight: bold;
+    padding: 4px 0;
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.spec.ts
new file mode 100644
index 0000000000..f78f26e839
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.spec.ts
@@ -0,0 +1,34 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ResourceAlertPreviewComponent } from './resource-alert-preview.component';
+import { ResourceAlertViewComponent } from './resource-alert-view/resource-alert-view.component';
+import { SidePanelService } from 'frontend/packages/core/src/shared/services/side-panel.service';
+import { KubernetesBaseTestModules } from '../../kubernetes.testing.module';
+
+describe('ResourceAlertPreviewComponent', () => {
+  let component: ResourceAlertPreviewComponent;
+  let fixture: ComponentFixture<ResourceAlertPreviewComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ResourceAlertPreviewComponent, ResourceAlertViewComponent ],
+      imports: [
+        KubernetesBaseTestModules,
+      ],
+      providers: [
+        SidePanelService,
+      ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ResourceAlertPreviewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.ts
new file mode 100644
index 0000000000..5abfac176e
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.ts
@@ -0,0 +1,23 @@
+import { Component } from '@angular/core';
+import { PreviewableComponent } from 'frontend/packages/core/src/shared/previewable-component';
+
+@Component({
+  selector: 'app-resource-alert-preview',
+  templateUrl: './resource-alert-preview.component.html',
+  styleUrls: ['./resource-alert-preview.component.scss']
+})
+export class ResourceAlertPreviewComponent implements PreviewableComponent {
+
+  title: string;
+
+  resource: any;
+  alerts: any;
+
+  constructor() { }
+
+  setProps(props: { [key: string]: any; }): void {
+    this.resource = props.resource;
+    this.title = `${this.resource.kind} Alerts`;
+  }
+
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.html
new file mode 100644
index 0000000000..f9193d84c4
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.html
@@ -0,0 +1,16 @@
+<div *ngIf="alertInfo">
+  <div *ngFor="let group of alertInfo">
+    <div *ngIf="showHeader" class="alert__group">{{group.name}}</div>
+    <div *ngFor="let alert of group.alerts">
+      <div class="alert__info">
+        <div [ngSwitch]="alert.level" class="alert__icon">
+          <mat-icon class="text-info" *ngSwitchCase="1">info</mat-icon>
+          <mat-icon class="text-warning" *ngSwitchCase="2">warning</mat-icon>
+          <mat-icon class="text-danger" *ngSwitchCase="3">error</mat-icon>
+          <mat-icon class="text-tentative" *ngSwitchDefault>help_outline</mat-icon>
+        </div>
+        {{ alert.message }}
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.scss
new file mode 100644
index 0000000000..d7d483462b
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.scss
@@ -0,0 +1,14 @@
+.alert {
+  &__info {
+    align-items: center;
+    display: flex;
+    margin: 4px 20px;
+  }
+  &__icon {
+    margin-right: 8px;
+  }
+  &__group {
+    font-weight: bold;
+    padding: 4px 0;
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.spec.ts
new file mode 100644
index 0000000000..0ffbf5f5ff
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.spec.ts
@@ -0,0 +1,38 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { MDAppModule } from './../../../../../core/md.module';
+
+import { ResourceAlertViewComponent } from './resource-alert-view.component';
+import { KubernetesBaseTestModules, KubeBaseGuidMock } from '../../../kubernetes.testing.module';
+import { KubernetesAnalysisService } from '../../../services/kubernetes.analysis.service';
+import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
+
+describe('ResourceAlertViewComponent', () => {
+  let component: ResourceAlertViewComponent;
+  let fixture: ComponentFixture<ResourceAlertViewComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ResourceAlertViewComponent ],
+      imports: [
+        KubernetesBaseTestModules,
+        MDAppModule
+      ],
+      providers: [
+        KubernetesAnalysisService,
+        KubernetesEndpointService,
+        KubeBaseGuidMock,
+      ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ResourceAlertViewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.ts
new file mode 100644
index 0000000000..15368b31e4
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.ts
@@ -0,0 +1,46 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+  selector: 'app-resource-alert-view',
+  templateUrl: './resource-alert-view.component.html',
+  styleUrls: ['./resource-alert-view.component.scss']
+})
+export class ResourceAlertViewComponent {
+
+  alertInfo;
+
+  @Input()
+  set alerts(data: any) {
+    if (data) {
+      const alerts = data.alerts ? data.alerts : data;
+      this.alertInfo = this.normalize(alerts);
+    }
+  }
+
+  @Input() showHeader = true;
+
+  normalize(data) {
+    // Normalize the alerts into groups
+    const normalized = {};
+    data.forEach(item => {
+      const path = item.namespace ? `${item.namespace}/${item.name}` : item.name;
+      if (!normalized[path]) {
+        normalized[path] = [];
+      }
+      normalized[path].push({
+        ...item,
+        path
+      });
+    });
+
+    const arr = [];
+    Object.keys(normalized).forEach(group => {
+      arr.push({
+        name: group,
+        alerts: normalized[group]
+      });
+    });
+    return arr;
+  }
+
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-catalog.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-catalog.ts
index 816ab0bd47..e41dfd779d 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-catalog.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-catalog.ts
@@ -4,6 +4,7 @@ import {
 } from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types';
 import {
+  AnalysisReportsActionBuilders,
   KubeDashboardActionBuilders,
   KubeDeploymentActionBuilders,
   KubeNamespaceActionBuilders,
@@ -13,6 +14,7 @@ import {
   KubeStatefulSetsActionBuilders,
 } from './store/action-builders/kube.action-builders';
 import {
+  AnalysisReport,
   KubernetesDeployment,
   KubernetesNamespace,
   KubernetesNode,
@@ -34,6 +36,7 @@ export class KubeEntityCatalog {
   public namespace: StratosCatalogEntity<IFavoriteMetadata, KubernetesNamespace, KubeNamespaceActionBuilders>;
   public service: StratosCatalogEntity<IFavoriteMetadata, KubeService, KubeServiceActionBuilders>
   public dashboard: StratosCatalogEntity<IFavoriteMetadata, any, KubeDashboardActionBuilders>;
+  public analysisReport: StratosCatalogEntity<undefined, AnalysisReport, AnalysisReportsActionBuilders>;
 }
 
 /**
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-factory.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-factory.ts
index 1fed3c1b20..02637d2f5a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-factory.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-factory.ts
@@ -22,6 +22,7 @@ export const kubernetesServicesEntityType = 'kubernetesService';
 export const kubernetesStatefulSetsEntityType = 'kubernetesStatefulSet';
 export const kubernetesDeploymentsEntityType = 'kubernetesDeployment';
 export const kubernetesDashboardEntityType = 'kubernetesDashboard';
+export const analysisReportEntityType = 'analysisReport';
 
 export const getKubeAppId = (object: KubernetesApp) => object.name;
 
@@ -104,6 +105,13 @@ entityCache[kubernetesDashboardEntityType] = new KubernetesEntitySchema(
   { idAttribute: getGuidFromKubeDashboardObj }
 );
 
+// Analysis Reports - should not be bound to an endpoint
+entityCache[analysisReportEntityType] = new KubernetesEntitySchema(
+  analysisReportEntityType,
+  {},
+  { idAttribute: 'id' }
+);
+
 entityCache[metricEntityType] = new KubernetesEntitySchema(metricEntityType);
 
 export function addKubernetesEntitySchema(key: string, newSchema: EntitySchema) {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts
index 1d8dc13dac..814f8a3e1f 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts
@@ -24,6 +24,7 @@ import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth
 import { KubeConfigRegistrationComponent } from './kube-config-registration/kube-config-registration.component';
 import { kubeEntityCatalog } from './kubernetes-entity-catalog';
 import {
+  analysisReportEntityType,
   KUBERNETES_ENDPOINT_TYPE,
   kubernetesDashboardEntityType,
   kubernetesDeploymentsEntityType,
@@ -35,6 +36,8 @@ import {
   kubernetesStatefulSetsEntityType,
 } from './kubernetes-entity-factory';
 import {
+  AnalysisReportsActionBuilders,
+  analysisReportsActionBuilders,
   KubeDashboardActionBuilders,
   kubeDashboardActionBuilders,
   KubeDeploymentActionBuilders,
@@ -186,6 +189,7 @@ export function generateKubernetesEntities(): StratosBaseCatalogEntity[] {
     generateNamespacesEntity(endpointDefinition),
     generateServicesEntity(endpointDefinition),
     generateDashboardEntity(endpointDefinition),
+    generateAnalysisReportsEntity(endpointDefinition),
     generateMetricEntity(endpointDefinition),
     ...generateWorkloadsEntities(endpointDefinition)
   ];
@@ -283,6 +287,18 @@ function generateDashboardEntity(endpointDefinition: StratosEndpointExtensionDef
   return kubeEntityCatalog.dashboard;
 }
 
+function generateAnalysisReportsEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: analysisReportEntityType,
+    schema: kubernetesEntityFactory(analysisReportEntityType),
+    endpoint: endpointDefinition
+  };
+  kubeEntityCatalog.analysisReport = new StratosCatalogEntity<undefined, any, AnalysisReportsActionBuilders>(definition, {
+    actionBuilders: analysisReportsActionBuilders
+  });
+  return kubeEntityCatalog.analysisReport
+}
+
 function generateMetricEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   const definition: IStratosEntityDefinition = {
     type: metricEntityType,
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.html
new file mode 100644
index 0000000000..650e5a18aa
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.html
@@ -0,0 +1,13 @@
+<app-page-sub-nav>
+
+  <app-analysis-report-runner [kubeId]="endpointID" [namespace]="kubeNamespaceService.namespaceName">
+  </app-analysis-report-runner>
+
+  <app-analysis-report-selector prompt="Report" [allowNone]="false" (selected)="analysisChanged($event)"
+    [autoSelect]="true" [endpoint]="endpointID" (reportCount)="onReportCount($event)" [path]="path">
+  </app-analysis-report-selector>
+</app-page-sub-nav>
+
+<app-analysis-report-viewer [report]="report$ | async"></app-analysis-report-viewer>
+<app-no-content-message *ngIf="noReportsAvailable" icon="assignment" [hidden]="false" firstLine="No reports available">
+</app-no-content-message>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.spec.ts
new file mode 100644
index 0000000000..5e5fdfaf98
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.spec.ts
@@ -0,0 +1,46 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { MDAppModule } from './../../../../core/md.module';
+
+import { KubernetesNamespaceAnalysisReportComponent } from './kubernetes-namespace-analysis-report.component';
+import { KubernetesBaseTestModules, KubeBaseGuidMock } from '../../kubernetes.testing.module';
+import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
+import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
+import {
+  AnalysisReportSelectorComponent
+} from './../../analysis-report-viewer/analysis-report-selector/analysis-report-selector.component';
+import { AnalysisReportViewerComponent } from './../../analysis-report-viewer/analysis-report-viewer.component';
+import { KubernetesNamespaceService } from '../../services/kubernetes-namespace.service';
+import { TabNavService } from 'frontend/packages/core/tab-nav.service';
+
+describe('KubernetesNamespaceAnalysisReportComponent', () => {
+  let component: KubernetesNamespaceAnalysisReportComponent;
+  let fixture: ComponentFixture<KubernetesNamespaceAnalysisReportComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ KubernetesNamespaceAnalysisReportComponent, AnalysisReportSelectorComponent, AnalysisReportViewerComponent ],
+      imports: [
+        KubernetesBaseTestModules,
+        MDAppModule
+      ],
+      providers: [
+        KubernetesAnalysisService,
+        KubernetesEndpointService,
+        KubeBaseGuidMock,
+        KubernetesNamespaceService,
+        TabNavService,
+      ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubernetesNamespaceAnalysisReportComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.ts
new file mode 100644
index 0000000000..cdaa70db35
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.ts
@@ -0,0 +1,50 @@
+import { Component } from '@angular/core';
+import { Subject } from 'rxjs';
+
+import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
+import { KubernetesNamespaceService } from '../../services/kubernetes-namespace.service';
+import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
+import { AnalysisReport } from '../../store/kube.types';
+
+@Component({
+  selector: 'app-kubernetes-namespace-analysis-report-tab',
+  templateUrl: './kubernetes-namespace-analysis-report.component.html',
+  styleUrls: ['./kubernetes-namespace-analysis-report.component.scss'],
+  providers: [
+    KubernetesAnalysisService
+  ]
+})
+export class KubernetesNamespaceAnalysisReportComponent {
+
+  public report$ = new Subject<AnalysisReport>();
+
+  path: string;
+
+  currentReport = null;
+
+  endpointID: string;
+
+  noReportsAvailable = false;
+
+  constructor(
+    public analyzerService: KubernetesAnalysisService,
+    public endpointService: KubernetesEndpointService,
+    public kubeNamespaceService: KubernetesNamespaceService,
+  ) {
+    this.endpointID = this.endpointService.kubeGuid;
+    this.path = `${this.kubeNamespaceService.namespaceName}`;
+    this.report$.next(null);
+  }
+
+  public analysisChanged(report) {
+    if (report.id !== this.currentReport) {
+      this.currentReport = report.id;
+      this.analyzerService.getByID(this.endpointID, report.id).subscribe(r => this.report$.next(r));
+    }
+  }
+
+  public onReportCount(count: number) {
+    this.noReportsAvailable = count === 0;
+  }
+
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts
index 3847972a17..45ab5eb4a9 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts
@@ -8,6 +8,7 @@ import { BaseKubeGuid } from '../kubernetes-page.types';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
 import { KubernetesNamespaceService } from '../services/kubernetes-namespace.service';
 import { KubernetesService } from '../services/kubernetes.service';
+import { KubernetesAnalysisService } from '../services/kubernetes.analysis.service';
 
 @Component({
   selector: 'app-kubernetes-namespace',
@@ -27,21 +28,20 @@ import { KubernetesService } from '../services/kubernetes.service';
     },
     KubernetesService,
     KubernetesEndpointService,
-    KubernetesNamespaceService
+    KubernetesNamespaceService,
+    KubernetesAnalysisService,
   ]
 })
 export class KubernetesNamespaceComponent {
 
-  tabLinks = [
-    { link: 'pods', label: 'Pods', icon: 'pod', iconFont: 'stratos-icons'  },
-    { link: 'services', label: 'Services', icon: 'service', iconFont: 'stratos-icons' }
-  ];
+  tabLinks = [];
 
   public breadcrumbs$: Observable<IHeaderBreadcrumb[]>;
 
   constructor(
     public kubeEndpointService: KubernetesEndpointService,
-    public kubeNamespaceService: KubernetesNamespaceService
+    public kubeNamespaceService: KubernetesNamespaceService,
+    public analysisService: KubernetesAnalysisService,
   ) {
     this.breadcrumbs$ = kubeEndpointService.endpoint$.pipe(
       map(endpoint => ([{
@@ -51,5 +51,11 @@ export class KubernetesNamespaceComponent {
       }])
       )
     );
+
+    this.tabLinks = [
+      { link: 'pods', label: 'Pods', icon: 'pod', iconFont: 'stratos-icons' },
+      { link: 'services', label: 'Services', icon: 'service', iconFont: 'stratos-icons' },
+      { link: 'analysis', label: 'Analysis', icon: 'assignment', hidden$: this.analysisService.hideAnalysis$ },
+    ];
   }
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html
index cb780e3041..c3ebbdd9e1 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html
@@ -13,7 +13,7 @@
       <app-metadata-item label="Age">{{ resource.age }}</app-metadata-item>
     </div>
 
-    <app-metadata-item class="resource-preview__labels" label="Labels">
+    <app-metadata-item class="resource-preview__labels" label="Labels" *ngIf="resource.labels">
       <div *ngFor="let label of resource.labels" class="resource-preview__label">
         <div class="resource-preview__label-name">{{ label.name }}</div>
         <div class="resource-preview__label-value">{{ label.value }}</div>
@@ -27,7 +27,10 @@
       </div>
     </app-metadata-item>
 
-    <app-json-viewer #viewer [json]="resource.jsonView"></app-json-viewer>
+    <app-metadata-item class="resource-preview__labels" label="Alerts" *ngIf="alerts">
+      <app-resource-alert-view [showHeader]="false" [alerts]="alerts"></app-resource-alert-view>
+    </app-metadata-item>
 
+    <app-json-viewer #viewer [json]="resource.jsonView" [expanded]="false"></app-json-viewer>
   </div>
 </app-sidepanel-preview>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts
index 5df03aea30..75fb79c994 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts
@@ -5,6 +5,7 @@ import { SidePanelService } from '../../../shared/services/side-panel.service';
 import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
 import { KubernetesResourceViewerComponent } from './kubernetes-resource-viewer.component';
+import { ResourceAlertViewComponent } from './../analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component';
 
 describe('KubernetesResourceViewerComponent', () => {
   let component: KubernetesResourceViewerComponent;
@@ -12,7 +13,7 @@ describe('KubernetesResourceViewerComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [KubernetesResourceViewerComponent],
+      declarations: [KubernetesResourceViewerComponent, KubernetesResourceViewerComponent, ResourceAlertViewComponent],
       imports: KubernetesBaseTestModules,
       providers: [
         KubernetesEndpointService,
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
index 871f4e9a17..4672958d66 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
@@ -6,10 +6,11 @@ import { filter, first, map, publishReplay, refCount, switchMap } from 'rxjs/ope
 import { EndpointsService } from '../../../../../core/src/core/endpoints.service';
 import { PreviewableComponent } from '../../../../../core/src/shared/previewable-component';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
-import { BasicKubeAPIResource, KubeAPIResource } from '../store/kube.types';
+import { BasicKubeAPIResource, KubeAPIResource, KubeStatus } from '../store/kube.types';
 
 export interface KubernetesResourceViewerConfig {
   title: string;
+  analysis?: any;
   resource$: Observable<BasicKubeAPIResource>;
   resourceKind: string;
 }
@@ -44,32 +45,42 @@ export class KubernetesResourceViewerComponent implements PreviewableComponent {
   public hasPodMetrics$: Observable<boolean>;
   public podRouterLink$: Observable<string[]>;
 
+  private analysis;
+  public alerts;
+
   setProps(props: KubernetesResourceViewerConfig) {
     this.title = props.title;
+    this.analysis = props.analysis;
     this.resource$ = props.resource$.pipe(
-      map((item: any) => {// KubeAPIResource
+      filter(item => !!item),
+      map((item: (KubeAPIResource | KubeStatus)) => {
         const resource: KubernetesResourceViewerResource = {} as KubernetesResourceViewerResource;
         const newItem = {} as any;
 
         resource.raw = item;
-
         Object.keys(item || []).forEach(k => {
-          if (k !== 'endpointId' && k !== 'releaseTitle' && k !== 'expandedStatus') {
+          if (k !== 'endpointId' && k !== 'releaseTitle' && k !== 'expandedStatus' && k !== '_metadata') {
             newItem[k] = item[k];
           }
         });
 
         resource.jsonView = newItem;
-        resource.age = moment(item.metadata.creationTimestamp).fromNow(true);
-        resource.creationTimestamp = item.metadata.creationTimestamp;
-
-        resource.labels = [];
-        Object.keys(item.metadata.labels || []).forEach(labelName => {
-          resource.labels.push({
-            name: labelName,
-            value: item.metadata.labels[labelName]
+
+        const fallback = item['_metadata'] || {};
+
+        const ts = item.metadata ? item.metadata.creationTimestamp : fallback.creationTimestamp;
+        resource.age = moment(ts).fromNow(true);
+        resource.creationTimestamp = ts;
+
+        if (item.metadata && item.metadata.labels) {
+          resource.labels = [];
+          Object.keys(item.metadata.labels || []).forEach(labelName => {
+            resource.labels.push({
+              name: labelName,
+              value: item.metadata.labels[labelName]
+            });
           });
-        });
+        }
 
         if (item.metadata && item.metadata.annotations) {
           resource.annotations = [];
@@ -81,8 +92,13 @@ export class KubernetesResourceViewerComponent implements PreviewableComponent {
           });
         }
 
-        resource.kind = item.kind || props.resourceKind;
-        resource.apiVersion = item.apiVersion || this.getVersionFromSelfLink(item.metadata.selfLink);
+        resource.kind = item['kind'] || fallback.kind || props.resourceKind;
+        resource.apiVersion = item['apiVersion'] || fallback.apiVersion || this.getVersionFromSelfLink(item.metadata['selfLink']);
+
+        // Apply analysis if there is one - if this is a k8s resource (i.e. not a container)
+        if (item.metadata) {
+          this.applyAnalysis(resource);
+        }
         return resource;
       }),
       publishReplay(1),
@@ -123,4 +139,14 @@ export class KubernetesResourceViewerComponent implements PreviewableComponent {
     return this.kubeEndpointService.kubeGuid || res.endpointId || res.metadata.kubeId;
   }
 
+  private applyAnalysis(resource) {
+    let id = (resource.kind || 'pod').toLowerCase();
+    id = `${id}/${resource.raw.metadata.namespace}/${resource.raw.metadata.name}`;
+    if (this.analysis && this.analysis.alerts[id]) {
+      this.alerts = this.analysis.alerts[id];
+    } else {
+      this.alerts = null;
+    }
+  }
+
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
index a24a892eb2..fcd9c0ba5f 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
@@ -7,6 +7,7 @@ import { FavoritesConfigMapper } from '../../../../../store/src/favorite-config-
 import { UserFavoriteEndpoint } from '../../../../../store/src/types/user-favorites.types';
 import { BaseKubeGuid } from '../kubernetes-page.types';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
+import { KubernetesAnalysisService } from '../services/kubernetes.analysis.service';
 import { KubernetesService } from '../services/kubernetes.service';
 
 @Component({
@@ -27,16 +28,12 @@ import { KubernetesService } from '../services/kubernetes.service';
     },
     KubernetesService,
     KubernetesEndpointService,
+    KubernetesAnalysisService,
   ]
 })
 export class KubernetesTabBaseComponent implements OnInit {
 
-  tabLinks = [
-    { link: 'summary', label: 'Summary', icon: 'kubernetes', iconFont: 'stratos-icons' },
-    { link: 'nodes', label: 'Nodes', icon: 'node', iconFont: 'stratos-icons' },
-    { link: 'namespaces', label: 'Namespaces', icon: 'namespace', iconFont: 'stratos-icons' },
-    { link: 'pods', label: 'Pods', icon: 'pod', iconFont: 'stratos-icons' },
-  ];
+  tabLinks = [];
 
   public isFetching$: Observable<boolean>;
   public favorite$: Observable<UserFavoriteEndpoint>;
@@ -44,7 +41,19 @@ export class KubernetesTabBaseComponent implements OnInit {
 
   constructor(
     public kubeEndpointService: KubernetesEndpointService,
-    public favoritesConfigMapper: FavoritesConfigMapper) { }
+    public favoritesConfigMapper: FavoritesConfigMapper,
+    public analysisService: KubernetesAnalysisService,
+  ) {
+    this.tabLinks = [
+      { link: 'summary', label: 'Summary', icon: 'kubernetes', iconFont: 'stratos-icons' },
+      { link: 'analysis', label: 'Analysis', icon: 'assignment', hidden$: this.analysisService.hideAnalysis$ },
+      { link: '-', label: 'Cluster' },
+      { link: 'nodes', label: 'Nodes', icon: 'node', iconFont: 'stratos-icons' },
+      { link: 'namespaces', label: 'Namespaces', icon: 'namespace', iconFont: 'stratos-icons' },
+      { link: '-', label: 'Resources' },
+      { link: 'pods', label: 'Pods', icon: 'pod', iconFont: 'stratos-icons' },
+    ];
+  }
 
   ngOnInit() {
     this.isFetching$ = this.kubeEndpointService.endpoint$.pipe(
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.module.ts
index faa30bd980..9d5c1db436 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.module.ts
@@ -4,10 +4,31 @@ import { NgxChartsModule } from '@swimlane/ngx-charts';
 
 import { CoreModule } from '../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
+import {
+  AnalysisReportRunnerComponent,
+} from './analysis-report-viewer/analysis-report-runner/analysis-report-runner.component';
+import {
+  AnalysisReportSelectorComponent,
+} from './analysis-report-viewer/analysis-report-selector/analysis-report-selector.component';
+import { AnalysisReportViewerComponent } from './analysis-report-viewer/analysis-report-viewer.component';
+import {
+  KubeScoreReportViewerComponent,
+} from './analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component';
+import { PopeyeReportViewerComponent } from './analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component';
+import {
+  ResourceAlertPreviewComponent,
+} from './analysis-report-viewer/resource-alert-preview/resource-alert-preview.component';
+import {
+  ResourceAlertViewComponent,
+} from './analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component';
+import { KubeConsoleComponent } from './kube-terminal/kube-console.component';
 import {
   KubedashConfigurationComponent,
 } from './kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component';
 import { KubernetesDashboardTabComponent } from './kubernetes-dashboard/kubernetes-dashboard.component';
+import {
+  KubernetesNamespaceAnalysisReportComponent,
+} from './kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component';
 import {
   KubernetesNamespacePodsComponent,
 } from './kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component';
@@ -32,6 +53,7 @@ import { KubernetesResourceViewerComponent } from './kubernetes-resource-viewer/
 import { KubernetesTabBaseComponent } from './kubernetes-tab-base/kubernetes-tab-base.component';
 import { KubernetesRoutingModule } from './kubernetes.routing';
 import { KubernetesComponent } from './kubernetes/kubernetes.component';
+import { AnalysisStatusCellComponent } from './list-types/analysis-status-cell/analysis-status-cell.component';
 import { KubernetesLabelsCellComponent } from './list-types/kubernetes-labels-cell/kubernetes-labels-cell.component';
 import {
   KubeNamespacePodCountComponent,
@@ -87,14 +109,22 @@ import { PodMetricsComponent } from './pod-metrics/pod-metrics.component';
 import { KubernetesEndpointService } from './services/kubernetes-endpoint.service';
 import { KubernetesNodeService } from './services/kubernetes-node.service';
 import { KubernetesService } from './services/kubernetes.service';
+import {
+  AnalysisInfoCardComponent,
+} from './tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component';
+import {
+  KubernetesAnalysisInfoComponent,
+} from './tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component';
+import {
+  KubernetesAnalysisReportComponent,
+} from './tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component';
+import { KubernetesAnalysisTabComponent } from './tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component';
 import { KubernetesNamespacesTabComponent } from './tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component';
 import { KubernetesNodesTabComponent } from './tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component';
 import { KubernetesPodsTabComponent } from './tabs/kubernetes-pods-tab/kubernetes-pods-tab.component';
 import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kubernetes-summary.component';
-import { KubeConsoleComponent } from './kube-terminal/kube-console.component';
 
 /* tslint:disable:max-line-length */
-
 /* tslint:enable */
 
 @NgModule({
@@ -115,6 +145,7 @@ import { KubeConsoleComponent } from './kube-terminal/kube-console.component';
     KubernetesNamespacesTabComponent,
     KubernetesDashboardTabComponent,
     KubernetesSummaryTabComponent,
+    KubernetesAnalysisTabComponent,
     PodMetricsComponent,
     KubernetesNodeLinkComponent,
     KubernetesNodeIpsComponent,
@@ -149,6 +180,18 @@ import { KubeConsoleComponent } from './kube-terminal/kube-console.component';
     KubeServiceCardComponent,
     KubedashConfigurationComponent,
     KubernetesPodContainersComponent,
+    KubernetesAnalysisReportComponent,
+    KubernetesAnalysisInfoComponent,
+    AnalysisInfoCardComponent,
+    AnalysisReportViewerComponent,
+    PopeyeReportViewerComponent,
+    AnalysisReportSelectorComponent,
+    AnalysisReportRunnerComponent,
+    ResourceAlertPreviewComponent,
+    ResourceAlertViewComponent,
+    KubeScoreReportViewerComponent,
+    AnalysisStatusCellComponent,
+    KubernetesNamespaceAnalysisReportComponent,
   ],
   providers: [
     KubernetesService,
@@ -173,9 +216,22 @@ import { KubeConsoleComponent } from './kube-terminal/kube-console.component';
     KubeServiceCardComponent,
     KubernetesResourceViewerComponent,
     KubernetesPodContainersComponent,
+    PopeyeReportViewerComponent,
+    KubeScoreReportViewerComponent,
+    AnalysisReportSelectorComponent,
+    ResourceAlertPreviewComponent,
+    AnalysisStatusCellComponent,
   ],
   exports: [
-    KubernetesResourceViewerComponent
+    KubernetesResourceViewerComponent,
+    AnalysisReportViewerComponent,
+    PopeyeReportViewerComponent,
+    KubeScoreReportViewerComponent,
+    AnalysisReportSelectorComponent,
+    AnalysisReportRunnerComponent,
+    ResourceAlertPreviewComponent,
+    ResourceAlertViewComponent,
+    AnalysisStatusCellComponent,
   ]
 })
 export class KubernetesModule { }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.routing.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.routing.ts
index c7681161ce..35c15386f8 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.routing.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.routing.ts
@@ -1,3 +1,4 @@
+import { KubernetesNamespaceAnalysisReportComponent } from './kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component';
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
@@ -24,6 +25,11 @@ import { KubernetesPodsTabComponent } from './tabs/kubernetes-pods-tab/kubernete
 import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kubernetes-summary.component';
 import { KubedashConfigurationComponent } from './kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component';
 import { KubeConsoleComponent } from './kube-terminal/kube-console.component';
+import { KubernetesAnalysisTabComponent } from './tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component';
+import { KubernetesAnalysisReportComponent } from './tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component';
+import {
+  KubernetesAnalysisInfoComponent
+} from './tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component';
 
 const kubernetes: Routes = [{
   path: '',
@@ -81,7 +87,10 @@ const kubernetes: Routes = [{
       path: 'services',
       component: KubernetesNamespaceServicesComponent
     },
-
+    {
+      path: 'analysis',
+      component: KubernetesNamespaceAnalysisReportComponent
+    }
   ]
 },
 {
@@ -109,6 +118,18 @@ const kubernetes: Routes = [{
       path: 'pods',
       component: KubernetesPodsTabComponent
     },
+    {
+      path: 'analysis',
+      component: KubernetesAnalysisTabComponent
+    },
+    {
+      path: 'analysis/report/:id',
+      component: KubernetesAnalysisReportComponent
+    },
+    {
+      path: 'analysis/info',
+      component: KubernetesAnalysisInfoComponent
+    },
   ]
 },
 {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.store.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.store.module.ts
index f0a76a9017..4b37169198 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.store.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.store.module.ts
@@ -1,12 +1,14 @@
 import { NgModule } from '@angular/core';
 import { EffectsModule } from '@ngrx/effects';
 
+import { AnalysisEffects } from './store/analysis.effects';
 import { KubernetesEffects } from './store/kubernetes.effects';
 
 @NgModule({
   imports: [
     EffectsModule.forFeature([
-      KubernetesEffects
+      AnalysisEffects,
+      KubernetesEffects,
     ])
   ]
 })
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-reports-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-reports-list-config.service.ts
new file mode 100644
index 0000000000..9e68483e80
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-reports-list-config.service.ts
@@ -0,0 +1,123 @@
+import { Injectable, NgZone } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { ITableColumn } from 'frontend/packages/core/src/shared/components/list/list-table/table.types';
+import {
+  IListAction,
+  IListConfig,
+  IListMultiFilterConfig,
+  ListViewTypes,
+} from 'frontend/packages/core/src/shared/components/list/list.component.types';
+import * as moment from 'moment';
+import { of } from 'rxjs';
+
+import { ListView } from '../../../../../store/src/actions/list.actions';
+import { AppState } from '../../../../../store/src/app-state';
+import { defaultHelmKubeListPageSize } from '../../kubernetes/list-types/kube-helm-list-types';
+import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
+import { KubernetesAnalysisService } from '../services/kubernetes.analysis.service';
+import { AnalysisReport } from '../store/kube.types';
+import { AnalysisReportsDataSource } from './analysis-reports-list-source';
+import { AnalysisStatusCellComponent } from './analysis-status-cell/analysis-status-cell.component';
+
+@Injectable()
+export class AnalysisReportsListConfig implements IListConfig<AnalysisReport> {
+  AppsDataSource: AnalysisReportsDataSource;
+  isLocal = true;
+  multiFilterConfigs: IListMultiFilterConfig[];
+
+  guid: string;
+
+  columns: Array<ITableColumn<AnalysisReport>> = [
+    {
+      columnId: 'name', headerCell: () => 'Name',
+      cellDefinition: {
+        getValue: (row: AnalysisReport) => row.name,
+        getLink: row => row.status === 'completed' ? `/kubernetes/${this.guid}/analysis/report/${row.id}` : null
+      },
+      sort: {
+        type: 'sort',
+        orderKey: 'name',
+        field: 'name'
+      },
+      cellFlex: '2',
+    },
+    {
+      columnId: 'type',
+      headerCell: () => 'Type',
+      cellDefinition: {
+        getValue: (row: AnalysisReport) => row.type.charAt(0).toUpperCase() + row.type.substring(1)
+      },
+      sort: {
+        type: 'sort',
+        orderKey: 'type',
+        field: 'type'
+      },
+      cellFlex: '1'
+    },
+    {
+      columnId: 'age',
+      headerCell: () => 'Age',
+      cellDefinition: {
+        getValue: (row: AnalysisReport) => {
+          return moment(row.created).fromNow(true);
+        }
+      },
+      sort: {
+        type: 'sort',
+        orderKey: 'age',
+        field: 'created'
+      },
+      cellFlex: '1'
+    },
+    {
+      columnId: 'status',
+      headerCell: () => 'Status',
+      cellComponent: AnalysisStatusCellComponent,
+      sort: {
+        type: 'sort',
+        orderKey: 'status',
+        field: 'status'
+      },
+      cellFlex: '1'
+    }
+  ];
+
+  pageSizeOptions = defaultHelmKubeListPageSize;
+  viewType = ListViewTypes.TABLE_ONLY;
+  defaultView = 'table' as ListView;
+
+  enableTextFilter = true;
+  text = {
+    filter: 'Filter by Name',
+    noEntries: 'There are no Analysis Reports'
+  };
+
+  constructor(
+    store: Store<AppState>,
+    kubeEndpointService: KubernetesEndpointService,
+    private analysisService: KubernetesAnalysisService,
+    ngZone: NgZone,
+  ) {
+    this.guid = kubeEndpointService.baseKube.guid;
+    this.AppsDataSource = new AnalysisReportsDataSource(store, this, kubeEndpointService, ngZone);
+  }
+
+  private listActionDelete: IListAction<AnalysisReport> = {
+    action: (item) => this.analysisService.delete(item.endpoint, item),
+    label: 'Delete',
+    icon: 'delete',
+    description: ``,
+    createEnabled: row$ => of(true)
+  };
+
+  private singleActions = [
+    this.listActionDelete,
+  ];
+
+  getGlobalActions = () => [];
+  getMultiActions = () => [];
+  getSingleActions = () => this.singleActions;
+  getColumns = () => this.columns;
+  getDataSource = () => this.AppsDataSource;
+  getMultiFiltersConfigs = () => [];
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-reports-list-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-reports-list-source.ts
new file mode 100644
index 0000000000..6ccd5e3d98
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-reports-list-source.ts
@@ -0,0 +1,63 @@
+import { NgZone } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { safeUnsubscribe } from 'frontend/packages/core/src/core/utils.service';
+import { ListDataSource } from 'frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source';
+import { IListConfig } from 'frontend/packages/core/src/shared/components/list/list.component.types';
+import { interval, Subscription } from 'rxjs';
+import { first, map } from 'rxjs/operators';
+
+import { AppState } from '../../../../../store/src/app-state';
+import { isFetchingPage } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
+import { kubeEntityCatalog } from '../kubernetes-entity-catalog';
+import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
+import { GetAnalysisReports } from '../store/anaylsis.actions';
+import { AnalysisReport } from '../store/kube.types';
+
+export class AnalysisReportsDataSource extends ListDataSource<AnalysisReport> {
+
+
+  private analysisAction: GetAnalysisReports;
+  private pollInterval: Subscription;
+
+  constructor(
+    store: Store<AppState>,
+    listConfig: IListConfig<AnalysisReport>,
+    endpointService: KubernetesEndpointService,
+    ngZone: NgZone,
+  ) {
+    const action = kubeEntityCatalog.analysisReport.actions.getMultiple(endpointService.baseKube.guid);
+    super({
+      store,
+      action,
+      schema: action.entity[0],
+      getRowUniqueId: (entity: AnalysisReport) => action.entity[0].getId(entity),
+      paginationKey: action.paginationKey,
+      isLocal: true,
+      transformEntities: [{ type: 'filter', field: 'name' }],
+      listConfig,
+    });
+    this.analysisAction = action;
+
+    this.startPoll(store, ngZone);
+  }
+
+  destroy() {
+    safeUnsubscribe(this.pollInterval);
+  }
+
+  private startPoll(store: Store<AppState>, ngZone: NgZone) {
+    ngZone.runOutsideAngular(() => this.pollInterval = interval(5000).subscribe(() => this.poll(store, ngZone)));
+  }
+  private poll(store: Store<AppState>, ngZone: NgZone) {
+    kubeEntityCatalog.analysisReport.store.getPaginationMonitor(this.analysisAction.kubeGuid).pagination$.pipe(
+      first(),
+      map(isFetchingPage)
+    ).subscribe(isFetchingPage => {
+      if (!isFetchingPage) {
+        ngZone.run(() => {
+          store.dispatch(this.analysisAction);
+        });
+      }
+    })
+  }
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.html
new file mode 100644
index 0000000000..6ff4563a31
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.html
@@ -0,0 +1,8 @@
+<div *ngIf="row.status === 'running'" class="status__running">
+  <mat-progress-spinner diameter="20" mode="indeterminate"></mat-progress-spinner> Running
+</div>
+<div *ngIf="row.status === 'completed'">Completed</div>
+<div *ngIf="row.status === 'error'" class="status__error">
+  <div>Error</div>
+   <mat-icon class="text-warning" *ngIf="row.error" matTooltip="{{ row.error }}">warning</mat-icon>
+</div>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.scss
new file mode 100644
index 0000000000..27dcfcf08b
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.scss
@@ -0,0 +1,22 @@
+.status {
+  &__running {
+    align-items: center;
+    display: flex;
+
+    &> mat-progress-spinner {
+      margin-right: 8px;
+    }
+  }
+  &__error {
+    align-items: center;
+    display: flex;
+
+    mat-icon {
+      cursor: help;
+      font-size: 20px;
+      height: 20px;
+      margin-left: 8px;
+      width: 20px;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.spec.ts
new file mode 100644
index 0000000000..3c1fb10915
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.spec.ts
@@ -0,0 +1,32 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { MDAppModule } from './../../../../core/md.module';
+import { AnalysisStatusCellComponent } from './analysis-status-cell.component';
+import {
+  AnalysisReportSelectorComponent
+} from './../../analysis-report-viewer/analysis-report-selector/analysis-report-selector.component';
+
+describe('AnalysisStatusCellComponent', () => {
+  let component: AnalysisStatusCellComponent;
+  let fixture: ComponentFixture<AnalysisStatusCellComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AnalysisStatusCellComponent, AnalysisReportSelectorComponent ],
+      imports: [
+        MDAppModule,
+      ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AnalysisStatusCellComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.ts
new file mode 100644
index 0000000000..acc74ee6d6
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.ts
@@ -0,0 +1,16 @@
+import { Component } from '@angular/core';
+import { TableCellCustom } from 'frontend/packages/core/src/shared/components/list/list.types';
+
+@Component({
+  selector: 'app-analysis-status-cell',
+  templateUrl: './analysis-status-cell.component.html',
+  styleUrls: ['./analysis-status-cell.component.scss']
+})
+export class AnalysisStatusCellComponent extends TableCellCustom<any> {
+
+  constructor() {
+    super();
+    this.row = {};
+  }
+
+ }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts
index e70ac26fdf..68f0f28e01 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts
@@ -1,8 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { BaseTestModules } from '../../../../../../core/test-framework/core-test.helper';
-import { KubernetesStatus } from '../../store/kube.types';
 import { KubernetesLabelsCellComponent } from './kubernetes-labels-cell.component';
+import { KubernetesStatus } from '../../store/kube.types';
 
 describe('KubernetesLabelsCellComponent', () => {
   let component: KubernetesLabelsCellComponent;
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/analysis-report.types.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/analysis-report.types.ts
new file mode 100644
index 0000000000..620640c6c9
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/analysis-report.types.ts
@@ -0,0 +1,22 @@
+export enum ResourceAlertLevel {
+  OK = 0,
+  Info,
+  Warning,
+  Error,
+  Unknown,
+}
+
+// We re-map an analysis reprot into a map of resource alerts that is better for us
+// to overlay in the UI to show issues from reports
+export interface ResourceAlert {
+  apiVersion?: string;
+  kind: string;
+  message: string;
+  namespace: string;
+  name: string;
+  level: ResourceAlertLevel;
+}
+
+export interface ResourceAlertMap {
+  [key: string]: ResourceAlert[];
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes.analysis.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes.analysis.service.ts
new file mode 100644
index 0000000000..14749dc1c8
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes.analysis.service.ts
@@ -0,0 +1,164 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { Store } from '@ngrx/store';
+import { combineLatest, Observable } from 'rxjs';
+import { filter, first, map, pairwise, startWith, tap } from 'rxjs/operators';
+
+import { SnackBarService } from '../../../../../core/src/shared/services/snackbar.service';
+import { ResetPaginationOfType } from '../../../../../store/src/actions/pagination.actions';
+import { AppState } from '../../../../../store/src/app-state';
+import { ListActionState, RequestInfoState } from '../../../../../store/src/reducers/api-request-reducer/types';
+import { kubeEntityCatalog } from '../kubernetes-entity-catalog';
+import { GetAnalysisReports } from '../store/anaylsis.actions';
+import { AnalysisReport } from '../store/kube.types';
+import { getHelmReleaseDetailsFromGuid } from '../workloads/store/workloads-entity-factory';
+import { KubernetesEndpointService } from './kubernetes-endpoint.service';
+
+export interface KubernetesAnalysisType {
+  name: string;
+  id: string;
+  namespaceAware: boolean;
+  iconUrl?: string;
+  descriptionUrl?: string;
+}
+
+@Injectable()
+export class KubernetesAnalysisService {
+  kubeGuid: string;
+
+  public analyzers$: Observable<KubernetesAnalysisType[]>;
+  public namespaceAnalyzers$: Observable<KubernetesAnalysisType[]>;
+
+  public enabled$: Observable<boolean>;
+  public hideAnalysis$: Observable<boolean>;
+
+  private action: GetAnalysisReports;
+
+  constructor(
+    public kubeEndpointService: KubernetesEndpointService,
+    public activatedRoute: ActivatedRoute,
+    public store: Store<AppState>,
+    private snackbarService: SnackBarService
+  ) {
+    this.kubeGuid = kubeEndpointService.kubeGuid || getHelmReleaseDetailsFromGuid(activatedRoute.snapshot.params.guid).endpointId;
+
+    // Is the backend plugin available?
+    this.enabled$ = this.store.select('auth').pipe(
+      map(auth => auth.sessionData.plugins && auth.sessionData.plugins.analysis)
+    );
+
+    this.hideAnalysis$ = this.enabled$.pipe(
+      map(enabled => !enabled),
+      startWith(true),
+    )
+
+    const allEngines = {
+      popeye:
+      {
+        name: 'PopEye',
+        id: 'popeye',
+        namespaceAware: true,
+        // iconUrl: '/core/assets/custom/popeye.png',
+        // iconWidth: '80',
+        descriptionUrl: '/core/assets/custom/popeye.md'
+      },
+      'kube-score':
+      {
+        name: 'Kube Score',
+        id: 'kube-score',
+        namespaceAware: true,
+        // iconUrl: '/core/assets/custom/kubescore.png',
+        // iconWidth: '120',
+        descriptionUrl: '/core/assets/custom/kubescore.md'
+      }
+      // {
+      //   name: 'Sonobuoy',
+      //   id: 'sonobuoy',
+      //   namespaceAware: false,
+      //   iconUrl: '/core/assets/custom/sonobuoy.png',
+      //   iconWidth: '70',
+      //   descriptionUrl: '/core/assets/custom/sonobuoy.md'
+      // }
+    };
+
+    // Determine which analyzers are enabled
+    this.analyzers$ = this.store.select('auth').pipe(
+      filter(auth => !!auth.sessionData['plugin-config']),
+      map(auth => auth.sessionData['plugin-config'].analysisEngines),
+      map(engines => engines.split(',').map(e => allEngines[e.trim()]).filter(e => !!e))
+    );
+
+    this.namespaceAnalyzers$ = combineLatest(
+      this.analyzers$,
+      this.enabled$
+    ).pipe(
+      map(([a, enabled]) => {
+        if (!enabled) {
+          return null;
+        }
+        return a.filter(v => v.namespaceAware);
+      })
+    );
+
+    this.action = kubeEntityCatalog.analysisReport.actions.getMultiple(this.kubeGuid)
+  }
+
+  public delete(endpointID: string, item: { id: string }) {
+    return kubeEntityCatalog.analysisReport.api.delete(endpointID, item.id);
+  }
+
+  public refresh() {
+    this.store.dispatch(new ResetPaginationOfType(this.action));
+  }
+
+  public run(id: string, endpointID: string, namespace?: string, app?: string): Observable<any> {
+    const obs$ = kubeEntityCatalog.analysisReport.api.run<RequestInfoState>(endpointID, id, namespace, app).pipe(
+      pairwise(),
+      filter(([oldE, newE]) => oldE.creating && !newE.creating),
+      map(([, newE]) => newE),
+      first()
+    )
+    obs$.subscribe(() => {
+      const type = id.charAt(0).toUpperCase() + id.substring(1);
+      let msg;
+      if (app) {
+        msg = `${type} analysis started for workload '${app}'`;
+      } else if (namespace) {
+        msg = `${type} analysis started for namespace '${namespace}'`;
+      } else {
+        msg = `${type} analysis started for the Kubernetes cluster`;
+      }
+      this.snackbarService.showReturn(msg, ['kubernetes', endpointID, 'analysis'], 'View', 5000);
+      this.refresh();
+    });
+    return obs$;
+  }
+
+  public getByID(endpoint: string, id: string, refresh = false): Observable<AnalysisReport> {
+    if (refresh) {
+      kubeEntityCatalog.analysisReport.api.getById<RequestInfoState>(endpoint, id)
+    }
+
+    const entityService = kubeEntityCatalog.analysisReport.store.getById.getEntityService(endpoint, id);
+    return entityService.waitForEntity$.pipe(
+      map(e => e.entity),
+      tap(entity => {
+        if (!refresh && !entity.report) {
+          kubeEntityCatalog.analysisReport.api.getById<RequestInfoState>(endpoint, id);
+          refresh = true;
+        }
+      }),
+      filter(entity => !!entity.report)
+    );
+  }
+
+  public getByPath(endpointID: string, path: string, refresh = false): Observable<AnalysisReport[]> {
+    if (refresh) {
+      kubeEntityCatalog.analysisReport.api.getByPath<ListActionState>(endpointID, path)
+    }
+    return kubeEntityCatalog.analysisReport.store.getByPath.getPaginationService(endpointID, path).entities$.pipe(
+      filter(entities => !!entities)
+    );
+  }
+
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes.service.ts
index 678b9eceed..09c03d154e 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes.service.ts
@@ -2,11 +2,11 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map, shareReplay } from 'rxjs/operators';
 
-import { endpointEntityType, stratosEntityFactory } from '../../../../../store/src/helpers/stratos-entity-factory';
 import { PaginationMonitor } from '../../../../../store/src/monitors/pagination-monitor';
-import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
+import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
 import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
-import { endpointListKey, EndpointModel } from '../../../../../store/src/types/endpoint.types';
+import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
+import { KUBERNETES_ENDPOINT_TYPE } from '../kubernetes-entity-factory';
 
 @Injectable()
 export class KubernetesService {
@@ -14,18 +14,11 @@ export class KubernetesService {
   kubeEndpointsMonitor: PaginationMonitor<EndpointModel>;
   waitForAppEntity$: Observable<EntityInfo<APIResource>>;
 
-  constructor(
-    private paginationMonitorFactory: PaginationMonitorFactory
-  ) {
-    // TODO: RC update with stratos entity catalog
-    this.kubeEndpointsMonitor = this.paginationMonitorFactory.create(
-      endpointListKey,
-      stratosEntityFactory(endpointEntityType),
-      true
-    );
+  constructor() {
+    this.kubeEndpointsMonitor = stratosEntityCatalog.endpoint.store.getAll.getPaginationMonitor()
 
     this.kubeEndpoints$ = this.kubeEndpointsMonitor.currentPage$.pipe(
-      map(endpoints => endpoints.filter(e => e.cnsi_type === 'k8s')),
+      map(endpoints => endpoints.filter(e => e.cnsi_type === KUBERNETES_ENDPOINT_TYPE)),
       shareReplay(1)
     );
   }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubescore-report.helper.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubescore-report.helper.ts
new file mode 100644
index 0000000000..b07c0e7abf
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubescore-report.helper.ts
@@ -0,0 +1,57 @@
+import { ResourceAlert, ResourceAlertLevel, ResourceAlertMap } from './analysis-report.types';
+
+export class KubeScoreReportHelper {
+
+  constructor(public report: any) {}
+
+  public map() {
+    if (!this.report.report) {
+      return;
+    }
+
+    const kubescore = this.report.report;
+    // Go through the report and re-map
+    const result = {} as ResourceAlertMap;
+
+    Object.keys(kubescore).forEach(key => {
+      const item = kubescore[key];
+      let id = item.TypeMeta.kind.toLowerCase();
+      id = `${id}/${item.ObjectMeta.namespace}/${item.ObjectMeta.name}`;
+
+      item.Checks.forEach(check => {
+        if (check.Grade !== 10 && !check.Skipped) {
+          // Add an alert for each comment
+          check.Comments.forEach(comment => {
+            // Include this comment
+            const alert = {
+              kind: item.TypeMeta.kind.toLowerCase(),
+              namespace: item.ObjectMeta.namespace,
+              name: item.ObjectMeta.name,
+              message: comment.Summary,
+              level: this.convertMessageLevel(check.Grade)
+            } as ResourceAlert;
+            if (!result[id]) {
+              result[id] = [] as ResourceAlert[];
+            }
+            result[id].push(alert);
+          });
+        }
+      });
+    });
+    this.report.alerts = result;
+  }
+  private convertMessageLevel(level: number): ResourceAlertLevel {
+    switch (level) {
+      case 10:
+        return ResourceAlertLevel.OK;
+      case 7:
+        return ResourceAlertLevel.Info;
+      case 5:
+        return ResourceAlertLevel.Warning;
+      case 1:
+        return ResourceAlertLevel.Error;
+      default:
+        return ResourceAlertLevel.Unknown;
+    }
+  }
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/popeye-report.helper.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/popeye-report.helper.ts
new file mode 100644
index 0000000000..12de4c61c1
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/popeye-report.helper.ts
@@ -0,0 +1,69 @@
+import { ResourceAlert, ResourceAlertLevel, ResourceAlertMap } from './analysis-report.types';
+
+export class PopeyeReportHelper {
+
+  constructor(public report: any) { }
+
+  // Map the report to the alert format
+  public map() {
+    if (!this.report.report || !this.report.report.popeye) {
+      return;
+    }
+
+    const popeye = this.report.report.popeye;
+    // Go through the report and re-map
+    const result = {} as ResourceAlertMap;
+    popeye.sanitizers.forEach(s => {
+      // We just care about issues
+      const resourceType = s.sanitizer;
+      if (s.issues) {
+        Object.keys(s.issues).forEach(resourcePath => {
+          const issues = s.issues[resourcePath];
+          issues.forEach(issue => {
+            // Level must be greater than 0 (OK)
+            if (issue.level > 0) {
+              let namespace;
+              let name;
+              if (resourcePath.indexOf('/') !== -1) {
+                // Has a namespace
+                namespace = resourcePath.split('/')[0];
+                name = resourcePath.split('/')[1];
+              } else {
+                name = resourcePath;
+                namespace = '';
+              }
+              const alert = {
+                kind: resourceType,
+                namespace,
+                name,
+                message: issue.message,
+                level: this.convertMessageLevel(issue.level)
+              } as ResourceAlert;
+              const id = `${resourceType}/${resourcePath}`;
+              if (!result[id]) {
+                result[id] = [] as ResourceAlert[];
+              }
+              result[id].push(alert);
+            }
+          });
+        });
+      }
+    });
+
+    this.report.alerts = result;
+  }
+  private convertMessageLevel(level: number): ResourceAlertLevel {
+    switch (level) {
+      case 0:
+        return ResourceAlertLevel.OK;
+      case 1:
+        return ResourceAlertLevel.Info;
+      case 2:
+        return ResourceAlertLevel.Warning;
+      case 3:
+        return ResourceAlertLevel.Error;
+      default:
+        return ResourceAlertLevel.Unknown;
+    }
+  }
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/route.helper.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/route.helper.ts
new file mode 100644
index 0000000000..ccbb8f7bc1
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/route.helper.ts
@@ -0,0 +1,11 @@
+import { ActivatedRoute } from '@angular/router';
+
+export function getParentURL(route: ActivatedRoute, removeLastParts = 1): string {
+  const reducer = (a: string, v) => {
+    const p = v.url.join('/');
+    return p.length > 0 ? `${a}/${p}` : a;
+  };
+  let res = route.snapshot.pathFromRoot.reduce(reducer, '').split('/');
+  res.splice(-removeLastParts, removeLastParts);
+  return res.join('/');
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/action-builders/kube.action-builders.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/action-builders/kube.action-builders.ts
index 58ad75827c..362c418497 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/action-builders/kube.action-builders.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/action-builders/kube.action-builders.ts
@@ -2,6 +2,13 @@ import {
   OrchestratedActionBuilders,
 } from '../../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import { GetHelmReleasePods, GetHelmReleaseServices } from '../../workloads/store/workloads.actions';
+import {
+  DeleteAnalysisReport,
+  GetAnalysisReportById,
+  GetAnalysisReports,
+  GetAnalysisReportsByPath,
+  RunAnalysisReport,
+} from '../anaylsis.actions';
 import {
   CreateKubernetesNamespace,
   GeKubernetesDeployments,
@@ -145,3 +152,35 @@ export interface KubeDashboardActionBuilders extends OrchestratedActionBuilders
 export const kubeDashboardActionBuilders: KubeDashboardActionBuilders = {
   get: (kubeGuid: string) => new GetKubernetesDashboard(kubeGuid)
 }
+
+export interface AnalysisReportsActionBuilders extends OrchestratedActionBuilders {
+  getMultiple: (
+    kubeGuid: string
+  ) => GetAnalysisReports;
+  getById: (
+    kubeGuid: string,
+    id: string,
+  ) => GetAnalysisReportById;
+  getByPath: (
+    kubeGuid: string,
+    path: string,
+  ) => GetAnalysisReportsByPath;
+  delete: (
+    kubeGuid: string,
+    id: string,
+  ) => DeleteAnalysisReport;
+  run: (
+    kubeGuid: string,
+    id: string,
+    namespace?: string,
+    app?: string
+  ) => RunAnalysisReport;
+}
+
+export const analysisReportsActionBuilders: AnalysisReportsActionBuilders = {
+  getMultiple: (kubeGuid: string) => new GetAnalysisReports(kubeGuid),
+  getById: (kubeGuid: string, id: string) => new GetAnalysisReportById(kubeGuid, id),
+  getByPath: (kubeGuid: string, path: string) => new GetAnalysisReportsByPath(kubeGuid, path),
+  delete: (kubeGuid: string, id: string) => new DeleteAnalysisReport(kubeGuid, id),
+  run: (kubeGuid: string, id: string, namespace?: string, app?: string) => new RunAnalysisReport(kubeGuid, id, namespace, app)
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/analysis.effects.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/analysis.effects.ts
new file mode 100644
index 0000000000..4f8a7d24c2
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/analysis.effects.ts
@@ -0,0 +1,264 @@
+import { HttpClient, HttpHeaders } 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 { environment } from '../../../../../core/src/environments/environment';
+import { AppState } from '../../../../../store/src/app-state';
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
+import { ApiRequestTypes } from '../../../../../store/src/reducers/api-request-reducer/request-helpers';
+import { NormalizedResponse } from '../../../../../store/src/types/api.types';
+import {
+  StartRequestAction,
+  WrapperRequestActionFailed,
+  WrapperRequestActionSuccess,
+} from '../../../../../store/src/types/request.types';
+import { KubeScoreReportHelper } from '../services/kubescore-report.helper';
+import { PopeyeReportHelper } from '../services/popeye-report.helper';
+import {
+  DELETE_ANALYSIS_REPORT_TYPES,
+  DeleteAnalysisReport,
+  GET_ANALYSIS_REPORT_BY_ID_TYPES,
+  GET_ANALYSIS_REPORTS_BY_PATH_TYPES,
+  GET_ANALYSIS_REPORTS_TYPES,
+  GetAnalysisReportById,
+  GetAnalysisReports,
+  GetAnalysisReportsByPath,
+  RUN_ANALYSIS_REPORT_TYPES,
+  RunAnalysisReport,
+} from './anaylsis.actions';
+import { AnalysisReport } from './kube.types';
+
+@Injectable()
+export class AnalysisEffects {
+  proxyAPIVersion = environment.proxyAPIVersion;
+
+  constructor(
+    private http: HttpClient,
+    private actions$: Actions,
+    private store: Store<AppState>,
+  ) { }
+
+  @Effect()
+  fetchAnalysisReports$ = this.actions$.pipe(
+    ofType<GetAnalysisReports>(GET_ANALYSIS_REPORTS_TYPES[0]),
+    flatMap(action => {
+      this.store.dispatch(new StartRequestAction(action));
+      const headers = new HttpHeaders({});
+      const requestArgs = {
+        headers
+      };
+      const url = `/pp/${this.proxyAPIVersion}/analysis/reports/${action.kubeGuid}`;
+      const entityKey = entityCatalog.getEntityKey(action);
+      return this.http.get(url, requestArgs).pipe(
+        mergeMap(response => {
+          const res: NormalizedResponse = {
+            entities: { [entityKey]: {} },
+            result: []
+          };
+          const items: any = response as Array<any>;
+          items.forEach(item => {
+            const id = item.id;
+            res.entities[entityKey][id] = item;
+            res.result.push(id);
+          });
+          return [new WrapperRequestActionSuccess(res, action)];
+        }),
+        catchError(error => [
+          new WrapperRequestActionFailed(error.message, action, 'fetch', {
+            endpointIds: [action.kubeGuid],
+            url: error.url || url,
+            eventCode: error.status ? error.status + '' : '500',
+            message: 'Kubernetes Analysis Report request error',
+            error
+          })
+        ])
+      );
+    })
+  );
+
+  @Effect()
+  fetchAnalysisReportById$ = this.actions$.pipe(
+    ofType<GetAnalysisReportById>(GET_ANALYSIS_REPORT_BY_ID_TYPES[0]),
+    flatMap(action => {
+      this.store.dispatch(new StartRequestAction(action));
+
+      const url = `/pp/${this.proxyAPIVersion}/analysis/reports/${action.kubeGuid}/${action.guid}`;
+      const headers = new HttpHeaders({});
+      const requestArgs = {
+        headers,
+      };
+      const entityKey = entityCatalog.getEntityKey(action);
+
+      return this.http.get(url, requestArgs).pipe(
+        mergeMap(response => {
+          this.processReport(response);
+
+          const res: NormalizedResponse = {
+            entities: {
+              [entityKey]: {
+                [action.guid]: response
+              }
+            },
+            result: [action.guid]
+          };
+          return [new WrapperRequestActionSuccess(res, action)];
+        }),
+        catchError(error => [
+          new WrapperRequestActionFailed(error.message, action, 'fetch', {
+            endpointIds: [action.kubeGuid],
+            url: error.url || url,
+            eventCode: error.status ? error.status + '' : '500',
+            message: 'Kubernetes Analysis Report request error',
+            error
+          })
+        ])
+      );
+    })
+  );
+
+  @Effect()
+  fetchAnalysisReportByPath$ = this.actions$.pipe(
+    ofType<GetAnalysisReportsByPath>(GET_ANALYSIS_REPORTS_BY_PATH_TYPES[0]),
+    flatMap(action => {
+      this.store.dispatch(new StartRequestAction(action));
+
+      const url = `/pp/${this.proxyAPIVersion}/analysis/completed/${action.kubeGuid}/${action.path}`;
+      const headers = new HttpHeaders({});
+      const requestArgs = {
+        headers,
+      };
+      const schema = action.entity[0];
+      const entityKey = entityCatalog.getEntityKey(action);
+      return this.http.get(url, requestArgs).pipe(
+        mergeMap((response: AnalysisReport[]) => {
+          const res: NormalizedResponse = {
+            entities: {
+              [entityKey]: {}
+            },
+            result: []
+          };
+          response.forEach(report => {
+            const guid = schema.getId(report);
+            res.entities[entityKey][guid] = report;
+            res.result.push(guid);
+          })
+          return [new WrapperRequestActionSuccess(res, action)];
+        }),
+        catchError(error => [
+          new WrapperRequestActionFailed(error.message, action, 'fetch', {
+            endpointIds: [action.kubeGuid],
+            url: error.url || url,
+            eventCode: error.status ? error.status + '' : '500',
+            message: 'Kubernetes Analysis Report request error',
+            error
+          })
+        ])
+      );
+    })
+  );
+
+  @Effect()
+  deleteAnalysisReport$ = this.actions$.pipe(
+    ofType<DeleteAnalysisReport>(DELETE_ANALYSIS_REPORT_TYPES[0]),
+    flatMap(action => {
+      const type: ApiRequestTypes = 'delete';
+
+      this.store.dispatch(new StartRequestAction(action, type));
+
+      const url = `/pp/${this.proxyAPIVersion}/analysis/reports`;
+      const headers = new HttpHeaders({});
+      const requestArgs = {
+        headers,
+        body: [action.guid]
+      };
+
+      return this.http.delete(url, requestArgs).pipe(
+        mergeMap(() => {
+          const res: NormalizedResponse = {
+            entities: { [entityCatalog.getEntityKey(action)]: {} },
+            result: []
+          };
+          return [new WrapperRequestActionSuccess(res, action, type)];
+        }),
+        catchError(error => [
+          new WrapperRequestActionFailed(error.message, action, type, {
+            endpointIds: [action.kubeGuid],
+            url: error.url || url,
+            eventCode: error.status ? error.status + '' : '500',
+            message: 'Kubernetes Analysis Report request error',
+            error
+          })
+        ])
+      );
+    })
+  );
+
+  @Effect()
+  runAnalysisReport$ = this.actions$.pipe(
+    ofType<RunAnalysisReport>(RUN_ANALYSIS_REPORT_TYPES[0]),
+    flatMap(action => {
+      const type: ApiRequestTypes = 'create';
+
+      this.store.dispatch(new StartRequestAction(action, type));
+
+      const { namespace, app } = action;
+      const body = {
+        namespace,
+        app,
+      };
+
+      // Start an Analysis
+      const url = `/pp/${this.proxyAPIVersion}/analysis/run/${action.guid}/${action.kubeGuid}`;
+      const headers = new HttpHeaders({});
+      const requestArgs = {
+        headers,
+      };
+
+      return this.http.post(url, body, requestArgs).pipe(
+        mergeMap((response: AnalysisReport) => {
+          const res: NormalizedResponse = {
+            entities: { [entityCatalog.getEntityKey(action)]: { [response.id]: response } },
+            result: [response.id]
+          };
+          return [new WrapperRequestActionSuccess(res, action, type)];
+        }),
+        catchError(error => [
+          new WrapperRequestActionFailed(error.message, action, type, {
+            endpointIds: [action.kubeGuid],
+            url: error.url || url,
+            eventCode: error.status ? error.status + '' : '500',
+            message: 'Kubernetes Analysis Report request error',
+            error
+          })
+        ])
+      );
+
+    })
+  );
+
+
+  private processReport(report: any) {
+    // Check the path of the report
+    if (report.path.split('/').length !== 2) {
+      return;
+    }
+
+    switch (report.format) {
+      case 'popeye':
+        const helper = new PopeyeReportHelper(report);
+        helper.map();
+        break;
+      case 'kubescore':
+        const kubeScoreHelper = new KubeScoreReportHelper(report);
+        kubeScoreHelper.map();
+        break;
+      default:
+        console.warn('Do not know how to handle this report type: ', report.format);
+        break;
+    }
+  }
+
+
+}
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/anaylsis.actions.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/anaylsis.actions.ts
new file mode 100644
index 0000000000..e9da8d7a27
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/anaylsis.actions.ts
@@ -0,0 +1,69 @@
+import { getActions } from '../../../../../store/src/actions/action.helper';
+import { PaginatedAction } from '../../../../../store/src/types/pagination.types';
+import { analysisReportEntityType, KUBERNETES_ENDPOINT_TYPE, kubernetesEntityFactory } from '../kubernetes-entity-factory';
+import { KubeAction, KubePaginationAction, KubeSingleEntityAction } from './kubernetes.actions';
+
+export const GET_ANALYSIS_REPORTS_TYPES = getActions('ANALYSIS', 'Get reports');
+export const GET_ANALYSIS_REPORT_BY_ID_TYPES = getActions('ANALYSIS', 'Get report by id');
+export const GET_ANALYSIS_REPORTS_BY_PATH_TYPES = getActions('ANALYSIS', 'Get report by path');
+export const DELETE_ANALYSIS_REPORT_TYPES = getActions('ANALYSIS', 'Delete report');
+export const RUN_ANALYSIS_REPORT_TYPES = getActions('ANALYSIS', 'Run');
+
+abstract class AnalysisAction implements KubeAction {
+  constructor(public kubeGuid: string, public actions: string[]) {
+    this.type = this.actions[0];
+  }
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
+  entityType = analysisReportEntityType;
+  entity = [kubernetesEntityFactory(analysisReportEntityType)];
+  type: string;
+}
+abstract class AnalysisPaginationAction extends AnalysisAction implements KubePaginationAction, PaginatedAction {
+  flattenPagination = true;
+  constructor(kubeGuid: string, actionTypes: string[], public paginationKey: string) {
+    super(kubeGuid, actionTypes);
+  }
+}
+abstract class AnalysisSingleEntityAction extends AnalysisAction implements KubeSingleEntityAction {
+  constructor(kubeGuid: string, actionTypes: string[], public guid: string) {
+    super(kubeGuid, actionTypes);
+  }
+}
+
+
+/** 
+ * Get the analysis reports for the given endpoint ID
+ */
+export class GetAnalysisReports extends AnalysisPaginationAction {
+  constructor(public kubeGuid: string) {
+    super(kubeGuid, GET_ANALYSIS_REPORTS_TYPES, kubeGuid)
+  }
+  initialParams = {
+    'order-direction': 'asc',
+    'order-direction-field': 'age',
+  };
+}
+
+export class GetAnalysisReportById extends AnalysisSingleEntityAction {
+  constructor(kubeGuid: string, id: string) {
+    super(kubeGuid, GET_ANALYSIS_REPORT_BY_ID_TYPES, id);
+  }
+}
+
+export class GetAnalysisReportsByPath extends AnalysisPaginationAction {
+  constructor(kubeGuid: string, public path: string) {
+    super(kubeGuid, GET_ANALYSIS_REPORTS_BY_PATH_TYPES, path);
+  }
+}
+
+export class DeleteAnalysisReport extends AnalysisSingleEntityAction {
+  constructor(kubeGuid: string, id: string) {
+    super(kubeGuid, DELETE_ANALYSIS_REPORT_TYPES, id);
+  }
+}
+
+export class RunAnalysisReport extends AnalysisSingleEntityAction {
+  constructor(kubeGuid: string, id: string, public namespace?: string, public app?: string) {
+    super(kubeGuid, RUN_ANALYSIS_REPORT_TYPES, id);
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.getIds.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.getIds.ts
index f08ff16fb3..898062b926 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.getIds.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.getIds.ts
@@ -14,7 +14,7 @@ const deliminate = (...args: string[]) => args.join('_:_');
 
 const debugMissingKubeId = (entity: BasicKubeAPIResource, func: (...args: string[]) => string, ...args: string[]) => {
   if (!environment.production && (!entity.metadata || !entity.metadata.kubeId)) {
-    console.log(`Kube entity does not have a kubeId, this is probably a bug: `, entity);
+    console.warn(`Kube entity does not have a kubeId, this is probably a bug: `, entity);
   }
   return func(...args);
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.types.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.types.ts
index b6b2721e86..3a4a5e60b9 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.types.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.types.ts
@@ -484,3 +484,30 @@ export interface HostPath {
 export interface Item {
   key: string;
 }
+
+export interface KubeStatus {
+  kind: string;
+  apiVersion: string;
+  metadata: Metadata;
+  status: string;
+  message: string;
+  reason: string;
+  details: {}
+  code: number
+}
+
+// Analysis Reports
+
+export interface AnalysisReport {
+  id: string;
+  endpoint: string;
+  type: string;
+  name: string;
+  path: string;
+  created: Date;
+  read: boolean;
+  status: string;
+  duration: number;
+  report?: any;
+  title?: string;
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kubernetes.actions.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kubernetes.actions.ts
index cec88d6f34..b35b07a92b 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kubernetes.actions.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kubernetes.actions.ts
@@ -81,7 +81,6 @@ export const GET_KUBE_DASHBOARD = '[KUBERNETES Endpoint] Get K8S Dashboard Info'
 export const GET_KUBE_DASHBOARD_SUCCESS = '[KUBERNETES Endpoint] Get Dashboard Success';
 export const GET_KUBE_DASHBOARD_FAILURE = '[KUBERNETES Endpoint] Get Dashboard Failure';
 
-
 const defaultSortParams = {
   'order-direction': 'desc' as SortDirection,
   'order-direction-field': 'name'
@@ -371,5 +370,3 @@ export class FetchKubernetesChartMetricsAction extends MetricsChartAction {
     );
   }
 }
-
-
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kubernetes.effects.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kubernetes.effects.ts
index 5f47b4a890..e839283471 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kubernetes.effects.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kubernetes.effects.ts
@@ -127,7 +127,7 @@ export class KubernetesEffects {
             endpointIds: [action.kubeGuid],
             url: error.url || url,
             eventCode: error.status ? error.status + '' : '500',
-            message: 'Kubernetes API request error',
+            message: 'Kubernetes Dashboard request error',
             error
           })
         ]));
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.html
new file mode 100644
index 0000000000..a695a022d0
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.html
@@ -0,0 +1,4 @@
+<div class="info__card">
+  <div class="info__card-icon" *ngIf="analyzer.iconUrl"><img [width]="analyzer.iconWidth" [src]="analyzer.iconUrl" /></div>
+  <div class="info__card-text" [innerHTML]="content$ | async" class="markdown-body"></div>
+</div>
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.scss
new file mode 100644
index 0000000000..0f224e7f96
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.scss
@@ -0,0 +1,21 @@
+.info {
+
+  &__card {
+    display: flex;
+  }
+
+  &__card-icon {
+    flex: 0 0 140px;
+    width: 140px;
+    &>img {
+      max-width: 120px;
+    }
+    margin-right: 10px;
+    text-align: center;
+  }
+
+  &__card-text {
+    flex: 1;
+  }
+
+}
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.spec.ts
new file mode 100644
index 0000000000..88894b763d
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.spec.ts
@@ -0,0 +1,29 @@
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AnalysisInfoCardComponent } from './analysis-info-card.component';
+
+describe('AnalysisInfoCardComponent', () => {
+  let component: AnalysisInfoCardComponent;
+  let fixture: ComponentFixture<AnalysisInfoCardComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AnalysisInfoCardComponent ],
+      imports: [
+        HttpClientTestingModule,
+      ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AnalysisInfoCardComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.theme.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.theme.scss
new file mode 100644
index 0000000000..06983eb900
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.theme.scss
@@ -0,0 +1,21 @@
+
+@mixin kube-analysis-card-theme($theme, $app-theme) {
+
+  .info__card {
+
+    P {
+      font-size: 14px;
+      line-height: 1.24em;
+    }
+
+    h2 {
+      font-size: 18px;
+      padding: 0;
+    }
+
+    h2 {
+      font-size: 16px;
+      padding: 0;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.ts
new file mode 100644
index 0000000000..56fcba9997
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.ts
@@ -0,0 +1,55 @@
+import { HttpClient } from '@angular/common/http';
+import { Component, Input } from '@angular/core';
+import * as markdown from 'marked';
+import { Observable, of } from 'rxjs';
+import { catchError, map } from 'rxjs/operators';
+
+@Component({
+  selector: 'app-analysis-info-card',
+  templateUrl: './analysis-info-card.component.html',
+  styleUrls: ['./analysis-info-card.component.scss']
+})
+export class AnalysisInfoCardComponent {
+
+  public loading = true;
+  public content$: Observable<string>;
+  private renderer = new markdown.Renderer();
+
+  public mAanalyzer = {};
+
+  @Input() set analyzer(analyzer: any) {
+    if (analyzer && analyzer.descriptionUrl) {
+      this.content$ = this.getDescription(analyzer.descriptionUrl);
+    }
+    this.mAanalyzer = analyzer;
+  }
+
+  get analyzer() {
+    return this.mAanalyzer;
+  }
+
+  constructor(private http: HttpClient) {
+    this.renderer.link = (href, title, text) => `<a target="_blank" title="${title || ''}" href="${href}">${text}</a>`;
+    this.renderer.code = (text: string) => `<code>${text}</code>`;
+  }
+
+  private getDescription(url): Observable<any> {
+    return this.http.get(url, { responseType: 'text' }).pipe(
+      map(resp => {
+        this.loading = false;
+        return markdown(resp, {
+          renderer: this.renderer
+        });
+      }),
+      catchError((error) => {
+        this.loading = false;
+        if (error.status === 404) {
+          return of('<h1>Unable to load description for this Analyzer</h1>');
+        } else {
+          return of('<h1>An error occurred retrieving description for this Analyzer</h1>');
+        }
+      }
+      ));
+  }
+
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.html
new file mode 100644
index 0000000000..b88ffd84a2
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.html
@@ -0,0 +1,7 @@
+<app-sidepanel-preview title="Analyzers">
+  <div *ngIf="analyzers$ | async as analyzers">
+    <div *ngFor="let a of analyzers">
+      <app-analysis-info-card [analyzer]="a"></app-analysis-info-card>
+    </div>
+  </div>
+</app-sidepanel-preview>
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.scss
new file mode 100644
index 0000000000..53951f99ae
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.scss
@@ -0,0 +1,5 @@
+.info__title {
+  padding: 0;
+  margin: 0 0 30px 0;
+  font-size: 22px;
+}
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.spec.ts
new file mode 100644
index 0000000000..0a35b86689
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.spec.ts
@@ -0,0 +1,38 @@
+
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { KubernetesAnalysisInfoComponent } from './kubernetes-analysis-info.component';
+import { AnalysisInfoCardComponent } from './analysis-info-card/analysis-info-card.component';
+import { KubernetesBaseTestModules, KubeBaseGuidMock } from '../../../kubernetes.testing.module';
+import { KubernetesAnalysisService } from '../../../services/kubernetes.analysis.service';
+import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
+
+describe('KubernetesAnalysisInfoComponent', () => {
+  let component: KubernetesAnalysisInfoComponent;
+  let fixture: ComponentFixture<KubernetesAnalysisInfoComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ KubernetesAnalysisInfoComponent, AnalysisInfoCardComponent ],
+      imports: [
+        KubernetesBaseTestModules,
+      ],
+      providers: [
+        KubernetesAnalysisService,
+        KubernetesEndpointService,
+        KubeBaseGuidMock,
+      ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubernetesAnalysisInfoComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.ts
new file mode 100644
index 0000000000..76cce96ccc
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.ts
@@ -0,0 +1,23 @@
+import { Component } from '@angular/core';
+import { PreviewableComponent } from 'frontend/packages/core/src/shared/previewable-component';
+import { Observable } from 'rxjs';
+
+import { KubernetesAnalysisService } from '../../../services/kubernetes.analysis.service';
+
+
+@Component({
+  selector: 'app-kubernetes-analysis-info',
+  templateUrl: './kubernetes-analysis-info.component.html',
+  styleUrls: ['./kubernetes-analysis-info.component.scss'],
+  providers: [
+    KubernetesAnalysisService
+  ]
+})
+export class KubernetesAnalysisInfoComponent implements PreviewableComponent {
+
+  analyzers$: Observable<any>;
+
+  setProps(props: { [key: string]: any; }) {
+    this.analyzers$ = props.analyzers$;
+  }
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.html
new file mode 100644
index 0000000000..25926fc569
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.html
@@ -0,0 +1,7 @@
+<app-page-sub-nav [breadcrumbs]="breadcrumbs$ | async"></app-page-sub-nav>
+
+<app-loading-page [isLoading]="isLoading$" text="Loading Analysis Report">
+  <app-no-content-message *ngIf="errorMsg$ | async as message" icon="warning" [hidden]="!message" [firstLine]="message.firstLine" [secondLine]="message.secondLine">
+  </app-no-content-message>
+  <app-analysis-report-viewer [report]="report$ | async"></app-analysis-report-viewer>
+</app-loading-page>
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.scss
new file mode 100644
index 0000000000..f70ee0c2c3
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.scss
@@ -0,0 +1,43 @@
+.report {
+  &__report-header {
+    align-items: center;
+    display: flex;
+    margin-bottom: 8px;
+  }
+  &__header {
+    align-items: center;
+    display: flex;
+  }
+  &__title {
+    flex: 1;
+  }
+  &__stat {
+    display: flex;
+    flex-direction: column;
+    padding: 5px 12px;
+    &>div:first-child {
+      opacity: 0.8;
+    }
+  }
+  &__score {
+    flex: 0;
+    font-size: 20px;
+  }
+  &__grade {
+    flex: 0;
+    font-size: 20px;
+  }
+  &__table {
+    margin-left: 20px;
+  }
+  &__issue {
+    align-items: center;
+    display: flex;
+  }
+  &__icon {
+    padding-right: 4px;
+  }
+  &__table-name {
+    vertical-align: top;
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.spec.ts
new file mode 100644
index 0000000000..f1f2d4fd8c
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.spec.ts
@@ -0,0 +1,32 @@
+
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { KubernetesAnalysisReportComponent } from './kubernetes-analysis-report.component';
+import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
+import { AnalysisReportViewerComponent } from './../../../analysis-report-viewer/analysis-report-viewer.component';
+
+describe('KubernetesAnalysisReportComponent', () => {
+  let component: KubernetesAnalysisReportComponent;
+  let fixture: ComponentFixture<KubernetesAnalysisReportComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ KubernetesAnalysisReportComponent, AnalysisReportViewerComponent ],
+      imports: [
+        KubernetesBaseTestModules,
+//        MDAppModule
+      ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubernetesAnalysisReportComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.theme.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.theme.scss
new file mode 100644
index 0000000000..4ea5002e16
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.theme.scss
@@ -0,0 +1,13 @@
+
+@mixin kube-analysis-report-theme($theme, $app-theme) {
+  $backgrounds: map-get($theme, background);
+  $background: mat-color($backgrounds, card);
+  $background-color:  map-get($app-theme, app-background-color);
+  $darker-background-color:  darken($background-color, 4%);
+  .report__header {
+    background-color: $darker-background-color;
+    border-top: 1px solid #ddd;
+    border-bottom: 1px solid #ddd;
+    padding-left: 10px;
+  }
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.ts
new file mode 100644
index 0000000000..4ca7a3fc19
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.ts
@@ -0,0 +1,80 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { IHeaderBreadcrumbLink } from 'frontend/packages/core/src/shared/components/page-header/page-header.types';
+import { BehaviorSubject, Observable, of, Subject } from 'rxjs';
+import { catchError, first, map, startWith } from 'rxjs/operators';
+
+import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
+import { KubernetesAnalysisService } from '../../../services/kubernetes.analysis.service';
+import { getParentURL } from '../../../services/route.helper';
+
+@Component({
+  selector: 'app-kubernetes-analysis-report',
+  templateUrl: './kubernetes-analysis-report.component.html',
+  styleUrls: ['./kubernetes-analysis-report.component.scss']
+})
+export class KubernetesAnalysisReportComponent implements OnInit {
+
+  report$: Observable<any>;
+  private errorMsg = new Subject<any>();
+  errorMsg$ = this.errorMsg.pipe(startWith(''));
+  isLoading$: Observable<boolean>;
+
+  endpointID: string;
+  id: string;
+
+  private breadcrumbsSubject: BehaviorSubject<IHeaderBreadcrumbLink[]>;
+  public breadcrumbs$: Observable<IHeaderBreadcrumbLink[]>;
+
+  constructor(
+    private analysisService: KubernetesAnalysisService,
+    private route: ActivatedRoute,
+    private kubeEndpointService: KubernetesEndpointService,
+  ) {
+    this.id = route.snapshot.params.id;
+
+    this.breadcrumbsSubject = new BehaviorSubject<IHeaderBreadcrumbLink[]>(undefined);
+    this.breadcrumbs$ = this.breadcrumbsSubject.asObservable();
+    this.breadcrumbsSubject.next([
+      { value: 'Analysis', routerLink: getParentURL(route, 2) },
+      { value: 'Report' },
+    ]);
+  }
+
+  ngOnInit() {
+    this.report$ = this.analysisService.getByID(this.kubeEndpointService.baseKube.guid, this.id).pipe(
+      map((response: any) => {
+        if (!response.type) {
+          this.error();
+          return false;
+        }
+        this.errorMsg.next('');
+        return response;
+      }),
+      catchError((e, c) => {
+        this.error();
+        return of(false);
+      })
+    );
+
+    this.isLoading$ = this.report$.pipe(
+      map(() => false),
+      startWith(true)
+    );
+
+    // When the report has loaded, update the name in the breadcrumbs
+    this.report$.pipe(first()).subscribe(report => {
+      this.breadcrumbsSubject.next([
+        { value: 'Analysis', routerLink: getParentURL(this.route, 2) },
+        { value: report.name },
+      ]);
+    });
+  }
+
+  error() {
+    const msg = { firstLine: 'Failed to load Analysis Report' };
+    this.errorMsg.next(msg);
+  }
+}
+
+
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.html
new file mode 100644
index 0000000000..42ebd5c5d8
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.html
@@ -0,0 +1,5 @@
+<app-page-sub-nav>
+  <app-analysis-report-runner [kubeId]="kubeEndpointService.kubeGuid"></app-analysis-report-runner>
+</app-page-sub-nav>
+
+<app-list></app-list>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.spec.ts
new file mode 100644
index 0000000000..b13da9b832
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.spec.ts
@@ -0,0 +1,42 @@
+
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { MDAppModule } from './../../../../core/md.module';
+
+import { KubernetesAnalysisTabComponent } from './kubernetes-analysis-tab.component';
+import { KubernetesBaseTestModules, KubeBaseGuidMock } from '../../kubernetes.testing.module';
+import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
+import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
+import { AnalysisReportViewerComponent } from './../../analysis-report-viewer/analysis-report-viewer.component';
+import { TabNavService } from 'frontend/packages/core/tab-nav.service';
+
+describe('KubernetesAnalysisTabComponent', () => {
+  let component: KubernetesAnalysisTabComponent;
+  let fixture: ComponentFixture<KubernetesAnalysisTabComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ KubernetesAnalysisTabComponent, AnalysisReportViewerComponent ],
+      imports: [
+        KubernetesBaseTestModules,
+        MDAppModule
+      ],
+      providers: [
+        KubernetesAnalysisService,
+        KubernetesEndpointService,
+        KubeBaseGuidMock,
+        TabNavService,
+      ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(KubernetesAnalysisTabComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.ts
new file mode 100644
index 0000000000..f0db6bbd91
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.ts
@@ -0,0 +1,24 @@
+import { Component } from '@angular/core';
+import { ListConfig } from 'frontend/packages/core/src/shared/components/list/list.component.types';
+
+import { AnalysisReportsListConfig } from '../../list-types/analysis-reports-list-config.service';
+import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
+import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
+
+@Component({
+  selector: 'app-kubernetes-analysis-tab',
+  templateUrl: './kubernetes-analysis-tab.component.html',
+  styleUrls: ['./kubernetes-analysis-tab.component.scss'],
+  providers: [
+    KubernetesAnalysisService,
+    {
+      provide: ListConfig,
+      useClass: AnalysisReportsListConfig,
+    }
+  ]
+})
+export class KubernetesAnalysisTabComponent {
+
+  constructor(public kubeEndpointService: KubernetesEndpointService) { }
+
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts
index 4777afe99b..96996ee411 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts
@@ -1,8 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { TabNavService } from 'frontend/packages/core/tab-nav.service';
 
-import { HelmReleaseProviders, KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
+import { HelmReleaseProviders, KubernetesBaseTestModules, KubeBaseGuidMock } from '../../../kubernetes.testing.module';
 import { HelmReleaseTabBaseComponent } from './helm-release-tab-base.component';
+import { KubernetesAnalysisService } from '../../../services/kubernetes.analysis.service';
+import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
 
 
 describe('HelmReleaseTabBaseComponent', () => {
@@ -15,7 +17,10 @@ describe('HelmReleaseTabBaseComponent', () => {
       declarations: [HelmReleaseTabBaseComponent],
       providers: [
         ...HelmReleaseProviders,
-        TabNavService
+        TabNavService,
+        KubernetesAnalysisService,
+        KubernetesEndpointService,
+        KubeBaseGuidMock,
       ]
     })
       .compileComponents();
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
index 9a838e889f..b84d708c7c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
@@ -7,12 +7,14 @@ import { catchError, map, share, switchMap } from 'rxjs/operators';
 
 import { LoggerService } from '../../../../../../../core/src/core/logger.service';
 import { IPageSideNavTab } from '../../../../../../../core/src/features/dashboard/page-side-nav/page-side-nav.component';
+import { SessionService } from '../../../../../../../core/src/shared/services/session.service';
 import { SnackBarService } from '../../../../../../../core/src/shared/services/snackbar.service';
 import { AppState } from '../../../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
 import { EntityRequestAction, WrapperRequestActionSuccess } from '../../../../../../../store/src/types/request.types';
 import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog';
 import { KubernetesPodExpandedStatusHelper } from '../../../services/kubernetes-expanded-state';
+import { KubernetesAnalysisService } from '../../../services/kubernetes.analysis.service';
 import { KubernetesPod, KubeService } from '../../../store/kube.types';
 import { KubePaginationAction } from '../../../store/kubernetes.actions';
 import { HelmReleaseGraph, HelmReleaseGuid, HelmReleasePod, HelmReleaseService } from '../../workload.types';
@@ -26,6 +28,7 @@ import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service';
   styleUrls: ['./helm-release-tab-base.component.scss'],
   providers: [
     HelmReleaseHelperService,
+    KubernetesAnalysisService,
     {
       provide: HelmReleaseGuid,
       useFactory: (activatedRoute: ActivatedRoute) => ({
@@ -43,8 +46,6 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
 
   private sub: Subscription;
 
-  // private connection: Connection;
-
   public breadcrumbs = [{
     breadcrumbs: [
       { value: 'Workloads', routerLink: '/workloads' }
@@ -53,23 +54,28 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
 
   public title = '';
 
-  tabLinks: IPageSideNavTab[] = [
-    { link: 'summary', label: 'Summary', icon: 'helm', iconFont: 'stratos-icons' },
-    { link: 'notes', label: 'Notes', icon: 'subject' },
-    { link: 'values', label: 'Values', icon: 'list' },
-    { link: '-', label: 'Resources' },
-    // { link: 'graph', label: 'Overview', icon: 'share' },
-    { link: 'pods', label: 'Pods', icon: 'pod', iconFont: 'stratos-icons'  },
-    { link: 'services', label: 'Services', icon: 'service', iconFont: 'stratos-icons' }
-  ];
+  tabLinks: IPageSideNavTab[];
+
   constructor(
     public helmReleaseHelper: HelmReleaseHelperService,
     private store: Store<AppState>,
     private logService: LoggerService,
-    private snackbarService: SnackBarService
+    private analysisService: KubernetesAnalysisService,
+    private snackbarService: SnackBarService,
+    sessionService: SessionService
   ) {
     this.title = this.helmReleaseHelper.releaseTitle;
 
+    this.tabLinks = [
+      { link: 'summary', label: 'Summary', icon: 'helm', iconFont: 'stratos-icons' },
+      { link: 'notes', label: 'Notes', icon: 'subject' },
+      { link: 'values', label: 'Values', icon: 'list' },
+      { link: 'analysis', label: 'Analysis', icon: 'assignment', hidden$: this.analysisService.hideAnalysis$ },
+      { link: '-', label: 'Resources' },
+      { link: 'graph', label: 'Overview', icon: 'share', hidden$: sessionService.isTechPreview().pipe(map(tp => !tp)) },
+      { link: 'pods', label: 'Pods', icon: 'pod', iconFont: 'stratos-icons' },
+      { link: 'services', label: 'Services', icon: 'service', iconFont: 'stratos-icons' }
+    ];
 
     const releaseRef = this.helmReleaseHelper.guidAsUrlFragment();
     const host = window.location.host;
@@ -132,21 +138,23 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
             const releaseServicesAction = kubeEntityCatalog.service.actions.getInWorkload(
               this.helmReleaseHelper.releaseTitle,
               this.helmReleaseHelper.endpointGuid,
-            )
+            );
             this.populateList(releaseServicesAction, svcs);
           }
 
-          const resources = { ...manifest };
-          resources.endpointId = this.helmReleaseHelper.endpointGuid;
-          resources.releaseTitle = this.helmReleaseHelper.releaseTitle;
+          // const resources = { ...manifest };
+          // kind === 'Resources' is an array, really they should go into a pagination section
+          messageObj.endpointId = this.helmReleaseHelper.endpointGuid;
+          messageObj.releaseTitle = this.helmReleaseHelper.releaseTitle;
+
           const releaseResourceAction = workloadsEntityCatalog.resource.actions.get(
-            resources.releaseTitle,
-            resources.endpointId,
+            this.helmReleaseHelper.releaseTitle,
+            this.helmReleaseHelper.endpointGuid,
           );
-          this.addResource(releaseResourceAction, resources);
+          this.addResource(releaseResourceAction, messageObj);
         } else if (messageObj.kind === 'ManifestErrors') {
           if (messageObj.data) {
-            this.snackbarService.show('Errors were found when parsing this workload. Not all resources may be shown', 'Dismiss')
+            this.snackbarService.show('Errors were found when parsing this workload. Not all resources may be shown', 'Dismiss');
           }
         }
       }
@@ -181,7 +189,7 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
       newResource.metadata.kubeId = action.kubeGuid;
       // The service entity from manifest is missing this, but apply here to ensure any others are caught
       newResource.metadata.namespace = this.helmReleaseHelper.namespace;
-      const entityId = action.entity[0].getId(resource)
+      const entityId = action.entity[0].getId(resource);
       newResources[entityId] = newResource;
     });
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/icon-helper.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/icon-helper.ts
new file mode 100644
index 0000000000..ea2d9e6df0
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/icon-helper.ts
@@ -0,0 +1,77 @@
+export function getIcon(kind: string) {
+  const rkind = kind || 'Pod';
+  if (iconMappings[rkind]) {
+    return iconMappings[rkind];
+  } else {
+    return iconMappings.default;
+  }
+}
+  
+const iconMappings = {
+  Namespace: {
+    name: 'namespace',
+    font: 'stratos-icons'
+  },
+  Container: {
+    name: 'container',
+    font: 'stratos-icons'
+  },
+  ClusterRole: {
+    name: 'cluster_role',
+    font: 'stratos-icons'
+  },
+  ClusterRoleBinding: {
+    name: 'cluster_role_binding',
+    font: 'stratos-icons'
+  },
+  Deployment: {
+    name: 'deployment',
+    font: 'stratos-icons'
+  },
+  ReplicaSet: {
+    name: 'replica_set',
+    font: 'stratos-icons'
+  },
+  Pod: {
+    name: 'pod',
+    font: 'stratos-icons'
+  },
+  Service: {
+    name: 'service',
+    font: 'stratos-icons'
+  },
+  Role: {
+    name: 'assignment_ind',
+    font: 'Material Icons',
+    fontSet: 'material-icons'
+  },
+  RoleBinding: {
+    name: 'role_binding',
+    font: 'stratos-icons'
+  },
+  StatefulSet: {
+    name: 'stateful_set',
+    font: 'stratos-icons'
+  },
+  Ingress: {
+    name: 'ingress',
+    font: 'stratos-icons'
+  },
+  ConfigMap: {
+    name: 'config_map',
+    font: 'stratos-icons'
+  },
+  Secret: {
+    name: 'config_map',
+    font: 'stratos-icons'
+  },
+  ServiceAccount: {
+    name: 'lock',
+    font: 'Material Icons',
+    fontSet: 'material-icons'
+  },
+  default: {
+    name: 'collocation',
+    font: 'stratos-icons'
+  }
+};
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.html
new file mode 100644
index 0000000000..15301e10ff
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.html
@@ -0,0 +1,12 @@
+<app-page-sub-nav>
+  <app-analysis-report-runner [kubeId]="helmReleaseHelper.endpointGuid" [namespace]="helmReleaseHelper.namespace"
+    [app]="helmReleaseHelper.releaseTitle">
+  </app-analysis-report-runner>
+  <app-analysis-report-selector prompt="Report" [allowNone]="false" (selected)="analysisChanged($event)"
+    [autoSelect]="true" [endpoint]="helmReleaseHelper.endpointGuid" (reportCount)="onReportCount($event)" [path]="path">
+  </app-analysis-report-selector>
+</app-page-sub-nav>
+
+<app-analysis-report-viewer [report]="report$ | async"></app-analysis-report-viewer>
+<app-no-content-message *ngIf="noReportsAvailable" icon="assignment" [hidden]="false" firstLine="No reports available">
+</app-no-content-message>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.spec.ts
new file mode 100644
index 0000000000..a2c29af062
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.spec.ts
@@ -0,0 +1,42 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HelmReleaseAnalysisTabComponent } from './helm-release-analysis-tab.component';
+import { AnalysisReportSelectorComponent } from './../../../../analysis-report-viewer/analysis-report-selector/analysis-report-selector.component';
+import { KubernetesBaseTestModules, KubeBaseGuidMock } from '../../../../kubernetes.testing.module';
+import { KubernetesAnalysisService } from '../../../../services/kubernetes.analysis.service';
+import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service';
+import { AnalysisReportViewerComponent } from '../../../../analysis-report-viewer/analysis-report-viewer.component';
+import { HelmReleaseProviders } from '../../../../kubernetes.testing.module';
+import { TabNavService } from 'frontend/packages/core/tab-nav.service';
+
+describe('HelmReleaseAnalysisTabComponent', () => {
+  let component: HelmReleaseAnalysisTabComponent;
+  let fixture: ComponentFixture<HelmReleaseAnalysisTabComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ HelmReleaseAnalysisTabComponent, AnalysisReportSelectorComponent, AnalysisReportViewerComponent],
+      imports: [
+        KubernetesBaseTestModules,
+      ],
+      providers: [
+        KubernetesAnalysisService,
+        KubernetesEndpointService,
+        KubeBaseGuidMock,
+        HelmReleaseProviders,
+        TabNavService
+      ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(HelmReleaseAnalysisTabComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.ts
new file mode 100644
index 0000000000..beb9436e4c
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.ts
@@ -0,0 +1,42 @@
+import { Component } from '@angular/core';
+import { Subject } from 'rxjs';
+
+import { KubernetesAnalysisService } from '../../../../services/kubernetes.analysis.service';
+import { AnalysisReport } from '../../../../store/kube.types';
+import { HelmReleaseHelperService } from '../helm-release-helper.service';
+
+@Component({
+  selector: 'app-helm-release-analysis-tab',
+  templateUrl: './helm-release-analysis-tab.component.html',
+  styleUrls: ['./helm-release-analysis-tab.component.scss']
+})
+export class HelmReleaseAnalysisTabComponent {
+
+  public report$ = new Subject<AnalysisReport>();
+
+  path: string;
+
+  currentReport = null;
+
+  noReportsAvailable = false;
+
+  constructor(
+    public analaysisService: KubernetesAnalysisService,
+    public helmReleaseHelper: HelmReleaseHelperService
+  ) {
+    this.path = `${this.helmReleaseHelper.namespace}/${this.helmReleaseHelper.releaseTitle}`;
+   }
+
+  public analysisChanged(report) {
+    if (report.id !== this.currentReport) {
+      this.currentReport = report.id;
+      this.analaysisService.getByID(this.helmReleaseHelper.endpointGuid, report.id).subscribe(r => this.report$.next(r));
+    }
+  }
+
+
+  public onReportCount(count: number) {
+    this.noReportsAvailable = count === 0;
+  }  
+
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
index a7dd8aaa99..13b0507c23 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
@@ -10,7 +10,7 @@ import {
   HelmReleaseChartData,
   HelmReleaseGraph,
   HelmReleaseGuid,
-  HelmReleaseResource,
+  HelmReleaseResources,
 } from '../../workload.types';
 import { workloadsEntityCatalog } from '../../workloads-entity-catalog';
 
@@ -69,7 +69,7 @@ export class HelmReleaseHelperService {
     );
   }
 
-  public fetchReleaseResources(): Observable<HelmReleaseResource> {
+  public fetchReleaseResources(): Observable<HelmReleaseResources> {
     // Get helm release
     const action = workloadsEntityCatalog.resource.actions.get(this.releaseTitle, this.endpointGuid)
     return workloadsEntityCatalog.resource.store.getEntityMonitor(
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
index 6dd8d86bda..1070d1925c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
@@ -3,23 +3,52 @@
     <mat-icon>all_out</mat-icon>
     <span>Fit</span>
   </button>
-  <button mat-button name="toggle" (click)="toggleLayout()" matTooltip="Toggle Layout">
-    <mat-icon>view_quilt</mat-icon>
-    <span>Toggle Layout</span>
-  </button>
+
+  <app-analysis-report-runner *ngIf="analyzerService.enabled$ | async" [kubeId]="helper.endpointGuid"
+    [namespace]="helper.namespace" [app]="helper.releaseTitle">
+  </app-analysis-report-runner>
+
+  <app-analysis-report-selector *ngIf="analyzerService.enabled$ | async" (selected)="analysisChanged($event)"
+    [endpoint]="helper.endpointGuid" [path]="path"></app-analysis-report-selector>
 </app-page-sub-nav>
 
-<ngx-graph *ngIf="nodes && nodes.length" class="chart-container" [links]="links" [nodes]="nodes" [update$]="update$"
-  [zoomToFit$]="fit$" [layout]="layout">
+<ngx-graph *ngIf="nodes && nodes.length" class="chart-container" [draggingEnabled]="false" [links]="links"
+  [nodes]="nodes" [update$]="update$" [zoomToFit$]="fit$" [layout]="layout">
   <ng-template #nodeTemplate let-node>
     <svg:g class="node" (click)="onNodeClick(node)">
-      <svg:rect [attr.width]="node.dimension.width" [attr.height]="node.dimension.height" [attr.fill]="node.data.fill"
-        class="node"></svg:rect>
-      />
-      <svg:text class="no-style" alignment-baseline="central" [attr.fill]="node.data.text" [attr.x]="10"
+      <svg:rect rx="4" ry="4" [attr.width]="node.dimension.width" [attr.height]="node.dimension.height"
+        [attr.fill]="node.data.fill" class="node"></svg:rect>
+
+      <svg:text alignment-baseline="top">
+        <svg:tspan [attr.fill]="node.data.text" x="10" dy="1.2em" font-size="32px"
+          [attr.font-family]="node.data.icon.font">{{ node.data.icon.name }}</svg:tspan>
+        <svg:tspan [attr.fill]="node.data.text" x="52" dy="-1.2em" style="font-weight: bold">{{node.label}}</svg:tspan>
+        <svg:tspan [attr.fill]="node.data.text" x="52" dy="1.5em">{{node.data.kind}}</svg:tspan>
+      </svg:text>
+
+      <!--
+
+      <svg:text class="no-style" alignment-baseline="central" [attr.fill]="node.data.text" [attr.x]="30"
         [attr.y]="node.dimension.height / 2">
         {{node.label}} ({{node.data.kind}})
       </svg:text>
+      <svg:text class="no-style" alignment-baseline="central" [attr.fill]="node.data.text" [attr.x]="10"
+        [attr.y]="node.dimension.height / 2" font-size="24" font-family="stratos-icons">cloud_foundry</svg:text>
+
+    -->
+      <svg:rect *ngIf="!node.data.alerts" [attr.stroke-dasharray]="node.data.dash" x="-2" y="-2" rx="4" ry="4"
+        [attr.width]="node.dimension.width + 4" [attr.height]="node.dimension.height + 4"
+        style="stroke:black;stroke-width:2;fill:none;"></svg:rect>
+      <svg:rect *ngIf="node.data.alerts" x="-2" y="-2" rx="4" ry="4" [attr.stroke]="node.data.alertSummary.color"
+        [attr.width]="node.dimension.width + 4" [attr.height]="node.dimension.height + 4"
+        style="stroke-width:5;fill:none;"></svg:rect>
     </svg:g>
   </ng-template>
-</ngx-graph>
\ No newline at end of file
+</ngx-graph>
+<div class="resources__loading" *ngIf="nodes && !nodes.length">
+  <div class="resources__loading__content">
+    Loading resources
+    <mat-progress-bar class="" [color]="'primary'" mode="indeterminate">
+    </mat-progress-bar>
+  </div>
+</div>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss
index ec3bfddc2f..beb8c49098 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss
@@ -3,3 +3,9 @@
   height: 100%;
   width: 100%;
 }
+
+@keyframes dash {
+  to {
+    stroke-dashoffset: 1000;
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
index 238acbf3c5..99e5683d26 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
@@ -5,6 +5,10 @@ import { TabNavService } from 'frontend/packages/core/tab-nav.service';
 
 import { HelmReleaseProviders, KubernetesBaseTestModules } from '../../../../kubernetes.testing.module';
 import { HelmReleaseResourceGraphComponent } from './helm-release-resource-graph.component';
+import { AnalysisReportSelectorComponent } from './../../../../analysis-report-viewer/analysis-report-selector/analysis-report-selector.component';
+import { KubernetesAnalysisService } from '../../../../services/kubernetes.analysis.service';
+import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service';
+import { KubeBaseGuidMock } from './../../../../kubernetes.testing.module';
 
 describe('HelmReleaseResourceGraphComponent', () => {
   let component: HelmReleaseResourceGraphComponent;
@@ -16,11 +20,14 @@ describe('HelmReleaseResourceGraphComponent', () => {
         ...KubernetesBaseTestModules,
         NgxGraphModule
       ],
-      declarations: [HelmReleaseResourceGraphComponent],
+      declarations: [HelmReleaseResourceGraphComponent, AnalysisReportSelectorComponent],
       providers: [
         ...HelmReleaseProviders,
         SidePanelService,
         TabNavService,
+        KubernetesAnalysisService,
+        KubernetesEndpointService,
+        KubeBaseGuidMock,
       ]
     })
       .compileComponents();
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
index d47848393b..9e73f79e75 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
@@ -1,13 +1,22 @@
 import { Component, ComponentFactoryResolver, OnDestroy, OnInit } from '@angular/core';
-import { Edge, Node } from '@swimlane/ngx-graph';
+import { Edge } from '@swimlane/ngx-graph';
 import { SidePanelService } from 'frontend/packages/core/src/shared/services/side-panel.service';
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
-import { filter, first, map } from 'rxjs/operators';
+import { BehaviorSubject, combineLatest, Observable, Subject, Subscription } from 'rxjs';
+import { distinctUntilChanged, filter, first, map, publishReplay, refCount, startWith } from 'rxjs/operators';
 
 import {
   KubernetesResourceViewerComponent,
 } from '../../../../kubernetes-resource-viewer/kubernetes-resource-viewer.component';
-import { KubeAPIResource } from '../../../../store/kube.types';
+import { ResourceAlert, ResourceAlertLevel } from '../../../../services/analysis-report.types';
+import { KubernetesAnalysisService } from '../../../../services/kubernetes.analysis.service';
+import {
+  HelmReleaseGraphLink,
+  HelmReleaseGraphNode,
+  HelmReleaseGraphNodeData,
+  HelmReleaseResource,
+  HelmReleaseResources,
+} from '../../../workload.types';
+import { getIcon } from '../../icon-helper';
 import { HelmReleaseHelperService } from '../helm-release-helper.service';
 
 
@@ -22,6 +31,26 @@ const layouts = [
   'colaForceDirected'
 ];
 
+interface CustomHelmReleaseGraphNode extends Omit<HelmReleaseGraphNode, 'data'> {
+  data: CustomHelmReleaseGraphNodeData
+}
+
+interface CustomHelmReleaseGraphNode {
+  id: string;
+  label: string;
+  data: CustomHelmReleaseGraphNodeData
+}
+
+interface CustomHelmReleaseGraphNodeData extends HelmReleaseGraphNodeData {
+  missing: boolean,
+  dash: number,
+  fill: string,
+  text: string,
+  icon: any,
+  alerts: [],
+  alertSummary: {}
+}
+
 @Component({
   selector: 'app-helm-release-resource-graph',
   templateUrl: './helm-release-resource-graph.component.html',
@@ -31,7 +60,7 @@ export class HelmReleaseResourceGraphComponent implements OnInit, OnDestroy {
 
   // see: https://swimlane.github.io/ngx-graph/#/#quick-start
 
-  public nodes: Node[] = [];
+  public nodes: CustomHelmReleaseGraphNode[] = [];
   public links: Edge[] = [];
 
   update$: BehaviorSubject<boolean> = new BehaviorSubject(false);
@@ -44,31 +73,62 @@ export class HelmReleaseResourceGraphComponent implements OnInit, OnDestroy {
 
   private graph: Subscription;
 
+  private didInitialFit = false;
+
+  public path: string;
+
+  private analysisReportUpdated = new Subject<any>();
+  private analysisReportUpdated$ = this.analysisReportUpdated.pipe(
+    startWith(null),
+    distinctUntilChanged(),
+    publishReplay(1),
+    refCount()
+  );
+
   constructor(
     private componentFactoryResolver: ComponentFactoryResolver,
     private helper: HelmReleaseHelperService,
-    private previewPanel: SidePanelService) { }
+    public analyzerService: KubernetesAnalysisService,
+    private previewPanel: SidePanelService) {
+    this.path = `${this.helper.namespace}/${this.helper.releaseTitle}`;
+  }
 
   ngOnInit() {
 
     // Listen for the graph
-    this.graph = this.helper.fetchReleaseGraph().subscribe(g => {
-      const newNodes = [];
-      Object.values(g.nodes).forEach((node: any) => {
+    this.graph = combineLatest(
+      this.helper.fetchReleaseGraph(),
+      this.analysisReportUpdated$
+    ).subscribe(([g, report]) => {
+      const newNodes: CustomHelmReleaseGraphNode[] = [];
+      Object.values(g.nodes).forEach((node: HelmReleaseGraphNode) => {
         const colors = this.getColor(node.data.status);
-        newNodes.push({
+        const icon = getIcon(node.data.kind);
+        const missing = node.data.status === 'missing';
+
+        const newNode: CustomHelmReleaseGraphNode = {
           id: node.id,
           label: node.label,
           data: {
             ...node.data,
+            missing: node.data.status === 'missing',
+            dash: missing ? 6 : 0,
             fill: colors.bg,
-            text: colors.fg
+            text: colors.fg,
+            icon: icon,
+            alerts: null,
+            alertSummary: {}
           },
-        });
+        };
+
+        // Does this node have any alerts?
+        this.applyAlertToNode(newNode, report)
+
+        newNodes.push(newNode);
       });
       this.nodes = newNodes;
 
-      const newLinks = [];
+      const newLinks: HelmReleaseGraphLink[] = [];
       Object.values(g.links).forEach((link: any) => {
         newLinks.push({
           id: link.id,
@@ -79,9 +139,48 @@ export class HelmReleaseResourceGraphComponent implements OnInit, OnDestroy {
       });
       this.links = newLinks;
       this.update$.next(true);
+
+      if (!this.didInitialFit) {
+        this.didInitialFit = true;
+        setTimeout(() => this.fitGraph(), 10);
+      }
     });
   }
 
+  private applyAlertToNode(newNode, report) {
+    if (report && report.alerts) {
+      Object.values(report.alerts).forEach((group: ResourceAlert[]) => {
+        group.forEach(alert => {
+          if (
+            newNode.data.kind.toLowerCase() === alert.kind &&
+            newNode.data.metadata.name === alert.name
+            // namespace is undefined, however the only resources we have should be from the correct context
+          ) {
+            newNode.data.alerts = newNode.data.alerts || [];
+            newNode.data.alerts.push(alert);
+            newNode.data.alertSummary = newNode.data.alertSummary || {};
+            if (alert.level > newNode.data.alertSummary.level || !newNode.data.alertSummary.level) {
+              newNode.data.alertSummary.color = this.alertLevelToColor(alert.level);
+              newNode.data.alertSummary.level = alert.level;
+            }
+          }
+        });
+      });
+    }
+  }
+
+  private alertLevelToColor(level: ResourceAlertLevel) {
+    // These colours need to come from theme - #420
+    switch (level) {
+      case ResourceAlertLevel.Info:
+        return '#42a5f5';
+      case ResourceAlertLevel.Warning:
+        return '#ff9800';
+      case ResourceAlertLevel.Error:
+        return '#f44336';
+    }
+  }
+
   ngOnDestroy() {
     if (this.graph) {
       this.graph.unsubscribe();
@@ -89,15 +188,20 @@ export class HelmReleaseResourceGraphComponent implements OnInit, OnDestroy {
   }
 
   // Open side panel when node is clicked
-  public onNodeClick(node: any) {
-    this.previewPanel.show(
-      KubernetesResourceViewerComponent,
-      {
-        title: 'Helm Release Resource Preview',
-        resource$: this.getResource(node)
-      },
-      this.componentFactoryResolver
-    );
+  public onNodeClick(node: CustomHelmReleaseGraphNode) {
+    this.analysisReportUpdated$.pipe(first()).subscribe(analysis => {
+      this.previewPanel.show(
+        KubernetesResourceViewerComponent,
+        {
+          title: 'Helm Release Resource Preview',
+          resource$: this.getResource(node),
+          analysis,
+          resourceKind: node.data.kind
+        },
+        this.componentFactoryResolver
+      );
+    })
+
   }
 
   public fitGraph() {
@@ -138,12 +242,31 @@ export class HelmReleaseResourceGraphComponent implements OnInit, OnDestroy {
     }
   }
 
-  private getResource(node: any): Observable<KubeAPIResource> {
+  private getResource(node: CustomHelmReleaseGraphNode): Observable<HelmReleaseResource> {
     return this.helper.fetchReleaseResources().pipe(
       filter(r => !!r),
-      map((r: any[]) => Object.values(r).find((res: any) => res.metadata.name === node.label && res.metadata.kind === node.kind)),
+      // tap(r => {
+      //   console.log(node);
+      //   console.log(r);
+      // }),
+      map((r: HelmReleaseResources) => Object.values(r.data).find((res) => {
+        // if (!res.metadata) {
+        //   console.log(node, res);
+        // }
+        return res.metadata.name === node.label && res.kind === node.data.kind;
+      })),
       first(),
     );
   }
 
+  public analysisChanged(report) {
+    if (report === null) {
+      this.analysisReportUpdated.next(null);
+    } else {
+      this.analyzerService.getByID(this.helper.endpointGuid, report.id).subscribe(results => {
+        this.analysisReportUpdated.next(results);
+      });
+    }
+  }
+
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
index f69faf6ea9..0bfbe0568a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
@@ -1,8 +1,15 @@
-<app-page-sub-nav *ngIf="!(isBusy$ | async)">
+<app-page-sub-nav *ngIf="!(isBusy$ | async) || false">
   <button mat-button name="delete" (click)="deleteRelease()" matTooltip="Delete">
     <mat-icon>delete</mat-icon>
     <span>Delete</span>
   </button>
+
+  <app-analysis-report-runner [kubeId]="helmReleaseHelper.endpointGuid" [namespace]="helmReleaseHelper.namespace"
+    [app]="helmReleaseHelper.releaseTitle">
+  </app-analysis-report-runner>
+
+  <app-analysis-report-selector *ngIf="analyzerService.enabled$ | async" (selected)="analysisChanged($event)"
+    [endpoint]="helmReleaseHelper.endpointGuid" [path]="path"></app-analysis-report-selector>
 </app-page-sub-nav>
 
 <app-loading-page [isLoading]="isBusy$" [text]="loadingMessage">
@@ -59,7 +66,8 @@
       <div *ngIf="hasAllResources$ | async; else stillLoadingResources">
         <div *ngIf="resources$ | async as resources" class="grid">
           <app-card-number-metric *ngFor="let res of resources" label="{{ res.label }}" icon="{{ res.icon.name }}"
-            iconFont="{{ res.icon.font }}" value="{{ res.count }}">
+            [alerts]="res.alerts" (showAlerts)="showAlerts($event, res)"
+            iconFont="{{ res.icon.fontSet || res.icon.font }}" value="{{ res.count }}">
           </app-card-number-metric>
         </div>
       </div>
@@ -76,12 +84,11 @@
     <ng-template #loadingResources>
       <div class="resources__loading">
         <div class="resources__loading__content">
-          Loading Resources
+          Loading resources
           <mat-progress-bar class="" [color]="'primary'" mode="indeterminate">
           </mat-progress-bar>
         </div>
       </div>
-
     </ng-template>
   </ng-container>
 </app-loading-page>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
index 60540500e7..ebe873f1d2 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
@@ -1,8 +1,12 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { TabNavService } from 'frontend/packages/core/tab-nav.service';
 
-import { HelmReleaseProviders, KubernetesBaseTestModules } from '../../../../kubernetes.testing.module';
+import { HelmReleaseProviders, KubernetesBaseTestModules, KubeBaseGuidMock } from '../../../../kubernetes.testing.module';
 import { HelmReleaseSummaryTabComponent } from './helm-release-summary-tab.component';
+import { KubernetesAnalysisService } from '../../../../services/kubernetes.analysis.service';
+import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service';
+import { AnalysisReportSelectorComponent } from './../../../../analysis-report-viewer/analysis-report-selector/analysis-report-selector.component';
+import { SidePanelService } from './../../../../../../shared/services/side-panel.service';
 
 describe('HelmReleaseSummaryTabComponent', () => {
   let component: HelmReleaseSummaryTabComponent;
@@ -13,10 +17,14 @@ describe('HelmReleaseSummaryTabComponent', () => {
       imports: [
         ...KubernetesBaseTestModules
       ],
-      declarations: [HelmReleaseSummaryTabComponent],
+      declarations: [HelmReleaseSummaryTabComponent, AnalysisReportSelectorComponent],
       providers: [
         ...HelmReleaseProviders,
-        TabNavService
+        KubernetesAnalysisService,
+        KubernetesEndpointService,
+        KubeBaseGuidMock,
+        TabNavService,
+        SidePanelService
       ]
     })
       .compileComponents();
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index a302a6fd2a..3b3d8ce7c8 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -1,25 +1,32 @@
 import { HttpClient } from '@angular/common/http';
-import { Component, OnDestroy } from '@angular/core';
+import { Component, ComponentFactoryResolver, OnDestroy } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { LoggerService } from 'frontend/packages/core/src/core/logger.service';
 import { ConfirmationDialogConfig } from 'frontend/packages/core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from 'frontend/packages/core/src/shared/components/confirmation-dialog.service';
+import { SidePanelService } from 'frontend/packages/core/src/shared/services/side-panel.service';
 import { ClearPaginationOfType } from 'frontend/packages/store/src/actions/pagination.actions';
 import { RouterNav } from 'frontend/packages/store/src/actions/router.actions';
 import { AppState } from 'frontend/packages/store/src/app-state';
-import { combineLatest, Observable, ReplaySubject } from 'rxjs';
+import { combineLatest, Observable, ReplaySubject, Subject } from 'rxjs';
 import { distinctUntilChanged, filter, first, map, publishReplay, refCount, startWith } from 'rxjs/operators';
 
 import { SnackBarService } from '../../../../../../../../core/src/shared/services/snackbar.service';
 import { endpointsEntityRequestDataSelector } from '../../../../../../../../store/src/selectors/endpoint.selectors';
-import { HelmReleaseChartData, HelmReleaseResource } from '../../../workload.types';
+import {
+  ResourceAlertPreviewComponent,
+} from '../../../../analysis-report-viewer/resource-alert-preview/resource-alert-preview.component';
+import { KubernetesAnalysisService } from '../../../../services/kubernetes.analysis.service';
+import { HelmReleaseChartData } from '../../../workload.types';
 import { workloadsEntityCatalog } from '../../../workloads-entity-catalog';
+import { getIcon } from '../../icon-helper';
 import { HelmReleaseHelperService } from '../helm-release-helper.service';
+import { ResourceAlert } from './../../../../services/analysis-report.types';
 
 @Component({
   selector: 'app-helm-release-summary-tab',
   templateUrl: './helm-release-summary-tab.component.html',
-  styleUrls: ['./helm-release-summary-tab.component.scss']
+  styleUrls: ['./helm-release-summary-tab.component.scss'],
 })
 export class HelmReleaseSummaryTabComponent implements OnDestroy {
   // Confirmation dialogs
@@ -38,6 +45,8 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
   private successChartColor = '#4DD3A7';
   private completedChartColour = '#7aa3e5';
 
+  public path: string;
+
   public podChartColors = [
     {
       name: 'Running',
@@ -60,88 +69,30 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
     }
   ];
 
-
-  public iconMappings = {
-    Namespace: {
-      name: 'namespace',
-      font: 'stratos-icons'
-    },
-    Container: {
-      name: 'container',
-      font: 'stratos-icons'
-    },
-    ClusterRole: {
-      name: 'cluster_role',
-      font: 'stratos-icons'
-    },
-    ClusterRoleBinding: {
-      name: 'cluster_role_binding',
-      font: 'stratos-icons'
-    },
-    Deployment: {
-      name: 'deployment',
-      font: 'stratos-icons'
-    },
-    ReplicaSet: {
-      name: 'replica_set',
-      font: 'stratos-icons'
-    },
-    Pod: {
-      name: 'pod',
-      font: 'stratos-icons'
-    },
-    Service: {
-      name: 'service',
-      font: 'stratos-icons'
-    },
-    Role: {
-      name: 'assignment_ind'
-    },
-    RoleBinding: {
-      name: 'role_binding',
-      font: 'stratos-icons'
-    },
-    StatefulSet: {
-      name: 'stateful_set',
-      font: 'stratos-icons'
-    },
-    Ingress: {
-      name: 'ingress',
-      font: 'stratos-icons'
-    },
-    ConfigMap: {
-      name: 'config_map',
-      font: 'stratos-icons'
-    },
-    Secret: {
-      name: 'config_map',
-      font: 'stratos-icons'
-    },
-    ServiceAccount: {
-      name: 'lock'
-    },
-    default: {
-      name: 'collocation',
-      font: 'stratos-icons'
-    }
-  };
-
   // Blue: #00B2E2
   // Yellow: #FFC107
 
   private deleted = false;
   public chartData$: Observable<HelmReleaseChartData>;
-  public resources$: Observable<HelmReleaseResource[]>;
+  public resources$: Observable<any[]>;
+
+  // Cached analysis report
+  private analysisReport;
+
+  private analysisReportUpdated = new Subject<string>();
+  private analysisReportUpdated$ = this.analysisReportUpdated.pipe(startWith(null), distinctUntilChanged());
 
   constructor(
+    private componentFactoryResolver: ComponentFactoryResolver,
     public helmReleaseHelper: HelmReleaseHelperService,
     private store: Store<AppState>,
     private confirmDialog: ConfirmationDialogService,
     private httpClient: HttpClient,
     private logService: LoggerService,
-    private snackbarService: SnackBarService
+    private snackbarService: SnackBarService,
+    public analyzerService: KubernetesAnalysisService,
+    private previewPanel: SidePanelService,
   ) {
-
     this.isBusy$ = combineLatest([
       this.helmReleaseHelper.isFetching$,
       this.busyDeletingSubject.asObservable().pipe(
@@ -152,6 +103,8 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
       startWith(true)
     );
 
+    this.path = `${this.helmReleaseHelper.namespace}/${this.helmReleaseHelper.releaseTitle}`;
+
     this.chartData$ = this.helmReleaseHelper.fetchReleaseChartStats().pipe(
       distinctUntilChanged(),
       map(chartData => ({
@@ -162,8 +115,11 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
       )
     );
 
-    this.resources$ = this.helmReleaseHelper.fetchReleaseGraph().pipe(
-      map((graph: any) => {
+    this.resources$ = combineLatest(
+      this.helmReleaseHelper.fetchReleaseGraph(),
+      this.analysisReportUpdated$
+    ).pipe(
+      map(([graph,]) => {
         const resources = {};
         // Collect the resources
         Object.values(graph.nodes).forEach((node: any) => {
@@ -173,18 +129,20 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
               label: `${node.data.kind}s`,
               count: 0,
               statuses: [],
-              icon: this.getIcon(node.data.kind)
+              icon: getIcon(node.data.kind)
             };
           }
           resources[node.data.kind].count++;
           resources[node.data.kind].statuses.push(node.data.status);
         });
+        this.applyAnalysis(resources, this.analysisReport);
         return Object.values(resources).sort((a: any, b: any) => a.kind.localeCompare(b.kind));
       }),
       publishReplay(1),
       refCount()
     );
 
+
     this.hasResources$ = combineLatest([
       this.chartData$,
       this.resources$
@@ -206,14 +164,25 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
       },
       'Delete'
     );
+
+    this.hasAllResources$ = combineLatest([
+      this.resources$,
+      this.hasResources$
+    ]).pipe(
+      map(([resources, hasSome]) => hasSome && resources && resources.length > 0)
+    );
   }
 
-  private getIcon(kind: string) {
-    const rkind = kind || 'Pod';
-    if (this.iconMappings[rkind]) {
-      return this.iconMappings[rkind];
+  public analysisChanged(report) {
+    if (report === null) {
+      // No report selected
+      this.analysisReport = null;
+      this.analysisReportUpdated.next('');
     } else {
-      return this.iconMappings.default;
+      this.analyzerService.getByID(this.helmReleaseHelper.endpointGuid, report.id).subscribe(results => {
+        this.analysisReport = results;
+        this.analysisReportUpdated.next(report.id);
+      });
     }
   }
 
@@ -283,4 +252,35 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
       first()
     );
   }
+
+  private applyAnalysis(resources, report) {
+    // Clear out existing alerts for all resources
+    Object.values(resources).forEach((resource: any) => resource.alerts = []);
+
+    if (report && Object.keys(resources).length > 0) {
+      Object.values(report.alerts).forEach((group: ResourceAlert[]) => {
+        group.forEach(alert => {
+          // Can we find a corresponding group in the resources?
+          const res = Object.keys(resources).find((i) => i.toLowerCase() === alert.kind);
+          if (res) {
+            const resItem = resources[res];
+            if (resItem) {
+              resItem.alerts.push(alert);
+            }
+          }
+        });
+      });
+    }
+  }
+
+  public showAlerts(alerts, resource) {
+    this.previewPanel.show(
+      ResourceAlertPreviewComponent,
+      {
+        resource,
+        alerts,
+      },
+      this.componentFactoryResolver
+    );
+  }
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-factory.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-factory.ts
index abce799544..9605546f9d 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-factory.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-factory.ts
@@ -1,6 +1,6 @@
 import { EntitySchema } from '../../../../../../store/src/helpers/entity-schema';
 import { addKubernetesEntitySchema, KubernetesEntitySchema } from '../../kubernetes-entity-factory';
-import { HelmRelease, HelmReleaseGraph, HelmReleaseResource } from '../workload.types';
+import { HelmRelease, HelmReleaseGraph, HelmReleaseResources } from '../workload.types';
 
 export const helmReleaseEntityKey = 'helmRelease';
 export const helmReleasePodEntityType = 'helmReleasePod';
@@ -22,7 +22,7 @@ export const getHelmReleaseIdByObj = (entity: HelmRelease) => getHelmReleaseId(e
 export const getHelmReleaseGraphId = (endpointId: string, releaseTitle: string) => `${endpointId}${separator}${releaseTitle}`;
 export const getHelmReleaseGraphIdByObj = (entity: HelmReleaseGraph) => getHelmReleaseGraphId(entity.endpointId, entity.releaseTitle);
 export const getHelmReleaseResourceId = (endpointId: string, releaseTitle: string) => `${endpointId}${separator}${releaseTitle}`;
-export const getHelmReleaseResourceIdByObj = (entity: HelmReleaseResource) => getHelmReleaseResourceId(entity.endpointId, entity.releaseTitle);
+export const getHelmReleaseResourceIdByObj = (entity: HelmReleaseResources) => getHelmReleaseResourceId(entity.endpointId, entity.releaseTitle);
 
 const entityCache: {
   [key: string]: EntitySchema
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-generator.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-generator.ts
index f4a0939afa..3a8f8a0181 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-generator.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-generator.ts
@@ -5,7 +5,7 @@ import {
 import { StratosEndpointExtensionDefinition } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
 import { IFavoriteMetadata } from '../../../../../../store/src/types/user-favorites.types';
 import { kubernetesEntityFactory } from '../../kubernetes-entity-factory';
-import { HelmRelease, HelmReleaseGraph, HelmReleaseResource } from '../workload.types';
+import { HelmRelease, HelmReleaseGraph, HelmReleaseResources } from '../workload.types';
 import { workloadsEntityCatalog } from '../workloads-entity-catalog';
 import {
   WorkloadGraphBuilders,
@@ -62,7 +62,7 @@ function generateReleaseResourceEntity(endpointDefinition: StratosEndpointExtens
     schema: kubernetesEntityFactory(helmReleaseResourceEntityType),
     endpoint: endpointDefinition
   };
-  workloadsEntityCatalog.resource = new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseResource, WorkloadResourceBuilders>(
+  workloadsEntityCatalog.resource = new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseResources, WorkloadResourceBuilders>(
     definition,
     {
       actionBuilders: workloadResourceBuilders
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workload.types.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workload.types.ts
index f91220bad4..bf5b8e708b 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workload.types.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workload.types.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 
-import { KubernetesPod, KubeService } from '../store/kube.types';
+import { KubeAPIResource, KubernetesPod, KubeService, KubeStatus } from '../store/kube.types';
 
 export interface HelmRelease {
   endpointId: string;
@@ -36,11 +36,43 @@ export interface HelmReleasePod extends HelmReleaseEntity, KubernetesPod { }
 export interface HelmReleaseService extends HelmReleaseEntity, KubeService { }
 
 export interface HelmReleaseGraph extends HelmReleaseEntity {
-  nodes: {};
-  links: {};
+  nodes: { [key: string]: HelmReleaseGraphNode };
+  links: { [key: string]: HelmReleaseGraphLink };
 }
 
-export type HelmReleaseResource = any;
+export interface HelmReleaseGraphNode {
+  id: string;
+  label: string;
+  data: HelmReleaseGraphNodeData
+}
+
+export interface HelmReleaseGraphNodeData {
+  kind: string,
+  status: string,
+  metadata: {
+    name: string,
+    namespace: string
+  }
+}
+
+export interface HelmReleaseGraphLink {
+  id: string;
+  label?: string;
+  source: string;
+  target: string;
+}
+
+export interface HelmReleaseResources extends HelmReleaseEntity {
+  data: HelmReleaseResource[],
+  kind: string
+};
+
+export interface HelmReleaseKubeAPIResource extends KubeAPIResource {
+  apiVersion: string;
+  kind: string;
+}
+
+export type HelmReleaseResource = HelmReleaseKubeAPIResource | KubeStatus;
 
 @Injectable()
 export class HelmReleaseGuid {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads-entity-catalog.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads-entity-catalog.ts
index 06d3a33c04..6492abd0b9 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads-entity-catalog.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads-entity-catalog.ts
@@ -1,7 +1,7 @@
 import { StratosCatalogEntity } from '../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { IFavoriteMetadata } from '../../../../../store/src/types/user-favorites.types';
 import { WorkloadGraphBuilders, WorkloadReleaseBuilders, WorkloadResourceBuilders } from './store/workload-action-builders';
-import { HelmRelease, HelmReleaseGraph, HelmReleaseResource } from './workload.types';
+import { HelmRelease, HelmReleaseGraph, HelmReleaseResources } from './workload.types';
 
 /**
  * A strongly typed collection of Workload Catalog Entities.
@@ -10,7 +10,7 @@ import { HelmRelease, HelmReleaseGraph, HelmReleaseResource } from './workload.t
 export class WorkloadsEntityCatalog {
   release: StratosCatalogEntity<IFavoriteMetadata, HelmRelease, WorkloadReleaseBuilders>;
   graph: StratosCatalogEntity<IFavoriteMetadata, HelmReleaseGraph, WorkloadGraphBuilders>
-  resource: StratosCatalogEntity<IFavoriteMetadata, HelmReleaseResource, WorkloadResourceBuilders>
+  resource: StratosCatalogEntity<IFavoriteMetadata, HelmReleaseResources, WorkloadResourceBuilders>
 }
 
 /**
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
index 5fb855b409..aaed18524c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
@@ -18,6 +18,7 @@ import { HelmReleaseValuesTabComponent } from './release/tabs/helm-release-value
 import { HelmReleasesTabComponent } from './releases-tab/releases-tab.component';
 import { WorkloadsStoreModule } from './store/workloads.store.module';
 import { WorkloadsRouting } from './workloads.routing';
+import { HelmReleaseAnalysisTabComponent } from './release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component';
 
 @NgModule({
   imports: [
@@ -39,6 +40,7 @@ import { WorkloadsRouting } from './workloads.routing';
     HelmReleaseServicesTabComponent,
     HelmReleaseResourceGraphComponent,
     HelmReleaseCardComponent,
+    HelmReleaseAnalysisTabComponent,
   ],
   entryComponents: [
     HelmReleaseCardComponent
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.routing.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.routing.ts
index 8f3a4100a7..dc687ecd76 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.routing.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.routing.ts
@@ -12,6 +12,7 @@ import { HelmReleaseServicesTabComponent } from './release/tabs/helm-release-ser
 import { HelmReleaseSummaryTabComponent } from './release/tabs/helm-release-summary-tab/helm-release-summary-tab.component';
 import { HelmReleaseValuesTabComponent } from './release/tabs/helm-release-values-tab/helm-release-values-tab.component';
 import { HelmReleasesTabComponent } from './releases-tab/releases-tab.component';
+import { HelmReleaseAnalysisTabComponent } from './release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component';
 
 const routes: Routes = [
   {
@@ -36,7 +37,8 @@ const routes: Routes = [
           { path: 'values', component: HelmReleaseValuesTabComponent },
           { path: 'pods', component: HelmReleasePodsTabComponent },
           { path: 'services', component: HelmReleaseServicesTabComponent },
-          { path: 'graph', component: HelmReleaseResourceGraphComponent }
+          { path: 'graph', component: HelmReleaseResourceGraphComponent },
+          { path: 'analysis', component: HelmReleaseAnalysisTabComponent },
         ]
       },
     ]
diff --git a/src/frontend/packages/suse-theme/assets/core/custom/kubescore.md b/src/frontend/packages/suse-theme/assets/core/custom/kubescore.md
new file mode 100644
index 0000000000..a4a592e740
--- /dev/null
+++ b/src/frontend/packages/suse-theme/assets/core/custom/kubescore.md
@@ -0,0 +1,7 @@
+## Kube-Score
+
+Kube-score is a tool that performs static code analysis of your Kubernetes object definitions.
+
+The output is a list of recommendations of what you can improve to make your application more secure and resilient.
+
+[https://github.com/zegl/kube-score](https://github.com/zegl/kube-score)
\ No newline at end of file
diff --git a/src/frontend/packages/suse-theme/assets/core/custom/kubescore.png b/src/frontend/packages/suse-theme/assets/core/custom/kubescore.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee6b8f82f0d5e47468499fbc2b0a517e13c78776
GIT binary patch
literal 36127
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
BRQ&(|

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/core/custom/popeye.md b/src/frontend/packages/suse-theme/assets/core/custom/popeye.md
new file mode 100644
index 0000000000..98f871ba7c
--- /dev/null
+++ b/src/frontend/packages/suse-theme/assets/core/custom/popeye.md
@@ -0,0 +1,7 @@
+## Popeye - A Kubernetes Cluster Sanitizer
+
+Popeye is a utility that scans live Kubernetes cluster and reports potential issues with deployed resources and configurations. It sanitizes your cluster based on what's deployed and not what's sitting on disk. By scanning your cluster, it detects misconfigurations and ensure best practices are in place thus preventing potential future headaches. It aims at reducing the cognitive overload one faces when operating a Kubernetes cluster in the wild. Furthermore, if your cluster employs a metric-server, it reports potential resources over/under allocations and attempts to warn you should your cluster run out of capacity.
+
+Popeye is a readonly tool, it does not alter any of your Kubernetes resources in any way!
+
+[https://github.com/derailed/popeye](https://github.com/derailed/popeye)
\ No newline at end of file
diff --git a/src/frontend/packages/suse-theme/assets/core/custom/popeye.png b/src/frontend/packages/suse-theme/assets/core/custom/popeye.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d07a32b969747836d65c7c1992855a3b8b1fc7c
GIT binary patch
literal 124519
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
O0000<MNUMnLSTYBg*FWU

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/core/custom/sonobuoy.md b/src/frontend/packages/suse-theme/assets/core/custom/sonobuoy.md
new file mode 100644
index 0000000000..4e7e951cbc
--- /dev/null
+++ b/src/frontend/packages/suse-theme/assets/core/custom/sonobuoy.md
@@ -0,0 +1,5 @@
+## Sonobuoy - Validate your Kubernetes configuration
+
+Sonobuoy is a diagnostic tool that makes it easier to understand the state of a Kubernetes cluster by running a choice of configuration tests in an accessible and non-destructive manner.
+
+[https://sonobuoy.io/](https://sonobuoy.io/)
\ No newline at end of file
diff --git a/src/frontend/packages/suse-theme/assets/core/custom/sonobuoy.png b/src/frontend/packages/suse-theme/assets/core/custom/sonobuoy.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fc164c2c5f184e49e42300b25d3d16d41f43605
GIT binary patch
literal 46789
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%0DS$8|0nri*DmT6p
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
JPDHLkV1l|5=o<h4

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/suse-theme/assets/core/custom/sonobuoy.svg b/src/frontend/packages/suse-theme/assets/core/custom/sonobuoy.svg
new file mode 100644
index 0000000000..96eee04212
--- /dev/null
+++ b/src/frontend/packages/suse-theme/assets/core/custom/sonobuoy.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   viewBox="0 0 680 200"
+   height="200"
+   width="680"
+   xml:space="preserve"
+   id="svg2"
+   version="1.1"><metadata
+     id="metadata8"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs6" /><g
+     transform="matrix(1.3333333,0,0,-1.3333333,0,200)"
+     id="g10"><g
+       transform="scale(0.1)"
+       id="g12"><path
+         id="path14"
+         style="fill:#239de0;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 593.238,294.602 39.442,-49.461 c 41.476,-11.813 85.011,-18.629 129.957,-19.789 l -69.532,87.179 c -2.074,2.61 -2.851,6.008 -2.113,9.25 l 99.821,437.34 c 0.742,3.242 2.917,5.973 5.917,7.418 l 404.16,194.633 c 3,1.445 6.49,1.445 9.48,0 l 57.87,-27.867 c -16.99,45.461 -40.13,87.925 -68.38,126.445 L 714.531,826.023 593.238,294.602" /><path
+         id="path16"
+         style="fill:#239de0;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="M 907.383,672.227 833.723,349.488 917.5,244.441 c 25.828,7.219 50.852,16.368 74.922,27.289 l -71.57,89.739 c -3.372,4.23 -4.629,9.769 -3.43,15.031 l 53.652,235.07 c 1.199,5.278 4.746,9.707 9.61,12.051 l 217.246,104.621 c 4.86,2.344 10.54,2.344 15.41,0 l 84.17,-40.531 c 2.42,20.441 3.82,41.199 3.82,62.289 0,6.715 -0.26,13.363 -0.51,20.02 l -95.19,45.839 -298.247,-143.632" /><path
+         id="path18"
+         style="fill:#239de0;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 776.328,1275 c -14.062,0 -27.949,-0.72 -41.734,-1.81 h 83.472 c -13.789,1.09 -27.675,1.81 -41.738,1.81" /><path
+         id="path20"
+         style="fill:#239de0;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 1003.81,595.332 -49.857,-218.391 71.107,-89.16 c 136.47,73.739 236.68,206.18 266.78,363.231 l -86.21,41.511 -201.82,-97.191" /><path
+         id="path22"
+         style="fill:#239de0;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 810.957,749.125 -97.48,-427.074 77.109,-96.692 c 32.93,0.891 65.129,4.75 96.289,11.45 L 806.98,337 c -2.722,3.422 -3.75,7.879 -2.769,12.141 l 76.734,336.207 c 0.969,4.257 3.828,7.84 7.766,9.734 L 1199.4,844.707 c 3.94,1.895 8.52,1.895 12.46,0 l 86.81,-41.809 c -3.51,34.907 -10.48,68.801 -20.51,101.364 l -72.53,34.933 -394.673,-190.07" /><path
+         id="path24"
+         style="fill:#239de0;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 483.754,314.301 c 37.887,-25.52 79.316,-46.11 123.312,-61.141 l -27.836,34.899 c -1.425,1.793 -1.96,4.132 -1.453,6.363 l 122.907,538.473 c 0.507,2.226 2.004,4.109 4.062,5.097 l 485.834,233.958 c -20.73,26.6 -43.92,51.14 -69.28,73.29 L 618.105,902.922 483.754,314.301" /><path
+         id="path26"
+         style="fill:#239de0;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 476.508,319.398 134.043,587.274 c 0.273,1.215 1.094,2.234 2.219,2.777 l 501.78,241.641 c -81.44,68.79 -184.023,113.2 -296.484,122.1 H 734.594 C 464.566,1251.82 251.328,1025.41 251.328,750 c 0,-178.07 89.199,-335.629 225.18,-430.602" /><path
+         id="path28"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="M 1197.93,728.242 980.684,623.621 c -4.864,-2.344 -8.411,-6.773 -9.61,-12.051 L 917.422,376.5 c -1.199,-5.262 0.058,-10.801 3.43,-15.031 l 71.57,-89.739 c 11.068,5.02 21.988,10.309 32.638,16.051 l -71.107,89.16 49.857,218.391 201.82,97.191 86.21,-41.511 c 2.32,12.09 4.2,24.332 5.67,36.699 l -84.17,40.531 c -4.87,2.344 -10.55,2.344 -15.41,0" /><path
+         id="path30"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="M 1199.4,844.707 888.711,695.082 c -3.938,-1.894 -6.797,-5.477 -7.766,-9.734 L 804.211,349.141 c -0.981,-4.262 0.047,-8.719 2.769,-12.141 l 79.895,-100.191 c 10.332,2.23 20.527,4.812 30.625,7.632 l -83.777,105.047 73.66,322.739 298.247,143.632 95.19,-45.839 c -0.42,11.039 -1.06,22.023 -2.15,32.878 l -86.81,41.809 c -3.94,1.895 -8.52,1.895 -12.46,0" /><path
+         id="path32"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="M 1200.89,961.172 796.73,766.539 c -3,-1.445 -5.175,-4.176 -5.917,-7.418 l -99.821,-437.34 c -0.738,-3.242 0.039,-6.64 2.113,-9.25 l 69.532,-87.179 c 4.558,-0.122 9.101,-0.352 13.691,-0.352 4.785,0 9.5,0.23 14.258,0.359 l -77.109,96.692 97.48,427.074 394.673,190.07 72.53,-34.933 c -3.01,9.808 -6.34,19.484 -9.92,29.043 l -57.87,27.867 c -2.99,1.445 -6.48,1.445 -9.48,0" /><path
+         id="path34"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="M 700.684,832.895 577.777,294.422 c -0.507,-2.231 0.028,-4.57 1.453,-6.363 l 27.836,-34.899 c 8.442,-2.89 16.981,-5.558 25.614,-8.019 l -39.442,49.461 121.293,531.421 485.329,233.727 c -3.02,4.12 -6.15,8.17 -9.28,12.2 L 704.746,837.992 c -2.058,-0.988 -3.555,-2.871 -4.062,-5.097" /><path
+         id="path36"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="M 610.551,906.672 476.508,319.398 c 2.422,-1.687 4.797,-3.449 7.246,-5.097 L 618.105,902.922 1121.3,1145.24 c -2.24,1.97 -4.47,3.93 -6.75,5.85 L 612.77,909.449 c -1.125,-0.543 -1.946,-1.562 -2.219,-2.777" /><path
+         id="path38"
+         style="fill:#696566;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 1466.12,594.32 29.41,36.598 c 34.79,-34.801 77.39,-59.395 134.99,-59.395 63.59,0 95.99,34.793 95.99,71.993 0,43.797 -38.99,61.203 -110.99,78 -82.8,19.199 -134.99,45 -134.99,116.394 0,65.996 58.8,117.598 137.99,117.598 61.2,0 106.79,-24.004 144.6,-58.797 l -28.8,-36.606 c -34.2,33 -75,52.801 -118.2,52.801 -51,0 -88.2,-33.597 -88.2,-71.398 0,-42.598 40.8,-57.598 111,-74.395 78.59,-18.597 135,-46.8 135,-119.394 0,-65.399 -49.2,-118.797 -145.2,-118.797 -67.8,0 -121.2,24.598 -162.6,65.398" /><path
+         id="path40"
+         style="fill:#696566;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 2193.91,741.914 c 0,91.797 -74.41,169.797 -163.2,169.797 -88.8,0 -163.8,-78 -163.8,-169.797 0,-92.398 75,-170.391 163.8,-170.391 88.79,0 163.2,77.993 163.2,170.391 z m -374.39,0 c 0,115.797 97.2,212.992 211.19,212.992 114.59,0 210.59,-97.195 210.59,-212.992 0,-115.797 -96,-213.594 -210.59,-213.594 -113.99,0 -211.19,97.797 -211.19,213.594" /><path
+         id="path42"
+         style="fill:#696566;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 2310.91,947.703 h 46.8 L 2613.3,612.32 v 335.383 h 46.8 v -412.18 h -46.8 L 2357.71,870.906 V 535.523 h -46.8 v 412.18" /><path
+         id="path44"
+         style="fill:#696566;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 3104.09,741.914 c 0,91.797 -74.39,169.797 -163.19,169.797 -88.8,0 -163.8,-78 -163.8,-169.797 0,-92.398 75,-170.391 163.8,-170.391 88.8,0 163.19,77.993 163.19,170.391 z m -374.38,0 c 0,115.797 97.19,212.992 211.19,212.992 114.59,0 210.58,-97.195 210.58,-212.992 0,-115.797 -95.99,-213.594 -210.58,-213.594 -114,0 -211.19,97.797 -211.19,213.594" /><path
+         id="path46"
+         style="fill:#696566;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 3405.29,578.121 c 51.01,0 87,31.801 87,76.195 0,44.399 -35.99,76.196 -87,76.196 H 3267.9 V 578.121 Z m -7.19,194.992 c 45.59,0 77.99,27.602 77.99,65.996 0,38.403 -32.4,65.996 -77.99,65.996 H 3267.9 V 773.113 Z m -177,174.59 h 189 c 66.59,0 113.4,-42.598 113.4,-102.598 0,-43.792 -21.61,-68.992 -58.8,-90.593 47.39,-24 74.99,-61.196 74.99,-106.192 0,-66 -51,-112.797 -122.4,-112.797 H 3221.1 v 412.18" /><path
+         id="path48"
+         style="fill:#696566;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 3607.5,706.516 v 241.187 h 46.8 V 706.516 c 0,-79.196 52.19,-135.594 125.39,-135.594 73.2,0 125.4,56.398 125.4,135.594 v 241.187 h 46.79 V 706.516 c 0,-104.399 -71.39,-178.196 -172.19,-178.196 -100.79,0 -172.19,73.797 -172.19,178.196" /><path
+         id="path50"
+         style="fill:#696566;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 4391.07,741.914 c 0,91.797 -74.4,169.797 -163.19,169.797 -88.8,0 -163.8,-78 -163.8,-169.797 0,-92.398 75,-170.391 163.8,-170.391 88.79,0 163.19,77.993 163.19,170.391 z m -374.38,0 c 0,115.797 97.2,212.992 211.19,212.992 114.59,0 210.59,-97.195 210.59,-212.992 0,-115.797 -96,-213.594 -210.59,-213.594 -113.99,0 -211.19,97.797 -211.19,213.594" /><path
+         id="path52"
+         style="fill:#696566;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 4628.68,703.516 -166.19,244.187 h 58.19 l 132.6,-199.789 133.8,199.789 h 56.4 L 4677.88,703.516 V 535.523 h -49.2 v 167.993" /></g></g></svg>
\ No newline at end of file
diff --git a/src/frontend/packages/theme/_helper.scss b/src/frontend/packages/theme/_helper.scss
index 7b9015f992..70cb9f9eda 100644
--- a/src/frontend/packages/theme/_helper.scss
+++ b/src/frontend/packages/theme/_helper.scss
@@ -115,6 +115,6 @@ $oss-dark-theme: mat-dark-theme($oss-dark-primary, $oss-dark-accent, $oss-dark-w
     $warn: map-get($theme, warn);
     $primary: map-get($theme, primary);
     $white: #fff; // Use default palette for status
-    @return (success: map-get($mat-green, 500), warning: map-get($mat-orange, 500), danger: mat-color($warn), tentative: map-get($mat-grey, 500), busy: mat-color($primary), text: $white, );
+    @return (success: map-get($mat-green, 500), info: map-get($mat-blue, 500), warning: map-get($mat-orange, 500), danger: mat-color($warn), tentative: map-get($mat-grey, 500), busy: mat-color($primary), text: $white, );
   }
 }
diff --git a/src/jetstream/config.example b/src/jetstream/config.example
index 69d9110c8b..417f5f8144 100644
--- a/src/jetstream/config.example
+++ b/src/jetstream/config.example
@@ -75,5 +75,8 @@ INVITE_USER_CLIENT_SECRET=
 # Simplify development with FDB (value is port of FDB server: 27016 for FDB, 27017 for MongoDB)
 #FDB_LOCAL_DEV=27017
 
+# Analysis services API
+#ANALYSIS_SERVICES_API=
+
 # Download link when installing the Kubernetes Dashboard in a targetted Kube Endpoint
-# STRATOS_KUBERNETES_DASHBOARD_IMAGE=
\ No newline at end of file
+# STRATOS_KUBERNETES_DASHBOARD_IMAGE=
diff --git a/src/jetstream/go.mod b/src/jetstream/go.mod
index 59494917e6..989a9fc1b8 100644
--- a/src/jetstream/go.mod
+++ b/src/jetstream/go.mod
@@ -36,6 +36,7 @@ require (
 	github.com/fatih/color v1.7.0 // indirect
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/google/go-querystring v1.0.0 // indirect
+	github.com/google/martian v2.1.0+incompatible
 	github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e // indirect
 	github.com/gorilla/context v1.1.1
 	github.com/gorilla/securecookie v1.1.1
diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index df1d085124..ca7f76c6fb 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -56,6 +56,7 @@ github.com/Microsoft/go-winio v0.4.12 h1:xAfWHN1IrQ0NJ9TBC0KBZoqLjzDTr1ML+4MywiU
 github.com/Microsoft/go-winio v0.4.12/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
 github.com/Microsoft/hcsshim v0.8.6 h1:ZfF0+zZeYdzMIVMZHKtDKJvLHj76XCuVae/jNkjj0IA=
 github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
+github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46 h1:lsxEuwrXEAokXB9qhlbKWPpo3KMLZQ5WB5WLQRW1uq0=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.0 h1:rmGxhojJlM0tuKtfdvliR84CFHljx9ag64t2xmVkjK4=
@@ -130,10 +131,13 @@ github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMX
 github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 h1:4BX8f882bXEDKfWIf0wa8HRvpnBoPszJJXL+TVbBw4M=
 github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/coreos/bbolt v1.3.1-coreos.6/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
+github.com/coreos/etcd v3.3.15+incompatible h1:+9RjdC18gMxNQVvSiXvObLu29mOFmkgdsB4cRTlV+EE=
 github.com/coreos/etcd v3.3.15+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7 h1:u9SHYsPQNyt5tgDm3YN7+9dYrpK96E5wFilTFWIDZOM=
 github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea h1:n2Ltr3SrfQlf/9nOna1DoGKxLx3qTSI8Ttl6Xrqp6mw=
 github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cppforlife/go-patch v0.2.0 h1:Y14MnCQjDlbw7WXT4k+u6DPAA9XnygN4BfrSpI/19RU=
 github.com/cppforlife/go-patch v0.2.0/go.mod h1:67a7aIi94FHDZdoeGSJRRFDp66l9MhaAG1yGxpUoFD8=
@@ -357,6 +361,7 @@ github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f/go.mod h1:Fecb
 github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc h1:f8eY6cV/x1x+HLjOp4r72s/31/V2aTUtg5oKRRPf8/Q=
 github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
 github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=
@@ -478,6 +483,7 @@ github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c h1:nXxl5PrvVm2L/wCy8dQu6DMTwH4oIuGN8GJDAlqDdVE=
 github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
+github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d h1:7PxY7LVfSZm7PEeBTyK1rj1gABdCO2mbri6GKO1cMDs=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
@@ -509,6 +515,7 @@ github.com/opencontainers/runc v0.1.1 h1:GlxAyO6x8rfZYN9Tt0Kti5a/cP41iuiO2yYT0IJ
 github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830 h1:yvQ/2Pupw60ON8TYEIGGTAI77yZsWYkiOeHFZWkwlCk=
 github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
+github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
@@ -634,8 +641,11 @@ github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wK
 go.mongodb.org/mongo-driver v1.1.3 h1:++7u8r9adKhGR+I79NfEtYrk2ktjenErXM99PSufIoI=
 go.mongodb.org/mongo-driver v1.1.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569 h1:nSQar3Y0E3VQF/VdZ8PTAilaXpER+d7ypdABCrpwMdg=
 go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df h1:shvkWr0NAZkg4nPuE3XrKP0VuBPijjk3TfX6Y6acFNg=
 go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15 h1:Z2sc4+v0JHV6Mn4kX1f2a5nruNjmV+Th32sugE8zwz8=
 go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -778,6 +788,7 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy
 gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
 gopkg.in/square/go-jose.v1 v1.1.2 h1:/5jmADZB+RiKtZGr4HxsEFOEfbfsjTKsVnqpThUpE30=
 gopkg.in/square/go-jose.v1 v1.1.2/go.mod h1:QpYS+a4WhS+DTlyQIi6Ka7MS3SuR9a055rgXNEe6EiA=
@@ -822,12 +833,14 @@ k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-201910010437
 k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20191001043732-d647ddbd755f/go.mod h1:f1tFT2pOqPzfckbG1GjHIzy3G+T2LW7rchcruNoLaiM=
 k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20191001043732-d647ddbd755f h1:X3br+JCtf40mnzQsKAnHnezd1CvCENgG5uLJTbAspZ4=
 k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20191001043732-d647ddbd755f/go.mod h1:PNw+FbGH4/s3zK9V3rAeMiHTbQz2CU/yqAkfQ2UgLVs=
+k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20191001043732-d647ddbd755f h1:QIhu1g7jmiv/90qGiPiCOTHFYEcrL0HA5P/6G/pt7zM=
 k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20191001043732-d647ddbd755f/go.mod h1:WmFoxjELD2xtWb77Yj9RPibT5ACkQYEW9lPQtNkGtbE=
 k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20191001043732-d647ddbd755f h1:6CkT409OUoX4ZiP++1N3id3PCcOoktBvclNsDKPKrfc=
 k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20191001043732-d647ddbd755f/go.mod h1:nBogvbgjMgo7AeVA6CuqVO13LVIfmlQ11t6xzAJdBN8=
 k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20191001043732-d647ddbd755f h1:ksJC2cpBqkCP8bzmfDYXr65JRpt9JmANvaKIR3qggt4=
 k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20191001043732-d647ddbd755f/go.mod h1:GiGfbsjtP4tOW6zgpL8/vCUoyXAV5+9X2onLursPi08=
 k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20191001043732-d647ddbd755f/go.mod h1:L8deZCu6NpzgKzY91TOGKJ1JtAoHd8WyJ/HdoxqZCGo=
+k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20191001043732-d647ddbd755f h1:fwZSUxpQ99UBEkIhHbzY2pE3SPU9Zn4yZkMSolEt6Jw=
 k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20191001043732-d647ddbd755f/go.mod h1:spPP+vRNS8EsnNNIhFCZTTuRO3XhV1WoF18HJySoZn8=
 k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20191001043732-d647ddbd755f h1:vH4+rTRLDI8z9dQCZ6cJcIi3RMGZ6JwJWyLbrSNHBCE=
 k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20191001043732-d647ddbd755f/go.mod h1:ellVfoCz8MlDjTnkqsTkU5svJOIjcK3XNx/onmixgDk=
@@ -845,6 +858,7 @@ rsc.io/letsencrypt v0.0.1/go.mod h1:buyQKZ6IXrRnB7TdkHP0RyEybLx18HHyOSoTyoOLqNY=
 sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
 sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
+sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca h1:6dsH6AYQWbyZmtttJNe8Gq1cXOeS1BdV3eW37zHilAQ=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA=
 sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
diff --git a/src/jetstream/load_plugins.go b/src/jetstream/load_plugins.go
index 188aef7b7c..861eb8c81b 100644
--- a/src/jetstream/load_plugins.go
+++ b/src/jetstream/load_plugins.go
@@ -7,12 +7,14 @@ import (
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cfappssh"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cloudfoundry"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cloudfoundryhosting"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/analysis"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/metrics"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/monocular"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/userfavorites"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/userinfo"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/userinvite"
+
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	log "github.com/sirupsen/logrus"
 )
@@ -39,6 +41,7 @@ func (pp *portalProxy) loadPlugins() {
 		{"monocular", monocular.Init},
 		{"userfavorites", userfavorites.Init},
 		{"autoscaler", autoscaler.Init},
+		{"analysis", analysis.Init},
 		{"backup", backup.Init},
 	} {
 		plugin, err := p.Init(pp)
diff --git a/src/jetstream/plugins/analysis/20200210105400_Analysis.go b/src/jetstream/plugins/analysis/20200210105400_Analysis.go
new file mode 100644
index 0000000000..f27d6bf873
--- /dev/null
+++ b/src/jetstream/plugins/analysis/20200210105400_Analysis.go
@@ -0,0 +1,43 @@
+package analysis
+
+import (
+	"database/sql"
+
+	"bitbucket.org/liamstask/goose/lib/goose"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore"
+)
+
+func init() {
+	datastore.RegisterMigration(20200210105400, "Analysis", func(txn *sql.Tx, conf *goose.DBConf) error {
+
+		createAnalysisTabls := "CREATE TABLE IF NOT EXISTS analysis ("
+		createAnalysisTabls += "id             VARCHAR(255) NOT NULL,"
+		createAnalysisTabls += "endpoint       VARCHAR(36) NOT NULL,"
+		createAnalysisTabls += "endpoint_type  VARCHAR(36) NOT NULL,"
+		createAnalysisTabls += "name           VARCHAR(255) NOT NULL,"
+		createAnalysisTabls += "user           VARCHAR(36) NOT NULL,"
+		createAnalysisTabls += "path           VARCHAR(255) NOT NULL,"
+		createAnalysisTabls += "type           VARCHAR(64) NOT NULL,"
+		createAnalysisTabls += "format         VARCHAR(64) NOT NULL,"
+		createAnalysisTabls += "created        TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,"
+		createAnalysisTabls += "acknowledged   BOOLEAN NOT NULL DEFAULT FALSE,"
+		createAnalysisTabls += "status         VARCHAR(16) NOT NULL,"
+		createAnalysisTabls += "duration       INT NOT NULL DEFAULT 0,"
+		createAnalysisTabls += "result         VARCHAR(255) NOT NULL,"
+		createAnalysisTabls += "PRIMARY KEY (id) );"
+
+		_, err := txn.Exec(createAnalysisTabls)
+		if err != nil {
+			return err
+		}
+
+		// createIndex := "CREATE INDEX charts_id ON charts (id);"
+		// _, err = txn.Exec(createIndex)
+		// if err != nil {
+		// 	return err
+		// }
+
+		return nil
+	})
+}
diff --git a/src/jetstream/plugins/analysis/container/Dockerfile b/src/jetstream/plugins/analysis/container/Dockerfile
new file mode 100644
index 0000000000..b9863a323a
--- /dev/null
+++ b/src/jetstream/plugins/analysis/container/Dockerfile
@@ -0,0 +1,61 @@
+FROM splatform/stratos-bk-build-base:leap15_1 as builder
+
+# Build the API Server for the analysis engines
+
+RUN mkdir -p /home/stratos/go/src
+WORKDIR /home/stratos/go/src
+COPY --chown=stratos:users . /home/stratos/go/src
+ARG VERSION=1.0.0
+RUN GO111MODULE=on go build -o stratos-analyzers -ldflags -X=main.appVersion=${VERSION}
+
+# Download the Analysis tools
+WORKDIR /home/stratos/analysis
+WORKDIR /home/stratos/tmp
+USER root
+
+# Analyzers ====================================================================================================================
+
+
+# Popeye
+ARG POPEYE_VERSION=0.6.2
+# Download archive - popeye executable is in main dir - move it to the analysis folder
+RUN wget https://github.com/derailed/popeye/releases/download/v${POPEYE_VERSION}/popeye_${POPEYE_VERSION}_Linux_x86_64.tar.gz && \
+    tar -xvf popeye_${POPEYE_VERSION}_Linux_x86_64.tar.gz && \
+    mv popeye ../analysis
+
+# Kube-score
+ARG KUBESCORE_VERSION=1.5.0
+RUN wget https://github.com/zegl/kube-score/releases/download/v${KUBESCORE_VERSION}/kube-score_${KUBESCORE_VERSION}_linux_amd64.tar.gz && \
+    tar -xvf kube-score_${KUBESCORE_VERSION}_linux_amd64.tar.gz && \
+    mv kube-score ../analysis
+
+# Sonobuoy
+# ARG SONOBUOY_VERSION=0.17.2
+# RUN wget https://github.com/vmware-tanzu/sonobuoy/releases/download/v${SONOBUOY_VERSION}/sonobuoy_${SONOBUOY_VERSION}_linux_amd64.tar.gz && \
+#     tar -xvf sonobuoy_${SONOBUOY_VERSION}_linux_amd64.tar.gz && \
+#     mv sonobuoy ../analysis
+
+# Need kubectl for Kubescore - TODO: Use correct version depending on cluster
+ARG KUBECTL_VERSION=1.16.2
+RUN wget https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl && \
+    chmod +x kubectl && \
+    mv kubectl ../analysis
+
+# klar
+# ARG KLAR_VERSION=2.4.0
+# RUN wget https://github.com/optiopay/klar/releases/download/v${KLAR_VERSION}/klar-${KLAR_VERSION}-linux-amd64 && \
+#     mv klar-${KLAR_VERSION}-linux-amd64 klar && \
+#     chmod +x klar && \
+#     mv klar ../analysis
+
+# Final Container =============================================================================================================
+
+FROM splatform/stratos-bk-base:leap15_1
+
+# Copy tools to the /usr/bin folder so that they are in the path
+COPY --from=builder /home/stratos/analysis /usr/bin
+COPY --from=builder /home/stratos/go/src/stratos-analyzers /stratos-analyzers
+COPY ./scripts /scripts
+RUN mkdir /reports
+
+CMD ["/stratos-analyzers"]
diff --git a/src/jetstream/plugins/analysis/container/go.mod b/src/jetstream/plugins/analysis/container/go.mod
new file mode 100644
index 0000000000..d9101c6c6c
--- /dev/null
+++ b/src/jetstream/plugins/analysis/container/go.mod
@@ -0,0 +1,12 @@
+module analyzers
+
+go 1.13
+
+require (
+	github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
+	github.com/labstack/echo v3.3.10+incompatible
+	github.com/labstack/gommon v0.3.0 // indirect
+	github.com/sirupsen/logrus v1.4.2
+	github.com/valyala/fasttemplate v1.1.0 // indirect
+	golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d // indirect
+)
diff --git a/src/jetstream/plugins/analysis/container/go.sum b/src/jetstream/plugins/analysis/container/go.sum
new file mode 100644
index 0000000000..ae076adf3a
--- /dev/null
+++ b/src/jetstream/plugins/analysis/container/go.sum
@@ -0,0 +1,48 @@
+github.com/cloudfoundry-incubator/stratos v2.0.0-beta-001+incompatible h1:UUxNbLjhv2cfymub5yNN1tjjqYkteHBBagb4jcbXEIQ=
+github.com/cloudfoundry-incubator/stratos/src/jetstream v0.0.0-20200222120421-390cf0f6670b h1:52Py09Cmdnyxr750Tj5InffbWJpCDTWie0RCbxxoUAA=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8bbnE7CX5OEgg=
+github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s=
+github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0=
+github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
+github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
+github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg=
+github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
+github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
+github.com/valyala/fasttemplate v1.1.0 h1:RZqt0yGBsps8NGvLSGW804QQqCUYYLsaOjTVHy1Ocw4=
+github.com/valyala/fasttemplate v1.1.0/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d h1:1ZiEyfaQIg3Qh0EoqpwAakHVhecoE5wlSg5GjnafJGw=
+golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/src/jetstream/plugins/analysis/container/kubescore.go b/src/jetstream/plugins/analysis/container/kubescore.go
new file mode 100644
index 0000000000..959e15964b
--- /dev/null
+++ b/src/jetstream/plugins/analysis/container/kubescore.go
@@ -0,0 +1,59 @@
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"time"
+
+	log "github.com/sirupsen/logrus"
+)
+
+func runKubeScore(job *AnalysisJob) error {
+
+	log.Debug("Running kube-score job")
+
+	job.Busy = true
+	job.Type = "kubescore"
+	job.Format = "kubescore"
+	setJobNameAndPath(job, "Kube-score")
+
+	scriptPath := filepath.Join(getScriptFolder(), "kubescore-runner.sh")
+	args := []string{scriptPath, job.KubeConfigPath, job.Config.Namespace}
+
+	log.Infof("Running kube score job: %s", job.Path)
+
+	go func() {
+		// Use our custom script which is a wrapper around kubescore
+		cmd := exec.Command("bash", args...)
+		cmd.Dir = job.Folder
+		cmd.Env = make([]string, 0)
+		cmd.Env = append(cmd.Env, fmt.Sprintf("KUBECONFIG=%s", job.KubeConfigPath))
+
+		start := time.Now()
+		out, err := cmd.Output()
+		end := time.Now()
+
+		log.Infof("Completed kube score job: %s", job.Path)
+
+		// Remove any config files when done
+		job.RemoveTempFiles()
+
+		job.Duration = int(end.Sub(start).Seconds())
+
+		if err != nil {
+			// There was an error
+			// Remove the folder
+			os.Remove(job.Folder)
+			job.Status = "error"
+		} else {
+			reportFile := filepath.Join(job.Folder, "report.log")
+			ioutil.WriteFile(reportFile, out, os.ModePerm)
+			job.Status = "completed"
+		}
+	}()
+
+	return nil
+}
diff --git a/src/jetstream/plugins/analysis/container/main.go b/src/jetstream/plugins/analysis/container/main.go
new file mode 100644
index 0000000000..533ec83786
--- /dev/null
+++ b/src/jetstream/plugins/analysis/container/main.go
@@ -0,0 +1,171 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"github.com/labstack/echo"
+	"github.com/labstack/echo/middleware"
+	log "github.com/sirupsen/logrus"
+)
+
+const (
+	defaultPort      = 8090
+	defaultAddress   = "0.0.0.0"
+	reportsDirEnvVar = "ANALYSIS_REPORTS_DIR"
+	scriptsDirEnvVar = "ANALYSIS_SCRIPTS_DIR"
+)
+
+type Analyzer struct {
+	reportsDir string
+	jobs       map[string]*AnalysisJob
+}
+
+func main() {
+	log.SetFormatter(&log.TextFormatter{ForceColors: true, FullTimestamp: true, TimestampFormat: time.UnixDate})
+
+	log.SetOutput(os.Stdout)
+
+	log.Info("========================================")
+	log.Info("=== Stratos Analysis API Server      ===")
+	log.Info("========================================")
+	log.Info("")
+	log.Info("Initialization started.")
+
+	analyzer := Analyzer{}
+	analyzer.jobs = make(map[string]*AnalysisJob)
+
+	analyzer.Start()
+}
+
+func (a *Analyzer) Start() {
+
+	// Reports folder
+
+	// Init reports directory
+	if reportsDir, ok := os.LookupEnv(reportsDirEnvVar); ok {
+		dir, err := filepath.Abs(reportsDir)
+		if err != nil {
+			log.Fatal("Can not get absolute path for reports folder")
+		}
+		a.reportsDir = dir
+	} else {
+		a.reportsDir = filepath.Join(os.TempDir(), "stratos-analysis")
+	}
+	log.Infof("Using reports folder: %s", a.reportsDir)
+
+	// Make the directory if it does not exit
+	if _, err := os.Stat(a.reportsDir); os.IsNotExist(err) {
+		if os.MkdirAll(a.reportsDir, os.ModePerm) != nil {
+			log.Fatal("Could not create folder for analysis reports")
+		}
+	}
+
+	// Start a simple web server
+	e := echo.New()
+	e.HideBanner = true
+	e.HidePort = true
+	customLoggerConfig := middleware.LoggerConfig{
+		Format: `Request: [${time_rfc3339}] Remote-IP:"${remote_ip}" ` +
+			`Method:"${method}" Path:"${path}" Status:${status} Latency:${latency_human} ` +
+			`Bytes-In:${bytes_in} Bytes-Out:${bytes_out}` + "\n",
+	}
+	e.Use(middleware.LoggerWithConfig(customLoggerConfig))
+	e.Use(middleware.Recover())
+
+	a.registerRoutes(e)
+
+	var engineErr error
+	address := fmt.Sprintf("%s:%d", defaultAddress, defaultPort)
+	log.Infof("Starting HTTP Server at address: %s", address)
+	engineErr = e.Start(address)
+
+	if engineErr != nil {
+		engineErrStr := fmt.Sprintf("%s", engineErr)
+		if !strings.Contains(engineErrStr, "Server closed") {
+			log.Warnf("Failed to start HTTP/S server: %+v", engineErr)
+		}
+	}
+}
+
+func (a *Analyzer) registerRoutes(e *echo.Echo) {
+	api := e.Group("/api")
+	api.Use(setSecureCacheContentMiddleware)
+
+	// Liveness check
+	api.GET("/v1/ping", a.ping)
+	// Run the given analyzer
+	api.POST("/v1/run/:analyzer", a.run)
+	// Get status
+	api.POST("/v1/status", a.status)
+	// Get a report
+	api.GET("/v1/report/:user/:endpoint/:id/:file", a.report)
+	// Delete a report
+	api.DELETE("/v1/report/:user/:endpoint/:id", a.delete)
+	// Delete all reports for an endpoint
+	api.DELETE("/v1/report/:endpoint", a.deleteEndpoint)
+}
+
+func setSecureCacheContentMiddleware(h echo.HandlerFunc) echo.HandlerFunc {
+	return func(c echo.Context) error {
+		c.Response().Header().Set("cache-control", "no-store")
+		c.Response().Header().Set("pragma", "no-cache")
+		return h(c)
+	}
+}
+
+// Set the name of the job
+func setJobNameAndPath(job *AnalysisJob, title string) {
+	job.Name = fmt.Sprintf("%s cluster analysis", title)
+	job.Path = ""
+
+	log.Info("setJobNameAndPath")
+	log.Infof("%+v", job.Config)
+
+	if job.Config != nil {
+		if len(job.Config.Namespace) > 0 {
+			if len(job.Config.App) > 0 {
+				job.Name = fmt.Sprintf("%s workload analysis: %s in %s", title, job.Config.App, job.Config.Namespace)
+				job.Path = fmt.Sprintf("%s/%s", job.Config.Namespace, job.Config.App)
+			} else {
+				job.Name = fmt.Sprintf("%s namespace analysis: %s", title, job.Config.Namespace)
+				job.Path = job.Config.Namespace
+			}
+		}
+	}
+}
+
+func getScriptFolder() string {
+	fallbackPath, err := os.Getwd()
+	if err != nil {
+		fallbackPath = "."
+	}
+
+	// Look first at the env var, then at a relative path to the executable
+	if dir, ok := os.LookupEnv(scriptsDirEnvVar); ok {
+		return dir
+	}
+
+	// Relative to the executable
+	dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
+	if err != nil {
+		log.Error("Could not get folder of the running program")
+		return fallbackPath
+	}
+
+	scripts := filepath.Join(dir, "scripts")
+	if _, err := os.Stat(scripts); !os.IsNotExist(err) {
+		return scripts
+	}
+
+	scripts = filepath.Join(dir, "plugins±", "analysis", "container", "scripts")
+	if _, err := os.Stat(scripts); !os.IsNotExist(err) {
+		return scripts
+	}
+
+	log.Error("Unable to locate scripts folder")
+	return fallbackPath
+}
diff --git a/src/jetstream/plugins/analysis/container/popeye.go b/src/jetstream/plugins/analysis/container/popeye.go
new file mode 100644
index 0000000000..209224a92e
--- /dev/null
+++ b/src/jetstream/plugins/analysis/container/popeye.go
@@ -0,0 +1,108 @@
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"time"
+
+	log "github.com/sirupsen/logrus"
+)
+
+type popEyeSummary struct {
+	Score int    `json:"score"`
+	Grade string `json:"grade"`
+}
+
+type popEyeResult struct {
+	PopEye popEyeSummary `json:"popeye"`
+}
+
+func runPopeye(job *AnalysisJob) error {
+
+	log.Debug("Running popeye job")
+
+	job.Busy = true
+	job.Type = "popeye"
+	job.Format = "popeye"
+	setJobNameAndPath(job, "Popeye")
+
+	log.Infof("Running popeye job: %s", job.Path)
+
+	args := []string{"--kubeconfig", job.KubeConfigPath, "-o", "json", "--insecure-skip-tls-verify"}
+	if len(job.Config.Namespace) > 0 {
+		args = append(args, "-n")
+		args = append(args, job.Config.Namespace)
+	} else {
+		args = append(args, "-A")
+	}
+
+	go func() {
+		cmd := exec.Command("popeye", args...)
+		cmd.Dir = job.Folder
+
+		start := time.Now()
+		out, err := cmd.Output()
+		end := time.Now()
+		job.EndTime = end
+
+		job.Busy = false
+
+		log.Infof("Completed kube score job: %s", job.Path)
+
+		// Remove any config files when done
+		job.RemoveTempFiles()
+
+		job.Duration = int(end.Sub(start).Seconds())
+
+		if err != nil {
+			// There was an error
+			// Remove the folder
+			os.Remove(job.Folder)
+			job.Status = "error"
+		} else {
+			reportFile := filepath.Join(job.Folder, "report.json")
+			ioutil.WriteFile(reportFile, out, os.ModePerm)
+			job.Status = "completed"
+
+			// Parse the report
+			if summary, err := parsePopeyeReport(reportFile); err == nil {
+				job.Result = serializePopeyeReport(summary)
+			}
+		}
+	}()
+
+	return nil
+}
+
+func parsePopeyeReport(file string) (*popEyeSummary, error) {
+	jsonFile, err := os.Open(file)
+	if err != nil {
+		return nil, err
+	}
+	defer jsonFile.Close()
+
+	data, err := ioutil.ReadAll(jsonFile)
+	if err != nil {
+		return nil, err
+	}
+
+	result := popEyeResult{}
+	if err = json.Unmarshal(data, &result); err != nil {
+		return nil, errors.New("Failed to parse Popeye report")
+	}
+
+	return &result.PopEye, nil
+}
+
+func serializePopeyeReport(summary *popEyeSummary) string {
+	jsonString, err := json.Marshal(summary)
+	if err != nil {
+		return ""
+	}
+
+	return string(jsonString)
+}
diff --git a/src/jetstream/plugins/analysis/container/routes.go b/src/jetstream/plugins/analysis/container/routes.go
new file mode 100644
index 0000000000..3b3c846e2b
--- /dev/null
+++ b/src/jetstream/plugins/analysis/container/routes.go
@@ -0,0 +1,90 @@
+package main
+
+import (
+	"errors"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/labstack/echo"
+	log "github.com/sirupsen/logrus"
+)
+
+// Ping endpoint
+func (a *Analyzer) ping(ec echo.Context) error {
+	return nil
+}
+
+// Get a given report
+func (a *Analyzer) report(ec echo.Context) error {
+
+	user := ec.Param("user")
+	endpoint := ec.Param("endpoint")
+	id := ec.Param("id")
+	name := ec.Param("file")
+
+	// Name must end in json - we only serve json files
+	if !strings.HasSuffix(name, ".json") {
+		return errors.New("Can't serve that file")
+	}
+
+	file := filepath.Join(a.reportsDir, user, endpoint, id, name)
+	_, err := os.Stat(file)
+	if os.IsNotExist(err) {
+		return echo.NewHTTPError(404, "No such file")
+	}
+
+	return ec.File(file)
+}
+
+// Delete a given report
+func (a *Analyzer) delete(ec echo.Context) error {
+	log.Debug("delete report")
+
+	user := ec.Param("user")
+	endpoint := ec.Param("endpoint")
+	id := ec.Param("id")
+	folder := filepath.Join(a.reportsDir, user, endpoint, id)
+	if err := os.RemoveAll(folder); err != nil {
+		log.Warnf("Could not delete Analysis report folder: %s", folder)
+		return echo.NewHTTPError(http.StatusInternalServerError, "Could not delete report")
+	}
+
+	return nil
+}
+
+// Delete all reports for a given endpoint
+func (a *Analyzer) deleteEndpoint(ec echo.Context) error {
+	log.Debug("delete reports for endpoint")
+
+	endpoint := ec.Param("endpoint")
+
+	// Iterate over all user folders
+	if items, err := ioutil.ReadDir(a.reportsDir); err == nil {
+		for _, item := range items {
+			if item.IsDir() {
+				// This is a user's folder - see if they have a folder for the endpoint
+				folder := filepath.Join(a.reportsDir, item.Name(), endpoint)
+				if folderExists(folder) {
+					if err := os.RemoveAll(folder); err != nil {
+						log.Warnf("Could not delete Analysis report endpoint folder: %s", folder)
+					}
+				}
+			}
+		}
+	} else {
+		return echo.NewHTTPError(http.StatusInternalServerError, "Error deleteing reports")
+	}
+
+	return nil
+}
+
+func folderExists(filename string) bool {
+	info, err := os.Stat(filename)
+	if os.IsNotExist(err) {
+		return false
+	}
+	return info.IsDir()
+}
diff --git a/src/jetstream/plugins/analysis/container/run.go b/src/jetstream/plugins/analysis/container/run.go
new file mode 100644
index 0000000000..06310a41eb
--- /dev/null
+++ b/src/jetstream/plugins/analysis/container/run.go
@@ -0,0 +1,130 @@
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"path/filepath"
+
+	"github.com/labstack/echo"
+	log "github.com/sirupsen/logrus"
+)
+
+const idHeaderName = "X-Stratos-Analaysis-ID"
+
+func (a *Analyzer) run(ec echo.Context) error {
+	err := a.doRun(ec)
+	if err != nil {
+		log.Error(err)
+	}
+	return err
+}
+
+func (a *Analyzer) doRun(ec echo.Context) error {
+
+	log.Debug("Run analyzer!")
+
+	engine := ec.Param("analyzer")
+	if len(engine) == 0 {
+		log.Warn("No analyzer")
+		return errors.New("No analyzer specified")
+	}
+
+	// ID is username/endpoint/id
+	id := ec.Request().Header.Get(idHeaderName)
+	if len(id) == 0 {
+		return errors.New("Mising ID header")
+	}
+
+	folder := filepath.Join(a.reportsDir, id)
+	if os.MkdirAll(folder, os.ModePerm) != nil {
+		return errors.New("Could not create folder for analysis report")
+	}
+
+	tempFiles := make([]string, 0)
+	reader, err := ec.Request().MultipartReader()
+	if err != nil {
+		log.Error("Could not parse request")
+		log.Error(err)
+		return errors.New("Failed to parse request payload")
+	}
+
+	job := AnalysisJob{}
+	params := kubeAnalyzerConfig{}
+
+	for {
+		part, err := reader.NextPart()
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			log.Error("Unexpected error when retrieving a part of the message")
+			return errors.New("Unexpected error when retrieving a part of the message")
+		}
+		defer part.Close()
+		fileBytes, err := ioutil.ReadAll(part)
+		if err != nil {
+			log.Error("Failed to read content of the part")
+			return errors.New("Failed to read content of the part")
+		}
+		filename := part.Header.Get("Content-ID")
+
+		// Decide what to do with the part
+		switch filename {
+		case "job":
+			if err = json.Unmarshal(fileBytes, &job); err != nil {
+				return fmt.Errorf("Can not parse Job: %v", err)
+			}
+		case "body":
+			if err = json.Unmarshal(fileBytes, &params); err != nil {
+				return fmt.Errorf("Can not parse parameters: %v", err)
+			}
+			job.Config = &params
+		default:
+			fullpath := filepath.Join(folder, filename)
+			if err = ioutil.WriteFile(fullpath, fileBytes, os.ModePerm); err != nil {
+				log.Error("Could not write data for: %s", filename)
+				return fmt.Errorf("Could not write file data for: %s", filename)
+			}
+			if filename == "kubeconfig" {
+				job.KubeConfigPath = fullpath
+			}
+			tempFiles = append(tempFiles, fullpath)
+		}
+	}
+
+	if len(job.ID) == 0 {
+		return errors.New("Invalid Job metadata supplied")
+	}
+
+	job.Folder = folder
+	job.TempFiles = tempFiles
+
+	// Store the job so we track which jobs are running
+	a.jobs[job.ID] = &job
+
+	job.Status = "running"
+
+	switch engine {
+	case "popeye":
+		err = runPopeye(&job)
+	case "kube-score":
+		err = runKubeScore(&job)
+	// case "sonobuoy":
+	// 	runSonobuoy(dbStore, file, folder, report, requestBody)
+	default:
+		job.Status = "error"
+		return fmt.Errorf("Unkown analyzer: %s", engine)
+	}
+
+	if err != nil {
+		job.Status = "error"
+		log.Error("Error running analyzer: %s", err)
+	}
+
+	return ec.JSON(http.StatusOK, job)
+}
diff --git a/src/jetstream/plugins/analysis/container/scripts/kubescore-runner.sh b/src/jetstream/plugins/analysis/container/scripts/kubescore-runner.sh
new file mode 100755
index 0000000000..2763b3008f
--- /dev/null
+++ b/src/jetstream/plugins/analysis/container/scripts/kubescore-runner.sh
@@ -0,0 +1,16 @@
+ARGS="--all-namespaces"
+
+if [ -n "$2" ]; then
+  ARGS="-n ${2}"
+fi
+
+# $1 is the kubeconfig file
+
+echo "Kubescore runner..."
+echo "Running report..."
+
+kubectl api-resources --verbs=list --namespaced -o name \
+  | xargs -n1 -I{} bash -c "kubectl get {} $ARGS -oyaml && echo ---" \
+  | kube-score score -o json - > report.json
+
+exit 0
diff --git a/src/jetstream/plugins/analysis/container/scripts/sonobuoy-runner.sh b/src/jetstream/plugins/analysis/container/scripts/sonobuoy-runner.sh
new file mode 100755
index 0000000000..8565beed6f
--- /dev/null
+++ b/src/jetstream/plugins/analysis/container/scripts/sonobuoy-runner.sh
@@ -0,0 +1,19 @@
+# $1 is the kubeconfig file
+
+echo "Sonobuoy runner..."
+env
+echo "Args"
+echo $@
+
+echo "Running report..."
+
+# Run the report and wait
+sonobuoy run --wait
+
+# Retrieve the report
+
+# Teardown sonobuoy
+
+# Unpack the report and copy the junit report to report.json at the top-level
+
+exit 0
diff --git a/src/jetstream/plugins/analysis/container/sonobuoy.go_ b/src/jetstream/plugins/analysis/container/sonobuoy.go_
new file mode 100644
index 0000000000..80be589427
--- /dev/null
+++ b/src/jetstream/plugins/analysis/container/sonobuoy.go_
@@ -0,0 +1,92 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/analysis/store"
+	log "github.com/sirupsen/logrus"
+)
+
+func runSonobuoy(dbStore store.AnalysisStore, kubeconfig, folder string, report store.AnalysisRecord, body []byte) error {
+	path := ""
+	namespace := ""
+	options := &popeyeConfig{}
+	if err := json.Unmarshal(body, options); err == nil {
+		namespace = options.Namespace
+		path = namespace
+
+		if len(options.App) > 0 {
+			path = fmt.Sprintf("%s/%s", path, options.App)
+		}
+	}
+	report.Name = "Sonobuoy cluster analysis"
+	report.Type = "sonobuoy"
+	report.Format = "junit"
+
+	scriptPath := filepath.Join(getScriptFolder(), "sonobuoy-runner.sh")
+	args := []string{scriptPath, kubeconfig, namespace}
+	log.Error(scriptPath)
+
+	report.Path = path
+	parts := len(strings.Split(path, "/"))
+	if parts == 2 {
+		report.Name = fmt.Sprintf("Sonobuoy workload analysis: %s in %s", options.App, namespace)
+	} else if parts == 1 && len(namespace) > 0 {
+		report.Name = fmt.Sprintf("Sonobuoy namespace analysis: %s", namespace)
+	}
+
+	_, err := dbStore.Save(report)
+	if err != nil {
+		return err
+	}
+
+	go func() {
+		// Use our custom script which is a wrapper around kubescore
+		cmd := exec.Command("bash", args...)
+		cmd.Dir = folder
+		cmd.Env = make([]string, 0)
+		cmd.Env = append(cmd.Env, fmt.Sprintf("KUBECONFIG=%s", kubeconfig))
+		log.Info(kubeconfig)
+
+		start := time.Now()
+		out, err := cmd.Output()
+		end := time.Now()
+
+		// Remove the config file when we are done
+		//os.Remove(kubeconfig)
+
+		if err != nil {
+			// There was an error
+			// Remove the folder
+			os.Remove(folder)
+			log.Error(">>>>>>>>> ERROR <<<<<<<<<")
+			log.Error(string(out))
+			log.Error(err)
+			report.Status = "error"
+		} else {
+			report.Status = "completed"
+
+			// Parse the report
+			// if summary, err := parsePopeyeReport(reportFile); err == nil {
+			// 	report.Result = serializePopeyeReport(summary)
+			// }
+
+			// Write stdout to log file
+			reportFile := filepath.Join(folder, "report.log")
+			ioutil.WriteFile(reportFile, out, os.ModePerm)
+		}
+
+		report.Duration = int(end.Sub(start).Seconds())
+
+		dbStore.UpdateReport(report.UserID, &report)
+	}()
+
+	return nil
+}
diff --git a/src/jetstream/plugins/analysis/container/status.go b/src/jetstream/plugins/analysis/container/status.go
new file mode 100644
index 0000000000..52ad376502
--- /dev/null
+++ b/src/jetstream/plugins/analysis/container/status.go
@@ -0,0 +1,74 @@
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"io/ioutil"
+
+	"github.com/labstack/echo"
+	log "github.com/sirupsen/logrus"
+)
+
+func (a *Analyzer) status(ec echo.Context) error {
+	err := a.doStatus(ec)
+	if err != nil {
+		log.Error(err)
+	}
+	return err
+}
+
+func (a *Analyzer) doStatus(ec echo.Context) error {
+	log.Debug("Status")
+	req := ec.Request()
+
+	// Body contains an array of IDs that the client thinks are running
+	// We send back updated status for each
+
+	// Get the list of IDs
+	defer req.Body.Close()
+	body, err := ioutil.ReadAll(req.Body)
+	if err != nil {
+		return errors.New("Could not read body")
+	}
+
+	ids := make([]string, 0)
+	if err := json.Unmarshal(body, &ids); err != nil {
+		return errors.New("Failed to parse body")
+	}
+
+	response := make(map[string]AnalysisJob)
+	for _, id := range ids {
+		if a.jobs[id] == nil {
+			// Client has a running job that we know nothing about - so must be an error
+			job := AnalysisJob{
+				ID:     id,
+				Status: "error",
+			}
+			response[id] = job
+		} else {
+			response[id] = *a.jobs[id]
+		}
+	}
+
+	// Go through all of the jobs we have and increment the cleanup counter of those that are finished
+	// Assume after 5 requests to the status API that the caller has the info they need for the completed job
+	// and remove it
+	cleanup := make([]string, 0)
+	for id, job := range a.jobs {
+		// If the job has finished, increment the cleanup counter
+		// We will remove it from our cache once we are pretty sure Jetstream has the status
+		if !job.Busy {
+			job.CleanupCounter = job.CleanupCounter + 1
+			if job.CleanupCounter > 5 {
+				cleanup = append(cleanup, id)
+			}
+		}
+	}
+
+	for _, id := range cleanup {
+		delete(a.jobs, id)
+	}
+
+	ec.JSON(200, response)
+	return nil
+}
diff --git a/src/jetstream/plugins/analysis/container/types.go b/src/jetstream/plugins/analysis/container/types.go
new file mode 100644
index 0000000000..fb9de49c8c
--- /dev/null
+++ b/src/jetstream/plugins/analysis/container/types.go
@@ -0,0 +1,48 @@
+package main
+
+import (
+	"encoding/json"
+	"os"
+	"time"
+
+	log "github.com/sirupsen/logrus"
+)
+
+type kubeAnalyzerConfig struct {
+	Namespace string `json:"namespace"`
+	App       string `json:"app"`
+}
+
+// AnalysisJob is the metadata format sent to and from the analyzer
+type AnalysisJob struct {
+	ID             string              `json:"id"`
+	UserID         string              `json:"-"`
+	EndpointType   string              `json:"endpointType"`
+	EndpointID     string              `json:"endpoint"`
+	Type           string              `json:"type"`
+	Path           string              `json:"path"`
+	Format         string              `json:"format"`
+	Name           string              `json:"name"`
+	Status         string              `json:"status"`
+	Duration       int                 `json:"duration"`
+	Result         string              `json:"-"`
+	Summary        *json.RawMessage    `json:"summary"`
+	Config         *kubeAnalyzerConfig `json:"-"`
+	Folder         string              `json:"-"`
+	KubeConfigPath string              `json:"-"`
+	TempFiles      []string            `json:"-"`
+	Busy           bool                `json:"-"`
+	EndTime        time.Time           `json:"-"`
+	CleanupCounter int                 `json:"-"`
+}
+
+// RemoveTempFiles will remove any temporary files
+func (job *AnalysisJob) RemoveTempFiles() {
+	log.Debug("Removing temporary files")
+	for _, name := range job.TempFiles {
+		err := os.Remove(name)
+		if err != nil {
+			log.Error("Could not delete file: %s", name)
+		}
+	}
+}
diff --git a/src/jetstream/plugins/analysis/list.go b/src/jetstream/plugins/analysis/list.go
new file mode 100644
index 0000000000..c03f7af4fe
--- /dev/null
+++ b/src/jetstream/plugins/analysis/list.go
@@ -0,0 +1,228 @@
+package analysis
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"strings"
+	"time"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/analysis/store"
+
+	"github.com/labstack/echo"
+
+	log "github.com/sirupsen/logrus"
+)
+
+const mainReportFile = "report.json"
+
+// listReports will list the analysis repotrs that have run
+func (c *Analysis) listReports(ec echo.Context) error {
+	log.Debug("listReports")
+	var p = c.portalProxy
+
+	// Need to get a config object for the target endpoint
+	// endpointGUID := ec.Param("endpoint")
+	userID := ec.Get("user_id").(string)
+	endpointID := ec.Param("endpoint")
+
+	// Create a record in the reports datastore
+	dbStore, err := store.NewAnalysisDBStore(p.GetDatabaseConnection())
+	if err != nil {
+		return err
+	}
+
+	reports, err := dbStore.List(userID, endpointID)
+	if err != nil {
+		return err
+	}
+
+	for _, report := range reports {
+		populateSummary(report)
+	}
+
+	return ec.JSON(200, reports)
+}
+
+// getReportsByPath will list the completed analysis repotrs that have run for the specified path
+func (c *Analysis) getReportsByPath(ec echo.Context) error {
+	log.Debug("getReportsByPath")
+	var p = c.portalProxy
+
+	// Need to get a config object for the target endpoint
+	userID := ec.Get("user_id").(string)
+	endpointID := ec.Param("endpoint")
+
+	pathPrefix := fmt.Sprintf("completed/%s/", endpointID)
+	index := strings.Index(ec.Request().RequestURI, pathPrefix)
+	if index < 0 {
+		return errors.New("Invalid request")
+	}
+	path := ec.Request().RequestURI[index+len(pathPrefix):]
+
+	// Create a record in the reports datastore
+	dbStore, err := store.NewAnalysisDBStore(p.GetDatabaseConnection())
+	if err != nil {
+		return err
+	}
+
+	reports, err := dbStore.ListCompletedByPath(userID, endpointID, path)
+	if err != nil {
+		return err
+	}
+
+	for _, report := range reports {
+		populateSummary(report)
+	}
+
+	return ec.JSON(200, reports)
+}
+
+func populateSummary(report *store.AnalysisRecord) {
+	if report.Status == "error" {
+		report.Error = report.Result
+	} else if len(report.Result) > 0 {
+		data := []byte(report.Result)
+		report.Summary = (*json.RawMessage)(&data)
+	}
+}
+
+func (c *Analysis) getLatestReport(ec echo.Context) error {
+	log.Debug("getLatestReport")
+	var p = c.portalProxy
+
+	// Need to get a config object for the target endpoint
+	userID := ec.Get("user_id").(string)
+	endpointID := ec.Param("endpoint")
+
+	pathPrefix := fmt.Sprintf("latest/%s/", endpointID)
+	index := strings.Index(ec.Request().RequestURI, pathPrefix)
+	if index < 0 {
+		return errors.New("Invalid request")
+	}
+	path := ec.Request().RequestURI[index+len(pathPrefix):]
+
+	// Create a record in the reports datastore
+	dbStore, err := store.NewAnalysisDBStore(p.GetDatabaseConnection())
+	if err != nil {
+		return err
+	}
+
+	report, err := dbStore.GetLatestCompleted(userID, endpointID, path)
+	if err != nil {
+		return echo.NewHTTPError(404, "No Analysis Report found")
+	}
+
+	if ec.Request().Method == "HEAD" {
+		ec.Response().Status = 200
+		return nil
+	}
+
+	// Get the report contents from the analysis server
+	bytes, err := c.getReportFile(report.UserID, report.EndpointID, report.ID, mainReportFile)
+	if err != nil {
+		return err
+	}
+
+	report.Report = (*json.RawMessage)(&bytes)
+	return ec.JSON(200, report)
+}
+
+func (c *Analysis) getReport(ec echo.Context) error {
+	log.Debug("getReport")
+	var p = c.portalProxy
+
+	// Need to get a config object for the target endpoint
+	userID := ec.Get("user_id").(string)
+	ID := ec.Param("id")
+	file := ec.Param("file")
+	if len(file) == 0 {
+		file = mainReportFile
+	}
+
+	// Create a record in the reports datastore
+	dbStore, err := store.NewAnalysisDBStore(p.GetDatabaseConnection())
+	if err != nil {
+		return err
+	}
+
+	report, err := dbStore.Get(userID, ID)
+	if err != nil {
+		return err
+	}
+
+	// Get the report contents from the analysis server
+	bytes, err := c.getReportFile(report.UserID, report.EndpointID, report.ID, file)
+	if err != nil {
+		return err
+	}
+
+	report.Report = (*json.RawMessage)(&bytes)
+	return ec.JSON(200, report)
+}
+
+func (c *Analysis) deleteReports(ec echo.Context) error {
+	log.Debug("deleteReports")
+	var p = c.portalProxy
+
+	// Need to get a config object for the target endpoint
+	userID := ec.Get("user_id").(string)
+
+	defer ec.Request().Body.Close()
+	body, err := ioutil.ReadAll(ec.Request().Body)
+	if err != nil {
+		return err
+	}
+
+	var ids []string
+	ids = make([]string, 0)
+	if err = json.Unmarshal(body, &ids); err != nil {
+		return err
+	}
+
+	dbStore, err := store.NewAnalysisDBStore(p.GetDatabaseConnection())
+	if err != nil {
+		return err
+	}
+
+	for _, id := range ids {
+		// Look up the report to get the endpoint ID
+		if job, err := dbStore.Get(userID, id); err == nil {
+			deleteURL := fmt.Sprintf("%s/api/v1/report/%s/%s/%s", c.analysisServer, job.UserID, job.EndpointID, job.ID)
+			r, _ := http.NewRequest(http.MethodDelete, deleteURL, nil)
+			client := &http.Client{Timeout: 30 * time.Second}
+			rsp, err := client.Do(r)
+			if err != nil {
+				log.Warnf("Could not delete analysis report for: %s", job.ID)
+			} else if rsp.StatusCode != http.StatusOK {
+				log.Warnf("Could not delete analysis report for: %s", job.ID)
+			}
+		}
+		dbStore.Delete(userID, id)
+	}
+
+	return ec.JSON(200, ids)
+}
+
+func (c *Analysis) getReportFile(userID, endpointID, ID, name string) ([]byte, error) {
+	// Make request to get report
+	statusURL := fmt.Sprintf("%s/api/v1/report/%s/%s/%s/%s", c.analysisServer, userID, endpointID, ID, name)
+	r, _ := http.NewRequest(http.MethodGet, statusURL, nil)
+	client := &http.Client{Timeout: 30 * time.Second}
+	rsp, err := client.Do(r)
+	if err != nil {
+		return nil, fmt.Errorf("Failed getting report from Analyzer service: %v", err)
+	} else if rsp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("Failed getting report from Analyzer service: %d", rsp.StatusCode)
+	}
+
+	defer rsp.Body.Close()
+	response, err := ioutil.ReadAll(rsp.Body)
+	if err != nil {
+		return nil, fmt.Errorf("Could not read response: %v", err)
+	}
+
+	return response, nil
+}
diff --git a/src/jetstream/plugins/analysis/main.go b/src/jetstream/plugins/analysis/main.go
new file mode 100644
index 0000000000..33dbc43917
--- /dev/null
+++ b/src/jetstream/plugins/analysis/main.go
@@ -0,0 +1,139 @@
+package analysis
+
+import (
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"time"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/analysis/store"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+
+	"github.com/labstack/echo"
+	log "github.com/sirupsen/logrus"
+)
+
+const (
+	analsyisServicesAPIEnvVar = "ANALYSIS_SERVICES_API"
+
+	// Allow specific engines to be enabled
+	analysisEnginesAPIEnvVar = "ANALYSIS_ENGINES"
+
+	// Names used to communicate settings info back to the front-end client
+	analysisEnabledPluginConfigSetting = "analysisEnabled"
+	analysisEnginesPluginConfigSetting = "analysisEngines"
+
+	defaultEngines = "popeye"
+)
+
+// Analysis - Plugin to allow analysers to run over an endpoint cluster
+type Analysis struct {
+	portalProxy    interfaces.PortalProxy
+	analysisServer string
+}
+
+// Init creates a new Analysis
+func Init(portalProxy interfaces.PortalProxy) (interfaces.StratosPlugin, error) {
+	store.InitRepositoryProvider(portalProxy.GetConfig().DatabaseProviderName)
+	return &Analysis{portalProxy: portalProxy}, nil
+}
+
+// GetMiddlewarePlugin gets the middleware plugin for this plugin
+func (analysis *Analysis) GetMiddlewarePlugin() (interfaces.MiddlewarePlugin, error) {
+	return nil, errors.New("Not implemented")
+}
+
+// GetEndpointPlugin gets the endpoint plugin for this plugin
+func (analysis *Analysis) GetEndpointPlugin() (interfaces.EndpointPlugin, error) {
+	return nil, errors.New("Not implemented")
+}
+
+// GetRoutePlugin gets the route plugin for this plugin
+func (analysis *Analysis) GetRoutePlugin() (interfaces.RoutePlugin, error) {
+	return analysis, nil
+}
+
+// AddAdminGroupRoutes adds the admin routes for this plugin to the Echo server
+func (analysis *Analysis) AddAdminGroupRoutes(echoGroup *echo.Group) {
+	// no-op
+}
+
+// AddSessionGroupRoutes adds the session routes for this plugin to the Echo server
+func (analysis *Analysis) AddSessionGroupRoutes(echoGroup *echo.Group) {
+	echoGroup.GET("/analysis/reports/:endpoint", analysis.listReports)
+	echoGroup.GET("/analysis/reports/:endpoint/:id", analysis.getReport)
+	echoGroup.GET("/analysis/reports/:endpoint/:id/:file", analysis.getReport)
+
+	// Get completed reports for the given path
+	echoGroup.GET("/analysis/completed/:endpoint/*", analysis.getReportsByPath)
+
+	// Get latest report
+	echoGroup.GET("/analysis/latest/:endpoint/*", analysis.getLatestReport)
+	echoGroup.HEAD("/analysis/latest/:endpoint/*", analysis.getLatestReport)
+
+	echoGroup.DELETE("/analysis/reports", analysis.deleteReports)
+
+	// Run report
+	echoGroup.POST("/analysis/run/:analyzer/:endpoint", analysis.runReport)
+}
+
+// Init performs plugin initialization
+func (analysis *Analysis) Init() error {
+	// Only enabled in tech preview
+	if !analysis.portalProxy.GetConfig().EnableTechPreview {
+		// This will set PluginsStatus[name] = false, which results in plugins[name] in the FE
+		return errors.New("Requires tech preview")
+	}
+
+	// Check env var
+	if url, ok := analysis.portalProxy.Env().Lookup(analsyisServicesAPIEnvVar); ok {
+		analysis.analysisServer = url
+
+		// Start background status check
+		analysis.initStatusCheck()
+
+		if engines, ok := analysis.portalProxy.Env().Lookup(analysisEnginesAPIEnvVar); ok {
+			analysis.portalProxy.GetConfig().PluginConfig[analysisEnginesPluginConfigSetting] = engines
+		} else {
+			analysis.portalProxy.GetConfig().PluginConfig[analysisEnginesPluginConfigSetting] = defaultEngines
+		}
+
+		return nil
+	}
+
+	return errors.New("Analysis services API Server not configured")
+}
+
+// OnEndpointNotification called when for endpoint events
+func (analysis *Analysis) OnEndpointNotification(action interfaces.EndpointAction, endpoint *interfaces.CNSIRecord) {
+	if action == interfaces.EndpointUnregisterAction {
+		// An endpoint was unregistered, so remove all reports
+		dbStore, err := store.NewAnalysisDBStore(analysis.portalProxy.GetDatabaseConnection())
+		if err == nil {
+			dbStore.DeleteForEndpoint(endpoint.GUID)
+
+			// Now ask the analysis engine to to delete all files on disk
+			deleteURL := fmt.Sprintf("%s/api/v1/report/%s", analysis.analysisServer, endpoint.GUID)
+			r, _ := http.NewRequest(http.MethodDelete, deleteURL, nil)
+			client := &http.Client{Timeout: 30 * time.Second}
+			rsp, err := client.Do(r)
+			if err != nil {
+				log.Errorf("Failed deleting reports from Analyzer service: %v", err)
+				return
+			}
+
+			if rsp.StatusCode != http.StatusOK {
+				log.Errorf("Failed deleting reports from Analyzer service: %d", rsp.StatusCode)
+			}
+
+			if rsp.Body != nil {
+				defer rsp.Body.Close()
+				_, err = ioutil.ReadAll(rsp.Body)
+				if err != nil {
+					log.Errorf("Could not read response: %v", err)
+				}
+			}
+		}
+	}
+}
diff --git a/src/jetstream/plugins/analysis/run.go b/src/jetstream/plugins/analysis/run.go
new file mode 100644
index 0000000000..7c64e569ed
--- /dev/null
+++ b/src/jetstream/plugins/analysis/run.go
@@ -0,0 +1,188 @@
+package analysis
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"mime/multipart"
+	"net/http"
+	"net/textproto"
+	"time"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/analysis/store"
+
+	"github.com/labstack/echo"
+	uuid "github.com/satori/go.uuid"
+	log "github.com/sirupsen/logrus"
+)
+
+type popeyeConfig struct {
+	Namespace string `json:"namespace"`
+	App       string `json:"app"`
+}
+
+type KubeConfigExporter interface {
+	GetKubeConfigForEndpointUser(endpointID, userID string) (string, error)
+}
+
+const idHeaderName = "X-Stratos-Analaysis-ID"
+
+func (c *Analysis) runReport(ec echo.Context) error {
+	log.Debug("runReport")
+
+	analyzer := ec.Param("analyzer")
+	endpointID := ec.Param("endpoint")
+	userID := ec.Get("user_id").(string)
+
+	// Look up the endpoint for the user
+	var p = c.portalProxy
+	endpoint, err := p.GetCNSIRecord(endpointID)
+	if err != nil {
+		return errors.New("Could not get endpoint information")
+	}
+
+	report := store.AnalysisRecord{
+		ID:           uuid.NewV4().String(),
+		EndpointID:   endpointID,
+		EndpointType: endpoint.CNSIType,
+		UserID:       userID,
+		Path:         "",
+		Created:      time.Now(),
+		Read:         false,
+		Duration:     0,
+		Status:       "pending",
+		Result:       "",
+	}
+
+	// Create a record in the reports datastore
+	dbStore, err := store.NewAnalysisDBStore(p.GetDatabaseConnection())
+	if err != nil {
+		return err
+	}
+
+	report.Name = fmt.Sprintf("Analysis report %s", analyzer)
+	dbStore.Save((report))
+
+	err = c.doRunReport(ec, analyzer, endpointID, userID, dbStore, &report)
+	if err != nil {
+		report.Status = "error"
+		report.Result = err.Error()
+		dbStore.UpdateReport(userID, &report)
+	}
+
+	return err
+
+}
+
+func (c *Analysis) doRunReport(ec echo.Context, analyzer, endpointID, userID string, dbStore store.AnalysisStore, report *store.AnalysisRecord) error {
+
+	// Get Kube Config
+	k8s := c.portalProxy.GetPlugin("kubernetes")
+	if k8s == nil {
+		return errors.New("Could not find Kubernetes plugin")
+	}
+
+	k8sConfig, ok := k8s.(KubeConfigExporter)
+	if !ok {
+		return errors.New("Could not find Kubernetes plugin interface")
+	}
+
+	config, err := k8sConfig.GetKubeConfigForEndpointUser(endpointID, userID)
+	if err != nil {
+		return errors.New("Could not get Kube Config for the endpoint")
+	}
+
+	id := fmt.Sprintf("%s/%s/%s", userID, endpointID, report.ID)
+
+	// Create a multi-part form to send to the analyzer container
+	body := new(bytes.Buffer)
+	writer := multipart.NewWriter(body)
+
+	// Add kube config
+	metadataHeader := textproto.MIMEHeader{}
+	metadataHeader.Set("Content-Type", "application/yaml")
+	metadataHeader.Set("Content-ID", "kubeconfig")
+	part, _ := writer.CreatePart(metadataHeader)
+	part.Write([]byte(config))
+
+	requestBody := make([]byte, 0)
+
+	// Read body
+	defer ec.Request().Body.Close()
+	if b, err := ioutil.ReadAll((ec.Request().Body)); err == nil {
+		requestBody = b
+	}
+
+	// Content that was posted to us
+	postHeader := textproto.MIMEHeader{}
+	postHeader.Set("Content-Type", "application/json")
+	postHeader.Set("Content-ID", "body")
+	part, _ = writer.CreatePart(postHeader)
+	part.Write(requestBody)
+
+	// Report config
+	reportHeader := textproto.MIMEHeader{}
+	reportHeader.Set("Content-Type", "application/json")
+	reportHeader.Set("Content-ID", "job")
+	part, _ = writer.CreatePart(reportHeader)
+	job, err := json.Marshal(report)
+	if err != nil {
+		return errors.New("Could not serialize job")
+	}
+	part.Write(job)
+	writer.Close()
+
+	// Post this to the Analyzer API
+	contentType := fmt.Sprintf("multipart/form-data; boundary=%s", writer.Boundary())
+	uploadURL := fmt.Sprintf("%s/api/v1/run/%s", c.analysisServer, analyzer)
+	r, _ := http.NewRequest(http.MethodPost, uploadURL, bytes.NewReader(body.Bytes()))
+	r.Header.Set("Content-Type", contentType)
+	r.Header.Set(idHeaderName, id)
+	client := &http.Client{Timeout: 180 * time.Second}
+	rsp, err := client.Do(r)
+	if err != nil {
+		return errors.New("Analysis job failed - could not contact Analysis Server")
+	}
+
+	if rsp.StatusCode != http.StatusOK {
+		log.Debugf("Request failed with response code: %d", rsp.StatusCode)
+		return fmt.Errorf("Analysis job failed with response code: %d", rsp.StatusCode)
+	}
+
+	// Job submitted okay
+	// Updated job is in the response
+
+	defer rsp.Body.Close()
+	response, err := ioutil.ReadAll(rsp.Body)
+	if err != nil {
+		return errors.New("Could not read response")
+	}
+
+	updatedJob := store.AnalysisRecord{}
+	if err = json.Unmarshal(response, &updatedJob); err != nil {
+		return errors.New("Could not read response - could not deserialize response")
+	}
+
+	report.Duration = updatedJob.Duration
+	report.Status = updatedJob.Status
+	report.Name = updatedJob.Name
+	report.Format = updatedJob.Format
+	report.Type = updatedJob.Type
+	report.Path = updatedJob.Path
+
+	log.Debug("OK => Job submitted okay")
+	log.Debug("=======================================================")
+	log.Debugf("%+v", report)
+	log.Debug("=======================================================")
+
+	err = dbStore.UpdateReport(userID, report)
+	if err != nil {
+		return fmt.Errorf("Could not save report %s", err)
+	}
+
+	log.Debug("All done - job saved")
+
+	return ec.JSON(200, report)
+}
diff --git a/src/jetstream/plugins/analysis/status.go b/src/jetstream/plugins/analysis/status.go
new file mode 100644
index 0000000000..5635589289
--- /dev/null
+++ b/src/jetstream/plugins/analysis/status.go
@@ -0,0 +1,109 @@
+package analysis
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"time"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/analysis/store"
+
+	log "github.com/sirupsen/logrus"
+)
+
+// Start a poller to check the status
+func (c *Analysis) initStatusCheck() {
+
+	log.Info("Analysis Plugin: Starting status check ...")
+
+	// Just loop forever, checking the status of running jobs every 10s
+	go func() {
+		for {
+			time.Sleep(10 * time.Second)
+			err := c.checkStatus()
+			if err != nil {
+				log.Errorf("Error checking status: %v", err)
+			}
+		}
+	}()
+}
+
+func (c *Analysis) checkStatus() error {
+	log.Debug("Checking status....")
+	p := c.portalProxy
+	// Create a record in the reports datastore
+	dbStore, err := store.NewAnalysisDBStore(p.GetDatabaseConnection())
+	if err != nil {
+		return fmt.Errorf("Status Check: Can not get anaylsis store db: %v", err)
+	}
+
+	// Get all running jobs
+	running, err := dbStore.ListRunning()
+	if err != nil {
+		return fmt.Errorf("Can not get list of running jobs: %v", err)
+	}
+
+	if len(running) == 0 {
+		return nil
+	}
+
+	ids := make([]string, 0)
+	for _, job := range running {
+		log.Debugf("Got running job: %s", job.ID)
+		ids = append(ids, job.ID)
+	}
+
+	data, err := json.Marshal(ids)
+	if err != nil {
+		log.Errorf("Could not marshal IDs: %v", err)
+		return fmt.Errorf("Could not marshal IDs: %v", err)
+	}
+
+	// Make request to status
+	statusURL := fmt.Sprintf("%s/api/v1/status", c.analysisServer)
+	r, _ := http.NewRequest(http.MethodPost, statusURL, bytes.NewReader(data))
+	r.Header.Set("Content-Type", "application/json")
+	client := &http.Client{Timeout: 180 * time.Second}
+	rsp, err := client.Do(r)
+	if err != nil {
+		return fmt.Errorf("Failed getting status from Analyzer service: %v", err)
+	}
+
+	if rsp.StatusCode != http.StatusOK {
+		return fmt.Errorf("Failed getting status from Analyzer service: %d", rsp.StatusCode)
+	}
+
+	defer rsp.Body.Close()
+	response, err := ioutil.ReadAll(rsp.Body)
+	if err != nil {
+		log.Errorf("Could not read response: %v", err)
+		return fmt.Errorf("Could not read response: %v", err)
+	}
+
+	// Turn into map of IDs to Jobs
+	statuses := make(map[string]store.AnalysisRecord)
+
+	if err := json.Unmarshal(response, &statuses); err != nil {
+		return fmt.Errorf("Could not parse response: %v", err)
+	}
+
+	for _, job := range running {
+		if status, ok := statuses[job.ID]; ok {
+			job.Duration = status.Duration
+			job.Status = status.Status
+			if err := dbStore.UpdateReport(job.UserID, job); err != nil {
+				log.Warnf("Unable to update status for job %s: %v", job.ID, err)
+			}
+		} else {
+			// The analysis server did not know about our job, os mark as error
+			job.Status = "error"
+			if err := dbStore.UpdateReport(job.UserID, job); err != nil {
+				log.Warnf("Unable to update status for job %s: %v", job.ID, err)
+			}
+		}
+	}
+
+	return nil
+}
diff --git a/src/jetstream/plugins/analysis/store/analysis_store_db.go b/src/jetstream/plugins/analysis/store/analysis_store_db.go
new file mode 100644
index 0000000000..481408fa6f
--- /dev/null
+++ b/src/jetstream/plugins/analysis/store/analysis_store_db.go
@@ -0,0 +1,164 @@
+package store
+
+import (
+	"database/sql"
+	"fmt"
+
+	log "github.com/sirupsen/logrus"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore"
+)
+
+var (
+	listReports                = `SELECT id, endpoint_type, endpoint, user, name, path, type, format, created, acknowledged, status, duration, result FROM analysis WHERE user = $1 AND endpoint = $2`
+	listCompletedReportsByPath = `SELECT id, endpoint_type, endpoint, user, name, path, type, format, created, acknowledged, status, duration, result FROM analysis WHERE status = 'completed' AND user = $1 AND endpoint = $2 AND path = $3 ORDER BY created DESC`
+	getReport                  = `SELECT id, endpoint_type, endpoint, user, name, path, type, format, created, acknowledged, status, duration, result FROM analysis WHERE user = $1 AND id=$2`
+	deleteReport               = `DELETE FROM analysis WHERE user = $1 AND id = $2`
+	saveReport                 = `INSERT INTO analysis (id, user, endpoint_type, endpoint, name, path, type, format, created, acknowledged, status, duration, result) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)`
+	updateReport               = `UPDATE analysis SET type = $1, format = $2, acknowledged = $3, status = $4, duration = $5, result = $6, name = $7, path = $8, result = $9 WHERE user = $10 AND id = $11`
+	getLatestReport            = `SELECT id, endpoint_type, endpoint, user, name, path, type, format, created, acknowledged, status, duration, result FROM analysis WHERE status = 'completed' AND user = $1 AND endpoint = $2 AND path = $3 ORDER BY created DESC`
+	listRunningReports         = `SELECT id, endpoint_type, endpoint, user, name, path, type, format, created, acknowledged, status, duration, result FROM analysis WHERE status = 'running' ORDER BY created DESC`
+	deleteForEndpoint          = `DELETE FROM analysis WHERE endpoint = $1`
+)
+
+// InitRepositoryProvider - One time init for the given DB Provider
+func InitRepositoryProvider(databaseProvider string) {
+	// Modify the database statements if needed, for the given database type
+	listReports = datastore.ModifySQLStatement(listReports, databaseProvider)
+	listCompletedReportsByPath = datastore.ModifySQLStatement(listCompletedReportsByPath, databaseProvider)
+	getReport = datastore.ModifySQLStatement(getReport, databaseProvider)
+	deleteReport = datastore.ModifySQLStatement(deleteReport, databaseProvider)
+	saveReport = datastore.ModifySQLStatement(saveReport, databaseProvider)
+	updateReport = datastore.ModifySQLStatement(updateReport, databaseProvider)
+	getLatestReport = datastore.ModifySQLStatement(getLatestReport, databaseProvider)
+	listRunningReports = datastore.ModifySQLStatement(listRunningReports, databaseProvider)
+	deleteForEndpoint = datastore.ModifySQLStatement(deleteForEndpoint, databaseProvider)
+}
+
+// AnalysisDBStore is a DB-backed Analysis Reports repository
+type AnalysisDBStore struct {
+	db *sql.DB
+}
+
+// NewAnalysisDBStore will create a new instance of the AnalysisDBStore
+func NewAnalysisDBStore(dcp *sql.DB) (AnalysisStore, error) {
+	return &AnalysisDBStore{db: dcp}, nil
+}
+
+// List - Returns a list of all user Analysis Reports for the given endpoint
+func (p *AnalysisDBStore) List(userGUID, endpointID string) ([]*AnalysisRecord, error) {
+	log.Debug("List")
+	rows, err := p.db.Query(listReports, userGUID, endpointID)
+	if err != nil {
+		return nil, fmt.Errorf("Unable to retrieve Analysis Reports records: %v", err)
+	}
+	defer rows.Close()
+
+	return list(rows)
+}
+
+func (p *AnalysisDBStore) ListCompletedByPath(userGUID, endpointID, path string) ([]*AnalysisRecord, error) {
+	log.Debug("ListCompletedByPath")
+	rows, err := p.db.Query(listCompletedReportsByPath, userGUID, endpointID, path)
+	if err != nil {
+		return nil, fmt.Errorf("Unable to retrieve Analysis Reports records: %v", err)
+	}
+	defer rows.Close()
+
+	return list(rows)
+}
+
+func (p *AnalysisDBStore) ListRunning() ([]*AnalysisRecord, error) {
+	log.Debug("ListRunning")
+	rows, err := p.db.Query(listRunningReports)
+	if err != nil {
+		return nil, fmt.Errorf("Unable to retrieve Analysis Reports records: %v", err)
+	}
+	defer rows.Close()
+
+	return list(rows)
+}
+
+func list(rows *sql.Rows) ([]*AnalysisRecord, error) {
+	var reportList []*AnalysisRecord
+	reportList = make([]*AnalysisRecord, 0)
+
+	for rows.Next() {
+		report := new(AnalysisRecord)
+		err := rows.Scan(&report.ID, &report.EndpointType, &report.EndpointID, &report.UserID, &report.Name, &report.Path, &report.Type, &report.Format, &report.Created, &report.Read, &report.Status, &report.Duration, &report.Result)
+		if err != nil {
+			return nil, fmt.Errorf("Unable to scan Analysis Reports records: %v", err)
+		}
+		reportList = append(reportList, report)
+	}
+
+	if err := rows.Err(); err != nil {
+		return nil, fmt.Errorf("Unable to List Analysis Reports records: %v", err)
+	}
+
+	return reportList, nil
+}
+
+// Get - Get a specific Analysis Report by ID
+func (p *AnalysisDBStore) Get(userGUID, ID string) (*AnalysisRecord, error) {
+	log.Debug("Get")
+
+	report := AnalysisRecord{}
+	err := p.db.QueryRow(getReport, userGUID, ID).Scan(&report.ID, &report.EndpointType, &report.EndpointID, &report.UserID, &report.Name, &report.Path, &report.Type, &report.Format, &report.Created, &report.Read, &report.Status, &report.Duration, &report.Result)
+	if err != nil {
+		msg := "Unable to Get Analysis Report record: %v"
+		log.Debugf(msg, err)
+		return nil, fmt.Errorf(msg, err)
+	}
+
+	return &report, nil
+}
+
+// GetLatestCompleted - Get latest report for the specified path
+func (p *AnalysisDBStore) GetLatestCompleted(userGUID, endpointID, path string) (*AnalysisRecord, error) {
+	log.Debug("GetLatestCompleted")
+
+	report := AnalysisRecord{}
+	err := p.db.QueryRow(getLatestReport, userGUID, endpointID, path).Scan(&report.ID, &report.EndpointType, &report.EndpointID, &report.UserID, &report.Name, &report.Path, &report.Type, &report.Format, &report.Created, &report.Read, &report.Status, &report.Duration, &report.Result)
+	if err != nil {
+		msg := "Unable to get laetst completed Analysis Report record: %v"
+		log.Debugf(msg, err)
+		return nil, fmt.Errorf(msg, err)
+	}
+
+	return &report, nil
+}
+
+// Delete will delete an Analysis Report from the datastore
+func (p *AnalysisDBStore) Delete(userGUID string, id string) error {
+	if _, err := p.db.Exec(deleteReport, userGUID, id); err != nil {
+		return fmt.Errorf("Unable to delete Analysis Report record: %v", err)
+	}
+
+	return nil
+}
+
+// UpdateReport will update the dynamic fields of the Analysis Record in thedatastore
+func (p *AnalysisDBStore) UpdateReport(userGUID string, report *AnalysisRecord) error {
+	if _, err := p.db.Exec(updateReport, report.Type, report.Format, report.Read, report.Status, report.Duration, report.Result, report.Name, report.Path, report.Result, userGUID, report.ID); err != nil {
+		return fmt.Errorf("Unable to update Analysis Report record: %v", err)
+	}
+	return nil
+}
+
+// Save will persist an Analysis Report to the datastore
+func (p *AnalysisDBStore) Save(report AnalysisRecord) (*AnalysisRecord, error) {
+	if _, err := p.db.Exec(saveReport, report.ID, report.UserID, report.EndpointType, report.EndpointID, report.Name, report.Path, report.Type, report.Format, report.Created, report.Read, &report.Status, &report.Duration, &report.Result); err != nil {
+		return nil, fmt.Errorf("Unable to save Analysis Report record: %v", err)
+	}
+
+	return &report, nil
+}
+
+// DeleteForEndpoint will remove all Analysis Reports for a given endpoint guid
+func (p *AnalysisDBStore) DeleteForEndpoint(endpointID string) error {
+	if _, err := p.db.Exec(deleteForEndpoint, endpointID); err != nil {
+		return fmt.Errorf("Unable to delete reports for endpoint: %s %v", endpointID, err)
+	}
+	return nil
+}
diff --git a/src/jetstream/plugins/analysis/store/main.go b/src/jetstream/plugins/analysis/store/main.go
new file mode 100644
index 0000000000..e9a14edac6
--- /dev/null
+++ b/src/jetstream/plugins/analysis/store/main.go
@@ -0,0 +1,39 @@
+package store
+
+import (
+	"encoding/json"
+	"time"
+)
+
+// AnalysisRecord represents an analysis that has been run
+type AnalysisRecord struct {
+	ID           string           `json:"id"`
+	UserID       string           `json:"-"`
+	EndpointType string           `json:"endpointType"`
+	EndpointID   string           `json:"endpoint"`
+	Type         string           `json:"type"`
+	Format       string           `json:"format"`
+	Name         string           `json:"name"`
+	Path         string           `json:"path"`
+	Created      time.Time        `json:"created"`
+	Read         bool             `json:"read"`
+	Status       string           `json:"status"`
+	Duration     int              `json:"duration"`
+	Result       string           `json:"-"`
+	Error        string           `json:"error"`
+	Summary      *json.RawMessage `json:"summary"`
+	Report       *json.RawMessage `json:"report,omitempty"`
+}
+
+// AnalysisStore is the analysis repository
+type AnalysisStore interface {
+	List(userGUID, endpointID string) ([]*AnalysisRecord, error)
+	Get(userGUID, id string) (*AnalysisRecord, error)
+	GetLatestCompleted(userGUID, endpointID, path string) (*AnalysisRecord, error)
+	ListCompletedByPath(userGUID, endpointID, path string) ([]*AnalysisRecord, error)
+	ListRunning() ([]*AnalysisRecord, error)
+	Delete(userGUID, id string) error
+	DeleteForEndpoint(endpointID string) error
+	Save(record AnalysisRecord) (*AnalysisRecord, error)
+	UpdateReport(userGUID string, report *AnalysisRecord) error
+}
diff --git a/src/jetstream/plugins/kubernetes/endpoint_config.go b/src/jetstream/plugins/kubernetes/endpoint_config.go
index 8a7acd85af..8e7b983235 100644
--- a/src/jetstream/plugins/kubernetes/endpoint_config.go
+++ b/src/jetstream/plugins/kubernetes/endpoint_config.go
@@ -24,10 +24,8 @@ func (c *KubernetesSpecification) GetConfigForEndpoint(masterURL string, token i
 func (c *KubernetesSpecification) GetConfigForEndpointUser(endpointID, userID string) (*restclient.Config, error) {
 
 	var p = c.portalProxy
-
 	cnsiRecord, err := p.GetCNSIRecord(endpointID)
 	if err != nil {
-		//return sendSSHError("Could not get endpoint information")
 		return nil, errors.New("Could not get endpoint information")
 	}
 
@@ -40,6 +38,23 @@ func (c *KubernetesSpecification) GetConfigForEndpointUser(endpointID, userID st
 	return c.GetConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRec)
 }
 
+func (c *KubernetesSpecification) GetKubeConfigForEndpointUser(endpointID, userID string) (string, error) {
+
+	var p = c.portalProxy
+	cnsiRecord, err := p.GetCNSIRecord(endpointID)
+	if err != nil {
+		return "", errors.New("Could not get endpoint information")
+	}
+
+	// Get token for this users
+	tokenRec, ok := p.GetCNSITokenRecord(endpointID, userID)
+	if !ok {
+		return "", errors.New("Could not get token")
+	}
+
+	return c.GetKubeConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRec, "")
+}
+
 func (c *KubernetesSpecification) getKubeConfigForEndpoint(masterURL string, token interfaces.TokenRecord, namespace string) (*clientcmdapi.Config, error) {
 
 	name := "cluster-0"
diff --git a/src/jetstream/plugins/kubernetes/get_release.go b/src/jetstream/plugins/kubernetes/get_release.go
index d072870557..e4627830ab 100644
--- a/src/jetstream/plugins/kubernetes/get_release.go
+++ b/src/jetstream/plugins/kubernetes/get_release.go
@@ -102,7 +102,7 @@ func (c *KubernetesSpecification) GetReleaseStatus(ec echo.Context) error {
 	// this back incrementally
 
 	// Parse the manifest
-	rel := helm.NewHelmRelease(res, endpointGUID, userID)
+	rel := helm.NewHelmRelease(res, endpointGUID, userID, c.portalProxy)
 
 	graph := helm.NewHelmReleaseGraph(rel)
 
diff --git a/src/jetstream/plugins/kubernetes/go.mod b/src/jetstream/plugins/kubernetes/go.mod
index 288ec1d075..6e44da2a86 100644
--- a/src/jetstream/plugins/kubernetes/go.mod
+++ b/src/jetstream/plugins/kubernetes/go.mod
@@ -9,7 +9,6 @@ require (
 	github.com/aws/aws-sdk-go v1.17.5
 	github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 // indirect
 	github.com/docker/docker v1.13.1 // indirect
-	github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385 // indirect
 	github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484 // indirect
 	github.com/ghodss/yaml v1.0.0
 	github.com/gorilla/websocket v1.4.0
diff --git a/src/jetstream/plugins/kubernetes/go.sum b/src/jetstream/plugins/kubernetes/go.sum
index d3b2e14ea0..3159ac83df 100644
--- a/src/jetstream/plugins/kubernetes/go.sum
+++ b/src/jetstream/plugins/kubernetes/go.sum
@@ -112,6 +112,7 @@ github.com/deislabs/oras v0.7.0/go.mod h1:sqMKPG3tMyIX9xwXUBRLhZ24o+uT4y6jgBD2Rz
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/disintegration/imaging v1.6.0 h1:nVPXRUUQ36Z7MNf0O77UzgnOb1mkMMor7lmJMJXc/mA=
 github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ=
+github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
 github.com/docker/cli v0.0.0-20190506213505-d88565df0c2d h1:qdD+BtyCE1XXpDyhvn0yZVcZOLILdj9Cw4pKu0kQbPQ=
 github.com/docker/cli v0.0.0-20190506213505-d88565df0c2d/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
@@ -254,6 +255,7 @@ github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho=
 github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8=
 github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk=
@@ -292,6 +294,8 @@ github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZs
 github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U=
 github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
+github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/sessions v1.1.3 h1:uXoZdcdA5XdXF3QzuSlheVRUvjl+1rKY7zBXL68L9RU=
@@ -369,6 +373,7 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 h1:wdTBUArlqtBYGN2Dd4+zsaFxFH0m4iGCHToW10jPX0k=
 github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
+github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
 github.com/kubernetes-sigs/aws-iam-authenticator v0.3.0 h1:HOC7YpUao5F3RTIncfBfoh+7/ID1Jl97ALNgEmWIjxo=
 github.com/kubernetes-sigs/aws-iam-authenticator v0.3.0/go.mod h1:ItxiN33Ho7Di8wiC4S4XqbH1NLF0DNdDWOd/5MI9gJU=
 github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc h1:Ttr4Z3ZrMv4rAXn10UAqOC8ACx+F1omvcyV1a3hRArE=
@@ -377,6 +382,7 @@ github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8
 github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s=
 github.com/labstack/gommon v0.2.8 h1:JvRqmeZcfrHC5u6uVleB4NxxNbzx6gpbJiQknDbKQu0=
 github.com/labstack/gommon v0.2.8/go.mod h1:/tj9csK2iPSBvn+3NLM9e52usepMtrd5ilFYA+wQNJ4=
+github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
@@ -392,9 +398,12 @@ github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM
 github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
 github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
+github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.6 h1:SrwhHcpV4nWrMGdNcC2kXpMfcBVYGDuTArqyhocJgvA=
 github.com/mattn/go-isatty v0.0.6/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
 github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-shellwords v1.0.5/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
@@ -495,8 +504,8 @@ github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNue
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday v2.0.0 h1:L7Oc72h7rDqGkbUorN/ncJ4N/y220/YRezHvBoKLOFA=
 github.com/russross/blackfriday v2.0.0+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/russross/blackfriday v2.0.0/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday v2.0.0+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/russross/blackfriday v2.0.0/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
@@ -537,12 +546,16 @@ github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245/go.mod h1:O1c
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/unrolled/render v1.0.0 h1:XYtvhA3UkpB7PqkvhUFYmpKD55OudoIeygcfus4vcd4=
 github.com/unrolled/render v1.0.0/go.mod h1:tu82oB5W2ykJRVioYsB+IQKcft7ryBr7w12qMBUPyXg=
+github.com/unrolled/render v1.0.1/go.mod h1:gN9T0NhL4Bfbwu8ann7Ry/TGHYfosul+J0obPf6NBdM=
 github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4 h1:gKMu1Bf6QINDnvyZuTaACm9ofY+PRh+5vFz4oxBZeF8=
 github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4/go.mod h1:50wTf68f99/Zt14pr046Tgt3Lp2vLyFZKzbFXTOabXw=
+github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
+github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
+github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
@@ -559,6 +572,7 @@ github.com/yvasiyarov/gorelic v0.0.6 h1:qMJQYPNdtJ7UNYHjX38KXZtltKTqimMuoQjNnSVI
 github.com/yvasiyarov/gorelic v0.0.6/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA=
 github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f h1:ERexzlUfuTvpE74urLSbIQW0Z/6hF9t8U4NsJLaioAY=
 github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
+go.mongodb.org/mongo-driver v1.1.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.opencensus.io v0.17.0/go.mod h1:mp1VrMQxhlqqDpKvH4UcQUa4YwlzNmymAjPrDdfxNpI=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -574,12 +588,15 @@ golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7 h1:0hQKqeLdqlt5iIwVOBErRi
 golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152 h1:ZC1Xn5A1nlpSmQCIva4bZ3ob3lmhYIefc+GU+DLg1Ow=
 golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9 h1:abxekknhS/Drh3uoQDk5Hc7BgeiyI39Crb7vhf/1j5s=
+golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067 h1:KYGJGHOQy8oSi1fDlSpcZF0+juKwk/hEMv5SiwHogR0=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -624,6 +641,8 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8=
@@ -641,6 +660,7 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f h1:25KHgbfyiSm6vwQLbM3zZIe1v9p/3ea4Rz+nnM5K/i4=
 golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191028164358-195ce5e7f934 h1:u/E0NqCIWRDAo9WCFo6Ko49njPFDLSd3z+X1HgWDMpE=
@@ -787,6 +807,7 @@ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8
 k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/helm v2.12.3+incompatible h1:wo1cdYjOnr5Z+LFuhtwIJaeQnec6D4gcg2H5UAKzY6w=
 k8s.io/helm v2.12.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
+k8s.io/helm v2.16.1+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
 k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.2.0 h1:0ElL0OHzF3N+OhoJTL0uca20SxtYt4X4+bzHeqrB83c=
 k8s.io/klog v0.2.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
diff --git a/src/jetstream/plugins/kubernetes/helm/graph.go b/src/jetstream/plugins/kubernetes/helm/graph.go
index cea0f9c5dd..a46bf3ac0a 100644
--- a/src/jetstream/plugins/kubernetes/helm/graph.go
+++ b/src/jetstream/plugins/kubernetes/helm/graph.go
@@ -27,8 +27,12 @@ type ReleaseNode struct {
 	ID    string `json:"id"`
 	Label string `json:"label"`
 	Data  struct {
-		Kind   string     `json:"kind"`
-		Status NodeStatus `json:"status"`
+		Kind     string     `json:"kind"`
+		Status   NodeStatus `json:"status"`
+		Metadata struct {
+			Name      string `yaml:"name" json:"name"`
+			Namespace string `yaml:"namespace" json:"namespace"`
+		} `yaml:"metadata" json:"metadata"`
 	} `json:"data"`
 }
 
@@ -67,6 +71,8 @@ func (r *HelmReleaseGraph) ParseManifest(release *HelmRelease) {
 		}
 
 		node.Data.Kind = item.Kind
+		node.Data.Metadata = item.Metadata
+		// Note - item.Metadata.Namespace is nil
 		node.Data.Status = "unknown"
 
 		switch o := item.Resource.(type) {
@@ -114,6 +120,9 @@ func (r *HelmReleaseGraph) ParseManifest(release *HelmRelease) {
 		case *rbacv1.RoleBinding:
 			target := getShortResourceId(item.Kind, o.Name)
 			r.ParseRoleBinding(target, o)
+		case *rbacv1.ClusterRoleBinding:
+			target := getShortResourceId(item.Kind, o.Name)
+			r.ParseClusterRoleBinding(target, o)
 		default:
 			log.Debugf("Graph: Unknown type: %s", reflect.TypeOf(o))
 		}
@@ -138,20 +147,15 @@ func (r *HelmReleaseGraph) generateTemporaryNode(id string) {
 
 	node := ReleaseNode{
 		ID:    id,
-		Label: parts[1],
+		Label: strings.Join(parts[1:], "-"),
 	}
 
 	node.Data.Kind = parts[0]
 	node.Data.Status = "missing"
-
 	r.Nodes[node.ID] = node
 }
 
 func getShortResourceId(kind, name string) string {
-	// // TODO: FIX - empty kind is a pod
-	// if len(kind) == 0 {
-	// 	kind = "Pod"
-	// }
 	return fmt.Sprintf("%s-%s", kind, name)
 }
 
@@ -180,6 +184,13 @@ func (r *HelmReleaseGraph) ProcessPod(id string, res KubeResource, spec v1.PodSp
 		}
 	}
 
+	// Service Account
+	saName := spec.ServiceAccountName
+	if len(saName) > 0 {
+		ref := fmt.Sprintf("ServiceAccount-%s", saName)
+		r.AddLink(id, ref)
+	}
+
 	// Go through the pod and process each container
 	// Add a node for each container
 	for _, container := range spec.Containers {
@@ -256,3 +267,14 @@ func (r *HelmReleaseGraph) ParseRoleBinding(id string, roleBinding *rbacv1.RoleB
 	roleRefID := fmt.Sprintf("%s-%s", roleBinding.RoleRef.Kind, roleBinding.RoleRef.Name)
 	r.AddLink(id, roleRefID)
 }
+
+func (r *HelmReleaseGraph) ParseClusterRoleBinding(id string, roleBinding *rbacv1.ClusterRoleBinding) {
+	for _, subject := range roleBinding.Subjects {
+		// TODO: Only match those with the same namespace ????
+		subjectID := fmt.Sprintf("%s-%s", subject.Kind, subject.Name)
+		r.AddLink(id, subjectID)
+	}
+
+	roleRefID := fmt.Sprintf("%s-%s", roleBinding.RoleRef.Kind, roleBinding.RoleRef.Name)
+	r.AddLink(id, roleRefID)
+}
diff --git a/src/jetstream/plugins/kubernetes/helm/release.go b/src/jetstream/plugins/kubernetes/helm/release.go
index f8fd9c3131..868200bb89 100644
--- a/src/jetstream/plugins/kubernetes/helm/release.go
+++ b/src/jetstream/plugins/kubernetes/helm/release.go
@@ -9,6 +9,7 @@ import (
 	"reflect"
 	"strings"
 
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	log "github.com/sirupsen/logrus"
 	"helm.sh/helm/v3/pkg/release"
 	appsv1 "k8s.io/api/apps/v1"
@@ -18,15 +19,16 @@ import (
 	v1 "k8s.io/api/core/v1"
 	extv1beta1 "k8s.io/api/extensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes/scheme"
-
-	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	"sigs.k8s.io/yaml"
 )
 
 var resourcesWithoutStatus = map[string]bool{
-	"RoleBinding": false,
-	"Role":        false,
+	"RoleBinding":        false,
+	"Role":               false,
+	"ClusterRole":        false,
+	"ClusterRoleBinding": false,
+	"PodSecurityPolicy":  false,
 }
 
 // HelmRelease represents a Helm Release deployed via Helm
@@ -45,7 +47,8 @@ type KubeResource struct {
 	Kind       string `yaml:"kind" json:"kind"`
 	APIVersion string `yaml:"apiVersion" json:"apiVersion"`
 	Metadata   struct {
-		Name string `yaml:"name" json:"name"`
+		Name      string `yaml:"name" json:"name"`
+		Namespace string `yaml:"namespace" json:"namespace"`
 	} `yaml:"metadata" json:"metadata"`
 	Resource interface{} `yaml:"resource"`
 	Manifest bool
@@ -56,7 +59,7 @@ func (r *KubeResource) getID() string {
 }
 
 // NewHelmRelease represents extended info about a Helm Release
-func NewHelmRelease(info *release.Release, endpoint, user string) *HelmRelease {
+func NewHelmRelease(info *release.Release, endpoint, user string, jetstream interfaces.PortalProxy) *HelmRelease {
 	r := &HelmRelease{
 		Release:  info,
 		Endpoint: endpoint,
@@ -76,16 +79,26 @@ func (r *HelmRelease) parseManifest() {
 	var bufr strings.Builder
 	for {
 		line, err := buffer.ReadString('\n')
-		if err != nil || (err == nil && strings.TrimSpace(line) == "---") {
+		if err != nil || (err == nil && strings.TrimRight(line, "\t \n") == "---") {
 			data := []byte(bufr.String())
 			if len(data) > 0 {
 				decode := scheme.Codecs.UniversalDeserializer().Decode
-				obj, _, err := decode([]byte(bufr.String()), nil, nil)
+				obj, _, err := decode(data, nil, nil)
 				if err != nil {
-					log.Error(fmt.Sprintf("Helm Manifest Parser: Error while decoding YAML object. Err was: %s", err))
-					r.ManifestErrors = true
+					// Custom Resource Definition
+					if strings.HasPrefix(err.Error(), "no kind") {
+						var t interface{}
+						if err := yaml.Unmarshal(data, &t); err == nil {
+							r.processYamlResource(t, data)
+						} else {
+							log.Errorf("Could not parse custom resource %s", err)
+						}
+					} else {
+						log.Error(fmt.Sprintf("Helm Manifest Parser: Error while decoding YAML object. Err was: %s", err))
+						r.ManifestErrors = true
+					}
 				} else {
-					r.processResource(obj)
+					r.processJsonResource(obj)
 				}
 
 				bufr.Reset()
@@ -96,7 +109,11 @@ func (r *HelmRelease) parseManifest() {
 		if err != nil {
 			break
 		}
-		bufr.WriteString(line)
+
+		// Ignore comments
+		if !strings.HasPrefix(strings.TrimSpace(line), "#") && !strings.HasPrefix(strings.TrimRight(line, "\t \n"), "---") {
+			bufr.WriteString(line)
+		}
 	}
 }
 
@@ -131,32 +148,61 @@ func (r *HelmRelease) GetPods() []interface{} {
 	return resources
 }
 
-// process a yaml resource from the helm manifest
-func (r *HelmRelease) processResource(obj runtime.Object) {
-	j, err := json.Marshal(obj)
+func (r *HelmRelease) processJsonResource(obj interface{}) {
+	data, err := json.Marshal(obj)
 	if err == nil {
 		var t KubeResource
-		if json.Unmarshal(j, &t) == nil {
-			t.Resource = obj
-			t.Manifest = true
-			r.setResource(t)
-			log.Debugf("Got resource: %s : %s", t.Kind, t.Metadata.Name)
-			r.processController(t)
-			r.addJobForResource(t.Kind, t.APIVersion, t.Metadata.Name)
+		if err := json.Unmarshal(data, &t); err == nil {
+			// If this is a List, then unpack it
+			if t.APIVersion == "v1" && t.Kind == "List" {
+				var list v1.PodList
+				err := json.Unmarshal(data, &list)
+				if err == nil {
+					for _, item := range list.Items {
+						r.processJsonResource(item)
+					}
+				} else {
+					log.Error("Helm Release Manifest: Could not parse List resource")
+				}
+			} else {
+				r.processKubeResource(obj, t)
+			}
 		} else {
 			log.Error("Helm Release Manifest: Could not parse Kubernetes resource")
 		}
+	} else {
+		log.Errorf("Helm Release ManifestL Could not marshal Kubernetes resource %s", err)
+	}
+}
+
+func (r *HelmRelease) processYamlResource(obj interface{}, data []byte) {
+	var t KubeResource
+	if err := yaml.Unmarshal(data, &t); err == nil {
+		r.processKubeResource(obj, t)
+	} else {
+		log.Error("Helm Release Manifest: Could not parse Kubernetes resource")
 	}
 }
 
-func (r *HelmRelease) addJobForResource(kind, apiVersion, name string) {
+// process a yaml resource from the helm manifest
+//func (r *HelmRelease) processResource(obj runtime.Object) {
+func (r *HelmRelease) processKubeResource(obj interface{}, t KubeResource) {
+	t.Resource = obj
+	t.Manifest = true
+	r.setResource(t)
+	log.Debugf("Got resource: %s : %s", t.Kind, t.Metadata.Name)
+	r.processController(t)
+	r.addJobForResource(t.Metadata.Namespace, t.Kind, t.APIVersion, t.Metadata.Name)
+}
+
+func (r *HelmRelease) addJobForResource(namespace, kind, apiVersion, name string) {
 	job := KubeResourceJob{
 		ID:         fmt.Sprintf("%s-%s#Pods", kind, name),
 		Endpoint:   r.Endpoint,
 		User:       r.User,
 		Namespace:  r.Namespace,
 		Name:       name,
-		URL:        getRestURL(r.Namespace, kind, apiVersion, name),
+		URL:        getRestURL(namespace, kind, apiVersion, name),
 		APIVersion: apiVersion,
 		Kind:       kind,
 	}
@@ -235,6 +281,8 @@ func (r *HelmRelease) UpdatePods(jetstream interfaces.PortalProxy) {
 
 				podCopy := &v1.Pod{}
 				*podCopy = pod
+				podCopy.Kind = "Pod"
+				podCopy.APIVersion = "v1"
 				res.Resource = podCopy
 				pods[res.getID()] = &res
 
@@ -268,7 +316,7 @@ func (r *HelmRelease) processPodOwners(pod v1.Pod) {
 			}
 			resource.ObjectMeta = metav1.ObjectMeta{
 				Name:      owner.Name,
-				Namespace: r.Namespace,
+				Namespace: pod.Namespace,
 			}
 			identifier := getResourceIdentifier(resource.TypeMeta, resource.ObjectMeta)
 			if _, ok := r.Resources[identifier]; !ok {
@@ -282,7 +330,7 @@ func (r *HelmRelease) processPodOwners(pod v1.Pod) {
 				res.Resource = &resource
 				r.setResource(res)
 
-				r.addJobForResource(owner.Kind, owner.APIVersion, owner.Name)
+				r.addJobForResource(pod.Namespace, owner.Kind, owner.APIVersion, owner.Name)
 			}
 		} else {
 			log.Debugf("Unexpected Pod owner kind: %s", owner.Kind)
@@ -290,15 +338,6 @@ func (r *HelmRelease) processPodOwners(pod v1.Pod) {
 	}
 }
 
-// func (r *HelmRelease) getKubeResource(typeMeta metav1.TypeMeta, objectMeta metav1.ObjectMeta) KubeResource {
-// 	kres := KubeResource{
-// 		Kind:       typeMeta.Kind,
-// 		APIVersion: typeMeta.APIVersion,
-// 	}
-// 	kres.Metadata.Name = objectMeta.Name
-// 	return kres
-// }
-
 func (r *HelmRelease) UpdateResources(jetstream interfaces.PortalProxy) {
 	// This will be an array of resources
 	runner := NewKubeAPIJob(jetstream, r.Jobs)
@@ -312,7 +351,7 @@ func (r *HelmRelease) UpdateResources(jetstream interfaces.PortalProxy) {
 		}
 		res.Metadata.Name = j.Name
 
-		// TODO: If the status was 404, then we should remove the resource
+		// If the status was 404, then we should remove the resource
 		if j.StatusCode == http.StatusNotFound {
 			log.Debugf("Resource has been deleted - removing: %s -> %s", j.Kind, j.Name)
 			r.deleteResource(res)
@@ -332,7 +371,14 @@ func (r *HelmRelease) UpdateResources(jetstream interfaces.PortalProxy) {
 			res.Resource = obj
 			r.setResource(res)
 		} else {
-			log.Error("Could not parse resource")
+			// Just decode from Yaml - could be a CRD
+			var obj interface{}
+			if err := yaml.Unmarshal(j.Data, &obj); err == nil {
+				res.Resource = obj
+				r.setResource(res)
+			} else {
+				log.Error("Could not parse resource")
+			}
 		}
 
 		// TODO: If the resource was a job, process the selector again
@@ -351,6 +397,22 @@ func getRestURL(namespace, kind, apiVersion, name string) string {
 			name += "/status"
 		}
 	}
-	restURL = fmt.Sprintf("/%s/%s/namespaces/%s/%ss/%s", base, apiVersion, namespace, strings.ToLower(kind), name)
+
+	kindPlural := pluralize(strings.ToLower(kind))
+	if len(namespace) == 0 {
+		// This is not a namespaced resource
+		restURL = fmt.Sprintf("/%s/%s/%s/%s", base, apiVersion, kindPlural, name)
+	} else {
+		restURL = fmt.Sprintf("/%s/%s/namespaces/%s/%s/%s", base, apiVersion, namespace, kindPlural, name)
+	}
+
 	return restURL
 }
+
+func pluralize(resource string) string {
+	if strings.HasSuffix(resource, "y") {
+		return fmt.Sprintf("%sies", resource[:len(resource)-1])
+	}
+
+	return fmt.Sprintf("%ss", resource)
+}

From a5b29fa3ef977c75cf5f22cf14ca3d193724e76d Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Fri, 24 Jul 2020 16:50:11 +0100
Subject: [PATCH 585/648] Merge upstream #3 (#421)

* Improve recent and favourites display (#4421)

* Improve recent and favourites display

* Remove debug logging

* Remove debug logging/subscription leak

* Unit test fix

* Tweaks following review

* Changes following review
- favourite & recent icon changes

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

* Add line-height to favourite and recent entity labels (#4438)

- missed out from another PR following review

* Autoscaler e2e tests: Give better failure error when the test can't find the scaling row (#4424)

* Improve autoscaler e2e tests

* Remove duplicate fail statement

* Helm Chart: Remove encryption key volume (#4355)

* Remove encryption key volume

* Remove encrpytion key volume migration from config-init job

* Improve the logout experience (#4439)

* Add support for including breaking changes in the changelog

* Improve the logout experience

* Fix unit tests

* Add request for version info to github issues template (#4443)

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Convert scripts to nodejs so they work on Windows (#4462)

* Convert scripts to js so they work on Windows

* Improve initial developer experience

* Fix scss compile on windows

* Fix windows build

* Use fs not fs-extra where possible (can work without npm install)

* Remove gulp

* Cleaner fixes for Windows

* Reset

* Fix whitespace

* Address PR feedback

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

* Shorten file paths containing `cloudfoundry`/`cloud-foundry` (#4466)

* Fix 'too long' file paths

* Fix build issues

* Convert scripts to js so they work on Windows

* Fix scss compile on windows

* Improve initial developer experience

* Fix scss compile on windows

* Fix windows build

* Use fs not fs-extra where possible (can work without npm install)

* Remove gulp

* Cleaner fixes for Windows

* Reset

* Fix whitespace

* Fix merge

Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>

* Fix log out page when there's a custom log in page (#4467)

* Add service broker space scope information to service wall list (#4463)

* Add service broker space scope information to service wall list

* Split out `Space Scope` into it's own `Scope` row/column

* Add service broker scope to service instance list (card and table) & app binding list (card)

* Fix e2e test

* Fix services table, cater for brokers that return 403

* Changes following review
- Show space scope link in app service list (quick access)
- Harmonize names (Service, broker, scope, etc)
- Fix space scope link in services wall

* Remove recents and favorites when entities are deleted (#4431)

* Improve recent and favourites display

* Remove debug logging

* Remove debug logging/subscription leak

* Unit test fix

* Remove recents and favorites when entities are deleted

* Fix merge issues

* Fix merge issue

* Tidy up and improve following PR feedback

* Remove out of date comment

* Fixed problem where clear was not working

* Check favorite exists before deleting

* Version bump and change log (#4469)

* Version bump and change log

* Update changelog

Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
---
 CHANGELOG.md                                  | 66 +++++++++++++++++
 package-lock.json                             |  2 +-
 package.json                                  |  2 +-
 .../src/shared/cf-shared.module.ts            |  4 +
 .../app-service-binding-card.component.html   | 22 +++++-
 .../app-service-binding-card.component.ts     | 58 ++++++---------
 .../cf-service-card.component.html            | 12 ++-
 .../cf-service-card.component.ts              | 21 +++---
 .../cf-service-instances-list-config.base.ts  |  4 +-
 .../cf-services-list-config.service.ts        | 19 ++++-
 .../table-cell-service-broker.component.html  | 16 ++++
 .../table-cell-service-broker.component.scss  |  0
 ...able-cell-service-broker.component.spec.ts | 25 +++++++
 .../table-cell-service-broker.component.ts    | 73 +++++++++++++++++++
 .../table-cell-service.component.html         |  9 ++-
 .../table-cell-service.component.scss         |  7 ++
 .../table-cell-service.component.ts           | 33 +++++----
 .../service-instance-card.component.html      | 12 ++-
 .../service-instance-card.component.ts        | 27 +++----
 .../src/actions/entity.delete.actions.ts      | 31 ++++++++
 .../packages/store/src/effects/api.effects.ts | 27 +++++--
 .../src/effects/user-favorites-effect.ts      | 25 ++++++-
 .../recently-visited.reducer.helpers.ts       |  9 +++
 .../recently-visited.reducer.ts               | 10 ++-
 .../application-autoscaler-e2e.spec.ts        |  3 -
 ...ate-service-instances-bind-app-e2e.spec.ts |  2 +-
 26 files changed, 416 insertions(+), 103 deletions(-)
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-broker/table-cell-service-broker.component.html
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-broker/table-cell-service-broker.component.scss
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-broker/table-cell-service-broker.component.spec.ts
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-broker/table-cell-service-broker.component.ts
 create mode 100644 src/frontend/packages/store/src/actions/entity.delete.actions.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 161b42c8ad..3822b7ef27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,71 @@
 # Change Log
 
+## 4.0.0
+
+[Full Changelog](https://github.com/cloudfoundry/stratos/compare/3.2.1...4.0.0)
+
+This release contains a number of fixes and improvements:
+
+**Improvements:**
+
+- Extensions: Remove the need for symlinks and improve the build process [\#4472](https://github.com/cloudfoundry/stratos/issues/4472)
+- Extensions: Allow Themes to be published and installed to/from npm [\#4471](https://github.com/cloudfoundry/stratos/issues/4471)
+- Extensions: Move to extensions and themes to be packages [\#4470](https://github.com/cloudfoundry/stratos/issues/4470)
+- Show service broker space scope information in service wall list [\#4458](https://github.com/cloudfoundry/stratos/issues/4458)
+- Client Secret is shown in the clear in the UI [\#4445](https://github.com/cloudfoundry/stratos/issues/4445)
+- Improve sizing of UI elements on desktop browsers [\#4419](https://github.com/cloudfoundry/stratos/issues/4419)
+- Theming: Allow more control over link and side navigation colors [\#4406](https://github.com/cloudfoundry/stratos/issues/4406)
+- Update to latest set of icons [\#4403](https://github.com/cloudfoundry/stratos/issues/4403)
+- Theming: Allow more control over page header colors and style [\#4396](https://github.com/cloudfoundry/stratos/issues/4396)
+- Helm Chart: Remove encryption volume [\#4351](https://github.com/cloudfoundry/stratos/issues/4351)
+- Improve app summary responsiveness [\#4348](https://github.com/cloudfoundry/stratos/issues/4348)
+- Improve UI for the case when we can't determine cf app deployment info [\#4347](https://github.com/cloudfoundry/stratos/issues/4347)
+- Change recent activity icon to avoid confusion with the refresh button [\#4346](https://github.com/cloudfoundry/stratos/issues/4346)
+- Helm Chart: Change default image pull policy to Always [\#4342](https://github.com/cloudfoundry/stratos/issues/4342)
+- Permissions: Org Managers: Disable org role checkboxes in roles stepper if not admin/org manager [\#4332](https://github.com/cloudfoundry/stratos/issues/4332)
+- Autoscaler: Add support for custom metrics [\#4298](https://github.com/cloudfoundry/stratos/issues/4298)
+- Add support for copying endpoint address in list view [\#4238](https://github.com/cloudfoundry/stratos/issues/4238)
+- Update to Angular 9 framework [\#4214](https://github.com/cloudfoundry/stratos/issues/4214)
+- Update docker logo in deploy app stepper [\#4133](https://github.com/cloudfoundry/stratos/issues/4133)
+- Helm Chart: Remove need for --recreate-pods when upgrading [\#4132](https://github.com/cloudfoundry/stratos/issues/4132)
+- Make permissions model extension friendly [\#3789](https://github.com/cloudfoundry/stratos/issues/3789)
+- User Favourites: Add icons to cards [\#3409](https://github.com/cloudfoundry/stratos/issues/3409)
+- Improve log out experience [\#2587](https://github.com/cloudfoundry/stratos/issues/2587)
+
+**Fixes:**
+
+- Ensure `cf push` works from Windows  [\#4465](https://github.com/cloudfoundry/stratos/issues/4465)
+- Visiting marketplace tab breaks service list [\#4397](https://github.com/cloudfoundry/stratos/issues/4397)
+- CF Application reports error after restage [\#4392](https://github.com/cloudfoundry/stratos/issues/4392)
+- Helm Chart: Icon is missing [\#4370](https://github.com/cloudfoundry/stratos/issues/4370)
+- Permissions: Users with no developer roles can click on create app button [\#4361](https://github.com/cloudfoundry/stratos/issues/4361)
+- Edit endpoint not available in table view [\#4349](https://github.com/cloudfoundry/stratos/issues/4349)
+- CF: Routes List: Filter by org breaks when user is an org auditor [\#4343](https://github.com/cloudfoundry/stratos/issues/4343)
+- Permissions: Only space developers should be able to see add service instance buttons [\#4331](https://github.com/cloudfoundry/stratos/issues/4331)
+- Permissions: Only Space Developers should be able to change count, terminate or ssh to instances [\#4330](https://github.com/cloudfoundry/stratos/issues/4330)
+- App: Gitlab Tab: Fix console errors [\#4325](https://github.com/cloudfoundry/stratos/issues/4325)
+- Permissions: Only space developers should be able to create/unbind/delete routes in app routes list [\#4324](https://github.com/cloudfoundry/stratos/issues/4324)
+- Permissions: Only Space Developers should be able to create/edit/delete an Autoscaler policy [\#4323](https://github.com/cloudfoundry/stratos/issues/4323)
+- Permissions: Only space developers should be able to see the app summary deployment card [\#4322](https://github.com/cloudfoundry/stratos/issues/4322)
+- Duplicated documentation between deploy/kubernetes and Helm Chart README.md [\#4315](https://github.com/cloudfoundry/stratos/issues/4315)
+- App Service Edit Binding: cancel of stepper results in leaked subscription [\#4295](https://github.com/cloudfoundry/stratos/issues/4295)
+- Exceptions thrown when navigating back from marketplace [\#4287](https://github.com/cloudfoundry/stratos/issues/4287)
+- Unbind services stepper fails to show bound services [\#4246](https://github.com/cloudfoundry/stratos/issues/4246)
+- Progress icon appears too close to right-hand size of table [\#4234](https://github.com/cloudfoundry/stratos/issues/4234)
+- Cancel/create in service instance stepper returns to incorrect locations [\#4052](https://github.com/cloudfoundry/stratos/issues/4052)
+- Exception thrown in setup steppers [\#3897](https://github.com/cloudfoundry/stratos/issues/3897)
+- Logout leaves the UI as is if the verify or logout call fails [\#2633](https://github.com/cloudfoundry/stratos/issues/2633)
+- Cf Build Packs: file name should wrap to next line if too long [\#1803](https://github.com/cloudfoundry/stratos/issues/1803)
+
+**Breaking Changes:**
+
+- **Kubernetes: Upgrade only possible from version 3.0.0 or later**
+
+  When deploying into Kubernetes using Helm and upgrading from an earlier version of Stratos using `helm upgrade`, upgrade is **only** supported from version 3.0.0 or later. If you are using an earlier version, first upgrade to version 3.x before then upgrading to the latest version.
+- **Angular 9 requires extensions to be declared**
+
+  Extension components must now be made known to the extensions system in the module that they are declared in, using `ExtensionService.declare`. Please check the documentation. This is required to ensure that the new Angular compiler for Ivy does not remove these components for being unreferenced in the application.
+
 ## 3.2.1
 
 [Full Changelog](https://github.com/SUSE/stratos/compare/3.2.0...3.2.1)
diff --git a/package-lock.json b/package-lock.json
index 8bbb6d91b2..1c002ad57b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "stratos",
-  "version": "3.2.1",
+  "version": "4.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 32d6ab56b1..e2996467de 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stratos",
-  "version": "3.2.1",
+  "version": "4.0.0",
   "description": "Stratos Console",
   "main": "index.js",
   "scripts": {
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 faca9700ab..206abb267a 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
@@ -136,6 +136,9 @@ import {
 import {
   TableCellServiceBindableComponent,
 } from './components/list/list-types/cf-services/table-cell-service-bindable/table-cell-service-bindable.component';
+import {
+  TableCellServiceBrokerComponent,
+} from './components/list/list-types/cf-services/table-cell-service-broker/table-cell-service-broker.component';
 import {
   TableCellServiceCfBreadcrumbsComponent,
 } from './components/list/list-types/cf-services/table-cell-service-cf-breadcrumbs/table-cell-service-cf-breadcrumbs.component';
@@ -248,6 +251,7 @@ const cfListTableCells: Type<TableCellCustom<any>>[] = [
   TableCellServiceReferencesComponent,
   TableCellServiceInstanceTagsComponent,
   TableCellCommitAuthorComponent,
+  TableCellServiceBrokerComponent
 ];
 
 const cfListCards: Type<CardCell<any>>[] = [
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.html b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.html
index 6bfbddb4da..854f94676f 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.html
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.html
@@ -1,7 +1,7 @@
 <app-meta-card class="app-service-card" [actionMenu]="cardMenu" [entityConfig]="entityConfig">
   <app-meta-card-title>
     <div class="app-service-card__title">
-      {{ (serviceInstance$ | async)?.entity.entity.name}}
+      {{ (serviceInstance$ | async)?.entity.name}}
       <app-service-icon [service]="service$ | async"></app-service-icon>
     </div>
   </app-meta-card-title>
@@ -18,7 +18,25 @@
     <app-meta-card-key>{{ data.label }}</app-meta-card-key>
     <app-meta-card-value>{{ data.data$ | async }} </app-meta-card-value>
   </app-meta-card-item>
-
+  <app-meta-card-item *ngIf="!isUserProvidedServiceInstance">
+    <app-meta-card-key>Service Broker</app-meta-card-key>
+    <app-meta-card-value>
+      <app-table-cell-service-broker [row]="service$ | async" [config]="brokerNameConfig">
+      </app-table-cell-service-broker>
+    </app-meta-card-value>
+  </app-meta-card-item>
+  <app-meta-card-item *ngIf="!isUserProvidedServiceInstance">
+    <app-meta-card-key>Service Scope</app-meta-card-key>
+    <app-meta-card-value>
+      <app-table-cell-service-broker [row]="service$ | async" [config]="brokerScopeConfig">
+      </app-table-cell-service-broker>
+    </app-meta-card-value>
+  </app-meta-card-item>
+  <app-meta-card-item>
+    <app-meta-card-key>Date Created On</app-meta-card-key>
+    <app-meta-card-value>{{ row.metadata.created_at | date:'medium'}}
+    </app-meta-card-value>
+  </app-meta-card-item>
   <app-meta-card-item *ngIf="envVarsAvailable$ | async as envVarData">
     <app-meta-card-key>Environment Variables</app-meta-card-key>
     <app-meta-card-value>
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 23b66083dc..b3e39e94f2 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
@@ -1,7 +1,6 @@
-import { DatePipe } from '@angular/common';
 import { Component, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf, of } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable, of } from 'rxjs';
 import { filter, first, map, switchMap } from 'rxjs/operators';
 
 import {
@@ -24,7 +23,6 @@ import { serviceBindingEntityType } from '../../../../../../cf-entity-types';
 import { ApplicationService } from '../../../../../../features/applications/application.service';
 import { isUserProvidedServiceInstance } from '../../../../../../features/cf/cf.helpers';
 import {
-  getServiceBrokerName,
   getServiceName,
   getServicePlanName,
   getServiceSummaryUrl,
@@ -34,6 +32,10 @@ import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-
 import { ServiceActionHelperService } from '../../../../../data-services/service-action-helper.service';
 import { CSI_CANCEL_URL } from '../../../../add-service-instance/csi-mode.service';
 import { EnvVarViewComponent } from '../../../../env-var-view/env-var-view.component';
+import {
+  TableCellServiceBrokerComponentConfig,
+  TableCellServiceBrokerComponentMode,
+} from '../../cf-services/table-cell-service-broker/table-cell-service-broker.component';
 
 
 interface EnvVarData {
@@ -54,19 +56,25 @@ export class AppServiceBindingCardComponent extends CardCell<APIResource<IServic
     customStyle?: string;
   }[];
   cardMenu: MenuItem[];
-  service$: Observable<EntityInfo<APIResource<IService>> | null>;
+  service$: Observable<APIResource<IService> | null>;
   serviceInstance$: Observable<EntityInfo<APIResource<IServiceInstance | IUserProvidedServiceInstance>>>;
   tags$: Observable<AppChip<IServiceInstance | IUserProvidedServiceInstance>[]>;
   entityConfig: ComponentEntityMonitorConfig;
   private envVarServicesSection$: Observable<string>;
-  private isUserProvidedServiceInstance: boolean;
+  isUserProvidedServiceInstance: boolean;
   serviceDescription$: Observable<string>;
   serviceUrl$: Observable<string>;
   serviceName$: Observable<string>;
 
+  brokerNameConfig: TableCellServiceBrokerComponentConfig = {
+    mode: TableCellServiceBrokerComponentMode.NAME
+  }
+  brokerScopeConfig: TableCellServiceBrokerComponentConfig = {
+    mode: TableCellServiceBrokerComponentMode.SCOPE,
+  }
+
   constructor(
     private dialog: MatDialog,
-    private datePipe: DatePipe,
     private appService: ApplicationService,
     private serviceActionHelperService: ServiceActionHelperService,
     private currentUserPermissionsService: CurrentUserPermissionsService,
@@ -105,11 +113,6 @@ export class AppServiceBindingCardComponent extends CardCell<APIResource<IServic
       this.setupAsServiceInstance();
     }
 
-    this.listData.push({
-      label: 'Date Created On',
-      data$: observableOf(this.datePipe.transform(this.row.metadata.created_at, 'medium'))
-    });
-
     this.tags$ = this.serviceInstance$.pipe(
       filter(o => !!o.entity.entity.tags),
       map(o => o.entity.entity.tags.map(t => ({ value: t })))
@@ -126,7 +129,8 @@ export class AppServiceBindingCardComponent extends CardCell<APIResource<IServic
     this.service$ = serviceInstance$.pipe(
       switchMap(o => cfEntityCatalog.service.store.getEntityService(o.entity.entity.service_guid, this.appService.cfGuid, {})
         .waitForEntity$),
-      filter(service => !!service)
+      filter(service => !!service),
+      map(e => e.entity)
     );
     this.listData = [{
       label: 'Service Plan',
@@ -139,39 +143,19 @@ export class AppServiceBindingCardComponent extends CardCell<APIResource<IServic
           return getServicePlanName(serviceInstance.service_plan.entity);
         })
       )
-    },
-    {
-      label: 'Service Broker',
-      data$: this.serviceInstance$.pipe(
-        switchMap(si => {
-          if (this.isUserProvidedServiceInstance) {
-            return null;
-          }
-          const serviceInstance: IServiceInstance = si.entity.entity as IServiceInstance;
-          return this.service$.pipe(
-            switchMap(service => {
-              return getServiceBrokerName(
-                service.entity.entity.service_broker_guid,
-                serviceInstance.cfGuid,
-              );
-            })
-          );
-        })
-      )
-    },
-    ];
-    this.envVarServicesSection$ = this.service$.pipe(map(s => s.entity.entity.label));
+    }];
+    this.envVarServicesSection$ = this.service$.pipe(map(s => s.entity.label));
 
     this.serviceDescription$ = this.service$.pipe(
-      map(service => service.entity.entity.description)
+      map(service => service.entity.description)
     );
 
     this.serviceUrl$ = this.service$.pipe(
-      map(service => getServiceSummaryUrl(service.entity.entity.cfGuid, service.entity.metadata.guid))
+      map(service => getServiceSummaryUrl(service.entity.cfGuid, service.metadata.guid))
     );
 
     this.serviceName$ = this.service$.pipe(
-      map(service => getServiceName(service.entity))
+      map(service => getServiceName(service))
     );
 
   }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-card/cf-service-card.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-card/cf-service-card.component.html
index 0268284b7c..838f06bdb0 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-card/cf-service-card.component.html
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-card/cf-service-card.component.html
@@ -13,13 +13,19 @@
     </app-meta-card-value>
   </app-meta-card-item>
   <app-meta-card-item>
-    <app-meta-card-key>Service Broker</app-meta-card-key>
+    <app-meta-card-key>Broker</app-meta-card-key>
     <app-meta-card-value>
-      {{ serviceBrokerName$ | async }}
+      <app-table-cell-service-broker [row]="serviceEntity" [config]="brokerNameConfig"></app-table-cell-service-broker>
     </app-meta-card-value>
   </app-meta-card-item>
   <app-meta-card-item>
-    <app-meta-card-key>Service Plans</app-meta-card-key>
+    <app-meta-card-key>Scope</app-meta-card-key>
+    <app-meta-card-value>
+      <app-table-cell-service-broker [row]="serviceEntity" [config]="brokerScopeConfig"></app-table-cell-service-broker>
+    </app-meta-card-value>
+  </app-meta-card-item>
+  <app-meta-card-item>
+    <app-meta-card-key>Plans</app-meta-card-key>
     <app-meta-card-value>
       {{ serviceEntity.entity.service_plans.length }}
     </app-meta-card-value>
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 f3696b8c7a..cf73ba00b7 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
@@ -1,6 +1,5 @@
 import { Component, Input } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
 
 import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
@@ -9,8 +8,12 @@ import { RouterNav } from '../../../../../../../../store/src/actions/router.acti
 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 { getServiceName } from '../../../../../../features/service-catalog/services-helper';
 import { CfOrgSpaceLabelService } from '../../../../../services/cf-org-space-label.service';
+import {
+  TableCellServiceBrokerComponentConfig,
+  TableCellServiceBrokerComponentMode,
+} from '../table-cell-service-broker/table-cell-service-broker.component';
 
 export interface ServiceTag {
   value: string;
@@ -27,7 +30,12 @@ export class CfServiceCardComponent extends CardCell<APIResource<IService>> {
   cfOrgSpace: CfOrgSpaceLabelService;
   extraInfo: IServiceExtra;
   tags: AppChip<ServiceTag>[] = [];
-  serviceBrokerName$: Observable<string>;
+  brokerNameConfig: TableCellServiceBrokerComponentConfig = {
+    mode: TableCellServiceBrokerComponentMode.NAME
+  }
+  brokerScopeConfig: TableCellServiceBrokerComponentConfig = {
+    mode: TableCellServiceBrokerComponentMode.SCOPE
+  }
 
   @Input() disableCardClick = false;
 
@@ -45,13 +53,6 @@ export class CfServiceCardComponent extends CardCell<APIResource<IService>> {
       if (!this.cfOrgSpace) {
         this.cfOrgSpace = new CfOrgSpaceLabelService(this.store, this.serviceEntity.entity.cfGuid);
       }
-
-      if (!this.serviceBrokerName$) {
-        this.serviceBrokerName$ = getServiceBrokerName(
-          this.serviceEntity.entity.service_broker_guid,
-          this.serviceEntity.entity.cfGuid,
-        );
-      }
     }
   }
 
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 2ed4424106..4dcfd049b1 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
@@ -78,7 +78,7 @@ export class CfServiceInstancesListConfigBase implements IListConfig<APIResource
       columnId: 'service',
       headerCell: () => 'Service',
       cellComponent: TableCellServiceComponent,
-      cellFlex: '2'
+      cellFlex: '3'
     },
     {
       columnId: 'lastOp',
@@ -119,7 +119,7 @@ export class CfServiceInstancesListConfigBase implements IListConfig<APIResource
         orderKey: 'creation',
         field: 'metadata.created_at'
       },
-      cellFlex: '2'
+      cellFlex: '1'
     },
   ];
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts
index 13e12ea854..a11fccae7a 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts
@@ -21,6 +21,10 @@ import { CfServiceCardComponent } from './cf-service-card/cf-service-card.compon
 import { CfServicesDataSource } from './cf-services-data-source';
 import { TableCellServiceActiveComponent } from './table-cell-service-active/table-cell-service-active.component';
 import { TableCellServiceBindableComponent } from './table-cell-service-bindable/table-cell-service-bindable.component';
+import {
+  TableCellServiceBrokerComponent,
+  TableCellServiceBrokerComponentMode,
+} from './table-cell-service-broker/table-cell-service-broker.component';
 import {
   TableCellServiceCfBreadcrumbsComponent,
 } from './table-cell-service-cf-breadcrumbs/table-cell-service-cf-breadcrumbs.component';
@@ -105,10 +109,19 @@ export class CfServicesListConfigService implements IListConfig<APIResource> {
   }, {
     columnId: 'broker',
     headerCell: () => 'Broker',
-    cellDefinition: {
-      valuePath: 'entity.label',
+    cellComponent: TableCellServiceBrokerComponent,
+    cellConfig: {
+      mode: TableCellServiceBrokerComponentMode.NAME
     },
-    cellFlex: '1'
+    cellFlex: '2'
+  }, {
+    columnId: 'brokerScope',
+    headerCell: () => 'Scope',
+    cellComponent: TableCellServiceBrokerComponent,
+    cellConfig: {
+      mode: TableCellServiceBrokerComponentMode.SCOPE
+    },
+    cellFlex: '2'
   }, {
     columnId: 'plans',
     headerCell: () => 'Plans',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-broker/table-cell-service-broker.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-broker/table-cell-service-broker.component.html
new file mode 100644
index 0000000000..1465604a38
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-broker/table-cell-service-broker.component.html
@@ -0,0 +1,16 @@
+<div *ngIf="(broker$ | async) else noBroker" class="service-broker">
+  <ng-container *ngIf="config?.mode === 'NAME'">
+    {{(broker$ | async).entity.name}}
+  </ng-container>
+  <div *ngIf="config?.mode === 'SCOPE'">
+    <ng-container *ngIf="spaceLink$ | async as spaceLink; else notSpaceScoped">
+      <ng-container *ngIf="config?.altScope; else normScope">Space</ng-container>
+      <ng-template #normScope><a [routerLink]="spaceLink.link">{{ spaceLink.name }}</a></ng-template>
+    </ng-container>
+    <ng-template #notSpaceScoped>
+      All Spaces
+    </ng-template>
+  </div>
+</div>
+<!-- Some CFs will return 403 when requesting a service's broker -->
+<ng-template #noBroker>-</ng-template>
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-broker/table-cell-service-broker.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-broker/table-cell-service-broker.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-broker/table-cell-service-broker.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-broker/table-cell-service-broker.component.spec.ts
new file mode 100644
index 0000000000..d7569ed286
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-broker/table-cell-service-broker.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TableCellServiceBrokerComponent } from './table-cell-service-broker.component';
+
+describe('TableCellServiceBrokerComponent', () => {
+  let component: TableCellServiceBrokerComponent;
+  let fixture: ComponentFixture<TableCellServiceBrokerComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [TableCellServiceBrokerComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(TableCellServiceBrokerComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-broker/table-cell-service-broker.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-broker/table-cell-service-broker.component.ts
new file mode 100644
index 0000000000..eea29808c6
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-broker/table-cell-service-broker.component.ts
@@ -0,0 +1,73 @@
+import { Component, Input } from '@angular/core';
+import { Observable } from 'rxjs';
+import { filter, map, switchMap } from 'rxjs/operators';
+
+import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
+import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { IServiceBroker } from '../../../../../../cf-api-svc.types';
+import { cfEntityCatalog } from '../../../../../../cf-entity-catalog';
+import { IService } from '../../../../../../public_api';
+
+export enum TableCellServiceBrokerComponentMode {
+  NAME = 'NAME',
+  SCOPE = 'SCOPE'
+}
+
+export interface TableCellServiceBrokerComponentConfig {
+  mode: TableCellServiceBrokerComponentMode;
+  altScope?: boolean;
+}
+
+@Component({
+  selector: 'app-table-cell-service-broker',
+  templateUrl: './table-cell-service-broker.component.html',
+  styleUrls: ['./table-cell-service-broker.component.scss']
+})
+export class TableCellServiceBrokerComponent extends TableCellCustom<APIResource<IService>> {
+
+  @Input()
+  config: TableCellServiceBrokerComponentConfig;
+
+  pRow: APIResource<IService>;
+  @Input()
+  set row(row: APIResource<IService>) {
+    this.pRow = row;
+    if (row && !this.spaceLink$) {
+      this.broker$ = cfEntityCatalog.serviceBroker.store.getEntityService(this.row.entity.service_broker_guid, this.row.entity.cfGuid, {}).waitForEntity$
+        .pipe(
+          map(e => e.entity)
+        )
+      this.spaceLink$ = this.broker$.pipe(
+        filter(broker => !!broker.entity.space_guid),
+        switchMap(broker => cfEntityCatalog.space.store.getWithOrganization.getEntityService(broker.entity.space_guid, broker.entity.cfGuid).waitForEntity$),
+        map(e => e.entity),
+        map(space => ({
+          name: space.entity.name,
+          link: ['/cloud-foundry',
+            space.entity.cfGuid,
+            'organizations',
+            space.entity.organization_guid,
+            'spaces',
+            space.metadata.guid,
+            'summary'
+          ]
+        })
+        )
+      )
+    }
+  }
+  get row(): APIResource<IService> {
+    return this.pRow;
+  }
+
+  public spaceLink$: Observable<{
+    name: string,
+    link: string[]
+  }>;
+  public broker$: Observable<APIResource<IServiceBroker>>
+
+  constructor() {
+    super()
+  }
+
+}
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.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
index 292f48f586..fd2aa9ce5b 100644
--- a/src/frontend/packages/cloud-foundry/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
@@ -4,5 +4,12 @@
 <div *ngIf="isUserProvidedServiceInstance === false">
   <div><a [routerLink]="serviceUrl$ | async">{{ serviceName$ | async }}</a></div>
   <div>Plan: {{ row.entity.service_plan?.entity.name }}</div>
-  <div>Broker: {{ serviceBrokerName$ | async }}</div>
+  <div class="broker">
+    Broker: <app-table-cell-service-broker [row]="service$ | async" [config]="brokerNameConfig">
+    </app-table-cell-service-broker>
+  </div>
+  <div class="broker">
+    Scope: <app-table-cell-service-broker [row]="service$ | async" [config]="brokerScopeConfig">
+    </app-table-cell-service-broker>
+  </div>
 </div>
\ No newline at end of file
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.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
index e3f51aafb5..d28afe7bc1 100644
--- a/src/frontend/packages/cloud-foundry/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
@@ -1,3 +1,10 @@
 div > div {
   padding-bottom: 5px;
 }
+
+.broker {
+  display: flex;
+  app-table-cell-service-broker {
+    padding-left: 5px;
+  }
+}
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 80434fe3b8..b9cbab0fec 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
@@ -1,6 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { Observable, of } from 'rxjs';
-import { filter, first, map, switchMap } from 'rxjs/operators';
+import { filter, map } from 'rxjs/operators';
 
 import { cfEntityCatalog } from '../../../../../../../../cloud-foundry/src/cf-entity-catalog';
 import { userProvidedServiceInstanceEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-types';
@@ -9,7 +9,11 @@ import { getServiceName } from '../../../../../../../../cloud-foundry/src/featur
 import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
-import { IServiceInstance } from '../../../../../../cf-api-svc.types';
+import { IService, IServiceInstance } from '../../../../../../cf-api-svc.types';
+import {
+  TableCellServiceBrokerComponentConfig,
+  TableCellServiceBrokerComponentMode,
+} from '../../cf-services/table-cell-service-broker/table-cell-service-broker.component';
 
 @Component({
   selector: 'app-table-cell-service',
@@ -20,13 +24,21 @@ export class TableCellServiceComponent extends TableCellCustom<APIResource<IServ
 
   serviceName$: Observable<string>;
   serviceUrl$: Observable<string>;
-  serviceBrokerName$: Observable<string>;
+  service$: Observable<APIResource<IService>>;
   // tslint:disable-next-line:ban-types
   isUserProvidedServiceInstance: Boolean;
 
   @Input() row: APIResource<IServiceInstance>;
   @Input() entityKey: string;
 
+  brokerNameConfig: TableCellServiceBrokerComponentConfig = {
+    mode: TableCellServiceBrokerComponentMode.NAME
+  }
+  brokerScopeConfig: TableCellServiceBrokerComponentConfig = {
+    mode: TableCellServiceBrokerComponentMode.SCOPE,
+    altScope: true
+  }
+
 
   ngOnInit() {
     this.isUserProvidedServiceInstance =
@@ -46,18 +58,9 @@ export class TableCellServiceComponent extends TableCellCustom<APIResource<IServ
         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()
-            );
-        })
+      this.service$ = service$.pipe(
+        filter(res => !!res),
+        map(a => a.entity),
       );
     }
   }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.html
index c9fa1a25fe..65a4475306 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.html
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.html
@@ -22,7 +22,17 @@
   </app-meta-card-item>
   <app-meta-card-item>
     <app-meta-card-key>Service Broker</app-meta-card-key>
-    <app-meta-card-value>{{ serviceBrokerName$ | async }} </app-meta-card-value>
+    <app-meta-card-value>
+      <app-table-cell-service-broker [row]="service$ | async" [config]="brokerNameConfig">
+      </app-table-cell-service-broker>
+    </app-meta-card-value>
+  </app-meta-card-item>
+  <app-meta-card-item>
+    <app-meta-card-key>Service Scope</app-meta-card-key>
+    <app-meta-card-value>
+      <app-table-cell-service-broker [row]="service$ | async" [config]="brokerScopeConfig">
+      </app-table-cell-service-broker>
+    </app-meta-card-value>
   </app-meta-card-item>
   <app-meta-card-item>
     <app-meta-card-key>Applications Attached</app-meta-card-key>
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 ffb0dd8ae5..8f8f8a5592 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
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
-import { filter, map, switchMap } from 'rxjs/operators';
+import { filter, map } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
 import { serviceInstancesEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-types';
@@ -17,7 +17,6 @@ import { IService, IServiceInstance } from '../../../../../../cf-api-svc.types';
 import { cfEntityCatalog } from '../../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import {
-  getServiceBrokerName,
   getServiceName,
   getServicePlanName,
   getServiceSummaryUrl,
@@ -26,6 +25,10 @@ import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-
 import { ServiceActionHelperService } from '../../../../../data-services/service-action-helper.service';
 import { CfOrgSpaceLabelService } from '../../../../../services/cf-org-space-label.service';
 import { CSI_CANCEL_URL } from '../../../../add-service-instance/csi-mode.service';
+import {
+  TableCellServiceBrokerComponentConfig,
+  TableCellServiceBrokerComponentMode,
+} from '../../cf-services/table-cell-service-broker/table-cell-service-broker.component';
 
 @Component({
   selector: 'app-service-instance-card',
@@ -97,15 +100,6 @@ export class ServiceInstanceCardComponent extends CardCell<APIResource<IServiceI
         );
       }
 
-      if (!this.serviceBrokerName$) {
-        // Note, here we just need the service's service broker. This should be available by
-        // `this.serviceInstanceEntity.entity.service_plan.entity.service.entity.service_broker_guid` however can be empty (see #4397).
-        // So fetch the service separately, as per the table way (this shouldn't start a http request if it's already in the store) 
-        this.serviceBrokerName$ = this.service$.pipe(
-          switchMap(service => getServiceBrokerName(service.entity.service_broker_guid, service.entity.cfGuid))
-        )
-      }
-
       if (!this.serviceName$) {
         // See note for this.serviceBrokerName$
         this.serviceName$ = this.service$.pipe(
@@ -142,12 +136,19 @@ export class ServiceInstanceCardComponent extends CardCell<APIResource<IServiceI
   entityConfig: ComponentEntityMonitorConfig;
 
   cfOrgSpace: CfOrgSpaceLabelService;
-  serviceBrokerName$: Observable<string>;
   serviceName$: Observable<string>;
   servicePlanName: string;
   serviceUrl: string;
 
-  private service$: Observable<APIResource<IService>>;
+  service$: Observable<APIResource<IService>>;
+
+  brokerNameConfig: TableCellServiceBrokerComponentConfig = {
+    mode: TableCellServiceBrokerComponentMode.NAME
+  }
+  brokerScopeConfig: TableCellServiceBrokerComponentConfig = {
+    mode: TableCellServiceBrokerComponentMode.SCOPE,
+    altScope: true
+  }
 
   private detach = () => {
     this.serviceActionHelperService.detachServiceBinding(
diff --git a/src/frontend/packages/store/src/actions/entity.delete.actions.ts b/src/frontend/packages/store/src/actions/entity.delete.actions.ts
new file mode 100644
index 0000000000..2b69ee601b
--- /dev/null
+++ b/src/frontend/packages/store/src/actions/entity.delete.actions.ts
@@ -0,0 +1,31 @@
+import { Action } from '@ngrx/store';
+
+import { EntityRequestAction } from '../types/request.types';
+import { IFavoriteMetadata, UserFavorite } from '../types/user-favorites.types';
+
+export class EntityDeleteCompleteAction implements Action {
+
+  public static ACTION_TYPE = '[Entity] Entity delete complete';
+  public type = EntityDeleteCompleteAction.ACTION_TYPE;
+
+  constructor(
+    public entityGuid: string,
+    public entityType: string,
+    public endpointGuid: string,
+    public endpointType: string,
+    public action: EntityRequestAction,
+  ) {}
+
+  // Create an entity delete action if we have all of the properties we need
+  public static parse(action: EntityRequestAction): EntityDeleteCompleteAction {
+    if (action.guid && action.entityType && action.endpointType && action.endpointGuid) {
+      return new EntityDeleteCompleteAction(action.guid, action.entityType, action.endpointGuid, action.endpointType, action);
+    }
+    return null;
+  }
+
+  public asFavorite(): UserFavorite<IFavoriteMetadata> {
+    return new UserFavorite<IFavoriteMetadata>(this.endpointGuid, this.endpointType, this.entityType, this.entityGuid);
+  }
+
+}
diff --git a/src/frontend/packages/store/src/effects/api.effects.ts b/src/frontend/packages/store/src/effects/api.effects.ts
index 493fe31634..34ee572143 100644
--- a/src/frontend/packages/store/src/effects/api.effects.ts
+++ b/src/frontend/packages/store/src/effects/api.effects.ts
@@ -3,13 +3,14 @@ import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { mergeMap, withLatestFrom } from 'rxjs/operators';
 
+import { EntityDeleteCompleteAction } from '../actions/entity.delete.actions';
 import { baseRequestPipelineFactory } from '../entity-request-pipeline/base-single-entity-request.pipeline';
 import { basePaginatedRequestPipeline } from '../entity-request-pipeline/entity-pagination-request-pipeline';
 import { apiRequestPipelineFactory } from '../entity-request-pipeline/entity-request-pipeline';
 import { PipelineHttpClient } from '../entity-request-pipeline/pipline-http-client.service';
 import { PaginatedAction } from '../types/pagination.types';
-import { ICFAction } from '../types/request.types';
-import { ApiActionTypes } from './../actions/request.actions';
+import { ICFAction, WrapperRequestActionSuccess } from '../types/request.types';
+import { ApiActionTypes, RequestTypes } from './../actions/request.actions';
 import { InternalAppState } from './../app-state';
 
 @Injectable()
@@ -18,9 +19,7 @@ export class APIEffect {
     private actions$: Actions,
     private store: Store<InternalAppState>,
     private httpClient: PipelineHttpClient
-  ) {
-
-  }
+  ) { }
 
   @Effect()
   apiRequest$ = this.actions$.pipe(
@@ -44,4 +43,22 @@ export class APIEffect {
     }),
   );
 
+  // Whenever we spot a delete success operation, look to see if the action
+  // fulfils the entity delete requirements and dispatch an entity delete action if it does
+  @Effect()
+  apiDeleteRequest$ = this.actions$.pipe(
+    ofType<WrapperRequestActionSuccess>(RequestTypes.SUCCESS),
+    withLatestFrom(this.store),
+    mergeMap(([action, appState]) => {
+      if (action.requestType === 'delete') {
+        const deleteAction = EntityDeleteCompleteAction.parse(action.apiAction);
+        if (deleteAction) {
+          // Dispatch a delete action for the entity
+          this.store.dispatch(deleteAction);
+        }
+      }
+      return [];
+    })
+  );
+
 }
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 02240e52af..76e31662f1 100644
--- a/src/frontend/packages/store/src/effects/user-favorites-effect.ts
+++ b/src/frontend/packages/store/src/effects/user-favorites-effect.ts
@@ -2,8 +2,9 @@ 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, first, mergeMap, switchMap } from 'rxjs/operators';
+import { catchError, first, mergeMap, switchMap, withLatestFrom } from 'rxjs/operators';
 
+import { EntityDeleteCompleteAction } from '../actions/entity.delete.actions';
 import { ClearPaginationOfEntity } from '../actions/pagination.actions';
 import {
   GetUserFavoritesAction,
@@ -17,24 +18,24 @@ import {
   UpdateUserFavoriteMetadataAction,
   UpdateUserFavoriteMetadataSuccessAction,
 } from '../actions/user-favourites.actions';
-import { DispatchOnlyAppState } from '../app-state';
+import { InternalAppState } from '../app-state';
 import { entityCatalog } from '../entity-catalog/entity-catalog';
 import { proxyAPIVersion } from '../jetstream';
 import { NormalizedResponse } from '../types/api.types';
 import { StartRequestAction, WrapperRequestActionFailed, WrapperRequestActionSuccess } from '../types/request.types';
 import { IFavoriteMetadata, UserFavorite, userFavoritesPaginationKey } from '../types/user-favorites.types';
 import { UserFavoriteManager } from '../user-favorite-manager';
+import { STRATOS_ENDPOINT_TYPE, userFavouritesEntityType } from './../helpers/stratos-entity-factory';
 
 const favoriteUrlPath = `/pp/${proxyAPIVersion}/favorites`;
 
-
 @Injectable()
 export class UserFavoritesEffect {
 
   constructor(
     private http: HttpClient,
     private actions$: Actions,
-    private store: Store<DispatchOnlyAppState>,
+    private store: Store<InternalAppState>,
     private userFavoriteManager: UserFavoriteManager
   ) {
   }
@@ -144,4 +145,20 @@ export class UserFavoritesEffect {
       );
     })
   );
+
+  @Effect()
+  entityDeleteRequest$ = this.actions$.pipe(
+    ofType<EntityDeleteCompleteAction>(EntityDeleteCompleteAction.ACTION_TYPE),
+    withLatestFrom(this.store),
+    mergeMap(([action, appState]) => {
+      // If there is a favorite, delete it
+      const fav = action.asFavorite();
+      const entityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, userFavouritesEntityType);
+      if (appState.requestData && appState.requestData[entityKey] && appState.requestData[entityKey][fav.guid]) {
+        this.store.dispatch(new RemoveUserFavoriteAction(fav));
+      }
+      return [];
+    })
+  );
+
 }
diff --git a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/recently-visited.reducer.helpers.ts b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/recently-visited.reducer.helpers.ts
index f1e84bafca..f63f5a5781 100644
--- a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/recently-visited.reducer.helpers.ts
+++ b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/recently-visited.reducer.helpers.ts
@@ -1,3 +1,4 @@
+import { EntityDeleteCompleteAction } from '../../actions/entity.delete.actions';
 import { AddRecentlyVisitedEntityAction } from '../../actions/recently-visited.actions';
 import { IRecentlyVisitedEntity, IRecentlyVisitedState } from '../../types/recently-visited.types';
 
@@ -62,3 +63,11 @@ export function cleanRecentsList(state: IRecentlyVisitedState, endpointGuids: st
   // Convert the array back into a map
   return filtered.reduce(recentArrayToMap, {});
 }
+
+export function clearEntityFromRecentsList(state: IRecentlyVisitedState, action: EntityDeleteCompleteAction): IRecentlyVisitedState {
+  // Remove entity from the map if it exists
+  const fav = action.asFavorite();
+  const newState = { ...state };
+  delete newState[fav.guid];
+  return newState;
+}
\ No newline at end of file
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 79fd5eaee4..19e21f17d9 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
@@ -7,17 +7,25 @@ import {
   GetAllEndpointsSuccess,
   UNREGISTER_ENDPOINTS_SUCCESS,
 } from '../../actions/endpoint.actions';
+import { EntityDeleteCompleteAction } from '../../actions/entity.delete.actions';
 import { AddRecentlyVisitedEntityAction, SetRecentlyVisitedEntityAction } from '../../actions/recently-visited.actions';
 import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { endpointEntityType, STRATOS_ENDPOINT_TYPE } from '../../helpers/stratos-entity-factory';
 import { IRecentlyVisitedState } from '../../types/recently-visited.types';
-import { addRecentlyVisitedEntity, cleanRecentsList, getDefaultRecentState } from './recently-visited.reducer.helpers';
+import {
+  addRecentlyVisitedEntity,
+  cleanRecentsList,
+  clearEntityFromRecentsList,
+  getDefaultRecentState,
+} from './recently-visited.reducer.helpers';
 
 export function recentlyVisitedReducer(
   state: IRecentlyVisitedState = getDefaultRecentState(),
   action: Action
 ): IRecentlyVisitedState {
   switch (action.type) {
+    case EntityDeleteCompleteAction.ACTION_TYPE:
+      return clearEntityFromRecentsList(state, action as EntityDeleteCompleteAction);
     case AddRecentlyVisitedEntityAction.ACTION_TYPE:
       return addRecentlyVisitedEntity(state, action as AddRecentlyVisitedEntityAction);
     case SetRecentlyVisitedEntityAction.ACTION_TYPE:
diff --git a/src/test-e2e/application/application-autoscaler-e2e.spec.ts b/src/test-e2e/application/application-autoscaler-e2e.spec.ts
index 8eb872fd73..996487c8d4 100644
--- a/src/test-e2e/application/application-autoscaler-e2e.spec.ts
+++ b/src/test-e2e/application/application-autoscaler-e2e.spec.ts
@@ -534,9 +534,6 @@ describe('Autoscaler -', () => {
             } else {
               console.log(`${time}: Waiting for event row: manually refreshing list`);
               eventPageBase.list.header.refresh();
-            if (retries === 0) {
-              sub.unsubscribe();
-            }
             }
           }
         });
diff --git a/src/test-e2e/marketplace/create-service-instances-bind-app-e2e.spec.ts b/src/test-e2e/marketplace/create-service-instances-bind-app-e2e.spec.ts
index 91eb24e945..0fe47fada5 100644
--- a/src/test-e2e/marketplace/create-service-instances-bind-app-e2e.spec.ts
+++ b/src/test-e2e/marketplace/create-service-instances-bind-app-e2e.spec.ts
@@ -50,7 +50,7 @@ describe('Create Service Instance with binding', () => {
         .then(metaCardRows => {
           expect(metaCardRows[1].value).toBe(servicesSecrets.publicService.name);
           expect(metaCardRows[2].value).toBe('shared');
-          expect(metaCardRows[4].value).toBe('1');
+          expect(metaCardRows[5].value).toBe('1');
         });
 
     });

From 302c5deee1a4cef4869fa78a24b62bd9e976c327 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Fri, 24 Jul 2020 17:58:15 +0100
Subject: [PATCH 586/648] Security Observability: Add persistent volume, gate
 on tech preview (#418)

* Work in progress Analysis tools

* Thursday updates

* Friday fixes and improvements

* Friday code

* Separate analyzers into a separate container

* Wire in analyzers container in the Helm chart

* Hide analysis UI features when not enabled

* Fix sidepanel bug with fallback metadata

* Bug fix for change in way tab links are hidden

* Remove debug logging

* Add refresh button to report selector drop down. Change no reports icon

* Add support for adding breadcrumbs in the sub nav bar

* Fix unit tests

* Fix format issues

* Final front-end unit test fixes

* Fix issues when deploying via Helm with mariadb

* Analyzers container fix. Allow helm chart to be packaged.

* Build script fixes

* Remove file

* WIP: Add support for Clair image scanning

* Use klar

* Remove binary

* Add clair helm chart for dev

* Fixes

* USe end var for clair server address

* Latest updates

* Improvements

* Minor fixes

* Tweak

* Fix 1.16 detecton issue with the analyzers

* Chart fixes

* Changes following first run of script

* Changes following npm install

* Update custom-src to new model
- expose custom module's module's
- Add routing module
- Tweak stratos.config.ts log output
- remove custom-src dir

* update naming... custom extensions --> suse extensions

* A few tidyups to help review

* Fix build issue due to merge

* Fixes following merge from upstream

* Remove clair from this PR

* Ignore example packages when there's a stratos config file

* Changes following review

* Changes following merge

* Update dir names, remove examples folder

* Add back in custom-src deploy content, also add product version to config

* Revert change needed downstream... (only needed when suse extension is included)

* Remove unused wip report viewers

* Fix after merge

* Move new terminal & config code to plugin, fix more build files

* Fix imports and add doc

* Fix compilation issues

* Change following merge

* Tweaks to logging

* Fix bug where report can not be deleted

* Fix kube config connect after merge, also fix subtype & error on connect

* Fix e2e

* Improve drop-down menu

* Remove strange merge artifacts

* Remove build file

* Fix graph overview

* Numerous improvements to graph parsing and presentation

* Remove logging. Add no reports message to workload analysis

* Add support for CRDs. KubeCF renders correctly.

* Allow which engines are enabled to be configured

* Fix issue where reports are not filtered by endpoint

* Minor changes following review

* Fixes for a few more issues

* Add Analyzers image build to Concourse CI

* Multiple small fixes
- fix text search in analysis list
- fix title of links in analysers info page
- handle slow connections by only polling analysis list when not already

* Fix kubeGuid for helm world

* Add AnalysisReportRunnerComponent
- Still need to add this to other places

* Delete reports when endpoint is unregistered

* Buf fixes. Use breadcrumbs in sub-nav

* Add run analysis button to workload analyis and graph tabs

* Fix select of overlay in workload graphs page

* Change default sort order of analysis list to age

* Ensure table cell links update on row change

* Align table action's icon better

* Use a side panel for analyzer info

* Add actions/effects for all used analyis actions
- Add new ResetPaginationOfType action, like ResetPagination but applies to all types
- Allows user to refresh reports list after kicking off new report on namespace & workload tabs
- Handle missing report param in reports returned from get all reports

* Remove some console.logs, converted some to console.info

* Update Kube Dashboard, allow download link to be configurable
- Default download link updated to v2.0.3
- Can configured link by setting env var `STRATOS_KUBERNETES_DASHBOARD_IMAGE`
- Can configure env var in helm via `console.kubeDashboardImage`
- Kube Dashboard now expanded by default (to show namespace drop down)

* Fix after merge

* Changes following review

* Fix expand of kube dashboard header by default

* Changes following review

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* WIP Wire in alerts to workload graph
- need to understand if namespace should be checked when matching node/resource to alert
- need to apply correct colour

* Fix workload security analysis overlay slide in

* Hide analysis headers info in tech preview & tie in tech preview check to analysisService.hideAnalysis$
- Q should the backend plugins be available in tech preview, see TODO

* Hide the Workload Graph view if in tech preview

* Fix disable of analysis plugin when tech preview is switched off

* Adderss PR feedback

* Gate analyzer deployment on tech preview. Add persistent volume

* Fixes - removed volume for now

* Fix issue with persistent volume

* Fix error message colour in login screen

* Fix after merge

Co-authored-by: Richard Cox <richard.cox@suse.com>
---
 .../console/templates/analyzers.yaml          | 47 +++++++++++++++++++
 deploy/kubernetes/console/values.yaml         |  6 +++
 .../helm-release-resource-graph.component.ts  | 13 ++---
 .../suse-login/suse-login.component.scss      |  1 +
 4 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/deploy/kubernetes/console/templates/analyzers.yaml b/deploy/kubernetes/console/templates/analyzers.yaml
index ca4d5a0d6d..75208610ff 100644
--- a/deploy/kubernetes/console/templates/analyzers.yaml
+++ b/deploy/kubernetes/console/templates/analyzers.yaml
@@ -1,4 +1,5 @@
 ---
+{{- if .Values.console.techPreview }}
 {{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major (trimSuffix "+" .Capabilities.KubeVersion.Minor) )}}
 apiVersion: apps/v1
 {{- else }}
@@ -20,6 +21,10 @@ spec:
       app.kubernetes.io/component: "stratos-analyzers"
   template:
     metadata:
+{{- if .Values.console.podAnnotations }}
+      annotations:
+{{ toYaml .Values.console.podAnnotations | indent 8 }}
+{{- end }}
       labels:
         app.kubernetes.io/name: "stratos"
         app.kubernetes.io/instance: "{{ .Release.Name }}"
@@ -27,6 +32,9 @@ spec:
         app.kubernetes.io/component: "stratos-analyzers"
         helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
         app: "{{ .Release.Name }}"
+        {{- if .Values.console.podExtraLabels}}
+        {{ toYaml .Values.console.podExtraLabels | nindent 8 }}
+        {{- end}}        
     spec:
       containers:
       - name: analyzers
@@ -36,10 +44,25 @@ spec:
         - name: api
           containerPort: 8090
         env:
+        - name: STRATOS_IMAGE_REF
+          value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
         - name: ANALYSIS_SCRIPTS_DIR
           value: "/scripts"
         - name: ANALYSIS_REPORTS_DIR
           value: "/reports"
+        volumeMounts:
+        - name: data
+          mountPath: /reports
+      {{- if and .Values.kube.registry.username .Values.kube.registry.password }}
+      imagePullSecrets:
+      - name: {{.Values.dockerRegistrySecret}}
+      {{- end }}
+      {{- if not .Values.console.reportsVolumeDisabled }}
+      volumes:
+      - name: data
+        persistentVolumeClaim:
+          claimName: "{{ .Release.Name }}-reports"
+      {{- end }}
 ---
 apiVersion: v1
 kind: Service
@@ -60,3 +83,27 @@ spec:
   selector:
     app: "{{ .Release.Name }}"
     app.kubernetes.io/component: "stratos-analyzers"
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: "{{ .Release.Name }}-reports"
+  labels:
+    app.kubernetes.io/name: "stratos"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+    app.kubernetes.io/component: "stratos-reports-volume"
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+  annotations:
+  {{- if .Values.storageClass }}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.storageClass | quote }}
+  {{- else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- end }}
+spec:
+  accessModes:
+    - "ReadWriteOnce"
+  resources:
+    requests:
+      storage: {{ default "1Gi" .Values.console.reportsVolumeSize | quote }}
+{{- end }}
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index 5dbf69f47d..d2ee436aca 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -112,6 +112,12 @@ console:
 
   # Download link when installing the Kubernetes Dashboard in a targetted Kube Endpoint
   kubeDashboardImage:
+
+  # Size for analysis reports volume
+  reportsVolumeSize: 1Gi
+
+  # Do not use a persistent volume for analysis reports
+  reportsVolumeDisabled: false
   
 images:
   console: stratos-console
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
index 9e73f79e75..99235522c1 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
@@ -245,16 +245,9 @@ export class HelmReleaseResourceGraphComponent implements OnInit, OnDestroy {
   private getResource(node: CustomHelmReleaseGraphNode): Observable<HelmReleaseResource> {
     return this.helper.fetchReleaseResources().pipe(
       filter(r => !!r),
-      // tap(r => {
-      //   console.log(node);
-      //   console.log(r);
-      // }),
-      map((r: HelmReleaseResources) => Object.values(r.data).find((res) => {
-        // if (!res.metadata) {
-        //   console.log(node, res);
-        // }
-        return res.metadata.name === node.label && res.kind === node.data.kind;
-      })),
+      map((r: HelmReleaseResources) => Object.values(r.data).find((res) =>
+        res.metadata.name === node.label && res.kind === node.data.kind
+      )),
       first(),
     );
   }
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
index 62ccddf629..c84aae5cfa 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
@@ -128,6 +128,7 @@
     }
   }
   &__message {
+    color: $suse-gray-fg;
     font-size: 18px;
     font-weight: 300;
     height: 20px;

From 4c43db43fae668a2af49c913af477371741a6d43 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Fri, 24 Jul 2020 18:08:42 +0100
Subject: [PATCH 587/648] 4.0.0 changelog (#423)

---
 CHANGELOG.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3822b7ef27..1626295348 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,12 +2,19 @@
 
 ## 4.0.0
 
-[Full Changelog](https://github.com/cloudfoundry/stratos/compare/3.2.1...4.0.0)
+[Full Changelog](https://github.com/SUSE/stratos/compare/3.2.1...4.0.0)
 
 This release contains a number of fixes and improvements:
 
 **Improvements:**
 
+- Add Kubernetes Terminal feature [\#422](https://github.com/SUSE/stratos/issues/422)
+- Add Dark Mode [\#410](https://github.com/SUSE/stratos/issues/410)
+- Add Security Observability support [\#401](https://github.com/SUSE/stratos/issues/401)
+- Update kube dashboard version [\#395](https://github.com/SUSE/stratos/issues/395)
+- Workload: Add warning if manifest parses with errors [\#390](https://github.com/SUSE/stratos/issues/390)
+- Workload Summary: Improve Ready/Not Ready stats when there are terminated containers [\#388](https://github.com/SUSE/stratos/issues/388)
+- Update theme to reflect new SUSE branding [\#385](https://github.com/SUSE/stratos/issues/385)
 - Extensions: Remove the need for symlinks and improve the build process [\#4472](https://github.com/cloudfoundry/stratos/issues/4472)
 - Extensions: Allow Themes to be published and installed to/from npm [\#4471](https://github.com/cloudfoundry/stratos/issues/4471)
 - Extensions: Move to extensions and themes to be packages [\#4470](https://github.com/cloudfoundry/stratos/issues/4470)
@@ -34,6 +41,9 @@ This release contains a number of fixes and improvements:
 
 **Fixes:**
 
+- Helm Chart: Icon is missing [\#393](https://github.com/SUSE/stratos/issues/393)
+- Workload Summary: Ring chart series toggled on refresh & legend vs ring colours missmatched [\#389](https://github.com/SUSE/stratos/issues/389)
+- Can't connect a K3S endpoint [\#372](https://github.com/SUSE/stratos/issues/372)
 - Ensure `cf push` works from Windows  [\#4465](https://github.com/cloudfoundry/stratos/issues/4465)
 - Visiting marketplace tab breaks service list [\#4397](https://github.com/cloudfoundry/stratos/issues/4397)
 - CF Application reports error after restage [\#4392](https://github.com/cloudfoundry/stratos/issues/4392)

From da704933bc5697460d490864ac59f0e133a81115 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Tue, 28 Jul 2020 09:28:06 +0100
Subject: [PATCH 588/648] Ensure custom login component included in `ng build
 --prod` (#424)

* Allow extensions to reference the custom login component
- will then be included in `ng build --prod`
- See #4473

* Add suse log in component to extension metadata

* Revert "Allow extensions to reference the custom login component"

This reverts commit 3988210aed1a4f3a00409c8070ad89613785fd9e.

* Revert "Add suse log in component to extension metadata"

This reverts commit a92f2f785757430c44a524281db859e7fc35bc78.

* Use correct method to include tree shaken component
- ExtensionService.declare
---
 .../packages/suse-extensions/src/custom/suse.module.ts        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/frontend/packages/suse-extensions/src/custom/suse.module.ts b/src/frontend/packages/suse-extensions/src/custom/suse.module.ts
index e0d45321b1..d147814f58 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/suse.module.ts
@@ -3,6 +3,7 @@ import { NgModule } from '@angular/core';
 import { CoreModule } from '../../../core/src/core/core.module';
 import { CustomizationService, CustomizationsMetadata } from '../../../core/src/core/customizations.types';
 import { MDAppModule } from '../../../core/src/core/md.module';
+import { ExtensionService } from '../../../core/src/public-api';
 import { SharedModule } from '../../../core/src/shared/shared.module';
 import { DemoHelperComponent } from './demo/demo-helper/demo-helper.component';
 import { HelmSetupModule } from './helm/helm.setup.module';
@@ -26,6 +27,9 @@ const SuseCustomizations: CustomizationsMetadata = {
     MDAppModule,
     KubernetesSetupModule,
     HelmSetupModule,
+    ExtensionService.declare([
+      SuseLoginComponent,
+    ])
   ],
   // FIXME: Ensure that anything lazy loaded/in kube endpoint pages is not included here - #3675
   declarations: [

From 582506f5c61187a26c31a1b380409be3882ae477 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Tue, 28 Jul 2020 09:28:21 +0100
Subject: [PATCH 589/648] Ensure filename/no filename text in connect by file
 dialog is aligned (#425)

- needs porting back
---
 .../src/shared/components/file-input/file-input.component.scss   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/frontend/packages/core/src/shared/components/file-input/file-input.component.scss b/src/frontend/packages/core/src/shared/components/file-input/file-input.component.scss
index b1417ebcc8..aa0e1b908a 100644
--- a/src/frontend/packages/core/src/shared/components/file-input/file-input.component.scss
+++ b/src/frontend/packages/core/src/shared/components/file-input/file-input.component.scss
@@ -7,6 +7,7 @@
     pointer-events: none;
   }
   &__field {
+    align-items: center;
     display: flex;
   }
   &__input {

From 381e609f4757929456f07196c8558d60b9957cce Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Tue, 28 Jul 2020 09:29:03 +0100
Subject: [PATCH 590/648] Fix workload resource 404s/workload service age field
 (#426)

- jobs to fetch resources were using a bad property for namespace (empty)
- this resulted in namespaced resources being fetched as if they weren't, so 404s
- seen as missing age field in workload services table & missing data in graph resource slide in
---
 src/jetstream/plugins/kubernetes/helm/release.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/helm/release.go b/src/jetstream/plugins/kubernetes/helm/release.go
index 868200bb89..915d1c8a2d 100644
--- a/src/jetstream/plugins/kubernetes/helm/release.go
+++ b/src/jetstream/plugins/kubernetes/helm/release.go
@@ -192,7 +192,7 @@ func (r *HelmRelease) processKubeResource(obj interface{}, t KubeResource) {
 	r.setResource(t)
 	log.Debugf("Got resource: %s : %s", t.Kind, t.Metadata.Name)
 	r.processController(t)
-	r.addJobForResource(t.Metadata.Namespace, t.Kind, t.APIVersion, t.Metadata.Name)
+	r.addJobForResource(r.Namespace, t.Kind, t.APIVersion, t.Metadata.Name)
 }
 
 func (r *HelmRelease) addJobForResource(namespace, kind, apiVersion, name string) {
@@ -200,7 +200,7 @@ func (r *HelmRelease) addJobForResource(namespace, kind, apiVersion, name string
 		ID:         fmt.Sprintf("%s-%s#Pods", kind, name),
 		Endpoint:   r.Endpoint,
 		User:       r.User,
-		Namespace:  r.Namespace,
+		Namespace:  namespace,
 		Name:       name,
 		URL:        getRestURL(namespace, kind, apiVersion, name),
 		APIVersion: apiVersion,

From 54507417957bd0b2229cea15cff6ac62bec3fc07 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 30 Jul 2020 14:07:45 +0100
Subject: [PATCH 591/648] Set memory limits for stratos-chartstore fdbdoclayer
 container - fixes #429 - apply limit to container showing memory leak -
 resources cannot be set in `DeploymentSpec` (no `resources` -
 https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.18/#deploymentspec-v1-apps)

---
 .../kubernetes/console/templates/fdbdoclayer/deployment.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/deploy/kubernetes/console/templates/fdbdoclayer/deployment.yaml b/deploy/kubernetes/console/templates/fdbdoclayer/deployment.yaml
index 4a1a02e06d..90923912b0 100644
--- a/deploy/kubernetes/console/templates/fdbdoclayer/deployment.yaml
+++ b/deploy/kubernetes/console/templates/fdbdoclayer/deployment.yaml
@@ -86,6 +86,11 @@ spec:
         - name: certs
           mountPath: "/etc/secrets"
           readOnly: true
+        resources:
+          limits:
+            memory: 384Mi
+          requests:
+            memory: 256Mi
       - name: fdbserver
         image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.fdbserver}}:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}

From b3c3339e0f1cabe3ef2c75d26357dd0c239ad2d4 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 31 Jul 2020 07:53:18 +0100
Subject: [PATCH 592/648] Update change log

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e30ecb5e2..7161d27c13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@ This release contains a number of fixes and improvements:
 
 **Fixes:**
 
+- Memory leak in stratos-chartstore (fdbdoclayer) [\#429](https://github.com/SUSE/stratos/issues/429)
 - Helm Chart: Icon is missing [\#393](https://github.com/SUSE/stratos/issues/393)
 - Workload Summary: Ring chart series toggled on refresh & legend vs ring colours missmatched [\#389](https://github.com/SUSE/stratos/issues/389)
 - Can't connect a K3S endpoint [\#372](https://github.com/SUSE/stratos/issues/372)

From d2fb52d76ecfb98ae4111ca0fa19869837819c78 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Fri, 7 Aug 2020 16:20:57 +0100
Subject: [PATCH 593/648] Add typed entity access and `custom-src` removal to
 change log (#435)

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7161d27c13..9a780c8ba0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ This release contains a number of fixes and improvements:
 - Workload: Add warning if manifest parses with errors [\#390](https://github.com/SUSE/stratos/issues/390)
 - Workload Summary: Improve Ready/Not Ready stats when there are terminated containers [\#388](https://github.com/SUSE/stratos/issues/388)
 - Update theme to reflect new SUSE branding [\#385](https://github.com/SUSE/stratos/issues/385)
+- Extensions: Allow typed access to store entities and their actions [\#4494](https://github.com/cloudfoundry/stratos/issues/4494)
 - Extensions: Remove the need for symlinks and improve the build process [\#4472](https://github.com/cloudfoundry/stratos/issues/4472)
 - Extensions: Allow Themes to be published and installed to/from npm [\#4471](https://github.com/cloudfoundry/stratos/issues/4471)
 - Extensions: Move to extensions and themes to be packages [\#4470](https://github.com/cloudfoundry/stratos/issues/4470)
@@ -71,6 +72,9 @@ This release contains a number of fixes and improvements:
 
 **Breaking Changes:**
 
+- **Customizations in `custom-src` are now npm packages**
+
+  Stratos customizations were previously in `./custom-src` and included in the build via symlinks. These customizations have now moved into local npm packages located in `./src/frontend/packages`. For more details please see our customization documentation at `./website/docs/extensions/introduction.md` or `https://stratos.app/docs/extensions/introduction`. There you will also find instructions on migrating to npm packages and a tool to help automate most of the process. 
 - **Kubernetes: Upgrade only possible from version 3.0.0 or later**
 
   When deploying into Kubernetes using Helm and upgrading from an earlier version of Stratos using `helm upgrade`, upgrade is **only** supported from version 3.0.0 or later. If you are using an earlier version, first upgrade to version 3.x before then upgrading to the latest version.

From 8ad354a4b78714549e70004f78ae1becb0e88179 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Thu, 13 Aug 2020 14:17:34 +0100
Subject: [PATCH 594/648] Fix helm 3 lint issue (#440)

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

diff --git a/deploy/kubernetes/console/templates/analyzers.yaml b/deploy/kubernetes/console/templates/analyzers.yaml
index 75208610ff..226d984564 100644
--- a/deploy/kubernetes/console/templates/analyzers.yaml
+++ b/deploy/kubernetes/console/templates/analyzers.yaml
@@ -1,5 +1,5 @@
----
 {{- if .Values.console.techPreview }}
+---
 {{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major (trimSuffix "+" .Capabilities.KubeVersion.Minor) )}}
 apiVersion: apps/v1
 {{- else }}

From 2962f50dceda08a5ad0957c129c5ebb04b570504 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Thu, 13 Aug 2020 14:27:45 +0100
Subject: [PATCH 595/648] Fix Docker All in One (#439)

---
 deploy/Dockerfile.all-in-one   | 9 ++++++---
 deploy/all-in-one/dig.sh       | 8 ++++++++
 deploy/all-in-one/src-build.sh | 1 -
 3 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 deploy/all-in-one/dig.sh

diff --git a/deploy/Dockerfile.all-in-one b/deploy/Dockerfile.all-in-one
index 5cc1408c3a..9ff9b1a73a 100644
--- a/deploy/Dockerfile.all-in-one
+++ b/deploy/Dockerfile.all-in-one
@@ -9,12 +9,10 @@ COPY --chown=stratos:users deploy/all-in-one/config.all-in-one.properties config
 
 ARG USE_PREBUILT_UI=false
 
-USER root
+USER stratos
 RUN node --version
 RUN deploy/all-in-one/src-build.sh
 
-USER stratos
-
 # Generate dev-certs
 RUN CERTS_PATH=/home/stratos/dev-certs ./generate_cert.sh
 
@@ -137,6 +135,11 @@ RUN if [ "x$CANARY_BUILD" != "x" ] ; then printf "\nFORCE_ENABLE_PERSISTENCE_FEA
 # Enable tech preview features if canary build flag is set
 RUN if [ "x$CANARY_BUILD" != "x" ] ; then printf "\nENABLE_TECH_PREVIEW=true\n" >> /srv/config.properties ; fi
 
+# Fix dig to resolve localhost to 127.0.0.1
+RUN mv /usr/bin/dig /usr/bin/digit
+COPY deploy/all-in-one/dig.sh /usr/bin/dig
+RUN chmod +x /usr/bin/dig
+
 EXPOSE 443
 
 # Need to be root to bind to port 443
diff --git a/deploy/all-in-one/dig.sh b/deploy/all-in-one/dig.sh
new file mode 100644
index 0000000000..82fb0a6fe6
--- /dev/null
+++ b/deploy/all-in-one/dig.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+HOST="${@: -1}"
+if [ "$HOST" == "localhost" ]; then
+  echo "127.0.0.1"
+else
+  /usr/bin/digit $@
+fi
diff --git a/deploy/all-in-one/src-build.sh b/deploy/all-in-one/src-build.sh
index d1618d6037..29a8049ace 100755
--- a/deploy/all-in-one/src-build.sh
+++ b/deploy/all-in-one/src-build.sh
@@ -9,7 +9,6 @@ if [ "${USE_PREBUILT_UI}" = "true" ]; then
 else
   echo "Building frontend"
   npm install
-  npm run customize
   npm run build
   if [ $? -ne 0 ]; then
     echo "Frontend build failed"

From afa26632e278bc33cbe2fb8d7f77f0acd359f955 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Tue, 18 Aug 2020 14:50:44 +0100
Subject: [PATCH 596/648] Merge upstream (#444)

* Ensure filename/no filename text in connect by file dialog is aligned (#4474)

- needs porting back

* Add typed entity access and `custom-src` removal to change log (#4496)

* Fixes #4335: Create Stratos static web site with better documentation (#4446)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* * Review comments fix

* Fix broken link to an image in frontend extensions doc

* Final tweaks

Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Richard Cox <richard-cox@users.noreply.github.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard Cox <richard.cox@suse.com>

* Fix and update customization docs (#4478)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* Apply new theming process to acme example

* First pass at customization docs, most of themeing done

* Final pass at customization docs

* Merge fixes

Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update base README, point to website (#4488)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* Apply new theming process to acme example

* First pass at customization docs, most of themeing done

* Final pass at customization docs

* Update base README, point to website

Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update developer docs (#4489)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* Apply new theming process to acme example

* First pass at customization docs, most of themeing done

* Final pass at customization docs

* Update base README, point to website

* Update developer docs
Still need an overhall, but updated to remove incorrect data and apply website context

Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix docs (#4497)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* Apply new theming process to acme example

* First pass at customization docs, most of themeing done

* Final pass at customization docs

* Update base README, point to website

* Update developer docs
Still need an overhall, but updated to remove incorrect data and apply website context

* Fix PR template

Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Ensure images dependent on techPreview flag are included in imagelist.txt (#4500)

* Improve clean-symlinks script (#4509)

* Add support for including breaking changes in the changelog

* Improve clean-symlinks script

* Update changelog.sh

* Update changelog.sh

* Remove trailing line

* Remove tailing line

* Change nginx ciphers and make configurable via helm chart values (#4507)

* Change nginx ciphers and make configurable via helm chart values

* Add support for including breaking changes in the changelog

* Improve clean-symlinks script

* Update changelog.sh

* Update changelog.sh

* Remove trailing line

* Remove tailing line

* Fix bug with cert path patching

* Fig bug where protocols not patched

* Update version to 4.0.1, add change log (#4514)

* Update version to 4.0.1, add change log

* Update package-lock

* Update package-lock

* Update README.md with SUSE specific info

* Remove `publish-docs:` github action

Co-authored-by: Veerapuram Varadhan <veerapuram.varadhan@suse.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
---
 .cfignore                                     |     1 +
 .codeclimate.yml                              |     3 +-
 .github/workflows/documentation.yml           |    28 +
 .gitignore                                    |     4 +
 CHANGELOG.md                                  |    17 +
 CONTRIBUTING.md                               |    10 +-
 README.md                                     |    62 +-
 build/clean-symlinks.js                       |    18 +-
 deploy/Dockerfile.ui                          |     2 +-
 deploy/README.md                              |     8 -
 deploy/cloud-foundry/README.md                |   314 -
 deploy/containers/nginx/conf/nginx.dev.conf   |     2 +-
 deploy/containers/nginx/conf/nginx.k8s.conf   |     4 +-
 deploy/containers/nginx/run-nginx.sh          |    22 +-
 deploy/kubernetes/console/README.md           |     7 +-
 .../console/templates/deployment.yaml         |     4 +
 deploy/kubernetes/console/values.yaml         |     4 +
 deploy/kubernetes/imagelist.values.yaml       |     6 +-
 docs/contributing.md                          |    85 -
 docs/customizing.md                           |   179 -
 docs/developers-guide-env-tech.md             |   211 -
 docs/developers-guide.md                      |   294 -
 docs/extensions.md                            |   284 -
 docs/i18n.md                                  |     3 -
 docs/images/extensions/tab-example.png        |   Bin 12163 -> 0 bytes
 docs/index.html                               |     1 -
 docs/issue_template.md                        |     9 +-
 docs/overview.md                              |    64 -
 docs/roadmap.md                               |    39 -
 index.yaml                                    |    76 -
 package-lock.json                             |  2115 +--
 package.json                                  |     2 +-
 .../packages/example-theme/_index.scss        |    56 +-
 .../example-theme/assets/core/nav-logo.png    |   Bin 0 -> 18891 bytes
 .../packages/example-theme/package.json       |     2 +-
 .../packages/example-theme/sass/custom.scss   |     2 -
 .../sass/custom/acme-colors.scss              |    16 +
 .../example-theme/sass/custom/acme.scss       |    70 +-
 website/.gitignore                            |    23 +
 website/README.md                             |    40 +
 website/babel.config.js                       |     3 +
 website/deploy.sh                             |   101 +
 .../docs/advanced}/bosh-metrics.md            |     5 +-
 .../docs/advanced}/invite-user-guide.md       |    15 +-
 {docs => website/docs/advanced}/sso.md        |     5 +-
 {docs => website/docs/deploy}/access.md       |     6 +-
 .../docs/deploy/all-in-one.md                 |    20 +-
 .../cloud-foundry/cf-troubleshooting.md       |   157 +
 .../deploy/cloud-foundry/cloud-foundry.md     |   162 +
 .../docs/deploy/cloud-foundry/db-migration.md |     8 +-
 .../docs/deploy/kubernetes.md                 |     8 +-
 website/docs/deploy/kubernetes/install.md     |   413 +
 website/docs/deploy/overview.md               |    44 +
 .../docs/deploy}/troubleshooting.md           |     8 +-
 website/docs/developer/backend.md             |   124 +
 website/docs/developer/contributing.md        |   162 +
 .../developer}/developers-guide-e2e-tests.md  |    22 +-
 .../developer/developers-guide-env-tech.md    |   103 +
 website/docs/developer/frontend-tests.md      |    73 +
 website/docs/developer/frontend.md            |    73 +
 website/docs/developer/introduction.md        |    37 +
 .../docs/extensions/backend.md                |     9 +-
 website/docs/extensions/frontend.md           |   459 +
 website/docs/extensions/introduction.md       |    61 +
 website/docs/extensions/theming.md            |   258 +
 website/docs/extensions/v4-migration.md       |    46 +
 website/docs/introduction.md                  |    63 +
 website/docs/license.md                       |   184 +
 website/docs/overview.md                      |    29 +
 {docs => website/docs}/status_updates.md      |     0
 website/docs/talks.md                         |    13 +
 website/docusaurus.config.js                  |    96 +
 website/package-lock.json                     | 13192 ++++++++++++++++
 website/package.json                          |    31 +
 website/sidebars.js                           |    54 +
 website/src/css/custom.css                    |   191 +
 website/src/pages/index.js                    |   176 +
 website/src/pages/styles.module.css           |    37 +
 website/static/.nojekyll                      |     0
 .../static}/images/Browserstack-logo.svg      |     0
 .../images/extensions/app-tab-example.png     |   Bin
 .../extensions/appwall-action-example.png     |   Bin
 .../static}/images/high-level-arch.png        |   Bin
 .../images/screenshots/app-summary.png        |   Bin
 website/static/img/cloudfoundry.png           |   Bin 0 -> 5301 bytes
 website/static/img/deploy.svg                 |     1 +
 website/static/img/easy.svg                   |     1 +
 website/static/img/extend.svg                 |     1 +
 website/static/img/favicon.ico                |   Bin 0 -> 15086 bytes
 website/static/img/kubernetes.svg             |    84 +
 website/static/img/logo.png                   |   Bin 0 -> 93628 bytes
 website/static/img/logo.svg                   |     1 +
 website/static/img/multi-cluster.svg          |     3 +
 website/static/img/open-source.svg            |     1 +
 website/static/img/screens/cf-app.png         |   Bin 0 -> 67519 bytes
 website/static/img/screens/endpoints.png      |   Bin 0 -> 33521 bytes
 website/static/img/screens/kube-graph.png     |   Bin 0 -> 63442 bytes
 97 files changed, 17073 insertions(+), 3554 deletions(-)
 create mode 100644 .github/workflows/documentation.yml
 delete mode 100644 deploy/README.md
 delete mode 100644 deploy/cloud-foundry/README.md
 delete mode 100644 docs/contributing.md
 delete mode 100644 docs/customizing.md
 delete mode 100644 docs/developers-guide-env-tech.md
 delete mode 100644 docs/developers-guide.md
 delete mode 100644 docs/extensions.md
 delete mode 100644 docs/i18n.md
 delete mode 100644 docs/images/extensions/tab-example.png
 delete mode 100644 docs/index.html
 delete mode 100644 docs/overview.md
 delete mode 100644 docs/roadmap.md
 delete mode 100755 index.yaml
 create mode 100644 src/frontend/packages/example-theme/assets/core/nav-logo.png
 create mode 100644 website/.gitignore
 create mode 100644 website/README.md
 create mode 100644 website/babel.config.js
 create mode 100755 website/deploy.sh
 rename {docs => website/docs/advanced}/bosh-metrics.md (98%)
 rename {docs => website/docs/advanced}/invite-user-guide.md (92%)
 rename {docs => website/docs/advanced}/sso.md (96%)
 rename {docs => website/docs/deploy}/access.md (97%)
 rename deploy/all-in-one/README.md => website/docs/deploy/all-in-one.md (91%)
 create mode 100644 website/docs/deploy/cloud-foundry/cf-troubleshooting.md
 create mode 100644 website/docs/deploy/cloud-foundry/cloud-foundry.md
 rename deploy/cloud-foundry/db-migration/README.md => website/docs/deploy/cloud-foundry/db-migration.md (90%)
 rename deploy/kubernetes/README.md => website/docs/deploy/kubernetes.md (80%)
 create mode 100644 website/docs/deploy/kubernetes/install.md
 create mode 100644 website/docs/deploy/overview.md
 rename {docs => website/docs/deploy}/troubleshooting.md (78%)
 create mode 100644 website/docs/developer/backend.md
 create mode 100644 website/docs/developer/contributing.md
 rename {docs => website/docs/developer}/developers-guide-e2e-tests.md (87%)
 create mode 100644 website/docs/developer/developers-guide-env-tech.md
 create mode 100644 website/docs/developer/frontend-tests.md
 create mode 100644 website/docs/developer/frontend.md
 create mode 100644 website/docs/developer/introduction.md
 rename docs/backend-plugins.md => website/docs/extensions/backend.md (93%)
 create mode 100644 website/docs/extensions/frontend.md
 create mode 100644 website/docs/extensions/introduction.md
 create mode 100644 website/docs/extensions/theming.md
 create mode 100644 website/docs/extensions/v4-migration.md
 create mode 100644 website/docs/introduction.md
 create mode 100644 website/docs/license.md
 create mode 100644 website/docs/overview.md
 rename {docs => website/docs}/status_updates.md (100%)
 create mode 100644 website/docs/talks.md
 create mode 100644 website/docusaurus.config.js
 create mode 100644 website/package-lock.json
 create mode 100644 website/package.json
 create mode 100644 website/sidebars.js
 create mode 100644 website/src/css/custom.css
 create mode 100644 website/src/pages/index.js
 create mode 100644 website/src/pages/styles.module.css
 create mode 100644 website/static/.nojekyll
 rename {docs => website/static}/images/Browserstack-logo.svg (100%)
 rename {docs => website/static}/images/extensions/app-tab-example.png (100%)
 rename {docs => website/static}/images/extensions/appwall-action-example.png (100%)
 rename {docs => website/static}/images/high-level-arch.png (100%)
 rename {docs => website/static}/images/screenshots/app-summary.png (100%)
 create mode 100644 website/static/img/cloudfoundry.png
 create mode 100644 website/static/img/deploy.svg
 create mode 100644 website/static/img/easy.svg
 create mode 100644 website/static/img/extend.svg
 create mode 100644 website/static/img/favicon.ico
 create mode 100644 website/static/img/kubernetes.svg
 create mode 100644 website/static/img/logo.png
 create mode 100644 website/static/img/logo.svg
 create mode 100644 website/static/img/multi-cluster.svg
 create mode 100644 website/static/img/open-source.svg
 create mode 100644 website/static/img/screens/cf-app.png
 create mode 100644 website/static/img/screens/endpoints.png
 create mode 100644 website/static/img/screens/kube-graph.png

diff --git a/.cfignore b/.cfignore
index 21c16f20e7..92be10a235 100644
--- a/.cfignore
+++ b/.cfignore
@@ -21,3 +21,4 @@ deploy/uaa/
 docs/
 build/dev_config.json
 e2e-reports/
+website/
diff --git a/.codeclimate.yml b/.codeclimate.yml
index 801ada6c4e..5650724125 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -28,4 +28,5 @@ exclude_patterns:
 - "**/vendor/"
 - "**/*.d.ts"
 - "**/__vendor/"
-- "**/*_test.go"
\ No newline at end of file
+- "**/*_test.go"
+- "website/"
\ No newline at end of file
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
new file mode 100644
index 0000000000..4b78eefdc3
--- /dev/null
+++ b/.github/workflows/documentation.yml
@@ -0,0 +1,28 @@
+name: documentation
+
+on:
+  pull_request:
+    branches: [master]
+  push:
+    branches: [master]
+
+jobs:
+  build-docs:
+    if: github.event_name != 'push'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
+        with:
+          node-version: '12.x'
+      - name: Test Build
+        run: |
+          cd website
+          if [ -e yarn.lock ]; then
+          yarn install --frozen-lockfile
+          elif [ -e package-lock.json ]; then
+          npm ci
+          else
+          npm i
+          fi
+          npm run build
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index fd305dfd93..730c756be1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -122,3 +122,7 @@ stratos-frontend-prebuild.zip
 src/frontend/assets
 src/frontend/sass
 go-vendor-*.tgz
+
+website/build
+website/site-dist
+website/.docusaurus
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a780c8ba0..23026997c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Change Log
 
+## 4.0.1
+
+[Full Changelog](https://github.com/SUSE/stratos/compare/4.0.0...4.0.1)
+
+This release contains a number of fixes and improvements:
+
+**Improvements:**
+
+- Helm Deployment: Allow nginx protocols and ciphers to be configured via values [\#4512](https://github.com/cloudfoundry/stratos/issues/4512)
+
+**Fixes:**
+
+- npm install can sometimes fail when symlinks from a previous Stratos version exist [\#4513](https://github.com/cloudfoundry/stratos/issues/4513)
+- Helm Deployment: Default nginx ciphers are too restrictive [\#4503](https://github.com/cloudfoundry/stratos/issues/4503)
+
+
+
 ## 4.0.0
 
 [Full Changelog](https://github.com/SUSE/stratos/compare/3.2.1...4.0.0)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5da3d8b31d..8e7ed009fc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,12 +1,12 @@
-# Contributing to Stratos UI
+# Contributing to Stratos
 
-Stratos UI is an open project and welcomes contributions. These guidelines are provided to help you understand how the project works and to make contributing smooth and fun for everybody involved.
+Stratos is an open project and welcomes contributions. These guidelines are provided to help you understand how the project works and to make contributing smooth and fun for everybody involved.
 
 There are two main forms of contribution: reporting issues and performing code changes.
 
 ## Reporting Issues
 
-If you find a problem with Stratos UI, report it using [GitHub issues](https://github.com/suse/stratos/issues/new).
+If you find a problem with Stratos, report it using [GitHub issues](https://github.com/suse/stratos/issues/new).
 
 Before reporting a new issue, please take a moment to check whether it has already been reported
 [here](https://github.com/suse/stratos/issues). If this is the case, please:
@@ -29,7 +29,7 @@ This information will help to determine the cause and prepare a fix as fast as p
 ## Code Changes
 
 Code contributions come in various forms and sizes, from simple bug fixes to implementation
-of new features. Before making any non-trivial change, get in touch with the Stratos UI developers first. This can prevent wasted effort later.
+of new features. Before making any non-trivial change, get in touch with the Stratos developers first. This can prevent wasted effort later.
 
 To send your code change, use GitHub pull requests. The workflow is as follows:
 
@@ -43,7 +43,7 @@ To send your code change, use GitHub pull requests. The workflow is as follows:
 
   1. Publish the branch and create a pull request.
 
-  1. Stratos UI developers will review your change and possibly point out issues.
+  1. Stratos developers will review your change and possibly point out issues.
      Adapt the code under their guidance until all issues are resolved.
 
   1. Finally, the pull request will get merged or rejected.
diff --git a/README.md b/README.md
index d00d11eb12..528627e08f 100644
--- a/README.md
+++ b/README.md
@@ -9,64 +9,26 @@
 
 Stratos is an Open Source Web-based UI (Console) for managing Cloud Foundry. It allows users and administrators to both manage applications running in the Cloud Foundry cluster and perform cluster management tasks.
 
-If you are looking for a version of Stratos, you can find ..
-- V1 in the [v1-master](https://github.com/suse/stratos/tree/v1-master) branch.
-- V2 in the [v2-master](https://github.com/suse/stratos/tree/v2-master) branch.
+![Stratos Application view](website/static/images/screenshots/app-summary.png)
 
-![Stratos Application view](docs/images/screenshots/app-summary.png)
+Please visit our new [documentation site](https://stratos.app/). There you can discover
 
-## Quick Start
+1. Our [introduction](https://stratos.app/docs/), including quick start, contributing and troubleshooting guides.
+1. How to [deploy](https://stratos.app/docs/deploy/overview) Stratos in a number of environments.
+    1. [Cloud Foundry](https://stratos.app/docs/deploy/cloud-foundry/cloud-foundry), as an application.
+    1. [Kubernetes](https://stratos.app/docs/deploy/kubernetes), using a Helm chart.
+    1. [Docker](https://stratos.app/docs/deploy/all-in-one), as a single container deploying all components.
+1. Configuring advanced features such a [Single Sign On](https://stratos.app/docs/advanced/sso) and Cloud Foundry '[invite to org](https://stratos.app/docs/advanced/invite-user-guide)'.
+1. Guides for [developers](https://stratos.app/docs/developer/introduction).
+1. How to [extend](https://stratos.app/docs/extensions/introduction) Stratos [functionality](https://stratos.app/docs/extensions/frontend) and apply a custom [theme](https://stratos.app/docs/extensions/theming).
 
-To get started quickly, we recommend following the steps to deploy the Stratos Console as a Cloud Foundry Application - see [here](deploy/cloud-foundry).
-
-If you have [docker](https://www.docker.com/community-edition) installed, you can quickly deploy Stratos using the all-in-one container:
-```
-$ docker run -p 4443:443 splatform/stratos:latest 
-```
-
-Once that has finished, you can then access Stratos by visiting https://localhost:4443.
-
-## Deploying Stratos
-
-Stratos can be deployed in the following environments:
-
-1. Cloud Foundry, as an application. See [guide](deploy/cloud-foundry)
-2. Kubernetes, using a Helm chart. See [guide](deploy/kubernetes)
-3. Docker, single container deploying all components. See [guide](deploy/all-in-one)
-
-## Troubleshooting
-
-Please see our [Troubleshooting](docs/troubleshooting) page.
-
-## Further Reading
- 
-Take a look at the [Feature Set](docs/features.md) for details on the feature set that Stratos provides.
- 
-Get an [Overview](docs/overview.md) of Stratos, its components and the different ways in which it can be deployed.
-
-Take a look at the [Development Roadmap](docs/roadmap.md) to see where we are heading. We update our status page each week to summarize what we are working on - see the [Status Page](docs/status_updates.md).
-
-Browse through features and issues in the project's [issues](https://github.com/suse/stratos/issues) page.
-
-What kind of code is in Stratos? We've integrated [Code Climate](https://codeclimate.com) for some code quality and maintainability metrics. Take a stroll around the [project page](https://codeclimate.com/github/SUSE/stratos)
-
-## Contributing
-
-We very much welcome developers who would like to get involved and contribute to the development of the Stratos project. Please refer to the [Contributing guide](CONTRIBUTING.md) for more information.
-
-For information to help getting started with development, please read the [Developer's Guide](docs/developers-guide.md).
-
-## Support and feedback
-
-We have a channel (#stratos) on the Cloud Foundy Slack where you can ask questions, get support or give us feedback. We'd love to hear from you if you are using Stratos.
-
-You can join the Cloud Foundry Slack here - https://slack.cloudfoundry.org/  - and then join the #stratos channel.
+> For more SUSE specific information, specifically regarding Stratos Kubernetes and Helm functionality, please see our `/docs` folder.
 
 ## Acknowledgements
 
 Tested with Browserstack
 
-<a href="https://www.browserstack.com"><img width="240px" src="docs/images/Browserstack-logo.svg" alt="Browserstack"></a>
+<a href="https://www.browserstack.com"><img width="240px" src="website/static/images/Browserstack-logo.svg" alt="Browserstack"></a>
 
 ## License
 
diff --git a/build/clean-symlinks.js b/build/clean-symlinks.js
index 9ae0c0aed1..6ba161c0d1 100644
--- a/build/clean-symlinks.js
+++ b/build/clean-symlinks.js
@@ -7,7 +7,7 @@ const path = require('path');
 const fs = require('fs');
 
 // __dirname is the folder where build.js is located
-const STRATOS_DIR= path.resolve(__dirname, '..');
+const STRATOS_DIR = path.resolve(__dirname, '..');
 
 function processFile(filepath) {
   if (fs.existsSync(filepath)) {
@@ -23,14 +23,18 @@ function processFolder(dir) {
   if (!fs.existsSync(dir)) {
     return
   }
-  fs.readdirSync(dir).forEach( f => {
+  fs.readdirSync(dir).forEach(f => {
     let dirPath = path.join(dir, f);
-    const realPath = fs.realpathSync(dirPath);
-    const stats = fs.lstatSync(realPath);
-    if (stats.isDirectory()) {
-      processFolder(dirPath);
+    if (!fs.existsSync(dirPath)) {
+      fs.unlinkSync(dirPath);
     } else {
-      processFile(dirPath);
+      const realPath = fs.realpathSync(dirPath);
+      const stats = fs.lstatSync(realPath);
+      if (stats.isDirectory()) {
+        processFolder(dirPath);
+      } else {
+        processFile(dirPath);
+      }
     }
   });
 };
diff --git a/deploy/Dockerfile.ui b/deploy/Dockerfile.ui
index 19ee495543..b2155de02e 100644
--- a/deploy/Dockerfile.ui
+++ b/deploy/Dockerfile.ui
@@ -16,7 +16,7 @@ RUN npm install && \
 FROM splatform/stratos-nginx-base:leap15_1 as prod-build
 RUN mkdir -p /usr/share/doc/suse
 COPY  deploy/containers/nginx/LICENSE.txt /usr/share/doc/suse/LICENSE.txt
-COPY  deploy/containers/nginx/conf/nginx.k8s.conf /etc/nginx/nginx.conf
+COPY  deploy/containers/nginx/conf/nginx.k8s.conf /etc/nginx/nginx.conf.tmpl
 COPY --from=base-build /usr/dist /usr/share/nginx/html
 COPY deploy/containers/nginx/run-nginx.sh/ /run-nginx.sh
 EXPOSE 80 443
diff --git a/deploy/README.md b/deploy/README.md
deleted file mode 100644
index cc7e9ed093..0000000000
--- a/deploy/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Deploying Stratos
-
-Stratos can be deployed in the following environments:
-
-1. Cloud Foundry, as an application. See [guide](cloud-foundry)
-2. Kubernetes, using a Helm chart. See [guide](kubernetes)
-3. Docker, single container deploying all components. See [guide](all-in-one)
-
diff --git a/deploy/cloud-foundry/README.md b/deploy/cloud-foundry/README.md
deleted file mode 100644
index 424faa2a48..0000000000
--- a/deploy/cloud-foundry/README.md
+++ /dev/null
@@ -1,314 +0,0 @@
-# Deploying as a Cloud Foundry Application
-
-## Deployment Steps
-
-The quickest way to install Stratos is to deploy it as a Cloud Foundry application. 
-
-You can do it in two ways:
-
-1. [Deploy Stratos from source](#Deploy-Stratos-from-source)
-1. [Deploy Stratos from docker image](#Deploy-Stratos-from-docker-image)
-
-You will then be able to open a web browser and navigate to the console URL:
-
-`https://console.<DOMAIN>`
-
-Where `<DOMAIN>` is the default domain configured for your Cloud Foundry cluster.
-
-To login use the following credentials detailed [here](../../docs/access.md).
-
-If you run into issues, please refer to the [Troubleshooting Guide](#troubleshooting) below.
-
-> The console will pre-configure the host Cloud Foundry endpoint. No other CF instance should be registered unless the instructions in
- the section [Associate Cloud Foundry database service](#Associate-Cloud-Foundry-database-service) are followed.
- All other deployment methods (helm, docker all-in-one, etc) allow the registration of multiple CF instances by default.
-
-Note:
-
-1. You need the cf CLI command line tool installed and available on the path.
-1. You need to have configured the cf cli to point to your Cloud Foundry cluster, to be authenticated with your credentials and to be targeted at the organization and space where you want the console application be created.
-1. You may need to configure Application Security Groups on your Cloud Foundry Cluster in order that  Stratos can communicate with the Cloud Foundry API. See [below](#application-security-groups) for more information.
-1. The Stratos Console will automatically detect the API endpoint for your Cloud Foundry. To do so, it relies on the `cf_api_url` value inside the `VCAP_APPLICATION` environment variable. If this is not provided by your Cloud Foundry platform, then you must manually update the application manifest as described [below](#console-fails-to-start).
-
-### Running Stratos in Production Environments
-
-Please be aware of the following when running Stratos in a production environment:
-
-#### Configure a Session Store Secret
-
-Stratos uses a Session Store Secret to protect the user session cookie. We recommend that you set your own value for this secret - choosing an alphanumeric string of your choice.
-
-You can configure this secret by editing the application manifest and adding to the `env` section, e.g.
-
-```
-applications:
-- name: console
-  ... memory, disk settings here
-  env:
-    SESSION_STORE_SECRET: <your session store secret here>
-```
-
-#### Pre-configure UAA client used for user invites
-
-> You can skip this step and configure any CFs invite clients via the Stratos UI.
-
- To set the UAA client for user invites, supply the client id and client secret as environment variables as shown below:
-
-  ```
-  INVITE_USER_CLIENT_ID=<UAA_CLIENT_ID>
-  INVITE_USER_CLIENT_SECRET=<UAA_CLIENT_SECRET>
-  ```
-
-This will set the the UAA client and UAA secret used to invite users for the default CF only.
-
-See the [invite users guide](../../docs/invite-user-guide.md) for more information about user invites in Stratos.
-
-#### Use of the Default Embedded SQLite Database
-
-We do not recommend deploying Stratos to a production environment using the default embedded SQLite Database. Instead we recommend creating
-and binding a database service instance to Stratos - for more information see [here](db-migration/README.md).
-
-### Deploy Stratos from source
-
-To do so, `clone` the **stratos** repository, `cd` into the newly cloned repository and `push` to Cloud Foundry. This can be done with:
-
-```
-git clone https://github.com/suse/stratos
-cd stratos
-git checkout tags/stable -b stable
-./build/store-git-metadata.sh
-cf push
-```
-
-If the cf push exceeds the time allowed see the instructions [here](#Pre-building-the-UI)
-
-#### Pre-building the UI
-
-Due to the memory usage of the Angular compiler (see below), when deployed to Cloud Foundry via `cf push`, Stratos does not use AOT (Ahead-of-Time) compilation.
-
-If you wish to enable AOT or reduce the push time, you can pre-build the UI before pushing.
-
-This can be done with:
-
-```
-git clone https://github.com/suse/stratos
-cd stratos
-npm install
-npm run prebuild-ui
-cf push
-```
-
-You will need a recent version of Node installed locally to do this.
-
-The `prebuild-ui` npm script performs a build of the front-end UI and then zips up the resulting folder into a package named `stratos-frontend-prebuild.zip`. The Stratos buildpack will unpack this zip file and use its contents instead of building the UI during staging, when this file is present.
-
-
-#### Memory Usage
-
-The Stratos Cloud Foundry `manifest.yml` states that the application requires
-`1512MB` of memory. This is required during the build process of the
-application since building an angular2 app is a memory intensive process. The
-memory limit can be scaled down after the app has been pushed, using the cf CLI.
-
-### Deploy Stratos from docker image
-
-Deploy Stratos using the [`splatform/stratos`](https://hub.docker.com/r/splatform/stratos) docker image
-
-> **NOTE:** Your Cloud Foundry must have docker support [enabled](https://docs.cloudfoundry.org/adminguide/docker.html#enable).
-
-```
-cf push console -o splatform/stratos:stable -m 128M -k 384M
-```
-> Note: You can replace `console` in the command above with a name of your choice for the application
-
-Alternatively cf push using a manifest
-
-- download [manifest-docker.yml](../../manifest-docker.yml) or create your own manifest file:
-    ```yaml
-    applications:
-    - name: console
-      docker:
-        image: splatform/stratos:stable
-      instances: 1
-      memory: 128M
-      disk_quota: 384M
-    ```
-- now, you can simply push it to Cloud Foundry:
-    ```
-    cf push -f manifest-docker.yml
-    ```
-
-## Associate Cloud Foundry database service
-Follow instructions [here](db-migration/README.md).
-
-## Use SSO Login
-
-By default Stratos will present its own login UI and only supports username and password authentication with your UAA. You can configure Stratos to use UAA's login UI by specifying the  the `SSO_LOGIN` environment variable in the manifest, for example:
-
-```
-applications:
-- name: console
-  ... memory, disk settings here
-  env:
-    SSO_LOGIN: true
-```
-
-When SSO Login is enabled, Stratos will also auto-connect to the Cloud Foundry it is deployed in using the token obtained during the SSO Login flow.
-
-For more information - see [Single-Sign On](../../docs/sso.md).
-
-## Troubleshooting
-
-### Creating logs for recent deployments
-To create a log file of the push
-```
-cf push | tee cfpush.log
-```
-
-To create a log file of recent console output
-```
-cf logs console --recent | tee cfconsole.log
-```
->**NOTE** If the name of the application has been changed from `console` in the manifest file please also change the name in the logs statement
-
-### Turning on backend debugging logs
-
-The `LOG_LEVEL` environment variable controls the backend logs 
-
-```
-cf set-env console LOG_LEVEL debug 
-cf restart console
-cf logs console
-```
-
-would output more debugging output such as
-
-```
-  2018-10-24T14:47:36.91+0200 [RTR/1] OUT console.my.domain - [2018-10-24T12:47:36.850+0000] "GET /pp/v1/-o1F0L956QhAIK7R56Uc1lMh5L4/apps/3ddc0bc6-a645-4449-9d1b-6fe86146cf61/ssh/0 HTTP/1.1" 500 0 0 "-" "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:60.0) Gecko/20100101 Firefox/60.0" "10.228.194.8:42182" "192.168.35.91:61044" x_forwarded_for:"10.228.194.8" x_forwarded_proto:"https" vcap_request_id:"182dddeb-d877-4d58-45f7-0bd886d1caf6" response_time:0.066925325 app_id:"0ba408ef-d0e6-4ab8-96bb-0bc078b8d8fb" app_index:"0" x_b3_traceid:"d166622a0d612fea" x_b3_spanid:"d166622a0d612fea" x_b3_parentspanid:"-"
-   2018-10-24T14:47:36.91+0200 [RTR/1] OUT 
-   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] sessionCleanupMiddleware                     
-   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] errorLoggingMiddleware                       
-   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT INFO[Wed Oct 24 12:47:36 UTC 2018] Not redirecting this request                 
-   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] getSession                                   
-   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] getSessionValue                              
-   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] getSession                                   
-   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] setStaticContentHeadersMiddleware            
-   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] urlCheckMiddleware                           
-   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] sessionMiddleware                            
-   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] getSessionValue                              
-   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] getSession                                   
-   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] xsrfMiddleware                               
-   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] GetCNSIRecord                                
-   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] Find                                         
-   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] decryptToken                                 
-   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] Decrypt                                      
-   [...]
-```
-
-### Application Security Groups
-
-If you have problems when deploying Stratos UI as a Cloud Foundry application, check that the Application Security Group you have will allow Stratos to communicate with the Cloud Foundry API.
-
-For information on the default ASGs, see [here](https://docs.cloudfoundry.org/concepts/asg.html#default-asg).
-
-To configure a new ASG for the organization and space that are using Stratos, first create a new ASG definition, for example:
-
-```
-[
-   {
-      "destination":"0.0.0.0-255.255.255.255",
-      "protocol":"all"
-   }
-]
-```
-
-Save this to a file, e.g. `my-asg.json`.
-
-> Note: this allows example all network traffic on all IP ranges - we don't recommend using this.
-
-Unbind the existing ASG for you organization (`ORG`) and space (`SPACE`) with:
-
-```
-cf unbind-security-group public_networks ORG SPACE
-```
-
-Create a new ASG using the definition you saved to a file and give it a name, with:
-
-```
-cf create-security-group NAME my-asg.json
-```
-
-Bind this ASG to your `ORG` and `SPACE` with:
-
-```
-cf bind-security-group NAME ORG SPACE
-```
-
-
-### Console fails to start
-
-The Stratos Console will automatically detect the API endpoint for your Cloud Foundry. To do so, it relies on the `cf_api` value inside the `VCAP_APPLICATION` environment variable.
-To check if the variable is present, use the CF CLI to list environment variables, and inspect the `VCAP_APPLICATION` variable under `System-Provided`.
-
-```
-$ cf env console
-Getting env variables for app console in org SUSE / space dev as admin...
-OK
-
-System-Provided:
-
-
- {
-  "VCAP_APPLICATION": {
-   "application_id": ...,
-   "application_name": "console",
-   "application_uris": ...
-   "application_version": ...,
-   "cf_api": "http://api.cf-dev.io",
-   ...
- }
-
- No user-defined env variables have been set
- ...
-```
-
-If the `cf_api` environment variable is absent then set the `CF_API_URL` variable. See the following _Setting the `CF_API_URL` env variable in the manifest_ section.
-
-
-However, if the `cf_api` environment variable is present, and an HTTP address is specified, it is possible that insecure traffic may be blocked. See the following _Setting the `CF_API_FORCE_SECURE` env variable in the manifest_ section.
-
-
-#### Setting the `CF_API_URL` env variable in the manifest
-
-To specify the Cloud Foundry API endpoint, add the `CF_API_URL` variable to the manifest, for example:
-
-```
-applications:
-- name: console
-  memory: 256M
-  disk_quota: 256M
-  host: console
-  timeout: 180
-  buildpack: https://github.com/cloudfoundry/stratos-buildpack
-  health-check-type: port
-  env:
-    CF_API_URL: https://<<CLOUD FOUNDRY API ENDPOINT>>>
-```
-
-#### Setting the `CF_API_FORCE_SECURE` env variable in the manifest
-
-To force the console to use secured communication with the Cloud Foundry API endpoint (HTTPS rather than HTTP), specify the `CF_API_FORCE_SECURE` environment in the manifest, for example:
-
-```
-applications:
-- name: console
-  memory: 256M
-  disk_quota: 256M
-  host: console
-  timeout: 180
-  buildpack: https://github.com/cloudfoundry/stratos-buildpack
-  health-check-type: port
-  env:
-    CF_API_FORCE_SECURE: true
-```
-
diff --git a/deploy/containers/nginx/conf/nginx.dev.conf b/deploy/containers/nginx/conf/nginx.dev.conf
index 23719b11b9..8f2e5f00cf 100644
--- a/deploy/containers/nginx/conf/nginx.dev.conf
+++ b/deploy/containers/nginx/conf/nginx.dev.conf
@@ -48,7 +48,7 @@ http {
         ssl_certificate             /etc/secrets/server.crt;
         ssl_certificate_key         /etc/secrets/server.key;
         ssl_protocols               TLSv1.2 TLSv1.3;
-        ssl_ciphers                 ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384;
+        ssl_ciphers                 HIGH:!aNULL:!MD5;
         ssl_prefer_server_ciphers   on;
 
         client_max_body_size        50M;
diff --git a/deploy/containers/nginx/conf/nginx.k8s.conf b/deploy/containers/nginx/conf/nginx.k8s.conf
index 620b3fd3e3..6b20bc69ab 100644
--- a/deploy/containers/nginx/conf/nginx.k8s.conf
+++ b/deploy/containers/nginx/conf/nginx.k8s.conf
@@ -47,8 +47,8 @@ http {
 
         ssl_certificate             /CONSOLE_CERT_PATH/tls.crt;
         ssl_certificate_key         /CONSOLE_CERT_PATH/tls.key;
-        ssl_protocols               TLSv1.2 TLSv1.3;
-        ssl_ciphers                 ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384;
+        ssl_protocols               __PROTOCOLS__;
+        ssl_ciphers                 __CIPHERS__;
         ssl_prefer_server_ciphers   on;
 
         client_max_body_size        50M;
diff --git a/deploy/containers/nginx/run-nginx.sh b/deploy/containers/nginx/run-nginx.sh
index 295b66688e..2c47cf12b2 100755
--- a/deploy/containers/nginx/run-nginx.sh
+++ b/deploy/containers/nginx/run-nginx.sh
@@ -5,6 +5,9 @@ echo "Stratos UI Container (nginx)"
 echo "============================================"
 echo ""
 
+# Copy the template config to the /etc/nging/nginx.conf
+cp /etc/nginx/nginx.conf.tmpl /etc/nginx/nginx.conf
+
 sed -i -e 's@CONSOLE_CERT_PATH@'"${CONSOLE_CERT_PATH}"'@g' /etc/nginx/nginx.conf
 echo "Checking for certificate at ${CONSOLE_CERT_PATH} ..."
 
@@ -16,5 +19,22 @@ do
     sleep 1; 
 done
 
-echo "TLS certificate detected ... starting nginx."
+echo "TLS certificate detected OK"
+
+# Patch the config file with the desired ciphers and protocols
+echo "Setting nginx ciphers and protocols"
+
+DEFAULT_PROTOCOLS="TLSv1.2 TLSv1.3"
+DEFAULT_CIPHERS="HIGH:!aNULL:!MD5"
+
+NGINX_PROTOCOLS=${SSL_PROTOCOLS:-$DEFAULT_PROTOCOLS}
+NGINX_CIPHERS=${SSL_CIPHERS:-$DEFAULT_CIPHERS}
+
+echo "SSL Protocols : $NGINX_PROTOCOLS"
+echo "SSL Ciphers   : $NGINX_CIPHERS"
+
+sed -i -e 's/__PROTOCOLS__/'"${NGINX_PROTOCOLS}"'/g' /etc/nginx/nginx.conf
+sed -i -e 's/__CIPHERS__/'"${NGINX_CIPHERS}"'/g' /etc/nginx/nginx.conf
+
+echo "Starting nginx ..."
 nginx -g "daemon off;"
diff --git a/deploy/kubernetes/console/README.md b/deploy/kubernetes/console/README.md
index 3e156e249e..ef228ed1d7 100644
--- a/deploy/kubernetes/console/README.md
+++ b/deploy/kubernetes/console/README.md
@@ -22,7 +22,7 @@ Check the repository was successfully added by searching for the `console`, for
 ```
 helm search repo console
 NAME               	CHART VERSION   APP VERSION	DESCRIPTION                                  
-stratos/console    	3.2.0           3.2.0      	A Helm chart for deploying Stratos UI Console
+stratos/console    	4.0.1           4.0.1      	A Helm chart for deploying Stratos UI Console
 ```
 
 > Note: Version numbers will depend on the version of Stratos available from the Helm repository
@@ -115,6 +115,8 @@ 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.sslProtocols|SSL Protocols to use for the nginx configuration|TLSv1.2 TLSv1.3|
+|console.sslCiphers|SSL Ciphers to use for the nginx configuration|HIGH:!aNULL:!MD5|
 |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||
@@ -256,7 +258,7 @@ You will also need to specify:
 - `console.mariadb.port` as the port of the external MariaDB database server (defaults to 3306)
 - `console.mariadb.tls` as the TLS mode (default is `false,` use `true` for a TLS connection to the database server)
 - `console.mariadb.database` as the name of the database
-- `console.mariadb.user` as the username to connect to the database server
+- `console.mariadb.user` as the username to connect to the database server
 - `console.mariadb.userPassword` as the password to connect to the database server
 
 When using an external database server, Stratos expects that you have:
@@ -407,4 +409,3 @@ kubectl create -f storageclass.yaml
 ```
 
 See [Storage Class documentation](https://kubernetes.io/docs/tasks/administer-cluster/change-default-storage-class/) for more information.
-
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 05a92ef3e2..6fd4fd2985 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -69,6 +69,10 @@ spec:
           value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
         - name: CONSOLE_CERT_PATH
           value: "/{{ .Release.Name }}-cert-volume"
+        - name: SSL_PROTOCOLS
+          value: "{{ .Values.console.sslProtocols }}"
+        - name: SSL_CIPHERS
+          value: "{{ .Values.console.sslCiphers }}"
         volumeMounts:
         - mountPath: "/{{ .Release.Name }}-cert-volume"
           name: "{{ .Release.Name }}-cert-volume"
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index d2ee436aca..5ac7dc060c 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -118,6 +118,10 @@ console:
 
   # Do not use a persistent volume for analysis reports
   reportsVolumeDisabled: false
+
+  # ssl protocols and ciphers overrides - leave empty for defaults
+  sslProtocols:
+  sslCiphers:
   
 images:
   console: stratos-console
diff --git a/deploy/kubernetes/imagelist.values.yaml b/deploy/kubernetes/imagelist.values.yaml
index 6c5b353e3c..1134c53c59 100644
--- a/deploy/kubernetes/imagelist.values.yaml
+++ b/deploy/kubernetes/imagelist.values.yaml
@@ -5,4 +5,8 @@
 # Use empty docker repository so names are consistent
 kube:
   registry:
-    hostname:
\ No newline at end of file
+    hostname:
+
+# Enable tech preview to include analyzer image
+console:
+  techPreview: true
\ No newline at end of file
diff --git a/docs/contributing.md b/docs/contributing.md
deleted file mode 100644
index 6e379dd8ac..0000000000
--- a/docs/contributing.md
+++ /dev/null
@@ -1,85 +0,0 @@
-# Contributing to Stratos UI
-
-## Reporting issues
-
-Before reporting an issue, please check whether it has already been reported
-[here](https://github.com/SUSE/stratos/issues). If this is the case, please:
-
-- Read all the comments to confirm that it's the same issue you're having.
-- Refrain from adding "same thing here" or "+1" comments. Just hit the
-  "subscribe" button to get notifications for this issue.
-- Add a comment only if you can provide helpful information that has not been
-  provided in the discussion yet.
-
-If you want to report a **new issue**, please ensure you give as much detail
-as possible about your setup/environment and provide sufficient steps
-for the issue to be easily reproduced.
-
-## Check for assigned people
-
-We use Github Issues for submitting known issues (e.g. bugs, features,
-etc.). Some issues will have someone assigned, meaning that there's already
-someone that takes responsibility for fixing the issue. This is not done to
-discourage contributions, rather to not step in the work that has already been
-done by the assignee. If you want to work on a known issue with someone already
-assigned to it, please contact the assignee first (e.g. by
-mentioning the assignee in a new comment on the specific issue). This way you
-can contribute with ideas, or even with code if the assignee decides that you
-can step in.
-
-If you plan to work on a non assigned issue, please add a comment on the issue
-to prevent duplicated work.
-
-## Sign your work
-
-The sign-off is a simple line at the end of the explanation for the patch. Your
-signature certifies that you wrote the patch or otherwise have the right to pass
-it on as an open-source patch. The rules are pretty simple: if you can certify
-the below (from [developercertificate.org](http://developercertificate.org/)):
-
-```
-Developer Certificate of Origin
-Version 1.1
-
-Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
-660 York Street, Suite 102,
-San Francisco, CA 94110 USA
-
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
-
-Developer's Certificate of Origin 1.1
-
-By making a contribution to this project, I certify that:
-
-(a) The contribution was created in whole or in part by me and I
-    have the right to submit it under the open source license
-    indicated in the file; or
-
-(b) The contribution is based upon previous work that, to the best
-    of my knowledge, is covered under an appropriate open source
-    license and I have the right under that license to submit that
-    work with modifications, whether created in whole or in part
-    by me, under the same open source license (unless I am
-    permitted to submit under a different license), as indicated
-    in the file; or
-
-(c) The contribution was provided directly to me by some other
-    person who certified (a), (b) or (c) and I have not modified
-    it.
-
-(d) I understand and agree that this project and the contribution
-    are public and that a record of the contribution (including all
-    personal information I submit with it, including my sign-off) is
-    maintained indefinitely and may be redistributed consistent with
-    this project or the open source license(s) involved.
-```
-
-Then you just add a line to every git commit message:
-
-    Signed-off-by: Joe Smith <joe.smith@email.com>
-
-Use your real name (sorry, no pseudonyms or anonymous contributions.)
-
-If you set your `user.name` and `user.email` git configs, you can sign your
-commit automatically with `git commit -s`.
diff --git a/docs/customizing.md b/docs/customizing.md
deleted file mode 100644
index f0defe7d76..0000000000
--- a/docs/customizing.md
+++ /dev/null
@@ -1,179 +0,0 @@
-# Customizing Stratos
-
-Stratos provides a mechanism for customization - the following customizations are currently supported:
-
-- Changing the theme colors
-- Changing certain image assets (favorite icon, login background and logo)
-- Overriding styles
-- Adding new functionality
-- Changing the initial loading indicator
-
-# Migrating to Stratos V4 Customization
-In V4 there are breaking customization changes. These changes allow a much improved approach to extensions by opening the door to npm style plugins.
-To aid in migrating we've provided these instructions.
-
-1) Before updating to the latest code...
-    1) Run `npm run customize-reset` to remove all previously created sym links.
-    2) Read through the customization documentation below to get a better understanding of the new process.
-1) Update your codebase with the desired v4 code.
-1) Run `npm install` (only required first time, this will ensure you have the required version of Angular).
-1) Change directory to `./build/tools/v4-migration` and run the migration script `./migrate.sh`.
-    - This will copy your customizations from `custom-src` to a new Angular package `src/frontend/packages/custom_extensions`.
-1) Check that the new package exports your custom module and if applicable your custom-routing module.
-    - The migrate script should do this in `src/frontend/packages/custom_extensions/src/public-api.ts`.
-1) Check that your ts config file defines the public api file.
-    - `src/tsconfig.json` file's `compilerOptions/paths` section should contain something like `"@custom/extensions": ["frontend/packages/custom_extensions/src/public-api.ts"]`.
-1) Check that your new package's package.json defines your custom module and if application custom-routing module.
-    - See `src/frontend/packages/custom_extensions/package.json` file's `stratos` section.
-    - Note your `routingModule` entry label should not have a preceding `_`.
-1) Build Stratos in your usual way, for instance `npm run build`.
-    - It could be that this fails due to TypeScript import issues, if so go through these and fix.
-    - During build time the custom packages will be discovered and output, see section starting `Building with these extensions`. These should contain the modules your require.
-1) Run Stratos your usual way. Ensure you can navigate to all your custom parts.
-1) Once you are happy everything works as intended remove the old `./custom-src` directory and commit you changes.
-
-## Approach
-
-In order to customize Stratos, you will need to fork the Stratos GitHub repository and apply customizations in your fork. Our aim is to minimize any merge conflicts that might occur when re-basing your fork with the upstream Stratos repository.
-
-<!-- All customizations are placed within a top-level folder named `custom-src`. This folder should only exist in forks and will not exist in the main Stratos repository, so any changes made within this folder should be free from merge conflicts. -->
-Customizations are placed in angular packages in the folder named `src/frontend/packages`. In the future you will be able to host these packages in npm and bring them into Stratos in the usual npm dependency way.
-
-Each package should contain custom Stratos configuration in it's package.json pointing to the modules it will be required to import. 
-
-stratos.yaml
-custom theme
-custom styles
-custom assets
-
-
-The Stratos approach to customization uses symbolic links. We maintain a default set of resources in the folder `src/misc/custom`. When you run `npm install` or when you explicitly run `npm run customize`, a gulp task (in the file `build/fe-build.js`) runs and creates symbolic links, linking the required files to their expected locations withing the `src` folder.
-
-If a required file exists in the `custom-src` folder location, the build script will link this file, otherwise, it will link the default resource from `src/misc/custom`.
-
-Normally, you do not need to run any scripts to apply customizations - they will be applied as part of a `postinstall` script that runs automatically when you do an `npm install`. You can manually run the following scripts if you update or change the customizations:
-
-- `npm run customize` - creates symbolic links for the required files, looking at the provided customizations and then falling back to default files
-
-- `npm run customize-default` - creates symbolic links for the required files, ignoring any provided customizations and using the default files
-
-- `npm run customize-reset` - remove all symbolic links. If you build after running this command you will see errors, as required files are not present.
-
-### Customizing Images
-
-The following image resources can be changed by creating the specified file in the folder shown:
-
-|File name|Folder|Description|
-|---|---|---|
-|favicon.ico|custom-src/frontend|Favorite icon to use|
-|logo.png|custom-src/frontend/assets|Logo to use on login screen and about page|
-|nav-logo.png|custom-src/frontend/assets|Logo to use in the top-left side navigation for the application logo|
-|login-bg.jpg|custom-src/frontend/assets|Image to use for the login page background|
-
-> NOTE: The `nav-logo.png` logo should have a height of 36px and a maximum width of 180 pixels.
-
-### Customizing the Theme
-
-Stratos uses Material Design and the [angular-material](https://material.angular.io/) library. It uses the same approach to theming.
-
-To create your own theme, create the file `custom.scss` in the folder `custom-src/frontend/sass`.
-
-In this file you can set any or all of the following variables:
-
-|Variable|Purpose|
-|---|---|
-|$stratos-theme|The main theme to use for Stratos|
-|$stratos-nav-theme|Theme to use for the side navigation panel|
-|$stratos-status-theme|Theme to use for displaying status in Stratos|
-
-Note that you do not have to specify all of these - defaults will be used if they are not set.
-
-In most cases you will probably want to generate a palette for the primary color for your version of Stratos - an example `custom.scss` this for this is shown below:
-
-```
-$suse-green: ( 50: #E0F7F0, 100: #B3ECD9, 200: #80E0C0, 300: #4DD3A7, 400: #26C994, 500: #00C081, 600: #00BA79, 700: #00B26E, 800: #00AA64, 900: #009C51, A100: #C7FFE0, A200: #94FFC4, A400: #61FFA8, A700: #47FF9A, contrast: (50: #000000, 100: #000000, 200: #000000, 300: #000000, 400: #ffffff, 500: #ffffff, 600: #ffffff, 700: #ffffff, 800: #ffffff, 900: #ffffff, A100: #000000, A200: #000000, A400: #000000, A700: #000000 ));
-
-$suse-red: ( 50: #ffebee, 100: #ffcdd2, 200: #ef9a9a, 300: #e57373, 400: #ef5350, 500: #f44336, 600: #e53935, 700: #d32f2f, 800: #c62828, 900: #b71c1c, A100: #ff8a80, A200: #ff5252, A400: #ff1744, A700: #d50000, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: white, A400: white, A700: white, ));
-
-// Create palettes
-$suse-app-primary: mat-palette($suse-green);
-$suse-theme-warn: mat-palette($suse-red);
-
-// Create a theme from the palette (secondary theme is the same as the primary in this example)
-$suse-app-theme: mat-light-theme($suse-app-primary, $suse-app-primary, $suse-theme-warn);
-
-// Set this theme as the one to use
-$stratos-theme: $suse-app-theme;
-```
-
-#### Creating or disabling the Dark theme
-
-You can also change the Dark theme, if you wish, by defining the following variables:
-
-|Variable|Purpose|
-|---|---|
-|$stratos-dark-theme|The dark theme to use for Stratos|
-|$stratos-dark-nav-theme|Dark theme to use for the side navigation panel|
-|$stratos-dark-status-theme|Dark theme to use for displaying status in Stratos|
-
-Note that minimally you must supply `stratos-dark-theme` to create a dark theme.
-
-By default a dark theme is assumed to be available and the default will be used if not overridden. You can disable dark theme support in the UI by setting the following variable in your `custom.scss`:
-
-```
-$stratos-dark-theme-supported: false;
-```
-
-### Changing Styles
-
-We don't generally recommend modifying styles, since from version to version of Stratos, we may change the styles used slightly which can mean any modifications you made will need updating. Should you wish to do so, you can modify these in the same `custom.scss` file that is used for theming.
-
-As an example, to disable the login background image, add the following to `custom.scss`:
-
-```
-.stratos .intro {
-  background-image: none;
-}
-```
-
-Note that the class `stratos` has been placed on the `BODY` tag of the Stratos application to assist with css selector specificity.
-
-### Adding new Features
-
-Code for new features should be placed within the `custom-src/frontend/app/custom` folder. You can create any sub-folder structure within this folder.
-
-When you perform an `npm install` or explicitly run `npm run customize`, the customize script is run and will symlink the folder `custom-src/frontend/app/custom` to `src/frontend/app/custom`. It will also create a module to import your custom code - this is placed in the file `src/frontend/app/custom/custom-import.module.ts`. You should _not_ edit this file.
-
-Within the `custom-src/frontend/app/custom` folder you must create a module in the file `custom.module.ts` named `CustomModule` - this will be imported into the Stratos application and is the mechanism by which you can add custom code to the front-end.
-
-We currently expose the following extension points in the Stratos UI:
-
-- Changing the component to use for the login screen
-- Adding new items to the side navigation menu
-- Adding new tabs to the Application, Cloud Foundry, Organization and Space views
-- Adding new action buttons to the Application Wall, Application, Cloud Foundry, Organization and Space and Endpoint views
-
-We use Decorators to annotate components to indicate that they are Stratos extensions.
-
-See [Extensions](extensions.md) for more detail and examples of front-end extensions.
-
-
-### Changing the Initial Loading Indicator
-
-On slower connections, it can take a few seconds to load the main Javascript resources for Stratos.
-
-In order to give the user some initial feedback that Stratos is loading, a loading indicator is included in the `index.html` file. This gets shown as early as possible, as soon as this main html file has loaded. Once the main code has been fetched, the view refreshes to show the application.
-
-A default loading indicator is provided that can be changed. To do so, create the following two files:
-
-- `custom-src/frontend/loading.css` - CSS styles to be included in a style block in the head of the index page
-- `custom-src/frontend/loading.html` - HTML markup to be included the the index page to render the loading indicator
-
-The files for the default indicator can be found in the `src/frontend/packages/core/misc/custom` folder.
-
-An example of a different loading indicator is included with the ACME sample in `examples/custom-src/frontend`.
-
-The customization task will insert the appropriate CSS and HTML files into the main index.html file when it runs.
-
-Take a look at the template for the `index.html` file in `src/frontend/packages/core/misc/custom/index.html`. The CSS file is inserted where the marker `/** @@LOADING_CSS@@ **/` is and the HTML file where `<!-- @@LOADING_HTML@@ -->` is.
-
diff --git a/docs/developers-guide-env-tech.md b/docs/developers-guide-env-tech.md
deleted file mode 100644
index 7e22201b90..0000000000
--- a/docs/developers-guide-env-tech.md
+++ /dev/null
@@ -1,211 +0,0 @@
-# Stratos Tech + Developer Environment
-
-## ES6
-
-* [http://stack.formidable.com/es6-interactive-guide](http://stack.formidable.com/es6-interactive-guide)
-* [http://es6-features.org](http://es6-features.org)
-
-## TypeScript
-
-* [https://www.sitepen.com/blog/2013/12/31/definitive-guide-to-typescript/](https://www.sitepen.com/blog/2013/12/31/definitive-guide-to-typescript/)
-* [https://learnxinyminutes.com/docs/typescript/](https://learnxinyminutes.com/docs/typescript/) (cheat sheet)
-* [https://www.tutorialspoint.com/typescript/](https://www.tutorialspoint.com/typescript/)
-* [https://tutorialzine.com/2016/07/learn-typescript-in-30-minutes](https://tutorialzine.com/2016/07/learn-typescript-in-30-minutes)
-* [https://www.sitepen.com/blog/2013/12/31/typescript-cheat-sheet/](https://www.sitepen.com/blog/2013/12/31/typescript-cheat-sheet/) (advanced cheat sheet)
-
-## Angular
-
-### Angular
-
-* [https://www.youtube.com/watch?v=KhzGSHNhnbI](https://www.youtube.com/watch?v=KhzGSHNhnbI) (very basic 1h video of angular covering basic app features in a demo)
-* [https://angular.io/guide/architecture](https://angular.io/guide/architecture) (official angular intro)
-* [https://angular.io/tutorial](https://angular.io/tutorial) (official angular tutorial. Basic to start with but good introduction to routing, http requests, promises, observables and observable event stream later on)
-
-### Angular CLI
-
-* [https://cli.angular.io/reference.pdf](https://cli.angular.io/reference.pdf) (cheat sheet)
-* [https://github.com/angular/angular-cli](https://github.com/angular/angular-cli)
-
-### Example Apps
-
-* https://github.com/aviabird/angularspree (covers everything)
-
-## Redux
-
-* [http://redux.js.org](http://redux.js.org)
-* [https://gist.github.com/btroncone/a6e4347326749f938510](https://gist.github.com/btroncone/a6e4347326749f938510)
-* [https://code-cartoons.com/a-cartoon-intro-to-redux-3afb775501a6](https://code-cartoons.com/a-cartoon-intro-to-redux-3afb775501a6)
-* [https://www.youtube.com/watch?v=WIqbzHdEPVM](https://www.youtube.com/watch?v=WIqbzHdEPVM)
-* [https://egghead.io/courses/getting-started-with-redux](https://egghead.io/courses/getting-started-with-redux)
-
-### Observables
-
-* [http://reactivex.io/documentation/observable.html](http://reactivex.io/documentation/observable.html)
-
-## VS Code Plug-ins
-
-There's no mandated IDE, but if you choose VS Code here's some helpful plug-ins
-
-### Super Helpful
-
-* TSLint
-* SassLint
-* TS Hero
-* Beautify
-* gitignore
-
-### Helpful
-
-* Angular 2+ Snippets
-* Angular v4 TypeScript Snippets
-* Git Lens
-* Document This
-* Git History
-* TODO Parser
-  * see icon bottom left for todo's in current file
-  * Add the following config to settings to exclude some folders
-
-   ```
-   "TodoParser": {
-        "folderExclude": ["node_modules", ".vscode"]
-   }
-   ```
-
-  * F1 + `Parse TODOs (all files)` to see all TODOs
-* Move TS - Move files and automatically update imports
-
-### Of Interest
-
-* Eclipse Keymap
-* Code Spell Checker
-  * List of words to exclude coming soon
-
-Example settings
-
-```
-{
-    "gitlens.blame.line.enabled": false,
-    "gitlens.codeLens.recentChange.enabled": false,
-    "gitlens.codeLens.authors.enabled": false,
-    "gitlens.blame.highlight.locations": [
-        "gutter",
-        "overview"
-    ],
-    "gitlens.currentLine.enabled": false,
-    "gitlens.hovers.currentLine.enabled": false,
-    "editor.fontSize": 12,
-    "editor.formatOnSave": true,
-    "editor.rulers": [
-        140
-    ],
-    "editor.renderLineHighlight": "none",
-    "search.exclude": {
-        "node_modules": true,
-        "**/node_modules": true,
-        "**/bower_components": true,
-        "coverage": true,
-        "components/*/backend/vendor": true,
-        "*.orig": true
-    },
-    "search.useIgnoreFilesByDefault": true,
-    "tslint.validateWithDefaultConfig": true,
-    "tslint.configFile": "tslint.json",
-    "tslint.autoFixOnSave": true,
-    "tslint.alwaysShowStatus": true,
-    "tslint.alwaysShowRuleFailuresAsWarnings": true,
-    "explorer.autoReveal": false,
-    "extensions.ignoreRecommendations": false,
-    "TodoParser": {
-        "folderExclude": [
-            "node_modules",
-            ".vscode"
-        ]
-    },
-    "cSpell.userWords": [
-        "Guids",
-        "action",
-        "api",
-        "cnsi",
-        "cnsis",
-        "confirmation",
-        "dialog",
-        "falsies",
-        "guid",
-        "iapi",
-        "initialise",
-        "initialised",
-        "injectable",
-        "memberof",
-        "ngrx",
-        "normalizr",
-        "strat",
-        "unsubscribe",
-        "vars"
-    ],
-    "cSpell.language": ",en-GB",
-    "cSpell.enabledLanguageIds": [
-        "c",
-        "css",
-        "cpp",
-        "csharp",
-        "fonts",
-        "go",
-        "handlebars",
-        "javascript",
-        "javascriptreact",
-        "json",
-        "latex",
-        "markdown",
-        "php",
-        "plaintext",
-        "python",
-        "restructuredtext",
-        "text",
-        "typescript",
-        "typescriptreact",
-        "yml",
-        "html"
-    ],
-    "files.exclude": {
-        "**/.git": true,
-        "**/.svn": true,
-        "**/.hg": true,
-        "**/CVS": true,
-        "**/.DS_Store": true,
-        "**/tmp": true,
-        "**/node_modules": true,
-        "**/bower_components": true,
-        "**/dist": true,
-        "**/.orig": true
-    },
-    "files.watcherExclude": {
-        "**/.git/objects/**": true,
-        "**/.git/subtree-cache/**": true,
-        "**/node_modules/**": true,
-        "**/tmp/**": true,
-        "**/bower_components/**": true,
-        "**/dist/**": true
-    },
-}
-```
-
-## Guides
-
-### ExpressionChangedAfterItHasBeenCheckedError Error
-
-#### Links
-
-* https://blog.angularindepth.com/everything-you-need-to-know-about-the-expressionchangedafterithasbeencheckederror-error-e3fd9ce7dbb4
-* https://github.com/angular/angular/issues/17572
-* https://github.com/angular/angular/issues/6005
-
-#### In summary
-
-* AVOID
-  * setTimeout
-  * forcing change detecting
-* TRY TO USE
-  * observeOn(asapScheduler) in observable chain
-  * ngAfterViewInit
-* Generally
-  * Avoid changing state in child components that will affect a binding in parent component/s
\ No newline at end of file
diff --git a/docs/developers-guide.md b/docs/developers-guide.md
deleted file mode 100644
index 9d9929d16e..0000000000
--- a/docs/developers-guide.md
+++ /dev/null
@@ -1,294 +0,0 @@
-
-# Developing the Stratos Console
-
-1. [Introduction](#introduction)
-1. [Frontend Development](#frontend-development)
-1. [Backend Development](#backend-development)
-
-## Introduction
-
-Stratos comprises of two main components:
-
-- A front-end UI that runs in your web browser. This is written in [Typescript](https://www.typescriptlang.org/) and uses the [Angular](https://angular.io/) framework.
-- A back-end that provides a web-based API to the front-end. This is written in Go.
-
-Depending on what you are contributing, you will need to develop with the front-end, back-end or both.
-
-## Frontend Development
-
-### Introduction to the stack
-
-Have a look through the [Env + Tech](developers-guide-env-tech.md) page to get acquainted with some of the new technologies used in v2.
-These include video's, tutorials and examples of Angular 2+, Typescript and Redux. There's also some advice on helpful plugins to use if
-using Visual Studio Code. If you feel comfortable with these and are happy with your dev environment please skip straight to
-[Set up Dependencies](#set-up-dependencies)
-
-### Set up Dependencies
-
-* Set up a Stratos backend - The frontend cannot run without a backend. Both backend and frontend exist in this same repo.
-  * Don't need to make changes to the backend code? To set up a backend run through the [deploy section](https://github.com/cloudfoundry/stratos/blob/master/deploy/README.md),
-    choose a deployment method and bring one up. These deployments will bring up the entire backend, including api service and database
-    along with a V2 frontend.
-  * Need to make changes to the backend code? Follow the below [Backend Development](#Backend-Development) set up guide
-* Install [NodeJs](https://nodejs.org) (minimum node version 12.13.0)
-* Install [Angular CLI](https://cli.angular.io/) - `npm install -g @angular/cli`
-
-### Configuration
-
-Configuration information can be found in two places
-
-* `./proxy.conf.js`
-  * In new forks this is missing and needs to be created using `./proxy.conf.template.js` as a template.
-  * Contains the address of the backend. Which will either be...
-     * If the backend is deployed via the instructions in the [deploy section](https://github.com/cloudfoundry/stratos/blob/master/deploy/README.md)
-       the url will be the same address as the V1 console's frontend address. For instance `https://localhost` would translate to
-        ```
-        const PROXY_CONFIG = {
-          "/pp": {
-            "target": {
-            "host": "localhost",
-            "protocol": "https:",
-            "port": 443
-          },
-          "secure": false,
-          "changeOrigin": true,
-          "ws": true,
-        }
-        ```
-      * If the backend is running locally using the instructions [Backend Development](#Backend-Development) below the url will local host
-        with a port of the `CONSOLE_PROXY_TLS_ADDRESS` value from `src/jetstream/config.properties`. By default this will be 5445. For
-        instance
-        ```
-        const PROXY_CONFIG = {
-          "/pp": {
-            "target": {
-              "host": "localhost",
-              "protocol": "https:",
-              "port": 5443
-            },
-            "ws": true,
-            "secure": false,
-            "changeOrigin": true,
-          }
-        }
-        ```
-* `./src/frontend/environments/environment.ts` for developer vs production like config
-  * This contains more general settings for the frontend and does not usually need to be changed
-
-## Run the frontend
-
-1. (First time only) Copy `./proxy.conf.template.js` to `./proxy.conf.js` and update with required Jetstream url (see above for more info)
-1. Run `npm install`
-1. Run `npm start` for a dev server. (the app will automatically reload if you change any of the source files)
-   * If this times out please use `npm run start-high-mem` instead
-   * To change the port from the default 4200, add `-- --port [new port number]`
-   * To stop the automatic reload every time a resource changes add `-- --live-reload false`
-   * To do both the above use `-- --live-reload false --port [new port number]`
-1. Navigate to `https://localhost:4200/`. The credentials to log in will be dependent on the Jetstream the console points at. Please refer
-   to the guides used when setting up the backend for more information
-
-## Build
-
-Run `npm run build` to build the project.
-
-The build artefacts will be stored in the `dist/` directory. This will output a production build of the application.
-
-## Creating angular items via angular cli
-
-To create a new angular component run `ng generate component component-name`. You can use a similar command to create other types of angular
-items `ng generate <directive|pipe|service|class|guard|interface|enum|module> <name>`.
-
-## Theming
-
-We use the angular material theming mechanism. See [here](https://material.angular.io/guide/theming-your-components) for more information about theming new components added to stratos.
-
-## Test
-
-### Lint
-
-Run `npm run lint` to execute tslint lint checking.
-
-### Unit tests
-
-Run `npm test` to execute the unit tests via [Karma](https://karma-runner.github.io). Coverage information can be found in `./coverage`
-
-To execute an individual package run `ng test <package name>`. To execute the tests again automatically on code changes add `--watch=true`
-
-> **NOTE** npm test will search for chrome on your path. If this is not so please set an env var CHROME_BIN pointing to your executable
-(chromium is fine too).
-
-### End-to-end tests
-
-Run `npm run e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
-
-Run `npm run e2e-dev` to execute end-to-end tests against a locally running instance on `https://localhost:4200`
-
-More information on the E2E tests and pre-requisites for running them is available here - [E2E Tests](developers-guide-e2e-tests.md).
-
-### Code Climate
-
-We use [Code Climate](https://codeclimate.com/github/SUSE/stratos) to check for general code quality issues. This executes against Pull
-Requests on creation/push.
-
-#### Running Code Climate locally
-> Generally we would not advise doing this and just rely on the code climate gate to run when pull requests are submitted
-
-To run locally see instructions [here](https://github.com/codeclimate/codeclimate) to install Code Climate CLI
-and engine via docker. Once set ensure you're in the root of the project and execute the following (it may take a while)
-
-```
-codeclimate analyze
-```
-
-> **NOTE** Unfortunately this highlights all current issues and not those that are the diff between any master and feature branch. Analyze
-can be ran against a single/sub set of files, again with all current issues, but a little more digestible.
-
-```
-codeclimate analyze <path to file/s>
-```
-
-In a feature branch to compare files that have changed to master, for instance, use the following
-
-```
-git checkout feature-branch-A
-codeclimate analyze $(git diff --name-only master)
-```
-
-You can also run the above command via npm
-
-```
-npm run climate
-```
-
-### Stratos Continue Integration
-For each new pull request and any subsequent pushes to it the following actions are executed
-- Code quality analysis via Code Climate - https://codeclimate.com/
-- Jenkins CI run, covering..
-  - Frontend lint check
-  - Backend lint check
-  - Frontend unit tests
-  - Backend unit tests
-  - End to end tests
-- Security anaylsis via Snyk - https://snyk.io/
-
-## Backend Development
-
-Jetstream is the back-end for Stratos. It is written in Go.
-
-We use Go Modules for dependency management.
-
-### Pre-requisites
-
-You will need the following installed/available:
-
-* go 1.12 or later.
-
-*For authentication, **either***
-
-* A UAA instance
-* A local user account 
-
-### Building the back-end
-
-
-#### Build
-
-From the `src/jetstream` folder, build the Stratos back-end with:
-
-```
-npm run build-backend
-```
-
-The back-end executable is named `jetstream` and should be created within the `src/jetstream` folder.
-
-### Configuration
-
-Configuration can either be done via
-- Environment Variable and/or Config File
-- In the UI when you first use a front end with this backend
-
-In all cases the configuration is saved to the database on first run. Any subsequent changes require the db to be reset. For the default sqlite
-db provider this can be done by deleting `src/jetstream/console-database.db`
-
-#### Configure by Environment Variables and/or Config File
-
-By default, the configuration in file `src/jetstream/config.properties` will be used. These can be changed by environment variables
-or an overrides file.
-
-##### Environment variable
-
-If you wish to use a local user account, ensure you have set the following environment variables:
-
-- `AUTH_ENDPOINT_TYPE=local`
-- `LOCAL_USER` - The username for the local user
-- `LOCAL_USER_PASSWORD` - The password for the local user
-- `LOCAL_USER_SCOPE=stratos.admin` - This gives the local user admin permissions. Currently other roles are not available.
-
-If you have a custom uaa, ensure you have set the following environment variables:
-
-- `UAA_ENDPOINT`- the URL of your UAA
-  - If you have an existing CF and want to use the same UAA use the `authorization_endpoint` value from `[cf url]/v2/info`
-    For example for PCF Dev, use: `UAA_ENDPOINT=https://login.local.pcfdev.io`.
-- `CONSOLE_CLIENT` - the Client ID to use when authenticating against your UAA (defaults to: 'cf')
-- `CONSOLE_CLIENT_SECRET` - the Client ID to use when authenticating against your UAA (defaults to empty)
-- `CONSOLE_ADMIN_SCOPE` - an existing UAA scope that will be used to identify users as `Stratos Admins`
-
-> To use a pre-built Stratos UAA container execute `docker run --name=uaa --rm -p 8080:8080 -P splatform/stratos-uaa`. The UAA will be
-  available at `http://localhost:8080` with a `CONSOLE_CLIENT` value of `console`
-
-##### Config File
-
-To easily persist configuration settings copy `src/jetstream/config.example` to `src/jetstream/config.properties`. The backend will load its
-configuration from this file in preference to the default config file, if it exists. You can also modify individual configuration settings
-by setting the corresponding environment variable.
-
-##### To configure a local user account via config file
-
-In `src/jetstream/config.properties` uncomment the following lines:
-
-```
-AUTH_ENDPOINT_TYPE=local
-LOCAL_USER=localuser
-LOCAL_USER_PASSWORD=localuserpass
-LOCAL_USER_SCOPE=stratos.admin
-```
-
-Load the Stratos UI and proceed to log in using the configured credentials.
-
-#### To configure UAA via Stratos
-
-1. Go through the `Config File` step above and comment out the `UAA_ENDPOINT` with a `#` in the new `config.properties` file.
-1. If any previous configuration attempt has been made reset your database as described above.
-1. Continue these steps from [Run](#run).
-   - You should see the line `Will add setup route and middleware` in the logs
-1. Load the Stratos UI as usual and you should be immediately directed to the setup wizard
-
-The setup wizard that allows you to enter the values normally fetched from environment variables or files. The UI will assist you through
-this process, validating that the UAA address and credentials are correct. It will also provide a list of possible scopes for the Stratos Admin
-
-#### Run
-
-Execute the following file from `src/jetstream`
-
-```
-jetstream
-```
-
-You should see the log as the backend starts up. You can press CTRL+C to stop the backend.
-
-
-#### Automatically register and connect to an existing endpoint
-To automatically register a Cloud Foundry add the environment variable/config setting below:
-
-```
-AUTO_REG_CF_URL=<api url of cf>
-```
-
-Jetstream will then attempt to auto-connect to it with the credentials supplied when logging into Stratos.
-
-#### Running Jetstream in a container
-
-We recommend running Stratos using the Docker All-In-One image.
-
-* Follow instructions in the deploy/all-in-one docs
-
diff --git a/docs/extensions.md b/docs/extensions.md
deleted file mode 100644
index 64c182e6a0..0000000000
--- a/docs/extensions.md
+++ /dev/null
@@ -1,284 +0,0 @@
-# Front-end Extensions
-
-An example illustrating the various front-end extension points of Stratos is included in the folder `examples/custom-src`.
-
-To include the customizations in this example, either copy or symlink the `examples/custom-src` to `custom-src` at the top-level of the Stratos repository.
-
-Next, run the customization script (this is done automatically when you do an `npm install`) with:
-
-```
-npm run customize
-```
-
-You can now run Stratos locally to see the customizations - see the [Developer's Guide](developers-guide.md) for details.
-
-For a walk-through of extending Stratos, see [Example: Adding a Custom Tab](#example:-adding-a-custom-tab).
-
-## Extension Points
-
-### Side Navigation
-
-New items can be added to the Side Navigation menu with extensions.
-
-To do so, annotate the routes for your extension with custom metadata, which Stratos will then pick up and add to the side menu.
-
-A full example is in the folder `examples/custom-src/frontend/app/custom/nav-extension`.
-
-Your route should have the following metadata in the `data` field:
-
-```
-    stratosNavigation: {
-      text: '<TITLE>',
-      matIcon: '<ICON NAME>'
-    }
-```
-
-Where `<TITLE>` is the text label to show in the side navigation and `<ICON NAME>` is the icon to use.
-
-You should place your route declaration in a module named `CustomRoutingModule` in the file `custom-src/frontend/app/custom/custom-routing.module.ts`.
-
-An example routing module would be:
-
-```
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-const customRoutes: Routes = [{
-  path: 'example',
-  loadChildren: 'app/custom/nav-extension/nav-extension.module#NavExtensionModule',
-  data: {
-    stratosNavigation: {
-      text: 'Example',
-      matIcon: 'extension'
-    }
-  }
-}];
-
-@NgModule({
-  imports: [
-    RouterModule.forRoot(customRoutes),
-  ],
-  declarations: []
-})
-export class CustomRoutingModule { }
-```
-
-This approach ensures that the Angular compiler creates a separate chunk for the extension at compile time.
-
-### Custom Tabs
-
-Tabs can be added to the following views in Stratos:
-
-- The Application view that shows the detail of an application
-- The Cloud Foundry view that shows detail for a Cloud Foundry
-- The Cloud Foundry Org view that shows detail for a Cloud Foundry organization
-- The Cloud Foundry Space view that shows detail for a Cloud Foundry space
-
-For example:
-
-![Example Application tab extension](images/extensions/app-tab-example.png)
-
-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 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:
-
-```
-@StratosTab({
-  type: StratosTabType.Application,
-  label: '<LABEL>',
-  link: '<LINK>'
-})
-```
-
-Where:
-
-- <TYPE> indicates where the tab should appear and can be:
-  - StratosTabType.Application - Application View
-  - StratosTabType.CloudFoundry - Cloud Foundry view
-  - StratosTabType.CloudFoundryOrg - Cloud Foundry Org view
-  - StratosTabType.CloudFoundrySpace - Cloud Foundry Space view
-- <LABEL> is the text label to use for the tab
-- <LINK> is the name to use for the route (this must only contain characters permitted in URLs)
-
-An example is included in the file `examples/custom-src/frontend/app/custom/app-tab-extension`.
-
-### Custom Actions
-
-Actions can be added to the following views in Stratos:
-
-- The Application Wall view that shows all applications
-- The Application view that shows the detail of an application
-- The Cloud Foundry view that shows detail for a Cloud Foundry
-- The Cloud Foundry Org view that shows detail for a Cloud Foundry organization
-- The Cloud Foundry Space view that shows detail for a Cloud Foundry space
-- The Endpoints view that shows all endpoints
-
-An action is a icon button that appears at the top-right of a View. For example:
-
-![Example Application action extension](images/extensions/appwall-action-example.png)
-
-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 declared with the `ExtensionService` in the imports of your custom module
-3. Decorate the component with the `StratosAction` decorator, for example:
-
-```
-@StratosAction({
-  type: StratosActionType.Applications,
-  label: '<LABEL>',
-  link: '<LINK>',
-  icon: '<ICON>
-})
-```
-
-Where:
-
-- <TYPE> indicates where the action should appear and can be:
-  - StratosActionType.Applications - Application Wall View
-  - StratosActionType.Application - Application View
-  - StratosActionType.CloudFoundry - Cloud Foundry view
-  - StratosActionType.CloudFoundryOrg - Cloud Foundry Org view
-  - StratosActionType.CloudFoundrySpace - Cloud Foundry Space view
-  - StratosActionType.Endpoints - Endpoints view
-- <ICON> is the icon to show
-- <LABEL> is the text label to use for the tooltip of the icon (optional)
-- <LINK> is the name to use for the route (this must only contain characters permitted in URLs)
-
-An example is included in the file `examples/custom-src/frontend/app/custom/app-action-extension`.
-
-## Example: Adding a Custom Tab
-
-In this example, we will walk through extending the Stratos front-end.
-
-This walk-through assumes that you have installed the Angular CLI globally - this can be done with `npm install -g @angular/cli`.
-
-### Create a new module
-
-First, create the custom-src folder structure - from the top-level of the Stratos repository run:
-
-```
-mkdir -p custom-src/frontend/app/custom
-mkdir -p /frontend/assets/custom
-```
-
-Next, run the customize task:
-
-```
-npm run customize
-```
-
-This will symlink our custom folder into the Stratos application source folder.
-
-Next, use the Angular CLI to create the root module for our custom code with:
-
-```
-ng generate module custom
-```
-
-This create a new Angular module `CustomModule`.
-
-Run the customize script again, now that that we have created the custom module with:
-
-```
-npm run customize
-```
-
-### Create a new Component for our Tab
-
-Create a new Angular component with the CLI:
-
-```
-ng generate component custom/example-tab-extension
-```
-
-### Add Decorator to make this Component an Extension
-
-In a text editor, open the file:
-
-```
-src/frontend/app/custom/example-tab-extension/example-tab-extension.component.ts
-```
-
-Add the following decorator to the component at the top of the file:
-
-```
-import { StratosTab, StratosTabType } from '../../core/extension/extension-service';
-
-@StratosTab({
-  type: StratosTabType.Application,
-  label: 'Example App Tab',
-  link: 'example'
-})
-```
-
-The file should now look like this:
-
-```
-import { Component, OnInit } from '@angular/core';
-import { StratosTab, StratosTabType } from '../../core/extension/extension-service';
-
-@StratosTab({
-  type: StratosTabType.Application,
-  label: 'Example App Tab',
-  link: 'example'
-})
-@Component({
-  selector: 'app-example-tab-extension',
-  templateUrl: './example-tab-extension.component.html',
-  styleUrls: ['./example-tab-extension.component.scss']
-})
-export class ExampleTabExtensionComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {
-  }
-
-}
-```
-
-Save the file.
-
-
-### Mark the component as an extensions 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 `ExtensionService.declare` to the import sesion, so it looks like this:
-
-```
-@NgModule({
-  imports: [
-    CommonModule,
-    ExtensionService.declare([
-      ExampleTabExtensionComponent,
-    ])    
-  ],
-  declarations: [ExampleTabExtensionComponent],
-  entryComponents: [ExampleTabExtensionComponent]
-})
-export class CustomModule { }
-```
-
-### Run it
-
-You should now be able to run Stratos locally and see this new tab on the application page for an application - as illustrated below:
-
-![Example tab extension](images/extensions/tab-example.png)
-
diff --git a/docs/i18n.md b/docs/i18n.md
deleted file mode 100644
index 0fc6e721e9..0000000000
--- a/docs/i18n.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Internationalization (i18n)
-
-WIP
diff --git a/docs/images/extensions/tab-example.png b/docs/images/extensions/tab-example.png
deleted file mode 100644
index 38afc322b7271958728d4dd97e4775348155cdb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12163
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
XdTHeN8@YV&k0Ycd<i#t+zWV<!{*+*k

diff --git a/docs/index.html b/docs/index.html
deleted file mode 100644
index a6bdc1e312..0000000000
--- a/docs/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<h1>Hello GH Pages</h1>
diff --git a/docs/issue_template.md b/docs/issue_template.md
index dffaf1add3..c8b8913393 100644
--- a/docs/issue_template.md
+++ b/docs/issue_template.md
@@ -1,8 +1,9 @@
-<!--- For bugs and general issues -->
+<!--------- For bugs and general issues --------->
 ### Stratos Version
 <!-- What version of Stratos does this related to? -->
 <!-- Version information can be seen in the `About` page reached via the User Icon top right -->
 <!-- If directly using code which branch, commit, etc did the source come from, what repository was it cloned from? -->
+
 ### Frontend Deployment type
 <!--- Where is the frontend deployed? -->
 <!--- Put an 'x' in one of the boxes below.  -->
@@ -25,15 +26,15 @@
 
 ### Actual behaviour
 
-### Steps to reproduce the behaviour
+### Steps to reproduce the behavior
 
 ### Log output covering before error and any error statements
 ```
-Insert your log here
+Insert log hereCopy
 ```
 
 
-<!--- For feature requests -->
+<!--------- For feature requests --------->
 ### Detailed Description
 <!--- Provide a detailed description of the change or addition you are proposing -->
 
diff --git a/docs/overview.md b/docs/overview.md
deleted file mode 100644
index c1640d9390..0000000000
--- a/docs/overview.md
+++ /dev/null
@@ -1,64 +0,0 @@
-# Stratos Overview
-
-The Stratos Console provides a web-based UI to allow developers and administrators to manage their applications and cloud foundry deployment(s).
-
-It is designed to manage one or more Cloud Foundry deployments. It does so by managing "endpoints", where each endpoint is a reference to a Cloud Foundry deployment. The notion of an endpoint is not specific to Cloud Foundry, allowing Stratos to connect to other service types in the future.
-
-Stratos stores endpoint metadata in a relational database. Administrators of Stratos are able to register (add) new endpoints to the Console. All users are able to then connect to these endpoints using their credentials, ensuring that they get the appropriate level of access when interacting with Cloud Foundry.
-
-The high-level architecture of Stratos is shown in the diagram below:
-
-![Stratos High-Level Architecture](images/high-level-arch.png)
-
-The main components:
-
-* Web UI - Single-page AngularJS web application providing the front-end that runs in the user's browser.
-* API Server - Provides the back-end APIs that support the front-end UI. This API takes care of authentication, endpoint management and proxying API requests from the front-end to the desired back-end API.
-* Endpoint Datastore - Relational database that stores the registered endpoints and the encrypted user access tokens.
-
-## Authentication
-
-Stratos UI authenticates users using a Cloud Foundry UAA service. It must be configured with the details necessary to communicate with a UAA. When the user logs in to the Console, their login will be validated with the UAA. The Console uses a scope to identify Console administrators from regular users.
-
-Administrators use the 'Endpoints Dashboard' within the Console to add new endpoints to the Console. All users are then able to connect to these endpoints by providing their credentials. The Console will use these credentials to communicate with the UAA for the given endpoint (typically Cloud Foundry) and obtain a refresh and access token. These tokens are encrypted and stored in the Endpoint Datastore.
-
-When a user interacts with the Console and API requests need to be made to a given Cloud Foundry endpoint, these are sent to the API Server along with a custom http header which indicated which endpoint(s) the requests should be send to. The API Server will forward the request to the appropriate endpoints, first looking up the access and refresh tokens required to communicate with the endpoint(s). If any access token has expired, it will use the refresh token to obtain a new access token.
-
-## Deployment
-
-Stratos UI can be deployed in a number of environments:
-
-* Deployed in Cloud Foundry, as an application. See [guide](../deploy/cloud-foundry)
-* Deployed in Kubernetes, using a Helm chart. See [guide](../deploy/kubernetes)
-* Deployed in Docker, single container deploying all components. See [guide](../deploy/all-in-one)
-
-There are differences between the deployments as follows:
-
-### Deployed in Cloud Foundry as an application
-
-In this case, Stratos is deployed in a manner optimized for the management of a single Cloud Foundry instance. The 'Endpoints Dashboard' that allows multiple Cloud Foundry endpoints to be registered is not deployed. An extra component is deployed that detects that the Console is running as Cloud Foundry which does the following:
-
-- Automatically detects the Cloud Foundry endpoint and located the UAA Endpoint to use for authentication
-- Authenticates directly against the UAA for the Clound Foundry where the Console is deployed and assumes that Cloud Foundry admins are also Console admins (the UAA Scope 'cloud_controller.admin' is used to identify admins)
-- Uses a SQLite database rather than Postgres
-- Automatically connects to the Cloud Foundry endpoint when a user logs in to simplify the user flow when using the Console in this case
-
-In this case, the front-end web application static resources are served by the API Server back-end rather than a separate web server.
-
-By defaut, a non-persistent SQLite database is used - by automatically registering the cloud foundry endpoint and connecting to it on login, all data stored in the database can be treated as ephimeral, since it will be re-created next time a user logs in. Cloud Foundry Session Affinity is used to ensure that when scaling up the Console Application to multiple instances, the user is also directed to the instance which will know about them and their endpoints (since each Application instance will have its own local SQLite store).
-
-Alternatively, Stratos can be configured [with a persistent Cloud Foundry database service](deploy/cloud-foundry/db-migration/README.md), which enables features requiring persistence such as user favorites.
-
-### Deployed in Kubernetes
-
-In this case, a Helm chart is used to deploy the Console into a Kubernetes environment.
-
-At the outer-level there are two services - the external service that provides the Console itself and a private service that provides a Postgres DB to the Console service.
-
-The Console service is provided by a deployment consisting of two containers, one providing the static front-end web application resources, served by an nginx instance, the other providing the API Server back-end.
-
-### Deployed in Docker using a single container
-
-In this case, a single Docker image is run in a container that hosts all services together. SQLite is used as the database, so any endpoint metadata registered is lost when the container is destroyed.
-
-This deployment is recommended only for trying out the Console and for development.
diff --git a/docs/roadmap.md b/docs/roadmap.md
deleted file mode 100644
index 25c55f2698..0000000000
--- a/docs/roadmap.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Stratos Roadmap - Out of date
-
-Last Updated: 2 July 2018
-
-# Version 2 Timeline
-
-The current focus is on releasing V2 of Stratos. The current timeline is:
-
-|Date|Milestone|
-|---|---|
-|15 June|Beta 1|
-|20 June|Beta 2|
-|25 June|RC 1|
-|29 June|RC 2|
-|20 July|2.0.0|
-
-Post 2.0 is released we will be working towards a regular recycle cycle each Sprint - we may start with Monthly releases and finally to releases each 2 weeks.
-
-## Agile
-
-We work on a 2-week Sprint cycle. Sprints start on Wednesdays. For reference, Sprint 27 started 4 April 2018.
-
-We are using GitHub issues to track all work items. See: https://github.com/cloudfoundry/stratos/issues
-
-## High-Level Features
-
-The high-level features that we schedule into the roadmap are identified by the ```feature-request``` label. You can see the current set of features [here](https://github.com/cloudfoundry/stratos/issues?q=is%3Aopen+is%3Aissue+label%3Afeature-request).
-
-### Near-term roadmap
-
-|#|Description|Issue|Notes|
-|---|---|---|---|
-|1|Technology Refresh (AngularJS => Angular)|[\#1972](https://github.com/cloudfoundry/stratos/issues/1972)|[Notes](planning/angular.md)|
-|2|1st class support for service plan & service instance|[\#1391](https://github.com/cloudfoundry/stratos/issues/1391)|[Notes](planning/services.md)|
-|3|Add support for Application and CF Metrics|[\#1985](https://github.com/cloudfoundry/stratos/issues/1985)|[Notes](planning/metrics.md)|
-|4|Support UAA login UX directly (SSO)|[\#1384](https://github.com/cloudfoundry/stratos/issues/1384)||
-|5|Support per-endpoint Client ID and Client Secret|[\#2220](https://github.com/cloudfoundry/stratos/issues/2220)||
-|6|Bring Orgs and Spaces view to top-level|[\#2619](https://github.com/cloudfoundry/stratos/issues/2619)||
-|7|Deploy application: Enable deploying from private Git repositories|[\#1442](https://github.com/cloudfoundry/stratos/issues/1442)||
diff --git a/index.yaml b/index.yaml
deleted file mode 100755
index 2d8ee50438..0000000000
--- a/index.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-apiVersion: v1
-entries:
-  console:
-  - apiVersion: v1
-    created: 2018-01-09T11:48:55.233833731Z
-    description: A Helm chart for deploying Stratos UI Console
-    digest: 378df78adeebfad7d81b63a9f01afbb830c35cf948e3b662349e1d20a0972955
-    name: console
-    urls:
-    - https://github.com/cloudfoundry-incubator/stratos/releases/download/1.0.0/console-helm-chart-1.0.0.tgz
-    version: 1.0.0
-  - apiVersion: v1
-    created: 2017-12-08T13:21:38.611521378Z
-    description: A Helm chart for deploying Stratos UI Console
-    digest: 8e8994171cf7ba37c4b37564c8efa07f1fd66dda347900b592ebfaae5407bf3d
-    name: console
-    urls:
-    - https://github.com/cloudfoundry-incubator/stratos/releases/download/0.9.9/console-helm-chart-0.9.9.tgz
-    version: 0.9.9
-  - apiVersion: v1
-    created: 2017-11-23T16:31:10.781104928Z
-    description: A Helm chart for deploying Stratos UI Console
-    digest: 97bdf40f53053815016e223d49082ba16984b9b5a0a5a2d237ef45bb42183ad8
-    name: console
-    urls:
-    - https://github.com/cloudfoundry-incubator/stratos/releases/download/0.9.8/console-helm-chart-0.9.8.tgz
-    version: 0.9.8
-  - apiVersion: v1
-    created: 2017-11-09T11:58:41.085073375Z
-    description: A Helm chart for deploying Stratos UI Console
-    digest: 1a297cebb9bf8d34fe4d679203082fb89894d9b90583988fb0a1349a27dde920
-    name: console
-    urls:
-    - https://github.com/cloudfoundry-incubator/stratos/releases/download/0.9.7/console-helm-chart-0.9.7.tgz
-    version: 0.9.7
-  - apiVersion: v1
-    created: 2017-11-01T11:57:35.330202636Z
-    description: A Helm chart for deploying Stratos UI Console
-    digest: 08611ec5de41a71567a033c4975752f31ca895b26316592a75d6dc93c2968e5f
-    name: console
-    urls:
-    - https://github.com/cloudfoundry-incubator/stratos/releases/download/0.9.6/console-helm-chart-0.9.6.tgz
-    version: 0.9.6
-  - apiVersion: v1
-    created: 2017-09-21T14:17:00.259268006+01:00
-    description: A Helm chart for deploying Console
-    digest: c0aa7067eebd02cbf775f1adde1948ff679f3753f5d6bb7403798260ad8278d7
-    name: console
-    urls:
-    - https://github.com/cloudfoundry-incubator/stratos/releases/download/0.9.5/console-helm-chart-0.9.5.tgz
-    version: 0.9.5
-  - apiVersion: v1
-    created: 2017-08-21T16:05:19.606723792Z
-    description: A Helm chart for deploying Console
-    digest: 488b5011edcc0b22a28f4e70e576351cc6b9f0f34198fb366cc53cddc197c9d1
-    name: console
-    urls:
-    - https://github.com/cloudfoundry-incubator/stratos/releases/download/0.9.2/console-helm-chart-0.9.2.tgz
-    version: 0.9.2
-  - apiVersion: v1
-    created: 2017-08-01T10:54:22.706325757Z
-    description: A Helm chart for deploying Console
-    digest: 5c7c2769771d7648647ed33a9e7c326c95cf550cb165aa3144dc8f8062dc66bb
-    name: console
-    urls:
-    - https://github.com/cloudfoundry-incubator/stratos/releases/download/0.9.1/console-helm-chart-0.9.1.tgz
-    version: 0.9.1
-  - apiVersion: v1
-    created: 2017-07-27T13:08:56.409964314Z
-    description: A Helm chart for deploying Console
-    digest: e05d4dd12d3e518ce8d123480196008815988dc59fa3653ad4593042e92cc36b
-    name: console
-    urls:
-    - https://github.com/cloudfoundry-incubator/stratos/releases/download/0.9.0/console-helm-chart-0.9.0.tgz
-    version: 0.9.0
-generated: 2018-01-09T11:48:55.232685995Z
diff --git a/package-lock.json b/package-lock.json
index 1c002ad57b..1823c4b66e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,9 +1,23 @@
 {
   "name": "stratos",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@angular-builders/custom-webpack": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-9.2.0.tgz",
+      "integrity": "sha512-0ivkjENONFm0oNy6hdCod4YaT4dUk80KuP9+eDliWuZIA70yKQgIYMLul0bz6/i+Cm24PaZ2tq4w7kW7AuSMoA==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/architect": ">=0.900.0 < 0.1000.0",
+        "@angular-devkit/build-angular": ">=0.900.0 < 0.1000.0",
+        "@angular-devkit/core": "^9.0.0",
+        "lodash": "^4.17.10",
+        "ts-node": "^8.5.2",
+        "webpack-merge": "^4.2.1"
+      }
+    },
     "@angular-devkit/architect": {
       "version": "0.901.7",
       "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.7.tgz",
@@ -618,6 +632,17 @@
       "resolved": "https://registry.npmjs.org/@angular/router/-/router-9.1.9.tgz",
       "integrity": "sha512-4u+CWMPB4hCkAsFCEzC94YEWT0wVozqGkc/Dortt2hFaqvZpIegg6iJVZlDxuyDjzFYBPnnbTDdgiTTA8ckfuA=="
     },
+    "@apidevtools/json-schema-ref-parser": {
+      "version": "9.0.6",
+      "resolved": "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.6.tgz",
+      "integrity": "sha512-M3YgsLjI0lZxvrpeGVk9Ap032W6TPQkH6pRAZz81Ac3WUNF79VQooAFnp8umjvVzUmD93NkogxEwbSce7qMsUg==",
+      "dev": true,
+      "requires": {
+        "@jsdevtools/ono": "^7.1.3",
+        "call-me-maybe": "^1.0.1",
+        "js-yaml": "^3.13.1"
+      }
+    },
     "@babel/code-frame": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
@@ -2968,6 +2993,12 @@
         }
       }
     },
+    "@jsdevtools/ono": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz",
+      "integrity": "sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==",
+      "dev": true
+    },
     "@ngrx/effects": {
       "version": "9.2.0",
       "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-9.2.0.tgz",
@@ -3964,15 +3995,6 @@
         "type-fest": "^0.11.0"
       }
     },
-    "ansi-gray": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
-      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
-      "dev": true,
-      "requires": {
-        "ansi-wrap": "0.1.0"
-      }
-    },
     "ansi-html": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
@@ -3993,16 +4015,17 @@
         "color-convert": "^1.9.0"
       }
     },
-    "ansi-wrap": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
+    "any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
       "dev": true
     },
     "anymatch": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
       "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "dev": true,
       "requires": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -4014,15 +4037,6 @@
       "integrity": "sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==",
       "dev": true
     },
-    "append-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
-      "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
-      "dev": true,
-      "requires": {
-        "buffer-equal": "^1.0.0"
-      }
-    },
     "append-transform": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz",
@@ -4081,108 +4095,24 @@
       "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
       "dev": true
     },
-    "arr-filter": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
-      "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
-      "dev": true,
-      "requires": {
-        "make-iterator": "^1.0.0"
-      }
-    },
     "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==",
       "dev": true
     },
-    "arr-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
-      "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
-      "dev": true,
-      "requires": {
-        "make-iterator": "^1.0.0"
-      }
-    },
     "arr-union": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
       "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
       "dev": true
     },
-    "array-each": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
-      "dev": true
-    },
     "array-flatten": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
       "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
       "dev": true
     },
-    "array-initial": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
-      "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
-      "dev": true,
-      "requires": {
-        "array-slice": "^1.0.0",
-        "is-number": "^4.0.0"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-          "dev": true
-        }
-      }
-    },
-    "array-last": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
-      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
-      "dev": true,
-      "requires": {
-        "is-number": "^4.0.0"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-          "dev": true
-        }
-      }
-    },
-    "array-slice": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
-      "dev": true
-    },
-    "array-sort": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
-      "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
-      "dev": true,
-      "requires": {
-        "default-compare": "^1.0.0",
-        "get-value": "^2.0.6",
-        "kind-of": "^5.0.2"
-      },
-      "dependencies": {
-        "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==",
-          "dev": true
-        }
-      }
-    },
     "array-union": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
@@ -4320,18 +4250,6 @@
       "integrity": "sha1-yL4BCitc0A3qlsgRFgNGk9/dgtE=",
       "dev": true
     },
-    "async-done": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
-      "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
-      "dev": true,
-      "requires": {
-        "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",
@@ -4344,15 +4262,6 @@
       "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
       "dev": true
     },
-    "async-settle": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
-      "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
-      "dev": true,
-      "requires": {
-        "async-done": "^1.2.2"
-      }
-    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -4527,23 +4436,6 @@
         "object.assign": "^4.1.0"
       }
     },
-    "bach": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
-      "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
-      "dev": true,
-      "requires": {
-        "arr-filter": "^1.1.1",
-        "arr-flatten": "^1.0.1",
-        "arr-map": "^2.0.0",
-        "array-each": "^1.0.0",
-        "array-initial": "^1.0.0",
-        "array-last": "^1.1.1",
-        "async-done": "^1.2.2",
-        "async-settle": "^1.0.0",
-        "now-and-later": "^2.0.0"
-      }
-    },
     "backo2": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
@@ -5106,18 +4998,6 @@
         "isarray": "^1.0.0"
       }
     },
-    "buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true
-    },
-    "buffer-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
-      "dev": true
-    },
     "buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
@@ -5324,6 +5204,12 @@
         }
       }
     },
+    "call-me-maybe": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
+      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
+      "dev": true
+    },
     "caller-callsite": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
@@ -5537,6 +5423,20 @@
       "integrity": "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==",
       "dev": true
     },
+    "cli-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-2.0.0.tgz",
+      "integrity": "sha512-a0VZ8LeraW0jTuCkuAGMNufareGHhyZU9z8OGsW0gXd1hZGi1SRuNRXdbGkraBBKnhyUhyebFWnRbp+dIn0f0A==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.1.1",
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.51",
+        "es6-iterator": "^2.0.3",
+        "memoizee": "^0.4.14",
+        "timers-ext": "^0.1.7"
+      }
+    },
     "cli-cursor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
@@ -5558,41 +5458,12 @@
       "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
       "dev": true
     },
-    "cliui": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-      "dev": true,
-      "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wrap-ansi": "^2.0.0"
-      },
-      "dependencies": {
-        "wrap-ansi": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-          "dev": true,
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1"
-          }
-        }
-      }
-    },
     "clone": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
       "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
       "dev": true
     },
-    "clone-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
-      "dev": true
-    },
     "clone-deep": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
@@ -5613,23 +5484,6 @@
         "mimic-response": "^1.0.0"
       }
     },
-    "clone-stats": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-      "dev": true
-    },
-    "cloneable-readable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
-      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "process-nextick-args": "^2.0.0",
-        "readable-stream": "^2.3.5"
-      }
-    },
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -5697,17 +5551,6 @@
         }
       }
     },
-    "collection-map": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
-      "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
-      "dev": true,
-      "requires": {
-        "arr-map": "^2.0.2",
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      }
-    },
     "collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
@@ -5751,12 +5594,6 @@
         "simple-swizzle": "^0.2.2"
       }
     },
-    "color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "dev": true
-    },
     "colors": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
@@ -5973,16 +5810,6 @@
       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
       "dev": true
     },
-    "copy-props": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
-      "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
-      "dev": true,
-      "requires": {
-        "each-props": "^1.3.0",
-        "is-plain-object": "^2.0.1"
-      }
-    },
     "copy-webpack-plugin": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz",
@@ -6780,23 +6607,6 @@
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-3.3.0.tgz",
       "integrity": "sha512-GRQOafGHwMHpjPx9iCvTgpu9NojZ49q794EEL94JVEw6VaeA8XTUyBKvAkOOjBX9oJNiV6G3P+T+tihFjo2TqA=="
     },
-    "default-compare": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
-      "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^5.0.2"
-      },
-      "dependencies": {
-        "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==",
-          "dev": true
-        }
-      }
-    },
     "default-gateway": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
@@ -6824,12 +6634,6 @@
         }
       }
     },
-    "default-resolution": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
-      "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
-      "dev": true
-    },
     "defaults": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
@@ -7010,12 +6814,6 @@
       "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
       "dev": true
     },
-    "detect-file": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
-      "dev": true
-    },
     "detect-node": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
@@ -7205,16 +7003,6 @@
         "stream-shift": "^1.0.0"
       }
     },
-    "each-props": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
-      "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
-      "dev": true,
-      "requires": {
-        "is-plain-object": "^2.0.1",
-        "object.defaults": "^1.1.0"
-      }
-    },
     "ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@@ -7263,7 +7051,8 @@
     "emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
     },
     "emojis-list": {
       "version": "3.0.0",
@@ -8160,18 +7949,6 @@
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
       "dev": true
     },
-    "fancy-log": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
-      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
-      "dev": true,
-      "requires": {
-        "ansi-gray": "^0.1.1",
-        "color-support": "^1.1.3",
-        "parse-node-version": "^1.0.0",
-        "time-stamp": "^1.0.0"
-      }
-    },
     "fast-deep-equal": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
@@ -8452,93 +8229,6 @@
         "locate-path": "^2.0.0"
       }
     },
-    "findup-sync": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
-      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
-      "dev": true,
-      "requires": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
-      },
-      "dependencies": {
-        "expand-tilde": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-          "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-          "dev": true,
-          "requires": {
-            "homedir-polyfill": "^1.0.1"
-          }
-        },
-        "global-modules": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-          "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-          "dev": true,
-          "requires": {
-            "global-prefix": "^1.0.1",
-            "is-windows": "^1.0.1",
-            "resolve-dir": "^1.0.0"
-          }
-        },
-        "global-prefix": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-          "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-          "dev": true,
-          "requires": {
-            "expand-tilde": "^2.0.2",
-            "homedir-polyfill": "^1.0.1",
-            "ini": "^1.3.4",
-            "is-windows": "^1.0.1",
-            "which": "^1.2.14"
-          }
-        },
-        "resolve-dir": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-          "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
-          "dev": true,
-          "requires": {
-            "expand-tilde": "^2.0.0",
-            "global-modules": "^1.0.0"
-          }
-        }
-      }
-    },
-    "fined": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
-      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
-      "dev": true,
-      "requires": {
-        "expand-tilde": "^2.0.2",
-        "is-plain-object": "^2.0.3",
-        "object.defaults": "^1.1.0",
-        "object.pick": "^1.2.0",
-        "parse-filepath": "^1.0.1"
-      },
-      "dependencies": {
-        "expand-tilde": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-          "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-          "dev": true,
-          "requires": {
-            "homedir-polyfill": "^1.0.1"
-          }
-        }
-      }
-    },
-    "flagged-respawn": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
-      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
-      "dev": true
-    },
     "flat-cache": {
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
@@ -8616,15 +8306,6 @@
       "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
       "dev": true
     },
-    "for-own": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-      "dev": true,
-      "requires": {
-        "for-in": "^1.0.1"
-      }
-    },
     "foreground-child": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz",
@@ -8797,16 +8478,6 @@
         }
       }
     },
-    "fs-mkdirp-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
-      "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.11",
-        "through2": "^2.0.3"
-      }
-    },
     "fs-write-stream-atomic": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
@@ -8938,194 +8609,19 @@
         }
       }
     },
-    "glob-stream": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
-      "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
+    "global-dirs": {
+      "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": {
-        "extend": "^3.0.0",
-        "glob": "^7.1.1",
-        "glob-parent": "^3.1.0",
-        "is-negated-glob": "^1.0.0",
-        "ordered-read-streams": "^1.0.0",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.1.5",
-        "remove-trailing-separator": "^1.0.1",
-        "to-absolute-glob": "^2.0.0",
-        "unique-stream": "^2.0.2"
+        "ini": "^1.3.5"
       }
     },
-    "glob-watcher": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.3.tgz",
-      "integrity": "sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==",
-      "dev": true,
-      "requires": {
-        "anymatch": "^2.0.0",
-        "async-done": "^1.2.0",
-        "chokidar": "^2.0.0",
-        "is-negated-glob": "^1.0.0",
-        "just-debounce": "^1.0.0",
-        "object.defaults": "^1.1.0"
-      },
-      "dependencies": {
-        "anymatch": {
-          "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"
-          }
-        },
-        "braces": {
-          "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",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          }
-        },
-        "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"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "extend-shallow": {
-          "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"
-          }
-        },
-        "fill-range": {
-          "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",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          }
-        },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "dev": true,
-          "optional": true
-        },
-        "is-binary-path": {
-          "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"
-          }
-        },
-        "is-number": {
-          "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"
-          }
-        },
-        "kind-of": {
-          "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"
-          }
-        },
-        "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"
-          }
-        },
-        "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.1.11",
-            "micromatch": "^3.1.10",
-            "readable-stream": "^2.0.2"
-          }
-        },
-        "to-regex-range": {
-          "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"
-          }
-        }
-      }
-    },
-    "global-dirs": {
-      "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.5"
-      }
-    },
-    "global-modules": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+    "global-modules": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
       "dev": true,
       "requires": {
         "global-prefix": "^1.0.1",
@@ -9212,15 +8708,6 @@
         "minimatch": "~3.0.2"
       }
     },
-    "glogg": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
-      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
-      "dev": true,
-      "requires": {
-        "sparkles": "^1.0.0"
-      }
-    },
     "gonzales-pe-sl": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/gonzales-pe-sl/-/gonzales-pe-sl-4.2.3.tgz",
@@ -9271,150 +8758,6 @@
         "lodash": "^4.17.15"
       }
     },
-    "gulp": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
-      "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
-      "dev": true,
-      "requires": {
-        "glob-watcher": "^5.0.3",
-        "gulp-cli": "^2.2.0",
-        "undertaker": "^1.2.1",
-        "vinyl-fs": "^3.0.0"
-      },
-      "dependencies": {
-        "ansi-colors": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-          "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-          "dev": true,
-          "requires": {
-            "ansi-wrap": "^0.1.0"
-          }
-        },
-        "gulp-cli": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
-          "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
-          "dev": true,
-          "requires": {
-            "ansi-colors": "^1.0.1",
-            "archy": "^1.0.0",
-            "array-sort": "^1.0.0",
-            "color-support": "^1.1.3",
-            "concat-stream": "^1.6.0",
-            "copy-props": "^2.0.1",
-            "fancy-log": "^1.3.2",
-            "gulplog": "^1.0.0",
-            "interpret": "^1.4.0",
-            "isobject": "^3.0.1",
-            "liftoff": "^3.1.0",
-            "matchdep": "^2.0.0",
-            "mute-stdout": "^1.0.0",
-            "pretty-hrtime": "^1.0.0",
-            "replace-homedir": "^1.0.0",
-            "semver-greatest-satisfied-range": "^1.1.0",
-            "v8flags": "^3.2.0",
-            "yargs": "^7.1.0"
-          }
-        },
-        "interpret": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-          "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
-          "dev": true
-        },
-        "v8flags": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
-          "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
-          "dev": true,
-          "requires": {
-            "homedir-polyfill": "^1.0.1"
-          }
-        }
-      }
-    },
-    "gulp-zip": {
-      "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",
-        "plugin-error": "^1.0.1",
-        "through2": "^3.0.1",
-        "vinyl": "^2.1.0",
-        "yazl": "^2.5.1"
-      },
-      "dependencies": {
-        "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=="
-        },
-        "get-stream": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-          "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.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=="
-        },
-        "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=="
-        },
-        "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",
-            "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=="
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "through2": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
-          "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
-          "dev": true,
-          "requires": {
-            "readable-stream": "2 || 3"
-          }
-        }
-      }
-    },
-    "gulplog": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
-      "dev": true,
-      "requires": {
-        "glogg": "^1.0.0"
-      }
-    },
     "handle-thing": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
@@ -9673,6 +9016,7 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
       "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "dev": true,
       "requires": {
         "parse-passwd": "^1.0.0"
       }
@@ -10143,12 +9487,6 @@
         "loose-envify": "^1.0.0"
       }
     },
-    "invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-      "dev": true
-    },
     "ip": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
@@ -10167,16 +9505,6 @@
       "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
       "dev": true
     },
-    "is-absolute": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
-      "dev": true,
-      "requires": {
-        "is-relative": "^1.0.0",
-        "is-windows": "^1.0.1"
-      }
-    },
     "is-absolute-url": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
@@ -10219,6 +9547,7 @@
       "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": {
         "binary-extensions": "^2.0.0"
       },
@@ -10226,7 +9555,8 @@
         "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=="
+          "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
+          "dev": true
         }
       }
     },
@@ -10331,7 +9661,8 @@
     "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-fullwidth-code-point": {
       "version": "1.0.0",
@@ -10400,12 +9731,6 @@
         "xtend": "^4.0.0"
       }
     },
-    "is-negated-glob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
-      "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
-      "dev": true
-    },
     "is-npm": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz",
@@ -10456,6 +9781,12 @@
         "isobject": "^3.0.1"
       }
     },
+    "is-promise": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
+      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
+      "dev": true
+    },
     "is-property": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
@@ -10488,15 +9819,6 @@
         "has": "^1.0.1"
       }
     },
-    "is-relative": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
-      "dev": true,
-      "requires": {
-        "is-unc-path": "^1.0.0"
-      }
-    },
     "is-resolvable": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
@@ -10538,21 +9860,6 @@
       "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
       "dev": true
     },
-    "is-unc-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
-      "dev": true,
-      "requires": {
-        "unc-path-regex": "^0.1.2"
-      }
-    },
-    "is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-      "dev": true
-    },
     "is-valid-glob": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
@@ -11149,6 +10456,43 @@
       "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
       "dev": true
     },
+    "json-schema-ref-parser": {
+      "version": "9.0.6",
+      "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-9.0.6.tgz",
+      "integrity": "sha512-z0JGv7rRD3CnJbZY/qCpscyArdtLJhr/wRBmFUdoZ8xMjsFyNdILSprG2degqRLjBjyhZHAEBpGOxniO9rKTxA==",
+      "dev": true,
+      "requires": {
+        "@apidevtools/json-schema-ref-parser": "9.0.6"
+      }
+    },
+    "json-schema-to-typescript": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/json-schema-to-typescript/-/json-schema-to-typescript-9.1.1.tgz",
+      "integrity": "sha512-VrdxmwQROjPBRlHxXwGUa2xzhOMPiNZIVsxZrZjMYtbI7suRFMiEktqaD/gqhfSya7Djy+x8dnJT+H0/0sZO0Q==",
+      "dev": true,
+      "requires": {
+        "@types/json-schema": "^7.0.4",
+        "cli-color": "^2.0.0",
+        "glob": "^7.1.6",
+        "is-glob": "^4.0.1",
+        "json-schema-ref-parser": "^9.0.1",
+        "json-stringify-safe": "^5.0.1",
+        "lodash": "^4.17.15",
+        "minimist": "^1.2.5",
+        "mkdirp": "^1.0.4",
+        "mz": "^2.7.0",
+        "prettier": "^2.0.5",
+        "stdin": "0.0.1"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        }
+      }
+    },
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -11163,12 +10507,6 @@
         "kind-of": "^6.0.2"
       }
     },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
-    },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
@@ -11235,12 +10573,6 @@
         "set-immediate-shim": "~1.0.1"
       }
     },
-    "just-debounce": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz",
-      "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=",
-      "dev": true
-    },
     "karma": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/karma/-/karma-5.0.1.tgz",
@@ -11781,16 +11113,6 @@
       "integrity": "sha512-QMQcnKAiQccfQTqtBh/qwquGZ2XK/DXND1jrcN9M8gMMy99Gwla7GQjndVUsEqIaRyP6bsFRuhwRj5poafBGJQ==",
       "dev": true
     },
-    "last-run": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
-      "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
-      "dev": true,
-      "requires": {
-        "default-resolution": "^2.0.0",
-        "es6-weak-map": "^2.0.1"
-      }
-    },
     "latest-version": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
@@ -11800,33 +11122,6 @@
         "package-json": "^6.3.0"
       }
     },
-    "lazystream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "^2.0.5"
-      }
-    },
-    "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "dev": true,
-      "requires": {
-        "invert-kv": "^1.0.0"
-      }
-    },
-    "lead": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
-      "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
-      "dev": true,
-      "requires": {
-        "flush-write-stream": "^1.0.2"
-      }
-    },
     "less": {
       "version": "3.11.1",
       "resolved": "https://registry.npmjs.org/less/-/less-3.11.1.tgz",
@@ -11937,59 +11232,12 @@
         "immediate": "~3.0.5"
       }
     },
-    "liftoff": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
-      "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
-      "dev": true,
-      "requires": {
-        "extend": "^3.0.0",
-        "findup-sync": "^3.0.0",
-        "fined": "^1.0.1",
-        "flagged-respawn": "^1.0.0",
-        "is-plain-object": "^2.0.4",
-        "object.map": "^1.0.0",
-        "rechoir": "^0.6.2",
-        "resolve": "^1.1.7"
-      }
-    },
     "lines-and-columns": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
       "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
       "dev": true
     },
-    "load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      },
-      "dependencies": {
-        "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=="
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY="
-        }
-      }
-    },
     "loader-runner": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
@@ -12019,8 +11267,7 @@
     "lodash": {
       "version": "4.17.19",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
-      "dev": true
+      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
     },
     "lodash-es": {
       "version": "4.17.15",
@@ -12145,6 +11392,15 @@
         }
       }
     },
+    "lru-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
+      "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
+      "dev": true,
+      "requires": {
+        "es5-ext": "~0.10.2"
+      }
+    },
     "magic-string": {
       "version": "0.25.7",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
@@ -12237,15 +11493,6 @@
         }
       }
     },
-    "make-iterator": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^6.0.2"
-      }
-    },
     "mamacro": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
@@ -12291,119 +11538,6 @@
       "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",
-      "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
-      "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
-      "dev": true,
-      "requires": {
-        "findup-sync": "^2.0.0",
-        "micromatch": "^3.0.4",
-        "resolve": "^1.4.0",
-        "stack-trace": "0.0.10"
-      },
-      "dependencies": {
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
-        "chokidar": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz",
-          "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==",
-          "requires": {
-            "anymatch": "~3.1.1",
-            "braces": "~3.0.2",
-            "fsevents": "~2.1.2",
-            "glob-parent": "~5.1.0",
-            "is-binary-path": "~2.1.0",
-            "normalize-path": "~3.0.0",
-            "readdirp": "~3.4.0"
-          }
-        },
-        "expand-tilde": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-          "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-          "requires": {
-            "homedir-polyfill": "^1.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==",
-          "requires": {
-            "to-regex-range": "^5.0.1"
-          }
-        },
-        "findup-sync": {
-          "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
-        },
-        "fsevents": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-          "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-          "optional": 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=="
-        },
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "requires": {
-            "is-extglob": "^2.1.0"
-          }
-        },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
-        },
-        "mime": {
-          "version": "2.4.6",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
-          "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="
-        },
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.0.0.tgz",
-          "integrity": "sha512-PiVO95TKvhiwgSwg1IdLYlCTdul38yZxZMIcnDSFIBUm4BNZha2qpQ4GpJ++15bHoKDtrW2D69lMfFwdFYtNZQ=="
-        },
-        "readdirp": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
-          "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
-          "requires": {
-            "picomatch": "^2.2.1"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "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==",
-          "requires": {
-            "is-number": "^7.0.0"
-          }
-        }
-      }
-    },
     "matched": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/matched/-/matched-1.0.2.tgz",
@@ -12459,6 +11593,22 @@
         }
       }
     },
+    "memoizee": {
+      "version": "0.4.14",
+      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz",
+      "integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "^0.10.45",
+        "es6-weak-map": "^2.0.2",
+        "event-emitter": "^0.3.5",
+        "is-promise": "^2.1",
+        "lru-queue": "0.1",
+        "next-tick": "1",
+        "timers-ext": "^0.1.5"
+      }
+    },
     "memory-fs": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
@@ -12970,18 +12120,23 @@
       "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
       "dev": true
     },
-    "mute-stdout": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
-      "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
-      "dev": true
-    },
     "mute-stream": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
       "dev": true
     },
+    "mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "dev": true,
+      "requires": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
+    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -13430,7 +12585,8 @@
     "normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true
     },
     "normalize-range": {
       "version": "0.1.2",
@@ -13449,15 +12605,6 @@
       "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",
-      "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
-      "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.2"
-      }
-    },
     "npm-bundled": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
@@ -14176,18 +13323,6 @@
         "object-keys": "^1.0.11"
       }
     },
-    "object.defaults": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-      "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
-      "dev": true,
-      "requires": {
-        "array-each": "^1.0.1",
-        "array-slice": "^1.0.0",
-        "for-own": "^1.0.0",
-        "isobject": "^3.0.0"
-      }
-    },
     "object.getownpropertydescriptors": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
@@ -14279,16 +13414,6 @@
         }
       }
     },
-    "object.map": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
-      "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
-      "dev": true,
-      "requires": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      }
-    },
     "object.pick": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
@@ -14298,16 +13423,6 @@
         "isobject": "^3.0.1"
       }
     },
-    "object.reduce": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
-      "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
-      "dev": true,
-      "requires": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      }
-    },
     "object.values": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
@@ -14587,15 +13702,6 @@
         }
       }
     },
-    "ordered-read-streams": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
-      "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "^2.0.1"
-      }
-    },
     "original": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
@@ -14617,15 +13723,6 @@
       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
       "dev": true
     },
-    "os-locale": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-      "dev": true,
-      "requires": {
-        "lcid": "^1.0.0"
-      }
-    },
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
@@ -14922,36 +14019,11 @@
         "safe-buffer": "^5.1.1"
       }
     },
-    "parse-filepath": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
-      "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
-      "dev": true,
-      "requires": {
-        "is-absolute": "^1.0.0",
-        "map-cache": "^0.2.0",
-        "path-root": "^0.1.1"
-      }
-    },
-    "parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dev": true,
-      "requires": {
-        "error-ex": "^1.2.0"
-      }
-    },
-    "parse-node-version": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
-      "dev": true
-    },
-    "parse-passwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY="
+    "parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+      "dev": true
     },
     "parse5": {
       "version": "5.1.1",
@@ -15029,21 +14101,6 @@
       "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
       "dev": true
     },
-    "path-root": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-      "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
-      "dev": true,
-      "requires": {
-        "path-root-regex": "^0.1.0"
-      }
-    },
-    "path-root-regex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-      "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
-      "dev": true
-    },
     "path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
@@ -15090,7 +14147,8 @@
     "picomatch": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "dev": true
     },
     "pidtree": {
       "version": "0.3.0",
@@ -15182,29 +14240,6 @@
         "find-up": "^2.1.0"
       }
     },
-    "plugin-error": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
-      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "^1.0.1",
-        "arr-diff": "^4.0.0",
-        "arr-union": "^3.1.0",
-        "extend-shallow": "^3.0.2"
-      },
-      "dependencies": {
-        "ansi-colors": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-          "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-          "dev": true,
-          "requires": {
-            "ansi-wrap": "^0.1.0"
-          }
-        }
-      }
-    },
     "pluralize": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz",
@@ -15930,10 +14965,10 @@
       "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
       "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
     },
-    "pretty-hrtime": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
+    "prettier": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz",
+      "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==",
       "dev": true
     },
     "private": {
@@ -16444,67 +15479,6 @@
         "util-promisify": "^2.1.0"
       }
     },
-    "read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-      "dev": true,
-      "requires": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
-      },
-      "dependencies": {
-        "path-type": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        }
-      }
-    },
-    "read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "dev": true,
-      "requires": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-          "dev": true,
-          "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-          "dev": true,
-          "requires": {
-            "pinkie-promise": "^2.0.0"
-          }
-        }
-      }
-    },
     "readable-stream": {
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
@@ -16560,15 +15534,6 @@
         }
       }
     },
-    "rechoir": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-      "dev": true,
-      "requires": {
-        "resolve": "^1.1.6"
-      }
-    },
     "reflect-metadata": {
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
@@ -16688,346 +15653,107 @@
           "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.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.2.0",
-        "regjsgen": "^0.5.1",
-        "regjsparser": "^0.6.4",
-        "unicode-match-property-ecmascript": "^1.0.4",
-        "unicode-match-property-value-ecmascript": "^1.2.0"
-      }
-    },
-    "registry-auth-token": {
-      "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"
-      }
-    },
-    "registry-url": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
-      "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
-      "dev": true,
-      "requires": {
-        "rc": "^1.2.8"
-      }
-    },
-    "regjsgen": {
-      "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.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
-        }
-      }
-    },
-    "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",
-      "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
-      "dev": true,
-      "requires": {
-        "is-buffer": "^1.1.5",
-        "is-utf8": "^0.2.1"
-      }
-    },
-    "remove-bom-stream": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
-      "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
-      "dev": true,
-      "requires": {
-        "remove-bom-buffer": "^3.0.0",
-        "safe-buffer": "^5.1.0",
-        "through2": "^2.0.3"
-      }
-    },
-    "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=",
-      "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==",
-      "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=",
-      "dev": true
-    },
-    "replace-ext": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-      "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
-      "dev": true
-    },
-    "replace-homedir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
-      "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
-      "dev": true,
-      "requires": {
-        "homedir-polyfill": "^1.0.1",
-        "is-absolute": "^1.0.0",
-        "remove-trailing-separator": "^1.1.0"
-      }
-    },
-    "replace-in-file": {
-      "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": "^3.0.0",
-        "glob": "^7.1.6",
-        "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"
-          }
-        },
-        "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": "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"
-          }
-        },
-        "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
-        },
-        "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
-        },
-        "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"
-          }
-        },
-        "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"
+          "requires": {
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.17.5",
+            "string.prototype.trimstart": "^1.0.0"
           }
         },
-        "yargs-parser": {
-          "version": "18.1.3",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-          "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+        "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": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.17.5",
+            "string.prototype.trimend": "^1.0.0"
           }
         }
       }
     },
+    "regexpu-core": {
+      "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.2.0",
+        "regjsgen": "^0.5.1",
+        "regjsparser": "^0.6.4",
+        "unicode-match-property-ecmascript": "^1.0.4",
+        "unicode-match-property-value-ecmascript": "^1.2.0"
+      }
+    },
+    "registry-auth-token": {
+      "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"
+      }
+    },
+    "registry-url": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
+      "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
+      "dev": true,
+      "requires": {
+        "rc": "^1.2.8"
+      }
+    },
+    "regjsgen": {
+      "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.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
+        }
+      }
+    },
+    "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-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "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==",
+      "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=",
+      "dev": true
+    },
     "request": {
       "version": "2.88.2",
       "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
@@ -17165,15 +15891,6 @@
       "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
       "dev": true
     },
-    "resolve-options": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
-      "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
-      "dev": true,
-      "requires": {
-        "value-or-function": "^3.0.0"
-      }
-    },
     "resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@@ -17807,15 +16524,6 @@
         "semver": "^5.3.0"
       }
     },
-    "semver-greatest-satisfied-range": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
-      "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
-      "dev": true,
-      "requires": {
-        "sver-compat": "^1.5.0"
-      }
-    },
     "semver-intersect": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/semver-intersect/-/semver-intersect-1.4.0.tgz",
@@ -18431,12 +17139,6 @@
       "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
       "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
     },
-    "sparkles": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
-      "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",
@@ -18666,12 +17368,6 @@
       "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",
-      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
-      "dev": true
-    },
     "stackframe": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.1.0.tgz",
@@ -18713,6 +17409,12 @@
       "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
       "dev": true
     },
+    "stdin": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/stdin/-/stdin-0.0.1.tgz",
+      "integrity": "sha1-0wQZgarsPf28d6GzjWNy449ftx4=",
+      "dev": true
+    },
     "stealthy-require": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
@@ -18804,12 +17506,6 @@
         "stubs": "^3.0.0"
       }
     },
-    "stream-exhaust": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
-      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
-      "dev": true
-    },
     "stream-http": {
       "version": "2.8.3",
       "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
@@ -19117,15 +17813,6 @@
         "ansi-regex": "^2.0.0"
       }
     },
-    "strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "dev": true,
-      "requires": {
-        "is-utf8": "^0.2.0"
-      }
-    },
     "strip-eof": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
@@ -19295,16 +17982,6 @@
         "has-flag": "^3.0.0"
       }
     },
-    "sver-compat": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
-      "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
-      "dev": true,
-      "requires": {
-        "es6-iterator": "^2.0.1",
-        "es6-symbol": "^3.1.1"
-      }
-    },
     "svgo": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
@@ -19689,6 +18366,24 @@
       "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
       "dev": true
     },
+    "thenify": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "dev": true,
+      "requires": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
+      "dev": true,
+      "requires": {
+        "thenify": ">= 3.1.0 < 4"
+      }
+    },
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -19705,28 +18400,12 @@
         "xtend": "~4.0.1"
       }
     },
-    "through2-filter": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
-      "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
-      "dev": true,
-      "requires": {
-        "through2": "~2.0.0",
-        "xtend": "~4.0.0"
-      }
-    },
     "thunky": {
       "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": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-      "dev": true
-    },
     "timers-browserify": {
       "version": "2.0.11",
       "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
@@ -19736,6 +18415,16 @@
         "setimmediate": "^1.0.4"
       }
     },
+    "timers-ext": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
+      "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
+      "dev": true,
+      "requires": {
+        "es5-ext": "~0.10.46",
+        "next-tick": "1"
+      }
+    },
     "timsort": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
@@ -19751,16 +18440,6 @@
         "os-tmpdir": "~1.0.2"
       }
     },
-    "to-absolute-glob": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
-      "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
-      "dev": true,
-      "requires": {
-        "is-absolute": "^1.0.0",
-        "is-negated-glob": "^1.0.0"
-      }
-    },
     "to-array": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
@@ -19826,15 +18505,6 @@
         "is-number": "^7.0.0"
       }
     },
-    "to-through": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
-      "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
-      "dev": true,
-      "requires": {
-        "through2": "^2.0.3"
-      }
-    },
     "toidentifier": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
@@ -20036,41 +18706,12 @@
       "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
       "dev": true
     },
-    "unc-path-regex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-      "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
-      "dev": true
-    },
     "underscore": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
       "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=",
       "dev": true
     },
-    "undertaker": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.1.tgz",
-      "integrity": "sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==",
-      "dev": true,
-      "requires": {
-        "arr-flatten": "^1.0.1",
-        "arr-map": "^2.0.0",
-        "bach": "^1.0.0",
-        "collection-map": "^1.0.0",
-        "es6-weak-map": "^2.0.1",
-        "last-run": "^1.1.0",
-        "object.defaults": "^1.0.0",
-        "object.reduce": "^1.0.0",
-        "undertaker-registry": "^1.0.0"
-      }
-    },
-    "undertaker-registry": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
-      "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
-      "dev": true
-    },
     "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",
@@ -20141,16 +18782,6 @@
         "imurmurhash": "^0.1.4"
       }
     },
-    "unique-stream": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
-      "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
-      "dev": true,
-      "requires": {
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "through2-filter": "^3.0.0"
-      }
-    },
     "unique-string": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
@@ -20561,12 +19192,6 @@
         "builtins": "^1.0.3"
       }
     },
-    "value-or-function": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
-      "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=",
-      "dev": true
-    },
     "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@@ -20590,79 +19215,6 @@
         "extsprintf": "^1.2.0"
       }
     },
-    "vinyl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
-      "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
-      "dev": true,
-      "requires": {
-        "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": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
-      "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
-      "dev": true,
-      "requires": {
-        "fs-mkdirp-stream": "^1.0.0",
-        "glob-stream": "^6.1.0",
-        "graceful-fs": "^4.0.0",
-        "is-valid-glob": "^1.0.0",
-        "lazystream": "^1.0.0",
-        "lead": "^1.0.0",
-        "object.assign": "^4.0.4",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.3.3",
-        "remove-bom-buffer": "^3.0.0",
-        "remove-bom-stream": "^1.2.0",
-        "resolve-options": "^1.1.0",
-        "through2": "^2.0.0",
-        "to-through": "^2.0.0",
-        "value-or-function": "^3.0.0",
-        "vinyl": "^2.0.0",
-        "vinyl-sourcemap": "^1.1.0"
-      },
-      "dependencies": {
-        "is-valid-glob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
-          "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
-          "dev": true
-        }
-      }
-    },
-    "vinyl-sourcemap": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
-      "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
-      "dev": true,
-      "requires": {
-        "append-buffer": "^1.0.2",
-        "convert-source-map": "^1.5.0",
-        "graceful-fs": "^4.1.6",
-        "normalize-path": "^2.1.1",
-        "now-and-later": "^2.0.0",
-        "remove-bom-buffer": "^3.0.0",
-        "vinyl": "^2.0.0"
-      },
-      "dependencies": {
-        "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"
-          }
-        }
-      }
-    },
     "vm-browserify": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
@@ -21661,12 +20213,6 @@
         "isexe": "^2.0.0"
       }
     },
-    "which-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-      "dev": true
-    },
     "widest-line": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
@@ -21909,79 +20455,6 @@
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true
     },
-    "yargs": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
-      "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
-      "dev": true,
-      "requires": {
-        "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": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true
-        },
-        "get-caller-file": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-          "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-          "dev": true
-        },
-        "require-main-filename": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-          "dev": true
-        },
-        "y18n": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
-          "dev": true
-        }
-      }
-    },
-    "yargs-parser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
-      "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
-      "dev": true,
-      "requires": {
-        "camelcase": "^3.0.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true
-        }
-      }
-    },
-    "yazl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
-      "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
-      "dev": true,
-      "requires": {
-        "buffer-crc32": "~0.2.3"
-      }
-    },
     "yeast": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
diff --git a/package.json b/package.json
index e2996467de..011b676947 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stratos",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Stratos Console",
   "main": "index.js",
   "scripts": {
diff --git a/src/frontend/packages/example-theme/_index.scss b/src/frontend/packages/example-theme/_index.scss
index a8d3f300e1..b837542374 100644
--- a/src/frontend/packages/example-theme/_index.scss
+++ b/src/frontend/packages/example-theme/_index.scss
@@ -2,8 +2,60 @@
 
 // Custom Theme
 @import './sass/custom';
+@import './sass/custom/acme-colors';
+
+// Style overrides
+@import './sass/custom/acme';
 
 @function stratos-theme() {
   $theme: stratos-theme-helper($stratos-theme);
-  @return $theme
-}
\ No newline at end of file
+  @return (
+    default: create-custom-theme($stratos-theme),
+    dark: create-dark-theme()
+  );
+}
+
+@function create-custom-theme($base-theme) {
+  $theme: stratos-theme-helper($base-theme);
+
+  // Modify some of the colors
+  $app-theme: map-get($theme, app-theme);
+  $app-theme: map-merge($app-theme, (
+    header-background-color: $acme-text,
+    header-foreground-color: $acme-dark-gray,
+    header-background-span: false,
+    stratos-title-show-text: true,
+    user-avatar-background-color: $acme-text,
+    user-avatar-foreground-color: $acme-primary-color,
+    user-avatar-header-invert-colors: false,
+    side-nav: (
+      background: $acme-dark-gray,
+      text: $acme-text-gray,
+      active: $acme-side-nav-active,
+      active-text: $acme-text-gray,
+      hover: $acme-side-nav-active,
+      hover-text: $acme-text-gray
+    )
+  ));
+
+  $theme: map-merge($theme, (
+    app-theme: $app-theme
+  ));
+
+  @return $theme;
+}
+
+@function create-dark-theme() {
+  $theme: create-custom-theme($stratos-dark-theme);
+
+  $app-theme: map-get($theme, app-theme);
+  $app-theme: map-merge($app-theme, (
+    header-background-color: $acme-dark-gray,
+    header-foreground-color: $acme-text,
+  ));
+
+  $theme: map-merge($theme, (
+    app-theme: $app-theme
+  ));
+  @return $theme;
+}
diff --git a/src/frontend/packages/example-theme/assets/core/nav-logo.png b/src/frontend/packages/example-theme/assets/core/nav-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..397545f790c3239791281ecd78d225af67dc4507
GIT binary patch
literal 18891
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

literal 0
HcmV?d00001

diff --git a/src/frontend/packages/example-theme/package.json b/src/frontend/packages/example-theme/package.json
index 704b682b04..f2006d3cc3 100644
--- a/src/frontend/packages/example-theme/package.json
+++ b/src/frontend/packages/example-theme/package.json
@@ -6,7 +6,7 @@
       "assets/core": "core/assets",
       "assets/favicon.ico": "favicon.ico"
     },
-    "theme":{
+    "theme": {
       "loadingCss": "loader/loading.css",
       "loadingHtml": "loader/loading.html"
     }
diff --git a/src/frontend/packages/example-theme/sass/custom.scss b/src/frontend/packages/example-theme/sass/custom.scss
index e3eb84c38a..68fa1ded70 100644
--- a/src/frontend/packages/example-theme/sass/custom.scss
+++ b/src/frontend/packages/example-theme/sass/custom.scss
@@ -14,5 +14,3 @@ $stratos-dark-theme: mat-dark-theme($acme-theme-primary, $acme-theme-primary, $a
 
 // Default Theme
 $stratos-theme: mat-light-theme($acme-theme-primary, $acme-theme-primary, $acme-theme-warn);
-
-@import 'custom/acme';
diff --git a/src/frontend/packages/example-theme/sass/custom/acme-colors.scss b/src/frontend/packages/example-theme/sass/custom/acme-colors.scss
index 878c2cda32..6da6321206 100644
--- a/src/frontend/packages/example-theme/sass/custom/acme-colors.scss
+++ b/src/frontend/packages/example-theme/sass/custom/acme-colors.scss
@@ -1,3 +1,5 @@
+// These colors need tidying, some aren't used
+
 $acme-primary: #00c081;
 $acme-secondary: #00243e;
 $acme-text: #fff;
@@ -5,3 +7,17 @@ $acme-text-gray: #ccc;
 $acme-button-gray: #888;
 $acme-dark-blue: #06253a;
 $acme-blue: #073155;
+
+// Acme Brand primary colour
+$acme-primary-color: #035a97;
+
+// Secondary blue colour
+$acme-secondary: #035a97;
+$acme-text: #fff;
+$acme-text-gray: #ccc;
+$acme-dark-blue: #06253a;
+$acme-blue: #073155;
+$acme-side-nav: $acme-secondary;
+$acme-side-nav-active: #003358;
+
+$acme-dark-gray: #333
diff --git a/src/frontend/packages/example-theme/sass/custom/acme.scss b/src/frontend/packages/example-theme/sass/custom/acme.scss
index 75794ebb6e..e4c53f3cbf 100644
--- a/src/frontend/packages/example-theme/sass/custom/acme.scss
+++ b/src/frontend/packages/example-theme/sass/custom/acme.scss
@@ -1,71 +1,11 @@
-// Style overrides
-// Acme Brand primary colour
-$acme-primary-color: #035a97;
+@import './acme-colors';
 
-// Secondary blue colour
-$acme-secondary: #035a97;
-$acme-text: #fff;
-$acme-text-gray: #ccc;
-$acme-dark-blue: #06253a;
-$acme-blue: #073155;
-$acme-side-nav: $acme-secondary;
-$acme-side-nav-active: #003358;
+// Style overrides
 
 body.stratos {
-  app-page-subheader {
-    .page-subheader {
-      background-color: #fff;
-      color: #333;
-    }
-  }
-
-  .page-header__divider {
-    color: #333;
-  }
-
-  .page-header__menu-button-icon {
-    background-color: $acme-primary-color;
-    color: $acme-text;
-  }
-
-  .mat-tab-nav-bar.mat-primary.mat-background-primary {
-    .mat-tab-links {
-      background-color: #fff;
-      color: #333;
-    }
-    .mat-tab-link {
-      color: #333;
-    }
-    .mat-ink-bar {
-      background-color: $acme-primary-color;
+  .favorite-list {
+    .app-no-content-container {
+      color: $acme-dark-blue;
     }
   }
-
-  .stratos-title__logo {
-    width: 160px;
-  }
-
-  .page-header .mat-toolbar.mat-primary {
-    background-color: #fff;
-    color: #333;
-  }
-
-  // Use Acme Blue Side Navigation
-  .side-nav,
-  .side-nav__top,
-  .side-nav__item--active:hover {
-    background-color: $acme-side-nav;
-  }
-  .side-nav__item--active,
-  .side-nav__item:hover {
-    background-color: $acme-side-nav-active;
-  }
-  .side-nav__bottom {
-    color: $acme-text-gray;
-  }
-
-  // Show the text Stratos beneath the Acme logo
-  .stratos-title > .stratos-title__header {
-    display: inline-block;
-  }
 }
diff --git a/website/.gitignore b/website/.gitignore
new file mode 100644
index 0000000000..b37ff6e4c3
--- /dev/null
+++ b/website/.gitignore
@@ -0,0 +1,23 @@
+# Dependencies
+/node_modules
+
+# Production
+/build
+
+# Generated files
+.docusaurus
+.cache-loader
+
+# Misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+/website/build
+/website/site-dist
\ No newline at end of file
diff --git a/website/README.md b/website/README.md
new file mode 100644
index 0000000000..b70a5be1d0
--- /dev/null
+++ b/website/README.md
@@ -0,0 +1,40 @@
+# Stratos Website
+
+This website is built using [Docusaurus 2](https://v2.docusaurus.io/), a modern static website generator.
+
+> Run the commands below in the `website` folder.
+
+### Installing Dependencies
+
+```
+$ npm install
+```
+
+### Local Development
+
+```
+$ npm start
+```
+
+This command starts a local development server and open up a browser window. Most changes are reflected live without having to restart the server.
+
+> Note this command will open a web browser on the locally served site (http://localhost:3000)
+
+### Build
+
+```
+$ ./deploy.sh -b
+```
+
+This command generates static content into the `build` directory and can be served using any static contents hosting service.
+
+### Deployment
+
+We use GitHub pages - this command is a convenient way to build the website and push to the `gh-pages` branch.
+
+```
+$ ./deploy.sh
+```
+
+
+> Note: The website is deployed to the GitHub Repository `cf-stratos/wesbite` which hosts https://stratos.app
\ No newline at end of file
diff --git a/website/babel.config.js b/website/babel.config.js
new file mode 100644
index 0000000000..e00595dae7
--- /dev/null
+++ b/website/babel.config.js
@@ -0,0 +1,3 @@
+module.exports = {
+  presets: [require.resolve('@docusaurus/core/lib/babel/preset')],
+};
diff --git a/website/deploy.sh b/website/deploy.sh
new file mode 100755
index 0000000000..bdf2c28552
--- /dev/null
+++ b/website/deploy.sh
@@ -0,0 +1,101 @@
+#!/usr/bin/env bash
+
+# Build and deploy the website
+
+set -euo pipefail
+
+ARG=${1:-deploy}
+
+# wesbite folder
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+pushd $DIR > /dev/null
+echo "Building website ..."
+
+# Copy helm chart readme
+cat << EOF > ./docs/deploy/kubernetes/install.md
+---
+id: helm-installation
+title: Deploying Using Helm
+sidebar_label: Deploy using Helm 
+---
+EOF
+
+# Concatentate the helm chart readme file
+tail -n +2 ${DIR}/../deploy/kubernetes/console/README.md >> ./docs/deploy/kubernetes/install.md
+
+# License file
+
+cat << EOF > ./docs/license.md
+---
+id: license
+title: License
+sidebar_label: License
+---
+
+Stratos is licensed under the Apache 2.0 Software License, shown below:
+
+\`\`\`
+EOF
+
+cat ${DIR}/../LICENSE >> ./docs/license.md
+echo "\`\`\`" >> ./docs/license.md
+
+# Contributing
+
+cat << EOF > ./docs/developer/contributing.md
+---
+title: Contributing
+sidebar_label: Contributing
+---
+
+EOF
+
+tail -n +2 ${DIR}/../CONTRIBUTING.md >> ./docs/developer/contributing.md
+
+# Copy and generate files only
+if [ "$ARG" == "-g" ]; then
+  exit 0
+fi
+
+npm run build
+
+# Generate and build only
+if [ "$ARG" == "-b" ]; then
+  exit 0
+fi
+
+msg="Website update: $(date)"
+
+tmpdir=./site-dist
+rm -rf site-dist
+mkdir -p $tmpdir
+pushd $tmpdir
+echo "Cloning web site"
+git clone git@github.com:cf-stratos/website.git
+
+echo "Copying newer site content ..."
+rsync --delete --exclude=.git -r $DIR/build/ ./website
+
+cd website
+
+echo "Adding CNAME file"
+echo "stratos.app" > CNAME
+
+if [ -z "$(git status --porcelain)" ]; then 
+  echo "No changes to publish"
+else
+  echo "Website has changed"
+  echo "Adding all files"
+  git add -A
+  git commit -m "${msg}"
+  echo "Pushing changes ..."
+  git push
+fi
+
+popd > /dev/null
+
+echo "Removing website dist folder"
+rm -rf $tmpdir
+
+popd > /dev/null
diff --git a/docs/bosh-metrics.md b/website/docs/advanced/bosh-metrics.md
similarity index 98%
rename from docs/bosh-metrics.md
rename to website/docs/advanced/bosh-metrics.md
index f2bd8e5226..8b71e0d51a 100644
--- a/docs/bosh-metrics.md
+++ b/website/docs/advanced/bosh-metrics.md
@@ -1,4 +1,7 @@
-# Connecting Prometheus-boshrelease to Stratos
+---
+title: Connecting Prometheus-boshrelease to Stratos
+sidebar_label: Connecting Prometheus-boshrelease
+---
 
 Stratos can show some metrics stored in Prometheus.
 
diff --git a/docs/invite-user-guide.md b/website/docs/advanced/invite-user-guide.md
similarity index 92%
rename from docs/invite-user-guide.md
rename to website/docs/advanced/invite-user-guide.md
index 58f9283f96..be3690db5d 100644
--- a/docs/invite-user-guide.md
+++ b/website/docs/advanced/invite-user-guide.md
@@ -1,4 +1,7 @@
-# Invite User Guide
+---
+title: Configuring Invite User Support
+sidebar_label: Configuring User Invites
+---
 
 Stratos provides a way for Cloud Foundry administrators and organization managers to invite users to an organization or space.
 
@@ -39,14 +42,14 @@ In the above example the client id is `stratos-invite` and client secret is `pas
 
 Alternatively, you can use an existing UAA Client, if one is already available with the appropriate scopes.
 
-> Note: You will need the Client ID and Client Secret used above when enabling User Invite support in the Stratos UI
+> Note: You will need the Client ID and Client Secret used above when enabling User Invite support in Stratos
 
 ## Configuring SMTP Server details and (optionally) modifying Email Templates
 
 Configuration depends on how you have deployed Stratos.
 
-1. For cf push, see [Configuration for CF Push](#Configuration-for-CF-Push)
-1. For Kubernetes with Helm, see: [Configuration for Helm Installation](#Configuration-for-Helm-Installation)
+1. For cf push, see [Configuration for CF Push](#configuration-for-cf-push)
+1. For Kubernetes with Helm, see: [Configuration for Helm Installation](#configuration-for-helm-installation)
 
 ## Enabling User Invite support in Stratos
 
@@ -56,7 +59,7 @@ This action must be performed by an Administrator in Stratos.
 1) Use the `Configure` button in the `User Invitation Support` section.
 1) Supply the uaa client id and secret and click `Configure`
 
-> Note: If Stratos has been deployed via `cf push` and the steps under the `Pre-configure invite UAA client` header in the  [CF deploy guide](../deploy/cloud-foundry/README.md)  have been followed, you will not follow these steps for the default CF.
+> Note: If Stratos has been deployed via `cf push` and the steps under the `Pre-configure invite UAA client` header in the  [CF deploy guide](../deploy/cloud-foundry/cloud-foundry)  have been followed, you will not follow these steps for the default CF.
 
 ## Configuration for CF Push
 
@@ -142,7 +145,7 @@ When developing locally, we recommend using [mailcatcher](https://mailcatcher.me
 
 To install mailcatcher via docker, use the following command: `docker run -d -p 1080:80 -p 1025:25 --name mail tophfr/mailcatcher`. Once mailcatcher is installed, continue to follow the instructions below.
 
-SMTP server details can be set via rhe usual environment variable approach or, when running locally, in the `jetstream/config.properties` file (see Backend Development - Configuration in [developers-guide](./developers-guide.md)). The config settings, with example values, are as follows:
+SMTP server details can be set via rhe usual environment variable approach or, when running locally, in the `jetstream/config.properties` file (see Backend Development - Configuration in [developers-guide](../developer/introduction)). The config settings, with example values, are as follows:
 
 ```
 SMTP_FROM_ADDRESS=Stratos<test@test.com>
diff --git a/docs/sso.md b/website/docs/advanced/sso.md
similarity index 96%
rename from docs/sso.md
rename to website/docs/advanced/sso.md
index 8f9f747c67..6dfb23a357 100644
--- a/docs/sso.md
+++ b/website/docs/advanced/sso.md
@@ -1,4 +1,7 @@
-# Single Sign On
+---
+title: Configuring Single Sign On
+sidebar_label: Configuring Single Sign On 
+---
 
 By default, Stratos will authenticate against a UAA using username and password, for both logging into Stratos and when connecting Cloud Foundry endpoints.
 
diff --git a/docs/access.md b/website/docs/deploy/access.md
similarity index 97%
rename from docs/access.md
rename to website/docs/deploy/access.md
index e55688dc5c..81ffe6a171 100644
--- a/docs/access.md
+++ b/website/docs/deploy/access.md
@@ -1,4 +1,8 @@
-# Accessing Stratos
+---
+id: access
+title: Accessing Stratos
+sidebar_label: Accessing Stratos 
+---
 
 Depending on the deployment mode, you may require access to an UAA. Stratos also has the option to configure a local user account which removes the need for a UAA in non-Cloud Foundry deployments.
 
diff --git a/deploy/all-in-one/README.md b/website/docs/deploy/all-in-one.md
similarity index 91%
rename from deploy/all-in-one/README.md
rename to website/docs/deploy/all-in-one.md
index a9d392934e..a8a8024c80 100644
--- a/deploy/all-in-one/README.md
+++ b/website/docs/deploy/all-in-one.md
@@ -1,12 +1,26 @@
-# Deploying with the All-In-One Docker Container
+---
+id: all-in-one
+title: Deploying with the All-In-One Docker Container
+sidebar_label: Docker All-in-One
+---
 
 The all-in-one container sets up the Stratos components in a single container.
 
 ## Requirements:
 
-You will need to have installed Docker, see:
+You will need to have installed Docker, see [Docker Installation Documentation](https://docs.docker.com/engine/installation/).
 
-* [Docker](https://docs.docker.com/engine/installation/)
+## Quick Start
+
+Run Stratos in Docker locally:
+
+```
+$ docker run -p 4443:443 splatform/stratos:latest 
+```
+
+Once that has finished, you can then access Stratos by visiting [https://localhost:4443](https://localhost:4443).
+
+You can configure a local admin account and set the password for future logins.
 
 ## Note regarding the Stratos Session Store Secret
 
diff --git a/website/docs/deploy/cloud-foundry/cf-troubleshooting.md b/website/docs/deploy/cloud-foundry/cf-troubleshooting.md
new file mode 100644
index 0000000000..c1b0f3ce71
--- /dev/null
+++ b/website/docs/deploy/cloud-foundry/cf-troubleshooting.md
@@ -0,0 +1,157 @@
+---
+title: Troubleshooting Cloud Foundry Deployment
+sidebar_label: Troubleshooting
+---
+
+## Creating logs for recent deployments
+To create a log file of the push
+```
+cf push | tee cfpush.log
+```
+
+To create a log file of recent console output
+```
+cf logs console --recent | tee cfconsole.log
+```
+>**NOTE** If the name of the application has been changed from `console` in the manifest file please also change the name in the logs statement
+
+## Turning on backend debugging logs
+
+The `LOG_LEVEL` environment variable controls the backend logs 
+
+```
+cf set-env console LOG_LEVEL debug 
+cf restart console
+cf logs console
+```
+
+would output more debugging output such as
+
+```
+  2018-10-24T14:47:36.91+0200 [RTR/1] OUT console.my.domain - [2018-10-24T12:47:36.850+0000] "GET /pp/v1/-o1F0L956QhAIK7R56Uc1lMh5L4/apps/3ddc0bc6-a645-4449-9d1b-6fe86146cf61/ssh/0 HTTP/1.1" 500 0 0 "-" "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:60.0) Gecko/20100101 Firefox/60.0" "10.228.194.8:42182" "192.168.35.91:61044" x_forwarded_for:"10.228.194.8" x_forwarded_proto:"https" vcap_request_id:"182dddeb-d877-4d58-45f7-0bd886d1caf6" response_time:0.066925325 app_id:"0ba408ef-d0e6-4ab8-96bb-0bc078b8d8fb" app_index:"0" x_b3_traceid:"d166622a0d612fea" x_b3_spanid:"d166622a0d612fea" x_b3_parentspanid:"-"
+   2018-10-24T14:47:36.91+0200 [RTR/1] OUT 
+   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] sessionCleanupMiddleware                     
+   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] errorLoggingMiddleware                       
+   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT INFO[Wed Oct 24 12:47:36 UTC 2018] Not redirecting this request                 
+   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] getSession                                   
+   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] getSessionValue                              
+   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] getSession                                   
+   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] setStaticContentHeadersMiddleware            
+   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] urlCheckMiddleware                           
+   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] sessionMiddleware                            
+   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] getSessionValue                              
+   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] getSession                                   
+   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] xsrfMiddleware                               
+   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] GetCNSIRecord                                
+   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] Find                                         
+   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] decryptToken                                 
+   2018-10-24T14:47:36.85+0200 [APP/PROC/WEB/0] OUT DEBU[Wed Oct 24 12:47:36 UTC 2018] Decrypt                                      
+   [...]
+```
+
+## Application Security Groups
+
+If you have problems when deploying Stratos as a Cloud Foundry application, check that the Application Security Group you have will allow Stratos to communicate with the Cloud Foundry API.
+
+For information on the default ASGs, see [here](https://docs.cloudfoundry.org/concepts/asg.html#default-asg).
+
+To configure a new ASG for the organization and space that are using Stratos, first create a new ASG definition, for example:
+
+```
+[
+   {
+      "destination":"0.0.0.0-255.255.255.255",
+      "protocol":"all"
+   }
+]
+```
+
+Save this to a file, e.g. `my-asg.json`.
+
+> Note: this allows example all network traffic on all IP ranges - we don't recommend using this.
+
+Unbind the existing ASG for you organization (`ORG`) and space (`SPACE`) with:
+
+```
+cf unbind-security-group public_networks ORG SPACE
+```
+
+Create a new ASG using the definition you saved to a file and give it a name, with:
+
+```
+cf create-security-group NAME my-asg.json
+```
+
+Bind this ASG to your `ORG` and `SPACE` with:
+
+```
+cf bind-security-group NAME ORG SPACE
+```
+
+
+## Console fails to start
+
+The Stratos Console will automatically detect the API endpoint for your Cloud Foundry. To do so, it relies on the `cf_api` value inside the `VCAP_APPLICATION` environment variable.
+To check if the variable is present, use the CF CLI to list environment variables, and inspect the `VCAP_APPLICATION` variable under `System-Provided`.
+
+```
+$ cf env console
+Getting env variables for app console in org SUSE / space dev as admin...
+OK
+
+System-Provided:
+
+
+ {
+  "VCAP_APPLICATION": {
+   "application_id": ...,
+   "application_name": "console",
+   "application_uris": ...
+   "application_version": ...,
+   "cf_api": "http://api.cf-dev.io",
+   ...
+ }
+
+ No user-defined env variables have been set
+ ...
+```
+
+If the `cf_api` environment variable is absent then set the `CF_API_URL` variable. See the following _Setting the `CF_API_URL` env variable in the manifest_ section.
+
+
+However, if the `cf_api` environment variable is present, and an HTTP address is specified, it is possible that insecure traffic may be blocked. See the following _Setting the `CF_API_FORCE_SECURE` env variable in the manifest_ section.
+
+
+#### Setting the `CF_API_URL` env variable in the manifest
+
+To specify the Cloud Foundry API endpoint, add the `CF_API_URL` variable to the manifest, for example:
+
+```
+applications:
+- name: console
+  memory: 256M
+  disk_quota: 256M
+  host: console
+  timeout: 180
+  buildpack: https://github.com/cloudfoundry/stratos-buildpack
+  health-check-type: port
+  env:
+    CF_API_URL: https://<<CLOUD FOUNDRY API ENDPOINT>>>
+```
+
+#### Setting the `CF_API_FORCE_SECURE` env variable in the manifest
+
+To force the console to use secured communication with the Cloud Foundry API endpoint (HTTPS rather than HTTP), specify the `CF_API_FORCE_SECURE` environment in the manifest, for example:
+
+```
+applications:
+- name: console
+  memory: 256M
+  disk_quota: 256M
+  host: console
+  timeout: 180
+  buildpack: https://github.com/cloudfoundry/stratos-buildpack
+  health-check-type: port
+  env:
+    CF_API_FORCE_SECURE: true
+```
diff --git a/website/docs/deploy/cloud-foundry/cloud-foundry.md b/website/docs/deploy/cloud-foundry/cloud-foundry.md
new file mode 100644
index 0000000000..1f876ced45
--- /dev/null
+++ b/website/docs/deploy/cloud-foundry/cloud-foundry.md
@@ -0,0 +1,162 @@
+---
+id: cloud-foundry
+title: Deploying as a Cloud Foundry Application
+sidebar_label: Deploy on Cloud Foundry 
+---
+
+## Deployment Steps
+
+Stratos can be pushed as an application to Cloud Foundry. 
+
+You can do it in two ways:
+
+1. [Deploy Stratos from source](#deploy-stratos-from-source)
+1. [Deploy Stratos from docker image](#deploy-stratos-from-docker-image)
+
+You will then be able to open a web browser and navigate to the console URL:
+
+`https://console.<DOMAIN>`
+
+Where `<DOMAIN>` is the default domain configured for your Cloud Foundry cluster.
+
+To login use the following credentials detailed [here](../access).
+
+If you run into issues, please refer to the [Troubleshooting Guide](cf-troubleshooting) below.
+
+> The console will pre-configure the host Cloud Foundry endpoint. No other CF instance should be registered unless the instructions in
+ the section [Associate Cloud Foundry database service](#associate-cloud-foundry-database-service) are followed.
+ All other deployment methods (helm, docker all-in-one, etc) allow the registration of multiple CF instances by default.
+
+Note:
+
+1. You need the cf CLI command line tool installed and available on the path.
+1. You need to have configured the cf cli to point to your Cloud Foundry cluster, to be authenticated with your credentials and to be targeted at the organization and space where you want the console application be created.
+1. You may need to configure Application Security Groups on your Cloud Foundry Cluster in order that  Stratos can communicate with the Cloud Foundry API. See [below](#application-security-groups) for more information.
+1. The Stratos Console will automatically detect the API endpoint for your Cloud Foundry. To do so, it relies on the `cf_api_url` value inside the `VCAP_APPLICATION` environment variable. If this is not provided by your Cloud Foundry platform, then you must manually update the application manifest as described [below](#console-fails-to-start).
+
+### Running Stratos in Production Environments
+
+Please be aware of the following when running Stratos in a production environment:
+
+#### Configure a Session Store Secret
+
+Stratos uses a Session Store Secret to protect the user session cookie. We recommend that you set your own value for this secret - choosing an alphanumeric string of your choice.
+
+You can configure this secret by editing the application manifest and adding to the `env` section, e.g.
+
+```
+applications:
+- name: console
+  ... memory, disk settings here
+  env:
+    SESSION_STORE_SECRET: <your session store secret here>
+```
+
+#### Pre-configure UAA client used for user invites
+
+> You can skip this step and configure any CFs invite clients via the Stratos UI.
+
+ To set the UAA client for user invites, supply the client id and client secret as environment variables as shown below:
+
+  ```
+  INVITE_USER_CLIENT_ID=<UAA_CLIENT_ID>
+  INVITE_USER_CLIENT_SECRET=<UAA_CLIENT_SECRET>
+  ```
+
+This will set the the UAA client and UAA secret used to invite users for the default CF only.
+
+See the [invite users guide](../guides/admin/invite-user-guide) for more information about user invites in Stratos.
+
+#### Use of the Default Embedded SQLite Database
+
+We do not recommend deploying Stratos to a production environment using the default embedded SQLite Database. Instead we recommend creating
+and binding a database service instance to Stratos - for more information see [here](db-migration).
+
+### Deploy Stratos from source
+
+To do so, `clone` the **stratos** repository, `cd` into the newly cloned repository and `push` to Cloud Foundry. This can be done with:
+
+```
+git clone https://github.com/cloudfoundry/stratos
+cd stratos
+git checkout tags/stable -b stable
+./build/store-git-metadata.sh
+cf push
+```
+
+If the cf push exceeds the time allowed see the instructions [here](#pre-building-the-ui)
+
+#### Pre-building the UI
+
+Due to the memory usage of the Angular compiler (see below), when deployed to Cloud Foundry via `cf push`, Stratos does not use AOT (Ahead-of-Time) compilation.
+
+If you wish to enable AOT or reduce the push time, you can pre-build the UI before pushing.
+
+This can be done with:
+
+```
+git clone https://github.com/cloudfoundry/stratos
+cd stratos
+npm install
+npm run prebuild-ui
+cf push
+```
+
+You will need a recent version of Node installed locally to do this.
+
+The `prebuild-ui` npm script performs a build of the front-end UI and then zips up the resulting folder into a package named `stratos-frontend-prebuild.zip`. The Stratos buildpack will unpack this zip file and use its contents instead of building the UI during staging, when this file is present.
+
+
+#### Memory Usage
+
+The Stratos Cloud Foundry `manifest.yml` states that the application requires
+`1512MB` of memory. This is required during the build process of the
+application since building an angular2 app is a memory intensive process. The
+memory limit can be scaled down after the app has been pushed, using the cf CLI.
+
+### Deploy Stratos from docker image
+
+Deploy Stratos using the [`splatform/stratos`](https://hub.docker.com/r/splatform/stratos) docker image
+
+> **NOTE:** Your Cloud Foundry must have docker support [enabled](https://docs.cloudfoundry.org/adminguide/docker.html#enable).
+
+```
+cf push console -o splatform/stratos:stable -m 128M -k 384M
+```
+> Note: You can replace `console` in the command above with a name of your choice for the application
+
+Alternatively cf push using a manifest
+
+- download [manifest-docker.yml](../../../manifest-docker.yml) or create your own manifest file:
+    ```yaml
+    applications:
+    - name: console
+      docker:
+        image: splatform/stratos:stable
+      instances: 1
+      memory: 128M
+      disk_quota: 384M
+    ```
+- now, you can simply push it to Cloud Foundry:
+    ```
+    cf push -f manifest-docker.yml
+    ```
+
+## Associate Cloud Foundry database service
+Follow instructions [here](db-migration).
+
+## Use SSO Login
+
+By default Stratos will present its own login UI and only supports username and password authentication with your UAA. You can configure Stratos to use UAA's login UI by specifying the  the `SSO_LOGIN` environment variable in the manifest, for example:
+
+```
+applications:
+- name: console
+  ... memory, disk settings here
+  env:
+    SSO_LOGIN: true
+```
+
+When SSO Login is enabled, Stratos will also auto-connect to the Cloud Foundry it is deployed in using the token obtained during the SSO Login flow.
+
+For more information - see [Single-Sign On](../../advanced/sso).
diff --git a/deploy/cloud-foundry/db-migration/README.md b/website/docs/deploy/cloud-foundry/db-migration.md
similarity index 90%
rename from deploy/cloud-foundry/db-migration/README.md
rename to website/docs/deploy/cloud-foundry/db-migration.md
index 281b5f9352..98cd856928 100644
--- a/deploy/cloud-foundry/db-migration/README.md
+++ b/website/docs/deploy/cloud-foundry/db-migration.md
@@ -1,6 +1,10 @@
-# Associate a Cloud Foundry database service
+---
+id: db-migration
+title: Associate a Cloud Foundry database service
+sidebar_label: Database service bindings
+---
 
-As described in the standard `cf push` instructions [here](../README.md) Stratos, when deployed via `cf push`,
+As described in the standard `cf push` instructions [here](cloud-foundry) Stratos, when deployed via `cf push`,
 does not contain any way to persist data over application restarts and db entries such as registered endpoints
 and user tokens are lost. To resolve this a Cloud Foundry db service can be bound to to it. Run through
 the steps below to implement.
diff --git a/deploy/kubernetes/README.md b/website/docs/deploy/kubernetes.md
similarity index 80%
rename from deploy/kubernetes/README.md
rename to website/docs/deploy/kubernetes.md
index 6d8d583560..55ed9cfeb2 100644
--- a/deploy/kubernetes/README.md
+++ b/website/docs/deploy/kubernetes.md
@@ -1,4 +1,8 @@
-# Deploying in Kubernetes
+---
+id: kubernetes
+title: Deploying in Kubernetes
+sidebar_label: Overview 
+---
 
 Stratos can be deployed to Kubernetes using [Helm](https://github.com/kubernetes/helm).
 
@@ -12,4 +16,4 @@ You will need to have both the `kubectl` and `helm` CLIs installed and available
 
 The Stratos Helm chart contains a `README.md` file that contains installation instructions and configuration documentation.
 
-This document is also available in our GitHub repository here: [README.md](https://github.com/cloudfoundry/stratos/blob/master/deploy/kubernetes/console/README.md).
+This document is also available in [here](kubernetes/helm-installation).
diff --git a/website/docs/deploy/kubernetes/install.md b/website/docs/deploy/kubernetes/install.md
new file mode 100644
index 0000000000..fad7b188d4
--- /dev/null
+++ b/website/docs/deploy/kubernetes/install.md
@@ -0,0 +1,413 @@
+---
+id: helm-installation
+title: Deploying Using Helm
+sidebar_label: Deploy using Helm 
+---
+
+Stratos is an Open Source Web-based Management console for Cloud Foundry. It allows users and administrators to both manage applications running in the Cloud Foundry cluster and perform cluster management tasks.
+
+## Installation
+
+Stratos can be installed to a Kubernetes cluster using Helm. Either Helm 2 or Helm 3 can be used, although we recommend using the newer Helm 3 version.
+
+Ensure the [Helm](https://github.com/helm/helm) client and [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) CLIs are installed. If you are using Helm 2, ensure you've initialized Tiller into your cluster with the appropriate
+Service Account.
+
+The Helm chart is published to the Stratos Helm repository.
+
+You will need to have the Stratos Helm repository added to your Helm setup, if you do not, run:
+
+```
+helm repo add stratos https://cloudfoundry.github.io/stratos
+```
+
+Check the repository was successfully added by searching for the `console`, for example:
+
+```
+helm search repo console
+NAME               	CHART VERSION   APP VERSION	DESCRIPTION                                  
+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
+
+> 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:
+
+```
+kubectl create namespace console
+helm install my-console stratos/console --namespace=console
+```
+
+> **Note**: The first `kubectl` command will create a namespace for Stratos. With Helm 3 you must create a namespace before installing.
+We recommend installing Stratos into a separate namespace.
+
+> **Note**: This assumes that a storage class exists in the Kubernetes cluster that has been marked as `default`. If no such storage class exists, a specific storage class needs to be specified, please see the following section *Specifying a custom Storage Class*. 
+
+> You can change the namespace (--namespace) and the release name to values of your choice.
+
+This will create a Stratos instance named `my-console` in a namespace called `console` in your Kubernetes cluster.
+
+After the install, you should be able to access the Console in a web browser by following [the instructions](#accessing-the-console) below.
+
+Advanced installation topics are covered in the the [Advanced Topics](#advanced-topics) section below.
+
+# Helm Chart Configuration
+
+The following table lists the configurable parameters of the Stratos Helm chart and their default values.
+
+|Parameter|Description|Default|
+|---|---|---|
+|imagePullPolicy|Image pull policy|IfNotPresent|
+|console.sessionStoreSecret|Secret to use when encrypting session tokens|auto-generated random value|
+|console.ssoLogin|Whether to enable SSO Login and use the UAA Login UI instead of the built-in one|false|
+|console.backendLogLevel|Log level for backend (info, debug)|info|
+|console.service.externalIPs|External IPs to add to the console service|[]|
+|console.service.loadBalancerIP|IP address to assign to the load balancer for the metrics service (if supported)||
+|console.service.loadBalancerSourceRanges|List of IP CIDRs allowed access to load balancer (if supported)|[]|
+|console.service.type|Service type for the console (ClusterIP, NodePort, LoadBalancer, ExternalName etc)|ClusterIP|
+|console.service.servicePort|Service port for the console service|443|
+|console.service.externalName|External name for the console service when service type is ExternalName||
+|console.service.nodePort|Node port to use for the console service when service type is NodePort or LoadBalancer||
+|console.ingress.enabled|Enable ingress for the console service|false|
+|console.ingress.host|Host for the ingress resource|||
+|console.ingress.secretName|Name of an existing secret containing the TLS certificate for ingress|||
+|console.service.http.enabled|Enabled HTTP access to the console service (as well as HTTPS)|false|
+|console.service.http.servicePort|Service port for HTTP access to the console service when enabled|80|
+|console.service.http.nodePort|Node port for HTTP access to the console service (as well as HTTPS)||
+|console.templatesConfigMapName|Name of config map that provides the template files for user invitation emails||
+|console.userInviteSubject|Email subject of the user invitation message||
+|console.techPreview|Enable/disable Tech Preview features|false|
+|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||
+|console.ui.listAllowLoadMaxed|If the maximum list size is met give the user the option to fetch all results|false|
+|console.localAdminPassword|Use local admin user instead of UAA - set to a password to enable||
+|console.tlsSecretName|Secret containing TLS certificate to use for the Console||
+|console.mariadb.external|Use an external database instead of the built-in MariaDB|false|
+|console.mariadb.database|Name of the database to use|console|
+|console.mariadb.user|Name of the user for accessing the database|console|
+|console.mariadb.userPassword|Password of the user for accessing the database. Leave blank for the built-in database to generate a random password||
+|console.mariadb.rootPassword|Password of the root user for accessing the database. Leave blank for the built-in database to generate a random password||
+|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|
+|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||
+|env.SMTP_PASSWORD|Password to use for authentication when Sending User Invite emails||
+|env.SMTP_HOST|Server host address to use for authentication when Sending User Invite emails||
+|env.SMTP_PORT|Server port to use for authentication when Sending User Invite emails||
+|kube.auth|Set to "rbac" if the Kubernetes cluster supports Role-based access control|"rbac"|
+|kube.organization|Registry organization to use when pulling images||
+|kube.registry.hostname|Hostname of registry to use when pulling images|docker.io|
+|kube.registry.username|Username to use when pulling images from the registry||
+|kube.registry.password|Password to use when pulling images from the registry||
+|console.podAnnotations|Annotations to be added to all pod resources||
+|console.podExtraLabels|Additional labels to be added to all pod resources||
+|console.statefulSetAnnotations|Annotations to be added to all statefulset resources||
+|console.statefulSetExtraLabels|Additional labels to be added to all statefulset resources||
+|console.deploymentAnnotations|Annotations to be added to all deployment resources||
+|console.deploymentExtraLabels|Additional labels to be added to all deployment resources||
+|console.jobAnnotations|Annotations to be added to all job resources||
+|console.jobExtraLabels|Additional labels to be added to all job resources||
+|console.service.annotations|Annotations to be added to all service resources||
+|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
+
+To check the status of the instance use the following command:
+
+```
+helm status my-console
+```
+
+> Note: Replace `my-console` with the value you used for the `name` parameter, or if you did not provide one, use the `helm list` command to find the release name that was automatically generated for you.
+
+The console is exposed via an HTTPS service - `RELEASE-NAME-ui-ext` (where RELEASE-NAME is the name used for the `name` parameter when installing). You can find the details of this service with:
+
+```
+kubectl get services -n NAMESPACE
+NAME                 TYPE        CLUSTER-IP      EXTERNAL-IP   PORT(S)         AGE
+my-console-mariadb   ClusterIP   10.105.216.25   <none>        3306/TCP        60s
+my-console-ui-ext    NodePort    10.109.207.70   <none>        443:31067/TCP   60s
+```
+
+> In this example, Stratos has been deployed withe the service configured as `NodePort`.
+
+The URL you use for accessing Stratos will depend on the service configuration and the environment that you have used.
+
+> Note: If you did not provide a certificate when installing, Stratos will use a self-signed certificate, so you will see a certificate warning which you access Stratos in a browser.
+
+# Upgrading your deployment
+
+To upgrade your instance when using the Helm repository, fetch any updates to the repository:
+
+```
+helm repo update
+```
+
+To update an instance, the following assumes your instance is called `my-console`:
+
+```
+helm upgrade my-console stratos/console
+```
+
+After the upgrade, perform a `helm list` to ensure your console is the latest version.
+
+## Uninstalling
+
+To uninstall Stratos, delete the Helm release and also delete the Kubernetes namespace:
+
+```
+helm delete my-console --purge
+kubectl delete namespace console
+```
+
+> Note: Stratos creates secrets in the namespace as part of an initialization job. These are not managed by Helm, so make sure you
+delete the namespace to remove these secrets. 
+
+# Advanced Topics
+
+## Using a Load Balancer
+
+If your Kubernetes deployment supports automatic configuration of a load balancer (e.g. Google Container Engine), specify the parameters `console.service.type=LoadBalancer` when installing.
+
+
+```
+kubectl create namespace console
+helm install my-console stratos/console --namespace=console --set console.service.type=LoadBalancer
+```
+
+## Using an Ingress Controller
+
+If your Kubernetes Cluster supports Ingress, you can expose Stratos through Ingress by supplying the appropriate ingress configuration when installing.
+
+This configuration is described below:
+
+|Parameter|Description|Default|
+|----|---|---|
+|console.service.ingress.enabled|Enables ingress|false|
+|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.service.ingress.host|The host name that will be used for the Stratos service.||
+|console.service.ingress.secretName|The existing TLS secret that contains the certificate for ingress.||
+
+You must provide `console.service.ingress.host` when enabling ingress.
+
+By default a certificate will be generated for TLS. You can provide your own certificate by creating a secret and specifying this with `console.service.ingress.secretName`.
+
+> Note: If you do not supply `console.service.ingress.host` but do supply `env.DOMAIN` then the host `console.[env.DOMAIN]` will be used.
+
+## Deploying from a Private Image Repository
+
+If the images used by the chart are hosted in a private repository, the following needs to be specified. Save the following to a file called `private_overrides.yaml`. Replace `REGISTRY USER PASSSWORD`, `REGISTRY USERNAME`, `REGISTRY URL` with the appropriate values. `USER EMAIL` can be left blank.
+
+```
+kube:
+  registry:
+    password: <REGISTRY USER PASSWORD>
+    username: <REGISTRY USERNAME>
+    hostname: <REGISTRY URL>
+    email: <USER EMAIL or leave blank>
+```
+
+Deploy with:
+
+```
+kubectl create namespace console
+helm install my-console stratos/console --namespace=console -f private_overrides.yaml
+```
+
+## Deploying with your own TLS certificates
+
+By default the console will generate self-signed certificates for demo purposes. To configure Stratos to use your provided TLS certificate, create a TLS secret in the namespace you are installing into and specify this secret name using the helm chart value `console.tlsSecretName` when installing.
+
+Assuming you have your certificate and key in the files `tls.crt` and `tls.key`, create the secret with:
+
+```
+kubectl create secret tls -n NAMESPACE stratos-tls-secret --cert=tls.crt --key=tls.key
+```
+
+> Where `NAMESPACE` is the namespace you are installing Stratos into - you will need to manually create the namespace first if it does not already exist.
+
+You can now install Stratos with:
+
+```
+kubectl create namespace console
+helm install my-console stratos/console --namespace=console --set console.tlsSecretName=stratos-tls-secret
+
+```
+
+## Using an External Database
+
+You can choose to use Stratos with an external database, rather than deploying a single-node MariaDB instance as part of the Helm install.
+
+To do so, specify `console.mariabdb.external=true` when deploying.
+
+You will also need to specify:
+
+- `console.mariadb.host` as the hostname of the external MariaDB database server
+- `console.mariadb.port` as the port of the external MariaDB database server (defaults to 3306)
+- `console.mariadb.tls` as the TLS mode (default is `false,` use `true` for a TLS connection to the database server)
+- `console.mariadb.database` as the name of the database
+- `console.mariadb.user` as the username to connect to the database server
+- `console.mariadb.userPassword` as the password to connect to the database server
+
+When using an external database server, Stratos expects that you have:
+
+- Created a user that will be used to access the database
+- Created a database for the Stratos tables and data
+- Granted appropriate permissions so that the user can access the database
+
+> Note: When using a database from a Cloud provider, ensure that the username is correct - in some cases this will be `username@servername` - check the provided connection documentation
+
+## Specifying UAA configuration
+
+When deploying with SCF, the `scf-config-values.yaml` (see [SCF Wiki link](https://github.com/SUSE/scf/wiki/How-to-Install-SCF#configuring-the-deployment)) can be supplied when installing Stratos.
+
+```
+kubectl create namespace console
+helm install my-console stratos/console --namespace=console -f scf-config-values.yaml
+```
+
+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:
+  endpoint: https://uaa.cf-dev.io:2793
+  consoleClient:  cf
+  consoleClientSecret: 
+  consoleAdminIdentifier: cloud_controller.admin 
+  skipSSLValidation: false
+```
+
+To install Stratos with the above specified configuration:
+
+```
+kubectl create namespace console
+helm install my-console stratos/console --namespace=console -f uaa-config.yaml
+```
+
+## Configuring a local user account
+
+This allows for deployment without a UAA. To enable the local user account, supply a password for the local user in the deployment command, as follows. All other steps for each deployment method should be followed as in the preceding sections above.
+
+To deploy using our Helm repository:
+
+```
+kubectl create namespace console
+helm install my-console stratos/console --namespace=console --set console.localAdminPassword=<password>
+```
+
+## Specifying Annotations and Labels
+
+In some scenarios it is useful to be able to add custom annotations and/or labels to the Kubernetes resources that the Stratos Helm chart creates.
+
+The Stratos Helm chart exposes a number of Helm chart values that cabe specified in order to do this - they are:
+
+|Parameter|Description|Default|
+|----|---|---|
+|console.podAnnotations|Annotations to be added to all pod resources||
+|console.podExtraLabels|Additional labels to be added to all pod resources||
+|console.statefulSetAnnotations|Annotations to be added to all statefulset resources|
+|console.statefulSetExtraLabels|Additional labels to be added to all statefulset resources||
+|console.deploymentAnnotations|Annotations to be added to all deployment resources||
+|console.deploymentExtraLabels|Additional labels to be added to all deployment resources||
+|console.jobAnnotations|Annotations to be added to all job resources||
+|console.jobExtraLabels|Additional labels to be added to all job resources||
+|console.service.annotations|Annotations to be added to all service resources||
+|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||
+
+## Requirements
+
+### Storage Class
+
+Stratos uses persistent volumes. In order to deploy it in your Kubernetes environment, you must
+have a storage class available.
+
+Without configuration, the Stratos Helm Chart will use the default storage class. If a default storage
+class is not available, installation will fail.
+
+To check if a `default` storage class exists, you can list your configured storage classes with `kubectl get storageclass`. If no storage class has `(default)` after it, then you need to either specify a storage class override or declare a default storage class for your Kubernetes cluster.
+
+For non-production environments, you may want to use the `hostpath` storage class. See the [SCF instructions](https://github.com/SUSE/scf/wiki/How-to-Install-SCF#choosing-a-storage-class) for details on setting this up. Note that you will need to make this storage class the default storage class, e.g.
+
+```
+kubectl patch storageclass <your-class-name> -p '{"metadata": {"annotations":{"storageclass.kubernetes.io/is-default-class":"true"}}}'
+```
+
+Where `<your-class-name>` would be `hostpath` if you follow the SCF instructions.
+
+
+### Specifying a custom Storage Class 
+
+If no default storage class has been defined in the Kubernetes cluster. The Stratos helm chart will fail to deploy successfully. To check if a `default` storage class exists, you can list your configured storage classes with `kubectl`. If no storage class has `(default)` after it, then you need to either specify a storage class override or declare a default storage class for your Kubernetes cluster.
+
+#### Providing Storage Class override
+```
+kubectl get storageclass
+NAME                TYPE
+ssd                 kubernetes.io/host-path   
+persistent          kubernetes.io/host-path   
+```
+
+For instance to use the storage class `persistent` to deploy Console persistent volume claims, store the following to a file called `override.yaml`.
+
+```
+---
+storageClass: persistent
+```
+
+If you want MariaDB to use a specific storage class (which can be different to that used for the other components), then specify the following:
+```
+---
+storageClass: persistent
+mariadb:
+  persistence:
+    storageClass: persistent
+```
+
+Run Helm with the override:
+
+```
+kubectl create namespace console
+helm install my-console stratos/console --namespace=console -f override.yaml
+```
+
+#### Create a default Storage Class
+
+Alternatively, you can configure a storage class with `storageclass.kubernetes.io/is-default-class` set to `true`. For instance the following storage class will be declared as the default. If you don't have the `hostpath` provisioner available in your local cluster, please follow the instructions on [link](https://github.com/kubernetes-incubator/external-storage/tree/master/docs/demo/hostpath-provisioner), to deploy one.
+
+If the hostpath provisioner is available, save the file to `storageclass.yaml`
+
+```
+---
+kind: StorageClass
+apiVersion: storage.k8s.io/v1beta1
+metadata:
+  name: default
+  annotations:
+    storageclass.kubernetes.io/is-default-class: "true"
+provisioner: kubernetes.io/host-path # Or whatever the local hostpath provisioner is called
+```
+
+To create it in your kubernetes cluster, execute the following.
+
+```
+kubectl create -f storageclass.yaml
+```
+
+See [Storage Class documentation](https://kubernetes.io/docs/tasks/administer-cluster/change-default-storage-class/) for more information.
diff --git a/website/docs/deploy/overview.md b/website/docs/deploy/overview.md
new file mode 100644
index 0000000000..f3bf6e39d8
--- /dev/null
+++ b/website/docs/deploy/overview.md
@@ -0,0 +1,44 @@
+---
+id: overview
+title: Deploying Stratos
+sidebar_label: Overview
+---
+
+Stratos can be deployed in the following environments:
+
+1. Cloud Foundry, as an application. See [guide](cloud-foundry/cloud-foundry)
+2. Kubernetes, using a Helm chart. See [guide](kubernetes)
+3. Docker, single container deploying all components. See [guide](all-in-one)
+
+> Note: that not all features are enabled in every environment - the Kubernetes deployment supports all features, but Cloud Foundry and Docker deployments do not support some features.
+
+> Note: Some features are marked as 'Tech Preview' and are only available if tech preview features are enabled when deploying.
+
+## Deployed in Cloud Foundry as an application
+
+In this case, Stratos is deployed in a manner optimized for the management of a single Cloud Foundry instance. The 'Endpoints Dashboard' that allows multiple Cloud Foundry endpoints to be registered is not deployed. An extra component is deployed that detects that the Console is running as Cloud Foundry which does the following:
+
+- Automatically detects the Cloud Foundry endpoint and located the UAA Endpoint to use for authentication
+- Authenticates directly against the UAA for the Clound Foundry where the Console is deployed and assumes that Cloud Foundry admins are also Console admins (the UAA Scope 'cloud_controller.admin' is used to identify admins)
+- Uses a SQLite database rather than Postgres
+- Automatically connects to the Cloud Foundry endpoint when a user logs in to simplify the user flow when using the Console in this case
+
+In this case, the front-end web application static resources are served by the API Server back-end rather than a separate web server.
+
+By defaut, a non-persistent SQLite database is used - by automatically registering the cloud foundry endpoint and connecting to it on login, all data stored in the database can be treated as ephimeral, since it will be re-created next time a user logs in. Cloud Foundry Session Affinity is used to ensure that when scaling up the Console Application to multiple instances, the user is also directed to the instance which will know about them and their endpoints (since each Application instance will have its own local SQLite store).
+
+Alternatively, Stratos can be configured [with a persistent Cloud Foundry database service](cloud-foundry/db-migration), which enables features requiring persistence such as user favorites.
+
+## Deployed in Kubernetes
+
+In this case, a Helm chart is used to deploy the Console into a Kubernetes environment.
+
+At the outer-level there are two services - the external service that provides the Console itself and a private service that provides a Postgres DB to the Console service.
+
+The Console service is provided by a deployment consisting of two containers, one providing the static front-end web application resources, served by an nginx instance, the other providing the API Server back-end.
+
+## Deployed in Docker using a single container
+
+In this case, a single Docker image is run in a container that hosts all services together. SQLite is used as the database, so any endpoint metadata registered is lost when the container is destroyed.
+
+This deployment is recommended only for trying out the Console and for development.
diff --git a/docs/troubleshooting.md b/website/docs/deploy/troubleshooting.md
similarity index 78%
rename from docs/troubleshooting.md
rename to website/docs/deploy/troubleshooting.md
index 138d8f7aec..c40f7065da 100644
--- a/docs/troubleshooting.md
+++ b/website/docs/deploy/troubleshooting.md
@@ -1,7 +1,11 @@
-# Troubleshooting
+---
+id: troubleshooting
+title: General Troubleshooting
+sidebar_label: Troubleshooting 
+---
 
 ## Deploying as a Cloud Foundry Application
-See the custom troubleshooting guide [here](../deploy/cloud-foundry#troubleshooting).
+See the custom troubleshooting guide [here](cloud-foundry/cf-troubleshooting).
 
 ## Usernames appear as long random characters when connected to IBM Cloud
 
diff --git a/website/docs/developer/backend.md b/website/docs/developer/backend.md
new file mode 100644
index 0000000000..d8b2e7bc15
--- /dev/null
+++ b/website/docs/developer/backend.md
@@ -0,0 +1,124 @@
+---
+title: Backend Development
+sidebar_label: Overview
+---
+
+Jetstream is the back-end for Stratos. It is written in Go.
+
+We use Go Modules for dependency management.
+
+### Pre-requisites
+
+You will need the following installed/available:
+
+* go 1.12 or later.
+
+*For authentication, **either***
+
+* A UAA instance
+* A local user account 
+
+### Building the back-end
+
+
+#### Build
+
+From the `src/jetstream` folder, build the Stratos back-end with:
+
+```
+npm run build-backend
+```
+
+The back-end executable is named `jetstream` and should be created within the `src/jetstream` folder.
+
+### Configuration
+
+Configuration can either be done via
+- Environment Variable and/or Config File
+- In the UI when you first use a front end with this backend
+
+In all cases the configuration is saved to the database on first run. Any subsequent changes require the db to be reset. For the default sqlite
+db provider this can be done by deleting `src/jetstream/console-database.db`
+
+#### Configure by Environment Variables and/or Config File
+
+By default, the configuration in file `./src/jetstream/config.dev` will be used. These can be changed by environment variables
+or an overrides file.
+
+##### Environment variable
+
+If you wish to use a local user account, ensure you have set the following environment variables:
+
+- `AUTH_ENDPOINT_TYPE=local`
+- `LOCAL_USER` - The username for the local user
+- `LOCAL_USER_PASSWORD` - The password for the local user
+- `LOCAL_USER_SCOPE=stratos.admin` - This gives the local user admin permissions. Currently other roles are not available.
+
+If you have a custom uaa, ensure you have set the following environment variables:
+
+- `UAA_ENDPOINT`- the URL of your UAA
+  - If you have an existing CF and want to use the same UAA use the `authorization_endpoint` value from `[cf url]/v2/info`
+    For example for PCF Dev, use: `UAA_ENDPOINT=https://login.local.pcfdev.io`.
+- `CONSOLE_CLIENT` - the Client ID to use when authenticating against your UAA (defaults to: 'cf')
+- `CONSOLE_CLIENT_SECRET` - the Client ID to use when authenticating against your UAA (defaults to empty)
+- `CONSOLE_ADMIN_SCOPE` - an existing UAA scope that will be used to identify users as `Stratos Admins`
+
+> To use a pre-built Stratos UAA container execute `docker run --name=uaa --rm -p 8080:8080 -P splatform/stratos-uaa`. The UAA will be
+  available at `http://localhost:8080` with a `CONSOLE_CLIENT` value of `console`
+
+##### Config File
+
+To easily persist configuration settings copy `src/jetstream/config.dev` to `src/jetstream/config.properties`. The backend will load its
+configuration from this file in preference to the default config file, if it exists. You can also modify individual configuration settings
+by setting the corresponding environment variable.
+
+##### To configure a local user account via config file
+
+In `src/jetstream/config.properties` uncomment the following lines:
+
+```
+AUTH_ENDPOINT_TYPE=local
+LOCAL_USER=localuser
+LOCAL_USER_PASSWORD=localuserpass
+LOCAL_USER_SCOPE=stratos.admin
+```
+
+Load the Stratos UI and proceed to log in using the configured credentials.
+
+#### To configure UAA via Stratos
+
+1. Go through the `Config File` step above and comment out the `UAA_ENDPOINT` with a `#` in the new `config.properties` file.
+1. If any previous configuration attempt has been made reset your database as described above.
+1. Continue these steps from [Run](#run).
+   - You should see the line `Will add setup route and middleware` in the logs
+1. Load the Stratos UI as usual and you should be immediately directed to the setup wizard
+
+The setup wizard that allows you to enter the values normally fetched from environment variables or files. The UI will assist you through
+this process, validating that the UAA address and credentials are correct. It will also provide a list of possible scopes for the Stratos Admin
+
+#### Run
+
+Execute the following file from `src/jetstream`
+
+```
+./jetstream
+```
+
+You should see the log as the backend starts up. You can press CTRL+C to stop the backend.
+
+
+#### Automatically register and connect to an existing endpoint
+To automatically register a Cloud Foundry add the environment variable/config setting below:
+
+```
+AUTO_REG_CF_URL=<api url of cf>
+```
+
+Jetstream will then attempt to auto-connect to it with the credentials supplied when logging into Stratos.
+
+#### Running Jetstream in a container
+
+We recommend running Stratos using the Docker All-In-One image.
+
+* Follow instructions in the deploy/all-in-one docs
+
diff --git a/website/docs/developer/contributing.md b/website/docs/developer/contributing.md
new file mode 100644
index 0000000000..5c4df05a69
--- /dev/null
+++ b/website/docs/developer/contributing.md
@@ -0,0 +1,162 @@
+---
+title: Contributing
+sidebar_label: Contributing
+---
+
+
+Stratos is an open project and welcomes contributions. These guidelines are provided to help you understand how the project works and to make contributing smooth and fun for everybody involved.
+
+There are two main forms of contribution: reporting issues and performing code changes.
+
+## Reporting Issues
+
+If you find a problem with Stratos, report it using [GitHub issues](https://github.com/cloudfoundry/stratos/issues/new).
+
+Before reporting a new issue, please take a moment to check whether it has already been reported
+[here](https://github.com/cloudfoundry/stratos/issues). If this is the case, please:
+
+- Read all the comments to confirm that it's the same issue you're having.
+- Refrain from adding "same thing here" or "+1" comments. Just hit the
+  "subscribe" button to get notifications for this issue.
+- Add a comment only if you can provide helpful information that has not been
+  provided in the discussion yet.
+
+When creating a new issue, make sure you include:
+
+1. As much detail as possible about your setup/environment
+1. Steps to reproduce the issue/bug
+1. What you expected to happen
+1. What happened instead
+
+This information will help to determine the cause and prepare a fix as fast as possible.
+
+## Code Changes
+
+Code contributions come in various forms and sizes, from simple bug fixes to implementation
+of new features. Before making any non-trivial change, get in touch with the Stratos developers first. This can prevent wasted effort later.
+
+To send your code change, use GitHub pull requests. The workflow is as follows:
+
+  1. Fork the project.
+
+  1. Create a branch based on `master`.
+
+  1. Implement your change, including tests and documentation.
+
+  1. Run tests to make sure your change didn't break anything.
+
+  1. Publish the branch and create a pull request.
+
+  1. Stratos developers will review your change and possibly point out issues.
+     Adapt the code under their guidance until all issues are resolved.
+
+  1. Finally, the pull request will get merged or rejected.
+
+See also [GitHub's guide on contributing](https://help.github.com/articles/fork-a-repo).
+
+If you want to do multiple unrelated changes, use separate branches and pull
+requests.
+
+### Commits
+
+Each commit in the pull request should do only one thing, which is clearly
+described by its commit message. Especially avoid mixing formatting changes and
+functional changes into one commit. When writing commit messages, adhere to
+[widely used
+conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+
+When the commit fixes a bug, put a message in the body of the commit message
+pointing to the number of the issue (e.g. "Fixes #123").
+
+### Pull requests and branches
+
+All work happens in branches. The master branch is only used as the target for pull
+requests.
+
+During code review you often need to update pull requests. Usually you do that
+by pushing additional commits.
+
+In some cases where the commit history of a pull request gets too cumbersome to
+review or you need bigger changes in the way you approach a problem which needs
+changing of commits you already did it's more practical to create a new pull
+request. This new pull request often will contain squashed versions of the
+previous pull request. Use that to clarify the changes contained in a pull
+request and to make review easier.
+
+When you replace a pull request by another one, add a message in the
+description of the new pull request on GitHub referencing the pull request it
+replaces (e.g. "Supersedes #123").
+
+Never force push commits. This changes history, can lead to data loss, and
+causes trouble for people who have checked out the changes which are overwritten
+by a force push. Don't waste time with thinking about if the force push in this
+one particular case would be ok, just don't do it.
+
+### Check for assigned people
+
+We use Github Issues for submitting known issues (e.g. bugs, features,
+etc.). Some issues will have someone assigned, meaning that there's already
+someone that takes responsibility for fixing the issue. This is not done to
+discourage contributions, rather to not step in the work that has already been
+done by the assignee. If you want to work on a known issue with someone already
+assigned to it, please contact the assignee first (e.g. by
+mentioning the assignee in a new comment on the specific issue). This way you
+can contribute with ideas, or even with code if the assignee decides that you
+can step in.
+
+If you plan to work on a non assigned issue, please add a comment on the issue
+to prevent duplicated work.
+
+### Sign your work
+
+The sign-off is a simple line at the end of the explanation for the change. Your
+signature certifies that you wrote the change or otherwise have the right to pass
+it on as an open-source change. The rules are pretty simple: if you can certify
+the below (from [developercertificate.org](http://developercertificate.org/)):
+
+```
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+660 York Street, Suite 102,
+San Francisco, CA 94110 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.
+```
+
+Then you just add a line to each git commit message:
+
+    Signed-off-by: Joe Smith <joe.smith@email.com>
+
+Use your real name (sorry, no pseudonyms or anonymous contributions.)
+
+If you set your `user.name` and `user.email` git configs, you can sign your
+commit automatically with `git commit -s`.
diff --git a/docs/developers-guide-e2e-tests.md b/website/docs/developer/developers-guide-e2e-tests.md
similarity index 87%
rename from docs/developers-guide-e2e-tests.md
rename to website/docs/developer/developers-guide-e2e-tests.md
index dbac463428..03d17b1643 100644
--- a/docs/developers-guide-e2e-tests.md
+++ b/website/docs/developer/developers-guide-e2e-tests.md
@@ -1,4 +1,8 @@
-# E2E Tests
+---
+id: developers-guide-e2e-tests
+title: E2E Tests
+sidebar_label: E2E Tests 
+---
 
 The Stratos E2E test suite exercises the Stratos UI using protractor/web-driver.
 
@@ -6,7 +10,7 @@ The tests require a Stratos instance to be running (front-end and back-end) and
 
 Developers' should be aware that:
 
-- The E2E tests are destructive on the Stratos system being tested - since they test endpoint registration, they will un-register any existing endpoints
+- The E2E tests are destructive on the Stratos system being tested - since they test endpoint registration, they will un-register any existing endpoints.
 - The E2E tests will create orgs, spaces, applications, routes, etc in the Cloud Foundry instance that is specified. Tests should automatically tidy up afterwards unless stopped abruptly.
 
 ## Pre-requisites
@@ -24,9 +28,9 @@ The tests require an instance of Cloud Foundry with the following:
 - A number of other Cloud Foundry entities
 
 To meet the above requirements we recommend running the Stratos CF E2E set up script which is kept up to date with the latest test requirements.
-More information can be found [below](#Running-the-E2E-Set-up-Script)
+More information can be found [below](#running-the-e2e-set-up-script).
 
-Before running the E2E tests, you need to create a file named `secrets.yaml` in the root of the Stratos folder. An example template is included in [src/test-e2e/secrets.yaml.example](../src/test-e2e/secrets.yaml.example) - copy this to `secrets.yaml` and edit accordingly.
+Before running the E2E tests, you need to create a file named `secrets.yaml` in the root of the Stratos folder. An example template is included in [src/test-e2e/secrets.yaml.example](https://github.com/cloudfoundry/stratos/blob/master/src/test-e2e/secrets.yaml.example) - copy this to `secrets.yaml` and edit accordingly.
 
 If you want to run the tests in headless Chrome, add the following to the secrets file:
 
@@ -35,7 +39,7 @@ headless: true
 ```
 
 ## Running the E2E Set up Script
-The script can be found in [deploy/tools/init-cf-for-e2e.sh](../deploy/tools/init-cf-for-e2e.sh)
+The script can be found in [deploy/tools/init-cf-for-e2e.sh](https://github.com/cloudfoundry/stratos/blob/master/deploy/tools/init-cf-for-e2e.sh)
 
 ### Minimum Requirements
 - CF CLI
@@ -107,13 +111,17 @@ Given the output of the script, the following template can be used to update the
 
 ### Tidying up test generated CF entities
 If tests are stopped before completing or fail to clean old test artifacts will exist in the CF. To clean some of these please see the script
-at [deploy/ci/automation/e2e-clean-remnants.sh](../deploy/ci/automation/e2e-clean-remnants.sh)
+at [deploy/ci/automation/e2e-clean-remnants.sh](https://github.com/cloudfoundry/stratos/blob/master/deploy/ci/automation/e2e-clean-remnants.sh)
 
 ## Running the tests
 
 To run the tests against an instance of Stratos execute
 ```
-npm run e2e -- --dev-server-target= --base-url=<URL of stratos
+STRATOS_E2E_BASE_URL=<URL of stratos> ng e2e --dev-server-target= --base-url=<URL of stratos>
+```
+If running Stratos on `https://127.0.0.1:4200` then instead execute
+```
+npm run e2e-dev
 ```
 
 
diff --git a/website/docs/developer/developers-guide-env-tech.md b/website/docs/developer/developers-guide-env-tech.md
new file mode 100644
index 0000000000..0b374c6c01
--- /dev/null
+++ b/website/docs/developer/developers-guide-env-tech.md
@@ -0,0 +1,103 @@
+---
+id: developers-guide-env-tech
+title: Developer Links + Environment
+sidebar_label: Dev Links & Env
+---
+
+## Links
+
+Below is a collection of links that are can be useful when tackling some of the technology involved with Stratos
+
+### ES6
+
+* [http://stack.formidable.com/es6-interactive-guide](http://stack.formidable.com/es6-interactive-guide)
+* [http://es6-features.org](http://es6-features.org)
+
+### TypeScript
+
+* [https://learnxinyminutes.com/docs/typescript/](https://learnxinyminutes.com/docs/typescript/) (cheat sheet)
+* [https://www.tutorialspoint.com/typescript/](https://www.tutorialspoint.com/typescript/)
+* [https://tutorialzine.com/2016/07/learn-typescript-in-30-minutes](https://tutorialzine.com/2016/07/learn-typescript-in-30-minutes)
+
+### Angular
+
+#### Angular
+
+* [https://www.youtube.com/watch?v=KhzGSHNhnbI](https://www.youtube.com/watch?v=KhzGSHNhnbI) (very basic 1h video of angular covering basic app features in a demo)
+* [https://angular.io/guide/architecture](https://angular.io/guide/architecture) (official angular intro)
+* [https://angular.io/tutorial](https://angular.io/tutorial) (official angular tutorial. Basic to start with but good introduction to routing, http requests, promises, observables and observable event stream later on)
+
+#### Angular CLI
+
+* [https://cli.angular.io/reference.pdf](https://cli.angular.io/reference.pdf) (cheat sheet)
+* [https://github.com/angular/angular-cli](https://github.com/angular/angular-cli)
+
+#### Example Apps
+
+* https://github.com/aviabird/angularspree (covers everything)
+
+### Redux
+
+* [http://redux.js.org](http://redux.js.org)
+* [https://gist.github.com/btroncone/a6e4347326749f938510](https://gist.github.com/btroncone/a6e4347326749f938510)
+* [https://code-cartoons.com/a-cartoon-intro-to-redux-3afb775501a6](https://code-cartoons.com/a-cartoon-intro-to-redux-3afb775501a6)
+* [https://www.youtube.com/watch?v=WIqbzHdEPVM](https://www.youtube.com/watch?v=WIqbzHdEPVM)
+* [https://egghead.io/courses/getting-started-with-redux](https://egghead.io/courses/getting-started-with-redux)
+
+#### Observables
+
+* [http://reactivex.io/documentation/observable.html](http://reactivex.io/documentation/observable.html)
+
+## VS Code Plug-ins
+
+There's no mandated IDE, but if you choose Visual Studio Code here's some helpful plug-ins
+
+### Really Helpful
+
+* TSLint
+* TS Hero
+* Git Lens
+* gitignore
+* Move TS - Move files and automatically update imports
+
+### Helpful
+
+* Beautify
+* Document This
+* Git History
+* TODO Parser
+  * see icon bottom left for todo's in current file
+  * Add the following config to settings to exclude some folders
+
+   ```
+   "TodoParser": {
+        "folderExclude": ["node_modules", ".vscode"]
+   }
+   ```
+
+  * F1 + `Parse TODOs (all files)` to see all TODOs
+* Code Spell Checker
+  * List of words to exclude coming soon
+* Eclipse Keymap
+
+
+## Guides
+
+### ExpressionChangedAfterItHasBeenCheckedError Error
+
+#### Links
+
+* https://blog.angularindepth.com/everything-you-need-to-know-about-the-expressionchangedafterithasbeencheckederror-error-e3fd9ce7dbb4
+* https://github.com/angular/angular/issues/17572
+* https://github.com/angular/angular/issues/6005
+
+#### In summary
+
+* AVOID
+  * setTimeout
+  * forcing change detecting
+* TRY TO USE
+  * observeOn(asapScheduler) in observable chain
+  * ngAfterViewInit
+* Generally
+  * Avoid changing state in child components that will affect a binding in parent component/s
\ No newline at end of file
diff --git a/website/docs/developer/frontend-tests.md b/website/docs/developer/frontend-tests.md
new file mode 100644
index 0000000000..d5380411b6
--- /dev/null
+++ b/website/docs/developer/frontend-tests.md
@@ -0,0 +1,73 @@
+---
+title: Frontend Tests
+sidebar_label: Tests
+---
+
+## Test
+
+### Lint
+
+Run `npm run lint` to execute tslint lint checking.
+
+### Unit tests
+
+Run `npm test` to execute the unit tests via [Karma](https://karma-runner.github.io). Coverage information can be found in `./coverage`
+
+To execute an individual package run `ng test <package name>`. To execute the tests again automatically on code changes add `--watch=true`
+
+> **NOTE** npm test will search for chrome on your path. If this is not so please set an env var CHROME_BIN pointing to your executable
+(chromium is fine too).
+
+### End-to-end tests
+
+Run `npm run e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
+
+Run `npm run e2e-dev` to execute end-to-end tests against a locally running instance on `https://localhost:4200`
+
+More information on the E2E tests and pre-requisites for running them is available here - [E2E Tests](developers-guide-e2e-tests.md).
+
+### Code Climate
+
+We use [Code Climate](https://codeclimate.com/github/cloudfoundry-incubator/stratos) to check for general code quality issues. This executes against Pull
+Requests on creation/push.
+
+#### Running Code Climate locally
+> Generally we would not advise doing this and just rely on the code climate gate to run when pull requests are submitted
+
+To run locally see instructions [here](https://github.com/codeclimate/codeclimate) to install Code Climate CLI
+and engine via docker. Once set ensure you're in the root of the project and execute the following (it may take a while)
+
+```
+codeclimate analyze
+```
+
+> **NOTE** Unfortunately this highlights all current issues and not those that are the diff between any master and feature branch. Analyze
+can be ran against a single/sub set of files, again with all current issues, but a little more digestible.
+
+```
+codeclimate analyze <path to file/s>
+```
+
+In a feature branch to compare files that have changed to master, for instance, use the following
+
+```
+git checkout feature-branch-A
+codeclimate analyze $(git diff --name-only master)
+```
+
+You can also run the above command via npm
+
+```
+npm run climate
+```
+
+### Stratos Continue Integration
+For each new pull request and any subsequent pushes to it the following actions are executed
+- Code quality analysis via Code Climate - https://codeclimate.com/
+- Jenkins CI run, covering..
+  - Frontend lint check
+  - Backend lint check
+  - Frontend unit tests
+  - Backend unit tests
+  - End to end tests
+- Security anaylsis via Snyk - https://snyk.io/
diff --git a/website/docs/developer/frontend.md b/website/docs/developer/frontend.md
new file mode 100644
index 0000000000..572dd2032a
--- /dev/null
+++ b/website/docs/developer/frontend.md
@@ -0,0 +1,73 @@
+---
+title: Frontend Development
+sidebar_label: Overview
+---
+
+## Introduction to the stack
+
+Before making changes to the frontend code you should be familiar with
+
+1. Angular
+1. Typescript / ES6
+1. Redux / NGRX / Observables
+1. Node / NPM
+
+There are a some introduction style resources [here](/docs/developer/developers-guide-env-tech.md). There's also some advice on helpful [VS code plugins](/docs/developer/developers-guide-env-tech#vs-code-plug-ins). If you feel comfortable with these and are happy with your dev environment please skip straight to
+[Set up Dependencies](#set-up-dependencies).
+
+## Set up Dependencies
+
+* Set up a Stratos backend. Both backend and frontend exist in this same repo. Follow the [Backend Development](/docs/developer/introduction#build--run-locally) set up guide.
+* Install [NodeJs](https://nodejs.org) (if not already install) (minimum node version 12.13.0)
+* Install [Angular CLI](https://cli.angular.io/) (if not already install) - `npm install -g @angular/cli`
+
+
+## Run the frontend
+
+1. Run `npm install`
+1. Run `npm start` for a dev server. (the app will automatically reload if you change any of the source files)
+   * If this times out please use `npm run start-high-mem` instead
+   * To change the port from the default 4200, add `-- --port [new port number]`
+   * To stop the automatic reload every time a resource changes add `-- --live-reload false`
+   * To do both the above use `-- --live-reload false --port [new port number]`
+1. Navigate to `https://localhost:4200/`. The credentials to log in will be dependent on the Jetstream the console points at. Please refer
+   to the guides used when setting up the backend for more information
+
+## Build
+
+> The normal dev cycle does not require a direct build.
+
+Run `npm run build` to build the project.
+
+The build artefacts will be stored in the `dist/` directory. This will output a production build of the application.
+
+## Creating angular items via angular cli
+
+To create a new angular component run `ng generate component component-name`. You can use a similar command to create other types of angular
+items `ng generate <directive|pipe|service|class|guard|interface|enum|module> <name>`.
+
+## Theming
+
+We use the angular material theming mechanism. See [here](https://material.angular.io/guide/theming-your-components) for more information about theming new components added to stratos.
+
+
+## Additional Information
+
+### Extensions
+
+Documentation on extensions can be found [here](/docs/extensions/introduction). From a developers perspective extensions are managed by npm packages.
+The default set are in `./src/frontend/packages`, any package added directly here will be automatically included by the build.
+
+At build time the Stratos Devkit (`./src/frontend/packages/devkit`) will ensure all packages are imported correctly and theming, both component and console level, are applied correctly.
+The devkit is automatically built in `postinstall` after `npm install` is ran. To directly build it `npm run dev-setup` can be executed.
+
+### Configuration
+
+Configuration information can be found in two places
+
+* `./proxy.conf.js`
+  * Informs the frontend where the backend is
+* `./src/frontend/packages/core/src/environments/environment.ts` for developer vs production like config
+  * This contains more general settings for the frontend and does not usually need to be changed
+* `config.properties`
+  * Backend configuration
diff --git a/website/docs/developer/introduction.md b/website/docs/developer/introduction.md
new file mode 100644
index 0000000000..8741bb4125
--- /dev/null
+++ b/website/docs/developer/introduction.md
@@ -0,0 +1,37 @@
+---
+title: Developing the Stratos Console
+sidebar_label: Getting Started
+---
+
+## Introduction
+
+Stratos comprises of two main components:
+
+- A front-end UI that runs in your web browser. This is written in [Typescript](https://www.typescriptlang.org/) and uses the [Angular](https://angular.io/) framework.
+- A back-end that provides a web-based API to the front-end. This is written in [Go](https://golang.org/).
+
+Depending on what you are contributing, you will need to develop with the front-end, back-end or both.
+
+## Build & Run Locally
+
+For a quick-start to get Stratos front and back ends built and running locally on a development system, follow the steps below.
+
+You will need to have `go` and `nodejs` installed in your development environment.
+
+```
+git clone https://github.com/cloudfoundry/stratos.git
+cd stratos
+npm install
+npm run build
+npm run build-backend
+cd src/jetstream
+./jetstream
+```
+
+This will build both the frontend and backend and run the backend in a mode where it will also serve the static resources for the frontend. 
+
+You can open a web browser and navigate to (https://127.0.0.1:5443) and login with username `admin` and password `admin`.
+
+> To develop the frontend we recommend reading through the [frontend](/docs/developer/frontend) doc. This includes a faster way to run Stratos and see your changes.
+
+> Additional back end docs are available [here](/docs/developer/backend) before making any changes to the code.
diff --git a/docs/backend-plugins.md b/website/docs/extensions/backend.md
similarity index 93%
rename from docs/backend-plugins.md
rename to website/docs/extensions/backend.md
index 4aba144c68..59e54cef44 100644
--- a/docs/backend-plugins.md
+++ b/website/docs/extensions/backend.md
@@ -1,4 +1,7 @@
-# Backend Plugins
+---
+title: Backend Plugins
+sidebar_label: Backend Plugins
+---
 
 This document provides a brief outline for extending the Stratos backend (Jetstream).
 
@@ -15,9 +18,9 @@ Currently, to create an extension to the backend:
 
 1. Build Jetstream
 
-> Note: There are a few plugins in the `src/jetstream/plugins` folder that should help serve as examples of how to write a plugin.
+> There are a few plugins in the `src/jetstream/plugins` folder that should help serve as examples of how to write a plugin.
 
-> Note: Jetstream uses the [Echo web server](https://echo.labstack.com/) from Labstack - some familiarity with this is required when developing backend plugins.
+> Jetstream uses the [Echo web server](https://echo.labstack.com/) from Labstack - some familiarity with this is required when developing backend plugins.
 ## Plugin Interface
 
 All plugins must implement the interface `interfaces.StratosPlugin` - this is defined in `src/jetstream/repository/interfaces/plugin.go`.
diff --git a/website/docs/extensions/frontend.md b/website/docs/extensions/frontend.md
new file mode 100644
index 0000000000..6bed192aae
--- /dev/null
+++ b/website/docs/extensions/frontend.md
@@ -0,0 +1,459 @@
+---
+title: Frontend Extensions
+sidebar_label: Frontend Extensions
+---
+
+Stratos exposes the following extension points:
+
+- Adding new items to the side navigation menu
+- Adding new tabs to the Application, Cloud Foundry, Organization and Space views
+- Adding new action buttons to the Application Wall, Application, Cloud Foundry, Organization and Space and Endpoint views
+- Replace the loading page
+- Replace the login page
+
+We use Decorators to annotate components to indicate that they are Stratos extensions.
+
+An example illustrating the various front-end extension points of Stratos is included in the folder `src/frontend/packages/example-extensions`.
+
+To run Stratos with these customizations see [here](/docs/extensions/introduction#acme).
+
+For a walk-through of extending Stratos, see [Example: Adding a Custom Tab](#example-adding-a-custom-tab).
+
+## Including modules and routes
+To include code and angular routing in your component there needs to be two access points
+- A core module that declares your extension components.
+- A core routing module that calls `RouterModule.forRoot`. This is the root for all routes in your package.
+
+These modules should be made available externally to Stratos by the following steps
+
+1. Exported in the package's `public-api.ts`, for example `src/frontend/packages/example-extensions/src/public-api.ts`. The public api should be added to the applications `tsconfig.json` for example `src/tsconfig.json`
+1. Reference as, or imported by, the two modules defined in the `stratos` section in the package's `package.json`, for example  `src/frontend/packages/example-extensions/package.json`
+   ```
+    "stratos": {
+      ...
+      "module": "ExampleModule",
+      "routingModule": "ExampleRoutingModule"
+      ...
+    }
+   ```
+
+At build time these are then added to a dynamically created module `src/frontend/packages/core/src/_custom-import.module.ts` and included in the output.
+
+## Extension Points
+
+### Side Navigation
+
+New items can be added to the Side Navigation menu with extensions.
+
+To do so, annotate the routes for your extension with custom metadata, which Stratos will then pick up and add to the side menu.
+
+A full example is in `src/frontend/packages/example-extensions/src/example-routing.module.ts` and `src/frontend/packages/example-extensions/src/nav-extension`.
+
+Your route should have the following metadata in the `data` field of the route:
+
+```
+    stratosNavigation: {
+      text: '<TITLE>',
+      matIcon: '<ICON NAME>'
+    }
+```
+
+Where `<TITLE>` is the text label to show in the side navigation and `<ICON NAME>` is the icon to use.
+
+> The routing module must be, or referenced by, the core routing module as described [above](/docs/extensions/frontend#including-modules-and-routes)
+
+An example routing module would be:
+
+```
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+
+const customRoutes: Routes = [{
+  path: 'example',
+  loadChildren: () => import('./nav-extension/nav-extension.module').then(m => m.NavExtensionModule),
+  data: {
+    stratosNavigation: {
+      text: 'Example',
+      matIcon: 'extension'
+    }
+  }
+}];
+
+@NgModule({
+  imports: [
+    RouterModule.forRoot(customRoutes),
+  ],
+  declarations: []
+})
+export class ExampleRoutingModule { }
+
+```
+
+This approach ensures that the Angular compiler creates a separate chunk for the extension at compile time which can be lazy loaded at run
+time.
+
+### Custom Tabs
+
+Tabs can be added to the following views in Stratos:
+
+- The Application view that shows the detail of an application
+- The Cloud Foundry view that shows detail for a Cloud Foundry
+- The Cloud Foundry Org view that shows detail for a Cloud Foundry organization
+- The Cloud Foundry Space view that shows detail for a Cloud Foundry space
+
+A step by step guide on how to create a custom tab can be found [below](/docs/extensions/frontend#example-adding-a-custom-tab).
+
+For example:
+
+![Example Application tab extension](../../images/extensions/app-tab-example.png)
+
+The approach for all of these is the same:
+
+1. Create a new component that will provide the tab contents
+1. Ensure that your component is included in the `EntryComponent` section of your custom module
+1. Decorate the component with the `StratosTab` decorator, for example:
+    ```
+    @StratosTab({
+      icon: 'extension',
+      type: StratosTabType.Application,
+      label: 'Example App Tab',
+      link: 'example'
+    })
+    ```
+    Where:
+    - < ICON > is the material design icon name for the icon
+    - < TYPE > indicates where the tab should appear and can be:
+      - StratosTabType.Application - Application View
+      - StratosTabType.CloudFoundry - Cloud Foundry view
+      - StratosTabType.CloudFoundryOrg - Cloud Foundry Org view
+      - StratosTabType.CloudFoundrySpace - Cloud Foundry Space view
+    - < LABEL > is the text label to use for the tab
+    - < LINK > is the name to use for the route (this must only contain characters permitted in URLs)
+    An example is included in the file `src/frontend/packages/example-extensions/src/app-tab-extension/app-tab-extension.component.ts`.
+1. Declare the component to avoid Angular tree shaking
+   - In the same module that the component is 'declared' in add the following to `imports`
+    ```
+      ExtensionService.declare([
+        <component name>,
+      ])
+    ```
+> The module referencing the component, or another referencing it, must be imported by the core module as described [above](/docs/extensions/frontend#including-modules-and-routes).
+
+### Custom Actions
+
+Actions can be added to the following views in Stratos:
+
+- The Application Wall view that shows all applications
+- The Application view that shows the detail of an application
+- The Cloud Foundry view that shows detail for a Cloud Foundry
+- The Cloud Foundry Org view that shows detail for a Cloud Foundry organization
+- The Cloud Foundry Space view that shows detail for a Cloud Foundry space
+- The Endpoints view that shows all endpoints
+
+An action is a icon button that appears at the top-right of a View. For example:
+
+![Example Application action extension](../../images/extensions/appwall-action-example.png)
+
+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
+1. Ensure that your component is included in the `EntryComponent` section of your custom module
+1. Decorate the component with the `StratosAction` decorator, for example:
+    ```
+    @StratosAction({
+      type: StratosActionType.Applications,
+      label: '<LABEL>',
+      link: '<LINK>',
+      icon: '<ICON>
+    })
+    ```
+    Where:
+    - < TYPE > indicates where the action should appear and can be:
+      - StratosActionType.Applications - Application Wall View
+      - StratosActionType.Application - Application View
+      - StratosActionType.CloudFoundry - Cloud Foundry view
+      - StratosActionType.CloudFoundryOrg - Cloud Foundry Org view
+      - StratosActionType.CloudFoundrySpace - Cloud Foundry Space view
+      - StratosActionType.Endpoints - Endpoints view
+    - < ICON > is the icon to show
+    - < LABEL > is the text label to use for the tooltip of the icon (optional)
+    - < LINK > is the name to use for the route (this must only contain characters permitted in URLs)
+    An example is included in the file `src/frontend/packages/example-extensions/src/app-action-extension/app-action-extension.component.ts`.
+1. Declare the component to avoid Angular tree shaking
+   - In the same module that the component is 'declared' in add the following to `imports`.
+    ```
+      ExtensionService.declare([
+        <component name>,
+      ])
+    ```
+
+> The module referencing the component, or another referencing it, must be imported by the core module as described in [above](/docs/extensions/frontend#including-modules-and-routes)
+
+### Loading Indicator
+
+On slower connections, it can take a few seconds to load the main Javascript resources for Stratos.
+
+In order to give the user some initial feedback that Stratos is loading, a loading indicator is included in the `index.html` file. This gets shown as early as possible, as soon as this main html file has loaded. Once the main code has been fetched, the view refreshes to show the application.
+
+A default loading indicator is provided that can be changed. To do so, create the following two in your extension or theme package:
+
+- `loading.css` - CSS styles to be included in a style block in the head of the index page
+- `loading.html` - HTML markup to be included the the index page to render the loading indicator
+
+Then reference them to your package's `package.json`
+
+```
+  "stratos": {
+    ...
+    "theme": {
+      "loadingCss": "loader/loading.css",
+      "loadingHtml": "loader/loading.html"
+    }
+    ...
+  },
+```
+
+The files for the default indicator can be found in the `src/frontend/packages/theme/loader` folder.
+
+An example of a different loading indicator is included with the ACME sample in `src/frontend/packages/example-theme/loader`.
+
+The customization task will insert the appropriate CSS and HTML files into the main index.html file when it runs.
+
+Take a look at the template for the `index.html` file in `src/frontend/packages/core/misc/custom/index.html`. The CSS file is inserted where the marker `/** @@LOADING_CSS@@ **/` is and the HTML file where `<!-- @@LOADING_HTML@@ -->` is.
+
+### Login Page
+
+The log in page can be replaced by another Angular component. This can extend the original log in component and provide the same functionality,
+see `src/frontend/packages/example-extensions/src/acme-login`.
+
+1. Create a new log in component that will contain the same form and fields. The component should have the decorator `@StratosLoginComponent()`
+   ```
+    @StratosLoginComponent()
+    @Component({
+      selector: 'app-acme-login',
+      templateUrl: './acme-login.component.html',
+      styleUrls: ['./acme-login.component.scss'],
+      encapsulation: ViewEncapsulation.None
+    })
+    export class AcmeLoginComponent extends LoginPageComponent {
+      ...
+   ``` 
+1. The new component should be declared and set as an entry point, as well as imported via the extension service, in a module
+   ```
+     imports: [
+        ...
+        ExtensionService.declare([
+          AcmeLoginComponent,
+        ])
+        ...
+      ],
+      // FIXME: Ensure that anything lazy loaded/in kube endpoint pages is not included here - #3675
+      declarations: [
+        ...
+        AcmeLoginComponent,
+        ...
+      ],
+      entryComponents: [
+        ...
+        AcmeLoginComponent,
+        ...
+      ]
+    })
+   ```
+
+### Other Points
+
+#### Customization Service
+A customization service provides a number of smaller extension points. 
+
+|Property | Description|
+|--|--|
+|hasEula| True if there's a EULA to show. When set to true the asset `/core/eula.html` must exist. For information about custom package assets see the images section [here](/docs/extensions/theming#new-images).  |
+|copyright| Text shown at the bottom of the side nav|
+|logoText| Text shown with the side nav logo|
+|aboutInfoComponent| Replace the component used in the Stratos `About` page|
+|supportInfoComponent| Replace the component used to provide support information int he Stratos `About` page|
+|noEndpointsComponent| Replace the component used in the Endpoints page when there are no registered endpoints|
+|alwaysShowNavForEndpointTypes| True to always show the side nav menu items even if an Endpoint for that type is not connected. For example set to `false` to hide CF based menu items such as `Application` if no CF is connected|
+
+To utilize these define them in a `CustomizationsMetadata` object and apply them using the Angular service `CustomizationService`
+
+```
+  constructor(cs: CustomizationService) {
+    const customizations: CustomizationsMetadata = {
+      copyright: '&copy; 2020 Me',
+      hasEula: true,
+      aboutInfoComponent: MyAboutInfoComponent,
+      noEndpointsComponent: MyWelcomeComponent,
+      alwaysShowNavForEndpointTypes: (typ) => false,
+    }
+    cs.set(customizations);
+  }
+
+```
+
+#### stratos.yaml
+A few 'higher up' extension points can be found in `./stratos.yaml`. For example the [SUSE stratos.yaml](https://github.com/SUSE/stratos/blob/master/stratos.yaml) is below. 
+
+```
+title: SUSE Stratos Console
+productVersion: 2.0.0
+```
+
+|Property|Description|
+|--|--|
+|title| Official product title, shown in `About` page and other custom places|
+|productVersion| Use when building `helm` charts|
+
+
+## Example: Adding a Custom Tab
+
+In this example, we will walk through extending the Stratos front-end. A new tab will be added to the Cloud Foundry Application page.
+
+This walk-through assumes that you have installed the Angular CLI globally - this can be done with `npm install -g @angular/cli`.
+
+### Create a new extensions package
+
+> Extension packages can contain many components and even a theme. The example here assumes a fresh start so a new package must be created
+
+1. Create the directory
+   ```
+   mdkir src/frontend/packages/my-custom-module
+   ```
+1. Create an angular module in `my-custom-module` called `my-example.module.ts`
+   ```
+    import { CommonModule } from '@angular/common';
+    import { NgModule } from '@angular/core';
+
+    @NgModule({
+      imports: [
+        CommonModule
+      ],
+      declarations: [
+      ]
+    })
+    export class MyExampleModule { }
+   ```
+1. Create a `public-api.ts` in `my-custom-module` and reference it in your applications `tsconfig.json`.
+
+    `public-api.ts`
+    ```
+    export * from './my-example.module';
+    ```
+    `tsconfig.json`
+    ```
+    "paths": {
+      ...
+      "@myexamples/extensions": ["frontend/packages/my-custom-module/public-api.ts"]
+      ....
+    }
+    ```
+
+1. Create a `package.json` in `my-custom-module`
+   ```
+    {
+      "name": "@myexamples/extensions",
+      "version": "0.0.1",
+      "peerDependencies": {
+        "@angular/common": "^6.0.0-rc.0 || ^6.0.0",
+        "@angular/core": "^6.0.0-rc.0 || ^6.0.0"
+      },
+      "stratos": {
+        "module": "MyExampleModule"
+      }
+    }
+   ```
+
+### Create a new Component for our Tab
+
+Create a new Angular component with the CLI:
+
+```
+cd src/frontend/packages/my-custom-module
+ng generate component example-tab-extension
+```
+
+This will automatically declare the component in `MyExampleModule`
+
+### Add Decorator to make this Component an Extension
+
+In a text editor, open the file:
+
+```
+src/frontend/packages/my-custom-module/example-tab-extension/example-tab-extension.component.ts
+```
+
+Add the following decorator to the component at the top of the file:
+
+```
+import { StratosTab, StratosTabType } from '@stratosui/core';
+
+@StratosTab({
+  icon: 'done',
+  type: StratosTabType.Application,
+  label: 'Example App Tab',
+  link: 'example'
+})
+```
+
+The file should now look like this:
+
+```
+import { Component, OnInit } from '@angular/core';
+import { StratosTab, StratosTabType } from '@stratosui/core';
+
+@StratosTab({
+  icon: 'done',
+  type: StratosTabType.Application,
+  label: 'Example App Tab',
+  link: 'example'
+})
+@Component({
+  selector: 'app-example-tab-extension',
+  templateUrl: './example-tab-extension.component.html',
+  styleUrls: ['./example-tab-extension.component.scss']
+})
+export class ExampleTabExtensionComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
+```
+
+Save the file.
+
+### Update the module
+
+The component must now be marked as an entry component and imported in such a way angular tree shaking is avoided.
+
+To do this, in a text editor, open the file `src/frontend/packages/my-custom-module/my-example.module.ts` update 
+- the file imports section
+- the module import array 
+- the entry component array
+
+```
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { ExtensionService } from '@stratosui/core';
+
+import { ExampleTabExtensionComponent } from './example-tab-extension/example-tab-extension.component';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    ExtensionService.declare([
+      ExampleTabExtensionComponent,
+    ])
+  ],
+  declarations: [ExampleTabExtensionComponent],
+  entryComponents: [ExampleTabExtensionComponent]
+})
+export class MyExampleModule { }
+```
+
+### Run it
+
+You should now be able to run Stratos [locally](/docs/developer/introduction) and see this new tab on the application page for an application.
diff --git a/website/docs/extensions/introduction.md b/website/docs/extensions/introduction.md
new file mode 100644
index 0000000000..b36474090c
--- /dev/null
+++ b/website/docs/extensions/introduction.md
@@ -0,0 +1,61 @@
+---
+title: Extending Stratos
+sidebar_label: Introduction
+---
+
+Stratos can be customized in a number of ways. Colors and fonts can be updated to add unique branding, additional menu items can be added in a number of places, custom EULAs can be used, new Stratos Jetstream (backend) endpoints, and much more.
+
+> For those with existing customization migrating to 4.0 please see our [upgrade guide](/docs/extensions/v4-migration).
+
+## Approach
+
+In order to customize Stratos, you will need to fork the Stratos GitHub repository and apply customizations in your fork. Our aim is to minimize any merge conflicts that might occur when re-basing your fork with the upstream Stratos repository.
+
+### Frontend
+
+Frontend customizations are placed in angular packages in the folder named `src/frontend/packages`. In the future you will be able to host these packages in npm and bring them into Stratos in the usual npm dependency way. There are no additional processes or build steps required for Stratos to then integrate these packages. All steps will be automatically applied under the hood during `npm install` and when `ng build`/`ng serve` runs.
+
+Information on custom theming can be found in the [theming page](/docs/extensions/theming).
+
+Information on additional functionality can be found in the [extensions page](/docs/extensions/frontend).
+
+### Backend (Jetstream)
+
+Jetstream customizations are written in go and can be added in `src/jetstream/plugins`. In the future we hope to combine this work with the frontend changes, such that all functionality for
+a feature can be applied to Stratos in a similar way.
+
+More information can be found in the [custom plugins page](/docs/extensions/backend).
+
+## Examples
+
+### ACME
+The ACME example contains a number of [theming](https://github.com/cloudfoundry/stratos/tree/master/src/frontend/packages/example-theme) and [functionality](https://github.com/cloudfoundry/stratos/tree/master/src/frontend/packages/example-extensions) customization.
+
+To run Stratos with these customizations
+
+1. Include the example packages (by default these are excluded). Do this by...
+   1. Creating the file `stratos.yaml` in the root of the repo
+   2. Adding the following content to `stratos.yaml`
+      ```
+      packages:
+        include:
+          - '@stratosui/core'
+          - '@stratosui/shared'
+          - '@stratosui/store'
+          - '@stratosui/cloud-foundry'
+          - '@stratosui/cf-autoscaler'
+          - '@stratosui/theme'
+          - '@example/extensions'
+          - '@example/theme'
+      ```
+1. Run Stratos the usual way, for more information see the [Developer Guide](/docs/developer/introduction).
+
+### SUSE
+
+More advanced, real world examples can be found the in SUSE Stratos repository, again containing [theming](https://github.com/SUSE/stratos/tree/master/src/frontend/packages/suse-theme) and [functionality](https://github.com/SUSE/stratos/tree/master/src/frontend/packages/suse-extensions) customizations.
+
+To run Stratos with these customizations simply start the console the usual way from that repo, for more information see the [Developer Guide](/docs/developer/introduction).
+
+## Further Reading
+
+Detailed instructions on how to customize the [theme](/docs/extensions/theming), [frontend functionality](/docs/extensions/frontend) and [backend](/docs/extensions/backend) can be found in this section.
diff --git a/website/docs/extensions/theming.md b/website/docs/extensions/theming.md
new file mode 100644
index 0000000000..50d26d74da
--- /dev/null
+++ b/website/docs/extensions/theming.md
@@ -0,0 +1,258 @@
+---
+title: Theming Stratos
+sidebar_label: Theming Stratos
+---
+
+Stratos provides a mechanism for customizing the theme, including:
+
+- Changing colors
+- Changing image assets (favorite icon, login background and logo)
+- Using additional fonts
+- Adding/Overriding styles
+- Applying theme colors to components
+
+Theme's are best encapsulated in a new npm package. It should contain the usual `package.json` file with a `stratos` section which will contain some of the theme customizations.
+
+An example of the type of package that can be created can be found in the [ACME example](https://github.com/cloudfoundry/stratos/tree/master/src/frontend/packages/example-theme). To run Stratos with these customizations see [here](/docs/extensions/introduction#acme).
+
+## Colors
+Stratos uses Material Design and the [angular-material](https://material.angular.io/) library and uses the same approach to theming.
+
+To create your own theme you will need to create a color pallet and provide it to Stratos as a material theme. This theme can also contain
+additional colors that customize core parts of the page (header, side navigator menu, avatar, etc).
+
+To do this create the file `_index.scss` in the root of your theme package. This should contain a Stratos scss function that will return a `theme`
+object via the Stratos helper function `stratos-theme-helper`, for [example](https://github.com/cloudfoundry/stratos/blob/master/src/frontend/packages/example-theme/_index.scss). 
+
+### Core Pallet
+In most cases you will probably want to generate a palette for the primary color for your version of Stratos - an example `custom.scss` for this is shown below:
+
+```
+$acme-primary: (50: #e8eaf6, 100: #c5cbe9, 200: #9fa8da, 300: #7985cb, 400: #5c6bc0, 500: #3f51b5, 600: #394aae, 700: #3140a5, 800: #29379d, 900: #1b278d, A100: #c6cbff, A200: #939dff, A400: #606eff, A700: #4757ff, contrast: (  50: #000000,  100: #000000,  200: #000000,  300: #000000,  400: #ffffff,  500: #ffffff,  600: #ffffff,  700: #ffffff,  800: #ffffff,  900: #ffffff,  A100: #000000,  A200: #000000,  A400: #ffffff,  A700: #ffffff, ));
+$mat-red: ( 50: #ffebee, 100: #ffcdd2, 200: #ef9a9a, 300: #e57373, 400: #ef5350, 500: #f44336, 600: #e53935, 700: #d32f2f, 800: #c62828, 900: #b71c1c, A100: #ff8a80, A200: #ff5252, A400: #ff1744, A700: #d50000, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: white, A400: white, A700: white, ));
+
+// Create palettes
+$acme-theme-primary: mat-palette($acme-primary);
+$acme-theme-warn: mat-palette($mat-red);
+
+// Create a theme from the palette (secondary theme is the same as the primary in this example)
+$stratos-theme: mat-light-theme($acme-theme-primary, $acme-theme-primary, $acme-theme-warn);
+
+// Create a similar theme but make it for dark mode
+$stratos-dark-theme: mat-dark-theme($acme-theme-primary, $acme-theme-primary, $acme-theme-warn);
+
+```
+
+### Stratos Colors
+
+Additional Stratos colors can be customized by supplying more colors to the `theme` object. Defining these colors helps reduce the amount of custom css the theme has to use.
+
+> You do not have to specify all of these - defaults will be used if they are not set.
+
+|Property|Description|
+|---|---|
+|app-background-color| Base color to show in the background of the application |
+|app-background-text-color| Color of text when placed on the basic background |
+|side-nav| See [below](/docs/extensions/theming#side-nav-colors) |
+|status| See [below](/docs/extensions/theming#status-colors)|
+|subdued-color| Lighter color meant to be a subdued version of the primary color |
+|ansi-colors| See [below](/docs/extensions/theming#ansi-colors)|
+|header-background-color| Background color for the main stratos header|
+|header-foreground-color| Foreground color for the main stratos |
+|stratos-title-show-text| Boolean - Show `Stratos` or provided title with the large logo in the about page, default log in page, etc |
+|header-background-span|Does the header background color span across the top, or is the sidenav background color used for the top-left portion|
+|underflow-background-color|Background colors to use for things like the about page header (underflow)|
+|underflow-foreground-color|Background colors to use for things like the about page header (underflow)|
+|link-color| Color for hyperlinks|
+|link-active-color| Color of visited hyperlinks|
+|user-avatar-background-color| Background color of the default avatar in the main header|
+|user-avatar-foreground-color| Foreground color of the default avatar in the main header|
+|user-avatar-underflow-invert-colors| Boolean - Invert the user-avatar colors|
+|user-avatar-header-invert-colors| Boolean - Invert the user-avatar colors in the main header|
+|intro-screen-background-color| Color of the background to introduction style screens (log in, log out, etc)|
+
+
+#### Side Nav Colors
+Colors that define how the top level navigation menu on the left of Stratos appears.
+
+|Property|Description|
+|---|---|
+|background| Background color of the side nav|
+|text| Color of text when menu item is not selected|
+|active| Color of background of a selected item|
+|active-text| Color of text of a selected item|
+|hover| Color of background of an item when hovered on|
+|hover-text| Color of text of an item when hovered on|
+
+#### Status Colors
+Colors that are associated with the standard levels of statuses.
+
+|Property|Description|
+|---|---|
+|success||
+|info||
+|warning||
+|danger||
+|tentative||
+|busy||
+|text||
+
+#### Ansi Colors
+Terminal style set of colors to show for logging output.
+
+|Property|Description|
+|---|---|
+|default-foreground||
+|default-background||
+|black||
+|red||
+|green||
+|yellow||
+|blue||
+|magenta||
+|cyan||
+|white||
+
+
+### Dark theme
+
+By default the theme will not contain a dark mode and the UX for enabled/disabling it will be hidden.
+
+In order to add a dark mode to your theme an additional `dark` color theme should be provided by the `stratos-theme` theme function in your
+theme's `_index.scss`, for example 
+in [_index.scss](https://github.com/cloudfoundry/stratos/blob/master/src/frontend/packages/example-theme/_index.scss).
+
+```
+@function stratos-theme() {
+  $theme: stratos-theme-helper($stratos-theme);
+  @return (
+    default: create-custom-theme($stratos-theme),
+    dark: create-dark-theme()
+  );
+}
+```
+
+Within the dark theme the default theme's additional Stratos colors can be overwritten.
+
+
+## Images
+
+### Replace Stratos Images
+
+
+
+
+Images that Stratos uses can be overwritten by a theme, for example the logo and favicon. To do so the new images should be added to the
+package and then referenced in the theme's `package.json` including the path of the image they overwrite. Below are some prominent examples.
+
+
+|File name|Path|Description|
+|---|---|---|
+|`favicon.ico`|`favicon.ico`|Favorite icon to use|
+|`logo.png`|`core/assets/logo.png`|Logo to use on login screen and about page|
+|`nav-logo.png`|`core/assets/nav-logo.png`|Logo to use in the top-left side navigation for the application logo|
+
+
+> The `nav-logo.png` logo should have a height of 36px and a maximum width of 180 pixels.
+
+> Files written to `core/assets` should be done in one line. In the example below both logo.png and nav-logo.png and done via the one
+> line
+
+Example `package.json`
+
+```
+  "stratos": {
+    ...
+    "assets": {
+      "assets/core": "core/assets",
+      "assets/favicon.ico": "favicon.ico",
+    },
+    ...
+  },
+```
+
+### New Images
+
+When images are used by custom components they should also be referenced in the theme's `package.json`. Whole folders can be included and should
+be written to `core/assets`. When references by the components they use that path `src="/core/assets/custom_image.png"`
+
+```
+  "stratos": {
+    ...
+    "assets": {
+      "local/assets": "core/assets",
+    },
+    ...
+  },
+```
+
+## Fonts
+Any custom fonts used by the theme or extensions can be provided in a similar way to images, the files should be added to the theme's package
+and then referenced in the theme's `package.json`.
+
+```
+  "stratos": {
+    "assets": {
+      ...
+      "assets/fonts": "suse/fonts"
+      ...
+  },
+```
+
+## Styles
+
+We don't generally recommend modifying styles, since from version to version of Stratos, we may change the styles used slightly which can mean any modifications you made will need updating. Should you wish to do so, you can modify these in the same `_index_.scss`. For example the Acme[_index.scss](https://github.com/cloudfoundry/stratos/blob/master/src/frontend/packages/example-theme/_index.scss) imports a file that adds a text color 
+
+```
+body.stratos {
+  .favorite-list {
+    .app-no-content-container {
+      color: $acme-dark-blue;
+    }
+  }
+}
+```
+
+Note that the class `stratos` has been placed on the `BODY` tag of the Stratos application to assist with css selector specificity.
+
+## Components
+
+Angular components in your packages can be themed, which provides them access to the theme's colors. To do this, in your extensions package that contains the components (this may be different to your theme package), add a `_all-theme.scss` file containing a scss function. This function
+should be referenced in the package's package.json and is called by the Stratos extension mechanism.
+
+The `_all-theme.scss` and `package.json` content may look like below
+
+```
+@mixin apply-theme-suse-extensions($stratos-theme) {
+
+  $theme: map-get($stratos-theme, theme);
+  $app-theme: map-get($stratos-theme, app-theme);
+
+}
+```
+
+```
+  "stratos": {
+    ...
+    "theming": "sass/_all-theme#apply-theme-suse-extensions",
+    ...
+  }
+```
+
+Component theme files can then be defined and their own scss functions being called from `_all-theme.scss`
+
+```
+@mixin apply-theme-suse-extensions($stratos-theme) {
+  ...
+  @include kube-analysis-report-theme($theme, $app-theme);
+  ...
+}
+```
+
+```
+@mixin kube-analysis-report-theme($theme, $app-theme) {
+  $backgrounds: map-get($theme, background);
+  $background: mat-color($backgrounds, card);
+  $background-color:  map-get($app-theme, app-background-color);
+}
+```
diff --git a/website/docs/extensions/v4-migration.md b/website/docs/extensions/v4-migration.md
new file mode 100644
index 0000000000..1317327c26
--- /dev/null
+++ b/website/docs/extensions/v4-migration.md
@@ -0,0 +1,46 @@
+---
+title: Migrating to V4
+sidebar_label:  Migrating to V4
+---
+
+In version 4 of Stratos there are breaking customization changes from previous versions. These changes allow a much improved approach to
+extensions by opening the door to npm style plugins. 
+
+Prominent changes include
+- `custom-src` has been removed along with the symlink approach of including files. Custom code is now added as npm packages in `src/frontend/packages`.
+Modules and routes are now exposed in a more standard package way. More info [here](/docs/extensions/frontend#including-modules-and-routes).
+Some existing components will not be included in some production style builds without also declaring them to the extension service, see 
+usages of `ExtensionService.declare`.
+- Material Design theming approach has been expanded to include many common colors, this removes the need to apply custom styles in a lot of cases. More info [here](/docs/extensions/theming#colors).
+- Dark theme is applied in a different way. More info [here](/docs/extensions/theming#dark-theme).
+- Image assets are replaced in a different way. More info [here](/docs/extensions/theming#images).
+- Custom component can now be themed, so theme colors can be accessed from within and applied. More info [here](/docs/extensions/theming#components).
+- A new 'loading' indicator has been added that you may wish to customize, more info [here](/docs/extensions/frontend#loading-indicator).
+
+## Basic Migration Steps
+To aid in migrating we've provided these instructions.
+
+1. Before updating to the latest code...
+    - Run `npm run customize-reset` to remove all previously created sym links.
+    - Read through the customization documentation below to get a better understanding of the new process.
+1. Update your codebase with the desired v4 code.
+1. Run `npm install` (only required first time, this will ensure you have the required version of Angular and the new devkit is built).
+1. Change directory to `./build/tools/v4-migration` and run the migration script `./migrate.sh`.
+    - This will copy your customizations from `custom-src` to a new Angular package `src/frontend/packages/custom_extensions`.
+1. Check that the new package exports your custom module and if applicable your custom-routing module.
+    - The migrate script should do this in `src/frontend/packages/custom_extensions/src/public-api.ts`.
+1. Check that your ts config file defines the public api file.
+    - `src/tsconfig.json` file's `compilerOptions/paths` section should contain something like `"@custom/extensions": ["frontend/packages/custom_extensions/src/public-api.ts"]`.
+1. Check that your new package's `package.json` defines your custom module and if applicable custom-routing module.
+    - See `src/frontend/packages/suse-extensions/package.json` file's `stratos` section.
+    - Note your `routingModule` entry label should not have a preceding `_`.
+1. Build Stratos in your usual way, for instance `npm run build`.
+    - It could be that this fails due to TypeScript import issues, if so go through these and fix.
+    - During build time the custom packages will be discovered and output, see section starting `Building with these extensions`. These should contain the modules your require.
+1. Run Stratos your usual way. Ensure you can navigate to all your custom parts.
+1. Once you are happy everything works as intended remove the old `./custom-src` directory and commit you changes.
+
+## Further Guidance
+Our ACME demo (`src/frontend/packages/example-extensions` and `src/frontend/packages/example-theme`) and SUSE repo ([theme](https://github.com/SUSE/stratos/tree/master/src/frontend/packages/suse-theme) and [extensions](https://github.com/SUSE/stratos/tree/master/src/frontend/packages/suse-extensions)) have both been updated and are fully compatible with the 4.0 changes. Both are a good source for examples.
+
+If there any questions or issues please reach out to us either on our Github [repo](https://github.com/cloudfoundry/stratos) or Slack room [#stratos](https://cloudfoundry.slack.com/?redir=%2Fmessages%2Fstratos).
diff --git a/website/docs/introduction.md b/website/docs/introduction.md
new file mode 100644
index 0000000000..f9706d79a5
--- /dev/null
+++ b/website/docs/introduction.md
@@ -0,0 +1,63 @@
+---
+id: introduction
+title: Introduction
+sidebar_label: Introduction 
+---
+
+Stratos is an Open Source Web-based UI for Cloud Foundry and Kubernetes.
+
+> Note: The Kubernetes additions to Stratos are currently maintained by SUSE and we are investigating the process of upstreaming these to the cloudfoundry GitHub repository. These would then become a standard part of Stratos build and install.
+
+For Cloud Foundry, it allows users and administrators to both manage applications running in the Cloud Foundry cluster and perform cluster management tasks.
+
+For Kubernetes, it provides Developers with views of their Kubernetes resources, the ability to view and deploy Helm Charts and view Workloads.
+
+![Stratos Application view](../images/screenshots/app-summary.png)
+
+## Quick Start
+
+To get started quickly, we recommend following the steps to deploy the Stratos Console as a Cloud Foundry Application - see [here](deploy/cloud-foundry/cloud-foundry).
+
+If you have [docker](https://www.docker.com/community-edition) installed, you can quickly deploy Stratos using the all-in-one container:
+```
+$ docker run -p 4443:443 splatform/stratos:latest 
+```
+
+Once that has finished, you can then access Stratos by visiting https://localhost:4443.
+
+## Deploying Stratos
+
+Stratos can be deployed in the following environments:
+
+1. Cloud Foundry, as an application. See [guide](deploy/cloud-foundry/cloud-foundry)
+2. Kubernetes, using a Helm chart. See [guide](deploy/kubernetes)
+3. Docker, single container deploying all components. See [guide](deploy/all-in-one)
+
+## Troubleshooting
+
+Please see our [Troubleshooting](deploy/troubleshooting) page.
+
+## Further Reading
+ 
+Get an [Overview](overview.md) of Stratos, its components and the different ways in which it can be deployed.
+
+Browse through features and issues in the project's [issues](https://github.com/cloudfoundry/stratos/issues) page.
+
+What kind of code is in Stratos? We've integrated [Code Climate](https://codeclimate.com) for some code quality and maintainability metrics. Take a stroll around the [project page](https://codeclimate.com/github/cloudfoundry/stratos)
+
+## Contributing
+
+We very much welcome developers who would like to get involved and contribute to the development of the Stratos project. Please refer to the [Contributing guide](developer/contributing.md) for more information.
+
+For information to help getting started with development, please read the [Developer's Guide](developer/introduction).
+
+## Support and feedback
+
+We have a channel (#stratos) on the Cloud Foundy Slack where you can ask questions, get support or give us feedback. We'd love to hear from you if you are using Stratos.
+
+You can join the Cloud Foundry Slack here - https://slack.cloudfoundry.org/  - and then join the #stratos channel.
+
+## License
+
+The work done has been licensed under Apache License 2.0. The license file can be found [here](license).
+
diff --git a/website/docs/license.md b/website/docs/license.md
new file mode 100644
index 0000000000..5fb10ab03a
--- /dev/null
+++ b/website/docs/license.md
@@ -0,0 +1,184 @@
+---
+id: license
+title: License
+sidebar_label: License
+---
+
+Stratos is licensed under the Apache 2.0 Software License, shown below:
+
+```
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+```
diff --git a/website/docs/overview.md b/website/docs/overview.md
new file mode 100644
index 0000000000..a0c2c39d92
--- /dev/null
+++ b/website/docs/overview.md
@@ -0,0 +1,29 @@
+---
+id: overview
+title: Stratos Overview
+sidebar_label: Overview 
+---
+
+Stratos provides a web-based UI to allow developers and administrators to manage their applications and cloud foundry deployment(s).
+
+It is designed to manage one or more Cloud Foundry deployments. It does so by managing "endpoints", where each endpoint is a reference to a Cloud Foundry deployment. The notion of an endpoint is not specific to Cloud Foundry, allowing Stratos to connect to other service types in the future.
+
+Stratos stores endpoint metadata in a relational database. Administrators of Stratos are able to register (add) new endpoints to the Console. All users are able to then connect to these endpoints using their credentials, ensuring that they get the appropriate level of access when interacting with Cloud Foundry.
+
+The high-level architecture of Stratos is shown in the diagram below:
+
+![Stratos High-Level Architecture](../images/high-level-arch.png)
+
+The main components:
+
+* Web UI - Single-page AngularJS web application providing the front-end that runs in the user's browser.
+* API Server - Provides the back-end APIs that support the front-end UI. This API takes care of authentication, endpoint management and proxying API requests from the front-end to the desired back-end API.
+* Endpoint Datastore - Relational database that stores the registered endpoints and the encrypted user access tokens.
+
+## Authentication
+
+Stratos authenticates users using a Cloud Foundry UAA service. It must be configured with the details necessary to communicate with a UAA. When the user logs in to the Console, their login will be validated with the UAA. The Console uses a scope to identify Console administrators from regular users.
+
+Administrators use the 'Endpoints Dashboard' within the Console to add new endpoints to the Console. All users are then able to connect to these endpoints by providing their credentials. The Console will use these credentials to communicate with the UAA for the given endpoint (typically Cloud Foundry) and obtain a refresh and access token. These tokens are encrypted and stored in the Endpoint Datastore.
+
+When a user interacts with the Console and API requests need to be made to a given Cloud Foundry endpoint, these are sent to the API Server along with a custom http header which indicated which endpoint(s) the requests should be send to. The API Server will forward the request to the appropriate endpoints, first looking up the access and refresh tokens required to communicate with the endpoint(s). If any access token has expired, it will use the refresh token to obtain a new access token.
diff --git a/docs/status_updates.md b/website/docs/status_updates.md
similarity index 100%
rename from docs/status_updates.md
rename to website/docs/status_updates.md
diff --git a/website/docs/talks.md b/website/docs/talks.md
new file mode 100644
index 0000000000..fcfe03a4e8
--- /dev/null
+++ b/website/docs/talks.md
@@ -0,0 +1,13 @@
+---
+id: talks
+title: Talks and Presentations
+sidebar_label: Talks 
+---
+
+|Date|Title|Video|
+|---|---|---|
+|18&nbsp;Sep&nbsp;2019|**Multi-cloud Management: Stratos and Kubernetes**|[Video](https://www.youtube.com/watch?v=mIWy1_672No)|
+|13&nbsp;Sep&nbsp;2019|**Stratos Project Update: The Future of the Stratos Management UI**|[Video](https://www.youtube.com/watch?v=oGN0v7Qpdi4)|
+|16&nbsp;Oct&nbsp;2018|**Stratos: A Cloud Foundry UI - Past, Present and Future**|[Video](https://www.youtube.com/watch?v=oikYcGAMEdE)|
+|27&nbsp;Apr&nbsp;2018|**Stratos UI - An Open Source UI for Cloud Foundry**|[Video](https://www.youtube.com/watch?v=zc_wbsu66lE)|
+|18&nbsp;Oct&nbsp;2017|**Lightning Talk: Cloud Native Application Management with the Stratos Console UI**|[Video](https://www.youtube.com/watch?v=duGpDkdrFmw)|
diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
new file mode 100644
index 0000000000..989742ae37
--- /dev/null
+++ b/website/docusaurus.config.js
@@ -0,0 +1,96 @@
+module.exports = {
+  title: 'STRATOS',
+  tagline: 'Open-Source Multi-Cluster UI for Cloud Foundry and Kubernetes',
+  url: 'https://stratos.app',
+  baseUrl: '/',
+  favicon: 'img/favicon.ico',
+  organizationName: 'cloudfoundry',
+  projectName: 'stratos',
+  themeConfig: {
+    disableDarkMode: true,
+    navbar: {
+      title: 'STRATOS',
+      logo: {
+        alt: 'Stratos',
+        src: 'img/logo.png',
+      },
+      links: [
+        {
+          to: 'docs/',
+          activeBasePath: 'docs',
+          label: 'Docs',
+          position: 'right',
+        },
+        // {to: 'blog', label: 'Blog', position: 'left'},
+        {
+          href: 'https://github.com/cloudfoundry/stratos',
+          label: 'GitHub',
+          position: 'right',
+        },
+      ],
+    },
+    footer: {
+      style: 'dark',
+      links: [
+        {
+          title: 'Docs',
+          items: [
+            {
+              label: 'Getting Started',
+              to: 'docs/',
+            },
+            {
+              label: 'Deploying Stratos',
+              to: 'docs/deploy/overview',
+            },
+          ],
+        },
+        {
+          title: 'Community',
+          items: [
+            {
+              label: 'Slack',
+              href: 'https://cloudfoundry.slack.com/?redir=%2Fmessages%2Fstratos',
+            },
+            {
+              label: 'GitHub',
+              href: 'https://github.com/cloudfoundry/stratos',
+            },
+          ],
+        },
+        
+        {
+          title: 'More',
+          items: [
+            {
+              label: 'Presentations and Talks',
+              to: 'docs/talks',
+            },
+          ],
+        },
+      ],
+      copyright: `Copyright © ${new Date().getFullYear()} Cloud Foundry Foundation`,
+    },
+  },
+  presets: [
+    [
+      '@docusaurus/preset-classic',
+      {
+        docs: {
+          // It is recommended to set document id as docs home page (`docs/` path).
+          homePageId: 'introduction',
+          sidebarPath: require.resolve('./sidebars.js'),
+          // Please change this to your repo.
+          editUrl:
+            'https://github.com/cloudfoundry/stratos/edit/master/website/',
+        },
+        theme: {
+          customCss: require.resolve('./src/css/custom.css'),
+        },
+      },
+    ],
+  ],
+  stylesheets: [
+    //'https://fonts.googleapis.com/icon?family=Material+Icons'
+  ]
+};
diff --git a/website/package-lock.json b/website/package-lock.json
new file mode 100644
index 0000000000..b25d4a0c8c
--- /dev/null
+++ b/website/package-lock.json
@@ -0,0 +1,13192 @@
+{
+  "name": "website",
+  "version": "0.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@babel/code-frame": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+      "requires": {
+        "@babel/highlight": "^7.10.4"
+      }
+    },
+    "@babel/compat-data": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.4.tgz",
+      "integrity": "sha512-t+rjExOrSVvjQQXNp5zAIYDp00KjdvGl/TpDX5REPr0S9IAIPQMTilcfG6q8c0QFmj9lSTVySV2VTsyggvtNIw==",
+      "requires": {
+        "browserslist": "^4.12.0",
+        "invariant": "^2.2.4",
+        "semver": "^5.5.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
+      }
+    },
+    "@babel/core": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.4.tgz",
+      "integrity": "sha512-3A0tS0HWpy4XujGc7QtOIHTeNwUgWaZc/WuS5YQrfhU67jnVmsD6OGPc1AKHH0LJHQICGncy3+YUjIhVlfDdcA==",
+      "requires": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/generator": "^7.10.4",
+        "@babel/helper-module-transforms": "^7.10.4",
+        "@babel/helpers": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/template": "^7.10.4",
+        "@babel/traverse": "^7.10.4",
+        "@babel/types": "^7.10.4",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.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": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
+      }
+    },
+    "@babel/generator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.4.tgz",
+      "integrity": "sha512-toLIHUIAgcQygFZRAQcsLQV3CBuX6yOIru1kJk/qqqvcRmZrYe6WavZTSG+bB8MxhnL9YPf+pKQfuiP161q7ng==",
+      "requires": {
+        "@babel/types": "^7.10.4",
+        "jsesc": "^2.5.1",
+        "lodash": "^4.17.13",
+        "source-map": "^0.5.0"
+      }
+    },
+    "@babel/helper-annotate-as-pure": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
+      "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
+      "requires": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz",
+      "integrity": "sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==",
+      "requires": {
+        "@babel/helper-explode-assignable-expression": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-builder-react-jsx": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.4.tgz",
+      "integrity": "sha512-5nPcIZ7+KKDxT1427oBivl9V9YTal7qk0diccnh7RrcgrT/pGFOjgGw1dgryyx1GvHEpXVfoDF6Ak3rTiWh8Rg==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-builder-react-jsx-experimental": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.4.tgz",
+      "integrity": "sha512-LyacH/kgQPgLAuaWrvvq1+E7f5bLyT8jXCh7nM67sRsy2cpIGfgWJ+FCnAKQXfY+F0tXUaN6FqLkp4JiCzdK8Q==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-module-imports": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-compilation-targets": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz",
+      "integrity": "sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==",
+      "requires": {
+        "@babel/compat-data": "^7.10.4",
+        "browserslist": "^4.12.0",
+        "invariant": "^2.2.4",
+        "levenary": "^1.1.1",
+        "semver": "^5.5.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
+      }
+    },
+    "@babel/helper-create-class-features-plugin": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.4.tgz",
+      "integrity": "sha512-9raUiOsXPxzzLjCXeosApJItoMnX3uyT4QdM2UldffuGApNrF8e938MwNpDCK9CPoyxrEoCgT+hObJc3mZa6lQ==",
+      "requires": {
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/helper-member-expression-to-functions": "^7.10.4",
+        "@babel/helper-optimise-call-expression": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-replace-supers": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.10.4"
+      }
+    },
+    "@babel/helper-create-regexp-features-plugin": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz",
+      "integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-regex": "^7.10.4",
+        "regexpu-core": "^4.7.0"
+      }
+    },
+    "@babel/helper-define-map": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.4.tgz",
+      "integrity": "sha512-nIij0oKErfCnLUCWaCaHW0Bmtl2RO9cN7+u2QT8yqTywgALKlyUVOvHDElh+b5DwVC6YB1FOYFOTWcN/+41EDA==",
+      "requires": {
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/types": "^7.10.4",
+        "lodash": "^4.17.13"
+      }
+    },
+    "@babel/helper-explode-assignable-expression": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz",
+      "integrity": "sha512-4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A==",
+      "requires": {
+        "@babel/traverse": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-function-name": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+      "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+      "requires": {
+        "@babel/helper-get-function-arity": "^7.10.4",
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-get-function-arity": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+      "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+      "requires": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-hoist-variables": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz",
+      "integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==",
+      "requires": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-member-expression-to-functions": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.4.tgz",
+      "integrity": "sha512-m5j85pK/KZhuSdM/8cHUABQTAslV47OjfIB9Cc7P+PvlAoBzdb79BGNfw8RhT5Mq3p+xGd0ZfAKixbrUZx0C7A==",
+      "requires": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-module-imports": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
+      "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+      "requires": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-module-transforms": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.4.tgz",
+      "integrity": "sha512-Er2FQX0oa3nV7eM1o0tNCTx7izmQtwAQsIiaLRWtavAAEcskb0XJ5OjJbVrYXWOTr8om921Scabn4/tzlx7j1Q==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.10.4",
+        "@babel/helper-replace-supers": "^7.10.4",
+        "@babel/helper-simple-access": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.10.4",
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.10.4",
+        "lodash": "^4.17.13"
+      }
+    },
+    "@babel/helper-optimise-call-expression": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
+      "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
+      "requires": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-plugin-utils": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
+      "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="
+    },
+    "@babel/helper-regex": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.4.tgz",
+      "integrity": "sha512-inWpnHGgtg5NOF0eyHlC0/74/VkdRITY9dtTpB2PrxKKn+AkVMRiZz/Adrx+Ssg+MLDesi2zohBW6MVq6b4pOQ==",
+      "requires": {
+        "lodash": "^4.17.13"
+      }
+    },
+    "@babel/helper-remap-async-to-generator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz",
+      "integrity": "sha512-86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-wrap-function": "^7.10.4",
+        "@babel/template": "^7.10.4",
+        "@babel/traverse": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-replace-supers": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
+      "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+      "requires": {
+        "@babel/helper-member-expression-to-functions": "^7.10.4",
+        "@babel/helper-optimise-call-expression": "^7.10.4",
+        "@babel/traverse": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-simple-access": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
+      "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+      "requires": {
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz",
+      "integrity": "sha512-pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg==",
+      "requires": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw=="
+    },
+    "@babel/helper-wrap-function": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz",
+      "integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==",
+      "requires": {
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/template": "^7.10.4",
+        "@babel/traverse": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helpers": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz",
+      "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==",
+      "requires": {
+        "@babel/template": "^7.10.4",
+        "@babel/traverse": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.10.4",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        }
+      }
+    },
+    "@babel/parser": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.4.tgz",
+      "integrity": "sha512-8jHII4hf+YVDsskTF6WuMB3X4Eh+PsUkC2ljq22so5rHvH+T8BzyL94VOdyFLNR8tBSVXOTbNHOKpR4TfRxVtA=="
+    },
+    "@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.4.tgz",
+      "integrity": "sha512-MJbxGSmejEFVOANAezdO39SObkURO5o/8b6fSH6D1pi9RZQt+ldppKPXfqgUWpSQ9asM6xaSaSJIaeWMDRP0Zg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-remap-async-to-generator": "^7.10.4",
+        "@babel/plugin-syntax-async-generators": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-class-properties": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz",
+      "integrity": "sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==",
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-proposal-dynamic-import": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz",
+      "integrity": "sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-json-strings": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz",
+      "integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-json-strings": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-nullish-coalescing-operator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz",
+      "integrity": "sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      }
+    },
+    "@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz",
+      "integrity": "sha512-6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
+        "@babel/plugin-transform-parameters": "^7.10.4"
+      }
+    },
+    "@babel/plugin-proposal-optional-catch-binding": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz",
+      "integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-optional-chaining": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.4.tgz",
+      "integrity": "sha512-ZIhQIEeavTgouyMSdZRap4VPPHqJJ3NEs2cuHs5p0erH+iz6khB0qfgU8g7UuJkG88+fBMy23ZiU+nuHvekJeQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-private-methods": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz",
+      "integrity": "sha512-wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==",
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-proposal-unicode-property-regex": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz",
+      "integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==",
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-async-generators": {
+      "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==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-class-properties": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz",
+      "integrity": "sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-dynamic-import": {
+      "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==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-json-strings": {
+      "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==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-jsx": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.4.tgz",
+      "integrity": "sha512-KCg9mio9jwiARCB7WAcQ7Y1q+qicILjoK8LP/VkPkEKaf5dkaZZK1EcTe91a3JJlZ3qy6L5s9X52boEYi8DM9g==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@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==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-object-rest-spread": {
+      "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==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-catch-binding": {
+      "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==",
+      "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==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-top-level-await": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz",
+      "integrity": "sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-typescript": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.4.tgz",
+      "integrity": "sha512-oSAEz1YkBCAKr5Yiq8/BNtvSAPwkp/IyUnwZogd8p+F0RuYQQrLeRUzIQhueQTTBy/F+a40uS7OFKxnkRvmvFQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-arrow-functions": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz",
+      "integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-async-to-generator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz",
+      "integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-remap-async-to-generator": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz",
+      "integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-block-scoping": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.4.tgz",
+      "integrity": "sha512-J3b5CluMg3hPUii2onJDRiaVbPtKFPLEaV5dOPY5OeAbDi1iU/UbbFFTgwb7WnanaDy7bjU35kc26W3eM5Qa0A==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "lodash": "^4.17.13"
+      }
+    },
+    "@babel/plugin-transform-classes": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz",
+      "integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-define-map": "^7.10.4",
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/helper-optimise-call-expression": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-replace-supers": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.10.4",
+        "globals": "^11.1.0"
+      }
+    },
+    "@babel/plugin-transform-computed-properties": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz",
+      "integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-destructuring": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz",
+      "integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-dotall-regex": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz",
+      "integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==",
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-duplicate-keys": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz",
+      "integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz",
+      "integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==",
+      "requires": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-for-of": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz",
+      "integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-function-name": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz",
+      "integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==",
+      "requires": {
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-literals": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz",
+      "integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-member-expression-literals": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz",
+      "integrity": "sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-modules-amd": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.4.tgz",
+      "integrity": "sha512-3Fw+H3WLUrTlzi3zMiZWp3AR4xadAEMv6XRCYnd5jAlLM61Rn+CRJaZMaNvIpcJpQ3vs1kyifYvEVPFfoSkKOA==",
+      "requires": {
+        "@babel/helper-module-transforms": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      }
+    },
+    "@babel/plugin-transform-modules-commonjs": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz",
+      "integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==",
+      "requires": {
+        "@babel/helper-module-transforms": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-simple-access": "^7.10.4",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      }
+    },
+    "@babel/plugin-transform-modules-systemjs": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.4.tgz",
+      "integrity": "sha512-Tb28LlfxrTiOTGtZFsvkjpyjCl9IoaRI52AEU/VIwOwvDQWtbNJsAqTXzh+5R7i74e/OZHH2c2w2fsOqAfnQYQ==",
+      "requires": {
+        "@babel/helper-hoist-variables": "^7.10.4",
+        "@babel/helper-module-transforms": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      }
+    },
+    "@babel/plugin-transform-modules-umd": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz",
+      "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==",
+      "requires": {
+        "@babel/helper-module-transforms": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz",
+      "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==",
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-new-target": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz",
+      "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-object-super": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz",
+      "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-replace-supers": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-parameters": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.4.tgz",
+      "integrity": "sha512-RurVtZ/D5nYfEg0iVERXYKEgDFeesHrHfx8RT05Sq57ucj2eOYAP6eu5fynL4Adju4I/mP/I6SO0DqNWAXjfLQ==",
+      "requires": {
+        "@babel/helper-get-function-arity": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-property-literals": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz",
+      "integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-react-constant-elements": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.10.4.tgz",
+      "integrity": "sha512-cYmQBW1pXrqBte1raMkAulXmi7rjg3VI6ZLg9QIic8Hq7BtYXaWuZSxsr2siOMI6SWwpxjWfnwhTUrd7JlAV7g==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-react-display-name": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.4.tgz",
+      "integrity": "sha512-Zd4X54Mu9SBfPGnEcaGcOrVAYOtjT2on8QZkLKEq1S/tHexG39d9XXGZv19VfRrDjPJzFmPfTAqOQS1pfFOujw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-react-jsx": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.4.tgz",
+      "integrity": "sha512-L+MfRhWjX0eI7Js093MM6MacKU4M6dnCRa/QPDwYMxjljzSCzzlzKzj9Pk4P3OtrPcxr2N3znR419nr3Xw+65A==",
+      "requires": {
+        "@babel/helper-builder-react-jsx": "^7.10.4",
+        "@babel/helper-builder-react-jsx-experimental": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-jsx": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-react-jsx-development": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.10.4.tgz",
+      "integrity": "sha512-RM3ZAd1sU1iQ7rI2dhrZRZGv0aqzNQMbkIUCS1txYpi9wHQ2ZHNjo5TwX+UD6pvFW4AbWqLVYvKy5qJSAyRGjQ==",
+      "requires": {
+        "@babel/helper-builder-react-jsx-experimental": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-jsx": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-react-jsx-self": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.10.4.tgz",
+      "integrity": "sha512-yOvxY2pDiVJi0axdTWHSMi5T0DILN+H+SaeJeACHKjQLezEzhLx9nEF9xgpBLPtkZsks9cnb5P9iBEi21En3gg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-jsx": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-react-jsx-source": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.4.tgz",
+      "integrity": "sha512-FTK3eQFrPv2aveerUSazFmGygqIdTtvskG50SnGnbEUnRPcGx2ylBhdFIzoVS1ty44hEgcPoCAyw5r3VDEq+Ug==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-jsx": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-react-pure-annotations": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.10.4.tgz",
+      "integrity": "sha512-+njZkqcOuS8RaPakrnR9KvxjoG1ASJWpoIv/doyWngId88JoFlPlISenGXjrVacZUIALGUr6eodRs1vmPnF23A==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-regenerator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz",
+      "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==",
+      "requires": {
+        "regenerator-transform": "^0.14.2"
+      }
+    },
+    "@babel/plugin-transform-reserved-words": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz",
+      "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-runtime": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.4.tgz",
+      "integrity": "sha512-8ULlGv8p+Vuxu+kz2Y1dk6MYS2b/Dki+NO6/0ZlfSj5tMalfDL7jI/o/2a+rrWLqSXvnadEqc2WguB4gdQIxZw==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "resolve": "^1.8.1",
+        "semver": "^5.5.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
+      }
+    },
+    "@babel/plugin-transform-shorthand-properties": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz",
+      "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-spread": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.4.tgz",
+      "integrity": "sha512-1e/51G/Ni+7uH5gktbWv+eCED9pP8ZpRhZB3jOaI3mmzfvJTWHkuyYTv0Z5PYtyM+Tr2Ccr9kUdQxn60fI5WuQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-sticky-regex": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz",
+      "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-regex": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-template-literals": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.4.tgz",
+      "integrity": "sha512-4NErciJkAYe+xI5cqfS8pV/0ntlY5N5Ske/4ImxAVX7mk9Rxt2bwDTGv1Msc2BRJvWQcmYEC+yoMLdX22aE4VQ==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-typeof-symbol": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz",
+      "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-typescript": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.10.4.tgz",
+      "integrity": "sha512-3WpXIKDJl/MHoAN0fNkSr7iHdUMHZoppXjf2HJ9/ed5Xht5wNIsXllJXdityKOxeA3Z8heYRb1D3p2H5rfCdPw==",
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-typescript": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-unicode-escapes": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz",
+      "integrity": "sha512-y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-unicode-regex": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz",
+      "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==",
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/preset-env": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.10.4.tgz",
+      "integrity": "sha512-tcmuQ6vupfMZPrLrc38d0sF2OjLT3/bZ0dry5HchNCQbrokoQi4reXqclvkkAT5b+gWc23meVWpve5P/7+w/zw==",
+      "requires": {
+        "@babel/compat-data": "^7.10.4",
+        "@babel/helper-compilation-targets": "^7.10.4",
+        "@babel/helper-module-imports": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-proposal-async-generator-functions": "^7.10.4",
+        "@babel/plugin-proposal-class-properties": "^7.10.4",
+        "@babel/plugin-proposal-dynamic-import": "^7.10.4",
+        "@babel/plugin-proposal-json-strings": "^7.10.4",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",
+        "@babel/plugin-proposal-numeric-separator": "^7.10.4",
+        "@babel/plugin-proposal-object-rest-spread": "^7.10.4",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.10.4",
+        "@babel/plugin-proposal-optional-chaining": "^7.10.4",
+        "@babel/plugin-proposal-private-methods": "^7.10.4",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.10.4",
+        "@babel/plugin-syntax-async-generators": "^7.8.0",
+        "@babel/plugin-syntax-class-properties": "^7.10.4",
+        "@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.10.4",
+        "@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.10.4",
+        "@babel/plugin-transform-arrow-functions": "^7.10.4",
+        "@babel/plugin-transform-async-to-generator": "^7.10.4",
+        "@babel/plugin-transform-block-scoped-functions": "^7.10.4",
+        "@babel/plugin-transform-block-scoping": "^7.10.4",
+        "@babel/plugin-transform-classes": "^7.10.4",
+        "@babel/plugin-transform-computed-properties": "^7.10.4",
+        "@babel/plugin-transform-destructuring": "^7.10.4",
+        "@babel/plugin-transform-dotall-regex": "^7.10.4",
+        "@babel/plugin-transform-duplicate-keys": "^7.10.4",
+        "@babel/plugin-transform-exponentiation-operator": "^7.10.4",
+        "@babel/plugin-transform-for-of": "^7.10.4",
+        "@babel/plugin-transform-function-name": "^7.10.4",
+        "@babel/plugin-transform-literals": "^7.10.4",
+        "@babel/plugin-transform-member-expression-literals": "^7.10.4",
+        "@babel/plugin-transform-modules-amd": "^7.10.4",
+        "@babel/plugin-transform-modules-commonjs": "^7.10.4",
+        "@babel/plugin-transform-modules-systemjs": "^7.10.4",
+        "@babel/plugin-transform-modules-umd": "^7.10.4",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.10.4",
+        "@babel/plugin-transform-new-target": "^7.10.4",
+        "@babel/plugin-transform-object-super": "^7.10.4",
+        "@babel/plugin-transform-parameters": "^7.10.4",
+        "@babel/plugin-transform-property-literals": "^7.10.4",
+        "@babel/plugin-transform-regenerator": "^7.10.4",
+        "@babel/plugin-transform-reserved-words": "^7.10.4",
+        "@babel/plugin-transform-shorthand-properties": "^7.10.4",
+        "@babel/plugin-transform-spread": "^7.10.4",
+        "@babel/plugin-transform-sticky-regex": "^7.10.4",
+        "@babel/plugin-transform-template-literals": "^7.10.4",
+        "@babel/plugin-transform-typeof-symbol": "^7.10.4",
+        "@babel/plugin-transform-unicode-escapes": "^7.10.4",
+        "@babel/plugin-transform-unicode-regex": "^7.10.4",
+        "@babel/preset-modules": "^0.1.3",
+        "@babel/types": "^7.10.4",
+        "browserslist": "^4.12.0",
+        "core-js-compat": "^3.6.2",
+        "invariant": "^2.2.2",
+        "levenary": "^1.1.1",
+        "semver": "^5.5.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
+      }
+    },
+    "@babel/preset-modules": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz",
+      "integrity": "sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
+      }
+    },
+    "@babel/preset-react": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.10.4.tgz",
+      "integrity": "sha512-BrHp4TgOIy4M19JAfO1LhycVXOPWdDbTRep7eVyatf174Hff+6Uk53sDyajqZPu8W1qXRBiYOfIamek6jA7YVw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-transform-react-display-name": "^7.10.4",
+        "@babel/plugin-transform-react-jsx": "^7.10.4",
+        "@babel/plugin-transform-react-jsx-development": "^7.10.4",
+        "@babel/plugin-transform-react-jsx-self": "^7.10.4",
+        "@babel/plugin-transform-react-jsx-source": "^7.10.4",
+        "@babel/plugin-transform-react-pure-annotations": "^7.10.4"
+      }
+    },
+    "@babel/preset-typescript": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.10.4.tgz",
+      "integrity": "sha512-SdYnvGPv+bLlwkF2VkJnaX/ni1sMNetcGI1+nThF1gyv6Ph8Qucc4ZZAjM5yZcE/AKRXIOTZz7eSRDWOEjPyRQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-transform-typescript": "^7.10.4"
+      }
+    },
+    "@babel/runtime": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.4.tgz",
+      "integrity": "sha512-UpTN5yUJr9b4EX2CnGNWIvER7Ab83ibv0pcvvHc4UOdrBI5jb8bj+32cCwPX6xu0mt2daFNjYhoi+X7beH0RSw==",
+      "requires": {
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
+    "@babel/template": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+      "requires": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.4.tgz",
+      "integrity": "sha512-aSy7p5THgSYm4YyxNGz6jZpXf+Ok40QF3aA2LyIONkDHpAcJzDUqlCKXv6peqYUs2gmic849C/t2HKw2a2K20Q==",
+      "requires": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/generator": "^7.10.4",
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0",
+        "lodash": "^4.17.13"
+      }
+    },
+    "@babel/types": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.4.tgz",
+      "integrity": "sha512-UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg==",
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.10.4",
+        "lodash": "^4.17.13",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "@csstools/convert-colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz",
+      "integrity": "sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw=="
+    },
+    "@docusaurus/core": {
+      "version": "2.0.0-alpha.58",
+      "resolved": "https://registry.npmjs.org/@docusaurus/core/-/core-2.0.0-alpha.58.tgz",
+      "integrity": "sha512-7VW7IQKTxTIeCXxzraLdTqRtYSmEG2ZJDt07z26NjK+17XyNQc0IoJs7M3xhjzaeP0s/CpYe5Yl+pgp6TIXqoA==",
+      "requires": {
+        "@babel/core": "^7.9.0",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-transform-runtime": "^7.9.0",
+        "@babel/preset-env": "^7.9.0",
+        "@babel/preset-react": "^7.9.4",
+        "@babel/preset-typescript": "^7.9.0",
+        "@babel/runtime": "^7.9.2",
+        "@docusaurus/utils": "^2.0.0-alpha.58",
+        "@endiliey/static-site-generator-webpack-plugin": "^4.0.0",
+        "@svgr/webpack": "^5.4.0",
+        "babel-loader": "^8.1.0",
+        "babel-plugin-dynamic-import-node": "^2.3.0",
+        "cache-loader": "^4.1.0",
+        "chalk": "^3.0.0",
+        "chokidar": "^3.3.0",
+        "commander": "^4.0.1",
+        "copy-webpack-plugin": "^5.0.5",
+        "core-js": "^2.6.5",
+        "css-loader": "^3.4.2",
+        "del": "^5.1.0",
+        "eta": "^1.1.1",
+        "express": "^4.17.1",
+        "fs-extra": "^8.1.0",
+        "globby": "^10.0.1",
+        "html-minifier-terser": "^5.0.5",
+        "html-tags": "^3.1.0",
+        "html-webpack-plugin": "^4.0.4",
+        "import-fresh": "^3.2.1",
+        "lodash.has": "^4.5.2",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.isstring": "^4.0.1",
+        "mini-css-extract-plugin": "^0.8.0",
+        "nprogress": "^0.2.0",
+        "null-loader": "^3.0.0",
+        "optimize-css-assets-webpack-plugin": "^5.0.3",
+        "pnp-webpack-plugin": "^1.6.4",
+        "portfinder": "^1.0.25",
+        "postcss-loader": "^3.0.0",
+        "postcss-preset-env": "^6.7.0",
+        "react-dev-utils": "^10.2.1",
+        "react-helmet": "^6.0.0-beta",
+        "react-loadable": "^5.5.0",
+        "react-loadable-ssr-addon": "^0.2.3",
+        "react-router": "^5.1.2",
+        "react-router-config": "^5.1.1",
+        "react-router-dom": "^5.1.2",
+        "semver": "^6.3.0",
+        "shelljs": "^0.8.4",
+        "std-env": "^2.2.1",
+        "terser-webpack-plugin": "^2.3.5",
+        "wait-file": "^1.0.5",
+        "webpack": "^4.41.2",
+        "webpack-bundle-analyzer": "^3.6.1",
+        "webpack-dev-server": "^3.11.0",
+        "webpack-merge": "^4.2.2",
+        "webpackbar": "^4.0.0"
+      }
+    },
+    "@docusaurus/mdx-loader": {
+      "version": "2.0.0-alpha.58",
+      "resolved": "https://registry.npmjs.org/@docusaurus/mdx-loader/-/mdx-loader-2.0.0-alpha.58.tgz",
+      "integrity": "sha512-g/uqzaoaRkwuPmjOB7/p58vNFLev9yE3FdkVfD19mSHyaMaKAzWGUiJxkaxPFtxCs4mwFWk7tJKSLY+B8MjS2Q==",
+      "requires": {
+        "@babel/parser": "^7.9.4",
+        "@babel/traverse": "^7.9.0",
+        "@mdx-js/mdx": "^1.5.8",
+        "@mdx-js/react": "^1.5.8",
+        "escape-html": "^1.0.3",
+        "fs-extra": "^8.1.0",
+        "github-slugger": "^1.3.0",
+        "gray-matter": "^4.0.2",
+        "loader-utils": "^1.2.3",
+        "mdast-util-to-string": "^1.1.0",
+        "remark-emoji": "^2.1.0",
+        "stringify-object": "^3.3.0",
+        "unist-util-visit": "^2.0.2"
+      },
+      "dependencies": {
+        "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==",
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        }
+      }
+    },
+    "@docusaurus/plugin-content-blog": {
+      "version": "2.0.0-alpha.58",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-blog/-/plugin-content-blog-2.0.0-alpha.58.tgz",
+      "integrity": "sha512-2Pn15pwPdnmKLAvNd4bk2XclnGtGYCpfAECypm9tBql6W6MShy0qOHH3JGLY8dQIMySsCkuC3jCl26EwXNgARw==",
+      "requires": {
+        "@docusaurus/mdx-loader": "^2.0.0-alpha.58",
+        "@docusaurus/utils": "^2.0.0-alpha.58",
+        "feed": "^4.1.0",
+        "fs-extra": "^8.1.0",
+        "globby": "^10.0.1",
+        "loader-utils": "^1.2.3",
+        "lodash.kebabcase": "^4.1.1",
+        "reading-time": "^1.2.0",
+        "remark-admonitions": "^1.2.1"
+      },
+      "dependencies": {
+        "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==",
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        }
+      }
+    },
+    "@docusaurus/plugin-content-docs": {
+      "version": "2.0.0-alpha.58",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-docs/-/plugin-content-docs-2.0.0-alpha.58.tgz",
+      "integrity": "sha512-+PHqften1daJXBxUZTN5pMIRP7NwGU7reO4QX0iy7Qp1Wqs63KPY/nSeM7dtxKCYtU+yWkLogvFlicARVqRU9A==",
+      "requires": {
+        "@docusaurus/mdx-loader": "^2.0.0-alpha.58",
+        "@docusaurus/utils": "^2.0.0-alpha.58",
+        "execa": "^3.4.0",
+        "fs-extra": "^8.1.0",
+        "globby": "^10.0.1",
+        "import-fresh": "^3.2.1",
+        "loader-utils": "^1.2.3",
+        "lodash.flatmap": "^4.5.0",
+        "lodash.groupby": "^4.6.0",
+        "lodash.pick": "^4.4.0",
+        "lodash.pickby": "^4.6.0",
+        "remark-admonitions": "^1.2.1",
+        "shelljs": "^0.8.4"
+      },
+      "dependencies": {
+        "execa": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz",
+          "integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==",
+          "requires": {
+            "cross-spawn": "^7.0.0",
+            "get-stream": "^5.0.0",
+            "human-signals": "^1.1.1",
+            "is-stream": "^2.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^4.0.0",
+            "onetime": "^5.1.0",
+            "p-finally": "^2.0.0",
+            "signal-exit": "^3.0.2",
+            "strip-final-newline": "^2.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
+          "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "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=="
+        },
+        "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==",
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        },
+        "npm-run-path": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+          "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+          "requires": {
+            "path-key": "^3.0.0"
+          }
+        },
+        "p-finally": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
+          "integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw=="
+        }
+      }
+    },
+    "@docusaurus/plugin-content-pages": {
+      "version": "2.0.0-alpha.58",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-pages/-/plugin-content-pages-2.0.0-alpha.58.tgz",
+      "integrity": "sha512-4LJn2CB83ZCkM4+0qNQWdm4gA2Og3QzmUfSqYOifTmsVsHuLSAqa5zRkkSSsZ244r+ya4e7nmS7nMd7kfK+v4w==",
+      "requires": {
+        "@docusaurus/types": "^2.0.0-alpha.58",
+        "@docusaurus/utils": "^2.0.0-alpha.58",
+        "globby": "^10.0.1"
+      }
+    },
+    "@docusaurus/plugin-debug": {
+      "version": "2.0.0-alpha.58",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-debug/-/plugin-debug-2.0.0-alpha.58.tgz",
+      "integrity": "sha512-w7sEUzuavp5N4TxgJus1TLFwRkypvg9+mRYZN+mgV05WF3ft+aDTToWeYNZq/8FoC1IEwkezOpPpaWtG4UWM7Q==",
+      "requires": {
+        "@docusaurus/types": "^2.0.0-alpha.58",
+        "@docusaurus/utils": "^2.0.0-alpha.58"
+      }
+    },
+    "@docusaurus/plugin-google-analytics": {
+      "version": "2.0.0-alpha.58",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-2.0.0-alpha.58.tgz",
+      "integrity": "sha512-R4I8j+XJkOl7fz8+lRnQKr8YP4zrG6dWBNZ66JquUwL6jmaavq1VRVavm7/s5Wr/vYLcpEWjynHViwDdVLegoQ=="
+    },
+    "@docusaurus/plugin-google-gtag": {
+      "version": "2.0.0-alpha.58",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-2.0.0-alpha.58.tgz",
+      "integrity": "sha512-t+B6K2/EvRofygDK5edeQAg2l069aU7H3sViG/3USpJSaY9bWNWRKjZk6BEOypC+mCW6g5HQgewQZ/bTkV+aDA=="
+    },
+    "@docusaurus/plugin-sitemap": {
+      "version": "2.0.0-alpha.58",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-sitemap/-/plugin-sitemap-2.0.0-alpha.58.tgz",
+      "integrity": "sha512-OS3XZG1S/USyZxSZ4e2pputW3sOl/hxvK+EAs51eOi/fYyVgO4BmFpcsoP17a5d1Cnxf8gumOkS6bLRDaG8KyQ==",
+      "requires": {
+        "@docusaurus/types": "^2.0.0-alpha.58",
+        "sitemap": "^3.2.2"
+      }
+    },
+    "@docusaurus/preset-classic": {
+      "version": "2.0.0-alpha.58",
+      "resolved": "https://registry.npmjs.org/@docusaurus/preset-classic/-/preset-classic-2.0.0-alpha.58.tgz",
+      "integrity": "sha512-XGXC5NcAkRUKpm4aho6moThPtLarGSouWW1xfYMQlT4dY6RG/FFt8n5viMXzGwOfA/H9B/s0sZpqHDw8U4FUCg==",
+      "requires": {
+        "@docusaurus/plugin-content-blog": "^2.0.0-alpha.58",
+        "@docusaurus/plugin-content-docs": "^2.0.0-alpha.58",
+        "@docusaurus/plugin-content-pages": "^2.0.0-alpha.58",
+        "@docusaurus/plugin-debug": "^2.0.0-alpha.58",
+        "@docusaurus/plugin-google-analytics": "^2.0.0-alpha.58",
+        "@docusaurus/plugin-google-gtag": "^2.0.0-alpha.58",
+        "@docusaurus/plugin-sitemap": "^2.0.0-alpha.58",
+        "@docusaurus/theme-classic": "^2.0.0-alpha.58",
+        "@docusaurus/theme-search-algolia": "^2.0.0-alpha.58"
+      }
+    },
+    "@docusaurus/theme-classic": {
+      "version": "2.0.0-alpha.58",
+      "resolved": "https://registry.npmjs.org/@docusaurus/theme-classic/-/theme-classic-2.0.0-alpha.58.tgz",
+      "integrity": "sha512-GvpzpsL3jTxm/3sPna7wOJaAauCha+uLZ33x/XOMKrfN02E2BLkaRphRyCliw1vvLXB3rJPlHyvBdKCTOVXaNw==",
+      "requires": {
+        "@mdx-js/mdx": "^1.5.8",
+        "@mdx-js/react": "^1.5.8",
+        "clsx": "^1.1.1",
+        "copy-text-to-clipboard": "^2.2.0",
+        "infima": "0.2.0-alpha.12",
+        "parse-numeric-range": "^0.0.2",
+        "prism-react-renderer": "^1.1.0",
+        "prismjs": "^1.20.0",
+        "prop-types": "^15.7.2",
+        "react-router-dom": "^5.1.2",
+        "react-toggle": "^4.1.1"
+      }
+    },
+    "@docusaurus/theme-search-algolia": {
+      "version": "2.0.0-alpha.58",
+      "resolved": "https://registry.npmjs.org/@docusaurus/theme-search-algolia/-/theme-search-algolia-2.0.0-alpha.58.tgz",
+      "integrity": "sha512-Iug5mET733Yx46E04BfJjz4+AvxzalRo8G4ZmOjePTMiKQpE1ee39Ypbwj77c8XxEadOcZC4mJtfxB3L1RqlBA==",
+      "requires": {
+        "algoliasearch": "^3.24.5",
+        "algoliasearch-helper": "^3.1.1",
+        "clsx": "^1.1.1",
+        "docsearch.js": "^2.6.3",
+        "eta": "^1.1.1"
+      }
+    },
+    "@docusaurus/types": {
+      "version": "2.0.0-alpha.58",
+      "resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-2.0.0-alpha.58.tgz",
+      "integrity": "sha512-OSkxoLwWJMhEHa4s6SXVCjfGwYm21yF6ZggoUo6kz+qqslTgF/JcPCVF9Y1Hf6bJJxUisi+ZHrHKEC6k4pphPA==",
+      "requires": {
+        "@types/webpack": "^4.41.0",
+        "commander": "^4.0.1",
+        "querystring": "0.2.0"
+      }
+    },
+    "@docusaurus/utils": {
+      "version": "2.0.0-alpha.58",
+      "resolved": "https://registry.npmjs.org/@docusaurus/utils/-/utils-2.0.0-alpha.58.tgz",
+      "integrity": "sha512-hBhdQCyVT15mH7RE5yuDBuhwbUnM4beKq2JLvRuZS4FoNu7T2S4OGusUAtTnNZEruoUv2QTkt+GrsRDKYi2fCA==",
+      "requires": {
+        "escape-string-regexp": "^2.0.0",
+        "fs-extra": "^8.1.0",
+        "gray-matter": "^4.0.2",
+        "lodash.camelcase": "^4.3.0",
+        "lodash.kebabcase": "^4.1.1"
+      },
+      "dependencies": {
+        "escape-string-regexp": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="
+        }
+      }
+    },
+    "@endiliey/static-site-generator-webpack-plugin": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@endiliey/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-4.0.0.tgz",
+      "integrity": "sha512-3MBqYCs30qk1OBRC697NqhGouYbs71D1B8hrk/AFJC6GwF2QaJOQZtA1JYAaGSe650sZ8r5ppRTtCRXepDWlng==",
+      "requires": {
+        "bluebird": "^3.7.1",
+        "cheerio": "^0.22.0",
+        "eval": "^0.1.4",
+        "url": "^0.11.0",
+        "webpack-sources": "^1.4.3"
+      }
+    },
+    "@hapi/address": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz",
+      "integrity": "sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ=="
+    },
+    "@hapi/bourne": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz",
+      "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="
+    },
+    "@hapi/hoek": {
+      "version": "8.5.1",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz",
+      "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow=="
+    },
+    "@hapi/joi": {
+      "version": "15.1.1",
+      "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz",
+      "integrity": "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==",
+      "requires": {
+        "@hapi/address": "2.x.x",
+        "@hapi/bourne": "1.x.x",
+        "@hapi/hoek": "8.x.x",
+        "@hapi/topo": "3.x.x"
+      }
+    },
+    "@hapi/topo": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz",
+      "integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==",
+      "requires": {
+        "@hapi/hoek": "^8.3.0"
+      }
+    },
+    "@mdx-js/mdx": {
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.6.tgz",
+      "integrity": "sha512-Q1j/RtjNbRZRC/ciaOqQLplsJ9lb0jJhDSvkusmzCsCX+NZH7YTUvccWf7l6zKW1CAiofJfqZdZtXkeJUDZiMw==",
+      "requires": {
+        "@babel/core": "7.9.6",
+        "@babel/plugin-syntax-jsx": "7.8.3",
+        "@babel/plugin-syntax-object-rest-spread": "7.8.3",
+        "@mdx-js/util": "^1.6.6",
+        "babel-plugin-apply-mdx-type-prop": "^1.6.6",
+        "babel-plugin-extract-import-names": "^1.6.6",
+        "camelcase-css": "2.0.1",
+        "detab": "2.0.3",
+        "hast-util-raw": "5.0.2",
+        "lodash.uniq": "4.5.0",
+        "mdast-util-to-hast": "9.1.0",
+        "remark-footnotes": "1.0.0",
+        "remark-mdx": "^1.6.6",
+        "remark-parse": "8.0.2",
+        "remark-squeeze-paragraphs": "4.0.0",
+        "style-to-object": "0.3.0",
+        "unified": "9.0.0",
+        "unist-builder": "2.0.3",
+        "unist-util-visit": "2.0.2"
+      },
+      "dependencies": {
+        "@babel/core": {
+          "version": "7.9.6",
+          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz",
+          "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==",
+          "requires": {
+            "@babel/code-frame": "^7.8.3",
+            "@babel/generator": "^7.9.6",
+            "@babel/helper-module-transforms": "^7.9.0",
+            "@babel/helpers": "^7.9.6",
+            "@babel/parser": "^7.9.6",
+            "@babel/template": "^7.8.6",
+            "@babel/traverse": "^7.9.6",
+            "@babel/types": "^7.9.6",
+            "convert-source-map": "^1.7.0",
+            "debug": "^4.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"
+          }
+        },
+        "@babel/plugin-syntax-jsx": {
+          "version": "7.8.3",
+          "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.8.3.tgz",
+          "integrity": "sha512-WxdW9xyLgBdefoo0Ynn3MRSkhe5tFVxxKNVdnZSh318WrG2e2jH+E9wd/++JsqcLJZPfz87njQJ8j2Upjm0M0A==",
+          "requires": {
+            "@babel/helper-plugin-utils": "^7.8.3"
+          }
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        },
+        "unist-util-is": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.2.tgz",
+          "integrity": "sha512-Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ=="
+        },
+        "unist-util-visit": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.2.tgz",
+          "integrity": "sha512-HoHNhGnKj6y+Sq+7ASo2zpVdfdRifhTgX2KTU3B/sO/TTlZchp7E3S4vjRzDJ7L60KmrCPsQkVK3lEF3cz36XQ==",
+          "requires": {
+            "@types/unist": "^2.0.0",
+            "unist-util-is": "^4.0.0",
+            "unist-util-visit-parents": "^3.0.0"
+          }
+        }
+      }
+    },
+    "@mdx-js/react": {
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-1.6.6.tgz",
+      "integrity": "sha512-zOOdNreHUNSFQ0dg3wYYg9sOGg2csf7Sk8JGBigeBq+4Xk4LO0QdycGAmgKNfeme+SyBV5LBIPjt1NNsScyWEQ=="
+    },
+    "@mdx-js/util": {
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.6.tgz",
+      "integrity": "sha512-PKTHVgMHnK5p+kcMWWNnZuoR7O19VmHiOujmVcyN50hya7qIdDb5vvsYC+dwLxApEXiABhLozq0dlIwFeS3yjg=="
+    },
+    "@mrmlnc/readdir-enhanced": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
+      "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
+      "requires": {
+        "call-me-maybe": "^1.0.1",
+        "glob-to-regexp": "^0.3.0"
+      }
+    },
+    "@nodelib/fs.scandir": {
+      "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==",
+      "requires": {
+        "@nodelib/fs.stat": "2.0.3",
+        "run-parallel": "^1.1.9"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
+      "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA=="
+    },
+    "@nodelib/fs.walk": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
+      "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.3",
+        "fastq": "^1.6.0"
+      }
+    },
+    "@svgr/babel-plugin-add-jsx-attribute": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.4.0.tgz",
+      "integrity": "sha512-ZFf2gs/8/6B8PnSofI0inYXr2SDNTDScPXhN7k5EqD4aZ3gi6u+rbmZHVB8IM3wDyx8ntKACZbtXSm7oZGRqVg=="
+    },
+    "@svgr/babel-plugin-remove-jsx-attribute": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-5.4.0.tgz",
+      "integrity": "sha512-yaS4o2PgUtwLFGTKbsiAy6D0o3ugcUhWK0Z45umJ66EPWunAz9fuFw2gJuje6wqQvQWOTJvIahUwndOXb7QCPg=="
+    },
+    "@svgr/babel-plugin-remove-jsx-empty-expression": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-5.0.1.tgz",
+      "integrity": "sha512-LA72+88A11ND/yFIMzyuLRSMJ+tRKeYKeQ+mR3DcAZ5I4h5CPWN9AHyUzJbWSYp/u2u0xhmgOe0+E41+GjEueA=="
+    },
+    "@svgr/babel-plugin-replace-jsx-attribute-value": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-5.0.1.tgz",
+      "integrity": "sha512-PoiE6ZD2Eiy5mK+fjHqwGOS+IXX0wq/YDtNyIgOrc6ejFnxN4b13pRpiIPbtPwHEc+NT2KCjteAcq33/F1Y9KQ=="
+    },
+    "@svgr/babel-plugin-svg-dynamic-title": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-5.4.0.tgz",
+      "integrity": "sha512-zSOZH8PdZOpuG1ZVx/cLVePB2ibo3WPpqo7gFIjLV9a0QsuQAzJiwwqmuEdTaW2pegyBE17Uu15mOgOcgabQZg=="
+    },
+    "@svgr/babel-plugin-svg-em-dimensions": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-5.4.0.tgz",
+      "integrity": "sha512-cPzDbDA5oT/sPXDCUYoVXEmm3VIoAWAPT6mSPTJNbQaBNUuEKVKyGH93oDY4e42PYHRW67N5alJx/eEol20abw=="
+    },
+    "@svgr/babel-plugin-transform-react-native-svg": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-5.4.0.tgz",
+      "integrity": "sha512-3eYP/SaopZ41GHwXma7Rmxcv9uRslRDTY1estspeB1w1ueZWd/tPlMfEOoccYpEMZU3jD4OU7YitnXcF5hLW2Q=="
+    },
+    "@svgr/babel-plugin-transform-svg-component": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.4.0.tgz",
+      "integrity": "sha512-zLl4Fl3NvKxxjWNkqEcpdSOpQ3LGVH2BNFQ6vjaK6sFo2IrSznrhURIPI0HAphKiiIwNYjAfE0TNoQDSZv0U9A=="
+    },
+    "@svgr/babel-preset": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-5.4.0.tgz",
+      "integrity": "sha512-Gyx7cCxua04DBtyILTYdQxeO/pwfTBev6+eXTbVbxe4HTGhOUW6yo7PSbG2p6eJMl44j6XSequ0ZDP7bl0nu9A==",
+      "requires": {
+        "@svgr/babel-plugin-add-jsx-attribute": "^5.4.0",
+        "@svgr/babel-plugin-remove-jsx-attribute": "^5.4.0",
+        "@svgr/babel-plugin-remove-jsx-empty-expression": "^5.0.1",
+        "@svgr/babel-plugin-replace-jsx-attribute-value": "^5.0.1",
+        "@svgr/babel-plugin-svg-dynamic-title": "^5.4.0",
+        "@svgr/babel-plugin-svg-em-dimensions": "^5.4.0",
+        "@svgr/babel-plugin-transform-react-native-svg": "^5.4.0",
+        "@svgr/babel-plugin-transform-svg-component": "^5.4.0"
+      }
+    },
+    "@svgr/core": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@svgr/core/-/core-5.4.0.tgz",
+      "integrity": "sha512-hWGm1DCCvd4IEn7VgDUHYiC597lUYhFau2lwJBYpQWDirYLkX4OsXu9IslPgJ9UpP7wsw3n2Ffv9sW7SXJVfqQ==",
+      "requires": {
+        "@svgr/plugin-jsx": "^5.4.0",
+        "camelcase": "^6.0.0",
+        "cosmiconfig": "^6.0.0"
+      }
+    },
+    "@svgr/hast-util-to-babel-ast": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.4.0.tgz",
+      "integrity": "sha512-+U0TZZpPsP2V1WvVhqAOSTk+N+CjYHdZx+x9UBa1eeeZDXwH8pt0CrQf2+SvRl/h2CAPRFkm+Ey96+jKP8Bsgg==",
+      "requires": {
+        "@babel/types": "^7.9.5"
+      }
+    },
+    "@svgr/plugin-jsx": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-5.4.0.tgz",
+      "integrity": "sha512-SGzO4JZQ2HvGRKDzRga9YFSqOqaNrgLlQVaGvpZ2Iht2gwRp/tq+18Pvv9kS9ZqOMYgyix2LLxZMY1LOe9NPqw==",
+      "requires": {
+        "@babel/core": "^7.7.5",
+        "@svgr/babel-preset": "^5.4.0",
+        "@svgr/hast-util-to-babel-ast": "^5.4.0",
+        "svg-parser": "^2.0.2"
+      }
+    },
+    "@svgr/plugin-svgo": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-5.4.0.tgz",
+      "integrity": "sha512-3Cgv3aYi1l6SHyzArV9C36yo4kgwVdF3zPQUC6/aCDUeXAofDYwE5kk3e3oT5ZO2a0N3lB+lLGvipBG6lnG8EA==",
+      "requires": {
+        "cosmiconfig": "^6.0.0",
+        "merge-deep": "^3.0.2",
+        "svgo": "^1.2.2"
+      }
+    },
+    "@svgr/webpack": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-5.4.0.tgz",
+      "integrity": "sha512-LjepnS/BSAvelnOnnzr6Gg0GcpLmnZ9ThGFK5WJtm1xOqdBE/1IACZU7MMdVzjyUkfFqGz87eRE4hFaSLiUwYg==",
+      "requires": {
+        "@babel/core": "^7.9.0",
+        "@babel/plugin-transform-react-constant-elements": "^7.9.0",
+        "@babel/preset-env": "^7.9.5",
+        "@babel/preset-react": "^7.9.4",
+        "@svgr/core": "^5.4.0",
+        "@svgr/plugin-jsx": "^5.4.0",
+        "@svgr/plugin-svgo": "^5.4.0",
+        "loader-utils": "^2.0.0"
+      }
+    },
+    "@types/anymatch": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz",
+      "integrity": "sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA=="
+    },
+    "@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=="
+    },
+    "@types/glob": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
+      "requires": {
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/html-minifier-terser": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz",
+      "integrity": "sha512-iYCgjm1dGPRuo12+BStjd1HiVQqhlRhWDOQigNxn023HcjnhsiFz9pc6CzJj4HwDCSQca9bxTL4PxJDbkdm3PA=="
+    },
+    "@types/json-schema": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz",
+      "integrity": "sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ=="
+    },
+    "@types/mdast": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.3.tgz",
+      "integrity": "sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==",
+      "requires": {
+        "@types/unist": "*"
+      }
+    },
+    "@types/minimatch": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
+    },
+    "@types/node": {
+      "version": "14.0.22",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.22.tgz",
+      "integrity": "sha512-emeGcJvdiZ4Z3ohbmw93E/64jRzUHAItSHt8nF7M4TGgQTiWqFVGB8KNpLGFmUHmHLvjvBgFwVlqNcq+VuGv9g=="
+    },
+    "@types/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
+    },
+    "@types/q": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
+      "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="
+    },
+    "@types/source-list-map": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
+      "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA=="
+    },
+    "@types/tapable": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.6.tgz",
+      "integrity": "sha512-W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA=="
+    },
+    "@types/uglify-js": {
+      "version": "3.9.3",
+      "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.9.3.tgz",
+      "integrity": "sha512-KswB5C7Kwduwjj04Ykz+AjvPcfgv/37Za24O2EDzYNbwyzOo8+ydtvzUfZ5UMguiVu29Gx44l1A6VsPPcmYu9w==",
+      "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=="
+        }
+      }
+    },
+    "@types/unist": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz",
+      "integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ=="
+    },
+    "@types/webpack": {
+      "version": "4.41.21",
+      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.21.tgz",
+      "integrity": "sha512-2j9WVnNrr/8PLAB5csW44xzQSJwS26aOnICsP3pSGCEdsu6KYtfQ6QJsVUKHWRnm1bL7HziJsfh5fHqth87yKA==",
+      "requires": {
+        "@types/anymatch": "*",
+        "@types/node": "*",
+        "@types/tapable": "*",
+        "@types/uglify-js": "*",
+        "@types/webpack-sources": "*",
+        "source-map": "^0.6.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=="
+        }
+      }
+    },
+    "@types/webpack-sources": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-1.4.0.tgz",
+      "integrity": "sha512-c88dKrpSle9BtTqR6ifdaxu1Lvjsl3C5OsfvuUbUwdXymshv1TkufUAXBajCCUM/f/TmnkZC/Esb03MinzSiXQ==",
+      "requires": {
+        "@types/node": "*",
+        "@types/source-list-map": "*",
+        "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=="
+        }
+      }
+    },
+    "@webassemblyjs/ast": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
+      "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
+      "requires": {
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0"
+      }
+    },
+    "@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz",
+      "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA=="
+    },
+    "@webassemblyjs/helper-api-error": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz",
+      "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw=="
+    },
+    "@webassemblyjs/helper-buffer": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz",
+      "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA=="
+    },
+    "@webassemblyjs/helper-code-frame": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz",
+      "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
+      "requires": {
+        "@webassemblyjs/wast-printer": "1.9.0"
+      }
+    },
+    "@webassemblyjs/helper-fsm": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz",
+      "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw=="
+    },
+    "@webassemblyjs/helper-module-context": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz",
+      "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0"
+      }
+    },
+    "@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
+      "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw=="
+    },
+    "@webassemblyjs/helper-wasm-section": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz",
+      "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0"
+      }
+    },
+    "@webassemblyjs/ieee754": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz",
+      "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
+      "requires": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "@webassemblyjs/leb128": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz",
+      "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
+      "requires": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/utf8": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz",
+      "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w=="
+    },
+    "@webassemblyjs/wasm-edit": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz",
+      "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/helper-wasm-section": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-opt": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
+        "@webassemblyjs/wast-printer": "1.9.0"
+      }
+    },
+    "@webassemblyjs/wasm-gen": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz",
+      "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
+      }
+    },
+    "@webassemblyjs/wasm-opt": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz",
+      "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0"
+      }
+    },
+    "@webassemblyjs/wasm-parser": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz",
+      "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
+      }
+    },
+    "@webassemblyjs/wast-parser": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz",
+      "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/floating-point-hex-parser": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-code-frame": "1.9.0",
+        "@webassemblyjs/helper-fsm": "1.9.0",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/wast-printer": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz",
+      "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
+    },
+    "@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
+    },
+    "abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+    },
+    "accepts": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "requires": {
+        "mime-types": "~2.1.24",
+        "negotiator": "0.6.2"
+      }
+    },
+    "acorn": {
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+      "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="
+    },
+    "acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="
+    },
+    "address": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/address/-/address-1.1.2.tgz",
+      "integrity": "sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA=="
+    },
+    "agentkeepalive": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-2.2.0.tgz",
+      "integrity": "sha1-xdG9SxKQCPEWPyNvhuX66iAm4u8="
+    },
+    "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==",
+      "requires": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      }
+    },
+    "ajv": {
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "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"
+      }
+    },
+    "ajv-errors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
+      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="
+    },
+    "ajv-keywords": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.1.tgz",
+      "integrity": "sha512-KWcq3xN8fDjSB+IMoh2VaXVhRI0BBGxoYp3rx7Pkb6z0cFjYR9Q9l4yZqqals0/zsioCmocC5H6UvsGD4MoIBA=="
+    },
+    "algoliasearch": {
+      "version": "3.35.1",
+      "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-3.35.1.tgz",
+      "integrity": "sha512-K4yKVhaHkXfJ/xcUnil04xiSrB8B8yHZoFEhWNpXg23eiCnqvTZw1tn/SqvdsANlYHLJlKl0qi3I/Q2Sqo7LwQ==",
+      "requires": {
+        "agentkeepalive": "^2.2.0",
+        "debug": "^2.6.9",
+        "envify": "^4.0.0",
+        "es6-promise": "^4.1.0",
+        "events": "^1.1.0",
+        "foreach": "^2.0.5",
+        "global": "^4.3.2",
+        "inherits": "^2.0.1",
+        "isarray": "^2.0.1",
+        "load-script": "^1.0.0",
+        "object-keys": "^1.0.11",
+        "querystring-es3": "^0.2.1",
+        "reduce": "^1.0.1",
+        "semver": "^5.1.0",
+        "tunnel-agent": "^0.6.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "events": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+          "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
+        },
+        "isarray": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
+      }
+    },
+    "algoliasearch-helper": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/algoliasearch-helper/-/algoliasearch-helper-3.1.2.tgz",
+      "integrity": "sha512-HfCVvmKH6+5OU9/SaHLdhvr39DBObA02z62RsfPhFDftzgQM6pJB2JoPyGpIteHW4RAYh8bPLiB8l4hajuy6fA==",
+      "requires": {
+        "events": "^1.1.1"
+      },
+      "dependencies": {
+        "events": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+          "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
+        }
+      }
+    },
+    "alphanum-sort": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
+      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM="
+    },
+    "ansi-colors": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA=="
+    },
+    "ansi-escapes": {
+      "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==",
+      "requires": {
+        "type-fest": "^0.11.0"
+      }
+    },
+    "ansi-html": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
+      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4="
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+    },
+    "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==",
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "anymatch": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "requires": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      }
+    },
+    "aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
+    },
+    "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=="
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
+    },
+    "array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "requires": {
+        "array-uniq": "^1.0.1"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
+    },
+    "array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
+    },
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "asn1.js": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "requires": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
+        }
+      }
+    },
+    "assert": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "requires": {
+        "object-assign": "^4.1.1",
+        "util": "0.10.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
+        },
+        "util": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "requires": {
+            "inherits": "2.0.1"
+          }
+        }
+      }
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+    },
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
+    },
+    "async": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "requires": {
+        "lodash": "^4.17.14"
+      }
+    },
+    "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=="
+    },
+    "async-limiter": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
+    },
+    "autocomplete.js": {
+      "version": "0.36.0",
+      "resolved": "https://registry.npmjs.org/autocomplete.js/-/autocomplete.js-0.36.0.tgz",
+      "integrity": "sha512-jEwUXnVMeCHHutUt10i/8ZiRaCb0Wo+ZyKxeGsYwBDtw6EJHqEeDrq4UwZRD8YBSvp3g6klP678il2eeiVXN2Q==",
+      "requires": {
+        "immediate": "^3.2.3"
+      }
+    },
+    "autoprefixer": {
+      "version": "9.8.5",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.5.tgz",
+      "integrity": "sha512-C2p5KkumJlsTHoNv9w31NrBRgXhf6eCMteJuHZi2xhkgC+5Vm40MEtCKPhc0qdgAOhox0YPy1SQHTAky05UoKg==",
+      "requires": {
+        "browserslist": "^4.12.0",
+        "caniuse-lite": "^1.0.30001097",
+        "colorette": "^1.2.0",
+        "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "postcss": "^7.0.32",
+        "postcss-value-parser": "^4.1.0"
+      }
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+    },
+    "aws4": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz",
+      "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA=="
+    },
+    "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=",
+      "requires": {
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "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"
+          }
+        },
+        "js-tokens": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+        }
+      }
+    },
+    "babel-loader": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz",
+      "integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==",
+      "requires": {
+        "find-cache-dir": "^2.1.0",
+        "loader-utils": "^1.4.0",
+        "mkdirp": "^0.5.3",
+        "pify": "^4.0.1",
+        "schema-utils": "^2.6.5"
+      },
+      "dependencies": {
+        "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==",
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        }
+      }
+    },
+    "babel-plugin-apply-mdx-type-prop": {
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.6.tgz",
+      "integrity": "sha512-rUzVvkQa8/9M63OZT6qQQ1bS8P0ozhXp9e5uJ3RwRJF5Me7s4nZK5SYhyNHYc0BkAflWnCOGMP3oPQUfuyB8tg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "7.8.3",
+        "@mdx-js/util": "^1.6.6"
+      },
+      "dependencies": {
+        "@babel/helper-plugin-utils": {
+          "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=="
+        }
+      }
+    },
+    "babel-plugin-dynamic-import-node": {
+      "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==",
+      "requires": {
+        "object.assign": "^4.1.0"
+      }
+    },
+    "babel-plugin-extract-import-names": {
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.6.tgz",
+      "integrity": "sha512-UtMuiQJnhVPAGE2+pDe7Nc9NVEmDdqGTN74BtRALgH+7oag88RpxFLOSiA+u5mFkFg741wW9Ut5KiyJpksEj/g==",
+      "requires": {
+        "@babel/helper-plugin-utils": "7.8.3"
+      },
+      "dependencies": {
+        "@babel/helper-plugin-utils": {
+          "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=="
+        }
+      }
+    },
+    "bail": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz",
+      "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ=="
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "requires": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "base64-js": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
+    },
+    "batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY="
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "bfj": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz",
+      "integrity": "sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==",
+      "requires": {
+        "bluebird": "^3.5.5",
+        "check-types": "^8.0.3",
+        "hoopy": "^0.1.4",
+        "tryer": "^1.0.1"
+      }
+    },
+    "big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
+    },
+    "binary-extensions": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
+      "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ=="
+    },
+    "bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
+    },
+    "bn.js": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz",
+      "integrity": "sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA=="
+    },
+    "body-parser": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "requires": {
+        "bytes": "3.1.0",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "on-finished": "~2.3.0",
+        "qs": "6.7.0",
+        "raw-body": "2.4.0",
+        "type-is": "~1.6.17"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
+    "bonjour": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
+      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
+      "requires": {
+        "array-flatten": "^2.1.0",
+        "deep-equal": "^1.0.1",
+        "dns-equal": "^1.0.0",
+        "dns-txt": "^2.0.2",
+        "multicast-dns": "^6.0.1",
+        "multicast-dns-service-types": "^1.1.0"
+      },
+      "dependencies": {
+        "array-flatten": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+          "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="
+        }
+      }
+    },
+    "boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "requires": {
+        "fill-range": "^7.0.1"
+      }
+    },
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
+    },
+    "browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "requires": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "requires": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "browserify-rsa": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "randombytes": "^2.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
+        }
+      }
+    },
+    "browserify-sign": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.0.tgz",
+      "integrity": "sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA==",
+      "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",
+        "safe-buffer": "^5.2.0"
+      },
+      "dependencies": {
+        "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=="
+        }
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "requires": {
+        "pako": "~1.0.5"
+      }
+    },
+    "browserslist": {
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.13.0.tgz",
+      "integrity": "sha512-MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ==",
+      "requires": {
+        "caniuse-lite": "^1.0.30001093",
+        "electron-to-chromium": "^1.3.488",
+        "escalade": "^3.0.1",
+        "node-releases": "^1.1.58"
+      }
+    },
+    "buffer": {
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+      "requires": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
+    },
+    "buffer-indexof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
+      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="
+    },
+    "buffer-json": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-json/-/buffer-json-2.0.0.tgz",
+      "integrity": "sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw=="
+    },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
+    },
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
+    },
+    "bytes": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
+    },
+    "cacache": {
+      "version": "12.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
+      "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"
+      }
+    },
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "requires": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      }
+    },
+    "cache-loader": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/cache-loader/-/cache-loader-4.1.0.tgz",
+      "integrity": "sha512-ftOayxve0PwKzBF/GLsZNC9fJBXl8lkZE3TOsjkboHfVHVkL39iUEs1FO07A33mizmci5Dudt38UZrrYXDtbhw==",
+      "requires": {
+        "buffer-json": "^2.0.0",
+        "find-cache-dir": "^3.0.0",
+        "loader-utils": "^1.2.3",
+        "mkdirp": "^0.5.1",
+        "neo-async": "^2.6.1",
+        "schema-utils": "^2.0.0"
+      },
+      "dependencies": {
+        "find-cache-dir": {
+          "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==",
+          "requires": {
+            "commondir": "^1.0.1",
+            "make-dir": "^3.0.2",
+            "pkg-dir": "^4.1.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==",
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "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==",
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "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==",
+          "requires": {
+            "semver": "^6.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==",
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "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=="
+        },
+        "pkg-dir": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+          "requires": {
+            "find-up": "^4.0.0"
+          }
+        }
+      }
+    },
+    "call-me-maybe": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
+      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms="
+    },
+    "caller-callsite": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
+      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
+      "requires": {
+        "callsites": "^2.0.0"
+      },
+      "dependencies": {
+        "callsites": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+          "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA="
+        }
+      }
+    },
+    "caller-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
+      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
+      "requires": {
+        "caller-callsite": "^2.0.0"
+      }
+    },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
+    },
+    "camel-case": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.1.tgz",
+      "integrity": "sha512-7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q==",
+      "requires": {
+        "pascal-case": "^3.1.1",
+        "tslib": "^1.10.0"
+      }
+    },
+    "camelcase": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz",
+      "integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w=="
+    },
+    "camelcase-css": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
+      "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA=="
+    },
+    "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==",
+      "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.30001099",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001099.tgz",
+      "integrity": "sha512-sdS9A+sQTk7wKoeuZBN/YMAHVztUfVnjDi4/UV3sDE8xoh7YR12hKW+pIdB3oqKGwr9XaFL2ovfzt9w8eUI5CA=="
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+    },
+    "ccount": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.5.tgz",
+      "integrity": "sha512-MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw=="
+    },
+    "chalk": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+      "requires": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.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==",
+          "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
+        },
+        "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==",
+          "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=="
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+        },
+        "supports-color": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
+    "character-entities": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
+      "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw=="
+    },
+    "character-entities-legacy": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
+      "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA=="
+    },
+    "character-reference-invalid": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
+      "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg=="
+    },
+    "chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
+    },
+    "check-types": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/check-types/-/check-types-8.0.3.tgz",
+      "integrity": "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ=="
+    },
+    "cheerio": {
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz",
+      "integrity": "sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=",
+      "requires": {
+        "css-select": "~1.2.0",
+        "dom-serializer": "~0.1.0",
+        "entities": "~1.1.1",
+        "htmlparser2": "^3.9.1",
+        "lodash.assignin": "^4.0.9",
+        "lodash.bind": "^4.1.4",
+        "lodash.defaults": "^4.0.1",
+        "lodash.filter": "^4.4.0",
+        "lodash.flatten": "^4.2.0",
+        "lodash.foreach": "^4.3.0",
+        "lodash.map": "^4.4.0",
+        "lodash.merge": "^4.4.0",
+        "lodash.pick": "^4.2.1",
+        "lodash.reduce": "^4.4.0",
+        "lodash.reject": "^4.4.0",
+        "lodash.some": "^4.4.0"
+      }
+    },
+    "chokidar": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz",
+      "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==",
+      "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.4.0"
+      }
+    },
+    "chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+    },
+    "chrome-trace-event": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
+      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "ci-info": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
+      "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A=="
+    },
+    "cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "requires": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "classnames": {
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
+      "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
+    },
+    "clean-css": {
+      "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==",
+      "requires": {
+        "source-map": "~0.6.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=="
+        }
+      }
+    },
+    "clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="
+    },
+    "cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "requires": {
+        "restore-cursor": "^3.1.0"
+      }
+    },
+    "cli-width": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
+      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="
+    },
+    "clipboard": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.6.tgz",
+      "integrity": "sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==",
+      "optional": true,
+      "requires": {
+        "good-listener": "^1.2.2",
+        "select": "^1.1.2",
+        "tiny-emitter": "^2.0.0"
+      }
+    },
+    "cliui": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "requires": {
+        "string-width": "^3.1.0",
+        "strip-ansi": "^5.2.0",
+        "wrap-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=="
+        },
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+        },
+        "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="
+        },
+        "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==",
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.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==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "clone-deep": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz",
+      "integrity": "sha1-TnPdCen7lxzDhnDF3O2cGJZIHMY=",
+      "requires": {
+        "for-own": "^0.1.3",
+        "is-plain-object": "^2.0.1",
+        "kind-of": "^3.0.2",
+        "lazy-cache": "^1.0.3",
+        "shallow-clone": "^0.1.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "clsx": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz",
+      "integrity": "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA=="
+    },
+    "coa": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
+      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
+      "requires": {
+        "@types/q": "^1.5.1",
+        "chalk": "^2.4.1",
+        "q": "^1.1.2"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        }
+      }
+    },
+    "collapse-white-space": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz",
+      "integrity": "sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ=="
+    },
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "requires": {
+        "map-visit": "^1.0.0",
+        "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==",
+      "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",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "color-string": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
+      "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
+      "requires": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
+    "colorette": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz",
+      "integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw=="
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "comma-separated-tokens": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz",
+      "integrity": "sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw=="
+    },
+    "commander": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+      "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
+    },
+    "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=="
+    },
+    "compressible": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+      "requires": {
+        "mime-db": ">= 1.43.0 < 2"
+      }
+    },
+    "compression": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+      "requires": {
+        "accepts": "~1.3.5",
+        "bytes": "3.0.0",
+        "compressible": "~2.0.16",
+        "debug": "2.6.9",
+        "on-headers": "~1.0.2",
+        "safe-buffer": "5.1.2",
+        "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+          "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "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"
+          }
+        },
+        "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==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "connect-history-api-fallback": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
+      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="
+    },
+    "consola": {
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/consola/-/consola-2.14.0.tgz",
+      "integrity": "sha512-A2j1x4u8d6SIVikhZROfpFJxQZie+cZOfQMyI/tu2+hWXe8iAv7R6FW6s6x04/7zBCst94lPddztot/d6GJiuQ=="
+    },
+    "console-browserify": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="
+    },
+    "constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
+    },
+    "content-disposition": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "requires": {
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
+    },
+    "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==",
+      "requires": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "cookie": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
+    },
+    "cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+    },
+    "copy-concurrently": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "requires": {
+        "aproba": "^1.1.1",
+        "fs-write-stream-atomic": "^1.0.8",
+        "iferr": "^0.1.5",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.0"
+      }
+    },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
+    },
+    "copy-text-to-clipboard": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/copy-text-to-clipboard/-/copy-text-to-clipboard-2.2.0.tgz",
+      "integrity": "sha512-WRvoIdnTs1rgPMkgA2pUOa/M4Enh2uzCwdKsOMYNAJiz/4ZvEJgmbF4OmninPmlFdAWisfeh0tH+Cpf7ni3RqQ=="
+    },
+    "copy-webpack-plugin": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz",
+      "integrity": "sha512-P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg==",
+      "requires": {
+        "cacache": "^12.0.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": "^2.1.2",
+        "webpack-log": "^2.0.0"
+      },
+      "dependencies": {
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        },
+        "globby": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
+          "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
+          "requires": {
+            "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"
+          }
+        },
+        "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==",
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+        },
+        "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==",
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
+      }
+    },
+    "core-js": {
+      "version": "2.6.11",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
+      "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
+    },
+    "core-js-compat": {
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
+      "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
+      "requires": {
+        "browserslist": "^4.8.5",
+        "semver": "7.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="
+        }
+      }
+    },
+    "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="
+    },
+    "cosmiconfig": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
+      "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+      "requires": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.1.0",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.7.2"
+      }
+    },
+    "create-ecdh": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
+      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
+        }
+      }
+    },
+    "create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "requires": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "cross-spawn": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz",
+      "integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==",
+      "requires": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      }
+    },
+    "crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "requires": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      }
+    },
+    "css-blank-pseudo": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz",
+      "integrity": "sha512-LHz35Hr83dnFeipc7oqFDmsjHdljj3TQtxGGiNWSOsTLIAubSm4TEz8qCaKFpk7idaQ1GfWscF4E6mgpBysA1w==",
+      "requires": {
+        "postcss": "^7.0.5"
+      }
+    },
+    "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="
+    },
+    "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==",
+      "requires": {
+        "postcss": "^7.0.1",
+        "timsort": "^0.3.0"
+      }
+    },
+    "css-has-pseudo": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz",
+      "integrity": "sha512-Z8hnfsZu4o/kt+AuFzeGpLVhFOGO9mluyHBaA2bA8aCGTwah5sT3WV/fTHH8UNZUytOIImuGPrl/prlb4oX4qQ==",
+      "requires": {
+        "postcss": "^7.0.6",
+        "postcss-selector-parser": "^5.0.0-rc.4"
+      },
+      "dependencies": {
+        "cssesc": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
+          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="
+        },
+        "postcss-selector-parser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
+          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
+          "requires": {
+            "cssesc": "^2.0.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "css-loader": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.6.0.tgz",
+      "integrity": "sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==",
+      "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.32",
+        "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.1.0",
+        "schema-utils": "^2.7.0",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+        },
+        "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==",
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        }
+      }
+    },
+    "css-prefers-color-scheme": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz",
+      "integrity": "sha512-MTu6+tMs9S3EUqzmqLXEcgNRbNkkD/TGFvowpeoWJn5Vfq7FMgsmRQs9X5NXAURiOBmOxm/lLjsDNXDE6k9bhg==",
+      "requires": {
+        "postcss": "^7.0.5"
+      }
+    },
+    "css-select": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
+      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
+      "requires": {
+        "boolbase": "~1.0.0",
+        "css-what": "2.1",
+        "domutils": "1.5.1",
+        "nth-check": "~1.0.1"
+      }
+    },
+    "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=="
+    },
+    "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==",
+      "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=="
+        }
+      }
+    },
+    "css-what": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg=="
+    },
+    "cssdb": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-4.4.0.tgz",
+      "integrity": "sha512-LsTAR1JPEM9TpGhl/0p3nQecC2LJ0kD8X5YARu1hk/9I1gril5vDtMZyNxcEpxxDj34YNck/ucjuoUd66K03oQ=="
+    },
+    "cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="
+    },
+    "cssnano": {
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz",
+      "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==",
+      "requires": {
+        "cosmiconfig": "^5.0.0",
+        "cssnano-preset-default": "^4.0.7",
+        "is-resolvable": "^1.0.0",
+        "postcss": "^7.0.0"
+      },
+      "dependencies": {
+        "cosmiconfig": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+          "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+          "requires": {
+            "import-fresh": "^2.0.0",
+            "is-directory": "^0.3.1",
+            "js-yaml": "^3.13.1",
+            "parse-json": "^4.0.0"
+          }
+        },
+        "import-fresh": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+          "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
+          "requires": {
+            "caller-path": "^2.0.0",
+            "resolve-from": "^3.0.0"
+          }
+        },
+        "parse-json": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+          "requires": {
+            "error-ex": "^1.3.1",
+            "json-parse-better-errors": "^1.0.1"
+          }
+        },
+        "resolve-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g="
+        }
+      }
+    },
+    "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==",
+      "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="
+    },
+    "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="
+    },
+    "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==",
+      "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=="
+    },
+    "csso": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz",
+      "integrity": "sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==",
+      "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==",
+          "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=="
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
+      }
+    },
+    "cyclist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
+      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk="
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "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.1"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+    },
+    "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="
+    },
+    "deep-equal": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
+      "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
+      "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"
+      }
+    },
+    "default-gateway": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
+      "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
+      "requires": {
+        "execa": "^1.0.0",
+        "ip-regex": "^2.1.0"
+      }
+    },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "requires": {
+        "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==",
+      "requires": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "del": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/del/-/del-5.1.0.tgz",
+      "integrity": "sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==",
+      "requires": {
+        "globby": "^10.0.1",
+        "graceful-fs": "^4.2.2",
+        "is-glob": "^4.0.1",
+        "is-path-cwd": "^2.2.0",
+        "is-path-inside": "^3.0.1",
+        "p-map": "^3.0.0",
+        "rimraf": "^3.0.0",
+        "slash": "^3.0.0"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "slash": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
+        }
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "delegate": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
+      "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==",
+      "optional": true
+    },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+    },
+    "des.js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+    },
+    "detab": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/detab/-/detab-2.0.3.tgz",
+      "integrity": "sha512-Up8P0clUVwq0FnFjDclzZsy9PadzRn5FFxrr47tQQvMHqyiFYVbpH8oXDzWtF0Q7pYy3l+RPmtBl+BsFF6wH0A==",
+      "requires": {
+        "repeat-string": "^1.5.4"
+      }
+    },
+    "detect-node": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
+      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw=="
+    },
+    "detect-port-alt": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz",
+      "integrity": "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==",
+      "requires": {
+        "address": "^1.0.1",
+        "debug": "^2.6.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
+    "diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
+        }
+      }
+    },
+    "dir-glob": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
+      "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
+      "requires": {
+        "path-type": "^3.0.0"
+      },
+      "dependencies": {
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+        }
+      }
+    },
+    "dns-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0="
+    },
+    "dns-packet": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
+      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "requires": {
+        "ip": "^1.1.0",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "dns-txt": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
+      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
+      "requires": {
+        "buffer-indexof": "^1.0.0"
+      }
+    },
+    "docsearch.js": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/docsearch.js/-/docsearch.js-2.6.3.tgz",
+      "integrity": "sha512-GN+MBozuyz664ycpZY0ecdQE0ND/LSgJKhTLA0/v3arIS3S1Rpf2OJz6A35ReMsm91V5apcmzr5/kM84cvUg+A==",
+      "requires": {
+        "algoliasearch": "^3.24.5",
+        "autocomplete.js": "0.36.0",
+        "hogan.js": "^3.0.2",
+        "request": "^2.87.0",
+        "stack-utils": "^1.0.1",
+        "to-factory": "^1.0.0",
+        "zepto": "^1.2.0"
+      }
+    },
+    "dom-converter": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
+      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
+      "requires": {
+        "utila": "~0.4"
+      }
+    },
+    "dom-serializer": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
+      "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
+      "requires": {
+        "domelementtype": "^1.3.0",
+        "entities": "^1.1.1"
+      }
+    },
+    "dom-walk": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
+      "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
+    },
+    "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=="
+    },
+    "domelementtype": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
+    },
+    "domhandler": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
+      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+      "requires": {
+        "domelementtype": "1"
+      }
+    },
+    "domutils": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+      "requires": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
+    "dot-case": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.3.tgz",
+      "integrity": "sha512-7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA==",
+      "requires": {
+        "no-case": "^3.0.3",
+        "tslib": "^1.10.0"
+      }
+    },
+    "dot-prop": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz",
+      "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==",
+      "requires": {
+        "is-obj": "^2.0.0"
+      }
+    },
+    "duplexer": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E="
+    },
+    "duplexify": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "requires": {
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "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"
+          }
+        },
+        "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==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "requires": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+    },
+    "ejs": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz",
+      "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="
+    },
+    "electron-to-chromium": {
+      "version": "1.3.496",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.496.tgz",
+      "integrity": "sha512-TXY4mwoyowwi4Lsrq9vcTUYBThyc1b2hXaTZI13p8/FRhY2CTaq5lK+DVjhYkKiTLsKt569Xes+0J5JsVXFurQ=="
+    },
+    "elliptic": {
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
+      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
+      "requires": {
+        "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"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
+        }
+      }
+    },
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
+    },
+    "emoticon": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/emoticon/-/emoticon-3.2.0.tgz",
+      "integrity": "sha512-SNujglcLTTg+lDAcApPNgEdudaqQFiAbJCqzjNxJkvN9vAwCGi0uu8IUVvx+f16h+V44KCY6Y2yboroc9pilHg=="
+    },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
+    },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "enhanced-resolve": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.2.0.tgz",
+      "integrity": "sha512-S7eiFb/erugyd1rLb6mQ3Vuq+EXHv5cpCkNqqIkYkBgN2QdFnyCZzFBleqwGEx4lgNGYij81BWnCrFNK7vxvjQ==",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.5.0",
+        "tapable": "^1.0.0"
+      },
+      "dependencies": {
+        "memory-fs": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
+          "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
+          "requires": {
+            "errno": "^0.1.3",
+            "readable-stream": "^2.0.1"
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "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"
+          }
+        },
+        "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==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "entities": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
+    },
+    "envify": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/envify/-/envify-4.1.0.tgz",
+      "integrity": "sha512-IKRVVoAYr4pIx4yIWNsz9mOsboxlNXiu7TNBnem/K/uTHdkyzXWDzHCK7UTolqBbgaBz0tQHsD3YNls0uIIjiw==",
+      "requires": {
+        "esprima": "^4.0.0",
+        "through": "~2.3.4"
+      }
+    },
+    "errno": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
+      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "requires": {
+        "prr": "~1.0.1"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.17.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+      "requires": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.0",
+        "is-regex": "^1.1.0",
+        "object-inspect": "^1.7.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.0",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.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==",
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
+    "es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+    },
+    "escalade": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.0.1.tgz",
+      "integrity": "sha512-DR6NO3h9niOT+MZs7bjxlj2a1k+POu5RN8CLTPX2+i78bRi9eLe7+0zXgUHMnGXWybYcL61E9hGhPKqedy8tQA=="
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+    },
+    "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="
+    },
+    "eslint-scope": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+    },
+    "esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "requires": {
+        "estraverse": "^4.1.0"
+      }
+    },
+    "estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
+    },
+    "eta": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/eta/-/eta-1.2.2.tgz",
+      "integrity": "sha512-8H+zm3HfY2ELz5P4zzR3uJ1LQLnhTAe5gb0vR9ziKZGCLhQrRtqwIyzsOkf7pdBnH7gFPLRAaKZdv2nj9vu9cw=="
+    },
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+    },
+    "eval": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/eval/-/eval-0.1.4.tgz",
+      "integrity": "sha512-npGsebJejyjMRnLdFu+T/97dnigqIU0Ov3IGrZ8ygd1v7RL1vGkEKtvyWZobqUH1AQgKlg0Yqqe2BtMA9/QZLw==",
+      "requires": {
+        "require-like": ">= 0.1.1"
+      }
+    },
+    "eventemitter3": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz",
+      "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ=="
+    },
+    "events": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.1.0.tgz",
+      "integrity": "sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg=="
+    },
+    "eventsource": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
+      "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
+      "requires": {
+        "original": "^1.0.0"
+      }
+    },
+    "evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "requires": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "requires": {
+        "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"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "path-key": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+          "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        },
+        "shebang-command": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+          "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+          "requires": {
+            "shebang-regex": "^1.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+          "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+        },
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "requires": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
+    "express": {
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
+      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "requires": {
+        "accepts": "~1.3.7",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.19.0",
+        "content-disposition": "0.5.3",
+        "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",
+        "fresh": "0.5.2",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.5",
+        "qs": "6.7.0",
+        "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",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    },
+    "extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "requires": {
+        "is-extendable": "^0.1.0"
+      }
+    },
+    "external-editor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+      "requires": {
+        "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==",
+      "requires": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+    },
+    "fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+    },
+    "fast-glob": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz",
+      "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==",
+      "requires": {
+        "@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"
+      }
+    },
+    "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=="
+    },
+    "fastq": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
+      "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==",
+      "requires": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "faye-websocket": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+      "requires": {
+        "websocket-driver": ">=0.5.1"
+      }
+    },
+    "feed": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/feed/-/feed-4.2.1.tgz",
+      "integrity": "sha512-l28KKcK1J/u3iq5dRDmmoB2p7dtBfACC2NqJh4dI2kFptxH0asfjmOfcxqh5Sv8suAlVa73gZJ4REY5RrafVvg==",
+      "requires": {
+        "xml-js": "^1.6.11"
+      }
+    },
+    "figgy-pudding": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
+      "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw=="
+    },
+    "figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
+    "filesize": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/filesize/-/filesize-6.0.1.tgz",
+      "integrity": "sha512-u4AYWPgbI5GBhs6id1KdImZWn5yfyFrrQ8OWZdN7ZMfA8Bf4HcO0BGo9bmUIEV8yrp8I1xVfJ/dn90GtFNNJcg=="
+    },
+    "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==",
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
+    "finalhandler": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "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"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
+    "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==",
+      "requires": {
+        "commondir": "^1.0.1",
+        "make-dir": "^2.0.0",
+        "pkg-dir": "^3.0.0"
+      }
+    },
+    "find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "requires": {
+        "locate-path": "^3.0.0"
+      }
+    },
+    "flatten": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz",
+      "integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg=="
+    },
+    "flush-write-stream": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+      "requires": {
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "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"
+          }
+        },
+        "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==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "follow-redirects": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.12.1.tgz",
+      "integrity": "sha512-tmRv0AVuR7ZyouUHLeNSiO6pqulF7dYa3s19c6t+wz9LD69/uSzdMxJ2S91nTI9U3rt/IldxpzMOFejp6f0hjg=="
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
+    },
+    "for-own": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+      "requires": {
+        "for-in": "^1.0.1"
+      }
+    },
+    "foreach": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+    },
+    "fork-ts-checker-webpack-plugin": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-3.1.1.tgz",
+      "integrity": "sha512-DuVkPNrM12jR41KM2e+N+styka0EgLkTnXmNcXdgOM37vtGeY+oCBK/Jx0hzSeEU6memFCtWb4htrHPMDfwwUQ==",
+      "requires": {
+        "babel-code-frame": "^6.22.0",
+        "chalk": "^2.4.1",
+        "chokidar": "^3.3.0",
+        "micromatch": "^3.1.10",
+        "minimatch": "^3.0.4",
+        "semver": "^5.6.0",
+        "tapable": "^1.0.0",
+        "worker-rpc": "^0.1.0"
+      },
+      "dependencies": {
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          },
+          "dependencies": {
+            "is-extendable": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+              "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+              "requires": {
+                "is-plain-object": "^2.0.4"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        },
+        "to-regex-range": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+          "requires": {
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
+          }
+        }
+      }
+    },
+    "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==",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
+    },
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "requires": {
+        "map-cache": "^0.2.2"
+      }
+    },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+    },
+    "from2": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "requires": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "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"
+          }
+        },
+        "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==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "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==",
+      "requires": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
+    "fs-minipass": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "requires": {
+        "minipass": "^3.0.0"
+      }
+    },
+    "fs-write-stream-atomic": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "iferr": "^0.1.5",
+        "imurmurhash": "^0.1.4",
+        "readable-stream": "1 || 2"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "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"
+          }
+        },
+        "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==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "fsevents": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+      "optional": true
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "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=="
+    },
+    "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=="
+    },
+    "get-own-enumerable-property-symbols": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
+      "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="
+    },
+    "get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "requires": {
+        "pump": "^3.0.0"
+      }
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "github-slugger": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.3.0.tgz",
+      "integrity": "sha512-gwJScWVNhFYSRDvURk/8yhcFBee6aFjye2a7Lhb2bUyRulpIoek9p0I9Kt7PT67d/nUlZbFu8L9RLiA0woQN8Q==",
+      "requires": {
+        "emoji-regex": ">=6.0.0 <=6.1.1"
+      },
+      "dependencies": {
+        "emoji-regex": {
+          "version": "6.1.1",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.1.tgz",
+          "integrity": "sha1-xs0OwbBkLio8Z6ETfvxeeW2k+I4="
+        }
+      }
+    },
+    "glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "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"
+      }
+    },
+    "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==",
+      "requires": {
+        "is-glob": "^4.0.1"
+      }
+    },
+    "glob-to-regexp": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
+      "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs="
+    },
+    "global": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
+      "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
+      "requires": {
+        "min-document": "^2.19.0",
+        "process": "^0.11.10"
+      }
+    },
+    "global-modules": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
+      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
+      "requires": {
+        "global-prefix": "^3.0.0"
+      }
+    },
+    "global-prefix": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
+      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
+      "requires": {
+        "ini": "^1.3.5",
+        "kind-of": "^6.0.2",
+        "which": "^1.3.1"
+      },
+      "dependencies": {
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
+    },
+    "globby": {
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz",
+      "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==",
+      "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",
+        "slash": "^3.0.0"
+      },
+      "dependencies": {
+        "array-union": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+          "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
+        },
+        "dir-glob": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+          "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+          "requires": {
+            "path-type": "^4.0.0"
+          }
+        },
+        "ignore": {
+          "version": "5.1.8",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+          "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="
+        },
+        "slash": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
+        }
+      }
+    },
+    "good-listener": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
+      "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=",
+      "optional": true,
+      "requires": {
+        "delegate": "^3.1.2"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
+    },
+    "gray-matter": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/gray-matter/-/gray-matter-4.0.2.tgz",
+      "integrity": "sha512-7hB/+LxrOjq/dd8APlK0r24uL/67w7SkYnfwhNFwg/VDIGWGmduTDYf3WNstLW2fbbmRwrDGCVSJ2isuf2+4Hw==",
+      "requires": {
+        "js-yaml": "^3.11.0",
+        "kind-of": "^6.0.2",
+        "section-matter": "^1.0.0",
+        "strip-bom-string": "^1.0.0"
+      }
+    },
+    "gzip-size": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
+      "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
+      "requires": {
+        "duplexer": "^0.1.1",
+        "pify": "^4.0.1"
+      }
+    },
+    "handle-thing": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
+      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+    },
+    "har-validator": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+      "requires": {
+        "ajv": "^6.5.5",
+        "har-schema": "^2.0.0"
+      }
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+    },
+    "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=="
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "requires": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      }
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "requires": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "hash-base": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "requires": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "dependencies": {
+        "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=="
+        }
+      }
+    },
+    "hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "requires": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "hast-to-hyperscript": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/hast-to-hyperscript/-/hast-to-hyperscript-7.0.4.tgz",
+      "integrity": "sha512-vmwriQ2H0RPS9ho4Kkbf3n3lY436QKLq6VaGA1pzBh36hBi3tm1DO9bR+kaJIbpT10UqaANDkMjxvjVfr+cnOA==",
+      "requires": {
+        "comma-separated-tokens": "^1.0.0",
+        "property-information": "^5.3.0",
+        "space-separated-tokens": "^1.0.0",
+        "style-to-object": "^0.2.1",
+        "unist-util-is": "^3.0.0",
+        "web-namespaces": "^1.1.2"
+      },
+      "dependencies": {
+        "style-to-object": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.2.3.tgz",
+          "integrity": "sha512-1d/k4EY2N7jVLOqf2j04dTc37TPOv/hHxZmvpg8Pdh8UYydxeu/C1W1U4vD8alzf5V2Gt7rLsmkr4dxAlDm9ng==",
+          "requires": {
+            "inline-style-parser": "0.1.1"
+          }
+        }
+      }
+    },
+    "hast-util-from-parse5": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-5.0.3.tgz",
+      "integrity": "sha512-gOc8UB99F6eWVWFtM9jUikjN7QkWxB3nY0df5Z0Zq1/Nkwl5V4hAAsl0tmwlgWl/1shlTF8DnNYLO8X6wRV9pA==",
+      "requires": {
+        "ccount": "^1.0.3",
+        "hastscript": "^5.0.0",
+        "property-information": "^5.0.0",
+        "web-namespaces": "^1.1.2",
+        "xtend": "^4.0.1"
+      }
+    },
+    "hast-util-parse-selector": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.4.tgz",
+      "integrity": "sha512-gW3sxfynIvZApL4L07wryYF4+C9VvH3AUi7LAnVXV4MneGEgwOByXvFo18BgmTWnm7oHAe874jKbIB1YhHSIzA=="
+    },
+    "hast-util-raw": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-5.0.2.tgz",
+      "integrity": "sha512-3ReYQcIHmzSgMq8UrDZHFL0oGlbuVGdLKs8s/Fe8BfHFAyZDrdv1fy/AGn+Fim8ZuvAHcJ61NQhVMtyfHviT/g==",
+      "requires": {
+        "hast-util-from-parse5": "^5.0.0",
+        "hast-util-to-parse5": "^5.0.0",
+        "html-void-elements": "^1.0.0",
+        "parse5": "^5.0.0",
+        "unist-util-position": "^3.0.0",
+        "web-namespaces": "^1.0.0",
+        "xtend": "^4.0.0",
+        "zwitch": "^1.0.0"
+      }
+    },
+    "hast-util-to-parse5": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/hast-util-to-parse5/-/hast-util-to-parse5-5.1.2.tgz",
+      "integrity": "sha512-ZgYLJu9lYknMfsBY0rBV4TJn2xiwF1fXFFjbP6EE7S0s5mS8LIKBVWzhA1MeIs1SWW6GnnE4In6c3kPb+CWhog==",
+      "requires": {
+        "hast-to-hyperscript": "^7.0.0",
+        "property-information": "^5.0.0",
+        "web-namespaces": "^1.0.0",
+        "xtend": "^4.0.0",
+        "zwitch": "^1.0.0"
+      }
+    },
+    "hastscript": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/hastscript/-/hastscript-5.1.2.tgz",
+      "integrity": "sha512-WlztFuK+Lrvi3EggsqOkQ52rKbxkXL3RwB6t5lwoa8QLMemoWfBuL43eDrwOamJyR7uKQKdmKYaBH1NZBiIRrQ==",
+      "requires": {
+        "comma-separated-tokens": "^1.0.0",
+        "hast-util-parse-selector": "^2.0.0",
+        "property-information": "^5.0.0",
+        "space-separated-tokens": "^1.0.0"
+      }
+    },
+    "he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
+    },
+    "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=="
+    },
+    "history": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
+      "integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==",
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "loose-envify": "^1.2.0",
+        "resolve-pathname": "^3.0.0",
+        "tiny-invariant": "^1.0.2",
+        "tiny-warning": "^1.0.0",
+        "value-equal": "^1.0.1"
+      }
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "requires": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "hogan.js": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz",
+      "integrity": "sha1-TNnhq9QpQUbnZ55B14mHMrAse/0=",
+      "requires": {
+        "mkdirp": "0.3.0",
+        "nopt": "1.0.10"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
+          "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4="
+        }
+      }
+    },
+    "hoist-non-react-statics": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+      "requires": {
+        "react-is": "^16.7.0"
+      }
+    },
+    "hoopy": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
+      "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ=="
+    },
+    "hpack.js": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+      "requires": {
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "wbuf": "^1.1.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "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"
+          }
+        },
+        "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==",
+          "requires": {
+            "safe-buffer": "~5.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="
+    },
+    "hsla-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
+      "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg="
+    },
+    "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=="
+    },
+    "html-entities": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz",
+      "integrity": "sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA=="
+    },
+    "html-minifier-terser": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz",
+      "integrity": "sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==",
+      "requires": {
+        "camel-case": "^4.1.1",
+        "clean-css": "^4.2.3",
+        "commander": "^4.1.1",
+        "he": "^1.2.0",
+        "param-case": "^3.0.3",
+        "relateurl": "^0.2.7",
+        "terser": "^4.6.3"
+      }
+    },
+    "html-tags": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz",
+      "integrity": "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg=="
+    },
+    "html-void-elements": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-1.0.5.tgz",
+      "integrity": "sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w=="
+    },
+    "html-webpack-plugin": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.3.0.tgz",
+      "integrity": "sha512-C0fzKN8yQoVLTelcJxZfJCE+aAvQiY2VUf3UuKrR4a9k5UMWYOtpDLsaXwATbcVCnI05hUS7L9ULQHWLZhyi3w==",
+      "requires": {
+        "@types/html-minifier-terser": "^5.0.0",
+        "@types/tapable": "^1.0.5",
+        "@types/webpack": "^4.41.8",
+        "html-minifier-terser": "^5.0.1",
+        "loader-utils": "^1.2.3",
+        "lodash": "^4.17.15",
+        "pretty-error": "^2.1.1",
+        "tapable": "^1.1.3",
+        "util.promisify": "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==",
+          "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==",
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        },
+        "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==",
+          "requires": {
+            "define-properties": "^1.1.2",
+            "object.getownpropertydescriptors": "^2.0.3"
+          }
+        }
+      }
+    },
+    "htmlparser2": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+      "requires": {
+        "domelementtype": "^1.3.1",
+        "domhandler": "^2.3.0",
+        "domutils": "^1.5.1",
+        "entities": "^1.1.1",
+        "inherits": "^2.0.1",
+        "readable-stream": "^3.1.1"
+      }
+    },
+    "http-deceiver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc="
+    },
+    "http-errors": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "requires": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.1",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.0"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+        }
+      }
+    },
+    "http-proxy": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+      "requires": {
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "http-proxy-middleware": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
+      "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
+      "requires": {
+        "http-proxy": "^1.17.0",
+        "is-glob": "^4.0.0",
+        "lodash": "^4.17.11",
+        "micromatch": "^3.1.10"
+      },
+      "dependencies": {
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          },
+          "dependencies": {
+            "is-extendable": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+              "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+              "requires": {
+                "is-plain-object": "^2.0.4"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "to-regex-range": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+          "requires": {
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
+          }
+        }
+      }
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      }
+    },
+    "https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM="
+    },
+    "human-signals": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "requires": {
+        "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==",
+      "requires": {
+        "postcss": "^7.0.14"
+      }
+    },
+    "ieee754": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
+    },
+    "iferr": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE="
+    },
+    "ignore": {
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="
+    },
+    "immediate": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz",
+      "integrity": "sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q=="
+    },
+    "immer": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-1.10.0.tgz",
+      "integrity": "sha512-O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg=="
+    },
+    "import-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
+      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
+      "requires": {
+        "import-from": "^2.1.0"
+      }
+    },
+    "import-fresh": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
+      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      }
+    },
+    "import-from": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
+      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
+      "requires": {
+        "resolve-from": "^3.0.0"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g="
+        }
+      }
+    },
+    "import-local": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
+      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+      "requires": {
+        "pkg-dir": "^3.0.0",
+        "resolve-cwd": "^2.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+    },
+    "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=="
+    },
+    "indexes-of": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
+      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc="
+    },
+    "infer-owner": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="
+    },
+    "infima": {
+      "version": "0.2.0-alpha.12",
+      "resolved": "https://registry.npmjs.org/infima/-/infima-0.2.0-alpha.12.tgz",
+      "integrity": "sha512-in5n36oE2sdiB/1rzuzdmKyuNRMVUO9P+qUidUG8leHeDU+WMQ7oTP7MXSqtAAxduiPb7HHi0/ptQLLUr/ge4w=="
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
+    },
+    "inline-style-parser": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz",
+      "integrity": "sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q=="
+    },
+    "inquirer": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.4.tgz",
+      "integrity": "sha512-Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ==",
+      "requires": {
+        "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.2.0",
+        "rxjs": "^6.5.3",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^5.1.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=="
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.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==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "internal-ip": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
+      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
+      "requires": {
+        "default-gateway": "^4.2.0",
+        "ipaddr.js": "^1.9.0"
+      }
+    },
+    "interpret": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="
+    },
+    "invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
+    "ip": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
+    },
+    "ip-regex": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk="
+    },
+    "ipaddr.js": {
+      "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=="
+    },
+    "is-absolute-url": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
+      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY="
+    },
+    "is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-alphabetical": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
+      "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg=="
+    },
+    "is-alphanumerical": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
+      "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
+      "requires": {
+        "is-alphabetical": "^1.0.0",
+        "is-decimal": "^1.0.0"
+      }
+    },
+    "is-arguments": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
+      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+    },
+    "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==",
+      "requires": {
+        "binary-extensions": "^2.0.0"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+    },
+    "is-callable": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw=="
+    },
+    "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=",
+      "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",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-date-object": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
+      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
+    },
+    "is-decimal": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
+      "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw=="
+    },
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "requires": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "dependencies": {
+        "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=="
+        }
+      }
+    },
+    "is-directory": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE="
+    },
+    "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=="
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+    },
+    "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=="
+    },
+    "is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-hexadecimal": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
+      "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw=="
+    },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
+    },
+    "is-obj": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
+      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="
+    },
+    "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=="
+    },
+    "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==",
+      "requires": {
+        "is-path-inside": "^2.1.0"
+      },
+      "dependencies": {
+        "is-path-inside": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+          "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
+          "requires": {
+            "path-is-inside": "^1.0.2"
+          }
+        }
+      }
+    },
+    "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=="
+    },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
+    },
+    "is-plain-object": {
+      "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==",
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "is-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+      "requires": {
+        "has-symbols": "^1.0.1"
+      }
+    },
+    "is-regexp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
+      "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk="
+    },
+    "is-resolvable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="
+    },
+    "is-root": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz",
+      "integrity": "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg=="
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+    },
+    "is-svg": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz",
+      "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==",
+      "requires": {
+        "html-comment-regex": "^1.1.0"
+      }
+    },
+    "is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "requires": {
+        "has-symbols": "^1.0.1"
+      }
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+    },
+    "is-whitespace-character": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz",
+      "integrity": "sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w=="
+    },
+    "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=="
+    },
+    "is-word-character": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz",
+      "integrity": "sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA=="
+    },
+    "is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "requires": {
+        "is-docker": "^2.0.0"
+      }
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+    },
+    "isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
+    "jest-worker": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz",
+      "integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==",
+      "requires": {
+        "merge-stream": "^2.0.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=="
+        },
+        "supports-color": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    },
+    "js-yaml": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+      "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+    },
+    "jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
+    },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+    },
+    "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=="
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
+    "json3": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
+      "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA=="
+    },
+    "json5": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
+      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "requires": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "killable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
+      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg=="
+    },
+    "kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+    },
+    "last-call-webpack-plugin": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz",
+      "integrity": "sha512-7KI2l2GIZa9p2spzPIVZBYyNKkN+e/SQPpnjlTiPhdbDW3F86tdKKELxKpzJ5sgU19wQWsACULZmpTPYHeWO5w==",
+      "requires": {
+        "lodash": "^4.17.5",
+        "webpack-sources": "^1.1.0"
+      }
+    },
+    "lazy-cache": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4="
+    },
+    "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=="
+    },
+    "levenary": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
+      "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
+      "requires": {
+        "leven": "^3.1.0"
+      }
+    },
+    "lines-and-columns": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
+      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
+    },
+    "load-script": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/load-script/-/load-script-1.0.0.tgz",
+      "integrity": "sha1-BJGTngvuVkPuSUp+PaPSuscMbKQ="
+    },
+    "loader-runner": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
+      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw=="
+    },
+    "loader-utils": {
+      "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==",
+      "requires": {
+        "big.js": "^5.2.2",
+        "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==",
+      "requires": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.19",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
+    },
+    "lodash._reinterpolate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0="
+    },
+    "lodash.assignin": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz",
+      "integrity": "sha1-uo31+4QesKPoBEIysOJjqNxqKKI="
+    },
+    "lodash.bind": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz",
+      "integrity": "sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU="
+    },
+    "lodash.camelcase": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY="
+    },
+    "lodash.chunk": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.chunk/-/lodash.chunk-4.2.0.tgz",
+      "integrity": "sha1-ZuXOH3btJ7QwPYxlEujRIW6BBrw="
+    },
+    "lodash.defaults": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
+      "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw="
+    },
+    "lodash.filter": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz",
+      "integrity": "sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4="
+    },
+    "lodash.flatmap": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.flatmap/-/lodash.flatmap-4.5.0.tgz",
+      "integrity": "sha1-74y/QI9uSCaGYzRTBcaswLd4cC4="
+    },
+    "lodash.flatten": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
+      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8="
+    },
+    "lodash.foreach": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
+      "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM="
+    },
+    "lodash.groupby": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz",
+      "integrity": "sha1-Cwih3PaDl8OXhVwyOXg4Mt90A9E="
+    },
+    "lodash.has": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz",
+      "integrity": "sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI="
+    },
+    "lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
+    },
+    "lodash.isstring": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
+      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE="
+    },
+    "lodash.kebabcase": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz",
+      "integrity": "sha1-hImxyw0p/4gZXM7KRI/21swpXDY="
+    },
+    "lodash.map": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz",
+      "integrity": "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM="
+    },
+    "lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4="
+    },
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+    },
+    "lodash.padstart": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.6.1.tgz",
+      "integrity": "sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs="
+    },
+    "lodash.pick": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
+      "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM="
+    },
+    "lodash.pickby": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz",
+      "integrity": "sha1-feoh2MGNdwOifHBMFdO4SmfjOv8="
+    },
+    "lodash.reduce": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz",
+      "integrity": "sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs="
+    },
+    "lodash.reject": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz",
+      "integrity": "sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU="
+    },
+    "lodash.some": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
+      "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0="
+    },
+    "lodash.sortby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
+    },
+    "lodash.template": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
+      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
+      "requires": {
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.templatesettings": "^4.0.0"
+      }
+    },
+    "lodash.templatesettings": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
+      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
+      "requires": {
+        "lodash._reinterpolate": "^3.0.0"
+      }
+    },
+    "lodash.toarray": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz",
+      "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE="
+    },
+    "lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M="
+    },
+    "loglevel": {
+      "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=="
+    },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      }
+    },
+    "lower-case": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz",
+      "integrity": "sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==",
+      "requires": {
+        "tslib": "^1.10.0"
+      }
+    },
+    "lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "requires": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "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==",
+      "requires": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
+      }
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "requires": {
+        "object-visit": "^1.0.0"
+      }
+    },
+    "markdown-escapes": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz",
+      "integrity": "sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg=="
+    },
+    "md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "mdast-squeeze-paragraphs": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mdast-squeeze-paragraphs/-/mdast-squeeze-paragraphs-4.0.0.tgz",
+      "integrity": "sha512-zxdPn69hkQ1rm4J+2Cs2j6wDEv7O17TfXTJ33tl/+JPIoEmtV9t2ZzBM5LPHE8QlHsmVD8t3vPKCyY3oH+H8MQ==",
+      "requires": {
+        "unist-util-remove": "^2.0.0"
+      }
+    },
+    "mdast-util-definitions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-3.0.1.tgz",
+      "integrity": "sha512-BAv2iUm/e6IK/b2/t+Fx69EL/AGcq/IG2S+HxHjDJGfLJtd6i9SZUS76aC9cig+IEucsqxKTR0ot3m933R3iuA==",
+      "requires": {
+        "unist-util-visit": "^2.0.0"
+      }
+    },
+    "mdast-util-to-hast": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-9.1.0.tgz",
+      "integrity": "sha512-Akl2Vi9y9cSdr19/Dfu58PVwifPXuFt1IrHe7l+Crme1KvgUT+5z+cHLVcQVGCiNTZZcdqjnuv9vPkGsqWytWA==",
+      "requires": {
+        "@types/mdast": "^3.0.0",
+        "@types/unist": "^2.0.3",
+        "collapse-white-space": "^1.0.0",
+        "detab": "^2.0.0",
+        "mdast-util-definitions": "^3.0.0",
+        "mdurl": "^1.0.0",
+        "trim-lines": "^1.0.0",
+        "unist-builder": "^2.0.0",
+        "unist-util-generated": "^1.0.0",
+        "unist-util-position": "^3.0.0",
+        "unist-util-visit": "^2.0.0"
+      }
+    },
+    "mdast-util-to-string": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz",
+      "integrity": "sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A=="
+    },
+    "mdn-data": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
+      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="
+    },
+    "mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
+    },
+    "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=",
+      "requires": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "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"
+          }
+        },
+        "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==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "merge-deep": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.2.tgz",
+      "integrity": "sha512-T7qC8kg4Zoti1cFd8Cr0M+qaZfOwjlPDEdZIIPPB2JZctjaPM4fX+i7HOId69tAti2fvO6X5ldfYUONDODsrkA==",
+      "requires": {
+        "arr-union": "^3.1.0",
+        "clone-deep": "^0.2.4",
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+    },
+    "merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
+    },
+    "merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+    },
+    "microevent.ts": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/microevent.ts/-/microevent.ts-0.1.1.tgz",
+      "integrity": "sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g=="
+    },
+    "micromatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+      "requires": {
+        "braces": "^3.0.1",
+        "picomatch": "^2.0.5"
+      }
+    },
+    "miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "requires": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
+        }
+      }
+    },
+    "mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+    },
+    "mime-db": {
+      "version": "1.44.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="
+    },
+    "mime-types": {
+      "version": "2.1.27",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+      "requires": {
+        "mime-db": "1.44.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
+    },
+    "min-document": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
+      "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
+      "requires": {
+        "dom-walk": "^0.1.0"
+      }
+    },
+    "mini-create-react-context": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.4.0.tgz",
+      "integrity": "sha512-b0TytUgFSbgFJGzJqXPKCFCBWigAjpjo+Fl7Vf7ZbKRDptszpppKxXH6DRXEABZ/gcEQczeb0iZ7JvL8e8jjCA==",
+      "requires": {
+        "@babel/runtime": "^7.5.5",
+        "tiny-warning": "^1.0.3"
+      }
+    },
+    "mini-css-extract-plugin": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.2.tgz",
+      "integrity": "sha512-a3Y4of27Wz+mqK3qrcd3VhYz6cU0iW5x3Sgvqzbj+XmlrSizmvu8QQMl5oMYJjgHOC4iyt+w7l4umP+dQeW3bw==",
+      "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==",
+          "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==",
+          "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==",
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
+      }
+    },
+    "minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+    },
+    "minipass": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
+      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
+      "requires": {
+        "yallist": "^4.0.0"
+      },
+      "dependencies": {
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+        }
+      }
+    },
+    "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==",
+      "requires": {
+        "minipass": "^3.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==",
+      "requires": {
+        "minipass": "^3.0.0"
+      }
+    },
+    "minipass-pipeline": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.3.tgz",
+      "integrity": "sha512-cFOknTvng5vqnwOpDsZTWhNll6Jf8o2x+/diplafmxpuIymAjzoOolZG0VvQf3V2HgqzJNhnuKHYp2BqDgz8IQ==",
+      "requires": {
+        "minipass": "^3.0.0"
+      }
+    },
+    "mississippi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+      "requires": {
+        "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"
+      }
+    },
+    "mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "requires": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "mixin-object": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
+      "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
+      "requires": {
+        "for-in": "^0.1.3",
+        "is-extendable": "^0.1.1"
+      },
+      "dependencies": {
+        "for-in": {
+          "version": "0.1.8",
+          "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
+          "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE="
+        }
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "move-concurrently": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+      "requires": {
+        "aproba": "^1.1.1",
+        "copy-concurrently": "^1.0.0",
+        "fs-write-stream-atomic": "^1.0.8",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.3"
+      }
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "multicast-dns": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
+      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
+      "requires": {
+        "dns-packet": "^1.3.1",
+        "thunky": "^1.0.2"
+      }
+    },
+    "multicast-dns-service-types": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
+      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE="
+    },
+    "mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
+    },
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "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.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "negotiator": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
+    },
+    "neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
+    },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+    },
+    "no-case": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz",
+      "integrity": "sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==",
+      "requires": {
+        "lower-case": "^2.0.1",
+        "tslib": "^1.10.0"
+      }
+    },
+    "node-emoji": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz",
+      "integrity": "sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw==",
+      "requires": {
+        "lodash.toarray": "^4.4.0"
+      }
+    },
+    "node-forge": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz",
+      "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ=="
+    },
+    "node-libs-browser": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+      "requires": {
+        "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.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.0",
+        "vm-browserify": "^1.0.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "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"
+          },
+          "dependencies": {
+            "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==",
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        }
+      }
+    },
+    "node-releases": {
+      "version": "1.1.59",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.59.tgz",
+      "integrity": "sha512-H3JrdUczbdiwxN5FuJPyCHnGHIFqQ0wWxo+9j1kAXAzqNMAHlo+4I/sYYxpyK0irQ73HgdiyzD32oqQDcU2Osw=="
+    },
+    "nopt": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
+      "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
+      "requires": {
+        "abbrev": "1"
+      }
+    },
+    "normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
+    },
+    "normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI="
+    },
+    "normalize-url": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
+      "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
+      "requires": {
+        "object-assign": "^4.0.1",
+        "prepend-http": "^1.0.0",
+        "query-string": "^4.1.0",
+        "sort-keys": "^1.0.0"
+      }
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "requires": {
+        "path-key": "^2.0.0"
+      },
+      "dependencies": {
+        "path-key": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+          "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
+        }
+      }
+    },
+    "nprogress": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz",
+      "integrity": "sha1-y480xTIT2JVyP8urkH6UIq28r7E="
+    },
+    "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==",
+      "requires": {
+        "boolbase": "~1.0.0"
+      }
+    },
+    "null-loader": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/null-loader/-/null-loader-3.0.0.tgz",
+      "integrity": "sha512-hf5sNLl8xdRho4UPBOOeoIwT3WhjYcMUQm0zj44EhD6UscMAz72o2udpoDFBgykucdEDGIcd6SXbc/G6zssbzw==",
+      "requires": {
+        "loader-utils": "^1.2.3",
+        "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==",
+          "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==",
+          "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==",
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
+      }
+    },
+    "num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4="
+    },
+    "oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "requires": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "object-inspect": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
+      "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="
+    },
+    "object-is": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz",
+      "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      }
+    },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+    },
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "requires": {
+        "isobject": "^3.0.0"
+      }
+    },
+    "object.assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "requires": {
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
+      }
+    },
+    "object.getownpropertydescriptors": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
+      "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
+      }
+    },
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "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==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3"
+      }
+    },
+    "obuf": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "onetime": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
+      "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
+      "requires": {
+        "mimic-fn": "^2.1.0"
+      }
+    },
+    "open": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.0.4.tgz",
+      "integrity": "sha512-brSA+/yq+b08Hsr4c8fsEW2CRzk1BmfN3SAK/5VCHQ9bdoZJ4qa/+AfR0xHjlbbZUyPkUHs1b8x1RqdyZdkVqQ==",
+      "requires": {
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
+      }
+    },
+    "opener": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz",
+      "integrity": "sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA=="
+    },
+    "opn": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
+      "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
+      "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="
+        }
+      }
+    },
+    "optimize-css-assets-webpack-plugin": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.3.tgz",
+      "integrity": "sha512-q9fbvCRS6EYtUKKSwI87qm2IxlyJK5b4dygW1rKUBT6mMDhdG5e5bZT63v6tnJR9F9FB/H5a0HTmtw+laUBxKA==",
+      "requires": {
+        "cssnano": "^4.1.10",
+        "last-call-webpack-plugin": "^3.0.0"
+      }
+    },
+    "original": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
+      "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
+      "requires": {
+        "url-parse": "^1.4.3"
+      }
+    },
+    "os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc="
+    },
+    "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="
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
+    },
+    "p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "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==",
+      "requires": {
+        "p-limit": "^2.0.0"
+      }
+    },
+    "p-map": {
+      "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==",
+      "requires": {
+        "aggregate-error": "^3.0.0"
+      }
+    },
+    "p-retry": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
+      "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
+      "requires": {
+        "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=="
+    },
+    "pako": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+    },
+    "parallel-transform": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
+      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
+      "requires": {
+        "cyclist": "^1.0.1",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.1.5"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "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"
+          }
+        },
+        "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==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "param-case": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.3.tgz",
+      "integrity": "sha512-VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA==",
+      "requires": {
+        "dot-case": "^3.0.3",
+        "tslib": "^1.10.0"
+      }
+    },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "requires": {
+        "callsites": "^3.0.0"
+      }
+    },
+    "parse-asn1": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
+      "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
+      "requires": {
+        "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-entities": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
+      "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
+      "requires": {
+        "character-entities": "^1.0.0",
+        "character-entities-legacy": "^1.0.0",
+        "character-reference-invalid": "^1.0.0",
+        "is-alphanumerical": "^1.0.0",
+        "is-decimal": "^1.0.0",
+        "is-hexadecimal": "^1.0.0"
+      }
+    },
+    "parse-json": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz",
+      "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1",
+        "lines-and-columns": "^1.1.6"
+      }
+    },
+    "parse-numeric-range": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/parse-numeric-range/-/parse-numeric-range-0.0.2.tgz",
+      "integrity": "sha1-tPCdQTx6282Yf26SM8e0shDJOOQ="
+    },
+    "parse5": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
+      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="
+    },
+    "parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
+    },
+    "pascal-case": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.1.tgz",
+      "integrity": "sha512-XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA==",
+      "requires": {
+        "no-case": "^3.0.3",
+        "tslib": "^1.10.0"
+      }
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
+    },
+    "path-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="
+    },
+    "path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA="
+    },
+    "path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
+    },
+    "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="
+    },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
+    },
+    "path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
+    },
+    "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=="
+    },
+    "path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+    },
+    "path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
+    },
+    "pbkdf2": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz",
+      "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==",
+      "requires": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+    },
+    "picomatch": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
+    },
+    "pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "requires": {
+        "pinkie": "^2.0.0"
+      }
+    },
+    "pkg-dir": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+      "requires": {
+        "find-up": "^3.0.0"
+      }
+    },
+    "pkg-up": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
+      "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
+      "requires": {
+        "find-up": "^3.0.0"
+      }
+    },
+    "pnp-webpack-plugin": {
+      "version": "1.6.4",
+      "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz",
+      "integrity": "sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==",
+      "requires": {
+        "ts-pnp": "^1.1.6"
+      }
+    },
+    "portfinder": {
+      "version": "1.0.26",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz",
+      "integrity": "sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==",
+      "requires": {
+        "async": "^2.6.2",
+        "debug": "^3.1.1",
+        "mkdirp": "^0.5.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
+    "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="
+    },
+    "postcss": {
+      "version": "7.0.32",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
+      "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==",
+      "requires": {
+        "chalk": "^2.4.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^6.1.0"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "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==",
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "postcss-attribute-case-insensitive": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz",
+      "integrity": "sha512-clkFxk/9pcdb4Vkn0hAHq3YnxBQ2p0CGD1dy24jN+reBck+EWxMbxSUqN4Yj7t0w8csl87K6p0gxBe1utkJsYA==",
+      "requires": {
+        "postcss": "^7.0.2",
+        "postcss-selector-parser": "^6.0.2"
+      }
+    },
+    "postcss-calc": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.2.tgz",
+      "integrity": "sha512-rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ==",
+      "requires": {
+        "postcss": "^7.0.27",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.0.2"
+      }
+    },
+    "postcss-color-functional-notation": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz",
+      "integrity": "sha512-ZBARCypjEDofW4P6IdPVTLhDNXPRn8T2s1zHbZidW6rPaaZvcnCS2soYFIQJrMZSxiePJ2XIYTlcb2ztr/eT2g==",
+      "requires": {
+        "postcss": "^7.0.2",
+        "postcss-values-parser": "^2.0.0"
+      }
+    },
+    "postcss-color-gray": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz",
+      "integrity": "sha512-q6BuRnAGKM/ZRpfDascZlIZPjvwsRye7UDNalqVz3s7GDxMtqPY6+Q871liNxsonUw8oC61OG+PSaysYpl1bnw==",
+      "requires": {
+        "@csstools/convert-colors": "^1.4.0",
+        "postcss": "^7.0.5",
+        "postcss-values-parser": "^2.0.0"
+      }
+    },
+    "postcss-color-hex-alpha": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.3.tgz",
+      "integrity": "sha512-PF4GDel8q3kkreVXKLAGNpHKilXsZ6xuu+mOQMHWHLPNyjiUBOr75sp5ZKJfmv1MCus5/DWUGcK9hm6qHEnXYw==",
+      "requires": {
+        "postcss": "^7.0.14",
+        "postcss-values-parser": "^2.0.1"
+      }
+    },
+    "postcss-color-mod-function": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz",
+      "integrity": "sha512-YP4VG+xufxaVtzV6ZmhEtc+/aTXH3d0JLpnYfxqTvwZPbJhWqp8bSY3nfNzNRFLgB4XSaBA82OE4VjOOKpCdVQ==",
+      "requires": {
+        "@csstools/convert-colors": "^1.4.0",
+        "postcss": "^7.0.2",
+        "postcss-values-parser": "^2.0.0"
+      }
+    },
+    "postcss-color-rebeccapurple": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-4.0.1.tgz",
+      "integrity": "sha512-aAe3OhkS6qJXBbqzvZth2Au4V3KieR5sRQ4ptb2b2O8wgvB3SJBsdG+jsn2BZbbwekDG8nTfcCNKcSfe/lEy8g==",
+      "requires": {
+        "postcss": "^7.0.2",
+        "postcss-values-parser": "^2.0.0"
+      }
+    },
+    "postcss-colormin": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
+      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
+      "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=="
+        }
+      }
+    },
+    "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==",
+      "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=="
+        }
+      }
+    },
+    "postcss-custom-media": {
+      "version": "7.0.8",
+      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz",
+      "integrity": "sha512-c9s5iX0Ge15o00HKbuRuTqNndsJUbaXdiNsksnVH8H4gdc+zbLzr/UasOwNG6CTDpLFekVY4672eWdiiWu2GUg==",
+      "requires": {
+        "postcss": "^7.0.14"
+      }
+    },
+    "postcss-custom-properties": {
+      "version": "8.0.11",
+      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz",
+      "integrity": "sha512-nm+o0eLdYqdnJ5abAJeXp4CEU1c1k+eB2yMCvhgzsds/e0umabFrN6HoTy/8Q4K5ilxERdl/JD1LO5ANoYBeMA==",
+      "requires": {
+        "postcss": "^7.0.17",
+        "postcss-values-parser": "^2.0.1"
+      }
+    },
+    "postcss-custom-selectors": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-5.1.2.tgz",
+      "integrity": "sha512-DSGDhqinCqXqlS4R7KGxL1OSycd1lydugJ1ky4iRXPHdBRiozyMHrdu0H3o7qNOCiZwySZTUI5MV0T8QhCLu+w==",
+      "requires": {
+        "postcss": "^7.0.2",
+        "postcss-selector-parser": "^5.0.0-rc.3"
+      },
+      "dependencies": {
+        "cssesc": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
+          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="
+        },
+        "postcss-selector-parser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
+          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
+          "requires": {
+            "cssesc": "^2.0.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "postcss-dir-pseudo-class": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-5.0.0.tgz",
+      "integrity": "sha512-3pm4oq8HYWMZePJY+5ANriPs3P07q+LW6FAdTlkFH2XqDdP4HeeJYMOzn0HYLhRSjBO3fhiqSwwU9xEULSrPgw==",
+      "requires": {
+        "postcss": "^7.0.2",
+        "postcss-selector-parser": "^5.0.0-rc.3"
+      },
+      "dependencies": {
+        "cssesc": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
+          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="
+        },
+        "postcss-selector-parser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
+          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
+          "requires": {
+            "cssesc": "^2.0.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "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==",
+      "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==",
+      "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==",
+      "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==",
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-double-position-gradients": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz",
+      "integrity": "sha512-G+nV8EnQq25fOI8CH/B6krEohGWnF5+3A6H/+JEpOncu5dCnkS1QQ6+ct3Jkaepw1NGVqqOZH6lqrm244mCftA==",
+      "requires": {
+        "postcss": "^7.0.5",
+        "postcss-values-parser": "^2.0.0"
+      }
+    },
+    "postcss-env-function": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-2.0.2.tgz",
+      "integrity": "sha512-rwac4BuZlITeUbiBq60h/xbLzXY43qOsIErngWa4l7Mt+RaSkT7QBjXVGTcBHupykkblHMDrBFh30zchYPaOUw==",
+      "requires": {
+        "postcss": "^7.0.2",
+        "postcss-values-parser": "^2.0.0"
+      }
+    },
+    "postcss-focus-visible": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz",
+      "integrity": "sha512-Z5CkWBw0+idJHSV6+Bgf2peDOFf/x4o+vX/pwcNYrWpXFrSfTkQ3JQ1ojrq9yS+upnAlNRHeg8uEwFTgorjI8g==",
+      "requires": {
+        "postcss": "^7.0.2"
+      }
+    },
+    "postcss-focus-within": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz",
+      "integrity": "sha512-W0APui8jQeBKbCGZudW37EeMCjDeVxKgiYfIIEo8Bdh5SpB9sxds/Iq8SEuzS0Q4YFOlG7EPFulbbxujpkrV2w==",
+      "requires": {
+        "postcss": "^7.0.2"
+      }
+    },
+    "postcss-font-variant": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-4.0.0.tgz",
+      "integrity": "sha512-M8BFYKOvCrI2aITzDad7kWuXXTm0YhGdP9Q8HanmN4EF1Hmcgs1KK5rSHylt/lUJe8yLxiSwWAHdScoEiIxztg==",
+      "requires": {
+        "postcss": "^7.0.2"
+      }
+    },
+    "postcss-gap-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz",
+      "integrity": "sha512-QZSqDaMgXCHuHTEzMsS2KfVDOq7ZFiknSpkrPJY6jmxbugUPTuSzs/vuE5I3zv0WAS+3vhrlqhijiprnuQfzmg==",
+      "requires": {
+        "postcss": "^7.0.2"
+      }
+    },
+    "postcss-image-set-function": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-3.0.1.tgz",
+      "integrity": "sha512-oPTcFFip5LZy8Y/whto91L9xdRHCWEMs3e1MdJxhgt4jy2WYXfhkng59fH5qLXSCPN8k4n94p1Czrfe5IOkKUw==",
+      "requires": {
+        "postcss": "^7.0.2",
+        "postcss-values-parser": "^2.0.0"
+      }
+    },
+    "postcss-initial": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-3.0.2.tgz",
+      "integrity": "sha512-ugA2wKonC0xeNHgirR4D3VWHs2JcU08WAi1KFLVcnb7IN89phID6Qtg2RIctWbnvp1TM2BOmDtX8GGLCKdR8YA==",
+      "requires": {
+        "lodash.template": "^4.5.0",
+        "postcss": "^7.0.2"
+      }
+    },
+    "postcss-lab-function": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz",
+      "integrity": "sha512-whLy1IeZKY+3fYdqQFuDBf8Auw+qFuVnChWjmxm/UhHWqNHZx+B99EwxTvGYmUBqe3Fjxs4L1BoZTJmPu6usVg==",
+      "requires": {
+        "@csstools/convert-colors": "^1.4.0",
+        "postcss": "^7.0.2",
+        "postcss-values-parser": "^2.0.0"
+      }
+    },
+    "postcss-load-config": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz",
+      "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==",
+      "requires": {
+        "cosmiconfig": "^5.0.0",
+        "import-cwd": "^2.0.0"
+      },
+      "dependencies": {
+        "cosmiconfig": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+          "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+          "requires": {
+            "import-fresh": "^2.0.0",
+            "is-directory": "^0.3.1",
+            "js-yaml": "^3.13.1",
+            "parse-json": "^4.0.0"
+          }
+        },
+        "import-fresh": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+          "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
+          "requires": {
+            "caller-path": "^2.0.0",
+            "resolve-from": "^3.0.0"
+          }
+        },
+        "parse-json": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+          "requires": {
+            "error-ex": "^1.3.1",
+            "json-parse-better-errors": "^1.0.1"
+          }
+        },
+        "resolve-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g="
+        }
+      }
+    },
+    "postcss-loader": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
+      "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "postcss": "^7.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==",
+          "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==",
+          "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==",
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
+      }
+    },
+    "postcss-logical": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-3.0.0.tgz",
+      "integrity": "sha512-1SUKdJc2vuMOmeItqGuNaC+N8MzBWFWEkAnRnLpFYj1tGGa7NqyVBujfRtgNa2gXR+6RkGUiB2O5Vmh7E2RmiA==",
+      "requires": {
+        "postcss": "^7.0.2"
+      }
+    },
+    "postcss-media-minmax": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-4.0.0.tgz",
+      "integrity": "sha512-fo9moya6qyxsjbFAYl97qKO9gyre3qvbMnkOZeZwlsW6XYFsvs2DMGDlchVLfAd8LHPZDxivu/+qW2SMQeTHBw==",
+      "requires": {
+        "postcss": "^7.0.2"
+      }
+    },
+    "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==",
+      "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=="
+        }
+      }
+    },
+    "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==",
+      "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==",
+          "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==",
+      "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=="
+        }
+      }
+    },
+    "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==",
+      "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=="
+        }
+      }
+    },
+    "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==",
+      "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=="
+        }
+      }
+    },
+    "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==",
+      "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==",
+          "requires": {
+            "dot-prop": "^5.2.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "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==",
+      "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==",
+      "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==",
+      "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==",
+      "requires": {
+        "icss-utils": "^4.0.0",
+        "postcss": "^7.0.6"
+      }
+    },
+    "postcss-nesting": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-7.0.1.tgz",
+      "integrity": "sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg==",
+      "requires": {
+        "postcss": "^7.0.2"
+      }
+    },
+    "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==",
+      "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==",
+      "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=="
+        }
+      }
+    },
+    "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==",
+      "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=="
+        }
+      }
+    },
+    "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==",
+      "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=="
+        }
+      }
+    },
+    "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==",
+      "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=="
+        }
+      }
+    },
+    "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==",
+      "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=="
+        }
+      }
+    },
+    "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==",
+      "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=="
+        }
+      }
+    },
+    "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==",
+      "requires": {
+        "is-absolute-url": "^2.0.0",
+        "normalize-url": "^3.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "normalize-url": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
+          "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="
+        },
+        "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=="
+        }
+      }
+    },
+    "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==",
+      "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=="
+        }
+      }
+    },
+    "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==",
+      "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=="
+        }
+      }
+    },
+    "postcss-overflow-shorthand": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-2.0.0.tgz",
+      "integrity": "sha512-aK0fHc9CBNx8jbzMYhshZcEv8LtYnBIRYQD5i7w/K/wS9c2+0NSR6B3OVMu5y0hBHYLcMGjfU+dmWYNKH0I85g==",
+      "requires": {
+        "postcss": "^7.0.2"
+      }
+    },
+    "postcss-page-break": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-2.0.0.tgz",
+      "integrity": "sha512-tkpTSrLpfLfD9HvgOlJuigLuk39wVTbbd8RKcy8/ugV2bNBUW3xU+AIqyxhDrQr1VUj1RmyJrBn1YWrqUm9zAQ==",
+      "requires": {
+        "postcss": "^7.0.2"
+      }
+    },
+    "postcss-place": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-4.0.1.tgz",
+      "integrity": "sha512-Zb6byCSLkgRKLODj/5mQugyuj9bvAAw9LqJJjgwz5cYryGeXfFZfSXoP1UfveccFmeq0b/2xxwcTEVScnqGxBg==",
+      "requires": {
+        "postcss": "^7.0.2",
+        "postcss-values-parser": "^2.0.0"
+      }
+    },
+    "postcss-preset-env": {
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-6.7.0.tgz",
+      "integrity": "sha512-eU4/K5xzSFwUFJ8hTdTQzo2RBLbDVt83QZrAvI07TULOkmyQlnYlpwep+2yIK+K+0KlZO4BvFcleOCCcUtwchg==",
+      "requires": {
+        "autoprefixer": "^9.6.1",
+        "browserslist": "^4.6.4",
+        "caniuse-lite": "^1.0.30000981",
+        "css-blank-pseudo": "^0.1.4",
+        "css-has-pseudo": "^0.10.0",
+        "css-prefers-color-scheme": "^3.1.1",
+        "cssdb": "^4.4.0",
+        "postcss": "^7.0.17",
+        "postcss-attribute-case-insensitive": "^4.0.1",
+        "postcss-color-functional-notation": "^2.0.1",
+        "postcss-color-gray": "^5.0.0",
+        "postcss-color-hex-alpha": "^5.0.3",
+        "postcss-color-mod-function": "^3.0.3",
+        "postcss-color-rebeccapurple": "^4.0.1",
+        "postcss-custom-media": "^7.0.8",
+        "postcss-custom-properties": "^8.0.11",
+        "postcss-custom-selectors": "^5.1.2",
+        "postcss-dir-pseudo-class": "^5.0.0",
+        "postcss-double-position-gradients": "^1.0.0",
+        "postcss-env-function": "^2.0.2",
+        "postcss-focus-visible": "^4.0.0",
+        "postcss-focus-within": "^3.0.0",
+        "postcss-font-variant": "^4.0.0",
+        "postcss-gap-properties": "^2.0.0",
+        "postcss-image-set-function": "^3.0.1",
+        "postcss-initial": "^3.0.0",
+        "postcss-lab-function": "^2.0.1",
+        "postcss-logical": "^3.0.0",
+        "postcss-media-minmax": "^4.0.0",
+        "postcss-nesting": "^7.0.0",
+        "postcss-overflow-shorthand": "^2.0.0",
+        "postcss-page-break": "^2.0.0",
+        "postcss-place": "^4.0.1",
+        "postcss-pseudo-class-any-link": "^6.0.0",
+        "postcss-replace-overflow-wrap": "^3.0.0",
+        "postcss-selector-matches": "^4.0.0",
+        "postcss-selector-not": "^4.0.0"
+      }
+    },
+    "postcss-pseudo-class-any-link": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-6.0.0.tgz",
+      "integrity": "sha512-lgXW9sYJdLqtmw23otOzrtbDXofUdfYzNm4PIpNE322/swES3VU9XlXHeJS46zT2onFO7V1QFdD4Q9LiZj8mew==",
+      "requires": {
+        "postcss": "^7.0.2",
+        "postcss-selector-parser": "^5.0.0-rc.3"
+      },
+      "dependencies": {
+        "cssesc": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
+          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="
+        },
+        "postcss-selector-parser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
+          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
+          "requires": {
+            "cssesc": "^2.0.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "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==",
+      "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==",
+      "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=="
+        }
+      }
+    },
+    "postcss-replace-overflow-wrap": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz",
+      "integrity": "sha512-2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw==",
+      "requires": {
+        "postcss": "^7.0.2"
+      }
+    },
+    "postcss-selector-matches": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz",
+      "integrity": "sha512-LgsHwQR/EsRYSqlwdGzeaPKVT0Ml7LAT6E75T8W8xLJY62CE4S/l03BWIt3jT8Taq22kXP08s2SfTSzaraoPww==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "postcss": "^7.0.2"
+      }
+    },
+    "postcss-selector-not": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-4.0.0.tgz",
+      "integrity": "sha512-W+bkBZRhqJaYN8XAnbbZPLWMvZD1wKTu0UxtFKdhtGjWYmxhkUneoeOhRJKdAE5V7ZTlnbHfCR+6bNwK9e1dTQ==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "postcss": "^7.0.2"
+      }
+    },
+    "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==",
+      "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==",
+      "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=="
+        }
+      }
+    },
+    "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==",
+      "requires": {
+        "alphanum-sort": "^1.0.0",
+        "postcss": "^7.0.0",
+        "uniqs": "^2.0.0"
+      }
+    },
+    "postcss-value-parser": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
+    },
+    "postcss-values-parser": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz",
+      "integrity": "sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg==",
+      "requires": {
+        "flatten": "^1.0.2",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      }
+    },
+    "prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
+    },
+    "pretty-error": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
+      "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
+      "requires": {
+        "renderkid": "^2.0.1",
+        "utila": "~0.4"
+      }
+    },
+    "pretty-time": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/pretty-time/-/pretty-time-1.1.0.tgz",
+      "integrity": "sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA=="
+    },
+    "prism-react-renderer": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/prism-react-renderer/-/prism-react-renderer-1.1.1.tgz",
+      "integrity": "sha512-MgMhSdHuHymNRqD6KM3eGS0PNqgK9q4QF5P0yoQQvpB6jNjeSAi3jcSAz0Sua/t9fa4xDOMar9HJbLa08gl9ug=="
+    },
+    "prismjs": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.20.0.tgz",
+      "integrity": "sha512-AEDjSrVNkynnw6A+B1DsFkd6AVdTnp+/WoUixFRULlCLZVRZlVQMVWio/16jv7G1FscUxQxOQhWwApgbnxr6kQ==",
+      "requires": {
+        "clipboard": "^2.0.0"
+      }
+    },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
+    },
+    "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=="
+    },
+    "promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
+    },
+    "prop-types": {
+      "version": "15.7.2",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+      "requires": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.8.1"
+      }
+    },
+    "property-information": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/property-information/-/property-information-5.5.0.tgz",
+      "integrity": "sha512-RgEbCx2HLa1chNgvChcx+rrCWD0ctBmGSE0M7lVm1yyv4UbvbrWoXp/BkVLZefzjrRBGW8/Js6uh/BnlHXFyjA==",
+      "requires": {
+        "xtend": "^4.0.0"
+      }
+    },
+    "proxy-addr": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
+      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
+      "requires": {
+        "forwarded": "~0.1.2",
+        "ipaddr.js": "1.9.1"
+      }
+    },
+    "prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
+    },
+    "psl": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+    },
+    "public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
+        }
+      }
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "pumpify": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "requires": {
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
+      },
+      "dependencies": {
+        "pump": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        }
+      }
+    },
+    "punycode": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
+    },
+    "q": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
+    },
+    "qs": {
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
+    },
+    "query-string": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
+      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
+      "requires": {
+        "object-assign": "^4.1.0",
+        "strict-uri-encode": "^1.0.0"
+      }
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
+    },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM="
+    },
+    "querystringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="
+    },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "requires": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
+    },
+    "raw-body": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "requires": {
+        "bytes": "3.1.0",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      }
+    },
+    "react": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react/-/react-16.13.1.tgz",
+      "integrity": "sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==",
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.2"
+      }
+    },
+    "react-dev-utils": {
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-10.2.1.tgz",
+      "integrity": "sha512-XxTbgJnYZmxuPtY3y/UV0D8/65NKkmaia4rXzViknVnZeVlklSh8u6TnaEYPfAi/Gh1TP4mEOXHI6jQOPbeakQ==",
+      "requires": {
+        "@babel/code-frame": "7.8.3",
+        "address": "1.1.2",
+        "browserslist": "4.10.0",
+        "chalk": "2.4.2",
+        "cross-spawn": "7.0.1",
+        "detect-port-alt": "1.1.6",
+        "escape-string-regexp": "2.0.0",
+        "filesize": "6.0.1",
+        "find-up": "4.1.0",
+        "fork-ts-checker-webpack-plugin": "3.1.1",
+        "global-modules": "2.0.0",
+        "globby": "8.0.2",
+        "gzip-size": "5.1.1",
+        "immer": "1.10.0",
+        "inquirer": "7.0.4",
+        "is-root": "2.1.0",
+        "loader-utils": "1.2.3",
+        "open": "^7.0.2",
+        "pkg-up": "3.1.0",
+        "react-error-overlay": "^6.0.7",
+        "recursive-readdir": "2.2.2",
+        "shell-quote": "1.7.2",
+        "strip-ansi": "6.0.0",
+        "text-table": "0.2.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==",
+          "requires": {
+            "@babel/highlight": "^7.8.3"
+          }
+        },
+        "@nodelib/fs.stat": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
+          "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
+        },
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "browserslist": {
+          "version": "4.10.0",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.10.0.tgz",
+          "integrity": "sha512-TpfK0TDgv71dzuTsEAlQiHeWQ/tiPqgNZVdv046fvNtBZrjbv2O3TsWCDU0AWGJJKCF/KsjNdLzR9hXOsh/CfA==",
+          "requires": {
+            "caniuse-lite": "^1.0.30001035",
+            "electron-to-chromium": "^1.3.378",
+            "node-releases": "^1.1.52",
+            "pkg-up": "^3.1.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "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="
+            }
+          }
+        },
+        "dir-glob": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
+          "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
+          "requires": {
+            "arrify": "^1.0.1",
+            "path-type": "^3.0.0"
+          }
+        },
+        "emojis-list": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+          "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
+        },
+        "escape-string-regexp": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          },
+          "dependencies": {
+            "is-extendable": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+              "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+              "requires": {
+                "is-plain-object": "^2.0.4"
+              }
+            }
+          }
+        },
+        "fast-glob": {
+          "version": "2.2.7",
+          "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
+          "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
+          "requires": {
+            "@mrmlnc/readdir-enhanced": "^2.2.1",
+            "@nodelib/fs.stat": "^1.1.2",
+            "glob-parent": "^3.1.0",
+            "is-glob": "^4.0.0",
+            "merge2": "^1.2.3",
+            "micromatch": "^3.1.10"
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.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==",
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        },
+        "globby": {
+          "version": "8.0.2",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz",
+          "integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==",
+          "requires": {
+            "array-union": "^1.0.1",
+            "dir-glob": "2.0.0",
+            "fast-glob": "^2.0.2",
+            "glob": "^7.1.2",
+            "ignore": "^3.3.5",
+            "pify": "^3.0.0",
+            "slash": "^1.0.0"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "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.2.3",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+          "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^2.0.0",
+            "json5": "^1.0.1"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "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==",
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "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=="
+        },
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+        },
+        "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"
+          }
+        },
+        "to-regex-range": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+          "requires": {
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
+          }
+        }
+      }
+    },
+    "react-dom": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.13.1.tgz",
+      "integrity": "sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==",
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.2",
+        "scheduler": "^0.19.1"
+      }
+    },
+    "react-error-overlay": {
+      "version": "6.0.7",
+      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.7.tgz",
+      "integrity": "sha512-TAv1KJFh3RhqxNvhzxj6LeT5NWklP6rDr2a0jaTfsZ5wSZWHOGeqQyejUp3xxLfPt2UpyJEcVQB/zyPcmonNFA=="
+    },
+    "react-fast-compare": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz",
+      "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA=="
+    },
+    "react-helmet": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz",
+      "integrity": "sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==",
+      "requires": {
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.7.2",
+        "react-fast-compare": "^3.1.1",
+        "react-side-effect": "^2.1.0"
+      }
+    },
+    "react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+    },
+    "react-loadable": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/react-loadable/-/react-loadable-5.5.0.tgz",
+      "integrity": "sha512-C8Aui0ZpMd4KokxRdVAm2bQtI03k2RMRNzOB+IipV3yxFTSVICv7WoUr5L9ALB5BmKO1iHgZtWM8EvYG83otdg==",
+      "requires": {
+        "prop-types": "^15.5.0"
+      }
+    },
+    "react-loadable-ssr-addon": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/react-loadable-ssr-addon/-/react-loadable-ssr-addon-0.2.3.tgz",
+      "integrity": "sha512-vPCqsmiafAMDcS9MLgXw3m4yMI40v1UeI8FTYJJkjf85LugKNnHf6D9yoDTzYwp8wEGF5viekwOD03ZPxSwnQQ=="
+    },
+    "react-router": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.0.tgz",
+      "integrity": "sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==",
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "history": "^4.9.0",
+        "hoist-non-react-statics": "^3.1.0",
+        "loose-envify": "^1.3.1",
+        "mini-create-react-context": "^0.4.0",
+        "path-to-regexp": "^1.7.0",
+        "prop-types": "^15.6.2",
+        "react-is": "^16.6.0",
+        "tiny-invariant": "^1.0.2",
+        "tiny-warning": "^1.0.0"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+        },
+        "path-to-regexp": {
+          "version": "1.8.0",
+          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
+          "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
+          "requires": {
+            "isarray": "0.0.1"
+          }
+        }
+      }
+    },
+    "react-router-config": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/react-router-config/-/react-router-config-5.1.1.tgz",
+      "integrity": "sha512-DuanZjaD8mQp1ppHjgnnUnyOlqYXZVjnov/JzFhjLEwd3Z4dYjMSnqrEzzGThH47vpCOqPPwJM2FtthLeJ8Pbg==",
+      "requires": {
+        "@babel/runtime": "^7.1.2"
+      }
+    },
+    "react-router-dom": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.2.0.tgz",
+      "integrity": "sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==",
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "history": "^4.9.0",
+        "loose-envify": "^1.3.1",
+        "prop-types": "^15.6.2",
+        "react-router": "5.2.0",
+        "tiny-invariant": "^1.0.2",
+        "tiny-warning": "^1.0.0"
+      }
+    },
+    "react-side-effect": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.0.tgz",
+      "integrity": "sha512-IgmcegOSi5SNX+2Snh1vqmF0Vg/CbkycU9XZbOHJlZ6kMzTmi3yc254oB1WCkgA7OQtIAoLmcSFuHTc/tlcqXg=="
+    },
+    "react-toggle": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/react-toggle/-/react-toggle-4.1.1.tgz",
+      "integrity": "sha512-+wXlMcSpg8SmnIXauMaZiKpR+r2wp2gMUteroejp2UTSqGTVvZLN+m9EhMzFARBKEw7KpQOwzCyfzeHeAndQGw==",
+      "requires": {
+        "classnames": "^2.2.5"
+      }
+    },
+    "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==",
+      "requires": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      }
+    },
+    "readdirp": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
+      "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+      "requires": {
+        "picomatch": "^2.2.1"
+      }
+    },
+    "reading-time": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/reading-time/-/reading-time-1.2.0.tgz",
+      "integrity": "sha512-5b4XmKK4MEss63y0Lw0vn0Zn6G5kiHP88mUnD8UeEsyORj3sh1ghTH0/u6m1Ax9G2F4wUZrknlp6WlIsCvoXVA=="
+    },
+    "rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+      "requires": {
+        "resolve": "^1.1.6"
+      }
+    },
+    "recursive-readdir": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
+      "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==",
+      "requires": {
+        "minimatch": "3.0.4"
+      }
+    },
+    "reduce": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/reduce/-/reduce-1.0.2.tgz",
+      "integrity": "sha512-xX7Fxke/oHO5IfZSk77lvPa/7bjMh9BuCk4OOoX5XTXrM7s0Z+MkPfSDfz0q7r91BhhGSs8gii/VEN/7zhCPpQ==",
+      "requires": {
+        "object-keys": "^1.1.0"
+      }
+    },
+    "regenerate": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz",
+      "integrity": "sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A=="
+    },
+    "regenerate-unicode-properties": {
+      "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==",
+      "requires": {
+        "regenerate": "^1.4.0"
+      }
+    },
+    "regenerator-runtime": {
+      "version": "0.13.5",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
+      "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="
+    },
+    "regenerator-transform": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
+      "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
+      "requires": {
+        "@babel/runtime": "^7.8.4"
+      }
+    },
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "requires": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "regexp.prototype.flags": {
+      "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==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
+      }
+    },
+    "regexpu-core": {
+      "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==",
+      "requires": {
+        "regenerate": "^1.4.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.2.0"
+      }
+    },
+    "regjsgen": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
+      "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="
+    },
+    "regjsparser": {
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
+      "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
+      "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="
+        }
+      }
+    },
+    "rehype-parse": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/rehype-parse/-/rehype-parse-6.0.2.tgz",
+      "integrity": "sha512-0S3CpvpTAgGmnz8kiCyFLGuW5yA4OQhyNTm/nwPopZ7+PI11WnGl1TTWTGv/2hPEe/g2jRLlhVVSsoDH8waRug==",
+      "requires": {
+        "hast-util-from-parse5": "^5.0.0",
+        "parse5": "^5.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "relateurl": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk="
+    },
+    "remark-admonitions": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/remark-admonitions/-/remark-admonitions-1.2.1.tgz",
+      "integrity": "sha512-Ji6p68VDvD+H1oS95Fdx9Ar5WA2wcDA4kwrrhVU7fGctC6+d3uiMICu7w7/2Xld+lnU7/gi+432+rRbup5S8ow==",
+      "requires": {
+        "rehype-parse": "^6.0.2",
+        "unified": "^8.4.2",
+        "unist-util-visit": "^2.0.1"
+      },
+      "dependencies": {
+        "is-plain-obj": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+          "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA=="
+        },
+        "unified": {
+          "version": "8.4.2",
+          "resolved": "https://registry.npmjs.org/unified/-/unified-8.4.2.tgz",
+          "integrity": "sha512-JCrmN13jI4+h9UAyKEoGcDZV+i1E7BLFuG7OsaDvTXI5P0qhHX+vZO/kOhz9jn8HGENDKbwSeB0nVOg4gVStGA==",
+          "requires": {
+            "bail": "^1.0.0",
+            "extend": "^3.0.0",
+            "is-plain-obj": "^2.0.0",
+            "trough": "^1.0.0",
+            "vfile": "^4.0.0"
+          }
+        }
+      }
+    },
+    "remark-emoji": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/remark-emoji/-/remark-emoji-2.1.0.tgz",
+      "integrity": "sha512-lDddGsxXURV01WS9WAiS9rO/cedO1pvr9tahtLhr6qCGFhHG4yZSJW3Ha4Nw9Uk1hLNmUBtPC0+m45Ms+xEitg==",
+      "requires": {
+        "emoticon": "^3.2.0",
+        "node-emoji": "^1.10.0",
+        "unist-util-visit": "^2.0.2"
+      }
+    },
+    "remark-footnotes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/remark-footnotes/-/remark-footnotes-1.0.0.tgz",
+      "integrity": "sha512-X9Ncj4cj3/CIvLI2Z9IobHtVi8FVdUrdJkCNaL9kdX8ohfsi18DXHsCVd/A7ssARBdccdDb5ODnt62WuEWaM/g=="
+    },
+    "remark-mdx": {
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.6.tgz",
+      "integrity": "sha512-BkR7SjP+3OvrCsWGlYy1tWEsZ8aQ86x+i7XWbW79g73Ws/cCaeVsEn0ZxAzzoTRH+PJWVU7Mbe64GdejEyKr2g==",
+      "requires": {
+        "@babel/core": "7.9.6",
+        "@babel/helper-plugin-utils": "7.8.3",
+        "@babel/plugin-proposal-object-rest-spread": "7.9.6",
+        "@babel/plugin-syntax-jsx": "7.8.3",
+        "@mdx-js/util": "^1.6.6",
+        "is-alphabetical": "1.0.4",
+        "remark-parse": "8.0.2",
+        "unified": "9.0.0"
+      },
+      "dependencies": {
+        "@babel/core": {
+          "version": "7.9.6",
+          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz",
+          "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==",
+          "requires": {
+            "@babel/code-frame": "^7.8.3",
+            "@babel/generator": "^7.9.6",
+            "@babel/helper-module-transforms": "^7.9.0",
+            "@babel/helpers": "^7.9.6",
+            "@babel/parser": "^7.9.6",
+            "@babel/template": "^7.8.6",
+            "@babel/traverse": "^7.9.6",
+            "@babel/types": "^7.9.6",
+            "convert-source-map": "^1.7.0",
+            "debug": "^4.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"
+          }
+        },
+        "@babel/helper-plugin-utils": {
+          "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=="
+        },
+        "@babel/plugin-proposal-object-rest-spread": {
+          "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==",
+          "requires": {
+            "@babel/helper-plugin-utils": "^7.8.3",
+            "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
+            "@babel/plugin-transform-parameters": "^7.9.5"
+          }
+        },
+        "@babel/plugin-syntax-jsx": {
+          "version": "7.8.3",
+          "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.8.3.tgz",
+          "integrity": "sha512-WxdW9xyLgBdefoo0Ynn3MRSkhe5tFVxxKNVdnZSh318WrG2e2jH+E9wd/++JsqcLJZPfz87njQJ8j2Upjm0M0A==",
+          "requires": {
+            "@babel/helper-plugin-utils": "^7.8.3"
+          }
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
+      }
+    },
+    "remark-parse": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.2.tgz",
+      "integrity": "sha512-eMI6kMRjsAGpMXXBAywJwiwAse+KNpmt+BK55Oofy4KvBZEqUDj6mWbGLJZrujoPIPPxDXzn3T9baRlpsm2jnQ==",
+      "requires": {
+        "ccount": "^1.0.0",
+        "collapse-white-space": "^1.0.2",
+        "is-alphabetical": "^1.0.0",
+        "is-decimal": "^1.0.0",
+        "is-whitespace-character": "^1.0.0",
+        "is-word-character": "^1.0.0",
+        "markdown-escapes": "^1.0.0",
+        "parse-entities": "^2.0.0",
+        "repeat-string": "^1.5.4",
+        "state-toggle": "^1.0.0",
+        "trim": "0.0.1",
+        "trim-trailing-lines": "^1.0.0",
+        "unherit": "^1.0.4",
+        "unist-util-remove-position": "^2.0.0",
+        "vfile-location": "^3.0.0",
+        "xtend": "^4.0.1"
+      }
+    },
+    "remark-squeeze-paragraphs": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/remark-squeeze-paragraphs/-/remark-squeeze-paragraphs-4.0.0.tgz",
+      "integrity": "sha512-8qRqmL9F4nuLPIgl92XUuxI3pFxize+F1H0e/W3llTk0UsjJaj01+RrirkMw7P21RKe4X6goQhYRSvNWX+70Rw==",
+      "requires": {
+        "mdast-squeeze-paragraphs": "^4.0.0"
+      }
+    },
+    "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="
+    },
+    "renderkid": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz",
+      "integrity": "sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==",
+      "requires": {
+        "css-select": "^1.1.0",
+        "dom-converter": "^0.2",
+        "htmlparser2": "^3.3.0",
+        "strip-ansi": "^3.0.0",
+        "utila": "^0.4.0"
+      }
+    },
+    "repeat-element": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
+    },
+    "replace-ext": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+      "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs="
+    },
+    "request": {
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+      "requires": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.3",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.5.0",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.5.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+        }
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+    },
+    "require-like": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/require-like/-/require-like-0.1.2.tgz",
+      "integrity": "sha1-rW8wwTvs15cBDEaK+ndcDAprR/o="
+    },
+    "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=="
+    },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
+    },
+    "resolve": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "requires": {
+        "path-parse": "^1.0.6"
+      }
+    },
+    "resolve-cwd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "requires": {
+        "resolve-from": "^3.0.0"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g="
+        }
+      }
+    },
+    "resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
+    },
+    "resolve-pathname": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz",
+      "integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng=="
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
+    },
+    "restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "requires": {
+        "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=="
+    },
+    "retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs="
+    },
+    "reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
+    },
+    "rgb-regex": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
+      "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE="
+    },
+    "rgba-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
+      "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM="
+    },
+    "rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "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==",
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "run-async": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
+      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="
+    },
+    "run-parallel": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
+      "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="
+    },
+    "run-queue": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
+      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+      "requires": {
+        "aproba": "^1.1.1"
+      }
+    },
+    "rx": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz",
+      "integrity": "sha1-pfE/957zt0D+MKqAP7CfmIBdR4I="
+    },
+    "rxjs": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.0.tgz",
+      "integrity": "sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "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=="
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "requires": {
+        "ret": "~0.1.10"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+    },
+    "scheduler": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
+      "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
+      }
+    },
+    "schema-utils": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
+      "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
+      "requires": {
+        "@types/json-schema": "^7.0.4",
+        "ajv": "^6.12.2",
+        "ajv-keywords": "^3.4.1"
+      }
+    },
+    "section-matter": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz",
+      "integrity": "sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==",
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "kind-of": "^6.0.0"
+      }
+    },
+    "select": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
+      "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=",
+      "optional": true
+    },
+    "select-hose": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo="
+    },
+    "selfsigned": {
+      "version": "1.10.7",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz",
+      "integrity": "sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==",
+      "requires": {
+        "node-forge": "0.9.0"
+      }
+    },
+    "semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+    },
+    "send": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "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",
+        "fresh": "0.5.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"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+            }
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+        }
+      }
+    },
+    "serialize-javascript": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz",
+      "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ=="
+    },
+    "serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+      "requires": {
+        "accepts": "~1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "http-errors": {
+          "version": "1.6.3",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+          "requires": {
+            "depd": "~1.1.2",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.1.0",
+            "statuses": ">= 1.4.0 < 2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        },
+        "setprototypeof": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
+        }
+      }
+    },
+    "serve-static": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "requires": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.17.1"
+      }
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+    },
+    "set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      }
+    },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
+    },
+    "setprototypeof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
+    },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "shallow-clone": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
+      "integrity": "sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=",
+      "requires": {
+        "is-extendable": "^0.1.1",
+        "kind-of": "^2.0.1",
+        "lazy-cache": "^0.2.3",
+        "mixin-object": "^2.0.1"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
+          "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=",
+          "requires": {
+            "is-buffer": "^1.0.2"
+          }
+        },
+        "lazy-cache": {
+          "version": "0.2.7",
+          "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
+          "integrity": "sha1-f+3fLctu23fRHvHRF6tf/fCrG2U="
+        }
+      }
+    },
+    "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==",
+      "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=="
+    },
+    "shell-quote": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
+      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg=="
+    },
+    "shelljs": {
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz",
+      "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==",
+      "requires": {
+        "glob": "^7.0.0",
+        "interpret": "^1.0.0",
+        "rechoir": "^0.6.2"
+      }
+    },
+    "signal-exit": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
+    },
+    "simple-swizzle": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+      "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=="
+        }
+      }
+    },
+    "sitemap": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/sitemap/-/sitemap-3.2.2.tgz",
+      "integrity": "sha512-TModL/WU4m2q/mQcrDgNANn0P4LwprM9MMvG4hu5zP4c6IIKs2YLTu6nXXnNr8ODW/WFtxKggiJ1EGn2W0GNmg==",
+      "requires": {
+        "lodash.chunk": "^4.2.0",
+        "lodash.padstart": "^4.6.1",
+        "whatwg-url": "^7.0.0",
+        "xmlbuilder": "^13.0.0"
+      }
+    },
+    "slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU="
+    },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "requires": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "requires": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "requires": {
+        "kind-of": "^3.2.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "sockjs": {
+      "version": "0.3.20",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz",
+      "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==",
+      "requires": {
+        "faye-websocket": "^0.10.0",
+        "uuid": "^3.4.0",
+        "websocket-driver": "0.6.5"
+      }
+    },
+    "sockjs-client": {
+      "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==",
+      "requires": {
+        "debug": "^3.2.5",
+        "eventsource": "^1.0.7",
+        "faye-websocket": "~0.11.1",
+        "inherits": "^2.0.3",
+        "json3": "^3.3.2",
+        "url-parse": "^1.4.3"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "faye-websocket": {
+          "version": "0.11.3",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
+          "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
+          "requires": {
+            "websocket-driver": ">=0.5.1"
+          }
+        }
+      }
+    },
+    "sort-keys": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
+      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
+      "requires": {
+        "is-plain-obj": "^1.0.0"
+      }
+    },
+    "source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
+    },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+    },
+    "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==",
+      "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"
+      }
+    },
+    "source-map-support": {
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.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=="
+        }
+      }
+    },
+    "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="
+    },
+    "space-separated-tokens": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz",
+      "integrity": "sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA=="
+    },
+    "spdy": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
+      "requires": {
+        "debug": "^4.1.0",
+        "handle-thing": "^2.0.0",
+        "http-deceiver": "^1.2.7",
+        "select-hose": "^2.0.0",
+        "spdy-transport": "^3.0.0"
+      }
+    },
+    "spdy-transport": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+      "requires": {
+        "debug": "^4.1.0",
+        "detect-node": "^2.0.4",
+        "hpack.js": "^2.1.6",
+        "obuf": "^1.1.2",
+        "readable-stream": "^3.0.6",
+        "wbuf": "^1.7.3"
+      }
+    },
+    "split-string": {
+      "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==",
+      "requires": {
+        "extend-shallow": "^3.0.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+    },
+    "sshpk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "requires": {
+        "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": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "requires": {
+        "figgy-pudding": "^3.5.1"
+      }
+    },
+    "stable": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="
+    },
+    "stack-utils": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz",
+      "integrity": "sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA=="
+    },
+    "state-toggle": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz",
+      "integrity": "sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ=="
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "requires": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+    },
+    "std-env": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/std-env/-/std-env-2.2.1.tgz",
+      "integrity": "sha512-IjYQUinA3lg5re/YMlwlfhqNRTzMZMqE+pezevdcTaHceqx8ngEi1alX9nNCk9Sc81fy1fLDeQoaCzeiW1yBOQ==",
+      "requires": {
+        "ci-info": "^1.6.0"
+      }
+    },
+    "stream-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+      "requires": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "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"
+          }
+        },
+        "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==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "stream-each": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "requires": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "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"
+          }
+        },
+        "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==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "stream-shift": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="
+    },
+    "strict-uri-encode": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
+    },
+    "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",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+        },
+        "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"
+          }
+        }
+      }
+    },
+    "string.prototype.trimend": {
+      "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==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      }
+    },
+    "string.prototype.trimstart": {
+      "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==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      }
+    },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      },
+      "dependencies": {
+        "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=="
+        }
+      }
+    },
+    "stringify-object": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
+      "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
+      "requires": {
+        "get-own-enumerable-property-symbols": "^3.0.0",
+        "is-obj": "^1.0.1",
+        "is-regexp": "^1.0.0"
+      },
+      "dependencies": {
+        "is-obj": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+          "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
+        }
+      }
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "strip-bom-string": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
+      "integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI="
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
+    },
+    "strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
+    },
+    "style-to-object": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz",
+      "integrity": "sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==",
+      "requires": {
+        "inline-style-parser": "0.1.1"
+      }
+    },
+    "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==",
+      "requires": {
+        "browserslist": "^4.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==",
+          "requires": {
+            "dot-prop": "^5.2.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "svg-parser": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz",
+      "integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ=="
+    },
+    "svgo": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
+      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
+      "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"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.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==",
+          "requires": {
+            "boolbase": "^1.0.0",
+            "css-what": "^3.2.1",
+            "domutils": "^1.7.0",
+            "nth-check": "^1.0.2"
+          }
+        },
+        "css-what": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.3.0.tgz",
+          "integrity": "sha512-pv9JPyatiPaQ6pf4OvD/dbfm0o5LviWmwxNWzblYf/1u9QZd0ihV+PMwy5jdQWQ3349kZmKEx9WXuSka2dM4cg=="
+        },
+        "domutils": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
+          "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+          "requires": {
+            "dom-serializer": "0",
+            "domelementtype": "1"
+          }
+        }
+      }
+    },
+    "tapable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="
+    },
+    "terser": {
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
+      "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
+      "requires": {
+        "commander": "^2.20.0",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.12"
+      },
+      "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=="
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
+      }
+    },
+    "terser-webpack-plugin": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.7.tgz",
+      "integrity": "sha512-xzYyaHUNhzgaAdBsXxk2Yvo/x1NJdslUaussK3fdpBbvttm1iIwU+c26dj9UxJcwk2c5UWt5F55MUTIA8BE7Dg==",
+      "requires": {
+        "cacache": "^13.0.1",
+        "find-cache-dir": "^3.3.1",
+        "jest-worker": "^25.4.0",
+        "p-limit": "^2.3.0",
+        "schema-utils": "^2.6.6",
+        "serialize-javascript": "^3.1.0",
+        "source-map": "^0.6.1",
+        "terser": "^4.6.12",
+        "webpack-sources": "^1.4.3"
+      },
+      "dependencies": {
+        "cacache": {
+          "version": "13.0.1",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz",
+          "integrity": "sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w==",
+          "requires": {
+            "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"
+          }
+        },
+        "find-cache-dir": {
+          "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==",
+          "requires": {
+            "commondir": "^1.0.1",
+            "make-dir": "^3.0.2",
+            "pkg-dir": "^4.1.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==",
+          "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==",
+          "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==",
+          "requires": {
+            "semver": "^6.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==",
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "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=="
+        },
+        "pkg-dir": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+          "requires": {
+            "find-up": "^4.0.0"
+          }
+        },
+        "serialize-javascript": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
+          "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
+          "requires": {
+            "randombytes": "^2.1.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        },
+        "ssri": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-7.1.0.tgz",
+          "integrity": "sha512-77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g==",
+          "requires": {
+            "figgy-pudding": "^3.5.1",
+            "minipass": "^3.1.1"
+          }
+        }
+      }
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+    },
+    "through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "requires": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "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"
+          }
+        },
+        "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==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "thunky": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
+    },
+    "timers-browserify": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
+      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
+      "requires": {
+        "setimmediate": "^1.0.4"
+      }
+    },
+    "timsort": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
+      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q="
+    },
+    "tiny-emitter": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+      "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==",
+      "optional": true
+    },
+    "tiny-invariant": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.1.0.tgz",
+      "integrity": "sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw=="
+    },
+    "tiny-warning": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
+      "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M="
+    },
+    "to-factory": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/to-factory/-/to-factory-1.0.0.tgz",
+      "integrity": "sha1-hzivi9lxIK0dQEeXKtpVY7+UebE="
+    },
+    "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="
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "requires": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "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==",
+      "requires": {
+        "is-number": "^7.0.0"
+      }
+    },
+    "toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
+    },
+    "tough-cookie": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "requires": {
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+        }
+      }
+    },
+    "tr46": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
+      "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
+      "requires": {
+        "punycode": "^2.1.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+        }
+      }
+    },
+    "trim": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
+      "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0="
+    },
+    "trim-lines": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-1.1.3.tgz",
+      "integrity": "sha512-E0ZosSWYK2mkSu+KEtQ9/KqarVjA9HztOSX+9FDdNacRAq29RRV6ZQNgob3iuW8Htar9vAfEa6yyt5qBAHZDBA=="
+    },
+    "trim-trailing-lines": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.3.tgz",
+      "integrity": "sha512-4ku0mmjXifQcTVfYDfR5lpgV7zVqPg6zV9rdZmwOPqq0+Zq19xDqEgagqVbc4pOOShbncuAOIs59R3+3gcF3ZA=="
+    },
+    "trough": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
+      "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA=="
+    },
+    "tryer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
+      "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="
+    },
+    "ts-pnp": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz",
+      "integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw=="
+    },
+    "tslib": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
+    },
+    "tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY="
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+    },
+    "type-fest": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ=="
+    },
+    "type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      }
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+    },
+    "unherit": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz",
+      "integrity": "sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==",
+      "requires": {
+        "inherits": "^2.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "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=="
+    },
+    "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==",
+      "requires": {
+        "unicode-canonical-property-names-ecmascript": "^1.0.4",
+        "unicode-property-aliases-ecmascript": "^1.0.4"
+      }
+    },
+    "unicode-match-property-value-ecmascript": {
+      "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=="
+    },
+    "unicode-property-aliases-ecmascript": {
+      "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=="
+    },
+    "unified": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/unified/-/unified-9.0.0.tgz",
+      "integrity": "sha512-ssFo33gljU3PdlWLjNp15Inqb77d6JnJSfyplGJPT/a+fNRNyCBeveBAYJdO5khKdF6WVHa/yYCC7Xl6BDwZUQ==",
+      "requires": {
+        "bail": "^1.0.0",
+        "extend": "^3.0.0",
+        "is-buffer": "^2.0.0",
+        "is-plain-obj": "^2.0.0",
+        "trough": "^1.0.0",
+        "vfile": "^4.0.0"
+      },
+      "dependencies": {
+        "is-buffer": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
+          "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="
+        },
+        "is-plain-obj": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+          "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA=="
+        }
+      }
+    },
+    "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==",
+      "requires": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      }
+    },
+    "uniq": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8="
+    },
+    "uniqs": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
+      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI="
+    },
+    "unique-filename": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "requires": {
+        "unique-slug": "^2.0.0"
+      }
+    },
+    "unique-slug": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+      "requires": {
+        "imurmurhash": "^0.1.4"
+      }
+    },
+    "unist-builder": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-2.0.3.tgz",
+      "integrity": "sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw=="
+    },
+    "unist-util-generated": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.5.tgz",
+      "integrity": "sha512-1TC+NxQa4N9pNdayCYA1EGUOCAO0Le3fVp7Jzns6lnua/mYgwHo0tz5WUAfrdpNch1RZLHc61VZ1SDgrtNXLSw=="
+    },
+    "unist-util-is": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-3.0.0.tgz",
+      "integrity": "sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A=="
+    },
+    "unist-util-position": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.1.0.tgz",
+      "integrity": "sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA=="
+    },
+    "unist-util-remove": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.0.0.tgz",
+      "integrity": "sha512-HwwWyNHKkeg/eXRnE11IpzY8JT55JNM1YCwwU9YNCnfzk6s8GhPXrVBBZWiwLeATJbI7euvoGSzcy9M29UeW3g==",
+      "requires": {
+        "unist-util-is": "^4.0.0"
+      },
+      "dependencies": {
+        "unist-util-is": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.2.tgz",
+          "integrity": "sha512-Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ=="
+        }
+      }
+    },
+    "unist-util-remove-position": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz",
+      "integrity": "sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==",
+      "requires": {
+        "unist-util-visit": "^2.0.0"
+      }
+    },
+    "unist-util-stringify-position": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
+      "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
+      "requires": {
+        "@types/unist": "^2.0.2"
+      }
+    },
+    "unist-util-visit": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
+      "integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
+      "requires": {
+        "@types/unist": "^2.0.0",
+        "unist-util-is": "^4.0.0",
+        "unist-util-visit-parents": "^3.0.0"
+      },
+      "dependencies": {
+        "unist-util-is": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.2.tgz",
+          "integrity": "sha512-Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ=="
+        }
+      }
+    },
+    "unist-util-visit-parents": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.0.tgz",
+      "integrity": "sha512-0g4wbluTF93npyPrp/ymd3tCDTMnP0yo2akFD2FIBAYXq/Sga3lwaU1D8OYKbtpioaI6CkDcQ6fsMnmtzt7htw==",
+      "requires": {
+        "@types/unist": "^2.0.0",
+        "unist-util-is": "^4.0.0"
+      },
+      "dependencies": {
+        "unist-util-is": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.2.tgz",
+          "integrity": "sha512-Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ=="
+        }
+      }
+    },
+    "universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+    },
+    "unquote": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
+      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ="
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "requires": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "requires": {
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
+        }
+      }
+    },
+    "upath": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="
+    },
+    "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==",
+      "requires": {
+        "punycode": "^2.1.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+        }
+      }
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+    },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      }
+    },
+    "url-parse": {
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
+      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+      "requires": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
+    },
+    "util": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "requires": {
+        "inherits": "2.0.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+        }
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "util.promisify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
+      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.2",
+        "has-symbols": "^1.0.1",
+        "object.getownpropertydescriptors": "^2.1.0"
+      }
+    },
+    "utila": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw="
+    },
+    "utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
+    },
+    "uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+    },
+    "value-equal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz",
+      "integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw=="
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
+    },
+    "vendors": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
+      "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "vfile": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.1.1.tgz",
+      "integrity": "sha512-lRjkpyDGjVlBA7cDQhQ+gNcvB1BGaTHYuSOcY3S7OhDmBtnzX95FhtZZDecSTDm6aajFymyve6S5DN4ZHGezdQ==",
+      "requires": {
+        "@types/unist": "^2.0.0",
+        "is-buffer": "^2.0.0",
+        "replace-ext": "1.0.0",
+        "unist-util-stringify-position": "^2.0.0",
+        "vfile-message": "^2.0.0"
+      },
+      "dependencies": {
+        "is-buffer": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
+          "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="
+        }
+      }
+    },
+    "vfile-location": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-3.0.1.tgz",
+      "integrity": "sha512-yYBO06eeN/Ki6Kh1QAkgzYpWT1d3Qln+ZCtSbJqFExPl1S3y2qqotJQXoh6qEvl/jDlgpUJolBn3PItVnnZRqQ=="
+    },
+    "vfile-message": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
+      "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
+      "requires": {
+        "@types/unist": "^2.0.0",
+        "unist-util-stringify-position": "^2.0.0"
+      }
+    },
+    "vm-browserify": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="
+    },
+    "wait-file": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/wait-file/-/wait-file-1.0.5.tgz",
+      "integrity": "sha512-udLpJY/eOxlrMm3+XD1RLuF2oT9B7J7wiyR5/9xrvQymS6YR6trWvVhzOldHrVbLwyiRmLj9fcvsjzpSXeZHkw==",
+      "requires": {
+        "@hapi/joi": "^15.1.0",
+        "fs-extra": "^8.1.0",
+        "rx": "^4.1.0"
+      }
+    },
+    "watchpack": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz",
+      "integrity": "sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==",
+      "requires": {
+        "chokidar": "^3.4.0",
+        "graceful-fs": "^4.1.2",
+        "neo-async": "^2.5.0",
+        "watchpack-chokidar2": "^2.0.0"
+      }
+    },
+    "watchpack-chokidar2": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
+      "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
+      "optional": true,
+      "requires": {
+        "chokidar": "^2.1.8"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "optional": true,
+          "requires": {
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+              "optional": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
+          }
+        },
+        "binary-extensions": {
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+          "optional": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "optional": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "optional": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "chokidar": {
+          "version": "2.1.8",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+          "optional": 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"
+          }
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "optional": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          },
+          "dependencies": {
+            "is-extendable": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+              "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+              "optional": true,
+              "requires": {
+                "is-plain-object": "^2.0.4"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "optional": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "optional": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fsevents": {
+          "version": "1.2.13",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+          "optional": true
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "optional": true,
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "optional": true,
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        },
+        "is-binary-path": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+          "optional": true,
+          "requires": {
+            "binary-extensions": "^1.0.0"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "optional": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "optional": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "optional": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "optional": true,
+          "requires": {
+            "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"
+          }
+        },
+        "readdirp": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+          "optional": true,
+          "requires": {
+            "graceful-fs": "^4.1.11",
+            "micromatch": "^3.1.10",
+            "readable-stream": "^2.0.2"
+          }
+        },
+        "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==",
+          "optional": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "to-regex-range": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+          "optional": true,
+          "requires": {
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
+          }
+        }
+      }
+    },
+    "wbuf": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+      "requires": {
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "web-namespaces": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.4.tgz",
+      "integrity": "sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw=="
+    },
+    "webidl-conversions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
+      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
+    },
+    "webpack": {
+      "version": "4.43.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz",
+      "integrity": "sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==",
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/wasm-edit": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
+        "acorn": "^6.4.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.3",
+        "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.3",
+        "watchpack": "^1.6.1",
+        "webpack-sources": "^1.4.1"
+      },
+      "dependencies": {
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          },
+          "dependencies": {
+            "is-extendable": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+              "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+              "requires": {
+                "is-plain-object": "^2.0.4"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "is-wsl": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+          "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0="
+        },
+        "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==",
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "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==",
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        },
+        "serialize-javascript": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
+          "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
+          "requires": {
+            "randombytes": "^2.1.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        },
+        "terser-webpack-plugin": {
+          "version": "1.4.4",
+          "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.4.tgz",
+          "integrity": "sha512-U4mACBHIegmfoEe5fdongHESNJWqsGU+W0S/9+BmYGVQDw1+c2Ow05TpMhxjPK1sRb7cuYq1BPl1e5YHJMTCqA==",
+          "requires": {
+            "cacache": "^12.0.2",
+            "find-cache-dir": "^2.1.0",
+            "is-wsl": "^1.1.0",
+            "schema-utils": "^1.0.0",
+            "serialize-javascript": "^3.1.0",
+            "source-map": "^0.6.1",
+            "terser": "^4.1.2",
+            "webpack-sources": "^1.4.0",
+            "worker-farm": "^1.7.0"
+          }
+        },
+        "to-regex-range": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+          "requires": {
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
+          }
+        }
+      }
+    },
+    "webpack-bundle-analyzer": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.8.0.tgz",
+      "integrity": "sha512-PODQhAYVEourCcOuU+NiYI7WdR8QyELZGgPvB1y2tjbUpbmcQOt5Q7jEK+ttd5se0KSBKD9SXHCEozS++Wllmw==",
+      "requires": {
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1",
+        "bfj": "^6.1.1",
+        "chalk": "^2.4.1",
+        "commander": "^2.18.0",
+        "ejs": "^2.6.1",
+        "express": "^4.16.3",
+        "filesize": "^3.6.1",
+        "gzip-size": "^5.0.0",
+        "lodash": "^4.17.15",
+        "mkdirp": "^0.5.1",
+        "opener": "^1.5.1",
+        "ws": "^6.0.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "7.3.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz",
+          "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA=="
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "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=="
+        },
+        "filesize": {
+          "version": "3.6.1",
+          "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
+          "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="
+        }
+      }
+    },
+    "webpack-dev-middleware": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz",
+      "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==",
+      "requires": {
+        "memory-fs": "^0.4.1",
+        "mime": "^2.4.4",
+        "mkdirp": "^0.5.1",
+        "range-parser": "^1.2.1",
+        "webpack-log": "^2.0.0"
+      },
+      "dependencies": {
+        "mime": {
+          "version": "2.4.6",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
+          "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="
+        }
+      }
+    },
+    "webpack-dev-server": {
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz",
+      "integrity": "sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==",
+      "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.3.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.8",
+        "opn": "^5.5.0",
+        "p-retry": "^3.0.1",
+        "portfinder": "^1.0.26",
+        "schema-utils": "^1.0.0",
+        "selfsigned": "^1.10.7",
+        "semver": "^6.3.0",
+        "serve-index": "^1.9.1",
+        "sockjs": "0.3.20",
+        "sockjs-client": "1.4.0",
+        "spdy": "^4.0.2",
+        "strip-ansi": "^3.0.1",
+        "supports-color": "^6.1.0",
+        "url": "^0.11.0",
+        "webpack-dev-middleware": "^3.7.2",
+        "webpack-log": "^2.0.0",
+        "ws": "^6.2.1",
+        "yargs": "^13.3.2"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "requires": {
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
+          }
+        },
+        "binary-extensions": {
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "chokidar": {
+          "version": "2.1.8",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+          "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"
+          }
+        },
+        "del": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
+          "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+          "requires": {
+            "@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"
+          }
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          },
+          "dependencies": {
+            "is-extendable": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+              "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+              "requires": {
+                "is-plain-object": "^2.0.4"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fsevents": {
+          "version": "1.2.13",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+          "optional": true
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        },
+        "globby": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+          "requires": {
+            "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": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+            }
+          }
+        },
+        "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=="
+        },
+        "is-binary-path": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+          "requires": {
+            "binary-extensions": "^1.0.0"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "p-map": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+          "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "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"
+          }
+        },
+        "readdirp": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+          "requires": {
+            "graceful-fs": "^4.1.11",
+            "micromatch": "^3.1.10",
+            "readable-stream": "^2.0.2"
+          }
+        },
+        "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==",
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.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==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        },
+        "to-regex-range": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+          "requires": {
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
+          }
+        }
+      }
+    },
+    "webpack-log": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
+      "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
+      "requires": {
+        "ansi-colors": "^3.0.0",
+        "uuid": "^3.3.2"
+      }
+    },
+    "webpack-merge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
+      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
+      "requires": {
+        "lodash": "^4.17.15"
+      }
+    },
+    "webpack-sources": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "requires": {
+        "source-list-map": "^2.0.0",
+        "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=="
+        }
+      }
+    },
+    "webpackbar": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/webpackbar/-/webpackbar-4.0.0.tgz",
+      "integrity": "sha512-k1qRoSL/3BVuINzngj09nIwreD8wxV4grcuhHTD8VJgUbGcy8lQSPqv+bM00B7F+PffwIsQ8ISd4mIwRbr23eQ==",
+      "requires": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^2.4.2",
+        "consola": "^2.10.0",
+        "figures": "^3.0.0",
+        "pretty-time": "^1.1.0",
+        "std-env": "^2.2.1",
+        "text-table": "^0.2.0",
+        "wrap-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.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==",
+          "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=="
+        },
+        "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"
+          }
+        },
+        "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==",
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.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==",
+              "requires": {
+                "@types/color-name": "^1.1.1",
+                "color-convert": "^2.0.1"
+              }
+            }
+          }
+        }
+      }
+    },
+    "websocket-driver": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
+      "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
+      "requires": {
+        "websocket-extensions": ">=0.1.1"
+      }
+    },
+    "websocket-extensions": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="
+    },
+    "whatwg-url": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
+      "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
+      "requires": {
+        "lodash.sortby": "^4.7.0",
+        "tr46": "^1.0.1",
+        "webidl-conversions": "^4.0.2"
+      }
+    },
+    "which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "requires": {
+        "isexe": "^2.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="
+    },
+    "worker-farm": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
+      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
+      "requires": {
+        "errno": "~0.1.7"
+      }
+    },
+    "worker-rpc": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/worker-rpc/-/worker-rpc-0.1.1.tgz",
+      "integrity": "sha512-P1WjMrUB3qgJNI9jfmpZ/htmBEjFh//6l/5y8SD9hg1Ef5zTTVVoRjTrTEzPrNBQvmhMxkoTsjOXN10GWU7aCg==",
+      "requires": {
+        "microevent.ts": "~0.1.1"
+      }
+    },
+    "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==",
+      "requires": {
+        "ansi-styles": "^3.2.0",
+        "string-width": "^3.0.0",
+        "strip-ansi": "^5.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=="
+        },
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+        },
+        "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="
+        },
+        "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==",
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.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==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "ws": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+      "requires": {
+        "async-limiter": "~1.0.0"
+      }
+    },
+    "xml-js": {
+      "version": "1.6.11",
+      "resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz",
+      "integrity": "sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==",
+      "requires": {
+        "sax": "^1.2.4"
+      }
+    },
+    "xmlbuilder": {
+      "version": "13.0.2",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-13.0.2.tgz",
+      "integrity": "sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ=="
+    },
+    "xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+    },
+    "y18n": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
+    },
+    "yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+    },
+    "yaml": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz",
+      "integrity": "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg=="
+    },
+    "yargs": {
+      "version": "13.3.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+      "requires": {
+        "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.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=="
+        },
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+        },
+        "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="
+        },
+        "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==",
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.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==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "yargs-parser": {
+      "version": "13.1.2",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+      "requires": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+        }
+      }
+    },
+    "zepto": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/zepto/-/zepto-1.2.0.tgz",
+      "integrity": "sha1-4Se9nmb9hGvl6rSME5SIL3wOT5g="
+    },
+    "zwitch": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",
+      "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw=="
+    }
+  }
+}
diff --git a/website/package.json b/website/package.json
new file mode 100644
index 0000000000..d024da876c
--- /dev/null
+++ b/website/package.json
@@ -0,0 +1,31 @@
+{
+  "name": "website",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "start": "docusaurus start",
+    "start-no-watch": "docusaurus start --no-open --poll",
+    "build": "docusaurus build",
+    "swizzle": "docusaurus swizzle",
+    "deploy": "./deploy.sh"
+  },
+  "dependencies": {
+    "@docusaurus/core": "^2.0.0-alpha.58",
+    "@docusaurus/preset-classic": "^2.0.0-alpha.58",
+    "clsx": "^1.1.1",
+    "react": "^16.8.4",
+    "react-dom": "^16.8.4"
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
+  }
+}
diff --git a/website/sidebars.js b/website/sidebars.js
new file mode 100644
index 0000000000..03b790c3e4
--- /dev/null
+++ b/website/sidebars.js
@@ -0,0 +1,54 @@
+module.exports = {
+  docs: {
+    Documentation: ['introduction', 'overview', 'license'],
+    'Deploying Stratos': [
+      'deploy/overview',
+      {
+        "Cloud Foundry": [
+          'deploy/cloud-foundry/cloud-foundry',
+          'deploy/cloud-foundry/db-migration',
+          'deploy/cloud-foundry/cf-troubleshooting'
+        ],
+      },
+      {
+        Kubernetes: [
+          'deploy/kubernetes',
+          'deploy/kubernetes/helm-installation'
+        ],
+      },
+      'deploy/all-in-one',
+      'deploy/access',
+      'deploy/troubleshooting',
+    ],
+    'Advanced Topics': [
+      'advanced/invite-user-guide',
+      'advanced/sso',
+      'advanced/bosh-metrics'
+    ],
+    'Development': [
+      'developer/contributing',
+      'developer/introduction',
+      {
+        Frontend: [
+          'developer/frontend',
+          'developer/frontend-tests'
+        ]
+      },
+      {
+        Backend: [
+          'developer/backend',
+        ]
+      },
+      'developer/developers-guide-e2e-tests',
+      'developer/developers-guide-env-tech',
+    ],
+    'Extending Stratos': [
+      'extensions/introduction',
+      'extensions/v4-migration',
+      'extensions/theming',
+      'extensions/frontend',
+      'extensions/backend',
+    ],
+
+  },
+};
diff --git a/website/src/css/custom.css b/website/src/css/custom.css
new file mode 100644
index 0000000000..1b5e6f88cd
--- /dev/null
+++ b/website/src/css/custom.css
@@ -0,0 +1,191 @@
+/* stylelint-disable docusaurus/copyright-header */
+/**
+ * Any CSS included here will be global. The classic template
+ * bundles Infima by default. Infima is a CSS framework designed to
+ * work well for content-centric websites.
+ */
+
+/* You can override the default Infima variables here. */
+:root {
+  --ifm-color-primary: #2196f3;
+  --ifm-color-primary-dark: #0d89ec;
+  --ifm-color-primary-darker: #0c81df;
+  --ifm-color-primary-darkest: #0a6bb7;
+  --ifm-color-primary-light: #3ba2f4;
+  --ifm-color-primary-lighter: #48a9f5;
+  --ifm-color-primary-lightest: #70bbf7;
+  --ifm-code-font-size: 95%;
+  --ifm-navbar-link-color: #fff;
+}
+
+.docusaurus-highlight-code-line {
+  background-color: rgb(72, 77, 91);
+  display: block;
+  margin: 0 calc(-1 * var(--ifm-pre-padding));
+  padding: 0 var(--ifm-pre-padding);
+}
+
+img.feature-img {
+  filter: grayscale(100%);
+  height: 100px;
+  width: 100px;
+}
+
+img.cf-logo {
+  width: auto;
+}
+
+.navbar {
+  background-color: #333;
+}
+
+.navbar-sidebar .navbar-sidebar__brand {
+  background-color: #333;
+}
+
+.navbar__toggle {
+  color: #d0d0d0;
+}
+
+.navbar__brand:hover {
+  color: var(--ifm-link-hover-color);
+}
+
+.main-wrapper .hero {
+  min-height: 480px;
+}
+
+.main-wrapper .hero a.button.button--outline.button--secondary {
+  color: #fff;
+}
+
+.main-wrapper .hero a.button.button--outline.button--secondary:hover {
+  color: #2196f3;
+}
+
+.container {
+  text-align: left;
+}
+
+.container .get-started {
+  justify-content: start;
+  padding-top: 20px;
+}
+
+.hero__subtitle {
+  font-size: 36px;
+}
+
+/* Reduce the text sizes */
+
+#__docusaurus article h1 {
+  font-size: 28px;
+}
+
+#__docusaurus article h2 {
+  font-size: 24px;
+}
+
+#__docusaurus article h3 {
+  font-size: 20px;
+}
+
+#__docusaurus article h4 {
+  font-size: 18px;
+}
+
+.menu__list, .menu__link {
+  font-size: 14px;
+}
+
+#__docusaurus .menu .menu__link--sublist:after {
+  background-size: 1.25rem 1.25rem;
+}
+
+#__docusaurus .docSidebarContainer_node_modules-\@docusaurus-theme-classic-src-theme-DocPage- {
+  width: 280px;
+}
+
+.home-intro {
+  /*margin-right: 150px;*/
+}
+
+.home-logo {
+  height: 300px;
+  opacity: .9;
+  position: absolute;
+  right: -150px;
+}
+
+@media screen and (max-width: 966px) {
+  .home-logo {
+    display: none;
+  }
+
+  .hero__subtitle {
+    font-size: 35px;
+  }
+  
+  section .screenshot {
+    margin: 0 0;
+  }
+
+
+}
+
+@media screen and (max-width: 813px) {
+  .hero__subtitle {
+    font-size: 31px;
+  }
+
+  img.feature-img {
+    height: 64px;
+    width: auto;
+  }
+
+
+}
+
+/* Screenshot */
+
+.blue {
+  background-color: #2196f3;
+  color: #fff
+}
+
+.white {
+  background-color: #fff;
+  color: #444;
+}
+
+
+.screenshot {
+  display: flex;
+  margin: 60px 0;
+}
+
+.screenshot img {
+  width: 600px;
+  -webkit-box-shadow: 0px 0px 37px 15px rgba(20,20,20,0.75);
+  -moz-box-shadow: 0px 0px 37px 15px rgba(20,20,20,0.75);
+  box-shadow: 0px 0px 37px 15px rgba(20,20,20,0.75);  
+}
+
+.screenshot img.right {
+  margin-left: 60px;
+}
+
+.screenshot img.left {
+  margin-right: 60px;
+}
+
+.screenshot div {
+  font-size: 20px;
+}
+
+@media screen and (max-width: 966px) {
+  .screenshot img {
+    display: none;
+    margin: 0;
+  }
+}
diff --git a/website/src/pages/index.js b/website/src/pages/index.js
new file mode 100644
index 0000000000..fc5979e229
--- /dev/null
+++ b/website/src/pages/index.js
@@ -0,0 +1,176 @@
+import Link from '@docusaurus/Link';
+import useBaseUrl from '@docusaurus/useBaseUrl';
+import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
+import Layout from '@theme/Layout';
+import clsx from 'clsx';
+import React from 'react';
+
+import styles from './styles.module.css';
+
+const features = [
+  {
+    title: <>Cloud Foundry</>,
+    imageUrl: 'img/cloudfoundry.png',
+    description: (
+      <>
+        Stratos is the de-facto UI for Cloud Foundry, providing a rich management experience
+        for all you Cloud Foundry needs... and we're an offical Cloud Foundry project too!
+      </>
+    ),
+    cls: 'cf-logo'
+  },
+  {
+    title: <>Kubernetes</>,
+    imageUrl: 'img/kubernetes.svg',
+    description: (
+      <>
+        Stratos sports a growing feature set for Kubernetes developers, extending its reach further
+        towards providing a single-pane-of-glass for your Cloud Native application development needs.
+      </>
+    ),
+  },
+  {
+    title: <>Multi-Cluster</>,
+    imageUrl: 'img/multi-cluster.svg',
+    description: (
+      <>
+        Stratos allows you to manage multiple Cloud Foundry and Kubernetes cluster from a single
+        management UI
+      </>
+    ),
+  },
+  {
+    title: <>Extensible</>,
+    imageUrl: 'img/extend.svg',
+    description: (
+      <>
+        Stratos is built with extensibility in mind and we continue to expand and improve the
+        extensibility experience for developers
+      </>
+    ),
+  },
+  {
+    title: <>Open Source</>,
+    imageUrl: 'img/open-source.svg',
+    description: (
+      <>
+        Stratos is Open Source with an Apache 2.0 License. Our codes lives on GitHub and we're a project within
+        the Cloud Foundry Foundation
+      </>
+    ),
+  },
+  {
+    title: <>Easy to Deploy</>,
+    imageUrl: 'img/deploy.svg',
+    description: (
+      <>
+        Stratos is easy to deploy and can be pushed as an application to Cloud Foundry, deployed to Kubernetes using Helm
+        or run locally in a Docker container
+      </>
+    ),
+  },
+
+
+];
+
+function Feature({imageUrl, title, description, cls}) {
+  const imgUrl = useBaseUrl(imageUrl);
+  return (
+    <div className={clsx('col col--4', styles.feature)}>
+      {imgUrl && (
+        <div className="">
+          <img className={clsx(styles.featureImage, cls, 'feature-img')} src={imgUrl} alt={title} />
+        </div>
+      )}
+      <h3>{title}</h3>
+      <p>{description}</p>
+    </div>
+  );
+}
+
+function Home() {
+  const context = useDocusaurusContext();
+  const {siteConfig = {}} = context;
+  return (
+    <Layout
+      title={`Home`}
+      description="Stratos - Web-based Management Interface for Cloud Foundry and Kubernetes">
+      <header className={clsx('hero hero--primary', styles.heroBanner)}>
+        <div className="container home-intro">
+        <h1 className="hero__title">{siteConfig.title}</h1>
+        <h2 className="hero__subtitle">Open-Source Multi-Cluster UI for <br/> Cloud Foundry and Kubernetes</h2>
+          <div className={clsx(styles.buttons, 'get-started')}>
+            <Link
+              className={clsx(
+                'button button--outline button--secondary button--lg',
+                styles.getStarted,
+              )}
+              to={useBaseUrl('docs/')}>
+              Get Started
+            </Link>
+          </div>
+        </div>
+        <img class="home-logo" src="img/logo.png" />
+      </header>
+      <main>
+        {features && features.length > 0 && (
+          <section className={styles.features}>
+            <div className="container">
+              <div className="row">
+                {features.map((props, idx) => (
+                  <Feature key={idx} {...props} />
+                ))}
+              </div>
+            </div>
+          </section>
+        )}
+        <section className={clsx(styles.features, 'screenshot-section', 'blue')}>
+          <div className="container">
+            <div class="screenshot">
+              <img class="left" src="img/screens/cf-app.png" />
+              <div>
+                <h2>Cloud Foundry</h2>
+                <p>Deploy and manage applications in Cloud Foundry. Stream application logs, scale applications and ssh to application instances</p>
+                <p>View and manage Cloud Foundry organizations and spaces and quotas.</p>
+                <p>Browse the Service Marketplace and create and manage service instances.</p>
+                <p>and a whole lot more ...</p>
+              </div>
+            </div>
+          </div>
+        </section>
+
+        <section className={clsx(styles.features, 'screenshot-section', 'white')}>
+          <div className="container">
+            <div class="screenshot">
+              <div>
+                <h2>Kubernetes</h2>
+                <p>View cluster-level metadata</p>
+                <p>Browse, view and install Helm Charts</p>
+                <p>View Helm Releases and see relationships between Kubernetes Resources</p>
+                <p>and lots more ...</p>
+              </div>
+              <img class="right" src="img/screens/kube-graph.png" />
+            </div>
+          </div>
+        </section>
+
+        <section className={clsx(styles.features, 'screenshot-section', 'blue')}>
+          <div className="container">
+            <div class="screenshot">
+              <img class="left" src="img/screens/endpoints.png" />
+              <div>
+                <h2>Multi-Cluster</h2>
+                <p>Add and Connect multiple Cloud Foundry and/or Kubernetes clusters.</p>
+                <p>Seemlessly switch between clusters and get aggregated views across clusters.</p>
+                <p>Favorite clusters and entities for easy access from the Home screen.</p>
+              </div>
+            </div>
+          </div>
+        </section>
+
+      </main>
+    </Layout>
+  );
+}
+
+export default Home;
diff --git a/website/src/pages/styles.module.css b/website/src/pages/styles.module.css
new file mode 100644
index 0000000000..c1aa85121c
--- /dev/null
+++ b/website/src/pages/styles.module.css
@@ -0,0 +1,37 @@
+/* stylelint-disable docusaurus/copyright-header */
+
+/**
+ * CSS files with the .module.css suffix will be treated as CSS modules
+ * and scoped locally.
+ */
+
+.heroBanner {
+  padding: 4rem 0;
+  text-align: center;
+  position: relative;
+  overflow: hidden;
+}
+
+@media screen and (max-width: 966px) {
+  .heroBanner {
+    padding: 2rem;
+  }
+}
+
+.buttons {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.features {
+  display: flex;
+  align-items: center;
+  padding: 2rem 0;
+  width: 100%;
+}
+
+.featureImage {
+  height: 200px;
+  width: 200px;
+}
diff --git a/website/static/.nojekyll b/website/static/.nojekyll
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/images/Browserstack-logo.svg b/website/static/images/Browserstack-logo.svg
similarity index 100%
rename from docs/images/Browserstack-logo.svg
rename to website/static/images/Browserstack-logo.svg
diff --git a/docs/images/extensions/app-tab-example.png b/website/static/images/extensions/app-tab-example.png
similarity index 100%
rename from docs/images/extensions/app-tab-example.png
rename to website/static/images/extensions/app-tab-example.png
diff --git a/docs/images/extensions/appwall-action-example.png b/website/static/images/extensions/appwall-action-example.png
similarity index 100%
rename from docs/images/extensions/appwall-action-example.png
rename to website/static/images/extensions/appwall-action-example.png
diff --git a/docs/images/high-level-arch.png b/website/static/images/high-level-arch.png
similarity index 100%
rename from docs/images/high-level-arch.png
rename to website/static/images/high-level-arch.png
diff --git a/docs/images/screenshots/app-summary.png b/website/static/images/screenshots/app-summary.png
similarity index 100%
rename from docs/images/screenshots/app-summary.png
rename to website/static/images/screenshots/app-summary.png
diff --git a/website/static/img/cloudfoundry.png b/website/static/img/cloudfoundry.png
new file mode 100644
index 0000000000000000000000000000000000000000..378a74380f786b3875408d2bb53d1bfde949f076
GIT binary patch
literal 5301
zcmV;m6iVxfP)<h;3K|Lk000e1NJLTq002e+003kN1^@s6J4!~m00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA6iP`%K~#8N<(vtW
zmBp3E?QUskXxdgW#$lkv#--ILY9!KU4w@sGDEktS4j`Md2s1Joz?nH@oFpd3nG=Xg
zI6$-Y0z#t#u~|+anPjk02i%B6>7XsbC@2WM3e7UV`})?i-uu?qtCRfCsq<CUtFP+b
zf8DxOU%mRiqzl>rxw*L)a!K#nwd-}AJ9obK{Q2{ejv^^3=}c8s)t1AD55G&Ys;sQ+
zY{M_DhgKnG`t<34d*;lUVRdzN-z9ki;bN3e?a-k^`wK6;Fga2v4wOIl1%R~EBtNJ8
z-n6u|Z7C@!n-(ovbf}?J%b`Vyx$nOFZc9x~ol6)<NYm^l;q>X#we|J&8@T@GbI(2Z
zhGsWAnw=Q24mx@&!jGeeyLnkeQy~_G1%3$OE8Dkkzr4Avs9A{_J$m%5kg<g!@-@wB
z70?lfA!$%^T2QkPBUXa5Tn8!NYAFi|f?Ci{ocWmMu%0FpGj{CQ>oMg$m~;otYE$5Q
zY9Q&BRjXE&YgVJsXkx@lYHDhJ1Su1+l4kc+O@UYs1TF5^vExr0YdwupNF8hmzT^(g
z`bq*Bw<F`k#*mXRF-po-8kF_OS02dv8nTW^l$?Z!QBq!_p_?_U(NJgkKGB0L-i{<E
zCs#@SxpU_(Vo`TF(QY{N9?jv*k$ERF=Osc;XkwI<0vh<XW+eoOI1dr~A>nQO(rfM7
zwR<i|P-zoiF@|tEWZjI<$Y$l+sNsL=)Tyns`(RjdLO1fj0}sqbnWr?F5Fm6v3f;4B
z-@Xc-d(LZiLg4u-DJLhV2Nv}kI_E0QP6%huo}Ia5$&!Vd^hGFQWJ<=Y-^Q#{G%FM!
z<Wq*oFPO@U8sh-nAXY^0Pa^s-7H~;JZaA<SKLfGXEnmL;fM$6jkQg08W%N=v%?btX
z*$g2MEnd9%L(OVdOr1J4iy^iQx$f4iP(ZE&+;dk@M+G`IDw>f9Dbg$4^Cb67Z7EU&
zQa5c(z;FE${}p;$f_t*DxCxr{gs;Vjwa{oq*dZh{O=V?e@3m{!?$NAP!N`##`($Qj
zz8rR;N$1t$FR${m8sCb>jT^TyJw1J}CVe5KoIH85&$@N%Uel~lm^N+NMfk5wl!|Ot
z(VM4_9XocsxVX3`QXnLT4<CM4mo8m?8+O*JuC88NSXek(lMZ-RGI{c3@%(?pPlVb>
zsjaPjhUb%i)TA$F%$RXoMn=XIdhI(n=XA2#5zMfbVNs8h{G5(`;mDCAOK_GI4L|u~
z{P^+m7%)YXzMuoDY5S)9{QM6zD+Zp#Oq@9J3C82UXwnz>l#eKz>t~t|Km2eeWd_ot
zKZcMiS<hU++C+bCfaDq2aR_>qsrGS(>3=O;xbO?jc0ebJ-LxYM#6UpKJV^hECS%}A
zj82LBm<~H@mM6lD*IBb>ji4u=p@*(8gm{r)AbECKxnf1-4A)^#KmGJOTFe3UiytyF
z11A=A{0tp$ag*KkW-9((7*YiAve=81yu7@2vuDqq->Fll^(c3R<QXfGs|hF^3GsPY
zNz88$do@n>k8|hFeJE0i3q%$aUZqK2pko*6y;qYla3zK*P&Tat!8+nJLt}v^9q8J%
z>vn#hWfV0bUSSj5^6Y%MPty3kg>&Z2$=7Dw@RV4x#(hy!Q*)0-W8h_O*Xh+4^h}xC
zDw36Q(xZ<)x(0LZD`}%_yy7P9mv8b6Od4_~L(V+SjzK{|!MpgHP}`i;b)!aO;2?%)
z5}AcUEw!1-S8Fr|nEPnVezdKaTM*dkcrr|${hM6|;vb(mb7oGYqByVwSfkM(bV29#
z8jr$3OphKtvT>Aw{sn8P!f$NRWE2Ai3`k?_t~Scp!^S9ND{9gb4D37!UiWiNMplOm
z0!UlWNI#`XPskbyoqK9B3I{PLH9X8Bi6Q)ZH>caPXV0I@)hJ-cCD=;F2O-fAY2V`)
zu*@uGJ;xGXo$#xg^n}b_kmGQ`4q}**uGOe7n4%raepa!av7&xPQ4!pZhYeCb5lcgs
ziGBO_b?Ac9|D#b~(8=938ik`W8vPrM`T_##G#UkhWO9E`TWAxELMFK7+vNpz+AbF#
z_&vK<uU;2NZnA*oAJeEWs3S|GQ8<X9k&86y33)DJO5du<C>YaO5Z2C18IvzCaXZ-M
z;_nFvmoua~MJl$yRJ;{gzjR(6;QmaFM&Tev6w|0Dm<mr-R8%;&6zCz@VT%#kz|J#D
zo3efc*k$c<ae49p>X=y$9z6IVvdW==AUK`}9mF&RkeVDXwDA=Jqf}6^@0Z|KCO$Mb
z+=vNWG4hbsJ}WEhN=-&V?|kMasHEeasU6HcUiaF;?OwSuWX|X<QFQO#JquY=HR%V3
zzjPz!q+UHCQyl9D$5NX7KiR^XxCDV6H!yjoyaapNw#(QdF8?@X9m?^Hb}upoE<LdH
z6B>=eK@3jpe>Lh01aUY!@}z-}JcN%1QP>2x-wh=0W@(adUkMdh>*sn~6x`cIqrO1r
zgBp#(L5%deMty<h-m1|k^7HeLlmCVh+AG*_`(2fd#O*Q$CT#+3ZsnQHvC1XCw?=)z
zIw+VJW|nG=`hthJyJYV}lTol(`gbF+QP2+Y`KGKL4C3?M?jwHo*s)_z>Mc=-Y^>sM
z*Q6&PPnI5=H5rA27}g?NWII8Vo`9H+2sKcXQLJ3K@^#2rU@K&TAU@Al)`a*nCfG1}
zEc^3HN=hPs@7h3y?;~TN<As!yAAIn^pEVhUgP8L2^8GaSu_k@N0xD0VF+ix<DEN-8
zlvi*=JW&#)Y<!yD-h`~r>uoW>=Zw;55RR3Vl{to?gBbk_HPoRSO!bcO<HtLmt%{0@
z&d?Kgqd>#70^${m4~8hWVD7gAq#W40ckgi8ind`O|C};S-=s-jFeB~LXbc?02vGQU
z8uf*m>LU%QSQHl*AE~UY{2EHXYm_rUm}n5l?_o)jz-+T)>C&Y=ckSBc`bQhH%wssz
zz!kgz0)MN~7`PIHz6H3MT21<bvJbd9VF6?R806eS@9wn~jwitn@#U$jfZ4B~{_KD{
z-LabV1;g+Jv#{$>bR|aiG7w;yCVe4`J;rmH4>@1pkZ(e%P(DY3Awl8>VqN5IVp<+Q
zVZsF0MVrWgEPKK%>IBsPtk*`qD=`8raXwZPxC17@9J|%l*3QwSD{#m|jIwsHN$~rP
zjyh?aJw!XqOh~~379vZiqqH(2Seh)?qywJB$Uk&6^ao7_0`r|YYSgH2Y0?3F&H<F0
zEK0h;Cd32-iDL<U)~;RaIlTFOIx>X%J6QlRJG}md6nGLN=-j#UB$RP@eK*K<XhufH
z%cDn+zD2VfU<O%^<J|6NC2oOxo?f$NjpvGd#E21n89t9`G7wnr+4S^u&;O<bzQoA*
zgV|6gkOU0B6do?Od-)pyiprkwSy9*!WRqk=%bcQfex+Fs$T^wJ%*@}2uhXnRK=jYN
ze2YO~WhnX-W_nbUfxw(Eq5KXna<Ce)7>7`X7@H&|Z41NjJuMakX@lN>LzfMqfNY2H
zLyI-(i9lk6Sr%*e&};6_!38vY4Fb&2qyyCT&qjF@Y}k3U?RkO%XZ&w;gk!JQ3*r_C
z-wCo7K`8T+mlx=nUuZHEm|h?BvKsuw8Z4pCCPu9zn%2BM>({UUNN<aQ)Xng5eI)S$
zr2Mq7urSo_LFjRrmX@{vD+qlkh@QNZSxpWRdf^4V#=s_q;Q4Q&SQ2eG_Jq8E?0*O|
zgbYFxBj!iNBWPg1W(5MPdCbddu!ik%B*cd^gx9rr45UtG!I_#21Tw#c><PV<5}Fu+
zl5;l=xjMsm;1km*J6)48K<WL2Q%XWKSg2+8a6L)IOnJZ5tw~?d{$6Arm<TC?goqI+
zIsItR^YD%h#&s`^#sG`?*e1rnr1||+b#?V&&5i-YxYijDWZZ+S{SzfckT5X<CFdS|
zNU3Id0wu53Xbd3iQ!ddBF++$IYD-H?T{q15&G8RKJdkZYG7fDFDS}23BajAhe$#M*
z{~^yEn(c<m^csVmJ9pNiU}T|Z2Ls}+vysB{j2(njVJSaBwts3YDS}25Banu9pqs<A
zdA--rVm8ZgbHGQB9zBQh;$Y(mi3A+C-@g?ZdW``xybdAPuUN5SUQ<XBG>I4kJ*6!}
zYaYVItde!9erH3<fe0h^hLs_StLJHN%E$a2OPe2KwT~ggkfsu1&@99VL?AgD%52da
z|1nF1m3(Fv(e(Ecj|a*}EJhY~5)3gK_d5n3IV?>Z2c<3A?6YjyvY$5>DS}WNI*ox0
zA4nN;=+L3m&6_vR*X$UK969oRdcTJzV*oKlB_$=}G#P{b{rk`A)~#Dza&mHMbCO}B
z#fS+5A%=@5F+2{q64M%JwxQHW_;t*e9=Q$B*2Ki@<QpF&0mOVEq_xqe#MneA8Ic)E
zLz~Lh*2JXPqzFu!naOpn(pqRUVwh3HzeIhEA;b!Qoy7F%(?|S^r}O=*ASO3Aw<AH0
zrhi?t<R6GsKR?26F`H1_dzseJDj(Nqv2~0r@T#k;e?`ydk`xjmZ?UDPr)SHeZ20iu
zax7ogF_BYG;&9_|==tZLkG!NRbyZbWy-OMKN%F+K4`N5Q)Z$LiA{HZx@a*ygBn(1<
zO9`EccOazJ*Vjk(X<5p55=Dg&LyGzq6Qa{Kj(8wdbdox_W)SY+abV5;_un7tEt$rk
z*(^q%pzo}ysp-#y;{cv=T@O;D<TM^S7Y`XS<jRzkl()$8@+C(<`Q(#sWo2cjse26R
zqK51*0m<?z^Ph3#yJ>GX?S4kK>pKpKA|Ybr1yU4y5P{^hfjQkNzMu<Fwpl?(FL?Ss
zjsiD};6sNFy&6lA_Yvg%gN6dJ_>A&BN=r+tg>(pboi<$ec5GmYXY1<f<hUHwCUwB_
zK0&Mk$XmgKrVQOs2t|wthQC<AQ*8gRd#&+6$x2B5=E{{TBZrb8<{Jq63ek>|mf;fz
zIih;a#*G^z?*mMlG%1_QYY>~zXA2A%+I57N7><vGv8Yf!2FLdb6^=-h6xnj%-uLP4
zr%>nyLy96DG8_v$u^tWbo4k4)fxJm4)`qn{QdwE~2A1Jq(hnj#I*de?f6y#ngdzr0
z4E6G*fsB1D?AL^wi;9Y}SFBhuH@=rpJTgl)q`rh9ija&CiuvnR>d4Q}pI=;Dd@I)0
z1AkVGC5Ad>DxhpB!|@qS`XUrDRQ4if9jb@ukpmFfqp+}W@aom8_iDBSY7Ks$Mi7hf
z{6kH44GRhi#$rV|v>EDX9QC>W$K{5=Z#Ia3f$8}u>$=--0|9qHqVLZ9ph1JK%E`&;
zhsBH_`27tcop$QlYp+es&dxqrUS96{NrT<HcUQ8C-hsnCOMQ1>NuHg}to3zdq<Eig
za-U|q!q@rgY*2)<UVFAtP|ov1S%U`;M&_ic$ovG?OJt}d3hpT<{DAQ5O`A5kRxokm
z#GfHU;5iv_#MJX7*5>)eMF%lL20r3G6#X_g-i^}=T!K^nG!5mrO^3`r10Z85(Z~zw
z@!+?}mHQ*t5O|AWJ&D=M@%OD-_nXLlsb={Cf@&%M79I8{;?LS&UW^h0+dWZm5taU3
z7&2@y^SpzTb-cekY}hcVNB(9F^{oXjxRCb>@xB{2Y;e3n#A>*(Q>RX$PHozdS&rH6
zcJqms=y-&b1uV7uB}$6I^+Oc&tj3xKAtcVClDsSo5)=BoiUIy7sbj~E>%{6L9U(>%
zjLpB7cw>N--C!!Tfw_MHIS)yXdxge;_0bgSc75TD-#iaU1_2J_(=ZW#YAohXW*y(<
zydT8Mm=%7Y$rzx(3s~cg^sv0);ZP=sEGsRKAceGZ3C{QJhOAiR<>mECOG^uNRNjUR
zBizAB!f||S<X!DZt5c>-xsnEdiSU=A<c(NB;G4AZkjf$88dkTCH#r0Y2M$bu`wZF`
zgR)Zy-_V~tA;X36--Kr=zYQ5Hw{6?zI)=nzaiH%Zf8-G(4CJ{A=Uc#aenmxv$X(Av
zYvdI|hb`-nxRX`uP#PITaJ-%B1tEuq@^OAY@>|Oou%_wF*zS(v-B4T>bLSa)mBbHm
zeGkiUeF4IT$V)HFQebu>vU1PI44vMgr)wK>R1_<aFC8Yd%?LS_2>Lh{QWA!s#=vwS
z3d-6gp-<7#f#>LuEI-+Ni4h=x>t0A0AoLM>egi};VU6H=Y%EcX88hYv2%n5q4T2EI
z$11`AUvh}$g)f<5i1{X-{#736JeS%*kRHN6i1RF`o;PujyHQNe)Oc<x8H<oO_ufVw
za^gIPd%Muv34Osa9x~)*2sg=MaLhAM=2=ZPD;TD-11E34%F7()^pq%#F?6^X%Lsk2
zIZ@z4H}Rl5M3WBq5+l9FFc2RT`jGMe7sy@_mh)qDTk2*xp2I^NFTMHFUm__2MnMv~
z{g7em`i7n-F_`%z%(=-QH2x|>rfjUn^&?=O#E6N>*AT^VYSv#2bjww~3*4L8$#tz1
z=zQgkRGgq34R!rUmJo+I%HI|;>zMB=$b)D)Gsxvlok9G7|EprP`zC9qkC^3T<H<a7
zq_SvCBV0zvMviPF2Uhawi4!Nj|Kf`;ZjY4oKp-&!al$n4T|D^@5uhva8m=$XU@2pD
zqu-Rvkjz7vQIx$E;Tk>V+n~N9SoAz(*y1<k8i*Wp-YkhD$AU2Tgd)a9Zf@=sJWqsr
zVcmxOYY2(58+e;$B@EeEV!^n8I?ydxxuzgtVwwV-{wG1u<5*8ZZDV=$44JE!ELqZG
zA5XT?s>B#1`e9=6V_3`et5&TF^>RmZpjpOzq9`dT*~OT5e1XFYl-<>uqzKx?VgxeV
zF*N=aM=o0hvPou6H^_d79DY8HbCqzC>2;CUwAwPb;DY}HUe|tZ@4cyp00000NkvXX
Hu0mjftwamV

literal 0
HcmV?d00001

diff --git a/website/static/img/deploy.svg b/website/static/img/deploy.svg
new file mode 100644
index 0000000000..097f164ef5
--- /dev/null
+++ b/website/static/img/deploy.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" focusable="false" width="1em" height="1em" style="-ms-transform: rotate(360deg); -webkit-transform: rotate(360deg); transform: rotate(360deg);" preserveAspectRatio="xMidYMid meet" viewBox="0 0 32 32"><path d="M7.288 23.292l7.997-7.997l1.415 1.414l-7.998 7.997z" fill="#626262"/><path d="M17 30a1 1 0 0 1-.37-.07a1 1 0 0 1-.62-.79l-1-7l2-.28l.75 5.27L21 24.52V17a1 1 0 0 1 .29-.71l4.07-4.07A8.94 8.94 0 0 0 28 5.86V4h-1.86a8.94 8.94 0 0 0-6.36 2.64l-4.07 4.07A1 1 0 0 1 15 11H7.48l-2.61 3.26l5.27.75l-.28 2l-7-1a1 1 0 0 1-.79-.62a1 1 0 0 1 .15-1l4-5A1 1 0 0 1 7 9h7.59l3.77-3.78A10.92 10.92 0 0 1 26.14 2H28a2 2 0 0 1 2 2v1.86a10.92 10.92 0 0 1-3.22 7.78L23 17.41V25a1 1 0 0 1-.38.78l-5 4A1 1 0 0 1 17 30z" fill="#626262"/></svg>
\ No newline at end of file
diff --git a/website/static/img/easy.svg b/website/static/img/easy.svg
new file mode 100644
index 0000000000..1e32c1c49d
--- /dev/null
+++ b/website/static/img/easy.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" focusable="false" width="1em" height="1em" style="-ms-transform: rotate(360deg); -webkit-transform: rotate(360deg); transform: rotate(360deg);" preserveAspectRatio="xMidYMid meet" viewBox="0 0 32 32"><path d="M26 21v-1a1 1 0 0 1 2 0v10h2V20a3.003 3.003 0 0 0-3-3a2.964 2.964 0 0 0-1.47.401a2.954 2.954 0 0 0-4-1A2.993 2.993 0 0 0 19 15a2.96 2.96 0 0 0-1 .185V10a3 3 0 0 0-6 0v11.105l-2.235-1.53v.001a2.999 2.999 0 0 0-3.882 4.55L12.323 30l1.347-1.478l-6.378-5.818A.99.99 0 0 1 7 22a1 1 0 0 1 1.6-.8l5.4 3.695V10a1 1 0 0 1 2 0v11h2v-3a1 1 0 0 1 2 0v3h2v-2a1 1 0 0 1 2 0v2z" fill="#626262"/><path d="M28 12h-6v-2h6V4H4v6h4v2H4a2.002 2.002 0 0 1-2-2V4a2.002 2.002 0 0 1 2-2h24a2.002 2.002 0 0 1 2 2v6a2.002 2.002 0 0 1-2 2z" fill="#626262"/></svg>
\ No newline at end of file
diff --git a/website/static/img/extend.svg b/website/static/img/extend.svg
new file mode 100644
index 0000000000..3c4cbcf5ee
--- /dev/null
+++ b/website/static/img/extend.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" focusable="false" width="1em" height="1em" style="-ms-transform: rotate(360deg); -webkit-transform: rotate(360deg); transform: rotate(360deg);" preserveAspectRatio="xMidYMid meet" viewBox="0 0 32 32"><path d="M26 22v3.586l-9-9V5.828l2.586 2.586L21 7l-5-5l-5 5l1.414 1.414L15 5.828v10.758l-9 9V22H4v7h7v-2H7.414L16 18.414L24.586 27H21v2h7v-7h-2z" fill="#626262"/></svg>
\ No newline at end of file
diff --git a/website/static/img/favicon.ico b/website/static/img/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..21f49bc43b08f557f085d0ba170f388e5956373f
GIT binary patch
literal 15086
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

literal 0
HcmV?d00001

diff --git a/website/static/img/kubernetes.svg b/website/static/img/kubernetes.svg
new file mode 100644
index 0000000000..bd6b1464fe
--- /dev/null
+++ b/website/static/img/kubernetes.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="722.8457"
+   height="701.96637"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="logo.svg"
+   inkscape:export-filename="/home/thockin/src/kubernetes/new.png"
+   inkscape:export-xdpi="460.95001"
+   inkscape:export-ydpi="460.95001">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16.190509"
+     inkscape:cx="277.56851"
+     inkscape:cy="157.54494"
+     inkscape:document-units="px"
+     inkscape:current-layer="g3052"
+     showgrid="false"
+     inkscape:window-width="1519"
+     inkscape:window-height="822"
+     inkscape:window-x="51"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="false"
+     fit-margin-top="10"
+     fit-margin-left="10"
+     fit-margin-right="10"
+     fit-margin-bottom="10" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-6.3260942,-174.7524)">
+    <g
+       id="g3052">
+      <path
+         style="fill:#326ce5;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 365.3125,184.8125 a 46.724621,46.342246 0 0 0 -17.90625,4.53125 l -244.34375,116.75 a 46.724621,46.342246 0 0 0 -25.28125,31.4375 L 17.5,599.78125 A 46.724621,46.342246 0 0 0 23.84375,635.3125 46.724621,46.342246 0 0 0 26.5,639 l 169.125,210.28125 a 46.724621,46.342246 0 0 0 36.53125,17.4375 L 503.375,866.65625 A 46.724621,46.342246 0 0 0 539.90625,849.25 L 708.96875,638.9375 A 46.724621,46.342246 0 0 0 718,599.71875 l -60.375,-262.25 a 46.724621,46.342246 0 0 0 -25.28125,-31.4375 l -244.375,-116.6875 A 46.724621,46.342246 0 0 0 365.3125,184.8125 z"
+         id="path3055"
+         inkscape:connector-curvature="0"
+         inkscape:export-filename="new.png"
+         inkscape:export-xdpi="250.55"
+         inkscape:export-ydpi="250.55" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3059"
+         d="m 367.73366,274.05962 c -8.07696,8.2e-4 -14.62596,7.27591 -14.625,16.25 1e-5,0.13773 0.0282,0.26934 0.0312,0.40625 -0.0119,1.21936 -0.0708,2.68836 -0.0312,3.75 0.19262,5.176 1.3209,9.13749 2,13.90625 1.23028,10.20666 2.26117,18.66736 1.625,26.53125 -0.61869,2.9654 -2.80288,5.67741 -4.75,7.5625 l -0.34375,6.1875 c -8.77682,0.72717 -17.61235,2.05874 -26.4375,4.0625 -37.97461,8.62218 -70.67008,28.18307 -95.5625,54.59375 -1.61522,-1.10193 -4.44103,-3.12914 -5.2813,-3.75 -2.61117,0.35262 -5.25021,1.15829 -8.6875,-0.84375 -6.54491,-4.40563 -12.50587,-10.48693 -19.71875,-17.8125 -3.30498,-3.50419 -5.69832,-6.84101 -9.625,-10.21875 -0.89172,-0.76707 -2.25258,-1.80455 -3.25,-2.59375 -3.06988,-2.44757 -6.6907,-3.72402 -10.1875,-3.84375 -4.49589,-0.15394 -8.82394,1.60385 -11.65625,5.15625 -5.03521,6.31538 -3.42312,15.96805 3.59375,21.5625 0.0712,0.0567 0.14702,0.10078 0.21875,0.15625 0.96422,0.78162 2.14496,1.78313 3.03125,2.4375 4.16687,3.07655 7.9732,4.65145 12.125,7.09375 8.747,5.40181 15.99837,9.88086 21.75,15.28125 2.24602,2.39417 2.63858,6.61292 2.9375,8.4375 l 4.6875,4.1875 c -25.09342,37.76368 -36.70686,84.40946 -29.8437,131.9375 l -6.125,1.78125 c -1.6143,2.08461 -3.89541,5.36474 -6.2813,6.34375 -7.52513,2.37021 -15.99424,3.24059 -26.21875,4.3125 -4.80031,0.39915 -8.94218,0.16095 -14.03125,1.125 -1.12008,0.21218 -2.68072,0.61877 -3.90625,0.90625 -0.0426,0.009 -0.0824,0.0216 -0.125,0.0312 -0.0668,0.0155 -0.15456,0.0479 -0.21875,0.0625 -8.62014,2.08279 -14.15774,10.006 -12.375,17.8125 1.78316,7.80833 10.20314,12.55677 18.875,10.6875 0.0626,-0.0143 0.1535,-0.0167 0.21875,-0.0312 0.0979,-0.0224 0.18409,-0.0699 0.28125,-0.0937 1.20885,-0.26536 2.72377,-0.5606 3.78125,-0.84375 5.00334,-1.33963 8.62694,-3.30796 13.125,-5.03125 9.67694,-3.47077 17.69173,-6.37022 25.5,-7.5 3.26118,-0.25542 6.69711,2.01216 8.40625,2.96875 l 6.375,-1.09375 c 14.67018,45.48282 45.41416,82.24502 84.34375,105.3125 l -2.65625,6.375 c 0.95742,2.47542 2.01341,5.8247 1.30022,8.26932 -2.83868,7.3612 -7.70097,15.13097 -13.23772,23.79318 -2.68085,4.00192 -5.42453,7.10761 -7.84375,11.6875 -0.5789,1.09589 -1.31618,2.77932 -1.875,3.9375 -3.75884,8.04236 -1.00164,17.3052 6.21875,20.78125 7.26575,3.49788 16.28447,-0.19134 20.1875,-8.25 0.006,-0.0114 0.0257,-0.0198 0.0312,-0.0312 0.004,-0.009 -0.004,-0.0225 0,-0.0312 0.55593,-1.14255 1.34353,-2.64437 1.8125,-3.71875 2.07213,-4.74702 2.76161,-8.81506 4.21875,-13.40625 3.86962,-9.72014 5.99567,-19.91903 11.32258,-26.27411 1.45868,-1.74023 3.83681,-2.4095 6.30242,-3.06964 l 3.3125,-6 c 33.93824,13.0268 71.92666,16.52246 109.875,7.90625 8.65697,-1.96557 17.01444,-4.50945 25.09375,-7.5625 0.93098,1.65133 2.66113,4.8257 3.125,5.625 2.50559,0.81518 5.24044,1.23614 7.46875,4.53125 3.98539,6.80898 6.7109,14.86416 10.03125,24.59375 1.45738,4.59111 2.17762,8.65933 4.25,13.40625 0.47234,1.08195 1.256,2.60486 1.8125,3.75 3.89482,8.08484 12.94212,11.78667 20.21875,8.28125 7.2195,-3.4779 9.97974,-12.7399 6.21875,-20.78125 -0.55889,-1.15814 -1.3273,-2.84164 -1.90625,-3.9375 -2.41946,-4.57976 -5.1627,-7.65448 -7.84375,-11.65625 -5.53721,-8.66192 -10.12968,-15.8577 -12.96875,-23.21875 -1.18711,-3.79657 0.20028,-6.15774 1.125,-8.625 -0.55378,-0.63477 -1.73881,-4.22009 -2.4375,-5.90625 40.4574,-23.88816 70.29856,-62.02129 84.3125,-106.0625 1.8924,0.29742 5.18154,0.87936 6.25,1.09375 2.19954,-1.4507 4.22194,-3.34352 8.1875,-3.03125 7.80832,1.12937 15.82288,4.02973 25.5,7.5 4.49815,1.72306 8.1216,3.72313 13.125,5.0625 1.05749,0.28309 2.57238,0.5472 3.78125,0.8125 0.0972,0.0238 0.1833,0.0714 0.28125,0.0937 0.0653,0.0146 0.15615,0.0169 0.21875,0.0312 8.67236,1.86695 17.09384,-2.87871 18.875,-10.6875 1.78074,-7.80696 -3.7543,-15.73201 -12.375,-17.8125 -1.25393,-0.28513 -3.03225,-0.76938 -4.25,-1 -5.08912,-0.96378 -9.23092,-0.7261 -14.03125,-1.125 -10.22456,-1.07138 -18.6935,-1.94269 -26.21875,-4.3125 -3.06826,-1.19028 -5.25103,-4.84124 -6.31255,-6.34375 l -5.90625,-1.71875 c 3.06226,-22.15442 2.23655,-45.21134 -3.0625,-68.28125 -5.34839,-23.28471 -14.80037,-44.58084 -27.40625,-63.34375 1.51505,-1.37729 4.37619,-3.91091 5.1875,-4.65625 0.23716,-2.62417 0.0334,-5.37553 2.75,-8.28125 5.75134,-5.40069 13.00329,-9.87898 21.75,-15.28125 4.15167,-2.44252 7.98954,-4.01698 12.15625,-7.09375 0.94225,-0.69576 2.2289,-1.79759 3.21875,-2.59375 7.01538,-5.59633 8.63058,-15.24842 3.59375,-21.5625 -5.03683,-6.31408 -14.79712,-6.90883 -21.8125,-1.3125 -0.99856,0.79085 -2.35353,1.82252 -3.25,2.59375 -3.9265,3.37796 -6.35145,6.71439 -9.65625,10.21875 -7.21249,7.32595 -13.17407,13.43777 -19.71875,17.84375 -2.83601,1.65106 -6.98996,1.07978 -8.87505,0.96875 l -5.5625,3.96875 c -31.7188,-33.26057 -74.90466,-54.52546 -121.40605,-58.6563 -0.13006,-1.94872 -0.30045,-5.47117 -0.34375,-6.53125 -1.90371,-1.82165 -4.20342,-3.37686 -4.78125,-7.3125 -0.63617,-7.86389 0.42597,-16.32459 1.65625,-26.53125 0.6791,-4.76876 1.80738,-8.73025 2,-13.90625 0.0438,-1.17663 -0.0265,-2.88401 -0.0312,-4.15625 -9.6e-4,-8.97409 -6.54804,-16.25082 -14.625,-16.25 z m -18.3125,113.4375 -4.34375,76.71875 -0.3125,0.15625 c -0.29134,6.86335 -5.93996,12.34375 -12.875,12.34375 -2.84081,0 -5.46294,-0.91229 -7.59375,-2.46875 l -0.125,0.0625 -62.90625,-44.59375 c 19.33365,-19.01115 44.06291,-33.06039 72.5625,-39.53125 5.20599,-1.18203 10.40966,-2.0591 15.59375,-2.6875 z m 36.65625,0 c 33.27347,4.09232 64.04501,19.15882 87.625,42.25 l -62.5,44.3125 -0.21875,-0.0937 c -5.54745,4.05169 -13.36343,3.04639 -17.6875,-2.375 -1.77132,-2.22096 -2.70072,-4.83239 -2.8125,-7.46875 l -0.0625,-0.0312 z m -147.625,70.875 57.4375,51.375 -0.0625,0.3125 c 5.18437,4.50697 5.94888,12.32794 1.625,17.75 -1.7712,2.22105 -4.14208,3.71074 -6.6875,4.40625 l -0.0625,0.25 -73.625,21.25 c -3.74728,-34.26517 4.32855,-67.57364 21.375,-95.34375 z m 258.15625,0.0312 c 8.5341,13.83256 14.99655,29.28214 18.84375,46.03125 3.80106,16.54828 4.75499,33.06697 3.1875,49.03125 l -74,-21.3125 -0.0625,-0.3125 c -6.6265,-1.81104 -10.69893,-8.55162 -9.15625,-15.3125 0.63203,-2.76962 2.10222,-5.11264 4.09375,-6.84375 l -0.0312,-0.15625 57.125,-51.125 z m -140.65625,55.3125 23.53125,0 14.625,18.28125 -5.25,22.8125 -21.125,10.15625 -21.1875,-10.1875 -5.25,-22.8125 z m 75.4375,62.5625 c 0.99997,-0.0505 1.99558,0.0396 2.96875,0.21875 l 0.125,-0.15625 76.15625,12.875 c -11.1455,31.3131 -32.47281,58.44018 -60.96875,76.59375 l -29.5625,-71.40625 0.0937,-0.125 c -2.71561,-6.30999 0.002,-13.70956 6.25,-16.71875 1.59965,-0.77041 3.27089,-1.19701 4.9375,-1.28125 z m -127.90625,0.3125 c 5.81174,0.0815 11.02462,4.11525 12.375,10.03125 0.63219,2.76958 0.3245,5.51375 -0.71875,7.9375 l 0.21875,0.28125 -29.25,70.6875 c -27.34716,-17.5486 -49.12927,-43.82403 -60.78125,-76.06245 l 75.5,-12.8125 0.125,0.15625 c 0.84451,-0.15541 1.701,-0.2304 2.53125,-0.21875 z m 63.78125,30.9688 c 2.02445,-0.0744 4.07865,0.34098 6.03125,1.28125 2.55951,1.23253 4.53673,3.17319 5.78125,5.5 l 0.28125,0 37.21875,67.25 c -4.83029,1.61923 -9.79609,3.00308 -14.875,4.15625 -28.46453,6.4629 -56.83862,4.50467 -82.53125,-4.25 l 37.125,-67.125 0.0625,0 c 2.22767,-4.16441 6.45247,-6.64887 10.90625,-6.8125 z"
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.25;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+         sodipodi:nodetypes="ccccccccsccccscssccsccccccccscccsccccccccccccccscccscsccsccccscscsccccccccscccscsccccsccccscscscccccccccccccccscccsccccccccccccscccccscccccccccccccccccccccccscccscccccccccscccscccc"
+         inkscape:export-filename="./path3059.png"
+         inkscape:export-xdpi="250.55"
+         inkscape:export-ydpi="250.55" />
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/website/static/img/logo.png b/website/static/img/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..03d4990b89312c6d14d0efbcd5810d81678e45d7
GIT binary patch
literal 93628
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
TTf_I|@o~l4;H{rpy8rjTjBk7)

literal 0
HcmV?d00001

diff --git a/website/static/img/logo.svg b/website/static/img/logo.svg
new file mode 100644
index 0000000000..9db6d0d066
--- /dev/null
+++ b/website/static/img/logo.svg
@@ -0,0 +1 @@
+<svg width="200" height="200" viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path fill="#FFF" d="M99 52h84v34H99z"/><path d="M23 163c-7.398 0-13.843-4.027-17.303-10A19.886 19.886 0 0 0 3 163c0 11.046 8.954 20 20 20h20v-20H23z" fill="#3ECC5F"/><path d="M112.98 57.376L183 53V43c0-11.046-8.954-20-20-20H73l-2.5-4.33c-1.112-1.925-3.889-1.925-5 0L63 23l-2.5-4.33c-1.111-1.925-3.889-1.925-5 0L53 23l-2.5-4.33c-1.111-1.925-3.889-1.925-5 0L43 23c-.022 0-.042.003-.065.003l-4.142-4.141c-1.57-1.571-4.252-.853-4.828 1.294l-1.369 5.104-5.192-1.392c-2.148-.575-4.111 1.389-3.535 3.536l1.39 5.193-5.102 1.367c-2.148.576-2.867 3.259-1.296 4.83l4.142 4.142c0 .021-.003.042-.003.064l-4.33 2.5c-1.925 1.111-1.925 3.889 0 5L23 53l-4.33 2.5c-1.925 1.111-1.925 3.889 0 5L23 63l-4.33 2.5c-1.925 1.111-1.925 3.889 0 5L23 73l-4.33 2.5c-1.925 1.111-1.925 3.889 0 5L23 83l-4.33 2.5c-1.925 1.111-1.925 3.889 0 5L23 93l-4.33 2.5c-1.925 1.111-1.925 3.889 0 5L23 103l-4.33 2.5c-1.925 1.111-1.925 3.889 0 5L23 113l-4.33 2.5c-1.925 1.111-1.925 3.889 0 5L23 123l-4.33 2.5c-1.925 1.111-1.925 3.889 0 5L23 133l-4.33 2.5c-1.925 1.111-1.925 3.889 0 5L23 143l-4.33 2.5c-1.925 1.111-1.925 3.889 0 5L23 153l-4.33 2.5c-1.925 1.111-1.925 3.889 0 5L23 163c0 11.046 8.954 20 20 20h120c11.046 0 20-8.954 20-20V83l-70.02-4.376A10.645 10.645 0 0 1 103 68c0-5.621 4.37-10.273 9.98-10.624" fill="#3ECC5F"/><path fill="#3ECC5F" d="M143 183h30v-40h-30z"/><path d="M193 158c-.219 0-.428.037-.639.064-.038-.15-.074-.301-.116-.451A5 5 0 0 0 190.32 148a4.96 4.96 0 0 0-3.016 1.036 26.531 26.531 0 0 0-.335-.336 4.955 4.955 0 0 0 1.011-2.987 5 5 0 0 0-9.599-1.959c-.148-.042-.297-.077-.445-.115.027-.211.064-.42.064-.639a5 5 0 0 0-5-5 5 5 0 0 0-5 5c0 .219.037.428.064.639-.148.038-.297.073-.445.115a4.998 4.998 0 0 0-9.599 1.959c0 1.125.384 2.151 1.011 2.987-3.717 3.632-6.031 8.693-6.031 14.3 0 11.046 8.954 20 20 20 9.339 0 17.16-6.41 19.361-15.064.211.027.42.064.639.064a5 5 0 0 0 5-5 5 5 0 0 0-5-5" fill="#44D860"/><path fill="#3ECC5F" d="M153 123h30v-20h-30z"/><path d="M193 115.5a2.5 2.5 0 1 0 0-5c-.109 0-.214.019-.319.032-.02-.075-.037-.15-.058-.225a2.501 2.501 0 0 0-.963-4.807c-.569 0-1.088.197-1.508.518a6.653 6.653 0 0 0-.168-.168c.314-.417.506-.931.506-1.494a2.5 2.5 0 0 0-4.8-.979A9.987 9.987 0 0 0 183 103c-5.522 0-10 4.478-10 10s4.478 10 10 10c.934 0 1.833-.138 2.69-.377a2.5 2.5 0 0 0 4.8-.979c0-.563-.192-1.077-.506-1.494.057-.055.113-.111.168-.168.42.321.939.518 1.508.518a2.5 2.5 0 0 0 .963-4.807c.021-.074.038-.15.058-.225.105.013.21.032.319.032" fill="#44D860"/><path d="M63 55.5a2.5 2.5 0 0 1-2.5-2.5c0-4.136-3.364-7.5-7.5-7.5s-7.5 3.364-7.5 7.5a2.5 2.5 0 1 1-5 0c0-6.893 5.607-12.5 12.5-12.5S65.5 46.107 65.5 53a2.5 2.5 0 0 1-2.5 2.5" fill="#000"/><path d="M103 183h60c11.046 0 20-8.954 20-20V93h-60c-11.046 0-20 8.954-20 20v70z" fill="#FFFF50"/><path d="M168.02 124h-50.04a1 1 0 1 1 0-2h50.04a1 1 0 1 1 0 2m0 20h-50.04a1 1 0 1 1 0-2h50.04a1 1 0 1 1 0 2m0 20h-50.04a1 1 0 1 1 0-2h50.04a1 1 0 1 1 0 2m0-49.814h-50.04a1 1 0 1 1 0-2h50.04a1 1 0 1 1 0 2m0 19.814h-50.04a1 1 0 1 1 0-2h50.04a1 1 0 1 1 0 2m0 20h-50.04a1 1 0 1 1 0-2h50.04a1 1 0 1 1 0 2M183 61.611c-.012 0-.022-.006-.034-.005-3.09.105-4.552 3.196-5.842 5.923-1.346 2.85-2.387 4.703-4.093 4.647-1.889-.068-2.969-2.202-4.113-4.46-1.314-2.594-2.814-5.536-5.963-5.426-3.046.104-4.513 2.794-5.807 5.167-1.377 2.528-2.314 4.065-4.121 3.994-1.927-.07-2.951-1.805-4.136-3.813-1.321-2.236-2.848-4.75-5.936-4.664-2.994.103-4.465 2.385-5.763 4.4-1.373 2.13-2.335 3.428-4.165 3.351-1.973-.07-2.992-1.51-4.171-3.177-1.324-1.873-2.816-3.993-5.895-3.89-2.928.1-4.399 1.97-5.696 3.618-1.232 1.564-2.194 2.802-4.229 2.724a1 1 0 0 0-.072 2c3.017.101 4.545-1.8 5.872-3.487 1.177-1.496 2.193-2.787 4.193-2.855 1.926-.082 2.829 1.115 4.195 3.045 1.297 1.834 2.769 3.914 5.731 4.021 3.103.104 4.596-2.215 5.918-4.267 1.182-1.834 2.202-3.417 4.15-3.484 1.793-.067 2.769 1.35 4.145 3.681 1.297 2.197 2.766 4.686 5.787 4.796 3.125.108 4.634-2.62 5.949-5.035 1.139-2.088 2.214-4.06 4.119-4.126 1.793-.042 2.728 1.595 4.111 4.33 1.292 2.553 2.757 5.445 5.825 5.556l.169.003c3.064 0 4.518-3.075 5.805-5.794 1.139-2.41 2.217-4.68 4.067-4.773v-2z" fill="#000"/><path fill="#3ECC5F" d="M83 183h40v-40H83z"/><path d="M143 158c-.219 0-.428.037-.639.064-.038-.15-.074-.301-.116-.451A5 5 0 0 0 140.32 148a4.96 4.96 0 0 0-3.016 1.036 26.531 26.531 0 0 0-.335-.336 4.955 4.955 0 0 0 1.011-2.987 5 5 0 0 0-9.599-1.959c-.148-.042-.297-.077-.445-.115.027-.211.064-.42.064-.639a5 5 0 0 0-5-5 5 5 0 0 0-5 5c0 .219.037.428.064.639-.148.038-.297.073-.445.115a4.998 4.998 0 0 0-9.599 1.959c0 1.125.384 2.151 1.011 2.987-3.717 3.632-6.031 8.693-6.031 14.3 0 11.046 8.954 20 20 20 9.339 0 17.16-6.41 19.361-15.064.211.027.42.064.639.064a5 5 0 0 0 5-5 5 5 0 0 0-5-5" fill="#44D860"/><path fill="#3ECC5F" d="M83 123h40v-20H83z"/><path d="M133 115.5a2.5 2.5 0 1 0 0-5c-.109 0-.214.019-.319.032-.02-.075-.037-.15-.058-.225a2.501 2.501 0 0 0-.963-4.807c-.569 0-1.088.197-1.508.518a6.653 6.653 0 0 0-.168-.168c.314-.417.506-.931.506-1.494a2.5 2.5 0 0 0-4.8-.979A9.987 9.987 0 0 0 123 103c-5.522 0-10 4.478-10 10s4.478 10 10 10c.934 0 1.833-.138 2.69-.377a2.5 2.5 0 0 0 4.8-.979c0-.563-.192-1.077-.506-1.494.057-.055.113-.111.168-.168.42.321.939.518 1.508.518a2.5 2.5 0 0 0 .963-4.807c.021-.074.038-.15.058-.225.105.013.21.032.319.032" fill="#44D860"/><path d="M143 41.75c-.16 0-.33-.02-.49-.05a2.52 2.52 0 0 1-.47-.14c-.15-.06-.29-.14-.431-.23-.13-.09-.259-.2-.38-.31-.109-.12-.219-.24-.309-.38s-.17-.28-.231-.43a2.619 2.619 0 0 1-.189-.96c0-.16.02-.33.05-.49.03-.16.08-.31.139-.47.061-.15.141-.29.231-.43.09-.13.2-.26.309-.38.121-.11.25-.22.38-.31.141-.09.281-.17.431-.23.149-.06.31-.11.47-.14.32-.07.65-.07.98 0 .159.03.32.08.47.14.149.06.29.14.43.23.13.09.259.2.38.31.11.12.22.25.31.38.09.14.17.28.23.43.06.16.11.31.14.47.029.16.05.33.05.49 0 .66-.271 1.31-.73 1.77-.121.11-.25.22-.38.31-.14.09-.281.17-.43.23a2.565 2.565 0 0 1-.96.19m20-1.25c-.66 0-1.3-.27-1.771-.73a3.802 3.802 0 0 1-.309-.38c-.09-.14-.17-.28-.231-.43a2.619 2.619 0 0 1-.189-.96c0-.66.27-1.3.729-1.77.121-.11.25-.22.38-.31.141-.09.281-.17.431-.23.149-.06.31-.11.47-.14.32-.07.66-.07.98 0 .159.03.32.08.47.14.149.06.29.14.43.23.13.09.259.2.38.31.459.47.73 1.11.73 1.77 0 .16-.021.33-.05.49-.03.16-.08.32-.14.47-.07.15-.14.29-.23.43-.09.13-.2.26-.31.38-.121.11-.25.22-.38.31-.14.09-.281.17-.43.23a2.565 2.565 0 0 1-.96.19" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/website/static/img/multi-cluster.svg b/website/static/img/multi-cluster.svg
new file mode 100644
index 0000000000..ad663a1212
--- /dev/null
+++ b/website/static/img/multi-cluster.svg
@@ -0,0 +1,3 @@
+<svg id="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><defs><style></style></defs>
+<path fill="#626262" d="M26,22a3.86,3.86,0,0,0-2,.57l-3.09-3.1a6,6,0,0,0,0-6.94L24,9.43A3.86,3.86,0,0,0,26,10a4,4,0,1,0-4-4,3.86,3.86,0,0,0,.57,2l-3.1,3.09a6,6,0,0,0-6.94,0L9.43,8A3.86,3.86,0,0,0,10,6a4,4,0,1,0-4,4,3.86,3.86,0,0,0,2-.57l3.09,3.1a6,6,0,0,0,0,6.94L8,22.57A3.86,3.86,0,0,0,6,22a4,4,0,1,0,4,4,3.86,3.86,0,0,0-.57-2l3.1-3.09a6,6,0,0,0,6.94,0L22.57,24A3.86,3.86,0,0,0,22,26a4,4,0,1,0,4-4ZM16,20a4,4,0,1,1,4-4A4,4,0,0,1,16,20Z"/>
+</svg>
\ No newline at end of file
diff --git a/website/static/img/open-source.svg b/website/static/img/open-source.svg
new file mode 100644
index 0000000000..c40cc14486
--- /dev/null
+++ b/website/static/img/open-source.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" focusable="false" width="1em" height="1em" style="-ms-transform: rotate(360deg); -webkit-transform: rotate(360deg); transform: rotate(360deg);" preserveAspectRatio="xMidYMid meet" viewBox="0 0 32 32"><path d="M23.5 4h-15l-6.784 9.045L16 29.527l14.284-16.482zm3.5 8h-5.446l-3.75-6H22.5zm-16.698 2l3.754 10.23L5.19 14zm2.13 0h7.136l-3.569 9.721zm.373-2L16 6.887L19.196 12zm8.893 2h5.112l-8.867 10.231zM9.5 6h4.696l-3.75 6H5z" fill="#626262"/></svg>
\ No newline at end of file
diff --git a/website/static/img/screens/cf-app.png b/website/static/img/screens/cf-app.png
new file mode 100644
index 0000000000000000000000000000000000000000..447fdada88c8af307db397593a2ddc8efccba89e
GIT binary patch
literal 67519
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
b9~%n~kqX>^HtwbUbp@&^X`v+w7J>g4)z<77

literal 0
HcmV?d00001

diff --git a/website/static/img/screens/endpoints.png b/website/static/img/screens/endpoints.png
new file mode 100644
index 0000000000000000000000000000000000000000..5abf20fc94f847a8235076af7807fd31d98ff082
GIT binary patch
literal 33521
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
RY9QcGSwUUCRL<nl{{n}{@l5~#

literal 0
HcmV?d00001

diff --git a/website/static/img/screens/kube-graph.png b/website/static/img/screens/kube-graph.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d0ad09bde9eb739d53bb4563b9d8abb7b5f2176
GIT binary patch
literal 63442
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
Ls$X!#KIDG^g_rTu

literal 0
HcmV?d00001


From 3502fb5c305d68b13e2891e83beb4812e11119fe Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Tue, 25 Aug 2020 11:10:32 +0100
Subject: [PATCH 597/648] Update kube pod container component following ux
 review (#441)

* Update kube pod container component following ux review

* Changes following review
- smaller icon
- re-add container probes
---
 .../kubernetes-pod-containers.component.html  |  47 ++++-
 .../kubernetes-pod-containers.component.scss  |  61 +++++-
 .../kubernetes-pod-containers.component.ts    | 178 ++++++------------
 3 files changed, 154 insertions(+), 132 deletions(-)

diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html
index 3eab146d85..6d265bc99c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html
@@ -1,4 +1,45 @@
-<div class="pod-containers">
-  <app-table [dataSource]="containerDataSource" [columns]="columns" [inExpandedRow]="true">
-  </app-table>
+<div *ngIf="containers$ | async as containers" class="pod-containers">
+  <div *ngFor="let container of containers" class="pod-containers__container">
+    <div class="pod-containers__container__icon">
+      <mat-icon *ngIf="icon[container.isInit] as iconDetail" class="" [fontSet]="iconDetail.font"
+        [ngClass]="{'container-icon': iconDetail.icon === 'container'}" [matTooltip]="iconDetail.tooltip">
+        {{ iconDetail.icon }}</mat-icon>
+    </div>
+    <div class="pod-containers__container__details">
+      <div class="pod-containers__container__details--header">
+        <app-boolean-indicator [isTrue]="container.containerStatus.ready" type="yes-no" [subtle]="false"
+          [showText]="false">
+        </app-boolean-indicator>
+        <span>
+          {{container.container.name}}
+        </span>
+      </div>
+      <div class="pod-containers__container__details--content">
+        <div>
+          <span>
+            Image:
+          </span>
+          <span>
+            {{container.container.image}}
+          </span>
+        </div>
+        <div>
+          <span>
+            State:
+          </span>
+          <span>
+            {{container.status}}
+          </span>
+        </div>
+        <div *ngIf="!container.isInit">
+          <span>
+            Probes (L:R):
+          </span>
+          <span>
+            {{container.container.livenessProbe ? 'on' : 'off'}}:{{container.container.readinessProbe ? 'on' : 'off'}}
+          </span>
+        </div>
+      </div>
+    </div>
+  </div>
 </div>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss
index e6fc2cb39b..d6f9565d71 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss
@@ -1,8 +1,61 @@
+$detail-padding: 28px;
+
 .pod-containers {
   display: flex;
-  app-table {
-    flex: 1;
-    padding-bottom: 10px;
-    padding-left: 57px;
+  flex-direction: column;
+  padding-left: 54px;
+  &__container {
+    display: flex;
+    flex-direction: row;
+    height: 100px;
+    &__icon {
+      align-items: center;
+      display: flex;
+      height: 60px;
+      width: 50px;
+      mat-icon {
+        font-size: 35px;
+        height: 35px;
+        width: 35px;
+      }
+      .container-icon {
+        padding-left: 4px;
+      }
+    }
+
+    &__details {
+      display: flex;
+      flex-direction: column;
+      min-width: 75%;
+
+      &--header {
+        display: flex;
+        flex-direction: row;
+        font-size: 15px;
+        font-weight: 500;
+        margin-top: 10px;
+        app-boolean-indicator {
+          width: $detail-padding;
+        }
+      }
+      &--content {
+        font-size: 13px;
+        margin-left: $detail-padding;
+        padding-bottom: 10px;
+        & > div {
+          display: flex;
+          flex-direction: row;
+        }
+        span:first-of-type {
+          min-width: 90px;
+        }
+      }
+    }
+
+    &:not(:last-of-type) {
+      .pod-containers__container__details {
+        border-bottom: 2px solid rgba(0, 0, 0, .1);
+      }
+    }
   }
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts
index d5b4702542..f01ff1652c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts
@@ -1,24 +1,15 @@
 import { TitleCasePipe } from '@angular/common';
 import { Component, Input } from '@angular/core';
 import * as moment from 'moment';
-import { of } from 'rxjs';
+import { Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
 import {
   BooleanIndicatorType,
 } from '../../../../../../../core/src/shared/components/boolean-indicator/boolean-indicator.component';
 import {
-  ITableListDataSource,
-} from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
-import {
-  TableCellBooleanIndicatorComponent,
   TableCellBooleanIndicatorComponentConfig,
 } from '../../../../../../../core/src/shared/components/list/list-table/table-cell-boolean-indicator/table-cell-boolean-indicator.component';
-import {
-  TableCellIconComponent,
-  TableCellIconComponentConfig,
-} from '../../../../../../../core/src/shared/components/list/list-table/table-cell-icon/table-cell-icon.component';
-import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
 import { CardCell } from '../../../../../../../core/src/shared/components/list/list.types';
 import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog';
 import { Container, ContainerState, ContainerStatus, InitContainer, KubernetesPod } from '../../../store/kube.types';
@@ -27,6 +18,7 @@ export interface ContainerForTable {
   isInit: boolean;
   container: Container | InitContainer;
   containerStatus: ContainerStatus;
+  status: string;
 }
 
 @Component({
@@ -39,21 +31,30 @@ export interface ContainerForTable {
 })
 export class KubernetesPodContainersComponent extends CardCell<KubernetesPod> {
 
+  public containers$: Observable<ContainerForTable[]>;
+  public icon = {
+    false: {
+      icon: 'container',
+      font: 'stratos-icons',
+      tooltip: 'Container'
+    },
+    true: {
+      icon: 'border_clear',
+      font: '',
+      tooltip: 'Init Container'
+    }
+  };
+
   @Input()
   set row(row: KubernetesPod) {
-    if (!row || !!this.containerDataSource) {
+    if (!row || !!this.containers$) {
       return;
     }
     const id = kubeEntityCatalog.pod.getSchema().getId(row);
-    this.containerDataSource = {
-      isTableLoading$: of(false),
-      connect: () => kubeEntityCatalog.pod.store.getEntityMonitor(id).entity$.pipe(
-        filter(pod => !!pod),
-        map(pod => this.map(pod)),
-      ),
-      disconnect: () => { },
-      trackBy: (index, container: ContainerForTable) => container.container.name,
-    };
+    this.containers$ = kubeEntityCatalog.pod.store.getEntityMonitor(id).entity$.pipe(
+      filter(pod => !!pod),
+      map(pod => this.map(pod)),
+    );
   }
 
   constructor(
@@ -62,106 +63,24 @@ export class KubernetesPodContainersComponent extends CardCell<KubernetesPod> {
     super();
   }
 
-  private readyBoolConfig: TableCellBooleanIndicatorComponentConfig<ContainerForTable> = {
-    isEnabled: (row: ContainerForTable) => row.containerStatus.ready,
-    type: BooleanIndicatorType.yesNo,
-    subtle: false,
-    showText: false
-  };
-
-  private iconConfig: TableCellIconComponentConfig<ContainerForTable> = {
-    getIcon: (row: ContainerForTable) => row.isInit ?
-      {
-        icon: 'border_clear',
-        font: '',
-        tooltip: 'Init Container'
-      } : {
-        icon: 'border_outer',
-        font: '',
-        tooltip: 'Container'
-      },
-  };
-
-  public containerDataSource: ITableListDataSource<ContainerForTable>;
-  public columns: ITableColumn<ContainerForTable>[] = [
-    {
-      columnId: 'icon',
-      headerCell: () => '',
-      cellComponent: TableCellIconComponent,
-      cellConfig: this.iconConfig,
-      cellFlex: '0 0 53px',
-    },
-    {
-      columnId: 'name',
-      headerCell: () => 'Container Name',
-      cellDefinition: {
-        valuePath: 'container.name'
-      },
-      cellFlex: '2',
-    },
-    {
-      columnId: 'image',
-      headerCell: () => 'Image',
-      cellDefinition: {
-        valuePath: 'container.image'
-      },
-      cellFlex: '3',
-    },
-    {
-      columnId: 'ready',
-      headerCell: () => 'Ready',
-      cellComponent: TableCellBooleanIndicatorComponent,
-      cellConfig: this.readyBoolConfig,
-      cellFlex: '1',
-    },
-    {
-      columnId: 'status',
-      headerCell: () => 'State',
-      cellDefinition: {
-        getValue: cft => {
-          if (!cft.containerStatus.state) {
-            return 'Unknown';
-          }
-          const entries = Object.entries(cft.containerStatus.state);
-          if (!entries.length) {
-            return 'Unknown';
-          }
-          const sorted = entries.sort((a, b) => {
-            const aStarted = moment(a[1].startedAt);
-            const bStarted = moment(b[1].startedAt);
+  private getState(containerStatus: ContainerStatus) {
+    if (!containerStatus.state) {
+      return 'Unknown';
+    }
+    const entries = Object.entries(containerStatus.state);
+    if (!entries.length) {
+      return 'Unknown';
+    }
+    const sorted = entries.sort((a, b) => {
+      const aStarted = moment(a[1].startedAt);
+      const bStarted = moment(b[1].startedAt);
 
-            return aStarted.isBefore(bStarted) ? -1 :
-              aStarted.isAfter(bStarted) ? 1 : 0;
+      return aStarted.isBefore(bStarted) ? -1 :
+        aStarted.isAfter(bStarted) ? 1 : 0;
 
-          });
-          return this.containerStatusToString(sorted[0][0], sorted[0][1]);
-        }
-      },
-      cellFlex: '2'
-    },
-    {
-      columnId: 'restarts',
-      headerCell: () => 'Restarts',
-      cellDefinition: {
-        getValue: cft => cft.containerStatus.restartCount.toString()
-      },
-      cellFlex: '1',
-    },
-    {
-      columnId: 'probes',
-      headerCell: () => 'Probes (L:R)',
-      cellDefinition: {
-        getValue: cft => {
-          if (cft.isInit) {
-            return '';
-          }
-          const container: Container = cft.container as Container;
-          return cft.isInit ? '' : `${container.livenessProbe ? 'on' : 'off'}:${container.readinessProbe ? 'on' : 'off'}`;
-        }
-      },
-      cellFlex: '1',
-    },
-  ];
+    });
+    return this.containerStatusToString(sorted[0][0], sorted[0][1]);
+  }
 
   private map(row: KubernetesPod): ContainerForTable[] {
     const containerStatus = row.status.containerStatuses || [];
@@ -173,20 +92,29 @@ export class KubernetesPodContainersComponent extends CardCell<KubernetesPod> {
     return containerStatusWithContainers.sort((a, b) => a.container.name.localeCompare(b.container.name));
   }
 
+  public readyBoolConfig: TableCellBooleanIndicatorComponentConfig<ContainerForTable> = {
+    isEnabled: (row: ContainerForTable) => row.containerStatus.ready,
+    type: BooleanIndicatorType.yesNo,
+    subtle: false,
+    showText: false
+  };
+
+  private containerStatusToString(state: string, status: ContainerState): string {
+    const exitCode = status.exitCode ? `:${status.exitCode}` : '';
+    const signal = status.signal ? `:${status.signal}` : '';
+    const reason = status.reason ? ` (${status.reason}${exitCode || signal})` : '';
+    return `${this.titleCase.transform(state)}${reason}`;
+  }
+
   private createContainerForTable(containerStatus: ContainerStatus, containers: (Container | InitContainer)[], isInit = false):
     ContainerForTable {
     const containerForTable: ContainerForTable = {
       isInit,
       containerStatus,
-      container: containers.find(c => c.name === containerStatus.name)
+      container: containers.find(c => c.name === containerStatus.name),
+      status: this.getState(containerStatus)
     };
     return containerForTable;
   }
 
-  private containerStatusToString(state: string, status: ContainerState): string {
-    const exitCode = status.exitCode ? `:${status.exitCode}` : '';
-    const signal = status.signal ? `:${status.signal}` : '';
-    const reason = status.reason ? ` (${status.reason}${exitCode || signal})` : '';
-    return `${this.titleCase.transform(state)}${reason}`;
-  }
 }

From d2d2223f6d385b7160361ace370c11e7382b673a Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Wed, 26 Aug 2020 15:15:00 +0100
Subject: [PATCH 598/648] Helm: Fix upgrade bug (#457)

* Fix upgrade bug

* Fix unit tests
---
 .../console/templates/deployment.yaml           | 17 +++++++++++------
 .../console/tests/custom_annotations_test.yaml  | 14 ++++++++------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 6fd4fd2985..2cd00464d0 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -4,12 +4,13 @@ apiVersion: apps/v1
 {{- else }}
 apiVersion: apps/v1beta1
 {{- end }}
-kind: StatefulSet
+kind: Deployment
 metadata:
   name: stratos
-{{- if .Values.console.statefulSetAnnotations }}
+{{- if .Values.console.deploymentAnnotations }}
   annotations:
-{{ toYaml .Values.console.statefulSetAnnotations | indent 4 }}
+    checksum/config: {{ default (randAlphaNum 5 | quote) .Values.console.checksum }}
+{{ toYaml .Values.console.deploymentAnnotations | indent 4 }}
 {{- end }}
   labels:
     app.kubernetes.io/name: "stratos"
@@ -19,12 +20,16 @@ metadata:
     helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     app: "{{ .Release.Name }}"
     component: stratos
-{{- if .Values.console.statefulSetExtraLabels }}
-{{ toYaml .Values.console.statefulSetExtraLabels | indent 4 }}
+{{- if .Values.console.deploymentExtraLabels }}
+{{ toYaml .Values.console.deploymentExtraLabels | indent 4 }}
 {{- end }}
 spec:
-  serviceName: stratos
   replicas: 1
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 0
+      maxUnavailable: 1  
   selector:
     matchLabels:
       app.kubernetes.io/name: "stratos"
diff --git a/deploy/kubernetes/console/tests/custom_annotations_test.yaml b/deploy/kubernetes/console/tests/custom_annotations_test.yaml
index 39a06a3787..451ffcd8c0 100644
--- a/deploy/kubernetes/console/tests/custom_annotations_test.yaml
+++ b/deploy/kubernetes/console/tests/custom_annotations_test.yaml
@@ -67,28 +67,30 @@ tests:
           value: r23453463456
         template: database.yaml
                                                                 
-# Stateful set
+# Stratos Deployment
 
-  - it: statefulset should not have annotaions unless configured
+  - it: stratos deploymentment should not have annotaions unless configured
     asserts:
       - isNull:
           path: metadata.annotations
         template: deployment.yaml
   - it: statefulset should support custom annotations
     set:
-      console.statefulSetAnnotations:
+      console.checksum: checksum-test
+      console.deploymentAnnotations:
         test-annotation: 172623
         test-annotation2: r23453463456
     asserts:
       - equal:
           path: metadata.annotations
           value:
+            checksum/config: checksum-test        
             test-annotation: 172623
             test-annotation2: r23453463456
         template: deployment.yaml
-  - it: statefulset should support custom labels
+  - it: stratos deploymentment should support custom labels
     set:
-      console.statefulSetExtraLabels:
+      console.deploymentExtraLabels:
         test-label: 172623
         test-label2: r23453463456
     asserts:
@@ -99,7 +101,7 @@ tests:
           path: metadata.labels.test-label2
           value: r23453463456
         template: deployment.yaml
-  - it: statefulset should support custom labels and annotations on its pods
+  - it: stratos deploymentment should support custom labels and annotations on its pods
     set:
       console.podExtraLabels:
         test-label: 172623

From 0254f0af16b2f4f39d42686b575e29c535676f87 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Thu, 27 Aug 2020 15:32:55 +0100
Subject: [PATCH 599/648] Update login screen to latest design (#449)

* Updated SUSE login screen

* Remove unused logos

* Addressed PR feedback

* Improvements to the SSO login page
---
 .../assets/custom/login/sign-in-bg.svg        |   1 +
 .../assets/custom/login/sign-in-line.svg      |   1 +
 .../assets/custom/login/sign-in-lock-1.svg    |   1 +
 .../assets/custom/login/suse-logo-dark.svg    |   1 +
 .../assets/custom/login/suse-logo-light.svg   |   1 +
 .../assets/custom/suse_login_logo.svg         |  10 -
 .../assets/custom/suse_logo.svg               |  10 -
 .../assets/suse_login_logo.svg                |  10 -
 .../suse-login/suse-login.component.html      |  85 ++++----
 .../suse-login/suse-login.component.scss      | 189 +++++++++++++-----
 10 files changed, 196 insertions(+), 113 deletions(-)
 create mode 100644 src/frontend/packages/suse-extensions/assets/custom/login/sign-in-bg.svg
 create mode 100644 src/frontend/packages/suse-extensions/assets/custom/login/sign-in-line.svg
 create mode 100644 src/frontend/packages/suse-extensions/assets/custom/login/sign-in-lock-1.svg
 create mode 100644 src/frontend/packages/suse-extensions/assets/custom/login/suse-logo-dark.svg
 create mode 100644 src/frontend/packages/suse-extensions/assets/custom/login/suse-logo-light.svg
 delete mode 100644 src/frontend/packages/suse-extensions/assets/custom/suse_login_logo.svg
 delete mode 100644 src/frontend/packages/suse-extensions/assets/custom/suse_logo.svg
 delete mode 100644 src/frontend/packages/suse-extensions/assets/suse_login_logo.svg

diff --git a/src/frontend/packages/suse-extensions/assets/custom/login/sign-in-bg.svg b/src/frontend/packages/suse-extensions/assets/custom/login/sign-in-bg.svg
new file mode 100644
index 0000000000..f868cfa9b9
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/assets/custom/login/sign-in-bg.svg
@@ -0,0 +1 @@
+<svg data-name="BG 1900" xmlns="http://www.w3.org/2000/svg" width="1900" height="768"><defs><clipPath id="a"><path data-name="Rectangle 2066" fill="#fff" stroke="#707070" d="M0 0h1900v768H0z"/></clipPath><clipPath id="b"><path data-name="Rectangle 2019" transform="translate(556.592 1945.341)" fill="none" d="M0 0h302.951v793H0z"/></clipPath></defs><g data-name="Mask Group 8"><g data-name="BG 1900" clip-path="url(#a)"><path data-name="Rectangle 1700" fill="#7ad4aa" d="M0 0h1900v768H0z"/><g data-name="Group 323" fill="none" stroke-miterlimit="10"><path data-name="Path 364" d="M728.929 357h208.236A28.835 28.835 0 00966 328.165v-431.33A28.835 28.835 0 01994.835-132H1211" stroke="#000" stroke-linecap="round" stroke-width="3" stroke-dasharray="0 8"/><path data-name="Path 365" d="M-146 174h450.165A28.835 28.835 0 01333 202.835v125.33A28.835 28.835 0 00361.835 357H579" stroke="#0c322c" stroke-width="2"/></g><g data-name="Group 325" transform="translate(1099 -316)"><path data-name="Path 364" d="M692.929 700h208.236A28.835 28.835 0 00930 671.165v-431.33A28.835 28.835 0 01958.835 211H1175" fill="none" stroke="#0c322c" stroke-linecap="round" stroke-miterlimit="10" stroke-width="4" stroke-dasharray="0 8"/><path data-name="Path 365" d="M-36 517h450.165A28.835 28.835 0 01443 545.835v125.33A28.835 28.835 0 00471.835 700H689" fill="none" stroke="#0c322c" stroke-miterlimit="10" stroke-width="2"/><circle data-name="Ellipse 860" cx="9" cy="9" r="9" transform="translate(680 691)" fill="#ff6a52"/></g><g data-name="Group 326"><path data-name="Path 364" d="M1446.929 1048h208.236a28.835 28.835 0 0028.835-28.835v-431.33A28.835 28.835 0 011712.835 559H1929" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="3" stroke-dasharray="0 8"/></g><g data-name="Group 805"><g data-name="Group 804"><g data-name="Group 803" clip-path="url(#b)" transform="translate(-679.592 -1963.341)"><g data-name="Group 767"><path data-name="Rectangle 1983" fill="none" d="M785 1864.8h103.6v103.6H785z"/><circle data-name="Ellipse 4279" cx="2.8" cy="2.8" r="2.8" transform="translate(795 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4280" cx="2.8" cy="2.8" r="2.8" transform="translate(821 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4281" cx="2.8" cy="2.8" r="2.8" transform="translate(847 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4282" cx="2.8" cy="2.8" r="2.8" transform="translate(873 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4283" cx="2.8" cy="2.8" r="2.8" transform="translate(795 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4284" cx="2.8" cy="2.8" r="2.8" transform="translate(821 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4285" cx="2.8" cy="2.8" r="2.8" transform="translate(847 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4286" cx="2.8" cy="2.8" r="2.8" transform="translate(873 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4287" cx="2.8" cy="2.8" r="2.8" transform="translate(795 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4288" cx="2.8" cy="2.8" r="2.8" transform="translate(821 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4289" cx="2.8" cy="2.8" r="2.8" transform="translate(847 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4290" cx="2.8" cy="2.8" r="2.8" transform="translate(873 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4291" cx="2.8" cy="2.8" r="2.8" transform="translate(795 1952.8)" fill="#30ba78"/><circle data-name="Ellipse 4292" cx="2.8" cy="2.8" r="2.8" transform="translate(821 1952.8)" fill="#30ba78"/><circle data-name="Ellipse 4293" cx="2.8" cy="2.8" r="2.8" transform="translate(847 1952.8)" fill="#30ba78"/><circle data-name="Ellipse 4294" cx="2.8" cy="2.8" r="2.8" transform="translate(873 1952.8)" fill="#30ba78"/></g><g data-name="Group 768"><path data-name="Rectangle 1984" fill="none" d="M785 1968.4h103.6V2072H785z"/><circle data-name="Ellipse 4295" cx="2.8" cy="2.8" r="2.8" transform="translate(795 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4296" cx="2.8" cy="2.8" r="2.8" transform="translate(821 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4297" cx="2.8" cy="2.8" r="2.8" transform="translate(847 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4298" cx="2.8" cy="2.8" r="2.8" transform="translate(873 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4299" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4300" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4301" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4302" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4303" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4304" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4305" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4306" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4307" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2056.4)" fill="#30ba78"/><circle data-name="Ellipse 4308" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2056.4)" fill="#30ba78"/><circle data-name="Ellipse 4309" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2056.4)" fill="#30ba78"/><circle data-name="Ellipse 4310" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2056.4)" fill="#30ba78"/></g><g data-name="Group 769"><path data-name="Rectangle 1985" fill="none" d="M785 2072h103.6v103.6H785z"/><circle data-name="Ellipse 4311" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2082)" fill="#30ba78"/><circle data-name="Ellipse 4312" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2082)" fill="#30ba78"/><circle data-name="Ellipse 4313" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2082)" fill="#30ba78"/><circle data-name="Ellipse 4314" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2082)" fill="#30ba78"/><circle data-name="Ellipse 4315" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2108)" fill="#30ba78"/><circle data-name="Ellipse 4316" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2108)" fill="#30ba78"/><circle data-name="Ellipse 4317" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2108)" fill="#30ba78"/><circle data-name="Ellipse 4318" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2108)" fill="#30ba78"/><circle data-name="Ellipse 4322" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2134)" fill="#30ba78"/><circle data-name="Ellipse 4323" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2160)" fill="#30ba78"/><circle data-name="Ellipse 4324" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2160)" fill="#30ba78"/><circle data-name="Ellipse 4325" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2160)" fill="#30ba78"/><circle data-name="Ellipse 4326" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2160)" fill="#30ba78"/></g><g data-name="Group 770"><path data-name="Rectangle 1986" fill="none" d="M785 2175.6h103.6v103.6H785z"/><circle data-name="Ellipse 4327" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4328" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4329" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4330" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4331" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4332" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4333" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4334" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4335" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4336" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4337" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4338" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4339" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2263.6)" fill="#30ba78"/><circle data-name="Ellipse 4340" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2263.6)" fill="#30ba78"/><circle data-name="Ellipse 4341" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2263.6)" fill="#30ba78"/><circle data-name="Ellipse 4342" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2263.6)" fill="#30ba78"/></g><g data-name="Group 771"><path data-name="Rectangle 1987" fill="none" d="M785 2279.2h103.6v103.6H785z"/><circle data-name="Ellipse 4343" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4344" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4345" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4346" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4347" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4348" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4349" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4350" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4351" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4352" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4353" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4354" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4355" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2367.2)" fill="#30ba78"/><circle data-name="Ellipse 4356" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2367.2)" fill="#30ba78"/><circle data-name="Ellipse 4357" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2367.2)" fill="#30ba78"/><circle data-name="Ellipse 4358" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2367.2)" fill="#30ba78"/></g><g data-name="Group 772"><path data-name="Rectangle 1988" fill="none" d="M785 2382.8h103.6v103.6H785z"/><circle data-name="Ellipse 4359" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4360" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4361" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4362" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4363" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4364" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4365" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4366" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4367" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4368" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4369" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4370" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4371" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2470.8)" fill="#30ba78"/><circle data-name="Ellipse 4372" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2470.8)" fill="#30ba78"/><circle data-name="Ellipse 4373" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2470.8)" fill="#30ba78"/><circle data-name="Ellipse 4374" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2470.8)" fill="#30ba78"/></g><g data-name="Group 773"><path data-name="Rectangle 1989" fill="none" d="M785 2486.4h103.6V2590H785z"/><circle data-name="Ellipse 4375" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4376" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4377" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4378" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4379" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4380" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4381" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4382" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4383" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4384" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4385" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4386" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4387" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2574.4)" fill="#30ba78"/><circle data-name="Ellipse 4388" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2574.4)" fill="#30ba78"/><circle data-name="Ellipse 4389" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2574.4)" fill="#30ba78"/><circle data-name="Ellipse 4390" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2574.4)" fill="#30ba78"/></g><g data-name="Group 774"><path data-name="Rectangle 1990" fill="none" d="M785 2590h103.6v103.6H785z"/><circle data-name="Ellipse 4391" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2600)" fill="#30ba78"/><circle data-name="Ellipse 4392" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2600)" fill="#30ba78"/><circle data-name="Ellipse 4393" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2600)" fill="#30ba78"/><circle data-name="Ellipse 4394" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2600)" fill="#30ba78"/><circle data-name="Ellipse 4395" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2626)" fill="#30ba78"/><circle data-name="Ellipse 4396" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2626)" fill="#30ba78"/><circle data-name="Ellipse 4397" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2626)" fill="#30ba78"/><circle data-name="Ellipse 4398" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2626)" fill="#30ba78"/><circle data-name="Ellipse 4399" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2652)" fill="#30ba78"/><circle data-name="Ellipse 4400" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2652)" fill="#30ba78"/><circle data-name="Ellipse 4401" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2652)" fill="#30ba78"/><circle data-name="Ellipse 4402" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2652)" fill="#30ba78"/><circle data-name="Ellipse 4403" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2678)" fill="#30ba78"/><circle data-name="Ellipse 4404" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2678)" fill="#30ba78"/><circle data-name="Ellipse 4405" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2678)" fill="#30ba78"/><circle data-name="Ellipse 4406" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2678)" fill="#30ba78"/></g><g data-name="Group 775"><path data-name="Rectangle 1991" fill="none" d="M785 2693.6h103.6v103.6H785z"/><circle data-name="Ellipse 4407" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4408" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4409" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4410" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4411" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4412" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4413" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4414" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4415" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4416" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4417" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4418" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4419" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2781.6)" fill="#30ba78"/><circle data-name="Ellipse 4420" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2781.6)" fill="#30ba78"/><circle data-name="Ellipse 4421" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2781.6)" fill="#30ba78"/><circle data-name="Ellipse 4422" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2781.6)" fill="#30ba78"/></g><g data-name="Group 776"><path data-name="Rectangle 1992" fill="none" d="M681.4 1864.8H785v103.6H681.4z"/><circle data-name="Ellipse 4423" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4424" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4425" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4426" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4427" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4428" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4429" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4430" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4431" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4432" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4433" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4434" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4435" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 1952.8)" fill="#30ba78"/><circle data-name="Ellipse 4436" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 1952.8)" fill="#30ba78"/><circle data-name="Ellipse 4437" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 1952.8)" fill="#30ba78"/><circle data-name="Ellipse 4438" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 1952.8)" fill="#30ba78"/></g><g data-name="Group 777"><path data-name="Rectangle 1993" fill="none" d="M681.4 1968.4H785V2072H681.4z"/><circle data-name="Ellipse 4439" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4440" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4441" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4442" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4443" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4444" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4445" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4446" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4447" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4448" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4449" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4450" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4451" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2056.4)" fill="#30ba78"/><circle data-name="Ellipse 4452" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2056.4)" fill="#30ba78"/><circle data-name="Ellipse 4453" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2056.4)" fill="#30ba78"/><circle data-name="Ellipse 4454" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2056.4)" fill="#30ba78"/></g><g data-name="Group 778"><path data-name="Rectangle 1994" fill="none" d="M681.4 2072H785v103.6H681.4z"/><circle data-name="Ellipse 4455" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2082)" fill="#30ba78"/><circle data-name="Ellipse 4456" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2082)" fill="#30ba78"/><circle data-name="Ellipse 4457" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2082)" fill="#30ba78"/><circle data-name="Ellipse 4458" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2082)" fill="#30ba78"/><circle data-name="Ellipse 4459" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2108)" fill="#30ba78"/><circle data-name="Ellipse 4460" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2108)" fill="#30ba78"/><circle data-name="Ellipse 4461" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2108)" fill="#30ba78"/><circle data-name="Ellipse 4462" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2108)" fill="#30ba78"/><circle data-name="Ellipse 4467" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2160)" fill="#30ba78"/><circle data-name="Ellipse 4468" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2160)" fill="#30ba78"/><circle data-name="Ellipse 4469" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2160)" fill="#30ba78"/><circle data-name="Ellipse 4470" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2160)" fill="#30ba78"/></g><g data-name="Group 779"><path data-name="Rectangle 1995" fill="none" d="M681.4 2175.6H785v103.6H681.4z"/><circle data-name="Ellipse 4471" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4472" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4473" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4474" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4475" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4476" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4477" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4478" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4479" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4480" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4481" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4482" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4483" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2263.6)" fill="#30ba78"/><circle data-name="Ellipse 4484" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2263.6)" fill="#30ba78"/><circle data-name="Ellipse 4485" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2263.6)" fill="#30ba78"/><circle data-name="Ellipse 4486" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2263.6)" fill="#30ba78"/></g><g data-name="Group 780"><path data-name="Rectangle 1996" fill="none" d="M681.4 2279.2H785v103.6H681.4z"/><circle data-name="Ellipse 4487" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4488" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4489" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4490" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4491" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4492" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4493" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4494" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4495" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4496" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4497" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4498" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4499" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2367.2)" fill="#30ba78"/><circle data-name="Ellipse 4500" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2367.2)" fill="#30ba78"/><circle data-name="Ellipse 4501" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2367.2)" fill="#30ba78"/><circle data-name="Ellipse 4502" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2367.2)" fill="#30ba78"/></g><g data-name="Group 781"><path data-name="Rectangle 1997" fill="none" d="M681.4 2382.8H785v103.6H681.4z"/><circle data-name="Ellipse 4503" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4504" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4505" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4506" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4507" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4508" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4509" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4510" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4511" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4512" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4513" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4514" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4515" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2470.8)" fill="#30ba78"/><circle data-name="Ellipse 4516" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2470.8)" fill="#30ba78"/><circle data-name="Ellipse 4517" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2470.8)" fill="#30ba78"/><circle data-name="Ellipse 4518" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2470.8)" fill="#30ba78"/></g><g data-name="Group 782"><path data-name="Rectangle 1998" fill="none" d="M681.4 2486.4H785V2590H681.4z"/><circle data-name="Ellipse 4519" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4520" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4521" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4522" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4523" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4524" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4525" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4526" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4527" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4528" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4529" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4530" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4531" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2574.4)" fill="#30ba78"/><circle data-name="Ellipse 4532" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2574.4)" fill="#30ba78"/><circle data-name="Ellipse 4533" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2574.4)" fill="#30ba78"/><circle data-name="Ellipse 4534" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2574.4)" fill="#30ba78"/></g><g data-name="Group 783"><path data-name="Rectangle 1999" fill="none" d="M681.4 2590H785v103.6H681.4z"/><circle data-name="Ellipse 4535" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2600)" fill="#30ba78"/><circle data-name="Ellipse 4536" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2600)" fill="#30ba78"/><circle data-name="Ellipse 4537" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2600)" fill="#30ba78"/><circle data-name="Ellipse 4538" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2600)" fill="#30ba78"/><circle data-name="Ellipse 4539" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2626)" fill="#30ba78"/><circle data-name="Ellipse 4540" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2626)" fill="#30ba78"/><circle data-name="Ellipse 4541" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2626)" fill="#30ba78"/><circle data-name="Ellipse 4542" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2626)" fill="#30ba78"/><circle data-name="Ellipse 4543" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2652)" fill="#30ba78"/><circle data-name="Ellipse 4544" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2652)" fill="#30ba78"/><circle data-name="Ellipse 4545" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2652)" fill="#30ba78"/><circle data-name="Ellipse 4546" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2652)" fill="#30ba78"/><circle data-name="Ellipse 4547" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2678)" fill="#30ba78"/><circle data-name="Ellipse 4548" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2678)" fill="#30ba78"/><circle data-name="Ellipse 4549" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2678)" fill="#30ba78"/><circle data-name="Ellipse 4550" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2678)" fill="#30ba78"/></g><g data-name="Group 784"><path data-name="Rectangle 2000" fill="none" d="M681.4 2693.6H785v103.6H681.4z"/><circle data-name="Ellipse 4551" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4552" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4553" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4554" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4555" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4556" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4557" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4558" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4559" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4560" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4561" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4562" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4563" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2781.6)" fill="#30ba78"/><circle data-name="Ellipse 4564" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2781.6)" fill="#30ba78"/><circle data-name="Ellipse 4565" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2781.6)" fill="#30ba78"/><circle data-name="Ellipse 4566" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2781.6)" fill="#30ba78"/></g><g data-name="Group 785"><path data-name="Rectangle 2001" fill="none" d="M577.8 1864.8h103.6v103.6H577.8z"/><circle data-name="Ellipse 4567" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4568" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4569" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4570" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4571" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4572" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4573" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4574" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4575" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4576" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4577" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4578" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4579" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 1952.8)" fill="#30ba78"/><circle data-name="Ellipse 4580" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 1952.8)" fill="#30ba78"/><circle data-name="Ellipse 4581" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 1952.8)" fill="#30ba78"/><circle data-name="Ellipse 4582" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 1952.8)" fill="#30ba78"/></g><g data-name="Group 786"><path data-name="Rectangle 2002" fill="none" d="M577.8 1968.4h103.6V2072H577.8z"/><circle data-name="Ellipse 4583" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4584" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4585" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4586" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4587" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4588" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4589" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4590" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4591" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4592" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4593" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4594" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4595" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2056.4)" fill="#30ba78"/><circle data-name="Ellipse 4596" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2056.4)" fill="#30ba78"/><circle data-name="Ellipse 4597" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2056.4)" fill="#30ba78"/><circle data-name="Ellipse 4598" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2056.4)" fill="#30ba78"/></g><g data-name="Group 787"><path data-name="Rectangle 2003" fill="none" d="M577.8 2072h103.6v103.6H577.8z"/><circle data-name="Ellipse 4599" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2082)" fill="#30ba78"/><circle data-name="Ellipse 4600" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2082)" fill="#30ba78"/><circle data-name="Ellipse 4601" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2082)" fill="#30ba78"/><circle data-name="Ellipse 4602" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2082)" fill="#30ba78"/><circle data-name="Ellipse 4603" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2108)" fill="#30ba78"/><circle data-name="Ellipse 4604" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2108)" fill="#30ba78"/><circle data-name="Ellipse 4605" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2108)" fill="#30ba78"/><circle data-name="Ellipse 4606" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2108)" fill="#30ba78"/><circle data-name="Ellipse 4607" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2134)" fill="#30ba78"/><circle data-name="Ellipse 4608" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2134)" fill="#30ba78"/><circle data-name="Ellipse 4609" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2134)" fill="#30ba78"/><circle data-name="Ellipse 4610" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2134)" fill="#30ba78"/><circle data-name="Ellipse 4611" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2160)" fill="#30ba78"/><circle data-name="Ellipse 4612" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2160)" fill="#30ba78"/><circle data-name="Ellipse 4613" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2160)" fill="#30ba78"/><circle data-name="Ellipse 4614" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2160)" fill="#30ba78"/></g><g data-name="Group 788"><path data-name="Rectangle 2004" fill="none" d="M577.8 2175.6h103.6v103.6H577.8z"/><circle data-name="Ellipse 4615" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4616" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4617" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4618" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4619" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4620" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4621" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4622" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4623" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4624" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4625" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4626" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4627" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2263.6)" fill="#30ba78"/><circle data-name="Ellipse 4628" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2263.6)" fill="#30ba78"/><circle data-name="Ellipse 4629" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2263.6)" fill="#30ba78"/><circle data-name="Ellipse 4630" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2263.6)" fill="#30ba78"/></g><g data-name="Group 789"><path data-name="Rectangle 2005" fill="none" d="M577.8 2279.2h103.6v103.6H577.8z"/><circle data-name="Ellipse 4631" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4632" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4633" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4634" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4635" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4636" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4637" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4638" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4639" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4640" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4641" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4642" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4643" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2367.2)" fill="#30ba78"/><circle data-name="Ellipse 4644" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2367.2)" fill="#30ba78"/><circle data-name="Ellipse 4645" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2367.2)" fill="#30ba78"/><circle data-name="Ellipse 4646" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2367.2)" fill="#30ba78"/></g><g data-name="Group 790"><path data-name="Rectangle 2006" fill="none" d="M577.8 2382.8h103.6v103.6H577.8z"/><circle data-name="Ellipse 4647" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4648" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4649" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4650" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4651" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4652" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4653" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4654" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4655" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4656" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4657" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4658" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4659" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2470.8)" fill="#30ba78"/><circle data-name="Ellipse 4660" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2470.8)" fill="#30ba78"/><circle data-name="Ellipse 4661" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2470.8)" fill="#30ba78"/><circle data-name="Ellipse 4662" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2470.8)" fill="#30ba78"/></g><g data-name="Group 791"><path data-name="Rectangle 2007" fill="none" d="M577.8 2486.4h103.6V2590H577.8z"/><circle data-name="Ellipse 4663" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4664" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4665" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4666" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4667" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4668" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4669" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4670" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4671" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4672" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4673" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4674" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4675" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2574.4)" fill="#30ba78"/><circle data-name="Ellipse 4676" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2574.4)" fill="#30ba78"/><circle data-name="Ellipse 4677" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2574.4)" fill="#30ba78"/><circle data-name="Ellipse 4678" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2574.4)" fill="#30ba78"/></g><g data-name="Group 792"><path data-name="Rectangle 2008" fill="none" d="M577.8 2590h103.6v103.6H577.8z"/><circle data-name="Ellipse 4679" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2600)" fill="#30ba78"/><circle data-name="Ellipse 4680" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2600)" fill="#30ba78"/><circle data-name="Ellipse 4681" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2600)" fill="#30ba78"/><circle data-name="Ellipse 4682" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2600)" fill="#30ba78"/><circle data-name="Ellipse 4683" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2626)" fill="#30ba78"/><circle data-name="Ellipse 4684" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2626)" fill="#30ba78"/><circle data-name="Ellipse 4685" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2626)" fill="#30ba78"/><circle data-name="Ellipse 4686" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2626)" fill="#30ba78"/><circle data-name="Ellipse 4687" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2652)" fill="#30ba78"/><circle data-name="Ellipse 4688" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2652)" fill="#30ba78"/><circle data-name="Ellipse 4689" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2652)" fill="#30ba78"/><circle data-name="Ellipse 4690" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2652)" fill="#30ba78"/><circle data-name="Ellipse 4691" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2678)" fill="#30ba78"/><circle data-name="Ellipse 4692" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2678)" fill="#30ba78"/><circle data-name="Ellipse 4693" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2678)" fill="#30ba78"/><circle data-name="Ellipse 4694" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2678)" fill="#30ba78"/></g><g data-name="Group 793"><path data-name="Rectangle 2009" fill="none" d="M577.8 2693.6h103.6v103.6H577.8z"/><circle data-name="Ellipse 4695" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4696" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4697" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4698" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4699" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4700" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4701" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4702" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4703" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4704" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4705" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4706" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4707" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2781.6)" fill="#30ba78"/><circle data-name="Ellipse 4708" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2781.6)" fill="#30ba78"/><circle data-name="Ellipse 4709" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2781.6)" fill="#30ba78"/><circle data-name="Ellipse 4710" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2781.6)" fill="#30ba78"/></g><g data-name="Group 794"><path data-name="Rectangle 2010" fill="none" d="M474.2 1864.8h103.6v103.6H474.2z"/><circle data-name="Ellipse 4711" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4712" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4713" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4714" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4715" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4716" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4717" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4718" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4719" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4720" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4721" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4722" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4723" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 1952.8)" fill="#30ba78"/><circle data-name="Ellipse 4724" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 1952.8)" fill="#30ba78"/><circle data-name="Ellipse 4725" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 1952.8)" fill="#30ba78"/><circle data-name="Ellipse 4726" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 1952.8)" fill="#30ba78"/></g><g data-name="Group 795"><path data-name="Rectangle 2011" fill="none" d="M474.2 1968.4h103.6V2072H474.2z"/><circle data-name="Ellipse 4727" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4728" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4729" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4730" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4731" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4732" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4733" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4734" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4735" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4736" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4737" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4738" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4739" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2056.4)" fill="#30ba78"/><circle data-name="Ellipse 4740" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2056.4)" fill="#30ba78"/><circle data-name="Ellipse 4741" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2056.4)" fill="#30ba78"/><circle data-name="Ellipse 4742" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2056.4)" fill="#30ba78"/></g><g data-name="Group 796"><path data-name="Rectangle 2012" fill="none" d="M474.2 2072h103.6v103.6H474.2z"/><circle data-name="Ellipse 4743" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2082)" fill="#30ba78"/><circle data-name="Ellipse 4744" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2082)" fill="#30ba78"/><circle data-name="Ellipse 4745" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2082)" fill="#30ba78"/><circle data-name="Ellipse 4746" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2082)" fill="#30ba78"/><circle data-name="Ellipse 4747" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2108)" fill="#30ba78"/><circle data-name="Ellipse 4748" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2108)" fill="#30ba78"/><circle data-name="Ellipse 4749" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2108)" fill="#30ba78"/><circle data-name="Ellipse 4750" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2108)" fill="#30ba78"/><circle data-name="Ellipse 4751" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2134)" fill="#30ba78"/><circle data-name="Ellipse 4752" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2134)" fill="#30ba78"/><circle data-name="Ellipse 4753" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2134)" fill="#30ba78"/><circle data-name="Ellipse 4754" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2134)" fill="#30ba78"/><circle data-name="Ellipse 4755" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2160)" fill="#30ba78"/><circle data-name="Ellipse 4756" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2160)" fill="#30ba78"/><circle data-name="Ellipse 4757" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2160)" fill="#30ba78"/><circle data-name="Ellipse 4758" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2160)" fill="#30ba78"/></g><g data-name="Group 797"><path data-name="Rectangle 2013" fill="none" d="M474.2 2175.6h103.6v103.6H474.2z"/><circle data-name="Ellipse 4759" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4760" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4761" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4762" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4763" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4764" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4765" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4766" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4767" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4768" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4769" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4770" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4771" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2263.6)" fill="#30ba78"/><circle data-name="Ellipse 4772" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2263.6)" fill="#30ba78"/><circle data-name="Ellipse 4773" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2263.6)" fill="#30ba78"/><circle data-name="Ellipse 4774" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2263.6)" fill="#30ba78"/></g><g data-name="Group 798"><path data-name="Rectangle 2014" fill="none" d="M474.2 2279.2h103.6v103.6H474.2z"/><circle data-name="Ellipse 4775" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4776" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4777" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4778" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4779" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4780" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4781" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4782" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4783" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4784" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4785" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4786" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4787" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2367.2)" fill="#30ba78"/><circle data-name="Ellipse 4788" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2367.2)" fill="#30ba78"/><circle data-name="Ellipse 4789" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2367.2)" fill="#30ba78"/><circle data-name="Ellipse 4790" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2367.2)" fill="#30ba78"/></g><g data-name="Group 799"><path data-name="Rectangle 2015" fill="none" d="M474.2 2382.8h103.6v103.6H474.2z"/><circle data-name="Ellipse 4791" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4792" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4793" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4794" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4795" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4796" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4797" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4798" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4799" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4800" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4801" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4802" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4803" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2470.8)" fill="#30ba78"/><circle data-name="Ellipse 4804" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2470.8)" fill="#30ba78"/><circle data-name="Ellipse 4805" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2470.8)" fill="#30ba78"/><circle data-name="Ellipse 4806" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2470.8)" fill="#30ba78"/></g><g data-name="Group 800"><path data-name="Rectangle 2016" fill="none" d="M474.2 2486.4h103.6V2590H474.2z"/><circle data-name="Ellipse 4807" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4808" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4809" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4810" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4811" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4812" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4813" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4814" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4815" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4816" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4817" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4818" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4819" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2574.4)" fill="#30ba78"/><circle data-name="Ellipse 4820" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2574.4)" fill="#30ba78"/><circle data-name="Ellipse 4821" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2574.4)" fill="#30ba78"/><circle data-name="Ellipse 4822" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2574.4)" fill="#30ba78"/></g><g data-name="Group 801"><path data-name="Rectangle 2017" fill="none" d="M474.2 2590h103.6v103.6H474.2z"/><circle data-name="Ellipse 4823" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2600)" fill="#30ba78"/><circle data-name="Ellipse 4824" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2600)" fill="#30ba78"/><circle data-name="Ellipse 4825" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2600)" fill="#30ba78"/><circle data-name="Ellipse 4826" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2600)" fill="#30ba78"/><circle data-name="Ellipse 4827" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2626)" fill="#30ba78"/><circle data-name="Ellipse 4828" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2626)" fill="#30ba78"/><circle data-name="Ellipse 4829" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2626)" fill="#30ba78"/><circle data-name="Ellipse 4830" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2626)" fill="#30ba78"/><circle data-name="Ellipse 4831" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2652)" fill="#30ba78"/><circle data-name="Ellipse 4832" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2652)" fill="#30ba78"/><circle data-name="Ellipse 4833" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2652)" fill="#30ba78"/><circle data-name="Ellipse 4834" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2652)" fill="#30ba78"/><circle data-name="Ellipse 4835" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2678)" fill="#30ba78"/><circle data-name="Ellipse 4836" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2678)" fill="#30ba78"/><circle data-name="Ellipse 4837" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2678)" fill="#30ba78"/><circle data-name="Ellipse 4838" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2678)" fill="#30ba78"/></g><g data-name="Group 802"><path data-name="Rectangle 2018" fill="none" d="M474.2 2693.6h103.6v103.6H474.2z"/><circle data-name="Ellipse 4839" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4840" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4841" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4842" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4843" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4844" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4845" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4846" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4847" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4848" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4849" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4850" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4851" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2781.6)" fill="#30ba78"/><circle data-name="Ellipse 4852" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2781.6)" fill="#30ba78"/><circle data-name="Ellipse 4853" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2781.6)" fill="#30ba78"/><circle data-name="Ellipse 4854" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2781.6)" fill="#30ba78"/></g></g></g></g><g data-name="Group 806"><g data-name="Group 804"><g data-name="Group 803" clip-path="url(#b)" transform="translate(1192.408 -2594.341)"><g data-name="Group 767"><path data-name="Rectangle 1983" fill="none" d="M785 1864.8h103.6v103.6H785z"/><circle data-name="Ellipse 4279" cx="2.8" cy="2.8" r="2.8" transform="translate(795 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4280" cx="2.8" cy="2.8" r="2.8" transform="translate(821 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4281" cx="2.8" cy="2.8" r="2.8" transform="translate(847 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4282" cx="2.8" cy="2.8" r="2.8" transform="translate(873 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4283" cx="2.8" cy="2.8" r="2.8" transform="translate(795 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4284" cx="2.8" cy="2.8" r="2.8" transform="translate(821 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4285" cx="2.8" cy="2.8" r="2.8" transform="translate(847 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4286" cx="2.8" cy="2.8" r="2.8" transform="translate(873 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4287" cx="2.8" cy="2.8" r="2.8" transform="translate(795 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4288" cx="2.8" cy="2.8" r="2.8" transform="translate(821 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4289" cx="2.8" cy="2.8" r="2.8" transform="translate(847 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4290" cx="2.8" cy="2.8" r="2.8" transform="translate(873 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4291" cx="2.8" cy="2.8" r="2.8" transform="translate(795 1952.8)" fill="#30ba78"/><circle data-name="Ellipse 4292" cx="2.8" cy="2.8" r="2.8" transform="translate(821 1952.8)" fill="#30ba78"/><circle data-name="Ellipse 4293" cx="2.8" cy="2.8" r="2.8" transform="translate(847 1952.8)" fill="#30ba78"/><circle data-name="Ellipse 4294" cx="2.8" cy="2.8" r="2.8" transform="translate(873 1952.8)" fill="#30ba78"/></g><g data-name="Group 768"><path data-name="Rectangle 1984" fill="none" d="M785 1968.4h103.6V2072H785z"/><circle data-name="Ellipse 4295" cx="2.8" cy="2.8" r="2.8" transform="translate(795 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4296" cx="2.8" cy="2.8" r="2.8" transform="translate(821 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4297" cx="2.8" cy="2.8" r="2.8" transform="translate(847 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4298" cx="2.8" cy="2.8" r="2.8" transform="translate(873 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4299" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4300" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4301" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4302" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4303" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4304" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4305" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4306" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4307" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2056.4)" fill="#30ba78"/><circle data-name="Ellipse 4308" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2056.4)" fill="#30ba78"/><circle data-name="Ellipse 4309" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2056.4)" fill="#30ba78"/><circle data-name="Ellipse 4310" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2056.4)" fill="#30ba78"/></g><g data-name="Group 769"><path data-name="Rectangle 1985" fill="none" d="M785 2072h103.6v103.6H785z"/><circle data-name="Ellipse 4311" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2082)" fill="#30ba78"/><circle data-name="Ellipse 4312" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2082)" fill="#30ba78"/><circle data-name="Ellipse 4313" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2082)" fill="#30ba78"/><circle data-name="Ellipse 4314" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2082)" fill="#30ba78"/><circle data-name="Ellipse 4315" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2108)" fill="#30ba78"/><circle data-name="Ellipse 4316" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2108)" fill="#30ba78"/><circle data-name="Ellipse 4317" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2108)" fill="#30ba78"/><circle data-name="Ellipse 4318" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2108)" fill="#30ba78"/><circle data-name="Ellipse 4322" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2134)" fill="#30ba78"/><circle data-name="Ellipse 4323" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2160)" fill="#30ba78"/><circle data-name="Ellipse 4324" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2160)" fill="#30ba78"/><circle data-name="Ellipse 4325" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2160)" fill="#30ba78"/><circle data-name="Ellipse 4326" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2160)" fill="#30ba78"/></g><g data-name="Group 770"><path data-name="Rectangle 1986" fill="none" d="M785 2175.6h103.6v103.6H785z"/><circle data-name="Ellipse 4327" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4328" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4329" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4330" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4331" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4332" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4333" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4334" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4335" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4336" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4337" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4338" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4339" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2263.6)" fill="#30ba78"/><circle data-name="Ellipse 4340" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2263.6)" fill="#30ba78"/><circle data-name="Ellipse 4341" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2263.6)" fill="#30ba78"/><circle data-name="Ellipse 4342" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2263.6)" fill="#30ba78"/></g><g data-name="Group 771"><path data-name="Rectangle 1987" fill="none" d="M785 2279.2h103.6v103.6H785z"/><circle data-name="Ellipse 4343" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4344" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4345" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4346" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4347" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4348" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4349" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4350" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4351" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4352" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4353" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4354" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4355" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2367.2)" fill="#30ba78"/><circle data-name="Ellipse 4356" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2367.2)" fill="#30ba78"/><circle data-name="Ellipse 4357" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2367.2)" fill="#30ba78"/><circle data-name="Ellipse 4358" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2367.2)" fill="#30ba78"/></g><g data-name="Group 772"><path data-name="Rectangle 1988" fill="none" d="M785 2382.8h103.6v103.6H785z"/><circle data-name="Ellipse 4359" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4360" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4361" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4362" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4363" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4364" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4365" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4366" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4367" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4368" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4369" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4370" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4371" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2470.8)" fill="#30ba78"/><circle data-name="Ellipse 4372" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2470.8)" fill="#30ba78"/><circle data-name="Ellipse 4373" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2470.8)" fill="#30ba78"/><circle data-name="Ellipse 4374" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2470.8)" fill="#30ba78"/></g><g data-name="Group 773"><path data-name="Rectangle 1989" fill="none" d="M785 2486.4h103.6V2590H785z"/><circle data-name="Ellipse 4375" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4376" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4377" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4378" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4379" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4380" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4381" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4382" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4383" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4384" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4385" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4386" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4387" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2574.4)" fill="#30ba78"/><circle data-name="Ellipse 4388" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2574.4)" fill="#30ba78"/><circle data-name="Ellipse 4389" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2574.4)" fill="#30ba78"/><circle data-name="Ellipse 4390" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2574.4)" fill="#30ba78"/></g><g data-name="Group 774"><path data-name="Rectangle 1990" fill="none" d="M785 2590h103.6v103.6H785z"/><circle data-name="Ellipse 4391" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2600)" fill="#30ba78"/><circle data-name="Ellipse 4392" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2600)" fill="#30ba78"/><circle data-name="Ellipse 4393" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2600)" fill="#30ba78"/><circle data-name="Ellipse 4394" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2600)" fill="#30ba78"/><circle data-name="Ellipse 4395" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2626)" fill="#30ba78"/><circle data-name="Ellipse 4396" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2626)" fill="#30ba78"/><circle data-name="Ellipse 4397" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2626)" fill="#30ba78"/><circle data-name="Ellipse 4398" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2626)" fill="#30ba78"/><circle data-name="Ellipse 4399" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2652)" fill="#30ba78"/><circle data-name="Ellipse 4400" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2652)" fill="#30ba78"/><circle data-name="Ellipse 4401" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2652)" fill="#30ba78"/><circle data-name="Ellipse 4402" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2652)" fill="#30ba78"/><circle data-name="Ellipse 4403" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2678)" fill="#30ba78"/><circle data-name="Ellipse 4404" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2678)" fill="#30ba78"/><circle data-name="Ellipse 4405" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2678)" fill="#30ba78"/><circle data-name="Ellipse 4406" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2678)" fill="#30ba78"/></g><g data-name="Group 775"><path data-name="Rectangle 1991" fill="none" d="M785 2693.6h103.6v103.6H785z"/><circle data-name="Ellipse 4407" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4408" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4409" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4410" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4411" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4412" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4413" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4414" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4415" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4416" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4417" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4418" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4419" cx="2.8" cy="2.8" r="2.8" transform="translate(795 2781.6)" fill="#30ba78"/><circle data-name="Ellipse 4420" cx="2.8" cy="2.8" r="2.8" transform="translate(821 2781.6)" fill="#30ba78"/><circle data-name="Ellipse 4421" cx="2.8" cy="2.8" r="2.8" transform="translate(847 2781.6)" fill="#30ba78"/><circle data-name="Ellipse 4422" cx="2.8" cy="2.8" r="2.8" transform="translate(873 2781.6)" fill="#30ba78"/></g><g data-name="Group 776"><path data-name="Rectangle 1992" fill="none" d="M681.4 1864.8H785v103.6H681.4z"/><circle data-name="Ellipse 4423" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4424" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4425" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4426" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4427" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4428" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4429" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4430" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4431" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4432" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4433" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4434" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4435" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 1952.8)" fill="#30ba78"/><circle data-name="Ellipse 4436" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 1952.8)" fill="#30ba78"/><circle data-name="Ellipse 4437" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 1952.8)" fill="#30ba78"/><circle data-name="Ellipse 4438" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 1952.8)" fill="#30ba78"/></g><g data-name="Group 777"><path data-name="Rectangle 1993" fill="none" d="M681.4 1968.4H785V2072H681.4z"/><circle data-name="Ellipse 4439" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4440" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4441" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4442" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4443" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4444" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4445" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4446" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4447" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4448" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4449" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4450" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4451" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2056.4)" fill="#30ba78"/><circle data-name="Ellipse 4452" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2056.4)" fill="#30ba78"/><circle data-name="Ellipse 4453" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2056.4)" fill="#30ba78"/><circle data-name="Ellipse 4454" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2056.4)" fill="#30ba78"/></g><g data-name="Group 779"><path data-name="Rectangle 1995" fill="none" d="M681.4 2175.6H785v103.6H681.4z"/><circle data-name="Ellipse 4471" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4472" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4473" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4474" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4475" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4476" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4477" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4478" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4479" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4480" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4481" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4482" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4483" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2263.6)" fill="#30ba78"/><circle data-name="Ellipse 4484" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2263.6)" fill="#30ba78"/><circle data-name="Ellipse 4485" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2263.6)" fill="#30ba78"/><circle data-name="Ellipse 4486" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2263.6)" fill="#30ba78"/></g><g data-name="Group 780"><path data-name="Rectangle 1996" fill="none" d="M681.4 2279.2H785v103.6H681.4z"/><circle data-name="Ellipse 4487" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4488" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4489" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4490" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4491" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4492" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4493" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4494" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4495" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4496" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4497" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4498" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4499" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2367.2)" fill="#30ba78"/><circle data-name="Ellipse 4500" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2367.2)" fill="#30ba78"/><circle data-name="Ellipse 4501" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2367.2)" fill="#30ba78"/><circle data-name="Ellipse 4502" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2367.2)" fill="#30ba78"/></g><g data-name="Group 781"><path data-name="Rectangle 1997" fill="none" d="M681.4 2382.8H785v103.6H681.4z"/><circle data-name="Ellipse 4503" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4504" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4505" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4506" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4507" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4508" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4509" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4510" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4511" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4512" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4513" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4514" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4515" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2470.8)" fill="#30ba78"/><circle data-name="Ellipse 4516" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2470.8)" fill="#30ba78"/><circle data-name="Ellipse 4517" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2470.8)" fill="#30ba78"/><circle data-name="Ellipse 4518" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2470.8)" fill="#30ba78"/></g><g data-name="Group 782"><path data-name="Rectangle 1998" fill="none" d="M681.4 2486.4H785V2590H681.4z"/><circle data-name="Ellipse 4519" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4520" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4521" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4522" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4523" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4524" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4525" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4526" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4527" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4528" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4529" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4530" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4531" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2574.4)" fill="#30ba78"/><circle data-name="Ellipse 4532" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2574.4)" fill="#30ba78"/><circle data-name="Ellipse 4533" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2574.4)" fill="#30ba78"/><circle data-name="Ellipse 4534" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2574.4)" fill="#30ba78"/></g><g data-name="Group 783"><path data-name="Rectangle 1999" fill="none" d="M681.4 2590H785v103.6H681.4z"/><circle data-name="Ellipse 4535" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2600)" fill="#30ba78"/><circle data-name="Ellipse 4536" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2600)" fill="#30ba78"/><circle data-name="Ellipse 4537" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2600)" fill="#30ba78"/><circle data-name="Ellipse 4538" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2600)" fill="#30ba78"/><circle data-name="Ellipse 4539" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2626)" fill="#30ba78"/><circle data-name="Ellipse 4540" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2626)" fill="#30ba78"/><circle data-name="Ellipse 4541" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2626)" fill="#30ba78"/><circle data-name="Ellipse 4542" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2626)" fill="#30ba78"/><circle data-name="Ellipse 4543" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2652)" fill="#30ba78"/><circle data-name="Ellipse 4544" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2652)" fill="#30ba78"/><circle data-name="Ellipse 4545" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2652)" fill="#30ba78"/><circle data-name="Ellipse 4546" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2652)" fill="#30ba78"/><circle data-name="Ellipse 4547" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2678)" fill="#30ba78"/><circle data-name="Ellipse 4548" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2678)" fill="#30ba78"/><circle data-name="Ellipse 4549" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2678)" fill="#30ba78"/><circle data-name="Ellipse 4550" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2678)" fill="#30ba78"/></g><g data-name="Group 784"><path data-name="Rectangle 2000" fill="none" d="M681.4 2693.6H785v103.6H681.4z"/><circle data-name="Ellipse 4551" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4552" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4553" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4554" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4555" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4556" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4557" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4558" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4559" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4560" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4561" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4562" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4563" cx="2.8" cy="2.8" r="2.8" transform="translate(691.4 2781.6)" fill="#30ba78"/><circle data-name="Ellipse 4564" cx="2.8" cy="2.8" r="2.8" transform="translate(717.4 2781.6)" fill="#30ba78"/><circle data-name="Ellipse 4565" cx="2.8" cy="2.8" r="2.8" transform="translate(743.4 2781.6)" fill="#30ba78"/><circle data-name="Ellipse 4566" cx="2.8" cy="2.8" r="2.8" transform="translate(769.4 2781.6)" fill="#30ba78"/></g><g data-name="Group 785"><path data-name="Rectangle 2001" fill="none" d="M577.8 1864.8h103.6v103.6H577.8z"/><circle data-name="Ellipse 4567" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4568" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4569" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4570" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4571" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4572" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4573" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4574" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4575" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4576" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4577" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4578" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4579" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 1952.8)" fill="#30ba78"/><circle data-name="Ellipse 4580" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 1952.8)" fill="#30ba78"/><circle data-name="Ellipse 4581" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 1952.8)" fill="#30ba78"/><circle data-name="Ellipse 4582" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 1952.8)" fill="#30ba78"/></g><g data-name="Group 786"><path data-name="Rectangle 2002" fill="none" d="M577.8 1968.4h103.6V2072H577.8z"/><circle data-name="Ellipse 4584" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4585" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4586" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4587" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4588" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4589" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4590" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4591" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4592" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4593" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4594" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4595" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2056.4)" fill="#30ba78"/><circle data-name="Ellipse 4596" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2056.4)" fill="#30ba78"/><circle data-name="Ellipse 4597" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2056.4)" fill="#30ba78"/><circle data-name="Ellipse 4598" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2056.4)" fill="#30ba78"/></g><g data-name="Group 787"><path data-name="Rectangle 2003" fill="none" d="M577.8 2072h103.6v103.6H577.8z"/><circle data-name="Ellipse 4599" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2082)" fill="#30ba78"/><circle data-name="Ellipse 4600" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2082)" fill="#30ba78"/><circle data-name="Ellipse 4601" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2082)" fill="#30ba78"/><circle data-name="Ellipse 4602" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2082)" fill="#30ba78"/><circle data-name="Ellipse 4603" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2108)" fill="#30ba78"/><circle data-name="Ellipse 4604" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2108)" fill="#30ba78"/><circle data-name="Ellipse 4605" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2108)" fill="#30ba78"/><circle data-name="Ellipse 4606" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2108)" fill="#30ba78"/><circle data-name="Ellipse 4607" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2134)" fill="#30ba78"/><circle data-name="Ellipse 4608" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2134)" fill="#30ba78"/><circle data-name="Ellipse 4609" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2134)" fill="#30ba78"/><circle data-name="Ellipse 4610" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2134)" fill="#30ba78"/><circle data-name="Ellipse 4611" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2160)" fill="#30ba78"/><circle data-name="Ellipse 4612" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2160)" fill="#30ba78"/><circle data-name="Ellipse 4613" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2160)" fill="#30ba78"/><circle data-name="Ellipse 4614" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2160)" fill="#30ba78"/></g><g data-name="Group 788"><path data-name="Rectangle 2004" fill="none" d="M577.8 2175.6h103.6v103.6H577.8z"/><circle data-name="Ellipse 4615" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4616" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4617" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4618" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4619" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4620" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4621" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4622" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4623" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4624" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4625" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4626" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4627" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2263.6)" fill="#30ba78"/><circle data-name="Ellipse 4628" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2263.6)" fill="#30ba78"/><circle data-name="Ellipse 4629" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2263.6)" fill="#30ba78"/><circle data-name="Ellipse 4630" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2263.6)" fill="#30ba78"/></g><g data-name="Group 789"><path data-name="Rectangle 2005" fill="none" d="M577.8 2279.2h103.6v103.6H577.8z"/><circle data-name="Ellipse 4631" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4632" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4633" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4634" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4635" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4636" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4637" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4638" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4639" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4640" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4641" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4642" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4643" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2367.2)" fill="#30ba78"/><circle data-name="Ellipse 4644" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2367.2)" fill="#30ba78"/><circle data-name="Ellipse 4645" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2367.2)" fill="#30ba78"/><circle data-name="Ellipse 4646" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2367.2)" fill="#30ba78"/></g><g data-name="Group 790"><path data-name="Rectangle 2006" fill="none" d="M577.8 2382.8h103.6v103.6H577.8z"/><circle data-name="Ellipse 4647" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4648" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4649" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4650" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4651" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4652" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4653" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4654" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4655" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4656" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4657" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4658" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4659" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2470.8)" fill="#30ba78"/><circle data-name="Ellipse 4660" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2470.8)" fill="#30ba78"/><circle data-name="Ellipse 4661" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2470.8)" fill="#30ba78"/><circle data-name="Ellipse 4662" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2470.8)" fill="#30ba78"/></g><g data-name="Group 791"><path data-name="Rectangle 2007" fill="none" d="M577.8 2486.4h103.6V2590H577.8z"/><circle data-name="Ellipse 4663" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4664" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4665" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4666" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4667" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4668" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4669" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4670" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4671" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4672" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4673" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4674" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4675" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2574.4)" fill="#30ba78"/><circle data-name="Ellipse 4676" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2574.4)" fill="#30ba78"/><circle data-name="Ellipse 4677" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2574.4)" fill="#30ba78"/><circle data-name="Ellipse 4678" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2574.4)" fill="#30ba78"/></g><g data-name="Group 792"><path data-name="Rectangle 2008" fill="none" d="M577.8 2590h103.6v103.6H577.8z"/><circle data-name="Ellipse 4679" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2600)" fill="#30ba78"/><circle data-name="Ellipse 4680" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2600)" fill="#30ba78"/><circle data-name="Ellipse 4681" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2600)" fill="#30ba78"/><circle data-name="Ellipse 4682" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2600)" fill="#30ba78"/><circle data-name="Ellipse 4683" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2626)" fill="#30ba78"/><circle data-name="Ellipse 4684" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2626)" fill="#30ba78"/><circle data-name="Ellipse 4685" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2626)" fill="#30ba78"/><circle data-name="Ellipse 4686" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2626)" fill="#30ba78"/><circle data-name="Ellipse 4687" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2652)" fill="#30ba78"/><circle data-name="Ellipse 4688" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2652)" fill="#30ba78"/><circle data-name="Ellipse 4689" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2652)" fill="#30ba78"/><circle data-name="Ellipse 4690" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2652)" fill="#30ba78"/><circle data-name="Ellipse 4691" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2678)" fill="#30ba78"/><circle data-name="Ellipse 4692" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2678)" fill="#30ba78"/><circle data-name="Ellipse 4693" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2678)" fill="#30ba78"/><circle data-name="Ellipse 4694" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2678)" fill="#30ba78"/></g><g data-name="Group 793"><path data-name="Rectangle 2009" fill="none" d="M577.8 2693.6h103.6v103.6H577.8z"/><circle data-name="Ellipse 4695" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4696" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4697" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4698" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4699" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4700" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4701" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4702" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4703" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4704" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4705" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4706" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4707" cx="2.8" cy="2.8" r="2.8" transform="translate(587.8 2781.6)" fill="#30ba78"/><circle data-name="Ellipse 4708" cx="2.8" cy="2.8" r="2.8" transform="translate(613.8 2781.6)" fill="#30ba78"/><circle data-name="Ellipse 4709" cx="2.8" cy="2.8" r="2.8" transform="translate(639.8 2781.6)" fill="#30ba78"/><circle data-name="Ellipse 4710" cx="2.8" cy="2.8" r="2.8" transform="translate(665.8 2781.6)" fill="#30ba78"/></g><g data-name="Group 794"><path data-name="Rectangle 2010" fill="none" d="M474.2 1864.8h103.6v103.6H474.2z"/><circle data-name="Ellipse 4711" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4712" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4713" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4714" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 1874.8)" fill="#30ba78"/><circle data-name="Ellipse 4715" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4716" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4717" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4718" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 1900.8)" fill="#30ba78"/><circle data-name="Ellipse 4719" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4720" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4721" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4722" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 1926.8)" fill="#30ba78"/><circle data-name="Ellipse 4723" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 1952.8)" fill="#30ba78"/><circle data-name="Ellipse 4724" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 1952.8)" fill="#30ba78"/><circle data-name="Ellipse 4725" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 1952.8)" fill="#30ba78"/><circle data-name="Ellipse 4726" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 1952.8)" fill="#30ba78"/></g><g data-name="Group 795"><path data-name="Rectangle 2011" fill="none" d="M474.2 1968.4h103.6V2072H474.2z"/><circle data-name="Ellipse 4727" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4728" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4729" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4730" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 1978.4)" fill="#30ba78"/><circle data-name="Ellipse 4731" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4732" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4733" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4734" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2004.4)" fill="#30ba78"/><circle data-name="Ellipse 4735" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4736" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4737" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4738" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2030.4)" fill="#30ba78"/><circle data-name="Ellipse 4739" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2056.4)" fill="#30ba78"/><circle data-name="Ellipse 4740" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2056.4)" fill="#30ba78"/><circle data-name="Ellipse 4741" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2056.4)" fill="#30ba78"/><circle data-name="Ellipse 4742" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2056.4)" fill="#30ba78"/></g><g data-name="Group 796"><path data-name="Rectangle 2012" fill="none" d="M474.2 2072h103.6v103.6H474.2z"/><circle data-name="Ellipse 4743" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2082)" fill="#30ba78"/><circle data-name="Ellipse 4744" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2082)" fill="#30ba78"/><circle data-name="Ellipse 4745" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2082)" fill="#30ba78"/><circle data-name="Ellipse 4746" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2082)" fill="#30ba78"/><circle data-name="Ellipse 4747" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2108)" fill="#30ba78"/><circle data-name="Ellipse 4748" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2108)" fill="#30ba78"/><circle data-name="Ellipse 4749" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2108)" fill="#30ba78"/><circle data-name="Ellipse 4750" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2108)" fill="#30ba78"/><circle data-name="Ellipse 4751" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2134)" fill="#30ba78"/><circle data-name="Ellipse 4752" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2134)" fill="#30ba78"/><circle data-name="Ellipse 4753" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2134)" fill="#30ba78"/><circle data-name="Ellipse 4754" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2134)" fill="#30ba78"/><circle data-name="Ellipse 4755" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2160)" fill="#30ba78"/><circle data-name="Ellipse 4756" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2160)" fill="#30ba78"/><circle data-name="Ellipse 4757" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2160)" fill="#30ba78"/><circle data-name="Ellipse 4758" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2160)" fill="#30ba78"/></g><g data-name="Group 797"><path data-name="Rectangle 2013" fill="none" d="M474.2 2175.6h103.6v103.6H474.2z"/><circle data-name="Ellipse 4759" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4760" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4761" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4762" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2185.6)" fill="#30ba78"/><circle data-name="Ellipse 4763" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4764" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4765" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4766" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2211.6)" fill="#30ba78"/><circle data-name="Ellipse 4767" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4768" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4769" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4770" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2237.6)" fill="#30ba78"/><circle data-name="Ellipse 4771" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2263.6)" fill="#30ba78"/><circle data-name="Ellipse 4772" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2263.6)" fill="#30ba78"/><circle data-name="Ellipse 4773" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2263.6)" fill="#30ba78"/><circle data-name="Ellipse 4774" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2263.6)" fill="#30ba78"/></g><g data-name="Group 798"><path data-name="Rectangle 2014" fill="none" d="M474.2 2279.2h103.6v103.6H474.2z"/><circle data-name="Ellipse 4775" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4776" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4777" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4778" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2289.2)" fill="#30ba78"/><circle data-name="Ellipse 4779" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4780" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4781" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4782" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2315.2)" fill="#30ba78"/><circle data-name="Ellipse 4783" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4784" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4785" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4786" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2341.2)" fill="#30ba78"/><circle data-name="Ellipse 4787" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2367.2)" fill="#30ba78"/><circle data-name="Ellipse 4788" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2367.2)" fill="#30ba78"/><circle data-name="Ellipse 4789" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2367.2)" fill="#30ba78"/><circle data-name="Ellipse 4790" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2367.2)" fill="#30ba78"/></g><g data-name="Group 799"><path data-name="Rectangle 2015" fill="none" d="M474.2 2382.8h103.6v103.6H474.2z"/><circle data-name="Ellipse 4791" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4792" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4793" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4794" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2392.8)" fill="#30ba78"/><circle data-name="Ellipse 4795" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4796" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4797" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4798" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2418.8)" fill="#30ba78"/><circle data-name="Ellipse 4799" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4800" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4801" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4802" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2444.8)" fill="#30ba78"/><circle data-name="Ellipse 4803" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2470.8)" fill="#30ba78"/><circle data-name="Ellipse 4804" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2470.8)" fill="#30ba78"/><circle data-name="Ellipse 4805" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2470.8)" fill="#30ba78"/><circle data-name="Ellipse 4806" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2470.8)" fill="#30ba78"/></g><g data-name="Group 800"><path data-name="Rectangle 2016" fill="none" d="M474.2 2486.4h103.6V2590H474.2z"/><circle data-name="Ellipse 4807" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4808" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4809" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4810" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2496.4)" fill="#30ba78"/><circle data-name="Ellipse 4811" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4812" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4813" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4814" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2522.4)" fill="#30ba78"/><circle data-name="Ellipse 4815" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4816" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4817" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4818" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2548.4)" fill="#30ba78"/><circle data-name="Ellipse 4819" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2574.4)" fill="#30ba78"/><circle data-name="Ellipse 4820" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2574.4)" fill="#30ba78"/><circle data-name="Ellipse 4821" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2574.4)" fill="#30ba78"/><circle data-name="Ellipse 4822" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2574.4)" fill="#30ba78"/></g><g data-name="Group 801"><path data-name="Rectangle 2017" fill="none" d="M474.2 2590h103.6v103.6H474.2z"/><circle data-name="Ellipse 4823" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2600)" fill="#30ba78"/><circle data-name="Ellipse 4824" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2600)" fill="#30ba78"/><circle data-name="Ellipse 4825" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2600)" fill="#30ba78"/><circle data-name="Ellipse 4826" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2600)" fill="#30ba78"/><circle data-name="Ellipse 4827" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2626)" fill="#30ba78"/><circle data-name="Ellipse 4828" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2626)" fill="#30ba78"/><circle data-name="Ellipse 4829" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2626)" fill="#30ba78"/><circle data-name="Ellipse 4830" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2626)" fill="#30ba78"/><circle data-name="Ellipse 4831" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2652)" fill="#30ba78"/><circle data-name="Ellipse 4832" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2652)" fill="#30ba78"/><circle data-name="Ellipse 4833" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2652)" fill="#30ba78"/><circle data-name="Ellipse 4834" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2652)" fill="#30ba78"/><circle data-name="Ellipse 4835" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2678)" fill="#30ba78"/><circle data-name="Ellipse 4836" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2678)" fill="#30ba78"/><circle data-name="Ellipse 4837" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2678)" fill="#30ba78"/><circle data-name="Ellipse 4838" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2678)" fill="#30ba78"/></g><g data-name="Group 802"><path data-name="Rectangle 2018" fill="none" d="M474.2 2693.6h103.6v103.6H474.2z"/><circle data-name="Ellipse 4839" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4840" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4841" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4842" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2703.6)" fill="#30ba78"/><circle data-name="Ellipse 4843" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4844" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4845" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4846" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2729.6)" fill="#30ba78"/><circle data-name="Ellipse 4847" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4848" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4849" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4850" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2755.6)" fill="#30ba78"/><circle data-name="Ellipse 4851" cx="2.8" cy="2.8" r="2.8" transform="translate(484.2 2781.6)" fill="#30ba78"/><circle data-name="Ellipse 4852" cx="2.8" cy="2.8" r="2.8" transform="translate(510.2 2781.6)" fill="#30ba78"/><circle data-name="Ellipse 4853" cx="2.8" cy="2.8" r="2.8" transform="translate(536.2 2781.6)" fill="#30ba78"/><circle data-name="Ellipse 4854" cx="2.8" cy="2.8" r="2.8" transform="translate(562.2 2781.6)" fill="#30ba78"/></g></g></g></g></g></g></svg>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/assets/custom/login/sign-in-line.svg b/src/frontend/packages/suse-extensions/assets/custom/login/sign-in-line.svg
new file mode 100644
index 0000000000..5a6c479b25
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/assets/custom/login/sign-in-line.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="457" height="95.016" viewBox="0 0 457 95.016"><g id="Group_811" data-name="Group 811" transform="translate(-3307.583 -534.597)"><line id="Line_10" data-name="Line 10" x2="182.791" transform="translate(3580.792 621.613)" fill="none" stroke="#30ba78" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><path id="Path_643" data-name="Path 643" d="M3569.289,621.613h-90.955a21.719,21.719,0,0,1-21.719-21.719V557.316A21.719,21.719,0,0,0,3434.9,535.6H3308.583" fill="none" stroke="#30ba78" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" stroke-dasharray="0 7"/><circle id="Ellipse_4857" data-name="Ellipse 4857" cx="8" cy="8" r="8" transform="translate(3567.927 613.613)" fill="#ff6a52"/></g></svg>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/assets/custom/login/sign-in-lock-1.svg b/src/frontend/packages/suse-extensions/assets/custom/login/sign-in-lock-1.svg
new file mode 100644
index 0000000000..2237550796
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/assets/custom/login/sign-in-lock-1.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="223.234" height="119.787" viewBox="0 0 223.234 119.787"><defs><clipPath id="clip-path"><rect id="Rectangle_2065" data-name="Rectangle 2065" width="223.234" height="88.341" transform="translate(3451.343 89.42)" fill="none"/></clipPath></defs><g id="Group_880" data-name="Group 880" transform="translate(-3451.343 -57.974)"><g id="Group_867" data-name="Group 867"><g id="Group_866" data-name="Group 866"><rect id="Rectangle_2060" data-name="Rectangle 2060" width="58" height="58" rx="12.981" transform="translate(3530.603 93.584)" fill="#0c322c" stroke="#ff6a52" stroke-width="2.993"/></g><path id="Path_635" data-name="Path 635" d="M3539.905,93.236,3540,76.343c.051-9.333,8.382-16.925,18.515-16.869l2.235.012c10.132.055,18.381,7.737,18.33,17.071" fill="none" stroke="#ff6a52" stroke-linecap="round" stroke-width="3"/><circle id="Ellipse_4277" data-name="Ellipse 4277" cx="8" cy="8" r="8" transform="translate(3551.603 114.584)" fill="#ff6a52"/></g><g id="Group_878" data-name="Group 878"><g id="Group_877" data-name="Group 877"><g id="Group_876" data-name="Group 876" clip-path="url(#clip-path)"><g id="Group_868" data-name="Group 868"><rect id="Rectangle_2061" data-name="Rectangle 2061" width="78" height="78" transform="translate(3617.497 64.62)" fill="none"/><circle id="Ellipse_5121" data-name="Ellipse 5121" cx="1.5" cy="1.5" r="1.5" transform="translate(3624.998 72.12)" fill="#30ba78"/><circle id="Ellipse_5122" data-name="Ellipse 5122" cx="1.5" cy="1.5" r="1.5" transform="translate(3644.998 72.12)" fill="#30ba78"/><circle id="Ellipse_5123" data-name="Ellipse 5123" cx="1.5" cy="1.5" r="1.5" transform="translate(3664.998 72.12)" fill="#30ba78"/><circle id="Ellipse_5124" data-name="Ellipse 5124" cx="1.5" cy="1.5" r="1.5" transform="translate(3684.998 72.12)" fill="#30ba78"/><circle id="Ellipse_5125" data-name="Ellipse 5125" cx="1.5" cy="1.5" r="1.5" transform="translate(3624.998 92.12)" fill="#30ba78"/><circle id="Ellipse_5126" data-name="Ellipse 5126" cx="1.5" cy="1.5" r="1.5" transform="translate(3644.998 92.12)" fill="#30ba78"/><circle id="Ellipse_5127" data-name="Ellipse 5127" cx="1.5" cy="1.5" r="1.5" transform="translate(3664.998 92.12)" fill="#30ba78"/><circle id="Ellipse_5128" data-name="Ellipse 5128" cx="1.5" cy="1.5" r="1.5" transform="translate(3684.998 92.12)" fill="#30ba78"/><circle id="Ellipse_5129" data-name="Ellipse 5129" cx="1.5" cy="1.5" r="1.5" transform="translate(3624.998 112.12)" fill="#30ba78"/><circle id="Ellipse_5130" data-name="Ellipse 5130" cx="1.5" cy="1.5" r="1.5" transform="translate(3644.998 112.12)" fill="#30ba78"/><circle id="Ellipse_5131" data-name="Ellipse 5131" cx="1.5" cy="1.5" r="1.5" transform="translate(3664.998 112.12)" fill="#30ba78"/><circle id="Ellipse_5132" data-name="Ellipse 5132" cx="1.5" cy="1.5" r="1.5" transform="translate(3684.998 112.12)" fill="#30ba78"/><circle id="Ellipse_5133" data-name="Ellipse 5133" cx="1.5" cy="1.5" r="1.5" transform="translate(3624.998 132.12)" fill="#30ba78"/><circle id="Ellipse_5134" data-name="Ellipse 5134" cx="1.5" cy="1.5" r="1.5" transform="translate(3644.998 132.12)" fill="#30ba78"/><circle id="Ellipse_5135" data-name="Ellipse 5135" cx="1.5" cy="1.5" r="1.5" transform="translate(3664.998 132.12)" fill="#30ba78"/><circle id="Ellipse_5136" data-name="Ellipse 5136" cx="1.5" cy="1.5" r="1.5" transform="translate(3684.998 132.12)" fill="#30ba78"/></g><g id="Group_869" data-name="Group 869"><circle id="Ellipse_5137" data-name="Ellipse 5137" cx="1.5" cy="1.5" r="1.5" transform="translate(3624.998 150.12)" fill="#30ba78"/><circle id="Ellipse_5138" data-name="Ellipse 5138" cx="1.5" cy="1.5" r="1.5" transform="translate(3644.998 150.12)" fill="#30ba78"/><circle id="Ellipse_5139" data-name="Ellipse 5139" cx="1.5" cy="1.5" r="1.5" transform="translate(3664.998 150.12)" fill="#30ba78"/><circle id="Ellipse_5140" data-name="Ellipse 5140" cx="1.5" cy="1.5" r="1.5" transform="translate(3684.998 150.12)" fill="#30ba78"/></g><g id="Group_870" data-name="Group 870"><rect id="Rectangle_2062" data-name="Rectangle 2062" width="78" height="78" transform="translate(3539.497 64.62)" fill="none"/><circle id="Ellipse_5141" data-name="Ellipse 5141" cx="1.5" cy="1.5" r="1.5" transform="translate(3546.998 72.12)" fill="#30ba78"/><circle id="Ellipse_5142" data-name="Ellipse 5142" cx="1.5" cy="1.5" r="1.5" transform="translate(3566.998 72.12)" fill="#30ba78"/><circle id="Ellipse_5143" data-name="Ellipse 5143" cx="1.5" cy="1.5" r="1.5" transform="translate(3586.998 72.12)" fill="#30ba78"/><circle id="Ellipse_5144" data-name="Ellipse 5144" cx="1.5" cy="1.5" r="1.5" transform="translate(3606.998 72.12)" fill="#30ba78"/><circle id="Ellipse_5145" data-name="Ellipse 5145" cx="1.5" cy="1.5" r="1.5" transform="translate(3606.998 92.12)" fill="#30ba78"/><circle id="Ellipse_5146" data-name="Ellipse 5146" cx="1.5" cy="1.5" r="1.5" transform="translate(3606.998 112.12)" fill="#30ba78"/><circle id="Ellipse_5147" data-name="Ellipse 5147" cx="1.5" cy="1.5" r="1.5" transform="translate(3606.998 132.12)" fill="#30ba78"/></g><g id="Group_871" data-name="Group 871"><circle id="Ellipse_5148" data-name="Ellipse 5148" cx="1.5" cy="1.5" r="1.5" transform="translate(3606.998 150.12)" fill="#30ba78"/></g><g id="Group_872" data-name="Group 872"><rect id="Rectangle_2063" data-name="Rectangle 2063" width="78" height="78" transform="translate(3461.497 64.62)" fill="none"/><circle id="Ellipse_5149" data-name="Ellipse 5149" cx="1.5" cy="1.5" r="1.5" transform="translate(3468.998 72.12)" fill="#30ba78"/><circle id="Ellipse_5150" data-name="Ellipse 5150" cx="1.5" cy="1.5" r="1.5" transform="translate(3488.998 72.12)" fill="#30ba78"/><circle id="Ellipse_5151" data-name="Ellipse 5151" cx="1.5" cy="1.5" r="1.5" transform="translate(3508.998 72.12)" fill="#30ba78"/><circle id="Ellipse_5152" data-name="Ellipse 5152" cx="1.5" cy="1.5" r="1.5" transform="translate(3528.998 72.12)" fill="#30ba78"/><circle id="Ellipse_5153" data-name="Ellipse 5153" cx="1.5" cy="1.5" r="1.5" transform="translate(3468.998 92.12)" fill="#30ba78"/><circle id="Ellipse_5154" data-name="Ellipse 5154" cx="1.5" cy="1.5" r="1.5" transform="translate(3488.998 92.12)" fill="#30ba78"/><circle id="Ellipse_5155" data-name="Ellipse 5155" cx="1.5" cy="1.5" r="1.5" transform="translate(3508.998 92.12)" fill="#30ba78"/><circle id="Ellipse_5156" data-name="Ellipse 5156" cx="1.5" cy="1.5" r="1.5" transform="translate(3468.998 112.12)" fill="#30ba78"/><circle id="Ellipse_5157" data-name="Ellipse 5157" cx="1.5" cy="1.5" r="1.5" transform="translate(3488.998 112.12)" fill="#30ba78"/><circle id="Ellipse_5158" data-name="Ellipse 5158" cx="1.5" cy="1.5" r="1.5" transform="translate(3508.998 112.12)" fill="#30ba78"/><circle id="Ellipse_5159" data-name="Ellipse 5159" cx="1.5" cy="1.5" r="1.5" transform="translate(3468.998 132.12)" fill="#30ba78"/><circle id="Ellipse_5160" data-name="Ellipse 5160" cx="1.5" cy="1.5" r="1.5" transform="translate(3488.998 132.12)" fill="#30ba78"/><circle id="Ellipse_5161" data-name="Ellipse 5161" cx="1.5" cy="1.5" r="1.5" transform="translate(3508.998 132.12)" fill="#30ba78"/></g><g id="Group_873" data-name="Group 873"><circle id="Ellipse_5162" data-name="Ellipse 5162" cx="1.5" cy="1.5" r="1.5" transform="translate(3468.998 150.12)" fill="#30ba78"/><circle id="Ellipse_5163" data-name="Ellipse 5163" cx="1.5" cy="1.5" r="1.5" transform="translate(3488.998 150.12)" fill="#30ba78"/><circle id="Ellipse_5164" data-name="Ellipse 5164" cx="1.5" cy="1.5" r="1.5" transform="translate(3508.998 150.12)" fill="#30ba78"/></g><g id="Group_874" data-name="Group 874"><rect id="Rectangle_2064" data-name="Rectangle 2064" width="78" height="78" transform="translate(3383.497 64.62)" fill="none"/><circle id="Ellipse_5165" data-name="Ellipse 5165" cx="1.5" cy="1.5" r="1.5" transform="translate(3390.998 72.12)" fill="#30ba78"/><circle id="Ellipse_5166" data-name="Ellipse 5166" cx="1.5" cy="1.5" r="1.5" transform="translate(3410.998 72.12)" fill="#30ba78"/><circle id="Ellipse_5167" data-name="Ellipse 5167" cx="1.5" cy="1.5" r="1.5" transform="translate(3430.998 72.12)" fill="#30ba78"/><circle id="Ellipse_5168" data-name="Ellipse 5168" cx="1.5" cy="1.5" r="1.5" transform="translate(3450.998 72.12)" fill="#30ba78"/><circle id="Ellipse_5169" data-name="Ellipse 5169" cx="1.5" cy="1.5" r="1.5" transform="translate(3390.998 92.12)" fill="#30ba78"/><circle id="Ellipse_5170" data-name="Ellipse 5170" cx="1.5" cy="1.5" r="1.5" transform="translate(3410.998 92.12)" fill="#30ba78"/><circle id="Ellipse_5171" data-name="Ellipse 5171" cx="1.5" cy="1.5" r="1.5" transform="translate(3430.998 92.12)" fill="#30ba78"/><circle id="Ellipse_5172" data-name="Ellipse 5172" cx="1.5" cy="1.5" r="1.5" transform="translate(3450.998 92.12)" fill="#30ba78"/><circle id="Ellipse_5173" data-name="Ellipse 5173" cx="1.5" cy="1.5" r="1.5" transform="translate(3390.998 112.12)" fill="#30ba78"/><circle id="Ellipse_5174" data-name="Ellipse 5174" cx="1.5" cy="1.5" r="1.5" transform="translate(3410.998 112.12)" fill="#30ba78"/><circle id="Ellipse_5175" data-name="Ellipse 5175" cx="1.5" cy="1.5" r="1.5" transform="translate(3430.998 112.12)" fill="#30ba78"/><circle id="Ellipse_5176" data-name="Ellipse 5176" cx="1.5" cy="1.5" r="1.5" transform="translate(3450.998 112.12)" fill="#30ba78"/><circle id="Ellipse_5177" data-name="Ellipse 5177" cx="1.5" cy="1.5" r="1.5" transform="translate(3390.998 132.12)" fill="#30ba78"/><circle id="Ellipse_5178" data-name="Ellipse 5178" cx="1.5" cy="1.5" r="1.5" transform="translate(3410.998 132.12)" fill="#30ba78"/><circle id="Ellipse_5179" data-name="Ellipse 5179" cx="1.5" cy="1.5" r="1.5" transform="translate(3430.998 132.12)" fill="#30ba78"/><circle id="Ellipse_5180" data-name="Ellipse 5180" cx="1.5" cy="1.5" r="1.5" transform="translate(3450.998 132.12)" fill="#30ba78"/></g><g id="Group_875" data-name="Group 875"><circle id="Ellipse_5181" data-name="Ellipse 5181" cx="1.5" cy="1.5" r="1.5" transform="translate(3450.998 150.12)" fill="#30ba78"/></g></g></g></g></g></svg>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/assets/custom/login/suse-logo-dark.svg b/src/frontend/packages/suse-extensions/assets/custom/login/suse-logo-dark.svg
new file mode 100644
index 0000000000..0b04bd9b06
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/assets/custom/login/suse-logo-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64.804" height="56.333" viewBox="0 0 64.804 56.333"><g id="Group_886" data-name="Group 886" transform="translate(-27.115 -27.141)"><path id="Path_646" data-name="Path 646" d="M57.557,100.141v8.676a6.231,6.231,0,0,1-1.648,4.7,6.655,6.655,0,0,1-4.8,1.59,6.656,6.656,0,0,1-4.8-1.59,6.229,6.229,0,0,1-1.648-4.7v-8.676a1.29,1.29,0,0,1,2.58,0v8.364a4.885,4.885,0,0,0,.944,3.31,3.72,3.72,0,0,0,2.928,1.063,3.721,3.721,0,0,0,2.927-1.063,4.888,4.888,0,0,0,.943-3.31v-8.364a1.29,1.29,0,0,1,2.581,0Zm-23.538,5.764a9.553,9.553,0,0,1-3.154-.968,1.723,1.723,0,0,1-.884-1.519,2,2,0,0,1,.908-1.684,4.31,4.31,0,0,1,2.558-.657,4.9,4.9,0,0,1,2.677.645,3.908,3.908,0,0,1,.985.926,1.225,1.225,0,1,0,1.883-1.564,6.371,6.371,0,0,0-1.853-1.441,8.075,8.075,0,0,0-3.716-.789,7.71,7.71,0,0,0-3.262.646,5.052,5.052,0,0,0-2.139,1.744,4.269,4.269,0,0,0-.741,2.437,3.8,3.8,0,0,0,.586,2.151,4.368,4.368,0,0,0,1.876,1.482,14.988,14.988,0,0,0,3.465,1,9.959,9.959,0,0,1,3.047.932,1.574,1.574,0,0,1,.872,1.386,1.839,1.839,0,0,1-.968,1.661,5.14,5.14,0,0,1-2.664.586,6.114,6.114,0,0,1-3-.669,4.533,4.533,0,0,1-1.235-1.014,1.218,1.218,0,0,0-1.778-.048l0,0a1.216,1.216,0,0,0-.06,1.667q2.045,2.283,6.1,2.283a8.906,8.906,0,0,0,3.286-.562,4.958,4.958,0,0,0,2.21-1.613,3.952,3.952,0,0,0,.789-2.438,3.858,3.858,0,0,0-.573-2.163,4.275,4.275,0,0,0-1.829-1.458A14.067,14.067,0,0,0,34.019,105.905Zm35.293-.005a9.531,9.531,0,0,1-3.154-.968,1.721,1.721,0,0,1-.884-1.517,2,2,0,0,1,.908-1.685,4.307,4.307,0,0,1,2.558-.657,4.894,4.894,0,0,1,2.677.645,3.945,3.945,0,0,1,.985.925,1.224,1.224,0,1,0,1.883-1.563,6.346,6.346,0,0,0-1.853-1.441,8.071,8.071,0,0,0-3.716-.788,7.7,7.7,0,0,0-3.262.645,5.045,5.045,0,0,0-2.139,1.744,4.262,4.262,0,0,0-.741,2.437,3.8,3.8,0,0,0,.586,2.151,4.368,4.368,0,0,0,1.876,1.482,14.976,14.976,0,0,0,3.466,1,9.972,9.972,0,0,1,3.047.932,1.575,1.575,0,0,1,.874,1.386,1.839,1.839,0,0,1-.97,1.661,5.127,5.127,0,0,1-2.663.586,6.112,6.112,0,0,1-3-.669,4.544,4.544,0,0,1-1.236-1.014,1.217,1.217,0,0,0-1.777-.048l0,0a1.215,1.215,0,0,0-.06,1.667q2.045,2.283,6.1,2.283a8.91,8.91,0,0,0,3.287-.562,4.962,4.962,0,0,0,2.21-1.613,3.953,3.953,0,0,0,.788-2.438,3.855,3.855,0,0,0-.573-2.162,4.274,4.274,0,0,0-1.828-1.458A14.1,14.1,0,0,0,69.312,105.9Zm21.05,6.739H83.2a1,1,0,0,1-1-1v-3.616h6.909a1.076,1.076,0,0,0,0-2.151H82.2v-3.558a1,1,0,0,1,1-1h7.158a1.128,1.128,0,1,0,0-2.256H83.2a3.261,3.261,0,0,0-3.257,3.258v9.326A3.262,3.262,0,0,0,83.2,114.9h7.158a1.129,1.129,0,1,0,0-2.257Z" transform="translate(0 -31.631)" fill="#0c322c"/><path id="Path_647" data-name="Path 647" d="M71.052,51.509a5.542,5.542,0,0,1,.74,1.355,1.519,1.519,0,0,0,.555.9.344.344,0,0,0,.051.023,8.456,8.456,0,0,0,2.051.173h2.716c.231,0,2.271,0,2.22-.23-.244-1.091-1.507-1.286-2.467-1.856a4.391,4.391,0,0,1-2.106-2.156,3.109,3.109,0,0,1,.262-2.2,1.754,1.754,0,0,1,1.012-.624,4.3,4.3,0,0,1,1.33.032c.539.055,1.073.153,1.61.22a20.21,20.21,0,0,0,3.135.162,17.345,17.345,0,0,0,5.1-.882A11.657,11.657,0,0,0,90.5,44.8c1.105-.822.817-.744-.3-.63a25.109,25.109,0,0,1-4.043.078,8.6,8.6,0,0,1-6-2.445.49.49,0,0,1,.022-.625c.188-.2.587-.082.711.022a8.756,8.756,0,0,0,4.994,1.979c1.033.051,2.039.071,3.073.025.516-.023,1.3-.02,1.814-.025.268,0,1,.074,1.134-.21a.566.566,0,0,0,.034-.271c-.151-4.135-.457-8.8-4.784-10.777-3.229-1.476-8.07-3.763-10.115-4.712A.727.727,0,0,0,76,27.869c0,1.382.071,3.366.071,5.172a13.31,13.31,0,0,0-3.886-2.2,36.555,36.555,0,0,0-4.4-1.677A47.18,47.18,0,0,0,58.5,27.336a35.577,35.577,0,0,0-10.7.54,33.069,33.069,0,0,0-15.772,8.042c-2.647,2.495-4.724,6.039-4.865,9.638-.2,5.093,1.226,7.828,3.849,10.646C35.2,60.694,44.2,61.323,47.845,56a8.7,8.7,0,0,0,.806-8.3,7.988,7.988,0,0,0-6.827-4.661,5.726,5.726,0,0,0-5.512,3.152,4.543,4.543,0,0,0,.914,4.788,1.97,1.97,0,0,0,1.791.721,1.014,1.014,0,0,0,.809-.809c.09-.609-.443-1-.771-1.472a2.26,2.26,0,0,1,.269-2.829,3.424,3.424,0,0,1,2.422-.783,4.639,4.639,0,0,1,2.339.556,4.136,4.136,0,0,1,1.861,2.756c.675,3.344-2.043,6.061-5.731,6.276a7.684,7.684,0,0,1-5.278-1.57c-3.728-3-4.642-9.13-.379-12.4,4.045-3.106,9.152-2.305,12.163-.691a14.667,14.667,0,0,1,5.567,5.741,34.622,34.622,0,0,1,1.805,3.649A8.276,8.276,0,0,0,56.138,53.4a3.5,3.5,0,0,0,2.439.562h5.147c.7,0,.529-.466.226-.774a5.3,5.3,0,0,0-2.57-1.105c-2.073-.57-1.862-3.316-1.288-3.316,1.854,0,1.914.055,3.538.034,2.346-.032,3.054-.168,4.887.511A6.094,6.094,0,0,1,71.052,51.509ZM90,36.375a3.9,3.9,0,1,1-2.907-2.9A3.9,3.9,0,0,1,90,36.375Zm-1.658,2.3a1.054,1.054,0,0,1-1.325-1.626,1.034,1.034,0,0,1,1.489,0A1.059,1.059,0,0,1,88.343,38.677Z" transform="translate(-0.016)" fill="#30ba78"/></g></svg>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/assets/custom/login/suse-logo-light.svg b/src/frontend/packages/suse-extensions/assets/custom/login/suse-logo-light.svg
new file mode 100644
index 0000000000..fa3148dd68
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/assets/custom/login/suse-logo-light.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="70.917" height="62.04" viewBox="0 0 70.917 62.04"><g id="Group_271" data-name="Group 271" transform="translate(-2151.086 -921.086)"><g id="Path_362" data-name="Path 362"><path id="Path_633" data-name="Path 633" d="M2220.32,980.421h-7.837a1.1,1.1,0,0,1-1.1-1.1v-3.977h7.563a1.183,1.183,0,0,0,0-2.365h-7.563v-3.915a1.1,1.1,0,0,1,1.1-1.1h7.836a1.241,1.241,0,0,0,0-2.482h-7.836a3.578,3.578,0,0,0-3.566,3.583v10.256a3.578,3.578,0,0,0,3.566,3.582h7.836a1.241,1.241,0,0,0,0-2.482m-23.044-7.411a10.42,10.42,0,0,1-3.454-1.064,1.9,1.9,0,0,1-.968-1.669,2.2,2.2,0,0,1,.994-1.852,4.7,4.7,0,0,1,2.8-.723,5.342,5.342,0,0,1,2.931.71,4.31,4.31,0,0,1,1.078,1.017,1.335,1.335,0,0,0,1.872.251c.03-.023.059-.047.087-.072a1.355,1.355,0,0,0,.1-1.9,6.99,6.99,0,0,0-2.028-1.584,8.818,8.818,0,0,0-4.068-.867,8.409,8.409,0,0,0-3.57.71,5.525,5.525,0,0,0-2.343,1.919,4.688,4.688,0,0,0-.811,2.68,4.185,4.185,0,0,0,.641,2.365,4.784,4.784,0,0,0,2.053,1.63,16.313,16.313,0,0,0,3.8,1.1,10.885,10.885,0,0,1,3.335,1.025,1.734,1.734,0,0,1,.956,1.524,2.026,2.026,0,0,1-1.061,1.827,5.594,5.594,0,0,1-2.917.644,6.661,6.661,0,0,1-3.284-.736,4.967,4.967,0,0,1-1.353-1.115,1.327,1.327,0,0,0-1.873-.121c-.025.022-.049.044-.072.068l-.005.005a1.339,1.339,0,0,0-.065,1.832q2.238,2.512,6.677,2.51a9.7,9.7,0,0,0,3.6-.618,5.434,5.434,0,0,0,2.42-1.774,4.367,4.367,0,0,0,.863-2.681,4.26,4.26,0,0,0-.628-2.378,4.671,4.671,0,0,0-2-1.6,15.354,15.354,0,0,0-3.7-1.065m-38.636.005a10.42,10.42,0,0,1-3.453-1.064,1.9,1.9,0,0,1-.969-1.67,2.2,2.2,0,0,1,.995-1.853,4.7,4.7,0,0,1,2.8-.722,5.337,5.337,0,0,1,2.93.71,4.276,4.276,0,0,1,1.078,1.018,1.338,1.338,0,0,0,1.875.248c.029-.023.057-.046.084-.071a1.351,1.351,0,0,0,.1-1.9,7,7,0,0,0-2.028-1.585,8.815,8.815,0,0,0-4.069-.866,8.423,8.423,0,0,0-3.571.709,5.555,5.555,0,0,0-2.341,1.919,4.713,4.713,0,0,0-.81,2.68,4.19,4.19,0,0,0,.64,2.365,4.792,4.792,0,0,0,2.055,1.631,16.374,16.374,0,0,0,3.793,1.1,10.89,10.89,0,0,1,3.337,1.025,1.732,1.732,0,0,1,.953,1.524,2.024,2.024,0,0,1-1.059,1.827,5.615,5.615,0,0,1-2.918.643,6.667,6.667,0,0,1-3.284-.736,4.96,4.96,0,0,1-1.352-1.115,1.328,1.328,0,0,0-1.875-.119c-.025.021-.049.044-.072.067h0a1.343,1.343,0,0,0-.066,1.833q2.239,2.512,6.679,2.51a9.716,9.716,0,0,0,3.6-.617,5.421,5.421,0,0,0,2.421-1.775,4.351,4.351,0,0,0,.863-2.681,4.25,4.25,0,0,0-.628-2.378,4.671,4.671,0,0,0-2-1.6,15.355,15.355,0,0,0-3.7-1.064m25.768-6.339v9.54a6.868,6.868,0,0,1-1.8,5.164,8.785,8.785,0,0,1-10.517,0,6.869,6.869,0,0,1-1.8-5.164v-9.54a1.412,1.412,0,1,1,2.824-.012v9.212a5.391,5.391,0,0,0,1.035,3.641,4.976,4.976,0,0,0,6.409,0,5.39,5.39,0,0,0,1.033-3.641v-9.2a1.413,1.413,0,1,1,2.826-.008v.008" fill="#fff" fill-rule="evenodd"/></g><g id="Path_363" data-name="Path 363"><path id="Path_634" data-name="Path 634" d="M2218.189,932.006a1.126,1.126,0,0,0-1.592-.039l-.039.039a1.168,1.168,0,0,0,.012,1.653,1.114,1.114,0,0,0,.169.138,1.15,1.15,0,0,0,1.268,0,1.171,1.171,0,0,0,.318-1.625,1.154,1.154,0,0,0-.136-.167m-1.491-3.946a4.291,4.291,0,1,0,3.182,3.2,4.293,4.293,0,0,0-3.182-3.2m-20.337,17.46c-2.007-.747-2.783-.6-5.35-.562-1.778.023-1.843-.038-3.873-.038-.627,0-.859,3.026,1.41,3.655a5.794,5.794,0,0,1,2.815,1.217c.33.341.516.854-.248.854h-5.632a3.816,3.816,0,0,1-2.67-.618,9.127,9.127,0,0,1-2.238-3.622,38.121,38.121,0,0,0-1.976-4.022,16.1,16.1,0,0,0-6.094-6.326c-3.3-1.779-8.887-2.662-13.314.761-4.666,3.608-3.666,10.364.415,13.669a8.376,8.376,0,0,0,5.778,1.73c4.036-.236,7.013-3.232,6.274-6.917a4.561,4.561,0,0,0-2.038-3.037,5.074,5.074,0,0,0-2.561-.613,3.745,3.745,0,0,0-2.651.863,2.5,2.5,0,0,0-.294,3.118c.359.516.942.95.844,1.622a1.118,1.118,0,0,1-.886.892,2.15,2.15,0,0,1-1.96-.8,5.03,5.03,0,0,1-1-5.277,6.262,6.262,0,0,1,6.034-3.473,8.748,8.748,0,0,1,7.474,5.137,9.635,9.635,0,0,1-.882,9.148c-3.99,5.87-13.842,5.177-18.419.226-2.872-3.106-4.432-6.12-4.213-11.733.153-3.966,2.427-7.872,5.325-10.621a36.092,36.092,0,0,1,17.264-8.863,38.681,38.681,0,0,1,11.71-.6,51.322,51.322,0,0,1,10.165,2.01,40.154,40.154,0,0,1,4.817,1.848,14.578,14.578,0,0,1,4.254,2.429c0-1.99-.077-4.178-.077-5.7a.8.8,0,0,1,.8-.795.813.813,0,0,1,.322.07c2.237,1.044,7.536,3.566,11.07,5.192,4.737,2.179,5.073,7.32,5.237,11.878a.612.612,0,0,1-.037.3c-.149.313-.947.228-1.24.232-.566.006-1.421,0-1.986.028-1.132.05-2.233.03-3.364-.028a9.537,9.537,0,0,1-5.466-2.182c-.135-.114-.573-.239-.779-.024a.542.542,0,0,0-.024.689,9.368,9.368,0,0,0,6.572,2.694,27.141,27.141,0,0,0,4.425-.086c1.227-.126,1.545-.211.335.7a12.777,12.777,0,0,1-3.55,1.791,18.879,18.879,0,0,1-5.583.972,21.993,21.993,0,0,1-3.432-.177c-.588-.074-1.172-.182-1.763-.243a4.7,4.7,0,0,0-1.454-.035,1.907,1.907,0,0,0-1.108.687,3.438,3.438,0,0,0-.287,2.428,4.823,4.823,0,0,0,2.306,2.376c1.051.628,2.432.843,2.7,2.046.055.252-2.177.259-2.431.254h-2.973a9.239,9.239,0,0,1-2.245-.191.252.252,0,0,1-.056-.025,1.674,1.674,0,0,1-.608-1,6.178,6.178,0,0,0-.81-1.493,6.692,6.692,0,0,0-2.776-2.421m22.51-13.281a3.152,3.152,0,1,1-3.153-3.172,3.152,3.152,0,0,1,3.153,3.172" fill="#30ba78" fill-rule="evenodd"/></g></g></svg>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/assets/custom/suse_login_logo.svg b/src/frontend/packages/suse-extensions/assets/custom/suse_login_logo.svg
deleted file mode 100644
index 7b8bbf809e..0000000000
--- a/src/frontend/packages/suse-extensions/assets/custom/suse_login_logo.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="270" height="90" viewBox="0, 0, 270, 90">
-  <g id="Layer_1">
-    <g>
-      <path d="M238.462,55.726 L224.907,55.726 C223.862,55.726 223.011,54.876 223.011,53.83 L223.011,46.982 L236.095,46.982 C237.219,46.982 238.131,46.071 238.131,44.946 C238.131,43.821 237.219,42.909 236.095,42.909 L223.011,42.909 L223.011,36.17 C223.011,35.124 223.862,34.273 224.907,34.273 L238.462,34.273 C239.642,34.273 240.6,33.318 240.6,32.137 C240.6,30.957 239.642,30 238.462,30 L224.907,30 C221.507,30 218.738,32.767 218.738,36.17 L218.738,53.83 C218.738,57.232 221.507,59.999 224.907,59.999 L238.462,59.999 C239.642,59.999 240.6,59.044 240.6,57.864 C240.6,56.683 239.642,55.726 238.462,55.726 M198.602,42.965 C195.736,42.45 193.743,41.842 192.628,41.132 C191.511,40.423 190.953,39.466 190.953,38.259 C190.953,36.963 191.526,35.898 192.672,35.068 C193.819,34.24 195.433,33.824 197.516,33.824 C199.628,33.824 201.317,34.23 202.585,35.046 C203.267,35.485 203.888,36.068 204.448,36.798 C205.274,37.866 206.833,38.008 207.837,37.104 C208.784,36.25 208.867,34.786 208.015,33.836 C206.987,32.688 205.818,31.779 204.508,31.109 C202.561,30.113 200.215,29.616 197.471,29.616 C195.117,29.616 193.058,30.022 191.294,30.837 C189.529,31.651 188.177,32.753 187.243,34.14 C186.307,35.529 185.84,37.067 185.84,38.757 C185.84,40.356 186.208,41.713 186.949,42.829 C187.687,43.947 188.873,44.881 190.502,45.635 C192.13,46.39 194.317,47.023 197.063,47.536 C199.809,48.05 201.732,48.637 202.833,49.301 C203.935,49.965 204.485,50.839 204.485,51.924 C204.485,53.283 203.875,54.332 202.651,55.071 C201.431,55.81 199.748,56.18 197.606,56.18 C195.343,56.18 193.45,55.758 191.926,54.912 C191.056,54.429 190.277,53.789 189.587,52.992 C188.719,51.985 187.161,51.961 186.222,52.901 L186.214,52.911 C185.354,53.769 185.288,55.162 186.099,56.066 C188.681,58.948 192.533,60.388 197.651,60.388 C200.004,60.388 202.079,60.033 203.875,59.324 C205.67,58.616 207.063,57.598 208.059,56.271 C209.056,54.943 209.554,53.404 209.554,51.653 C209.554,50.025 209.192,48.66 208.468,47.559 C207.743,46.458 206.59,45.537 205.005,44.799 C203.422,44.059 201.287,43.448 198.602,42.965 M131.77,42.974 C128.904,42.459 126.913,41.85 125.797,41.141 C124.68,40.432 124.123,39.474 124.123,38.266 C124.123,36.97 124.696,35.906 125.842,35.077 C126.989,34.248 128.603,33.832 130.685,33.832 C132.795,33.832 134.486,34.24 135.753,35.054 C136.437,35.493 137.058,36.077 137.618,36.806 C138.442,37.876 140.002,38.017 141.006,37.113 C141.954,36.258 142.036,34.794 141.184,33.845 C140.156,32.696 138.986,31.787 137.677,31.117 C135.731,30.122 133.384,29.624 130.639,29.624 C128.286,29.624 126.227,30.031 124.463,30.845 C122.697,31.659 121.347,32.762 120.412,34.15 C119.477,35.537 119.009,37.075 119.009,38.765 C119.009,40.364 119.377,41.723 120.118,42.837 C120.857,43.954 122.042,44.891 123.67,45.644 C125.299,46.399 127.487,47.032 130.232,47.545 C132.977,48.058 134.9,48.647 136.002,49.31 C137.103,49.973 137.654,50.848 137.654,51.934 C137.654,53.292 137.043,54.34 135.822,55.079 C134.599,55.819 132.917,56.188 130.776,56.188 C128.512,56.188 126.618,55.766 125.095,54.92 C124.226,54.438 123.446,53.798 122.758,53.001 C121.89,51.993 120.331,51.97 119.39,52.911 L119.383,52.919 C118.523,53.777 118.457,55.17 119.268,56.074 C121.85,58.957 125.701,60.396 130.821,60.396 C133.174,60.396 135.248,60.042 137.043,59.333 C138.838,58.625 140.233,57.605 141.229,56.278 C142.225,54.952 142.722,53.411 142.722,51.662 C142.722,50.033 142.36,48.669 141.636,47.567 C140.911,46.465 139.759,45.546 138.173,44.807 C136.59,44.067 134.456,43.457 131.77,42.974 M176.343,32.059 L176.343,48.487 C176.343,52.408 175.302,55.372 173.221,57.379 C171.139,59.386 168.107,60.388 164.126,60.388 C160.142,60.388 157.11,59.386 155.028,57.379 C152.947,55.372 151.907,52.408 151.907,48.487 L151.907,32.059 C151.907,30.709 152.999,29.616 154.349,29.616 C155.698,29.616 156.794,30.709 156.794,32.059 L156.794,47.898 C156.794,50.735 157.389,52.824 158.581,54.166 C159.773,55.508 161.62,56.18 164.126,56.18 C166.63,56.18 168.476,55.508 169.668,54.166 C170.86,52.824 171.456,50.735 171.456,47.898 L171.456,32.059 C171.456,30.709 172.551,29.616 173.899,29.616 C175.249,29.616 176.343,30.709 176.343,32.059" fill="#0C322C"/>
-      <path d="M101.408,42.16 C101.003,42.429 100.461,42.429 100.055,42.16 C99.391,41.719 99.327,40.797 99.863,40.264 C100.339,39.771 101.124,39.771 101.6,40.263 C102.135,40.797 102.07,41.719 101.408,42.16 M103.344,39.473 C104.116,42.757 101.164,45.71 97.88,44.938 C96.208,44.546 94.881,43.219 94.488,41.548 C93.718,38.266 96.669,35.315 99.952,36.084 C101.623,36.475 102.951,37.801 103.344,39.473 M81.232,57.135 C81.607,57.674 81.919,58.195 82.094,58.716 C82.218,59.086 82.377,59.574 82.742,59.77 C82.762,59.781 82.78,59.791 82.802,59.797 C83.472,60.041 85.195,60 85.195,60 L88.364,60 C88.635,60.004 91.016,59.997 90.956,59.731 C90.669,58.458 89.197,58.23 88.076,57.564 C87.043,56.948 86.063,56.25 85.619,55.049 C85.387,54.429 85.524,52.999 85.923,52.478 C86.214,52.101 86.643,51.851 87.104,51.75 C87.615,51.641 88.145,51.735 88.656,51.787 C89.286,51.851 89.908,51.965 90.536,52.043 C91.748,52.201 92.972,52.264 94.194,52.231 C96.211,52.175 98.233,51.854 100.145,51.202 C101.48,50.754 102.795,50.148 103.93,49.305 C105.22,48.346 104.881,48.436 103.573,48.57 C102.007,48.73 100.427,48.754 98.856,48.661 C97.39,48.576 95.944,48.403 94.618,47.722 C93.574,47.183 92.677,46.643 91.849,45.808 C91.725,45.682 91.648,45.314 91.875,45.079 C92.095,44.851 92.561,44.983 92.704,45.105 C94.148,46.312 96.302,47.306 98.532,47.414 C99.738,47.474 100.911,47.496 102.118,47.444 C102.721,47.416 103.631,47.42 104.236,47.414 C104.548,47.41 105.399,47.5 105.558,47.169 C105.606,47.073 105.602,46.962 105.598,46.854 C105.421,42.028 105.064,36.585 100.014,34.278 C96.246,32.555 90.597,29.886 88.211,28.779 C87.658,28.516 87.011,28.932 87.011,29.548 C87.011,31.16 87.093,33.476 87.094,35.584 C85.951,34.42 84.026,33.685 82.559,33.011 C80.893,32.247 79.173,31.599 77.423,31.054 C73.9,29.963 70.254,29.291 66.587,28.927 C62.428,28.512 58.199,28.711 54.104,29.557 C47.36,30.955 40.731,34.198 35.699,38.941 C32.61,41.851 30.186,45.988 30.022,50.187 C29.788,56.13 31.453,59.321 34.513,62.61 C39.393,67.852 49.896,68.586 54.15,62.37 C56.064,59.572 56.479,55.777 55.09,52.684 C53.701,49.593 50.508,47.359 47.123,47.245 C44.496,47.158 41.697,48.494 40.69,50.923 C39.922,52.778 40.359,55.07 41.758,56.51 C42.303,57.072 43.041,57.532 43.847,57.352 C44.322,57.246 44.719,56.889 44.791,56.407 C44.897,55.696 44.275,55.235 43.892,54.689 C43.201,53.704 43.341,52.225 44.206,51.388 C44.936,50.681 46.017,50.472 47.033,50.475 C47.979,50.477 48.946,50.646 49.762,51.123 C50.909,51.798 51.671,53.034 51.935,54.34 C52.722,58.243 49.549,61.414 45.247,61.663 C43.046,61.793 40.806,61.215 39.088,59.832 C34.737,56.332 33.671,49.178 38.644,45.359 C43.365,41.734 49.325,42.668 52.839,44.552 C55.651,46.059 57.747,48.525 59.335,51.251 C60.132,52.622 60.811,54.055 61.441,55.51 C62.047,56.909 62.614,58.319 63.827,59.344 C64.63,60.024 65.621,60 66.673,60 L72.678,60 C73.494,60 73.295,59.456 72.943,59.096 C72.147,58.282 71.003,58.098 69.944,57.807 C67.523,57.141 67.77,53.936 68.44,53.936 C70.604,53.936 70.672,54.001 72.568,53.977 C75.304,53.939 76.132,53.78 78.272,54.571 C79.416,54.995 80.515,56.113 81.232,57.135" fill="#30BA78"/>
-    </g>
-  </g>
-</svg>
diff --git a/src/frontend/packages/suse-extensions/assets/custom/suse_logo.svg b/src/frontend/packages/suse-extensions/assets/custom/suse_logo.svg
deleted file mode 100644
index 140888bd1a..0000000000
--- a/src/frontend/packages/suse-extensions/assets/custom/suse_logo.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="90" height="30" viewBox="0, 0, 90, 30">
-  <g id="Layer_1">
-    <g>
-      <path d="M33.238,14.348 C33.06,14.466 32.821,14.466 32.643,14.348 C32.351,14.154 32.323,13.748 32.559,13.513 C32.768,13.296 33.114,13.296 33.323,13.513 C33.558,13.748 33.53,14.154 33.238,14.348 M33.936,13.378 C34.208,14.532 33.17,15.571 32.015,15.299 C31.428,15.161 30.961,14.695 30.823,14.107 C30.552,12.953 31.59,11.916 32.744,12.187 C33.331,12.324 33.798,12.79 33.936,13.378 M34.214,16.233 C33.789,16.195 33.805,15.69 34.33,15.743 C34.488,15.759 35.006,15.778 35.14,15.61 C35.201,15.534 35.192,15.387 35.19,15.351 C35.112,13.99 35.021,12.195 33.338,11.426 C32.082,10.852 30.199,9.962 29.404,9.593 C29.219,9.506 29.004,9.644 29.004,9.849 C29.004,10.344 29.027,10.881 29.027,11.57 C29.027,11.702 29.048,11.968 28.996,11.997 C28.947,12.024 28.874,11.822 28.694,11.671 C28.388,11.413 27.97,11.211 27.52,11.004 C26.964,10.749 26.391,10.533 25.808,10.352 C24.633,9.988 23.418,9.764 22.195,9.642 C20.81,9.504 19.4,9.57 18.034,9.852 C15.787,10.318 13.577,11.4 11.9,12.98 C10.87,13.951 10.062,15.329 10.007,16.729 C9.929,18.71 10.484,19.774 11.505,20.87 C13.131,22.617 16.632,22.862 18.05,20.79 C18.688,19.857 18.826,18.592 18.363,17.561 C17.9,16.531 16.836,15.786 15.708,15.748 C14.832,15.719 13.899,16.165 13.564,16.974 C13.307,17.592 13.453,18.356 13.919,18.837 C14.101,19.024 14.347,19.177 14.616,19.117 C14.774,19.082 14.906,18.963 14.93,18.802 C14.966,18.565 14.758,18.412 14.63,18.23 C14.4,17.901 14.447,17.408 14.735,17.129 C14.979,16.894 15.339,16.824 15.678,16.825 C15.993,16.825 16.315,16.882 16.587,17.041 C16.97,17.266 17.224,17.678 17.312,18.113 C17.574,19.414 16.517,20.471 15.082,20.555 C14.349,20.598 13.602,20.405 13.029,19.944 C11.579,18.778 11.224,16.393 12.881,15.12 C14.455,13.911 16.442,14.223 17.613,14.851 C18.55,15.353 19.249,16.175 19.778,17.084 C20.044,17.541 20.27,18.018 20.48,18.503 C20.682,18.97 20.871,19.44 21.276,19.781 C21.543,20.008 21.874,20 22.224,20 L24.226,20 C24.498,20 24.432,19.819 24.314,19.699 C24.049,19.427 23.668,19.366 23.314,19.269 C22.508,19.047 22.59,17.979 22.813,17.979 C23.535,17.979 23.558,18 24.189,17.992 C25.102,17.98 25.377,17.927 26.09,18.191 C26.472,18.332 26.838,18.705 27.077,19.045 C27.202,19.225 27.306,19.398 27.365,19.572 C27.406,19.695 27.459,19.858 27.581,19.923 C27.587,19.927 27.594,19.93 27.601,19.932 C27.824,20.014 28.398,20 28.398,20 L29.455,20 C29.545,20.001 30.339,19.999 30.319,19.91 C30.223,19.486 29.732,19.41 29.359,19.188 C29.014,18.983 28.688,18.75 28.539,18.35 C28.462,18.143 28.508,17.666 28.641,17.492 C28.738,17.367 28.881,17.284 29.035,17.25 C29.205,17.213 29.382,17.245 29.552,17.262 C29.762,17.284 29.969,17.322 30.178,17.348 C30.583,17.4 30.991,17.422 31.398,17.411 C32.07,17.392 32.744,17.284 33.382,17.067 C33.827,16.918 33.848,16.89 34.269,16.68 C34.909,16.36 34.434,16.253 34.214,16.233" fill="#30BA78"/>
-      <path d="M74.969,19.927 C73.874,19.927 72.983,19.036 72.983,17.941 L72.983,12.055 C72.983,10.96 73.874,10.069 74.969,10.069 L79.488,10.069 C79.842,10.069 80.13,10.357 80.13,10.71 C80.13,11.064 79.842,11.352 79.488,11.352 L74.969,11.352 C74.582,11.352 74.267,11.667 74.267,12.055 L74.267,14.372 L78.698,14.372 C79.034,14.372 79.306,14.645 79.306,14.98 C79.306,15.315 79.034,15.588 78.698,15.588 L74.267,15.588 L74.267,17.941 C74.267,18.329 74.582,18.644 74.969,18.644 L79.488,18.644 C79.842,18.644 80.13,18.932 80.13,19.286 C80.13,19.64 79.842,19.927 79.488,19.927 z M54.709,20.057 C53.406,20.057 52.402,19.726 51.725,19.073 C51.049,18.422 50.707,17.442 50.707,16.16 L50.707,10.684 C50.707,10.274 51.04,9.94 51.45,9.94 C51.86,9.94 52.194,10.274 52.194,10.684 L52.194,15.964 C52.194,16.923 52.401,17.642 52.808,18.1 C53.218,18.561 53.857,18.795 54.709,18.795 C55.56,18.795 56.199,18.561 56.609,18.1 C57.016,17.642 57.223,16.923 57.223,15.964 L57.223,10.684 C57.223,10.274 57.557,9.94 57.967,9.94 C58.377,9.94 58.711,10.274 58.711,10.684 L58.711,16.16 C58.711,17.441 58.368,18.421 57.691,19.073 C57.015,19.726 56.012,20.057 54.709,20.057 M65.884,20.057 C64.206,20.057 62.928,19.58 62.086,18.64 C61.842,18.368 61.858,17.948 62.121,17.685 L62.124,17.682 L62.127,17.679 C62.26,17.547 62.438,17.474 62.626,17.474 C62.826,17.474 63.014,17.559 63.143,17.708 C63.378,17.979 63.646,18.2 63.942,18.364 C64.457,18.65 65.106,18.795 65.869,18.795 C66.594,18.795 67.172,18.667 67.587,18.415 C68.015,18.156 68.233,17.783 68.233,17.306 C68.233,16.92 68.036,16.605 67.648,16.371 C67.271,16.144 66.634,15.949 65.701,15.774 C64.795,15.605 64.065,15.394 63.53,15.146 C63.002,14.901 62.613,14.595 62.376,14.235 C62.138,13.878 62.018,13.434 62.018,12.917 C62.018,12.37 62.171,11.866 62.473,11.417 C62.776,10.968 63.221,10.606 63.794,10.341 C64.371,10.075 65.054,9.94 65.824,9.94 C66.724,9.94 67.502,10.105 68.137,10.43 C68.564,10.648 68.95,10.949 69.287,11.324 C69.543,11.611 69.519,12.055 69.232,12.314 C69.103,12.43 68.936,12.494 68.763,12.494 C68.543,12.494 68.34,12.394 68.206,12.221 C68.015,11.973 67.8,11.771 67.567,11.621 C67.135,11.343 66.554,11.202 65.839,11.202 C65.134,11.202 64.577,11.346 64.184,11.63 C63.784,11.919 63.581,12.297 63.581,12.751 C63.581,13.177 63.78,13.52 64.172,13.768 C64.553,14.011 65.213,14.214 66.188,14.389 C67.074,14.548 67.786,14.752 68.305,14.995 C68.818,15.234 69.197,15.535 69.431,15.89 C69.663,16.244 69.781,16.69 69.781,17.216 C69.781,17.781 69.618,18.285 69.297,18.713 C68.974,19.143 68.515,19.478 67.933,19.707 C67.346,19.939 66.657,20.057 65.884,20.057 M43.607,20.059 C41.929,20.059 40.651,19.582 39.809,18.642 C39.565,18.371 39.581,17.951 39.844,17.687 L39.848,17.683 C39.982,17.55 40.16,17.477 40.35,17.477 C40.55,17.477 40.738,17.562 40.866,17.711 C41.1,17.982 41.368,18.202 41.664,18.366 C42.18,18.653 42.829,18.798 43.592,18.798 C44.316,18.798 44.894,18.67 45.311,18.418 C45.739,18.159 45.956,17.786 45.956,17.309 C45.956,16.923 45.759,16.608 45.371,16.374 C44.993,16.147 44.356,15.951 43.424,15.776 C42.518,15.608 41.788,15.396 41.253,15.149 C40.725,14.904 40.336,14.597 40.098,14.238 C39.861,13.881 39.741,13.437 39.741,12.92 C39.741,12.373 39.894,11.869 40.196,11.421 C40.499,10.971 40.944,10.609 41.517,10.344 C42.093,10.078 42.776,9.943 43.547,9.943 C44.447,9.943 45.225,10.108 45.86,10.433 C46.287,10.652 46.674,10.952 47.009,11.327 C47.266,11.614 47.242,12.057 46.955,12.317 C46.826,12.433 46.659,12.497 46.485,12.497 C46.266,12.497 46.063,12.397 45.929,12.224 C45.739,11.976 45.523,11.774 45.29,11.623 C44.857,11.345 44.276,11.205 43.562,11.205 C42.856,11.205 42.3,11.349 41.906,11.633 C41.507,11.923 41.304,12.3 41.304,12.754 C41.304,13.18 41.503,13.522 41.895,13.771 C42.276,14.014 42.935,14.217 43.912,14.392 C44.796,14.551 45.508,14.754 46.029,14.997 C46.542,15.237 46.92,15.539 47.153,15.892 C47.386,16.246 47.504,16.692 47.504,17.219 C47.504,17.784 47.341,18.288 47.02,18.715 C46.697,19.146 46.238,19.481 45.655,19.71 C45.068,19.942 44.379,20.059 43.607,20.059" fill="#FFFFFF"/>
-    </g>
-  </g>
-</svg>
diff --git a/src/frontend/packages/suse-extensions/assets/suse_login_logo.svg b/src/frontend/packages/suse-extensions/assets/suse_login_logo.svg
deleted file mode 100644
index 7b8bbf809e..0000000000
--- a/src/frontend/packages/suse-extensions/assets/suse_login_logo.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="270" height="90" viewBox="0, 0, 270, 90">
-  <g id="Layer_1">
-    <g>
-      <path d="M238.462,55.726 L224.907,55.726 C223.862,55.726 223.011,54.876 223.011,53.83 L223.011,46.982 L236.095,46.982 C237.219,46.982 238.131,46.071 238.131,44.946 C238.131,43.821 237.219,42.909 236.095,42.909 L223.011,42.909 L223.011,36.17 C223.011,35.124 223.862,34.273 224.907,34.273 L238.462,34.273 C239.642,34.273 240.6,33.318 240.6,32.137 C240.6,30.957 239.642,30 238.462,30 L224.907,30 C221.507,30 218.738,32.767 218.738,36.17 L218.738,53.83 C218.738,57.232 221.507,59.999 224.907,59.999 L238.462,59.999 C239.642,59.999 240.6,59.044 240.6,57.864 C240.6,56.683 239.642,55.726 238.462,55.726 M198.602,42.965 C195.736,42.45 193.743,41.842 192.628,41.132 C191.511,40.423 190.953,39.466 190.953,38.259 C190.953,36.963 191.526,35.898 192.672,35.068 C193.819,34.24 195.433,33.824 197.516,33.824 C199.628,33.824 201.317,34.23 202.585,35.046 C203.267,35.485 203.888,36.068 204.448,36.798 C205.274,37.866 206.833,38.008 207.837,37.104 C208.784,36.25 208.867,34.786 208.015,33.836 C206.987,32.688 205.818,31.779 204.508,31.109 C202.561,30.113 200.215,29.616 197.471,29.616 C195.117,29.616 193.058,30.022 191.294,30.837 C189.529,31.651 188.177,32.753 187.243,34.14 C186.307,35.529 185.84,37.067 185.84,38.757 C185.84,40.356 186.208,41.713 186.949,42.829 C187.687,43.947 188.873,44.881 190.502,45.635 C192.13,46.39 194.317,47.023 197.063,47.536 C199.809,48.05 201.732,48.637 202.833,49.301 C203.935,49.965 204.485,50.839 204.485,51.924 C204.485,53.283 203.875,54.332 202.651,55.071 C201.431,55.81 199.748,56.18 197.606,56.18 C195.343,56.18 193.45,55.758 191.926,54.912 C191.056,54.429 190.277,53.789 189.587,52.992 C188.719,51.985 187.161,51.961 186.222,52.901 L186.214,52.911 C185.354,53.769 185.288,55.162 186.099,56.066 C188.681,58.948 192.533,60.388 197.651,60.388 C200.004,60.388 202.079,60.033 203.875,59.324 C205.67,58.616 207.063,57.598 208.059,56.271 C209.056,54.943 209.554,53.404 209.554,51.653 C209.554,50.025 209.192,48.66 208.468,47.559 C207.743,46.458 206.59,45.537 205.005,44.799 C203.422,44.059 201.287,43.448 198.602,42.965 M131.77,42.974 C128.904,42.459 126.913,41.85 125.797,41.141 C124.68,40.432 124.123,39.474 124.123,38.266 C124.123,36.97 124.696,35.906 125.842,35.077 C126.989,34.248 128.603,33.832 130.685,33.832 C132.795,33.832 134.486,34.24 135.753,35.054 C136.437,35.493 137.058,36.077 137.618,36.806 C138.442,37.876 140.002,38.017 141.006,37.113 C141.954,36.258 142.036,34.794 141.184,33.845 C140.156,32.696 138.986,31.787 137.677,31.117 C135.731,30.122 133.384,29.624 130.639,29.624 C128.286,29.624 126.227,30.031 124.463,30.845 C122.697,31.659 121.347,32.762 120.412,34.15 C119.477,35.537 119.009,37.075 119.009,38.765 C119.009,40.364 119.377,41.723 120.118,42.837 C120.857,43.954 122.042,44.891 123.67,45.644 C125.299,46.399 127.487,47.032 130.232,47.545 C132.977,48.058 134.9,48.647 136.002,49.31 C137.103,49.973 137.654,50.848 137.654,51.934 C137.654,53.292 137.043,54.34 135.822,55.079 C134.599,55.819 132.917,56.188 130.776,56.188 C128.512,56.188 126.618,55.766 125.095,54.92 C124.226,54.438 123.446,53.798 122.758,53.001 C121.89,51.993 120.331,51.97 119.39,52.911 L119.383,52.919 C118.523,53.777 118.457,55.17 119.268,56.074 C121.85,58.957 125.701,60.396 130.821,60.396 C133.174,60.396 135.248,60.042 137.043,59.333 C138.838,58.625 140.233,57.605 141.229,56.278 C142.225,54.952 142.722,53.411 142.722,51.662 C142.722,50.033 142.36,48.669 141.636,47.567 C140.911,46.465 139.759,45.546 138.173,44.807 C136.59,44.067 134.456,43.457 131.77,42.974 M176.343,32.059 L176.343,48.487 C176.343,52.408 175.302,55.372 173.221,57.379 C171.139,59.386 168.107,60.388 164.126,60.388 C160.142,60.388 157.11,59.386 155.028,57.379 C152.947,55.372 151.907,52.408 151.907,48.487 L151.907,32.059 C151.907,30.709 152.999,29.616 154.349,29.616 C155.698,29.616 156.794,30.709 156.794,32.059 L156.794,47.898 C156.794,50.735 157.389,52.824 158.581,54.166 C159.773,55.508 161.62,56.18 164.126,56.18 C166.63,56.18 168.476,55.508 169.668,54.166 C170.86,52.824 171.456,50.735 171.456,47.898 L171.456,32.059 C171.456,30.709 172.551,29.616 173.899,29.616 C175.249,29.616 176.343,30.709 176.343,32.059" fill="#0C322C"/>
-      <path d="M101.408,42.16 C101.003,42.429 100.461,42.429 100.055,42.16 C99.391,41.719 99.327,40.797 99.863,40.264 C100.339,39.771 101.124,39.771 101.6,40.263 C102.135,40.797 102.07,41.719 101.408,42.16 M103.344,39.473 C104.116,42.757 101.164,45.71 97.88,44.938 C96.208,44.546 94.881,43.219 94.488,41.548 C93.718,38.266 96.669,35.315 99.952,36.084 C101.623,36.475 102.951,37.801 103.344,39.473 M81.232,57.135 C81.607,57.674 81.919,58.195 82.094,58.716 C82.218,59.086 82.377,59.574 82.742,59.77 C82.762,59.781 82.78,59.791 82.802,59.797 C83.472,60.041 85.195,60 85.195,60 L88.364,60 C88.635,60.004 91.016,59.997 90.956,59.731 C90.669,58.458 89.197,58.23 88.076,57.564 C87.043,56.948 86.063,56.25 85.619,55.049 C85.387,54.429 85.524,52.999 85.923,52.478 C86.214,52.101 86.643,51.851 87.104,51.75 C87.615,51.641 88.145,51.735 88.656,51.787 C89.286,51.851 89.908,51.965 90.536,52.043 C91.748,52.201 92.972,52.264 94.194,52.231 C96.211,52.175 98.233,51.854 100.145,51.202 C101.48,50.754 102.795,50.148 103.93,49.305 C105.22,48.346 104.881,48.436 103.573,48.57 C102.007,48.73 100.427,48.754 98.856,48.661 C97.39,48.576 95.944,48.403 94.618,47.722 C93.574,47.183 92.677,46.643 91.849,45.808 C91.725,45.682 91.648,45.314 91.875,45.079 C92.095,44.851 92.561,44.983 92.704,45.105 C94.148,46.312 96.302,47.306 98.532,47.414 C99.738,47.474 100.911,47.496 102.118,47.444 C102.721,47.416 103.631,47.42 104.236,47.414 C104.548,47.41 105.399,47.5 105.558,47.169 C105.606,47.073 105.602,46.962 105.598,46.854 C105.421,42.028 105.064,36.585 100.014,34.278 C96.246,32.555 90.597,29.886 88.211,28.779 C87.658,28.516 87.011,28.932 87.011,29.548 C87.011,31.16 87.093,33.476 87.094,35.584 C85.951,34.42 84.026,33.685 82.559,33.011 C80.893,32.247 79.173,31.599 77.423,31.054 C73.9,29.963 70.254,29.291 66.587,28.927 C62.428,28.512 58.199,28.711 54.104,29.557 C47.36,30.955 40.731,34.198 35.699,38.941 C32.61,41.851 30.186,45.988 30.022,50.187 C29.788,56.13 31.453,59.321 34.513,62.61 C39.393,67.852 49.896,68.586 54.15,62.37 C56.064,59.572 56.479,55.777 55.09,52.684 C53.701,49.593 50.508,47.359 47.123,47.245 C44.496,47.158 41.697,48.494 40.69,50.923 C39.922,52.778 40.359,55.07 41.758,56.51 C42.303,57.072 43.041,57.532 43.847,57.352 C44.322,57.246 44.719,56.889 44.791,56.407 C44.897,55.696 44.275,55.235 43.892,54.689 C43.201,53.704 43.341,52.225 44.206,51.388 C44.936,50.681 46.017,50.472 47.033,50.475 C47.979,50.477 48.946,50.646 49.762,51.123 C50.909,51.798 51.671,53.034 51.935,54.34 C52.722,58.243 49.549,61.414 45.247,61.663 C43.046,61.793 40.806,61.215 39.088,59.832 C34.737,56.332 33.671,49.178 38.644,45.359 C43.365,41.734 49.325,42.668 52.839,44.552 C55.651,46.059 57.747,48.525 59.335,51.251 C60.132,52.622 60.811,54.055 61.441,55.51 C62.047,56.909 62.614,58.319 63.827,59.344 C64.63,60.024 65.621,60 66.673,60 L72.678,60 C73.494,60 73.295,59.456 72.943,59.096 C72.147,58.282 71.003,58.098 69.944,57.807 C67.523,57.141 67.77,53.936 68.44,53.936 C70.604,53.936 70.672,54.001 72.568,53.977 C75.304,53.939 76.132,53.78 78.272,54.571 C79.416,54.995 80.515,56.113 81.232,57.135" fill="#30BA78"/>
-    </g>
-  </g>
-</svg>
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html
index 66a45dbc77..57577ea756 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html
@@ -1,43 +1,58 @@
-<div class="suse-login" id="app-login-page">
-  <div class="suse-login__header">
-    <div class="suse-login__title">SUSE Stratos Console</div>
-  </div>
-  <div class="suse-login__content" [ngClass]="{'suse-login-sso': ssoLogin}">
+<div class="suse-login" id="app-login-page" [ngClass]="{'suse-login-sso': ssoLogin}" >
+  <div class="suse-login__content">
     <div class="suse-login__intro">
-      <h1 class="suse-login__headline">SUSE<br>Stratos<br>Console</h1>
+      <img class="suse-login__intro-img-left" src="/core/assets/custom/login/suse-logo-light.svg">
+      <img class="suse-login__intro-img" src="/core/assets/custom/login/sign-in-lock-1.svg">
+      <h1 class="suse-login__headline">SUSE<br>Stratos Console</h1>
       <p class="suse-login__tagline">Manage and monitor Cloud Foundry and Kubernetes systems and workloads.</p>
-    </div>
-    <div class="suse-login__box" [ngClass]="{'suse-login__busy': busy$ | async }">
-      <div *ngIf="!ssoLogin" class="suse-login__form-title">Sign in</div>
-      <div class="suse-login__form-outer">
-        <form class="suse-login__form" name="loginForm" (ngSubmit)="login()" #loginForm="ngForm">
-          <mat-form-field *ngIf="!ssoLogin" [hideRequiredMarker]="true">
-            <input matInput required [(ngModel)]="username" name="username" placeholder="Username">
-          </mat-form-field>
-          <mat-form-field *ngIf="!ssoLogin" [hideRequiredMarker]="true">
-            <input matInput required type="password" [(ngModel)]="password" name="password" placeholder="Password">
-          </mat-form-field>
-          <button class="suse-login__submit" color="primary" *ngIf="!loggedIn" type="submit" mat-button
-            mat-raised-button [disabled]="!loginForm.valid">
-            {{ !ssoLogin ? 'Login' : 'Login with SSO' }}
-          </button>
-        </form>
+      <div class="suse-login__line">
+        <img src="/core/assets/custom/login/sign-in-line.svg">
       </div>
-      <div id="login__loading" class="suse-login__loading">
-        <mat-progress-bar mode="indeterminate"></mat-progress-bar>
+      <div *ngIf="ssoLogin" class="suse-login__sso-container" [ngClass]="{'suse-login__busy': busy$ | async }">
+        <ng-container *ngTemplateOutlet="loginform"></ng-container>
       </div>
-      <div id="login-error-message" class="suse-login__message"
-        [ngClass]="{'suse-login__message--show': !!message, 'suse-login__message-error': this.error}">
-        {{ message }}
+      <div class="suse-login__footer">
+        <div class="suse-login__copyright">
+          <span *ngIf="config.copyright" [innerHTML]="config.copyright"></span>
+        </div>
       </div>
     </div>
-  </div>
-  <div class="suse-login__footer">
-    <div class="suse-login__copyright">
-      <span *ngIf="config.copyright" [innerHTML]="config.copyright"></span>
-    </div>
-    <div class="suse-login__logo">
-      <a href="https://www.suse.com" target="_blank"><img src="/core/assets/custom/suse_login_logo.svg"></a>
+    <div class="suse-login__right" *ngIf="!ssoLogin">
+      <img class="suse-login__logo-mobile" src="/core/assets/custom/login/suse-logo-dark.svg">
+      <div class="suse-login__footer-mobile">
+        <div class="suse-login__copyright">
+          <span *ngIf="config.copyright" [innerHTML]="config.copyright"></span>
+        </div>
+      </div>
+
+      <div class="suse-login__box" [ngClass]="{'suse-login__busy': busy$ | async }">
+        <div *ngIf="!ssoLogin" class="suse-login__form-title">Sign in</div>
+        <ng-container *ngTemplateOutlet="loginform"></ng-container>
+      </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
+
+<ng-template #loginform>
+  <div class="suse-login__form-outer">
+    <form class="suse-login__form" name="loginForm" (ngSubmit)="login()" #loginForm="ngForm">
+      <mat-form-field *ngIf="!ssoLogin" [hideRequiredMarker]="true">
+        <input matInput required [(ngModel)]="username" name="username" placeholder="Username">
+      </mat-form-field>
+      <mat-form-field *ngIf="!ssoLogin" [hideRequiredMarker]="true">
+        <input matInput required type="password" [(ngModel)]="password" name="password" placeholder="Password">
+      </mat-form-field>
+      <button class="suse-login__submit" [ngClass]="{'suse-login__sso-button': ssoLogin}" color="primary" *ngIf="!loggedIn" type="submit" mat-button
+        mat-raised-button [disabled]="!loginForm.valid">
+        {{ !ssoLogin ? 'Login' : 'Login with SSO' }}
+      </button>
+    </form>
+  </div>
+  <div id="login__loading" class="suse-login__loading">
+    <mat-progress-bar mode="indeterminate"></mat-progress-bar>
+  </div>
+  <div id="login-error-message" class="suse-login__message"
+    [ngClass]="{'suse-login__message--show': !!message, 'suse-login__message-error': this.error}">
+    {{ message }}
+  </div>
+</ng-template>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
index c84aae5cfa..a7b3338ac5 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
@@ -1,13 +1,21 @@
 @import '../../../../suse-theme/sass/colors';
 
+app-suse-login {
+  background: url(/core/assets/custom/login/sign-in-bg.svg) #7AD4AA no-repeat center fixed;
+  background-size: cover;
+  display: flex;
+  justify-content: center;
+  height: 100vh;
+  width: 100%;
+}
+
 .suse-login {
   align-items: center;
-  background-color: $suse-gray;
+  align-self: center;
+  background-color: #fff;
   color: $suse-gray-fg;
   display: flex;
   flex-direction: column;
-  width: 100%;
-  height: 100%;
   &__header,
   &__content,
   &__footer {
@@ -28,43 +36,60 @@
     align-items: flex-start;
     color: $suse-text;
     flex: 1;
-    margin-top: 100px;
-    overflow-y: auto;
-    width: 90%;
+    width: 1120px;
   }
   &__footer {
     flex: 0 0 auto;
-    width: 90%;
-    padding: 20px 0;
+    padding: 20px 0 0 0;
   }
   &__title {
     font-family: "Work Sans";
     width: 90%;
   }
   &__copyright {
-    color: $suse-gray-fg;
     flex: 1;
+    font-size: 12px;
+    opacity: 0.7;
   }
   &__logo {
     img {
       width: 128px;
     }
   }
+  &__footer-mobile {
+    display: none;
+  }
   &__intro {
-    flex: 1;
+    background-color: $suse-dark-green;
+    display: flex;
+    flex: 0 0 445px;
+    flex-direction: column;
     font-family: "Work Sans";
-    margin-right: 24px;
+    padding: 32px;
+    &-img {
+      margin-bottom: 1rem;
+    }
+    &-img-left {
+      align-self: flex-start;
+      margin-bottom: 1rem;
+    }
+  }
+  &__line {
+    margin: 32px -32px;
+    overflow: hidden;
   }
   &__box {
     display: flex;
-    flex: 1;
     flex-direction: column;
     justify-content: center;
-    margin-left: 24px;
+    width: 75%;
   }
   &__form {
     display: flex;
     flex-direction: column;
+    .mat-form-field {
+      margin-bottom: 12px;
+    }
     .mat-form-field:not(.mat-form-field-invalid).mat-form-field-appearance-legacy {
       color: $suse-gray-fg;
       .mat-form-field-label {
@@ -81,37 +106,44 @@
     }
     margin-top: 24px;
   }
+  &__right {
+    align-self: center;
+    display: flex;
+    justify-content: center;
+    flex: 1;
+  }
+  &__logo-mobile {
+    display: none;
+  }
   &__headline {
     color: $suse-primary-color;
     font-family: "Work Sans";
-    font-size: 52px;
+    font-size: 28px;
     font-weight: 300;
+    line-height: 1.5;
     margin: 0;
+    margin-bottom: .5rem;    
   }
   &__tagline {
-    color: $suse-gray-fg;
     font-family: "Work Sans";
-    font-size: 18px;
+    font-size: 14px;
     font-weight: 300;
     line-height: 1.5;
-    margin: 24px 0;
+    margin: 0;
   }
   &__form-outer {
-    max-width: 400px;
     opacity: 1;
     transition: opacity 250ms linear;
   }
   &__form-title {
-    color: $suse-gray-fg;
-    font-size: 30px;
+    color: $suse-primary-color;
+    font-size: 28px;
     font-weight: 300;
     margin-bottom: 24px;
     transition: opacity 250ms linear;
   }
   &__loading {
-    display: none;
     margin-top: 24px;
-    max-width: 400px;
     opacity: 0;
     transition: opacity 250ms linear;
   }
@@ -129,42 +161,103 @@
   }
   &__message {
     color: $suse-gray-fg;
-    font-size: 18px;
-    font-weight: 300;
-    height: 20px;
+    font-size: 14px;
+    height: 24px;
     max-width: 400px;
     padding-top: 20px;
   }
+
+  &__sso-button.mat-button.suse-login__submit {
+    align-self: center;
+    padding: 0 60px;
+  }
+
 }
 
-// If SSO Login, move the form underneath the intro
+// If SSO Login change the presentation
 .suse-login-sso {
-  &.suse-login__content {
-    flex-direction: column;
-    .suse-login__intro {
-      flex: 0;
-    }
-    .suse-login__box {
-      justify-content: flex-start;
-      margin-left: 0;
-    }
+  .suse-login__intro {
+    flex: 1;
+  };
+  .suse-login__line IMG {
+    height: 0;
+    padding: 20px;
+  }
+  .suse-login__sso-button.mat-button.suse-login__submit {
+    align-self: flex-start;
+  }
+
+
+}
+
+@media only screen and (max-width: 1120px) {
+
+  .suse-login {
+    align-self: unset;
+    height: 100%;
+    width: 100%;
+  }
+
+  .suse-login__content {
+    width: 100%;
+  }
+
+  .suse-login__intro {
+    flex: 0;
+    height: 100%;
+    width: 335px;
+  }
+
+  .suse-login__right {
+    align-self: unset;
+    margin-top: 120px;
   }
 }
 
-// On small screens, hide the intro and just show the login box
-@media(max-width: 768px) {
-  .suse-login:not(.suse-login-sso) {
+// Mobile - login form only (unless SSO)
+@media only screen and (max-width: 768px) {
+
+  .suse-login:not(.suse-login-sso)  {
+  
     .suse-login {
-      &__intro {
-        display: none;
-      }
-      &__box {
-        margin: 0;
-      }
-      &__content {
-        max-width: 400px;
-        width: 80%;
-      }
+      
+    &__intro {
+      display: none;
+    }
+
+    &__logo-mobile {
+      display: inline;
+      left: 30px;
+      position: absolute;
+      top: 30px;
+    }
+
+    &__footer-mobile {
+      align-items: flex-end;
+      background-color: #fff;
+      bottom: 0;
+      color: #000;
+      display: flex;
+      height: 60px;
+      padding: 30px;
+      position: fixed;
+      width: 100%;
+      z-index: 1;
+    }
+
+    &__right {
+      margin-bottom: 60px;
     }
   }
 }
+}
+
+
+// Sticky copyright footer
+@media only screen and (min-height: 580px) and (max-width: 1120px) {
+
+  .suse-login__footer {
+    position: fixed;
+    bottom: 20px;
+  }
+}

From 008570bbfcd0863411b123639af1b8af79053d2e Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Thu, 27 Aug 2020 15:35:07 +0100
Subject: [PATCH 600/648] Show caasp node versions and indicate if nodes have
 updates available (#451)

* Show caasp node versions and indicate if nodes have updates available

* Fix hasBooleanAnnoation typo, ensure CAASP_SECURITY_UPDATES_ANNOTATION is used

* Add caasp update info to nodes list and node summary

* Fix boolean-indicator bug
- subtle, if set late, was not taken into account

* Move caasp update info to the summary card

* Change title of summary card to general information
- avoids summary title x 2 (page title and card title)

* Revert "Move caasp update info to the summary card"

This reverts commit 82212987e878248fef613cb8c37188ca66b23c7f.

* Move caasp update info into summary container

Co-authored-by: Richard Cox <richard.cox@suse.com>
---
 .../boolean-indicator.component.ts            | 11 ++-
 .../suse-extensions/sass/_all-theme.scss      |  4 +
 .../kubernetes-node-link.component.html       |  5 +-
 .../kubernetes-node-link.component.scss       |  8 ++
 .../kubernetes-node-link.component.theme.scss | 18 +++++
 .../kubernetes-node-link.component.ts         | 25 +++++-
 ...ubernetes-node-condition-card.component.ts | 29 ++++++-
 .../kubernetes-node-condition.component.html  |  4 +-
 .../kubernetes-node-condition.component.ts    | 20 ++++-
 ...ubernetes-node-summary-card.component.html | 24 +++++-
 ...ubernetes-node-summary-card.component.scss |  4 +-
 .../kubernetes-node-summary-card.component.ts | 31 ++++++--
 .../services/kubernetes-endpoint.service.ts   | 77 +++++++++++++++++++
 .../services/kubernetes-node.service.ts       |  5 +-
 .../src/custom/kubernetes/store/kube.types.ts | 10 ++-
 .../kubernetes-summary.component.html         | 20 +++++
 .../kubernetes-summary.component.scss         | 26 +++++++
 .../kubernetes-summary.component.theme.scss   | 19 +++--
 .../kubernetes-summary.component.ts           |  6 +-
 19 files changed, 314 insertions(+), 32 deletions(-)
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.theme.scss

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 4a544a0d27..6a1675dc5f 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
@@ -38,7 +38,16 @@ export class BooleanIndicatorComponent {
   // Invert the text labels with the icons (No text for yes value and vice-versa)
   @Input() inverse = false;
   // Should we use a subtle display - this won't show the No option as danger (typically red)
-  @Input() subtle = true;
+  private pSubtle = true;
+  @Input()
+  get subtle(): boolean {
+    return this.pSubtle;
+  }
+  set subtle(subtle: boolean) {
+    this.pSubtle = subtle;
+    this.updateBooleanOutput();
+  }
+
   @Input() showText = true;
 
   private pType: BooleanIndicatorType;
diff --git a/src/frontend/packages/suse-extensions/sass/_all-theme.scss b/src/frontend/packages/suse-extensions/sass/_all-theme.scss
index 9f21f4317f..5afbb47729 100644
--- a/src/frontend/packages/suse-extensions/sass/_all-theme.scss
+++ b/src/frontend/packages/suse-extensions/sass/_all-theme.scss
@@ -1,16 +1,20 @@
 // Theming for the copmponents in the Kubernetes package
 
+@import '../src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.theme';
 @import '../src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.theme';
 @import '../src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.theme';
 @import '../src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.theme';
+@import '../src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.theme';
 
 @mixin apply-theme-suse-extensions($stratos-theme) {
 
   $theme: map-get($stratos-theme, theme);
   $app-theme: map-get($stratos-theme, app-theme);
 
+  @include kube-summary-theme($theme, $app-theme);
   @include kube-analysis-report-theme($theme, $app-theme);
   @include kube-analysis-card-theme($theme, $app-theme);
   @include monocular-chart-card($theme, $app-theme);
+  @include kube-node-link-theme($theme, $app-theme);
 
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html
index 99161c715c..c425c5f39e 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html
@@ -1 +1,4 @@
-<a [routerLink]="nodeLink">{{row.metadata.name}}</a>
+<div class="node-link">
+  <a [routerLink]="nodeLink">{{row.metadata.name}}</a>
+  <mat-icon *ngIf="icon" class="{{icon.class}}" [matTooltip]="icon.message">{{icon.icon}}</mat-icon>
+</div>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.scss
index e69de29bb2..24cbdb0c59 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.scss
@@ -0,0 +1,8 @@
+.node-link {
+  align-items: center;
+  display: flex;
+  flex-direction: row;
+  mat-icon {
+    padding-left: 10px;
+  }
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.theme.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.theme.scss
new file mode 100644
index 0000000000..387f85d461
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.theme.scss
@@ -0,0 +1,18 @@
+
+@mixin kube-node-link-theme($theme, $app-theme) {
+
+  $status-colors: map-get($app-theme, status);
+  $error: map-get($status-colors, danger);
+  $warning: map-get($status-colors, warning);
+
+  .node-link {
+    .mat-icon {
+      &.error {
+        color: $error;
+      }
+      &.warning {
+        color: $warning;
+      }
+    }
+  }
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts
index 39dc89844f..d5c05226f8 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts
@@ -11,7 +11,14 @@ import { KubernetesNode } from '../../../store/kube.types';
 })
 export class KubernetesNodeLinkComponent extends TableCellCustom<KubernetesNode> implements OnInit {
 
-  public nodeLink;
+  public nodeLink: string;
+
+  public icon: {
+    icon: string,
+    class: string,
+    message: string
+  };
+
   constructor(
     private kubeEndpointService: KubernetesEndpointService
   ) {
@@ -20,6 +27,22 @@ export class KubernetesNodeLinkComponent extends TableCellCustom<KubernetesNode>
 
   ngOnInit() {
     this.nodeLink = `/kubernetes/${this.kubeEndpointService.kubeGuid}/nodes/${this.row.metadata.name}`;
+    const caaspNodeData = this.kubeEndpointService.getCaaspNodeData(this.row);
+    if (caaspNodeData) {
+      if (caaspNodeData.securityUpdates) {
+        this.icon = {
+          icon: 'error',
+          class: 'error',
+          message: 'Node has security updates'
+        };
+      } else if (caaspNodeData.disruptiveUpdates) {
+        this.icon = {
+          icon: 'warning',
+          class: 'warning',
+          message: 'Node has disruptive updates'
+        };
+      }
+    }
   }
 
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts
index 1046605a5f..b778e37518 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts
@@ -1,8 +1,35 @@
 import { Component } from '@angular/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { CaaspNodeData, KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service';
+import { KubernetesNodeService } from '../../../../services/kubernetes-node.service';
 
 @Component({
   selector: 'app-kubernetes-node-condition-card',
   templateUrl: './kubernetes-node-condition-card.component.html',
   styleUrls: ['./kubernetes-node-condition-card.component.scss']
 })
-export class KubernetesNodeConditionCardComponent { }
+export class KubernetesNodeConditionCardComponent {
+  public caaspNode$: Observable<CaaspNodeData>;
+  public caaspNodeDisruptive$: Observable<boolean>;
+  public caaspNodSecurity$: Observable<boolean>;
+
+  constructor(
+    public kubeEndpointService: KubernetesEndpointService,
+    public kubeNodeService: KubernetesNodeService
+  ) {
+
+    this.caaspNode$ = this.kubeNodeService.nodeEntity$.pipe(
+      map(node => kubeEndpointService.getCaaspNodeData(node)),
+    );
+
+    this.caaspNodeDisruptive$ = this.caaspNode$.pipe(
+      map(node => node.disruptiveUpdates)
+    )
+
+    this.caaspNodSecurity$ = this.caaspNode$.pipe(
+      map(node => node.securityUpdates)
+    )
+  }
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html
index ea848be216..ae2fa2e27d 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="condition$ | async as conditionValue" class="kube-node-condition">
+<div *ngIf="hasCondition$ | async" class="kube-node-condition" [ngStyle]="{'padding-top': paddingTop}">
   <div class="kube-node-condition__title">
     <mat-icon [fontSet]="icons[condition][1]">{{ icons[condition][0] }}</mat-icon>
     <div>
@@ -6,5 +6,5 @@
     </div>
   </div>
   <app-boolean-indicator class="kube-node-condition__indicator" [subtle]="subtle" [inverse]="inverse"
-    [isTrue]="conditionValue" type="yes-no"></app-boolean-indicator>
+    [isTrue]="condition$ | async" [type]="type"></app-boolean-indicator>
 </div>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts
index 08b17950bf..010f8acf94 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts
@@ -16,6 +16,13 @@ export class KubernetesNodeConditionComponent implements OnInit {
   @Input()
   condition: ConditionType;
   condition$: Observable<boolean>;
+  hasCondition$: Observable<boolean>;
+
+  @Input()
+  overrideCondition$: Observable<boolean>;
+
+  @Input()
+  type = 'yes-no'
 
   @Input()
   inverse = false;
@@ -23,6 +30,9 @@ export class KubernetesNodeConditionComponent implements OnInit {
   @Input()
   subtle = false;
 
+  @Input()
+  paddingTop = '20px';
+
   public titles = ConditionTypeLabels;
 
   public icons = {
@@ -31,7 +41,10 @@ export class KubernetesNodeConditionComponent implements OnInit {
     MemoryPressure: ['memory', 'material-icons'],
     DiskPressure: ['storage', 'material-icons'],
     PIDPressure: ['vertical_align_center', 'material-icons'],
-    NetworkUnavailable: ['settings_ethernet', 'material-icons']
+    NetworkUnavailable: ['settings_ethernet', 'material-icons'],
+    CaaspUpdates: ['vertical_align_top', 'material-icons'],
+    CaaspDisruptive: ['warning', 'material-icons'],
+    CaaspSecurity: ['security', 'material-icons']
   };
 
   constructor(
@@ -39,13 +52,16 @@ export class KubernetesNodeConditionComponent implements OnInit {
   ) { }
 
   ngOnInit() {
-    this.condition$ = this.kubeNodeService.node$.pipe(
+    this.condition$ = this.overrideCondition$ ? this.overrideCondition$ : this.kubeNodeService.node$.pipe(
       filter(p => !!p && !!p.entity),
       map(p => p.entity.status.conditions),
       map(conditions => conditions.filter(o => o.type === this.condition)),
       filter(conditions => !!conditions.length),
       map(conditions => this.shouldBeGreen(conditions[0]))
     );
+    this.hasCondition$ = this.condition$.pipe(
+      map(() => true)
+    )
   }
 
   shouldBeGreen(condition: KubernetesCondition) {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.html
index d5347278d9..c0d7270b8f 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.html
@@ -1,14 +1,30 @@
 <div class="kubernetes-node-summary-card">
   <mat-card>
     <mat-card-header>
-      <mat-card-title>Summary</mat-card-title>
+      <mat-card-title>General Information</mat-card-title>
     </mat-card-header>
     <mat-card-content>
       <div class="kubernetes-node-summary-card__content">
-        <app-metadata-item icon="title" label="Name">{{ (kubeNodeService.nodeEntity$ | async)?.metadata.name }}</app-metadata-item>
-        <app-metadata-item icon="today" label="Created">{{ (kubeNodeService.nodeEntity$ | async)?.metadata.creationTimestamp | date:'medium' }}</app-metadata-item>
+        <app-metadata-item icon="title" label="Name">{{ (kubeNodeService.nodeEntity$ | async)?.metadata.name }}
+        </app-metadata-item>
+        <app-metadata-item icon="today" label="Created">
+          {{ (kubeNodeService.nodeEntity$ | async)?.metadata.creationTimestamp | date:'medium' }}</app-metadata-item>
+        <ng-container *ngIf="caaspNode$ | async as caaspNode">
+          <app-metadata-item icon="info_outline" label="CaaSP Version" *ngIf="caaspNode.version">
+            {{ caaspNode.version }}</app-metadata-item>
+          <app-kubernetes-node-condition [inverse]="true" [subtle]="false" type="no-yes" condition="CaaspUpdates"
+            [overrideCondition$]="caaspNodeUpdates$" [paddingTop]="'0'">
+          </app-kubernetes-node-condition>
+          <app-kubernetes-node-condition [inverse]="true" [subtle]="false" type="no-yes" condition="CaaspDisruptive"
+            [overrideCondition$]="caaspNodeDisruptive$" [paddingTop]="'12px'">
+          </app-kubernetes-node-condition>
+          <app-kubernetes-node-condition [inverse]="true" [subtle]="false" type="no-yes" condition="CaaspSecurity"
+            [overrideCondition$]="caaspNodeSecurity$" [paddingTop]="'12px'">
+          </app-kubernetes-node-condition>
+        </ng-container>
+
       </div>
     </mat-card-content>
   </mat-card>
 
-</div>
+</div>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.scss
index 42591c3cc6..f3257a9b10 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.scss
@@ -1,3 +1,3 @@
 .kubernetes-node-summary-card {
-    height: 100%
-}
\ No newline at end of file
+  height: 100%;
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts
index 1f18811511..8b088c3d70 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts
@@ -1,10 +1,9 @@
 import { Component } from '@angular/core';
 import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 
-import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
-import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service';
+import { CaaspNodeData, KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service';
 import { KubernetesNodeService } from '../../../../services/kubernetes-node.service';
-import { KubernetesNode } from '../../../../store/kube.types';
 
 @Component({
   selector: 'app-kubernetes-node-summary-card',
@@ -12,12 +11,30 @@ import { KubernetesNode } from '../../../../store/kube.types';
   styleUrls: ['./kubernetes-node-summary-card.component.scss']
 })
 export class KubernetesNodeSummaryCardComponent {
-  node$: Observable<KubernetesNode>;
-  labels$: Observable<AppChip[]>;
-  annotations$: Observable<AppChip[]>;
+  public caaspVersion$: Observable<string>;
+  public caaspNode$: Observable<CaaspNodeData>;
+  public caaspNodeUpdates$: Observable<boolean>;
+  public caaspNodeDisruptive$: Observable<boolean>;
+  public caaspNodeSecurity$: Observable<boolean>;
 
   constructor(
     public kubeEndpointService: KubernetesEndpointService,
     public kubeNodeService: KubernetesNodeService
-  ) { }
+  ) {
+    this.caaspNode$ = this.kubeNodeService.nodeEntity$.pipe(
+      map(node => kubeEndpointService.getCaaspNodeData(node)),
+    );
+
+    this.caaspNodeUpdates$ = this.caaspNode$.pipe(
+      map(node => node.updates)
+    )
+
+    this.caaspNodeDisruptive$ = this.caaspNode$.pipe(
+      map(node => node.disruptiveUpdates)
+    )
+
+    this.caaspNodeSecurity$ = this.caaspNode$.pipe(
+      map(node => node.securityUpdates)
+    )
+  }
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-endpoint.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-endpoint.service.ts
index 8b8927e376..2fe71f3803 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-endpoint.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-endpoint.service.ts
@@ -20,6 +20,28 @@ import {
   KubeService,
 } from '../store/kube.types';
 import { KubeDashboardStatus } from '../store/kubernetes.effects';
+import { Annotations } from './../store/kube.types';
+
+const CAASP_VERSION_ANNOTATION = 'caasp.suse.com/caasp-release-version';
+const CAASP_DISRUPTIVE_UPDATES_ANNOTATION = 'caasp.suse.com/has-disruptive-updates';
+const CAASP_SECURITY_UPDATES_ANNOTATION = 'caasp.suse.com/has-security-updates';
+const CAASP_HAS_UPDATES_ANNOTATION = 'caasp.suse.com/has-updates';
+
+export interface CaaspNodesData {
+  version: string;
+  versionMismatch: boolean;
+  updates: number;
+  disruptiveUpdates: number;
+  securityUpdates: number;
+}
+
+export interface CaaspNodeData {
+  version: string;
+  updates: boolean;
+  disruptiveUpdates: boolean;
+  securityUpdates: boolean;
+}
+
 
 @Injectable()
 export class KubernetesEndpointService {
@@ -65,6 +87,61 @@ export class KubernetesEndpointService {
     this.constructCoreObservables();
   }
 
+  getCaaspNodesData(nodes$: Observable<KubernetesNode[]> = this.nodes$): Observable<CaaspNodesData> {
+    return nodes$.pipe(
+      map(nodes => {
+        const info: CaaspNodesData = {
+          version: 'Unknown',
+          versionMismatch: false,
+          updates: 0,
+          disruptiveUpdates: 0,
+          securityUpdates: 0
+        };
+        const versions = {};
+
+        nodes.forEach(n => {
+          const nodeData = this.getCaaspNodeData(n);
+          if (!nodeData) {
+            return;
+          }
+
+          if (!versions[nodeData.version]) {
+            versions[nodeData.version] = 0;
+          }
+          versions[nodeData.version]++;
+
+          info.updates += nodeData.updates ? 1 : 0;
+          info.disruptiveUpdates += nodeData.disruptiveUpdates ? 1 : 0;
+          info.securityUpdates += nodeData.securityUpdates ? 1 : 0;
+        });
+
+        if (Object.keys(versions).length === 0) {
+          return null;
+        }
+
+        info.version = Object.keys(versions).join(', ');
+        info.versionMismatch = Object.keys(versions).length !== 1;
+        return info;
+      })
+    )
+  }
+
+  getCaaspNodeData(n: KubernetesNode): CaaspNodeData {
+    if (n && n.metadata && n.metadata.annotations) {
+      return {
+        version: n.metadata.annotations[CAASP_VERSION_ANNOTATION],
+        updates: this.hasBooleanAnnotation(n.metadata.annotations, CAASP_HAS_UPDATES_ANNOTATION),
+        disruptiveUpdates: this.hasBooleanAnnotation(n.metadata.annotations, CAASP_DISRUPTIVE_UPDATES_ANNOTATION),
+        securityUpdates: this.hasBooleanAnnotation(n.metadata.annotations, CAASP_SECURITY_UPDATES_ANNOTATION)
+      }
+    }
+  }
+
+  // Check for the specified annotation with a value of 'yes'
+  private hasBooleanAnnotation(annotations: Annotations, annotation: string): boolean {
+    return annotations[annotation] && annotations[annotation] === 'yes' ? true : false
+  }
+
   getNodeKubeVersions(nodes$: Observable<KubernetesNode[]> = this.nodes$) {
     return nodes$.pipe(
       map(nodes => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-node.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-node.service.ts
index 3dd564f2e0..855173aef9 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-node.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-node.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { filter, first, map, shareReplay } from 'rxjs/operators';
+import { filter, first, map, publishReplay, refCount } from 'rxjs/operators';
 
 import { getIdFromRoute } from '../../../../../core/src/core/utils.service';
 import { MetricQueryConfig, MetricsAction } from '../../../../../store/src/actions/metrics.actions';
@@ -42,7 +42,8 @@ export class KubernetesNodeService {
     this.node$ = nodeEntityService.entityObs$.pipe(
       filter(p => !!p && !!p.entity),
       first(),
-      shareReplay(1),
+      publishReplay(1),
+      refCount()
     );
 
     this.nodeEntity$ = this.node$.pipe(
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.types.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.types.ts
index 3a4a5e60b9..9192f7014c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.types.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.types.ts
@@ -136,7 +136,10 @@ export enum ConditionType {
   DiskPressure = 'DiskPressure',
   Ready = 'Ready',
   PIDPressure = 'PIDPressure',
-  NetworkUnavailable = 'NetworkUnavailable'
+  NetworkUnavailable = 'NetworkUnavailable',
+  CaaspUpdates = 'CaaspUpdates',
+  CaaspDisruptive = 'CaaspDisruptive',
+  CaaspSecurity = 'CaaspSecurity'
 }
 export const ConditionTypeLabels = {
   [ConditionType.Ready]: 'Ready',
@@ -144,7 +147,10 @@ export const ConditionTypeLabels = {
   [ConditionType.MemoryPressure]: 'Memory Pressure',
   [ConditionType.DiskPressure]: 'Disk Pressure',
   [ConditionType.PIDPressure]: 'PID Pressure',
-  [ConditionType.NetworkUnavailable]: 'Network Unavailable'
+  [ConditionType.NetworkUnavailable]: 'Network Unavailable',
+  [ConditionType.CaaspUpdates]: 'Updates Available',
+  [ConditionType.CaaspDisruptive]: 'Disruptive Update',
+  [ConditionType.CaaspSecurity]: 'Security Update'
 };
 
 export enum ConditionStatus {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
index d13d1c2b45..6029db052e 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
@@ -55,6 +55,26 @@
         </div>
       </div>
 
+      <!-- Show CaaSP metadata -->
+      <div class="app-metadata" *ngIf="caaspData$ | async as data">
+          <div class="app-metadata__two-cols">
+            <app-metadata-item label="CaaSP Version">
+              <div class="caasp-version">
+                <div>{{ data.version }}</div><mat-icon class="text-warning" matTooltip="Nodes report multiple versions" *ngIf="data.versionMismatch">warning</mat-icon>
+              </div>
+            </app-metadata-item>
+          </div>
+            <div class="app-metadata__two-cols">
+              <app-metadata-item label="Nodes with Updates">
+                <div class="caasp-updates">
+                  <div>{{ data.updates }}</div>
+                  <div *ngIf="data.securityUpdates > 0" class="caasp-updates__security">Security: <b>{{ data.securityUpdates }}</b></div>
+                  <div *ngIf="data.disruptiveUpdates > 0" class="caasp-updates__disruptive">Disruptive: <b>{{ data.disruptiveUpdates }}</b></div>
+                </div>
+              </app-metadata-item>
+          </div>
+      </div>
+
       <div class="kube-details__graphs">
         <div class="kube-details__graphs-group">
           <div class="kube-details__graph">
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss
index 9ec58f91b6..ff59086255 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss
@@ -63,4 +63,30 @@
       margin-top: 0;
     }
   }
+
+  .caasp-version {
+    display: flex;
+
+    mat-icon {
+      cursor: help;
+      font-size: 20px;
+      height: 20px;
+      margin-left: 12px;
+      width: 20px;
+    }
+  }
+
+  .caasp-updates {
+    align-items: center;
+    display: flex;
+
+    &__security,
+    &__disruptive {
+      border-radius: 8px;
+      font-size: 12px;
+      margin-left: 10px;
+      padding: 1px 8px;
+    }
+  }
+
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.theme.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.theme.scss
index 93ed3f107c..6b9afbebb3 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.theme.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.theme.scss
@@ -1,10 +1,17 @@
 
-// Not currently used but should be - NJ
 @mixin kube-summary-theme($theme, $app-theme) {
-  $backgrounds: map-get($theme, background);
-  $background: mat-color($backgrounds, card);
-  .kube-details__graphs {
-    background: linear-gradient(to bottom, $background 0%, $background 40%, transparent 70%);
+  $status-colors: map-get($app-theme, status);
+  $status-warning: map-get($status-colors, warning);
+  $status-danger: map-get($status-colors, danger);
+
+  .caasp-updates {
+    &__security {
+      border: 1px solid $status-danger;
+      color: $status-danger;
+    }
+    &__disruptive {
+      border: 1px solid $status-warning;
+      color: $status-warning;
+    }
   }
 }
-
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts
index 7548a95d02..b5a69213bb 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts
@@ -17,7 +17,7 @@ import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/p
 import { getCurrentPageRequestInfo } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
 import { PaginatedAction, PaginationEntityState } from '../../../../../../store/src/types/pagination.types';
 import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
-import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
+import { CaaspNodesData, KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
 
 interface IValueLabels {
   usedLabel?: string;
@@ -30,6 +30,7 @@ interface IEndpointDetails {
   label: string;
   name: string;
 }
+
 @Component({
   selector: 'app-kubernetes-summary',
   templateUrl: './kubernetes-summary.component.html',
@@ -73,6 +74,7 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
   public nodesReady$: Observable<ISimpleUsageChartData>;
   public networkUnavailable$: Observable<ISimpleUsageChartData>;
   public kubeNodeVersions$: Observable<string>;
+  public caaspData$: Observable<CaaspNodesData>;
 
   public pressureChartThresholds: IChartThresholds = {
     danger: 90,
@@ -165,6 +167,8 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
 
     this.kubeNodeVersions$ = this.kubeEndpointService.getNodeKubeVersions(nodes$).pipe(startWith('-'));
 
+    this.caaspData$ = this.kubeEndpointService.getCaaspNodesData(nodes$);
+
     this.isLoading$ = combineLatest([
       this.endpointDetails$,
       this.podCount$,

From 4843986a75e5d2555d1d7aa86fe55b9fb2be23e2 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Thu, 27 Aug 2020 15:37:31 +0100
Subject: [PATCH 601/648] Don't do expensive helm repo update when starting
 terminal (#453)

---
 deploy/containers/kube-terminal/kubeconsole.bashrc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/deploy/containers/kube-terminal/kubeconsole.bashrc b/deploy/containers/kube-terminal/kubeconsole.bashrc
index 0a1edfdd56..c07ef129f5 100644
--- a/deploy/containers/kube-terminal/kubeconsole.bashrc
+++ b/deploy/containers/kube-terminal/kubeconsole.bashrc
@@ -6,9 +6,7 @@ RESET="\033[0m"
 BOLD="\033[1m"
 DIM="\033[2m"
 
-echo -e "${BOLD}${GREEN}SUSE Stratos Console${RESET}"
-echo ""
-echo -e "${CYAN}Kubernetes Terminal${RESET}"
+echo -e "${CYAN}Stratos Kubernetes Terminal${RESET}"
 echo ""
 
 # Only do these on first run
@@ -51,7 +49,9 @@ if [ ! -f "/stratos/.firstrun" ]; then
   if [ -f "${HOME}/.stratos/helm-setup" ]; then
     echo "Setting up Helm repositories ..."
     source  "${HOME}/.stratos/helm-setup" > /dev/null
-    helm repo update 2>&1 > /dev/null
+
+    # helm repo update can take a while, so get the user to do that if they want to use helm
+    echo -e "You may need to run ${CYAN}helm repo update${RESET} to update your repositories before using Helm"
     echo ""
   fi
 
@@ -73,5 +73,5 @@ touch "/stratos/.firstrun"
 unset `compgen -A variable | grep KUBERNETES`
 
 echo 
-echo -e "Ready - ${CYAN}kubectl${RESET} and ${CYAN}helm${RESET} commands are available"
+echo -e "${CYAN}kubectl${RESET} and ${CYAN}helm${RESET} commands are available"
 echo ""

From 8fa12b0d2775d57a80e5cfa98f5ed05dc0684524 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Thu, 27 Aug 2020 15:53:35 +0100
Subject: [PATCH 602/648] Improve presentation and fix issue with development
 versions (#456)

---
 .../chart-details-info.component.html         |  4 +-
 .../chart-details-info.component.scss         | 12 ++++++
 .../chart-details-usage.component.html        | 39 ++-----------------
 .../chart-details-usage.component.scss        |  7 ++++
 .../chart-details-versions.component.html     | 16 +++++---
 .../chart-details-versions.component.scss     | 27 +++++++++++--
 .../chart-details-versions.component.ts       | 12 +++++-
 .../chart-item/chart-item.component.html      |  9 +----
 .../chart-item/chart-item.component.scss      |  5 +++
 .../list-item/list-item.component.html        |  2 +-
 .../list-item/list-item.component.scss        |  9 +++++
 .../list-item/list-item.component.ts          |  5 ++-
 .../chartsvc/foundationdb/handler.go          | 16 +++++++-
 13 files changed, 105 insertions(+), 58 deletions(-)

diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.html
index 457d4edd57..0329e95550 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.html
@@ -13,7 +13,7 @@ <h1>Home</h1>
         <a href="{{ chart.attributes.home }}" target="_blank">{{chart.attributes.home}}</a>
       </div>
     </div>
-    <div class="chartInfo__maintainers">
+    <div class="chartInfo__maintainers" *ngIf="maintainers.length">
       <h1>Maintainers</h1>
       <div *ngFor="let maintainer of maintainers">
         <a href="{{ maintainerUrl(maintainer) }}" target="_blank">{{ maintainer.name }}</a>
@@ -22,7 +22,7 @@ <h1>Maintainers</h1>
     <div class="chartInfo__related" *ngIf="sources.length">
       <h1>Related</h1>
       <div *ngFor="let source of sources">
-        <a href="{{ source }}" target="_blank">{{ source }}</a>
+        <a href="{{ source }}" class="chartInfo__related-link" target="_blank">{{ source }}</a>
       </div>
     </div>
   </mat-card>
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.scss
index 5ff001e7c6..1b1558c02c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.scss
@@ -1,5 +1,9 @@
 .chartInfo {
 
+  h1 {
+    font-size: 18px;
+  }
+
   app-panel {
     box-shadow: 1px 1px 10px rgba(black, 0.07);
     border: 0 !important;
@@ -11,6 +15,14 @@
     }
   }
 
+  &__related {
+    max-width: 280px;
+  }
+
+  &__related-link {
+    font-size: 14px;
+  }
+
   &__properties {
     overflow: auto;
     display: block;
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html
index 4058bb6801..1e374b0705 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html
@@ -1,35 +1,4 @@
-<mat-card class="chart-details-usage">
-  <h1>Install</h1>
-  <mat-tab-group>
-    <mat-tab label="UI" *ngIf="endpointsService.hasConnectedEndpointType('k8s') | async">
-      <p>You can install this Helm Chart from here.</p>
-      <button class="chart-details-usage__install" color="primary" mat-button mat-raised-button
-        routerLink="/monocular/install/{{chart.id}}/{{currentVersion}}">Install</button>
-    </mat-tab>
-
-    <mat-tab label="Helm CLI">
-      <div *ngIf="showRepoInstructions" class="chart-details-usage__repository chart-details-usage__section">
-        <h2 class="chart-details-usage__label">Add {{ chart.attributes.repo.name }} repository</h2>
-        <mat-form-field>
-          <input matInput floatingPlaceholder=false [value]=repoAddInstructions>
-        </mat-form-field>
-        <button mat-button angulartics2On="click" angularticsEvent="RepositoryCopy">
-          <mat-icon svgIcon="content-copy"></mat-icon>
-        </button>
-      </div>
-      <div class="chart-details-usage__section">
-        <h2 class="chart-details-usage__label">Install chart</h2>
-        <mat-form-field>
-          <input matInput readonly floatingPlaceholder=false [value]=installInstructions>
-        </mat-form-field>
-        <button mat-button ngxClipboard angulartics2On="click">
-          <mat-icon svgIcon="content-copy"></mat-icon>
-        </button>
-      </div>
-      <p class="help-link">
-        <a href="https://github.com/kubernetes/helm/blob/master/docs/quickstart.md" target="_blank"
-          title="How to install Helm">Need Helm?</a>
-      </p>
-    </mat-tab>
-  </mat-tab-group>
-</mat-card>
\ No newline at end of file
+<div class="chart-details-usage__install">
+  <button class="chart-details-usage__install-btn" color="primary" mat-button mat-raised-button
+  routerLink="/monocular/install/{{chart.id}}/{{currentVersion}}">Install Chart</button>
+</div>
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.scss
index f74db6a81e..955e8885c7 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.scss
@@ -9,6 +9,7 @@ mat-tab-body {
   margin: 2em 0;
   box-shadow: 1px 1px 10px rgba(black, 0.07);
   h1 {
+    font-size: 18px;
     margin: 0;
   }
 
@@ -26,6 +27,12 @@ mat-tab-body {
     flex-direction: column;
   }
 
+  &__install {
+    display: flex;
+    justify-content: flex-end;
+    margin: 35px 0;
+  }
+
   .mat-input-element {
     .mat-input-wrapper {
       margin: 1em 0 .5em;
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.html
index 3707dcd9c6..68e0d21e6f 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.html
@@ -1,11 +1,15 @@
 <div class="versions">
   <h1>Chart Versions</h1>
-  <div class="version" *ngFor="let version of shownVersions()">
-    <span class='number' [class.selected]="isSelected(version)">
-      <a [href]="goToVersionUrl(version)" [routerLink]="goToVersionUrl(version)">
-        {{ version.attributes.version }}</a>
-    </span> -
-    <span class='creation-date'>{{ version.attributes.created | date: 'MMM d, y' }}</span>
+  <div class="version__table">
+    <div class="version__row" *ngFor="let version of shownVersions()">
+      <div class='version__cell number' [class.selected]="isSelected(version)">
+        <a [href]="goToVersionUrl(version)" [routerLink]="goToVersionUrl(version)">
+          <span *ngIf="version.attributes.version.length>15">{{ version.attributes.version | slice:0:16 }}...</span>
+          <span *ngIf="version.attributes.version.length<16">{{ version.attributes.version }}</span>
+          </a>
+        </div>
+      <div class='version__cell creation-date'>{{ version.attributes.created | date: 'MMM d, y' }}</div>
+    </div>
   </div>
   <div class="more-link" *ngIf="showMoreLink()">
     <a (click)="setShowAllVersions()">show all...</a>
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.scss
index e334c053b2..b3002ff9d3 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.scss
@@ -3,6 +3,7 @@
 .versions {
 
   h1 {
+    font-size: 18px;
     margin-top: 0;
   }
   .more-link {
@@ -10,14 +11,32 @@
   }
 }
 
-.version {
-  display: block;
+.version__cell {
 
-  .creation-date {
+  &.creation-date {
     color: lighten($layout-base, 20%);
   }
 
-  .number.selected {
+  &.number.selected {
     font-weight: bold;
   }
 }
+
+.version {
+  &__table {
+    display: table;
+    width: 100%;
+  }
+  &__row {
+    display: table-row;
+  }
+  &__cell {
+    display: table-cell;
+  }
+}
+
+.app-version {
+  h1 {
+    font-size: 18px;
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts
index 5b563f203e..9e17557519 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts
@@ -32,8 +32,18 @@ export class ChartDetailsVersionsComponent {
 
   shownVersions(): ChartVersion[] {
     if (this.versions) {
-      return this.showAllVersions ? this.versions : this.versions.slice(0, 5);
+      return this.showAllVersions ? this.versions : this.getNonDevelopmentVersion().slice(0, 5);
     }
     return [];
   }
+
+  getNonDevelopmentVersion(): ChartVersion[] {
+    const nonDevel: ChartVersion[] = [];
+    for (const version of this.versions) {
+      if (version.attributes.version.indexOf('-') === -1) {
+        nonDevel.push(version);
+      }
+    }
+    return nonDevel;
+  }
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.html
index fc0074d65c..b94c5bc9ef 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.html
@@ -1,18 +1,13 @@
-<app-list-item class="chart-item" [detailUrl]="goToDetailUrl()">
+<app-list-item class="chart-item" [detailUrl]="goToDetailUrl()" height="auto">
   <img class="list-item-logo chart-item-logo" alt="{{ chart.attributes.name }}'s logo" src="{{ iconUrl }}" />
   <div class="list-item-info chart-item-info">
     <h2 class="chart-item-info__title">
-      <a [href]="goToDetailUrl()" [routerLink]="goToDetailUrl()">
-        {{ chart.attributes.name }}</a>
+        <a [href]="goToDetailUrl()" [routerLink]="goToDetailUrl()">{{ chart.attributes.repo.name }}/{{ chart.attributes.name }}</a>
     </h2>
     <p>
       <span class="chart-item-info__version"
         *ngIf="showVersion && chart.relationships.latestChartVersion.data.app_version">
         {{ chart.relationships.latestChartVersion.data.app_version }}</span>
-      <span class="chart-item-info__repo repo-{{chart.attributes.repo.name}}">
-        <a [href]="goToRepoUrl()" [routerLink]="goToRepoUrl()">
-          {{ chart.attributes.repo.name }}</a>
-      </span>
     </p>
     <div class="chart-item-info__description" *ngIf="showDescription">
       {{ chart.attributes.description }}
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.scss
index 0c06d1a026..e42c43a10e 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.scss
@@ -16,6 +16,7 @@ $chart-item-logo-width: 80px;
     &__title {
       margin: 0;
       font-weight: 500;
+      font-size: 16px;
       cursor: pointer;
       margin-bottom: 4px;
 
@@ -28,6 +29,10 @@ $chart-item-logo-width: 80px;
       margin: 0;
     }
 
+    &__version {
+      font-size: 14px;
+    }
+
     // Remove this when chips are ready:
     // https://github.com/angular/material2/issues/120
     &__repo {
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.html
index 1e02c4fde2..5964674ba8 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.html
@@ -1,6 +1,6 @@
 <div class="list-item">
   <a [href]="detailUrl" [routerLink]="detailUrl">
-    <div class="list-item-content">
+    <div class="list-item-content" [ngClass]="{'list-item__auto-height': height === 'auto'}">
       <div class="list-item-logo">
         <ng-content select=".list-item-logo"></ng-content>
       </div>
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.scss
index cebb26fe0a..15e6632b19 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.scss
@@ -3,6 +3,7 @@
 
 // Vars
 $list-item-content-height: 200px;
+$list-item-content-min-height: 140px;
 
 .list-item {
   border-radius: $border-radius;
@@ -47,4 +48,12 @@ $list-item-content-height: 200px;
     word-wrap: break-word;
     text-align: center;
   }
+
+  &__auto-height {
+    height: auto;
+
+    .list-item-info {
+      padding: 10px 0;
+    }
+  }
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.ts
index 91745aab75..8052238ffb 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, Input } from '@angular/core';
 
 @Component({
   selector: 'app-list-item',
@@ -8,5 +8,8 @@ import { Component } from '@angular/core';
   inputs: ['detailUrl']
 })
 export class ListItemComponent {
+
+  @Input() height = 'default';
+
   public detailUrl: string;
 }
diff --git a/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go b/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go
index fde7d07fde..a0fb5863bf 100644
--- a/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go
+++ b/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go
@@ -23,6 +23,7 @@ import (
 	"net/http"
 	"sort"
 	"strconv"
+	"strings"
 
 	"github.com/helm/monocular/chartsvc/foundationdb/datastore"
 	"github.com/helm/monocular/chartsvc/models"
@@ -461,7 +462,11 @@ func SearchCharts(w http.ResponseWriter, req *http.Request, params Params) {
 }
 
 func newChartResponse(c *models.Chart) *utils.ApiResponse {
-	latestCV := c.ChartVersions[0]
+
+	// NWM: This was: latestCV := c.ChartVersions[0] - but this includes development charts
+	// FIX: This ignores development versions
+	latestCV := findFirstNonDevelopmentVersion(c)
+
 	return &utils.ApiResponse{
 		Type:       "chart",
 		ID:         c.ID,
@@ -476,6 +481,15 @@ func newChartResponse(c *models.Chart) *utils.ApiResponse {
 	}
 }
 
+func findFirstNonDevelopmentVersion(c *models.Chart) models.ChartVersion {
+	for _, chartVersion := range c.ChartVersions {
+		if strings.Index(chartVersion.Version, "-") == -1 {
+			return chartVersion
+		}
+	}
+	return c.ChartVersions[0]
+}
+
 func newChartListResponse(charts []*models.Chart) utils.ApiListResponse {
 	cl := utils.ApiListResponse{}
 	for _, c := range charts {

From d479e80ee33796822980cae804789dbd35134153 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Thu, 27 Aug 2020 15:55:42 +0100
Subject: [PATCH 603/648] Fix: Kubernetes unit tests aren't being run (#459)

---
 angular.json                                  | 17 +++++++++
 package.json                                  |  1 +
 .../packages/suse-extensions/karma.conf.js    |  8 +++++
 .../demo-helper/demo-helper.component.spec.ts |  4 +--
 .../create-release.component.spec.ts          |  4 +--
 .../src/custom/helm/helm-testing.module.ts    |  8 ++---
 .../monocular-chart-card.component.spec.ts    |  2 +-
 .../monocular-tab-base.component.spec.ts      |  4 +--
 .../chart-details-usage.component.spec.ts     |  6 ++--
 .../chart-details.component.spec.ts           |  6 ++--
 .../chart-item/chart-item.component.spec.ts   |  2 +-
 .../monocular/charts/charts.component.spec.ts |  2 +-
 .../monocular/loader/loader.component.spec.ts |  2 +-
 .../analysis-report-runner.component.spec.ts  | 17 ++++++++-
 ...analysis-report-selector.component.spec.ts |  8 ++---
 .../analysis-report-viewer.component.spec.ts  |  6 +++-
 ...kube-score-report-viewer.component.spec.ts |  8 ++---
 .../popeye-report-viewer.component.spec.ts    |  8 ++---
 .../resource-alert-view.component.spec.ts     |  8 ++---
 ...kubernetes-aws-auth-form.component.spec.ts |  3 +-
 ...bernetes-certs-auth-form.component.spec.ts |  2 +-
 ...ernetes-config-auth-form.component.spec.ts |  2 +-
 ...kubernetes-gke-auth-form.component.spec.ts |  2 +-
 .../kube-config-table-name.component.spec.ts  |  4 ++-
 .../kube-console.component.spec.ts            |  6 ++--
 .../kubedash-configuration.component.spec.ts  |  8 ++---
 .../kubernetes-dashboard.component.spec.ts    |  2 +-
 ...amespace-analysis-report.component.spec.ts | 14 ++++----
 ...netes-namespace-services.component.spec.ts |  2 +-
 .../kubernetes-node.component.spec.ts         |  2 +-
 ...bernetes-resource-viewer.component.spec.ts |  6 ++--
 .../kubernetes-tab-base.component.spec.ts     |  2 +-
 .../kubernetes/kubernetes.testing.module.ts   |  2 +-
 .../kubernetes/kubernetes.component.spec.ts   |  2 +-
 .../analysis-status-cell.component.spec.ts    |  6 ++--
 .../condition-cell.component.spec.ts          |  2 +-
 ...kubernetes-node-capacity.component.spec.ts |  2 +-
 .../kubernetes-node-ips.component.spec.ts     |  2 +-
 .../kubernetes-node-labels.component.spec.ts  |  2 +-
 ...kubernetes-node-pressure.component.spec.ts |  2 +-
 .../pod-metrics/pod-metrics.component.spec.ts |  2 +-
 ...kubernetes-analysis-info.component.spec.ts | 14 +++++---
 ...bernetes-analysis-report.component.spec.ts | 18 +++++++---
 .../kubernetes-analysis-report.component.ts   |  4 +++
 .../kubernetes-analysis-tab.component.spec.ts | 12 +++----
 .../kubernetes-summary.component.spec.ts      |  2 +-
 ...helm-release-summary-tab.component.spec.ts | 12 ++++---
 .../suse-login/suse-login.component.spec.ts   |  4 +--
 .../packages/suse-extensions/src/test.ts      | 36 +++++++++++++++++++
 .../suse-extensions/tsconfig.spec.json        | 17 +++++++++
 50 files changed, 219 insertions(+), 98 deletions(-)
 create mode 100644 src/frontend/packages/suse-extensions/karma.conf.js
 create mode 100644 src/frontend/packages/suse-extensions/src/test.ts
 create mode 100644 src/frontend/packages/suse-extensions/tsconfig.spec.json

diff --git a/angular.json b/angular.json
index b557dc7a20..95d3bd1b49 100644
--- a/angular.json
+++ b/angular.json
@@ -351,7 +351,24 @@
           }
         }
       }
+    },
+    "extensions": {
+      "root": "src/frontend/packages/suse-extensions",
+      "sourceRoot": "src/frontend/packages/suse-extensions/src",
+      "projectType": "library",
+      "prefix": "lib",
+      "architect": {
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/frontend/packages/suse-extensions/src/test.ts",
+            "tsConfig": "src/frontend/packages/suse-extensions/tsconfig.spec.json",
+            "karmaConfig": "src/frontend/packages/suse-extensions/karma.conf.js"
+          }
+        }
+      }
     }
+
   },
   "defaultProject": "stratos",
   "schematics": {
diff --git a/package.json b/package.json
index 011b676947..79fdb92362 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +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",
+    "test-frontend:extensions": "NG_TEST_SUITE=extensions ng test extensions --code-coverage --watch=false",
     "posttest": "nyc report --reporter=html --reporter=lcovonly --reporter=json --tempDir=coverage/nyc",
     "codecov": "codecov -f coverage/coverage-final.json",
     "lint": "ng lint --format stylish",
diff --git a/src/frontend/packages/suse-extensions/karma.conf.js b/src/frontend/packages/suse-extensions/karma.conf.js
new file mode 100644
index 0000000000..c23e417786
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/karma.conf.js
@@ -0,0 +1,8 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+  config.set({
+    ...require('../../../../build/karma.conf.creator.js')('extensions')(config)
+  })
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.spec.ts
index 2d6d578d43..847f32c442 100644
--- a/src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.spec.ts
@@ -1,8 +1,8 @@
 import { HttpClientModule } from '@angular/common/http';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../tab-nav.service';
-import { BaseTestModules } from '../../../../test-framework/core-test.helper';
+import { TabNavService } from '../../../../../core/tab-nav.service';
+import { BaseTestModules } from '../../../../../core/test-framework/core-test.helper';
 import { DemoHelperComponent } from './demo-helper.component';
 
 describe('DemoHelperComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.spec.ts
index 26e121fdac..6cf6078bec 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.spec.ts
@@ -3,11 +3,11 @@ import { HttpClient } from '@angular/common/http';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { ConfirmationDialogService } from '../../../../../core/src/shared/components/confirmation-dialog.service';
+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 '../../../../tab-nav.service';
-import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service';
 import { KubernetesBaseTestModules } from '../../kubernetes/kubernetes.testing.module';
 import { CreateReleaseComponent } from './create-release.component';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm-testing.module.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm-testing.module.ts
index 2bace2cf52..d995b63748 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/helm-testing.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/helm-testing.module.ts
@@ -1,16 +1,16 @@
 import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
 import { NgModule } from '@angular/core';
+import { CoreModule } from '@angular/flex-layout';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
+import { SharedModule } from '@stratosui/core';
 
+import { AppTestModule } from '../../../../core/test-framework/core-test.helper';
 import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../../../store/src/entity-catalog.module';
 import { entityCatalog, TestEntityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
+import { generateStratosEntities } from '../../../../store/src/stratos-entity-generator';
 import { createBasicStoreModule } from '../../../../store/testing/public-api';
-import { AppTestModule } from '../../../test-framework/core-test.helper';
-import { generateStratosEntities } from '../../base-entity-types';
-import { CoreModule } from '../../core/core.module';
-import { SharedModule } from '../../shared/shared.module';
 import { HelmReleaseGuid } from '../kubernetes/workloads/workload.types';
 import { generateHelmEntities } from './helm-entity-generator';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.spec.ts
index 08de859911..14b4272b60 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { BaseTestModulesNoShared } from '../../../../../test-framework/core-test.helper';
+import { BaseTestModulesNoShared } from '../../../../../../core/test-framework/core-test.helper';
 import { ChartItemComponent } from '../../monocular/chart-item/chart-item.component';
 import { ListItemComponent } from '../../monocular/list-item/list-item.component';
 import { ChartsService } from '../../monocular/shared/services/charts.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.spec.ts
index 153b0b9cfb..410d613753 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../tab-nav.service';
-import { BaseTestModulesNoShared } from '../../../../test-framework/core-test.helper';
+import { TabNavService } from '../../../../../core/tab-nav.service';
+import { BaseTestModulesNoShared } from '../../../../../core/test-framework/core-test.helper';
 import { HelmModule } from '../helm.module';
 import { MonocularTabBaseComponent } from './monocular-tab-base.component';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts
index 979905d767..0964fec6e2 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts
@@ -1,10 +1,10 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 
+import { EndpointsService } from '../../../../../../../core/src/core/endpoints.service';
+import { UtilsService } from '../../../../../../../core/src/core/utils.service';
+import { BaseTestModulesNoShared } from '../../../../../../../core/test-framework/core-test.helper';
 import { PaginationMonitorFactory } from '../../../../../../../store/src/monitors/pagination-monitor.factory';
-import { BaseTestModulesNoShared } from '../../../../../../test-framework/core-test.helper';
-import { EndpointsService } from '../../../../../core/endpoints.service';
-import { UtilsService } from '../../../../../core/utils.service';
 import { ChartDetailsUsageComponent } from './chart-details-usage.component';
 
 describe('Component: ChartDetailsUsage', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.spec.ts
index d670ba09c3..93812f2d5b 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.spec.ts
@@ -3,11 +3,11 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { BrowserModule } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 
-import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
-import { BaseTestModulesNoShared } from '../../../../../test-framework/core-test.helper';
 import {
   EntitySummaryTitleComponent,
-} from '../../../../shared/components/entity-summary-title/entity-summary-title.component';
+} from '../../../../../../core/src/shared/components/entity-summary-title/entity-summary-title.component';
+import { BaseTestModulesNoShared } from '../../../../../../core/test-framework/core-test.helper';
+import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { ChartItemComponent } from '../chart-item/chart-item.component';
 import { ListItemComponent } from '../list-item/list-item.component';
 import { LoaderComponent } from '../loader/loader.component';
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.spec.ts
index 6a4f2723fe..47188d55a5 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.spec.ts
@@ -3,8 +3,8 @@ import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 
+import { LoggerService } from '../../../../../../core/src/core/logger.service';
 import { createBasicStoreModule } from '../../../../../../store/testing/public-api';
-import { LoggerService } from '../../../../core/logger.service';
 import { ChartsService } from '../shared/services/charts.service';
 import { ConfigService } from '../shared/services/config.service';
 import { ChartItemComponent } from './chart-item.component';
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.spec.ts
index d634d2c8de..493bebfb1d 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.spec.ts
@@ -6,8 +6,8 @@ import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
 
+import { LoggerService } from '../../../../../../core/src/core/logger.service';
 import { createBasicStoreModule } from '../../../../../../store/testing/public-api';
-import { LoggerService } from '../../../../core/logger.service';
 import { ChartItemComponent } from '../chart-item/chart-item.component';
 import { ChartListComponent } from '../chart-list/chart-list.component';
 import { LoaderComponent } from '../loader/loader.component';
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.spec.ts
index 0154562121..61bd1aa4ce 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { CoreModule } from '@stratosui/core';
 
-import { CoreModule } from '../../../../core/core.module';
 import { LoaderComponent } from './loader.component';
 
 describe('LoaderComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.spec.ts
index f2d53545a3..8757c86532 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.spec.ts
@@ -1,5 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../kubernetes.testing.module';
+import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
+import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
+import { SidePanelService } from './../../../../../../core/src/shared/services/side-panel.service';
+import { SharedModule } from './../../../../../../core/src/shared/shared.module';
 import { AnalysisReportRunnerComponent } from './analysis-report-runner.component';
 
 describe('AnalysisReportRunnerComponent', () => {
@@ -8,7 +13,17 @@ describe('AnalysisReportRunnerComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ AnalysisReportRunnerComponent ]
+      declarations: [ AnalysisReportRunnerComponent ],
+      imports: [
+        SharedModule,
+        KubernetesBaseTestModules,
+      ],
+      providers: [
+        KubernetesAnalysisService,
+        KubernetesEndpointService,
+        KubeBaseGuidMock,
+        SidePanelService,
+      ]
     })
     .compileComponents();
   }));
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.spec.ts
index d23be84d77..4d421a38e4 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.spec.ts
@@ -1,10 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { MDAppModule } from './../../../../core/md.module';
 
-import { AnalysisReportSelectorComponent } from './analysis-report-selector.component';
-import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
-import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
+import { MDAppModule } from '../../../../../../core/src/public-api';
 import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../kubernetes.testing.module';
+import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
+import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
+import { AnalysisReportSelectorComponent } from './analysis-report-selector.component';
 
 describe('AnalysisReportSelectorComponent', () => {
   let component: AnalysisReportSelectorComponent;
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.spec.ts
index ed39ab0acf..6b49e51116 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.spec.ts
@@ -1,7 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { AnalysisReportViewerComponent } from './analysis-report-viewer.component';
 import { KubernetesBaseTestModules } from '../kubernetes.testing.module';
+import { KubernetesAnalysisService } from '../services/kubernetes.analysis.service';
+import { AnalysisReportViewerComponent } from './analysis-report-viewer.component';
 
 describe('AnalysisReportViewerComponent', () => {
   let component: AnalysisReportViewerComponent;
@@ -12,6 +13,9 @@ describe('AnalysisReportViewerComponent', () => {
       declarations: [ AnalysisReportViewerComponent ],
       imports: [
         KubernetesBaseTestModules,
+      ],
+      providers: [
+        KubernetesAnalysisService
       ]
     })
     .compileComponents();
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.spec.ts
index a93f22f618..babd043739 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.spec.ts
@@ -1,10 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { MDAppModule } from './../../../../core/md.module';
 
-import { KubeScoreReportViewerComponent } from './kube-score-report-viewer.component';
-import { KubernetesBaseTestModules, KubeBaseGuidMock } from '../../kubernetes.testing.module';
-import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
+import { MDAppModule } from '../../../../../../core/src/public-api';
+import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
+import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
+import { KubeScoreReportViewerComponent } from './kube-score-report-viewer.component';
 
 describe('KubeScoreReportViewerComponent', () => {
   let component: KubeScoreReportViewerComponent;
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.spec.ts
index ccbe5c5081..192d66f8da 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.spec.ts
@@ -1,10 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { MDAppModule } from './../../../../core/md.module';
 
-import { PopeyeReportViewerComponent } from './popeye-report-viewer.component';
-import { KubernetesBaseTestModules, KubeBaseGuidMock } from '../../kubernetes.testing.module';
-import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
+import { MDAppModule } from '../../../../../../core/src/public-api';
+import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
+import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
+import { PopeyeReportViewerComponent } from './popeye-report-viewer.component';
 
 describe('PopeyeReportViewerComponent', () => {
   let component: PopeyeReportViewerComponent;
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.spec.ts
index 0ffbf5f5ff..9f158d36cf 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.spec.ts
@@ -1,10 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { MDAppModule } from './../../../../../core/md.module';
 
-import { ResourceAlertViewComponent } from './resource-alert-view.component';
-import { KubernetesBaseTestModules, KubeBaseGuidMock } from '../../../kubernetes.testing.module';
-import { KubernetesAnalysisService } from '../../../services/kubernetes.analysis.service';
+import { MDAppModule } from '../../../../../../../core/src/public-api';
+import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
+import { KubernetesAnalysisService } from '../../../services/kubernetes.analysis.service';
+import { ResourceAlertViewComponent } from './resource-alert-view.component';
 
 describe('ResourceAlertViewComponent', () => {
   let component: ResourceAlertViewComponent;
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts
index 84179dbe41..f9ef26134c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts
@@ -2,8 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormBuilder } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
-import { MDAppModule } from '../../../../core/md.module';
-import { SharedModule } from '../../../../shared/shared.module';
+import { MDAppModule, SharedModule } from '../../../../../../core/src/public-api';
 import { KubernetesAWSAuthFormComponent } from './kubernetes-aws-auth-form.component';
 
 describe('KubernetesAWSAuthFormComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts
index af9ca17150..74ccf5ef71 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts
@@ -3,7 +3,7 @@ import { FormBuilder } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { CoreModule } from 'frontend/packages/core/src/core/core.module';
 
-import { SharedModule } from '../../../../shared/shared.module';
+import { SharedModule } from './../../../../../../core/src/shared/shared.module';
 import { KubernetesCertsAuthFormComponent } from './kubernetes-certs-auth-form.component';
 
 describe('KubernetesCertsAuthFormComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.spec.ts
index 0fd0b060d0..756e42f1bc 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.spec.ts
@@ -2,7 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormBuilder } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
-import { SharedModule } from '../../../../shared/shared.module';
+import { SharedModule } from './../../../../../../core/src/shared/shared.module';
 import { KubernetesConfigAuthFormComponent } from './kubernetes-config-auth-form.component';
 
 describe('KubernetesConfigAuthFormComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.spec.ts
index 1327730757..32c5fa6b31 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.spec.ts
@@ -2,7 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormBuilder } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
-import { SharedModule } from '../../../../shared/shared.module';
+import { SharedModule } from './../../../../../../core/src/shared/shared.module';
 import { KubernetesGKEAuthFormComponent } from './kubernetes-gke-auth-form.component';
 
 describe('KubernetesGKEAuthFormComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts
index c37211591f..4e4f7f59c7 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts
@@ -1,6 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { IListDataSource } from '../../../../../shared/components/list/data-sources-controllers/list-data-source-types';
+import {
+  IListDataSource,
+} from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
 import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
 import { KubeConfigFileCluster } from '../../kube-config.types';
 import { KubeConfigTableName } from './kube-config-table-name.component';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.spec.ts
index 8671538bc9..65f7e4ba32 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.spec.ts
@@ -4,9 +4,9 @@ import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { ApplicationService } from '../../../../../cloud-foundry/src/features/applications/application.service';
 import { ApplicationServiceMock } from '../../../../../cloud-foundry/test-framework/application-service-helper';
-import { TabNavService } from '../../../../tab-nav.service';
-import { CoreModule } from '../../../core/core.module';
-import { SharedModule } from '../../../shared/shared.module';
+import { SharedModule } from '../../../../../core/src/public-api';
+import { TabNavService } from '../../../../../core/tab-nav.service';
+import { CoreModule } from './../../../../../core/src/core/core.module';
 import { KubeConsoleComponent } from './kube-console.component';
 
 describe('KubeConsoleComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts
index c8f461034f..84062f4fc2 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts
@@ -1,10 +1,10 @@
+import { HttpClient, HttpHandler } from '@angular/common/http';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
 
-import { KubedashConfigurationComponent } from './kubedash-configuration.component';
+import { TabNavService } from '../../../../../../core/tab-nav.service';
 import { KubernetesBaseTestModules } from '../../kubernetes.testing.module';
-import { TabNavService } from '../../../../../tab-nav.service';
-import { HttpClient, HttpHandler } from '@angular/common/http';
-import { ActivatedRoute } from '@angular/router';
+import { KubedashConfigurationComponent } from './kubedash-configuration.component';
 
 describe('KubedashConfigurationComponent', () => {
   let component: KubedashConfigurationComponent;
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts
index 9bd1d38afa..f918ee294b 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
-import { TabNavService } from '../../../../tab-nav.service';
+import { TabNavService } from '../../../../../core/tab-nav.service';
 import { KubernetesBaseTestModules } from '../kubernetes.testing.module';
 import { KubernetesDashboardTabComponent } from './kubernetes-dashboard.component';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.spec.ts
index 5e5fdfaf98..4834ac63ec 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.spec.ts
@@ -1,16 +1,16 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { MDAppModule } from './../../../../core/md.module';
+import { TabNavService } from 'frontend/packages/core/tab-nav.service';
 
-import { KubernetesNamespaceAnalysisReportComponent } from './kubernetes-namespace-analysis-report.component';
-import { KubernetesBaseTestModules, KubeBaseGuidMock } from '../../kubernetes.testing.module';
-import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
+import { MDAppModule } from '../../../../../../core/src/public-api';
+import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
+import { KubernetesNamespaceService } from '../../services/kubernetes-namespace.service';
+import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
 import {
-  AnalysisReportSelectorComponent
+  AnalysisReportSelectorComponent,
 } from './../../analysis-report-viewer/analysis-report-selector/analysis-report-selector.component';
 import { AnalysisReportViewerComponent } from './../../analysis-report-viewer/analysis-report-viewer.component';
-import { KubernetesNamespaceService } from '../../services/kubernetes-namespace.service';
-import { TabNavService } from 'frontend/packages/core/tab-nav.service';
+import { KubernetesNamespaceAnalysisReportComponent } from './kubernetes-namespace-analysis-report.component';
 
 describe('KubernetesNamespaceAnalysisReportComponent', () => {
   let component: KubernetesNamespaceAnalysisReportComponent;
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts
index 8733dc7999..d638b3b663 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../tab-nav.service';
+import { TabNavService } from '../../../../../../core/tab-nav.service';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesBaseTestModules } from '../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts
index 277bf2ca96..b334471044 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
-import { TabNavService } from '../../../../tab-nav.service';
+import { TabNavService } from '../../../../../core/tab-nav.service';
 import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../kubernetes.testing.module';
 import { KubernetesNodeComponent } from './kubernetes-node.component';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts
index 75fb79c994..38b577beaa 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts
@@ -1,11 +1,13 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
-import { SidePanelService } from '../../../shared/services/side-panel.service';
+import { SidePanelService } from '../../../../../core/src/shared/services/side-panel.service';
 import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
+import {
+  ResourceAlertViewComponent,
+} from './../analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component';
 import { KubernetesResourceViewerComponent } from './kubernetes-resource-viewer.component';
-import { ResourceAlertViewComponent } from './../analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component';
 
 describe('KubernetesResourceViewerComponent', () => {
   let component: KubernetesResourceViewerComponent;
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts
index 22ffd1698a..0d8e5a109e 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
-import { TabNavService } from '../../../../tab-nav.service';
+import { TabNavService } from '../../../../../core/tab-nav.service';
 import { KubernetesBaseTestModules } from '../kubernetes.testing.module';
 import { KubernetesTabBaseComponent } from './kubernetes-tab-base.component';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.testing.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.testing.module.ts
index 82cb57d3e8..e1967ff707 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.testing.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.testing.module.ts
@@ -3,12 +3,12 @@ import { NgModule } from '@angular/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 
-import { generateStratosEntities } from '../../../../core/src/base-entity-types';
 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 { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../../../store/src/entity-catalog.module';
 import { entityCatalog, TestEntityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
+import { generateStratosEntities } from '../../../../store/src/stratos-entity-generator';
 import { createBasicStoreModule } from '../../../../store/testing/public-api';
 import { HelmReleaseActivatedRouteMock, HelmReleaseGuidMock } from '../helm/helm-testing.module';
 import { generateKubernetesEntities } from './kubernetes-entity-generator';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.spec.ts
index 99112c8c5c..f715faab3a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../tab-nav.service';
+import { TabNavService } from '../../../../../core/tab-nav.service';
 import { KubernetesBaseTestModules } from '../kubernetes.testing.module';
 import { KubernetesComponent } from './kubernetes.component';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.spec.ts
index 3c1fb10915..aca29a6d84 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.spec.ts
@@ -1,10 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { MDAppModule } from './../../../../core/md.module';
-import { AnalysisStatusCellComponent } from './analysis-status-cell.component';
+import { MDAppModule } from '../../../../../../core/src/public-api';
 import {
-  AnalysisReportSelectorComponent
+  AnalysisReportSelectorComponent,
 } from './../../analysis-report-viewer/analysis-report-selector/analysis-report-selector.component';
+import { AnalysisStatusCellComponent } from './analysis-status-cell.component';
 
 describe('AnalysisStatusCellComponent', () => {
   let component: AnalysisStatusCellComponent;
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts
index bd66e4e87b..382f3b21ba 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { BaseTestModules } from '../../../../../../test-framework/core-test.helper';
+import { BaseTestModules } from '../../../../../../../core/test-framework/core-test.helper';
 import { ConditionCellComponent } from './condition-cell.component';
 
 describe('ConditionCellComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts
index d6d5d7d6c2..e71a76120f 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { BaseTestModules } from '../../../../../../test-framework/core-test.helper';
+import { BaseTestModules } from '../../../../../../../core/test-framework/core-test.helper';
 import { KubernetesNodeCapacityComponent } from './kubernetes-node-capacity.component';
 
 describe('KubernetesNodeCapacityComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts
index b55778d677..cbb540177f 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { BaseTestModules } from '../../../../../../test-framework/core-test.helper';
+import { BaseTestModules } from '../../../../../../../core/test-framework/core-test.helper';
 import { KubernetesNodeIpsComponent } from './kubernetes-node-ips.component';
 
 describe('KubernetesNodeIpsComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts
index f36e05a977..2f7e112135 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { BaseTestModules } from '../../../../../../test-framework/core-test.helper';
+import { BaseTestModules } from '../../../../../../../core/test-framework/core-test.helper';
 import { KubernetesNodeLabelsComponent } from './kubernetes-node-labels.component';
 
 describe('KubernetesNodeLabelsComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts
index c5e1367b72..0a3579cd55 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { BaseTestModules } from '../../../../../../test-framework/core-test.helper';
+import { BaseTestModules } from '../../../../../../../core/test-framework/core-test.helper';
 import { KubernetesNodePressureComponent } from './kubernetes-node-pressure.component';
 
 describe('KubernetesNodePressureComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts
index c999020533..3efdf94c24 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
-import { TabNavService } from '../../../../tab-nav.service';
+import { TabNavService } from '../../../../../core/tab-nav.service';
 import { KubernetesBaseTestModules } from '../kubernetes.testing.module';
 import { PodMetricsComponent } from './pod-metrics.component';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.spec.ts
index 0a35b86689..d959dc1a83 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.spec.ts
@@ -1,11 +1,13 @@
-
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { KubernetesAnalysisInfoComponent } from './kubernetes-analysis-info.component';
-import { AnalysisInfoCardComponent } from './analysis-info-card/analysis-info-card.component';
-import { KubernetesBaseTestModules, KubeBaseGuidMock } from '../../../kubernetes.testing.module';
-import { KubernetesAnalysisService } from '../../../services/kubernetes.analysis.service';
+import { SidePanelService } from '../../../../../../../core/src/shared/services/side-panel.service';
+import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
+import { KubernetesAnalysisService } from '../../../services/kubernetes.analysis.service';
+import { SharedModule } from './../../../../../../../core/src/shared/shared.module';
+import { AnalysisInfoCardComponent } from './analysis-info-card/analysis-info-card.component';
+import { KubernetesAnalysisInfoComponent } from './kubernetes-analysis-info.component';
+
 
 describe('KubernetesAnalysisInfoComponent', () => {
   let component: KubernetesAnalysisInfoComponent;
@@ -15,11 +17,13 @@ describe('KubernetesAnalysisInfoComponent', () => {
     TestBed.configureTestingModule({
       declarations: [ KubernetesAnalysisInfoComponent, AnalysisInfoCardComponent ],
       imports: [
+        SharedModule,
         KubernetesBaseTestModules,
       ],
       providers: [
         KubernetesAnalysisService,
         KubernetesEndpointService,
+        SidePanelService,
         KubeBaseGuidMock,
       ]
     })
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.spec.ts
index f1f2d4fd8c..642176aa68 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.spec.ts
@@ -1,9 +1,13 @@
-
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { KubernetesAnalysisReportComponent } from './kubernetes-analysis-report.component';
-import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
+import { TabNavService } from '../../../../../../../core/tab-nav.service';
+import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
+import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
+import { KubernetesAnalysisService } from '../../../services/kubernetes.analysis.service';
+import { CoreModule } from './../../../../../../../core/src/core/core.module';
 import { AnalysisReportViewerComponent } from './../../../analysis-report-viewer/analysis-report-viewer.component';
+import { KubernetesAnalysisReportComponent } from './kubernetes-analysis-report.component';
+
 
 describe('KubernetesAnalysisReportComponent', () => {
   let component: KubernetesAnalysisReportComponent;
@@ -14,7 +18,13 @@ describe('KubernetesAnalysisReportComponent', () => {
       declarations: [ KubernetesAnalysisReportComponent, AnalysisReportViewerComponent ],
       imports: [
         KubernetesBaseTestModules,
-//        MDAppModule
+        CoreModule,
+      ],
+      providers: [
+        KubernetesAnalysisService,
+        KubernetesEndpointService,
+        KubeBaseGuidMock,
+        TabNavService,
       ]
     })
     .compileComponents();
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.ts
index 4ca7a3fc19..ab39ef6700 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.ts
@@ -42,6 +42,10 @@ export class KubernetesAnalysisReportComponent implements OnInit {
   }
 
   ngOnInit() {
+    if (!this.id) {
+      return;
+    }
+
     this.report$ = this.analysisService.getByID(this.kubeEndpointService.baseKube.guid, this.id).pipe(
       map((response: any) => {
         if (!response.type) {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.spec.ts
index b13da9b832..6e6255dd8c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.spec.ts
@@ -1,13 +1,13 @@
-
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { MDAppModule } from './../../../../core/md.module';
+import { TabNavService } from 'frontend/packages/core/tab-nav.service';
 
-import { KubernetesAnalysisTabComponent } from './kubernetes-analysis-tab.component';
-import { KubernetesBaseTestModules, KubeBaseGuidMock } from '../../kubernetes.testing.module';
-import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
+import { MDAppModule } from '../../../../../../core/src/public-api';
+import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
+import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
 import { AnalysisReportViewerComponent } from './../../analysis-report-viewer/analysis-report-viewer.component';
-import { TabNavService } from 'frontend/packages/core/tab-nav.service';
+import { KubernetesAnalysisTabComponent } from './kubernetes-analysis-tab.component';
+
 
 describe('KubernetesAnalysisTabComponent', () => {
   let component: KubernetesAnalysisTabComponent;
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts
index 8e64596d2e..539312f0a8 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts
@@ -1,7 +1,7 @@
 import { HttpClient, HttpHandler } from '@angular/common/http';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../tab-nav.service';
+import { TabNavService } from '../../../../../../core/tab-nav.service';
 import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
 import { KubernetesSummaryTabComponent } from './kubernetes-summary.component';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
index ebe873f1d2..4582dd922d 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
@@ -1,12 +1,14 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { TabNavService } from 'frontend/packages/core/tab-nav.service';
 
-import { HelmReleaseProviders, KubernetesBaseTestModules, KubeBaseGuidMock } from '../../../../kubernetes.testing.module';
-import { HelmReleaseSummaryTabComponent } from './helm-release-summary-tab.component';
-import { KubernetesAnalysisService } from '../../../../services/kubernetes.analysis.service';
+import { SidePanelService } from '../../../../../../../../core/src/shared/services/side-panel.service';
+import { HelmReleaseProviders, KubeBaseGuidMock, KubernetesBaseTestModules } from '../../../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service';
-import { AnalysisReportSelectorComponent } from './../../../../analysis-report-viewer/analysis-report-selector/analysis-report-selector.component';
-import { SidePanelService } from './../../../../../../shared/services/side-panel.service';
+import { KubernetesAnalysisService } from '../../../../services/kubernetes.analysis.service';
+import {
+  AnalysisReportSelectorComponent,
+} from './../../../../analysis-report-viewer/analysis-report-selector/analysis-report-selector.component';
+import { HelmReleaseSummaryTabComponent } from './helm-release-summary-tab.component';
 
 describe('HelmReleaseSummaryTabComponent', () => {
   let component: HelmReleaseSummaryTabComponent;
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.spec.ts
index 1906b66ac5..2955b20df0 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.spec.ts
@@ -4,9 +4,9 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { StoreModule } from '@ngrx/store';
 
-import { CoreModule } from '../../core/core.module';
-import { SharedModule } from '../../shared/shared.module';
+import { CoreModule } from '../../../../core/src/core/core.module';
 import { appReducers } from '../../../../store/src/reducers.module';
+import { SharedModule } from './../../../../core/src/shared/shared.module';
 import { SuseLoginComponent } from './suse-login.component';
 
 describe('SuseLoginComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/test.ts b/src/frontend/packages/suse-extensions/src/test.ts
new file mode 100644
index 0000000000..f205020844
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/test.ts
@@ -0,0 +1,36 @@
+// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+import 'core-js/es/reflect';
+import 'zone.js/dist/zone';
+import 'zone.js/dist/zone-testing';
+
+import { APP_BASE_HREF } from '@angular/common';
+import { getTestBed } from '@angular/core/testing';
+import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
+
+
+declare const require: any;
+
+// First, initialize the Angular testing environment.
+const testBed = getTestBed();
+testBed.initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting()
+);
+
+beforeEach(() => {
+  testBed.configureTestingModule({
+    providers: [{ provide: APP_BASE_HREF, useValue: '/' }]
+  });
+});
+
+/**
+ * Bump up the Jasmine timeout from 5 seconds
+ */
+beforeAll(() => {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
+});
+
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);
diff --git a/src/frontend/packages/suse-extensions/tsconfig.spec.json b/src/frontend/packages/suse-extensions/tsconfig.spec.json
new file mode 100644
index 0000000000..cb4a7be918
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/tsconfig.spec.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../../tsconfig.spec.json",
+  "compilerOptions": {
+    "outDir": "../../../../out-tsc/spec",
+    "types": [
+      "jasmine",
+      "node"
+    ]
+  },
+  "files": [
+    "src/test.ts"
+  ],
+  "include": [
+    "**/*.spec.ts",
+    "**/*.d.ts"
+  ]
+}

From 758f920f4bc68272f96c1913de9716bb7fccb821 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Tue, 1 Sep 2020 15:54:59 +0100
Subject: [PATCH 604/648] Fix issue where kube dependency vbom.ml/util is no
 longer available (#462)

* Fix issue where kube depedency vbom.ml/util is no longer available
- caused BE unit tests to fail on unrelated PRs
- route error
  ```
  go: vbom.ml/util@v0.0.0-20180919145318-efcd4e0f9787: unrecognized import path "vbom.ml/util" (https fetch: Get https://vbom.ml/util?go-get=1: dial tcp: lookup vbom.ml on 127.0.0.53:53: no such host)
  ```

* Update go.mod
---
 src/jetstream/go.sum                    | 132 ------------------------
 src/jetstream/plugins/kubernetes/go.mod |   1 -
 2 files changed, 133 deletions(-)

diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index ca7f76c6fb..ed4bbbd391 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -7,21 +7,15 @@ code.cloudfoundry.org/bytefmt v0.0.0-20180906201452-2aa6f33b730c h1:VzwteSWGbW9m
 code.cloudfoundry.org/bytefmt v0.0.0-20180906201452-2aa6f33b730c/go.mod h1:wN/zk7mhREp/oviagqUXY3EwuHhWyOvAdsn5Y4CzOrc=
 code.cloudfoundry.org/cfnetworking-cli-api v0.0.0-20190103195135-4b04f26287a6 h1:Yc9r1p21kEpni9WlG4mwOZw87TB2QlyS9sAEebZ3+ak=
 code.cloudfoundry.org/cfnetworking-cli-api v0.0.0-20190103195135-4b04f26287a6/go.mod h1:u5FovqC5GGAEbFPz+IdjycDA+gIjhUwqxnu0vbHwVeM=
-code.cloudfoundry.org/cli v6.43.0+incompatible h1:jAaPyHN5Hb2r2sR9i8Y8ejKPiPpuBYMaHBFyKVmQ7T4=
-code.cloudfoundry.org/cli v6.43.0+incompatible/go.mod h1:e4d+EpbwevNhyTZKybrLlyTvpH+W22vMsmdmcTxs/Fo=
 code.cloudfoundry.org/cli v6.49.0+incompatible h1:lUuYux9EXLe8EBzlvckJLpHKhc8szJfWiEc3SXdM8+o=
 code.cloudfoundry.org/cli v6.49.0+incompatible/go.mod h1:e4d+EpbwevNhyTZKybrLlyTvpH+W22vMsmdmcTxs/Fo=
-code.cloudfoundry.org/diego-ssh v0.0.0-20200312183824-517d22c5d890 h1:sr3sHuZSH6puBqQgatzM3hYRrfOc+D8eVv0ykLYwd6o=
 code.cloudfoundry.org/diego-ssh v0.0.0-20200312183824-517d22c5d890/go.mod h1:L2/glHnSK+wKnsG8oZZqdV2sgYY9NDo/I1aDJGhcWaM=
 code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f h1:UrKzEwTgeiff9vxdrfdqxibzpWjxLnuXDI5m6z3GJAk=
 code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f/go.mod h1:sk5LnIjB/nIEU7yP5sDQExVm62wu0pBh3yrElngUisI=
-code.cloudfoundry.org/inigo v0.0.0-20200318144131-597cd5dbfe8b h1:TSoj8216L9LEU1MKAI9GSpOpLesalhitn8R4fEn38P8=
 code.cloudfoundry.org/inigo v0.0.0-20200318144131-597cd5dbfe8b/go.mod h1:1ZB1JCh2FAp+SqX79ve6dc8YREvbsziULEOncAilX4Q=
-code.cloudfoundry.org/lager v2.0.0+incompatible h1:WZwDKDB2PLd/oL+USK4b4aEjUymIej9My2nUQ9oWEwQ=
 code.cloudfoundry.org/lager v2.0.0+incompatible/go.mod h1:O2sS7gKP3HM2iemG+EnwvyNQK7pTSC6Foi4QiMp9sSk=
 code.cloudfoundry.org/ykk v0.0.0-20170424192843-e4df4ce2fd4d h1:M+zXqtXJqcsmpL76aU0tdl1ho23eYa4axYoM4gD62UA=
 code.cloudfoundry.org/ykk v0.0.0-20170424192843-e4df4ce2fd4d/go.mod h1:YUJiVOr5xl0N/RjMxM1tHmgSpBbi5UM+KoVR5AoejO0=
-github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
 github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
 github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
@@ -33,14 +27,12 @@ github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbt
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/DATA-DOG/go-sqlmock v1.1.3 h1:sVIxMSTMnnVzl9Bn6BMjW6p5lSbpjHL80mqnxMWJ/oE=
 github.com/DATA-DOG/go-sqlmock v1.1.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
 github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e h1:eb0Pzkt15Bm7f2FFYv7sjY7NPFi3cPkS3tv1CcrFBWA=
 github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
 github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg=
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
-github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc=
 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
@@ -52,14 +44,10 @@ github.com/Masterminds/sprig/v3 v3.0.0 h1:KSQz7Nb08/3VU9E4ns29dDxcczhOD1q7O1UfM4
 github.com/Masterminds/sprig/v3 v3.0.0/go.mod h1:NEUY/Qq8Gdm2xgYA+NwJM6wmfdRV9xkh8h/Rld20R0U=
 github.com/Masterminds/vcs v1.13.0/go.mod h1:N09YCmOQr6RLxC6UNHzuVwAdodYbbnycGHSmwVJjcKA=
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
-github.com/Microsoft/go-winio v0.4.12 h1:xAfWHN1IrQ0NJ9TBC0KBZoqLjzDTr1ML+4MywiUOryc=
 github.com/Microsoft/go-winio v0.4.12/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
-github.com/Microsoft/hcsshim v0.8.6 h1:ZfF0+zZeYdzMIVMZHKtDKJvLHj76XCuVae/jNkjj0IA=
 github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
-github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46 h1:lsxEuwrXEAokXB9qhlbKWPpo3KMLZQ5WB5WLQRW1uq0=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-github.com/PuerkitoBio/purell v1.1.0 h1:rmGxhojJlM0tuKtfdvliR84CFHljx9ag64t2xmVkjK4=
 github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
@@ -68,7 +56,6 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc h1:MhBvG7RLaLqlyjxMR6of35vt6MVQ+eXMcgn9X/sy0FE=
 github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA=
-github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs=
 github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -76,7 +63,6 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/antonlindstrom/pgstore v0.0.0-20170604072116-a407030ba6d0 h1:e6PEaXbztY0ViaKotCICNnBQDUeNEJgrQ5UAHWlloh4=
 github.com/antonlindstrom/pgstore v0.0.0-20170604072116-a407030ba6d0/go.mod h1:2Ti6VUHVxpC0VSmTZzEvpzysnaGAfGBOoMIz5ykPyyw=
-github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77 h1:afT88tB6u9JCKQZVAAaa9ICz/uGn5Uw9ekn6P22mYKM=
 github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77/go.mod h1:bXvGk6IkT1Agy7qzJ+DjIw/SJ1AaB3AvAuMDVV+Vkoo=
 github.com/arschles/assert v1.0.0/go.mod h1:m/u69zW43x0h8dTHcv3JJZljINyEYgBuf5fYJP6WikI=
 github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
@@ -84,12 +70,10 @@ github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/aws/aws-sdk-go v1.17.5 h1:WW9Hm3KYo48iZHpmBc+b7sgyS0h32zgCvya28SLW4BU=
 github.com/aws/aws-sdk-go v1.17.5/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y=
 github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
 github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
@@ -107,14 +91,12 @@ github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tj
 github.com/cf-stratos/mysqlstore v0.0.0-20170822100912-304308519d13 h1:WwIvjUUodNoZduhdhotbKnrLSFoIn5vD3QgNZv0hjvo=
 github.com/cf-stratos/mysqlstore v0.0.0-20170822100912-304308519d13/go.mod h1:GgQT0ToC+7JLnMKdDB5d434WwCLC2dpNR2AgTJj/08o=
 github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
-github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 h1:HD4PLRzjuCVW79mQ0/pdsalOLHJ+FaEoqJLxfltpb2U=
 github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
 github.com/charlievieth/fs v0.0.0-20170613215519-7dc373669fa1 h1:vTlpHKxJqykyKdW9bkrDJNWeKNuSIAJ0TP/K4lRsz/Q=
 github.com/charlievieth/fs v0.0.0-20170613215519-7dc373669fa1/go.mod h1:sAoA1zHCH4FJPE2gne5iBiiVG66U7Nyp6JqlOo+FEyg=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudfoundry-community/go-cfenv v1.17.0 h1:qfxEfn8qKkaHY3ZEk/Y2noY79HBASvNgmtHK9x4+6GY=
 github.com/cloudfoundry-community/go-cfenv v1.17.0/go.mod h1:2UgWvQTRXUuIZ/x3KnW6fk6CgPBhcV4UQb/UGIrUyyI=
-github.com/cloudfoundry-incubator/stratos v2.0.0-beta-001+incompatible h1:UUxNbLjhv2cfymub5yNN1tjjqYkteHBBagb4jcbXEIQ=
 github.com/cloudfoundry/bosh-cli v5.4.0+incompatible h1:KpT2PBB7nP1QnK8guXeZ/D2k7FZYAOxcveKgYTDEDBI=
 github.com/cloudfoundry/bosh-cli v5.4.0+incompatible/go.mod h1:rzIB+e1sn7wQL/TJ54bl/FemPKRhXby5BIMS3tLuWFM=
 github.com/cloudfoundry/bosh-utils v0.0.0-20190206192830-9a0affed2bf1 h1:TxcGamw+BaxXTFwZFORzkWNMCHAWjhThxnI24CLS7iE=
@@ -131,17 +113,13 @@ github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMX
 github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 h1:4BX8f882bXEDKfWIf0wa8HRvpnBoPszJJXL+TVbBw4M=
 github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/coreos/bbolt v1.3.1-coreos.6/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
-github.com/coreos/etcd v3.3.15+incompatible h1:+9RjdC18gMxNQVvSiXvObLu29mOFmkgdsB4cRTlV+EE=
 github.com/coreos/etcd v3.3.15+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7 h1:u9SHYsPQNyt5tgDm3YN7+9dYrpK96E5wFilTFWIDZOM=
 github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea h1:n2Ltr3SrfQlf/9nOna1DoGKxLx3qTSI8Ttl6Xrqp6mw=
 github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cppforlife/go-patch v0.2.0 h1:Y14MnCQjDlbw7WXT4k+u6DPAA9XnygN4BfrSpI/19RU=
 github.com/cppforlife/go-patch v0.2.0/go.mod h1:67a7aIi94FHDZdoeGSJRRFDp66l9MhaAG1yGxpUoFD8=
-github.com/creack/pty v1.1.7 h1:6pwm8kMQKCmgUg0ZHTm5+/YvRK0s3THD/28+T6/kk4A=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
@@ -170,7 +148,6 @@ github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82/go.mod h1:/u0gXw
 github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
 github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4=
 github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE=
 github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
 github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c h1:ZfSZ3P3BedhKGUhzj7BQlPSU4OvT6tfOKe3DVHzOA7s=
@@ -183,17 +160,13 @@ github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76/go.mod h1:KjxHHirfL
 github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
 github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
 github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
-github.com/elazarl/goproxy v0.0.0-20200315184450-1f3cb6622dad h1:zPs0fNF2Io1Qytf92EI2CDJ9oCXZr+NmjEVexrUEdq4=
 github.com/elazarl/goproxy v0.0.0-20200315184450-1f3cb6622dad/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
 github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
-github.com/elazarl/goproxy/ext v0.0.0-20200315184450-1f3cb6622dad h1:3OG8xVCbdeebrE5IsoWl0TP25DWiHDbLUy+EKif7hDE=
 github.com/elazarl/goproxy/ext v0.0.0-20200315184450-1f3cb6622dad/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emicklei/go-restful v2.11.1+incompatible h1:CjKsv3uWcCMvySPQYKxO8XX3f9zD4FeZRsW4G0B4ffE=
 github.com/emicklei/go-restful v2.11.1+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
-github.com/evanphx/json-patch v4.1.0+incompatible h1:K1MDoo4AZ4wU0GIU/fPmtZg7VpzLjCxu+UwBD1FvwOc=
-github.com/evanphx/json-patch v4.1.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M=
 github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
@@ -202,9 +175,7 @@ github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZM
 github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/garyburd/redigo v1.6.0 h1:0VruCpn7yAIIu7pWVClQC8wxCJEcG3nyzpMSHKi1PQc=
 github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -226,14 +197,12 @@ github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQH
 github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
 github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
 github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
-github.com/go-openapi/jsonpointer v0.17.0 h1:nH6xp8XdXHx8dqveo0ZuJBluCO2qGrPbDNZ0dwoRHP0=
 github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
 github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
-github.com/go-openapi/jsonreference v0.17.0 h1:yJW3HCkTHg7NOA+gZ83IPHzUSnUzGXhGmsdiCcMexbA=
 github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
 github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
 github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
@@ -247,7 +216,6 @@ github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6
 github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64=
 github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
 github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
-github.com/go-openapi/spec v0.18.0 h1:aIjeyG5mo5/FrvDkpKKEGZPmF9MPHahS72mzfVqeQXQ=
 github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
 github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
 github.com/go-openapi/spec v0.19.4 h1:ixzUSnHTd6hCemgtAJgluaTSGYpLNpJY4mA2DIkdOAo=
@@ -256,7 +224,6 @@ github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pL
 github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
 github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY=
 github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
-github.com/go-openapi/swag v0.17.0 h1:iqrgMg7Q7SvtbWLlltPrkMs0UBJI6oTSs79JFRUi880=
 github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
 github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
 github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
@@ -264,7 +231,6 @@ github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tF
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
 github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
-github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
@@ -273,24 +239,19 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/gofrs/flock v0.7.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
-github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
 github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 h1:uHTyIjqVhYRhLbJ8nIiOJHkEZZ+5YoOsAbD3sk82NiE=
 github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
@@ -300,7 +261,6 @@ github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW
 github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho=
 github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8=
 github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -311,33 +271,22 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
-github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf h1:+RRA9JqSOZFfKrOeqr2z77+8R2RKyh8PG66dcu1V0ck=
-github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
 github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.1.0 h1:Jf4mxPC/ziBnoPIdpQdPJ9OeiomAUHLvxmPRSPH9m4s=
-github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
-github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhpy9g=
-github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/googleapis/gnostic v0.3.1 h1:WeAefnSUHlBb0iJKwxFDZdbfGwkd7xRNuV+IpXMJhYk=
 github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU=
 github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e h1:XWcjeEtTFTOVA9Fs1w7n2XBftk5ib4oZrhzWk0B+3eA=
 github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
-github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZsA=
 github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
-github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U=
 github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
 github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
@@ -346,13 +295,9 @@ github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+
 github.com/gorilla/sessions v1.1.3 h1:uXoZdcdA5XdXF3QzuSlheVRUvjl+1rKY7zBXL68L9RU=
 github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
-github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY=
-github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY=
-github.com/gosuri/uitable v0.0.1/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/gosuri/uitable v0.0.1/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/govau/cf-common v0.0.7 h1:uhp1P6XM6GGzu1+A4C7LELLX/9mCmH6W5DpJZC0kWmo=
 github.com/govau/cf-common v0.0.7/go.mod h1:5xL/OfE7wxeyHlXb7iei0rAbdQ/5v6dF18BZknPv7NQ=
@@ -361,10 +306,8 @@ github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f/go.mod h1:Fecb
 github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc h1:f8eY6cV/x1x+HLjOp4r72s/31/V2aTUtg5oKRRPf8/Q=
 github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
-github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
-github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.3 h1:YPkqC67at8FYaadspW/6uE0COsBxS2656RLEr8Bppgk=
@@ -374,16 +317,13 @@ github.com/helm/monocular v1.4.0/go.mod h1:PpkCN0v4zVVigsIHnsQdJytKFmaUkwfhxB7z3
 github.com/heptio/authenticator v0.3.0/go.mod h1:Q86X8hc61JXhE5XxYLKmrSRWby/Oe8IIYZIBgmGVkTA=
 github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40 h1:GT4RsKmHh1uZyhmTkWJTDALRjSHYQp6FRKrotf0zhAs=
 github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40/go.mod h1:NtmN9h8vrTveVQRLHcX2HQ5wIPBDCsZ351TGbZWgg38=
-github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0=
 github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4=
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI=
 github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.8 h1:CGgOkSJeqMRmt0D9XLWExdT4m4F1vd3FV3VPt+0VxkQ=
 github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
@@ -397,27 +337,21 @@ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV
 github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 h1:PJPDf8OUfOK1bb/NeTKd4f1QXZItOX389VN3B6qC8ro=
 github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
 github.com/kat-co/vala v0.0.0-20170210184112-42e1d8b61f12 h1:DQVOxR9qdYEybJUr/c7ku34r3PfajaMYXZwgDM7KuSk=
 github.com/kat-co/vala v0.0.0-20170210184112-42e1d8b61f12/go.mod h1:u9MdXq/QageOOSGp7qG4XAQsYUMP+V5zEel/Vrl6OOc=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
-github.com/kr/pty v1.1.8 h1:AkaSdXYQOWeaO3neb8EM634ahkXXe3jYbVh/F9lq+GI=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 h1:wdTBUArlqtBYGN2Dd4+zsaFxFH0m4iGCHToW10jPX0k=
-github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
 github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a h1:VqeX/fehAB6FtBox0TVYcjOMXGE56INQIfbXegditX4=
 github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
 github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc h1:Ttr4Z3ZrMv4rAXn10UAqOC8ACx+F1omvcyV1a3hRArE=
@@ -451,7 +385,6 @@ github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcME
 github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
 github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-shellwords v1.0.5/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
-github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
 github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v1.13.0 h1:LnJI81JidiW9r7pS/hXe6cFeO5EXNq7KbfvoJLRI69c=
 github.com/mattn/go-sqlite3 v1.13.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
@@ -460,7 +393,6 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5
 github.com/mholt/archiver v3.1.1+incompatible h1:1dCVxuqs0dJseYEhi5pl7MYPH9zDa1wBi7mF09cbNkU=
 github.com/mholt/archiver v3.1.1+incompatible/go.mod h1:Dh2dOXnSdiLxRiPoVfIr/fI1TwETms9B8CTWfeh7ROU=
 github.com/miekg/dns v0.0.0-20181005163659-0d29b283ac0f/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/miekg/dns v1.1.4 h1:rCMZsU2ScVSYcAsOXgmC6+AKOK+6pmQTOcw03nfwYV0=
 github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
 github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
@@ -483,12 +415,9 @@ github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c h1:nXxl5PrvVm2L/wCy8dQu6DMTwH4oIuGN8GJDAlqDdVE=
 github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
-github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d h1:7PxY7LVfSZm7PEeBTyK1rj1gABdCO2mbri6GKO1cMDs=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
-github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ=
 github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U=
 github.com/nwaples/rardecode v1.0.0 h1:r7vGuS5akxOnR4JQSkko62RJ1ReCMXxQRPtxsiFMBOs=
 github.com/nwaples/rardecode v1.0.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
@@ -497,15 +426,11 @@ github.com/nwmac/sqlitestore v0.0.0-20180824125213-7d2ab221fb3f/go.mod h1:GVvWHl
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo=
 github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw=
 github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.8.1 h1:C5Dqfs/LeauYDX0jJXIe2SWmwCbGzx9yF8C8xy3Lh34=
 github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
@@ -513,13 +438,9 @@ github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVo
 github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/opencontainers/runc v0.1.1 h1:GlxAyO6x8rfZYN9Tt0Kti5a/cP41iuiO2yYT0IJGY8Y=
 github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
-github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830 h1:yvQ/2Pupw60ON8TYEIGGTAI77yZsWYkiOeHFZWkwlCk=
-github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
-github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
-github.com/phayes/freeport v0.0.0-20171002181615-b8543db493a5 h1:rZQtoozkfsiNs36c7Tdv/gyGNzD1X1XWKO8rptVNZuM=
 github.com/phayes/freeport v0.0.0-20171002181615-b8543db493a5/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE=
 github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
@@ -529,28 +450,23 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/poy/eachers v0.0.0-20181020210610-23942921fe77 h1:SNdqPRvRsVmYR0gKqFvrUKhFizPJ6yDiGQ++VAJIoDg=
 github.com/poy/eachers v0.0.0-20181020210610-23942921fe77/go.mod h1:x1vqpbcMW9T/KRcQ4b48diSiSVtYgvwQ5xzDByEg4WE=
 github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=
 github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.2.1 h1:JnMpQc6ppsNgw9QPAGF6Dod479itz7lvlsMzzNayLOI=
 github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.7.0 h1:L+1lyG48J1zAQXA3RBX/nG/B3gjlHq0zTt2tlbJLyCY=
 github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190129233650-316cf8ccfec5/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
@@ -562,7 +478,6 @@ github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNue
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94 h1:G04eS0JkAIVZfaJLjla9dNxkJCPiKIGZlw9AfOhzOD0=
 github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94/go.mod h1:b18R55ulyQ/h3RaWyloPyER7fWQVZvimKKhnI5OfrJQ=
-github.com/sajari/fuzzy v1.0.0 h1:+FmwVvJErsd0d0hAPlj4CxqxUtQY/fOoY0DwX4ykpRY=
 github.com/sajari/fuzzy v1.0.0/go.mod h1:OjYR6KxoWOe9+dOlXeiCJd4dIbED4Oo8wpS89o0pwOo=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
@@ -571,9 +486,7 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 h1:hBSHahWMEgzwRyS6dRpxY0XyjZsHyQ61s084wo5PJe0=
 github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v0.0.0-20160503033757-d4c757aa9afd h1:ZDVcuZGxvWB1ooKj1e31P/ktQK4A2WumM+LucMENpds=
 github.com/smartystreets/goconvey v0.0.0-20160503033757-d4c757aa9afd/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
 github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
@@ -582,7 +495,6 @@ github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkU
 github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
@@ -596,7 +508,6 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245/go.mod h1:O1c8HleITsZqzNZDjSNzirUGsMT0oGu9LhHKoJrqO+A=
-github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 h1:mujcChM89zOHwgZBBNr5WZ77mBXP1yR+gLThGCYZgAg=
 github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0=
 github.com/tedsuo/rata v1.0.0 h1:Sf9aZrYy6ElSTncjnGkyC2yuVvz5YJetBIUKJ4CmeKE=
 github.com/tedsuo/rata v1.0.0/go.mod h1:X47ELzhOoLbfFIY0Cql9P6yo3Cdwf2CMX3FVZxRzJPc=
@@ -625,43 +536,33 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:
 github.com/xeipuuv/gojsonschema v1.1.0 h1:ngVtJC9TY/lg0AA/1k48FYhBrhRoFlEmWzsehpNAaZg=
 github.com/xeipuuv/gojsonschema v1.1.0/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
 github.com/xenolf/lego v0.0.0-20160613233155-a9d8cec0e656/go.mod h1:fwiGnfsIjG7OHPfOvgK7Y/Qo6+2Ox0iozjNTkZICKbY=
-github.com/xenolf/lego v0.3.2-0.20160613233155-a9d8cec0e656 h1:BTvU+npm3/yjuBd53EvgiFLl5+YLikf2WvHsjRQ4KrY=
 github.com/xenolf/lego v0.3.2-0.20160613233155-a9d8cec0e656/go.mod h1:fwiGnfsIjG7OHPfOvgK7Y/Qo6+2Ox0iozjNTkZICKbY=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
 github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
-github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 h1:p7OofyZ509h8DmPLh8Hn+EIIZm/xYhdZHJ9GnXHdr6U=
 github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
-github.com/yvasiyarov/gorelic v0.0.6 h1:qMJQYPNdtJ7UNYHjX38KXZtltKTqimMuoQjNnSVIuJg=
 github.com/yvasiyarov/gorelic v0.0.6/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA=
-github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f h1:ERexzlUfuTvpE74urLSbIQW0Z/6hF9t8U4NsJLaioAY=
 github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
 github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
 github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
 go.mongodb.org/mongo-driver v1.1.3 h1:++7u8r9adKhGR+I79NfEtYrk2ktjenErXM99PSufIoI=
 go.mongodb.org/mongo-driver v1.1.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569 h1:nSQar3Y0E3VQF/VdZ8PTAilaXpER+d7ypdABCrpwMdg=
 go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df h1:shvkWr0NAZkg4nPuE3XrKP0VuBPijjk3TfX6Y6acFNg=
 go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
-go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15 h1:Z2sc4+v0JHV6Mn4kX1f2a5nruNjmV+Th32sugE8zwz8=
 go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152 h1:ZC1Xn5A1nlpSmQCIva4bZ3ob3lmhYIefc+GU+DLg1Ow=
 golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9 h1:abxekknhS/Drh3uoQDk5Hc7BgeiyI39Crb7vhf/1j5s=
 golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067 h1:KYGJGHOQy8oSi1fDlSpcZF0+juKwk/hEMv5SiwHogR0=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
@@ -691,17 +592,13 @@ golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271 h1:N66aaryRB3Ax92gH0v3hp1QYZ3zWWCCUR/j8Ifh45Ss=
 golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226191147-529b322ea346 h1:zxGQKdHVCsCsJpbd7ijKsVC27CyETheUBql7Br2TGmA=
-golang.org/x/oauth2 v0.0.0-20190226191147-529b322ea346/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -712,27 +609,22 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191008105621-543471e840be h1:QAcqgptGM8IQBC9K/RC4o+O9YmqEm0diQn9QmZw/0mU=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191028164358-195ce5e7f934 h1:u/E0NqCIWRDAo9WCFo6Ko49njPFDLSd3z+X1HgWDMpE=
 golang.org/x/sys v0.0.0-20191028164358-195ce5e7f934/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -750,7 +642,6 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
 gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
@@ -758,11 +649,8 @@ gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmK
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190128161407-8ac453e89fca/go.mod h1:L3J43x8/uS+qIUoksaLKe6OS3nUKxOKuIFz1sl2/jx4=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -771,7 +659,6 @@ google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRn
 google.golang.org/genproto v0.0.0-20191028173616-919d9bdd9fe6 h1:UXl+Zk3jqqcbEVV7ace5lrt4YdA4tXiz3f/KbmD29Vo=
 google.golang.org/genproto v0.0.0-20191028173616-919d9bdd9fe6/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
-google.golang.org/grpc v1.19.0 h1:cfg4PD8YEdSFnm7qLV4++93WcmhH2nIUhMjhdCvl3j8=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
@@ -779,39 +666,26 @@ google.golang.org/grpc v1.24.0 h1:vb/1TCsVn3DcJlQ0Gs1yB1pKI6Do2/QNwxdKqmc/b0s=
 google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/cheggaaa/pb.v1 v1.0.27 h1:kJdccidYzt3CaHD1crCFTS1hxyhSi059NhOFUf03YFo=
 gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
-gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
-gopkg.in/square/go-jose.v1 v1.1.2 h1:/5jmADZB+RiKtZGr4HxsEFOEfbfsjTKsVnqpThUpE30=
 gopkg.in/square/go-jose.v1 v1.1.2/go.mod h1:QpYS+a4WhS+DTlyQIi6Ka7MS3SuR9a055rgXNEe6EiA=
-gopkg.in/square/go-jose.v2 v2.2.2 h1:orlkJ3myw8CN1nVQHBFfloD+L3egixIa4FvUP6RosSA=
 gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 helm.sh/helm/v3 v3.0.0 h1:or/9cs1GgfcTQeEnR2CVJNw893/rmqIG1KsNHmUiSFw=
 helm.sh/helm/v3 v3.0.0/go.mod h1:sI7B9yfvMgxtTPMWdk1jSKJ2aa59UyP9qhPydqW6mgo=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -833,14 +707,12 @@ k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-201910010437
 k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20191001043732-d647ddbd755f/go.mod h1:f1tFT2pOqPzfckbG1GjHIzy3G+T2LW7rchcruNoLaiM=
 k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20191001043732-d647ddbd755f h1:X3br+JCtf40mnzQsKAnHnezd1CvCENgG5uLJTbAspZ4=
 k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20191001043732-d647ddbd755f/go.mod h1:PNw+FbGH4/s3zK9V3rAeMiHTbQz2CU/yqAkfQ2UgLVs=
-k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20191001043732-d647ddbd755f h1:QIhu1g7jmiv/90qGiPiCOTHFYEcrL0HA5P/6G/pt7zM=
 k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20191001043732-d647ddbd755f/go.mod h1:WmFoxjELD2xtWb77Yj9RPibT5ACkQYEW9lPQtNkGtbE=
 k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20191001043732-d647ddbd755f h1:6CkT409OUoX4ZiP++1N3id3PCcOoktBvclNsDKPKrfc=
 k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20191001043732-d647ddbd755f/go.mod h1:nBogvbgjMgo7AeVA6CuqVO13LVIfmlQ11t6xzAJdBN8=
 k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20191001043732-d647ddbd755f h1:ksJC2cpBqkCP8bzmfDYXr65JRpt9JmANvaKIR3qggt4=
 k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20191001043732-d647ddbd755f/go.mod h1:GiGfbsjtP4tOW6zgpL8/vCUoyXAV5+9X2onLursPi08=
 k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20191001043732-d647ddbd755f/go.mod h1:L8deZCu6NpzgKzY91TOGKJ1JtAoHd8WyJ/HdoxqZCGo=
-k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20191001043732-d647ddbd755f h1:fwZSUxpQ99UBEkIhHbzY2pE3SPU9Zn4yZkMSolEt6Jw=
 k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20191001043732-d647ddbd755f/go.mod h1:spPP+vRNS8EsnNNIhFCZTTuRO3XhV1WoF18HJySoZn8=
 k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20191001043732-d647ddbd755f h1:vH4+rTRLDI8z9dQCZ6cJcIi3RMGZ6JwJWyLbrSNHBCE=
 k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20191001043732-d647ddbd755f/go.mod h1:ellVfoCz8MlDjTnkqsTkU5svJOIjcK3XNx/onmixgDk=
@@ -853,14 +725,10 @@ modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
 modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
 modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
 modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
-rsc.io/letsencrypt v0.0.1 h1:DV0d09Ne9E7UUa9ZqWktZ9L2VmybgTgfq7xlfFR/bbU=
 rsc.io/letsencrypt v0.0.1/go.mod h1:buyQKZ6IXrRnB7TdkHP0RyEybLx18HHyOSoTyoOLqNY=
 sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
 sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
-sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca h1:6dsH6AYQWbyZmtttJNe8Gq1cXOeS1BdV3eW37zHilAQ=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA=
 sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
-vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 h1:O69FD9pJA4WUZlEwYatBEEkRWKQ5cKodWpdKTrCS/iQ=
-vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI=
diff --git a/src/jetstream/plugins/kubernetes/go.mod b/src/jetstream/plugins/kubernetes/go.mod
index 6e44da2a86..ebeac9e5a1 100644
--- a/src/jetstream/plugins/kubernetes/go.mod
+++ b/src/jetstream/plugins/kubernetes/go.mod
@@ -29,7 +29,6 @@ require (
 	k8s.io/api v0.0.0-20191016110408-35e52d86657a
 	k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8
 	k8s.io/client-go v0.0.0-20191016111102-bec269661e48
-	vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 // indirect
 )
 
 replace (

From 1e7f1ae428a2fb561d2a7b8deeed9f5f358595ed Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Wed, 2 Sep 2020 10:47:18 +0100
Subject: [PATCH 605/648] Add a 'live reload' button to workload views (#443)

* Add a 'live reload' button to workload views
- move workload socket code into it's own service
- create toggle component to start/stop socket

* Add pause/unpause workload socket, used instead of stop/start

* Changes following review

* Fix unit tests
---
 .../kubernetes/kubernetes.testing.module.ts   |   2 +
 .../helm-release-socket-service.ts            | 209 ++++++++++++++++++
 .../helm-release-tab-base.component.ts        | 153 +------------
 .../release/tabs/helm-release-helpers.scss    |   8 +
 .../helm-release-pods-tab.component.html      |   3 +
 .../helm-release-pods-tab.component.scss      |   3 +
 .../helm-release-pods-tab.component.spec.ts   |  14 +-
 ...helm-release-resource-graph.component.html |   2 +
 ...helm-release-resource-graph.component.scss |   6 +-
 .../helm-release-services-tab.component.html  |   3 +
 .../helm-release-services-tab.component.scss  |   3 +
 ...elm-release-services-tab.component.spec.ts |  14 +-
 .../helm-release-summary-tab.component.html   |   2 +
 .../helm-release-summary-tab.component.scss   |   2 +
 .../workload-live-reload.component.html       |   3 +
 .../workload-live-reload.component.scss       |   3 +
 .../workload-live-reload.component.spec.ts    |  37 ++++
 .../workload-live-reload.component.ts         |  25 +++
 .../kubernetes/workloads/workloads.module.ts  |   2 +
 src/jetstream/plugins/cfapppush/deploy.go     |   2 +-
 .../plugins/kubernetes/get_release.go         |  68 +++++-
 21 files changed, 405 insertions(+), 159 deletions(-)
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-socket-service.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helpers.scss
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.html
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.scss
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.spec.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.ts

diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.testing.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.testing.module.ts
index e1967ff707..ea8fa319f8 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.testing.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.testing.module.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 { TabNavService } from '../../../../core/tab-nav.service';
 import { AppTestModule } from '../../../../core/test-framework/core-test.helper';
 import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../../../store/src/entity-catalog.module';
 import { entityCatalog, TestEntityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
@@ -49,6 +50,7 @@ export const HelmReleaseProviders = [
   HelmReleaseHelperService,
   HelmReleaseActivatedRouteMock,
   HelmReleaseGuidMock,
+  TabNavService
 ];
 
 export const KubeBaseGuidMock = { provide: BaseKubeGuid, useValue: { guid: 'anything' } };
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-socket-service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-socket-service.ts
new file mode 100644
index 0000000000..cb2eb017b2
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-socket-service.ts
@@ -0,0 +1,209 @@
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Subject, Subscription } from 'rxjs';
+import makeWebSocketObservable, { GetWebSocketResponses } from 'rxjs-websockets';
+import { catchError, map, share, switchMap } from 'rxjs/operators';
+
+import { LoggerService } from '../../../../../../../core/src/core/logger.service';
+import { SnackBarService } from '../../../../../../../core/src/shared/services/snackbar.service';
+import { AppState } from '../../../../../../../store/src/app-state';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
+import { EntityRequestAction, WrapperRequestActionSuccess } from '../../../../../../../store/src/types/request.types';
+import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog';
+import { KubernetesPodExpandedStatusHelper } from '../../../services/kubernetes-expanded-state';
+import { KubernetesPod, KubeService } from '../../../store/kube.types';
+import { KubePaginationAction } from '../../../store/kubernetes.actions';
+import { HelmReleaseGraph, HelmReleasePod, HelmReleaseService } from '../../workload.types';
+import { workloadsEntityCatalog } from '../../workloads-entity-catalog';
+import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service';
+
+
+enum SocketEventTypes {
+  PAUSE_TRUE = 20000,
+  PAUSE_FALSE = 20001,
+}
+
+interface SocketMessage {
+  type: SocketEventTypes
+}
+
+@Injectable()
+export class HelmReleaseSocketService {
+
+  private sub: Subscription;
+  private sendToSocket = new Subject<any>();
+
+  constructor(
+    private helmReleaseHelper: HelmReleaseHelperService,
+    private store: Store<AppState>,
+    private logService: LoggerService,
+    private snackbarService: SnackBarService,
+  ) {
+
+  }
+
+  public start() {
+    if (this.isStarted()) {
+      return;
+    }
+
+    const releaseRef = this.helmReleaseHelper.guidAsUrlFragment();
+    const host = window.location.host;
+    const protocol = window.location.protocol === 'https:' ? 'wss' : 'ws';
+    const streamUrl = (
+      `${protocol}://${host}/pp/v1/helm/releases/${releaseRef}/status`
+    );
+
+    const socket$ = makeWebSocketObservable(streamUrl).pipe(catchError(e => {
+      this.logService.error(
+        'Error while connecting to socket: ' + JSON.stringify(e)
+      );
+      return [];
+    }),
+      share(),
+    );
+
+    const messages = socket$.pipe(
+      switchMap((getResponses: GetWebSocketResponses) => {
+        return getResponses(this.sendToSocket);
+      }),
+      map((message: string) => message),
+      catchError(e => {
+        console.error('Workload WS error: ', e);
+        return [];
+      })
+    );
+
+    let prefix = '';
+    this.sub = messages.subscribe(jsonString => {
+      const messageObj = JSON.parse(jsonString);
+      if (messageObj) {
+        if (messageObj.kind === 'ReleasePrefix') {
+          prefix = messageObj.data;
+        } else if (messageObj.kind === 'Pods') {
+          const pods: KubernetesPod[] = messageObj.data || [];
+          const podsWithInfo: KubernetesPod[] = pods.map(pod => KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(pod));
+          const releasePodsAction = kubeEntityCatalog.pod.actions.getInWorkload(
+            this.helmReleaseHelper.endpointGuid,
+            this.helmReleaseHelper.releaseTitle
+          );
+          this.populateList(releasePodsAction, podsWithInfo);
+        } else if (messageObj.kind === 'Graph') {
+          const graph: HelmReleaseGraph = messageObj.data;
+          graph.endpointId = this.helmReleaseHelper.endpointGuid;
+          graph.releaseTitle = this.helmReleaseHelper.releaseTitle;
+          const releaseGraphAction = workloadsEntityCatalog.graph.actions.get(graph.releaseTitle, graph.endpointId);
+          this.addResource(releaseGraphAction, graph);
+        } else if (messageObj.kind === 'Manifest' || messageObj.kind === 'Resources') {
+          // Store all of the services
+          const manifest = messageObj.data;
+          const svcs: KubeService[] = [];
+          // Store ALL resources for the release
+          manifest.forEach(resource => {
+            if (resource.kind === 'Service' && prefix) {
+              svcs.push(resource);
+            }
+          });
+          if (svcs.length > 0) {
+            const releaseServicesAction = kubeEntityCatalog.service.actions.getInWorkload(
+              this.helmReleaseHelper.releaseTitle,
+              this.helmReleaseHelper.endpointGuid,
+            );
+            this.populateList(releaseServicesAction, svcs);
+          }
+
+          // const resources = { ...manifest };
+          // kind === 'Resources' is an array, really they should go into a pagination section
+          messageObj.endpointId = this.helmReleaseHelper.endpointGuid;
+          messageObj.releaseTitle = this.helmReleaseHelper.releaseTitle;
+
+          const releaseResourceAction = workloadsEntityCatalog.resource.actions.get(
+            this.helmReleaseHelper.releaseTitle,
+            this.helmReleaseHelper.endpointGuid,
+          );
+          this.addResource(releaseResourceAction, messageObj);
+        } else if (messageObj.kind === 'ManifestErrors') {
+          if (messageObj.data) {
+            this.snackbarService.show('Errors were found when parsing this workload. Not all resources may be shown', 'Dismiss');
+          }
+        }
+      }
+    });
+  }
+
+  public stop() {
+    if (this.sub) {
+      this.sub.unsubscribe()
+      this.sub = null;
+    }
+  }
+
+  public enable(enable: boolean) {
+    if (enable) {
+      this.start()
+    } else {
+      this.stop()
+    }
+  }
+
+  public isStarted(): boolean {
+    return !!this.sub;
+  }
+
+  public pause(pause: boolean) {
+    if (pause != this.isPaused) {
+      const message: SocketMessage = {
+        type: pause ? SocketEventTypes.PAUSE_TRUE : SocketEventTypes.PAUSE_FALSE
+      }
+      this.sendToSocket.next(JSON.stringify(message));
+      this.isPaused = pause;
+    }
+  }
+
+  public isPaused = false;
+
+  ngOnDestroy() {
+    this.sub.unsubscribe();
+    this.snackbarService.hide();
+  }
+
+  private addResource(action: EntityRequestAction, data: any) {
+    const catalogEntity = entityCatalog.getEntity(action);
+    const response = {
+      entities: {
+        [catalogEntity.entityKey]: {
+          [action.guid]: data
+        }
+      },
+      result: [
+        action.guid
+      ]
+    };
+    const successWrapper = new WrapperRequestActionSuccess(response, action);
+    this.store.dispatch(successWrapper);
+  }
+
+  private populateList(action: KubePaginationAction, resources: any) {
+    const entity = entityCatalog.getEntity(action);
+    const newResources = {};
+    resources.forEach(resource => {
+      const newResource: HelmReleasePod | HelmReleaseService = {
+        endpointId: action.kubeGuid,
+        releaseTitle: this.helmReleaseHelper.releaseTitle,
+        ...resource
+      };
+      newResource.metadata.kubeId = action.kubeGuid;
+      // The service entity from manifest is missing this, but apply here to ensure any others are caught
+      newResource.metadata.namespace = this.helmReleaseHelper.namespace;
+      const entityId = action.entity[0].getId(resource);
+      newResources[entityId] = newResource;
+    });
+
+    const releasePods = {
+      entities: { [entity.entityKey]: newResources },
+      result: Object.keys(newResources)
+    };
+    const successWrapper = new WrapperRequestActionSuccess(releasePods, action, 'fetch', releasePods.result.length, 1);
+    this.store.dispatch(successWrapper);
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
index b84d708c7c..8bad3751c8 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
@@ -1,25 +1,15 @@
 import { Component, OnDestroy } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Store } from '@ngrx/store';
-import { Observable, Subject, Subscription } from 'rxjs';
-import makeWebSocketObservable, { GetWebSocketResponses } from 'rxjs-websockets';
-import { catchError, map, share, switchMap } from 'rxjs/operators';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 
-import { LoggerService } from '../../../../../../../core/src/core/logger.service';
 import { IPageSideNavTab } from '../../../../../../../core/src/features/dashboard/page-side-nav/page-side-nav.component';
 import { SessionService } from '../../../../../../../core/src/shared/services/session.service';
 import { SnackBarService } from '../../../../../../../core/src/shared/services/snackbar.service';
-import { AppState } from '../../../../../../../store/src/app-state';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
-import { EntityRequestAction, WrapperRequestActionSuccess } from '../../../../../../../store/src/types/request.types';
-import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog';
-import { KubernetesPodExpandedStatusHelper } from '../../../services/kubernetes-expanded-state';
 import { KubernetesAnalysisService } from '../../../services/kubernetes.analysis.service';
-import { KubernetesPod, KubeService } from '../../../store/kube.types';
-import { KubePaginationAction } from '../../../store/kubernetes.actions';
-import { HelmReleaseGraph, HelmReleaseGuid, HelmReleasePod, HelmReleaseService } from '../../workload.types';
-import { workloadsEntityCatalog } from '../../workloads-entity-catalog';
+import { HelmReleaseGuid } from '../../workload.types';
 import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service';
+import { HelmReleaseSocketService } from './helm-release-socket-service';
 
 
 @Component({
@@ -37,15 +27,14 @@ import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service';
       deps: [
         ActivatedRoute
       ]
-    }
+    },
+    HelmReleaseSocketService
   ]
 })
 export class HelmReleaseTabBaseComponent implements OnDestroy {
 
   isFetching$: Observable<boolean>;
 
-  private sub: Subscription;
-
   public breadcrumbs = [{
     breadcrumbs: [
       { value: 'Workloads', routerLink: '/workloads' }
@@ -58,11 +47,10 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
 
   constructor(
     public helmReleaseHelper: HelmReleaseHelperService,
-    private store: Store<AppState>,
-    private logService: LoggerService,
     private analysisService: KubernetesAnalysisService,
     private snackbarService: SnackBarService,
-    sessionService: SessionService
+    sessionService: SessionService,
+    private socketService: HelmReleaseSocketService
   ) {
     this.title = this.helmReleaseHelper.releaseTitle;
 
@@ -77,132 +65,11 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
       { link: 'services', label: 'Services', icon: 'service', iconFont: 'stratos-icons' }
     ];
 
-    const releaseRef = this.helmReleaseHelper.guidAsUrlFragment();
-    const host = window.location.host;
-    const protocol = window.location.protocol === 'https:' ? 'wss' : 'ws';
-    const streamUrl = (
-      `${protocol}://${host}/pp/v1/helm/releases/${releaseRef}/status`
-    );
-
-    const socket$ = makeWebSocketObservable(streamUrl).pipe(catchError(e => {
-      this.logService.error(
-        'Error while connecting to socket: ' + JSON.stringify(e)
-      );
-      return [];
-    }),
-      share(),
-    );
-
-    const messages = socket$.pipe(
-      switchMap((getResponses: GetWebSocketResponses) => {
-        return getResponses(new Subject<string>());
-      }),
-      map((message: string) => message),
-      catchError(e => {
-        console.error('Workload WS error: ', e);
-        return [];
-      })
-    );
-
-    let prefix = '';
-    this.sub = messages.subscribe(jsonString => {
-      const messageObj = JSON.parse(jsonString);
-      if (messageObj) {
-        if (messageObj.kind === 'ReleasePrefix') {
-          prefix = messageObj.data;
-        } else if (messageObj.kind === 'Pods') {
-          const pods: KubernetesPod[] = messageObj.data || [];
-          const podsWithInfo: KubernetesPod[] = pods.map(pod => KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(pod));
-          const releasePodsAction = kubeEntityCatalog.pod.actions.getInWorkload(
-            this.helmReleaseHelper.endpointGuid,
-            this.helmReleaseHelper.releaseTitle
-          );
-          this.populateList(releasePodsAction, podsWithInfo);
-        } else if (messageObj.kind === 'Graph') {
-          const graph: HelmReleaseGraph = messageObj.data;
-          graph.endpointId = this.helmReleaseHelper.endpointGuid;
-          graph.releaseTitle = this.helmReleaseHelper.releaseTitle;
-          const releaseGraphAction = workloadsEntityCatalog.graph.actions.get(graph.releaseTitle, graph.endpointId);
-          this.addResource(releaseGraphAction, graph);
-        } else if (messageObj.kind === 'Manifest' || messageObj.kind === 'Resources') {
-          // Store all of the services
-          const manifest = messageObj.data;
-          const svcs: KubeService[] = [];
-          // Store ALL resources for the release
-          manifest.forEach(resource => {
-            if (resource.kind === 'Service' && prefix) {
-              svcs.push(resource);
-            }
-          });
-          if (svcs.length > 0) {
-            const releaseServicesAction = kubeEntityCatalog.service.actions.getInWorkload(
-              this.helmReleaseHelper.releaseTitle,
-              this.helmReleaseHelper.endpointGuid,
-            );
-            this.populateList(releaseServicesAction, svcs);
-          }
-
-          // const resources = { ...manifest };
-          // kind === 'Resources' is an array, really they should go into a pagination section
-          messageObj.endpointId = this.helmReleaseHelper.endpointGuid;
-          messageObj.releaseTitle = this.helmReleaseHelper.releaseTitle;
-
-          const releaseResourceAction = workloadsEntityCatalog.resource.actions.get(
-            this.helmReleaseHelper.releaseTitle,
-            this.helmReleaseHelper.endpointGuid,
-          );
-          this.addResource(releaseResourceAction, messageObj);
-        } else if (messageObj.kind === 'ManifestErrors') {
-          if (messageObj.data) {
-            this.snackbarService.show('Errors were found when parsing this workload. Not all resources may be shown', 'Dismiss');
-          }
-        }
-      }
-    });
-  }
-
-  private addResource(action: EntityRequestAction, data: any) {
-    const catalogEntity = entityCatalog.getEntity(action);
-    const response = {
-      entities: {
-        [catalogEntity.entityKey]: {
-          [action.guid]: data
-        }
-      },
-      result: [
-        action.guid
-      ]
-    };
-    const successWrapper = new WrapperRequestActionSuccess(response, action);
-    this.store.dispatch(successWrapper);
-  }
-
-  private populateList(action: KubePaginationAction, resources: any) {
-    const entity = entityCatalog.getEntity(action);
-    const newResources = {};
-    resources.forEach(resource => {
-      const newResource: HelmReleasePod | HelmReleaseService = {
-        endpointId: action.kubeGuid,
-        releaseTitle: this.helmReleaseHelper.releaseTitle,
-        ...resource
-      };
-      newResource.metadata.kubeId = action.kubeGuid;
-      // The service entity from manifest is missing this, but apply here to ensure any others are caught
-      newResource.metadata.namespace = this.helmReleaseHelper.namespace;
-      const entityId = action.entity[0].getId(resource);
-      newResources[entityId] = newResource;
-    });
-
-    const releasePods = {
-      entities: { [entity.entityKey]: newResources },
-      result: Object.keys(newResources)
-    };
-    const successWrapper = new WrapperRequestActionSuccess(releasePods, action, 'fetch', releasePods.result.length, 1);
-    this.store.dispatch(successWrapper);
+    this.socketService.start()
   }
 
   ngOnDestroy() {
-    this.sub.unsubscribe();
+    this.socketService.stop()
     this.snackbarService.hide();
   }
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helpers.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helpers.scss
new file mode 100644
index 0000000000..8b6c1eeb83
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helpers.scss
@@ -0,0 +1,8 @@
+
+@mixin add-life-update-style {
+  app-workload-live-reload {
+    display: flex;
+    flex: 1;
+    justify-content: flex-end;
+  }
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.html
index dd2b6cb351..0bb77b9833 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.html
@@ -1 +1,4 @@
+<app-page-sub-nav>
+  <app-workload-live-reload></app-workload-live-reload>
+</app-page-sub-nav>
 <app-list></app-list>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss
index e69de29bb2..81703c5b2a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss
@@ -0,0 +1,3 @@
+@import '../helm-release-helpers';
+
+@include add-life-update-style
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts
index 2dc9718ec8..a312703b4e 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts
@@ -1,6 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { HelmReleaseGuidMock } from '../../../../../helm/helm-testing.module';
 import { HelmReleaseProviders, KubernetesBaseTestModules } from '../../../../kubernetes.testing.module';
+import { HelmReleaseSocketService } from '../../helm-release-tab-base/helm-release-socket-service';
+import { WorkloadLiveReloadComponent } from '../../workload-live-reload/workload-live-reload.component';
+import { HelmReleaseHelperService } from '../helm-release-helper.service';
 import { HelmReleasePodsTabComponent } from './helm-release-pods-tab.component';
 
 describe('HelmReleasePodsTabComponent', () => {
@@ -12,9 +16,15 @@ describe('HelmReleasePodsTabComponent', () => {
       imports: [
         ...KubernetesBaseTestModules
       ],
-      declarations: [HelmReleasePodsTabComponent],
+      declarations: [
+        HelmReleasePodsTabComponent,
+        WorkloadLiveReloadComponent
+      ],
       providers: [
-        ...HelmReleaseProviders
+        ...HelmReleaseProviders,
+        HelmReleaseSocketService,
+        HelmReleaseHelperService,
+        HelmReleaseGuidMock
       ]
     })
       .compileComponents();
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
index 1070d1925c..9087c4666a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
@@ -10,6 +10,8 @@
 
   <app-analysis-report-selector *ngIf="analyzerService.enabled$ | async" (selected)="analysisChanged($event)"
     [endpoint]="helper.endpointGuid" [path]="path"></app-analysis-report-selector>
+
+  <app-workload-live-reload></app-workload-live-reload>
 </app-page-sub-nav>
 
 <ngx-graph *ngIf="nodes && nodes.length" class="chart-container" [draggingEnabled]="false" [links]="links"
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss
index beb8c49098..a41e57f918 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss
@@ -1,3 +1,5 @@
+@import '../helm-release-helpers';
+
 :host {
   display: flex;
   height: 100%;
@@ -8,4 +10,6 @@
   to {
     stroke-dashoffset: 1000;
   }
-}
\ No newline at end of file
+}
+
+@include add-life-update-style
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.html
index dd2b6cb351..0bb77b9833 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.html
@@ -1 +1,4 @@
+<app-page-sub-nav>
+  <app-workload-live-reload></app-workload-live-reload>
+</app-page-sub-nav>
 <app-list></app-list>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.scss
index e69de29bb2..81703c5b2a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.scss
@@ -0,0 +1,3 @@
+@import '../helm-release-helpers';
+
+@include add-life-update-style
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts
index 392dd17d4b..b54d40a909 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts
@@ -1,6 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { HelmReleaseGuidMock } from '../../../../../helm/helm-testing.module';
 import { HelmReleaseProviders, KubernetesBaseTestModules } from '../../../../kubernetes.testing.module';
+import { HelmReleaseSocketService } from '../../helm-release-tab-base/helm-release-socket-service';
+import { WorkloadLiveReloadComponent } from '../../workload-live-reload/workload-live-reload.component';
+import { HelmReleaseHelperService } from '../helm-release-helper.service';
 import { HelmReleaseServicesTabComponent } from './helm-release-services-tab.component';
 
 
@@ -13,9 +17,15 @@ describe('HelmReleaseServicesTabComponent', () => {
       imports: [
         ...KubernetesBaseTestModules
       ],
-      declarations: [HelmReleaseServicesTabComponent],
+      declarations: [
+        HelmReleaseServicesTabComponent,
+        WorkloadLiveReloadComponent
+      ],
       providers: [
-        ...HelmReleaseProviders
+        ...HelmReleaseProviders,
+        HelmReleaseSocketService,
+        HelmReleaseHelperService,
+        HelmReleaseGuidMock
       ]
     })
       .compileComponents();
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
index 0bfbe0568a..ad0b133c87 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
@@ -10,6 +10,8 @@
 
   <app-analysis-report-selector *ngIf="analyzerService.enabled$ | async" (selected)="analysisChanged($event)"
     [endpoint]="helmReleaseHelper.endpointGuid" [path]="path"></app-analysis-report-selector>
+
+  <app-workload-live-reload></app-workload-live-reload>
 </app-page-sub-nav>
 
 <app-loading-page [isLoading]="isBusy$" [text]="loadingMessage">
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
index 1e7019d68d..d57c1bb42f 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
@@ -1,5 +1,6 @@
 
 @import '../../../../../../../../core/sass/mixins';
+@import '../helm-release-helpers';
 
 .resources {
   padding: 0 10px;
@@ -67,3 +68,4 @@
   }
 }
 
+@include add-life-update-style
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.html
new file mode 100644
index 0000000000..70f1d6801e
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.html
@@ -0,0 +1,3 @@
+<mat-slide-toggle [color]="'primary'" [checked]="checked" labelPosition="before" (change)="onChange($event)">
+  Live Updates
+</mat-slide-toggle>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.scss
new file mode 100644
index 0000000000..dc5ff7f622
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.scss
@@ -0,0 +1,3 @@
+mat-slide-toggle {
+  font-size: 15px;
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.spec.ts
new file mode 100644
index 0000000000..df86d31d29
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.spec.ts
@@ -0,0 +1,37 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HelmReleaseGuidMock } from '../../../../helm/helm-testing.module';
+import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
+import { HelmReleaseSocketService } from '../helm-release-tab-base/helm-release-socket-service';
+import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service';
+import { WorkloadLiveReloadComponent } from './workload-live-reload.component';
+
+describe('WorkloadLiveReloadComponent', () => {
+  let component: WorkloadLiveReloadComponent;
+  let fixture: ComponentFixture<WorkloadLiveReloadComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        ...KubernetesBaseTestModules
+      ],
+      declarations: [WorkloadLiveReloadComponent],
+      providers: [
+        HelmReleaseSocketService,
+        HelmReleaseHelperService,
+        HelmReleaseGuidMock
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(WorkloadLiveReloadComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.ts
new file mode 100644
index 0000000000..35dd56caad
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.ts
@@ -0,0 +1,25 @@
+import { Component, OnInit } from '@angular/core';
+
+import { HelmReleaseSocketService } from '../helm-release-tab-base/helm-release-socket-service';
+
+@Component({
+  selector: 'app-workload-live-reload',
+  templateUrl: './workload-live-reload.component.html',
+  styleUrls: ['./workload-live-reload.component.scss']
+})
+export class WorkloadLiveReloadComponent implements OnInit {
+  public checked = false;
+
+  constructor(
+    private socketService: HelmReleaseSocketService
+  ) { }
+
+  ngOnInit(): void {
+    this.checked = this.socketService.isStarted();
+  }
+
+  public onChange(event) {
+    this.socketService.pause(!event.checked)
+  }
+
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
index aaed18524c..05804cb596 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
@@ -19,6 +19,7 @@ import { HelmReleasesTabComponent } from './releases-tab/releases-tab.component'
 import { WorkloadsStoreModule } from './store/workloads.store.module';
 import { WorkloadsRouting } from './workloads.routing';
 import { HelmReleaseAnalysisTabComponent } from './release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component';
+import { WorkloadLiveReloadComponent } from './release/workload-live-reload/workload-live-reload.component';
 
 @NgModule({
   imports: [
@@ -41,6 +42,7 @@ import { HelmReleaseAnalysisTabComponent } from './release/tabs/helm-release-ana
     HelmReleaseResourceGraphComponent,
     HelmReleaseCardComponent,
     HelmReleaseAnalysisTabComponent,
+    WorkloadLiveReloadComponent,
   ],
   entryComponents: [
     HelmReleaseCardComponent
diff --git a/src/jetstream/plugins/cfapppush/deploy.go b/src/jetstream/plugins/cfapppush/deploy.go
index d68b09019e..e28c37d8b9 100644
--- a/src/jetstream/plugins/cfapppush/deploy.go
+++ b/src/jetstream/plugins/cfapppush/deploy.go
@@ -223,7 +223,7 @@ func (cfAppPush *CFAppPush) deploy(echoContext echo.Context) error {
 
 	sendEvent(clientWebSocket, CLOSE_SUCCESS)
 
-	log.Debug("Waiting for close ackhowledgement from the client")
+	log.Debug("Waiting for close acknowledgement from the client")
 
 	wait := 30 * time.Second
 	clientWebSocket.SetReadDeadline(time.Now().Add(wait))
diff --git a/src/jetstream/plugins/kubernetes/get_release.go b/src/jetstream/plugins/kubernetes/get_release.go
index e4627830ab..4e1c527107 100644
--- a/src/jetstream/plugins/kubernetes/get_release.go
+++ b/src/jetstream/plugins/kubernetes/get_release.go
@@ -3,6 +3,7 @@ package kubernetes
 import (
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
 	"time"
 
 	"github.com/gorilla/websocket"
@@ -15,6 +16,17 @@ import (
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 )
 
+const (
+	PauseTrue int = iota + 20000
+	PauseFalse
+)
+
+// ResourceMessage ...  Incoming content of socket
+type ResourceMessage struct {
+	MessageType int `json:"type"`
+}
+
+// ResourceResponse ... Outgoing content of socket
 type ResourceResponse struct {
 	Kind string          `json:"kind"`
 	Data json.RawMessage `json:"data"`
@@ -98,7 +110,7 @@ func (c *KubernetesSpecification) GetReleaseStatus(ec echo.Context) error {
 
 	// ws is the websocket ready for use
 
-	// Write the release info first - we will then go fetch the status of evertyhing in the release and send
+	// Write the release info first - we will then go fetch the status of everything in the release and send
 	// this back incrementally
 
 	// Parse the manifest
@@ -145,16 +157,20 @@ func (c *KubernetesSpecification) GetReleaseStatus(ec echo.Context) error {
 	sendResource(ws, "ManifestErrors", rel.ManifestErrors)
 
 	stopchan := make(chan bool)
+	pausechan := make(chan bool)
 
-	go readLoop(ws, stopchan)
+	go readLoop(ws, stopchan, pausechan)
 
 	var sleep = 1 * time.Second
+	var paused = false
 
 	// Now we have everything, so loop, polling to get status
 	for {
-		log.Debug("Polling for release - wait 10 seconds")
 
 		select {
+		case pause := <-pausechan:
+			paused = pause
+			break
 		case <-stopchan:
 			ws.Close()
 			return nil
@@ -162,7 +178,12 @@ func (c *KubernetesSpecification) GetReleaseStatus(ec echo.Context) error {
 			break
 		}
 
-		log.Debug("Polling for release ....")
+		if paused {
+			log.Debug("Updating release resources paused ....")
+			continue
+		}
+
+		log.Debug("Updating release resources ....")
 
 		// Pods
 		rel.UpdatePods(c.portalProxy)
@@ -180,15 +201,42 @@ func (c *KubernetesSpecification) GetReleaseStatus(ec echo.Context) error {
 
 		sleep = 10 * time.Second
 	}
-
-	ws.Close()
-
-	return nil
 }
 
-func readLoop(c *websocket.Conn, stopchan chan<- bool) {
+func readLoop(c *websocket.Conn, stopchan chan<- bool, pausechan chan<- bool) {
 	for {
-		if _, _, err := c.NextReader(); err != nil {
+
+		messageType, r, err := c.NextReader()
+		if err != nil {
+			c.Close()
+			close(stopchan)
+			break
+		}
+
+		switch messageType {
+		case websocket.TextMessage:
+			data, err := ioutil.ReadAll(r)
+			if err != nil {
+				log.Warnf("Failed to read content of helm resource websocket message: %+v", err)
+				break
+			}
+
+			message := ResourceMessage{}
+			err = json.Unmarshal(data, &message)
+			if err != nil {
+				log.Warnf("Failed to parse content of helm resource websocket message: %+v", err)
+				break
+			}
+
+			switch message.MessageType {
+			case PauseTrue:
+				pausechan <- true
+				break
+			case PauseFalse:
+				pausechan <- false
+				break
+			}
+		default:
 			c.Close()
 			close(stopchan)
 			break

From 463a6fc648a667324f52bc3e4ba203b8404453dd Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Wed, 2 Sep 2020 10:52:38 +0100
Subject: [PATCH 606/648] Update Kube Resource Icons (#461)

---
 .../kubernetes/workloads/release/icon-helper.ts | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/icon-helper.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/icon-helper.ts
index ea2d9e6df0..1bfb949f64 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/icon-helper.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/icon-helper.ts
@@ -6,7 +6,7 @@ export function getIcon(kind: string) {
     return iconMappings.default;
   }
 }
-  
+
 const iconMappings = {
   Namespace: {
     name: 'namespace',
@@ -62,14 +62,23 @@ const iconMappings = {
     font: 'stratos-icons'
   },
   Secret: {
-    name: 'config_map',
-    font: 'stratos-icons'
+    name: 'lock',
+    font: 'Material Icons',
+    fontSet: 'material-icons'
   },
   ServiceAccount: {
-    name: 'lock',
+    name: 'account_circle',
     font: 'Material Icons',
     fontSet: 'material-icons'
   },
+  Job: {
+    name: 'job',
+    font: 'stratos-icons'
+  },
+  PersistentVolumeClaim: {
+    name: 'persistent_volume',
+    font: 'stratos-icons'
+  },
   default: {
     name: 'collocation',
     font: 'stratos-icons'

From 49e741c14429af773609bfc087430661c4516866 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Tue, 8 Sep 2020 11:12:43 +0100
Subject: [PATCH 607/648] Indicate if the Helm chart has a schema (#464)

* Indicate if the Helm chart has a schema

* Fixes

* Fix unit tests

* Update comment

* Fix typo
---
 .../chart-details-info.component.html         | 16 +++++++++--
 .../chart-details-info.component.scss         |  9 ++----
 .../chart-details-info.component.ts           | 28 ++++++++++++++++++-
 .../chart-details-usage.component.html        |  9 +++++-
 .../chart-details-versions.component.scss     | 13 +++++++--
 .../monocular/shared/models/chart-version.ts  |  1 +
 .../shared/services/charts.service.ts         | 13 +++++++++
 .../chartsvc/foundationdb/handler.go          |  2 ++
 8 files changed, 78 insertions(+), 13 deletions(-)

diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.html
index 0329e95550..52ab1483fe 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.html
@@ -10,19 +10,29 @@
     <div class="chartInfo__home" *ngIf="chart.attributes.home">
       <h1>Home</h1>
       <div>
-        <a href="{{ chart.attributes.home }}" target="_blank">{{chart.attributes.home}}</a>
+        <a class="chartInfo__link" href="{{ chart.attributes.home }}" target="_blank">{{chart.attributes.home}}</a>
       </div>
     </div>
     <div class="chartInfo__maintainers" *ngIf="maintainers.length">
       <h1>Maintainers</h1>
       <div *ngFor="let maintainer of maintainers">
-        <a href="{{ maintainerUrl(maintainer) }}" target="_blank">{{ maintainer.name }}</a>
+        <a href="{{ maintainerUrl(maintainer) }}" class="chartInfo__link" target="_blank">{{ maintainer.name }}</a>
       </div>
     </div>
     <div class="chartInfo__related" *ngIf="sources.length">
       <h1>Related</h1>
       <div *ngFor="let source of sources">
-        <a href="{{ source }}" class="chartInfo__related-link" target="_blank">{{ source }}</a>
+        <a href="{{ source }}" class="chartInfo__link" target="_blank">{{ source }}</a>
+      </div>
+    </div>
+    <div class="chartInfo__related" *ngIf="schema">
+      <h1>Schema</h1>
+      <div class="chartInfo__link">This chart contains a values schema</div>
+    </div>
+    <div class="chartInfo__related" *ngIf="currentVersion">
+      <h1>Chart</h1>
+      <div *ngFor="let url of currentVersion.attributes.urls">
+        <a href="{{ url }}" class="chartInfo__link" target="_blank">{{ url }}</a>
       </div>
     </div>
   </mat-card>
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.scss
index 1b1558c02c..558bef53f1 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.scss
@@ -1,7 +1,7 @@
 .chartInfo {
 
   h1 {
-    font-size: 18px;
+    font-size: 16px;
   }
 
   app-panel {
@@ -15,11 +15,7 @@
     }
   }
 
-  &__related {
-    max-width: 280px;
-  }
-
-  &__related-link {
+  &__link {
     font-size: 14px;
   }
 
@@ -27,5 +23,6 @@
     overflow: auto;
     display: block;
     margin-bottom: 2em;
+    max-width: 260px;
   }
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.ts
index c8c46032a7..fad154c9d7 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.ts
@@ -1,4 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
+import { of } from 'rxjs';
+import { catchError, first } from 'rxjs/operators';
 
 import { Chart } from '../../shared/models/chart';
 import { ChartVersion } from '../../shared/models/chart-version';
@@ -12,8 +14,22 @@ import { ChartsService } from '../../shared/services/charts.service';
 })
 export class ChartDetailsInfoComponent implements OnInit {
   @Input() chart: Chart;
-  @Input() currentVersion: ChartVersion;
   versions: ChartVersion[];
+  schema: any = null;
+
+  _currentVersion: ChartVersion;
+
+  get currentVersion(): ChartVersion {
+    return this._currentVersion;
+  }
+
+  @Input() set currentVersion (version: ChartVersion) {
+    this._currentVersion = version;
+    if (version) {
+      this.getSchema(this._currentVersion);
+    }
+  }
+
   constructor(private chartsService: ChartsService) { }
 
   ngOnInit() {
@@ -52,4 +68,14 @@ export class ChartDetailsInfoComponent implements OnInit {
       repoURL === 'https://kubernetes-charts-incubator.storage.googleapis.com'
     );
   }
+
+  private getSchema(currentVersion: ChartVersion) {
+    this.chartsService.getChartSchema(currentVersion).pipe(
+      first(),
+      catchError(() => of(null))
+    ).subscribe(schema => {
+      this.schema = schema;
+    });
+  }
+
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html
index 1e374b0705..5801bc679a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html
@@ -1,4 +1,11 @@
 <div class="chart-details-usage__install">
-  <button class="chart-details-usage__install-btn" color="primary" mat-button mat-raised-button
+  <button *ngIf="endpointsService.hasConnectedEndpointType('k8s') | async; else nok8s" class="chart-details-usage__install-btn" color="primary" mat-button mat-raised-button
   routerLink="/monocular/install/{{chart.id}}/{{currentVersion}}">Install Chart</button>
 </div>
+
+<!-- If there are no Kubernetes endpoints connected, show a disabled buitton with a tool tip-->
+<ng-template #nok8s>
+  <div matTooltip="Add a Kubernetes endpoint to install charts">
+    <button disabled="true" class="chart-details-usage__install-btn" color="primary" mat-button mat-raised-button>Install Chart</button>
+  </div>
+</ng-template>
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.scss
index b3002ff9d3..7a82f45467 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.scss
@@ -3,11 +3,17 @@
 .versions {
 
   h1 {
-    font-size: 18px;
+    font-size: 16px;
     margin-top: 0;
   }
   .more-link {
+    cursor: pointer;
+    font-size: 14px;
     margin-top: .5em;
+
+    &:hover {
+      text-decoration: underline;
+    }
   }
 }
 
@@ -23,6 +29,8 @@
 }
 
 .version {
+  font-size: 14px;
+
   &__table {
     display: table;
     width: 100%;
@@ -32,11 +40,12 @@
   }
   &__cell {
     display: table-cell;
+    font-size: 14px;
   }
 }
 
 .app-version {
   h1 {
-    font-size: 18px;
+    font-size: 16px;
   }
 }
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/chart-version.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/chart-version.ts
index b3e7671f9a..56a2030021 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/chart-version.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/chart-version.ts
@@ -13,6 +13,7 @@ export class ChartVersionAttributes {
   icons: ChartVersionIcon[];
   readme: string;
   version: string;
+  schema?: string;
   /* tslint:disable-next-line:variable-name */
   app_version: string;
   urls: string[];
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts
index c56a82df08..85cfae1317 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts
@@ -109,6 +109,19 @@ export class ChartsService {
       responseType: 'text'
     });
   }
+
+  /**
+   * Get a chart's Schema using the API
+   *
+   * @param repo Repository name
+   * @param chartName Chart name
+   * @param version Chart version
+   * @return An observable that will be the json schema
+   */
+  getChartSchema(chartVersion: ChartVersion): Observable<any> {
+    return this.http.get(`${this.hostname}${chartVersion.attributes.schema}`);
+  }
+
   /**
    * Get chart versions using the API
    *
diff --git a/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go b/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go
index a0fb5863bf..d937f43c06 100644
--- a/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go
+++ b/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go
@@ -501,6 +501,8 @@ func newChartListResponse(charts []*models.Chart) utils.ApiListResponse {
 func chartVersionAttributes(cid string, cv models.ChartVersion) models.ChartVersion {
 	cv.Readme = pathPrefix + "/assets/" + cid + "/versions/" + cv.Version + "/README.md"
 	cv.Values = pathPrefix + "/assets/" + cid + "/versions/" + cv.Version + "/values.yaml"
+	cv.Schema = pathPrefix + "/assets/" + cid + "/versions/" + cv.Version + "/values.schema.json"
+
 	return cv
 }
 

From aa675d36bc7b1e564b864b751abc6add830b097b Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Tue, 8 Sep 2020 11:13:03 +0100
Subject: [PATCH 608/648] Enable linting for suse-extensions package (#465)

* Enable linting for suse-extensions package

* Fix linting
---
 angular.json                                  |   12 +
 package-lock.json                             | 4448 ++++++++++-------
 package.json                                  |    2 +-
 .../chart-item/chart-item.component.ts        |    2 +-
 .../list-filters/list-filters.component.ts    |    4 +-
 .../list-item/list-item.component.ts          |    2 +-
 .../helm/monocular/loader/loader.component.ts |    2 +-
 .../helm/monocular/panel/panel.component.ts   |    2 +-
 .../src/custom/helm/store/helm.effects.ts     |   60 +-
 .../kube-config-selection.component.ts        |   22 +-
 .../kube-config-table-name.component.spec.ts  |   14 +-
 .../kube-config-table-name.component.ts       |    2 +-
 .../kube-config.types.ts                      |    6 +-
 .../kubernetes/kubernetes-entity-generator.ts |   16 +-
 .../kubernetes-resource-viewer.component.ts   |    7 +-
 .../kubernetes/kubernetes.setup.module.ts     |    6 +-
 .../analysis-reports-list-source.ts           |    8 +-
 .../kubernetes-pod-containers.component.ts    |   17 +-
 .../services/kubernetes.analysis.service.ts   |   14 +-
 .../kubernetes/services/route.helper.ts       |    2 +-
 .../action-builders/kube.action-builders.ts   |   44 +-
 ...naylsis.actions.ts => analysis.actions.ts} |    4 +-
 .../kubernetes/store/analysis.effects.ts      |    4 +-
 .../helm-release-socket-service.ts            |   19 +-
 .../workloads/release/icon-helper.ts          |   20 +-
 .../helm-release-analysis-tab.component.ts    |    5 +-
 .../tabs/helm-release-helper.service.ts       |    7 +-
 .../helm-release-resource-graph.component.ts  |   12 +-
 .../store/workloads-entity-factory.ts         |   14 +-
 .../suse-welcome/suse-welcome.component.ts    |    2 +-
 .../packages/suse-extensions/tslint.json      |    3 +
 tslint.json                                   |    1 -
 32 files changed, 2863 insertions(+), 1920 deletions(-)
 rename src/frontend/packages/suse-extensions/src/custom/kubernetes/store/{anaylsis.actions.ts => analysis.actions.ts} (97%)
 create mode 100644 src/frontend/packages/suse-extensions/tslint.json

diff --git a/angular.json b/angular.json
index 95d3bd1b49..001160c86a 100644
--- a/angular.json
+++ b/angular.json
@@ -365,6 +365,18 @@
             "tsConfig": "src/frontend/packages/suse-extensions/tsconfig.spec.json",
             "karmaConfig": "src/frontend/packages/suse-extensions/karma.conf.js"
           }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "src/tsconfig.json"
+            ],
+            "tslintConfig": "src/frontend/packages/suse-extensions/tslint.json",
+            "files": [
+              "src/frontend/packages/suse-extensions/src/**/*.ts"
+            ]
+          }
         }
       }
     }
diff --git a/package-lock.json b/package-lock.json
index 1823c4b66e..77791d470f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -40,29 +40,29 @@
       }
     },
     "@angular-devkit/build-angular": {
-      "version": "0.901.7",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.901.7.tgz",
-      "integrity": "sha512-NiBwapx/XJqYGzSmENff78i6Yif9PjYDJ9BB+59t2eDofkCZUcPFrhQmRgliO7rt6RATvT81lDP89+LBXCTQPw==",
+      "version": "0.901.12",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.901.12.tgz",
+      "integrity": "sha512-enK+u1Lg1a/KWUs3r8Tc7Igduu5ph9fgziV8bjQeVrswrqFb0m0eEhxe/zV8rvE92H3NBZp5Z+uzOYIcg4eirw==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.901.7",
-        "@angular-devkit/build-optimizer": "0.901.7",
-        "@angular-devkit/build-webpack": "0.901.7",
-        "@angular-devkit/core": "9.1.7",
+        "@angular-devkit/architect": "0.901.12",
+        "@angular-devkit/build-optimizer": "0.901.12",
+        "@angular-devkit/build-webpack": "0.901.12",
+        "@angular-devkit/core": "9.1.12",
         "@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.7",
-        "ajv": "6.12.0",
+        "@ngtools/webpack": "9.1.12",
+        "ajv": "6.12.3",
         "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",
-        "copy-webpack-plugin": "5.1.1",
+        "copy-webpack-plugin": "6.0.3",
         "core-js": "3.6.4",
         "css-loader": "3.5.1",
         "cssnano": "4.1.10",
@@ -71,7 +71,7 @@
         "glob": "7.1.6",
         "jest-worker": "25.1.0",
         "karma-source-map-support": "1.4.0",
-        "less": "3.11.1",
+        "less": "3.11.3",
         "less-loader": "5.0.0",
         "license-webpack-plugin": "2.1.4",
         "loader-utils": "2.0.0",
@@ -97,7 +97,7 @@
         "stylus": "0.54.7",
         "stylus-loader": "3.0.2",
         "terser": "4.6.10",
-        "terser-webpack-plugin": "2.3.5",
+        "terser-webpack-plugin": "3.0.3",
         "tree-kill": "1.2.2",
         "webpack": "4.42.0",
         "webpack-dev-middleware": "3.7.2",
@@ -108,12 +108,197 @@
         "worker-plugin": "4.0.3"
       },
       "dependencies": {
+        "@angular-devkit/architect": {
+          "version": "0.901.12",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.12.tgz",
+          "integrity": "sha512-gLlsxa+3JPV1m1gRvRMujOs4xKox6I5BkYmOD1zfu+dB6y3LuBAvHfXA6FaTDVOMBrmSlWnE4PmOmB6xd7wxMA==",
+          "dev": true,
+          "requires": {
+            "@angular-devkit/core": "9.1.12",
+            "rxjs": "6.5.4"
+          }
+        },
+        "@angular-devkit/core": {
+          "version": "9.1.12",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.12.tgz",
+          "integrity": "sha512-D/GnBeSlmdgGn7EhuE32HuPuRAjvUuxi7Q6WywBI8PSsXKAGnrypghBwMATNnOA24//CgbW2533Y9VWHaeXdeA==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.12.3",
+            "fast-json-stable-stringify": "2.1.0",
+            "magic-string": "0.25.7",
+            "rxjs": "6.5.4",
+            "source-map": "0.7.3"
+          }
+        },
+        "ajv": {
+          "version": "6.12.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+          "dev": true,
+          "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"
+          }
+        },
+        "chownr": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+          "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+          "dev": true
+        },
+        "copy-webpack-plugin": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz",
+          "integrity": "sha512-q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA==",
+          "dev": true,
+          "requires": {
+            "cacache": "^15.0.4",
+            "fast-glob": "^3.2.4",
+            "find-cache-dir": "^3.3.1",
+            "glob-parent": "^5.1.1",
+            "globby": "^11.0.1",
+            "loader-utils": "^2.0.0",
+            "normalize-path": "^3.0.0",
+            "p-limit": "^3.0.1",
+            "schema-utils": "^2.7.0",
+            "serialize-javascript": "^4.0.0",
+            "webpack-sources": "^1.4.3"
+          },
+          "dependencies": {
+            "cacache": {
+              "version": "15.0.5",
+              "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz",
+              "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==",
+              "dev": true,
+              "requires": {
+                "@npmcli/move-file": "^1.0.1",
+                "chownr": "^2.0.0",
+                "fs-minipass": "^2.0.0",
+                "glob": "^7.1.4",
+                "infer-owner": "^1.0.4",
+                "lru-cache": "^6.0.0",
+                "minipass": "^3.1.1",
+                "minipass-collect": "^1.0.2",
+                "minipass-flush": "^1.0.5",
+                "minipass-pipeline": "^1.2.2",
+                "mkdirp": "^1.0.3",
+                "p-map": "^4.0.0",
+                "promise-inflight": "^1.0.1",
+                "rimraf": "^3.0.2",
+                "ssri": "^8.0.0",
+                "tar": "^6.0.2",
+                "unique-filename": "^1.1.1"
+              }
+            }
+          }
+        },
         "core-js": {
           "version": "3.6.4",
           "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
           "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
           "dev": true
         },
+        "fast-glob": {
+          "version": "3.2.4",
+          "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz",
+          "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==",
+          "dev": true,
+          "requires": {
+            "@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"
+          }
+        },
+        "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"
+          }
+        },
+        "less": {
+          "version": "3.11.3",
+          "resolved": "https://registry.npmjs.org/less/-/less-3.11.3.tgz",
+          "integrity": "sha512-VkZiTDdtNEzXA3LgjQiC3D7/ejleBPFVvq+aRI9mIj+Zhmif5TvFPM244bT4rzkvOCvJ9q4zAztok1M7Nygagw==",
+          "dev": true,
+          "requires": {
+            "clone": "^2.1.2",
+            "errno": "^0.1.1",
+            "graceful-fs": "^4.1.2",
+            "image-size": "~0.5.0",
+            "make-dir": "^2.1.0",
+            "mime": "^1.4.1",
+            "promise": "^7.1.1",
+            "request": "^2.83.0",
+            "source-map": "~0.6.0",
+            "tslib": "^1.10.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,
+              "optional": true
+            }
+          }
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "minipass": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
+          "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz",
+          "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-map": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+          "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+          "dev": true,
+          "requires": {
+            "aggregate-error": "^3.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
+        },
         "parse5": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
@@ -144,6 +329,15 @@
           "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==",
           "dev": true
         },
+        "serialize-javascript": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+          "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+          "dev": true,
+          "requires": {
+            "randombytes": "^2.1.0"
+          }
+        },
         "source-map": {
           "version": "0.7.3",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
@@ -174,9 +368,9 @@
       }
     },
     "@angular-devkit/build-optimizer": {
-      "version": "0.901.7",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.901.7.tgz",
-      "integrity": "sha512-Xuce3StdxhcgLYb0BAaFGr3Bzj5EM2OsAqIT15PkikWY1k5cK50vPxoC/BkX4QDL9eXSHtqAfMBfA6h5N422vw==",
+      "version": "0.901.12",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.901.12.tgz",
+      "integrity": "sha512-XuXA+6y9QkIAwSVZhWmne4r7qugUUWaXobgRefbn9heiRlY8/7XkZmmvbSrxc1fgQfQar52W9fAa19fAIeNvnw==",
       "dev": true,
       "requires": {
         "loader-utils": "2.0.0",
@@ -201,16 +395,51 @@
       }
     },
     "@angular-devkit/build-webpack": {
-      "version": "0.901.7",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.901.7.tgz",
-      "integrity": "sha512-pTLW5Eqy9cHgv78LKiH0e30lxqKzUPjh1djvNtFsEemOHsfKQdAfjLjikoaQvqMoBKVaUU7r2vmyyS17cH+1yw==",
+      "version": "0.901.12",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.901.12.tgz",
+      "integrity": "sha512-zrhZV2LhQ4uFl9at9i2jiedIu932HsaFN4OMMsTFlV+6CZxtEUBI85hhnPa5KQtIYQr2OMQSQf/FyhnBGs0riQ==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.901.7",
-        "@angular-devkit/core": "9.1.7",
+        "@angular-devkit/architect": "0.901.12",
+        "@angular-devkit/core": "9.1.12",
         "rxjs": "6.5.4"
       },
       "dependencies": {
+        "@angular-devkit/architect": {
+          "version": "0.901.12",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.12.tgz",
+          "integrity": "sha512-gLlsxa+3JPV1m1gRvRMujOs4xKox6I5BkYmOD1zfu+dB6y3LuBAvHfXA6FaTDVOMBrmSlWnE4PmOmB6xd7wxMA==",
+          "dev": true,
+          "requires": {
+            "@angular-devkit/core": "9.1.12",
+            "rxjs": "6.5.4"
+          }
+        },
+        "@angular-devkit/core": {
+          "version": "9.1.12",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.12.tgz",
+          "integrity": "sha512-D/GnBeSlmdgGn7EhuE32HuPuRAjvUuxi7Q6WywBI8PSsXKAGnrypghBwMATNnOA24//CgbW2533Y9VWHaeXdeA==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.12.3",
+            "fast-json-stable-stringify": "2.1.0",
+            "magic-string": "0.25.7",
+            "rxjs": "6.5.4",
+            "source-map": "0.7.3"
+          }
+        },
+        "ajv": {
+          "version": "6.12.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+          "dev": true,
+          "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"
+          }
+        },
         "rxjs": {
           "version": "6.5.4",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
@@ -219,6 +448,12 @@
           "requires": {
             "tslib": "^1.9.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
         }
       }
     },
@@ -653,9 +888,9 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.1.tgz",
-      "integrity": "sha512-CHvCj7So7iCkGKPRFUfryXIkU2gSBw7VSZFYLsqVhrS47269VK2Hfi9S/YcublPMW8k1u2bQBlbDruoQEm4fgw==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz",
+      "integrity": "sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==",
       "dev": true,
       "requires": {
         "browserslist": "^4.12.0",
@@ -743,69 +978,57 @@
       }
     },
     "@babel/helper-annotate-as-pure": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz",
-      "integrity": "sha512-ewp3rvJEwLaHgyWGe4wQssC2vjks3E80WiUe2BpMb0KhreTjMROCbxXcEovTrbeGVdQct5VjQfrv9EgC+xMzCw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
+      "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.10.1"
+        "@babel/types": "^7.10.4"
       },
       "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-          "dev": true
-        },
         "@babel/types": {
-          "version": "7.10.2",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-          "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.1",
-            "lodash": "^4.17.13",
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "lodash": "^4.17.19",
             "to-fast-properties": "^2.0.0"
           }
         }
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.1.tgz",
-      "integrity": "sha512-cQpVq48EkYxUU0xozpGCLla3wlkdRRqLWu1ksFMXA9CM5KQmyyRpSEsYXbao7JUkOw/tAaYKCaYyZq6HOFYtyw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz",
+      "integrity": "sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==",
       "dev": true,
       "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.10.1",
-        "@babel/types": "^7.10.1"
+        "@babel/helper-explode-assignable-expression": "^7.10.4",
+        "@babel/types": "^7.10.4"
       },
       "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-          "dev": true
-        },
         "@babel/types": {
-          "version": "7.10.2",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-          "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.1",
-            "lodash": "^4.17.13",
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "lodash": "^4.17.19",
             "to-fast-properties": "^2.0.0"
           }
         }
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.2.tgz",
-      "integrity": "sha512-hYgOhF4To2UTB4LTaZepN/4Pl9LD4gfbJx8A34mqoluT8TLbof1mhUlYuNWTEebONa8+UlCC4X0TEXu7AOUyGA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz",
+      "integrity": "sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.10.1",
+        "@babel/compat-data": "^7.10.4",
         "browserslist": "^4.12.0",
         "invariant": "^2.2.4",
         "levenary": "^1.1.1",
@@ -813,239 +1036,116 @@
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.1.tgz",
-      "integrity": "sha512-Rx4rHS0pVuJn5pJOqaqcZR4XSgeF9G/pO/79t+4r7380tXFJdzImFnxMU19f83wjSrmKHq6myrM10pFHTGzkUA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz",
+      "integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.1",
-        "@babel/helper-regex": "^7.10.1",
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-regex": "^7.10.4",
         "regexpu-core": "^4.7.0"
       }
     },
     "@babel/helper-define-map": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.1.tgz",
-      "integrity": "sha512-+5odWpX+OnvkD0Zmq7panrMuAGQBu6aPUgvMzuMGo4R+jUOvealEj2hiqI6WhxgKrTpFoFj0+VdsuA8KDxHBDg==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz",
+      "integrity": "sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.10.1",
-        "@babel/types": "^7.10.1",
-        "lodash": "^4.17.13"
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/types": "^7.10.5",
+        "lodash": "^4.17.19"
       },
       "dependencies": {
         "@babel/code-frame": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-          "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
           "dev": true,
           "requires": {
-            "@babel/highlight": "^7.10.1"
+            "@babel/highlight": "^7.10.4"
           }
         },
         "@babel/helper-function-name": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
-          "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
           "dev": true,
           "requires": {
-            "@babel/helper-get-function-arity": "^7.10.1",
-            "@babel/template": "^7.10.1",
-            "@babel/types": "^7.10.1"
+            "@babel/helper-get-function-arity": "^7.10.4",
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.10.4"
           }
         },
         "@babel/helper-get-function-arity": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
-          "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.10.1"
+            "@babel/types": "^7.10.4"
           }
         },
-        "@babel/helper-validator-identifier": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-          "dev": true
-        },
         "@babel/highlight": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
-          "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.1",
+            "@babel/helper-validator-identifier": "^7.10.4",
             "chalk": "^2.0.0",
             "js-tokens": "^4.0.0"
           }
         },
         "@babel/parser": {
-          "version": "7.10.2",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
-          "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
+          "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
           "dev": true
         },
         "@babel/template": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
-          "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.10.1",
-            "@babel/parser": "^7.10.1",
-            "@babel/types": "^7.10.1"
+            "@babel/code-frame": "^7.10.4",
+            "@babel/parser": "^7.10.4",
+            "@babel/types": "^7.10.4"
           }
         },
         "@babel/types": {
-          "version": "7.10.2",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-          "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.1",
-            "lodash": "^4.17.13",
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "lodash": "^4.17.19",
             "to-fast-properties": "^2.0.0"
           }
         }
       }
     },
     "@babel/helper-explode-assignable-expression": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.1.tgz",
-      "integrity": "sha512-vcUJ3cDjLjvkKzt6rHrl767FeE7pMEYfPanq5L16GRtrXIoznc0HykNW2aEYkcnP76P0isoqJ34dDMFZwzEpJg==",
+      "version": "7.11.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz",
+      "integrity": "sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==",
       "dev": true,
       "requires": {
-        "@babel/traverse": "^7.10.1",
-        "@babel/types": "^7.10.1"
+        "@babel/types": "^7.10.4"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-          "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
+        "@babel/types": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
-            "@babel/highlight": "^7.10.1"
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "lodash": "^4.17.19",
+            "to-fast-properties": "^2.0.0"
           }
-        },
-        "@babel/generator": {
-          "version": "7.10.2",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz",
-          "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.2",
-            "jsesc": "^2.5.1",
-            "lodash": "^4.17.13",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
-          "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.10.1",
-            "@babel/template": "^7.10.1",
-            "@babel/types": "^7.10.1"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
-          "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.1"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
-          "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.1"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-          "dev": true
-        },
-        "@babel/highlight": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
-          "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.1",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.10.2",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
-          "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
-          "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.1",
-            "@babel/parser": "^7.10.1",
-            "@babel/types": "^7.10.1"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz",
-          "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.1",
-            "@babel/generator": "^7.10.1",
-            "@babel/helper-function-name": "^7.10.1",
-            "@babel/helper-split-export-declaration": "^7.10.1",
-            "@babel/parser": "^7.10.1",
-            "@babel/types": "^7.10.1",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.13"
-          }
-        },
-        "@babel/types": {
-          "version": "7.10.2",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-          "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.1",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^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"
-          }
-        },
-        "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
         }
       }
     },
@@ -1070,28 +1170,22 @@
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.1.tgz",
-      "integrity": "sha512-vLm5srkU8rI6X3+aQ1rQJyfjvCBLXP8cAGeuw04zeAM2ItKb1e7pmVmLyHb4sDaAYnLL13RHOZPLEtcGZ5xvjg==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz",
+      "integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.10.1"
+        "@babel/types": "^7.10.4"
       },
       "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-          "dev": true
-        },
         "@babel/types": {
-          "version": "7.10.2",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-          "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.1",
-            "lodash": "^4.17.13",
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "lodash": "^4.17.19",
             "to-fast-properties": "^2.0.0"
           }
         }
@@ -1262,159 +1356,79 @@
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz",
-      "integrity": "sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
+      "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
       "dev": true
     },
     "@babel/helper-regex": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.1.tgz",
-      "integrity": "sha512-7isHr19RsIJWWLLFn21ubFt223PjQyg1HY7CZEMRr820HttHPpVvrsIN3bUOo44DEfFV4kBXO7Abbn9KTUZV7g==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz",
+      "integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.13"
+        "lodash": "^4.17.19"
       }
     },
     "@babel/helper-remap-async-to-generator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.1.tgz",
-      "integrity": "sha512-RfX1P8HqsfgmJ6CwaXGKMAqbYdlleqglvVtht0HGPMSsy2V6MqLlOJVF/0Qyb/m2ZCi2z3q3+s6Pv7R/dQuZ6A==",
+      "version": "7.11.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz",
+      "integrity": "sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.1",
-        "@babel/helper-wrap-function": "^7.10.1",
-        "@babel/template": "^7.10.1",
-        "@babel/traverse": "^7.10.1",
-        "@babel/types": "^7.10.1"
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-wrap-function": "^7.10.4",
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.10.4"
       },
       "dependencies": {
         "@babel/code-frame": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-          "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.10.1"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.10.2",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz",
-          "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.2",
-            "jsesc": "^2.5.1",
-            "lodash": "^4.17.13",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
-          "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.10.1",
-            "@babel/template": "^7.10.1",
-            "@babel/types": "^7.10.1"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
-          "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.1"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
-          "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.10.1"
+            "@babel/highlight": "^7.10.4"
           }
         },
-        "@babel/helper-validator-identifier": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-          "dev": true
-        },
         "@babel/highlight": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
-          "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.1",
+            "@babel/helper-validator-identifier": "^7.10.4",
             "chalk": "^2.0.0",
             "js-tokens": "^4.0.0"
           }
         },
         "@babel/parser": {
-          "version": "7.10.2",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
-          "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
+          "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
           "dev": true
         },
         "@babel/template": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
-          "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.1",
-            "@babel/parser": "^7.10.1",
-            "@babel/types": "^7.10.1"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz",
-          "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.10.1",
-            "@babel/generator": "^7.10.1",
-            "@babel/helper-function-name": "^7.10.1",
-            "@babel/helper-split-export-declaration": "^7.10.1",
-            "@babel/parser": "^7.10.1",
-            "@babel/types": "^7.10.1",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.13"
+            "@babel/code-frame": "^7.10.4",
+            "@babel/parser": "^7.10.4",
+            "@babel/types": "^7.10.4"
           }
         },
         "@babel/types": {
-          "version": "7.10.2",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-          "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.1",
-            "lodash": "^4.17.13",
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "lodash": "^4.17.19",
             "to-fast-properties": "^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"
-          }
-        },
-        "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
         }
       }
     },
@@ -1625,7 +1639,29 @@
         }
       }
     },
-    "@babel/helper-split-export-declaration": {
+    "@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz",
+      "integrity": "sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.11.0"
+      },
+      "dependencies": {
+        "@babel/types": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "lodash": "^4.17.19",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
+      }
+    },
+    "@babel/helper-split-export-declaration": {
       "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==",
@@ -1641,126 +1677,119 @@
       "dev": true
     },
     "@babel/helper-wrap-function": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz",
-      "integrity": "sha512-C0MzRGteVDn+H32/ZgbAv5r56f2o1fZSA/rj/TYo8JEJNHg+9BdSmKBUND0shxWRztWhjlT2cvHYuynpPsVJwQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz",
+      "integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.10.1",
-        "@babel/template": "^7.10.1",
-        "@babel/traverse": "^7.10.1",
-        "@babel/types": "^7.10.1"
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/template": "^7.10.4",
+        "@babel/traverse": "^7.10.4",
+        "@babel/types": "^7.10.4"
       },
       "dependencies": {
         "@babel/code-frame": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-          "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
           "dev": true,
           "requires": {
-            "@babel/highlight": "^7.10.1"
+            "@babel/highlight": "^7.10.4"
           }
         },
         "@babel/generator": {
-          "version": "7.10.2",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz",
-          "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==",
+          "version": "7.11.6",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
+          "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.10.2",
+            "@babel/types": "^7.11.5",
             "jsesc": "^2.5.1",
-            "lodash": "^4.17.13",
             "source-map": "^0.5.0"
           }
         },
         "@babel/helper-function-name": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
-          "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
           "dev": true,
           "requires": {
-            "@babel/helper-get-function-arity": "^7.10.1",
-            "@babel/template": "^7.10.1",
-            "@babel/types": "^7.10.1"
+            "@babel/helper-get-function-arity": "^7.10.4",
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.10.4"
           }
         },
         "@babel/helper-get-function-arity": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
-          "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.10.1"
+            "@babel/types": "^7.10.4"
           }
         },
         "@babel/helper-split-export-declaration": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
-          "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+          "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.10.1"
+            "@babel/types": "^7.11.0"
           }
         },
-        "@babel/helper-validator-identifier": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-          "dev": true
-        },
         "@babel/highlight": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
-          "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.1",
+            "@babel/helper-validator-identifier": "^7.10.4",
             "chalk": "^2.0.0",
             "js-tokens": "^4.0.0"
           }
         },
         "@babel/parser": {
-          "version": "7.10.2",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
-          "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
+          "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
           "dev": true
         },
         "@babel/template": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
-          "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.10.1",
-            "@babel/parser": "^7.10.1",
-            "@babel/types": "^7.10.1"
+            "@babel/code-frame": "^7.10.4",
+            "@babel/parser": "^7.10.4",
+            "@babel/types": "^7.10.4"
           }
         },
         "@babel/traverse": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz",
-          "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
+          "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.10.1",
-            "@babel/generator": "^7.10.1",
-            "@babel/helper-function-name": "^7.10.1",
-            "@babel/helper-split-export-declaration": "^7.10.1",
-            "@babel/parser": "^7.10.1",
-            "@babel/types": "^7.10.1",
+            "@babel/code-frame": "^7.10.4",
+            "@babel/generator": "^7.11.5",
+            "@babel/helper-function-name": "^7.10.4",
+            "@babel/helper-split-export-declaration": "^7.11.0",
+            "@babel/parser": "^7.11.5",
+            "@babel/types": "^7.11.5",
             "debug": "^4.1.0",
             "globals": "^11.1.0",
-            "lodash": "^4.17.13"
+            "lodash": "^4.17.19"
           }
         },
         "@babel/types": {
-          "version": "7.10.2",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-          "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.1",
-            "lodash": "^4.17.13",
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "lodash": "^4.17.19",
             "to-fast-properties": "^2.0.0"
           }
         },
@@ -1947,95 +1976,96 @@
       "dev": true
     },
     "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.1.tgz",
-      "integrity": "sha512-vzZE12ZTdB336POZjmpblWfNNRpMSua45EYnRigE2XsZxcXcIyly2ixnTJasJE4Zq3U7t2d8rRF7XRUuzHxbOw==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz",
+      "integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-remap-async-to-generator": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-remap-async-to-generator": "^7.10.4",
         "@babel/plugin-syntax-async-generators": "^7.8.0"
       }
     },
     "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.1.tgz",
-      "integrity": "sha512-Cpc2yUVHTEGPlmiQzXj026kqwjEQAD9I4ZC16uzdbgWgitg/UHKHLffKNCQZ5+y8jpIZPJcKcwsr2HwPh+w3XA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz",
+      "integrity": "sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.4",
         "@babel/plugin-syntax-dynamic-import": "^7.8.0"
       }
     },
     "@babel/plugin-proposal-json-strings": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.1.tgz",
-      "integrity": "sha512-m8r5BmV+ZLpWPtMY2mOKN7wre6HIO4gfIiV+eOmsnZABNenrt/kzYBwrh+KOfgumSWpnlGs5F70J8afYMSJMBg==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz",
+      "integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.0"
       }
     },
     "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz",
-      "integrity": "sha512-56cI/uHYgL2C8HVuHOuvVowihhX0sxb3nnfVRzUeVHTWmRHTZrKuAh/OBIMggGU/S1g/1D2CRCXqP+3u7vX7iA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz",
+      "integrity": "sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.4",
         "@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==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.1.tgz",
-      "integrity": "sha512-Z+Qri55KiQkHh7Fc4BW6o+QBuTagbOp9txE+4U1i79u9oWlf2npkiDx+Rf3iK3lbcHBuNy9UOkwuR5wOMH3LIQ==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz",
+      "integrity": "sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.4",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-transform-parameters": "^7.10.1"
+        "@babel/plugin-transform-parameters": "^7.10.4"
       }
     },
     "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz",
-      "integrity": "sha512-VqExgeE62YBqI3ogkGoOJp1R6u12DFZjqwJhqtKc2o5m1YTUuUWnos7bZQFBhwkxIFpWYJ7uB75U7VAPPiKETA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz",
+      "integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.4",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
       }
     },
     "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.1.tgz",
-      "integrity": "sha512-dqQj475q8+/avvok72CF3AOSV/SGEcH29zT5hhohqqvvZ2+boQoOr7iGldBG5YXTO2qgCgc2B3WvVLUdbeMlGA==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz",
+      "integrity": "sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0",
         "@babel/plugin-syntax-optional-chaining": "^7.8.0"
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.1.tgz",
-      "integrity": "sha512-JjfngYRvwmPwmnbRZyNiPFI8zxCZb8euzbCG/LxyKdeTb59tVciKo9GK9bi6JYKInk1H11Dq9j/zRqIH4KigfQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz",
+      "integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-syntax-async-generators": {
@@ -2075,12 +2105,12 @@
       }
     },
     "@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==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-syntax-object-rest-spread": {
@@ -2111,234 +2141,1242 @@
       }
     },
     "@babel/plugin-syntax-top-level-await": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.1.tgz",
-      "integrity": "sha512-hgA5RYkmZm8FTFT3yu2N9Bx7yVVOKYT6yEdXXo6j2JTm0wNxgqaGeQVaSHRjhfnQbX91DtjFB6McRFSlcJH3xQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz",
+      "integrity": "sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-arrow-functions": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz",
-      "integrity": "sha512-6AZHgFJKP3DJX0eCNJj01RpytUa3SOGawIxweHkNX2L6PYikOZmoh5B0d7hIHaIgveMjX990IAa/xK7jRTN8OA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz",
+      "integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.1.tgz",
-      "integrity": "sha512-XCgYjJ8TY2slj6SReBUyamJn3k2JLUIiiR5b6t1mNCMSvv7yx+jJpaewakikp0uWFQSF7ChPPoe3dHmXLpISkg==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz",
+      "integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-remap-async-to-generator": "^7.10.1"
+        "@babel/helper-module-imports": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-remap-async-to-generator": "^7.10.4"
+      },
+      "dependencies": {
+        "@babel/helper-module-imports": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
+          "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/types": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "lodash": "^4.17.19",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.1.tgz",
-      "integrity": "sha512-B7K15Xp8lv0sOJrdVAoukKlxP9N59HS48V1J3U/JGj+Ad+MHq+am6xJVs85AgXrQn4LV8vaYFOB+pr/yIuzW8Q==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz",
+      "integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.1.tgz",
-      "integrity": "sha512-8bpWG6TtF5akdhIm/uWTyjHqENpy13Fx8chg7pFH875aNLwX8JxIxqm08gmAT+Whe6AOmaTeLPe7dpLbXt+xUw==",
+      "version": "7.11.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz",
+      "integrity": "sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "lodash": "^4.17.13"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.1.tgz",
-      "integrity": "sha512-P9V0YIh+ln/B3RStPoXpEQ/CoAxQIhRSUn7aXqQ+FZJ2u8+oCtjIXR3+X0vsSD8zv+mb56K7wZW1XiDTDGiDRQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz",
+      "integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.1",
-        "@babel/helper-define-map": "^7.10.1",
-        "@babel/helper-function-name": "^7.10.1",
-        "@babel/helper-optimise-call-expression": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-replace-supers": "^7.10.1",
-        "@babel/helper-split-export-declaration": "^7.10.1",
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-define-map": "^7.10.4",
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/helper-optimise-call-expression": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-replace-supers": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.10.4",
         "globals": "^11.1.0"
       },
       "dependencies": {
         "@babel/code-frame": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-          "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
           "dev": true,
           "requires": {
-            "@babel/highlight": "^7.10.1"
+            "@babel/highlight": "^7.10.4"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.11.6",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
+          "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.5",
+            "jsesc": "^2.5.1",
+            "source-map": "^0.5.0"
           }
         },
         "@babel/helper-function-name": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
-          "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
           "dev": true,
           "requires": {
-            "@babel/helper-get-function-arity": "^7.10.1",
-            "@babel/template": "^7.10.1",
-            "@babel/types": "^7.10.1"
+            "@babel/helper-get-function-arity": "^7.10.4",
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.10.4"
           }
         },
         "@babel/helper-get-function-arity": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
-          "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.10.1"
+            "@babel/types": "^7.10.4"
           }
         },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
-          "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
+        "@babel/helper-member-expression-to-functions": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
+          "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.10.1"
+            "@babel/types": "^7.11.0"
           }
         },
-        "@babel/helper-validator-identifier": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-          "dev": true
+        "@babel/helper-optimise-call-expression": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
+          "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-replace-supers": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
+          "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-member-expression-to-functions": "^7.10.4",
+            "@babel/helper-optimise-call-expression": "^7.10.4",
+            "@babel/traverse": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+          "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.0"
+          }
         },
         "@babel/highlight": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
-          "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.1",
+            "@babel/helper-validator-identifier": "^7.10.4",
             "chalk": "^2.0.0",
             "js-tokens": "^4.0.0"
           }
         },
         "@babel/parser": {
-          "version": "7.10.2",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
-          "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
+          "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
           "dev": true
         },
         "@babel/template": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
-          "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.10.1",
-            "@babel/parser": "^7.10.1",
-            "@babel/types": "^7.10.1"
+            "@babel/code-frame": "^7.10.4",
+            "@babel/parser": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
+          "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/generator": "^7.11.5",
+            "@babel/helper-function-name": "^7.10.4",
+            "@babel/helper-split-export-declaration": "^7.11.0",
+            "@babel/parser": "^7.11.5",
+            "@babel/types": "^7.11.5",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.19"
           }
         },
         "@babel/types": {
-          "version": "7.10.2",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-          "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.1",
-            "lodash": "^4.17.13",
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "lodash": "^4.17.19",
             "to-fast-properties": "^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"
+          }
+        },
+        "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/plugin-transform-computed-properties": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.1.tgz",
-      "integrity": "sha512-mqSrGjp3IefMsXIenBfGcPXxJxweQe2hEIwMQvjtiDQ9b1IBvDUjkAtV/HMXX47/vXf14qDNedXsIiNd1FmkaQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz",
+      "integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz",
-      "integrity": "sha512-V/nUc4yGWG71OhaTH705pU8ZSdM6c1KmmLP8ys59oOYbT7RpMYAR3MsVOt6OHL0WzG7BlTU076va9fjJyYzJMA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz",
+      "integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.1.tgz",
-      "integrity": "sha512-19VIMsD1dp02RvduFUmfzj8uknaO3uiHHF0s3E1OHnVsNj8oge8EQ5RzHRbJjGSetRnkEuBYO7TG1M5kKjGLOA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz",
+      "integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.1.tgz",
-      "integrity": "sha512-wIEpkX4QvX8Mo9W6XF3EdGttrIPZWozHfEaDTU0WJD/TDnXMvdDh30mzUl/9qWhnf7naicYartcEfUghTCSNpA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz",
+      "integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz",
-      "integrity": "sha512-lr/przdAbpEA2BUzRvjXdEDLrArGRRPwbaF9rvayuHRvdQ7lUTTkZnhZrJ4LE2jvgMRFF4f0YuPQ20vhiPYxtA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz",
+      "integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==",
       "dev": true,
       "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz",
-      "integrity": "sha512-US8KCuxfQcn0LwSCMWMma8M2R5mAjJGsmoCBVwlMygvmDUMkTCykc84IqN1M7t+agSfOmLYTInLCHJM+RUoz+w==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz",
+      "integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-function-name": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz",
-      "integrity": "sha512-//bsKsKFBJfGd65qSNNh1exBy5Y9gD9ZN+DvrJ8f7HXr4avE5POW6zB7Rj6VnqHV33+0vXWUwJT0wSHubiAQkw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz",
+      "integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "dependencies": {
         "@babel/code-frame": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-          "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw=="
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.4"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.10.4",
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
+          "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/parser": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/types": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "lodash": "^4.17.19",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
+      }
+    },
+    "@babel/plugin-transform-literals": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz",
+      "integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-member-expression-literals": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz",
+      "integrity": "sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-modules-amd": {
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz",
+      "integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.10.5",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.4"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.11.6",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
+          "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.5",
+            "jsesc": "^2.5.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.10.4",
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-member-expression-to-functions": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
+          "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.0"
+          }
+        },
+        "@babel/helper-module-imports": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
+          "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-module-transforms": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
+          "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-module-imports": "^7.10.4",
+            "@babel/helper-replace-supers": "^7.10.4",
+            "@babel/helper-simple-access": "^7.10.4",
+            "@babel/helper-split-export-declaration": "^7.11.0",
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.11.0",
+            "lodash": "^4.17.19"
+          }
+        },
+        "@babel/helper-optimise-call-expression": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
+          "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-replace-supers": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
+          "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-member-expression-to-functions": "^7.10.4",
+            "@babel/helper-optimise-call-expression": "^7.10.4",
+            "@babel/traverse": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-simple-access": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
+          "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+          "dev": true,
+          "requires": {
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+          "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.0"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
+          "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/parser": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
+          "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/generator": "^7.11.5",
+            "@babel/helper-function-name": "^7.10.4",
+            "@babel/helper-split-export-declaration": "^7.11.0",
+            "@babel/parser": "^7.11.5",
+            "@babel/types": "^7.11.5",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.19"
+          }
+        },
+        "@babel/types": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "lodash": "^4.17.19",
+            "to-fast-properties": "^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"
+          }
+        },
+        "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/plugin-transform-modules-commonjs": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz",
+      "integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-simple-access": "^7.10.4",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.4"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.11.6",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
+          "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.5",
+            "jsesc": "^2.5.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.10.4",
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-member-expression-to-functions": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
+          "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.0"
+          }
+        },
+        "@babel/helper-module-imports": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
+          "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-module-transforms": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
+          "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-module-imports": "^7.10.4",
+            "@babel/helper-replace-supers": "^7.10.4",
+            "@babel/helper-simple-access": "^7.10.4",
+            "@babel/helper-split-export-declaration": "^7.11.0",
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.11.0",
+            "lodash": "^4.17.19"
+          }
+        },
+        "@babel/helper-optimise-call-expression": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
+          "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-replace-supers": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
+          "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-member-expression-to-functions": "^7.10.4",
+            "@babel/helper-optimise-call-expression": "^7.10.4",
+            "@babel/traverse": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-simple-access": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
+          "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+          "dev": true,
+          "requires": {
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+          "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.0"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
+          "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/parser": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
+          "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/generator": "^7.11.5",
+            "@babel/helper-function-name": "^7.10.4",
+            "@babel/helper-split-export-declaration": "^7.11.0",
+            "@babel/parser": "^7.11.5",
+            "@babel/types": "^7.11.5",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.19"
+          }
+        },
+        "@babel/types": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "lodash": "^4.17.19",
+            "to-fast-properties": "^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"
+          }
+        },
+        "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/plugin-transform-modules-systemjs": {
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz",
+      "integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-hoist-variables": "^7.10.4",
+        "@babel/helper-module-transforms": "^7.10.5",
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.4"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.11.6",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
+          "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.5",
+            "jsesc": "^2.5.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.10.4",
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-member-expression-to-functions": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
+          "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.0"
+          }
+        },
+        "@babel/helper-module-imports": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
+          "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-module-transforms": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
+          "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-module-imports": "^7.10.4",
+            "@babel/helper-replace-supers": "^7.10.4",
+            "@babel/helper-simple-access": "^7.10.4",
+            "@babel/helper-split-export-declaration": "^7.11.0",
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.11.0",
+            "lodash": "^4.17.19"
+          }
+        },
+        "@babel/helper-optimise-call-expression": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
+          "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-replace-supers": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
+          "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-member-expression-to-functions": "^7.10.4",
+            "@babel/helper-optimise-call-expression": "^7.10.4",
+            "@babel/traverse": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-simple-access": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
+          "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+          "dev": true,
+          "requires": {
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+          "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.0"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
+          "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/parser": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
+          "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/generator": "^7.11.5",
+            "@babel/helper-function-name": "^7.10.4",
+            "@babel/helper-split-export-declaration": "^7.11.0",
+            "@babel/parser": "^7.11.5",
+            "@babel/types": "^7.11.5",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.19"
+          }
+        },
+        "@babel/types": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "lodash": "^4.17.19",
+            "to-fast-properties": "^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"
+          }
+        },
+        "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/plugin-transform-modules-umd": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz",
+      "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.4"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.11.6",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
+          "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.5",
+            "jsesc": "^2.5.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.10.4",
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-member-expression-to-functions": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
+          "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.0"
+          }
+        },
+        "@babel/helper-module-imports": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
+          "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-module-transforms": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
+          "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-module-imports": "^7.10.4",
+            "@babel/helper-replace-supers": "^7.10.4",
+            "@babel/helper-simple-access": "^7.10.4",
+            "@babel/helper-split-export-declaration": "^7.11.0",
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.11.0",
+            "lodash": "^4.17.19"
+          }
+        },
+        "@babel/helper-optimise-call-expression": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
+          "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-replace-supers": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
+          "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-member-expression-to-functions": "^7.10.4",
+            "@babel/helper-optimise-call-expression": "^7.10.4",
+            "@babel/traverse": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-simple-access": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
+          "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+          "dev": true,
+          "requires": {
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+          "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.0"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
+          "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/parser": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
+          "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/generator": "^7.11.5",
+            "@babel/helper-function-name": "^7.10.4",
+            "@babel/helper-split-export-declaration": "^7.11.0",
+            "@babel/parser": "^7.11.5",
+            "@babel/types": "^7.11.5",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.19"
+          }
+        },
+        "@babel/types": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "lodash": "^4.17.19",
+            "to-fast-properties": "^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"
+          }
+        },
+        "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/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz",
+      "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-new-target": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz",
+      "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-object-super": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz",
+      "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-replace-supers": "^7.10.4"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.4"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.11.6",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
+          "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.5",
+            "jsesc": "^2.5.1",
+            "source-map": "^0.5.0"
+          }
         },
         "@babel/helper-function-name": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
-          "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
           "dev": true,
           "requires": {
-            "@babel/helper-get-function-arity": "^7.10.1",
-            "@babel/template": "^7.10.1",
-            "@babel/types": "^7.10.1"
+            "@babel/helper-get-function-arity": "^7.10.4",
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.10.4"
           }
         },
         "@babel/helper-get-function-arity": {
@@ -2350,25 +3388,60 @@
             "@babel/types": "^7.10.4"
           }
         },
-        "@babel/helper-validator-identifier": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw=="
+        "@babel/helper-member-expression-to-functions": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
+          "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.0"
+          }
+        },
+        "@babel/helper-optimise-call-expression": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
+          "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-replace-supers": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
+          "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-member-expression-to-functions": "^7.10.4",
+            "@babel/helper-optimise-call-expression": "^7.10.4",
+            "@babel/traverse": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+          "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.0"
+          }
         },
         "@babel/highlight": {
-          "version": "7.9.0",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
-          "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+          "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.9.0",
+            "@babel/helper-validator-identifier": "^7.10.4",
             "chalk": "^2.0.0",
             "js-tokens": "^4.0.0"
           }
         },
         "@babel/parser": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.4.tgz",
-          "integrity": "sha512-8jHII4hf+YVDsskTF6WuMB3X4Eh+PsUkC2ljq22so5rHvH+T8BzyL94VOdyFLNR8tBSVXOTbNHOKpR4TfRxVtA==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
+          "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
           "dev": true
         },
         "@babel/template": {
@@ -2380,286 +3453,168 @@
             "@babel/code-frame": "^7.10.4",
             "@babel/parser": "^7.10.4",
             "@babel/types": "^7.10.4"
-          },
-          "dependencies": {
-            "@babel/code-frame": {
-              "version": "7.10.4",
-              "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-              "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-              "dev": true,
-              "requires": {
-                "@babel/highlight": "^7.10.4"
-              }
-            },
-            "@babel/helper-validator-identifier": {
-              "version": "7.10.4",
-              "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
-              "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
-              "dev": true
-            },
-            "@babel/highlight": {
-              "version": "7.10.4",
-              "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-              "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-              "dev": true,
-              "requires": {
-                "@babel/helper-validator-identifier": "^7.10.4",
-                "chalk": "^2.0.0",
-                "js-tokens": "^4.0.0"
-              }
-            }
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
+          "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/generator": "^7.11.5",
+            "@babel/helper-function-name": "^7.10.4",
+            "@babel/helper-split-export-declaration": "^7.11.0",
+            "@babel/parser": "^7.11.5",
+            "@babel/types": "^7.11.5",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.19"
           }
         },
         "@babel/types": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.4.tgz",
-          "integrity": "sha512-UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.13",
+            "lodash": "^4.17.19",
             "to-fast-properties": "^2.0.0"
-          },
-          "dependencies": {
-            "@babel/helper-validator-identifier": {
-              "version": "7.10.4",
-              "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
-              "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
-              "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=="
-        },
         "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
         }
       }
     },
-    "@babel/plugin-transform-literals": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz",
-      "integrity": "sha512-qi0+5qgevz1NHLZroObRm5A+8JJtibb7vdcPQF1KQE12+Y/xxl8coJ+TpPW9iRq+Mhw/NKLjm+5SHtAHCC7lAw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
-    "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.1.tgz",
-      "integrity": "sha512-UmaWhDokOFT2GcgU6MkHC11i0NQcL63iqeufXWfRy6pUOGYeCGEKhvfFO6Vz70UfYJYHwveg62GS83Rvpxn+NA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
-    "@babel/plugin-transform-modules-amd": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.1.tgz",
-      "integrity": "sha512-31+hnWSFRI4/ACFr1qkboBbrTxoBIzj7qA69qlq8HY8p7+YCzkCT6/TvQ1a4B0z27VeWtAeJd6pr5G04dc1iHw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      }
-    },
-    "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz",
-      "integrity": "sha512-AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-simple-access": "^7.10.1",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      }
-    },
-    "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.1.tgz",
-      "integrity": "sha512-ewNKcj1TQZDL3YnO85qh9zo1YF1CHgmSTlRQgHqe63oTrMI85cthKtZjAiZSsSNjPQ5NCaYo5QkbYqEw1ZBgZA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-hoist-variables": "^7.10.1",
-        "@babel/helper-module-transforms": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      }
-    },
-    "@babel/plugin-transform-modules-umd": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.1.tgz",
-      "integrity": "sha512-EIuiRNMd6GB6ulcYlETnYYfgv4AxqrswghmBRQbWLHZxN4s7mupxzglnHqk9ZiUpDI4eRWewedJJNj67PWOXKA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
-    "@babel/plugin-transform-named-capturing-groups-regex": {
-      "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": {
-        "@babel/helper-create-regexp-features-plugin": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-new-target": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.1.tgz",
-      "integrity": "sha512-MBlzPc1nJvbmO9rPr1fQwXOM2iGut+JC92ku6PbiJMMK7SnQc1rytgpopveE3Evn47gzvGYeCdgfCDbZo0ecUw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
-      }
-    },
-    "@babel/plugin-transform-object-super": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.1.tgz",
-      "integrity": "sha512-WnnStUDN5GL+wGQrJylrnnVlFhFmeArINIR9gjhSeYyvroGhBrSAXYg/RHsnfzmsa+onJrTJrEClPzgNmmQ4Gw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-replace-supers": "^7.10.1"
-      }
-    },
     "@babel/plugin-transform-parameters": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz",
-      "integrity": "sha512-tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz",
+      "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==",
       "dev": true,
       "requires": {
-        "@babel/helper-get-function-arity": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-get-function-arity": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
       "dependencies": {
         "@babel/helper-get-function-arity": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
-          "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.10.1"
+            "@babel/types": "^7.10.4"
           }
         },
-        "@babel/helper-validator-identifier": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-          "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-          "dev": true
-        },
         "@babel/types": {
-          "version": "7.10.2",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-          "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.1",
-            "lodash": "^4.17.13",
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "lodash": "^4.17.19",
             "to-fast-properties": "^2.0.0"
           }
         }
       }
     },
     "@babel/plugin-transform-property-literals": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.1.tgz",
-      "integrity": "sha512-Kr6+mgag8auNrgEpbfIWzdXYOvqDHZOF0+Bx2xh4H2EDNwcbRb9lY6nkZg8oSjsX+DH9Ebxm9hOqtKW+gRDeNA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz",
+      "integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.1.tgz",
-      "integrity": "sha512-B3+Y2prScgJ2Bh/2l9LJxKbb8C8kRfsG4AdPT+n7ixBHIxJaIG8bi8tgjxUMege1+WqSJ+7gu1YeoMVO3gPWzw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz",
+      "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==",
       "dev": true,
       "requires": {
         "regenerator-transform": "^0.14.2"
       }
     },
     "@babel/plugin-transform-reserved-words": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.1.tgz",
-      "integrity": "sha512-qN1OMoE2nuqSPmpTqEM7OvJ1FkMEV+BjVeZZm9V9mq/x1JLKQ4pcv8riZJMNN3u2AUGl0ouOMjRr2siecvHqUQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz",
+      "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz",
-      "integrity": "sha512-AR0E/lZMfLstScFwztApGeyTHJ5u3JUKMjneqRItWeEqDdHWZwAOKycvQNCasCK/3r5YXsuNG25funcJDu7Y2g==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz",
+      "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz",
-      "integrity": "sha512-8wTPym6edIrClW8FI2IoaePB91ETOtg36dOkj3bYcNe7aDMN2FXEoUa+WrmPc4xa1u2PQK46fUX2aCb+zo9rfw==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz",
+      "integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz",
-      "integrity": "sha512-j17ojftKjrL7ufX8ajKvwRilwqTok4q+BjkknmQw9VNHnItTyMP5anPFzxFJdCQs7clLcWpCV3ma+6qZWLnGMA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz",
+      "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-regex": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-regex": "^7.10.4"
       }
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.1.tgz",
-      "integrity": "sha512-t7B/3MQf5M1T9hPCRG28DNGZUuxAuDqLYS03rJrIk2prj/UV7Z6FOneijhQhnv/Xa039vidXeVbvjK2SK5f7Gg==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz",
+      "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.1.tgz",
-      "integrity": "sha512-qX8KZcmbvA23zDi+lk9s6hC1FM7jgLHYIjuLgULgc8QtYnmB3tAVIYkNoKRQ75qWBeyzcoMoK8ZQmogGtC/w0g==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz",
+      "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz",
-      "integrity": "sha512-Y/2a2W299k0VIUdbqYm9X2qS6fE0CUBhhiPpimK6byy7OJ/kORLlIX+J6UrjgNu5awvs62k+6RSslxhcvVw2Tw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz",
+      "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/preset-env": {
@@ -2731,9 +3686,9 @@
       }
     },
     "@babel/preset-modules": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz",
-      "integrity": "sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
+      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
@@ -2744,9 +3699,9 @@
       }
     },
     "@babel/runtime": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz",
-      "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==",
+      "version": "7.11.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz",
+      "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==",
       "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.4"
@@ -3020,17 +3975,42 @@
       "integrity": "sha512-/FvgcpjO4IvwNFnRVoHGikAvckr6fxKf4NgYoTQ9giI8xavolLvuQUHxzH20legi5dgZz34ii2m2g1Q7OxEV8w=="
     },
     "@ngtools/webpack": {
-      "version": "9.1.7",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-9.1.7.tgz",
-      "integrity": "sha512-A7VB2I42Kn+7jl0tDKzGNLAoZLWSqkKo9Hg1bmKpvAAIz+DSbq3uV+JWgGgTprM3tn0lfkVgmqk4H17HKwAOcg==",
+      "version": "9.1.12",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-9.1.12.tgz",
+      "integrity": "sha512-lypMXIq5oxBMsoDu/VOa1yUmmXthhxkCJa8LG0ZohfnbwhmZvz3SAW7omBGuVrb5cVIfLCkaRCSnQ1MNc6ULXw==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "9.1.7",
+        "@angular-devkit/core": "9.1.12",
         "enhanced-resolve": "4.1.1",
         "rxjs": "6.5.4",
         "webpack-sources": "1.4.3"
       },
       "dependencies": {
+        "@angular-devkit/core": {
+          "version": "9.1.12",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.12.tgz",
+          "integrity": "sha512-D/GnBeSlmdgGn7EhuE32HuPuRAjvUuxi7Q6WywBI8PSsXKAGnrypghBwMATNnOA24//CgbW2533Y9VWHaeXdeA==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.12.3",
+            "fast-json-stable-stringify": "2.1.0",
+            "magic-string": "0.25.7",
+            "rxjs": "6.5.4",
+            "source-map": "0.7.3"
+          }
+        },
+        "ajv": {
+          "version": "6.12.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+          "dev": true,
+          "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"
+          }
+        },
         "rxjs": {
           "version": "6.5.4",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
@@ -3039,6 +4019,12 @@
           "requires": {
             "tslib": "^1.9.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
         }
       }
     },
@@ -3068,6 +4054,23 @@
         "fastq": "^1.6.0"
       }
     },
+    "@npmcli/move-file": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.0.1.tgz",
+      "integrity": "sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==",
+      "dev": true,
+      "requires": {
+        "mkdirp": "^1.0.4"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        }
+      }
+    },
     "@rollup/plugin-commonjs": {
       "version": "11.1.0",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-11.1.0.tgz",
@@ -3453,9 +4456,9 @@
       "dev": true
     },
     "@types/glob": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha512-VgNIkxK+j7Nz5P7jvUZlRvhuPSmsEfS03b0alKcq5V/STUKAa3Plemsn5mrQUO7am6OErJ4rhGEGJbACclrtRA==",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
       "dev": true,
       "requires": {
         "@types/minimatch": "*",
@@ -3525,9 +4528,9 @@
       "dev": true
     },
     "@types/q": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz",
-      "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
+      "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
       "dev": true
     },
     "@types/request": {
@@ -4011,6 +5014,7 @@
       "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"
       }
@@ -4162,14 +5166,15 @@
       }
     },
     "asn1.js": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
       "dev": true,
       "requires": {
         "bn.js": "^4.0.0",
         "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
       },
       "dependencies": {
         "bn.js": {
@@ -4196,16 +5201,6 @@
           "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
           "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=="
-        },
-        "type-fest": {
-          "version": "0.8.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
-        },
         "util": {
           "version": "0.10.3",
           "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
@@ -4330,39 +5325,13 @@
       "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==",
-          "dev": true,
-          "requires": {
-            "commondir": "^1.0.1",
-            "make-dir": "^2.0.0",
-            "pkg-dir": "^3.0.0"
-          },
-          "dependencies": {
-            "commondir": {
-              "version": "1.0.1",
-              "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-              "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-              "dev": true
-            },
-            "pkg-dir": {
-              "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": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
           "dev": true,
           "requires": {
-            "locate-path": "^3.0.0"
+            "commondir": "^1.0.1",
+            "make-dir": "^2.0.0",
+            "pkg-dir": "^3.0.0"
           }
         },
         "json5": {
@@ -4385,40 +5354,6 @@
             "json5": "^1.0.1"
           }
         },
-        "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.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": "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
-        },
         "pify": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
@@ -4578,9 +5513,9 @@
       "dev": true
     },
     "bn.js": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz",
-      "integrity": "sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz",
+      "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==",
       "dev": true
     },
     "body-parser": {
@@ -4822,41 +5757,22 @@
       }
     },
     "browserify-sign": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.0.tgz",
-      "integrity": "sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
       "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",
+        "elliptic": "^6.5.3",
         "inherits": "^2.0.4",
         "parse-asn1": "^5.1.5",
         "readable-stream": "^3.6.0",
         "safe-buffer": "^5.2.0"
       },
       "dependencies": {
-        "lowercase-keys": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-          "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="
-        },
-        "normalize-url": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
-          "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ=="
-        },
-        "pump": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        },
         "readable-stream": {
           "version": "3.6.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -5065,38 +5981,6 @@
         "unique-filename": "^1.1.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"
-          },
-          "dependencies": {
-            "fs.realpath": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-              "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-              "dev": true
-            },
-            "inflight": {
-              "version": "1.0.6",
-              "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-              "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-              "dev": true,
-              "requires": {
-                "once": "^1.3.0",
-                "wrappy": "1"
-              }
-            }
-          }
-        },
         "minipass": {
           "version": "3.1.3",
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
@@ -5280,6 +6164,7 @@
       "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",
@@ -5290,6 +6175,7 @@
           "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"
           }
@@ -5458,6 +6344,57 @@
       "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
       "dev": true
     },
+    "cliui": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "dev": true,
+      "requires": {
+        "string-width": "^3.1.0",
+        "strip-ansi": "^5.2.0",
+        "wrap-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
+        },
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+          "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
+        },
+        "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==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.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==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
     "clone": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
@@ -5575,6 +6512,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"
       }
@@ -5582,7 +6520,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-string": {
       "version": "1.5.3",
@@ -5974,28 +6913,16 @@
         "is-directory": "^0.3.1",
         "js-yaml": "^3.13.1",
         "parse-json": "^4.0.0"
-      },
-      "dependencies": {
-        "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.1",
-            "json-parse-better-errors": "^1.0.1"
-          }
-        }
       }
     },
     "create-ecdh": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
       "dev": true,
       "requires": {
         "bn.js": "^4.1.0",
-        "elliptic": "^6.0.0"
+        "elliptic": "^6.5.3"
       },
       "dependencies": {
         "bn.js": {
@@ -6212,9 +7139,9 @@
       }
     },
     "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==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.3.0.tgz",
+      "integrity": "sha512-pv9JPyatiPaQ6pf4OvD/dbfm0o5LviWmwxNWzblYf/1u9QZd0ihV+PMwy5jdQWQ3349kZmKEx9WXuSka2dM4cg==",
       "dev": true
     },
     "cssauron": {
@@ -7026,9 +7953,9 @@
       "dev": true
     },
     "elliptic": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz",
-      "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
+      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
       "dev": true,
       "requires": {
         "bn.js": "^4.4.0",
@@ -7202,9 +8129,9 @@
       "dev": true
     },
     "entities": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.2.tgz",
-      "integrity": "sha512-dmD3AvJQBUjKpcNkoqr+x+IF0SdRtPz9Vk0uTy4yWqga9ibB6s4v++QFWNohjiUGoMlF552ZvNyXDxz5iW0qmw==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
+      "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
       "dev": true
     },
     "err-code": {
@@ -7387,7 +8314,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",
@@ -7694,9 +8622,9 @@
       "dev": true
     },
     "events": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.1.0.tgz",
-      "integrity": "sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz",
+      "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==",
       "dev": true
     },
     "eventsource": {
@@ -8057,42 +8985,6 @@
       "requires": {
         "loader-utils": "^2.0.0",
         "schema-utils": "^2.6.5"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
-          "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
-          "dev": true,
-          "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"
-          }
-        },
-        "loader-utils": {
-          "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": "^2.1.2"
-          }
-        },
-        "schema-utils": {
-          "version": "2.7.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-          "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.4",
-            "ajv": "^6.12.2",
-            "ajv-keywords": "^3.4.1"
-          }
-        }
       }
     },
     "fileset": {
@@ -8845,7 +9737,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",
@@ -9138,6 +10031,111 @@
         "is-glob": "^4.0.0",
         "lodash": "^4.17.11",
         "micromatch": "^3.1.10"
+      },
+      "dependencies": {
+        "braces": {
+          "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",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "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"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "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",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "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"
+              }
+            }
+          }
+        },
+        "is-number": {
+          "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"
+          },
+          "dependencies": {
+            "kind-of": {
+              "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"
+              }
+            }
+          }
+        },
+        "micromatch": {
+          "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",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "to-regex-range": {
+          "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"
+          }
+        }
       }
     },
     "http-signature": {
@@ -10401,9 +11399,9 @@
           "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==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -10414,7 +11412,8 @@
     "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",
@@ -11355,9 +12354,9 @@
       }
     },
     "loglevel": {
-      "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==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz",
+      "integrity": "sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==",
       "dev": true
     },
     "loose-envify": {
@@ -11673,108 +12672,13 @@
       "dev": true
     },
     "micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
       "dev": true,
       "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "dependencies": {
-        "braces": {
-          "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",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "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"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "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",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "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"
-              }
-            }
-          }
-        },
-        "is-number": {
-          "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"
-          },
-          "dependencies": {
-            "kind-of": {
-              "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"
-              }
-            }
-          }
-        },
-        "to-regex-range": {
-          "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"
-          }
-        }
+        "braces": "^3.0.1",
+        "picomatch": "^2.0.5"
       }
     },
     "miller-rabin": {
@@ -11969,9 +12873,9 @@
       }
     },
     "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==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
+      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
       "dev": true,
       "requires": {
         "minipass": "^3.0.0"
@@ -11989,9 +12893,9 @@
       }
     },
     "minizlib": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.0.tgz",
-      "integrity": "sha512-EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
       "dev": true,
       "requires": {
         "minipass": "^3.0.0",
@@ -13216,22 +14120,22 @@
       },
       "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==",
+          "version": "1.17.6",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+          "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
           "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",
+            "is-callable": "^1.2.0",
+            "is-regex": "^1.1.0",
             "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"
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
           }
         },
         "es-to-primitive": {
@@ -13258,41 +14162,19 @@
           "dev": true
         },
         "is-regex": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-          "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
+          "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
           "dev": true,
           "requires": {
             "has-symbols": "^1.0.1"
           }
         },
         "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==",
+          "version": "1.8.0",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
+          "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
           "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"
-          }
         }
       }
     },
@@ -13436,22 +14318,22 @@
       },
       "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==",
+          "version": "1.17.6",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+          "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
           "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",
+            "is-callable": "^1.2.0",
+            "is-regex": "^1.1.0",
             "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"
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
           }
         },
         "es-to-primitive": {
@@ -13478,41 +14360,19 @@
           "dev": true
         },
         "is-regex": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-          "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
+          "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
           "dev": true,
           "requires": {
             "has-symbols": "^1.0.1"
           }
         },
         "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==",
+          "version": "1.8.0",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
+          "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
           "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"
-          }
         }
       }
     },
@@ -14006,19 +14866,28 @@
       }
     },
     "parse-asn1": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
-      "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
       "dev": true,
       "requires": {
-        "asn1.js": "^4.0.0",
+        "asn1.js": "^5.2.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-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.1",
+        "json-parse-better-errors": "^1.0.1"
+      }
+    },
     "parse-passwd": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
@@ -14247,14 +15116,14 @@
       "dev": true
     },
     "portfinder": {
-      "version": "1.0.26",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz",
-      "integrity": "sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==",
+      "version": "1.0.28",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
+      "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
       "dev": true,
       "requires": {
         "async": "^2.6.2",
         "debug": "^3.1.1",
-        "mkdirp": "^0.5.1"
+        "mkdirp": "^0.5.5"
       },
       "dependencies": {
         "debug": {
@@ -14266,6 +15135,15 @@
             "ms": "^2.1.1"
           }
         },
+        "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"
+          }
+        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -14300,9 +15178,9 @@
       }
     },
     "postcss-calc": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.2.tgz",
-      "integrity": "sha512-rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.4.tgz",
+      "integrity": "sha512-0I79VRAd1UTkaHzY9w83P39YGO/M3bG7/tNLrHGEunBolfoGM0hSjrGvjoeaj0JE/zIw5GsI2KZ0UwDJqv5hjw==",
       "dev": true,
       "requires": {
         "postcss": "^7.0.27",
@@ -14602,15 +15480,34 @@
       }
     },
     "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==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz",
+      "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==",
       "dev": true,
       "requires": {
         "icss-utils": "^4.1.1",
-        "postcss": "^7.0.16",
+        "postcss": "^7.0.32",
         "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.0.0"
+        "postcss-value-parser": "^4.1.0"
+      },
+      "dependencies": {
+        "postcss": {
+          "version": "7.0.32",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
+          "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.4.2",
+            "source-map": "^0.6.1",
+            "supports-color": "^6.1.0"
+          }
+        },
+        "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
+        }
       }
     },
     "postcss-modules-scope": {
@@ -14731,44 +15628,6 @@
         "postcss-value-parser": "^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==",
-          "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==",
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "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==",
-          "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=="
-        },
         "postcss-value-parser": {
           "version": "3.3.1",
           "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
@@ -14968,13 +15827,7 @@
     "prettier": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz",
-      "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==",
-      "dev": true
-    },
-    "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-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==",
       "dev": true
     },
     "process": {
@@ -15344,9 +16197,9 @@
       "dev": true
     },
     "querystringify": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
-      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
       "dev": true
     },
     "randombytes": {
@@ -15562,13 +16415,12 @@
       "dev": true
     },
     "regenerator-transform": {
-      "version": "0.14.4",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz",
-      "integrity": "sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==",
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
+      "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
       "dev": true,
       "requires": {
-        "@babel/runtime": "^7.8.4",
-        "private": "^0.1.8"
+        "@babel/runtime": "^7.8.4"
       }
     },
     "regex-not": {
@@ -15592,22 +16444,22 @@
       },
       "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==",
+          "version": "1.17.6",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+          "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
           "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",
+            "is-callable": "^1.2.0",
+            "is-regex": "^1.1.0",
             "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"
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
           }
         },
         "es-to-primitive": {
@@ -15634,41 +16486,19 @@
           "dev": true
         },
         "is-regex": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-          "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
+          "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
           "dev": true,
           "requires": {
             "has-symbols": "^1.0.1"
           }
         },
         "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==",
+          "version": "1.8.0",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
+          "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
           "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"
-          }
         }
       }
     },
@@ -16431,20 +17261,20 @@
       "dev": true
     },
     "schema-utils": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-      "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
       "dev": true,
       "requires": {
-        "@types/json-schema": "^7.0.4",
-        "ajv": "^6.12.2",
-        "ajv-keywords": "^3.4.1"
+        "@types/json-schema": "^7.0.5",
+        "ajv": "^6.12.4",
+        "ajv-keywords": "^3.5.2"
       },
       "dependencies": {
         "ajv": {
-          "version": "6.12.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
-          "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
+          "version": "6.12.4",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz",
+          "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -16452,6 +17282,12 @@
             "json-schema-traverse": "^0.4.1",
             "uri-js": "^4.2.2"
           }
+        },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+          "dev": true
         }
       }
     },
@@ -17883,21 +18719,6 @@
             "indexes-of": "^1.0.1",
             "uniq": "^1.0.1"
           }
-        },
-        "sax": {
-          "version": "0.5.8",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz",
-          "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE="
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
         }
       }
     },
@@ -18115,15 +18936,15 @@
       "dev": true
     },
     "tar": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.0.2.tgz",
-      "integrity": "sha512-Glo3jkRtPcvpDlAs/0+hozav78yoXKFr+c4wgw62NNMO3oo4AaJdCo21Uu7lcwr55h39W2XD1LMERc64wtbItg==",
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.0.5.tgz",
+      "integrity": "sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==",
       "dev": true,
       "requires": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
         "minipass": "^3.0.0",
-        "minizlib": "^2.1.0",
+        "minizlib": "^2.1.1",
         "mkdirp": "^1.0.3",
         "yallist": "^4.0.0"
       },
@@ -18265,48 +19086,79 @@
       }
     },
     "terser-webpack-plugin": {
-      "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==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.3.tgz",
+      "integrity": "sha512-bZFnotuIKq5Rqzrs+qIwFzGdKdffV9epG5vDSEbYzvKAhPeR5RbbrQysfPgbIIMhNAQtZD2hGwBfSKUXjXZZZw==",
       "dev": true,
       "requires": {
-        "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",
+        "cacache": "^15.0.4",
+        "find-cache-dir": "^3.3.1",
+        "jest-worker": "^26.0.0",
+        "p-limit": "^2.3.0",
+        "schema-utils": "^2.6.6",
+        "serialize-javascript": "^3.1.0",
         "source-map": "^0.6.1",
-        "terser": "^4.4.3",
+        "terser": "^4.6.13",
         "webpack-sources": "^1.4.3"
       },
       "dependencies": {
         "cacache": {
-          "version": "13.0.1",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz",
-          "integrity": "sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w==",
+          "version": "15.0.5",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz",
+          "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==",
           "dev": true,
           "requires": {
-            "chownr": "^1.1.2",
-            "figgy-pudding": "^3.5.1",
+            "@npmcli/move-file": "^1.0.1",
+            "chownr": "^2.0.0",
             "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",
+            "lru-cache": "^6.0.0",
+            "minipass": "^3.1.1",
             "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",
+            "mkdirp": "^1.0.3",
+            "p-map": "^4.0.0",
             "promise-inflight": "^1.0.1",
-            "rimraf": "^2.7.1",
-            "ssri": "^7.0.0",
+            "rimraf": "^3.0.2",
+            "ssri": "^8.0.0",
+            "tar": "^6.0.2",
             "unique-filename": "^1.1.1"
           }
         },
+        "chownr": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+          "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+          "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
+        },
+        "jest-worker": {
+          "version": "26.3.0",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.3.0.tgz",
+          "integrity": "sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^7.0.0"
+          }
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
         "minipass": {
           "version": "3.1.3",
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
@@ -18316,6 +19168,12 @@
             "yallist": "^4.0.0"
           }
         },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        },
         "p-limit": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -18325,26 +19183,63 @@
             "p-try": "^2.0.0"
           }
         },
+        "p-map": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+          "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+          "dev": true,
+          "requires": {
+            "aggregate-error": "^3.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
         },
+        "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"
+          }
+        },
+        "serialize-javascript": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
+          "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
+          "dev": true,
+          "requires": {
+            "randombytes": "^2.1.0"
+          }
+        },
         "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==",
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "figgy-pudding": "^3.5.1",
-            "minipass": "^3.1.1"
+            "has-flag": "^4.0.0"
+          }
+        },
+        "terser": {
+          "version": "4.8.0",
+          "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
+          "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
+          "dev": true,
+          "requires": {
+            "commander": "^2.20.0",
+            "source-map": "~0.6.1",
+            "source-map-support": "~0.5.12"
           }
         }
       }
@@ -19081,22 +19976,22 @@
       },
       "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==",
+          "version": "1.17.6",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+          "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
           "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",
+            "is-callable": "^1.2.0",
+            "is-regex": "^1.1.0",
             "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"
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
           }
         },
         "es-to-primitive": {
@@ -19123,41 +20018,19 @@
           "dev": true
         },
         "is-regex": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-          "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
+          "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
           "dev": true,
           "requires": {
             "has-symbols": "^1.0.1"
           }
         },
         "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==",
+          "version": "1.8.0",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
+          "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
           "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"
-          }
         }
       }
     },
@@ -19228,49 +20101,21 @@
       "dev": true
     },
     "watchpack": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz",
-      "integrity": "sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz",
+      "integrity": "sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==",
       "dev": true,
       "requires": {
-        "chokidar": "^3.4.0",
+        "chokidar": "^3.4.1",
         "graceful-fs": "^4.1.2",
         "neo-async": "^2.5.0",
         "watchpack-chokidar2": "^2.0.0"
       },
       "dependencies": {
-        "anymatch": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-          "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "normalize-path": "^3.0.0",
-            "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,
-          "optional": 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,
-          "optional": true,
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
         "chokidar": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz",
-          "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==",
+          "version": "3.4.2",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
+          "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
           "dev": true,
           "optional": true,
           "requires": {
@@ -19284,23 +20129,6 @@
             "readdirp": "~3.4.0"
           }
         },
-        "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,
-          "optional": true,
-          "requires": {
-            "to-regex-range": "^5.0.1"
-          }
-        },
-        "fsevents": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-          "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-          "dev": true,
-          "optional": true
-        },
         "glob-parent": {
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
@@ -19310,63 +20138,73 @@
           "requires": {
             "is-glob": "^4.0.1"
           }
-        },
-        "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,
-          "optional": true,
-          "requires": {
-            "binary-extensions": "^2.0.0"
-          }
-        },
-        "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,
-          "optional": true
-        },
-        "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,
-          "optional": true
-        },
-        "readdirp": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
-          "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+        }
+      }
+    },
+    "watchpack-chokidar2": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
+      "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chokidar": "^2.1.8"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
           "dev": true,
           "optional": true,
           "requires": {
-            "picomatch": "^2.2.1"
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "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,
+              "optional": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
           }
         },
-        "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==",
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
           "dev": true,
           "optional": true,
           "requires": {
-            "is-number": "^7.0.0"
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
           }
-        }
-      }
-    },
-    "watchpack-chokidar2": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
-      "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chokidar": "^2.1.8"
-      },
-      "dependencies": {
+        },
         "chokidar": {
           "version": "2.1.8",
           "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
@@ -19386,86 +20224,6 @@
             "path-is-absolute": "^1.0.0",
             "readdirp": "^2.2.1",
             "upath": "^1.1.1"
-          },
-          "dependencies": {
-            "anymatch": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-              "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "micromatch": "^3.1.4",
-                "normalize-path": "^2.1.1"
-              },
-              "dependencies": {
-                "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,
-                  "optional": true,
-                  "requires": {
-                    "remove-trailing-separator": "^1.0.1"
-                  }
-                }
-              }
-            },
-            "braces": {
-              "version": "2.3.2",
-              "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-              "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "arr-flatten": "^1.1.0",
-                "array-unique": "^0.3.2",
-                "extend-shallow": "^2.0.1",
-                "fill-range": "^4.0.0",
-                "isobject": "^3.0.1",
-                "repeat-element": "^1.1.2",
-                "snapdragon": "^0.8.1",
-                "snapdragon-node": "^2.0.1",
-                "split-string": "^3.0.2",
-                "to-regex": "^3.0.1"
-              }
-            },
-            "fsevents": {
-              "version": "1.2.13",
-              "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-              "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-              "dev": true,
-              "optional": true
-            },
-            "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,
-              "optional": true,
-              "requires": {
-                "graceful-fs": "^4.1.11",
-                "micromatch": "^3.1.10",
-                "readable-stream": "^2.0.2"
-              }
-            },
-            "upath": {
-              "version": "1.2.0",
-              "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-              "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
           }
         },
         "fill-range": {
@@ -19479,8 +20237,27 @@
             "is-number": "^3.0.0",
             "repeat-string": "^1.6.1",
             "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
           }
         },
+        "fsevents": {
+          "version": "1.2.13",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+          "dev": true,
+          "optional": true
+        },
         "is-binary-path": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
@@ -19499,24 +20276,53 @@
           "optional": true,
           "requires": {
             "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
           }
         },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
           "dev": true,
           "optional": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
           }
         },
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+        "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,
-          "optional": true
+          "optional": true,
+          "requires": {
+            "graceful-fs": "^4.1.11",
+            "micromatch": "^3.1.10",
+            "readable-stream": "^2.0.2"
+          }
         },
         "to-regex-range": {
           "version": "2.1.1",
@@ -19612,6 +20418,35 @@
           "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
           "dev": true
         },
+        "braces": {
+          "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",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "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"
+              }
+            }
+          }
+        },
         "cacache": {
           "version": "12.0.4",
           "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
@@ -19635,6 +20470,29 @@
             "y18n": "^4.0.0"
           }
         },
+        "fill-range": {
+          "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",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "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"
+              }
+            }
+          }
+        },
         "find-cache-dir": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
@@ -19646,18 +20504,24 @@
             "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==",
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "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"
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "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"
+              }
+            }
           }
         },
         "is-wsl": {
@@ -19696,6 +20560,27 @@
             "readable-stream": "^2.0.1"
           }
         },
+        "micromatch": {
+          "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",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
         "schema-utils": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
@@ -19707,6 +20592,15 @@
             "ajv-keywords": "^3.1.0"
           }
         },
+        "serialize-javascript": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+          "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+          "dev": true,
+          "requires": {
+            "randombytes": "^2.1.0"
+          }
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -19723,31 +20617,30 @@
           }
         },
         "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==",
+          "version": "1.4.5",
+          "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
+          "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
           "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",
+            "serialize-javascript": "^4.0.0",
             "source-map": "^0.6.1",
             "terser": "^4.1.2",
             "webpack-sources": "^1.4.0",
             "worker-farm": "^1.7.0"
-          },
-          "dependencies": {
-            "worker-farm": {
-              "version": "1.7.0",
-              "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
-              "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
-              "dev": true,
-              "requires": {
-                "errno": "~0.1.7"
-              }
-            }
+          }
+        },
+        "to-regex-range": {
+          "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"
           }
         }
       }
@@ -19824,12 +20717,6 @@
         "yargs": "^13.3.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==",
-          "dev": true
-        },
         "anymatch": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
@@ -19867,6 +20754,17 @@
             "snapdragon-node": "^2.0.1",
             "split-string": "^3.0.2",
             "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "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"
+              }
+            }
           }
         },
         "chokidar": {
@@ -19889,28 +20787,6 @@
             "upath": "^1.1.1"
           }
         },
-        "cliui": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-          "dev": true,
-          "requires": {
-            "string-width": "^3.1.0",
-            "strip-ansi": "^5.2.0",
-            "wrap-ansi": "^5.1.0"
-          },
-          "dependencies": {
-            "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"
-              }
-            }
-          }
-        },
         "debug": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -19920,21 +20796,6 @@
             "ms": "^2.1.1"
           }
         },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-          "dev": true
-        },
-        "extend-shallow": {
-          "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"
-          }
-        },
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -19945,15 +20806,17 @@
             "is-number": "^3.0.0",
             "repeat-string": "^1.6.1",
             "to-regex-range": "^2.1.0"
-          }
-        },
-        "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"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "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"
+              }
+            }
           }
         },
         "fsevents": {
@@ -19978,12 +20841,6 @@
             "binary-extensions": "^1.0.0"
           }
         },
-        "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
-        },
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -19991,25 +20848,38 @@
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "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"
+              }
+            }
           }
         },
-        "kind-of": {
-          "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"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
           "dev": true,
           "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
           }
         },
         "ms": {
@@ -20018,30 +20888,6 @@
           "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": "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
-        },
         "readdirp": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
@@ -20070,28 +20916,6 @@
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "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==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          },
-          "dependencies": {
-            "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"
-              }
-            }
-          }
-        },
         "to-regex-range": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
@@ -20101,40 +20925,6 @@
             "is-number": "^3.0.0",
             "repeat-string": "^1.6.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
-        },
-        "yargs": {
-          "version": "13.3.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-          "dev": true,
-          "requires": {
-            "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.2"
-          }
-        },
-        "yargs-parser": {
-          "version": "13.1.2",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
         }
       }
     },
@@ -20213,6 +21003,12 @@
         "isexe": "^2.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
+    },
     "widest-line": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
@@ -20268,6 +21064,15 @@
       "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
       "dev": true
     },
+    "worker-farm": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
+      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
+      "dev": true,
+      "requires": {
+        "errno": "~0.1.7"
+      }
+    },
     "worker-plugin": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/worker-plugin/-/worker-plugin-4.0.3.tgz",
@@ -20455,6 +21260,117 @@
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true
     },
+    "yargs": {
+      "version": "13.3.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+      "dev": true,
+      "requires": {
+        "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.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==",
+          "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==",
+          "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==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "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": "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.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": "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
+        },
+        "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==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.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==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "yargs-parser": {
+      "version": "13.1.2",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
+    },
     "yeast": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
diff --git a/package.json b/package.json
index 79fdb92362..15e022fa11 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
   "devDependencies": {
     "@angular-builders/custom-webpack": "^9.1.0",
     "@angular-devkit/architect": "^0.901.7",
-    "@angular-devkit/build-angular": "~0.901.5",
+    "@angular-devkit/build-angular": "^0.901.12",
     "@angular-devkit/build-ng-packagr": "~0.901.5",
     "@angular-devkit/core": "^9.1.7",
     "@angular-devkit/schematics": "^9.1.5",
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.ts
index 890a24d958..ae51cd2620 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.ts
@@ -7,7 +7,7 @@ import { ChartsService } from '../shared/services/charts.service';
   selector: 'app-chart-item',
   templateUrl: './chart-item.component.html',
   styleUrls: ['./chart-item.component.scss'],
-  /* tslint:disable-next-line:use-input-property-decorator */
+  /* tslint:disable-next-line:no-inputs-metadata-property */
   inputs: ['chart', 'showVersion', 'showDescription']
 })
 export class ChartItemComponent implements OnInit {
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.ts
index 06d9d7658a..cb4e7a538a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.ts
@@ -4,10 +4,10 @@ import { Component } from '@angular/core';
   selector: 'app-list-filters',
   templateUrl: './list-filters.component.html',
   styleUrls: ['./list-filters.component.scss'],
-  /* tslint:disable-next-line:use-input-property-decorator */
+  /* tslint:disable-next-line:no-inputs-metadata-property */
   inputs: ['filters']
 })
 
 export class ListFiltersComponent {
-  public filters: { title: string, items: Array<{}> }[] = [];
+  public filters: { title: string, items: Array<{}>, }[] = [];
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.ts
index 8052238ffb..20cd266321 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.ts
@@ -4,7 +4,7 @@ import { Component, Input } from '@angular/core';
   selector: 'app-list-item',
   templateUrl: './list-item.component.html',
   styleUrls: ['./list-item.component.scss'],
-  /* tslint:disable-next-line:use-input-property-decorator */
+  /* tslint:disable-next-line:no-inputs-metadata-property */
   inputs: ['detailUrl']
 })
 export class ListItemComponent {
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.ts
index 21a30ec988..9702102959 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.ts
@@ -4,7 +4,7 @@ import { Component } from '@angular/core';
   selector: 'app-loader',
   templateUrl: './loader.component.html',
   styleUrls: ['./loader.component.scss'],
-  /* tslint:disable-next-line:use-input-property-decorator */
+  /* tslint:disable-next-line:no-inputs-metadata-property */
   inputs: ['loading']
 })
 export class LoaderComponent {
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.ts
index debf1260bf..957bcd01c1 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.ts
@@ -4,7 +4,7 @@ import { Component } from '@angular/core';
   selector: 'app-panel',
   templateUrl: './panel.component.html',
   styleUrls: ['./panel.component.scss'],
-  /* tslint:disable-next-line:use-input-property-decorator */
+  /* tslint:disable-next-line:no-inputs-metadata-property */
   inputs: ['title', 'background', 'container', 'border']
 })
 export class PanelComponent {
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
index b938cd119b..65a3d1b9b8 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
@@ -159,35 +159,7 @@ export class HelmEffects {
     })
   );
 
-  private makeRequest(
-    action: EntityRequestAction,
-    url: string,
-    mapResult: (response: any) => NormalizedResponse,
-    endpointIds: string[]
-  ): Observable<Action> {
-    this.store.dispatch(new StartRequestAction(action));
-    const requestArgs = {
-      headers: null,
-      params: null
-    };
-    return this.httpClient.get(url, requestArgs).pipe(
-      mergeMap((response: any) => [new WrapperRequestActionSuccess(mapResult(response), action)]),
-      catchError(error => {
-        const { status, message } = HelmEffects.createHelmError(error);
-        return [
-          new WrapperRequestActionFailed(message, action, 'fetch', {
-            endpointIds,
-            url: error.url || url,
-            eventCode: status,
-            message,
-            error
-          })
-        ];
-      })
-    );
-  }
-
-  static createHelmErrorMessage(err: any): string {
+  private static createHelmErrorMessage(err: any): string {
     if (err) {
       if (err.error && err.error.message) {
         // Kube error
@@ -203,7 +175,7 @@ export class HelmEffects {
     return 'Helm API request error';
   }
 
-  static createHelmError(err: any): { status: string, message: string } {
+  public static createHelmError(err: any): { status: string, message: string; } {
     let unwrapped = err;
     if (err.error) {
       unwrapped = err.error;
@@ -222,6 +194,34 @@ export class HelmEffects {
     };
   }
 
+  private makeRequest(
+    action: EntityRequestAction,
+    url: string,
+    mapResult: (response: any) => NormalizedResponse,
+    endpointIds: string[]
+  ): Observable<Action> {
+    this.store.dispatch(new StartRequestAction(action));
+    const requestArgs = {
+      headers: null,
+      params: null
+    };
+    return this.httpClient.get(url, requestArgs).pipe(
+      mergeMap((response: any) => [new WrapperRequestActionSuccess(mapResult(response), action)]),
+      catchError(error => {
+        const { status, message } = HelmEffects.createHelmError(error);
+        return [
+          new WrapperRequestActionFailed(message, action, 'fetch', {
+            endpointIds,
+            url: error.url || url,
+            eventCode: status,
+            message,
+            error
+          })
+        ];
+      })
+    );
+  }
+
   private checkSyncStatus() {
     // Dispatch request
     const url = `/pp/${this.proxyAPIVersion}/chartrepos/status`;
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts
index de5d80f1c7..7a0f02b017 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts
@@ -16,7 +16,7 @@ import { AppState } from '../../../../../../store/src/app-state';
 import { KubeConfigHelper } from '../kube-config.helper';
 import { KubeConfigFileCluster } from '../kube-config.types';
 import { KubeConfigTableCertComponent } from './kube-config-table-cert/kube-config-table-cert.component';
-import { KubeConfigTableName } from './kube-config-table-name/kube-config-table-name.component';
+import { KubeConfigTableNameComponent } from './kube-config-table-name/kube-config-table-name.component';
 import { KubeConfigTableSelectComponent } from './kube-config-table-select/kube-config-table-select.component';
 import {
   KubeConfigTableSubTypeSelectComponent,
@@ -50,7 +50,7 @@ export class KubeConfigSelectionComponent {
     selectAllChecked: false,
     selectAllFilteredRows: () => {
       // Should always go to true from indeterminate
-      this.dataSource.selectAllChecked = this.dataSource.selectAllIndeterminate ? true : !this.dataSource.selectAllChecked
+      this.dataSource.selectAllChecked = this.dataSource.selectAllIndeterminate ? true : !this.dataSource.selectAllChecked;
       this.dataSource.selectAllIndeterminate = false; // either all off or all on, cannot be indeterminate
 
       this.helper.clusters$.pipe(
@@ -65,7 +65,7 @@ export class KubeConfigSelectionComponent {
         first(),
       ).subscribe(clusters => {
         this.checkCanGoNext(clusters);
-      })
+      });
     },
     editRow: null,
     editRowName: null,
@@ -95,7 +95,7 @@ export class KubeConfigSelectionComponent {
     },
     {
       columnId: 'name', headerCell: () => 'Name',
-      cellComponent: KubeConfigTableName,
+      cellComponent: KubeConfigTableNameComponent,
       cellFlex: '3',
       class: 'app-table__cell--table-no-v-padding'
     },
@@ -135,7 +135,7 @@ export class KubeConfigSelectionComponent {
     public helper: KubeConfigHelper,
     private snackbarService: SnackBarService
   ) {
-    this.helper.clustersChanged = () => this.clustersChanged()
+    this.helper.clustersChanged = () => this.clustersChanged();
   }
 
   // Save data for the next step to know the list of clusters to import
@@ -145,15 +145,15 @@ export class KubeConfigSelectionComponent {
       success: true,
       data: clusters
     }))
-  )
+  );
 
   clustersParse(cluster: string) {
     this.snackbarService.hide();
     this.helper.parse(cluster).pipe(first()).subscribe(errorString => {
       if (errorString) {
-        this.snackbarService.show(`Failed to load Kube Config: ${errorString}`, 'Close')
+        this.snackbarService.show(`Failed to load Kube Config: ${errorString}`, 'Close');
       }
-    })
+    });
   }
 
   onEnter = () => {
@@ -161,8 +161,8 @@ export class KubeConfigSelectionComponent {
       return;
     }
     // Handle back from review step (ensure newly registered endpoints are taken into account)
-    this.helper.updateAll().pipe(first()).subscribe(() => { })
-  }
+    this.helper.updateAll().pipe(first()).subscribe(() => { });
+  };
 
   // Row changed event - update the next button and selection state
   clustersChanged() {
@@ -187,7 +187,7 @@ export class KubeConfigSelectionComponent {
       } else {
         this.dataSource.selectAllIndeterminate = true;
       }
-    })
+    });
 
   }
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts
index 4e4f7f59c7..bd6516944d 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts
@@ -5,28 +5,28 @@ import {
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
 import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
 import { KubeConfigFileCluster } from '../../kube-config.types';
-import { KubeConfigTableName } from './kube-config-table-name.component';
+import { KubeConfigTableNameComponent } from './kube-config-table-name.component';
 
 describe('KubeConfigTableName', () => {
-  let component: KubeConfigTableName;
-  let fixture: ComponentFixture<KubeConfigTableName>;
+  let component: KubeConfigTableNameComponent;
+  let fixture: ComponentFixture<KubeConfigTableNameComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
         ...KubernetesBaseTestModules
       ],
-      declarations: [KubeConfigTableName]
+      declarations: [KubeConfigTableNameComponent]
     })
       .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(KubeConfigTableName);
+    fixture = TestBed.createComponent(KubeConfigTableNameComponent);
     component = fixture.componentInstance;
     component.dataSource = {
-      getRowUniqueId: (row) => ""
-    } as IListDataSource<KubeConfigFileCluster>
+      getRowUniqueId: (row) => ''
+    } as IListDataSource<KubeConfigFileCluster>;
     fixture.detectChanges();
   });
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts
index 2b5420071c..8e3fe8c827 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts
@@ -8,4 +8,4 @@ import { KubeConfigFileCluster } from '../../kube-config.types';
   templateUrl: './kube-config-table-name.component.html',
   styleUrls: ['./kube-config-table-name.component.scss']
 })
-export class KubeConfigTableName extends TableCellCustom<KubeConfigFileCluster> { }
+export class KubeConfigTableNameComponent extends TableCellCustom<KubeConfigFileCluster> { }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.types.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.types.ts
index 41cbb80198..0a34ee0611 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.types.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.types.ts
@@ -35,7 +35,7 @@ export interface KubeConfigFileCluster {
   _subType?: string;
   // additional info is required in order to connect, hints at register only, though is specific due to warning message
   _additionalUserInfo: boolean;
-  // unique identifier 
+  // unique identifier
   _id: string;
 }
 
@@ -51,7 +51,7 @@ export interface KubeConfigFileUserDetail {
   'client-certificate-data'?: string;
   'client-key-data'?: string;
   token?: string;
-  exec?: any
+  exec?: any;
   username?: string;
   password?: string;
 }
@@ -100,5 +100,5 @@ export interface EndpointConfig {
 export interface KubeConfigImportAuthConfig {
   subType: string;
   authType: string;
-  values: { [key: string]: string };
+  values: { [key: string]: string, };
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts
index 814f8a3e1f..0e526b8aeb 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts
@@ -71,7 +71,7 @@ const enum KubeEndpointAuthTypes {
   GKE = 'gke-auth',
 }
 
-const kubeAuthTypeMap: { [type: string]: EndpointAuthTypeConfig } = {
+const kubeAuthTypeMap: { [type: string]: EndpointAuthTypeConfig, } = {
   [KubeEndpointAuthTypes.CERT_AUTH]: {
     value: KubeEndpointAuthTypes.CERT_AUTH,
     name: 'Kubernetes Cert Auth',
@@ -132,7 +132,11 @@ export function generateKubernetesEntities(): StratosBaseCatalogEntity[] {
     iconFont: 'stratos-icons',
     logoUrl: '/core/assets/custom/kubernetes.svg',
     urlValidation: undefined,
-    authTypes: [kubeAuthTypeMap[KubeEndpointAuthTypes.CERT_AUTH], kubeAuthTypeMap[KubeEndpointAuthTypes.CONFIG], BaseEndpointAuth.UsernamePassword],
+    authTypes: [
+      kubeAuthTypeMap[KubeEndpointAuthTypes.CERT_AUTH],
+      kubeAuthTypeMap[KubeEndpointAuthTypes.CONFIG],
+      BaseEndpointAuth.UsernamePassword
+    ],
     renderPriority: 4,
     subTypes: [
       {
@@ -209,7 +213,8 @@ function generateStatefulSetsEntity(endpointDefinition: StratosEndpointExtension
     schema: kubernetesEntityFactory(kubernetesStatefulSetsEntityType),
     endpoint: endpointDefinition
   };
-  kubeEntityCatalog.statefulSet = new StratosCatalogEntity<IFavoriteMetadata, KubernetesStatefulSet, KubeStatefulSetsActionBuilders>(definition, {
+  kubeEntityCatalog.statefulSet = new StratosCatalogEntity<IFavoriteMetadata, KubernetesStatefulSet, KubeStatefulSetsActionBuilders>(
+    definition, {
     actionBuilders: kubeStatefulSetsActionBuilders
   });
   return kubeEntityCatalog.statefulSet;
@@ -233,7 +238,8 @@ function generateDeploymentsEntity(endpointDefinition: StratosEndpointExtensionD
     schema: kubernetesEntityFactory(kubernetesDeploymentsEntityType),
     endpoint: endpointDefinition
   };
-  kubeEntityCatalog.deployment = new StratosCatalogEntity<IFavoriteMetadata, KubernetesDeployment, KubeDeploymentActionBuilders>(definition, {
+  kubeEntityCatalog.deployment = new StratosCatalogEntity<IFavoriteMetadata, KubernetesDeployment, KubeDeploymentActionBuilders>(
+    definition, {
     actionBuilders: kubeDeploymentActionBuilders
   });
   return kubeEntityCatalog.deployment;
@@ -296,7 +302,7 @@ function generateAnalysisReportsEntity(endpointDefinition: StratosEndpointExtens
   kubeEntityCatalog.analysisReport = new StratosCatalogEntity<undefined, any, AnalysisReportsActionBuilders>(definition, {
     actionBuilders: analysisReportsActionBuilders
   });
-  return kubeEntityCatalog.analysisReport
+  return kubeEntityCatalog.analysisReport;
 }
 
 function generateMetricEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
index 4672958d66..ded7309f19 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
@@ -20,8 +20,8 @@ interface KubernetesResourceViewerResource {
   jsonView: KubeAPIResource;
   age: string;
   creationTimestamp: string;
-  labels: { name: string, value: string }[];
-  annotations: { name: string, value: string }[];
+  labels: { name: string, value: string, }[];
+  annotations: { name: string, value: string, }[];
   kind: string;
   apiVersion: string;
 }
@@ -66,6 +66,7 @@ export class KubernetesResourceViewerComponent implements PreviewableComponent {
 
         resource.jsonView = newItem;
 
+        /* tslint:disable-next-line:no-string-literal  */
         const fallback = item['_metadata'] || {};
 
         const ts = item.metadata ? item.metadata.creationTimestamp : fallback.creationTimestamp;
@@ -92,7 +93,9 @@ export class KubernetesResourceViewerComponent implements PreviewableComponent {
           });
         }
 
+        /* tslint:disable-next-line:no-string-literal  */
         resource.kind = item['kind'] || fallback.kind || props.resourceKind;
+        /* tslint:disable-next-line:no-string-literal  */
         resource.apiVersion = item['apiVersion'] || fallback.apiVersion || this.getVersionFromSelfLink(item.metadata['selfLink']);
 
         // Apply analysis if there is one - if this is a k8s resource (i.e. not a container)
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.setup.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.setup.module.ts
index 88d75af289..f064cb04e2 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.setup.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.setup.module.ts
@@ -26,7 +26,7 @@ import {
   KubeConfigTableCertComponent,
 } from './kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component';
 import {
-  KubeConfigTableName,
+  KubeConfigTableNameComponent,
 } from './kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component';
 import {
   KubeConfigTableSelectComponent,
@@ -64,7 +64,7 @@ import { KubernetesEndpointService } from './services/kubernetes-endpoint.servic
     KubeConfigTableUserSelectComponent,
     KubeConfigTableImportStatusComponent,
     KubeConfigTableSubTypeSelectComponent,
-    KubeConfigTableName,
+    KubeConfigTableNameComponent,
     KubeConfigTableCertComponent
   ],
   providers: [
@@ -81,7 +81,7 @@ import { KubernetesEndpointService } from './services/kubernetes-endpoint.servic
     KubeConfigTableUserSelectComponent,
     KubeConfigTableImportStatusComponent,
     KubeConfigTableSubTypeSelectComponent,
-    KubeConfigTableName,
+    KubeConfigTableNameComponent,
     KubeConfigTableCertComponent
   ]
 })
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-reports-list-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-reports-list-source.ts
index 6ccd5e3d98..d2f9330a3f 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-reports-list-source.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-reports-list-source.ts
@@ -10,7 +10,7 @@ import { AppState } from '../../../../../store/src/app-state';
 import { isFetchingPage } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { kubeEntityCatalog } from '../kubernetes-entity-catalog';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
-import { GetAnalysisReports } from '../store/anaylsis.actions';
+import { GetAnalysisReports } from '../store/analysis.actions';
 import { AnalysisReport } from '../store/kube.types';
 
 export class AnalysisReportsDataSource extends ListDataSource<AnalysisReport> {
@@ -52,12 +52,12 @@ export class AnalysisReportsDataSource extends ListDataSource<AnalysisReport> {
     kubeEntityCatalog.analysisReport.store.getPaginationMonitor(this.analysisAction.kubeGuid).pagination$.pipe(
       first(),
       map(isFetchingPage)
-    ).subscribe(isFetchingPage => {
-      if (!isFetchingPage) {
+    ).subscribe(isFetchingPageRes => {
+      if (!isFetchingPageRes) {
         ngZone.run(() => {
           store.dispatch(this.analysisAction);
         });
       }
-    })
+    });
   }
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts
index f01ff1652c..7f349cd24a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts
@@ -1,3 +1,4 @@
+/* tslint:disable:max-line-length */
 import { TitleCasePipe } from '@angular/common';
 import { Component, Input } from '@angular/core';
 import * as moment from 'moment';
@@ -14,6 +15,8 @@ import { CardCell } from '../../../../../../../core/src/shared/components/list/l
 import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog';
 import { Container, ContainerState, ContainerStatus, InitContainer, KubernetesPod } from '../../../store/kube.types';
 
+/* tslint:enable:max-line-length */
+
 export interface ContainerForTable {
   isInit: boolean;
   container: Container | InitContainer;
@@ -45,6 +48,13 @@ export class KubernetesPodContainersComponent extends CardCell<KubernetesPod> {
     }
   };
 
+  public readyBoolConfig: TableCellBooleanIndicatorComponentConfig<ContainerForTable> = {
+    isEnabled: (row: ContainerForTable) => row.containerStatus.ready,
+    type: BooleanIndicatorType.yesNo,
+    subtle: false,
+    showText: false
+  };
+
   @Input()
   set row(row: KubernetesPod) {
     if (!row || !!this.containers$) {
@@ -92,13 +102,6 @@ export class KubernetesPodContainersComponent extends CardCell<KubernetesPod> {
     return containerStatusWithContainers.sort((a, b) => a.container.name.localeCompare(b.container.name));
   }
 
-  public readyBoolConfig: TableCellBooleanIndicatorComponentConfig<ContainerForTable> = {
-    isEnabled: (row: ContainerForTable) => row.containerStatus.ready,
-    type: BooleanIndicatorType.yesNo,
-    subtle: false,
-    showText: false
-  };
-
   private containerStatusToString(state: string, status: ContainerState): string {
     const exitCode = status.exitCode ? `:${status.exitCode}` : '';
     const signal = status.signal ? `:${status.signal}` : '';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes.analysis.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes.analysis.service.ts
index 14749dc1c8..a5589d99b6 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes.analysis.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes.analysis.service.ts
@@ -9,7 +9,7 @@ import { ResetPaginationOfType } from '../../../../../store/src/actions/paginati
 import { AppState } from '../../../../../store/src/app-state';
 import { ListActionState, RequestInfoState } from '../../../../../store/src/reducers/api-request-reducer/types';
 import { kubeEntityCatalog } from '../kubernetes-entity-catalog';
-import { GetAnalysisReports } from '../store/anaylsis.actions';
+import { GetAnalysisReports } from '../store/analysis.actions';
 import { AnalysisReport } from '../store/kube.types';
 import { getHelmReleaseDetailsFromGuid } from '../workloads/store/workloads-entity-factory';
 import { KubernetesEndpointService } from './kubernetes-endpoint.service';
@@ -50,7 +50,7 @@ export class KubernetesAnalysisService {
     this.hideAnalysis$ = this.enabled$.pipe(
       map(enabled => !enabled),
       startWith(true),
-    )
+    );
 
     const allEngines = {
       popeye:
@@ -100,10 +100,10 @@ export class KubernetesAnalysisService {
       })
     );
 
-    this.action = kubeEntityCatalog.analysisReport.actions.getMultiple(this.kubeGuid)
+    this.action = kubeEntityCatalog.analysisReport.actions.getMultiple(this.kubeGuid);
   }
 
-  public delete(endpointID: string, item: { id: string }) {
+  public delete(endpointID: string, item: { id: string, }) {
     return kubeEntityCatalog.analysisReport.api.delete(endpointID, item.id);
   }
 
@@ -117,7 +117,7 @@ export class KubernetesAnalysisService {
       filter(([oldE, newE]) => oldE.creating && !newE.creating),
       map(([, newE]) => newE),
       first()
-    )
+    );
     obs$.subscribe(() => {
       const type = id.charAt(0).toUpperCase() + id.substring(1);
       let msg;
@@ -136,7 +136,7 @@ export class KubernetesAnalysisService {
 
   public getByID(endpoint: string, id: string, refresh = false): Observable<AnalysisReport> {
     if (refresh) {
-      kubeEntityCatalog.analysisReport.api.getById<RequestInfoState>(endpoint, id)
+      kubeEntityCatalog.analysisReport.api.getById<RequestInfoState>(endpoint, id);
     }
 
     const entityService = kubeEntityCatalog.analysisReport.store.getById.getEntityService(endpoint, id);
@@ -154,7 +154,7 @@ export class KubernetesAnalysisService {
 
   public getByPath(endpointID: string, path: string, refresh = false): Observable<AnalysisReport[]> {
     if (refresh) {
-      kubeEntityCatalog.analysisReport.api.getByPath<ListActionState>(endpointID, path)
+      kubeEntityCatalog.analysisReport.api.getByPath<ListActionState>(endpointID, path);
     }
     return kubeEntityCatalog.analysisReport.store.getByPath.getPaginationService(endpointID, path).entities$.pipe(
       filter(entities => !!entities)
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/route.helper.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/route.helper.ts
index ccbb8f7bc1..847fa6dd84 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/route.helper.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/route.helper.ts
@@ -5,7 +5,7 @@ export function getParentURL(route: ActivatedRoute, removeLastParts = 1): string
     const p = v.url.join('/');
     return p.length > 0 ? `${a}/${p}` : a;
   };
-  let res = route.snapshot.pathFromRoot.reduce(reducer, '').split('/');
+  const res = route.snapshot.pathFromRoot.reduce(reducer, '').split('/');
   res.splice(-removeLastParts, removeLastParts);
   return res.join('/');
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/action-builders/kube.action-builders.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/action-builders/kube.action-builders.ts
index 362c418497..22d30c7c9b 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/action-builders/kube.action-builders.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/action-builders/kube.action-builders.ts
@@ -8,7 +8,7 @@ import {
   GetAnalysisReports,
   GetAnalysisReportsByPath,
   RunAnalysisReport,
-} from '../anaylsis.actions';
+} from '../analysis.actions';
 import {
   CreateKubernetesNamespace,
   GeKubernetesDeployments,
@@ -31,35 +31,35 @@ export interface KubeStatefulSetsActionBuilders extends OrchestratedActionBuilde
   getMultiple: (
     kubeGuid: string,
     paginationKey?: string,
-  ) => GetKubernetesStatefulSets
+  ) => GetKubernetesStatefulSets;
 }
 
 export const kubeStatefulSetsActionBuilders: KubeStatefulSetsActionBuilders = {
   getMultiple: (kubeGuid: string, paginationKey?: string) => new GetKubernetesStatefulSets(kubeGuid)
-}
+};
 
 export interface KubePodActionBuilders extends OrchestratedActionBuilders {
   get: (
     podName: string,
     kubeGuid: string,
-    extraArgs: { namespace: string }
+    extraArgs: { namespace: string; }
   ) => GetKubernetesPod,
   getMultiple: (
     kubeGuid: string,
     paginationKey?: string,
-  ) => GetKubernetesPods
+  ) => GetKubernetesPods;
   getOnNode: (
     kubeGuid: string,
     nodeName: string
-  ) => GetKubernetesPodsOnNode
+  ) => GetKubernetesPodsOnNode;
   getInNamespace: (
     kubeGuid: string,
     namespace: string
-  ) => GetKubernetesPodsInNamespace
+  ) => GetKubernetesPodsInNamespace;
   getInWorkload: (
     kubeGuid: string,
     releaseTitle: string
-  ) => GetHelmReleasePods
+  ) => GetHelmReleasePods;
 }
 
 export const kubePodActionBuilders: KubePodActionBuilders = {
@@ -68,28 +68,28 @@ export const kubePodActionBuilders: KubePodActionBuilders = {
   getOnNode: (kubeGuid: string, nodeName: string) => new GetKubernetesPodsOnNode(kubeGuid, nodeName),
   getInNamespace: (kubeGuid: string, namespace: string) => new GetKubernetesPodsInNamespace(kubeGuid, namespace),
   getInWorkload: (kubeGuid: string, releaseTitle: string) => new GetHelmReleasePods(kubeGuid, releaseTitle)
-}
+};
 
 export interface KubeDeploymentActionBuilders extends OrchestratedActionBuilders {
   getMultiple: (
     kubeGuid: string,
     paginationKey?: string,
-  ) => GeKubernetesDeployments
+  ) => GeKubernetesDeployments;
 }
 
 export const kubeDeploymentActionBuilders: KubeDeploymentActionBuilders = {
   getMultiple: (kubeGuid: string, paginationKey?: string) => new GeKubernetesDeployments(kubeGuid)
-}
+};
 
 export interface KubeNodeActionBuilders extends OrchestratedActionBuilders {
   get: (
     nodeName: string,
     kubeGuid: string
-  ) => GetKubernetesNode
+  ) => GetKubernetesNode;
   getMultiple: (
     kubeGuid: string,
     paginationKey?: string,
-  ) => GetKubernetesNodes
+  ) => GetKubernetesNodes;
   healthCheck: (
     kubeGuid: string,
   ) => KubeHealthCheck;
@@ -99,7 +99,7 @@ export const kubeNodeActionBuilders: KubeNodeActionBuilders = {
   get: (nodeName: string, endpointGuid: string) => new GetKubernetesNode(nodeName, endpointGuid),
   getMultiple: (kubeGuid: string, paginationKey?: string) => new GetKubernetesNodes(kubeGuid),
   healthCheck: (kubeGuid: string) => new KubeHealthCheck(kubeGuid)
-}
+};
 
 export interface KubeNamespaceActionBuilders extends OrchestratedActionBuilders {
   get: (
@@ -113,35 +113,35 @@ export interface KubeNamespaceActionBuilders extends OrchestratedActionBuilders
   getMultiple: (
     kubeGuid: string,
     paginationKey?: string,
-  ) => GetKubernetesNamespaces
+  ) => GetKubernetesNamespaces;
 }
 
 export const kubeNamespaceActionBuilders: KubeNamespaceActionBuilders = {
   get: (namespace: string, kubeGuid: string) => new GetKubernetesNamespace(namespace, kubeGuid),
   create: (namespace: string, kubeGuid: string) => new CreateKubernetesNamespace(namespace, kubeGuid),
   getMultiple: (kubeGuid: string, paginationKey?: string) => new GetKubernetesNamespaces(kubeGuid)
-}
+};
 
 export interface KubeServiceActionBuilders extends OrchestratedActionBuilders {
   getMultiple: (
     kubeGuid: string,
     paginationKey?: string
-  ) => GetKubernetesServices
+  ) => GetKubernetesServices;
   getInNamespace: (
     namespace: string,
     kubeGuid: string
-  ) => GetKubernetesServicesInNamespace
+  ) => GetKubernetesServicesInNamespace;
   getInWorkload: (
     releaseTitle: string,
     kubeGuid: string
-  ) => GetHelmReleaseServices
+  ) => GetHelmReleaseServices;
 }
 
 export const kubeServiceActionBuilders: KubeServiceActionBuilders = {
   getMultiple: (kubeGuid: string, paginationKey?: string) => new GetKubernetesServices(kubeGuid),
   getInNamespace: (namespace: string, kubeGuid: string) => new GetKubernetesServicesInNamespace(kubeGuid, namespace),
   getInWorkload: (releaseTitle: string, kubeGuid: string) => new GetHelmReleaseServices(kubeGuid, releaseTitle)
-}
+};
 
 export interface KubeDashboardActionBuilders extends OrchestratedActionBuilders {
   get: (
@@ -151,7 +151,7 @@ export interface KubeDashboardActionBuilders extends OrchestratedActionBuilders
 
 export const kubeDashboardActionBuilders: KubeDashboardActionBuilders = {
   get: (kubeGuid: string) => new GetKubernetesDashboard(kubeGuid)
-}
+};
 
 export interface AnalysisReportsActionBuilders extends OrchestratedActionBuilders {
   getMultiple: (
@@ -183,4 +183,4 @@ export const analysisReportsActionBuilders: AnalysisReportsActionBuilders = {
   getByPath: (kubeGuid: string, path: string) => new GetAnalysisReportsByPath(kubeGuid, path),
   delete: (kubeGuid: string, id: string) => new DeleteAnalysisReport(kubeGuid, id),
   run: (kubeGuid: string, id: string, namespace?: string, app?: string) => new RunAnalysisReport(kubeGuid, id, namespace, app)
-}
+};
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/anaylsis.actions.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/analysis.actions.ts
similarity index 97%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/store/anaylsis.actions.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/store/analysis.actions.ts
index e9da8d7a27..5748da68f3 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/anaylsis.actions.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/analysis.actions.ts
@@ -31,12 +31,12 @@ abstract class AnalysisSingleEntityAction extends AnalysisAction implements Kube
 }
 
 
-/** 
+/**
  * Get the analysis reports for the given endpoint ID
  */
 export class GetAnalysisReports extends AnalysisPaginationAction {
   constructor(public kubeGuid: string) {
-    super(kubeGuid, GET_ANALYSIS_REPORTS_TYPES, kubeGuid)
+    super(kubeGuid, GET_ANALYSIS_REPORTS_TYPES, kubeGuid);
   }
   initialParams = {
     'order-direction': 'asc',
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/analysis.effects.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/analysis.effects.ts
index 4f8a7d24c2..24ab4ea499 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/analysis.effects.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/analysis.effects.ts
@@ -27,7 +27,7 @@ import {
   GetAnalysisReportsByPath,
   RUN_ANALYSIS_REPORT_TYPES,
   RunAnalysisReport,
-} from './anaylsis.actions';
+} from './analysis.actions';
 import { AnalysisReport } from './kube.types';
 
 @Injectable()
@@ -143,7 +143,7 @@ export class AnalysisEffects {
             const guid = schema.getId(report);
             res.entities[entityKey][guid] = report;
             res.result.push(guid);
-          })
+          });
           return [new WrapperRequestActionSuccess(res, action)];
         }),
         catchError(error => [
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-socket-service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-socket-service.ts
index cb2eb017b2..4147fe3e0e 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-socket-service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-socket-service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, OnDestroy } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Subject, Subscription } from 'rxjs';
 import makeWebSocketObservable, { GetWebSocketResponses } from 'rxjs-websockets';
@@ -24,14 +24,15 @@ enum SocketEventTypes {
 }
 
 interface SocketMessage {
-  type: SocketEventTypes
+  type: SocketEventTypes;
 }
 
 @Injectable()
-export class HelmReleaseSocketService {
+export class HelmReleaseSocketService implements OnDestroy {
 
   private sub: Subscription;
   private sendToSocket = new Subject<any>();
+  public isPaused = false;
 
   constructor(
     private helmReleaseHelper: HelmReleaseHelperService,
@@ -133,16 +134,16 @@ export class HelmReleaseSocketService {
 
   public stop() {
     if (this.sub) {
-      this.sub.unsubscribe()
+      this.sub.unsubscribe();
       this.sub = null;
     }
   }
 
   public enable(enable: boolean) {
     if (enable) {
-      this.start()
+      this.start();
     } else {
-      this.stop()
+      this.stop();
     }
   }
 
@@ -151,17 +152,15 @@ export class HelmReleaseSocketService {
   }
 
   public pause(pause: boolean) {
-    if (pause != this.isPaused) {
+    if (pause !== this.isPaused) {
       const message: SocketMessage = {
         type: pause ? SocketEventTypes.PAUSE_TRUE : SocketEventTypes.PAUSE_FALSE
-      }
+      };
       this.sendToSocket.next(JSON.stringify(message));
       this.isPaused = pause;
     }
   }
 
-  public isPaused = false;
-
   ngOnDestroy() {
     this.sub.unsubscribe();
     this.snackbarService.hide();
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/icon-helper.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/icon-helper.ts
index 1bfb949f64..7029707587 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/icon-helper.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/icon-helper.ts
@@ -1,12 +1,3 @@
-export function getIcon(kind: string) {
-  const rkind = kind || 'Pod';
-  if (iconMappings[rkind]) {
-    return iconMappings[rkind];
-  } else {
-    return iconMappings.default;
-  }
-}
-
 const iconMappings = {
   Namespace: {
     name: 'namespace',
@@ -83,4 +74,13 @@ const iconMappings = {
     name: 'collocation',
     font: 'stratos-icons'
   }
-};
\ No newline at end of file
+};
+
+export function getIcon(kind: string) {
+  const rkind = kind || 'Pod';
+  if (iconMappings[rkind]) {
+    return iconMappings[rkind];
+  } else {
+    return iconMappings.default;
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.ts
index beb9436e4c..5986c0df78 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.ts
@@ -25,7 +25,7 @@ export class HelmReleaseAnalysisTabComponent {
     public helmReleaseHelper: HelmReleaseHelperService
   ) {
     this.path = `${this.helmReleaseHelper.namespace}/${this.helmReleaseHelper.releaseTitle}`;
-   }
+  }
 
   public analysisChanged(report) {
     if (report.id !== this.currentReport) {
@@ -34,9 +34,8 @@ export class HelmReleaseAnalysisTabComponent {
     }
   }
 
-
   public onReportCount(count: number) {
     this.noReportsAvailable = count === 0;
-  }  
+  }
 
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
index 13b0507c23..fae00ae737 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
@@ -71,7 +71,7 @@ export class HelmReleaseHelperService {
 
   public fetchReleaseResources(): Observable<HelmReleaseResources> {
     // Get helm release
-    const action = workloadsEntityCatalog.resource.actions.get(this.releaseTitle, this.endpointGuid)
+    const action = workloadsEntityCatalog.resource.actions.get(this.releaseTitle, this.endpointGuid);
     return workloadsEntityCatalog.resource.store.getEntityMonitor(
       action.guid
     ).entity$.pipe(
@@ -90,7 +90,7 @@ export class HelmReleaseHelperService {
   }
 
   private mapPods(pods: KubernetesPod[]): HelmReleaseChartData {
-    const podPhases: { [phase: string]: number } = {};
+    const podPhases: { [phase: string]: number, } = {};
     const containers = {
       ready: {
         name: 'Ready',
@@ -132,6 +132,7 @@ export class HelmReleaseHelperService {
     };
   }
 
+  // tslint:disable-next-line:ban-types
   private isContainerReady(state: ContainerStateCollection = {}): Boolean {
     if (state.running) {
       return true;
@@ -139,7 +140,7 @@ export class HelmReleaseHelperService {
       return false;
     } else if (!!state.terminated) {
       // Assume a failed state is not ready (covers completed init states), discard success state
-      return state.terminated.exitCode === 0 ? null : false
+      return state.terminated.exitCode === 0 ? null : false;
     }
     return false;
   }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
index 99235522c1..c6774f7980 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
@@ -32,13 +32,13 @@ const layouts = [
 ];
 
 interface CustomHelmReleaseGraphNode extends Omit<HelmReleaseGraphNode, 'data'> {
-  data: CustomHelmReleaseGraphNodeData
+  data: CustomHelmReleaseGraphNodeData;
 }
 
 interface CustomHelmReleaseGraphNode {
   id: string;
   label: string;
-  data: CustomHelmReleaseGraphNodeData
+  data: CustomHelmReleaseGraphNodeData;
 }
 
 interface CustomHelmReleaseGraphNodeData extends HelmReleaseGraphNodeData {
@@ -48,7 +48,7 @@ interface CustomHelmReleaseGraphNodeData extends HelmReleaseGraphNodeData {
   text: string,
   icon: any,
   alerts: [],
-  alertSummary: {}
+  alertSummary: {};
 }
 
 @Component({
@@ -115,14 +115,14 @@ export class HelmReleaseResourceGraphComponent implements OnInit, OnDestroy {
             dash: missing ? 6 : 0,
             fill: colors.bg,
             text: colors.fg,
-            icon: icon,
+            icon,
             alerts: null,
             alertSummary: {}
           },
         };
 
         // Does this node have any alerts?
-        this.applyAlertToNode(newNode, report)
+        this.applyAlertToNode(newNode, report);
 
         newNodes.push(newNode);
       });
@@ -200,7 +200,7 @@ export class HelmReleaseResourceGraphComponent implements OnInit, OnDestroy {
         },
         this.componentFactoryResolver
       );
-    })
+    });
 
   }
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-factory.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-factory.ts
index 9605546f9d..c1f3dd65bc 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-factory.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-factory.ts
@@ -15,17 +15,19 @@ export const getHelmReleaseDetailsFromGuid = (guid: string) => {
     endpointId: parts[0],
     namespace: parts[1],
     releaseTitle: parts[2]
-  }
-}
-export const getHelmReleaseId = (endpointId: string, namespace: string, name: string) => `${endpointId}${separator}${namespace}${separator}${name}`;
+  };
+};
+export const getHelmReleaseId = (endpointId: string, namespace: string, name: string) =>
+  `${endpointId}${separator}${namespace}${separator}${name}`;
 export const getHelmReleaseIdByObj = (entity: HelmRelease) => getHelmReleaseId(entity.endpointId, entity.namespace, entity.name);
 export const getHelmReleaseGraphId = (endpointId: string, releaseTitle: string) => `${endpointId}${separator}${releaseTitle}`;
 export const getHelmReleaseGraphIdByObj = (entity: HelmReleaseGraph) => getHelmReleaseGraphId(entity.endpointId, entity.releaseTitle);
 export const getHelmReleaseResourceId = (endpointId: string, releaseTitle: string) => `${endpointId}${separator}${releaseTitle}`;
-export const getHelmReleaseResourceIdByObj = (entity: HelmReleaseResources) => getHelmReleaseResourceId(entity.endpointId, entity.releaseTitle);
+export const getHelmReleaseResourceIdByObj = (entity: HelmReleaseResources) =>
+  getHelmReleaseResourceId(entity.endpointId, entity.releaseTitle);
 
 const entityCache: {
-  [key: string]: EntitySchema
+  [key: string]: EntitySchema,
 } = {};
 
 entityCache[helmReleaseEntityKey] = new KubernetesEntitySchema(
@@ -48,6 +50,6 @@ entityCache[helmReleaseResourceEntityType] = new KubernetesEntitySchema(
 
 Object.entries(entityCache).forEach(([key, workloadSchema]) => addKubernetesEntitySchema(key, workloadSchema));
 
-export const createHelmReleaseEntities = (): { [cacheName: string]: EntitySchema } => {
+export const createHelmReleaseEntities = (): { [cacheName: string]: EntitySchema; } => {
   return entityCache;
 };
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.ts b/src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.ts
index dc04e71d03..fb15002a6d 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.ts
@@ -5,4 +5,4 @@ import { Component } from '@angular/core';
   templateUrl: './suse-welcome.component.html',
   styleUrls: ['./suse-welcome.component.scss'],
 })
-export class SuseWelcomeComponent {}
+export class SuseWelcomeComponent { }
diff --git a/src/frontend/packages/suse-extensions/tslint.json b/src/frontend/packages/suse-extensions/tslint.json
new file mode 100644
index 0000000000..9da788b6cb
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../../../tslint.json"
+}
diff --git a/tslint.json b/tslint.json
index 3d9cb120dd..2b58369bbd 100644
--- a/tslint.json
+++ b/tslint.json
@@ -31,7 +31,6 @@
     "no-non-null-assertion": true,
     "no-redundant-jsdoc": true,
     "no-switch-case-fall-through": true,
-    "no-use-before-declare": true,
     "no-var-requires": false,
     "object-literal-key-quotes": [true, "as-needed"],
     "object-literal-sort-keys": false,

From 3d4829dbb1e9507a7b62b19a666281e9e030cf9c Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Thu, 10 Sep 2020 10:19:36 +0100
Subject: [PATCH 609/648] Filter endpoints by type (#434)

* Add endpoint type filter to endpoint page list
- Need to decide - always show filter or only when above certain number of endpoint types?
- Need to decide - show base enpdoints or endpoint with subtypes

* Changes to suse extensions

* Fix issue where endpoint list sort/filter was lost on unregister/disconnect/connect

* Changes following review
- only filter by type, ignore sub type
- only show filter if there are more than two types of endpoint registered

* Tidy up

* Changes following review, fix empty sort drop down on cf endpoints list
---
 .../cf-endpoints-list-config.service.ts       |  5 +-
 .../endpoint/base-endpoints-data-source.ts    | 57 +++++++++----
 .../endpoint/endpoints-data-source.ts         |  6 +-
 .../endpoint/endpoints-list-config.service.ts | 80 ++++++++++++++++++-
 .../components/list/list.component.html       |  3 +-
 .../components/list/list.component.types.ts   |  7 +-
 .../store/src/actions/pagination.actions.ts   |  7 +-
 ...agination-reducer-clear-pagination-type.ts | 13 ---
 .../pagination-reducer-create-pagination.ts   | 24 +++++-
 .../pagination-reducer-reset-pagination.ts    | 17 ++++
 .../pagination-reducer/pagination.reducer.ts  | 10 ++-
 ...onocular-repository-list-config.service.ts |  2 +-
 .../kubernetes-endpoints-data-source.ts       |  2 +-
 ...ubernetes-endpoints-list-config.service.ts |  4 +-
 14 files changed, 185 insertions(+), 52 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service.ts
index a72c7221e7..f38a7a0705 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service.ts
@@ -36,7 +36,7 @@ export class CFEndpointsListConfigService implements IListConfig<EndpointModel>
     paginationMonitorFactory: PaginationMonitorFactory,
     entityMonitorFactory: EntityMonitorFactory,
     internalEventMonitorFactory: InternalEventMonitorFactory,
-    endpointsListConfigService: EndpointsListConfigService
+    endpointsListConfigService: EndpointsListConfigService,
   ) {
     this.columns = endpointsListConfigService.columns.filter(column => {
       return column.columnId !== 'type';
@@ -46,7 +46,8 @@ export class CFEndpointsListConfigService implements IListConfig<EndpointModel>
       this,
       paginationMonitorFactory,
       entityMonitorFactory,
-      internalEventMonitorFactory);
+      internalEventMonitorFactory,
+    );
   }
   public getColumns = () => this.columns;
   public getGlobalActions = () => [];
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source.ts
index afacea4130..22f224cbe5 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source.ts
@@ -11,7 +11,8 @@ import { InternalEventMonitorFactory } from '../../../../../../../store/src/moni
 import { PaginationMonitorFactory } from '../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { endpointEntitiesSelector } from '../../../../../../../store/src/selectors/endpoint.selectors';
 import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
-import { ListDataSource } from '../../data-sources-controllers/list-data-source';
+import { PaginationEntityState } from '../../../../../../../store/src/types/pagination.types';
+import { DataFunction, DataFunctionDefinition, ListDataSource } from '../../data-sources-controllers/list-data-source';
 import { IListDataSourceConfig } from '../../data-sources-controllers/list-data-source-config';
 import { RowsState } from '../../data-sources-controllers/list-data-source-types';
 import { TableRowStateManager } from '../../list-table/table-row/table-row-state-manager';
@@ -27,11 +28,15 @@ export function syncPaginationSection(
   store.dispatch(new CreatePagination(
     action,
     paginationKey,
-    action.paginationKey
+    action.paginationKey,
+    action.initialParams
   ));
 }
 
 export class BaseEndpointsDataSource extends ListDataSource<EndpointModel> {
+
+  public static typeFilterKey = 'endpointType';
+
   store: Store<AppState>;
   /**
    * Used to distinguish between data sources providing all endpoints or those that only provide endpoints matching this value.
@@ -49,7 +54,8 @@ export class BaseEndpointsDataSource extends ListDataSource<EndpointModel> {
     paginationMonitorFactory: PaginationMonitorFactory,
     entityMonitorFactory: EntityMonitorFactory,
     internalEventMonitorFactory: InternalEventMonitorFactory,
-    onlyConnected = true
+    onlyConnected = true,
+    filterByType = false
   ) {
     const rowStateHelper = new ListRowSateHelper();
     const { rowStateManager, sub } = rowStateHelper.getRowStateManager(
@@ -73,21 +79,28 @@ export class BaseEndpointsDataSource extends ListDataSource<EndpointModel> {
       () => this.store.dispatch(action)
     );
 
+    const transformEntities: (DataFunctionDefinition | DataFunction<EndpointModel>)[] = [{
+      type: 'filter',
+      field: 'name'
+    }];
+    if (dsEndpointType || onlyConnected) {
+      transformEntities.push((entities: EndpointModel[]) => {
+        return dsEndpointType || onlyConnected ? entities.filter(endpoint => {
+          return (!onlyConnected || endpoint.connectionStatus === 'connected') &&
+            (!dsEndpointType || endpoint.cnsi_type === dsEndpointType);
+        }) : entities;
+      });
+    }
+    if (filterByType) {
+      transformEntities.push((entities: EndpointModel[], paginationState: PaginationEntityState) =>
+        BaseEndpointsDataSource.endpointTypeFilter(entities, paginationState)
+      );
+    }
+
     super({
       ...config,
       paginationKey: action.paginationKey,
-      transformEntities: [
-        (entities: EndpointModel[]) => {
-          return dsEndpointType || onlyConnected ? entities.filter(endpoint => {
-            return (!onlyConnected || endpoint.connectionStatus === 'connected') &&
-              (!dsEndpointType || endpoint.cnsi_type === dsEndpointType);
-          }) : entities;
-        },
-        {
-          type: 'filter',
-          field: 'name'
-        },
-      ],
+      transformEntities,
     });
     this.dsEndpointType = dsEndpointType;
   }
@@ -154,4 +167,18 @@ export class BaseEndpointsDataSource extends ListDataSource<EndpointModel> {
       })),
     ).subscribe();
   }
+
+  static endpointTypeFilter: DataFunction<EndpointModel> = (entities: EndpointModel[], paginationState: PaginationEntityState) => {
+    if (
+      !paginationState.clientPagination ||
+      !paginationState.clientPagination.filter ||
+      !paginationState.clientPagination.filter.items[BaseEndpointsDataSource.typeFilterKey]
+    ) {
+      return entities;
+    }
+    const searchTerm = paginationState.clientPagination.filter.items[BaseEndpointsDataSource.typeFilterKey];
+    return searchTerm ?
+      entities.filter(endpoint => endpoint.cnsi_type === searchTerm) :
+      entities;
+  };
 }
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 cdb066f099..8ae915ccf3 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
@@ -18,7 +18,8 @@ export class EndpointsDataSource extends BaseEndpointsDataSource {
     listConfig: IListConfig<EndpointModel>,
     paginationMonitorFactory: PaginationMonitorFactory,
     entityMonitorFactory: EntityMonitorFactory,
-    internalEventMonitorFactory: InternalEventMonitorFactory
+    internalEventMonitorFactory: InternalEventMonitorFactory,
+    filterByType = false
   ) {
     super(
       store,
@@ -28,7 +29,8 @@ export class EndpointsDataSource extends BaseEndpointsDataSource {
       paginationMonitorFactory,
       entityMonitorFactory,
       internalEventMonitorFactory,
-      false
+      false,
+      filterByType
     );
   }
 }
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 0f091dbd85..217c3b43b9 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,29 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { filter } from 'rxjs/operators';
+import { BehaviorSubject, combineLatest, of } from 'rxjs';
+import { debounceTime, filter, map } from 'rxjs/operators';
 
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
+import { SetClientFilter } from '../../../../../../../store/src/actions/pagination.actions';
 import { AppState } from '../../../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
 import { FavoritesConfigMapper } from '../../../../../../../store/src/favorite-config-mapper';
 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 { stratosEntityCatalog } from '../../../../../../../store/src/stratos-entity-catalog';
 import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
+import { PaginationEntityState } from '../../../../../../../store/src/types/pagination.types';
 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 {
+  IListAction,
+  IListConfig,
+  IListMultiFilterConfig,
+  IListMultiFilterConfigItem,
+  ListViewTypes,
+} from '../../list.component.types';
+import { BaseEndpointsDataSource } from './base-endpoints-data-source';
 import { EndpointCardComponent } from './endpoint-card/endpoint-card.component';
 import { EndpointListHelper } from './endpoint-list.helpers';
 import { EndpointsDataSource } from './endpoints-data-source';
@@ -110,12 +121,14 @@ export class EndpointsListConfigService implements IListConfig<EndpointModel> {
       (row: EndpointModel) => favoritesConfigMapper.getFavoriteEndpointFromEntity(row)
     );
     this.columns.push(favoriteCell);
+
     this.dataSource = new EndpointsDataSource(
       this.store,
       this,
       paginationMonitorFactory,
       entityMonitorFactory,
-      internalEventMonitorFactory
+      internalEventMonitorFactory,
+      true
     );
   }
 
@@ -124,9 +137,68 @@ export class EndpointsListConfigService implements IListConfig<EndpointModel> {
   public getSingleActions = () => this.singleActions;
   public getColumns = () => this.columns;
   public getDataSource = () => this.dataSource;
-  public getMultiFiltersConfigs = () => [];
+
+  public getMultiFiltersConfigs = (): IListMultiFilterConfig[] => [this.createEndpointTypeFilter()];
 
   private getEndpointTypeString(endpoint: EndpointModel): string {
     return entityCatalog.getEndpoint(endpoint.cnsi_type, endpoint.sub_type).definition.label;
   }
+
+  private createEndpointTypeFilter(): IListMultiFilterConfig {
+    return {
+      key: BaseEndpointsDataSource.typeFilterKey,
+      label: 'Endpoint Type',
+      list$: combineLatest([
+        stratosEntityCatalog.endpoint.store.getPaginationMonitor().currentPage$,
+        stratosEntityCatalog.endpoint.store.getPaginationMonitor().pagination$
+      ]).pipe(
+        debounceTime(100),// This can get pretty spammy, to help protect resetEndpointTypeFilter allow a pause
+        filter(([endpoints, pagination]) => !!endpoints),
+        map(([endpoints, pagination]) => {
+          // Provide a list of endpoint types only if there are more than two registered endpoint types
+          const types: { [type: string]: boolean; } = {};
+          for (const endpoint of endpoints) {
+            types[endpoint.cnsi_type] = true;
+          }
+          if (Object.values(types).filter(type => type).length < 2) {
+            // If we're going to hid the endpoint filter ensure any existing filter value is reset
+            this.resetEndpointTypeFilter(pagination);
+            return [];
+          }
+          return entityCatalog.getAllBaseEndpointTypes()
+            .sort((a, b) => a.definition.renderPriority - b.definition.renderPriority)
+            .filter(et => types[et.type])
+            .map(et => {
+              const res: IListMultiFilterConfigItem = {
+                label: et.definition.label,
+                item: et,
+                value: et.type
+              };
+              return res;
+            });
+        })
+      ),
+      loading$: of(false),
+      select: new BehaviorSubject(undefined)
+    };
+  }
+
+  private resetEndpointTypeFilter(pagination: PaginationEntityState) {
+    if (
+      pagination.clientPagination &&
+      pagination.clientPagination.filter &&
+      pagination.clientPagination.filter.items[BaseEndpointsDataSource.typeFilterKey]
+    ) {
+      const clientPaginationFilter = {
+        ...pagination.clientPagination.filter,
+        items: {
+          ...pagination.clientPagination.filter.items,
+          [BaseEndpointsDataSource.typeFilterKey]: null
+        }
+      };
+      this.store.dispatch(
+        new SetClientFilter(this.dataSource.masterAction, this.dataSource.paginationKey, clientPaginationFilter)
+      );
+    }
+  }
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list.component.html b/src/frontend/packages/core/src/shared/components/list/list.component.html
index 28ee1e36ef..f8b7839b14 100644
--- a/src/frontend/packages/core/src/shared/components/list/list.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list.component.html
@@ -45,7 +45,8 @@
           <div class="list-component__header__left--multi-filters"
             [hidden]="(!(hasRows$ | async) && !filter) || (isAddingOrSelecting$ | async)">
             <ng-container *ngFor="let multiFilterManager of multiFilterManagers; first as isFirst">
-              <mat-form-field *ngIf="!isFirst || !(multiFilterManager.hasOneItem$ | async)" [floatLabel]="'never'">
+              <mat-form-field *ngIf="!isFirst || !(multiFilterManager.hasOneOrLessItems$ | async)"
+                [floatLabel]="'never'">
                 <mat-select id="{{multiFilterManager.filterKey}}" matInput [(value)]="multiFilterManager.value"
                   [disabled]="!(multiFilterManager.filterIsReady$ | async)"
                   (selectionChange)="multiFilterManager.selectItem($event.value)">
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 ae2038162f..de841ba208 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
@@ -1,4 +1,4 @@
-import { Type } from '@angular/core';
+import { Injectable, Type } from '@angular/core';
 import * as moment from 'moment';
 import { BehaviorSubject, combineLatest, Observable, of as observableOf } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
@@ -13,7 +13,6 @@ 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";
 import { CardCell } from './list.types';
 
 export enum ListViewTypes {
@@ -204,7 +203,7 @@ export class MultiFilterManager<T> {
   public filterIsReady$: Observable<boolean>;
   public filterItems$: Observable<IListMultiFilterConfigItem[]>;
   public hasItems$: Observable<boolean>;
-  public hasOneItem$: Observable<boolean>;
+  public hasOneOrLessItems$: Observable<boolean>;
   public value: string;
 
   public filterKey: string;
@@ -217,7 +216,7 @@ export class MultiFilterManager<T> {
     this.filterKey = this.multiFilterConfig.key;
     this.allLabel = multiFilterConfig.allLabel || 'All';
     this.filterItems$ = this.getItemObservable(multiFilterConfig);
-    this.hasOneItem$ = this.filterItems$.pipe(map(items => items.length === 1));
+    this.hasOneOrLessItems$ = this.filterItems$.pipe(map(items => items.length <= 1));
     this.hasItems$ = this.filterItems$.pipe(map(items => !!items.length));
     this.filterIsReady$ = this.getReadyObservable(multiFilterConfig, dataSource, this.hasItems$);
   }
diff --git a/src/frontend/packages/store/src/actions/pagination.actions.ts b/src/frontend/packages/store/src/actions/pagination.actions.ts
index 0a6f540eec..9c133b7bf7 100644
--- a/src/frontend/packages/store/src/actions/pagination.actions.ts
+++ b/src/frontend/packages/store/src/actions/pagination.actions.ts
@@ -69,7 +69,12 @@ export class CreatePagination extends BasePaginationAction implements Action {
   /**
    * @param seed The pagination key for the section we should use as a seed when creating the new pagination section.
    */
-  constructor(pEntityConfig: Partial<EntityCatalogEntityConfig>, public paginationKey: string, public seed?: string) {
+  constructor(
+    pEntityConfig: Partial<EntityCatalogEntityConfig>,
+    public paginationKey: string,
+    public seed?: string,
+    public initialParams?: PaginationParam
+  ) {
     super(pEntityConfig);
   }
   type = CREATE_PAGINATION;
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 aaf5dafbaf..7191d36695 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,3 @@
-import { EndpointActionComplete } from '../../actions/endpoint.actions';
-import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { PaginationState } from '../../types/pagination.types';
 import { getDefaultPaginationEntityState } from './pagination-reducer-reset-pagination';
 
@@ -22,14 +20,3 @@ export function paginationClearAllTypes(state: PaginationState, entityKeys: stri
     return prevState;
   }, state);
 }
-
-export function clearEndpointEntities(state: PaginationState, action: EndpointActionComplete) {
-  const entityKeys = entityCatalog.getAllEntitiesForEndpointType(action.endpointType).map(entity => entity.entityKey);
-  if (entityKeys.length > 0) {
-    return paginationClearAllTypes(
-      state,
-      entityKeys
-    );
-  }
-  return state;
-}
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 a34f1d65cb..ad60adc0d1 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,7 +1,12 @@
 import { CreatePagination } from '../../actions/pagination.actions';
 import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { EntityCatalogEntityConfig } from '../../entity-catalog/entity-catalog.types';
-import { PaginationEntityState, PaginationState } from '../../types/pagination.types';
+import {
+  PaginationEntityState,
+  PaginationEntityTypeState,
+  PaginationParam,
+  PaginationState,
+} from '../../types/pagination.types';
 import { spreadClientPagination } from './pagination-reducer.helper';
 
 function getPaginationKey(entityConfig: EntityCatalogEntityConfig) {
@@ -42,7 +47,7 @@ function mergeWithSeed(state: PaginationState, action: CreatePagination, default
   const currentPagination = state[entityKey][action.paginationKey] || defaultState;
   const seeded = action.seed && state[entityKey] && state[entityKey][action.seed];
   const seedPagination = seeded ? state[entityKey][action.seed] : defaultState;
-  const entityState = {
+  const entityState: PaginationEntityTypeState = {
     ...newState[entityKey],
     [action.paginationKey]: {
       ...seedPagination,
@@ -50,7 +55,10 @@ function mergeWithSeed(state: PaginationState, action: CreatePagination, default
       pageCount: currentPagination.pageCount,
       currentPage: currentPagination.currentPage,
       clientPagination: mergePaginationSections(currentPagination, seedPagination, defaultState),
-      seed: seeded ? action.seed : null
+      seed: seeded ? action.seed : null,
+      // Ensure any filters from seed are not carried into new list
+      // For example, sort by type on endpoints page, go to cf endpoint page and type is not shown
+      params: mergeParamsSections(currentPagination, action.initialParams)
     }
   };
   return {
@@ -59,6 +67,16 @@ function mergeWithSeed(state: PaginationState, action: CreatePagination, default
   };
 }
 
+function mergeParamsSections(
+  currentPagination: PaginationEntityState,
+  initialSeedParams: PaginationParam = {},
+): PaginationParam {
+  return {
+    ...currentPagination.params,
+    ...initialSeedParams,
+  };
+}
+
 function mergePaginationSections(
   currentPagination: PaginationEntityState,
   seedPagination: PaginationEntityState,
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 18c1566775..fb4bcce3b0 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,3 +1,4 @@
+import { EndpointActionComplete } from '../../actions/endpoint.actions';
 import { ResetPagination } from '../../actions/pagination.actions';
 import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { PaginationEntityState, PaginationEntityTypeState, PaginationState } from '../../types/pagination.types';
@@ -102,3 +103,19 @@ function paginationResetPaginationState(oldEntityState: PaginationEntityState) {
   }
   return entityState;
 }
+
+export function resetEndpointEntities(state: PaginationState, action: EndpointActionComplete) {
+  const entityKeys = entityCatalog.getAllEntitiesForEndpointType(action.endpointType).map(entity => entity.entityKey);
+  if (entityKeys.length > 0) {
+    return entityKeys.reduce((prevState, entityKey) => {
+      if (prevState[entityKey]) {
+        return {
+          ...prevState,
+          [entityKey]: paginationResetAllPaginationSections(prevState, entityKey)
+        }
+      }
+      return prevState;
+    }, state);
+  }
+  return state;
+}
\ 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 d24616c794..eef23bc50d 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
@@ -36,11 +36,15 @@ import { UpdatePaginationMaxedState } from './../../actions/pagination.actions';
 import { paginationAddParams } from './pagination-reducer-add-params';
 import { paginationClearPages } from './pagination-reducer-clear-pages';
 import { paginationClearOfEntity } from './pagination-reducer-clear-pagination-of-entity';
-import { clearEndpointEntities, paginationClearAllTypes } from './pagination-reducer-clear-pagination-type';
+import { paginationClearAllTypes } from './pagination-reducer-clear-pagination-type';
 import { createNewPaginationSection } from './pagination-reducer-create-pagination';
 import { paginationIgnoreMaxed, paginationMaxReached } from './pagination-reducer-max-reached';
 import { paginationRemoveParams } from './pagination-reducer-remove-params';
-import { getDefaultPaginationEntityState, paginationResetPagination } from './pagination-reducer-reset-pagination';
+import {
+  getDefaultPaginationEntityState,
+  paginationResetPagination,
+  resetEndpointEntities,
+} from './pagination-reducer-reset-pagination';
 import { paginationSetClientFilter } from './pagination-reducer-set-client-filter';
 import { paginationSetClientFilterKey } from './pagination-reducer-set-client-filter-key';
 import { paginationSetClientPage } from './pagination-reducer-set-client-page';
@@ -137,7 +141,7 @@ function paginate(action, state = {}, updatePagination) {
   }
 
   if (isEndpointAction(action)) {
-    return clearEndpointEntities(state, action);
+    return resetEndpointEntities(state, action);
   }
 
   if (action.type === UPDATE_MAXED_STATE) {
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-repository-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-repository-list-config.service.ts
index 879403cb41..654ec79973 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-repository-list-config.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-repository-list-config.service.ts
@@ -172,7 +172,7 @@ export class MonocularRepositoryListConfig implements IListConfig<EndpointModel>
       paginationMonitorFactory,
       entityMonitorFactory,
       internalEventMonitorFactory,
-      ngZone
+      ngZone,
     );
   }
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts
index b578a4ad05..3eaaf1f26e 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts
@@ -33,7 +33,7 @@ export class KubernetesEndpointsDataSource extends BaseEndpointsDataSource {
       'k8s',
       paginationMonitorFactory,
       entityMonitorFactory,
-      internalEventMonitorFactory
+      internalEventMonitorFactory,
     );
   }
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
index 9115a09569..2c384fefa9 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
@@ -39,7 +39,7 @@ export class KubernetesEndpointsListConfigService implements IListConfig<Endpoin
     paginationMonitorFactory: PaginationMonitorFactory,
     entityMonitorFactory: EntityMonitorFactory,
     internalEventMonitorFactory: InternalEventMonitorFactory,
-    endpointsListConfigService: EndpointsListConfigService
+    endpointsListConfigService: EndpointsListConfigService,
   ) {
     this.columns = endpointsListConfigService.columns.filter(column => {
       return column.columnId !== 'type';
@@ -49,7 +49,7 @@ export class KubernetesEndpointsListConfigService implements IListConfig<Endpoin
       this,
       paginationMonitorFactory,
       entityMonitorFactory,
-      internalEventMonitorFactory
+      internalEventMonitorFactory,
     );
   }
   public getColumns = () => this.columns;

From c44204a49b2baa731dd675625d97b6b4a8d05777 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Thu, 10 Sep 2020 10:19:53 +0100
Subject: [PATCH 610/648] Add support for Helm Upgrade and history (#458)

* Improve presentation and fix issue with development versions

* Add support for Helm Upgrade and Helm history

* Remove console logging

* Add comment

* Minor tweaks following self-review

* Remove debug logging

* Fix whitespace

* Minor tidy ups

* Fix compile issue

* Fix front-end unit tests

* Always show upgrade button

* Minor entity store type updates

* Address PR feedback

* Revert

* Remove description when checking for similar charts

* Only show button when the helm chart is available

Co-authored-by: Richard Cox <richard.cox@suse.com>
---
 .../packages/core/sass/mat-desktop.scss       |   4 +
 .../components/list/list.component.html       |   2 +-
 .../components/list/list.component.types.ts   |  15 +-
 .../components/stepper/step/step.component.ts |   2 +-
 .../stepper/steppers/steppers.component.ts    |   2 +-
 .../suse-extensions/sass/_all-theme.scss      |   2 +
 .../src/custom/helm/helm-entity-catalog.ts    |   7 +-
 .../src/custom/helm/helm-entity-factory.ts    |   7 +
 .../src/custom/helm/helm-entity-generator.ts  |  22 ++-
 .../custom/helm/store/helm.action-builders.ts |  12 +-
 .../src/custom/helm/store/helm.actions.ts     |  26 ++++
 .../src/custom/helm/store/helm.effects.ts     |  28 ++++
 .../src/custom/helm/store/helm.types.ts       |  44 +++---
 .../helm-release-tab-base.component.ts        |   1 +
 .../tabs/helm-release-helper.service.ts       | 130 ++++++++++++++++-
 .../helm-release-history-tab.component.html   |   1 +
 .../helm-release-history-tab.component.scss   |   0
 ...helm-release-history-tab.component.spec.ts |  31 ++++
 .../helm-release-history-tab.component.ts     |  92 ++++++++++++
 .../helm-release-summary-tab.component.html   |  63 ++++----
 .../helm-release-summary-tab.component.scss   |   7 +
 ...helm-release-summary-tab.component.spec.ts |   5 +-
 ...m-release-summary-tab.component.theme.scss |  15 ++
 .../helm-release-summary-tab.component.ts     |  11 +-
 .../store/workload-action-builders.ts         |  50 +++++--
 .../store/workloads-entity-factory.ts         |   9 ++
 .../store/workloads-entity-generator.ts       |  27 +++-
 .../workloads/store/workloads.actions.ts      |  58 +++++++-
 .../workloads/store/workloads.effects.ts      |  87 ++++++++++-
 .../release-version-data-source.ts            |  61 ++++++++
 .../release-version-list-config.ts            | 131 +++++++++++++++++
 .../upgrade-release.component.html            |  37 +++++
 .../upgrade-release.component.scss            |  59 ++++++++
 .../upgrade-release.component.spec.ts         |  37 +++++
 .../upgrade-release.component.ts              | 114 +++++++++++++++
 .../kubernetes/workloads/workload.types.ts    |  17 +++
 .../workloads/workloads-entity-catalog.ts     |  14 +-
 .../kubernetes/workloads/workloads.module.ts  |  10 +-
 .../kubernetes/workloads/workloads.routing.ts |  12 +-
 .../workloads/workloads.testing.module.ts     |  47 ++++++
 .../plugins/kubernetes/install_release.go     | 135 ++++++++++++++----
 src/jetstream/plugins/kubernetes/main.go      |   2 +
 42 files changed, 1318 insertions(+), 118 deletions(-)
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.html
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.scss
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.spec.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.theme.scss
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-data-source.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-list-config.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.html
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.scss
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.spec.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.testing.module.ts

diff --git a/src/frontend/packages/core/sass/mat-desktop.scss b/src/frontend/packages/core/sass/mat-desktop.scss
index cf474347e0..7e11af970e 100644
--- a/src/frontend/packages/core/sass/mat-desktop.scss
+++ b/src/frontend/packages/core/sass/mat-desktop.scss
@@ -63,6 +63,10 @@ $desktop-toggle-button-item-height: $desktop-menu-item-height - 2px;
     font-size: $desktop-font-size;
   }
 
+  .mat-slide-toggle-label {
+    font-size: $desktop-font-size;
+  }
+
   // Allow a slightly-wider snackbar on desktop
   .mat-snack-bar-container {
     max-width: 40vw;
diff --git a/src/frontend/packages/core/src/shared/components/list/list.component.html b/src/frontend/packages/core/src/shared/components/list/list.component.html
index f8b7839b14..db67aaa1e0 100644
--- a/src/frontend/packages/core/src/shared/components/list/list.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list.component.html
@@ -50,7 +50,7 @@
                 <mat-select id="{{multiFilterManager.filterKey}}" matInput [(value)]="multiFilterManager.value"
                   [disabled]="!(multiFilterManager.filterIsReady$ | async)"
                   (selectionChange)="multiFilterManager.selectItem($event.value)">
-                  <mat-option>{{ multiFilterManager.allLabel }}</mat-option>
+                  <mat-option *ngIf="!multiFilterManager.hideAllOption">{{ multiFilterManager.allLabel }}</mat-option>
                   <mat-option *ngFor="let selectItem of multiFilterManager.filterItems$ | async"
                     [value]="selectItem.value">
                     {{selectItem.label}}
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 de841ba208..6416a73dc3 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
@@ -1,7 +1,7 @@
 import { Injectable, Type } from '@angular/core';
 import * as moment from 'moment';
 import { BehaviorSubject, combineLatest, Observable, of as observableOf } from 'rxjs';
-import { map, startWith } from 'rxjs/operators';
+import { first, map, startWith } from 'rxjs/operators';
 
 import { ListView } from '../../../../../store/src/actions/list.actions';
 import { ActionState } from '../../../../../store/src/reducers/api-request-reducer/types';
@@ -130,9 +130,11 @@ export interface IListMultiFilterConfig {
   key: string;
   label: string;
   allLabel?: string;
+  hideAllOption?: boolean;
   list$: Observable<IListMultiFilterConfigItem[]>;
   loading$: Observable<boolean>;
   select: BehaviorSubject<any>;
+  autoSelectFirst?: boolean;
 }
 
 export interface IListFilter {
@@ -208,6 +210,7 @@ export class MultiFilterManager<T> {
 
   public filterKey: string;
   public allLabel: string;
+  public hideAllOption = false;
 
   constructor(
     public multiFilterConfig: IListMultiFilterConfig,
@@ -215,10 +218,20 @@ export class MultiFilterManager<T> {
   ) {
     this.filterKey = this.multiFilterConfig.key;
     this.allLabel = multiFilterConfig.allLabel || 'All';
+    this.hideAllOption = multiFilterConfig.hideAllOption || false;
     this.filterItems$ = this.getItemObservable(multiFilterConfig);
     this.hasOneOrLessItems$ = this.filterItems$.pipe(map(items => items.length <= 1));
     this.hasItems$ = this.filterItems$.pipe(map(items => !!items.length));
     this.filterIsReady$ = this.getReadyObservable(multiFilterConfig, dataSource, this.hasItems$);
+
+    // Also select the first option if configured
+    if (multiFilterConfig.autoSelectFirst) {
+      this.filterItems$.pipe(first()).subscribe(options => {
+        if (options && options.length > 0) {
+          this.selectItem(options[0].value);
+        }
+      })
+    }
   }
 
   private getReadyObservable(
diff --git a/src/frontend/packages/core/src/shared/components/stepper/step/step.component.ts b/src/frontend/packages/core/src/shared/components/stepper/step/step.component.ts
index 73f164301a..9ab65bcd51 100644
--- a/src/frontend/packages/core/src/shared/components/stepper/step/step.component.ts
+++ b/src/frontend/packages/core/src/shared/components/stepper/step/step.component.ts
@@ -21,7 +21,7 @@ export interface StepOnNextResult {
   data?: any;
 }
 
-export type StepOnNextFunction = () => Observable<StepOnNextResult>;
+export type StepOnNextFunction = (index: number, step: StepComponent) => Observable<StepOnNextResult>;
 
 @Component({
   selector: 'app-step',
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 1e0776289c..a79b0fcc7a 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
@@ -117,7 +117,7 @@ export class SteppersComponent implements OnInit, AfterContentInit, OnDestroy {
     if (this.currentIndex < this.steps.length) {
       const step = this.steps[this.currentIndex];
       step.busy = true;
-      const obs$ = step.onNext();
+      const obs$ = step.onNext(this.currentIndex, step);
       if (!(obs$ instanceof Observable)) {
         return;
       }
diff --git a/src/frontend/packages/suse-extensions/sass/_all-theme.scss b/src/frontend/packages/suse-extensions/sass/_all-theme.scss
index 5afbb47729..116316ed35 100644
--- a/src/frontend/packages/suse-extensions/sass/_all-theme.scss
+++ b/src/frontend/packages/suse-extensions/sass/_all-theme.scss
@@ -4,6 +4,7 @@
 @import '../src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.theme';
 @import '../src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.theme';
 @import '../src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.theme';
+@import '../src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.theme';
 @import '../src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.theme';
 
 @mixin apply-theme-suse-extensions($stratos-theme) {
@@ -15,6 +16,7 @@
   @include kube-analysis-report-theme($theme, $app-theme);
   @include kube-analysis-card-theme($theme, $app-theme);
   @include monocular-chart-card($theme, $app-theme);
+  @include helm-release-summary-tab-theme($theme, $app-theme);
   @include kube-node-link-theme($theme, $app-theme);
 
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-catalog.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-catalog.ts
index 288b527982..83dda2cd49 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-catalog.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-catalog.ts
@@ -1,4 +1,4 @@
-import { StratosCatalogEndpointEntity, StratosCatalogEntity } from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity'; import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types'; import { MonocularChart, HelmVersion } from './store/helm.types'; import { HelmChartActionBuilders, HelmVersionActionBuilders } from './store/helm.action-builders';
+import { StratosCatalogEndpointEntity, StratosCatalogEntity } from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity'; import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types'; import { MonocularChart, HelmVersion, MonocularVersion } from './store/helm.types'; import { HelmChartActionBuilders, HelmVersionActionBuilders, HelmChartVersionsActionBuilders } from './store/helm.action-builders';
 
 /**
  * A strongly typed collection of Helm Catalog Entities.
@@ -6,8 +6,9 @@ import { StratosCatalogEndpointEntity, StratosCatalogEntity } from '../../../../
  */
 export class HelmEntityCatalog {
   endpoint: StratosCatalogEndpointEntity;
-  chart: StratosCatalogEntity<IFavoriteMetadata, MonocularChart, HelmChartActionBuilders>
-  version: StratosCatalogEntity<IFavoriteMetadata, HelmVersion, HelmVersionActionBuilders>
+  chart: StratosCatalogEntity<IFavoriteMetadata, MonocularChart, HelmChartActionBuilders>;
+  version: StratosCatalogEntity<IFavoriteMetadata, HelmVersion, HelmVersionActionBuilders>;
+  chartVersions: StratosCatalogEntity<IFavoriteMetadata, MonocularVersion[], HelmChartVersionsActionBuilders>;
 }
 
 /**
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-factory.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-factory.ts
index 5bb57a9a65..302dd8a060 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-factory.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-factory.ts
@@ -5,6 +5,7 @@ import { HelmVersion, MonocularChart } from './store/helm.types';
 
 export const helmVersionsEntityType = 'helmVersions';
 export const monocularChartsEntityType = 'monocularCharts';
+export const monocularChartVersionsEntityType = 'monocularChartVersions';
 
 export const getMonocularChartId = (entity: MonocularChart) => entity.id;
 export const getHelmVersionId = (entity: HelmVersion) => entity.endpointId;
@@ -45,6 +46,12 @@ entityCache[helmVersionsEntityType] = new HelmEntitySchema(
   { idAttribute: getHelmVersionId }
 );
 
+entityCache[monocularChartVersionsEntityType] = new HelmEntitySchema(
+  monocularChartVersionsEntityType,
+  {},
+  { idAttribute: getHelmVersionId }
+);
+
 export function helmEntityFactory(key: string): EntitySchema {
   const entity = entityCache[key];
   if (!entity) {
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-generator.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-generator.ts
index 380b225a40..c9ef3d8afa 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-generator.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-generator.ts
@@ -11,14 +11,17 @@ import {
   helmEntityFactory,
   helmVersionsEntityType,
   monocularChartsEntityType,
+  monocularChartVersionsEntityType,
 } from './helm-entity-factory';
 import {
   HelmChartActionBuilders,
   helmChartActionBuilders,
+  HelmChartVersionsActionBuilders,
+  helmChartVersionsActionBuilders,
   HelmVersionActionBuilders,
   helmVersionActionBuilders,
 } from './store/helm.action-builders';
-import { HelmVersion, MonocularChart } from './store/helm.types';
+import { HelmVersion, MonocularChart, MonocularVersion } from './store/helm.types';
 
 
 export function generateHelmEntities(): StratosBaseCatalogEntity[] {
@@ -35,10 +38,12 @@ export function generateHelmEntities(): StratosBaseCatalogEntity[] {
     authTypes: [],
     renderPriority: 10,
   };
+
   return [
     generateEndpointEntity(endpointDefinition),
     generateChartEntity(endpointDefinition),
     generateVersionEntity(endpointDefinition),
+    generateChartVersionsEntity(endpointDefinition),
   ];
 }
 
@@ -80,4 +85,19 @@ function generateVersionEntity(endpointDefinition: StratosEndpointExtensionDefin
   return helmEntityCatalog.version;
 }
 
+function generateChartVersionsEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: monocularChartVersionsEntityType,
+    schema: helmEntityFactory(monocularChartVersionsEntityType),
+    endpoint: endpointDefinition
+  };
+  helmEntityCatalog.chartVersions = new StratosCatalogEntity<IFavoriteMetadata, MonocularVersion[], HelmChartVersionsActionBuilders>(
+    definition,
+    {
+      actionBuilders: helmChartVersionsActionBuilders
+    }
+  );
+  return helmEntityCatalog.chartVersions;
+}
+
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.action-builders.ts b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.action-builders.ts
index 53c20f4de9..df443d3ea6 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.action-builders.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.action-builders.ts
@@ -1,5 +1,5 @@
 import { OrchestratedActionBuilders } from '../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
-import { GetHelmVersions, GetMonocularCharts, HelmInstall } from './helm.actions';
+import { GetHelmChartVersions, GetHelmVersions, GetMonocularCharts, HelmInstall } from './helm.actions';
 import { HelmInstallValues } from './helm.types';
 
 export interface HelmChartActionBuilders extends OrchestratedActionBuilders {
@@ -20,4 +20,12 @@ export interface HelmVersionActionBuilders extends OrchestratedActionBuilders {
 
 export const helmVersionActionBuilders: HelmVersionActionBuilders = {
   getMultiple: () => new GetHelmVersions()
-}
\ No newline at end of file
+}
+
+export interface HelmChartVersionsActionBuilders extends OrchestratedActionBuilders {
+  getMultiple: (repoName: string, chartName: string) => GetHelmChartVersions
+}
+
+export const helmChartVersionsActionBuilders: HelmChartVersionsActionBuilders = {
+  getMultiple: (repoName: string, chartName: string) => new GetHelmChartVersions(repoName, chartName)
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.actions.ts b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.actions.ts
index c47e8e47f3..df552269dd 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.actions.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.actions.ts
@@ -5,6 +5,7 @@ import {
   helmEntityFactory,
   helmVersionsEntityType,
   monocularChartsEntityType,
+  monocularChartVersionsEntityType,
 } from '../helm-entity-factory';
 import { HelmInstallValues } from './helm.types';
 
@@ -12,6 +13,10 @@ export const GET_MONOCULAR_CHARTS = '[Monocular] Get Charts';
 export const GET_MONOCULAR_CHARTS_SUCCESS = '[Monocular] Get Charts Success';
 export const GET_MONOCULAR_CHARTS_FAILURE = '[Monocular] Get Charts Failure';
 
+export const GET_MONOCULAR_CHART_VERSIONS = '[Monocular] Get Chart Versions';
+export const GET_MONOCULAR_CHART_VERSIONS_SUCCESS = '[Monocular] Get Chart Versions Success';
+export const GET_MONOCULAR_CHART_VERSIONS_FAILURE = '[Monocular] Get Chart Versions Failure';
+
 export const GET_HELM_VERSIONS = '[Helm] Get Versions';
 export const GET_HELM_VERSIONS_SUCCESS = '[Helm] Get Versions Success';
 export const GET_HELM_VERSIONS_FAILURE = '[Helm] Get Versions Failure';
@@ -73,3 +78,24 @@ export class GetHelmVersions implements MonocularPaginationAction {
   };
   flattenPagination = true;
 }
+
+export class GetHelmChartVersions implements MonocularPaginationAction {
+  constructor(public repoName: string, public chartName: string) {
+    this.paginationKey = `'monocular-chart-versions-${repoName}-${chartName}`;
+  }
+  type = GET_MONOCULAR_CHART_VERSIONS;
+  endpointType = HELM_ENDPOINT_TYPE;
+  entityType = monocularChartVersionsEntityType;
+  entity = [helmEntityFactory(monocularChartVersionsEntityType)];
+  actions = [
+    GET_MONOCULAR_CHART_VERSIONS,
+    GET_MONOCULAR_CHART_VERSIONS_SUCCESS,
+    GET_MONOCULAR_CHART_VERSIONS_FAILURE
+  ];
+  paginationKey: string;
+  initialParams = {
+    'order-direction': 'asc',
+    'order-direction-field': 'version',
+  };
+  flattenPagination = true;
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
index 65a3d1b9b8..31508d886f 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
@@ -23,7 +23,9 @@ import { helmEntityCatalog } from '../helm-entity-catalog';
 import { getHelmVersionId, getMonocularChartId, HELM_ENDPOINT_TYPE } from '../helm-entity-factory';
 import {
   GET_HELM_VERSIONS,
+  GET_MONOCULAR_CHART_VERSIONS,
   GET_MONOCULAR_CHARTS,
+  GetHelmChartVersions,
   GetHelmVersions,
   GetMonocularCharts,
   HELM_INSTALL,
@@ -128,6 +130,32 @@ export class HelmEffects {
     })
   );
 
+  @Effect()
+  fetchChartVersions$ = this.actions$.pipe(
+    ofType<GetHelmChartVersions>(GET_MONOCULAR_CHART_VERSIONS),
+    flatMap(action => {
+      const entityKey = entityCatalog.getEntityKey(action);
+      return this.makeRequest(action, `/pp/${this.proxyAPIVersion}/chartsvc/v1/charts/${action.repoName}/${action.chartName}/versions`,
+      (response) => {
+        const base = {
+          entities: { [entityKey]: {} },
+          result: []
+        } as NormalizedResponse;
+
+        const items = response.data as Array<any>;
+        const processedData = items.reduce((res, data) => {
+          const id = getMonocularChartId(data);
+          res.entities[entityKey][id] = data;
+          // Promote the name to the top-level object for simplicity
+          data.name = data.attributes.name;
+          res.result.push(id);
+          return res;
+        }, base);
+        return processedData;
+      }, []);
+    })
+  );
+
   @Effect()
   helmInstall$ = this.actions$.pipe(
     ofType<HelmInstall>(HELM_INSTALL),
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.types.ts b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.types.ts
index 54b21b657c..4ddf46021c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.types.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.types.ts
@@ -1,3 +1,6 @@
+import { Chart } from './../monocular/shared/models/chart';
+import { ChartVersion } from './../monocular/shared/models/chart-version';
+
 export interface MonocularRepository {
   name: string;
   url: string;
@@ -7,26 +10,18 @@ export interface MonocularRepository {
   status: string;
 }
 
-export interface MonocularChart {
-  id: string;
+// Reuse types from the Monocular codebase
+export interface MonocularChart extends Chart {
   name: string;
-  attributes: {
-    description: string;
-    home: string;
-    icon: string;
-    keywords: string[];
-    repo: {
-      name: string;
-      url: string;
-    };
-  };
-  relationships: {
-    latestChartVersion: {
-      data: {
-        version: string
-      }
-    }
-  };
+}
+
+export type MonocularVersion = ChartVersion;
+
+// Basic Chart Metadata
+export interface ChartMetadata {
+  name: string;
+  description: string;
+  sources: string[];
 }
 
 export interface HelmVersion {
@@ -50,8 +45,6 @@ export enum HelmStatus {
   Pending_Rollback = 8
 }
 
-
-
 export interface HelmInstallValues {
   endpoint: string;
   releaseName: string;
@@ -59,3 +52,12 @@ export interface HelmInstallValues {
   values: string;
   chart: string;
 }
+
+export interface HelmUpgradeValues {
+  chart: {
+    name: string;
+    repo: string;
+    version: string;
+  };
+  restartPods?: boolean;
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
index 8bad3751c8..d121deed5d 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
@@ -58,6 +58,7 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
       { link: 'summary', label: 'Summary', icon: 'helm', iconFont: 'stratos-icons' },
       { link: 'notes', label: 'Notes', icon: 'subject' },
       { link: 'values', label: 'Values', icon: 'list' },
+      { link: 'history', label: 'History', icon: 'schedule' },
       { link: 'analysis', label: 'Analysis', icon: 'assignment', hidden$: this.analysisService.hideAnalysis$ },
       { link: '-', label: 'Resources' },
       { link: 'graph', label: 'Overview', icon: 'share', hidden$: sessionService.isTechPreview().pipe(map(tp => !tp)) },
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
index fae00ae737..749d08e560 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
@@ -1,7 +1,9 @@
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
+import { combineLatest, Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
+import { helmEntityCatalog } from '../../../../helm/helm-entity-catalog';
+import { ChartMetadata } from '../../../../helm/store/helm.types';
 import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog';
 import { ContainerStateCollection, KubernetesPod } from '../../../store/kube.types';
 import { getHelmReleaseDetailsFromGuid } from '../../store/workloads-entity-factory';
@@ -14,6 +16,49 @@ import {
 } from '../../workload.types';
 import { workloadsEntityCatalog } from '../../workloads-entity-catalog';
 
+// Simple class to represent MAJOR.MINOR.REVISION version
+class Version {
+
+  public major: number;
+  public minor: number;
+  public revision: number;
+
+  public valid: boolean;
+
+  constructor(v: string) {
+    this.valid = false;
+    if (typeof v === 'string') {
+      const parts = v.split('.');
+      if (parts.length === 3) {
+        this.major = parseInt(parts[0], 10);
+        this.minor = parseInt(parts[1], 10);
+        this.revision = parseInt(parts[2], 10);
+        this.valid = true;
+      }
+    }
+  }
+
+  // Is this version newer than the supplied other version?
+  public isNewer(other: Version): boolean {
+    if (!this.valid || !other.valid) {
+      return false;
+    }
+
+    if (this.major > other.major) {
+      return true;
+    }
+
+    if (this.major === other.major) {
+      if (this.minor > other.minor) {
+        return true;
+      }
+      if (this.minor === other.minor) {
+        return this.revision > other.revision;
+      }
+    }
+    return false;
+  }
+}
 
 @Injectable()
 export class HelmReleaseHelperService {
@@ -71,10 +116,8 @@ export class HelmReleaseHelperService {
 
   public fetchReleaseResources(): Observable<HelmReleaseResources> {
     // Get helm release
-    const action = workloadsEntityCatalog.resource.actions.get(this.releaseTitle, this.endpointGuid);
-    return workloadsEntityCatalog.resource.store.getEntityMonitor(
-      action.guid
-    ).entity$.pipe(
+    const guid = workloadsEntityCatalog.resource.actions.get(this.releaseTitle, this.endpointGuid).guid;
+    return workloadsEntityCatalog.resource.store.getEntityMonitor(guid).entity$.pipe(
       filter(resources => !!resources)
     );
   }
@@ -89,6 +132,24 @@ export class HelmReleaseHelperService {
     );
   }
 
+  // Check to see if a workload has updates available
+  public getCharts() {
+    return helmEntityCatalog.chart.store.getPaginationService().entities$.pipe(
+      filter(charts => !!charts)
+    );
+  }
+
+  public fetchReleaseHistory(): Observable<any> {
+    // Get the history for a Helm release
+    return workloadsEntityCatalog.history.store.getEntityService(
+      this.releaseTitle,
+      this.endpointGuid,
+      { namespace: this.namespace }
+    ).waitForEntity$.pipe(
+      map(historyEntity => historyEntity.entity.revisions)
+    );
+  }
+
   private mapPods(pods: KubernetesPod[]): HelmReleaseChartData {
     const podPhases: { [phase: string]: number, } = {};
     const containers = {
@@ -144,4 +205,63 @@ export class HelmReleaseHelperService {
     }
     return false;
   }
+
+  public hasUpgrade(returnLatest = false): Observable<any> {
+    const updates = combineLatest(this.getCharts(), this.release$);
+    return updates.pipe(
+      map(([charts, release]) => {
+        for (const c of charts) {
+          if (this.isProbablySameChart(c.attributes, release.chart.metadata)) {
+            if (c.relationships && c.relationships.latestChartVersion && c.relationships.latestChartVersion.data) {
+              const latest = new Version(c.relationships.latestChartVersion.data.version);
+              const current = new Version(release.chart.metadata.version);
+              if (latest.isNewer(current)) {
+                return {
+                  release,
+                  upgrade: c.attributes,
+                  version: c.relationships.latestChartVersion.data.version
+                };
+              }
+            }
+          }
+        }
+        // No newer release, so return the release itself if that is what was requested and we can find the chart
+        // NOTE: If the helm repository is removed that we installed from, we won't be able to find the chart
+        if (returnLatest) {
+          const releaseChart = charts.find(c => c.relationships.latestChartVersion.data.version === release.chart.metadata.version);
+          if (releaseChart) {
+            return {
+              release,
+              upgrade: releaseChart.attributes,
+              version: releaseChart.relationships.latestChartVersion.data.version
+            }
+          }
+        }
+        return null;
+      })
+    );
+  }
+
+  // We might have a chart with the same name in multiple repositories - we only have chart metadata
+  // We don't know which Helm repository it came from, so use the name and sources to match
+  private isProbablySameChart(a: ChartMetadata, b: ChartMetadata): boolean {
+    // Basic properties must be the same
+    if ((a.name !== b.name) || (a.sources.length !== b.sources.length)) {
+      return false;
+    }
+
+    // Sources must match
+    let count = 0;
+    a.sources.forEach(source => {
+      count += b.sources.findIndex((s) => s === source) === -1 ? 0 : 1;
+    });
+
+    if (count !== a.sources.length) {
+      return false;
+    }
+
+    return true;
+  }
+
 }
+
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.html
new file mode 100644
index 0000000000..7e055c154c
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.html
@@ -0,0 +1 @@
+<app-table [dataSource]="dataSource" [columns]="columns"></app-table>
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.spec.ts
new file mode 100644
index 0000000000..f2b19dceeb
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.spec.ts
@@ -0,0 +1,31 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HelmReleaseGuidMock } from '../../../../../helm/helm-testing.module';
+import { HelmReleaseHelperService } from '../helm-release-helper.service';
+import { HelmReleaseHistoryTabComponent } from './helm-release-history-tab.component';
+
+describe('HelmReleaseHistoryTabComponent', () => {
+  let component: HelmReleaseHistoryTabComponent;
+  let fixture: ComponentFixture<HelmReleaseHistoryTabComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ HelmReleaseHistoryTabComponent ],
+      providers: [
+        HelmReleaseHelperService,
+        HelmReleaseGuidMock
+      ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(HelmReleaseHistoryTabComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.ts
new file mode 100644
index 0000000000..df49f034bc
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.ts
@@ -0,0 +1,92 @@
+import { Component } from '@angular/core';
+import * as moment from 'moment';
+import { of } from 'rxjs';
+import { map, startWith } from 'rxjs/operators';
+
+import {
+  ITableListDataSource,
+} from '../../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
+import { ITableColumn } from '../../../../../../../../core/src/shared/components/list/list-table/table.types';
+import { HelmReleaseHelperService } from './../helm-release-helper.service';
+
+@Component({
+  selector: 'app-helm-release-history-tab',
+  templateUrl: './helm-release-history-tab.component.html',
+  styleUrls: ['./helm-release-history-tab.component.scss']
+})
+export class HelmReleaseHistoryTabComponent {
+
+  public columns: ITableColumn<any>[] = [];
+
+  public dataSource: ITableListDataSource<any>;
+
+  constructor(public helmReleaseHelper: HelmReleaseHelperService) {
+
+    // Use the ame column layout as the Helm CLI
+    this.columns = [
+      {
+        columnId: 'revision',
+        headerCell: () => 'Revision',
+        cellFlex: '1',
+        cellDefinition: {
+          valuePath: 'revision'
+        }
+      },
+      {
+        columnId: 'updated',
+        headerCell: () => 'Updated',
+        cellFlex: '3',
+        cellDefinition: {
+          getValue: row => moment(row.last_deployed).format('LLL')
+        }
+      },
+      {
+        columnId: 'status',
+        headerCell: () => 'Status',
+        cellFlex: '2',
+        cellDefinition: {
+          valuePath: 'status'
+        }
+      },
+      {
+        columnId: 'chart',
+        headerCell: () => 'Chart',
+        cellFlex: '2',
+        cellDefinition: {
+          getValue: row => `${row.chart.name}-${row.chart.version}`
+        }
+      },
+      {
+        columnId: 'app_version',
+        headerCell: () => 'App Version',
+        cellFlex: '1',
+        cellDefinition: {
+          valuePath: 'chart.appVersion'
+        }
+      },
+      {
+        columnId: 'description',
+        headerCell: () => 'Description',
+        cellFlex: '2',
+        cellDefinition: {
+          valuePath: 'description'
+        }
+      },
+    ];
+
+    const data$ = this.helmReleaseHelper.fetchReleaseHistory();
+    this.dataSource = {
+      connect: () => data$,
+      disconnect: () => { },
+      trackBy: (index, item) => item.revision,
+      isTableLoading$: data$.pipe(
+        map(revisions => !revisions),
+        startWith(true),
+      ),
+      getRowState: (row) => {
+        return of({});
+      }
+    };
+  }
+
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
index ad0b133c87..ade8a8bf0a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
@@ -4,6 +4,11 @@
     <span>Delete</span>
   </button>
 
+  <button *ngIf="canUpgrade$ | async" mat-button name="upgrade" [routerLink]="['../upgrade']" matTooltip="Upgrade">
+    <mat-icon>vertical_align_top</mat-icon>
+    <span>Upgrade</span>
+  </button>
+
   <app-analysis-report-runner [kubeId]="helmReleaseHelper.endpointGuid" [namespace]="helmReleaseHelper.namespace"
     [app]="helmReleaseHelper.releaseTitle">
   </app-analysis-report-runner>
@@ -16,35 +21,41 @@
 
 <app-loading-page [isLoading]="isBusy$" [text]="loadingMessage">
   <ng-container *ngIf="helmReleaseHelper.release$ | async as release">
-    <app-entity-summary-title [imagePath]="release.chart.metadata.icon" [title]="release.name"
+    <div>
+      <div *ngIf="hasUpgrade$ | async as upgrade" class="chart-upgrade">
+        Upgrade available: {{ upgrade }}
+      </div>
+      <app-entity-summary-title [imagePath]="release.chart.metadata.icon" [title]="release.name"
       [subText]="release.chart.metadata.description" [subTitle]="release.chart.metadata.name"
       [fallBackIcon]="'workloads'" [fallBackIconFont]="'stratos-icons'">
-      <div class="summary">
-        <div class="chart-details">
-          <app-metadata-item class="chart-details__item" label="Chart Version">{{ release.chart.metadata.version }}
-          </app-metadata-item>
-          <app-metadata-item class="chart-details__item" label="Application Version">
-            {{ release.chart.metadata.appVersion || '-' }}
-          </app-metadata-item>
-          <app-metadata-item class="chart-details__item" label="Cluster">
-            <a [routerLink]="createClusterLink()">{{ getClusterName() | async }}</a>
-          </app-metadata-item>
-          <app-metadata-item class="chart-details__item" label="Namespace">
-            <a [routerLink]="createNamespaceLink(release.namespace)">{{ release.namespace }}</a>
-          </app-metadata-item>
-          <app-metadata-item class="chart-details__item" label="Release Version">{{ release.version }}
-          </app-metadata-item>
-          <app-metadata-item class="chart-details__item" label="Status">{{ release.status | titlecase }}
-          </app-metadata-item>
-          <app-metadata-item class="chart-details__item" label="First Deployed">
-            {{ release.info.first_deployed | date:'medium' }}
-          </app-metadata-item>
-          <app-metadata-item class="chart-details__item" label="Last Deployed">
-            {{ release.info.last_deployed | date:'medium' }}
-          </app-metadata-item>
+        <div class="summary">
+          <div class="chart-details">
+            <app-metadata-item class="chart-details__item" label="Chart Version">{{ release.chart.metadata.version }}
+            </app-metadata-item>
+            <app-metadata-item class="chart-details__item" label="Application Version">
+              {{ release.chart.metadata.appVersion || '-' }}
+            </app-metadata-item>
+            <app-metadata-item class="chart-details__item" label="Cluster">
+              <a [routerLink]="createClusterLink()">{{ getClusterName() | async }}</a>
+            </app-metadata-item>
+            <app-metadata-item class="chart-details__item" label="Namespace">
+              <a [routerLink]="createNamespaceLink(release.namespace)">{{ release.namespace }}</a>
+            </app-metadata-item>
+            <app-metadata-item class="chart-details__item" label="Release Version">{{ release.version }}
+            </app-metadata-item>
+            <app-metadata-item class="chart-details__item" label="Status">{{ release.status | titlecase }}
+            </app-metadata-item>
+            <app-metadata-item class="chart-details__item" label="First Deployed">
+              {{ release.info.first_deployed | date:'medium' }}
+            </app-metadata-item>
+            <app-metadata-item class="chart-details__item" label="Last Deployed">
+              {{ release.info.last_deployed | date:'medium' }}
+            </app-metadata-item>
+          </div>
         </div>
-      </div>
-    </app-entity-summary-title>
+      </app-entity-summary-title>
+    </div>
+      
     <div *ngIf="hasResources$ | async; else loadingResources" class="resources">
       <app-metadata-item class="chart-details__item" label="Pods and Containers"></app-metadata-item>
       <app-tile-grid>
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
index d57c1bb42f..b2f30b0f4a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
@@ -43,6 +43,13 @@
   opacity: .6;
 }
 
+.chart-upgrade {
+  border-radius: 8px;
+  float: right;
+  font-size: 12px;
+  margin-right: 10px;
+  padding: 2px 8px;
+}
 
 .grid {
   $bottom-space: 20px;
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
index 4582dd922d..9eb1592e81 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
@@ -2,9 +2,10 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { TabNavService } from 'frontend/packages/core/tab-nav.service';
 
 import { SidePanelService } from '../../../../../../../../core/src/shared/services/side-panel.service';
-import { HelmReleaseProviders, KubeBaseGuidMock, KubernetesBaseTestModules } from '../../../../kubernetes.testing.module';
+import { HelmReleaseProviders, KubeBaseGuidMock } from '../../../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service';
 import { KubernetesAnalysisService } from '../../../../services/kubernetes.analysis.service';
+import { WorkloadsBaseTestingModule } from '../../../workloads.testing.module';
 import {
   AnalysisReportSelectorComponent,
 } from './../../../../analysis-report-viewer/analysis-report-selector/analysis-report-selector.component';
@@ -17,7 +18,7 @@ describe('HelmReleaseSummaryTabComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
-        ...KubernetesBaseTestModules
+        ...WorkloadsBaseTestingModule
       ],
       declarations: [HelmReleaseSummaryTabComponent, AnalysisReportSelectorComponent],
       providers: [
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.theme.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.theme.scss
new file mode 100644
index 0000000000..30c0894af2
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.theme.scss
@@ -0,0 +1,15 @@
+@mixin helm-release-summary-tab-theme($theme, $app-theme) {
+
+  $status-colors: map-get($app-theme, status);
+  $status-success: map-get($status-colors, success);
+  $status-warning: map-get($status-colors, warning);
+  $status-danger: map-get($status-colors, danger);
+  $status-tentative: map-get($status-colors, tentative);
+  $status-info: map-get($status-colors, info);
+
+  .chart-upgrade {
+    border: 1px solid $status-success;
+    color: $status-success;
+  }
+
+}
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index 3b3d8ce7c8..0a8fbac769 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -47,6 +47,11 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
 
   public path: string;
 
+  public hasUpgrade$: Observable<string>;
+
+  // Can we upgrade? Yes as long as the Helm Chart can be found
+  public canUpgrade$: Observable<boolean>;
+
   public podChartColors = [
     {
       name: 'Running',
@@ -115,6 +120,10 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
       )
     );
 
+    this.hasUpgrade$ = this.helmReleaseHelper.hasUpgrade().pipe(map(v => v ? v.version : null));
+
+    this.canUpgrade$ = this.helmReleaseHelper.hasUpgrade(true).pipe(map(v => !!v));
+
     this.resources$ = combineLatest(
       this.helmReleaseHelper.fetchReleaseGraph(),
       this.analysisReportUpdated$
@@ -217,7 +226,7 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
           const action = workloadsEntityCatalog.release.actions.getMultiple();
           this.store.dispatch(new ClearPaginationOfType(action));
           this.completeDelete();
-          this.store.dispatch(new RouterNav({ path: ['workloads'] }));
+          this.store.dispatch(new RouterNav({ path: ['./workloads'] }));
         }
       });
     });
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workload-action-builders.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workload-action-builders.ts
index eb7591f9c5..f85d09243e 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workload-action-builders.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workload-action-builders.ts
@@ -1,42 +1,74 @@
 import {
   OrchestratedActionBuilders,
 } from '../../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
-import { GetHelmRelease, GetHelmReleaseGraph, GetHelmReleaseResource, GetHelmReleases } from './workloads.actions';
+import { HelmUpgradeValues } from '../../../helm/store/helm.types';
+import {
+  GetHelmRelease,
+  GetHelmReleaseGraph,
+  GetHelmReleaseHistory,
+  GetHelmReleaseResource,
+  GetHelmReleases,
+  UpgradeHelmRelease,
+} from './workloads.actions';
 
 export interface WorkloadReleaseBuilders extends OrchestratedActionBuilders {
   get: (
     title: string,
     endpointGuid: string,
-    extraArgs: { namespace: string }
+    extraArgs: { namespace: string, }
   ) => GetHelmRelease;
   getMultiple: () => GetHelmReleases;
+  upgrade: (
+    title: string,
+    endpointGuid: string,
+    namespace: string,
+    values: HelmUpgradeValues) => UpgradeHelmRelease;
 }
 
 export const workloadReleaseBuilders: WorkloadReleaseBuilders = {
-  get: (title: string, endpointGuid: string, { namespace }: { namespace: string }) => {
+  get: (title: string, endpointGuid: string, { namespace }: { namespace: string, }) => {
     return new GetHelmRelease(endpointGuid, namespace, title);
   },
-  getMultiple: () => new GetHelmReleases()
-}
+  getMultiple: () => new GetHelmReleases(),
+  upgrade: (
+    title: string,
+    endpointGuid: string,
+    namespace: string,
+    values: HelmUpgradeValues) => new UpgradeHelmRelease(title, endpointGuid, namespace, values)
+};
 
 export interface WorkloadGraphBuilders extends OrchestratedActionBuilders {
   get: (
     releaseTitle: string,
     endpointGuid: string
-  ) => GetHelmReleaseGraph
+  ) => GetHelmReleaseGraph;
 }
 
 export const workloadGraphBuilders: WorkloadGraphBuilders = {
   get: (releaseTitle: string, endpointGuid: string) => new GetHelmReleaseGraph(endpointGuid, releaseTitle)
-}
+};
 
 export interface WorkloadResourceBuilders extends OrchestratedActionBuilders {
   get: (
     releaseTitle: string,
     endpointGuid: string,
-  ) => GetHelmReleaseResource
+  ) => GetHelmReleaseResource;
 }
 
 export const workloadResourceBuilders: WorkloadResourceBuilders = {
   get: (releaseTitle: string, endpointGuid: string) => new GetHelmReleaseResource(endpointGuid, releaseTitle)
-}
\ No newline at end of file
+};
+
+export interface WorkloadResourceHistoryBuilders extends OrchestratedActionBuilders {
+  get: (
+    releaseTitle: string,
+    endpointGuid: string,
+    extraArgs: { namespace: string, }
+  ) => GetHelmReleaseHistory;
+}
+
+export const workloadResourceHistoryBuilders: WorkloadResourceHistoryBuilders = {
+  get: (releaseTitle: string, endpointGuid: string, { namespace }: { namespace: string, }) =>
+    new GetHelmReleaseHistory(endpointGuid, namespace, releaseTitle)
+};
+
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-factory.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-factory.ts
index c1f3dd65bc..25ada89e41 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-factory.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-factory.ts
@@ -7,6 +7,7 @@ export const helmReleasePodEntityType = 'helmReleasePod';
 export const helmReleaseServiceEntityType = 'helmReleaseService';
 export const helmReleaseGraphEntityType = 'helmReleaseGraph';
 export const helmReleaseResourceEntityType = 'helmReleaseResource';
+export const helmReleaseHistoryEntityType = 'helmReleaseHistory';
 
 const separator = ':';
 export const getHelmReleaseDetailsFromGuid = (guid: string) => {
@@ -48,8 +49,16 @@ entityCache[helmReleaseResourceEntityType] = new KubernetesEntitySchema(
   { idAttribute: getHelmReleaseResourceIdByObj }
 );
 
+entityCache[helmReleaseHistoryEntityType] = new KubernetesEntitySchema(
+  helmReleaseHistoryEntityType,
+  {},
+  { idAttribute: getHelmReleaseResourceIdByObj }
+);
+
 Object.entries(entityCache).forEach(([key, workloadSchema]) => addKubernetesEntitySchema(key, workloadSchema));
 
+
 export const createHelmReleaseEntities = (): { [cacheName: string]: EntitySchema; } => {
   return entityCache;
 };
+
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-generator.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-generator.ts
index 3a8f8a0181..d1695d2322 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-generator.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-generator.ts
@@ -7,6 +7,7 @@ import { IFavoriteMetadata } from '../../../../../../store/src/types/user-favori
 import { kubernetesEntityFactory } from '../../kubernetes-entity-factory';
 import { HelmRelease, HelmReleaseGraph, HelmReleaseResources } from '../workload.types';
 import { workloadsEntityCatalog } from '../workloads-entity-catalog';
+import { HelmReleaseHistory } from './../workload.types';
 import {
   WorkloadGraphBuilders,
   workloadGraphBuilders,
@@ -14,15 +15,24 @@ import {
   workloadReleaseBuilders,
   WorkloadResourceBuilders,
   workloadResourceBuilders,
+  WorkloadResourceHistoryBuilders,
+  workloadResourceHistoryBuilders,
 } from './workload-action-builders';
-import { helmReleaseEntityKey, helmReleaseGraphEntityType, helmReleaseResourceEntityType } from './workloads-entity-factory';
+import {
+  helmReleaseEntityKey,
+  helmReleaseGraphEntityType,
+  helmReleaseHistoryEntityType,
+  helmReleaseResourceEntityType,
+} from './workloads-entity-factory';
 
 
 export function generateWorkloadsEntities(endpointDefinition: StratosEndpointExtensionDefinition): StratosBaseCatalogEntity[] {
+
   return [
     generateReleaseEntity(endpointDefinition),
     generateReleaseGraphEntity(endpointDefinition),
     generateReleaseResourceEntity(endpointDefinition),
+    generateReleaseHistoryEntity(endpointDefinition)
   ];
 }
 
@@ -71,3 +81,18 @@ function generateReleaseResourceEntity(endpointDefinition: StratosEndpointExtens
   return workloadsEntityCatalog.resource;
 }
 
+function generateReleaseHistoryEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
+  const definition = {
+    type: helmReleaseHistoryEntityType,
+    schema: kubernetesEntityFactory(helmReleaseHistoryEntityType),
+    endpoint: endpointDefinition
+  };
+  workloadsEntityCatalog.history = new StratosCatalogEntity<IFavoriteMetadata, HelmReleaseHistory, WorkloadResourceHistoryBuilders>(
+    definition,
+    {
+      actionBuilders: workloadResourceHistoryBuilders
+    }
+  );
+  return workloadsEntityCatalog.history;
+}
+
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.actions.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.actions.ts
index b2448b591f..d80ba31beb 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.actions.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.actions.ts
@@ -1,7 +1,7 @@
 import { EntityRequestAction } from 'frontend/packages/store/src/types/request.types';
 
-import { PaginatedAction } from '../../../../../../store/src/types/pagination.types';
 import { MonocularPaginationAction } from '../../../helm/store/helm.actions';
+import { HelmUpgradeValues } from '../../../helm/store/helm.types';
 import {
   KUBERNETES_ENDPOINT_TYPE,
   kubernetesEntityFactory,
@@ -15,6 +15,7 @@ import {
   getHelmReleaseResourceId,
   helmReleaseEntityKey,
   helmReleaseGraphEntityType,
+  helmReleaseHistoryEntityType,
   helmReleaseResourceEntityType,
 } from './workloads-entity-factory';
 
@@ -38,12 +39,16 @@ export const UPDATE_HELM_RELEASE = '[Helm] Update Release';
 export const UPDATE_HELM_RELEASE_SUCCESS = '[Helm] Update Release Success';
 export const UPDATE_HELM_RELEASE_FAILURE = '[Helm] Update Release Failure';
 
-interface HelmReleaseSingleEntity extends EntityRequestAction {
-  guid: string;
-}
+export const GET_HELM_RELEASE_HISTORY = '[Helm] Get Release History';
+export const GET_HELM_RELEASE_HISTORY_SUCCESS = '[Helm] Get Release History Success';
+export const GET_HELM_RELEASE_HISTORY_FAILURE = '[Helm] Get Release History Failure';
 
-interface HelmReleasePaginated extends PaginatedAction, EntityRequestAction {
+export const UPGRADE_HELM_RELEASE = '[Helm] Upgrade Release';
+export const UPGRADE_HELM_RELEASE_SUCCESS = '[Helm] Upgrade Release Success';
+export const UPGRADE_HELM_RELEASE_FAILURE = '[Helm] Upgrade Release Failure';
 
+interface HelmReleaseSingleEntity extends EntityRequestAction {
+  guid: string;
 }
 
 export class GetHelmReleases implements MonocularPaginationAction {
@@ -170,3 +175,46 @@ export class GetHelmReleaseServices implements KubePaginationAction {
   };
   flattenPagination = true;
 }
+
+export class GetHelmReleaseHistory implements HelmReleaseSingleEntity {
+  constructor(
+    public endpointGuid: string,
+    public namespace: string,
+    public releaseTitle: string
+  ) {
+    this.guid = getHelmReleaseId(this.endpointGuid, this.namespace, this.releaseTitle);
+  }
+  type = GET_HELM_RELEASE_HISTORY;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
+  entity = kubernetesEntityFactory(helmReleaseHistoryEntityType);
+  entityType = helmReleaseHistoryEntityType;
+  actions = [
+    GET_HELM_RELEASE_HISTORY,
+    GET_HELM_RELEASE_HISTORY_SUCCESS,
+    GET_HELM_RELEASE_HISTORY_FAILURE
+  ];
+
+  guid: string;
+}
+
+export class UpgradeHelmRelease implements HelmReleaseSingleEntity {
+  guid: string;
+  type = UPGRADE_HELM_RELEASE;
+  endpointType = KUBERNETES_ENDPOINT_TYPE;
+  entity = kubernetesEntityFactory(helmReleaseEntityKey);
+  entityType = helmReleaseEntityKey;
+  constructor(
+    public releaseTitle: string,
+    public endpointGuid: string,
+    public namespace: string,
+    public values: HelmUpgradeValues
+  ) {
+    this.guid = getHelmReleaseId(this.endpointGuid, this.namespace, this.releaseTitle);
+  }
+  updatingKey = 'upgrading';
+  actions = [
+    UPGRADE_HELM_RELEASE,
+    UPGRADE_HELM_RELEASE_SUCCESS,
+    UPGRADE_HELM_RELEASE_FAILURE
+  ];
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.effects.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.effects.ts
index ea7add12fe..a572f14604 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.effects.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.effects.ts
@@ -8,6 +8,7 @@ import { catchError, flatMap, mergeMap } from 'rxjs/operators';
 
 import { AppState } from '../../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
+import { ApiRequestTypes } from '../../../../../../store/src/reducers/api-request-reducer/request-helpers';
 import { NormalizedResponse } from '../../../../../../store/src/types/api.types';
 import {
   EntityRequestAction,
@@ -16,9 +17,19 @@ import {
   WrapperRequestActionSuccess,
 } from '../../../../../../store/src/types/request.types';
 import { HelmEffects } from '../../../helm/store/helm.effects';
-import { HelmRelease } from '../workload.types';
+import { HelmRelease, HelmReleaseHistory } from '../workload.types';
+import { workloadsEntityCatalog } from './../workloads-entity-catalog';
 import { getHelmReleaseId } from './workloads-entity-factory';
-import { GET_HELM_RELEASE, GET_HELM_RELEASES, GetHelmRelease, GetHelmReleases } from './workloads.actions';
+import {
+  GET_HELM_RELEASE,
+  GET_HELM_RELEASE_HISTORY,
+  GET_HELM_RELEASES,
+  GetHelmRelease,
+  GetHelmReleaseHistory,
+  GetHelmReleases,
+  UPGRADE_HELM_RELEASE,
+  UpgradeHelmRelease,
+} from './workloads.actions';
 
 @Injectable()
 export class WorkloadsEffects {
@@ -82,7 +93,77 @@ export class WorkloadsEffects {
     })
   );
 
-  private mapHelmRelease(data, endpointId, guid: string) {
+  @Effect()
+  fetchHelmReleaseHistory$ = this.actions$.pipe(
+    ofType<GetHelmReleaseHistory>(GET_HELM_RELEASE_HISTORY),
+    flatMap(action => {
+      const entityKey = entityCatalog.getEntityKey(action);
+      return this.makeRequest(
+        action,
+        `/pp/${this.proxyAPIVersion}/helm/releases/${action.endpointGuid}/${action.namespace}/${action.releaseTitle}/history`,
+        (response) => {
+          const processedData = {
+            entities: { [entityKey]: {} },
+            result: []
+          } as NormalizedResponse;
+
+          const data: HelmReleaseHistory = {
+            endpointId: action.endpointGuid,
+            releaseTitle: action.releaseTitle,
+            revisions: []
+          };
+
+          for (const version of response) {
+            data.revisions.push({
+              ...version.info,
+              revision: version.version,
+              chart: version.chart.metadata,
+              values: version.chart.values
+            });
+          }
+          // Store the data against the release guid
+          processedData.entities[entityKey][action.guid] = data;
+          processedData.result.push(action.guid);
+          return processedData;
+        }, [action.endpointGuid]);
+    })
+  );
+
+  @Effect()
+  helmUpgrade$ = this.actions$.pipe(
+    ofType<UpgradeHelmRelease>(UPGRADE_HELM_RELEASE),
+    flatMap(action => {
+      const requestType: ApiRequestTypes = 'update';
+      const url = `/pp/v1//helm/releases/${action.endpointGuid}/${action.namespace}/${action.releaseTitle}`;
+      this.store.dispatch(new StartRequestAction(action, requestType));
+      // Refresh the workload after upgrade
+      const fetchAction = workloadsEntityCatalog.release.actions.get(action.releaseTitle, action.endpointGuid,
+        { namespace: action.namespace });
+      return this.httpClient.post(url, action.values).pipe(
+        mergeMap(() => {
+          return [
+            fetchAction,
+            new WrapperRequestActionSuccess(null, action)
+          ];
+        }),
+        catchError(error => {
+          const { status, message } = HelmEffects.createHelmError(error);
+          const errorMessage = `Failed to upgrade helm release: ${message}`;
+          return [
+            new WrapperRequestActionFailed(errorMessage, action, requestType, {
+              endpointIds: [action.endpointGuid],
+              url: error.url || url,
+              eventCode: status,
+              message: errorMessage,
+              error
+            })
+          ];
+        })
+      );
+    })
+  );
+
+private mapHelmRelease(data, endpointId, guid: string) {
     const helmRelease: HelmRelease = {
       ...data,
       endpointId
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-data-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-data-source.ts
new file mode 100644
index 0000000000..f98ddea450
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-data-source.ts
@@ -0,0 +1,61 @@
+import { Store } from '@ngrx/store';
+import { Observable, of } from 'rxjs';
+
+import {
+  DataFunction,
+  ListDataSource,
+} from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
+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 { PaginationEntityState } from '../../../../../../store/src/types/pagination.types';
+import { helmEntityCatalog } from '../../../helm/helm-entity-catalog';
+import { helmEntityFactory, monocularChartVersionsEntityType } from '../../../helm/helm-entity-factory';
+import { MonocularVersion } from './../../../helm/store/helm.types';
+
+
+const typeFilterKey = 'versionType';
+
+
+export class HelmReleaseVersionsDataSource extends ListDataSource<MonocularVersion> {
+
+  private currentVersion: string;
+
+  constructor(
+    store: Store<any>,
+    listConfig: IListConfig<MonocularVersion>,
+    repoName: string,
+    chartName: string,
+    version: string,
+  ) {
+    super({
+      store,
+      action: helmEntityCatalog.chartVersions.actions.getMultiple(repoName, chartName),
+      schema: helmEntityFactory(monocularChartVersionsEntityType),
+      getRowUniqueId: (object: MonocularVersion) => object.id,
+      paginationKey: helmEntityCatalog.chartVersions.actions.getMultiple(repoName, chartName).paginationKey,
+      isLocal: true,
+      transformEntities: [
+        (entities: MonocularVersion[], paginationState: PaginationEntityState) => this.endpointTypeFilter(entities, paginationState)
+      ],
+      listConfig,
+    });
+
+    this.currentVersion = version;
+    this.getRowState = (row: any): Observable<RowState> => of({ highlighted: row.attributes.version === this.currentVersion });
+  }
+
+
+  public endpointTypeFilter: DataFunction<MonocularVersion> = (entities: MonocularVersion[], paginationState: PaginationEntityState) => {
+    if (
+      !paginationState.clientPagination ||
+      !paginationState.clientPagination.filter ||
+      !paginationState.clientPagination.filter.items[typeFilterKey]) {
+      return entities;
+    }
+
+    // Filter out development versions if configured
+    const showAll = paginationState.clientPagination.filter.items[typeFilterKey] === 'all';
+    return showAll ?  entities : entities.filter(e => e.attributes.version.indexOf('-') === -1);
+  }
+}
+
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-list-config.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-list-config.ts
new file mode 100644
index 0000000000..6d712da1d5
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-list-config.ts
@@ -0,0 +1,131 @@
+import { Store } from '@ngrx/store';
+import * as moment from 'moment';
+import { BehaviorSubject, of } from 'rxjs';
+import { first } from 'rxjs/operators';
+
+import { ListDataSource } from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
+import {
+  TableCellRadioComponent,
+} from '../../../../../../core/src/shared/components/list/list-table/table-cell-radio/table-cell-radio.component';
+import { ITableColumn } from '../../../../../../core/src/shared/components/list/list-table/table.types';
+import {
+  defaultPaginationPageSizeOptionsTable,
+  IGlobalListAction,
+  IListAction,
+  IListConfig,
+  IListMultiFilterConfig,
+  IMultiListAction,
+  ListViewTypes,
+} from '../../../../../../core/src/shared/components/list/list.component.types';
+import { MonocularVersion } from '../../../helm/store/helm.types';
+import { HelmReleaseVersionsDataSource } from './release-version-data-source';
+
+const typeFilterKey = 'versionType';
+
+export class ReleaseUpgradeVersionsListConfig implements IListConfig<any> {
+
+  public versionsDataSource: ListDataSource<MonocularVersion>;
+
+  private multiFiltersConfigs: IListMultiFilterConfig[];
+
+  getGlobalActions: () => IGlobalListAction<any>[];
+  getMultiActions: () => IMultiListAction<any>[];
+  getSingleActions: () => IListAction<any>[];
+
+  columns: Array<ITableColumn<any>> = [
+    {
+      columnId: 'radio',
+      headerCell: () => '',
+      cellComponent: TableCellRadioComponent,
+      class: 'table-column-select',
+      cellFlex: '0 0 60px'
+    },
+    {
+      columnId: 'version',
+      headerCell: () => 'Version',
+      cellFlex: '2',
+      cellDefinition: {
+        valuePath: 'attributes.version'
+      }
+    },
+    {
+      columnId: 'created',
+      headerCell: () => 'Created',
+      cellFlex: '3',
+      cellDefinition: {
+        getValue: row => moment(row.attributes.created).format('LLL')
+      }
+    },
+    {
+      columnId: 'age',
+      headerCell: () => 'Age',
+      cellFlex: '2',
+      cellDefinition: {
+        getValue: row => moment(row.attributes.created).fromNow(true)
+      }
+    },
+  ];
+  pageSizeOptions = defaultPaginationPageSizeOptionsTable;
+  viewType = ListViewTypes.TABLE_ONLY;
+
+  hideRefresh = true;
+
+  getColumns = () => this.columns;
+  getMultiFiltersConfigs = (): IListMultiFilterConfig[] => this.multiFiltersConfigs;
+
+  getDataSource = () => this.versionsDataSource;
+
+  constructor(
+    store: Store<any>,
+    repoName: string,
+    chartName: string,
+    version: string,
+  ) {
+    this.getGlobalActions = () => [];
+    this.getMultiActions = () => [];
+    this.getSingleActions = () => [];
+
+    this.versionsDataSource = new HelmReleaseVersionsDataSource(store, this, repoName, chartName, version);
+
+    this.multiFiltersConfigs = [{
+      hideAllOption: true,
+      autoSelectFirst: true,
+      key: typeFilterKey,
+        label: 'Endpoint Type',
+        list$: of([
+          {
+            label: 'Release Versions',
+            item: {},
+            value: 'release'
+          },
+          {
+            label: 'All Versions',
+            item: {},
+            value: 'all'
+          }
+        ]),
+        loading$: of(false),
+        select: new BehaviorSubject(undefined)
+      }];
+
+    // Auto-select first non-development version
+    setTimeout(() => {
+      this.versionsDataSource.page$.pipe(first()).subscribe(rs => {
+        if (rs && rs.length > 0) {
+          this.versionsDataSource.selectedRowToggle(this.getFirstNonDevelopmentVersion(rs), false);
+        }
+      });
+    }, 0);
+  }
+
+  // Get the first version that is a non-development version (no hypen in the version number)
+  private getFirstNonDevelopmentVersion(rows: MonocularVersion[]): MonocularVersion {
+    for (const mv of rows) {
+      if (mv.attributes.version.indexOf('-') === -1) {
+        return mv
+      }
+    }
+    return rows[0];
+  }
+
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.html
new file mode 100644
index 0000000000..dae9721887
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.html
@@ -0,0 +1,37 @@
+<app-page-header>
+  Upgrade Workload
+</app-page-header>
+<app-steppers [cancel]="cancelUrl">
+  <app-step title="Version" [valid]="validate$ | async">
+    <app-list class="workload-upgrade__list" *ngIf="listConfig" [listConfig]="listConfig"></app-list>
+  </app-step>
+  <app-step title="Overrides" [onNext]="doUpgrade" finishButtonText="Upgrade">
+    <div class="workload-upgrade__form">
+    <form [formGroup]="overrides" class="stepper-form overrides_form">
+      <div class="workload-upgrade__heading">
+        <h3 class="workload-upgrade__title">Enter YAML Value Overrides</h3>
+        <!--
+        <button (click)="useValuesYaml()" [disabled]="!valuesYaml" class=""workload-upgrade__button" mat-button
+          color="primary">Copy from values.yaml</button>
+        -->
+      </div>
+      <mat-form-field [floatLabel]="'always'" class="overrides_form-field">
+        <mat-label>Values</mat-label>
+        <textarea #overridesYamlTextArea class="overrides__yaml" matInput formControlName="values" name="Values"
+          spellcheck="false"></textarea>
+      </mat-form-field>
+    </form>
+    <!--
+    <mat-slide-toggle (change)="toggleAdvancedOptions()">Show Advanced Options</mat-slide-toggle>
+    -->
+    </div>
+  </app-step>
+
+  <!-- Add support for recreate pods and other advanced options in the future
+  <app-step [hidden]="!showAdvancedOptions" [onNext]="doUpgrade" title="Advanced" finishButtonText="Upgrade">
+    Advanced Options
+  </app-step>
+  -->
+
+
+</app-steppers>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.scss
new file mode 100644
index 0000000000..8d5007efa3
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.scss
@@ -0,0 +1,59 @@
+:host {
+  flex: 1;
+}
+.workload-upgrade {
+
+  &__list {
+    width: 100%;
+  }
+
+  &__form {
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+  }
+  &__heading {
+    align-items: center;
+    display: flex;
+  }
+
+  &__title {
+    flex: 1;
+    font-size: 14px;
+  }
+  &__button {
+    height: 36px;
+  }
+}
+
+form {
+  flex: 1;
+
+  mat-checkbox {
+    display: flex;
+    height: 23px;
+    margin-top: 10px;
+  }
+}
+
+.overrides {
+  &__yaml {
+    background-color: rgba(0, 0, 0, .1);
+    font-family: 'Source Code Pro', monospace;
+    height: 400px;
+  }
+
+  &_form {
+    max-width: 100%;
+  }
+
+  &_form-field {
+    flex: 1;
+    height: 100%;
+    width: 100%;
+  }
+}
+
+form.overrides_form {
+  max-width: 100%;
+}
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.spec.ts
new file mode 100644
index 0000000000..f77dc54235
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.spec.ts
@@ -0,0 +1,37 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HelmReleaseProviders, KubeBaseGuidMock } from '../../kubernetes.testing.module';
+import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
+import { WorkloadsBaseTestingModule } from '../workloads.testing.module';
+import { UpgradeReleaseComponent } from './upgrade-release.component';
+
+
+describe('UpgradeReleaseComponent', () => {
+  let component: UpgradeReleaseComponent;
+  let fixture: ComponentFixture<UpgradeReleaseComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ UpgradeReleaseComponent ],
+      imports: [
+        ...WorkloadsBaseTestingModule
+      ],
+      providers: [
+        KubernetesEndpointService,
+        KubeBaseGuidMock,
+        ...HelmReleaseProviders,
+      ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(UpgradeReleaseComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts
new file mode 100644
index 0000000000..8ef8a83118
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts
@@ -0,0 +1,114 @@
+import { Component } from '@angular/core';
+import { FormControl, FormGroup } from '@angular/forms';
+import { ActivatedRoute } from '@angular/router';
+import { Store } from '@ngrx/store';
+import { Observable, of } from 'rxjs';
+import { filter, first, map, pairwise } from 'rxjs/operators';
+
+import { StepComponent, StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
+import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types';
+import { HelmUpgradeValues } from '../../../helm/store/helm.types';
+import { HelmReleaseHelperService } from '../release/tabs/helm-release-helper.service';
+import { HelmReleaseGuid } from '../workload.types';
+import { workloadsEntityCatalog } from './../workloads-entity-catalog';
+import { ReleaseUpgradeVersionsListConfig } from './release-version-list-config';
+
+@Component({
+  selector: 'app-upgrade-release',
+  templateUrl: './upgrade-release.component.html',
+  styleUrls: ['./upgrade-release.component.scss'],
+  providers: [
+    HelmReleaseHelperService,
+    {
+      provide: HelmReleaseGuid,
+      useFactory: (activatedRoute: ActivatedRoute) => ({
+        guid: activatedRoute.snapshot.params.guid
+      }),
+      deps: [
+        ActivatedRoute
+      ]
+    }
+  ]
+})
+export class UpgradeReleaseComponent {
+
+  public cancelUrl;
+  public listConfig;
+  public validate$: Observable<boolean>;
+  private version;
+  public overrides: FormGroup;
+
+  // Future
+  public showAdvancedOptions = false;
+
+  constructor(store: Store<any>, public helper: HelmReleaseHelperService) {
+
+    this.cancelUrl = `/workloads/${this.helper.guid}`;
+
+    // Form for overrides step (Helm Values)
+    this.overrides = new FormGroup({
+      values: new FormControl('')
+    });
+
+    this.helper.hasUpgrade(true).pipe(
+      filter(c => !!c),
+      first()
+    ).subscribe(chart => {
+      const name = chart.upgrade.name;
+      const repoName = chart.upgrade.repo.name;
+      const version = chart.release.chart.metadata.version;
+      this.listConfig = new ReleaseUpgradeVersionsListConfig(store, repoName, name, version);
+
+      // First step is valid when a version has been selected
+      this.validate$ = this.listConfig.versionsDataSource.selectedRows$.pipe(
+        map((rows: Map<string, any>) => {
+          if (rows && rows.size === 1) {
+            this.version = rows.values().next().value;
+            return true;
+          }
+          return false;
+        })
+      );
+    });
+  }
+
+  // Hide/show the advanced options step
+  toggleAdvancedOptions() {
+    this.showAdvancedOptions = !this.showAdvancedOptions;
+  }
+
+  doUpgrade: StepOnNextFunction = (index: number, step: StepComponent) => {
+    // If we are showing the advanced options, don't upgrade if we aer not on the last step
+    if (this.showAdvancedOptions && index === 1 ) {
+      return of({ success: true });
+    }
+
+    const values: HelmUpgradeValues = {
+      ...this.overrides.value,
+      restartPods: false,
+      chart: {
+        name: this.version.relationships.chart.data.name,
+        repo: this.version.relationships.chart.data.repo.name,
+        version: this.version.attributes.version,
+      },
+    };
+
+    // Make the request
+    return workloadsEntityCatalog.release.api.upgrade<ActionState>(this.helper.releaseTitle,
+      this.helper.endpointGuid, this.helper.namespace, values).pipe(
+      // Wait for result of request
+      filter(state => !!state),
+      pairwise(),
+      filter(([oldVal, newVal]) => (oldVal.busy && !newVal.busy)),
+      map(([, newVal]) => newVal),
+      map(result => ({
+        success: !result.error,
+        redirect: !result.error,
+        redirectPayload: {
+          path: !result.error ? this.cancelUrl : ''
+        },
+        message: !result.error ? '' : result.message
+      }))
+    );
+  }
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workload.types.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workload.types.ts
index bf5b8e708b..321e86b734 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workload.types.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workload.types.ts
@@ -21,7 +21,11 @@ export interface HelmRelease {
   chart: {
     values: any;
     metadata: {
+      name: string;
+      version: string;
       icon?: string;
+      description: string;
+      sources: string[];
     };
   };
 }
@@ -67,6 +71,19 @@ export interface HelmReleaseResources extends HelmReleaseEntity {
   kind: string
 };
 
+export interface HelmReleaseRevision {
+  first_deployed: string;
+  last_deployed: string;
+  deleted: boolean;
+  description: string;
+  status: string;
+  revision: number;
+}
+
+export interface HelmReleaseHistory extends HelmReleaseEntity {
+  revisions: HelmReleaseRevision[],
+};
+
 export interface HelmReleaseKubeAPIResource extends KubeAPIResource {
   apiVersion: string;
   kind: string;
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads-entity-catalog.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads-entity-catalog.ts
index 6492abd0b9..30a8791541 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads-entity-catalog.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads-entity-catalog.ts
@@ -1,7 +1,12 @@
 import { StratosCatalogEntity } from '../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { IFavoriteMetadata } from '../../../../../store/src/types/user-favorites.types';
-import { WorkloadGraphBuilders, WorkloadReleaseBuilders, WorkloadResourceBuilders } from './store/workload-action-builders';
-import { HelmRelease, HelmReleaseGraph, HelmReleaseResources } from './workload.types';
+import {
+  WorkloadGraphBuilders,
+  WorkloadReleaseBuilders,
+  WorkloadResourceBuilders,
+  WorkloadResourceHistoryBuilders,
+} from './store/workload-action-builders';
+import { HelmRelease, HelmReleaseGraph, HelmReleaseHistory, HelmReleaseResources } from './workload.types';
 
 /**
  * A strongly typed collection of Workload Catalog Entities.
@@ -9,8 +14,9 @@ import { HelmRelease, HelmReleaseGraph, HelmReleaseResources } from './workload.
  */
 export class WorkloadsEntityCatalog {
   release: StratosCatalogEntity<IFavoriteMetadata, HelmRelease, WorkloadReleaseBuilders>;
-  graph: StratosCatalogEntity<IFavoriteMetadata, HelmReleaseGraph, WorkloadGraphBuilders>
-  resource: StratosCatalogEntity<IFavoriteMetadata, HelmReleaseResources, WorkloadResourceBuilders>
+  graph: StratosCatalogEntity<IFavoriteMetadata, HelmReleaseGraph, WorkloadGraphBuilders>;
+  resource: StratosCatalogEntity<IFavoriteMetadata, HelmReleaseResources, WorkloadResourceBuilders>;
+  history: StratosCatalogEntity<IFavoriteMetadata, HelmReleaseHistory, WorkloadResourceHistoryBuilders>;
 }
 
 /**
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
index 05804cb596..44ab5ce4bb 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
@@ -7,6 +7,9 @@ import { SharedModule } from '../../../../../core/src/shared/shared.module';
 import { KubernetesModule } from '../kubernetes.module';
 import { HelmReleaseCardComponent } from './list-types/helm-release-card/helm-release-card.component';
 import { HelmReleaseTabBaseComponent } from './release/helm-release-tab-base/helm-release-tab-base.component';
+import {
+  HelmReleaseAnalysisTabComponent,
+} from './release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component';
 import { HelmReleaseNotesTabComponent } from './release/tabs/helm-release-notes-tab/helm-release-notes-tab.component';
 import { HelmReleasePodsTabComponent } from './release/tabs/helm-release-pods/helm-release-pods-tab.component';
 import {
@@ -17,8 +20,9 @@ import { HelmReleaseSummaryTabComponent } from './release/tabs/helm-release-summ
 import { HelmReleaseValuesTabComponent } from './release/tabs/helm-release-values-tab/helm-release-values-tab.component';
 import { HelmReleasesTabComponent } from './releases-tab/releases-tab.component';
 import { WorkloadsStoreModule } from './store/workloads.store.module';
+import { UpgradeReleaseComponent } from './upgrade-release/upgrade-release.component';
 import { WorkloadsRouting } from './workloads.routing';
-import { HelmReleaseAnalysisTabComponent } from './release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component';
+import { HelmReleaseHistoryTabComponent } from './release/tabs/helm-release-history-tab/helm-release-history-tab.component';
 import { WorkloadLiveReloadComponent } from './release/workload-live-reload/workload-live-reload.component';
 
 @NgModule({
@@ -29,7 +33,7 @@ import { WorkloadLiveReloadComponent } from './release/workload-live-reload/work
     WorkloadsStoreModule,
     WorkloadsRouting,
     NgxGraphModule,
-    KubernetesModule
+    KubernetesModule,
   ],
   declarations: [
     HelmReleasesTabComponent,
@@ -43,6 +47,8 @@ import { WorkloadLiveReloadComponent } from './release/workload-live-reload/work
     HelmReleaseCardComponent,
     HelmReleaseAnalysisTabComponent,
     WorkloadLiveReloadComponent,
+    UpgradeReleaseComponent,
+    HelmReleaseHistoryTabComponent,
   ],
   entryComponents: [
     HelmReleaseCardComponent
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.routing.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.routing.ts
index dc687ecd76..a7732ac7a5 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.routing.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.routing.ts
@@ -3,6 +3,10 @@ import { RouterModule, Routes } from '@angular/router';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
 import { HelmReleaseTabBaseComponent } from './release/helm-release-tab-base/helm-release-tab-base.component';
+import {
+  HelmReleaseAnalysisTabComponent,
+} from './release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component';
+import { HelmReleaseHistoryTabComponent } from './release/tabs/helm-release-history-tab/helm-release-history-tab.component';
 import { HelmReleaseNotesTabComponent } from './release/tabs/helm-release-notes-tab/helm-release-notes-tab.component';
 import { HelmReleasePodsTabComponent } from './release/tabs/helm-release-pods/helm-release-pods-tab.component';
 import {
@@ -12,7 +16,7 @@ import { HelmReleaseServicesTabComponent } from './release/tabs/helm-release-ser
 import { HelmReleaseSummaryTabComponent } from './release/tabs/helm-release-summary-tab/helm-release-summary-tab.component';
 import { HelmReleaseValuesTabComponent } from './release/tabs/helm-release-values-tab/helm-release-values-tab.component';
 import { HelmReleasesTabComponent } from './releases-tab/releases-tab.component';
-import { HelmReleaseAnalysisTabComponent } from './release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component';
+import { UpgradeReleaseComponent } from './upgrade-release/upgrade-release.component';
 
 const routes: Routes = [
   {
@@ -23,6 +27,11 @@ const routes: Routes = [
         component: HelmReleasesTabComponent,
         pathMatch: 'full',
       },
+      {
+        path: ':guid/upgrade',
+        component: UpgradeReleaseComponent,
+        pathMatch: 'full',
+      },
       {
         // Helm Release Views
         path: ':guid',
@@ -35,6 +44,7 @@ const routes: Routes = [
           { path: 'summary', component: HelmReleaseSummaryTabComponent },
           { path: 'notes', component: HelmReleaseNotesTabComponent },
           { path: 'values', component: HelmReleaseValuesTabComponent },
+          { path: 'history', component: HelmReleaseHistoryTabComponent },
           { path: 'pods', component: HelmReleasePodsTabComponent },
           { path: 'services', component: HelmReleaseServicesTabComponent },
           { path: 'graph', component: HelmReleaseResourceGraphComponent },
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.testing.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.testing.module.ts
new file mode 100644
index 0000000000..5f6b193777
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.testing.module.ts
@@ -0,0 +1,47 @@
+import { HttpClientModule } from '@angular/common/http';
+import { NgModule } from '@angular/core';
+import { CoreModule } from '@angular/flex-layout';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
+
+import { SharedModule } from '../../../../../core/src/public-api';
+import { AppTestModule } from '../../../../../core/test-framework/core-test.helper';
+import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../../../../store/src/entity-catalog.module';
+import { entityCatalog, TestEntityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
+import { generateStratosEntities } from '../../../../../store/src/stratos-entity-generator';
+import { createBasicStoreModule } from '../../../../../store/testing/public-api';
+import { generateHelmEntities } from '../../helm/helm-entity-generator';
+import { HelmTestingModule } from '../../helm/helm-testing.module';
+import { generateKubernetesEntities } from '../kubernetes-entity-generator';
+
+@NgModule({
+  imports: [{
+    ngModule: EntityCatalogFeatureModule,
+    providers: [
+      {
+        provide: CATALOGUE_ENTITIES, useFactory: () => {
+          const testEntityCatalog = entityCatalog as TestEntityCatalog;
+          testEntityCatalog.clear();
+          return [
+            ...generateStratosEntities(),
+            ...generateKubernetesEntities(),
+            ...generateHelmEntities(),
+          ];
+        }
+      }
+    ]
+  }]
+})
+export class WorkloadsTestingModule { }
+
+export const WorkloadsBaseTestingModule = [
+  AppTestModule,
+  RouterTestingModule,
+  CoreModule,
+  createBasicStoreModule(),
+  NoopAnimationsModule,
+  HttpClientModule,
+  SharedModule,
+  HelmTestingModule,
+  WorkloadsTestingModule
+]
diff --git a/src/jetstream/plugins/kubernetes/install_release.go b/src/jetstream/plugins/kubernetes/install_release.go
index 0505f51f06..15cf67623e 100644
--- a/src/jetstream/plugins/kubernetes/install_release.go
+++ b/src/jetstream/plugins/kubernetes/install_release.go
@@ -15,6 +15,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 
 	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/chart"
 	"helm.sh/helm/v3/pkg/chart/loader"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
@@ -34,6 +35,15 @@ type installRequest struct {
 	} `json:"chart"`
 }
 
+type upgradeRequest struct {
+	Values string `json:"values"`
+	Chart  struct {
+		Name       string `json:"name"`
+		Repository string `json:"repo"`
+		Version    string `json:"version"`
+	} `json:"chart"`
+}
+
 // Monocular is a plugin for Monocular
 type Monocular interface {
 	GetChartStore() *chartsvc.ChartSvcDatastore
@@ -51,36 +61,11 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 		return interfaces.NewJetstreamErrorf("Could not get Create Release Parameters: %v+", err)
 	}
 
-	chartID := fmt.Sprintf("%s/%s", params.Chart.Repository, params.Chart.Name)
-
-	log.Debugf("Helm: Installing release %s", chartID)
-
-	downloadURL, err := c.getChart(chartID, params.Chart.Version)
-	if err != nil {
-		return interfaces.NewJetstreamErrorf("Could not get the Download URL for the Helm Chart")
-	}
-
-	log.Debugf("Chart Download URL: %s", downloadURL)
-
-	// NWM: Should we look up Helm Repository endpoint and use the value from that
-	httpClient := c.portalProxy.GetHttpClient(false)
-	resp, err := httpClient.Get(downloadURL)
-	if err != nil {
-		return interfaces.NewJetstreamErrorf("Could not download Chart Archive: %s", err)
-	}
-	if resp.StatusCode != 200 {
-		return interfaces.NewJetstreamErrorf("Could not download Chart Archive: %s", resp.Status)
-	}
-
-	defer resp.Body.Close()
-
-	chart, err := loader.LoadArchive(resp.Body)
+	chart, err := c.loadChart(params.Chart.Repository, params.Chart.Name, params.Chart.Version)
 	if err != nil {
-		return interfaces.NewJetstreamErrorf("Could not load chart from archive: %v+", err)
+		return interfaces.NewJetstreamErrorf("Could not load chart: %v+", err)
 	}
 
-	log.Debugf("Loaded helm chart: %s", chart.Name())
-
 	endpointGUID := params.Endpoint
 	userGUID := ec.Get("user_id").(string)
 
@@ -154,6 +139,32 @@ func (c *KubernetesSpecification) getChart(chartID, version string) (string, err
 	return "", errors.New("Could not find Chart Version")
 }
 
+// Load the Helm chart for the given repository, name and version
+func (c *KubernetesSpecification) loadChart(repo, name, version string) (*chart.Chart, error) {
+
+	chartID := fmt.Sprintf("%s/%s", repo, name)
+	downloadURL, err := c.getChart(chartID, version)
+	if err != nil {
+		return nil, fmt.Errorf("Could not get the Download URL for the Helm Chart")
+	}
+
+	log.Debugf("Helm Chart Download URL: %s", downloadURL)
+
+	// NWM: Should we look up Helm Repository endpoint and use the value from that
+	httpClient := c.portalProxy.GetHttpClient(false)
+	resp, err := httpClient.Get(downloadURL)
+	if err != nil {
+		return nil, fmt.Errorf("Could not download Chart Archive: %s", err)
+	}
+	if resp.StatusCode != 200 {
+		return nil, fmt.Errorf("Could not download Chart Archive: %s", resp.Status)
+	}
+
+	defer resp.Body.Close()
+
+	return loader.LoadArchive(resp.Body)
+}
+
 // DeleteRelease will delete a release
 func (c *KubernetesSpecification) DeleteRelease(ec echo.Context) error {
 	endpointGUID := ec.Param("endpoint")
@@ -170,7 +181,6 @@ func (c *KubernetesSpecification) DeleteRelease(ec echo.Context) error {
 	defer hc.Cleanup()
 
 	uninstall := action.NewUninstall(config)
-
 	deleteResponse, err := uninstall.Run(releaseName)
 	if err != nil {
 		return interfaces.NewJetstreamError("Could not delete Helm Release")
@@ -178,3 +188,72 @@ func (c *KubernetesSpecification) DeleteRelease(ec echo.Context) error {
 
 	return ec.JSON(200, deleteResponse)
 }
+
+// GetReleaseHistory will get the history for a release
+func (c *KubernetesSpecification) GetReleaseHistory(ec echo.Context) error {
+	endpointGUID := ec.Param("endpoint")
+	releaseName := ec.Param("name")
+	namespace := ec.Param("namespace")
+
+	userGUID := ec.Get("user_id").(string)
+
+	config, hc, err := c.GetHelmConfiguration(endpointGUID, userGUID, namespace)
+	if err != nil {
+		return interfaces.NewJetstreamErrorf("Could not get Helm Configuration for endpoint: %+v", err)
+	}
+
+	defer hc.Cleanup()
+
+	history := action.NewHistory(config)
+	historyResponse, err := history.Run(releaseName)
+	if err != nil {
+		return interfaces.NewJetstreamError("Could not get history for the Helm Release")
+	}
+
+	return ec.JSON(200, historyResponse)
+}
+
+// UpgradeRelease will upgrade the specified release
+func (c *KubernetesSpecification) UpgradeRelease(ec echo.Context) error {
+	endpointGUID := ec.Param("endpoint")
+	releaseName := ec.Param("name")
+	namespace := ec.Param("namespace")
+
+	userGUID := ec.Get("user_id").(string)
+
+	bodyReader := ec.Request().Body
+	buf := new(bytes.Buffer)
+	buf.ReadFrom(bodyReader)
+
+	var params upgradeRequest
+	err := json.Unmarshal(buf.Bytes(), &params)
+	if err != nil {
+		return interfaces.NewJetstreamErrorf("Could not get Upgrade Release Parameters: %+v", err)
+	}
+
+	config, hc, err := c.GetHelmConfiguration(endpointGUID, userGUID, namespace)
+	if err != nil {
+		return interfaces.NewJetstreamErrorf("Could not get Helm Configuration for endpoint: %+v", err)
+	}
+
+	defer hc.Cleanup()
+
+	chart, err := c.loadChart(params.Chart.Repository, params.Chart.Name, params.Chart.Version)
+	if err != nil {
+		return interfaces.NewJetstreamErrorf("Could not load chart for upgrade: %+v", err)
+	}
+
+	userSuppliedValues := map[string]interface{}{}
+	if err := yaml.Unmarshal([]byte(params.Values), &userSuppliedValues); err != nil {
+		// Could not parse the user's values
+		return interfaces.NewJetstreamErrorf("Could not parse values: %+v", err)
+	}
+
+	upgrade := action.NewUpgrade(config)
+	upgradeResponse, err := upgrade.Run(releaseName, chart, userSuppliedValues)
+	if err != nil {
+		return interfaces.NewJetstreamErrorf("Could not upgrade Helm Release: %+v", err)
+	}
+
+	return ec.JSON(200, upgradeResponse)
+}
diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
index fb374deb69..628251591c 100644
--- a/src/jetstream/plugins/kubernetes/main.go
+++ b/src/jetstream/plugins/kubernetes/main.go
@@ -178,8 +178,10 @@ func (c *KubernetesSpecification) AddSessionGroupRoutes(echoGroup *echo.Group) {
 	echoGroup.GET("/helm/releases", c.ListReleases)
 	echoGroup.POST("/helm/install", c.InstallRelease)
 	echoGroup.DELETE("/helm/releases/:endpoint/:namespace/:name", c.DeleteRelease)
+	echoGroup.GET("/helm/releases/:endpoint/:namespace/:name/history", c.GetReleaseHistory)
 	echoGroup.GET("/helm/releases/:endpoint/:namespace/:name/status", c.GetReleaseStatus)
 	echoGroup.GET("/helm/releases/:endpoint/:namespace/:name", c.GetRelease)
+	echoGroup.POST("/helm/releases/:endpoint/:namespace/:name", c.UpgradeRelease)
 
 	// Kube Terminal
 	if c.kubeTerminal != nil {

From 799197834012f0e6a18d7a1abd1ff17e88c658c2 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Fri, 11 Sep 2020 10:19:30 +0100
Subject: [PATCH 611/648] Helm: Allow users to view and use repositories from
 Helm Hub (#463)

* Improve presentation and fix issue with development versions

* WIP

* Add support for Helm Upgrade and Helm history

* Remove console logging

* Add comment

* Minor tweaks following self-review

* WIP

* fix install button

* Fix actual helm install

* Remove helm repos view
- need to add endpoint type specific actions to endpoints list view (helm sync)

* Show per endpoint type actions in endpoints table
- use for helm sync

* Tidy up registration step

* Tidy up provider interceptor pattern

* Tidy up services, fix charts list filter by repo/helm hub

* Add endpoint unRegisterable, make helm types sub types, tidy up

* Remove debug logging

* Fix whitespace

* Minor tidy ups

* Fix compile issue

* Fixed versions again, and bugs following subtype split

* Fix unit tests

* Add db migration script to update existing helm endpoints with repo subtype

* Fix front-end unit tests

* Always show upgrade button

* Minor entity store type updates

* Convert unRegisterable to registeredLimit

* Changes following review

* Fix display of helm type in favourite cards
- favourite cards are NOT by subtype, so parent type must have label info

* Multiple Fixes
- Fix display of disconected text & box in endpoint favourite card
- Don't go out to fetch helm schema if there's none defined
- Fixes following merge

* Align icons in workload summary page

* Fix lint failures

* Address PR feedback

* Revert

* Remove description when checking for similar charts

* Only show button when the helm chart is available

* Improve types, start work on helm hub upgrade

* Fixes following merge

* Remove TODOs

Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
---
 src/frontend/packages/core/src/app.module.ts  |   3 -
 .../create-endpoint-base-step.component.ts    |  52 +++-
 .../card-number-metric.component.scss         |   1 +
 .../favorites-meta-card.component.scss        |   1 -
 .../meta-card-base/meta-card.component.html   |  32 ++-
 .../meta-card-base/meta-card.component.ts     |  11 +-
 .../endpoint-card/endpoint-card.component.ts  |  15 +-
 .../endpoint/endpoint-list.helpers.ts         |  45 +++-
 .../tile-selector/tile-selector.component.ts  |  10 +-
 src/frontend/packages/core/xsrf.module.ts     |   3 +
 .../src/entity-catalog/entity-catalog.ts      |   2 +-
 .../entity-catalog/entity-catalog.types.ts    |  18 +-
 .../helm/chart-view/monocular.component.ts    |   9 +-
 .../create-release.component.ts               |  19 +-
 .../src/custom/helm/helm-entity-factory.ts    |   6 +-
 .../src/custom/helm/helm-entity-generator.ts  |  62 ++++-
 .../helm-hub-registration.component.html      |  10 +
 .../helm-hub-registration.component.scss}     |   0
 .../helm-hub-registration.component.spec.ts   |  33 +++
 .../helm-hub-registration.component.ts        |  35 +++
 .../src/custom/helm/helm.module.ts            |  41 +--
 .../src/custom/helm/helm.routing.ts           |  11 +-
 .../src/custom/helm/helm.setup.module.ts      |   4 +
 .../monocular-charts-data-source.ts           |  25 +-
 .../monocular-charts-list-config.service.ts   |  23 +-
 ...onocular-repository-list-config.service.ts | 185 --------------
 .../monocular-repository-list-source.ts       |  65 -----
 .../monocular-tab-base.component.html         |   2 +-
 .../monocular-tab-base.component.ts           |   4 -
 .../src/custom/helm/monocular.interceptor.ts  |  67 +++++
 .../chart-details-usage.component.html        |  12 +-
 .../chart-details-usage.component.ts          |  25 +-
 .../chart-details-versions.component.ts       |   6 +-
 .../chart-details/chart-details.component.ts  |   3 +-
 .../chart-item/chart-item.component.spec.ts   |  13 +-
 .../chart-item/chart-item.component.ts        |   5 +-
 .../custom/helm/monocular/monocular.module.ts |  53 ++++
 .../helm/monocular/shared/models/chart.ts     |   3 +-
 .../shared/services/charts.service.ts         |  34 ++-
 .../shared/services/repos.service.ts          |   3 +-
 .../stratos-monocular-providers.helpers.ts    |  28 +++
 .../monocular/stratos-monocular.helper.ts     |  19 ++
 .../custom/helm/store/helm.action-builders.ts |  36 ++-
 .../src/custom/helm/store/helm.actions.ts     |  16 +-
 .../src/custom/helm/store/helm.effects.ts     | 180 +++++++++----
 .../src/custom/helm/store/helm.types.ts       |  22 +-
 .../repository-tab.component.html             |   1 -
 .../repository-tab.component.spec.ts          |  29 ---
 .../repository-tab.component.ts               |  17 --
 .../tabs/helm-release-helper.service.ts       |  18 +-
 .../workloads/store/workloads.effects.ts      |   4 +-
 .../release-version-data-source.ts            |  24 +-
 .../release-version-list-config.ts            |  41 +--
 .../upgrade-release.component.ts              |  52 ++--
 .../kubernetes/workloads/workloads.routing.ts |   1 +
 .../datastore/20200902162200_HelmSubtype.go   |  21 ++
 src/jetstream/passthrough.go                  |   2 +-
 .../plugins/kubernetes/install_release.go     |  49 ++--
 src/jetstream/plugins/metrics/main.go         |   2 -
 src/jetstream/plugins/monocular/main.go       | 236 ++++++++++++++++--
 60 files changed, 1127 insertions(+), 622 deletions(-)
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/helm/helm-hub-registration/helm-hub-registration.component.html
 rename src/frontend/packages/suse-extensions/src/custom/helm/{tabs/repository-tab/repository-tab.component.scss => helm-hub-registration/helm-hub-registration.component.scss} (100%)
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/helm/helm-hub-registration/helm-hub-registration.component.spec.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/helm/helm-hub-registration/helm-hub-registration.component.ts
 delete mode 100644 src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-repository-list-config.service.ts
 delete mode 100644 src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-repository-list-source.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/helm/monocular.interceptor.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/helm/monocular/monocular.module.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/helm/monocular/stratos-monocular-providers.helpers.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/helm/monocular/stratos-monocular.helper.ts
 delete mode 100644 src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.html
 delete mode 100644 src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.spec.ts
 delete mode 100644 src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.ts
 create mode 100644 src/jetstream/datastore/20200902162200_HelmSubtype.go

diff --git a/src/frontend/packages/core/src/app.module.ts b/src/frontend/packages/core/src/app.module.ts
index 840ed60377..64f5ca665b 100644
--- a/src/frontend/packages/core/src/app.module.ts
+++ b/src/frontend/packages/core/src/app.module.ts
@@ -89,9 +89,6 @@ const storeDebugImports = environment.production ? [] : [
 })
 class AppStoreDebugModule { }
 
-/**
- * `HttpXsrfTokenExtractor` which retrieves the token from a cookie.
- */
 
 @NgModule({
   declarations: [
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 e354112437..38d4b1e417 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
@@ -1,13 +1,17 @@
 import { Component } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import { combineLatest, filter, first, map } from 'rxjs/operators';
 
 import { RouterNav } from '../../../../../../store/src/actions/router.actions';
 import { GeneralEntityAppState } from '../../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
+import {
+  StratosCatalogEndpointEntity,
+} from '../../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { IStratosEndpointDefinition } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
 import { selectSessionData } from '../../../../../../store/src/reducers/auth.reducer';
+import { stratosEntityCatalog } from '../../../../../../store/src/stratos-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';
@@ -17,6 +21,10 @@ interface ICreateEndpointTilesData extends ITileData {
   parentType: string;
 }
 
+type EndpointsByType = {
+  [endpointType: string]: number,
+};
+
 @Component({
   selector: 'app-create-endpoint-base-step',
   templateUrl: './create-endpoint-base-step.component.html',
@@ -67,7 +75,7 @@ export class CreateEndpointBaseStepComponent {
     }
     // Both A & B are equal. Unlikely.
     return 0;
-  }
+  };
 
   get selectedTile() {
     return this.pSelectedTile;
@@ -83,13 +91,15 @@ export class CreateEndpointBaseStepComponent {
       }));
     }
   }
-  constructor(public store: Store<GeneralEntityAppState>, ) {
+  constructor(public store: Store<GeneralEntityAppState>,) {
     // Need to filter the endpoint types on the tech preview flag
     this.tileSelectorConfig$ = store.select(selectSessionData()).pipe(
+      combineLatest(this.getEndpointTypesByCount()),
       first(),
-      map(sessionData => {
+      map(([sessionData, endpointTypesByCount]) => {
         const techPreviewIsEnabled = sessionData.config.enableTechPreview || false;
         return entityCatalog.getAllEndpointTypes(techPreviewIsEnabled)
+          .filter(endpoint => this.filterByEndpointCount(endpoint, endpointTypesByCount))
           .sort((endpointA, endpointB) => this.sortEndpointTiles(endpointA.definition, endpointB.definition))
           .map(catalogEndpoint => {
             const endpoint = catalogEndpoint.definition;
@@ -112,4 +122,38 @@ export class CreateEndpointBaseStepComponent {
     );
   }
 
+  private getEndpointDefinitionKey = (type: string, subType: string): string => type + '_sep_' + subType;
+  private getEndpointTypesByCount = (): Observable<EndpointsByType> =>
+    stratosEntityCatalog.endpoint.store.getAll.getPaginationService().entities$.pipe(
+      filter(endpoints => !!endpoints),
+      map(endpoints => {
+        const endpointsByType: { [endpointType: string]: number; } = {};
+        return endpoints.reduce((res, endpoint) => {
+          const type = this.getEndpointDefinitionKey(endpoint.cnsi_type, endpoint.sub_type);
+          if (!res[type]) {
+            res[type] = 0;
+          }
+          res[type]++;
+          return res;
+        }, endpointsByType);
+      }),
+    );
+  private filterByEndpointCount = (endpoint: StratosCatalogEndpointEntity, endpointTypesByCount: EndpointsByType) => {
+    // No limit applied, always show endpoint
+    if (typeof endpoint.definition.registeredLimit !== 'number') {
+      return true;
+    }
+    // Zero limit, never show endpoint
+    if (endpoint.definition.registeredLimit === 0) {
+      return false;
+    }
+
+    // Check that the limit is not exceeded by endpoints already registered
+    const type = endpoint.definition.parentType ?
+      this.getEndpointDefinitionKey(endpoint.definition.parentType, endpoint.definition.type) :
+      this.getEndpointDefinitionKey(endpoint.definition.type, '');
+    const count = endpointTypesByCount[type] || 0;
+    return count < endpoint.definition.registeredLimit;
+  };
+
 }
diff --git a/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.scss b/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.scss
index 78aa3599eb..cc87470846 100644
--- a/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.scss
+++ b/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.scss
@@ -26,6 +26,7 @@
     font-size: 40px;
     height: 40px;
     margin-right: 12px;
+    text-align: center;
     width: 40px;
   }
   &__label {
diff --git a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.scss b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.scss
index 84f88ba55f..bbb07aa386 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.scss
+++ b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.scss
@@ -69,7 +69,6 @@
     font-size: 14px;
     font-weight: normal;
     margin-right: 8px;
-    margin-top: -2px;
     padding: 2px 4px;
   }
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.html b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.html
index 075cdf838c..0223537772 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.html
@@ -1,5 +1,5 @@
-<mat-card class="meta-card {{status$ && statusBackground? (status$ | async): '' }}" [ngClass]="{'meta-card-pointer': clickAction}"
-  (click)="clickAction ? clickAction() : null">
+<mat-card class="meta-card {{status$ && statusBackground? (status$ | async): '' }}"
+  [ngClass]="{'meta-card-pointer': clickAction}" (click)="clickAction ? clickAction() : null">
   <div *ngIf="isDeleting$ | async" class="meta-card__deleting-overlay">
     <div class="meta-card__deleting-overlay-inner">
       <div class="meta-card__deleting-text">Deleting</div>
@@ -9,7 +9,8 @@
   <app-card-status *ngIf="status$" [status$]="status$">
   </app-card-status>
   <mat-card-header class="meta-card__header" *ngIf="title">
-    <div [ngClass]="statusIconByTitle ? 'meta-card__header-container__title--with-icon' : 'meta-card__header-container__title'">
+    <div
+      [ngClass]="statusIconByTitle ? 'meta-card__header-container__title--with-icon' : 'meta-card__header-container__title'">
       <div
         [ngClass]="statusIconByTitle ? 'meta-card__header-container__title__content--with-icon' : 'meta-card__header-container__title__content'">
         <ng-container *ngTemplateOutlet="title.content"></ng-container>
@@ -18,20 +19,24 @@
         <ng-container *ngTemplateOutlet="statusIconTmple"></ng-container>
       </div>
     </div>
-    <app-entity-favorite-star [confirmRemoval]="confirmFavoriteRemoval" class="meta-card__favorite" *ngIf="favorite" [favorite]="favorite">
+    <app-entity-favorite-star [confirmRemoval]="confirmFavoriteRemoval" class="meta-card__favorite" *ngIf="favorite"
+      [favorite]="favorite">
     </app-entity-favorite-star>
     <div class="meta-card__header-container__actions" *ngIf="actionMenu && (showMenu$ | async)" appClickStopPropagation>
-      <button mat-icon-button class="meta-card__header__button" color="basic" [matMenuTriggerFor]="menu" [disabled]="isDeleting$ | async">
+      <button mat-icon-button class="meta-card__header__button" color="basic" [matMenuTriggerFor]="menu"
+        [disabled]="isDeleting$ | async">
         <mat-icon>more_vert</mat-icon>
       </button>
-      <mat-menu class="meta-card__header__popup" #menu="matMenu" xPosition="before" >
+      <mat-menu class="meta-card__header__popup" #menu="matMenu" xPosition="before">
         <ng-container *ngFor="let menuItem of actionMenu">
-          <button class="meta-card__header__popup__btn" [disabled]="menuItem.disabled | async" mat-menu-item *ngIf="menuItem.can | async"
-            (click)="menuItem.action()">
-            <mat-icon *ngIf="menuItem.icon">{{menuItem.icon}}</mat-icon>
-            <span>{{menuItem.label}}</span>
-          </button>
-          <div *ngIf="menuItem.separator" class="meta-card__header__popup-separator"></div>
+          <ng-container *ngIf="menuItem.can | async">
+            <button *ngIf="!menuItem.separator" class="meta-card__header__popup__btn"
+              [disabled]="menuItem.disabled | async" mat-menu-item (click)="menuItem.action()">
+              <mat-icon *ngIf="menuItem.icon">{{menuItem.icon}}</mat-icon>
+              <span>{{menuItem.label}}</span>
+            </button>
+            <div *ngIf="menuItem.separator" class="meta-card__header__popup-separator"></div>
+          </ng-container>
         </ng-container>
       </mat-menu>
     </div>
@@ -48,6 +53,7 @@
   </mat-card-content>
 </mat-card>
 <ng-template #statusIconTmple>
-  <app-application-state-icon *ngIf="statusIcon && status$" [status]="status$ | async" matTooltip="{{statusIconTooltip}}">
+  <app-application-state-icon *ngIf="statusIcon && status$" [status]="status$ | async"
+    matTooltip="{{statusIconTooltip}}">
   </app-application-state-icon>
 </ng-template>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.ts b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.ts
index 59a95244d6..039954d7f2 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
@@ -1,5 +1,5 @@
 import { Component, ContentChild, ContentChildren, Input, OnDestroy, QueryList } from '@angular/core';
-import { combineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
+import { combineLatest, Observable, of as observableOf, of, Subscription } from 'rxjs';
 import { first, map, tap } from 'rxjs/operators';
 
 import { FavoritesConfigMapper } from '../../../../../../../../store/src/favorite-config-mapper';
@@ -13,7 +13,7 @@ import { MetaCardItemComponent } from '../meta-card-item/meta-card-item.componen
 import { MetaCardTitleComponent } from '../meta-card-title/meta-card-title.component';
 
 
-export function createMetaCardMenuItemSeparator() {
+export function createMetaCardMenuItemSeparator(): MenuItem {
   return {
     label: '-',
     separator: true,
@@ -86,7 +86,7 @@ export class MetaCardComponent implements OnDestroy {
       this.pActionMenu = actionMenu.map(menuItem => {
         if (!menuItem.can) {
           menuItem.separator = menuItem.label === '-';
-          menuItem.can = observableOf(!menuItem.separator);
+          menuItem.can = of(true);
         }
         if (!menuItem.disabled) {
           menuItem.disabled = observableOf(false);
@@ -94,7 +94,10 @@ export class MetaCardComponent implements OnDestroy {
         return menuItem;
       });
 
-      this.showMenu$ = combineLatest(actionMenu.map(menuItem => menuItem.can)).pipe(
+      const nonSeparators = actionMenu
+        .filter(menuItem => !menuItem.separator)
+        .map(menuItem => menuItem.can);
+      this.showMenu$ = combineLatest(nonSeparators).pipe(
         map(cans => cans.some(can => can))
       );
     }
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 dfdd1548a2..82bb85e5a4 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
@@ -93,13 +93,18 @@ export class EndpointCardComponent extends CardCell<EndpointModel> implements On
   @Input('dataSource')
   set dataSource(ds: BaseEndpointsDataSource) {
     this.pDs = ds;
+
     // Don't show card menu if the ds only provides a single endpoint type (for instance the cf endpoint page)
     if (ds && !ds.dsEndpointType && !this.cardMenu) {
-      this.cardMenu = this.endpointListHelper.endpointActions().map(endpointAction => ({
-        label: endpointAction.label,
-        action: () => endpointAction.action(this.pRow),
-        can: endpointAction.createVisible(this.rowObs)
-      }));
+      this.cardMenu = this.endpointListHelper.endpointActions(true).map(endpointAction => {
+        const separator = endpointAction.label === '-';
+        return {
+          label: endpointAction.label,
+          action: () => endpointAction.action(this.pRow),
+          can: endpointAction.createVisible ? endpointAction.createVisible(this.rowObs) : null,
+          separator
+        };
+      });
 
       // Add a copy address to clipboard
       this.cardMenu.push(createMetaCardMenuItemSeparator());
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 e1ebaabf50..41347976e7 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
@@ -1,7 +1,7 @@
 import { ComponentFactoryResolver, ComponentRef, Injectable, ViewContainerRef } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
-import { combineLatest, Observable } from 'rxjs';
+import { combineLatest, Observable, of } from 'rxjs';
 import { map, pairwise } from 'rxjs/operators';
 
 import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
@@ -19,6 +19,7 @@ import {
 import { SnackBarService } from '../../../../services/snackbar.service';
 import { ConfirmationDialogConfig } from '../../../confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../confirmation-dialog.service';
+import { createMetaCardMenuItemSeparator } from '../../list-cards/meta-card/meta-card-base/meta-card.component';
 import { IListAction } from '../../list.component.types';
 import { TableCellCustom } from '../../list.types';
 
@@ -37,6 +38,27 @@ function isEndpointListDetailsComponent(obj: any): EndpointListDetailsComponent
   return obj ? obj.isEndpointListDetailsComponent ? obj as EndpointListDetailsComponent : null : null;
 }
 
+/**
+ * Combine the result of all createVisibles functions for the given actions
+ */
+function combineCreateVisibles(
+  customActions: IListAction<EndpointModel>[]
+): (row$: Observable<EndpointModel>) => Observable<boolean> {
+  const createVisiblesFns = customActions
+    .map(action => action.createVisible)
+    .filter(createVisible => !!createVisible);
+  if (createVisiblesFns.length === 0) {
+    return () => of(false);
+  } else {
+    return (row$: Observable<EndpointModel>) => {
+      const createVisibles = createVisiblesFns.map(createVisible => createVisible(row$));
+      return combineLatest(createVisibles).pipe(
+        map(allRes => allRes.some(res => res))
+      );
+    };
+  }
+}
+
 @Injectable()
 export class EndpointListHelper {
   constructor(
@@ -48,7 +70,23 @@ export class EndpointListHelper {
     private snackBarService: SnackBarService,
   ) { }
 
-  endpointActions(): IListAction<EndpointModel>[] {
+  endpointActions(includeSeparators = false): IListAction<EndpointModel>[] {
+    // Add any additional actions that are per endpoint type
+    const customActions = entityCatalog.getAllEndpointTypes()
+      .map(endpoint => endpoint.definition.endpointListActions)
+      .filter(endpointListActions => !!endpointListActions)
+      .map(endpointListActions => endpointListActions(this.store))
+      .reduce((res, actions) => res.concat(actions), []);
+
+    if (includeSeparators && customActions.length) {
+      // Only show the separator if we have custom actions to separate AND at least one is visible
+      const createVisibleFn = combineCreateVisibles(customActions);
+      customActions.splice(0, 0, {
+        ...createMetaCardMenuItemSeparator(),
+        createVisible: createVisibleFn
+      });
+    }
+
     return [
       {
         action: (item) => {
@@ -126,7 +164,8 @@ export class EndpointListHelper {
         label: 'Edit endpoint',
         description: 'Edit the endpoint',
         createVisible: () => this.currentUserPermissionsService.can(StratosCurrentUserPermissions.ENDPOINT_REGISTER)
-      }
+      },
+      ...customActions
     ];
   }
 
diff --git a/src/frontend/packages/core/src/shared/components/tile-selector/tile-selector.component.ts b/src/frontend/packages/core/src/shared/components/tile-selector/tile-selector.component.ts
index 49c3e95cf2..18c8c144de 100644
--- a/src/frontend/packages/core/src/shared/components/tile-selector/tile-selector.component.ts
+++ b/src/frontend/packages/core/src/shared/components/tile-selector/tile-selector.component.ts
@@ -1,4 +1,5 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
+
 import { ITileConfig } from '../tile/tile-selector.types';
 
 
@@ -12,6 +13,9 @@ export class TileSelectorComponent {
   public hiddenOptions: ITileConfig[] = [];
   public showingMore = false;
   @Input() set options(options: ITileConfig[]) {
+    if (!options) {
+      return;
+    }
     const groupedOptions = options.reduce((grouped, option) => {
       if (option.hidden) {
         grouped.hidden.push(option);
@@ -20,9 +24,9 @@ export class TileSelectorComponent {
       }
       return grouped;
     }, {
-        show: [],
-        hidden: []
-      });
+      show: [],
+      hidden: []
+    });
     this.pOptions = groupedOptions.show;
     this.hiddenOptions = groupedOptions.hidden;
   }
diff --git a/src/frontend/packages/core/xsrf.module.ts b/src/frontend/packages/core/xsrf.module.ts
index 5d875f273f..b1456f72eb 100644
--- a/src/frontend/packages/core/xsrf.module.ts
+++ b/src/frontend/packages/core/xsrf.module.ts
@@ -13,6 +13,9 @@ import { tap } from 'rxjs/operators';
 
 const STRATOS_XSRF_HEADER_NAME = 'X-XSRF-Token';
 
+/**
+ * `HttpXsrfTokenExtractor` which retrieves the token from a cookie.
+ */
 @Injectable()
 export class HttpXsrfHeaderExtractor implements HttpXsrfTokenExtractor {
 
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog.ts
index 5565256852..224f05b471 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog.ts
@@ -176,7 +176,7 @@ class EntityCatalog {
     return Array.from(this.endpoints.values());
   }
 
-  public getAllEndpointTypes(techPreviewEnabled = false) {
+  public getAllEndpointTypes(techPreviewEnabled = false): StratosCatalogEndpointEntity[] {
     const baseEndpoints = Array.from(this.endpoints.values())
       .filter(item => !item.definition.techPreview || item.definition.techPreview && techPreviewEnabled);
     return baseEndpoints.reduce((allEndpoints, baseEndpoint) => {
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 fa574a1754..b0dfe4151f 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,7 +1,8 @@
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 
-import { GeneralEntityAppState } from '../app-state';
+import { IListAction } from '../../../core/src/shared/components/list/list.component.types';
+import { AppState, GeneralEntityAppState } from '../app-state';
 import {
   ApiErrorMessageHandler,
   EntitiesFetchHandler,
@@ -119,6 +120,10 @@ export interface IStratosEndpointDefinition<T = EntityCatalogSchemas | EntitySch
   readonly tokenSharing?: boolean;
   readonly urlValidation?: boolean;
   readonly unConnectable?: boolean;
+  /**
+   * How many endpoints of this type can be registered, 0 - many
+   */
+  readonly registeredLimit?: number;
   /**
    * Indicates if this endpoint type is in tech preview and should only be shown when tech preview mode is enabled
    */
@@ -146,11 +151,16 @@ export interface IStratosEndpointDefinition<T = EntityCatalogSchemas | EntitySch
   /**
    * Allows the endpoint to fetch user roles, for example when the user loads Stratos or connects an endpoint of this type
    */
-  readonly userRolesFetch?: EntityUserRolesFetch
+  readonly userRolesFetch?: EntityUserRolesFetch;
   /**
    * Allows the user roles to be stored, updated and removed in the current user permissions section of the store
    */
-  readonly userRolesReducer?: EntityUserRolesReducer
+  readonly userRolesReducer?: EntityUserRolesReducer;
+  /**
+   * A list of actions that will be displayed in the endpoints lists
+   * Note - These should be restricted by type
+   */
+  readonly endpointListActions?: (store: Store<AppState>) => IListAction<EndpointModel>[];
 }
 
 export interface StratosEndpointExtensionDefinition extends Omit<IStratosEndpointDefinition, 'schema'> { }
@@ -206,7 +216,7 @@ export interface IStratosEntityBuilder<T extends IEntityMetadata, Y = any> {
   getLines?(): EntityRowBuilder<T>[];
   getSubTypeLabels?(entityMetadata: T): {
     singular: string,
-    plural: string
+    plural: string,
   };
   /**
    * Actions that don't effect an individual entity i.e. create new
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.ts
index fb74ce9981..f8cb93cdff 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.ts
@@ -1,10 +1,17 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
+import { createMonocularProviders } from '../monocular/stratos-monocular-providers.helpers';
+import { getMonocularEndpoint } from '../monocular/stratos-monocular.helper';
+
+
 @Component({
   selector: 'app-monocular',
   templateUrl: './monocular.component.html',
   styleUrls: ['./monocular.component.scss'],
+  providers: [
+    ...createMonocularProviders()
+  ]
 })
 export class MonocularChartViewComponent implements OnInit {
 
@@ -27,7 +34,7 @@ export class MonocularChartViewComponent implements OnInit {
 
     if (!!parts.version) {
       breadcrumbs.push(
-        { value: this.title, routerLink: `/monocular/charts/${parts.repo}/${parts.chartName}` }
+        { value: this.title, routerLink: `/monocular/charts/${getMonocularEndpoint(this.route)}/${parts.repo}/${parts.chartName}` }
       );
       this.title = parts.version;
     }
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.ts
index d830c232f6..c57b1175cf 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.ts
@@ -16,12 +16,17 @@ import { kubeEntityCatalog } from '../../kubernetes/kubernetes-entity-catalog';
 import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes/kubernetes-entity-factory';
 import { KubernetesNamespace } from '../../kubernetes/store/kube.types';
 import { helmEntityCatalog } from '../helm-entity-catalog';
+import { createMonocularProviders } from '../monocular/stratos-monocular-providers.helpers';
+import { getMonocularEndpoint, stratosMonocularEndpointGuid } from '../monocular/stratos-monocular.helper';
 import { HelmInstallValues } from '../store/helm.types';
 
 @Component({
   selector: 'app-create-release',
   templateUrl: './create-release.component.html',
   styleUrls: ['./create-release.component.scss'],
+  providers: [
+    ...createMonocularProviders()
+  ]
 })
 export class CreateReleaseComponent implements OnInit, OnDestroy {
 
@@ -61,7 +66,7 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     private confirmDialog: ConfirmationDialogService,
   ) {
     const chart = this.route.snapshot.params;
-    this.cancelUrl = `/monocular/charts/${chart.repo}/${chart.chartName}/${chart.version}`;
+    this.cancelUrl = `/monocular/charts/${getMonocularEndpoint(this.route)}/${chart.repo}/${chart.chartName}/${chart.version}`;
 
     this.setupDetailsStep();
 
@@ -207,13 +212,13 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
       // this.overridesYamlAutosize.resizeToFitContent(true);
       this.overridesYamlTextArea.nativeElement.focus();
     }, 1);
-  }
+  };
 
   submit: StepOnNextFunction = () => {
     return this.createNamespace().pipe(
       switchMap(createRes => createRes.success ? this.installChart() : of(createRes))
     );
-  }
+  };
 
   createNamespace(): Observable<StepOnNextResult> {
     if (!this.details.controls.createNamespace.value || this.createdNamespace) {
@@ -245,11 +250,17 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
   }
 
   installChart(): Observable<StepOnNextResult> {
+    const endpoint = getMonocularEndpoint(this.route, null, null);
     // Build the request body
     const values: HelmInstallValues = {
       ...this.details.value,
       ...this.overrides.value,
-      chart: this.route.snapshot.params
+      chart: {
+        chartName: this.route.snapshot.params.chartName,
+        repo: this.route.snapshot.params.repo,
+        version: this.route.snapshot.params.version,
+      },
+      monocularEndpoint: endpoint === stratosMonocularEndpointGuid ? null : endpoint
     };
 
     // Make the request
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-factory.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-factory.ts
index 302dd8a060..6cdf2402a9 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-factory.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-factory.ts
@@ -11,9 +11,11 @@ export const getMonocularChartId = (entity: MonocularChart) => entity.id;
 export const getHelmVersionId = (entity: HelmVersion) => entity.endpointId;
 
 export const HELM_ENDPOINT_TYPE = 'helm';
+export const HELM_REPO_ENDPOINT_TYPE = 'repo';
+export const HELM_HUB_ENDPOINT_TYPE = 'hub';
 
 const entityCache: {
-  [key: string]: EntitySchema
+  [key: string]: EntitySchema,
 } = {};
 
 export class HelmEntitySchema extends EntitySchema {
@@ -49,7 +51,7 @@ entityCache[helmVersionsEntityType] = new HelmEntitySchema(
 entityCache[monocularChartVersionsEntityType] = new HelmEntitySchema(
   monocularChartVersionsEntityType,
   {},
-  { idAttribute: getHelmVersionId }
+  { idAttribute: getMonocularChartId }
 );
 
 export function helmEntityFactory(key: string): EntitySchema {
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-generator.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-generator.ts
index c9ef3d8afa..8ac9945a41 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-generator.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-generator.ts
@@ -1,18 +1,28 @@
+import { Store } from '@ngrx/store';
+import { of } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { IListAction } from '../../../../core/src/shared/components/list/list.component.types';
+import { AppState } from '../../../../store/src/app-state';
 import {
   StratosBaseCatalogEntity,
   StratosCatalogEndpointEntity,
   StratosCatalogEntity,
 } from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { StratosEndpointExtensionDefinition } from '../../../../store/src/entity-catalog/entity-catalog.types';
+import { EndpointModel } from '../../../../store/src/types/endpoint.types';
 import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types';
 import { helmEntityCatalog } from './helm-entity-catalog';
 import {
   HELM_ENDPOINT_TYPE,
+  HELM_HUB_ENDPOINT_TYPE,
+  HELM_REPO_ENDPOINT_TYPE,
   helmEntityFactory,
   helmVersionsEntityType,
   monocularChartsEntityType,
   monocularChartVersionsEntityType,
 } from './helm-entity-factory';
+import { HelmHubRegistrationComponent } from './helm-hub-registration/helm-hub-registration.component';
 import {
   HelmChartActionBuilders,
   helmChartActionBuilders,
@@ -25,18 +35,52 @@ import { HelmVersion, MonocularChart, MonocularVersion } from './store/helm.type
 
 
 export function generateHelmEntities(): StratosBaseCatalogEntity[] {
+  const helmRepoRenderPriority = 10;
   const endpointDefinition: StratosEndpointExtensionDefinition = {
     type: HELM_ENDPOINT_TYPE,
-    label: 'Helm Repository',
-    labelPlural: 'Helm Repositories',
-    icon: 'helm',
-    iconFont: 'stratos-icons',
     logoUrl: '/core/assets/custom/helm.svg',
-    urlValidation: undefined,
-    unConnectable: true,
-    techPreview: false,
     authTypes: [],
-    renderPriority: 10,
+    registeredLimit: 0,
+    icon: 'helm',
+    iconFont: 'stratos-icons',
+    label: 'Helm',
+    labelPlural: 'Helms',
+    subTypes: [
+      {
+        type: HELM_REPO_ENDPOINT_TYPE,
+        label: 'Helm Repository',
+        labelPlural: 'Helm Repositories',
+        logoUrl: '/core/assets/custom/helm.svg',
+        urlValidation: undefined,
+        unConnectable: true,
+        techPreview: false,
+        authTypes: [],
+        endpointListActions: (store: Store<AppState>): IListAction<EndpointModel>[] => {
+          return [{
+            action: (item: EndpointModel) => helmEntityCatalog.chart.api.synchronise(item),
+            label: 'Synchronize',
+            description: '',
+            createVisible: row => row.pipe(
+              map(item => item.cnsi_type === HELM_ENDPOINT_TYPE && item.sub_type === HELM_REPO_ENDPOINT_TYPE)
+            ),
+            createEnabled: () => of(true)
+          }];
+        },
+        renderPriority: helmRepoRenderPriority,
+        registeredLimit: null,
+      },
+      {
+        type: HELM_HUB_ENDPOINT_TYPE,
+        label: 'Helm Hub',
+        labelPlural: 'Helm Hubs',
+        authTypes: [],
+        unConnectable: true,
+        logoUrl: '/core/assets/custom/helm.svg',
+        renderPriority: helmRepoRenderPriority + 1,
+        registrationComponent: HelmHubRegistrationComponent,
+        registeredLimit: 1,
+      },
+    ],
   };
 
   return [
@@ -50,7 +94,7 @@ export function generateHelmEntities(): StratosBaseCatalogEntity[] {
 function generateEndpointEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
   helmEntityCatalog.endpoint = new StratosCatalogEndpointEntity(
     endpointDefinition,
-    metadata => `/monocular/repos/${metadata.guid}`,
+    metadata => `/monocular/charts`,
   );
   return helmEntityCatalog.endpoint;
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm-hub-registration/helm-hub-registration.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/helm-hub-registration/helm-hub-registration.component.html
new file mode 100644
index 0000000000..fe749d24f3
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/helm-hub-registration/helm-hub-registration.component.html
@@ -0,0 +1,10 @@
+<app-steppers cancel="/endpoints">
+  <app-step title="" [valid]="true" [onNext]="onNext" finishButtonText="Register">
+    <div>
+      <p>Helm Hub is a public repository for Helm Charts. </p>
+      <p>To browse and install these charts you need to register Helm Hub as an endpoint by clicking `Register` below.
+      </p>
+      <p>To disable Helm Hub simply unregister the Helm Hub endpoint</p>
+    </div>
+  </app-step>
+</app-steppers>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/helm-hub-registration/helm-hub-registration.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.scss
rename to src/frontend/packages/suse-extensions/src/custom/helm/helm-hub-registration/helm-hub-registration.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm-hub-registration/helm-hub-registration.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm-hub-registration/helm-hub-registration.component.spec.ts
new file mode 100644
index 0000000000..df9c494821
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/helm-hub-registration/helm-hub-registration.component.spec.ts
@@ -0,0 +1,33 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { EndpointsService } from '../../../../../core/src/core/endpoints.service';
+import { UserService } from '../../../../../core/src/core/user.service';
+import { BaseTestModules } from '../../../../../core/test-framework/core-test.helper';
+import { HelmHubRegistrationComponent } from './helm-hub-registration.component';
+
+describe('HelmHubRegistrationComponent', () => {
+  let component: HelmHubRegistrationComponent;
+  let fixture: ComponentFixture<HelmHubRegistrationComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [...BaseTestModules],
+      declarations: [HelmHubRegistrationComponent],
+      providers: [
+        EndpointsService,
+        UserService
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(HelmHubRegistrationComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm-hub-registration/helm-hub-registration.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm-hub-registration/helm-hub-registration.component.ts
new file mode 100644
index 0000000000..2b1a2ceeb3
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/helm-hub-registration/helm-hub-registration.component.ts
@@ -0,0 +1,35 @@
+import { Component } from '@angular/core';
+import { filter, map, pairwise } from 'rxjs/operators';
+
+import { StepOnNextFunction } from '../../../../../core/src/shared/components/stepper/step/step.component';
+import { ActionState } from '../../../../../store/src/reducers/api-request-reducer/types';
+import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
+import { HELM_ENDPOINT_TYPE, HELM_HUB_ENDPOINT_TYPE } from '../helm-entity-factory';
+
+@Component({
+  selector: 'app-helm-hub-registration',
+  templateUrl: './helm-hub-registration.component.html',
+  styleUrls: ['./helm-hub-registration.component.scss']
+})
+export class HelmHubRegistrationComponent {
+
+  onNext: StepOnNextFunction = () => {
+    return stratosEntityCatalog.endpoint.api.register<ActionState>(
+      HELM_ENDPOINT_TYPE,
+      HELM_HUB_ENDPOINT_TYPE,
+      'Helm Hub',
+      'https://hub.helm.sh/api',
+      false
+    ).pipe(
+      pairwise(),
+      filter(([oldV, newV]) => oldV.busy && !newV.busy),
+      map(([, newV]) => newV),
+      map(state => ({
+        success: !state.error,
+        message: state.message,
+        redirect: !state.error
+      }))
+    );
+  };
+
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm.module.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm.module.ts
index d03d15582b..0bba8cacac 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/helm.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/helm.module.ts
@@ -8,27 +8,8 @@ import { CreateReleaseModule } from './create-release/create-release.module';
 import { HelmRoutingModule } from './helm.routing';
 import { MonocularChartCardComponent } from './list-types/monocular-chart-card/monocular-chart-card.component';
 import { MonocularTabBaseComponent } from './monocular-tab-base/monocular-tab-base.component';
-import { ChartDetailsInfoComponent } from './monocular/chart-details/chart-details-info/chart-details-info.component';
-import { ChartDetailsReadmeComponent } from './monocular/chart-details/chart-details-readme/chart-details-readme.component';
-import { ChartDetailsUsageComponent } from './monocular/chart-details/chart-details-usage/chart-details-usage.component';
-import {
-  ChartDetailsVersionsComponent,
-} from './monocular/chart-details/chart-details-versions/chart-details-versions.component';
-import { ChartDetailsComponent } from './monocular/chart-details/chart-details.component';
-import { ChartIndexComponent } from './monocular/chart-index/chart-index.component';
-import { ChartItemComponent } from './monocular/chart-item/chart-item.component';
-import { ChartListComponent } from './monocular/chart-list/chart-list.component';
-import { ChartsComponent } from './monocular/charts/charts.component';
-import { ListFiltersComponent } from './monocular/list-filters/list-filters.component';
-import { ListItemComponent } from './monocular/list-item/list-item.component';
-import { LoaderComponent } from './monocular/loader/loader.component';
-import { PanelComponent } from './monocular/panel/panel.component';
-import { ChartsService } from './monocular/shared/services/charts.service';
-import { ConfigService } from './monocular/shared/services/config.service';
-import { MenuService } from './monocular/shared/services/menu.service';
-import { ReposService } from './monocular/shared/services/repos.service';
+import { MonocularModule } from './monocular/monocular.module';
 import { CatalogTabComponent } from './tabs/catalog-tab/catalog-tab.component';
-import { RepositoryTabComponent } from './tabs/repository-tab/repository-tab.component';
 
 @NgModule({
   imports: [
@@ -37,33 +18,15 @@ import { RepositoryTabComponent } from './tabs/repository-tab/repository-tab.com
     SharedModule,
     HelmRoutingModule,
     CreateReleaseModule,
+    MonocularModule
   ],
   declarations: [
-    PanelComponent,
-    ChartIndexComponent,
-    ChartListComponent,
-    ChartItemComponent,
-    ListItemComponent,
-    ListFiltersComponent,
-    LoaderComponent,
-    ChartsComponent,
-    ChartIndexComponent,
-    ChartDetailsComponent,
-    ChartDetailsUsageComponent,
-    ChartDetailsVersionsComponent,
-    ChartDetailsReadmeComponent,
-    ChartDetailsInfoComponent,
     MonocularTabBaseComponent,
-    RepositoryTabComponent,
     CatalogTabComponent,
     MonocularChartCardComponent,
     MonocularChartViewComponent,
   ],
   providers: [
-    ChartsService,
-    ConfigService,
-    MenuService,
-    ReposService
   ],
   entryComponents: [
     MonocularChartCardComponent,
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm.routing.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm.routing.ts
index 0f67b21db6..37dc491734 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/helm.routing.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/helm.routing.ts
@@ -5,7 +5,6 @@ import { MonocularChartViewComponent } from './chart-view/monocular.component';
 import { CreateReleaseComponent } from './create-release/create-release.component';
 import { MonocularTabBaseComponent } from './monocular-tab-base/monocular-tab-base.component';
 import { CatalogTabComponent } from './tabs/catalog-tab/catalog-tab.component';
-import { RepositoryTabComponent } from './tabs/repository-tab/repository-tab.component';
 
 const monocular: Routes = [
   {
@@ -15,14 +14,12 @@ const monocular: Routes = [
       { path: '', redirectTo: 'charts', pathMatch: 'full' },
       { path: 'charts', component: CatalogTabComponent },
       { path: 'charts/:repo', component: CatalogTabComponent },
-      { path: 'repos', component: RepositoryTabComponent },
-      { path: 'repos/:guid', component: RepositoryTabComponent },
     ]
   },
-  { pathMatch: 'full', path: 'charts/:repo/:chartName/:version', component: MonocularChartViewComponent },
-  { path: 'charts/:repo/:chartName', component: MonocularChartViewComponent },
-  { pathMatch: 'full', path: 'install/:repo/:chartName/:version', component: CreateReleaseComponent },
-  { pathMatch: 'full', path: 'install/:repo/:chartName', component: CreateReleaseComponent },
+  { pathMatch: 'full', path: 'charts/:endpoint/:repo/:chartName/:version', component: MonocularChartViewComponent },
+  { path: 'charts/:endpoint/:repo/:chartName', component: MonocularChartViewComponent },
+  { pathMatch: 'full', path: 'install/:endpoint/:repo/:chartName/:version', component: CreateReleaseComponent },
+  { path: 'install/:endpoint/:repo/:chartName', component: CreateReleaseComponent },
 ];
 
 @NgModule({
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm.setup.module.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm.setup.module.ts
index 3070b56567..3a57d47e51 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/helm.setup.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/helm.setup.module.ts
@@ -11,6 +11,7 @@ import { EntityCatalogModule } from '../../../../store/src/entity-catalog.module
 import { EndpointHealthCheck } from '../../../../store/src/entity-catalog/entity-catalog.types';
 import { HELM_ENDPOINT_TYPE } from './helm-entity-factory';
 import { generateHelmEntities } from './helm-entity-generator';
+import { HelmHubRegistrationComponent } from './helm-hub-registration/helm-hub-registration.component';
 import { HelmStoreModule } from './helm.store.module';
 
 @NgModule({
@@ -20,6 +21,9 @@ import { HelmStoreModule } from './helm.store.module';
     CommonModule,
     SharedModule,
     HelmStoreModule,
+  ],
+  declarations: [
+    HelmHubRegistrationComponent
   ]
 })
 export class HelmSetupModule {
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-data-source.ts b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-data-source.ts
index 45e3929eed..00d04b583f 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-data-source.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-data-source.ts
@@ -2,7 +2,8 @@ import { Store } from '@ngrx/store';
 
 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 { AppState } from '../../../../../store/src/app-state';
+import { AppState, IRequestEntityTypeState } from '../../../../../store/src/app-state';
+import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
 import { PaginationEntityState } from '../../../../../store/src/types/pagination.types';
 import { helmEntityCatalog } from '../helm-entity-catalog';
 import { MonocularChart } from '../store/helm.types';
@@ -11,7 +12,8 @@ export class MonocularChartsDataSource extends ListDataSource<MonocularChart> {
 
   constructor(
     store: Store<AppState>,
-    listConfig: IListConfig<MonocularChart>
+    listConfig: IListConfig<MonocularChart>,
+    endpoints: IRequestEntityTypeState<EndpointModel>
   ) {
     const action = helmEntityCatalog.chart.actions.getMultiple();
     super({
@@ -22,13 +24,18 @@ export class MonocularChartsDataSource extends ListDataSource<MonocularChart> {
       paginationKey: action.paginationKey,
       isLocal: true,
       listConfig,
-      transformEntities: [{ type: 'filter', field: 'name' },
-      (entities: MonocularChart[], paginationState: PaginationEntityState) => {
-        const repository = paginationState.clientPagination.filter.items.repository;
-        return entities.filter(e => {
-          return !(repository && repository !== e.attributes.repo.name);
-        });
-      }
+      transformEntities: [
+        { type: 'filter', field: 'name' },
+        (entities: MonocularChart[], paginationState: PaginationEntityState) => {
+          const repository = paginationState.clientPagination.filter.items.repository;
+          if (!repository) {
+            return entities;
+          }
+          return entities.filter(e => e.monocularEndpointId ?
+            repository === endpoints[e.monocularEndpointId].name :
+            repository === e.attributes.repo.name
+          );
+        }
       ]
     });
   }
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-list-config.service.ts
index 5585990f79..cd41a26b0c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-list-config.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-list-config.service.ts
@@ -14,13 +14,14 @@ import {
 import { ListView } from '../../../../../store/src/actions/list.actions';
 import { AppState } from '../../../../../store/src/app-state';
 import { defaultHelmKubeListPageSize } from '../../kubernetes/list-types/kube-helm-list-types';
+import { HELM_ENDPOINT_TYPE } from '../helm-entity-factory';
 import { MonocularChart } from '../store/helm.types';
 import { MonocularChartCardComponent } from './monocular-chart-card/monocular-chart-card.component';
 import { MonocularChartsDataSource } from './monocular-charts-data-source';
 
 @Injectable()
 export class MonocularChartsListConfig implements IListConfig<MonocularChart> {
-  AppsDataSource: MonocularChartsDataSource;
+  dataSource: MonocularChartsDataSource;
   isLocal = true;
   multiFilterConfigs: IListMultiFilterConfig[];
 
@@ -74,26 +75,36 @@ export class MonocularChartsListConfig implements IListConfig<MonocularChart> {
     noEntries: 'There are no charts'
   };
 
+  private initialised: Observable<boolean>;
+
   constructor(
     store: Store<AppState>,
     private endpointsService: EndpointsService,
     private route: ActivatedRoute,
   ) {
-    this.AppsDataSource = new MonocularChartsDataSource(store, this);
+
+    this.initialised = endpointsService.endpoints$.pipe(
+      filter(endpoints => !!endpoints),
+      map(endpoints => {
+        this.dataSource = new MonocularChartsDataSource(store, this, endpoints);
+        return true;
+      }),
+    );
   }
 
   getGlobalActions = () => [];
   getMultiActions = () => [];
   getSingleActions = () => [];
   getColumns = () => this.columns;
-  getDataSource = () => this.AppsDataSource;
+  getDataSource = () => this.dataSource;
   getMultiFiltersConfigs = () => [this.createRepositoryFilterConfig()];
+  getInitialised = () => this.initialised;
 
   private createRepositoryFilterConfig(): IListMultiFilterConfig {
     return {
       key: 'repository',
-      label: 'Repository',
-      allLabel: 'All Repositories',
+      label: 'Source',
+      allLabel: 'All Sources',
       list$: this.helmRepositories(),
       loading$: observableOf(false),
       select: new BehaviorSubject(this.route.snapshot.params.repo)
@@ -105,7 +116,7 @@ export class MonocularChartsListConfig implements IListConfig<MonocularChart> {
       map(endpoints => {
         const repos = [];
         Object.values(endpoints).forEach(ep => {
-          if (ep.cnsi_type === 'helm') {
+          if (ep.cnsi_type === HELM_ENDPOINT_TYPE) {
             repos.push({ label: ep.name, item: ep.name, value: ep.name });
           }
         });
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-repository-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-repository-list-config.service.ts
deleted file mode 100644
index 654ec79973..0000000000
--- a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-repository-list-config.service.ts
+++ /dev/null
@@ -1,185 +0,0 @@
-import { HttpClient } from '@angular/common/http';
-import { Injectable, NgZone } from '@angular/core';
-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';
-import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog';
-import { selectDeletionInfo } from 'frontend/packages/store/src/selectors/api.selectors';
-import { of as observableOf } from 'rxjs';
-import { pairwise } from 'rxjs/operators';
-
-import { CurrentUserPermissionsService } from '../../../../../core/src/core/permissions/current-user-permissions.service';
-import { StratosCurrentUserPermissions } from '../../../../../core/src/core/permissions/stratos-user-permissions.checker';
-import { environment } from '../../../../../core/src/environments/environment';
-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 {
-  EndpointCardComponent,
-} from '../../../../../core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component';
-import {
-  TableCellEndpointStatusComponent,
-} from '../../../../../core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component';
-import {
-  IListAction,
-  IListConfig,
-  ListViewTypes,
-} from '../../../../../core/src/shared/components/list/list.component.types';
-import { AppState } from '../../../../../store/src/app-state';
-import { getFullEndpointApiUrl } from '../../../../../store/src/endpoint-utils';
-import { endpointEntityType, STRATOS_ENDPOINT_TYPE } from '../../../../../store/src/helpers/stratos-entity-factory';
-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 { defaultHelmKubeListPageSize } from '../../kubernetes/list-types/kube-helm-list-types';
-import { MonocularRepositoryDataSource } from './monocular-repository-list-source';
-
-@Injectable()
-export class MonocularRepositoryListConfig implements IListConfig<EndpointModel> {
-  isLocal = true;
-  dataSource: MonocularRepositoryDataSource;
-  viewType = ListViewTypes.TABLE_ONLY;
-  cardComponent = EndpointCardComponent;
-  text = {
-    title: '',
-    filter: 'Filter Repositories',
-    noEntries: 'There are no repositories'
-  };
-  pageSizeOptions = defaultHelmKubeListPageSize;
-  enableTextFilter = true;
-  columns: ITableColumn<EndpointModel>[] = [
-    {
-      columnId: 'name',
-      headerCell: () => 'Name',
-      cellDefinition: {
-        valuePath: 'name'
-      },
-      sort: {
-        type: 'sort',
-        orderKey: 'name',
-        field: 'name'
-      },
-      cellFlex: '2'
-    },
-    {
-      columnId: 'address',
-      headerCell: () => 'Address',
-      cellDefinition: {
-        getValue: getFullEndpointApiUrl
-      },
-      sort: {
-        type: 'sort',
-        orderKey: 'address',
-        field: 'api_endpoint.Host'
-      },
-      cellFlex: '7'
-    },
-    {
-      columnId: 'status',
-      headerCell: () => 'Status',
-      cellComponent: TableCellEndpointStatusComponent,
-      cellConfig: {
-        showLabel: true
-      },
-      cellFlex: '2'
-    },
-  ];
-
-  private endpointEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointEntityType);
-
-  private listActionSyncRepository: IListAction<EndpointModel> = {
-    action: (item: EndpointModel) => {
-      const requestArgs = {
-        headers: null,
-        params: null
-      };
-      const proxyAPIVersion = environment.proxyAPIVersion;
-      const url = `/pp/${proxyAPIVersion}/chartrepos/${item.guid}`;
-      const req = this.httpClient.post(url, requestArgs);
-      req.subscribe(ok => {
-        this.snackBar.open('Helm Repository synchronization started', 'Dismiss', { duration: 3000 });
-        // Refresh repository status
-        this.dataSource.refresh();
-      }, err => {
-        this.snackBar.open(`Failed to Synchronize Helm Repository '${item.name}'`, 'Dismiss', { duration: 5000 });
-      });
-      return req;
-    },
-    label: 'Synchronize',
-    description: '',
-    createVisible: () => observableOf(true),
-    createEnabled: () => observableOf(true)
-  };
-
-  private deleteRepository: IListAction<EndpointModel> = {
-    action: (item) => {
-      const confirmation = new ConfirmationDialogConfig(
-        'Delete Helm Repository',
-        `Are you sure you want to delete repository '${item.name}'?`,
-        'Delete',
-        true
-      );
-      this.confirmDialog.open(confirmation, () => {
-        this.store.dispatch(new UnregisterEndpoint(item.guid, item.cnsi_type));
-        this.handleDeleteAction(item, ([oldVal, newVal]) => {
-          this.snackBar.open(`Delete Helm Repository '${item.name}'`, 'Dismiss', { duration: 3000 });
-        });
-      });
-    },
-    label: 'Delete',
-    description: 'Delete Helm Repository',
-    createVisible: () => this.currentUserPermissionsService.can(StratosCurrentUserPermissions.ENDPOINT_REGISTER)
-  };
-
-  private handleDeleteAction(item, handleChange) {
-    this.handleAction(selectDeletionInfo(
-      this.endpointEntityKey,
-      item.guid,
-    ), handleChange);
-  }
-
-  private handleAction(storeSelect, handleChange) {
-    const disSub = this.store.select(storeSelect).pipe(
-      pairwise())
-      .subscribe(([oldVal, newVal]) => {
-        if (!newVal.error && (oldVal.busy && !newVal.busy)) {
-          handleChange([oldVal, newVal]);
-          disSub.unsubscribe();
-        }
-      });
-  }
-
-
-  constructor(
-    public store: Store<AppState>,
-    public activatedRoute: ActivatedRoute,
-    paginationMonitorFactory: PaginationMonitorFactory,
-    entityMonitorFactory: EntityMonitorFactory,
-    internalEventMonitorFactory: InternalEventMonitorFactory,
-    ngZone: NgZone,
-    public httpClient: HttpClient,
-    public snackBar: MatSnackBar,
-    public confirmDialog: ConfirmationDialogService,
-    public currentUserPermissionsService: CurrentUserPermissionsService,
-  ) {
-    const highlighted = activatedRoute.snapshot.params.guid;
-    this.dataSource = new MonocularRepositoryDataSource(
-      this.store,
-      this,
-      highlighted,
-      paginationMonitorFactory,
-      entityMonitorFactory,
-      internalEventMonitorFactory,
-      ngZone,
-    );
-  }
-
-  public getColumns = () => this.columns;
-  public getGlobalActions = () => [];
-  public getMultiActions = () => [];
-  public getSingleActions = () => [this.listActionSyncRepository, this.deleteRepository];
-  public getMultiFiltersConfigs = () => [];
-  public getDataSource = () => this.dataSource;
-}
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-repository-list-source.ts b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-repository-list-source.ts
deleted file mode 100644
index fec0503321..0000000000
--- a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-repository-list-source.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { NgZone } from '@angular/core';
-import { Store } from '@ngrx/store';
-import { interval, Observable, of as observableOf, Subscription } from 'rxjs';
-
-import { safeUnsubscribe } from '../../../../../core/src/core/utils.service';
-import { RowState } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
-import {
-  BaseEndpointsDataSource,
-  syncPaginationSection,
-} from '../../../../../core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source';
-import { IListConfig } from '../../../../../core/src/shared/components/list/list.component.types';
-import { GetAllEndpoints } from '../../../../../store/src/actions/endpoint.actions';
-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 { HELM_ENDPOINT_TYPE } from '../helm-entity-factory';
-
-export class MonocularRepositoryDataSource extends BaseEndpointsDataSource {
-
-  private polls: Subscription[];
-  private highlighted;
-  constructor(
-    store: Store<AppState>,
-    listConfig: IListConfig<EndpointModel>,
-    highlighted: string,
-    paginationMonitorFactory: PaginationMonitorFactory,
-    entityMonitorFactory: EntityMonitorFactory,
-    internalEventMonitorFactory: InternalEventMonitorFactory,
-    ngZone: NgZone,
-  ) {
-    const action = new GetAllEndpoints();
-    const paginationKey = 'mono-endpoints';
-    // We do this here to ensure we sync up with main endpoint table data.
-    syncPaginationSection(store, action, paginationKey);
-    action.paginationKey = paginationKey;
-    super(
-      store,
-      listConfig,
-      action,
-      HELM_ENDPOINT_TYPE,
-      paginationMonitorFactory,
-      entityMonitorFactory,
-      internalEventMonitorFactory,
-      false);
-    this.highlighted = highlighted;
-    this.getRowState = (row: any): Observable<RowState> => observableOf({ highlighted: row.guid === this.highlighted });
-    this.polls = [];
-    ngZone.runOutsideAngular(() => {
-      this.polls.push(
-        interval(10000).subscribe(() => {
-          ngZone.run(() => {
-            store.dispatch(action);
-          });
-        })
-      );
-    });
-  }
-
-  destroy() {
-    safeUnsubscribe(...(this.polls || []));
-  }
-
-}
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.html
index 106aa1b41e..73783346ce 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.html
@@ -1,4 +1,4 @@
-<app-page-header tabsHeader="Helm" [tabs]="tabLinks" [endpointIds$]="endpointIds$">
+<app-page-header [endpointIds$]="endpointIds$">
   <h1>Helm</h1>
 </app-page-header>
 <router-outlet></router-outlet>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.ts
index e6cb223a67..236ad2c157 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.ts
@@ -14,10 +14,6 @@ import { HELM_ENDPOINT_TYPE } from '../helm-entity-factory';
 })
 export class MonocularTabBaseComponent implements OnInit {
 
-  public tabLinks = [
-    { link: 'charts', label: 'Charts', icon: 'folder_open' },
-    { link: 'repos', label: 'Repositories', icon: 'products', iconFont: 'stratos-icons' }
-  ];
   public endpointIds$: Observable<string[]>;
 
   constructor(private store: Store<AppState>) { }
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular.interceptor.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular.interceptor.ts
new file mode 100644
index 0000000000..ddb24966a1
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular.interceptor.ts
@@ -0,0 +1,67 @@
+import { HttpBackend, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { Observable } from 'rxjs';
+
+import { stratosMonocularEndpointGuid } from './monocular/stratos-monocular.helper';
+
+/**
+ * Add information to request to monocular to differ between stratos and helm hub monocular instances
+ */
+@Injectable()
+export class MonocularInterceptor implements HttpInterceptor {
+
+  constructor(private route: ActivatedRoute) { }
+
+  /**
+   * The interceptor should only run for http clients provided in the helm module, but just in case only apply self for specific urls..
+   */
+  private readonly includeUrls = [
+    '/pp/v1/chartsvc'
+  ];
+
+  intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
+    const validUrl = this.includeUrls.find(part => req.url.indexOf(part) >= 0);
+    const endpoint = this.route.snapshot.params.endpoint;
+    const hasEndpoint = !!endpoint;
+    const isExternalMonocular = endpoint !== stratosMonocularEndpointGuid;
+
+    const newReq = validUrl && hasEndpoint && isExternalMonocular ? req.clone({
+      // Endpoint guid will be helm hub's endpoint
+      headers: req.headers.set('x-cap-cnsi-list', endpoint)
+    }) : req;
+
+    return next.handle(newReq);
+  }
+}
+
+class HttpInterceptorHandler implements HttpHandler {
+  constructor(private next: HttpHandler, private interceptor: HttpInterceptor) { }
+
+  handle(req: HttpRequest<any>): Observable<HttpEvent<any>> {
+    return this.interceptor.intercept(req, this.next);
+  }
+}
+export class HttpInterceptingHandler implements HttpHandler {
+  private chain: HttpHandler = null;
+
+  constructor(
+    private backend: HttpBackend,
+    private interceptors: HttpInterceptor[],
+    private intercept?: (req: HttpRequest<any>) => HttpRequest<any>
+  ) { }
+
+  handle(req: HttpRequest<any>): Observable<HttpEvent<any>> {
+    if (this.intercept) {
+      req = this.intercept(req);
+    }
+
+    if (this.chain === null) {
+      this.chain = this.interceptors.reduceRight(
+        (next, interceptor) => new HttpInterceptorHandler(next, interceptor),
+        this.backend
+      );
+    }
+    return this.chain.handle(req);
+  }
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html
index 5801bc679a..aa041718ae 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html
@@ -1,11 +1,13 @@
 <div class="chart-details-usage__install">
-  <button *ngIf="endpointsService.hasConnectedEndpointType('k8s') | async; else nok8s" class="chart-details-usage__install-btn" color="primary" mat-button mat-raised-button
-  routerLink="/monocular/install/{{chart.id}}/{{currentVersion}}">Install Chart</button>
+  <button *ngIf="endpointsService.hasConnectedEndpointType('k8s') | async; else nok8s"
+    class="chart-details-usage__install-btn" color="primary" mat-button mat-raised-button
+    [routerLink]="installUrl">Install Chart</button>
 </div>
 
-<!-- If there are no Kubernetes endpoints connected, show a disabled buitton with a tool tip-->
+<!-- If there are no Kubernetes endpoints connected, show a disabled button with a tool tip-->
 <ng-template #nok8s>
   <div matTooltip="Add a Kubernetes endpoint to install charts">
-    <button disabled="true" class="chart-details-usage__install-btn" color="primary" mat-button mat-raised-button>Install Chart</button>
+    <button disabled="true" class="chart-details-usage__install-btn" color="primary" mat-button
+      mat-raised-button>Install Chart</button>
   </div>
-</ng-template>
+</ng-template>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts
index d6c91d4a44..73025fe6ac 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts
@@ -2,9 +2,11 @@ import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
 import { MatIconRegistry } from '@angular/material/icon';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { DomSanitizer } from '@angular/platform-browser';
+import { ActivatedRoute } from '@angular/router';
 
 import { EndpointsService } from '../../../../../../../core/src/core/endpoints.service';
 import { Chart } from '../../shared/models/chart';
+import { getMonocularEndpoint } from '../../stratos-monocular.helper';
 
 @Component({
   selector: 'app-chart-details-usage',
@@ -22,7 +24,8 @@ export class ChartDetailsUsageComponent implements OnInit {
     private mdIconRegistry: MatIconRegistry,
     private sanitizer: DomSanitizer,
     public snackBar: MatSnackBar,
-    public endpointsService: EndpointsService
+    public endpointsService: EndpointsService,
+    private route: ActivatedRoute,
   ) { }
 
   ngOnInit() {
@@ -35,24 +38,8 @@ export class ChartDetailsUsageComponent implements OnInit {
     );
   }
 
-  // Show an snack bar to confirm the user that the code has been copied
-  showSnackBar(): void {
-    this.snackBar.open('Copied to the clipboard', '', {
-      duration: 1500
-    });
-  }
-
-  get showRepoInstructions(): boolean {
-    return this.chart.attributes.repo.name !== 'stable';
-  }
-
-  get repoAddInstructions(): string {
-    return `helm repo add ${this.chart.attributes.repo.name} ${this.chart
-      .attributes.repo.url}`;
-  }
-
-  get installInstructions(): string {
-    return `helm install ${this.chart.id} --version ${this.currentVersion}`;
+  get installUrl(): string {
+    return `/monocular/install/${getMonocularEndpoint(this.route, this.chart)}/${this.chart.id}/${this.currentVersion}`;
   }
 
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts
index 9e17557519..553b028fc9 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts
@@ -1,7 +1,9 @@
 import { Component, Input } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 
 import { ChartAttributes } from '../../shared/models/chart';
 import { ChartVersion } from '../../shared/models/chart-version';
+import { getMonocularEndpoint } from '../../stratos-monocular.helper';
 
 @Component({
   selector: 'app-chart-details-versions',
@@ -13,9 +15,11 @@ export class ChartDetailsVersionsComponent {
   @Input() currentVersion: ChartVersion;
   showAllVersions: boolean;
 
+  constructor(private route: ActivatedRoute) { }
+
   goToVersionUrl(version: ChartVersion): string {
     const chart: ChartAttributes = version.relationships.chart.data;
-    return `/monocular/charts/${chart.repo.name}/${chart.name}/${version.attributes.version}`;
+    return `/monocular/charts/${getMonocularEndpoint(this.route)}/${chart.repo.name}/${chart.name}/${version.attributes.version}`;
   }
 
   isSelected(version: ChartVersion): boolean {
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.ts
index 6e0d22df33..76262da43a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.ts
@@ -6,6 +6,7 @@ import { Chart } from '../shared/models/chart';
 import { ChartVersion } from '../shared/models/chart-version';
 import { ChartsService } from '../shared/services/charts.service';
 import { ConfigService } from '../shared/services/config.service';
+import { getMonocularEndpoint } from '../stratos-monocular.helper';
 
 @Component({
   selector: 'app-chart-details',
@@ -55,6 +56,6 @@ export class ChartDetailsComponent implements OnInit {
   updateMetaTags(): void { }
 
   goToRepoUrl(): string {
-    return `/charts/${this.chart.attributes.repo.name}`;
+    return `/charts/${getMonocularEndpoint(null, this.chart)}/${this.chart.attributes.repo.name}`;
   }
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.spec.ts
index 47188d55a5..b9512b6483 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.spec.ts
@@ -2,6 +2,7 @@ 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 } from '@angular/router';
 
 import { LoggerService } from '../../../../../../core/src/core/logger.service';
 import { createBasicStoreModule } from '../../../../../../store/testing/public-api';
@@ -22,7 +23,17 @@ describe('Component: ChartItem', () => {
         HttpClient,
         ConfigService,
         ChartsService,
-        LoggerService
+        LoggerService,
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: {
+              params: {
+              },
+              queryParams: {}
+            },
+          }
+        }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.ts
index ae51cd2620..e17d058c7d 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 
 import { Chart } from '../shared/models/chart';
 import { ChartsService } from '../shared/services/charts.service';
+import { getMonocularEndpoint } from '../stratos-monocular.helper';
 
 @Component({
   selector: 'app-chart-item',
@@ -26,11 +27,11 @@ export class ChartItemComponent implements OnInit {
   }
 
   goToDetailUrl(): string {
-    return `/monocular/charts/${this.chart.attributes.repo.name}/${this.chart.attributes
+    return `/monocular/charts/${getMonocularEndpoint(null, this.chart)}/${this.chart.attributes.repo.name}/${this.chart.attributes
       .name}`;
   }
 
   goToRepoUrl(): string {
-    return `/monocular/charts/${this.chart.attributes.repo.name}`;
+    return `/monocular/charts/${getMonocularEndpoint(null, this.chart)}/${this.chart.attributes.repo.name}`;
   }
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/monocular.module.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/monocular.module.ts
new file mode 100644
index 0000000000..240e637d44
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/monocular.module.ts
@@ -0,0 +1,53 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { CoreModule, SharedModule } from '../../../../../core/src/public-api';
+import { ChartDetailsInfoComponent } from './chart-details/chart-details-info/chart-details-info.component';
+import { ChartDetailsReadmeComponent } from './chart-details/chart-details-readme/chart-details-readme.component';
+import { ChartDetailsUsageComponent } from './chart-details/chart-details-usage/chart-details-usage.component';
+import { ChartDetailsVersionsComponent } from './chart-details/chart-details-versions/chart-details-versions.component';
+import { ChartDetailsComponent } from './chart-details/chart-details.component';
+import { ChartIndexComponent } from './chart-index/chart-index.component';
+import { ChartItemComponent } from './chart-item/chart-item.component';
+import { ChartListComponent } from './chart-list/chart-list.component';
+import { ChartsComponent } from './charts/charts.component';
+import { ListFiltersComponent } from './list-filters/list-filters.component';
+import { ListItemComponent } from './list-item/list-item.component';
+import { LoaderComponent } from './loader/loader.component';
+import { PanelComponent } from './panel/panel.component';
+import { createMonocularProviders } from './stratos-monocular-providers.helpers';
+
+const components = [
+  PanelComponent,
+  ChartListComponent,
+  ChartItemComponent,
+  ListItemComponent,
+  ListFiltersComponent,
+  LoaderComponent,
+  ChartsComponent,
+  ChartIndexComponent,
+  ChartDetailsComponent,
+  ChartDetailsUsageComponent,
+  ChartDetailsVersionsComponent,
+  ChartDetailsReadmeComponent,
+  ChartDetailsInfoComponent,
+];
+
+@NgModule({
+  imports: [
+    CoreModule,
+    CommonModule,
+    SharedModule,
+  ],
+  declarations: [
+    ...components,
+  ],
+  providers: [
+    // Note - not really needed here, given need to bring in with a component where route with endpoint id param exists
+    ...createMonocularProviders()
+  ],
+  exports: [
+    ...components
+  ]
+})
+export class MonocularModule { }
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/chart.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/chart.ts
index 5c2a35dac3..4953b56f06 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/chart.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/chart.ts
@@ -8,6 +8,7 @@ export class Chart {
   links: string[];
   attributes: ChartAttributes;
   relationships: ChartRelationships;
+  monocularEndpointId?: string;
 }
 
 
@@ -29,6 +30,6 @@ class ChartRelationships {
 class ChartVersionRelationship {
   data: ChartVersionAttributes;
   links: {
-    self: string
+    self: string,
   };
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts
index 85cfae1317..77f23474d7 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts
@@ -1,9 +1,11 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Observable, throwError } from 'rxjs';
+import { ActivatedRoute } from '@angular/router';
+import { Observable, of, throwError } from 'rxjs';
 import { catchError, map, tap } from 'rxjs/operators';
 
 import { LoggerService } from '../../../../../../../core/src/core/logger.service';
+import { getMonocularEndpoint, stratosMonocularEndpointGuid } from '../../stratos-monocular.helper';
 import { Chart } from '../models/chart';
 import { ChartVersion } from '../models/chart-version';
 import { ConfigService } from './config.service';
@@ -19,13 +21,31 @@ export class ChartsService {
   constructor(
     private http: HttpClient,
     config: ConfigService,
-    private loggerService: LoggerService
+    private loggerService: LoggerService,
+    private route: ActivatedRoute,
   ) {
     this.hostname = `${config.backendHostname}/chartsvc`;
     this.cacheCharts = {};
     this.hostname = '/pp/v1/chartsvc';
   }
 
+  /**
+   * Update url to go to a monocular instance other than stratos
+   * These are used as img src values so won't hit our http interceptor
+   */
+  private updateStratosUrl(chart: Chart, url: string): string {
+    const endpoint = getMonocularEndpoint(this.route, chart);
+    if (!endpoint || endpoint === stratosMonocularEndpointGuid) {
+      return url;
+    }
+    const parts = url.split('/');
+    const chartsvcIndex = parts.findIndex(part => part === 'chartsvc');
+    if (chartsvcIndex >= 0) {
+      parts.splice(chartsvcIndex, 0, `monocular/${endpoint}`);
+    }
+    return parts.join('/');
+  }
+
   /**
    * Get all charts from the API
    *
@@ -48,7 +68,7 @@ export class ChartsService {
         observer.next(this.cacheCharts[repo]);
       });
     } else {
-      return this.http.get<{ data: any }>(url).pipe(
+      return this.http.get<{ data: any, }>(url).pipe(
         map(r => this.extractData(r)),
         tap((data) => this.storeCache(data, repo)),
         catchError(this.handleError)
@@ -119,7 +139,7 @@ export class ChartsService {
    * @return An observable that will be the json schema
    */
   getChartSchema(chartVersion: ChartVersion): Observable<any> {
-    return this.http.get(`${this.hostname}${chartVersion.attributes.schema}`);
+    return chartVersion.attributes.schema ? this.http.get(`${this.hostname}${chartVersion.attributes.schema}`) : of(null);
   }
 
   /**
@@ -130,7 +150,7 @@ export class ChartsService {
    * @return An observable containing an array of ChartVersions
    */
   getVersions(repo: string, chartName: string): Observable<ChartVersion[]> {
-    return this.http.get<{ data: any }>(`${this.hostname}/v1/charts/${repo}/${chartName}/versions`).pipe(
+    return this.http.get<{ data: any; }>(`${this.hostname}/v1/charts/${repo}/${chartName}/versions`).pipe(
       map(m => this.extractData(m)),
       catchError(this.handleError)
     );
@@ -157,7 +177,7 @@ export class ChartsService {
    */
   getChartIconURL(chart: Chart): string {
     if (chart.attributes.icon) {
-      return `${this.hostname}${chart.attributes.icon}`;
+      return this.updateStratosUrl(chart, `${this.hostname}${chart.attributes.icon}`);
     } else {
       return '/core/assets/custom/placeholder.png';
     }
@@ -175,7 +195,7 @@ export class ChartsService {
   }
 
 
-  private extractData(res: { data: any }) {
+  private extractData(res: { data: any; }) {
     return res.data || {};
   }
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/repos.service.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/repos.service.ts
index 9ac9582e7e..23a0880309 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/repos.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/repos.service.ts
@@ -8,7 +8,6 @@ import { RepoAttributes } from '../models/repo';
 import { ConfigService } from './config.service';
 
 
-
 @Injectable()
 export class ReposService {
 
@@ -34,7 +33,7 @@ export class ReposService {
     );
   }
 
-  private extractData(res: { data: any }) {
+  private extractData(res: { data: any; }) {
     return res.data || {};
   }
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/stratos-monocular-providers.helpers.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/stratos-monocular-providers.helpers.ts
new file mode 100644
index 0000000000..ac028762ec
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/stratos-monocular-providers.helpers.ts
@@ -0,0 +1,28 @@
+import { HTTP_INTERCEPTORS, HttpBackend, HttpClient, HttpInterceptor } from '@angular/common/http';
+
+import { HttpInterceptingHandler, MonocularInterceptor } from '../monocular.interceptor';
+import { ChartsService } from './shared/services/charts.service';
+import { ConfigService } from './shared/services/config.service';
+import { MenuService } from './shared/services/menu.service';
+import { ReposService } from './shared/services/repos.service';
+
+/**
+ * Helm Method to ensure http client with custom monocular interceptor is used in the monocular services
+ */
+export const createMonocularProviders = () => [
+  ChartsService,
+  ConfigService,
+  MenuService,
+  ReposService,
+  MonocularInterceptor,
+  {
+    provide: HttpClient,
+    useFactory: (httpBackend: HttpBackend, interceptors: HttpInterceptor[], monocularInterceptor: MonocularInterceptor) => {
+      return new HttpClient(new HttpInterceptingHandler(httpBackend, [
+        ...interceptors,
+        monocularInterceptor
+      ]));
+    },
+    deps: [HttpBackend, HTTP_INTERCEPTORS, MonocularInterceptor]
+  }
+];
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/stratos-monocular.helper.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/stratos-monocular.helper.ts
new file mode 100644
index 0000000000..7a79192d1f
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/stratos-monocular.helper.ts
@@ -0,0 +1,19 @@
+import { ActivatedRoute } from '@angular/router';
+
+import { Chart } from './shared/models/chart';
+
+
+/**
+ * Stratos Monocular has no concept of an endpoint (it has monocular repo endpoints...) so give it a default string
+ * Note - This could be the guid for the helm hub endpoint
+ */
+export const stratosMonocularEndpointGuid = 'default';
+
+/**
+ * Add the monocular endpoint id to a url. This could be the helm hub endpoint guid or `default` for stratos monocular
+ */
+export const getMonocularEndpoint = (route?: ActivatedRoute, chart?: Chart, ifEmpty = stratosMonocularEndpointGuid) => {
+  const endpointFromRoute = route ? route.snapshot.params.endpoint : null;
+  const endpointFromChart = chart ? chart.monocularEndpointId : null;
+  return endpointFromRoute || endpointFromChart || ifEmpty;
+};
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.action-builders.ts b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.action-builders.ts
index df443d3ea6..708227b098 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.action-builders.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.action-builders.ts
@@ -1,31 +1,49 @@
 import { OrchestratedActionBuilders } from '../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
-import { GetHelmChartVersions, GetHelmVersions, GetMonocularCharts, HelmInstall } from './helm.actions';
+import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
+import { GetHelmChartVersions, GetHelmVersions, GetMonocularCharts, HelmInstall, HelmSynchronise } from './helm.actions';
 import { HelmInstallValues } from './helm.types';
 
 export interface HelmChartActionBuilders extends OrchestratedActionBuilders {
   getMultiple: () => GetMonocularCharts,
   // Helm install added to chart action builder and not helm release/workload to ensure action & effect are available in this module
   // (others may not have loaded)
-  install: (values: HelmInstallValues) => HelmInstall
+  install: (values: HelmInstallValues) => HelmInstall,
+  synchronise: (endpoint: EndpointModel) => HelmSynchronise;
 }
 
 export const helmChartActionBuilders: HelmChartActionBuilders = {
   getMultiple: () => new GetMonocularCharts(),
-  install: (values: HelmInstallValues) => new HelmInstall(values)
-}
+  install: (values: HelmInstallValues) => new HelmInstall(values),
+  synchronise: (endpoint: EndpointModel) => new HelmSynchronise(endpoint)
+};
 
 export interface HelmVersionActionBuilders extends OrchestratedActionBuilders {
-  getMultiple: () => GetHelmVersions
+  getMultiple: () => GetHelmVersions;
 }
 
 export const helmVersionActionBuilders: HelmVersionActionBuilders = {
   getMultiple: () => new GetHelmVersions()
-}
+};
 
 export interface HelmChartVersionsActionBuilders extends OrchestratedActionBuilders {
-  getMultiple: (repoName: string, chartName: string) => GetHelmChartVersions
+  getMultiple: (
+    endpointGuid: string,
+    paginationKey: string,
+    extraArgs: {
+      monocularEndpoint: string,
+      repoName: string,
+      chartName: string;
+    }) => GetHelmChartVersions;
 }
 
 export const helmChartVersionsActionBuilders: HelmChartVersionsActionBuilders = {
-  getMultiple: (repoName: string, chartName: string) => new GetHelmChartVersions(repoName, chartName)
-}
+  getMultiple: (
+    endpointGuid: string,
+    paginationKey: string,
+    extraArgs: {
+      monocularEndpoint: string,
+      repoName: string,
+      chartName: string;
+    }) =>
+    new GetHelmChartVersions(extraArgs.monocularEndpoint, extraArgs.repoName, extraArgs.chartName)
+};
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.actions.ts b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.actions.ts
index df552269dd..883cdd4414 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.actions.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.actions.ts
@@ -1,3 +1,6 @@
+import { Action } from '@ngrx/store';
+
+import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
 import { PaginatedAction } from '../../../../../store/src/types/pagination.types';
 import { EntityRequestAction } from '../../../../../store/src/types/request.types';
 import {
@@ -25,6 +28,8 @@ export const HELM_INSTALL = '[Helm] Install';
 export const HELM_INSTALL_SUCCESS = '[Helm] Install Success';
 export const HELM_INSTALL_FAILURE = '[Helm] Install Failure';
 
+export const HELM_SYNCHRONISE = '[Helm] Synchronise';
+
 export interface MonocularPaginationAction extends PaginatedAction, EntityRequestAction { }
 
 export class GetMonocularCharts implements MonocularPaginationAction {
@@ -48,6 +53,15 @@ export class GetMonocularCharts implements MonocularPaginationAction {
   flattenPagination = true;
 }
 
+export class HelmSynchronise implements Action {
+  public type = HELM_SYNCHRONISE;
+  public guid: string;
+
+  constructor(public endpoint: EndpointModel) {
+    this.guid = endpoint.guid;
+  }
+}
+
 export class HelmInstall implements EntityRequestAction {
   type = HELM_INSTALL;
   endpointType = HELM_ENDPOINT_TYPE;
@@ -80,7 +94,7 @@ export class GetHelmVersions implements MonocularPaginationAction {
 }
 
 export class GetHelmChartVersions implements MonocularPaginationAction {
-  constructor(public repoName: string, public chartName: string) {
+  constructor(public monocularEndpoint: string, public repoName: string, public chartName: string) {
     this.paginationKey = `'monocular-chart-versions-${repoName}-${chartName}`;
   }
   type = GET_MONOCULAR_CHART_VERSIONS;
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
index 31508d886f..440f452122 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
@@ -1,9 +1,10 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
+import { MatSnackBar } from '@angular/material/snack-bar';
 import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Action, Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
-import { catchError, flatMap, mergeMap } from 'rxjs/operators';
+import { combineLatest, Observable, of } from 'rxjs';
+import { catchError, flatMap, map, mergeMap, withLatestFrom } from 'rxjs/operators';
 
 import { environment } from '../../../../../core/src/environments/environment';
 import { GET_ENDPOINTS_SUCCESS, GetAllEndpointsSuccess } from '../../../../../store/src/actions/endpoint.actions';
@@ -12,6 +13,7 @@ import { AppState } from '../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
 import { isJetstreamError } from '../../../../../store/src/jetstream';
 import { ApiRequestTypes } from '../../../../../store/src/reducers/api-request-reducer/request-helpers';
+import { endpointOfTypeSelector } from '../../../../../store/src/selectors/endpoint.selectors';
 import { NormalizedResponse } from '../../../../../store/src/types/api.types';
 import {
   EntityRequestAction,
@@ -20,7 +22,9 @@ import {
   WrapperRequestActionSuccess,
 } from '../../../../../store/src/types/request.types';
 import { helmEntityCatalog } from '../helm-entity-catalog';
-import { getHelmVersionId, getMonocularChartId, HELM_ENDPOINT_TYPE } from '../helm-entity-factory';
+import { getHelmVersionId, getMonocularChartId, HELM_ENDPOINT_TYPE, HELM_HUB_ENDPOINT_TYPE } from '../helm-entity-factory';
+import { Chart } from '../monocular/shared/models/chart';
+import { stratosMonocularEndpointGuid } from '../monocular/stratos-monocular.helper';
 import {
   GET_HELM_VERSIONS,
   GET_MONOCULAR_CHART_VERSIONS,
@@ -29,17 +33,60 @@ import {
   GetHelmVersions,
   GetMonocularCharts,
   HELM_INSTALL,
+  HELM_SYNCHRONISE,
   HelmInstall,
+  HelmSynchronise,
 } from './helm.actions';
 import { HelmVersion } from './helm.types';
 
+type MonocularChartsResponse = {
+  data: Chart[];
+};
+
+const mapMonocularChartResponse = (entityKey: string, response: MonocularChartsResponse): NormalizedResponse => {
+  const base: NormalizedResponse = {
+    entities: { [entityKey]: {} },
+    result: []
+  };
+
+  const items = response.data as Array<any>;
+  const processedData: NormalizedResponse = items.reduce((res, data) => {
+    const id = getMonocularChartId(data);
+    res.entities[entityKey][id] = data;
+    // Promote the name to the top-level object for simplicity
+    data.name = data.attributes.name;
+    res.result.push(id);
+    return res;
+  }, base);
+  return processedData;
+};
+
+const mergeMonocularChartResponses = (entityKey: string, responses: MonocularChartsResponse[]): NormalizedResponse => {
+  const combined = responses.reduce((res, response) => {
+    res.data = res.data.concat(response.data);
+    return res;
+  }, { data: [] });
+  return mapMonocularChartResponse(entityKey, combined);
+};
+
+const addMonocularId = (endpointId: string, response: MonocularChartsResponse): MonocularChartsResponse => {
+  const data = response.data.map(chart => ({
+    ...chart,
+    monocularEndpointId: endpointId
+  }));
+  return {
+    data
+  };
+};
+
 @Injectable()
 export class HelmEffects {
 
   constructor(
     private httpClient: HttpClient,
     private actions$: Actions,
-    private store: Store<AppState>
+    private store: Store<AppState>,
+    public snackBar: MatSnackBar,
   ) { }
 
   // Endpoints that we know are synchronizing
@@ -53,7 +100,7 @@ export class HelmEffects {
   updateOnSyncFinished$ = this.actions$.pipe(
     ofType<GetAllEndpointsSuccess>(GET_ENDPOINTS_SUCCESS),
     flatMap(action => {
-      // Look to see if we have any endpoints that are sycnhronizing
+      // Look to see if we have any endpoints that are synchronizing
       let updated = false;
       Object.values(action.payload.entities.stratosEndpoint).forEach(endpoint => {
         if (endpoint.cnsi_type === HELM_ENDPOINT_TYPE && endpoint.endpoint_metadata) {
@@ -78,25 +125,43 @@ export class HelmEffects {
   @Effect()
   fetchCharts$ = this.actions$.pipe(
     ofType<GetMonocularCharts>(GET_MONOCULAR_CHARTS),
-    flatMap(action => {
+    withLatestFrom(this.store),
+    flatMap(([action, appState]) => {
       const entityKey = entityCatalog.getEntityKey(action);
-      return this.makeRequest(action, `/pp/${this.proxyAPIVersion}/chartsvc/v1/charts`, (response) => {
-        const base = {
-          entities: { [entityKey]: {} },
-          result: []
-        } as NormalizedResponse;
 
-        const items = response.data as Array<any>;
-        const processedData = items.reduce((res, data) => {
-          const id = getMonocularChartId(data);
-          res.entities[entityKey][id] = data;
-          // Promote the name to the top-level object for simplicity
-          data.name = data.attributes.name;
-          res.result.push(id);
-          return res;
-        }, base);
-        return processedData;
-      }, []);
+      this.store.dispatch(new StartRequestAction(action));
+
+      const helmEndpoints = Object.values(endpointOfTypeSelector(HELM_ENDPOINT_TYPE)(appState));
+      const helmHubEndpoint = helmEndpoints.find(endpoint => endpoint.sub_type === HELM_HUB_ENDPOINT_TYPE);
+
+      // See https://github.com/SUSE/stratos/issues/466. It would be better to use the standard proxy for this request and go out to all
+      // valid helm sub types
+      const stratosMonocular = this.httpClient.get<MonocularChartsResponse>(`/pp/${this.proxyAPIVersion}/chartsvc/v1/charts`);
+      const helmHubMonocular = helmHubEndpoint ? this.createHelmHubRequest(helmHubEndpoint.guid) : of({ data: [] });
+
+      return combineLatest([
+        stratosMonocular,
+        helmHubMonocular
+      ]).pipe(
+        map(res => mergeMonocularChartResponses(entityKey, res)),
+        mergeMap((response: NormalizedResponse) => [new WrapperRequestActionSuccess(response, action)]),
+        catchError(error => {
+          const { status, message } = HelmEffects.createHelmError(error);
+          const endpointIds = helmEndpoints.map(e => e.guid);
+          if (helmHubEndpoint) {
+            endpointIds.push(helmHubEndpoint.guid);
+          }
+          return [
+            new WrapperRequestActionFailed(message, action, 'fetch', {
+              endpointIds,
+              url: null,
+              eventCode: status,
+              message,
+              error
+            })
+          ];
+        })
+      );
     })
   );
 
@@ -106,10 +171,10 @@ export class HelmEffects {
     flatMap(action => {
       const entityKey = entityCatalog.getEntityKey(action);
       return this.makeRequest(action, `/pp/${this.proxyAPIVersion}/helm/versions`, (response) => {
-        const processedData = {
+        const processedData: NormalizedResponse = {
           entities: { [entityKey]: {} },
           result: []
-        } as NormalizedResponse;
+        };
 
         // Go through each endpoint ID
         Object.keys(response).forEach(endpoint => {
@@ -136,23 +201,25 @@ export class HelmEffects {
     flatMap(action => {
       const entityKey = entityCatalog.getEntityKey(action);
       return this.makeRequest(action, `/pp/${this.proxyAPIVersion}/chartsvc/v1/charts/${action.repoName}/${action.chartName}/versions`,
-      (response) => {
-        const base = {
-          entities: { [entityKey]: {} },
-          result: []
-        } as NormalizedResponse;
+        (response) => {
+          const base: NormalizedResponse = {
+            entities: { [entityKey]: {} },
+            result: []
+          };
 
-        const items = response.data as Array<any>;
-        const processedData = items.reduce((res, data) => {
-          const id = getMonocularChartId(data);
-          res.entities[entityKey][id] = data;
-          // Promote the name to the top-level object for simplicity
-          data.name = data.attributes.name;
-          res.result.push(id);
-          return res;
-        }, base);
-        return processedData;
-      }, []);
+          const items = response.data as Array<any>;
+          const processedData = items.reduce((res, data) => {
+            const id = getMonocularChartId(data);
+            res.entities[entityKey][id] = data;
+            // Promote the name to the top-level object for simplicity
+            data.name = data.attributes.name;
+            res.result.push(id);
+            return res;
+          }, base);
+          return processedData;
+        }, [], {
+        'x-cap-cnsi-list': action.monocularEndpoint !== stratosMonocularEndpointGuid ? action.monocularEndpoint : ''
+      });
     })
   );
 
@@ -187,6 +254,26 @@ export class HelmEffects {
     })
   );
 
+  @Effect()
+  helmSynchronise$ = this.actions$.pipe(
+    ofType<HelmSynchronise>(HELM_SYNCHRONISE),
+    flatMap(action => {
+      const requestArgs = {
+        headers: null,
+        params: null
+      };
+      const proxyAPIVersion = environment.proxyAPIVersion;
+      const url = `/pp/${proxyAPIVersion}/chartrepos/${action.endpoint.guid}`;
+      const req = this.httpClient.post(url, requestArgs);
+      req.subscribe(ok => {
+        this.snackBar.open('Helm Repository synchronization started', 'Dismiss', { duration: 3000 });
+      }, err => {
+        this.snackBar.open(`Failed to Synchronize Helm Repository '${action.endpoint.name}'`, 'Dismiss', { duration: 5000 });
+      });
+      return [];
+    })
+  );
+
   private static createHelmErrorMessage(err: any): string {
     if (err) {
       if (err.error && err.error.message) {
@@ -222,15 +309,24 @@ export class HelmEffects {
     };
   }
 
+  private createHelmHubRequest(endpointId: string): Observable<MonocularChartsResponse> {
+    return this.httpClient.get<MonocularChartsResponse>(`/pp/${this.proxyAPIVersion}/chartsvc/v1/charts`, {
+      headers: {
+        'x-cap-cnsi-list': endpointId
+      }
+    }).pipe(map(res => addMonocularId(endpointId, res)));
+  }
+
   private makeRequest(
     action: EntityRequestAction,
     url: string,
     mapResult: (response: any) => NormalizedResponse,
-    endpointIds: string[]
+    endpointIds: string[],
+    headers = {}
   ): Observable<Action> {
     this.store.dispatch(new StartRequestAction(action));
     const requestArgs = {
-      headers: null,
+      headers,
       params: null
     };
     return this.httpClient.get(url, requestArgs).pipe(
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.types.ts b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.types.ts
index 4ddf46021c..7c9c4afa9c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.types.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.types.ts
@@ -1,5 +1,5 @@
-import { Chart } from './../monocular/shared/models/chart';
-import { ChartVersion } from './../monocular/shared/models/chart-version';
+import { Chart } from '../monocular/shared/models/chart';
+import { ChartVersion } from '../monocular/shared/models/chart-version';
 
 export interface MonocularRepository {
   name: string;
@@ -47,10 +47,26 @@ export enum HelmStatus {
 
 export interface HelmInstallValues {
   endpoint: string;
+  monocularEndpoint: string;
   releaseName: string;
   releaseNamespace: string;
   values: string;
-  chart: string;
+  chart: {
+    name: string;
+    repo: string;
+    version: string;
+  };
+}
+
+export interface HelmUpgradeValues {
+  values: string;
+  chart: {
+    name: string;
+    repo: string;
+    version: string;
+  };
+  restartPods?: boolean;
+  monocularEndpoint?: string;
 }
 
 export interface HelmUpgradeValues {
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.html
deleted file mode 100644
index dd2b6cb351..0000000000
--- a/src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<app-list></app-list>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.spec.ts
deleted file mode 100644
index 57e2407ba1..0000000000
--- a/src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.spec.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { HelmBaseTestModules } from '../../helm-testing.module';
-import { RepositoryTabComponent } from './repository-tab.component';
-
-describe('RepositoryTabComponent', () => {
-  let component: RepositoryTabComponent;
-  let fixture: ComponentFixture<RepositoryTabComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        ...HelmBaseTestModules
-      ],
-      declarations: [RepositoryTabComponent]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(RepositoryTabComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.ts
deleted file mode 100644
index cea4439854..0000000000
--- a/src/frontend/packages/suse-extensions/src/custom/helm/tabs/repository-tab/repository-tab.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Component } from '@angular/core';
-
-import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
-import { MonocularRepositoryListConfig } from '../../list-types/monocular-repository-list-config.service';
-
-@Component({
-  selector: 'app-repository-tab',
-  templateUrl: './repository-tab.component.html',
-  styleUrls: ['./repository-tab.component.scss'],
-  providers: [{
-    provide: ListConfig,
-    useClass: MonocularRepositoryListConfig,
-  }]
-})
-export class RepositoryTabComponent {
-
-}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
index 749d08e560..99899a0b92 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
@@ -3,6 +3,7 @@ import { combineLatest, Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
 import { helmEntityCatalog } from '../../../../helm/helm-entity-catalog';
+import { ChartAttributes } from '../../../../helm/monocular/shared/models/chart';
 import { ChartMetadata } from '../../../../helm/store/helm.types';
 import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog';
 import { ContainerStateCollection, KubernetesPod } from '../../../store/kube.types';
@@ -60,6 +61,13 @@ class Version {
   }
 }
 
+type InternalHelmUpgrade = {
+  release: HelmRelease,
+  upgrade: ChartAttributes,
+  version: string,
+  monocularEndpointId: string;
+};
+
 @Injectable()
 export class HelmReleaseHelperService {
 
@@ -206,7 +214,7 @@ export class HelmReleaseHelperService {
     return false;
   }
 
-  public hasUpgrade(returnLatest = false): Observable<any> {
+  public hasUpgrade(returnLatest = false): Observable<InternalHelmUpgrade> {
     const updates = combineLatest(this.getCharts(), this.release$);
     return updates.pipe(
       map(([charts, release]) => {
@@ -219,7 +227,8 @@ export class HelmReleaseHelperService {
                 return {
                   release,
                   upgrade: c.attributes,
-                  version: c.relationships.latestChartVersion.data.version
+                  version: c.relationships.latestChartVersion.data.version,
+                  monocularEndpointId: c.monocularEndpointId
                 };
               }
             }
@@ -233,8 +242,9 @@ export class HelmReleaseHelperService {
             return {
               release,
               upgrade: releaseChart.attributes,
-              version: releaseChart.relationships.latestChartVersion.data.version
-            }
+              version: releaseChart.relationships.latestChartVersion.data.version,
+              monocularEndpointId: releaseChart.monocularEndpointId
+            };
           }
         }
         return null;
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.effects.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.effects.ts
index a572f14604..7c235a2766 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.effects.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.effects.ts
@@ -163,7 +163,7 @@ export class WorkloadsEffects {
     })
   );
 
-private mapHelmRelease(data, endpointId, guid: string) {
+  private mapHelmRelease(data, endpointId, guid: string) {
     const helmRelease: HelmRelease = {
       ...data,
       endpointId
@@ -201,7 +201,7 @@ private mapHelmRelease(data, endpointId, guid: string) {
             message: errorMessage,
             error
           })
-        ]
+        ];
       })
     );
   }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-data-source.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-data-source.ts
index f98ddea450..204cc8b66a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-data-source.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-data-source.ts
@@ -1,15 +1,11 @@
 import { Store } from '@ngrx/store';
 import { Observable, of } from 'rxjs';
 
-import {
-  DataFunction,
-  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 { 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 { PaginationEntityState } from '../../../../../../store/src/types/pagination.types';
 import { helmEntityCatalog } from '../../../helm/helm-entity-catalog';
-import { helmEntityFactory, monocularChartVersionsEntityType } from '../../../helm/helm-entity-factory';
 import { MonocularVersion } from './../../../helm/store/helm.types';
 
 
@@ -26,13 +22,19 @@ export class HelmReleaseVersionsDataSource extends ListDataSource<MonocularVersi
     repoName: string,
     chartName: string,
     version: string,
+    monocularEndpoint: string,
   ) {
+    const action = helmEntityCatalog.chartVersions.actions.getMultiple(null, null, {
+      repoName,
+      chartName,
+      monocularEndpoint
+    });
     super({
       store,
-      action: helmEntityCatalog.chartVersions.actions.getMultiple(repoName, chartName),
-      schema: helmEntityFactory(monocularChartVersionsEntityType),
-      getRowUniqueId: (object: MonocularVersion) => object.id,
-      paginationKey: helmEntityCatalog.chartVersions.actions.getMultiple(repoName, chartName).paginationKey,
+      action,
+      schema: action.entity[0],
+      getRowUniqueId: (object: MonocularVersion) => action.entity[0].getId(object),
+      paginationKey: action.paginationKey,
       isLocal: true,
       transformEntities: [
         (entities: MonocularVersion[], paginationState: PaginationEntityState) => this.endpointTypeFilter(entities, paginationState)
@@ -45,7 +47,7 @@ export class HelmReleaseVersionsDataSource extends ListDataSource<MonocularVersi
   }
 
 
-  public endpointTypeFilter: DataFunction<MonocularVersion> = (entities: MonocularVersion[], paginationState: PaginationEntityState) => {
+  public endpointTypeFilter(entities: MonocularVersion[], paginationState: PaginationEntityState): MonocularVersion[] {
     if (
       !paginationState.clientPagination ||
       !paginationState.clientPagination.filter ||
@@ -55,7 +57,7 @@ export class HelmReleaseVersionsDataSource extends ListDataSource<MonocularVersi
 
     // Filter out development versions if configured
     const showAll = paginationState.clientPagination.filter.items[typeFilterKey] === 'all';
-    return showAll ?  entities : entities.filter(e => e.attributes.version.indexOf('-') === -1);
+    return showAll ? entities : entities.filter(e => e.attributes.version.indexOf('-') === -1);
   }
 }
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-list-config.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-list-config.ts
index 6d712da1d5..fe811a1a78 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-list-config.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-list-config.ts
@@ -22,7 +22,7 @@ import { HelmReleaseVersionsDataSource } from './release-version-data-source';
 
 const typeFilterKey = 'versionType';
 
-export class ReleaseUpgradeVersionsListConfig implements IListConfig<any> {
+export class ReleaseUpgradeVersionsListConfig implements IListConfig<MonocularVersion> {
 
   public versionsDataSource: ListDataSource<MonocularVersion>;
 
@@ -32,7 +32,7 @@ export class ReleaseUpgradeVersionsListConfig implements IListConfig<any> {
   getMultiActions: () => IMultiListAction<any>[];
   getSingleActions: () => IListAction<any>[];
 
-  columns: Array<ITableColumn<any>> = [
+  columns: Array<ITableColumn<MonocularVersion>> = [
     {
       columnId: 'radio',
       headerCell: () => '',
@@ -80,33 +80,34 @@ export class ReleaseUpgradeVersionsListConfig implements IListConfig<any> {
     repoName: string,
     chartName: string,
     version: string,
+    monocularEndpoint: string
   ) {
     this.getGlobalActions = () => [];
     this.getMultiActions = () => [];
     this.getSingleActions = () => [];
 
-    this.versionsDataSource = new HelmReleaseVersionsDataSource(store, this, repoName, chartName, version);
+    this.versionsDataSource = new HelmReleaseVersionsDataSource(store, this, repoName, chartName, version, monocularEndpoint);
 
     this.multiFiltersConfigs = [{
       hideAllOption: true,
       autoSelectFirst: true,
       key: typeFilterKey,
-        label: 'Endpoint Type',
-        list$: of([
-          {
-            label: 'Release Versions',
-            item: {},
-            value: 'release'
-          },
-          {
-            label: 'All Versions',
-            item: {},
-            value: 'all'
-          }
-        ]),
-        loading$: of(false),
-        select: new BehaviorSubject(undefined)
-      }];
+      label: 'Endpoint Type',
+      list$: of([
+        {
+          label: 'Release Versions',
+          item: {},
+          value: 'release'
+        },
+        {
+          label: 'All Versions',
+          item: {},
+          value: 'all'
+        }
+      ]),
+      loading$: of(false),
+      select: new BehaviorSubject(undefined)
+    }];
 
     // Auto-select first non-development version
     setTimeout(() => {
@@ -122,7 +123,7 @@ export class ReleaseUpgradeVersionsListConfig implements IListConfig<any> {
   private getFirstNonDevelopmentVersion(rows: MonocularVersion[]): MonocularVersion {
     for (const mv of rows) {
       if (mv.attributes.version.indexOf('-') === -1) {
-        return mv
+        return mv;
       }
     }
     return rows[0];
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts
index 8ef8a83118..34f8ef5c45 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts
@@ -7,7 +7,8 @@ import { filter, first, map, pairwise } from 'rxjs/operators';
 
 import { StepComponent, StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types';
-import { HelmUpgradeValues } from '../../../helm/store/helm.types';
+import { stratosMonocularEndpointGuid } from '../../../helm/monocular/stratos-monocular.helper';
+import { HelmUpgradeValues, MonocularVersion } from '../../../helm/store/helm.types';
 import { HelmReleaseHelperService } from '../release/tabs/helm-release-helper.service';
 import { HelmReleaseGuid } from '../workload.types';
 import { workloadsEntityCatalog } from './../workloads-entity-catalog';
@@ -33,15 +34,20 @@ import { ReleaseUpgradeVersionsListConfig } from './release-version-list-config'
 export class UpgradeReleaseComponent {
 
   public cancelUrl;
-  public listConfig;
+  public listConfig: ReleaseUpgradeVersionsListConfig;
   public validate$: Observable<boolean>;
-  private version;
+  private version: MonocularVersion;
   public overrides: FormGroup;
 
+  private monocularEndpointId: string;
+
   // Future
   public showAdvancedOptions = false;
 
-  constructor(store: Store<any>, public helper: HelmReleaseHelperService) {
+  constructor(
+    store: Store<any>,
+    public helper: HelmReleaseHelperService
+  ) {
 
     this.cancelUrl = `/workloads/${this.helper.guid}`;
 
@@ -57,7 +63,8 @@ export class UpgradeReleaseComponent {
       const name = chart.upgrade.name;
       const repoName = chart.upgrade.repo.name;
       const version = chart.release.chart.metadata.version;
-      this.listConfig = new ReleaseUpgradeVersionsListConfig(store, repoName, name, version);
+      this.listConfig = new ReleaseUpgradeVersionsListConfig(store, repoName, name, version, chart.monocularEndpointId);
+      this.monocularEndpointId = chart.monocularEndpointId;
 
       // First step is valid when a version has been selected
       this.validate$ = this.listConfig.versionsDataSource.selectedRows$.pipe(
@@ -79,36 +86,37 @@ export class UpgradeReleaseComponent {
 
   doUpgrade: StepOnNextFunction = (index: number, step: StepComponent) => {
     // If we are showing the advanced options, don't upgrade if we aer not on the last step
-    if (this.showAdvancedOptions && index === 1 ) {
+    if (this.showAdvancedOptions && index === 1) {
       return of({ success: true });
     }
 
     const values: HelmUpgradeValues = {
-      ...this.overrides.value,
+      values: this.overrides.controls.values.value,
       restartPods: false,
       chart: {
         name: this.version.relationships.chart.data.name,
         repo: this.version.relationships.chart.data.repo.name,
         version: this.version.attributes.version,
       },
+      monocularEndpoint: this.monocularEndpointId === stratosMonocularEndpointGuid ? null : this.monocularEndpointId
     };
 
     // Make the request
     return workloadsEntityCatalog.release.api.upgrade<ActionState>(this.helper.releaseTitle,
       this.helper.endpointGuid, this.helper.namespace, values).pipe(
-      // Wait for result of request
-      filter(state => !!state),
-      pairwise(),
-      filter(([oldVal, newVal]) => (oldVal.busy && !newVal.busy)),
-      map(([, newVal]) => newVal),
-      map(result => ({
-        success: !result.error,
-        redirect: !result.error,
-        redirectPayload: {
-          path: !result.error ? this.cancelUrl : ''
-        },
-        message: !result.error ? '' : result.message
-      }))
-    );
-  }
+        // Wait for result of request
+        filter(state => !!state),
+        pairwise(),
+        filter(([oldVal, newVal]) => (oldVal.busy && !newVal.busy)),
+        map(([, newVal]) => newVal),
+        map(result => ({
+          success: !result.error,
+          redirect: !result.error,
+          redirectPayload: {
+            path: !result.error ? this.cancelUrl : ''
+          },
+          message: !result.error ? '' : result.message
+        }))
+      );
+  };
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.routing.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.routing.ts
index a7732ac7a5..a9773315f8 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.routing.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.routing.ts
@@ -28,6 +28,7 @@ const routes: Routes = [
         pathMatch: 'full',
       },
       {
+        // guid = kube endpoint
         path: ':guid/upgrade',
         component: UpgradeReleaseComponent,
         pathMatch: 'full',
diff --git a/src/jetstream/datastore/20200902162200_HelmSubtype.go b/src/jetstream/datastore/20200902162200_HelmSubtype.go
new file mode 100644
index 0000000000..ebb97be983
--- /dev/null
+++ b/src/jetstream/datastore/20200902162200_HelmSubtype.go
@@ -0,0 +1,21 @@
+package datastore
+
+import (
+	"database/sql"
+
+	"bitbucket.org/liamstask/goose/lib/goose"
+)
+
+func init() {
+	RegisterMigration(20200902162200, "HelmSubtype", func(txn *sql.Tx, conf *goose.DBConf) error {
+
+		// Make sure all previous helm endpoints type shave the correct 'repo' sub type
+		updateHelmRepoSubtype := "UPDATE cnsis SET sub_type='repo' WHERE cnsi_type='helm';"
+		_, err := txn.Exec(updateHelmRepoSubtype)
+		if err != nil {
+			return err
+		}
+
+		return nil
+	})
+}
diff --git a/src/jetstream/passthrough.go b/src/jetstream/passthrough.go
index 4a6cfeeba0..b104ba5fed 100644
--- a/src/jetstream/passthrough.go
+++ b/src/jetstream/passthrough.go
@@ -221,7 +221,7 @@ func (p *portalProxy) proxy(c echo.Context) error {
 }
 
 func (p *portalProxy) ProxyRequest(c echo.Context, uri *url.URL) (map[string]*interfaces.CNSIRequest, error) {
-	log.Debug("proxy")
+	log.Debug("ProxyRequest")
 	cnsiList := strings.Split(c.Request().Header.Get("x-cap-cnsi-list"), ",")
 	shouldPassthrough := "true" == c.Request().Header.Get("x-cap-passthrough")
 	longRunning := "true" == c.Request().Header.Get(longRunningTimeoutHeader)
diff --git a/src/jetstream/plugins/kubernetes/install_release.go b/src/jetstream/plugins/kubernetes/install_release.go
index 15cf67623e..575c0b7065 100644
--- a/src/jetstream/plugins/kubernetes/install_release.go
+++ b/src/jetstream/plugins/kubernetes/install_release.go
@@ -6,7 +6,6 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/helm/monocular/chartsvc"
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
 	"sigs.k8s.io/yaml"
@@ -24,11 +23,12 @@ import (
 const chartCollection = "charts"
 
 type installRequest struct {
-	Endpoint  string `json:"endpoint"`
-	Name      string `json:"releaseName"`
-	Namespace string `json:"releaseNamespace"`
-	Values    string `json:"values"`
-	Chart     struct {
+	Endpoint          string `json:"endpoint"`
+	MonocularEndpoint string `json:"monocularEndpoint"`
+	Name              string `json:"releaseName"`
+	Namespace         string `json:"releaseNamespace"`
+	Values            string `json:"values"`
+	Chart             struct {
 		Name       string `json:"chartName"`
 		Repository string `json:"repo"`
 		Version    string `json:"version"`
@@ -36,17 +36,19 @@ type installRequest struct {
 }
 
 type upgradeRequest struct {
-	Values string `json:"values"`
-	Chart  struct {
+	MonocularEndpoint string `json:"monocularEndpoint"`
+	Values            string `json:"values"`
+	Chart             struct {
 		Name       string `json:"name"`
 		Repository string `json:"repo"`
 		Version    string `json:"version"`
 	} `json:"chart"`
+	RestartPods bool `json:"restartPods"`
 }
 
 // Monocular is a plugin for Monocular
 type Monocular interface {
-	GetChartStore() *chartsvc.ChartSvcDatastore
+	GetChartDownloadUrl(monocularEndpoint, chartID, chartVersion string) (string, error)
 }
 
 // InstallRelease will install a Helm 3 release
@@ -61,7 +63,7 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 		return interfaces.NewJetstreamErrorf("Could not get Create Release Parameters: %v+", err)
 	}
 
-	chart, err := c.loadChart(params.Chart.Repository, params.Chart.Name, params.Chart.Version)
+	chart, err := c.loadChart(params.MonocularEndpoint, params.Chart.Repository, params.Chart.Name, params.Chart.Version)
 	if err != nil {
 		return interfaces.NewJetstreamErrorf("Could not load chart: %v+", err)
 	}
@@ -110,7 +112,7 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 	return ec.JSON(200, release)
 }
 
-func (c *KubernetesSpecification) getChart(chartID, version string) (string, error) {
+func (c *KubernetesSpecification) getChart(monocularEndpoint, chartID, version string) (string, error) {
 	helm := c.portalProxy.GetPlugin("monocular")
 	if helm == nil {
 		return "", errors.New("Could not find monocular plugin")
@@ -121,31 +123,16 @@ func (c *KubernetesSpecification) getChart(chartID, version string) (string, err
 		return "", errors.New("Could not find monocular plugin interface")
 	}
 
-	store := monocular.GetChartStore()
-	chart, err := store.GetChart(chartID)
-	if err != nil {
-		return "", errors.New("Could not find Chart")
-	}
-
-	// Find the download URL for the version
-	for _, chartVersion := range chart.ChartVersions {
-		if chartVersion.Version == version {
-			if len(chartVersion.URLs) == 1 {
-				return chartVersion.URLs[0], nil
-			}
-		}
-	}
-
-	return "", errors.New("Could not find Chart Version")
+	return monocular.GetChartDownloadUrl(monocularEndpoint, chartID, version)
 }
 
 // Load the Helm chart for the given repository, name and version
-func (c *KubernetesSpecification) loadChart(repo, name, version string) (*chart.Chart, error) {
+func (c *KubernetesSpecification) loadChart(monocularEndpoint, repo, name, version string) (*chart.Chart, error) {
 
 	chartID := fmt.Sprintf("%s/%s", repo, name)
-	downloadURL, err := c.getChart(chartID, version)
+	downloadURL, err := c.getChart(monocularEndpoint, chartID, version)
 	if err != nil {
-		return nil, fmt.Errorf("Could not get the Download URL for the Helm Chart")
+		return nil, fmt.Errorf("Could not get the Download URL for the Helm Chart: %+v", err)
 	}
 
 	log.Debugf("Helm Chart Download URL: %s", downloadURL)
@@ -238,7 +225,7 @@ func (c *KubernetesSpecification) UpgradeRelease(ec echo.Context) error {
 
 	defer hc.Cleanup()
 
-	chart, err := c.loadChart(params.Chart.Repository, params.Chart.Name, params.Chart.Version)
+	chart, err := c.loadChart(params.MonocularEndpoint, params.Chart.Repository, params.Chart.Name, params.Chart.Version)
 	if err != nil {
 		return interfaces.NewJetstreamErrorf("Could not load chart for upgrade: %+v", err)
 	}
diff --git a/src/jetstream/plugins/metrics/main.go b/src/jetstream/plugins/metrics/main.go
index b04ae68f3f..535e52706d 100644
--- a/src/jetstream/plugins/metrics/main.go
+++ b/src/jetstream/plugins/metrics/main.go
@@ -348,9 +348,7 @@ func (m *MetricsSpecification) UpdateMetadata(info *interfaces.Info, userGUID st
 	for _, values := range info.Endpoints {
 		for _, endpoint := range values {
 			// Look to see if we can find the metrics provider for this URL
-			log.Debugf("Processing endpoint: %+v", endpoint)
 			log.Debugf("Processing endpoint: %+v", endpoint.CNSIRecord)
-
 			if provider, ok := hasMetricsProvider(metricsProviders, endpoint.DopplerLoggingEndpoint); ok {
 				endpoint.Metadata["metrics"] = provider.EndpointGUID
 				endpoint.Metadata["metrics_job"] = provider.Job
diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index 0a6b38438e..01f12dc905 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -1,14 +1,17 @@
 package monocular
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
+	"io/ioutil"
 	"math/rand"
 	"net/http"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
+	"time"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	"github.com/labstack/echo"
@@ -16,10 +19,15 @@ import (
 
 	"github.com/helm/monocular/chartsvc"
 	"github.com/helm/monocular/chartsvc/foundationdb"
+	"github.com/helm/monocular/chartsvc/models"
+	"github.com/helm/monocular/chartsvc/utils"
 )
 
 const (
 	helmEndpointType      = "helm"
+	helmHubEndpointType   = "hub"
+	helmRepoEndpointType  = "repo"
+	stratosPrefix         = "/pp/v1/"
 	prefix                = "/pp/v1/chartsvc/"
 	kubeReleaseNameEnvVar = "STRATOS_HELM_RELEASE"
 	foundationDBURLEnvVar = "FDB_URL"
@@ -41,16 +49,20 @@ type Monocular struct {
 	devSyncPID      int
 }
 
+type HelmHubChart struct {
+	utils.ApiResponse
+	Attributes *models.ChartVersion `json:"attributes"`
+}
+
+type HelmHubChartResponse struct {
+	Data HelmHubChart `json:"data"`
+}
+
 // Init creates a new Monocular
 func Init(portalProxy interfaces.PortalProxy) (interfaces.StratosPlugin, error) {
 	return &Monocular{portalProxy: portalProxy}, nil
 }
 
-// GetChartStore gets the chart store
-func (m *Monocular) GetChartStore() *chartsvc.ChartSvcDatastore {
-	return m.RepoQueryStore
-}
-
 // Init performs plugin initialization
 func (m *Monocular) Init() error {
 	log.Debug("Monocular init .... ")
@@ -135,26 +147,31 @@ func (m *Monocular) syncOnStartup() {
 	// Get the repositories that we currently have
 	repos, err := foundationdb.ListRepositories()
 	if err != nil {
-		log.Errorf("Chart Repostiory Startup: Unable to sync repositories: %v+", err)
+		log.Errorf("Chart Repository Startup: Unable to sync repositories: %v+", err)
 		return
 	}
 
 	// Get all of the helm endpoints
 	endpoints, err := m.portalProxy.ListEndpoints()
 	if err != nil {
-		log.Errorf("Chart Repostiory Startup: Unable to sync repositories: %v+", err)
+		log.Errorf("Chart Repository Startup: Unable to sync repositories: %v+", err)
 		return
 	}
 
 	helmRepos := make([]string, 0)
 	for _, ep := range endpoints {
 		if ep.CNSIType == helmEndpointType {
-			helmRepos = append(helmRepos, ep.Name)
-
-			// Is this an endpoint that we don't have charts for ?
-			if !arrayContainsString(repos, ep.Name) {
-				log.Infof("Syncing helm repository to chart store: %s", ep.Name)
-				m.Sync(interfaces.EndpointRegisterAction, ep)
+			if ep.SubType == helmRepoEndpointType {
+				helmRepos = append(helmRepos, ep.Name)
+
+				// Is this an endpoint that we don't have charts for ?
+				if !arrayContainsString(repos, ep.Name) {
+					log.Infof("Syncing helm repository to chart store: %s", ep.Name)
+					m.Sync(interfaces.EndpointRegisterAction, ep)
+				}
+			} else {
+				metadata := "{}"
+				m.portalProxy.UpdateEndpointMetadata(ep.GUID, metadata)
 			}
 		}
 	}
@@ -195,7 +212,7 @@ func (m *Monocular) ConfigureChartSVC(fdbURL *string, fDB *string, cACertFile st
 }
 
 func (m *Monocular) OnEndpointNotification(action interfaces.EndpointAction, endpoint *interfaces.CNSIRecord) {
-	if endpoint.CNSIType == helmEndpointType {
+	if endpoint.CNSIType == helmEndpointType && endpoint.SubType == helmRepoEndpointType {
 		m.Sync(action, endpoint)
 	}
 }
@@ -222,15 +239,57 @@ func (m *Monocular) AddAdminGroupRoutes(echoGroup *echo.Group) {
 
 // AddSessionGroupRoutes adds the session routes for this plugin to the Echo server
 func (m *Monocular) AddSessionGroupRoutes(echoGroup *echo.Group) {
+	// Requests to Monocular Instances
+	echoGroup.Any("/chartsvc/*", m.handleAPI)
+	// Reach out to a monocular instance other than Stratos (like helm hub). This is usually done via `x-cap-cnsi-list`
+	// however cannot be done for things like img src
+	echoGroup.Any("/monocular/:guid/chartsvc/*", m.handleMonocularInstance)
+
 	// API for Helm Chart Repositories
 	echoGroup.GET("/chartrepos", m.ListRepos)
-	echoGroup.Any("/chartsvc/*", m.handleAPI)
 	echoGroup.POST("/chartrepos/status", m.GetRepoStatuses)
 	echoGroup.POST("/chartrepos/:guid", m.SyncRepo)
 }
 
+// isExternalMonocularRequest .. Should this request go out to an external monocular instance? IF so returns external monocular endpoint
+func (m *Monocular) isExternalMonocularRequest(c echo.Context) (*interfaces.CNSIRecord, error) {
+	cnsiList := strings.Split(c.Request().Header.Get("x-cap-cnsi-list"), ",")
+
+	// If this has a cnsi then test if it for an external monocular instance
+	if len(cnsiList) == 1 && len(cnsiList[0]) > 0 {
+		return m.validateExternalMonocularEndpoint(cnsiList[0])
+	}
+
+	return nil, nil
+}
+
+// validateExternalMonocularEndpoint .. Is this endpoint related to an external moncular instance (not stratos's)
+func (m *Monocular) validateExternalMonocularEndpoint(cnsi string) (*interfaces.CNSIRecord, error) {
+	endpoint, err := m.portalProxy.GetCNSIRecord(cnsi)
+	if err != nil {
+		err := errors.New("Failed to fetch endpoint")
+		return nil, echo.NewHTTPError(http.StatusBadRequest, err.Error())
+	}
+
+	if endpoint.CNSIType == helmEndpointType && endpoint.SubType != helmRepoEndpointType {
+		return &endpoint, nil
+	}
+
+	return nil, nil
+}
+
 // Forward requests to the Chart Service API
 func (m *Monocular) handleAPI(c echo.Context) error {
+	externalMonocularEndpoint, err := m.isExternalMonocularRequest(c)
+	if err != nil {
+		return echo.NewHTTPError(http.StatusBadRequest, err.Error())
+	}
+
+	// If this request is associated with an external monocular instance forward the request on to it
+	if externalMonocularEndpoint != nil {
+		return m.baseHandleMonocularInstance(c, externalMonocularEndpoint)
+	}
+
 	// Modify the path to remove our prefix for the Chart Service API
 	path := c.Request().URL.Path
 	log.Debugf("URL to chartsvc requested: %v", path)
@@ -242,3 +301,150 @@ func (m *Monocular) handleAPI(c echo.Context) error {
 	m.chartSvcRoutes.ServeHTTP(c.Response().Writer, c.Request())
 	return nil
 }
+
+func (m *Monocular) handleMonocularInstance(c echo.Context) error {
+	log.Debug("handleMonocularInstance")
+	guid := c.Param("guid")
+	monocularEndpoint, err := m.validateExternalMonocularEndpoint(guid)
+	if monocularEndpoint == nil || err != nil {
+		err := errors.New("No monocular endpoint")
+		return echo.NewHTTPError(http.StatusBadRequest, err.Error())
+	}
+
+	return m.baseHandleMonocularInstance(c, monocularEndpoint)
+}
+
+func removeBreakingHeaders(oldRequest, emptyRequest *http.Request) {
+	for k, v := range oldRequest.Header {
+		switch {
+		// Skip these
+		//  - "Referer" causes CF to fail with a 403
+		//  - "Connection", "X-Cap-*" and "Cookie" are consumed by us
+		//  - "Accept-Encoding" must be excluded otherwise the transport will expect us to handle the encoding/compression
+		//  - X-Forwarded-* headers - these will confuse Cloud Foundry in some cases (e.g. load balancers)
+		case k == "Connection", k == "Cookie", k == "Referer", k == "Accept-Encoding",
+			strings.HasPrefix(strings.ToLower(k), "x-cap-"),
+			strings.HasPrefix(strings.ToLower(k), "x-forwarded-"):
+
+		// Forwarding everything else
+		default:
+			emptyRequest.Header[k] = v
+		}
+	}
+}
+
+// baseHandleMonocularInstance ..  Forward request to monocular of endpoint
+func (m *Monocular) baseHandleMonocularInstance(c echo.Context, monocularEndpoint *interfaces.CNSIRecord) error {
+	log.Debug("baseHandleMonocularInstance")
+	// Generic proxy is handled last, after plugins.
+
+	if monocularEndpoint == nil {
+		err := errors.New("No monocular endpoint")
+		return echo.NewHTTPError(http.StatusBadRequest, err.Error())
+	}
+
+	// We should be able to use `DoProxySingleRequest`, which goes through to `doRequest`, however the actual forwarded request is handled
+	// by the 'authHandler' associated with the endpoint OR defaults to an OAuth request. For this case there's no auth at all so falls over.
+	// Tracked in https://github.com/SUSE/stratos/issues/466
+
+	url := monocularEndpoint.APIEndpoint
+	path := c.Request().URL.Path
+	log.Debug("URL to monocular requested: %v", path)
+	if strings.Index(path, stratosPrefix) == 0 {
+		// drop stratos pp/v1
+		path = path[len(stratosPrefix)-1:]
+
+		// drop leading slash
+		if path[0] == '/' {
+			path = path[1:]
+		}
+
+		// drop monocular/:guid
+		parts := strings.Split(path, "/")
+		if parts[0] == "monocular" {
+			parts = parts[2:]
+		}
+
+		// Bring all back together
+		url.Path += "/" + strings.Join(parts, "/")
+	}
+	log.Debugf("URL to monocular: %v", url.String())
+
+	req, err := http.NewRequest(c.Request().Method, url.String(), nil)
+
+	removeBreakingHeaders(c.Request(), req)
+
+	client := &http.Client{Timeout: 30 * time.Second}
+	res, err := client.Do(req)
+
+	if err != nil {
+		c.Response().Status = 500
+		c.Response().Write([]byte(err.Error()))
+	} else if res.Body != nil {
+		c.Response().Status = res.StatusCode
+		c.Response().Header().Set("Content-Type", res.Header.Get("Content-Type"))
+		body, _ := ioutil.ReadAll(res.Body)
+		c.Response().Write(body)
+		defer res.Body.Close()
+	} else {
+		c.Response().Status = 200
+	}
+
+	return nil
+}
+
+// GetChartDownloadUrl ... Get the download url for the bits required to install the given chart
+func (m *Monocular) GetChartDownloadUrl(monocularEndpoint, chartID, version string) (string, error) {
+	if len(monocularEndpoint) > 0 {
+		// Fetch the monocular endpoint for the url
+		endpoint, err := m.validateExternalMonocularEndpoint(monocularEndpoint)
+		if err != nil {
+			return "", err
+		}
+		url := endpoint.APIEndpoint
+
+		// Fetch the chart, this will give us the url to download the bits
+		url.Path += "/chartsvc/v1/charts/" + chartID + "/versions/" + version
+		req, err := http.NewRequest(http.MethodGet, url.String(), nil)
+		req.Header.Set(echo.HeaderContentType, echo.MIMEApplicationJSON)
+		client := &http.Client{Timeout: 30 * time.Second}
+		res, err := client.Do(req)
+		if err != nil {
+			return "", err
+		} else if res.StatusCode >= 400 {
+			return "", fmt.Errorf("Couldn't download monocular chart (%+v) from '%+v'", res.StatusCode, req.URL)
+		} else if res.Body != nil {
+			body, _ := ioutil.ReadAll(res.Body)
+			defer res.Body.Close()
+
+			// Reach into the chart response for the download URL
+			chartVersionResponse := &HelmHubChartResponse{}
+			err := json.Unmarshal(body, chartVersionResponse)
+			if err != nil {
+				return "", err
+			}
+			if len(chartVersionResponse.Data.Attributes.URLs) < 1 {
+				return "", errors.New("Response contained no chart package urls")
+			}
+			return chartVersionResponse.Data.Attributes.URLs[0], err
+		} else {
+			return "", errors.New("No body in response to chart request")
+		}
+	} else {
+		store := m.RepoQueryStore
+		chart, err := store.GetChart(chartID)
+		if err != nil {
+			return "", errors.New("Could not find Chart")
+		}
+
+		// Find the download URL for the version
+		for _, chartVersion := range chart.ChartVersions {
+			if chartVersion.Version == version {
+				if len(chartVersion.URLs) == 1 {
+					return chartVersion.URLs[0], nil
+				}
+			}
+		}
+		return "", errors.New("Could not find Chart Version")
+	}
+}

From 82c99982f5ad2669fa2326708ff936847fa80507 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Fri, 11 Sep 2020 16:55:03 +0100
Subject: [PATCH 612/648] Fix valid state of helm install & fixes missing from
 helm hub pr (#472)

* Add fixes missed from helm hub PR

* Fix valid state of install helm stepper next button on missing namespace
---
 .../custom/helm/create-release/create-release.component.ts    | 2 +-
 .../suse-extensions/src/custom/helm/store/helm.effects.ts     | 4 +++-
 .../workloads/release/tabs/helm-release-helper.service.ts     | 3 ++-
 .../helm-release-history-tab.component.ts                     | 4 +++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.ts
index c57b1175cf..26ccf5c874 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.ts
@@ -89,7 +89,7 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     this.details = new FormGroup({
       endpoint: new FormControl('', Validators.required),
       releaseName: new FormControl('', Validators.required),
-      releaseNamespace: new FormControl(''),
+      releaseNamespace: new FormControl('', Validators.required),
       createNamespace: new FormControl(false),
     });
     this.details.controls.createNamespace.disable();
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
index 440f452122..c963c2fa7e 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
@@ -218,7 +218,9 @@ export class HelmEffects {
           }, base);
           return processedData;
         }, [], {
-        'x-cap-cnsi-list': action.monocularEndpoint !== stratosMonocularEndpointGuid ? action.monocularEndpoint : ''
+        'x-cap-cnsi-list': action.monocularEndpoint && action.monocularEndpoint !== stratosMonocularEndpointGuid ?
+          action.monocularEndpoint :
+          ''
       });
     })
   );
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
index 99899a0b92..d3af46d384 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
@@ -14,6 +14,7 @@ import {
   HelmReleaseGraph,
   HelmReleaseGuid,
   HelmReleaseResources,
+  HelmReleaseRevision,
 } from '../../workload.types';
 import { workloadsEntityCatalog } from '../../workloads-entity-catalog';
 
@@ -147,7 +148,7 @@ export class HelmReleaseHelperService {
     );
   }
 
-  public fetchReleaseHistory(): Observable<any> {
+  public fetchReleaseHistory(): Observable<HelmReleaseRevision[]> {
     // Get the history for a Helm release
     return workloadsEntityCatalog.history.store.getEntityService(
       this.releaseTitle,
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.ts
index df49f034bc..2e0ada870e 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.ts
@@ -74,7 +74,9 @@ export class HelmReleaseHistoryTabComponent {
       },
     ];
 
-    const data$ = this.helmReleaseHelper.fetchReleaseHistory();
+    const data$ = this.helmReleaseHelper.fetchReleaseHistory().pipe(
+      map(history => [...history].sort((a, b) => b.revision - a.revision))
+    );
     this.dataSource = {
       connect: () => data$,
       disconnect: () => { },

From b0e37981f7627941c3fc5b20f1f7d15e4f9964e4 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Fri, 11 Sep 2020 16:55:59 +0100
Subject: [PATCH 613/648] Workloads List: Show chart version instead of release
 version (#474)

---
 .../helm-release-card/helm-release-card.component.html      | 4 ++--
 .../list-types/helm-releases-list-config.service.ts         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
index ad120d3cea..8dde7f3341 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
@@ -29,9 +29,9 @@
     </app-meta-card-value>
   </app-meta-card-item>
   <app-meta-card-item>
-    <app-meta-card-key>Version</app-meta-card-key>
+    <app-meta-card-key>Chart Version</app-meta-card-key>
     <app-meta-card-value>
-      {{ row.version }}
+      {{ row.chart.metadata.version }}
     </app-meta-card-value>
   </app-meta-card-item>
   <app-meta-card-item>
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts
index 9e2b68e4b8..3ab9f96d4d 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts
@@ -88,14 +88,14 @@ export class HelmReleasesListConfig implements IListConfig<HelmRelease> {
     },
     {
       columnId: 'version',
-      headerCell: () => 'Version',
+      headerCell: () => 'Chart Version',
       cellDefinition: {
-        valuePath: 'version'
+        valuePath: 'chart.metadata.version'
       },
       sort: {
         type: 'sort',
         orderKey: 'version',
-        field: 'version'
+        field: 'chart.metadata.version'
       },
       cellFlex: '1'
     },

From 2c3ccbd4d34454ba549648ddc0c70d607000f378 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Mon, 14 Sep 2020 11:36:59 +0100
Subject: [PATCH 614/648] Login Screen: Hide the form during initial verify
 (#476)

- on fresh load, not logged in, the form is shown once verify fails
- on load when logged in, form does not flash up
---
 .../login/login-page/login-page.component.ts  | 49 ++++++++++++-------
 .../suse-login/suse-login.component.html      | 10 ++--
 .../suse-login/suse-login.component.scss      |  4 ++
 3 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/src/frontend/packages/core/src/features/login/login-page/login-page.component.ts b/src/frontend/packages/core/src/features/login/login-page/login-page.component.ts
index 8764ac68f0..3a4d78324d 100644
--- a/src/frontend/packages/core/src/features/login/login-page/login-page.component.ts
+++ b/src/frontend/packages/core/src/features/login/login-page/login-page.component.ts
@@ -29,6 +29,7 @@ export class LoginPageComponent implements OnInit, OnDestroy {
 
   loggedIn: boolean;
   loggingIn: boolean;
+  isLoginFlow: boolean;
   verifying: boolean;
   error: boolean;
 
@@ -36,6 +37,7 @@ export class LoginPageComponent implements OnInit, OnDestroy {
   ssoOptions: string;
 
   busy$: Observable<boolean>;
+  initialLoad$: Observable<boolean>;
 
   redirect: RouterRedirect;
 
@@ -47,29 +49,37 @@ export class LoginPageComponent implements OnInit, OnDestroy {
     this.ssoLogin = false;
     this.store.dispatch(new VerifySession());
     const auth$ = this.store.select(s => ({ auth: s.auth, endpoints: s.endpoints }));
+    this.initialLoad$ = auth$.pipe(
+      map(({ auth, }) =>
+        auth.verifying && !auth.loggingIn || // checking if user is logged in but not in processed of logging in
+        (auth.sessionData && auth.sessionData.valid) && !this.isLoginFlow // logged in but haven't hit log in
+      ),
+    );
+
     this.busy$ = auth$.pipe(
-      map(
-        ({ auth, endpoints }) => !auth.error || !(auth.sessionData && auth.sessionData.valid) &&
-          (auth.sessionData && auth.sessionData.valid) || auth.verifying || auth.loggingIn || endpoints.loading
+      map(({ auth, endpoints }) =>
+        !auth.error ||
+        !(auth.sessionData && auth.sessionData.valid) && (auth.sessionData && auth.sessionData.valid) ||
+        auth.verifying ||
+        auth.loggingIn ||
+        endpoints.loading
       ),
       startWith(true)
     );
-    this.subscription =
-      auth$
-        .pipe(
-          tap(({ auth }) => {
-            this.redirect = auth.redirect;
-            this.handleOther(auth);
-          }),
-          takeWhile(({ auth }) => {
-            const loggedIn = !auth.loggingIn && auth.loggedIn;
-            const validSession = auth.sessionData && auth.sessionData.valid;
-            return !(loggedIn && validSession);
-          }),
-        )
-        .subscribe({
-          complete: () => this.handleSuccess()
-        });
+    this.subscription = auth$.pipe(
+      tap(({ auth }) => {
+        this.redirect = auth.redirect;
+        this.handleOther(auth);
+      }),
+      takeWhile(({ auth }) => {
+        const loggedIn = !auth.loggingIn && auth.loggedIn;
+        const validSession = auth.sessionData && auth.sessionData.valid;
+        return !(loggedIn && validSession);
+      }),
+    )
+      .subscribe({
+        complete: () => this.handleSuccess()
+      });
   }
 
   ngOnDestroy() {
@@ -107,6 +117,7 @@ export class LoginPageComponent implements OnInit, OnDestroy {
   private handleOther(auth: AuthState) {
     this.loggedIn = auth.loggedIn;
     this.loggingIn = auth.loggingIn;
+    this.isLoginFlow = this.isLoginFlow || auth.loggingIn;
     this.verifying = auth.verifying;
     this.ssoOptions = auth.sessionData && auth.sessionData.ssoOptions;
     this.ssoLogin = !!this.ssoOptions;
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html
index 57577ea756..e7155c7e67 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html
@@ -1,4 +1,4 @@
-<div class="suse-login" id="app-login-page" [ngClass]="{'suse-login-sso': ssoLogin}" >
+<div class="suse-login" id="app-login-page" [ngClass]="{'suse-login-sso': ssoLogin}">
   <div class="suse-login__content">
     <div class="suse-login__intro">
       <img class="suse-login__intro-img-left" src="/core/assets/custom/login/suse-logo-light.svg">
@@ -26,7 +26,7 @@ <h1 class="suse-login__headline">SUSE<br>Stratos Console</h1>
       </div>
 
       <div class="suse-login__box" [ngClass]="{'suse-login__busy': busy$ | async }">
-        <div *ngIf="!ssoLogin" class="suse-login__form-title">Sign in</div>
+        <div *ngIf="!ssoLogin" class="suse-login__form-title" [ngClass]="{'hidden': initialLoad$ | async}">Sign in</div>
         <ng-container *ngTemplateOutlet="loginform"></ng-container>
       </div>
     </div>
@@ -34,7 +34,7 @@ <h1 class="suse-login__headline">SUSE<br>Stratos Console</h1>
 </div>
 
 <ng-template #loginform>
-  <div class="suse-login__form-outer">
+  <div class="suse-login__form-outer" [ngClass]="{'hidden': initialLoad$ | async}">
     <form class="suse-login__form" name="loginForm" (ngSubmit)="login()" #loginForm="ngForm">
       <mat-form-field *ngIf="!ssoLogin" [hideRequiredMarker]="true">
         <input matInput required [(ngModel)]="username" name="username" placeholder="Username">
@@ -42,8 +42,8 @@ <h1 class="suse-login__headline">SUSE<br>Stratos Console</h1>
       <mat-form-field *ngIf="!ssoLogin" [hideRequiredMarker]="true">
         <input matInput required type="password" [(ngModel)]="password" name="password" placeholder="Password">
       </mat-form-field>
-      <button class="suse-login__submit" [ngClass]="{'suse-login__sso-button': ssoLogin}" color="primary" *ngIf="!loggedIn" type="submit" mat-button
-        mat-raised-button [disabled]="!loginForm.valid">
+      <button class="suse-login__submit" [ngClass]="{'suse-login__sso-button': ssoLogin}" color="primary"
+        *ngIf="!loggedIn" type="submit" mat-button mat-raised-button [disabled]="!loginForm.valid">
         {{ !ssoLogin ? 'Login' : 'Login with SSO' }}
       </button>
     </form>
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
index a7b3338ac5..aaf7e88a7a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
@@ -172,6 +172,10 @@ app-suse-login {
     padding: 0 60px;
   }
 
+  .hidden {
+    visibility: hidden;
+  }
+
 }
 
 // If SSO Login change the presentation

From 2122aae82080617e7863aad8d424996b7a900a4b Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Mon, 14 Sep 2020 17:30:21 +0100
Subject: [PATCH 615/648] Fix SSO Error message & helm chart list on helm hub
 register/unregister (#477)

* Fix sso warning message

* Reset helm pagination sections on unregister helm endpoint

* Reset helm chart pagination on helm hub register
---
 .../login-page.component.theme.scss           |  8 ++++
 .../src/custom/helm/store/helm.effects.ts     | 47 +++++++++++++++++--
 .../suse-login/suse-login.component.scss      |  5 +-
 3 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/src/frontend/packages/core/src/features/login/login-page/login-page.component.theme.scss b/src/frontend/packages/core/src/features/login/login-page/login-page.component.theme.scss
index 9a682c63c1..e6a56746e2 100644
--- a/src/frontend/packages/core/src/features/login/login-page/login-page.component.theme.scss
+++ b/src/frontend/packages/core/src/features/login/login-page/login-page.component.theme.scss
@@ -1,5 +1,7 @@
 @mixin login-page-theme($theme, $app-theme) {
   $primary: map-get($theme, primary);
+  $warn: map-get($theme, warn);
+
   .login {
     background-color: map-get($app-theme, app-background-color);
     &__title {
@@ -9,4 +11,10 @@
       color: mat-contrast($primary, 500);
     }
   }
+
+  .suse-login-sso {
+    .suse-login__message {
+      color: mat-color($warn);
+    }
+  }
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
index c963c2fa7e..351e05ffc1 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
@@ -4,17 +4,26 @@ import { MatSnackBar } from '@angular/material/snack-bar';
 import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Action, Store } from '@ngrx/store';
 import { combineLatest, Observable, of } from 'rxjs';
-import { catchError, flatMap, map, mergeMap, withLatestFrom } from 'rxjs/operators';
+import { catchError, first, flatMap, map, mergeMap, withLatestFrom } from 'rxjs/operators';
 
 import { environment } from '../../../../../core/src/environments/environment';
-import { GET_ENDPOINTS_SUCCESS, GetAllEndpointsSuccess } from '../../../../../store/src/actions/endpoint.actions';
-import { ClearPaginationOfType } from '../../../../../store/src/actions/pagination.actions';
+import {
+  EndpointActionComplete,
+  GET_ENDPOINTS_SUCCESS,
+  GetAllEndpointsSuccess,
+  REGISTER_ENDPOINTS_SUCCESS,
+  UNREGISTER_ENDPOINTS_SUCCESS,
+  UnregisterEndpoint,
+} from '../../../../../store/src/actions/endpoint.actions';
+import { ClearPaginationOfType, ResetPaginationOfType } from '../../../../../store/src/actions/pagination.actions';
 import { AppState } from '../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
 import { isJetstreamError } from '../../../../../store/src/jetstream';
 import { ApiRequestTypes } from '../../../../../store/src/reducers/api-request-reducer/request-helpers';
 import { endpointOfTypeSelector } from '../../../../../store/src/selectors/endpoint.selectors';
+import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
 import { NormalizedResponse } from '../../../../../store/src/types/api.types';
+import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
 import {
   EntityRequestAction,
   StartRequestAction,
@@ -276,6 +285,38 @@ export class HelmEffects {
     })
   );
 
+  @Effect()
+  endpointUnregister$ = this.actions$.pipe(
+    ofType<UnregisterEndpoint>(UNREGISTER_ENDPOINTS_SUCCESS),
+    flatMap(action => stratosEntityCatalog.endpoint.store.getEntityMonitor(action.guid).entity$.pipe(
+      first(),
+      mergeMap(endpoint => {
+        if (endpoint.cnsi_type !== HELM_ENDPOINT_TYPE) {
+          return [];
+        }
+        return [
+          new ResetPaginationOfType(helmEntityCatalog.chart.getSchema()),
+          new ResetPaginationOfType(helmEntityCatalog.chartVersions.getSchema()),
+          new ResetPaginationOfType(helmEntityCatalog.version.getSchema()),
+        ];
+      })
+    ))
+  );
+
+  @Effect()
+  registerEndpoint$ = this.actions$.pipe(
+    ofType<EndpointActionComplete>(REGISTER_ENDPOINTS_SUCCESS),
+    flatMap(action => {
+      const endpoint: EndpointModel = action.endpoint as EndpointModel;
+      if (endpoint && endpoint.cnsi_type === HELM_ENDPOINT_TYPE && endpoint.sub_type === HELM_HUB_ENDPOINT_TYPE) {
+        return [
+          new ResetPaginationOfType(helmEntityCatalog.chart.getSchema()),
+        ];
+      }
+      return [];
+    })
+  );
+
   private static createHelmErrorMessage(err: any): string {
     if (err) {
       if (err.error && err.error.message) {
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
index aaf7e88a7a..0bab1c84ab 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
@@ -190,8 +190,9 @@ app-suse-login {
   .suse-login__sso-button.mat-button.suse-login__submit {
     align-self: flex-start;
   }
-
-
+  .suse-login__message {
+    padding-top: 0;
+  }
 }
 
 @media only screen and (max-width: 1120px) {

From e568f98e2da239c94330dd1b7c67fb42a2688269 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Mon, 14 Sep 2020 18:06:51 +0100
Subject: [PATCH 616/648] Simpler Helm Chart store (#467)

* Update go.sum

* Replace foundation DB with sql db and file cache

* Tidy ups and final tweaks to get versions working

* Tidy up build and remove fdb

* Update .gitignore

* Remove unused functions

* FIx upgrade and add in sources

* Fix unit test

* Remove fdb helm chart values

* Fix default cache folder name

* Remove unused commented code

* Fix comments

* Formatting

* Tidy ups

* Add missing import following refactor

* Fix issues with async delete and edit

* Tidy up chartName

* Fix HelmChartID rename to HelmChartReference

* FIx backend merge issues

* Set volume for helm cache when deployed to k8s

* Fix fro kuberenetes deployment

* Ensure db statements aer modified for different DBs

* Address PR feedback

* Fix missing param to error log msg

* Add support for retrieving icon for a specific version

* Use icon for the chart version. Reduce loading indicators

* Bug fix for icon on list view

* Fix icons on Helm Hub

* Address final PR feedback
---
 .cfignore                                     |   1 +
 .gitignore                                    |   1 +
 deploy/Dockerfile.all-in-one                  | 105 +--
 deploy/aio-entrypoint.sh                      |  26 -
 .../all-in-one/config.all-in-one.properties   |   3 +-
 deploy/all-in-one/dig.sh                      |   8 -
 deploy/ci/suse-console-dev-releases.yml       |  51 +-
 deploy/cloud-foundry/config.properties        |   4 +-
 .../monocular/fdb-doclayer/Dockerfile         |  64 --
 .../fdb-doc-layer-networkpolicy.yaml          |  21 -
 .../monocular/fdb-doclayer/fdbdoc.bash        |  75 --
 .../monocular/fdb-server/Dockerfile           |  89 --
 .../monocular/fdb-server/configure_db.bash    |  45 -
 .../fdb-server/create_cluster_file.bash       |  61 --
 .../fdb-server/create_server_environment.bash |  49 -
 .../download_multiversion_libraries.bash      |  31 -
 .../containers/monocular/fdb-server/fdb.bash  |  46 -
 .../fdb-server/fdbserver-networkpolicy.yaml   |  21 -
 .../console/templates/chartsync.yaml          |  70 --
 .../console/templates/deployment.yaml         |  12 +-
 .../console/templates/fdb-secrets.yaml        |  27 -
 .../templates/fdbdoclayer/deployment.yaml     | 123 ---
 .../fdbdoclayer/fdb-doc-layer-service.yaml    |  33 -
 deploy/kubernetes/console/values.yaml         |   3 -
 deploy/kubernetes/custom/__stratos.tpl        |  10 -
 deploy/kubernetes/custom/custom-build.sh      |  10 -
 .../stepper/steppers/steppers.component.ts    |   2 +-
 .../create-release.component.spec.ts          |   9 +-
 .../create-release.component.ts               |  59 +-
 .../src/custom/helm/helm.routing.ts           |   4 +-
 .../chart-details-readme.component.ts         |   5 +-
 .../chart-details.component.html              |   2 +-
 .../chart-details/chart-details.component.ts  |  13 +-
 .../shared/services/charts.service.ts         |  12 +-
 .../src/custom/helm/store/helm.types.ts       |  39 +-
 .../upgrade-release.component.ts              |   5 +-
 .../kubernetes/workloads/workload.utils.ts    |   9 +
 src/jetstream/cnsi.go                         |   7 +
 src/jetstream/config.dev                      |   3 +
 src/jetstream/config.example                  |  10 +-
 src/jetstream/go.mod                          |   8 +-
 src/jetstream/go.sum                          |  19 +
 src/jetstream/plugins/kubernetes/go.mod       |   2 -
 .../plugins/kubernetes/install_release.go     |  53 +-
 .../monocular/20200819184800_ChartStore.go    |  49 +
 src/jetstream/plugins/monocular/README.md     |  82 --
 src/jetstream/plugins/monocular/README.txt    |  13 -
 src/jetstream/plugins/monocular/cache.go      | 341 +++++++
 .../plugins/monocular/chart-repo/.gitignore   |   1 -
 .../plugins/monocular/chart-repo/Dockerfile   |  12 -
 .../plugins/monocular/chart-repo/Makefile     |   8 -
 .../monocular/chart-repo/api_endpoint.go      | 323 -------
 .../monocular/chart-repo/chart_repo.go        |  64 --
 .../chart-repo/common/chart_utils.go          | 205 -----
 .../monocular/chart-repo/common/types.go      | 162 ----
 .../plugins/monocular/chart-repo/delete.go    |  39 -
 .../chart-repo/foundationdb/datastore.go      | 121 ---
 .../chart-repo/foundationdb/delete.go         |  66 --
 .../chart-repo/foundationdb/mockstore.go      |  82 --
 .../monocular/chart-repo/foundationdb/sync.go |  70 --
 .../chart-repo/foundationdb/utils.go          | 531 -----------
 .../chart-repo/foundationdb/utils_test.go     | 696 --------------
 .../plugins/monocular/chart-repo/go.mod       |  37 -
 .../plugins/monocular/chart-repo/go.sum       | 230 -----
 .../plugins/monocular/chart-repo/serve.go     |  67 --
 .../plugins/monocular/chart-repo/sync.go      |  39 -
 .../chart-repo/testdata/empty-repo-index.yaml |   1 -
 .../chart-repo/testdata/valid-index.yaml      |  69 --
 .../monocular/chart-repo/utils/version.go     |  51 --
 .../monocular/{chartsvc/models => }/chart.go  |  42 +-
 src/jetstream/plugins/monocular/chart_svc.go  | 283 ++++++
 .../plugins/monocular/chartsvc/Dockerfile     |   9 -
 .../plugins/monocular/chartsvc/Makefile       |   6 -
 .../plugins/monocular/chartsvc/README.md      |   6 -
 .../plugins/monocular/chartsvc/datastore.go   |  41 -
 .../foundationdb/datastore/datastore.go       | 146 ---
 .../foundationdb/datastore/mockstore.go       |  87 --
 .../chartsvc/foundationdb/handler.go          | 541 -----------
 .../chartsvc/foundationdb/handler_test.go     | 867 ------------------
 .../plugins/monocular/chartsvc/go.mod         |  31 -
 .../plugins/monocular/chartsvc/go.sum         | 139 ---
 .../plugins/monocular/chartsvc/main.go        | 168 ----
 .../plugins/monocular/chartsvc/main_test.go   | 544 -----------
 .../monocular/chartsvc/utils/testutils.go     |  41 -
 .../plugins/monocular/chartsvc_main.txt       |  15 -
 .../plugins/monocular/git-merge-subpath.sh    |  65 --
 .../plugins/monocular/git-pull-downstream.sh  |  77 --
 .../plugins/monocular/git-push-upstream.sh    |  82 --
 src/jetstream/plugins/monocular/go.mod        |  13 +-
 src/jetstream/plugins/monocular/go.sum        |  10 +
 src/jetstream/plugins/monocular/main.go       | 296 ++----
 src/jetstream/plugins/monocular/repository.go |  41 +-
 .../{chartsvc/utils => }/responses.go         |  14 +-
 .../plugins/monocular/store/chart_store_db.go | 211 +++++
 src/jetstream/plugins/monocular/store/main.go |  28 +
 .../plugins/monocular/store/types.go          |  38 +
 .../plugins/monocular/store/version.go        |  60 ++
 .../plugins/monocular/sync-source.sh          |  38 -
 src/jetstream/plugins/monocular/sync.go       | 238 ++---
 .../plugins/monocular/sync_worker.go          | 139 +++
 src/jetstream/plugins/monocular/types.go      |  70 ++
 .../plugins/monocular/utils/urlpoll.go        | 144 ---
 .../repository/interfaces/endpoints.go        |   5 +
 103 files changed, 1585 insertions(+), 7559 deletions(-)
 delete mode 100644 deploy/aio-entrypoint.sh
 delete mode 100644 deploy/all-in-one/dig.sh
 delete mode 100644 deploy/containers/monocular/fdb-doclayer/Dockerfile
 delete mode 100644 deploy/containers/monocular/fdb-doclayer/fdb-doc-layer-networkpolicy.yaml
 delete mode 100755 deploy/containers/monocular/fdb-doclayer/fdbdoc.bash
 delete mode 100644 deploy/containers/monocular/fdb-server/Dockerfile
 delete mode 100755 deploy/containers/monocular/fdb-server/configure_db.bash
 delete mode 100644 deploy/containers/monocular/fdb-server/create_cluster_file.bash
 delete mode 100644 deploy/containers/monocular/fdb-server/create_server_environment.bash
 delete mode 100644 deploy/containers/monocular/fdb-server/download_multiversion_libraries.bash
 delete mode 100644 deploy/containers/monocular/fdb-server/fdb.bash
 delete mode 100644 deploy/containers/monocular/fdb-server/fdbserver-networkpolicy.yaml
 delete mode 100644 deploy/kubernetes/console/templates/chartsync.yaml
 delete mode 100644 deploy/kubernetes/console/templates/fdb-secrets.yaml
 delete mode 100644 deploy/kubernetes/console/templates/fdbdoclayer/deployment.yaml
 delete mode 100644 deploy/kubernetes/console/templates/fdbdoclayer/fdb-doc-layer-service.yaml
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workload.utils.ts
 create mode 100644 src/jetstream/plugins/monocular/20200819184800_ChartStore.go
 delete mode 100644 src/jetstream/plugins/monocular/README.md
 delete mode 100644 src/jetstream/plugins/monocular/README.txt
 create mode 100644 src/jetstream/plugins/monocular/cache.go
 delete mode 100644 src/jetstream/plugins/monocular/chart-repo/.gitignore
 delete mode 100644 src/jetstream/plugins/monocular/chart-repo/Dockerfile
 delete mode 100644 src/jetstream/plugins/monocular/chart-repo/Makefile
 delete mode 100644 src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
 delete mode 100644 src/jetstream/plugins/monocular/chart-repo/chart_repo.go
 delete mode 100644 src/jetstream/plugins/monocular/chart-repo/common/chart_utils.go
 delete mode 100644 src/jetstream/plugins/monocular/chart-repo/common/types.go
 delete mode 100644 src/jetstream/plugins/monocular/chart-repo/delete.go
 delete mode 100644 src/jetstream/plugins/monocular/chart-repo/foundationdb/datastore.go
 delete mode 100644 src/jetstream/plugins/monocular/chart-repo/foundationdb/delete.go
 delete mode 100644 src/jetstream/plugins/monocular/chart-repo/foundationdb/mockstore.go
 delete mode 100644 src/jetstream/plugins/monocular/chart-repo/foundationdb/sync.go
 delete mode 100644 src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
 delete mode 100644 src/jetstream/plugins/monocular/chart-repo/foundationdb/utils_test.go
 delete mode 100644 src/jetstream/plugins/monocular/chart-repo/go.mod
 delete mode 100644 src/jetstream/plugins/monocular/chart-repo/go.sum
 delete mode 100644 src/jetstream/plugins/monocular/chart-repo/serve.go
 delete mode 100644 src/jetstream/plugins/monocular/chart-repo/sync.go
 delete mode 100644 src/jetstream/plugins/monocular/chart-repo/testdata/empty-repo-index.yaml
 delete mode 100644 src/jetstream/plugins/monocular/chart-repo/testdata/valid-index.yaml
 delete mode 100644 src/jetstream/plugins/monocular/chart-repo/utils/version.go
 rename src/jetstream/plugins/monocular/{chartsvc/models => }/chart.go (57%)
 create mode 100644 src/jetstream/plugins/monocular/chart_svc.go
 delete mode 100644 src/jetstream/plugins/monocular/chartsvc/Dockerfile
 delete mode 100644 src/jetstream/plugins/monocular/chartsvc/Makefile
 delete mode 100644 src/jetstream/plugins/monocular/chartsvc/README.md
 delete mode 100644 src/jetstream/plugins/monocular/chartsvc/datastore.go
 delete mode 100644 src/jetstream/plugins/monocular/chartsvc/foundationdb/datastore/datastore.go
 delete mode 100644 src/jetstream/plugins/monocular/chartsvc/foundationdb/datastore/mockstore.go
 delete mode 100644 src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go
 delete mode 100644 src/jetstream/plugins/monocular/chartsvc/foundationdb/handler_test.go
 delete mode 100644 src/jetstream/plugins/monocular/chartsvc/go.mod
 delete mode 100644 src/jetstream/plugins/monocular/chartsvc/go.sum
 delete mode 100644 src/jetstream/plugins/monocular/chartsvc/main.go
 delete mode 100644 src/jetstream/plugins/monocular/chartsvc/main_test.go
 delete mode 100644 src/jetstream/plugins/monocular/chartsvc/utils/testutils.go
 delete mode 100644 src/jetstream/plugins/monocular/chartsvc_main.txt
 delete mode 100755 src/jetstream/plugins/monocular/git-merge-subpath.sh
 delete mode 100755 src/jetstream/plugins/monocular/git-pull-downstream.sh
 delete mode 100755 src/jetstream/plugins/monocular/git-push-upstream.sh
 rename src/jetstream/plugins/monocular/{chartsvc/utils => }/responses.go (85%)
 create mode 100644 src/jetstream/plugins/monocular/store/chart_store_db.go
 create mode 100644 src/jetstream/plugins/monocular/store/main.go
 create mode 100644 src/jetstream/plugins/monocular/store/types.go
 create mode 100644 src/jetstream/plugins/monocular/store/version.go
 delete mode 100755 src/jetstream/plugins/monocular/sync-source.sh
 create mode 100644 src/jetstream/plugins/monocular/sync_worker.go
 create mode 100644 src/jetstream/plugins/monocular/types.go
 delete mode 100644 src/jetstream/plugins/monocular/utils/urlpoll.go

diff --git a/.cfignore b/.cfignore
index 92be10a235..4775f324c9 100644
--- a/.cfignore
+++ b/.cfignore
@@ -22,3 +22,4 @@ docs/
 build/dev_config.json
 e2e-reports/
 website/
+.helm-cache/
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 730c756be1..ac5cbdb218 100644
--- a/.gitignore
+++ b/.gitignore
@@ -96,6 +96,7 @@ src/jetstream/config.properties
 src/jetstream/db/dbconf.yml
 src/jetstream/plugins/monocular/chart-repo/chartrepo
 src/jetstream/plugins/analysis/container/analyzers
+src/jetstream/.helm-cache
 
 # Customisations - these can be removed in the future
 # Left in for now to prevent these files being checked-in, if they are still present
diff --git a/deploy/Dockerfile.all-in-one b/deploy/Dockerfile.all-in-one
index 9ff9b1a73a..f9dbdf8adf 100644
--- a/deploy/Dockerfile.all-in-one
+++ b/deploy/Dockerfile.all-in-one
@@ -16,65 +16,6 @@ RUN deploy/all-in-one/src-build.sh
 # Generate dev-certs
 RUN CERTS_PATH=/home/stratos/dev-certs ./generate_cert.sh
 
-# ---------------------------------------------------------------------------------------------------
-# Docker build for FDB Server component
-FROM splatform/stratos-bk-build-base:leap15_1 as fdbserver-builder
-
-# Install FoundationDB Binaries
-ARG FDB_VERSION=6.2.15
-ARG FDB_WEBSITE=https://www.foundationdb.org
-
-USER root
-WORKDIR /home/stratos/tmp
-WORKDIR /home/stratos
-RUN pwd && ls -al
-RUN curl $FDB_WEBSITE/downloads/$FDB_VERSION/linux/fdb_$FDB_VERSION.tar.gz -o fdb_$FDB_VERSION.tar.gz && \
-	tar -xzf fdb_$FDB_VERSION.tar.gz --strip-components=1 && \
-	rm fdb_$FDB_VERSION.tar.gz && \
-	chmod u+x fdbbackup fdbcli fdbdr fdbmonitor fdbrestore fdbserver backup_agent dr_agent && \
-	mv fdbbackup fdbcli fdbdr fdbmonitor fdbrestore fdbserver backup_agent dr_agent /usr/bin
-
-WORKDIR /var/fdb
-
-# Install FoundationDB Client Libraries
-
-ARG FDB_VERSION=6.2.15
-ARG FDB_ADDITIONAL_VERSIONS="5.1.7"
-ARG FDB_WEBSITE=https://www.foundationdb.org
-
-COPY deploy/containers/monocular/fdb-server/download_multiversion_libraries.bash scripts/
-
-# Set Up Runtime Scripts and Directories
-COPY deploy/containers/monocular/fdb-server/fdb.bash scripts/
-COPY deploy/containers/monocular/fdb-server/create_server_environment.bash scripts/
-COPY deploy/containers/monocular/fdb-server/create_cluster_file.bash scripts/
-COPY deploy/containers/monocular/fdb-server/configure_db.bash scripts/
-RUN chmod u+x scripts/*.bash && \
-	mkdir -p logs
-
-# ---------------------------------------------------------------------------------------------------
-# Docker build for FDB Document Layer component
-FROM splatform/stratos-bk-build-base:leap15_1 as fdbdoclayer-builder
-
-# Install FoundationDB Document Layer Binaries
-ARG FDB_DOC_VERSION=1.6.3
-ARG FDB_WEBSITE=https://www.foundationdb.org
-
-WORKDIR /home/stratos
-RUN curl $FDB_WEBSITE/downloads/$FDB_DOC_VERSION/linux/fdb-document-layer-$FDB_DOC_VERSION-Linux.tar.gz -o fdb-document-layer-$FDB_DOC_VERSION-Linux.tar.gz && \
-    tar -xvf fdb-document-layer-$FDB_DOC_VERSION-Linux.tar.gz && \
-    mv fdb-document-layer-$FDB_DOC_VERSION-Linux doclayer
- 
-# ---------------------------------------------------------------------------------------------------
-# Docker build for Chart Repo component
-FROM splatform/stratos-bk-build-base:leap15_1 as chartrepo-builder
-
-COPY --chown=stratos:users src/jetstream/plugins/monocular/chart-repo /go/src/github.com/helm/monocular
-WORKDIR /go/src/github.com/helm/monocular
-ARG VERSION
-RUN GO111MODULE=on GOPROXY=https://gocenter.io CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-X main.version=$VERSION" .
-
-
 # ---------------------------------------------------------------------------------------------------
 # Final AIO Container
 # ---------------------------------------------------------------------------------------------------
@@ -92,59 +33,15 @@ COPY --from=jetstream-builder /home/stratos/config.properties /srv/config.proper
 # User Invite templates
 COPY --from=jetstream-builder /home/stratos/src/jetstream/templates /srv/templates
 
-# Pull in binaries from fdbserver-builder
-COPY --from=fdbserver-builder /usr/bin /usr/bin
-COPY --from=fdbserver-builder /var/fdb/scripts /var/fdb/scripts
-
-# Install FoundationDB Client Libraries directly here rather than in the fdbserver-builder, as the install destination depends on an external script.
-ARG FDB_VERSION=6.2.15
-ARG FDB_ADDITIONAL_VERSIONS="5.1.7"
-ARG FDB_WEBSITE=https://www.foundationdb.org
-RUN mkdir -p /mnt/website
-RUN curl $FDB_WEBSITE/downloads/$FDB_VERSION/linux/libfdb_c_$FDB_VERSION.so -o /usr/lib64/libfdb_c.so && \
-	bash /var/fdb/scripts/download_multiversion_libraries.bash $FDB_WEBSITE $FDB_ADDITIONAL_VERSIONS && \
-	rm -rf /mnt/website
-VOLUME /var/fdb/data
-RUN mkdir -p /var/fdb/logs
-
-# Pull in binaries from fdbdoclayer-builder
-COPY --from=fdbdoclayer-builder /home/stratos/doclayer/bin/fdbdoc /usr/bin/fdbdoc
-COPY --from=fdbdoclayer-builder /home/stratos/doclayer/lib/foundationdb/document/fdbmonitor /usr/bin/fdbmonitor
-# Bring in doclayer startup script
-COPY deploy/containers/monocular/fdb-doclayer/fdbdoc.bash /var/fdb/scripts
-RUN chmod u+x /var/fdb/scripts/fdbdoc.bash
-# Doclayer startup script dependency
-# FoundationDB environment variables
-ENV FDB_PORT 4500
-ENV FDB_CLUSTER_FILE /var/fdb/fdb.cluster
-# Set to host, since all processes run in single container
-ENV FDB_NETWORKING_MODE host 
-ENV FDB_COORDINATOR_PORT 4500
-ENV FDB_PROCESS_CLASS unset
-ENV CLUSTER_ID docker:docker
-ENV FDB_COORDINATOR localhost
-ENV FDB_DOC_PORT 27016
-ENV FDB_LISTEN_IP 0.0.0.0
-
-# Pull in binaries from chartrepo-builder
-COPY --from=chartrepo-builder /go/src/github.com/helm/monocular/chartrepo /chartrepo
-
 # Enable persistence features if canary build flag is set
 RUN if [ "x$CANARY_BUILD" != "x" ] ; then printf "\nFORCE_ENABLE_PERSISTENCE_FEATURES=true\n" >> /srv/config.properties ; fi
 
 # Enable tech preview features if canary build flag is set
 RUN if [ "x$CANARY_BUILD" != "x" ] ; then printf "\nENABLE_TECH_PREVIEW=true\n" >> /srv/config.properties ; fi
 
-# Fix dig to resolve localhost to 127.0.0.1
-RUN mv /usr/bin/dig /usr/bin/digit
-COPY deploy/all-in-one/dig.sh /usr/bin/dig
-RUN chmod +x /usr/bin/dig
-
 EXPOSE 443
 
 # Need to be root to bind to port 443
 USER root
 
-COPY deploy/aio-entrypoint.sh .
-RUN chmod +x ./aio-entrypoint.sh
-ENTRYPOINT ["bash", "-c", "./aio-entrypoint.sh -u mongodb://localhost:${FDB_DOC_PORT}"]
+ENTRYPOINT ["./jetstream"]
diff --git a/deploy/aio-entrypoint.sh b/deploy/aio-entrypoint.sh
deleted file mode 100644
index 939eea2a85..0000000000
--- a/deploy/aio-entrypoint.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-while getopts ":u:" opt; do
-  case ${opt} in
-    u )
-        doclayer=$OPTARG
-      ;;
-    \? ) echo "Invalid option: $OPTARG" 1>&2
-      ;;
-    : )
-      echo "$OPTARG requires a value set to the URL of the document layer." 1>&2
-      ;;
-  esac
-done
-shift $((OPTIND -1))
-
-if [ -z "$doclayer" ];
-then
-    echo "--doclayer-url must be set." >&2
-    exit 1
-fi
-
-/var/fdb/scripts/fdb.bash &
-/var/fdb/scripts/fdbdoc.bash &
-/chartrepo serve --doclayer-url=$doclayer &
-./jetstream
\ No newline at end of file
diff --git a/deploy/all-in-one/config.all-in-one.properties b/deploy/all-in-one/config.all-in-one.properties
index aab49027df..458d85e2e7 100644
--- a/deploy/all-in-one/config.all-in-one.properties
+++ b/deploy/all-in-one/config.all-in-one.properties
@@ -14,5 +14,4 @@ STRATOS_DEPLOYMENT_DOCKER_AIO=true
 SKIP_SSL_VALIDATION=true
 SQLITE_KEEP_DB=true
 TEMPLATE_DIR=./templates
-FDB_URL=mongodb://localhost:27016
-SYNC_SERVER_URL=http://localhost:8080
\ No newline at end of file
+HELM_CACHE_FOLDER=./helm-cache
\ No newline at end of file
diff --git a/deploy/all-in-one/dig.sh b/deploy/all-in-one/dig.sh
deleted file mode 100644
index 82fb0a6fe6..0000000000
--- a/deploy/all-in-one/dig.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-HOST="${@: -1}"
-if [ "$HOST" == "localhost" ]; then
-  echo "127.0.0.1"
-else
-  /usr/bin/digit $@
-fi
diff --git a/deploy/ci/suse-console-dev-releases.yml b/deploy/ci/suse-console-dev-releases.yml
index be33e148f5..eb40b5b8c0 100644
--- a/deploy/ci/suse-console-dev-releases.yml
+++ b/deploy/ci/suse-console-dev-releases.yml
@@ -47,24 +47,6 @@ resources:
     username: ((docker-username))
     password: ((docker-password))
     repository: ((docker-repository))/stratos-console
-- name: fdbserver-image
-  type: docker-image
-  source:
-    username: ((docker-username))
-    password: ((docker-password))
-    repository: ((docker-repository))/stratos-fdbserver
-- name: fdbdoclayer-image
-  type: docker-image
-  source:
-    username: ((docker-username))
-    password: ((docker-password))
-    repository: ((docker-repository))/stratos-fdbdoclayer
-- name: chartsync-image
-  type: docker-image
-  source:
-    username: ((docker-username))
-    password: ((docker-password))
-    repository: ((docker-repository))/stratos-chartsync
 - name: kube-terminal-image
   type: docker-image
   source:
@@ -159,13 +141,6 @@ jobs:
           tag: image-tag/v2-alpha-tag
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))
-      - put: kube-terminal-image
-        params:
-          dockerfile: stratos/deploy/containers/kube-terminal/Dockerfile.kubeterminal
-          build: stratos/deploy/containers/kube-terminal
-          tag: image-tag/v2-alpha-tag
-          patch_base_reg: ((patch-base-reg))
-          patch_base_tag: ((patch-base-tag))
     - do: 
       - put: ui-image
         params:
@@ -184,31 +159,17 @@ jobs:
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))
     - do:
-      - put: fdbserver-image
-        params:
-          dockerfile: stratos/deploy/containers/monocular/fdb-server/Dockerfile
-          build: stratos/deploy/containers/monocular/fdb-server/
-          tag: image-tag/v2-alpha-tag
-          patch_base_reg: ((patch-base-reg))
-          patch_base_tag: ((patch-base-tag))
-      - put: fdbdoclayer-image
-        params:
-          dockerfile: stratos/deploy/containers/monocular/fdb-doclayer/Dockerfile
-          build: stratos/deploy/containers/monocular/fdb-doclayer/
-          tag: image-tag/v2-alpha-tag
-          patch_base_reg: ((patch-base-reg))
-          patch_base_tag: ((patch-base-tag))
-      - put: chartsync-image
+      - put: analyzers-image
         params:
-          dockerfile: stratos/src/jetstream/plugins/monocular/chart-repo/Dockerfile
-          build: stratos/src/jetstream/plugins/monocular/chart-repo/
+          dockerfile: stratos/src/jetstream/plugins/analysis/container/Dockerfile
+          build: stratos/src/jetstream/plugins/analysis/container/
           tag: image-tag/v2-alpha-tag
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))
-      - put: analyzers-image
+      - put: kube-terminal-image
         params:
-          dockerfile: stratos/src/jetstream/plugins/analysis/container/Dockerfile
-          build: stratos/src/jetstream/plugins/analysis/container/
+          dockerfile: stratos/deploy/containers/kube-terminal/Dockerfile.kubeterminal
+          build: stratos/deploy/containers/kube-terminal
           tag: image-tag/v2-alpha-tag
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))
diff --git a/deploy/cloud-foundry/config.properties b/deploy/cloud-foundry/config.properties
index a5cb9bd20a..648d77d54a 100644
--- a/deploy/cloud-foundry/config.properties
+++ b/deploy/cloud-foundry/config.properties
@@ -19,4 +19,6 @@ ENCRYPTION_KEY=B374A26A71490437AA024E4FADD5B497FDFF1A8EA6FF12F6FB65AF2720B59CCF
 #VCAP_APPLICATION={"cf_api": "https://api.10.4.21.240.nip.io:8443"}
 
 # User invite templates
-TEMPLATE_DIR=./templates
\ No newline at end of file
+TEMPLATE_DIR=./templates
+
+HELM_CACHE_FOLDER=./helm-cache
\ No newline at end of file
diff --git a/deploy/containers/monocular/fdb-doclayer/Dockerfile b/deploy/containers/monocular/fdb-doclayer/Dockerfile
deleted file mode 100644
index e670a88e2a..0000000000
--- a/deploy/containers/monocular/fdb-doclayer/Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-
-# Original Source: https://raw.githubusercontent.com/kreinecke/fdb-document-layer/master/packaging/docker/Dockerfile
-
-# Dockerfile
-#
-# This source file is part of the FoundationDB open source project
-#
-# Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Builder container
-FROM splatform/stratos-bk-build-base:leap15_1 as builder
-
-# Install dependencies
-
-# Our Stratos base image already has curl and less in it
-
-# Install FoundationDB Document Layer Binaries
-
-ARG FDB_DOC_VERSION=1.6.3
-ARG FDB_WEBSITE=https://www.foundationdb.org
-
-WORKDIR /home/stratos
-RUN curl $FDB_WEBSITE/downloads/$FDB_DOC_VERSION/linux/fdb-document-layer-$FDB_DOC_VERSION-Linux.tar.gz -o fdb-document-layer-$FDB_DOC_VERSION-Linux.tar.gz && \
-    tar -xvf fdb-document-layer-$FDB_DOC_VERSION-Linux.tar.gz && \
-    mv fdb-document-layer-$FDB_DOC_VERSION-Linux doclayer
-
-
-# This Docker image is just packing 6.0 client libraries. Document Layer works with
-# any FoundationDB server >= 5.1.0. If your server version is not 6.0, then you might
-# have to add the correct version client library here.
-ARG FDB_CLIENT_VERSION=6.2.15
-RUN curl $FDB_WEBSITE/downloads/$FDB_CLIENT_VERSION/linux/libfdb_c_$FDB_CLIENT_VERSION.so -o /home/stratos/libfdb_c.so && \
-    chmod +x /home/stratos/libfdb_c.so && \
-	rm -rf /mnt/website
-
-# Final doclayer container
-FROM splatform/stratos-bk-init-base:leap15_1
-WORKDIR /var/fdb
-
-COPY --from=builder /home/stratos/libfdb_c.so /usr/lib64/libfdb_c.so
-COPY --from=builder /home/stratos/doclayer/bin/fdbdoc /usr/bin/fdbdoc
-COPY --from=builder /home/stratos/doclayer/lib/foundationdb/document/fdbmonitor /usr/bin/fdbmonitor
-
-COPY fdbdoc.bash scripts/
-RUN chmod u+x scripts/*.bash && mkdir -p logs
-
-CMD /var/fdb/scripts/fdbdoc.bash
-
-# Runtime Configuration Options
-ENV FDB_DOC_PORT 27016
-ENV FDB_NETWORKING_MODE container
\ No newline at end of file
diff --git a/deploy/containers/monocular/fdb-doclayer/fdb-doc-layer-networkpolicy.yaml b/deploy/containers/monocular/fdb-doclayer/fdb-doc-layer-networkpolicy.yaml
deleted file mode 100644
index 7322378bd0..0000000000
--- a/deploy/containers/monocular/fdb-doclayer/fdb-doc-layer-networkpolicy.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-{{- if .Values.fdbdoclayer.networkPolicy.enabled }}
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  name: {{ template "fullname" . }}-fdbdoclayer
-  labels:
-    app: {{ template "fullname" . }}-fdbdoclayer
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-spec:
-  podSelector:
-    matchLabels:
-      app: {{ template "fullname" . }}-fdbdoclayer
-      release: {{ .Release.Name }}
-  ingress:
-    ports:
-      port: 27016
-      protocol: TCP
-{{- end }}
diff --git a/deploy/containers/monocular/fdb-doclayer/fdbdoc.bash b/deploy/containers/monocular/fdb-doclayer/fdbdoc.bash
deleted file mode 100755
index 935c119741..0000000000
--- a/deploy/containers/monocular/fdb-doclayer/fdbdoc.bash
+++ /dev/null
@@ -1,75 +0,0 @@
-#! /bin/bash
-
-function setup_cluster_file() {
-	FDB_CLUSTER_FILE=${FDB_CLUSTER_FILE:-/etc/foundationdb/fdb.cluster}
-	mkdir -p $(dirname $FDB_CLUSTER_FILE)
-
-	if [[ -n $FDB_COORDINATOR ]]; then
-		echo "FDB coordinator: $FDB_COORDINATOR"
-		if [[ -z $coordinator_ip ]]; then
-			coordinator_ip=$(dig +short +search $FDB_COORDINATOR)
-		fi
-		echo "Coordinator IP: $coordinator_ip"
-		if [[ -z "$coordinator_ip" ]]; then
-				echo "Failed to look up coordinator address for $FDB_COORDINATOR" 1>&2
-				exit 1
-		fi
-		coordinator_port=${FDB_COORDINATOR_PORT:-4500}
-		if [[ -z $CLUSTER_ID ]]; then
-			echo "CLUSTER_ID environment variable not defined" 1>&2
-			exit 1
-		fi
-		echo "$CLUSTER_ID@$coordinator_ip:$coordinator_port" > $FDB_CLUSTER_FILE
-	else
-		echo "FDB_COORDINATOR environment variable not defined" 1>&2
-		exit 1
-	fi
-
-	if [ ! -f ${FDB_CLUSTER_FILE} ]; then
-		echo "Failed to locate cluster file at $FDB_CLUSTER_FILE" 1>&2
-		exit 1
-	fi
-}
-
-function setup_public_ip() {
-	if [[ "$FDB_NETWORKING_MODE" == "host" ]]; then
-		public_ip=127.0.0.1
-	elif [[ "$FDB_NETWORKING_MODE" == "container" ]]; then
-		public_ip=$(grep `hostname` /etc/hosts | sed -e "s/\s *`hostname`.*//")
-		coordinator_ip=$public_ip
-	else
-		echo "Unknown FDB Networking mode \"$FDB_NETWORKING_MODE\"" 1>&2
-		exit 1
-	fi
-
-	PUBLIC_IP=$public_ip
-}
-
-setup_public_ip
-setup_cluster_file
-
-if [ -n ${FDB_LISTEN_IP} ]; then
-	LISTEN_IP=${FDB_LISTEN_IP}
-else
-	LISTEN_IP=${PUBLIC_IP}
-fi
-
-echo "===================================================================================="
-echo "FDB Document Layer starting"
-echo "===================================================================================="
-echo ""
-
-echo "Connecting to FDB server at: $CLUSTER_ID@$coordinator_ip:$coordinator_port"
-echo "Cluster file contents: "
-cat $FDB_CLUSTER_FILE
-
-echo "Listen IP is ${LISTEN_IP}"
-echo "Public IP is ${PUBLIC_IP}"
-
-if [[ "$ENABLE_TLS" == "true" ]]; then
-	echo "Starting FDB Document Layer on $LISTEN_IP:$FDB_DOC_PORT:tls. TLS enabled."
-	fdbdoc -V --listen_address $LISTEN_IP:$FDB_DOC_PORT:tls --tls_certificate_file $SERVER_CRT --tls_ca_file $CA_CRT --tls_key_file $SERVER_KEY --logdir /var/fdb/logs
-else
-	echo "Starting FDB Document Layer on $LISTEN_IP:$FDB_DOC_PORT. No TLS."
-	fdbdoc -V --listen_address $LISTEN_IP:$FDB_DOC_PORT --logdir /var/fdb/logs
-fi
diff --git a/deploy/containers/monocular/fdb-server/Dockerfile b/deploy/containers/monocular/fdb-server/Dockerfile
deleted file mode 100644
index 48e589f3b1..0000000000
--- a/deploy/containers/monocular/fdb-server/Dockerfile
+++ /dev/null
@@ -1,89 +0,0 @@
-# Taken from: https://github.com/kreinecke/foundationdb/tree/fdb-k8s/packaging/docker
-
-# Dockerfile
-#
-# This source file is part of the FoundationDB open source project
-#
-# Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-FROM splatform/stratos-bk-build-base:leap15_1 as builder
-
-# Install dependencies
-
-# RUN apt-get update && \
-# 	apt-get install -y curl>=7.58.0-2ubuntu3.6 \
-# 	dnsutils>=1:9.11.3+dfsg-1ubuntu1.7 && \
-# 	rm -r /var/lib/apt/lists/*
-
-# NOTE: Dependencies are in the base image
-
-# Install FoundationDB Binaries
-
-ARG FDB_VERSION=6.2.15
-ARG FDB_WEBSITE=https://www.foundationdb.org
-
-USER root
-WORKDIR /home/stratos/tmp
-WORKDIR /home/stratos
-RUN pwd && ls -al
-RUN curl $FDB_WEBSITE/downloads/$FDB_VERSION/linux/fdb_$FDB_VERSION.tar.gz -o fdb_$FDB_VERSION.tar.gz && \
-	tar -xzf fdb_$FDB_VERSION.tar.gz --strip-components=1 && \
-	rm fdb_$FDB_VERSION.tar.gz && \
-	chmod u+x fdbbackup fdbcli fdbdr fdbmonitor fdbrestore fdbserver backup_agent dr_agent && \
-	mv fdbbackup fdbcli fdbdr fdbmonitor fdbrestore fdbserver backup_agent dr_agent /home/stratos/tmp
-
-
-# Main container
-FROM splatform/stratos-bk-base:leap15_1
-
-WORKDIR /var/fdb
-
-# Install FoundationDB Client Libraries
-
-ARG FDB_VERSION=6.2.15
-ARG FDB_ADDITIONAL_VERSIONS="5.1.7"
-ARG FDB_WEBSITE=https://www.foundationdb.org
-
-COPY --from=builder /home/stratos/tmp /usr/bin
-
-COPY download_multiversion_libraries.bash scripts/
-
-RUN mkdir -p /mnt/website
-RUN curl $FDB_WEBSITE/downloads/$FDB_VERSION/linux/libfdb_c_$FDB_VERSION.so -o /usr/lib/libfdb_c.so && \
-	bash scripts/download_multiversion_libraries.bash $FDB_WEBSITE $FDB_ADDITIONAL_VERSIONS && \
-	rm -rf /mnt/website
-
-# Set Up Runtime Scripts and Directories
-
-COPY fdb.bash scripts/
-COPY create_server_environment.bash scripts/
-COPY create_cluster_file.bash scripts/
-COPY configure_db.bash scripts/
-RUN chmod u+x scripts/*.bash && \
-	mkdir -p logs
-VOLUME /var/fdb/data
-
-CMD /var/fdb/scripts/fdb.bash
-
-# Runtime Configuration Options
-
-ENV FDB_PORT 4500
-ENV FDB_CLUSTER_FILE /var/fdb/fdb.cluster
-ENV FDB_NETWORKING_MODE container
-ENV FDB_COORDINATOR ""
-ENV FDB_COORDINATOR_PORT 4500
-ENV FDB_CLUSTER_FILE_CONTENTS ""
-ENV FDB_PROCESS_CLASS unset
\ No newline at end of file
diff --git a/deploy/containers/monocular/fdb-server/configure_db.bash b/deploy/containers/monocular/fdb-server/configure_db.bash
deleted file mode 100755
index df2a8d6e91..0000000000
--- a/deploy/containers/monocular/fdb-server/configure_db.bash
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/bash
-
-#
-# create_cluster_file.bash
-#
-# This source file is part of the FoundationDB open source project
-#
-# Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# This script creates a cluster file for a server or client.
-# This takes the cluster file path from the FDB_CLUSTER_FILE
-# environment variable, with a default of /etc/foundationdb/fdb.cluster
-#
-# The name of the coordinator must be defined in the FDB_COORDINATOR environment
-# variable, and it must be a name that can be resolved through DNS.
-
-function configure_db() {
-	max_retry=10
-	counter=0
-	until fdbcli --exec "configure new single memory" | grep 'Database created'
-	do
-   		sleep 1
-   		[[ counter -eq $max_retry ]] && echo "Failed!" && exit 1
-   		echo "Could not init db yet. Trying again. Try #$counter"
-   		((counter++))
-	done
-	echo "Database created."
-}
-
-if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-	configure_db "$@"
-fi
\ No newline at end of file
diff --git a/deploy/containers/monocular/fdb-server/create_cluster_file.bash b/deploy/containers/monocular/fdb-server/create_cluster_file.bash
deleted file mode 100644
index 0a710264a4..0000000000
--- a/deploy/containers/monocular/fdb-server/create_cluster_file.bash
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/bash
-
-#
-# create_cluster_file.bash
-#
-# This source file is part of the FoundationDB open source project
-#
-# Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# This script creates a cluster file for a server or client.
-# This takes the cluster file path from the FDB_CLUSTER_FILE
-# environment variable, with a default of /etc/foundationdb/fdb.cluster
-#
-# The name of the coordinator must be defined in the FDB_COORDINATOR environment
-# variable, and it must be a name that can be resolved through DNS.
-
-function create_cluster_file() {
-	FDB_CLUSTER_FILE=${FDB_CLUSTER_FILE:-/etc/foundationdb/fdb.cluster}
-	mkdir -p $(dirname $FDB_CLUSTER_FILE)
-
-	if [[ -n "$FDB_CLUSTER_FILE_CONTENTS" ]]; then
-		echo "$FDB_CLUSTER_FILE_CONTENTS" > $FDB_CLUSTER_FILE
-	elif [[ -n $FDB_COORDINATOR ]]; then
-		#We are in k8s and must lookup the fdb service hostname, not the pod IP.
-		coordinator_ip=$(dig +short +search $FDB_COORDINATOR)
-		if [[ -z "$coordinator_ip" ]]; then
-			echo "Failed to look up coordinator address for $FDB_COORDINATOR" 1>&2
-			exit 1
-		fi
-		if [[ -z $CLUSTER_ID ]]; then
-                        echo "CLUSTER_ID environment variable not defined" 1>&2
-                        exit 1
-                fi
-		coordinator_port=${FDB_COORDINATOR_PORT:-4500}
-		echo "export COORDINATOR_IP=$coordinator_ip" >> $env_file
-		echo "export COORDINATOR_PORT=$coordinator_port" >> $env_file
-		source $env_file
-		#echo "$CLUSTER_ID@$coordinator_ip:$coordinator_port,127.0.0.1:4500" > $FDB_CLUSTER_FILE
-		echo "$CLUSTER_ID@$PUBLIC_IP:4500" > $FDB_CLUSTER_FILE
-	else
-		echo "FDB_COORDINATOR environment variable not defined" 1>&2
-		exit 1
-	fi
-}
-
-if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-	create_cluster_file "$@"
-fi
\ No newline at end of file
diff --git a/deploy/containers/monocular/fdb-server/create_server_environment.bash b/deploy/containers/monocular/fdb-server/create_server_environment.bash
deleted file mode 100644
index d417f0367d..0000000000
--- a/deploy/containers/monocular/fdb-server/create_server_environment.bash
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/bash
-
-#
-# create_server_environment.bash
-#
-# This source file is part of the FoundationDB open source project
-#
-# Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-source /var/fdb/scripts/create_cluster_file.bash
-
-function create_server_environment() {
-	fdb_dir=/var/fdb
-	env_file=$fdb_dir/.fdbenv
-
-	: > $env_file
-
-	# If using docker in host network mode, or if we are running our client in the same container, use 127.0.0.1
-	if [[ "$FDB_NETWORKING_MODE" == "host" ]]; then
-		public_ip=127.0.0.1
-	elif [[ "$FDB_NETWORKING_MODE" == "container" ]]; then
-		#We are running in k8s
-		public_ip=$(grep `hostname` /etc/hosts | sed -e "s/\s *`hostname`.*//")
-	else
-		echo "Unknown FDB Networking mode \"$FDB_NETWORKING_MODE\"" 1>&2
-		exit 1
-	fi
-
-	echo "export PUBLIC_IP=$public_ip" >> $env_file
-	# If the FDB_COORDINATOR node is not set, then we are the coordinator - use our public IP
-	if [[ -z $FDB_COORDINATOR ]]; then
-		FDB_CLUSTER_FILE_CONTENTS="docker:docker@$public_ip:$FDB_PORT"
-	fi
-
-	create_cluster_file
-}
diff --git a/deploy/containers/monocular/fdb-server/download_multiversion_libraries.bash b/deploy/containers/monocular/fdb-server/download_multiversion_libraries.bash
deleted file mode 100644
index 651947857c..0000000000
--- a/deploy/containers/monocular/fdb-server/download_multiversion_libraries.bash
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/bash
-
-#
-# download_multiversion_libraries.bash
-#
-# This source file is part of the FoundationDB open source project
-#
-# Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-mkdir -p /usr/lib/fdb/multiversion
-website=$1
-shift
-for version in $*; do
-	origin=$website/downloads/$version/linux/libfdb_c_$version.so
-	destination=/usr/lib/fdb/multiversion/libfdb_c_$version.so
-	echo "Downloading $origin to $destination"
-	curl $origin -o $destination
-done
\ No newline at end of file
diff --git a/deploy/containers/monocular/fdb-server/fdb.bash b/deploy/containers/monocular/fdb-server/fdb.bash
deleted file mode 100644
index 44842089e4..0000000000
--- a/deploy/containers/monocular/fdb-server/fdb.bash
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/bash
-
-#
-# fdb.bash
-#
-# This source file is part of the FoundationDB open source project
-#
-# Copyright 2013-2018 Apple Inc. and the FoundationDB project authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-source /var/fdb/scripts/create_server_environment.bash
-create_server_environment
-source /var/fdb/.fdbenv
-echo "Starting FDB server listening on: $PUBLIC_IP:$FDB_PORT public address: $PUBLIC_IP:$FDB_PORT"
-cat /var/fdb/fdb.cluster
-source /var/fdb/scripts/configure_db.bash
-configure_db &
-
-if [ -n ${FDB_LISTEN_IP} ]; then
-	LISTEN_IP=${FDB_LISTEN_IP}
-else
-	LISTEN_IP=${PUBLIC_IP}
-fi
-
-echo "===================================================================================="
-echo "FDB Server starting"
-echo "===================================================================================="
-echo ""
-
-echo "Listen IP is ${LISTEN_IP}"
-echo "Public IP is ${PUBLIC_IP}"
-
-fdbserver --listen_address $LISTEN_IP:$FDB_PORT --public_address $PUBLIC_IP:$FDB_PORT \
-	--datadir /var/fdb/data --logdir /var/fdb/logs
\ No newline at end of file
diff --git a/deploy/containers/monocular/fdb-server/fdbserver-networkpolicy.yaml b/deploy/containers/monocular/fdb-server/fdbserver-networkpolicy.yaml
deleted file mode 100644
index 2752d371e2..0000000000
--- a/deploy/containers/monocular/fdb-server/fdbserver-networkpolicy.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-{{- if .Values.fdbserver.networkPolicy.enabled }}
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  name: {{ template "fullname" . }}-fdbserver
-  labels:
-    app: {{ template "fullname" . }}-fdbserver
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-spec:
-  podSelector:
-    matchLabels:
-      app: {{ template "fullname" . }}-fdbserver
-      release: {{ .Release.Name }}
-  ingress:
-  - ports:
-    - port: 4500
-      protocol: TCP
-{{- end }}
diff --git a/deploy/kubernetes/console/templates/chartsync.yaml b/deploy/kubernetes/console/templates/chartsync.yaml
deleted file mode 100644
index 1eeab2affd..0000000000
--- a/deploy/kubernetes/console/templates/chartsync.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
----
-{{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major (trimSuffix "+" .Capabilities.KubeVersion.Minor) )}}
-apiVersion: apps/v1
-{{- else }}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Deployment
-metadata:
-  name: stratos-chartsync
-  labels:
-    app.kubernetes.io/name: "stratos"
-    app.kubernetes.io/instance: "{{ .Release.Name }}"
-    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "stratos-chartsync"
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-spec:
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: "stratos"
-      app.kubernetes.io/component: "stratos-chartsync"
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: "stratos"
-        app.kubernetes.io/instance: "{{ .Release.Name }}"
-        app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-        app.kubernetes.io/component: "stratos-chartsync"
-        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-        app: "{{ .Release.Name }}"
-    spec:
-      containers:
-      - name: chartsync
-        image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{ default "stratos-chartsync" .Values.images.chartsync}}:{{.Values.consoleVersion}}
-        imagePullPolicy: {{.Values.imagePullPolicy}}
-        command: ["/chartrepo"]
-        args: ["serve", "--doclayer-url=mongodb://{{ .Release.Name }}-fdbdoclayer:27016", "--cafile=/etc/certs/ca.crt", "--certfile=/etc/certs/tls.crt", "--keyfile=/etc/certs/tls.key"]
-        env:
-        - name: STRATOS_IMAGE_REF
-          value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
-        ports:
-        - name: endpoint
-          containerPort: 8080
-        volumeMounts:
-        - name: certs
-          mountPath: "/etc/certs"
-          readOnly: true   
-      volumes:
-        - name: certs
-          secret:
-            secretName: {{ .Release.Name }}-fdbdoclayer-certs
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: "{{ .Release.Name }}-chartsync"
-  labels:
-    app.kubernetes.io/name: "stratos"
-    app.kubernetes.io/instance: "{{ .Release.Name }}"
-    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "stratos-chartsync-service"
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-spec:
-  type: ClusterIP
-  ports:
-  - name: chartsync
-    port: 8080
-    targetPort: 8080
-  selector:
-    app: "{{ .Release.Name }}"
-    app.kubernetes.io/component: "stratos-chartsync"
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 2cd00464d0..50d94a2c5d 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -282,6 +282,8 @@ spec:
           value: {{ default "" .Values.console.userInviteSubject | quote }}
         - name: ENABLE_TECH_PREVIEW
           value: {{ default "false" .Values.console.techPreview | quote }}
+        - name: HELM_CACHE_FOLDER
+          value: /helm-cache
         {{- if .Values.console.ui }}
         {{- if .Values.console.ui.listMaxSize }}
         - name: UI_LIST_MAX_SIZE
@@ -315,9 +317,8 @@ spec:
           name: "{{ .Release.Name }}-templates"
           readOnly: true
         {{- end }}
-        - mountPath: "/etc/monocular-certs"
-          name: "{{ .Release.Name }}-monocular-certs"
-          readOnly: true
+        - mountPath: /helm-cache
+          name: helm-cache-volume          
       {{- if and .Values.kube.registry.username .Values.kube.registry.password }}
       imagePullSecrets:
       - name: {{.Values.dockerRegistrySecret}}
@@ -347,6 +348,5 @@ spec:
         configMap:
           name: {{ .Values.console.templatesConfigMapName }}
       {{- end }}
-      - name: "{{ .Release.Name }}-monocular-certs"
-        secret:
-          secretName: {{ .Release.Name }}-fdbdoclayer-certs
+      - name: helm-cache-volume
+        emptyDir: {}      
diff --git a/deploy/kubernetes/console/templates/fdb-secrets.yaml b/deploy/kubernetes/console/templates/fdb-secrets.yaml
deleted file mode 100644
index 7e9598779f..0000000000
--- a/deploy/kubernetes/console/templates/fdb-secrets.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-{{/*
-Generate self-signed certificate
-*/}}
-{{- define "fdbdoclayer.generateCertificate" -}}
-{{- $altNames := list ( printf "%s%s" .Release.Name "-fdbdoclayer") ( printf "%s%s.%s" (include "fullname" .) "-fdbdoclayer" .Release.Namespace ) ( printf "%s.%s.svc" (include "console.certName" .) .Release.Namespace ) -}}
-{{- $ca := genCA "stratos-ca" 365 -}}
-{{- $cert := genSignedCert "fdbdoclayer" nil $altNames 365 $ca -}}
-tls.crt: {{ $cert.Cert | b64enc }}
-tls.key: {{ $cert.Key | b64enc }}
-tls.pem: {{ printf "%s\n%s\n%s\n" ($cert.Cert) ($ca.Cert) ($cert.Key) | b64enc }}
-ca.crt:  {{ $ca.Cert | b64enc }}
-{{- end -}}
-
----
-apiVersion: v1
-kind: Secret
-type: kubernetes.io/tls
-metadata:
-  name: {{ .Release.Name }}-fdbdoclayer-certs
-  labels:
-    app.kubernetes.io/name: "stratos"
-    app.kubernetes.io/instance: "{{ .Release.Name }}"
-    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "fdbdoclayer-certs"
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-data:
-{{ (include "fdbdoclayer.generateCertificate" .) | indent 2 }}
\ No newline at end of file
diff --git a/deploy/kubernetes/console/templates/fdbdoclayer/deployment.yaml b/deploy/kubernetes/console/templates/fdbdoclayer/deployment.yaml
deleted file mode 100644
index 90923912b0..0000000000
--- a/deploy/kubernetes/console/templates/fdbdoclayer/deployment.yaml
+++ /dev/null
@@ -1,123 +0,0 @@
-
-{{- if semverCompare ">=1.16" (printf "%s.%s" .Capabilities.KubeVersion.Major (trimSuffix "+" .Capabilities.KubeVersion.Minor) )}}
-apiVersion: apps/v1
-{{- else }}
-apiVersion: apps/v1beta2
-{{- end }}
-kind: Deployment
-metadata:
-  name: stratos-chartstore
-{{- if .Values.console.deploymentAnnotations }}
-  annotations:
-{{ toYaml .Values.console.deploymentAnnotations | indent 4 }}
-{{- end }}
-  labels:
-    app.kubernetes.io/name: "stratos"
-    app.kubernetes.io/instance: "{{ .Release.Name }}"
-    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "stratos-chartstore"
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-{{- if .Values.console.deploymentExtraLabels }}
-{{ toYaml .Values.console.deploymentExtraLabels | indent 4 }}
-{{- end }}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: "stratos"
-      app.kubernetes.io/instance: "{{ .Release.Name }}"
-      app.kubernetes.io/component: "stratos-chartstore"
-  template:
-    metadata:
-{{- if .Values.console.podAnnotations }}
-      annotations:
-{{ toYaml .Values.console.podAnnotations | indent 8 }}
-{{- end }}
-      labels:
-        app.kubernetes.io/name: "stratos"
-        app.kubernetes.io/instance: "{{ .Release.Name }}"
-        app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-        app.kubernetes.io/component: "stratos-chartstore"
-        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-        {{- if .Values.console.podExtraLabels}}
-        {{ toYaml .Values.console.podExtraLabels | nindent 8 }}
-        {{- end}}        
-    spec:
-{{- with .Values.securityContext }}
-      securityContext:
-{{ toYaml . | indent 8 }}
-{{- end }}
-      containers:
-      - name: fdbdoclayer
-        image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.fdbdoclayer}}:{{.Values.consoleVersion}}
-        imagePullPolicy: {{.Values.imagePullPolicy}}
-        env:
-        - name: STRATOS_IMAGE_REF
-          value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
-        - name: FDB_COORDINATOR
-          value: {{ .Release.Name }}-fdbdoclayer
-        - name: FDB_LISTEN_IP
-          value: 0.0.0.0
-        - name: CLUSTER_ID 
-          value: chartdb:erlklkg
-        - name: ENABLE_TLS
-          value: "true"
-        - name: SERVER_CRT
-          value: "/etc/secrets/tls.crt"
-        - name: SERVER_KEY
-          value: "/etc/secrets/tls.key"
-        - name: CA_CRT
-          value: "/etc/secrets/ca.crt"   
-        - name: FDB_NETWORKING_MODE 
-          value: container
-        ports:
-        - containerPort: 27016
-        livenessProbe:
-          tcpSocket:
-            port: 27016
-          initialDelaySeconds: 3
-          periodSeconds: 20
-        readinessProbe:
-          tcpSocket:
-            port: 27016
-          initialDelaySeconds: 3
-          periodSeconds: 10
-        volumeMounts:
-        - name: certs
-          mountPath: "/etc/secrets"
-          readOnly: true
-        resources:
-          limits:
-            memory: 384Mi
-          requests:
-            memory: 256Mi
-      - name: fdbserver
-        image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.fdbserver}}:{{.Values.consoleVersion}}
-        imagePullPolicy: {{.Values.imagePullPolicy}}
-        env:
-        - name: STRATOS_IMAGE_REF
-          value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
-        - name: FDB_COORDINATOR
-          value: {{ .Release.Name }}-fdbdoclayer
-        - name: FDB_LISTEN_IP
-          value: 0.0.0.0
-        - name: CLUSTER_ID
-          value: chartdb:erlklkg
-        - name: FDB_NETWORKING_MODE 
-          value: container
-        ports:
-        - containerPort: 4500
-        livenessProbe:
-          tcpSocket:
-            port: 4500
-          initialDelaySeconds: 3
-          periodSeconds: 20
-        readinessProbe:
-          tcpSocket:
-            port: 4500
-          initialDelaySeconds: 3
-          periodSeconds: 10
-      volumes:
-        - name: certs
-          secret:
-            secretName: {{ .Release.Name }}-fdbdoclayer-certs
diff --git a/deploy/kubernetes/console/templates/fdbdoclayer/fdb-doc-layer-service.yaml b/deploy/kubernetes/console/templates/fdbdoclayer/fdb-doc-layer-service.yaml
deleted file mode 100644
index b3c74bfb0a..0000000000
--- a/deploy/kubernetes/console/templates/fdbdoclayer/fdb-doc-layer-service.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Release.Name }}-fdbdoclayer
-{{- if .Values.console.service -}}
-{{- if .Values.console.service.annotations }}
-  annotations:
-{{ toYaml .Values.console.service.annotations | indent 4 }}
-{{- end }}
-{{- end }}
-  labels:
-    app.kubernetes.io/name: "stratos"
-    app.kubernetes.io/instance: "{{ .Release.Name }}"
-    app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-    app.kubernetes.io/component: "{{ .Release.Name }}-fdbdoclayer"
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-{{- if .Values.console.service -}}
-{{- if .Values.console.service.extraLabels }}
-{{ toYaml .Values.console.service.extraLabels | indent 4 }}
-{{- end }}
-{{- end }}
-spec:
-  type: ClusterIP
-  ports:
-  - port: 27016
-    targetPort: 27016
-    protocol: TCP
-    name: fdbdoclayer
-  selector:
-    app.kubernetes.io/name: "stratos"
-    app.kubernetes.io/instance: "{{ .Release.Name }}"
-    app.kubernetes.io/component: "stratos-chartstore"
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index 5ac7dc060c..3e72d57812 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -128,9 +128,6 @@ images:
   proxy: stratos-jetstream
   mariadb: stratos-mariadb
   configInit: stratos-config-init
-  fdbserver: stratos-fdbserver
-  fdbdoclayer: stratos-fdbdoclayer
-  chartsync: stratos-chartsync
   analyzers: stratos-analyzers
 
 # Specify which storage class should be used for PVCs
diff --git a/deploy/kubernetes/custom/__stratos.tpl b/deploy/kubernetes/custom/__stratos.tpl
index d5eb091928..653bade6f6 100644
--- a/deploy/kubernetes/custom/__stratos.tpl
+++ b/deploy/kubernetes/custom/__stratos.tpl
@@ -2,16 +2,6 @@
 
 # Extra env vars for the Jetstream Pod in deployment.yaml
 {{- define "stratosJetstreamEnv" }}
-- name: MONOCULAR_CRT_PATH
-  value: "/etc/monocular-certs/tls.crt"
-- name: MONOCULAR_KEY_PATH
-  value: "/etc/monocular-certs/tls.key"
-- name: MONOCULAR_CA_CRT_PATH
-  value: "/etc/monocular-certs/ca.crt"
-- name: FDB_URL
-  value: "mongodb://{{ .Release.Name }}-fdbdoclayer:27016"
-- name: SYNC_SERVER_URL
-  value: "http://{{ .Release.Name }}-chartsync:8080"
 - name: ANALYSIS_SERVICES_API
   value: "http://{{ .Release.Name }}-analyzers:8090"
 - name: STRATOS_KUBERNETES_NAMESPACE
diff --git a/deploy/kubernetes/custom/custom-build.sh b/deploy/kubernetes/custom/custom-build.sh
index b44f9fbd41..8b413607cf 100644
--- a/deploy/kubernetes/custom/custom-build.sh
+++ b/deploy/kubernetes/custom/custom-build.sh
@@ -12,16 +12,6 @@ printf "${RESET}"
 
 function custom_image_build() {
 
-  log "-- Building/publishing Foundation DB Server"
-  patchAndPushImage stratos-fdbserver Dockerfile "${STRATOS_PATH}/deploy/containers/monocular/fdb-server"
-
-  log "-- Building/publishing Foundation DB Document Layer"
-  patchAndPushImage stratos-fdbdoclayer Dockerfile "${STRATOS_PATH}/deploy/containers/monocular/fdb-doclayer"
-
-  # Build and push an image for the Helm Repo Sync Tool
-  log "-- Building/publishing Monocular Chart Repo Sync Tool"
-  patchAndPushImage stratos-chartsync Dockerfile "${STRATOS_PATH}/src/jetstream/plugins/monocular/chart-repo"
-
   # Build and push an image for the Kubernetes Terminal
   log "-- Building/publishing Kubernetes Terminal"
   patchAndPushImage stratos-kube-terminal Dockerfile.kubeterminal "${STRATOS_PATH}/deploy/containers/kube-terminal"
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 a79b0fcc7a..f35cb5c7ba 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
@@ -128,7 +128,7 @@ export class SteppersComponent implements OnInit, AfterContentInit, OnDestroy {
           this.logger.warn('Stepper failed: ', err);
           return observableOf({
             success: false,
-            message: 'Failed',
+            message: err || 'Failed',
             redirectPayload: null,
             redirect: false,
             data: {},
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.spec.ts
index 6cf6078bec..c214981990 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.spec.ts
@@ -9,6 +9,9 @@ import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-m
 import { InternalEventMonitorFactory } from '../../../../../store/src/monitors/internal-event-monitor.factory';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { KubernetesBaseTestModules } from '../../kubernetes/kubernetes.testing.module';
+import { MockChartService } from '../monocular/shared/services/chart.service.mock';
+import { ChartsService } from '../monocular/shared/services/charts.service';
+import { ConfigService } from '../monocular/shared/services/config.service';
 import { CreateReleaseComponent } from './create-release.component';
 
 describe('CreateReleaseComponent', () => {
@@ -31,8 +34,10 @@ describe('CreateReleaseComponent', () => {
         EntityMonitorFactory,
         InternalEventMonitorFactory,
         TabNavService,
-        ConfirmationDialogService
-      ]
+        ConfirmationDialogService,
+        { provide: ChartsService, useValue: new MockChartService() },
+        { provide: ConfigService, useValue: { appName: 'appName' } },
+    ]
     })
       .compileComponents();
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.ts
index 26ccf5c874..372ea2e145 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.ts
@@ -15,10 +15,13 @@ import { RequestInfoState } from '../../../../../store/src/reducers/api-request-
 import { kubeEntityCatalog } from '../../kubernetes/kubernetes-entity-catalog';
 import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes/kubernetes-entity-factory';
 import { KubernetesNamespace } from '../../kubernetes/store/kube.types';
+import { getFirstChartUrl } from '../../kubernetes/workloads/workload.utils';
 import { helmEntityCatalog } from '../helm-entity-catalog';
 import { createMonocularProviders } from '../monocular/stratos-monocular-providers.helpers';
 import { getMonocularEndpoint, stratosMonocularEndpointGuid } from '../monocular/stratos-monocular.helper';
 import { HelmInstallValues } from '../store/helm.types';
+import { ChartsService } from './../monocular/shared/services/charts.service';
+import { HelmChartReference } from './../store/helm.types';
 
 @Component({
   selector: 'app-create-release',
@@ -59,14 +62,18 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
   private subs: Subscription[] = [];
   private createdNamespace = false;
 
+  private chart: HelmChartReference;
+
   constructor(
     private route: ActivatedRoute,
     public endpointsService: EndpointsService,
     private httpClient: HttpClient,
     private confirmDialog: ConfirmationDialogService,
+    private chartsService: ChartsService,
   ) {
-    const chart = this.route.snapshot.params;
-    this.cancelUrl = `/monocular/charts/${getMonocularEndpoint(this.route)}/${chart.repo}/${chart.chartName}/${chart.version}`;
+    const chart = this.route.snapshot.params as HelmChartReference;
+    this.cancelUrl = `/monocular/charts/${getMonocularEndpoint(this.route)}/${chart.repo}/${chart.name}/${chart.version}`;
+    this.chart = chart;
 
     this.setupDetailsStep();
 
@@ -75,7 +82,7 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     });
 
     // Fetch the values.yaml for the Chart
-    const valuesYamlUrl = `/pp/v1/chartsvc/v1/assets/${chart.repo}/${chart.chartName}/versions/${chart.version}/values.yaml`;
+    const valuesYamlUrl = `/pp/v1/chartsvc/v1/assets/${chart.repo}/${chart.name}/versions/${chart.version}/values.yaml`;
 
     this.httpClient.get(valuesYamlUrl, { responseType: 'text' })
       .subscribe(response => {
@@ -256,33 +263,45 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
       ...this.details.value,
       ...this.overrides.value,
       chart: {
-        chartName: this.route.snapshot.params.chartName,
+        name: this.route.snapshot.params.name,
         repo: this.route.snapshot.params.repo,
         version: this.route.snapshot.params.version,
       },
       monocularEndpoint: endpoint === stratosMonocularEndpointGuid ? null : endpoint
     };
 
-    // Make the request
-    return helmEntityCatalog.chart.api.install<RequestInfoState>(values).pipe(
-      // Wait for result of request
-      filter(state => !!state),
-      pairwise(),
-      filter(([oldVal, newVal]) => (oldVal.creating && !newVal.creating)),
-      map(([, newVal]) => newVal),
-      map(result => ({
-        success: !result.error,
-        redirect: !result.error,
-        redirectPayload: {
-          path: !result.error ? `workloads/${values.endpoint}:${values.releaseNamespace}:${values.releaseName}/summary` : ''
-        },
-        message: !result.error ? '' : result.message
-      }))
+    // Get the chart first, so we can get then install URL, then install
+    return this.chartsService.getVersion(this.chart.repo, this.chart.name, this.chart.version).pipe(
+      switchMap(chartInfo => {
+        if (!chartInfo) {
+          throw new Error('Could not get Chart URL');
+        }
+        // Add the chart url into the values
+        values.chartUrl = getFirstChartUrl(chartInfo);
+        if (values.chartUrl.length === 0) {
+          throw new Error('Could not get Chart URL');
+        }
+        // Make the request
+        return helmEntityCatalog.chart.api.install<RequestInfoState>(values).pipe(
+          // Wait for result of request
+          filter(state => !!state),
+          pairwise(),
+          filter(([oldVal, newVal]) => (oldVal.creating && !newVal.creating)),
+          map(([, newVal]) => newVal),
+          map(result => ({
+            success: !result.error,
+            redirect: !result.error,
+            redirectPayload: {
+              path: !result.error ? `workloads/${values.endpoint}:${values.releaseNamespace}:${values.releaseName}/summary` : ''
+            },
+            message: !result.error ? '' : result.message
+          }))
+        )
+      })
     );
   }
 
   ngOnDestroy() {
     safeUnsubscribe(...this.subs);
   }
-
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm.routing.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm.routing.ts
index 37dc491734..e42207d593 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/helm.routing.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/helm.routing.ts
@@ -18,8 +18,8 @@ const monocular: Routes = [
   },
   { pathMatch: 'full', path: 'charts/:endpoint/:repo/:chartName/:version', component: MonocularChartViewComponent },
   { path: 'charts/:endpoint/:repo/:chartName', component: MonocularChartViewComponent },
-  { pathMatch: 'full', path: 'install/:endpoint/:repo/:chartName/:version', component: CreateReleaseComponent },
-  { path: 'install/:endpoint/:repo/:chartName', component: CreateReleaseComponent },
+  { pathMatch: 'full', path: 'install/:endpoint/:repo/:name/:version', component: CreateReleaseComponent },
+  { path: 'install/:endpoint/:repo/:name', component: CreateReleaseComponent },
 ];
 
 @NgModule({
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts
index 50ffa840a5..939eb86e08 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts
@@ -19,19 +19,22 @@ export class ChartDetailsReadmeComponent {
     }
   }
 
-  public loading = true;
+  public loading = false;
   public readmeContent$: Observable<string>;
   private renderer = new markdown.Renderer();
+  private loadingDelay: any;
 
   constructor(private chartsService: ChartsService) {
     this.renderer.link = (href, title, text) => `<a target="_blank" title="${title}" href="${href}">${text}</a>`;
     this.renderer.code = (text: string) => `<code>${text}</code>`;
+    this.loadingDelay = setTimeout(() => this.loading = true, 100);
   }
 
   // TODO: See #150 - This should not require loading the specific version and then the readme
   private getReadme(currentVersion: ChartVersion): Observable<string> {
     return this.chartsService.getChartReadme(currentVersion).pipe(
       map(resp => {
+        clearTimeout(this.loadingDelay);
         this.loading = false;
         return markdown(resp, {
           renderer: this.renderer
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.html
index fae3d4f7d5..31c68dc996 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.html
@@ -1,5 +1,5 @@
 <div>
-  <app-panel *ngIf="!chart && !loading" class="app-panel--container">
+  <app-panel *ngIf="!chart && !initing" class="app-panel--container">
     <h2>Sorry, we couldn't find the chart</h2>
   </app-panel>
   <app-loader [loading]="loading">
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.ts
index 76262da43a..5d63a62325 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.ts
@@ -16,16 +16,21 @@ import { getMonocularEndpoint } from '../stratos-monocular.helper';
 export class ChartDetailsComponent implements OnInit {
   /* This resource will be different, probably ChartVersion */
   chart: Chart;
-  loading = true;
+  loading = false;
+  initing = true;
   currentVersion: ChartVersion;
   iconUrl: string;
   titleVersion: string;
 
+  loadingDelay: any;
+
   constructor(
     private route: ActivatedRoute,
     private chartsService: ChartsService,
     private config: ConfigService,
-  ) { }
+  ) {
+    this.loadingDelay = setTimeout(() => this.loading = true, 100);
+  }
 
   ngOnInit() {
     this.route.params.forEach((params: Params) => {
@@ -34,7 +39,9 @@ export class ChartDetailsComponent implements OnInit {
 
       if (!!chartName) {
         this.chartsService.getChart(repo, chartName).pipe(first()).subscribe(chart => {
+          clearTimeout(this.loadingDelay);
           this.loading = false;
+          this.initing = false;
           this.chart = chart;
           const version = params.version || this.chart.relationships.latestChartVersion.data.version;
           this.chartsService.getVersion(repo, chartName, version).pipe(first())
@@ -42,8 +49,8 @@ export class ChartDetailsComponent implements OnInit {
               this.currentVersion = chartVersion;
               this.titleVersion = this.currentVersion.attributes.app_version || '';
               this.updateMetaTags();
+              this.iconUrl = this.chartsService.getChartIconURL(this.chart, chartVersion);
             });
-          this.iconUrl = this.chartsService.getChartIconURL(this.chart);
         });
       }
     });
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts
index 77f23474d7..cb22418fba 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts
@@ -125,9 +125,9 @@ export class ChartsService {
    * @return An observable that will be a chartReadme
    */
   getChartReadme(chartVersion: ChartVersion): Observable<string> {
-    return this.http.get(`${this.hostname}${chartVersion.attributes.readme}`, {
+    return chartVersion.attributes.readme ? this.http.get(`${this.hostname}${chartVersion.attributes.readme}`, {
       responseType: 'text'
-    });
+    }) : of('<h1>No Readme available for this chart</h1>');
   }
 
   /**
@@ -175,9 +175,11 @@ export class ChartsService {
    *
    * @param chart Chart object
    */
-  getChartIconURL(chart: Chart): string {
-    if (chart.attributes.icon) {
-      return this.updateStratosUrl(chart, `${this.hostname}${chart.attributes.icon}`);
+  getChartIconURL(chart: Chart, version?: ChartVersion): string {
+    let url = version ? version.relationships.chart.data.icon : null;
+    url = url || chart.attributes.icon;
+    if (url) {
+      return this.updateStratosUrl(chart, `${this.hostname}${url}`);
     } else {
       return '/core/assets/custom/placeholder.png';
     }
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.types.ts b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.types.ts
index 7c9c4afa9c..fc79d7039c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.types.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.types.ts
@@ -45,35 +45,26 @@ export enum HelmStatus {
   Pending_Rollback = 8
 }
 
-export interface HelmInstallValues {
-  endpoint: string;
+export interface HelmChartReference {
+  name: string;
+  repo: string;
+  version: string;
+}
+
+export interface HelmUpgradeInstallValues {
   monocularEndpoint: string;
-  releaseName: string;
-  releaseNamespace: string;
   values: string;
-  chart: {
-    name: string;
-    repo: string;
-    version: string;
-  };
+  chart: HelmChartReference;
+  chartUrl: string;
 }
 
-export interface HelmUpgradeValues {
-  values: string;
-  chart: {
-    name: string;
-    repo: string;
-    version: string;
-  };
-  restartPods?: boolean;
-  monocularEndpoint?: string;
+export interface HelmInstallValues extends HelmUpgradeInstallValues {
+  endpoint: string;
+  releaseName: string;
+  releaseNamespace: string;
 }
 
-export interface HelmUpgradeValues {
-  chart: {
-    name: string;
-    repo: string;
-    version: string;
-  };
+
+export interface HelmUpgradeValues extends HelmUpgradeInstallValues {
   restartPods?: boolean;
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts
index 34f8ef5c45..328ded2c6f 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts
@@ -11,6 +11,7 @@ import { stratosMonocularEndpointGuid } from '../../../helm/monocular/stratos-mo
 import { HelmUpgradeValues, MonocularVersion } from '../../../helm/store/helm.types';
 import { HelmReleaseHelperService } from '../release/tabs/helm-release-helper.service';
 import { HelmReleaseGuid } from '../workload.types';
+import { getFirstChartUrl } from '../workload.utils';
 import { workloadsEntityCatalog } from './../workloads-entity-catalog';
 import { ReleaseUpgradeVersionsListConfig } from './release-version-list-config';
 
@@ -90,6 +91,7 @@ export class UpgradeReleaseComponent {
       return of({ success: true });
     }
 
+    // Add the chart url into the values
     const values: HelmUpgradeValues = {
       values: this.overrides.controls.values.value,
       restartPods: false,
@@ -98,7 +100,8 @@ export class UpgradeReleaseComponent {
         repo: this.version.relationships.chart.data.repo.name,
         version: this.version.attributes.version,
       },
-      monocularEndpoint: this.monocularEndpointId === stratosMonocularEndpointGuid ? null : this.monocularEndpointId
+      monocularEndpoint: this.monocularEndpointId === stratosMonocularEndpointGuid ? null : this.monocularEndpointId,
+      chartUrl: getFirstChartUrl(this.version)
     };
 
     // Make the request
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workload.utils.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workload.utils.ts
new file mode 100644
index 0000000000..7c8fb71baa
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workload.utils.ts
@@ -0,0 +1,9 @@
+import { ChartVersion } from '../../helm/monocular/shared/models/chart-version';
+
+// Get first URL for a Chart or return empty string if none
+export function getFirstChartUrl(chart: ChartVersion): string {
+  if (chart && chart.attributes && chart.attributes.urls && chart.attributes.urls.length > 0) {
+    return chart.attributes.urls[0];
+  }
+  return '';
+}
diff --git a/src/jetstream/cnsi.go b/src/jetstream/cnsi.go
index daf0ea3446..685e5fef03 100644
--- a/src/jetstream/cnsi.go
+++ b/src/jetstream/cnsi.go
@@ -633,5 +633,12 @@ func (p *portalProxy) updateEndpoint(c echo.Context) error {
 		}
 	}
 
+	// Notify plugins if they support the notification interface
+	for _, plugin := range p.Plugins {
+		if notifier, ok := plugin.(interfaces.EndpointNotificationPlugin); ok {
+			notifier.OnEndpointNotification(interfaces.EndpointUpdateAction, &endpoint)
+		}
+	}
+
 	return nil
 }
diff --git a/src/jetstream/config.dev b/src/jetstream/config.dev
index a98e5c3ec3..9b98a9b21b 100644
--- a/src/jetstream/config.dev
+++ b/src/jetstream/config.dev
@@ -53,3 +53,6 @@ AUTH_ENDPOINT_TYPE=local
 LOCAL_USER=admin
 LOCAL_USER_PASSWORD=admin
 LOCAL_USER_SCOPE=stratos.admin
+
+# Cache folder for Helm Charts
+HELM_CACHE_FOLDER=./.helm-cache
diff --git a/src/jetstream/config.example b/src/jetstream/config.example
index 417f5f8144..3723583c27 100644
--- a/src/jetstream/config.example
+++ b/src/jetstream/config.example
@@ -68,15 +68,11 @@ INVITE_USER_CLIENT_SECRET=
 # DB_DATABASE_NAME=stratosdb
 # DB_SSL_MODE=disable
 
-# Helm Monocular configuration
-#FDB_URL="ongodb://127.0.0.1:27016"
-#SYNC_SERVER_URL=http://127.0.0.1:8080"
-
-# Simplify development with FDB (value is port of FDB server: 27016 for FDB, 27017 for MongoDB)
-#FDB_LOCAL_DEV=27017
-
 # Analysis services API
 #ANALYSIS_SERVICES_API=
 
 # Download link when installing the Kubernetes Dashboard in a targetted Kube Endpoint
 # STRATOS_KUBERNETES_DASHBOARD_IMAGE=
+
+# Cache folder for Helm Charts
+# HELM_CACHE_FOLDER=./helm-cache
\ No newline at end of file
diff --git a/src/jetstream/go.mod b/src/jetstream/go.mod
index 989a9fc1b8..9c59189023 100644
--- a/src/jetstream/go.mod
+++ b/src/jetstream/go.mod
@@ -35,6 +35,7 @@ require (
 	github.com/elazarl/goproxy/ext v0.0.0-20200315184450-1f3cb6622dad // indirect
 	github.com/fatih/color v1.7.0 // indirect
 	github.com/go-sql-driver/mysql v1.5.0
+	github.com/golang/snappy v0.0.1 // indirect
 	github.com/google/go-querystring v1.0.0 // indirect
 	github.com/google/martian v2.1.0+incompatible
 	github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e // indirect
@@ -74,11 +75,12 @@ require (
 	github.com/valyala/fasttemplate v1.1.0 // indirect
 	github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec // indirect
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
-	golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9
+	golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
 	gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0
 	gopkg.in/cheggaaa/pb.v1 v1.0.27 // indirect
-	gopkg.in/yaml.v2 v2.2.8
+	gopkg.in/yaml.v2 v2.3.0
 	k8s.io/apiextensions-apiserver v0.0.0 // indirect
+	k8s.io/helm v2.16.10+incompatible // indirect
 	k8s.io/kubectl v0.0.0 // indirect
 )
 
@@ -90,8 +92,6 @@ replace (
 	github.com/SermoDigital/jose => github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc
 	github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.4.1
 	github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309
-	github.com/helm/monocular/chartrepo => ./plugins/monocular/chart-repo
-	github.com/helm/monocular/chartsvc => ./plugins/monocular/chartsvc
 	github.com/kubernetes-sigs/aws-iam-authenticator => github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc
 	github.com/russross/blackfriday v2.0.0+incompatible => github.com/russross/blackfriday v1.5.2
 	github.com/sergi/go-diff => github.com/sergi/go-diff v1.0.0
diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index ed4bbbd391..219e52d2ec 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -27,17 +27,21 @@ github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbt
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/DATA-DOG/go-sqlmock v1.1.3 h1:sVIxMSTMnnVzl9Bn6BMjW6p5lSbpjHL80mqnxMWJ/oE=
 github.com/DATA-DOG/go-sqlmock v1.1.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
 github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e h1:eb0Pzkt15Bm7f2FFYv7sjY7NPFi3cPkS3tv1CcrFBWA=
 github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
 github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg=
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
+github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc=
 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/semver/v3 v3.0.1 h1:2kKm5lb7dKVrt5TYUiAavE6oFc1cFT0057UVGT+JqLk=
 github.com/Masterminds/semver/v3 v3.0.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
+github.com/Masterminds/semver/v3 v3.1.0 h1:Y2lUDsFKVRSYGojLJ1yLxSXdMmMYTYls0rCvoqmMUQk=
+github.com/Masterminds/semver/v3 v3.1.0/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/Masterminds/sprig v2.18.0+incompatible h1:QoGhlbC6pter1jxKnjMFxT8EqsLuDE6FEcNbWEpw+lI=
 github.com/Masterminds/sprig v2.18.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o=
 github.com/Masterminds/sprig/v3 v3.0.0 h1:KSQz7Nb08/3VU9E4ns29dDxcczhOD1q7O1UfM4G3t3g=
@@ -64,6 +68,7 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF
 github.com/antonlindstrom/pgstore v0.0.0-20170604072116-a407030ba6d0 h1:e6PEaXbztY0ViaKotCICNnBQDUeNEJgrQ5UAHWlloh4=
 github.com/antonlindstrom/pgstore v0.0.0-20170604072116-a407030ba6d0/go.mod h1:2Ti6VUHVxpC0VSmTZzEvpzysnaGAfGBOoMIz5ykPyyw=
 github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77/go.mod h1:bXvGk6IkT1Agy7qzJ+DjIw/SJ1AaB3AvAuMDVV+Vkoo=
+github.com/arschles/assert v1.0.0 h1:NofQbRhtxcLgP+XoKunA7J6UMJNTqX7xR/19tej8UsA=
 github.com/arschles/assert v1.0.0/go.mod h1:m/u69zW43x0h8dTHcv3JJZljINyEYgBuf5fYJP6WikI=
 github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
@@ -287,6 +292,7 @@ github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e/go.mod h1:wJfORR
 github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
+github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U=
 github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
 github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
@@ -314,6 +320,7 @@ github.com/hashicorp/golang-lru v0.5.3 h1:YPkqC67at8FYaadspW/6uE0COsBxS2656RLEr8
 github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/helm/monocular v1.4.0 h1:g0sOpuMe+9u+aPfd9ZO8mWV+c8W0dfGyBG9Wl23nwec=
 github.com/helm/monocular v1.4.0/go.mod h1:PpkCN0v4zVVigsIHnsQdJytKFmaUkwfhxB7z33a9/gE=
+github.com/helm/monocular v1.10.0 h1:/tkbVH0+7GR2C4W2ODJGiVGXyHmYCa3vaBb5S+pz6bE=
 github.com/heptio/authenticator v0.3.0/go.mod h1:Q86X8hc61JXhE5XxYLKmrSRWby/Oe8IIYZIBgmGVkTA=
 github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40 h1:GT4RsKmHh1uZyhmTkWJTDALRjSHYQp6FRKrotf0zhAs=
 github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40/go.mod h1:NtmN9h8vrTveVQRLHcX2HQ5wIPBDCsZ351TGbZWgg38=
@@ -337,6 +344,7 @@ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV
 github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
@@ -347,10 +355,12 @@ github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQL
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a h1:VqeX/fehAB6FtBox0TVYcjOMXGE56INQIfbXegditX4=
 github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
@@ -486,7 +496,9 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 h1:hBSHahWMEgzwRyS6dRpxY0XyjZsHyQ61s084wo5PJe0=
 github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v0.0.0-20160503033757-d4c757aa9afd h1:ZDVcuZGxvWB1ooKj1e31P/ktQK4A2WumM+LucMENpds=
 github.com/smartystreets/goconvey v0.0.0-20160503033757-d4c757aa9afd/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
 github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
@@ -560,6 +572,8 @@ golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20191028145041-f83a4685e152/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9 h1:abxekknhS/Drh3uoQDk5Hc7BgeiyI39Crb7vhf/1j5s=
 golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM=
+golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -599,6 +613,7 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -682,6 +697,8 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 helm.sh/helm/v3 v3.0.0 h1:or/9cs1GgfcTQeEnR2CVJNw893/rmqIG1KsNHmUiSFw=
 helm.sh/helm/v3 v3.0.0/go.mod h1:sI7B9yfvMgxtTPMWdk1jSKJ2aa59UyP9qhPydqW6mgo=
@@ -693,6 +710,8 @@ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8
 k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/helm v2.16.1+incompatible h1:L+k810plJlaGWEw1EszeT4deK8XVaKxac1oGcuB+WDc=
 k8s.io/helm v2.16.1+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
+k8s.io/helm v2.16.10+incompatible h1:eFksERw3joHEL62TrcDX8I5fgEQJvit4qxxPXAkYTyQ=
+k8s.io/helm v2.16.10+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
 k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
diff --git a/src/jetstream/plugins/kubernetes/go.mod b/src/jetstream/plugins/kubernetes/go.mod
index ebeac9e5a1..e5d44dd87d 100644
--- a/src/jetstream/plugins/kubernetes/go.mod
+++ b/src/jetstream/plugins/kubernetes/go.mod
@@ -13,7 +13,6 @@ require (
 	github.com/ghodss/yaml v1.0.0
 	github.com/gorilla/websocket v1.4.0
 	github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect
-	github.com/helm/monocular/chartsvc v0.0.0-00010101000000-000000000000
 	github.com/heptio/authenticator v0.3.0 // indirect
 	github.com/kubernetes-sigs/aws-iam-authenticator v0.3.0
 	github.com/labstack/echo v3.3.10+incompatible
@@ -35,7 +34,6 @@ replace (
 	github.com/SermoDigital/jose => github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc
 	github.com/cloudfoundry-incubator/stratos/src/jetstream => ../..
 	github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309
-	github.com/helm/monocular/chartsvc => ../monocular/chartsvc
 	github.com/kubernetes-sigs/aws-iam-authenticator => github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc
 	github.com/russross/blackfriday v2.0.0+incompatible => github.com/russross/blackfriday v1.5.2
 	github.com/sergi/go-diff => github.com/sergi/go-diff v1.0.0
diff --git a/src/jetstream/plugins/kubernetes/install_release.go b/src/jetstream/plugins/kubernetes/install_release.go
index 575c0b7065..7998300c8b 100644
--- a/src/jetstream/plugins/kubernetes/install_release.go
+++ b/src/jetstream/plugins/kubernetes/install_release.go
@@ -3,7 +3,6 @@ package kubernetes
 import (
 	"bytes"
 	"encoding/json"
-	"errors"
 	"fmt"
 
 	"github.com/labstack/echo"
@@ -28,6 +27,7 @@ type installRequest struct {
 	Name              string `json:"releaseName"`
 	Namespace         string `json:"releaseNamespace"`
 	Values            string `json:"values"`
+	ChartURL          string `json:"chartUrl"`
 	Chart             struct {
 		Name       string `json:"chartName"`
 		Repository string `json:"repo"`
@@ -38,6 +38,7 @@ type installRequest struct {
 type upgradeRequest struct {
 	MonocularEndpoint string `json:"monocularEndpoint"`
 	Values            string `json:"values"`
+	ChartURL          string `json:"chartUrl"`
 	Chart             struct {
 		Name       string `json:"name"`
 		Repository string `json:"repo"`
@@ -46,11 +47,6 @@ type upgradeRequest struct {
 	RestartPods bool `json:"restartPods"`
 }
 
-// Monocular is a plugin for Monocular
-type Monocular interface {
-	GetChartDownloadUrl(monocularEndpoint, chartID, chartVersion string) (string, error)
-}
-
 // InstallRelease will install a Helm 3 release
 func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 	bodyReader := ec.Request().Body
@@ -63,7 +59,12 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 		return interfaces.NewJetstreamErrorf("Could not get Create Release Parameters: %v+", err)
 	}
 
-	chart, err := c.loadChart(params.MonocularEndpoint, params.Chart.Repository, params.Chart.Name, params.Chart.Version)
+	// Client must give us the download URL for the chart
+	if len(params.ChartURL) == 0 {
+		return interfaces.NewJetstreamErrorf("Client did not supply Chart download URL")
+	}
+
+	chart, err := c.loadChart(params.ChartURL)
 	if err != nil {
 		return interfaces.NewJetstreamErrorf("Could not load chart: %v+", err)
 	}
@@ -112,29 +113,8 @@ func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error {
 	return ec.JSON(200, release)
 }
 
-func (c *KubernetesSpecification) getChart(monocularEndpoint, chartID, version string) (string, error) {
-	helm := c.portalProxy.GetPlugin("monocular")
-	if helm == nil {
-		return "", errors.New("Could not find monocular plugin")
-	}
-
-	monocular, ok := helm.(Monocular)
-	if !ok {
-		return "", errors.New("Could not find monocular plugin interface")
-	}
-
-	return monocular.GetChartDownloadUrl(monocularEndpoint, chartID, version)
-}
-
 // Load the Helm chart for the given repository, name and version
-func (c *KubernetesSpecification) loadChart(monocularEndpoint, repo, name, version string) (*chart.Chart, error) {
-
-	chartID := fmt.Sprintf("%s/%s", repo, name)
-	downloadURL, err := c.getChart(monocularEndpoint, chartID, version)
-	if err != nil {
-		return nil, fmt.Errorf("Could not get the Download URL for the Helm Chart: %+v", err)
-	}
-
+func (c *KubernetesSpecification) loadChart(downloadURL string) (*chart.Chart, error) {
 	log.Debugf("Helm Chart Download URL: %s", downloadURL)
 
 	// NWM: Should we look up Helm Repository endpoint and use the value from that
@@ -218,6 +198,16 @@ func (c *KubernetesSpecification) UpgradeRelease(ec echo.Context) error {
 		return interfaces.NewJetstreamErrorf("Could not get Upgrade Release Parameters: %+v", err)
 	}
 
+	// Client must give us the download URL for the chart
+	if len(params.ChartURL) == 0 {
+		return interfaces.NewJetstreamErrorf("Client did not supply Chart download URL")
+	}
+
+	chart, err := c.loadChart(params.ChartURL)
+	if err != nil {
+		return interfaces.NewJetstreamErrorf("Could not load chart for upgrade: %+v", err)
+	}
+
 	config, hc, err := c.GetHelmConfiguration(endpointGUID, userGUID, namespace)
 	if err != nil {
 		return interfaces.NewJetstreamErrorf("Could not get Helm Configuration for endpoint: %+v", err)
@@ -225,11 +215,6 @@ func (c *KubernetesSpecification) UpgradeRelease(ec echo.Context) error {
 
 	defer hc.Cleanup()
 
-	chart, err := c.loadChart(params.MonocularEndpoint, params.Chart.Repository, params.Chart.Name, params.Chart.Version)
-	if err != nil {
-		return interfaces.NewJetstreamErrorf("Could not load chart for upgrade: %+v", err)
-	}
-
 	userSuppliedValues := map[string]interface{}{}
 	if err := yaml.Unmarshal([]byte(params.Values), &userSuppliedValues); err != nil {
 		// Could not parse the user's values
diff --git a/src/jetstream/plugins/monocular/20200819184800_ChartStore.go b/src/jetstream/plugins/monocular/20200819184800_ChartStore.go
new file mode 100644
index 0000000000..41ef1ebebf
--- /dev/null
+++ b/src/jetstream/plugins/monocular/20200819184800_ChartStore.go
@@ -0,0 +1,49 @@
+package monocular
+
+import (
+	"database/sql"
+
+	"bitbucket.org/liamstask/goose/lib/goose"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore"
+)
+
+func init() {
+	datastore.RegisterMigration(20200819184800, "HelmChartStore", func(txn *sql.Tx, conf *goose.DBConf) error {
+
+		createChartsTable := "CREATE TABLE IF NOT EXISTS helm_charts ("
+		createChartsTable += "endpoint            VARCHAR(64)  NOT NULL,"
+		createChartsTable += "name                VARCHAR(255) NOT NULL,"
+		createChartsTable += "repo_name           VARCHAR(255) NOT NULL,"
+		createChartsTable += "version             VARCHAR(64)  NOT NULL,"
+		createChartsTable += "created             TIMESTAMP    NOT NULL,"
+		createChartsTable += "app_version         VARCHAR(64)  NOT NULL,"
+		createChartsTable += "description         VARCHAR(255) NOT NULL,"
+		createChartsTable += "icon_url            VARCHAR(255) NOT NULL,"
+		createChartsTable += "chart_url           VARCHAR(255) NOT NULL,"
+		createChartsTable += "source_url          VARCHAR(255) NOT NULL,"
+		createChartsTable += "digest              VARCHAR(64)  NOT NULL,"
+		createChartsTable += "is_latest           BOOLEAN      NOT NULL DEFAULT FALSE,"
+		createChartsTable += "update_batch        VARCHAR(64)  NOT NULL,"
+		createChartsTable += "PRIMARY KEY (endpoint, name, version) );"
+
+		_, err := txn.Exec(createChartsTable)
+		if err != nil {
+			return err
+		}
+
+		createIndex := "CREATE INDEX helm_charts_endpoint ON helm_charts (endpoint, name, version);"
+		_, err = txn.Exec(createIndex)
+		if err != nil {
+			return err
+		}
+
+		createRepoIndex := "CREATE INDEX helm_charts_repository ON helm_charts (name, repo_name, version);"
+		_, err = txn.Exec(createRepoIndex)
+		if err != nil {
+			return err
+		}
+
+		return nil
+	})
+}
diff --git a/src/jetstream/plugins/monocular/README.md b/src/jetstream/plugins/monocular/README.md
deleted file mode 100644
index 956b10490c..0000000000
--- a/src/jetstream/plugins/monocular/README.md
+++ /dev/null
@@ -1,82 +0,0 @@
-# Syncing this subtree with the Monocular repo
-
-## Common Prerequisites 
-
-**NOTE:**
-
-The scripts do their best to fail gracefully. To avoid problems however, make sure the following pre-requisities are done before attempting. A CTRL-C in the middle of a run will likely require some cleanup.
-
-
-1. Ensure you have the monocular fork as a remote. e.g.
-
-```
-git remote add -f -t master stratos-monocular-fork git@github.com:cf-stratos/monocular.git
-```
-
-2. With a second remote it's useful to store remote refs separately in case of branch/tag collisions:
-
-```
-git config --add remote.stratos-monocular-fork.fetch 'refs/tags/*:refs/rtags/stratos-monocular-fork/*
-```
-
-## Before running the PULL script
-Follow these carefully. 
-
-1. Ensure you are on the branch you want to merge into.
-2. Ensure you have no unstaged or uncommitted changes
-3. `git status` should be clean
-
-## Before running the PUSH script
-1. Ensure that at least one pull haa been made already
-2. Ensure the monocular target branch exists and has been pushed to its monocular remote
-3. Ensure you have no unstaged or uncommitted changes.
-4. `git status` should be clean.
-
-## Running the scripts..
-
-Both scripts, when run either without arguments or with the `-h` flag, will show usage instructions.
-
-### PULL script:
-
-This pulls the subtree from monocular repo under `/cmd` into the stratos repo under `/src/jetstream/plugins/monocular`
-
-Usage:
-
-```
-git-pull-downstream.sh -f <MONOCULAR_FORK> [ -b <MONOCULAR_BRANCH>  | -r <MONOCULAR_REF> ]
--f MONOCULAR_FORK         The upstream (monocular) repo"
--b MONOCULAR_BRANCH       The upstream branch to pull from" >&1
--r MONOCULAR_REF          The upsream ref to pull from (e.g. tag or SHA1)
-```
-
-e.g.
-
-```
-./git-pull-downstream.sh -f stratos-monocular-fork -b master
-```
-
-#### To pull a tag:
-The tag should be specufied as : `refs/rtags/stratos-monocular-fork/<tag>`
-
-e.g.
-
-```
-./git-pull-downstream.sh -f stratos-monocular-fork -r refs/rtags/stratos-monocular-fork/v1.4.0
-```
-
-
-### PUSH script:
-Usage: 
-
-```
-git-push-upstream.sh -f <MONOCULAR_FORK> -t <MONOCULAR_BRANCH> -s <STRATOS_SOURCE_BRANCH> ]
--f MONOCULAR_FORK         The upstream (monocular) repo to push to"
--t MONOCULAR_BRANCH       The target (monocular) upstream branch to push to
--s STRATOS_SOURCE_BRANCH  The source stratos branch containing the changes
-```
-
-e.g. 
-
-```
-./git-push-upstream.sh -f stratos-monocular-fork -t feature-branch -s dummy-master
-```
\ No newline at end of file
diff --git a/src/jetstream/plugins/monocular/README.txt b/src/jetstream/plugins/monocular/README.txt
deleted file mode 100644
index 149af612ae..0000000000
--- a/src/jetstream/plugins/monocular/README.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-### Run chart repo in serve mode WITH TLS ###
-### Modify the bind mounts according to location of certs on your system
-
-docker run -p 8080:8080 --rm -e -ti --network=host -v ~/dev/git/fdb-doclayer-fork/packaging/docker/testcerts:/etc/tlscerts kreinecke/suse-fdb-chart-repo:latest /chartrepo serve --doclayer-url=mongodb://localhost:27016 stable https://kubernetes-charts.storage.googleapis.com --cafile /etc/tlscerts/ca.crt --certfile /etc/tlscerts/client.crt --keyfile /etc/tlscerts/client.key --debug
-
-To test sync and status fetch:
-curl -X PUT -H "Content-Type: application/json" -d '{"repoURL":"https://kubernetes-charts.storage.googleapis.com"}' http://localhost:8080/v1/sync/stable
-
-curl -X GET http://localhost:8080/v1/status/stable
-
-
-### TLS Currently not optional, but for reference, use command below if making optional in future ###
-docker run -p 8080:8080 --rm -e -ti --network=host kreinecke/suse-fdb-chart-repo:latest /chartrepo serve --doclayer-url=mongodb://192.168.57.1:27016 stable https://kubernetes-charts.storage.googleapis.com
diff --git a/src/jetstream/plugins/monocular/cache.go b/src/jetstream/plugins/monocular/cache.go
new file mode 100644
index 0000000000..6e38df02ec
--- /dev/null
+++ b/src/jetstream/plugins/monocular/cache.go
@@ -0,0 +1,341 @@
+package monocular
+
+import (
+	"archive/tar"
+	"compress/gzip"
+	"crypto/sha256"
+	"encoding/hex"
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+	"os"
+	"path"
+	"path/filepath"
+	"strings"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/monocular/store"
+	log "github.com/sirupsen/logrus"
+	yaml "gopkg.in/yaml.v2"
+)
+
+// Local Helm Chart Cache
+
+// A local file cache stores chart files
+// We only download the files for the latest version - other versions are downloaded on demand
+// Within the cache there is a folder for each endpoint (helm repository) and under each of those
+// a folder for each chart with chart files in ana a digest tag file
+
+// If there are multiple Stratos backends, then each maintains its own cache
+
+// The Chart index is stored in the database
+
+const digestFilename = "digest"
+
+// deleteCacheForEndpoint will delete all cached files for the given endpoint
+func (m *Monocular) deleteCacheForEndpoint(endpointID string) error {
+	endpointCacheFolder := path.Join(m.CacheFolder, endpointID)
+	return os.RemoveAll(endpointCacheFolder)
+}
+
+// cacheCharts will cache charts in the local folder cache
+func (m *Monocular) cacheCharts(charts []store.ChartStoreRecord) error {
+
+	var errorCount = 0
+	log.Debug("Cacheing charts")
+	for _, chart := range charts {
+		log.Debugf("Processing: %s", chart.Name)
+		if err := m.cacheChart(chart); err != nil {
+			errorCount++
+			log.Warnf("Error cacheing chart: %s - %+v", chart.Name, err)
+		}
+		if _, err := m.cacheChartIcon(chart); err != nil {
+			errorCount++
+			log.Warnf("Error cacheing chart icon: %s - %+v", chart.Name, err)
+		}
+
+	}
+	if errorCount > 0 {
+		return errors.New("Error(s) occurred caching charts")
+	}
+
+	return nil
+}
+
+// Get the cache folder path for a chart
+func (m *Monocular) getChartCacheFolder(chart store.ChartStoreRecord) string {
+	filename := fmt.Sprintf("%s_%s", chart.Name, chart.Version)
+	return path.Join(m.CacheFolder, chart.EndpointID, filename)
+}
+
+// cleanCacheFiles will Clean all files in the folder for an endpoint that are not referenced by any of the charts we have for that endpoint
+func (m *Monocular) cleanCacheFiles(endpointID string, allCharts []store.ChartStoreRecord) error {
+
+	// Build map of the valid chart folder names
+	validFiles := make(map[string]bool)
+	for _, chart := range allCharts {
+		validFiles[m.getChartCacheFolder(chart)] = true
+	}
+
+	endpointCacheFolder := path.Join(m.CacheFolder, endpointID)
+	// Don't delete the top-level cache folder for the endpoint
+	validFiles[endpointCacheFolder] = true
+	errorCount := 0
+	filepath.Walk(endpointCacheFolder, func(path string, info os.FileInfo, err error) error {
+		if err == nil && info.IsDir() {
+			if _, ok := validFiles[path]; !ok {
+				// Filename does not exist in the map of valid file names
+				log.Debugf("Need to delete unused cache folder: %s", path)
+				if err := os.RemoveAll(path); err != nil {
+					log.Errorf("Could not delete folder %s - %+v", path, err)
+					errorCount++
+				}
+			}
+		}
+		return nil
+	})
+
+	if errorCount > 0 {
+		return fmt.Errorf("Error(s) occurred cleaning unused folders from the cache folder for endpoint %s", endpointID)
+	}
+
+	return nil
+}
+
+// Is there a chart digest in the given folder with the given value?
+func hasDigestFile(chartCachePath, digest string) bool {
+	data, err := ioutil.ReadFile(path.Join(chartCachePath, digestFilename))
+	if err == nil {
+		chk := strings.TrimSpace(string(data))
+		return chk == digest
+	}
+
+	return false
+}
+
+// write the chart digest to a file
+func writeDigestFile(chartCachePath, digest string) error {
+	return ioutil.WriteFile(path.Join(chartCachePath, digestFilename), []byte(digest), 0644)
+}
+
+func (m *Monocular) getChartYaml(chart store.ChartStoreRecord) *ChartMetadata {
+
+	// Cache the Chart if we don't have it already
+	m.cacheChart(chart)
+
+	chartCacheYamlPath := path.Join(m.getChartCacheFolder(chart), "Chart.yaml")
+	if _, err := os.Stat(chartCacheYamlPath); os.IsNotExist(err) {
+		return nil
+	}
+
+	// Check we can unmarshall the request
+	data, err := ioutil.ReadFile(chartCacheYamlPath)
+	if err != nil {
+		return nil
+	}
+
+	// Parse as yaml
+	var chartYaml ChartMetadata
+	err = yaml.Unmarshal(data, &chartYaml)
+	if err != nil {
+		return nil
+	}
+	return &chartYaml
+}
+
+// Get the cache file path for the chart icon
+func (m *Monocular) getIconCacheFile(chart store.ChartStoreRecord) string {
+	ext := ""
+	u, err := url.Parse(chart.IconURL)
+	if err == nil {
+		parts := strings.Split(u.Path, "/")
+		filename := parts[len(parts)-1]
+		index := strings.LastIndex(filename, ".")
+		if index != -1 {
+			ext = filename[index:]
+		}
+	}
+
+	filename := fmt.Sprintf("icon%s", ext)
+	return path.Join(m.getChartCacheFolder(chart), filename)
+}
+
+func (m *Monocular) ensureFolder(path string) error {
+	if _, err := os.Stat(path); os.IsNotExist(err) {
+		return os.MkdirAll(path, os.ModePerm)
+	}
+
+	return nil
+}
+
+// Cache chart
+// Check to see if we already have files for the given chart - if not, download the archive
+// and extract the files we need:
+// Chart.yaml, README.md, values.yaml, values.schema.json
+// Download the icon as well
+func (m *Monocular) cacheChart(chart store.ChartStoreRecord) error {
+	log.Debugf("Cacheing chart: %s, %s", chart.Name, chart.Version)
+
+	chartCachePath := m.getChartCacheFolder(chart)
+	if err := m.ensureFolder(chartCachePath); err != nil {
+		log.Warnf("Could not create folder for chart downloads: %+v", err)
+		return err
+	}
+
+	// Check to see if we have the same digest
+	if ok := hasDigestFile(chartCachePath, chart.Digest); ok {
+		log.Debug("Skipping download - already have archive with the same digest")
+		return nil
+	}
+
+	archiveFile := path.Join(chartCachePath, "chart.tgz")
+	if err := m.downloadFile(archiveFile, chart.ChartURL); err != nil {
+		return fmt.Errorf("Could not download chart from: %s - %+v", chart.ChartURL, err)
+	}
+
+	sum, err := getFileChecksum(archiveFile)
+	if err != nil {
+		return fmt.Errorf("Could not calculate checksum for chart archive: %s - %+v", archiveFile, err)
+	}
+
+	if err := writeDigestFile(chartCachePath, sum); err != nil {
+		return fmt.Errorf("Could not write chart digest file in: %s - %+v", chartCachePath, err)
+	}
+
+	// Now extract the files we need
+	filenames := []string{"Chart.yaml", "README.md", "values.schema.json", "values.yaml"}
+	if err := extractArchiveFiles(archiveFile, chart.Name, chartCachePath, filenames); err != nil {
+		return fmt.Errorf("Could not extract files from chart archive: %s - %+v", archiveFile, err)
+	}
+
+	// We can delete the Chart archive - don't need it anymore
+	os.Remove(archiveFile)
+
+	return nil
+}
+
+// Cache a chart icon
+func (m *Monocular) cacheChartIcon(chart store.ChartStoreRecord) (string, error) {
+	log.Debugf("Cacheing chart icon: %s, %s", chart.Name, chart.Version)
+	if len(chart.IconURL) > 0 {
+		log.Debugf("Downloading chart icon: %s", chart.IconURL)
+		// If icon file already exists then don't download again
+		iconFilePath := m.getIconCacheFile(chart)
+		if _, err := os.Stat(iconFilePath); os.IsNotExist(err) {
+			if err := m.ensureFolder(path.Dir(iconFilePath)); err != nil {
+				log.Error(err)
+			} else if err := m.downloadFile(iconFilePath, chart.IconURL); err != nil {
+				log.Errorf("Could not download chart icon: %+v", err)
+				return "", fmt.Errorf("Could not download Chart icon: %+v", err)
+			}
+		}
+		return iconFilePath, nil
+	}
+
+	return "", nil
+}
+
+// download a file form the given url sand save to the file path
+func (m *Monocular) downloadFile(filepath string, url string) error {
+	// Get the data
+	httpClient := m.portalProxy.GetHttpClient(false)
+	resp, err := httpClient.Get(url)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("Error downloading icon: %s - %d:%s", url, resp.StatusCode, resp.Status)
+	}
+
+	// Create the file
+	out, err := os.Create(filepath)
+	if err != nil {
+		return err
+	}
+	defer out.Close()
+
+	// Write the body to file
+	_, err = io.Copy(out, resp.Body)
+	return err
+}
+
+func extractArchiveFiles(archivePath, chartName, downloadFolder string, filenames []string) error {
+	// Map the filenames array into a map of path to destination file
+	requiredFiles := make(map[string]string)
+	requiredCount := len(filenames)
+	for _, name := range filenames {
+		requiredFiles[fmt.Sprintf("%s/%s", chartName, name)] = path.Join(downloadFolder, name)
+	}
+
+	f, err := os.Open(archivePath)
+	if err != nil {
+		log.Error("Helm: Archive extract file: Could not open file %s - %+v", archivePath, err)
+		return err
+	}
+	defer f.Close()
+
+	gzf, err := gzip.NewReader(f)
+	if err != nil {
+		log.Error("Helm: Archive extract file: Could not open zip file %s - %+v", archivePath, err)
+		return err
+	}
+
+	tarReader := tar.NewReader(gzf)
+	for {
+		header, err := tarReader.Next()
+		if err == io.EOF {
+			break
+		}
+
+		if err != nil {
+			log.Error("Helm: Archive extract file: Could not process archive file %s - %+v", archivePath, err)
+			return err
+		}
+
+		name := header.Name
+		switch header.Typeflag {
+		case tar.TypeDir:
+			continue
+		case tar.TypeReg:
+			// Is this a file we are looking for?
+			if downloadPath, ok := requiredFiles[name]; ok {
+				// Create the file
+				out, err := os.Create(downloadPath)
+				if err != nil {
+					return err
+				}
+				defer out.Close()
+
+				io.Copy(out, tarReader)
+
+				// If we have extracted all of the files we are looking for, then return early, rather than
+				// going through the rest of the files
+				requiredCount--
+				if requiredCount == 0 {
+					return nil
+				}
+			}
+		}
+	}
+
+	return nil
+}
+
+// get the SHA256 checksum for a file
+func getFileChecksum(file string) (string, error) {
+	f, err := os.Open(file)
+	if err != nil {
+		return "", err
+	}
+	defer f.Close()
+	hasher := sha256.New()
+	if _, err := io.Copy(hasher, f); err != nil {
+		return "", err
+	}
+
+	return hex.EncodeToString(hasher.Sum(nil)), nil
+}
diff --git a/src/jetstream/plugins/monocular/chart-repo/.gitignore b/src/jetstream/plugins/monocular/chart-repo/.gitignore
deleted file mode 100644
index 253eef939d..0000000000
--- a/src/jetstream/plugins/monocular/chart-repo/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-chart-repo-sync
diff --git a/src/jetstream/plugins/monocular/chart-repo/Dockerfile b/src/jetstream/plugins/monocular/chart-repo/Dockerfile
deleted file mode 100644
index ac5d67a440..0000000000
--- a/src/jetstream/plugins/monocular/chart-repo/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM splatform/stratos-bk-build-base:leap15_1 as builder
-
-COPY --chown=stratos:users . /go/src/github.com/helm/monocular
-WORKDIR /go/src/github.com/helm/monocular
-ARG VERSION
-RUN GO111MODULE=on GOPROXY=https://gocenter.io CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-X main.version=$VERSION" .
-
-FROM splatform/stratos-bk-base:leap15_1
-#COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY --from=builder /go/src/github.com/helm/monocular/chartrepo /chartrepo
-USER 1001
-CMD ["/chartrepo"]
diff --git a/src/jetstream/plugins/monocular/chart-repo/Makefile b/src/jetstream/plugins/monocular/chart-repo/Makefile
deleted file mode 100644
index 42140b79a8..0000000000
--- a/src/jetstream/plugins/monocular/chart-repo/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-IMAGE_REPO ?= docker.io/kreinecke/suse-fdb-chart-repo-tls
-IMAGE_TAG ?= latest
-# Version of the binary to be produced
-VERSION ?= $$(git rev-parse HEAD)
-
-docker-build:
-	# We use the context of the root dir
-	docker build --pull --rm -t ${IMAGE_REPO}:${IMAGE_TAG} --build-arg "VERSION=${VERSION}" -f Dockerfile .
diff --git a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go b/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
deleted file mode 100644
index 8040e204b2..0000000000
--- a/src/jetstream/plugins/monocular/chart-repo/api_endpoint.go
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
-Copyright (c) 2017 The Helm Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"context"
-	"crypto/tls"
-	"crypto/x509"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"time"
-
-	"github.com/google/uuid"
-	"github.com/gorilla/mux"
-	"github.com/heptiolabs/healthcheck"
-	log "github.com/sirupsen/logrus"
-	"github.com/urfave/negroni"
-	"go.mongodb.org/mongo-driver/mongo/options"
-
-	"github.com/helm/monocular/chartrepo/common"
-	fdb "github.com/helm/monocular/chartrepo/foundationdb"
-)
-
-const pathPrefix = "/v1"
-
-var fdbClient fdb.Client
-var fDBName string
-var authorizationHeader string
-
-// Params a key-value map of path params
-type Params map[string]string
-
-// WithParams can be used to wrap handlers to take an extra arg for path params
-type WithParams func(http.ResponseWriter, *http.Request, Params)
-
-func (h WithParams) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	vars := mux.Vars(req)
-	h(w, req, vars)
-}
-
-func setupRoutes() http.Handler {
-	r := mux.NewRouter()
-
-	// Healthcheck
-	health := healthcheck.NewHandler()
-	r.Handle("/live", health)
-	r.Handle("/ready", health)
-
-	// Routes
-	apiv1 := r.PathPrefix(pathPrefix).Subrouter()
-	apiv1.Methods("PUT").Path("/sync/{repo}").Handler(WithParams(OnDemandSync))
-	apiv1.Methods("PUT").Path("/delete/{repo}").Handler(WithParams(OnDemandDelete))
-	apiv1.Methods("GET").Path("/status/{repo}").Handler(WithParams(RepoSyncStatus))
-
-	n := negroni.Classic()
-	n.UseHandler(r)
-	return n
-}
-
-func OnDemandSync(w http.ResponseWriter, req *http.Request, params Params) {
-
-	//Running in serve mode, we dont want to close the db client connection after a request
-	var clientKeepAlive = true
-
-	type syncParams struct {
-		RepoURL string `json:"repoURL"`
-	}
-
-	repoName := params["repo"]
-	if repoName == "" {
-		err := fmt.Errorf("No Repository name provided in request for Sync action.")
-		log.Error(err.Error())
-		w.Header().Set("Server", "ChartRepo (On-Demand)")
-		http.Error(w, err.Error(), http.StatusBadRequest)
-		return
-	}
-
-	var status string
-	//If this repo is already syncing, don't start another sync, but return in progress response
-	//Ignore error return value when fetching status - we don't care if the repo does not exist yet
-	currentRepoStatus, _ := fdb.GetRepoSyncStatus(repoName)
-	activeSyncJob := currentRepoStatus.Status == common.SyncStatusInProgress || currentRepoStatus.Status == common.SyncStatusInProgress
-	if activeSyncJob {
-		status = common.SyncStatusInProgress
-	} else {
-
-		dec := json.NewDecoder(req.Body)
-		var url syncParams
-		if err := dec.Decode(&url); err != nil {
-			log.Error(err.Error())
-			w.Header().Set("Server", "ChartRepo (On-Demand)")
-			http.Error(w, "Error decoding sync request repository URL: "+err.Error(), http.StatusBadRequest)
-			return
-		}
-
-		repoURL := url.RepoURL
-
-		if repoURL == "" {
-			err := fmt.Errorf("No Repository URL provided in request for Sync action.")
-			log.Error(err.Error())
-			w.Header().Set("Server", "ChartRepo (On-Demand)")
-			http.Error(w, err.Error(), http.StatusBadRequest)
-			return
-		}
-
-		go fdb.SyncRepo(fdbClient, fDBName, repoName, repoURL, authorizationHeader, clientKeepAlive)
-
-		status = common.SyncStatusInProgress
-	}
-
-	requestUUID, err := uuid.NewUUID()
-
-	//Return sync status in response
-	response := common.SyncJobStatusResponse{requestUUID.String(), status}
-	js, err := json.Marshal(response)
-	if err != nil {
-		log.Error(err.Error())
-		w.Header().Set("Server", "ChartRepo (On-Demand)")
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-	w.Header().Set("Server", "ChartRepo (On-Demand)")
-	w.Write(js)
-}
-
-func OnDemandDelete(w http.ResponseWriter, req *http.Request, params Params) {
-	repoName := params["repo"]
-	requestUUID, err := uuid.NewUUID()
-	if repoName == "" {
-		err := fmt.Errorf("No Repository name provided in request for Delete action.")
-		log.Error(err.Error())
-		w.Header().Set("Server", "ChartRepo (On-Demand)")
-		http.Error(w, err.Error(), http.StatusBadRequest)
-	}
-
-	var status string
-	currentRepoStatus, err := fdb.GetRepoSyncStatus(repoName)
-	if err != nil {
-		log.Errorf("Request: requestUUID, %v", err.Error())
-		w.Header().Set("Server", "ChartRepo (On-Demand)")
-		http.Error(w, err.Error(), http.StatusNotFound)
-		return
-	}
-	//If this repo is already being deleted, don't start another delete, but return in progress response
-	activeDeleteJob := currentRepoStatus.Status == common.DeleteStatusInProgress || currentRepoStatus.Status == common.DeleteStatusInProgress
-	if activeDeleteJob {
-		status = common.DeleteStatusInProgress
-	} else {
-
-		//Running in serve mode, we dont want to close the db client connection after a request
-		var clientKeepAlive = true
-
-		go fdb.DeleteRepo(fdbClient, fDBName, repoName, clientKeepAlive)
-		status = common.DeleteStatusInProgress
-	}
-
-	//Return delete status in response
-
-	response := common.DeleteJobStatusResponse{requestUUID.String(), status}
-	js, err := json.Marshal(response)
-	if err != nil {
-		log.Error(err.Error())
-		w.Header().Set("Server", "ChartRepo (On-Demand)")
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-	w.Header().Set("Server", "ChartRepo (On-Demand)")
-	w.Write(js)
-}
-
-func RepoSyncStatus(w http.ResponseWriter, req *http.Request, params Params) {
-	repoName := params["repo"]
-	if repoName == "" {
-		log.Fatal("No Repository name provided in request for sync status.")
-	}
-
-	requestUUID, err := uuid.NewUUID()
-	status, err := fdb.GetRepoSyncStatus(repoName)
-	if err != nil {
-		log.Errorf("Request: requestUUID, %v, %v", requestUUID, err.Error())
-		w.Header().Set("Server", "ChartRepo (On-Demand)")
-		http.Error(w, err.Error(), http.StatusNotFound)
-		return
-	}
-
-	response := common.SyncJobStatusResponse{
-		UUID:   requestUUID.String(),
-		Status: status.Status,
-	}
-	js, err := json.Marshal(response)
-	if err != nil {
-		log.Errorf("Request: requestUUID, %v, %v", requestUUID, err.Error())
-		w.Header().Set("Server", "ChartRepo (On-Demand)")
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-	w.Header().Set("Server", "ChartRepo (On-Demand)")
-	w.Write(js)
-}
-
-func RepoDeleteStatus(w http.ResponseWriter, req *http.Request, params Params) {
-	repoName := params["repo"]
-	if repoName == "" {
-		log.Fatal("No Repository name provided in request for delete status.")
-	}
-
-	requestUUID, err := uuid.NewUUID()
-	status, err := fdb.GetRepoDeleteStatus(repoName)
-	if err != nil {
-		log.Errorf("Request: requestUUID, %v", err.Error())
-		w.Header().Set("Server", "ChartRepo (On-Demand)")
-		http.Error(w, err.Error(), http.StatusNotFound)
-		return
-	}
-
-	response := common.DeleteJobStatusResponse{requestUUID.String(), status.Status}
-	js, err := json.Marshal(response)
-	if err != nil {
-		log.Errorf("Request: requestUUID, %v", err.Error())
-		w.Header().Set("Server", "ChartRepo (On-Demand)")
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-	w.Header().Set("Server", "ChartRepo (On-Demand)")
-	w.Write(js)
-}
-
-func initOnDemandEndpoint(fdbURL string, fdbName string, tlsEnabled bool, caCertFile string, certFile string, keyFile string, authHeader string, debug bool) {
-
-	authorizationHeader = authHeader
-	fDBName = fdbName
-
-	if debug {
-		log.SetLevel(log.DebugLevel)
-	}
-
-	InitFDBDocLayerConnection(&fdbURL, &fdbName, &tlsEnabled, &caCertFile, &certFile, &keyFile, &debug)
-
-	n := setupRoutes()
-
-	port := os.Getenv("PORT")
-	if port == "" {
-		port = "8080"
-	}
-	addr := ":" + port
-	log.Infof("On-Demand endpoint listening on: %v", addr)
-	if tlsEnabled {
-		log.Infof("TLS is enabled.")
-	} else {
-		log.Infof("TLS is disabled.")
-	}
-	http.ListenAndServe(addr, n)
-}
-
-func InitFDBDocLayerConnection(fdbURL *string, fDB *string, tlsEnabled *bool, CAFile *string, certFile *string, keyFile *string, debug *bool) {
-
-	log.Debugf("Attempting to connect to FDB: %v, %v, debug: %v", *fdbURL, *fDB, *debug)
-
-	var tlsConfig *tls.Config
-
-	if *tlsEnabled {
-		//Load CA Cert from file here
-		CA, err := ioutil.ReadFile(*CAFile) // just pass the file name
-		if err != nil {
-			log.Fatalf("Cannot load CA certificate from file: %v.", err)
-			return
-		}
-		CACert := x509.NewCertPool()
-		ok := CACert.AppendCertsFromPEM([]byte(CA))
-		if !ok {
-			log.Fatalf("Cannot append CA certificate to certificate pool.")
-			return
-		}
-		//Now load the key pair and create tls options struct
-		clientKeyPair, err := tls.LoadX509KeyPair(*certFile, *keyFile)
-		if err != nil {
-			log.Fatalf("Cannot load server keypair: %v", err)
-			return
-		}
-
-		tlsConfig = &tls.Config{RootCAs: CACert, Certificates: []tls.Certificate{clientKeyPair}}
-	}
-
-	//Init client options and open connection
-	clientOptions := options.Client().ApplyURI(*fdbURL).SetMinPoolSize(10).SetMaxPoolSize(100)
-	if *tlsEnabled {
-		clientOptions.SetTLSConfig(tlsConfig)
-	}
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-	client, err := fdb.NewDocLayerClient(ctx, clientOptions)
-	fdbClient = client
-	if err != nil {
-		log.Fatalf("Can't create client for FoundationDB document layer: %v. URL provided was: %v", err, *fdbURL)
-		return
-	}
-	log.Debugf("FDB Document Layer client created.")
-}
diff --git a/src/jetstream/plugins/monocular/chart-repo/chart_repo.go b/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
deleted file mode 100644
index ec917468d8..0000000000
--- a/src/jetstream/plugins/monocular/chart-repo/chart_repo.go
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-Copyright (c) 2018 The Helm Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"os"
-
-	"github.com/helm/monocular/chartrepo/utils"
-
-	"github.com/spf13/cobra"
-)
-
-var rootCmd = &cobra.Command{
-	Use:   "chart-repo",
-	Short: "Chart Repository utility",
-	Run: func(cmd *cobra.Command, args []string) {
-		cmd.Help()
-	},
-}
-
-func main() {
-	cmd := rootCmd
-	if err := cmd.Execute(); err != nil {
-		os.Exit(1)
-	}
-}
-
-func init() {
-
-	cmds := []*cobra.Command{SyncCmd, DeleteCmd, ServeCmd}
-
-	for _, cmd := range cmds {
-		rootCmd.AddCommand(cmd)
-
-		//Flags for optional FoundationDB + Document Layer backend
-		cmd.Flags().String("doclayer-url", "mongodb://dev-fdbdoclayer/27016", "FoundationDB Document Layer URL")
-		cmd.Flags().String("doclayer-database", "monocular-plugin", "FoundationDB Document-Layer database")
-
-		//Flags for Serve-Mode TLS
-		cmd.Flags().Bool("tls", false, "Enable Mutual TLS")
-		cmd.Flags().String("cafile", "", "Path to CA certificate to use for client verification.")
-		cmd.Flags().String("certfile", "", "Path to TLS certificate.")
-		cmd.Flags().String("keyfile", "", "Path to TLS key.")
-
-		// see version.go
-		cmd.Flags().StringVarP(&utils.UserAgentComment, "user-agent-comment", "", "", "UserAgent comment used during outbound requests")
-		cmd.Flags().Bool("debug", false, "verbose logging")
-	}
-	rootCmd.AddCommand(utils.VersionCmd)
-}
diff --git a/src/jetstream/plugins/monocular/chart-repo/common/chart_utils.go b/src/jetstream/plugins/monocular/chart-repo/common/chart_utils.go
deleted file mode 100644
index 0a7298c0e2..0000000000
--- a/src/jetstream/plugins/monocular/chart-repo/common/chart_utils.go
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
-Copyright (c) 2019 The Helm Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package common
-
-import (
-	"archive/tar"
-	"bytes"
-	"crypto/sha256"
-	"crypto/tls"
-	"crypto/x509"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"os"
-	"path"
-	"strings"
-	"time"
-
-	"github.com/helm/monocular/chartrepo/utils"
-
-	"github.com/ghodss/yaml"
-	"github.com/jinzhu/copier"
-	log "github.com/sirupsen/logrus"
-	helmrepo "k8s.io/helm/pkg/repo"
-)
-
-//ParseRepoURL parses a repo URL string into a URL
-func ParseRepoURL(repoURL string) (*url.URL, error) {
-	repoURL = strings.TrimSpace(repoURL)
-	return url.ParseRequestURI(repoURL)
-}
-
-//FetchRepoIndex fetches the index.yaml for a repository
-func FetchRepoIndex(r Repo, netClient HTTPClient) ([]byte, error) {
-	indexURL, err := ParseRepoURL(r.URL)
-	if err != nil {
-		log.WithFields(log.Fields{"url": r.URL}).WithError(err).Error("failed to parse URL")
-		return nil, err
-	}
-	indexURL.Path = path.Join(indexURL.Path, "index.yaml")
-	req, err := http.NewRequest("GET", indexURL.String(), nil)
-	if err != nil {
-		log.WithFields(log.Fields{"url": req.URL.String()}).WithError(err).Error("could not build repo index request")
-		return nil, err
-	}
-
-	req.Header.Set("User-Agent", utils.UserAgent())
-	if len(r.AuthorizationHeader) > 0 {
-		req.Header.Set("Authorization", r.AuthorizationHeader)
-	}
-
-	res, err := netClient.Do(req)
-	if res != nil {
-		defer res.Body.Close()
-	}
-	if err != nil {
-		log.WithFields(log.Fields{"url": req.URL.String()}).WithError(err).Error("error requesting repo index")
-		return nil, err
-	}
-
-	if res.StatusCode != http.StatusOK {
-		log.WithFields(log.Fields{"url": req.URL.String(), "status": res.StatusCode}).Error("error requesting repo index, are you sure this is a chart repository?")
-		return nil, errors.New("repo index request failed")
-	}
-
-	body, err := ioutil.ReadAll(res.Body)
-	if err != nil {
-		return nil, err
-	}
-	return body, nil
-}
-
-//ParseRepoIndex parses a repository index into an IndexFile
-func ParseRepoIndex(body []byte) (*helmrepo.IndexFile, error) {
-	var index helmrepo.IndexFile
-	err := yaml.Unmarshal(body, &index)
-	if err != nil {
-		return nil, err
-	}
-	index.SortEntries()
-	return &index, nil
-}
-
-//ChartsFromIndex creates an array of Charts from a Repository IndexFile
-//Deprecated charts are skipped
-func ChartsFromIndex(index *helmrepo.IndexFile, r Repo) []Chart {
-	var charts []Chart
-	for _, entry := range index.Entries {
-		if entry[0].GetDeprecated() {
-			log.WithFields(log.Fields{"name": entry[0].GetName()}).Info("skipping deprecated chart")
-			continue
-		}
-		charts = append(charts, NewChart(entry, r))
-	}
-	return charts
-}
-
-// NewChart Takes an entry from the index and constructs a database representation of the
-// object.
-func NewChart(entry helmrepo.ChartVersions, r Repo) Chart {
-	var c Chart
-	copier.Copy(&c, entry[0])
-	copier.Copy(&c.ChartVersions, entry)
-	c.Repo = r
-	c.ID = fmt.Sprintf("%s/%s", r.Name, c.Name)
-	return c
-}
-
-//ExtractFilesFromTarball extracts the specified files from a tarball into a map
-func ExtractFilesFromTarball(filenames []string, tarf *tar.Reader) (map[string]string, error) {
-	ret := make(map[string]string)
-	for {
-		header, err := tarf.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return ret, err
-		}
-
-		for _, f := range filenames {
-			if strings.EqualFold(header.Name, f) {
-				var b bytes.Buffer
-				io.Copy(&b, tarf)
-				ret[f] = string(b.Bytes())
-				break
-			}
-		}
-	}
-	return ret, nil
-}
-
-//ChartTarballURL returns the URL for a given chart version
-func ChartTarballURL(r Repo, cv ChartVersion) string {
-	source := cv.URLs[0]
-	if _, err := ParseRepoURL(source); err != nil {
-		// If the chart URL is not absolute, join with repo URL. It's fine if the
-		// URL we build here is invalid as we can catch this error when actually
-		// making the request
-		u, _ := url.Parse(r.URL)
-		u.Path = path.Join(u.Path, source)
-		return u.String()
-	}
-	return source
-}
-
-// InitNetClient configures an HTTP client for making requests to repositories
-func InitNetClient(additionalCA string, timeoutSeconds time.Duration) (*http.Client, error) {
-	// Get the SystemCertPool, continue with an empty pool on error
-	caCertPool, _ := x509.SystemCertPool()
-	if caCertPool == nil {
-		caCertPool = x509.NewCertPool()
-	}
-
-	// If additionalCA exists, load it
-	if _, err := os.Stat(additionalCA); !os.IsNotExist(err) {
-		certs, err := ioutil.ReadFile(additionalCA)
-		if err != nil {
-			return nil, fmt.Errorf("Failed to append %s to RootCAs: %v", additionalCA, err)
-		}
-
-		// Append our cert to the system pool
-		if ok := caCertPool.AppendCertsFromPEM(certs); !ok {
-			return nil, fmt.Errorf("Failed to append %s to RootCAs", additionalCA)
-		}
-	}
-
-	// Return Transport for testing purposes
-	return &http.Client{
-		Timeout: time.Second * timeoutSeconds,
-		Transport: &http.Transport{
-			TLSClientConfig: &tls.Config{
-				RootCAs: caCertPool,
-			},
-			Proxy: http.ProxyFromEnvironment,
-		},
-	}, nil
-}
-
-//GetSha256 generates a SHA 256 hash for a given byte array
-func GetSha256(src []byte) (string, error) {
-	f := bytes.NewReader(src)
-	h := sha256.New()
-	if _, err := io.Copy(h, f); err != nil {
-		return "", err
-	}
-	return fmt.Sprintf("%x", h.Sum(nil)), nil
-}
diff --git a/src/jetstream/plugins/monocular/chart-repo/common/types.go b/src/jetstream/plugins/monocular/chart-repo/common/types.go
deleted file mode 100644
index a1fa3a4076..0000000000
--- a/src/jetstream/plugins/monocular/chart-repo/common/types.go
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-Copyright (c) 2019 The Helm Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package common
-
-import (
-	"net/http"
-	"sync"
-	"time"
-)
-
-//Repo holds information to identify a repository
-type Repo struct {
-	Name                string
-	URL                 string
-	AuthorizationHeader string `bson:"-"`
-}
-
-//Maintainer describes the maintainer of a Chart
-type Maintainer struct {
-	Name  string
-	Email string
-}
-
-//Chart holds full descriptor of a Helm chart
-type Chart struct {
-	ID            string `bson:"_id"`
-	Name          string
-	Repo          Repo
-	Description   string
-	Home          string
-	Keywords      []string
-	Maintainers   []Maintainer
-	Sources       []string
-	Icon          string
-	ChartVersions []ChartVersion
-}
-
-//ChartVersion holds version information on a Chart
-type ChartVersion struct {
-	Version    string
-	AppVersion string
-	Created    time.Time
-	Digest     string
-	URLs       []string
-}
-
-//ChartFiles describes the chart values, readme, schema and digest components of a chart
-type ChartFiles struct {
-	ID     string `bson:"_id"`
-	Readme string
-	Values string
-	Schema string
-	Repo   Repo
-	Digest string
-}
-
-//RepoCheck describes the state of a repository in terms its current checksum and last update time.
-//It is used to determine whether or not to re-sync a respository.
-type RepoCheck struct {
-	ID         string    `bson:"_id"`
-	LastUpdate time.Time `bson:"last_update"`
-	Checksum   string    `bson:"checksum"`
-}
-
-//ImportChartFilesJob contains the information needed by an
-//ImportWorker when import a chart from a repository
-type ImportChartFilesJob struct {
-	Name         string
-	Repo         Repo
-	ChartVersion ChartVersion
-}
-
-//HTTPClient defines a behaviour for making HTTP requests
-type HTTPClient interface {
-	Do(req *http.Request) (*http.Response, error)
-}
-
-type RepoSyncStatus struct {
-	Repo   string `json:"repo"`
-	URL    string `json:"url"`
-	Status string `json:"status"`
-}
-
-type SyncStatusMap struct {
-	mut       sync.Mutex
-	statusMap map[string]RepoSyncStatus
-}
-
-func NewSyncStatusMap() *SyncStatusMap {
-	return &SyncStatusMap{sync.Mutex{}, make(map[string]RepoSyncStatus)}
-}
-
-func (m *SyncStatusMap) Set(repo string, status RepoSyncStatus) {
-	m.mut.Lock()
-	defer m.mut.Unlock()
-	m.statusMap[repo] = status
-}
-
-func (m *SyncStatusMap) Get(repo string) RepoSyncStatus {
-	m.mut.Lock()
-	defer m.mut.Unlock()
-	return m.statusMap[repo]
-}
-
-const SyncStatusFailed = "Failed"
-const SyncStatusSynced = "Synchronized"
-const SyncStatusInProgress = "Synchronizing"
-
-type RepoDeleteStatus struct {
-	Repo   string `json:"repo"`
-	URL    string `json:"url"`
-	Status string `json:"status"`
-}
-
-type DeleteStatusMap struct {
-	mut       sync.Mutex
-	statusMap map[string]RepoDeleteStatus
-}
-
-func NewDeleteStatusMap() *DeleteStatusMap {
-	return &DeleteStatusMap{sync.Mutex{}, make(map[string]RepoDeleteStatus)}
-}
-
-func (m *DeleteStatusMap) Set(repo string, status RepoDeleteStatus) {
-	m.mut.Lock()
-	defer m.mut.Unlock()
-	m.statusMap[repo] = status
-}
-
-func (m *DeleteStatusMap) Get(repo string) RepoDeleteStatus {
-	m.mut.Lock()
-	defer m.mut.Unlock()
-	return m.statusMap[repo]
-}
-
-const DeleteStatusFailed = "Failed"
-const DeleteStatusDeleted = "Deleted"
-const DeleteStatusInProgress = "Deleting"
-
-type SyncJobStatusResponse struct {
-	UUID   string `json:"uuid"`
-	Status string `json:"status"`
-}
-
-type DeleteJobStatusResponse struct {
-	UUID   string `json:"uuid"`
-	Status string `json:"status"`
-}
diff --git a/src/jetstream/plugins/monocular/chart-repo/delete.go b/src/jetstream/plugins/monocular/chart-repo/delete.go
deleted file mode 100644
index 17b1e2dc43..0000000000
--- a/src/jetstream/plugins/monocular/chart-repo/delete.go
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright (c) 2018 The Helm Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"github.com/helm/monocular/chartrepo/foundationdb"
-
-	log "github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-)
-
-//DeleteCmd Delete a chart repository from Monocular
-var DeleteCmd = &cobra.Command{
-	Use:   "delete [REPO NAME]",
-	Short: "delete a chart repository",
-	Run: func(cmd *cobra.Command, args []string) {
-		if len(args) != 1 {
-			log.Info("Need exactly one argument: [REPO NAME]")
-			cmd.Help()
-			return
-		}
-
-		foundationdb.Delete(cmd, args)
-	},
-}
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/datastore.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/datastore.go
deleted file mode 100644
index b5eaf598c0..0000000000
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/datastore.go
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-Copyright (c) 2019 The Helm Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package foundationdb
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	log "github.com/sirupsen/logrus"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
-)
-
-const defaultTimeout = 30 * time.Second
-
-// Config configures the database connection
-type Config struct {
-	URL      string
-	Database string
-	Timeout  time.Duration
-}
-
-// Client is an interface for a MongoDB client
-type Client interface {
-	Database(name string) (Database, func())
-}
-
-// Database is an interface for accessing a MongoDB database
-type Database interface {
-	Collection(name string) Collection
-}
-
-// Collection is an interface for accessing a MongoDB collection
-type Collection interface {
-	BulkWrite(ctxt context.Context, operations []mongo.WriteModel, options *options.BulkWriteOptions) (*mongo.BulkWriteResult, error)
-	DeleteMany(ctxt context.Context, filter interface{}, options *options.DeleteOptions) (*mongo.DeleteResult, error)
-	FindOne(ctxt context.Context, filter interface{}, result interface{}, options *options.FindOneOptions) error
-	InsertOne(ctxt context.Context, document interface{}, options *options.InsertOneOptions) (*mongo.InsertOneResult, error)
-	UpdateOne(ctxt context.Context, filter interface{}, update interface{}, options *options.UpdateOptions) (*mongo.UpdateResult, error)
-}
-
-// mongoDatabase wraps an mongo.Database and implements Database
-type mongoDatabase struct {
-	Database *mongo.Database
-}
-
-// mongoClient wraps an mongo.Database and implements Database
-type mongoClient struct {
-	Client *mongo.Client
-}
-
-//NewDocLayerClient creates a mongoDB client using the given options
-func NewDocLayerClient(ctx context.Context, options *options.ClientOptions) (Client, error) {
-	client, err := mongo.Connect(ctx, options)
-	return &mongoClient{client}, err
-}
-
-//Database Creates a new interface for accessing the specified FDB Document-Layer database
-func (c *mongoClient) Database(dbName string) (Database, func()) {
-
-	db := &mongoDatabase{c.Client.Database(dbName)}
-
-	return db, func() {
-		err := c.Client.Disconnect(context.Background())
-
-		if err != nil {
-			log.Fatal(err)
-		}
-		fmt.Println("Connection to MongoDB closed.")
-	}
-}
-
-//Collection returns a reference to a given collection in the FDB Document-layer
-func (d *mongoDatabase) Collection(name string) Collection {
-	return &mongoCollection{d.Database.Collection(name)}
-}
-
-// mongoCollection wraps a mongo.Collection and implements Collection
-type mongoCollection struct {
-	Collection *mongo.Collection
-}
-
-func (c *mongoCollection) BulkWrite(ctxt context.Context, operations []mongo.WriteModel, options *options.BulkWriteOptions) (*mongo.BulkWriteResult, error) {
-	res, err := c.Collection.BulkWrite(ctxt, operations, options)
-	return res, err
-}
-
-func (c *mongoCollection) DeleteMany(ctxt context.Context, filter interface{}, options *options.DeleteOptions) (*mongo.DeleteResult, error) {
-	res, err := c.Collection.DeleteMany(ctxt, filter, options)
-	return res, err
-}
-
-func (c *mongoCollection) FindOne(ctxt context.Context, filter interface{}, result interface{}, options *options.FindOneOptions) error {
-	res := c.Collection.FindOne(ctxt, filter, options)
-	return res.Decode(result)
-}
-
-func (c *mongoCollection) InsertOne(ctxt context.Context, document interface{}, options *options.InsertOneOptions) (*mongo.InsertOneResult, error) {
-	res, err := c.Collection.InsertOne(ctxt, document, options)
-	return res, err
-}
-
-func (c *mongoCollection) UpdateOne(ctxt context.Context, filter interface{}, document interface{}, options *options.UpdateOptions) (*mongo.UpdateResult, error) {
-	res, err := c.Collection.UpdateOne(ctxt, filter, document, options)
-	return res, err
-}
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/delete.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/delete.go
deleted file mode 100644
index d5f29445ab..0000000000
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/delete.go
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-Copyright (c) 2019 The Helm Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package foundationdb
-
-import (
-	"context"
-	"time"
-
-	log "github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-	"go.mongodb.org/mongo-driver/mongo/options"
-)
-
-//Delete Deletes a chart repository from FoundationDB Document-Layer
-func Delete(cmd *cobra.Command, args []string) {
-
-	fdbURL, err := cmd.Flags().GetString("doclayer-url")
-	if err != nil {
-		log.Fatal(err)
-	}
-	fDB, err := cmd.Flags().GetString("doclayer-database")
-	if err != nil {
-		log.Fatal(err)
-	}
-	debug, err := cmd.Flags().GetBool("debug")
-	if err != nil {
-		log.Fatal(err)
-	}
-	if debug {
-		log.SetLevel(log.DebugLevel)
-	}
-
-	log.Debugf("Creating client for FDB: %v, %v, %v", fdbURL, fDB, debug)
-	clientOptions := options.Client().ApplyURI(fdbURL).SetMinPoolSize(10).SetMaxPoolSize(100)
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-	client, err := NewDocLayerClient(ctx, clientOptions)
-	if err != nil {
-		log.Fatalf("Can't create client for FoundationDB document layer: %v URL provided was: %v", err, fdbURL)
-		return
-	}
-
-	log.Debugf("Client created.")
-
-	//Close db client after serving request
-	var clientKeepAlive = false
-	if err = DeleteRepo(client, fDB, args[0], clientKeepAlive); err != nil {
-		log.Fatalf("Can't delete chart repository %s from database: %v", args[0], err, clientKeepAlive)
-	}
-
-	log.Infof("Successfully deleted the chart repository %s from database", args[0])
-}
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/mockstore.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/mockstore.go
deleted file mode 100644
index eaac71db68..0000000000
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/mockstore.go
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-Copyright (c) 2019 The Helm Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package foundationdb
-
-import (
-	"context"
-
-	"github.com/stretchr/testify/mock"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
-)
-
-//mockDatabase acts as a mock datastore.Database
-type mockDatabase struct {
-	*mock.Mock
-}
-
-type mockClient struct {
-	*mock.Mock
-}
-
-//NewMockClient returns a mocked Document-Layer client
-func NewMockClient(m *mock.Mock) Client {
-	return mockClient{m}
-}
-
-//Database returns a mocked datastore.Database and empty closer function
-func (c mockClient) Database(dbName string) (Database, func()) {
-
-	db := mockDatabase{c.Mock}
-
-	return db, func() {
-	}
-}
-
-func (d mockDatabase) Collection(name string) Collection {
-	return mockCollection{d.Mock}
-}
-
-// mockCollection acts as a mock datastore.Collection
-type mockCollection struct {
-	*mock.Mock
-}
-
-func (c mockCollection) BulkWrite(ctxt context.Context, operations []mongo.WriteModel, options *options.BulkWriteOptions) (*mongo.BulkWriteResult, error) {
-	args := c.Called(ctxt, operations, options)
-	return args.Get(0).(*mongo.BulkWriteResult), args.Error(1)
-}
-
-func (c mockCollection) DeleteMany(ctxt context.Context, filter interface{}, options *options.DeleteOptions) (*mongo.DeleteResult, error) {
-	args := c.Called(ctxt, filter, options)
-	return args.Get(0).(*mongo.DeleteResult), args.Error(1)
-}
-
-func (c mockCollection) FindOne(ctxt context.Context, filter interface{}, result interface{}, options *options.FindOneOptions) error {
-	args := c.Called(ctxt, filter, result, options)
-	return args.Error(0)
-}
-
-func (c mockCollection) InsertOne(ctxt context.Context, document interface{}, options *options.InsertOneOptions) (*mongo.InsertOneResult, error) {
-	args := c.Called(ctxt, document, options)
-	return args.Get(0).(*mongo.InsertOneResult), args.Error(1)
-}
-
-func (c mockCollection) UpdateOne(ctxt context.Context, filter interface{}, document interface{}, options *options.UpdateOptions) (*mongo.UpdateResult, error) {
-	args := c.Called(ctxt, filter, document, options)
-	return args.Get(0).(*mongo.UpdateResult), args.Error(1)
-}
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/sync.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/sync.go
deleted file mode 100644
index 6db32d6b64..0000000000
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/sync.go
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-Copyright (c) 2018 The Helm Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package foundationdb
-
-import (
-	"context"
-	"os"
-	"time"
-
-	log "github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-	"go.mongodb.org/mongo-driver/mongo/options"
-)
-
-//Sync Add a new chart repository to FoundationDB Document-Layer and periodically sync it
-func Sync(cmd *cobra.Command, args []string) {
-
-	fdbURL, err := cmd.Flags().GetString("doclayer-url")
-	if err != nil {
-		log.Fatal(err)
-	}
-	fDB, err := cmd.Flags().GetString("doclayer-database")
-	if err != nil {
-		log.Fatal(err)
-	}
-	debug, err := cmd.Flags().GetBool("debug")
-	if err != nil {
-		log.Fatal(err)
-	}
-	if debug {
-		log.SetLevel(log.DebugLevel)
-	}
-
-	log.Debugf("Creating client for FDB: %v, %v, %v", fdbURL, fDB, debug)
-	clientOptions := options.Client().ApplyURI(fdbURL).SetMinPoolSize(10).SetMaxPoolSize(100)
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-	client, err := NewDocLayerClient(ctx, clientOptions)
-	if err != nil {
-		log.Fatalf("Can't create client for FoundationDB document layer: %v. URL provided was: %v", err, fdbURL)
-		return
-	}
-
-	log.Debugf("Client created.")
-
-	startTime := time.Now()
-	//Close db client after serving request
-	var clientKeepAlive = false
-	authorizationHeader := os.Getenv("AUTHORIZATION_HEADER")
-	if err = SyncRepo(client, fDB, args[0], args[1], authorizationHeader, clientKeepAlive); err != nil {
-		log.Fatalf("Can't add chart repository to database: %v", err)
-		return
-	}
-	timeTaken := time.Since(startTime).Seconds()
-	log.Infof("Successfully added the chart repository %s to database in %v seconds", args[0], timeTaken)
-}
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
deleted file mode 100644
index 926ed920ad..0000000000
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils.go
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
-Copyright (c) 2019 The Helm Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package foundationdb
-
-import (
-	"archive/tar"
-	"bytes"
-	"compress/gzip"
-	"context"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/helm/monocular/chartrepo/common"
-	"github.com/helm/monocular/chartrepo/utils"
-
-	"github.com/disintegration/imaging"
-	log "github.com/sirupsen/logrus"
-
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
-)
-
-const (
-	chartCollection       = "charts"
-	repositoryCollection  = "repos"
-	chartFilesCollection  = "files"
-	defaultTimeoutSeconds = 10
-	additionalCAFile      = "/usr/local/share/ca-certificates/ca.crt"
-)
-
-var netClient common.HTTPClient = &http.Client{}
-var repoSyncStatus *common.SyncStatusMap = common.NewSyncStatusMap()
-var repoDeleteStatus *common.DeleteStatusMap = common.NewDeleteStatusMap()
-
-func init() {
-	var err error
-	netClient, err = common.InitNetClient(additionalCAFile, defaultTimeoutSeconds)
-	if err != nil {
-		log.Fatal(err)
-	}
-}
-
-func createStatus(repoName, repoUrl, status string) common.RepoSyncStatus {
-	syncStatus := common.RepoSyncStatus{}
-	syncStatus.Repo = repoName
-	syncStatus.URL = repoUrl
-	syncStatus.Status = status
-	return syncStatus
-}
-
-// SyncRepo Syncing is performed in the following steps:
-// 1. Update database to match chart metadata from index
-// 2. Concurrently process icons for charts (concurrently)
-// 3. Concurrently process the README and values.yaml for the latest chart version of each chart
-// 4. Concurrently process READMEs and values.yaml for historic chart versions
-//
-// These steps are processed in this way to ensure relevant chart data is
-// imported into the database as fast as possible. E.g. we want all icons for
-// charts before fetching readmes for each chart and version pair.
-func SyncRepo(dbClient Client, dbName, repoName, repoURL string, authorizationHeader string, clientKeepAlive bool) error {
-
-	repoSyncStatus.Set(repoName, createStatus(repoName, repoURL, common.SyncStatusInProgress))
-
-	db, closer := dbClient.Database(dbName)
-
-	log.Infof("Keeping client alive: %v", clientKeepAlive)
-	if !clientKeepAlive {
-		defer closer()
-	}
-
-	url, err := common.ParseRepoURL(repoURL)
-	if err != nil {
-		log.WithFields(log.Fields{"url": repoURL}).WithError(err).Error("Failed to parse Repo URL")
-		repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusFailed})
-		return err
-	}
-
-	log.Debugf("Checking database connection and readiness...")
-	collection := db.Collection("numbers")
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	res, err := collection.InsertOne(ctx, bson.M{"name": "pi", "value": 3.14159}, options.InsertOne())
-	if err != nil {
-		log.Errorf("Database readiness/connection test failed: %v", err)
-		cancel()
-		repoSyncStatus.Set(repoName, createStatus(repoName, repoURL, common.SyncStatusFailed))
-		return err
-	}
-	id := res.InsertedID
-	collection.DeleteMany(ctx, bson.M{"_id": id}, options.Delete())
-	cancel()
-	log.Debugf("Database connection test successful.")
-	log.Debugf("Inserted a test document to test collection with ID: %v", id)
-
-	r := common.Repo{Name: repoName, URL: url.String(), AuthorizationHeader: authorizationHeader}
-	repoBytes, err := common.FetchRepoIndex(r, netClient)
-	if err != nil {
-		log.Errorf("Failed to fetch repo index: %v", err)
-
-		repoSyncStatus.Set(repoName, createStatus(repoName, repoURL, common.SyncStatusFailed))
-		return err
-	}
-
-	repoChecksum, err := common.GetSha256(repoBytes)
-	if err != nil {
-		log.Errorf("Failed to generate repo checksum: %v", err)
-		repoSyncStatus.Set(repoName, createStatus(repoName, repoURL, common.SyncStatusFailed))
-		return err
-	}
-
-	// Check if the repo has been already processed
-	if repoAlreadyProcessed(db, repoName, repoChecksum) {
-		log.WithFields(log.Fields{"url": repoURL}).Info("Skipping repository since there are no updates")
-		repoSyncStatus.Set(repoName, createStatus(repoName, repoURL, common.SyncStatusSynced))
-		return nil
-	}
-
-	index, err := common.ParseRepoIndex(repoBytes)
-	if err != nil {
-		log.Errorf("Error parsing repo index: %v", err)
-		repoSyncStatus.Set(repoName, createStatus(repoName, repoURL, common.SyncStatusFailed))
-		return err
-	}
-
-	charts := common.ChartsFromIndex(index, r)
-	log.Debugf("%v Charts in index of repo: %v", len(charts), repoURL)
-	if len(charts) == 0 {
-		repoSyncStatus.Set(repoName, createStatus(repoName, repoURL, common.SyncStatusSynced))
-		return errors.New("no charts in repository index")
-	}
-
-	err = importCharts(db, dbName, charts)
-	if err != nil {
-		log.Errorf("Error importing charts: %v", err)
-		repoSyncStatus.Set(repoName, createStatus(repoName, repoURL, common.SyncStatusFailed))
-		return err
-	}
-
-	// Process 10 charts at a time
-	numWorkers := 10
-	iconJobs := make(chan common.Chart, numWorkers)
-	chartFilesJobs := make(chan common.ImportChartFilesJob, numWorkers)
-	var wg sync.WaitGroup
-
-	log.Debugf("starting %d workers", numWorkers)
-	for i := 0; i < numWorkers; i++ {
-		wg.Add(1)
-		go importWorker(db, &wg, iconJobs, chartFilesJobs)
-	}
-
-	// Enqueue jobs to process chart icons
-	for _, c := range charts {
-		iconJobs <- c
-	}
-	// Close the iconJobs channel to signal the worker pools to move on to the
-	// chart files jobs
-	close(iconJobs)
-
-	// Iterate through the list of charts and enqueue the latest chart version to
-	// be processed. Append the rest of the chart versions to a list to be
-	// enqueued later
-	var toEnqueue []common.ImportChartFilesJob
-	for _, c := range charts {
-		chartFilesJobs <- common.ImportChartFilesJob{Name: c.Name, Repo: c.Repo, ChartVersion: c.ChartVersions[0]}
-		for _, cv := range c.ChartVersions[1:] {
-			toEnqueue = append(toEnqueue, common.ImportChartFilesJob{Name: c.Name, Repo: c.Repo, ChartVersion: cv})
-		}
-	}
-
-	// Enqueue all the remaining chart versions
-	for _, cfj := range toEnqueue {
-		chartFilesJobs <- cfj
-	}
-	// Close the chartFilesJobs channel to signal the worker pools that there are
-	// no more jobs to process
-	close(chartFilesJobs)
-
-	// Wait for the worker pools to finish processing
-	wg.Wait()
-
-	// Update cache in the database
-	if err = updateLastCheck(db, repoName, repoChecksum, time.Now()); err != nil {
-		log.Errorf("Error updating last repo check timestamp: %v", err)
-		repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusFailed})
-		return err
-	}
-	log.WithFields(log.Fields{"Repository": repoName, "URL": repoURL}).Info("Synchronized successfully: ")
-	repoSyncStatus.Set(repoName, common.RepoSyncStatus{"repoName", repoURL, common.SyncStatusSynced})
-	return nil
-}
-
-func repoAlreadyProcessed(db Database, repoName string, checksum string) bool {
-	lastCheck := &common.RepoCheck{}
-	filter := bson.M{"_id": repoName}
-	err := db.Collection(repositoryCollection).FindOne(context.Background(), filter, lastCheck, options.FindOne())
-	return err == nil && checksum == lastCheck.Checksum
-}
-
-func updateLastCheck(db Database, repoName string, checksum string, now time.Time) error {
-	selector := bson.M{"_id": repoName}
-	update := bson.M{"$set": bson.M{"last_update": now, "checksum": checksum}}
-	_, err := db.Collection(repositoryCollection).UpdateOne(context.Background(), selector, update, options.Update())
-	return err
-}
-
-func DeleteRepo(dbClient Client, dbName, repoName string, clientKeepAlive bool) error {
-	db, closer := dbClient.Database(dbName)
-
-	log.Infof("Keeping client alive: %v", clientKeepAlive)
-	if !clientKeepAlive {
-		defer closer()
-	}
-
-	log.Debugf("Checking database connection and readiness...")
-	collection := db.Collection("numbers")
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	res, err := collection.InsertOne(ctx, bson.M{"name": "pi", "value": 3.14159}, options.InsertOne())
-	if err != nil {
-		log.Fatalf("Database readiness/connection test failed: %v", err)
-		cancel()
-		return err
-	}
-	id := res.InsertedID
-	collection.DeleteMany(ctx, bson.M{"_id": id}, options.Delete())
-	cancel()
-	log.Debugf("Database connection test successful.")
-	log.Debugf("Inserted a test document to test collection with ID: %v", id)
-
-	collection = db.Collection(chartCollection)
-	filter := bson.M{
-		"repo.name": repoName,
-	}
-	deleteResult, err := collection.DeleteMany(context.Background(), filter, options.Delete())
-	if err != nil {
-		log.Debugf("Error occurred during delete repo (deleting charts from index). Err: %v, Result: %v", err, deleteResult)
-		return err
-	}
-	log.Debugf("Repo delete (delete charts from index) result: %v charts deleted", deleteResult.DeletedCount)
-
-	collection = db.Collection(chartFilesCollection)
-	deleteResult, err = collection.DeleteMany(context.Background(), filter, options.Delete())
-	if err != nil {
-		log.Debugf("Error occurred during delete repo (deleting chart files from index). Err: %v, Result: %v", err, deleteResult)
-		return err
-	}
-	log.Debugf("Repo delete (delete chart files from index) result: %v chart files deleted.", deleteResult.DeletedCount)
-	collection = db.Collection(repositoryCollection)
-	deleteResult, err = collection.DeleteMany(context.Background(), filter, options.Delete())
-	if err != nil {
-		log.Debugf("Error occurred during delete repo (deleting repositories from index). Err: %v, Result: %v", err, deleteResult)
-		return err
-	}
-	log.Debugf("Repo delete (delete chart files from index) result: %v repositories deleted.", deleteResult.DeletedCount)
-
-	return err
-}
-
-func importCharts(db Database, dbName string, charts []common.Chart) error {
-	var operations []mongo.WriteModel
-	var chartIDs []string
-	for _, c := range charts {
-		operation := mongo.NewUpdateOneModel()
-		chartIDs = append(chartIDs, c.ID)
-		// charts to upsert - pair of filter, chart
-		operation.SetFilter(bson.M{
-			"_id": c.ID,
-		})
-
-		chartBSON, err := bson.Marshal(&c)
-		var doc bson.M
-		bson.Unmarshal(chartBSON, &doc)
-		delete(doc, "_id")
-
-		if err != nil {
-			log.Debugf("Error marshalling chart to BSON: %v. Skipping this chart.", err)
-		} else {
-			update := doc
-			operation.SetUpdate(update)
-			operation.SetUpsert(true)
-			operations = append(operations, operation)
-		}
-		log.Debugf("Adding chart insert operation for chart: %v", c.ID)
-	}
-
-	//Must use bulk write for array of filters
-	collection := db.Collection(chartCollection)
-	updateResult, err := collection.BulkWrite(
-		context.Background(),
-		operations,
-		options.BulkWrite(),
-	)
-
-	//Set upsert flag and upsert the pairs here
-	//Updates our index for charts that we already have and inserts charts that are new
-	if err != nil {
-		log.Debugf("Error occurred during chart import (upsert many). Err: %v", err)
-		return err
-	}
-	log.Debugf("Upsert chart index success. %v documents inserted, %v documents upserted, %v documents modified", updateResult.InsertedCount, updateResult.UpsertedCount, updateResult.ModifiedCount)
-
-	//Remove from our index, any charts that no longer exist
-	filter := bson.M{
-		"_id": bson.M{
-			"$nin": chartIDs,
-		},
-		"repo.name": charts[0].Repo.Name,
-	}
-	deleteResult, err := collection.DeleteMany(context.Background(), filter, options.Delete())
-	if err != nil {
-		log.Debugf("Error occurred during chart import (delete many). Err: %v", err)
-		return err
-	}
-	log.Debugf("Delete stale charts from index success. %v documents deleted.", deleteResult.DeletedCount)
-
-	return err
-}
-
-func importWorker(db Database, wg *sync.WaitGroup, icons <-chan common.Chart, chartFiles <-chan common.ImportChartFilesJob) {
-	defer wg.Done()
-	for c := range icons {
-		log.WithFields(log.Fields{"name": c.Name}).Debug("importing icon")
-		if err := fetchAndImportIcon(db, c); err != nil {
-			log.WithFields(log.Fields{"name": c.Name}).WithError(err).Warn("failed to import icon")
-		}
-	}
-	for j := range chartFiles {
-		log.WithFields(log.Fields{"name": j.Name, "version": j.ChartVersion.Version}).Debug("importing readme and values")
-		if err := fetchAndImportFiles(db, j.Name, j.Repo, j.ChartVersion); err != nil {
-			log.WithFields(log.Fields{"name": j.Name, "version": j.ChartVersion.Version}).WithError(err).Warn("failed to import files")
-		}
-	}
-}
-
-func fetchAndImportIcon(db Database, c common.Chart) error {
-	if c.Icon == "" {
-		log.WithFields(log.Fields{"name": c.Name}).Debug("icon not found")
-		return nil
-	}
-
-	req, err := http.NewRequest("GET", c.Icon, nil)
-	if err != nil {
-		return err
-	}
-	req.Header.Set("User-Agent", utils.UserAgent())
-	if len(c.Repo.AuthorizationHeader) > 0 {
-		req.Header.Set("Authorization", c.Repo.AuthorizationHeader)
-	}
-
-	res, err := netClient.Do(req)
-	if res != nil {
-		defer res.Body.Close()
-	}
-	if err != nil {
-		return err
-	}
-
-	if res.StatusCode != http.StatusOK {
-		return fmt.Errorf("%d %s", res.StatusCode, c.Icon)
-	}
-
-	b := []byte{}
-	contentType := ""
-	if strings.Contains(res.Header.Get("Content-Type"), "image/svg") {
-		// if the icon is a SVG file simply read it
-		b, err = ioutil.ReadAll(res.Body)
-		if err != nil {
-			return err
-		}
-		contentType = res.Header.Get("Content-Type")
-	} else {
-		// if the icon is in any other format try to convert it to PNG
-		orig, err := imaging.Decode(res.Body)
-		if err != nil {
-			log.WithFields(log.Fields{"name": c.Name}).WithError(err).Error("failed to decode icon")
-			return err
-		}
-
-		// TODO: make this configurable?
-		icon := imaging.Fit(orig, 160, 160, imaging.Lanczos)
-
-		var buf bytes.Buffer
-		imaging.Encode(&buf, icon, imaging.PNG)
-		b = buf.Bytes()
-		contentType = "image/png"
-	}
-
-	collection := db.Collection(chartCollection)
-	//Update single icon
-	update := bson.M{"$set": bson.M{"raw_icon": b, "icon_content_type": contentType}}
-	filter := bson.M{"_id": c.ID}
-	updateResult, err := collection.UpdateOne(context.Background(), filter, update, options.Update())
-	if err != nil {
-		log.Debugf("Error occurred during chart icon import (update one). Err: %v, Result: %v", err, updateResult)
-		return err
-	}
-	return err
-}
-
-func fetchAndImportFiles(db Database, name string, r common.Repo, cv common.ChartVersion) error {
-
-	chartFilesID := fmt.Sprintf("%s/%s-%s", r.Name, name, cv.Version)
-	//Check if we already have indexed files for this chart version and digest
-	collection := db.Collection(chartFilesCollection)
-	filter := bson.M{"_id": chartFilesID, "digest": cv.Digest}
-	findResult := collection.FindOne(context.Background(), filter, &common.ChartFiles{}, options.FindOne())
-	if findResult != mongo.ErrNoDocuments {
-		log.WithFields(log.Fields{"name": name, "version": cv.Version}).Debug("skipping existing files")
-		return nil
-	}
-	log.WithFields(log.Fields{"name": name, "version": cv.Version}).Debug("fetching files")
-
-	url := common.ChartTarballURL(r, cv)
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return err
-	}
-	req.Header.Set("User-Agent", utils.UserAgent())
-	if len(r.AuthorizationHeader) > 0 {
-		req.Header.Set("Authorization", r.AuthorizationHeader)
-	}
-
-	res, err := netClient.Do(req)
-	if err != nil {
-		return err
-	}
-	defer res.Body.Close()
-
-	// We read the whole chart into memory, this should be okay since the chart
-	// tarball needs to be small enough to fit into a GRPC call (Tiller
-	// requirement)
-	gzf, err := gzip.NewReader(res.Body)
-	if err != nil {
-		return err
-	}
-	defer gzf.Close()
-
-	tarf := tar.NewReader(gzf)
-
-	readmeFileName := name + "/README.md"
-	valuesFileName := name + "/values.yaml"
-	schemaFileName := name + "/values.schema.json"
-	filenames := []string{valuesFileName, readmeFileName, schemaFileName}
-
-	files, err := common.ExtractFilesFromTarball(filenames, tarf)
-	if err != nil {
-		return err
-	}
-
-	chartFiles := common.ChartFiles{ID: chartFilesID, Repo: r, Digest: cv.Digest}
-	if v, ok := files[readmeFileName]; ok {
-		chartFiles.Readme = v
-	} else {
-		log.WithFields(log.Fields{"name": name, "version": cv.Version}).Warn("README.md not found")
-	}
-	if v, ok := files[valuesFileName]; ok {
-		chartFiles.Values = v
-	} else {
-		log.WithFields(log.Fields{"name": name, "version": cv.Version}).Warn("values.yaml not found")
-	}
-	if v, ok := files[schemaFileName]; ok {
-		chartFiles.Schema = v
-	} else {
-		log.WithFields(log.Fields{"name": name, "version": cv.Version}).Warn("values.schema.json not found")
-	}
-
-	// inserts the chart files if not already indexed, or updates the existing
-	// entry if digest has changed
-	log.Debugf("Inserting chart files %v to collection: %v....", chartFilesID, chartFilesCollection)
-	collection = db.Collection(chartFilesCollection)
-	filter = bson.M{"_id": chartFilesID}
-	chartBSON, err := bson.Marshal(&chartFiles)
-	var doc bson.M
-	bson.Unmarshal(chartBSON, &doc)
-	delete(doc, "_id")
-	update := bson.M{"$set": doc}
-	updateResult, err := collection.UpdateOne(context.Background(), filter, update, options.Update().SetUpsert(true))
-	if err != nil {
-		log.Debugf("Error occurred during chart files import (update one). Chart files : %v doc: %v  Err: %v", chartFiles, doc, err)
-		return err
-	}
-	log.Debugf("Chart files import success. (update one) Upserted: %v Updated: %v", updateResult.UpsertedCount, updateResult.ModifiedCount)
-	return nil
-}
-
-func GetRepoSyncStatus(repo string) (common.RepoSyncStatus, error) {
-	status := repoSyncStatus.Get(repo)
-	if status == (common.RepoSyncStatus{}) {
-		return status, errors.New("Repo does not exist in database.")
-	}
-	return status, nil
-}
-
-func GetRepoDeleteStatus(repo string) (common.RepoDeleteStatus, error) {
-	status := repoDeleteStatus.Get(repo)
-	if status == (common.RepoDeleteStatus{}) {
-		return status, errors.New("Repo does not exist in database.")
-	}
-	return status, nil
-}
-
-func database(client *mongo.Client, dbName string) (*mongo.Database, func()) {
-
-	db := client.Database(dbName)
-	return db, func() {
-		err := client.Disconnect(context.Background())
-
-		if err != nil {
-			log.Fatal(err)
-		}
-		fmt.Println("Connection to MongoDB closed.")
-	}
-}
diff --git a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils_test.go b/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils_test.go
deleted file mode 100644
index e435012458..0000000000
--- a/src/jetstream/plugins/monocular/chart-repo/foundationdb/utils_test.go
+++ /dev/null
@@ -1,696 +0,0 @@
-/*
-Copyright (c) 2018 The Helm Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package foundationdb
-
-import (
-	"archive/tar"
-	"bytes"
-	"compress/gzip"
-	"crypto/rand"
-	"fmt"
-	"image"
-	"image/color"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"path"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/helm/monocular/chartrepo/common"
-	"github.com/helm/monocular/chartrepo/utils"
-
-	"github.com/arschles/assert"
-	"github.com/disintegration/imaging"
-	log "github.com/sirupsen/logrus"
-	"github.com/stretchr/testify/mock"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/mongo"
-)
-
-var validRepoIndexYAMLBytes, _ = ioutil.ReadFile("../testdata/valid-index.yaml")
-var validRepoIndexYAML = string(validRepoIndexYAMLBytes)
-
-var invalidRepoIndexYAML = "invalid"
-
-type badHTTPClient struct{}
-
-func (h *badHTTPClient) Do(req *http.Request) (*http.Response, error) {
-	w := httptest.NewRecorder()
-	w.WriteHeader(500)
-	return w.Result(), nil
-}
-
-type goodHTTPClient struct{}
-
-func (h *goodHTTPClient) Do(req *http.Request) (*http.Response, error) {
-	w := httptest.NewRecorder()
-	// Don't accept trailing slashes
-	if strings.HasPrefix(req.URL.Path, "//") {
-		w.WriteHeader(500)
-	}
-	// If subpath repo URL test, check that index.yaml is correctly added to the
-	// subpath
-	if req.URL.Host == "subpath.test" && req.URL.Path != "/subpath/index.yaml" {
-		w.WriteHeader(500)
-	}
-
-	w.Write([]byte(validRepoIndexYAML))
-	return w.Result(), nil
-}
-
-type badIconClient struct{}
-
-func (h *badIconClient) Do(req *http.Request) (*http.Response, error) {
-	w := httptest.NewRecorder()
-	w.Write([]byte("not-an-image"))
-	return w.Result(), nil
-}
-
-type goodIconClient struct{}
-
-func iconBytes() []byte {
-	var b bytes.Buffer
-	img := imaging.New(1, 1, color.White)
-	imaging.Encode(&b, img, imaging.PNG)
-	return b.Bytes()
-}
-
-func (h *goodIconClient) Do(req *http.Request) (*http.Response, error) {
-	w := httptest.NewRecorder()
-	w.Write(iconBytes())
-	return w.Result(), nil
-}
-
-type svgIconClient struct{}
-
-func (h *svgIconClient) Do(req *http.Request) (*http.Response, error) {
-	w := httptest.NewRecorder()
-	w.Write([]byte("foo"))
-	res := w.Result()
-	res.Header.Set("Content-Type", "image/svg")
-	return res, nil
-}
-
-type goodTarballClient struct {
-	c          common.Chart
-	skipReadme bool
-	skipValues bool
-	skipSchema bool
-}
-
-var testChartReadme = "# readme for chart\n\nBest chart in town"
-var testChartValues = "image: test"
-var testChartSchema = `{"properties": {}}`
-
-func (h *goodTarballClient) Do(req *http.Request) (*http.Response, error) {
-	w := httptest.NewRecorder()
-	gzw := gzip.NewWriter(w)
-	files := []tarballFile{{h.c.Name + "/Chart.yaml", "should be a Chart.yaml here..."}}
-	if !h.skipValues {
-		files = append(files, tarballFile{h.c.Name + "/values.yaml", testChartValues})
-	}
-	if !h.skipReadme {
-		files = append(files, tarballFile{h.c.Name + "/README.md", testChartReadme})
-	}
-	if !h.skipSchema {
-		files = append(files, tarballFile{h.c.Name + "/values.schema.json", testChartSchema})
-	}
-	createTestTarball(gzw, files)
-	gzw.Flush()
-	return w.Result(), nil
-}
-
-type authenticatedTarballClient struct {
-	c common.Chart
-}
-
-func (h *authenticatedTarballClient) Do(req *http.Request) (*http.Response, error) {
-	w := httptest.NewRecorder()
-
-	// Ensure we're sending the right Authorization header
-	if !strings.Contains(req.Header.Get("Authorization"), "Bearer ThisSecretAccessTokenAuthenticatesTheClient") {
-		w.WriteHeader(500)
-	} else {
-		gzw := gzip.NewWriter(w)
-		files := []tarballFile{{h.c.Name + "/Chart.yaml", "should be a Chart.yaml here..."}}
-		files = append(files, tarballFile{h.c.Name + "/values.yaml", testChartValues})
-		files = append(files, tarballFile{h.c.Name + "/README.md", testChartReadme})
-		files = append(files, tarballFile{h.c.Name + "/values.schema.json", testChartSchema})
-		createTestTarball(gzw, files)
-		gzw.Flush()
-	}
-	return w.Result(), nil
-}
-
-func Test_syncURLInvalidity(t *testing.T) {
-	tests := []struct {
-		name    string
-		repoURL string
-	}{
-		{"invalid URL", "not-a-url"},
-		{"invalid URL", "https//google.com"},
-	}
-	m := mock.Mock{}
-	dbClient := NewMockClient(&m)
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := SyncRepo(dbClient, "test", "test", tt.repoURL, "")
-			assert.ExistsErr(t, err, tt.name)
-		})
-	}
-}
-
-func Test_fetchRepoIndex(t *testing.T) {
-	tests := []struct {
-		name string
-		r    common.Repo
-	}{
-		{"valid HTTP URL", common.Repo{URL: "http://my.examplerepo.com"}},
-		{"valid HTTPS URL", common.Repo{URL: "https://my.examplerepo.com"}},
-		{"valid trailing URL", common.Repo{URL: "https://my.examplerepo.com/"}},
-		{"valid subpath URL", common.Repo{URL: "https://subpath.test/subpath/"}},
-		{"valid URL with trailing spaces", common.Repo{URL: "https://subpath.test/subpath/  "}},
-		{"valid URL with leading spaces", common.Repo{URL: "  https://subpath.test/subpath/"}},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			netClient = &goodHTTPClient{}
-			_, err := common.FetchRepoIndex(tt.r, netClient)
-			assert.NoErr(t, err)
-		})
-	}
-
-	t.Run("failed request", func(t *testing.T) {
-		netClient = &badHTTPClient{}
-		_, err := common.FetchRepoIndex(common.Repo{URL: "https://my.examplerepo.com"}, netClient)
-		assert.ExistsErr(t, err, "failed request")
-	})
-}
-
-func Test_fetchRepoIndexUserAgent(t *testing.T) {
-	tests := []struct {
-		name              string
-		version           string
-		userAgentComment  string
-		expectedUserAgent string
-	}{
-		{"default user agent", "", "", "chart-repo/devel"},
-		{"custom version no app", "1.0", "", "chart-repo/1.0"},
-		{"custom version and app", "1.0", "monocular/1.2", "chart-repo/1.0 (monocular/1.2)"},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Override global variables used to generate the userAgent
-			if tt.version != "" {
-				utils.Version = tt.version
-			}
-
-			if tt.userAgentComment != "" {
-				utils.UserAgentComment = tt.userAgentComment
-			}
-
-			server := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
-				assert.Equal(t, tt.expectedUserAgent, req.Header.Get("User-Agent"), "expected user agent")
-				rw.Write([]byte(validRepoIndexYAML))
-			}))
-			// Close the server when test finishes
-			defer server.Close()
-
-			netClient = server.Client()
-
-			_, err := common.FetchRepoIndex(common.Repo{URL: server.URL}, netClient)
-			assert.NoErr(t, err)
-		})
-	}
-}
-
-func Test_parseRepoIndex(t *testing.T) {
-	tests := []struct {
-		name     string
-		repoYAML string
-	}{
-		{"invalid", "invalid"},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			_, err := common.ParseRepoIndex([]byte(tt.repoYAML))
-			assert.ExistsErr(t, err, tt.name)
-		})
-	}
-
-	t.Run("valid", func(t *testing.T) {
-		index, err := common.ParseRepoIndex([]byte(validRepoIndexYAML))
-		assert.NoErr(t, err)
-		assert.Equal(t, len(index.Entries), 2, "number of charts")
-		assert.Equal(t, index.Entries["acs-engine-autoscaler"][0].GetName(), "acs-engine-autoscaler", "chart version populated")
-	})
-}
-
-func Test_chartsFromIndex(t *testing.T) {
-	r := common.Repo{Name: "test", URL: "http://testrepo.com"}
-	index, _ := common.ParseRepoIndex([]byte(validRepoIndexYAML))
-	charts := common.ChartsFromIndex(index, r)
-	assert.Equal(t, len(charts), 2, "number of charts")
-
-	indexWithDeprecated := validRepoIndexYAML + `
-  deprecated-chart:
-  - name: deprecated-chart
-    deprecated: true`
-	index2, err := common.ParseRepoIndex([]byte(indexWithDeprecated))
-	assert.NoErr(t, err)
-	charts = common.ChartsFromIndex(index2, r)
-	assert.Equal(t, len(charts), 2, "number of charts")
-}
-
-func Test_newChart(t *testing.T) {
-	r := common.Repo{Name: "test", URL: "http://testrepo.com"}
-	index, _ := common.ParseRepoIndex([]byte(validRepoIndexYAML))
-	c := common.NewChart(index.Entries["wordpress"], r)
-	assert.Equal(t, c.Name, "wordpress", "correctly built")
-	assert.Equal(t, len(c.ChartVersions), 2, "correctly built")
-	assert.Equal(t, c.Description, "new description!", "takes chart fields from latest entry")
-	assert.Equal(t, c.Repo, r, "repo set")
-	assert.Equal(t, c.ID, "test/wordpress", "id set")
-}
-
-func Test_importCharts(t *testing.T) {
-	m := &mock.Mock{}
-	// Ensure Upsert func is called with some arguments
-	m.On("BulkWrite", mock.Anything, mock.Anything, mock.Anything).Return(&mongo.BulkWriteResult{}, nil)
-	m.On("DeleteMany", mock.Anything, mock.Anything, mock.Anything).Return(&mongo.DeleteResult{}, nil)
-	dbClient := NewMockClient(m)
-	db, _ := dbClient.Database("test")
-	index, _ := common.ParseRepoIndex([]byte(validRepoIndexYAML))
-	charts := common.ChartsFromIndex(index, common.Repo{Name: "test", URL: "http://testrepo.com"})
-	importCharts(db, "test", charts)
-
-	m.AssertExpectations(t)
-	// The BulkWrite method takes an array of WriteModels.
-	// For x charts to upsert, there should be x elements.
-	// Each element has a selector (filter) and an "update" - the update document to apply
-	args := m.Calls[0].Arguments.Get(1).([]mongo.WriteModel)
-	assert.Equal(t, len(args), len(charts), "number of charts to upsert")
-	for i := 0; i < len(args); i++ {
-		updateModel := args[i].(*mongo.UpdateOneModel)
-		assert.Equal(t, updateModel.Filter, bson.M{"_id": "test/" + updateModel.Update.(bson.M)["name"].(string)}, "selector")
-	}
-}
-
-func Test_DeleteRepo(t *testing.T) {
-	m := &mock.Mock{}
-	//Expect a few calls to test the DB readiness
-	m.On("InsertOne", mock.Anything, mock.Anything, mock.Anything).Return(&mongo.InsertOneResult{}, nil)
-	m.On("DeleteMany", mock.Anything, mock.Anything, mock.Anything).Return(&mongo.DeleteResult{}, nil)
-
-	m.On("DeleteMany", mock.Anything, bson.M{
-		"repo.name": "test",
-	}, mock.Anything).Return(&mongo.DeleteResult{}, nil)
-	dbClient := NewMockClient(m)
-
-	err := DeleteRepo(dbClient, "test", "test")
-	if err != nil {
-		t.Errorf("failed to delete chart repo test: %v", err)
-	}
-	m.AssertExpectations(t)
-}
-
-func Test_fetchAndImportIcon(t *testing.T) {
-	t.Run("no icon", func(t *testing.T) {
-		m := mock.Mock{}
-		dbClient := NewMockClient(&m)
-		db, _ := dbClient.Database("test")
-		c := common.Chart{ID: "test/acs-engine-autoscaler"}
-		assert.NoErr(t, fetchAndImportIcon(db, c))
-	})
-
-	index, _ := common.ParseRepoIndex([]byte(validRepoIndexYAML))
-	charts := common.ChartsFromIndex(index, common.Repo{Name: "test", URL: "http://testrepo.com"})
-
-	t.Run("failed download", func(t *testing.T) {
-		netClient = &badHTTPClient{}
-		c := charts[0]
-		m := mock.Mock{}
-		dbClient := NewMockClient(&m)
-		db, _ := dbClient.Database("test")
-		assert.Err(t, fmt.Errorf("500 %s", c.Icon), fetchAndImportIcon(db, c))
-	})
-
-	t.Run("bad icon", func(t *testing.T) {
-		netClient = &badIconClient{}
-		c := charts[0]
-		m := mock.Mock{}
-		dbClient := NewMockClient(&m)
-		db, _ := dbClient.Database("test")
-		assert.Err(t, image.ErrFormat, fetchAndImportIcon(db, c))
-	})
-
-	t.Run("valid icon", func(t *testing.T) {
-		netClient = &goodIconClient{}
-		c := charts[0]
-		m := mock.Mock{}
-		dbClient := NewMockClient(&m)
-		db, _ := dbClient.Database("test")
-		m.On("UpdateOne", mock.Anything, bson.M{"_id": c.ID}, bson.M{"$set": bson.M{"raw_icon": iconBytes(), "icon_content_type": "image/png"}}, mock.Anything).Return(&mongo.UpdateResult{}, nil)
-		assert.NoErr(t, fetchAndImportIcon(db, c))
-		m.AssertExpectations(t)
-	})
-
-	t.Run("valid SVG icon", func(t *testing.T) {
-		netClient = &svgIconClient{}
-		c := common.Chart{
-			ID:   "foo",
-			Icon: "https://foo/bar/logo.svg",
-			Repo: common.Repo{},
-		}
-		m := mock.Mock{}
-		dbClient := NewMockClient(&m)
-		db, _ := dbClient.Database("test")
-		m.On("UpdateOne", mock.Anything, bson.M{"_id": c.ID}, bson.M{"$set": bson.M{"raw_icon": []byte("foo"), "icon_content_type": "image/svg"}}, mock.Anything).Return(&mongo.UpdateResult{}, nil)
-		assert.NoErr(t, fetchAndImportIcon(db, c))
-		m.AssertExpectations(t)
-	})
-}
-
-func Test_fetchAndImportFiles(t *testing.T) {
-	index, _ := common.ParseRepoIndex([]byte(validRepoIndexYAML))
-	charts := common.ChartsFromIndex(index, common.Repo{Name: "test", URL: "http://testrepo.com", AuthorizationHeader: "Bearer ThisSecretAccessTokenAuthenticatesTheClient1s"})
-	cv := charts[0].ChartVersions[0]
-
-	t.Run("http error", func(t *testing.T) {
-		m := mock.Mock{}
-		m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(mongo.ErrNoDocuments)
-		dbClient := NewMockClient(&m)
-		db, _ := dbClient.Database("test")
-		netClient = &badHTTPClient{}
-		assert.Err(t, io.EOF, fetchAndImportFiles(db, charts[0].Name, charts[0].Repo, cv))
-	})
-
-	t.Run("file not found", func(t *testing.T) {
-		netClient = &goodTarballClient{c: charts[0], skipValues: true, skipReadme: true, skipSchema: true}
-		m := mock.Mock{}
-		m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(mongo.ErrNoDocuments)
-		chartFilesID := fmt.Sprintf("%s/%s-%s", charts[0].Repo.Name, charts[0].Name, cv.Version)
-		chartFiles := common.ChartFiles{ID: chartFilesID, Readme: "", Values: "", Schema: "", Repo: charts[0].Repo, Digest: cv.Digest}
-		chartBSON, _ := bson.Marshal(&chartFiles)
-		var doc bson.M
-		bson.Unmarshal(chartBSON, &doc)
-		delete(doc, "_id")
-		update := bson.M{"$set": doc}
-		m.On("UpdateOne", mock.Anything, bson.M{"_id": chartFilesID}, update, mock.Anything).Return(&mongo.UpdateResult{}, nil)
-		dbClient := NewMockClient(&m)
-		db, _ := dbClient.Database("test")
-		err := fetchAndImportFiles(db, charts[0].Name, charts[0].Repo, cv)
-		assert.NoErr(t, err)
-		m.AssertExpectations(t)
-	})
-
-	t.Run("authenticated request", func(t *testing.T) {
-		netClient = &authenticatedTarballClient{c: charts[0]}
-		m := mock.Mock{}
-		m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(mongo.ErrNoDocuments)
-		chartFilesID := fmt.Sprintf("%s/%s-%s", charts[0].Repo.Name, charts[0].Name, cv.Version)
-		chartFiles := common.ChartFiles{ID: chartFilesID, Readme: testChartReadme, Values: testChartValues, Schema: testChartSchema, Repo: charts[0].Repo, Digest: cv.Digest}
-		chartBSON, _ := bson.Marshal(&chartFiles)
-		var doc bson.M
-		bson.Unmarshal(chartBSON, &doc)
-		delete(doc, "_id")
-		update := bson.M{"$set": doc}
-		m.On("UpdateOne", mock.Anything, bson.M{"_id": chartFilesID}, update, mock.Anything).Return(&mongo.UpdateResult{}, nil)
-		dbClient := NewMockClient(&m)
-		db, _ := dbClient.Database("test")
-		err := fetchAndImportFiles(db, charts[0].Name, charts[0].Repo, cv)
-		assert.NoErr(t, err)
-		m.AssertExpectations(t)
-	})
-
-	t.Run("valid tarball", func(t *testing.T) {
-		netClient = &goodTarballClient{c: charts[0]}
-		m := mock.Mock{}
-		m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(mongo.ErrNoDocuments)
-		chartFilesID := fmt.Sprintf("%s/%s-%s", charts[0].Repo.Name, charts[0].Name, cv.Version)
-		chartFiles := common.ChartFiles{ID: chartFilesID, Readme: testChartReadme, Values: testChartValues, Schema: testChartSchema, Repo: charts[0].Repo, Digest: cv.Digest}
-		chartBSON, _ := bson.Marshal(&chartFiles)
-		var doc bson.M
-		bson.Unmarshal(chartBSON, &doc)
-		delete(doc, "_id")
-		update := bson.M{"$set": doc}
-		m.On("UpdateOne", mock.Anything, bson.M{"_id": chartFilesID}, update, mock.Anything).Return(&mongo.UpdateResult{}, nil)
-		dbClient := NewMockClient(&m)
-		db, _ := dbClient.Database("test")
-		err := fetchAndImportFiles(db, charts[0].Name, charts[0].Repo, cv)
-		assert.NoErr(t, err)
-		m.AssertExpectations(t)
-	})
-
-	t.Run("file exists", func(t *testing.T) {
-		m := mock.Mock{}
-		// don't return an error when checking if files already exists
-		m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
-		dbClient := NewMockClient(&m)
-		db, _ := dbClient.Database("test")
-		err := fetchAndImportFiles(db, charts[0].Name, charts[0].Repo, cv)
-		assert.NoErr(t, err)
-		m.AssertNotCalled(t, "UpdateOne", mock.Anything, mock.Anything, mock.Anything)
-	})
-}
-
-func Test_chartTarballURL(t *testing.T) {
-	r := common.Repo{Name: "test", URL: "http://testrepo.com"}
-	tests := []struct {
-		name   string
-		cv     common.ChartVersion
-		wanted string
-	}{
-		{"absolute url", common.ChartVersion{URLs: []string{"http://testrepo.com/wordpress-0.1.0.tgz"}}, "http://testrepo.com/wordpress-0.1.0.tgz"},
-		{"relative url", common.ChartVersion{URLs: []string{"wordpress-0.1.0.tgz"}}, "http://testrepo.com/wordpress-0.1.0.tgz"},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			assert.Equal(t, common.ChartTarballURL(r, tt.cv), tt.wanted, "url")
-		})
-	}
-}
-
-func Test_extractFilesFromTarball(t *testing.T) {
-	tests := []struct {
-		name     string
-		files    []tarballFile
-		filename string
-		want     string
-	}{
-		{"file", []tarballFile{{"file.txt", "best file ever"}}, "file.txt", "best file ever"},
-		{"multiple file tarball", []tarballFile{{"file.txt", "best file ever"}, {"file2.txt", "worst file ever"}}, "file2.txt", "worst file ever"},
-		{"file in dir", []tarballFile{{"file.txt", "best file ever"}, {"test/file2.txt", "worst file ever"}}, "test/file2.txt", "worst file ever"},
-		{"filename ignore case", []tarballFile{{"Readme.md", "# readme for chart"}, {"values.yaml", "key: value"}}, "README.md", "# readme for chart"},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var b bytes.Buffer
-			createTestTarball(&b, tt.files)
-			r := bytes.NewReader(b.Bytes())
-			tarf := tar.NewReader(r)
-			files, err := common.ExtractFilesFromTarball([]string{tt.filename}, tarf)
-			assert.NoErr(t, err)
-			assert.Equal(t, files[tt.filename], tt.want, "file body")
-		})
-	}
-
-	t.Run("extract multiple files", func(t *testing.T) {
-		var b bytes.Buffer
-		tFiles := []tarballFile{{"file.txt", "best file ever"}, {"file2.txt", "worst file ever"}}
-		createTestTarball(&b, tFiles)
-		r := bytes.NewReader(b.Bytes())
-		tarf := tar.NewReader(r)
-		files, err := common.ExtractFilesFromTarball([]string{tFiles[0].Name, tFiles[1].Name}, tarf)
-		assert.NoErr(t, err)
-		assert.Equal(t, len(files), 2, "matches")
-		for _, f := range tFiles {
-			assert.Equal(t, files[f.Name], f.Body, "file body")
-		}
-	})
-
-	t.Run("file not found", func(t *testing.T) {
-		var b bytes.Buffer
-		createTestTarball(&b, []tarballFile{{"file.txt", "best file ever"}})
-		r := bytes.NewReader(b.Bytes())
-		tarf := tar.NewReader(r)
-		name := "file2.txt"
-		files, err := common.ExtractFilesFromTarball([]string{name}, tarf)
-		assert.NoErr(t, err)
-		assert.Equal(t, files[name], "", "file body")
-	})
-
-	t.Run("not a tarball", func(t *testing.T) {
-		b := make([]byte, 4)
-		rand.Read(b)
-		r := bytes.NewReader(b)
-		tarf := tar.NewReader(r)
-		files, err := common.ExtractFilesFromTarball([]string{"file2.txt"}, tarf)
-		assert.Err(t, io.ErrUnexpectedEOF, err)
-		assert.Equal(t, len(files), 0, "file body")
-	})
-}
-
-type tarballFile struct {
-	Name, Body string
-}
-
-func createTestTarball(w io.Writer, files []tarballFile) {
-	// Create a new tar archive.
-	tarw := tar.NewWriter(w)
-
-	// Add files to the archive.
-	for _, file := range files {
-		hdr := &tar.Header{
-			Name: file.Name,
-			Mode: 0600,
-			Size: int64(len(file.Body)),
-		}
-		if err := tarw.WriteHeader(hdr); err != nil {
-			log.Fatalln(err)
-		}
-		if _, err := tarw.Write([]byte(file.Body)); err != nil {
-			log.Fatalln(err)
-		}
-	}
-	// Make sure to check the error on Close.
-	if err := tarw.Close(); err != nil {
-		log.Fatal(err)
-	}
-}
-
-func Test_initNetClient(t *testing.T) {
-	// Test env
-	otherDir, err := ioutil.TempDir("", "ca-registry")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(otherDir)
-
-	// Create cert
-	caCert := `-----BEGIN CERTIFICATE-----
-MIIC6jCCAdKgAwIBAgIUKVfzA7lfBgSYP8enCVhlm0ql5YwwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAxMCQ0EwHhcNMTgxMjEyMTQxNzAwWhcNMjMxMjExMTQxNzAw
-WjANMQswCQYDVQQDEwJDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALZU3fsAgvoUuLSHr24apslaYyuX84wGoZQmtFtQ+A3DF9KL/2nn3yZ6qJPkH0TF
-sbObEQRNi+P6vQ3nI/dSNMX5PzMBP2CB6L7zEXzZQEHtAK0Bzva5CKEBGX7OfIKl
-aBvs+dzKVJBdb+Oh0maacMwa4QbcD6ejzF90jUbaO65lpQpcL7KQdppKOGNclRaA
-hQTV2VsxrV4hH7K9btaTTxso+8W6p8v6X9vf40Ywx72p+SKnGh+FCrOp1gYLBLwo
-4SM0OUQHRvqUlj0XhZk5pW0dMRwHcoz1S2GmE5bj4edr4j+zGzGxa2wRGKvM0OCn
-Do84AVszTFPmUf+mCl4pJNECAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFI5l5k+MEhrbOQ29dOW1qJhI0yKaMA0GCSqG
-SIb3DQEBCwUAA4IBAQByDebUOKzn6jfmXlW62vm09V+ipqId01wm21G9XMtMEqhc
-xtun6YwQeTuGPtdepWG+NXuSsiX/HNAHeaumJaaljHhdKDisnMQ0CTnNsu8NPkAl
-9iMEB3iXLWkb7+HgfPJAHZVGcMqMxNEMZYHB1Fh0G2Ne376X94+GYJ08qR2C8rUP
-BShhMSktB578h4GtPIWSjPhDUWg1fGe7sewR+GPyuL9859hOD0wGm9tUixBKloCu
-b90fhqZZ3FqZD7W1qJGKvz/8geqi0noip+uq/dokK1jarRkOVEJP+EvXkHo0tIuc
-h251U/Daz6NiQBM9AxyAw6EHm8XAZBvCuebfzyrT
------END CERTIFICATE-----`
-	otherCA := path.Join(otherDir, "ca.crt")
-	err = ioutil.WriteFile(otherCA, []byte(caCert), 0644)
-	if err != nil {
-		t.Error(err)
-	}
-
-	_, err = common.InitNetClient(otherCA, defaultTimeoutSeconds)
-	if err != nil {
-		t.Error(err)
-	}
-}
-
-var emptyRepoIndexYAMLBytes, _ = ioutil.ReadFile("testdata/empty-repo-index.yaml")
-var emptyRepoIndexYAML = string(emptyRepoIndexYAMLBytes)
-
-type emptyChartRepoHTTPClient struct{}
-
-func (h *emptyChartRepoHTTPClient) Do(req *http.Request) (*http.Response, error) {
-	w := httptest.NewRecorder()
-	w.Write([]byte(emptyRepoIndexYAML))
-	return w.Result(), nil
-}
-
-func Test_emptyChartRepo(t *testing.T) {
-	netClient = &emptyChartRepoHTTPClient{}
-	m := mock.Mock{}
-	dbClient := NewMockClient(&m)
-	//Expect a call to test the DB readiness
-	m.On("InsertOne", mock.Anything, mock.Anything, mock.Anything).Return(&mongo.InsertOneResult{}, nil)
-	m.On("DeleteMany", mock.Anything, mock.Anything, mock.Anything).Return(&mongo.DeleteResult{}, nil)
-
-	m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
-	err := SyncRepo(dbClient, "test", "testRepo", "https://my.examplerepo.com", "")
-	assert.ExistsErr(t, err, "Failed Request")
-}
-
-func Test_getSha256(t *testing.T) {
-	sha, err := common.GetSha256([]byte("this is a test"))
-	assert.Equal(t, err, nil, "Unable to get sha")
-	assert.Equal(t, sha, "2e99758548972a8e8822ad47fa1017ff72f06f3ff6a016851f45c398732bc50c", "Unable to get sha")
-}
-
-func Test_repoAlreadyProcessed(t *testing.T) {
-	tests := []struct {
-		name            string
-		checksum        string
-		mockedLastCheck common.RepoCheck
-		processed       bool
-	}{
-		{"not processed yet", "bar", common.RepoCheck{}, false},
-		{"already processed", "bar", common.RepoCheck{Checksum: "bar"}, true},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			m := mock.Mock{}
-			repo := &common.RepoCheck{}
-			m.On("FindOne", mock.Anything, mock.Anything, repo, mock.Anything).Run(func(args mock.Arguments) {
-				*args.Get(2).(*common.RepoCheck) = tt.mockedLastCheck
-			}).Return(nil)
-			dbClient := NewMockClient(&m)
-			db, _ := dbClient.Database("test")
-			res := repoAlreadyProcessed(db, "", tt.checksum)
-			if res != tt.processed {
-				t.Errorf("Expected alreadyProcessed to be %v got %v", tt.processed, res)
-			}
-		})
-	}
-}
-
-func Test_updateLastCheck(t *testing.T) {
-	m := mock.Mock{}
-	repoName := "foo"
-	checksum := "bar"
-	now := time.Now()
-	selector := bson.M{"_id": repoName}
-	m.On("UpdateOne", mock.Anything, selector, bson.M{"$set": bson.M{"last_update": now, "checksum": checksum}}, mock.Anything).Return(&mongo.UpdateResult{}, nil)
-	dbClient := NewMockClient(&m)
-	db, _ := dbClient.Database("test")
-	err := updateLastCheck(db, repoName, checksum, now)
-	if err != nil {
-		t.Errorf("Unexpected error %v", err)
-	}
-	if len(m.Calls) != 1 {
-		t.Errorf("Expected one call got %d", len(m.Calls))
-	}
-}
diff --git a/src/jetstream/plugins/monocular/chart-repo/go.mod b/src/jetstream/plugins/monocular/chart-repo/go.mod
deleted file mode 100644
index 8ba1b1a9dc..0000000000
--- a/src/jetstream/plugins/monocular/chart-repo/go.mod
+++ /dev/null
@@ -1,37 +0,0 @@
-module github.com/helm/monocular/chartrepo
-
-go 1.12
-
-require (
-	github.com/Masterminds/semver v1.5.0 // indirect
-	github.com/arschles/assert v1.0.0
-	github.com/cyphar/filepath-securejoin v0.2.2 // indirect
-	github.com/disintegration/imaging v1.6.2
-	github.com/ghodss/yaml v1.0.0
-	github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 // indirect
-	github.com/gobwas/glob v0.2.3 // indirect
-	github.com/golang/snappy v0.0.1 // indirect
-	github.com/google/uuid v1.1.1
-	github.com/gorilla/mux v1.7.3
-	github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40
-	github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a
-	github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a
-	github.com/prometheus/client_golang v1.2.1 // indirect
-	github.com/sirupsen/logrus v1.4.2
-	github.com/spf13/cobra v0.0.5
-	github.com/stretchr/testify v1.4.0
-	github.com/urfave/negroni v1.0.0
-	github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c // indirect
-	github.com/xdg/stringprep v1.0.0 // indirect
-	go.mongodb.org/mongo-driver v1.1.3
-	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
-	k8s.io/apimachinery v0.0.0-20191203211716-adc6f4cd9e7d // indirect
-	k8s.io/client-go v11.0.0+incompatible // indirect
-	k8s.io/helm v2.16.1+incompatible
-)
-
-replace (
-	github.com/helm/monocular/chartrepo/common => ./common
-	github.com/helm/monocular/chartrepo/foundationdb => ./foundationdb
-	github.com/helm/monocular/chartrepo/utils => ./utils
-)
diff --git a/src/jetstream/plugins/monocular/chart-repo/go.sum b/src/jetstream/plugins/monocular/chart-repo/go.sum
deleted file mode 100644
index b34c274aa1..0000000000
--- a/src/jetstream/plugins/monocular/chart-repo/go.sum
+++ /dev/null
@@ -1,230 +0,0 @@
-github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
-github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
-github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
-github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
-github.com/arschles/assert v1.0.0 h1:NofQbRhtxcLgP+XoKunA7J6UMJNTqX7xR/19tej8UsA=
-github.com/arschles/assert v1.0.0/go.mod h1:m/u69zW43x0h8dTHcv3JJZljINyEYgBuf5fYJP6WikI=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/cespare/xxhash/v2 v2.1.0 h1:yTUvW7Vhb89inJ+8irsUqiWjh8iT6sQPZiQzI6ReGkA=
-github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM=
-github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
-github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
-github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
-github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=
-github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
-github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
-github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
-github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
-github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
-github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
-github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=
-github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
-github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
-github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
-github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
-github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
-github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
-github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
-github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
-github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
-github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
-github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
-github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/helm/monocular v1.9.0 h1:jmCzg4mwHLLyL75/5Ekj3aqJs0Hr63fX3+n/hInwZ3U=
-github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40 h1:GT4RsKmHh1uZyhmTkWJTDALRjSHYQp6FRKrotf0zhAs=
-github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40/go.mod h1:NtmN9h8vrTveVQRLHcX2HQ5wIPBDCsZ351TGbZWgg38=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a h1:zPPuIq2jAWWPTrGt70eK/BSch+gFAGrNzecsoENgu2o=
-github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
-github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a h1:VqeX/fehAB6FtBox0TVYcjOMXGE56INQIfbXegditX4=
-github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
-github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
-github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
-github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
-github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.2.1 h1:JnMpQc6ppsNgw9QPAGF6Dod479itz7lvlsMzzNayLOI=
-github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.7.0 h1:L+1lyG48J1zAQXA3RBX/nG/B3gjlHq0zTt2tlbJLyCY=
-github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8=
-github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
-github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
-github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
-github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
-github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
-github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
-github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
-github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
-github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
-github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk=
-github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
-github.com/xdg/stringprep v1.0.0 h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0=
-github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
-github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-go.mongodb.org/mongo-driver v1.1.3 h1:++7u8r9adKhGR+I79NfEtYrk2ktjenErXM99PSufIoI=
-go.mongodb.org/mongo-driver v1.1.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 h1:mKdxBk7AujPs8kU4m80U72y/zjbZ3UcXC7dClwKbUI0=
-golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U=
-golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456 h1:ng0gs1AKnRRuEMZoTLLlbOd+C17zUDepwGQBb/n+JVg=
-golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191010194322-b09406accb47 h1:/XfQ9z7ib8eEJX2hdgFTZJ/ntt0swNk5oYBziWeTCvY=
-golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-k8s.io/apimachinery v0.0.0-20191203211716-adc6f4cd9e7d h1:q+OZmYewHJeMCzwpHkXlNTtk5bvaUMPCikKvf77RBlo=
-k8s.io/apimachinery v0.0.0-20191203211716-adc6f4cd9e7d/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg=
-k8s.io/client-go v11.0.0+incompatible h1:LBbX2+lOwY9flffWlJM7f1Ct8V2SRNiMRDFeiwnJo9o=
-k8s.io/client-go v11.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
-k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
-k8s.io/helm v2.16.1+incompatible h1:L+k810plJlaGWEw1EszeT4deK8XVaKxac1oGcuB+WDc=
-k8s.io/helm v2.16.1+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
-k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
-k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
-k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
-sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
-sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
diff --git a/src/jetstream/plugins/monocular/chart-repo/serve.go b/src/jetstream/plugins/monocular/chart-repo/serve.go
deleted file mode 100644
index 22589b0524..0000000000
--- a/src/jetstream/plugins/monocular/chart-repo/serve.go
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-Copyright (c) 2018 The Helm Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"os"
-
-	log "github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-)
-
-//ServeCmd Start an HTTP server to allow on-demand trigger of sync or delete
-var ServeCmd = &cobra.Command{
-	Use:   "serve",
-	Short: "Start an HTTP server for on-demand trigger of sync or delete",
-	Run: func(cmd *cobra.Command, args []string) {
-		fdbURL, err := cmd.Flags().GetString("doclayer-url")
-		if err != nil {
-			log.Fatal(err)
-		}
-		fDB, err := cmd.Flags().GetString("doclayer-database")
-		if err != nil {
-			log.Fatal(err)
-		}
-		cACert, err := cmd.Flags().GetString("cafile")
-		if err != nil {
-			log.Fatal(err)
-		}
-		key, err := cmd.Flags().GetString("keyfile")
-		if err != nil {
-			log.Fatal(err)
-		}
-		cert, err := cmd.Flags().GetString("certfile")
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		//TLS options must either be all set to enabled TLS, or none set to disable TLS
-		var tlsEnabled = cACert != "" && key != "" && cert != ""
-		if !(tlsEnabled || (cACert == "" && key == "" && cert == "")) {
-			cmd.Help()
-			log.Fatal("To enable TLS, all 3 TLS cert paths must be set.")
-		}
-
-		debug, err := cmd.Flags().GetBool("debug")
-		if err != nil {
-			log.Fatal(err)
-		}
-		authorizationHeader := os.Getenv("AUTHORIZATION_HEADER")
-
-		initOnDemandEndpoint(fdbURL, fDB, tlsEnabled, cACert, cert, key, authorizationHeader, debug)
-	},
-}
diff --git a/src/jetstream/plugins/monocular/chart-repo/sync.go b/src/jetstream/plugins/monocular/chart-repo/sync.go
deleted file mode 100644
index 5230e78ead..0000000000
--- a/src/jetstream/plugins/monocular/chart-repo/sync.go
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright (c) 2018 The Helm Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"github.com/helm/monocular/chartrepo/foundationdb"
-
-	log "github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-)
-
-//SyncCmd Sync a chart repository with Monocular
-var SyncCmd = &cobra.Command{
-	Use:   "sync [REPO NAME] [REPO URL]",
-	Short: "add a new chart repository, and resync its charts periodically",
-	Run: func(cmd *cobra.Command, args []string) {
-
-		if len(args) != 2 {
-			log.Info("Need exactly two arguments: [REPO NAME] [REPO URL]")
-			cmd.Help()
-			return
-		}
-		foundationdb.Sync(cmd, args)
-	},
-}
diff --git a/src/jetstream/plugins/monocular/chart-repo/testdata/empty-repo-index.yaml b/src/jetstream/plugins/monocular/chart-repo/testdata/empty-repo-index.yaml
deleted file mode 100644
index 9e608aa034..0000000000
--- a/src/jetstream/plugins/monocular/chart-repo/testdata/empty-repo-index.yaml
+++ /dev/null
@@ -1 +0,0 @@
-entries:
\ No newline at end of file
diff --git a/src/jetstream/plugins/monocular/chart-repo/testdata/valid-index.yaml b/src/jetstream/plugins/monocular/chart-repo/testdata/valid-index.yaml
deleted file mode 100644
index d5a93537c1..0000000000
--- a/src/jetstream/plugins/monocular/chart-repo/testdata/valid-index.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-entries:
-  acs-engine-autoscaler:
-  - apiVersion: v1
-    appVersion: 2.1.1
-    created: 2017-12-06T18:48:59.568323124Z
-    description: Scales worker nodes within agent pools
-    digest: 39e66eb53c310529bd9dd19776f8ba662e063a4ebd51fc5ec9f2267e2e073e3e
-    icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
-    maintainers:
-    - email: ritazh@microsoft.com
-      name: ritazh
-    - email: wibuch@microsoft.com
-      name: wbuchwalter
-    name: acs-engine-autoscaler
-    sources:
-    - https://github.com/wbuchwalter/Kubernetes-acs-engine-autoscaler
-    urls:
-    - https://kubernetes-charts.storage.googleapis.com/acs-engine-autoscaler-2.1.1.tgz
-    version: 2.1.1
-  wordpress:
-  - appVersion: 4.9.1
-    created: 2017-12-06T18:48:59.644981487Z
-    description: new description!
-    digest: 74889e60a35dcffa4686f88bb23de863fed2b6e63a69b1f4858dde37c301885c
-    engine: gotpl
-    home: http://www.wordpress.com/
-    icon: https://bitnami.com/assets/stacks/wordpress/img/wordpress-stack-220x234.png
-    keywords:
-    - wordpress
-    - cms
-    - blog
-    - http
-    - web
-    - application
-    - php
-    maintainers:
-    - email: containers@bitnami.com
-      name: bitnami-bot
-    name: wordpress
-    sources:
-    - https://github.com/bitnami/bitnami-docker-wordpress
-    urls:
-    - https://kubernetes-charts.storage.googleapis.com/wordpress-0.7.5.tgz
-    version: 0.7.5
-  - appVersion: 4.9.0
-    created: 2017-12-01T11:49:00.136950565Z
-    description: Web publishing platform for building blogs and websites.
-    digest: a69139ef3008eeb11ca60261ec2ded61e84ce7db32bb3626056e84bcff7ec270
-    engine: gotpl
-    home: http://www.wordpress.com/
-    icon: https://bitnami.com/assets/stacks/wordpress/img/wordpress-stack-220x234.png
-    keywords:
-    - wordpress
-    - cms
-    - cms
-    - blog
-    - http
-    - web
-    - application
-    - php
-    maintainers:
-    - email: containers@bitnami.com
-      name: bitnami-bot
-    name: wordpress
-    sources:
-    - https://github.com/bitnami/bitnami-docker-wordpress
-    urls:
-    - https://kubernetes-charts.storage.googleapis.com/wordpress-0.7.4.tgz
-    version: 0.7.4
diff --git a/src/jetstream/plugins/monocular/chart-repo/utils/version.go b/src/jetstream/plugins/monocular/chart-repo/utils/version.go
deleted file mode 100644
index e30f658e8c..0000000000
--- a/src/jetstream/plugins/monocular/chart-repo/utils/version.go
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright (c) 2018 The Helm Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package utils
-
-import (
-	"fmt"
-
-	"github.com/spf13/cobra"
-)
-
-var (
-	Version          = "devel"
-	UserAgentComment string
-)
-
-// UserAgent returns the user agent to be used during calls to the chart repositories
-// Examples:
-// chart-repo/devel
-// chart-repo/1.0
-// chart-repo/1.0 (monocular v1.0-beta4)
-// More info here https://github.com/kubeapps/kubeapps/issues/767#issuecomment-436835938
-func UserAgent() string {
-	ua := "chart-repo/" + Version
-	if UserAgentComment != "" {
-		ua = fmt.Sprintf("%s (%s)", ua, UserAgentComment)
-	}
-	return ua
-}
-
-//VersionCmd returns Monocular version information
-var VersionCmd = &cobra.Command{
-	Use:   "version",
-	Short: "returns version information",
-	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println(Version)
-	},
-}
diff --git a/src/jetstream/plugins/monocular/chartsvc/models/chart.go b/src/jetstream/plugins/monocular/chart.go
similarity index 57%
rename from src/jetstream/plugins/monocular/chartsvc/models/chart.go
rename to src/jetstream/plugins/monocular/chart.go
index 7501f85c36..70e9c4a763 100644
--- a/src/jetstream/plugins/monocular/chartsvc/models/chart.go
+++ b/src/jetstream/plugins/monocular/chart.go
@@ -14,12 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package models
+package monocular
 
 import (
 	"time"
-
-	"k8s.io/helm/pkg/proto/hapi/chart"
 )
 
 // Repo holds the App repository details
@@ -30,18 +28,18 @@ type Repo struct {
 
 // Chart is a higher-level representation of a chart package
 type Chart struct {
-	ID              string             `json:"-" bson:"_id"`
-	Name            string             `json:"name"`
-	Repo            Repo               `json:"repo"`
-	Description     string             `json:"description"`
-	Home            string             `json:"home"`
-	Keywords        []string           `json:"keywords"`
-	Maintainers     []chart.Maintainer `json:"maintainers"`
-	Sources         []string           `json:"sources"`
-	Icon            string             `json:"icon"`
-	RawIcon         []byte             `json:"-" bson:"raw_icon"`
-	IconContentType string             `json:"-" bson:"icon_content_type,omitempty"`
-	ChartVersions   []ChartVersion     `json:"-"`
+	ID              string            `json:"-"`
+	Name            string            `json:"name"`
+	Repo            Repo              `json:"repo"`
+	Description     string            `json:"description"`
+	Home            string            `json:"home"`
+	Keywords        []string          `json:"keywords"`
+	Maintainers     []ChartMaintainer `json:"maintainers"`
+	Sources         []string          `json:"sources"`
+	Icon            string            `json:"icon"`
+	RawIcon         []byte            `json:"-"`
+	IconContentType string            `json:"-"`
+	ChartVersions   []ChartVersion    `json:"-"`
 }
 
 // ChartVersion is a representation of a specific version of a chart
@@ -51,17 +49,9 @@ type ChartVersion struct {
 	Created    time.Time `json:"created"`
 	Digest     string    `json:"digest"`
 	URLs       []string  `json:"urls"`
-	Readme     string    `json:"readme" bson:"-"`
-	Values     string    `json:"values" bson:"-"`
-	Schema     string    `json:"schema" bson:"-"`
-}
-
-// ChartFiles holds the README and values for a given chart version
-type ChartFiles struct {
-	ID     string `bson:"_id"`
-	Readme string
-	Values string
-	Schema string
+	Readme     string    `json:"readme,omitempty"`
+	Values     string    `json:"values,omitempty"`
+	Schema     string    `json:"schema,omitempty"`
 }
 
 //RepoCheck describes the state of a repository in terms its current checksum and last update time.
diff --git a/src/jetstream/plugins/monocular/chart_svc.go b/src/jetstream/plugins/monocular/chart_svc.go
new file mode 100644
index 0000000000..770d0d69fc
--- /dev/null
+++ b/src/jetstream/plugins/monocular/chart_svc.go
@@ -0,0 +1,283 @@
+package monocular
+
+import (
+	"errors"
+	"fmt"
+	"net/http"
+	"os"
+	"path"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/monocular/store"
+	"github.com/labstack/echo"
+	log "github.com/sirupsen/logrus"
+)
+
+// Functions to provide a Monocular compatible API with our chart store
+
+// List all helm Charts - gets the latest version for each Chart
+func (m *Monocular) listCharts(c echo.Context) error {
+	log.Debug("List Charts called")
+
+	// Check if this is a request for an external Monocular
+	if handled, err := m.processMonocularRequest(c); handled {
+		return err
+	}
+
+	charts, err := m.ChartStore.GetLatestCharts()
+	if err != nil {
+		return err
+	}
+
+	// Translate the list into an array of Charts
+	var list APIListResponse
+	for _, chart := range charts {
+		list = append(list, m.translateToChartAPIResponse(chart, nil))
+	}
+
+	meta := Meta{
+		TotalPages: 1,
+	}
+
+	body := BodyAPIListResponse{
+		Data: &list,
+		Meta: meta,
+	}
+
+	return c.JSON(200, body)
+}
+
+// Get the latest version of a given chart
+func (m *Monocular) getChart(c echo.Context) error {
+	log.Debug("Get Chart called")
+
+	// Check if this is a request for an external Monocular
+	if handled, err := m.processMonocularRequest(c); handled {
+		return err
+	}
+
+	repo := c.Param("repo")
+	chartName := c.Param("name")
+
+	chart, err := m.ChartStore.GetChart(repo, chartName, "")
+	if err != nil {
+		return err
+	}
+
+	chartYaml := m.getChartYaml(*chart)
+	body := BodyAPIResponse{
+		Data: *m.translateToChartAPIResponse(chart, chartYaml),
+	}
+	return c.JSON(200, body)
+}
+
+func (m *Monocular) getIcon(c echo.Context) error {
+	log.Debug("Get Icon called")
+
+	// Check if this is a request for an external Monocular
+	if handled, err := m.processMonocularRequest(c); handled {
+		return err
+	}
+
+	repo := c.Param("repo")
+	chartName := c.Param("chartName")
+	version := c.Param("version")
+
+	if len(version) == 0 {
+		log.Debugf("Get icon for %s/%s", repo, chartName)
+	} else {
+		log.Debugf("Get icon for %s/%s-%s", repo, chartName, version)
+	}
+
+	chart, err := m.ChartStore.GetChart(repo, chartName, version)
+	if err != nil {
+		log.Error("Can not find chart")
+		return errors.New("Error")
+	}
+
+	// This will download and cache the icon if it is not already cached - it returns the local file path to the icon file
+	// or an empty string if no icon is available or could not be downloaded
+	iconFilePath, _ := m.cacheChartIcon(*chart)
+	if len(iconFilePath) == 0 {
+		// No icon or error downloading
+		http.Redirect(c.Response().Writer, c.Request(), "/core/assets/custom/placeholder.png", http.StatusTemporaryRedirect)
+		return nil
+	}
+
+	c.File(iconFilePath)
+	return nil
+}
+
+// /chartsvc/v1/charts/:repo/:name/versions/:version
+// Get specific chart version
+func (m *Monocular) getChartVersion(c echo.Context) error {
+	log.Debug("getChartAndVersion called")
+
+	// Check if this is a request for an external Monocular
+	if handled, err := m.processMonocularRequest(c); handled {
+		return err
+	}
+
+	repo := c.Param("repo")
+	chartName := c.Param("name")
+	version := c.Param("version")
+
+	chart, err := m.ChartStore.GetChart(repo, chartName, version)
+	if err != nil {
+		return err
+	}
+
+	chartYaml := m.getChartYaml(*chart)
+	if chartYaml == nil {
+		// Error - could not get chart yaml
+		return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Can not find Chart.yaml for %s/%s-%s", repo, chartName, version))
+	}
+
+	body := BodyAPIResponse{
+		Data: *m.translateToChartVersionAPIResponse(chart, chartYaml),
+	}
+	return c.JSON(200, body)
+}
+
+// /chartsvc/v1/charts/:repo/:name/versions
+// Get all chart versions for a given chart
+func (m *Monocular) getChartVersions(c echo.Context) error {
+
+	// Check if this is a request for an external Monocular
+	if handled, err := m.processMonocularRequest(c); handled {
+		return err
+	}
+
+	repo := c.Param("repo")
+	chartName := c.Param("name")
+
+	// Get all versions for a given chart
+	charts, err := m.ChartStore.GetChartVersions(repo, chartName)
+	if err != nil {
+		return err
+	}
+
+	// Translate the list into an array of Charts
+	var list APIListResponse
+	for _, chart := range charts {
+		list = append(list, m.translateToChartVersionAPIResponse(chart, nil))
+	}
+
+	body := BodyAPIListResponse{
+		Data: &list,
+	}
+
+	return c.JSON(200, body)
+}
+
+// Get a file such as the README or valyes for a given chart version
+func (m *Monocular) getChartAndVersionFile(c echo.Context) error {
+	log.Debug("Get Chart file called")
+
+	// Check if this is a request for an external Monocular
+	if handled, err := m.processMonocularRequest(c); handled {
+		return err
+	}
+
+	repo := c.Param("repo")
+	chartName := c.Param("name")
+	version := c.Param("version")
+	filename := c.Param("filename")
+
+	log.Debugf("Get chart file: %s", filename)
+
+	chart, err := m.ChartStore.GetChart(repo, chartName, version)
+	if err != nil {
+		return err
+	}
+
+	if m.cacheChart(*chart) == nil {
+		return c.File(path.Join(m.getChartCacheFolder(*chart), filename))
+	}
+
+	return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Can not find file %s for the specified chart", filename))
+}
+
+// This is the simpler version that returns just enough data needed for the Charts list view
+// This is a slight cheat - the response is not as complete as the Monocular API, but includes
+// enough for the UI and saves us having to pull out all of the Chart.yaml files
+func (m *Monocular) translateToChartAPIResponse(record *store.ChartStoreRecord, chartYaml *ChartMetadata) *APIResponse {
+	response := &APIResponse{
+		ID:            fmt.Sprintf("%s/%s", record.Repository, record.Name),
+		Type:          "chart",
+		Relationships: make(map[string]Rel),
+		Attributes:    m.translateToChart(record, chartYaml),
+	}
+
+	response.Relationships["latestChartVersion"] = Rel{
+		Data: m.translateToChartVersion(record, chartYaml),
+	}
+	return response
+}
+
+func (m *Monocular) translateToChart(record *store.ChartStoreRecord, chartYaml *ChartMetadata) Chart {
+	chart := Chart{
+		Name:        record.Name,
+		Description: record.Description,
+		Repo:        Repo{},
+		Icon:        fmt.Sprintf("/v1/assets/%s/%s/%s/logo", record.Repository, record.Name, record.Version),
+		Sources:     record.Sources,
+	}
+
+	chart.Repo.Name = record.Repository
+
+	if chartYaml != nil {
+		chart.Keywords = chartYaml.Keywords
+		chart.Maintainers = make([]ChartMaintainer, len(chartYaml.Maintainers))
+		for index, maintainer := range chartYaml.Maintainers {
+			chart.Maintainers[index] = *maintainer
+		}
+
+		chart.Home = chartYaml.Home
+	}
+
+	return chart
+}
+
+func (m *Monocular) translateToChartVersion(record *store.ChartStoreRecord, chartYaml *ChartMetadata) ChartVersion {
+	chartVersion := ChartVersion{
+		Version:    record.Version,
+		AppVersion: record.AppVersion,
+		Digest:     record.Digest,
+		Created:    record.Created,
+		URLs:       make([]string, 1),
+	}
+	chartVersion.URLs[0] = record.ChartURL
+	if chartYaml != nil {
+		// If we have the Chart yaml, then we already have the chart
+		// Add in the files that are available
+		cacheFolder := m.getChartCacheFolder(*record)
+		chartVersion.Readme = getFileAssetURL(record.Repository, record.Name, record.Version, cacheFolder, "README.md")
+		chartVersion.Schema = getFileAssetURL(record.Repository, record.Name, record.Version, cacheFolder, "values.schema.json")
+		chartVersion.Values = getFileAssetURL(record.Repository, record.Name, record.Version, cacheFolder, "values.yaml")
+	}
+
+	return chartVersion
+}
+
+func (m *Monocular) translateToChartVersionAPIResponse(record *store.ChartStoreRecord, chartYaml *ChartMetadata) *APIResponse {
+	response := &APIResponse{
+		ID:            fmt.Sprintf("%s/%s-%s", record.Repository, record.Name, record.Version),
+		Type:          "chartVersion",
+		Relationships: make(map[string]Rel),
+		Attributes:    m.translateToChartVersion(record, chartYaml),
+	}
+
+	response.Relationships["chart"] = Rel{
+		Data: m.translateToChart(record, chartYaml),
+	}
+	return response
+}
+
+func getFileAssetURL(repo, name, version, folder, filename string) string {
+	cachePath := path.Join(folder, filename)
+	if _, err := os.Stat(cachePath); os.IsNotExist(err) {
+		return ""
+	}
+
+	return fmt.Sprintf("/v1/assets/%s/%s/versions/%s/%s", repo, name, version, filename)
+}
diff --git a/src/jetstream/plugins/monocular/chartsvc/Dockerfile b/src/jetstream/plugins/monocular/chartsvc/Dockerfile
deleted file mode 100644
index 9f4ce2c0bc..0000000000
--- a/src/jetstream/plugins/monocular/chartsvc/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM golang:1.12 as builder
-COPY . /go/src/github.com/helm/monocular/chartsvc
-WORKDIR /go/src/github.com/helm/monocular/chartsvc
-RUN GO111MODULE=on GOPROXY=https://gocenter.io CGO_ENABLED=0 go build -a -installsuffix cgo .
-FROM scratch
-COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY --from=builder /go/src/github.com/helm/monocular/chartsvc /chartsvc
-EXPOSE 8080
-CMD ["/chartsvc"]
diff --git a/src/jetstream/plugins/monocular/chartsvc/Makefile b/src/jetstream/plugins/monocular/chartsvc/Makefile
deleted file mode 100644
index ef0b800ae2..0000000000
--- a/src/jetstream/plugins/monocular/chartsvc/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-IMAGE_REPO ?= docker.io/kreinecke/suse-fdb-chartsvc
-IMAGE_TAG ?= latest
-
-docker-build:
-	# We use the context of the root dir
-	docker build --pull --rm -t ${IMAGE_REPO}:${IMAGE_TAG} -f Dockerfile .
diff --git a/src/jetstream/plugins/monocular/chartsvc/README.md b/src/jetstream/plugins/monocular/chartsvc/README.md
deleted file mode 100644
index 2cc0afc9d3..0000000000
--- a/src/jetstream/plugins/monocular/chartsvc/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Chartsvc
-
-Chartsvc is a service for Monocular that reads chart metadata from the database
-and presents it in a RESTful API. It should be used with the
-[chart-repo](https://github.com/helm/monocular/tree/master/cmd/chart-repo) to
-populate chart metadata in the database.
diff --git a/src/jetstream/plugins/monocular/chartsvc/datastore.go b/src/jetstream/plugins/monocular/chartsvc/datastore.go
deleted file mode 100644
index 0e789c277c..0000000000
--- a/src/jetstream/plugins/monocular/chartsvc/datastore.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package chartsvc
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/helm/monocular/chartsvc/foundationdb"
-	"github.com/helm/monocular/chartsvc/foundationdb/datastore"
-	"github.com/helm/monocular/chartsvc/models"
-	log "github.com/sirupsen/logrus"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
-)
-
-const chartCollection = "charts"
-
-type ChartSvcDatastore struct {
-	dbClient datastore.Client
-	db       datastore.Database
-	dbCloser func()
-}
-
-func (m *ChartSvcDatastore) ListRepositories() ([]string, error) {
-	return foundationdb.ListRepositories()
-}
-
-// GetChart returns the chart with the given ID
-func (m *ChartSvcDatastore) GetChart(chartID string) (models.Chart, error) {
-	var chart models.Chart
-
-	chartCollection := m.db.Collection(chartCollection)
-	filter := bson.M{"_id": chartID}
-	findResult := chartCollection.FindOne(context.Background(), filter, &chart, options.FindOne())
-	if findResult == mongo.ErrNoDocuments {
-		log.WithError(findResult).Errorf("could not find chart with id %s", chartID)
-		return chart, fmt.Errorf("could not find chart with id %s", chartID)
-	}
-
-	return chart, nil
-}
diff --git a/src/jetstream/plugins/monocular/chartsvc/foundationdb/datastore/datastore.go b/src/jetstream/plugins/monocular/chartsvc/foundationdb/datastore/datastore.go
deleted file mode 100644
index 37ac06d008..0000000000
--- a/src/jetstream/plugins/monocular/chartsvc/foundationdb/datastore/datastore.go
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
-Copyright (c) 2019
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Package datastore implements an interface on top of the mgo mongo client
-package datastore
-
-import (
-	"context"
-	"fmt"
-	"reflect"
-	"time"
-
-	log "github.com/sirupsen/logrus"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
-)
-
-const defaultTimeout = 30 * time.Second
-
-// Config configures the database connection
-type Config struct {
-	URL      string
-	Database string
-	Timeout  time.Duration
-}
-
-// Client is an interface for a MongoDB client
-type Client interface {
-	Database(name string) (Database, func())
-}
-
-// Database is an interface for accessing a MongoDB database
-type Database interface {
-	Collection(name string) Collection
-}
-
-// Collection is an interface for accessing a MongoDB collection
-type Collection interface {
-	BulkWrite(ctxt context.Context, operations []mongo.WriteModel, options *options.BulkWriteOptions) (*mongo.BulkWriteResult, error)
-	DeleteMany(ctxt context.Context, filter interface{}, options *options.DeleteOptions) (*mongo.DeleteResult, error)
-	FindOne(ctxt context.Context, filter interface{}, result interface{}, options *options.FindOneOptions) error
-	InsertOne(ctxt context.Context, document interface{}, options *options.InsertOneOptions) (*mongo.InsertOneResult, error)
-	UpdateOne(ctxt context.Context, filter interface{}, update interface{}, options *options.UpdateOptions) (*mongo.UpdateResult, error)
-	Find(ctxt context.Context, filter interface{}, result interface{}, options *options.FindOptions) error
-}
-
-// mongoDatabase wraps a mongo.Database and implements Collection
-type mongoDatabase struct {
-	Database *mongo.Database
-}
-
-// mongoClient wraps a mongo.Client and implements Database
-type mongoClient struct {
-	Client *mongo.Client
-}
-
-// NewDocLayerClient creates a new MongoDB client for the FoundationDB document layer.
-func NewDocLayerClient(ctx context.Context, options *options.ClientOptions) (Client, error) {
-	client, err := mongo.Connect(ctx, options)
-	return &mongoClient{client}, err
-}
-
-func (c *mongoClient) Database(dbName string) (Database, func()) {
-
-	db := &mongoDatabase{c.Client.Database(dbName)}
-
-	return db, func() {
-		log.Infof("Closing db connection")
-		err := c.Client.Disconnect(context.Background())
-
-		if err != nil {
-			log.Fatal(err)
-		}
-		fmt.Println("Connection to MongoDB closed.")
-	}
-}
-
-func (d *mongoDatabase) Collection(name string) Collection {
-	return &mongoCollection{d.Database.Collection(name)}
-}
-
-// mgoCollection wraps an mgo.Collection and implements Collection
-type mongoCollection struct {
-	Collection *mongo.Collection
-}
-
-func (c *mongoCollection) BulkWrite(ctxt context.Context, operations []mongo.WriteModel, options *options.BulkWriteOptions) (*mongo.BulkWriteResult, error) {
-	res, err := c.Collection.BulkWrite(ctxt, operations, options)
-	return res, err
-}
-
-func (c *mongoCollection) DeleteMany(ctxt context.Context, filter interface{}, options *options.DeleteOptions) (*mongo.DeleteResult, error) {
-	res, err := c.Collection.DeleteMany(ctxt, filter, options)
-	return res, err
-}
-
-func (c *mongoCollection) FindOne(ctxt context.Context, filter interface{}, result interface{}, options *options.FindOneOptions) error {
-	res := c.Collection.FindOne(ctxt, filter, options)
-	return res.Decode(result)
-}
-
-func (c *mongoCollection) InsertOne(ctxt context.Context, document interface{}, options *options.InsertOneOptions) (*mongo.InsertOneResult, error) {
-	res, err := c.Collection.InsertOne(ctxt, document, options)
-	return res, err
-}
-
-func (c *mongoCollection) UpdateOne(ctxt context.Context, filter interface{}, document interface{}, options *options.UpdateOptions) (*mongo.UpdateResult, error) {
-	res, err := c.Collection.UpdateOne(ctxt, filter, document, options)
-	return res, err
-}
-
-func (c *mongoCollection) Find(ctxt context.Context, filter interface{}, result interface{}, options *options.FindOptions) error {
-	resCursor, err := c.Collection.Find(ctxt, filter, options)
-	if err != nil {
-		log.WithError(err).Errorf(
-			"Error fetching query result.")
-	} else {
-		resultType := reflect.ValueOf(result)
-		if resultType.Kind() != reflect.Ptr {
-			return fmt.Errorf("Result arg must be a pointer type. Got: %v", resultType.Kind())
-		}
-		resultSliceType := resultType.Elem()
-		if resultSliceType.Kind() != reflect.Slice {
-			return fmt.Errorf("Result arg must be a slice value. Got: %v", resultSliceType.Kind())
-		}
-		err = resCursor.All(context.Background(), result)
-		if err != nil {
-			log.WithError(err).Errorf(
-				"Error decoding query result.")
-		}
-	}
-	return err
-}
diff --git a/src/jetstream/plugins/monocular/chartsvc/foundationdb/datastore/mockstore.go b/src/jetstream/plugins/monocular/chartsvc/foundationdb/datastore/mockstore.go
deleted file mode 100644
index 053ffea382..0000000000
--- a/src/jetstream/plugins/monocular/chartsvc/foundationdb/datastore/mockstore.go
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-Copyright (c) 2019
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package datastore
-
-import (
-	"context"
-
-	"github.com/stretchr/testify/mock"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
-)
-
-// mockDatabase acts as a mock datastore.Database
-type mockDatabase struct {
-	*mock.Mock
-}
-
-type mockClient struct {
-	*mock.Mock
-}
-
-//NewMockClient returns a mocked FDB Document-Layer client
-func NewMockClient(m *mock.Mock) Client {
-	return mockClient{m}
-}
-
-// DB returns a mocked datastore.Database and empty closer function
-func (c mockClient) Database(dbName string) (Database, func()) {
-
-	db := mockDatabase{c.Mock}
-
-	return db, func() {
-	}
-}
-
-func (d mockDatabase) Collection(name string) Collection {
-	return mockCollection{d.Mock}
-}
-
-// mockCollection acts as a mock datastore.Collection
-type mockCollection struct {
-	*mock.Mock
-}
-
-func (c mockCollection) BulkWrite(ctxt context.Context, operations []mongo.WriteModel, options *options.BulkWriteOptions) (*mongo.BulkWriteResult, error) {
-	args := c.Called(ctxt, operations, options)
-	return args.Get(0).(*mongo.BulkWriteResult), args.Error(1)
-}
-
-func (c mockCollection) DeleteMany(ctxt context.Context, filter interface{}, options *options.DeleteOptions) (*mongo.DeleteResult, error) {
-	args := c.Called(ctxt, filter, options)
-	return args.Get(0).(*mongo.DeleteResult), args.Error(1)
-}
-
-func (c mockCollection) FindOne(ctxt context.Context, filter interface{}, result interface{}, options *options.FindOneOptions) error {
-	args := c.Called(ctxt, filter, result, options)
-	return args.Error(0)
-}
-
-func (c mockCollection) InsertOne(ctxt context.Context, document interface{}, options *options.InsertOneOptions) (*mongo.InsertOneResult, error) {
-	args := c.Called(ctxt, document, options)
-	return args.Get(0).(*mongo.InsertOneResult), args.Error(1)
-}
-
-func (c mockCollection) UpdateOne(ctxt context.Context, filter interface{}, document interface{}, options *options.UpdateOptions) (*mongo.UpdateResult, error) {
-	args := c.Called(ctxt, filter, document, options)
-	return args.Get(0).(*mongo.UpdateResult), args.Error(1)
-}
-
-func (c mockCollection) Find(ctxt context.Context, filter interface{}, result interface{}, options *options.FindOptions) error {
-	args := c.Called(ctxt, filter, result, options)
-	return args.Error(0)
-}
diff --git a/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go b/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go
deleted file mode 100644
index d937f43c06..0000000000
--- a/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler.go
+++ /dev/null
@@ -1,541 +0,0 @@
-/*
-Copyright (c) 2019
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package foundationdb
-
-import (
-	"context"
-	"fmt"
-	"math"
-	"net/http"
-	"sort"
-	"strconv"
-	"strings"
-
-	"github.com/helm/monocular/chartsvc/foundationdb/datastore"
-	"github.com/helm/monocular/chartsvc/models"
-	"github.com/helm/monocular/chartsvc/utils"
-
-	"github.com/gorilla/mux"
-	"github.com/kubeapps/common/response"
-	log "github.com/sirupsen/logrus"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
-)
-
-// Params a key-value map of path params
-type Params map[string]string
-
-// WithParams can be used to wrap handlers to take an extra arg for path params
-type WithParams func(http.ResponseWriter, *http.Request, Params)
-
-func (h WithParams) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	vars := mux.Vars(req)
-	h(w, req, vars)
-}
-
-const chartCollection = "charts"
-const filesCollection = "files"
-const repoCollection = "repos"
-
-// count is used to parse the result of a $count operation in the database
-type count struct {
-	Count int
-}
-
-var dbClient datastore.Client
-var db datastore.Database
-var dbCloser func()
-
-//var db mongo.Database
-var dbName string
-var pathPrefix string
-
-//SetPathPrefix sets the URL prefix for the ChartSVC API endpoint
-func SetPathPrefix(prefix string) {
-	pathPrefix = prefix
-}
-
-//InitDBConfig sets FDB Document-Layer client and DB config for the ChartSVC API handler
-func InitDBConfig(client datastore.Client, name string) {
-	dbClient = client
-	db, dbCloser = dbClient.Database(name)
-	dbName = name
-}
-
-// getPageNumberAndSize extracts the page number and size of a request. Default (1, 0) if not set
-func getPageNumberAndSize(req *http.Request) (int, int) {
-	page := req.FormValue("page")
-	size := req.FormValue("size")
-	pageInt, err := strconv.ParseUint(page, 10, 64)
-	if err != nil {
-		pageInt = 1
-	}
-	// ParseUint will return 0 if size is a not positive integer
-	sizeInt, _ := strconv.ParseUint(size, 10, 64)
-	return int(pageInt), int(sizeInt)
-}
-
-// showDuplicates returns if a request wants to retrieve charts. Default false
-func showDuplicates(req *http.Request) bool {
-	return len(req.FormValue("showDuplicates")) > 0
-}
-
-// min returns the minimum of two integers.
-// We are not using math.Min since that compares float64
-// and it's unnecessarily complex.
-func min(a, b int) int {
-	if a < b {
-		return a
-	}
-	return b
-}
-
-func uniqChartList(charts []*models.Chart) []*models.Chart {
-	// We will keep track of unique digest:chart to avoid duplicates
-	chartDigests := map[string]bool{}
-	res := []*models.Chart{}
-	for _, c := range charts {
-		digest := c.ChartVersions[0].Digest
-		// Filter out the chart if we've seen the same digest before
-		if _, ok := chartDigests[digest]; !ok {
-			chartDigests[digest] = true
-			res = append(res, c)
-		}
-	}
-	return res
-}
-
-func getPaginatedChartList(repo string, pageNumber, pageSize int, showDuplicates bool) (utils.ApiListResponse, interface{}, error) {
-	log.Debugf("Request for paginated chart list for repo %v", repo)
-
-	//Find all charts for repo name and sort by chart name
-	collection := db.Collection(chartCollection)
-	filter := bson.M{}
-	if repo != "" {
-		filter = bson.M{"repo.name": repo}
-	}
-	var charts []*models.Chart
-	err := collection.Find(context.Background(), filter, &charts, options.Find())
-	if err != nil {
-		log.WithError(err).Errorf(
-			"Error fetching charts from DB for pagination %s",
-			repo,
-		)
-		return newChartListResponse([]*models.Chart{}), utils.Meta{TotalPages: 0}, err
-	}
-	var tempChartMap map[string]*models.Chart = make(map[string]*models.Chart)
-
-	chartsToSort := make([]*models.Chart, 0, len(tempChartMap))
-
-	if !showDuplicates {
-		for _, chart := range charts {
-			log.Debugf("Chart digest: %v.", chart.ChartVersions[0].Digest)
-			tempChartMap[chart.ChartVersions[0].Digest] = chart
-		}
-		log.Debugf("Charts in map: %v", len(tempChartMap))
-		//Now just get all the values from our map
-		for _, v := range tempChartMap {
-			log.Debugf("Adding chart: %v to unique chart list.", *v)
-			chartsToSort = append(chartsToSort, v)
-		}
-	} else {
-		chartsToSort = charts
-	}
-
-	//Sort the list of paginated charts by name
-	sort.Slice(chartsToSort, func(i, j int) bool {
-		return chartsToSort[i].Name < chartsToSort[j].Name
-	})
-
-	sortedCharts := chartsToSort
-	log.Debugf("Charts in sorted list: %v", len(sortedCharts))
-	log.Debugf("Page size requested: %v", pageSize)
-	var paginatedCharts = sortedCharts
-	totalPages := 1
-	if pageSize != 0 {
-		// If a pageSize is given, returns only the the specified number of charts and
-		// the number of pages
-		cc := count{}
-		cc.Count = len(sortedCharts)
-		totalPages = int(math.Ceil(float64(cc.Count) / float64(pageSize)))
-
-		// If the page number is out of range, return the last one
-		if pageNumber > totalPages {
-			pageNumber = totalPages
-		}
-		paginatedCharts = sortedCharts[(pageNumber-1)*pageSize : pageNumber*pageSize]
-	}
-
-	log.Debugf("Returning %v charts, Done.", len(paginatedCharts))
-	return newChartListResponse(paginatedCharts), utils.Meta{TotalPages: totalPages}, nil
-}
-
-//ListRepositories returns a list of names of all stored repositories
-func ListRepositories() ([]string, error) {
-	var repoNames []string
-	//Find all repo names
-	collection := db.Collection(repoCollection)
-	filter := bson.M{}
-	var lastChecks []*models.RepoCheck
-	err := collection.Find(context.Background(), filter, &lastChecks, options.Find())
-	if err != nil {
-		log.WithError(err).Error("could not fetch repositories")
-		return repoNames, err
-	}
-	for i := range lastChecks {
-		repoNames = append(repoNames, lastChecks[i].ID)
-	}
-	return repoNames, nil
-}
-
-// ListCharts returns a list of charts
-func ListCharts(w http.ResponseWriter, req *http.Request) {
-	log.Debug("Request for charts..")
-	pageNumber, pageSize := getPageNumberAndSize(req)
-	cl, meta, err := getPaginatedChartList("", pageNumber, pageSize, showDuplicates(req))
-	if err != nil {
-		log.WithError(err).Error("could not fetch charts")
-		response.NewErrorResponse(http.StatusInternalServerError, "could not fetch all charts").Write(w)
-		return
-	}
-	response.NewDataResponseWithMeta(cl, meta).Write(w)
-	log.Debug("Done.")
-}
-
-// ListRepoCharts returns a list of charts in the given repo
-func ListRepoCharts(w http.ResponseWriter, req *http.Request, params Params) {
-	log.Debug("Request for charts..")
-	pageNumber, pageSize := getPageNumberAndSize(req)
-	cl, meta, err := getPaginatedChartList(params["repo"], pageNumber, pageSize, showDuplicates(req))
-	if err != nil {
-		log.WithError(err).Error("could not fetch charts")
-		response.NewErrorResponse(http.StatusInternalServerError, "could not fetch all charts").Write(w)
-		return
-	}
-	response.NewDataResponseWithMeta(cl, meta).Write(w)
-	log.Debug("Done.")
-}
-
-// GetChart returns the chart from the given repo
-func GetChart(w http.ResponseWriter, req *http.Request, params Params) {
-	var chart models.Chart
-	chartID := fmt.Sprintf("%s/%s", params["repo"], params["chartName"])
-
-	chartCollection := db.Collection(chartCollection)
-	filter := bson.M{"_id": chartID}
-	findResult := chartCollection.FindOne(context.Background(), filter, &chart, options.FindOne())
-	if findResult == mongo.ErrNoDocuments {
-		log.WithError(findResult).Errorf("could not find chart with id %s", chartID)
-		response.NewErrorResponse(http.StatusNotFound, "could not find chart").Write(w)
-		return
-	}
-
-	cr := newChartResponse(&chart)
-	response.NewDataResponse(cr).Write(w)
-}
-
-// ListChartVersions returns a list of chart versions for the given chart
-func ListChartVersions(w http.ResponseWriter, req *http.Request, params Params) {
-	var chart models.Chart
-	chartID := fmt.Sprintf("%s/%s", params["repo"], params["chartName"])
-
-	chartCollection := db.Collection(chartCollection)
-	filter := bson.M{"_id": chartID}
-	findResult := chartCollection.FindOne(context.Background(), filter, &chart, options.FindOne())
-	if findResult == mongo.ErrNoDocuments {
-		log.WithError(findResult).Errorf("could not find chart with id %s", chartID)
-		response.NewErrorResponse(http.StatusNotFound, "could not find chart").Write(w)
-		return
-	}
-
-	cvl := newChartVersionListResponse(&chart)
-	response.NewDataResponse(cvl).Write(w)
-}
-
-// GetChartVersion returns the given chart version
-func GetChartVersion(w http.ResponseWriter, req *http.Request, params Params) {
-	var chart models.Chart
-	chartID := fmt.Sprintf("%s/%s", params["repo"], params["chartName"])
-
-	chartCollection := db.Collection(chartCollection)
-	filter := bson.M{
-		"_id":           chartID,
-		"chartversions": bson.M{"$elemMatch": bson.M{"version": params["version"]}},
-	}
-	projection := bson.M{
-		"name": 1, "repo": 1, "description": 1, "home": 1, "keywords": 1, "maintainers": 1, "sources": 1,
-		"chartversions": 1,
-	}
-	findResult := chartCollection.FindOne(context.Background(), filter, &chart, options.FindOne().SetProjection(projection))
-	if findResult == mongo.ErrNoDocuments {
-		log.WithError(findResult).Errorf("could not find chart with id %s", chartID)
-		response.NewErrorResponse(http.StatusNotFound, "could not find chart").Write(w)
-		return
-	}
-
-	for i := range chart.ChartVersions {
-		if chart.ChartVersions[i].Version == params["version"] {
-			chart.ChartVersions = chart.ChartVersions[i : i+1]
-			break
-		}
-	}
-	// Cut the versions slice down to just one element
-	cvr := newChartVersionResponse(&chart, chart.ChartVersions[0])
-	response.NewDataResponse(cvr).Write(w)
-}
-
-// GetChartIcon returns the icon for a given chart
-func GetChartIcon(w http.ResponseWriter, req *http.Request, params Params) {
-	var chart models.Chart
-	chartID := fmt.Sprintf("%s/%s", params["repo"], params["chartName"])
-
-	chartCollection := db.Collection(chartCollection)
-	filter := bson.M{"_id": chartID}
-	findResult := chartCollection.FindOne(context.Background(), filter, &chart, options.FindOne())
-	if findResult == mongo.ErrNoDocuments {
-		log.WithError(findResult).Errorf("could not find chart with id %s", chartID)
-		http.NotFound(w, req)
-		return
-	}
-	if chart.RawIcon == nil {
-		http.NotFound(w, req)
-		return
-	}
-
-	if chart.IconContentType != "" {
-		// Force the Content-Type header because the autogenerated type does not work for
-		// image/svg+xml. It is detected as plain text
-		w.Header().Set("Content-Type", chart.IconContentType)
-	}
-
-	w.Write(chart.RawIcon)
-}
-
-// GetChartVersionReadme returns the README for a given chart
-func GetChartVersionReadme(w http.ResponseWriter, req *http.Request, params Params) {
-
-	var files models.ChartFiles
-	fileID := fmt.Sprintf("%s/%s-%s", params["repo"], params["chartName"], params["version"])
-
-	filesCollection := db.Collection(filesCollection)
-	filter := bson.M{"_id": fileID}
-	findResult := filesCollection.FindOne(context.Background(), filter, &files, options.FindOne())
-	if findResult == mongo.ErrNoDocuments {
-		log.WithError(findResult).Errorf("could not find files with id %s", fileID)
-		http.NotFound(w, req)
-		return
-	}
-	readme := []byte(files.Readme)
-	if len(readme) == 0 {
-		log.Errorf("could not find a README for id %s", fileID)
-		http.NotFound(w, req)
-		return
-	}
-	w.Write(readme)
-}
-
-// GetChartVersionValues returns the values.yaml for a given chart
-func GetChartVersionValues(w http.ResponseWriter, req *http.Request, params Params) {
-	var files models.ChartFiles
-
-	fileID := fmt.Sprintf("%s/%s-%s", params["repo"], params["chartName"], params["version"])
-	filesCollection := db.Collection(filesCollection)
-	filter := bson.M{"_id": fileID}
-	findResult := filesCollection.FindOne(context.Background(), filter, &files, options.FindOne())
-	if findResult == mongo.ErrNoDocuments {
-		log.WithError(findResult).Errorf("could not find values.yaml with id %s", fileID)
-		http.NotFound(w, req)
-		return
-	}
-
-	w.Write([]byte(files.Values))
-}
-
-// GetChartVersionSchema returns the values.schema.json for a given chart
-func GetChartVersionSchema(w http.ResponseWriter, req *http.Request, params Params) {
-
-	var files models.ChartFiles
-
-	fileID := fmt.Sprintf("%s/%s-%s", params["repo"], params["chartName"], params["version"])
-	filter := bson.M{"_id": fileID}
-	filesCollection := db.Collection(filesCollection)
-	findResult := filesCollection.FindOne(context.Background(), filter, &files, options.FindOne())
-	if findResult == mongo.ErrNoDocuments {
-		log.WithError(findResult).Errorf("could not find values.schema.json with id %s", fileID)
-		http.NotFound(w, req)
-		return
-	}
-
-	w.Write([]byte(files.Schema))
-}
-
-// ListChartsWithFilters returns the list of repos that contains the given chart and the latest version found
-func ListChartsWithFilters(w http.ResponseWriter, req *http.Request, params Params) {
-
-	var charts []*models.Chart
-
-	chartCollection := db.Collection(chartCollection)
-	filter := bson.M{
-		"name": params["chartName"],
-		"chartversions": bson.M{
-			"$elemMatch": bson.M{"version": req.FormValue("version"), "appversion": req.FormValue("appversion")},
-		}}
-	projection := bson.M{
-		"name": 1, "repo": 1,
-		"chartversions": bson.M{"$slice": 1},
-	}
-	err := chartCollection.Find(context.Background(), filter, &charts, options.Find().SetProjection(projection))
-	if err != nil {
-		log.WithError(err).Errorf(
-			"Error finding charts with the given name %s, version %s and appversion %s",
-			params["chartName"], req.FormValue("version"), req.FormValue("appversion"),
-		)
-		// continue to return empty list
-	}
-
-	chartResponse := charts
-	if !showDuplicates(req) {
-		chartResponse = uniqChartList(charts)
-	}
-
-	cl := newChartListResponse(chartResponse)
-	response.NewDataResponse(cl).Write(w)
-}
-
-// SearchCharts returns the list of charts that matches the query param in any of these fields:
-//  - name
-//  - description
-//  - repository name
-//  - any keyword
-//  - any source
-//  - any maintainer name
-func SearchCharts(w http.ResponseWriter, req *http.Request, params Params) {
-
-	query := req.FormValue("q")
-	var charts []*models.Chart
-
-	chartCollection := db.Collection(chartCollection)
-	filter := bson.M{
-		"$or": []bson.M{
-			{"name": bson.M{"$regex": query}},
-			{"description": bson.M{"$regex": query}},
-			{"repo.name": bson.M{"$regex": query}},
-			{"keywords": bson.M{"$elemMatch": bson.M{"$regex": query}}},
-			{"sources": bson.M{"$elemMatch": bson.M{"$regex": query}}},
-			{"maintainers": bson.M{"$elemMatch": bson.M{"name": bson.M{"$regex": query}}}},
-		},
-	}
-	if params["repo"] != "" {
-		filter["repo.name"] = params["repo"]
-	}
-	err := chartCollection.Find(context.Background(), filter, &charts, options.Find())
-	if err != nil {
-		log.WithError(err).Errorf(
-			"Error finding charts with the given name %s, version %s and appversion %s",
-			params["chartName"], req.FormValue("version"), req.FormValue("appversion"),
-		)
-		// continue to return empty list
-	}
-
-	chartResponse := charts
-	if !showDuplicates(req) {
-		chartResponse = uniqChartList(charts)
-	}
-
-	cl := newChartListResponse(uniqChartList(chartResponse))
-	response.NewDataResponse(cl).Write(w)
-}
-
-func newChartResponse(c *models.Chart) *utils.ApiResponse {
-
-	// NWM: This was: latestCV := c.ChartVersions[0] - but this includes development charts
-	// FIX: This ignores development versions
-	latestCV := findFirstNonDevelopmentVersion(c)
-
-	return &utils.ApiResponse{
-		Type:       "chart",
-		ID:         c.ID,
-		Attributes: chartAttributes(*c),
-		Links:      utils.SelfLink{Self: pathPrefix + "/charts/" + c.ID},
-		Relationships: utils.RelMap{
-			"latestChartVersion": utils.Rel{
-				Data:  chartVersionAttributes(c.ID, latestCV),
-				Links: utils.SelfLink{Self: pathPrefix + "/charts/" + c.ID + "/versions/" + latestCV.Version},
-			},
-		},
-	}
-}
-
-func findFirstNonDevelopmentVersion(c *models.Chart) models.ChartVersion {
-	for _, chartVersion := range c.ChartVersions {
-		if strings.Index(chartVersion.Version, "-") == -1 {
-			return chartVersion
-		}
-	}
-	return c.ChartVersions[0]
-}
-
-func newChartListResponse(charts []*models.Chart) utils.ApiListResponse {
-	cl := utils.ApiListResponse{}
-	for _, c := range charts {
-		cl = append(cl, newChartResponse(c))
-	}
-	return cl
-}
-
-func chartVersionAttributes(cid string, cv models.ChartVersion) models.ChartVersion {
-	cv.Readme = pathPrefix + "/assets/" + cid + "/versions/" + cv.Version + "/README.md"
-	cv.Values = pathPrefix + "/assets/" + cid + "/versions/" + cv.Version + "/values.yaml"
-	cv.Schema = pathPrefix + "/assets/" + cid + "/versions/" + cv.Version + "/values.schema.json"
-
-	return cv
-}
-
-func chartAttributes(c models.Chart) models.Chart {
-	if c.RawIcon != nil {
-		c.Icon = pathPrefix + "/assets/" + c.ID + "/logo"
-	} else {
-		// If the icon wasn't processed, it is either not set or invalid
-		c.Icon = ""
-	}
-	return c
-}
-
-func newChartVersionResponse(c *models.Chart, cv models.ChartVersion) *utils.ApiResponse {
-	return &utils.ApiResponse{
-		Type:       "chartVersion",
-		ID:         fmt.Sprintf("%s-%s", c.ID, cv.Version),
-		Attributes: chartVersionAttributes(c.ID, cv),
-		Links:      utils.SelfLink{Self: pathPrefix + "/charts/" + c.ID + "/versions/" + cv.Version},
-		Relationships: utils.RelMap{
-			"chart": utils.Rel{
-				Data:  chartAttributes(*c),
-				Links: utils.SelfLink{Self: pathPrefix + "/charts/" + c.ID},
-			},
-		},
-	}
-}
-
-func newChartVersionListResponse(c *models.Chart) utils.ApiListResponse {
-	var cvl utils.ApiListResponse
-	for _, cv := range c.ChartVersions {
-		cvl = append(cvl, newChartVersionResponse(c, cv))
-	}
-
-	return cvl
-}
diff --git a/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler_test.go b/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler_test.go
deleted file mode 100644
index 2496a16069..0000000000
--- a/src/jetstream/plugins/monocular/chartsvc/foundationdb/handler_test.go
+++ /dev/null
@@ -1,867 +0,0 @@
-/*
-Copyright (c) 2019
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package foundationdb
-
-import (
-	"bytes"
-	"encoding/json"
-	"image/color"
-	"net/http"
-	"net/http/httptest"
-	"strconv"
-	"strings"
-	"testing"
-
-	"github.com/helm/monocular/chartsvc/foundationdb/datastore"
-	"github.com/helm/monocular/chartsvc/models"
-	"github.com/helm/monocular/chartsvc/utils"
-
-	"github.com/disintegration/imaging"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/mongo"
-)
-
-var cc count
-
-const testChartReadme = "# Quickstart\n\n```bash\nhelm install my-repo/my-chart\n```"
-const testChartValues = "image:\n  registry: docker.io\n  repository: my-repo/my-chart\n  tag: 0.1.0"
-
-const fdbURL = "mongodb://fdb-service/27016"
-const fDB = "charts"
-
-func iconBytes() []byte {
-	var b bytes.Buffer
-	img := imaging.New(1, 1, color.White)
-	imaging.Encode(&b, img, imaging.PNG)
-	return b.Bytes()
-}
-
-func Test_chartAttributes(t *testing.T) {
-	tests := []struct {
-		name  string
-		chart models.Chart
-	}{
-		{"chart has no icon", models.Chart{
-			ID: "stable/wordpress",
-		}},
-		{"chart has a icon", models.Chart{
-			ID: "repo/mychart", RawIcon: iconBytes(), IconContentType: "image/svg",
-		}},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			c := chartAttributes(tt.chart)
-			assert.Equal(t, tt.chart.ID, c.ID)
-			assert.Equal(t, tt.chart.RawIcon, c.RawIcon)
-			if len(tt.chart.RawIcon) == 0 {
-				assert.Equal(t, len(c.Icon), 0, "icon url should be undefined")
-			} else {
-				assert.Equal(t, c.Icon, pathPrefix+"/assets/"+tt.chart.ID+"/logo", "the icon url should be the same")
-				assert.Equal(t, c.IconContentType, tt.chart.IconContentType, "the icon content type should be the same")
-			}
-		})
-	}
-}
-
-func Test_chartVersionAttributes(t *testing.T) {
-	tests := []struct {
-		name  string
-		chart models.Chart
-	}{
-		{"my-chart", models.Chart{
-			ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}},
-		}},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			cv := chartVersionAttributes(tt.chart.ID, tt.chart.ChartVersions[0])
-			assert.Equal(t, cv.Version, tt.chart.ChartVersions[0].Version, "version string should be the same")
-			assert.Equal(t, cv.Readme, pathPrefix+"/assets/"+tt.chart.ID+"/versions/"+tt.chart.ChartVersions[0].Version+"/README.md", "README.md resource path should be the same")
-			assert.Equal(t, cv.Values, pathPrefix+"/assets/"+tt.chart.ID+"/versions/"+tt.chart.ChartVersions[0].Version+"/values.yaml", "values.yaml resource path should be the same")
-		})
-	}
-}
-
-func Test_newChartResponse(t *testing.T) {
-	tests := []struct {
-		name  string
-		chart models.Chart
-	}{
-		{"chart has only one version", models.Chart{
-			ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "1.2.3"}}},
-		},
-		{"chart has many versions", models.Chart{
-			ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.2"}, {Version: "0.1.0"}},
-		}},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			cResponse := newChartResponse(&tt.chart)
-			assert.Equal(t, cResponse.Type, "chart", "response type is chart")
-			assert.Equal(t, cResponse.ID, tt.chart.ID, "chart ID should be the same")
-			assert.Equal(t, cResponse.Relationships["latestChartVersion"].Data.(models.ChartVersion).Version, tt.chart.ChartVersions[0].Version, "latestChartVersion should match version at index 0")
-			assert.Equal(t, cResponse.Links.(utils.SelfLink).Self, pathPrefix+"/charts/"+tt.chart.ID, "self link should be the same")
-			assert.Equal(t, len(cResponse.Attributes.(models.Chart).ChartVersions), len(tt.chart.ChartVersions), "number of chart versions in the response should be the same")
-		})
-	}
-}
-
-func Test_newChartListResponse(t *testing.T) {
-	tests := []struct {
-		name   string
-		input  []*models.Chart
-		result []*models.Chart
-	}{
-		{"no charts", []*models.Chart{}, []*models.Chart{}},
-		{"has one chart", []*models.Chart{
-			{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
-		}, []*models.Chart{
-			{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
-		}},
-		{"has two charts", []*models.Chart{
-			{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
-			{ID: "stable/wordpress", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "1234"}, {Version: "1.2.2", Digest: "12345"}}},
-		}, []*models.Chart{
-			{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
-			{ID: "stable/wordpress", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "1234"}, {Version: "1.2.2", Digest: "12345"}}},
-		}},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			clResponse := newChartListResponse(tt.input)
-			assert.Equal(t, len(clResponse), len(tt.result), "number of charts in response should be the same")
-			for i := range tt.result {
-				assert.Equal(t, clResponse[i].Type, "chart", "response type is chart")
-				assert.Equal(t, clResponse[i].ID, tt.result[i].ID, "chart ID should be the same")
-				assert.Equal(t, clResponse[i].Relationships["latestChartVersion"].Data.(models.ChartVersion).Version, tt.result[i].ChartVersions[0].Version, "latestChartVersion should match version at index 0")
-				assert.Equal(t, clResponse[i].Links.(utils.SelfLink).Self, pathPrefix+"/charts/"+tt.result[i].ID, "self link should be the same")
-				assert.Equal(t, len(clResponse[i].Attributes.(models.Chart).ChartVersions), len(tt.result[i].ChartVersions), "number of chart versions in the response should be the same")
-			}
-		})
-	}
-}
-
-func Test_newChartVersionResponse(t *testing.T) {
-	tests := []struct {
-		name  string
-		chart models.Chart
-	}{
-		{"my-chart", models.Chart{
-			ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}, {Version: "0.2.3"}},
-		}},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			for i := range tt.chart.ChartVersions {
-				cvResponse := newChartVersionResponse(&tt.chart, tt.chart.ChartVersions[i])
-				assert.Equal(t, cvResponse.Type, "chartVersion", "response type is chartVersion")
-				assert.Equal(t, cvResponse.ID, tt.chart.ID+"-"+tt.chart.ChartVersions[i].Version, "reponse id should have chart version suffix")
-				assert.Equal(t, cvResponse.Links.(interface{}).(utils.SelfLink).Self, pathPrefix+"/charts/"+tt.chart.ID+"/versions/"+tt.chart.ChartVersions[i].Version, "self link should be the same")
-				assert.Equal(t, cvResponse.Attributes.(models.ChartVersion).Version, tt.chart.ChartVersions[i].Version, "chart version in the response should be the same")
-				assert.Equal(t, cvResponse.Relationships["chart"].Data.(interface{}).(models.Chart), tt.chart, "chart in relatioship matches")
-			}
-		})
-	}
-}
-
-func Test_newChartVersionListResponse(t *testing.T) {
-	tests := []struct {
-		name  string
-		chart models.Chart
-	}{
-		{"chart has no versions", models.Chart{
-			ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{},
-		}},
-		{"chart has one version", models.Chart{
-			ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1"}},
-		}},
-		{"chart has many versions", models.Chart{
-			ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1"}, {Version: "0.0.2"}},
-		}},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			cvListResponse := newChartVersionListResponse(&tt.chart)
-			assert.Equal(t, len(cvListResponse), len(tt.chart.ChartVersions), "number of chart versions in response should be the same")
-			for i := range tt.chart.ChartVersions {
-				assert.Equal(t, cvListResponse[i].Type, "chartVersion", "response type is chartVersion")
-				assert.Equal(t, cvListResponse[i].ID, tt.chart.ID+"-"+tt.chart.ChartVersions[i].Version, "reponse id should have chart version suffix")
-				assert.Equal(t, cvListResponse[i].Links.(interface{}).(utils.SelfLink).Self, pathPrefix+"/charts/"+tt.chart.ID+"/versions/"+tt.chart.ChartVersions[i].Version, "self link should be the same")
-				assert.Equal(t, cvListResponse[i].Attributes.(models.ChartVersion).Version, tt.chart.ChartVersions[i].Version, "chart version in the response should be the same")
-			}
-		})
-	}
-}
-
-func Test_listCharts(t *testing.T) {
-	pageSize := 2
-	tests := []struct {
-		name            string
-		query           string
-		dbQueryResult   []*models.Chart
-		chartListResult []*models.Chart
-		meta            utils.Meta
-	}{
-		{"no charts", "", []*models.Chart{}, []*models.Chart{}, utils.Meta{TotalPages: 1}},
-		{"one chart", "", []*models.Chart{
-			{ID: "my-repo/my-chart", Name: "my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
-		}, []*models.Chart{
-			{ID: "my-repo/my-chart", Name: "my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
-		}, utils.Meta{TotalPages: 1}},
-		{"two charts", "", []*models.Chart{
-			{ID: "my-repo/my-chart", Name: "my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
-			{ID: "stable/dokuwiki", Name: "dokuwiki", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "1234"}, {Version: "1.2.2", Digest: "12345"}}},
-		}, []*models.Chart{
-			{ID: "stable/dokuwiki", Name: "dokuwiki", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "1234"}, {Version: "1.2.2", Digest: "12345"}}},
-			{ID: "my-repo/my-chart", Name: "my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
-		}, utils.Meta{TotalPages: 1}},
-		// Pagination tests
-		{"four charts with pagination", "?size=" + strconv.Itoa(pageSize), []*models.Chart{
-			{ID: "my-repo/my-chart", Name: "my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
-			{ID: "stable/dokuwiki", Name: "dokuwiki", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "1234"}}},
-			{ID: "stable/drupal", Name: "drupal", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "12345"}}},
-			{ID: "stable/wordpress", Name: "wordpress", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "123456"}}},
-		}, []*models.Chart{
-			{ID: "stable/dokuwiki", Name: "dokuwiki", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "1234"}}},
-			{ID: "stable/drupal", Name: "drupal", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "12345"}}},
-		}, utils.Meta{TotalPages: 2}},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var m mock.Mock
-			dbClient = datastore.NewMockClient(&m)
-			db, _ = dbClient.Database("test")
-			var chartsList []*models.Chart
-
-			m.On("Find", mock.Anything, mock.Anything, &chartsList, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
-				*args.Get(2).(*[]*models.Chart) = tt.dbQueryResult
-			})
-
-			w := httptest.NewRecorder()
-			req := httptest.NewRequest("GET", "/charts"+tt.query, nil)
-			ListCharts(w, req)
-
-			m.AssertExpectations(t)
-			assert.Equal(t, http.StatusOK, w.Code)
-
-			var b utils.BodyAPIListResponse
-			json.NewDecoder(w.Body).Decode(&b)
-			if b.Data == nil {
-				t.Fatal("chart list shouldn't be null")
-			}
-			data := *b.Data
-
-			assert.Len(t, data, len(tt.chartListResult))
-
-			for i, resp := range data {
-				assert.Equal(t, resp.ID, tt.chartListResult[i].ID, "chart id in the response should be the same")
-				assert.Equal(t, resp.Type, "chart", "response type is chart")
-				assert.Equal(t, resp.Links.(map[string]interface{})["self"], pathPrefix+"/charts/"+tt.chartListResult[i].ID, "self link should be the same")
-				assert.Equal(t, resp.Relationships["latestChartVersion"].Data.(map[string]interface{})["version"], tt.chartListResult[i].ChartVersions[0].Version, "latestChartVersion should match version at index 0")
-			}
-			assert.Equal(t, b.Meta, tt.meta, "response meta should be the same")
-		})
-	}
-}
-
-func Test_listRepoCharts(t *testing.T) {
-	pageSize := 2
-	tests := []struct {
-		name            string
-		repo            string
-		query           string
-		dbQueryResult   []*models.Chart
-		chartListResult []*models.Chart
-		meta            utils.Meta
-	}{
-		{"repo has no charts", "my-repo", "", []*models.Chart{}, []*models.Chart{}, utils.Meta{TotalPages: 1}},
-		{"repo has one chart", "my-repo", "", []*models.Chart{
-			{ID: "my-repo/my-chart", Name: "my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
-		}, []*models.Chart{
-			{ID: "my-repo/my-chart", Name: "my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
-		}, utils.Meta{TotalPages: 1}},
-		{"repo has many charts", "my-repo", "", []*models.Chart{
-			{ID: "my-repo/my-chart", Name: "my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
-			{ID: "my-repo/dokuwiki", Name: "dokuwiki", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "1234"}, {Version: "1.2.2", Digest: "12345"}}},
-		}, []*models.Chart{
-			{ID: "my-repo/dokuwiki", Name: "dokuwiki", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "1234"}, {Version: "1.2.2", Digest: "12345"}}},
-			{ID: "my-repo/my-chart", Name: "my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
-		}, utils.Meta{TotalPages: 1}},
-		{"repo has many charts with pagination", "my-repo", "?size=" + strconv.Itoa(pageSize), []*models.Chart{
-			{ID: "my-repo/my-chart3", Name: "my-chart3", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
-			{ID: "my-repo/my-chart1", Name: "my-chart1", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "1234"}}},
-			{ID: "my-repo/my-chart2", Name: "my-chart2", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "12345"}}},
-		}, []*models.Chart{
-			{ID: "my-repo/my-chart1", Name: "my-chart1", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "1234"}}},
-			{ID: "my-repo/my-chart2", Name: "my-chart2", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "12345"}}},
-		}, utils.Meta{TotalPages: 2}},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var m mock.Mock
-			dbClient = datastore.NewMockClient(&m)
-			db, _ = dbClient.Database("test")
-			var chartsList []*models.Chart
-			m.On("Find", mock.Anything, bson.M{"repo.name": "my-repo"}, &chartsList, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
-				*args.Get(2).(*[]*models.Chart) = tt.dbQueryResult
-			})
-
-			w := httptest.NewRecorder()
-			req := httptest.NewRequest("GET", "/charts/"+tt.repo+tt.query, nil)
-			params := Params{
-				"repo": "my-repo",
-			}
-
-			ListRepoCharts(w, req, params)
-
-			m.AssertExpectations(t)
-			assert.Equal(t, http.StatusOK, w.Code)
-
-			var b utils.BodyAPIListResponse
-			json.NewDecoder(w.Body).Decode(&b)
-			data := *b.Data
-			assert.Len(t, data, len(tt.chartListResult))
-			for i, resp := range data {
-				assert.Equal(t, resp.ID, tt.chartListResult[i].ID, "chart id in the response should be the same")
-				assert.Equal(t, resp.Type, "chart", "response type is chart")
-				assert.Equal(t, resp.Relationships["latestChartVersion"].Data.(map[string]interface{})["version"], tt.chartListResult[i].ChartVersions[0].Version, "latestChartVersion should match version at index 0")
-			}
-			assert.Equal(t, b.Meta, tt.meta, "response meta should be the same")
-		})
-	}
-}
-
-func Test_getChart(t *testing.T) {
-	tests := []struct {
-		name     string
-		err      error
-		chart    models.Chart
-		wantCode int
-	}{
-		{
-			"chart does not exist",
-			mongo.ErrNoDocuments,
-			models.Chart{ID: "my-repo/my-chart"},
-			http.StatusNotFound,
-		},
-		{
-			"chart exists",
-			nil,
-			models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}}},
-			http.StatusOK,
-		},
-		{
-			"chart has multiple versions",
-			nil,
-			models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}, {Version: "0.0.1"}}},
-			http.StatusOK,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var m mock.Mock
-			dbClient = datastore.NewMockClient(&m)
-			db, _ = dbClient.Database("test")
-
-			if tt.err != nil {
-				m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tt.err)
-			} else {
-				m.On("FindOne", mock.Anything, mock.Anything, &models.Chart{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
-					*args.Get(2).(*models.Chart) = tt.chart
-				})
-			}
-
-			w := httptest.NewRecorder()
-			req := httptest.NewRequest("GET", "/charts/"+tt.chart.ID, nil)
-			parts := strings.Split(tt.chart.ID, "/")
-			params := Params{
-				"repo":      parts[0],
-				"chartName": parts[1],
-			}
-
-			GetChart(w, req, params)
-
-			m.AssertExpectations(t)
-			assert.Equal(t, tt.wantCode, w.Code)
-			if tt.wantCode == http.StatusOK {
-				var b utils.BodyAPIResponse
-				json.NewDecoder(w.Body).Decode(&b)
-				assert.Equal(t, b.Data.ID, tt.chart.ID, "chart id in the response should be the same")
-				assert.Equal(t, b.Data.Type, "chart", "response type is chart")
-				assert.Equal(t, b.Data.Links.(map[string]interface{})["self"], pathPrefix+"/charts/"+tt.chart.ID, "self link should be the same")
-				assert.Equal(t, b.Data.Relationships["latestChartVersion"].Data.(map[string]interface{})["version"], tt.chart.ChartVersions[0].Version, "latestChartVersion should match version at index 0")
-			}
-		})
-	}
-}
-
-func Test_listChartVersions(t *testing.T) {
-	tests := []struct {
-		name     string
-		err      error
-		chart    models.Chart
-		wantCode int
-	}{
-		{
-			"chart does not exist",
-			mongo.ErrNoDocuments,
-			models.Chart{ID: "my-repo/my-chart"},
-			http.StatusNotFound,
-		},
-		{
-			"chart exists",
-			nil,
-			models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}}},
-			http.StatusOK,
-		},
-		{
-			"chart has multiple versions",
-			nil,
-			models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}, {Version: "0.0.1"}}},
-			http.StatusOK,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var m mock.Mock
-			dbClient = datastore.NewMockClient(&m)
-			db, _ = dbClient.Database("test")
-
-			if tt.err != nil {
-				m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tt.err)
-			} else {
-				m.On("FindOne", mock.Anything, mock.Anything, &models.Chart{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
-					*args.Get(2).(*models.Chart) = tt.chart
-				})
-			}
-
-			w := httptest.NewRecorder()
-			req := httptest.NewRequest("GET", "/charts/"+tt.chart.ID+"/versions", nil)
-			parts := strings.Split(tt.chart.ID, "/")
-			params := Params{
-				"repo":      parts[0],
-				"chartName": parts[1],
-			}
-
-			ListChartVersions(w, req, params)
-
-			m.AssertExpectations(t)
-			assert.Equal(t, tt.wantCode, w.Code)
-			if tt.wantCode == http.StatusOK {
-				var b utils.BodyAPIListResponse
-				json.NewDecoder(w.Body).Decode(&b)
-				data := *b.Data
-				for i, resp := range data {
-					assert.Equal(t, resp.ID, tt.chart.ID+"-"+tt.chart.ChartVersions[i].Version, "chart id in the response should be the same")
-					assert.Equal(t, resp.Type, "chartVersion", "response type is chartVersion")
-					assert.Equal(t, resp.Attributes.(map[string]interface{})["version"], tt.chart.ChartVersions[i].Version, "chart version should match")
-				}
-			}
-		})
-	}
-}
-
-func Test_getChartVersion(t *testing.T) {
-	tests := []struct {
-		name     string
-		err      error
-		chart    models.Chart
-		wantCode int
-	}{
-		{
-			"chart does not exist",
-			mongo.ErrNoDocuments,
-			models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}}},
-			http.StatusNotFound,
-		},
-		{
-			"chart exists",
-			nil,
-			models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}}},
-			http.StatusOK,
-		},
-		{
-			"chart has multiple versions",
-			nil,
-			models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}, {Version: "0.0.1"}}},
-			http.StatusOK,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var m mock.Mock
-			dbClient = datastore.NewMockClient(&m)
-			db, _ = dbClient.Database("test")
-
-			if tt.err != nil {
-				m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tt.err)
-			} else {
-				m.On("FindOne", mock.Anything, mock.Anything, &models.Chart{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
-					*args.Get(2).(*models.Chart) = tt.chart
-				})
-			}
-
-			w := httptest.NewRecorder()
-			req := httptest.NewRequest("GET", "/charts/"+tt.chart.ID+"/versions/"+tt.chart.ChartVersions[0].Version, nil)
-			parts := strings.Split(tt.chart.ID, "/")
-			params := Params{
-				"repo":      parts[0],
-				"chartName": parts[1],
-				"version":   tt.chart.ChartVersions[0].Version,
-			}
-
-			GetChartVersion(w, req, params)
-
-			m.AssertExpectations(t)
-			assert.Equal(t, tt.wantCode, w.Code)
-			if tt.wantCode == http.StatusOK {
-				var b utils.BodyAPIResponse
-				json.NewDecoder(w.Body).Decode(&b)
-				assert.Equal(t, b.Data.ID, tt.chart.ID+"-"+tt.chart.ChartVersions[0].Version, "chart id in the response should be the same")
-				assert.Equal(t, b.Data.Type, "chartVersion", "response type is chartVersion")
-				assert.Equal(t, b.Data.Attributes.(map[string]interface{})["version"], tt.chart.ChartVersions[0].Version, "chart version should match")
-			}
-		})
-	}
-}
-
-func Test_getChartIcon(t *testing.T) {
-	tests := []struct {
-		name     string
-		err      error
-		chart    models.Chart
-		wantCode int
-	}{
-		{
-			"chart does not exist",
-			mongo.ErrNoDocuments,
-			models.Chart{ID: "my-repo/my-chart"},
-			http.StatusNotFound,
-		},
-		{
-			"chart has icon",
-			nil,
-			models.Chart{ID: "my-repo/my-chart", RawIcon: iconBytes(), IconContentType: "image/png"},
-			http.StatusOK,
-		},
-		{
-			"chart does not have a icon",
-			nil,
-			models.Chart{ID: "my-repo/my-chart"},
-			http.StatusNotFound,
-		},
-		{
-			"chart has icon with custom type",
-			nil,
-			models.Chart{ID: "my-repo/my-chart", RawIcon: iconBytes(), IconContentType: "image/svg"},
-			http.StatusOK,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var m mock.Mock
-			dbClient = datastore.NewMockClient(&m)
-			db, _ = dbClient.Database("test")
-
-			if tt.err != nil {
-				m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tt.err)
-			} else {
-				m.On("FindOne", mock.Anything, mock.Anything, &models.Chart{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
-					*args.Get(2).(*models.Chart) = tt.chart
-				})
-			}
-
-			w := httptest.NewRecorder()
-			req := httptest.NewRequest("GET", "/assets/"+tt.chart.ID+"/logo", nil)
-			parts := strings.Split(tt.chart.ID, "/")
-			params := Params{
-				"repo":      parts[0],
-				"chartName": parts[1],
-			}
-
-			GetChartIcon(w, req, params)
-
-			m.AssertExpectations(t)
-			assert.Equal(t, tt.wantCode, w.Code, "http status code should match")
-			if tt.wantCode == http.StatusOK {
-				assert.Equal(t, w.Body.Bytes(), tt.chart.RawIcon, "raw icon data should match")
-				assert.Equal(t, w.Header().Get("Content-Type"), tt.chart.IconContentType, "icon content type should match")
-			}
-		})
-	}
-}
-
-func Test_getChartVersionReadme(t *testing.T) {
-	tests := []struct {
-		name     string
-		version  string
-		err      error
-		files    models.ChartFiles
-		wantCode int
-	}{
-		{
-			"chart does not exist",
-			"0.1.0",
-			mongo.ErrNoDocuments,
-			models.ChartFiles{ID: "my-repo/my-chart"},
-			http.StatusNotFound,
-		},
-		{
-			"chart exists",
-			"1.2.3",
-			nil,
-			models.ChartFiles{ID: "my-repo/my-chart", Readme: testChartReadme},
-			http.StatusOK,
-		},
-		{
-			"chart does not have a readme",
-			"1.1.1",
-			nil,
-			models.ChartFiles{ID: "my-repo/my-chart"},
-			http.StatusNotFound,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var m mock.Mock
-			dbClient = datastore.NewMockClient(&m)
-			db, _ = dbClient.Database("test")
-
-			if tt.err != nil {
-				m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tt.err)
-			} else {
-				m.On("FindOne", mock.Anything, mock.Anything, &models.ChartFiles{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
-					*args.Get(2).(*models.ChartFiles) = tt.files
-				})
-			}
-
-			w := httptest.NewRecorder()
-			req := httptest.NewRequest("GET", "/assets/"+tt.files.ID+"/versions/"+tt.version+"/README.md", nil)
-			parts := strings.Split(tt.files.ID, "/")
-			params := Params{
-				"repo":      parts[0],
-				"chartName": parts[1],
-				"version":   "0.1.0",
-			}
-
-			GetChartVersionReadme(w, req, params)
-
-			m.AssertExpectations(t)
-			assert.Equal(t, tt.wantCode, w.Code, "http status code should match")
-			if tt.wantCode == http.StatusOK {
-				assert.Equal(t, string(w.Body.Bytes()), tt.files.Readme, "content of the readme should match")
-			}
-		})
-	}
-}
-
-func Test_getChartVersionValues(t *testing.T) {
-	tests := []struct {
-		name     string
-		version  string
-		err      error
-		files    models.ChartFiles
-		wantCode int
-	}{
-		{
-			"chart does not exist",
-			"0.1.0",
-			mongo.ErrNoDocuments,
-			models.ChartFiles{ID: "my-repo/my-chart"},
-			http.StatusNotFound,
-		},
-		{
-			"chart exists",
-			"3.2.1",
-			nil,
-			models.ChartFiles{ID: "my-repo/my-chart", Values: testChartValues},
-			http.StatusOK,
-		},
-		{
-			"chart does not have values.yaml",
-			"2.2.2",
-			nil,
-			models.ChartFiles{ID: "my-repo/my-chart"},
-			http.StatusOK,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var m mock.Mock
-			dbClient = datastore.NewMockClient(&m)
-			db, _ = dbClient.Database("test")
-
-			if tt.err != nil {
-				m.On("FindOne", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tt.err)
-			} else {
-				m.On("FindOne", mock.Anything, mock.Anything, &models.ChartFiles{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
-					*args.Get(2).(*models.ChartFiles) = tt.files
-				})
-			}
-
-			w := httptest.NewRecorder()
-			req := httptest.NewRequest("GET", "/assets/"+tt.files.ID+"/versions/"+tt.version+"/values.yaml", nil)
-			parts := strings.Split(tt.files.ID, "/")
-			params := Params{
-				"repo":      parts[0],
-				"chartName": parts[1],
-				"version":   "0.1.0",
-			}
-
-			GetChartVersionValues(w, req, params)
-
-			m.AssertExpectations(t)
-			assert.Equal(t, tt.wantCode, w.Code, "http status code should match")
-			if tt.wantCode == http.StatusOK {
-				assert.Equal(t, string(w.Body.Bytes()), tt.files.Values, "content of values.yaml should match")
-			}
-		})
-	}
-}
-
-func Test_findLatestChart(t *testing.T) {
-	t.Run("returns mocked chart", func(t *testing.T) {
-		chart := &models.Chart{
-			Name: "foo",
-			ID:   "foo",
-			Repo: models.Repo{Name: "bar"},
-			ChartVersions: []models.ChartVersion{
-				models.ChartVersion{Version: "1.0.0", AppVersion: "0.1.0"},
-				models.ChartVersion{Version: "0.0.1", AppVersion: "0.1.0"},
-			},
-		}
-		charts := []*models.Chart{chart}
-		reqVersion := "1.0.0"
-		reqAppVersion := "0.1.0"
-
-		var m mock.Mock
-		dbClient = datastore.NewMockClient(&m)
-		db, _ = dbClient.Database("test")
-		var chartsList []*models.Chart
-		m.On("Find", mock.Anything, mock.Anything, &chartsList, mock.Anything).Run(func(args mock.Arguments) {
-			*args.Get(2).(*[]*models.Chart) = charts
-		}).Return(nil)
-
-		w := httptest.NewRecorder()
-		req := httptest.NewRequest("GET", "/charts?name="+chart.Name+"&version="+reqVersion+"&appversion="+reqAppVersion, nil)
-		params := Params{
-			"name":       chart.Name,
-			"version":    reqVersion,
-			"appversion": reqAppVersion,
-		}
-
-		ListChartsWithFilters(w, req, params)
-
-		var b utils.BodyAPIListResponse
-		json.NewDecoder(w.Body).Decode(&b)
-		if b.Data == nil {
-			t.Fatal("chart list shouldn't be null")
-		}
-		data := *b.Data
-
-		if data[0].ID != chart.ID {
-			t.Errorf("Expecting %v, received %v", chart, data[0].ID)
-		}
-	})
-	t.Run("ignores duplicated chart", func(t *testing.T) {
-		charts := []*models.Chart{
-			{Name: "foo", ID: "stable/foo", Repo: models.Repo{Name: "bar"}, ChartVersions: []models.ChartVersion{models.ChartVersion{Version: "1.0.0", AppVersion: "0.1.0", Digest: "123"}}},
-			{Name: "foo", ID: "bitnami/foo", Repo: models.Repo{Name: "bar"}, ChartVersions: []models.ChartVersion{models.ChartVersion{Version: "1.0.0", AppVersion: "0.1.0", Digest: "123"}}},
-		}
-		reqVersion := "1.0.0"
-		reqAppVersion := "0.1.0"
-
-		var m mock.Mock
-		dbClient = datastore.NewMockClient(&m)
-		db, _ = dbClient.Database("test")
-		var chartsList []*models.Chart
-		m.On("Find", mock.Anything, mock.Anything, &chartsList, mock.Anything).Run(func(args mock.Arguments) {
-			*args.Get(2).(*[]*models.Chart) = charts
-		}).Return(nil)
-
-		w := httptest.NewRecorder()
-		req := httptest.NewRequest("GET", "/charts?name="+charts[0].Name+"&version="+reqVersion+"&appversion="+reqAppVersion, nil)
-		params := Params{
-			"name":       charts[0].Name,
-			"version":    reqVersion,
-			"appversion": reqAppVersion,
-		}
-
-		ListChartsWithFilters(w, req, params)
-
-		var b utils.BodyAPIListResponse
-		json.NewDecoder(w.Body).Decode(&b)
-		if b.Data == nil {
-			t.Fatal("chart list shouldn't be null")
-		}
-		data := *b.Data
-
-		assert.Equal(t, len(data), 1, "it should return a single chart")
-		if data[0].ID != charts[0].ID {
-			t.Errorf("Expecting %v, received %v", charts[0], data[0].ID)
-		}
-	})
-	t.Run("includes duplicated charts when showDuplicates param set", func(t *testing.T) {
-		charts := []*models.Chart{
-			{Name: "foo", ID: "stable/foo", Repo: models.Repo{Name: "bar"}, ChartVersions: []models.ChartVersion{models.ChartVersion{Version: "1.0.0", AppVersion: "0.1.0", Digest: "123"}}},
-			{Name: "foo", ID: "bitnami/foo", Repo: models.Repo{Name: "bar"}, ChartVersions: []models.ChartVersion{models.ChartVersion{Version: "1.0.0", AppVersion: "0.1.0", Digest: "123"}}},
-		}
-		reqVersion := "1.0.0"
-		reqAppVersion := "0.1.0"
-
-		var m mock.Mock
-		dbClient = datastore.NewMockClient(&m)
-		db, _ = dbClient.Database("test")
-		var chartsList []*models.Chart
-		m.On("Find", mock.Anything, mock.Anything, &chartsList, mock.Anything).Run(func(args mock.Arguments) {
-			*args.Get(2).(*[]*models.Chart) = charts
-		}).Return(nil)
-
-		w := httptest.NewRecorder()
-		req := httptest.NewRequest("GET", "/charts?showDuplicates=true&name="+charts[0].Name+"&version="+reqVersion+"&appversion="+reqAppVersion, nil)
-		params := Params{
-			"name":       charts[0].Name,
-			"version":    reqVersion,
-			"appversion": reqAppVersion,
-		}
-
-		ListChartsWithFilters(w, req, params)
-
-		var b utils.BodyAPIListResponse
-		json.NewDecoder(w.Body).Decode(&b)
-		if b.Data == nil {
-			t.Fatal("chart list shouldn't be null")
-		}
-		data := *b.Data
-
-		assert.Equal(t, 2, len(data), "it should return both charts")
-	})
-}
diff --git a/src/jetstream/plugins/monocular/chartsvc/go.mod b/src/jetstream/plugins/monocular/chartsvc/go.mod
deleted file mode 100644
index 3fea97e947..0000000000
--- a/src/jetstream/plugins/monocular/chartsvc/go.mod
+++ /dev/null
@@ -1,31 +0,0 @@
-module github.com/helm/monocular/chartsvc
-
-go 1.12
-
-require (
-	github.com/disintegration/imaging v1.6.2
-	github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8
-	github.com/golang/snappy v0.0.1 // indirect
-	github.com/gorilla/mux v1.7.3
-	github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40
-	github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a
-	github.com/labstack/echo v3.3.10+incompatible // indirect
-	github.com/labstack/gommon v0.3.0 // indirect
-	github.com/prometheus/client_golang v1.2.1 // indirect
-	github.com/sirupsen/logrus v1.4.2
-	github.com/stretchr/testify v1.4.0
-	github.com/unrolled/render v1.0.1 // indirect
-	github.com/urfave/negroni v1.0.0
-	github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c // indirect
-	github.com/xdg/stringprep v1.0.0 // indirect
-	go.mongodb.org/mongo-driver v1.1.3
-	golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9 // indirect
-	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
-	k8s.io/helm v2.16.1+incompatible
-)
-
-replace (
-	github.com/helm/monocular/chartsvc/foundationdb => ./foundationdb
-	github.com/helm/monocular/chartsvc/models => ./models
-	github.com/helm/monocular/chartsvc/utils => ./utils
-)
diff --git a/src/jetstream/plugins/monocular/chartsvc/go.sum b/src/jetstream/plugins/monocular/chartsvc/go.sum
deleted file mode 100644
index dbf10aba67..0000000000
--- a/src/jetstream/plugins/monocular/chartsvc/go.sum
+++ /dev/null
@@ -1,139 +0,0 @@
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/cespare/xxhash/v2 v2.1.0 h1:yTUvW7Vhb89inJ+8irsUqiWjh8iT6sQPZiQzI6ReGkA=
-github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
-github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
-github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
-github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=
-github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
-github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
-github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40 h1:GT4RsKmHh1uZyhmTkWJTDALRjSHYQp6FRKrotf0zhAs=
-github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40/go.mod h1:NtmN9h8vrTveVQRLHcX2HQ5wIPBDCsZ351TGbZWgg38=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a h1:VqeX/fehAB6FtBox0TVYcjOMXGE56INQIfbXegditX4=
-github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
-github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8bbnE7CX5OEgg=
-github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s=
-github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0=
-github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
-github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
-github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg=
-github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
-github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.2.1 h1:JnMpQc6ppsNgw9QPAGF6Dod479itz7lvlsMzzNayLOI=
-github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.7.0 h1:L+1lyG48J1zAQXA3RBX/nG/B3gjlHq0zTt2tlbJLyCY=
-github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8=
-github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/unrolled/render v1.0.1 h1:VDDnQQVfBMsOsp3VaCJszSO0nkBIVEYoPWeRThk9spY=
-github.com/unrolled/render v1.0.1/go.mod h1:gN9T0NhL4Bfbwu8ann7Ry/TGHYfosul+J0obPf6NBdM=
-github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
-github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
-github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
-github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasttemplate v1.0.1 h1:tY9CJiPnMXf1ERmG2EyK7gNUd+c6RKGD0IfU8WdUSz8=
-github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
-github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk=
-github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
-github.com/xdg/stringprep v1.0.0 h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0=
-github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
-go.mongodb.org/mongo-driver v1.1.3 h1:++7u8r9adKhGR+I79NfEtYrk2ktjenErXM99PSufIoI=
-go.mongodb.org/mongo-driver v1.1.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
-go.mongodb.org/mongo-driver v1.2.1 h1:ANAlYXXM5XmOdW/Nc38jOr+wS5nlk7YihT24U1imiWM=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9 h1:abxekknhS/Drh3uoQDk5Hc7BgeiyI39Crb7vhf/1j5s=
-golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U=
-golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 h1:dfGZHvZk057jK2MCeWus/TowKpJ8y4AmooUzdBSR9GU=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191010194322-b09406accb47 h1:/XfQ9z7ib8eEJX2hdgFTZJ/ntt0swNk5oYBziWeTCvY=
-golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-k8s.io/helm v2.16.1+incompatible h1:L+k810plJlaGWEw1EszeT4deK8XVaKxac1oGcuB+WDc=
-k8s.io/helm v2.16.1+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
diff --git a/src/jetstream/plugins/monocular/chartsvc/main.go b/src/jetstream/plugins/monocular/chartsvc/main.go
deleted file mode 100644
index 05226e6bc5..0000000000
--- a/src/jetstream/plugins/monocular/chartsvc/main.go
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
-Copyright (c) 2017 The Helm Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package chartsvc
-
-import (
-	"context"
-	"crypto/tls"
-	"crypto/x509"
-	"flag"
-	"io/ioutil"
-	"net/http"
-	"os"
-
-	"github.com/gorilla/mux"
-	"github.com/heptiolabs/healthcheck"
-	mongoDatastore "github.com/kubeapps/common/datastore"
-	log "github.com/sirupsen/logrus"
-	"github.com/urfave/negroni"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
-
-	fdb "github.com/helm/monocular/chartsvc/foundationdb"
-	fdbDatastore "github.com/helm/monocular/chartsvc/foundationdb/datastore"
-)
-
-const pathPrefix = "/v1"
-
-var client *mongo.Client
-var dbSession mongoDatastore.Session
-
-func SetupRoutes() http.Handler {
-	r := mux.NewRouter()
-
-	// Healthcheck
-	health := healthcheck.NewHandler()
-	r.Handle("/live", health)
-	r.Handle("/ready", health)
-
-	// Routes
-	apiv1 := r.PathPrefix(pathPrefix).Subrouter()
-	apiv1.Methods("GET").Path("/charts").Queries("name", "{chartName}", "version", "{version}", "appversion", "{appversion}").Handler(fdb.WithParams(fdb.ListChartsWithFilters))
-	apiv1.Methods("GET").Path("/charts").Queries("name", "{chartName}", "version", "{version}", "appversion", "{appversion}", "showDuplicates", "{showDuplicates}").Handler(fdb.WithParams(fdb.ListChartsWithFilters))
-	apiv1.Methods("GET").Path("/charts").HandlerFunc(fdb.ListCharts)
-	apiv1.Methods("GET").Path("/charts").Queries("showDuplicates", "{showDuplicates}").HandlerFunc(fdb.ListCharts)
-	apiv1.Methods("GET").Path("/charts/search").Queries("q", "{query}").Handler(fdb.WithParams(fdb.SearchCharts))
-	apiv1.Methods("GET").Path("/charts/search").Queries("q", "{query}", "showDuplicates", "{showDuplicates}").Handler(fdb.WithParams(fdb.SearchCharts))
-	apiv1.Methods("GET").Path("/charts/{repo}").Handler(fdb.WithParams(fdb.ListRepoCharts))
-	apiv1.Methods("GET").Path("/charts/{repo}/search").Queries("q", "{query}").Handler(fdb.WithParams(fdb.SearchCharts))
-	apiv1.Methods("GET").Path("/charts/{repo}/search").Queries("q", "{query}", "showDuplicates", "{showDuplicates}").Handler(fdb.WithParams(fdb.SearchCharts))
-	apiv1.Methods("GET").Path("/charts/{repo}/{chartName}").Handler(fdb.WithParams(fdb.GetChart))
-	apiv1.Methods("GET").Path("/charts/{repo}/{chartName}/versions").Handler(fdb.WithParams(fdb.ListChartVersions))
-	apiv1.Methods("GET").Path("/charts/{repo}/{chartName}/versions/{version}").Handler(fdb.WithParams(fdb.GetChartVersion))
-	apiv1.Methods("GET").Path("/assets/{repo}/{chartName}/logo").Handler(fdb.WithParams(fdb.GetChartIcon))
-	// Maintain the logo-160x160-fit.png endpoint for backward compatibility /assets/{repo}/{chartName}/logo should be used instead
-	apiv1.Methods("GET").Path("/assets/{repo}/{chartName}/logo-160x160-fit.png").Handler(fdb.WithParams(fdb.GetChartIcon))
-	apiv1.Methods("GET").Path("/assets/{repo}/{chartName}/versions/{version}/README.md").Handler(fdb.WithParams(fdb.GetChartVersionReadme))
-	apiv1.Methods("GET").Path("/assets/{repo}/{chartName}/versions/{version}/values.yaml").Handler(fdb.WithParams(fdb.GetChartVersionValues))
-	apiv1.Methods("GET").Path("/assets/{repo}/{chartName}/versions/{version}/values.schema.json").Handler(fdb.WithParams(fdb.GetChartVersionSchema))
-
-	n := negroni.Classic()
-	n.UseHandler(r)
-	return n
-}
-
-func main() {
-
-	debug := flag.Bool("debug", false, "Debug Logging")
-
-	//Flags for optional FoundationDB + Document Layer backend
-	fdbURL := flag.String("doclayer-url", "mongodb://fdb-service/27016", "FoundationDB Document Layer URL")
-	fDB := flag.String("doclayer-database", "monocular-plugin", "FoundationDB Document-Layer database")
-
-	//Flags for Serve-Mode TLS
-	cACertFile := flag.String("cafile", "", "Path to CA certificate to use for client verification.")
-	certFile := flag.String("certfile", "", "Path to TLS certificate.")
-	keyFile := flag.String("keyfile", "", "Path to TLS key.")
-
-	//TLS options must either be all set to enabled TLS, or none set to disable TLS
-	var tlsEnabled = *cACertFile != "" && *keyFile != "" && *certFile != ""
-	if !(tlsEnabled || (*cACertFile == "" && *keyFile == "" && *certFile == "")) {
-		log.Fatal("To enable TLS, all 3 TLS cert paths must be set.")
-	}
-
-	flag.Parse()
-
-	if *debug {
-		log.SetLevel(log.DebugLevel)
-	}
-
-	InitFDBDocLayerConnection(fdbURL, fDB, &tlsEnabled, *cACertFile, *certFile, *keyFile, debug)
-
-	n := SetupRoutes()
-
-	port := os.Getenv("PORT")
-	if port == "" {
-		port = "8080"
-	}
-	addr := ":" + port
-	log.WithFields(log.Fields{"addr": addr}).Info("Started chartsvc")
-	http.ListenAndServe(addr, n)
-}
-
-func InitFDBDocLayerConnection(fdbURL *string, fDB *string, tlsEnabled *bool, CAFile string, certFile string, keyFile string, debug *bool) *ChartSvcDatastore {
-
-	log.Debugf("Attempting to connect to FDB: %v, %v, debug: %v", *fdbURL, *fDB, *debug)
-
-	var tlsConfig *tls.Config
-
-	if *tlsEnabled {
-		//Load CA Cert from file here
-		CA, err := ioutil.ReadFile(CAFile) // just pass the file name
-		if err != nil {
-			log.Fatalf("Cannot load CA certificate from file: %v.", err)
-			return nil
-		}
-		CACert := x509.NewCertPool()
-		ok := CACert.AppendCertsFromPEM([]byte(CA))
-		if !ok {
-			log.Fatalf("Cannot append CA certificate to certificate pool.")
-			return nil
-		}
-		//Now load the key pair and create tls options struct
-		clientKeyPair, err := tls.LoadX509KeyPair(certFile, keyFile)
-		if err != nil {
-			log.Fatalf("Cannot load server keypair: %v", err)
-			return nil
-		}
-
-		tlsConfig = &tls.Config{RootCAs: CACert, Certificates: []tls.Certificate{clientKeyPair}}
-	}
-
-	clientOptions := options.Client().ApplyURI(*fdbURL)
-	if *tlsEnabled {
-		clientOptions.SetTLSConfig(tlsConfig)
-	}
-	client, err := fdbDatastore.NewDocLayerClient(context.Background(), clientOptions)
-	if err != nil {
-		log.Fatalf("Can't create client for FoundationDB document layer: %v. URL provided was: %v.", err, *fdbURL)
-		return nil
-	}
-	log.Debugf("FDB Document Layer client created.")
-
-	fdb.InitDBConfig(client, *fDB)
-	fdb.SetPathPrefix(pathPrefix)
-
-	db, dbCloser := client.Database(*fDB)
-	datastore := &ChartSvcDatastore{
-		dbClient: client,
-		db:       db,
-		dbCloser: dbCloser,
-	}
-
-	return datastore
-}
diff --git a/src/jetstream/plugins/monocular/chartsvc/main_test.go b/src/jetstream/plugins/monocular/chartsvc/main_test.go
deleted file mode 100644
index 8dbc7b3e11..0000000000
--- a/src/jetstream/plugins/monocular/chartsvc/main_test.go
+++ /dev/null
@@ -1,544 +0,0 @@
-/*
-Copyright (c) 2017 The Helm Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package chartsvc
-
-import (
-	"encoding/json"
-	"errors"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	fdb "github.com/helm/monocular/chartsvc/foundationdb"
-	datastore "github.com/helm/monocular/chartsvc/foundationdb/datastore"
-	"github.com/helm/monocular/chartsvc/models"
-	"github.com/helm/monocular/chartsvc/utils"
-	"go.mongodb.org/mongo-driver/mongo"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-)
-
-var dbType string = "mongodb"
-
-const testChartSchema = `{"properties": {"type": "object"}}`
-
-// tests the GET /live endpoint
-func Test_GetLive(t *testing.T) {
-	var m mock.Mock
-	dbClient := datastore.NewMockClient(&m)
-	fdb.InitDBConfig(dbClient, "test")
-
-	ts := httptest.NewServer(SetupRoutes())
-	defer ts.Close()
-
-	res, err := http.Get(ts.URL + "/live")
-	assert.NoError(t, err, "should not return an error")
-	defer res.Body.Close()
-	assert.Equal(t, res.StatusCode, http.StatusOK, "http status code should match")
-}
-
-// tests the GET /ready endpoint
-func Test_GetReady(t *testing.T) {
-	var m mock.Mock
-	dbClient := datastore.NewMockClient(&m)
-	fdb.InitDBConfig(dbClient, "test")
-
-	ts := httptest.NewServer(SetupRoutes())
-	defer ts.Close()
-
-	res, err := http.Get(ts.URL + "/ready")
-	assert.NoError(t, err, "should not return an error")
-	defer res.Body.Close()
-	assert.Equal(t, res.StatusCode, http.StatusOK, "http status code should match")
-}
-
-// tests the GET /{apiVersion}/charts endpoint
-func Test_GetCharts(t *testing.T) {
-	ts := httptest.NewServer(SetupRoutes())
-	defer ts.Close()
-
-	tests := []struct {
-		name   string
-		charts []*models.Chart
-	}{
-		{"no charts", []*models.Chart{}},
-		{"one chart", []*models.Chart{
-			{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1"}}}},
-		},
-		{"two charts", []*models.Chart{
-			{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
-			{ID: "my-repo/dokuwiki", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "1234"}, {Version: "1.2.2", Digest: "12345"}}},
-		}},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var m mock.Mock
-			dbClient := datastore.NewMockClient(&m)
-			fdb.InitDBConfig(dbClient, "test")
-
-			m.On("Find", mock.Anything, mock.Anything, &utils.ChartsList, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
-				*args.Get(2).(*[]*models.Chart) = tt.charts
-			})
-
-			res, err := http.Get(ts.URL + pathPrefix + "/charts")
-			assert.NoError(t, err)
-			defer res.Body.Close()
-
-			m.AssertExpectations(t)
-			assert.Equal(t, res.StatusCode, http.StatusOK, "http status code should match")
-
-			var b utils.BodyAPIListResponse
-			json.NewDecoder(res.Body).Decode(&b)
-			assert.Len(t, *b.Data, len(tt.charts))
-		})
-	}
-}
-
-// tests the GET /{apiVersion}/charts/{repo} endpoint
-func Test_GetChartsInRepo(t *testing.T) {
-	ts := httptest.NewServer(SetupRoutes())
-	defer ts.Close()
-
-	tests := []struct {
-		name   string
-		repo   string
-		charts []*models.Chart
-	}{
-		{"repo has no charts", "my-repo", []*models.Chart{}},
-		{"repo has one chart", "my-repo", []*models.Chart{
-			{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
-		}},
-		{"repo has many charts", "my-repo", []*models.Chart{
-			{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}},
-			{ID: "my-repo/dokuwiki", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "1234"}, {Version: "1.2.2", Digest: "12345"}}},
-		}},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var m mock.Mock
-			dbClient := datastore.NewMockClient(&m)
-			fdb.InitDBConfig(dbClient, "test")
-
-			m.On("Find", mock.Anything, mock.Anything, &utils.ChartsList, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
-				*args.Get(2).(*[]*models.Chart) = tt.charts
-			})
-			res, err := http.Get(ts.URL + pathPrefix + "/charts/" + tt.repo)
-			assert.NoError(t, err)
-			defer res.Body.Close()
-
-			m.AssertExpectations(t)
-			assert.Equal(t, res.StatusCode, http.StatusOK, "http status code should match")
-
-			var b utils.BodyAPIListResponse
-			json.NewDecoder(res.Body).Decode(&b)
-			assert.Len(t, *b.Data, len(tt.charts))
-		})
-	}
-}
-
-// tests the GET /{apiVersion}/charts/{repo}/{chartName} endpoint
-func Test_GetChartInRepo(t *testing.T) {
-	ts := httptest.NewServer(SetupRoutes())
-	defer ts.Close()
-
-	tests := []struct {
-		name     string
-		err      error
-		chart    models.Chart
-		wantCode int
-	}{
-		{
-			"chart does not exist",
-			errors.New("return an error when checking if chart exists"),
-			models.Chart{ID: "my-repo/my-chart"},
-			http.StatusNotFound,
-		},
-		{
-			"chart exists",
-			nil,
-			models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}}},
-			http.StatusOK,
-		},
-		{
-			"chart has multiple versions",
-			nil,
-			models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}, {Version: "0.0.1"}}},
-			http.StatusOK,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var m mock.Mock
-			dbClient := datastore.NewMockClient(&m)
-			fdb.InitDBConfig(dbClient, "test")
-			if tt.err != nil {
-				m.On("FindOne", mock.Anything, mock.Anything, &models.Chart{}, mock.Anything).Return(mongo.ErrNoDocuments)
-			} else {
-				m.On("FindOne", mock.Anything, mock.Anything, &models.Chart{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
-					*args.Get(2).(*models.Chart) = tt.chart
-				})
-			}
-
-			res, err := http.Get(ts.URL + pathPrefix + "/charts/" + tt.chart.ID)
-			assert.NoError(t, err)
-			defer res.Body.Close()
-
-			m.AssertExpectations(t)
-			assert.Equal(t, tt.wantCode, res.StatusCode, "http status code should match")
-		})
-	}
-}
-
-// tests the GET /{apiVersion}/charts/{repo}/{chartName}/versions endpoint
-func Test_ListChartVersions(t *testing.T) {
-	ts := httptest.NewServer(SetupRoutes())
-	defer ts.Close()
-
-	tests := []struct {
-		name     string
-		err      error
-		chart    models.Chart
-		wantCode int
-	}{
-		{
-			"chart does not exist",
-			errors.New("return an error when checking if chart exists"),
-			models.Chart{ID: "my-repo/my-chart"},
-			http.StatusNotFound,
-		},
-		{
-			"chart exists",
-			nil,
-			models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}}},
-			http.StatusOK,
-		},
-		{
-			"chart has multiple versions",
-			nil,
-			models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}, {Version: "0.0.1"}}},
-			http.StatusOK,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var m mock.Mock
-			dbClient := datastore.NewMockClient(&m)
-			fdb.InitDBConfig(dbClient, "test")
-			if tt.err != nil {
-				m.On("FindOne", mock.Anything, mock.Anything, &models.Chart{}, mock.Anything).Return(mongo.ErrNoDocuments)
-			} else {
-				m.On("FindOne", mock.Anything, mock.Anything, &models.Chart{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
-					*args.Get(2).(*models.Chart) = tt.chart
-				})
-			}
-
-			res, err := http.Get(ts.URL + pathPrefix + "/charts/" + tt.chart.ID + "/versions")
-			assert.NoError(t, err)
-			defer res.Body.Close()
-
-			m.AssertExpectations(t)
-			assert.Equal(t, tt.wantCode, res.StatusCode, "http status code should match")
-		})
-	}
-}
-
-// tests the GET /{apiVersion}/charts/{repo}/{chartName}/versions/{:version} endpoint
-func Test_GetChartVersion(t *testing.T) {
-	ts := httptest.NewServer(SetupRoutes())
-	defer ts.Close()
-
-	tests := []struct {
-		name     string
-		err      error
-		chart    models.Chart
-		wantCode int
-	}{
-		{
-			"chart does not exist",
-			errors.New("return an error when checking if chart exists"),
-			models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}}},
-			http.StatusNotFound,
-		},
-		{
-			"chart exists",
-			nil,
-			models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}}},
-			http.StatusOK,
-		},
-		{
-			"chart has multiple versions",
-			nil,
-			models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}, {Version: "0.0.1"}}},
-			http.StatusOK,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var m mock.Mock
-			dbClient := datastore.NewMockClient(&m)
-			fdb.InitDBConfig(dbClient, "test")
-			if tt.err != nil {
-				m.On("FindOne", mock.Anything, mock.Anything, &models.Chart{}, mock.Anything).Return(mongo.ErrNoDocuments)
-			} else {
-				m.On("FindOne", mock.Anything, mock.Anything, &models.Chart{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
-					*args.Get(2).(*models.Chart) = tt.chart
-				})
-			}
-
-			res, err := http.Get(ts.URL + pathPrefix + "/charts/" + tt.chart.ID + "/versions/" + tt.chart.ChartVersions[0].Version)
-			assert.NoError(t, err)
-			defer res.Body.Close()
-
-			m.AssertExpectations(t)
-			assert.Equal(t, res.StatusCode, tt.wantCode, "http status code should match")
-		})
-	}
-}
-
-// tests the GET /{apiVersion}/assets/{repo}/{chartName}/logo-160x160-fit.png endpoint
-func Test_GetChartIcon(t *testing.T) {
-	ts := httptest.NewServer(SetupRoutes())
-	defer ts.Close()
-
-	tests := []struct {
-		name     string
-		err      error
-		chart    models.Chart
-		wantCode int
-	}{
-		{
-			"chart does not exist",
-			errors.New("return an error when checking if chart exists"),
-			models.Chart{ID: "my-repo/my-chart"},
-			http.StatusNotFound,
-		},
-		{
-			"chart has icon",
-			nil,
-			models.Chart{ID: "my-repo/my-chart", RawIcon: utils.IconBytes()},
-			http.StatusOK,
-		},
-		{
-			"chart does not have a icon",
-			nil,
-			models.Chart{ID: "my-repo/my-chart"},
-			http.StatusNotFound,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var m mock.Mock
-			dbClient := datastore.NewMockClient(&m)
-			fdb.InitDBConfig(dbClient, "test")
-			if tt.err != nil {
-				m.On("FindOne", mock.Anything, mock.Anything, &models.Chart{}, mock.Anything).Return(mongo.ErrNoDocuments)
-			} else {
-				m.On("FindOne", mock.Anything, mock.Anything, &models.Chart{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
-					*args.Get(2).(*models.Chart) = tt.chart
-				})
-			}
-
-			res, err := http.Get(ts.URL + pathPrefix + "/assets/" + tt.chart.ID + "/logo")
-			assert.NoError(t, err)
-			defer res.Body.Close()
-
-			m.AssertExpectations(t)
-			assert.Equal(t, tt.wantCode, res.StatusCode, "http status code should match")
-		})
-	}
-}
-
-// tests the GET /{apiVersion}/assets/{repo}/{chartName}/versions/{version}/README.md endpoint
-func Test_GetChartReadme(t *testing.T) {
-	ts := httptest.NewServer(SetupRoutes())
-	defer ts.Close()
-
-	tests := []struct {
-		name     string
-		version  string
-		err      error
-		files    models.ChartFiles
-		wantCode int
-	}{
-		{
-			"chart does not exist",
-			"0.1.0",
-			errors.New("return an error when checking if chart exists"),
-			models.ChartFiles{ID: "my-repo/my-chart"},
-			http.StatusNotFound,
-		},
-		{
-			"chart exists",
-			"1.2.3",
-			nil,
-			models.ChartFiles{ID: "my-repo/my-chart", Readme: utils.TestChartReadme},
-			http.StatusOK,
-		},
-		{
-			"chart does not have a readme",
-			"1.1.1",
-			nil,
-			models.ChartFiles{ID: "my-repo/my-chart"},
-			http.StatusNotFound,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var m mock.Mock
-			dbClient := datastore.NewMockClient(&m)
-			fdb.InitDBConfig(dbClient, "test")
-			if tt.err != nil {
-				m.On("FindOne", mock.Anything, mock.Anything, &models.ChartFiles{}, mock.Anything).Return(mongo.ErrNoDocuments)
-			} else {
-				m.On("FindOne", mock.Anything, mock.Anything, &models.ChartFiles{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
-					*args.Get(2).(*models.ChartFiles) = tt.files
-				})
-			}
-
-			res, err := http.Get(ts.URL + pathPrefix + "/assets/" + tt.files.ID + "/versions/" + tt.version + "/README.md")
-			assert.NoError(t, err)
-			defer res.Body.Close()
-
-			m.AssertExpectations(t)
-			assert.Equal(t, tt.wantCode, res.StatusCode, "http status code should match")
-		})
-	}
-}
-
-// tests the GET /{apiVersion}/assets/{repo}/{chartName}/versions/{version}/values.yaml endpoint
-func Test_GetChartValues(t *testing.T) {
-	ts := httptest.NewServer(SetupRoutes())
-	defer ts.Close()
-
-	tests := []struct {
-		name     string
-		version  string
-		err      error
-		files    models.ChartFiles
-		wantCode int
-	}{
-		{
-			"chart does not exist",
-			"0.1.0",
-			errors.New("return an error when checking if chart exists"),
-			models.ChartFiles{ID: "my-repo/my-chart"},
-			http.StatusNotFound,
-		},
-		{
-			"chart exists",
-			"3.2.1",
-			nil,
-			models.ChartFiles{ID: "my-repo/my-chart", Values: utils.TestChartValues},
-			http.StatusOK,
-		},
-		{
-			"chart does not have values.yaml",
-			"2.2.2",
-			nil,
-			models.ChartFiles{ID: "my-repo/my-chart"},
-			http.StatusOK,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var m mock.Mock
-			dbClient := datastore.NewMockClient(&m)
-			fdb.InitDBConfig(dbClient, "test")
-			if tt.err != nil {
-				m.On("FindOne", mock.Anything, mock.Anything, &models.ChartFiles{}, mock.Anything).Return(mongo.ErrNoDocuments)
-			} else {
-				m.On("FindOne", mock.Anything, mock.Anything, &models.ChartFiles{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
-					*args.Get(2).(*models.ChartFiles) = tt.files
-				})
-			}
-
-			res, err := http.Get(ts.URL + pathPrefix + "/assets/" + tt.files.ID + "/versions/" + tt.version + "/values.yaml")
-			assert.NoError(t, err)
-			defer res.Body.Close()
-
-			m.AssertExpectations(t)
-			assert.Equal(t, res.StatusCode, tt.wantCode, "http status code should match")
-		})
-	}
-}
-
-// tests the GET /{apiVersion}/assets/{repo}/{chartName}/versions/{version}/values/schema.json endpoint
-func Test_GetChartSchema(t *testing.T) {
-	ts := httptest.NewServer(SetupRoutes())
-	defer ts.Close()
-
-	tests := []struct {
-		name     string
-		version  string
-		err      error
-		files    models.ChartFiles
-		wantCode int
-	}{
-		{
-			"chart does not exist",
-			"0.1.0",
-			errors.New("return an error when checking if chart exists"),
-			models.ChartFiles{ID: "my-repo/my-chart"},
-			http.StatusNotFound,
-		},
-		{
-			"chart exists",
-			"3.2.1",
-			nil,
-			models.ChartFiles{ID: "my-repo/my-chart", Schema: testChartSchema},
-			http.StatusOK,
-		},
-		{
-			"chart does not have values.schema.json",
-			"2.2.2",
-			nil,
-			models.ChartFiles{ID: "my-repo/my-chart"},
-			http.StatusOK,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var m mock.Mock
-			dbClient := datastore.NewMockClient(&m)
-			fdb.InitDBConfig(dbClient, "test")
-			if tt.err != nil {
-				m.On("FindOne", mock.Anything, mock.Anything, &models.ChartFiles{}, mock.Anything).Return(mongo.ErrNoDocuments)
-			} else {
-				m.On("FindOne", mock.Anything, mock.Anything, &models.ChartFiles{}, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
-					*args.Get(2).(*models.ChartFiles) = tt.files
-				})
-			}
-
-			res, err := http.Get(ts.URL + pathPrefix + "/assets/" + tt.files.ID + "/versions/" + tt.version + "/values.schema.json")
-			assert.NoError(t, err)
-			defer res.Body.Close()
-
-			m.AssertExpectations(t)
-			assert.Equal(t, res.StatusCode, tt.wantCode, "http status code should match")
-		})
-	}
-}
diff --git a/src/jetstream/plugins/monocular/chartsvc/utils/testutils.go b/src/jetstream/plugins/monocular/chartsvc/utils/testutils.go
deleted file mode 100644
index 4014887a8f..0000000000
--- a/src/jetstream/plugins/monocular/chartsvc/utils/testutils.go
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright (c) 2019 The Helm Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package utils
-
-import (
-	"bytes"
-	"image/color"
-
-	"github.com/helm/monocular/chartsvc/models"
-
-	"github.com/disintegration/imaging"
-)
-
-//ChartsList a list of charts used in unit tests
-var ChartsList []*models.Chart
-
-//IconBytes the bytes of a chart icon image used in unit tests
-func IconBytes() []byte {
-	var b bytes.Buffer
-	img := imaging.New(1, 1, color.White)
-	imaging.Encode(&b, img, imaging.PNG)
-	return b.Bytes()
-}
-
-const TestChartReadme = "# Quickstart\n\n```bash\nhelm install my-repo/my-chart\n```"
-const TestChartValues = "image:\n  registry: docker.io\n  repository: my-repo/my-chart\n  tag: 0.1.0"
-const TestChartSchema = `{"properties": {"type": "object"}}`
diff --git a/src/jetstream/plugins/monocular/chartsvc_main.txt b/src/jetstream/plugins/monocular/chartsvc_main.txt
deleted file mode 100644
index 33c73651be..0000000000
--- a/src/jetstream/plugins/monocular/chartsvc_main.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-
-// Stratos addition to chartsvc main.go
-
-// SetMongoConfig allosws Stratos plugin to configure MongoDB
-func SetMongoConfig(dbURL, dbName, dbUsername *string, dbPassword string) (datastore.Session, error) {
-	var err error
-	mongoConfig := datastore.Config{URL: *dbURL, Database: *dbName, Username: *dbUsername, Password: dbPassword}
-	dbSession, err = datastore.NewSession(mongoConfig)
-	return dbSession, err
-}
-
-// GetRoutes exposes the HTTP routes for the Chart Service API
-func GetRoutes() http.Handler {
-  return setupRoutes()
-}
diff --git a/src/jetstream/plugins/monocular/git-merge-subpath.sh b/src/jetstream/plugins/monocular/git-merge-subpath.sh
deleted file mode 100755
index da5ecf1b8b..0000000000
--- a/src/jetstream/plugins/monocular/git-merge-subpath.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#! /bin/bash
-
-#================================================
-# Attribution:
-# https://stackoverflow.com/questions/23937436/add-subdirectory-of-remote-repo-with-git-subtree/30386041#30386041
-#================================================================
-
-git-merge-subpath() {
-    local SQUASH
-    if [[ $1 == "--squash" ]]; then
-        SQUASH=1
-        shift
-    fi
-    if (( $# != 3 )); then
-        local PARAMS="[--squash] SOURCE_COMMIT SOURCE_PREFIX DEST_PREFIX"
-        echo "USAGE: ${FUNCNAME[0]} $PARAMS"
-        return 1
-    fi
-
-    # Friendly parameter names; strip any trailing slashes from prefixes.
-    local SOURCE_COMMIT="$1" SOURCE_PREFIX="${2%/}" DEST_PREFIX="${3%/}"
-
-    local SOURCE_SHA1
-    SOURCE_SHA1=$(git rev-parse --verify "$SOURCE_COMMIT^{commit}")
-
-    local OLD_SHA1
-    local GIT_ROOT=$(git rev-parse --show-toplevel)
-    if [[ -n "$(ls -A "$GIT_ROOT/$DEST_PREFIX" 2> /dev/null)" ]]; then
-        # OLD_SHA1 will remain empty if there is no match.
-        local RE="^${FUNCNAME[0]}: [0-9a-f]{40} $SOURCE_PREFIX $DEST_PREFIX\$"
-        OLD_SHA1=$(git log -1 --format=%b -E --grep="$RE" \
-                   | grep --color=never -E "$RE" | tail -1 | awk '{print $2}')
-    fi
-
-    local OLD_TREEISH
-    if [[ -n $OLD_SHA1 ]]; then
-        OLD_TREEISH="$OLD_SHA1:$SOURCE_PREFIX"
-    else
-        # This is the first time git-merge-subpath is run, so diff against the
-        # empty commit instead of the last commit created by git-merge-subpath.
-        OLD_TREEISH=$(git hash-object -t tree /dev/null)
-    fi &&
-
-    if [[ -z $SQUASH ]]; then
-        git merge -s ours --no-commit "$SOURCE_COMMIT" || return 1
-    fi &&
-
-    printf "Calculating diff of changes from source and applying to destination..."
-    git diff --color=never "$OLD_TREEISH" "$SOURCE_COMMIT:$SOURCE_PREFIX" \
-        | git apply -3 --directory="$DEST_PREFIX" || git mergetool
-    echo "done."
-    if (( $? == 1 )); then
-        echo "Uh-oh! Try cleaning up with |git reset --merge|."
-	echo "You may be able to finish the merge manually then run the following (do not modify the commit message):"
-        echo "git commit -em \"Merge $SOURCE_COMMIT:$SOURCE_PREFIX/ to $DEST_PREFIX/ ${FUNCNAME[0]}: $SOURCE_SHA1 $SOURCE_PREFIX $DEST_PREFIX\""
-	return 1
-    else
-        git commit -em "Merge $SOURCE_COMMIT:$SOURCE_PREFIX/ to $DEST_PREFIX/ 
-
-# Feel free to edit the title and body above, but make sure to keep the
-# ${FUNCNAME[0]}: line below intact, so ${FUNCNAME[0]} can find it
-# again when grepping git log.
-${FUNCNAME[0]}: $SOURCE_SHA1 $SOURCE_PREFIX $DEST_PREFIX"
-    fi
-}
diff --git a/src/jetstream/plugins/monocular/git-pull-downstream.sh b/src/jetstream/plugins/monocular/git-pull-downstream.sh
deleted file mode 100755
index 462b3bdc0b..0000000000
--- a/src/jetstream/plugins/monocular/git-pull-downstream.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-echo "=== Pull Monocular Code to Stratos Repo ===" >&1
-echo "Pulls the subtree under cmd from monocular repo into the src/jetstream/plugins/monocular subtree in stratos" >&1
-usage() {
-	echo    "Usage: git-pull-downstream.sh -f <MONOCULAR_FORK> [ -b <MONOCULAR_BRANCH>  | -r <MONOCULAR_REF> ]" >&1
-	echo    "  options:" >&1
-	printf  "    -f MONOCULAR_FORK         The upstream fork/repo to pull from\n" >&1
-	printf  "    ONE OF EITHER -b or -r must be set\n" >&1
-	echo    "    -b MONOCULAR_BRANCH       The upstream branch to pull from" >&1
-	echo    "    -r MONOCULAR_REF  The upsream ref to pull from (e.g. tag or SHA1)" >&1
-	echo    "    -h usage" >&1
-	exit 0
-}
-
-while getopts f:b:r:h arg 
-do
-	case ${arg} in
-		f)   MONOCULAR_FORK=${OPTARG};;
-		b)   MONOCULAR_BRANCH=${OPTARG};;
-		r)   MONOCULAR_REF=${OPTARG};;
-		h)   usage;;
-		\?)  usage;;
-	esac
-done
-
-if [ -z "$MONOCULAR_FORK" ]; then
-	echo "Must specify a monocular fork to pull from" >&2
-	usage
-fi
-
-if [ -n "$MONOCULAR_BRANCH" ] && [ -n "$MONOCULAR_REF" ] || [ -z "$MONOCULAR_BRANCH" ] && [ -z "$MONOCULAR_REF" ]; then
-	echo "Must specify either a monocular branch or ref to pull from" >&2
-	usage
-fi
-
-echo "Monocular fork: $MONOCULAR_FORK" >&1
-echo "Monocular branch: $MONOCULAR_BRANCH" >&1
-echo "Monocular ref: $MONOCULAR_REF" >&1
-
-DIRPATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-echo "${DIRPATH}"
-
-pushd "${DIRPATH}" >& /dev/null || exit
-
-source ./git-merge-subpath.sh
-
-echo "Fetching $MONOCULAR_FORK"
-
-# Fetch and merge the monocular subtree into the Stratos repo and attempt squash commit
-git fetch "$MONOCULAR_FORK"
-
-# Set our pull ref to either "fork/branch" or [tag|commit]
-if [ -n "$MONOCULAR_REF" ]; then
-	PULL_REF="$MONOCULAR_REF"
-else
-	PULL_REF="$MONOCULAR_FORK/$MONOCULAR_BRANCH"
-fi
-
-echo "Reading subtree index from $MONOCULAR_FORK:cmd. Merging in changes from $PULL_REF into src/jetstream/plugins/monocular" >&1
-# Move to root of repo
-repo_root=$(git rev-parse --show-toplevel)
-echo "Moving to repo top level: $repo_root" >&1
-pushd "$repo_root" >&/dev/null || exit
-
-# Read in tree
-# Git diff apply from last commit (or none) to the specified commit between the given subtrees
-git-merge-subpath --squash "$PULL_REF" cmd src/jetstream/plugins/monocular
-merge_retval=$?
-
-popd >& /dev/null || exit
-popd >& /dev/null || exit
-
-if [ $merge_retval -eq 0 ]; then
-	echo "Success" >&1
-fi
-
diff --git a/src/jetstream/plugins/monocular/git-push-upstream.sh b/src/jetstream/plugins/monocular/git-push-upstream.sh
deleted file mode 100755
index c4e54aaed7..0000000000
--- a/src/jetstream/plugins/monocular/git-push-upstream.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-
-echo "== Push Monocular Changes Upstream ==" >&1
-
-usage() {
-	echo "Usage: git-push-upstream.sh -f <MONOCULAR_FORK> -t <MONOCULAR_BRANCH> -s <STRATOS_SOURCE_BRANCH> ]" >&1
-	echo "  options:" >&1
-	echo "    -f MONOCULAR_FORK         The upstream fork/repo to push to" >&1
-	echo "    -t MONOCULAR_BRANCH       The target upstream branch to push to" >&1
-	echo "    -s STRATOS_SOURCE_BRANCH  The Stratos source branch containing the changes" >&1
-	echo "    -h usage"
-}
-
-while getopts f:t:s:h arg; do
-	case ${arg} in
-		f)   MONOCULAR_FORK=${OPTARG};;
-		t)   MONOCULAR_BRANCH=${OPTARG};;
-		s)   STRATOS_BRANCH=${OPTARG};;
-		h)   usage;;
-		\?)  usage;;
-	esac
-done
-
-
-if [[ -z "$MONOCULAR_FORK"  ||  -z "$MONOCULAR_BRANCH" || -z "$STRATOS_BRANCH" ]]; then
-	usage
-	exit 1
-fi
-
-echo "Monocular fork: $MONOCULAR_FORK" >&1
-echo "Monocular branch: $MONOCULAR_BRANCH" >&1
-echo "Stratos source branch: $STRATOS_BRANCH" >&1
-
-DIRPATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-echo "${DIRPATH}"
-
-pushd "${DIRPATH}" >& /dev/null || exit
-
-source ./git-merge-subpath.sh
-
-echo "Checking out monocular target branch: $MONOCULAR_BRANCH from $MONOCULAR_FORK into temporary merge branch: temp-merge-branch" >&1
-
-##Change to top level of repo
-repo_root=$(git rev-parse --show-toplevel)
-echo "Moving to repo top level: $repo_root" >&1
-pushd "$repo_root" >&/dev/null || exit
-
-##Checkout the monocular feature branch onto a temporary merge branch
-git fetch "$MONOCULAR_FORK"
-git checkout -b temp-merge-branch "$MONOCULAR_FORK"/"$MONOCULAR_BRANCH" || exit
-
-##Merge changes from our monocular subtree in Stratos v2-master to our temp-merge-branch
-
-echo "Merging Stratos branch $STRATOS_BRANCH at src/jetstream/plugins/monocular into temp-merge-branch" >&1
-
-git-merge-subpath --squash origin/"$STRATOS_BRANCH" src/jetstream/plugins/monocular cmd
-if [ $? -ne 0 ]; then
-	echo "Unsuccessful." >&2
-	#Move back to repo root - important in case of bail-out here.
-	popd >& /dev/null || exit
-	exit 1
-else
-
-	echo "Pushing changes to target branch: $MONOCULAR_BRANCH on $MONOCULAR_FORK" >&1
-
-        ##Push the temporary merge branch back to the monocular feature branch
-        git push "$MONOCULAR_FORK" HEAD:"$MONOCULAR_BRANCH"
-        if [ $? -ne 0 ]; then
-	     echo "Failed to push to branch: $MONOCULAR_BRANCH on $MONOCULAR_FORK." >&2
-        else
-	     echo "Cleaning up temporary branches" >&1
-             ##Cleanup: remove our temporary merge branch
-             git checkout "$STRATOS_BRANCH" && git branch -d temp-merge-branch
-       fi
-fi
-
-popd >& /dev/null || exit
-popd >& /dev/null || exit
-
-if [ $? -eq 0 ]; then
-	echo "Success" >&1
-fi
diff --git a/src/jetstream/plugins/monocular/go.mod b/src/jetstream/plugins/monocular/go.mod
index d099ac958b..a1f6697738 100644
--- a/src/jetstream/plugins/monocular/go.mod
+++ b/src/jetstream/plugins/monocular/go.mod
@@ -4,22 +4,19 @@ go 1.12
 
 require (
 	bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c
+	github.com/Masterminds/semver/v3 v3.1.0 // indirect
 	github.com/go-sql-driver/mysql v1.4.1 // indirect
-	github.com/helm/monocular v1.4.0
-	github.com/helm/monocular/chartrepo v0.0.0-00010101000000-000000000000
-	github.com/helm/monocular/chartsvc v0.0.0-00010101000000-000000000000
 	github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a
 	github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28 // indirect
 	github.com/labstack/echo v3.3.10+incompatible
+	github.com/labstack/gommon v0.3.0 // indirect
 	github.com/lib/pq v1.0.0 // indirect
 	github.com/mattn/go-sqlite3 v1.10.0 // indirect
 	github.com/satori/go.uuid v1.2.0
 	github.com/sirupsen/logrus v1.4.2
 	github.com/ziutek/mymysql v1.5.4 // indirect
+	golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a // indirect
+	gopkg.in/yaml.v2 v2.3.0 // indirect
 )
 
-replace (
-	github.com/cloudfoundry-incubator/stratos/src/jetstream => ../..
-	github.com/helm/monocular/chartrepo => ./chart-repo
-	github.com/helm/monocular/chartsvc => ./chartsvc
-)
+replace github.com/cloudfoundry-incubator/stratos/src/jetstream => ../..
diff --git a/src/jetstream/plugins/monocular/go.sum b/src/jetstream/plugins/monocular/go.sum
index 1dc960fbfd..c4d22047ed 100644
--- a/src/jetstream/plugins/monocular/go.sum
+++ b/src/jetstream/plugins/monocular/go.sum
@@ -6,6 +6,8 @@ github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITg
 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/Masterminds/semver/v3 v3.1.0 h1:Y2lUDsFKVRSYGojLJ1yLxSXdMmMYTYls0rCvoqmMUQk=
+github.com/Masterminds/semver/v3 v3.1.0/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
@@ -254,6 +256,8 @@ golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9 h1:abxekknhS/Drh3uoQDk5Hc7BgeiyI39Crb7vhf/1j5s=
 golang.org/x/crypto v0.0.0-20191205161847-0a08dada0ff9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM=
+golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 h1:00VmoueYNlNz/aHIilyyQz/MHSqGoWJzpFv/HW8xpzI=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U=
@@ -262,6 +266,7 @@ golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 h1:rjwSpXsdiK0dV8/Naq3kAw9ymfAeJIyd0upUIElB+lI=
@@ -280,12 +285,15 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191010194322-b09406accb47 h1:/XfQ9z7ib8eEJX2hdgFTZJ/ntt0swNk5oYBziWeTCvY=
 golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@@ -303,6 +311,8 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 k8s.io/apimachinery v0.0.0-20190221093215-450d01ad5771 h1:XMECjVNpkFVT9uY40z07scw8Xtn2mUnkxx8BC3gjwoE=
 k8s.io/apimachinery v0.0.0-20190221093215-450d01ad5771/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
 k8s.io/apimachinery v0.0.0-20191203211716-adc6f4cd9e7d h1:q+OZmYewHJeMCzwpHkXlNTtk5bvaUMPCikKvf77RBlo=
diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index 01f12dc905..c2746a13bf 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -1,26 +1,18 @@
 package monocular
 
 import (
-	"encoding/json"
 	"errors"
-	"fmt"
 	"io/ioutil"
-	"math/rand"
 	"net/http"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"strings"
 	"time"
 
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/monocular/store"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
-
-	"github.com/helm/monocular/chartsvc"
-	"github.com/helm/monocular/chartsvc/foundationdb"
-	"github.com/helm/monocular/chartsvc/models"
-	"github.com/helm/monocular/chartsvc/utils"
 )
 
 const (
@@ -28,30 +20,25 @@ const (
 	helmHubEndpointType   = "hub"
 	helmRepoEndpointType  = "repo"
 	stratosPrefix         = "/pp/v1/"
-	prefix                = "/pp/v1/chartsvc/"
 	kubeReleaseNameEnvVar = "STRATOS_HELM_RELEASE"
-	foundationDBURLEnvVar = "FDB_URL"
-	syncServerURLEnvVar   = "SYNC_SERVER_URL"
-	caCertEnvVar          = "MONOCULAR_CA_CRT_PATH"
-	tlsKeyEnvVar          = "MONOCULAR_KEY_PATH"
-	tLSCertEnvVar         = "MONOCULAR_CRT_PATH"
-	localDevEnvVar        = "FDB_LOCAL_DEV"
-	chartSyncBasePort     = 45000
+	cacheFolderEnvVar     = "HELM_CACHE_FOLDER"
+	defaultCacheFolder    = "./.helm-cache"
 )
 
 // Monocular is a plugin for Monocular
 type Monocular struct {
 	portalProxy     interfaces.PortalProxy
 	chartSvcRoutes  http.Handler
-	RepoQueryStore  *chartsvc.ChartSvcDatastore
+	ChartStore      store.ChartStore
 	FoundationDBURL string
 	SyncServiceURL  string
 	devSyncPID      int
+	CacheFolder     string
 }
 
 type HelmHubChart struct {
-	utils.ApiResponse
-	Attributes *models.ChartVersion `json:"attributes"`
+	APIResponse
+	Attributes *ChartVersion `json:"attributes"`
 }
 
 type HelmHubChartResponse struct {
@@ -60,96 +47,51 @@ type HelmHubChartResponse struct {
 
 // Init creates a new Monocular
 func Init(portalProxy interfaces.PortalProxy) (interfaces.StratosPlugin, error) {
+	store.InitRepositoryProvider(portalProxy.GetConfig().DatabaseProviderName)
 	return &Monocular{portalProxy: portalProxy}, nil
 }
 
 // Init performs plugin initialization
 func (m *Monocular) Init() error {
 	log.Debug("Monocular init .... ")
-	if err := m.configure(); err != nil {
+
+	m.CacheFolder = m.portalProxy.Env().String(cacheFolderEnvVar, defaultCacheFolder)
+	folder, err := filepath.Abs(m.CacheFolder)
+	if err != nil {
 		return err
 	}
-
-	fdbURL := m.FoundationDBURL
-	fDB := "monocular-plugin"
-	debug := false
-	caCertPath, _ := m.portalProxy.Env().Lookup(caCertEnvVar)
-	TLSCertPath, _ := m.portalProxy.Env().Lookup(tLSCertEnvVar)
-	tlsKeyPath, _ := m.portalProxy.Env().Lookup(tlsKeyEnvVar)
-	m.ConfigureChartSVC(&fdbURL, &fDB, caCertPath, TLSCertPath, tlsKeyPath, &debug)
-	m.chartSvcRoutes = chartsvc.SetupRoutes()
-	m.InitSync()
-	m.syncOnStartup()
-	return nil
-}
-
-// Destroy does any cleanup for the plugin on exit
-func (m *Monocular) Destroy() {
-	log.Debug("Monocular plugin .. destroy")
-	if m.devSyncPID != 0 {
-		log.Info("... Stopping chart sync tool")
-		if p, err := os.FindProcess(m.devSyncPID); err == nil {
-			p.Kill()
-		} else {
-			log.Error("Could not find process for the chart sync tool")
+	m.CacheFolder = folder
+	log.Infof("Using Cache folder: %s", m.CacheFolder)
+
+	// Check that the folder exists - try to make it, if not
+	if _, err := os.Stat(m.CacheFolder); os.IsNotExist(err) {
+		log.Info("Helm Cache folder does not exist - creating")
+		if err := os.MkdirAll(m.CacheFolder, os.ModePerm); err != nil {
+			log.Warn("Could not create folder for Helm Cache")
+			return err
 		}
 	}
-}
-
-func (m *Monocular) configure() error {
-
-	// Env var lookup for Monocular services
-	m.FoundationDBURL = m.portalProxy.Env().String(foundationDBURLEnvVar, "")
-	m.SyncServiceURL = m.portalProxy.Env().String(syncServerURLEnvVar, "")
-
-	if fdbPort, isLocal := m.portalProxy.Env().Lookup(localDevEnvVar); isLocal {
-		// Create a random port to use for the chart sync service
-		devSyncPort := chartSyncBasePort + rand.Intn(5000)
-		m.FoundationDBURL = fmt.Sprintf("mongodb://127.0.0.1:%s", fdbPort)
-		m.SyncServiceURL = fmt.Sprintf("http://127.0.0.1:%d", devSyncPort)
 
-		// Run the chartrepo tool
-		dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
-		if err != nil {
-			log.Error("Can not get folder of current process")
-		}
-		chartSyncTool := filepath.Join(dir, "plugins", "monocular", "chart-repo", "chartrepo")
-		cmd := exec.Command(chartSyncTool, "serve", fmt.Sprintf("--doclayer-url=%s", m.FoundationDBURL))
-		cmd.Env = make([]string, 1)
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-		cmd.Env[0] = fmt.Sprintf("PORT=%d", devSyncPort)
-		if err = cmd.Start(); err != nil {
-			log.Fatalf("Error starting chart sync tool: %+v", err)
-		} else {
-			m.devSyncPID = cmd.Process.Pid
-		}
+	store, err := store.NewHelmChartDBStore(m.portalProxy.GetDatabaseConnection())
+	if err != nil {
+		log.Errorf("Can not get Helm Chart store: %s", err)
+		return err
 	}
 
-	log.Debugf("Foundation DB : %s", m.FoundationDBURL)
-	log.Debugf("Sync Server   : %s", m.SyncServiceURL)
-
-	if len(m.FoundationDBURL) == 0 || len(m.SyncServiceURL) == 0 {
-		return errors.New("Helm Monocular DB and/or Sync server are not configured")
-	}
+	m.ChartStore = store
 
+	m.InitSync()
+	m.syncOnStartup()
 	return nil
 }
 
-func getReleaseNameEnvVarPrefix(name string) string {
-	prefix := strings.ToUpper(name)
-	prefix = strings.ReplaceAll(prefix, "-", "_")
-	return prefix
+// Destroy does any cleanup for the plugin on exit
+func (m *Monocular) Destroy() {
+	log.Debug("Monocular plugin .. destroy")
 }
 
 func (m *Monocular) syncOnStartup() {
-
-	// Get the repositories that we currently have
-	repos, err := foundationdb.ListRepositories()
-	if err != nil {
-		log.Errorf("Chart Repository Startup: Unable to sync repositories: %v+", err)
-		return
-	}
+	// Always sync all repositories on startup
 
 	// Get all of the helm endpoints
 	endpoints, err := m.portalProxy.ListEndpoints()
@@ -158,17 +100,13 @@ func (m *Monocular) syncOnStartup() {
 		return
 	}
 
-	helmRepos := make([]string, 0)
+	helmRepos := make(map[string]bool)
 	for _, ep := range endpoints {
 		if ep.CNSIType == helmEndpointType {
 			if ep.SubType == helmRepoEndpointType {
-				helmRepos = append(helmRepos, ep.Name)
-
-				// Is this an endpoint that we don't have charts for ?
-				if !arrayContainsString(repos, ep.Name) {
-					log.Infof("Syncing helm repository to chart store: %s", ep.Name)
-					m.Sync(interfaces.EndpointRegisterAction, ep)
-				}
+				helmRepos[ep.Name] = true
+				log.Infof("Syncing helm repository to chart store: %s", ep.Name)
+				m.Sync(interfaces.EndpointRegisterAction, ep)
 			} else {
 				metadata := "{}"
 				m.portalProxy.UpdateEndpointMetadata(ep.GUID, metadata)
@@ -176,16 +114,15 @@ func (m *Monocular) syncOnStartup() {
 		}
 	}
 
-	// Now delete any repositories that are no longer registered as endpoints
-	for _, repo := range repos {
-		if !arrayContainsString(helmRepos, repo) {
-			log.Infof("Removing helm repository from chart store: %s", repo)
-			endpoint := &interfaces.CNSIRecord{
-				GUID:     repo,
-				Name:     repo,
-				CNSIType: helmEndpointType,
+	// Delete any endpoints left in the chart store that are no longer registered
+	// Get all of the endpoints that we have in the Database Chart Store
+	existing, err := m.ChartStore.GetEndpointIDs()
+	if err == nil {
+		for _, id := range existing {
+			if _, ok := helmRepos[id]; !ok {
+				log.Warnf("Endpoint ID %s exists in the Chart Store but does not exist as an endpoint - deleting", id)
+				m.deleteChartStoreForEndpoint(id)
 			}
-			m.Sync(interfaces.EndpointUnregisterAction, endpoint)
 		}
 	}
 }
@@ -200,17 +137,7 @@ func arrayContainsString(a []string, x string) bool {
 	return false
 }
 
-func (m *Monocular) ConfigureChartSVC(fdbURL *string, fDB *string, cACertFile string, certFile string, keyFile string, debug *bool) error {
-	//TLS options must either be all set to enabled TLS, or none set to disable TLS
-	var tlsEnabled = cACertFile != "" && keyFile != "" && certFile != ""
-	if !(tlsEnabled || (cACertFile == "" && keyFile == "" && certFile == "")) {
-		return errors.New("To enable TLS, all 3 TLS cert paths must be set.")
-	}
-	m.RepoQueryStore = chartsvc.InitFDBDocLayerConnection(fdbURL, fDB, &tlsEnabled, cACertFile, certFile, keyFile, debug)
-
-	return nil
-}
-
+// OnEndpointNotification handles notification that endpoint has been remoevd
 func (m *Monocular) OnEndpointNotification(action interfaces.EndpointAction, endpoint *interfaces.CNSIRecord) {
 	if endpoint.CNSIType == helmEndpointType && endpoint.SubType == helmRepoEndpointType {
 		m.Sync(action, endpoint)
@@ -239,16 +166,57 @@ func (m *Monocular) AddAdminGroupRoutes(echoGroup *echo.Group) {
 
 // AddSessionGroupRoutes adds the session routes for this plugin to the Echo server
 func (m *Monocular) AddSessionGroupRoutes(echoGroup *echo.Group) {
-	// Requests to Monocular Instances
-	echoGroup.Any("/chartsvc/*", m.handleAPI)
+
+	// API for Helm Chart Repositories - sync and sync status
 	// Reach out to a monocular instance other than Stratos (like helm hub). This is usually done via `x-cap-cnsi-list`
 	// however cannot be done for things like img src
 	echoGroup.Any("/monocular/:guid/chartsvc/*", m.handleMonocularInstance)
 
-	// API for Helm Chart Repositories
-	echoGroup.GET("/chartrepos", m.ListRepos)
-	echoGroup.POST("/chartrepos/status", m.GetRepoStatuses)
-	echoGroup.POST("/chartrepos/:guid", m.SyncRepo)
+	echoGroup.POST("/chartrepos/:guid", m.syncRepo)
+	echoGroup.POST("/chartrepos/status", m.getRepoStatuses)
+
+	// Routes for Chart Store
+	chartSvcGroup := echoGroup.Group("/chartsvc")
+
+	// Routes for the internal chart store
+
+	// Get specific chart version file (used for values.yaml)
+	chartSvcGroup.GET("/v1/assets/:repo/:name/versions/:version/:filename", m.getChartAndVersionFile)
+
+	// Get specific chart version file
+	chartSvcGroup.GET("/v1/charts/:repo/:name/versions/:version/files/:filename", m.getChartAndVersionFile)
+
+	// Get specific chart version of a chart
+	chartSvcGroup.GET("/v1/charts/:repo/:name/versions/:version", m.getChartVersion)
+
+	// Get chart versions
+	chartSvcGroup.GET("/v1/charts/:repo/:name/versions", m.getChartVersions)
+
+	// Get a chart
+	chartSvcGroup.GET("/v1/charts/:repo/:name", m.getChart)
+
+	// // Get list of charts
+	chartSvcGroup.GET("/v1/charts", m.listCharts)
+
+	// Get the chart icon for a specific version
+	chartSvcGroup.GET("/v1/assets/:repo/:chartName/:version/logo", m.getIcon)
+
+	// Get the chart icon
+	chartSvcGroup.GET("/v1/assets/:repo/:chartName/logo", m.getIcon)
+}
+
+// Check if the request if for an external Monocular instance and handle it if so
+func (m *Monocular) processMonocularRequest(c echo.Context) (bool, error) {
+	externalMonocularEndpoint, err := m.isExternalMonocularRequest(c)
+	if err != nil {
+		return true, echo.NewHTTPError(http.StatusBadRequest, err.Error())
+	}
+
+	// If this request is associated with an external monocular instance forward the request on to it
+	if externalMonocularEndpoint != nil {
+		return true, m.baseHandleMonocularInstance(c, externalMonocularEndpoint)
+	}
+	return false, nil
 }
 
 // isExternalMonocularRequest .. Should this request go out to an external monocular instance? IF so returns external monocular endpoint
@@ -278,30 +246,6 @@ func (m *Monocular) validateExternalMonocularEndpoint(cnsi string) (*interfaces.
 	return nil, nil
 }
 
-// Forward requests to the Chart Service API
-func (m *Monocular) handleAPI(c echo.Context) error {
-	externalMonocularEndpoint, err := m.isExternalMonocularRequest(c)
-	if err != nil {
-		return echo.NewHTTPError(http.StatusBadRequest, err.Error())
-	}
-
-	// If this request is associated with an external monocular instance forward the request on to it
-	if externalMonocularEndpoint != nil {
-		return m.baseHandleMonocularInstance(c, externalMonocularEndpoint)
-	}
-
-	// Modify the path to remove our prefix for the Chart Service API
-	path := c.Request().URL.Path
-	log.Debugf("URL to chartsvc requested: %v", path)
-	if strings.Index(path, prefix) == 0 {
-		path = path[len(prefix)-1:]
-		c.Request().URL.Path = path
-	}
-	log.Debugf("URL to chartsvc requested after modification: %v", path)
-	m.chartSvcRoutes.ServeHTTP(c.Response().Writer, c.Request())
-	return nil
-}
-
 func (m *Monocular) handleMonocularInstance(c echo.Context) error {
 	log.Debug("handleMonocularInstance")
 	guid := c.Param("guid")
@@ -392,59 +336,3 @@ func (m *Monocular) baseHandleMonocularInstance(c echo.Context, monocularEndpoin
 
 	return nil
 }
-
-// GetChartDownloadUrl ... Get the download url for the bits required to install the given chart
-func (m *Monocular) GetChartDownloadUrl(monocularEndpoint, chartID, version string) (string, error) {
-	if len(monocularEndpoint) > 0 {
-		// Fetch the monocular endpoint for the url
-		endpoint, err := m.validateExternalMonocularEndpoint(monocularEndpoint)
-		if err != nil {
-			return "", err
-		}
-		url := endpoint.APIEndpoint
-
-		// Fetch the chart, this will give us the url to download the bits
-		url.Path += "/chartsvc/v1/charts/" + chartID + "/versions/" + version
-		req, err := http.NewRequest(http.MethodGet, url.String(), nil)
-		req.Header.Set(echo.HeaderContentType, echo.MIMEApplicationJSON)
-		client := &http.Client{Timeout: 30 * time.Second}
-		res, err := client.Do(req)
-		if err != nil {
-			return "", err
-		} else if res.StatusCode >= 400 {
-			return "", fmt.Errorf("Couldn't download monocular chart (%+v) from '%+v'", res.StatusCode, req.URL)
-		} else if res.Body != nil {
-			body, _ := ioutil.ReadAll(res.Body)
-			defer res.Body.Close()
-
-			// Reach into the chart response for the download URL
-			chartVersionResponse := &HelmHubChartResponse{}
-			err := json.Unmarshal(body, chartVersionResponse)
-			if err != nil {
-				return "", err
-			}
-			if len(chartVersionResponse.Data.Attributes.URLs) < 1 {
-				return "", errors.New("Response contained no chart package urls")
-			}
-			return chartVersionResponse.Data.Attributes.URLs[0], err
-		} else {
-			return "", errors.New("No body in response to chart request")
-		}
-	} else {
-		store := m.RepoQueryStore
-		chart, err := store.GetChart(chartID)
-		if err != nil {
-			return "", errors.New("Could not find Chart")
-		}
-
-		// Find the download URL for the version
-		for _, chartVersion := range chart.ChartVersions {
-			if chartVersion.Version == version {
-				if len(chartVersion.URLs) == 1 {
-					return chartVersion.URLs[0], nil
-				}
-			}
-		}
-		return "", errors.New("Could not find Chart Version")
-	}
-}
diff --git a/src/jetstream/plugins/monocular/repository.go b/src/jetstream/plugins/monocular/repository.go
index 18b1f3e600..eeeffa298d 100644
--- a/src/jetstream/plugins/monocular/repository.go
+++ b/src/jetstream/plugins/monocular/repository.go
@@ -2,7 +2,6 @@ package monocular
 
 import (
 	"encoding/json"
-	"errors"
 	"io/ioutil"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
@@ -10,45 +9,11 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-type HelmRepoInfo struct {
-	ID         string `json:"id"`
-	Type       string `json:"type"`
-	Attributes struct {
-		Name string `json:"name"`
-		URL  string `json:"url"`
-	} `json:"attributes"`
-}
-
 type helmStatusInfo map[string]bool
 
-func (m *Monocular) ListRepos(c echo.Context) error {
-	log.Debug("ListRepos")
-
-	endpoints, err := m.portalProxy.ListEndpoints()
-	if err != nil {
-		return errors.New("Could not get endpoints")
-	}
-
-	repos := make([]HelmRepoInfo, 0)
-	for _, ep := range endpoints {
-		if ep.CNSIType == helmEndpointType {
-			// Helm endpoint
-			repo := HelmRepoInfo{
-				ID:   ep.Name,
-				Type: "repository",
-			}
-			repo.Attributes.Name = ep.Name
-			repo.Attributes.URL = ep.APIEndpoint.String()
-			repos = append(repos, repo)
-		}
-	}
-
-	return c.JSON(200, repos)
-}
-
-// GetRepoStatuses will get the status of the Helm Endpoints requested
-func (m *Monocular) GetRepoStatuses(c echo.Context) error {
-	log.Debug("GetRepoStatuses")
+// getRepoStatuses will get the status of the Helm Endpoints requested
+func (m *Monocular) getRepoStatuses(c echo.Context) error {
+	log.Debug("getRepoStatuses")
 
 	// Get the list of endpoints we are looking at
 	// Need to extract the parameters from the request body
diff --git a/src/jetstream/plugins/monocular/chartsvc/utils/responses.go b/src/jetstream/plugins/monocular/responses.go
similarity index 85%
rename from src/jetstream/plugins/monocular/chartsvc/utils/responses.go
rename to src/jetstream/plugins/monocular/responses.go
index 00d6c105f2..036c9aa658 100644
--- a/src/jetstream/plugins/monocular/chartsvc/utils/responses.go
+++ b/src/jetstream/plugins/monocular/responses.go
@@ -14,21 +14,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package utils
+package monocular
 
 //BodyAPIListResponse is an API body response in list format including the number of results pages
 type BodyAPIListResponse struct {
-	Data *ApiListResponse `json:"data"`
+	Data *APIListResponse `json:"data"`
 	Meta Meta             `json:"meta,omitempty"`
 }
 
 //BodyAPIResponse is an API body response in non-list format
 type BodyAPIResponse struct {
-	Data ApiResponse `json:"data"`
+	Data APIResponse `json:"data"`
 }
 
-//ApiResponse is an API response in non-list format
-type ApiResponse struct {
+//APIResponse is an API response in non-list format
+type APIResponse struct {
 	ID            string      `json:"id"`
 	Type          string      `json:"type"`
 	Attributes    interface{} `json:"attributes"`
@@ -36,8 +36,8 @@ type ApiResponse struct {
 	Relationships RelMap      `json:"relationships"`
 }
 
-//ApiListResponse is an API response in list format
-type ApiListResponse []*ApiResponse
+//APIListResponse is an API response in list format
+type APIListResponse []*APIResponse
 
 //SelfLink the self-referencing URL to a chart in a response
 type SelfLink struct {
diff --git a/src/jetstream/plugins/monocular/store/chart_store_db.go b/src/jetstream/plugins/monocular/store/chart_store_db.go
new file mode 100644
index 0000000000..c21a7d5787
--- /dev/null
+++ b/src/jetstream/plugins/monocular/store/chart_store_db.go
@@ -0,0 +1,211 @@
+package store
+
+import (
+	"database/sql"
+	"errors"
+	"fmt"
+	"sort"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore"
+)
+
+var (
+	saveChartVersion   = `INSERT INTO helm_charts (endpoint, name, repo_name, version, created, app_version, description, icon_url, chart_url, source_url, digest, is_latest, update_batch) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)`
+	deleteChartVersion = `DELETE FROM helm_charts WHERE endpoint = $1 AND name = $2 and version = $3`
+	deleteForEndpoint  = `DELETE FROM helm_charts WHERE endpoint = $1`
+	deleteForBatch     = `DELETE FROM helm_charts WHERE endpoint = $1 AND name = $2 and update_batch != $3`
+	renameEndpoint     = `UPDATE helm_charts SET repo_name=$1 WHERE endpoint=$2`
+	getLatestCharts    = `SELECT endpoint, name, repo_name, version, created, app_version, description, icon_url, chart_url, source_url, digest, is_latest FROM helm_charts WHERE is_latest = true`
+	getLatestChart     = `SELECT endpoint, name, repo_name, version, created, app_version, description, icon_url, chart_url, source_url, digest, is_latest FROM helm_charts WHERE repo_name = $1 AND name = $2 AND is_latest = true`
+	getChartVersion    = `SELECT endpoint, name, repo_name, version, created, app_version, description, icon_url, chart_url, source_url, digest, is_latest FROM helm_charts WHERE repo_name = $1 AND name = $2 AND version = $3`
+	getChartVersions   = `SELECT endpoint, name, repo_name, version, created, app_version, description, icon_url, chart_url, source_url, digest, is_latest FROM helm_charts WHERE repo_name = $1 AND name = $2`
+	getEndpointIDs     = `SELECT DISTINCT endpoint FROM helm_charts`
+)
+
+// InitRepositoryProvider - One time init for the given DB Provider
+func InitRepositoryProvider(databaseProvider string) {
+	saveChartVersion = datastore.ModifySQLStatement(saveChartVersion, databaseProvider)
+	deleteChartVersion = datastore.ModifySQLStatement(deleteChartVersion, databaseProvider)
+	deleteForEndpoint = datastore.ModifySQLStatement(deleteForEndpoint, databaseProvider)
+	deleteForBatch = datastore.ModifySQLStatement(deleteForBatch, databaseProvider)
+	renameEndpoint = datastore.ModifySQLStatement(renameEndpoint, databaseProvider)
+	getLatestCharts = datastore.ModifySQLStatement(getLatestCharts, databaseProvider)
+	getLatestChart = datastore.ModifySQLStatement(getLatestChart, databaseProvider)
+	getChartVersion = datastore.ModifySQLStatement(getChartVersion, databaseProvider)
+	getChartVersions = datastore.ModifySQLStatement(getChartVersions, databaseProvider)
+	getEndpointIDs = datastore.ModifySQLStatement(getEndpointIDs, databaseProvider)
+}
+
+// HelmChartDBStore is a DB-backed Helm Chart repository
+type HelmChartDBStore struct {
+	db *sql.DB
+}
+
+// NewHelmChartDBStore will create a new instance of the AnalysisDBStore
+func NewHelmChartDBStore(dcp *sql.DB) (ChartStore, error) {
+	return &HelmChartDBStore{db: dcp}, nil
+}
+
+// Save a Helm Chart to the database
+func (p *HelmChartDBStore) Save(chart ChartStoreRecord, batchID string) error {
+
+	// Delete the existing record
+	p.db.Exec(deleteChartVersion, chart.EndpointID, chart.Name, chart.Version)
+
+	sourceURL := ""
+	if len(chart.Sources) > 0 {
+		sourceURL = chart.Sources[0]
+	}
+
+	if _, err := p.db.Exec(saveChartVersion, chart.EndpointID, chart.Name, chart.Repository, chart.Version, chart.Created, chart.AppVersion, chart.Description, chart.IconURL, chart.ChartURL, sourceURL, chart.Digest, chart.IsLatest, batchID); err != nil {
+		return fmt.Errorf("Unable to save Helm Chart Version: %v", err)
+	}
+	return nil
+}
+
+// DeleteBatch will remove all chart versions not with the given batch id
+func (p *HelmChartDBStore) DeleteBatch(endpointID, chart, batchID string) error {
+	if _, err := p.db.Exec(deleteForBatch, endpointID, chart, batchID); err != nil {
+		return fmt.Errorf("Unable to delete Helm Chart Versions for batch ID: %s %v", batchID, err)
+	}
+	return nil
+}
+
+// DeleteForEndpoint will remove all Helm Charts for a given endpoint guid
+func (p *HelmChartDBStore) DeleteForEndpoint(endpointID string) error {
+	if _, err := p.db.Exec(deleteForEndpoint, endpointID); err != nil {
+		return fmt.Errorf("Unable to delete Helm Charts for endpoint: %s %v", endpointID, err)
+	}
+	return nil
+}
+
+// RenameEndpoint will update all charts for a given endpoint to have the new repository name
+func (p *HelmChartDBStore) RenameEndpoint(endpointID, name string) error {
+	if _, err := p.db.Exec(renameEndpoint, name, endpointID); err != nil {
+		return fmt.Errorf("Unable to rename Helm Chart repository for endpoint: %s %v", endpointID, err)
+	}
+	return nil
+}
+
+// GetLatestCharts will get only the info for the latest version of each chart
+func (p *HelmChartDBStore) GetLatestCharts() ([]*ChartStoreRecord, error) {
+
+	rows, err := p.db.Query(getLatestCharts)
+	if err != nil {
+		return nil, fmt.Errorf("Unable to retrieve Helm Charts: %v", err)
+	}
+	defer rows.Close()
+
+	var chartList []*ChartStoreRecord
+
+	for rows.Next() {
+		chart := new(ChartStoreRecord)
+		sourceURL := ""
+		err := rows.Scan(&chart.EndpointID, &chart.Name, &chart.Repository, &chart.Version, &chart.Created, &chart.AppVersion, &chart.Description, &chart.IconURL, &chart.ChartURL, &sourceURL, &chart.Digest, &chart.IsLatest)
+		if err != nil {
+			return nil, fmt.Errorf("Unable to scan Helm Chart records: %v", err)
+		}
+		chart.SemVer = NewSemanticVersion(chart.Version)
+		addSources(chart, sourceURL)
+		chartList = append(chartList, chart)
+	}
+
+	if err = rows.Err(); err != nil {
+		return nil, fmt.Errorf("Unable to list Helm Chart records: %v", err)
+	}
+
+	return chartList, nil
+}
+
+// GetChart gets a single helm chart
+func (p *HelmChartDBStore) GetChart(repo, name, version string) (*ChartStoreRecord, error) {
+
+	var row *sql.Row
+	chart := new(ChartStoreRecord)
+
+	if len(version) == 0 {
+		row = p.db.QueryRow(getLatestChart, repo, name)
+	} else {
+		row = p.db.QueryRow(getChartVersion, repo, name, version)
+	}
+
+	sourceURL := ""
+	err := row.Scan(&chart.EndpointID, &chart.Name, &chart.Repository, &chart.Version, &chart.Created, &chart.AppVersion, &chart.Description, &chart.IconURL, &chart.ChartURL, &sourceURL, &chart.Digest, &chart.IsLatest)
+	switch {
+	case err == sql.ErrNoRows:
+		return chart, errors.New("No match for that chart")
+	case err != nil:
+		return chart, fmt.Errorf("Error trying to find chart record: %v", err)
+	default:
+		// do nothing
+	}
+
+	chart.SemVer = NewSemanticVersion(chart.Version)
+	addSources(chart, sourceURL)
+
+	return chart, nil
+}
+
+// GetChartVersions will get all of the versions for a given chart
+func (p *HelmChartDBStore) GetChartVersions(repo, name string) ([]*ChartStoreRecord, error) {
+	rows, err := p.db.Query(getChartVersions, repo, name)
+	if err != nil {
+		return nil, fmt.Errorf("Unable to retrieve Helm Charts: %v", err)
+	}
+	defer rows.Close()
+
+	var chartList ChartStoreRecordList
+
+	for rows.Next() {
+		chart := new(ChartStoreRecord)
+		sourceURL := ""
+		err := rows.Scan(&chart.EndpointID, &chart.Name, &chart.Repository, &chart.Version, &chart.Created, &chart.AppVersion, &chart.Description, &chart.IconURL, &chart.ChartURL, &sourceURL, &chart.Digest, &chart.IsLatest)
+		if err != nil {
+			return nil, fmt.Errorf("Unable to scan Helm Chart records: %v", err)
+		}
+		chart.SemVer = NewSemanticVersion(chart.Version)
+		addSources(chart, sourceURL)
+		chartList = append(chartList, chart)
+	}
+
+	if err = rows.Err(); err != nil {
+		return nil, fmt.Errorf("Unable to list Helm Chart records: %v", err)
+	}
+
+	// Sort list by version
+	sort.Sort(chartList)
+	return chartList, nil
+}
+
+// GetEndpointIDs will get all unique endpoint IDs from the database
+func (p *HelmChartDBStore) GetEndpointIDs() ([]string, error) {
+	rows, err := p.db.Query(getEndpointIDs)
+	if err != nil {
+		return nil, fmt.Errorf("Unable to retrieve Endpoint IDs: %v", err)
+	}
+	defer rows.Close()
+
+	list := make([]string, 0)
+
+	for rows.Next() {
+		var endpoint string
+		err := rows.Scan(&endpoint)
+		if err != nil {
+			return nil, fmt.Errorf("Unable to scan Helm Chart records for endpoints: %v", err)
+		}
+		list = append(list, endpoint)
+	}
+
+	if err = rows.Err(); err != nil {
+		return nil, fmt.Errorf("Unable to list Helm Chart endpoints: %v", err)
+	}
+
+	return list, nil
+}
+
+func addSources(record *ChartStoreRecord, sourceURL string) {
+	record.Sources = make([]string, 0)
+	if len(sourceURL) > 0 {
+		record.Sources = append(record.Sources, sourceURL)
+	}
+}
diff --git a/src/jetstream/plugins/monocular/store/main.go b/src/jetstream/plugins/monocular/store/main.go
new file mode 100644
index 0000000000..68501e5f0f
--- /dev/null
+++ b/src/jetstream/plugins/monocular/store/main.go
@@ -0,0 +1,28 @@
+package store
+
+// ChartStore is the Helm Chart Store repository
+type ChartStore interface {
+	// This will add or update the given chart
+	Save(chart ChartStoreRecord, batchID string) error
+
+	// Delete chart versions for a given batch
+	DeleteBatch(endpoint, chart, batchID string) error
+
+	// Delete all charts for the given endpoint
+	DeleteForEndpoint(endpoint string) error
+
+	// RenameEndpoint renames an endpoint (==renames helm repository)
+	RenameEndpoint(endpointID, name string) error
+
+	// GetLatestCharts gets all of the latest charts
+	GetLatestCharts() ([]*ChartStoreRecord, error)
+
+	// Version is optional - empty means get latest
+	GetChart(repo, name, version string) (*ChartStoreRecord, error)
+
+	// Get Chart Versions
+	GetChartVersions(repo, name string) ([]*ChartStoreRecord, error)
+
+	// Get Endopoint IDs stored in the chart store
+	GetEndpointIDs() ([]string, error)
+}
diff --git a/src/jetstream/plugins/monocular/store/types.go b/src/jetstream/plugins/monocular/store/types.go
new file mode 100644
index 0000000000..65e5881d50
--- /dev/null
+++ b/src/jetstream/plugins/monocular/store/types.go
@@ -0,0 +1,38 @@
+package store
+
+import (
+	"time"
+)
+
+// ChartStoreRecord represents a Helm Chart Version record
+type ChartStoreRecord struct {
+	EndpointID  string          `json:"endpoint"`
+	Name        string          `json:"name"`
+	Repository  string          `json:"repo_name"`
+	Version     string          `json:"version"`
+	AppVersion  string          `json:"app_version"`
+	Description string          `json:"description"`
+	IconURL     string          `json:"icon_url"`
+	ChartURL    string          `json:"chart_url"`
+	Sources     []string        `json:"sources"`
+	Created     time.Time       `json:"created"`
+	Digest      string          `json:"digest"`
+	IsLatest    bool            `json:"is_latest"`
+	SemVer      SemanticVersion `json:"-"`
+}
+
+type ChartStoreRecordList []*ChartStoreRecord
+
+func (r ChartStoreRecordList) Len() int {
+	return len(r)
+}
+
+func (r ChartStoreRecordList) Swap(i, j int) {
+	r[i], r[j] = r[j], r[i]
+}
+func (r ChartStoreRecordList) Less(i, j int) bool {
+	ci := r[i].SemVer
+	cj := r[j].SemVer
+
+	return ci.LessThan(&cj)
+}
diff --git a/src/jetstream/plugins/monocular/store/version.go b/src/jetstream/plugins/monocular/store/version.go
new file mode 100644
index 0000000000..76a08f5f19
--- /dev/null
+++ b/src/jetstream/plugins/monocular/store/version.go
@@ -0,0 +1,60 @@
+package store
+
+import (
+	semver "github.com/Masterminds/semver/v3"
+)
+
+// SemanticVersion is a semver with support for a plain text version
+// Uses the semver library - which errors if the version can not be parsed
+// This wrapper ensures that if a version can not be parsed as a semver
+// it is treated as a string
+
+type SemanticVersion struct {
+	Version *semver.Version
+	Text    string
+	Valid   bool
+}
+
+// NewSemanticVersion parses and returns a Semantic Version
+func NewSemanticVersion(version string) SemanticVersion {
+
+	v := SemanticVersion{
+		Text: version,
+	}
+
+	sv, err := semver.NewVersion(version)
+	v.Version = sv
+	v.Valid = err == nil
+
+	return v
+}
+
+func (s *SemanticVersion) LessThan(d *SemanticVersion) bool {
+	if d == nil {
+		return true
+	}
+	if s.Valid && d.Valid {
+		return !s.Version.LessThan(d.Version)
+	} else if s.Valid && !d.Valid {
+		return true
+	} else if !s.Valid && d.Valid {
+		return false
+	}
+
+	return s.Text < d.Text
+}
+
+func (s *SemanticVersion) LessThanReleaseVersions(d *SemanticVersion) bool {
+	if d == nil {
+		return true
+	}
+	if s.Valid && d.Valid {
+		// Check release versions
+		if len(d.Version.Prerelease()) > 0 {
+			return true
+		}
+		return !s.Version.LessThan(d.Version)
+	}
+
+	return s.LessThan(d)
+}
diff --git a/src/jetstream/plugins/monocular/sync-source.sh b/src/jetstream/plugins/monocular/sync-source.sh
deleted file mode 100755
index c9f34721f6..0000000000
--- a/src/jetstream/plugins/monocular/sync-source.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-echo "== Sync Monocular backend code =="
-
-DIRPATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-echo ${DIRPATH}
-
-pushd ${DIRPATH} >& /dev/null
-rm -rf tmp
-mkdir tmp
-git clone https://github.com/helm/monocular.git ./tmp/monocular
-
-# Copy the golang backend code
-cp -R ./tmp/monocular/cmd/* .
-
-# Add to the chartsvc API
-cat ./chartsvc_main.txt >> ./chartsvc/main.go
-
-# Update packages
-sed -i.bak -e 's/package main/package chartsvc/g' ./chartsvc/*.go
-sed -i.bak -e 's/package main/package chartrepo/g' ./chart-repo/*.go
-
-# Remove .bak files
-find . -name "*.bak" -type f -delete
-
-# Remove tmp folder
-rm -rf ./tmp
-
-# Initialize go modules
-cd ./chartsvc
-go mod init github.com/helm/monocular/chartsvc
-
-cd ../chart-repo
-go mod init github.com/helm/monocular/chartrepo
-
-popd >& /dev/null
-
-echo "All done"
diff --git a/src/jetstream/plugins/monocular/sync.go b/src/jetstream/plugins/monocular/sync.go
index ab1e6c3460..ff1795fa9a 100644
--- a/src/jetstream/plugins/monocular/sync.go
+++ b/src/jetstream/plugins/monocular/sync.go
@@ -2,17 +2,10 @@ package monocular
 
 import (
 	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"strings"
-	"time"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
-	"github.com/helm/monocular/chartrepo/common"
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"
-	"k8s.io/apimachinery/pkg/util/wait"
 )
 
 type SyncJob struct {
@@ -25,14 +18,6 @@ type SyncMetadata struct {
 	Busy   bool   `json:"busy"`
 }
 
-const (
-	chartRepoPathPrefix          = "/v1"
-	statusPollInterval           = 30
-	statusPollTimeout            = 320
-	syncServiceTimeoutBoundary   = 10
-	syncServiceReadyPollInterval = 5
-)
-
 // Sync Channel
 var syncChan = make(chan SyncJob, 100)
 
@@ -41,9 +26,9 @@ func (m *Monocular) InitSync() {
 	go m.processSyncRequests()
 }
 
-// SyncRepos is endpoint to force a re-sync of a given Helm Repository
-func (m *Monocular) SyncRepo(c echo.Context) error {
-	log.Debug("SyncRepos")
+// syncRepo is endpoint to force a re-sync of a given Helm Repository
+func (m *Monocular) syncRepo(c echo.Context) error {
+	log.Debug("syncRepo")
 
 	// Lookup repository by GUID
 	var p = m.portalProxy
@@ -61,170 +46,71 @@ func (m *Monocular) SyncRepo(c echo.Context) error {
 
 // Sync schedules a sync action for the given endpoint
 func (m *Monocular) Sync(action interfaces.EndpointAction, endpoint *interfaces.CNSIRecord) {
+	// Delete and Update are Synchronously handled
+	// Add (Sync) is handled Asynchronously via a SyncJob
+	if action == 0 {
+		// If the sync job is busy, it won't update the status of this new job until it completes the previous one
+		// Set the status to indicate it is pending
+		metadata := SyncMetadata{
+			Status: "Pending",
+			Busy:   true,
+		}
+		m.portalProxy.UpdateEndpointMetadata(endpoint.GUID, marshalSyncMetadata(metadata))
 
-	// If the sync job is busy, it won't update the status of this new job until it completes the previou sone
-	// Set the status to indicate it is pending
-	metadata := SyncMetadata{
-		Status: "Pending",
-		Busy:   true,
-	}
-	m.portalProxy.UpdateEndpointMetadata(endpoint.GUID, marshalSyncMetadata(metadata))
+		// Add the job to the queue to be processed
+		job := SyncJob{
+			Action:   action,
+			Endpoint: endpoint,
+		}
 
-	// Add the job to the queue to be processed
-	job := SyncJob{
-		Action:   action,
-		Endpoint: endpoint,
+		// Schedula a sync job
+		syncChan <- job
+	} else if action == 1 {
+		log.Debugf("Deleting Helm Repository: %s", endpoint.Name)
+		m.deleteChartStoreForEndpoint(endpoint.GUID)
+	} else if action == 2 {
+		log.Debugf("Helm Repository has been updated - renaming the Helm repository field in the associated charts")
+		if err := m.ChartStore.RenameEndpoint(endpoint.GUID, endpoint.Name); err != nil {
+			log.Errorf("An error occurred renameing the Helm Repository for endpoint %s to %s - %+v", endpoint.GUID, endpoint.Name, err)
+		}
 	}
-
-	syncChan <- job
 }
 
-func waitForSyncService(syncServiceURL string) error {
-	// Ensure that the chart repo sync service is responsive
-	for {
-		// establish an outer timeout boundary
-		timeout := time.Now().Add(time.Minute * syncServiceTimeoutBoundary)
-
-		// Make a dummy status request to the chart repo - if it is up we should get a 404
-		statusURL := fmt.Sprintf("%s%s/status/%s", syncServiceURL, chartRepoPathPrefix, "none")
-		resp, err := http.Get(statusURL)
-		if resp != nil {
-			defer resp.Body.Close()
-		}
-		if err == nil {
-			log.Info("Sync service is reachable and ready.")
-			break
-		} else {
-			log.Debugf("Result of chart repo request: %v", err)
-			log.Info("Sync service not yet ready. Waiting for sync service to be available...")
-		}
-
-		// If our timeout boundary has been exceeded, bail out
-		if timeout.Sub(time.Now()) < 0 {
-			return fmt.Errorf("timeout boundary of %d minutes has been exceeded", syncServiceTimeoutBoundary)
-		}
+func (m *Monocular) deleteChartStoreForEndpoint(id string) {
+	// Delete the records from the database
+	if err := m.ChartStore.DeleteForEndpoint(id); err != nil {
+		log.Warnf("Unable to delete Helm Charts for endpoint %s - %+v", id, err)
+	}
 
-		// Circle back and try again
-		time.Sleep(time.Second * syncServiceReadyPollInterval)
+	// Delete files from the cache
+	if err := m.deleteCacheForEndpoint(id); err != nil {
+		log.Warnf("Unable to delete Helm Chart Cache for endpoint %s - %+v", err)
 	}
-	return nil
 }
 
 func (m *Monocular) processSyncRequests() {
 	log.Info("Helm Repository Sync init")
 	for job := range syncChan {
-		err := waitForSyncService(m.SyncServiceURL)
-		if err != nil {
-			log.Errorf("Unable to process sync request for %v. Chart Repo not available after %v minutes. %v", job.Endpoint.Name, syncServiceTimeoutBoundary, err)
-			continue
-		}
 		log.Debugf("Processing Helm Repository Sync Job: %s", job.Endpoint.Name)
-		var repoSyncRequestParams string = fmt.Sprintf("{\"repoURL\":%q}", job.Endpoint.APIEndpoint.String())
-		// Could be delete or sync
-		if job.Action == 0 {
-			log.Debug("Syncing new repository")
-			metadata := SyncMetadata{
-				Status: "Synchronizing",
-				Busy:   true,
-			}
-			m.portalProxy.UpdateEndpointMetadata(job.Endpoint.GUID, marshalSyncMetadata(metadata))
-			syncURL := fmt.Sprintf("%s%s/sync/%s", m.SyncServiceURL, chartRepoPathPrefix, job.Endpoint.Name)
-
-			//Hit the sync server container endpoint to trigger a sync for given repo
-			response, err := putRequest(syncURL, strings.NewReader(repoSyncRequestParams))
-			metadata.Busy = false
-			if err != nil {
-				log.Warn("Request to sync repository failed: %v", err)
-				metadata.Status = "Sync Failed"
-			} else {
-				statusResponse := common.SyncJobStatusResponse{}
-				defer response.Body.Close()
-				err := json.NewDecoder(response.Body).Decode(&statusResponse)
-				if err != nil {
-					log.Errorf("Unable to parse response from chart-repo server, sync request may not be processed: %v", err)
-					metadata.Status = "Sync Failed"
-				} else if statusResponse.Status != common.SyncStatusInProgress {
-					log.Errorf("Failed to synchronize repo: %v, response: %v, statusResponse", job.Endpoint.Name, err)
-					metadata.Status = "Sync Failed"
-				} else {
-					metadata.Status = "Synchronizing"
-					metadata.Busy = true
-					m.updateMetadata(job.Endpoint.GUID, metadata)
-					log.Infof("Sync in progress for repository: %s", job.Endpoint.APIEndpoint.String())
-					//Now wait for success
-					statusURL := fmt.Sprintf("%s%s/status/%s", m.SyncServiceURL, chartRepoPathPrefix, job.Endpoint.Name)
-					err := waitForSyncComplete(statusURL)
-					metadata.Busy = false
-					if err == nil {
-						// Need to get the actual status
-						status, err := getSyncStatus(statusURL)
-						if err == nil {
-							metadata.Status = status.Status
-						} else {
-							metadata.Status = "Sync Failed"
-						}
-					} else {
-						metadata.Status = "Sync Failed"
-						log.Errorf("Failed to fetch sync status for repo: %v, %v", job.Endpoint.Name, err)
-					}
-				}
-			}
-			m.updateMetadata(job.Endpoint.GUID, metadata)
-		} else if job.Action == 1 {
-			log.Infof("Deleting Helm Repository: %s", job.Endpoint.Name)
-			//Hit the sync server container endpoint to trigger a delete for given repo
-			deleteURL := fmt.Sprintf("%s%s/delete/%s", m.SyncServiceURL, chartRepoPathPrefix, job.Endpoint.Name)
-			response, err := putRequest(deleteURL, strings.NewReader(repoSyncRequestParams))
-			//Extract status from response
-			if err != nil {
-				log.Warn("Request to delete repository failed: %v+", err)
-			} else {
-				statusResponse := common.SyncJobStatusResponse{}
-				defer response.Body.Close()
-				err := json.NewDecoder(response.Body).Decode(&statusResponse)
-				if err != nil {
-					log.Errorf("Unable to parse response from chart-repo server, delete request may not be processed: %v", err)
-				} else if statusResponse.Status != common.DeleteStatusInProgress {
-					log.Errorf("Failed to delete repo: %v, response: %v, statusResponse", job.Endpoint.Name, err)
-				}
-			}
-		}
-	}
-
-	log.Debug("processSyncRequests finished")
-}
-
-func waitForSyncComplete(url string) error {
-	return wait.Poll(statusPollInterval*time.Second, time.Duration(statusPollTimeout)*time.Second, func() (bool, error) {
-		var complete = false
-		statusResponse, err := getSyncStatus(url)
-		if err == nil && statusResponse.Status == common.SyncStatusSynced || statusResponse.Status == common.SyncStatusFailed {
-			// Note: complete can mean synced okay or sync failed
-			complete = true
+		metadata := SyncMetadata{
+			Status: "Synchronizing",
+			Busy:   true,
 		}
-		return complete, err
-	})
-}
+		m.portalProxy.UpdateEndpointMetadata(job.Endpoint.GUID, marshalSyncMetadata(metadata))
 
-func getSyncStatus(url string) (*common.SyncJobStatusResponse, error) {
-	resp, err := http.Get(url)
-	if err == nil {
-		defer resp.Body.Close()
-		statusResponse := common.SyncJobStatusResponse{}
-		err = json.NewDecoder(resp.Body).Decode(&statusResponse)
-		if err == nil {
-			return &statusResponse, nil
+		chartIndexURL := job.Endpoint.APIEndpoint.String()
+		metadata.Status = "Synchronized"
+		metadata.Busy = false
+		err := m.syncHelmRepository(job.Endpoint.GUID, job.Endpoint.Name, chartIndexURL)
+		if err != nil {
+			log.Warn("Helm Repository sync repository failed for repository %s - %v", job.Endpoint.GUID, err)
+			metadata.Status = "Sync Failed"
 		}
-	}
-	return nil, err
-}
 
-func marshalSyncMetadata(metadata SyncMetadata) string {
-	jsonString, err := json.Marshal(metadata)
-	if err != nil {
-		return ""
+		// Update the job status
+		m.updateMetadata(job.Endpoint.GUID, metadata)
 	}
-	return string(jsonString)
+	log.Debug("processSyncRequests finished")
 }
 
 func (m *Monocular) updateMetadata(endpoint string, metadata SyncMetadata) {
@@ -234,24 +120,10 @@ func (m *Monocular) updateMetadata(endpoint string, metadata SyncMetadata) {
 	}
 }
 
-//https://gist.github.com/maniankara/a10d19960293b34b608ac7ef068a3d63
-func putRequest(url string, data io.Reader) (*http.Response, error) {
-	client := &http.Client{}
-	req, err := http.NewRequest(http.MethodPut, url, data)
-	var resp *http.Response
-	if err == nil {
-		resp, err = client.Do(req)
-	}
-	return resp, err
-}
-
-//https://gist.github.com/maniankara/a10d19960293b34b608ac7ef068a3d63
-func getRequest(url string, data io.Reader) (*http.Response, error) {
-	client := &http.Client{}
-	req, err := http.NewRequest(http.MethodPut, url, data)
-	var resp *http.Response
-	if err == nil {
-		resp, err = client.Do(req)
+func marshalSyncMetadata(metadata SyncMetadata) string {
+	jsonString, err := json.Marshal(metadata)
+	if err != nil {
+		return ""
 	}
-	return resp, err
+	return string(jsonString)
 }
diff --git a/src/jetstream/plugins/monocular/sync_worker.go b/src/jetstream/plugins/monocular/sync_worker.go
new file mode 100644
index 0000000000..e168d2c611
--- /dev/null
+++ b/src/jetstream/plugins/monocular/sync_worker.go
@@ -0,0 +1,139 @@
+package monocular
+
+import (
+	"fmt"
+	"strings"
+
+	yaml "gopkg.in/yaml.v2"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/monocular/store"
+	uuid "github.com/satori/go.uuid"
+	log "github.com/sirupsen/logrus"
+)
+
+type syncResult struct {
+	Charts []store.ChartStoreRecord
+	Latest store.ChartStoreRecord
+}
+
+func (m *Monocular) syncHelmRepository(endpointID, repoName, url string) error {
+
+	// Add index.yaml to the URL
+	var downloadURL string
+
+	// Append "index.yaml" to the Chart Repository URL
+	if strings.HasSuffix(url, "/") {
+		downloadURL = fmt.Sprintf("%sindex.yaml", url)
+	} else {
+		downloadURL = fmt.Sprintf("%s/index.yaml", url)
+	}
+
+	// Read the index.html file from the repository
+	httpClient := m.portalProxy.GetHttpClient(false)
+	resp, err := httpClient.Get(downloadURL)
+	if err != nil {
+		return fmt.Errorf("Could not download Helm Repository Index: %s", err)
+	}
+	if resp.StatusCode != 200 {
+		return fmt.Errorf("Could not download Helm Repository Index: %s", resp.Status)
+	}
+
+	defer resp.Body.Close()
+
+	// Marshal to the index structure
+	var index IndexFile
+
+	decoder := yaml.NewDecoder(resp.Body)
+	err = decoder.Decode(&index)
+	if err != nil {
+		return fmt.Errorf("Error marshalling Helm Repository Index: %+v", err)
+	}
+
+	var latestCharts []store.ChartStoreRecord
+	var allCharts []store.ChartStoreRecord
+
+	// Iterate over each chart in the index
+	for name, chartVersions := range index.Entries {
+		log.Debugf("Helm Repository Sync: Processing chart: %s", name)
+		syncRsult := m.procesChartVersions(endpointID, repoName, name, chartVersions)
+		latestCharts = append(latestCharts, syncRsult.Latest)
+		allCharts = append(allCharts, syncRsult.Charts...)
+	}
+
+	// Cache latest charts
+	if err = m.cacheCharts(latestCharts); err != nil {
+		log.Warnf("Error caching helm charts: %+v", err)
+	}
+
+	// Finally, delete all files that are no longer referenced in the database
+	if err = m.cleanCacheFiles(endpointID, allCharts); err != nil {
+		log.Errorf("%s", err)
+	}
+
+	log.Infof("Sync completed for %s", repoName)
+
+	return nil
+}
+
+func (m *Monocular) procesChartVersions(endpoint, repoName, name string, chartVersions []IndexFileMetadata) syncResult {
+
+	result := syncResult{}
+
+	// Find the newest version
+	var latestSemVer *store.SemanticVersion
+	for _, chartVersion := range chartVersions {
+		sv := store.NewSemanticVersion(chartVersion.Version)
+		if sv.LessThanReleaseVersions(latestSemVer) {
+			latestSemVer = &sv
+		}
+	}
+
+	latestVersion := latestSemVer.Text
+
+	// Generate a new batch update id - we use this to remove any charts that we not updated in this sync - these
+	// will have an old batch update id afetr processing
+	batchID := uuid.NewV4().String()
+
+	// Write all versions database
+	for _, chartVersion := range chartVersions {
+		if len(chartVersion.URLs) == 0 {
+			log.Warnf("Can not index Chart %s, Version %s - Chart does not have any Chart URLs", chartVersion.Name, chartVersion.Version)
+		} else {
+			if len(chartVersion.URLs) > 1 {
+				log.Warnf("Chart %s, Version %s - Chart has more than 1 Chart URL - only using the first URL", chartVersion.Name, chartVersion.Version)
+			}
+
+			// Create a record for the Chart Version that we will store in the database
+			record := store.ChartStoreRecord{
+				EndpointID:  endpoint,
+				Name:        chartVersion.Name,
+				Repository:  repoName,
+				Version:     chartVersion.Version,
+				AppVersion:  chartVersion.AppVersion,
+				Description: chartVersion.Description,
+				IconURL:     chartVersion.Icon,
+				ChartURL:    chartVersion.URLs[0],
+				Sources:     chartVersion.Sources,
+				Created:     chartVersion.Created,
+				Digest:      chartVersion.Digest,
+				IsLatest:    chartVersion.Version == latestVersion,
+			}
+
+			result.Charts = append(result.Charts, record)
+			if record.IsLatest {
+				result.Latest = record
+			}
+
+			if err := m.ChartStore.Save(record, batchID); err != nil {
+				log.Warnf("Error saving Chart %s, Version %s to the database: %+v", record.Name, record.Version, err)
+			}
+		}
+	}
+
+	// Delete versions not updated in this batch
+	if err := m.ChartStore.DeleteBatch(endpoint, name, batchID); err != nil {
+		log.Warnf("Error deleting old Chart batches: Name %s, Batch ID %s, error: %+v", name, batchID, err)
+	}
+
+	return result
+}
diff --git a/src/jetstream/plugins/monocular/types.go b/src/jetstream/plugins/monocular/types.go
new file mode 100644
index 0000000000..0c828daa13
--- /dev/null
+++ b/src/jetstream/plugins/monocular/types.go
@@ -0,0 +1,70 @@
+package monocular
+
+import "time"
+
+// IndexFile represents the index.yaml structure for a Helm Repository
+type IndexFile struct {
+	APIVersion string                         `json:"apiVersion,omitempty"`
+	Entries    map[string][]IndexFileMetadata `json:"entries,omitempty"`
+}
+
+// IndexFileMetadata represents the metadata for a single chart version
+type IndexFileMetadata struct {
+	Name        string    `json:"name,omitempty"`
+	AppVersion  string    `json:"appVersion" yaml:"appVersion"`
+	Description string    `json:"description,omitempty"`
+	Digest      string    `json:"digest,omitempty"`
+	Version     string    `json:"version,omitempty"`
+	Created     time.Time `json:"created"`
+	Icon        string    `json:"icon,omitempty"`
+	URLs        []string  `json:"-" yaml:"urls"`
+	Sources     []string  `json:"-" yaml:"sources"`
+	APIVersion  string    `json:"-" yaml:"apiVersion"`
+}
+
+// ChartMaintainer describes a Chart maintainer.
+type ChartMaintainer struct {
+	// Name is a user name or organization name
+	Name string `json:"name,omitempty"`
+	// Email is an optional email address to contact the named maintainer
+	Email string `json:"email,omitempty"`
+	// URL is an optional URL to an address for the named maintainer
+	URL string `json:"url,omitempty"`
+}
+
+// ChartMetadata for a Chart file. This models the structure of a Chart.yaml file.
+type ChartMetadata struct {
+	// The name of the chart
+	Name string `json:"name,omitempty"`
+	// The URL to a relevant project page, git repo, or contact person
+	Home string `json:"home,omitempty"`
+	// Source is the URL to the source code of this chart
+	Sources []string `json:"sources,omitempty"`
+	// A SemVer 2 conformant version string of the chart
+	Version string `json:"version,omitempty"`
+	// A one-sentence description of the chart
+	Description string `json:"description,omitempty"`
+	// A list of string keywords
+	Keywords []string `json:"keywords,omitempty"`
+	// A list of name and URL/email address combinations for the maintainer(s)
+	Maintainers []*ChartMaintainer `json:"maintainers,omitempty"`
+	// The URL to an icon file.
+	Icon string `json:"icon,omitempty"`
+	// The API Version of this chart.
+	APIVersion string `json:"apiVersion,omitempty"`
+	// The condition to check to enable chart
+	Condition string `json:"condition,omitempty"`
+	// The tags to check to enable chart
+	Tags string `json:"tags,omitempty"`
+	// The version of the application enclosed inside of this chart.
+	AppVersion string `json:"appVersion,omitempty"`
+	// Whether or not this chart is deprecated
+	Deprecated bool `json:"deprecated,omitempty"`
+	// Annotations are additional mappings uninterpreted by Helm,
+	// made available for inspection by other applications.
+	Annotations map[string]string `json:"annotations,omitempty"`
+	// KubeVersion is a SemVer constraint specifying the version of Kubernetes required.
+	KubeVersion string `json:"kubeVersion,omitempty"`
+	// Specifies the chart type: application or library
+	Type string `json:"type,omitempty"`
+}
diff --git a/src/jetstream/plugins/monocular/utils/urlpoll.go b/src/jetstream/plugins/monocular/utils/urlpoll.go
deleted file mode 100644
index 3e71baddc0..0000000000
--- a/src/jetstream/plugins/monocular/utils/urlpoll.go
+++ /dev/null
@@ -1,144 +0,0 @@
-// https://golang.org/doc%2Fcodewalk%2Furlpoll.go
-
-package utils
-
-import (
-	"ioutil"
-	"log"
-	"net/http"
-	"time"
-)
-
-const (
-	numPollers     = 2                // number of Poller goroutines to launch
-	pollInterval   = 20 * time.Second // how often to poll each URL
-	statusInterval = 10 * time.Second // how often to log status to stdout
-	errTimeout     = 10 * time.Second // back-off timeout on error
-)
-
-var urls = []string{
-	"http://www.google.com/",
-	"http://golang.org/",
-	"http://blog.golang.org/",
-}
-
-// State represents the last-known state of a URL.
-type State struct {
-	url    string
-	status string
-	body   string
-	error  string
-}
-
-// StateMonitor maintains a map that stores the state of the URLs being
-// polled, and prints the current state every updateInterval nanoseconds.
-// It returns a chan State to which resource state should be sent.
-func StateMonitor(updateInterval time.Duration) chan<- State {
-	updates := make(chan State)
-	urlStatus := make(map[string]string)
-	ticker := time.NewTicker(updateInterval)
-	go func() {
-		for {
-			select {
-			case <-ticker.C:
-				logState(urlStatus)
-			case s := <-updates:
-				urlStatus[s.url] = s.status
-			}
-		}
-	}()
-	return updates
-}
-
-// logState prints a state map.
-func logState(s map[string]string) {
-	log.Println("Current state:")
-	for k, v := range s {
-		log.Printf(" %s %s", k, v)
-	}
-}
-
-// Resource represents an HTTP URL to be polled by this program.
-type Resource struct {
-	url      string
-	errCount int
-}
-
-// Poll executes an HTTP HEAD request for url
-// and returns the HTTP status string or an error string.
-func (r *Resource) PollHead() string {
-	resp, err := http.Head(r.url)
-	if err != nil {
-		log.Println("Error", r.url, err)
-		r.errCount++
-		return err.Error()
-	}
-	r.errCount = 0
-	return resp.Status
-}
-
-// Poll executes an HTTP GET request for url
-// and returns the HTTP status string, body as a string.
-func (r *Resource) PollGet() (string, string, error) {
-
-	var body = ""
-	resp, err := http.Get(r.url)
-	defer resp.Body.Close()
-	if err != nil {
-		r.errCount++
-		return body, resp.Status, err
-	}
-
-	bodyBytes, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		r.errCount++
-		return body, resp.Status, err
-	}
-
-	r.errCount = 0
-	body = string(bodyBytes)
-	return body, resp.Status, nil
-}
-
-// Sleep sleeps for an appropriate interval (dependent on error state)
-// before sending the Resource to done.
-func (r *Resource) Sleep(done chan<- *Resource) {
-	time.Sleep(pollInterval + errTimeout*time.Duration(r.errCount))
-	done <- r
-}
-
-func BodyPoller(in <-chan *Resource, out chan<- *Resource, status chan<- State) {
-	for r := range in {
-		b, s, e := r.PollGet()
-		errorString = ""
-		if e != nil {
-			errorString = e.Error()
-		}
-		status <- State{r.url, s, b, errorString}
-		out <- r
-	}
-}
-
-func main() {
-	// Create our input and output channels.
-	pending, complete := make(chan *Resource), make(chan *Resource)
-
-	// Launch the StateMonitor.
-	status := StateMonitor(statusInterval)
-
-	// Launch some Poller goroutines.
-	for i := 0; i < numPollers; i++ {
-		go Poller(pending, complete, status)
-	}
-
-	// Send some Resources to the pending queue.
-	go func() {
-		for _, url := range urls {
-			pending <- &Resource{url: url}
-		}
-	}()
-
-	for r := range complete {
-		go r.Sleep(pending)
-	}
-}
diff --git a/src/jetstream/repository/interfaces/endpoints.go b/src/jetstream/repository/interfaces/endpoints.go
index 376a286e77..f843ad254c 100644
--- a/src/jetstream/repository/interfaces/endpoints.go
+++ b/src/jetstream/repository/interfaces/endpoints.go
@@ -18,9 +18,14 @@ type RoutePlugin interface {
 	AddAdminGroupRoutes(echoContext *echo.Group)
 }
 
+// EndpointAction identifies the type of action for an endpoint notification
 type EndpointAction int
 
 const (
+	// EndpointRegisterAction is for when an endpoint is registered
 	EndpointRegisterAction EndpointAction = iota
+	// EndpointUnregisterAction is for when an endpoint is unregistered
 	EndpointUnregisterAction
+	// EndpointUpdateAction is for when an endpoint is updated (e.g. renamed)
+	EndpointUpdateAction
 )

From 491190de8613e3c29dc4869e64d6592dca781b76 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Tue, 15 Sep 2020 13:57:30 +0100
Subject: [PATCH 617/648] Helm: Improve experience for editing chart values
 (#469)

* Indicate if the Helm chart has a schema

* Fixes

* Fix unit tests

* Update go.sum

* Replace foundation DB with sql db and file cache

* Tidy ups and final tweaks to get versions working

* Tidy up build and remove fdb

* Update .gitignore

* Remove unused functions

* FIx upgrade and add in sources

* Improve the edit experience for entering Helm chart values

* Fix unit test

* Remove fdb helm chart values

* Fix default cache folder name

* Remove unused commented code

* Fix comments

* Formatting

* Tidy ups

* Fix stylesheet issue with var

* Update comments

* Add missing import following refactor

* Fixes for diff and for form <-> editor transitions

* Fix issues with async delete and edit

* Tidy up chartName

* Fix HelmChartID rename to HelmChartReference

* Fixes

* FIx backend merge issues

* Fixes

* Get upgrade working

* Fix unit tests due to moving of create release component

* Additional unit test fixes

* One more test fix

* Fix for tests

* Import MD App Module for unit test fix

* Remove commented out code block

* Use drop down menu for the values actions

* Improve comments and remove console.log

* Set volume for helm cache when deployed to k8s

* Fix fro kuberenetes deployment

* Ensure db statements aer modified for different DBs

* Address PR feedback

* Fix missing param to error log msg

* Add support for retrieving icon for a specific version

* Use icon for the chart version. Reduce loading indicators

* Bug fix for icon on list view

* Fix icons on Helm Hub

* Merge fixes

* Fix merge issue

* Fix merge issue

* Fix unit tests

* Address PR feedback
---
 angular.json                                  |  12 +-
 package.json                                  |   8 +-
 .../suse-extensions/sass/_all-theme.scss      |   3 +-
 .../create-release.component.scss             |  50 --
 .../create-release/create-release.module.ts   |  19 -
 .../src/custom/helm/helm.module.ts            |   2 -
 .../src/custom/helm/helm.routing.ts           |   3 -
 .../chart-details-usage.component.ts          |   2 +-
 .../chart-values-editor.component.html        |  63 +++
 .../chart-values-editor.component.scss        | 104 +++++
 .../chart-values-editor.component.spec.ts     |  41 ++
 .../chart-values-editor.component.theme.scss  |  65 +++
 .../chart-values-editor.component.ts          | 427 ++++++++++++++++++
 .../chart-values-editor/diffvalues.ts         |  50 ++
 .../json-schema-generator.ts                  | 288 ++++++++++++
 .../create-release.component.html             |  13 +-
 .../create-release.component.scss             |  18 +
 .../create-release.component.spec.ts          |  20 +-
 .../create-release.component.ts               |  93 ++--
 .../helm-release-summary-tab.component.ts     |   1 +
 .../upgrade-release.component.html            |  25 +-
 .../upgrade-release.component.ts              |  50 +-
 .../kubernetes/workloads/workloads.module.ts  |  14 +
 .../kubernetes/workloads/workloads.routing.ts |   3 +
 24 files changed, 1172 insertions(+), 202 deletions(-)
 delete mode 100644 src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.scss
 delete mode 100644 src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.module.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.html
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.scss
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.spec.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.theme.scss
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/diffvalues.ts
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/json-schema-generator.ts
 rename src/frontend/packages/suse-extensions/src/custom/{helm => kubernetes/workloads}/create-release/create-release.component.html (70%)
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.scss
 rename src/frontend/packages/suse-extensions/src/custom/{helm => kubernetes/workloads}/create-release/create-release.component.spec.ts (61%)
 rename src/frontend/packages/suse-extensions/src/custom/{helm => kubernetes/workloads}/create-release/create-release.component.ts (73%)

diff --git a/angular.json b/angular.json
index 001160c86a..79b33bcd31 100644
--- a/angular.json
+++ b/angular.json
@@ -28,7 +28,17 @@
                 "input": "custom-src/frontend/assets/custom",
                 "output": "/core/assets/custom"
               },
-              "src/frontend/packages/core/favicon.ico"
+              "src/frontend/packages/core/favicon.ico",
+              {
+                "glob": "**/*",
+                "input": "node_modules/ngx-monaco-editor/assets/monaco",
+                "output": "/core/assets/monaco"
+              },
+              {
+                "glob": "**/*",
+                "input": "node_modules/@cfstratos/monaco-yaml/lib",
+                "output": "/core/assets/monaco/vs/language/yaml"
+              }
             ],
             "styles": [
               "src/frontend/packages/core/src/styles.scss",
diff --git a/package.json b/package.json
index 15e022fa11..0806aac4f6 100644
--- a/package.json
+++ b/package.json
@@ -61,31 +61,33 @@
     "@angular/platform-browser-dynamic": "^9.1.6",
     "@angular/platform-server": "^9.1.6",
     "@angular/router": "^9.1.6",
+    "@cfstratos/ajsf-material": "^0.1.6",
+    "@cfstratos/monaco-yaml": "^2.5.0",
     "@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",
     "@swimlane/ngx-graph": "^7.0.1",
-    "@types/moment-timezone": "^0.5.13",
     "@types/marked": "^0.7.4",
+    "@types/moment-timezone": "^0.5.13",
     "angular2-virtual-scroll": "^0.4.16",
     "core-js": "^3.6.5",
     "immer": "^6.0.3",
+    "intersect": "^1.0.1",
     "lodash-es": "^4.17.14",
     "mappy-breakpoints": "^0.2.3",
     "marked": "^0.8.2",
-    "intersect": "^1.0.1",
     "moment": "^2.24.0",
     "moment-timezone": "^0.5.28",
     "ngrx-store-localstorage": "9.0.0",
     "ngx-moment": "^3.5.0",
+    "ngx-monaco-editor": "^9.0.0",
     "normalizr": "^3.6.0",
     "reselect": "^4.0.0",
     "rxjs": "^6.5.5",
     "rxjs-spy": "^7.0.2",
     "rxjs-websockets": "~8.0.1",
-    "@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/suse-extensions/sass/_all-theme.scss b/src/frontend/packages/suse-extensions/sass/_all-theme.scss
index 116316ed35..3d775747a6 100644
--- a/src/frontend/packages/suse-extensions/sass/_all-theme.scss
+++ b/src/frontend/packages/suse-extensions/sass/_all-theme.scss
@@ -6,6 +6,7 @@
 @import '../src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.theme';
 @import '../src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.theme';
 @import '../src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.theme';
+@import '../src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.theme';
 
 @mixin apply-theme-suse-extensions($stratos-theme) {
 
@@ -18,5 +19,5 @@
   @include monocular-chart-card($theme, $app-theme);
   @include helm-release-summary-tab-theme($theme, $app-theme);
   @include kube-node-link-theme($theme, $app-theme);
-
+  @include app-chart-values-editor-theme($theme, $app-theme);
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.scss
deleted file mode 100644
index a2974cf6f0..0000000000
--- a/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.scss
+++ /dev/null
@@ -1,50 +0,0 @@
-:host {
-  flex: 1;
-}
-
-.helm-create-release {
-  &__heading {
-    align-items: center;
-    display: flex;
-  }
-
-  &__title {
-    flex: 1;
-    font-size: 14px;
-  }
-  &__button {
-    height: 36px;
-  }
-}
-
-form {
-  flex: 1;
-
-  mat-checkbox {
-    display: flex;
-    height: 23px;
-    margin-top: 10px;
-  }
-}
-
-.overrides {
-  &__yaml {
-    background-color: rgba(0, 0, 0, .1);
-    font-family: 'Source Code Pro', monospace;
-    height: 400px;
-  }
-
-  &_form {
-    max-width: 100%;
-  }
-
-  &_form-field {
-    flex: 1;
-    height: 100%;
-    width: 100%;
-  }
-}
-
-form.overrides_form {
-  max-width: 100%;
-}
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.module.ts b/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.module.ts
deleted file mode 100644
index 924e790d1e..0000000000
--- a/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.module.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-
-import { CoreModule } from '../../../../../core/src/core/core.module';
-import { SharedModule } from '../../../../../core/src/shared/shared.module';
-import { CreateReleaseComponent } from './create-release.component';
-
-
-@NgModule({
-  imports: [
-    CommonModule,
-    CoreModule,
-    SharedModule
-  ],
-  declarations: [
-    CreateReleaseComponent,
-  ]
-})
-export class CreateReleaseModule { }
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm.module.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm.module.ts
index 0bba8cacac..02f818996c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/helm.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/helm.module.ts
@@ -4,7 +4,6 @@ import { NgModule } from '@angular/core';
 import { CoreModule } from '../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
 import { MonocularChartViewComponent } from './chart-view/monocular.component';
-import { CreateReleaseModule } from './create-release/create-release.module';
 import { HelmRoutingModule } from './helm.routing';
 import { MonocularChartCardComponent } from './list-types/monocular-chart-card/monocular-chart-card.component';
 import { MonocularTabBaseComponent } from './monocular-tab-base/monocular-tab-base.component';
@@ -17,7 +16,6 @@ import { CatalogTabComponent } from './tabs/catalog-tab/catalog-tab.component';
     CommonModule,
     SharedModule,
     HelmRoutingModule,
-    CreateReleaseModule,
     MonocularModule
   ],
   declarations: [
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm.routing.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm.routing.ts
index e42207d593..b523106013 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/helm.routing.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/helm.routing.ts
@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
 import { MonocularChartViewComponent } from './chart-view/monocular.component';
-import { CreateReleaseComponent } from './create-release/create-release.component';
 import { MonocularTabBaseComponent } from './monocular-tab-base/monocular-tab-base.component';
 import { CatalogTabComponent } from './tabs/catalog-tab/catalog-tab.component';
 
@@ -18,8 +17,6 @@ const monocular: Routes = [
   },
   { pathMatch: 'full', path: 'charts/:endpoint/:repo/:chartName/:version', component: MonocularChartViewComponent },
   { path: 'charts/:endpoint/:repo/:chartName', component: MonocularChartViewComponent },
-  { pathMatch: 'full', path: 'install/:endpoint/:repo/:name/:version', component: CreateReleaseComponent },
-  { path: 'install/:endpoint/:repo/:name', component: CreateReleaseComponent },
 ];
 
 @NgModule({
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts
index 73025fe6ac..0f213b27e8 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts
@@ -39,7 +39,7 @@ export class ChartDetailsUsageComponent implements OnInit {
   }
 
   get installUrl(): string {
-    return `/monocular/install/${getMonocularEndpoint(this.route, this.chart)}/${this.chart.id}/${this.currentVersion}`;
+    return `/workloads/install/${getMonocularEndpoint(this.route, this.chart)}/${this.chart.id}/${this.currentVersion}`;
   }
 
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.html
new file mode 100644
index 0000000000..2baa79aaf0
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.html
@@ -0,0 +1,63 @@
+<mat-card class="editor-card">
+  <div *ngIf="loading$ | async" class="editor-loading">
+    <div>
+      <div class="editor-loading__msg">Loading ...</div>
+      <mat-progress-bar class="editor-loading__progress-bar" [color]="'primary'" mode="indeterminate"></mat-progress-bar>      
+    </div>
+  </div>
+  <mat-toolbar class="editor-toolbar">
+    <mat-button-toggle-group [value]="mode" name="editMode" aria-label="Edit Mode" (change)="editModeChanged($event)"  *ngIf="schema; else editorOnly">
+      <mat-button-toggle value="form">Form</mat-button-toggle>
+      <mat-button-toggle value="editor">YAML</mat-button-toggle>
+    </mat-button-toggle-group>
+
+    <ng-template #editorOnly>
+      <div class="editor-title">YAML Editor</div>
+    </ng-template>
+
+    <div class="editor-spacer"></div>
+
+    <div class="editor-toolbar-buttons">
+      <mat-menu #appMenu="matMenu">
+        <button mat-menu-item (click)="copyValues()">Copy from chart values</button>
+        <button *ngIf="releaseValues" mat-menu-item (click)="copyReleaseValues()">Copy from release values</button>
+        <mat-divider *ngIf="mode === 'editor'" class="editor-menu-divider"></mat-divider>
+        <button *ngIf="mode === 'editor'" mat-menu-item (click)="diff()">Diff with chart values</button>
+        <mat-divider class="editor-menu-divider"></mat-divider>
+        <button mat-menu-item (click)="clearFormValues()">Clear</button>
+      </mat-menu>
+      <button mat-button [matMenuTriggerFor]="appMenu">
+        <span>Values</span>
+        <mat-icon>arrow_drop_down</mat-icon>
+      </button> 
+    </div>
+
+    <div class="editor-toolbar-buttons">
+      <mat-button-toggle (click)="toggleLineNumbers()" checked="lineNumbers" *ngIf="mode === 'editor'">
+        <mat-icon>format_list_numbered</mat-icon>
+      </mat-button-toggle>
+      <mat-button-toggle (click)="toggleMinimap()" checked="minimap" *ngIf="mode === 'editor'">
+        <mat-icon>map</mat-icon>
+      </mat-button-toggle>
+    </div>
+      
+  </mat-toolbar>
+  <div [ngClass]="{'editor-hidden': mode !== 'form'}" class="editor-form">
+    <div class="editor-yaml-error" *ngIf="yamlError">
+      <div class="editor-yaml-error__msg">
+        <div>
+          <mat-icon class="editor-yaml-error__icon text-warning">warning</mat-icon>
+        </div>
+        <div class="editor-yaml-error__text">
+          <div>Error - YAML is not valid</div>
+          <div>Use the YAML editor to correct it so the values can be loaded into the form</div>
+          </div>
+      </div>
+    </div>
+    <json-schema-form *ngIf="hasSchema" (onChanges)="formChanged($event)" #schemaForm loadExternalAssets="false" [options]="{ addSubmit: false }" [schema]="schema" framework="material-design" [data]="initialFormData"></json-schema-form>
+  </div>
+  <div [ngClass]="{'editor-hidden': mode !== 'editor'}" class="editor-monaco" #monacoContainer>
+    <ngx-monaco-editor #monacoEditor class="editor-monaco-edit "[options]="editorOptions" [model]="model" [(ngModel)]="code" (onInit)="onMonacoInit($event)"></ngx-monaco-editor>
+  </div>
+
+</mat-card>
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.scss
new file mode 100644
index 0000000000..8e28d24ff1
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.scss
@@ -0,0 +1,104 @@
+:host {
+  display: flex;
+  width: 100%;
+}
+.editor {
+
+  $toolbar-height: 40px;
+
+  &-card {
+    flex: 1;
+    padding: 0;
+  }
+
+  &-title {
+    font-size: 14px;
+  }
+
+  &-form {
+    display: block;
+    height: calc(100% - #{$toolbar-height});
+    overflow-y: scroll;
+    padding: 20px;    
+    width: 100%;
+
+    &.editor-hidden {
+      display: none;
+    }
+  }
+
+  &-loading {
+    align-items: center;
+    display: flex;
+    height: 100%;
+    justify-content: center; 
+    position: absolute;
+    width: 100%;
+    z-index: 100;
+    
+    &__msg {
+      text-align: center;
+    }
+    &__progress-bar {
+      margin-top: 10px;
+      min-width: 120px;
+    }
+  }
+
+  &-yaml-error {
+    align-items: center;
+    display: flex;
+    height: calc(100% - #{$toolbar-height});
+    justify-content: center;
+    margin: -20px;
+    opacity: 0.7;
+    position: absolute;
+    width: 100%;
+    z-index: 100;
+
+    &__msg {
+      display: flex;
+      flex-direction: row;
+    }
+    &__text {
+      line-height: 24px;
+    }
+    &__icon {
+      font-size: 32px;
+      height: 32px;
+      margin-right: 12px;
+      width: 32px;
+     }
+  }
+
+  &-toolbar-buttons {
+    display: flex;
+    mat-button-toggle {
+      margin-left: 8px;
+    }
+  }
+
+  &-spacer {
+    flex: 1 1 auto;
+  }
+
+  &-monaco {
+    display: block;
+
+    &.editor-hidden {
+      display: none;
+    }
+  }
+
+  &-monaco-edit {
+    position: absolute;
+  }
+
+  &-menu-divider {
+    margin: 4px 0;
+  }  
+}
+
+.mat-card.editor-card>:first-child {
+  margin: 0;
+}
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.spec.ts
new file mode 100644
index 0000000000..8dc9906951
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.spec.ts
@@ -0,0 +1,41 @@
+import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { createBasicStoreModule } from '@stratosui/store/testing';
+
+import { ConfirmationDialogService } from '../../../../../../core/src/shared/components/confirmation-dialog.service';
+import { MDAppModule } from './../../../../../../core/src/core/md.module';
+import { ChartValuesEditorComponent } from './chart-values-editor.component';
+
+describe('ChartValuesEditorComponent', () => {
+  let component: ChartValuesEditorComponent;
+  let fixture: ComponentFixture<ChartValuesEditorComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ChartValuesEditorComponent ],
+      providers: [
+        HttpClient,
+        HttpHandler,
+        ConfirmationDialogService,
+      ],
+      imports: [
+        MDAppModule,
+        HttpClientModule,
+        HttpClientTestingModule,
+        createBasicStoreModule(),
+      ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ChartValuesEditorComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.theme.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.theme.scss
new file mode 100644
index 0000000000..fa694c22cd
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.theme.scss
@@ -0,0 +1,65 @@
+@mixin app-chart-values-editor-theme($theme, $app-theme) {
+
+  $background: map-get($theme, background);
+  $foreground: map-get($theme, foreground);
+
+  $app-background: map-get($app-theme, app-background-color);
+
+  // Fixes some layout issues with Angular Json Schema Form due to use of Angular flex-layout
+
+  // Also tweaks sizing and spacing of elements
+
+  $vert-padding: 10px;
+  $toolbar-icon-size: 16px;
+  $toolbar-item-height: 24px;
+  $toolbar-item-font-size: 12px;
+
+  // We discourage use of !important, but this is only way to override
+  // the angular flex settings in the ajsf library - otherwise the layout is wrong
+  .form-flex-column {
+    flex-flow: column !important;
+  }
+
+  .legend {
+    font-size: 14px;
+    padding: $vert-padding 0;
+  }
+
+  .editor-loading, .editor-yaml-error {
+    background-color: $app-background;
+  }
+          
+  // Make controls in the editor toolbar smaller
+  .editor-toolbar {
+    height: 40px;
+
+    .mat-button-toggle-button {
+      display: flex;
+    }
+    .mat-button-toggle-label-content {
+      font-size: $toolbar-item-font-size;
+      line-height: $toolbar-item-height;
+      padding: 0 8px;
+
+      .mat-icon {
+        font-size: $toolbar-icon-size;
+        height: $toolbar-icon-size;
+        width: $toolbar-icon-size;
+      }
+    }
+    .mat-button {
+      font-size: $toolbar-item-font-size;
+      line-height: $toolbar-item-height;
+      padding: 0 12px;
+    }
+
+  }
+
+  // Override hover color for context menu to align with Stratos theme
+  // Monaco doesn't seem to expose this as a theme colour
+  .monaco-editor .monaco-menu .action-item.focused a.action-menu-item {
+    background: mat-color($background, 'hover') !important;
+    color: mat-color($foreground, 'text') !important;
+  }
+
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts
new file mode 100644
index 0000000000..9b5f28c925
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts
@@ -0,0 +1,427 @@
+import { HttpClient } from '@angular/common/http';
+import { AfterViewInit, Component, ElementRef, Input, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core';
+import { JsonSchemaFormComponent } from '@cfstratos/ajsf-core';
+import * as yaml from 'js-yaml';
+import { BehaviorSubject, combineLatest, fromEvent, Observable, of, Subscription } from 'rxjs';
+import { catchError, debounceTime, filter, map, startWith, tap } from 'rxjs/operators';
+
+import { ConfirmationDialogConfig } from '../../../../../../core/src/shared/components/confirmation-dialog.config';
+import { ConfirmationDialogService } from '../../../../../../core/src/shared/components/confirmation-dialog.service';
+import { ThemeService } from './../../../../../../store/src/theme.service';
+import { diffObjects } from './diffvalues';
+import { generateJsonSchemaFromObject } from './json-schema-generator';
+
+
+export interface ChartValuesConfig {
+
+  // URL of the JSON Schema for the chart values
+  schemaUrl: string;
+
+  // URL of the Chart Values
+  valuesUrl: string;
+
+  // Values for the current release (optional)
+  releaseValues? : string
+}
+
+// Height of the toolbar that sits above the editor conmponent
+const TOOLBAR_HEIGHT = 40;
+
+// Editor modes - can be either using the form or the code editor
+enum EditorMode {
+  CodeEditor = 'editor',
+  JSonSchemaForm = 'form',
+}
+
+@Component({
+  selector: 'app-chart-values-editor',
+  templateUrl: './chart-values-editor.component.html',
+  styleUrls: ['./chart-values-editor.component.scss']
+})
+export class ChartValuesEditorComponent implements OnInit, OnDestroy, AfterViewInit {
+
+  @Input() set config(config: ChartValuesConfig) {
+    if (!!config) {
+      this.schemaUrl = config.schemaUrl;
+      this.valuesUrl = config.valuesUrl;
+      this.releaseValues = config.releaseValues;
+      this.init();
+    }
+  }
+
+  schemaUrl: string;
+  valuesUrl: string;
+  releaseValues: string;
+
+  // Model for the editor - we set this once when the YAML support has been loaded
+  public model;
+
+  // Editor mode - either 'editor' for the Monaco Code Editor or 'form' for the JSON Schema Form editor
+  public mode: EditorMode = EditorMode.CodeEditor;
+
+  // Content shown in the code editor
+  public code = '';
+
+  // JSON Schema
+  public schema: any;
+
+  public hasSchema = false;
+
+  // Data shown in the form on load
+  public initialFormData = {};
+
+  // Data updated in the form as the user changes it
+  public formData = {};
+
+  // Is the YAML in the code editor invalid?
+  public yamlError = false;
+
+  // Monaco Code Editor settings
+  public minimap = true;
+  public lineNumbers = true;
+
+  // Chart Values - as both raw text (keeping comments) and parsed JSON
+  public chartValuesYaml: string;
+  public chartValues: any;
+
+  // Default Monaco options
+  public editorOptions = {
+    automaticLayout: false, // We will resize the editor to fit the available space
+    contextmenu: false, // Turn off the right-click context menu
+    tabSize: 2,
+  };
+
+  // Monaco editor
+  public editor: any;
+
+  // Observable - are we still loading resources?
+  public loading$: Observable<boolean>;
+
+  // Observable for tracking if the Monaco editor has loaded
+  private monacoLoaded$ = new BehaviorSubject<boolean>(false);
+
+  private resizeSub: Subscription;
+  private themeSub: Subscription;
+
+  // Track whether the user changes the code in the text editor
+  private codeOnEnter: string;
+
+  // Reference to the editor, so we can adjust its size to fit
+  @ViewChild('monacoEditor', {read: ElementRef}) monacoEditor: ElementRef;
+
+  @ViewChild('schemaForm') schemaForm: JsonSchemaFormComponent;
+
+  // Confirmation dialog - copy values
+  overwriteValuesConfirmation = new ConfirmationDialogConfig(
+    'Overwrite Values?',
+    'Are you sure you want to replace your values with those from values.yaml?',
+    'Overwrite'
+  );
+
+  // Confirmation dialog - copy release values
+  overwriteReleaseValuesConfirmation = new ConfirmationDialogConfig(
+    'Overwrite Values?',
+    'Are you sure you want to replace your values with those from the release?',
+    'Overwrite'
+  );
+
+  // Confirmation dialog - diff values
+  overwriteDiffValuesConfirmation = new ConfirmationDialogConfig(
+    'Overwrite Values?',
+    'Are you sure you want to replace your values with the diff with values.yaml?',
+    'Overwrite'
+  );
+
+  // Confirmation dialog - clear values
+  clearValuesConfirmation = new ConfirmationDialogConfig(
+    'Clear Values?',
+    'Are you sure you want to clear the form values?',
+    'Overwrite'
+  );
+
+  constructor(
+    private elRef: ElementRef,
+    private renderer: Renderer2,
+    private httpClient: HttpClient,
+    private themeService: ThemeService,
+    private confirmDialog: ConfirmationDialogService,
+  ) {}
+
+  ngOnInit(): void {
+    // Listen for window resize and resize the editor when this happens
+    this.resizeSub = fromEvent(window, 'resize').pipe(debounceTime(150)).subscribe(event  => this.resize());
+  }
+
+  private init() {
+    // Observabled for loading schema and values for the Chart
+    const schema$ = this.httpClient.get(this.schemaUrl).pipe(catchError(e => of(null)));
+    const values$: Observable<string | unknown> = this.httpClient.get(this.valuesUrl, { responseType: 'text' }).pipe(
+      catchError(e => of(null))
+    );
+
+    // We need the schame, value sand the monaco editor to be all loaded before we're ready
+    this.loading$ = combineLatest(schema$, values$, this.monacoLoaded$).pipe(
+      filter(([schema, values, loaded]) => schema !== undefined && values !== undefined && loaded),
+      tap(([schema, values, loaded]) => {
+        this.schema = schema;
+        if (values !== null) {
+          this.chartValuesYaml = values as string;
+          this.chartValues = yaml.safeLoad(values);
+          // Set the form to the chart values initially, so if the user does nothing, they get the defaults
+          this.initialFormData = this.chartValues;
+        }
+        // Default to form if there is a schema
+        if (schema !== null) {
+          this.hasSchema = true;
+          this.mode = EditorMode.JSonSchemaForm;
+          // Register schema with the Monaco editor
+          this.registerSchema(this.schema);
+        } else {
+          // No Schema, so register an auto-generated schema from the Chart's values
+          this.registerSchema(generateJsonSchemaFromObject('Generated Schema', this.chartValues));
+
+          // Inherit the previous values if available (upgrade)
+          if (this.releaseValues) {
+            this.code = yaml.safeDump(this.releaseValues);
+          }
+        }
+        this.updateModel();
+      }),
+      map(([schema, values, loaded]) => !loaded),
+      startWith(true)
+    );
+  }
+
+  ngAfterViewInit(): void {
+    this.resizeEditor();
+  }
+
+  ngOnDestroy(): void {
+    if (this.resizeSub) {
+      this.resizeSub.unsubscribe();
+    }
+    if (this.themeSub) {
+      this.themeSub.unsubscribe();
+    }
+  }
+
+  // Toggle editor minimap on/off
+  toggleMinimap() {
+    this.minimap = !this.minimap;
+    this.editor.updateOptions({ minimap: { enabled: this.minimap } });
+  }
+
+  // Toggle editor line numbers on/off
+  toggleLineNumbers() {
+    this.lineNumbers = !this.lineNumbers;
+    this.editor.updateOptions({ lineNumbers: this.lineNumbers ? 'on' : 'off' });
+  }
+
+  // Store the update form data when the form changes
+  // AJSF two-way binding seems to cause issues
+  formChanged(data: any) {
+    this.formData = data;
+  }
+
+  // The edit mode has changed (form or editor)
+  editModeChanged(mode) {
+    this.mode = mode.value;
+
+    if (this.mode === EditorMode.CodeEditor) {
+      // Form -> Editor
+      // Only copy if there is not an error - otherwise keep the invalid yaml from the editor that needs fixing
+      if (!this.yamlError) {
+        this.code = this.getDiff(this.formData);
+        this.codeOnEnter = this.code;
+      }
+
+      // Need to resize the editor, as it will be freshly shown
+      this.resizeEditor();
+    } else {
+      // Editor -> Form
+      // Try and parse the YAML - if we can't this is an error, so we can't edit this back in the form
+      try {
+        if (this.codeOnEnter === this.code) {
+          return
+        }
+
+        // Parse as json
+        const json = yaml.safeLoad(this.code || '{}');
+        // Must be an object, otherwise it was not valid
+        if (typeof(json) !== 'object') {
+          throw new Error('Invalid YAML');
+        }
+        this.yamlError = false;
+        const data = {
+          ...this.formData,
+          ...json
+        };
+        this.initialFormData = data;
+        this.formData = data;
+      } catch (e) {
+        // The yaml in the code editor is invalid, so we can't marshal it back to json for the from editor
+        this.yamlError = true;
+      }
+    }
+  }
+
+  // Called once the Monaco editor has loaded and then each time the model is update
+  // Store a reference to the editor and ensure the editor theme is synchronized with the Stratos theme
+  onMonacoInit(editor) {
+    this.editor = editor;
+    this.resize();
+
+    // Only load the YAML support once - when we set the model, onMonacoInit will et
+    if (this.model) {
+      return;
+    }
+
+    // Load the YAML Language support - require is available as it will have been loaded by the Monaco vs loader
+    const req = (window as any).require;
+    req(['vs/language/yaml/monaco.contribution'], () => {
+      // Set the model now that YAML support is loaded - this will update the editor correctly
+      this.updateModel();
+      this.monacoLoaded$.next(true);
+    });
+
+    // Watch for theme changes - set light/dark theme in the monaco editor as the Stratos theme changes
+    this.themeSub = this.themeService.getTheme().subscribe(theme => {
+      const monaco = (window as any).monaco;
+      const monacoTheme = (theme.styleName === 'dark-theme') ? 'vs-dark' : 'vs';
+      monaco.editor.setTheme(monacoTheme);
+    });
+  }
+
+  private updateModel() {
+    this.model = {
+      language: 'yaml',
+      uri: this.getSchemaUri()
+     };
+  }
+
+  // Delayed resize of editor to fit
+  resizeEditor() {
+    setTimeout(() => this.resize(), 1);
+  }
+
+  // Resize editor to fit
+  resize() {
+    // Return if resize before editor has been set
+    if (!this.editor) {
+      return;
+    }
+
+    // Get width and height of the host element
+    const w = this.elRef.nativeElement.offsetWidth;
+    let h = this.elRef.nativeElement.offsetHeight;
+
+    // Check if host element not visible (does not have a size)
+    if ((w === 0) && (h === 0)) {
+      return;
+    }
+
+    // Remove height of toolbar (since this is incluced in the height of the host element)
+    h = h - TOOLBAR_HEIGHT;
+
+    // Set the Monaco editor to the same size as the container
+    this.renderer.setStyle(this.monacoEditor.nativeElement, 'width', `${w}px`);
+    this.renderer.setStyle(this.monacoEditor.nativeElement, 'height', `${h}px`);
+
+    // Ask Monaco to layout again with its new size
+    this.editor.layout();
+  }
+
+  // Get an absolute URI for the Schema - it is not fetched, just used as a reference
+  // schemaUrl is a relative URL - e.g. /p1/v1/chartsvc....
+  getSchemaUri(): string {
+    return `https://stratos.app/schemas${this.schemaUrl}`;
+  }
+
+  // Register the schema with the Monaco editor
+  // Reference: https://github.com/pengx17/monaco-yaml/blob/master/examples/umd/index.html#L69
+  registerSchema(schema: any) {
+    const monaco = (window as any).monaco;
+    monaco.languages.yaml.yamlDefaults.setDiagnosticsOptions({
+      enableSchemaRequest: true,
+      hover: true,
+      completion: true,
+      validate: true,
+      format: true,
+      schemas: [
+        {
+          uri: this.getSchemaUri(),
+          fileMatch: [this.getSchemaUri()],
+          schema
+        }
+      ]
+    });
+  }
+
+  public getValues(): any {
+    return (this.mode === EditorMode.JSonSchemaForm) ? this.formData : yaml.safeLoad(this.code);
+  }
+
+  public copyValues() {
+    const confirm = this.mode === EditorMode.JSonSchemaForm || this.mode === EditorMode.CodeEditor && this.code.length > 0;
+    if (confirm) {
+      this.confirmDialog.open(this.overwriteValuesConfirmation, () => {
+        this.doCopyValues();
+      });
+    } else {
+      this.doCopyValues();
+    }
+  }
+
+  // Copy the chart values into either the form or the code editor, depending on the current mode
+  private doCopyValues() {
+    if (this.mode === EditorMode.JSonSchemaForm) {
+      this.initialFormData = this.chartValues;
+    } else {
+      // Use the raw Yaml, so we keep comments and formatting
+      this.code = this.chartValuesYaml;
+    }
+  }
+
+  public copyReleaseValues() {
+    const confirm = this.mode === EditorMode.JSonSchemaForm || this.mode === EditorMode.CodeEditor && this.code.length > 0;
+    if (confirm) {
+      this.confirmDialog.open(this.overwriteReleaseValuesConfirmation, () => {
+        this.doCopyReleaseValues();
+      });
+    } else {
+      this.doCopyReleaseValues();
+    }
+  }
+
+  // Copy the release values into either the form or the code editor, depending on the current mode
+  private doCopyReleaseValues() {
+    if (this.mode === EditorMode.JSonSchemaForm) {
+      this.initialFormData = this.releaseValues;
+    } else {
+      this.code = yaml.safeDump(this.releaseValues);
+    }
+  }
+
+  // Reset the form values
+  clearFormValues() {
+    this.confirmDialog.open(this.clearValuesConfirmation, () => {
+      this.initialFormData = {};
+    });
+  }
+
+  // Update the code editor to only show the YAML that contains the differences with the values.yaml
+  diff() {
+    this.confirmDialog.open(this.overwriteDiffValuesConfirmation, () => {
+      const userValues = yaml.safeLoad(this.code);
+      this.code = this.getDiff(userValues);
+    });
+  }
+
+  getDiff(userValues: any): string {
+    let code = yaml.safeDump(diffObjects(userValues, this.chartValues));
+    if (code.trim() === '{}') {
+      code = '';
+    }
+    return code
+  }
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/diffvalues.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/diffvalues.ts
new file mode 100644
index 0000000000..4fc2d15946
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/diffvalues.ts
@@ -0,0 +1,50 @@
+// Helper for diffing user values and chart values
+
+function arraysAreEqual(a1: any[], a2: any[]): boolean {
+  if (a1.length !== a2.length) {
+    return false
+  }
+
+  for (let i=0; i<a1.length; i++) {
+    // Compare each item in the array
+    if (typeof(a1[i] === 'object')) {
+      const diff = diffObjects(a1[i], a2[i]);
+      if (Object.keys(diff).length !== 0) {
+        return false;
+      }
+    } else if (a1[i] !== a2[i]) {
+      return false;
+    }
+  }
+  return true;
+}
+
+// NOTE: This is a one-way diff only
+// diffObjects is main export - diffs two objects and returns only the diffrence
+export function diffObjects(src: any, dest: any): any {
+  if (!src) {
+    return {};
+  }
+  Object.keys(src).forEach(key => {
+    if (typeof(src[key]) === typeof(dest[key])) {
+      if(src[key] === null && dest[key] === null) {
+        delete src[key];
+      } else if(Array.isArray(src[key])) {
+        // Array
+        if (arraysAreEqual(src[key], dest[key])) {
+          delete src[key];
+        }
+      } else if (typeof(src[key]) === 'object') {
+        // Object
+        diffObjects(src[key], dest[key]);
+        if (src[key] && Object.keys(src[key]).length === 0) {
+          delete src[key];
+        }
+      } else if (src[key] === dest[key]) {
+        // Value
+        delete src[key];
+      }
+    }
+  });
+  return src;
+}
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/json-schema-generator.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/json-schema-generator.ts
new file mode 100644
index 0000000000..531d3aa985
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/json-schema-generator.ts
@@ -0,0 +1,288 @@
+// Generate a JSON Schema from an object
+// This code incorporates the library: https://github.com/nijikokun/generate-schema/blob/master/src/schemas/json.js
+// It is modified for Typescript and to mark all properties as not required
+
+// Reference: https://github.com/stephenhandley/type-of-is/blob/master/index.js
+// Modified for Typescript
+
+const BUILT_IN_TYPES = [
+  Object,
+  Function,
+  Array,
+  String,
+  Boolean,
+  Number,
+  Date,
+  RegExp,
+  Error
+];
+
+const _toString = ({}).toString;
+
+function isBuiltIn(_constructor): boolean {
+  for (const bit of BUILT_IN_TYPES) {
+    if (bit === _constructor) {
+      return true;
+    }
+  }
+  return false;
+};
+
+function of(obj) {
+  if ((obj === null) || (obj === undefined)) {
+    return obj;
+  } else {
+    return obj.constructor;
+  }
+}
+
+function stringType(obj) {
+  // [object Blah] -> Blah
+  const stype = _toString.call(obj).slice(8, -1);
+  if ((obj === null) || (obj === undefined)) {
+    return stype.toLowerCase();
+  }
+
+  const ctype = of(obj);
+  if (ctype && !isBuiltIn(ctype)) {
+    return ctype.name;
+  } else {
+    return stype;
+  }
+};
+
+// Reference: https://github.com/nijikokun/generate-schema/blob/master/src/schemas/json.js
+
+
+const DRAFT = 'http://json-schema.org/draft-04/schema#'
+
+function getPropertyFormat(value) {
+  const type = stringType(value).toLowerCase()
+
+  if (type === 'date') return 'date-time'
+  return null
+}
+
+function getPropertyType(value) {
+  const type = stringType(value).toLowerCase()
+
+  if (type === 'number') return Number.isInteger(value) ? 'integer' : type
+  if (type === 'date') return 'string'
+  if (type === 'regexp') return 'string'
+  if (type === 'function') return 'string'
+  return type
+}
+
+function getUniqueKeys(a, b, c) {
+  a = Object.keys(a)
+  b = Object.keys(b)
+  c = c || []
+
+  let value
+  let cIndex
+  let aIndex
+
+  for (let keyIndex = 0, keyLength = b.length; keyIndex < keyLength; keyIndex++) {
+    value = b[keyIndex]
+    aIndex = a.indexOf(value)
+    cIndex = c.indexOf(value)
+
+    if (aIndex === -1) {
+      if (cIndex !== -1) {
+        // Value is optional, it doesn't exist in A but exists in B(n)
+        c.splice(cIndex, 1)
+      }
+    } else if (cIndex === -1) {
+      // Value is required, it exists in both B and A, and is not yet present in C
+      c.push(value)
+    }
+  }
+
+  return c
+}
+
+function processArray(array, output?, nested?: boolean) {
+  let format
+  let oneOf
+  let type
+
+  if (nested && output) {
+    output = { items: output }
+  } else {
+    output = output || {}
+    output.type = getPropertyType(array)
+    output.items = output.items || {}
+    type = output.items.type || null
+  }
+
+  // Determine whether each item is different
+  for (let arrIndex = 0, arrLength = array.length; arrIndex < arrLength; arrIndex++) {
+    const elementType = getPropertyType(array[arrIndex])
+    const elementFormat = getPropertyFormat(array[arrIndex])
+
+    if (type && elementType !== type) {
+      output.items.oneOf = []
+      oneOf = true
+      break
+    } else {
+      type = elementType
+      format = elementFormat
+    }
+  }
+
+  // Setup type otherwise
+  if (!oneOf && type) {
+    output.items.type = type
+    if (format) {
+      output.items.format = format
+    }
+  } else if (oneOf && type !== 'object') {
+    output.items = {
+      oneOf: [{ type }],
+      required: false
+    }
+  }
+
+  // Process each item depending
+  if (typeof output.items.oneOf !== 'undefined' || type === 'object') {
+    for (let itemIndex = 0, itemLength = array.length; itemIndex < itemLength; itemIndex++) {
+      const value = array[itemIndex]
+      const itemType = getPropertyType(value)
+      const itemFormat = getPropertyFormat(value)
+      let arrayItem
+      if (itemType === 'object') {
+        if (output.items.properties) {
+          output.items.required = false
+        }
+        arrayItem = processObject(value, oneOf ? {} : output.items.properties, true)
+      } else if (itemType === 'array') {
+        arrayItem = processArray(value, oneOf ? {} : output.items.properties, true)
+      } else {
+        arrayItem = {}
+        arrayItem.type = itemType
+        if (itemFormat) {
+          arrayItem.format = itemFormat
+        }
+      }
+      if (oneOf) {
+        const childType = stringType(value).toLowerCase()
+        const tempObj: any = {};
+        if (!arrayItem.type && childType === 'object') {
+          tempObj.properties = arrayItem
+          tempObj.type = 'object'
+          arrayItem = tempObj
+        }
+        output.items.oneOf.push(arrayItem)
+      } else {
+        if (output.items.type !== 'object') {
+          continue;
+        }
+        output.items.properties = arrayItem
+      }
+    }
+  }
+  return nested ? output.items : output
+}
+
+function processObject(object: any, output?: any, nested?: boolean) {
+  if (nested && output) {
+    output = { properties: output }
+  } else {
+    output = output || {}
+    output.type = getPropertyType(object)
+    output.properties = output.properties || {}
+    output.required = []
+  }
+
+  for(const key of Object.keys(object)) {
+    const value = object[key]
+    let typ = getPropertyType(value)
+    const format = getPropertyFormat(value)
+
+    typ = typ === 'undefined' ? 'null' : typ
+
+    if (typ === 'object') {
+      output.properties[key] = processObject(value, output.properties[key])
+      continue
+    }
+
+    if (typ === 'array') {
+      output.properties[key] = processArray(value, output.properties[key])
+      continue
+    }
+
+    if (output.properties[key]) {
+      const entry = output.properties[key]
+      const hasTypeArray = Array.isArray(entry.type)
+
+      // When an array already exists, we check the existing
+      // type array to see if it contains our current property
+      // type, if not, we add it to the array and continue
+      if (hasTypeArray && entry.type.indexOf(typ) < 0) {
+        entry.type.push(typ)
+      }
+
+      // When multiple fields of differing types occur,
+      // json schema states that the field must specify the
+      // primitive types the field allows in array format.
+      if (!hasTypeArray && entry.type !== typ) {
+        entry.type = [entry.type, typ]
+      }
+
+      continue
+    }
+
+    output.properties[key] = {}
+    output.properties[key].type = typ
+
+    if (format) {
+      output.properties[key].format = format
+    }
+  }
+
+  return nested ? output.properties : output
+}
+
+
+export function generateJsonSchemaFromObject(title, object) {
+  let processOutput
+  const output: any = {
+    $schema: DRAFT
+  }
+
+  // Determine title exists
+  if (typeof title !== 'string') {
+    object = title
+    title = undefined
+  } else {
+    output.title = title
+  }
+
+  // Set initial object type
+  output.type = stringType(object).toLowerCase()
+
+  // Process object
+  if (output.type === 'object') {
+    processOutput = processObject(object)
+    output.type = processOutput.type
+    output.properties = processOutput.properties
+
+    // For a generated schema, nothing is marked as required
+    // This is a modification to the library
+    output.required = false;
+  }
+
+  if (output.type === 'array') {
+    processOutput = processArray(object)
+    output.type = processOutput.type
+    output.items = processOutput.items
+
+    if (output.title) {
+      output.items.title = output.title
+      output.title += ' Set'
+    }
+  }
+
+  // Output
+  return output
+}
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.html
similarity index 70%
rename from src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.html
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.html
index 4aec9bb603..000f286a25 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.html
@@ -36,17 +36,6 @@
     </form>
   </app-step>
   <app-step [title]="'Overrides'" [onNext]="submit" [finishButtonText]="'Install'" [onEnter]="onEnterOverrides">
-    <form [formGroup]="overrides" class="stepper-form overrides_form">
-      <div class="helm-create-release__heading">
-        <h3 class="helm-create-release__title">Enter YAML Value Overrides</h3>
-        <button (click)="useValuesYaml()" [disabled]="!valuesYaml" class="helm-create-release__button" mat-button
-          color="primary">Copy from values.yaml</button>
-      </div>
-      <mat-form-field [floatLabel]="'always'" class="overrides_form-field">
-        <mat-label>Values</mat-label>
-        <textarea #overridesYamlTextArea class="overrides__yaml" matInput formControlName="values" name="Values"
-          spellcheck="false"></textarea>
-      </mat-form-field>
-    </form>
+    <app-chart-values-editor #editor [config]="config"></app-chart-values-editor>
   </app-step>
 </app-steppers>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.scss
new file mode 100644
index 0000000000..cf807defaa
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.scss
@@ -0,0 +1,18 @@
+:host {
+  flex: 1;
+}
+
+.helm-create-release {
+  &__heading {
+    align-items: center;
+    display: flex;
+  }
+
+  &__title {
+    flex: 1;
+    font-size: 14px;
+  }
+  &__button {
+    height: 36px;
+  }
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.spec.ts
similarity index 61%
rename from src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.spec.ts
index c214981990..f2533edc8b 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.spec.ts
@@ -3,15 +3,15 @@ import { HttpClient } from '@angular/common/http';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { ConfirmationDialogService } from '../../../../../core/src/shared/components/confirmation-dialog.service';
-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 { KubernetesBaseTestModules } from '../../kubernetes/kubernetes.testing.module';
-import { MockChartService } from '../monocular/shared/services/chart.service.mock';
-import { ChartsService } from '../monocular/shared/services/charts.service';
-import { ConfigService } from '../monocular/shared/services/config.service';
+import { ConfirmationDialogService } from '../../../../../../core/src/shared/components/confirmation-dialog.service';
+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 { MockChartService } from '../../../helm/monocular/shared/services/chart.service.mock';
+import { ChartsService } from '../../../helm/monocular/shared/services/charts.service';
+import { ConfigService } from '../../../helm/monocular/shared/services/config.service';
+import { KubernetesBaseTestModules } from '../../kubernetes.testing.module';
 import { CreateReleaseComponent } from './create-release.component';
 
 describe('CreateReleaseComponent', () => {
@@ -52,8 +52,6 @@ describe('CreateReleaseComponent', () => {
   });
 
   it('should be created', () => {
-    httpMock.expectOne('/pp/v1/chartsvc/v1/assets/undefined/undefined/versions/undefined/values.yaml');
-
     expect(component).toBeTruthy();
   });
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.ts
similarity index 73%
rename from src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.ts
rename to src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.ts
index 372ea2e145..fcc3ccff84 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/create-release/create-release.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.ts
@@ -1,27 +1,26 @@
-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/input';
 import { ActivatedRoute } from '@angular/router';
 import { BehaviorSubject, combineLatest, Observable, of, Subscription } from 'rxjs';
 import { distinctUntilChanged, filter, first, map, pairwise, startWith, switchMap } from 'rxjs/operators';
 
-import { EndpointsService } from '../../../../../core/src/core/endpoints.service';
-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 { StepOnNextFunction, StepOnNextResult } from '../../../../../core/src/shared/components/stepper/step/step.component';
-import { RequestInfoState } from '../../../../../store/src/reducers/api-request-reducer/types';
-import { kubeEntityCatalog } from '../../kubernetes/kubernetes-entity-catalog';
-import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes/kubernetes-entity-factory';
-import { KubernetesNamespace } from '../../kubernetes/store/kube.types';
-import { getFirstChartUrl } from '../../kubernetes/workloads/workload.utils';
-import { helmEntityCatalog } from '../helm-entity-catalog';
-import { createMonocularProviders } from '../monocular/stratos-monocular-providers.helpers';
-import { getMonocularEndpoint, stratosMonocularEndpointGuid } from '../monocular/stratos-monocular.helper';
-import { HelmInstallValues } from '../store/helm.types';
-import { ChartsService } from './../monocular/shared/services/charts.service';
-import { HelmChartReference } from './../store/helm.types';
+import { EndpointsService } from '../../../../../../core/src/core/endpoints.service';
+import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
+import {
+  StepOnNextFunction,
+  StepOnNextResult,
+} from '../../../../../../core/src/shared/components/stepper/step/step.component';
+import { RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
+import { helmEntityCatalog } from '../../../helm/helm-entity-catalog';
+import { ChartsService } from '../../../helm/monocular/shared/services/charts.service';
+import { createMonocularProviders } from '../../../helm/monocular/stratos-monocular-providers.helpers';
+import { getMonocularEndpoint, stratosMonocularEndpointGuid } from '../../../helm/monocular/stratos-monocular.helper';
+import { HelmChartReference, HelmInstallValues } from '../../../helm/store/helm.types';
+import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
+import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes-entity-factory';
+import { KubernetesNamespace } from '../../store/kube.types';
+import { getFirstChartUrl } from '../workload.utils';
+import { ChartValuesConfig, ChartValuesEditorComponent } from './../chart-values-editor/chart-values-editor.component';
 
 @Component({
   selector: 'app-create-release',
@@ -33,13 +32,6 @@ import { HelmChartReference } from './../store/helm.types';
 })
 export class CreateReleaseComponent implements OnInit, OnDestroy {
 
-  // Confirmation dialog
-  overwriteValuesConfirmation = new ConfirmationDialogConfig(
-    'Overwrite Values?',
-    'Are you sure you want to replace your values with those from values.yaml?',
-    'Overwrite'
-  );
-
   // isLoading$ = observableOf(false);
   paginationStateSub: Subscription;
 
@@ -49,47 +41,33 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
 
   details: FormGroup;
   namespaces$: Observable<string[]>;
-  overrides: FormGroup;
 
   private endpointChanged = new BehaviorSubject(null);
 
   @ViewChild('releaseNameInputField', { static: true }) releaseNameInputField: ElementRef;
-  @ViewChild('overridesYamlTextArea', { static: true }) overridesYamlTextArea: ElementRef;
-  @ViewChild(MatTextareaAutosize, { static: false }) overridesYamlAutosize: MatTextareaAutosize;
-
-  public valuesYaml = '';
+  @ViewChild('editor', { static: true }) editor: ChartValuesEditorComponent;
 
   private subs: Subscription[] = [];
   private createdNamespace = false;
 
   private chart: HelmChartReference;
+  public config: ChartValuesConfig;
 
   constructor(
     private route: ActivatedRoute,
     public endpointsService: EndpointsService,
-    private httpClient: HttpClient,
-    private confirmDialog: ConfirmationDialogService,
     private chartsService: ChartsService,
   ) {
     const chart = this.route.snapshot.params as HelmChartReference;
     this.cancelUrl = `/monocular/charts/${getMonocularEndpoint(this.route)}/${chart.repo}/${chart.name}/${chart.version}`;
     this.chart = chart;
 
-    this.setupDetailsStep();
-
-    this.overrides = new FormGroup({
-      values: new FormControl('')
-    });
-
-    // Fetch the values.yaml for the Chart
-    const valuesYamlUrl = `/pp/v1/chartsvc/v1/assets/${chart.repo}/${chart.name}/versions/${chart.version}/values.yaml`;
+    this.config = {
+      valuesUrl: `/pp/v1/chartsvc/v1/assets/${chart.repo}/${chart.name}/versions/${chart.version}/values.yaml`,
+      schemaUrl: `/pp/v1/chartsvc/v1/assets/${chart.repo}/${chart.name}/versions/${chart.version}/values.schema.json`,
+    }
 
-    this.httpClient.get(valuesYamlUrl, { responseType: 'text' })
-      .subscribe(response => {
-        this.valuesYaml = response;
-      }, err => {
-        console.error('Failed to fetch chart values: ', err.message || err);
-      });
+    this.setupDetailsStep();
   }
 
   private setupDetailsStep() {
@@ -186,21 +164,6 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     return lowerCase.length ? namespaces.filter(ns => ns.toLowerCase().indexOf(lowerCase) >= 0) : namespaces;
   }
 
-  public useValuesYaml() {
-    if (this.overrides.value.values.length !== 0) {
-      this.confirmDialog.open(this.overwriteValuesConfirmation, () => {
-        this.replaceWithValuesYaml();
-      });
-
-    } else {
-      this.replaceWithValuesYaml();
-    }
-  }
-
-  private replaceWithValuesYaml() {
-    this.overrides.controls.values.setValue(this.valuesYaml, { onlySelf: true });
-  }
-
   ngOnInit() {
     // Auto select endpoint if there is only one
     this.kubeEndpoints$.pipe(first()).subscribe(ep => {
@@ -214,11 +177,9 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     });
   }
 
+  // Ensure the editor is resized when the overrides step becomes visible
   onEnterOverrides = () => {
-    setTimeout(() => {
-      // this.overridesYamlAutosize.resizeToFitContent(true);
-      this.overridesYamlTextArea.nativeElement.focus();
-    }, 1);
+    this.editor.resizeEditor();
   };
 
   submit: StepOnNextFunction = () => {
@@ -261,7 +222,7 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     // Build the request body
     const values: HelmInstallValues = {
       ...this.details.value,
-      ...this.overrides.value,
+      values: this.editor.getValues(),
       chart: {
         name: this.route.snapshot.params.name,
         repo: this.route.snapshot.params.repo,
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index 0a8fbac769..a3f7b44bb4 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -122,6 +122,7 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
 
     this.hasUpgrade$ = this.helmReleaseHelper.hasUpgrade().pipe(map(v => v ? v.version : null));
 
+    // Can upgrade if the Chart is available
     this.canUpgrade$ = this.helmReleaseHelper.hasUpgrade(true).pipe(map(v => !!v));
 
     this.resources$ = combineLatest(
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.html
index dae9721887..4a3ab48abc 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.html
@@ -2,29 +2,11 @@
   Upgrade Workload
 </app-page-header>
 <app-steppers [cancel]="cancelUrl">
-  <app-step title="Version" [valid]="validate$ | async">
+  <app-step title="Version" [valid]="validate$ | async" [onNext]="onNext">
     <app-list class="workload-upgrade__list" *ngIf="listConfig" [listConfig]="listConfig"></app-list>
   </app-step>
-  <app-step title="Overrides" [onNext]="doUpgrade" finishButtonText="Upgrade">
-    <div class="workload-upgrade__form">
-    <form [formGroup]="overrides" class="stepper-form overrides_form">
-      <div class="workload-upgrade__heading">
-        <h3 class="workload-upgrade__title">Enter YAML Value Overrides</h3>
-        <!--
-        <button (click)="useValuesYaml()" [disabled]="!valuesYaml" class=""workload-upgrade__button" mat-button
-          color="primary">Copy from values.yaml</button>
-        -->
-      </div>
-      <mat-form-field [floatLabel]="'always'" class="overrides_form-field">
-        <mat-label>Values</mat-label>
-        <textarea #overridesYamlTextArea class="overrides__yaml" matInput formControlName="values" name="Values"
-          spellcheck="false"></textarea>
-      </mat-form-field>
-    </form>
-    <!--
-    <mat-slide-toggle (change)="toggleAdvancedOptions()">Show Advanced Options</mat-slide-toggle>
-    -->
-    </div>
+  <app-step title="Overrides" [onNext]="doUpgrade" finishButtonText="Upgrade" [onEnter]="onEnterOverrides">
+    <app-chart-values-editor #editor [config]="config"></app-chart-values-editor>
   </app-step>
 
   <!-- Add support for recreate pods and other advanced options in the future
@@ -33,5 +15,4 @@ <h3 class="workload-upgrade__title">Enter YAML Value Overrides</h3>
   </app-step>
   -->
 
-
 </app-steppers>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts
index 328ded2c6f..2502205f7e 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts
@@ -1,14 +1,18 @@
-import { Component } from '@angular/core';
-import { FormControl, FormGroup } from '@angular/forms';
+import { Component, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { Observable, of } from 'rxjs';
-import { filter, first, map, pairwise } from 'rxjs/operators';
+import { filter, first, map, pairwise, tap } from 'rxjs/operators';
 
-import { StepComponent, StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
+import {
+  StepComponent,
+  StepOnNextFunction,
+  StepOnNextResult,
+} from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types';
 import { stratosMonocularEndpointGuid } from '../../../helm/monocular/stratos-monocular.helper';
 import { HelmUpgradeValues, MonocularVersion } from '../../../helm/store/helm.types';
+import { ChartValuesConfig, ChartValuesEditorComponent } from '../chart-values-editor/chart-values-editor.component';
 import { HelmReleaseHelperService } from '../release/tabs/helm-release-helper.service';
 import { HelmReleaseGuid } from '../workload.types';
 import { getFirstChartUrl } from '../workload.utils';
@@ -34,11 +38,14 @@ import { ReleaseUpgradeVersionsListConfig } from './release-version-list-config'
 })
 export class UpgradeReleaseComponent {
 
+  @ViewChild('editor', { static: true }) editor: ChartValuesEditorComponent;
+
   public cancelUrl;
   public listConfig: ReleaseUpgradeVersionsListConfig;
   public validate$: Observable<boolean>;
   private version: MonocularVersion;
-  public overrides: FormGroup;
+
+  public config: ChartValuesConfig;
 
   private monocularEndpointId: string;
 
@@ -52,11 +59,6 @@ export class UpgradeReleaseComponent {
 
     this.cancelUrl = `/workloads/${this.helper.guid}`;
 
-    // Form for overrides step (Helm Values)
-    this.overrides = new FormGroup({
-      values: new FormControl('')
-    });
-
     this.helper.hasUpgrade(true).pipe(
       filter(c => !!c),
       first()
@@ -80,6 +82,32 @@ export class UpgradeReleaseComponent {
     });
   }
 
+  // Ensure the editor is resized when the overrides step becomes visible
+  onEnterOverrides = () => {
+    this.editor.resizeEditor();
+  }
+
+  // Update the editor with the chosen version when the user moves to the next step
+  onNext = (): Observable<StepOnNextResult> => {
+    const chart = this.version.relationships.chart.data;
+    const version = this.version.attributes.version;
+
+    // Fetch the release metadata so that we have the values used to install the current release
+    return this.helper.release$.pipe(
+      first(),
+      tap(release => {
+        this.config = {
+          schemaUrl: `/pp/v1/chartsvc/v1/assets/${chart.repo.name}/${chart.name}/versions/${version}/values.schema.json`,
+          valuesUrl: `/pp/v1/chartsvc/v1/assets/${chart.repo.name}/${chart.name}/versions/${version}/values.yaml`,
+          releaseValues: release.config
+        };
+      }),
+      map(() => {
+        return { success: true }
+      })
+    );
+  }
+
   // Hide/show the advanced options step
   toggleAdvancedOptions() {
     this.showAdvancedOptions = !this.showAdvancedOptions;
@@ -93,7 +121,7 @@ export class UpgradeReleaseComponent {
 
     // Add the chart url into the values
     const values: HelmUpgradeValues = {
-      values: this.overrides.controls.values.value,
+      values: this.editor.getValues(),
       restartPods: false,
       chart: {
         name: this.version.relationships.chart.data.name,
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
index 44ab5ce4bb..7359657da2 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
@@ -1,10 +1,14 @@
 import { CommonModule, DatePipe } from '@angular/common';
 import { NgModule } from '@angular/core';
+import { MaterialDesignFrameworkModule } from '@cfstratos/ajsf-material';
 import { NgxGraphModule } from '@swimlane/ngx-graph';
+import { MonacoEditorModule, NgxMonacoEditorConfig } from 'ngx-monaco-editor';
 
 import { CoreModule } from '../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../core/src/shared/shared.module';
 import { KubernetesModule } from '../kubernetes.module';
+import { ChartValuesEditorComponent } from './chart-values-editor/chart-values-editor.component';
+import { CreateReleaseComponent } from './create-release/create-release.component';
 import { HelmReleaseCardComponent } from './list-types/helm-release-card/helm-release-card.component';
 import { HelmReleaseTabBaseComponent } from './release/helm-release-tab-base/helm-release-tab-base.component';
 import {
@@ -25,6 +29,12 @@ import { WorkloadsRouting } from './workloads.routing';
 import { HelmReleaseHistoryTabComponent } from './release/tabs/helm-release-history-tab/helm-release-history-tab.component';
 import { WorkloadLiveReloadComponent } from './release/workload-live-reload/workload-live-reload.component';
 
+// Default config for the Monaco edfior
+const monacoConfig: NgxMonacoEditorConfig = {
+  baseUrl: '/core/assets', // configure base path for monaco editor
+  defaultOptions: { scrollBeyondLastLine: false }
+};
+
 @NgModule({
   imports: [
     CoreModule,
@@ -34,6 +44,8 @@ import { WorkloadLiveReloadComponent } from './release/workload-live-reload/work
     WorkloadsRouting,
     NgxGraphModule,
     KubernetesModule,
+    MaterialDesignFrameworkModule,
+    MonacoEditorModule.forRoot(monacoConfig),
   ],
   declarations: [
     HelmReleasesTabComponent,
@@ -46,6 +58,8 @@ import { WorkloadLiveReloadComponent } from './release/workload-live-reload/work
     HelmReleaseResourceGraphComponent,
     HelmReleaseCardComponent,
     HelmReleaseAnalysisTabComponent,
+    ChartValuesEditorComponent,
+    CreateReleaseComponent,
     WorkloadLiveReloadComponent,
     UpgradeReleaseComponent,
     HelmReleaseHistoryTabComponent,
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.routing.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.routing.ts
index a9773315f8..5b91cda06a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.routing.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.routing.ts
@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
+import { CreateReleaseComponent } from './create-release/create-release.component';
 import { HelmReleaseTabBaseComponent } from './release/helm-release-tab-base/helm-release-tab-base.component';
 import {
   HelmReleaseAnalysisTabComponent,
@@ -27,6 +28,8 @@ const routes: Routes = [
         component: HelmReleasesTabComponent,
         pathMatch: 'full',
       },
+      { pathMatch: 'full', path: 'install/:endpoint/:repo/:name/:version', component: CreateReleaseComponent },
+      { pathMatch: 'full', path: 'install/:endpoint/:repo/:name', component: CreateReleaseComponent },
       {
         // guid = kube endpoint
         path: ':guid/upgrade',

From a9353fad00a64c6ef928561de1b9531bc0779e54 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Tue, 15 Sep 2020 15:52:30 +0100
Subject: [PATCH 618/648] Merge upstream (#468)

* Ensure filename/no filename text in connect by file dialog is aligned (#4474)

- needs porting back

* Add typed entity access and `custom-src` removal to change log (#4496)

* Fixes #4335: Create Stratos static web site with better documentation (#4446)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* * Review comments fix

* Fix broken link to an image in frontend extensions doc

* Final tweaks

Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Richard Cox <richard-cox@users.noreply.github.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard Cox <richard.cox@suse.com>

* Fix and update customization docs (#4478)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* Apply new theming process to acme example

* First pass at customization docs, most of themeing done

* Final pass at customization docs

* Merge fixes

Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update base README, point to website (#4488)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* Apply new theming process to acme example

* First pass at customization docs, most of themeing done

* Final pass at customization docs

* Update base README, point to website

Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update developer docs (#4489)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* Apply new theming process to acme example

* First pass at customization docs, most of themeing done

* Final pass at customization docs

* Update base README, point to website

* Update developer docs
Still need an overhall, but updated to remove incorrect data and apply website context

Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix docs (#4497)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* Apply new theming process to acme example

* First pass at customization docs, most of themeing done

* Final pass at customization docs

* Update base README, point to website

* Update developer docs
Still need an overhall, but updated to remove incorrect data and apply website context

* Fix PR template

Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Ensure images dependent on techPreview flag are included in imagelist.txt (#4500)

* Improve clean-symlinks script (#4509)

* Add support for including breaking changes in the changelog

* Improve clean-symlinks script

* Update changelog.sh

* Update changelog.sh

* Remove trailing line

* Remove tailing line

* Change nginx ciphers and make configurable via helm chart values (#4507)

* Change nginx ciphers and make configurable via helm chart values

* Add support for including breaking changes in the changelog

* Improve clean-symlinks script

* Update changelog.sh

* Update changelog.sh

* Remove trailing line

* Remove tailing line

* Fix bug with cert path patching

* Fig bug where protocols not patched

* Update version to 4.0.1, add change log (#4514)

* Update version to 4.0.1, add change log

* Update package-lock

* Fix deploy from gitlab using a group's repo (#4479)

- only supported user based repos
- fixes #4153

* Add additional time ranges to base metrics range selector (#4480)

- fixes https://github.com/SUSE/stratos/issues/415

* Add some time saving comments to cf permissions checker (#4508)

* Move tab-nav and xsrf module source files to the src folder (#4518)

* Move tab-nav files

* Move xsrf module

* Fix GitHub branch limit (#4510)

* Ensure we fetch all repo's and branches when deploying github apps

* Ensure we only fetch branches once
- SUSE/stratos vs suse/stratos
- ensure branches are treated as 'local' lists

* Increate page size for github commits and gitlab requests

* Remove use of nodejs util module (#4521)

* Remove use of nodejs util module

* Fix comment typo

* Remove dependencies between store and core that have crept in (#4517)

* Remove dependencies between store and core that have crept in

* Fix issue with unit tests

* Import fixes and unit test fix

* Fix store testing package (#4520)

* Fix store testing package

* Update public-api.ts

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

* Fix the position of the header guide array (#4524)

- shown when there are no registered endpoints (and some incoming scenarios)
- position is determined by location of associated button in header
- position of button can change given visibility of other buttons (notification bell, endpoint backup, etc)
- now check positiion after a delay, add fade in to mask delay

* Metrics: Ensure trailing slashes are ignored when comparing URLs (#4527)

* Remove imports of the form 'frontend/....' (#4519)

* Move tab-nav files

* Move xsrf module

* Remove imports of the form 'frontend/...'

* Move endpopints-health-check.ts (#4530)

* Add UMD Ids to external modules in store package (#4522)

* Add UMB Ids to external modules in store package

* Add moment

* Address PR feedback

* Improvements & more checks to autoscaler scheduled date tests (#4535)

- allow more time to skip between date and time values in date fields
- add a check to
- add checks to ensure we have the correct number of scheduled date rules

* Remove api driven views (#4537)

* Remove logger service and action history (#4538)

* Remove logger service

* Missed a few and removed action history as it was not being used

* Remove action history

* A few more

* Fix for removed method

* Add support for API keys (#4515)

* Add backend support for API keys

* Add last_used field to API keys

* Use secure random value as key secret

* Add tests for ListAPIKeys and AddAPIKey

* Cover the rest of psql_apikeys.go with tests

* Refactor the code a bit

* Storing SQL queries in a struct should ensure that
`datastore.ModifySQLStatement` gets called on all of them.
* A wrapper func around `db.Exec` reduces copypasta.
* Actually call `InitRepositoryProvider` for API keys package

* Add route handler tests using gomock

* Actually use skipper in xsrfMiddleware; minor clean-up

* Update moment imports to remove warning when building library (#4534)

* Update moment imports to remove warning when building library

* Fix references to moment-timezone and markdown
- contains some changes to e2e tests as well, might need to be reverted

* Fix unit test

* Fix `import *` in e2e tests

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

* Fix Helm upgrade bug (#4544)

* Fix Helm upgrade bug

* Fix unit tests

* Store api_keys.last_used in UTC (#4541)

* Add UI for Stratos API Keys (#4523)

* Add backend support for API keys

* Add last_used field to API keys

* Add base api keys page

* Add basic api key entity framework (untested)

* Add a basic api keys list (untested, need to wire in properties/columns + actions)

* Fix entity type related issues

* Add basic way to create api key

* Wire in delete to list

* Improve 'no api keys' ux

* Final tidy up

* Other fixes

* Fix unit tests

* Add 'Last Used' column to API keys list

* Don't flash up 'no entries' when we haven't loaded api keys yet

* Fix last used sorting
- takes into account timezone
- use cacheing to cater for often called sort

* Fix unit test after changes in master

* Fix after moment change

* Remove now unrequired sorting of api key last used date via moment

Co-authored-by: Ivan Kapelyukhin <ikapelyukhin@suse.com>

* Add basic e2e tests for API Keys (#4536)

* Add backend support for API keys

* Add last_used field to API keys

* Add base api keys page

* Add basic api key entity framework (untested)

* Add a basic api keys list (untested, need to wire in properties/columns + actions)

* Fix entity type related issues

* Add basic way to create api key

* Wire in delete to list

* Improve 'no api keys' ux

* Final tidy up

* Other fixes

* Fix unit tests

* Add basic e2e tests for api keys

* Add 'Last Used' column to API keys list

* Don't flash up 'no entries' when we haven't loaded api keys yet

* Fix last used sorting
- takes into account timezone
- use cacheing to cater for often called sort

* Fix unit test after changes in master

* Fix after moment change

* Beef up test, fix for initial empty state

* Remove now unrequired sorting of api key last used date via moment

Co-authored-by: Ivan Kapelyukhin <ikapelyukhin@suse.com>

* Bump docusaurus version and add support for versioning  (#4506)

* Bump docusaurus version and versioning
- Bump docusaurus to latest 2.0 version
- Fix errors thrown up by new linting process
- Add version support, setup 4.0.0
- Enable dark mode and fix in home screen

* Move status_updates back into root project docs folder

* Fix links
- fix dead links
- ensure all links are relative (so work when versioned)

* Remove version 4.0.0

* WIP

* WIP

* Completed

* Temporarily remove docsVersionDropdown until first version added to internal-versions

* Update website docs

* Build fix for temp situation where there's no versions

* Add custom version of 'not latest released docs' message

* Improve versioning and dark mode toggle
- Add `All Versions page`
- Conditionally include versions in drop down
- Improve dark mode toggle icons

* Temporarily remove dependent on versions
- will be added back in when 4.0 sha is known

* Update Versions Process

* Add 4.0.0

* Fix in `build`/`serve` world
- worked fine in `start` world...

* Update 4.0.0 with temp version

* Multiple improvements
- Fix clean git repo before run
- Swizzle docs version drop down nav bar item, move in custom code
- Improve docs (latest version must appear in drop down)

* Changes following review

* Reduce font in version warning

* API Keys: Make feature configurable for different user types (#4540)

* Add a special type and parsing for the new config option

* Add APIKeysEnabled to /info, check it in the middleware

* Add test coverage for apiKeyMiddleware

* Block API keys endpoints if disabled in the config; add tests

* Fix failing test

* Add API_KEYS_ENABLED to the Helm chart

* Add JSON schema to the Helm chart

* Add docs for UAA SSO user permissions management (#4554)

* Bump docusaurus version and versioning
- Bump docusaurus to latest 2.0 version
- Fix errors thrown up by new linting process
- Add version support, setup 4.0.0
- Enable dark mode and fix in home screen

* Move status_updates back into root project docs folder

* Fix links
- fix dead links
- ensure all links are relative (so work when versioned)

* Remove version 4.0.0

* WIP

* WIP

* Completed

* Temporarily remove docsVersionDropdown until first version added to internal-versions

* Update website docs

* Build fix for temp situation where there's no versions

* Add custom version of 'not latest released docs' message

* Improve versioning and dark mode toggle
- Add `All Versions page`
- Conditionally include versions in drop down
- Improve dark mode toggle icons

* Temporarily remove dependent on versions
- will be added back in when 4.0 sha is known

* Update Versions Process

* Add 4.0.0

* Fix in `build`/`serve` world
- worked fine in `start` world...

* Update 4.0.0 with temp version

* Add troubleshooting section for SSO

* Update SSO auth troubleshooting section

* Add basic developers guide for working with helm (#4511)

* Bump docusaurus version and versioning
- Bump docusaurus to latest 2.0 version
- Fix errors thrown up by new linting process
- Add version support, setup 4.0.0
- Enable dark mode and fix in home screen

* Move status_updates back into root project docs folder

* Fix links
- fix dead links
- ensure all links are relative (so work when versioned)

* Add basic developers guide for working with helm

* Fix post merge issue

* Enable/disable API keys UI given API keys config setting (#4559)

* Add a special type and parsing for the new config option

* Add APIKeysEnabled to /info, check it in the middleware

* Add test coverage for apiKeyMiddleware

* Block API keys endpoints if disabled in the config; add tests

* Fix failing test

* Add API_KEYS_ENABLED to the Helm chart

* Add JSON schema to the Helm chart

* Enable/disable API keys UI given API keys config setting

* Changes following review

* Fix unit tests

Co-authored-by: Ivan Kapelyukhin <ikapelyukhin@suse.com>

* Enable linting for all packages (#4561)

* Enable linting for all packages
- lots to solve!
- we may wish to exclude some files

* Fix linting

* Bump angular json schema form (#4564)

* Bump angular json schema form

* Handle bug where mat-error maring is too big
- We may want to consider moving this upstream

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

* Docs: Update internal versions & Automate future updates  (#4558)

* Docs: Update where 4.0.0 is built from, add 4.0.1
- means we can delete the old `docs-versioning` branch
- both versions point to the same commit (when branch merged to master),
  but reduces user confusion when they can't find the docs for the latest
  released version. Going forward this will point directly to the release label

* Automatically update website's internal-versions.json on new releases
- Add new github action
- Action will trigger on a release being published
- Action looks at github `release` object associated with event and extracts
  a version label and git label
- Use extracted values adds new value to internal-versions.json
- Creates a PR with the change

* Fix checkout issue

* Update documentation-versioning.yml

* Merge fixes, remove fdescribe already in master

* Fix linting

* Fix unit tests

Co-authored-by: Veerapuram Varadhan <veerapuram.varadhan@suse.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Ivan Kapelyukhin <ikapelyukhin@suse.com>
---
 .../workflows/documentation-versioning.yml    |   40 +
 .github/workflows/documentation.yml           |    2 +-
 .gitignore                                    |    4 +
 README.md                                     |    2 +-
 angular.json                                  |   15 +-
 deploy/kubernetes/console/README.md           |    1 +
 .../console/templates/deployment.yaml         |    2 +
 deploy/kubernetes/console/values.schema.json  |  373 +++
 deploy/kubernetes/console/values.yaml         |    3 +
 package-lock.json                             |   96 +-
 .../cf-autoscaler/src/cf-autoscaler.module.ts |    2 +-
 .../autoscaler-transform-metric.ts            |    4 +-
 .../autoscaler-transform-policy.ts            |    2 +-
 .../autoscaler-helpers/autoscaler-util.ts     |    2 +-
 .../autoscaler-validation.ts                  |    4 +-
 .../autoscaler-base.component.spec.ts         |    2 +-
 .../autoscaler-metric-page.component.spec.ts  |    6 +-
 ...caler-scale-history-page.component.spec.ts |    6 +-
 ...autoscaler-tab-extension.component.spec.ts |    2 +-
 .../autoscaler-tab-extension.component.ts     |   14 +-
 ...it-autoscaler-credential.component.spec.ts |    4 +-
 .../edit-autoscaler-policy-service.ts         |    2 +-
 ...-autoscaler-policy-step1.component.spec.ts |    2 +-
 .../edit-autoscaler-policy-step1.component.ts |    2 +-
 ...-autoscaler-policy-step2.component.spec.ts |    2 +-
 ...-autoscaler-policy-step3.component.spec.ts |    2 +-
 .../edit-autoscaler-policy-step3.component.ts |    8 +-
 ...-autoscaler-policy-step4.component.spec.ts |    2 +-
 .../edit-autoscaler-policy-step4.component.ts |    6 +-
 .../edit-autoscaler-policy.component.spec.ts  |    4 +-
 ...cf-app-autoscaler-events-config.service.ts |    2 +-
 .../combo-series-vertical.component.spec.ts   |    2 +-
 ...scaler-metric-chart-list-config.service.ts |    2 +-
 .../src/actions/app-variables.actions.ts      |    4 +-
 .../actions/deploy-applications.actions.ts    |    1 +
 .../cloud-foundry/src/cf-entity-generator.ts  |   14 +-
 .../src/cloud-foundry-test.module.ts          |    2 -
 .../application-delete.component.spec.ts      |    2 +-
 .../application-wall.component.spec.ts        |    2 +-
 .../application-tabs-base.component.spec.ts   |    2 +-
 .../build-tab/build-tab.component.spec.ts     |    2 +-
 .../tabs/gitscm-tab/gitscm-tab.component.ts   |    6 +-
 .../log-stream-tab.component.ts               |   10 +-
 .../variables-tab/variables-tab.component.ts  |    8 +-
 .../cli-info-application.component.spec.ts    |    2 +-
 .../create-application.component.spec.ts      |    2 +-
 .../deploy-application-step2.component.ts     |    2 +-
 .../deploy-application.component.spec.ts      |    2 +-
 .../github-project-exists.directive.ts        |    2 -
 .../edit-application.component.spec.ts        |    2 +-
 ...ew-application-base-step.component.spec.ts |    2 +-
 .../add-route-stepper.component.spec.ts       |    2 +-
 .../ssh-application.component.spec.ts         |    2 +-
 .../add-organization.component.spec.ts        |    2 +-
 .../cf/add-quota/add-quota.component.spec.ts  |    2 +-
 .../add-space-quota.component.spec.ts         |    2 +-
 .../cf/add-space/add-space.component.spec.ts  |    5 +-
 .../src/features/cf/cf.helpers.ts             |    2 +-
 .../cli-info-cloud-foundry.component.spec.ts  |    2 +-
 .../cf/cloud-foundry-section.module.ts        |    2 -
 .../cf/cloud-foundry-section.routing.ts       |    5 -
 .../cloud-foundry-tabs-base.component.spec.ts |    2 +-
 .../cloud-foundry.component.spec.ts           |    2 +-
 .../edit-organization.component.spec.ts       |    2 +-
 .../edit-quota/edit-quota.component.spec.ts   |    2 +-
 .../edit-space-quota-step.component.ts        |    6 +-
 .../edit-space-quota.component.spec.ts        |    2 +-
 .../edit-space/edit-space.component.spec.ts   |    2 +-
 .../quota-definition.component.spec.ts        |    2 +-
 .../space-quota-definition.component.spec.ts  |    2 +-
 .../cloud-foundry-cell-base.component.spec.ts |    2 +-
 .../cloud-foundry-firehose-formatter.ts       |   13 +-
 .../cloud-foundry-firehose.component.ts       |    6 +-
 ...rganization-space-quotas.component.spec.ts |    2 +-
 ...oundry-organization-base.component.spec.ts |    2 +-
 ...ndry-organization-events.component.spec.ts |    4 +-
 ...ndry-organization-spaces.component.spec.ts |    2 +-
 ...cloud-foundry-space-base.component.spec.ts |    2 +-
 ...oud-foundry-space-events.component.spec.ts |    6 +-
 ...-space-service-instances.component.spec.ts |    3 -
 ...ud-foundry-space-summary.component.spec.ts |    2 +-
 ...loud-foundry-space-users.component.spec.ts |    2 +-
 .../cloud-foundry-space-users.component.ts    |    6 +-
 ...dry-organization-summary.component.spec.ts |    2 +-
 ...undry-organization-users.component.spec.ts |    2 +-
 ...ud-foundry-organizations.component.spec.ts |    2 +-
 .../cloud-foundry-quotas.component.spec.ts    |    2 +-
 ...loud-foundry-summary-tab.component.spec.ts |    2 +-
 .../invite-users.component.spec.ts            |    2 +-
 .../manage-users-confirm.component.ts         |   16 +-
 .../manage-users-modify.component.ts          |   14 +-
 .../manage-users.component.spec.ts            |    2 +-
 .../remove-user/remove-user.component.spec.ts |    2 +-
 .../remove-user/remove-user.component.ts      |    4 +-
 .../service-catalog-page.component.spec.ts    |    2 +-
 .../service-tabs-base.component.spec.ts       |    2 +-
 .../detach-service-instance.component.spec.ts |    2 +-
 .../services-wall.component.spec.ts           |    2 +-
 ...rvice-instance-base-step.component.spec.ts |    2 +-
 .../add-service-instance.component.spec.ts    |    2 +-
 .../create-service-instance-helper.service.ts |   16 +-
 .../card-cf-info/card-cf-info.component.ts    |    2 +-
 .../list-types/app/cf-apps-data-source.ts     |    9 +-
 .../cf-cell-health-list-config.service.ts     |    5 +-
 .../cf-cells/cf-cells-list-config.service.ts  |    2 +-
 ...cell-feature-flag-description.component.ts |    2 +-
 .../table-cell-service-broker.component.ts    |   25 +-
 .../cf-org-permission-cell.component.ts       |    6 +-
 .../list-types/cf-users/cf-permission-cell.ts |    2 +-
 .../cf-space-permission-cell.component.ts     |    8 +-
 ...hub-commits-list-config-app-tab.service.ts |    2 +-
 .../scm/github-pagination.helper.ts           |  153 +
 .../shared/data-services/scm/github-scm.ts    |   39 +-
 .../shared/data-services/scm/gitlab-scm.ts    |   61 +-
 .../app-name-unique.directive.ts              |    4 +-
 .../src/store/effects/deploy-app.effects.ts   |   24 +-
 .../src/store/effects/github.effects.ts       |    4 +-
 .../src/store/effects/request.effects.ts      |    4 +-
 .../src/store/effects/users-roles.effects.ts  |    6 +-
 .../cf-user-permissions-checkers.ts           |   28 +-
 .../user-permissions/cf-user-roles-fetch.ts   |   19 +-
 .../sass/components/json-schema-form.scss     |    5 +
 .../api-driven-views/api-drive-views.types.ts |    7 -
 .../api-driven-views-routing.module.ts        |   45 -
 .../api-driven-views.module.ts                |   28 -
 .../api-entity-list.component.html            |    1 -
 .../api-entity-list.component.scss            |    0
 .../api-entity-list.component.spec.ts         |   25 -
 .../api-entity-list.component.ts              |   15 -
 .../api-entity-type-selector.component.html   |    2 -
 .../api-entity-type-selector.component.scss   |    0
 ...api-entity-type-selector.component.spec.ts |   59 -
 .../api-entity-type-selector.component.ts     |   40 -
 .../api-endpoint-select-page.component.html   |    6 -
 .../api-endpoint-select-page.component.scss   |    0
 ...api-endpoint-select-page.component.spec.ts |   40 -
 .../api-endpoint-select-page.component.ts     |   39 -
 ...i-endpoint-type-select-page.component.html |    6 -
 ...i-endpoint-type-select-page.component.scss |    0
 ...ndpoint-type-select-page.component.spec.ts |   38 -
 ...api-endpoint-type-select-page.component.ts |   47 -
 .../api-entity-list-page.component.html       |    1 -
 .../api-entity-list-page.component.scss       |    0
 .../api-entity-list-page.component.spec.ts    |   36 -
 .../api-entity-list-page.component.ts         |   26 -
 ...api-entity-type-select-page.component.html |    4 -
 ...api-entity-type-select-page.component.scss |    0
 ...-entity-type-select-page.component.spec.ts |   38 -
 .../api-entity-type-select-page.component.ts  |   52 -
 src/frontend/packages/core/src/app.module.ts  |    4 +-
 src/frontend/packages/core/src/app.routing.ts |    7 +-
 .../src/core/apiKey-auth-guard.service.ts     |   30 +
 .../packages/core/src/core/core.module.ts     |    4 +-
 .../{ => src/core}/endpoints-health-checks.ts |    6 +-
 .../core/src/core/endpoints.service.ts        |    2 +-
 .../src/core/extension/extension-service.ts   |   14 +-
 .../core/src/core/logger.service.spec.ts      |   24 -
 .../packages/core/src/core/logger.service.ts  |   77 -
 .../current-user-permissions.service.ts       |   16 +-
 .../stratos-user-permissions.checker.ts       |   43 +-
 .../packages/core/src/core/utils.service.ts   |    9 +-
 .../core/src/environments/environment.prod.ts |    4 -
 .../core/src/environments/environment.ts      |    4 -
 .../about-page/about-page.component.spec.ts   |    8 +-
 .../diagnostics-page.component.spec.ts        |    8 +-
 .../eula-page/eula-page.component.spec.ts     |    8 +-
 .../add-api-key-dialog.component.html         |   28 +
 .../add-api-key-dialog.component.scss         |   28 +
 .../add-api-key-dialog.component.spec.ts      |   40 +
 .../add-api-key-dialog.component.ts           |   66 +
 .../api-keys-page.component.html              |   33 +
 .../api-keys-page.component.scss              |   15 +
 .../api-keys-page.component.spec.ts           |   42 +
 .../api-keys-page/api-keys-page.component.ts  |   63 +
 .../src/features/api-keys/api-keys.module.ts  |   22 +
 .../src/features/api-keys/api-keys.routing.ts |   18 +
 .../dashboard-base.component.spec.ts          |    2 +-
 .../dashboard-base.component.ts               |    6 +-
 .../page-side-nav.component.spec.ts           |    4 +-
 .../page-side-nav/page-side-nav.component.ts  |    4 +-
 .../side-nav/side-nav.component.html          |    2 +-
 .../dashboard/side-nav/side-nav.component.ts  |   23 +-
 .../backup-endpoints.component.spec.ts        |    2 +-
 .../backup-endpoints.component.ts             |    2 +-
 ...backup-restore-endpoints.component.spec.ts |    2 +-
 .../restore-endpoints.service.ts              |    4 +-
 .../restore-endpoints.component.spec.ts       |    2 +-
 .../connect-endpoint-dialog.component.spec.ts |    4 +-
 ...reate-endpoint-base-step.component.spec.ts |   23 +-
 .../create-endpoint.component.spec.ts         |    7 +-
 .../edit-endpoint.component.spec.ts           |    6 +-
 .../endpoints-page.component.html             |    2 +-
 .../endpoints-page.component.spec.ts          |    2 +-
 .../error-page/error-page.component.spec.ts   |    2 +-
 .../events-page/events-page.component.spec.ts |    8 +-
 .../home/home/home-page.component.spec.ts     |    8 +-
 .../features/home/home/home-page.component.ts |    2 -
 .../src/features/metrics/metrics.helpers.ts   |   15 +-
 .../src/features/metrics/metrics.module.ts    |   13 +-
 .../metrics/metrics/metrics.component.spec.ts |    9 +-
 .../no-endpoints-non-admin.component.spec.ts  |    8 +-
 .../local-account-wizard.component.spec.ts    |    8 +-
 .../setup-welcome.component.spec.ts           |    2 +-
 .../console-uaa-wizard.component.spec.ts      |   10 +-
 .../edit-profile-info.component.spec.ts       |    2 +-
 .../profile-info.component.spec.ts            |    9 +-
 .../packages/core/src/route-reuse-stragegy.ts |    2 +-
 .../app-action-monitor.component.ts           |    4 +-
 .../boolean-indicator.component.ts            |   44 +-
 .../copy-to-clipboard.component.ts            |    5 +-
 .../date-time/date-time.component.ts          |    9 +-
 .../favorites-meta-card.component.ts          |    9 +-
 .../table-cell/table-cell.component.spec.ts   |    4 -
 .../list/list-table/table.component.ts        |    2 +-
 .../list-types/apiKeys/apiKey-data-source.ts  |   32 +
 .../apiKeys/apiKey-list-config.service.ts     |  103 +
 .../endpoint-card/endpoint-card.component.ts  |    2 +-
 .../endpoint/endpoint-list.helpers.ts         |    4 +-
 .../shared/components/list/list.component.ts  |    2 +-
 .../components/list/list.component.types.ts   |    4 +-
 .../markdown-preview.component.spec.ts        |    3 +-
 .../markdown-preview.component.ts             |    6 +-
 .../metrics-range-selector.component.ts       |    2 +-
 .../nested-tabs/nested-tabs.component.ts      |    3 +-
 .../no-content-message.component.html         |    2 +-
 .../no-content-message.component.scss         |    5 +
 .../no-content-message.component.ts           |   19 +-
 .../page-header/page-header.component.html    |  107 +-
 .../page-header/page-header.component.spec.ts |    8 +-
 .../page-header/page-header.component.ts      |   10 +-
 .../show-page-header.component.spec.ts        |    2 +-
 .../show-page-header.component.ts             |    2 +-
 .../page-sub-nav.component.spec.ts            |    2 +-
 .../page-sub-nav/page-sub-nav.component.ts    |    4 +-
 .../recent-entities.component.ts              |   10 +-
 .../sidepanel-preview.component.spec.ts       |    3 +-
 .../start-end-date.component.spec.ts          |    2 +-
 .../start-end-date.component.ts               |    2 +-
 .../stepper/steppers/steppers.component.ts    |    4 +-
 .../src/shared/components/user-avatar/md5.ts  |    3 +-
 .../user-avatar/user-avatar.component.ts      |    3 +-
 .../user-profile-banner.component.ts          |    3 +-
 .../metrics-range-selector-manager.service.ts |    2 +-
 .../metrics-range-selector.service.ts         |   12 +-
 .../services/metrics-range-selector.types.ts  |    2 +-
 .../packages/core/src/shared/shared.module.ts |    2 +
 src/frontend/packages/core/src/styles.scss    |    1 +
 .../core/{ => src}/tab-nav.service.ts         |    6 +-
 .../packages/core/{ => src}/tab-nav.types.ts  |    0
 .../packages/core/{ => src}/xsrf.module.ts    |    0
 src/frontend/packages/core/tslint.json        |    2 +-
 src/frontend/packages/store/ng-package.json   |   16 +-
 .../src/actions/action-history.actions.ts     |    9 -
 .../store/src/actions/apiKey.actions.ts       |   44 +
 .../src/actions/internal-events.actions.ts    |    2 +-
 .../packages/store/src/actions/log.actions.ts |   60 -
 .../store/src/actions/router.actions.ts       |    4 +-
 .../store/src/actions/system.actions.ts       |   12 +-
 .../src/actions/user-favourites.actions.ts    |   12 +-
 .../packages/store/src/apiKey.types.ts        |    7 +
 src/frontend/packages/store/src/app-state.ts  |    2 -
 .../src/effects/action-history.effects.ts     |   26 -
 .../store/src/effects/apiKey.effects.ts       |  132 +
 .../store/src/effects/endpoint.effects.ts     |    4 +-
 .../action-dispatcher.spec.ts                 |   54 +-
 .../entity-catalog-entity.ts                  |   16 +
 .../entity-catalog-entity.types.ts            |   29 +-
 .../entity-catalog/entity-catalog.helper.ts   |    5 +-
 .../src/entity-catalog/entity-catalog.spec.ts |    9 +-
 .../src/entity-catalog/entity-catalog.ts      |    1 -
 .../entity-pagination-request-pipeline.ts     |    2 -
 .../packages/store/src/entity-service.ts      |   10 +-
 .../src/helpers/paginated-request-helpers.ts  |   49 +-
 .../src/helpers/stratos-entity-factory.ts     |    4 +
 .../internal-event-monitor.factory.spec.ts    |    7 +-
 .../src/monitors/internal-event.monitor.ts    |    4 +-
 src/frontend/packages/store/src/public-api.ts |   25 +-
 .../packages/store/src/reducers.module.ts     |    2 -
 .../src/reducers/action-history-reducer.ts    |   23 -
 .../api-request-reducer/fail-request.ts       |    3 +-
 .../api-request-reducer/start-request.ts      |    3 +-
 .../api-request-reducer/succeed-request.ts    |    3 +-
 .../api-request-reducer/update-request.ts     |    5 +-
 .../current-user-roles.reducer.ts             |    7 +-
 .../packages/store/src/store.module.ts        |    6 +-
 .../store/src/stratos-action-builders.ts      |   49 +-
 .../store/src/stratos-entity-catalog.ts       |    8 +
 .../store/src/stratos-entity-generator.ts     |   52 +-
 .../packages/store/src/types/auth.types.ts    |    8 +-
 src/frontend/packages/store/src/utils.ts      |    6 +
 .../packages/store/testing/ng-package.json    |    5 +-
 .../store/testing/src/store-test-helper.ts    |   33 +-
 .../store/testing/src/store-test.module.ts    |    4 +-
 .../packages/store/testing/tslint.json        |    2 +-
 .../demo-helper/demo-helper.component.spec.ts |    2 +-
 .../monocular-tab-base.component.spec.ts      |    2 +-
 .../chart-details-readme.component.ts         |    2 +-
 .../chart-item/chart-item.component.spec.ts   |    2 -
 .../monocular/charts/charts.component.spec.ts |    2 -
 .../shared/services/charts.service.ts         |    6 +-
 .../shared/services/repos.service.ts          |    6 +-
 .../analysis-report-selector.component.ts     |    8 +-
 .../kube-console.component.spec.ts            |    6 +-
 .../kubedash-configuration.component.spec.ts  |    6 +-
 .../kubernetes-dashboard.component.spec.ts    |    2 +-
 .../kubernetes/kubernetes-metrics.helpers.ts  |    3 +-
 ...amespace-analysis-report.component.spec.ts |    6 +-
 ...netes-namespace-services.component.spec.ts |    2 +-
 .../kubernetes-node.component.spec.ts         |    2 +-
 .../kubernetes-resource-viewer.component.ts   |    2 +-
 .../kubernetes-tab-base.component.spec.ts     |    2 +-
 .../kubernetes/kubernetes.testing.module.ts   |    2 +-
 .../kubernetes/kubernetes.component.spec.ts   |    2 +-
 .../analysis-reports-list-config.service.ts   |    2 +-
 .../kubernetes/list-types/kube-list.helper.ts |    2 +-
 .../kubernetes-pod-containers.component.ts    |    2 +-
 .../pod-metrics/pod-metrics.component.spec.ts |    2 +-
 .../analysis-info-card.component.ts           |    2 +-
 ...bernetes-analysis-report.component.spec.ts |    6 +-
 .../kubernetes-analysis-tab.component.spec.ts |    6 +-
 .../kubernetes-summary.component.spec.ts      |    2 +-
 .../create-release.component.spec.ts          |    4 +-
 .../helm-release-socket-service.ts            |    4 +-
 .../helm-release-tab-base.component.spec.ts   |    8 +-
 ...elm-release-analysis-tab.component.spec.ts |   19 +-
 .../helm-release-history-tab.component.ts     |    2 +-
 ...m-release-resource-graph.component.spec.ts |   10 +-
 ...helm-release-summary-tab.component.spec.ts |    2 +-
 .../helm-release-summary-tab.component.ts     |    4 +-
 .../helm-release-values-tab.component.spec.ts |    2 +-
 .../releases-tab.component.spec.ts            |    2 +-
 .../release-version-list-config.ts            |    2 +-
 src/jetstream/apikeys.go                      |   92 +
 src/jetstream/apikeys_test.go                 |  389 +++
 src/jetstream/auth_test.go                    |    4 +-
 src/jetstream/config.dev                      |    3 +
 .../datastore/20200814140918_ApiKeys.go       |   22 +
 src/jetstream/go.mod                          |    1 +
 src/jetstream/go.sum                          |    7 +
 src/jetstream/info.go                         |    1 +
 src/jetstream/main.go                         |   33 +-
 src/jetstream/middleware.go                   |  240 +-
 src/jetstream/middleware_test.go              |  378 +++
 src/jetstream/plugins/metrics/main.go         |   13 +-
 src/jetstream/plugins/metrics/main_test.go    |    3 +
 src/jetstream/portal_proxy.go                 |    2 +
 src/jetstream/repository/apikeys/apikeys.go   |   12 +
 .../repository/apikeys/mock_apikeys.go        |  107 +
 .../repository/apikeys/psql_apikeys.go        |  184 ++
 .../repository/apikeys/psql_apikeys_test.go   |  339 +++
 .../repository/interfaces/apikeys.go          |   12 +
 .../repository/interfaces/config/config.go    |   40 +-
 .../repository/interfaces/structs.go          |    9 +-
 .../repository/mock_interfaces/mock_auth.go   |  107 +
 src/test-e2e/apikeys/apikey-e2e-helper.ts     |   29 +
 src/test-e2e/apikeys/apikeys-e2e.spec.ts      |  119 +
 .../apikeys/po/apikey-add-dialog.po.ts        |   35 +
 .../apikeys/po/apikeys-list-page.po.ts        |   34 +
 .../application-autoscaler-e2e.spec.ts        |   30 +-
 .../application-deploy-local-e2e.spec.ts      |    2 +-
 .../po/application-page-autoscaler.po.ts      |   10 +-
 .../po/create-autoscaler-policy-step.po.ts    |    2 +-
 .../po/message-no-autoscaler-policy.ts        |    2 +-
 .../endpoints/endpoints-register-e2e.spec.ts  |    1 -
 src/test-e2e/helpers/request-helpers.ts       |    6 +-
 src/test-e2e/helpers/uaa-request-helpers.ts   |    2 +-
 src/test-e2e/locale.helper.ts                 |    2 +-
 src/test-e2e/po/form.po.ts                    |    1 +
 src/test-e2e/po/page-header.po.ts             |   12 +-
 src/tsconfig.json                             |    2 +
 website/README.md                             |   50 +-
 website/add-version.sh                        |   27 +
 website/build-versions.sh                     |  151 +
 website/docs/advanced/sso.md                  |   17 +-
 .../deploy/cloud-foundry/cloud-foundry.md     |    6 +-
 website/docs/developer/deploy.md              |    8 +
 .../docs/developer/developers-guide-helm.md   |   59 +
 website/docs/developer/frontend.md            |    6 +-
 website/docs/developer/introduction.md        |    4 +-
 website/docs/extensions/frontend.md           |   32 +-
 website/docs/extensions/introduction.md       |   14 +-
 website/docs/extensions/v4-migration.md       |   12 +-
 website/docs/introduction.md                  |    2 +-
 website/docs/overview.md                      |    2 +-
 website/docs/status_updates.md                |  721 -----
 website/docusaurus.config.js                  |  107 +-
 website/internal-versions.json                |    4 +
 website/package-lock.json                     | 2595 ++++++++++-------
 website/package.json                          |   13 +-
 website/sidebars.js                           |    6 +
 website/src/css/custom.css                    |   28 +-
 website/src/pages/index.js                    |   24 +-
 website/src/pages/versions.js                 |   95 +
 .../src/theme/DocVersionSuggestions/index.js  |   64 +
 .../DocVersionSuggestions/styles.module.css   |    3 +
 website/src/theme/Navbar/index.js             |  209 ++
 website/src/theme/Navbar/styles.module.css    |   26 +
 .../DocsVersionDropdownNavbarItem.js          |   81 +
 398 files changed, 7091 insertions(+), 3580 deletions(-)
 create mode 100644 .github/workflows/documentation-versioning.yml
 create mode 100644 deploy/kubernetes/console/values.schema.json
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/data-services/scm/github-pagination.helper.ts
 create mode 100644 src/frontend/packages/core/sass/components/json-schema-form.scss
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/api-drive-views.types.ts
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/api-driven-views-routing.module.ts
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/api-driven-views.module.ts
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/components/api-entity-list/api-entity-list.component.html
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/components/api-entity-list/api-entity-list.component.scss
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/components/api-entity-list/api-entity-list.component.spec.ts
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/components/api-entity-list/api-entity-list.component.ts
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/components/api-type-selector/api-entity-type-selector.component.html
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/components/api-type-selector/api-entity-type-selector.component.scss
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/components/api-type-selector/api-entity-type-selector.component.spec.ts
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/components/api-type-selector/api-entity-type-selector.component.ts
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/features/api-endpoint-select-page/api-endpoint-select-page.component.html
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/features/api-endpoint-select-page/api-endpoint-select-page.component.scss
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/features/api-endpoint-select-page/api-endpoint-select-page.component.spec.ts
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/features/api-endpoint-select-page/api-endpoint-select-page.component.ts
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.html
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.scss
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.spec.ts
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.ts
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.html
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.scss
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.spec.ts
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.ts
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/features/api-entity-type-select-page/api-entity-type-select-page.component.html
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/features/api-entity-type-select-page/api-entity-type-select-page.component.scss
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/features/api-entity-type-select-page/api-entity-type-select-page.component.spec.ts
 delete mode 100644 src/frontend/packages/core/src/api-driven-views/features/api-entity-type-select-page/api-entity-type-select-page.component.ts
 create mode 100644 src/frontend/packages/core/src/core/apiKey-auth-guard.service.ts
 rename src/frontend/packages/core/{ => src/core}/endpoints-health-checks.ts (74%)
 delete mode 100644 src/frontend/packages/core/src/core/logger.service.spec.ts
 delete mode 100644 src/frontend/packages/core/src/core/logger.service.ts
 create mode 100644 src/frontend/packages/core/src/features/api-keys/add-api-key-dialog/add-api-key-dialog.component.html
 create mode 100644 src/frontend/packages/core/src/features/api-keys/add-api-key-dialog/add-api-key-dialog.component.scss
 create mode 100644 src/frontend/packages/core/src/features/api-keys/add-api-key-dialog/add-api-key-dialog.component.spec.ts
 create mode 100644 src/frontend/packages/core/src/features/api-keys/add-api-key-dialog/add-api-key-dialog.component.ts
 create mode 100644 src/frontend/packages/core/src/features/api-keys/api-keys-page/api-keys-page.component.html
 create mode 100644 src/frontend/packages/core/src/features/api-keys/api-keys-page/api-keys-page.component.scss
 create mode 100644 src/frontend/packages/core/src/features/api-keys/api-keys-page/api-keys-page.component.spec.ts
 create mode 100644 src/frontend/packages/core/src/features/api-keys/api-keys-page/api-keys-page.component.ts
 create mode 100644 src/frontend/packages/core/src/features/api-keys/api-keys.module.ts
 create mode 100644 src/frontend/packages/core/src/features/api-keys/api-keys.routing.ts
 create mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/apiKeys/apiKey-data-source.ts
 create mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/apiKeys/apiKey-list-config.service.ts
 rename src/frontend/packages/core/{ => src}/tab-nav.service.ts (94%)
 rename src/frontend/packages/core/{ => src}/tab-nav.types.ts (100%)
 rename src/frontend/packages/core/{ => src}/xsrf.module.ts (100%)
 delete mode 100644 src/frontend/packages/store/src/actions/action-history.actions.ts
 create mode 100644 src/frontend/packages/store/src/actions/apiKey.actions.ts
 delete mode 100644 src/frontend/packages/store/src/actions/log.actions.ts
 create mode 100644 src/frontend/packages/store/src/apiKey.types.ts
 delete mode 100644 src/frontend/packages/store/src/effects/action-history.effects.ts
 create mode 100644 src/frontend/packages/store/src/effects/apiKey.effects.ts
 delete mode 100644 src/frontend/packages/store/src/reducers/action-history-reducer.ts
 create mode 100644 src/frontend/packages/store/src/utils.ts
 create mode 100644 src/jetstream/apikeys.go
 create mode 100644 src/jetstream/apikeys_test.go
 create mode 100644 src/jetstream/datastore/20200814140918_ApiKeys.go
 create mode 100644 src/jetstream/middleware_test.go
 create mode 100644 src/jetstream/repository/apikeys/apikeys.go
 create mode 100644 src/jetstream/repository/apikeys/mock_apikeys.go
 create mode 100644 src/jetstream/repository/apikeys/psql_apikeys.go
 create mode 100644 src/jetstream/repository/apikeys/psql_apikeys_test.go
 create mode 100644 src/jetstream/repository/interfaces/apikeys.go
 create mode 100644 src/jetstream/repository/mock_interfaces/mock_auth.go
 create mode 100644 src/test-e2e/apikeys/apikey-e2e-helper.ts
 create mode 100644 src/test-e2e/apikeys/apikeys-e2e.spec.ts
 create mode 100644 src/test-e2e/apikeys/po/apikey-add-dialog.po.ts
 create mode 100644 src/test-e2e/apikeys/po/apikeys-list-page.po.ts
 create mode 100755 website/add-version.sh
 create mode 100755 website/build-versions.sh
 create mode 100644 website/docs/developer/deploy.md
 create mode 100644 website/docs/developer/developers-guide-helm.md
 delete mode 100644 website/docs/status_updates.md
 create mode 100644 website/internal-versions.json
 create mode 100644 website/src/pages/versions.js
 create mode 100644 website/src/theme/DocVersionSuggestions/index.js
 create mode 100644 website/src/theme/DocVersionSuggestions/styles.module.css
 create mode 100644 website/src/theme/Navbar/index.js
 create mode 100644 website/src/theme/Navbar/styles.module.css
 create mode 100644 website/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.js

diff --git a/.github/workflows/documentation-versioning.yml b/.github/workflows/documentation-versioning.yml
new file mode 100644
index 0000000000..76eab9369b
--- /dev/null
+++ b/.github/workflows/documentation-versioning.yml
@@ -0,0 +1,40 @@
+name: documentation-versions
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  update-docs-internal-versions:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
+        with:
+          node-version: '12.x'
+      - name: Update internal-versions.json
+        run: |
+          cd website
+          if [ -e yarn.lock ]; then
+          yarn install --frozen-lockfile
+          elif [ -e package-lock.json ]; then
+          npm ci
+          else
+          npm i
+          fi
+          npm run add-version
+      - name: Create Pull Request
+        id: cpr
+        uses: peter-evans/create-pull-request@v3.3.0
+        with:
+          commit-message: Update Docs Versions
+          delete-branch: true
+          title: Update website docs version following release
+          body: |
+            - Auto-generated
+          labels: |
+            ready for review
+          draft: false
+      - name: Check output
+        run: |
+          echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 4b78eefdc3..a705479e7a 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -25,4 +25,4 @@ jobs:
           else
           npm i
           fi
-          npm run build
\ No newline at end of file
+          npm run build
diff --git a/.gitignore b/.gitignore
index ac5cbdb218..eb452d4518 100644
--- a/.gitignore
+++ b/.gitignore
@@ -127,3 +127,7 @@ go-vendor-*.tgz
 website/build
 website/site-dist
 website/.docusaurus
+website/versioned_docs
+website/versioned_sidebars
+website/versions.json
+website/versions-repo
diff --git a/README.md b/README.md
index 528627e08f..2c4ca4c6b3 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Please visit our new [documentation site](https://stratos.app/). There you can d
 1. Guides for [developers](https://stratos.app/docs/developer/introduction).
 1. How to [extend](https://stratos.app/docs/extensions/introduction) Stratos [functionality](https://stratos.app/docs/extensions/frontend) and apply a custom [theme](https://stratos.app/docs/extensions/theming).
 
-> For more SUSE specific information, specifically regarding Stratos Kubernetes and Helm functionality, please see our `/docs` folder.
+> For more SUSE specific information, for example regarding Stratos Kubernetes and Helm functionality, please see our `/docs` folder.
 
 ## Acknowledgements
 
diff --git a/angular.json b/angular.json
index 79b33bcd31..18d9daa972 100644
--- a/angular.json
+++ b/angular.json
@@ -192,11 +192,7 @@
             ],
             "tslintConfig": "src/frontend/packages/core/tslint.json",
             "files": [
-              "src/frontend/packages/core/src/**/*.ts",
-              "src/frontend/packages/core/src/custom/**/*.ts"
-            ],
-            "exclude": [
-              "!src/frontend/packages/core/**"
+              "src/frontend/packages/core/src/**/*.ts"
             ]
           }
         }
@@ -237,9 +233,6 @@
             "tslintConfig": "src/frontend/packages/store/tslint.json",
             "files": [
               "src/frontend/packages/store/src/**/*.ts"
-            ],
-            "exclude": [
-              "!src/frontend/packages/store/**"
             ]
           }
         }
@@ -311,9 +304,6 @@
             "tslintConfig": "src/frontend/packages/cloud-foundry/tslint.json",
             "files": [
               "src/frontend/packages/cloud-foundry/src/**/*.ts"
-            ],
-            "exclude": [
-              "!src/frontend/packages/cloud-foundry/**"
             ]
           }
         }
@@ -354,9 +344,6 @@
             "tslintConfig": "src/frontend/packages/cf-autoscaler/tslint.json",
             "files": [
               "src/frontend/packages/cf-autoscaler/src/**/*.ts"
-            ],
-            "exclude": [
-              "!src/frontend/packages/cf-autoscaler/**"
             ]
           }
         }
diff --git a/deploy/kubernetes/console/README.md b/deploy/kubernetes/console/README.md
index ef228ed1d7..ee238aa880 100644
--- a/deploy/kubernetes/console/README.md
+++ b/deploy/kubernetes/console/README.md
@@ -75,6 +75,7 @@ The following table lists the configurable parameters of the Stratos Helm chart
 |console.templatesConfigMapName|Name of config map that provides the template files for user invitation emails||
 |console.userInviteSubject|Email subject of the user invitation message||
 |console.techPreview|Enable/disable Tech Preview features|false|
+|console.apiKeysEnabled|Enable/disable API key-based access to Stratos API (disabled, admin_only, all_users)|admin_only|
 |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||
 |console.ui.listAllowLoadMaxed|If the maximum list size is met give the user the option to fetch all results|false|
 |console.localAdminPassword|Use local admin user instead of UAA - set to a password to enable||
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 50d94a2c5d..40280e1ba8 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -282,6 +282,8 @@ spec:
           value: {{ default "" .Values.console.userInviteSubject | quote }}
         - name: ENABLE_TECH_PREVIEW
           value: {{ default "false" .Values.console.techPreview | quote }}
+        - name: API_KEYS_ENABLED
+          value: {{ default "admin_only" .Values.console.apiKeysEnabled | quote }}
         - name: HELM_CACHE_FOLDER
           value: /helm-cache
         {{- if .Values.console.ui }}
diff --git a/deploy/kubernetes/console/values.schema.json b/deploy/kubernetes/console/values.schema.json
new file mode 100644
index 0000000000..34651e77ae
--- /dev/null
+++ b/deploy/kubernetes/console/values.schema.json
@@ -0,0 +1,373 @@
+{
+    "$schema": "http://json-schema.org/schema#",
+    "type": "object",
+    "properties": {
+        "autoCleanup": {
+            "type": "boolean"
+        },
+        "configInit": {
+            "type": "object",
+            "properties": {
+                "nodeSelector": {
+                    "type": "object"
+                }
+            }
+        },
+        "console": {
+            "type": "object",
+            "properties": {
+                "apiKeysEnabled": {
+                    "type": "string",
+                    "enum": ["disabled", "admin_only", "all_users"]
+                },
+                "autoRegisterCF": {
+                    "type": ["string", "null"]
+                },
+                "backendLogLevel": {
+                    "type": "string"
+                },
+                "cookieDomain": {
+                    "type": ["string", "null"]
+                },
+                "deploymentAnnotations": {
+                    "type": "object"
+                },
+                "deploymentExtraLabels": {
+                    "type": "object"
+                },
+                "jobAnnotations": {
+                    "type": "object"
+                },
+                "jobExtraLabels": {
+                    "type": "object"
+                },
+                "localAdminPassword": {
+                    "type": ["string", "null"]
+                },
+                "nodeSelector": {
+                    "type": "object"
+                },
+                "podAnnotations": {
+                    "type": "object"
+                },
+                "podExtraLabels": {
+                    "type": "object"
+                },
+                "service": {
+                    "type": "object",
+                    "properties": {
+                        "annotations": {
+                            "type": "object"
+                        },
+                        "externalIPs": {
+                            "type": "array"
+                        },
+                        "externalName": {
+                            "type": ["string", "null"]
+                        },
+                        "extraLabels": {
+                            "type": "object"
+                        },
+                        "http": {
+                            "type": "object",
+                            "properties": {
+                                "enabled": {
+                                    "type": "boolean"
+                                },
+                                "servicePort": {
+                                    "type": "integer"
+                                }
+                            }
+                        },
+                        "ingress": {
+                            "type": "object",
+                            "properties": {
+                                "annotations": {
+                                    "type": "object"
+                                },
+                                "enabled": {
+                                    "type": "boolean"
+                                },
+                                "extraLabels": {
+                                    "type": "object"
+                                },
+                                "host": {
+                                    "type": ["string", "null"]
+                                },
+                                "secretName": {
+                                    "type": ["string", "null"]
+                                },
+                                "tls": {
+                                    "type": "object",
+                                    "properties": {
+                                        "crt": {
+                                            "type": ["string", "null"]
+                                        },
+                                        "key": {
+                                            "type": ["string", "null"]
+                                        }
+                                    }
+                                }
+                            }
+                        },
+                        "loadBalancerIP": {
+                            "type": ["string", "null"]
+                        },
+                        "loadBalancerSourceRanges": {
+                            "type": "array"
+                        },
+                        "servicePort": {
+                            "type": "integer"
+                        },
+                        "type": {
+                            "type": "string"
+                        }
+                    }
+                },
+                "sessionStoreSecret": {
+                    "type": ["string", "null"]
+                },
+                "sslCiphers": {
+                    "type": ["string", "null"]
+                },
+                "sslProtocols": {
+                    "type": ["string", "null"]
+                },
+                "ssoLogin": {
+                    "type": "boolean"
+                },
+                "ssoOptions": {
+                    "type": ["string", "null"]
+                },
+                "statefulSetAnnotations": {
+                    "type": "object"
+                },
+                "statefulSetExtraLabels": {
+                    "type": "object"
+                },
+                "techPreview": {
+                    "type": "boolean"
+                },
+                "templatesConfigMapName": {
+                    "type": ["string", "null"]
+                },
+                "tlsSecretName": {
+                    "type": ["string", "null"]
+                },
+                "ui": {
+                    "type": "object",
+                    "properties": {
+                        "listAllowLoadMaxed": {
+                            "type": "boolean"
+                        },
+                        "listMaxSize": {
+                            "type": ["integer", "null"]
+                        }
+                    }
+                },
+                "userInviteSubject": {
+                    "type": ["string", "null"]
+                }
+            }
+        },
+        "consoleVersion": {
+            "type": "string"
+        },
+        "dockerRegistrySecret": {
+            "type": "string"
+        },
+        "env": {
+            "type": "object",
+            "properties": {
+                "DOMAIN": {
+                    "type": ["string", "null"]
+                },
+                "SMTP_AUTH": {
+                    "type": "string"
+                },
+                "SMTP_FROM_ADDRESS": {
+                    "type": ["string", "null"]
+                },
+                "SMTP_HOST": {
+                    "type": ["string", "null"]
+                },
+                "SMTP_PASSWORD": {
+                    "type": ["string", "null"]
+                },
+                "SMTP_PORT": {
+                    "type": "string"
+                },
+                "SMTP_USER": {
+                    "type": ["string", "null"]
+                },
+                "UAA_HOST": {
+                    "type": ["string", "null"]
+                },
+                "UAA_PORT": {
+                    "type": "integer"
+                },
+                "UAA_ZONE": {
+                    "type": "string"
+                }
+            }
+        },
+        "imagePullPolicy": {
+            "type": "string"
+        },
+        "images": {
+            "type": "object",
+            "properties": {
+                "configInit": {
+                    "type": "string"
+                },
+                "console": {
+                    "type": "string"
+                },
+                "mariadb": {
+                    "type": "string"
+                },
+                "proxy": {
+                    "type": "string"
+                }
+            }
+        },
+        "kube": {
+            "type": "object",
+            "properties": {
+                "auth": {
+                    "type": "string"
+                },
+                "external_console_https_port": {
+                    "type": "integer"
+                },
+                "organization": {
+                    "type": "string"
+                },
+                "registry": {
+                    "type": "object",
+                    "properties": {
+                        "email": {
+                            "type": "string"
+                        },
+                        "hostname": {
+                            "type": ["string", "null"]
+                        },
+                        "password": {
+                            "type": ["string", "null"]
+                        },
+                        "username": {
+                            "type": ["string", "null"]
+                        }
+                    }
+                },
+                "storage_class": {
+                    "type": "object",
+                    "properties": {
+                        "persistent": {
+                            "type": ["string", "null"]
+                        }
+                    }
+                }
+            }
+        },
+        "mariadb": {
+            "type": "object",
+            "properties": {
+                "database": {
+                    "type": "string"
+                },
+                "external": {
+                    "type": "boolean"
+                },
+                "host": {
+                    "type": ["string", "null"]
+                },
+                "nodeSelector": {
+                    "type": "object"
+                },
+                "persistence": {
+                    "type": "object",
+                    "properties": {
+                        "accessMode": {
+                            "type": "string"
+                        },
+                        "enabled": {
+                            "type": "boolean"
+                        },
+                        "size": {
+                            "type": "string"
+                        },
+                        "storageClass": {
+                            "type": ["string", "null"]
+                        }
+                    }
+                },
+                "port": {
+                    "type": "null"
+                },
+                "resources": {
+                    "type": "object",
+                    "properties": {
+                        "requests": {
+                            "type": "object",
+                            "properties": {
+                                "cpu": {
+                                    "type": "string"
+                                },
+                                "memory": {
+                                    "type": "string"
+                                }
+                            }
+                        }
+                    }
+                },
+                "rootPassword": {
+                    "type": ["string", "null"]
+                },
+                "tls": {
+                    "type": ["string", "null"]
+                },
+                "type": {
+                    "type": ["string", "null"]
+                },
+                "user": {
+                    "type": "string"
+                },
+                "userPassword": {
+                    "type": ["string", "null"]
+                }
+            }
+        },
+        "services": {
+            "type": "object",
+            "properties": {
+                "loadbalanced": {
+                    "type": "boolean"
+                }
+            }
+        },
+        "uaa": {
+            "type": "object",
+            "properties": {
+                "consoleAdminIdentifier": {
+                    "type": ["string", "null"]
+                },
+                "consoleClient": {
+                    "type": ["string", "null"]
+                },
+                "consoleClientSecret": {
+                    "type": ["string", "null"]
+                },
+                "endpoint": {
+                    "type": ["string", "null"]
+                },
+                "skipSSLValidation": {
+                    "type": "boolean"
+                }
+            }
+        },
+        "useLb": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index 3e72d57812..e9999e9d35 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -67,6 +67,9 @@ console:
   # Enable/disable Tech Preview
   techPreview: false
 
+  # Enable/disable API key-based access to Stratos API
+  apiKeysEnabled: admin_only
+
   ui:
     # Override the default maximum number of entities that a configured list can fetch. When a list meets this amount additional pages are not fetched 
     listMaxSize:
diff --git a/package-lock.json b/package-lock.json
index 77791d470f..6ae8d5b767 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -986,6 +986,12 @@
         "@babel/types": "^7.10.4"
       },
       "dependencies": {
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+          "dev": true
+        },
         "@babel/types": {
           "version": "7.11.5",
           "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
@@ -1009,6 +1015,12 @@
         "@babel/types": "^7.10.4"
       },
       "dependencies": {
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+          "dev": true
+        },
         "@babel/types": {
           "version": "7.11.5",
           "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
@@ -1086,6 +1098,12 @@
             "@babel/types": "^7.10.4"
           }
         },
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+          "dev": true
+        },
         "@babel/highlight": {
           "version": "7.10.4",
           "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
@@ -1136,6 +1154,12 @@
         "@babel/types": "^7.10.4"
       },
       "dependencies": {
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+          "dev": true
+        },
         "@babel/types": {
           "version": "7.11.5",
           "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
@@ -1178,6 +1202,12 @@
         "@babel/types": "^7.10.4"
       },
       "dependencies": {
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+          "dev": true
+        },
         "@babel/types": {
           "version": "7.11.5",
           "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
@@ -1391,6 +1421,12 @@
             "@babel/highlight": "^7.10.4"
           }
         },
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+          "dev": true
+        },
         "@babel/highlight": {
           "version": "7.10.4",
           "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
@@ -1648,6 +1684,12 @@
         "@babel/types": "^7.11.0"
       },
       "dependencies": {
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+          "dev": true
+        },
         "@babel/types": {
           "version": "7.11.5",
           "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
@@ -1737,6 +1779,12 @@
             "@babel/types": "^7.11.0"
           }
         },
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+          "dev": true
+        },
         "@babel/highlight": {
           "version": "7.10.4",
           "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
@@ -2178,6 +2226,12 @@
             "@babel/types": "^7.10.4"
           }
         },
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+          "dev": true
+        },
         "@babel/types": {
           "version": "7.11.5",
           "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
@@ -2304,6 +2358,12 @@
             "@babel/types": "^7.11.0"
           }
         },
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+          "dev": true
+        },
         "@babel/highlight": {
           "version": "7.10.4",
           "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
@@ -2472,6 +2532,12 @@
             "@babel/types": "^7.10.4"
           }
         },
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+          "dev": true
+        },
         "@babel/highlight": {
           "version": "7.10.4",
           "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
@@ -2655,6 +2721,12 @@
             "@babel/types": "^7.11.0"
           }
         },
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+          "dev": true
+        },
         "@babel/highlight": {
           "version": "7.10.4",
           "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
@@ -2853,6 +2925,12 @@
             "@babel/types": "^7.11.0"
           }
         },
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+          "dev": true
+        },
         "@babel/highlight": {
           "version": "7.10.4",
           "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
@@ -3051,6 +3129,12 @@
             "@babel/types": "^7.11.0"
           }
         },
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+          "dev": true
+        },
         "@babel/highlight": {
           "version": "7.10.4",
           "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
@@ -3820,18 +3904,18 @@
       }
     },
     "@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==",
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@cfstratos/ajsf-core/-/ajsf-core-0.1.6.tgz",
+      "integrity": "sha512-G47ZAvn7ynuUkB2XzeewxhDB9yB5EYcBWfmBYB6FeEkFzX9PpcaCm8QK72IO6Kis+HjAvO5kwqiud9TXUPhMNw==",
       "requires": {
         "ajv": "^6.10.0",
         "lodash-es": "^4.17.15"
       }
     },
     "@cfstratos/ajsf-material": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@cfstratos/ajsf-material/-/ajsf-material-0.1.5.tgz",
-      "integrity": "sha512-e0BSgFho4D4H76YhRBt9xg5zGuoJlcuMs7eWdSABZhW7LKHKKpLWqoGHo6qX4Q3rFTADxXiljKk86FjrMaYfrQ==",
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@cfstratos/ajsf-material/-/ajsf-material-0.1.6.tgz",
+      "integrity": "sha512-dUV2aqwQoRCaedNh31ZVZUgDhWqdiJnikag/Nws5h4fFs6sdmL2sS8A18e6onLA8t9t4n0y8PEib6qgxqr3ezw==",
       "requires": {
         "@cfstratos/ajsf-core": "~0.1.5",
         "lodash-es": "^4.17.15"
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 95b411929b..6474fd5e56 100644
--- a/src/frontend/packages/cf-autoscaler/src/cf-autoscaler.module.ts
+++ b/src/frontend/packages/cf-autoscaler/src/cf-autoscaler.module.ts
@@ -1,10 +1,10 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
-import { ExtensionService } from 'frontend/packages/core/src/core/extension/extension-service';
 
 import { CloudFoundrySharedModule } from '../../cloud-foundry/src/shared/cf-shared.module';
 import { CoreModule } from '../../core/src/core/core.module';
+import { ExtensionService } from '../../core/src/core/extension/extension-service';
 import { MDAppModule } from '../../core/src/core/md.module';
 import { SharedModule } from '../../core/src/shared/shared.module';
 import { AutoscalerTabExtensionComponent } from './features/autoscaler-tab-extension/autoscaler-tab-extension.component';
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 899e687833..3e535655bb 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
@@ -1,5 +1,6 @@
-import * as moment from 'moment-timezone';
+import moment from 'moment-timezone';
 
+import { PaginationResponse } from '../../../../cloud-foundry/src/store/types/cf-api.types';
 import {
   AppAutoscalerMetricBasicInfo,
   AppAutoscalerMetricData,
@@ -10,7 +11,6 @@ import {
   AppScalingTrigger,
 } from '../../store/app-autoscaler.types';
 import { AutoscalerConstants, getScaleType } from './autoscaler-util';
-import { PaginationResponse } from '../../../../cloud-foundry/src/store/types/cf-api.types';
 
 function initMetricData(metricName: string): AppAutoscalerMetricDataLocal {
   return {
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 5e11d7642b..b00b5ce017 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
@@ -1,4 +1,4 @@
-import * as moment from 'moment-timezone';
+import moment from 'moment-timezone';
 
 import {
   AppAutoscalerPolicy,
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 9e73dfed78..cff3e9856b 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
@@ -1,4 +1,4 @@
-import * as moment from 'moment-timezone';
+import moment from 'moment-timezone';
 
 import {
   AppAutoscalerMetricDataPoint,
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 22410741c5..b9300612c4 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
@@ -1,5 +1,5 @@
-import * as intersect from 'intersect';
-import * as moment from 'moment-timezone';
+import intersect from 'intersect';
+import moment from 'moment-timezone';
 
 import { AppRecurringSchedule, AppScalingRule, AppSpecificDate } from '../../store/app-autoscaler.types';
 import { AutoscalerConstants } from './autoscaler-util';
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 5afb7cda0e..29293ef982 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
@@ -8,7 +8,7 @@ import { ApplicationService } from '../../../cloud-foundry/src/features/applicat
 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 { TabNavService } from '../../../core/src/tab-nav.service';
 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 22140a5cdf..a6b358f4d1 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
@@ -7,8 +7,9 @@ import { createEmptyStoreModule } from '@stratosui/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 { CurrentUserPermissionsService } from '../../../../core/src/core/permissions/current-user-permissions.service';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
-import { TabNavService } from '../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../core/src/tab-nav.service';
 import { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module';
 import { AutoscalerMetricPageComponent } from './autoscaler-metric-page.component';
 
@@ -30,7 +31,8 @@ describe('AutoscalerMetricPageComponent', () => {
       providers: [
         DatePipe,
         { provide: ApplicationService, useClass: ApplicationServiceMock },
-        TabNavService
+        TabNavService,
+        CurrentUserPermissionsService
       ]
     })
       .compileComponents();
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 78e8a572a4..477a22f4fa 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
@@ -7,8 +7,9 @@ import { createEmptyStoreModule } from '@stratosui/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 { CurrentUserPermissionsService } from '../../../../core/src/core/permissions/current-user-permissions.service';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
-import { TabNavService } from '../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../core/src/tab-nav.service';
 import { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module';
 import { AutoscalerScaleHistoryPageComponent } from './autoscaler-scale-history-page.component';
 
@@ -30,7 +31,8 @@ describe('AutoscalerScaleHistoryPageComponent', () => {
       providers: [
         DatePipe,
         { provide: ApplicationService, useClass: ApplicationServiceMock },
-        TabNavService
+        TabNavService,
+        CurrentUserPermissionsService
       ]
     })
       .compileComponents();
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 b96d66bdb5..43f27e5b57 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
@@ -21,7 +21,7 @@ import {
 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 { TabNavService } from '../../../../core/src/tab-nav.service';
 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/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 9b3b56c9b2..a71a1e76e1 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
@@ -71,7 +71,7 @@ import { appAutoscalerAppMetricEntityType, autoscalerEntityFactory } from '../..
         createEntityRelationKey(spaceEntityType, organizationEntityType),
       ],
       populateMissing: true
-    })
+    });
 
     const canEditApp$ = appEntService.waitForEntity$.pipe(
       switchMap(app => cups.can(
@@ -80,14 +80,14 @@ import { appAutoscalerAppMetricEntityType, autoscalerEntityFactory } from '../..
         app.entity.entity.space.entity.organization_guid,
         app.entity.entity.space.metadata.guid
       )),
-    )
+    );
 
     const autoscalerEnabled = isAutoscalerEnabled(endpointGuid, esf);
 
     return canEditApp$.pipe(
       switchMap(canEditSpace => canEditSpace ? autoscalerEnabled : of(false)),
       map(can => !can)
-    )
+    );
   }
 })
 @Component({
@@ -179,9 +179,9 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
         if (buildParts.length < 0) {
           return false;
         }
-        return Number.parseInt(buildParts[0]) >= 3
+        return Number.parseInt(buildParts[0], 10) >= 3;
       })
-    )
+    );
 
     this.appAutoscalerPolicyService = this.entityServiceFactory.create(
       this.applicationService.appGuid,
@@ -360,7 +360,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
       ],
       query
     }));
-  }
+  };
 
   metricChartPage() {
     this.store.dispatch(new RouterNav({
@@ -402,6 +402,6 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
         'edit-autoscaler-credential'
       ]
     }));
-  }
+  };
 
 }
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 131139620e..847513f52e 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
@@ -6,8 +6,9 @@ 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 { CurrentUserPermissionsService } from '../../../../core/src/core/permissions/current-user-permissions.service';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
-import { TabNavService } from '../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../core/src/tab-nav.service';
 import { createBasicStoreModule } from '../../../../store/testing/public-api';
 import { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module';
 import { EditAutoscalerCredentialComponent } from './edit-autoscaler-credential.component';
@@ -33,6 +34,7 @@ describe('EditAutoscalerCredentialComponent', () => {
         DatePipe,
         { provide: ApplicationService, useClass: ApplicationServiceMock },
         TabNavService,
+        CurrentUserPermissionsService
       ]
     })
       .compileComponents();
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.ts
index fc6f92c265..a49603e247 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import * as moment from 'moment-timezone';
+import moment from 'moment-timezone';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { filter, first } from 'rxjs/operators';
 
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 02095792e5..5dd121d938 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
@@ -8,7 +8,7 @@ import { ApplicationService } from '../../../../../cloud-foundry/src/features/ap
 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 { TabNavService } from '../../../../../core/src/tab-nav.service';
 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-step1/edit-autoscaler-policy-step1.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts
index dc3be58839..1ff96089b9 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators } from '@angular/forms';
 import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material/core';
 import { ActivatedRoute } from '@angular/router';
-import * as moment from 'moment-timezone';
+import moment from 'moment-timezone';
 import { of as observableOf } from 'rxjs';
 import { map } from 'rxjs/operators';
 
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 05552c2692..809b56d90d 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
@@ -8,7 +8,7 @@ import { ApplicationService } from '../../../../../cloud-foundry/src/features/ap
 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 { TabNavService } from '../../../../../core/src/tab-nav.service';
 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 01d38f4030..c154204509 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
@@ -8,7 +8,7 @@ import { ApplicationService } from '../../../../../cloud-foundry/src/features/ap
 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 { TabNavService } from '../../../../../core/src/tab-nav.service';
 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-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 542688df0a..a8d47f628b 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
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators } from '@angular/forms';
 import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material/core';
 import { ActivatedRoute } from '@angular/router';
-import * as moment from 'moment-timezone';
+import moment from 'moment-timezone';
 
 import { ApplicationService } from '../../../../../cloud-foundry/src/features/applications/application.service';
 import { AutoscalerConstants, PolicyAlert, shiftArray } from '../../../core/autoscaler-helpers/autoscaler-util';
@@ -12,11 +12,7 @@ import {
   recurringSchedulesOverlapping,
   timeIsSameOrAfter,
 } from '../../../core/autoscaler-helpers/autoscaler-validation';
-import {
-  AppAutoscalerInvalidPolicyError,
-  AppAutoscalerPolicy,
-  AppAutoscalerPolicyLocal,
-} from '../../../store/app-autoscaler.types';
+import { AppAutoscalerInvalidPolicyError, AppAutoscalerPolicyLocal } from '../../../store/app-autoscaler.types';
 import { EditAutoscalerPolicy } from '../edit-autoscaler-policy-base-step';
 import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service';
 import {
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 a2f2dab563..4c5e3f48fc 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
@@ -8,7 +8,7 @@ import { ApplicationService } from '../../../../../cloud-foundry/src/features/ap
 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 { TabNavService } from '../../../../../core/src/tab-nav.service';
 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-step4/edit-autoscaler-policy-step4.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts
index 78198371b8..3050f2caad 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts
@@ -3,15 +3,15 @@ import { AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators } from
 import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material/core';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
-import * as moment from 'moment-timezone';
+import moment from 'moment-timezone';
 import { of as observableOf } from 'rxjs';
 import { filter, first, map, pairwise } from 'rxjs/operators';
 
 import { ApplicationService } from '../../../../../cloud-foundry/src/features/applications/application.service';
-import { EntityService } from '../../../../../store/src/entity-service';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { StepOnNextFunction } from '../../../../../core/src/shared/components/stepper/step/step.component';
 import { AppState } from '../../../../../store/src/app-state';
+import { EntityService } from '../../../../../store/src/entity-service';
+import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { RequestInfoState } from '../../../../../store/src/reducers/api-request-reducer/types';
 import { AutoscalerConstants, PolicyAlert } from '../../../core/autoscaler-helpers/autoscaler-util';
 import {
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 9be13c7f96..bfab3dab44 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
@@ -7,8 +7,9 @@ import { createEmptyStoreModule } from '@stratosui/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 { CurrentUserPermissionsService } from '../../../../core/src/core/permissions/current-user-permissions.service';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
-import { TabNavService } from '../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../core/src/tab-nav.service';
 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';
@@ -43,6 +44,7 @@ describe('EditAutoscalerPolicyComponent', () => {
         { provide: ApplicationService, useClass: ApplicationServiceMock },
         TabNavService,
         EditAutoscalerPolicyService,
+        CurrentUserPermissionsService
       ]
     })
       .compileComponents();
diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts
index 8732d20bfb..80a55eeb41 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts
+++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts
@@ -1,7 +1,7 @@
 import { DatePipe } from '@angular/common';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
-import * as moment from 'moment';
+import moment from 'moment';
 
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import { ApplicationService } from '../../../../../cloud-foundry/src/features/applications/application.service';
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 367ee3f0d1..4c3f7879ac 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
@@ -9,7 +9,7 @@ import { ApplicationService } from '../../../../../../../cloud-foundry/src/featu
 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 { TabNavService } from '../../../../../../../core/src/tab-nav.service';
 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.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts
index a5c3fd8aef..7d425f7bbe 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts
+++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
-import * as moment from 'moment';
+import moment from 'moment';
 
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import { ApplicationService } from '../../../../../cloud-foundry/src/features/applications/application.service';
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 8a9f974710..fc38618e9a 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
@@ -11,9 +11,10 @@ export class AppVariablesUpdate implements Action {
 
   type = AppVariables.UPDATE;
   updatedApplication: UpdateApplication;
+  guid: string;
 
   constructor(public cfGuid: string, public appGuid: string) {
-    this.guid = 'n/a' // No such thing as an individual app variable guid
+    this.guid = 'n/a'; // No such thing as an individual app variable guid
   }
 
   protected createUpdateApplication(allEnvVars: ListAppEnvVar[], selectedItems: ListAppEnvVar[]): UpdateApplication {
@@ -28,7 +29,6 @@ export class AppVariablesUpdate implements Action {
     }
     return updateApp;
   }
-  guid: string;
 }
 
 export class AppVariablesDelete extends AppVariablesUpdate {
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 9604b767da..17c35c2e7f 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
@@ -86,6 +86,7 @@ export class FetchBranchesForProject implements PaginatedAction {
   type = FETCH_BRANCHES_FOR_PROJECT;
   entityType = gitBranchesEntityType;
   paginationKey: string;
+  flattenPagination = true;
 
   static createPaginationKey = (scm: GitSCM, projectName: string) => scm.getType() + ':' + projectName;
 }
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 07b5489a05..20e226cbd5 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
@@ -1,5 +1,5 @@
 import { Action, Store } from '@ngrx/store';
-import * as moment from 'moment';
+import moment from 'moment';
 import { combineLatest, Observable, of } from 'rxjs';
 import { first, map } from 'rxjs/operators';
 
@@ -299,14 +299,14 @@ export function generateCFEntities(): StratosBaseCatalogEntity[] {
     },
     entitiesEmitHandler: (action: PaginatedAction | PaginatedAction[], dispatcher: ActionDispatcher) => {
       let lastValidationFootprint: string;
-      const arrayAction = Array.isArray(action) ? action : [action];
+      const actionsArray = 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]
+          actionsArray.forEach(actionFromArray => dispatcher(new CfValidateEntitiesStart(
+            actionFromArray,
+            state.ids[actionFromArray.__forcedPageNumber__ || state.currentPage]
           )));
         }
       };
@@ -314,7 +314,7 @@ 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)));
+      ).subscribe(newActions => newActions.forEach(newAction => store.dispatch(newAction)));
     },
     paginationConfig: {
       getEntitiesFromResponse: (response: CFResponse) => response.resources,
@@ -1231,7 +1231,7 @@ function generateCfOrgEntity(endpointDefinition: StratosEndpointExtensionDefinit
     labelPlural: 'Organizations',
     endpoint: endpointDefinition,
     icon: 'organization',
-    iconFont: 'stratos-icons'    
+    iconFont: 'stratos-icons'
   };
   cfEntityCatalog.org = new StratosCatalogEntity<
     IOrgFavMetadata,
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 2bc284c36c..3df3235a19 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,7 +4,6 @@ import { EffectsModule } from '@ngrx/effects';
 
 import { generateASEntities } from '../../cf-autoscaler/src/store/autoscaler-entity-generator';
 import { getGitHubAPIURL, GITHUB_API_URL } from '../../core/src/core/github.helpers';
-import { LoggerService } from '../../core/src/core/logger.service';
 import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../store/src/entity-catalog.module';
 import { entityCatalog, TestEntityCatalog } from '../../store/src/entity-catalog/entity-catalog';
 import { generateStratosEntities } from '../../store/src/stratos-entity-generator';
@@ -42,7 +41,6 @@ import { CloudFoundryStoreModule } from './store/cloud-foundry.store.module';
   providers: [
     { provide: GITHUB_API_URL, useFactory: getGitHubAPIURL },
     GitSCMService,
-    LoggerService,
     LongRunningCfOperationsService,
     CfUserService,
     {
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 52aa6ff434..8137d582fc 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
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { generateTestApplicationServiceProvider } from '../../../../test-framework/application-service-helper';
 import { generateCfBaseTestModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ApplicationsModule } from '../applications.module';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-wall/application-wall.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application-wall/application-wall.component.spec.ts
index e92a929b87..e7060da064 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application-wall/application-wall.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-wall/application-wall.component.spec.ts
@@ -1,7 +1,7 @@
 import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { generateCfBaseTestModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { CfEndpointsMissingComponent } from '../../../shared/components/cf-endpoints-missing/cf-endpoints-missing.component';
 import { CloudFoundryService } from '../../../shared/data-services/cloud-foundry.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 19c49370d4..db27792fcc 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
@@ -9,7 +9,7 @@ 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 { SharedModule } from '../../../../../../core/src/shared/shared.module';
-import { TabNavService } from '../../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../../core/src/tab-nav.service';
 import { generateTestApplicationServiceProvider } from '../../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 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 58a38edbe5..6f3aa1d408 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
@@ -8,7 +8,7 @@ import { CoreModule } from '../../../../../../../../core/src/core/core.module';
 import { GITHUB_API_URL } from '../../../../../../../../core/src/core/github.helpers';
 import { APP_GUID, CF_GUID } from '../../../../../../../../core/src/shared/entity.tokens';
 import { SharedModule } from '../../../../../../../../core/src/shared/shared.module';
-import { TabNavService } from '../../../../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../../../../core/src/tab-nav.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';
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 528965f3c9..32d2c03c3e 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
@@ -81,16 +81,16 @@ export class GitSCMTabComponent implements OnInit, OnDestroy {
         const scm = this.scmService.getSCM(scmType as GitSCMType);
 
         const gitRepInfoMeta: GitMeta = { projectName: stProject.deploySource.project, scm };
-        this.gitSCMRepoEntityService = cfEntityCatalog.gitRepo.store.getRepoInfo.getEntityService(gitRepInfoMeta)
+        this.gitSCMRepoEntityService = cfEntityCatalog.gitRepo.store.getRepoInfo.getEntityService(gitRepInfoMeta);
 
         const gitMeta: GitMeta = { projectName: stProject.deploySource.project, scm, commitSha };
         const repoEntityID = `${scmType}-${projectName}`;
         const commitEntityID = `${repoEntityID}-${commitSha}`; // FIXME: Should come from action #4245
-        this.gitCommitEntityService = cfEntityCatalog.gitCommit.store.getEntityService(commitEntityID, null, gitMeta)
+        this.gitCommitEntityService = cfEntityCatalog.gitCommit.store.getEntityService(commitEntityID, null, gitMeta);
 
         this.gitBranchEntityService = cfEntityCatalog.gitBranch.store.getEntityService(undefined, undefined, {
           scm,
-          projectName: projectName,
+          projectName,
           branchName: stProject.deploySource.branch
         });
 
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 e4226d87c0..cc4a4f4bd7 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
@@ -1,13 +1,12 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { NgModel } from '@angular/forms';
 import { Store } from '@ngrx/store';
-import * as moment from 'moment';
+import moment from 'moment';
 import { NEVER, Observable, Subject } from 'rxjs';
 import makeWebSocketObservable, { GetWebSocketResponses } from 'rxjs-websockets';
-import { catchError, share, switchMap, map, first, startWith, debounceTime } from 'rxjs/operators';
+import { catchError, debounceTime, first, map, share, startWith, switchMap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
-import { LoggerService } from '../../../../../../../../core/src/core/logger.service';
 import { AnsiColorizer } from '../../../../../../../../core/src/shared/components/log-viewer/ansi-colorizer';
 import { ApplicationService } from '../../../../application.service';
 
@@ -39,7 +38,6 @@ export class LogStreamTabComponent implements OnInit {
   constructor(
     private applicationService: ApplicationService,
     private store: Store<CFAppState>,
-    private logService: LoggerService
   ) {
     this.filter = this.jsonFilter.bind(this);
   }
@@ -55,7 +53,7 @@ export class LogStreamTabComponent implements OnInit {
         }/apps/${this.applicationService.appGuid}/stream`;
 
       const socket$ = makeWebSocketObservable(streamUrl).pipe(catchError(e => {
-        this.logService.error(
+        console.error(
           'Error while connecting to socket: ' + JSON.stringify(e)
         );
         return [];
@@ -110,7 +108,7 @@ export class LogStreamTabComponent implements OnInit {
       const messageString = this.colorizer.colorize(atob(messageObj.message), msgColour, bold) + '\n';
       return timeStamp + ': ' + messageSource + ' ' + messageString;
     } catch (error) {
-      this.logService.error('Failed to filter jsonMessage from WebSocket: ' + JSON.stringify(error));
+      console.error('Failed to filter jsonMessage from WebSocket: ' + JSON.stringify(error));
       return jsonString;
     }
   }
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/variables-tab/variables-tab.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/variables-tab/variables-tab.component.ts
index cec72a0142..ff7c2f0fe3 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/variables-tab/variables-tab.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/variables-tab/variables-tab.component.ts
@@ -4,19 +4,18 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
-import { LoggerService } from '../../../../../../../../core/src/core/logger.service';
 import {
   ListDataSource,
 } from '../../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
+import { ListConfig } from '../../../../../../../../core/src/shared/components/list/list.component.types';
+import { stratosEndpointGuidKey } from '../../../../../../../../store/src/entity-request-pipeline/pipeline.types';
 import {
   ListAppEnvVar,
 } from '../../../../../../shared/components/list/list-types/app-variables/cf-app-variables-data-source';
 import {
   CfAppVariablesListConfigService,
 } from '../../../../../../shared/components/list/list-types/app-variables/cf-app-variables-list-config.service';
-import { ListConfig } from '../../../../../../../../core/src/shared/components/list/list.component.types';
 import { ApplicationService } from '../../../../application.service';
-import { stratosEndpointGuidKey } from '../../../../../../../../store/src/entity-request-pipeline/pipeline.types';
 
 export interface VariableTabAllEnvVarType {
   name: string;
@@ -39,7 +38,6 @@ export class VariablesTabComponent implements OnInit {
     private store: Store<CFAppState>,
     private appService: ApplicationService,
     private listConfig: ListConfig<ListAppEnvVar>,
-    private loggerService: LoggerService
   ) {
     this.envVarsDataSource = listConfig.getDataSource();
   }
@@ -96,7 +94,7 @@ export class VariablesTabComponent implements OnInit {
     try {
       return JSON.parse(value);
     } catch (err) {
-      this.loggerService.debug('Failed to parse STRATOS_PROJECT env var', err);
+      console.warn('Failed to parse STRATOS_PROJECT env var', err);
     }
     return '';
   }
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 ff36e161d2..7c10059edc 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
@@ -4,7 +4,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 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 { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { generateTestApplicationServiceProvider } from '../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { CloudFoundrySharedModule } from '../../../shared/cf-shared.module';
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 0d161c70ff..482334781b 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
@@ -7,7 +7,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 { TabNavService } from '../../../../../core/src/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';
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 da3babd5ca..59f9703e0a 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
@@ -247,7 +247,7 @@ export class DeployApplicationStep2Component
       .pipe(
         // Wait for a new project name change
         filter(state => state && !state.checking && !state.error && state.exists),
-        distinctUntilChanged((x, y) => x.name === y.name),
+        distinctUntilChanged((x, y) => x.name.toLowerCase() === y.name.toLowerCase()),
         // Convert project name into branches pagination observable
         switchMap(state =>
           cfEntityCatalog.gitBranch.store.getPaginationService(null, null, {
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 109a98e22f..2124a1e765 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
@@ -7,7 +7,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 { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { generateCfStoreModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { CloudFoundrySharedModule } from '../../../shared/cf-shared.module';
 import { CfOrgSpaceDataService } from '../../../shared/data-services/cf-org-space-service.service';
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 ac555207ef..a053f51d2c 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
@@ -14,11 +14,9 @@ interface GithubProjectExistsResponse {
   githubProjectError: string;
 }
 
-/* tslint:disable:no-use-before-declare  */
 const GITHUB_PROJECT_EXISTS = {
   provide: NG_ASYNC_VALIDATORS, useExisting: forwardRef(() => GithubProjectExistsDirective), multi: true
 };
-/* tslint:enable */
 
 @Directive({
   selector: '[appGithubProjectExists][ngModel]',
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 e5de781a2a..a7ec509698 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
@@ -6,7 +6,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 { TabNavService } from '../../../../../core/src/tab-nav.service';
 import {
   ApplicationServiceMock,
   generateTestApplicationServiceProvider,
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/new-application-base-step/new-application-base-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/new-application-base-step/new-application-base-step.component.spec.ts
index 7ad81b99f5..3b84e92f6c 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/new-application-base-step/new-application-base-step.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/new-application-base-step/new-application-base-step.component.spec.ts
@@ -3,7 +3,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 { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { generateCfStoreModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ApplicationDeploySourceTypes } from '../deploy-application/deploy-application-steps.types';
 import { NewApplicationBaseStepComponent } from './new-application-base-step.component';
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 f06e6bbbd2..4c544e020f 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
@@ -5,7 +5,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 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 { TabNavService } from '../../../../../../core/src/tab-nav.service';
 import { ApplicationServiceMock } from '../../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ApplicationService } from '../../application.service';
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 3454569951..ea7a43c9c2 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
@@ -3,7 +3,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 { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { ApplicationServiceMock } from '../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ApplicationService } from '../application.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/add-organization/add-organization.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-organization/add-organization.component.spec.ts
index 7af9fd0150..0db36dc5a0 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/add-organization/add-organization.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/add-organization/add-organization.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { generateCfBaseTestModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { AddOrganizationComponent } from './add-organization.component';
 import { CreateOrganizationStepComponent } from './create-organization-step/create-organization-step.component';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/add-quota/add-quota.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-quota/add-quota.component.spec.ts
index 80bc70ebd1..ef3767615e 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/add-quota/add-quota.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/add-quota/add-quota.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/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';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/add-space-quota.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/add-space-quota.component.spec.ts
index a9f62d776d..dd5ecaaa40 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/add-space-quota.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/add-space-quota.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/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';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/add-space/add-space.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-space/add-space.component.spec.ts
index 0684912834..ff17123de0 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/add-space/add-space.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/add-space/add-space.component.spec.ts
@@ -1,10 +1,9 @@
 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 { TabNavService } from '../../../../../core/src/tab-nav.service';
+import { CFBaseTestModules } from '../../../../test-framework/cf-test-helper';
 import { AddSpaceComponent } from './add-space.component';
 import { CreateSpaceStepComponent } from './create-space-step/create-space-step.component';
-import { CFBaseTestModules } from '../../../../test-framework/cf-test-helper';
 
 describe('AddSpaceComponent', () => {
   let component: AddSpaceComponent;
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/cf.helpers.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cf.helpers.ts
index a4ddeb40cf..fb946f7108 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/cf.helpers.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/cf.helpers.ts
@@ -358,7 +358,7 @@ export const cfOrgSpaceFilter = (entities: APIResource[], paginationState: Pagin
 
   const fetchOrgGuid = (e: APIResource<CfOrgSpaceFilterTypes>): string => {
     return e.entity.space ? e.entity.space.entity.organization_guid : null;
-  }
+  };
 
   // Filter by cf/org/space
   const cfGuid = paginationState.clientPagination.filter.items.cf;
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/cli-info-cloud-foundry/cli-info-cloud-foundry.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cli-info-cloud-foundry/cli-info-cloud-foundry.component.spec.ts
index 25e3004052..9f5b515cad 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/cli-info-cloud-foundry/cli-info-cloud-foundry.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/cli-info-cloud-foundry/cli-info-cloud-foundry.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-section.module.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-section.module.ts
index aa22c90c69..688e900238 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-section.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-section.module.ts
@@ -129,8 +129,6 @@ import {
 import { UsersRolesComponent } from './users/manage-users/manage-users.component';
 import { RemoveUserComponent } from './users/remove-user/remove-user.component';
 
-/* tslint:disable:max-line-length */
-
 @NgModule({
   imports: [
     CommonModule,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-section.routing.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-section.routing.ts
index b8b6a008f3..53f11cea56 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-section.routing.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-section.routing.ts
@@ -90,11 +90,6 @@ import { InviteUsersComponent } from './users/invite-users/invite-users.componen
 import { UsersRolesComponent } from './users/manage-users/manage-users.component';
 import { RemoveUserComponent } from './users/remove-user/remove-user.component';
 
-/* tslint:disable:max-line-length */
-
-
-/* tslint:enable:max-line-length */
-
 const usersRoles = [
   {
     path: 'users/manage',
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.spec.ts
index 726f61014c..27d8cdfc0c 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { populateStoreWithTestEndpoint, testSCFEndpointGuid } from '@stratosui/store/testing';
 
-import { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry/cloud-foundry.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry/cloud-foundry.component.spec.ts
index 4b8d81f2a0..6067c9a0e9 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry/cloud-foundry.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry/cloud-foundry.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { populateStoreWithTestEndpoint } from '@stratosui/store/testing';
 
-import { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import {
   generateCfBaseTestModules,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization.component.spec.ts
index e176d3137a..c93308ee77 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota.component.spec.ts
index 71fd777494..ae177c3fa5 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
-import { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/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';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
index 8c0123ad3d..da83e79b84 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
@@ -49,7 +49,11 @@ 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/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota.component.spec.ts
index a17eee1dee..787c24d760 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
-import { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/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';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space.component.spec.ts
index 7c09107d9c..4c99880fe0 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/quota-definition/quota-definition.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/quota-definition/quota-definition.component.spec.ts
index 4fb96c3435..ffb1b72d3e 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/quota-definition/quota-definition.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/quota-definition/quota-definition.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 import { populateStoreWithTestEndpoint, testSCFEndpointGuid } from '@stratosui/store/testing';
 
-import { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition/space-quota-definition.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition/space-quota-definition.component.spec.ts
index ee79e073f2..7bde1d12ae 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition/space-quota-definition.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition/space-quota-definition.component.spec.ts
@@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { testSCFEndpoint, testSCFEndpointGuid } from '@stratosui/store/testing';
 
-import { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { EntityCatalogHelpers } from '../../../../../store/src/entity-catalog/entity-catalog.helper';
 import { EntityCatalogEntityConfig } from '../../../../../store/src/entity-catalog/entity-catalog.types';
 import { endpointEntityType, stratosEntityFactory } from '../../../../../store/src/helpers/stratos-entity-factory';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.spec.ts
index ee7518e8c1..760cdc4695 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../../../../core/src/tab-nav.service';
 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';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose-formatter.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose-formatter.ts
index 51062be14d..2a8615929c 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose-formatter.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose-formatter.ts
@@ -1,13 +1,12 @@
-/**
- * Formats log messages from the Cloud Foundry firehose
- */
-import * as moment from 'moment';
+import moment from 'moment';
 
-import { LoggerService } from '../../../../../../core/src/core/logger.service';
 import { UtilsService } from '../../../../../../core/src/core/utils.service';
 import { AnsiColorizer } from '../../../../../../core/src/shared/components/log-viewer/ansi-colorizer';
 import { FireHoseItem, HTTP_METHODS } from './cloud-foundry-firehose.types';
 
+/**
+ * Formats log messages from the Cloud Foundry firehose
+ */
 
 /* eslint-disable no-control-regex */
 const ANSI_ESCAPE_MATCHER = new RegExp('\x1B\\[([0-9;]*)m', 'g');
@@ -29,7 +28,7 @@ export class CloudFoundryFirehoseFormatter {
 
   private colorizer = new AnsiColorizer();
 
-  constructor(private logService: LoggerService, private utils: UtilsService) { }
+  constructor(private utils: UtilsService) { }
 
   // Enable or disable all filters
   public showAll(all: boolean) {
@@ -66,7 +65,7 @@ export class CloudFoundryFirehoseFormatter {
           filtered = this.handleOtherEvent(cfEvent);
       }
     } catch (error) {
-      this.logService.error('Failed to filter jsonMessage from WebSocket: ' + jsonString);
+      console.error('Failed to filter jsonMessage from WebSocket: ' + jsonString);
       filtered = jsonString;
     }
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.ts
index b2bbddcf69..e5bed949b7 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.ts
@@ -1,9 +1,8 @@
 import { Component, OnInit } from '@angular/core';
 import { Observable, Subject } from 'rxjs';
 import websocketConnect from 'rxjs-websockets';
-import { catchError, filter, share, map, switchMap } from 'rxjs/operators';
+import { catchError, filter, map, share, switchMap } from 'rxjs/operators';
 
-import { LoggerService } from '../../../../../../core/src/core/logger.service';
 import { UtilsService } from '../../../../../../core/src/core/utils.service';
 import { environment } from '../../../../../../core/src/environments/environment.prod';
 import { CloudFoundryEndpointService } from '../../services/cloud-foundry-endpoint.service';
@@ -25,7 +24,6 @@ export class CloudFoundryFirehoseComponent implements OnInit {
 
   constructor(
     private cfEndpointService: CloudFoundryEndpointService,
-    private logService: LoggerService,
     private utilsService: UtilsService
   ) { }
 
@@ -36,7 +34,7 @@ export class CloudFoundryFirehoseComponent implements OnInit {
       }/firehose`;
 
     this.setupFirehoseStream(streamUrl);
-    this.formatter = new CloudFoundryFirehoseFormatter(this.logService, this.utilsService);
+    this.formatter = new CloudFoundryFirehoseFormatter(this.utilsService);
     this.filter = this.formatter.jsonFilter.bind(this.formatter);
   }
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organization-space-quotas/cloud-foundry-organization-space-quotas.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organization-space-quotas/cloud-foundry-organization-space-quotas.component.spec.ts
index 3cda3f2573..84998577c1 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organization-space-quotas/cloud-foundry-organization-space-quotas.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organization-space-quotas/cloud-foundry-organization-space-quotas.component.spec.ts
@@ -1,7 +1,7 @@
 import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../../core/src/tab-nav.service';
 import { CFBaseTestModules } from '../../../../../test-framework/cf-test-helper';
 import { generateTestCfEndpointServiceProvider } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import {
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component.spec.ts
index 2270c81012..5ec7cc6be9 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../../../core/src/tab-nav.service';
 import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-events/cloud-foundry-organization-events.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-events/cloud-foundry-organization-events.component.spec.ts
index ef58df42ab..c5bcdfd914 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-events/cloud-foundry-organization-events.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-events/cloud-foundry-organization-events.component.spec.ts
@@ -1,10 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import {
-  generateActiveRouteCfOrgSpaceMock,
-} from 'frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper';
 
 import { ListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { CFBaseTestModules } from '../../../../../../test-framework/cf-test-helper';
+import { generateActiveRouteCfOrgSpaceMock } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import {
   CloudFoundryEventsListComponent,
 } from '../../../../../shared/components/cloud-foundry-events-list/cloud-foundry-events-list.component';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-organization-spaces.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-organization-spaces.component.spec.ts
index 47b0e37828..3e716a9838 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-organization-spaces.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-organization-spaces.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../../../core/src/tab-nav.service';
 import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.spec.ts
index b525621558..9e8cb485d2 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../../../../core/src/tab-nav.service';
 import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.spec.ts
index 542fe41631..a09f80521e 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.spec.ts
@@ -1,10 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import {
-  generateActiveRouteCfOrgSpaceMock,
-} from 'frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper';
 
 import { ListConfig } from '../../../../../../../../../core/src/shared/components/list/list.component.types';
 import { CFBaseTestModules } from '../../../../../../../../test-framework/cf-test-helper';
+import {
+  generateActiveRouteCfOrgSpaceMock,
+} from '../../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import {
   CloudFoundryEventsListComponent,
 } from '../../../../../../../shared/components/cloud-foundry-events-list/cloud-foundry-events-list.component';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.spec.ts
index d1598bc08b..d26fba5719 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.spec.ts
@@ -10,9 +10,6 @@ import {
 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({
   declarations: [TableCellAppCfOrgSpaceHeaderComponent],
   imports: [CommonModule],
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts
index e6e27e1e5b..9b1935631e 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../../../../../core/src/tab-nav.service';
 import {
   generateActiveRouteCfOrgSpaceMock,
   generateCfBaseTestModules,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts
index 0df268c9e1..48dec0b9e8 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../../../../../core/src/tab-nav.service';
 import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.ts
index 3b82a9e0e0..90c173f4f8 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.ts
@@ -1,12 +1,14 @@
 import { Component } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { CFAppState } from 'frontend/packages/cloud-foundry/src/cf-app-state';
-import { CurrentUserPermissionsService } from 'frontend/packages/core/src/core/permissions/current-user-permissions.service';
 import { combineLatest, Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 
+import {
+  CurrentUserPermissionsService,
+} from '../../../../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { ListConfig } from '../../../../../../../../../core/src/shared/components/list/list.component.types';
 import { CFFeatureFlagTypes } from '../../../../../../../cf-api.types';
+import { CFAppState } from '../../../../../../../cf-app-state';
 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/cf/tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component.spec.ts
index 933c783b42..639ae6ff62 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../../../core/src/tab-nav.service';
 import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component.spec.ts
index 8c989eab9b..1430a0c2e9 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../../../core/src/tab-nav.service';
 import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cloud-foundry-organizations.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cloud-foundry-organizations.component.spec.ts
index 2c1572821d..ec94265165 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cloud-foundry-organizations.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cloud-foundry-organizations.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../../core/src/tab-nav.service';
 import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-quotas/cloud-foundry-quotas.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-quotas/cloud-foundry-quotas.component.spec.ts
index 75913ddedf..8e5c68629e 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-quotas/cloud-foundry-quotas.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-quotas/cloud-foundry-quotas.component.spec.ts
@@ -1,7 +1,7 @@
 import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../../core/src/tab-nav.service';
 import { CFBaseTestModules } from '../../../../../test-framework/cf-test-helper';
 import { generateTestCfEndpointServiceProvider } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { CfOrgsListConfigService } from '../../../../shared/components/list/list-types/cf-orgs/cf-orgs-list-config.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-summary-tab/cloud-foundry-summary-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-summary-tab/cloud-foundry-summary-tab.component.spec.ts
index 25dec485d3..9c459b2db9 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-summary-tab/cloud-foundry-summary-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-summary-tab/cloud-foundry-summary-tab.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../../core/src/tab-nav.service';
 import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users.component.spec.ts
index 92b37bb6b0..e6586ecd83 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users.component.spec.ts
@@ -1,7 +1,7 @@
 import { HttpClient, HttpHandler } from '@angular/common/http';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../../core/src/tab-nav.service';
 import {
   generateCfActiveRouteMock,
   generateCfBaseTestModules,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-confirm/manage-users-confirm.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-confirm/manage-users-confirm.component.ts
index 969da7b695..206a633c2f 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-confirm/manage-users-confirm.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-confirm/manage-users-confirm.component.ts
@@ -30,12 +30,6 @@ import { CfUser, OrgUserRoleNames, SpaceUserRoleNames } from '../../../../../sto
 import { CfRoleChangeWithNames, UserRoleLabels } from '../../../../../store/types/users-roles.types';
 import { ManageUsersSetUsernamesHelper } from '../manage-users-set-usernames/manage-users-set-usernames.component';
 
-/* tslint:disable:max-line-length */
-
-
-
-/* tslint:enable:max-line-length */
-
 @Component({
   selector: 'app-manage-users-confirm',
   templateUrl: './manage-users-confirm.component.html',
@@ -84,8 +78,8 @@ export class UsersRolesConfirmComponent implements OnInit, AfterContentInit {
 
   private updateChanges = new Subject();
   private nameCache: {
-    user: { [guid: string]: string },
-    role: { [guid: string]: string },
+    user: { [guid: string]: string, },
+    role: { [guid: string]: string, },
   } = {
       user: {},
       role: {}
@@ -129,7 +123,7 @@ export class UsersRolesConfirmComponent implements OnInit, AfterContentInit {
     this.store.select(selectCfUsersRoles).pipe(
       first(),
     ).subscribe(usersRoles => this.store.dispatch(new UsersRolesClearUpdateState(usersRoles.changedRoles)));
-  }
+  };
 
   fetchUsername = (userGuid: string, users: APIResource<CfUser>[]): string => {
     let res = this.nameCache.user[userGuid];
@@ -139,11 +133,11 @@ export class UsersRolesConfirmComponent implements OnInit, AfterContentInit {
     res = users.find(user => user.metadata.guid === userGuid).entity.username;
     this.nameCache.user[userGuid] = res;
     return res;
-  }
+  };
 
   fetchRoleName = (roleName: OrgUserRoleNames | SpaceUserRoleNames, isOrg: boolean): string => {
     return isOrg ? UserRoleLabels.org.short[roleName] : UserRoleLabels.space.short[roleName];
-  }
+  };
 
   private createCfObs() {
     this.cfGuid$ = this.store.select(selectCfUsersRoles).pipe(
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/manage-users-modify.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/manage-users-modify.component.ts
index 7782611d97..aec13ada83 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/manage-users-modify.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/manage-users-modify.component.ts
@@ -54,11 +54,7 @@ import { ActiveRouteCfOrgSpace } from '../../../cf-page.types';
 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 */
-
-interface Org { metadata: { guid: string }; }
+interface Org { metadata: { guid: string, }; }
 interface CfUserWithWarning extends CfUser {
   showWarning: boolean;
 }
@@ -294,21 +290,21 @@ export class UsersRolesModifyComponent implements OnInit, OnDestroy {
         this.store.dispatch(new UsersRolesFlipSetRoles());
       }
     });
-  }
+  };
 
   onLeave = (isNext: boolean) => {
     if (!isNext && this.snackBarRef) {
       this.snackBarRef.dismiss();
       this.snackBarRef = null;
     }
-  }
+  };
 
   onNext = () => {
     return combineLatest([
       this.store.select(selectCfUsersIsRemove).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());
@@ -318,6 +314,6 @@ export class UsersRolesModifyComponent implements OnInit, OnDestroy {
     ).pipe(catchError(err => {
       return observableOf({ success: false });
     }));
-  }
+  };
 
 }
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users.component.spec.ts
index 49c4be9fc8..3c67f45536 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users.component.spec.ts
@@ -6,7 +6,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 { TabNavService } from '../../../../../../core/src/tab-nav.service';
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { CfUserServiceTestProvider } from '../../../../../test-framework/user-service-helper';
 import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/users/remove-user/remove-user.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/remove-user/remove-user.component.spec.ts
index dc025ef094..bd5d2a63f2 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/users/remove-user/remove-user.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/users/remove-user/remove-user.component.spec.ts
@@ -6,7 +6,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 { TabNavService } from '../../../../../../core/src/tab-nav.service';
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { CfUserServiceTestProvider } from '../../../../../test-framework/user-service-helper';
 import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cf/users/remove-user/remove-user.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/remove-user/remove-user.component.ts
index 7c4a435f3d..9a9642fe87 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cf/users/remove-user/remove-user.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cf/users/remove-user/remove-user.component.ts
@@ -4,7 +4,6 @@ import { Store } from '@ngrx/store';
 import { combineLatest as obsCombineLatest, Observable, of as observableOf } from 'rxjs';
 import { combineLatest, filter, first, map, startWith } from 'rxjs/operators';
 
-import { LoggerService } from '../../../../../../core/src/core/logger.service';
 import { CurrentUserPermissionsService } from '../../../../../../core/src/core/permissions/current-user-permissions.service';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { AppState } from '../../../../../../store/src/app-state';
@@ -49,7 +48,6 @@ export class RemoveUserComponent implements OnDestroy {
     private activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
     private cfUserService: CfUserService,
     private cfRolesService: CfRolesService,
-    private logService: LoggerService,
     private route: ActivatedRoute,
     private userPerms: CurrentUserPermissionsService
   ) {
@@ -67,7 +65,7 @@ export class RemoveUserComponent implements OnDestroy {
           first()
         );
     } else {
-      this.logService.error('User param not defined');
+      console.error('User param not defined');
       return;
     }
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog-page/service-catalog-page.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog-page/service-catalog-page.component.spec.ts
index 57528a599c..90f7083f13 100644
--- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog-page/service-catalog-page.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog-page/service-catalog-page.component.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 { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { generateCfStoreModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { CfEndpointsMissingComponent } from '../../../shared/components/cf-endpoints-missing/cf-endpoints-missing.component';
 import { CloudFoundryService } from '../../../shared/data-services/cloud-foundry.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.spec.ts
index e25c5c6f2e..f8dc7a2755 100644
--- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { generateCfBaseTestModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { CfUserPermissionDirective } from '../../../shared/directives/cf-user-permission/cf-user-permission.directive';
 import { ServicesService } from '../services.service';
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 32ecc4e292..623415cc93 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
@@ -2,7 +2,7 @@ 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 { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { generateCfBaseTestModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ServiceActionHelperService } from '../../../shared/data-services/service-action-helper.service';
 import { DetachAppsComponent } from './detach-apps/detach-apps.component';
diff --git a/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.spec.ts
index 7d20df5522..7cf738ff7f 100644
--- a/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { generateCfBaseTestModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { CfEndpointsMissingComponent } from '../../../shared/components/cf-endpoints-missing/cf-endpoints-missing.component';
 import { CfOrgSpaceDataService } from '../../../shared/data-services/cf-org-space-service.service';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component.spec.ts
index f104e8d150..ef280c7cbd 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../../core/src/tab-nav.service';
 import { generateCfBaseTestModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { AddServiceInstanceBaseStepComponent } from './add-service-instance-base-step.component';
 
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 daa030668e..f79e72c929 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
@@ -37,7 +37,7 @@ 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 { TabNavService } from '../../../../../../core/src/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';
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 f79ffc547c..cc96c5fc5d 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
@@ -52,11 +52,15 @@ export class CreateServiceInstanceHelper {
     );
 
     const paginationKey = createEntityRelationPaginationKey(servicePlanVisibilityEntityType, this.cfGuid);
-    this.servicePlanVisibilities$ = cfEntityCatalog.servicePlanVisibility.store.getPaginationService(this.cfGuid, paginationKey, {}).entities$
-  }
+    this.servicePlanVisibilities$ = cfEntityCatalog.servicePlanVisibility.store.getPaginationService(
+      this.cfGuid,
+      paginationKey,
+      {}
+    ).entities$;
+  };
 
   getServicePlanVisibilities = (): Observable<APIResource<IServicePlanVisibility>[]> =>
-    this.servicePlanVisibilities$.pipe(filter(p => !!p))
+    this.servicePlanVisibilities$.pipe(filter(p => !!p));
 
 
   getServicePlans(): Observable<APIResource<IServicePlan>[]> {
@@ -69,7 +73,7 @@ export class CreateServiceInstanceHelper {
         filter(p => !!p),
         map(getServiceName)
       );
-  }
+  };
 
   getServiceInstancesForService = (servicePlanGuid: string = null, spaceGuid: string = null, cfGuid: string = null) => {
     let action;
@@ -77,7 +81,7 @@ export class CreateServiceInstanceHelper {
     if (spaceGuid) {
       paginationKey = createEntityRelationPaginationKey(serviceInstancesEntityType, `${spaceGuid}-${servicePlanGuid}`);
       const q = [new QParam('service_plan_guid', servicePlanGuid, QParamJoiners.colon).toString()];
-      action = cfEntityCatalog.serviceInstance.actions.getAllInSpace(spaceGuid, cfGuid, paginationKey, q)
+      action = cfEntityCatalog.serviceInstance.actions.getAllInSpace(spaceGuid, cfGuid, paginationKey, q);
     } else if (servicePlanGuid) {
       paginationKey = createEntityRelationPaginationKey(serviceInstancesEntityType, servicePlanGuid);
       action = cfEntityCatalog.serviceInstance.actions.getAllInServicePlan(servicePlanGuid, cfGuid, paginationKey);
@@ -98,5 +102,5 @@ export class CreateServiceInstanceHelper {
         publishReplay(1),
         refCount()
       );
-  }
+  };
 }
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 8be8e3f5cb..49df7b2862 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,11 +1,11 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { fetchAutoscalerInfo } from '@stratosui/cf-autoscaler';
-import { APIResource, EntityInfo } from 'frontend/packages/store/src/types/api.types';
 import { Observable, Subscription } from 'rxjs';
 import { map, tap } from 'rxjs/operators';
 
 import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service';
+import { APIResource, EntityInfo } from '../../../../../../store/src/types/api.types';
 import { ICfV2Info } from '../../../../cf-api.types';
 import { CloudFoundryEndpointService } from '../../../../features/cf/services/cloud-foundry-endpoint.service';
 import {
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 137f9073dd..77cbca9094 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
@@ -102,13 +102,10 @@ export class CfAppsDataSource extends CFListDataSource<APIResource> {
           if (app instanceof MultiActionListEntity) {
             app = app.entity;
           }
-          const appState = app.entity.state;
-          const appGuid = app.metadata.guid;
-          const cfGuid = app.entity.cfGuid;
-          if (appState === 'STARTED') {
+          if (app.entity.state === 'STARTED') {
             actions.push({
-              id: appGuid,
-              action: cfEntityCatalog.appStats.actions.getMultiple(appGuid, cfGuid)
+              id: app.metadata.guid,
+              action: cfEntityCatalog.appStats.actions.getMultiple(app.metadata.guid, app.entity.cfGuid)
             });
           }
         });
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 51e4e54f65..055d15a4e3 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,3 +1,4 @@
+/* tslint:disable:max-line-length */
 import { DatePipe } from '@angular/common';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
@@ -24,6 +25,8 @@ import {
 import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
 import { CfCellHealthDataSource, CfCellHealthEntry, CfCellHealthState } from './cf-cell-health-source';
 
+// tslint:enable:max-line-length
+
 @Injectable()
 export class CfCellHealthListConfigService extends BaseCfListConfig<CfCellHealthEntry> {
 
@@ -93,6 +96,6 @@ export class CfCellHealthListConfigService extends BaseCfListConfig<CfCellHealth
         field: 'state'
       }
     },
-  ]
+  ];
   getDataSource = () => this.dataSource;
 }
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 783f2b148f..859b7a7c16 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,3 +1,4 @@
+// tslint:disable:max-line-length
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
@@ -22,7 +23,6 @@ import { ActiveRouteCfCell } from '../../../../../features/cf/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-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 de671fa58f..324c695ac2 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,6 @@
 import { Component, Input } from '@angular/core';
-import { TableCellCustom } from 'frontend/packages/core/src/shared/components/list/list.types';
 
+import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { IFeatureFlag } from '../../../../../../cf-api.types';
 import { FeatureFlagDescriptions } from '../cf-feature-flags-data-source';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-broker/table-cell-service-broker.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-broker/table-cell-service-broker.component.ts
index eea29808c6..1f61b851d9 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-broker/table-cell-service-broker.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-broker/table-cell-service-broker.component.ts
@@ -33,13 +33,20 @@ export class TableCellServiceBrokerComponent extends TableCellCustom<APIResource
   set row(row: APIResource<IService>) {
     this.pRow = row;
     if (row && !this.spaceLink$) {
-      this.broker$ = cfEntityCatalog.serviceBroker.store.getEntityService(this.row.entity.service_broker_guid, this.row.entity.cfGuid, {}).waitForEntity$
-        .pipe(
-          map(e => e.entity)
-        )
+      this.broker$ = cfEntityCatalog.serviceBroker.store.getEntityService(
+        this.row.entity.service_broker_guid,
+        this.row.entity.cfGuid,
+        {}
+      ).waitForEntity$.pipe(
+        map(e => e.entity)
+      );
       this.spaceLink$ = this.broker$.pipe(
         filter(broker => !!broker.entity.space_guid),
-        switchMap(broker => cfEntityCatalog.space.store.getWithOrganization.getEntityService(broker.entity.space_guid, broker.entity.cfGuid).waitForEntity$),
+        switchMap(broker => cfEntityCatalog.space.store.getWithOrganization.getEntityService(
+          broker.entity.space_guid,
+          broker.entity.cfGuid
+        ).waitForEntity$
+        ),
         map(e => e.entity),
         map(space => ({
           name: space.entity.name,
@@ -53,7 +60,7 @@ export class TableCellServiceBrokerComponent extends TableCellCustom<APIResource
           ]
         })
         )
-      )
+      );
     }
   }
   get row(): APIResource<IService> {
@@ -62,12 +69,12 @@ export class TableCellServiceBrokerComponent extends TableCellCustom<APIResource
 
   public spaceLink$: Observable<{
     name: string,
-    link: string[]
+    link: string[],
   }>;
-  public broker$: Observable<APIResource<IServiceBroker>>
+  public broker$: Observable<APIResource<IServiceBroker>>;
 
   constructor() {
-    super()
+    super();
   }
 
 }
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 05653c251e..b69318d2be 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
@@ -20,7 +20,7 @@ import { getOrgRoles } from '../../../../../../features/cf/cf.helpers';
 import { CfUser, IUserPermissionInOrg, OrgUserRoleNames } from '../../../../../../store/types/cf-user.types';
 import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-user-permissions-checkers';
 import { CfUserService } from '../../../../../data-services/cf-user.service';
-import { CfPermissionCell, ICellPermissionList } from '../cf-permission-cell';
+import { CfPermissionCellDirective, ICellPermissionList } from '../cf-permission-cell';
 
 @Component({
   selector: 'app-org-user-permission-cell',
@@ -28,7 +28,7 @@ import { CfPermissionCell, ICellPermissionList } from '../cf-permission-cell';
   styleUrls: ['./cf-org-permission-cell.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class CfOrgPermissionCellComponent extends CfPermissionCell<OrgUserRoleNames> {
+export class CfOrgPermissionCellComponent extends CfPermissionCellDirective<OrgUserRoleNames> {
 
   constructor(
     public store: Store<CFAppState>,
@@ -96,6 +96,6 @@ export class CfOrgPermissionCellComponent extends CfPermissionCell<OrgUserRoleNa
   }
 
   public canRemovePermission = (cfGuid: string, orgGuid: string, spaceGuid: string) =>
-    this.userPerms.can(CfCurrentUserPermissions.ORGANIZATION_CHANGE_ROLES, cfGuid, orgGuid)
+    this.userPerms.can(CfCurrentUserPermissions.ORGANIZATION_CHANGE_ROLES, cfGuid, orgGuid);
 
 }
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 458162a84b..4f79ca2521 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
@@ -28,7 +28,7 @@ export interface ICellPermissionList<T> extends IUserRole<T> {
 }
 
 @Directive()
-export abstract class CfPermissionCell<T> extends TableCellCustom<APIResource<CfUser>> {
+export abstract class CfPermissionCellDirective<T> extends TableCellCustom<APIResource<CfUser>> {
   userEntity: BehaviorSubject<CfUser> = new BehaviorSubject(null);
 
   @Input('row')
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 ba82dc8bb6..d5ac10914d 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
@@ -20,7 +20,7 @@ import { getSpaceRoles } from '../../../../../../features/cf/cf.helpers';
 import { CfUser, IUserPermissionInSpace, SpaceUserRoleNames } from '../../../../../../store/types/cf-user.types';
 import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-user-permissions-checkers';
 import { CfUserService } from '../../../../../data-services/cf-user.service';
-import { CfPermissionCell, ICellPermissionList } from '../cf-permission-cell';
+import { CfPermissionCellDirective, ICellPermissionList } from '../cf-permission-cell';
 
 @Component({
   selector: 'app-cf-space-permission-cell',
@@ -28,7 +28,7 @@ import { CfPermissionCell, ICellPermissionList } from '../cf-permission-cell';
   styleUrls: ['./cf-space-permission-cell.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class CfSpacePermissionCellComponent extends CfPermissionCell<SpaceUserRoleNames> {
+export class CfSpacePermissionCellComponent extends CfPermissionCellDirective<SpaceUserRoleNames> {
 
   missingRoles$: Observable<boolean>;
 
@@ -83,7 +83,7 @@ export class CfSpacePermissionCellComponent extends CfPermissionCell<SpaceUserRo
       filter(org => !!org),
       first(),
       map((orgs: APIResource<IOrganization>[]) => {
-        const orgNames: { [orgGuid: string]: string } = {};
+        const orgNames: { [orgGuid: string]: string; } = {};
         orgs.forEach(org => {
           orgNames[org.metadata.guid] = org.entity.name;
         });
@@ -154,5 +154,5 @@ export class CfSpacePermissionCellComponent extends CfPermissionCell<SpaceUserRo
   }
 
   public canRemovePermission = (cfGuid: string, orgGuid: string, spaceGuid: string) =>
-    this.userPerms.can(CfCurrentUserPermissions.SPACE_CHANGE_ROLES, cfGuid, orgGuid, spaceGuid)
+    this.userPerms.can(CfCurrentUserPermissions.SPACE_CHANGE_ROLES, cfGuid, orgGuid, spaceGuid);
 }
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 fbca27d4a5..3315917aa2 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
@@ -1,7 +1,7 @@
 import { DatePipe } from '@angular/common';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
-import * as moment from 'moment';
+import moment from 'moment';
 import { Observable } from 'rxjs';
 import { combineLatest, filter, first, map } from 'rxjs/operators';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/github-pagination.helper.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/github-pagination.helper.ts
new file mode 100644
index 0000000000..59aaccfdf5
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/github-pagination.helper.ts
@@ -0,0 +1,153 @@
+import { HttpClient, HttpResponse } from '@angular/common/http';
+import { PaginationFlattener } from '@stratosui/store';
+import { Observable } from 'rxjs';
+
+// --------------- Note ----------------
+// There are two types of pagination github uses
+// 1) Pagination info is in the body of the response (GithubPaginationResponse / GithubFlattenerPaginationConfig)
+//    - Array is in the body of the response
+//    - Things like total number of results in the body of the response
+// 2) Pagination info is in the response header (GithubPaginationArrayResponse / GithubFlattenerForArrayPaginationConfig)
+//    - Array is the body of the response
+//    - Thinks like total number of results are in a `link` property in the response header
+
+
+/**
+ * Body of a github pagination response (pagination info inside body)
+ */
+type GithubPaginationResponse<T = any> = {
+  incomplete_results: boolean,
+  items: T[],
+  total_count: number,
+};
+
+/**
+ * Body of a github pagination response (pagination info is in header)
+ */
+type GithubPaginationArrayResponse<T = any> = T[];
+
+export const GITHUB_PER_PAGE_PARAM = 'per_page';
+export const GITHUB_PER_PAGE_PARAM_VALUE = 100;
+const GITHUB_MAX_PAGES = 5;
+const GITHUB_PAGE_PARAM = 'page';
+const GITHUB_LINK_PAGE_REGEX = /page=([\d]*)/;
+
+/**
+ * Config used with `flattenPagination`. To use when the pagination info is in the body
+ */
+export class GithubFlattenerPaginationConfig<T> implements PaginationFlattener<T[], GithubPaginationResponse<T>> {
+  constructor(
+    private httpClient: HttpClient,
+    public url: string,
+  ) { }
+
+  getTotalPages = (res: GithubPaginationResponse<T>): number => {
+    const total = Math.floor(this.getTotalResults(res) / GITHUB_PER_PAGE_PARAM_VALUE) + 1;
+    if (total > GITHUB_MAX_PAGES) {
+      console.warn(`Not fetching all github entities (too many pages: ${total})`);
+      return GITHUB_MAX_PAGES;
+    }
+    return total;
+  };
+  getTotalResults = (res: GithubPaginationResponse<T>): number => {
+    return res.total_count;
+  };
+  mergePages = (response: any[]): T[] => {
+    return response.reduce((all, res) => {
+      return all.concat(...res.items);
+    }, [] as T[]);
+  };
+  fetch = (...args: any[]): Observable<GithubPaginationResponse<T>> => {
+    return this.httpClient.get<GithubPaginationResponse<T>>(
+      this.url,
+      {
+        params: {
+          ...args[0]
+        },
+      }
+    );
+  };
+  buildFetchParams = (i: number): any[] => {
+    const requestOption = {
+      [GITHUB_PAGE_PARAM]: i.toString(),
+      [GITHUB_PER_PAGE_PARAM]: GITHUB_PER_PAGE_PARAM_VALUE.toString()
+    };
+    return [requestOption];
+  };
+  clearResults = (res: GithubPaginationResponse<T>, allResults: number) => {
+    throw new Error('Not Implemented');
+  };
+}
+
+/**
+ * Config used with `flattenPagination`. To use when the pagination info in the response header
+ */
+export class GithubFlattenerForArrayPaginationConfig<T>
+  implements PaginationFlattener<GithubPaginationArrayResponse<T>, HttpResponse<GithubPaginationArrayResponse<T>>> {
+  constructor(
+    private httpClient: HttpClient,
+    public url: string,
+  ) { }
+
+  getTotalPages = (res: HttpResponse<GithubPaginationArrayResponse<T>>): number => {
+    // Link: <https://api.github.com/search/code?q=addClass+user%3Amozilla&page=2>; rel="next",
+    // <https://api.github.com/search/code?q=addClass+user%3Amozilla&page=34>; rel="last"
+
+    const link = res.headers.get('link');
+    if (!link) {
+      // There's no `link` if there's only one page.....
+      return 1;
+    }
+    const parts = link.split(',');
+    if (!parts.length) {
+      throw new Error('Unable to depagination github request (no commas in `link`)');
+    }
+    const last = parts.find(part => part.endsWith('rel="last"'));
+    if (!last) {
+      throw new Error('Unable to depagination github request (no `last` in `link`)');
+    }
+    const trimmedLast = last.trim();
+    const lastUrl = trimmedLast.slice(1, trimmedLast.indexOf('>'));
+    const lastPageNumber = GITHUB_LINK_PAGE_REGEX.exec(lastUrl);
+    if (lastPageNumber.length < 2) {
+      throw new Error(`Unable to depagination github request (could not find page number in ${lastUrl})`);
+    }
+
+    const total = parseInt(lastPageNumber[1], 10);
+    if (total > GITHUB_MAX_PAGES) {
+      console.warn(`Not fetching all github entities (too many pages: ${total})`);
+      return GITHUB_MAX_PAGES;
+    }
+    return total;
+  };
+  getTotalResults = (res: HttpResponse<GithubPaginationArrayResponse<T>>): number => {
+    return this.getTotalPages(res) * GITHUB_PER_PAGE_PARAM_VALUE;
+  };
+  mergePages = (response: any[]): GithubPaginationArrayResponse<T> => {
+    return response.reduce((all, res) => {
+      return all.concat(...res.body);
+    }, [] as GithubPaginationArrayResponse<T>);
+  };
+  fetch = (...args: any[]): Observable<HttpResponse<GithubPaginationArrayResponse<T>>> => {
+    return this.httpClient.get<GithubPaginationArrayResponse<T>>(
+      this.url,
+      {
+        params: {
+          ...args[0]
+        },
+        // Required to ensure we can access the https response header
+        observe: 'response'
+      }
+    );
+  };
+  buildFetchParams = (i: number): any[] => {
+    const requestOption = {
+      [GITHUB_PAGE_PARAM]: i.toString(),
+      [GITHUB_PER_PAGE_PARAM]: GITHUB_PER_PAGE_PARAM_VALUE.toString()
+    };
+    return [requestOption];
+  };
+  clearResults = (res: HttpResponse<GithubPaginationArrayResponse<T>>, allResults: number) => {
+    throw new Error('Not Implemented');
+  };
+}
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/github-scm.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/github-scm.ts
index 5c6180fb38..915eae9576 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/github-scm.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/github-scm.ts
@@ -1,9 +1,16 @@
 import { HttpClient } from '@angular/common/http';
+import { flattenPagination } from '@stratosui/store';
 import { Observable } from 'rxjs';
-import { filter, map } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 
 import { getGitHubAPIURL } from '../../../../../core/src/core/github.helpers';
 import { GitBranch, GitCommit, GitRepo } from '../../../store/types/git.types';
+import {
+  GITHUB_PER_PAGE_PARAM,
+  GITHUB_PER_PAGE_PARAM_VALUE,
+  GithubFlattenerForArrayPaginationConfig,
+  GithubFlattenerPaginationConfig,
+} from './github-pagination.helper';
 import { GitSCM, SCMIcon } from './scm';
 import { GitSCMType } from './scm.service';
 
@@ -37,7 +44,14 @@ export class GitHubSCM implements GitSCM {
   }
 
   getBranches(httpClient: HttpClient, projectName: string): Observable<GitBranch[]> {
-    return httpClient.get(`${this.gitHubURL}/repos/${projectName}/branches`) as Observable<GitBranch[]>;
+    const url = `${this.gitHubURL}/repos/${projectName}/branches`;
+    const config = new GithubFlattenerForArrayPaginationConfig<GitBranch>(httpClient, url)
+    const firstRequest = config.fetch(...config.buildFetchParams(1))
+    return flattenPagination(
+      null,
+      firstRequest,
+      config
+    )
   }
 
   getCommit(httpClient: HttpClient, projectName: string, commitSha: string): Observable<GitCommit> {
@@ -49,7 +63,12 @@ export class GitHubSCM implements GitSCM {
   }
 
   getCommits(httpClient: HttpClient, projectName: string, ref: string): Observable<GitCommit[]> {
-    return httpClient.get(`${this.gitHubURL}/repos/${projectName}/commits?sha=${ref}`) as Observable<GitCommit[]>;
+    return httpClient.get<GitCommit[]>(
+      `${this.gitHubURL}/repos/${projectName}/commits?sha=${ref}`, {
+      params: {
+        [GITHUB_PER_PAGE_PARAM]: GITHUB_PER_PAGE_PARAM_VALUE.toString()
+      }
+    });
   }
 
   getCloneURL(projectName: string): string {
@@ -70,12 +89,18 @@ export class GitHubSCM implements GitSCM {
     if (prjParts.length > 1) {
       url = `${this.gitHubURL}/search/repositories?q=${prjParts[1]}+in:name+fork:true+user:${prjParts[0]}`;
     }
-    return httpClient.get(url).pipe(
-      filter((repos: any) => !!repos.items),
+
+    const config = new GithubFlattenerPaginationConfig<GitRepo>(httpClient, url)
+    const firstRequest = config.fetch(...config.buildFetchParams(1))
+    return flattenPagination(
+      null,
+      firstRequest,
+      config
+    ).pipe(
       map(repos => {
-        return repos.items.map(item => item.full_name);
+        return repos.map(item => item.full_name);
       })
-    );
+    )
   }
 
   public convertCommit(projectName: string, commit: any): GitCommit {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/gitlab-scm.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/gitlab-scm.ts
index 0d6b210764..badb54157d 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/gitlab-scm.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/gitlab-scm.ts
@@ -1,6 +1,6 @@
 import { HttpClient, HttpErrorResponse } from '@angular/common/http';
-import { Observable, of as observableOf } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { combineLatest, Observable, of as observableOf, of } from 'rxjs';
+import { catchError, map } from 'rxjs/operators';
 import { Md5 } from 'ts-md5/dist/md5';
 
 import { GitBranch, GitCommit, GitRepo } from '../../../store/types/git.types';
@@ -8,6 +8,8 @@ import { GitSCM, SCMIcon } from './scm';
 import { GitSCMType } from './scm.service';
 
 const gitLabAPIUrl = 'https://gitlab.com/api/v4';
+const GITLAB_PER_PAGE_PARAM = 'per_page';
+const GITLAB_PER_PAGE_PARAM_VALUE = 100;
 
 export class GitLabSCM implements GitSCM {
 
@@ -29,19 +31,18 @@ export class GitLabSCM implements GitSCM {
   getRepository(httpClient: HttpClient, projectName: string): Observable<GitRepo> {
     const parts = projectName.split('/');
 
-    let obs$ = httpClient.get(`${gitLabAPIUrl}/users/${parts[0]}/projects?search=${parts[1]}`);
-    if (parts.length !== 2) {
-      obs$ = observableOf(null);
-    }
+    const obs$ = parts.length !== 2 ?
+      observableOf(null) :
+      httpClient.get(`${gitLabAPIUrl}/projects/${parts.join('%2F')}`);
 
     return obs$.pipe(
       map((data: any) => {
-        if (data.length !== 1) {
+        if (!data) {
           throw new HttpErrorResponse({
             status: 404
           });
         }
-        return this.convertProject(data[0]);
+        return this.convertProject(data);
       })
     );
   }
@@ -59,7 +60,13 @@ export class GitLabSCM implements GitSCM {
 
   getBranches(httpClient: HttpClient, projectName: string): Observable<GitBranch[]> {
     const prjNameEncoded = encodeURIComponent(projectName);
-    return httpClient.get(`${gitLabAPIUrl}/projects/${prjNameEncoded}/repository/branches`).pipe(
+    return httpClient.get(
+      `${gitLabAPIUrl}/projects/${prjNameEncoded}/repository/branches`, {
+      params: {
+        [GITLAB_PER_PAGE_PARAM]: GITLAB_PER_PAGE_PARAM_VALUE.toString()
+      }
+    }
+    ).pipe(
       map((data: any) => {
         const branches = [];
         data.forEach(b => {
@@ -87,7 +94,13 @@ export class GitLabSCM implements GitSCM {
 
   getCommits(httpClient: HttpClient, projectName: string, commitSha: string): Observable<GitCommit[]> {
     const prjNameEncoded = encodeURIComponent(projectName);
-    return httpClient.get(`${gitLabAPIUrl}/projects/${prjNameEncoded}/repository/commits?ref_name=${commitSha}`).pipe(
+    return httpClient.get(
+      `${gitLabAPIUrl}/projects/${prjNameEncoded}/repository/commits?ref_name=${commitSha}`, {
+      params: {
+        [GITLAB_PER_PAGE_PARAM]: GITLAB_PER_PAGE_PARAM_VALUE.toString()
+      }
+    }
+    ).pipe(
       map((data: any) => {
         const commits = [];
         data.forEach(c => commits.push(this.convertCommit(projectName, c)));
@@ -110,17 +123,29 @@ export class GitLabSCM implements GitSCM {
 
   getMatchingRepositories(httpClient: HttpClient, projectName: string): Observable<string[]> {
     const prjParts = projectName.split('/');
-    let url = `${gitLabAPIUrl}/projects?search=${projectName}`;
-    if (prjParts.length > 1) {
-      url = `${gitLabAPIUrl}/users/${prjParts[0]}/projects?search=${prjParts[1]}`;
-    }
-    return httpClient.get(url).pipe(
-      map((repos: any) => {
-        return repos.map(item => item.path_with_namespace);
-      })
+
+    const obs$ = prjParts.length > 1 ?
+      this.getMatchingUserGroupRepositories(httpClient, prjParts) :
+      httpClient.get(`${gitLabAPIUrl}/projects?search=${projectName}`, {
+        params: {
+          [GITLAB_PER_PAGE_PARAM]: GITLAB_PER_PAGE_PARAM_VALUE.toString()
+        }
+      });
+
+    return obs$.pipe(
+      map((repos: any[]) => repos.map(item => item.path_with_namespace)),
     );
   }
 
+  private getMatchingUserGroupRepositories(httpClient: HttpClient, prjParts: string[]): Observable<any[]> {
+    return combineLatest([
+      httpClient.get<[]>(`${gitLabAPIUrl}/users/${prjParts[0]}/projects/?search=${prjParts[1]}`).pipe(catchError(() => of([]))),
+      httpClient.get<[]>(`${gitLabAPIUrl}/groups/${prjParts[0]}/projects?search=${prjParts[1]}`).pipe(catchError(() => of([]))),
+    ]).pipe(
+      map(([a, b]: [any[], any[]]) => a.concat(b)),
+    )
+  }
+
   private convertProject(prj: any): GitRepo {
     return {
       ...prj,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/directives/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
index eab0dac1b9..59870a82a3 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/directives/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
@@ -9,11 +9,9 @@ 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 = {
   provide: NG_ASYNC_VALIDATORS, useExisting: forwardRef(() => AppNameUniqueDirective), multi: true
 };
-/* tslint:enable */
 
 // See: https://medium.com/@kahlil/asynchronous-validation-with-angular-reactive-forms-1a392971c062
 
@@ -65,7 +63,7 @@ export class AppNameUniqueDirective implements AsyncValidator, OnInit {
     this.appApplicationNameUnique.set(false);
   }
 
-  public validate(control: AbstractControl): Observable<{ appNameTaken: boolean } | null> {
+  public validate(control: AbstractControl): Observable<{ appNameTaken: boolean; } | null> {
     if (!control.dirty) {
       return observableOf(null);
     }
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 11a4310bf8..c840fe50b1 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
@@ -5,7 +5,6 @@ import { Store } from '@ngrx/store';
 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';
 import { NormalizedResponse } from '../../../../store/src/types/api.types';
 import { PaginatedAction } from '../../../../store/src/types/pagination.types';
@@ -36,24 +35,24 @@ import { CF_ENDPOINT_TYPE } from '../../cf-types';
 import { selectDeployAppState } from '../selectors/deploy-application.selector';
 import { GitCommit } from '../types/git.types';
 
-function parseHttpPipeError(res: any, logger: LoggerService): { message?: string } {
+function parseHttpPipeError(res: any): { message?: string } {
   if (!res.status) {
     return res;
   }
   try {
     return res.json ? res.json() : res;
   } catch (e) {
-    logger.warn('Failed to parse response body', e);
+    console.warn('Failed to parse response body', e);
   }
   return {};
 }
 
-export function createFailedGithubRequestMessage(error: any, logger: LoggerService) {
-  const response = parseHttpPipeError(error, logger);
+export function createFailedGithubRequestMessage(error: any) {
+  const response = parseHttpPipeError(error);
   const message = response.message || '';
   return error.status === 403 && message.startsWith('API rate limit exceeded for') ?
-    'Github ' + message.substring(0, message.indexOf('(')) :
-    'Github request failed';
+    'Git ' + message.substring(0, message.indexOf('(')) :
+    'Git request failed';
 }
 
 @Injectable()
@@ -61,7 +60,6 @@ export class DeployAppEffects {
   constructor(
     private actions$: Actions,
     private store: Store<CFAppState>,
-    private logger: LoggerService,
     private httpClient: HttpClient
   ) { }
 
@@ -77,7 +75,7 @@ export class DeployAppEffects {
         map(res => new ProjectExists(action.projectName, res)),
         catchError(err => observableOf(err.status === 404 ?
           new ProjectDoesntExist(action.projectName) :
-          new ProjectFetchFail(action.projectName, createFailedGithubRequestMessage(err, this.logger))
+          new ProjectFetchFail(action.projectName, createFailedGithubRequestMessage(err))
         ))
       );
     })
@@ -120,7 +118,7 @@ export class DeployAppEffects {
           ];
         }),
         catchError(err => [
-          new WrapperRequestActionFailed(createFailedGithubRequestMessage(err, this.logger), apiAction, actionType)
+          new WrapperRequestActionFailed(createFailedGithubRequestMessage(err), apiAction, actionType)
         ]));
     }));
 
@@ -152,7 +150,7 @@ export class DeployAppEffects {
           ];
         }),
         catchError(err => [
-          new WrapperRequestActionFailed(createFailedGithubRequestMessage(err, this.logger), apiAction, actionType)
+          new WrapperRequestActionFailed(createFailedGithubRequestMessage(err), apiAction, actionType)
         ]));
     }));
 
@@ -180,7 +178,7 @@ export class DeployAppEffects {
           ];
         }),
         catchError(err => [
-          new WrapperRequestActionFailed(createFailedGithubRequestMessage(err, this.logger), apiAction, actionType)
+          new WrapperRequestActionFailed(createFailedGithubRequestMessage(err), apiAction, actionType)
         ]));
     }));
 
@@ -211,7 +209,7 @@ export class DeployAppEffects {
           ];
         }),
         catchError(err => [
-          new WrapperRequestActionFailed(createFailedGithubRequestMessage(err, this.logger), apiAction, actionType)
+          new WrapperRequestActionFailed(createFailedGithubRequestMessage(err), apiAction, actionType)
         ]));
     }));
 
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 0864d7b8da..cf534bc46a 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
@@ -4,7 +4,6 @@ import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { catchError, mergeMap } from 'rxjs/operators';
 
-import { LoggerService } from '../../../../core/src/core/logger.service';
 import { NormalizedResponse } from '../../../../store/src/types/api.types';
 import {
   StartRequestAction,
@@ -29,7 +28,6 @@ export class GithubEffects {
     private actions$: Actions,
     private store: Store<CFAppState>,
     private scmService: GitSCMService,
-    private logger: LoggerService,
     private httpClient: HttpClient
   ) { }
   @Effect()
@@ -57,7 +55,7 @@ export class GithubEffects {
           ];
         }),
         catchError(err => [
-          new WrapperRequestActionFailed(createFailedGithubRequestMessage(err, this.logger), apiAction, actionType)
+          new WrapperRequestActionFailed(createFailedGithubRequestMessage(err), apiAction, actionType)
         ]
         ));
     }));
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 9cd7107c35..ed653a0ddd 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
@@ -3,7 +3,6 @@ import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 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 { rootUpdatingKey } from '../../../../store/src/reducers/api-request-reducer/types';
 import { getAPIRequestDataState } from '../../../../store/src/selectors/api.selectors';
@@ -26,7 +25,6 @@ export class CfValidateEffects {
   constructor(
     private actions$: Actions,
     private store: Store<CFAppState>,
-    private logger: LoggerService,
   ) { }
 
   /**
@@ -89,7 +87,7 @@ export class CfValidateEffects {
         })
       )
         .pipe(catchError(error => {
-          this.logger.warn(`Entity validation process failed`, error);
+          console.warn(`Entity validation process failed`, error);
           this.update(apiAction, false, error.message);
           return [];
         }));
diff --git a/src/frontend/packages/cloud-foundry/src/store/effects/users-roles.effects.ts b/src/frontend/packages/cloud-foundry/src/store/effects/users-roles.effects.ts
index c75fb997b0..789eeb837e 100644
--- a/src/frontend/packages/cloud-foundry/src/store/effects/users-roles.effects.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/effects/users-roles.effects.ts
@@ -2,9 +2,6 @@ import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
-import {
-  ManageUsersSetUsernamesHelper,
-} from 'frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component';
 import { combineLatest as observableCombineLatest, combineLatest, Observable, of as observableOf, of } from 'rxjs';
 import { catchError, filter, first, map, mergeMap, pairwise, switchMap, tap, withLatestFrom } from 'rxjs/operators';
 
@@ -21,6 +18,9 @@ import { AddCfUserRole, ChangeCfUserRole, RemoveCfUserRole } from '../../actions
 import { CFAppState } from '../../cf-app-state';
 import { organizationEntityType, spaceEntityType } from '../../cf-entity-types';
 import { CF_ENDPOINT_TYPE } from '../../cf-types';
+import {
+  ManageUsersSetUsernamesHelper,
+} from '../../features/cf/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component';
 import { CfUserService } from '../../shared/data-services/cf-user.service';
 import { fetchCfUserRole } from '../../user-permissions/cf-user-roles-fetch';
 import { selectCfUsersRoles } from '../selectors/cf-users-roles.selector';
diff --git a/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-permissions-checkers.ts b/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-permissions-checkers.ts
index 1aead1cd0f..f30b7697b4 100644
--- a/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-permissions-checkers.ts
+++ b/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-permissions-checkers.ts
@@ -39,7 +39,7 @@ export const cfCurrentUserPermissionsService = [
     deps: [Store]
   },
   CurrentUserPermissionsService,
-]
+];
 
 export enum CfCurrentUserPermissions {
   APPLICATION_VIEW = 'view.application',
@@ -164,7 +164,10 @@ export const cfPermissionConfigs: IPermissionConfigs = {
   [CfCurrentUserPermissions.ORGANIZATION_DELETE]: new PermissionConfig(CfPermissionTypes.ENDPOINT_SCOPE, CfScopeStrings.CF_ADMIN_GROUP),
   [CfCurrentUserPermissions.ORGANIZATION_EDIT]: new PermissionConfigLink(CfCurrentUserPermissions.ORGANIZATION_DELETE),
   [CfCurrentUserPermissions.ORGANIZATION_SUSPEND]: new PermissionConfig(CfPermissionTypes.ENDPOINT_SCOPE, CfScopeStrings.CF_ADMIN_GROUP),
-  [CfCurrentUserPermissions.ORGANIZATION_CHANGE_ROLES]: new PermissionConfig(CfPermissionTypes.ORGANIZATION, CfPermissionStrings.ORG_MANAGER),
+  [CfCurrentUserPermissions.ORGANIZATION_CHANGE_ROLES]: new PermissionConfig(
+    CfPermissionTypes.ORGANIZATION,
+    CfPermissionStrings.ORG_MANAGER
+  ),
   [CfCurrentUserPermissions.SERVICE_INSTANCE_DELETE]: new PermissionConfig(CfPermissionTypes.SPACE, CfPermissionStrings.SPACE_DEVELOPER),
   [CfCurrentUserPermissions.SERVICE_INSTANCE_CREATE]: new PermissionConfig(CfPermissionTypes.SPACE, CfPermissionStrings.SPACE_DEVELOPER),
   [CfCurrentUserPermissions.SERVICE_INSTANCE_EDIT]: new PermissionConfig(CfPermissionTypes.SPACE, CfPermissionStrings.SPACE_DEVELOPER),
@@ -191,7 +194,9 @@ export class CfUserPermissionsChecker extends BaseCurrentUserPermissionsChecker
     endpointGuid?: string,
     orgOrSpaceGuid?: string,
     allSpacesWithinOrg = false
-  ) {
+  ): Observable<boolean> {
+    // In some situations the observable returned here is not subscribed to (for example due to applyAdminCheck).
+    // This is bad (we should skip this function entirely) and should be fixed. This would require a thorough appraisal and overhaul.
     if (type === CfPermissionTypes.ENDPOINT_SCOPE) {
       if (!endpointGuid) {
         return of(false);
@@ -217,8 +222,8 @@ export class CfUserPermissionsChecker extends BaseCurrentUserPermissionsChecker
   };
 
   /**
-  * @param permissionConfig Single permission to be checked
-  */
+   * @param permissionConfig Single permission to be checked
+   */
   public getSimpleCheck(permissionConfig: PermissionConfig, endpointGuid?: string, orgOrSpaceGuid?: string, spaceGuid?: string) {
     const check$ = this.getBaseSimpleCheck(permissionConfig, endpointGuid, orgOrSpaceGuid, spaceGuid);
     if (permissionConfig.type === CfPermissionTypes.ORGANIZATION || permissionConfig.type === CfPermissionTypes.SPACE) {
@@ -327,8 +332,8 @@ export class CfUserPermissionsChecker extends BaseCurrentUserPermissionsChecker
   }
 
   /**
- * Includes read only admins, global auditors and users that don't have the cloud_controller.write scope
- */
+   * Includes read only admins, global auditors and users that don't have the cloud_controller.write scope
+   */
   private getReadOnlyCheck(endpointGuid: string) {
     return this.getCfEndpointState(endpointGuid).pipe(
       map(
@@ -357,6 +362,7 @@ export class CfUserPermissionsChecker extends BaseCurrentUserPermissionsChecker
           return of(true);
         }
         if (isReadOnly) {
+          // This is bad, we should not assume that the check type wants a negative result if the user only has 'read only' rights.
           return of(false);
         }
         return check$;
@@ -365,8 +371,8 @@ export class CfUserPermissionsChecker extends BaseCurrentUserPermissionsChecker
   }
 
   /**
- * If no endpoint is passed, check them all
- */
+   * If no endpoint is passed, check them all
+   */
   private getReadOnlyChecks(endpointGuid?: string) {
     const endpointGuids$ = this.getEndpointGuidObservable(endpointGuid);
     return endpointGuids$.pipe(
@@ -431,9 +437,9 @@ export class CfUserPermissionsChecker extends BaseCurrentUserPermissionsChecker
     const groupedChecks = this.groupConfigs(permissionConfigs);
     return Object.keys(groupedChecks).map((permission: PermissionTypes) => {
       const configGroup = groupedChecks[permission];
-      const checkCombiner = this.getBaseCheckFromConfig(configGroup, permission, endpointGuid, orgOrSpaceGuid, spaceGuid)
+      const checkCombiner = this.getBaseCheckFromConfig(configGroup, permission, endpointGuid, orgOrSpaceGuid, spaceGuid);
       if (checkCombiner) {
-        checkCombiner.checks = checkCombiner.checks.map(check$ => this.applyAdminCheck(check$, endpointGuid))
+        checkCombiner.checks = checkCombiner.checks.map(check$ => this.applyAdminCheck(check$, endpointGuid));
       }
       return checkCombiner;
     });
diff --git a/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-roles-fetch.ts b/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-roles-fetch.ts
index 06340d5496..e26807ae1b 100644
--- a/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-roles-fetch.ts
+++ b/src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-roles-fetch.ts
@@ -31,7 +31,10 @@ import { cfEntityCatalog } from '../cf-entity-catalog';
 import { CF_ENDPOINT_TYPE } from '../cf-types';
 import { CFResponse } from '../store/types/cf-api.types';
 
-const createEndpointArray = (store: Store<AppState>, endpoints: string[] | EntityUserRolesEndpoint[]): Observable<EntityUserRolesEndpoint[]> => {
+const createEndpointArray = (
+  store: Store<AppState>,
+  endpoints: string[] | EntityUserRolesEndpoint[]
+): Observable<EntityUserRolesEndpoint[]> => {
   // If there's no endpoints get all from store. Alternatively fetch specific endpoint id's from store
   if (!endpoints || !endpoints.length || typeof (endpoints[0]) === 'string') {
     const endpointIds = endpoints as string[];
@@ -44,7 +47,7 @@ const createEndpointArray = (store: Store<AppState>, endpoints: string[] | Entit
     );
   }
   return of(endpoints as EntityUserRolesEndpoint[]);
-}
+};
 
 export const cfUserRolesFetch: EntityUserRolesFetch = (
   endpoints: string[] | EntityUserRolesEndpoint[],
@@ -56,7 +59,7 @@ export const cfUserRolesFetch: EntityUserRolesFetch = (
       const isAllAdmins = cfEndpoints.every(endpoint => !!endpoint.user.admin);
       // If all endpoints are connected as admin, there's no permissions to fetch. So only update the permission state to initialised
       if (isAllAdmins) {
-        cfEndpoints.forEach(endpoint => store.dispatch(new GetCfUserRelations(endpoint.guid, GET_CURRENT_CF_USER_RELATIONS_SUCCESS)))
+        cfEndpoints.forEach(endpoint => store.dispatch(new GetCfUserRelations(endpoint.guid, GET_CURRENT_CF_USER_RELATIONS_SUCCESS)));
       } else {
         // If some endpoints are not connected as admin, go out and fetch the current user's specific roles
         const flagsAndRoleRequests = dispatchRoleRequests(cfEndpoints, store, httpClient);
@@ -67,8 +70,8 @@ export const cfUserRolesFetch: EntityUserRolesFetch = (
       }
       return of(true);
     })
-  )
-}
+  );
+};
 
 interface CfsRequestState {
   [cfGuid: string]: Observable<boolean>[];
@@ -97,7 +100,7 @@ function dispatchRoleRequests(
       store.dispatch(new GetCfUserRelations(endpoint.guid, GET_CURRENT_CF_USER_RELATIONS));
 
       // Dispatch feature flags fetch actions
-      const ffAction = cfEntityCatalog.featureFlag.actions.getMultiple(endpoint.guid)
+      const ffAction = cfEntityCatalog.featureFlag.actions.getMultiple(endpoint.guid);
       requests[endpoint.guid] = [createPaginationCompleteWatcher(store, ffAction)];
       store.dispatch(ffAction);
 
@@ -142,7 +145,7 @@ function fetchCfUserRoles(endpoint: IEndpointConnectionInfo, store: Store<AppSta
 
 class PermissionFlattener extends BaseHttpClientFetcher<CFResponse> implements PaginationFlattener<CFResponse, CFResponse> {
 
-  constructor(httpClient: HttpClient, public url, public requestOptions: { [key: string]: any }) {
+  constructor(httpClient: HttpClient, public url, public requestOptions: { [key: string]: any; }) {
     super(httpClient, url, requestOptions, 'page');
   }
   public getTotalPages = (res: CFResponse) => res.total_pages;
@@ -156,7 +159,7 @@ class PermissionFlattener extends BaseHttpClientFetcher<CFResponse> implements P
       return finalRes;
     }, firstRes);
     return final;
-  }
+  };
   public getTotalResults = (res: CFResponse): number => res.total_results;
   public clearResults = (res: CFResponse) => of(res);
 }
diff --git a/src/frontend/packages/core/sass/components/json-schema-form.scss b/src/frontend/packages/core/sass/components/json-schema-form.scss
new file mode 100644
index 0000000000..9f004b481a
--- /dev/null
+++ b/src/frontend/packages/core/sass/components/json-schema-form.scss
@@ -0,0 +1,5 @@
+json-schema-form {
+  mat-error.mat-error {
+    margin-bottom: .05rem;
+  }
+}
diff --git a/src/frontend/packages/core/src/api-driven-views/api-drive-views.types.ts b/src/frontend/packages/core/src/api-driven-views/api-drive-views.types.ts
deleted file mode 100644
index 7e902d54dd..0000000000
--- a/src/frontend/packages/core/src/api-driven-views/api-drive-views.types.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export class ApiEntityType {
-  constructor(
-    public type: string,
-    public title: string,
-    public imageUrl?: string
-  ) { }
-}
diff --git a/src/frontend/packages/core/src/api-driven-views/api-driven-views-routing.module.ts b/src/frontend/packages/core/src/api-driven-views/api-driven-views-routing.module.ts
deleted file mode 100644
index 1f7e0d4da2..0000000000
--- a/src/frontend/packages/core/src/api-driven-views/api-driven-views-routing.module.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { ApiEndpointTypeSelectPageComponent } from './features/api-endpoint-type-select-page/api-endpoint-type-select-page.component';
-import { ApiEntityTypeSelectPageComponent } from './features/api-entity-type-select-page/api-entity-type-select-page.component';
-import { ApiEndpointSelectPageComponent } from './features/api-endpoint-select-page/api-endpoint-select-page.component';
-import { ApiEntityListPageComponent } from './features/api-entity-list-page/api-entity-list-page.component';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: ApiEndpointTypeSelectPageComponent,
-    // children: [
-    //   {
-    //     path: ':endpointType',
-    //     component: ApiEntityTypeSelectPageComponent,
-    //     children: [{
-    //       path: '/:endpointGuid',
-    //       children: [{
-    //         path: '/:entityType'
-    //       }]
-    //     }]
-    //   }
-    // ]
-
-  },
-  {
-    path: ':endpointType',
-    component: ApiEndpointSelectPageComponent
-  },
-  {
-    path: ':endpointType/:endpointId',
-    component: ApiEntityTypeSelectPageComponent,
-    children: [{
-      path: ':entityType',
-      component: ApiEntityListPageComponent
-    }]
-  }
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
-})
-export class ApiDrivenViewsRoutingModule { }
diff --git a/src/frontend/packages/core/src/api-driven-views/api-driven-views.module.ts b/src/frontend/packages/core/src/api-driven-views/api-driven-views.module.ts
deleted file mode 100644
index 351b6eb173..0000000000
--- a/src/frontend/packages/core/src/api-driven-views/api-driven-views.module.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-
-import { ApiDrivenViewsRoutingModule } from './api-driven-views-routing.module';
-import { ApiEndpointSelectPageComponent } from './features/api-endpoint-select-page/api-endpoint-select-page.component';
-import { ApiEndpointTypeSelectPageComponent } from './features/api-endpoint-type-select-page/api-endpoint-type-select-page.component';
-import { ApiEntityTypeSelectPageComponent } from './features/api-entity-type-select-page/api-entity-type-select-page.component';
-import { ApiEntityListPageComponent } from './features/api-entity-list-page/api-entity-list-page.component';
-import { SharedModule } from '../shared/shared.module';
-import { ApiEntityListComponent } from './components/api-entity-list/api-entity-list.component';
-import { ApiEntityTypeSelectorComponent } from './components/api-type-selector/api-entity-type-selector.component';
-
-@NgModule({
-  declarations: [
-    ApiEndpointSelectPageComponent,
-    ApiEndpointTypeSelectPageComponent,
-    ApiEntityTypeSelectPageComponent,
-    ApiEntityListPageComponent,
-    ApiEntityListComponent,
-    ApiEntityTypeSelectorComponent
-  ],
-  imports: [
-    CommonModule,
-    SharedModule,
-    ApiDrivenViewsRoutingModule
-  ]
-})
-export class ApiDrivenViewsModule { }
diff --git a/src/frontend/packages/core/src/api-driven-views/components/api-entity-list/api-entity-list.component.html b/src/frontend/packages/core/src/api-driven-views/components/api-entity-list/api-entity-list.component.html
deleted file mode 100644
index c987a3c5a9..0000000000
--- a/src/frontend/packages/core/src/api-driven-views/components/api-entity-list/api-entity-list.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>api-entity-list works!</p>
diff --git a/src/frontend/packages/core/src/api-driven-views/components/api-entity-list/api-entity-list.component.scss b/src/frontend/packages/core/src/api-driven-views/components/api-entity-list/api-entity-list.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/frontend/packages/core/src/api-driven-views/components/api-entity-list/api-entity-list.component.spec.ts b/src/frontend/packages/core/src/api-driven-views/components/api-entity-list/api-entity-list.component.spec.ts
deleted file mode 100644
index f3913cbda0..0000000000
--- a/src/frontend/packages/core/src/api-driven-views/components/api-entity-list/api-entity-list.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ApiEntityListComponent } from './api-entity-list.component';
-
-describe('ApiEntityListComponent', () => {
-  let component: ApiEntityListComponent;
-  let fixture: ComponentFixture<ApiEntityListComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ApiEntityListComponent]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ApiEntityListComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/frontend/packages/core/src/api-driven-views/components/api-entity-list/api-entity-list.component.ts b/src/frontend/packages/core/src/api-driven-views/components/api-entity-list/api-entity-list.component.ts
deleted file mode 100644
index 45a254629d..0000000000
--- a/src/frontend/packages/core/src/api-driven-views/components/api-entity-list/api-entity-list.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-api-entity-list',
-  templateUrl: './api-entity-list.component.html',
-  styleUrls: ['./api-entity-list.component.scss']
-})
-export class ApiEntityListComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {
-  }
-
-}
diff --git a/src/frontend/packages/core/src/api-driven-views/components/api-type-selector/api-entity-type-selector.component.html b/src/frontend/packages/core/src/api-driven-views/components/api-type-selector/api-entity-type-selector.component.html
deleted file mode 100644
index e18ecb279a..0000000000
--- a/src/frontend/packages/core/src/api-driven-views/components/api-type-selector/api-entity-type-selector.component.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<app-tile-selector *ngIf="entityTiles" [options]="entityTiles" (selection)="emitEntitySelection($event)">
-</app-tile-selector>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/api-driven-views/components/api-type-selector/api-entity-type-selector.component.scss b/src/frontend/packages/core/src/api-driven-views/components/api-type-selector/api-entity-type-selector.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/frontend/packages/core/src/api-driven-views/components/api-type-selector/api-entity-type-selector.component.spec.ts b/src/frontend/packages/core/src/api-driven-views/components/api-type-selector/api-entity-type-selector.component.spec.ts
deleted file mode 100644
index b54398c933..0000000000
--- a/src/frontend/packages/core/src/api-driven-views/components/api-type-selector/api-entity-type-selector.component.spec.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ApiEntityType } from '../../api-drive-views.types';
-import { SharedModule } from '../../../shared/shared.module';
-import { ApiEntityTypeSelectorComponent } from './api-entity-type-selector.component';
-import { ApiDrivenViewsModule } from '../../api-driven-views.module';
-
-describe('ApiEntityTypeSelectorComponent', () => {
-  let component: ApiEntityTypeSelectorComponent;
-  let fixture: ComponentFixture<ApiEntityTypeSelectorComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [SharedModule, ApiDrivenViewsModule]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ApiEntityTypeSelectorComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-
-  it('should render endpoint', () => {
-    const endpointTypes: ApiEntityType[] = [{
-      title: 'Endpoint1',
-      imageUrl: 'image1',
-      type: 'endpoint1Type'
-    },
-    {
-      title: 'Endpoint2',
-      imageUrl: 'image2',
-      type: 'endpoint2Type'
-    }];
-    component.entityTypes = endpointTypes;
-    fixture.detectChanges();
-    const element: HTMLElement = fixture.nativeElement;
-    const tileElements = Array.from(element.getElementsByClassName('tile-selector'));
-    expect(tileElements.length).toBe(2);
-    expect(tileElements.length).toBe(2);
-    tileElements.forEach((tile, index) => {
-      expect(tile.getElementsByClassName('tile-selector__content')[0].textContent)
-        .toBe(endpointTypes[index].title);
-      expect(
-        tile.getElementsByClassName('tile-selector__header')[0]
-          .getElementsByTagName('img')[0]
-          .attributes.getNamedItem('src')
-          .value
-      )
-        .toBe(endpointTypes[index].imageUrl);
-
-    });
-  });
-});
diff --git a/src/frontend/packages/core/src/api-driven-views/components/api-type-selector/api-entity-type-selector.component.ts b/src/frontend/packages/core/src/api-driven-views/components/api-type-selector/api-entity-type-selector.component.ts
deleted file mode 100644
index eb61fb957d..0000000000
--- a/src/frontend/packages/core/src/api-driven-views/components/api-type-selector/api-entity-type-selector.component.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Component, OnInit, Input, Output } from '@angular/core';
-import { ApiEntityType } from '../../api-drive-views.types';
-import { ITileConfig, ITileImgConfig } from '../../../shared/components/tile/tile-selector.types';
-import { Subject } from 'rxjs';
-
-@Component({
-  selector: 'app-api-entity-type-selector',
-  templateUrl: './api-entity-type-selector.component.html',
-  styleUrls: ['./api-entity-type-selector.component.scss']
-})
-export class ApiEntityTypeSelectorComponent implements OnInit {
-  public entityTiles: ITileConfig[];
-  @Input() set entityTypes(types: ApiEntityType[]) {
-    this.entityTiles = types.map(type => {
-      return new ITileConfig(type.title, {
-        location: type.imageUrl
-      }, {
-          type: type.type
-        }
-      );
-    });
-  }
-  @Output() public entitySelected = new Subject<ApiEntityType>();
-
-  public emitEntitySelection(tile: ITileConfig) {
-    if (tile) {
-      this.entitySelected.next(
-        new ApiEntityType(tile.data.type as string, tile.label as string, (tile.graphic as ITileImgConfig).location)
-      );
-    } else {
-      this.entitySelected.next(null);
-    }
-  }
-
-  constructor() { }
-
-  ngOnInit() {
-  }
-
-}
diff --git a/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-select-page/api-endpoint-select-page.component.html b/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-select-page/api-endpoint-select-page.component.html
deleted file mode 100644
index 52f7688c92..0000000000
--- a/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-select-page/api-endpoint-select-page.component.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<app-page-header>
-  Select Endpoint
-</app-page-header>
-<app-api-entity-type-selector [entityTypes]="connectedEndpointsOfType$ | async"
-  (entitySelected)="endpointSelected($event)">
-</app-api-entity-type-selector>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-select-page/api-endpoint-select-page.component.scss b/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-select-page/api-endpoint-select-page.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
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
deleted file mode 100644
index e8e2769c61..0000000000
--- a/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-select-page/api-endpoint-select-page.component.spec.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TabNavService } from 'frontend/packages/core/tab-nav.service';
-import { generateBaseTestStoreModules } from 'frontend/packages/core/test-framework/core-test.helper';
-
-import { CoreModule } from '../../../core/core.module';
-import { SharedModule } from '../../../shared/shared.module';
-import { ApiDrivenViewsModule } from '../../api-driven-views.module';
-import { ApiEndpointSelectPageComponent } from './api-endpoint-select-page.component';
-
-describe('ApiEndpointSelectPageComponent', () => {
-  let component: ApiEndpointSelectPageComponent;
-  let fixture: ComponentFixture<ApiEndpointSelectPageComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        ...generateBaseTestStoreModules(),
-        CoreModule,
-        RouterTestingModule,
-        SharedModule,
-        ApiDrivenViewsModule,
-      ],
-      providers: [
-        TabNavService,
-      ]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ApiEndpointSelectPageComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-select-page/api-endpoint-select-page.component.ts b/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-select-page/api-endpoint-select-page.component.ts
deleted file mode 100644
index 01b3c5f54e..0000000000
--- a/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-select-page/api-endpoint-select-page.component.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { GeneralAppState } from '../../../../../store/src/app-state';
-import { Observable } from 'rxjs';
-import { ApiEntityType } from '../../api-drive-views.types';
-import { Store } from '@ngrx/store';
-import { connectedEndpointsOfTypesSelector } from '../../../../../store/src/selectors/endpoint.selectors';
-import { ActivatedRoute, Router } from '@angular/router';
-import { map, filter } from 'rxjs/operators';
-
-@Component({
-  selector: 'app-api-endpoint-select-page',
-  templateUrl: './api-endpoint-select-page.component.html',
-  styleUrls: ['./api-endpoint-select-page.component.scss']
-})
-export class ApiEndpointSelectPageComponent implements OnInit {
-  public connectedEndpointsOfType$: Observable<ApiEntityType[]>;
-  constructor(
-    private store: Store<GeneralAppState>,
-    private route: ActivatedRoute,
-    private router: Router
-  ) { }
-  public endpointSelected(endpoint: ApiEntityType) {
-    this.router.navigate([endpoint.type], { relativeTo: this.route });
-  }
-  ngOnInit() {
-    const endpointType = this.route.snapshot.params.endpointType;
-
-    this.connectedEndpointsOfType$ = this.store.select(connectedEndpointsOfTypesSelector(endpointType)).pipe(
-      map(endpointsMap => Object.values(endpointsMap)),
-      filter(endpoints => !!endpoints || !endpoints.length),
-      map(endpoints => endpoints.map(endpoint => new ApiEntityType(
-        endpoint.guid,
-        endpoint.name
-        //  TODO Get icon from entity catalog
-      )))
-    );
-  }
-
-}
diff --git a/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.html b/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.html
deleted file mode 100644
index 63099672f9..0000000000
--- a/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<app-page-header>
-  Select Endpoint Type
-</app-page-header>
-<app-api-entity-type-selector [entityTypes]="connectedEndpointTypes$ | async"
-  (entitySelected)="endpointSelected($event)">
-</app-api-entity-type-selector>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.scss b/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.spec.ts b/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.spec.ts
deleted file mode 100644
index 960cbecc80..0000000000
--- a/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.spec.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TabNavService } from 'frontend/packages/core/tab-nav.service';
-
-import { generateBaseTestStoreModules } from '../../../../test-framework/core-test.helper';
-import { CoreModule } from '../../../core/core.module';
-import { SharedModule } from '../../../shared/shared.module';
-import { ApiDrivenViewsModule } from '../../api-driven-views.module';
-import { ApiEndpointTypeSelectPageComponent } from './api-endpoint-type-select-page.component';
-
-describe('ApiEndpointTypeSelectPageComponent', () => {
-  let component: ApiEndpointTypeSelectPageComponent;
-  let fixture: ComponentFixture<ApiEndpointTypeSelectPageComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        ...generateBaseTestStoreModules(),
-        CoreModule,
-        RouterTestingModule,
-        SharedModule,
-        ApiDrivenViewsModule,
-      ],
-      providers: [TabNavService]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ApiEndpointTypeSelectPageComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
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
deleted file mode 100644
index c897ea9c69..0000000000
--- a/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
-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';
-import { ApiEntityType } from '../../api-drive-views.types';
-
-@Component({
-  selector: 'app-api-endpoint-type-select-page',
-  templateUrl: './api-endpoint-type-select-page.component.html',
-  styleUrls: ['./api-endpoint-type-select-page.component.scss']
-})
-export class ApiEndpointTypeSelectPageComponent implements OnInit {
-  public connectedEndpointTypes$: Observable<ApiEntityType[]>;
-  constructor(
-    public store: Store<GeneralAppState>,
-    public router: Router,
-    public activeRoute: ActivatedRoute
-  ) { }
-  public endpointSelected(endpoint: ApiEntityType) {
-    this.router.navigate([endpoint.type], { relativeTo: this.activeRoute });
-  }
-  ngOnInit() {
-    const endpointTypes = entityCatalog.getAllEndpointTypes();
-    const endpointTypesWithEntities = endpointTypes
-      .filter(endpointType => entityCatalog.getAllEntitiesForEndpointType(endpointType.type).length > 0);
-    this.connectedEndpointTypes$ = this.store.select(endpointEntitiesSelector).pipe(
-      map(endpoints => {
-        const endpointTypeSet = new Set<string>();
-        Object.values(endpoints).forEach(endpoint => {
-          if (endpoint.connectionStatus === 'connected') {
-            endpointTypeSet.add(endpoint.cnsi_type);
-          }
-        });
-        return Array.from(endpointTypeSet)
-          .map(type => endpointTypesWithEntities.find(endpoint => endpoint.type === type))
-          .filter(endpoint => !!endpoint)
-          .map(endpoint => new ApiEntityType(endpoint.type, endpoint.definition.label, endpoint.definition.logoUrl));
-      })
-    );
-  }
-
-}
diff --git a/src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.html b/src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.html
deleted file mode 100644
index e3a7a3b7f3..0000000000
--- a/src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<app-simple-list *ngIf="catalogEntity" [catalogEntity]="catalogEntity"></app-simple-list>
diff --git a/src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.scss b/src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.spec.ts b/src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.spec.ts
deleted file mode 100644
index b06b48139e..0000000000
--- a/src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.spec.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { generateBaseTestStoreModules } from '../../../../test-framework/core-test.helper';
-import { CoreModule } from '../../../core/core.module';
-import { SharedModule } from '../../../shared/shared.module';
-import { ApiDrivenViewsModule } from '../../api-driven-views.module';
-import { ApiEntityListPageComponent } from './api-entity-list-page.component';
-
-describe('ApiEntityListPageComponent', () => {
-  let component: ApiEntityListPageComponent;
-  let fixture: ComponentFixture<ApiEntityListPageComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        ...generateBaseTestStoreModules(),
-        CoreModule,
-        RouterTestingModule,
-        SharedModule,
-        ApiDrivenViewsModule,
-      ]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ApiEntityListPageComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
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
deleted file mode 100644
index eff169381f..0000000000
--- a/src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-
-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',
-  templateUrl: './api-entity-list-page.component.html',
-  styleUrls: ['./api-entity-list-page.component.scss']
-})
-export class ApiEntityListPageComponent implements OnInit {
-  public catalogEntity: StratosBaseCatalogEntity;
-  constructor(
-    public route: ActivatedRoute
-  ) { }
-
-  ngOnInit() {
-    const endpointType = this.route.parent ? this.route.parent.snapshot.params.endpointType : null;
-    const entityType = this.route.snapshot.params.entityType;
-    this.catalogEntity = entityCatalog.getEntity(endpointType, entityType);
-  }
-
-}
diff --git a/src/frontend/packages/core/src/api-driven-views/features/api-entity-type-select-page/api-entity-type-select-page.component.html b/src/frontend/packages/core/src/api-driven-views/features/api-entity-type-select-page/api-entity-type-select-page.component.html
deleted file mode 100644
index cb561c92a3..0000000000
--- a/src/frontend/packages/core/src/api-driven-views/features/api-entity-type-select-page/api-entity-type-select-page.component.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<app-page-header [tabs]="tabs">
-  {{ connectedEndpointsOfType$ | async }}
-</app-page-header>
-<router-outlet></router-outlet>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/api-driven-views/features/api-entity-type-select-page/api-entity-type-select-page.component.scss b/src/frontend/packages/core/src/api-driven-views/features/api-entity-type-select-page/api-entity-type-select-page.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/frontend/packages/core/src/api-driven-views/features/api-entity-type-select-page/api-entity-type-select-page.component.spec.ts b/src/frontend/packages/core/src/api-driven-views/features/api-entity-type-select-page/api-entity-type-select-page.component.spec.ts
deleted file mode 100644
index 12963030bf..0000000000
--- a/src/frontend/packages/core/src/api-driven-views/features/api-entity-type-select-page/api-entity-type-select-page.component.spec.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TabNavService } from 'frontend/packages/core/tab-nav.service';
-
-import { generateBaseTestStoreModules } from '../../../../test-framework/core-test.helper';
-import { CoreModule } from '../../../core/core.module';
-import { SharedModule } from '../../../shared/shared.module';
-import { ApiDrivenViewsModule } from '../../api-driven-views.module';
-import { ApiEntityTypeSelectPageComponent } from './api-entity-type-select-page.component';
-
-describe('ApiEntityTypeSelectPageComponent', () => {
-  let component: ApiEntityTypeSelectPageComponent;
-  let fixture: ComponentFixture<ApiEntityTypeSelectPageComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        ...generateBaseTestStoreModules(),
-        CoreModule,
-        RouterTestingModule,
-        SharedModule,
-        ApiDrivenViewsModule,
-      ],
-      providers: [TabNavService]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ApiEntityTypeSelectPageComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
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
deleted file mode 100644
index 69ce1bc3f9..0000000000
--- a/src/frontend/packages/core/src/api-driven-views/features/api-entity-type-select-page/api-entity-type-select-page.component.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-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 { TabNavService } from '../../../../tab-nav.service';
-import { IPageSideNavTab } from '../../../features/dashboard/page-side-nav/page-side-nav.component';
-
-@Component({
-  selector: 'app-api-entity-type-select-page',
-  templateUrl: './api-entity-type-select-page.component.html',
-  styleUrls: ['./api-entity-type-select-page.component.scss']
-})
-export class ApiEntityTypeSelectPageComponent implements OnInit {
-  public connectedEndpointsOfType$: Observable<string>;
-  public tabs: IPageSideNavTab[];
-  constructor(
-    private route: ActivatedRoute,
-    private router: Router,
-    private tabNavService: TabNavService,
-    private store: Store<GeneralAppState>
-  ) { }
-
-  ngOnInit() {
-    const endpointGuid = this.route.snapshot.params.endpointId;
-    const endpointType = this.route.snapshot.params.endpointType;
-    const endpointEntity = entityCatalog.getEndpoint(endpointType);
-    const endpointEntities = entityCatalog.getAllEntitiesForEndpointType(endpointType);
-    const entitiesWithGetMultiple = endpointEntities.filter(
-      entity => entity && entity.definition.tableConfig && entity.actionOrchestrator.hasActionBuilder('getMultiple')
-    );
-    this.connectedEndpointsOfType$ = this.store.select(connectedEndpointsOfTypesSelector(endpointType)).pipe(
-      map(endpoints => endpoints[endpointGuid] ? endpoints[endpointGuid].name : 'Entities')
-    );
-    if (endpointEntity) {
-      this.tabNavService.setHeader(endpointEntity.definition.label);
-    }
-    this.tabs = entitiesWithGetMultiple.map(entity => {
-      return {
-        link: entity.type,
-        label: entity.definition.labelPlural,
-        icon: entity.definition.icon,
-        iconFont: entity.definition.iconFont
-      };
-    });
-  }
-
-}
diff --git a/src/frontend/packages/core/src/app.module.ts b/src/frontend/packages/core/src/app.module.ts
index 64f5ca665b..0ed0d1b159 100644
--- a/src/frontend/packages/core/src/app.module.ts
+++ b/src/frontend/packages/core/src/app.module.ts
@@ -24,8 +24,6 @@ import { generateStratosEntities } from '../../store/src/stratos-entity-generato
 import { EndpointModel } from '../../store/src/types/endpoint.types';
 import { IFavoriteMetadata, UserFavorite } from '../../store/src/types/user-favorites.types';
 import { UserFavoriteManager } from '../../store/src/user-favorite-manager';
-import { TabNavService } from '../tab-nav.service';
-import { XSRFModule } from '../xsrf.module';
 import { AppComponent } from './app.component';
 import { RouteModule } from './app.routing';
 import { CoreModule } from './core/core.module';
@@ -47,6 +45,8 @@ import { CustomReuseStrategy } from './route-reuse-stragegy';
 import { endpointEventKey, GlobalEventData, GlobalEventService } from './shared/global-events.service';
 import { SidePanelService } from './shared/services/side-panel.service';
 import { SharedModule } from './shared/shared.module';
+import { TabNavService } from './tab-nav.service';
+import { XSRFModule } from './xsrf.module';
 
 // Create action for router navigation. See
 // - https://github.com/ngrx/platform/issues/68
diff --git a/src/frontend/packages/core/src/app.routing.ts b/src/frontend/packages/core/src/app.routing.ts
index 2020929d92..a54b1c30d5 100644
--- a/src/frontend/packages/core/src/app.routing.ts
+++ b/src/frontend/packages/core/src/app.routing.ts
@@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
+import { APIKeyAuthGuardService } from './core/apiKey-auth-guard.service';
 import { AuthGuardService } from './core/auth-guard.service';
 import { CoreModule } from './core/core.module';
 import { EndpointsService } from './core/endpoints.service';
@@ -72,7 +73,6 @@ const appRoutes: Routes = [
           }
         }
       },
-      { path: 'entity-list', loadChildren: () => import('./api-driven-views/api-driven-views.module').then(m => m.ApiDrivenViewsModule) },
       {
         path: 'endpoints',
         data: {
@@ -95,6 +95,11 @@ const appRoutes: Routes = [
       },
       { path: 'about', loadChildren: () => import('./features/about/about.module').then(m => m.AboutModule) },
       { path: 'user-profile', loadChildren: () => import('./features/user-profile/user-profile.module').then(m => m.UserProfileModule) },
+      {
+        path: 'api-keys',
+        loadChildren: () => import('./features/api-keys/api-keys.module').then(m => m.ApiKeysModule),
+        canActivate: [APIKeyAuthGuardService]
+      },
       { path: 'events', loadChildren: () => import('./features/event-page/event-page.module').then(m => m.EventPageModule) },
       {
         path: 'errors/:endpointId',
diff --git a/src/frontend/packages/core/src/core/apiKey-auth-guard.service.ts b/src/frontend/packages/core/src/core/apiKey-auth-guard.service.ts
new file mode 100644
index 0000000000..70e965da23
--- /dev/null
+++ b/src/frontend/packages/core/src/core/apiKey-auth-guard.service.ts
@@ -0,0 +1,30 @@
+import { Injectable } from '@angular/core';
+import { CanActivate } from '@angular/router';
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { RouterNav } from '../../../store/src/actions/router.actions';
+import { AppState } from '../../../store/src/app-state';
+import { CurrentUserPermissionsService } from './permissions/current-user-permissions.service';
+import { StratosCurrentUserPermissions } from './permissions/stratos-user-permissions.checker';
+
+@Injectable()
+export class APIKeyAuthGuardService implements CanActivate {
+
+  constructor(
+    private store: Store<AppState>,
+    private cups: CurrentUserPermissionsService,
+  ) { }
+
+  canActivate(): Observable<boolean> {
+    return this.cups.can(StratosCurrentUserPermissions.API_KEYS).pipe(
+      map(can => {
+        if (!can) {
+          this.store.dispatch(new RouterNav({ path: ['/'] }));
+        }
+        return can;
+      })
+    );
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/core/core.module.ts b/src/frontend/packages/core/src/core/core.module.ts
index ff8b4eb280..792f489d5c 100644
--- a/src/frontend/packages/core/src/core/core.module.ts
+++ b/src/frontend/packages/core/src/core/core.module.ts
@@ -12,6 +12,7 @@ import { PaginationMonitorFactory } from '../../../store/src/monitors/pagination
 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 { APIKeyAuthGuardService } from './apiKey-auth-guard.service';
 import { AuthGuardService } from './auth-guard.service';
 import { ButtonBlurOnClickDirective } from './button-blur-on-click.directive';
 import { BytesToHumanSize, MegaBytesToHumanSize } from './byte-formatters.pipe';
@@ -24,7 +25,6 @@ import { EntityFavoriteStarComponent } from './entity-favorite-star/entity-favor
 import { EventWatcherService } from './event-watcher/event-watcher.service';
 import { InfinityPipe } from './infinity.pipe';
 import { LogOutDialogComponent } from './log-out-dialog/log-out-dialog.component';
-import { LoggerService } from './logger.service';
 import { MDAppModule } from './md.module';
 import { NotSetupGuardService } from './not-setup-guard.service';
 import { PageHeaderService } from './page-header-service/page-header.service';
@@ -70,12 +70,12 @@ import { WindowRef } from './window-ref/window-ref.service';
   ],
   providers: [
     AuthGuardService,
+    APIKeyAuthGuardService,
     NotSetupGuardService,
     PageHeaderService,
     EventWatcherService,
     WindowRef,
     UtilsService,
-    LoggerService,
     EndpointsService,
     UserService,
     EntityServiceFactory,
diff --git a/src/frontend/packages/core/endpoints-health-checks.ts b/src/frontend/packages/core/src/core/endpoints-health-checks.ts
similarity index 74%
rename from src/frontend/packages/core/endpoints-health-checks.ts
rename to src/frontend/packages/core/src/core/endpoints-health-checks.ts
index 11e46ae3fc..37a5c3164b 100644
--- a/src/frontend/packages/core/endpoints-health-checks.ts
+++ b/src/frontend/packages/core/src/core/endpoints-health-checks.ts
@@ -1,8 +1,8 @@
 import { Injectable } from '@angular/core';
 
-import { entityCatalog } from '../store/src/entity-catalog/entity-catalog';
-import { EndpointHealthCheck } from '../store/src/entity-catalog/entity-catalog.types';
-import { EndpointModel } from '../store/src/types/endpoint.types';
+import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
+import { EndpointHealthCheck } from '../../../store/src/entity-catalog/entity-catalog.types';
+import { EndpointModel } from '../../../store/src/types/endpoint.types';
 
 @Injectable({
   providedIn: 'root'
diff --git a/src/frontend/packages/core/src/core/endpoints.service.ts b/src/frontend/packages/core/src/core/endpoints.service.ts
index 6354590f8a..8da0f1d610 100644
--- a/src/frontend/packages/core/src/core/endpoints.service.ts
+++ b/src/frontend/packages/core/src/core/endpoints.service.ts
@@ -11,8 +11,8 @@ import { EndpointHealthCheck } from '../../../store/src/entity-catalog/entity-ca
 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';
-import { EndpointHealthChecks } from '../../endpoints-health-checks';
 import { endpointHasMetricsByAvailable } from '../features/endpoints/endpoint-helpers';
+import { EndpointHealthChecks } from './endpoints-health-checks';
 import { UserService } from './user.service';
 
 
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 c2d198c7d6..495dd76d8e 100644
--- a/src/frontend/packages/core/src/core/extension/extension-service.ts
+++ b/src/frontend/packages/core/src/core/extension/extension-service.ts
@@ -66,9 +66,9 @@ export interface StratosExtensionRoutes {
 // Stores the extension metadata as defined by the decorators
 const extensionMetadata = {
   loginComponent: null,
-  extensionRoutes: {} as { [key: string]: StratosExtensionRoutes[] },
-  tabs: {} as { [key: string]: IPageSideNavTab[] },
-  actions: {} as { [key: string]: StratosActionMetadata[] },
+  extensionRoutes: {} as { [key: string]: StratosExtensionRoutes[], },
+  tabs: {} as { [key: string]: IPageSideNavTab[], },
+  actions: {} as { [key: string]: StratosActionMetadata[], },
 };
 
 /**
@@ -118,6 +118,10 @@ function addExtensionAction(action: StratosActionType, target: any, props: Strat
   extensionMetadata.actions[action].push(props);
 }
 
+// Empty module used to support the registration of Extension Components
+@NgModule()
+export class ExtEmptyModule { }
+
 // Injectable Extension Service
 @Injectable({
   providedIn: 'root',
@@ -201,7 +205,3 @@ 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 { }
diff --git a/src/frontend/packages/core/src/core/logger.service.spec.ts b/src/frontend/packages/core/src/core/logger.service.spec.ts
deleted file mode 100644
index 1720fe0b84..0000000000
--- a/src/frontend/packages/core/src/core/logger.service.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { inject, TestBed } from '@angular/core/testing';
-import { createBasicStoreModule } from '@stratosui/store/testing';
-
-import { CoreTestingModule } from '../../test-framework/core-test.modules';
-import { LoggerService } from './logger.service';
-
-describe('LoggerService', () => {
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [
-        LoggerService
-      ],
-      imports: [
-        CoreTestingModule,
-        createBasicStoreModule(),
-      ]
-    });
-  });
-
-  it('should be created', inject([LoggerService], (service: LoggerService) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/src/frontend/packages/core/src/core/logger.service.ts b/src/frontend/packages/core/src/core/logger.service.ts
deleted file mode 100644
index 2a98c6cbf4..0000000000
--- a/src/frontend/packages/core/src/core/logger.service.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
-
-import {
-  LoggerDebugAction,
-  LoggerErrorAction,
-  LoggerInfoAction,
-  LoggerWarnAction,
-  LogLevel,
-} from '../../../store/src/actions/log.actions';
-import { GeneralEntityAppState } from '../../../store/src/app-state';
-import { environment } from '../environments/environment.prod';
-
-export enum LogLevelStringToNumber {
-  DEBUG = 0,
-  INFO = 1,
-  WARN = 2,
-  ERROR = 3
-}
-
-@Injectable()
-export class LoggerService {
-
-  constructor(private store: Store<GeneralEntityAppState>) { }
-
-  private log(level: LogLevel, message: string, arg: any) {
-    if (LogLevelStringToNumber[level] < LogLevelStringToNumber[environment.logLevel] || !environment.logToConsole) {
-      return;
-    }
-    const date = new Date();
-    message = `${date.toUTCString()}- ${message}`;
-
-    let func = console.log;
-    switch (level) {
-      case LogLevel.ERROR:
-        func = console.error;
-        this.store.dispatch(new LoggerErrorAction(message));
-        break;
-      case LogLevel.WARN:
-        func = console.warn;
-        this.store.dispatch(new LoggerWarnAction(message));
-        break;
-      case LogLevel.INFO:
-        // tslint:disable-next-line:no-console
-        func = console.info;
-        this.store.dispatch(new LoggerInfoAction(message));
-        break;
-      case LogLevel.DEBUG:
-        func = console.log;
-        this.store.dispatch(new LoggerDebugAction(message));
-        break;
-    }
-
-    if (arg) {
-      func(message, arg);
-    } else {
-      func(message);
-    }
-  }
-
-  debug(message: string, arg?: any) {
-    this.log(LogLevel.DEBUG, message, arg);
-  }
-
-  info(message: string, arg?: any) {
-    this.log(LogLevel.INFO, message, arg);
-  }
-
-  warn(message: string, arg?: any) {
-    this.log(LogLevel.WARN, message, arg);
-  }
-
-  error(message: string, arg?: any) {
-    this.log(LogLevel.ERROR, message, arg);
-  }
-
-}
diff --git a/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.ts b/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.ts
index 4ad096b7c5..c7cf116b80 100644
--- a/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.ts
+++ b/src/frontend/packages/core/src/core/permissions/current-user-permissions.service.ts
@@ -5,7 +5,6 @@ import { distinctUntilChanged, map, switchMap } from 'rxjs/operators';
 
 import { InternalAppState } from '../../../../store/src/app-state';
 import { stratosEntityCatalog } from '../../../../store/src/stratos-entity-catalog';
-import { LoggerService } from '../logger.service';
 import {
   CurrentUserPermissions,
   PermissionConfig,
@@ -28,7 +27,6 @@ export class CurrentUserPermissionsService {
   constructor(
     private store: Store<InternalAppState>,
     @Optional() @Inject(CUSTOM_USER_PERMISSION_CHECKERS) customCheckers: ICurrentUserPermissionsChecker[],
-    private logger: LoggerService
   ) {
     // Cannot set default value for parameter as the Optional decorator sets it to null
     const nullSafeCustomCheckers = customCheckers || [];
@@ -136,7 +134,9 @@ export class CurrentUserPermissionsService {
   private combineChecks(
     checkCombiners: IPermissionCheckCombiner[],
   ) {
-    const reducedChecks = checkCombiners.map(combiner => BaseCurrentUserPermissionsChecker.reduceChecks(combiner.checks, combiner.combineType));
+    const reducedChecks = checkCombiners.map(combiner =>
+      BaseCurrentUserPermissionsChecker.reduceChecks(combiner.checks, combiner.combineType)
+    );
     return combineLatest(reducedChecks).pipe(
       map(checks => checks.every(check => check))
     );
@@ -172,21 +172,21 @@ export class CurrentUserPermissionsService {
     failureValue: T
   ): T {
     const res: T[] = [];
-    for (let i = 0; i < this.allCheckers.length; i++) {
-      const checkerRes = checkFn(this.allCheckers[i]);
+    for (const checker of this.allCheckers) {
+      const checkerRes = checkFn(checker);
       if (checkerRes) {
         res.push(checkerRes);
       }
     }
-    if (res.length == 0) {
-      this.logger.warn(`Permissions: Failed to find a '${checkNoun}' for '${checkType}'. Permission Denied.`);
+    if (res.length === 0) {
+      console.warn(`Permissions: Failed to find a '${checkNoun}' for '${checkType}'. Permission Denied.`);
       return failureValue;
     }
     if (res.length === 1) {
       return res[0];
     }
     if (res.length > 1) {
-      this.logger.warn(`Permissions: Found too many '${checkNoun}' for '${checkType}'. Permission Denied.`);
+      console.warn(`Permissions: Found too many '${checkNoun}' for '${checkType}'. Permission Denied.`);
       return failureValue;
     }
   }
diff --git a/src/frontend/packages/core/src/core/permissions/stratos-user-permissions.checker.ts b/src/frontend/packages/core/src/core/permissions/stratos-user-permissions.checker.ts
index db4c382b26..181f62a1a0 100644
--- a/src/frontend/packages/core/src/core/permissions/stratos-user-permissions.checker.ts
+++ b/src/frontend/packages/core/src/core/permissions/stratos-user-permissions.checker.ts
@@ -1,12 +1,15 @@
 import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
+import { switchMap } from 'rxjs/operators';
 
 import { GeneralEntityAppState } from '../../../../store/src/app-state';
+import { selectSessionData } from '../../../../store/src/reducers/auth.reducer';
 import {
   getCurrentUserStratosHasScope,
   getCurrentUserStratosRole,
   PermissionValues,
 } from '../../../../store/src/selectors/current-user-role.selectors';
+import { APIKeysEnabled } from '../../../../store/src/types/auth.types';
 import { IPermissionConfigs, PermissionConfig, PermissionTypes } from './current-user-permissions.config';
 import {
   BaseCurrentUserPermissionsChecker,
@@ -19,6 +22,10 @@ import {
 export enum StratosCurrentUserPermissions {
   ENDPOINT_REGISTER = 'register.endpoint',
   PASSWORD_CHANGE = 'change-password',
+  /**
+   * Does the user have permission to view/create/delete their own API Keys?
+   */
+  API_KEYS = 'api-keys'
 }
 
 export enum StratosPermissionStrings {
@@ -34,20 +41,28 @@ export enum StratosScopeStrings {
 
 export enum StratosPermissionTypes {
   STRATOS = 'internal',
-  STRATOS_SCOPE = 'internal-scope'
+  STRATOS_SCOPE = 'internal-scope',
+  API_KEY = 'api-key'
 }
 
 // For each set permissions are checked by permission types of ENDPOINT, ENDPOINT_SCOPE, STRATOS_SCOPE, FEATURE_FLAG or a random bag.
 // Every group result must be true in order for the permission to be true. A group result is true if all or some of it's permissions are
 // true (see `getCheckFromConfig`).
 export const stratosPermissionConfigs: IPermissionConfigs = {
-  [StratosCurrentUserPermissions.ENDPOINT_REGISTER]: new PermissionConfig(StratosPermissionTypes.STRATOS, StratosPermissionStrings.STRATOS_ADMIN),
-  [StratosCurrentUserPermissions.PASSWORD_CHANGE]: new PermissionConfig(StratosPermissionTypes.STRATOS_SCOPE, StratosScopeStrings.STRATOS_CHANGE_PASSWORD),
+  [StratosCurrentUserPermissions.ENDPOINT_REGISTER]: new PermissionConfig(
+    StratosPermissionTypes.STRATOS,
+    StratosPermissionStrings.STRATOS_ADMIN
+  ),
+  [StratosCurrentUserPermissions.PASSWORD_CHANGE]: new PermissionConfig(
+    StratosPermissionTypes.STRATOS_SCOPE,
+    StratosScopeStrings.STRATOS_CHANGE_PASSWORD
+  ),
+  [StratosCurrentUserPermissions.API_KEYS]: new PermissionConfig(StratosPermissionTypes.API_KEY, '')
 };
 
 export class StratosUserPermissionsChecker extends BaseCurrentUserPermissionsChecker implements ICurrentUserPermissionsChecker {
   constructor(private store: Store<GeneralEntityAppState>, ) {
-    super()
+    super();
   }
 
   getPermissionConfig(action: string) {
@@ -75,6 +90,8 @@ export class StratosUserPermissionsChecker extends BaseCurrentUserPermissionsChe
         return this.getInternalCheck(permissionConfig.permission as StratosPermissionStrings);
       case (StratosPermissionTypes.STRATOS_SCOPE):
         return this.getInternalScopesCheck(permissionConfig.permission as StratosScopeStrings);
+      case (StratosPermissionTypes.API_KEY):
+        return this.apiKeyCheck();
     }
   }
 
@@ -95,6 +112,20 @@ export class StratosUserPermissionsChecker extends BaseCurrentUserPermissionsChe
     return this.check(StratosPermissionTypes.STRATOS_SCOPE, permission);
   }
 
+  private apiKeyCheck(): Observable<boolean> {
+    return this.store.select(selectSessionData()).pipe(
+      switchMap(sessionData => {
+        switch (sessionData.config.APIKeysEnabled) {
+          case APIKeysEnabled.ADMIN_ONLY:
+            return this.store.select(getCurrentUserStratosRole(StratosPermissionStrings.STRATOS_ADMIN));
+          case APIKeysEnabled.ALL_USERS:
+            return of(true);
+        }
+        return of(false);
+      })
+    );
+  }
+
   public getComplexCheck(
     permissionConfig: PermissionConfig[],
     ...args: any[]
@@ -108,7 +139,7 @@ export class StratosUserPermissionsChecker extends BaseCurrentUserPermissionsChe
             checks: this.getInternalScopesChecks(configGroup),
           };
       }
-    })
+    });
     // Checker must handle all configs
     return res.every(check => !!check) ? res : null;
   }
diff --git a/src/frontend/packages/core/src/core/utils.service.ts b/src/frontend/packages/core/src/core/utils.service.ts
index d3d1c3f837..cd40db21ed 100644
--- a/src/frontend/packages/core/src/core/utils.service.ts
+++ b/src/frontend/packages/core/src/core/utils.service.ts
@@ -293,10 +293,13 @@ export const arraysEqual = (a: any[], b: any[]): boolean => {
   return false;
 };
 
+
+/* tslint:disable:no-bitwise  */
 export const createGuid = (): string => {
   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
-    var r = Math.random() * 16 | 0,
-      v = c == 'x' ? r : (r & 0x3 | 0x8);
+    const r = Math.random() * 16 | 0;
+    const v = c === 'x' ? r : (r & 0x3 | 0x8);
     return v.toString(16);
   });
-}
+};
+/* tslint:enable */
diff --git a/src/frontend/packages/core/src/environments/environment.prod.ts b/src/frontend/packages/core/src/environments/environment.prod.ts
index da8e7d8dbd..61c616a7fe 100644
--- a/src/frontend/packages/core/src/environments/environment.prod.ts
+++ b/src/frontend/packages/core/src/environments/environment.prod.ts
@@ -1,13 +1,9 @@
 import { cfAPIVersion, proxyAPIVersion } from '../../../store/src/jetstream';
-import { LogLevel } from './../../../store/src/actions/log.actions';
 
 export const environment = {
   production: true,
-  logLevel: LogLevel.WARN,
   proxyAPIVersion,
   cfAPIVersion,
-  logToConsole: true,
-  logEnableConsoleActions: false,
   showObsDebug: false,
   disablePolling: false
 };
diff --git a/src/frontend/packages/core/src/environments/environment.ts b/src/frontend/packages/core/src/environments/environment.ts
index e10f7527a5..ee77d9adb8 100644
--- a/src/frontend/packages/core/src/environments/environment.ts
+++ b/src/frontend/packages/core/src/environments/environment.ts
@@ -1,4 +1,3 @@
-import { LogLevel } from '../../../store/src/actions/log.actions';
 import { cfAPIVersion, proxyAPIVersion } from '../../../store/src/jetstream';
 
 // The file contents for the current environment will overwrite these during build.
@@ -10,9 +9,6 @@ export const environment = {
   production: false,
   proxyAPIVersion,
   cfAPIVersion,
-  logLevel: LogLevel.DEBUG,
-  logToConsole: true,
-  logEnableConsoleActions: false,
   showObsDebug: false,
   disablePolling: false
 };
diff --git a/src/frontend/packages/core/src/features/about/about-page/about-page.component.spec.ts b/src/frontend/packages/core/src/features/about/about-page/about-page.component.spec.ts
index 3aea3c6790..69f0863602 100644
--- a/src/frontend/packages/core/src/features/about/about-page/about-page.component.spec.ts
+++ b/src/frontend/packages/core/src/features/about/about-page/about-page.component.spec.ts
@@ -2,10 +2,11 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { createBasicStoreModule } from '@stratosui/store/testing';
 
-import { TabNavService } from '../../../../tab-nav.service';
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
 import { CoreModule } from '../../../core/core.module';
+import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
 import { SharedModule } from '../../../shared/shared.module';
+import { TabNavService } from '../../../tab-nav.service';
 import { AboutPageComponent } from './about-page.component';
 
 describe('AboutPageComponent', () => {
@@ -22,7 +23,10 @@ describe('AboutPageComponent', () => {
         CoreTestingModule,
         createBasicStoreModule(),
       ],
-      providers: [TabNavService]
+      providers: [
+        TabNavService,
+        CurrentUserPermissionsService
+      ]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/core/src/features/about/diagnostics-page/diagnostics-page.component.spec.ts b/src/frontend/packages/core/src/features/about/diagnostics-page/diagnostics-page.component.spec.ts
index c65bac7fc7..16786352e6 100644
--- a/src/frontend/packages/core/src/features/about/diagnostics-page/diagnostics-page.component.spec.ts
+++ b/src/frontend/packages/core/src/features/about/diagnostics-page/diagnostics-page.component.spec.ts
@@ -2,10 +2,11 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { createBasicStoreModule } from '@stratosui/store/testing';
 
-import { TabNavService } from '../../../../tab-nav.service';
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
 import { CoreModule } from '../../../core/core.module';
+import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
 import { SharedModule } from '../../../shared/shared.module';
+import { TabNavService } from '../../../tab-nav.service';
 import { DiagnosticsPageComponent } from './diagnostics-page.component';
 
 describe('DiagnosticsPageComponent', () => {
@@ -22,7 +23,10 @@ describe('DiagnosticsPageComponent', () => {
         CoreTestingModule,
         createBasicStoreModule(),
       ],
-      providers: [TabNavService]
+      providers: [
+        TabNavService,
+        CurrentUserPermissionsService
+      ]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.spec.ts b/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.spec.ts
index 113aac37d3..cd45da187e 100644
--- a/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.spec.ts
+++ b/src/frontend/packages/core/src/features/about/eula-page/eula-page.component.spec.ts
@@ -4,9 +4,10 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { createBasicStoreModule } from '@stratosui/store/testing';
 
-import { TabNavService } from '../../../../tab-nav.service';
 import { CoreModule } from '../../../core/core.module';
+import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
 import { SharedModule } from '../../../shared/shared.module';
+import { TabNavService } from '../../../tab-nav.service';
 import { EulaPageComponent } from './eula-page.component';
 
 describe('EulaPageComponent', () => {
@@ -24,7 +25,10 @@ describe('EulaPageComponent', () => {
         HttpClientTestingModule,
         createBasicStoreModule(),
       ],
-      providers: [TabNavService]
+      providers: [
+        TabNavService,
+        CurrentUserPermissionsService
+      ]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/core/src/features/api-keys/add-api-key-dialog/add-api-key-dialog.component.html b/src/frontend/packages/core/src/features/api-keys/add-api-key-dialog/add-api-key-dialog.component.html
new file mode 100644
index 0000000000..bf044a85bf
--- /dev/null
+++ b/src/frontend/packages/core/src/features/api-keys/add-api-key-dialog/add-api-key-dialog.component.html
@@ -0,0 +1,28 @@
+<div class="key-dialog__loading-wrapper">
+  <mat-progress-bar class="key-dialog__loading"
+    [color]="(hasErrored$ | async) && !(isBusy$ | async) ? 'warn' : 'primary'"
+    [mode]="(isBusy$ | async) ? 'indeterminate' : 'solid'">
+  </mat-progress-bar>
+</div>
+<div class="key-dialog">
+  <div class="key-dialog__title">
+    <h2 mat-dialog-title>
+      Create an API Key
+    </h2>
+  </div>
+  <div>
+  </div>
+  <div [formGroup]="formGroup">
+    <mat-form-field>
+      <input matInput placeholder="Description" formControlName="comment" required>
+    </mat-form-field>
+  </div>
+
+  <app-dialog-error message="{{hasErrored$ | async}}" [show]="(hasErrored$ | async) && !(isBusy$ | async)">
+  </app-dialog-error>
+  <mat-dialog-actions class="key-dialog__actions">
+    <button [mat-dialog-close]="true" mat-button color="warn" [disabled]="(isBusy$ | async)">Cancel</button>
+    <button (click)="submit()" [disabled]="(isBusy$ | async) || !formGroup.valid" mat-button
+      color="primary">Create</button>
+  </mat-dialog-actions>
+</div>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/features/api-keys/add-api-key-dialog/add-api-key-dialog.component.scss b/src/frontend/packages/core/src/features/api-keys/add-api-key-dialog/add-api-key-dialog.component.scss
new file mode 100644
index 0000000000..a235091e2d
--- /dev/null
+++ b/src/frontend/packages/core/src/features/api-keys/add-api-key-dialog/add-api-key-dialog.component.scss
@@ -0,0 +1,28 @@
+.key-dialog {
+  &__loading {
+    left: 0;
+    position: absolute;
+    right: 0;
+    top: 0;
+    &-wrapper {
+      position: relative;
+      margin: 0 -24px;
+      transform: translateY(-24px);
+    }
+  }
+
+  &__title {
+    display: flex;
+    h2 {
+      flex: 1;
+    }
+  }
+
+  &__actions {
+    justify-content: flex-end;
+  }
+
+  mat-form-field {
+    width: 100%;
+  }
+}
diff --git a/src/frontend/packages/core/src/features/api-keys/add-api-key-dialog/add-api-key-dialog.component.spec.ts b/src/frontend/packages/core/src/features/api-keys/add-api-key-dialog/add-api-key-dialog.component.spec.ts
new file mode 100644
index 0000000000..e27047ec08
--- /dev/null
+++ b/src/frontend/packages/core/src/features/api-keys/add-api-key-dialog/add-api-key-dialog.component.spec.ts
@@ -0,0 +1,40 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { MatDialogRef } from '@angular/material/dialog';
+
+import { BaseTestModules } from '../../../../test-framework/core-test.helper';
+import { AddApiKeyDialogComponent } from './add-api-key-dialog.component';
+
+describe('AddApiKeyDialogComponent', () => {
+  let component: AddApiKeyDialogComponent;
+  let fixture: ComponentFixture<AddApiKeyDialogComponent>;
+
+  const mockDialogRef = {
+    close: () => { }
+  };
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        ...BaseTestModules,
+      ],
+      declarations: [AddApiKeyDialogComponent],
+      providers: [
+        {
+          provide: MatDialogRef,
+          useValue: mockDialogRef
+        }
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AddApiKeyDialogComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/core/src/features/api-keys/add-api-key-dialog/add-api-key-dialog.component.ts b/src/frontend/packages/core/src/features/api-keys/add-api-key-dialog/add-api-key-dialog.component.ts
new file mode 100644
index 0000000000..eea0b54086
--- /dev/null
+++ b/src/frontend/packages/core/src/features/api-keys/add-api-key-dialog/add-api-key-dialog.component.ts
@@ -0,0 +1,66 @@
+import { Component, OnDestroy } from '@angular/core';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { MatDialogRef } from '@angular/material/dialog';
+import { BehaviorSubject, Subscription } from 'rxjs';
+import { filter, first, map, pairwise, tap } from 'rxjs/operators';
+
+import { ApiKey } from '../../../../../store/src/apiKey.types';
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
+import { RequestInfoState } from '../../../../../store/src/reducers/api-request-reducer/types';
+import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
+import { NormalizedResponse } from '../../../../../store/src/types/api.types';
+import { safeUnsubscribe } from '../../../core/utils.service';
+
+@Component({
+  selector: 'app-add-api-key-dialog',
+  templateUrl: './add-api-key-dialog.component.html',
+  styleUrls: ['./add-api-key-dialog.component.scss']
+})
+export class AddApiKeyDialogComponent implements OnDestroy {
+
+  private hasErrored = new BehaviorSubject(null);
+  public hasErrored$ = this.hasErrored.asObservable();
+  private isBusy = new BehaviorSubject(false)
+  public isBusy$ = this.isBusy.asObservable();
+
+  private sub: Subscription;
+
+  public formGroup: FormGroup;
+
+  constructor(
+    private fb: FormBuilder,
+    public dialogRef: MatDialogRef<ApiKey>,
+  ) {
+    this.formGroup = this.fb.group({
+      comment: ['', Validators.required],
+    });
+  }
+
+  ngOnDestroy(): void {
+    safeUnsubscribe(this.sub);
+  }
+
+  submit() {
+    this.sub = stratosEntityCatalog.apiKey.api.create<RequestInfoState>(this.formGroup.controls.comment.value).pipe(
+      tap(() => {
+        this.isBusy.next(true);
+        this.hasErrored.next(null);
+      }),
+      pairwise(),
+      filter(([oldR, newR]) => oldR.creating && !newR.creating),
+      map(([, newR]) => newR),
+      tap(state => {
+        if (state.error) {
+          this.hasErrored.next(`Failed to create key: ${state.message}`);
+          this.isBusy.next(false);
+        } else {
+          const response: NormalizedResponse<ApiKey> = state.response;
+          const entityKey = entityCatalog.getEntityKey(stratosEntityCatalog.apiKey.actions.create(''));
+          this.dialogRef.close(response.entities[entityKey][response.result[0]])
+        }
+      }),
+      first()
+    ).subscribe()
+  }
+
+}
diff --git a/src/frontend/packages/core/src/features/api-keys/api-keys-page/api-keys-page.component.html b/src/frontend/packages/core/src/features/api-keys/api-keys-page/api-keys-page.component.html
new file mode 100644
index 0000000000..0cacc03903
--- /dev/null
+++ b/src/frontend/packages/core/src/features/api-keys/api-keys-page/api-keys-page.component.html
@@ -0,0 +1,33 @@
+<app-page-header>
+  <h1>API Keys</h1>
+  <div class="page-header-right">
+    <button id="stratos-api-key" mat-icon-button (click)="addApiKey()" matTooltip="Create API Key">
+      <mat-icon>add</mat-icon>
+    </button>
+  </div>
+</app-page-header>
+
+<div class="keys-page__new" *ngIf="keyDetails$ | async as keyDetails">
+
+  <mat-card class="keys-page__card">
+    <mat-card-header>
+      <mat-icon>vpn_key</mat-icon>New API Key
+    </mat-card-header>
+    <mat-card-content>
+      <p>Your API Key has been successfully created. Use the following information to connect to Stratos.</p>
+      <p><i>Please safely record these details, there is no later way to view them</i></p>
+      <ul>
+        <li id="apikey-secret">Secret: {{keyDetails.secret}}</li>
+      </ul>
+      <button (click)="clearKeyDetails()" mat-button color="warn">Close</button>
+    </mat-card-content>
+  </mat-card>
+</div>
+
+<app-list *ngIf="(hasKeys$ | async) === true"></app-list>
+<app-no-content-message *ngIf="(hasKeys$ | async) === false" icon="vpn_key" [firstLine]="'You have no API keys'"
+  [secondLine]="{
+      text: ''
+    }" [toolbarLink]="{
+      text: 'Create an API key'
+    }" toolbarAlign="stratos-api-key"></app-no-content-message>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/features/api-keys/api-keys-page/api-keys-page.component.scss b/src/frontend/packages/core/src/features/api-keys/api-keys-page/api-keys-page.component.scss
new file mode 100644
index 0000000000..291e1522e1
--- /dev/null
+++ b/src/frontend/packages/core/src/features/api-keys/api-keys-page/api-keys-page.component.scss
@@ -0,0 +1,15 @@
+.keys-page {
+  &__new {
+    mat-card {
+      margin-bottom: 24px;
+      mat-card-header {
+        align-items: center;
+        display: flex;
+        margin-bottom: 15px;
+        mat-icon {
+          margin-right: 5px;
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/features/api-keys/api-keys-page/api-keys-page.component.spec.ts b/src/frontend/packages/core/src/features/api-keys/api-keys-page/api-keys-page.component.spec.ts
new file mode 100644
index 0000000000..1c2318bba0
--- /dev/null
+++ b/src/frontend/packages/core/src/features/api-keys/api-keys-page/api-keys-page.component.spec.ts
@@ -0,0 +1,42 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { MatDialogRef } from '@angular/material/dialog';
+
+import { BaseTestModules } from '../../../../test-framework/core-test.helper';
+import { TabNavService } from '../../../tab-nav.service';
+import { ApiKeysPageComponent } from './api-keys-page.component';
+
+describe('ApiKeysPageComponent', () => {
+  let component: ApiKeysPageComponent;
+  let fixture: ComponentFixture<ApiKeysPageComponent>;
+
+  const mockDialogRef = {
+    close: () => { }
+  };
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        ...BaseTestModules,
+      ],
+      declarations: [ApiKeysPageComponent],
+      providers: [
+        {
+          provide: MatDialogRef,
+          useValue: mockDialogRef
+        },
+        TabNavService
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ApiKeysPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/core/src/features/api-keys/api-keys-page/api-keys-page.component.ts b/src/frontend/packages/core/src/features/api-keys/api-keys-page/api-keys-page.component.ts
new file mode 100644
index 0000000000..4f130201b6
--- /dev/null
+++ b/src/frontend/packages/core/src/features/api-keys/api-keys-page/api-keys-page.component.ts
@@ -0,0 +1,63 @@
+import { Component } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
+import { Observable, Subject } from 'rxjs';
+import { first, map, startWith } from 'rxjs/operators';
+
+import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
+import { ApiKeyListConfigService } from '../../../shared/components/list/list-types/apiKeys/apiKey-list-config.service';
+import { ListConfig } from '../../../shared/components/list/list.component.types';
+import { AddApiKeyDialogComponent } from '../add-api-key-dialog/add-api-key-dialog.component';
+
+@Component({
+  selector: 'app-api-keys-page',
+  templateUrl: './api-keys-page.component.html',
+  styleUrls: ['./api-keys-page.component.scss'],
+  providers: [{
+    provide: ListConfig,
+    useClass: ApiKeyListConfigService,
+  }]
+})
+export class ApiKeysPageComponent {
+
+  public keyDetails = new Subject<string>();
+  public keyDetails$ = this.keyDetails.asObservable();
+
+  /* tslint:disable:ban-types  */
+  // This is intentionally typed, property can be null and there's different logic associated with it
+  public hasKeys$: Observable<Boolean>;
+  /* tslint:enable */
+
+  constructor(
+    private dialog: MatDialog,
+  ) {
+    this.hasKeys$ = stratosEntityCatalog.apiKey.store.getPaginationService().entities$.pipe(
+      map(entities => entities && !!entities.length),
+      startWith(null),
+    );
+  }
+
+  addApiKey() {
+    this.showDialog().pipe(first()).subscribe(key => {
+      this.keyDetails.next(key);
+    });
+  }
+
+  clearKeyDetails() {
+    this.keyDetails.next();
+  }
+
+  private showDialog(): Observable<string> {
+    return this.dialog.open(AddApiKeyDialogComponent, {
+      disableClose: true,
+    }).afterClosed().pipe(
+      map(newApiKey => {
+        if (newApiKey && newApiKey.guid) {
+          stratosEntityCatalog.apiKey.api.getMultiple();
+          return newApiKey;
+        }
+        return null;
+      })
+    );
+  }
+
+}
diff --git a/src/frontend/packages/core/src/features/api-keys/api-keys.module.ts b/src/frontend/packages/core/src/features/api-keys/api-keys.module.ts
new file mode 100644
index 0000000000..c2311b97d4
--- /dev/null
+++ b/src/frontend/packages/core/src/features/api-keys/api-keys.module.ts
@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+
+import { CoreModule } from '../../core/core.module';
+import { SharedModule } from '../../shared/shared.module';
+import { ApiKeysPageComponent } from './api-keys-page/api-keys-page.component';
+import { ApiKeysRoutingModule } from './api-keys.routing';
+import { AddApiKeyDialogComponent } from './add-api-key-dialog/add-api-key-dialog.component';
+
+
+@NgModule({
+  imports: [
+    CoreModule,
+    SharedModule,
+    ApiKeysRoutingModule,
+  ],
+  declarations: [
+    ApiKeysPageComponent,
+    AddApiKeyDialogComponent
+  ]
+})
+export class ApiKeysModule { }
+
diff --git a/src/frontend/packages/core/src/features/api-keys/api-keys.routing.ts b/src/frontend/packages/core/src/features/api-keys/api-keys.routing.ts
new file mode 100644
index 0000000000..395c58188b
--- /dev/null
+++ b/src/frontend/packages/core/src/features/api-keys/api-keys.routing.ts
@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+
+import { ApiKeysPageComponent } from './api-keys-page/api-keys-page.component';
+
+const apiKeys: Routes = [
+  {
+    path: '',
+    component: ApiKeysPageComponent
+  },
+];
+
+@NgModule({
+  imports: [
+    RouterModule.forChild(apiKeys),
+  ]
+})
+export class ApiKeysRoutingModule { }
diff --git a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.spec.ts b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.spec.ts
index 395bdf628c..f448246a7d 100644
--- a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.spec.ts
+++ b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.spec.ts
@@ -7,11 +7,11 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { StoreModule } from '@ngrx/store';
 
 import { appReducers } from '../../../../../store/src/reducers.module';
-import { TabNavService } from '../../../../tab-nav.service';
 import { CoreModule } from '../../../core/core.module';
 import { PageHeaderService } from '../../../core/page-header-service/page-header.service';
 import { SidePanelService } from '../../../shared/services/side-panel.service';
 import { SharedModule } from '../../../shared/shared.module';
+import { TabNavService } from '../../../tab-nav.service';
 import { MetricsService } from '../../metrics/services/metrics-service';
 import { PageSideNavComponent } from '../page-side-nav/page-side-nav.component';
 import { SideNavComponent } from '../side-nav/side-nav.component';
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 42a8998120..b7da02c398 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
@@ -14,11 +14,11 @@ import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-ca
 import { DashboardState } from '../../../../../store/src/reducers/dashboard-reducer';
 import { selectDashboardState } from '../../../../../store/src/selectors/dashboard.selectors';
 import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
-import { TabNavService } from '../../../../tab-nav.service';
 import { CustomizationService } from '../../../core/customizations.types';
 import { EndpointsService } from '../../../core/endpoints.service';
 import { IHeaderBreadcrumbLink } from '../../../shared/components/page-header/page-header.types';
 import { SidePanelService } from '../../../shared/services/side-panel.service';
+import { TabNavService } from '../../../tab-nav.service';
 import { IPageSideNavTab } from '../page-side-nav/page-side-nav.component';
 import { PageHeaderService } from './../../../core/page-header-service/page-header.service';
 import { SideNavItem } from './../side-nav/side-nav.component';
@@ -36,8 +36,8 @@ export class DashboardBaseComponent implements OnInit, OnDestroy, AfterViewInit
   public isMobile$: Observable<boolean>;
   public sideNavMode$: Observable<string>;
   public sideNavMode: string;
-  public mainNavState$: Observable<{ mode: string; opened: boolean; iconMode: boolean }>;
-  public rightNavState$: Observable<{ opened: boolean, component?: object, props?: object }>;
+  public mainNavState$: Observable<{ mode: string; opened: boolean; iconMode: boolean; }>;
+  public rightNavState$: Observable<{ opened: boolean, component?: object, props?: object; }>;
   private dashboardState$: Observable<DashboardState>;
   public noMargin$: Observable<boolean>;
   private closeSub: Subscription;
diff --git a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.spec.ts b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.spec.ts
index 58b9e971e8..871b3dd00c 100644
--- a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.spec.ts
+++ b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.spec.ts
@@ -1,8 +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 { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
+import { BaseTestModulesNoShared } from '../../../../test-framework/core-test.helper';
+import { TabNavService } from '../../../tab-nav.service';
 import { PageSideNavComponent } from './page-side-nav.component';
 
 describe('PageSideNavComponent', () => {
diff --git a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.ts b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.ts
index bab4cd21dc..aa0fb03459 100644
--- a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.ts
+++ b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.ts
@@ -2,15 +2,15 @@ import { Component, Input, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { Observable, of } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
 import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { selectIsMobile } from '../../../../../store/src/selectors/dashboard.selectors';
-import { TabNavService } from '../../../../tab-nav.service';
 import { StratosTabMetadata } from '../../../core/extension/extension-service';
 import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
 import { IBreadcrumb } from '../../../shared/components/breadcrumbs/breadcrumbs.types';
-import { map } from 'rxjs/operators';
+import { TabNavService } from '../../../tab-nav.service';
 
 
 
diff --git a/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.html b/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.html
index 42b179688b..15ec64efb0 100644
--- a/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.html
+++ b/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.html
@@ -2,7 +2,7 @@
   <div class="side-nav__inner">
     <div class="side-nav__top">
       <div class="side-nav__top-inner">
-        <div class="side-nav__logo" (click)="logoClicked.next(true)">
+        <div class="side-nav__logo">
           <div class="side-nav__logo-img"></div>
           <div class="side-nav__logo-text">{{ customizations.logoText || '' }}
           </div>
diff --git a/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.ts b/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.ts
index aaa4ece632..b6febb4efa 100644
--- a/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.ts
+++ b/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.ts
@@ -1,13 +1,11 @@
-import { Component, EventEmitter, InjectionToken, Input, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, InjectionToken, Input, Output } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { buffer, debounceTime, filter, map } from 'rxjs/operators';
+import { Observable } from 'rxjs';
 
-import { ActionHistoryDump } from '../../../../../store/src/actions/action-history.actions';
 import { ToggleSideNav } from '../../../../../store/src/actions/dashboard-actions';
 import { AppState } from '../../../../../store/src/app-state';
-import { TabNavItem } from '../../../../tab-nav.types';
 import { CustomizationService, CustomizationsMetadata } from '../../../core/customizations.types';
+import { TabNavItem } from '../../../tab-nav.types';
 
 export const SIDENAV_COPYRIGHT = new InjectionToken<string>('Optional copyright string for side nav');
 
@@ -32,7 +30,7 @@ export interface SideNavItem extends TabNavItem {
   styleUrls: ['./side-nav.component.scss']
 })
 
-export class SideNavComponent implements OnInit {
+export class SideNavComponent {
 
   public customizations: CustomizationsMetadata;
 
@@ -56,20 +54,7 @@ export class SideNavComponent implements OnInit {
   @Output() changedMode = new EventEmitter();
   private isIconMode = true;
 
-  // Button is not always visible on load, so manually push through an event
-  logoClicked: BehaviorSubject<any> = new BehaviorSubject(true);
-
   public toggleSidenav() {
     this.store.dispatch(new ToggleSideNav());
   }
-
-  ngOnInit() {
-    const toLength = a => a.length;
-    const debounced$ = this.logoClicked.pipe(debounceTime(250)); // debounce the click stream
-    this.logoClicked.pipe(
-      buffer(debounced$),
-      map(toLength),
-      filter(x => x === 3))
-      .subscribe(event => this.store.dispatch(new ActionHistoryDump()));
-  }
 }
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 3ccb5308ed..5eb19422d8 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,8 +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 { TabNavService } from '../../../../tab-nav.service';
 import { BackupEndpointsComponent } from './backup-endpoints.component';
 
 describe('BackupEndpointsComponent', () => {
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 9c41ea8a3d..8e09accf47 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,6 +1,6 @@
 import { Component } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
-import * as moment from 'moment';
+import moment from 'moment';
 import { Observable, of, Subject } from 'rxjs';
 import { filter, first, map } from 'rxjs/operators';
 
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 528a5ee7a9..9e3ebe2233 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,8 +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 { TabNavService } from '../../../../tab-nav.service';
 import { BackupRestoreEndpointsComponent } from './backup-restore-endpoints.component';
 
 describe('BackupRestoreEndpointsComponent', () => {
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 38dee43257..3b9a657097 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
@@ -8,7 +8,6 @@ import { GeneralEntityAppState } from '../../../../../store/src/app-state';
 import { BrowserStandardEncoder } from '../../../../../store/src/browser-encoder';
 import { selectSessionData } from '../../../../../store/src/reducers/auth.reducer';
 import { SessionData } from '../../../../../store/src/types/auth.types';
-import { LoggerService } from '../../../core/logger.service';
 
 interface BackupContent {
   payload: string;
@@ -47,7 +46,6 @@ export class RestoreEndpointsService {
   constructor(
     private store: Store<GeneralEntityAppState>,
     private http: HttpClient,
-    private logger: LoggerService
   ) {
     this.setupStep1();
   }
@@ -97,7 +95,7 @@ export class RestoreEndpointsService {
       parsedContent = JSON.parse(content);
       this.unparsableFileContent = null;
     } catch (err) {
-      this.logger.warn('Failed to parse file contents: ', err);
+      console.warn('Failed to parse file contents: ', err);
       parsedContent = null;
       this.unparsableFileContent = `${err instanceof Error ? err.message : String(err)}`;
     }
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 ff141f7953..46482bb15e 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,8 +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 { TabNavService } from '../../../../tab-nav.service';
 import { RestoreEndpointsComponent } from './restore-endpoints.component';
 
 describe('RestoreEndpointsComponent', () => {
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 752e290c94..3f63c6c7d6 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
@@ -10,6 +10,7 @@ import { CoreTestingModule } from '../../../../test-framework/core-test.modules'
 import { CoreModule } from '../../../core/core.module';
 import { SidePanelService } from '../../../shared/services/side-panel.service';
 import { SharedModule } from '../../../shared/shared.module';
+import { MetricsModule } from '../../metrics/metrics.module';
 import { ConnectEndpointComponent } from '../connect-endpoint/connect-endpoint.component';
 import { ConnectEndpointConfig } from '../connect.service';
 import { CredentialsAuthFormComponent } from './auth-forms/credentials-auth-form.component';
@@ -49,7 +50,8 @@ describe('ConnectEndpointDialogComponent', () => {
         RouterTestingModule,
         NoopAnimationsModule,
         CoreTestingModule,
-        createBasicStoreModule()
+        createBasicStoreModule(),
+        MetricsModule,
       ]
     }).overrideModule(BrowserDynamicTestingModule, {
       set: {
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.spec.ts
index c0108afa2d..eae2dd40c7 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.spec.ts
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.spec.ts
@@ -4,10 +4,11 @@ import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { createBasicStoreModule } from '@stratosui/store/testing';
 
-import { TabNavService } from '../../../../../tab-nav.service';
 import { CoreTestingModule } from '../../../../../test-framework/core-test.modules';
 import { CoreModule } from '../../../../core/core.module';
+import { CurrentUserPermissionsService } from '../../../../core/permissions/current-user-permissions.service';
 import { SharedModule } from '../../../../shared/shared.module';
+import { TabNavService } from '../../../../tab-nav.service';
 import { CreateEndpointBaseStepComponent } from './create-endpoint-base-step.component';
 
 describe('CreateEndpointBaseStepComponent', () => {
@@ -27,15 +28,19 @@ describe('CreateEndpointBaseStepComponent', () => {
         createBasicStoreModule(),
         NoopAnimationsModule
       ],
-      providers: [{
-        provide: ActivatedRoute,
-        useValue: {
-          snapshot: {
-            queryParams: {},
-            params: { type: 'metrics' }
+      providers: [
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: {
+              queryParams: {},
+              params: { type: 'metrics' }
+            }
           }
-        }
-      }, TabNavService],
+        },
+        TabNavService,
+        CurrentUserPermissionsService
+      ],
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.spec.ts
index 7479b4a0d1..a074af1f7b 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
@@ -5,11 +5,12 @@ import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { createBasicStoreModule } from '@stratosui/store/testing';
 
-import { TabNavService } from '../../../../tab-nav.service';
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
 import { CoreModule } from '../../../core/core.module';
+import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
 import { SidePanelService } from '../../../shared/services/side-panel.service';
 import { SharedModule } from '../../../shared/shared.module';
+import { TabNavService } from '../../../tab-nav.service';
 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';
@@ -49,7 +50,9 @@ describe('CreateEndpointComponent', () => {
         }
       },
         TabNavService,
-        SidePanelService],
+        SidePanelService,
+        CurrentUserPermissionsService
+      ],
     })
       .compileComponents();
   }));
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 9b94a55029..6dbdbb0753 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
@@ -4,10 +4,11 @@ import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 
 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 { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
 import { SharedModule } from '../../../shared/shared.module';
+import { TabNavService } from '../../../tab-nav.service';
 import { EditEndpointStepComponent } from './edit-endpoint-step/edit-endpoint-step.component';
 import { EditEndpointComponent } from './edit-endpoint.component';
 
@@ -36,7 +37,8 @@ describe('EditEndpointComponent', () => {
             }
           }
         },
-        TabNavService
+        TabNavService,
+        CurrentUserPermissionsService
       ]
     })
       .compileComponents();
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 c8e3f991c3..0775265f9d 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
@@ -5,7 +5,7 @@ <h1>Endpoints</h1>
       [routerLink]="'/endpoints/new/'" matTooltip="Register Endpoint">
       <mat-icon>add</mat-icon>
     </button>
-    <button id="stratos-add-endpoint" *appUserPermission="canRegisterEndpoint" mat-icon-button
+    <button id="stratos-restore-backup" *appUserPermission="canRegisterEndpoint" mat-icon-button
       [routerLink]="'/endpoints/backup-restore'" matTooltip="Backup/Restore Endpoints">
       <mat-icon>settings_backup_restore</mat-icon>
     </button>
diff --git a/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.spec.ts
index 2906a26a9d..9773e3ab52 100644
--- a/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.spec.ts
+++ b/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.spec.ts
@@ -6,11 +6,11 @@ import { StoreModule } from '@ngrx/store';
 import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { appReducers } from '../../../../../store/src/reducers.module';
-import { TabNavService } from '../../../../tab-nav.service';
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
 import { CoreModule } from '../../../core/core.module';
 import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
 import { SharedModule } from '../../../shared/shared.module';
+import { TabNavService } from '../../../tab-nav.service';
 import { SidePanelService } from './../../../shared/services/side-panel.service';
 import { EndpointsPageComponent } from './endpoints-page.component';
 
diff --git a/src/frontend/packages/core/src/features/error-page/error-page/error-page.component.spec.ts b/src/frontend/packages/core/src/features/error-page/error-page/error-page.component.spec.ts
index 206f02d3d9..f8cd0828ea 100644
--- a/src/frontend/packages/core/src/features/error-page/error-page/error-page.component.spec.ts
+++ b/src/frontend/packages/core/src/features/error-page/error-page/error-page.component.spec.ts
@@ -2,10 +2,10 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { createBasicStoreModule } from '@stratosui/store/testing';
 
-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 { TabNavService } from '../../../tab-nav.service';
 import { ErrorPageComponent } from './error-page.component';
 
 describe('ErrorPageComponent', () => {
diff --git a/src/frontend/packages/core/src/features/event-page/events-page/events-page.component.spec.ts b/src/frontend/packages/core/src/features/event-page/events-page/events-page.component.spec.ts
index 883569abca..c79c2d4d5d 100644
--- a/src/frontend/packages/core/src/features/event-page/events-page/events-page.component.spec.ts
+++ b/src/frontend/packages/core/src/features/event-page/events-page/events-page.component.spec.ts
@@ -2,10 +2,11 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { createBasicStoreModule } from '@stratosui/store/testing';
 
-import { TabNavService } from '../../../../tab-nav.service';
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
 import { CoreModule } from '../../../core/core.module';
+import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
 import { SharedModule } from '../../../shared/shared.module';
+import { TabNavService } from '../../../tab-nav.service';
 import { EventsPageComponent } from './events-page.component';
 
 describe('EventsPageComponent', () => {
@@ -22,7 +23,10 @@ describe('EventsPageComponent', () => {
         createBasicStoreModule(),
         RouterTestingModule
       ],
-      providers: [TabNavService]
+      providers: [
+        TabNavService,
+        CurrentUserPermissionsService
+      ]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/core/src/features/home/home/home-page.component.spec.ts b/src/frontend/packages/core/src/features/home/home/home-page.component.spec.ts
index a456ae097f..9579ad3f19 100644
--- a/src/frontend/packages/core/src/features/home/home/home-page.component.spec.ts
+++ b/src/frontend/packages/core/src/features/home/home/home-page.component.spec.ts
@@ -4,10 +4,11 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { createBasicStoreModule } from '@stratosui/store/testing';
 
-import { TabNavService } from '../../../../tab-nav.service';
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
 import { CoreModule } from '../../../core/core.module';
+import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
 import { SharedModule } from '../../../shared/shared.module';
+import { TabNavService } from '../../../tab-nav.service';
 import { HomePageComponent } from './home-page.component';
 
 describe('HomePageComponent', () => {
@@ -26,7 +27,10 @@ describe('HomePageComponent', () => {
         CoreTestingModule,
         createBasicStoreModule()
       ],
-      providers: [TabNavService]
+      providers: [
+        TabNavService,
+        CurrentUserPermissionsService
+      ]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/core/src/features/home/home/home-page.component.ts b/src/frontend/packages/core/src/features/home/home/home-page.component.ts
index 6700b83fa3..94e3e09635 100644
--- a/src/frontend/packages/core/src/features/home/home/home-page.component.ts
+++ b/src/frontend/packages/core/src/features/home/home/home-page.component.ts
@@ -10,7 +10,6 @@ import { IUserFavoritesGroups } from '../../../../../store/src/types/favorite-gr
 import { UserFavorite } from '../../../../../store/src/types/user-favorites.types';
 import { UserFavoriteManager } from '../../../../../store/src/user-favorite-manager';
 import { EndpointsService } from '../../../core/endpoints.service';
-import { LoggerService } from '../../../core/logger.service';
 
 @Component({
   selector: 'app-home-page',
@@ -27,7 +26,6 @@ export class HomePageComponent {
   constructor(
     endpointsService: EndpointsService,
     store: Store<AppState>,
-    logger: LoggerService,
     public userFavoriteManager: UserFavoriteManager
   ) {
     this.allEndpointIds$ = endpointsService.endpoints$.pipe(
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 72dfa2d0c1..677a94ee07 100644
--- a/src/frontend/packages/core/src/features/metrics/metrics.helpers.ts
+++ b/src/frontend/packages/core/src/features/metrics/metrics.helpers.ts
@@ -51,7 +51,7 @@ export function mapMetricsData(ep: MetricsEndpointProvider): MetricsEndpointInfo
     && 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;
+      const hasEndpoint = data.findIndex(i => compareUrl(i.url, endp.url) || compareUrl(i.url, endp.cfEndpoint)) !== -1;
       if (!hasEndpoint) {
         const catalogEndpoint = entityCatalog.getEndpoint(endp.type, '');
         if (catalogEndpoint) { // Provider metadata could give unknown endpoint
@@ -76,3 +76,16 @@ export function mapMetricsData(ep: MetricsEndpointProvider): MetricsEndpointInfo
   }
   return data;
 }
+
+// Simple URL compare that ignores tailing forward slashes
+function compareUrl(a: string, b: string): boolean {
+  if (a && a.endsWith('/')) {
+    a = a.substr(0, a.length -1);
+  }
+
+  if (b && b.endsWith('/')) {
+    b = b.substr(0, b.length -1);
+  }
+
+  return a === b;
+}
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 9c14db9211..0fa61010da 100644
--- a/src/frontend/packages/core/src/features/metrics/metrics.module.ts
+++ b/src/frontend/packages/core/src/features/metrics/metrics.module.ts
@@ -1,7 +1,9 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 
+import { stratosEntityCatalog } from '../../../../store/src/stratos-entity-catalog';
 import { CoreModule } from '../../core/core.module';
+import { BaseEndpointAuth } from '../../core/endpoint-auth';
 import { SharedModule } from '../../shared/shared.module';
 import { MetricsEndpointDetailsComponent } from './metrics-endpoint-details/metrics-endpoint-details.component';
 import { MetricsRoutingModule } from './metrics.routing';
@@ -23,4 +25,13 @@ import { MetricsService } from './services/metrics-service';
     MetricsEndpointDetailsComponent,
   ]
 })
-export class MetricsModule { }
+export class MetricsModule {
+
+  constructor() {
+    // Register the endpoint details component
+    // This is done here to break circular dependency - since the registration is done in the store package
+    // But the core package defines the component for the endpoint card details
+    stratosEntityCatalog.metricsEndpoint.setListComponent(MetricsEndpointDetailsComponent);
+    stratosEntityCatalog.metricsEndpoint.setAuthTypes([BaseEndpointAuth.UsernamePassword, BaseEndpointAuth.None]);
+  }
+}
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 37500654bb..ae19f047f3 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
@@ -4,10 +4,11 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { createBasicStoreModule } from '@stratosui/store/testing';
 
-import { TabNavService } from '../../../../tab-nav.service';
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
 import { CoreModule } from '../../../core/core.module';
+import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
 import { SharedModule } from '../../../shared/shared.module';
+import { TabNavService } from '../../../tab-nav.service';
 import { MetricsService } from '../services/metrics-service';
 import { MetricsComponent } from './metrics.component';
 
@@ -27,7 +28,11 @@ describe('MetricsComponent', () => {
         createBasicStoreModule(),
       ],
       declarations: [MetricsComponent],
-      providers: [MetricsService, TabNavService]
+      providers: [
+        MetricsService,
+        TabNavService,
+        CurrentUserPermissionsService
+      ]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/core/src/features/no-endpoints-non-admin/no-endpoints-non-admin.component.spec.ts b/src/frontend/packages/core/src/features/no-endpoints-non-admin/no-endpoints-non-admin.component.spec.ts
index fb688116a9..4e8f59f873 100644
--- a/src/frontend/packages/core/src/features/no-endpoints-non-admin/no-endpoints-non-admin.component.spec.ts
+++ b/src/frontend/packages/core/src/features/no-endpoints-non-admin/no-endpoints-non-admin.component.spec.ts
@@ -2,10 +2,11 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { createBasicStoreModule } from '@stratosui/store/testing';
 
-import { TabNavService } from '../../../tab-nav.service';
 import { CoreTestingModule } from '../../../test-framework/core-test.modules';
 import { CoreModule } from '../../core/core.module';
+import { CurrentUserPermissionsService } from '../../core/permissions/current-user-permissions.service';
 import { SharedModule } from '../../shared/shared.module';
+import { TabNavService } from '../../tab-nav.service';
 import { NoEndpointsNonAdminComponent } from './no-endpoints-non-admin.component';
 
 describe('NoEndpointsNonAdminComponent', () => {
@@ -22,7 +23,10 @@ describe('NoEndpointsNonAdminComponent', () => {
         CoreTestingModule,
         createBasicStoreModule(),
       ],
-      providers: [TabNavService]
+      providers: [
+        TabNavService,
+        CurrentUserPermissionsService
+      ]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/core/src/features/setup/local-account-wizard/local-account-wizard.component.spec.ts b/src/frontend/packages/core/src/features/setup/local-account-wizard/local-account-wizard.component.spec.ts
index d76be87a52..a15ea5f550 100644
--- a/src/frontend/packages/core/src/features/setup/local-account-wizard/local-account-wizard.component.spec.ts
+++ b/src/frontend/packages/core/src/features/setup/local-account-wizard/local-account-wizard.component.spec.ts
@@ -4,11 +4,12 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { createEmptyStoreModule } from '@stratosui/store/testing';
 
-import { TabNavService } from '../../../../tab-nav.service';
 import { CoreModule } from '../../../core/core.module';
 import { MDAppModule } from '../../../core/md.module';
+import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
 import { PageHeaderModule } from '../../../shared/components/page-header/page-header.module';
 import { SharedModule } from '../../../shared/shared.module';
+import { TabNavService } from '../../../tab-nav.service';
 import { SetupModule } from '../setup.module';
 import { LocalAccountWizardComponent } from './local-account-wizard.component';
 
@@ -30,7 +31,10 @@ describe('LocalAccountWizardComponent', () => {
         createEmptyStoreModule(),
         NoopAnimationsModule,
       ],
-      providers: [TabNavService]
+      providers: [
+        TabNavService,
+        CurrentUserPermissionsService
+      ]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/core/src/features/setup/setup-welcome/setup-welcome.component.spec.ts b/src/frontend/packages/core/src/features/setup/setup-welcome/setup-welcome.component.spec.ts
index 071ba41d53..4e74e46d21 100644
--- a/src/frontend/packages/core/src/features/setup/setup-welcome/setup-welcome.component.spec.ts
+++ b/src/frontend/packages/core/src/features/setup/setup-welcome/setup-welcome.component.spec.ts
@@ -3,12 +3,12 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 
-import { TabNavService } from '../../../../tab-nav.service';
 import { generateBaseTestStoreModules } from '../../../../test-framework/core-test.helper';
 import { CoreModule } from '../../../core/core.module';
 import { MDAppModule } from '../../../core/md.module';
 import { PageHeaderModule } from '../../../shared/components/page-header/page-header.module';
 import { SharedModule } from '../../../shared/shared.module';
+import { TabNavService } from '../../../tab-nav.service';
 import { SetupModule } from '../setup.module';
 import { SetupWelcomeComponent } from './setup-welcome.component';
 
diff --git a/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.spec.ts b/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.spec.ts
index 873fe6b16d..56353578c4 100644
--- a/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.spec.ts
+++ b/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.spec.ts
@@ -3,13 +3,14 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { StoreModule } from '@ngrx/store';
-import { appReducers } from 'frontend/packages/store/src/reducers.module';
 
-import { TabNavService } from '../../../../tab-nav.service';
+import { appReducers } from '../../../../../store/src/reducers.module';
 import { CoreModule } from '../../../core/core.module';
 import { MDAppModule } from '../../../core/md.module';
+import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
 import { PageHeaderModule } from '../../../shared/components/page-header/page-header.module';
 import { SharedModule } from '../../../shared/shared.module';
+import { TabNavService } from '../../../tab-nav.service';
 import { SetupModule } from '../setup.module';
 import { ConsoleUaaWizardComponent } from './console-uaa-wizard.component';
 
@@ -31,7 +32,10 @@ describe('ConsoleUaaWizardComponent', () => {
         StoreModule.forRoot(appReducers),
         NoopAnimationsModule,
       ],
-      providers: [TabNavService]
+      providers: [
+        TabNavService,
+        CurrentUserPermissionsService
+      ]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/core/src/features/user-profile/edit-profile-info/edit-profile-info.component.spec.ts b/src/frontend/packages/core/src/features/user-profile/edit-profile-info/edit-profile-info.component.spec.ts
index 89281e1382..3d68b5bcbe 100644
--- a/src/frontend/packages/core/src/features/user-profile/edit-profile-info/edit-profile-info.component.spec.ts
+++ b/src/frontend/packages/core/src/features/user-profile/edit-profile-info/edit-profile-info.component.spec.ts
@@ -4,12 +4,12 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { createBasicStoreModule } from '@stratosui/store/testing';
 
-import { TabNavService } from '../../../../tab-nav.service';
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
 import { CoreModule } from '../../../core/core.module';
 import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
 import { UserProfileService } from '../../../core/user-profile.service';
 import { SharedModule } from '../../../shared/shared.module';
+import { TabNavService } from '../../../tab-nav.service';
 import { EditProfileInfoComponent } from './edit-profile-info.component';
 
 describe('EditProfileInfoComponent', () => {
diff --git a/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.spec.ts b/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.spec.ts
index 2c855307de..e10f58880b 100644
--- a/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.spec.ts
+++ b/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.spec.ts
@@ -4,11 +4,12 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { createBasicStoreModule } from '@stratosui/store/testing';
 
-import { TabNavService } from '../../../../tab-nav.service';
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
 import { CoreModule } from '../../../core/core.module';
+import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
 import { UserProfileService } from '../../../core/user-profile.service';
 import { SharedModule } from '../../../shared/shared.module';
+import { TabNavService } from '../../../tab-nav.service';
 import { ProfileInfoComponent } from './profile-info.component';
 
 describe('ProfileInfoComponent', () => {
@@ -27,7 +28,11 @@ describe('ProfileInfoComponent', () => {
         CoreTestingModule,
         createBasicStoreModule()
       ],
-      providers: [UserProfileService, TabNavService]
+      providers: [
+        UserProfileService,
+        TabNavService,
+        CurrentUserPermissionsService
+      ]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/core/src/route-reuse-stragegy.ts b/src/frontend/packages/core/src/route-reuse-stragegy.ts
index d350557f57..53170825fb 100644
--- a/src/frontend/packages/core/src/route-reuse-stragegy.ts
+++ b/src/frontend/packages/core/src/route-reuse-stragegy.ts
@@ -1,8 +1,8 @@
+import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, DetachedRouteHandle, RouteReuseStrategy } from '@angular/router';
 
 import { AppComponent } from './app.component';
 import { DashboardBaseComponent } from './features/dashboard/dashboard-base/dashboard-base.component';
-import { Injectable } from "@angular/core";
 
 
 @Injectable()
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 84b00b4d77..929836fbc0 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
@@ -84,11 +84,11 @@ export class AppActionMonitorComponent<T> implements OnInit {
     };
 
     // Some data$ obs only ever emit once. If we subscribed directly to this then that emit would be consumed and will not be available
-    // in the data source connect subscription. So wrap it in a replay to ensure the last emitted value is available 
+    // in the data source connect subscription. So wrap it in a replay to ensure the last emitted value is available
     this.replayData$ = this.data$.pipe(
       publishReplay(1),
       refCount()
-    )
+    );
 
     this.allColumns = [...this.columns, monitorColumn];
     this.dataSource = {
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 6a1675dc5f..be48e1d828 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
@@ -50,6 +50,25 @@ export class BooleanIndicatorComponent {
 
   @Input() showText = true;
 
+  private icons = {
+    Yes: 'check_circle',
+    Enabled: 'check_circle',
+    Healthy: 'check_circle',
+    True: 'check_circle',
+    Succeeded: 'check_circle',
+    Add: 'add_circle',
+    No: 'highlight_off',
+    Disabled: 'highlight_off',
+    Unhealthy: 'highlight_off',
+    Failed: 'remove_circle',
+    False: 'highlight_off',
+    Remove: 'remove_circle',
+    Locked: 'lock_outline',
+    Unlocked: 'lock_open',
+    Unknown: 'help_outline',
+    Progress: 'cached'
+  };
+
   private pType: BooleanIndicatorType;
   @Input()
   get type(): BooleanIndicatorType {
@@ -74,31 +93,12 @@ export class BooleanIndicatorComponent {
     const isUnknown = typeof this.isTrue !== 'boolean';
     this.booleanOutput = this.getIconTextAndSeverity({
       isTrue: this.isTrue,
-      isUnknown: isUnknown,
+      isUnknown,
       inverse: this.inverse,
       subtle: this.subtle
     });
   }
 
-  private icons = {
-    Yes: 'check_circle',
-    Enabled: 'check_circle',
-    Healthy: 'check_circle',
-    True: 'check_circle',
-    Succeeded: 'check_circle',
-    Add: 'add_circle',
-    No: 'highlight_off',
-    Disabled: 'highlight_off',
-    Unhealthy: 'highlight_off',
-    Failed: 'remove_circle',
-    False: 'highlight_off',
-    Remove: 'remove_circle',
-    Locked: 'lock_outline',
-    Unlocked: 'lock_open',
-    Unknown: 'help_outline',
-    Progress: 'cached'
-  };
-
   private getIconTextAndSeverity = (
     { isTrue = false, isUnknown = false, inverse = false, subtle = true }: IBooleanConfig
   ): IBooleanOutput => {
@@ -117,13 +117,13 @@ export class BooleanIndicatorComponent {
       isTrue: inverse ? !isTrue : isTrue,
       subtle
     };
-  }
+  };
 
   private getText = ({ isTrue = false, inverse = false }: IBooleanConfig): string => {
     const [enabledText, disabledText] = this.getTypeText(this.type);
     const value = inverse ? !isTrue : isTrue;
     return this.capitalizeFirstLetter(value ? enabledText : disabledText);
-  }
+  };
 
   private getTypeText = (s: string) => s.split('-');
 
diff --git a/src/frontend/packages/core/src/shared/components/copy-to-clipboard/copy-to-clipboard.component.ts b/src/frontend/packages/core/src/shared/components/copy-to-clipboard/copy-to-clipboard.component.ts
index 1534ec9e43..39046acd13 100644
--- a/src/frontend/packages/core/src/shared/components/copy-to-clipboard/copy-to-clipboard.component.ts
+++ b/src/frontend/packages/core/src/shared/components/copy-to-clipboard/copy-to-clipboard.component.ts
@@ -1,8 +1,6 @@
 import { DOCUMENT } from '@angular/common';
 import { Component, Inject, Input, OnInit } from '@angular/core';
 
-import { LoggerService } from '../../../core/logger.service';
-
 @Component({
   selector: 'app-copy-to-clipboard',
   templateUrl: './copy-to-clipboard.component.html',
@@ -23,7 +21,6 @@ export class CopyToClipboardComponent implements OnInit {
 
   constructor(
     @Inject(DOCUMENT) document: Document,
-    private logService: LoggerService
   ) {
     this.document = document;
   }
@@ -63,7 +60,7 @@ export class CopyToClipboardComponent implements OnInit {
       this.copySuccessWait = true;
       setTimeout(() => this.copySuccessWait = false, 2000);
     } catch (err) {
-      this.logService.warn('Failed to copy to clipboard');
+      console.warn('Failed to copy to clipboard');
     }
 
     this.document.body.removeChild(textArea);
diff --git a/src/frontend/packages/core/src/shared/components/date-time/date-time.component.ts b/src/frontend/packages/core/src/shared/components/date-time/date-time.component.ts
index 340445fef4..fe9026a7a4 100644
--- a/src/frontend/packages/core/src/shared/components/date-time/date-time.component.ts
+++ b/src/frontend/packages/core/src/shared/components/date-time/date-time.component.ts
@@ -1,9 +1,8 @@
-import { SetupModule } from './../../../features/setup/setup.module';
-import { Component, OnInit, Output, OnDestroy, Input, EventEmitter } from '@angular/core';
+import { Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core';
 import { FormControl } from '@angular/forms';
-import * as moment from 'moment';
-import { tap, map, filter, shareReplay, debounceTime } from 'rxjs/operators';
-import { combineLatest, Subscription, Observable } from 'rxjs';
+import moment from 'moment';
+import { combineLatest, Observable, Subscription } from 'rxjs';
+import { debounceTime, filter, map, shareReplay, tap } from 'rxjs/operators';
 
 @Component({
   selector: 'app-date-time',
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 16797fb932..06367a9196 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
@@ -87,12 +87,9 @@ export class FavoritesMetaCardComponent {
       this.prettyName = prettyName || 'Unknown';
       this.entityConfig = new ComponentEntityMonitorConfig(favorite.guid, stratosEntityFactory(userFavouritesEntityType));
 
-      // If this favorite is an endpoint, lookup the image for it from the entitiy catalog
+      // If this favorite is an endpoint, lookup the image for it from the entity catalog
       if (this.favorite.entityType === 'endpoint') {
-        this.iconUrl$ = endpoint$.pipe(map(a => {
-          const entityDef = entityCatalog.getEndpoint(a.cnsi_type, a.sub_type);
-          return entityDef.definition.logoUrl;
-        }));
+        this.iconUrl$ = endpoint$.pipe(map(a => entityCatalog.getEndpoint(a.cnsi_type, a.sub_type).definition.logoUrl));
       } else {
         this.iconUrl$ = observableOf('');
       }
@@ -141,7 +138,7 @@ export class FavoritesMetaCardComponent {
 
   private removeFavorite = () => {
     stratosEntityCatalog.userFavorite.api.delete(this.favorite);
-  }
+  };
 
   public toggleMoreError() {
     this.showMore = !this.showMore;
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 b7ff749166..ffea2724cc 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
@@ -15,10 +15,6 @@ 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 */
-
 describe('TableCellComponent', () => {
   let component: TableCellComponent<any>;
   let fixture: ComponentFixture<TableCellComponent<any>>;
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table.component.ts
index ab1af731f3..e63d89b826 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table.component.ts
@@ -64,7 +64,7 @@ export class TableComponent<T> implements OnInit, OnDestroy {
   public columnNames: string[];
 
   @Input() minRowHeight: string;
-  @Input() prominentErrorBar: boolean = true;
+  @Input() prominentErrorBar = true;
 
   ngOnInit() {
     if (this.addSelect || this.expandComponent || this.addActions) {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/apiKeys/apiKey-data-source.ts b/src/frontend/packages/core/src/shared/components/list/list-types/apiKeys/apiKey-data-source.ts
new file mode 100644
index 0000000000..a57eee6721
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/apiKeys/apiKey-data-source.ts
@@ -0,0 +1,32 @@
+import { Store } from '@ngrx/store';
+
+import { GetAllApiKeys } from '../../../../../../../store/src/actions/apiKey.actions';
+import { ApiKey } from '../../../../../../../store/src/apiKey.types';
+import { AppState } from '../../../../../../../store/src/app-state';
+import { ListDataSource } from '../../data-sources-controllers/list-data-source';
+import { IListConfig } from '../../list.component.types';
+
+export class ApiKeyDataSource extends ListDataSource<ApiKey> {
+
+  constructor(
+    store: Store<AppState>,
+    listConfig: IListConfig<ApiKey>,
+    action: GetAllApiKeys,
+  ) {
+    super({
+      store,
+      action,
+      schema: action.entity[0],
+      getRowUniqueId: (object) => action.entity[0].getId(object),
+      paginationKey: action.paginationKey,
+      isLocal: true,
+      transformEntities: [
+        {
+          type: 'filter',
+          field: 'comment'
+        },
+      ],
+      listConfig,
+    });
+  }
+}
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/apiKeys/apiKey-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/apiKeys/apiKey-list-config.service.ts
new file mode 100644
index 0000000000..035a9067da
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/apiKeys/apiKey-list-config.service.ts
@@ -0,0 +1,103 @@
+import { Injectable } from '@angular/core';
+import { SortDirection } from '@angular/material/sort';
+import { Store } from '@ngrx/store';
+import moment from 'moment';
+
+import { ListView } from '../../../../../../../store/src/actions/list.actions';
+import { ApiKey } from '../../../../../../../store/src/apiKey.types';
+import { AppState } from '../../../../../../../store/src/app-state';
+import { stratosEntityCatalog } from '../../../../../../../store/src/stratos-entity-catalog';
+import { ConfirmationDialogConfig } from '../../../confirmation-dialog.config';
+import { ConfirmationDialogService } from '../../../confirmation-dialog.service';
+import { ITableColumn } from '../../list-table/table.types';
+import { IListAction, IListConfig, ListViewTypes } from '../../list.component.types';
+import { ApiKeyDataSource } from './apiKey-data-source';
+
+@Injectable()
+export class ApiKeyListConfigService implements IListConfig<ApiKey> {
+
+  private static comment = 'comment';
+  private static lastUsedName = 'last_used';
+
+  private deleteAction: IListAction<ApiKey> = {
+    action: (item: ApiKey) => {
+      const confirmation = new ConfirmationDialogConfig(
+        'Delete Key',
+        `Are you sure?`,
+        'Delete',
+        true
+      );
+      this.confirmDialog.open(
+        confirmation,
+        () => stratosEntityCatalog.apiKey.api.delete(item.guid)
+      );
+    },
+    label: 'Delete',
+    description: 'Delete API Key',
+  }
+  private singleActions: IListAction<ApiKey>[] = [this.deleteAction];
+
+
+  public readonly columns: ITableColumn<ApiKey>[] = [
+    {
+      columnId: ApiKeyListConfigService.comment,
+      headerCell: () => 'Description',
+      cellDefinition: {
+        valuePath: 'comment'
+      },
+      sort: {
+        type: 'sort',
+        orderKey: ApiKeyListConfigService.comment,
+        field: 'comment'
+      },
+      cellFlex: '2'
+    },
+    {
+      columnId: ApiKeyListConfigService.lastUsedName,
+      headerCell: () => 'Last Used',
+      cellDefinition: {
+        getValue: row => row.last_used ? moment(row.last_used).format('LLL') : null
+      },
+      sort: {
+        type: 'sort',
+        orderKey: ApiKeyListConfigService.lastUsedName,
+        field: 'last_used'
+      },
+      cellFlex: '1'
+    }
+  ];
+
+  isLocal = true;
+  dataSource: ApiKeyDataSource;
+  viewType = ListViewTypes.TABLE_ONLY;
+  defaultView = 'table' as ListView;
+  text = {
+    title: '',
+    filter: 'Filter API Keys'
+  };
+  enableTextFilter = true;
+
+  constructor(
+    store: Store<AppState>,
+    private confirmDialog: ConfirmationDialogService,
+  ) {
+    const action = stratosEntityCatalog.apiKey.actions.getMultiple();
+    action.initialParams = {
+      'order-direction': 'desc' as SortDirection,
+      'order-direction-field': 'comment'
+    };
+    this.dataSource = new ApiKeyDataSource(
+      store,
+      this,
+      action
+    );
+  }
+
+  public getGlobalActions = () => [];
+  public getMultiActions = () => [];
+  public getSingleActions = () => this.singleActions;
+  public getColumns = () => this.columns;
+  public getDataSource = () => this.dataSource;
+  public getMultiFiltersConfigs = () => [];
+
+}
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 82bb85e5a4..b06faaca61 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
@@ -9,10 +9,10 @@ import {
   ViewContainerRef,
 } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { AppState } from 'frontend/packages/store/src/app-state';
 import { Observable, of, ReplaySubject, Subscription } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 
+import { AppState } from '../../../../../../../../store/src/app-state';
 import { getFullEndpointApiUrl } from '../../../../../../../../store/src/endpoint-utils';
 import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog';
 import {
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 41347976e7..c1350720f1 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
@@ -10,7 +10,6 @@ import { entityCatalog } from '../../../../../../../store/src/entity-catalog/ent
 import { ActionState } from '../../../../../../../store/src/reducers/api-request-reducer/types';
 import { stratosEntityCatalog } from '../../../../../../../store/src/stratos-entity-catalog';
 import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
-import { LoggerService } from '../../../../../core/logger.service';
 import { CurrentUserPermissionsService } from '../../../../../core/permissions/current-user-permissions.service';
 import { StratosCurrentUserPermissions } from '../../../../../core/permissions/stratos-user-permissions.checker';
 import {
@@ -66,7 +65,6 @@ export class EndpointListHelper {
     private dialog: MatDialog,
     private currentUserPermissionsService: CurrentUserPermissionsService,
     private confirmDialog: ConfirmationDialogService,
-    private log: LoggerService,
     private snackBarService: SnackBarService,
   ) { }
 
@@ -192,7 +190,7 @@ export class EndpointListHelper {
       endpointDetails: container
     };
     if (!component) {
-      this.log.warn(`Attempted to create a non-endpoint list details component "${listDetailsComponent}"`);
+      console.warn(`Attempted to create a non-endpoint list details component "${listDetailsComponent}"`);
       this.destroyEndpointDetails(refs);
     }
     return refs;
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 318bd0dd7e..2bc6da4898 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
@@ -701,7 +701,7 @@ export class ListComponent<T> implements OnInit, OnChanges, OnDestroy, AfterView
         map(requestInfo => ({
           deleting: requestInfo.deleting.busy,
           error: requestInfo.deleting.error,
-          message: requestInfo.deleting.error ? `Sorry, deletion failed` : null
+          message: requestInfo.deleting.error ? requestInfo.deleting.message || `Sorry, deletion failed` : null
         }))
       );
     };
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 6416a73dc3..174fc5eaa9 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
@@ -1,5 +1,5 @@
 import { Injectable, Type } from '@angular/core';
-import * as moment from 'moment';
+import moment from 'moment';
 import { BehaviorSubject, combineLatest, Observable, of as observableOf } from 'rxjs';
 import { first, map, startWith } from 'rxjs/operators';
 
@@ -230,7 +230,7 @@ export class MultiFilterManager<T> {
         if (options && options.length > 0) {
           this.selectItem(options[0].value);
         }
-      })
+      });
     }
   }
 
diff --git a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.spec.ts b/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.spec.ts
index 6e783f38c2..9c7a44a49e 100644
--- a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.spec.ts
@@ -5,7 +5,6 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
-import { LoggerService } from '../../../core/logger.service';
 import { SidepanelPreviewComponent } from '../sidepanel-preview/sidepanel-preview.component';
 import { MDAppModule } from './../../../core/md.module';
 import { SidePanelService } from './../../services/side-panel.service';
@@ -18,7 +17,7 @@ describe('MarkdownPreviewComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [MarkdownPreviewComponent, SidepanelPreviewComponent],
-      providers: [LoggerService, HttpClient, HttpHandler, SidePanelService],
+      providers: [HttpClient, HttpHandler, SidePanelService],
       imports: [
         MDAppModule,
         RouterTestingModule,
diff --git a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.ts b/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.ts
index 9dba74b1d5..ee00380c54 100644
--- a/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.ts
+++ b/src/frontend/packages/core/src/shared/components/markdown-preview/markdown-preview.component.ts
@@ -1,9 +1,8 @@
 import { HttpClient } from '@angular/common/http';
 import { Component, ElementRef, Input, SecurityContext, ViewChild } from '@angular/core';
 import { DomSanitizer } from '@angular/platform-browser';
-import * as markdown from 'marked';
+import markdown from 'marked';
 
-import { LoggerService } from '../../../core/logger.service';
 import { PreviewableComponent } from '../../previewable-component';
 
 @Component({
@@ -30,7 +29,6 @@ export class MarkdownPreviewComponent implements PreviewableComponent {
 
   constructor(
     private httpClient: HttpClient,
-    private logger: LoggerService,
     private domSanitizer: DomSanitizer
   ) { }
 
@@ -56,7 +54,7 @@ export class MarkdownPreviewComponent implements PreviewableComponent {
           this.markdownHtml = markdown(markText, { renderer });
         }
       },
-      (error) => this.logger.warn(`Failed to fetch markdown with url ${this.documentUrl}: `, error));
+      (error) => console.warn(`Failed to fetch markdown with url ${this.documentUrl}: `, error));
   }
 
   public markdownRendered() {
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 1fab0c74fc..facb1bfe9a 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
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core';
-import * as moment from 'moment';
+import moment from 'moment';
 import { Subscription } from 'rxjs';
 
 import { MetricsAction } from '../../../../../store/src/actions/metrics.actions';
diff --git a/src/frontend/packages/core/src/shared/components/nested-tabs/nested-tabs.component.ts b/src/frontend/packages/core/src/shared/components/nested-tabs/nested-tabs.component.ts
index 6f60fdb092..98f10111f7 100644
--- a/src/frontend/packages/core/src/shared/components/nested-tabs/nested-tabs.component.ts
+++ b/src/frontend/packages/core/src/shared/components/nested-tabs/nested-tabs.component.ts
@@ -1,5 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { TabNavItem } from '../../../../tab-nav.types';
+
+import { TabNavItem } from '../../../tab-nav.types';
 
 
 @Component({
diff --git a/src/frontend/packages/core/src/shared/components/no-content-message/no-content-message.component.html b/src/frontend/packages/core/src/shared/components/no-content-message/no-content-message.component.html
index efe500ff02..18aefbc5f3 100644
--- a/src/frontend/packages/core/src/shared/components/no-content-message/no-content-message.component.html
+++ b/src/frontend/packages/core/src/shared/components/no-content-message/no-content-message.component.html
@@ -1,4 +1,4 @@
- <div class="app-no-content-container" [ngClass]="{'app-no-content-container__menu': mode === 'menu'}">
+<div class="app-no-content-container" [ngClass]="{'app-no-content-container__menu': mode === 'menu'}">
   <div *ngIf="toolbarLink?.text" class="app-no-content-container__link" #toolBarLinkElement>
     <div class="app-no-content-container__link-text">{{toolbarLink.text}}</div>
     <mat-icon #toolbarRef class="app-no-content-container__link-icon">reply</mat-icon>
diff --git a/src/frontend/packages/core/src/shared/components/no-content-message/no-content-message.component.scss b/src/frontend/packages/core/src/shared/components/no-content-message/no-content-message.component.scss
index e9ea57ee5e..b46c1ba6fb 100644
--- a/src/frontend/packages/core/src/shared/components/no-content-message/no-content-message.component.scss
+++ b/src/frontend/packages/core/src/shared/components/no-content-message/no-content-message.component.scss
@@ -26,6 +26,7 @@
   }
   &__link {
     display: flex;
+    opacity: 0%;
     position: absolute;
     right: 113px;
     top: 54px;
@@ -39,6 +40,10 @@
       font-size: 16px;
       margin-top: 26px;
     }
+    &--show {
+      opacity: 100%;
+      transition: opacity .6s;
+    }
   }
   &__menu {
     margin-top: 0;
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 a303a443e2..e156f3cf0d 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
@@ -29,13 +29,18 @@ export class NoContentMessageComponent implements AfterViewInit {
   constructor(private renderer: Renderer2) { }
 
   ngAfterViewInit() {
-    // Align the prompt with the toolbar item
-    if (this.toolBarLinkElement) {
-      const elem = document.getElementById(this.toolbarAlign);
-      if (elem) {
-        const right = document.body.clientWidth - elem.getBoundingClientRect().right;
-        this.renderer.setStyle(this.toolBarLinkElement.nativeElement, 'right', right + 'px');
+    // Align the prompt with the toolbar item ...
+    // Note - Only execute after a delay. The final place of the target element may change given visibility of other menu items
+    // (polling disabled, notification bell). We should come back to this and replace the timeout with a better way of determining readyness
+    setTimeout(() => {
+      if (this.toolBarLinkElement) {
+        const elem = document.getElementById(this.toolbarAlign);
+        if (elem) {
+          const right = document.body.clientWidth - elem.getBoundingClientRect().right - 3;
+          this.renderer.setStyle(this.toolBarLinkElement.nativeElement, 'right', right + 'px');
+          this.renderer.addClass(this.toolBarLinkElement.nativeElement, 'app-no-content-container__link--show')
+        }
       }
-    }
+    }, 500);
   }
 }
diff --git a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.html b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.html
index 387c40e4ba..5f6c34fe7d 100644
--- a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.html
+++ b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.html
@@ -14,7 +14,8 @@
                 <ng-container *ngFor="let breadcrumbDef of breadcrumbDefinitions">
                   <span class="page-header__breadcrumb page-header__breadcrumb-link" *ngIf="breadcrumbDef.routerLink"
                     [routerLink]="breadcrumbDef.routerLink">{{ breadcrumbDef.value }}</span>
-                  <span class="page-header__breadcrumb" *ngIf="!breadcrumbDef.routerLink">{{ breadcrumbDef.value }}</span>
+                  <span class="page-header__breadcrumb"
+                    *ngIf="!breadcrumbDef.routerLink">{{ breadcrumbDef.value }}</span>
                   <mat-icon class="page-header__breadcrumb-separator">chevron_right</mat-icon>
                 </ng-container>
               </div>
@@ -24,61 +25,67 @@
             </div>
             <div class="page-header__filler"></div>
             <div class="page-header__right">
-            <div #extensionRef>
-              <app-extension-buttons *ngIf="actionsKey" [type]="actionsKey"></app-extension-buttons>
-            </div>
-            <div #ref>
-              <ng-content select=".page-header-right"></ng-content>
-            </div>
-            <span class="page-header__divider" *ngIf="
+              <div #extensionRef>
+                <app-extension-buttons *ngIf="actionsKey" [type]="actionsKey"></app-extension-buttons>
+              </div>
+              <div #ref>
+                <ng-content select=".page-header-right"></ng-content>
+              </div>
+              <span class="page-header__divider" *ngIf="
             (extensionRef.children[0] && extensionRef.children[0].children && extensionRef.children[0].children.length > 0) ||
             (ref.children[0] && ref.children[0] && ref.children[0].children && ref.children[0].children.length > 0)
           ">
-              |
-            </span>
-            <button *ngIf="showHistory" class="page-header__menu-button" mat-icon-button [matMenuTriggerFor]="history">
-              <mat-icon class="page-header__nav-toggle">schedule</mat-icon>
-            </button>
-            <mat-menu #history="matMenu" [overlapTrigger]="false" class="page-header__menu">
-              <div class="page-header__history">
-                <h3 class="page-header__history-title">Recent Activity</h3>
-                <app-recent-entities mode="menu" class="page-header__history-list" history="true"></app-recent-entities>
-              </div>
-            </mat-menu>
-            <button *ngIf="(events$ | async).length > 0" routerLink="/events" mat-icon-button
-              class="page-header__notification-button">
-              <mat-icon matBadgeColor="warn" [matBadge]="(unreadEventCount$ | async) || ''"
-                class="page-header__notifications-button">
-                notifications
-              </mat-icon>
-            </button>
-            <button id="userMenu" *ngIf="!hideMenu" class="page-header__menu-button page-header__usermenu"
-              mat-icon-button [matMenuTriggerFor]="menu">
-              <app-user-avatar color="header" [allowGravatar]="allowGravatar$ | async" [user]="user$ | async"></app-user-avatar>
-            </button>
-            <mat-menu #menu="matMenu" [overlapTrigger]="false" class="page-header__menu">
-              <div class="page-header__menu-inner">
-                <div class="page-header__username">
-                  <app-user-avatar [allowGravatar]="allowGravatar$ | async" [user]="user$ | async"></app-user-avatar>
-                  <div class="page-header__username-text">
-                    <div>{{ username$ | async }}</div>
-                  </div>
+                |
+              </span>
+              <button *ngIf="showHistory" class="page-header__menu-button" mat-icon-button
+                [matMenuTriggerFor]="history">
+                <mat-icon class="page-header__nav-toggle">schedule</mat-icon>
+              </button>
+              <mat-menu #history="matMenu" [overlapTrigger]="false" class="page-header__menu">
+                <div class="page-header__history">
+                  <h3 class="page-header__history-title">Recent Activity</h3>
+                  <app-recent-entities mode="menu" class="page-header__history-list" history="true">
+                  </app-recent-entities>
                 </div>
-                <div *ngIf="!logoutOnly">
-                  <button mat-menu-item routerLink="/about">
-                    <span>About</span>
-                  </button>
-                  <button mat-menu-item routerLink="/user-profile">
-                    <span>Profile</span>
+              </mat-menu>
+              <button *ngIf="(events$ | async).length > 0" routerLink="/events" mat-icon-button
+                class="page-header__notification-button">
+                <mat-icon matBadgeColor="warn" [matBadge]="(unreadEventCount$ | async) || ''"
+                  class="page-header__notifications-button">
+                  notifications
+                </mat-icon>
+              </button>
+              <button id="userMenu" *ngIf="!hideMenu" class="page-header__menu-button page-header__usermenu"
+                mat-icon-button [matMenuTriggerFor]="menu">
+                <app-user-avatar color="header" [allowGravatar]="allowGravatar$ | async" [user]="user$ | async">
+                </app-user-avatar>
+              </button>
+              <mat-menu #menu="matMenu" [overlapTrigger]="false" class="page-header__menu">
+                <div class="page-header__menu-inner">
+                  <div class="page-header__username">
+                    <app-user-avatar [allowGravatar]="allowGravatar$ | async" [user]="user$ | async"></app-user-avatar>
+                    <div class="page-header__username-text">
+                      <div>{{ username$ | async }}</div>
+                    </div>
+                  </div>
+                  <div *ngIf="!logoutOnly">
+                    <button mat-menu-item routerLink="/about">
+                      <span>About</span>
+                    </button>
+                    <button mat-menu-item routerLink="/user-profile">
+                      <span>Profile</span>
+                    </button>
+                    <button mat-menu-item routerLink="/api-keys" *ngIf="canAPIKeys$ | async">
+                      <span>API Keys</span>
+                    </button>
+                    <div class="page-header__menu-separator"></div>
+                  </div>
+                  <button mat-menu-item (click)="logout()">
+                    <span>Logout</span>
                   </button>
-                  <div class="page-header__menu-separator"></div>
                 </div>
-                <button mat-menu-item (click)="logout()">
-                  <span>Logout</span>
-                </button>
-              </div>
-            </mat-menu>
-          </div>
+              </mat-menu>
+            </div>
           </mat-toolbar>
         </div>
         <app-page-header-events *ngIf="!hideEndpointErrors" class="header-events" [endpointIds$]="endpointIds$">
diff --git a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.spec.ts b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.spec.ts
index bc242042f2..dfa81f3643 100644
--- a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.spec.ts
@@ -3,11 +3,12 @@ import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { StoreModule } from '@ngrx/store';
 
+import { InternalEventMonitorFactory } from '../../../../../store/src/monitors/internal-event-monitor.factory';
 import { appReducers } from '../../../../../store/src/reducers.module';
-import { TabNavService } from '../../../../tab-nav.service';
 import { CoreModule } from '../../../core/core.module';
 import { MDAppModule } from '../../../core/md.module';
-import { InternalEventMonitorFactory } from '../../../../../store/src/monitors/internal-event-monitor.factory';
+import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
+import { TabNavService } from '../../../tab-nav.service';
 import { SharedModule } from '../../shared.module';
 import { PageHeaderComponent } from './page-header.component';
 import { PageHeaderModule } from './page-header.module';
@@ -28,7 +29,8 @@ describe('PageHeaderComponent', () => {
             }
           }
         },
-        TabNavService
+        TabNavService,
+        CurrentUserPermissionsService
       ],
       imports: [
         MDAppModule,
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 46be7b2b61..2547077ff4 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
@@ -2,7 +2,7 @@ import { TemplatePortal } from '@angular/cdk/portal';
 import { AfterViewInit, Component, Input, OnDestroy, TemplateRef, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Store } from '@ngrx/store';
-import * as moment from 'moment';
+import moment from 'moment';
 import { Observable } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 
@@ -15,9 +15,11 @@ import { selectIsMobile } from '../../../../../store/src/selectors/dashboard.sel
 import { InternalEventSeverity } from '../../../../../store/src/types/internal-events.types';
 import { StratosStatus } from '../../../../../store/src/types/shared.types';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../store/src/types/user-favorites.types';
-import { TabNavService } from '../../../../tab-nav.service';
+import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
+import { StratosCurrentUserPermissions } from '../../../core/permissions/stratos-user-permissions.checker';
 import { UserProfileService } from '../../../core/user-profile.service';
 import { IPageSideNavTab } from '../../../features/dashboard/page-side-nav/page-side-nav.component';
+import { TabNavService } from '../../../tab-nav.service';
 import { GlobalEventService, IGlobalEvent } from '../../global-events.service';
 import { selectDashboardState } from './../../../../../store/src/selectors/dashboard.selectors';
 import { UserProfileInfo } from './../../../../../store/src/types/user-profile.types';
@@ -29,6 +31,7 @@ import { BREADCRUMB_URL_PARAM, IHeaderBreadcrumb, IHeaderBreadcrumbLink } from '
   styleUrls: ['./page-header.component.scss']
 })
 export class PageHeaderComponent implements OnDestroy, AfterViewInit {
+  public canAPIKeys$: Observable<boolean>;
   public breadcrumbDefinitions: IHeaderBreadcrumbLink[] = null;
   private breadcrumbKey: string;
   public eventSeverity = InternalEventSeverity;
@@ -156,6 +159,7 @@ export class PageHeaderComponent implements OnDestroy, AfterViewInit {
     eventService: GlobalEventService,
     private favoritesConfigMapper: FavoritesConfigMapper,
     private userProfileService: UserProfileService,
+    private cups: CurrentUserPermissionsService,
   ) {
     this.events$ = eventService.events$.pipe(
       startWith([])
@@ -185,6 +189,8 @@ export class PageHeaderComponent implements OnDestroy, AfterViewInit {
     this.allowGravatar$ = this.store.select(selectDashboardState).pipe(
       map(dashboardState => dashboardState.gravatarEnabled)
     );
+
+    this.canAPIKeys$ = this.cups.can(StratosCurrentUserPermissions.API_KEYS);
   }
 
   ngOnDestroy() {
diff --git a/src/frontend/packages/core/src/shared/components/page-header/show-page-header/show-page-header.component.spec.ts b/src/frontend/packages/core/src/shared/components/page-header/show-page-header/show-page-header.component.spec.ts
index e98cc350b6..3214487c5e 100644
--- a/src/frontend/packages/core/src/shared/components/page-header/show-page-header/show-page-header.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/page-header/show-page-header/show-page-header.component.spec.ts
@@ -1,8 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
-import { TabNavService } from '../../../../../tab-nav.service';
 import { CoreModule } from '../../../../core/core.module';
+import { TabNavService } from '../../../../tab-nav.service';
 import { ShowPageHeaderComponent } from './show-page-header.component';
 
 describe('ShowPageHeaderComponent', () => {
diff --git a/src/frontend/packages/core/src/shared/components/page-header/show-page-header/show-page-header.component.ts b/src/frontend/packages/core/src/shared/components/page-header/show-page-header/show-page-header.component.ts
index bf90d6eccd..506572d214 100644
--- a/src/frontend/packages/core/src/shared/components/page-header/show-page-header/show-page-header.component.ts
+++ b/src/frontend/packages/core/src/shared/components/page-header/show-page-header/show-page-header.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 
-import { TabNavService } from '../../../../../tab-nav.service';
+import { TabNavService } from '../../../../tab-nav.service';
 
 @Component({
   selector: 'app-show-page-header',
diff --git a/src/frontend/packages/core/src/shared/components/page-sub-nav/page-sub-nav.component.spec.ts b/src/frontend/packages/core/src/shared/components/page-sub-nav/page-sub-nav.component.spec.ts
index ef0a872651..a2b538f67d 100644
--- a/src/frontend/packages/core/src/shared/components/page-sub-nav/page-sub-nav.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/page-sub-nav/page-sub-nav.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
-import { TabNavService } from '../../../../tab-nav.service';
+import { TabNavService } from '../../../tab-nav.service';
 import { PageSubNavComponent } from './page-sub-nav.component';
 
 describe('PageSubNavComponent', () => {
diff --git a/src/frontend/packages/core/src/shared/components/page-sub-nav/page-sub-nav.component.ts b/src/frontend/packages/core/src/shared/components/page-sub-nav/page-sub-nav.component.ts
index 8c66274b02..604a2680e7 100644
--- a/src/frontend/packages/core/src/shared/components/page-sub-nav/page-sub-nav.component.ts
+++ b/src/frontend/packages/core/src/shared/components/page-sub-nav/page-sub-nav.component.ts
@@ -1,7 +1,7 @@
 import { TemplatePortal } from '@angular/cdk/portal';
 import { AfterViewInit, Component, Input, OnDestroy, TemplateRef, ViewChild } from '@angular/core';
 
-import { TabNavService } from '../../../../tab-nav.service';
+import { TabNavService } from '../../../tab-nav.service';
 import { IHeaderBreadcrumbLink } from '../page-header/page-header.types';
 
 @Component({
@@ -15,7 +15,7 @@ export class PageSubNavComponent implements AfterViewInit, OnDestroy {
   set breadcrumbs(crumbs: IHeaderBreadcrumbLink[]) {
     this.tabNavService.setSubNavBreadcrumbs(crumbs);
   }
-  
+
   @ViewChild('subNavTmpl', { static: true }) subNavTmpl: TemplateRef<any>;
 
   constructor(private tabNavService: TabNavService) { }
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 a44f13294b..ed5adeaed9 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
@@ -1,15 +1,15 @@
 import { Component, Input } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog';
-import {
-  MAX_RECENT_COUNT,
-} from 'frontend/packages/store/src/reducers/current-user-roles-reducer/recently-visited.reducer.helpers';
-import * as moment from 'moment';
+import moment from 'moment';
 import { Observable, of as observableOf } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
 import { endpointEntityType } from '../../../../../store/src/helpers/stratos-entity-factory';
+import {
+  MAX_RECENT_COUNT,
+} from '../../../../../store/src/reducers/current-user-roles-reducer/recently-visited.reducer.helpers';
 import { endpointEntitiesSelector } from '../../../../../store/src/selectors/endpoint.selectors';
 import { recentlyVisitedSelector } from '../../../../../store/src/selectors/recently-visitied.selectors';
 import { IRecentlyVisitedEntity } from '../../../../../store/src/types/recently-visited.types';
diff --git a/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.spec.ts b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.spec.ts
index e09366568c..3af77fa9bf 100644
--- a/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/sidepanel-preview/sidepanel-preview.component.spec.ts
@@ -5,7 +5,6 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
-import { LoggerService } from '../../../core/logger.service';
 import { MDAppModule } from '../../../core/md.module';
 import { SidePanelService } from './../../services/side-panel.service';
 import { SidepanelPreviewComponent } from './sidepanel-preview.component';
@@ -17,7 +16,7 @@ describe('SidepanelPreviewComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [SidepanelPreviewComponent],
-      providers: [LoggerService, HttpClient, HttpHandler, SidePanelService],
+      providers: [HttpClient, HttpHandler, SidePanelService],
       imports: [
         MDAppModule,
         RouterTestingModule,
diff --git a/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.spec.ts b/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.spec.ts
index eaa8ba06e3..44339bcddf 100644
--- a/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import * as moment from 'moment';
+import moment from 'moment';
 
 import { SharedModule } from './../../shared.module';
 import { StartEndDateComponent } from './start-end-date.component';
diff --git a/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.ts b/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.ts
index 46958aa923..a8b3640c81 100644
--- a/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.ts
+++ b/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import * as moment from 'moment';
+import moment from 'moment';
 
 @Component({
   selector: 'app-start-end-date',
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 f35cb5c7ba..062ef505f2 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
@@ -17,7 +17,6 @@ import { catchError, first, map, switchMap } from 'rxjs/operators';
 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';
 import { SteppersService } from '../steppers.service';
 import { StepComponent, StepOnNextResult } from './../step/step.component';
@@ -63,7 +62,6 @@ export class SteppersComponent implements OnInit, AfterContentInit, OnDestroy {
     private steppersService: SteppersService,
     private store: Store<AppState>,
     private snackBar: MatSnackBar,
-    private logger: LoggerService,
     private route: ActivatedRoute
   ) {
     const previousRoute$ = store.select(getPreviousRoutingState).pipe(first());
@@ -125,7 +123,7 @@ export class SteppersComponent implements OnInit, AfterContentInit, OnDestroy {
       this.nextSub = obs$.pipe(
         first(),
         catchError(err => {
-          this.logger.warn('Stepper failed: ', err);
+          console.warn('Stepper failed: ', err);
           return observableOf({
             success: false,
             message: err || 'Failed',
diff --git a/src/frontend/packages/core/src/shared/components/user-avatar/md5.ts b/src/frontend/packages/core/src/shared/components/user-avatar/md5.ts
index da9418a3b4..06abf96e4d 100644
--- a/src/frontend/packages/core/src/shared/components/user-avatar/md5.ts
+++ b/src/frontend/packages/core/src/shared/components/user-avatar/md5.ts
@@ -1,5 +1,6 @@
 /*eslint-disable*/
-/*tslint:disabled*/
+/*tslint:disable*/
+
 
 export class MD5 {
 
diff --git a/src/frontend/packages/core/src/shared/components/user-avatar/user-avatar.component.ts b/src/frontend/packages/core/src/shared/components/user-avatar/user-avatar.component.ts
index f60246cab8..adbca46ed5 100644
--- a/src/frontend/packages/core/src/shared/components/user-avatar/user-avatar.component.ts
+++ b/src/frontend/packages/core/src/shared/components/user-avatar/user-avatar.component.ts
@@ -1,5 +1,6 @@
 import { Component, Input } from '@angular/core';
-import { UserProfileInfo } from 'frontend/packages/store/src/types/user-profile.types';
+
+import { UserProfileInfo } from '../../../../../store/src/types/user-profile.types';
 import { MD5 } from './md5';
 
 @Component({
diff --git a/src/frontend/packages/core/src/shared/components/user-profile-banner/user-profile-banner.component.ts b/src/frontend/packages/core/src/shared/components/user-profile-banner/user-profile-banner.component.ts
index e198687778..a7efc4cf89 100644
--- a/src/frontend/packages/core/src/shared/components/user-profile-banner/user-profile-banner.component.ts
+++ b/src/frontend/packages/core/src/shared/components/user-profile-banner/user-profile-banner.component.ts
@@ -1,5 +1,6 @@
 import { Component, Input } from '@angular/core';
-import { UserProfileInfo } from 'frontend/packages/store/src/types/user-profile.types';
+
+import { UserProfileInfo } from '../../../../../store/src/types/user-profile.types';
 
 @Component({
   selector: 'app-user-profile-banner',
diff --git a/src/frontend/packages/core/src/shared/services/metrics-range-selector-manager.service.ts b/src/frontend/packages/core/src/shared/services/metrics-range-selector-manager.service.ts
index bb8ef4dc09..994a287b2f 100644
--- a/src/frontend/packages/core/src/shared/services/metrics-range-selector-manager.service.ts
+++ b/src/frontend/packages/core/src/shared/services/metrics-range-selector-manager.service.ts
@@ -1,5 +1,5 @@
 import { Injectable, NgZone } from '@angular/core';
-import * as moment from 'moment';
+import moment from 'moment';
 import { Subject, Subscription } from 'rxjs';
 import { debounceTime, takeWhile, tap } from 'rxjs/operators';
 
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 9789997fe0..a90943d7ac 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
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import * as moment from 'moment';
+import moment from 'moment';
 
 import { MetricQueryConfig, MetricsAction } from '../../../../store/src/actions/metrics.actions';
 import { IMetrics } from '../../../../store/src/types/base-metric.types';
@@ -23,6 +23,16 @@ export class MetricsRangeSelectorService {
       label: 'The past hour',
       queryType: MetricQueryType.QUERY
     },
+    {
+      value: '1:day',
+      label: 'The past day',
+      queryType: MetricQueryType.QUERY
+    },
+    {
+      value: '3:day',
+      label: 'The past 3 days',
+      queryType: MetricQueryType.QUERY
+    },
     {
       value: '1:week',
       label: 'The past week',
diff --git a/src/frontend/packages/core/src/shared/services/metrics-range-selector.types.ts b/src/frontend/packages/core/src/shared/services/metrics-range-selector.types.ts
index 872a42e0c8..2c2e47fe32 100644
--- a/src/frontend/packages/core/src/shared/services/metrics-range-selector.types.ts
+++ b/src/frontend/packages/core/src/shared/services/metrics-range-selector.types.ts
@@ -1,4 +1,4 @@
-import * as moment from 'moment';
+import moment from 'moment';
 
 import { MetricQueryType } from '../../../../store/src/types/metric.types';
 
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index 160c4d90a7..cb3c000b5d 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -57,6 +57,7 @@ import { TableCellStatusDirective } from './components/list/list-table/table-cel
 import { listTableCells } from './components/list/list-table/table-cell/table-cell.component';
 import { TableComponent } from './components/list/list-table/table.component';
 import { listTableComponents } from './components/list/list-table/table.types';
+import { ApiKeyListConfigService } from './components/list/list-types/apiKeys/apiKey-list-config.service';
 import { EndpointCardComponent } from './components/list/list-types/endpoint/endpoint-card/endpoint-card.component';
 import { EndpointListHelper } from './components/list/list-types/endpoint/endpoint-list.helpers';
 import { EndpointsListConfigService } from './components/list/list-types/endpoint/endpoints-list-config.service';
@@ -319,6 +320,7 @@ import { UserPermissionDirective } from './user-permission.directive';
     ListConfig,
     EndpointListHelper,
     EndpointsListConfigService,
+    ApiKeyListConfigService,
     ConfirmationDialogService,
     InternalEventMonitorFactory,
     MetricsRangeSelectorService,
diff --git a/src/frontend/packages/core/src/styles.scss b/src/frontend/packages/core/src/styles.scss
index c4e58757d0..58d85e671b 100644
--- a/src/frontend/packages/core/src/styles.scss
+++ b/src/frontend/packages/core/src/styles.scss
@@ -10,6 +10,7 @@
 @import '../sass/components/mat-tabs';
 @import '../sass/components/mat-table';
 @import '../sass/components/mat-button-toggle-group';
+@import '../sass/components/json-schema-form';
 
 body {
   font-family: Lato, sans-serif; // font-size: 13px;
diff --git a/src/frontend/packages/core/tab-nav.service.ts b/src/frontend/packages/core/src/tab-nav.service.ts
similarity index 94%
rename from src/frontend/packages/core/tab-nav.service.ts
rename to src/frontend/packages/core/src/tab-nav.service.ts
index d11ed06666..99af87716c 100644
--- a/src/frontend/packages/core/tab-nav.service.ts
+++ b/src/frontend/packages/core/src/tab-nav.service.ts
@@ -4,8 +4,8 @@ import { NavigationEnd, Router } from '@angular/router';
 import { asapScheduler, BehaviorSubject, combineLatest, Observable, Subject } from 'rxjs';
 import { filter, map, observeOn, publishReplay, refCount, startWith } from 'rxjs/operators';
 
-import { IPageSideNavTab } from './src/features/dashboard/page-side-nav/page-side-nav.component';
-import { IHeaderBreadcrumbLink } from './src/shared/components/page-header/page-header.types';
+import { IPageSideNavTab } from './features/dashboard/page-side-nav/page-side-nav.component';
+import { IHeaderBreadcrumbLink } from './shared/components/page-header/page-header.types';
 
 
 @Injectable()
@@ -84,7 +84,7 @@ export class TabNavService {
       return null;
     }
     return activeTab;
-  }
+  };
 
   private observeSubject(subject: Subject<any>) {
     return subject.asObservable().pipe(
diff --git a/src/frontend/packages/core/tab-nav.types.ts b/src/frontend/packages/core/src/tab-nav.types.ts
similarity index 100%
rename from src/frontend/packages/core/tab-nav.types.ts
rename to src/frontend/packages/core/src/tab-nav.types.ts
diff --git a/src/frontend/packages/core/xsrf.module.ts b/src/frontend/packages/core/src/xsrf.module.ts
similarity index 100%
rename from src/frontend/packages/core/xsrf.module.ts
rename to src/frontend/packages/core/src/xsrf.module.ts
diff --git a/src/frontend/packages/core/tslint.json b/src/frontend/packages/core/tslint.json
index 1f63906f09..9da788b6cb 100644
--- a/src/frontend/packages/core/tslint.json
+++ b/src/frontend/packages/core/tslint.json
@@ -1,3 +1,3 @@
 {
-  "extends": "../../../tslint.json"
+  "extends": "../../../../tslint.json"
 }
diff --git a/src/frontend/packages/store/ng-package.json b/src/frontend/packages/store/ng-package.json
index babd6c3d91..d06c8efd6e 100644
--- a/src/frontend/packages/store/ng-package.json
+++ b/src/frontend/packages/store/ng-package.json
@@ -2,6 +2,18 @@
   "$schema": "../../../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../../../../dist/store",
   "lib": {
-    "entryFile": "src/public-api.ts"
+    "entryFile": "src/public-api.ts",
+    "umdModuleIds": {
+      "normalizr": "normalizr",
+      "rxjs-spy/operators": "rxjsSpy_operators",
+      "rxjs-spy/operators/tag": "rxjsSpy_operators_tag",
+      "ngrx-store-localstorage": "ngrxStoreLocalstorage",
+      "@ngrx/store": "ngrx_store",
+      "@ngrx/effects": "ngrx_effects",
+      "immer": "immer",
+      "util": "util",
+      "@ngrx/router-store": "ngrx_routerStore",
+      "moment": "moment"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/src/frontend/packages/store/src/actions/action-history.actions.ts b/src/frontend/packages/store/src/actions/action-history.actions.ts
deleted file mode 100644
index a8a0b1e6e4..0000000000
--- a/src/frontend/packages/store/src/actions/action-history.actions.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Action } from '@ngrx/store';
-
-export const ActionHistoryActions = {
-  DUMP: '[Action History] Dump',
-};
-
-export class ActionHistoryDump implements Action {
-  type = ActionHistoryActions.DUMP;
-}
diff --git a/src/frontend/packages/store/src/actions/apiKey.actions.ts b/src/frontend/packages/store/src/actions/apiKey.actions.ts
new file mode 100644
index 0000000000..4b10e34bef
--- /dev/null
+++ b/src/frontend/packages/store/src/actions/apiKey.actions.ts
@@ -0,0 +1,44 @@
+import { apiKeyEntityType, STRATOS_ENDPOINT_TYPE, stratosEntityFactory } from '../helpers/stratos-entity-factory';
+import { PaginatedAction, PaginationParam } from '../types/pagination.types';
+import { EntityRequestAction } from '../types/request.types';
+
+export const API_KEY_ADD = '[API Key] Add API Key'
+export const API_KEY_DELETE = '[API Key] Delete API Key'
+export const API_KEY_GET_ALL = '[API Key] Get All API Key'
+
+abstract class BaseApiKeyAction implements EntityRequestAction {
+  entityType = apiKeyEntityType;
+  endpointType = STRATOS_ENDPOINT_TYPE;
+  entity = [stratosEntityFactory(apiKeyEntityType)]
+  constructor(public type: string) { }
+}
+
+interface PaginationApiKeyAction extends PaginatedAction, EntityRequestAction {
+  flattenPagination: boolean;
+}
+interface SingleApiKeyAction extends EntityRequestAction {
+  guid: string;
+}
+
+export class AddApiKey extends BaseApiKeyAction implements SingleApiKeyAction {
+  constructor(public comment: string) {
+    super(API_KEY_ADD);
+  }
+  guid = 'ADD'
+}
+
+export class DeleteApiKey extends BaseApiKeyAction implements SingleApiKeyAction {
+  constructor(public guid: string) {
+    super(API_KEY_DELETE);
+  }
+}
+
+export class GetAllApiKeys extends BaseApiKeyAction implements PaginationApiKeyAction {
+  constructor() {
+    super(API_KEY_GET_ALL);
+    this.paginationKey = 'CURRENT_USERS';
+  }
+  flattenPagination = true;
+  paginationKey: string;
+  initialParams: PaginationParam
+}
\ No newline at end of file
diff --git a/src/frontend/packages/store/src/actions/internal-events.actions.ts b/src/frontend/packages/store/src/actions/internal-events.actions.ts
index 845a0adca4..d644492891 100644
--- a/src/frontend/packages/store/src/actions/internal-events.actions.ts
+++ b/src/frontend/packages/store/src/actions/internal-events.actions.ts
@@ -1,5 +1,5 @@
 import { Action } from '@ngrx/store';
-import * as moment from 'moment';
+import moment from 'moment';
 
 import {
   CLEAR_ENDPOINT_ERROR_EVENTS,
diff --git a/src/frontend/packages/store/src/actions/log.actions.ts b/src/frontend/packages/store/src/actions/log.actions.ts
deleted file mode 100644
index dd35c9e6d1..0000000000
--- a/src/frontend/packages/store/src/actions/log.actions.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { Action } from '@ngrx/store';
-
-export enum LogLevel {
-  DEBUG,
-  INFO,
-  WARN,
-  ERROR
-}
-
-export const LoggerActionTypes = {
-  DEBUG: '[LOG] Debug',
-  INFO: '[LOG] Info',
-  WARN: '[LOG] Warn',
-  ERROR: '[LOG] Error',
-};
-
-export class LoggerAction implements Action {
-  constructor(
-    public logLevel: LogLevel = LogLevel.INFO,
-    public message: string,
-    public type: string
-  ) {
-  }
-}
-
-export class LoggerDebugAction implements LoggerAction {
-  constructor(
-    public message: string
-  ) {
-  }
-  logLevel = LogLevel.DEBUG;
-  type = LoggerActionTypes.DEBUG;
-}
-
-export class LoggerInfoAction implements LoggerAction {
-  constructor(
-    public message: string
-  ) {
-  }
-  logLevel = LogLevel.INFO;
-  type = LoggerActionTypes.INFO;
-}
-
-export class LoggerWarnAction implements LoggerAction {
-  constructor(
-    public message: string
-  ) {
-  }
-  logLevel = LogLevel.WARN;
-  type = LoggerActionTypes.WARN;
-}
-
-export class LoggerErrorAction implements LoggerAction {
-  constructor(
-    public message: string
-  ) {
-  }
-  logLevel = LogLevel.ERROR;
-  type = LoggerActionTypes.ERROR;
-}
diff --git a/src/frontend/packages/store/src/actions/router.actions.ts b/src/frontend/packages/store/src/actions/router.actions.ts
index e824ec55b5..5a20c3bc2d 100644
--- a/src/frontend/packages/store/src/actions/router.actions.ts
+++ b/src/frontend/packages/store/src/actions/router.actions.ts
@@ -2,7 +2,6 @@ import { NavigationExtras } from '@angular/router';
 import { Action } from '@ngrx/store';
 
 import { RouterRedirect } from '../reducers/routing.reducer';
-import { LoggerAction, LogLevel } from './log.actions';
 
 export const RouterActions = {
   GO: '[Router] Go To',
@@ -16,8 +15,7 @@ export interface IRouterNavPayload {
   query?: RouterQueryParams;
   extras?: NavigationExtras;
 }
-export class RouterNav implements Action, LoggerAction {
-  public logLevel: LogLevel.INFO;
+export class RouterNav implements Action {
   public message: string;
   type = RouterActions.GO;
   constructor(public payload: IRouterNavPayload, public redirect?: RouterRedirect) {
diff --git a/src/frontend/packages/store/src/actions/system.actions.ts b/src/frontend/packages/store/src/actions/system.actions.ts
index 29c9f9410d..93f178d758 100644
--- a/src/frontend/packages/store/src/actions/system.actions.ts
+++ b/src/frontend/packages/store/src/actions/system.actions.ts
@@ -3,22 +3,24 @@ import { Action } from '@ngrx/store';
 import { STRATOS_ENDPOINT_TYPE, stratosEntityFactory, systemInfoEntityType } from '../helpers/stratos-entity-factory';
 import { EntityRequestAction } from '../types/request.types';
 import { SystemInfo } from '../types/system.types';
-import { BaseEndpointAction, GetAllEndpoints } from './endpoint.actions';
+import { GetAllEndpoints, GetEndpoint } from './endpoint.actions';
 
 export const GET_SYSTEM_INFO = '[System] Get info';
 export const GET_SYSTEM_INFO_SUCCESS = '[System] Get info success';
 export const GET_SYSTEM_INFO_FAILED = '[System] Get info failed';
 
+export type GetSystemInfoAssociatedAction = GetEndpoint | GetAllEndpoints;
+
 export class GetSystemInfo implements EntityRequestAction {
   static guid = 'info';
   guid = GetSystemInfo.guid;
-  constructor(public login = false, public associatedAction?: BaseEndpointAction) {
+  constructor(public login = false, public associatedAction?: GetSystemInfoAssociatedAction) {
     if (!this.associatedAction) {
       this.associatedAction = new GetAllEndpoints(login);
     }
   }
   schemaKey = systemInfoEntityType;
-  entity = [stratosEntityFactory(systemInfoEntityType)]
+  entity = [stratosEntityFactory(systemInfoEntityType)];
   entityType = systemInfoEntityType;
   endpointType = STRATOS_ENDPOINT_TYPE;
   type = GET_SYSTEM_INFO;
@@ -26,10 +28,10 @@ export class GetSystemInfo implements EntityRequestAction {
     GET_SYSTEM_INFO,
     GET_SYSTEM_INFO_SUCCESS,
     GET_SYSTEM_INFO_FAILED
-  ]
+  ];
 }
 
 export class GetSystemSuccess implements Action {
-  constructor(public payload: SystemInfo, public login = false, public associatedAction: BaseEndpointAction) { }
+  constructor(public payload: SystemInfo, public login = false, public associatedAction: GetSystemInfoAssociatedAction) { }
   type = GET_SYSTEM_INFO_SUCCESS;
 }
diff --git a/src/frontend/packages/store/src/actions/user-favourites.actions.ts b/src/frontend/packages/store/src/actions/user-favourites.actions.ts
index c4fcfdf744..029a6b3f71 100644
--- a/src/frontend/packages/store/src/actions/user-favourites.actions.ts
+++ b/src/frontend/packages/store/src/actions/user-favourites.actions.ts
@@ -12,7 +12,7 @@ abstract class BaseUserFavoritesAction implements EntityRequestAction {
   public type: string;
   public url = '/user-favorites';
 
-  public entity = [stratosEntityFactory(userFavouritesEntityType)]
+  public entity = [stratosEntityFactory(userFavouritesEntityType)];
   public entityType = userFavouritesEntityType;
   public endpointType = STRATOS_ENDPOINT_TYPE;
 }
@@ -51,7 +51,7 @@ abstract class BaseSuccessFavouriteAction extends BaseSingleUserFavouritesAction
   }
 }
 
-// --------- 
+// ---------
 
 export class GetUserFavoritesAction extends BaseMultipleUserFavouritesAction {
   static PAGINATION_KEY = 'user_favourites';
@@ -85,7 +85,7 @@ export class GetUserFavoritesFailedAction extends BaseMultipleUserFavouritesActi
   }
 }
 
-// --------- 
+// ---------
 
 export class RemoveUserFavoriteAction extends BaseSingleUserFavouritesAction {
   static ACTION_TYPE = '[Favorite] Remove Favorite';
@@ -100,11 +100,11 @@ export class RemoveUserFavoriteAction extends BaseSingleUserFavouritesAction {
 export class RemoveUserFavoriteSuccessAction extends BaseSuccessFavouriteAction {
   static ACTION_TYPE = '[Favorite] Remove Favorite Success';
   constructor(favorite: UserFavorite<IFavoriteMetadata>) {
-    super(RemoveUserFavoriteSuccessAction.ACTION_TYPE, favorite)
+    super(RemoveUserFavoriteSuccessAction.ACTION_TYPE, favorite);
   }
 }
 
-// --------- 
+// ---------
 
 export class SaveUserFavoriteAction extends BaseSingleUserFavouritesAction {
   static ACTION_TYPE = '[Favorite] Save Favorite';
@@ -120,7 +120,7 @@ export class SaveUserFavoriteSuccessAction extends BaseSuccessFavouriteAction {
   }
 }
 
-// --------- 
+// ---------
 
 export class ToggleUserFavoriteAction extends BaseSingleUserFavouritesAction {
   static ACTION_TYPE = '[Favorite] Toggle Favorite';
diff --git a/src/frontend/packages/store/src/apiKey.types.ts b/src/frontend/packages/store/src/apiKey.types.ts
new file mode 100644
index 0000000000..35ac4736b7
--- /dev/null
+++ b/src/frontend/packages/store/src/apiKey.types.ts
@@ -0,0 +1,7 @@
+export interface ApiKey {
+  comment: string;
+  guid: string;
+  last_used: string;
+  secret: string;
+  user_guid: string;
+}
\ No newline at end of file
diff --git a/src/frontend/packages/store/src/app-state.ts b/src/frontend/packages/store/src/app-state.ts
index 6974c9c510..8c31bdf705 100644
--- a/src/frontend/packages/store/src/app-state.ts
+++ b/src/frontend/packages/store/src/app-state.ts
@@ -1,4 +1,3 @@
-import { ActionHistoryState } from './reducers/action-history-reducer';
 import { RequestInfoState } from './reducers/api-request-reducer/types';
 import { AuthState } from './reducers/auth.reducer';
 import { DashboardState } from './reducers/dashboard-reducer';
@@ -26,7 +25,6 @@ export type BaseRequestDataState = Record<string, IRequestEntityTypeState<any>>;
 export abstract class AppState<
   T extends Record<string, any> = any
   > {
-  actionHistory: ActionHistoryState;
   auth: AuthState;
   uaaSetup: UAASetupState;
   endpoints: EndpointState;
diff --git a/src/frontend/packages/store/src/effects/action-history.effects.ts b/src/frontend/packages/store/src/effects/action-history.effects.ts
deleted file mode 100644
index c96a9bbaac..0000000000
--- a/src/frontend/packages/store/src/effects/action-history.effects.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Actions, Effect, ofType } from '@ngrx/effects';
-import { Store } from '@ngrx/store';
-import { map, take } from 'rxjs/operators';
-
-import { ActionHistoryActions, ActionHistoryDump } from '../actions/action-history.actions';
-import { InternalAppState } from '../app-state';
-
-
-@Injectable()
-export class ActionHistoryEffect {
-
-  constructor(
-    private actions$: Actions,
-    private store: Store<InternalAppState>,
-  ) { }
-
-  @Effect({ dispatch: false }) dumpActionHistory$ = this.actions$.pipe(
-    ofType<ActionHistoryDump>(ActionHistoryActions.DUMP),
-    map(() => {
-      this.store.select('actionHistory').pipe(
-        take(1))
-        .subscribe();
-    }));
-}
-
diff --git a/src/frontend/packages/store/src/effects/apiKey.effects.ts b/src/frontend/packages/store/src/effects/apiKey.effects.ts
new file mode 100644
index 0000000000..d4dc3a033b
--- /dev/null
+++ b/src/frontend/packages/store/src/effects/apiKey.effects.ts
@@ -0,0 +1,132 @@
+import { HttpClient, HttpParams } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Actions, Effect, ofType } from '@ngrx/effects';
+import { Store } from '@ngrx/store';
+import { catchError, mergeMap, switchMap } from 'rxjs/operators';
+
+import {
+  AddApiKey,
+  API_KEY_ADD,
+  API_KEY_DELETE,
+  API_KEY_GET_ALL,
+  DeleteApiKey,
+  GetAllApiKeys,
+} from '../actions/apiKey.actions';
+import { ApiKey } from '../apiKey.types';
+import { InternalAppState } from '../app-state';
+import { BrowserStandardEncoder } from '../browser-encoder';
+import { entityCatalog } from '../entity-catalog/entity-catalog';
+import { proxyAPIVersion } from '../jetstream';
+import { NormalizedResponse } from '../types/api.types';
+import { StartRequestAction, WrapperRequestActionFailed, WrapperRequestActionSuccess } from '../types/request.types';
+
+const apiKeyUrlPath = `/pp/${proxyAPIVersion}/api_keys`;
+
+@Injectable()
+export class ApiKeyEffect {
+
+  constructor(
+    private http: HttpClient,
+    private actions$: Actions,
+    private store: Store<InternalAppState>,
+  ) {
+  }
+
+  @Effect() add = this.actions$.pipe(
+    ofType<AddApiKey>(API_KEY_ADD),
+    mergeMap(action => {
+      const actionType = 'create';
+      this.store.dispatch(new StartRequestAction(action, actionType))
+
+      return this.http.post<ApiKey>(apiKeyUrlPath, new HttpParams({
+        encoder: new BrowserStandardEncoder(),
+        fromObject: {
+          comment: action.comment
+        }
+      })).pipe(
+        switchMap(newApiKey => {
+          const guid = action.entity[0].getId(newApiKey);
+          const entityKey = entityCatalog.getEntityKey(action);
+          const response: NormalizedResponse<ApiKey> = {
+            entities: {
+              [entityKey]: {
+                [guid]: newApiKey
+              }
+            },
+            result: [guid]
+          }
+          this.store.dispatch(new WrapperRequestActionSuccess(response, action, actionType));
+          return [];
+        }),
+        catchError(err => {
+          this.store.dispatch(new WrapperRequestActionFailed(this.convertErrorToString(err), action, actionType));
+          return [];
+        })
+      );
+    })
+  );
+
+  @Effect() delete = this.actions$.pipe(
+    ofType<DeleteApiKey>(API_KEY_DELETE),
+    mergeMap(action => {
+      const actionType = 'delete';
+      this.store.dispatch(new StartRequestAction(action, actionType))
+
+      return this.http.delete(apiKeyUrlPath, {
+        params: new HttpParams({
+          encoder: new BrowserStandardEncoder(),
+          fromObject: {
+            guid: action.guid
+          }
+        })
+      }).pipe(
+        switchMap(() => {
+          this.store.dispatch(new WrapperRequestActionSuccess(null, action, actionType));
+          return [];
+        }),
+        catchError(err => {
+          this.store.dispatch(new WrapperRequestActionFailed(this.convertErrorToString(err), action, actionType));
+          return [];
+        })
+      );
+    })
+  );
+
+  @Effect() getAll = this.actions$.pipe(
+    ofType<GetAllApiKeys>(API_KEY_GET_ALL),
+    mergeMap(action => {
+      const actionType = 'fetch';
+      this.store.dispatch(new StartRequestAction(action, actionType))
+      return this.http.get(apiKeyUrlPath).pipe(
+        switchMap((res: ApiKey[]) => {
+          const entityKey = entityCatalog.getEntityKey(action);
+          const response: NormalizedResponse<ApiKey> = {
+            entities: {
+              [entityKey]: {
+              }
+            },
+            result: []
+          }
+
+          res.forEach(apiKey => {
+            const guid = action.entity[0].getId(apiKey);
+            response.entities[entityKey][guid] = apiKey;
+            response.result.push(guid);
+          });
+
+          this.store.dispatch(new WrapperRequestActionSuccess(response, action, actionType));
+          return [];
+        }),
+        catchError(err => {
+          this.store.dispatch(new WrapperRequestActionFailed(this.convertErrorToString(err), action, actionType));
+          return [];
+        })
+      );
+    })
+  );
+
+  private convertErrorToString(err: any): string {
+    // We should look into beefing this up / combining with generic error handling
+    return err && err.error ? err.error : 'Failed API Key action';
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/store/src/effects/endpoint.effects.ts b/src/frontend/packages/store/src/effects/endpoint.effects.ts
index 6925c05e5c..36d73ee967 100644
--- a/src/frontend/packages/store/src/effects/endpoint.effects.ts
+++ b/src/frontend/packages/store/src/effects/endpoint.effects.ts
@@ -89,11 +89,13 @@ export class EndpointsEffect {
         });
       });
 
+      const isLogin = associatedAction.type === GET_ENDPOINTS ? (associatedAction as GetAllEndpoints).login : false;
+
       // Order is important. Need to ensure data is written (none cf action success) before we notify everything is loaded
       // (endpoint success)
       return [
         new WrapperRequestActionSuccess(mappedData, associatedAction, 'fetch'),
-        new GetAllEndpointsSuccess(mappedData, associatedAction['login']),
+        new GetAllEndpointsSuccess(mappedData, isLogin),
       ];
     }));
 
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 88cc83b37a..4be9e84ff6 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
@@ -12,7 +12,7 @@ import { EntityCatalogHelpers } from '../entity-catalog.helper';
 
 describe('ActionDispatcher', () => {
   it('should not dispatch unknown action', () => {
-    const actionBuilders = ActionBuilderConfigMapper.getActionBuilders({}, null, null, null)
+    const actionBuilders = ActionBuilderConfigMapper.getActionBuilders({}, null, null, null);
     const actionOrchestrator = new ActionOrchestrator('Empty', actionBuilders);
 
     const store = {
@@ -30,7 +30,7 @@ describe('ActionDispatcher', () => {
     const entityActionDispatcher = EntityCatalogEntityStoreHelpers.getActionDispatchers(
       store,
       actionBuilders
-    )
+    );
     expect(entityActionDispatcher.get).toBeUndefined();
   });
 
@@ -38,14 +38,20 @@ describe('ActionDispatcher', () => {
   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 testEndpointGuid = 'endpoint Guid';
+    const testGuid = 'guid';
+    const testPaginationKey = 'asd';
+
+    const getAction = { type: 'get action', entityType, endpointType, guid: testGuid, endpointGuid: testEndpointGuid };
+    const getMultipleAction = {
+      type: 'getMultiple action',
+      entityType,
+      endpointType,
+      endpointGuid: testEndpointGuid,
+      paginationKey: testPaginationKey
+    };
+    const customGetAction = { type: 'custom Action', entityType, endpointType, guid: testGuid };
+    const customGetMultipleAction = { type: 'custom MultipleAction', entityType, endpointType, paginationKey: testPaginationKey };
 
     const builders: OrchestratedActionBuilders = {
       get: (guid: string, endpointGuid: string, extraArgs?: any) => ({
@@ -66,8 +72,8 @@ describe('ActionDispatcher', () => {
         ...customGetMultipleAction,
         paginationKey
       }),
-    }
-    const actionBuilders = ActionBuilderConfigMapper.getActionBuilders(builders, null, null, null)
+    };
+    const actionBuilders = ActionBuilderConfigMapper.getActionBuilders(builders, null, null, null);
     const actionOrchestrator = new ActionOrchestrator(entityType, actionBuilders);
 
     const entityStore = {
@@ -85,12 +91,12 @@ describe('ActionDispatcher', () => {
     const entityActionDispatcher = EntityCatalogEntityStoreHelpers.getActionDispatchers(
       entityStore,
       actionBuilders
-    )
+    );
 
     const store = {
-      dispatch: (action: Action) => { console.log(action) },
+      dispatch: (action: Action) => { console.log(action); },
       select: (...args: any[]) => of(null)
-    } as Store<AppState<any>>
+    } as Store<AppState<any>>;
 
     EntityCatalogHelpers.SetEntityCatalogHelper({
       store,
@@ -102,27 +108,27 @@ describe('ActionDispatcher', () => {
           currentPageState$: {}
         })
       } as unknown as PaginationMonitorFactory
-    } as EntityCatalogHelper)
+    } as EntityCatalogHelper);
     const storeDispatchSpy = spyOn(store, 'dispatch');
 
     expect(entityActionDispatcher.get).toBeDefined();
-    expect(entityActionDispatcher.get(guid, endpointGuid)).toBeDefined();
-    expect(storeDispatchSpy).toHaveBeenCalledWith(getAction)
+    expect(entityActionDispatcher.get(testGuid, testEndpointGuid)).toBeDefined();
+    expect(storeDispatchSpy).toHaveBeenCalledWith(getAction);
     storeDispatchSpy.calls.reset();
 
     expect(entityActionDispatcher.custom).toBeDefined();
-    expect(entityActionDispatcher.custom(guid)).toBeDefined();
-    expect(storeDispatchSpy).toHaveBeenCalledWith(customGetAction)
+    expect(entityActionDispatcher.custom(testGuid)).toBeDefined();
+    expect(storeDispatchSpy).toHaveBeenCalledWith(customGetAction);
     storeDispatchSpy.calls.reset();
 
     expect(entityActionDispatcher.getMultiple).toBeDefined();
-    expect(entityActionDispatcher.getMultiple(endpointGuid, paginationKey)).toBeDefined();
-    expect(storeDispatchSpy).toHaveBeenCalledWith(getMultipleAction)
+    expect(entityActionDispatcher.getMultiple(testEndpointGuid, testPaginationKey)).toBeDefined();
+    expect(storeDispatchSpy).toHaveBeenCalledWith(getMultipleAction);
     storeDispatchSpy.calls.reset();
 
     expect(entityActionDispatcher.customMultipleAction).toBeDefined();
-    expect(entityActionDispatcher.customMultipleAction(paginationKey)).toBeDefined();
-    expect(storeDispatchSpy).toHaveBeenCalledWith(customGetMultipleAction)
+    expect(entityActionDispatcher.customMultipleAction(testPaginationKey)).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 61bbc7883e..cbe9b83830 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
@@ -12,6 +12,7 @@ import {
   PaginationPageIteratorConfig,
 } from '../../entity-request-pipeline/pagination-request-base-handlers/pagination-iterator.pipe';
 import { EntityPipelineEntity, stratosEndpointGuidKey } from '../../entity-request-pipeline/pipeline.types';
+import { EndpointAuthTypeConfig } from '../../extension-types';
 import { EntitySchema } from '../../helpers/entity-schema';
 import { endpointEntityType, STRATOS_ENDPOINT_TYPE, stratosEntityFactory } from '../../helpers/stratos-entity-factory';
 import { EndpointModel } from '../../types/endpoint.types';
@@ -352,5 +353,20 @@ export class StratosCatalogEndpointEntity extends StratosBaseCatalogEntity<IEndp
       }
     });
   }
+
+  public setListComponent(component: any) {
+    // Can only be set once
+    if (!this.definition.listDetailsComponent) {
+      (this.definition as any).listDetailsComponent = component;
+    }
+  }
+
+  public setAuthTypes(authTypes: EndpointAuthTypeConfig[]) {
+    // Can only be set once
+    if (!this.definition.authTypes || this.definition.authTypes.length === 0) {
+      (this.definition as any).authTypes = authTypes;
+    }
+  }
+
 }
 
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 ac6e5e3ae3..ba490b0d57 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
@@ -18,11 +18,12 @@ export interface CoreEntityCatalogEntityStore<Y, ABC extends OrchestratedActionB
     entityId: string,
     params?: {
       schemaKey?: string,
-      startWithNull?: boolean
+      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
+   * 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']>
@@ -34,7 +35,8 @@ export interface CoreEntityCatalogEntityStore<Y, ABC extends OrchestratedActionB
     ...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
+   * 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']>
@@ -53,16 +55,25 @@ type PaginatedActionBuildersWithNevers<ABC extends OrchestratedActionBuilders> =
 /**
  * Filter out builders that don't return pagination actions from ABC
  */
-type PaginatedActionBuilders<ABC extends OrchestratedActionBuilders> = Omit<PaginatedActionBuildersWithNevers<ABC>, NeverKeys<PaginatedActionBuildersWithNevers<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>;
+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>>>
+type NonPaginatedActionBuilders<ABC extends OrchestratedActionBuilders> = Omit<
+  NonPaginatedActionBuildersWithNevers<ABC>,
+  NeverKeys<NonPaginatedActionBuildersWithNevers<ABC>>
+>;
 
 
 /**
@@ -90,13 +101,13 @@ type EntityCatalogEntityStoreSingles<Y, ABC extends OrchestratedActionBuilders,
     ) => EntityMonitor<Y>;
     getEntityService: (
       ...args: Parameters<SABC[K]>
-    ) => EntityService<Y>
+    ) => EntityService<Y>;
   }
 };
 
 export type CustomEntityCatalogEntityStore<Y, ABC extends OrchestratedActionBuilders> =
   EntityCatalogEntityStoreCollections<Y, ABC, PaginatedActionBuilders<ABC>> &
-  EntityCatalogEntityStoreSingles<Y, ABC, NonPaginatedActionBuilders<ABC>>
+  EntityCatalogEntityStoreSingles<Y, ABC, NonPaginatedActionBuilders<ABC>>;
 
 
 /**
@@ -107,7 +118,7 @@ export type CustomEntityCatalogEntityStore<Y, ABC extends OrchestratedActionBuil
  */
 export type EntityCatalogEntityStore<Y, ABC extends OrchestratedActionBuilders> =
   CoreEntityCatalogEntityStore<Y, ABC> &
-  CustomEntityCatalogEntityStore<Y, ABC>
+  CustomEntityCatalogEntityStore<Y, ABC>;
 
 
 
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 c4fc7b45f8..f52c07063c 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
@@ -2,6 +2,8 @@ import { EntityCatalogHelper } from './entity-catalog-entity/entity-catalog.serv
 
 export abstract class EntityCatalogHelpers {
   static readonly endpointType = 'endpoint';
+  private static Instance: EntityCatalogHelper;
+
   static buildEntityKey(entityType: string, endpointType: string): string {
     if (!entityType) {
       return endpointType;
@@ -9,11 +11,10 @@ export abstract class EntityCatalogHelpers {
     if (!endpointType) {
       return entityType;
     }
-    // Camelcased to make it work better with the store.
+    // Camel cased to make it work better with the store.
     return `${endpointType}${entityType.charAt(0).toUpperCase() + entityType.slice(1)}`;
   }
 
-  private static Instance: EntityCatalogHelper;
   static SetEntityCatalogHelper(ecf: EntityCatalogHelper) {
     this.Instance = ecf;
   }
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog.spec.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog.spec.ts
index 7b2a0f4c5a..449bc49cc7 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog.spec.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog.spec.ts
@@ -1,13 +1,10 @@
-import {
-  EndpointListDetailsComponent,
-} from '../../../core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers';
 import { EntitySchema } from '../helpers/entity-schema';
 import { endpointEntityType, stratosEntityFactory } from '../helpers/stratos-entity-factory';
 import { TestEntityCatalog } from './entity-catalog';
 import { StratosCatalogEndpointEntity, StratosCatalogEntity } from './entity-catalog-entity/entity-catalog-entity';
 import { EntityCatalogSchemas, IStratosEndpointDefinition } from './entity-catalog.types';
 
-fdescribe('EntityCatalogService', () => {
+describe('EntityCatalogService', () => {
   let entityCatalog: TestEntityCatalog;
   function getEndpointDefinition() {
     return {
@@ -18,7 +15,7 @@ fdescribe('EntityCatalogService', () => {
       iconFont: 'stratos-icons',
       logoUrl: '/core/assets/endpoint-icons/cloudfoundry.png',
       authTypes: [],
-      listDetailsComponent: EndpointListDetailsComponent,
+      listDetailsComponent: 'Test Component',
     } as IStratosEndpointDefinition;
   }
   function getDefaultSchema() {
@@ -136,7 +133,7 @@ fdescribe('EntityCatalogService', () => {
       ...subtypeDefinition,
       icon: 'cloud_foundry',
       iconFont: 'stratos-icons',
-      listDetailsComponent: EndpointListDetailsComponent,
+      listDetailsComponent: 'Test Component',
       schema: {
         default: stratosEntityFactory(endpointEntityType)
       },
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog.ts
index 224f05b471..3144ee57b4 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog.ts
@@ -131,7 +131,6 @@ class EntityCatalog {
       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) {
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 509b5f661d..c2bb4371e1 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
@@ -10,7 +10,6 @@ import {
   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';
 import { PaginatedAction, PaginationEntityState } from '../types/pagination.types';
 import {
@@ -69,7 +68,6 @@ function getRequestObservable(
 }
 export interface PaginatedRequestPipelineConfig<T extends AppState = InternalAppState> extends BasePipelineConfig<T> {
   action: PaginatedAction;
-  pageFlattenerConfig: PaginationFlattenerConfig;
 }
 export const basePaginatedRequestPipeline: EntityRequestPipeline = (
   store: Store<AppState>,
diff --git a/src/frontend/packages/store/src/entity-service.ts b/src/frontend/packages/store/src/entity-service.ts
index 38f2f1c911..d64705220a 100644
--- a/src/frontend/packages/store/src/entity-service.ts
+++ b/src/frontend/packages/store/src/entity-service.ts
@@ -35,10 +35,10 @@ const dispatcherFactory = <T>(
     const updatedAction = {
       ...action,
       updatingKey
-    }
+    };
 
     // Do we have a fetch handler defined by the endpoint/entity?
-    const entityFetchHandler: EntityFetchHandler<T> = catalogEntity.getEntityFetchHandler()
+    const entityFetchHandler: EntityFetchHandler<T> = catalogEntity.getEntityFetchHandler();
     const fetchHandler = entityFetchHandler ?
       entityFetchHandler(store, updatedAction) :
       (entity: T) => store.dispatch(updatedAction);
@@ -46,8 +46,8 @@ const dispatcherFactory = <T>(
     // 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)
+      store.select(selectEntity<T>(catalogEntity.entityKey, action.guid)).pipe(first()).subscribe(storeEntity => fetchHandler(storeEntity));
+      fetchHandler(entity);
     } : fetchHandler;
   };
 
@@ -135,7 +135,7 @@ export class EntityService<T = any> {
       first(),
       switchMap(() => cleanEntityInfo$)
     );
-  }
+  };
 
   private getCleanEntityInfoObs(entityMonitor: EntityMonitor<T>) {
     return combineLatest(
diff --git a/src/frontend/packages/store/src/helpers/paginated-request-helpers.ts b/src/frontend/packages/store/src/helpers/paginated-request-helpers.ts
index 2a55648abc..b769333738 100644
--- a/src/frontend/packages/store/src/helpers/paginated-request-helpers.ts
+++ b/src/frontend/packages/store/src/helpers/paginated-request-helpers.ts
@@ -1,6 +1,6 @@
-import { HttpClient, HttpRequest } from '@angular/common/http';
-import { forkJoin, Observable, of as observableOf } from 'rxjs';
-import { first, map, mergeMap } from 'rxjs/operators';
+import { HttpClient, HttpRequest, HttpResponse } from '@angular/common/http';
+import { forkJoin, Observable, of as observableOf, of } from 'rxjs';
+import { first, map, mergeMap, switchMap } from 'rxjs/operators';
 
 import { UpdatePaginationMaxedState } from '../actions/pagination.actions';
 import { ActionDispatcher } from '../entity-request-pipeline/entity-request-pipeline.types';
@@ -9,15 +9,10 @@ import { ActionDispatcher } from '../entity-request-pipeline/entity-request-pipe
 // TODO: See #4208. This should be replaced with
 // src/frontend/packages/store/src/entity-request-pipeline/pagination-request-base-handlers/pagination-iterator.pipe.ts
 
-export interface PaginationFlattenerConfig<T = any, C = any> extends Pick<
-  PaginationFlattener<T, C>,
-  'getTotalPages' | 'getTotalResults' | 'mergePages' | 'clearResults'
-  > { }
-
 export interface PaginationFlattener<T = any, C = any> {
   getTotalPages: (res: C) => number;
   getTotalResults: (res: C) => number;
-  mergePages: (res: T[]) => T;
+  mergePages: (res: C[]) => T;
   fetch: (...args) => Observable<C>;
   buildFetchParams: (i: number) => any[];
   clearResults: (res: C, allResults: number) => Observable<C>;
@@ -66,6 +61,39 @@ export class BaseHttpFetcher {
   }
 }
 
+/**
+ * T is what we get back per request, C is what we return in the observable
+ */
+export interface IteratePaginationConfig<T, C> {
+  getFirst: (url: string) => Observable<HttpResponse<T>>;
+  getNext: (response: HttpResponse<T>) => Observable<HttpResponse<T>>;
+  getResult: (response: HttpResponse<T>) => C[];
+}
+/**
+ * T is what we get back per request, C is what we return in the observable
+ */
+export function iteratePagination<T, C>(
+  results: C[] = [],
+  request: Observable<HttpResponse<T>>,
+  iterator: IteratePaginationConfig<T, C>
+): Observable<C[]> {
+  return request.pipe(
+    first(),
+    switchMap(response => {
+      const nextRequest = iterator.getNext(response);
+      results.push(...iterator.getResult(response));
+      if (!nextRequest) {
+        return of(results);
+      }
+      return iteratePagination<T, C>(
+        results,
+        nextRequest,
+        iterator
+      );
+    }),
+  );
+}
+
 export function flattenPagination<T, C>(
   actionDispatcher: ActionDispatcher,
   firstRequest: Observable<C>,
@@ -90,7 +118,6 @@ export function flattenPagination<T, C>(
           return forkJoin([flattener.clearResults(firstResData, allResults)]);
         }
       }
-      // Discover the endpoint with the most pages. This is the amount of request we will need to make to fetch all pages from all
       // Make those requests
       const maxRequests = flattener.getTotalPages(firstResData);
       const requests = [];
@@ -102,7 +129,7 @@ export function flattenPagination<T, C>(
       }
       return forkJoin(requests);
     }),
-    map((responses: T[]) => {
+    map((responses: C[]) => {
       // Merge all responses into the first page
       return flattener.mergePages(responses);
     }),
diff --git a/src/frontend/packages/store/src/helpers/stratos-entity-factory.ts b/src/frontend/packages/store/src/helpers/stratos-entity-factory.ts
index 1182c576a3..2c570b69e5 100644
--- a/src/frontend/packages/store/src/helpers/stratos-entity-factory.ts
+++ b/src/frontend/packages/store/src/helpers/stratos-entity-factory.ts
@@ -4,6 +4,7 @@ export const userFavouritesEntityType = 'userFavorites';
 export const endpointEntityType = 'endpoint';
 export const userProfileEntityType = 'userProfile';
 export const systemInfoEntityType = 'systemInfo';
+export const apiKeyEntityType = 'apiKey';
 
 export const metricEntityType = 'metrics';
 
@@ -31,6 +32,9 @@ entityCache[endpointEntityType] = EndpointSchema;
 const UserProfileInfoSchema = new StratosEntitySchema(userProfileEntityType, 'id');
 entityCache[userProfileEntityType] = UserProfileInfoSchema;
 
+const ApiKeySchema = new StratosEntitySchema(apiKeyEntityType, 'guid');
+entityCache[apiKeyEntityType] = ApiKeySchema;
+
 export function stratosEntityFactory(key: string): EntitySchema {
   const entity = entityCache[key];
   if (!entity) {
diff --git a/src/frontend/packages/store/src/monitors/internal-event-monitor.factory.spec.ts b/src/frontend/packages/store/src/monitors/internal-event-monitor.factory.spec.ts
index c29e7856a2..1911b1549f 100644
--- a/src/frontend/packages/store/src/monitors/internal-event-monitor.factory.spec.ts
+++ b/src/frontend/packages/store/src/monitors/internal-event-monitor.factory.spec.ts
@@ -1,15 +1,14 @@
-import { TestBed, inject } from '@angular/core/testing';
-import { InternalEventMonitorFactory } from './internal-event-monitor.factory';
-import { SharedModule } from '../../../core/src/shared/shared.module';
+import { inject, TestBed } from '@angular/core/testing';
 import { StoreModule } from '@ngrx/store';
 
+import { InternalEventMonitorFactory } from './internal-event-monitor.factory';
+
 
 describe('InternalEventMonitorFactory', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       providers: [InternalEventMonitorFactory],
       imports: [
-        SharedModule,
         StoreModule.forRoot({})
       ]
     });
diff --git a/src/frontend/packages/store/src/monitors/internal-event.monitor.ts b/src/frontend/packages/store/src/monitors/internal-event.monitor.ts
index 9beb4d4164..ba51dd2911 100644
--- a/src/frontend/packages/store/src/monitors/internal-event.monitor.ts
+++ b/src/frontend/packages/store/src/monitors/internal-event.monitor.ts
@@ -1,13 +1,13 @@
 import { NgZone } from '@angular/core';
-import * as moment from 'moment';
+import moment from 'moment';
 import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import { distinctUntilChanged, map, share, startWith } from 'rxjs/operators';
 
 import {
   InternalEventSeverity,
   InternalEventsState,
-  InternalEventSubjectState,
   InternalEventState,
+  InternalEventSubjectState,
 } from '../types/internal-events.types';
 
 export function newNonAngularInterval(ngZone: NgZone, intervalTime: number) {
diff --git a/src/frontend/packages/store/src/public-api.ts b/src/frontend/packages/store/src/public-api.ts
index 1b1787baef..ea38cf610c 100644
--- a/src/frontend/packages/store/src/public-api.ts
+++ b/src/frontend/packages/store/src/public-api.ts
@@ -2,8 +2,25 @@
  * Public API Surface of store
  */
 
- // Helpers
- export * from './helpers/store-helpers';
+// Helpers
+export * from './helpers/store-helpers';
 
- // App State
- export { AppState } from './app-state';
\ No newline at end of file
+// App State
+export { AppState } from './app-state';
+
+// Used by store testing module
+export { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from './entity-catalog.module';
+export { entityCatalog, TestEntityCatalog } from './entity-catalog/entity-catalog';
+export { EntityCatalogEntityConfig } from './entity-catalog/entity-catalog.types';
+export { endpointEntityType, stratosEntityFactory } from './helpers/stratos-entity-factory';
+export { appReducers } from './reducers.module';
+export { getDefaultRequestState, rootUpdatingKey } from './reducers/api-request-reducer/types';
+export { getDefaultPaginationEntityState } from './reducers/pagination-reducer/pagination-reducer-reset-pagination';
+export { NormalizedResponse } from './types/api.types';
+export { SessionData, SessionDataEndpoint } from './types/auth.types';
+export { getDefaultRolesRequestState } from './types/current-user-roles.types';
+export { EndpointModel } from './types/endpoint.types';
+export { BaseEntityValues } from './types/entity.types';
+export { WrapperRequestActionSuccess } from './types/request.types';
+
+export { flattenPagination, PaginationFlattener } from './helpers/paginated-request-helpers';
diff --git a/src/frontend/packages/store/src/reducers.module.ts b/src/frontend/packages/store/src/reducers.module.ts
index d5268b68bf..af7b4c3104 100644
--- a/src/frontend/packages/store/src/reducers.module.ts
+++ b/src/frontend/packages/store/src/reducers.module.ts
@@ -3,7 +3,6 @@ import { ActionReducer, ActionReducerMap, StoreModule } from '@ngrx/store';
 import { localStorageSync } from 'ngrx-store-localstorage';
 
 import { getDashboardStateSessionId } from './helpers/store-helpers';
-import { actionHistoryReducer } from './reducers/action-history-reducer';
 import { requestReducer } from './reducers/api-request-reducers.generator';
 import { authReducer } from './reducers/auth.reducer';
 import { currentUserRolesReducer } from './reducers/current-user-roles-reducer/current-user-roles.reducer';
@@ -36,7 +35,6 @@ export const appReducers = {
   // This is added as part of the entity catalog module.
   // requestData,
   dashboard: dashboardReducer,
-  actionHistory: actionHistoryReducer,
   lists: listReducer,
   routing: routingReducer,
   internalEvents: internalEventReducer,
diff --git a/src/frontend/packages/store/src/reducers/action-history-reducer.ts b/src/frontend/packages/store/src/reducers/action-history-reducer.ts
deleted file mode 100644
index 3c42af31c5..0000000000
--- a/src/frontend/packages/store/src/reducers/action-history-reducer.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Action } from '@ngrx/store';
-
-export class ActionHistoryState extends Array<string> { }
-
-const maxAge = 100;
-const defaultState: ActionHistoryState = [];
-
-export function actionHistoryReducer(state: ActionHistoryState = defaultState, action: Action) {
-  // Un-comment this at some point
-  // const newState = [...state];
-  // let historyItem = action.type;
-  // const message = (action as LoggerAction).message;
-  // if (message) {
-  //   historyItem += ` '${message}'`;
-  // }
-  // newState.push(historyItem);
-
-  // if (newState.length > maxAge) {
-  //   newState.shift();
-  // }
-  // return newState;
-  return state;
-}
diff --git a/src/frontend/packages/store/src/reducers/api-request-reducer/fail-request.ts b/src/frontend/packages/store/src/reducers/api-request-reducer/fail-request.ts
index 1a3826a515..c32e437e5e 100644
--- a/src/frontend/packages/store/src/reducers/api-request-reducer/fail-request.ts
+++ b/src/frontend/packages/store/src/reducers/api-request-reducer/fail-request.ts
@@ -1,7 +1,6 @@
-import { isNullOrUndefined } from 'util';
-
 import { BaseEntityRequestAction } from '../../entity-catalog/action-orchestrator/action-orchestrator';
 import { IFailedRequestAction } from '../../types/request.types';
+import { isNullOrUndefined } from '../../utils';
 import { getEntityRequestState, mergeUpdatingState, setEntityRequestState } from './request-helpers';
 
 export function failRequest(state, action: IFailedRequestAction) {
diff --git a/src/frontend/packages/store/src/reducers/api-request-reducer/start-request.ts b/src/frontend/packages/store/src/reducers/api-request-reducer/start-request.ts
index e6534502a7..7a2446129e 100644
--- a/src/frontend/packages/store/src/reducers/api-request-reducer/start-request.ts
+++ b/src/frontend/packages/store/src/reducers/api-request-reducer/start-request.ts
@@ -1,7 +1,6 @@
-import { isNullOrUndefined } from 'util';
-
 import { BaseEntityRequestAction } from '../../entity-catalog/action-orchestrator/action-orchestrator';
 import { IStartRequestAction } from '../../types/request.types';
+import { isNullOrUndefined } from '../../utils';
 import {
   getEntityRequestState,
   mergeUpdatingState,
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 71b79e9aaa..ee4089a1e1 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,9 +1,8 @@
-import { isNullOrUndefined } from 'util';
-
 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 { isNullOrUndefined } from '../../utils';
 import {
   createRequestStateFromResponse,
   getEntityRequestState,
diff --git a/src/frontend/packages/store/src/reducers/api-request-reducer/update-request.ts b/src/frontend/packages/store/src/reducers/api-request-reducer/update-request.ts
index 4d9cbc8ebe..c7e2bfd1a9 100644
--- a/src/frontend/packages/store/src/reducers/api-request-reducer/update-request.ts
+++ b/src/frontend/packages/store/src/reducers/api-request-reducer/update-request.ts
@@ -1,8 +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 { IUpdateRequestAction } from '../../types/request.types';
+import { isNullOrUndefined } from '../../utils';
 import { getEntityRequestState, mergeUpdatingState, setEntityRequestState } from './request-helpers';
 
 export function updateRequest(state: BaseRequestState, action: IUpdateRequestAction) {
diff --git a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-roles.reducer.ts b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-roles.reducer.ts
index ad4ffc58b4..3f958b4758 100644
--- a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-roles.reducer.ts
+++ b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-roles.reducer.ts
@@ -46,7 +46,7 @@ function coreCurrentUserRolesReducer(state: ICurrentUserRolesState, action: Acti
         state: currentUserRolesRequestStateReducer(state.state, RolesRequestStateStage.FAILURE)
       };
     case SESSION_VERIFIED:
-      const svAction = action as VerifiedSession
+      const svAction = action as VerifiedSession;
       return applyInternalScopes(state, svAction.sessionData.user);
   }
   return state;
@@ -59,7 +59,10 @@ export enum RolesRequestStateStage {
   OTHER
 }
 
-export function currentUserRolesRequestStateReducer(state: RolesRequestState = getDefaultRolesRequestState(), stage: RolesRequestStateStage) {
+export function currentUserRolesRequestStateReducer(
+  state: RolesRequestState = getDefaultRolesRequestState(),
+  stage: RolesRequestStateStage
+) {
   switch (stage) {
     case RolesRequestStateStage.START:
       return {
diff --git a/src/frontend/packages/store/src/store.module.ts b/src/frontend/packages/store/src/store.module.ts
index 794355dc3a..903f620b94 100644
--- a/src/frontend/packages/store/src/store.module.ts
+++ b/src/frontend/packages/store/src/store.module.ts
@@ -2,8 +2,8 @@ import { HttpClientModule } from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { EffectsModule } from '@ngrx/effects';
 
-import { ActionHistoryEffect } from './effects/action-history.effects';
 import { APIEffect } from './effects/api.effects';
+import { ApiKeyEffect } from './effects/apiKey.effects';
 import { AuthEffect } from './effects/auth.effects';
 import { DashboardEffect } from './effects/dashboard.effects';
 import { EndpointApiError } from './effects/endpoint-api-errors.effects';
@@ -37,7 +37,6 @@ import { AppReducersModule } from './reducers.module';
       UAASetupEffect,
       EndpointsEffect,
       PaginationEffects,
-      ActionHistoryEffect,
       RouterEffect,
       SystemEffects,
       SetClientFilterEffect,
@@ -45,7 +44,8 @@ import { AppReducersModule } from './reducers.module';
       UserProfileEffect,
       RecursiveDeleteEffect,
       UserFavoritesEffect,
-      PermissionsEffects
+      PermissionsEffects,
+      ApiKeyEffect
     ])
   ]
 })
diff --git a/src/frontend/packages/store/src/stratos-action-builders.ts b/src/frontend/packages/store/src/stratos-action-builders.ts
index c64a95cd01..d14da73621 100644
--- a/src/frontend/packages/store/src/stratos-action-builders.ts
+++ b/src/frontend/packages/store/src/stratos-action-builders.ts
@@ -1,6 +1,6 @@
+import { AddApiKey, DeleteApiKey, GetAllApiKeys } from './actions/apiKey.actions';
 import {
   AuthParams,
-  BaseEndpointAction,
   ConnectEndpoint,
   DisconnectEndpoint,
   GetAllEndpoints,
@@ -9,7 +9,7 @@ import {
   UnregisterEndpoint,
   UpdateEndpoint,
 } from './actions/endpoint.actions';
-import { GetSystemInfo } from './actions/system.actions';
+import { GetSystemInfo, GetSystemInfoAssociatedAction } from './actions/system.actions';
 import {
   GetUserFavoritesAction,
   RemoveUserFavoriteAction,
@@ -33,7 +33,7 @@ export interface EndpointActionBuilder extends OrchestratedActionBuilders {
   getMultiple: (
     endpointGuid?: string,
     paginationKey?: string,
-    args?: { login: boolean }
+    args?: { login: boolean, }
   ) => GetAllEndpoints,
   connect: (
     guid: string,
@@ -83,7 +83,7 @@ export const endpointActionBuilder: EndpointActionBuilder = {
   getMultiple: (
     endpointGuid?: string,
     paginationKey?: string,
-    args?: { login: boolean }
+    args?: { login: boolean, }
   ) => new GetAllEndpoints(args ? args.login : false),
   connect: (
     guid: string,
@@ -137,20 +137,20 @@ export const endpointActionBuilder: EndpointActionBuilder = {
     args.clientSecret,
     args.allowSSO
   ),
-}
+};
 
 export interface SystemInfoActionBuilder extends OrchestratedActionBuilders {
   getSystemInfo: (
     login?: boolean,
-    associatedAction?: BaseEndpointAction
-  ) => GetSystemInfo
+    associatedAction?: GetSystemInfoAssociatedAction
+  ) => GetSystemInfo;
 }
 export const systemInfoActionBuilder: SystemInfoActionBuilder = {
   getSystemInfo: (
     login?: false,
-    associatedAction?: BaseEndpointAction
+    associatedAction?: GetSystemInfoAssociatedAction
   ) => new GetSystemInfo(login, associatedAction)
-}
+};
 
 export interface UserFavoriteActionBuilder extends OrchestratedActionBuilders {
   getMultiple: () => GetUserFavoritesAction,
@@ -163,10 +163,10 @@ export interface UserFavoriteActionBuilder extends OrchestratedActionBuilders {
   ) => SaveUserFavoriteAction,
   toggle: (
     favorite: UserFavorite<IFavoriteMetadata>
-  ) => ToggleUserFavoriteAction
+  ) => ToggleUserFavoriteAction;
   updateFavorite: (
     favorite: UserFavorite<IFavoriteMetadata>
-  ) => UpdateUserFavoriteMetadataAction
+  ) => UpdateUserFavoriteMetadataAction;
 }
 
 export const userFavoriteActionBuilder: UserFavoriteActionBuilder = {
@@ -176,23 +176,40 @@ export const userFavoriteActionBuilder: UserFavoriteActionBuilder = {
   save: (favorite: UserFavorite<IFavoriteMetadata>) => new SaveUserFavoriteAction(favorite),
   toggle: (favorite: UserFavorite<IFavoriteMetadata>) => new ToggleUserFavoriteAction(favorite),
   updateFavorite: (favorite: UserFavorite<IFavoriteMetadata>) => new UpdateUserFavoriteMetadataAction(favorite)
-}
+};
 
 export interface UserProfileActionBuilder extends OrchestratedActionBuilders {
   get: (
     userGuid: string
-  ) => FetchUserProfileAction
+  ) => FetchUserProfileAction;
   updateProfile: (
     profile: UserProfileInfo,
     password: string
-  ) => UpdateUserProfileAction
+  ) => UpdateUserProfileAction;
   updatePassword: (
     guid: string,
     passwordChanges: UserProfilePasswordUpdate
-  ) => UpdateUserPasswordAction
+  ) => UpdateUserPasswordAction;
 }
 export const userProfileActionBuilder: UserProfileActionBuilder = {
   get: (userGuid: string) => new FetchUserProfileAction(userGuid),
   updateProfile: (profile: UserProfileInfo, password: string) => new UpdateUserProfileAction(profile, password),
   updatePassword: (guid: string, passwordChanges: UserProfilePasswordUpdate) => new UpdateUserPasswordAction(guid, passwordChanges)
-}
\ No newline at end of file
+};
+
+export interface ApiKeyActionBuilder extends OrchestratedActionBuilders {
+  create: (
+    comment: string
+  ) => AddApiKey;
+  delete: (
+    guid: string
+  ) => DeleteApiKey;
+  getMultiple: (
+
+  ) => GetAllApiKeys;
+}
+export const apiKeyActionBuilder: ApiKeyActionBuilder = {
+  create: (comment: string) => new AddApiKey(comment),
+  delete: (guid: string) => new DeleteApiKey(guid),
+  getMultiple: () => new GetAllApiKeys()
+};
\ No newline at end of file
diff --git a/src/frontend/packages/store/src/stratos-entity-catalog.ts b/src/frontend/packages/store/src/stratos-entity-catalog.ts
index 9237a16978..5a58cc14aa 100644
--- a/src/frontend/packages/store/src/stratos-entity-catalog.ts
+++ b/src/frontend/packages/store/src/stratos-entity-catalog.ts
@@ -1,8 +1,10 @@
+import { ApiKey } from './apiKey.types';
 import {
   StratosCatalogEndpointEntity,
   StratosCatalogEntity,
 } from './entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import {
+  ApiKeyActionBuilder,
   EndpointActionBuilder,
   SystemInfoActionBuilder,
   UserFavoriteActionBuilder,
@@ -39,6 +41,12 @@ export class StratosEntityCatalog {
   >
 
   metricsEndpoint: StratosCatalogEndpointEntity;
+
+  apiKey: StratosCatalogEntity<
+    undefined,
+    ApiKey,
+    ApiKeyActionBuilder
+  >
 }
 
 export const stratosEntityCatalog = new StratosEntityCatalog();
diff --git a/src/frontend/packages/store/src/stratos-entity-generator.ts b/src/frontend/packages/store/src/stratos-entity-generator.ts
index 0062f4fc4a..c1ae7ffae0 100644
--- a/src/frontend/packages/store/src/stratos-entity-generator.ts
+++ b/src/frontend/packages/store/src/stratos-entity-generator.ts
@@ -1,28 +1,23 @@
-import { BaseEndpointAuth } from '../../core/src/core/endpoint-auth';
-import {
-  MetricsEndpointDetailsComponent,
-} from '../../core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component';
+import { ApiKey } from './apiKey.types';
 import {
   StratosBaseCatalogEntity,
   StratosCatalogEndpointEntity,
   StratosCatalogEntity,
-} from '../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
+} from './entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { IStratosEntityDefinition } from './entity-catalog/entity-catalog.types';
 import {
-  endpointEntityType,
+  apiKeyEntityType,
   STRATOS_ENDPOINT_TYPE,
-  stratosEntityFactory,
   systemInfoEntityType,
   userFavouritesEntityType,
   userProfileEntityType,
-} from '../../store/src/helpers/stratos-entity-factory';
-import {
-  addOrUpdateUserFavoriteMetadataReducer,
-  deleteUserFavoriteMetadataReducer,
-} from '../../store/src/reducers/favorite.reducer';
-import { systemEndpointsReducer } from '../../store/src/reducers/system-endpoints.reducer';
-import { EndpointModel } from '../../store/src/types/endpoint.types';
-import { IStratosEntityDefinition } from './entity-catalog/entity-catalog.types';
+} from './helpers/stratos-entity-factory';
+import { endpointEntityType, EndpointModel, stratosEntityFactory } from './public-api';
+import { addOrUpdateUserFavoriteMetadataReducer, deleteUserFavoriteMetadataReducer } from './reducers/favorite.reducer';
+import { systemEndpointsReducer } from './reducers/system-endpoints.reducer';
 import {
+  ApiKeyActionBuilder,
+  apiKeyActionBuilder,
   EndpointActionBuilder,
   endpointActionBuilder,
   SystemInfoActionBuilder,
@@ -52,7 +47,8 @@ export function generateStratosEntities(): StratosBaseCatalogEntity[] {
     generateSystemInfo(stratosType),
     generateUserFavorite(stratosType),
     generateUserProfile(stratosType),
-    generateMetricsEndpoint()
+    generateMetricsEndpoint(),
+    generateAPIKeys(stratosType)
   ]
 }
 
@@ -151,11 +147,29 @@ function generateMetricsEndpoint() {
     labelPlural: 'Metrics',
     tokenSharing: true,
     logoUrl: '/core/assets/endpoint-icons/metrics.svg',
-    authTypes: [BaseEndpointAuth.UsernamePassword, BaseEndpointAuth.None],
-    renderPriority: 1,
-    listDetailsComponent: MetricsEndpointDetailsComponent,
+    authTypes: [],
+    renderPriority: 1
   },
     metadata => `/endpoints/metrics/${metadata.guid}`
   )
   return stratosEntityCatalog.metricsEndpoint;
 }
+
+function generateAPIKeys(stratosType) {
+  const definition: IStratosEntityDefinition = {
+    schema: stratosEntityFactory(apiKeyEntityType),
+    type: apiKeyEntityType,
+    endpoint: stratosType,
+  }
+  stratosEntityCatalog.apiKey = new StratosCatalogEntity<
+    undefined,
+    ApiKey,
+    ApiKeyActionBuilder
+  >(
+    definition,
+    {
+      actionBuilders: apiKeyActionBuilder
+    }
+  )
+  return stratosEntityCatalog.apiKey;
+}
diff --git a/src/frontend/packages/store/src/types/auth.types.ts b/src/frontend/packages/store/src/types/auth.types.ts
index cef354d888..5787243ea7 100644
--- a/src/frontend/packages/store/src/types/auth.types.ts
+++ b/src/frontend/packages/store/src/types/auth.types.ts
@@ -22,10 +22,16 @@ export interface SessionEndpoints {
 export interface SessionEndpoint {
   [guid: string]: SessionDataEndpoint;
 }
+export enum APIKeysEnabled {
+  DISABLED = 'disabled',
+  ADMIN_ONLY = 'admin_only',
+  ALL_USERS = 'all_users'
+}
 export interface SessionDataConfig {
   enableTechPreview?: boolean;
   listMaxSize?: number;
   listAllowLoadMaxed?: boolean;
+  APIKeysEnabled?: APIKeysEnabled;
 }
 export interface SessionData {
   endpoints?: SessionEndpoints;
@@ -44,7 +50,7 @@ export interface SessionData {
   ['plugin-config']?: PluginConfig;
   plugins: {
     demo: boolean,
-    [pluginName: string]: boolean
+    [pluginName: string]: boolean,
   };
   config: SessionDataConfig;
 }
diff --git a/src/frontend/packages/store/src/utils.ts b/src/frontend/packages/store/src/utils.ts
new file mode 100644
index 0000000000..4167318128
--- /dev/null
+++ b/src/frontend/packages/store/src/utils.ts
@@ -0,0 +1,6 @@
+// We don't want to bring in the utils package from nodejs
+// We only use this one function:
+
+export function isNullOrUndefined(obj: any): boolean {
+  return typeof obj === 'undefined' || obj === null;
+}
diff --git a/src/frontend/packages/store/testing/ng-package.json b/src/frontend/packages/store/testing/ng-package.json
index bfa6b062cf..f5e468c9b5 100644
--- a/src/frontend/packages/store/testing/ng-package.json
+++ b/src/frontend/packages/store/testing/ng-package.json
@@ -2,6 +2,9 @@
   "$schema": "../../../../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../../../../dist/store/testing",
   "lib": {
-    "entryFile": "public-api.ts"
+    "entryFile": "public-api.ts",
+    "umdModuleIds": {
+      "@ngrx/store": "ngrx_store"
+    }
   }
 }
\ No newline at end of file
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 327474a530..ad0942e40f 100644
--- a/src/frontend/packages/store/testing/src/store-test-helper.ts
+++ b/src/frontend/packages/store/testing/src/store-test-helper.ts
@@ -1,20 +1,24 @@
 import { ModuleWithProviders } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { Store, StoreModule } from '@ngrx/store';
-
-import { AppState } from '../../src/app-state';
-import { entityCatalog } from '../../src/entity-catalog/entity-catalog';
-import { EntityCatalogEntityConfig } from '../../src/entity-catalog/entity-catalog.types';
-import { endpointEntityType, stratosEntityFactory } from '../../src/helpers/stratos-entity-factory';
-import { appReducers } from '../../src/reducers.module';
-import { getDefaultRequestState, rootUpdatingKey } from '../../src/reducers/api-request-reducer/types';
-import { getDefaultPaginationEntityState } from '../../src/reducers/pagination-reducer/pagination-reducer-reset-pagination';
-import { NormalizedResponse } from '../../src/types/api.types';
-import { SessionData, SessionDataEndpoint } from '../../src/types/auth.types';
-import { getDefaultRolesRequestState } from '../../src/types/current-user-roles.types';
-import { EndpointModel } from '../../src/types/endpoint.types';
-import { BaseEntityValues } from '../../src/types/entity.types';
-import { WrapperRequestActionSuccess } from '../../src/types/request.types';
+import {
+  appReducers,
+  AppState,
+  BaseEntityValues,
+  endpointEntityType,
+  EndpointModel,
+  entityCatalog,
+  EntityCatalogEntityConfig,
+  getDefaultPaginationEntityState,
+  getDefaultRequestState,
+  getDefaultRolesRequestState,
+  NormalizedResponse,
+  rootUpdatingKey,
+  SessionData,
+  SessionDataEndpoint,
+  stratosEntityFactory,
+  WrapperRequestActionSuccess,
+} from '@stratosui/store';
 
 export const testSCFEndpointGuid = '01ccda9d-8f40-4dd0-bc39-08eea68e364f';
 const testSCFSessionEndpoint: SessionDataEndpoint = {
@@ -164,7 +168,6 @@ function getDefaultInitialTestStratosStoreState() {
       headerEventMinimized: true,
       gravatarEnabled: false,
     },
-    actionHistory: [],
     lists: {},
     routing: {
       previousState: {
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 9bb257559b..e5bc7764c2 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,5 @@
 import { NgModule } from '@angular/core';
-
-import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../src/entity-catalog.module';
-import { entityCatalog, TestEntityCatalog } from '../../src/entity-catalog/entity-catalog';
+import { CATALOGUE_ENTITIES, entityCatalog, EntityCatalogFeatureModule, TestEntityCatalog } from '@stratosui/store';
 
 @NgModule({
   imports: [
diff --git a/src/frontend/packages/store/testing/tslint.json b/src/frontend/packages/store/testing/tslint.json
index 6ee5e859e0..847d730db4 100644
--- a/src/frontend/packages/store/testing/tslint.json
+++ b/src/frontend/packages/store/testing/tslint.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tslint.json",
+  "extends": "../../../../../tslint.json",
   "rules": {
     "directive-selector": [
       false,
diff --git a/src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.spec.ts
index 847f32c442..b0c270cf94 100644
--- a/src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.spec.ts
@@ -1,7 +1,7 @@
 import { HttpClientModule } from '@angular/common/http';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { BaseTestModules } from '../../../../../core/test-framework/core-test.helper';
 import { DemoHelperComponent } from './demo-helper.component';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.spec.ts
index 410d613753..462903feb4 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { BaseTestModulesNoShared } from '../../../../../core/test-framework/core-test.helper';
 import { HelmModule } from '../helm.module';
 import { MonocularTabBaseComponent } from './monocular-tab-base.component';
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts
index 939eb86e08..171a260696 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input } from '@angular/core';
-import * as markdown from 'marked';
+import markdown from 'marked';
 import { Observable, of as observableOf } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.spec.ts
index b9512b6483..e07911a9da 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.spec.ts
@@ -4,7 +4,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
-import { LoggerService } from '../../../../../../core/src/core/logger.service';
 import { createBasicStoreModule } from '../../../../../../store/testing/public-api';
 import { ChartsService } from '../shared/services/charts.service';
 import { ConfigService } from '../shared/services/config.service';
@@ -23,7 +22,6 @@ describe('Component: ChartItem', () => {
         HttpClient,
         ConfigService,
         ChartsService,
-        LoggerService,
         {
           provide: ActivatedRoute,
           useValue: {
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.spec.ts
index 493bebfb1d..eae5836ec8 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.spec.ts
@@ -6,7 +6,6 @@ import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
 
-import { LoggerService } from '../../../../../../core/src/core/logger.service';
 import { createBasicStoreModule } from '../../../../../../store/testing/public-api';
 import { ChartItemComponent } from '../chart-item/chart-item.component';
 import { ChartListComponent } from '../chart-list/chart-list.component';
@@ -51,7 +50,6 @@ describe('ChartsComponent', () => {
           }
         },
         ReposService,
-        LoggerService
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts
index cb22418fba..5d48d733b0 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts
@@ -4,7 +4,6 @@ import { ActivatedRoute } from '@angular/router';
 import { Observable, of, throwError } from 'rxjs';
 import { catchError, map, tap } from 'rxjs/operators';
 
-import { LoggerService } from '../../../../../../../core/src/core/logger.service';
 import { getMonocularEndpoint, stratosMonocularEndpointGuid } from '../../stratos-monocular.helper';
 import { Chart } from '../models/chart';
 import { ChartVersion } from '../models/chart-version';
@@ -21,7 +20,6 @@ export class ChartsService {
   constructor(
     private http: HttpClient,
     config: ConfigService,
-    private loggerService: LoggerService,
     private route: ActivatedRoute,
   ) {
     this.hostname = `${config.backendHostname}/chartsvc`;
@@ -204,9 +202,7 @@ export class ChartsService {
   private handleError(error: any) {
     const errMsg = (error.message) ? error.message :
       error.status ? `${error.status} - ${error.statusText}` : 'Server error';
-    if (!!this.loggerService) {
-      this.loggerService.error(errMsg);
-    }
+    console.error(errMsg);
     return throwError(errMsg);
   }
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/repos.service.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/repos.service.ts
index 23a0880309..8903061080 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/repos.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/repos.service.ts
@@ -3,7 +3,6 @@ import { Injectable } from '@angular/core';
 import { Observable, throwError } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 
-import { LoggerService } from '../../../../../../../core/src/core/logger.service';
 import { RepoAttributes } from '../models/repo';
 import { ConfigService } from './config.service';
 
@@ -16,7 +15,6 @@ export class ReposService {
   constructor(
     private http: HttpClient,
     private config: ConfigService,
-    private loggerService: LoggerService
   ) {
     this.hostname = `/pp/v1/chartrepos`;
   }
@@ -40,9 +38,7 @@ export class ReposService {
   private handleError(error: any) {
     const errMsg = (error.json().message) ? error.json().message :
       error.status ? `${error.status} - ${error.statusText}` : 'Server error';
-    if (!!this.loggerService) {
-      this.loggerService.error(errMsg);
-    }
+    console.error(errMsg);
     return throwError(errMsg);
   }
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.ts
index ffb13fa10c..5b5bce37a5 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
-import * as moment from 'moment';
+import moment from 'moment';
 import { Observable, Subscription } from 'rxjs';
 import { map, tap } from 'rxjs/operators';
 
@@ -60,7 +60,7 @@ export class AnalysisReportSelectorComponent implements OnInit, OnDestroy {
           this.onSelected(reports[0]);
         }
       })
-    )
+    );
   }
 
 
@@ -75,13 +75,13 @@ export class AnalysisReportSelectorComponent implements OnInit, OnDestroy {
   }
 
   public refreshReports($event: MouseEvent) {
-    this.analysisService.getByPath(this.endpoint, this.path, true)
+    this.analysisService.getByPath(this.endpoint, this.path, true);
     $event.preventDefault();
     $event.cancelBubble = true;
   }
 
   ngOnDestroy() {
-    safeUnsubscribe(...this.subs)
+    safeUnsubscribe(...this.subs);
   }
 
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.spec.ts
index 65f7e4ba32..75932802f6 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.spec.ts
@@ -4,8 +4,9 @@ import { createBasicStoreModule } from '@stratosui/store/testing';
 
 import { ApplicationService } from '../../../../../cloud-foundry/src/features/applications/application.service';
 import { ApplicationServiceMock } from '../../../../../cloud-foundry/test-framework/application-service-helper';
+import { CurrentUserPermissionsService } from '../../../../../core/src/core/permissions/current-user-permissions.service';
 import { SharedModule } from '../../../../../core/src/public-api';
-import { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { CoreModule } from './../../../../../core/src/core/core.module';
 import { KubeConsoleComponent } from './kube-console.component';
 
@@ -24,7 +25,8 @@ describe('KubeConsoleComponent', () => {
       ],
       providers: [
         { provide: ApplicationService, useClass: ApplicationServiceMock },
-        TabNavService
+        TabNavService,
+        CurrentUserPermissionsService
       ],
     })
       .compileComponents();
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts
index 84062f4fc2..0779af7d2c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts
@@ -2,7 +2,7 @@ import { HttpClient, HttpHandler } from '@angular/common/http';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
-import { TabNavService } from '../../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../../core/src/tab-nav.service';
 import { KubernetesBaseTestModules } from '../../kubernetes.testing.module';
 import { KubedashConfigurationComponent } from './kubedash-configuration.component';
 
@@ -13,7 +13,7 @@ describe('KubedashConfigurationComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [...KubernetesBaseTestModules],
-      declarations: [ KubedashConfigurationComponent ],
+      declarations: [KubedashConfigurationComponent],
       providers: [
         {
           provide: ActivatedRoute,
@@ -31,7 +31,7 @@ describe('KubedashConfigurationComponent', () => {
         HttpHandler,
       ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts
index f918ee294b..92ee1c9d9d 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
-import { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { KubernetesBaseTestModules } from '../kubernetes.testing.module';
 import { KubernetesDashboardTabComponent } from './kubernetes-dashboard.component';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-metrics.helpers.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-metrics.helpers.ts
index 1507afc966..45580cbbdf 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-metrics.helpers.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-metrics.helpers.ts
@@ -1,5 +1,4 @@
-import { ValidatorFn } from '@angular/forms';
-import * as moment from 'moment';
+import moment from 'moment';
 
 
 export function formatCPUTime(value: string | number, debug = false): string {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.spec.ts
index 4834ac63ec..c247e9f24e 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.spec.ts
@@ -1,5 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { TabNavService } from 'frontend/packages/core/tab-nav.service';
+import { TabNavService } from 'frontend/packages/core/src/tab-nav.service';
 
 import { MDAppModule } from '../../../../../../core/src/public-api';
 import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../kubernetes.testing.module';
@@ -18,7 +18,7 @@ describe('KubernetesNamespaceAnalysisReportComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ KubernetesNamespaceAnalysisReportComponent, AnalysisReportSelectorComponent, AnalysisReportViewerComponent ],
+      declarations: [KubernetesNamespaceAnalysisReportComponent, AnalysisReportSelectorComponent, AnalysisReportViewerComponent],
       imports: [
         KubernetesBaseTestModules,
         MDAppModule
@@ -31,7 +31,7 @@ describe('KubernetesNamespaceAnalysisReportComponent', () => {
         TabNavService,
       ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts
index d638b3b663..083db88ddf 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../../core/src/tab-nav.service';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesBaseTestModules } from '../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts
index b334471044..b06b4eee40 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
-import { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../kubernetes.testing.module';
 import { KubernetesNodeComponent } from './kubernetes-node.component';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
index ded7309f19..8944cb03ef 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import * as moment from 'moment';
+import moment from 'moment';
 import { Observable, of } from 'rxjs';
 import { filter, first, map, publishReplay, refCount, switchMap } from 'rxjs/operators';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts
index 0d8e5a109e..d714ab66a2 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
-import { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { KubernetesBaseTestModules } from '../kubernetes.testing.module';
 import { KubernetesTabBaseComponent } from './kubernetes-tab-base.component';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.testing.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.testing.module.ts
index ea8fa319f8..af0520b267 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.testing.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.testing.module.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 { TabNavService } from '../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../core/src/tab-nav.service';
 import { AppTestModule } from '../../../../core/test-framework/core-test.helper';
 import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../../../store/src/entity-catalog.module';
 import { entityCatalog, TestEntityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.spec.ts
index f715faab3a..d222961131 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { KubernetesBaseTestModules } from '../kubernetes.testing.module';
 import { KubernetesComponent } from './kubernetes.component';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-reports-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-reports-list-config.service.ts
index 9e68483e80..8755eda8b2 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-reports-list-config.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-reports-list-config.service.ts
@@ -7,7 +7,7 @@ import {
   IListMultiFilterConfig,
   ListViewTypes,
 } from 'frontend/packages/core/src/shared/components/list/list.component.types';
-import * as moment from 'moment';
+import moment from 'moment';
 import { of } from 'rxjs';
 
 import { ListView } from '../../../../../store/src/actions/list.actions';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kube-list.helper.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kube-list.helper.ts
index 5769d1bbee..1509c97e9c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kube-list.helper.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kube-list.helper.ts
@@ -1,4 +1,4 @@
-import * as moment from 'moment';
+import moment from 'moment';
 
 import { DataFunction } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts
index 7f349cd24a..526d4132e9 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts
@@ -1,7 +1,7 @@
 /* tslint:disable:max-line-length */
 import { TitleCasePipe } from '@angular/common';
 import { Component, Input } from '@angular/core';
-import * as moment from 'moment';
+import moment from 'moment';
 import { Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts
index 3efdf94c24..5f245aad3a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
-import { TabNavService } from '../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { KubernetesBaseTestModules } from '../kubernetes.testing.module';
 import { PodMetricsComponent } from './pod-metrics.component';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.ts
index 56fcba9997..4fb75c972c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.ts
@@ -1,6 +1,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Component, Input } from '@angular/core';
-import * as markdown from 'marked';
+import markdown from 'marked';
 import { Observable, of } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.spec.ts
index 642176aa68..ee1e090856 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../../../core/src/tab-nav.service';
 import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
 import { KubernetesAnalysisService } from '../../../services/kubernetes.analysis.service';
@@ -15,7 +15,7 @@ describe('KubernetesAnalysisReportComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ KubernetesAnalysisReportComponent, AnalysisReportViewerComponent ],
+      declarations: [KubernetesAnalysisReportComponent, AnalysisReportViewerComponent],
       imports: [
         KubernetesBaseTestModules,
         CoreModule,
@@ -27,7 +27,7 @@ describe('KubernetesAnalysisReportComponent', () => {
         TabNavService,
       ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.spec.ts
index 6e6255dd8c..1706cd886f 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.spec.ts
@@ -1,5 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { TabNavService } from 'frontend/packages/core/tab-nav.service';
+import { TabNavService } from 'frontend/packages/core/src/tab-nav.service';
 
 import { MDAppModule } from '../../../../../../core/src/public-api';
 import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../kubernetes.testing.module';
@@ -15,7 +15,7 @@ describe('KubernetesAnalysisTabComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ KubernetesAnalysisTabComponent, AnalysisReportViewerComponent ],
+      declarations: [KubernetesAnalysisTabComponent, AnalysisReportViewerComponent],
       imports: [
         KubernetesBaseTestModules,
         MDAppModule
@@ -27,7 +27,7 @@ describe('KubernetesAnalysisTabComponent', () => {
         TabNavService,
       ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts
index 539312f0a8..c5ec93f420 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts
@@ -1,7 +1,7 @@
 import { HttpClient, HttpHandler } from '@angular/common/http';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../../core/src/tab-nav.service';
 import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
 import { KubernetesSummaryTabComponent } from './kubernetes-summary.component';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.spec.ts
index f2533edc8b..00adc0ba34 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.spec.ts
@@ -4,7 +4,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ConfirmationDialogService } from '../../../../../../core/src/shared/components/confirmation-dialog.service';
-import { TabNavService } from '../../../../../../core/tab-nav.service';
+import { TabNavService } from '../../../../../../core/src/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';
@@ -37,7 +37,7 @@ describe('CreateReleaseComponent', () => {
         ConfirmationDialogService,
         { provide: ChartsService, useValue: new MockChartService() },
         { provide: ConfigService, useValue: { appName: 'appName' } },
-    ]
+      ]
     })
       .compileComponents();
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-socket-service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-socket-service.ts
index 4147fe3e0e..920e07a48d 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-socket-service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-socket-service.ts
@@ -4,7 +4,6 @@ import { Subject, Subscription } from 'rxjs';
 import makeWebSocketObservable, { GetWebSocketResponses } from 'rxjs-websockets';
 import { catchError, map, share, switchMap } from 'rxjs/operators';
 
-import { LoggerService } from '../../../../../../../core/src/core/logger.service';
 import { SnackBarService } from '../../../../../../../core/src/shared/services/snackbar.service';
 import { AppState } from '../../../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
@@ -37,7 +36,6 @@ export class HelmReleaseSocketService implements OnDestroy {
   constructor(
     private helmReleaseHelper: HelmReleaseHelperService,
     private store: Store<AppState>,
-    private logService: LoggerService,
     private snackbarService: SnackBarService,
   ) {
 
@@ -56,7 +54,7 @@ export class HelmReleaseSocketService implements OnDestroy {
     );
 
     const socket$ = makeWebSocketObservable(streamUrl).pipe(catchError(e => {
-      this.logService.error(
+      console.error(
         'Error while connecting to socket: ' + JSON.stringify(e)
       );
       return [];
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts
index 96996ee411..521eb3a53e 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts
@@ -1,10 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { TabNavService } from 'frontend/packages/core/tab-nav.service';
+import { TabNavService } from 'frontend/packages/core/src/tab-nav.service';
 
-import { HelmReleaseProviders, KubernetesBaseTestModules, KubeBaseGuidMock } from '../../../kubernetes.testing.module';
-import { HelmReleaseTabBaseComponent } from './helm-release-tab-base.component';
-import { KubernetesAnalysisService } from '../../../services/kubernetes.analysis.service';
+import { HelmReleaseProviders, KubeBaseGuidMock, KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
+import { KubernetesAnalysisService } from '../../../services/kubernetes.analysis.service';
+import { HelmReleaseTabBaseComponent } from './helm-release-tab-base.component';
 
 
 describe('HelmReleaseTabBaseComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.spec.ts
index a2c29af062..9d531b7a8e 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.spec.ts
@@ -1,13 +1,14 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { TabNavService } from 'frontend/packages/core/src/tab-nav.service';
 
-import { HelmReleaseAnalysisTabComponent } from './helm-release-analysis-tab.component';
-import { AnalysisReportSelectorComponent } from './../../../../analysis-report-viewer/analysis-report-selector/analysis-report-selector.component';
-import { KubernetesBaseTestModules, KubeBaseGuidMock } from '../../../../kubernetes.testing.module';
-import { KubernetesAnalysisService } from '../../../../services/kubernetes.analysis.service';
-import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service';
 import { AnalysisReportViewerComponent } from '../../../../analysis-report-viewer/analysis-report-viewer.component';
-import { HelmReleaseProviders } from '../../../../kubernetes.testing.module';
-import { TabNavService } from 'frontend/packages/core/tab-nav.service';
+import { HelmReleaseProviders, KubeBaseGuidMock, KubernetesBaseTestModules } from '../../../../kubernetes.testing.module';
+import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service';
+import { KubernetesAnalysisService } from '../../../../services/kubernetes.analysis.service';
+import {
+  AnalysisReportSelectorComponent,
+} from './../../../../analysis-report-viewer/analysis-report-selector/analysis-report-selector.component';
+import { HelmReleaseAnalysisTabComponent } from './helm-release-analysis-tab.component';
 
 describe('HelmReleaseAnalysisTabComponent', () => {
   let component: HelmReleaseAnalysisTabComponent;
@@ -15,7 +16,7 @@ describe('HelmReleaseAnalysisTabComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ HelmReleaseAnalysisTabComponent, AnalysisReportSelectorComponent, AnalysisReportViewerComponent],
+      declarations: [HelmReleaseAnalysisTabComponent, AnalysisReportSelectorComponent, AnalysisReportViewerComponent],
       imports: [
         KubernetesBaseTestModules,
       ],
@@ -27,7 +28,7 @@ describe('HelmReleaseAnalysisTabComponent', () => {
         TabNavService
       ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.ts
index 2e0ada870e..08907252bc 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import * as moment from 'moment';
+import moment from 'moment';
 import { of } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
index 99e5683d26..dca8ca40f6 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
@@ -1,14 +1,16 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NgxGraphModule } from '@swimlane/ngx-graph';
 import { SidePanelService } from 'frontend/packages/core/src/shared/services/side-panel.service';
-import { TabNavService } from 'frontend/packages/core/tab-nav.service';
+import { TabNavService } from 'frontend/packages/core/src/tab-nav.service';
 
 import { HelmReleaseProviders, KubernetesBaseTestModules } from '../../../../kubernetes.testing.module';
-import { HelmReleaseResourceGraphComponent } from './helm-release-resource-graph.component';
-import { AnalysisReportSelectorComponent } from './../../../../analysis-report-viewer/analysis-report-selector/analysis-report-selector.component';
-import { KubernetesAnalysisService } from '../../../../services/kubernetes.analysis.service';
 import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service';
+import { KubernetesAnalysisService } from '../../../../services/kubernetes.analysis.service';
+import {
+  AnalysisReportSelectorComponent,
+} from './../../../../analysis-report-viewer/analysis-report-selector/analysis-report-selector.component';
 import { KubeBaseGuidMock } from './../../../../kubernetes.testing.module';
+import { HelmReleaseResourceGraphComponent } from './helm-release-resource-graph.component';
 
 describe('HelmReleaseResourceGraphComponent', () => {
   let component: HelmReleaseResourceGraphComponent;
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
index 9eb1592e81..85a9bcbb98 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
@@ -1,5 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { TabNavService } from 'frontend/packages/core/tab-nav.service';
+import { TabNavService } from 'frontend/packages/core/src/tab-nav.service';
 
 import { SidePanelService } from '../../../../../../../../core/src/shared/services/side-panel.service';
 import { HelmReleaseProviders, KubeBaseGuidMock } from '../../../../kubernetes.testing.module';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index a3f7b44bb4..f1c0413fc7 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -1,7 +1,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Component, ComponentFactoryResolver, OnDestroy } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { LoggerService } from 'frontend/packages/core/src/core/logger.service';
 import { ConfirmationDialogConfig } from 'frontend/packages/core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from 'frontend/packages/core/src/shared/components/confirmation-dialog.service';
 import { SidePanelService } from 'frontend/packages/core/src/shared/services/side-panel.service';
@@ -93,7 +92,6 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
     private store: Store<AppState>,
     private confirmDialog: ConfirmationDialogService,
     private httpClient: HttpClient,
-    private logService: LoggerService,
     private snackbarService: SnackBarService,
     public analyzerService: KubernetesAnalysisService,
     private previewPanel: SidePanelService,
@@ -221,7 +219,7 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy {
         error: (err: any) => {
           this.endDelete();
           this.snackbarService.show('Failed to delete release', 'Close');
-          this.logService.error('Failed to delete release: ', err);
+          console.error('Failed to delete release: ', err);
         },
         complete: () => {
           const action = workloadsEntityCatalog.release.actions.getMultiple();
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts
index 753a4c1445..dd864daa79 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts
@@ -1,5 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { TabNavService } from 'frontend/packages/core/tab-nav.service';
+import { TabNavService } from 'frontend/packages/core/src/tab-nav.service';
 
 import { HelmReleaseProviders, KubernetesBaseTestModules } from '../../../../kubernetes.testing.module';
 import { HelmReleaseValuesTabComponent } from './helm-release-values-tab.component';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts
index 745833b6fd..20f505b6b5 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts
@@ -1,6 +1,6 @@
 import { DatePipe } from '@angular/common';
 import { async, TestBed } from '@angular/core/testing';
-import { TabNavService } from 'frontend/packages/core/tab-nav.service';
+import { TabNavService } from 'frontend/packages/core/src/tab-nav.service';
 
 import { KubernetesBaseTestModules } from '../../kubernetes.testing.module';
 import { HelmReleaseHelperService } from '../release/tabs/helm-release-helper.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-list-config.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-list-config.ts
index fe811a1a78..0d0f0307c5 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-list-config.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-list-config.ts
@@ -1,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import * as moment from 'moment';
+import moment from 'moment';
 import { BehaviorSubject, of } from 'rxjs';
 import { first } from 'rxjs/operators';
 
diff --git a/src/jetstream/apikeys.go b/src/jetstream/apikeys.go
new file mode 100644
index 0000000000..c9ab110113
--- /dev/null
+++ b/src/jetstream/apikeys.go
@@ -0,0 +1,92 @@
+package main
+
+import (
+	"errors"
+	"net/http"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces/config"
+	"github.com/labstack/echo"
+	log "github.com/sirupsen/logrus"
+)
+
+func (p *portalProxy) checkIfAPIKeysEnabled(userGUID string) error {
+	if p.Config.APIKeysEnabled == config.APIKeysConfigEnum.Disabled {
+		log.Info("API keys are disabled")
+		return errors.New("API keys are disabled")
+	} else if p.Config.APIKeysEnabled == config.APIKeysConfigEnum.AdminOnly {
+		user, err := p.StratosAuthService.GetUser(userGUID)
+		if err != nil {
+			return err
+		}
+
+		if !user.Admin {
+			log.Info("API keys are disabled for non-admin users")
+			return errors.New("API keys are disabled for non-admin users")
+		}
+	}
+
+	return nil
+}
+
+func (p *portalProxy) addAPIKey(c echo.Context) error {
+	log.Debug("addAPIKey")
+
+	userGUID := c.Get("user_id").(string)
+	comment := c.FormValue("comment")
+
+	if len(comment) == 0 {
+		return echo.NewHTTPError(http.StatusBadRequest, "Comment can't be empty")
+	}
+
+	if err := p.checkIfAPIKeysEnabled(userGUID); err != nil {
+		return echo.NewHTTPError(http.StatusForbidden, err.Error())
+	}
+
+	apiKey, err := p.APIKeysRepository.AddAPIKey(userGUID, comment)
+	if err != nil {
+		log.Errorf("Error adding API key: %v", err)
+		return errors.New("Error adding API key")
+	}
+
+	return c.JSON(http.StatusOK, apiKey)
+}
+
+func (p *portalProxy) listAPIKeys(c echo.Context) error {
+	log.Debug("listAPIKeys")
+
+	userGUID := c.Get("user_id").(string)
+
+	if err := p.checkIfAPIKeysEnabled(userGUID); err != nil {
+		return echo.NewHTTPError(http.StatusForbidden, err.Error())
+	}
+
+	apiKeys, err := p.APIKeysRepository.ListAPIKeys(userGUID)
+	if err != nil {
+		log.Errorf("Error listing API keys: %v", err)
+		return errors.New("Error listing API keys")
+	}
+
+	return c.JSON(http.StatusOK, apiKeys)
+}
+
+func (p *portalProxy) deleteAPIKey(c echo.Context) error {
+	log.Debug("deleteAPIKey")
+
+	userGUID := c.Get("user_id").(string)
+	keyGUID := c.FormValue("guid")
+
+	if len(keyGUID) == 0 {
+		return echo.NewHTTPError(http.StatusBadRequest, "API key guid can't be empty")
+	}
+
+	if err := p.checkIfAPIKeysEnabled(userGUID); err != nil {
+		return echo.NewHTTPError(http.StatusForbidden, err.Error())
+	}
+
+	if err := p.APIKeysRepository.DeleteAPIKey(userGUID, keyGUID); err != nil {
+		log.Errorf("Error deleting API key: %v", err)
+		return errors.New("Error deleting API key")
+	}
+
+	return nil
+}
diff --git a/src/jetstream/apikeys_test.go b/src/jetstream/apikeys_test.go
new file mode 100644
index 0000000000..3e7e952f4d
--- /dev/null
+++ b/src/jetstream/apikeys_test.go
@@ -0,0 +1,389 @@
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"net/http"
+	"testing"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/apikeys"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces/config"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/mock_interfaces"
+	"github.com/golang/mock/gomock"
+	"github.com/labstack/echo"
+	log "github.com/sirupsen/logrus"
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func Test_addAPIKey(t *testing.T) {
+	t.Parallel()
+
+	// disabling logging noise
+	log.SetLevel(log.PanicLevel)
+
+	Convey("Given a request to add an API key", t, func() {
+		userID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+
+		ctrl := gomock.NewController(t)
+		mockAPIRepo := apikeys.NewMockRepository(ctrl)
+		mockStratosAuth := mock_interfaces.NewMockStratosAuth(ctrl)
+		pp := makeMockServer(mockAPIRepo, mockStratosAuth)
+		defer ctrl.Finish()
+		defer pp.DatabaseConnectionPool.Close()
+
+		Convey("when API keys are disabled", func() {
+			pp.Config.APIKeysEnabled = config.APIKeysConfigEnum.Disabled
+
+			Convey("when API key comment is present", func() {
+				comment := "Test API key"
+				ctx, _ := makeNewRequestWithParams("POST", map[string]string{"comment": comment})
+				ctx.Set("user_id", userID)
+
+				err := pp.addAPIKey(ctx)
+
+				Convey("should return an error", func() {
+					So(err, ShouldResemble, echo.NewHTTPError(http.StatusForbidden, "API keys are disabled"))
+				})
+			})
+		})
+
+		Convey("when API keys are enabled for admin users", func() {
+			pp.Config.APIKeysEnabled = config.APIKeysConfigEnum.AdminOnly
+
+			Convey("when a StratosAuth error occurs", func() {
+				comment := "Test API key"
+				ctx, _ := makeNewRequestWithParams("POST", map[string]string{"comment": comment})
+				ctx.Set("user_id", userID)
+
+				mockStratosAuth.
+					EXPECT().
+					GetUser(gomock.Eq(userID)).
+					Return(nil, errors.New("Something went wrong"))
+
+				err := pp.addAPIKey(ctx)
+
+				Convey("should return an error", func() {
+					So(err, ShouldResemble, echo.NewHTTPError(http.StatusForbidden, "Something went wrong"))
+				})
+			})
+
+			Convey("when user is not an admin", func() {
+				Convey("when API key comment is present", func() {
+					comment := "Test API key"
+					ctx, _ := makeNewRequestWithParams("POST", map[string]string{"comment": comment})
+					ctx.Set("user_id", userID)
+
+					connectedUser := &interfaces.ConnectedUser{
+						GUID:  userID,
+						Admin: false,
+					}
+
+					mockStratosAuth.
+						EXPECT().
+						GetUser(gomock.Eq(userID)).
+						Return(connectedUser, nil)
+
+					err := pp.addAPIKey(ctx)
+
+					Convey("should return an error", func() {
+						So(err, ShouldResemble, echo.NewHTTPError(http.StatusForbidden, "API keys are disabled for non-admin users"))
+					})
+				})
+			})
+
+			Convey("when user is an admin", func() {
+				Convey("when API key comment is present", func() {
+					comment := "Test API key"
+					retval := interfaces.APIKey{UserGUID: userID, Comment: comment}
+
+					ctx, rec := makeNewRequestWithParams("POST", map[string]string{"comment": comment})
+					ctx.Set("user_id", userID)
+
+					connectedUser := &interfaces.ConnectedUser{
+						GUID:  userID,
+						Admin: true,
+					}
+
+					mockStratosAuth.
+						EXPECT().
+						GetUser(gomock.Eq(userID)).
+						Return(connectedUser, nil)
+
+					mockAPIRepo.
+						EXPECT().
+						AddAPIKey(gomock.Eq(userID), gomock.Eq(comment)).
+						Return(&retval, nil)
+
+					err := pp.addAPIKey(ctx)
+
+					var data map[string]interface{}
+					if jsonErr := json.Unmarshal(rec.Body.Bytes(), &data); jsonErr != nil {
+						panic(jsonErr)
+					}
+
+					Convey("there should be no error", func() {
+						So(err, ShouldBeNil)
+					})
+
+					Convey("should return HTTP code 200", func() {
+						So(rec.Code, ShouldEqual, 200)
+					})
+
+					Convey("API key user_guid should equal context user", func() {
+						So(data["user_guid"], ShouldEqual, userID)
+					})
+
+					Convey("API key comment should equal request comment", func() {
+						So(data["comment"], ShouldEqual, comment)
+					})
+
+					Convey("API key last_used should be nil", func() {
+						So(data["last_used"], ShouldBeNil)
+					})
+				})
+			})
+		})
+
+		Convey("when API keys are enabled", func() {
+			pp.Config.APIKeysEnabled = config.APIKeysConfigEnum.AllUsers
+
+			Convey("when comment is not specified", func() {
+				ctx, _ := makeNewRequest()
+				ctx.Set("user_id", userID)
+
+				err := pp.addAPIKey(ctx)
+
+				Convey("should return an error", func() {
+					So(err, ShouldResemble, echo.NewHTTPError(http.StatusBadRequest, "Comment can't be empty"))
+				})
+			})
+
+			Convey("when a DB error occurs", func() {
+				comment := "Test API key"
+
+				mockAPIRepo.
+					EXPECT().
+					AddAPIKey(gomock.Eq(userID), gomock.Eq(comment)).
+					Return(nil, errors.New("Something went wrong"))
+
+				ctx, _ := makeNewRequestWithParams("POST", map[string]string{"comment": comment})
+				ctx.Set("user_id", userID)
+
+				err := pp.addAPIKey(ctx)
+
+				Convey("should return an error", func() {
+					So(err, ShouldResemble, errors.New("Error adding API key"))
+				})
+			})
+
+			Convey("when API key comment is present", func() {
+				comment := "Test API key"
+				retval := interfaces.APIKey{UserGUID: userID, Comment: comment}
+
+				mockAPIRepo.
+					EXPECT().
+					AddAPIKey(gomock.Eq(userID), gomock.Eq(comment)).
+					Return(&retval, nil)
+
+				ctx, rec := makeNewRequestWithParams("POST", map[string]string{"comment": comment})
+				ctx.Set("user_id", userID)
+
+				err := pp.addAPIKey(ctx)
+
+				var data map[string]interface{}
+				if jsonErr := json.Unmarshal(rec.Body.Bytes(), &data); jsonErr != nil {
+					panic(jsonErr)
+				}
+
+				Convey("there should be no error", func() {
+					So(err, ShouldBeNil)
+				})
+
+				Convey("should return HTTP code 200", func() {
+					So(rec.Code, ShouldEqual, 200)
+				})
+
+				Convey("API key user_guid should equal context user", func() {
+					So(data["user_guid"], ShouldEqual, userID)
+				})
+
+				Convey("API key comment should equal request comment", func() {
+					So(data["comment"], ShouldEqual, comment)
+				})
+
+				Convey("API key last_used should be nil", func() {
+					So(data["last_used"], ShouldBeNil)
+				})
+			})
+		})
+	})
+}
+
+func Test_listAPIKeys(t *testing.T) {
+	t.Parallel()
+
+	// disabling logging noise
+	log.SetLevel(log.PanicLevel)
+
+	ctrl := gomock.NewController(t)
+	mockAPIRepo := apikeys.NewMockRepository(ctrl)
+	mockStratosAuth := mock_interfaces.NewMockStratosAuth(ctrl)
+	pp := makeMockServer(mockAPIRepo, mockStratosAuth)
+	defer ctrl.Finish()
+	defer pp.DatabaseConnectionPool.Close()
+
+	Convey("Given a request to list API keys", t, func() {
+		userID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+
+		Convey("When API keys are disabled", func() {
+			pp.Config.APIKeysEnabled = config.APIKeysConfigEnum.Disabled
+
+			ctx, _ := makeNewRequest()
+			ctx.Set("user_id", userID)
+
+			err := pp.listAPIKeys(ctx)
+
+			Convey("should return an error", func() {
+				So(err, ShouldResemble, echo.NewHTTPError(http.StatusForbidden, "API keys are disabled"))
+			})
+		})
+
+		Convey("When API keys are enabled", func() {
+			pp.Config.APIKeysEnabled = config.APIKeysConfigEnum.AllUsers
+
+			Convey("when a DB error occurs", func() {
+				mockAPIRepo.
+					EXPECT().
+					ListAPIKeys(gomock.Eq(userID)).
+					Return(nil, errors.New("Something went wrong"))
+
+				ctx, _ := makeNewRequest()
+				ctx.Set("user_id", userID)
+
+				err := pp.listAPIKeys(ctx)
+
+				Convey("should return an error", func() {
+					So(err, ShouldResemble, errors.New("Error listing API keys"))
+				})
+			})
+
+			Convey("when DB no errors occur", func() {
+				r1 := &interfaces.APIKey{
+					GUID:     "00000000-0000-0000-0000-000000000000",
+					Secret:   "",
+					UserGUID: userID,
+					Comment:  "First key",
+					LastUsed: nil,
+				}
+
+				r2 := &interfaces.APIKey{
+					GUID:     "11111111-1111-1111-1111-111111111111",
+					Secret:   "",
+					UserGUID: userID,
+					Comment:  "Second key",
+					LastUsed: nil,
+				}
+
+				retval := []interfaces.APIKey{*r1, *r2}
+
+				mockAPIRepo.
+					EXPECT().
+					ListAPIKeys(gomock.Eq(userID)).
+					Return(retval, nil)
+
+				ctx, rec := makeNewRequest()
+				ctx.Set("user_id", userID)
+
+				err := pp.listAPIKeys(ctx)
+
+				Convey("there should be no error", func() {
+					So(err, ShouldBeNil)
+				})
+
+				Convey("return valid JSON", func() {
+					So(rec.Body.String(), ShouldEqual, jsonMust(retval)+"\n")
+				})
+			})
+		})
+	})
+}
+
+func Test_deleteAPIKeys(t *testing.T) {
+	t.Parallel()
+
+	// disabling logging noise
+	log.SetLevel(log.PanicLevel)
+
+	ctrl := gomock.NewController(t)
+	mockAPIRepo := apikeys.NewMockRepository(ctrl)
+	mockStratosAuth := mock_interfaces.NewMockStratosAuth(ctrl)
+	pp := makeMockServer(mockAPIRepo, mockStratosAuth)
+	defer ctrl.Finish()
+	defer pp.DatabaseConnectionPool.Close()
+
+	userID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+	keyID := "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"
+
+	Convey("Given a request to delete an API key", t, func() {
+		Convey("when API keys are disabled", func() {
+			pp.Config.APIKeysEnabled = config.APIKeysConfigEnum.Disabled
+
+			ctx, _ := makeNewRequestWithParams("POST", map[string]string{"guid": keyID})
+			ctx.Set("user_id", userID)
+
+			err := pp.deleteAPIKey(ctx)
+
+			Convey("should return an error", func() {
+				So(err, ShouldResemble, echo.NewHTTPError(http.StatusForbidden, "API keys are disabled"))
+			})
+		})
+
+		Convey("when API keys are enabled", func() {
+			pp.Config.APIKeysEnabled = config.APIKeysConfigEnum.AllUsers
+
+			Convey("when no API key GUID is supplied", func() {
+				ctx, _ := makeNewRequest()
+				ctx.Set("user_id", userID)
+
+				err := pp.deleteAPIKey(ctx)
+
+				Convey("should return an error", func() {
+					So(err, ShouldResemble, echo.NewHTTPError(http.StatusBadRequest, "API key guid can't be empty"))
+				})
+			})
+
+			Convey("when an error occured during API key deletion", func() {
+				mockAPIRepo.
+					EXPECT().
+					DeleteAPIKey(gomock.Eq(userID), gomock.Eq(keyID)).
+					Return(errors.New("Something went wrong"))
+
+				ctx, _ := makeNewRequestWithParams("POST", map[string]string{"guid": keyID})
+				ctx.Set("user_id", userID)
+
+				err := pp.deleteAPIKey(ctx)
+
+				Convey("should return an error", func() {
+					So(err, ShouldResemble, errors.New("Error deleting API key"))
+				})
+			})
+
+			Convey("when an API key is deleted succesfully", func() {
+				mockAPIRepo.
+					EXPECT().
+					DeleteAPIKey(gomock.Eq(userID), gomock.Eq(keyID)).
+					Return(nil)
+
+				ctx, _ := makeNewRequestWithParams("POST", map[string]string{"guid": keyID})
+				ctx.Set("user_id", userID)
+
+				err := pp.deleteAPIKey(ctx)
+
+				Convey("there should be no error", func() {
+					So(err, ShouldBeNil)
+				})
+			})
+		})
+	})
+}
diff --git a/src/jetstream/auth_test.go b/src/jetstream/auth_test.go
index b7657fbede..f2c72f7cd0 100644
--- a/src/jetstream/auth_test.go
+++ b/src/jetstream/auth_test.go
@@ -784,9 +784,9 @@ func TestVerifySession(t *testing.T) {
 			So(contentType, ShouldEqual, "application/json; charset=UTF-8")
 		})
 
-		var expectedScopes = "\"scopes\":[\"openid\",\"scim.read\",\"cloud_controller.admin\",\"uaa.user\",\"cloud_controller.read\",\"password.write\",\"routing.router_groups.read\",\"cloud_controller.write\",\"doppler.firehose\",\"scim.write\"]"
+		var expectedScopes = `"scopes":["openid","scim.read","cloud_controller.admin","uaa.user","cloud_controller.read","password.write","routing.router_groups.read","cloud_controller.write","doppler.firehose","scim.write"]`
 
-		var expectedBody = "{\"version\":{\"proxy_version\":\"dev\",\"database_version\":20161117141922},\"user\":{\"guid\":\"asd-gjfg-bob\",\"name\":\"admin\",\"admin\":false," + expectedScopes + "},\"endpoints\":{\"cf\":{}},\"plugins\":null,\"config\":{\"enableTechPreview\":false}}"
+		var expectedBody = `{"version":{"proxy_version":"dev","database_version":20161117141922},"user":{"guid":"asd-gjfg-bob","name":"admin","admin":false,` + expectedScopes + `},"endpoints":{"cf":{}},"plugins":null,"config":{"enableTechPreview":false,"APIKeysEnabled":"admin_only"}}`
 
 		Convey("Should contain expected body", func() {
 			So(res, ShouldNotBeNil)
diff --git a/src/jetstream/config.dev b/src/jetstream/config.dev
index 9b98a9b21b..27ec166bf3 100644
--- a/src/jetstream/config.dev
+++ b/src/jetstream/config.dev
@@ -54,5 +54,8 @@ LOCAL_USER=admin
 LOCAL_USER_PASSWORD=admin
 LOCAL_USER_SCOPE=stratos.admin
 
+# Enable/disable API key-based access to Stratos API (disabled, admin_only, all_users). Default is admin_only
+#API_KEYS_ENABLED=admin_only
+
 # Cache folder for Helm Charts
 HELM_CACHE_FOLDER=./.helm-cache
diff --git a/src/jetstream/datastore/20200814140918_ApiKeys.go b/src/jetstream/datastore/20200814140918_ApiKeys.go
new file mode 100644
index 0000000000..2a00b44365
--- /dev/null
+++ b/src/jetstream/datastore/20200814140918_ApiKeys.go
@@ -0,0 +1,22 @@
+package datastore
+
+import (
+	"database/sql"
+
+	"bitbucket.org/liamstask/goose/lib/goose"
+)
+
+func init() {
+	RegisterMigration(20200814140918, "ApiKeys", func(txn *sql.Tx, conf *goose.DBConf) error {
+		apiTokenTable := "CREATE TABLE IF NOT EXISTS api_keys ("
+		apiTokenTable += "guid            VARCHAR(36) NOT NULL UNIQUE,"
+		apiTokenTable += "secret          VARCHAR(36) NOT NULL UNIQUE,"
+		apiTokenTable += "user_guid       VARCHAR(36) NOT NULL,"
+		apiTokenTable += "comment         VARCHAR(255) NOT NULL,"
+		apiTokenTable += "last_used       TIMESTAMP,"
+		apiTokenTable += "PRIMARY KEY (guid) );"
+
+		_, err := txn.Exec(apiTokenTable)
+		return err
+	})
+}
diff --git a/src/jetstream/go.mod b/src/jetstream/go.mod
index 9c59189023..4ca6a15bdc 100644
--- a/src/jetstream/go.mod
+++ b/src/jetstream/go.mod
@@ -35,6 +35,7 @@ require (
 	github.com/elazarl/goproxy/ext v0.0.0-20200315184450-1f3cb6622dad // indirect
 	github.com/fatih/color v1.7.0 // indirect
 	github.com/go-sql-driver/mysql v1.5.0
+	github.com/golang/mock v1.2.0
 	github.com/golang/snappy v0.0.1 // indirect
 	github.com/google/go-querystring v1.0.0 // indirect
 	github.com/google/martian v2.1.0+incompatible
diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index 219e52d2ec..32e2f9c513 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -236,6 +236,7 @@ github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tF
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
 github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
+github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
@@ -256,7 +257,10 @@ github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4er
 github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc=
+github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
 github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
@@ -596,6 +600,7 @@ golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190225153610-fe579d43d832/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -654,9 +659,11 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
 gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
diff --git a/src/jetstream/info.go b/src/jetstream/info.go
index 2000460cc5..0c4cef7d57 100644
--- a/src/jetstream/info.go
+++ b/src/jetstream/info.go
@@ -59,6 +59,7 @@ func (p *portalProxy) getInfo(c echo.Context) (*interfaces.Info, error) {
 	s.Configuration.TechPreview = p.Config.EnableTechPreview
 	s.Configuration.ListMaxSize = p.Config.UIListMaxSize
 	s.Configuration.ListAllowLoadMaxed = p.Config.UIListAllowLoadMaxed
+	s.Configuration.APIKeysEnabled = string(p.Config.APIKeysEnabled)
 
 	// Only add diagnostics information if the user is an admin
 	if uaaUser.Admin {
diff --git a/src/jetstream/main.go b/src/jetstream/main.go
index 955f6f0000..fcacdf4cdf 100644
--- a/src/jetstream/main.go
+++ b/src/jetstream/main.go
@@ -37,6 +37,7 @@ import (
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/crypto"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/apikeys"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/cnsis"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/console_config"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
@@ -178,6 +179,7 @@ func main() {
 	console_config.InitRepositoryProvider(dc.DatabaseProvider)
 	localusers.InitRepositoryProvider(dc.DatabaseProvider)
 	sessiondata.InitRepositoryProvider(dc.DatabaseProvider)
+	apikeys.InitRepositoryProvider(dc.DatabaseProvider)
 
 	// Establish a Postgresql connection pool
 	databaseConnectionPool, migratorConf, err := initConnPool(dc, envLookup)
@@ -657,6 +659,12 @@ func newPortalProxy(pc interfaces.PortalConfig, dcp *sql.DB, ss HttpSessionStore
 
 	log.Infof("Session Cookie name: %s", cookieName)
 
+	// Setting default value for APIKeysEnabled
+	if pc.APIKeysEnabled == "" {
+		log.Debug(`APIKeysEnabled not set, setting to "admin_only"`)
+		pc.APIKeysEnabled = config.APIKeysConfigEnum.AdminOnly
+	}
+
 	pp := &portalProxy{
 		Config:                 pc,
 		DatabaseConnectionPool: dcp,
@@ -681,6 +689,12 @@ func newPortalProxy(pc interfaces.PortalConfig, dcp *sql.DB, ss HttpSessionStore
 		Handler: pp.DoOidcFlowRequest,
 	})
 
+	var err error
+	pp.APIKeysRepository, err = apikeys.NewPgsqlAPIKeysRepository(pp.DatabaseConnectionPool)
+	if err != nil {
+		panic(fmt.Errorf("Can't initialize APIKeysRepository: %v", err))
+	}
+
 	return pp
 }
 
@@ -905,8 +919,19 @@ func (p *portalProxy) registerRoutes(e *echo.Echo, needSetupMiddleware bool) {
 
 	// All routes in the session group need the user to be authenticated
 	sessionGroup := pp.Group("/v1")
-	sessionGroup.Use(p.sessionMiddleware)
-	sessionGroup.Use(p.xsrfMiddleware)
+	sessionGroup.Use(p.sessionMiddleware())
+	sessionGroup.Use(p.xsrfMiddleware())
+
+	sessionGroup.POST("/api_keys", p.addAPIKey)
+	sessionGroup.GET("/api_keys", p.listAPIKeys)
+	sessionGroup.DELETE("/api_keys", p.deleteAPIKey)
+
+	apiKeyGroupConfig := MiddlewareConfig{Skipper: p.apiKeySkipper}
+
+	apiKeyGroup := pp.Group("/v1")
+	apiKeyGroup.Use(p.apiKeyMiddleware)
+	apiKeyGroup.Use(p.sessionMiddlewareWithConfig(apiKeyGroupConfig))
+	apiKeyGroup.Use(p.xsrfMiddlewareWithConfig(apiKeyGroupConfig))
 
 	for _, plugin := range p.Plugins {
 		middlewarePlugin, err := plugin.GetMiddlewarePlugin()
@@ -932,8 +957,8 @@ func (p *portalProxy) registerRoutes(e *echo.Echo, needSetupMiddleware bool) {
 	sessionAuthGroup.GET("/session/verify", p.verifySession)
 
 	// CNSI operations
-	sessionGroup.GET("/cnsis", p.listCNSIs)
-	sessionGroup.GET("/cnsis/registered", p.listRegisteredCNSIs)
+	apiKeyGroup.GET("/cnsis", p.listCNSIs)
+	apiKeyGroup.GET("/cnsis/registered", p.listRegisteredCNSIs)
 
 	// Info
 	sessionGroup.GET("/info", p.info)
diff --git a/src/jetstream/middleware.go b/src/jetstream/middleware.go
index 723ed2ad49..446677f225 100644
--- a/src/jetstream/middleware.go
+++ b/src/jetstream/middleware.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"crypto/subtle"
+	"database/sql"
 	"errors"
 	"fmt"
 	"net/http"
@@ -15,6 +16,7 @@ import (
 	log "github.com/sirupsen/logrus"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces/config"
 )
 
 const cfSessionCookieName = "JSESSIONID"
@@ -28,6 +30,15 @@ const StratosSSOHeader = "x-stratos-sso-login"
 // Header to communicate any error during SSO
 const StratosSSOErrorHeader = "x-stratos-sso-error"
 
+// APIKeySkipperContextKey - name of a context key that indicates that valid API key was supplied
+const APIKeySkipperContextKey = "valid_api_key"
+
+// APIKeyHeader - API key authentication header name
+const APIKeyHeader = "Authentication"
+
+// APIKeyAuthScheme - API key authentication scheme
+const APIKeyAuthScheme = "Bearer"
+
 func handleSessionError(config interfaces.PortalConfig, c echo.Context, err error, doNotLog bool, msg string) error {
 	log.Debug("handleSessionError")
 
@@ -65,75 +76,118 @@ func handleSessionError(config interfaces.PortalConfig, c echo.Context, err erro
 	)
 }
 
-func (p *portalProxy) sessionMiddleware(h echo.HandlerFunc) echo.HandlerFunc {
-	return func(c echo.Context) error {
-		log.Debug("sessionMiddleware")
+type (
+	// Skipper - skipper function for middlewares
+	Skipper func(echo.Context) bool
 
-		p.removeEmptyCookie(c)
+	// MiddlewareConfig defines the config for the middleware.
+	MiddlewareConfig struct {
+		// Skipper defines a function to skip middleware.
+		Skipper Skipper
+	}
+)
 
-		userID, err := p.GetSessionValue(c, "user_id")
-		if err == nil {
-			c.Set("user_id", userID)
-			return h(c)
-		}
+func (p *portalProxy) sessionMiddleware() echo.MiddlewareFunc {
 
-		// Don't log an error if we are verifying the session, as a failure is not an error
-		isVerify := strings.HasSuffix(c.Request().RequestURI, "/auth/session/verify")
-		if isVerify {
-			// Tell the frontend what the Cookie Domain is so it can check if sessions will work
-			c.Response().Header().Set(StratosDomainHeader, p.Config.CookieDomain)
-		}
+	return p.sessionMiddlewareWithConfig(MiddlewareConfig{})
+}
 
-		// Clear any session cookie
-		cookie := new(http.Cookie)
-		cookie.Name = p.SessionCookieName
-		cookie.Value = ""
-		cookie.Expires = time.Now().Add(-24 * time.Hour)
-		cookie.Domain = p.SessionStoreOptions.Domain
-		cookie.HttpOnly = p.SessionStoreOptions.HttpOnly
-		cookie.Secure = p.SessionStoreOptions.Secure
-		cookie.Path = p.SessionStoreOptions.Path
-		cookie.MaxAge = 0
-		c.SetCookie(cookie)
-
-		return handleSessionError(p.Config, c, err, isVerify, "User session could not be found")
+func (p *portalProxy) sessionMiddlewareWithConfig(config MiddlewareConfig) echo.MiddlewareFunc {
+	// Default skipper function always returns false
+	if config.Skipper == nil {
+		config.Skipper = func(c echo.Context) bool { return false }
 	}
-}
 
-// Support for Angular XSRF
-func (p *portalProxy) xsrfMiddleware(h echo.HandlerFunc) echo.HandlerFunc {
-	return func(c echo.Context) error {
-		log.Debug("xsrfMiddleware")
+	return func(h echo.HandlerFunc) echo.HandlerFunc {
+		return func(c echo.Context) error {
+			log.Debug("sessionMiddleware")
 
-		// Only do this for mutating requests - i.e. we can ignore for GET or HEAD requests
-		if c.Request().Method == "GET" || c.Request().Method == "HEAD" {
-			return h(c)
-		}
+			if config.Skipper(c) {
+				log.Debug("Skipping sessionMiddleware")
+				return h(c)
+			}
 
-		// Routes registered with /apps are assumed to be web apps that do their own XSRF
-		if strings.HasPrefix(c.Request().URL.String(), "/pp/v1/apps/") {
-			return h(c)
+			p.removeEmptyCookie(c)
+
+			userID, err := p.GetSessionValue(c, "user_id")
+			if err == nil {
+				c.Set("user_id", userID)
+				return h(c)
+			}
+
+			// Don't log an error if we are verifying the session, as a failure is not an error
+			isVerify := strings.HasSuffix(c.Request().RequestURI, "/auth/session/verify")
+			if isVerify {
+				// Tell the frontend what the Cookie Domain is so it can check if sessions will work
+				c.Response().Header().Set(StratosDomainHeader, p.Config.CookieDomain)
+			}
+
+			// Clear any session cookie
+			cookie := new(http.Cookie)
+			cookie.Name = p.SessionCookieName
+			cookie.Value = ""
+			cookie.Expires = time.Now().Add(-24 * time.Hour)
+			cookie.Domain = p.SessionStoreOptions.Domain
+			cookie.HttpOnly = p.SessionStoreOptions.HttpOnly
+			cookie.Secure = p.SessionStoreOptions.Secure
+			cookie.Path = p.SessionStoreOptions.Path
+			cookie.MaxAge = 0
+			c.SetCookie(cookie)
+
+			return handleSessionError(p.Config, c, err, isVerify, "User session could not be found")
 		}
+	}
+}
 
-		errMsg := "Failed to get stored XSRF token from user session"
-		token, err := p.GetSessionStringValue(c, XSRFTokenSessionName)
-		if err == nil {
-			// Check the token against the header
-			requestToken := c.Request().Header.Get(XSRFTokenHeader)
-			if len(requestToken) > 0 {
-				if compareTokens(requestToken, token) {
-					return h(c)
+func (p *portalProxy) xsrfMiddleware() echo.MiddlewareFunc {
+	return p.xsrfMiddlewareWithConfig(MiddlewareConfig{})
+}
+
+func (p *portalProxy) xsrfMiddlewareWithConfig(config MiddlewareConfig) echo.MiddlewareFunc {
+	// Default skipper function always returns false
+	if config.Skipper == nil {
+		config.Skipper = func(c echo.Context) bool { return false }
+	}
+
+	return func(h echo.HandlerFunc) echo.HandlerFunc {
+		return func(c echo.Context) error {
+			log.Debug("xsrfMiddleware")
+
+			if config.Skipper(c) {
+				log.Debug("Skipping xsrfMiddleware")
+				return h(c)
+			}
+
+			// Only do this for mutating requests - i.e. we can ignore for GET or HEAD requests
+			if c.Request().Method == "GET" || c.Request().Method == "HEAD" {
+				return h(c)
+			}
+
+			// Routes registered with /apps are assumed to be web apps that do their own XSRF
+			if strings.HasPrefix(c.Request().URL.String(), "/pp/v1/apps/") {
+				return h(c)
+			}
+
+			errMsg := "Failed to get stored XSRF token from user session"
+			token, err := p.GetSessionStringValue(c, XSRFTokenSessionName)
+			if err == nil {
+				// Check the token against the header
+				requestToken := c.Request().Header.Get(XSRFTokenHeader)
+				if len(requestToken) > 0 {
+					if compareTokens(requestToken, token) {
+						return h(c)
+					}
+					errMsg = "Supplied XSRF Token does not match"
+				} else {
+					errMsg = "XSRF Token was not supplied in the header"
 				}
-				errMsg = "Supplied XSRF Token does not match"
-			} else {
-				errMsg = "XSRF Token was not supplied in the header"
 			}
+			return interfaces.NewHTTPShadowError(
+				http.StatusUnauthorized,
+				"XSRF Token could not be found or does not match",
+				"XSRF Token error: %s", errMsg,
+			)
 		}
-		return interfaces.NewHTTPShadowError(
-			http.StatusUnauthorized,
-			"XSRF Token could not be found or does not match",
-			"XSRF Token error: %s", errMsg,
-		)
 	}
 }
 
@@ -254,3 +308,77 @@ func retryAfterUpgradeMiddleware(h echo.HandlerFunc, env *env.VarSet) echo.Handl
 		return h(c)
 	}
 }
+
+func getAPIKeyFromHeader(c echo.Context) (string, error) {
+	header := c.Request().Header.Get(APIKeyHeader)
+
+	l := len(APIKeyAuthScheme)
+	if len(header) > l+1 && header[:l] == APIKeyAuthScheme {
+		return header[l+1:], nil
+	}
+
+	return "", errors.New("No API key in the header")
+}
+
+func (p *portalProxy) apiKeyMiddleware(h echo.HandlerFunc) echo.HandlerFunc {
+	return func(c echo.Context) error {
+		log.Debug("apiKeyMiddleware")
+
+		// skipping thise middleware if API keys are disabled
+		if p.Config.APIKeysEnabled == config.APIKeysConfigEnum.Disabled {
+			log.Debugf("apiKeyMiddleware: API keys are disabled, skipping")
+			return h(c)
+		}
+
+		apiKeySecret, err := getAPIKeyFromHeader(c)
+		if err != nil {
+			log.Debugf("apiKeyMiddleware: %v", err)
+			return h(c)
+		}
+
+		apiKey, err := p.APIKeysRepository.GetAPIKeyBySecret(apiKeySecret)
+		if err != nil {
+			switch {
+			case err == sql.ErrNoRows:
+				log.Debug("apiKeyMiddleware: Invalid API key supplied")
+			default:
+				log.Errorf("apiKeyMiddleware: %v", err)
+			}
+
+			return h(c)
+		}
+
+		// checking if user is an admin if API keys are enabled for admins only
+		if p.Config.APIKeysEnabled == config.APIKeysConfigEnum.AdminOnly {
+			user, err := p.StratosAuthService.GetUser(apiKey.UserGUID)
+			if err != nil {
+				log.Errorf("apiKeyMiddleware: %v", err)
+				return h(c)
+			}
+
+			if !user.Admin {
+				log.Debugf("apiKeyMiddleware: user isn't admin, skipping")
+				return h(c)
+			}
+		}
+
+		c.Set(APIKeySkipperContextKey, true)
+		c.Set("user_id", apiKey.UserGUID)
+
+		// some endpoints check not only the context store, but also the contents of the session store
+		sessionValues := make(map[string]interface{})
+		sessionValues["user_id"] = apiKey.UserGUID
+		p.setSessionValues(c, sessionValues)
+
+		err = p.APIKeysRepository.UpdateAPIKeyLastUsed(apiKey.GUID)
+		if err != nil {
+			log.Errorf("apiKeyMiddleware: %v", err)
+		}
+
+		return h(c)
+	}
+}
+
+func (p *portalProxy) apiKeySkipper(c echo.Context) bool {
+	return c.Get(APIKeySkipperContextKey) != nil && c.Get(APIKeySkipperContextKey).(bool) == true
+}
diff --git a/src/jetstream/middleware_test.go b/src/jetstream/middleware_test.go
new file mode 100644
index 0000000000..4a64895137
--- /dev/null
+++ b/src/jetstream/middleware_test.go
@@ -0,0 +1,378 @@
+package main
+
+import (
+	"database/sql"
+	"errors"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/apikeys"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces/config"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/mock_interfaces"
+	"github.com/golang/mock/gomock"
+	"github.com/labstack/echo"
+	log "github.com/sirupsen/logrus"
+	. "github.com/smartystreets/goconvey/convey"
+	sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1"
+)
+
+func makeMockServer(apiKeysRepo apikeys.Repository, mockStratosAuth interfaces.StratosAuth) *portalProxy {
+	db, _, dberr := sqlmock.New()
+	if dberr != nil {
+		log.Panicf("an error '%s' was not expected when opening a stub database connection", dberr)
+	}
+
+	pp := setupPortalProxy(db)
+	pp.DatabaseConnectionPool = db
+	pp.APIKeysRepository = apiKeysRepo
+	pp.StratosAuthService = mockStratosAuth
+
+	return pp
+}
+
+func makeNewRequest() (echo.Context, *httptest.ResponseRecorder) {
+	req := setupMockReq("GET", "", map[string]string{})
+	rec := httptest.NewRecorder()
+	e := echo.New()
+	ctx := e.NewContext(req, rec)
+
+	return ctx, rec
+}
+
+func makeNewRequestWithParams(httpVerb string, formValues map[string]string) (echo.Context, *httptest.ResponseRecorder) {
+	req := setupMockReq(httpVerb, "", formValues)
+	rec := httptest.NewRecorder()
+	e := echo.New()
+	ctx := e.NewContext(req, rec)
+
+	return ctx, rec
+}
+
+func Test_apiKeyMiddleware(t *testing.T) {
+	t.Parallel()
+
+	// disabling logging noise
+	log.SetLevel(log.PanicLevel)
+
+	ctrl := gomock.NewController(t)
+	mockAPIRepo := apikeys.NewMockRepository(ctrl)
+	mockStratosAuth := mock_interfaces.NewMockStratosAuth(ctrl)
+	pp := makeMockServer(mockAPIRepo, mockStratosAuth)
+	defer ctrl.Finish()
+	defer pp.DatabaseConnectionPool.Close()
+
+	handlerFunc := func(c echo.Context) error {
+		return c.String(http.StatusOK, "test")
+	}
+
+	middleware := pp.apiKeyMiddleware(handlerFunc)
+	apiKeySecret := "SecretMcSecretface"
+
+	Convey("when API keys are enabled for all users", t, func() {
+		pp.Config.APIKeysEnabled = config.APIKeysConfigEnum.AllUsers
+
+		Convey("when headers are present", func() {
+			Convey("when schema other than Bearer is used", func() {
+				ctx, rec := makeNewRequest()
+				ctx.Request().Header.Add("Authentication", "JWT "+apiKeySecret)
+
+				err := middleware(ctx)
+
+				Convey("should not set user_id in the context", func() {
+					So(ctx.Get("user_id"), ShouldBeNil)
+				})
+
+				Convey("should not set skip flag in the context", func() {
+					So(ctx.Get(APIKeySkipperContextKey), ShouldBeNil)
+				})
+
+				Convey("request should be successful", func() {
+					So(err, ShouldBeNil)
+					So(rec.Code, ShouldEqual, 200)
+					So(rec.Body.String(), ShouldEqual, "test")
+				})
+			})
+
+			Convey("when Bearer schema is used", func() {
+				Convey("when no matching key is found", func() {
+					ctx, rec := makeNewRequest()
+					ctx.Request().Header.Add("Authentication", "Bearer "+apiKeySecret)
+
+					mockAPIRepo.
+						EXPECT().
+						GetAPIKeyBySecret(gomock.Eq(apiKeySecret)).
+						Return(nil, sql.ErrNoRows)
+
+					err := middleware(ctx)
+
+					Convey("should not set user_id in the context", func() {
+						So(ctx.Get("user_id"), ShouldBeNil)
+					})
+
+					Convey("should not set skip flag in the context", func() {
+						So(ctx.Get(APIKeySkipperContextKey), ShouldBeNil)
+					})
+
+					Convey("request should be successful", func() {
+						So(err, ShouldBeNil)
+						So(rec.Code, ShouldEqual, 200)
+						So(rec.Body.String(), ShouldEqual, "test")
+					})
+				})
+
+				Convey("when APIKeysRepository returns an error", func() {
+					ctx, rec := makeNewRequest()
+					ctx.Request().Header.Add("Authentication", "Bearer "+apiKeySecret)
+
+					mockAPIRepo.
+						EXPECT().
+						GetAPIKeyBySecret(gomock.Eq(apiKeySecret)).
+						Return(nil, errors.New("Something went wrong"))
+
+					err := middleware(ctx)
+
+					Convey("should not set user_id in the context", func() {
+						So(ctx.Get("user_id"), ShouldBeNil)
+					})
+
+					Convey("should not set skip flag in the context", func() {
+						So(ctx.Get(APIKeySkipperContextKey), ShouldBeNil)
+					})
+
+					Convey("request should be successful", func() {
+						So(err, ShouldBeNil)
+						So(rec.Code, ShouldEqual, 200)
+						So(rec.Body.String(), ShouldEqual, "test")
+					})
+				})
+
+				Convey("when a matching key is found", func() {
+					ctx, rec := makeNewRequest()
+					ctx.Request().Header.Add("Authentication", "Bearer "+apiKeySecret)
+
+					apiKey := &interfaces.APIKey{
+						UserGUID: "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+						GUID:     "00000000-0000-0000-0000-000000000000",
+					}
+
+					mockAPIRepo.
+						EXPECT().
+						GetAPIKeyBySecret(gomock.Eq(apiKeySecret)).
+						Return(apiKey, nil)
+
+					mockAPIRepo.
+						EXPECT().
+						UpdateAPIKeyLastUsed(gomock.Eq(apiKey.GUID)).
+						Return(nil)
+
+					err := middleware(ctx)
+
+					Convey("should set user_id in the context", func() {
+						So(ctx.Get("user_id"), ShouldEqual, apiKey.UserGUID)
+					})
+
+					Convey("should set skip flag in the context", func() {
+						So(ctx.Get(APIKeySkipperContextKey), ShouldBeTrue)
+					})
+
+					Convey("request should be successful", func() {
+						So(err, ShouldBeNil)
+						So(rec.Code, ShouldEqual, 200)
+						So(rec.Body.String(), ShouldEqual, "test")
+					})
+				})
+
+				Convey("when a matching key is found, but last_used can't be updated", func() {
+					ctx, rec := makeNewRequest()
+					ctx.Request().Header.Add("Authentication", "Bearer "+apiKeySecret)
+
+					apiKey := &interfaces.APIKey{
+						UserGUID: "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+						GUID:     "00000000-0000-0000-0000-000000000000",
+					}
+
+					mockAPIRepo.
+						EXPECT().
+						GetAPIKeyBySecret(gomock.Eq(apiKeySecret)).
+						Return(apiKey, nil)
+
+					mockAPIRepo.
+						EXPECT().
+						UpdateAPIKeyLastUsed(gomock.Eq(apiKey.GUID)).
+						Return(errors.New("Something went wrong"))
+
+					err := middleware(ctx)
+
+					Convey("should set user_id in the context", func() {
+						So(ctx.Get("user_id"), ShouldEqual, apiKey.UserGUID)
+					})
+
+					Convey("should set skip flag in the context", func() {
+						So(ctx.Get(APIKeySkipperContextKey), ShouldBeTrue)
+					})
+
+					Convey("request should be successful", func() {
+						So(err, ShouldBeNil)
+						So(rec.Code, ShouldEqual, 200)
+						So(rec.Body.String(), ShouldEqual, "test")
+					})
+				})
+
+			})
+		})
+	})
+
+	Convey("when API keys are enabled for all admins only", t, func() {
+		pp.Config.APIKeysEnabled = config.APIKeysConfigEnum.AdminOnly
+
+		Convey("when a matching key belongs a non-admin user", func() {
+			ctx, rec := makeNewRequest()
+			ctx.Request().Header.Add("Authentication", "Bearer "+apiKeySecret)
+
+			apiKey := &interfaces.APIKey{
+				UserGUID: "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+				GUID:     "00000000-0000-0000-0000-000000000000",
+			}
+
+			connectedUser := &interfaces.ConnectedUser{
+				GUID:  apiKey.UserGUID,
+				Admin: false,
+			}
+
+			mockAPIRepo.
+				EXPECT().
+				GetAPIKeyBySecret(gomock.Eq(apiKeySecret)).
+				Return(apiKey, nil)
+
+			mockStratosAuth.
+				EXPECT().
+				GetUser(gomock.Eq(apiKey.UserGUID)).
+				Return(connectedUser, nil)
+
+			err := middleware(ctx)
+
+			Convey("should not set user_id in the context", func() {
+				So(ctx.Get("user_id"), ShouldBeNil)
+			})
+
+			Convey("should not set skip flag in the context", func() {
+				So(ctx.Get(APIKeySkipperContextKey), ShouldBeNil)
+			})
+
+			Convey("request should be successful", func() {
+				So(err, ShouldBeNil)
+				So(rec.Code, ShouldEqual, 200)
+				So(rec.Body.String(), ShouldEqual, "test")
+			})
+		})
+
+		Convey("when a matching key belongs an admin user", func() {
+			ctx, rec := makeNewRequest()
+			ctx.Request().Header.Add("Authentication", "Bearer "+apiKeySecret)
+
+			apiKey := &interfaces.APIKey{
+				UserGUID: "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+				GUID:     "00000000-0000-0000-0000-000000000000",
+			}
+
+			connectedUser := &interfaces.ConnectedUser{
+				GUID:  apiKey.UserGUID,
+				Admin: true,
+			}
+
+			mockAPIRepo.
+				EXPECT().
+				GetAPIKeyBySecret(gomock.Eq(apiKeySecret)).
+				Return(apiKey, nil)
+
+			mockAPIRepo.
+				EXPECT().
+				UpdateAPIKeyLastUsed(gomock.Eq(apiKey.GUID)).
+				Return(nil)
+
+			mockStratosAuth.
+				EXPECT().
+				GetUser(gomock.Eq(apiKey.UserGUID)).
+				Return(connectedUser, nil)
+
+			err := middleware(ctx)
+
+			Convey("should set user_id in the context", func() {
+				So(ctx.Get("user_id"), ShouldEqual, apiKey.UserGUID)
+			})
+
+			Convey("should set skip flag in the context", func() {
+				So(ctx.Get(APIKeySkipperContextKey), ShouldBeTrue)
+			})
+
+			Convey("request should be successful", func() {
+				So(err, ShouldBeNil)
+				So(rec.Code, ShouldEqual, 200)
+				So(rec.Body.String(), ShouldEqual, "test")
+			})
+		})
+
+		Convey("when StratosAuth.GetUser returns an error", func() {
+			ctx, rec := makeNewRequest()
+			ctx.Request().Header.Add("Authentication", "Bearer "+apiKeySecret)
+
+			apiKey := &interfaces.APIKey{
+				UserGUID: "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+				GUID:     "00000000-0000-0000-0000-000000000000",
+			}
+
+			mockAPIRepo.
+				EXPECT().
+				GetAPIKeyBySecret(gomock.Eq(apiKeySecret)).
+				Return(apiKey, nil)
+
+			mockStratosAuth.
+				EXPECT().
+				GetUser(gomock.Eq(apiKey.UserGUID)).
+				Return(nil, errors.New("Something went wrong"))
+
+			err := middleware(ctx)
+
+			Convey("should not set user_id in the context", func() {
+				So(ctx.Get("user_id"), ShouldBeNil)
+			})
+
+			Convey("should not set skip flag in the context", func() {
+				So(ctx.Get(APIKeySkipperContextKey), ShouldBeNil)
+			})
+
+			Convey("request should be successful", func() {
+				So(err, ShouldBeNil)
+				So(rec.Code, ShouldEqual, 200)
+				So(rec.Body.String(), ShouldEqual, "test")
+			})
+		})
+	})
+
+	Convey("when API keys are disabled", t, func() {
+		pp.Config.APIKeysEnabled = config.APIKeysConfigEnum.Disabled
+
+		Convey("when an API key header is supplied", func() {
+			ctx, rec := makeNewRequest()
+			ctx.Request().Header.Add("Authentication", "Bearer "+apiKeySecret)
+
+			err := middleware(ctx)
+
+			Convey("should not set user_id in the context", func() {
+				So(ctx.Get("user_id"), ShouldBeNil)
+			})
+
+			Convey("should not set skip flag in the context", func() {
+				So(ctx.Get(APIKeySkipperContextKey), ShouldBeNil)
+			})
+
+			Convey("request should be successful", func() {
+				So(err, ShouldBeNil)
+				So(rec.Code, ShouldEqual, 200)
+				So(rec.Body.String(), ShouldEqual, "test")
+			})
+		})
+	})
+}
diff --git a/src/jetstream/plugins/metrics/main.go b/src/jetstream/plugins/metrics/main.go
index 535e52706d..ac3bb7e7f1 100644
--- a/src/jetstream/plugins/metrics/main.go
+++ b/src/jetstream/plugins/metrics/main.go
@@ -388,7 +388,11 @@ 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
+
+	aPath := trimPath(ua.Path)
+	bPath := trimPath(ub.Path)
+
+	return ua.Scheme == ub.Scheme && ua.Hostname() == ub.Hostname() && aPort == bPort && aPath == bPath
 }
 
 func getPort(u *url.URL) string {
@@ -407,6 +411,13 @@ func getPort(u *url.URL) string {
 	return port
 }
 
+func trimPath(path string) string {
+	if strings.HasSuffix(path, "/") {
+		return path[:len(path)-1]
+	}
+	return path
+}
+
 func (m *MetricsSpecification) getMetricsEndpoints(userGUID string, cnsiList []string) (map[string]EndpointMetricsRelation, error) {
 
 	metricsProviders := make([]MetricsMetadata, 0)
diff --git a/src/jetstream/plugins/metrics/main_test.go b/src/jetstream/plugins/metrics/main_test.go
index 7b57d89cab..d02b5d80aa 100644
--- a/src/jetstream/plugins/metrics/main_test.go
+++ b/src/jetstream/plugins/metrics/main_test.go
@@ -23,6 +23,9 @@ func TestUrlComparision(t *testing.T) {
 		So(compareURL("http://test.com/a", "http://test.com/a"), ShouldBeTrue)
 		So(compareURL("http://test.com/a?one=two", "http://test.com/a?two=one"), ShouldBeTrue)
 
+		// Should ignore trailing slashes
+		So(compareURL("http://test.com/", "http://test.com"), ShouldBeTrue)
+
 	})
 
 }
diff --git a/src/jetstream/portal_proxy.go b/src/jetstream/portal_proxy.go
index 7ed43b1022..4dc8ead88b 100644
--- a/src/jetstream/portal_proxy.go
+++ b/src/jetstream/portal_proxy.go
@@ -5,6 +5,7 @@ import (
 	"regexp"
 	"time"
 
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/apikeys"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	"github.com/gorilla/sessions"
 	"github.com/govau/cf-common/env"
@@ -24,6 +25,7 @@ type portalProxy struct {
 	AuthProviders          map[string]interfaces.AuthProvider
 	env                    *env.VarSet
 	StratosAuthService     interfaces.StratosAuth
+	APIKeysRepository      apikeys.Repository
 }
 
 // HttpSessionStore - Interface for a store that can manage HTTP Sessions
diff --git a/src/jetstream/repository/apikeys/apikeys.go b/src/jetstream/repository/apikeys/apikeys.go
new file mode 100644
index 0000000000..bf783990a0
--- /dev/null
+++ b/src/jetstream/repository/apikeys/apikeys.go
@@ -0,0 +1,12 @@
+package apikeys
+
+import "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+
+// Repository - API keys repository
+type Repository interface {
+	AddAPIKey(userID string, comment string) (*interfaces.APIKey, error)
+	GetAPIKeyBySecret(keySecret string) (*interfaces.APIKey, error)
+	ListAPIKeys(userID string) ([]interfaces.APIKey, error)
+	DeleteAPIKey(userGUID string, keyGUID string) error
+	UpdateAPIKeyLastUsed(keyGUID string) error
+}
diff --git a/src/jetstream/repository/apikeys/mock_apikeys.go b/src/jetstream/repository/apikeys/mock_apikeys.go
new file mode 100644
index 0000000000..d507eb5991
--- /dev/null
+++ b/src/jetstream/repository/apikeys/mock_apikeys.go
@@ -0,0 +1,107 @@
+// Code generated by MockGen. DO NOT EDIT.
+// Source: apikeys.go
+
+// Package apikeys is a generated GoMock package.
+package apikeys
+
+import (
+	interfaces "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	gomock "github.com/golang/mock/gomock"
+	reflect "reflect"
+)
+
+// MockRepository is a mock of Repository interface
+type MockRepository struct {
+	ctrl     *gomock.Controller
+	recorder *MockRepositoryMockRecorder
+}
+
+// MockRepositoryMockRecorder is the mock recorder for MockRepository
+type MockRepositoryMockRecorder struct {
+	mock *MockRepository
+}
+
+// NewMockRepository creates a new mock instance
+func NewMockRepository(ctrl *gomock.Controller) *MockRepository {
+	mock := &MockRepository{ctrl: ctrl}
+	mock.recorder = &MockRepositoryMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use
+func (m *MockRepository) EXPECT() *MockRepositoryMockRecorder {
+	return m.recorder
+}
+
+// AddAPIKey mocks base method
+func (m *MockRepository) AddAPIKey(userID, comment string) (*interfaces.APIKey, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "AddAPIKey", userID, comment)
+	ret0, _ := ret[0].(*interfaces.APIKey)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// AddAPIKey indicates an expected call of AddAPIKey
+func (mr *MockRepositoryMockRecorder) AddAPIKey(userID, comment interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddAPIKey", reflect.TypeOf((*MockRepository)(nil).AddAPIKey), userID, comment)
+}
+
+// GetAPIKeyBySecret mocks base method
+func (m *MockRepository) GetAPIKeyBySecret(keySecret string) (*interfaces.APIKey, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetAPIKeyBySecret", keySecret)
+	ret0, _ := ret[0].(*interfaces.APIKey)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// GetAPIKeyBySecret indicates an expected call of GetAPIKeyBySecret
+func (mr *MockRepositoryMockRecorder) GetAPIKeyBySecret(keySecret interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAPIKeyBySecret", reflect.TypeOf((*MockRepository)(nil).GetAPIKeyBySecret), keySecret)
+}
+
+// ListAPIKeys mocks base method
+func (m *MockRepository) ListAPIKeys(userID string) ([]interfaces.APIKey, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "ListAPIKeys", userID)
+	ret0, _ := ret[0].([]interfaces.APIKey)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// ListAPIKeys indicates an expected call of ListAPIKeys
+func (mr *MockRepositoryMockRecorder) ListAPIKeys(userID interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListAPIKeys", reflect.TypeOf((*MockRepository)(nil).ListAPIKeys), userID)
+}
+
+// DeleteAPIKey mocks base method
+func (m *MockRepository) DeleteAPIKey(userGUID, keyGUID string) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "DeleteAPIKey", userGUID, keyGUID)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// DeleteAPIKey indicates an expected call of DeleteAPIKey
+func (mr *MockRepositoryMockRecorder) DeleteAPIKey(userGUID, keyGUID interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAPIKey", reflect.TypeOf((*MockRepository)(nil).DeleteAPIKey), userGUID, keyGUID)
+}
+
+// UpdateAPIKeyLastUsed mocks base method
+func (m *MockRepository) UpdateAPIKeyLastUsed(keyGUID string) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "UpdateAPIKeyLastUsed", keyGUID)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// UpdateAPIKeyLastUsed indicates an expected call of UpdateAPIKeyLastUsed
+func (mr *MockRepositoryMockRecorder) UpdateAPIKeyLastUsed(keyGUID interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateAPIKeyLastUsed", reflect.TypeOf((*MockRepository)(nil).UpdateAPIKeyLastUsed), keyGUID)
+}
diff --git a/src/jetstream/repository/apikeys/psql_apikeys.go b/src/jetstream/repository/apikeys/psql_apikeys.go
new file mode 100644
index 0000000000..8e95327aaa
--- /dev/null
+++ b/src/jetstream/repository/apikeys/psql_apikeys.go
@@ -0,0 +1,184 @@
+package apikeys
+
+import (
+	"database/sql"
+	"encoding/base64"
+	"errors"
+	"fmt"
+	"reflect"
+	"time"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/crypto"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	uuid "github.com/satori/go.uuid"
+	log "github.com/sirupsen/logrus"
+)
+
+var sqlQueries = struct {
+	InsertAPIKey         string
+	GetAPIKeyBySecret    string
+	ListAPIKeys          string
+	DeleteAPIKey         string
+	UpdateAPIKeyLastUsed string
+}{
+	InsertAPIKey:         `INSERT INTO api_keys (guid, secret, user_guid, comment) VALUES ($1, $2, $3, $4)`,
+	GetAPIKeyBySecret:    `SELECT guid, user_guid, comment, last_used FROM api_keys WHERE secret = $1`,
+	ListAPIKeys:          `SELECT guid, user_guid, comment, last_used FROM api_keys WHERE user_guid = $1`,
+	DeleteAPIKey:         `DELETE FROM api_keys WHERE user_guid = $1 AND guid = $2`,
+	UpdateAPIKeyLastUsed: `UPDATE api_keys SET last_used = $1 WHERE guid = $2`,
+}
+
+// PgsqlAPIKeysRepository - Postgresql-backed API keys repository
+type PgsqlAPIKeysRepository struct {
+	db *sql.DB
+}
+
+// NewPgsqlAPIKeysRepository - get a reference to the API keys data source
+func NewPgsqlAPIKeysRepository(dcp *sql.DB) (Repository, error) {
+	log.Debug("NewPgsqlAPIKeysRepository")
+	return &PgsqlAPIKeysRepository{db: dcp}, nil
+}
+
+// InitRepositoryProvider - One time init for the given DB Provider
+func InitRepositoryProvider(databaseProvider string) {
+	// Modify the database statements if needed, for the given database type
+	// Iterating over the struct to ensure that all of the queries are updated
+	v := reflect.ValueOf(sqlQueries)
+	for i := 0; i < v.NumField(); i++ {
+		q := v.Field(i).Interface().(string)
+
+		reflect.
+			ValueOf(&sqlQueries).
+			Elem().
+			FieldByIndex([]int{i}).
+			SetString(
+				datastore.ModifySQLStatement(q, databaseProvider),
+			)
+	}
+}
+
+// AddAPIKey - Add a new API key to the datastore.
+func (p *PgsqlAPIKeysRepository) AddAPIKey(userID string, comment string) (*interfaces.APIKey, error) {
+	log.Debug("AddAPIKey")
+
+	var err error
+
+	// Validate args
+	if len(comment) > 255 {
+		msg := "comment maximum length is 255 characters"
+		log.Debug(msg)
+		err = errors.New(msg)
+	}
+
+	if err != nil {
+		return nil, err
+	}
+
+	randomBytes, err := crypto.GenerateRandomBytes(48)
+	if err != nil {
+		return nil, err
+	}
+
+	keyGUID := uuid.NewV4().String()
+	keySecret := base64.URLEncoding.EncodeToString(randomBytes)
+
+	err = execQuery(p, sqlQueries.InsertAPIKey, keyGUID, keySecret, userID, comment)
+	if err != nil {
+		return nil, fmt.Errorf("AddAPIKey: %v", err)
+	}
+
+	apiKey := &interfaces.APIKey{
+		GUID:     keyGUID,
+		Secret:   keySecret,
+		UserGUID: userID,
+		Comment:  comment,
+	}
+
+	return apiKey, err
+}
+
+// GetAPIKeyBySecret - gets user ID for an API key
+func (p *PgsqlAPIKeysRepository) GetAPIKeyBySecret(keySecret string) (*interfaces.APIKey, error) {
+	log.Debug("GetAPIKeyBySecret")
+
+	var apiKey interfaces.APIKey
+
+	err := p.db.QueryRow(sqlQueries.GetAPIKeyBySecret, keySecret).Scan(
+		&apiKey.GUID,
+		&apiKey.UserGUID,
+		&apiKey.Comment,
+		&apiKey.LastUsed,
+	)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &apiKey, nil
+}
+
+// ListAPIKeys - list API keys for a given user GUID
+func (p *PgsqlAPIKeysRepository) ListAPIKeys(userID string) ([]interfaces.APIKey, error) {
+	log.Debug("ListAPIKeys")
+
+	rows, err := p.db.Query(sqlQueries.ListAPIKeys, userID)
+	if err != nil {
+		log.Errorf("unable to list API keys: %v", err)
+		return nil, err
+	}
+
+	result := []interfaces.APIKey{}
+	for rows.Next() {
+		var apiKey interfaces.APIKey
+		err = rows.Scan(&apiKey.GUID, &apiKey.UserGUID, &apiKey.Comment, &apiKey.LastUsed)
+		if err != nil {
+			log.Errorf("Scan: %v", err)
+			return nil, err
+		}
+		result = append(result, apiKey)
+	}
+
+	return result, nil
+}
+
+// DeleteAPIKey - delete an API key identified by its GUID
+func (p *PgsqlAPIKeysRepository) DeleteAPIKey(userGUID string, keyGUID string) error {
+	log.Debug("DeleteAPIKey")
+
+	err := execQuery(p, sqlQueries.DeleteAPIKey, userGUID, keyGUID)
+	if err != nil {
+		return fmt.Errorf("DeleteAPIKey: %v", err)
+	}
+
+	return nil
+}
+
+// UpdateAPIKeyLastUsed - sets API key last_used field to current time
+func (p *PgsqlAPIKeysRepository) UpdateAPIKeyLastUsed(keyGUID string) error {
+	log.Debug("UpdateAPIKeyLastUsed")
+
+	err := execQuery(p, sqlQueries.UpdateAPIKeyLastUsed, time.Now().UTC(), keyGUID)
+	if err != nil {
+		return fmt.Errorf("UpdateAPIKeyLastUsed: %v", err)
+	}
+
+	return nil
+}
+
+// A wrapper around db.Exec that validates that exactly 1 row has been inserted/deleted/updated
+func execQuery(p *PgsqlAPIKeysRepository, query string, args ...interface{}) error {
+	result, err := p.db.Exec(query, args...)
+	if err != nil {
+		return err
+	}
+
+	rowsUpdates, err := result.RowsAffected()
+	if err != nil {
+		return errors.New("could not determine number of rows that were updated")
+	} else if rowsUpdates < 1 {
+		return errors.New("no rows were updated")
+	}
+
+	return nil
+}
diff --git a/src/jetstream/repository/apikeys/psql_apikeys_test.go b/src/jetstream/repository/apikeys/psql_apikeys_test.go
new file mode 100644
index 0000000000..3534e4619c
--- /dev/null
+++ b/src/jetstream/repository/apikeys/psql_apikeys_test.go
@@ -0,0 +1,339 @@
+package apikeys
+
+import (
+	"errors"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	. "github.com/smartystreets/goconvey/convey"
+	"gopkg.in/DATA-DOG/go-sqlmock.v1"
+)
+
+func TestNewPgsqlAPIKeysRepository(t *testing.T) {
+	Convey("Given a request for a new reference to a API keys Repository", t, func() {
+		db, _, err := sqlmock.New()
+		if err != nil {
+			t.Errorf("an error '%s' was not expected when opening a stub database connection", err)
+		}
+		defer db.Close()
+
+		repository, err := NewPgsqlAPIKeysRepository(db)
+
+		Convey("no error should be returned", func() {
+			So(err, ShouldBeNil)
+		})
+
+		Convey("result should be of valid type", func() {
+			So(repository, ShouldHaveSameTypeAs, &PgsqlAPIKeysRepository{})
+		})
+	})
+}
+
+func TestAddAPIKey(t *testing.T) {
+	var (
+		userID            = "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+		insertIntoAPIKeys = `INSERT INTO api_keys`
+		comment           = "test"
+	)
+
+	Convey("Given a request to add an API key", t, func() {
+		db, mock, err := sqlmock.New()
+		if err != nil {
+			t.Errorf("an error '%s' was not expected when opening a stub database connection", err)
+		}
+		defer db.Close()
+
+		repository, _ := NewPgsqlAPIKeysRepository(db)
+
+		Convey("when the comment exceeds maximal length", func() {
+			_, err := repository.AddAPIKey(userID, strings.Repeat("a", 256))
+
+			Convey("an error should be returned", func() {
+				So(err, ShouldResemble, errors.New("comment maximum length is 255 characters"))
+			})
+		})
+
+		Convey("when a key can't be inserted", func() {
+			mock.ExpectExec(insertIntoAPIKeys).
+				WithArgs(sqlmock.AnyArg(), sqlmock.AnyArg(), userID, comment).
+				WillReturnResult(sqlmock.NewResult(0, 0))
+
+			apiKey, err := repository.AddAPIKey(userID, comment)
+
+			Convey("an error should be returned", func() {
+				So(err, ShouldResemble, errors.New("AddAPIKey: no rows were updated"))
+			})
+
+			Convey("should return nil", func() {
+				So(apiKey, ShouldBeNil)
+			})
+		})
+
+		Convey("when the comment is not empty", func() {
+			mock.ExpectExec(insertIntoAPIKeys).
+				WithArgs(sqlmock.AnyArg(), sqlmock.AnyArg(), userID, comment).
+				WillReturnResult(sqlmock.NewResult(1, 1))
+
+			apiKey, err := repository.AddAPIKey(userID, comment)
+
+			Convey("there should be no error returned", func() {
+				So(err, ShouldBeNil)
+			})
+
+			Convey("should return an API key", func() {
+				So(apiKey, ShouldHaveSameTypeAs, &interfaces.APIKey{})
+			})
+
+			Convey("API key secret should not be empty", func() {
+				So(len(apiKey.Secret), ShouldBeGreaterThan, 0)
+			})
+		})
+	})
+}
+
+func TestListAPIKeys(t *testing.T) {
+	var (
+		userID            = "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+		rowFields         = []string{"guid", "user_guid", "comment", "last_used"}
+		selectUserAPIKeys = `SELECT (.+) FROM api_keys WHERE user_guid = (.+)`
+	)
+
+	Convey("Given a request to list API keys", t, func() {
+		db, mock, err := sqlmock.New()
+		if err != nil {
+			t.Errorf("an error '%s' was not expected when opening a stub database connection", err)
+		}
+		defer db.Close()
+
+		repository, err := NewPgsqlAPIKeysRepository(db)
+
+		Convey("if no records exist in the DB", func() {
+			rs := sqlmock.NewRows(rowFields)
+			mock.ExpectQuery(selectUserAPIKeys).WillReturnRows(rs)
+			results, err := repository.ListAPIKeys(userID)
+
+			Convey("DB query expectations should be met", func() {
+				So(mock.ExpectationsWereMet(), ShouldBeNil)
+			})
+
+			Convey("there should be no error returned", func() {
+				So(err, ShouldBeNil)
+			})
+
+			Convey("result should be empty", func() {
+				So(len(results), ShouldEqual, 0)
+			})
+
+			Convey("result should be of correct type", func() {
+				expectedList := make([]interfaces.APIKey, 0)
+				So(results, ShouldResemble, expectedList)
+			})
+		})
+
+		Convey("if records exist in the DB", func() {
+			t := time.Now()
+
+			r1 := &interfaces.APIKey{
+				GUID:     "00000000-0000-0000-0000-000000000000",
+				Secret:   "",
+				UserGUID: userID,
+				Comment:  "First key",
+				LastUsed: &t,
+			}
+
+			r2 := &interfaces.APIKey{
+				GUID:     "11111111-1111-1111-1111-111111111111",
+				Secret:   "",
+				UserGUID: userID,
+				Comment:  "Second key",
+				LastUsed: nil,
+			}
+
+			expectedList := []interfaces.APIKey{*r1, *r2}
+
+			mockRows := sqlmock.NewRows(rowFields).
+				AddRow(r1.GUID, r1.UserGUID, r1.Comment, r1.LastUsed).
+				AddRow(r2.GUID, r2.UserGUID, r2.Comment, r2.LastUsed)
+
+			mock.ExpectQuery(selectUserAPIKeys).WillReturnRows(mockRows)
+
+			results, err := repository.ListAPIKeys(userID)
+
+			Convey("DB query expectations should be met", func() {
+				So(mock.ExpectationsWereMet(), ShouldBeNil)
+			})
+
+			Convey("there should be no error returned", func() {
+				So(err, ShouldBeNil)
+			})
+
+			Convey("2 API keys should be returned", func() {
+				So(len(results), ShouldEqual, 2)
+			})
+
+			Convey("result should be of correct type", func() {
+				So(results, ShouldResemble, expectedList)
+			})
+		})
+	})
+}
+
+func TestGetAPIKeyBySecret(t *testing.T) {
+	var (
+		rowFields            = []string{"guid", "user_guid", "comment", "last_used"}
+		selectAPIKeyBySecret = `SELECT (.+) FROM api_keys WHERE secret = (.+)`
+	)
+
+	Convey("Given a request to get an API key by its secret", t, func() {
+		db, mock, err := sqlmock.New()
+		if err != nil {
+			t.Errorf("an error '%s' was not expected when opening a stub database connection", err)
+		}
+		defer db.Close()
+
+		repository, err := NewPgsqlAPIKeysRepository(db)
+
+		Convey("if no matching record exists in the DB", func() {
+			rs := sqlmock.NewRows(rowFields)
+			mock.ExpectQuery(selectAPIKeyBySecret).WillReturnRows(rs)
+			results, err := repository.GetAPIKeyBySecret("test")
+
+			Convey("DB query expectations should be met", func() {
+				So(mock.ExpectationsWereMet(), ShouldBeNil)
+			})
+
+			Convey("an error should be returned", func() {
+				So(err, ShouldResemble, errors.New("sql: no rows in result set"))
+			})
+
+			Convey("result should be nil", func() {
+				So(results, ShouldBeNil)
+			})
+		})
+
+		Convey("if records exist in the DB", func() {
+			t := time.Now()
+
+			r := &interfaces.APIKey{
+				GUID:     "00000000-0000-0000-0000-000000000000",
+				Secret:   "",
+				UserGUID: "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+				Comment:  "First key",
+				LastUsed: &t,
+			}
+
+			mockRows := sqlmock.NewRows(rowFields).
+				AddRow(r.GUID, r.UserGUID, r.Comment, r.LastUsed)
+
+			mock.ExpectQuery(selectAPIKeyBySecret).WillReturnRows(mockRows)
+
+			results, err := repository.GetAPIKeyBySecret("test")
+
+			Convey("DB query expectations should be met", func() {
+				So(mock.ExpectationsWereMet(), ShouldBeNil)
+			})
+
+			Convey("there should be no error returned", func() {
+				So(err, ShouldBeNil)
+			})
+
+			Convey("result should be of correct type", func() {
+				So(results, ShouldResemble, r)
+			})
+		})
+	})
+}
+
+func TestDeleteAPIKey(t *testing.T) {
+	var (
+		userID            = "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+		keyID             = "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"
+		deleteFromAPIKeys = `DELETE FROM api_keys WHERE user_guid = (.+) AND guid = (.+)`
+	)
+
+	Convey("Given a request to add an API key", t, func() {
+		db, mock, err := sqlmock.New()
+		if err != nil {
+			t.Errorf("an error '%s' was not expected when opening a stub database connection", err)
+		}
+		defer db.Close()
+
+		repository, _ := NewPgsqlAPIKeysRepository(db)
+
+		Convey("when a matching key doesn't exist", func() {
+			mock.ExpectExec(deleteFromAPIKeys).
+				WithArgs(userID, keyID).
+				WillReturnResult(sqlmock.NewResult(0, 0))
+
+			err := repository.DeleteAPIKey(userID, keyID)
+
+			Convey("an error should be returned", func() {
+				So(err, ShouldResemble, errors.New("DeleteAPIKey: no rows were updated"))
+			})
+		})
+
+		Convey("when a matching key exists", func() {
+			mock.ExpectExec(deleteFromAPIKeys).
+				WithArgs(userID, keyID).
+				WillReturnResult(sqlmock.NewResult(1, 1))
+
+			err := repository.DeleteAPIKey(userID, keyID)
+
+			Convey("DB query expectations should be met", func() {
+				So(mock.ExpectationsWereMet(), ShouldBeNil)
+			})
+
+			Convey("there should be no error returned", func() {
+				So(err, ShouldBeNil)
+			})
+		})
+	})
+}
+
+//
+func TestUpdateAPIKeyLastUsed(t *testing.T) {
+	var (
+		keyID          = "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"
+		updateLastUsed = `UPDATE api_keys SET last_used = (.+) WHERE guid = (.+)`
+	)
+
+	Convey("Given a request to update API key last used", t, func() {
+		db, mock, err := sqlmock.New()
+		if err != nil {
+			t.Errorf("an error '%s' was not expected when opening a stub database connection", err)
+		}
+		defer db.Close()
+
+		repository, _ := NewPgsqlAPIKeysRepository(db)
+
+		Convey("when a matching key doesn't exist", func() {
+			mock.ExpectExec(updateLastUsed).
+				WithArgs(sqlmock.AnyArg(), keyID).
+				WillReturnResult(sqlmock.NewResult(0, 0))
+
+			err := repository.UpdateAPIKeyLastUsed(keyID)
+
+			Convey("an error should be returned", func() {
+				So(err, ShouldResemble, errors.New("UpdateAPIKeyLastUsed: no rows were updated"))
+			})
+		})
+
+		Convey("when a matching key exists", func() {
+			mock.ExpectExec(updateLastUsed).
+				WithArgs(sqlmock.AnyArg(), keyID).
+				WillReturnResult(sqlmock.NewResult(1, 1))
+
+			err := repository.UpdateAPIKeyLastUsed(keyID)
+
+			Convey("DB query expectations should be met", func() {
+				So(mock.ExpectationsWereMet(), ShouldBeNil)
+			})
+
+			Convey("there should be no error returned", func() {
+				So(err, ShouldBeNil)
+			})
+		})
+	})
+}
diff --git a/src/jetstream/repository/interfaces/apikeys.go b/src/jetstream/repository/interfaces/apikeys.go
new file mode 100644
index 0000000000..a0ead69e35
--- /dev/null
+++ b/src/jetstream/repository/interfaces/apikeys.go
@@ -0,0 +1,12 @@
+package interfaces
+
+import "time"
+
+// APIKey - represents API key DB entry
+type APIKey struct {
+	GUID     string     `json:"guid"`
+	Secret   string     `json:"secret"`
+	UserGUID string     `json:"user_guid"`
+	Comment  string     `json:"comment"`
+	LastUsed *time.Time `json:"last_used"`
+}
diff --git a/src/jetstream/repository/interfaces/config/config.go b/src/jetstream/repository/interfaces/config/config.go
index 872e3470d4..0e4dbe75ad 100644
--- a/src/jetstream/repository/interfaces/config/config.go
+++ b/src/jetstream/repository/interfaces/config/config.go
@@ -20,6 +20,39 @@ import (
 
 const secretsDir = "/etc/secrets"
 
+// APIKeysConfigValue - special type for configuring whether API keys feature is enabled
+type APIKeysConfigValue string
+
+// APIKeysConfigEnum - defines possible configuration values for Stratos API keys feature
+var APIKeysConfigEnum = struct {
+	Disabled  APIKeysConfigValue
+	AdminOnly APIKeysConfigValue
+	AllUsers  APIKeysConfigValue
+}{
+	Disabled:  "disabled",
+	AdminOnly: "admin_only",
+	AllUsers:  "all_users",
+}
+
+// verifies that given string is a valid config value (i.e., present in APIKeysConfigEnum)
+func parseAPIKeysConfigValue(input string) (APIKeysConfigValue, error) {
+	t := reflect.TypeOf(APIKeysConfigEnum)
+	v := reflect.ValueOf(APIKeysConfigEnum)
+
+	var allowedValues []string
+
+	for i := 0; i < t.NumField(); i++ {
+		allowedValue := string(v.Field(i).Interface().(APIKeysConfigValue))
+		if allowedValue == input {
+			return APIKeysConfigValue(input), nil
+		}
+
+		allowedValues = append(allowedValues, allowedValue)
+	}
+
+	return "", fmt.Errorf("Invalid value %q, allowed values: %q", input, allowedValues)
+}
+
 var urlType *url.URL
 
 // Load the given pointer to struct with values from the environment and the
@@ -119,7 +152,12 @@ func SetStructFieldValue(value reflect.Value, field reflect.Value, val string) e
 		b, err = strconv.ParseBool(val)
 		newVal = b
 	case reflect.String:
-		newVal = val
+		apiKeysConfigType := reflect.TypeOf((*APIKeysConfigValue)(nil)).Elem()
+		if typ == apiKeysConfigType {
+			newVal, err = parseAPIKeysConfigValue(val)
+		} else {
+			newVal = val
+		}
 	default:
 		if typ == reflect.TypeOf(urlType) {
 			newVal, err = url.Parse(val)
diff --git a/src/jetstream/repository/interfaces/structs.go b/src/jetstream/repository/interfaces/structs.go
index 909c91048b..20512c58a3 100644
--- a/src/jetstream/repository/interfaces/structs.go
+++ b/src/jetstream/repository/interfaces/structs.go
@@ -4,6 +4,7 @@ import (
 	"net/http"
 	"net/url"
 
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces/config"
 	"github.com/gorilla/sessions"
 	"github.com/labstack/echo"
 )
@@ -214,9 +215,10 @@ type Info struct {
 	PluginConfig  map[string]string                     `json:"plugin-config,omitempty"`
 	Diagnostics   *Diagnostics                          `json:"diagnostics,omitempty"`
 	Configuration struct {
-		TechPreview        bool  `json:"enableTechPreview"`
-		ListMaxSize        int64 `json:"listMaxSize,omitempty"`
-		ListAllowLoadMaxed bool  `json:"listAllowLoadMaxed,omitempty"`
+		TechPreview        bool   `json:"enableTechPreview"`
+		ListMaxSize        int64  `json:"listMaxSize,omitempty"`
+		ListAllowLoadMaxed bool   `json:"listAllowLoadMaxed,omitempty"`
+		APIKeysEnabled     string `json:"APIKeysEnabled"`
 	} `json:"config"`
 }
 
@@ -369,6 +371,7 @@ type PortalConfig struct {
 	DatabaseProviderName               string
 	EnableTechPreview                  bool `configName:"ENABLE_TECH_PREVIEW"`
 	CanMigrateDatabaseSchema           bool
+	APIKeysEnabled                     config.APIKeysConfigValue `configName:"API_KEYS_ENABLED"`
 	// CanMigrateDatabaseSchema indicates if we can safely perform migrations
 	// This depends on the deployment mechanism and the database config
 	// e.g. if running in Cloud Foundry with a shared DB, then only the 0-index application instance
diff --git a/src/jetstream/repository/mock_interfaces/mock_auth.go b/src/jetstream/repository/mock_interfaces/mock_auth.go
new file mode 100644
index 0000000000..801847baa9
--- /dev/null
+++ b/src/jetstream/repository/mock_interfaces/mock_auth.go
@@ -0,0 +1,107 @@
+// Code generated by MockGen. DO NOT EDIT.
+// Source: repository/interfaces/auth.go
+
+// Package mock_interfaces is a generated GoMock package.
+package mock_interfaces
+
+import (
+	interfaces "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	gomock "github.com/golang/mock/gomock"
+	echo "github.com/labstack/echo"
+	reflect "reflect"
+)
+
+// MockStratosAuth is a mock of StratosAuth interface
+type MockStratosAuth struct {
+	ctrl     *gomock.Controller
+	recorder *MockStratosAuthMockRecorder
+}
+
+// MockStratosAuthMockRecorder is the mock recorder for MockStratosAuth
+type MockStratosAuthMockRecorder struct {
+	mock *MockStratosAuth
+}
+
+// NewMockStratosAuth creates a new mock instance
+func NewMockStratosAuth(ctrl *gomock.Controller) *MockStratosAuth {
+	mock := &MockStratosAuth{ctrl: ctrl}
+	mock.recorder = &MockStratosAuthMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use
+func (m *MockStratosAuth) EXPECT() *MockStratosAuthMockRecorder {
+	return m.recorder
+}
+
+// Login mocks base method
+func (m *MockStratosAuth) Login(c echo.Context) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Login", c)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// Login indicates an expected call of Login
+func (mr *MockStratosAuthMockRecorder) Login(c interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Login", reflect.TypeOf((*MockStratosAuth)(nil).Login), c)
+}
+
+// Logout mocks base method
+func (m *MockStratosAuth) Logout(c echo.Context) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Logout", c)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// Logout indicates an expected call of Logout
+func (mr *MockStratosAuthMockRecorder) Logout(c interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Logout", reflect.TypeOf((*MockStratosAuth)(nil).Logout), c)
+}
+
+// GetUsername mocks base method
+func (m *MockStratosAuth) GetUsername(userGUID string) (string, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetUsername", userGUID)
+	ret0, _ := ret[0].(string)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// GetUsername indicates an expected call of GetUsername
+func (mr *MockStratosAuthMockRecorder) GetUsername(userGUID interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUsername", reflect.TypeOf((*MockStratosAuth)(nil).GetUsername), userGUID)
+}
+
+// GetUser mocks base method
+func (m *MockStratosAuth) GetUser(userGUID string) (*interfaces.ConnectedUser, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetUser", userGUID)
+	ret0, _ := ret[0].(*interfaces.ConnectedUser)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// GetUser indicates an expected call of GetUser
+func (mr *MockStratosAuthMockRecorder) GetUser(userGUID interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUser", reflect.TypeOf((*MockStratosAuth)(nil).GetUser), userGUID)
+}
+
+// VerifySession mocks base method
+func (m *MockStratosAuth) VerifySession(c echo.Context, sessionUser string, sessionExpireTime int64) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "VerifySession", c, sessionUser, sessionExpireTime)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// VerifySession indicates an expected call of VerifySession
+func (mr *MockStratosAuthMockRecorder) VerifySession(c, sessionUser, sessionExpireTime interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "VerifySession", reflect.TypeOf((*MockStratosAuth)(nil).VerifySession), c, sessionUser, sessionExpireTime)
+}
diff --git a/src/test-e2e/apikeys/apikey-e2e-helper.ts b/src/test-e2e/apikeys/apikey-e2e-helper.ts
new file mode 100644
index 0000000000..2db25a8dd4
--- /dev/null
+++ b/src/test-e2e/apikeys/apikey-e2e-helper.ts
@@ -0,0 +1,29 @@
+import { promise } from 'protractor';
+
+import { E2ESetup } from '../e2e';
+import { RequestHelpers } from '../helpers/request-helpers';
+
+const reqHelpers = new RequestHelpers();
+
+export class ApiKeyE2eHelper {
+
+
+  constructor(public e2eSetup: E2ESetup) {
+  }
+
+  addKey(comment: string, isAdmim: boolean): promise.Promise<any> {
+    return reqHelpers.sendRequest(isAdmim ? this.e2eSetup.adminReq : this.e2eSetup.userReq, { method: 'POST', url: 'pp/v1/api-key' }, null, {
+      comment
+    });
+  }
+
+  deleteKey(guid: string, isAdmim: boolean): promise.Promise<any> {
+    return reqHelpers.sendRequest(isAdmim ? this.e2eSetup.adminReq : this.e2eSetup.userReq, { method: 'DELETE', url: 'pp/v1/api-key' }, null, {
+      guid
+    });
+  }
+
+  getAllKeys(isAdmim: boolean): promise.Promise<any> {
+    return reqHelpers.sendRequest(isAdmim ? this.e2eSetup.adminReq : this.e2eSetup.userReq, { method: 'GET', url: 'pp/v1/api-key' }, null, undefined);
+  }
+}
\ No newline at end of file
diff --git a/src/test-e2e/apikeys/apikeys-e2e.spec.ts b/src/test-e2e/apikeys/apikeys-e2e.spec.ts
new file mode 100644
index 0000000000..aebe505b4c
--- /dev/null
+++ b/src/test-e2e/apikeys/apikeys-e2e.spec.ts
@@ -0,0 +1,119 @@
+import { promise } from 'protractor';
+
+import { MessageNoContentPo } from '../application/po/message-no-autoscaler-policy';
+import { e2e } from '../e2e';
+import { ConsoleUserType, E2EHelpers } from '../helpers/e2e-helpers';
+import { Component } from '../po/component.po';
+import { ConfirmDialogComponent } from '../po/confirm-dialog';
+import { ApiKeyE2eHelper } from './apikey-e2e-helper';
+import { ApiKeyAddDialogPo } from './po/apikey-add-dialog.po';
+import { APIKeyListPage } from './po/apikeys-list-page.po';
+
+const customApiKeyLabel = E2EHelpers.e2eItemPrefix + (process.env.CUSTOM_APP_LABEL || process.env.USER) + '-api-key';
+
+describe('API Keys -', () => {
+
+  let helper: ApiKeyE2eHelper;
+  let newKeysComment: string;
+  let page = new APIKeyListPage();
+  let currentKeysCount = promise.fullyResolved(0);
+
+  beforeAll(() => {
+    const setup = e2e.setup(ConsoleUserType.admin)
+      .clearAllEndpoints()
+      .getInfo(ConsoleUserType.admin);
+    helper = new ApiKeyE2eHelper(setup);
+
+    newKeysComment = E2EHelpers.createCustomName(customApiKeyLabel).toLowerCase()
+  })
+
+  // Should be ran in sequence
+  describe('Ordered Tests - ', () => {
+    it('Navigate to api key page', () => {
+      page.header.clickUserMenuItem('API Keys');
+      page.waitForPage();
+    })
+
+    it('New key does not exist', () => {
+      // Validation check
+      return page.list.isPresent().then(isDisplayed => {
+        if (isDisplayed) {
+          expect(page.list.table.findRow('comment', newKeysComment, false)).toBeLessThan(0);
+          currentKeysCount = page.list.table.getRowCount();
+        } else {
+          const noContentComponent = new MessageNoContentPo();
+          expect(noContentComponent.isDisplayed()).toBeTruthy()
+        }
+      })
+    });
+
+    describe('Add Dialog - ', () => {
+      it('Basic Dialog tests', () => {
+        expect(page.addKeyButton().isDisplayed()).toBeTruthy();
+        page.addKeyButton().click();
+
+        const dialog = new ApiKeyAddDialogPo();
+        expect(dialog.isDisplayed()).toBeTruthy();
+        expect(dialog.canClose()).toBeTruthy();
+        expect(dialog.canCreate()).toBeFalsy();
+
+        dialog.close();
+
+        dialog.waitUntilNotShown();
+
+        page.waitForPage();
+
+      });
+
+      it('Add a new key', () => {
+        expect(page.addKeyButton().isDisplayed()).toBeTruthy();
+        page.addKeyButton().click();
+
+        const dialog = new ApiKeyAddDialogPo();
+        dialog.waitUntilShown();
+        expect(dialog.canCreate()).toBeFalsy();
+
+        dialog.form.fill({
+          comment: newKeysComment
+        })
+
+        expect(dialog.canClose()).toBeTruthy();
+        expect(dialog.canCreate()).toBeTruthy();
+
+        dialog.create();
+        dialog.waitUntilNotShown();
+      });
+    })
+
+    it('New key has a secret', () => {
+      const secret = new Component(page.getKeySecret());
+      secret.waitUntilShown();
+      expect(secret.getComponent().getText()).toBeDefined();
+      page.closeKeySecret();
+      secret.waitUntilNotShown()
+    })
+
+    it('New key is in updated table', () => {
+      expect(page.list.table.findRow('description', newKeysComment, true)).toBeGreaterThanOrEqual(0);
+    })
+
+    it('Delete new key', () => {
+      return page.list.table.findRow('description', newKeysComment, true)
+        .then(rowIndex => {
+          page.list.table.openRowActionMenuByIndex(rowIndex).clickItem('Delete');
+          ConfirmDialogComponent.expectDialogAndConfirm('Delete', 'Delete Key');
+          page.waitForPage();
+          return page.list.isPresent();
+        })
+        .then(isListDisplayed => {
+          if (isListDisplayed) {
+            page.list.waitForNoLoadingIndicator();
+            expect(page.list.table.getRowCount()).toEqual(currentKeysCount);
+          } else {
+            expect(0).toEqual(currentKeysCount)
+          }
+        })
+    })
+  })
+
+});
\ No newline at end of file
diff --git a/src/test-e2e/apikeys/po/apikey-add-dialog.po.ts b/src/test-e2e/apikeys/po/apikey-add-dialog.po.ts
new file mode 100644
index 0000000000..07b70c4ce8
--- /dev/null
+++ b/src/test-e2e/apikeys/po/apikey-add-dialog.po.ts
@@ -0,0 +1,35 @@
+import { by, element } from 'protractor';
+
+import { Component } from '../../po/component.po';
+import { FormComponent } from '../../po/form.po';
+import { MenuComponent } from '../../po/menu.po';
+
+export class ApiKeyAddDialogPo extends Component {
+
+  public form: FormComponent;
+
+  public buttons: MenuComponent;
+
+  constructor() {
+    super(element(by.tagName('app-add-api-key-dialog')));
+    this.form = new FormComponent(this.locator.element(by.css('.key-dialog')));
+    this.buttons = new MenuComponent(this.locator.element(by.css('.key-dialog__actions')));
+  }
+
+  close() {
+    return this.buttons.getItemMap().then(btns => btns.cancel.click());
+  }
+
+  canClose() {
+    return this.buttons.getItemMap().then(btns => !btns.cancel.disabled);
+  }
+
+  create() {
+    return this.buttons.getItemMap().then(btns => btns.create.click());
+  }
+
+  canCreate() {
+    return this.buttons.getItemMap().then(btns => !btns.create.disabled);
+  }
+
+}
diff --git a/src/test-e2e/apikeys/po/apikeys-list-page.po.ts b/src/test-e2e/apikeys/po/apikeys-list-page.po.ts
new file mode 100644
index 0000000000..c6977bc06e
--- /dev/null
+++ b/src/test-e2e/apikeys/po/apikeys-list-page.po.ts
@@ -0,0 +1,34 @@
+import { browser, by, element, ElementFinder, promise, protractor } from 'protractor';
+
+import { ListComponent } from '../../po/list.po';
+import { Page } from '../../po/page.po';
+
+const until = protractor.ExpectedConditions;
+
+export class APIKeyListPage extends Page {
+
+  list = new ListComponent();
+  private locator: ElementFinder;
+
+  constructor() {
+    super('/api-keys');
+    this.locator = element(by.css('app-api-keys-page'));
+  }
+
+  addKeyButton(): ElementFinder {
+    return element(by.css('#stratos-api-key'));
+  }
+
+
+  waitForSecret(): promise.Promise<any> {
+    return browser.wait(until.presenceOf(this.getKeySecret()));
+  }
+
+  getKeySecret(): ElementFinder {
+    return this.locator.element(by.css('.keys-page__card li'));
+  }
+
+  closeKeySecret(): promise.Promise<void> {
+    return this.locator.element(by.css('.keys-page__card button')).click();
+  }
+}
\ No newline at end of file
diff --git a/src/test-e2e/application/application-autoscaler-e2e.spec.ts b/src/test-e2e/application/application-autoscaler-e2e.spec.ts
index 996487c8d4..8c88c4aeb2 100644
--- a/src/test-e2e/application/application-autoscaler-e2e.spec.ts
+++ b/src/test-e2e/application/application-autoscaler-e2e.spec.ts
@@ -1,4 +1,4 @@
-import * as moment from 'moment-timezone';
+import moment from 'moment-timezone';
 import { browser, promise } from 'protractor';
 import { timer } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
@@ -22,6 +22,17 @@ let applicationE2eHelper: ApplicationE2eHelper;
 
 describe('Autoscaler -', () => {
 
+  const validateFormDate = (fromForm: promise.Promise<any>, toEqual: moment.Moment, label: string) => {
+    fromForm.then(fieldInput => {
+      const momentFieldInput = moment(fieldInput)
+      expect(momentFieldInput.year).toBe(toEqual.year, `Failed for '${label}'`);
+      expect(momentFieldInput.month).toBe(toEqual.month, `Failed for '${label}'`);
+      expect(momentFieldInput.day).toBe(toEqual.day, `Failed for '${label}'`);
+      expect(momentFieldInput.hour).toBe(toEqual.hour, `Failed for '${label}'`);
+      expect(momentFieldInput.minute).toBe(toEqual.minute, `Failed for '${label}'`);
+    })
+  }
+
   beforeAll(() => {
     const setup = e2e.setup(ConsoleUserType.user)
       .clearAllEndpoints()
@@ -92,6 +103,7 @@ describe('Autoscaler -', () => {
 
     beforeAll(() => new LocaleHelper().getWindowDateTimeFormats().then(formats => {
       timeFormat = formats.timeFormat;
+      // Note - sendMultipleKeys interprets this as containing a right arrow key to skip between date and time
       dateAndTimeFormat = `${formats.dateFormat},${timeFormat}`;
     }));
 
@@ -229,7 +241,7 @@ describe('Autoscaler -', () => {
       expect(createPolicy.stepper.canNext()).toBeFalsy();
 
       // Schedule dates should not overlap
-      // scheduleStartDate1 should be set close to time it's entered, this is what triggers the scaling event tested below
+      // scheduleStartDate1 should be set close to time it's entered, this is what triggers the scaling event tested below (is this true given rules are deleted in edit?)
       const scheduleStartDate1 = moment().tz('UTC').add(1, 'minutes').add(30, 'seconds');
       scheduleEndDate1 = moment().tz('UTC').add(2, 'days');
       scheduleStartDate2 = moment().tz('UTC').add(3, 'days');
@@ -237,14 +249,18 @@ describe('Autoscaler -', () => {
 
       // Fill in form -- valid inputs
       createPolicy.stepper.getStepperForm().fill({ start_date_time: scheduleStartDate1.format(dateAndTimeFormat) });
+      validateFormDate(createPolicy.stepper.getStepperForm().getText('start_date_time'), scheduleStartDate1, 'Create Policy: Schedule 1: Start Date');
       createPolicy.stepper.getStepperForm().fill({ end_date_time: scheduleEndDate1.format(dateAndTimeFormat) });
+      validateFormDate(createPolicy.stepper.getStepperForm().getText('end_date_time'), scheduleEndDate1, 'Create Policy: Schedule 1: End Date');
       createPolicy.stepper.getStepperForm().fill({ instance_min_count: '2' });
       createPolicy.stepper.getStepperForm().fill({ initial_min_instance_count: '2' });
       createPolicy.stepper.getStepperForm().fill({ instance_max_count: '10' });
-      expect(createPolicy.stepper.getMatErrorsCount()).toBe(0);
+      expect(createPolicy.stepper.getMatErrorsCount()).toBe(0, 'Form errors are shown where there should be none');
       expect(createPolicy.stepper.getDoneButtonDisabledStatus()).toBe(null);
       createPolicy.stepper.clickDoneButton();
 
+      expect(createPolicy.stepper.getRuleTilesCount()).toBe(1, 'There should be one specific date rules, rest of test will fail');
+
       // Bad form, have seen errors where the first schedule isn't shown in ux but is submitted. When submitted the start time is already
       // in the past and the create policy request fails. Needs a better solution
       e2e.sleep(1000);
@@ -260,10 +276,14 @@ describe('Autoscaler -', () => {
       createPolicy.stepper.getStepperForm().fill({ instance_min_count: '2' });
       // Fill in form -- valid inputs
       createPolicy.stepper.getStepperForm().fill({ start_date_time: scheduleStartDate2.format(dateAndTimeFormat) });
+      validateFormDate(createPolicy.stepper.getStepperForm().getText('start_date_time'), scheduleStartDate2, 'Create Policy: Schedule 2: Start Date');
       createPolicy.stepper.getStepperForm().fill({ end_date_time: scheduleEndDate2.format(dateAndTimeFormat) });
+      validateFormDate(createPolicy.stepper.getStepperForm().getText('end_date_time'), scheduleEndDate2, 'Create Policy: Schedule 2: Start Date');
       expect(createPolicy.stepper.getMatErrorsCount()).toBe(0);
       createPolicy.stepper.clickDoneButton();
 
+      expect(createPolicy.stepper.getRuleTilesCount()).toBe(2, 'There should be two specific date rules, rest of test will fail');
+
       expect(createPolicy.stepper.canNext()).toBeTruthy();
       createPolicy.stepper.next();
     });
@@ -384,6 +404,8 @@ describe('Autoscaler -', () => {
     });
 
     it('Should pass SpecificDates Step', () => {
+      expect(createPolicy.stepper.getRuleTilesCount()).toBe(2, 'There should be two specific date rules, rest of test will fail');
+
       createPolicy.stepper.clickDeleteButton(1);
       expect(createPolicy.stepper.canNext()).toBeTruthy();
 
@@ -397,7 +419,9 @@ describe('Autoscaler -', () => {
       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) });
+      validateFormDate(createPolicy.stepper.getStepperForm().getText('start_date_time'), scheduleStartDate1, 'Edit Policy: Schedule 1: Start Date');
       createPolicy.stepper.getStepperForm().fill({ end_date_time: scheduleEndDate1.format(dateAndTimeFormat) });
+      validateFormDate(createPolicy.stepper.getStepperForm().getText('end_date_time'), scheduleEndDate1, 'Edit Policy: Schedule 1: Start Date');
       createPolicy.stepper.clickDoneButton();
 
       expect(createPolicy.stepper.canNext()).toBeTruthy();
diff --git a/src/test-e2e/application/application-deploy-local-e2e.spec.ts b/src/test-e2e/application/application-deploy-local-e2e.spec.ts
index 463e0b71cf..6e51367f7b 100644
--- a/src/test-e2e/application/application-deploy-local-e2e.spec.ts
+++ b/src/test-e2e/application/application-deploy-local-e2e.spec.ts
@@ -1,4 +1,4 @@
-import * as path from 'path';
+import path from 'path';
 import { browser, by, element, protractor } from 'protractor';
 
 import { ApplicationsPage } from '../applications/applications.po';
diff --git a/src/test-e2e/application/po/application-page-autoscaler.po.ts b/src/test-e2e/application/po/application-page-autoscaler.po.ts
index b887b1e1ca..242f833e64 100644
--- a/src/test-e2e/application/po/application-page-autoscaler.po.ts
+++ b/src/test-e2e/application/po/application-page-autoscaler.po.ts
@@ -1,18 +1,18 @@
-import { promise, browser } from 'protractor';
+import { browser, promise } from 'protractor';
 
 import { ApplicationBasePage } from './application-page.po';
-import { MessageNoAutoscalePolicy } from './message-no-autoscaler-policy';
 import { BannerAutoscalerTab } from './banner-autoscaler-tab';
 import { CardAutoscalerDefault } from './card-autoscaler-default.po';
 import { CardAutoscalerMetric } from './card-autoscaler-metric';
+import { MessageNoContentPo } from './message-no-autoscaler-policy';
 import { TableAutoscalerEvents } from './table-autoscaler-events.po';
-import { TableAutoscalerTriggers } from './table-autoscaler-triggers';
 import { TableAutoscalerSchedules } from './table-autoscaler-schedules';
+import { TableAutoscalerTriggers } from './table-autoscaler-triggers';
 
 export class ApplicationPageAutoscalerTab extends ApplicationBasePage {
 
   bannerAutoscalerTab: BannerAutoscalerTab;
-  messageNoPolicy: MessageNoAutoscalePolicy;
+  messageNoPolicy: MessageNoContentPo;
   cardDefault: CardAutoscalerDefault;
   cardMetric: CardAutoscalerMetric;
   tableTriggers: TableAutoscalerTriggers;
@@ -21,7 +21,7 @@ export class ApplicationPageAutoscalerTab extends ApplicationBasePage {
 
   constructor(public cfGuid: string, public appGuid: string) {
     super(cfGuid, appGuid, 'autoscale');
-    this.messageNoPolicy = new MessageNoAutoscalePolicy();
+    this.messageNoPolicy = new MessageNoContentPo();
     this.bannerAutoscalerTab = new BannerAutoscalerTab(cfGuid, appGuid);
     this.cardDefault = new CardAutoscalerDefault(cfGuid, appGuid);
     this.cardMetric = new CardAutoscalerMetric(cfGuid, appGuid);
diff --git a/src/test-e2e/application/po/create-autoscaler-policy-step.po.ts b/src/test-e2e/application/po/create-autoscaler-policy-step.po.ts
index 0622a87f44..fcc609b406 100644
--- a/src/test-e2e/application/po/create-autoscaler-policy-step.po.ts
+++ b/src/test-e2e/application/po/create-autoscaler-policy-step.po.ts
@@ -1,4 +1,4 @@
-import * as moment from 'moment-timezone';
+import moment from 'moment-timezone';
 import { by, ElementArrayFinder, ElementFinder, promise } from 'protractor';
 
 import { FormComponent } from '../../po/form.po';
diff --git a/src/test-e2e/application/po/message-no-autoscaler-policy.ts b/src/test-e2e/application/po/message-no-autoscaler-policy.ts
index fd9ffeef9c..76d7290ce8 100644
--- a/src/test-e2e/application/po/message-no-autoscaler-policy.ts
+++ b/src/test-e2e/application/po/message-no-autoscaler-policy.ts
@@ -2,7 +2,7 @@ import { by, element, ElementFinder, promise } from 'protractor';
 
 import { Component } from '../../po/component.po';
 
-export class MessageNoAutoscalePolicy extends Component {
+export class MessageNoContentPo extends Component {
 
   constructor(locator: ElementFinder = element(by.tagName('app-no-content-message'))) {
     super(locator);
diff --git a/src/test-e2e/endpoints/endpoints-register-e2e.spec.ts b/src/test-e2e/endpoints/endpoints-register-e2e.spec.ts
index 68c931fe85..18b5832930 100644
--- a/src/test-e2e/endpoints/endpoints-register-e2e.spec.ts
+++ b/src/test-e2e/endpoints/endpoints-register-e2e.spec.ts
@@ -167,7 +167,6 @@ describe('Endpoints', () => {
           // Handle the error case for invalid certificate - could be unknown authority or bad certificate
           // so check for correct message at the start and the helpful message for the user to correct the problem
           expect(snackBar.hasMessage('SSL error - x509: certificate')).toBeTruthy();
-          /* tslint:disable-line:max-line-length*/
           expect(snackBar.messageContains('Please check "Skip SSL validation for the endpoint" if the certificate issuer is trusted'))
             .toBeTruthy();
         });
diff --git a/src/test-e2e/helpers/request-helpers.ts b/src/test-e2e/helpers/request-helpers.ts
index 2d440ef58a..714eabb5dc 100644
--- a/src/test-e2e/helpers/request-helpers.ts
+++ b/src/test-e2e/helpers/request-helpers.ts
@@ -1,7 +1,7 @@
 import { existsSync, readFileSync } from 'fs';
 import { join } from 'path';
 import { browser, promise } from 'protractor';
-import * as request from 'request-promise-native';
+import request from 'request-promise-native';
 
 import { E2E, e2e } from '../e2e';
 import { ConsoleUserType } from './e2e-helpers';
@@ -125,8 +125,8 @@ export class RequestHelpers {
     Object.keys(options).forEach(key => {
       const v = options[key];
       if (typeof v === 'string' && key === 'password') {
-        options[key]='******';
-      } else if  (typeof v === 'object') {
+        options[key] = '******';
+      } else if (typeof v === 'object') {
         this.sanitizeOption(options[key]);
       }
     });
diff --git a/src/test-e2e/helpers/uaa-request-helpers.ts b/src/test-e2e/helpers/uaa-request-helpers.ts
index 41947e061f..8bd80a429d 100644
--- a/src/test-e2e/helpers/uaa-request-helpers.ts
+++ b/src/test-e2e/helpers/uaa-request-helpers.ts
@@ -1,5 +1,5 @@
 import { promise } from 'protractor';
-import * as request from 'request-promise-native';
+import request from 'request-promise-native';
 
 import { e2e } from '../e2e';
 import { E2EUaa } from '../e2e.types';
diff --git a/src/test-e2e/locale.helper.ts b/src/test-e2e/locale.helper.ts
index 53aa76e018..af483bc5cd 100644
--- a/src/test-e2e/locale.helper.ts
+++ b/src/test-e2e/locale.helper.ts
@@ -1,4 +1,4 @@
-import * as moment from 'moment';
+import moment from 'moment';
 import { browser, promise } from 'protractor';
 
 export class LocaleHelper {
diff --git a/src/test-e2e/po/form.po.ts b/src/test-e2e/po/form.po.ts
index 1e676db7ac..83c8141c56 100644
--- a/src/test-e2e/po/form.po.ts
+++ b/src/test-e2e/po/form.po.ts
@@ -325,6 +325,7 @@ export class FormComponent extends Component {
     keyString.split(/[ ,:\/]/).forEach((key) => {
       ctrl.sendKeys(key);
       if (key.length === 4) {
+        browser.sleep(500);
         ctrl.sendKeys(Key.ARROW_RIGHT);
       }
     });
diff --git a/src/test-e2e/po/page-header.po.ts b/src/test-e2e/po/page-header.po.ts
index e323f29098..92d058bdaa 100644
--- a/src/test-e2e/po/page-header.po.ts
+++ b/src/test-e2e/po/page-header.po.ts
@@ -50,17 +50,25 @@ export class PageHeader extends Component {
     browser.wait(this.until.textToBePresentInElement(this.getTitle(), text), 10000, `Failed to wait for page header with text ${text}`);
   }
 
-  logout(): promise.Promise<any> {
+  getUserMenu(): ElementFinder {
     return this.locator.element(by.id('userMenu'))
+  }
+
+  clickUserMenuItem(itemText: string): promise.Promise<any> {
+    return this.getUserMenu()
       .click()
       .then(() => {
         // browser.driver.sleep(2000);
         const menu = new MenuComponent();
         menu.waitUntilShown();
-        menu.clickItem('Logout');
+        menu.clickItem(itemText);
         // browser.driver.sleep(2000);
         return browser.waitForAngular();
       });
   }
 
+  logout(): promise.Promise<any> {
+    return this.clickUserMenuItem('Logout');
+  }
+
 }
diff --git a/src/tsconfig.json b/src/tsconfig.json
index 0ee21fc3d1..a086487d1f 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -12,6 +12,8 @@
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,    
     "importHelpers": true,
     "target": "es2015",
     "module": "esnext",
diff --git a/website/README.md b/website/README.md
index b70a5be1d0..157538b94c 100644
--- a/website/README.md
+++ b/website/README.md
@@ -26,7 +26,7 @@ This command starts a local development server and open up a browser window. Mos
 $ ./deploy.sh -b
 ```
 
-This command generates static content into the `build` directory and can be served using any static contents hosting service.
+This command generates static content into the `build` directory and can be served using any static contents hosting service, or `npm run serve` to see locally.
 
 ### Deployment
 
@@ -37,4 +37,50 @@ $ ./deploy.sh
 ```
 
 
-> Note: The website is deployed to the GitHub Repository `cf-stratos/wesbite` which hosts https://stratos.app
\ No newline at end of file
+> Note: The website is deployed to the GitHub Repository `cf-stratos/wesbite` which hosts https://stratos.app
+
+### Version
+
+Versions is handled automatically by `npm run versions` which is called as part of `npm run build`. The `versions` target runs `build-versions.sh` which
+
+> The files is `docs/` will be marked as `next`.
+
+1. clones a local copy of the repo
+1. cleans up any previous run (repo aside)
+1. Loop through each version defined in `internal-versions.json` (latest version is highest)
+  - checkout that version in temp repo
+  - tag that version with it's version label using docusaurus
+  - copy the files docusaurus creates back into the main repo
+  - store the label
+1. remove the local clone
+
+#### Add a new version
+
+1. Open `internal-versions.json`
+1. Add to the top `<label of version to be displayed in website>:<version of repo to checkout that contains required docs>:<show version in versions drop down`. For example `[ "4.0.0:4.0.0:true"]`
+1. Commit, push and merge changes
+
+> Note - the most recent version (first in array) MUST be visible in the drop down. This is the version that is picked by Docusaurus as the default
+
+Everything else should be handled by the CI process (building with all versions in file and publishing)
+
+
+# Updating Docusaurus Version
+If the version of Docusaurus is updated be careful of changes to components that have been 'swizzled`. These are theme components that we have copied using the swizzle command and tweaked locally. 
+
+For example
+
+```
+npm run docusaurus -- swizzle @docusaurus/theme-classic Navbar
+```
+
+Currently these components are in `./website/src/theme`
+- DocsVersionDropdownNavbarItem (trims out versions in drop down, shows link to all versions)
+- DocVersionSuggestions (fixes text shown when not on last released version)
+- NavBar (dynamically hide the versions drop down if not in the docs section)
+
+After Docusaurus is updated these will remain the Stratos version of the old Docusaurus version. Therefore may need to be recreated using swizzle and applying the same changes.
+
+Note, there are also two non-swizzled custom pages that may also need updating. Current these components are in `./website/src/pages/*.js`
+- index.js (home page)
+- versions.js (all versions page)
diff --git a/website/add-version.sh b/website/add-version.sh
new file mode 100755
index 0000000000..b8fd451e87
--- /dev/null
+++ b/website/add-version.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+set -e
+set -o pipefail
+
+echo "Determining version Label & Tag"
+
+# GITHUB_EVENT_PATH points to json containing event data. This contains the github release object
+# See https://developer.github.com/webhooks/event-payloads/#release
+versionLabel=$(jq -r '.release.name' $GITHUB_EVENT_PATH)
+versionSha=$(jq -r '.release.tag_name' $GITHUB_EVENT_PATH)
+showVersionInDropDown=true
+internalVersionsFile="internal-versions.json"
+
+echo Adding the following as latest docs version
+echo "Label            : $versionLabel"
+echo "Tag/Sha          : $versionSha"
+echo "Show In Dropdown : $showVersionInDropDown"
+
+interalVersion=$versionLabel:$versionSha:$showVersionInDropDown
+echo "New Version      : $interalVersion"
+
+# Write to temp env var. Not sure why, but a simple `> $internalVersionsFile` wipes out content
+res=$(jq --arg argval $interalVersion -r '. |= [$argval] + .' $internalVersionsFile)
+echo "$res" > $internalVersionsFile
+
+echo "Result           :"
+cat $internalVersionsFile
diff --git a/website/build-versions.sh b/website/build-versions.sh
new file mode 100755
index 0000000000..2959642ebe
--- /dev/null
+++ b/website/build-versions.sh
@@ -0,0 +1,151 @@
+#!/usr/bin/env bash
+set -e
+set -o pipefail
+
+function logInner() (
+  echo ..... $1
+)
+
+function cleanUpBefore() (
+  currentWebsite=$1
+
+  rm -rf $currentWebsite/versioned_docs
+  mkdir -p $currentWebsite/versioned_docs
+
+  rm -rf $currentWebsite/versioned_sidebars
+  mkdir -p $currentWebsite/versioned_sidebars
+
+  echo "[]" > $currentWebsite/versions.json
+
+  cleanUpGit
+) 
+
+function gitClone() (
+  rurl="$1" localdir="$2"
+  echo "Cloning from $rurl into $localdir"
+  # git clone --depth 1 --no-single-branch $rurl $localdir
+  git clone $rurl $localdir
+  pushd $localdir/website > /dev/null
+  npm install
+  popd > /dev/null
+)
+
+function checkoutAndTag() (
+  logInner "Checking out: $versionsHash"
+  pushd $tempDirForGit > /dev/null
+  git checkout $versionsHash
+  pushd website > /dev/null
+  logInner "Tagging with version $versionsLabel"
+  npm run version -- $versionsLabel
+  popd > /dev/null
+  popd > /dev/null
+)
+
+function createVersionedDocs() (
+  logInner "Updating versioned docs folder"
+  checkedOutRepo=$1
+  currentWebsite=$2
+  label=$3
+  
+  mkdir -p $currentWebsite/versioned_docs
+  cp -r $checkedOutRepo/website/versioned_docs/version-$label $currentWebsite/versioned_docs
+)
+
+function createVersiondSidebar() (
+  logInner "Updating versioned sidebar"
+  checkedOutRepo=$1
+  currentWebsite=$2
+  label=$3
+  
+  mkdir -p $currentWebsite/versioned_sidebars
+  cp $checkedOutRepo/website/versioned_sidebars/version-$label-sidebars.json $currentWebsite/versioned_sidebars
+)
+
+function updateVersionsFile() (
+  vString=$1
+  if [ $vString = "]" ]; then
+    echo "No content for versions file"
+    return
+  fi
+  echo Updating versions file from $vString
+  versions="[${vString:1}"
+
+  echo to $versions
+  echo $versions > $versionsFile
+)
+
+function cleanUpGit() (
+  echo Removing folder: $tempDirForGit 
+  rm -rf $tempDirForGit
+) 
+
+
+# wesbite folder
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+# tempDirForGit=$(mktemp -d)
+tempDirForGit=$DIR/versions-repo
+mkdir -p $tempDirForGit
+
+gitUrl=$(git remote get-url origin)
+versionsFile="versions.json"
+internalVersionsFile="internal-versions.json"
+
+echo ---------- Values  -------------
+# echo Hashes to treat as version: $hashes
+echo Temp Dir: $tempDirForGit. This will be removed
+echo GIT Url: $gitUrl
+echo Versions File: $versionsFile
+echo Internal Versions File: $internalVersionsFile
+echo Current Directory: $DIR
+
+cleanUpBefore $DIR
+
+gitClone $gitUrl $tempDirForGit
+
+versions="]"
+
+internalVersions=$(jq -r '.[]' $internalVersionsFile)
+export internalVersionsArray=($internalVersions)
+
+# Loop through each version 
+# .. checkout that version in the temp dir
+# .. tag that version with it's label using docusaurus
+# .. copy the files docusaurus creates back into the main repo
+# .. store the label 
+# The versions are reveresed, not so important at the moment but it's useful for future improvements
+# if the docusaurus labelling works from oldest to newest. The order in the versions.json file should
+# go from newest (first in array) to oldest (last in array)
+for ((i = ${#internalVersionsArray[@]} - 1;i >= 0;i--)); do
+  row=${internalVersionsArray[i]}
+  IFS=: read versionsLabel versionsHash includeInDropDown <<< $row
+
+  # This is donw via the website now
+  # if [ $includeInDropDown != "true" ]; then
+  #   echo Skipping version: $versionsLabel \"$includeInDropDown\"
+  #   continue
+  # fi
+
+  if [ -z "$versionsLabel" ]; then
+    echo Invalid row \(no version label\): $row 
+    exit 1
+  fi
+
+  if [ -z "$versionsHash" ]; then
+    echo Invalid row \(no version hash\): $row
+    exit 1
+  fi
+
+  echo Process version \'$versionsLabel\' with checkout target of \'$versionsHash\'
+
+  checkoutAndTag
+  createVersionedDocs $tempDirForGit/ $DIR $versionsLabel
+  createVersiondSidebar $tempDirForGit $DIR $versionsLabel
+  versions=,\"$versionsLabel\"$versions
+
+  echo Finished processing \'$versionsLabel\'
+
+done
+
+updateVersionsFile $versions
+cleanUpGit $tempDirForGit
diff --git a/website/docs/advanced/sso.md b/website/docs/advanced/sso.md
index 6dfb23a357..db4dd92193 100644
--- a/website/docs/advanced/sso.md
+++ b/website/docs/advanced/sso.md
@@ -67,4 +67,19 @@ 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
+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.
+
+## Troubleshooting
+
+1. User has selected the incorrect application authorities when logging in to Stratos via SSO for the first time.
+   - The user can update their permissions and other account settings via https://login.< uaa address >/profile
+2. Administrator wants to remove the application authorities selection users see when logging in to Stratos via SSO for the first time
+   - This is carried out at the Admins discretion
+   - Using the `uaac` cli update the 'autoapprove' property of the client used by Stratos to either `true` for all authorities or a comma separated list for the authorities to be removed.
+
+     ```
+     uaac client update <console client> --autoapprove true
+     ```
+3. User sees the error message `No scopes were granted` when trying to log in to Stratos via SSO
+   - User may not have selected any of the application authorities when logging in to Stratos via SSO for the first time
+   - Either of the resolutions to 1 and 2 can be made
diff --git a/website/docs/deploy/cloud-foundry/cloud-foundry.md b/website/docs/deploy/cloud-foundry/cloud-foundry.md
index 1f876ced45..88961f85b8 100644
--- a/website/docs/deploy/cloud-foundry/cloud-foundry.md
+++ b/website/docs/deploy/cloud-foundry/cloud-foundry.md
@@ -65,7 +65,7 @@ applications:
 
 This will set the the UAA client and UAA secret used to invite users for the default CF only.
 
-See the [invite users guide](../guides/admin/invite-user-guide) for more information about user invites in Stratos.
+See the [invite users guide](../../advanced/invite-user-guide) for more information about user invites in Stratos.
 
 #### Use of the Default Embedded SQLite Database
 
@@ -127,7 +127,7 @@ cf push console -o splatform/stratos:stable -m 128M -k 384M
 
 Alternatively cf push using a manifest
 
-- download [manifest-docker.yml](../../../manifest-docker.yml) or create your own manifest file:
+- download [manifest-docker.yml](https://raw.githubusercontent.com/cloudfoundry/stratos/master/manifest-docker.yml) or create your own manifest file:
     ```yaml
     applications:
     - name: console
@@ -147,7 +147,7 @@ Follow instructions [here](db-migration).
 
 ## Use SSO Login
 
-By default Stratos will present its own login UI and only supports username and password authentication with your UAA. You can configure Stratos to use UAA's login UI by specifying the  the `SSO_LOGIN` environment variable in the manifest, for example:
+By default Stratos will present its own login UI and only supports username and password authentication with your UAA. You can configure Stratos to use UAA's login UI by specifying the `SSO_LOGIN` environment variable in the manifest, for example:
 
 ```
 applications:
diff --git a/website/docs/developer/deploy.md b/website/docs/developer/deploy.md
new file mode 100644
index 0000000000..24c4e3305c
--- /dev/null
+++ b/website/docs/developer/deploy.md
@@ -0,0 +1,8 @@
+---
+title: Deploy Dev Guide
+sidebar_label: Overview
+---
+
+As described in the [Deploying Stratos](../overview.md) section there are a number of ways that Stratos can be deployed. From a development perspective some, like `cf push`, are simpler than others, like `helm install`.
+
+We're looking at expanding our documentation for all cases, what is found here is the start of that process.
\ No newline at end of file
diff --git a/website/docs/developer/developers-guide-helm.md b/website/docs/developer/developers-guide-helm.md
new file mode 100644
index 0000000000..7a04476f8b
--- /dev/null
+++ b/website/docs/developer/developers-guide-helm.md
@@ -0,0 +1,59 @@
+---
+title: Helm Development Guide
+sidebar_label: Helm
+---
+
+
+:::info
+This document is currently in progress and will be expanded in the future.
+:::
+
+
+## Building Images
+
+The images references by the helm charts are built in two stages.
+
+### Base Images
+
+Changes to these happen infrequently, so not every dev cycle requires this step.
+
+1. Ensure your docker hub credentials are set
+   1. `docker login`
+1. Create and push images to docker hub
+   1. `cd deploy/stratos-base-images`
+   1. `./build-base-images.sh -o dockerhuborgname -p`
+       - `p` pushes the images to dockerhub. Replace `dockerhuborgname` with the docker hub org where test images should be pushed
+   1. Wait for script to complete, this may take a while
+
+:::note
+If you receive the error ``"--squash" is only supported on a Docker daemon with experimental features enabled`` during build enable
+experimental feature by
+1. Add `"experimental": true` to ~/.docker/config.json
+1. Restart docker - `sudo systemctl restart docker`
+1. `docker version` should show client with experimental feature enabled
+:::
+
+### All Other Images
+
+Changes to these will occur more often and are built upon the base images created above. This step is executed with the command command used
+to build the charts below.
+
+## Building Charts
+
+1. Ensure your docker hub credentials are set
+   1. `docker login`
+1. Create the charts, and create and push images to docker hub
+   1. `cd deploy/kubernetes`
+   1. `./build.sh -t 4.0.1 -o dockerhuborgname -p`
+      -`p` pushes the images to dockerhub. Replace `dockerhuborgname` with the docker hub org where test images should be pushed. This should match where your base images are
+      -`t` will tag the images with a version
+   1. The new charts with updated image references will be created in `deploy/kubernetes/helm-charts`
+
+### Testing built output
+
+1. `cd deploy/kubernetes`
+1. Install the usual way, with your namespace and values (if required). For example
+   ```
+   helm install console helm-chart --namespace=console --values stratos-values.yaml
+   ```
+
diff --git a/website/docs/developer/frontend.md b/website/docs/developer/frontend.md
index 572dd2032a..3d8659cfb8 100644
--- a/website/docs/developer/frontend.md
+++ b/website/docs/developer/frontend.md
@@ -12,12 +12,12 @@ Before making changes to the frontend code you should be familiar with
 1. Redux / NGRX / Observables
 1. Node / NPM
 
-There are a some introduction style resources [here](/docs/developer/developers-guide-env-tech.md). There's also some advice on helpful [VS code plugins](/docs/developer/developers-guide-env-tech#vs-code-plug-ins). If you feel comfortable with these and are happy with your dev environment please skip straight to
+There are a some introduction style resources [here](./developers-guide-env-tech.md). There's also some advice on helpful [VS code plugins](./developers-guide-env-tech#vs-code-plug-ins). If you feel comfortable with these and are happy with your dev environment please skip straight to
 [Set up Dependencies](#set-up-dependencies).
 
 ## Set up Dependencies
 
-* Set up a Stratos backend. Both backend and frontend exist in this same repo. Follow the [Backend Development](/docs/developer/introduction#build--run-locally) set up guide.
+* Set up a Stratos backend. Both backend and frontend exist in this same repo. Follow the [Backend Development](./introduction#build--run-locally) set up guide.
 * Install [NodeJs](https://nodejs.org) (if not already install) (minimum node version 12.13.0)
 * Install [Angular CLI](https://cli.angular.io/) (if not already install) - `npm install -g @angular/cli`
 
@@ -55,7 +55,7 @@ We use the angular material theming mechanism. See [here](https://material.angul
 
 ### Extensions
 
-Documentation on extensions can be found [here](/docs/extensions/introduction). From a developers perspective extensions are managed by npm packages.
+Documentation on extensions can be found [here](../extensions/introduction). From a developers perspective extensions are managed by npm packages.
 The default set are in `./src/frontend/packages`, any package added directly here will be automatically included by the build.
 
 At build time the Stratos Devkit (`./src/frontend/packages/devkit`) will ensure all packages are imported correctly and theming, both component and console level, are applied correctly.
diff --git a/website/docs/developer/introduction.md b/website/docs/developer/introduction.md
index 8741bb4125..e2e70572b7 100644
--- a/website/docs/developer/introduction.md
+++ b/website/docs/developer/introduction.md
@@ -32,6 +32,6 @@ This will build both the frontend and backend and run the backend in a mode wher
 
 You can open a web browser and navigate to (https://127.0.0.1:5443) and login with username `admin` and password `admin`.
 
-> To develop the frontend we recommend reading through the [frontend](/docs/developer/frontend) doc. This includes a faster way to run Stratos and see your changes.
+> To develop the frontend we recommend reading through the [frontend](./frontend) doc. This includes a faster way to run Stratos and see your changes.
 
-> Additional back end docs are available [here](/docs/developer/backend) before making any changes to the code.
+> Additional back end docs are available [here](./backend) before making any changes to the code.
diff --git a/website/docs/extensions/frontend.md b/website/docs/extensions/frontend.md
index 6bed192aae..3a72048b86 100644
--- a/website/docs/extensions/frontend.md
+++ b/website/docs/extensions/frontend.md
@@ -15,7 +15,7 @@ We use Decorators to annotate components to indicate that they are Stratos exten
 
 An example illustrating the various front-end extension points of Stratos is included in the folder `src/frontend/packages/example-extensions`.
 
-To run Stratos with these customizations see [here](/docs/extensions/introduction#acme).
+To run Stratos with these customizations see [here](./introduction#acme).
 
 For a walk-through of extending Stratos, see [Example: Adding a Custom Tab](#example-adding-a-custom-tab).
 
@@ -60,7 +60,7 @@ Your route should have the following metadata in the `data` field of the route:
 
 Where `<TITLE>` is the text label to show in the side navigation and `<ICON NAME>` is the icon to use.
 
-> The routing module must be, or referenced by, the core routing module as described [above](/docs/extensions/frontend#including-modules-and-routes)
+> The routing module must be, or referenced by, the core routing module as described [above](./frontend#including-modules-and-routes)
 
 An example routing module would be:
 
@@ -101,11 +101,11 @@ Tabs can be added to the following views in Stratos:
 - The Cloud Foundry Org view that shows detail for a Cloud Foundry organization
 - The Cloud Foundry Space view that shows detail for a Cloud Foundry space
 
-A step by step guide on how to create a custom tab can be found [below](/docs/extensions/frontend#example-adding-a-custom-tab).
+A step by step guide on how to create a custom tab can be found [below](./frontend#example-adding-a-custom-tab).
 
 For example:
 
-![Example Application tab extension](../../images/extensions/app-tab-example.png)
+![Example Application tab extension](/images/extensions/app-tab-example.png)
 
 The approach for all of these is the same:
 
@@ -130,14 +130,13 @@ The approach for all of these is the same:
     - < LABEL > is the text label to use for the tab
     - < LINK > is the name to use for the route (this must only contain characters permitted in URLs)
     An example is included in the file `src/frontend/packages/example-extensions/src/app-tab-extension/app-tab-extension.component.ts`.
-1. Declare the component to avoid Angular tree shaking
-   - In the same module that the component is 'declared' in add the following to `imports`
+1. Declare the component to avoid Angular tree shaking. In the same module that the component is 'declared' in add the following to `imports`
     ```
       ExtensionService.declare([
         <component name>,
       ])
     ```
-> The module referencing the component, or another referencing it, must be imported by the core module as described [above](/docs/extensions/frontend#including-modules-and-routes).
+  > The module referencing the component, or another referencing it, must be imported by the core module as described [above](./frontend#including-modules-and-routes).
 
 ### Custom Actions
 
@@ -152,7 +151,7 @@ Actions can be added to the following views in Stratos:
 
 An action is a icon button that appears at the top-right of a View. For example:
 
-![Example Application action extension](../../images/extensions/appwall-action-example.png)
+![Example Application action extension](/images/extensions/appwall-action-example.png)
 
 The approach for all of these is the same:
 
@@ -179,15 +178,14 @@ The approach for all of these is the same:
     - < LABEL > is the text label to use for the tooltip of the icon (optional)
     - < LINK > is the name to use for the route (this must only contain characters permitted in URLs)
     An example is included in the file `src/frontend/packages/example-extensions/src/app-action-extension/app-action-extension.component.ts`.
-1. Declare the component to avoid Angular tree shaking
-   - In the same module that the component is 'declared' in add the following to `imports`.
-    ```
-      ExtensionService.declare([
-        <component name>,
+1. Declare the component to avoid Angular tree shaking. In the same module that the component is 'declared' in add the following to `imports`.
+     ```
+     ExtensionService.declare([
+      <component name>,
       ])
-    ```
+     ```
 
-> The module referencing the component, or another referencing it, must be imported by the core module as described in [above](/docs/extensions/frontend#including-modules-and-routes)
+  > The module referencing the component, or another referencing it, must be imported by the core module as described in [above](./frontend#including-modules-and-routes)
 
 ### Loading Indicator
 
@@ -268,7 +266,7 @@ A customization service provides a number of smaller extension points.
 
 |Property | Description|
 |--|--|
-|hasEula| True if there's a EULA to show. When set to true the asset `/core/eula.html` must exist. For information about custom package assets see the images section [here](/docs/extensions/theming#new-images).  |
+|hasEula| True if there's a EULA to show. When set to true the asset `/core/eula.html` must exist. For information about custom package assets see the images section [here](./theming#new-images).  |
 |copyright| Text shown at the bottom of the side nav|
 |logoText| Text shown with the side nav logo|
 |aboutInfoComponent| Replace the component used in the Stratos `About` page|
@@ -456,4 +454,4 @@ export class MyExampleModule { }
 
 ### Run it
 
-You should now be able to run Stratos [locally](/docs/developer/introduction) and see this new tab on the application page for an application.
+You should now be able to run Stratos [locally](../developer/introduction#build--run-locally) and see this new tab on the application page for an application.
diff --git a/website/docs/extensions/introduction.md b/website/docs/extensions/introduction.md
index b36474090c..775068c4c9 100644
--- a/website/docs/extensions/introduction.md
+++ b/website/docs/extensions/introduction.md
@@ -5,7 +5,7 @@ sidebar_label: Introduction
 
 Stratos can be customized in a number of ways. Colors and fonts can be updated to add unique branding, additional menu items can be added in a number of places, custom EULAs can be used, new Stratos Jetstream (backend) endpoints, and much more.
 
-> For those with existing customization migrating to 4.0 please see our [upgrade guide](/docs/extensions/v4-migration).
+> For those with existing customization migrating to 4.0 please see our [upgrade guide](./v4-migration).
 
 ## Approach
 
@@ -15,16 +15,16 @@ In order to customize Stratos, you will need to fork the Stratos GitHub reposito
 
 Frontend customizations are placed in angular packages in the folder named `src/frontend/packages`. In the future you will be able to host these packages in npm and bring them into Stratos in the usual npm dependency way. There are no additional processes or build steps required for Stratos to then integrate these packages. All steps will be automatically applied under the hood during `npm install` and when `ng build`/`ng serve` runs.
 
-Information on custom theming can be found in the [theming page](/docs/extensions/theming).
+Information on custom theming can be found in the [theming page](./theming).
 
-Information on additional functionality can be found in the [extensions page](/docs/extensions/frontend).
+Information on additional functionality can be found in the [extensions page](./frontend).
 
 ### Backend (Jetstream)
 
 Jetstream customizations are written in go and can be added in `src/jetstream/plugins`. In the future we hope to combine this work with the frontend changes, such that all functionality for
 a feature can be applied to Stratos in a similar way.
 
-More information can be found in the [custom plugins page](/docs/extensions/backend).
+More information can be found in the [custom plugins page](./backend).
 
 ## Examples
 
@@ -48,14 +48,14 @@ To run Stratos with these customizations
           - '@example/extensions'
           - '@example/theme'
       ```
-1. Run Stratos the usual way, for more information see the [Developer Guide](/docs/developer/introduction).
+1. Run Stratos the usual way, for more information see the [Developer Guide](../developer/introduction).
 
 ### SUSE
 
 More advanced, real world examples can be found the in SUSE Stratos repository, again containing [theming](https://github.com/SUSE/stratos/tree/master/src/frontend/packages/suse-theme) and [functionality](https://github.com/SUSE/stratos/tree/master/src/frontend/packages/suse-extensions) customizations.
 
-To run Stratos with these customizations simply start the console the usual way from that repo, for more information see the [Developer Guide](/docs/developer/introduction).
+To run Stratos with these customizations simply start the console the usual way from that repo, for more information see the [Developer Guide](../developer/introduction).
 
 ## Further Reading
 
-Detailed instructions on how to customize the [theme](/docs/extensions/theming), [frontend functionality](/docs/extensions/frontend) and [backend](/docs/extensions/backend) can be found in this section.
+Detailed instructions on how to customize the [theme](./theming), [frontend functionality](./frontend) and [backend](./backend) can be found in this section.
diff --git a/website/docs/extensions/v4-migration.md b/website/docs/extensions/v4-migration.md
index 1317327c26..06f87d5647 100644
--- a/website/docs/extensions/v4-migration.md
+++ b/website/docs/extensions/v4-migration.md
@@ -8,14 +8,14 @@ extensions by opening the door to npm style plugins.
 
 Prominent changes include
 - `custom-src` has been removed along with the symlink approach of including files. Custom code is now added as npm packages in `src/frontend/packages`.
-Modules and routes are now exposed in a more standard package way. More info [here](/docs/extensions/frontend#including-modules-and-routes).
+Modules and routes are now exposed in a more standard package way. More info [here](./frontend#including-modules-and-routes).
 Some existing components will not be included in some production style builds without also declaring them to the extension service, see 
 usages of `ExtensionService.declare`.
-- Material Design theming approach has been expanded to include many common colors, this removes the need to apply custom styles in a lot of cases. More info [here](/docs/extensions/theming#colors).
-- Dark theme is applied in a different way. More info [here](/docs/extensions/theming#dark-theme).
-- Image assets are replaced in a different way. More info [here](/docs/extensions/theming#images).
-- Custom component can now be themed, so theme colors can be accessed from within and applied. More info [here](/docs/extensions/theming#components).
-- A new 'loading' indicator has been added that you may wish to customize, more info [here](/docs/extensions/frontend#loading-indicator).
+- Material Design theming approach has been expanded to include many common colors, this removes the need to apply custom styles in a lot of cases. More info [here](./theming#colors).
+- Dark theme is applied in a different way. More info [here](./theming#dark-theme).
+- Image assets are replaced in a different way. More info [here](./theming#images).
+- Custom component can now be themed, so theme colors can be accessed from within and applied. More info [here](./theming#components).
+- A new 'loading' indicator has been added that you may wish to customize, more info [here](./frontend#loading-indicator).
 
 ## Basic Migration Steps
 To aid in migrating we've provided these instructions.
diff --git a/website/docs/introduction.md b/website/docs/introduction.md
index f9706d79a5..b78743dc07 100644
--- a/website/docs/introduction.md
+++ b/website/docs/introduction.md
@@ -12,7 +12,7 @@ For Cloud Foundry, it allows users and administrators to both manage application
 
 For Kubernetes, it provides Developers with views of their Kubernetes resources, the ability to view and deploy Helm Charts and view Workloads.
 
-![Stratos Application view](../images/screenshots/app-summary.png)
+![Stratos Application view](/images/screenshots/app-summary.png)
 
 ## Quick Start
 
diff --git a/website/docs/overview.md b/website/docs/overview.md
index a0c2c39d92..83e9cac93c 100644
--- a/website/docs/overview.md
+++ b/website/docs/overview.md
@@ -12,7 +12,7 @@ Stratos stores endpoint metadata in a relational database. Administrators of Str
 
 The high-level architecture of Stratos is shown in the diagram below:
 
-![Stratos High-Level Architecture](../images/high-level-arch.png)
+![Stratos High-Level Architecture](/images/high-level-arch.png)
 
 The main components:
 
diff --git a/website/docs/status_updates.md b/website/docs/status_updates.md
deleted file mode 100644
index e8751ec4ba..0000000000
--- a/website/docs/status_updates.md
+++ /dev/null
@@ -1,721 +0,0 @@
-# Status Updates
-
-Weekly status updates are published here.
-
-## 12 April 2019
-This week the Stratos team has been...
-- Presenting Stratos v2.4 features to the community in the latest project update
-- Working towards phase two of the extension project.
-- Finishing off the remove roles from cf user feature.
-- Finishing off adding an optional 'connect' step to the register endpoint stepper.
-- Reviewing and shepherding PRs into master, minor bug fixes.
-
-## 5 April 2019
-This week the Stratos team have mostly been ...
-- Improving e2e reliability and merging existing PRs.
-- Improving the create/deploy app flow. Users will now only be presented with a single button to start the flow. Their first step is to decide where the source for the app will come from (github, gitlab, locally, etc) or to create without source.
-- Removing the endpoints page when there's no persistent storage. This is now on par with the home/favourites page.
-- Adding an option that will allow the user to stay signed in to the console (if option is checked and the page remains visible).
-- Starting working towards the ability to remove all roles from a cf user with a single click (after confirmation).
-- Starting working towards an optional 'connect' step when registering an endpoint.
-- Fixed a few minor trivial bugs
-
-## 22 March 2019
-
-This week:
-
-- Work continues to complete the addition of support for Cloud Foundry User Provided Services. This is almost done. A few small issues and corner-cases cropped up which we have been working on.
-- Added support for slide-in help content and wired this into the endpoint connection dialog
-- We continued to refine the visual presentation of endpoints within Stratos
-
-## 15 March 2019
-
-This week:
-
-- Enhancing the endpoint registration view to use a tile selector
-- Updating our docs on our use cases and requirements for the Cloud Foundry V3 API
-
-## 8 March 2019
-
-This week:
-
-- Added a card view to the endpoints view
-- Continued to refine the support for User Provided Service Instances
-- Working on support to allow list views to show different entity types in the same list
-- Ensured features requiring persistence database are not enabled when using SQLite
-
-## 1 March 2019
-
-This week:
-
-- Updated the front-end code to use Angular 7 (in review)
-- Continued to add support for User Provided Service Instances
-- Reviewed, tweaked and merged our first phase of work on improving extensions support
-
-## 22 February 2019
-
-This week:
-
-- The user invite feature has been reviewed and merged
-- Front-end code restructuring to support next phase of extensions work
-- Pre-work for update to Angular 7
-- Add support for User Provided Services
-- Updates to our documentation on our needs for the Cloud Foundry V3 API
-
-**Important:**
-
-Hello All - Two CVEs in Stratos were recently discovered - both are fixed in 2.3.0 - so we **encourage you to update** to that latest version to address these issues. Both relate to the session cookie:
-
-https://www.cloudfoundry.org/blog/cve-2019-3783/
-https://www.cloudfoundry.org/blog/cve-2019-3784/
-
-**Deployment Survey**
-
-We want to understand more about how everyone is deploying Stratos - so we can better support the most used deployment scenarios and (possibly) remove some of the deployment mechanisms that aren’t being used - we’ve got a quick survey we’d love it if you could fill out: https://www.surveymonkey.co.uk/r/MLXDMKG
-
-## 15 February 2019
-
-This week:
-
-- 2.3.0 was Released!
-- The user Favourites feature has been reviewed and merged
-- We continue to fix and merge many of the outstanding PRs around User Favourites and Scalability
-- We spent half a day reviewing our next steps to re-structure the front-end code as part of our work towards the next phase of extensibility.
-- We continue to improve the suite of automated deployment tests that run continuosuly
-
-## 8 February 2019
-
-Release 2.3.0 is all ready to go and we will publish this on Monday.
-
-Otherwise, we've been working on:
-
-- Finishing a first version of the User Favourites feature
-- Finishing a first version of the User Invitation feature
-- Investigating possible security issue: https://github.com/cloudfoundry/stratos/issues/3385
-- Updates to our extensions approach 
-
-## 1 February 2019
-
-We are looking to release 2.3.0 next week having completed testing.
-
-Work has otherwise continued on four tracks:
-
-- Closing out existing PRs
-- Finishing a first version of the User Favourites feature
-- Finishing a first version of the User Invitation feature
-- Improving test automation
-
-## 25 January 2019
-
-This week:
-
-- Published a release candidate for Stratos 2.3.0 which we continue to test
-- Worked to update a few outstanding PRs - we are aiming to close out some of the remaining PRs this sprint, ahead of a re-org of our front-end code to better support extensions to Stratos in the future
-- Continued to refine the User Favourites feature
-- Worked to add the ability to invite a user into a Cloud Foundry organisation
-- Continued to improve the reliability of automated deployment tests in Jenkins
-
-## 18 January 2019
-
-We created a test release of 2.3.0 and identified a number of issues to be resolved for release.
-
-The remainder of this week was spent fixing the issues identified.
-
-A 2.3.0 Release Candidate will be published later today or on Monday of next week.
-
-We hope to finish testing and publish the 2.3.0 release next week.
-
-The 2.3.0 Change Log has been updated and is available [here](https://github.com/cloudfoundry/stratos/blob/master/CHANGELOG.md)
-
-## 11 January 2019
-
-Happy New Year!
-
-The focus of the week was in preparing 2.3.0 release:
-
-- We reviewed, updated and merged over 20 outstanding PRs that were targeted at 2.3.0 release
-- We’ve made some improvements to our Helm chart to the external service configuration
-- We’ve tweaked our release process and updated and improved our Concourse release pipelines
-- Performed initial testing of 2.3.0 build
-
-We expect to create a Release Candidate next for 2.3.0 so QA can kick the tyres as well.
-
-We’re also looking at the roadmap for this year and planning our releases throughout 2019.
-
-## 21st December 2018
-
-Rounding off our year, here's some highlights from the last few weeks.
-
-- User Favourites - Great progress has been made and we're almost ready to merge to master.
-- Page Tabs & Side Nav Update - The horizontal tabs shown in sections such as Application, Cloud Foundry, Organisation, etc have found a smart new home in a side nav. For screenshots see PR #3289
-
-PRs:
-- Add a routes list to the CF tabs, Routes Refactor & Route Bug Fixes (#3292)
-- Add deployment info for apps deployed via docker & fix info for local/archive apps (#3291)
-- Improve focus & tabbing (#3288)
-- Application Env Var fix & improvements (#3286)
-- Fix exception when navigating away from the first deploy app step (#3277)
-- Add service plan tab to service pages (#3275)
-- List Multifilter Improvements (don't show cloud foundry selector if there's only one connected) (#3270)
-- Update side nav logo with light version of new logo (#2921)
-- Hide app vars tab if user is not a space developer (#3247)
-- Show app chip list for space routes list bound apps (#3041)
-
-Community PRs:
-
-- Fixes Async Service Provisioning Bug (#3090) (merged)
-- [autoscaler] add autoscaler tab in app page (#3266)
-
-
-## 7th December 2018
-
-The team are continuing to tackle some of the smaller issues form the backlog as well as the following two features:
-
-- User Favorites - Allowing users to favorite Apps, Orgs, Spaces etc and to provide quick access to these items.
-- Inviting Users - Support for inviting users to a Cloud Foundry system via email and to grant appropriate rights to an Org/Space
-
-PRs:
-
-- Reduce size of Docker All-in-one image [\#3261](https://github.com/cloudfoundry/stratos/pull/3261)
-- Tidy up CLI login info [\#3269](https://github.com/cloudfoundry/stratos/pull/3269)
-- Add service provider name to marketplace service card [\#3268](https://github.com/cloudfoundry/stratos/pull/3268)
-- Add link to dashboard in service instance table [\#3267](https://github.com/cloudfoundry/stratos/pull/3267)
-- Add Org and Space status bar to Org/Space Cards [\#3265](https://github.com/cloudfoundry/stratos/pull/3265)
-- Helm port configuration improvements and unit tests [\#3264](https://github.com/cloudfoundry/stratos/pull/3265)
-- Add confirmation dialog to `Restage` app [\#3263](https://github.com/cloudfoundry/stratos/pull/3263)
-- Remove global manage apps link [\#3259](https://github.com/cloudfoundry/stratos/pull/3259)
-- Add user has roles filter to users tables [\#3258](https://github.com/cloudfoundry/stratos/pull/3258)
-
-
-## 30th November 2018
-
-A quieter week for the Stratos team - with some out on vacation as we head towards the festive season.
-
-PRs this week:
-
-- Make the table multi actions more obvious [\#3251](https://github.com/cloudfoundry/stratos/pull/3251)
-- Hide app vars tab if user is not a space developer [\#3247](https://github.com/cloudfoundry/stratos/pull/3247)
-- Improve resilience of e2e tests [\#3246](https://github.com/cloudfoundry/stratos/pull/3246)
-- App Wall filter and sort controls size tweaks [\#3243](https://github.com/cloudfoundry/stratos/pull/3243)
-- Deploy App: Add notification toast [\#3242](https://github.com/cloudfoundry/stratos/pull/3242)
-
-## 23rd November 2018
-
-We've been continuing to test Stratos 2.2.0 and improving test automation and E2E test reliability.
-
-We've started to work through some of the GitHub issues - the focus for the next couple of sprints is to fix and close out some of the smaller issues and bugs.
-
-We're also working to improve the scalability of Stratos with large numbers of Apps/Orgs/Spaces/Users.
-
-PRs this week:
-
-- App Deploy: Add Public GitLab Repository support [\#3239](https://github.com/cloudfoundry/stratos/pull/3239)
-- Fix CLI info formatting [\#3237](https://github.com/cloudfoundry/stratos/pull/3237)
-- Show better error message on login screen when account locked [\#3235](https://github.com/cloudfoundry/stratos/pull/3235)
-- Add Route: Use correct label for submit button [\#3231](https://github.com/cloudfoundry/stratos/pull/3231)
-- Fix for cancel broken on add route [\#3228](https://github.com/cloudfoundry/stratos/pull/3228)
-- Backend: Update to latest version of Echo Web Server [\#3216](https://github.com/cloudfoundry/stratos/pull/3216)
-- Show refresh button for latest modified application lists [\#3213](https://github.com/cloudfoundry/stratos/pull/3213)
-- Scalability: Handle large number of apps in cf dashboards [\#3212](https://github.com/cloudfoundry/stratos/pull/3212)
-- Support prometheus-boshrelease as a metrics endpoint [\#3202](https://github.com/cloudfoundry/stratos/pull/3202)
-- Fix alignment of arrow when no endpoints registered [\#3234](https://github.com/cloudfoundry/stratos/pull/3234)
-- Run customize when prebuild and log node and npm versions [\#3232](https://github.com/cloudfoundry/stratos/pull/3232)
-- Add stricter check for jetstream error object [\#3223](https://github.com/cloudfoundry/stratos/pull/3223)
-- Improve paginated/pagination action naming [\#3218](https://github.com/cloudfoundry/stratos/pull/3218)
-- Fix display of generic error bar [\#3214](https://github.com/cloudfoundry/stratos/pull/3214)
-- Only show + icon when we have at least one connected CF [\#3211](https://github.com/cloudfoundry/stratos/pull/3211)
-
-## 16th November 2018
-
-This week the team has been working on:
-
-- Testing Stratos 2.2.0
-- Enabling Extensions to be published separately
-- Test automation
-- E2E Test reliability
-- Space service tidy up [\#3197](https://github.com/cloudfoundry/stratos/pull/3197)
-
-## 9th November 2018
-
-This week the team has been:
-
-- Testing Stratos 2.2.0
-- Working towards enabling Extensions to be published separately
-- Updating developer documents: [\#3184](https://github.com/cloudfoundry/stratos/pull/3184)
-- Adding initial document for back-end plugins: [\#3189](https://github.com/cloudfoundry/stratos/pull/3189)
-- Fixed bug with deploying with folder upload: [\#3191](https://github.com/cloudfoundry/stratos/pull/3191)
-
-## 2nd November 2018
-
-This week we have mostly been:
-
-- Releasing Stratos 2.2.0. More details can be found at https://github.com/cloudfoundry/stratos/releases/tag/2.2.0. 
-- Discussing integration of the Autoscaler (https://github.com/cloudfoundry-incubator/app-autoscaler) UI (https://github.com/cloudfoundry-incubator/app-autoscaler-ui) into Stratos. We’ve provided a first round of guidance to the Autoscaler team and are looking forward to the second round next week. The initial designs look great.
-- Knowledge sharing activities revolving helm charts and concourse release pipelines
-
-## 26th October 2018
-
-The team were away attending a workshop this week.
-
-The only item of note is that we have now forked the go-flags package that was causing broken dependency issues for us and updated Stratos to use this package. This should allow us to avoid future issues with this package.
-
-## 19th October 2018
-
-We are preparing for this month's 2.2.0 release which will be out towards the end of the month.
-
-Highlights for this week:
-
-- Extensions: Fix for side nav. Add initial docs [\#3140](https://github.com/cloudfoundry/stratos/pull/3140)
-- User menu improvements [\#3136](https://github.com/cloudfoundry/stratos/pull/3136)
-- Metrics: Show table of cell health state changes instead of chart [\#3135](https://github.com/cloudfoundry/stratos/pull/3135)
-- Metrics: Update app instance cell data when scaling up [\#3133](https://github.com/cloudfoundry/stratos/pull/3133)
-- Metrics: Ensure CF Cells info is shown for non cf admins [\#3121](https://github.com/cloudfoundry/stratos/pull/3121)
-- Add 'type text to continue' to confirmation modal [\#3131](https://github.com/cloudfoundry/stratos/pull/3131)
-- Delete App Stepper: Disable delete of routes and services that are bound to other app/s [\#3129](https://github.com/cloudfoundry/stratos/pull/3129)
-- Endpoints Table: Only show 'Admin' check icon for cf endpoints [\#3132](https://github.com/cloudfoundry/stratos/pull/3132)
-
-
-## 12th October 2018
-
-The team have been preparing for and attending the CF Summit in Basel.
-
-## 5th October 2018
-
-The team have been preparing for the CF Summit in Basel next week.
-
-Highlights for this week (continuing from last week):
-
-- E2E Tests and Automation - Focusing on making the E2E tests more resilient to timing issues. 
-
-- Metrics - Added Diego Cell to the App Instances table when metrics are available and added a Cell view which shows metrics for a given Diego cell.
-
-Fixes:
-
-- Ensure we handle orgs with no users [\#3098](https://github.com/cloudfoundry/stratos/pull/3098) - fixes a bug creating a space in a new org.
-
-- Endpoint Registration: Only show SSO option for CF Endpoint type [#\3105](https://github.com/cloudfoundry/stratos/pull/3105)
-
-## 28th September 2018
-
-This week saw the release of 2.1.1 and an update 2.1.2. It was necessary to tag a 2.1.2 release to resolve a broken backend dependency that would affect users deploying via 'cf push'. You should use 2.1.2 and not 2.1.1. 
-
-*2.1.2 Highlights*
-
-- Fix go-flags dependency pinned version broken [\#3071](https://github.com/cloudfoundry/stratos/pull/3071)
-
-- App wall filtering can stop working  with some filter combinations [\#3043](https://github.com/cloudfoundry/stratos/pull/3043)
-
-- Can not connect a metrics endpoint [\#3035](https://github.com/cloudfoundry/stratos/issues/3035)
-
-- Backend build issue due to the pinned commit for a dependency being removed [\#3060](https://github.com/cloudfoundry/stratos/pull/3060)
-
-- Metrics: Wrong job can be matched up when there are multiple jobs [\#3057](https://github.com/cloudfoundry/stratos/pull/3057)
-
-
-Highlights for this week (continuing from last week):
-
-- Extensions - Work continues on adding extension points in the UI. Extensions is targeted for 2.2.0 in October.
-
-- E2E Tests and Automation - Focusing on making the E2E tests more resilient to timing issues. 
-
-- Metrics - Work to tidy up the existing Cloud Foundry Application metrics is complete.
-
-## 21st September 2018
-
-This week saw the release of 2.1.0 - the highlights are:
-
-- Stratos frontend can be pre-built before pushing to Cloud Foundry to enable AOT and reduce push time
-- SSO support refinements with the ability to now connect a Cloud Foundry endpoint using SSO in addition to SSO login to Straos itself
-- Ability to specify manifest overrides when deploying an application
-- Ability to optionally specify Client ID anc Client Secret when registering an endpoint
-- Add ability to restage an application
-- Endpoints list now shows logged in user's username and whether they're an admin
-- Switched to new Stratos logo for login and about pages
-- Backend improvements to make it easier for developers to develop with
-- Security fixes
-
-Full release information is available [here](https://github.com/cloudfoundry/stratos/releases/tag/2.1.0).
-
-Highlights for this week (continuing from last week):
-
-- Extensions - Work continues on adding extension points in the UI. Extensions is targeted for 2.2.0 in October.
-
-- E2E Tests and Automation - Focusing on making the E2E tests more resilient to timing issues. We have also spent time getting the E2E tests to run against BrowserStack to allow us to automate testing of Stratos across multiple browser types/platforms.
-
-- Metrics - Work to tidy up the existing Cloud Foundry Application metrics is complete.
-
-- JSON Schema support for Service Instance binding - We have been working to update PR [#2997](https://github.com/cloudfoundry/stratos/pull/2997) to get this feature into Stratos.
-
-Fixes/Misc:
-
-- Fix app wall filtering issue [#3043](https://github.com/cloudfoundry/stratos/pull/3043)
-- Fix for Connect button not being enabled when SSO is the default [#3004](https://github.com/cloudfoundry/stratos/pull/3004)
-- Version number always reports 'dev' [#3001](https://github.com/cloudfoundry/stratos/pull/3001)
-- Diagnostics does not show GitHub details when cloned via HTTPS [#3007](https://github.com/cloudfoundry/stratos/pull/3007)
-- Fix for NULL Client Secret bug [#3015](https://github.com/cloudfoundry/stratos/pull/3015)
-- Fix bug where token IDs are not set properly when upgrading from a previous version [#3017](https://github.com/cloudfoundry/stratos/pull/3017)
-
-## 14th September 2018
-
-We've been preparing the 2.1.0 release this week. This will be published next week. Going forward we will be publishing a new release every month. The release notes for 2.1.0 have been created and are [here](https://github.com/cloudfoundry/stratos/blob/master/CHANGELOG.md#210).
-
-Highlights for this week:
-
-- Extensions - Work continues on adding extension points in the UI. We have PRs up to support adding new side-nav items, tabs and actions. This already goes beyond what could be done in V1 of Stratos. The extension mechanism is also much cleaner due to the use of decorators. Extensions is targeted for 2.2.0 in October.
-
-- E2E Tests and Automation - Continuing to build out the E2E test suite and automate the deploy and test of Stratos in different environments (pushed to Cloud Foundry, pushed to Cloud Foundry with MySQL and Postgres, pushed to Cloud Foundry with SSO, Docker compose, Docker All-in-One)
-
-- Metrics - Work is almost complete on improving the metrics integration and presentation in the UI. Rather than display a timeline under each graph, we are switching to a control to allow you to choose the time period.
-
-Other updates:
-
-- Allow auto-registration name to be configured [#2986](https://github.com/cloudfoundry/stratos/pull/2986)
-- SSO: Refinements [#2982](https://github.com/cloudfoundry/stratos/pull/2982)
-  - Fix consistency of SSO casing and hyphenation => 'Single Sign-On'
-  - Make SSO default when connecting if enabled for the endpoint
-  - Move the SSO Allowed checkbox to the bottom in 'Advanced Options', so that the form does not move when the checkbox is checked and the advisory text appears
-- Add check to make sure DB Schema migrations have completed (fixes an issue with diagnostics and a possible race-condition when deployed via Helm or Docker Compose) [#2977](https://github.com/cloudfoundry/stratos/pull/2977)
-
-
-## 7th September 2018
-
-Update for this week:
-
-- Single Sign-On - Added the ability to enable SSO Login when using the Setup screen.
-
-- Metrics - Work continues to improve the metrics integration and presentation in the UI
-
-- Extensions - Work has started on adding extension points in the UI. This will be accomplished via decorators, in the same way that Angular uses decorators for Components etc. [#2962](https://github.com/cloudfoundry/stratos/pull/2962)
-
-- Deploy App Manifest overrides - Added an extra step in the 'Deploy App' flow to allow you to override manifest settings before deploying [#2924](https://github.com/cloudfoundry/stratos/pull/2924) 
-
-- Show Service plan cost when selecting a service plan (if not free) [#2959](https://github.com/cloudfoundry/stratos/pull/2959)
-
-- E2E Tests - Resolved GitHub rate limits issues when running E2E Tests [#2949](https://github.com/cloudfoundry/stratos/pull/2949)
-
-- Travis - The Travis build has been restructured to run jobs in parallel and E2E tests now run against PRs in addition to branches.
-
-
-## 31st August 2018
-
-Update for this week:
-
-- Go-backend re-structure - The additional cleanup work has been merged.
-
-- Single-Sign-On - Further work on Single-Sign On:
-  - Improvements - improve error handling, add navigate straight to login option [#2522](https://github.com/cloudfoundry/stratos/pull/2522)
-  - Link tokens rather than copying them [#2916](https://github.com/cloudfoundry/stratos/pull/2916)
-  - Allow a Cloud Foundry endpoint to be connected with SSO login [#2928](https://github.com/cloudfoundry/stratos/pull/2928)
-
-- Allow Client ID and Secret to be set when registering an endpoint [#2920](https://github.com/cloudfoundry/stratos/pull/2920)
-
-- Scalability:
-  - Change application list in service instance table row from vertical to chip list [#2915](https://github.com/cloudfoundry/stratos/pull/2915)
-  - Convert space apps list from local to remote [#2913](https://github.com/cloudfoundry/stratos/pull/2913)
-
-- Metrics - Work has started on tidying up and improving the metrics views
-
-## 24th August 2018
-
-Update for this week:
-
-- Go-backend re-structure - This work has now been merged and should make it easier to develop with and contribute to. Some additional clean up was done and is awaiting PR review.
-
-- Extended end-to-end test suite - Further work to build-out the E2E test suite. See:
-  - Services E2E: Service Instance creation with App Binding [#2855](https://github.com/cloudfoundry/stratos/pull/2855)
-  - E2E: Basic Application Routes tests [#2862](https://github.com/cloudfoundry/stratos/pull/2862)
-  - E2E: Basic Application Instances tests [#2863](https://github.com/cloudfoundry/stratos/pull/2863)
-  - E2E: Basic test for Cf/Org/Space users tables [#2904](https://github.com/cloudfoundry/stratos/pull/2904)
-
-- Small improvements and fixes for the Diagnostics page [#2860](https://github.com/cloudfoundry/stratos/pull/2860)
-
-
-## 17th August 2018
-
-Update for this week:
-
-- 2.0.1 - We tagged a 2.0.1 release. This is identical to 2.0.0 and only fixes an issue with a broken dependency - one of the pinned dependencies was no longer working. This issue only affects you if you were pushing to Cloud Foundry from the 2.0.0 tag.
-
-- Pre-built UI - We added the ability to pre-build the UI before pushing to Cloud Foundry. This allows you to build the UI with AOT (Ahead-of-time) compilation enabled and push to CF. This will also reduce push time. See the doc [Pre-building the UI](https://github.com/cloudfoundry/stratos/tree/master/deploy/cloud-foundry#pre-building-the-ui).
-
-- Go-backend re-structure. Work is almost complete on re-structuring the go backend to make it easier to develop with and contribute to. See issue [#2815](https://github.com/cloudfoundry/stratos/issues/2815).
-
-- Extended end-to-end test suite
-
-## 10th August 2018
-A similar update to last week, focusing on metrics, testing and the community.
-
-- Testing the new metrics deployment process.
-- Improving the end to end test setup process, this will enable better coverage of service tests.
-- Improving test coverage, both unit and end to end, of the often used list component.
-- Improving test coverage of entity validation, another often used component.
-- Manage application stats requests better in the application wall when there are many many started apps.
-- Investigating, solving and shepherding community issues. Some of the stand out ones..
-  - Stratos URLs are now consistent. Previously for the same CF the id would change every time it's registered, meaning bookmarks would need updating following every re-registration. Now as long as the CF API url doesn't change the CF id in the url will remain the same. - https://github.com/cloudfoundry/stratos/issues/2798
-  - Correctly report application instance counts with respect to app state - https://github.com/cloudfoundry/stratos/issues/2797
-  - Apply permissions to application actions (start, restart, etc) - https://github.com/cloudfoundry/stratos/issues/2806
-
-## 3 August 2018
-This week we've focused on..
-
-- Making metrics components easier to deploy. This will help us apply polish and publicise CF metrics in the coming weeks.
-- Improving test suites and coverage.
-- Responding to community issues. There's been an increase in use and some great contributions.
-- Fixing older, but still valid, issues that haven't quite been important to address at the time.
-
-In addition we’ve created a short (a few minutes) survey to get a better idea how the community plan to use Stratos. Answers and feedback will directly impact the direction we take Stratos, so the quicker we have responses the quicker we can act on them. Follow this link to start answering https://www.surveymonkey.com/r/2L8XWST
-
-## 27 July 2018
-
-The main news this week is that we have released a first version of Stratos 2.0.
-
-We've been focused over the past weeks on fixing bugs and improving tests and we're delighted to have reached this milestone.
-
-The release details are available here - https://github.com/cloudfoundry/stratos/releases/tag/2.0.0.
-
-We've also started to catch up on some of the outstanding PRs, especially submitted from the community, for example:
-
-- Change DB schema and backend to support storing a client/secret for each Endpoint [\#2622](https://github.com/cloudfoundry/stratos/pull/2622)
-- Fix migrate script to work in Postgresql [\#2601](https://github.com/cloudfoundry/stratos/pull/2601)
-
-## 20 July 2018
-
-This week the focus has been on further testing and refinement of Release Candidate 2.
-
-We will be publishing a Release Candidate 3 on Monday 23 July. We expect this to be the final RC and will most likely promote this to be the final Version 2 release later next week.
-
-We've been focused on more test automation and building out more end-to-end tests, in addition to fixing a few bugs.
-
-We had an issue with the Angular AOT + build optimization which pushed the final RC into next week. This took a while to get to the bottom of.
-
-For a full list of merged PRs this week, see: [Merged PRs](https://github.com/cloudfoundry/stratos/pulls?page=1&q=is%3Apr+is%3Amerged+updated%3A%3E%3D2018-07-13&utf8=%E2%9C%93).
-
-## 13 July 2018
-
-The SUSE team has been participating in SUSE Hack Week, so there is no change in status this week.
-
-Work resumes next week on getting a first 2.0 release published.
-
-## 06 July 2018
-
-This week the focus has been on further testing and refinement of Release Candidate 2.
-
-We've been identifying and fixing issues - see: [Merged PRs](
-https://github.com/cloudfoundry/stratos/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aclosed+updated%3A%3E%3D2018-07-02+).
-
-## 29 June 2018
-
-This week the focus has been on creating a Release Candidate of Version 2.
-
-In fact, we published two Release Candidates - at the start and end of the week - full details here:
-https://github.com/cloudfoundry/stratos/releases
-
-A large number of bugs and smaller issues have been resolved since last week's Beta 2 release - full details here: https://github.com/cloudfoundry/stratos/compare/2.0.0-beta-002...2.0.0-rc2
-
-Work has been focused on testing the Release Candidates and fixing defects.
-
-## 22 June 2018
-
-This week the focus has been on creating a second Beta release of Version 2.
-
-A large number of bugs and smaller issues have been resolved - full details here: https://github.com/cloudfoundry/stratos/releases/tag/2.0.0-beta-002.
-
-
-## 15 June 2018
-
-We are working towards a release of V2. We are now functionally complete and are working through priority 1 issues and defects.
-
-- The release schedule is updated here - [Roadmap](roadmap.md).
-- Priority 1 defects are labelled P1 - you can view them with this [Filter](https://github.com/cloudfoundry/stratos/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3AP1)
-- We have tagged a Beta 1 of Version 2 of Stratos today - https://github.com/cloudfoundry/stratos/releases/tag/v2.0.0-beta-001
-
-We've been working through a large number of defects this week -
-
-- Deploy info card shows both file and folder info [\#2351](https://github.com/cloudfoundry/stratos/issues/2351)
-- App Service Instances: Modal appears off screen [\#2347](https://github.com/cloudfoundry/stratos/issues/2347)
-- Users list is empty after cancel [\#2339](https://github.com/cloudfoundry/stratos/issues/2339)
-- We still show large no connected CF endpoints even when you connect a metrics endpoint [\#2332](https://github.com/cloudfoundry/stratos/issues/2332)
-- Connected endpoint does not show 'unregister' action [\#2321](https://github.com/cloudfoundry/stratos/issues/2321)
-- Service instance page shows no 'no cf connected' warning [\#2320](https://github.com/cloudfoundry/stratos/issues/2320)
-- No page header on Cloud Foundry pages when you go directly there [\#2319](https://github.com/cloudfoundry/stratos/issues/2319)
-- Service Instance entity is not updated after unbinding an app [\#2317](https://github.com/cloudfoundry/stratos/issues/2317)
-- Service broker card intermittently appears immediately below service summary card [\#2314](https://github.com/cloudfoundry/stratos/issues/2314)
-- Select cf/org/space in create service instance stepper mentions `app` [\#2313](https://github.com/cloudfoundry/stratos/issues/2313)
-- Adding a space scoped service should not show org/space selection step [\#2311](https://github.com/cloudfoundry/stratos/issues/2311)
-- Front-end unit tests are unreliable in Travis [\#2308](https://github.com/cloudfoundry/stratos/issues/2308)
-- Not all backend tests are run [\#2300](https://github.com/cloudfoundry/stratos/issues/2300)
-- Log Stream token refresh does not work [\#2299](https://github.com/cloudfoundry/stratos/issues/2299)
-- Marketplace: Service Broker card should be hidden if the broker isn't returned by API [\#2279](https://github.com/cloudfoundry/stratos/issues/2279)
-- Endpoint Users are not refetched when an endpoint is reconnected as a different user. [\#2274](https://github.com/cloudfoundry/stratos/issues/2274)
-- Marketplace service cards tags list fails to expand [\#2263](https://github.com/cloudfoundry/stratos/issues/2263)
-- App bound service is shown in services to bind to list [\#2253](https://github.com/cloudfoundry/stratos/issues/2253)
-- Error response handling is broken [\#2242](https://github.com/cloudfoundry/stratos/issues/2242)
-- Investigate issue with space-scoped services being returned incorrectly by the `List Services for Space` request [\#2240](https://github.com/cloudfoundry/stratos/issues/2240)
-- App Log Stream shows `Connecting....` for apps that aren't running [\#2235](https://github.com/cloudfoundry/stratos/issues/2235)
-- Map Existing Routes: Sort by apps attached is broken [\#2210](https://github.com/cloudfoundry/stratos/issues/2210)
-- Application: OFFLINE WHILE UPDATING state only allows the delete action. [\#2208](https://github.com/cloudfoundry/stratos/issues/2208)
-- Cf/Org/Space filters are not updating on endpoint change [\#2162](https://github.com/cloudfoundry/stratos/issues/2162)
-- Component effects are cropped in steppers [\#2116](https://github.com/cloudfoundry/stratos/issues/2116)
-- Cloud Foundry orgs and space views contain multiple app-headers [\#2051](https://github.com/cloudfoundry/stratos/issues/2051)
-- 2nd row of tabs sometimes disappears [\#2005](https://github.com/cloudfoundry/stratos/issues/2005)
-- Instances tab shows Unknown when scaling \(with crashed app\) [\#2002](https://github.com/cloudfoundry/stratos/issues/2002)
-- Console setup improvements \#2 [\#1974](https://github.com/cloudfoundry/stratos/issues/1974)
-- Services page does not update after connecting/disconnected an SCF [\#1973](https://github.com/cloudfoundry/stratos/issues/1973)
-- White bar flashes at top of page on Cloud Foundry page [\#1963](https://github.com/cloudfoundry/stratos/issues/1963)
-- Show service type in service wall card [\#2315](https://github.com/cloudfoundry/stratos/issues/2315)
-- Show space name in space broker card [\#2312](https://github.com/cloudfoundry/stratos/issues/2312)
-- Add confirmation modals where required [\#2257](https://github.com/cloudfoundry/stratos/issues/2257)
-- Add git commit id and whether user is an admin on the about page [\#2246](https://github.com/cloudfoundry/stratos/issues/2246)
-- Update base images for git vulnerability CVE 2018-11235 [\#2241](https://github.com/cloudfoundry/stratos/issues/2241)
-- Update service steppers following async stepper changes [\#2234](https://github.com/cloudfoundry/stratos/issues/2234)
-- CF Permissions - Apply to user management [\#2226](https://github.com/cloudfoundry/stratos/issues/2226)
-- CF Permissions - Apply to services [\#2225](https://github.com/cloudfoundry/stratos/issues/2225)
-- CF Permissions - Apply to App Wall + Summary [\#2224](https://github.com/cloudfoundry/stratos/issues/2224)
-- V1 e2e fix [\#2316](https://github.com/cloudfoundry/stratos/pull/2316) ([nwmac](https://github.com/nwmac))
-
-
-## 08 June 2018
-
-The team have been working on the following issues and PRs this week:
-
-- Front-end unit tests are unreliable in Travis [#3208](https://github.com/cloudfoundry/stratos/issues/2308) - we're seeing a lot of problems with the front-end unit tests when running in Travis - we're continuing to dig into this issue to understand what the cause is, since this is affecting reliability of PR gate checks.
-
-- Services permissions [#2284](https://github.com/cloudfoundry/stratos/pull/2284) - wiring the user permissions service into the Service UI to ensure users are only presented with actions that they are permitted to perform.
-
-- Allow metrics endpoint token to be shared [#2283](https://github.com/cloudfoundry/stratos/pull/2283) - adding support for the admin user to connect to a Prometheus metrics endpoint and then make that connection available to all users. Note that non-admins can only see metrics for applications that they have permission to view.
-
-- Show whether user is an admin on the about page [#2306](https://github.com/cloudfoundry/stratos/pull/2306) - we now indicate on the about page if the current user is an administrator of Stratos.
-
-- Add Permissions to CF Users tables [#2291](https://github.com/cloudfoundry/stratos/pull/2291) - wired in the user permissions service into the Cloud Foundry user management UI.
-
-- Wire in actions to app state [#2288](https://github.com/cloudfoundry/stratos/pull/2288) - actions on the application view now use the same rules as in V1 to determine which actions should be shown based on the current application state.
-
-- Quicker e2e tests for PRs  [#2273](https://github.com/cloudfoundry/stratos/pull/2273) - changed the way e2e tests run for PRs. They will now use a quicker local deployment rather than a full deployment in docker.
-
-- Only show add and deploy buttons when there is at least 1 connected CF [#2285](https://github.com/cloudfoundry/stratos/pull/2285) - we now only show the add and deploy buttons on the application wall when there is a Cloud Foundry available.
-
-- Fetch cf users when not cf admin [#2282](https://github.com/cloudfoundry/stratos/pull/2282) - ensuring that we use different APIs call when the user is not an admin in order to retrieve the data to display for the user list.
-
-- Hide service broker card if broker information isn't available [#2287](https://github.com/cloudfoundry/stratos/pull/2287) - we now hide the service broker card if we can not retrieve the broker metadata.
-
-- Only allow password change if user has password.write scope [#2278](https://github.com/cloudfoundry/stratos/pull/2278) - user is now only presented with the option to change their password if they have permission to do so.
-
-- Backend logging improvements [#2267](https://github.com/cloudfoundry/stratos/pull/2267) - first round of tidy up to the back-end logging, including not logging an error when verifying the user's seesion when they don't have a valid session.
-
-- Use local fonts [#2260](https://github.com/cloudfoundry/stratos/pull/2260) - all fonts are now served up by the app itself to allow air-gapped deployment.
-
-- Endpoint confirmation modals [#2258](https://github.com/cloudfoundry/stratos/pull/2258) - added confirmation modals when disconnecting or un-registering and endpoint.
-
-- Added theming section to developer guide readme [#2249](https://github.com/cloudfoundry/stratos/pull/2249) - added documentation on how theming is done for Stratos.
-
-- Update permissions when when entities are updated [#2221](https://github.com/cloudfoundry/stratos/pull/2221) - we now ensure that permissions are updated when endpoints (and other entities) are updated in Stratos.
-
-## 01 June 2018
-
-The team have been working on the following issues and PRs this week:
-
-- Upgrade to Angular 6 [#2227](https://github.com/cloudfoundry/stratos/pull/2227) - Completed work and testing. Will merge early next week.
-
-- Edit service instance from Services Wall [#2233](https://github.com/cloudfoundry/stratos/pull/2233) - Added ability to edit an existing service instance.
-
-- E2E Tests [#1523](https://github.com/cloudfoundry/stratos/issues/1523) - Continuing to extend E2E test suite.
-
-- Fix compression issue [#2248](https://github.com/cloudfoundry/stratos/pull/2248) - Fixed an issue when Stratos accessed a Cloud Foundry instance with gzip compression enabled. Thanks to everyone for their help with this one.
-
-- Fix App SSH (Broken when auth and token endpoints are different) [#2250](https://github.com/cloudfoundry/stratos/pull/2250) - Fixed an issue with Application SSH for some CF deplyoments.
-
-- Fix application issue on reload when served by backend [#2238](https://github.com/cloudfoundry/stratos/pull/2238) - Fixed an issue where refreshing the browser on application pages resulted in a 404 (when deployed via cf push)
-
-
-
-## 25 May 2018
-
-The team have been working on the following issues and PRs this week:
-
-- Upgrade to Angular 6 [#2227](https://github.com/cloudfoundry/stratos/pull/2227)
-
-- Handle async request progress/success/failure in modals [#2223](https://github.com/cloudfoundry/stratos/pull/2223) - Improving busy state and error feedback in modals - e.g. when creating an application, creating a space etc
-
-- Service Summary tab [#2219](https://github.com/cloudfoundry/stratos/pull/2219) - add a summary tab to the view for a service, to show summary metadata
-
-- Add support for back-end custom plugins [#2217](https://github.com/cloudfoundry/stratos/pull/2217)
-
-- Apply user permissions to CF pages (2) [#2212](https://github.com/cloudfoundry/stratos/pull/2212) - Completion of work to wire in user permissions into the Cloud Foundry view
-
-
-## 18 May 2018
-
-The team have been working on the following issues and PRs this week:
-
-- User permissions [#2147](https://github.com/cloudfoundry/stratos/pull/2147) - adding in the framework to control UI elements based on the user's permissions
-
-- Apply user permissions to CF pages [#2198](https://github.com/cloudfoundry/stratos/pull/2198) - appropriately show the CF actions a user can perform based on their permissions
-
-- Service instances view [#2074](https://github.com/cloudfoundry/stratos/issues/2074) - adding a view to show service instances
-
-- Services Wall: Create Services instance [#2163](https://github.com/cloudfoundry/stratos/pull/2163) - adding support for creating service instances from the service marketplace view
-
-- App Services tab: Allow user to bind a service instance [#2188](https://github.com/cloudfoundry/stratos/pull/2188)
-
-- E2E Tests and E2E Test setup improvements [#2183](https://github.com/cloudfoundry/stratos/pull/2183)
-
-- Add support for Angular XSRF protection [#2153](https://github.com/cloudfoundry/stratos/pull/2153) - adding support for the Angular XSRF protection mechanism
-
-- Remove deprecated API & Add confirmation dialogs when detaching/removing service bindings [#2193](https://github.com/cloudfoundry/stratos/pull/2193)
-
-
-
-
-## 11 May 2018
-
-The work to get V2 to the same level of functionality as V1 is going well and we're nearing completion - the team have been working on the following issues and PRs this week:
-
-- Add restart app button [#2140](https://github.com/cloudfoundry/stratos/pull/2140) - adding restart action to applications
-
-- CF Push: Bump up memory further [#2135](https://github.com/cloudfoundry/stratos/pull/2135) - increase memory when pushing to work around the memory-hungry Angular compiler
-
-- Service instances view [#2074](https://github.com/cloudfoundry/stratos/issues/2074) - adding a view to show service instances
-
-- User permissions [#2147](https://github.com/cloudfoundry/stratos/pull/2147) - adding in the framework to control UI elements based on the user's permissions
-
-- Customizations [#2133](https://github.com/cloudfoundry/stratos/pull/2133) - initial support for customizing Stratos (theme etc)
-
-- E2E Tests [#1523](https://github.com/cloudfoundry/stratos/issues/1523) - putting in place the E2E framework for V2, getting this working in Travis and porting over the V1 Endpoints tests.
-
-- Delete App should show dependencies and allow optional deletion [#2044](https://github.com/cloudfoundry/stratos/pull/2044) - when deleting an application the user is shown the application dependencies (routes, service instances) and is able to delete these with the application or leave them in place for use by other applications
-
-- Cloud Foundry: Manage Users [#1541](https://github.com/cloudfoundry/stratos/issues/1541) - re-introducing the equivalent features that V1 has allowing user to manage user roles across Cloud Foundry
-
-## 4 May 2018
-
-The team have been working on the following issues and PRs this week:
-
-- E2E Tests [#1523](https://github.com/cloudfoundry/stratos/issues/1523) - putting in place the E2E framework for V2, getting this working in Travis and porting over the V1 Endpoints tests.
-
-- Delete App should show dependencies and allow optional deletion [#2044](https://github.com/cloudfoundry/stratos/pull/2044) - when deleting an application the user is shown the application dependencies (routes, service instances) and is able to delete these with the application or leave them in place for use by other applications
-
-- Cloud Foundry: Manage Users [#1541](https://github.com/cloudfoundry/stratos/issues/1541) - re-introducing the equivalent features that V1 has allowing user to manage user roles across Cloud Foundry
-
-- Implement Create Service Instance [#2043](https://github.com/cloudfoundry/stratos/issues/2043) - adding support for creating service instances
-
-- Service Instance creation: Support space-scoped broker provided plans [#2111](https://github.com/cloudfoundry/stratos/pull/2111)
-
-- Make Service Instance creation wizard service plan visibility aware [#2109](https://github.com/cloudfoundry/stratos/pull/2109)
-
-- Return better error information from API passthroughs [#2084](https://github.com/cloudfoundry/stratos/pull/2085)
-
-## 27 April 2018
-
-The team have been working on the following issues this week:
-
-- GitHub tab/deploy updates [#2067](https://github.com/cloudfoundry/stratos/issues/2067) - When deploying an application from GitHub, we now allow the user to select a commit from their selected branch. When viewing the GitHub tab of an application, the user can see the list of commits and update the application from a different commit on the branch.
-
-- Deploy App: Add support for an archive file or local folder  [#2040](https://github.com/cloudfoundry/stratos/issues/2040) - In addition to Git deployment, users can now browse to a local application archive file or folder and deploy using that.
-
-- User Profile: Implement edit and password change as per V1 [#2062](https://github.com/cloudfoundry/stratos/issues/2040) - Users can now edit their profile metadata and change their password.
-
-- Create & List Service Instances - [#2086](https://github.com/cloudfoundry/stratos/pull/2086) - adding the ability to view and create Service Instances.
-
-- Delete App should show dependencies and allow optional deletion [#2044](https://github.com/cloudfoundry/stratos/pull/2044) - when deleting and application the user is shown the application dependencies(routes, service instances) and is able to delete these with the application or leave them in place for use by other applications
-
-- Cloud Foundry: Manage Users [#1541](https://github.com/cloudfoundry/stratos/issues/1541) - re-introducing the equivalent features that V1 has allowing user to manage user roles across Cloud Foundry
diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
index 989742ae37..767c50520e 100644
--- a/website/docusaurus.config.js
+++ b/website/docusaurus.config.js
@@ -7,70 +7,80 @@ module.exports = {
   organizationName: 'cloudfoundry',
   projectName: 'stratos',
   themeConfig: {
-    disableDarkMode: true,
     navbar: {
       title: 'STRATOS',
       logo: {
         alt: 'Stratos',
         src: 'img/logo.png',
       },
-      links: [
-        {
-          to: 'docs/',
-          activeBasePath: 'docs',
-          label: 'Docs',
-          position: 'right',
-        },
-        // {to: 'blog', label: 'Blog', position: 'left'},
-        {
-          href: 'https://github.com/cloudfoundry/stratos',
-          label: 'GitHub',
-          position: 'right',
-        },
-      ],
+      items: [{
+        type: 'docsVersionDropdown',
+        position: 'right',
+        nextVersionLabel: 'Latest',
+      },
+      {
+        to: 'docs/',
+        activeBasePath: 'docs',
+        label: 'Docs',
+        position: 'right',
+      }, {
+        href: 'https://github.com/cloudfoundry/stratos',
+        label: 'GitHub',
+        position: 'right',
+      }],
     },
     footer: {
       style: 'dark',
-      links: [
-        {
-          title: 'Docs',
-          items: [
-            {
-              label: 'Getting Started',
-              to: 'docs/',
-            },
-            {
-              label: 'Deploying Stratos',
-              to: 'docs/deploy/overview',
-            },
-          ],
+      links: [{
+        title: 'Docs',
+        items: [{
+          label: 'Getting Started',
+          to: 'docs/',
         },
         {
-          title: 'Community',
-          items: [
-            {
-              label: 'Slack',
-              href: 'https://cloudfoundry.slack.com/?redir=%2Fmessages%2Fstratos',
-            },
-            {
-              label: 'GitHub',
-              href: 'https://github.com/cloudfoundry/stratos',
-            },
-          ],
+          label: 'Deploying Stratos',
+          to: 'docs/deploy/overview',
+        },
+        ],
+      },
+      {
+        title: 'Community',
+        items: [{
+          label: 'Slack',
+          href: 'https://cloudfoundry.slack.com/?redir=%2Fmessages%2Fstratos',
         },
-        
         {
-          title: 'More',
-          items: [
-            {
-              label: 'Presentations and Talks',
-              to: 'docs/talks',
-            },
-          ],
+          label: 'GitHub',
+          href: 'https://github.com/cloudfoundry/stratos',
         },
+        ],
+      },
+
+      {
+        title: 'More',
+        items: [{
+          label: 'Presentations and Talks',
+          to: 'docs/talks',
+        },],
+      },
       ],
       copyright: `Copyright © ${new Date().getFullYear()} Cloud Foundry Foundation`,
     },
+    colorMode: {
+      defaultMode: 'light',
+      disableSwitch: false,
+      respectPrefersColorScheme: true,
+      switchConfig: {
+        darkIcon: '🌙',
+        darkIconStyle: {
+          marginLeft: '2px',
+        },
+        lightIcon: '☀️',
+        lightIconStyle: {
+          marginLeft: '1px',
+        },
+      },
+    },
   },
   presets: [
     [
@@ -81,8 +91,7 @@ module.exports = {
           homePageId: 'introduction',
           sidebarPath: require.resolve('./sidebars.js'),
           // Please change this to your repo.
-          editUrl:
-            'https://github.com/cloudfoundry/stratos/edit/master/website/',
+          editUrl: 'https://github.com/cloudfoundry/stratos/edit/master/website/',
         },
         theme: {
           customCss: require.resolve('./src/css/custom.css'),
diff --git a/website/internal-versions.json b/website/internal-versions.json
new file mode 100644
index 0000000000..2635ffaea2
--- /dev/null
+++ b/website/internal-versions.json
@@ -0,0 +1,4 @@
+[
+  "4.0.1:372682177452d8d:true",
+  "4.0.0:372682177452d8d:true"
+]
diff --git a/website/package-lock.json b/website/package-lock.json
index b25d4a0c8c..58729d2303 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -4,6 +4,121 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@algolia/cache-browser-local-storage": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.4.0.tgz",
+      "integrity": "sha512-2AiKgN7DpFypkRCRkpqH7waXXyFdcnsPWzmN8sLHrB/FfXqgmsQb3pGft+9YHZIDQ0vAnfgMxSGgMhMGW+0Qnw==",
+      "requires": {
+        "@algolia/cache-common": "4.4.0"
+      }
+    },
+    "@algolia/cache-common": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.4.0.tgz",
+      "integrity": "sha512-PrIgoMnXaDWUfwOekahro543pgcJfgRu/nd/ZQS5ffem3+Ow725eZY6HDpPaQ1k3cvLii9JH6V2sNJConjqUKA=="
+    },
+    "@algolia/cache-in-memory": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.4.0.tgz",
+      "integrity": "sha512-9+XlUB0baDU/Dp9URRHPp6Q37YmTO0QmgPWt9+n+wqZrRL0jR3Jezr4jCT7RemqGMxBiR+YpnqaUv0orpb0ptw==",
+      "requires": {
+        "@algolia/cache-common": "4.4.0"
+      }
+    },
+    "@algolia/client-account": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.4.0.tgz",
+      "integrity": "sha512-Kynu3cMEs0clTLf674rtrCF+FWR/JwlQxKlIWsPzvLBRmNXdvYej9YBcNaOr4OTQFCCZn9JVE8ib91Z7J4IL1Q==",
+      "requires": {
+        "@algolia/client-common": "4.4.0",
+        "@algolia/client-search": "4.4.0",
+        "@algolia/transporter": "4.4.0"
+      }
+    },
+    "@algolia/client-analytics": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.4.0.tgz",
+      "integrity": "sha512-GQyjQimKAc9sZbafxln9Wk7j4pEYiORv28MZkZ+0Bjt7WNXIeO7OgOOECVpQHm9buyV6hCKpNtJcbb5/syRzdQ==",
+      "requires": {
+        "@algolia/client-common": "4.4.0",
+        "@algolia/client-search": "4.4.0",
+        "@algolia/requester-common": "4.4.0",
+        "@algolia/transporter": "4.4.0"
+      }
+    },
+    "@algolia/client-common": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.4.0.tgz",
+      "integrity": "sha512-a3yr6UhzjWPHDG/8iGp9UvrDOm1aeHVWJIf0Nj/cIvqX5tNCEIo4IMe59ovApkDgLOIpt/cLsyhn9/FiPXRhJA==",
+      "requires": {
+        "@algolia/requester-common": "4.4.0",
+        "@algolia/transporter": "4.4.0"
+      }
+    },
+    "@algolia/client-recommendation": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-recommendation/-/client-recommendation-4.4.0.tgz",
+      "integrity": "sha512-sBszbQH46rko6w2fdEG77ma8+fAg0SDkLZGxWhv4trgcnYGUBFl2dcpEPt/6koto9b4XYlf+eh+qi6iGvYqRPg==",
+      "requires": {
+        "@algolia/client-common": "4.4.0",
+        "@algolia/requester-common": "4.4.0",
+        "@algolia/transporter": "4.4.0"
+      }
+    },
+    "@algolia/client-search": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.4.0.tgz",
+      "integrity": "sha512-jqWcxCUyPPHnHreoMb2PnN9iHTP+V/nL62R84XuTRDE3VgTnhm4ZnqyuRdzZQqaz+gNy5znav64TmQ9FN9WW5g==",
+      "requires": {
+        "@algolia/client-common": "4.4.0",
+        "@algolia/requester-common": "4.4.0",
+        "@algolia/transporter": "4.4.0"
+      }
+    },
+    "@algolia/logger-common": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.4.0.tgz",
+      "integrity": "sha512-2vjmSENLaKNuF+ytRDysfWxxgFG95WXCHwHbueThdPMCK3hskkwqJ0Y/pugKfzl+54mZxegb4BYfgcCeuaHVUw=="
+    },
+    "@algolia/logger-console": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.4.0.tgz",
+      "integrity": "sha512-st/GUWyKvr6YM72OOfF+RmpdVGda3BPXbQ+chpntUq1WyVkyZXGjSmH1IcBVlua27GzxabwOUYON39cF3x10/g==",
+      "requires": {
+        "@algolia/logger-common": "4.4.0"
+      }
+    },
+    "@algolia/requester-browser-xhr": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.4.0.tgz",
+      "integrity": "sha512-V3a4hXlNch355GnWaT1f5QfXhROpsjT6sd0Znq29gAhwLqfBExhLW6Khdkv5pENC0Qy7ClVhdXFrBL9QCQer1g==",
+      "requires": {
+        "@algolia/requester-common": "4.4.0"
+      }
+    },
+    "@algolia/requester-common": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.4.0.tgz",
+      "integrity": "sha512-jPinHlFJEFokxQ5b3JWyjQKKn+FMy0hH99PApzOgQAYOSiFRXiPEZp6LeIexDeLLu7Y3eRt/3nHvjPKa6PmRRw=="
+    },
+    "@algolia/requester-node-http": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.4.0.tgz",
+      "integrity": "sha512-b7HC9C/GHxiV4+0GpCRTtjscvwarPr3dGm4CAhb6AkNjgjRcFUNr1NfsF75w3WVmzmt79/7QZihddztDdVMGjw==",
+      "requires": {
+        "@algolia/requester-common": "4.4.0"
+      }
+    },
+    "@algolia/transporter": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.4.0.tgz",
+      "integrity": "sha512-Xxzq91DEEeKIzT3DU46n4LEyTGAKZNtSHc2H9wvIY5MYwhZwEribmXXZ6k8W1FvBvzggv3juu0SP+xwGoR7F0w==",
+      "requires": {
+        "@algolia/cache-common": "4.4.0",
+        "@algolia/logger-common": "4.4.0",
+        "@algolia/requester-common": "4.4.0"
+      }
+    },
     "@babel/code-frame": {
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
@@ -13,9 +128,9 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.4.tgz",
-      "integrity": "sha512-t+rjExOrSVvjQQXNp5zAIYDp00KjdvGl/TpDX5REPr0S9IAIPQMTilcfG6q8c0QFmj9lSTVySV2VTsyggvtNIw==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz",
+      "integrity": "sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==",
       "requires": {
         "browserslist": "^4.12.0",
         "invariant": "^2.2.4",
@@ -30,23 +145,23 @@
       }
     },
     "@babel/core": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.4.tgz",
-      "integrity": "sha512-3A0tS0HWpy4XujGc7QtOIHTeNwUgWaZc/WuS5YQrfhU67jnVmsD6OGPc1AKHH0LJHQICGncy3+YUjIhVlfDdcA==",
+      "version": "7.11.1",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.1.tgz",
+      "integrity": "sha512-XqF7F6FWQdKGGWAzGELL+aCO1p+lRY5Tj5/tbT3St1G8NaH70jhhDIKknIZaDans0OQBG5wRAldROLHSt44BgQ==",
       "requires": {
         "@babel/code-frame": "^7.10.4",
-        "@babel/generator": "^7.10.4",
-        "@babel/helper-module-transforms": "^7.10.4",
+        "@babel/generator": "^7.11.0",
+        "@babel/helper-module-transforms": "^7.11.0",
         "@babel/helpers": "^7.10.4",
-        "@babel/parser": "^7.10.4",
+        "@babel/parser": "^7.11.1",
         "@babel/template": "^7.10.4",
-        "@babel/traverse": "^7.10.4",
-        "@babel/types": "^7.10.4",
+        "@babel/traverse": "^7.11.0",
+        "@babel/types": "^7.11.0",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.1",
         "json5": "^2.1.2",
-        "lodash": "^4.17.13",
+        "lodash": "^4.17.19",
         "resolve": "^1.3.2",
         "semver": "^5.4.1",
         "source-map": "^0.5.0"
@@ -60,13 +175,12 @@
       }
     },
     "@babel/generator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.4.tgz",
-      "integrity": "sha512-toLIHUIAgcQygFZRAQcsLQV3CBuX6yOIru1kJk/qqqvcRmZrYe6WavZTSG+bB8MxhnL9YPf+pKQfuiP161q7ng==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz",
+      "integrity": "sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==",
       "requires": {
-        "@babel/types": "^7.10.4",
+        "@babel/types": "^7.11.0",
         "jsesc": "^2.5.1",
-        "lodash": "^4.17.13",
         "source-map": "^0.5.0"
       }
     },
@@ -97,13 +211,13 @@
       }
     },
     "@babel/helper-builder-react-jsx-experimental": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.4.tgz",
-      "integrity": "sha512-LyacH/kgQPgLAuaWrvvq1+E7f5bLyT8jXCh7nM67sRsy2cpIGfgWJ+FCnAKQXfY+F0tXUaN6FqLkp4JiCzdK8Q==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.5.tgz",
+      "integrity": "sha512-Buewnx6M4ttG+NLkKyt7baQn7ScC/Td+e99G914fRU8fGIUivDDgVIQeDHFa5e4CRSJQt58WpNHhsAZgtzVhsg==",
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.10.4",
         "@babel/helper-module-imports": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.10.5"
       }
     },
     "@babel/helper-compilation-targets": {
@@ -126,12 +240,12 @@
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.4.tgz",
-      "integrity": "sha512-9raUiOsXPxzzLjCXeosApJItoMnX3uyT4QdM2UldffuGApNrF8e938MwNpDCK9CPoyxrEoCgT+hObJc3mZa6lQ==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz",
+      "integrity": "sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==",
       "requires": {
         "@babel/helper-function-name": "^7.10.4",
-        "@babel/helper-member-expression-to-functions": "^7.10.4",
+        "@babel/helper-member-expression-to-functions": "^7.10.5",
         "@babel/helper-optimise-call-expression": "^7.10.4",
         "@babel/helper-plugin-utils": "^7.10.4",
         "@babel/helper-replace-supers": "^7.10.4",
@@ -149,13 +263,13 @@
       }
     },
     "@babel/helper-define-map": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.4.tgz",
-      "integrity": "sha512-nIij0oKErfCnLUCWaCaHW0Bmtl2RO9cN7+u2QT8yqTywgALKlyUVOvHDElh+b5DwVC6YB1FOYFOTWcN/+41EDA==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz",
+      "integrity": "sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==",
       "requires": {
         "@babel/helper-function-name": "^7.10.4",
-        "@babel/types": "^7.10.4",
-        "lodash": "^4.17.13"
+        "@babel/types": "^7.10.5",
+        "lodash": "^4.17.19"
       }
     },
     "@babel/helper-explode-assignable-expression": {
@@ -194,11 +308,11 @@
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.4.tgz",
-      "integrity": "sha512-m5j85pK/KZhuSdM/8cHUABQTAslV47OjfIB9Cc7P+PvlAoBzdb79BGNfw8RhT5Mq3p+xGd0ZfAKixbrUZx0C7A==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
+      "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
       "requires": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.11.0"
       }
     },
     "@babel/helper-module-imports": {
@@ -210,17 +324,17 @@
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.4.tgz",
-      "integrity": "sha512-Er2FQX0oa3nV7eM1o0tNCTx7izmQtwAQsIiaLRWtavAAEcskb0XJ5OjJbVrYXWOTr8om921Scabn4/tzlx7j1Q==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
+      "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
       "requires": {
         "@babel/helper-module-imports": "^7.10.4",
         "@babel/helper-replace-supers": "^7.10.4",
         "@babel/helper-simple-access": "^7.10.4",
-        "@babel/helper-split-export-declaration": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.11.0",
         "@babel/template": "^7.10.4",
-        "@babel/types": "^7.10.4",
-        "lodash": "^4.17.13"
+        "@babel/types": "^7.11.0",
+        "lodash": "^4.17.19"
       }
     },
     "@babel/helper-optimise-call-expression": {
@@ -237,11 +351,11 @@
       "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="
     },
     "@babel/helper-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.4.tgz",
-      "integrity": "sha512-inWpnHGgtg5NOF0eyHlC0/74/VkdRITY9dtTpB2PrxKKn+AkVMRiZz/Adrx+Ssg+MLDesi2zohBW6MVq6b4pOQ==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz",
+      "integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==",
       "requires": {
-        "lodash": "^4.17.13"
+        "lodash": "^4.17.19"
       }
     },
     "@babel/helper-remap-async-to-generator": {
@@ -276,12 +390,20 @@
         "@babel/types": "^7.10.4"
       }
     },
+    "@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz",
+      "integrity": "sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==",
+      "requires": {
+        "@babel/types": "^7.11.0"
+      }
+    },
     "@babel/helper-split-export-declaration": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz",
-      "integrity": "sha512-pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+      "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
       "requires": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.11.0"
       }
     },
     "@babel/helper-validator-identifier": {
@@ -333,14 +455,14 @@
       }
     },
     "@babel/parser": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.4.tgz",
-      "integrity": "sha512-8jHII4hf+YVDsskTF6WuMB3X4Eh+PsUkC2ljq22so5rHvH+T8BzyL94VOdyFLNR8tBSVXOTbNHOKpR4TfRxVtA=="
+      "version": "7.11.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.3.tgz",
+      "integrity": "sha512-REo8xv7+sDxkKvoxEywIdsNFiZLybwdI7hcT5uEPyQrSMB4YQ973BfC9OOrD/81MaIjh6UxdulIQXkjmiH3PcA=="
     },
     "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.4.tgz",
-      "integrity": "sha512-MJbxGSmejEFVOANAezdO39SObkURO5o/8b6fSH6D1pi9RZQt+ldppKPXfqgUWpSQ9asM6xaSaSJIaeWMDRP0Zg==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz",
+      "integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==",
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
         "@babel/helper-remap-async-to-generator": "^7.10.4",
@@ -365,6 +487,15 @@
         "@babel/plugin-syntax-dynamic-import": "^7.8.0"
       }
     },
+    "@babel/plugin-proposal-export-namespace-from": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz",
+      "integrity": "sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+      }
+    },
     "@babel/plugin-proposal-json-strings": {
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz",
@@ -374,6 +505,15 @@
         "@babel/plugin-syntax-json-strings": "^7.8.0"
       }
     },
+    "@babel/plugin-proposal-logical-assignment-operators": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz",
+      "integrity": "sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+      }
+    },
     "@babel/plugin-proposal-nullish-coalescing-operator": {
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz",
@@ -393,9 +533,9 @@
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz",
-      "integrity": "sha512-6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz",
+      "integrity": "sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==",
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
@@ -412,11 +552,12 @@
       }
     },
     "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.4.tgz",
-      "integrity": "sha512-ZIhQIEeavTgouyMSdZRap4VPPHqJJ3NEs2cuHs5p0erH+iz6khB0qfgU8g7UuJkG88+fBMy23ZiU+nuHvekJeQ==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz",
+      "integrity": "sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==",
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0",
         "@babel/plugin-syntax-optional-chaining": "^7.8.0"
       }
     },
@@ -462,6 +603,14 @@
         "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
+    "@babel/plugin-syntax-export-namespace-from": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
     "@babel/plugin-syntax-json-strings": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
@@ -478,6 +627,14 @@
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
+    "@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
     "@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",
@@ -561,12 +718,11 @@
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.4.tgz",
-      "integrity": "sha512-J3b5CluMg3hPUii2onJDRiaVbPtKFPLEaV5dOPY5OeAbDi1iU/UbbFFTgwb7WnanaDy7bjU35kc26W3eM5Qa0A==",
+      "version": "7.11.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz",
+      "integrity": "sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "lodash": "^4.17.13"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-classes": {
@@ -660,11 +816,11 @@
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.4.tgz",
-      "integrity": "sha512-3Fw+H3WLUrTlzi3zMiZWp3AR4xadAEMv6XRCYnd5jAlLM61Rn+CRJaZMaNvIpcJpQ3vs1kyifYvEVPFfoSkKOA==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz",
+      "integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==",
       "requires": {
-        "@babel/helper-module-transforms": "^7.10.4",
+        "@babel/helper-module-transforms": "^7.10.5",
         "@babel/helper-plugin-utils": "^7.10.4",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       }
@@ -681,12 +837,12 @@
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.4.tgz",
-      "integrity": "sha512-Tb28LlfxrTiOTGtZFsvkjpyjCl9IoaRI52AEU/VIwOwvDQWtbNJsAqTXzh+5R7i74e/OZHH2c2w2fsOqAfnQYQ==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz",
+      "integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==",
       "requires": {
         "@babel/helper-hoist-variables": "^7.10.4",
-        "@babel/helper-module-transforms": "^7.10.4",
+        "@babel/helper-module-transforms": "^7.10.5",
         "@babel/helper-plugin-utils": "^7.10.4",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       }
@@ -726,9 +882,9 @@
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.4.tgz",
-      "integrity": "sha512-RurVtZ/D5nYfEg0iVERXYKEgDFeesHrHfx8RT05Sq57ucj2eOYAP6eu5fynL4Adju4I/mP/I6SO0DqNWAXjfLQ==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz",
+      "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==",
       "requires": {
         "@babel/helper-get-function-arity": "^7.10.4",
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -789,9 +945,9 @@
       }
     },
     "@babel/plugin-transform-react-jsx-source": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.4.tgz",
-      "integrity": "sha512-FTK3eQFrPv2aveerUSazFmGygqIdTtvskG50SnGnbEUnRPcGx2ylBhdFIzoVS1ty44hEgcPoCAyw5r3VDEq+Ug==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.5.tgz",
+      "integrity": "sha512-wTeqHVkN1lfPLubRiZH3o73f4rfon42HpgxUSs86Nc+8QIcm/B9s8NNVXu/gwGcOyd7yDib9ikxoDLxJP0UiDA==",
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
         "@babel/plugin-syntax-jsx": "^7.10.4"
@@ -823,9 +979,9 @@
       }
     },
     "@babel/plugin-transform-runtime": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.4.tgz",
-      "integrity": "sha512-8ULlGv8p+Vuxu+kz2Y1dk6MYS2b/Dki+NO6/0ZlfSj5tMalfDL7jI/o/2a+rrWLqSXvnadEqc2WguB4gdQIxZw==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.0.tgz",
+      "integrity": "sha512-LFEsP+t3wkYBlis8w6/kmnd6Kb1dxTd+wGJ8MlxTGzQo//ehtqlVL4S9DNUa53+dtPSQobN2CXx4d81FqC58cw==",
       "requires": {
         "@babel/helper-module-imports": "^7.10.4",
         "@babel/helper-plugin-utils": "^7.10.4",
@@ -849,11 +1005,12 @@
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.4.tgz",
-      "integrity": "sha512-1e/51G/Ni+7uH5gktbWv+eCED9pP8ZpRhZB3jOaI3mmzfvJTWHkuyYTv0Z5PYtyM+Tr2Ccr9kUdQxn60fI5WuQ==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz",
+      "integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
@@ -866,9 +1023,9 @@
       }
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.4.tgz",
-      "integrity": "sha512-4NErciJkAYe+xI5cqfS8pV/0ntlY5N5Ske/4ImxAVX7mk9Rxt2bwDTGv1Msc2BRJvWQcmYEC+yoMLdX22aE4VQ==",
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz",
+      "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==",
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.10.4",
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -883,11 +1040,11 @@
       }
     },
     "@babel/plugin-transform-typescript": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.10.4.tgz",
-      "integrity": "sha512-3WpXIKDJl/MHoAN0fNkSr7iHdUMHZoppXjf2HJ9/ed5Xht5wNIsXllJXdityKOxeA3Z8heYRb1D3p2H5rfCdPw==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.11.0.tgz",
+      "integrity": "sha512-edJsNzTtvb3MaXQwj8403B7mZoGu9ElDJQZOKjGUnvilquxBA3IQoEIOvkX/1O8xfAsnHS/oQhe2w/IXrr+w0w==",
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.10.4",
+        "@babel/helper-create-class-features-plugin": "^7.10.5",
         "@babel/helper-plugin-utils": "^7.10.4",
         "@babel/plugin-syntax-typescript": "^7.10.4"
       }
@@ -910,29 +1067,33 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.10.4.tgz",
-      "integrity": "sha512-tcmuQ6vupfMZPrLrc38d0sF2OjLT3/bZ0dry5HchNCQbrokoQi4reXqclvkkAT5b+gWc23meVWpve5P/7+w/zw==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.0.tgz",
+      "integrity": "sha512-2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg==",
       "requires": {
-        "@babel/compat-data": "^7.10.4",
+        "@babel/compat-data": "^7.11.0",
         "@babel/helper-compilation-targets": "^7.10.4",
         "@babel/helper-module-imports": "^7.10.4",
         "@babel/helper-plugin-utils": "^7.10.4",
         "@babel/plugin-proposal-async-generator-functions": "^7.10.4",
         "@babel/plugin-proposal-class-properties": "^7.10.4",
         "@babel/plugin-proposal-dynamic-import": "^7.10.4",
+        "@babel/plugin-proposal-export-namespace-from": "^7.10.4",
         "@babel/plugin-proposal-json-strings": "^7.10.4",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.11.0",
         "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",
         "@babel/plugin-proposal-numeric-separator": "^7.10.4",
-        "@babel/plugin-proposal-object-rest-spread": "^7.10.4",
+        "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
         "@babel/plugin-proposal-optional-catch-binding": "^7.10.4",
-        "@babel/plugin-proposal-optional-chaining": "^7.10.4",
+        "@babel/plugin-proposal-optional-chaining": "^7.11.0",
         "@babel/plugin-proposal-private-methods": "^7.10.4",
         "@babel/plugin-proposal-unicode-property-regex": "^7.10.4",
         "@babel/plugin-syntax-async-generators": "^7.8.0",
         "@babel/plugin-syntax-class-properties": "^7.10.4",
         "@babel/plugin-syntax-dynamic-import": "^7.8.0",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
         "@babel/plugin-syntax-json-strings": "^7.8.0",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
         "@babel/plugin-syntax-numeric-separator": "^7.10.4",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
@@ -965,14 +1126,14 @@
         "@babel/plugin-transform-regenerator": "^7.10.4",
         "@babel/plugin-transform-reserved-words": "^7.10.4",
         "@babel/plugin-transform-shorthand-properties": "^7.10.4",
-        "@babel/plugin-transform-spread": "^7.10.4",
+        "@babel/plugin-transform-spread": "^7.11.0",
         "@babel/plugin-transform-sticky-regex": "^7.10.4",
         "@babel/plugin-transform-template-literals": "^7.10.4",
         "@babel/plugin-transform-typeof-symbol": "^7.10.4",
         "@babel/plugin-transform-unicode-escapes": "^7.10.4",
         "@babel/plugin-transform-unicode-regex": "^7.10.4",
         "@babel/preset-modules": "^0.1.3",
-        "@babel/types": "^7.10.4",
+        "@babel/types": "^7.11.0",
         "browserslist": "^4.12.0",
         "core-js-compat": "^3.6.2",
         "invariant": "^2.2.2",
@@ -1023,13 +1184,22 @@
       }
     },
     "@babel/runtime": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.4.tgz",
-      "integrity": "sha512-UpTN5yUJr9b4EX2CnGNWIvER7Ab83ibv0pcvvHc4UOdrBI5jb8bj+32cCwPX6xu0mt2daFNjYhoi+X7beH0RSw==",
+      "version": "7.11.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz",
+      "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==",
       "requires": {
         "regenerator-runtime": "^0.13.4"
       }
     },
+    "@babel/runtime-corejs3": {
+      "version": "7.11.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.11.2.tgz",
+      "integrity": "sha512-qh5IR+8VgFz83VBa6OkaET6uN/mJOhHONuy3m1sgF0CV6mXdPSEBdA7e1eUbVvyNtANjMbg22JUv71BaDXLY6A==",
+      "requires": {
+        "core-js-pure": "^3.0.0",
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
     "@babel/template": {
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
@@ -1041,28 +1211,28 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.4.tgz",
-      "integrity": "sha512-aSy7p5THgSYm4YyxNGz6jZpXf+Ok40QF3aA2LyIONkDHpAcJzDUqlCKXv6peqYUs2gmic849C/t2HKw2a2K20Q==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz",
+      "integrity": "sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==",
       "requires": {
         "@babel/code-frame": "^7.10.4",
-        "@babel/generator": "^7.10.4",
+        "@babel/generator": "^7.11.0",
         "@babel/helper-function-name": "^7.10.4",
-        "@babel/helper-split-export-declaration": "^7.10.4",
-        "@babel/parser": "^7.10.4",
-        "@babel/types": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.11.0",
+        "@babel/parser": "^7.11.0",
+        "@babel/types": "^7.11.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0",
-        "lodash": "^4.17.13"
+        "lodash": "^4.17.19"
       }
     },
     "@babel/types": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.4.tgz",
-      "integrity": "sha512-UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
+      "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
       "requires": {
         "@babel/helper-validator-identifier": "^7.10.4",
-        "lodash": "^4.17.13",
+        "lodash": "^4.17.19",
         "to-fast-properties": "^2.0.0"
       }
     },
@@ -1071,23 +1241,45 @@
       "resolved": "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz",
       "integrity": "sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw=="
     },
+    "@docsearch/css": {
+      "version": "1.0.0-alpha.27",
+      "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-1.0.0-alpha.27.tgz",
+      "integrity": "sha512-Kw6R/gAHMZW2tKZO2a0gd3I8Yf6bJgTk3Dp+L0ZFrvEHEh8v3yQKvoxVify3ML9YVyvCxxAPQQuF9u3JNUwvXw=="
+    },
+    "@docsearch/react": {
+      "version": "1.0.0-alpha.27",
+      "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-1.0.0-alpha.27.tgz",
+      "integrity": "sha512-jcgUHZsrNNRsaVsplqKhXWheh4VzRTCdhsPuVhJMRvfsFUqXEPo/7kVt5xIybtOj9u+/FVdeSO+APJEE2rakYA==",
+      "requires": {
+        "@docsearch/css": "^1.0.0-alpha.27",
+        "@francoischalifour/autocomplete-core": "^1.0.0-alpha.27",
+        "@francoischalifour/autocomplete-preset-algolia": "^1.0.0-alpha.27",
+        "algoliasearch": "^4.0.0"
+      }
+    },
     "@docusaurus/core": {
-      "version": "2.0.0-alpha.58",
-      "resolved": "https://registry.npmjs.org/@docusaurus/core/-/core-2.0.0-alpha.58.tgz",
-      "integrity": "sha512-7VW7IQKTxTIeCXxzraLdTqRtYSmEG2ZJDt07z26NjK+17XyNQc0IoJs7M3xhjzaeP0s/CpYe5Yl+pgp6TIXqoA==",
+      "version": "2.0.0-alpha.61",
+      "resolved": "https://registry.npmjs.org/@docusaurus/core/-/core-2.0.0-alpha.61.tgz",
+      "integrity": "sha512-Ev0v5J7L/Pm3VJMdhhyR8I9tUQo8MhVRUUT+Bf0W3TMYG6jp2cIXE88yCfxOsTDducS7EMrdtUXfvePGH9CE/A==",
       "requires": {
         "@babel/core": "^7.9.0",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.1",
+        "@babel/plugin-proposal-optional-chaining": "^7.10.3",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-transform-runtime": "^7.9.0",
         "@babel/preset-env": "^7.9.0",
         "@babel/preset-react": "^7.9.4",
         "@babel/preset-typescript": "^7.9.0",
         "@babel/runtime": "^7.9.2",
-        "@docusaurus/utils": "^2.0.0-alpha.58",
+        "@babel/runtime-corejs3": "^7.10.4",
+        "@docusaurus/types": "^2.0.0-alpha.61",
+        "@docusaurus/utils": "^2.0.0-alpha.61",
         "@endiliey/static-site-generator-webpack-plugin": "^4.0.0",
+        "@hapi/joi": "^17.1.1",
         "@svgr/webpack": "^5.4.0",
         "babel-loader": "^8.1.0",
         "babel-plugin-dynamic-import-node": "^2.3.0",
+        "boxen": "^4.2.0",
         "cache-loader": "^4.1.0",
         "chalk": "^3.0.0",
         "chokidar": "^3.3.0",
@@ -1096,14 +1288,19 @@
         "core-js": "^2.6.5",
         "css-loader": "^3.4.2",
         "del": "^5.1.0",
+        "detect-port": "^1.3.0",
         "eta": "^1.1.1",
         "express": "^4.17.1",
+        "file-loader": "^6.0.0",
         "fs-extra": "^8.1.0",
         "globby": "^10.0.1",
         "html-minifier-terser": "^5.0.5",
         "html-tags": "^3.1.0",
         "html-webpack-plugin": "^4.0.4",
         "import-fresh": "^3.2.1",
+        "inquirer": "^7.2.0",
+        "is-root": "^2.1.0",
+        "lodash": "^4.5.2",
         "lodash.has": "^4.5.2",
         "lodash.isplainobject": "^4.0.6",
         "lodash.isstring": "^4.0.1",
@@ -1112,7 +1309,6 @@
         "null-loader": "^3.0.0",
         "optimize-css-assets-webpack-plugin": "^5.0.3",
         "pnp-webpack-plugin": "^1.6.4",
-        "portfinder": "^1.0.25",
         "postcss-loader": "^3.0.0",
         "postcss-preset-env": "^6.7.0",
         "react-dev-utils": "^10.2.1",
@@ -1122,10 +1318,14 @@
         "react-router": "^5.1.2",
         "react-router-config": "^5.1.1",
         "react-router-dom": "^5.1.2",
+        "resolve-pathname": "^3.0.0",
         "semver": "^6.3.0",
+        "serve-handler": "^6.1.3",
         "shelljs": "^0.8.4",
         "std-env": "^2.2.1",
         "terser-webpack-plugin": "^2.3.5",
+        "update-notifier": "^4.1.0",
+        "url-loader": "^4.1.0",
         "wait-file": "^1.0.5",
         "webpack": "^4.41.2",
         "webpack-bundle-analyzer": "^3.6.1",
@@ -1135,15 +1335,17 @@
       }
     },
     "@docusaurus/mdx-loader": {
-      "version": "2.0.0-alpha.58",
-      "resolved": "https://registry.npmjs.org/@docusaurus/mdx-loader/-/mdx-loader-2.0.0-alpha.58.tgz",
-      "integrity": "sha512-g/uqzaoaRkwuPmjOB7/p58vNFLev9yE3FdkVfD19mSHyaMaKAzWGUiJxkaxPFtxCs4mwFWk7tJKSLY+B8MjS2Q==",
+      "version": "2.0.0-alpha.61",
+      "resolved": "https://registry.npmjs.org/@docusaurus/mdx-loader/-/mdx-loader-2.0.0-alpha.61.tgz",
+      "integrity": "sha512-n7VMfyshgMjoVI2YdQFlPVcMTSR+XOl2UbOTgJXDmD4yCeLOSaj63g8fwVoCy+NRkPgjpWGTGCeLNs63dk9jYg==",
       "requires": {
         "@babel/parser": "^7.9.4",
         "@babel/traverse": "^7.9.0",
+        "@docusaurus/core": "^2.0.0-alpha.61",
         "@mdx-js/mdx": "^1.5.8",
         "@mdx-js/react": "^1.5.8",
         "escape-html": "^1.0.3",
+        "file-loader": "^6.0.0",
         "fs-extra": "^8.1.0",
         "github-slugger": "^1.3.0",
         "gray-matter": "^4.0.2",
@@ -1151,7 +1353,8 @@
         "mdast-util-to-string": "^1.1.0",
         "remark-emoji": "^2.1.0",
         "stringify-object": "^3.3.0",
-        "unist-util-visit": "^2.0.2"
+        "unist-util-visit": "^2.0.2",
+        "url-loader": "^4.1.0"
       },
       "dependencies": {
         "json5": {
@@ -1175,12 +1378,16 @@
       }
     },
     "@docusaurus/plugin-content-blog": {
-      "version": "2.0.0-alpha.58",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-blog/-/plugin-content-blog-2.0.0-alpha.58.tgz",
-      "integrity": "sha512-2Pn15pwPdnmKLAvNd4bk2XclnGtGYCpfAECypm9tBql6W6MShy0qOHH3JGLY8dQIMySsCkuC3jCl26EwXNgARw==",
-      "requires": {
-        "@docusaurus/mdx-loader": "^2.0.0-alpha.58",
-        "@docusaurus/utils": "^2.0.0-alpha.58",
+      "version": "2.0.0-alpha.61",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-blog/-/plugin-content-blog-2.0.0-alpha.61.tgz",
+      "integrity": "sha512-C2U5NTKYeDm7AViMt4fqmkLuk2kwxvvkzAK84EvEA3tVy3Q58qTfRqbDyFJGN63OL1Os+1HwQvGjPjCUWVbJ3Q==",
+      "requires": {
+        "@docusaurus/core": "^2.0.0-alpha.61",
+        "@docusaurus/mdx-loader": "^2.0.0-alpha.61",
+        "@docusaurus/types": "^2.0.0-alpha.61",
+        "@docusaurus/utils": "^2.0.0-alpha.61",
+        "@docusaurus/utils-validation": "^2.0.0-alpha.61",
+        "@hapi/joi": "^17.1.1",
         "feed": "^4.1.0",
         "fs-extra": "^8.1.0",
         "globby": "^10.0.1",
@@ -1211,12 +1418,16 @@
       }
     },
     "@docusaurus/plugin-content-docs": {
-      "version": "2.0.0-alpha.58",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-docs/-/plugin-content-docs-2.0.0-alpha.58.tgz",
-      "integrity": "sha512-+PHqften1daJXBxUZTN5pMIRP7NwGU7reO4QX0iy7Qp1Wqs63KPY/nSeM7dtxKCYtU+yWkLogvFlicARVqRU9A==",
-      "requires": {
-        "@docusaurus/mdx-loader": "^2.0.0-alpha.58",
-        "@docusaurus/utils": "^2.0.0-alpha.58",
+      "version": "2.0.0-alpha.61",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-docs/-/plugin-content-docs-2.0.0-alpha.61.tgz",
+      "integrity": "sha512-1WojgF+0ZQoARVF3I++2ghzG0sY4panxNiWv8Mzo2MdqECj3lgmR8jaVUSXj4bcTzX7uAEVS9MqKYIf3DBpgYg==",
+      "requires": {
+        "@docusaurus/core": "^2.0.0-alpha.61",
+        "@docusaurus/mdx-loader": "^2.0.0-alpha.61",
+        "@docusaurus/types": "^2.0.0-alpha.61",
+        "@docusaurus/utils": "^2.0.0-alpha.61",
+        "@docusaurus/utils-validation": "^2.0.0-alpha.61",
+        "@hapi/joi": "17.1.1",
         "execa": "^3.4.0",
         "fs-extra": "^8.1.0",
         "globby": "^10.0.1",
@@ -1226,6 +1437,7 @@
         "lodash.groupby": "^4.6.0",
         "lodash.pick": "^4.4.0",
         "lodash.pickby": "^4.6.0",
+        "lodash.sortby": "^4.6.0",
         "remark-admonitions": "^1.2.1",
         "shelljs": "^0.8.4"
       },
@@ -1248,9 +1460,9 @@
           }
         },
         "get-stream": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-          "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
           "requires": {
             "pump": "^3.0.0"
           }
@@ -1294,69 +1506,98 @@
       }
     },
     "@docusaurus/plugin-content-pages": {
-      "version": "2.0.0-alpha.58",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-pages/-/plugin-content-pages-2.0.0-alpha.58.tgz",
-      "integrity": "sha512-4LJn2CB83ZCkM4+0qNQWdm4gA2Og3QzmUfSqYOifTmsVsHuLSAqa5zRkkSSsZ244r+ya4e7nmS7nMd7kfK+v4w==",
-      "requires": {
-        "@docusaurus/types": "^2.0.0-alpha.58",
-        "@docusaurus/utils": "^2.0.0-alpha.58",
-        "globby": "^10.0.1"
+      "version": "2.0.0-alpha.61",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-pages/-/plugin-content-pages-2.0.0-alpha.61.tgz",
+      "integrity": "sha512-UQmXnGQCQoMltnL0Zvf0Dhqis+tKPwAdtcoBcQN4dvaDp4iEsS8eJjG9QZqvPzqJv+giVyuCT/KeZj/pxCitNw==",
+      "requires": {
+        "@docusaurus/mdx-loader": "^2.0.0-alpha.61",
+        "@docusaurus/types": "^2.0.0-alpha.61",
+        "@docusaurus/utils": "^2.0.0-alpha.61",
+        "@docusaurus/utils-validation": "^2.0.0-alpha.61",
+        "@hapi/joi": "17.1.1",
+        "globby": "^10.0.1",
+        "loader-utils": "^1.2.3",
+        "remark-admonitions": "^1.2.1"
+      },
+      "dependencies": {
+        "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==",
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        }
       }
     },
     "@docusaurus/plugin-debug": {
-      "version": "2.0.0-alpha.58",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-debug/-/plugin-debug-2.0.0-alpha.58.tgz",
-      "integrity": "sha512-w7sEUzuavp5N4TxgJus1TLFwRkypvg9+mRYZN+mgV05WF3ft+aDTToWeYNZq/8FoC1IEwkezOpPpaWtG4UWM7Q==",
+      "version": "2.0.0-alpha.61",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-debug/-/plugin-debug-2.0.0-alpha.61.tgz",
+      "integrity": "sha512-v0qbGwT/yd5Dy/dcwn5fBCdlFE60IOOhllBDuKUsjJwKCvFDKHZ6jtxrZY+ujIlDfj/Tkc4ban0w46JGWnMj+w==",
       "requires": {
-        "@docusaurus/types": "^2.0.0-alpha.58",
-        "@docusaurus/utils": "^2.0.0-alpha.58"
+        "@docusaurus/types": "^2.0.0-alpha.61",
+        "@docusaurus/utils": "^2.0.0-alpha.61"
       }
     },
     "@docusaurus/plugin-google-analytics": {
-      "version": "2.0.0-alpha.58",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-2.0.0-alpha.58.tgz",
-      "integrity": "sha512-R4I8j+XJkOl7fz8+lRnQKr8YP4zrG6dWBNZ66JquUwL6jmaavq1VRVavm7/s5Wr/vYLcpEWjynHViwDdVLegoQ=="
+      "version": "2.0.0-alpha.61",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-2.0.0-alpha.61.tgz",
+      "integrity": "sha512-f+KmaoM6eTledmgyijMNREvekZVLJ3nll6aUNDXPod9+MF673Hs4RGDyveMAjLiq03+VCgtXAniTSYsFIHcuAQ=="
     },
     "@docusaurus/plugin-google-gtag": {
-      "version": "2.0.0-alpha.58",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-2.0.0-alpha.58.tgz",
-      "integrity": "sha512-t+B6K2/EvRofygDK5edeQAg2l069aU7H3sViG/3USpJSaY9bWNWRKjZk6BEOypC+mCW6g5HQgewQZ/bTkV+aDA=="
+      "version": "2.0.0-alpha.61",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-2.0.0-alpha.61.tgz",
+      "integrity": "sha512-9l/CUNtBIZqTKY7vD0dOOTrLRpbViXSQPsIOlfYDilS2AQmpsoJVQf6CcCts+GaxWMu0pTw3zeCNnFtJfDV5pA=="
     },
     "@docusaurus/plugin-sitemap": {
-      "version": "2.0.0-alpha.58",
-      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-sitemap/-/plugin-sitemap-2.0.0-alpha.58.tgz",
-      "integrity": "sha512-OS3XZG1S/USyZxSZ4e2pputW3sOl/hxvK+EAs51eOi/fYyVgO4BmFpcsoP17a5d1Cnxf8gumOkS6bLRDaG8KyQ==",
+      "version": "2.0.0-alpha.61",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-sitemap/-/plugin-sitemap-2.0.0-alpha.61.tgz",
+      "integrity": "sha512-7nXJl/zsnr8Hlzxn3bm9NhpwP4sRFGXWwSCWCC4FMrIw9ihXWTtMGe9hDuJx4DqC8xufyQMw26VGauH7XAWdMg==",
       "requires": {
-        "@docusaurus/types": "^2.0.0-alpha.58",
+        "@docusaurus/types": "^2.0.0-alpha.61",
+        "@hapi/joi": "17.1.1",
+        "fs-extra": "^8.1.0",
         "sitemap": "^3.2.2"
       }
     },
     "@docusaurus/preset-classic": {
-      "version": "2.0.0-alpha.58",
-      "resolved": "https://registry.npmjs.org/@docusaurus/preset-classic/-/preset-classic-2.0.0-alpha.58.tgz",
-      "integrity": "sha512-XGXC5NcAkRUKpm4aho6moThPtLarGSouWW1xfYMQlT4dY6RG/FFt8n5viMXzGwOfA/H9B/s0sZpqHDw8U4FUCg==",
+      "version": "2.0.0-alpha.61",
+      "resolved": "https://registry.npmjs.org/@docusaurus/preset-classic/-/preset-classic-2.0.0-alpha.61.tgz",
+      "integrity": "sha512-/3HL468XiSZ1T4mdvqnfV6O80Qv4BxAseJGnmkBwS0u6+Q1VgkNxRxVk4B45OWPaurK/Dl+sCn4sAAUWUGRsZg==",
       "requires": {
-        "@docusaurus/plugin-content-blog": "^2.0.0-alpha.58",
-        "@docusaurus/plugin-content-docs": "^2.0.0-alpha.58",
-        "@docusaurus/plugin-content-pages": "^2.0.0-alpha.58",
-        "@docusaurus/plugin-debug": "^2.0.0-alpha.58",
-        "@docusaurus/plugin-google-analytics": "^2.0.0-alpha.58",
-        "@docusaurus/plugin-google-gtag": "^2.0.0-alpha.58",
-        "@docusaurus/plugin-sitemap": "^2.0.0-alpha.58",
-        "@docusaurus/theme-classic": "^2.0.0-alpha.58",
-        "@docusaurus/theme-search-algolia": "^2.0.0-alpha.58"
+        "@docusaurus/plugin-content-blog": "^2.0.0-alpha.61",
+        "@docusaurus/plugin-content-docs": "^2.0.0-alpha.61",
+        "@docusaurus/plugin-content-pages": "^2.0.0-alpha.61",
+        "@docusaurus/plugin-debug": "^2.0.0-alpha.61",
+        "@docusaurus/plugin-google-analytics": "^2.0.0-alpha.61",
+        "@docusaurus/plugin-google-gtag": "^2.0.0-alpha.61",
+        "@docusaurus/plugin-sitemap": "^2.0.0-alpha.61",
+        "@docusaurus/theme-classic": "^2.0.0-alpha.61",
+        "@docusaurus/theme-search-algolia": "^2.0.0-alpha.61"
       }
     },
     "@docusaurus/theme-classic": {
-      "version": "2.0.0-alpha.58",
-      "resolved": "https://registry.npmjs.org/@docusaurus/theme-classic/-/theme-classic-2.0.0-alpha.58.tgz",
-      "integrity": "sha512-GvpzpsL3jTxm/3sPna7wOJaAauCha+uLZ33x/XOMKrfN02E2BLkaRphRyCliw1vvLXB3rJPlHyvBdKCTOVXaNw==",
+      "version": "2.0.0-alpha.61",
+      "resolved": "https://registry.npmjs.org/@docusaurus/theme-classic/-/theme-classic-2.0.0-alpha.61.tgz",
+      "integrity": "sha512-LPJwDi8iPzBe36+U65h4w5N5rXSuXuxPXWzBe/eF0/miR7VVCKydGSSubQLSMAXV0QWspGJIRSPnwuNH3DjJZg==",
       "requires": {
+        "@hapi/joi": "^17.1.1",
         "@mdx-js/mdx": "^1.5.8",
         "@mdx-js/react": "^1.5.8",
         "clsx": "^1.1.1",
         "copy-text-to-clipboard": "^2.2.0",
         "infima": "0.2.0-alpha.12",
+        "lodash": "^4.17.19",
         "parse-numeric-range": "^0.0.2",
         "prism-react-renderer": "^1.1.0",
         "prismjs": "^1.20.0",
@@ -1366,37 +1607,40 @@
       }
     },
     "@docusaurus/theme-search-algolia": {
-      "version": "2.0.0-alpha.58",
-      "resolved": "https://registry.npmjs.org/@docusaurus/theme-search-algolia/-/theme-search-algolia-2.0.0-alpha.58.tgz",
-      "integrity": "sha512-Iug5mET733Yx46E04BfJjz4+AvxzalRo8G4ZmOjePTMiKQpE1ee39Ypbwj77c8XxEadOcZC4mJtfxB3L1RqlBA==",
+      "version": "2.0.0-alpha.61",
+      "resolved": "https://registry.npmjs.org/@docusaurus/theme-search-algolia/-/theme-search-algolia-2.0.0-alpha.61.tgz",
+      "integrity": "sha512-B47SmuBdF2kguBo3Wkx8L/jhYgHXxgxEpcf9JCLPGzK0YiRJk111z43h6PLSwirEpxb4OE+sFqr5oPvnsgnwRw==",
       "requires": {
-        "algoliasearch": "^3.24.5",
+        "@docsearch/react": "^1.0.0-alpha.25",
+        "@hapi/joi": "^17.1.1",
+        "algoliasearch": "^4.0.0",
         "algoliasearch-helper": "^3.1.1",
         "clsx": "^1.1.1",
-        "docsearch.js": "^2.6.3",
         "eta": "^1.1.1"
       }
     },
     "@docusaurus/types": {
-      "version": "2.0.0-alpha.58",
-      "resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-2.0.0-alpha.58.tgz",
-      "integrity": "sha512-OSkxoLwWJMhEHa4s6SXVCjfGwYm21yF6ZggoUo6kz+qqslTgF/JcPCVF9Y1Hf6bJJxUisi+ZHrHKEC6k4pphPA==",
+      "version": "2.0.0-alpha.61",
+      "resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-2.0.0-alpha.61.tgz",
+      "integrity": "sha512-x1fBiL/KNfREvA6B40CCTABjK9KP+kj/H/7mHfiwdtOYvVt9GJSgnjThkVD62lpVFbOhQ5C0togZsSzKlw6H/w==",
       "requires": {
         "@types/webpack": "^4.41.0",
         "commander": "^4.0.1",
-        "querystring": "0.2.0"
+        "querystring": "0.2.0",
+        "webpack-merge": "^4.2.2"
       }
     },
     "@docusaurus/utils": {
-      "version": "2.0.0-alpha.58",
-      "resolved": "https://registry.npmjs.org/@docusaurus/utils/-/utils-2.0.0-alpha.58.tgz",
-      "integrity": "sha512-hBhdQCyVT15mH7RE5yuDBuhwbUnM4beKq2JLvRuZS4FoNu7T2S4OGusUAtTnNZEruoUv2QTkt+GrsRDKYi2fCA==",
+      "version": "2.0.0-alpha.61",
+      "resolved": "https://registry.npmjs.org/@docusaurus/utils/-/utils-2.0.0-alpha.61.tgz",
+      "integrity": "sha512-MHvR3Rq8Kk9W6skBR3x7mLsDaNrnp6Mmobyc0ZVql+eiLrjiN7SPunvrVJDE90bQ50HZFLLoAkfgfrvbX5mecg==",
       "requires": {
         "escape-string-regexp": "^2.0.0",
         "fs-extra": "^8.1.0",
         "gray-matter": "^4.0.2",
         "lodash.camelcase": "^4.3.0",
-        "lodash.kebabcase": "^4.1.1"
+        "lodash.kebabcase": "^4.1.1",
+        "resolve-pathname": "^3.0.0"
       },
       "dependencies": {
         "escape-string-regexp": {
@@ -1406,6 +1650,14 @@
         }
       }
     },
+    "@docusaurus/utils-validation": {
+      "version": "2.0.0-alpha.61",
+      "resolved": "https://registry.npmjs.org/@docusaurus/utils-validation/-/utils-validation-2.0.0-alpha.61.tgz",
+      "integrity": "sha512-3QrJqZoR5eBz2XG0ijuTIp5AEOe1OHtuv7nkKArOCzFmjuBJLhUTRcECf0K+lcmdJ25zrRAWAYNgTvpVpBjaNg==",
+      "requires": {
+        "@hapi/joi": "17.1.1"
+      }
+    },
     "@endiliey/static-site-generator-webpack-plugin": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/@endiliey/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-4.0.0.tgz",
@@ -1418,128 +1670,129 @@
         "webpack-sources": "^1.4.3"
       }
     },
+    "@francoischalifour/autocomplete-core": {
+      "version": "1.0.0-alpha.27",
+      "resolved": "https://registry.npmjs.org/@francoischalifour/autocomplete-core/-/autocomplete-core-1.0.0-alpha.27.tgz",
+      "integrity": "sha512-kpKbtrjMt9l1HIFFmmH0u88633/1oBD+mEjKg1EIRJ1zQCeOBxlQvIXZ3X6GEoud79QjLVoc8HD4HN1OMRt+OA=="
+    },
+    "@francoischalifour/autocomplete-preset-algolia": {
+      "version": "1.0.0-alpha.27",
+      "resolved": "https://registry.npmjs.org/@francoischalifour/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.0.0-alpha.27.tgz",
+      "integrity": "sha512-Mp4lhlLd8vuLOCXtuw8UTUaJXGRrXYL7AN/ZmhaMwqyL9e9XSqLlcv82EWP0NAMcoz/I1E1C709h4jnbnN4llw=="
+    },
     "@hapi/address": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz",
-      "integrity": "sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ=="
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@hapi/address/-/address-4.1.0.tgz",
+      "integrity": "sha512-SkszZf13HVgGmChdHo/PxchnSaCJ6cetVqLzyciudzZRT0jcOouIF/Q93mgjw8cce+D+4F4C1Z/WrfFN+O3VHQ==",
+      "requires": {
+        "@hapi/hoek": "^9.0.0"
+      }
     },
     "@hapi/bourne": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz",
       "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="
     },
+    "@hapi/formula": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@hapi/formula/-/formula-2.0.0.tgz",
+      "integrity": "sha512-V87P8fv7PI0LH7LiVi8Lkf3x+KCO7pQozXRssAHNXXL9L1K+uyu4XypLXwxqVDKgyQai6qj3/KteNlrqDx4W5A=="
+    },
     "@hapi/hoek": {
-      "version": "8.5.1",
-      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz",
-      "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow=="
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.0.4.tgz",
+      "integrity": "sha512-EwaJS7RjoXUZ2cXXKZZxZqieGtc7RbvQhUy8FwDoMQtxWVi14tFjeFCYPZAM1mBCpOpiBpyaZbb9NeHc7eGKgw=="
     },
     "@hapi/joi": {
-      "version": "15.1.1",
-      "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz",
-      "integrity": "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==",
+      "version": "17.1.1",
+      "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-17.1.1.tgz",
+      "integrity": "sha512-p4DKeZAoeZW4g3u7ZeRo+vCDuSDgSvtsB/NpfjXEHTUjSeINAi/RrVOWiVQ1isaoLzMvFEhe8n5065mQq1AdQg==",
       "requires": {
-        "@hapi/address": "2.x.x",
-        "@hapi/bourne": "1.x.x",
-        "@hapi/hoek": "8.x.x",
-        "@hapi/topo": "3.x.x"
+        "@hapi/address": "^4.0.1",
+        "@hapi/formula": "^2.0.0",
+        "@hapi/hoek": "^9.0.0",
+        "@hapi/pinpoint": "^2.0.0",
+        "@hapi/topo": "^5.0.0"
       }
     },
+    "@hapi/pinpoint": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@hapi/pinpoint/-/pinpoint-2.0.0.tgz",
+      "integrity": "sha512-vzXR5MY7n4XeIvLpfl3HtE3coZYO4raKXW766R6DZw/6aLqR26iuZ109K7a0NtF2Db0jxqh7xz2AxkUwpUFybw=="
+    },
     "@hapi/topo": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz",
-      "integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.0.0.tgz",
+      "integrity": "sha512-tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw==",
       "requires": {
-        "@hapi/hoek": "^8.3.0"
+        "@hapi/hoek": "^9.0.0"
       }
     },
     "@mdx-js/mdx": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.6.tgz",
-      "integrity": "sha512-Q1j/RtjNbRZRC/ciaOqQLplsJ9lb0jJhDSvkusmzCsCX+NZH7YTUvccWf7l6zKW1CAiofJfqZdZtXkeJUDZiMw==",
+      "version": "1.6.16",
+      "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.16.tgz",
+      "integrity": "sha512-jnYyJ0aCafCIehn3GjYcibIapaLBgs3YkoenNQBPcPFyyuUty7B3B07OE+pMllhJ6YkWeP/R5Ax19x0nqTzgJw==",
       "requires": {
-        "@babel/core": "7.9.6",
-        "@babel/plugin-syntax-jsx": "7.8.3",
+        "@babel/core": "7.10.5",
+        "@babel/plugin-syntax-jsx": "7.10.4",
         "@babel/plugin-syntax-object-rest-spread": "7.8.3",
-        "@mdx-js/util": "^1.6.6",
-        "babel-plugin-apply-mdx-type-prop": "^1.6.6",
-        "babel-plugin-extract-import-names": "^1.6.6",
+        "@mdx-js/util": "1.6.16",
+        "babel-plugin-apply-mdx-type-prop": "1.6.16",
+        "babel-plugin-extract-import-names": "1.6.16",
         "camelcase-css": "2.0.1",
         "detab": "2.0.3",
-        "hast-util-raw": "5.0.2",
+        "hast-util-raw": "6.0.0",
         "lodash.uniq": "4.5.0",
         "mdast-util-to-hast": "9.1.0",
         "remark-footnotes": "1.0.0",
-        "remark-mdx": "^1.6.6",
-        "remark-parse": "8.0.2",
+        "remark-mdx": "1.6.16",
+        "remark-parse": "8.0.3",
         "remark-squeeze-paragraphs": "4.0.0",
         "style-to-object": "0.3.0",
-        "unified": "9.0.0",
+        "unified": "9.1.0",
         "unist-builder": "2.0.3",
-        "unist-util-visit": "2.0.2"
+        "unist-util-visit": "2.0.3"
       },
       "dependencies": {
         "@babel/core": {
-          "version": "7.9.6",
-          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz",
-          "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==",
-          "requires": {
-            "@babel/code-frame": "^7.8.3",
-            "@babel/generator": "^7.9.6",
-            "@babel/helper-module-transforms": "^7.9.0",
-            "@babel/helpers": "^7.9.6",
-            "@babel/parser": "^7.9.6",
-            "@babel/template": "^7.8.6",
-            "@babel/traverse": "^7.9.6",
-            "@babel/types": "^7.9.6",
+          "version": "7.10.5",
+          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.5.tgz",
+          "integrity": "sha512-O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w==",
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/generator": "^7.10.5",
+            "@babel/helper-module-transforms": "^7.10.5",
+            "@babel/helpers": "^7.10.4",
+            "@babel/parser": "^7.10.5",
+            "@babel/template": "^7.10.4",
+            "@babel/traverse": "^7.10.5",
+            "@babel/types": "^7.10.5",
             "convert-source-map": "^1.7.0",
             "debug": "^4.1.0",
             "gensync": "^1.0.0-beta.1",
             "json5": "^2.1.2",
-            "lodash": "^4.17.13",
+            "lodash": "^4.17.19",
             "resolve": "^1.3.2",
             "semver": "^5.4.1",
             "source-map": "^0.5.0"
           }
         },
-        "@babel/plugin-syntax-jsx": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.8.3.tgz",
-          "integrity": "sha512-WxdW9xyLgBdefoo0Ynn3MRSkhe5tFVxxKNVdnZSh318WrG2e2jH+E9wd/++JsqcLJZPfz87njQJ8j2Upjm0M0A==",
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.8.3"
-          }
-        },
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
           "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
-        },
-        "unist-util-is": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.2.tgz",
-          "integrity": "sha512-Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ=="
-        },
-        "unist-util-visit": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.2.tgz",
-          "integrity": "sha512-HoHNhGnKj6y+Sq+7ASo2zpVdfdRifhTgX2KTU3B/sO/TTlZchp7E3S4vjRzDJ7L60KmrCPsQkVK3lEF3cz36XQ==",
-          "requires": {
-            "@types/unist": "^2.0.0",
-            "unist-util-is": "^4.0.0",
-            "unist-util-visit-parents": "^3.0.0"
-          }
         }
       }
     },
     "@mdx-js/react": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-1.6.6.tgz",
-      "integrity": "sha512-zOOdNreHUNSFQ0dg3wYYg9sOGg2csf7Sk8JGBigeBq+4Xk4LO0QdycGAmgKNfeme+SyBV5LBIPjt1NNsScyWEQ=="
+      "version": "1.6.16",
+      "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-1.6.16.tgz",
+      "integrity": "sha512-+FhuSVOPo7+4fZaRwWuCSRUcZkJOkZu0rfAbBKvoCg1LWb1Td8Vzi0DTLORdSvgWNbU6+EL40HIgwTOs00x2Jw=="
     },
     "@mdx-js/util": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.6.tgz",
-      "integrity": "sha512-PKTHVgMHnK5p+kcMWWNnZuoR7O19VmHiOujmVcyN50hya7qIdDb5vvsYC+dwLxApEXiABhLozq0dlIwFeS3yjg=="
+      "version": "1.6.16",
+      "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.16.tgz",
+      "integrity": "sha512-SFtLGIGZummuyMDPRL5KdmpgI8U19Ble28UjEWihPjGxF1Lgj8aDjLWY8KiaUy9eqb9CKiVCqEIrK9jbnANfkw=="
     },
     "@mrmlnc/readdir-enhanced": {
       "version": "2.2.1",
@@ -1573,6 +1826,11 @@
         "fastq": "^1.6.0"
       }
     },
+    "@sindresorhus/is": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
+      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="
+    },
     "@svgr/babel-plugin-add-jsx-attribute": {
       "version": "5.4.0",
       "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.4.0.tgz",
@@ -1682,6 +1940,14 @@
         "loader-utils": "^2.0.0"
       }
     },
+    "@szmarczak/http-timer": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
+      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
+      "requires": {
+        "defer-to-connect": "^1.0.1"
+      }
+    },
     "@types/anymatch": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz",
@@ -1701,6 +1967,14 @@
         "@types/node": "*"
       }
     },
+    "@types/hast": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.1.tgz",
+      "integrity": "sha512-viwwrB+6xGzw+G1eWpF9geV3fnsDgXqHG+cqgiHrvQfDUW5hzhCyV7Sy3UJxhfRFBsgky2SSW33qi/YrIkjX5Q==",
+      "requires": {
+        "@types/unist": "*"
+      }
+    },
     "@types/html-minifier-terser": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz",
@@ -1725,15 +1999,20 @@
       "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
     },
     "@types/node": {
-      "version": "14.0.22",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.22.tgz",
-      "integrity": "sha512-emeGcJvdiZ4Z3ohbmw93E/64jRzUHAItSHt8nF7M4TGgQTiWqFVGB8KNpLGFmUHmHLvjvBgFwVlqNcq+VuGv9g=="
+      "version": "14.0.27",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.27.tgz",
+      "integrity": "sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g=="
     },
     "@types/parse-json": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
       "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
     },
+    "@types/parse5": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/@types/parse5/-/parse5-5.0.3.tgz",
+      "integrity": "sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw=="
+    },
     "@types/q": {
       "version": "1.5.4",
       "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
@@ -1790,9 +2069,9 @@
       }
     },
     "@types/webpack-sources": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-1.4.0.tgz",
-      "integrity": "sha512-c88dKrpSle9BtTqR6ifdaxu1Lvjsl3C5OsfvuUbUwdXymshv1TkufUAXBajCCUM/f/TmnkZC/Esb03MinzSiXQ==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-1.4.2.tgz",
+      "integrity": "sha512-77T++JyKow4BQB/m9O96n9d/UUHWLQHlcqXb9Vsf4F1+wKNrrlWNFPDLKNT92RJnCSL6CieTc+NDXtCVZswdTw==",
       "requires": {
         "@types/node": "*",
         "@types/source-list-map": "*",
@@ -1973,11 +2252,6 @@
       "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
-    "abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
-    },
     "accepts": {
       "version": "1.3.7",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
@@ -2002,11 +2276,6 @@
       "resolved": "https://registry.npmjs.org/address/-/address-1.1.2.tgz",
       "integrity": "sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA=="
     },
-    "agentkeepalive": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-2.2.0.tgz",
-      "integrity": "sha1-xdG9SxKQCPEWPyNvhuX66iAm4u8="
-    },
     "aggregate-error": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz",
@@ -2033,66 +2302,35 @@
       "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="
     },
     "ajv-keywords": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.1.tgz",
-      "integrity": "sha512-KWcq3xN8fDjSB+IMoh2VaXVhRI0BBGxoYp3rx7Pkb6z0cFjYR9Q9l4yZqqals0/zsioCmocC5H6UvsGD4MoIBA=="
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="
     },
     "algoliasearch": {
-      "version": "3.35.1",
-      "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-3.35.1.tgz",
-      "integrity": "sha512-K4yKVhaHkXfJ/xcUnil04xiSrB8B8yHZoFEhWNpXg23eiCnqvTZw1tn/SqvdsANlYHLJlKl0qi3I/Q2Sqo7LwQ==",
-      "requires": {
-        "agentkeepalive": "^2.2.0",
-        "debug": "^2.6.9",
-        "envify": "^4.0.0",
-        "es6-promise": "^4.1.0",
-        "events": "^1.1.0",
-        "foreach": "^2.0.5",
-        "global": "^4.3.2",
-        "inherits": "^2.0.1",
-        "isarray": "^2.0.1",
-        "load-script": "^1.0.0",
-        "object-keys": "^1.0.11",
-        "querystring-es3": "^0.2.1",
-        "reduce": "^1.0.1",
-        "semver": "^5.1.0",
-        "tunnel-agent": "^0.6.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "events": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-          "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
-        },
-        "isarray": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
-        }
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.4.0.tgz",
+      "integrity": "sha512-Ag3wxe/nSodNl/1KbHibtkh7TNLptKE300/wnGVtszRjXivaWD6333nUpCumrYObHym/fHMHyLcmQYezXbAIWQ==",
+      "requires": {
+        "@algolia/cache-browser-local-storage": "4.4.0",
+        "@algolia/cache-common": "4.4.0",
+        "@algolia/cache-in-memory": "4.4.0",
+        "@algolia/client-account": "4.4.0",
+        "@algolia/client-analytics": "4.4.0",
+        "@algolia/client-common": "4.4.0",
+        "@algolia/client-recommendation": "4.4.0",
+        "@algolia/client-search": "4.4.0",
+        "@algolia/logger-common": "4.4.0",
+        "@algolia/logger-console": "4.4.0",
+        "@algolia/requester-browser-xhr": "4.4.0",
+        "@algolia/requester-common": "4.4.0",
+        "@algolia/requester-node-http": "4.4.0",
+        "@algolia/transporter": "4.4.0"
       }
     },
     "algoliasearch-helper": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/algoliasearch-helper/-/algoliasearch-helper-3.1.2.tgz",
-      "integrity": "sha512-HfCVvmKH6+5OU9/SaHLdhvr39DBObA02z62RsfPhFDftzgQM6pJB2JoPyGpIteHW4RAYh8bPLiB8l4hajuy6fA==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/algoliasearch-helper/-/algoliasearch-helper-3.2.2.tgz",
+      "integrity": "sha512-/3XvE33R+gQKaiPdy3nmHYqhF8hqIu8xnlOicVxb1fD6uMFmxW8rGLzzrRfsPfxgAfm+c1NslLb3TzQVIB8aVA==",
       "requires": {
         "events": "^1.1.1"
       },
@@ -2109,6 +2347,26 @@
       "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
       "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM="
     },
+    "ansi-align": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
+      "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
+      "requires": {
+        "string-width": "^3.0.0"
+      },
+      "dependencies": {
+        "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==",
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        }
+      }
+    },
     "ansi-colors": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
@@ -2120,6 +2378,13 @@
       "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
       "requires": {
         "type-fest": "^0.11.0"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ=="
+        }
       }
     },
     "ansi-html": {
@@ -2128,9 +2393,9 @@
       "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4="
     },
     "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
     },
     "ansi-styles": {
       "version": "3.2.1",
@@ -2205,22 +2470,15 @@
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
       "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
     },
-    "asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "requires": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
     "asn1.js": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
       "requires": {
         "bn.js": "^4.0.0",
         "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
       },
       "dependencies": {
         "bn.js": {
@@ -2254,11 +2512,6 @@
         }
       }
     },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-    },
     "assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
@@ -2282,48 +2535,25 @@
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
       "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
     },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-    },
     "atob": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
     },
-    "autocomplete.js": {
-      "version": "0.36.0",
-      "resolved": "https://registry.npmjs.org/autocomplete.js/-/autocomplete.js-0.36.0.tgz",
-      "integrity": "sha512-jEwUXnVMeCHHutUt10i/8ZiRaCb0Wo+ZyKxeGsYwBDtw6EJHqEeDrq4UwZRD8YBSvp3g6klP678il2eeiVXN2Q==",
-      "requires": {
-        "immediate": "^3.2.3"
-      }
-    },
     "autoprefixer": {
-      "version": "9.8.5",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.5.tgz",
-      "integrity": "sha512-C2p5KkumJlsTHoNv9w31NrBRgXhf6eCMteJuHZi2xhkgC+5Vm40MEtCKPhc0qdgAOhox0YPy1SQHTAky05UoKg==",
+      "version": "9.8.6",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz",
+      "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==",
       "requires": {
         "browserslist": "^4.12.0",
-        "caniuse-lite": "^1.0.30001097",
-        "colorette": "^1.2.0",
+        "caniuse-lite": "^1.0.30001109",
+        "colorette": "^1.2.1",
         "normalize-range": "^0.1.2",
         "num2fraction": "^1.2.2",
         "postcss": "^7.0.32",
         "postcss-value-parser": "^4.1.0"
       }
     },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
-    },
-    "aws4": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz",
-      "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA=="
-    },
     "babel-code-frame": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
@@ -2334,6 +2564,11 @@
         "js-tokens": "^3.0.2"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+        },
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
@@ -2356,6 +2591,14 @@
           "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
           "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
         },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
@@ -2396,19 +2639,12 @@
       }
     },
     "babel-plugin-apply-mdx-type-prop": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.6.tgz",
-      "integrity": "sha512-rUzVvkQa8/9M63OZT6qQQ1bS8P0ozhXp9e5uJ3RwRJF5Me7s4nZK5SYhyNHYc0BkAflWnCOGMP3oPQUfuyB8tg==",
+      "version": "1.6.16",
+      "resolved": "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.16.tgz",
+      "integrity": "sha512-hjUd24Yhnr5NKtHpC2mcRBGjC6RUKGzSzjN9g5SdjT4WpL/JDlpmjyBf7vWsJJSXFvMIbzRyxF4lT9ukwOnj/w==",
       "requires": {
-        "@babel/helper-plugin-utils": "7.8.3",
-        "@mdx-js/util": "^1.6.6"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "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=="
-        }
+        "@babel/helper-plugin-utils": "7.10.4",
+        "@mdx-js/util": "1.6.16"
       }
     },
     "babel-plugin-dynamic-import-node": {
@@ -2420,18 +2656,11 @@
       }
     },
     "babel-plugin-extract-import-names": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.6.tgz",
-      "integrity": "sha512-UtMuiQJnhVPAGE2+pDe7Nc9NVEmDdqGTN74BtRALgH+7oag88RpxFLOSiA+u5mFkFg741wW9Ut5KiyJpksEj/g==",
+      "version": "1.6.16",
+      "resolved": "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.16.tgz",
+      "integrity": "sha512-Da6Ra0sbA/1Iavli8LdMbTjyrsOPaxMm4lrKl8VJN4sJI5F64qy2EpLj3+5INLvNPfW4ddwpStbfP3Rf3jIgcw==",
       "requires": {
-        "@babel/helper-plugin-utils": "7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "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=="
-        }
+        "@babel/helper-plugin-utils": "7.10.4"
       }
     },
     "bail": {
@@ -2504,14 +2733,6 @@
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY="
     },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
     "bfj": {
       "version": "6.1.2",
       "resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz",
@@ -2600,6 +2821,28 @@
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
       "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
     },
+    "boxen": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz",
+      "integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==",
+      "requires": {
+        "ansi-align": "^3.0.0",
+        "camelcase": "^5.3.1",
+        "chalk": "^3.0.0",
+        "cli-boxes": "^2.2.0",
+        "string-width": "^4.1.0",
+        "term-size": "^2.1.0",
+        "type-fest": "^0.8.1",
+        "widest-line": "^3.1.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+        }
+      }
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -2673,15 +2916,15 @@
       }
     },
     "browserify-sign": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.0.tgz",
-      "integrity": "sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
       "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",
+        "elliptic": "^6.5.3",
         "inherits": "^2.0.4",
         "parse-asn1": "^5.1.5",
         "readable-stream": "^3.6.0",
@@ -2704,14 +2947,14 @@
       }
     },
     "browserslist": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.13.0.tgz",
-      "integrity": "sha512-MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ==",
+      "version": "4.14.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.0.tgz",
+      "integrity": "sha512-pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ==",
       "requires": {
-        "caniuse-lite": "^1.0.30001093",
-        "electron-to-chromium": "^1.3.488",
-        "escalade": "^3.0.1",
-        "node-releases": "^1.1.58"
+        "caniuse-lite": "^1.0.30001111",
+        "electron-to-chromium": "^1.3.523",
+        "escalade": "^3.0.2",
+        "node-releases": "^1.1.60"
       }
     },
     "buffer": {
@@ -2881,6 +3124,40 @@
         }
       }
     },
+    "cacheable-request": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
+      "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
+      "requires": {
+        "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": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "lowercase-keys": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+          "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="
+        },
+        "normalize-url": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
+          "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ=="
+        }
+      }
+    },
     "call-me-maybe": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
@@ -2945,14 +3222,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001099",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001099.tgz",
-      "integrity": "sha512-sdS9A+sQTk7wKoeuZBN/YMAHVztUfVnjDi4/UV3sDE8xoh7YR12hKW+pIdB3oqKGwr9XaFL2ovfzt9w8eUI5CA=="
-    },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+      "version": "1.0.30001113",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001113.tgz",
+      "integrity": "sha512-qMvjHiKH21zzM/VDZr6oosO6Ri3U0V2tC015jRXjOecwQCJtsU5zklTNTk31jQbIOP8gha0h1ccM/g0ECP+4BA=="
     },
     "ccount": {
       "version": "1.0.5",
@@ -3054,9 +3326,9 @@
       }
     },
     "chokidar": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz",
-      "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
+      "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
       "requires": {
         "anymatch": "~3.1.1",
         "braces": "~3.0.2",
@@ -3141,6 +3413,11 @@
       "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
       "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="
     },
+    "cli-boxes": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.0.tgz",
+      "integrity": "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w=="
+    },
     "cli-cursor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
@@ -3150,9 +3427,9 @@
       }
     },
     "cli-width": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
-      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw=="
     },
     "clipboard": {
       "version": "2.0.6",
@@ -3175,21 +3452,6 @@
         "wrap-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=="
-        },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-        },
-        "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="
-        },
         "string-width": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -3199,14 +3461,6 @@
             "is-fullwidth-code-point": "^2.0.0",
             "strip-ansi": "^5.1.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==",
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
         }
       }
     },
@@ -3232,6 +3486,14 @@
         }
       }
     },
+    "clone-response": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
+      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
     "clsx": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz",
@@ -3309,14 +3571,6 @@
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz",
       "integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw=="
     },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
     "comma-separated-tokens": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz",
@@ -3419,15 +3673,38 @@
         }
       }
     },
+    "configstore": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
+      "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
+      "requires": {
+        "dot-prop": "^5.2.0",
+        "graceful-fs": "^4.1.2",
+        "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": "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==",
+          "requires": {
+            "semver": "^6.0.0"
+          }
+        }
+      }
+    },
     "connect-history-api-fallback": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
       "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="
     },
     "consola": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/consola/-/consola-2.14.0.tgz",
-      "integrity": "sha512-A2j1x4u8d6SIVikhZROfpFJxQZie+cZOfQMyI/tu2+hWXe8iAv7R6FW6s6x04/7zBCst94lPddztot/d6GJiuQ=="
+      "version": "2.15.0",
+      "resolved": "https://registry.npmjs.org/consola/-/consola-2.15.0.tgz",
+      "integrity": "sha512-vlcSGgdYS26mPf7qNi+dCisbhiyDnrN1zaRbw3CSuc2wGOMEGGPsp46PdRG5gqXwgtJfjxDkxRNAgRPr1B77vQ=="
     },
     "console-browserify": {
       "version": "1.2.0",
@@ -3600,6 +3877,11 @@
         }
       }
     },
+    "core-js-pure": {
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.5.tgz",
+      "integrity": "sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA=="
+    },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -3618,12 +3900,12 @@
       }
     },
     "create-ecdh": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
       "requires": {
         "bn.js": "^4.1.0",
-        "elliptic": "^6.0.0"
+        "elliptic": "^6.5.3"
       },
       "dependencies": {
         "bn.js": {
@@ -3686,6 +3968,11 @@
         "randomfill": "^1.0.3"
       }
     },
+    "crypto-random-string": {
+      "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=="
+    },
     "css-blank-pseudo": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz",
@@ -3975,14 +4262,6 @@
       "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
       "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk="
     },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "debug": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -4001,6 +4280,14 @@
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
     },
+    "decompress-response": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
     "deep-equal": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
@@ -4014,6 +4301,11 @@
         "regexp.prototype.flags": "^1.2.0"
       }
     },
+    "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=="
+    },
     "default-gateway": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
@@ -4023,6 +4315,11 @@
         "ip-regex": "^2.1.0"
       }
     },
+    "defer-to-connect": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
+      "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="
+    },
     "define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -4098,11 +4395,6 @@
         }
       }
     },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-    },
     "delegate": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
@@ -4141,10 +4433,10 @@
       "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
       "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw=="
     },
-    "detect-port-alt": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz",
-      "integrity": "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==",
+    "detect-port": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/detect-port/-/detect-port-1.3.0.tgz",
+      "integrity": "sha512-E+B1gzkl2gqxt1IhUzwjrxBKRqx1UzC3WLONHinn8S3T6lwV/agVCyitiFOsGJ/eYuEUBvD71MZHy3Pv1G9doQ==",
       "requires": {
         "address": "^1.0.1",
         "debug": "^2.6.0"
@@ -4227,20 +4519,6 @@
         "buffer-indexof": "^1.0.0"
       }
     },
-    "docsearch.js": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/docsearch.js/-/docsearch.js-2.6.3.tgz",
-      "integrity": "sha512-GN+MBozuyz664ycpZY0ecdQE0ND/LSgJKhTLA0/v3arIS3S1Rpf2OJz6A35ReMsm91V5apcmzr5/kM84cvUg+A==",
-      "requires": {
-        "algoliasearch": "^3.24.5",
-        "autocomplete.js": "0.36.0",
-        "hogan.js": "^3.0.2",
-        "request": "^2.87.0",
-        "stack-utils": "^1.0.1",
-        "to-factory": "^1.0.0",
-        "zepto": "^1.2.0"
-      }
-    },
     "dom-converter": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
@@ -4258,11 +4536,6 @@
         "entities": "^1.1.1"
       }
     },
-    "dom-walk": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
-      "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
-    },
     "domain-browser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
@@ -4308,9 +4581,14 @@
       }
     },
     "duplexer": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
-      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E="
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
+      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
+    },
+    "duplexer3": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI="
     },
     "duplexify": {
       "version": "3.7.1",
@@ -4347,15 +4625,6 @@
         }
       }
     },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -4367,9 +4636,9 @@
       "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="
     },
     "electron-to-chromium": {
-      "version": "1.3.496",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.496.tgz",
-      "integrity": "sha512-TXY4mwoyowwi4Lsrq9vcTUYBThyc1b2hXaTZI13p8/FRhY2CTaq5lK+DVjhYkKiTLsKt569Xes+0J5JsVXFurQ=="
+      "version": "1.3.533",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.533.tgz",
+      "integrity": "sha512-YqAL+NXOzjBnpY+dcOKDlZybJDCOzgsq4koW3fvyty/ldTmsb4QazZpOWmVvZ2m0t5jbBf7L0lIGU3BUipwG+A=="
     },
     "elliptic": {
       "version": "6.5.3",
@@ -4393,9 +4662,9 @@
       }
     },
     "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
     },
     "emojis-list": {
       "version": "3.0.0",
@@ -4421,9 +4690,9 @@
       }
     },
     "enhanced-resolve": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.2.0.tgz",
-      "integrity": "sha512-S7eiFb/erugyd1rLb6mQ3Vuq+EXHv5cpCkNqqIkYkBgN2QdFnyCZzFBleqwGEx4lgNGYij81BWnCrFNK7vxvjQ==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz",
+      "integrity": "sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==",
       "requires": {
         "graceful-fs": "^4.1.2",
         "memory-fs": "^0.5.0",
@@ -4468,15 +4737,6 @@
       "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
       "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
     },
-    "envify": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/envify/-/envify-4.1.0.tgz",
-      "integrity": "sha512-IKRVVoAYr4pIx4yIWNsz9mOsboxlNXiu7TNBnem/K/uTHdkyzXWDzHCK7UTolqBbgaBz0tQHsD3YNls0uIIjiw==",
-      "requires": {
-        "esprima": "^4.0.0",
-        "through": "~2.3.4"
-      }
-    },
     "errno": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
@@ -4521,15 +4781,15 @@
         "is-symbol": "^1.0.2"
       }
     },
-    "es6-promise": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
-    },
     "escalade": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.0.1.tgz",
-      "integrity": "sha512-DR6NO3h9niOT+MZs7bjxlj2a1k+POu5RN8CLTPX2+i78bRi9eLe7+0zXgUHMnGXWybYcL61E9hGhPKqedy8tQA=="
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz",
+      "integrity": "sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ=="
+    },
+    "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=="
     },
     "escape-html": {
       "version": "1.0.3",
@@ -4597,9 +4857,9 @@
       "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ=="
     },
     "events": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.1.0.tgz",
-      "integrity": "sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg=="
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz",
+      "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg=="
     },
     "eventsource": {
       "version": "1.0.7",
@@ -4840,11 +5100,6 @@
         }
       }
     },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
-    },
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -4868,6 +5123,14 @@
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
+    "fast-url-parser": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz",
+      "integrity": "sha1-9K8+qfNNiicc9YrSs3WfQx8LMY0=",
+      "requires": {
+        "punycode": "^1.3.2"
+      }
+    },
     "fastq": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
@@ -4905,6 +5168,15 @@
         "escape-string-regexp": "^1.0.5"
       }
     },
+    "file-loader": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.0.0.tgz",
+      "integrity": "sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==",
+      "requires": {
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^2.6.5"
+      }
+    },
     "filesize": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/filesize/-/filesize-6.0.1.tgz",
@@ -5004,9 +5276,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.12.1.tgz",
-      "integrity": "sha512-tmRv0AVuR7ZyouUHLeNSiO6pqulF7dYa3s19c6t+wz9LD69/uSzdMxJ2S91nTI9U3rt/IldxpzMOFejp6f0hjg=="
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
+      "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA=="
     },
     "for-in": {
       "version": "1.0.2",
@@ -5021,16 +5293,6 @@
         "for-in": "^1.0.1"
       }
     },
-    "foreach": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
-    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-    },
     "fork-ts-checker-webpack-plugin": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-3.1.1.tgz",
@@ -5177,16 +5439,6 @@
         }
       }
     },
-    "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==",
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      }
-    },
     "forwarded": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
@@ -5335,14 +5587,6 @@
       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
       "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
     },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "github-slugger": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.3.0.tgz",
@@ -5384,13 +5628,12 @@
       "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
       "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs="
     },
-    "global": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
-      "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
+    "global-dirs": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz",
+      "integrity": "sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==",
       "requires": {
-        "min-document": "^2.19.0",
-        "process": "^0.11.10"
+        "ini": "^1.3.5"
       }
     },
     "global-modules": {
@@ -5475,6 +5718,24 @@
         "delegate": "^3.1.2"
       }
     },
+    "got": {
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
+      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
+      "requires": {
+        "@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.4",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
@@ -5505,20 +5766,6 @@
       "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
       "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="
     },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
-    },
-    "har-validator": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-      "requires": {
-        "ajv": "^6.5.5",
-        "har-schema": "^2.0.0"
-      }
-    },
     "has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -5533,6 +5780,13 @@
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
       "requires": {
         "ansi-regex": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+        }
       }
     },
     "has-flag": {
@@ -5592,6 +5846,11 @@
         }
       }
     },
+    "has-yarn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
+      "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="
+    },
     "hash-base": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
@@ -5619,38 +5878,30 @@
       }
     },
     "hast-to-hyperscript": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/hast-to-hyperscript/-/hast-to-hyperscript-7.0.4.tgz",
-      "integrity": "sha512-vmwriQ2H0RPS9ho4Kkbf3n3lY436QKLq6VaGA1pzBh36hBi3tm1DO9bR+kaJIbpT10UqaANDkMjxvjVfr+cnOA==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/hast-to-hyperscript/-/hast-to-hyperscript-9.0.0.tgz",
+      "integrity": "sha512-NJvMYU3GlMLs7hN3CRbsNlMzusVNkYBogVWDGybsuuVQ336gFLiD+q9qtFZT2meSHzln3pNISZWTASWothMSMg==",
       "requires": {
+        "@types/unist": "^2.0.3",
         "comma-separated-tokens": "^1.0.0",
         "property-information": "^5.3.0",
         "space-separated-tokens": "^1.0.0",
-        "style-to-object": "^0.2.1",
-        "unist-util-is": "^3.0.0",
-        "web-namespaces": "^1.1.2"
-      },
-      "dependencies": {
-        "style-to-object": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.2.3.tgz",
-          "integrity": "sha512-1d/k4EY2N7jVLOqf2j04dTc37TPOv/hHxZmvpg8Pdh8UYydxeu/C1W1U4vD8alzf5V2Gt7rLsmkr4dxAlDm9ng==",
-          "requires": {
-            "inline-style-parser": "0.1.1"
-          }
-        }
+        "style-to-object": "^0.3.0",
+        "unist-util-is": "^4.0.0",
+        "web-namespaces": "^1.0.0"
       }
     },
     "hast-util-from-parse5": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-5.0.3.tgz",
-      "integrity": "sha512-gOc8UB99F6eWVWFtM9jUikjN7QkWxB3nY0df5Z0Zq1/Nkwl5V4hAAsl0tmwlgWl/1shlTF8DnNYLO8X6wRV9pA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-6.0.0.tgz",
+      "integrity": "sha512-3ZYnfKenbbkhhNdmOQqgH10vnvPivTdsOJCri+APn0Kty+nRkDHArnaX9Hiaf8H+Ig+vkNptL+SRY/6RwWJk1Q==",
       "requires": {
-        "ccount": "^1.0.3",
+        "@types/parse5": "^5.0.0",
+        "ccount": "^1.0.0",
         "hastscript": "^5.0.0",
         "property-information": "^5.0.0",
-        "web-namespaces": "^1.1.2",
-        "xtend": "^4.0.1"
+        "vfile": "^4.0.0",
+        "web-namespaces": "^1.0.0"
       }
     },
     "hast-util-parse-selector": {
@@ -5659,26 +5910,28 @@
       "integrity": "sha512-gW3sxfynIvZApL4L07wryYF4+C9VvH3AUi7LAnVXV4MneGEgwOByXvFo18BgmTWnm7oHAe874jKbIB1YhHSIzA=="
     },
     "hast-util-raw": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-5.0.2.tgz",
-      "integrity": "sha512-3ReYQcIHmzSgMq8UrDZHFL0oGlbuVGdLKs8s/Fe8BfHFAyZDrdv1fy/AGn+Fim8ZuvAHcJ61NQhVMtyfHviT/g==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-6.0.0.tgz",
+      "integrity": "sha512-IQo6tv3bMMKxk53DljswliucCJOQxaZFCuKEJ7X80249dmJ1nA9LtOnnylsLlqTG98NjQ+iGcoLAYo9q5FRhRg==",
       "requires": {
-        "hast-util-from-parse5": "^5.0.0",
-        "hast-util-to-parse5": "^5.0.0",
+        "@types/hast": "^2.0.0",
+        "hast-util-from-parse5": "^6.0.0",
+        "hast-util-to-parse5": "^6.0.0",
         "html-void-elements": "^1.0.0",
-        "parse5": "^5.0.0",
+        "parse5": "^6.0.0",
         "unist-util-position": "^3.0.0",
+        "vfile": "^4.0.0",
         "web-namespaces": "^1.0.0",
         "xtend": "^4.0.0",
         "zwitch": "^1.0.0"
       }
     },
     "hast-util-to-parse5": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/hast-util-to-parse5/-/hast-util-to-parse5-5.1.2.tgz",
-      "integrity": "sha512-ZgYLJu9lYknMfsBY0rBV4TJn2xiwF1fXFFjbP6EE7S0s5mS8LIKBVWzhA1MeIs1SWW6GnnE4In6c3kPb+CWhog==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-to-parse5/-/hast-util-to-parse5-6.0.0.tgz",
+      "integrity": "sha512-Lu5m6Lgm/fWuz8eWnrKezHtVY83JeRGaNQ2kn9aJgqaxvVkFCZQBEhgodZUDUvoodgyROHDb3r5IxAEdl6suJQ==",
       "requires": {
-        "hast-to-hyperscript": "^7.0.0",
+        "hast-to-hyperscript": "^9.0.0",
         "property-information": "^5.0.0",
         "web-namespaces": "^1.0.0",
         "xtend": "^4.0.0",
@@ -5729,22 +5982,6 @@
         "minimalistic-crypto-utils": "^1.0.1"
       }
     },
-    "hogan.js": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz",
-      "integrity": "sha1-TNnhq9QpQUbnZ55B14mHMrAse/0=",
-      "requires": {
-        "mkdirp": "0.3.0",
-        "nopt": "1.0.10"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
-          "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4="
-        }
-      }
-    },
     "hoist-non-react-statics": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
@@ -5895,6 +6132,11 @@
         "readable-stream": "^3.1.1"
       }
     },
+    "http-cache-semantics": {
+      "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=="
+    },
     "http-deceiver": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
@@ -6056,16 +6298,6 @@
         }
       }
     },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      }
-    },
     "https-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
@@ -6107,11 +6339,6 @@
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
       "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="
     },
-    "immediate": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz",
-      "integrity": "sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q=="
-    },
     "immer": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/immer/-/immer-1.10.0.tgz",
@@ -6149,6 +6376,11 @@
         }
       }
     },
+    "import-lazy": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
+      "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM="
+    },
     "import-local": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
@@ -6208,46 +6440,80 @@
       "integrity": "sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q=="
     },
     "inquirer": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.4.tgz",
-      "integrity": "sha512-Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ==",
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
+      "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
       "requires": {
         "ansi-escapes": "^4.2.1",
-        "chalk": "^2.4.2",
+        "chalk": "^4.1.0",
         "cli-cursor": "^3.1.0",
-        "cli-width": "^2.0.0",
+        "cli-width": "^3.0.0",
         "external-editor": "^3.0.3",
         "figures": "^3.0.0",
-        "lodash": "^4.17.15",
+        "lodash": "^4.17.19",
         "mute-stream": "0.0.8",
-        "run-async": "^2.2.0",
-        "rxjs": "^6.5.3",
+        "run-async": "^2.4.0",
+        "rxjs": "^6.6.0",
         "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=="
+        },
+        "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==",
+          "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
         },
         "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "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==",
+          "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=="
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+        },
         "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==",
+          "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==",
           "requires": {
-            "ansi-regex": "^4.1.0"
+            "has-flag": "^4.0.0"
           }
         }
       }
@@ -6354,6 +6620,21 @@
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
       "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw=="
     },
+    "is-ci": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "requires": {
+        "ci-info": "^2.0.0"
+      },
+      "dependencies": {
+        "ci-info": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+          "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
+        }
+      }
+    },
     "is-color-stop": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
@@ -6418,9 +6699,9 @@
       "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE="
     },
     "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=="
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz",
+      "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw=="
     },
     "is-extendable": {
       "version": "0.1.1",
@@ -6433,9 +6714,9 @@
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
     },
     "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=="
+      "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="
     },
     "is-glob": {
       "version": "4.0.1",
@@ -6450,6 +6731,20 @@
       "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
       "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw=="
     },
+    "is-installed-globally": {
+      "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==",
+      "requires": {
+        "global-dirs": "^2.0.1",
+        "is-path-inside": "^3.0.1"
+      }
+    },
+    "is-npm": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz",
+      "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig=="
+    },
     "is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -6502,9 +6797,9 @@
       }
     },
     "is-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
+      "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
       "requires": {
         "has-symbols": "^1.0.1"
       }
@@ -6573,6 +6868,11 @@
         "is-docker": "^2.0.0"
       }
     },
+    "is-yarn-global": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
+      "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="
+    },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -6588,11 +6888,6 @@
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
     },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-    },
     "jest-worker": {
       "version": "25.5.0",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz",
@@ -6631,36 +6926,26 @@
         "esprima": "^4.0.0"
       }
     },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
-    },
     "jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
     },
+    "json-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
+      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg="
+    },
     "json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
       "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
     },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-    },
     "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=="
     },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
-    },
     "json3": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
@@ -6682,15 +6967,12 @@
         "graceful-fs": "^4.1.6"
       }
     },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+    "keyv": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
+      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
       "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
+        "json-buffer": "3.0.0"
       }
     },
     "killable": {
@@ -6712,6 +6994,14 @@
         "webpack-sources": "^1.1.0"
       }
     },
+    "latest-version": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
+      "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
+      "requires": {
+        "package-json": "^6.3.0"
+      }
+    },
     "lazy-cache": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
@@ -6735,11 +7025,6 @@
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
       "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
     },
-    "load-script": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/load-script/-/load-script-1.0.0.tgz",
-      "integrity": "sha1-BJGTngvuVkPuSUp+PaPSuscMbKQ="
-    },
     "loader-runner": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
@@ -6942,6 +7227,11 @@
         "tslib": "^1.10.0"
       }
     },
+    "lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="
+    },
     "lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -7174,13 +7464,10 @@
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
     },
-    "min-document": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
-      "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
-      "requires": {
-        "dom-walk": "^0.1.0"
-      }
+    "mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
     },
     "mini-create-react-context": {
       "version": "0.4.0",
@@ -7287,9 +7574,9 @@
       }
     },
     "minipass-pipeline": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.3.tgz",
-      "integrity": "sha512-cFOknTvng5vqnwOpDsZTWhNll6Jf8o2x+/diplafmxpuIymAjzoOolZG0VvQf3V2HgqzJNhnuKHYp2BqDgz8IQ==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
+      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
       "requires": {
         "minipass": "^3.0.0"
       }
@@ -7522,17 +7809,9 @@
       }
     },
     "node-releases": {
-      "version": "1.1.59",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.59.tgz",
-      "integrity": "sha512-H3JrdUczbdiwxN5FuJPyCHnGHIFqQ0wWxo+9j1kAXAzqNMAHlo+4I/sYYxpyK0irQ73HgdiyzD32oqQDcU2Osw=="
-    },
-    "nopt": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
-      "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
-      "requires": {
-        "abbrev": "1"
-      }
+      "version": "1.1.60",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz",
+      "integrity": "sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA=="
     },
     "normalize-path": {
       "version": "3.0.0",
@@ -7627,11 +7906,6 @@
       "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
       "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4="
     },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
-    },
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -7758,17 +8032,17 @@
       }
     },
     "onetime": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
-      "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
       "requires": {
         "mimic-fn": "^2.1.0"
       }
     },
     "open": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.0.4.tgz",
-      "integrity": "sha512-brSA+/yq+b08Hsr4c8fsEW2CRzk1BmfN3SAK/5VCHQ9bdoZJ4qa/+AfR0xHjlbbZUyPkUHs1b8x1RqdyZdkVqQ==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.1.0.tgz",
+      "integrity": "sha512-lLPI5KgOwEYCDKXf4np7y1PBEkj7HYIyP2DY8mVDRnx0VIIu6bNrRB0R66TuO7Mack6EnTNLm4uvcl1UoklTpA==",
       "requires": {
         "is-docker": "^2.0.0",
         "is-wsl": "^2.1.1"
@@ -7821,6 +8095,11 @@
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
     },
+    "p-cancelable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
+      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="
+    },
     "p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
@@ -7863,6 +8142,17 @@
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
     },
+    "package-json": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
+      "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
+      "requires": {
+        "got": "^9.6.0",
+        "registry-auth-token": "^4.0.0",
+        "registry-url": "^5.0.0",
+        "semver": "^6.2.0"
+      }
+    },
     "pako": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
@@ -7920,13 +8210,12 @@
       }
     },
     "parse-asn1": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
-      "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
       "requires": {
-        "asn1.js": "^4.0.0",
+        "asn1.js": "^5.2.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"
@@ -7946,9 +8235,9 @@
       }
     },
     "parse-json": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz",
-      "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.1.tgz",
+      "integrity": "sha512-ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ==",
       "requires": {
         "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
@@ -7962,9 +8251,9 @@
       "integrity": "sha1-tPCdQTx6282Yf26SM8e0shDJOOQ="
     },
     "parse5": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
-      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
     },
     "parseurl": {
       "version": "1.3.3",
@@ -8042,11 +8331,6 @@
         "sha.js": "^2.4.8"
       }
     },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
-    },
     "picomatch": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
@@ -8095,13 +8379,13 @@
       }
     },
     "portfinder": {
-      "version": "1.0.26",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz",
-      "integrity": "sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==",
+      "version": "1.0.28",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
+      "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
       "requires": {
         "async": "^2.6.2",
         "debug": "^3.1.1",
-        "mkdirp": "^0.5.1"
+        "mkdirp": "^0.5.5"
       },
       "dependencies": {
         "debug": {
@@ -8174,9 +8458,9 @@
       }
     },
     "postcss-calc": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.2.tgz",
-      "integrity": "sha512-rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.3.tgz",
+      "integrity": "sha512-IB/EAEmZhIMEIhG7Ov4x+l47UaXOS1n2f4FBUk/aKllQhtSCxWhTzn0nJgkqN7fo/jcWySvWTSB6Syk9L+31bA==",
       "requires": {
         "postcss": "^7.0.27",
         "postcss-selector-parser": "^6.0.2",
@@ -8675,14 +8959,14 @@
       }
     },
     "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==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz",
+      "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==",
       "requires": {
         "icss-utils": "^4.1.1",
-        "postcss": "^7.0.16",
+        "postcss": "^7.0.32",
         "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.0.0"
+        "postcss-value-parser": "^4.1.0"
       }
     },
     "postcss-modules-scope": {
@@ -9107,9 +9391,9 @@
       "integrity": "sha512-MgMhSdHuHymNRqD6KM3eGS0PNqgK9q4QF5P0yoQQvpB6jNjeSAi3jcSAz0Sua/t9fa4xDOMar9HJbLa08gl9ug=="
     },
     "prismjs": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.20.0.tgz",
-      "integrity": "sha512-AEDjSrVNkynnw6A+B1DsFkd6AVdTnp+/WoUixFRULlCLZVRZlVQMVWio/16jv7G1FscUxQxOQhWwApgbnxr6kQ==",
+      "version": "1.21.0",
+      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.21.0.tgz",
+      "integrity": "sha512-uGdSIu1nk3kej2iZsLyDoJ7e9bnPzIgY0naW/HdknGj61zScaprVEVGHrPoXqI+M9sP0NDnTK2jpkvmldpuqDw==",
       "requires": {
         "clipboard": "^2.0.0"
       }
@@ -9161,11 +9445,6 @@
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
       "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
     },
-    "psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
-    },
     "public-encrypt": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
@@ -9221,6 +9500,14 @@
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
       "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
     },
+    "pupa": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.0.1.tgz",
+      "integrity": "sha512-hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA==",
+      "requires": {
+        "escape-goat": "^2.0.0"
+      }
+    },
     "q": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
@@ -9288,6 +9575,17 @@
         "unpipe": "1.0.0"
       }
     },
+    "rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "requires": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      }
+    },
     "react": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react/-/react-16.13.1.tgz",
@@ -9342,11 +9640,6 @@
           "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
           "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
         },
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
-        },
         "braces": {
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -9402,6 +9695,28 @@
             }
           }
         },
+        "cli-width": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
+          "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "detect-port-alt": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz",
+          "integrity": "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==",
+          "requires": {
+            "address": "^1.0.1",
+            "debug": "^2.6.0"
+          }
+        },
         "dir-glob": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
@@ -9516,6 +9831,36 @@
             "slash": "^1.0.0"
           }
         },
+        "inquirer": {
+          "version": "7.0.4",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.4.tgz",
+          "integrity": "sha512-Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ==",
+          "requires": {
+            "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.2.0",
+            "rxjs": "^6.5.3",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^5.1.0",
+            "through": "^2.3.6"
+          },
+          "dependencies": {
+            "strip-ansi": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+              "requires": {
+                "ansi-regex": "^4.1.0"
+              }
+            }
+          }
+        },
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -9580,6 +9925,11 @@
             "to-regex": "^3.0.2"
           }
         },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        },
         "p-locate": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
@@ -9612,6 +9962,13 @@
           "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
           "requires": {
             "ansi-regex": "^5.0.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "5.0.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+              "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+            }
           }
         },
         "to-regex-range": {
@@ -9781,14 +10138,6 @@
         "minimatch": "3.0.4"
       }
     },
-    "reduce": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/reduce/-/reduce-1.0.2.tgz",
-      "integrity": "sha512-xX7Fxke/oHO5IfZSk77lvPa/7bjMh9BuCk4OOoX5XTXrM7s0Z+MkPfSDfz0q7r91BhhGSs8gii/VEN/7zhCPpQ==",
-      "requires": {
-        "object-keys": "^1.1.0"
-      }
-    },
     "regenerate": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz",
@@ -9803,9 +10152,9 @@
       }
     },
     "regenerator-runtime": {
-      "version": "0.13.5",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
-      "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="
+      "version": "0.13.7",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
     },
     "regenerator-transform": {
       "version": "0.14.5",
@@ -9865,6 +10214,22 @@
         "unicode-match-property-value-ecmascript": "^1.2.0"
       }
     },
+    "registry-auth-token": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.0.tgz",
+      "integrity": "sha512-P+lWzPrsgfN+UEpDS3U8AQKg/UjZX6mQSJueZj3EK+vNESoqBSpBUD3gmu4sF9lOsjXWjF11dQKUqemf3veq1w==",
+      "requires": {
+        "rc": "^1.2.8"
+      }
+    },
+    "registry-url": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
+      "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
+      "requires": {
+        "rc": "^1.2.8"
+      }
+    },
     "regjsgen": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
@@ -9893,6 +10258,25 @@
         "hast-util-from-parse5": "^5.0.0",
         "parse5": "^5.0.0",
         "xtend": "^4.0.0"
+      },
+      "dependencies": {
+        "hast-util-from-parse5": {
+          "version": "5.0.3",
+          "resolved": "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-5.0.3.tgz",
+          "integrity": "sha512-gOc8UB99F6eWVWFtM9jUikjN7QkWxB3nY0df5Z0Zq1/Nkwl5V4hAAsl0tmwlgWl/1shlTF8DnNYLO8X6wRV9pA==",
+          "requires": {
+            "ccount": "^1.0.3",
+            "hastscript": "^5.0.0",
+            "property-information": "^5.0.0",
+            "web-namespaces": "^1.1.2",
+            "xtend": "^4.0.1"
+          }
+        },
+        "parse5": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
+          "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="
+        }
       }
     },
     "relateurl": {
@@ -9945,64 +10329,51 @@
       "integrity": "sha512-X9Ncj4cj3/CIvLI2Z9IobHtVi8FVdUrdJkCNaL9kdX8ohfsi18DXHsCVd/A7ssARBdccdDb5ODnt62WuEWaM/g=="
     },
     "remark-mdx": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.6.tgz",
-      "integrity": "sha512-BkR7SjP+3OvrCsWGlYy1tWEsZ8aQ86x+i7XWbW79g73Ws/cCaeVsEn0ZxAzzoTRH+PJWVU7Mbe64GdejEyKr2g==",
-      "requires": {
-        "@babel/core": "7.9.6",
-        "@babel/helper-plugin-utils": "7.8.3",
-        "@babel/plugin-proposal-object-rest-spread": "7.9.6",
-        "@babel/plugin-syntax-jsx": "7.8.3",
-        "@mdx-js/util": "^1.6.6",
+      "version": "1.6.16",
+      "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.16.tgz",
+      "integrity": "sha512-xqZhBQ4TonFiSFpVt6SnTLRnxstu7M6pcaOibKZhqzk4zMRVacVenD7iECjfESK+72LkPm/NW+0r5ahJAg7zlQ==",
+      "requires": {
+        "@babel/core": "7.10.5",
+        "@babel/helper-plugin-utils": "7.10.4",
+        "@babel/plugin-proposal-object-rest-spread": "7.10.4",
+        "@babel/plugin-syntax-jsx": "7.10.4",
+        "@mdx-js/util": "1.6.16",
         "is-alphabetical": "1.0.4",
-        "remark-parse": "8.0.2",
-        "unified": "9.0.0"
+        "remark-parse": "8.0.3",
+        "unified": "9.1.0"
       },
       "dependencies": {
         "@babel/core": {
-          "version": "7.9.6",
-          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz",
-          "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==",
-          "requires": {
-            "@babel/code-frame": "^7.8.3",
-            "@babel/generator": "^7.9.6",
-            "@babel/helper-module-transforms": "^7.9.0",
-            "@babel/helpers": "^7.9.6",
-            "@babel/parser": "^7.9.6",
-            "@babel/template": "^7.8.6",
-            "@babel/traverse": "^7.9.6",
-            "@babel/types": "^7.9.6",
+          "version": "7.10.5",
+          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.5.tgz",
+          "integrity": "sha512-O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w==",
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/generator": "^7.10.5",
+            "@babel/helper-module-transforms": "^7.10.5",
+            "@babel/helpers": "^7.10.4",
+            "@babel/parser": "^7.10.5",
+            "@babel/template": "^7.10.4",
+            "@babel/traverse": "^7.10.5",
+            "@babel/types": "^7.10.5",
             "convert-source-map": "^1.7.0",
             "debug": "^4.1.0",
             "gensync": "^1.0.0-beta.1",
             "json5": "^2.1.2",
-            "lodash": "^4.17.13",
+            "lodash": "^4.17.19",
             "resolve": "^1.3.2",
             "semver": "^5.4.1",
             "source-map": "^0.5.0"
           }
         },
-        "@babel/helper-plugin-utils": {
-          "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=="
-        },
         "@babel/plugin-proposal-object-rest-spread": {
-          "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==",
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz",
+          "integrity": "sha512-6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA==",
           "requires": {
-            "@babel/helper-plugin-utils": "^7.8.3",
+            "@babel/helper-plugin-utils": "^7.10.4",
             "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-            "@babel/plugin-transform-parameters": "^7.9.5"
-          }
-        },
-        "@babel/plugin-syntax-jsx": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.8.3.tgz",
-          "integrity": "sha512-WxdW9xyLgBdefoo0Ynn3MRSkhe5tFVxxKNVdnZSh318WrG2e2jH+E9wd/++JsqcLJZPfz87njQJ8j2Upjm0M0A==",
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.8.3"
+            "@babel/plugin-transform-parameters": "^7.10.4"
           }
         },
         "semver": {
@@ -10013,9 +10384,9 @@
       }
     },
     "remark-parse": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.2.tgz",
-      "integrity": "sha512-eMI6kMRjsAGpMXXBAywJwiwAse+KNpmt+BK55Oofy4KvBZEqUDj6mWbGLJZrujoPIPPxDXzn3T9baRlpsm2jnQ==",
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz",
+      "integrity": "sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==",
       "requires": {
         "ccount": "^1.0.0",
         "collapse-white-space": "^1.0.2",
@@ -10058,6 +10429,21 @@
         "htmlparser2": "^3.3.0",
         "strip-ansi": "^3.0.0",
         "utila": "^0.4.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        }
       }
     },
     "repeat-element": {
@@ -10075,40 +10461,6 @@
       "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
       "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs="
     },
-    "request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "dependencies": {
-        "qs": {
-          "version": "6.5.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
-        }
-      }
-    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -10167,6 +10519,14 @@
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
     },
+    "responselike": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
+      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
+      "requires": {
+        "lowercase-keys": "^1.0.0"
+      }
+    },
     "restore-cursor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
@@ -10242,9 +10602,9 @@
       "integrity": "sha1-pfE/957zt0D+MKqAP7CfmIBdR4I="
     },
     "rxjs": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.0.tgz",
-      "integrity": "sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==",
+      "version": "6.6.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz",
+      "integrity": "sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==",
       "requires": {
         "tslib": "^1.9.0"
       }
@@ -10324,6 +10684,14 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
       "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
     },
+    "semver-diff": {
+      "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==",
+      "requires": {
+        "semver": "^6.3.0"
+      }
+    },
     "send": {
       "version": "0.17.1",
       "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
@@ -10371,6 +10739,56 @@
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz",
       "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ=="
     },
+    "serve-handler": {
+      "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.3.tgz",
+      "integrity": "sha512-FosMqFBNrLyeiIDvP1zgO6YoTzFYHxLDEIavhlmQ+knB2Z7l1t+kGLHkZIDN7UVWqQAmKI3D20A6F6jo3nDd4w==",
+      "requires": {
+        "bytes": "3.0.0",
+        "content-disposition": "0.5.2",
+        "fast-url-parser": "1.1.3",
+        "mime-types": "2.1.18",
+        "minimatch": "3.0.4",
+        "path-is-inside": "1.0.2",
+        "path-to-regexp": "2.2.1",
+        "range-parser": "1.2.0"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+          "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
+        },
+        "content-disposition": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+          "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
+        },
+        "mime-db": {
+          "version": "1.33.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
+          "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="
+        },
+        "mime-types": {
+          "version": "2.1.18",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
+          "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
+          "requires": {
+            "mime-db": "~1.33.0"
+          }
+        },
+        "path-to-regexp": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.2.1.tgz",
+          "integrity": "sha512-gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ=="
+        },
+        "range-parser": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
+          "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4="
+        }
+      }
+    },
     "serve-index": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
@@ -10813,22 +11231,6 @@
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
-    "sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "requires": {
-        "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": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
@@ -10842,11 +11244,6 @@
       "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
       "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="
     },
-    "stack-utils": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz",
-      "integrity": "sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA=="
-    },
     "state-toggle": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz",
@@ -10987,6 +11384,16 @@
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
           "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
         },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+        },
+        "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=="
+        },
         "strip-ansi": {
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
@@ -11048,11 +11455,11 @@
       }
     },
     "strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "requires": {
-        "ansi-regex": "^2.0.0"
+        "ansi-regex": "^4.1.0"
       }
     },
     "strip-bom-string": {
@@ -11070,6 +11477,11 @@
       "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
     },
+    "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="
+    },
     "style-to-object": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz",
@@ -11175,6 +11587,11 @@
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
       "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="
     },
+    "term-size": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz",
+      "integrity": "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw=="
+    },
     "terser": {
       "version": "4.8.0",
       "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
@@ -11198,16 +11615,16 @@
       }
     },
     "terser-webpack-plugin": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.7.tgz",
-      "integrity": "sha512-xzYyaHUNhzgaAdBsXxk2Yvo/x1NJdslUaussK3fdpBbvttm1iIwU+c26dj9UxJcwk2c5UWt5F55MUTIA8BE7Dg==",
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz",
+      "integrity": "sha512-/fKw3R+hWyHfYx7Bv6oPqmk4HGQcrWLtV3X6ggvPuwPNHSnzvVV51z6OaaCOus4YLjutYGOz3pEpbhe6Up2s1w==",
       "requires": {
         "cacache": "^13.0.1",
         "find-cache-dir": "^3.3.1",
         "jest-worker": "^25.4.0",
         "p-limit": "^2.3.0",
         "schema-utils": "^2.6.6",
-        "serialize-javascript": "^3.1.0",
+        "serialize-javascript": "^4.0.0",
         "source-map": "^0.6.1",
         "terser": "^4.6.12",
         "webpack-sources": "^1.4.3"
@@ -11295,9 +11712,9 @@
           }
         },
         "serialize-javascript": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
-          "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+          "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
           "requires": {
             "randombytes": "^2.1.0"
           }
@@ -11408,11 +11825,6 @@
       "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
       "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M="
     },
-    "to-factory": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/to-factory/-/to-factory-1.0.0.tgz",
-      "integrity": "sha1-hzivi9lxIK0dQEeXKtpVY7+UebE="
-    },
     "to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
@@ -11436,6 +11848,11 @@
         }
       }
     },
+    "to-readable-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
+      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="
+    },
     "to-regex": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
@@ -11479,22 +11896,6 @@
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
       "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
     },
-    "tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "requires": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-        }
-      }
-    },
     "tr46": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
@@ -11550,23 +11951,10 @@
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
       "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY="
     },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
-    },
     "type-fest": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ=="
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
     },
     "type-is": {
       "version": "1.6.18",
@@ -11582,6 +11970,14 @@
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
     },
+    "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==",
+      "requires": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
     "unherit": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz",
@@ -11616,9 +12012,9 @@
       "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg=="
     },
     "unified": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/unified/-/unified-9.0.0.tgz",
-      "integrity": "sha512-ssFo33gljU3PdlWLjNp15Inqb77d6JnJSfyplGJPT/a+fNRNyCBeveBAYJdO5khKdF6WVHa/yYCC7Xl6BDwZUQ==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/unified/-/unified-9.1.0.tgz",
+      "integrity": "sha512-VXOv7Ic6twsKGJDeZQ2wwPqXs2hM0KNu5Hkg9WgAZbSD1pxhZ7p8swqg583nw1Je2fhwHy6U8aEjiI79x1gvag==",
       "requires": {
         "bail": "^1.0.0",
         "extend": "^3.0.0",
@@ -11677,6 +12073,14 @@
         "imurmurhash": "^0.1.4"
       }
     },
+    "unique-string": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
+      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
+      "requires": {
+        "crypto-random-string": "^2.0.0"
+      }
+    },
     "unist-builder": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-2.0.3.tgz",
@@ -11688,9 +12092,9 @@
       "integrity": "sha512-1TC+NxQa4N9pNdayCYA1EGUOCAO0Le3fVp7Jzns6lnua/mYgwHo0tz5WUAfrdpNch1RZLHc61VZ1SDgrtNXLSw=="
     },
     "unist-util-is": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-3.0.0.tgz",
-      "integrity": "sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A=="
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.2.tgz",
+      "integrity": "sha512-Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ=="
     },
     "unist-util-position": {
       "version": "3.1.0",
@@ -11703,13 +12107,6 @@
       "integrity": "sha512-HwwWyNHKkeg/eXRnE11IpzY8JT55JNM1YCwwU9YNCnfzk6s8GhPXrVBBZWiwLeATJbI7euvoGSzcy9M29UeW3g==",
       "requires": {
         "unist-util-is": "^4.0.0"
-      },
-      "dependencies": {
-        "unist-util-is": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.2.tgz",
-          "integrity": "sha512-Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ=="
-        }
       }
     },
     "unist-util-remove-position": {
@@ -11736,13 +12133,6 @@
         "@types/unist": "^2.0.0",
         "unist-util-is": "^4.0.0",
         "unist-util-visit-parents": "^3.0.0"
-      },
-      "dependencies": {
-        "unist-util-is": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.2.tgz",
-          "integrity": "sha512-Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ=="
-        }
       }
     },
     "unist-util-visit-parents": {
@@ -11752,13 +12142,6 @@
       "requires": {
         "@types/unist": "^2.0.0",
         "unist-util-is": "^4.0.0"
-      },
-      "dependencies": {
-        "unist-util-is": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.2.tgz",
-          "integrity": "sha512-Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ=="
-        }
       }
     },
     "universalify": {
@@ -11817,6 +12200,26 @@
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
       "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="
     },
+    "update-notifier": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.0.tgz",
+      "integrity": "sha512-w3doE1qtI0/ZmgeoDoARmI5fjDoT93IfKgEGqm26dGUOh8oNpaSTsGNdYRN/SjOuo10jcJGwkEL3mroKzktkew==",
+      "requires": {
+        "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.3.1",
+        "is-npm": "^4.0.0",
+        "is-yarn-global": "^0.3.0",
+        "latest-version": "^5.0.0",
+        "pupa": "^2.0.1",
+        "semver-diff": "^3.1.1",
+        "xdg-basedir": "^4.0.0"
+      }
+    },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
@@ -11846,6 +12249,16 @@
         "querystring": "0.2.0"
       }
     },
+    "url-loader": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.0.tgz",
+      "integrity": "sha512-IzgAAIC8wRrg6NYkFIJY09vtktQcsvU8V6HhtQj9PTefbYImzLB1hufqo4m+RyM5N3mLx5BqJKccgxJS+W3kqw==",
+      "requires": {
+        "loader-utils": "^2.0.0",
+        "mime-types": "^2.1.26",
+        "schema-utils": "^2.6.5"
+      }
+    },
     "url-parse": {
       "version": "1.4.7",
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
@@ -11855,6 +12268,21 @@
         "requires-port": "^1.0.0"
       }
     },
+    "url-parse-lax": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
+      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
+      "requires": {
+        "prepend-http": "^2.0.0"
+      },
+      "dependencies": {
+        "prepend-http": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+          "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="
+        }
+      }
+    },
     "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
@@ -11921,20 +12349,10 @@
       "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
       "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="
     },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
     "vfile": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.1.1.tgz",
-      "integrity": "sha512-lRjkpyDGjVlBA7cDQhQ+gNcvB1BGaTHYuSOcY3S7OhDmBtnzX95FhtZZDecSTDm6aajFymyve6S5DN4ZHGezdQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.0.tgz",
+      "integrity": "sha512-a/alcwCvtuc8OX92rqqo7PflxiCgXRFjdyoGVuYV+qbgCb0GgZJRvIgCD4+U/Kl1yhaRsaTwksF88xbPyGsgpw==",
       "requires": {
         "@types/unist": "^2.0.0",
         "is-buffer": "^2.0.0",
@@ -11977,14 +12395,45 @@
         "@hapi/joi": "^15.1.0",
         "fs-extra": "^8.1.0",
         "rx": "^4.1.0"
+      },
+      "dependencies": {
+        "@hapi/address": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz",
+          "integrity": "sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ=="
+        },
+        "@hapi/hoek": {
+          "version": "8.5.1",
+          "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz",
+          "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow=="
+        },
+        "@hapi/joi": {
+          "version": "15.1.1",
+          "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz",
+          "integrity": "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==",
+          "requires": {
+            "@hapi/address": "2.x.x",
+            "@hapi/bourne": "1.x.x",
+            "@hapi/hoek": "8.x.x",
+            "@hapi/topo": "3.x.x"
+          }
+        },
+        "@hapi/topo": {
+          "version": "3.1.6",
+          "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz",
+          "integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==",
+          "requires": {
+            "@hapi/hoek": "^8.3.0"
+          }
+        }
       }
     },
     "watchpack": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz",
-      "integrity": "sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz",
+      "integrity": "sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==",
       "requires": {
-        "chokidar": "^3.4.0",
+        "chokidar": "^3.4.1",
         "graceful-fs": "^4.1.2",
         "neo-async": "^2.5.0",
         "watchpack-chokidar2": "^2.0.0"
@@ -12262,9 +12711,9 @@
       "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
     },
     "webpack": {
-      "version": "4.43.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz",
-      "integrity": "sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==",
+      "version": "4.44.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.1.tgz",
+      "integrity": "sha512-4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ==",
       "requires": {
         "@webassemblyjs/ast": "1.9.0",
         "@webassemblyjs/helper-module-context": "1.9.0",
@@ -12274,7 +12723,7 @@
         "ajv": "^6.10.2",
         "ajv-keywords": "^3.4.1",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^4.1.0",
+        "enhanced-resolve": "^4.3.0",
         "eslint-scope": "^4.0.3",
         "json-parse-better-errors": "^1.0.2",
         "loader-runner": "^2.4.0",
@@ -12287,7 +12736,7 @@
         "schema-utils": "^1.0.0",
         "tapable": "^1.1.3",
         "terser-webpack-plugin": "^1.4.3",
-        "watchpack": "^1.6.1",
+        "watchpack": "^1.7.4",
         "webpack-sources": "^1.4.1"
       },
       "dependencies": {
@@ -12430,9 +12879,9 @@
           }
         },
         "serialize-javascript": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
-          "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+          "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
           "requires": {
             "randombytes": "^2.1.0"
           }
@@ -12443,15 +12892,15 @@
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         },
         "terser-webpack-plugin": {
-          "version": "1.4.4",
-          "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.4.tgz",
-          "integrity": "sha512-U4mACBHIegmfoEe5fdongHESNJWqsGU+W0S/9+BmYGVQDw1+c2Ow05TpMhxjPK1sRb7cuYq1BPl1e5YHJMTCqA==",
+          "version": "1.4.5",
+          "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
+          "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
           "requires": {
             "cacache": "^12.0.2",
             "find-cache-dir": "^2.1.0",
             "is-wsl": "^1.1.0",
             "schema-utils": "^1.0.0",
-            "serialize-javascript": "^3.1.0",
+            "serialize-javascript": "^4.0.0",
             "source-map": "^0.6.1",
             "terser": "^4.1.2",
             "webpack-sources": "^1.4.0",
@@ -12490,9 +12939,9 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "7.3.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz",
-          "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA=="
+          "version": "7.4.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz",
+          "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w=="
         },
         "chalk": {
           "version": "2.4.2",
@@ -12575,6 +13024,11 @@
         "yargs": "^13.3.2"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+        },
         "anymatch": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
@@ -12841,6 +13295,14 @@
             "safe-buffer": "~5.1.0"
           }
         },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
         "supports-color": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
@@ -13003,6 +13465,14 @@
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
       "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
     },
+    "widest-line": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
+      "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
+      "requires": {
+        "string-width": "^4.0.0"
+      }
+    },
     "worker-farm": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
@@ -13029,21 +13499,6 @@
         "strip-ansi": "^5.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=="
-        },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-        },
-        "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="
-        },
         "string-width": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -13053,14 +13508,6 @@
             "is-fullwidth-code-point": "^2.0.0",
             "strip-ansi": "^5.1.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==",
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
         }
       }
     },
@@ -13069,6 +13516,17 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
+    "write-file-atomic": {
+      "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==",
+      "requires": {
+        "imurmurhash": "^0.1.4",
+        "is-typedarray": "^1.0.0",
+        "signal-exit": "^3.0.2",
+        "typedarray-to-buffer": "^3.1.5"
+      }
+    },
     "ws": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
@@ -13077,6 +13535,11 @@
         "async-limiter": "~1.0.0"
       }
     },
+    "xdg-basedir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
+      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="
+    },
     "xml-js": {
       "version": "1.6.11",
       "resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz",
@@ -13127,21 +13590,6 @@
         "yargs-parser": "^13.1.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=="
-        },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-        },
-        "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="
-        },
         "string-width": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -13151,14 +13599,6 @@
             "is-fullwidth-code-point": "^2.0.0",
             "strip-ansi": "^5.1.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==",
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
         }
       }
     },
@@ -13178,11 +13618,6 @@
         }
       }
     },
-    "zepto": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/zepto/-/zepto-1.2.0.tgz",
-      "integrity": "sha1-4Se9nmb9hGvl6rSME5SIL3wOT5g="
-    },
     "zwitch": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",
diff --git a/website/package.json b/website/package.json
index d024da876c..c2ae0c4742 100644
--- a/website/package.json
+++ b/website/package.json
@@ -5,13 +5,18 @@
   "scripts": {
     "start": "docusaurus start",
     "start-no-watch": "docusaurus start --no-open --poll",
-    "build": "docusaurus build",
+    "build": "npm run versions && docusaurus build",
     "swizzle": "docusaurus swizzle",
-    "deploy": "./deploy.sh"
+    "deploy": "./deploy.sh",
+    "version": "docusaurus docs:version",
+    "versions": "./build-versions.sh",
+    "add-version": "./add-version.sh",
+    "docusaurus": "docusaurus",
+    "serve": "docusaurus serve"
   },
   "dependencies": {
-    "@docusaurus/core": "^2.0.0-alpha.58",
-    "@docusaurus/preset-classic": "^2.0.0-alpha.58",
+    "@docusaurus/core": "^2.0.0-alpha.59",
+    "@docusaurus/preset-classic": "^2.0.0-alpha.59",
     "clsx": "^1.1.1",
     "react": "^16.8.4",
     "react-dom": "^16.8.4"
diff --git a/website/sidebars.js b/website/sidebars.js
index 03b790c3e4..5d164a979b 100644
--- a/website/sidebars.js
+++ b/website/sidebars.js
@@ -39,6 +39,12 @@ module.exports = {
           'developer/backend',
         ]
       },
+      {
+        Deploy: [
+          'developer/deploy',
+          'developer/developers-guide-helm'
+        ]
+      },
       'developer/developers-guide-e2e-tests',
       'developer/developers-guide-env-tech',
     ],
diff --git a/website/src/css/custom.css b/website/src/css/custom.css
index 1b5e6f88cd..314ad649bf 100644
--- a/website/src/css/custom.css
+++ b/website/src/css/custom.css
@@ -72,6 +72,12 @@ img.cf-logo {
   padding-top: 20px;
 }
 
+/* Fix for dark mode, given the backgrounds are hardcoded below */
+.hero__title,
+.hero__subtitle {
+  color: #fff;
+}
+
 .hero__subtitle {
   font-size: 36px;
 }
@@ -94,7 +100,8 @@ img.cf-logo {
   font-size: 18px;
 }
 
-.menu__list, .menu__link {
+.menu__list,
+.menu__link {
   font-size: 14px;
 }
 
@@ -125,7 +132,7 @@ img.cf-logo {
   .hero__subtitle {
     font-size: 35px;
   }
-  
+
   section .screenshot {
     margin: 0 0;
   }
@@ -166,9 +173,9 @@ img.cf-logo {
 
 .screenshot img {
   width: 600px;
-  -webkit-box-shadow: 0px 0px 37px 15px rgba(20,20,20,0.75);
-  -moz-box-shadow: 0px 0px 37px 15px rgba(20,20,20,0.75);
-  box-shadow: 0px 0px 37px 15px rgba(20,20,20,0.75);  
+  -webkit-box-shadow: 0px 0px 37px 15px rgba(20, 20, 20, 0.75);
+  -moz-box-shadow: 0px 0px 37px 15px rgba(20, 20, 20, 0.75);
+  box-shadow: 0px 0px 37px 15px rgba(20, 20, 20, 0.75);
 }
 
 .screenshot img.right {
@@ -189,3 +196,14 @@ img.cf-logo {
     margin: 0;
   }
 }
+
+
+/* Hide versions drop down and versions link on home page */
+.stratosIsNotDocsPage .navbar__item.dropdown--right {
+  display: none;
+}
+
+/* Hide the `Versions: x` pill that appears above a doc page's title */
+article > div > .badge.badge--secondary {
+  display: none;
+}
diff --git a/website/src/pages/index.js b/website/src/pages/index.js
index fc5979e229..941fe6a213 100644
--- a/website/src/pages/index.js
+++ b/website/src/pages/index.js
@@ -73,7 +73,7 @@ const features = [
 
 ];
 
-function Feature({imageUrl, title, description, cls}) {
+function Feature({ imageUrl, title, description, cls }) {
   const imgUrl = useBaseUrl(imageUrl);
   return (
     <div className={clsx('col col--4', styles.feature)}>
@@ -90,15 +90,15 @@ function Feature({imageUrl, title, description, cls}) {
 
 function Home() {
   const context = useDocusaurusContext();
-  const {siteConfig = {}} = context;
+  const { siteConfig = {} } = context;
   return (
     <Layout
       title={`Home`}
       description="Stratos - Web-based Management Interface for Cloud Foundry and Kubernetes">
       <header className={clsx('hero hero--primary', styles.heroBanner)}>
         <div className="container home-intro">
-        <h1 className="hero__title">{siteConfig.title}</h1>
-        <h2 className="hero__subtitle">Open-Source Multi-Cluster UI for <br/> Cloud Foundry and Kubernetes</h2>
+          <h1 className="hero__title">{siteConfig.title}</h1>
+          <h2 className="hero__subtitle">Open-Source Multi-Cluster UI for <br /> Cloud Foundry and Kubernetes</h2>
           <div className={clsx(styles.buttons, 'get-started')}>
             <Link
               className={clsx(
@@ -110,7 +110,7 @@ function Home() {
             </Link>
           </div>
         </div>
-        <img class="home-logo" src="img/logo.png" />
+        <img className="home-logo" src="img/logo.png" />
       </header>
       <main>
         {features && features.length > 0 && (
@@ -126,8 +126,8 @@ function Home() {
         )}
         <section className={clsx(styles.features, 'screenshot-section', 'blue')}>
           <div className="container">
-            <div class="screenshot">
-              <img class="left" src="img/screens/cf-app.png" />
+            <div className="screenshot">
+              <img className="left" src="img/screens/cf-app.png" />
               <div>
                 <h2>Cloud Foundry</h2>
                 <p>Deploy and manage applications in Cloud Foundry. Stream application logs, scale applications and ssh to application instances</p>
@@ -139,9 +139,9 @@ function Home() {
           </div>
         </section>
 
-        <section className={clsx(styles.features, 'screenshot-section', 'white')}>
+        <section className={clsx(styles.features)}>
           <div className="container">
-            <div class="screenshot">
+            <div className="screenshot">
               <div>
                 <h2>Kubernetes</h2>
                 <p>View cluster-level metadata</p>
@@ -149,15 +149,15 @@ function Home() {
                 <p>View Helm Releases and see relationships between Kubernetes Resources</p>
                 <p>and lots more ...</p>
               </div>
-              <img class="right" src="img/screens/kube-graph.png" />
+              <img className="right" src="img/screens/kube-graph.png" />
             </div>
           </div>
         </section>
 
         <section className={clsx(styles.features, 'screenshot-section', 'blue')}>
           <div className="container">
-            <div class="screenshot">
-              <img class="left" src="img/screens/endpoints.png" />
+            <div className="screenshot">
+              <img className="left" src="img/screens/endpoints.png" />
               <div>
                 <h2>Multi-Cluster</h2>
                 <p>Add and Connect multiple Cloud Foundry and/or Kubernetes clusters.</p>
diff --git a/website/src/pages/versions.js b/website/src/pages/versions.js
new file mode 100644
index 0000000000..d8fe416fcb
--- /dev/null
+++ b/website/src/pages/versions.js
@@ -0,0 +1,95 @@
+import Link from '@docusaurus/Link';
+import useBaseUrl from '@docusaurus/useBaseUrl';
+import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
+import Layout from '@theme/Layout';
+import React from 'react';
+
+import versionsWithHash from '../../internal-versions.json';
+import versions from '../../versions.json';
+
+function Version() {
+  const context = useDocusaurusContext();
+  const { siteConfig = {} } = context;
+  const latestVersion = versions[0];
+  const pastVersions = versionsWithHash
+    .map(versionWithHash => versionWithHash.split(':'))
+    .filter((versionWithHash) => versionWithHash[0] !== latestVersion);
+
+
+  const repoUrl = `https://github.com/${siteConfig.organizationName}/${siteConfig.projectName}`;
+  return (
+    <Layout
+      title="Versions"
+      permalink="/versions">
+      <main className="container margin-vert--lg">
+        <h1>All Versions</h1>
+        <div className="margin-bottom--lg">
+          <h3 id="latest">Latest version (Stable)</h3>
+          <p>Here you can find the latest documentation.</p>
+          <table>
+            <tbody>
+              <tr>
+                <th>{latestVersion}</th>
+                <td>
+                  <Link to={useBaseUrl('/docs')}>Documentation</Link>
+                </td>
+                <td>
+                  <a href={`${repoUrl}/releases/tag/${latestVersion}`}>
+                    Release Notes
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+        <div className="margin-bottom--lg">
+          <h3 id="next">Next version (Unreleased)</h3>
+          <p>Here you can find the documentation for unreleased version.</p>
+          <table>
+            <tbody>
+              <tr>
+                <th>master</th>
+                <td>
+                  <Link to={useBaseUrl('/docs/next')}>Documentation</Link>
+                </td>
+                <td>
+                  <a href={repoUrl}>Source Code</a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+        {pastVersions.length > 0 && (
+          <div className="margin-bottom--lg">
+            <h3 id="archive">Past Versions</h3>
+            <p>
+              Here you can find documentation for previous versions of
+              Docusaurus.
+            </p>
+            <table>
+              <tbody>
+                {pastVersions.map((version) => (
+                  <tr key={version[0]}>
+                    <th>{version[0]}</th>
+                    <td>
+                      <Link to={useBaseUrl(`/docs/${version[0]}`)}>
+                        Documentation
+                        </Link>
+                    </td>
+                    <td>
+                      <a href={`${repoUrl}/releases/tag/${version[0]}`}>
+                        Release Notes
+                      </a>
+                    </td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          </div>
+        )}
+      </main>
+    </Layout>
+  );
+}
+
+export default Version;
\ No newline at end of file
diff --git a/website/src/theme/DocVersionSuggestions/index.js b/website/src/theme/DocVersionSuggestions/index.js
new file mode 100644
index 0000000000..3612410fc2
--- /dev/null
+++ b/website/src/theme/DocVersionSuggestions/index.js
@@ -0,0 +1,64 @@
+import Link from '@docusaurus/Link';
+import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
+import { useActivePlugin, useActiveVersion, useDocVersionSuggestions } from '@theme/hooks/useDocs';
+import React from 'react';
+
+import styles from './styles.module.css';
+
+const useMandatoryActiveDocsPluginId = () => {
+  const activePlugin = useActivePlugin();
+
+  if (!activePlugin) {
+    throw new Error(
+      'DocVersionCallout is only supposed to be used on docs-related routes',
+    );
+  }
+
+  return activePlugin.pluginId;
+};
+
+const getVersionMainDoc = (version) =>
+  version.docs.find((doc) => doc.id === version.mainDocId);
+
+function DocVersionSuggestions() {
+  const {
+    siteConfig: { title: siteTitle },
+  } = useDocusaurusContext();
+  const pluginId = useMandatoryActiveDocsPluginId();
+  const activeVersion = useActiveVersion(pluginId);
+  const {
+    latestDocSuggestion,
+    latestVersionSuggestion,
+  } = useDocVersionSuggestions(pluginId); // No suggestion to be made
+
+  if (!latestVersionSuggestion) {
+    return <></>;
+  }
+
+  const activeVersionName = activeVersion.name; // try to link to same doc in latest version (not always possible)
+  // fallback to main doc of latest version
+
+  const suggestedDoc =
+    latestDocSuggestion ?? getVersionMainDoc(latestVersionSuggestion);
+  return (
+    <div className="alert alert--secondary margin-bottom--md" role="alert" >
+      {activeVersionName === 'next' ? (
+        <div className={styles.container}>
+          This is the development documentation. For the latest released documentation see{' '}
+          <strong>
+            <Link to={suggestedDoc.path}> {latestVersionSuggestion.name}</Link>
+          </strong>.
+        </div>
+      ) : (
+          <div className={styles.container}>
+            This is documentation for <strong>{activeVersionName}</strong>. For the latest released documentation see {' '}
+            <strong>
+              <Link to={suggestedDoc.path}>{latestVersionSuggestion.name}</Link>
+            </strong>.
+          </div>
+        )}
+    </div>
+  );
+}
+
+export default DocVersionSuggestions;
diff --git a/website/src/theme/DocVersionSuggestions/styles.module.css b/website/src/theme/DocVersionSuggestions/styles.module.css
new file mode 100644
index 0000000000..5739a2b5e0
--- /dev/null
+++ b/website/src/theme/DocVersionSuggestions/styles.module.css
@@ -0,0 +1,3 @@
+:local(.container) {
+  font-size: 14px;
+}
diff --git a/website/src/theme/Navbar/index.js b/website/src/theme/Navbar/index.js
new file mode 100644
index 0000000000..fe4a85c0f5
--- /dev/null
+++ b/website/src/theme/Navbar/index.js
@@ -0,0 +1,209 @@
+import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment';
+import Link from '@docusaurus/Link';
+import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
+import useHideableNavbar from '@theme/hooks/useHideableNavbar';
+import useLockBodyScroll from '@theme/hooks/useLockBodyScroll';
+import useLogo from '@theme/hooks/useLogo';
+import useThemeContext from '@theme/hooks/useThemeContext';
+import useWindowSize, { windowSizes } from '@theme/hooks/useWindowSize';
+import NavbarItem from '@theme/NavbarItem';
+import SearchBar from '@theme/SearchBar';
+import Toggle from '@theme/Toggle';
+import clsx from 'clsx';
+import React, { useCallback, useEffect, useState } from 'react';
+
+import styles from './styles.module.css';
+
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+const DefaultNavItemPosition = 'right'; // If split links by left/right
+// if position is unspecified, fallback to right (as v1)
+
+
+let stratosIsNotDocsPage = false;
+function stratosUpdateIsNotDocsPage() {
+  const path = ExecutionEnvironment.canUseDOM ? window.location.pathname : null;
+  if (path) {
+    stratosIsNotDocsPage = !path.toLocaleLowerCase().startsWith('/docs');
+  }
+}
+
+
+function splitNavItemsByPosition(items) {
+  const leftItems = items.filter(
+    (item) => (item.position ?? DefaultNavItemPosition) === 'left',
+  );
+  const rightItems = items.filter(
+    (item) => (item.position ?? DefaultNavItemPosition) === 'right',
+  );
+  return {
+    leftItems,
+    rightItems,
+  };
+}
+
+function Navbar() {
+  const {
+    siteConfig: {
+      themeConfig: {
+        navbar: { title = '', items = [], hideOnScroll = false } = {},
+        colorMode: { disableSwitch: disableColorModeSwitch = false } = {},
+      },
+    },
+    isClient,
+  } = useDocusaurusContext();
+  const [sidebarShown, setSidebarShown] = useState(false);
+  const [isSearchBarExpanded, setIsSearchBarExpanded] = useState(false);
+  const { isDarkTheme, setLightTheme, setDarkTheme } = useThemeContext();
+  const { navbarRef, isNavbarVisible } = useHideableNavbar(hideOnScroll);
+  const { logoLink, logoLinkProps, logoImageUrl, logoAlt } = useLogo();
+  useLockBodyScroll(sidebarShown);
+  const showSidebar = useCallback(() => {
+    setSidebarShown(true);
+  }, [setSidebarShown]);
+  const hideSidebar = useCallback(() => {
+    setSidebarShown(false);
+  }, [setSidebarShown]);
+  const onToggleChange = useCallback(
+    (e) => (e.target.checked ? setDarkTheme() : setLightTheme()),
+    [setLightTheme, setDarkTheme],
+  );
+  const windowSize = useWindowSize();
+  useEffect(() => {
+    if (windowSize === windowSizes.desktop) {
+      setSidebarShown(false);
+    }
+  }, [windowSize]);
+
+  useEffect(() => {
+    stratosUpdateIsNotDocsPage();
+  }, []);
+
+  const { leftItems, rightItems } = splitNavItemsByPosition(items);
+  return (
+    <nav
+      ref={navbarRef}
+      className={clsx('navbar', 'navbar--light', 'navbar--fixed-top', {
+        'navbar-sidebar--show': sidebarShown,
+        [styles.navbarHideable]: hideOnScroll,
+        [styles.navbarHidden]: !isNavbarVisible,
+      })}>
+      <div className={`navbar__inner ${stratosIsNotDocsPage ? 'stratosIsNotDocsPage' : ''}`}>
+        <div className="navbar__items">
+          {items != null && items.length !== 0 && (
+            <div
+              aria-label="Navigation bar toggle"
+              className="navbar__toggle"
+              role="button"
+              tabIndex={0}
+              onClick={showSidebar}
+              onKeyDown={showSidebar}>
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                width="30"
+                height="30"
+                viewBox="0 0 30 30"
+                role="img"
+                focusable="false">
+                <title>Menu</title>
+                <path
+                  stroke="currentColor"
+                  strokeLinecap="round"
+                  strokeMiterlimit="10"
+                  strokeWidth="2"
+                  d="M4 7h22M4 15h22M4 23h22"
+                />
+              </svg>
+            </div>
+          )}
+          <Link className="navbar__brand" to={logoLink} {...logoLinkProps}>
+            {logoImageUrl != null && (
+              <img
+                key={isClient}
+                className="navbar__logo"
+                src={logoImageUrl}
+                alt={logoAlt}
+              />
+            )}
+            {title != null && (
+              <strong
+                className={clsx('navbar__title', {
+                  [styles.hideLogoText]: isSearchBarExpanded,
+                })}>
+                {title}
+              </strong>
+            )}
+          </Link>
+          {leftItems.map((item, i) => (
+            <NavbarItem {...item} key={i} />
+          ))}
+        </div>
+        <div className="navbar__items navbar__items--right">
+          {rightItems.map((item, i) => (
+            <NavbarItem {...item} key={i} />
+          ))}
+          {!disableColorModeSwitch && (
+            <Toggle
+              className={styles.displayOnlyInLargeViewport}
+              aria-label="Dark mode toggle"
+              checked={isDarkTheme}
+              onChange={onToggleChange}
+            />
+          )}
+          <SearchBar
+            handleSearchBarToggle={setIsSearchBarExpanded}
+            isSearchBarExpanded={isSearchBarExpanded}
+          />
+        </div>
+      </div>
+      <div
+        role="presentation"
+        className="navbar-sidebar__backdrop"
+        onClick={hideSidebar}
+      />
+      <div className="navbar-sidebar">
+        <div className="navbar-sidebar__brand">
+          <Link
+            className="navbar__brand"
+            onClick={hideSidebar}
+            to={logoLink}
+            {...logoLinkProps}>
+            {logoImageUrl != null && (
+              <img
+                key={isClient}
+                className="navbar__logo"
+                src={logoImageUrl}
+                alt={logoAlt}
+              />
+            )}
+            {title != null && (
+              <strong className="navbar__title">{title}</strong>
+            )}
+          </Link>
+          {!disableColorModeSwitch && sidebarShown && (
+            <Toggle
+              aria-label="Dark mode toggle in sidebar"
+              checked={isDarkTheme}
+              onChange={onToggleChange}
+            />
+          )}
+        </div>
+        <div className="navbar-sidebar__items">
+          <div className="menu">
+            <ul className="menu__list">
+              {items.map((item, i) => (
+                <NavbarItem mobile {...item} onClick={hideSidebar} key={i} />
+              ))}
+            </ul>
+          </div>
+        </div>
+      </div>
+    </nav>
+  );
+}
+
+export default Navbar;
diff --git a/website/src/theme/Navbar/styles.module.css b/website/src/theme/Navbar/styles.module.css
new file mode 100644
index 0000000000..fb524ac417
--- /dev/null
+++ b/website/src/theme/Navbar/styles.module.css
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+@media screen and (max-width: 997px) {
+  .displayOnlyInLargeViewport {
+    display: none !important;
+  }
+}
+
+@media (max-width: 768px) {
+  .hideLogoText {
+    display: none;
+  }
+}
+
+.navbarHideable {
+  transition: top 0.2s ease-in-out;
+}
+
+.navbarHidden {
+  top: calc(var(--ifm-navbar-height) * -1) !important;
+}
diff --git a/website/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.js b/website/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.js
new file mode 100644
index 0000000000..570d9cb773
--- /dev/null
+++ b/website/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.js
@@ -0,0 +1,81 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+import { useActiveDocContext, useLatestVersion, useVersions } from '@theme/hooks/useDocs';
+import React from 'react';
+
+import versionsWithHash from '../../../internal-versions.json';
+import DefaultNavbarItem from '../../../node_modules/@docusaurus/theme-classic/lib/theme/NavbarItem/DefaultNavbarItem';
+
+const versionLabel = (version, nextVersionLabel) =>
+  version.name === 'next' ? nextVersionLabel : version.name;
+
+const getVersionMainDoc = (version) =>
+  version.docs.find((doc) => doc.id === version.mainDocId);
+
+const createStratosVersions = (versions) => {
+  // Remove certain versions from version drop down
+  const newVersions = [];
+  const pastVersions = versionsWithHash.map(versionWithHash => versionWithHash.split(':'))
+  versions.forEach(version => {
+    const pastVersion = pastVersions.find(pastVersion => pastVersion[0] === version.name)
+    if (version.name === 'next' || (pastVersion && pastVersion[2] === 'true')) {
+      newVersions.push(version)
+    }
+  })
+  return newVersions;
+}
+
+export default function DocsVersionDropdownNavbarItem({
+  mobile,
+  docsPluginId,
+  nextVersionLabel,
+  ...props
+}) {
+  const activeDocContext = useActiveDocContext(docsPluginId);
+  const versions = useVersions(docsPluginId);
+  const stratosVersions = createStratosVersions(versions)
+  const latestVersion = useLatestVersion(docsPluginId);
+  const items = stratosVersions.map((version) => {
+    // We try to link to the same doc, in another version
+    // When not possible, fallback to the "main doc" of the version
+    const versionDoc =
+      activeDocContext?.alternateDocVersions[version.name] ||
+      getVersionMainDoc(version);
+    return {
+      isNavLink: true,
+      label: versionLabel(version, nextVersionLabel),
+      to: versionDoc.path,
+      isActive: () => version === activeDocContext?.activeVersion,
+    };
+  });
+
+  // Stratos - Add the 'All Versions' link to the versions drop down
+  items.push({
+    isNavLink: true,
+    label: "All Versions",
+    to: "/versions",
+    isActive: () => false,
+  })
+
+  const dropdownVersion = activeDocContext.activeVersion ?? latestVersion; // Mobile is handled a bit differently
+
+  const dropdownLabel = mobile
+    ? 'Versions'
+    : versionLabel(dropdownVersion, nextVersionLabel);
+  const dropdownTo = mobile
+    ? undefined
+    : getVersionMainDoc(dropdownVersion).path;
+  return (
+    <DefaultNavbarItem
+      {...props}
+      mobile={mobile}
+      label={dropdownLabel}
+      to={dropdownTo}
+      items={items}
+    />
+  );
+}

From 5bfd091f8253bc173322c7f3627c2f2f728585a8 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Tue, 15 Sep 2020 16:19:34 +0100
Subject: [PATCH 619/648] Fix db lock issue (#479)

* Fix db locking issue

* Fix
---
 src/jetstream/plugins/monocular/main.go       |  3 +--
 .../plugins/monocular/store/chart_store_db.go | 22 +++++++++++++++----
 .../plugins/monocular/sync_worker.go          | 10 ++++++++-
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index c2746a13bf..b5c46f2e58 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -104,8 +104,7 @@ func (m *Monocular) syncOnStartup() {
 	for _, ep := range endpoints {
 		if ep.CNSIType == helmEndpointType {
 			if ep.SubType == helmRepoEndpointType {
-				helmRepos[ep.Name] = true
-				log.Infof("Syncing helm repository to chart store: %s", ep.Name)
+				helmRepos[ep.GUID] = true
 				m.Sync(interfaces.EndpointRegisterAction, ep)
 			} else {
 				metadata := "{}"
diff --git a/src/jetstream/plugins/monocular/store/chart_store_db.go b/src/jetstream/plugins/monocular/store/chart_store_db.go
index c21a7d5787..5fd0c92a2b 100644
--- a/src/jetstream/plugins/monocular/store/chart_store_db.go
+++ b/src/jetstream/plugins/monocular/store/chart_store_db.go
@@ -11,6 +11,7 @@ import (
 
 var (
 	saveChartVersion   = `INSERT INTO helm_charts (endpoint, name, repo_name, version, created, app_version, description, icon_url, chart_url, source_url, digest, is_latest, update_batch) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)`
+	updateChartVersion = `UPDATE helm_charts SET created=$1, app_version=$2, description=$3, icon_url=$4, chart_url=$5, source_url=$6, digest=$7, is_latest=$8, update_batch=$9 WHERE endpoint=$10 AND name=$11 AND repo_name=$12 AND version=$13`
 	deleteChartVersion = `DELETE FROM helm_charts WHERE endpoint = $1 AND name = $2 and version = $3`
 	deleteForEndpoint  = `DELETE FROM helm_charts WHERE endpoint = $1`
 	deleteForBatch     = `DELETE FROM helm_charts WHERE endpoint = $1 AND name = $2 and update_batch != $3`
@@ -20,12 +21,15 @@ var (
 	getChartVersion    = `SELECT endpoint, name, repo_name, version, created, app_version, description, icon_url, chart_url, source_url, digest, is_latest FROM helm_charts WHERE repo_name = $1 AND name = $2 AND version = $3`
 	getChartVersions   = `SELECT endpoint, name, repo_name, version, created, app_version, description, icon_url, chart_url, source_url, digest, is_latest FROM helm_charts WHERE repo_name = $1 AND name = $2`
 	getEndpointIDs     = `SELECT DISTINCT endpoint FROM helm_charts`
+	updateChartDigest  = `UPDATE helm_charts SET is_latest=$1, update_batch=$2 WHERE endpoint=$3 AND name=$4 AND repo_name=$5 AND version=$6`
 )
 
 // InitRepositoryProvider - One time init for the given DB Provider
 func InitRepositoryProvider(databaseProvider string) {
 	saveChartVersion = datastore.ModifySQLStatement(saveChartVersion, databaseProvider)
-	deleteChartVersion = datastore.ModifySQLStatement(deleteChartVersion, databaseProvider)
+	updateChartVersion = datastore.ModifySQLStatement(updateChartVersion, databaseProvider)
+	updateChartVersion = datastore.ModifySQLStatement(updateChartVersion, databaseProvider)
+	updateChartDigest = datastore.ModifySQLStatement(updateChartDigest, databaseProvider)
 	deleteForEndpoint = datastore.ModifySQLStatement(deleteForEndpoint, databaseProvider)
 	deleteForBatch = datastore.ModifySQLStatement(deleteForBatch, databaseProvider)
 	renameEndpoint = datastore.ModifySQLStatement(renameEndpoint, databaseProvider)
@@ -49,14 +53,24 @@ func NewHelmChartDBStore(dcp *sql.DB) (ChartStore, error) {
 // Save a Helm Chart to the database
 func (p *HelmChartDBStore) Save(chart ChartStoreRecord, batchID string) error {
 
-	// Delete the existing record
-	p.db.Exec(deleteChartVersion, chart.EndpointID, chart.Name, chart.Version)
-
 	sourceURL := ""
 	if len(chart.Sources) > 0 {
 		sourceURL = chart.Sources[0]
 	}
 
+	// Get the existing record - if it has the same digest, then no need to store it
+	record, err := p.GetChart(chart.Repository, chart.Name, chart.Version)
+	if err == nil && record.Digest == chart.Digest {
+		_, err := p.db.Exec(updateChartDigest, chart.IsLatest, batchID, chart.EndpointID, chart.Name, chart.Repository, chart.Version)
+		return err
+	}
+
+	if err == nil {
+		// The record already exists, so update it
+		_, err := p.db.Exec(updateChartVersion, chart.Created, chart.AppVersion, chart.Description, chart.IconURL, chart.ChartURL, sourceURL, chart.Digest, chart.IsLatest, batchID, chart.EndpointID, chart.Name, chart.Repository, chart.Version)
+		return err
+	}
+
 	if _, err := p.db.Exec(saveChartVersion, chart.EndpointID, chart.Name, chart.Repository, chart.Version, chart.Created, chart.AppVersion, chart.Description, chart.IconURL, chart.ChartURL, sourceURL, chart.Digest, chart.IsLatest, batchID); err != nil {
 		return fmt.Errorf("Unable to save Helm Chart Version: %v", err)
 	}
diff --git a/src/jetstream/plugins/monocular/sync_worker.go b/src/jetstream/plugins/monocular/sync_worker.go
index e168d2c611..962c899669 100644
--- a/src/jetstream/plugins/monocular/sync_worker.go
+++ b/src/jetstream/plugins/monocular/sync_worker.go
@@ -3,6 +3,7 @@ package monocular
 import (
 	"fmt"
 	"strings"
+	"time"
 
 	yaml "gopkg.in/yaml.v2"
 
@@ -52,6 +53,9 @@ func (m *Monocular) syncHelmRepository(endpointID, repoName, url string) error {
 	var latestCharts []store.ChartStoreRecord
 	var allCharts []store.ChartStoreRecord
 
+	log.Infof("Helm Repository sync started for %s", repoName)
+	start := time.Now()
+
 	// Iterate over each chart in the index
 	for name, chartVersions := range index.Entries {
 		log.Debugf("Helm Repository Sync: Processing chart: %s", name)
@@ -70,7 +74,8 @@ func (m *Monocular) syncHelmRepository(endpointID, repoName, url string) error {
 		log.Errorf("%s", err)
 	}
 
-	log.Infof("Sync completed for %s", repoName)
+	elapsed := time.Since(start).Round(time.Second)
+	log.Infof("Helm Repository sync completed for %s (%s)", repoName, elapsed)
 
 	return nil
 }
@@ -127,6 +132,9 @@ func (m *Monocular) procesChartVersions(endpoint, repoName, name string, chartVe
 			if err := m.ChartStore.Save(record, batchID); err != nil {
 				log.Warnf("Error saving Chart %s, Version %s to the database: %+v", record.Name, record.Version, err)
 			}
+
+			// Small delay mainly for SQLite so we don't hog the database connection
+			time.Sleep(2 * time.Millisecond)
 		}
 	}
 

From ae76bbe06795ad89787cd38e378933c888183ded Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Tue, 15 Sep 2020 19:30:55 +0100
Subject: [PATCH 620/648] Merge upstream, also add 4.1.0 version & change log
 (#480)

* Ensure filename/no filename text in connect by file dialog is aligned (#4474)

- needs porting back

* Add typed entity access and `custom-src` removal to change log (#4496)

* Fixes #4335: Create Stratos static web site with better documentation (#4446)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* * Review comments fix

* Fix broken link to an image in frontend extensions doc

* Final tweaks

Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Richard Cox <richard-cox@users.noreply.github.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard Cox <richard.cox@suse.com>

* Fix and update customization docs (#4478)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* Apply new theming process to acme example

* First pass at customization docs, most of themeing done

* Final pass at customization docs

* Merge fixes

Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update base README, point to website (#4488)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* Apply new theming process to acme example

* First pass at customization docs, most of themeing done

* Final pass at customization docs

* Update base README, point to website

Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update developer docs (#4489)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* Apply new theming process to acme example

* First pass at customization docs, most of themeing done

* Final pass at customization docs

* Update base README, point to website

* Update developer docs
Still need an overhall, but updated to remove incorrect data and apply website context

Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix docs (#4497)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* Apply new theming process to acme example

* First pass at customization docs, most of themeing done

* Final pass at customization docs

* Update base README, point to website

* Update developer docs
Still need an overhall, but updated to remove incorrect data and apply website context

* Fix PR template

Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Ensure images dependent on techPreview flag are included in imagelist.txt (#4500)

* Improve clean-symlinks script (#4509)

* Add support for including breaking changes in the changelog

* Improve clean-symlinks script

* Update changelog.sh

* Update changelog.sh

* Remove trailing line

* Remove tailing line

* Change nginx ciphers and make configurable via helm chart values (#4507)

* Change nginx ciphers and make configurable via helm chart values

* Add support for including breaking changes in the changelog

* Improve clean-symlinks script

* Update changelog.sh

* Update changelog.sh

* Remove trailing line

* Remove tailing line

* Fix bug with cert path patching

* Fig bug where protocols not patched

* Update version to 4.0.1, add change log (#4514)

* Update version to 4.0.1, add change log

* Update package-lock

* Fix deploy from gitlab using a group's repo (#4479)

- only supported user based repos
- fixes #4153

* Add additional time ranges to base metrics range selector (#4480)

- fixes https://github.com/SUSE/stratos/issues/415

* Add some time saving comments to cf permissions checker (#4508)

* Move tab-nav and xsrf module source files to the src folder (#4518)

* Move tab-nav files

* Move xsrf module

* Fix GitHub branch limit (#4510)

* Ensure we fetch all repo's and branches when deploying github apps

* Ensure we only fetch branches once
- SUSE/stratos vs suse/stratos
- ensure branches are treated as 'local' lists

* Increate page size for github commits and gitlab requests

* Remove use of nodejs util module (#4521)

* Remove use of nodejs util module

* Fix comment typo

* Remove dependencies between store and core that have crept in (#4517)

* Remove dependencies between store and core that have crept in

* Fix issue with unit tests

* Import fixes and unit test fix

* Fix store testing package (#4520)

* Fix store testing package

* Update public-api.ts

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

* Fix the position of the header guide array (#4524)

- shown when there are no registered endpoints (and some incoming scenarios)
- position is determined by location of associated button in header
- position of button can change given visibility of other buttons (notification bell, endpoint backup, etc)
- now check positiion after a delay, add fade in to mask delay

* Metrics: Ensure trailing slashes are ignored when comparing URLs (#4527)

* Remove imports of the form 'frontend/....' (#4519)

* Move tab-nav files

* Move xsrf module

* Remove imports of the form 'frontend/...'

* Move endpopints-health-check.ts (#4530)

* Add UMD Ids to external modules in store package (#4522)

* Add UMB Ids to external modules in store package

* Add moment

* Address PR feedback

* Improvements & more checks to autoscaler scheduled date tests (#4535)

- allow more time to skip between date and time values in date fields
- add a check to
- add checks to ensure we have the correct number of scheduled date rules

* Remove api driven views (#4537)

* Remove logger service and action history (#4538)

* Remove logger service

* Missed a few and removed action history as it was not being used

* Remove action history

* A few more

* Fix for removed method

* Add support for API keys (#4515)

* Add backend support for API keys

* Add last_used field to API keys

* Use secure random value as key secret

* Add tests for ListAPIKeys and AddAPIKey

* Cover the rest of psql_apikeys.go with tests

* Refactor the code a bit

* Storing SQL queries in a struct should ensure that
`datastore.ModifySQLStatement` gets called on all of them.
* A wrapper func around `db.Exec` reduces copypasta.
* Actually call `InitRepositoryProvider` for API keys package

* Add route handler tests using gomock

* Actually use skipper in xsrfMiddleware; minor clean-up

* Update moment imports to remove warning when building library (#4534)

* Update moment imports to remove warning when building library

* Fix references to moment-timezone and markdown
- contains some changes to e2e tests as well, might need to be reverted

* Fix unit test

* Fix `import *` in e2e tests

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

* Fix Helm upgrade bug (#4544)

* Fix Helm upgrade bug

* Fix unit tests

* Store api_keys.last_used in UTC (#4541)

* Add UI for Stratos API Keys (#4523)

* Add backend support for API keys

* Add last_used field to API keys

* Add base api keys page

* Add basic api key entity framework (untested)

* Add a basic api keys list (untested, need to wire in properties/columns + actions)

* Fix entity type related issues

* Add basic way to create api key

* Wire in delete to list

* Improve 'no api keys' ux

* Final tidy up

* Other fixes

* Fix unit tests

* Add 'Last Used' column to API keys list

* Don't flash up 'no entries' when we haven't loaded api keys yet

* Fix last used sorting
- takes into account timezone
- use cacheing to cater for often called sort

* Fix unit test after changes in master

* Fix after moment change

* Remove now unrequired sorting of api key last used date via moment

Co-authored-by: Ivan Kapelyukhin <ikapelyukhin@suse.com>

* Add basic e2e tests for API Keys (#4536)

* Add backend support for API keys

* Add last_used field to API keys

* Add base api keys page

* Add basic api key entity framework (untested)

* Add a basic api keys list (untested, need to wire in properties/columns + actions)

* Fix entity type related issues

* Add basic way to create api key

* Wire in delete to list

* Improve 'no api keys' ux

* Final tidy up

* Other fixes

* Fix unit tests

* Add basic e2e tests for api keys

* Add 'Last Used' column to API keys list

* Don't flash up 'no entries' when we haven't loaded api keys yet

* Fix last used sorting
- takes into account timezone
- use cacheing to cater for often called sort

* Fix unit test after changes in master

* Fix after moment change

* Beef up test, fix for initial empty state

* Remove now unrequired sorting of api key last used date via moment

Co-authored-by: Ivan Kapelyukhin <ikapelyukhin@suse.com>

* Bump docusaurus version and add support for versioning  (#4506)

* Bump docusaurus version and versioning
- Bump docusaurus to latest 2.0 version
- Fix errors thrown up by new linting process
- Add version support, setup 4.0.0
- Enable dark mode and fix in home screen

* Move status_updates back into root project docs folder

* Fix links
- fix dead links
- ensure all links are relative (so work when versioned)

* Remove version 4.0.0

* WIP

* WIP

* Completed

* Temporarily remove docsVersionDropdown until first version added to internal-versions

* Update website docs

* Build fix for temp situation where there's no versions

* Add custom version of 'not latest released docs' message

* Improve versioning and dark mode toggle
- Add `All Versions page`
- Conditionally include versions in drop down
- Improve dark mode toggle icons

* Temporarily remove dependent on versions
- will be added back in when 4.0 sha is known

* Update Versions Process

* Add 4.0.0

* Fix in `build`/`serve` world
- worked fine in `start` world...

* Update 4.0.0 with temp version

* Multiple improvements
- Fix clean git repo before run
- Swizzle docs version drop down nav bar item, move in custom code
- Improve docs (latest version must appear in drop down)

* Changes following review

* Reduce font in version warning

* API Keys: Make feature configurable for different user types (#4540)

* Add a special type and parsing for the new config option

* Add APIKeysEnabled to /info, check it in the middleware

* Add test coverage for apiKeyMiddleware

* Block API keys endpoints if disabled in the config; add tests

* Fix failing test

* Add API_KEYS_ENABLED to the Helm chart

* Add JSON schema to the Helm chart

* Add docs for UAA SSO user permissions management (#4554)

* Bump docusaurus version and versioning
- Bump docusaurus to latest 2.0 version
- Fix errors thrown up by new linting process
- Add version support, setup 4.0.0
- Enable dark mode and fix in home screen

* Move status_updates back into root project docs folder

* Fix links
- fix dead links
- ensure all links are relative (so work when versioned)

* Remove version 4.0.0

* WIP

* WIP

* Completed

* Temporarily remove docsVersionDropdown until first version added to internal-versions

* Update website docs

* Build fix for temp situation where there's no versions

* Add custom version of 'not latest released docs' message

* Improve versioning and dark mode toggle
- Add `All Versions page`
- Conditionally include versions in drop down
- Improve dark mode toggle icons

* Temporarily remove dependent on versions
- will be added back in when 4.0 sha is known

* Update Versions Process

* Add 4.0.0

* Fix in `build`/`serve` world
- worked fine in `start` world...

* Update 4.0.0 with temp version

* Add troubleshooting section for SSO

* Update SSO auth troubleshooting section

* Add basic developers guide for working with helm (#4511)

* Bump docusaurus version and versioning
- Bump docusaurus to latest 2.0 version
- Fix errors thrown up by new linting process
- Add version support, setup 4.0.0
- Enable dark mode and fix in home screen

* Move status_updates back into root project docs folder

* Fix links
- fix dead links
- ensure all links are relative (so work when versioned)

* Add basic developers guide for working with helm

* Fix post merge issue

* Enable/disable API keys UI given API keys config setting (#4559)

* Add a special type and parsing for the new config option

* Add APIKeysEnabled to /info, check it in the middleware

* Add test coverage for apiKeyMiddleware

* Block API keys endpoints if disabled in the config; add tests

* Fix failing test

* Add API_KEYS_ENABLED to the Helm chart

* Add JSON schema to the Helm chart

* Enable/disable API keys UI given API keys config setting

* Changes following review

* Fix unit tests

Co-authored-by: Ivan Kapelyukhin <ikapelyukhin@suse.com>

* Enable linting for all packages (#4561)

* Enable linting for all packages
- lots to solve!
- we may wish to exclude some files

* Fix linting

* Bump angular json schema form (#4564)

* Bump angular json schema form

* Handle bug where mat-error maring is too big
- We may want to consider moving this upstream

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

* Docs: Update internal versions & Automate future updates  (#4558)

* Docs: Update where 4.0.0 is built from, add 4.0.1
- means we can delete the old `docs-versioning` branch
- both versions point to the same commit (when branch merged to master),
  but reduces user confusion when they can't find the docs for the latest
  released version. Going forward this will point directly to the release label

* Automatically update website's internal-versions.json on new releases
- Add new github action
- Action will trigger on a release being published
- Action looks at github `release` object associated with event and extracts
  a version label and git label
- Use extracted values adds new value to internal-versions.json
- Creates a PR with the change

* Fix checkout issue

* Update documentation-versioning.yml

* Fix nightly tage reference and names (#4574)

* [Security] Bump node-fetch from 2.6.0 to 2.6.1 (#4572)

Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.6.0 to 2.6.1. **This update includes a security fix.**
- [Release notes](https://github.com/bitinn/node-fetch/releases)
- [Changelog](https://github.com/node-fetch/node-fetch/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/bitinn/node-fetch/compare/v2.6.0...v2.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Merge changes from downstream (#4567)

- json schema form mat-error styling fix
- info & border style colors
- desktop style fixes
- changes to breadcrumbs
- sidenav dark mode fix
- new functionality for card-number-metric component
- filter endpoint by type
- more info in stepper onNext fn
- SessionService with isTechPreview
- Add reset pagination of type action/reducer
- Fix cf endpoint sort by type bug

* Reduce sizes for stepper padding and dialog content on desktop (#4573)

* Moer style tweaks

* Update mat-desktop.scss

Co-authored-by: Richard Cox <richard-cox@users.noreply.github.com>

* Optionally reduce size of tile selector cards, apply to create endpoints and deploy app (#4571)

* Improve tile selector sizing
- Reduce width of tile by tweaking tile grid breakpoints
  - Switch down to 1 column later on when reducing width
  - Add intermediat 3 column step to reduce times when 2 columns are too large
- Reduce height of tiles by about a 1/4

* Shrink size of github, git url and docker images in create app stepper

* Helm Chart: Add NOTES.txt template & update chart.yaml (#4557)

* Helm Chart Updates
- Add NOTES template
- Add maintainers and keywords to chart.yaml

* Update helm install instruction in build.sh script to helm 3

* Helm Chart Notes Fixes/Updates

* Changes following review

* Changes following review

* Address PR comments, fix whitespacing

* Update versions & Changelog

* Use smaller tiles for register endpoint stepper

* Update CHANGELOG.md

Co-authored-by: Veerapuram Varadhan <veerapuram.varadhan@suse.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Ivan Kapelyukhin <ikapelyukhin@suse.com>
---
 .cfignore                                     |    2 +-
 CHANGELOG.md                                  |   35 +
 deploy/ci/console-nightly-releases.yml        |   10 +-
 .../dev-releases/nightly-release-description  |    2 +-
 .../tasks/dev-releases/nightly-release-name   |    2 +-
 deploy/kubernetes/build.sh                    |    2 +-
 deploy/kubernetes/console/Chart.yaml          |   13 +-
 deploy/kubernetes/console/README.md           |    2 +-
 deploy/kubernetes/console/templates/NOTES.txt |   31 +
 package-lock.json                             | 1125 ++++++++++++++++-
 package.json                                  |    2 +-
 .../deploy-application-steps.types.ts         |   11 +-
 .../new-application-base-step.component.html  |    3 +-
 .../packages/core/sass/mat-desktop.scss       |   16 +
 .../create-endpoint-base-step.component.html  |    3 +-
 .../tile-selector-tile.component.html         |   27 +-
 .../tile-selector-tile.component.scss         |  126 +-
 .../tile-selector-tile.component.ts           |    9 +-
 .../tile-selector.component.html              |    4 +-
 .../tile-selector.component.scss              |   16 +-
 .../tile-selector/tile-selector.component.ts  |    1 +
 .../components/tile/tile-selector.types.ts    |    1 +
 website/docs/extensions/theming.md            |    8 +-
 23 files changed, 1314 insertions(+), 137 deletions(-)
 create mode 100644 deploy/kubernetes/console/templates/NOTES.txt

diff --git a/.cfignore b/.cfignore
index 4775f324c9..f58e7a9d67 100644
--- a/.cfignore
+++ b/.cfignore
@@ -22,4 +22,4 @@ docs/
 build/dev_config.json
 e2e-reports/
 website/
-.helm-cache/
\ No newline at end of file
+.helm-cache/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23026997c3..a2916e1e66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,40 @@
 # Change Log
 
+## 4.1.0
+
+[Full Changelog](https://github.com/SUSE/stratos/compare/4.0.1...4.1.0)
+
+This release contains a number of fixes and improvements:
+
+**Improvements:**
+
+- Helm: Add support for JSON Schema when inputting values [\#447](https://github.com/SUSE/stratos/issues/447)
+- Helm: Improve chart values YAML editor [\#481](https://github.com/SUSE/stratos/issues/481)
+- Helm: Support helm upgrade of a workload [\#446](https://github.com/SUSE/stratos/issues/446)
+- Helm: Allow users to view and use repositories from Helm Hub [\#445](https://github.com/SUSE/stratos/issues/445)
+- Add support for API Keys [\#4504](https://github.com/cloudfoundry/stratos/issues/4504)
+- Workload List: Show Chart Version instead of Release Version [\#473](https://github.com/SUSE/stratos/issues/473)
+- Helm: Allow users to view revision history for a Helm Release [\#460](https://github.com/SUSE/stratos/issues/460)
+- Kubernetes Terminal: It can take a long time to get to the prompt with large helm repositories registered [\#452](https://github.com/SUSE/stratos/issues/452)
+- Show CaaSP Node version and whether updates are pending on the summary view [\#450](https://github.com/SUSE/stratos/issues/450)
+- Update SUSE login screen to latest EOS design [\#448](https://github.com/SUSE/stratos/issues/448)
+- Toggle live updates in workloads view [\#442](https://github.com/SUSE/stratos/issues/442)
+- Container List in Pods List Improvements [\#360](https://github.com/SUSE/stratos/issues/360)
+- Register Endpoint: Reduce size of cards [\#4568](https://github.com/cloudfoundry/stratos/issues/4568)
+- Metrics view: Add "The last day" to time range selector  [\#4516](https://github.com/cloudfoundry/stratos/issues/4516)
+
+
+**Fixes:**
+
+- Helm Install: Install button becomes enabled before namespace supplied [\#471](https://github.com/SUSE/stratos/issues/471)
+- Helm Chart: Charts view incorrectly shows development versions as the latest versions [\#455](https://github.com/SUSE/stratos/issues/455)
+- Sort endpoint table by type results in empty sort drop down in cf endpoints list [\#4565](https://github.com/cloudfoundry/stratos/issues/4565)
+- Endpoint unregister clears user sort & filter selection [\#4563](https://github.com/cloudfoundry/stratos/issues/4563)
+- Metrics: Metrics detail page can show two endpoint cards if URLs have trailing slash [\#4528](https://github.com/cloudfoundry/stratos/issues/4528)
+- Deploy from Gitlab: Repos in groups do not work [\#4153](https://github.com/cloudfoundry/stratos/issues/4153)
+- Deploy app from Github repo only shows branches from a-e in dropdown [\#3966](https://github.com/cloudfoundry/stratos/issues/3966)
+
+
 ## 4.0.1
 
 [Full Changelog](https://github.com/SUSE/stratos/compare/4.0.0...4.0.1)
diff --git a/deploy/ci/console-nightly-releases.yml b/deploy/ci/console-nightly-releases.yml
index 68751c0160..03d7a82c4e 100644
--- a/deploy/ci/console-nightly-releases.yml
+++ b/deploy/ci/console-nightly-releases.yml
@@ -106,25 +106,25 @@ jobs:
           dockerfile: stratos/deploy/Dockerfile.bk
           build: stratos/
           target_name:  prod-build
-          tag: stratos/deploy/ci/tasks/dev-releases/nightly-tag
+          tag: stratos/deploy/ci/tasks/build-images/nightly-tag
           build_args_file: image-tag/build-args
       - put: mariadb-image
         params:
           dockerfile: stratos/deploy/db/Dockerfile.mariadb
           build: stratos/deploy/db
-          tag: stratos/deploy/ci/tasks/dev-releases/nightly-tag
+          tag: stratos/deploy/ci/tasks/build-images/nightly-tag
     - do:
       - put: config-init-image
         params:
           dockerfile: stratos/deploy/Dockerfile.init
           build: stratos/
-          tag: stratos/deploy/ci/tasks/dev-releases/nightly-tag
+          tag: stratos/deploy/ci/tasks/build-images/nightly-tag
       - put: ui-image
         params:
           dockerfile: stratos/deploy/Dockerfile.ui
           build: stratos/
           target_name: prod-build
-          tag: stratos/deploy/ci/tasks/dev-releases/nightly-tag
+          tag: stratos/deploy/ci/tasks/build-images/nightly-tag
           prebuild_script: build/store-git-metadata.sh
 - name: create-chart
   plan:
@@ -153,7 +153,7 @@ jobs:
     - put: nightly-gh-release
       params:
         name: stratos/deploy/ci/tasks/dev-releases/nightly-release-name
-        tag: stratos/deploy/ci/tasks/dev-releases/nightly-tag
+        tag: stratos/deploy/ci/tasks/build-images/nightly-tag
         body: stratos/deploy/ci/tasks/dev-releases/nightly-release-description
         globs:
         - helm-chart-tarball/*.tgz
diff --git a/deploy/ci/tasks/dev-releases/nightly-release-description b/deploy/ci/tasks/dev-releases/nightly-release-description
index 10f5c521b9..f7b1480f6d 100644
--- a/deploy/ci/tasks/dev-releases/nightly-release-description
+++ b/deploy/ci/tasks/dev-releases/nightly-release-description
@@ -1 +1 @@
-This is an alpha release of Stratos v2
\ No newline at end of file
+Nightly Stratos build
\ No newline at end of file
diff --git a/deploy/ci/tasks/dev-releases/nightly-release-name b/deploy/ci/tasks/dev-releases/nightly-release-name
index ae784554be..fc7a445a46 100644
--- a/deploy/ci/tasks/dev-releases/nightly-release-name
+++ b/deploy/ci/tasks/dev-releases/nightly-release-name
@@ -1 +1 @@
-Stratos 3.0.0 Nightly Release
\ No newline at end of file
+Stratos Nightly Release
\ No newline at end of file
diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
index f838cc3549..4dc645a607 100755
--- a/deploy/kubernetes/build.sh
+++ b/deploy/kubernetes/build.sh
@@ -296,5 +296,5 @@ printf "${RESET}"
 echo
 echo "To deploy using Helm, execute the following:"
 echo 
-echo "    helm install helm-chart --namespace console --name my-console"
+echo "    helm install my-console ./helm-chart --namespace console"
 echo
diff --git a/deploy/kubernetes/console/Chart.yaml b/deploy/kubernetes/console/Chart.yaml
index 22538c426e..aaea5f78e9 100644
--- a/deploy/kubernetes/console/Chart.yaml
+++ b/deploy/kubernetes/console/Chart.yaml
@@ -1,8 +1,17 @@
 apiVersion: v1
-description: A Helm chart for deploying Stratos UI Console
+description: A Helm chart for deploying Stratos
 name: console
 version: 0.1.0
 appVersion: 0.1.0
 sources:
   - https://github.com/cloudfoundry/stratos
-icon: https://raw.githubusercontent.com/cloudfoundry/stratos/master/deploy/kubernetes/console/icon.png
\ No newline at end of file
+icon: https://raw.githubusercontent.com/cloudfoundry/stratos/master/deploy/kubernetes/console/icon.png
+home: https://stratos.app
+maintainers:
+  - name: Stratos Maintainers
+    email: stratos-maintainers@suse.de
+keywords:
+  - Stratos
+  - "Cloud Foundry"
+  - Kubernetes
+  - Helm
\ No newline at end of file
diff --git a/deploy/kubernetes/console/README.md b/deploy/kubernetes/console/README.md
index ee238aa880..cadd5c7d49 100644
--- a/deploy/kubernetes/console/README.md
+++ b/deploy/kubernetes/console/README.md
@@ -22,7 +22,7 @@ Check the repository was successfully added by searching for the `console`, for
 ```
 helm search repo console
 NAME               	CHART VERSION   APP VERSION	DESCRIPTION                                  
-stratos/console    	4.0.1           4.0.1      	A Helm chart for deploying Stratos UI Console
+stratos/console    	4.1.0           4.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
diff --git a/deploy/kubernetes/console/templates/NOTES.txt b/deploy/kubernetes/console/templates/NOTES.txt
new file mode 100644
index 0000000000..0d005a46fd
--- /dev/null
+++ b/deploy/kubernetes/console/templates/NOTES.txt
@@ -0,0 +1,31 @@
+{{- if .Values.console.techPreview }}
+Tech Preview is enabled, extra features will be shown.
+{{- end}}
+
+To access Stratos:
+{{- $ingress := .Values.console.ingress | default dict }}
+{{- if $ingress.enabled }}
+From outside the cluster, the server URL is: http://{{ .Values.console.ingress.host }}
+{{- else }}
+Get the URL by running these commands in the same shell:
+{{- if contains "NodePort" .Values.console.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services console-ui-ext)
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo https://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.console.service.type }}
+  NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+        You can watch the status of by running 'kubectl get svc --namespace {{ .Release.Namespace }} -w console-ui-ext'
+
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} console-ui-ext -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+  echo http://$SERVICE_IP:{{ .Values.console.service.servicePort }}
+{{- else if contains "ClusterIP"  .Values.console.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app=stratos-0,component=ui" -o jsonpath="{.items[0].metadata.name}")
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 443
+{{- end }}
+{{- end }}
+
+To learn more about the release, try:
+  $ helm status {{ .Release.Name }} -n {{ .Release.Namespace }}
+  $ helm get values {{ .Release.Name }} -n {{ .Release.Namespace }}
+  $ kubectl get services -n {{ .Release.Namespace }}
+  $ kubectl get pods -n {{ .Release.Namespace }}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 6ae8d5b767..e9babc88f2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3331,6 +3331,916 @@
             "@babel/types": "^7.11.0"
           }
         },
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+          "dev": true
+        },
+        "@babel/highlight": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
+          "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/parser": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
+          "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/generator": "^7.11.5",
+            "@babel/helper-function-name": "^7.10.4",
+            "@babel/helper-split-export-declaration": "^7.11.0",
+            "@babel/parser": "^7.11.5",
+            "@babel/types": "^7.11.5",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.19"
+          }
+        },
+        "@babel/types": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "lodash": "^4.17.19",
+            "to-fast-properties": "^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"
+          }
+        },
+        "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/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz",
+      "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-new-target": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz",
+      "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-object-super": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz",
+      "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-replace-supers": "^7.10.4"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.4"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.11.6",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
+          "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.5",
+            "jsesc": "^2.5.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.10.4",
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-member-expression-to-functions": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
+          "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.0"
+          }
+        },
+        "@babel/helper-optimise-call-expression": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
+          "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-replace-supers": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
+          "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-member-expression-to-functions": "^7.10.4",
+            "@babel/helper-optimise-call-expression": "^7.10.4",
+            "@babel/traverse": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+          "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.0"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+          "dev": true
+        },
+        "@babel/highlight": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
+          "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/parser": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
+          "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/generator": "^7.11.5",
+            "@babel/helper-function-name": "^7.10.4",
+            "@babel/helper-split-export-declaration": "^7.11.0",
+            "@babel/parser": "^7.11.5",
+            "@babel/types": "^7.11.5",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.19"
+          }
+        },
+        "@babel/types": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "lodash": "^4.17.19",
+            "to-fast-properties": "^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"
+          }
+        },
+        "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/plugin-transform-parameters": {
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz",
+      "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-get-function-arity": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.4"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.11.6",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
+          "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.5",
+            "jsesc": "^2.5.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.10.4",
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/parser": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
+          "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/generator": "^7.11.5",
+            "@babel/helper-function-name": "^7.10.4",
+            "@babel/helper-split-export-declaration": "^7.11.0",
+            "@babel/parser": "^7.11.5",
+            "@babel/types": "^7.11.5",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.19"
+          }
+        },
+        "@babel/types": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "lodash": "^4.17.19",
+            "to-fast-properties": "^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"
+          }
+        },
+        "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/plugin-transform-property-literals": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz",
+      "integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-regenerator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz",
+      "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==",
+      "dev": true,
+      "requires": {
+        "regenerator-transform": "^0.14.2"
+      }
+    },
+    "@babel/plugin-transform-reserved-words": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz",
+      "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-shorthand-properties": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz",
+      "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-spread": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz",
+      "integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0"
+      }
+    },
+    "@babel/plugin-transform-sticky-regex": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz",
+      "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-regex": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-template-literals": {
+      "version": "7.10.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz",
+      "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-typeof-symbol": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz",
+      "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-unicode-regex": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz",
+      "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/preset-env": {
+      "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.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
+      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
+      }
+    },
+    "@babel/runtime": {
+      "version": "7.11.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz",
+      "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==",
+      "dev": true,
+      "requires": {
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
+    "@babel/template": {
+      "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.8.3",
+        "@babel/parser": "^7.8.6",
+        "@babel/types": "^7.8.6"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.4"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.11.6",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
+          "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.5",
+            "jsesc": "^2.5.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.10.4",
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-member-expression-to-functions": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
+          "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.0"
+          }
+        },
+        "@babel/helper-module-imports": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
+          "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-module-transforms": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
+          "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-module-imports": "^7.10.4",
+            "@babel/helper-replace-supers": "^7.10.4",
+            "@babel/helper-simple-access": "^7.10.4",
+            "@babel/helper-split-export-declaration": "^7.11.0",
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.11.0",
+            "lodash": "^4.17.19"
+          }
+        },
+        "@babel/helper-optimise-call-expression": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
+          "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-replace-supers": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
+          "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-member-expression-to-functions": "^7.10.4",
+            "@babel/helper-optimise-call-expression": "^7.10.4",
+            "@babel/traverse": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-simple-access": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
+          "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+          "dev": true,
+          "requires": {
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+          "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.0"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+          "dev": true
+        },
+        "@babel/highlight": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
+          "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/parser": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/traverse": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
+          "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/generator": "^7.11.5",
+            "@babel/helper-function-name": "^7.10.4",
+            "@babel/helper-split-export-declaration": "^7.11.0",
+            "@babel/parser": "^7.11.5",
+            "@babel/types": "^7.11.5",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.19"
+          }
+        },
+        "@babel/types": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "lodash": "^4.17.19",
+            "to-fast-properties": "^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"
+          }
+        },
+        "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/plugin-transform-modules-umd": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz",
+      "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.9.0",
+        "lodash": "^4.17.13",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "@cfstratos/ajsf-core": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@cfstratos/ajsf-core/-/ajsf-core-0.1.6.tgz",
+      "integrity": "sha512-G47ZAvn7ynuUkB2XzeewxhDB9yB5EYcBWfmBYB6FeEkFzX9PpcaCm8QK72IO6Kis+HjAvO5kwqiud9TXUPhMNw==",
+      "requires": {
+        "ajv": "^6.10.0",
+        "lodash-es": "^4.17.15"
+      }
+    },
+    "@cfstratos/ajsf-material": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@cfstratos/ajsf-material/-/ajsf-material-0.1.6.tgz",
+      "integrity": "sha512-dUV2aqwQoRCaedNh31ZVZUgDhWqdiJnikag/Nws5h4fFs6sdmL2sS8A18e6onLA8t9t4n0y8PEib6qgxqr3ezw==",
+      "requires": {
+        "@cfstratos/ajsf-core": "~0.1.5",
+        "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": {
+        "@babel/code-frame": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.4"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.11.6",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
+          "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.5",
+            "jsesc": "^2.5.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.10.4",
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-get-function-arity": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-member-expression-to-functions": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
+          "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.0"
+          }
+        },
+        "@babel/helper-module-imports": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
+          "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-module-transforms": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
+          "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-module-imports": "^7.10.4",
+            "@babel/helper-replace-supers": "^7.10.4",
+            "@babel/helper-simple-access": "^7.10.4",
+            "@babel/helper-split-export-declaration": "^7.11.0",
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.11.0",
+            "lodash": "^4.17.19"
+          }
+        },
+        "@babel/helper-optimise-call-expression": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
+          "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-replace-supers": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
+          "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-member-expression-to-functions": "^7.10.4",
+            "@babel/helper-optimise-call-expression": "^7.10.4",
+            "@babel/traverse": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-simple-access": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
+          "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+          "dev": true,
+          "requires": {
+            "@babel/template": "^7.10.4",
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.11.0",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+          "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.11.0"
+          }
+        },
         "@babel/highlight": {
           "version": "7.10.4",
           "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
@@ -3375,22 +4285,76 @@
             "globals": "^11.1.0",
             "lodash": "^4.17.19"
           }
+        }
+      }
+    },
+    "@jsdevtools/ono": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.2.tgz",
+      "integrity": "sha512-qS/a24RA5FEoiJS9wiv6Pwg2c/kiUo3IVUQcfeM9JvsR6pM8Yx+yl/6xWYLckZCT5jpLNhslgjiA8p/XcGyMRQ==",
+      "dev": true
+    },
+    "@ngrx/effects": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-9.2.0.tgz",
+      "integrity": "sha512-8V09zDIPehGpzgfcgyczelovsVYJvDQhN9wHt37K5A+YCG0CI8nj8FmKokHATwv/S62YqFrOVnr/TZacxpDhBw=="
+    },
+    "@ngrx/router-store": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-9.2.0.tgz",
+      "integrity": "sha512-thu6aU9YWM64oNEk4Srx/mNSeQ2SPJKlTji8MSzfr06qgCMyPSXZBYlfs8HqY+af3eB7XBEhb/4ew4JJ6xC9zw=="
+    },
+    "@ngrx/store": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-9.2.0.tgz",
+      "integrity": "sha512-V8AI3mxbMztVpbZpALkLZYlGkofKcu9GaOCY5e+sZ1VcJ90oxhFjBpnmd6MuVdmhep1XAHALb1B8ZbBFn+xsgQ=="
+    },
+    "@ngrx/store-devtools": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-9.2.0.tgz",
+      "integrity": "sha512-/FvgcpjO4IvwNFnRVoHGikAvckr6fxKf4NgYoTQ9giI8xavolLvuQUHxzH20legi5dgZz34ii2m2g1Q7OxEV8w=="
+    },
+    "@ngtools/webpack": {
+      "version": "9.1.12",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-9.1.12.tgz",
+      "integrity": "sha512-lypMXIq5oxBMsoDu/VOa1yUmmXthhxkCJa8LG0ZohfnbwhmZvz3SAW7omBGuVrb5cVIfLCkaRCSnQ1MNc6ULXw==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/core": "9.1.12",
+        "enhanced-resolve": "4.1.1",
+        "rxjs": "6.5.4",
+        "webpack-sources": "1.4.3"
+      },
+      "dependencies": {
+        "@angular-devkit/core": {
+          "version": "9.1.12",
+          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.12.tgz",
+          "integrity": "sha512-D/GnBeSlmdgGn7EhuE32HuPuRAjvUuxi7Q6WywBI8PSsXKAGnrypghBwMATNnOA24//CgbW2533Y9VWHaeXdeA==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.12.3",
+            "fast-json-stable-stringify": "2.1.0",
+            "magic-string": "0.25.7",
+            "rxjs": "6.5.4",
+            "source-map": "0.7.3"
+          }
         },
-        "@babel/types": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+        "ajv": {
+          "version": "6.12.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+        "rxjs": {
+          "version": "6.5.4",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
+          "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
@@ -3404,10 +4368,53 @@
         }
       }
     },
-    "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz",
-      "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==",
+    "@nodelib/fs.scandir": {
+      "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.3",
+        "run-parallel": "^1.1.9"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "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.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.3",
+        "fastq": "^1.6.0"
+      }
+    },
+    "@npmcli/move-file": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.0.1.tgz",
+      "integrity": "sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==",
+      "dev": true,
+      "requires": {
+        "mkdirp": "^1.0.4"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        }
+      }
+    },
+    "@rollup/plugin-commonjs": {
+      "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": {
         "@babel/helper-create-regexp-features-plugin": "^7.10.4"
@@ -3634,10 +4641,44 @@
         "regenerator-transform": "^0.14.2"
       }
     },
-    "@babel/plugin-transform-reserved-words": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz",
-      "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==",
+    "@tootallnate/once": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "dev": true
+    },
+    "@tweenjs/tween.js": {
+      "version": "17.4.0",
+      "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-17.4.0.tgz",
+      "integrity": "sha512-J3fzl1F6wvh8KXVVcIuHN12xi1ZDcPA/0Vix+ZcJYwZWVHUwfIqfvzYXXEw7ybeev6477KCTt9fKydU+ajUqcg=="
+    },
+    "@types/caseless": {
+      "version": "0.12.2",
+      "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz",
+      "integrity": "sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==",
+      "dev": true
+    },
+    "@types/circular-json": {
+      "version": "0.4.0",
+      "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",
+      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
+      "dev": true
+    },
+    "@types/glob": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -3662,10 +4703,28 @@
         "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0"
       }
     },
-    "@babel/plugin-transform-sticky-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz",
-      "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==",
+    "@types/node": {
+      "version": "13.13.11",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.11.tgz",
+      "integrity": "sha512-FX7mIFKfnGCfq10DGWNhfCNxhACEeqH5uulT6wRRA1KEt7zgLe0HdrAd9/QQkObDqp2Z0KEV3OAmNgs0lTx5tQ==",
+      "dev": true
+    },
+    "@types/normalize-package-data": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+      "dev": true
+    },
+    "@types/q": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
+      "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
+      "dev": true
+    },
+    "@types/request": {
+      "version": "2.48.4",
+      "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.4.tgz",
+      "integrity": "sha512-W1t1MTKYR8PxICH+A4HgEIPuAC3sbljoEVfyZbeFJJDbr30guDspJri2XOaM2E+Un7ZjrihaDi7cf6fPa2tbgw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
@@ -9726,14 +10785,6 @@
       "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
       "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"
-      }
-    },
     "handle-thing": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
@@ -11433,9 +12484,9 @@
           "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==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -13464,9 +14515,9 @@
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
     },
     "node-fetch": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
-      "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
       "dev": true
     },
     "node-fetch-npm": {
diff --git a/package.json b/package.json
index 0806aac4f6..91cc3b68b1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stratos",
-  "version": "4.0.1",
+  "version": "4.1.0",
   "description": "Stratos Console",
   "main": "index.js",
   "scripts": {
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 5acb4f80d2..b20ecdb697 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
@@ -34,7 +34,8 @@ export class ApplicationDeploySourceTypes {
       helpText: 'Please select the public GitHub project and branch you would like to deploy from.',
       graphic: {
         // TODO: Move cf assets to CF package (#3769)
-        location: '/core/assets/endpoint-icons/github-logo.png'
+        location: '/core/assets/endpoint-icons/github-logo.png',
+        transform: 'scale(0.7)'
       }
     },
     {
@@ -51,7 +52,8 @@ export class ApplicationDeploySourceTypes {
       id: DEPLOY_TYPES_IDS.GIT_URL,
       helpText: 'Please enter the public git url and branch or tag you would like to deploy from.',
       graphic: {
-        location: '/core/assets/endpoint-icons/Git-logo.png'
+        location: '/core/assets/endpoint-icons/Git-logo.png',
+        transform: 'scale(0.7)'
       }
     },
     {
@@ -59,12 +61,13 @@ export class ApplicationDeploySourceTypes {
       id: DEPLOY_TYPES_IDS.DOCKER_IMG,
       helpText: 'Please specify an application name and the Docker image to be used (registry/org/image-name).',
       graphic: {
-        location: '/core/assets/endpoint-icons/docker.png'
+        location: '/core/assets/endpoint-icons/docker.png',
+        transform: 'scale(0.8)'
       },
       disabledText: 'The selected Cloud Foundry cannot deploy Docker images. Please check that the Diego Docker feature flag is enabled'
     },
     {
-      name: 'Application Archive File',
+      name: 'Application Archive',
       id: DEPLOY_TYPES_IDS.FILE,
       helpText: 'Please select the archive file that contains the application you would like to deploy.',
       graphic: { matIcon: 'unarchive' }
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/new-application-base-step/new-application-base-step.component.html b/src/frontend/packages/cloud-foundry/src/features/applications/new-application-base-step/new-application-base-step.component.html
index 0b8f2f5066..9bd7ae404a 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/new-application-base-step/new-application-base-step.component.html
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/new-application-base-step/new-application-base-step.component.html
@@ -7,7 +7,8 @@ <h1>New Application</h1>
       <h3>Select application source</h3>
       <p>To create an application you can either deploy from a specific source or create an application shell. An
         application shell is an empty application with no package associated with it.</p>
-      <app-tile-selector [options]="tileSelectorConfig" (selection)="selectedTile = $event"></app-tile-selector>
+      <app-tile-selector [options]="tileSelectorConfig" [smallerTiles]="true" (selection)="selectedTile = $event">
+      </app-tile-selector>
     </div>
   </app-step>
 </app-steppers>
\ No newline at end of file
diff --git a/src/frontend/packages/core/sass/mat-desktop.scss b/src/frontend/packages/core/sass/mat-desktop.scss
index 7e11af970e..dd073dffa5 100644
--- a/src/frontend/packages/core/sass/mat-desktop.scss
+++ b/src/frontend/packages/core/sass/mat-desktop.scss
@@ -103,6 +103,7 @@ $desktop-toggle-button-item-height: $desktop-menu-item-height - 2px;
         line-height: normal;
       }
     }
+
   }
 
   // Smaller page header
@@ -127,4 +128,19 @@ $desktop-toggle-button-item-height: $desktop-menu-item-height - 2px;
   app-profile-info .user-profile {
     top: $desktop-page-header-height;
   }
+
+  // Smaller dialog titles & content
+  .mat-dialog-title {
+    font-size: 18px;
+  }
+  .mat-dialog-content {
+    font-size: 16px;
+  }
+
+  // Reduced padding on steppers - the stepper already had padding applied because they are included in the dashboard, which
+  // has padding via the '.dashboard__content` class - so we end up with double padding - this removes the extra level of padding
+  .steppers__inner {
+    padding: 0;
+  }
+
 }
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.html b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.html
index 5a3116dce9..c37555a655 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.html
@@ -12,7 +12,8 @@ <h3>Select the type of the endpoint to register</h3>
         the 'Connecting' process. To do this return to the Endpoints page.
       </p>
     -->
-      <app-tile-selector [options]="tileSelectorConfig$ | async" (selection)="selectedTile = $event">
+      <app-tile-selector [options]="tileSelectorConfig$ | async" [smallerTiles]="true"
+        (selection)="selectedTile = $event">
       </app-tile-selector>
     </div>
   </app-step>
diff --git a/src/frontend/packages/core/src/shared/components/tile-selector-tile/tile-selector-tile.component.html b/src/frontend/packages/core/src/shared/components/tile-selector-tile/tile-selector-tile.component.html
index 155b4b7885..eefa5a8c67 100644
--- a/src/frontend/packages/core/src/shared/components/tile-selector-tile/tile-selector-tile.component.html
+++ b/src/frontend/packages/core/src/shared/components/tile-selector-tile/tile-selector-tile.component.html
@@ -1,13 +1,16 @@
-<div *ngIf="tile" class="tile-selector" [ngClass]="{'tile-selector__active': active, 'tile-selector__taller': !!tile.description}" (click)="onClick(tile)">
-  <div class="tile-selector__header">
-    <mat-icon *ngIf="tile.graphic.matIcon; else imgIcon" class="tile-selector__icon"
-      [fontSet]="tile.graphic.matIconFont"> {{ tile.graphic.matIcon }}</mat-icon>
-    <ng-template #imgIcon>
-      <img src="{{tile.graphic.location}}" />
-    </ng-template>
+<div *ngIf="tile" class="tile-selector-parent" [ngClass]="{'smaller': smaller}">
+  <div class="tile-selector" [ngClass]="{'tile-selector__active': active, 'tile-selector__taller': !!tile.description}"
+    (click)="onClick(tile)">
+    <div class="tile-selector__header">
+      <mat-icon *ngIf="tile.graphic.matIcon; else imgIcon" class="tile-selector__icon"
+        [fontSet]="tile.graphic.matIconFont"> {{ tile.graphic.matIcon }}</mat-icon>
+      <ng-template #imgIcon>
+        <img src="{{tile.graphic.location}}" [style.transform]="tile.graphic.transform" />
+      </ng-template>
+    </div>
+    <div class="tile-selector__content">
+      <h3>{{ tile.label }}</h3>
+    </div>
+    <div class="tile-selector__description" *ngIf="tile && tile.description">{{ tile.description }}</div>
   </div>
-  <div class="tile-selector__content">
-    <h3>{{ tile.label }}</h3>
-  </div>
-  <div class="tile-selector__description" *ngIf="tile && tile.description">{{ tile.description }}</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/tile-selector-tile/tile-selector-tile.component.scss b/src/frontend/packages/core/src/shared/components/tile-selector-tile/tile-selector-tile.component.scss
index 68db7e8382..2a6328ad84 100644
--- a/src/frontend/packages/core/src/shared/components/tile-selector-tile/tile-selector-tile.component.scss
+++ b/src/frontend/packages/core/src/shared/components/tile-selector-tile/tile-selector-tile.component.scss
@@ -1,74 +1,82 @@
-.tile-selector {
-  $tile-height: 200px;
-  border-radius: 3px;
-  cursor: pointer;
-  display: flex;
-  flex-direction: column;
-  height: $tile-height;
-  opacity: .5;
-  transition: transform .2s ease;
-  user-select: none;
-  width: 100%;
 
-  &__taller {
-    height: 260px;
-  }
-  &:hover {
-    opacity: 1;
-    transform: scale(1.02);
-  }
-  &__more {
-    align-items: center;
+@mixin create($tile-height: 200px, $icon-size: 80px) {
+  $img-size: $tile-height / 2;
+
+  .tile-selector {
+    border-radius: 3px;
     cursor: pointer;
     display: flex;
-    font-size: 16px;
+    flex-direction: column;
     height: $tile-height;
-    justify-content: center;
-  }
+    opacity: .5;
+    transition: transform .2s ease;
+    user-select: none;
+    width: 100%;
 
-  &:active {
-    transform: scale(.98);
-  }
+    &:hover {
+      opacity: 1;
+      transform: scale(1.02);
+    }
+    &__more {
+      align-items: center;
+      cursor: pointer;
+      display: flex;
+      font-size: 16px;
+      height: $tile-height;
+      justify-content: center;
+    }
 
-  &__active {
-    opacity: 1;
-  }
+    &:active {
+      transform: scale(.98);
+    }
 
-  &__header {
-    align-items: center;
-    display: flex;
-    flex: 2;
-    justify-content: center;
-    width: 100%;
+    &__active {
+      opacity: 1;
+    }
+
+    &__header {
+      align-items: center;
+      display: flex;
+      flex: 2;
+      justify-content: center;
+      width: 100%;
 
-    img {
-      height: 100px;
+      img {
+        height: $img-size;
+      }
     }
-  }
 
-  &__description {
-    flex: 0;
-    padding: 10px;
-    text-align: center;
-  }
+    &__description {
+      flex: 0;
+      padding: 10px;
+      text-align: center;
+    }
 
-  &__content {
-    display: flex;
-    flex: 0;
-    flex-direction: column;
-    justify-content: center;
-    opacity: .8;
-    padding: 0 1em;
-    position: relative;
-    text-align: center;
-    word-wrap: break-word;
+    &__content {
+      display: flex;
+      flex: 0;
+      flex-direction: column;
+      justify-content: center;
+      opacity: .8;
+      padding: 0 1em;
+      position: relative;
+      text-align: center;
+      word-wrap: break-word;
+    }
+
+    &__icon {
+      font-size: $icon-size;
+      height: $icon-size;
+      opacity: .6;
+      width: $icon-size;
+    }
   }
+}
+
+.tile-selector-parent {
+  @include create;
 
-  $icon-size: 80px;
-  &__icon {
-    font-size: $icon-size;
-    height: $icon-size;
-    opacity: .6;
-    width: $icon-size;
+  &.smaller {
+    @include create(160px, 60px);
   }
 }
diff --git a/src/frontend/packages/core/src/shared/components/tile-selector-tile/tile-selector-tile.component.ts b/src/frontend/packages/core/src/shared/components/tile-selector-tile/tile-selector-tile.component.ts
index f4f6a69ec7..5b11d6ac48 100644
--- a/src/frontend/packages/core/src/shared/components/tile-selector-tile/tile-selector-tile.component.ts
+++ b/src/frontend/packages/core/src/shared/components/tile-selector-tile/tile-selector-tile.component.ts
@@ -1,17 +1,20 @@
-import { Component, Input, EventEmitter, Output } from '@angular/core';
-import { ITileConfig, ITileIconConfig, ITileImgConfig, ITileData } from '../tile/tile-selector.types';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+
+import { ITileConfig, ITileData, ITileGraphic } from '../tile/tile-selector.types';
 
 @Component({
   selector: 'app-tile-selector-tile',
   templateUrl: './tile-selector-tile.component.html',
   styleUrls: ['./tile-selector-tile.component.scss']
 })
-export class TileSelectorTileComponent<Y = ITileIconConfig | ITileImgConfig> {
+export class TileSelectorTileComponent<Y = ITileGraphic> {
 
   @Input() tile: ITileConfig<ITileData, Y>;
 
   @Input() active: boolean;
 
+  @Input() smaller = false;
+
   @Output() tileSelect = new EventEmitter<ITileConfig>();
 
   public onClick(tile: ITileConfig) {
diff --git a/src/frontend/packages/core/src/shared/components/tile-selector/tile-selector.component.html b/src/frontend/packages/core/src/shared/components/tile-selector/tile-selector.component.html
index b3b0112dae..7f05aa5e7d 100644
--- a/src/frontend/packages/core/src/shared/components/tile-selector/tile-selector.component.html
+++ b/src/frontend/packages/core/src/shared/components/tile-selector/tile-selector.component.html
@@ -11,7 +11,7 @@
 </div>
 
 <ng-template #tile let-options="options" let-selected="selected">
-  <app-tile-selector-tile *ngFor="let tile of options"
-    (tileSelect)="selectionChange(tile)" [tile]="tile" [active]="selected === tile || !selected">
+  <app-tile-selector-tile *ngFor="let tile of options" (tileSelect)="selectionChange(tile)" [tile]="tile"
+    [active]="selected === tile || !selected" [smaller]="smallerTiles">
   </app-tile-selector-tile>
 </ng-template>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/tile-selector/tile-selector.component.scss b/src/frontend/packages/core/src/shared/components/tile-selector/tile-selector.component.scss
index c5a5ce6951..cccdb39707 100644
--- a/src/frontend/packages/core/src/shared/components/tile-selector/tile-selector.component.scss
+++ b/src/frontend/packages/core/src/shared/components/tile-selector/tile-selector.component.scss
@@ -9,17 +9,31 @@
   min-height: 0;
   min-width: 0;
 
-  @include breakpoint(tablet) {
+
+  @include breakpoint(mobileonly) {
+    // < 600
+    grid-template-columns: repeat(1, 1fr);
+  }
+
+  @include breakpoint(phablet) {
+    // > 600
     grid-column-gap: $bottom-space;
     grid-row-gap: $bottom-space;
     grid-template-columns: repeat(2, 1fr);
   }
 
+  @include breakpoint(tablet) {
+    // > 900
+    grid-template-columns: repeat(3, 1fr);
+  }
+
   @include breakpoint(laptop) {
+    // > 1200
     grid-template-columns: repeat(4, 1fr);
   }
 
   @include breakpoint(desktop) {
+    // > 1800
     grid-template-columns: repeat(5, 1fr);
   }
 }
diff --git a/src/frontend/packages/core/src/shared/components/tile-selector/tile-selector.component.ts b/src/frontend/packages/core/src/shared/components/tile-selector/tile-selector.component.ts
index 18c8c144de..cd7d92f4b2 100644
--- a/src/frontend/packages/core/src/shared/components/tile-selector/tile-selector.component.ts
+++ b/src/frontend/packages/core/src/shared/components/tile-selector/tile-selector.component.ts
@@ -12,6 +12,7 @@ export class TileSelectorComponent {
   public pOptions: ITileConfig[] = [];
   public hiddenOptions: ITileConfig[] = [];
   public showingMore = false;
+  @Input() smallerTiles = false;
   @Input() set options(options: ITileConfig[]) {
     if (!options) {
       return;
diff --git a/src/frontend/packages/core/src/shared/components/tile/tile-selector.types.ts b/src/frontend/packages/core/src/shared/components/tile/tile-selector.types.ts
index d443c03fcb..92f314d6b5 100644
--- a/src/frontend/packages/core/src/shared/components/tile/tile-selector.types.ts
+++ b/src/frontend/packages/core/src/shared/components/tile/tile-selector.types.ts
@@ -5,6 +5,7 @@ export interface ITileIconConfig {
 
 export interface ITileImgConfig {
   location: string;
+  transform?: string;
 }
 
 export type ITileGraphic = ITileIconConfig | ITileImgConfig;
diff --git a/website/docs/extensions/theming.md b/website/docs/extensions/theming.md
index 50d26d74da..cd55d91cfc 100644
--- a/website/docs/extensions/theming.md
+++ b/website/docs/extensions/theming.md
@@ -13,7 +13,7 @@ Stratos provides a mechanism for customizing the theme, including:
 
 Theme's are best encapsulated in a new npm package. It should contain the usual `package.json` file with a `stratos` section which will contain some of the theme customizations.
 
-An example of the type of package that can be created can be found in the [ACME example](https://github.com/cloudfoundry/stratos/tree/master/src/frontend/packages/example-theme). To run Stratos with these customizations see [here](/docs/extensions/introduction#acme).
+An example of the type of package that can be created can be found in the [ACME example](https://github.com/cloudfoundry/stratos/tree/master/src/frontend/packages/example-theme). To run Stratos with these customizations see [here](./introduction#acme).
 
 ## Colors
 Stratos uses Material Design and the [angular-material](https://material.angular.io/) library and uses the same approach to theming.
@@ -53,10 +53,10 @@ Additional Stratos colors can be customized by supplying more colors to the `the
 |---|---|
 |app-background-color| Base color to show in the background of the application |
 |app-background-text-color| Color of text when placed on the basic background |
-|side-nav| See [below](/docs/extensions/theming#side-nav-colors) |
-|status| See [below](/docs/extensions/theming#status-colors)|
+|side-nav| See [below](./theming#side-nav-colors) |
+|status| See [below](./theming#status-colors)|
 |subdued-color| Lighter color meant to be a subdued version of the primary color |
-|ansi-colors| See [below](/docs/extensions/theming#ansi-colors)|
+|ansi-colors| See [below](./theming#ansi-colors)|
 |header-background-color| Background color for the main stratos header|
 |header-foreground-color| Foreground color for the main stratos |
 |stratos-title-show-text| Boolean - Show `Stratos` or provided title with the large logo in the about page, default log in page, etc |

From 9bd34032c6f90017056e95ecb58d4c9612e6c167 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Wed, 16 Sep 2020 12:41:46 +0100
Subject: [PATCH 621/648] Helm Values Editor: Bug fixes (#482)

* Bug fixes

* Better fix using merge

* Ensure values are strings before submitting
- only change in chart editor is getValues return type, otherwise all whitespace/semi colon

Co-authored-by: Richard Cox <richard.cox@suse.com>
---
 .../chart-values-editor.component.ts          | 33 ++++++++++---------
 .../chart-values-editor/diffvalues.ts         | 32 +++++++++++++++---
 .../workloads/chart-values-editor/merge.ts    | 26 +++++++++++++++
 .../create-release.component.ts               |  6 ++--
 .../upgrade-release.component.ts              |  8 ++---
 5 files changed, 79 insertions(+), 26 deletions(-)
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/merge.ts

diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts
index 9b5f28c925..ff0ace0e14 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts
@@ -10,6 +10,7 @@ import { ConfirmationDialogService } from '../../../../../../core/src/shared/com
 import { ThemeService } from './../../../../../../store/src/theme.service';
 import { diffObjects } from './diffvalues';
 import { generateJsonSchemaFromObject } from './json-schema-generator';
+import { mergeObjects } from './merge';
 
 
 export interface ChartValuesConfig {
@@ -21,7 +22,7 @@ export interface ChartValuesConfig {
   valuesUrl: string;
 
   // Values for the current release (optional)
-  releaseValues? : string
+  releaseValues?: string;
 }
 
 // Height of the toolbar that sits above the editor conmponent
@@ -107,7 +108,7 @@ export class ChartValuesEditorComponent implements OnInit, OnDestroy, AfterViewI
   private codeOnEnter: string;
 
   // Reference to the editor, so we can adjust its size to fit
-  @ViewChild('monacoEditor', {read: ElementRef}) monacoEditor: ElementRef;
+  @ViewChild('monacoEditor', { read: ElementRef }) monacoEditor: ElementRef;
 
   @ViewChild('schemaForm') schemaForm: JsonSchemaFormComponent;
 
@@ -145,11 +146,11 @@ export class ChartValuesEditorComponent implements OnInit, OnDestroy, AfterViewI
     private httpClient: HttpClient,
     private themeService: ThemeService,
     private confirmDialog: ConfirmationDialogService,
-  ) {}
+  ) { }
 
   ngOnInit(): void {
     // Listen for window resize and resize the editor when this happens
-    this.resizeSub = fromEvent(window, 'resize').pipe(debounceTime(150)).subscribe(event  => this.resize());
+    this.resizeSub = fromEvent(window, 'resize').pipe(debounceTime(150)).subscribe(event => this.resize());
   }
 
   private init() {
@@ -231,7 +232,9 @@ export class ChartValuesEditorComponent implements OnInit, OnDestroy, AfterViewI
       // Form -> Editor
       // Only copy if there is not an error - otherwise keep the invalid yaml from the editor that needs fixing
       if (!this.yamlError) {
-        this.code = this.getDiff(this.formData);
+        const codeYaml = yaml.safeLoad(this.code || '{}');
+        const data = mergeObjects(codeYaml, this.formData);
+        this.code = this.getDiff(data);
         this.codeOnEnter = this.code;
       }
 
@@ -242,20 +245,18 @@ export class ChartValuesEditorComponent implements OnInit, OnDestroy, AfterViewI
       // Try and parse the YAML - if we can't this is an error, so we can't edit this back in the form
       try {
         if (this.codeOnEnter === this.code) {
-          return
+          // Code did not change
+          return;
         }
 
         // Parse as json
         const json = yaml.safeLoad(this.code || '{}');
         // Must be an object, otherwise it was not valid
-        if (typeof(json) !== 'object') {
+        if (typeof (json) !== 'object') {
           throw new Error('Invalid YAML');
         }
         this.yamlError = false;
-        const data = {
-          ...this.formData,
-          ...json
-        };
+        const data = mergeObjects(this.formData, json);
         this.initialFormData = data;
         this.formData = data;
       } catch (e) {
@@ -296,7 +297,7 @@ export class ChartValuesEditorComponent implements OnInit, OnDestroy, AfterViewI
     this.model = {
       language: 'yaml',
       uri: this.getSchemaUri()
-     };
+    };
   }
 
   // Delayed resize of editor to fit
@@ -357,7 +358,7 @@ export class ChartValuesEditorComponent implements OnInit, OnDestroy, AfterViewI
     });
   }
 
-  public getValues(): any {
+  public getValues(): object {
     return (this.mode === EditorMode.JSonSchemaForm) ? this.formData : yaml.safeLoad(this.code);
   }
 
@@ -402,10 +403,12 @@ export class ChartValuesEditorComponent implements OnInit, OnDestroy, AfterViewI
     }
   }
 
-  // Reset the form values
+  // Reset the form values and the code
   clearFormValues() {
     this.confirmDialog.open(this.clearValuesConfirmation, () => {
       this.initialFormData = {};
+      this.code = '';
+      this.codeOnEnter = '';
     });
   }
 
@@ -422,6 +425,6 @@ export class ChartValuesEditorComponent implements OnInit, OnDestroy, AfterViewI
     if (code.trim() === '{}') {
       code = '';
     }
-    return code
+    return code;
   }
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/diffvalues.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/diffvalues.ts
index 4fc2d15946..d4a27c6e8d 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/diffvalues.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/diffvalues.ts
@@ -5,11 +5,14 @@ function arraysAreEqual(a1: any[], a2: any[]): boolean {
     return false
   }
 
+  // Compare each item in the array
   for (let i=0; i<a1.length; i++) {
-    // Compare each item in the array
-    if (typeof(a1[i] === 'object')) {
-      const diff = diffObjects(a1[i], a2[i]);
-      if (Object.keys(diff).length !== 0) {
+    if (Array.isArray(a1[i])) {
+      if (!arraysAreEqual(a1[i], a2[i])) {
+        return false;
+      }
+    } else if (typeof(a1[i] === 'object')) {
+      if (!objectsAreEqual(a1[i], a2[i])) {
         return false;
       }
     } else if (a1[i] !== a2[i]) {
@@ -19,12 +22,33 @@ function arraysAreEqual(a1: any[], a2: any[]): boolean {
   return true;
 }
 
+function objectsAreEqual(src: any, dest: any): boolean {
+  if (Object.keys(src).length !== Object.keys(dest).length) {
+    return false;
+  }
+
+  Object.keys(src).forEach(key => {
+    if (typeof(src[key]) !== typeof(dest[key])) {
+      return false;
+    } else if(src[key] === null && dest[key] === null) {
+      return true;
+    } else if (Array.isArray(src[key]) && !arraysAreEqual(src[key], dest[key])) {
+        return false;
+    } else if (typeof(src[key]) === 'object' && !objectsAreEqual(src[key], dest[key])) {
+        return false;
+    }
+  });
+
+  return true;
+}
+
 // NOTE: This is a one-way diff only
 // diffObjects is main export - diffs two objects and returns only the diffrence
 export function diffObjects(src: any, dest: any): any {
   if (!src) {
     return {};
   }
+
   Object.keys(src).forEach(key => {
     if (typeof(src[key]) === typeof(dest[key])) {
       if(src[key] === null && dest[key] === null) {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/merge.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/merge.ts
new file mode 100644
index 0000000000..39ef4cf042
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/merge.ts
@@ -0,0 +1,26 @@
+
+export function mergeObjects(src: any, ...dest: any): any {
+  // Copy src
+  const data = JSON.parse(JSON.stringify(src));
+  // Merge in all of the dest objects
+  for (const obj of dest) {
+    doMergeObjects(data, obj);
+  }
+
+  return data;
+}
+
+// merge from dest into src
+function doMergeObjects(src: any, dest: any) {
+  // Go through the keys of dest an update them in src
+  Object.keys(dest).forEach(key => {
+    if (typeof(dest[key]) === 'object' && !Array.isArray(dest)) {
+      if (!src[key]) {
+        src[key] = {};
+      }
+      doMergeObjects(src[key], dest[key]);
+    } else {
+      src[key] = dest[key]
+    }
+  });
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.ts
index fcc3ccff84..f044e91101 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.ts
@@ -65,7 +65,7 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     this.config = {
       valuesUrl: `/pp/v1/chartsvc/v1/assets/${chart.repo}/${chart.name}/versions/${chart.version}/values.yaml`,
       schemaUrl: `/pp/v1/chartsvc/v1/assets/${chart.repo}/${chart.name}/versions/${chart.version}/values.schema.json`,
-    }
+    };
 
     this.setupDetailsStep();
   }
@@ -222,7 +222,7 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     // Build the request body
     const values: HelmInstallValues = {
       ...this.details.value,
-      values: this.editor.getValues(),
+      values: JSON.stringify(this.editor.getValues()),
       chart: {
         name: this.route.snapshot.params.name,
         repo: this.route.snapshot.params.repo,
@@ -257,7 +257,7 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
             },
             message: !result.error ? '' : result.message
           }))
-        )
+        );
       })
     );
   }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts
index 2502205f7e..43d7af5f25 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts
@@ -85,7 +85,7 @@ export class UpgradeReleaseComponent {
   // Ensure the editor is resized when the overrides step becomes visible
   onEnterOverrides = () => {
     this.editor.resizeEditor();
-  }
+  };
 
   // Update the editor with the chosen version when the user moves to the next step
   onNext = (): Observable<StepOnNextResult> => {
@@ -103,10 +103,10 @@ export class UpgradeReleaseComponent {
         };
       }),
       map(() => {
-        return { success: true }
+        return { success: true };
       })
     );
-  }
+  };
 
   // Hide/show the advanced options step
   toggleAdvancedOptions() {
@@ -121,7 +121,7 @@ export class UpgradeReleaseComponent {
 
     // Add the chart url into the values
     const values: HelmUpgradeValues = {
-      values: this.editor.getValues(),
+      values: JSON.stringify(this.editor.getValues()),
       restartPods: false,
       chart: {
         name: this.version.relationships.chart.data.name,

From bc9cd1a1d0862e258bc3a56b6b5042426e0ff828 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Wed, 16 Sep 2020 13:31:35 +0100
Subject: [PATCH 622/648] Update CI pipelines (#483)

---
 deploy/ci/console-dev-releases.yml      | 4 ++--
 deploy/ci/suse-console-dev-releases.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/deploy/ci/console-dev-releases.yml b/deploy/ci/console-dev-releases.yml
index 4696f6a39b..e52789e24f 100644
--- a/deploy/ci/console-dev-releases.yml
+++ b/deploy/ci/console-dev-releases.yml
@@ -13,8 +13,8 @@ resources:
     uri: git@github.com:((stratos-repository-organization))/((stratos-repository))
     branch: ((stratos-repository-branch))
     private_key: ((github-private-key))
-    # Match any Version 3 release (alpha, beta, rc) other than the actual release
-    tag_filter: "3*-*"
+    # Match any Version 4 release (alpha, beta, rc) other than the actual release
+    tag_filter: "4*-*"
 - name: helm-repo
   type: git
   source:
diff --git a/deploy/ci/suse-console-dev-releases.yml b/deploy/ci/suse-console-dev-releases.yml
index eb40b5b8c0..e05f578318 100644
--- a/deploy/ci/suse-console-dev-releases.yml
+++ b/deploy/ci/suse-console-dev-releases.yml
@@ -14,8 +14,8 @@ resources:
     uri: git@github.com:((stratos-repository-organization))/((stratos-repository))
     branch: ((stratos-repository-branch))
     private_key: ((github-private-key))
-    # Match any Version 3 release (alpha, beta, rc) other than the actual release
-    tag_filter: "3*-*"
+    # Match any Version 4 release (alpha, beta, rc) other than the actual release
+    tag_filter: "4*-*"
 - name: helm-repo
   type: git
   source:

From 73ec30e15ae318c555a02a8d1976e615133f91fd Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Wed, 16 Sep 2020 20:56:06 +0100
Subject: [PATCH 623/648] Update package-lock (#485)

---
 package-lock.json | 1221 +++++----------------------------------------
 1 file changed, 125 insertions(+), 1096 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e9babc88f2..a7b9794ca8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "stratos",
-  "version": "4.0.1",
+  "version": "4.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -3331,916 +3331,6 @@
             "@babel/types": "^7.11.0"
           }
         },
-        "@babel/helper-validator-identifier": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
-          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
-          "dev": true
-        },
-        "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-          "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.10.4",
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
-          "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/generator": "^7.11.5",
-            "@babel/helper-function-name": "^7.10.4",
-            "@babel/helper-split-export-declaration": "^7.11.0",
-            "@babel/parser": "^7.11.5",
-            "@babel/types": "^7.11.5",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
-        "@babel/types": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^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"
-          }
-        },
-        "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/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz",
-      "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4"
-      }
-    },
-    "@babel/plugin-transform-new-target": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz",
-      "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-transform-object-super": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz",
-      "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-replace-supers": "^7.10.4"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.10.4"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.11.6",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
-          "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.11.5",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.10.4",
-            "@babel/template": "^7.10.4",
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/helper-member-expression-to-functions": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
-          "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.11.0"
-          }
-        },
-        "@babel/helper-optimise-call-expression": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
-          "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/helper-replace-supers": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
-          "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-member-expression-to-functions": "^7.10.4",
-            "@babel/helper-optimise-call-expression": "^7.10.4",
-            "@babel/traverse": "^7.10.4",
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-          "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.11.0"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
-          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
-          "dev": true
-        },
-        "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-          "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.10.4",
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
-          "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/generator": "^7.11.5",
-            "@babel/helper-function-name": "^7.10.4",
-            "@babel/helper-split-export-declaration": "^7.11.0",
-            "@babel/parser": "^7.11.5",
-            "@babel/types": "^7.11.5",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
-        "@babel/types": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^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"
-          }
-        },
-        "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/plugin-transform-parameters": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz",
-      "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-get-function-arity": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.10.4"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.11.6",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
-          "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.11.5",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.10.4",
-            "@babel/template": "^7.10.4",
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
-          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.10.4",
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
-          "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/generator": "^7.11.5",
-            "@babel/helper-function-name": "^7.10.4",
-            "@babel/helper-split-export-declaration": "^7.11.0",
-            "@babel/parser": "^7.11.5",
-            "@babel/types": "^7.11.5",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
-        "@babel/types": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^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"
-          }
-        },
-        "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/plugin-transform-property-literals": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz",
-      "integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-transform-regenerator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz",
-      "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==",
-      "dev": true,
-      "requires": {
-        "regenerator-transform": "^0.14.2"
-      }
-    },
-    "@babel/plugin-transform-reserved-words": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz",
-      "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz",
-      "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-transform-spread": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz",
-      "integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0"
-      }
-    },
-    "@babel/plugin-transform-sticky-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz",
-      "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-regex": "^7.10.4"
-      }
-    },
-    "@babel/plugin-transform-template-literals": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz",
-      "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz",
-      "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-transform-unicode-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz",
-      "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/preset-env": {
-      "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.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
-      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
-        "@babel/types": "^7.4.4",
-        "esutils": "^2.0.2"
-      }
-    },
-    "@babel/runtime": {
-      "version": "7.11.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz",
-      "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==",
-      "dev": true,
-      "requires": {
-        "regenerator-runtime": "^0.13.4"
-      }
-    },
-    "@babel/template": {
-      "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.8.3",
-        "@babel/parser": "^7.8.6",
-        "@babel/types": "^7.8.6"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.10.4"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.11.6",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
-          "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.11.5",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.10.4",
-            "@babel/template": "^7.10.4",
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/helper-member-expression-to-functions": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
-          "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.11.0"
-          }
-        },
-        "@babel/helper-module-imports": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
-          "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/helper-module-transforms": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
-          "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-module-imports": "^7.10.4",
-            "@babel/helper-replace-supers": "^7.10.4",
-            "@babel/helper-simple-access": "^7.10.4",
-            "@babel/helper-split-export-declaration": "^7.11.0",
-            "@babel/template": "^7.10.4",
-            "@babel/types": "^7.11.0",
-            "lodash": "^4.17.19"
-          }
-        },
-        "@babel/helper-optimise-call-expression": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
-          "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/helper-replace-supers": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
-          "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-member-expression-to-functions": "^7.10.4",
-            "@babel/helper-optimise-call-expression": "^7.10.4",
-            "@babel/traverse": "^7.10.4",
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/helper-simple-access": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
-          "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
-          "dev": true,
-          "requires": {
-            "@babel/template": "^7.10.4",
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-          "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.11.0"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
-          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
-          "dev": true
-        },
-        "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-          "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.10.4",
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
-          "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/generator": "^7.11.5",
-            "@babel/helper-function-name": "^7.10.4",
-            "@babel/helper-split-export-declaration": "^7.11.0",
-            "@babel/parser": "^7.11.5",
-            "@babel/types": "^7.11.5",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
-        "@babel/types": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^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"
-          }
-        },
-        "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/plugin-transform-modules-umd": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz",
-      "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.9.0",
-        "lodash": "^4.17.13",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "@cfstratos/ajsf-core": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/@cfstratos/ajsf-core/-/ajsf-core-0.1.6.tgz",
-      "integrity": "sha512-G47ZAvn7ynuUkB2XzeewxhDB9yB5EYcBWfmBYB6FeEkFzX9PpcaCm8QK72IO6Kis+HjAvO5kwqiud9TXUPhMNw==",
-      "requires": {
-        "ajv": "^6.10.0",
-        "lodash-es": "^4.17.15"
-      }
-    },
-    "@cfstratos/ajsf-material": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/@cfstratos/ajsf-material/-/ajsf-material-0.1.6.tgz",
-      "integrity": "sha512-dUV2aqwQoRCaedNh31ZVZUgDhWqdiJnikag/Nws5h4fFs6sdmL2sS8A18e6onLA8t9t4n0y8PEib6qgxqr3ezw==",
-      "requires": {
-        "@cfstratos/ajsf-core": "~0.1.5",
-        "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": {
-        "@babel/code-frame": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.10.4"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.11.6",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
-          "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.11.5",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-          "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.10.4",
-            "@babel/template": "^7.10.4",
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/helper-member-expression-to-functions": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
-          "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.11.0"
-          }
-        },
-        "@babel/helper-module-imports": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
-          "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/helper-module-transforms": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
-          "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-module-imports": "^7.10.4",
-            "@babel/helper-replace-supers": "^7.10.4",
-            "@babel/helper-simple-access": "^7.10.4",
-            "@babel/helper-split-export-declaration": "^7.11.0",
-            "@babel/template": "^7.10.4",
-            "@babel/types": "^7.11.0",
-            "lodash": "^4.17.19"
-          }
-        },
-        "@babel/helper-optimise-call-expression": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
-          "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/helper-replace-supers": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
-          "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-member-expression-to-functions": "^7.10.4",
-            "@babel/helper-optimise-call-expression": "^7.10.4",
-            "@babel/traverse": "^7.10.4",
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/helper-simple-access": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
-          "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
-          "dev": true,
-          "requires": {
-            "@babel/template": "^7.10.4",
-            "@babel/types": "^7.10.4"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-          "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.11.0"
-          }
-        },
         "@babel/highlight": {
           "version": "7.10.4",
           "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
@@ -4285,76 +3375,22 @@
             "globals": "^11.1.0",
             "lodash": "^4.17.19"
           }
-        }
-      }
-    },
-    "@jsdevtools/ono": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.2.tgz",
-      "integrity": "sha512-qS/a24RA5FEoiJS9wiv6Pwg2c/kiUo3IVUQcfeM9JvsR6pM8Yx+yl/6xWYLckZCT5jpLNhslgjiA8p/XcGyMRQ==",
-      "dev": true
-    },
-    "@ngrx/effects": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-9.2.0.tgz",
-      "integrity": "sha512-8V09zDIPehGpzgfcgyczelovsVYJvDQhN9wHt37K5A+YCG0CI8nj8FmKokHATwv/S62YqFrOVnr/TZacxpDhBw=="
-    },
-    "@ngrx/router-store": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-9.2.0.tgz",
-      "integrity": "sha512-thu6aU9YWM64oNEk4Srx/mNSeQ2SPJKlTji8MSzfr06qgCMyPSXZBYlfs8HqY+af3eB7XBEhb/4ew4JJ6xC9zw=="
-    },
-    "@ngrx/store": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-9.2.0.tgz",
-      "integrity": "sha512-V8AI3mxbMztVpbZpALkLZYlGkofKcu9GaOCY5e+sZ1VcJ90oxhFjBpnmd6MuVdmhep1XAHALb1B8ZbBFn+xsgQ=="
-    },
-    "@ngrx/store-devtools": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-9.2.0.tgz",
-      "integrity": "sha512-/FvgcpjO4IvwNFnRVoHGikAvckr6fxKf4NgYoTQ9giI8xavolLvuQUHxzH20legi5dgZz34ii2m2g1Q7OxEV8w=="
-    },
-    "@ngtools/webpack": {
-      "version": "9.1.12",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-9.1.12.tgz",
-      "integrity": "sha512-lypMXIq5oxBMsoDu/VOa1yUmmXthhxkCJa8LG0ZohfnbwhmZvz3SAW7omBGuVrb5cVIfLCkaRCSnQ1MNc6ULXw==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/core": "9.1.12",
-        "enhanced-resolve": "4.1.1",
-        "rxjs": "6.5.4",
-        "webpack-sources": "1.4.3"
-      },
-      "dependencies": {
-        "@angular-devkit/core": {
-          "version": "9.1.12",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.12.tgz",
-          "integrity": "sha512-D/GnBeSlmdgGn7EhuE32HuPuRAjvUuxi7Q6WywBI8PSsXKAGnrypghBwMATNnOA24//CgbW2533Y9VWHaeXdeA==",
-          "dev": true,
-          "requires": {
-            "ajv": "6.12.3",
-            "fast-json-stable-stringify": "2.1.0",
-            "magic-string": "0.25.7",
-            "rxjs": "6.5.4",
-            "source-map": "0.7.3"
-          }
         },
-        "ajv": {
-          "version": "6.12.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+        "@babel/types": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
           "dev": true,
           "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"
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "lodash": "^4.17.19",
+            "to-fast-properties": "^2.0.0"
           }
         },
-        "rxjs": {
-          "version": "6.5.4",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
-          "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==",
+        "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"
@@ -4368,53 +3404,10 @@
         }
       }
     },
-    "@nodelib/fs.scandir": {
-      "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.3",
-        "run-parallel": "^1.1.9"
-      }
-    },
-    "@nodelib/fs.stat": {
-      "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.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.3",
-        "fastq": "^1.6.0"
-      }
-    },
-    "@npmcli/move-file": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.0.1.tgz",
-      "integrity": "sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==",
-      "dev": true,
-      "requires": {
-        "mkdirp": "^1.0.4"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-          "dev": true
-        }
-      }
-    },
-    "@rollup/plugin-commonjs": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-11.1.0.tgz",
-      "integrity": "sha512-Ycr12N3ZPN96Fw2STurD21jMqzKwL9QuFhms3SD7KKRK7oaXUsBU9Zt0jL/rOPHiPYisI21/rXGO3jr9BnLHUA==",
+    "@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz",
+      "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==",
       "dev": true,
       "requires": {
         "@babel/helper-create-regexp-features-plugin": "^7.10.4"
@@ -4641,44 +3634,10 @@
         "regenerator-transform": "^0.14.2"
       }
     },
-    "@tootallnate/once": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
-      "dev": true
-    },
-    "@tweenjs/tween.js": {
-      "version": "17.4.0",
-      "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-17.4.0.tgz",
-      "integrity": "sha512-J3fzl1F6wvh8KXVVcIuHN12xi1ZDcPA/0Vix+ZcJYwZWVHUwfIqfvzYXXEw7ybeev6477KCTt9fKydU+ajUqcg=="
-    },
-    "@types/caseless": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz",
-      "integrity": "sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==",
-      "dev": true
-    },
-    "@types/circular-json": {
-      "version": "0.4.0",
-      "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",
-      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
-      "dev": true
-    },
-    "@types/glob": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
-      "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
+    "@babel/plugin-transform-reserved-words": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz",
+      "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -4703,28 +3662,10 @@
         "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0"
       }
     },
-    "@types/node": {
-      "version": "13.13.11",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.11.tgz",
-      "integrity": "sha512-FX7mIFKfnGCfq10DGWNhfCNxhACEeqH5uulT6wRRA1KEt7zgLe0HdrAd9/QQkObDqp2Z0KEV3OAmNgs0lTx5tQ==",
-      "dev": true
-    },
-    "@types/normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
-      "dev": true
-    },
-    "@types/q": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
-      "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
-      "dev": true
-    },
-    "@types/request": {
-      "version": "2.48.4",
-      "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.4.tgz",
-      "integrity": "sha512-W1t1MTKYR8PxICH+A4HgEIPuAC3sbljoEVfyZbeFJJDbr30guDspJri2XOaM2E+Un7ZjrihaDi7cf6fPa2tbgw==",
+    "@babel/plugin-transform-sticky-regex": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz",
+      "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
@@ -4980,6 +3921,26 @@
         "lodash-es": "^4.17.15"
       }
     },
+    "@cfstratos/monaco-yaml": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@cfstratos/monaco-yaml/-/monaco-yaml-2.5.0.tgz",
+      "integrity": "sha512-4ojHL0lnXZHHW8k2J8ipaXsl+aQj3bOXVdJEIwyhLtsJcYpq3npEiQkQs/U7ySi4Ehm/3qTdccXlilAyuWLxyw==",
+      "requires": {
+        "js-yaml": "^3.12.0",
+        "prettier": "^1.19.1",
+        "vscode-json-languageservice": "^3.8.3",
+        "vscode-languageserver": "^6.1.1",
+        "vscode-uri": "^2.1.2"
+      },
+      "dependencies": {
+        "prettier": {
+          "version": "1.19.1",
+          "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz",
+          "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==",
+          "optional": true
+        }
+      }
+    },
     "@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -6215,7 +5176,6 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
       "requires": {
         "sprintf-js": "~1.0.2"
       }
@@ -9697,8 +8657,7 @@
     "esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
     "esrecurse": {
       "version": "4.2.1",
@@ -10785,6 +9744,14 @@
       "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
       "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"
+      }
+    },
     "handle-thing": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
@@ -12554,7 +11521,6 @@
       "version": "3.13.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
       "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
-      "dev": true,
       "requires": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -12662,6 +11628,11 @@
         "minimist": "^1.2.5"
       }
     },
+    "jsonc-parser": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz",
+      "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg=="
+    },
     "jsonfile": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
@@ -12841,13 +11812,6 @@
             "path-exists": "^4.0.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",
@@ -14509,6 +13473,11 @@
         "tslib": "^1.9.0"
       }
     },
+    "ngx-monaco-editor": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/ngx-monaco-editor/-/ngx-monaco-editor-9.0.0.tgz",
+      "integrity": "sha512-fPXT3M8W920Vs0KPMX6iA7GJYjBRnl9naug9A7D2inPPzxQGtgPZrSEatIPf37a6ir9Ts+8fwt1bTkFzfTgIpQ=="
+    },
     "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
@@ -19293,8 +18262,7 @@
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
     "sshpk": {
       "version": "1.16.1",
@@ -21235,6 +20203,67 @@
       "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
       "dev": true
     },
+    "vscode-json-languageservice": {
+      "version": "3.8.4",
+      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.8.4.tgz",
+      "integrity": "sha512-njDG0+YJvYNKXH+6plQGZMxgbifATFrRpC6Qnm/SAn4IW8bMHxsYunsxrjtpqK42CVSz6Lr7bpbTEZbVuOmFLw==",
+      "requires": {
+        "jsonc-parser": "^2.3.1",
+        "vscode-languageserver-textdocument": "^1.0.1",
+        "vscode-languageserver-types": "3.16.0-next.2",
+        "vscode-nls": "^5.0.0",
+        "vscode-uri": "^2.1.2"
+      }
+    },
+    "vscode-jsonrpc": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz",
+      "integrity": "sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A=="
+    },
+    "vscode-languageserver": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz",
+      "integrity": "sha512-DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ==",
+      "requires": {
+        "vscode-languageserver-protocol": "^3.15.3"
+      }
+    },
+    "vscode-languageserver-protocol": {
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz",
+      "integrity": "sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==",
+      "requires": {
+        "vscode-jsonrpc": "^5.0.1",
+        "vscode-languageserver-types": "3.15.1"
+      },
+      "dependencies": {
+        "vscode-languageserver-types": {
+          "version": "3.15.1",
+          "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz",
+          "integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="
+        }
+      }
+    },
+    "vscode-languageserver-textdocument": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz",
+      "integrity": "sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA=="
+    },
+    "vscode-languageserver-types": {
+      "version": "3.16.0-next.2",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz",
+      "integrity": "sha512-QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q=="
+    },
+    "vscode-nls": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.0.tgz",
+      "integrity": "sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA=="
+    },
+    "vscode-uri": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz",
+      "integrity": "sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A=="
+    },
     "watchpack": {
       "version": "1.7.4",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz",

From 99ff9e9efa52ad7043f7dbd49eedc5dc1d5dc577 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Wed, 16 Sep 2020 20:56:36 +0100
Subject: [PATCH 624/648] Ensure wide helm chart logos are not cropped in chart
 list (#486)

---
 .../custom/helm/monocular/chart-item/chart-item.component.scss   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.scss b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.scss
index e42c43a10e..813c0b946e 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.scss
@@ -9,6 +9,7 @@ $chart-item-logo-width: 80px;
 
   &-logo {
     max-height: 80%;
+    max-width: 80%;
   }
 
   &-info {

From 3279924a840f80d4357d444c1ea4a6252c74c4fd Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Thu, 17 Sep 2020 07:28:42 +0100
Subject: [PATCH 625/648] Truncate fields to fit db width (#487)

---
 src/jetstream/plugins/monocular/chart_svc.go            | 2 ++
 src/jetstream/plugins/monocular/store/chart_store_db.go | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/jetstream/plugins/monocular/chart_svc.go b/src/jetstream/plugins/monocular/chart_svc.go
index 770d0d69fc..2913536a52 100644
--- a/src/jetstream/plugins/monocular/chart_svc.go
+++ b/src/jetstream/plugins/monocular/chart_svc.go
@@ -227,6 +227,8 @@ func (m *Monocular) translateToChart(record *store.ChartStoreRecord, chartYaml *
 
 	if chartYaml != nil {
 		chart.Keywords = chartYaml.Keywords
+		// Prefer the Chart Yaml description if we have it (db one might be truncated)
+		chart.Description = chartYaml.Description
 		chart.Maintainers = make([]ChartMaintainer, len(chartYaml.Maintainers))
 		for index, maintainer := range chartYaml.Maintainers {
 			chart.Maintainers[index] = *maintainer
diff --git a/src/jetstream/plugins/monocular/store/chart_store_db.go b/src/jetstream/plugins/monocular/store/chart_store_db.go
index 5fd0c92a2b..3ad7e0bd79 100644
--- a/src/jetstream/plugins/monocular/store/chart_store_db.go
+++ b/src/jetstream/plugins/monocular/store/chart_store_db.go
@@ -50,6 +50,10 @@ func NewHelmChartDBStore(dcp *sql.DB) (ChartStore, error) {
 	return &HelmChartDBStore{db: dcp}, nil
 }
 
+func truncate(in string) string {
+	return fmt.Sprintf("%.255s", in)
+}
+
 // Save a Helm Chart to the database
 func (p *HelmChartDBStore) Save(chart ChartStoreRecord, batchID string) error {
 
@@ -67,11 +71,11 @@ func (p *HelmChartDBStore) Save(chart ChartStoreRecord, batchID string) error {
 
 	if err == nil {
 		// The record already exists, so update it
-		_, err := p.db.Exec(updateChartVersion, chart.Created, chart.AppVersion, chart.Description, chart.IconURL, chart.ChartURL, sourceURL, chart.Digest, chart.IsLatest, batchID, chart.EndpointID, chart.Name, chart.Repository, chart.Version)
+		_, err := p.db.Exec(updateChartVersion, chart.Created, chart.AppVersion, truncate(chart.Description), truncate(chart.IconURL), truncate(chart.ChartURL), truncate(sourceURL), chart.Digest, chart.IsLatest, batchID, chart.EndpointID, chart.Name, chart.Repository, chart.Version)
 		return err
 	}
 
-	if _, err := p.db.Exec(saveChartVersion, chart.EndpointID, chart.Name, chart.Repository, chart.Version, chart.Created, chart.AppVersion, chart.Description, chart.IconURL, chart.ChartURL, sourceURL, chart.Digest, chart.IsLatest, batchID); err != nil {
+	if _, err := p.db.Exec(saveChartVersion, chart.EndpointID, chart.Name, chart.Repository, chart.Version, chart.Created, chart.AppVersion, truncate(chart.Description), truncate(chart.IconURL), truncate(chart.ChartURL), truncate(sourceURL), chart.Digest, chart.IsLatest, batchID); err != nil {
 		return fmt.Errorf("Unable to save Helm Chart Version: %v", err)
 	}
 	return nil

From 9a0727227c68b1d256059a3216f48f5ed2e98a83 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Thu, 17 Sep 2020 09:06:55 +0100
Subject: [PATCH 626/648] Ensure service name is correct in helm chart
 NOTES.txt (#489)

---
 deploy/kubernetes/console/templates/NOTES.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/deploy/kubernetes/console/templates/NOTES.txt b/deploy/kubernetes/console/templates/NOTES.txt
index 0d005a46fd..a423cd3600 100644
--- a/deploy/kubernetes/console/templates/NOTES.txt
+++ b/deploy/kubernetes/console/templates/NOTES.txt
@@ -9,14 +9,14 @@ From outside the cluster, the server URL is: http://{{ .Values.console.ingress.h
 {{- else }}
 Get the URL by running these commands in the same shell:
 {{- if contains "NodePort" .Values.console.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services console-ui-ext)
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ .Release.Name }}-ui-ext)
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo https://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" .Values.console.service.type }}
   NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        You can watch the status of by running 'kubectl get svc --namespace {{ .Release.Namespace }} -w console-ui-ext'
+        You can watch the status of by running 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ .Release.Name }}-ui-ext'
 
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} console-ui-ext -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ .Release.Name }}-ui-ext -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP:{{ .Values.console.service.servicePort }}
 {{- else if contains "ClusterIP"  .Values.console.service.type }}
   export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app=stratos-0,component=ui" -o jsonpath="{.items[0].metadata.name}")

From 4967c8d7b715612d89372bddbf9958878618179d Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Thu, 17 Sep 2020 10:51:13 +0100
Subject: [PATCH 627/648] Ensure the api key secret db field is long enough
 (#488)

---
 src/jetstream/datastore/20200814140918_ApiKeys.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jetstream/datastore/20200814140918_ApiKeys.go b/src/jetstream/datastore/20200814140918_ApiKeys.go
index 2a00b44365..43bc76b181 100644
--- a/src/jetstream/datastore/20200814140918_ApiKeys.go
+++ b/src/jetstream/datastore/20200814140918_ApiKeys.go
@@ -10,7 +10,7 @@ func init() {
 	RegisterMigration(20200814140918, "ApiKeys", func(txn *sql.Tx, conf *goose.DBConf) error {
 		apiTokenTable := "CREATE TABLE IF NOT EXISTS api_keys ("
 		apiTokenTable += "guid            VARCHAR(36) NOT NULL UNIQUE,"
-		apiTokenTable += "secret          VARCHAR(36) NOT NULL UNIQUE,"
+		apiTokenTable += "secret          VARCHAR(64) NOT NULL UNIQUE,"
 		apiTokenTable += "user_guid       VARCHAR(36) NOT NULL,"
 		apiTokenTable += "comment         VARCHAR(255) NOT NULL,"
 		apiTokenTable += "last_used       TIMESTAMP,"

From c0499097dd1c85d0a5c85173ec06cc8d5dde07d4 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Thu, 17 Sep 2020 15:16:29 +0100
Subject: [PATCH 628/648] Fix created date issue on helm chart re-sync (#491)

* Fix created date issue

* Typo fix, change log level
---
 src/jetstream/plugins/monocular/store/chart_store_db.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/jetstream/plugins/monocular/store/chart_store_db.go b/src/jetstream/plugins/monocular/store/chart_store_db.go
index 3ad7e0bd79..5a7561898f 100644
--- a/src/jetstream/plugins/monocular/store/chart_store_db.go
+++ b/src/jetstream/plugins/monocular/store/chart_store_db.go
@@ -7,6 +7,7 @@ import (
 	"sort"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore"
+	log "github.com/sirupsen/logrus"
 )
 
 var (
@@ -21,7 +22,7 @@ var (
 	getChartVersion    = `SELECT endpoint, name, repo_name, version, created, app_version, description, icon_url, chart_url, source_url, digest, is_latest FROM helm_charts WHERE repo_name = $1 AND name = $2 AND version = $3`
 	getChartVersions   = `SELECT endpoint, name, repo_name, version, created, app_version, description, icon_url, chart_url, source_url, digest, is_latest FROM helm_charts WHERE repo_name = $1 AND name = $2`
 	getEndpointIDs     = `SELECT DISTINCT endpoint FROM helm_charts`
-	updateChartDigest  = `UPDATE helm_charts SET is_latest=$1, update_batch=$2 WHERE endpoint=$3 AND name=$4 AND repo_name=$5 AND version=$6`
+	updateChartDigest  = `UPDATE helm_charts SET created=$1, is_latest=$2, update_batch=$3 WHERE endpoint=$4 AND name=$5 AND repo_name=$6 AND version=$7`
 )
 
 // InitRepositoryProvider - One time init for the given DB Provider
@@ -65,11 +66,13 @@ func (p *HelmChartDBStore) Save(chart ChartStoreRecord, batchID string) error {
 	// Get the existing record - if it has the same digest, then no need to store it
 	record, err := p.GetChart(chart.Repository, chart.Name, chart.Version)
 	if err == nil && record.Digest == chart.Digest {
-		_, err := p.db.Exec(updateChartDigest, chart.IsLatest, batchID, chart.EndpointID, chart.Name, chart.Repository, chart.Version)
+		log.Debugf("Chart already exists %s/%s-%s with digest %s", chart.Repository, chart.Name, chart.Version, chart.Digest)
+		_, err := p.db.Exec(updateChartDigest, chart.Created, chart.IsLatest, batchID, chart.EndpointID, chart.Name, chart.Repository, chart.Version)
 		return err
 	}
 
 	if err == nil {
+		log.Debugf("Chart already exists %s/%s-%s with different digest %s", chart.Repository, chart.Name, chart.Version, chart.Digest)
 		// The record already exists, so update it
 		_, err := p.db.Exec(updateChartVersion, chart.Created, chart.AppVersion, truncate(chart.Description), truncate(chart.IconURL), truncate(chart.ChartURL), truncate(sourceURL), chart.Digest, chart.IsLatest, batchID, chart.EndpointID, chart.Name, chart.Repository, chart.Version)
 		return err

From 29ee2f91203fa5f156c829482fc3ab2aa4bbcc7e Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Thu, 17 Sep 2020 16:37:47 +0100
Subject: [PATCH 629/648] Add chart link in charts table, refresh endpoints
 status on sync (#490)

* Add link to chart in chart list table view
-

* Refresh endpoints after sync request is sent

* Fix unit tests
---
 .../custom/helm/chart-view/monocular.component.ts  |  9 ++++++---
 .../src/custom/helm/helm-entity-generator.ts       | 14 ++++++++++++--
 .../monocular-charts-list-config.service.ts        | 11 ++++++++++-
 .../chart-details-versions.component.spec.ts       |  6 ++++--
 .../chart-details-versions.component.ts            |  9 ++++++---
 .../monocular/chart-item/chart-item.component.ts   |  7 +------
 .../monocular/shared/services/charts.service.ts    |  4 ++++
 .../tabs/catalog-tab/catalog-tab.component.spec.ts |  5 ++++-
 .../create-release/create-release.component.ts     |  2 +-
 9 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.ts
index f8cb93cdff..fd788562d4 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.ts
@@ -1,8 +1,8 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
+import { ChartsService } from '../monocular/shared/services/charts.service';
 import { createMonocularProviders } from '../monocular/stratos-monocular-providers.helpers';
-import { getMonocularEndpoint } from '../monocular/stratos-monocular.helper';
 
 
 @Component({
@@ -19,7 +19,10 @@ export class MonocularChartViewComponent implements OnInit {
 
   public title = '';
 
-  constructor(private route: ActivatedRoute) { }
+  constructor(
+    private route: ActivatedRoute,
+    private chartService: ChartsService
+  ) { }
 
   public ngOnInit() {
 
@@ -34,7 +37,7 @@ export class MonocularChartViewComponent implements OnInit {
 
     if (!!parts.version) {
       breadcrumbs.push(
-        { value: this.title, routerLink: `/monocular/charts/${getMonocularEndpoint(this.route)}/${parts.repo}/${parts.chartName}` }
+        { value: this.title, routerLink: this.chartService.getChartSummaryRoute(parts.repo, parts.chartName, null, this.route) }
       );
       this.title = parts.version;
     }
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-generator.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-generator.ts
index 8ac9945a41..23722669e3 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-generator.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-generator.ts
@@ -1,6 +1,6 @@
 import { Store } from '@ngrx/store';
 import { of } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { catchError, first, map } from 'rxjs/operators';
 
 import { IListAction } from '../../../../core/src/shared/components/list/list.component.types';
 import { AppState } from '../../../../store/src/app-state';
@@ -10,6 +10,7 @@ import {
   StratosCatalogEntity,
 } from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { StratosEndpointExtensionDefinition } from '../../../../store/src/entity-catalog/entity-catalog.types';
+import { stratosEntityCatalog } from '../../../../store/src/stratos-entity-catalog';
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
 import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types';
 import { helmEntityCatalog } from './helm-entity-catalog';
@@ -57,7 +58,16 @@ export function generateHelmEntities(): StratosBaseCatalogEntity[] {
         authTypes: [],
         endpointListActions: (store: Store<AppState>): IListAction<EndpointModel>[] => {
           return [{
-            action: (item: EndpointModel) => helmEntityCatalog.chart.api.synchronise(item),
+            action: (item: EndpointModel) => {
+              helmEntityCatalog.chart.api.synchronise(item).pipe(
+                catchError(() => null), // Be super safe to ensure we pass the first filter
+                first()
+              ).subscribe(res => {
+                if (res != null) {
+                  stratosEntityCatalog.endpoint.api.getAll();
+                }
+              });
+            },
             label: 'Synchronize',
             description: '',
             createVisible: row => row.pipe(
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-list-config.service.ts b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-list-config.service.ts
index cd41a26b0c..427a61b9ae 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-list-config.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-list-config.service.ts
@@ -15,6 +15,7 @@ import { ListView } from '../../../../../store/src/actions/list.actions';
 import { AppState } from '../../../../../store/src/app-state';
 import { defaultHelmKubeListPageSize } from '../../kubernetes/list-types/kube-helm-list-types';
 import { HELM_ENDPOINT_TYPE } from '../helm-entity-factory';
+import { ChartsService } from '../monocular/shared/services/charts.service';
 import { MonocularChart } from '../store/helm.types';
 import { MonocularChartCardComponent } from './monocular-chart-card/monocular-chart-card.component';
 import { MonocularChartsDataSource } from './monocular-charts-data-source';
@@ -29,7 +30,14 @@ export class MonocularChartsListConfig implements IListConfig<MonocularChart> {
     {
       columnId: 'name', headerCell: () => 'Name',
       cellDefinition: {
-        getValue: (row) => row.name,
+        getValue: row => row.name,
+        getLink: row => this.chartsService.getChartSummaryRoute(
+          row.attributes.repo.name,
+          row.name,
+          null,
+          null,
+          row
+        ),
       },
       sort: {
         type: 'sort',
@@ -81,6 +89,7 @@ export class MonocularChartsListConfig implements IListConfig<MonocularChart> {
     store: Store<AppState>,
     private endpointsService: EndpointsService,
     private route: ActivatedRoute,
+    private chartsService: ChartsService
   ) {
 
     this.initialised = endpointsService.endpoints$.pipe(
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.spec.ts
index 00a67df285..450d53069d 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.spec.ts
@@ -2,9 +2,10 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
 import { PanelComponent } from '../../panel/panel.component';
+import { MockChartService } from '../../shared/services/chart.service.mock';
+import { ChartsService } from '../../shared/services/charts.service';
 import { ChartDetailsVersionsComponent } from './chart-details-versions.component';
 
-/* tslint:disable:no-unused-variable */
 describe('ChartDetailsVersionsComponent', () => {
   let component: ChartDetailsVersionsComponent;
   let fixture: ComponentFixture<ChartDetailsVersionsComponent>;
@@ -12,7 +13,8 @@ describe('ChartDetailsVersionsComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ChartDetailsVersionsComponent, PanelComponent],
-      imports: [RouterTestingModule]
+      imports: [RouterTestingModule],
+      providers: [{ provide: ChartsService, useValue: new MockChartService() },]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts
index 553b028fc9..b69c28e3be 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts
@@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router';
 
 import { ChartAttributes } from '../../shared/models/chart';
 import { ChartVersion } from '../../shared/models/chart-version';
-import { getMonocularEndpoint } from '../../stratos-monocular.helper';
+import { ChartsService } from '../../shared/services/charts.service';
 
 @Component({
   selector: 'app-chart-details-versions',
@@ -15,11 +15,14 @@ export class ChartDetailsVersionsComponent {
   @Input() currentVersion: ChartVersion;
   showAllVersions: boolean;
 
-  constructor(private route: ActivatedRoute) { }
+  constructor(
+    private route: ActivatedRoute,
+    private chartService: ChartsService
+  ) { }
 
   goToVersionUrl(version: ChartVersion): string {
     const chart: ChartAttributes = version.relationships.chart.data;
-    return `/monocular/charts/${getMonocularEndpoint(this.route)}/${chart.repo.name}/${chart.name}/${version.attributes.version}`;
+    return this.chartService.getChartSummaryRoute(chart.repo.name, chart.name, version.attributes.version, this.route);
   }
 
   isSelected(version: ChartVersion): boolean {
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.ts
index e17d058c7d..777f0e8d48 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.ts
@@ -2,7 +2,6 @@ import { Component, OnInit } from '@angular/core';
 
 import { Chart } from '../shared/models/chart';
 import { ChartsService } from '../shared/services/charts.service';
-import { getMonocularEndpoint } from '../stratos-monocular.helper';
 
 @Component({
   selector: 'app-chart-item',
@@ -27,11 +26,7 @@ export class ChartItemComponent implements OnInit {
   }
 
   goToDetailUrl(): string {
-    return `/monocular/charts/${getMonocularEndpoint(null, this.chart)}/${this.chart.attributes.repo.name}/${this.chart.attributes
-      .name}`;
+    return this.chartsService.getChartSummaryRoute(this.chart.attributes.repo.name, this.chart.attributes.name, null, null, this.chart);
   }
 
-  goToRepoUrl(): string {
-    return `/monocular/charts/${getMonocularEndpoint(null, this.chart)}/${this.chart.attributes.repo.name}`;
-  }
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts
index 5d48d733b0..196f3f96eb 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts
@@ -183,6 +183,10 @@ export class ChartsService {
     }
   }
 
+  getChartSummaryRoute(repoName: string, chartName: string, version?: string, route?: ActivatedRoute, chart?: Chart): string {
+    return `/monocular/charts/${getMonocularEndpoint(route, chart)}/${repoName}/${chartName}${version ? `/${version}` : ''}`;
+  }
+
   /**
    * Store the charts in the cache
    *
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.spec.ts
index ae3ab61f3f..a772479936 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.spec.ts
@@ -1,6 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { HelmBaseTestModules } from '../../helm-testing.module';
+import { MockChartService } from '../../monocular/shared/services/chart.service.mock';
+import { ChartsService } from '../../monocular/shared/services/charts.service';
 import { CatalogTabComponent } from './catalog-tab.component';
 
 describe('CatalogTabComponent', () => {
@@ -12,7 +14,8 @@ describe('CatalogTabComponent', () => {
       imports: [
         ...HelmBaseTestModules
       ],
-      declarations: [CatalogTabComponent]
+      declarations: [CatalogTabComponent],
+      providers: [{ provide: ChartsService, useValue: new MockChartService() },]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.ts
index f044e91101..59d4a9d1d7 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.ts
@@ -59,7 +59,7 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     private chartsService: ChartsService,
   ) {
     const chart = this.route.snapshot.params as HelmChartReference;
-    this.cancelUrl = `/monocular/charts/${getMonocularEndpoint(this.route)}/${chart.repo}/${chart.name}/${chart.version}`;
+    this.cancelUrl = this.chartsService.getChartSummaryRoute(chart.repo, chart.name, chart.version, this.route);
     this.chart = chart;
 
     this.config = {

From def5429db5e43c84e7e9ffc8f4f7788a2c645f6c Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Fri, 18 Sep 2020 09:32:34 +0100
Subject: [PATCH 630/648] Update mysel helper script (#492)

---
 build/tools/mysqldb-dev.sh   | 40 +++++-------------------------------
 src/jetstream/config.dev     |  9 ++++++++
 src/jetstream/config.example |  1 +
 3 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/build/tools/mysqldb-dev.sh b/build/tools/mysqldb-dev.sh
index 94aefd952f..157410950b 100755
--- a/build/tools/mysqldb-dev.sh
+++ b/build/tools/mysqldb-dev.sh
@@ -8,39 +8,9 @@ echo $STRATOS_PATH
 docker stop stratos-db
 docker rm stratos-db
 
-ID=$(docker run --name stratos-db -d -e MYSQL_ROOT_PASSWORD=dbroot -p 3306:3306 splatform/stratos-mariadb)
-echo $ID
+IMAGE=mariadb:10.2.33
 
-rm -f dbsetup.sql init.sh
-cat <<EOF > dbsetup.sql
-CREATE DATABASE stratosdb;
-CREATE USER stratos IDENTIFIED BY 'strat0s';
-GRANT ALL PRIVILEGES ON stratosdb.* to 'stratos'@'%';
-EOF
-
-cat <<EOF > init.sh
-#!/usr/bin/env bash
-mysql -uroot -pdbroot < /dbsetup.sql
-EOF
-
-chmod +x init.sh
-docker cp ./dbsetup.sql ${ID}:/dbsetup.sql
-docker cp ./init.sh ${ID}:/init.sh
-rm dbsetup.sql init.sh
-
-#Fetch dockerize tool
-wget https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-linux-amd64-v0.6.1.tar.gz
-tar -xzvf dockerize-linux-amd64-v0.6.1.tar.gz
-rm dockerize-linux-amd64-v0.6.1.tar.gz
-
-chmod +x ./dockerize
-docker cp ./dockerize ${ID}:/dockerize
-rm dockerize
-
-#We us wait for the internal socket to come up before running init script
-echo "Just waiting a few seconds for the DB to come online ..."
-docker exec -t ${ID} /dockerize -wait file:///var/run/mysql/mysql.sock -timeout 1m
-
-docker exec -t ${ID} /init.sh
-
-echo "Database ready"
+# The container can set up users and a new database via env vars
+ID=$(docker run --name stratos-db -d -e MYSQL_DATABASE=stratosdb -e MYSQL_ROOT_PASSWORD=dbroot -e MYSQL_PASSWORD=strat0s -p 3306:3306 ${IMAGE})
+echo "Launched container: $ID"
+echo "Database started ... it may take a few seconds to complete initialization ..."
diff --git a/src/jetstream/config.dev b/src/jetstream/config.dev
index 27ec166bf3..d22fff32f8 100644
--- a/src/jetstream/config.dev
+++ b/src/jetstream/config.dev
@@ -59,3 +59,12 @@ LOCAL_USER_SCOPE=stratos.admin
 
 # Cache folder for Helm Charts
 HELM_CACHE_FOLDER=./.helm-cache
+
+# MariaDB database for local dev
+# DATABASE_PROVIDER=mysql
+# DB_HOST=127.0.0.1
+# DB_PORT=3306
+# DB_USER=stratos
+# DB_PASSWORD=strat0s
+# DB_DATABASE_NAME=stratosdb
+# DB_SSL_MODE=disable
\ No newline at end of file
diff --git a/src/jetstream/config.example b/src/jetstream/config.example
index 3723583c27..701192d521 100644
--- a/src/jetstream/config.example
+++ b/src/jetstream/config.example
@@ -58,6 +58,7 @@ INVITE_USER_CLIENT_SECRET=
 # DB_USER=stratos
 # DB_PASSWORD=strat0s
 # DB_DATABASE_NAME=stratosdb
+# DB_SSL_MODE=disable
 
 # Postgresql database for local dev
 # DATABASE_PROVIDER=pgsql

From a95b49b4c84362a4246ce4e0be39936e07306647 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Mon, 21 Sep 2020 08:43:50 +0100
Subject: [PATCH 631/648] Fix issue where charts list errors if only helm hub
 registered (#493)

* Fix issue where charts list errored if both helm hub and helm repo's are registered
- this was a regression
- we shouldn't make the call if there's no registered endpoints anyway

* Fix styling on install chart step 1
- apply flex to ensure form fields are correct width
---
 .../src/custom/helm/store/helm.effects.ts     | 38 ++++++++++++-------
 .../create-release.component.html             |  2 +-
 .../create-release.component.scss             | 17 +--------
 src/jetstream/go.sum                          |  1 +
 4 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
index 351e05ffc1..931d26902c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
@@ -31,7 +31,13 @@ import {
   WrapperRequestActionSuccess,
 } from '../../../../../store/src/types/request.types';
 import { helmEntityCatalog } from '../helm-entity-catalog';
-import { getHelmVersionId, getMonocularChartId, HELM_ENDPOINT_TYPE, HELM_HUB_ENDPOINT_TYPE } from '../helm-entity-factory';
+import {
+  getHelmVersionId,
+  getMonocularChartId,
+  HELM_ENDPOINT_TYPE,
+  HELM_HUB_ENDPOINT_TYPE,
+  HELM_REPO_ENDPOINT_TYPE,
+} from '../helm-entity-factory';
 import { Chart } from '../monocular/shared/models/chart';
 import { stratosMonocularEndpointGuid } from '../monocular/stratos-monocular.helper';
 import {
@@ -144,13 +150,10 @@ export class HelmEffects {
       const helmHubEndpoint = helmEndpoints.find(endpoint => endpoint.sub_type === HELM_HUB_ENDPOINT_TYPE);
 
       // See https://github.com/SUSE/stratos/issues/466. It would be better to use the standard proxy for this request and go out to all
-      // valid helm sub types
-      const stratosMonocular = this.httpClient.get<MonocularChartsResponse>(`/pp/${this.proxyAPIVersion}/chartsvc/v1/charts`);
-      const helmHubMonocular = helmHubEndpoint ? this.createHelmHubRequest(helmHubEndpoint.guid) : of({ data: [] });
-
+      // valid helm sub types instead of making two requests here
       return combineLatest([
-        stratosMonocular,
-        helmHubMonocular
+        this.createHelmRepoRequest(helmEndpoints),
+        this.createHelmHubRequest(helmHubEndpoint)
       ]).pipe(
         map(res => mergeMonocularChartResponses(entityKey, res)),
         mergeMap((response: NormalizedResponse) => [new WrapperRequestActionSuccess(response, action)]),
@@ -352,12 +355,21 @@ export class HelmEffects {
     };
   }
 
-  private createHelmHubRequest(endpointId: string): Observable<MonocularChartsResponse> {
-    return this.httpClient.get<MonocularChartsResponse>(`/pp/${this.proxyAPIVersion}/chartsvc/v1/charts`, {
-      headers: {
-        'x-cap-cnsi-list': endpointId
-      }
-    }).pipe(map(res => addMonocularId(endpointId, res)));
+  private createHelmHubRequest(helmHubEndpoint: EndpointModel): Observable<MonocularChartsResponse> {
+    return helmHubEndpoint ?
+      this.httpClient.get<MonocularChartsResponse>(`/pp/${this.proxyAPIVersion}/chartsvc/v1/charts`, {
+        headers: {
+          'x-cap-cnsi-list': helmHubEndpoint.guid
+        }
+      }).pipe(map(res => addMonocularId(helmHubEndpoint.guid, res))) :
+      of({ data: [] });
+  }
+
+  private createHelmRepoRequest(helmEndpoints: EndpointModel[]): Observable<MonocularChartsResponse> {
+    const helmRepoEndpoints = helmEndpoints.find(endpoint => endpoint.sub_type === HELM_REPO_ENDPOINT_TYPE);
+    return helmRepoEndpoints ?
+      this.httpClient.get<MonocularChartsResponse>(`/pp/${this.proxyAPIVersion}/chartsvc/v1/charts`) :
+      of({ data: [] });
   }
 
   private makeRequest(
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.html
index 000f286a25..8be2ac3295 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.html
@@ -3,7 +3,7 @@
 </app-page-header>
 <app-steppers [cancel]="cancelUrl">
   <app-step [title]="'Kubernetes'" [valid]="validate$ | async">
-    <form [formGroup]="details" class="stepper-form">
+    <form [formGroup]="details" class="stepper-form helm-create-release">
       <b>Select the Kubernetes cluster to install to</b>
       <mat-form-field>
         <mat-select formControlName="endpoint" name="endpoint">
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.scss
index cf807defaa..7b6b2917ab 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.scss
@@ -1,18 +1,3 @@
-:host {
-  flex: 1;
-}
-
 .helm-create-release {
-  &__heading {
-    align-items: center;
-    display: flex;
-  }
-
-  &__title {
-    flex: 1;
-    font-size: 14px;
-  }
-  &__button {
-    height: 36px;
-  }
+  flex: 1;
 }
diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index 32e2f9c513..9488234375 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -256,6 +256,7 @@ github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4er
 github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0 h1:28o5sBqPkBsMGnC6b4MvE2TzSr5/AT4c/1fLqVGIwlk=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc=
 github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=

From 8173e371ed6861a6ce7b04cddb0e3d63ed424144 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Tue, 22 Sep 2020 11:22:11 +0100
Subject: [PATCH 632/648] Fix issue where invalid yaml throws an error (#500)

---
 .../chart-values-editor/chart-values-editor.component.ts  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts
index ff0ace0e14..e3f2484b45 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts
@@ -167,7 +167,7 @@ export class ChartValuesEditorComponent implements OnInit, OnDestroy, AfterViewI
         this.schema = schema;
         if (values !== null) {
           this.chartValuesYaml = values as string;
-          this.chartValues = yaml.safeLoad(values);
+          this.chartValues = yaml.safeLoad(values, { json: true });
           // Set the form to the chart values initially, so if the user does nothing, they get the defaults
           this.initialFormData = this.chartValues;
         }
@@ -232,7 +232,7 @@ export class ChartValuesEditorComponent implements OnInit, OnDestroy, AfterViewI
       // Form -> Editor
       // Only copy if there is not an error - otherwise keep the invalid yaml from the editor that needs fixing
       if (!this.yamlError) {
-        const codeYaml = yaml.safeLoad(this.code || '{}');
+        const codeYaml = yaml.safeLoad(this.code || '{}', { json: true });
         const data = mergeObjects(codeYaml, this.formData);
         this.code = this.getDiff(data);
         this.codeOnEnter = this.code;
@@ -250,7 +250,7 @@ export class ChartValuesEditorComponent implements OnInit, OnDestroy, AfterViewI
         }
 
         // Parse as json
-        const json = yaml.safeLoad(this.code || '{}');
+        const json = yaml.safeLoad(this.code || '{}', { json: true });
         // Must be an object, otherwise it was not valid
         if (typeof (json) !== 'object') {
           throw new Error('Invalid YAML');
@@ -415,7 +415,7 @@ export class ChartValuesEditorComponent implements OnInit, OnDestroy, AfterViewI
   // Update the code editor to only show the YAML that contains the differences with the values.yaml
   diff() {
     this.confirmDialog.open(this.overwriteDiffValuesConfirmation, () => {
-      const userValues = yaml.safeLoad(this.code);
+      const userValues = yaml.safeLoad(this.code, { json: true });
       this.code = this.getDiff(userValues);
     });
   }

From ec8bb95b72ae03bb9191e2b9a01fea98e2d45459 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Tue, 22 Sep 2020 12:06:13 +0100
Subject: [PATCH 633/648] Fix duplicated repo name ids (#495)

* Fix filter by helm chart source
- To reproduce add bitnami helm repo endpoint named `bitnami`, add helm hub
  , try to filter by helm repo endpoint and nothing changes
- the helm repo bitnami charts were being overwritten by the helm hub
  bitnami charts as they were keyed the same in the store
- Fix is to ensure charts are keyed with their source

* Display helm hub label in chart summary view
---
 .../src/custom/helm/helm-entity-factory.ts    | 15 +++++----
 .../chart-details.component.html              |  3 +-
 .../chart-details/chart-details.component.ts  |  7 ++++-
 .../src/custom/helm/store/helm.effects.ts     | 31 ++++++++++---------
 4 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-factory.ts b/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-factory.ts
index 6cdf2402a9..3449e60e33 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-factory.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-factory.ts
@@ -1,15 +1,13 @@
 import { Schema, schema } from 'normalizr';
 
 import { EntitySchema } from '../../../../store/src/helpers/entity-schema';
+import { stratosMonocularEndpointGuid } from './monocular/stratos-monocular.helper';
 import { HelmVersion, MonocularChart } from './store/helm.types';
 
 export const helmVersionsEntityType = 'helmVersions';
 export const monocularChartsEntityType = 'monocularCharts';
 export const monocularChartVersionsEntityType = 'monocularChartVersions';
 
-export const getMonocularChartId = (entity: MonocularChart) => entity.id;
-export const getHelmVersionId = (entity: HelmVersion) => entity.endpointId;
-
 export const HELM_ENDPOINT_TYPE = 'helm';
 export const HELM_REPO_ENDPOINT_TYPE = 'repo';
 export const HELM_HUB_ENDPOINT_TYPE = 'hub';
@@ -39,19 +37,24 @@ export class HelmEntitySchema extends EntitySchema {
 entityCache[monocularChartsEntityType] = new HelmEntitySchema(
   monocularChartsEntityType,
   {},
-  { idAttribute: getMonocularChartId }
+  {
+    idAttribute: (entity: MonocularChart) => {
+      const monocularPrefix = entity.monocularEndpointId || stratosMonocularEndpointGuid;
+      return monocularPrefix + '/' + entity.id;
+    }
+  }
 );
 
 entityCache[helmVersionsEntityType] = new HelmEntitySchema(
   helmVersionsEntityType,
   {},
-  { idAttribute: getHelmVersionId }
+  { idAttribute: (entity: HelmVersion) => entity.endpointId }
 );
 
 entityCache[monocularChartVersionsEntityType] = new HelmEntitySchema(
   monocularChartVersionsEntityType,
   {},
-  { idAttribute: getMonocularChartId }
+  { idAttribute: (entity: MonocularChart) => entity.id }
 );
 
 export function helmEntityFactory(key: string): EntitySchema {
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.html b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.html
index 31c68dc996..f89ef9ce0a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.html
@@ -5,8 +5,7 @@ <h2>Sorry, we couldn't find the chart</h2>
   <app-loader [loading]="loading">
     <div class="chart-details__wrapper">
       <app-entity-summary-title class="summary-title" *ngIf="chart" [title]="chart.attributes.name"
-        subTitle="{{ chart.attributes.repo.name }}"
-        [subText]="chart.attributes.description" [imagePath]="iconUrl">
+        [subTitle]="chartSubTitle" [subText]="chart.attributes.description" [imagePath]="iconUrl">
         <div class="chart-details__content">
           <article class="chart-details__content__docs">
             <app-chart-details-readme [currentVersion]=currentVersion></app-chart-details-readme>
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.ts
index 5d63a62325..49f0f11661 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.ts
@@ -6,7 +6,7 @@ import { Chart } from '../shared/models/chart';
 import { ChartVersion } from '../shared/models/chart-version';
 import { ChartsService } from '../shared/services/charts.service';
 import { ConfigService } from '../shared/services/config.service';
-import { getMonocularEndpoint } from '../stratos-monocular.helper';
+import { getMonocularEndpoint, stratosMonocularEndpointGuid } from '../stratos-monocular.helper';
 
 @Component({
   selector: 'app-chart-details',
@@ -21,6 +21,7 @@ export class ChartDetailsComponent implements OnInit {
   currentVersion: ChartVersion;
   iconUrl: string;
   titleVersion: string;
+  chartSubTitle: string;
 
   loadingDelay: any;
 
@@ -43,6 +44,10 @@ export class ChartDetailsComponent implements OnInit {
           this.loading = false;
           this.initing = false;
           this.chart = chart;
+          this.chartSubTitle = chart.attributes.repo.name;
+          if (getMonocularEndpoint(this.route, chart) !== stratosMonocularEndpointGuid) {
+            this.chartSubTitle = 'Helm Hub - ' + this.chartSubTitle;
+          }
           const version = params.version || this.chart.relationships.latestChartVersion.data.version;
           this.chartsService.getVersion(repo, chartName, version).pipe(first())
             .subscribe(chartVersion => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
index 931d26902c..7a05a8c357 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
@@ -18,6 +18,7 @@ import {
 import { ClearPaginationOfType, ResetPaginationOfType } from '../../../../../store/src/actions/pagination.actions';
 import { AppState } from '../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
+import { EntitySchema } from '../../../../../store/src/helpers/entity-schema';
 import { isJetstreamError } from '../../../../../store/src/jetstream';
 import { ApiRequestTypes } from '../../../../../store/src/reducers/api-request-reducer/request-helpers';
 import { endpointOfTypeSelector } from '../../../../../store/src/selectors/endpoint.selectors';
@@ -31,13 +32,7 @@ import {
   WrapperRequestActionSuccess,
 } from '../../../../../store/src/types/request.types';
 import { helmEntityCatalog } from '../helm-entity-catalog';
-import {
-  getHelmVersionId,
-  getMonocularChartId,
-  HELM_ENDPOINT_TYPE,
-  HELM_HUB_ENDPOINT_TYPE,
-  HELM_REPO_ENDPOINT_TYPE,
-} from '../helm-entity-factory';
+import { HELM_ENDPOINT_TYPE, HELM_HUB_ENDPOINT_TYPE, HELM_REPO_ENDPOINT_TYPE } from '../helm-entity-factory';
 import { Chart } from '../monocular/shared/models/chart';
 import { stratosMonocularEndpointGuid } from '../monocular/stratos-monocular.helper';
 import {
@@ -58,7 +53,11 @@ type MonocularChartsResponse = {
   data: Chart[];
 };
 
-const mapMonocularChartResponse = (entityKey: string, response: MonocularChartsResponse): NormalizedResponse => {
+const mapMonocularChartResponse = (
+  entityKey: string,
+  response: MonocularChartsResponse,
+  schema: EntitySchema
+): NormalizedResponse => {
   const base: NormalizedResponse = {
     entities: { [entityKey]: {} },
     result: []
@@ -66,7 +65,7 @@ const mapMonocularChartResponse = (entityKey: string, response: MonocularChartsR
 
   const items = response.data as Array<any>;
   const processedData: NormalizedResponse = items.reduce((res, data) => {
-    const id = getMonocularChartId(data);
+    const id = schema.getId(data);
     res.entities[entityKey][id] = data;
     // Promote the name to the top-level object for simplicity
     data.name = data.attributes.name;
@@ -76,12 +75,16 @@ const mapMonocularChartResponse = (entityKey: string, response: MonocularChartsR
   return processedData;
 };
 
-const mergeMonocularChartResponses = (entityKey: string, responses: MonocularChartsResponse[]): NormalizedResponse => {
+const mergeMonocularChartResponses = (
+  entityKey: string,
+  responses: MonocularChartsResponse[],
+  schema: EntitySchema
+): NormalizedResponse => {
   const combined = responses.reduce((res, response) => {
     res.data = res.data.concat(response.data);
     return res;
   }, { data: [] });
-  return mapMonocularChartResponse(entityKey, combined);
+  return mapMonocularChartResponse(entityKey, combined, schema);
 };
 
 const addMonocularId = (endpointId: string, response: MonocularChartsResponse): MonocularChartsResponse => {
@@ -155,7 +158,7 @@ export class HelmEffects {
         this.createHelmRepoRequest(helmEndpoints),
         this.createHelmHubRequest(helmHubEndpoint)
       ]).pipe(
-        map(res => mergeMonocularChartResponses(entityKey, res)),
+        map(res => mergeMonocularChartResponses(entityKey, res, action.entity[0])),
         mergeMap((response: NormalizedResponse) => [new WrapperRequestActionSuccess(response, action)]),
         catchError(error => {
           const { status, message } = HelmEffects.createHelmError(error);
@@ -199,7 +202,7 @@ export class HelmEffects {
             endpointId: endpoint,
             ...endpointData
           };
-          processedData.entities[entityKey][getHelmVersionId(version)] = version;
+          processedData.entities[entityKey][action.entity[0].getId(version)] = version;
           processedData.result.push(endpoint);
         });
         return processedData;
@@ -221,7 +224,7 @@ export class HelmEffects {
 
           const items = response.data as Array<any>;
           const processedData = items.reduce((res, data) => {
-            const id = getMonocularChartId(data);
+            const id = action.entity[0].getId(data);
             res.entities[entityKey][id] = data;
             // Promote the name to the top-level object for simplicity
             data.name = data.attributes.name;

From ac2e8b717ebeafb51326a22712445ec699f9ec15 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Tue, 22 Sep 2020 13:37:03 +0100
Subject: [PATCH 634/648] Fix issue where kube terminal adds helm hub as a
 repository (#501)

---
 .../plugins/kubernetes/terminal/helpers.go    | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/terminal/helpers.go b/src/jetstream/plugins/kubernetes/terminal/helpers.go
index b34caf9a9a..634cfff1ab 100644
--- a/src/jetstream/plugins/kubernetes/terminal/helpers.go
+++ b/src/jetstream/plugins/kubernetes/terminal/helpers.go
@@ -22,6 +22,11 @@ import (
 	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
 )
 
+const (
+	helmEndpointType     = "helm"
+	helmRepoEndpointType = "repo"
+)
+
 // PodCreationData stores the clients and names used to create pod and secret
 type PodCreationData struct {
 	Namespace    string
@@ -123,7 +128,7 @@ func (k *KubeTerminal) createPod(c echo.Context, kubeConfig, kubeVersion string,
 	podSpec.Spec.EnableServiceLinks = &off
 	podSpec.Spec.RestartPolicy = "Never"
 	podSpec.Spec.DNSPolicy = "Default"
-	
+
 	volumeMountsSpec := make([]v1.VolumeMount, 1)
 	volumeMountsSpec[0].Name = "kubeconfig"
 	volumeMountsSpec[0].MountPath = "/home/stratos/.stratos"
@@ -139,7 +144,7 @@ func (k *KubeTerminal) createPod(c echo.Context, kubeConfig, kubeVersion string,
 	containerSpec[0].Env = make([]v1.EnvVar, 1)
 	containerSpec[0].Env[0].Name = "K8S_VERSION"
 	containerSpec[0].Env[0].Value = kubeVersion
-	
+
 	podSpec.Spec.Containers = containerSpec
 
 	volumesSpec := make([]v1.Volume, 1)
@@ -168,7 +173,7 @@ func (k *KubeTerminal) createPod(c echo.Context, kubeConfig, kubeVersion string,
 	for {
 		status, err := podClient.Get(pod.Name, statusOptions)
 		if err == nil && status.Status.Phase == "Running" {
-			break;
+			break
 		}
 
 		timeout = timeout - 1
@@ -219,8 +224,10 @@ func getHelmRepoSetupScript(portalProxy interfaces.PortalProxy) string {
 	}
 
 	for _, ep := range endpoints {
-		if ep.CNSIType == "helm" {
-			str += fmt.Sprintf("helm repo add %s %s > /dev/null\n", ep.Name, ep.APIEndpoint)
+		if ep.CNSIType == helmEndpointType && ep.SubType == helmRepoEndpointType {
+			// Remove spaces from the name
+			name := strings.ReplaceAll(ep.Name, " ", "_")
+			str += fmt.Sprintf("helm repo add %s %s > /dev/null\n", name, ep.APIEndpoint)
 		}
 	}
 
@@ -252,7 +259,7 @@ func (k *KubeTerminal) getKubeVersion(endpointID, userID string) (string, error)
 		// Get the version number - remove any 'v' perfix or '+' suffix
 		version := nodes.Items[0].Status.NodeInfo.KubeletVersion
 		reg, err := regexp.Compile("[^0-9\\.]+")
-    if err == nil {
+		if err == nil {
 			version = reg.ReplaceAllString(version, "")
 		}
 		parts := strings.Split(version, ".")

From 4d36e00e57b6d4225c0aa4a80fb0e02a33234f71 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Tue, 22 Sep 2020 16:39:18 +0100
Subject: [PATCH 635/648] Fix issue with Schemas on Helm Hub (#503)

* Fix issue where chart download link was not absolute
- Expected url, got chart file name
- We now check for this, if url is not absoulte assume filename and append to repo url

* Fix issue with Schemas on Helm Hub

* Update following changes in #503

* Fix issue with missing schema on upgrade for local chart

* Fix failing unit test

Co-authored-by: Richard Cox <richard.cox@suse.com>
---
 .../chart-details-info.component.ts           |  6 +-
 .../shared/services/charts.service.ts         | 60 +++++++++++++++-
 .../src/custom/helm/store/helm.types.ts       |  1 +
 .../chart-values-editor.component.html        |  2 +-
 .../chart-values-editor.component.ts          |  4 ++
 .../create-release.component.spec.ts          |  1 +
 .../create-release.component.ts               | 14 ++--
 .../tabs/helm-release-helper.service.ts       | 10 +--
 .../upgrade-release.component.spec.ts         |  5 ++
 .../upgrade-release.component.ts              | 26 ++++---
 .../kubernetes/workloads/workload.utils.ts    |  9 ---
 .../kubernetes/workloads/workloads.module.ts  |  6 +-
 src/jetstream/plugins/monocular/chart.go      |  2 +-
 src/jetstream/plugins/monocular/chart_svc.go  | 68 +++++++++++++++++++
 src/jetstream/plugins/monocular/main.go       | 15 ++--
 15 files changed, 183 insertions(+), 46 deletions(-)
 delete mode 100644 src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workload.utils.ts

diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.ts
index fad154c9d7..7a273df5e6 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.ts
@@ -26,7 +26,7 @@ export class ChartDetailsInfoComponent implements OnInit {
   @Input() set currentVersion (version: ChartVersion) {
     this._currentVersion = version;
     if (version) {
-      this.getSchema(this._currentVersion);
+      this.getSchema(this._currentVersion, this.chart);
     }
   }
 
@@ -69,8 +69,8 @@ export class ChartDetailsInfoComponent implements OnInit {
     );
   }
 
-  private getSchema(currentVersion: ChartVersion) {
-    this.chartsService.getChartSchema(currentVersion).pipe(
+  private getSchema(currentVersion: ChartVersion, chart: Chart) {
+    this.chartsService.getChartSchema(currentVersion, chart).pipe(
       first(),
       catchError(() => of(null))
     ).subscribe(schema => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts
index 196f3f96eb..80590f39ba 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts
@@ -7,6 +7,7 @@ import { catchError, map, tap } from 'rxjs/operators';
 import { getMonocularEndpoint, stratosMonocularEndpointGuid } from '../../stratos-monocular.helper';
 import { Chart } from '../models/chart';
 import { ChartVersion } from '../models/chart-version';
+import { RepoAttributes } from '../models/repo';
 import { ConfigService } from './config.service';
 
 
@@ -22,7 +23,6 @@ export class ChartsService {
     config: ConfigService,
     private route: ActivatedRoute,
   ) {
-    this.hostname = `${config.backendHostname}/chartsvc`;
     this.cacheCharts = {};
     this.hostname = '/pp/v1/chartsvc';
   }
@@ -136,8 +136,53 @@ export class ChartsService {
    * @param version Chart version
    * @return An observable that will be the json schema
    */
-  getChartSchema(chartVersion: ChartVersion): Observable<any> {
-    return chartVersion.attributes.schema ? this.http.get(`${this.hostname}${chartVersion.attributes.schema}`) : of(null);
+  getChartSchema(chartVersion: ChartVersion, chart: Chart): Observable<any> {
+    const url = this.getChartSchemaURL(chartVersion, chart.attributes.name, chart.attributes.repo);
+    return url ? this.http.get(url) : of(null);
+  }
+
+  // Get the URL for obtaining a Chart's schema
+  getChartSchemaURL(chartVersion: ChartVersion, name: string, repo: RepoAttributes): string {
+    // Helm Hub does not give us the schema information so we have to use an additional backend API to fetch the chart and check
+    if (chartVersion.attributes.schema === undefined) {
+      let url = this.getChartURL(chartVersion, repo);
+      url = btoa(url);
+      return `/pp/v1/monocular/schema/${name}/${url}`;
+    }
+
+    // We have the schema URL, so we can fetch that directly
+    return chartVersion.attributes.schema ? `${this.hostname}${chartVersion.attributes.schema}` : null;
+  }
+
+  getChartURL(chartVersion: ChartVersion, repo?: RepoAttributes): string {
+    const firstUrl = this.getFirstChartUrl(chartVersion);
+    if (firstUrl.length > 0) {
+      // Check if url is absolute, if not assume it's a filename
+      if (!firstUrl.startsWith('http://') && !firstUrl.startsWith('https://')) {
+        const repoUrl = repo ? repo.url : '';
+        return repoUrl || this.getChartRepoUrl(chartVersion) + '/' + firstUrl;
+      }
+    }
+    return firstUrl;
+  }
+
+  private getFirstChartUrl(chart: ChartVersion): string {
+    if (chart && chart.attributes && chart.attributes.urls && chart.attributes.urls.length > 0) {
+      return chart.attributes.urls[0];
+    }
+    return '';
+  }
+
+  private getChartRepoUrl(chart: ChartVersion): string {
+    if (chart &&
+      chart.relationships &&
+      chart.relationships.chart &&
+      chart.relationships.chart.data &&
+      chart.relationships.chart.data.repo
+    ) {
+      return chart.relationships.chart.data.repo.url;
+    }
+    return '';
   }
 
   /**
@@ -168,6 +213,15 @@ export class ChartsService {
     );
   }
 
+  getVersionFromEndpoint(endpoint: string, repo: string, chartName: string, version: string): Observable<ChartVersion> {
+    const requestArgs  = { headers: { 'x-cap-cnsi-list': endpoint !== stratosMonocularEndpointGuid ? endpoint :'' } };
+    return this.http.get(
+      `${this.hostname}/v1/charts/${repo}/${chartName}/versions/${version}`, requestArgs).pipe(
+      map(this.extractData),
+      catchError(this.handleError)
+    );
+  }
+
   /**
    * Get the URL for retrieving the chart's icon
    *
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.types.ts b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.types.ts
index fc79d7039c..0bee35fc0e 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.types.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.types.ts
@@ -46,6 +46,7 @@ export enum HelmStatus {
 }
 
 export interface HelmChartReference {
+  endpoint?: string;
   name: string;
   repo: string;
   version: string;
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.html
index 2baa79aaf0..2b5bf1b3fd 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.html
@@ -1,5 +1,5 @@
 <mat-card class="editor-card">
-  <div *ngIf="loading$ | async" class="editor-loading">
+  <div *ngIf="initing || (loading$ | async)" class="editor-loading">
     <div>
       <div class="editor-loading__msg">Loading ...</div>
       <mat-progress-bar class="editor-loading__progress-bar" [color]="'primary'" mode="indeterminate"></mat-progress-bar>      
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts
index e3f2484b45..d7621a5e9b 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts
@@ -98,6 +98,8 @@ export class ChartValuesEditorComponent implements OnInit, OnDestroy, AfterViewI
   // Observable - are we still loading resources?
   public loading$: Observable<boolean>;
 
+  public initing = true;
+
   // Observable for tracking if the Monaco editor has loaded
   private monacoLoaded$ = new BehaviorSubject<boolean>(false);
 
@@ -191,6 +193,8 @@ export class ChartValuesEditorComponent implements OnInit, OnDestroy, AfterViewI
       map(([schema, values, loaded]) => !loaded),
       startWith(true)
     );
+
+    this.initing = false;
   }
 
   ngAfterViewInit(): void {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.spec.ts
index 00adc0ba34..9de5331552 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.spec.ts
@@ -47,6 +47,7 @@ describe('CreateReleaseComponent', () => {
 
   beforeEach(() => {
     fixture = TestBed.createComponent(CreateReleaseComponent);
+    httpMock.expectOne('/pp/v1/chartsvc/v1/charts/undefined/undefined/versions/undefined');
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.ts
index 59d4a9d1d7..438c58c404 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.ts
@@ -19,7 +19,6 @@ import { HelmChartReference, HelmInstallValues } from '../../../helm/store/helm.
 import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes-entity-factory';
 import { KubernetesNamespace } from '../../store/kube.types';
-import { getFirstChartUrl } from '../workload.utils';
 import { ChartValuesConfig, ChartValuesEditorComponent } from './../chart-values-editor/chart-values-editor.component';
 
 @Component({
@@ -62,10 +61,13 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     this.cancelUrl = this.chartsService.getChartSummaryRoute(chart.repo, chart.name, chart.version, this.route);
     this.chart = chart;
 
-    this.config = {
-      valuesUrl: `/pp/v1/chartsvc/v1/assets/${chart.repo}/${chart.name}/versions/${chart.version}/values.yaml`,
-      schemaUrl: `/pp/v1/chartsvc/v1/assets/${chart.repo}/${chart.name}/versions/${chart.version}/values.schema.json`,
-    };
+    // Fetch the Chart Version metadata so we can get the correct URL for the Chart's JSON Schema
+    this.chartsService.getVersion(this.chart.repo, this.chart.name, this.chart.version).pipe(first()).subscribe(ch => {
+      this.config = {
+        valuesUrl: `/pp/v1/monocular/values/${this.chart.endpoint}/${this.chart.repo}/${chart.name}/${this.chart.version}`,
+        schemaUrl: this.chartsService.getChartSchemaURL(ch, ch.relationships.chart.data.name, ch.relationships.chart.data.repo)
+      };
+    });
 
     this.setupDetailsStep();
   }
@@ -238,7 +240,7 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
           throw new Error('Could not get Chart URL');
         }
         // Add the chart url into the values
-        values.chartUrl = getFirstChartUrl(chartInfo);
+        values.chartUrl = this.chartsService.getChartURL(chartInfo);
         if (values.chartUrl.length === 0) {
           throw new Error('Could not get Chart URL');
         }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
index d3af46d384..93dffcc4e4 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
@@ -257,21 +257,17 @@ export class HelmReleaseHelperService {
   // We don't know which Helm repository it came from, so use the name and sources to match
   private isProbablySameChart(a: ChartMetadata, b: ChartMetadata): boolean {
     // Basic properties must be the same
-    if ((a.name !== b.name) || (a.sources.length !== b.sources.length)) {
+    if (a.name !== b.name) {
       return false;
     }
 
-    // Sources must match
+    // Must have at least one source in common
     let count = 0;
     a.sources.forEach(source => {
       count += b.sources.findIndex((s) => s === source) === -1 ? 0 : 1;
     });
 
-    if (count !== a.sources.length) {
-      return false;
-    }
-
-    return true;
+    return count > 0;
   }
 
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.spec.ts
index f77dc54235..c3151ef19b 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.spec.ts
@@ -1,5 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { MockChartService } from '../../../helm/monocular/shared/services/chart.service.mock';
+import { ChartsService } from '../../../helm/monocular/shared/services/charts.service';
+import { ConfigService } from '../../../helm/monocular/shared/services/config.service';
 import { HelmReleaseProviders, KubeBaseGuidMock } from '../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
 import { WorkloadsBaseTestingModule } from '../workloads.testing.module';
@@ -20,6 +23,8 @@ describe('UpgradeReleaseComponent', () => {
         KubernetesEndpointService,
         KubeBaseGuidMock,
         ...HelmReleaseProviders,
+        { provide: ChartsService, useValue: new MockChartService() },
+        { provide: ConfigService, useValue: { appName: 'appName' } },
       ]
     })
     .compileComponents();
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts
index 43d7af5f25..8d4b789437 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts
@@ -1,7 +1,7 @@
 import { Component, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
-import { Observable, of } from 'rxjs';
+import { combineLatest, Observable, of } from 'rxjs';
 import { filter, first, map, pairwise, tap } from 'rxjs/operators';
 
 import {
@@ -10,12 +10,13 @@ import {
   StepOnNextResult,
 } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types';
+import { ChartsService } from '../../../helm/monocular/shared/services/charts.service';
+import { createMonocularProviders } from '../../../helm/monocular/stratos-monocular-providers.helpers';
 import { stratosMonocularEndpointGuid } from '../../../helm/monocular/stratos-monocular.helper';
 import { HelmUpgradeValues, MonocularVersion } from '../../../helm/store/helm.types';
 import { ChartValuesConfig, ChartValuesEditorComponent } from '../chart-values-editor/chart-values-editor.component';
 import { HelmReleaseHelperService } from '../release/tabs/helm-release-helper.service';
 import { HelmReleaseGuid } from '../workload.types';
-import { getFirstChartUrl } from '../workload.utils';
 import { workloadsEntityCatalog } from './../workloads-entity-catalog';
 import { ReleaseUpgradeVersionsListConfig } from './release-version-list-config';
 
@@ -33,7 +34,8 @@ import { ReleaseUpgradeVersionsListConfig } from './release-version-list-config'
       deps: [
         ActivatedRoute
       ]
-    }
+    },
+    ...createMonocularProviders()
   ]
 })
 export class UpgradeReleaseComponent {
@@ -54,7 +56,8 @@ export class UpgradeReleaseComponent {
 
   constructor(
     store: Store<any>,
-    public helper: HelmReleaseHelperService
+    public helper: HelmReleaseHelperService,
+    private chartsService: ChartsService,
   ) {
 
     this.cancelUrl = `/workloads/${this.helper.guid}`;
@@ -91,14 +94,19 @@ export class UpgradeReleaseComponent {
   onNext = (): Observable<StepOnNextResult> => {
     const chart = this.version.relationships.chart.data;
     const version = this.version.attributes.version;
+    const endpointID = this.monocularEndpointId || stratosMonocularEndpointGuid;
+
 
     // Fetch the release metadata so that we have the values used to install the current release
-    return this.helper.release$.pipe(
+    return combineLatest(
+      [this.helper.release$, this.chartsService.getVersionFromEndpoint(endpointID, chart.repo.name, chart.name, version)]
+    ).pipe(
       first(),
-      tap(release => {
+      tap(([release, chartVersionDetail]) => {
+        const schemaUrl = this.chartsService.getChartSchemaURL(chartVersionDetail, chart.name, chart.repo);
         this.config = {
-          schemaUrl: `/pp/v1/chartsvc/v1/assets/${chart.repo.name}/${chart.name}/versions/${version}/values.schema.json`,
-          valuesUrl: `/pp/v1/chartsvc/v1/assets/${chart.repo.name}/${chart.name}/versions/${version}/values.yaml`,
+          schemaUrl,
+          valuesUrl: `/pp/v1/monocular/values/${endpointID}/${chart.repo.name}/${chart.name}/${version}`,
           releaseValues: release.config
         };
       }),
@@ -129,7 +137,7 @@ export class UpgradeReleaseComponent {
         version: this.version.attributes.version,
       },
       monocularEndpoint: this.monocularEndpointId === stratosMonocularEndpointGuid ? null : this.monocularEndpointId,
-      chartUrl: getFirstChartUrl(this.version)
+      chartUrl: this.chartsService.getChartURL(this.version)
     };
 
     // Make the request
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workload.utils.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workload.utils.ts
deleted file mode 100644
index 7c8fb71baa..0000000000
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workload.utils.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { ChartVersion } from '../../helm/monocular/shared/models/chart-version';
-
-// Get first URL for a Chart or return empty string if none
-export function getFirstChartUrl(chart: ChartVersion): string {
-  if (chart && chart.attributes && chart.attributes.urls && chart.attributes.urls.length > 0) {
-    return chart.attributes.urls[0];
-  }
-  return '';
-}
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
index 7359657da2..341c83d740 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
@@ -14,6 +14,7 @@ import { HelmReleaseTabBaseComponent } from './release/helm-release-tab-base/hel
 import {
   HelmReleaseAnalysisTabComponent,
 } from './release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component';
+import { HelmReleaseHistoryTabComponent } from './release/tabs/helm-release-history-tab/helm-release-history-tab.component';
 import { HelmReleaseNotesTabComponent } from './release/tabs/helm-release-notes-tab/helm-release-notes-tab.component';
 import { HelmReleasePodsTabComponent } from './release/tabs/helm-release-pods/helm-release-pods-tab.component';
 import {
@@ -22,12 +23,11 @@ import {
 import { HelmReleaseServicesTabComponent } from './release/tabs/helm-release-services/helm-release-services-tab.component';
 import { HelmReleaseSummaryTabComponent } from './release/tabs/helm-release-summary-tab/helm-release-summary-tab.component';
 import { HelmReleaseValuesTabComponent } from './release/tabs/helm-release-values-tab/helm-release-values-tab.component';
+import { WorkloadLiveReloadComponent } from './release/workload-live-reload/workload-live-reload.component';
 import { HelmReleasesTabComponent } from './releases-tab/releases-tab.component';
 import { WorkloadsStoreModule } from './store/workloads.store.module';
 import { UpgradeReleaseComponent } from './upgrade-release/upgrade-release.component';
 import { WorkloadsRouting } from './workloads.routing';
-import { HelmReleaseHistoryTabComponent } from './release/tabs/helm-release-history-tab/helm-release-history-tab.component';
-import { WorkloadLiveReloadComponent } from './release/workload-live-reload/workload-live-reload.component';
 
 // Default config for the Monaco edfior
 const monacoConfig: NgxMonacoEditorConfig = {
@@ -68,7 +68,7 @@ const monacoConfig: NgxMonacoEditorConfig = {
     HelmReleaseCardComponent
   ],
   providers: [
-    DatePipe
+    DatePipe,
   ]
 })
 export class WorkloadsModule { }
diff --git a/src/jetstream/plugins/monocular/chart.go b/src/jetstream/plugins/monocular/chart.go
index 70e9c4a763..3b486aff12 100644
--- a/src/jetstream/plugins/monocular/chart.go
+++ b/src/jetstream/plugins/monocular/chart.go
@@ -51,7 +51,7 @@ type ChartVersion struct {
 	URLs       []string  `json:"urls"`
 	Readme     string    `json:"readme,omitempty"`
 	Values     string    `json:"values,omitempty"`
-	Schema     string    `json:"schema,omitempty"`
+	Schema     string    `json:"schema"`
 }
 
 //RepoCheck describes the state of a repository in terms its current checksum and last update time.
diff --git a/src/jetstream/plugins/monocular/chart_svc.go b/src/jetstream/plugins/monocular/chart_svc.go
index 2913536a52..79a192bebf 100644
--- a/src/jetstream/plugins/monocular/chart_svc.go
+++ b/src/jetstream/plugins/monocular/chart_svc.go
@@ -1,6 +1,7 @@
 package monocular
 
 import (
+	"encoding/base64"
 	"errors"
 	"fmt"
 	"net/http"
@@ -197,6 +198,73 @@ func (m *Monocular) getChartAndVersionFile(c echo.Context) error {
 	return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Can not find file %s for the specified chart", filename))
 }
 
+func (m *Monocular) getChartValues(c echo.Context) error {
+	endpointID := c.Param("endpoint")
+	repo := c.Param("repo")
+	chartName := c.Param("name")
+	version := c.Param("version")
+
+	// Built in Monocular
+	if endpointID == "default" {
+		filename := "values.yaml"
+		log.Debugf("Get chart file: %s", filename)
+		chart, err := m.ChartStore.GetChart(repo, chartName, version)
+		if err != nil {
+			return err
+		}
+		if m.cacheChart(*chart) == nil {
+			return c.File(path.Join(m.getChartCacheFolder(*chart), filename))
+		}
+		return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Can not find file %s for the specified chart", filename))
+	}
+
+	// Helm Hub
+	// Change the URL and then forward on
+	p := fmt.Sprintf("/chartsvc/v1/assets/%s/%s/versions/%s/values.yaml", repo, chartName, version)
+	monocularEndpoint, err := m.validateExternalMonocularEndpoint(endpointID)
+	if monocularEndpoint == nil || err != nil {
+		return echo.NewHTTPError(http.StatusBadRequest, errors.New("No monocular endpoint"))
+	}
+
+	return m.proxyToMonocularInstance(c, monocularEndpoint, p)
+}
+
+// Check to see if the given chart URL has a schema
+func (m *Monocular) checkForJsonSchema(c echo.Context) error {
+	log.Debug("checkForJsonSchema called")
+
+	chartName := c.Param("name")
+	encodedChartURL := c.Param("encodedChartURL")
+	url, err := base64.StdEncoding.DecodeString(encodedChartURL)
+	if err != nil {
+		return err
+	}
+
+	chartURL := string(url)
+
+	chartCachePath := path.Join(m.CacheFolder, "schemas", encodedChartURL)
+	if err := m.ensureFolder(chartCachePath); err != nil {
+		log.Warnf("checkForJsonSchema: Could not create folder for chart downloads: %+v", err)
+		return err
+	}
+
+	// We can delete the Chart archive - don't need it anymore
+	defer os.RemoveAll(chartCachePath)
+
+	archiveFile := path.Join(chartCachePath, "chart.tgz")
+	if err := m.downloadFile(archiveFile, chartURL); err != nil {
+		return fmt.Errorf("Could not download chart from: %s - %+v", chartURL, err)
+	}
+
+	// Now extract the files we need
+	filenames := []string{"values.schema.json"}
+	if err := extractArchiveFiles(archiveFile, chartName, chartCachePath, filenames); err != nil {
+		return fmt.Errorf("Could not extract files from chart archive: %s - %+v", archiveFile, err)
+	}
+
+	return c.File(path.Join(chartCachePath, "values.schema.json"))
+}
+
 // This is the simpler version that returns just enough data needed for the Charts list view
 // This is a slight cheat - the response is not as complete as the Monocular API, but includes
 // enough for the UI and saves us having to pull out all of the Chart.yaml files
diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go
index b5c46f2e58..9315381a2b 100644
--- a/src/jetstream/plugins/monocular/main.go
+++ b/src/jetstream/plugins/monocular/main.go
@@ -171,6 +171,9 @@ func (m *Monocular) AddSessionGroupRoutes(echoGroup *echo.Group) {
 	// however cannot be done for things like img src
 	echoGroup.Any("/monocular/:guid/chartsvc/*", m.handleMonocularInstance)
 
+	echoGroup.Any("/monocular/schema/:name/:encodedChartURL", m.checkForJsonSchema)
+	echoGroup.Any("/monocular/values/:endpoint/:repo/:name/:version", m.getChartValues)
+
 	echoGroup.POST("/chartrepos/:guid", m.syncRepo)
 	echoGroup.POST("/chartrepos/status", m.getRepoStatuses)
 
@@ -290,7 +293,6 @@ func (m *Monocular) baseHandleMonocularInstance(c echo.Context, monocularEndpoin
 	// by the 'authHandler' associated with the endpoint OR defaults to an OAuth request. For this case there's no auth at all so falls over.
 	// Tracked in https://github.com/SUSE/stratos/issues/466
 
-	url := monocularEndpoint.APIEndpoint
 	path := c.Request().URL.Path
 	log.Debug("URL to monocular requested: %v", path)
 	if strings.Index(path, stratosPrefix) == 0 {
@@ -308,13 +310,18 @@ func (m *Monocular) baseHandleMonocularInstance(c echo.Context, monocularEndpoin
 			parts = parts[2:]
 		}
 
-		// Bring all back together
-		url.Path += "/" + strings.Join(parts, "/")
+		path = "/" + strings.Join(parts, "/")
 	}
+
+	return m.proxyToMonocularInstance(c, monocularEndpoint, path)
+}
+
+func (m *Monocular) proxyToMonocularInstance(c echo.Context, monocularEndpoint *interfaces.CNSIRecord, path string) error {
+	url := monocularEndpoint.APIEndpoint
 	log.Debugf("URL to monocular: %v", url.String())
+	url.Path += path
 
 	req, err := http.NewRequest(c.Request().Method, url.String(), nil)
-
 	removeBreakingHeaders(c.Request(), req)
 
 	client := &http.Client{Timeout: 30 * time.Second}

From 9742e5d665be01f4a55be3fd69b8f18b8b157973 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Tue, 22 Sep 2020 16:51:15 +0100
Subject: [PATCH 636/648] Merge upstream (#504)

* Ensure filename/no filename text in connect by file dialog is aligned (#4474)

- needs porting back

* Add typed entity access and `custom-src` removal to change log (#4496)

* Fixes #4335: Create Stratos static web site with better documentation (#4446)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* * Review comments fix

* Fix broken link to an image in frontend extensions doc

* Final tweaks

Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Richard Cox <richard-cox@users.noreply.github.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard Cox <richard.cox@suse.com>

* Fix and update customization docs (#4478)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* Apply new theming process to acme example

* First pass at customization docs, most of themeing done

* Final pass at customization docs

* Merge fixes

Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update base README, point to website (#4488)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* Apply new theming process to acme example

* First pass at customization docs, most of themeing done

* Final pass at customization docs

* Update base README, point to website

Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update developer docs (#4489)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* Apply new theming process to acme example

* First pass at customization docs, most of themeing done

* Final pass at customization docs

* Update base README, point to website

* Update developer docs
Still need an overhall, but updated to remove incorrect data and apply website context

Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix docs (#4497)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* Apply new theming process to acme example

* First pass at customization docs, most of themeing done

* Final pass at customization docs

* Update base README, point to website

* Update developer docs
Still need an overhall, but updated to remove incorrect data and apply website context

* Fix PR template

Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Ensure images dependent on techPreview flag are included in imagelist.txt (#4500)

* Improve clean-symlinks script (#4509)

* Add support for including breaking changes in the changelog

* Improve clean-symlinks script

* Update changelog.sh

* Update changelog.sh

* Remove trailing line

* Remove tailing line

* Change nginx ciphers and make configurable via helm chart values (#4507)

* Change nginx ciphers and make configurable via helm chart values

* Add support for including breaking changes in the changelog

* Improve clean-symlinks script

* Update changelog.sh

* Update changelog.sh

* Remove trailing line

* Remove tailing line

* Fix bug with cert path patching

* Fig bug where protocols not patched

* Update version to 4.0.1, add change log (#4514)

* Update version to 4.0.1, add change log

* Update package-lock

* Fix deploy from gitlab using a group's repo (#4479)

- only supported user based repos
- fixes #4153

* Add additional time ranges to base metrics range selector (#4480)

- fixes https://github.com/SUSE/stratos/issues/415

* Add some time saving comments to cf permissions checker (#4508)

* Move tab-nav and xsrf module source files to the src folder (#4518)

* Move tab-nav files

* Move xsrf module

* Fix GitHub branch limit (#4510)

* Ensure we fetch all repo's and branches when deploying github apps

* Ensure we only fetch branches once
- SUSE/stratos vs suse/stratos
- ensure branches are treated as 'local' lists

* Increate page size for github commits and gitlab requests

* Remove use of nodejs util module (#4521)

* Remove use of nodejs util module

* Fix comment typo

* Remove dependencies between store and core that have crept in (#4517)

* Remove dependencies between store and core that have crept in

* Fix issue with unit tests

* Import fixes and unit test fix

* Fix store testing package (#4520)

* Fix store testing package

* Update public-api.ts

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

* Fix the position of the header guide array (#4524)

- shown when there are no registered endpoints (and some incoming scenarios)
- position is determined by location of associated button in header
- position of button can change given visibility of other buttons (notification bell, endpoint backup, etc)
- now check positiion after a delay, add fade in to mask delay

* Metrics: Ensure trailing slashes are ignored when comparing URLs (#4527)

* Remove imports of the form 'frontend/....' (#4519)

* Move tab-nav files

* Move xsrf module

* Remove imports of the form 'frontend/...'

* Move endpopints-health-check.ts (#4530)

* Add UMD Ids to external modules in store package (#4522)

* Add UMB Ids to external modules in store package

* Add moment

* Address PR feedback

* Improvements & more checks to autoscaler scheduled date tests (#4535)

- allow more time to skip between date and time values in date fields
- add a check to
- add checks to ensure we have the correct number of scheduled date rules

* Remove api driven views (#4537)

* Remove logger service and action history (#4538)

* Remove logger service

* Missed a few and removed action history as it was not being used

* Remove action history

* A few more

* Fix for removed method

* Add support for API keys (#4515)

* Add backend support for API keys

* Add last_used field to API keys

* Use secure random value as key secret

* Add tests for ListAPIKeys and AddAPIKey

* Cover the rest of psql_apikeys.go with tests

* Refactor the code a bit

* Storing SQL queries in a struct should ensure that
`datastore.ModifySQLStatement` gets called on all of them.
* A wrapper func around `db.Exec` reduces copypasta.
* Actually call `InitRepositoryProvider` for API keys package

* Add route handler tests using gomock

* Actually use skipper in xsrfMiddleware; minor clean-up

* Update moment imports to remove warning when building library (#4534)

* Update moment imports to remove warning when building library

* Fix references to moment-timezone and markdown
- contains some changes to e2e tests as well, might need to be reverted

* Fix unit test

* Fix `import *` in e2e tests

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

* Fix Helm upgrade bug (#4544)

* Fix Helm upgrade bug

* Fix unit tests

* Store api_keys.last_used in UTC (#4541)

* Add UI for Stratos API Keys (#4523)

* Add backend support for API keys

* Add last_used field to API keys

* Add base api keys page

* Add basic api key entity framework (untested)

* Add a basic api keys list (untested, need to wire in properties/columns + actions)

* Fix entity type related issues

* Add basic way to create api key

* Wire in delete to list

* Improve 'no api keys' ux

* Final tidy up

* Other fixes

* Fix unit tests

* Add 'Last Used' column to API keys list

* Don't flash up 'no entries' when we haven't loaded api keys yet

* Fix last used sorting
- takes into account timezone
- use cacheing to cater for often called sort

* Fix unit test after changes in master

* Fix after moment change

* Remove now unrequired sorting of api key last used date via moment

Co-authored-by: Ivan Kapelyukhin <ikapelyukhin@suse.com>

* Add basic e2e tests for API Keys (#4536)

* Add backend support for API keys

* Add last_used field to API keys

* Add base api keys page

* Add basic api key entity framework (untested)

* Add a basic api keys list (untested, need to wire in properties/columns + actions)

* Fix entity type related issues

* Add basic way to create api key

* Wire in delete to list

* Improve 'no api keys' ux

* Final tidy up

* Other fixes

* Fix unit tests

* Add basic e2e tests for api keys

* Add 'Last Used' column to API keys list

* Don't flash up 'no entries' when we haven't loaded api keys yet

* Fix last used sorting
- takes into account timezone
- use cacheing to cater for often called sort

* Fix unit test after changes in master

* Fix after moment change

* Beef up test, fix for initial empty state

* Remove now unrequired sorting of api key last used date via moment

Co-authored-by: Ivan Kapelyukhin <ikapelyukhin@suse.com>

* Bump docusaurus version and add support for versioning  (#4506)

* Bump docusaurus version and versioning
- Bump docusaurus to latest 2.0 version
- Fix errors thrown up by new linting process
- Add version support, setup 4.0.0
- Enable dark mode and fix in home screen

* Move status_updates back into root project docs folder

* Fix links
- fix dead links
- ensure all links are relative (so work when versioned)

* Remove version 4.0.0

* WIP

* WIP

* Completed

* Temporarily remove docsVersionDropdown until first version added to internal-versions

* Update website docs

* Build fix for temp situation where there's no versions

* Add custom version of 'not latest released docs' message

* Improve versioning and dark mode toggle
- Add `All Versions page`
- Conditionally include versions in drop down
- Improve dark mode toggle icons

* Temporarily remove dependent on versions
- will be added back in when 4.0 sha is known

* Update Versions Process

* Add 4.0.0

* Fix in `build`/`serve` world
- worked fine in `start` world...

* Update 4.0.0 with temp version

* Multiple improvements
- Fix clean git repo before run
- Swizzle docs version drop down nav bar item, move in custom code
- Improve docs (latest version must appear in drop down)

* Changes following review

* Reduce font in version warning

* API Keys: Make feature configurable for different user types (#4540)

* Add a special type and parsing for the new config option

* Add APIKeysEnabled to /info, check it in the middleware

* Add test coverage for apiKeyMiddleware

* Block API keys endpoints if disabled in the config; add tests

* Fix failing test

* Add API_KEYS_ENABLED to the Helm chart

* Add JSON schema to the Helm chart

* Add docs for UAA SSO user permissions management (#4554)

* Bump docusaurus version and versioning
- Bump docusaurus to latest 2.0 version
- Fix errors thrown up by new linting process
- Add version support, setup 4.0.0
- Enable dark mode and fix in home screen

* Move status_updates back into root project docs folder

* Fix links
- fix dead links
- ensure all links are relative (so work when versioned)

* Remove version 4.0.0

* WIP

* WIP

* Completed

* Temporarily remove docsVersionDropdown until first version added to internal-versions

* Update website docs

* Build fix for temp situation where there's no versions

* Add custom version of 'not latest released docs' message

* Improve versioning and dark mode toggle
- Add `All Versions page`
- Conditionally include versions in drop down
- Improve dark mode toggle icons

* Temporarily remove dependent on versions
- will be added back in when 4.0 sha is known

* Update Versions Process

* Add 4.0.0

* Fix in `build`/`serve` world
- worked fine in `start` world...

* Update 4.0.0 with temp version

* Add troubleshooting section for SSO

* Update SSO auth troubleshooting section

* Add basic developers guide for working with helm (#4511)

* Bump docusaurus version and versioning
- Bump docusaurus to latest 2.0 version
- Fix errors thrown up by new linting process
- Add version support, setup 4.0.0
- Enable dark mode and fix in home screen

* Move status_updates back into root project docs folder

* Fix links
- fix dead links
- ensure all links are relative (so work when versioned)

* Add basic developers guide for working with helm

* Fix post merge issue

* Enable/disable API keys UI given API keys config setting (#4559)

* Add a special type and parsing for the new config option

* Add APIKeysEnabled to /info, check it in the middleware

* Add test coverage for apiKeyMiddleware

* Block API keys endpoints if disabled in the config; add tests

* Fix failing test

* Add API_KEYS_ENABLED to the Helm chart

* Add JSON schema to the Helm chart

* Enable/disable API keys UI given API keys config setting

* Changes following review

* Fix unit tests

Co-authored-by: Ivan Kapelyukhin <ikapelyukhin@suse.com>

* Enable linting for all packages (#4561)

* Enable linting for all packages
- lots to solve!
- we may wish to exclude some files

* Fix linting

* Bump angular json schema form (#4564)

* Bump angular json schema form

* Handle bug where mat-error maring is too big
- We may want to consider moving this upstream

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

* Docs: Update internal versions & Automate future updates  (#4558)

* Docs: Update where 4.0.0 is built from, add 4.0.1
- means we can delete the old `docs-versioning` branch
- both versions point to the same commit (when branch merged to master),
  but reduces user confusion when they can't find the docs for the latest
  released version. Going forward this will point directly to the release label

* Automatically update website's internal-versions.json on new releases
- Add new github action
- Action will trigger on a release being published
- Action looks at github `release` object associated with event and extracts
  a version label and git label
- Use extracted values adds new value to internal-versions.json
- Creates a PR with the change

* Fix checkout issue

* Update documentation-versioning.yml

* Fix nightly tage reference and names (#4574)

* [Security] Bump node-fetch from 2.6.0 to 2.6.1 (#4572)

Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.6.0 to 2.6.1. **This update includes a security fix.**
- [Release notes](https://github.com/bitinn/node-fetch/releases)
- [Changelog](https://github.com/node-fetch/node-fetch/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/bitinn/node-fetch/compare/v2.6.0...v2.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Merge changes from downstream (#4567)

- json schema form mat-error styling fix
- info & border style colors
- desktop style fixes
- changes to breadcrumbs
- sidenav dark mode fix
- new functionality for card-number-metric component
- filter endpoint by type
- more info in stepper onNext fn
- SessionService with isTechPreview
- Add reset pagination of type action/reducer
- Fix cf endpoint sort by type bug

* Reduce sizes for stepper padding and dialog content on desktop (#4573)

* Moer style tweaks

* Update mat-desktop.scss

Co-authored-by: Richard Cox <richard-cox@users.noreply.github.com>

* Optionally reduce size of tile selector cards, apply to create endpoints and deploy app (#4571)

* Improve tile selector sizing
- Reduce width of tile by tweaking tile grid breakpoints
  - Switch down to 1 column later on when reducing width
  - Add intermediat 3 column step to reduce times when 2 columns are too large
- Reduce height of tiles by about a 1/4

* Shrink size of github, git url and docker images in create app stepper

* Helm Chart: Add NOTES.txt template & update chart.yaml (#4557)

* Helm Chart Updates
- Add NOTES template
- Add maintainers and keywords to chart.yaml

* Update helm install instruction in build.sh script to helm 3

* Helm Chart Notes Fixes/Updates

* Changes following review

* Changes following review

* Address PR comments, fix whitespacing

* Bump version and notes (#4576)

* Bump version

* Add release notes

* Update CHANGELOG.md

* Change version number to 4.1.0

* Revert "Change version number to 4.1.0"

This reverts commit 78d8a920952a7786ef2df7dc188c448858b31b44.

* Update tag to match v4 (#4582)

* Update package-lock.json version to 4.1.0 (#4581)

* Ensure service name is correct in helm chart NOTES.txt (#4585)

* Ensure the api key secret db field is long enough (#4586)

* Fix release tag issue (#4594)

* Add more logging of all files to be archived (#4595)

* Release Pipelines: Always read vars from git checkout (#4597)

* Always read vars from git checkout

* FIx create chart

Co-authored-by: Veerapuram Varadhan <veerapuram.varadhan@suse.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Ivan Kapelyukhin <ikapelyukhin@suse.com>
---
 .../tasks/dev-releases/check-gh-release.yml   |  9 ++---
 deploy/ci/tasks/dev-releases/create-chart.yml | 10 +++--
 .../tasks/dev-releases/generate-tag-files.yml | 39 +++++--------------
 .../tasks/dev-releases/update-gh-release.yml  |  8 ++--
 deploy/ci/tasks/dev-releases/vars-helper.sh   | 32 +++++++++++++++
 .../console/templates/deployment.yaml         |  2 +-
 src/jetstream/config.dev                      |  2 +-
 7 files changed, 59 insertions(+), 43 deletions(-)
 create mode 100755 deploy/ci/tasks/dev-releases/vars-helper.sh

diff --git a/deploy/ci/tasks/dev-releases/check-gh-release.yml b/deploy/ci/tasks/dev-releases/check-gh-release.yml
index b9a23fc69f..64c34f6ddd 100644
--- a/deploy/ci/tasks/dev-releases/check-gh-release.yml
+++ b/deploy/ci/tasks/dev-releases/check-gh-release.yml
@@ -16,14 +16,13 @@ run:
     - |
       # Check that the Github release DOES NOT exist
       ROOT_DIR=${PWD}
-      VERSION=$(cat image-tag/v2-version)
-      FULL_VERSION=$(cat image-tag/v2-alpha-tag) 
-      GIT_TAG=$(cat image-tag/v2-tag) 
       STRATOS=${ROOT_DIR}/stratos
+      source "${STRATOS}/deploy/ci/tasks/dev-releases/vars-helper.sh"
+
       source ${STRATOS}/deploy/ci/tasks/dev-releases/github-helper.sh
 
       # Check tagged release version is consistent with package.json version
-      TAG_RELEASE_VERSION=$(echo ${FULL_VERSION} | cut -d"-" -f1)
+      TAG_RELEASE_VERSION=$(echo ${LATEST_TAG} | cut -d"-" -f1)
       if [ "${TAG_RELEASE_VERSION}" != "${VERSION}" ]; then
         echo "Package.json version is not consistent with tag release version! ${TAG_RELEASE_VERSION} != ${VERSION}"
         exit 1
@@ -32,7 +31,7 @@ run:
 
       # Check that the release exists
       set +e
-      github-release info -t ${GIT_TAG}
+      github-release info -t ${RELEASE_TAG}
       RETVAL=$?
       set -e
 
diff --git a/deploy/ci/tasks/dev-releases/create-chart.yml b/deploy/ci/tasks/dev-releases/create-chart.yml
index 9cb8935fd7..55fb8f9eca 100644
--- a/deploy/ci/tasks/dev-releases/create-chart.yml
+++ b/deploy/ci/tasks/dev-releases/create-chart.yml
@@ -21,12 +21,14 @@ run:
       helm init --client-only
       ROOT_DIR=$PWD
       STRATOS=${ROOT_DIR}/stratos
+      source "${STRATOS}/deploy/ci/tasks/dev-releases/vars-helper.sh"
+
       source ${STRATOS}/deploy/ci/tasks/dev-releases/create-chart-helper.sh
       HELM_REPO=${ROOT_DIR}/helm-repo/${HELM_REPO_PATH}
-      GIT_TAG=$(cat image-tag/v2-alpha-tag)
-      VERSION=$(cat image-tag/v2-version)
-      RELEASE_VERSION=$(cat image-tag/v2-tag)
-      COMMIT=$(cat image-tag/v2-commit)
+
+      GIT_TAG=${LATEST_TAG}
+      RELEASE_VERSION=${RELEASE_TAG}
+      COMMIT=${COMMIT_HASH}
 
       # Required for setupAndPushChange commit message
       IMAGE_TAG=${GIT_TAG}
diff --git a/deploy/ci/tasks/dev-releases/generate-tag-files.yml b/deploy/ci/tasks/dev-releases/generate-tag-files.yml
index 18c0918107..1a56bae074 100644
--- a/deploy/ci/tasks/dev-releases/generate-tag-files.yml
+++ b/deploy/ci/tasks/dev-releases/generate-tag-files.yml
@@ -18,27 +18,12 @@ run:
     - |
       echo "Generate tag files started..."
 
-      cd stratos
-
-      RELEASE_TAG=$(cat .git/ref)
-
-      # RELEASE_TAG is the full tag that started the pipleinee, e.g. '2.0.0-rc.1' 
-      VERSION=$(cat package.json | grep version | grep -Po "([0-9\.]?)*")
-      COMMIT_HASH=$(git log -1 --format="%h")
-      LATEST_TAG=$VERSION-${COMMIT_HASH}
-      SOURCE_CODE_REPO=$(git config --get remote.origin.url)
+      ROOT_DIR=${PWD}
+      STRATOS=${ROOT_DIR}/stratos
+      source "${STRATOS}/deploy/ci/tasks/dev-releases/vars-helper.sh"
 
-      echo "Got version $VERSION from package.json."
-
-      echo "Got $LATEST_TAG as the latest git tag."
+      cd stratos
 
-      if [ ! -z ${TAG_SUFFIX} ]; then
-        if [ "${TAG_SUFFIX}" != "null" ]; then
-          echo "Adding tag suffix '$TAG_SUFFIX' to the latest tag."
-          LATEST_TAG=${LATEST_TAG}-${TAG_SUFFIX}
-          echo "The latest tag is now $LATEST_TAG."
-        fi
-      fi
       echo "Running store-git-metadata.sh..."
 
       ./build/store-git-metadata.sh
@@ -73,17 +58,13 @@ run:
 
       echo "Created v2-alpha-tag, v2-version and build-args."
 
-      echo "Contents of build-args:"
-      cat build-args
-
-      echo "Contents of ui-build-args:"
-      cat ui-build-args
+      echo "Contents of files to be packaged:"
 
-      echo "Contents of v2-alpha-tag:"
-      cat v2-alpha-tag
-      
-      echo "Contents of image-labels:"
-      cat image-labels
+      for f in *; do
+        echo "File: $f ______________________________________________________"
+        cat $f
+        echo ""
+      done
 
       set -x
 
diff --git a/deploy/ci/tasks/dev-releases/update-gh-release.yml b/deploy/ci/tasks/dev-releases/update-gh-release.yml
index 80a79a98ec..f3897c03d3 100644
--- a/deploy/ci/tasks/dev-releases/update-gh-release.yml
+++ b/deploy/ci/tasks/dev-releases/update-gh-release.yml
@@ -17,10 +17,12 @@ run:
     - |
       # Create Github release
       ROOT_DIR=${PWD}
-      VERSION=$(cat image-tag/v2-version)
-      FULL_VERSION=$(cat image-tag/v2-alpha-tag) 
-      GIT_TAG=$(cat image-tag/v2-tag) 
       STRATOS=${ROOT_DIR}/stratos
+      source "${STRATOS}/deploy/ci/tasks/dev-releases/vars-helper.sh"
+
+      FULL_VERSION=${LATEST_TAG}
+      GIT_TAG=${RELEASE_TAG}
+
       source ${STRATOS}/deploy/ci/tasks/dev-releases/github-helper.sh
 
       # Check tagged release version is consistent with package.json version
diff --git a/deploy/ci/tasks/dev-releases/vars-helper.sh b/deploy/ci/tasks/dev-releases/vars-helper.sh
new file mode 100755
index 0000000000..edc0c1cd16
--- /dev/null
+++ b/deploy/ci/tasks/dev-releases/vars-helper.sh
@@ -0,0 +1,32 @@
+
+pushd stratos
+
+VERSION=$(cat package.json | grep version | grep -Po "([0-9\.]?)*")
+COMMIT_HASH=$(git log -1 --format="%h")
+LATEST_TAG=$VERSION-${COMMIT_HASH}
+SOURCE_CODE_REPO=$(git config --get remote.origin.url)
+
+# Check that the RELEASE_TAG matches the version
+RELEASE_TAG=$(git describe)
+if [[ "${RELEASE_TAG}" != ${VERSION}* ]]; then
+  echo "Error: Can not get tag for this release - got ${RELEASE_TAG}"
+  exit 1
+fi
+
+if [ ! -z ${TAG_SUFFIX} ]; then
+  if [ "${TAG_SUFFIX}" != "null" ]; then
+    echo "Adding tag suffix '$TAG_SUFFIX' to the latest tag."
+    LATEST_TAG=${LATEST_TAG}-${TAG_SUFFIX}
+    echo "The latest tag is now $LATEST_TAG."
+  fi
+fi
+
+popd
+
+set +x
+echo "VERSION : ${VERSION}"
+echo "COMMIT_HASH : ${COMMIT_HASH}"
+echo "LATEST_TAG : ${LATEST_TAG}"
+echo "SOURCE_CODE_REPO : ${SOURCE_CODE_REPO}"
+echo "RELEASE_TAG : ${RELEASE_TAG}"
+set -x
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 40280e1ba8..919098add4 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -29,7 +29,7 @@ spec:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 0
-      maxUnavailable: 1  
+      maxUnavailable: 1
   selector:
     matchLabels:
       app.kubernetes.io/name: "stratos"
diff --git a/src/jetstream/config.dev b/src/jetstream/config.dev
index d22fff32f8..fa8c377f29 100644
--- a/src/jetstream/config.dev
+++ b/src/jetstream/config.dev
@@ -67,4 +67,4 @@ HELM_CACHE_FOLDER=./.helm-cache
 # DB_USER=stratos
 # DB_PASSWORD=strat0s
 # DB_DATABASE_NAME=stratosdb
-# DB_SSL_MODE=disable
\ No newline at end of file
+# DB_SSL_MODE=disable

From ad9149fd6d13868fa8747f47ab7a9bc6e3871404 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Tue, 22 Sep 2020 19:21:36 +0100
Subject: [PATCH 637/648] Kube Terminal: Appears to hang if it takes a while to
 start up (#506)

* Fix issue where chart download link was not absolute
- Expected url, got chart file name
- We now check for this, if url is not absoulte assume filename and append to repo url

* Fix issue with Schemas on Helm Hub

* Update following changes in #503

* Fix issue with missing schema on upgrade for local chart

* Fix failing unit test

* Ensure kube terminal does not hang if it takes a while to start up

* Fix timeout issue

Co-authored-by: Richard Cox <richard.cox@suse.com>
---
 .../plugins/kubernetes/terminal/helpers.go    | 19 ++++--
 .../plugins/kubernetes/terminal/start.go      | 68 +++++++++++++------
 2 files changed, 62 insertions(+), 25 deletions(-)

diff --git a/src/jetstream/plugins/kubernetes/terminal/helpers.go b/src/jetstream/plugins/kubernetes/terminal/helpers.go
index 634cfff1ab..08f5a918a8 100644
--- a/src/jetstream/plugins/kubernetes/terminal/helpers.go
+++ b/src/jetstream/plugins/kubernetes/terminal/helpers.go
@@ -23,8 +23,9 @@ import (
 )
 
 const (
-	helmEndpointType     = "helm"
-	helmRepoEndpointType = "repo"
+	helmEndpointType        = "helm"
+	helmRepoEndpointType    = "repo"
+	startingProgressMessage = "Waiting for Kubernetes Terminal to start up ..."
 )
 
 // PodCreationData stores the clients and names used to create pod and secret
@@ -87,6 +88,8 @@ func (k *KubeTerminal) createPod(c echo.Context, kubeConfig, kubeVersion string,
 		Type: "Opaque",
 	}
 
+	sendProgressMessage(ws, startingProgressMessage)
+
 	setResourcMetadata(&secretSpec.ObjectMeta, sessionID)
 
 	secretSpec.Data = make(map[string][]byte)
@@ -98,6 +101,7 @@ func (k *KubeTerminal) createPod(c echo.Context, kubeConfig, kubeVersion string,
 		secretSpec.Data["helm-setup"] = []byte(helmSetup)
 	}
 
+	sendProgressMessage(ws, startingProgressMessage)
 	_, err = secretClient.Create(secretSpec)
 	if err != nil {
 		log.Warnf("Kubernetes Terminal: Unable to create Secret: %+v", err)
@@ -154,6 +158,8 @@ func (k *KubeTerminal) createPod(c echo.Context, kubeConfig, kubeVersion string,
 	}
 	podSpec.Spec.Volumes = volumesSpec
 
+	sendProgressMessage(ws, startingProgressMessage)
+
 	// Create a new pod
 	pod, err := podClient.Create(podSpec)
 	if err != nil {
@@ -165,12 +171,12 @@ func (k *KubeTerminal) createPod(c echo.Context, kubeConfig, kubeVersion string,
 	result.PodClient = podClient
 	result.PodName = podName
 
-	sendProgressMessage(ws, "Waiting for Kubernetes Terminal to start up ...")
-
 	// Wait for the pod to be running
 	timeout := 60
 	statusOptions := metav1.GetOptions{}
 	for {
+		// This ensures we keep the web socket alive while the container is creating
+		sendProgressMessage(ws, startingProgressMessage)
 		status, err := podClient.Get(pod.Name, statusOptions)
 		if err == nil && status.Status.Phase == "Running" {
 			break
@@ -201,6 +207,11 @@ func setResourcMetadata(metadata *metav1.ObjectMeta, sessionID string) {
 
 // Cleanup the pod and secret
 func (k *KubeTerminal) cleanupPodAndSecret(podData *PodCreationData) error {
+	if podData == nil {
+		// Already been cleaned up
+		return nil
+	}
+
 	if len(podData.PodName) > 0 {
 		//captureBashHistory(podData)
 		podData.PodClient.Delete(podData.PodName, nil)
diff --git a/src/jetstream/plugins/kubernetes/terminal/start.go b/src/jetstream/plugins/kubernetes/terminal/start.go
index 63c90fe519..a37a26e9a8 100644
--- a/src/jetstream/plugins/kubernetes/terminal/start.go
+++ b/src/jetstream/plugins/kubernetes/terminal/start.go
@@ -41,6 +41,15 @@ type terminalSize struct {
 const (
 	// Time allowed to write a message to the peer.
 	writeWait = 10 * time.Second
+
+	// Time allowed to read the next pong message from the peer.
+	pongWait = 60 * time.Second
+
+	// Send pings to peer with this period. Must be less than pongWait.
+	pingPeriod = (pongWait * 9) / 10
+
+	// Time to wait before force close on connection.
+	closeGracePeriod = 10 * time.Second
 )
 
 // Start handles web-socket request to launch a Kubernetes Terminal
@@ -60,7 +69,7 @@ func (k *KubeTerminal) Start(c echo.Context) error {
 	if !ok {
 		return errors.New("Could not get token")
 	}
-	
+
 	// This is the kube config for the kubernetes endpoint that we want configured in the Terminal
 	kubeConfig, err := k.Kube.GetKubeConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRecord, "")
 	if err != nil {
@@ -79,7 +88,10 @@ func (k *KubeTerminal) Start(c echo.Context) error {
 	defer ws.Close()
 	defer pingTicker.Stop()
 
-	// We are now in web socket land - we don't want any middleware to change the HTTP response 
+	// At this point we aer using web sockets, so we can not return errors to the client as the connection
+	// has been upgraded to a web socket
+
+	// We are now in web socket land - we don't want any middleware to change the HTTP response
 	c.Set("Stratos-WebSocket", "true")
 
 	// Send a message to say that we are creating the pod
@@ -95,8 +107,8 @@ func (k *KubeTerminal) Start(c echo.Context) error {
 		k.cleanupPodAndSecret(podData)
 
 		// Send error message
-		sendProgressMessage(ws, "!" + err.Error())
-		return err
+		sendProgressMessage(ws, "!"+err.Error())
+		return nil
 	}
 
 	// API Endpoint to SSH/exec into a container
@@ -131,28 +143,33 @@ func (k *KubeTerminal) Start(c echo.Context) error {
 
 	stdoutDone := make(chan bool)
 	go pumpStdout(ws, wsConn, stdoutDone)
+	go ping(ws, stdoutDone)
 
 	// If the downstream connection is closed, close the other web socket as well
-	ws.SetCloseHandler(func (code int, text string) error {
+	ws.SetCloseHandler(func(code int, text string) error {
 		wsConn.Close()
+		// Cleanup
+		k.cleanupPodAndSecret(podData)
+		podData = nil
 		return nil
 	})
 
+	// Wait a while when reading - can take some time for the container to launch
+	ws.SetReadDeadline(time.Now().Add(pongWait))
+	ws.SetPongHandler(func(string) error { ws.SetReadDeadline(time.Now().Add(pongWait)); return nil })
+
 	// Read the input from the web socket and pipe it to the SSH client
 	for {
 		_, r, err := ws.ReadMessage()
 		if err != nil {
-			// Check to see if this was because the web socket was closed cleanly
-			closed := false
-			select {
-			case msg := <-stdoutDone:
-					closed = msg
-			}
-			if !closed {
-				log.Errorf("Kubernetes terminal: error reading message from web socket: %+v", err)
-			}
-			log.Debug("Kube Terminal cleaning up ....")
+			// Error reading - so clean up
 			k.cleanupPodAndSecret(podData)
+			podData = nil
+
+			ws.SetWriteDeadline(time.Now().Add(writeWait))
+			ws.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
+			time.Sleep(closeGracePeriod)
+			ws.Close()
 
 			// No point returning an error - we've already upgraded to web sockets, so we can't use the HTTP response now
 			return nil
@@ -160,7 +177,6 @@ func (k *KubeTerminal) Start(c echo.Context) error {
 
 		res := KeyCode{}
 		json.Unmarshal(r, &res)
-
 		if res.Cols == 0 {
 			slice := make([]byte, 1)
 			slice[0] = 0
@@ -177,11 +193,6 @@ func (k *KubeTerminal) Start(c echo.Context) error {
 			wsConn.WriteMessage(websocket.TextMessage, slice)
 		}
 	}
-
-	// Cleanup
-	log.Error("Kubernetes Terminal is cleaning up")
-
-	return k.cleanupPodAndSecret(podData)
 }
 
 func pumpStdout(ws *websocket.Conn, source *websocket.Conn, done chan bool) {
@@ -202,3 +213,18 @@ func pumpStdout(ws *websocket.Conn, source *websocket.Conn, done chan bool) {
 		}
 	}
 }
+
+func ping(ws *websocket.Conn, done chan bool) {
+	ticker := time.NewTicker(pingPeriod)
+	defer ticker.Stop()
+	for {
+		select {
+		case <-ticker.C:
+			if err := ws.WriteControl(websocket.PingMessage, []byte{}, time.Now().Add(writeWait)); err != nil {
+				log.Errorf("Web socket ping error: %+v", err)
+			}
+		case <-done:
+			return
+		}
+	}
+}

From d62a3c5290039ae545b4731426606b7dade40380 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Wed, 23 Sep 2020 10:17:42 +0100
Subject: [PATCH 638/648] Release pipeline tag fix (#507)

* Release pipeline tag fix

* Fix suse pipeline
---
 deploy/ci/console-dev-releases.yml      | 5 ++++-
 deploy/ci/console-helm-chart-pr.yml     | 1 -
 deploy/ci/console-make-release.yml      | 1 +
 deploy/ci/suse-console-dev-releases.yml | 5 ++++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/deploy/ci/console-dev-releases.yml b/deploy/ci/console-dev-releases.yml
index e52789e24f..efcb887ad2 100644
--- a/deploy/ci/console-dev-releases.yml
+++ b/deploy/ci/console-dev-releases.yml
@@ -101,6 +101,7 @@ jobs:
         GIT_USER: ((concourse-user))
         GIT_EMAIL: ((concourse-email))
         GIT_PRIVATE_KEY: ((github-private-key))
+        TAG_SUFFIX: ((tag-suffix))
 - name: build-images
   plan:
   - get: stratos
@@ -170,6 +171,7 @@ jobs:
         DOCKER_REGISTRY: ((docker-registry))
         HELM_REPO_PATH: ((helm-repo-path))
         HELM_REPO_BRANCH: ((helm-repo-branch))
+        TAG_SUFFIX: ((tag-suffix))
     - put: helm-chart-tarball
       params:
        file: helm-chart/*.tgz
@@ -196,4 +198,5 @@ jobs:
         GITHUB_REPO: ((helm-repo-github-repository))
         GIT_USER: ((concourse-user))
         GIT_EMAIL: ((concourse-email))
-        GIT_PRIVATE_KEY: ((github-private-key))
\ No newline at end of file
+        GIT_PRIVATE_KEY: ((github-private-key))
+        TAG_SUFFIX: ((tag-suffix))
diff --git a/deploy/ci/console-helm-chart-pr.yml b/deploy/ci/console-helm-chart-pr.yml
index bee5e837d4..a476d10cf2 100644
--- a/deploy/ci/console-helm-chart-pr.yml
+++ b/deploy/ci/console-helm-chart-pr.yml
@@ -40,7 +40,6 @@ jobs:
         GITHUB_REPO: ((helm-repo-github-repository))
         GITHUB_TOKEN: ((github-access-token))
         GIT_PRIVATE_KEY: ((github-private-key))
-        GITHUB_TOKEN: ((github-access-token))
         DOCKER_ORG: ((docker-organization))
         DOCKER_REGISTRY: ((docker-registry))
         HELM_REPO_PATH: ((helm-repo-path))
diff --git a/deploy/ci/console-make-release.yml b/deploy/ci/console-make-release.yml
index d803858ce9..1a5856a2ed 100644
--- a/deploy/ci/console-make-release.yml
+++ b/deploy/ci/console-make-release.yml
@@ -80,3 +80,4 @@ jobs:
         HELM_RELEASE_REPO_FOLDER: ((release-helm-stable-folder))
         HELM_RELEASE_REGISTRY_HOST: ((release-repository))
         HELM_RELEASE_REGISTRY_ORG: ((release-repository-organization))
+        TAG_SUFFIX: ((tag-suffix))
diff --git a/deploy/ci/suse-console-dev-releases.yml b/deploy/ci/suse-console-dev-releases.yml
index e05f578318..e4af7f2fff 100644
--- a/deploy/ci/suse-console-dev-releases.yml
+++ b/deploy/ci/suse-console-dev-releases.yml
@@ -114,6 +114,7 @@ jobs:
         GIT_USER: ((concourse-user))
         GIT_EMAIL: ((concourse-email))
         GIT_PRIVATE_KEY: ((github-private-key))
+        TAG_SUFFIX: ((tag-suffix))
 - name: build-images
   plan:
   - get: stratos
@@ -199,6 +200,7 @@ jobs:
         DOCKER_REGISTRY: ((docker-registry))
         HELM_REPO_PATH: ((helm-repo-path))
         HELM_REPO_BRANCH: ((helm-repo-branch))
+        TAG_SUFFIX: ((tag-suffix))
     - put: helm-chart-tarball
       params:
        file: helm-chart/*.tgz
@@ -225,4 +227,5 @@ jobs:
         GITHUB_REPO: ((helm-repo-github-repository))
         GIT_USER: ((concourse-user))
         GIT_EMAIL: ((concourse-email))
-        GIT_PRIVATE_KEY: ((github-private-key))
\ No newline at end of file
+        GIT_PRIVATE_KEY: ((github-private-key))
+        TAG_SUFFIX: ((tag-suffix))

From 4e92362f5d6ceee22054e3606e4ba6265e3c109a Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Thu, 24 Sep 2020 09:48:03 +0100
Subject: [PATCH 639/648] Fix caasp labels (#510)

* Fix created date issue

* Fix issue with CaaSP info always appearing

* Remove blank line
---
 .../kubernetes-node-link.component.html                  | 2 +-
 .../kubernetes-node-link.component.scss                  | 3 +++
 .../kubernetes-node-summary-card.component.ts            | 5 ++++-
 .../kubernetes/services/kubernetes-endpoint.service.ts   | 9 ++++++---
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html
index c425c5f39e..a32c03f58b 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html
@@ -1,4 +1,4 @@
 <div class="node-link">
   <a [routerLink]="nodeLink">{{row.metadata.name}}</a>
-  <mat-icon *ngIf="icon" class="{{icon.class}}" [matTooltip]="icon.message">{{icon.icon}}</mat-icon>
+  <mat-icon *ngIf="icon" class="{{icon.class}} node-link__help" [matTooltip]="icon.message">{{icon.icon}}</mat-icon>
 </div>
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.scss b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.scss
index 24cbdb0c59..f95dfc2f4d 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.scss
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.scss
@@ -5,4 +5,7 @@
   mat-icon {
     padding-left: 10px;
   }
+  &__help {
+    cursor: help;
+  }
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts
index 8b088c3d70..51342da974 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts
@@ -22,7 +22,10 @@ export class KubernetesNodeSummaryCardComponent {
     public kubeNodeService: KubernetesNodeService
   ) {
     this.caaspNode$ = this.kubeNodeService.nodeEntity$.pipe(
-      map(node => kubeEndpointService.getCaaspNodeData(node)),
+      map(node => {
+        const nodeData = kubeEndpointService.getCaaspNodeData(node);
+        return !!nodeData.version ? nodeData : null;
+      }),
     );
 
     this.caaspNodeUpdates$ = this.caaspNode$.pipe(
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-endpoint.service.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-endpoint.service.ts
index 2fe71f3803..1bf6932297 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-endpoint.service.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-endpoint.service.ts
@@ -105,10 +105,13 @@ export class KubernetesEndpointService {
             return;
           }
 
-          if (!versions[nodeData.version]) {
-            versions[nodeData.version] = 0;
+          // Only has a version if it is a CaaSP node
+          if (nodeData.version) {
+            if (!versions[nodeData.version]) {
+              versions[nodeData.version] = 0;
+            }
+            versions[nodeData.version]++;
           }
-          versions[nodeData.version]++;
 
           info.updates += nodeData.updates ? 1 : 0;
           info.disruptiveUpdates += nodeData.disruptiveUpdates ? 1 : 0;

From 07059799c219d4af7cd4c1782855f86bb873836f Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Thu, 24 Sep 2020 10:28:16 +0100
Subject: [PATCH 640/648] Only use diff values from form (#511)

---
 .../chart-values-editor/chart-values-editor.component.ts       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts
index d7621a5e9b..60b56a6bf5 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts
@@ -363,7 +363,8 @@ export class ChartValuesEditorComponent implements OnInit, OnDestroy, AfterViewI
   }
 
   public getValues(): object {
-    return (this.mode === EditorMode.JSonSchemaForm) ? this.formData : yaml.safeLoad(this.code);
+    // Always diff the form with the Chart Values to get only the changes that the user has made
+    return (this.mode === EditorMode.JSonSchemaForm) ? diffObjects(this.formData, this.chartValues) : yaml.safeLoad(this.code);
   }
 
   public copyValues() {

From cf6f655e93f8e0fdc2832ee30303bb85c1d268b2 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Mon, 28 Sep 2020 09:03:31 +0100
Subject: [PATCH 641/648] Move suse specific login theme out of default login
 theme (#508)

---
 .../login/login-page/login-page.component.theme.scss   |  6 ------
 .../packages/suse-extensions/sass/_all-theme.scss      |  2 ++
 .../custom/suse-login/suse-login.component.theme.scss  | 10 ++++++++++
 3 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.theme.scss

diff --git a/src/frontend/packages/core/src/features/login/login-page/login-page.component.theme.scss b/src/frontend/packages/core/src/features/login/login-page/login-page.component.theme.scss
index e6a56746e2..2b41be411b 100644
--- a/src/frontend/packages/core/src/features/login/login-page/login-page.component.theme.scss
+++ b/src/frontend/packages/core/src/features/login/login-page/login-page.component.theme.scss
@@ -1,6 +1,5 @@
 @mixin login-page-theme($theme, $app-theme) {
   $primary: map-get($theme, primary);
-  $warn: map-get($theme, warn);
 
   .login {
     background-color: map-get($app-theme, app-background-color);
@@ -12,9 +11,4 @@
     }
   }
 
-  .suse-login-sso {
-    .suse-login__message {
-      color: mat-color($warn);
-    }
-  }
 }
diff --git a/src/frontend/packages/suse-extensions/sass/_all-theme.scss b/src/frontend/packages/suse-extensions/sass/_all-theme.scss
index 3d775747a6..3f1be2c34b 100644
--- a/src/frontend/packages/suse-extensions/sass/_all-theme.scss
+++ b/src/frontend/packages/suse-extensions/sass/_all-theme.scss
@@ -7,6 +7,7 @@
 @import '../src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.theme';
 @import '../src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.theme';
 @import '../src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.theme';
+@import '../src/custom/suse-login/suse-login.component.theme';
 
 @mixin apply-theme-suse-extensions($stratos-theme) {
 
@@ -20,4 +21,5 @@
   @include helm-release-summary-tab-theme($theme, $app-theme);
   @include kube-node-link-theme($theme, $app-theme);
   @include app-chart-values-editor-theme($theme, $app-theme);
+  @include suse-login-page-theme($theme, $app-theme);
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.theme.scss b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.theme.scss
new file mode 100644
index 0000000000..c0b4f3f115
--- /dev/null
+++ b/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.theme.scss
@@ -0,0 +1,10 @@
+
+@mixin suse-login-page-theme($theme, $app-theme) {
+  $warn: map-get($theme, warn);
+
+  .suse-login-sso {
+    .suse-login__message {
+      color: mat-color($warn);
+    }
+  }
+}

From 4cbbc07efdb556e8ad19efb9712f6c1043a4f2aa Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Fri, 2 Oct 2020 13:16:00 +0100
Subject: [PATCH 642/648] Split out Kube code (with Helm & Workloads) into it's
 own package (#475)

* Ensure filename/no filename text in connect by file dialog is aligned (#4474)

- needs porting back

* Add typed entity access and `custom-src` removal to change log (#4496)

* Fixes #4335: Create Stratos static web site with better documentation (#4446)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* * Review comments fix

* Fix broken link to an image in frontend extensions doc

* Final tweaks

Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Richard Cox <richard-cox@users.noreply.github.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Richard Cox <richard.cox@suse.com>

* Fix and update customization docs (#4478)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* Apply new theming process to acme example

* First pass at customization docs, most of themeing done

* Final pass at customization docs

* Merge fixes

Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update base README, point to website (#4488)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* Apply new theming process to acme example

* First pass at customization docs, most of themeing done

* Final pass at customization docs

* Update base README, point to website

Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update developer docs (#4489)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* Apply new theming process to acme example

* First pass at customization docs, most of themeing done

* Final pass at customization docs

* Update base README, point to website

* Update developer docs
Still need an overhall, but updated to remove incorrect data and apply website context

Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix docs (#4497)

* Fixes #4335: Create Stratos static web site with better documentation
structure using docusaurus. Initial commit.

* 1) Re-organize some more existing doc files.
2) Re-organize links in the doc file to refer to the new document
   hierarchy.

* Landing Page WIP

* Documentation tweaks

* Use better action names

* More visual improvements to landing page

* More doc and landing page improvements

* Remove publish workflow for now

* Typo fix

* Moer documentation improvements

* Remove extra title from helm doc

* Fix script when used from npm

* Improve layout on mobile devices

* More documentation improvements

* Fix typo

* Merge downstream (#4441)

* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review

* Show all favorites for an endpoint favorite if there is only one (#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes

* Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode

* Fix issues with tests not running if build upload fails (#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file

* Improve autoscaler e2e logging (#4456)

* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events

* Fix check-e2e-pr.sh for pr's from other repos (#4459)

- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG

* Convert Client Secret Input Fields to `password` (#4455)

* Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) (#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>

* [Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump lodash from 4.17.15 to 4.17.19 (#4452)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Website update: Wed 22 Jul 2020 21:55:00 BST

* Website update: Wed 22 Jul 2020 21:56:45 BST

* Website update: Wed 22 Jul 2020 21:58:22 BST

* Remove dist

* FIx deploy script to remove old files

* Moer tidy ups

* Add CNAME file when publishing

* Add talks doc

* * Fix broken links due to reorganization of documents

* Move Troubleshooting content from cloud-foundry deployment doc to
  cf-troubleshooting

* * Fix Getting Started broken link in page footer

* Only publish if there are website changes

* Remove old doc

* Publish website on merge

* Apply new theming process to acme example

* First pass at customization docs, most of themeing done

* Final pass at customization docs

* Update base README, point to website

* Update developer docs
Still need an overhall, but updated to remove incorrect data and apply website context

* Fix PR template

Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Ensure images dependent on techPreview flag are included in imagelist.txt (#4500)

* Improve clean-symlinks script (#4509)

* Add support for including breaking changes in the changelog

* Improve clean-symlinks script

* Update changelog.sh

* Update changelog.sh

* Remove trailing line

* Remove tailing line

* Change nginx ciphers and make configurable via helm chart values (#4507)

* Change nginx ciphers and make configurable via helm chart values

* Add support for including breaking changes in the changelog

* Improve clean-symlinks script

* Update changelog.sh

* Update changelog.sh

* Remove trailing line

* Remove tailing line

* Fix bug with cert path patching

* Fig bug where protocols not patched

* Update version to 4.0.1, add change log (#4514)

* Update version to 4.0.1, add change log

* Update package-lock

* Fix deploy from gitlab using a group's repo (#4479)

- only supported user based repos
- fixes #4153

* Add additional time ranges to base metrics range selector (#4480)

- fixes https://github.com/SUSE/stratos/issues/415

* Add some time saving comments to cf permissions checker (#4508)

* Move tab-nav and xsrf module source files to the src folder (#4518)

* Move tab-nav files

* Move xsrf module

* Fix GitHub branch limit (#4510)

* Ensure we fetch all repo's and branches when deploying github apps

* Ensure we only fetch branches once
- SUSE/stratos vs suse/stratos
- ensure branches are treated as 'local' lists

* Increate page size for github commits and gitlab requests

* Remove use of nodejs util module (#4521)

* Remove use of nodejs util module

* Fix comment typo

* Remove dependencies between store and core that have crept in (#4517)

* Remove dependencies between store and core that have crept in

* Fix issue with unit tests

* Import fixes and unit test fix

* Fix store testing package (#4520)

* Fix store testing package

* Update public-api.ts

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

* Fix the position of the header guide array (#4524)

- shown when there are no registered endpoints (and some incoming scenarios)
- position is determined by location of associated button in header
- position of button can change given visibility of other buttons (notification bell, endpoint backup, etc)
- now check positiion after a delay, add fade in to mask delay

* Metrics: Ensure trailing slashes are ignored when comparing URLs (#4527)

* Remove imports of the form 'frontend/....' (#4519)

* Move tab-nav files

* Move xsrf module

* Remove imports of the form 'frontend/...'

* Move endpopints-health-check.ts (#4530)

* Add UMD Ids to external modules in store package (#4522)

* Add UMB Ids to external modules in store package

* Add moment

* Address PR feedback

* Improvements & more checks to autoscaler scheduled date tests (#4535)

- allow more time to skip between date and time values in date fields
- add a check to
- add checks to ensure we have the correct number of scheduled date rules

* Remove api driven views (#4537)

* Remove logger service and action history (#4538)

* Remove logger service

* Missed a few and removed action history as it was not being used

* Remove action history

* A few more

* Fix for removed method

* Add support for API keys (#4515)

* Add backend support for API keys

* Add last_used field to API keys

* Use secure random value as key secret

* Add tests for ListAPIKeys and AddAPIKey

* Cover the rest of psql_apikeys.go with tests

* Refactor the code a bit

* Storing SQL queries in a struct should ensure that
`datastore.ModifySQLStatement` gets called on all of them.
* A wrapper func around `db.Exec` reduces copypasta.
* Actually call `InitRepositoryProvider` for API keys package

* Add route handler tests using gomock

* Actually use skipper in xsrfMiddleware; minor clean-up

* Update moment imports to remove warning when building library (#4534)

* Update moment imports to remove warning when building library

* Fix references to moment-timezone and markdown
- contains some changes to e2e tests as well, might need to be reverted

* Fix unit test

* Fix `import *` in e2e tests

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

* Improve presentation and fix issue with development versions

* WIP

* Fix Helm upgrade bug (#4544)

* Fix Helm upgrade bug

* Fix unit tests

* Add support for Helm Upgrade and Helm history

* Remove console logging

* Add comment

* Minor tweaks following self-review

* WIP

* fix install button

* Fix actual helm install

* Remove helm repos view
- need to add endpoint type specific actions to endpoints list view (helm sync)

* Store api_keys.last_used in UTC (#4541)

* Show per endpoint type actions in endpoints table
- use for helm sync

* Tidy up registration step

* Tidy up provider interceptor pattern

* Tidy up services, fix charts list filter by repo/helm hub

* Add endpoint unRegisterable, make helm types sub types, tidy up

* Remove debug logging

* Fix whitespace

* Add UI for Stratos API Keys (#4523)

* Add backend support for API keys

* Add last_used field to API keys

* Add base api keys page

* Add basic api key entity framework (untested)

* Add a basic api keys list (untested, need to wire in properties/columns + actions)

* Fix entity type related issues

* Add basic way to create api key

* Wire in delete to list

* Improve 'no api keys' ux

* Final tidy up

* Other fixes

* Fix unit tests

* Add 'Last Used' column to API keys list

* Don't flash up 'no entries' when we haven't loaded api keys yet

* Fix last used sorting
- takes into account timezone
- use cacheing to cater for often called sort

* Fix unit test after changes in master

* Fix after moment change

* Remove now unrequired sorting of api key last used date via moment

Co-authored-by: Ivan Kapelyukhin <ikapelyukhin@suse.com>

* Minor tidy ups

* Add basic e2e tests for API Keys (#4536)

* Add backend support for API keys

* Add last_used field to API keys

* Add base api keys page

* Add basic api key entity framework (untested)

* Add a basic api keys list (untested, need to wire in properties/columns + actions)

* Fix entity type related issues

* Add basic way to create api key

* Wire in delete to list

* Improve 'no api keys' ux

* Final tidy up

* Other fixes

* Fix unit tests

* Add basic e2e tests for api keys

* Add 'Last Used' column to API keys list

* Don't flash up 'no entries' when we haven't loaded api keys yet

* Fix last used sorting
- takes into account timezone
- use cacheing to cater for often called sort

* Fix unit test after changes in master

* Fix after moment change

* Beef up test, fix for initial empty state

* Remove now unrequired sorting of api key last used date via moment

Co-authored-by: Ivan Kapelyukhin <ikapelyukhin@suse.com>

* Fix compile issue

* Fixed versions again, and bugs following subtype split

* Fix unit tests

* Add db migration script to update existing helm endpoints with repo subtype

* Bump docusaurus version and add support for versioning  (#4506)

* Bump docusaurus version and versioning
- Bump docusaurus to latest 2.0 version
- Fix errors thrown up by new linting process
- Add version support, setup 4.0.0
- Enable dark mode and fix in home screen

* Move status_updates back into root project docs folder

* Fix links
- fix dead links
- ensure all links are relative (so work when versioned)

* Remove version 4.0.0

* WIP

* WIP

* Completed

* Temporarily remove docsVersionDropdown until first version added to internal-versions

* Update website docs

* Build fix for temp situation where there's no versions

* Add custom version of 'not latest released docs' message

* Improve versioning and dark mode toggle
- Add `All Versions page`
- Conditionally include versions in drop down
- Improve dark mode toggle icons

* Temporarily remove dependent on versions
- will be added back in when 4.0 sha is known

* Update Versions Process

* Add 4.0.0

* Fix in `build`/`serve` world
- worked fine in `start` world...

* Update 4.0.0 with temp version

* Multiple improvements
- Fix clean git repo before run
- Swizzle docs version drop down nav bar item, move in custom code
- Improve docs (latest version must appear in drop down)

* Changes following review

* Reduce font in version warning

* Fix front-end unit tests

* API Keys: Make feature configurable for different user types (#4540)

* Add a special type and parsing for the new config option

* Add APIKeysEnabled to /info, check it in the middleware

* Add test coverage for apiKeyMiddleware

* Block API keys endpoints if disabled in the config; add tests

* Fix failing test

* Add API_KEYS_ENABLED to the Helm chart

* Add JSON schema to the Helm chart

* Add docs for UAA SSO user permissions management (#4554)

* Bump docusaurus version and versioning
- Bump docusaurus to latest 2.0 version
- Fix errors thrown up by new linting process
- Add version support, setup 4.0.0
- Enable dark mode and fix in home screen

* Move status_updates back into root project docs folder

* Fix links
- fix dead links
- ensure all links are relative (so work when versioned)

* Remove version 4.0.0

* WIP

* WIP

* Completed

* Temporarily remove docsVersionDropdown until first version added to internal-versions

* Update website docs

* Build fix for temp situation where there's no versions

* Add custom version of 'not latest released docs' message

* Improve versioning and dark mode toggle
- Add `All Versions page`
- Conditionally include versions in drop down
- Improve dark mode toggle icons

* Temporarily remove dependent on versions
- will be added back in when 4.0 sha is known

* Update Versions Process

* Add 4.0.0

* Fix in `build`/`serve` world
- worked fine in `start` world...

* Update 4.0.0 with temp version

* Add troubleshooting section for SSO

* Update SSO auth troubleshooting section

* Add basic developers guide for working with helm (#4511)

* Bump docusaurus version and versioning
- Bump docusaurus to latest 2.0 version
- Fix errors thrown up by new linting process
- Add version support, setup 4.0.0
- Enable dark mode and fix in home screen

* Move status_updates back into root project docs folder

* Fix links
- fix dead links
- ensure all links are relative (so work when versioned)

* Add basic developers guide for working with helm

* Fix post merge issue

* Always show upgrade button

* Minor entity store type updates

* Enable/disable API keys UI given API keys config setting (#4559)

* Add a special type and parsing for the new config option

* Add APIKeysEnabled to /info, check it in the middleware

* Add test coverage for apiKeyMiddleware

* Block API keys endpoints if disabled in the config; add tests

* Fix failing test

* Add API_KEYS_ENABLED to the Helm chart

* Add JSON schema to the Helm chart

* Enable/disable API keys UI given API keys config setting

* Changes following review

* Fix unit tests

Co-authored-by: Ivan Kapelyukhin <ikapelyukhin@suse.com>

* Convert unRegisterable to registeredLimit

* Changes following review

* Fix display of helm type in favourite cards
- favourite cards are NOT by subtype, so parent type must have label info

* Multiple Fixes
- Fix display of disconected text & box in endpoint favourite card
- Don't go out to fetch helm schema if there's none defined
- Fixes following merge

* Align icons in workload summary page

* Enable linting for all packages (#4561)

* Enable linting for all packages
- lots to solve!
- we may wish to exclude some files

* Fix linting

* Fix lint failures

* Address PR feedback

* Revert

* Remove description when checking for similar charts

* Only show button when the helm chart is available

* Bump angular json schema form (#4564)

* Bump angular json schema form

* Handle bug where mat-error maring is too big
- We may want to consider moving this upstream

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

* Docs: Update internal versions & Automate future updates  (#4558)

* Docs: Update where 4.0.0 is built from, add 4.0.1
- means we can delete the old `docs-versioning` branch
- both versions point to the same commit (when branch merged to master),
  but reduces user confusion when they can't find the docs for the latest
  released version. Going forward this will point directly to the release label

* Automatically update website's internal-versions.json on new releases
- Add new github action
- Action will trigger on a release being published
- Action looks at github `release` object associated with event and extracts
  a version label and git label
- Use extracted values adds new value to internal-versions.json
- Creates a PR with the change

* Fix checkout issue

* Update documentation-versioning.yml

* Improve types, start work on helm hub upgrade

* Fixes following merge

* Remove TODOs

* Merge fixes, remove fdescribe already in master

* Fix linting

* Create kubernetes package

* Fix imports
- removal of custom folder

* Fix unit tests

* Fixes following review

* Fix unit tests

* Fix theming for suse login

Co-authored-by: Veerapuram Varadhan <veerapuram.varadhan@suse.com>
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Veerapuram Varadhan <v.varadhan@gmail.com>
Co-authored-by: Ivan Kapelyukhin <ikapelyukhin@suse.com>
---
 angular.json                                  |  28 ++++++++++++++
 package.json                                  |   1 +
 .../logout-page/logout-page.component.spec.ts |   6 +--
 .../assets/custom/aks.svg                     |   0
 .../assets/custom/app_placeholder.svg         |   0
 .../assets/custom/caasp.png                   | Bin
 .../assets/custom/eks.svg                     |   0
 .../assets/custom/gke.svg                     |   0
 .../assets/custom/helm.svg                    |   0
 .../assets/custom/help/en/connecting_gke.md   |   0
 .../assets/custom/k3s.svg                     |   0
 .../assets/custom/kube_import.png             | Bin
 .../assets/custom/kubernetes.svg              |   0
 .../assets/custom/placeholder.png             | Bin
 .../packages/kubernetes/karma.conf.js         |   8 ++++
 src/frontend/packages/kubernetes/package.json |  16 ++++++++
 .../packages/kubernetes/sass/_all-theme.scss  |  24 ++++++++++++
 .../helm/chart-view/monocular.component.html  |   0
 .../helm/chart-view/monocular.component.scss  |   0
 .../helm/chart-view/monocular.component.ts    |   0
 .../src}/helm/helm-entity-catalog.ts          |  12 +++++-
 .../src}/helm/helm-entity-factory.ts          |   2 +-
 .../src}/helm/helm-entity-generator.ts        |  14 +++----
 .../helm-hub-registration.component.html      |   0
 .../helm-hub-registration.component.scss      |   0
 .../helm-hub-registration.component.spec.ts   |   6 +--
 .../helm-hub-registration.component.ts        |   6 +--
 .../src}/helm/helm-testing.module.ts          |  17 +++++----
 .../src}/helm/helm.module.ts                  |   4 +-
 .../src}/helm/helm.routing.ts                 |   0
 .../src}/helm/helm.setup.module.ts            |  14 +++----
 .../src}/helm/helm.store.module.ts            |   0
 .../monocular-chart-card.component.html       |   0
 .../monocular-chart-card.component.scss       |   0
 .../monocular-chart-card.component.spec.ts    |   2 +-
 .../monocular-chart-card.component.theme.scss |   0
 .../monocular-chart-card.component.ts         |   2 +-
 .../monocular-charts-data-source.ts           |  10 ++---
 .../monocular-charts-list-config.service.ts   |  10 ++---
 .../monocular-tab-base.component.html         |   0
 .../monocular-tab-base.component.scss         |   0
 .../monocular-tab-base.component.spec.ts      |   4 +-
 .../monocular-tab-base.component.ts           |   0
 .../src}/helm/monocular.interceptor.ts        |   0
 .../src}/helm/monocular/app.component.scss    |   0
 .../chart-details-info.component.html         |   0
 .../chart-details-info.component.scss         |   0
 .../chart-details-info.component.spec.ts      |   0
 .../chart-details-info.component.ts           |   0
 .../chart-details-readme.component.html       |   0
 .../chart-details-readme.component.scss       |   0
 .../chart-details-readme.component.spec.ts    |   0
 .../chart-details-readme.component.ts         |   0
 .../chart-details-usage.component.html        |   0
 .../chart-details-usage.component.scss        |   0
 .../chart-details-usage.component.spec.ts     |   8 ++--
 .../chart-details-usage.component.ts          |   2 +-
 .../chart-details-versions.component.html     |   0
 .../chart-details-versions.component.scss     |   0
 .../chart-details-versions.component.spec.ts  |   0
 .../chart-details-versions.component.ts       |   0
 .../chart-details.component.html              |   0
 .../chart-details.component.scss              |   0
 .../chart-details.component.spec.ts           |   6 +--
 .../chart-details/chart-details.component.ts  |   0
 .../chart-index/chart-index.component.html    |   0
 .../chart-index/chart-index.component.scss    |   0
 .../chart-index/chart-index.component.spec.ts |   0
 .../chart-index/chart-index.component.ts      |   0
 .../chart-item/chart-item.component.html      |   0
 .../chart-item/chart-item.component.scss      |   0
 .../chart-item/chart-item.component.spec.ts   |   2 +-
 .../chart-item/chart-item.component.ts        |   0
 .../chart-list/chart-list.component.html      |   0
 .../chart-list/chart-list.component.scss      |   0
 .../chart-list/chart-list.component.spec.ts   |   0
 .../chart-list/chart-list.component.ts        |   0
 .../monocular/charts/charts.component.html    |   0
 .../monocular/charts/charts.component.scss    |   0
 .../monocular/charts/charts.component.spec.ts |   2 +-
 .../helm/monocular/charts/charts.component.ts |   0
 .../list-filters/list-filters.component.html  |   0
 .../list-filters/list-filters.component.scss  |   0
 .../list-filters.component.spec.ts            |   0
 .../list-filters/list-filters.component.ts    |   0
 .../list-item/list-item.component.html        |   0
 .../list-item/list-item.component.scss        |   0
 .../list-item/list-item.component.spec.ts     |   0
 .../list-item/list-item.component.ts          |   0
 .../monocular/loader/loader.component.html    |   0
 .../monocular/loader/loader.component.scss    |   0
 .../monocular/loader/loader.component.spec.ts |   0
 .../helm/monocular/loader/loader.component.ts |   0
 .../src}/helm/monocular/monocular.module.ts   |   2 +-
 .../helm/monocular/panel/panel.component.html |   0
 .../helm/monocular/panel/panel.component.scss |   0
 .../monocular/panel/panel.component.spec.ts   |   0
 .../helm/monocular/panel/panel.component.ts   |   0
 .../monocular/shared/models/chart-version.ts  |   0
 .../helm/monocular/shared/models/chart.ts     |   0
 .../monocular/shared/models/maintainer.ts     |   0
 .../src}/helm/monocular/shared/models/repo.ts |   0
 .../src}/helm/monocular/shared/seo.data.ts    |   0
 .../shared/services/chart.service.mock.ts     |   0
 .../shared/services/charts.service.ts         |   4 +-
 .../shared/services/config.service.ts         |   0
 .../monocular/shared/services/menu.service.ts |   0
 .../shared/services/repos.service.ts          |   2 +-
 .../stratos-monocular-providers.helpers.ts    |   0
 .../monocular/stratos-monocular.helper.ts     |   0
 .../src}/helm/store/helm.action-builders.ts   |   4 +-
 .../src}/helm/store/helm.actions.ts           |   6 +--
 .../src}/helm/store/helm.effects.ts           |  32 ++++++++--------
 .../src}/helm/store/helm.types.ts             |   0
 .../catalog-tab/catalog-tab.component.html    |   0
 .../catalog-tab/catalog-tab.component.scss    |   0
 .../catalog-tab/catalog-tab.component.spec.ts |   0
 .../tabs/catalog-tab/catalog-tab.component.ts |   2 +-
 .../custom => kubernetes/src}/helm/theme.scss |   0
 .../src/kube-package-routing.module.ts}       |   2 +-
 .../kubernetes/src/kube-package.module.ts     |  22 +++++++++++
 .../analysis-report-runner.component.html     |   0
 .../analysis-report-runner.component.scss     |   0
 .../analysis-report-runner.component.spec.ts  |   8 ++--
 .../analysis-report-runner.component.ts       |   0
 .../analysis-report-selector.component.html   |   0
 .../analysis-report-selector.component.scss   |   0
 ...analysis-report-selector.component.spec.ts |   6 +--
 .../analysis-report-selector.component.ts     |   2 +-
 .../analysis-report-viewer.component.html     |   0
 .../analysis-report-viewer.component.scss     |   0
 .../analysis-report-viewer.component.spec.ts  |   0
 .../analysis-report-viewer.component.ts       |   0
 .../kube-score-report-viewer.component.html   |   0
 .../kube-score-report-viewer.component.scss   |   0
 ...kube-score-report-viewer.component.spec.ts |   6 +--
 .../kube-score-report-viewer.component.ts     |   0
 .../popeye-report-viewer.component.html       |   0
 .../popeye-report-viewer.component.scss       |   0
 .../popeye-report-viewer.component.spec.ts    |   6 +--
 .../popeye-report-viewer.component.ts         |   0
 .../resource-alert-preview.component.html     |   0
 .../resource-alert-preview.component.scss     |   0
 .../resource-alert-preview.component.spec.ts  |   0
 .../resource-alert-preview.component.ts       |   2 +-
 .../resource-alert-view.component.html        |   0
 .../resource-alert-view.component.scss        |   0
 .../resource-alert-view.component.spec.ts     |   6 +--
 .../resource-alert-view.component.ts          |   0
 .../kubernetes-aws-auth-form.component.html   |   0
 .../kubernetes-aws-auth-form.component.scss   |   0
 ...kubernetes-aws-auth-form.component.spec.ts |   2 +-
 .../kubernetes-aws-auth-form.component.ts     |   3 +-
 .../kubernetes-certs-auth-form.component.html |   0
 .../kubernetes-certs-auth-form.component.scss |   0
 ...bernetes-certs-auth-form.component.spec.ts |   2 +-
 .../kubernetes-certs-auth-form.component.ts   |   3 +-
 ...kubernetes-config-auth-form.component.html |   0
 ...kubernetes-config-auth-form.component.scss |   0
 ...ernetes-config-auth-form.component.spec.ts |   2 +-
 .../kubernetes-config-auth-form.component.ts  |   3 +-
 .../kubernetes-gke-auth-form.component.html   |   0
 .../kubernetes-gke-auth-form.component.scss   |   0
 ...kubernetes-gke-auth-form.component.spec.ts |   2 +-
 .../kubernetes-gke-auth-form.component.ts     |   3 +-
 .../kube-config-auth.helper.ts                |  10 ++---
 .../kube-config-import.component.html         |   0
 .../kube-config-import.component.scss         |   0
 .../kube-config-import.component.spec.ts      |   0
 .../kube-config-import.component.ts           |  26 ++++++-------
 ...-config-table-import-status.component.html |   0
 ...-config-table-import-status.component.scss |   0
 ...nfig-table-import-status.component.spec.ts |   0
 ...be-config-table-import-status.component.ts |   4 +-
 .../kube-config-registration.component.html   |   0
 .../kube-config-registration.component.scss   |   0
 ...kube-config-registration.component.spec.ts |   0
 .../kube-config-registration.component.ts     |   0
 .../kube-config-selection.component.html      |   0
 .../kube-config-selection.component.scss      |   0
 .../kube-config-selection.component.spec.ts   |   0
 .../kube-config-selection.component.ts        |  10 ++---
 .../kube-config-table-cert.component.html     |   0
 .../kube-config-table-cert.component.scss     |   0
 .../kube-config-table-cert.component.spec.ts  |   0
 .../kube-config-table-cert.component.ts       |  12 +++---
 .../kube-config-table-name.component.html     |   0
 .../kube-config-table-name.component.scss     |   0
 .../kube-config-table-name.component.spec.ts  |   2 +-
 .../kube-config-table-name.component.ts       |   2 +-
 .../kube-config-table-select.component.html   |   0
 .../kube-config-table-select.component.scss   |   0
 ...kube-config-table-select.component.spec.ts |   0
 .../kube-config-table-select.component.ts     |   2 +-
 ...onfig-table-sub-type-select.component.html |   0
 ...onfig-table-sub-type-select.component.scss |   0
 ...ig-table-sub-type-select.component.spec.ts |   0
 ...-config-table-sub-type-select.component.ts |   2 +-
 ...be-config-table-user-select.component.html |   0
 ...be-config-table-user-select.component.scss |   0
 ...config-table-user-select.component.spec.ts |   0
 ...kube-config-table-user-select.component.ts |   2 +-
 .../kube-config.helper.ts                     |  20 +++++-----
 .../kube-config.types.ts                      |   8 ++--
 .../kube-terminal/kube-console.component.html |   0
 .../kube-terminal/kube-console.component.scss |   0
 .../kube-console.component.spec.ts            |  11 +++---
 .../kube-terminal/kube-console.component.ts   |   4 +-
 .../kubedash-configuration.component.html     |   0
 .../kubedash-configuration.component.scss     |   0
 .../kubedash-configuration.component.spec.ts  |   2 +-
 .../kubedash-configuration.component.ts       |   6 +--
 .../kubernetes-dashboard.component.html       |   0
 .../kubernetes-dashboard.component.scss       |   0
 .../kubernetes-dashboard.component.spec.ts    |   2 +-
 .../kubernetes-dashboard.component.ts         |   4 +-
 .../kubernetes/kubernetes-entity-catalog.ts   |   6 +--
 .../kubernetes/kubernetes-entity-factory.ts   |   8 ++--
 .../kubernetes/kubernetes-entity-generator.ts |  12 +++---
 .../kubernetes/kubernetes-metrics.helpers.ts  |   0
 ...s-namespace-analysis-report.component.html |   0
 ...s-namespace-analysis-report.component.scss |   0
 ...amespace-analysis-report.component.spec.ts |   4 +-
 ...tes-namespace-analysis-report.component.ts |   0
 .../kubernetes-namespace-pods.component.html  |   0
 .../kubernetes-namespace-pods.component.scss  |   0
 .../kubernetes-namespace-pods.component.ts    |   2 +-
 ...bernetes-namespace-services.component.html |   0
 ...bernetes-namespace-services.component.scss |   0
 ...netes-namespace-services.component.spec.ts |   2 +-
 ...kubernetes-namespace-services.component.ts |   2 +-
 .../kubernetes-namespace.component.html       |   0
 .../kubernetes-namespace.component.scss       |   0
 .../kubernetes-namespace.component.ts         |   4 +-
 ...etes-node-metric-stats-card.component.html |   0
 ...etes-node-metric-stats-card.component.scss |   0
 ...s-node-metric-stats-card.component.spec.ts |   0
 ...rnetes-node-metric-stats-card.component.ts |   0
 ...bernetes-node-metrics-chart.component.html |   0
 ...bernetes-node-metrics-chart.component.scss |   0
 ...netes-node-metrics-chart.component.spec.ts |   0
 ...kubernetes-node-metrics-chart.component.ts |  12 +++---
 .../kubernetes-node-metrics.component.html    |   0
 .../kubernetes-node-metrics.component.scss    |   0
 .../kubernetes-node-metrics.component.spec.ts |  20 +++++++---
 .../kubernetes-node-metrics.component.ts      |  10 ++---
 ...bernetes-node-simple-metric.component.html |   0
 ...bernetes-node-simple-metric.component.scss |   0
 ...netes-node-simple-metric.component.spec.ts |   0
 ...kubernetes-node-simple-metric.component.ts |   0
 .../kubernetes-node-pods.component.html       |   0
 .../kubernetes-node-pods.component.scss       |   0
 .../kubernetes-node-pods.component.spec.ts    |   0
 .../kubernetes-node-pods.component.ts         |   2 +-
 .../kubernetes-node.component.html            |   0
 .../kubernetes-node.component.scss            |   0
 .../kubernetes-node.component.spec.ts         |   2 +-
 .../kubernetes-node.component.ts              |   4 +-
 .../src}/kubernetes/kubernetes-page.types.ts  |   0
 .../kubernetes-resource-viewer.component.html |   0
 .../kubernetes-resource-viewer.component.scss |   0
 ...bernetes-resource-viewer.component.spec.ts |   2 +-
 .../kubernetes-resource-viewer.component.ts   |   4 +-
 .../kubernetes-tab-base.component.html        |   0
 .../kubernetes-tab-base.component.scss        |   0
 .../kubernetes-tab-base.component.spec.ts     |   2 +-
 .../kubernetes-tab-base.component.ts          |   4 +-
 .../src}/kubernetes/kubernetes.module.ts      |   4 +-
 .../src}/kubernetes/kubernetes.routing.ts     |   0
 .../kubernetes/kubernetes.setup.module.ts     |  10 ++---
 .../kubernetes/kubernetes.store.module.ts     |   0
 .../kubernetes/kubernetes.testing.module.ts   |  19 +++++----
 .../kubernetes/kubernetes.component.html      |   0
 .../kubernetes/kubernetes.component.scss      |   0
 .../kubernetes/kubernetes.component.spec.ts   |   2 +-
 .../kubernetes/kubernetes.component.ts        |  10 ++---
 .../analysis-reports-list-config.service.ts   |   4 +-
 .../analysis-reports-list-source.ts           |   4 +-
 .../analysis-status-cell.component.html       |   0
 .../analysis-status-cell.component.scss       |   0
 .../analysis-status-cell.component.spec.ts    |   6 +--
 .../analysis-status-cell.component.ts         |   0
 .../list-types/kube-helm-list-types.ts        |   0
 .../kubernetes/list-types/kube-list.helper.ts |   4 +-
 .../kubernetes-endpoints-data-source.ts       |  15 ++++----
 ...ubernetes-endpoints-list-config.service.ts |  19 +++++----
 .../kubernetes-labels-cell.component.html     |   0
 .../kubernetes-labels-cell.component.scss     |   0
 .../kubernetes-labels-cell.component.spec.ts  |   4 +-
 .../kubernetes-labels-cell.component.ts       |   4 +-
 .../kubernetes-namespace-pods-data-source.ts  |   6 +--
 ...etes-namespace-pods-list-config.service.ts |   2 +-
 ...bernetes-namespace-services-data-source.ts |   4 +-
 ...-namespace-services-list-config.service.ts |   2 +-
 .../kube-namespace-pod-count.component.html   |   0
 .../kube-namespace-pod-count.component.scss   |   0
 ...kube-namespace-pod-count.component.spec.ts |   0
 .../kube-namespace-pod-count.component.ts     |   2 +-
 .../kubernetes-namespace-link.component.html  |   0
 .../kubernetes-namespace-link.component.scss  |   0
 ...ubernetes-namespace-link.component.spec.ts |   0
 .../kubernetes-namespace-link.component.ts    |   2 +-
 .../kubernetes-namespaces-data-source.ts      |   8 ++--
 ...bernetes-namespaces-list-config.service.ts |   6 +--
 .../kubernetes-node-pods-data-source.ts       |   6 +--
 ...ubernetes-node-pods-list-config.service.ts |   2 +-
 .../condition-cell.component.html             |   0
 .../condition-cell.component.scss             |   0
 .../condition-cell.component.spec.ts          |   2 +-
 .../condition-cell.component.ts               |   2 +-
 .../kubernetes-node-capacity.component.html   |   0
 .../kubernetes-node-capacity.component.scss   |   0
 ...kubernetes-node-capacity.component.spec.ts |   2 +-
 .../kubernetes-node-capacity.component.ts     |   2 +-
 .../kubernetes-node-ips.component.html        |   0
 .../kubernetes-node-ips.component.scss        |   0
 .../kubernetes-node-ips.component.spec.ts     |   2 +-
 .../kubernetes-node-ips.component.ts          |   2 +-
 .../kubernetes-node-labels.component.html     |   0
 .../kubernetes-node-labels.component.scss     |   0
 .../kubernetes-node-labels.component.spec.ts  |   2 +-
 .../kubernetes-node-labels.component.ts       |   2 +-
 .../kubernetes-node-link.component.html       |   0
 .../kubernetes-node-link.component.scss       |   0
 .../kubernetes-node-link.component.spec.ts    |   0
 .../kubernetes-node-link.component.theme.scss |   0
 .../kubernetes-node-link.component.ts         |   4 +-
 .../kubernetes-node-pressure.component.html   |   0
 .../kubernetes-node-pressure.component.scss   |   0
 ...kubernetes-node-pressure.component.spec.ts |   2 +-
 ...ernetes-node-pressure.component.theme.scss |   0
 .../kubernetes-node-pressure.component.ts     |   2 +-
 ...ernetes-node-condition-card.component.html |   0
 ...ernetes-node-condition-card.component.scss |   0
 ...etes-node-condition-card.component.spec.ts |   0
 ...ubernetes-node-condition-card.component.ts |   0
 .../kubernetes-node-condition.component.html  |   0
 .../kubernetes-node-condition.component.scss  |   0
 .../kubernetes-node-condition.component.ts    |   0
 .../kubernetes-node-info-card.component.html  |   0
 .../kubernetes-node-info-card.component.scss  |   0
 ...ubernetes-node-info-card.component.spec.ts |   0
 .../kubernetes-node-info-card.component.ts    |   0
 ...ubernetes-node-summary-card.component.html |   0
 ...ubernetes-node-summary-card.component.scss |   0
 ...rnetes-node-summary-card.component.spec.ts |   0
 .../kubernetes-node-summary-card.component.ts |   0
 .../kubernetes-node-summary.component.html    |   0
 .../kubernetes-node-summary.component.scss    |   0
 .../kubernetes-node-summary.component.spec.ts |   0
 .../kubernetes-node-summary.component.ts      |   0
 .../kubernetes-node-tags-card.component.html  |   0
 .../kubernetes-node-tags-card.component.scss  |   0
 ...ubernetes-node-tags-card.component.spec.ts |   0
 .../kubernetes-node-tags-card.component.ts    |   2 +-
 .../kubernetes-nodes-data-source.ts           |   8 ++--
 .../kubernetes-nodes-list-config.service.ts   |  10 ++---
 .../node-pod-count.component.html             |   0
 .../node-pod-count.component.scss             |   0
 .../node-pod-count.component.spec.ts          |   0
 .../node-pod-count.component.ts               |   2 +-
 .../kubernetes-pod-containers.component.html  |   0
 .../kubernetes-pod-containers.component.scss  |   0
 ...ubernetes-pod-containers.component.spec.ts |   0
 .../kubernetes-pod-containers.component.ts    |   9 ++---
 .../kubernetes-pod-status.component.html      |   0
 .../kubernetes-pod-status.component.scss      |   0
 .../kubernetes-pod-status.component.spec.ts   |   0
 .../kubernetes-pod-status.component.ts        |   2 +-
 .../kubernetes-pod-tags.component.html        |   0
 .../kubernetes-pod-tags.component.scss        |   0
 .../kubernetes-pod-tags.component.spec.ts     |   0
 .../kubernetes-pod-tags.component.ts          |   4 +-
 .../kubernetes-pods-data-source.ts            |   6 +--
 .../kubernetes-pods-list-config.service.ts    |   8 ++--
 .../kubernetes-service-ports.component.html   |   0
 .../kubernetes-service-ports.component.scss   |   0
 ...kubernetes-service-ports.component.spec.ts |   0
 .../kubernetes-service-ports.component.ts     |   2 +-
 .../kubernetes-service-card.component.html    |   0
 .../kubernetes-service-card.component.scss    |   0
 .../kubernetes-service-card.component.spec.ts |   0
 .../kubernetes-service-card.component.ts      |   0
 .../kubernetes-service-list-config.service.ts |   8 ++--
 .../kubernetes-services-data-source.ts        |   8 ++--
 .../pod-metrics/pod-metrics.component.html    |   0
 .../pod-metrics/pod-metrics.component.scss    |   0
 .../pod-metrics/pod-metrics.component.spec.ts |   2 +-
 .../pod-metrics/pod-metrics.component.ts      |  16 ++++----
 .../services/analysis-report.types.ts         |   0
 .../services/kubernetes-endpoint.service.ts   |  23 +++++------
 .../services/kubernetes-expanded-state.ts     |   0
 .../services/kubernetes-namespace.service.ts  |   2 +-
 .../services/kubernetes-node.service.ts       |  12 +++---
 .../services/kubernetes.analysis.service.ts   |   8 ++--
 .../kubernetes/services/kubernetes.service.ts |  10 ++---
 .../services/kubescore-report.helper.ts       |   0
 .../services/popeye-report.helper.ts          |   0
 .../src}/kubernetes/services/route.helper.ts  |   0
 .../action-builders/kube.action-builders.ts   |   6 +--
 .../src}/kubernetes/store/analysis.actions.ts |   4 +-
 .../src}/kubernetes/store/analysis.effects.ts |  14 ++-----
 .../src}/kubernetes/store/kube.getIds.ts      |  10 ++---
 .../src}/kubernetes/store/kube.types.ts       |   0
 .../kubernetes/store/kubernetes.actions.ts    |  10 ++---
 .../kubernetes/store/kubernetes.effects.ts    |  20 ++++------
 .../analysis-info-card.component.html         |   0
 .../analysis-info-card.component.scss         |   0
 .../analysis-info-card.component.spec.ts      |   0
 .../analysis-info-card.component.theme.scss   |   0
 .../analysis-info-card.component.ts           |   0
 .../kubernetes-analysis-info.component.html   |   0
 .../kubernetes-analysis-info.component.scss   |   0
 ...kubernetes-analysis-info.component.spec.ts |   8 ++--
 .../kubernetes-analysis-info.component.ts     |   2 +-
 .../kubernetes-analysis-report.component.html |   0
 .../kubernetes-analysis-report.component.scss |   0
 ...bernetes-analysis-report.component.spec.ts |   4 +-
 ...netes-analysis-report.component.theme.scss |   0
 .../kubernetes-analysis-report.component.ts   |   0
 .../kubernetes-analysis-tab.component.html    |   0
 .../kubernetes-analysis-tab.component.scss    |   0
 .../kubernetes-analysis-tab.component.spec.ts |   4 +-
 .../kubernetes-analysis-tab.component.ts      |   0
 .../kubernetes-namespaces-tab.component.html  |   0
 .../kubernetes-namespaces-tab.component.scss  |   0
 .../kubernetes-namespaces-tab.component.ts    |   2 +-
 .../kubernetes-nodes-tab.component.html       |   0
 .../kubernetes-nodes-tab.component.scss       |   0
 .../kubernetes-nodes-tab.component.spec.ts    |   0
 .../kubernetes-nodes-tab.component.ts         |   2 +-
 .../kubernetes-pods-tab.component.html        |   0
 .../kubernetes-pods-tab.component.scss        |   0
 .../kubernetes-pods-tab.component.spec.ts     |   0
 .../kubernetes-pods-tab.component.ts          |   2 +-
 .../kubernetes-summary.component.html         |   0
 .../kubernetes-summary.component.scss         |   0
 .../kubernetes-summary.component.spec.ts      |   2 +-
 .../kubernetes-summary.component.theme.scss   |   0
 .../kubernetes-summary.component.ts           |  21 +++++-----
 .../chart-values-editor.component.html        |   0
 .../chart-values-editor.component.scss        |   0
 .../chart-values-editor.component.spec.ts     |   8 ++--
 .../chart-values-editor.component.theme.scss  |   0
 .../chart-values-editor.component.ts          |   6 +--
 .../chart-values-editor/diffvalues.ts         |   0
 .../json-schema-generator.ts                  |   0
 .../workloads/chart-values-editor/merge.ts    |   0
 .../create-release.component.html             |   0
 .../create-release.component.scss             |   0
 .../create-release.component.spec.ts          |  11 +++---
 .../create-release.component.ts               |  11 ++----
 .../helm-release-card.component.html          |   0
 .../helm-release-card.component.scss          |   0
 .../helm-release-card.component.spec.ts       |   0
 .../helm-release-card.component.ts            |   2 +-
 .../helm-release-pods-list-config.service.ts  |   0
 .../helm-release-pods-list-source.ts          |   0
 ...lm-release-services-list-config.service.ts |   0
 .../helm-release-services-list-source.ts      |   0
 .../helm-releases-list-config.service.ts      |   2 +-
 .../list-types/helm-releases-list-source.ts   |   0
 .../kube-namespaces-filter-config.service.ts  |   2 +-
 .../helm-release-socket-service.ts            |   7 ++--
 .../helm-release-tab-base.component.html      |   0
 .../helm-release-tab-base.component.scss      |   0
 .../helm-release-tab-base.component.spec.ts   |   2 +-
 .../helm-release-tab-base.component.ts        |  10 ++---
 .../workloads/release/icon-helper.ts          |   0
 .../helm-release-analysis-tab.component.html  |   0
 .../helm-release-analysis-tab.component.scss  |   0
 ...elm-release-analysis-tab.component.spec.ts |   2 +-
 .../helm-release-analysis-tab.component.ts    |   0
 .../tabs/helm-release-helper.service.ts       |   0
 .../release/tabs/helm-release-helpers.scss    |   0
 .../helm-release-history-tab.component.html   |   0
 .../helm-release-history-tab.component.scss   |   0
 ...helm-release-history-tab.component.spec.ts |   0
 .../helm-release-history-tab.component.ts     |   4 +-
 .../helm-release-notes-tab.component.html     |   0
 .../helm-release-notes-tab.component.scss     |   0
 .../helm-release-notes-tab.component.spec.ts  |   0
 .../helm-release-notes-tab.component.ts       |   0
 .../helm-release-pods-tab.component.html      |   0
 .../helm-release-pods-tab.component.scss      |   0
 .../helm-release-pods-tab.component.spec.ts   |   0
 .../helm-release-pods-tab.component.ts        |   0
 ...helm-release-resource-graph.component.html |   0
 ...helm-release-resource-graph.component.scss |   0
 ...m-release-resource-graph.component.spec.ts |   2 +-
 .../helm-release-resource-graph.component.ts  |   0
 .../helm-release-services-tab.component.html  |   0
 .../helm-release-services-tab.component.scss  |   0
 ...elm-release-services-tab.component.spec.ts |   0
 .../helm-release-services-tab.component.ts    |   0
 .../helm-release-summary-tab.component.html   |   0
 .../helm-release-summary-tab.component.scss   |   2 +-
 ...helm-release-summary-tab.component.spec.ts |   4 +-
 ...m-release-summary-tab.component.theme.scss |   0
 .../helm-release-summary-tab.component.ts     |   4 +-
 .../helm-release-values-tab.component.html    |   0
 .../helm-release-values-tab.component.scss    |   0
 .../helm-release-values-tab.component.spec.ts |   2 +-
 .../helm-release-values-tab.component.ts      |   0
 .../workload-live-reload.component.html       |   0
 .../workload-live-reload.component.scss       |   0
 .../workload-live-reload.component.spec.ts    |   0
 .../workload-live-reload.component.ts         |   0
 .../releases-tab/releases-tab.component.html  |   0
 .../releases-tab/releases-tab.component.scss  |   0
 .../releases-tab.component.spec.ts            |   2 +-
 .../releases-tab/releases-tab.component.ts    |   2 +-
 .../store/workload-action-builders.ts         |   4 +-
 .../store/workloads-entity-factory.ts         |   2 +-
 .../store/workloads-entity-generator.ts       |   6 +--
 .../workloads/store/workloads.actions.ts      |   0
 .../workloads/store/workloads.effects.ts      |  14 ++++---
 .../workloads/store/workloads.reducers.ts     |   0
 .../workloads/store/workloads.store.module.ts |   0
 .../release-version-data-source.ts            |   8 ++--
 .../release-version-list-config.ts            |   8 ++--
 .../upgrade-release.component.html            |   0
 .../upgrade-release.component.scss            |   0
 .../upgrade-release.component.spec.ts         |   0
 .../upgrade-release.component.ts              |   4 +-
 .../kubernetes/workloads/workload.types.ts    |   0
 .../workloads/workloads-entity-catalog.ts     |   4 +-
 .../kubernetes/workloads/workloads.module.ts  |   4 +-
 .../kubernetes/workloads/workloads.routing.ts |   0
 .../workloads/workloads.testing.module.ts     |  19 +++++----
 .../packages/kubernetes/src/public-api.ts     |   4 ++
 src/frontend/packages/kubernetes/src/test.ts  |  36 ++++++++++++++++++
 .../packages/kubernetes/tsconfig.spec.json    |  17 +++++++++
 src/frontend/packages/kubernetes/tslint.json  |   3 ++
 .../packages/suse-extensions/package.json     |   1 -
 .../suse-extensions/sass/_all-theme.scss      |  18 +--------
 .../demo-helper/demo-helper.component.html    |   0
 .../demo-helper/demo-helper.component.scss    |   0
 .../demo-helper/demo-helper.component.spec.ts |   4 +-
 .../demo/demo-helper/demo-helper.component.ts |   4 +-
 .../suse-extensions/src/public-api.ts         |   3 +-
 .../suse-about-info.component.html            |   0
 .../suse-about-info.component.scss            |   0
 .../suse-about-info.component.ts              |   6 +--
 .../suse-login/suse-login.component.html      |   0
 .../suse-login/suse-login.component.scss      |   2 +-
 .../suse-login/suse-login.component.spec.ts   |  10 ++---
 .../suse-login.component.theme.scss           |   0
 .../suse-login/suse-login.component.ts        |   8 ++--
 .../suse-welcome/suse-welcome.component.html  |   0
 .../suse-welcome/suse-welcome.component.scss  |   2 +-
 .../suse-welcome/suse-welcome.component.ts    |   0
 .../src/{custom => }/suse.module.ts           |  17 ++++-----
 src/jetstream/go.mod                          |   1 +
 src/jetstream/go.sum                          |  18 +++++++++
 src/tsconfig.json                             |   3 +-
 556 files changed, 735 insertions(+), 571 deletions(-)
 rename src/frontend/packages/{suse-extensions => kubernetes}/assets/custom/aks.svg (100%)
 rename src/frontend/packages/{suse-extensions => kubernetes}/assets/custom/app_placeholder.svg (100%)
 rename src/frontend/packages/{suse-extensions => kubernetes}/assets/custom/caasp.png (100%)
 rename src/frontend/packages/{suse-extensions => kubernetes}/assets/custom/eks.svg (100%)
 rename src/frontend/packages/{suse-extensions => kubernetes}/assets/custom/gke.svg (100%)
 rename src/frontend/packages/{suse-extensions => kubernetes}/assets/custom/helm.svg (100%)
 rename src/frontend/packages/{suse-extensions => kubernetes}/assets/custom/help/en/connecting_gke.md (100%)
 rename src/frontend/packages/{suse-extensions => kubernetes}/assets/custom/k3s.svg (100%)
 rename src/frontend/packages/{suse-extensions => kubernetes}/assets/custom/kube_import.png (100%)
 rename src/frontend/packages/{suse-extensions => kubernetes}/assets/custom/kubernetes.svg (100%)
 rename src/frontend/packages/{suse-extensions => kubernetes}/assets/custom/placeholder.png (100%)
 create mode 100644 src/frontend/packages/kubernetes/karma.conf.js
 create mode 100644 src/frontend/packages/kubernetes/package.json
 create mode 100644 src/frontend/packages/kubernetes/sass/_all-theme.scss
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/chart-view/monocular.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/chart-view/monocular.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/chart-view/monocular.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/helm-entity-catalog.ts (63%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/helm-entity-factory.ts (96%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/helm-entity-generator.ts (88%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/helm-hub-registration/helm-hub-registration.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/helm-hub-registration/helm-hub-registration.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/helm-hub-registration/helm-hub-registration.component.spec.ts (77%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/helm-hub-registration/helm-hub-registration.component.ts (75%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/helm-testing.module.ts (72%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/helm.module.ts (87%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/helm.routing.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/helm.setup.module.ts (69%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/helm.store.module.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/list-types/monocular-chart-card/monocular-chart-card.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/list-types/monocular-chart-card/monocular-chart-card.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/list-types/monocular-chart-card/monocular-chart-card.component.spec.ts (93%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/list-types/monocular-chart-card/monocular-chart-card.component.theme.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/list-types/monocular-chart-card/monocular-chart-card.component.ts (82%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/list-types/monocular-charts-data-source.ts (71%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/list-types/monocular-charts-list-config.service.ts (90%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular-tab-base/monocular-tab-base.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular-tab-base/monocular-tab-base.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular-tab-base/monocular-tab-base.component.spec.ts (83%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular-tab-base/monocular-tab-base.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular.interceptor.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/app.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-details/chart-details-info/chart-details-info.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-details/chart-details-info/chart-details-info.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-details/chart-details-info/chart-details-info.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-details/chart-details-info/chart-details-info.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts (65%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts (94%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-details/chart-details.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-details/chart-details.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-details/chart-details.component.spec.ts (89%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-details/chart-details.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-index/chart-index.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-index/chart-index.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-index/chart-index.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-index/chart-index.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-item/chart-item.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-item/chart-item.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-item/chart-item.component.spec.ts (93%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-item/chart-item.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-list/chart-list.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-list/chart-list.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-list/chart-list.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/chart-list/chart-list.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/charts/charts.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/charts/charts.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/charts/charts.component.spec.ts (96%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/charts/charts.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/list-filters/list-filters.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/list-filters/list-filters.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/list-filters/list-filters.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/list-filters/list-filters.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/list-item/list-item.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/list-item/list-item.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/list-item/list-item.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/list-item/list-item.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/loader/loader.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/loader/loader.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/loader/loader.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/loader/loader.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/monocular.module.ts (96%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/panel/panel.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/panel/panel.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/panel/panel.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/panel/panel.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/shared/models/chart-version.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/shared/models/chart.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/shared/models/maintainer.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/shared/models/repo.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/shared/seo.data.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/shared/services/chart.service.mock.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/shared/services/charts.service.ts (98%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/shared/services/config.service.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/shared/services/menu.service.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/shared/services/repos.service.ts (95%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/stratos-monocular-providers.helpers.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/monocular/stratos-monocular.helper.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/store/helm.action-builders.ts (89%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/store/helm.actions.ts (93%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/store/helm.effects.ts (93%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/store/helm.types.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/tabs/catalog-tab/catalog-tab.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/tabs/catalog-tab/catalog-tab.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/tabs/catalog-tab/catalog-tab.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/tabs/catalog-tab/catalog-tab.component.ts (80%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/helm/theme.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom/suse-routing.module.ts => kubernetes/src/kube-package-routing.module.ts} (96%)
 create mode 100644 src/frontend/packages/kubernetes/src/kube-package.module.ts
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.spec.ts (81%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.spec.ts (88%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.ts (96%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/analysis-report-viewer.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/analysis-report-viewer.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/analysis-report-viewer.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/analysis-report-viewer.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.spec.ts (88%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.spec.ts (88%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.ts (91%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.spec.ts (88%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts (93%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.ts (83%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts (93%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts (96%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.spec.ts (93%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.ts (93%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.spec.ts (93%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.ts (93%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-auth.helper.ts (92%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts (91%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.ts (76%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-registration.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-registration.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-registration.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-registration.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts (92%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.ts (92%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts (90%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts (79%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.ts (85%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.ts (90%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.ts (88%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config.helper.ts (91%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-config-registration/kube-config.types.ts (85%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-terminal/kube-console.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-terminal/kube-console.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-terminal/kube-console.component.spec.ts (65%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kube-terminal/kube-console.component.ts (92%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts (94%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts (95%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts (94%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts (96%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-entity-catalog.ts (89%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-entity-factory.ts (92%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-entity-generator.ts (95%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-metrics.helpers.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.spec.ts (92%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.ts (84%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts (94%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.ts (84%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-namespace/kubernetes-namespace.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-namespace/kubernetes-namespace.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts (94%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.ts (74%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.spec.ts (71%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts (85%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts (82%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-node/kubernetes-node.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-node/kubernetes-node.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts (94%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-node/kubernetes-node.component.ts (91%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-page.types.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts (94%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts (96%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts (94%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts (93%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes.module.ts (98%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes.routing.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes.setup.module.ts (90%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes.store.module.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes.testing.module.ts (68%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes/kubernetes.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes/kubernetes.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes/kubernetes.component.spec.ts (91%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/kubernetes/kubernetes.component.ts (79%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/analysis-reports-list-config.service.ts (96%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/analysis-reports-list-source.ts (92%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.spec.ts (82%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kube-helm-list-types.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kube-list.helper.ts (88%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts (52%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts (59%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts (92%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.ts (76%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts (79%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts (94%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts (80%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service.ts (93%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.ts (90%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.ts (87%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts (71%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts (91%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts (76%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts (93%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts (92%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts (89%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts (92%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.ts (85%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts (92%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.ts (88%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts (92%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.ts (85%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.theme.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts (91%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts (92%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.theme.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.ts (88%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.ts (90%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts (73%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts (92%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.ts (89%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts (90%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts (93%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.ts (80%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts (73%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts (92%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts (81%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts (83%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts (65%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/pod-metrics/pod-metrics.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/pod-metrics/pod-metrics.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/pod-metrics/pod-metrics.component.spec.ts (93%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/pod-metrics/pod-metrics.component.ts (88%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/services/analysis-report.types.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/services/kubernetes-endpoint.service.ts (92%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/services/kubernetes-expanded-state.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/services/kubernetes-namespace.service.ts (93%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/services/kubernetes-node.service.ts (84%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/services/kubernetes.analysis.service.ts (93%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/services/kubernetes.service.ts (64%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/services/kubescore-report.helper.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/services/popeye-report.helper.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/services/route.helper.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/store/action-builders/kube.action-builders.ts (97%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/store/analysis.actions.ts (94%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/store/analysis.effects.ts (93%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/store/kube.getIds.ts (93%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/store/kube.types.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/store/kubernetes.actions.ts (97%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/store/kubernetes.effects.ts (95%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.theme.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.spec.ts (81%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.ts (93%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.spec.ts (89%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.theme.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.spec.ts (90%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.ts (86%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.ts (83%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.ts (82%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts (93%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.theme.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts (91%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/chart-values-editor/chart-values-editor.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/chart-values-editor/chart-values-editor.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/chart-values-editor/chart-values-editor.component.spec.ts (80%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/chart-values-editor/chart-values-editor.component.theme.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts (97%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/chart-values-editor/diffvalues.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/chart-values-editor/json-schema-generator.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/chart-values-editor/merge.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/create-release/create-release.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/create-release/create-release.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/create-release/create-release.component.spec.ts (74%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/create-release/create-release.component.ts (96%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts (93%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/list-types/helm-release-pods-list-config.service.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/list-types/helm-release-pods-list-source.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/list-types/helm-release-services-list-config.service.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/list-types/helm-release-services-list-source.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/list-types/helm-releases-list-config.service.ts (98%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/list-types/helm-releases-list-source.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts (97%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/helm-release-tab-base/helm-release-socket-service.ts (94%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts (95%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts (86%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/icon-helper.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.spec.ts (95%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-helper.service.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-helpers.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.ts (91%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts (95%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss (96%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts (89%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.theme.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts (98%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts (92%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/releases-tab/releases-tab.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/releases-tab/releases-tab.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts (92%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/releases-tab/releases-tab.component.ts (92%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/store/workload-action-builders.ts (94%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/store/workloads-entity-factory.ts (96%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/store/workloads-entity-generator.ts (93%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/store/workloads.actions.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/store/workloads.effects.ts (94%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/store/workloads.reducers.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/store/workloads.store.module.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/upgrade-release/release-version-data-source.ts (80%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/upgrade-release/release-version-list-config.ts (88%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/upgrade-release/upgrade-release.component.html (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/upgrade-release/upgrade-release.component.scss (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/upgrade-release/upgrade-release.component.spec.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/upgrade-release/upgrade-release.component.ts (97%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/workload.types.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/workloads-entity-catalog.ts (84%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/workloads.module.ts (95%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/workloads.routing.ts (100%)
 rename src/frontend/packages/{suse-extensions/src/custom => kubernetes/src}/kubernetes/workloads/workloads.testing.module.ts (66%)
 create mode 100644 src/frontend/packages/kubernetes/src/public-api.ts
 create mode 100644 src/frontend/packages/kubernetes/src/test.ts
 create mode 100644 src/frontend/packages/kubernetes/tsconfig.spec.json
 create mode 100644 src/frontend/packages/kubernetes/tslint.json
 rename src/frontend/packages/suse-extensions/src/{custom => }/demo/demo-helper/demo-helper.component.html (100%)
 rename src/frontend/packages/suse-extensions/src/{custom => }/demo/demo-helper/demo-helper.component.scss (100%)
 rename src/frontend/packages/suse-extensions/src/{custom => }/demo/demo-helper/demo-helper.component.spec.ts (84%)
 rename src/frontend/packages/suse-extensions/src/{custom => }/demo/demo-helper/demo-helper.component.ts (83%)
 rename src/frontend/packages/suse-extensions/src/{custom => }/suse-about-info/suse-about-info.component.html (100%)
 rename src/frontend/packages/suse-extensions/src/{custom => }/suse-about-info/suse-about-info.component.scss (100%)
 rename src/frontend/packages/suse-extensions/src/{custom => }/suse-about-info/suse-about-info.component.ts (79%)
 rename src/frontend/packages/suse-extensions/src/{custom => }/suse-login/suse-login.component.html (100%)
 rename src/frontend/packages/suse-extensions/src/{custom => }/suse-login/suse-login.component.scss (98%)
 rename src/frontend/packages/suse-extensions/src/{custom => }/suse-login/suse-login.component.spec.ts (78%)
 rename src/frontend/packages/suse-extensions/src/{custom => }/suse-login/suse-login.component.theme.scss (100%)
 rename src/frontend/packages/suse-extensions/src/{custom => }/suse-login/suse-login.component.ts (66%)
 rename src/frontend/packages/suse-extensions/src/{custom => }/suse-welcome/suse-welcome.component.html (100%)
 rename src/frontend/packages/suse-extensions/src/{custom => }/suse-welcome/suse-welcome.component.scss (93%)
 rename src/frontend/packages/suse-extensions/src/{custom => }/suse-welcome/suse-welcome.component.ts (100%)
 rename src/frontend/packages/suse-extensions/src/{custom => }/suse.module.ts (68%)

diff --git a/angular.json b/angular.json
index 18d9daa972..31c5a47d56 100644
--- a/angular.json
+++ b/angular.json
@@ -376,6 +376,34 @@
           }
         }
       }
+    },
+    "kubernetes": {
+      "root": "src/frontend/packages/kubernetes",
+      "sourceRoot": "src/frontend/packages/kubernetes/src",
+      "projectType": "library",
+      "prefix": "lib",
+      "architect": {
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/frontend/packages/kubernetes/src/test.ts",
+            "tsConfig": "src/frontend/packages/kubernetes/tsconfig.spec.json",
+            "karmaConfig": "src/frontend/packages/kubernetes/karma.conf.js"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "src/tsconfig.json"
+            ],
+            "tslintConfig": "src/frontend/packages/kubernetes/tslint.json",
+            "files": [
+              "src/frontend/packages/kubernetes/src/**/*.ts"
+            ]
+          }
+        }
+      }
     }
 
   },
diff --git a/package.json b/package.json
index 91cc3b68b1..6a2065af21 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
     "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",
     "test-frontend:extensions": "NG_TEST_SUITE=extensions ng test extensions --code-coverage --watch=false",
+    "test-frontend:kubernetes": "NG_TEST_SUITE=kubernetes ng test kubernetes --code-coverage --watch=false",
     "posttest": "nyc report --reporter=html --reporter=lcovonly --reporter=json --tempDir=coverage/nyc",
     "codecov": "codecov -f coverage/coverage-final.json",
     "lint": "ng lint --format stylish",
diff --git a/src/frontend/packages/core/src/features/login/logout-page/logout-page.component.spec.ts b/src/frontend/packages/core/src/features/login/logout-page/logout-page.component.spec.ts
index fff7bac83e..5029385a87 100644
--- a/src/frontend/packages/core/src/features/login/logout-page/logout-page.component.spec.ts
+++ b/src/frontend/packages/core/src/features/login/logout-page/logout-page.component.spec.ts
@@ -1,11 +1,11 @@
 import { CommonModule } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { CoreModule } from '@angular/flex-layout';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { StoreModule } from '@ngrx/store';
 
 import { appReducers } from '../../../../../store/src/reducers.module';
+import { CoreModule } from '../../../core/core.module';
 import { SharedModule } from '../../../public-api';
 import { LogoutPageComponent } from './logout-page.component';
 
@@ -15,7 +15,7 @@ describe('LogoutPageComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ LogoutPageComponent ],
+      declarations: [LogoutPageComponent],
       imports: [
         CommonModule,
         CoreModule,
@@ -27,7 +27,7 @@ describe('LogoutPageComponent', () => {
         )
       ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/frontend/packages/suse-extensions/assets/custom/aks.svg b/src/frontend/packages/kubernetes/assets/custom/aks.svg
similarity index 100%
rename from src/frontend/packages/suse-extensions/assets/custom/aks.svg
rename to src/frontend/packages/kubernetes/assets/custom/aks.svg
diff --git a/src/frontend/packages/suse-extensions/assets/custom/app_placeholder.svg b/src/frontend/packages/kubernetes/assets/custom/app_placeholder.svg
similarity index 100%
rename from src/frontend/packages/suse-extensions/assets/custom/app_placeholder.svg
rename to src/frontend/packages/kubernetes/assets/custom/app_placeholder.svg
diff --git a/src/frontend/packages/suse-extensions/assets/custom/caasp.png b/src/frontend/packages/kubernetes/assets/custom/caasp.png
similarity index 100%
rename from src/frontend/packages/suse-extensions/assets/custom/caasp.png
rename to src/frontend/packages/kubernetes/assets/custom/caasp.png
diff --git a/src/frontend/packages/suse-extensions/assets/custom/eks.svg b/src/frontend/packages/kubernetes/assets/custom/eks.svg
similarity index 100%
rename from src/frontend/packages/suse-extensions/assets/custom/eks.svg
rename to src/frontend/packages/kubernetes/assets/custom/eks.svg
diff --git a/src/frontend/packages/suse-extensions/assets/custom/gke.svg b/src/frontend/packages/kubernetes/assets/custom/gke.svg
similarity index 100%
rename from src/frontend/packages/suse-extensions/assets/custom/gke.svg
rename to src/frontend/packages/kubernetes/assets/custom/gke.svg
diff --git a/src/frontend/packages/suse-extensions/assets/custom/helm.svg b/src/frontend/packages/kubernetes/assets/custom/helm.svg
similarity index 100%
rename from src/frontend/packages/suse-extensions/assets/custom/helm.svg
rename to src/frontend/packages/kubernetes/assets/custom/helm.svg
diff --git a/src/frontend/packages/suse-extensions/assets/custom/help/en/connecting_gke.md b/src/frontend/packages/kubernetes/assets/custom/help/en/connecting_gke.md
similarity index 100%
rename from src/frontend/packages/suse-extensions/assets/custom/help/en/connecting_gke.md
rename to src/frontend/packages/kubernetes/assets/custom/help/en/connecting_gke.md
diff --git a/src/frontend/packages/suse-extensions/assets/custom/k3s.svg b/src/frontend/packages/kubernetes/assets/custom/k3s.svg
similarity index 100%
rename from src/frontend/packages/suse-extensions/assets/custom/k3s.svg
rename to src/frontend/packages/kubernetes/assets/custom/k3s.svg
diff --git a/src/frontend/packages/suse-extensions/assets/custom/kube_import.png b/src/frontend/packages/kubernetes/assets/custom/kube_import.png
similarity index 100%
rename from src/frontend/packages/suse-extensions/assets/custom/kube_import.png
rename to src/frontend/packages/kubernetes/assets/custom/kube_import.png
diff --git a/src/frontend/packages/suse-extensions/assets/custom/kubernetes.svg b/src/frontend/packages/kubernetes/assets/custom/kubernetes.svg
similarity index 100%
rename from src/frontend/packages/suse-extensions/assets/custom/kubernetes.svg
rename to src/frontend/packages/kubernetes/assets/custom/kubernetes.svg
diff --git a/src/frontend/packages/suse-extensions/assets/custom/placeholder.png b/src/frontend/packages/kubernetes/assets/custom/placeholder.png
similarity index 100%
rename from src/frontend/packages/suse-extensions/assets/custom/placeholder.png
rename to src/frontend/packages/kubernetes/assets/custom/placeholder.png
diff --git a/src/frontend/packages/kubernetes/karma.conf.js b/src/frontend/packages/kubernetes/karma.conf.js
new file mode 100644
index 0000000000..c23e417786
--- /dev/null
+++ b/src/frontend/packages/kubernetes/karma.conf.js
@@ -0,0 +1,8 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+  config.set({
+    ...require('../../../../build/karma.conf.creator.js')('extensions')(config)
+  })
+}
diff --git a/src/frontend/packages/kubernetes/package.json b/src/frontend/packages/kubernetes/package.json
new file mode 100644
index 0000000000..81032a063e
--- /dev/null
+++ b/src/frontend/packages/kubernetes/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "@stratosui/kubernetes",
+  "version": "0.0.1",
+  "peerDependencies": {
+    "@angular/common": "^6.0.0-rc.0 || ^6.0.0",
+    "@angular/core": "^6.0.0-rc.0 || ^6.0.0"
+  },
+  "stratos": {
+    "module": "KubePackageModule",
+    "routingModule": "KubePackageModuleRoutingModule",
+    "theming": "sass/_all-theme#apply-theme-kubernetes",
+    "assets": {
+      "assets": "core/assets"
+    }
+  }
+}
diff --git a/src/frontend/packages/kubernetes/sass/_all-theme.scss b/src/frontend/packages/kubernetes/sass/_all-theme.scss
new file mode 100644
index 0000000000..8a917544fa
--- /dev/null
+++ b/src/frontend/packages/kubernetes/sass/_all-theme.scss
@@ -0,0 +1,24 @@
+// Theming for the copmponents in the Kubernetes package
+
+@import '../src/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.theme';
+@import '../src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.theme';
+@import '../src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.theme';
+@import '../src/helm/list-types/monocular-chart-card/monocular-chart-card.component.theme';
+@import '../src/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.theme';
+@import '../src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.theme';
+@import '../src/kubernetes/workloads/chart-values-editor/chart-values-editor.component.theme';
+
+@mixin apply-theme-kubernetes($stratos-theme) {
+
+  $theme: map-get($stratos-theme, theme);
+  $app-theme: map-get($stratos-theme, app-theme);
+
+  @include kube-summary-theme($theme, $app-theme);
+  @include kube-analysis-report-theme($theme, $app-theme);
+  @include kube-analysis-card-theme($theme, $app-theme);
+  @include monocular-chart-card($theme, $app-theme);
+  @include helm-release-summary-tab-theme($theme, $app-theme);
+  @include kube-node-link-theme($theme, $app-theme);
+  @include app-chart-values-editor-theme($theme, $app-theme);
+
+}
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.html b/src/frontend/packages/kubernetes/src/helm/chart-view/monocular.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.html
rename to src/frontend/packages/kubernetes/src/helm/chart-view/monocular.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.scss b/src/frontend/packages/kubernetes/src/helm/chart-view/monocular.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.scss
rename to src/frontend/packages/kubernetes/src/helm/chart-view/monocular.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.ts b/src/frontend/packages/kubernetes/src/helm/chart-view/monocular.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/chart-view/monocular.component.ts
rename to src/frontend/packages/kubernetes/src/helm/chart-view/monocular.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-catalog.ts b/src/frontend/packages/kubernetes/src/helm/helm-entity-catalog.ts
similarity index 63%
rename from src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-catalog.ts
rename to src/frontend/packages/kubernetes/src/helm/helm-entity-catalog.ts
index 83dda2cd49..ec62f85798 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-catalog.ts
+++ b/src/frontend/packages/kubernetes/src/helm/helm-entity-catalog.ts
@@ -1,4 +1,14 @@
-import { StratosCatalogEndpointEntity, StratosCatalogEntity } from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity'; import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types'; import { MonocularChart, HelmVersion, MonocularVersion } from './store/helm.types'; import { HelmChartActionBuilders, HelmVersionActionBuilders, HelmChartVersionsActionBuilders } from './store/helm.action-builders';
+import {
+  StratosCatalogEndpointEntity,
+  StratosCatalogEntity,
+} from '../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { IFavoriteMetadata } from '../../../store/src/types/user-favorites.types';
+import {
+  HelmChartActionBuilders,
+  HelmChartVersionsActionBuilders,
+  HelmVersionActionBuilders,
+} from './store/helm.action-builders';
+import { HelmVersion, MonocularChart, MonocularVersion } from './store/helm.types';
 
 /**
  * A strongly typed collection of Helm Catalog Entities.
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-factory.ts b/src/frontend/packages/kubernetes/src/helm/helm-entity-factory.ts
similarity index 96%
rename from src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-factory.ts
rename to src/frontend/packages/kubernetes/src/helm/helm-entity-factory.ts
index 3449e60e33..3746c87fef 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-factory.ts
+++ b/src/frontend/packages/kubernetes/src/helm/helm-entity-factory.ts
@@ -1,6 +1,6 @@
 import { Schema, schema } from 'normalizr';
 
-import { EntitySchema } from '../../../../store/src/helpers/entity-schema';
+import { EntitySchema } from '../../../store/src/helpers/entity-schema';
 import { stratosMonocularEndpointGuid } from './monocular/stratos-monocular.helper';
 import { HelmVersion, MonocularChart } from './store/helm.types';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-generator.ts b/src/frontend/packages/kubernetes/src/helm/helm-entity-generator.ts
similarity index 88%
rename from src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-generator.ts
rename to src/frontend/packages/kubernetes/src/helm/helm-entity-generator.ts
index 23722669e3..7e14101f7a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-generator.ts
+++ b/src/frontend/packages/kubernetes/src/helm/helm-entity-generator.ts
@@ -2,17 +2,17 @@ import { Store } from '@ngrx/store';
 import { of } from 'rxjs';
 import { catchError, first, map } from 'rxjs/operators';
 
-import { IListAction } from '../../../../core/src/shared/components/list/list.component.types';
-import { AppState } from '../../../../store/src/app-state';
+import { IListAction } from '../../../core/src/shared/components/list/list.component.types';
+import { AppState } from '../../../store/src/app-state';
 import {
   StratosBaseCatalogEntity,
   StratosCatalogEndpointEntity,
   StratosCatalogEntity,
-} from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
-import { StratosEndpointExtensionDefinition } from '../../../../store/src/entity-catalog/entity-catalog.types';
-import { stratosEntityCatalog } from '../../../../store/src/stratos-entity-catalog';
-import { EndpointModel } from '../../../../store/src/types/endpoint.types';
-import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types';
+} from '../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { StratosEndpointExtensionDefinition } from '../../../store/src/entity-catalog/entity-catalog.types';
+import { EndpointModel } from '../../../store/src/public-api';
+import { stratosEntityCatalog } from '../../../store/src/stratos-entity-catalog';
+import { IFavoriteMetadata } from '../../../store/src/types/user-favorites.types';
 import { helmEntityCatalog } from './helm-entity-catalog';
 import {
   HELM_ENDPOINT_TYPE,
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm-hub-registration/helm-hub-registration.component.html b/src/frontend/packages/kubernetes/src/helm/helm-hub-registration/helm-hub-registration.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/helm-hub-registration/helm-hub-registration.component.html
rename to src/frontend/packages/kubernetes/src/helm/helm-hub-registration/helm-hub-registration.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm-hub-registration/helm-hub-registration.component.scss b/src/frontend/packages/kubernetes/src/helm/helm-hub-registration/helm-hub-registration.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/helm-hub-registration/helm-hub-registration.component.scss
rename to src/frontend/packages/kubernetes/src/helm/helm-hub-registration/helm-hub-registration.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm-hub-registration/helm-hub-registration.component.spec.ts b/src/frontend/packages/kubernetes/src/helm/helm-hub-registration/helm-hub-registration.component.spec.ts
similarity index 77%
rename from src/frontend/packages/suse-extensions/src/custom/helm/helm-hub-registration/helm-hub-registration.component.spec.ts
rename to src/frontend/packages/kubernetes/src/helm/helm-hub-registration/helm-hub-registration.component.spec.ts
index df9c494821..69893fc648 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/helm-hub-registration/helm-hub-registration.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/helm/helm-hub-registration/helm-hub-registration.component.spec.ts
@@ -1,8 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { EndpointsService } from '../../../../../core/src/core/endpoints.service';
-import { UserService } from '../../../../../core/src/core/user.service';
-import { BaseTestModules } from '../../../../../core/test-framework/core-test.helper';
+import { EndpointsService } from '../../../../core/src/core/endpoints.service';
+import { UserService } from '../../../../core/src/core/user.service';
+import { BaseTestModules } from '../../../../core/test-framework/core-test.helper';
 import { HelmHubRegistrationComponent } from './helm-hub-registration.component';
 
 describe('HelmHubRegistrationComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm-hub-registration/helm-hub-registration.component.ts b/src/frontend/packages/kubernetes/src/helm/helm-hub-registration/helm-hub-registration.component.ts
similarity index 75%
rename from src/frontend/packages/suse-extensions/src/custom/helm/helm-hub-registration/helm-hub-registration.component.ts
rename to src/frontend/packages/kubernetes/src/helm/helm-hub-registration/helm-hub-registration.component.ts
index 2b1a2ceeb3..45adcc2cdc 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/helm-hub-registration/helm-hub-registration.component.ts
+++ b/src/frontend/packages/kubernetes/src/helm/helm-hub-registration/helm-hub-registration.component.ts
@@ -1,9 +1,9 @@
 import { Component } from '@angular/core';
 import { filter, map, pairwise } from 'rxjs/operators';
 
-import { StepOnNextFunction } from '../../../../../core/src/shared/components/stepper/step/step.component';
-import { ActionState } from '../../../../../store/src/reducers/api-request-reducer/types';
-import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
+import { StepOnNextFunction } from '../../../../core/src/shared/components/stepper/step/step.component';
+import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
+import { stratosEntityCatalog } from '../../../../store/src/stratos-entity-catalog';
 import { HELM_ENDPOINT_TYPE, HELM_HUB_ENDPOINT_TYPE } from '../helm-entity-factory';
 
 @Component({
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm-testing.module.ts b/src/frontend/packages/kubernetes/src/helm/helm-testing.module.ts
similarity index 72%
rename from src/frontend/packages/suse-extensions/src/custom/helm/helm-testing.module.ts
rename to src/frontend/packages/kubernetes/src/helm/helm-testing.module.ts
index d995b63748..db5308232e 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/helm-testing.module.ts
+++ b/src/frontend/packages/kubernetes/src/helm/helm-testing.module.ts
@@ -1,16 +1,19 @@
 import { HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
 import { NgModule } from '@angular/core';
-import { CoreModule } from '@angular/flex-layout';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
-import { SharedModule } from '@stratosui/core';
+import { CoreModule, SharedModule } from '@stratosui/core';
 
-import { AppTestModule } from '../../../../core/test-framework/core-test.helper';
-import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../../../store/src/entity-catalog.module';
-import { entityCatalog, TestEntityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
-import { generateStratosEntities } from '../../../../store/src/stratos-entity-generator';
-import { createBasicStoreModule } from '../../../../store/testing/public-api';
+import { AppTestModule } from '../../../core/test-framework/core-test.helper';
+import {
+  CATALOGUE_ENTITIES,
+  entityCatalog,
+  EntityCatalogFeatureModule,
+  TestEntityCatalog,
+} from '../../../store/src/public-api';
+import { generateStratosEntities } from '../../../store/src/stratos-entity-generator';
+import { createBasicStoreModule } from '../../../store/testing/public-api';
 import { HelmReleaseGuid } from '../kubernetes/workloads/workload.types';
 import { generateHelmEntities } from './helm-entity-generator';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm.module.ts b/src/frontend/packages/kubernetes/src/helm/helm.module.ts
similarity index 87%
rename from src/frontend/packages/suse-extensions/src/custom/helm/helm.module.ts
rename to src/frontend/packages/kubernetes/src/helm/helm.module.ts
index 02f818996c..e2229215bf 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/helm.module.ts
+++ b/src/frontend/packages/kubernetes/src/helm/helm.module.ts
@@ -1,8 +1,8 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 
-import { CoreModule } from '../../../../core/src/core/core.module';
-import { SharedModule } from '../../../../core/src/shared/shared.module';
+import { CoreModule } from '../../../core/src/core/core.module';
+import { SharedModule } from '../../../core/src/shared/shared.module';
 import { MonocularChartViewComponent } from './chart-view/monocular.component';
 import { HelmRoutingModule } from './helm.routing';
 import { MonocularChartCardComponent } from './list-types/monocular-chart-card/monocular-chart-card.component';
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm.routing.ts b/src/frontend/packages/kubernetes/src/helm/helm.routing.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/helm.routing.ts
rename to src/frontend/packages/kubernetes/src/helm/helm.routing.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm.setup.module.ts b/src/frontend/packages/kubernetes/src/helm/helm.setup.module.ts
similarity index 69%
rename from src/frontend/packages/suse-extensions/src/custom/helm/helm.setup.module.ts
rename to src/frontend/packages/kubernetes/src/helm/helm.setup.module.ts
index 3a57d47e51..29ca39d039 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/helm.setup.module.ts
+++ b/src/frontend/packages/kubernetes/src/helm/helm.setup.module.ts
@@ -2,13 +2,13 @@ import { CommonModule } from '@angular/common';
 import { NgModule, Optional, SkipSelf } from '@angular/core';
 import { Store } from '@ngrx/store';
 
-import { CoreModule } from '../../../../core/src/core/core.module';
-import { EndpointsService } from '../../../../core/src/core/endpoints.service';
-import { SharedModule } from '../../../../core/src/shared/shared.module';
-import { GetSystemInfo } from '../../../../store/src/actions/system.actions';
-import { AppState } from '../../../../store/src/app-state';
-import { EntityCatalogModule } from '../../../../store/src/entity-catalog.module';
-import { EndpointHealthCheck } from '../../../../store/src/entity-catalog/entity-catalog.types';
+import { EndpointsService } from '../../../core/src/core/endpoints.service';
+import { CoreModule } from '../../../core/src/public-api';
+import { SharedModule } from '../../../core/src/shared/shared.module';
+import { GetSystemInfo } from '../../../store/src/actions/system.actions';
+import { EntityCatalogModule } from '../../../store/src/entity-catalog.module';
+import { EndpointHealthCheck } from '../../../store/src/entity-catalog/entity-catalog.types';
+import { AppState } from '../../../store/src/public-api';
 import { HELM_ENDPOINT_TYPE } from './helm-entity-factory';
 import { generateHelmEntities } from './helm-entity-generator';
 import { HelmHubRegistrationComponent } from './helm-hub-registration/helm-hub-registration.component';
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/helm.store.module.ts b/src/frontend/packages/kubernetes/src/helm/helm.store.module.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/helm.store.module.ts
rename to src/frontend/packages/kubernetes/src/helm/helm.store.module.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.html b/src/frontend/packages/kubernetes/src/helm/list-types/monocular-chart-card/monocular-chart-card.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.html
rename to src/frontend/packages/kubernetes/src/helm/list-types/monocular-chart-card/monocular-chart-card.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.scss b/src/frontend/packages/kubernetes/src/helm/list-types/monocular-chart-card/monocular-chart-card.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.scss
rename to src/frontend/packages/kubernetes/src/helm/list-types/monocular-chart-card/monocular-chart-card.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.spec.ts b/src/frontend/packages/kubernetes/src/helm/list-types/monocular-chart-card/monocular-chart-card.component.spec.ts
similarity index 93%
rename from src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.spec.ts
rename to src/frontend/packages/kubernetes/src/helm/list-types/monocular-chart-card/monocular-chart-card.component.spec.ts
index 14b4272b60..7075b41929 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/helm/list-types/monocular-chart-card/monocular-chart-card.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { BaseTestModulesNoShared } from '../../../../../../core/test-framework/core-test.helper';
+import { BaseTestModulesNoShared } from '../../../../../core/test-framework/core-test.helper';
 import { ChartItemComponent } from '../../monocular/chart-item/chart-item.component';
 import { ListItemComponent } from '../../monocular/list-item/list-item.component';
 import { ChartsService } from '../../monocular/shared/services/charts.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.theme.scss b/src/frontend/packages/kubernetes/src/helm/list-types/monocular-chart-card/monocular-chart-card.component.theme.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.theme.scss
rename to src/frontend/packages/kubernetes/src/helm/list-types/monocular-chart-card/monocular-chart-card.component.theme.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.ts b/src/frontend/packages/kubernetes/src/helm/list-types/monocular-chart-card/monocular-chart-card.component.ts
similarity index 82%
rename from src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.ts
rename to src/frontend/packages/kubernetes/src/helm/list-types/monocular-chart-card/monocular-chart-card.component.ts
index 06aa2fa3cb..fe540b5c52 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.ts
+++ b/src/frontend/packages/kubernetes/src/helm/list-types/monocular-chart-card/monocular-chart-card.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 
-import { CardCell } from '../../../../../../core/src/shared/components/list/list.types';
+import { CardCell } from '../../../../../core/src/shared/components/list/list.types';
 import { MonocularChart } from '../../store/helm.types';
 
 @Component({
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-data-source.ts b/src/frontend/packages/kubernetes/src/helm/list-types/monocular-charts-data-source.ts
similarity index 71%
rename from src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-data-source.ts
rename to src/frontend/packages/kubernetes/src/helm/list-types/monocular-charts-data-source.ts
index 00d04b583f..e71de82d77 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-data-source.ts
+++ b/src/frontend/packages/kubernetes/src/helm/list-types/monocular-charts-data-source.ts
@@ -1,10 +1,10 @@
 import { Store } from '@ngrx/store';
 
-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 { AppState, IRequestEntityTypeState } from '../../../../../store/src/app-state';
-import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
-import { PaginationEntityState } from '../../../../../store/src/types/pagination.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 { IRequestEntityTypeState } from '../../../../store/src/app-state';
+import { AppState, EndpointModel } from '../../../../store/src/public-api';
+import { PaginationEntityState } from '../../../../store/src/types/pagination.types';
 import { helmEntityCatalog } from '../helm-entity-catalog';
 import { MonocularChart } from '../store/helm.types';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-list-config.service.ts b/src/frontend/packages/kubernetes/src/helm/list-types/monocular-charts-list-config.service.ts
similarity index 90%
rename from src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-list-config.service.ts
rename to src/frontend/packages/kubernetes/src/helm/list-types/monocular-charts-list-config.service.ts
index 427a61b9ae..5cf3124c39 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/list-types/monocular-charts-list-config.service.ts
+++ b/src/frontend/packages/kubernetes/src/helm/list-types/monocular-charts-list-config.service.ts
@@ -4,15 +4,15 @@ import { Store } from '@ngrx/store';
 import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
-import { EndpointsService } from '../../../../../core/src/core/endpoints.service';
-import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types';
+import { EndpointsService } from '../../../../core/src/core/endpoints.service';
+import { ITableColumn } from '../../../../core/src/shared/components/list/list-table/table.types';
 import {
   IListConfig,
   IListMultiFilterConfig,
   ListViewTypes,
-} from '../../../../../core/src/shared/components/list/list.component.types';
-import { ListView } from '../../../../../store/src/actions/list.actions';
-import { AppState } from '../../../../../store/src/app-state';
+} from '../../../../core/src/shared/components/list/list.component.types';
+import { ListView } from '../../../../store/src/actions/list.actions';
+import { AppState } from '../../../../store/src/public-api';
 import { defaultHelmKubeListPageSize } from '../../kubernetes/list-types/kube-helm-list-types';
 import { HELM_ENDPOINT_TYPE } from '../helm-entity-factory';
 import { ChartsService } from '../monocular/shared/services/charts.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.html b/src/frontend/packages/kubernetes/src/helm/monocular-tab-base/monocular-tab-base.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.html
rename to src/frontend/packages/kubernetes/src/helm/monocular-tab-base/monocular-tab-base.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.scss b/src/frontend/packages/kubernetes/src/helm/monocular-tab-base/monocular-tab-base.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.scss
rename to src/frontend/packages/kubernetes/src/helm/monocular-tab-base/monocular-tab-base.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.spec.ts b/src/frontend/packages/kubernetes/src/helm/monocular-tab-base/monocular-tab-base.component.spec.ts
similarity index 83%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.spec.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular-tab-base/monocular-tab-base.component.spec.ts
index 462903feb4..44d51292b1 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/helm/monocular-tab-base/monocular-tab-base.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../core/src/tab-nav.service';
-import { BaseTestModulesNoShared } from '../../../../../core/test-framework/core-test.helper';
+import { TabNavService } from '../../../../core/src/tab-nav.service';
+import { BaseTestModulesNoShared } from '../../../../core/test-framework/core-test.helper';
 import { HelmModule } from '../helm.module';
 import { MonocularTabBaseComponent } from './monocular-tab-base.component';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.ts b/src/frontend/packages/kubernetes/src/helm/monocular-tab-base/monocular-tab-base.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular-tab-base/monocular-tab-base.component.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular-tab-base/monocular-tab-base.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular.interceptor.ts b/src/frontend/packages/kubernetes/src/helm/monocular.interceptor.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular.interceptor.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular.interceptor.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/app.component.scss b/src/frontend/packages/kubernetes/src/helm/monocular/app.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/app.component.scss
rename to src/frontend/packages/kubernetes/src/helm/monocular/app.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.html b/src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-info/chart-details-info.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.html
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-info/chart-details-info.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.scss b/src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-info/chart-details-info.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.scss
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-info/chart-details-info.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.spec.ts b/src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-info/chart-details-info.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.spec.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-info/chart-details-info.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.ts b/src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-info/chart-details-info.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-info/chart-details-info.component.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-info/chart-details-info.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.html b/src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.html
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.scss b/src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.scss
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.spec.ts b/src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.spec.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts b/src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-readme/chart-details-readme.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html b/src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.scss b/src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.scss
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts b/src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts
similarity index 65%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts
index 0964fec6e2..dcd88dc1ab 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.spec.ts
@@ -1,10 +1,10 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 
-import { EndpointsService } from '../../../../../../../core/src/core/endpoints.service';
-import { UtilsService } from '../../../../../../../core/src/core/utils.service';
-import { BaseTestModulesNoShared } from '../../../../../../../core/test-framework/core-test.helper';
-import { PaginationMonitorFactory } from '../../../../../../../store/src/monitors/pagination-monitor.factory';
+import { EndpointsService } from '../../../../../../core/src/core/endpoints.service';
+import { UtilsService } from '../../../../../../core/src/core/utils.service';
+import { BaseTestModulesNoShared } from '../../../../../../core/test-framework/core-test.helper';
+import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { ChartDetailsUsageComponent } from './chart-details-usage.component';
 
 describe('Component: ChartDetailsUsage', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts b/src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts
similarity index 94%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts
index 0f213b27e8..425fe87746 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts
+++ b/src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts
@@ -4,7 +4,7 @@ import { MatSnackBar } from '@angular/material/snack-bar';
 import { DomSanitizer } from '@angular/platform-browser';
 import { ActivatedRoute } from '@angular/router';
 
-import { EndpointsService } from '../../../../../../../core/src/core/endpoints.service';
+import { EndpointsService } from '../../../../../../core/src/core/endpoints.service';
 import { Chart } from '../../shared/models/chart';
 import { getMonocularEndpoint } from '../../stratos-monocular.helper';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.html b/src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.html
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.scss b/src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.scss
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.spec.ts b/src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.spec.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts b/src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details-versions/chart-details-versions.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.html b/src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.html
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.scss b/src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.scss
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.spec.ts b/src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details.component.spec.ts
similarity index 89%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.spec.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details.component.spec.ts
index 93812f2d5b..4e1be686cd 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details.component.spec.ts
@@ -5,9 +5,9 @@ import { RouterTestingModule } from '@angular/router/testing';
 
 import {
   EntitySummaryTitleComponent,
-} from '../../../../../../core/src/shared/components/entity-summary-title/entity-summary-title.component';
-import { BaseTestModulesNoShared } from '../../../../../../core/test-framework/core-test.helper';
-import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
+} from '../../../../../core/src/shared/components/entity-summary-title/entity-summary-title.component';
+import { BaseTestModulesNoShared } from '../../../../../core/test-framework/core-test.helper';
+import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { ChartItemComponent } from '../chart-item/chart-item.component';
 import { ListItemComponent } from '../list-item/list-item.component';
 import { LoaderComponent } from '../loader/loader.component';
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.ts b/src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-details/chart-details.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-index/chart-index.component.html b/src/frontend/packages/kubernetes/src/helm/monocular/chart-index/chart-index.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-index/chart-index.component.html
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-index/chart-index.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-index/chart-index.component.scss b/src/frontend/packages/kubernetes/src/helm/monocular/chart-index/chart-index.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-index/chart-index.component.scss
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-index/chart-index.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-index/chart-index.component.spec.ts b/src/frontend/packages/kubernetes/src/helm/monocular/chart-index/chart-index.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-index/chart-index.component.spec.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-index/chart-index.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-index/chart-index.component.ts b/src/frontend/packages/kubernetes/src/helm/monocular/chart-index/chart-index.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-index/chart-index.component.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-index/chart-index.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.html b/src/frontend/packages/kubernetes/src/helm/monocular/chart-item/chart-item.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.html
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-item/chart-item.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.scss b/src/frontend/packages/kubernetes/src/helm/monocular/chart-item/chart-item.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.scss
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-item/chart-item.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.spec.ts b/src/frontend/packages/kubernetes/src/helm/monocular/chart-item/chart-item.component.spec.ts
similarity index 93%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.spec.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-item/chart-item.component.spec.ts
index e07911a9da..e8e62854b0 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/helm/monocular/chart-item/chart-item.component.spec.ts
@@ -4,7 +4,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
-import { createBasicStoreModule } from '../../../../../../store/testing/public-api';
+import { createBasicStoreModule } from '../../../../../store/testing/public-api';
 import { ChartsService } from '../shared/services/charts.service';
 import { ConfigService } from '../shared/services/config.service';
 import { ChartItemComponent } from './chart-item.component';
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.ts b/src/frontend/packages/kubernetes/src/helm/monocular/chart-item/chart-item.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-item/chart-item.component.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-item/chart-item.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-list/chart-list.component.html b/src/frontend/packages/kubernetes/src/helm/monocular/chart-list/chart-list.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-list/chart-list.component.html
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-list/chart-list.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-list/chart-list.component.scss b/src/frontend/packages/kubernetes/src/helm/monocular/chart-list/chart-list.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-list/chart-list.component.scss
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-list/chart-list.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-list/chart-list.component.spec.ts b/src/frontend/packages/kubernetes/src/helm/monocular/chart-list/chart-list.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-list/chart-list.component.spec.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-list/chart-list.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-list/chart-list.component.ts b/src/frontend/packages/kubernetes/src/helm/monocular/chart-list/chart-list.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-list/chart-list.component.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/chart-list/chart-list.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.html b/src/frontend/packages/kubernetes/src/helm/monocular/charts/charts.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.html
rename to src/frontend/packages/kubernetes/src/helm/monocular/charts/charts.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.scss b/src/frontend/packages/kubernetes/src/helm/monocular/charts/charts.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.scss
rename to src/frontend/packages/kubernetes/src/helm/monocular/charts/charts.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.spec.ts b/src/frontend/packages/kubernetes/src/helm/monocular/charts/charts.component.spec.ts
similarity index 96%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.spec.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/charts/charts.component.spec.ts
index eae5836ec8..abe09fe639 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/helm/monocular/charts/charts.component.spec.ts
@@ -6,7 +6,7 @@ import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
 
-import { createBasicStoreModule } from '../../../../../../store/testing/public-api';
+import { createBasicStoreModule } from '../../../../../store/testing/public-api';
 import { ChartItemComponent } from '../chart-item/chart-item.component';
 import { ChartListComponent } from '../chart-list/chart-list.component';
 import { LoaderComponent } from '../loader/loader.component';
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.ts b/src/frontend/packages/kubernetes/src/helm/monocular/charts/charts.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/charts/charts.component.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/charts/charts.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.html b/src/frontend/packages/kubernetes/src/helm/monocular/list-filters/list-filters.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.html
rename to src/frontend/packages/kubernetes/src/helm/monocular/list-filters/list-filters.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.scss b/src/frontend/packages/kubernetes/src/helm/monocular/list-filters/list-filters.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.scss
rename to src/frontend/packages/kubernetes/src/helm/monocular/list-filters/list-filters.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.spec.ts b/src/frontend/packages/kubernetes/src/helm/monocular/list-filters/list-filters.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.spec.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/list-filters/list-filters.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.ts b/src/frontend/packages/kubernetes/src/helm/monocular/list-filters/list-filters.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-filters/list-filters.component.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/list-filters/list-filters.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.html b/src/frontend/packages/kubernetes/src/helm/monocular/list-item/list-item.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.html
rename to src/frontend/packages/kubernetes/src/helm/monocular/list-item/list-item.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.scss b/src/frontend/packages/kubernetes/src/helm/monocular/list-item/list-item.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.scss
rename to src/frontend/packages/kubernetes/src/helm/monocular/list-item/list-item.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.spec.ts b/src/frontend/packages/kubernetes/src/helm/monocular/list-item/list-item.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.spec.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/list-item/list-item.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.ts b/src/frontend/packages/kubernetes/src/helm/monocular/list-item/list-item.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/list-item/list-item.component.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/list-item/list-item.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.html b/src/frontend/packages/kubernetes/src/helm/monocular/loader/loader.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.html
rename to src/frontend/packages/kubernetes/src/helm/monocular/loader/loader.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.scss b/src/frontend/packages/kubernetes/src/helm/monocular/loader/loader.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.scss
rename to src/frontend/packages/kubernetes/src/helm/monocular/loader/loader.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.spec.ts b/src/frontend/packages/kubernetes/src/helm/monocular/loader/loader.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.spec.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/loader/loader.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.ts b/src/frontend/packages/kubernetes/src/helm/monocular/loader/loader.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/loader/loader.component.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/loader/loader.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/monocular.module.ts b/src/frontend/packages/kubernetes/src/helm/monocular/monocular.module.ts
similarity index 96%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/monocular.module.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/monocular.module.ts
index 240e637d44..450e9f8864 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/monocular.module.ts
+++ b/src/frontend/packages/kubernetes/src/helm/monocular/monocular.module.ts
@@ -1,7 +1,7 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 
-import { CoreModule, SharedModule } from '../../../../../core/src/public-api';
+import { CoreModule, SharedModule } from '../../../../core/src/public-api';
 import { ChartDetailsInfoComponent } from './chart-details/chart-details-info/chart-details-info.component';
 import { ChartDetailsReadmeComponent } from './chart-details/chart-details-readme/chart-details-readme.component';
 import { ChartDetailsUsageComponent } from './chart-details/chart-details-usage/chart-details-usage.component';
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.html b/src/frontend/packages/kubernetes/src/helm/monocular/panel/panel.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.html
rename to src/frontend/packages/kubernetes/src/helm/monocular/panel/panel.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.scss b/src/frontend/packages/kubernetes/src/helm/monocular/panel/panel.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.scss
rename to src/frontend/packages/kubernetes/src/helm/monocular/panel/panel.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.spec.ts b/src/frontend/packages/kubernetes/src/helm/monocular/panel/panel.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.spec.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/panel/panel.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.ts b/src/frontend/packages/kubernetes/src/helm/monocular/panel/panel.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/panel/panel.component.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/panel/panel.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/chart-version.ts b/src/frontend/packages/kubernetes/src/helm/monocular/shared/models/chart-version.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/chart-version.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/shared/models/chart-version.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/chart.ts b/src/frontend/packages/kubernetes/src/helm/monocular/shared/models/chart.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/chart.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/shared/models/chart.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/maintainer.ts b/src/frontend/packages/kubernetes/src/helm/monocular/shared/models/maintainer.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/maintainer.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/shared/models/maintainer.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/repo.ts b/src/frontend/packages/kubernetes/src/helm/monocular/shared/models/repo.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/models/repo.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/shared/models/repo.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/seo.data.ts b/src/frontend/packages/kubernetes/src/helm/monocular/shared/seo.data.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/seo.data.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/shared/seo.data.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/chart.service.mock.ts b/src/frontend/packages/kubernetes/src/helm/monocular/shared/services/chart.service.mock.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/chart.service.mock.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/shared/services/chart.service.mock.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts b/src/frontend/packages/kubernetes/src/helm/monocular/shared/services/charts.service.ts
similarity index 98%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/shared/services/charts.service.ts
index 80590f39ba..f239ab2c97 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/charts.service.ts
+++ b/src/frontend/packages/kubernetes/src/helm/monocular/shared/services/charts.service.ts
@@ -193,7 +193,7 @@ export class ChartsService {
    * @return An observable containing an array of ChartVersions
    */
   getVersions(repo: string, chartName: string): Observable<ChartVersion[]> {
-    return this.http.get<{ data: any; }>(`${this.hostname}/v1/charts/${repo}/${chartName}/versions`).pipe(
+    return this.http.get<{ data: any, }>(`${this.hostname}/v1/charts/${repo}/${chartName}/versions`).pipe(
       map(m => this.extractData(m)),
       catchError(this.handleError)
     );
@@ -253,7 +253,7 @@ export class ChartsService {
   }
 
 
-  private extractData(res: { data: any; }) {
+  private extractData(res: { data: any, }) {
     return res.data || {};
   }
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/config.service.ts b/src/frontend/packages/kubernetes/src/helm/monocular/shared/services/config.service.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/config.service.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/shared/services/config.service.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/menu.service.ts b/src/frontend/packages/kubernetes/src/helm/monocular/shared/services/menu.service.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/menu.service.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/shared/services/menu.service.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/repos.service.ts b/src/frontend/packages/kubernetes/src/helm/monocular/shared/services/repos.service.ts
similarity index 95%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/repos.service.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/shared/services/repos.service.ts
index 8903061080..56dbe19649 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/shared/services/repos.service.ts
+++ b/src/frontend/packages/kubernetes/src/helm/monocular/shared/services/repos.service.ts
@@ -31,7 +31,7 @@ export class ReposService {
     );
   }
 
-  private extractData(res: { data: any; }) {
+  private extractData(res: { data: any, }) {
     return res.data || {};
   }
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/stratos-monocular-providers.helpers.ts b/src/frontend/packages/kubernetes/src/helm/monocular/stratos-monocular-providers.helpers.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/stratos-monocular-providers.helpers.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/stratos-monocular-providers.helpers.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/monocular/stratos-monocular.helper.ts b/src/frontend/packages/kubernetes/src/helm/monocular/stratos-monocular.helper.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/monocular/stratos-monocular.helper.ts
rename to src/frontend/packages/kubernetes/src/helm/monocular/stratos-monocular.helper.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.action-builders.ts b/src/frontend/packages/kubernetes/src/helm/store/helm.action-builders.ts
similarity index 89%
rename from src/frontend/packages/suse-extensions/src/custom/helm/store/helm.action-builders.ts
rename to src/frontend/packages/kubernetes/src/helm/store/helm.action-builders.ts
index 708227b098..b6b37b9566 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.action-builders.ts
+++ b/src/frontend/packages/kubernetes/src/helm/store/helm.action-builders.ts
@@ -1,5 +1,5 @@
-import { OrchestratedActionBuilders } from '../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
-import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
+import { OrchestratedActionBuilders } from '../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
+import { EndpointModel } from '../../../../store/src/public-api';
 import { GetHelmChartVersions, GetHelmVersions, GetMonocularCharts, HelmInstall, HelmSynchronise } from './helm.actions';
 import { HelmInstallValues } from './helm.types';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.actions.ts b/src/frontend/packages/kubernetes/src/helm/store/helm.actions.ts
similarity index 93%
rename from src/frontend/packages/suse-extensions/src/custom/helm/store/helm.actions.ts
rename to src/frontend/packages/kubernetes/src/helm/store/helm.actions.ts
index 883cdd4414..ef32453dbf 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.actions.ts
+++ b/src/frontend/packages/kubernetes/src/helm/store/helm.actions.ts
@@ -1,8 +1,8 @@
 import { Action } from '@ngrx/store';
 
-import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
-import { PaginatedAction } from '../../../../../store/src/types/pagination.types';
-import { EntityRequestAction } from '../../../../../store/src/types/request.types';
+import { EndpointModel } from '../../../../store/src/public-api';
+import { PaginatedAction } from '../../../../store/src/types/pagination.types';
+import { EntityRequestAction } from '../../../../store/src/types/request.types';
 import {
   HELM_ENDPOINT_TYPE,
   helmEntityFactory,
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts b/src/frontend/packages/kubernetes/src/helm/store/helm.effects.ts
similarity index 93%
rename from src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
rename to src/frontend/packages/kubernetes/src/helm/store/helm.effects.ts
index 7a05a8c357..a8723b347f 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts
+++ b/src/frontend/packages/kubernetes/src/helm/store/helm.effects.ts
@@ -6,7 +6,7 @@ import { Action, Store } from '@ngrx/store';
 import { combineLatest, Observable, of } from 'rxjs';
 import { catchError, first, flatMap, map, mergeMap, withLatestFrom } from 'rxjs/operators';
 
-import { environment } from '../../../../../core/src/environments/environment';
+import { environment } from '../../../../core/src/environments/environment';
 import {
   EndpointActionComplete,
   GET_ENDPOINTS_SUCCESS,
@@ -14,23 +14,25 @@ import {
   REGISTER_ENDPOINTS_SUCCESS,
   UNREGISTER_ENDPOINTS_SUCCESS,
   UnregisterEndpoint,
-} from '../../../../../store/src/actions/endpoint.actions';
-import { ClearPaginationOfType, ResetPaginationOfType } from '../../../../../store/src/actions/pagination.actions';
-import { AppState } from '../../../../../store/src/app-state';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
-import { EntitySchema } from '../../../../../store/src/helpers/entity-schema';
-import { isJetstreamError } from '../../../../../store/src/jetstream';
-import { ApiRequestTypes } from '../../../../../store/src/reducers/api-request-reducer/request-helpers';
-import { endpointOfTypeSelector } from '../../../../../store/src/selectors/endpoint.selectors';
-import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
-import { NormalizedResponse } from '../../../../../store/src/types/api.types';
-import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
+} from '../../../../store/src/actions/endpoint.actions';
+import { ClearPaginationOfType, ResetPaginationOfType } from '../../../../store/src/actions/pagination.actions';
+import { EntitySchema } from '../../../../store/src/helpers/entity-schema';
+import { isJetstreamError } from '../../../../store/src/jetstream';
+import {
+  AppState,
+  EndpointModel,
+  entityCatalog,
+  NormalizedResponse,
+  WrapperRequestActionSuccess,
+} from '../../../../store/src/public-api';
+import { ApiRequestTypes } from '../../../../store/src/reducers/api-request-reducer/request-helpers';
+import { endpointOfTypeSelector } from '../../../../store/src/selectors/endpoint.selectors';
+import { stratosEntityCatalog } from '../../../../store/src/stratos-entity-catalog';
 import {
   EntityRequestAction,
   StartRequestAction,
   WrapperRequestActionFailed,
-  WrapperRequestActionSuccess,
-} from '../../../../../store/src/types/request.types';
+} from '../../../../store/src/types/request.types';
 import { helmEntityCatalog } from '../helm-entity-catalog';
 import { HELM_ENDPOINT_TYPE, HELM_HUB_ENDPOINT_TYPE, HELM_REPO_ENDPOINT_TYPE } from '../helm-entity-factory';
 import { Chart } from '../monocular/shared/models/chart';
@@ -339,7 +341,7 @@ export class HelmEffects {
     return 'Helm API request error';
   }
 
-  public static createHelmError(err: any): { status: string, message: string; } {
+  public static createHelmError(err: any): { status: string, message: string, } {
     let unwrapped = err;
     if (err.error) {
       unwrapped = err.error;
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/store/helm.types.ts b/src/frontend/packages/kubernetes/src/helm/store/helm.types.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/store/helm.types.ts
rename to src/frontend/packages/kubernetes/src/helm/store/helm.types.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.html b/src/frontend/packages/kubernetes/src/helm/tabs/catalog-tab/catalog-tab.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.html
rename to src/frontend/packages/kubernetes/src/helm/tabs/catalog-tab/catalog-tab.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.scss b/src/frontend/packages/kubernetes/src/helm/tabs/catalog-tab/catalog-tab.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.scss
rename to src/frontend/packages/kubernetes/src/helm/tabs/catalog-tab/catalog-tab.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.spec.ts b/src/frontend/packages/kubernetes/src/helm/tabs/catalog-tab/catalog-tab.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.spec.ts
rename to src/frontend/packages/kubernetes/src/helm/tabs/catalog-tab/catalog-tab.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.ts b/src/frontend/packages/kubernetes/src/helm/tabs/catalog-tab/catalog-tab.component.ts
similarity index 80%
rename from src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.ts
rename to src/frontend/packages/kubernetes/src/helm/tabs/catalog-tab/catalog-tab.component.ts
index 4628d67ca9..f6047d2db4 100644
--- a/src/frontend/packages/suse-extensions/src/custom/helm/tabs/catalog-tab/catalog-tab.component.ts
+++ b/src/frontend/packages/kubernetes/src/helm/tabs/catalog-tab/catalog-tab.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 
-import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
+import { ListConfig } from '../../../../../core/src/shared/components/list/list.component.types';
 import { MonocularChartsListConfig } from '../../list-types/monocular-charts-list-config.service';
 
 @Component({
diff --git a/src/frontend/packages/suse-extensions/src/custom/helm/theme.scss b/src/frontend/packages/kubernetes/src/helm/theme.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/helm/theme.scss
rename to src/frontend/packages/kubernetes/src/helm/theme.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-routing.module.ts b/src/frontend/packages/kubernetes/src/kube-package-routing.module.ts
similarity index 96%
rename from src/frontend/packages/suse-extensions/src/custom/suse-routing.module.ts
rename to src/frontend/packages/kubernetes/src/kube-package-routing.module.ts
index efabd4582e..ed3d3e80e7 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse-routing.module.ts
+++ b/src/frontend/packages/kubernetes/src/kube-package-routing.module.ts
@@ -54,4 +54,4 @@ const customRoutes: Routes = [
   ],
   declarations: []
 })
-export class SuseRoutingModule { }
+export class KubePackageModuleRoutingModule { }
diff --git a/src/frontend/packages/kubernetes/src/kube-package.module.ts b/src/frontend/packages/kubernetes/src/kube-package.module.ts
new file mode 100644
index 0000000000..286802cf3a
--- /dev/null
+++ b/src/frontend/packages/kubernetes/src/kube-package.module.ts
@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+
+import { CoreModule, MDAppModule, SharedModule } from '../../core/src/public-api';
+import { HelmSetupModule } from './helm/helm.setup.module';
+import { KubernetesSetupModule } from './kubernetes/kubernetes.setup.module';
+
+
+@NgModule({
+  imports: [
+    CoreModule,
+    SharedModule,
+    MDAppModule,
+    KubernetesSetupModule,
+    HelmSetupModule,
+  ],
+  // FIXME: Ensure that anything lazy loaded/in kube endpoint pages is not included here - #3675
+  declarations: [
+  ],
+  entryComponents: [
+  ]
+})
+export class KubePackageModule { }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.html b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.spec.ts
similarity index 81%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.spec.ts
index 8757c86532..60794e0912 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.spec.ts
@@ -1,10 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { SharedModule } from '../../../../../core/src/public-api';
+import { SidePanelService } from '../../../../../core/src/shared/services/side-panel.service';
 import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
 import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
-import { SidePanelService } from './../../../../../../core/src/shared/services/side-panel.service';
-import { SharedModule } from './../../../../../../core/src/shared/shared.module';
 import { AnalysisReportRunnerComponent } from './analysis-report-runner.component';
 
 describe('AnalysisReportRunnerComponent', () => {
@@ -13,7 +13,7 @@ describe('AnalysisReportRunnerComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ AnalysisReportRunnerComponent ],
+      declarations: [AnalysisReportRunnerComponent],
       imports: [
         SharedModule,
         KubernetesBaseTestModules,
@@ -25,7 +25,7 @@ describe('AnalysisReportRunnerComponent', () => {
         SidePanelService,
       ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-runner/analysis-report-runner.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.html b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.spec.ts
similarity index 88%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.spec.ts
index 4d421a38e4..7740777a66 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { MDAppModule } from '../../../../../../core/src/public-api';
+import { MDAppModule } from '../../../../../core/src/public-api';
 import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
 import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
@@ -12,7 +12,7 @@ describe('AnalysisReportSelectorComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ AnalysisReportSelectorComponent ],
+      declarations: [AnalysisReportSelectorComponent],
       imports: [
         KubernetesBaseTestModules,
         MDAppModule
@@ -23,7 +23,7 @@ describe('AnalysisReportSelectorComponent', () => {
         KubeBaseGuidMock,
       ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.ts
similarity index 96%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.ts
index 5b5bce37a5..07f430e4cb 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-selector/analysis-report-selector.component.ts
@@ -3,7 +3,7 @@ import moment from 'moment';
 import { Observable, Subscription } from 'rxjs';
 import { map, tap } from 'rxjs/operators';
 
-import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
+import { safeUnsubscribe } from '../../../../../core/src/core/utils.service';
 import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
 import { AnalysisReport } from '../../store/kube.types';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.html b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-viewer.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-viewer.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-viewer.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-viewer.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-viewer.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-viewer.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-viewer.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/analysis-report-viewer.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/analysis-report-viewer.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.html b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.spec.ts
similarity index 88%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.spec.ts
index babd043739..6ad49bf3aa 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { MDAppModule } from '../../../../../../core/src/public-api';
+import { MDAppModule } from '../../../../../core/src/public-api';
 import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
 import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
@@ -12,7 +12,7 @@ describe('KubeScoreReportViewerComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ KubeScoreReportViewerComponent ],
+      declarations: [KubeScoreReportViewerComponent],
       imports: [
         KubernetesBaseTestModules,
         MDAppModule
@@ -23,7 +23,7 @@ describe('KubeScoreReportViewerComponent', () => {
         KubeBaseGuidMock,
       ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/kube-score-report-viewer/kube-score-report-viewer.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.html b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.spec.ts
similarity index 88%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.spec.ts
index 192d66f8da..eb03a6aa2f 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { MDAppModule } from '../../../../../../core/src/public-api';
+import { MDAppModule } from '../../../../../core/src/public-api';
 import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
 import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
@@ -12,7 +12,7 @@ describe('PopeyeReportViewerComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ PopeyeReportViewerComponent ],
+      declarations: [PopeyeReportViewerComponent],
       imports: [
         KubernetesBaseTestModules,
         MDAppModule
@@ -23,7 +23,7 @@ describe('PopeyeReportViewerComponent', () => {
         KubeBaseGuidMock,
       ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/popeye-report-viewer/popeye-report-viewer.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.html b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.ts
similarity index 91%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.ts
index 5abfac176e..139644c612 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-preview.component.ts
@@ -15,7 +15,7 @@ export class ResourceAlertPreviewComponent implements PreviewableComponent {
 
   constructor() { }
 
-  setProps(props: { [key: string]: any; }): void {
+  setProps(props: { [key: string]: any, }): void {
     this.resource = props.resource;
     this.title = `${this.resource.kind} Alerts`;
   }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.html b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.spec.ts
similarity index 88%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.spec.ts
index 9f158d36cf..b80151d9b3 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { MDAppModule } from '../../../../../../../core/src/public-api';
+import { MDAppModule } from '../../../../../../core/src/public-api';
 import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
 import { KubernetesAnalysisService } from '../../../services/kubernetes.analysis.service';
@@ -12,7 +12,7 @@ describe('ResourceAlertViewComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ ResourceAlertViewComponent ],
+      declarations: [ResourceAlertViewComponent],
       imports: [
         KubernetesBaseTestModules,
         MDAppModule
@@ -23,7 +23,7 @@ describe('ResourceAlertViewComponent', () => {
         KubeBaseGuidMock,
       ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.html b/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts
similarity index 93%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts
index f9ef26134c..66400910ac 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts
@@ -2,7 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormBuilder } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
-import { MDAppModule, SharedModule } from '../../../../../../core/src/public-api';
+import { MDAppModule, SharedModule } from '../../../../../core/src/public-api';
 import { KubernetesAWSAuthFormComponent } from './kubernetes-aws-auth-form.component';
 
 describe('KubernetesAWSAuthFormComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.ts
similarity index 83%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.ts
index 2c67e0049c..78f5d08465 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.ts
@@ -1,7 +1,8 @@
 import { Component, Input } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 
-import { IAuthForm } from '../../../../../../store/src/extension-types';
+import { IAuthForm } from '../../../../../store/src/extension-types';
+
 
 
 @Component({
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html b/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts
similarity index 93%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts
index 74ccf5ef71..860cbec1e8 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts
@@ -3,7 +3,7 @@ import { FormBuilder } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { CoreModule } from 'frontend/packages/core/src/core/core.module';
 
-import { SharedModule } from './../../../../../../core/src/shared/shared.module';
+import { SharedModule } from './../../../../../core/src/shared/shared.module';
 import { KubernetesCertsAuthFormComponent } from './kubernetes-certs-auth-form.component';
 
 describe('KubernetesCertsAuthFormComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts
similarity index 96%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts
index 889f8b5a7d..7fae0d007d 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts
@@ -1,8 +1,7 @@
 import { Component, Input } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 
-import { EndpointAuthValues, IEndpointAuthComponent } from '../../../../../../store/src/extension-types';
-
+import { EndpointAuthValues, IEndpointAuthComponent } from '../../../../../store/src/extension-types';
 
 
 @Component({
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.html b/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.spec.ts
similarity index 93%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.spec.ts
index 756e42f1bc..dba933224c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.spec.ts
@@ -2,7 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormBuilder } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
-import { SharedModule } from './../../../../../../core/src/shared/shared.module';
+import { SharedModule } from './../../../../../core/src/shared/shared.module';
 import { KubernetesConfigAuthFormComponent } from './kubernetes-config-auth-form.component';
 
 describe('KubernetesConfigAuthFormComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.ts
similarity index 93%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.ts
index 424f0ce2ee..dc7491f0e8 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.ts
@@ -1,7 +1,8 @@
 import { Component, Input } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 
-import { EndpointAuthValues, IEndpointAuthComponent } from '../../../../../../store/src/extension-types';
+import { EndpointAuthValues, IEndpointAuthComponent } from '../../../../../store/src/extension-types';
+
 
 
 @Component({
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.html b/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.spec.ts
similarity index 93%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.spec.ts
index 32c5fa6b31..24fe572feb 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.spec.ts
@@ -2,7 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormBuilder } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
-import { SharedModule } from './../../../../../../core/src/shared/shared.module';
+import { SharedModule } from './../../../../../core/src/shared/shared.module';
 import { KubernetesGKEAuthFormComponent } from './kubernetes-gke-auth-form.component';
 
 describe('KubernetesGKEAuthFormComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.ts
similarity index 93%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.ts
index ef2c74b0ed..c810b406a1 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.ts
@@ -1,7 +1,8 @@
 import { Component, Input } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 
-import { EndpointAuthValues, IEndpointAuthComponent } from '../../../../../../store/src/extension-types';
+import { EndpointAuthValues, IEndpointAuthComponent } from '../../../../../store/src/extension-types';
+
 
 
 @Component({
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-auth.helper.ts b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-auth.helper.ts
similarity index 92%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-auth.helper.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-auth.helper.ts
index 158d36edd0..e6caba2fd0 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-auth.helper.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-auth.helper.ts
@@ -1,10 +1,10 @@
 import { ComponentFactoryResolver, Injector } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
 
-import { ConnectEndpointData } from '../../../../../core/src/features/endpoints/connect.service';
-import { RowState } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
-import { EndpointAuthTypeConfig, IAuthForm } from '../../../../../store/src/extension-types';
+import { ConnectEndpointData } from '../../../../core/src/features/endpoints/connect.service';
+import { RowState } from '../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
+import { EndpointAuthTypeConfig, IAuthForm } from '../../../../store/src/extension-types';
+import { entityCatalog } from '../../../../store/src/public-api';
 import { KUBERNETES_ENDPOINT_TYPE } from '../kubernetes-entity-factory';
 import { KubeConfigFileCluster, KubeConfigFileUser } from './kube-config.types';
 
@@ -14,7 +14,7 @@ import { KubeConfigFileCluster, KubeConfigFileUser } from './kube-config.types';
  */
 export class KubeConfigAuthHelper {
 
-  authTypes: { [name: string]: EndpointAuthTypeConfig } = {};
+  authTypes: { [name: string]: EndpointAuthTypeConfig, } = {};
 
   public subTypes = [];
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts
similarity index 91%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts
index a330b5a994..a8d27482c5 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-import/kube-config-import.component.ts
@@ -4,25 +4,25 @@ import { Store } from '@ngrx/store';
 import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'rxjs';
 import { distinctUntilChanged, filter, first, map, pairwise, startWith, withLatestFrom } from 'rxjs/operators';
 
-import { EndpointsService } from '../../../../../../core/src/core/endpoints.service';
-import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
+import { EndpointsService } from '../../../../../core/src/core/endpoints.service';
+import { safeUnsubscribe } from '../../../../../core/src/core/utils.service';
 import {
   ConnectEndpointConfig,
   ConnectEndpointData,
   ConnectEndpointService,
-} from '../../../../../../core/src/features/endpoints/connect.service';
+} from '../../../../../core/src/features/endpoints/connect.service';
 import {
   IActionMonitorComponentState,
-} from '../../../../../../core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component';
+} from '../../../../../core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component';
 import {
   ITableListDataSource,
   RowState,
-} from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
-import { ITableColumn } from '../../../../../../core/src/shared/components/list/list-table/table.types';
-import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
-import { AppState } from '../../../../../../store/src/app-state';
-import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types';
-import { stratosEntityCatalog } from '../../../../../../store/src/stratos-entity-catalog';
+} from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
+import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types';
+import { StepOnNextFunction } from '../../../../../core/src/shared/components/stepper/step/step.component';
+import { AppState } from '../../../../../store/src/public-api';
+import { ActionState } from '../../../../../store/src/reducers/api-request-reducer/types';
+import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
 import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes-entity-factory';
 import { KubeConfigAuthHelper } from '../kube-config-auth.helper';
 import { KubeConfigFileCluster, KubeConfigImportAction, KubeImportState } from '../kube-config.types';
@@ -272,7 +272,7 @@ export class KubeConfigImportComponent implements OnDestroy {
       }
     });
     this.data.next(imports);
-  }
+  };
 
   // Finish - go back to the endpoints view
   onNext: StepOnNextFunction = () => {
@@ -289,10 +289,10 @@ export class KubeConfigImportComponent implements OnDestroy {
       ).subscribe(imports => {
         // Go through the imports and dispatch the actions to perform them in sequence
         this.processAction([...imports]);
-      })
+      });
       return observableOf({ success: true, ignoreSuccess: true });
     }
-  }
+  };
 
   // These two should be somewhere else
   private getUpdatingState(actionState$: Observable<ActionState>): Observable<KubeImportState> {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.ts
similarity index 76%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.ts
index ee59c019f8..d9d8da3697 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-import/kube-config-table-import-status/kube-config-table-import-status.component.ts
@@ -3,8 +3,8 @@ import { Observable } from 'rxjs';
 
 import {
   IActionMonitorComponentState,
-} from '../../../../../../../core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component';
-import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
+} from '../../../../../../core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component';
+import { TableCellCustom } from '../../../../../../core/src/shared/components/list/list.types';
 import { KubeConfigFileCluster } from '../../kube-config.types';
 
 @Component({
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-registration.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-registration.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-registration.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-registration.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-registration.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-registration.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-registration.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-registration.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-registration.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-registration.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-registration.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-registration.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-registration.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-registration.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-registration.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-registration.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts
similarity index 92%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts
index 7a0f02b017..9f3655ce82 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-selection.component.ts
@@ -6,13 +6,13 @@ import { first, map, switchMap } from 'rxjs/operators';
 import {
   ITableListDataSource,
   RowState,
-} from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
+} from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
 import {
   TableHeaderSelectComponent,
-} from '../../../../../../core/src/shared/components/list/list-table/table-header-select/table-header-select.component';
-import { ITableColumn } from '../../../../../../core/src/shared/components/list/list-table/table.types';
-import { SnackBarService } from '../../../../../../core/src/shared/services/snackbar.service';
-import { AppState } from '../../../../../../store/src/app-state';
+} from '../../../../../core/src/shared/components/list/list-table/table-header-select/table-header-select.component';
+import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types';
+import { SnackBarService } from '../../../../../core/src/shared/services/snackbar.service';
+import { AppState } from '../../../../../store/src/public-api';
 import { KubeConfigHelper } from '../kube-config.helper';
 import { KubeConfigFileCluster } from '../kube-config.types';
 import { KubeConfigTableCertComponent } from './kube-config-table-cert/kube-config-table-cert.component';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.ts
similarity index 92%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.ts
index c7deb2270d..31f71b63fc 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-cert/kube-config-table-cert.component.ts
@@ -3,7 +3,7 @@ import { Component, Input } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 import { timeout } from 'rxjs/operators';
 
-import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../core/src/shared/components/list/list.types';
 import { KubeConfigHelper } from '../../kube-config.helper';
 import { KubeConfigFileCluster } from '../../kube-config.types';
 
@@ -12,7 +12,7 @@ type CertResponse = {
   Required: boolean;
   Error: boolean;
   Message: string;
-}
+};
 
 @Component({
   selector: 'app-kube-config-table-cert',
@@ -22,8 +22,8 @@ type CertResponse = {
 export class KubeConfigTableCertComponent extends TableCellCustom<KubeConfigFileCluster> {
 
   initialValue = new BehaviorSubject<{
-    checked: boolean
-  }>(null)
+    checked: boolean;
+  }>(null);
   initialValue$ = this.initialValue.asObservable();
 
   private pRow: KubeConfigFileCluster;
@@ -45,7 +45,7 @@ export class KubeConfigTableCertComponent extends TableCellCustom<KubeConfigFile
           (res: CertResponse) => this.update(res.Required),
           // Failed, check for specific cert required error
           (e: HttpErrorResponse) => this.update(false)
-        )
+        );
       }
     }
   }
@@ -57,7 +57,7 @@ export class KubeConfigTableCertComponent extends TableCellCustom<KubeConfigFile
     private helper: KubeConfigHelper,
     private http: HttpClient
   ) {
-    super()
+    super();
   }
 
   private update(checked: boolean) {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts
similarity index 90%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts
index bd6516944d..4f08f762fd 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.spec.ts
@@ -2,7 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import {
   IListDataSource,
-} from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
+} from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
 import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
 import { KubeConfigFileCluster } from '../../kube-config.types';
 import { KubeConfigTableNameComponent } from './kube-config-table-name.component';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts
similarity index 79%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts
index 8e3fe8c827..adaa97e293 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-name/kube-config-table-name.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 
-import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../core/src/shared/components/list/list.types';
 import { KubeConfigFileCluster } from '../../kube-config.types';
 
 @Component({
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.ts
similarity index 85%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.ts
index 60f93a1ad9..6c7eb5abad 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-select/kube-config-table-select.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 
-import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../core/src/shared/components/list/list.types';
 import { KubeConfigHelper } from '../../kube-config.helper';
 import { KubeConfigFileCluster } from '../../kube-config.types';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.ts
similarity index 90%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.ts
index 8d487d1bc6..4069c9c684 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-sub-type-select/kube-config-table-sub-type-select.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../core/src/shared/components/list/list.types';
 import { KubeConfigAuthHelper } from '../../kube-config-auth.helper';
 import { KubeConfigHelper } from '../../kube-config.helper';
 import { KubeConfigFileCluster } from '../../kube-config.types';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.ts
similarity index 88%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.ts
index 3b174fb27a..4582640704 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config-selection/kube-config-table-user-select/kube-config-table-user-select.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../core/src/shared/components/list/list.types';
 import { KubeConfigHelper } from '../../kube-config.helper';
 import { KubeConfigFileCluster } from '../../kube-config.types';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.helper.ts b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config.helper.ts
similarity index 91%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.helper.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config.helper.ts
index 8a9e474340..91daa1a4c8 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.helper.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config.helper.ts
@@ -3,11 +3,11 @@ import * as yaml from 'js-yaml';
 import { BehaviorSubject, combineLatest, Observable, of } from 'rxjs';
 import { filter, first, map, tap } from 'rxjs/operators';
 
-import { EndpointsService } from '../../../../../core/src/core/endpoints.service';
-import { createGuid } from '../../../../../core/src/core/utils.service';
-import { RowState } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
-import { getFullEndpointApiUrl } from '../../../../../store/src/endpoint-utils';
-import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
+import { EndpointsService } from '../../../../core/src/core/endpoints.service';
+import { createGuid } from '../../../../core/src/core/utils.service';
+import { RowState } from '../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
+import { getFullEndpointApiUrl } from '../../../../store/src/endpoint-utils';
+import { EndpointModel } from '../../../../store/src/public-api';
 import { KubeConfigAuthHelper } from './kube-config-auth.helper';
 import { KubeConfigFile, KubeConfigFileCluster } from './kube-config.types';
 
@@ -23,7 +23,7 @@ export class KubeConfigHelper {
 
   authHelper = new KubeConfigAuthHelper();
 
-  clusters = new BehaviorSubject<KubeConfigFileCluster[]>(null)
+  clusters = new BehaviorSubject<KubeConfigFileCluster[]>(null);
   clusters$ = this.clusters.asObservable().pipe(
     filter(clusters => !!clusters)
   );
@@ -36,18 +36,18 @@ export class KubeConfigHelper {
   public clustersChanged: () => void;
   public update = (cluster: KubeConfigFileCluster) => {
     this.checkValidity(cluster).subscribe(() => this.clustersChanged());
-  }
+  };
 
   public updateAll(): Observable<any> {
     return this.clusters$.pipe(
       tap(clusters => clusters.forEach(cluster => this.update(cluster))),
-    )
+    );
   }
 
   public parse(config: string): Observable<string> {
     let doc: KubeConfigFile;
 
-    const clusters: { [name: string]: KubeConfigFileCluster } = {};
+    const clusters: { [name: string]: KubeConfigFileCluster, } = {};
 
     try {
       doc = yaml.safeLoad(config);
@@ -160,7 +160,7 @@ export class KubeConfigHelper {
         const newState = this.authHelper.parseAuth(cluster, user);
         if (!!newState && !!newState.message) {
           reset = false;
-          cluster._invalid = newState.error || newState.warning
+          cluster._invalid = newState.error || newState.warning;
           cluster._state.next(newState);
         }
       }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.types.ts b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config.types.ts
similarity index 85%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.types.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config.types.ts
index 0a34ee0611..bf38e74e03 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-config-registration/kube-config.types.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kube-config-registration/kube-config.types.ts
@@ -2,10 +2,10 @@ import { Observable, Subject } from 'rxjs';
 
 import {
   IActionMonitorComponentState,
-} from '../../../../../core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component';
-import { RowState } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
-import { EndpointAuthTypeConfig } from '../../../../../store/src/extension-types';
-import { ActionStatus } from './../../../../../store/src/reducers/api-request-reducer/types';
+} from '../../../../core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component';
+import { RowState } from '../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
+import { EndpointAuthTypeConfig } from '../../../../store/src/extension-types';
+import { ActionStatus } from './../../../../store/src/reducers/api-request-reducer/types';
 
 // Types for a Kubernetes Configuration file
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kube-terminal/kube-console.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-terminal/kube-console.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kube-terminal/kube-console.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-terminal/kube-console.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/kube-terminal/kube-console.component.spec.ts
similarity index 65%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-terminal/kube-console.component.spec.ts
index 75932802f6..a4dd9b2411 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kube-terminal/kube-console.component.spec.ts
@@ -2,12 +2,11 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { createBasicStoreModule } from '@stratosui/store/testing';
 
-import { ApplicationService } from '../../../../../cloud-foundry/src/features/applications/application.service';
-import { ApplicationServiceMock } from '../../../../../cloud-foundry/test-framework/application-service-helper';
-import { CurrentUserPermissionsService } from '../../../../../core/src/core/permissions/current-user-permissions.service';
-import { SharedModule } from '../../../../../core/src/public-api';
-import { TabNavService } from '../../../../../core/src/tab-nav.service';
-import { CoreModule } from './../../../../../core/src/core/core.module';
+import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';
+import { ApplicationServiceMock } from '../../../../cloud-foundry/test-framework/application-service-helper';
+import { CurrentUserPermissionsService } from '../../../../core/src/core/permissions/current-user-permissions.service';
+import { CoreModule, SharedModule } from '../../../../core/src/public-api';
+import { TabNavService } from '../../../../core/src/tab-nav.service';
 import { KubeConsoleComponent } from './kube-console.component';
 
 describe('KubeConsoleComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kube-terminal/kube-console.component.ts
similarity index 92%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kube-terminal/kube-console.component.ts
index cb14bef481..514546b5a3 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kube-terminal/kube-console.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kube-terminal/kube-console.component.ts
@@ -4,8 +4,8 @@ import { NEVER, Observable, Subject } from 'rxjs';
 import websocketConnect, { normalClosureMessage } from 'rxjs-websockets';
 import { catchError, map, switchMap, tap } from 'rxjs/operators';
 
-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 { IHeaderBreadcrumb } from '../../../../core/src/shared/components/page-header/page-header.types';
+import { SshViewerComponent } from '../../../../core/src/shared/components/ssh-viewer/ssh-viewer.component';
 import { BaseKubeGuid } from '../kubernetes-page.types';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
 import { KubernetesService } from '../services/kubernetes.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts
similarity index 94%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts
index 0779af7d2c..caff198d41 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.spec.ts
@@ -2,7 +2,7 @@ import { HttpClient, HttpHandler } from '@angular/common/http';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
-import { TabNavService } from '../../../../../../core/src/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { KubernetesBaseTestModules } from '../../kubernetes.testing.module';
 import { KubedashConfigurationComponent } from './kubedash-configuration.component';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts
similarity index 95%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts
index 5a0d0a1a0a..8510847ea2 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts
@@ -5,9 +5,9 @@ import { ActivatedRoute } from '@angular/router';
 import { BehaviorSubject, Observable, Subscription } from 'rxjs';
 import { distinctUntilChanged, filter, map } from 'rxjs/operators';
 
-import { ConfirmationDialogConfig } from '../../../../../../core/src/shared/components/confirmation-dialog.config';
-import { ConfirmationDialogService } from '../../../../../../core/src/shared/components/confirmation-dialog.service';
-import { IHeaderBreadcrumb } from '../../../../../../core/src/shared/components/page-header/page-header.types';
+import { ConfirmationDialogConfig } from '../../../../../core/src/shared/components/confirmation-dialog.config';
+import { ConfirmationDialogService } from '../../../../../core/src/shared/components/confirmation-dialog.service';
+import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
 import { KubernetesService } from '../../services/kubernetes.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts
similarity index 94%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts
index 92ee1c9d9d..25fc305d97 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
-import { TabNavService } from '../../../../../core/src/tab-nav.service';
+import { TabNavService } from '../../../../core/src/tab-nav.service';
 import { KubernetesBaseTestModules } from '../kubernetes.testing.module';
 import { KubernetesDashboardTabComponent } from './kubernetes-dashboard.component';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
similarity index 96%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
index f54541c1b2..92047d7909 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts
@@ -6,8 +6,8 @@ import { map } from 'rxjs/operators';
 
 import {
   EndpointMissingMessageParts,
-} from '../../../../../core/src/shared/components/endpoints-missing/endpoints-missing.component';
-import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
+} from '../../../../core/src/shared/components/endpoints-missing/endpoints-missing.component';
+import { IHeaderBreadcrumb } from '../../../../core/src/shared/components/page-header/page-header.types';
 import { BaseKubeGuid } from '../kubernetes-page.types';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
 import { KubernetesService } from '../services/kubernetes.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-catalog.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-entity-catalog.ts
similarity index 89%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-catalog.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-entity-catalog.ts
index e41dfd779d..f90866eebe 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-catalog.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-entity-catalog.ts
@@ -1,8 +1,8 @@
 import {
   StratosCatalogEndpointEntity,
   StratosCatalogEntity,
-} from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
-import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types';
+} from '../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { IFavoriteMetadata } from '../../../store/src/types/user-favorites.types';
 import {
   AnalysisReportsActionBuilders,
   KubeDashboardActionBuilders,
@@ -34,7 +34,7 @@ export class KubeEntityCatalog {
   public deployment: StratosCatalogEntity<IFavoriteMetadata, KubernetesDeployment, KubeDeploymentActionBuilders>;
   public node: StratosCatalogEntity<IFavoriteMetadata, KubernetesNode, KubeNodeActionBuilders>;
   public namespace: StratosCatalogEntity<IFavoriteMetadata, KubernetesNamespace, KubeNamespaceActionBuilders>;
-  public service: StratosCatalogEntity<IFavoriteMetadata, KubeService, KubeServiceActionBuilders>
+  public service: StratosCatalogEntity<IFavoriteMetadata, KubeService, KubeServiceActionBuilders>;
   public dashboard: StratosCatalogEntity<IFavoriteMetadata, any, KubeDashboardActionBuilders>;
   public analysisReport: StratosCatalogEntity<undefined, AnalysisReport, AnalysisReportsActionBuilders>;
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-factory.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-entity-factory.ts
similarity index 92%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-factory.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-entity-factory.ts
index 02637d2f5a..3b82c7d712 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-factory.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-entity-factory.ts
@@ -1,8 +1,8 @@
 import { Schema, schema } from 'normalizr';
 
-import { getAPIResourceGuid } from '../../../../cloud-foundry/src/store/selectors/api.selectors';
-import { EntitySchema } from '../../../../store/src/helpers/entity-schema';
-import { metricEntityType } from '../../../../store/src/helpers/stratos-entity-factory';
+import { getAPIResourceGuid } from '../../../cloud-foundry/src/store/selectors/api.selectors';
+import { EntitySchema } from '../../../store/src/helpers/entity-schema';
+import { metricEntityType } from '../../../store/src/helpers/stratos-entity-factory';
 import {
   getGuidFromKubeDashboardObj,
   getGuidFromKubeDeploymentObj,
@@ -29,7 +29,7 @@ export const getKubeAppId = (object: KubernetesApp) => object.name;
 export const KUBERNETES_ENDPOINT_TYPE = 'k8s';
 
 const entityCache: {
-  [key: string]: EntitySchema
+  [key: string]: EntitySchema;
 } = {};
 
 export class KubernetesEntitySchema extends EntitySchema {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-entity-generator.ts
similarity index 95%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-entity-generator.ts
index 0e526b8aeb..7b7d77a960 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-entity-generator.ts
@@ -1,18 +1,18 @@
 import { Validators } from '@angular/forms';
 
-import { BaseEndpointAuth } from '../../../../core/src/core/endpoint-auth';
+import { BaseEndpointAuth } from '../../../core/src/core/endpoint-auth';
 import {
   StratosBaseCatalogEntity,
   StratosCatalogEndpointEntity,
   StratosCatalogEntity,
-} from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
+} from '../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import {
   IStratosEntityDefinition,
   StratosEndpointExtensionDefinition,
-} from '../../../../store/src/entity-catalog/entity-catalog.types';
-import { EndpointAuthTypeConfig, EndpointType } from '../../../../store/src/extension-types';
-import { metricEntityType } from '../../../../store/src/helpers/stratos-entity-factory';
-import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types';
+} from '../../../store/src/entity-catalog/entity-catalog.types';
+import { EndpointAuthTypeConfig, EndpointType } from '../../../store/src/extension-types';
+import { metricEntityType } from '../../../store/src/helpers/stratos-entity-factory';
+import { IFavoriteMetadata } from '../../../store/src/types/user-favorites.types';
 import { KubernetesAWSAuthFormComponent } from './auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component';
 import {
   KubernetesCertsAuthFormComponent,
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-metrics.helpers.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-metrics.helpers.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-metrics.helpers.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-metrics.helpers.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.spec.ts
similarity index 92%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.spec.ts
index c247e9f24e..2e150486ae 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { TabNavService } from 'frontend/packages/core/src/tab-nav.service';
 
-import { MDAppModule } from '../../../../../../core/src/public-api';
+import { MDAppModule } from '../../../../../core/src/public-api';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
 import { KubernetesNamespaceService } from '../../services/kubernetes-namespace.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-analysis-report/kubernetes-namespace-analysis-report.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.ts
similarity index 84%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.ts
index 812ad3aaa1..a9127d468f 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 
-import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
+import { ListConfig } from '../../../../../core/src/shared/components/list/list.component.types';
 import {
   KubernetesNamespacePodsListConfigService,
 } from '../../list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts
similarity index 94%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts
index 083db88ddf..68f5dd3509 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../../core/src/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesBaseTestModules } from '../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.ts
similarity index 84%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.ts
index f8a81aa887..02a76e577e 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 
-import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
+import { ListConfig } from '../../../../../core/src/shared/components/list/list.component.types';
 import {
   KubernetesNamespaceServicesListConfig,
 } from '../../list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts
similarity index 94%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts
index 45ab5eb4a9..0a7eab7a1e 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts
@@ -3,12 +3,12 @@ import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
+import { IHeaderBreadcrumb } from '../../../../core/src/shared/components/page-header/page-header.types';
 import { BaseKubeGuid } from '../kubernetes-page.types';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
 import { KubernetesNamespaceService } from '../services/kubernetes-namespace.service';
-import { KubernetesService } from '../services/kubernetes.service';
 import { KubernetesAnalysisService } from '../services/kubernetes.analysis.service';
+import { KubernetesService } from '../services/kubernetes.service';
 
 @Component({
   selector: 'app-kubernetes-namespace',
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.ts
similarity index 74%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.ts
index 9be744ec76..e9c226f588 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.ts
@@ -1,12 +1,10 @@
 import { Component, Input, OnInit } from '@angular/core';
 
-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 {
-  MetricsChartHelpers,
-} from '../../../../../../../core/src/shared/components/metrics-chart/metrics.component.helpers';
-import { IMetricMatrixResult } from '../../../../../../../store/src/types/base-metric.types';
-import { IMetricApplication } from '../../../../../../../store/src/types/metric.types';
+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 { MetricsChartHelpers } from '../../../../../../core/src/shared/components/metrics-chart/metrics.component.helpers';
+import { IMetricMatrixResult } from '../../../../../../store/src/types/base-metric.types';
+import { IMetricApplication } from '../../../../../../store/src/types/metric.types';
 import { FetchKubernetesMetricsAction } from '../../../store/kubernetes.actions';
 
 @Component({
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.spec.ts
similarity index 71%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.spec.ts
index 5a5624b412..8cf61f7366 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.spec.ts
@@ -1,12 +1,16 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { KubernetesNodeMetricsComponent } from './kubernetes-node-metrics.component';
-import { KubernetesNodeMetricStatsCardComponent } from './kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component';
-import { KubernetesNodeSimpleMetricComponent } from './kubernetes-node-simple-metric/kubernetes-node-simple-metric.component';
-import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
-import { KubernetesNodeService } from '../../services/kubernetes-node.service';
 import { KubernetesBaseTestModules } from '../../kubernetes.testing.module';
+import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
+import { KubernetesNodeService } from '../../services/kubernetes-node.service';
+import {
+  KubernetesNodeMetricStatsCardComponent,
+} from './kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component';
+import { KubernetesNodeMetricsComponent } from './kubernetes-node-metrics.component';
+import {
+  KubernetesNodeSimpleMetricComponent,
+} from './kubernetes-node-simple-metric/kubernetes-node-simple-metric.component';
 
 describe('KubernetesNodeMetricsComponent', () => {
   let component: KubernetesNodeMetricsComponent;
@@ -14,7 +18,11 @@ describe('KubernetesNodeMetricsComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [KubernetesNodeMetricsComponent, KubernetesNodeMetricStatsCardComponent, KubernetesNodeSimpleMetricComponent],
+      declarations: [
+        KubernetesNodeMetricsComponent,
+        KubernetesNodeMetricStatsCardComponent,
+        KubernetesNodeSimpleMetricComponent
+      ],
       imports: KubernetesBaseTestModules,
       providers: [BaseKubeGuid, KubernetesEndpointService, KubernetesNodeService]
     })
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts
similarity index 85%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts
index f91208e9c1..7e2cd38a56 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts
@@ -1,13 +1,13 @@
 import { Component, OnInit } from '@angular/core';
 
-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 { MetricsConfig } from '../../../../../core/src/shared/components/metrics-chart/metrics-chart.component';
+import { MetricsLineChartConfig } from '../../../../../core/src/shared/components/metrics-chart/metrics-chart.types';
 import {
   ChartDataTypes,
   getMetricsChartConfigBuilder,
-} from '../../../../../../core/src/shared/components/metrics-chart/metrics.component.helpers';
-import { ChartSeries, IMetricMatrixResult } from '../../../../../../store/src/types/base-metric.types';
-import { IMetricApplication } from '../../../../../../store/src/types/metric.types';
+} from '../../../../../core/src/shared/components/metrics-chart/metrics.component.helpers';
+import { ChartSeries, IMetricMatrixResult } from '../../../../../store/src/types/base-metric.types';
+import { IMetricApplication } from '../../../../../store/src/types/metric.types';
 import { formatAxisCPUTime, formatCPUTime } from '../../kubernetes-metrics.helpers';
 import { KubeNodeMetric, KubernetesNodeService } from '../../services/kubernetes-node.service';
 import { FetchKubernetesChartMetricsAction } from '../../store/kubernetes.actions';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts
similarity index 82%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts
index 92d3de996c..5cd5f67945 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 
-import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
+import { ListConfig } from '../../../../../core/src/shared/components/list/list.component.types';
 import {
   KubernetesNodePodsListConfigService,
 } from '../../list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts
similarity index 94%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts
index b06b4eee40..b0530a0935 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
-import { TabNavService } from '../../../../../core/src/tab-nav.service';
+import { TabNavService } from '../../../../core/src/tab-nav.service';
 import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../kubernetes.testing.module';
 import { KubernetesNodeComponent } from './kubernetes-node.component';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node.component.ts
similarity index 91%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node.component.ts
index 14b6bb6e3e..17b057f286 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-node/kubernetes-node.component.ts
@@ -3,8 +3,8 @@ import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
 import { first, map, tap } from 'rxjs/operators';
 
-import { EndpointsService } from '../../../../../core/src/core/endpoints.service';
-import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
+import { EndpointsService } from '../../../../core/src/core/endpoints.service';
+import { IHeaderBreadcrumb } from '../../../../core/src/shared/components/page-header/page-header.types';
 import { BaseKubeGuid } from '../kubernetes-page.types';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
 import { KubernetesNodeService } from '../services/kubernetes-node.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-page.types.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-page.types.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-page.types.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-page.types.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts
similarity index 94%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts
index 38b577beaa..c7d6ae77a4 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
-import { SidePanelService } from '../../../../../core/src/shared/services/side-panel.service';
+import { SidePanelService } from '../../../../core/src/shared/services/side-panel.service';
 import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
 import {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
similarity index 96%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
index 8944cb03ef..3f868ec9ef 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
@@ -3,8 +3,8 @@ import moment from 'moment';
 import { Observable, of } from 'rxjs';
 import { filter, first, map, publishReplay, refCount, switchMap } from 'rxjs/operators';
 
-import { EndpointsService } from '../../../../../core/src/core/endpoints.service';
-import { PreviewableComponent } from '../../../../../core/src/shared/previewable-component';
+import { EndpointsService } from '../../../../core/src/core/endpoints.service';
+import { PreviewableComponent } from '../../../../core/src/shared/previewable-component';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
 import { BasicKubeAPIResource, KubeAPIResource, KubeStatus } from '../store/kube.types';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts
similarity index 94%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts
index d714ab66a2..27e21b1be5 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
-import { TabNavService } from '../../../../../core/src/tab-nav.service';
+import { TabNavService } from '../../../../core/src/tab-nav.service';
 import { KubernetesBaseTestModules } from '../kubernetes.testing.module';
 import { KubernetesTabBaseComponent } from './kubernetes-tab-base.component';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
similarity index 93%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
index fcd9c0ba5f..c250a2de07 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts
@@ -3,8 +3,8 @@ import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
 import { first, map, startWith } from 'rxjs/operators';
 
-import { FavoritesConfigMapper } from '../../../../../store/src/favorite-config-mapper';
-import { UserFavoriteEndpoint } from '../../../../../store/src/types/user-favorites.types';
+import { FavoritesConfigMapper } from '../../../../store/src/favorite-config-mapper';
+import { UserFavoriteEndpoint } from '../../../../store/src/types/user-favorites.types';
 import { BaseKubeGuid } from '../kubernetes-page.types';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
 import { KubernetesAnalysisService } from '../services/kubernetes.analysis.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.module.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes.module.ts
similarity index 98%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.module.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes.module.ts
index 9d5c1db436..2ee5760928 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.module.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes.module.ts
@@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
-import { CoreModule } from '../../../../core/src/core/core.module';
-import { SharedModule } from '../../../../core/src/shared/shared.module';
+import { CoreModule } from '../../../core/src/core/core.module';
+import { SharedModule } from '../../../core/src/shared/shared.module';
 import {
   AnalysisReportRunnerComponent,
 } from './analysis-report-viewer/analysis-report-runner/analysis-report-runner.component';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.routing.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes.routing.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.routing.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes.routing.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.setup.module.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes.setup.module.ts
similarity index 90%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.setup.module.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes.setup.module.ts
index f064cb04e2..c7afda8eee 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.setup.module.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes.setup.module.ts
@@ -1,11 +1,11 @@
 import { CommonModule } from '@angular/common';
 import { NgModule, Optional, SkipSelf } from '@angular/core';
 
-import { CoreModule } from '../../../../core/src/core/core.module';
-import { EndpointsService } from '../../../../core/src/core/endpoints.service';
-import { SharedModule } from '../../../../core/src/shared/shared.module';
-import { EntityCatalogModule } from '../../../../store/src/entity-catalog.module';
-import { EndpointHealthCheck } from '../../../../store/src/entity-catalog/entity-catalog.types';
+import { CoreModule } from '../../../core/src/core/core.module';
+import { EndpointsService } from '../../../core/src/core/endpoints.service';
+import { SharedModule } from '../../../core/src/shared/shared.module';
+import { EntityCatalogModule } from '../../../store/src/entity-catalog.module';
+import { EndpointHealthCheck } from '../../../store/src/entity-catalog/entity-catalog.types';
 import { KubernetesAWSAuthFormComponent } from './auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component';
 import {
   KubernetesCertsAuthFormComponent,
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.store.module.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes.store.module.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.store.module.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes.store.module.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.testing.module.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes.testing.module.ts
similarity index 68%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.testing.module.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes.testing.module.ts
index af0520b267..bffc35ba08 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.testing.module.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes.testing.module.ts
@@ -3,14 +3,17 @@ import { NgModule } from '@angular/core';
 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/src/tab-nav.service';
-import { AppTestModule } from '../../../../core/test-framework/core-test.helper';
-import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../../../store/src/entity-catalog.module';
-import { entityCatalog, TestEntityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
-import { generateStratosEntities } from '../../../../store/src/stratos-entity-generator';
-import { createBasicStoreModule } from '../../../../store/testing/public-api';
+import { CoreModule, SharedModule } from '../../../core/src/public-api';
+import { TabNavService } from '../../../core/src/tab-nav.service';
+import { AppTestModule } from '../../../core/test-framework/core-test.helper';
+import {
+  CATALOGUE_ENTITIES,
+  entityCatalog,
+  EntityCatalogFeatureModule,
+  TestEntityCatalog,
+} from '../../../store/src/public-api';
+import { generateStratosEntities } from '../../../store/src/stratos-entity-generator';
+import { createBasicStoreModule } from '../../../store/testing/public-api';
 import { HelmReleaseActivatedRouteMock, HelmReleaseGuidMock } from '../helm/helm-testing.module';
 import { generateKubernetesEntities } from './kubernetes-entity-generator';
 import { BaseKubeGuid } from './kubernetes-page.types';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.html b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes/kubernetes.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes/kubernetes.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes/kubernetes.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes/kubernetes.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes/kubernetes.component.spec.ts
similarity index 91%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes/kubernetes.component.spec.ts
index d222961131..89e6bc2ced 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes/kubernetes.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../core/src/tab-nav.service';
+import { TabNavService } from '../../../../core/src/tab-nav.service';
 import { KubernetesBaseTestModules } from '../kubernetes.testing.module';
 import { KubernetesComponent } from './kubernetes.component';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes/kubernetes.component.ts
similarity index 79%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/kubernetes/kubernetes.component.ts
index 9d0c2975f4..b94175816b 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes/kubernetes.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/kubernetes/kubernetes.component.ts
@@ -3,12 +3,10 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, first, map } from 'rxjs/operators';
 
-import {
-  EndpointListHelper,
-} from '../../../../../core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers';
-import { ListConfig } from '../../../../../core/src/shared/components/list/list.component.types';
-import { RouterNav } from '../../../../../store/src/actions/router.actions';
-import { AppState } from '../../../../../store/src/app-state';
+import { EndpointListHelper } from '../../../../core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers';
+import { ListConfig } from '../../../../core/src/shared/components/list/list.component.types';
+import { RouterNav } from '../../../../store/src/actions/router.actions';
+import { AppState } from '../../../../store/src/public-api';
 import {
   KubernetesEndpointsListConfigService,
 } from '../list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-reports-list-config.service.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/analysis-reports-list-config.service.ts
similarity index 96%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-reports-list-config.service.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/analysis-reports-list-config.service.ts
index 8755eda8b2..1288c57637 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-reports-list-config.service.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/analysis-reports-list-config.service.ts
@@ -10,8 +10,8 @@ import {
 import moment from 'moment';
 import { of } from 'rxjs';
 
-import { ListView } from '../../../../../store/src/actions/list.actions';
-import { AppState } from '../../../../../store/src/app-state';
+import { ListView } from '../../../../store/src/actions/list.actions';
+import { AppState } from '../../../../store/src/public-api';
 import { defaultHelmKubeListPageSize } from '../../kubernetes/list-types/kube-helm-list-types';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
 import { KubernetesAnalysisService } from '../services/kubernetes.analysis.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-reports-list-source.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/analysis-reports-list-source.ts
similarity index 92%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-reports-list-source.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/analysis-reports-list-source.ts
index d2f9330a3f..0b1cccec2f 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-reports-list-source.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/analysis-reports-list-source.ts
@@ -6,8 +6,8 @@ import { IListConfig } from 'frontend/packages/core/src/shared/components/list/l
 import { interval, Subscription } from 'rxjs';
 import { first, map } from 'rxjs/operators';
 
-import { AppState } from '../../../../../store/src/app-state';
-import { isFetchingPage } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
+import { AppState } from '../../../../store/src/public-api';
+import { isFetchingPage } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { kubeEntityCatalog } from '../kubernetes-entity-catalog';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
 import { GetAnalysisReports } from '../store/analysis.actions';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.html b/src/frontend/packages/kubernetes/src/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.spec.ts
similarity index 82%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.spec.ts
index aca29a6d84..d7c7f58503 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { MDAppModule } from '../../../../../../core/src/public-api';
+import { MDAppModule } from '../../../../../core/src/public-api';
 import {
   AnalysisReportSelectorComponent,
 } from './../../analysis-report-viewer/analysis-report-selector/analysis-report-selector.component';
@@ -12,12 +12,12 @@ describe('AnalysisStatusCellComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ AnalysisStatusCellComponent, AnalysisReportSelectorComponent ],
+      declarations: [AnalysisStatusCellComponent, AnalysisReportSelectorComponent],
       imports: [
         MDAppModule,
       ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/analysis-status-cell/analysis-status-cell.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kube-helm-list-types.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kube-helm-list-types.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kube-helm-list-types.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kube-helm-list-types.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kube-list.helper.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kube-list.helper.ts
similarity index 88%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kube-list.helper.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kube-list.helper.ts
index 1509c97e9c..b2ac0ae8bb 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kube-list.helper.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kube-list.helper.ts
@@ -1,7 +1,7 @@
 import moment from 'moment';
 
-import { DataFunction } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
-import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types';
+import { DataFunction } from '../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
+import { ITableColumn } from '../../../../core/src/shared/components/list/list-table/table.types';
 import { BasicKubeAPIResource, ConditionType, KubernetesNode } from '../store/kube.types';
 
 export function getConditionSort(condition: ConditionType): DataFunction<KubernetesNode> {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts
similarity index 52%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts
index 3eaaf1f26e..c91acd3774 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts
@@ -3,14 +3,13 @@ import { Store } from '@ngrx/store';
 import {
   BaseEndpointsDataSource,
   syncPaginationSection,
-} from '../../../../../../core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source';
-import { IListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
-import { GetAllEndpoints } from '../../../../../../store/src/actions/endpoint.actions';
-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';
+} from '../../../../../core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source';
+import { IListConfig } from '../../../../../core/src/shared/components/list/list.component.types';
+import { GetAllEndpoints } from '../../../../../store/src/actions/endpoint.actions';
+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 { AppState, EndpointModel } from '../../../../../store/src/public-api';
 
 export class KubernetesEndpointsDataSource extends BaseEndpointsDataSource {
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
similarity index 59%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
index 2c384fefa9..f4efc09eca 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts
@@ -1,22 +1,21 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 
-import { ITableColumn } from '../../../../../../core/src/shared/components/list/list-table/table.types';
+import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types';
 import {
   BaseEndpointsDataSource,
-} from '../../../../../../core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source';
+} from '../../../../../core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source';
 import {
   EndpointCardComponent,
-} from '../../../../../../core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component';
+} from '../../../../../core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component';
 import {
   EndpointsListConfigService,
-} from '../../../../../../core/src/shared/components/list/list-types/endpoint/endpoints-list-config.service';
-import { IListConfig, ListViewTypes } from '../../../../../../core/src/shared/components/list/list.component.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';
+} from '../../../../../core/src/shared/components/list/list-types/endpoint/endpoints-list-config.service';
+import { IListConfig, ListViewTypes } from '../../../../../core/src/shared/components/list/list.component.types';
+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 { AppState, EndpointModel } from '../../../../../store/src/public-api';
 import { KubernetesEndpointsDataSource } from './kubernetes-endpoints-data-source';
 
 @Injectable()
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.html b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts
similarity index 92%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts
index 68f0f28e01..208f7e2be3 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.spec.ts
@@ -1,8 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { BaseTestModules } from '../../../../../../core/test-framework/core-test.helper';
-import { KubernetesLabelsCellComponent } from './kubernetes-labels-cell.component';
+import { BaseTestModules } from '../../../../../core/test-framework/core-test.helper';
 import { KubernetesStatus } from '../../store/kube.types';
+import { KubernetesLabelsCellComponent } from './kubernetes-labels-cell.component';
 
 describe('KubernetesLabelsCellComponent', () => {
   let component: KubernetesLabelsCellComponent;
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.ts
similarity index 76%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.ts
index a22c8018e7..20a8b2e5b0 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-labels-cell/kubernetes-labels-cell.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 
-import { AppChip } from '../../../../../../core/src/shared/components/chips/chips.component';
-import { TableCellCustom } from '../../../../../../core/src/shared/components/list/list.types';
+import { AppChip } from '../../../../../core/src/shared/components/chips/chips.component';
+import { TableCellCustom } from '../../../../../core/src/shared/components/list/list.types';
 import { KubeAPIResource } from '../../store/kube.types';
 
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
similarity index 79%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
index 17d13b91a9..8ed8c1128c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts
@@ -1,8 +1,8 @@
 import { Store } from '@ngrx/store';
 
-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 { AppState } from '../../../../../../store/src/app-state';
+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 { AppState } from '../../../../../store/src/public-api';
 import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { kubernetesEntityFactory, kubernetesPodsEntityType } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts
similarity index 94%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts
index 98830df419..c5e48a4935 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 
-import { AppState } from '../../../../../../store/src/app-state';
+import { AppState } from '../../../../../store/src/public-api';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesNamespaceService } from '../../services/kubernetes-namespace.service';
 import { BaseKubernetesPodsListConfigService } from '../kubernetes-pods/kubernetes-pods-list-config.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts
similarity index 80%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts
index 7ac8f28263..bf533daf17 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts
@@ -1,7 +1,7 @@
 import { Store } from '@ngrx/store';
 
-import { IListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
-import { AppState } from '../../../../../../store/src/app-state';
+import { IListConfig } from '../../../../../core/src/shared/components/list/list.component.types';
+import { AppState } from '../../../../../store/src/public-api';
 import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubeService } from '../../store/kube.types';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service.ts
similarity index 93%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service.ts
index d6bf8a0385..ebf6103361 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 
-import { AppState } from '../../../../../../store/src/app-state';
+import { AppState } from '../../../../../store/src/public-api';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesNamespaceService } from '../../services/kubernetes-namespace.service';
 import { BaseKubernetesServicesListConfig } from '../kubernetes-services/kubernetes-service-list-config.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.html b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.ts
similarity index 90%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.ts
index 239363c136..d1e7679573 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../core/src/shared/components/list/list.types';
 import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
 import { KubernetesNamespace } from '../../../store/kube.types';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.html b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.ts
similarity index 87%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.ts
index e39f0e95ce..58fde4613a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../core/src/shared/components/list/list.types';
 import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
 import { KubernetesNamespace } from '../../../store/kube.types';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
similarity index 71%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
index 76555c46ee..c95efb1f23 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts
@@ -1,9 +1,9 @@
 import { Store } from '@ngrx/store';
 
-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 { getPaginationKey } from '../../../../../../store/src/actions/pagination.actions';
-import { AppState } from '../../../../../../store/src/app-state';
+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 { getPaginationKey } from '../../../../../store/src/actions/pagination.actions';
+import { AppState } from '../../../../../store/src/public-api';
 import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { kubernetesNamespacesEntityType } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
similarity index 91%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
index 58b66774a6..587fcf631d 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts
@@ -3,9 +3,9 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, first, map, tap } from 'rxjs/operators';
 
-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 { AppState } from '../../../../../../store/src/app-state';
+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 { AppState } from '../../../../../store/src/public-api';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
 import { KubernetesNamespace } from '../../store/kube.types';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
similarity index 76%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
index 746bf5e95a..6ff5893190 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts
@@ -1,8 +1,8 @@
 import { Store } from '@ngrx/store';
 
-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 { AppState } from '../../../../../../store/src/app-state';
+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 { AppState } from '../../../../../store/src/public-api';
 import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesNodeService } from '../../services/kubernetes-node.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts
similarity index 93%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts
index be0d52354d..4f93ff213b 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 
-import { AppState } from '../../../../../../store/src/app-state';
+import { AppState } from '../../../../../store/src/public-api';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesNodeService } from '../../services/kubernetes-node.service';
 import { BaseKubernetesPodsListConfigService } from '../kubernetes-pods/kubernetes-pods-list-config.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.html b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts
similarity index 92%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts
index 382f3b21ba..dedb8f791a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { BaseTestModules } from '../../../../../../../core/test-framework/core-test.helper';
+import { BaseTestModules } from '../../../../../../core/test-framework/core-test.helper';
 import { ConditionCellComponent } from './condition-cell.component';
 
 describe('ConditionCellComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts
similarity index 89%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts
index da889a853f..03b0b2e878 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../core/src/shared/components/list/list.types';
 import { KubernetesNode } from '../../../store/kube.types';
 
 @Component({
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.html b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts
similarity index 92%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts
index e71a76120f..bc04b8d360 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { BaseTestModules } from '../../../../../../../core/test-framework/core-test.helper';
+import { BaseTestModules } from '../../../../../../core/test-framework/core-test.helper';
 import { KubernetesNodeCapacityComponent } from './kubernetes-node-capacity.component';
 
 describe('KubernetesNodeCapacityComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.ts
similarity index 85%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.ts
index 8b1738b7d0..17491cde85 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.ts
@@ -1,6 +1,6 @@
 import { Component, ViewEncapsulation } from '@angular/core';
 
-import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../core/src/shared/components/list/list.types';
 
 
 @Component({
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.html b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts
similarity index 92%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts
index cbb540177f..942059a5b5 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { BaseTestModules } from '../../../../../../../core/test-framework/core-test.helper';
+import { BaseTestModules } from '../../../../../../core/test-framework/core-test.helper';
 import { KubernetesNodeIpsComponent } from './kubernetes-node-ips.component';
 
 describe('KubernetesNodeIpsComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.ts
similarity index 88%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.ts
index d037fbce9e..feb188954f 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-ips/kubernetes-node-ips.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../core/src/shared/components/list/list.types';
 import { KubernetesAddressExternal, KubernetesAddressInternal, KubernetesNode } from '../../../store/kube.types';
 
 @Component({
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.html b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts
similarity index 92%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts
index 2f7e112135..050be6121c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { BaseTestModules } from '../../../../../../../core/test-framework/core-test.helper';
+import { BaseTestModules } from '../../../../../../core/test-framework/core-test.helper';
 import { KubernetesNodeLabelsComponent } from './kubernetes-node-labels.component';
 
 describe('KubernetesNodeLabelsComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.ts
similarity index 85%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.ts
index 07f0f35f7a..f15c018bec 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-labels/kubernetes-node-labels.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../core/src/shared/components/list/list.types';
 import { KubernetesNode } from '../../../store/kube.types';
 
 @Component({
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.theme.scss b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.theme.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.theme.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.theme.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts
similarity index 91%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts
index d5c05226f8..ccf197c570 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../core/src/shared/components/list/list.types';
 import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
 import { KubernetesNode } from '../../../store/kube.types';
 
@@ -16,7 +16,7 @@ export class KubernetesNodeLinkComponent extends TableCellCustom<KubernetesNode>
   public icon: {
     icon: string,
     class: string,
-    message: string
+    message: string,
   };
 
   constructor(
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.html b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts
similarity index 92%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts
index 0a3579cd55..cb7eb3fa12 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { BaseTestModules } from '../../../../../../../core/test-framework/core-test.helper';
+import { BaseTestModules } from '../../../../../../core/test-framework/core-test.helper';
 import { KubernetesNodePressureComponent } from './kubernetes-node-pressure.component';
 
 describe('KubernetesNodePressureComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.theme.scss b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.theme.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.theme.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.theme.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.ts
similarity index 88%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.ts
index 1352f25bc6..8f532f808f 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-pressure/kubernetes-node-pressure.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../core/src/shared/components/list/list.types';
 import { ConditionType, ConditionTypeLabels, KubernetesNode } from '../../../store/kube.types';
 
 @Component({
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.html b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.html b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.html b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.html b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.html b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.ts
similarity index 90%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.ts
index 4aa3994061..347734d3eb 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
+import { AppChip } from '../../../../../../../core/src/shared/components/chips/chips.component';
 import { KubernetesNodeService } from '../../../../services/kubernetes-node.service';
 
 @Component({
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
similarity index 73%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
index a51fbe5a8d..2550ea4e65 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts
@@ -4,10 +4,10 @@ import {
   DataFunction,
   DataFunctionDefinition,
   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 { getPaginationKey } from '../../../../../../store/src/actions/pagination.actions';
-import { AppState } from '../../../../../../store/src/app-state';
+} from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
+import { IListConfig } from '../../../../../core/src/shared/components/list/list.component.types';
+import { getPaginationKey } from '../../../../../store/src/actions/pagination.actions';
+import { AppState } from '../../../../../store/src/public-api';
 import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { kubernetesNodesEntityType } from '../../kubernetes-entity-factory';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
similarity index 92%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
index 244d2739e7..8fa1986be2 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts
@@ -1,15 +1,15 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 
-import { DataFunction } from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
-import { ITableColumn } from '../../../../../../core/src/shared/components/list/list-table/table.types';
+import { DataFunction } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
+import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types';
 import {
   IListConfig,
   IListFilter,
   ListViewTypes,
-} from '../../../../../../core/src/shared/components/list/list.component.types';
-import { AppState } from '../../../../../../store/src/app-state';
-import { PaginationEntityState } from '../../../../../../store/src/types/pagination.types';
+} from '../../../../../core/src/shared/components/list/list.component.types';
+import { AppState } from '../../../../../store/src/public-api';
+import { PaginationEntityState } from '../../../../../store/src/types/pagination.types';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { ConditionType, KubernetesAddressExternal, KubernetesAddressInternal, KubernetesNode } from '../../store/kube.types';
 import { defaultHelmKubeListPageSize } from '../kube-helm-list-types';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.html b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.ts
similarity index 89%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.ts
index 75d4b752a8..b59c679be9 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../core/src/shared/components/list/list.types';
 import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
 import { KubernetesNode } from '../../../store/kube.types';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts
similarity index 90%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts
index 526d4132e9..dcbfd41b47 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts
@@ -1,4 +1,3 @@
-/* tslint:disable:max-line-length */
 import { TitleCasePipe } from '@angular/common';
 import { Component, Input } from '@angular/core';
 import moment from 'moment';
@@ -7,16 +6,14 @@ import { filter, map } from 'rxjs/operators';
 
 import {
   BooleanIndicatorType,
-} from '../../../../../../../core/src/shared/components/boolean-indicator/boolean-indicator.component';
+} from '../../../../../../core/src/shared/components/boolean-indicator/boolean-indicator.component';
 import {
   TableCellBooleanIndicatorComponentConfig,
-} from '../../../../../../../core/src/shared/components/list/list-table/table-cell-boolean-indicator/table-cell-boolean-indicator.component';
-import { CardCell } from '../../../../../../../core/src/shared/components/list/list.types';
+} from '../../../../../../core/src/shared/components/list/list-table/table-cell-boolean-indicator/table-cell-boolean-indicator.component';
+import { CardCell } from '../../../../../../core/src/shared/components/list/list.types';
 import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog';
 import { Container, ContainerState, ContainerStatus, InitContainer, KubernetesPod } from '../../../store/kube.types';
 
-/* tslint:enable:max-line-length */
-
 export interface ContainerForTable {
   isInit: boolean;
   container: Container | InitContainer;
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
similarity index 93%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
index 7ba04b0ad1..37fab13a02 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-status/kubernetes-pod-status.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 
-import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
+import { TableCellCustom } from '../../../../../../core/src/shared/components/list/list.types';
 import { KubernetesPodExpandedStatusTypes } from '../../../services/kubernetes-expanded-state';
 import { KubernetesPod } from '../../../store/kube.types';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.html b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.ts
similarity index 80%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.ts
index 92dea65c38..f1b28c19a0 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 
-import { AppChip } from '../../../../../../../core/src/shared/components/chips/chips.component';
-import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
+import { AppChip } from '../../../../../../core/src/shared/components/chips/chips.component';
+import { TableCellCustom } from '../../../../../../core/src/shared/components/list/list.types';
 import { KubeAPIResource, PodLabel } from '../../../store/kube.types';
 
 @Component({
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
similarity index 73%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
index da0d7f92d2..dd6b22afcb 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts
@@ -1,8 +1,8 @@
 import { Store } from '@ngrx/store';
 
-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 { AppState } from '../../../../../../store/src/app-state';
+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 { AppState } from '../../../../../store/src/public-api';
 import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import { KubernetesPod } from '../../store/kube.types';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
similarity index 92%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
index 0c1c5199e7..6534cf9b8a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts
@@ -8,10 +8,10 @@ import { of } from 'rxjs';
 import {
   TableCellSidePanelComponent,
   TableCellSidePanelConfig,
-} from '../../../../../../core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component';
-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 { AppState } from '../../../../../../store/src/app-state';
+} from '../../../../../core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component';
+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 { AppState } from '../../../../../store/src/public-api';
 import { BaseKubeGuid } from '../../kubernetes-page.types';
 import {
   KubernetesResourceViewerComponent,
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
similarity index 81%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
index 2c0cad521b..2d1defd4de 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 
-import { CardCell } from '../../../../../../core/src/shared/components/list/list.types';
+import { CardCell } from '../../../../../core/src/shared/components/list/list.types';
 import { KubeService } from '../../store/kube.types';
 
 @Component({
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.html b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-services/kubernetes-service-card/kubernetes-service-card.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
similarity index 83%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
index e8615512b2..6c861ff29c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-services/kubernetes-service-list-config.service.ts
@@ -1,12 +1,12 @@
 import { of } from 'rxjs';
 
-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 {
   TableCellSidePanelComponent,
   TableCellSidePanelConfig,
-} from '../../../../../../core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component';
-import { ITableColumn } from '../../../../../../core/src/shared/components/list/list-table/table.types';
-import { IListConfig, ListViewTypes } from '../../../../../../core/src/shared/components/list/list.component.types';
+} from '../../../../../core/src/shared/components/list/list-table/table-cell-side-panel/table-cell-side-panel.component';
+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 {
   KubernetesResourceViewerComponent,
   KubernetesResourceViewerConfig,
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts
similarity index 65%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts
index 89f60d414a..e973ca1f75 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts
@@ -1,10 +1,10 @@
 import { Store } from '@ngrx/store';
 import { OperatorFunction } from 'rxjs';
 
-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 { AppState } from '../../../../../../store/src/app-state';
-import { PaginatedAction } from '../../../../../../store/src/types/pagination.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 { AppState } from '../../../../../store/src/public-api';
+import { PaginatedAction } from '../../../../../store/src/types/pagination.types';
 import { KubeService } from '../../store/kube.types';
 
 export class BaseKubernetesServicesDataSource extends ListDataSource<KubeService> {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.html b/src/frontend/packages/kubernetes/src/kubernetes/pod-metrics/pod-metrics.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/pod-metrics/pod-metrics.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/pod-metrics/pod-metrics.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/pod-metrics/pod-metrics.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/pod-metrics/pod-metrics.component.spec.ts
similarity index 93%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/pod-metrics/pod-metrics.component.spec.ts
index 5f245aad3a..cbf4e5677f 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/pod-metrics/pod-metrics.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
-import { TabNavService } from '../../../../../core/src/tab-nav.service';
+import { TabNavService } from '../../../../core/src/tab-nav.service';
 import { KubernetesBaseTestModules } from '../kubernetes.testing.module';
 import { PodMetricsComponent } from './pod-metrics.component';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/pod-metrics/pod-metrics.component.ts
similarity index 88%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/pod-metrics/pod-metrics.component.ts
index 3fe46c7d38..6d0801f813 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/pod-metrics/pod-metrics.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/pod-metrics/pod-metrics.component.ts
@@ -3,17 +3,17 @@ import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { getIdFromRoute } from '../../../../../core/src/core/utils.service';
-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 { getIdFromRoute } from '../../../../core/src/core/utils.service';
+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 {
   ChartDataTypes,
   getMetricsChartConfigBuilder,
-} from '../../../../../core/src/shared/components/metrics-chart/metrics.component.helpers';
-import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
-import { EntityInfo } from '../../../../../store/src/types/api.types';
-import { ChartSeries, IMetricMatrixResult } from '../../../../../store/src/types/base-metric.types';
-import { IMetricApplication } from '../../../../../store/src/types/metric.types';
+} from '../../../../core/src/shared/components/metrics-chart/metrics.component.helpers';
+import { IHeaderBreadcrumb } from '../../../../core/src/shared/components/page-header/page-header.types';
+import { EntityInfo } from '../../../../store/src/types/api.types';
+import { ChartSeries, IMetricMatrixResult } from '../../../../store/src/types/base-metric.types';
+import { IMetricApplication } from '../../../../store/src/types/metric.types';
 import { kubeEntityCatalog } from '../kubernetes-entity-catalog';
 import { formatAxisCPUTime, formatCPUTime } from '../kubernetes-metrics.helpers';
 import { BaseKubeGuid } from '../kubernetes-page.types';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/analysis-report.types.ts b/src/frontend/packages/kubernetes/src/kubernetes/services/analysis-report.types.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/services/analysis-report.types.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/services/analysis-report.types.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-endpoint.service.ts b/src/frontend/packages/kubernetes/src/kubernetes/services/kubernetes-endpoint.service.ts
similarity index 92%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-endpoint.service.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/services/kubernetes-endpoint.service.ts
index 1bf6932297..b33f03a1f1 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-endpoint.service.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/services/kubernetes-endpoint.service.ts
@@ -3,13 +3,14 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable, of } from 'rxjs';
 import { filter, first, map, shareReplay, startWith, switchMap } from 'rxjs/operators';
 
-import { GetAllEndpoints } from '../../../../../store/src/actions/endpoint.actions';
-import { AppState } from '../../../../../store/src/app-state';
-import { EntityService } from '../../../../../store/src/entity-service';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
-import { PaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
-import { EntityInfo } from '../../../../../store/src/types/api.types';
-import { EndpointModel, EndpointUser } from '../../../../../store/src/types/endpoint.types';
+import { GetAllEndpoints } from '../../../../store/src/actions/endpoint.actions';
+import { AppState } from '../../../../store/src/app-state';
+import { EntityService } from '../../../../store/src/entity-service';
+import { EntityServiceFactory } from '../../../../store/src/entity-service-factory.service';
+import { EndpointModel } from '../../../../store/src/public-api';
+import { PaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
+import { EntityInfo } from '../../../../store/src/types/api.types';
+import { EndpointUser } from '../../../../store/src/types/endpoint.types';
 import { kubeEntityCatalog } from '../kubernetes-entity-catalog';
 import { BaseKubeGuid } from '../kubernetes-page.types';
 import {
@@ -126,7 +127,7 @@ export class KubernetesEndpointService {
         info.versionMismatch = Object.keys(versions).length !== 1;
         return info;
       })
-    )
+    );
   }
 
   getCaaspNodeData(n: KubernetesNode): CaaspNodeData {
@@ -136,13 +137,13 @@ export class KubernetesEndpointService {
         updates: this.hasBooleanAnnotation(n.metadata.annotations, CAASP_HAS_UPDATES_ANNOTATION),
         disruptiveUpdates: this.hasBooleanAnnotation(n.metadata.annotations, CAASP_DISRUPTIVE_UPDATES_ANNOTATION),
         securityUpdates: this.hasBooleanAnnotation(n.metadata.annotations, CAASP_SECURITY_UPDATES_ANNOTATION)
-      }
+      };
     }
   }
 
   // Check for the specified annotation with a value of 'yes'
   private hasBooleanAnnotation(annotations: Annotations, annotation: string): boolean {
-    return annotations[annotation] && annotations[annotation] === 'yes' ? true : false
+    return annotations[annotation] && annotations[annotation] === 'yes' ? true : false;
   }
 
   getNodeKubeVersions(nodes$: Observable<KubernetesNode[]> = this.nodes$) {
@@ -228,7 +229,7 @@ export class KubernetesEndpointService {
 
     this.pods$ = this.getObservable<KubernetesPod>(kubeEntityCatalog.pod.store.getPaginationService(this.kubeGuid));
 
-    this.nodes$ = this.getObservable<KubernetesNode>(kubeEntityCatalog.node.store.getPaginationService(this.kubeGuid))
+    this.nodes$ = this.getObservable<KubernetesNode>(kubeEntityCatalog.node.store.getPaginationService(this.kubeGuid));
 
     this.statefulSets$ = this.getObservable<KubernetesStatefulSet>(kubeEntityCatalog.statefulSet.store.getPaginationService(this.kubeGuid));
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-expanded-state.ts b/src/frontend/packages/kubernetes/src/kubernetes/services/kubernetes-expanded-state.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-expanded-state.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/services/kubernetes-expanded-state.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-namespace.service.ts b/src/frontend/packages/kubernetes/src/kubernetes/services/kubernetes-namespace.service.ts
similarity index 93%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-namespace.service.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/services/kubernetes-namespace.service.ts
index 03f3758a06..d6c62cf663 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-namespace.service.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/services/kubernetes-namespace.service.ts
@@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
 import { filter, first, map, publishReplay } from 'rxjs/operators';
 
-import { getIdFromRoute } from '../../../../../core/src/core/utils.service';
+import { getIdFromRoute } from '../../../../core/src/core/utils.service';
 import { kubeEntityCatalog } from '../kubernetes-entity-catalog';
 import { KubernetesNamespace } from '../store/kube.types';
 import { KubernetesEndpointService } from './kubernetes-endpoint.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-node.service.ts b/src/frontend/packages/kubernetes/src/kubernetes/services/kubernetes-node.service.ts
similarity index 84%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-node.service.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/services/kubernetes-node.service.ts
index 855173aef9..951a50de18 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes-node.service.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/services/kubernetes-node.service.ts
@@ -4,12 +4,12 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, first, map, publishReplay, refCount } from 'rxjs/operators';
 
-import { getIdFromRoute } from '../../../../../core/src/core/utils.service';
-import { MetricQueryConfig, MetricsAction } from '../../../../../store/src/actions/metrics.actions';
-import { AppState } from '../../../../../store/src/app-state';
-import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
-import { EntityInfo } from '../../../../../store/src/types/api.types';
-import { MetricQueryType } from '../../../../../store/src/types/metric.types';
+import { getIdFromRoute } from '../../../../core/src/core/utils.service';
+import { MetricQueryConfig, MetricsAction } from '../../../../store/src/actions/metrics.actions';
+import { EntityMonitorFactory } from '../../../../store/src/monitors/entity-monitor.factory.service';
+import { AppState } from '../../../../store/src/public-api';
+import { EntityInfo } from '../../../../store/src/types/api.types';
+import { MetricQueryType } from '../../../../store/src/types/metric.types';
 import { kubeEntityCatalog } from '../kubernetes-entity-catalog';
 import { KubernetesNode, MetricStatistic } from '../store/kube.types';
 import { FetchKubernetesMetricsAction } from '../store/kubernetes.actions';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes.analysis.service.ts b/src/frontend/packages/kubernetes/src/kubernetes/services/kubernetes.analysis.service.ts
similarity index 93%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes.analysis.service.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/services/kubernetes.analysis.service.ts
index a5589d99b6..5c0454d3ad 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes.analysis.service.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/services/kubernetes.analysis.service.ts
@@ -4,10 +4,10 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable } from 'rxjs';
 import { filter, first, map, pairwise, startWith, tap } from 'rxjs/operators';
 
-import { SnackBarService } from '../../../../../core/src/shared/services/snackbar.service';
-import { ResetPaginationOfType } from '../../../../../store/src/actions/pagination.actions';
-import { AppState } from '../../../../../store/src/app-state';
-import { ListActionState, RequestInfoState } from '../../../../../store/src/reducers/api-request-reducer/types';
+import { SnackBarService } from '../../../../core/src/shared/services/snackbar.service';
+import { ResetPaginationOfType } from '../../../../store/src/actions/pagination.actions';
+import { AppState } from '../../../../store/src/app-state';
+import { ListActionState, RequestInfoState } from '../../../../store/src/reducers/api-request-reducer/types';
 import { kubeEntityCatalog } from '../kubernetes-entity-catalog';
 import { GetAnalysisReports } from '../store/analysis.actions';
 import { AnalysisReport } from '../store/kube.types';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes.service.ts b/src/frontend/packages/kubernetes/src/kubernetes/services/kubernetes.service.ts
similarity index 64%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes.service.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/services/kubernetes.service.ts
index 09c03d154e..3f103e61f1 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubernetes.service.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/services/kubernetes.service.ts
@@ -2,10 +2,10 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map, shareReplay } from 'rxjs/operators';
 
-import { PaginationMonitor } from '../../../../../store/src/monitors/pagination-monitor';
-import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog';
-import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
-import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
+import { PaginationMonitor } from '../../../../store/src/monitors/pagination-monitor';
+import { EndpointModel } from '../../../../store/src/public-api';
+import { stratosEntityCatalog } from '../../../../store/src/stratos-entity-catalog';
+import { APIResource, EntityInfo } from '../../../../store/src/types/api.types';
 import { KUBERNETES_ENDPOINT_TYPE } from '../kubernetes-entity-factory';
 
 @Injectable()
@@ -15,7 +15,7 @@ export class KubernetesService {
   waitForAppEntity$: Observable<EntityInfo<APIResource>>;
 
   constructor() {
-    this.kubeEndpointsMonitor = stratosEntityCatalog.endpoint.store.getAll.getPaginationMonitor()
+    this.kubeEndpointsMonitor = stratosEntityCatalog.endpoint.store.getAll.getPaginationMonitor();
 
     this.kubeEndpoints$ = this.kubeEndpointsMonitor.currentPage$.pipe(
       map(endpoints => endpoints.filter(e => e.cnsi_type === KUBERNETES_ENDPOINT_TYPE)),
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubescore-report.helper.ts b/src/frontend/packages/kubernetes/src/kubernetes/services/kubescore-report.helper.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/services/kubescore-report.helper.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/services/kubescore-report.helper.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/popeye-report.helper.ts b/src/frontend/packages/kubernetes/src/kubernetes/services/popeye-report.helper.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/services/popeye-report.helper.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/services/popeye-report.helper.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/services/route.helper.ts b/src/frontend/packages/kubernetes/src/kubernetes/services/route.helper.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/services/route.helper.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/services/route.helper.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/action-builders/kube.action-builders.ts b/src/frontend/packages/kubernetes/src/kubernetes/store/action-builders/kube.action-builders.ts
similarity index 97%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/store/action-builders/kube.action-builders.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/store/action-builders/kube.action-builders.ts
index 22d30c7c9b..7d1cf49d2a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/action-builders/kube.action-builders.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/store/action-builders/kube.action-builders.ts
@@ -1,6 +1,4 @@
-import {
-  OrchestratedActionBuilders,
-} from '../../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
+import { OrchestratedActionBuilders } from '../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import { GetHelmReleasePods, GetHelmReleaseServices } from '../../workloads/store/workloads.actions';
 import {
   DeleteAnalysisReport,
@@ -42,7 +40,7 @@ export interface KubePodActionBuilders extends OrchestratedActionBuilders {
   get: (
     podName: string,
     kubeGuid: string,
-    extraArgs: { namespace: string; }
+    extraArgs: { namespace: string, }
   ) => GetKubernetesPod,
   getMultiple: (
     kubeGuid: string,
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/analysis.actions.ts b/src/frontend/packages/kubernetes/src/kubernetes/store/analysis.actions.ts
similarity index 94%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/store/analysis.actions.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/store/analysis.actions.ts
index 5748da68f3..551b3c43d1 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/analysis.actions.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/store/analysis.actions.ts
@@ -1,5 +1,5 @@
-import { getActions } from '../../../../../store/src/actions/action.helper';
-import { PaginatedAction } from '../../../../../store/src/types/pagination.types';
+import { getActions } from '../../../../store/src/actions/action.helper';
+import { PaginatedAction } from '../../../../store/src/types/pagination.types';
 import { analysisReportEntityType, KUBERNETES_ENDPOINT_TYPE, kubernetesEntityFactory } from '../kubernetes-entity-factory';
 import { KubeAction, KubePaginationAction, KubeSingleEntityAction } from './kubernetes.actions';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/analysis.effects.ts b/src/frontend/packages/kubernetes/src/kubernetes/store/analysis.effects.ts
similarity index 93%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/store/analysis.effects.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/store/analysis.effects.ts
index 24ab4ea499..d3f8dbb8a8 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/analysis.effects.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/store/analysis.effects.ts
@@ -4,16 +4,10 @@ import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { catchError, flatMap, mergeMap } from 'rxjs/operators';
 
-import { environment } from '../../../../../core/src/environments/environment';
-import { AppState } from '../../../../../store/src/app-state';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
-import { ApiRequestTypes } from '../../../../../store/src/reducers/api-request-reducer/request-helpers';
-import { NormalizedResponse } from '../../../../../store/src/types/api.types';
-import {
-  StartRequestAction,
-  WrapperRequestActionFailed,
-  WrapperRequestActionSuccess,
-} from '../../../../../store/src/types/request.types';
+import { environment } from '../../../../core/src/environments/environment';
+import { AppState, entityCatalog, NormalizedResponse, WrapperRequestActionSuccess } from '../../../../store/src/public-api';
+import { ApiRequestTypes } from '../../../../store/src/reducers/api-request-reducer/request-helpers';
+import { StartRequestAction, WrapperRequestActionFailed } from '../../../../store/src/types/request.types';
 import { KubeScoreReportHelper } from '../services/kubescore-report.helper';
 import { PopeyeReportHelper } from '../services/popeye-report.helper';
 import {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.getIds.ts b/src/frontend/packages/kubernetes/src/kubernetes/store/kube.getIds.ts
similarity index 93%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.getIds.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/store/kube.getIds.ts
index 898062b926..256d39ca39 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.getIds.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/store/kube.getIds.ts
@@ -1,4 +1,4 @@
-import { environment } from '../../../../../core/src/environments/environment';
+import { environment } from '../../../../core/src/environments/environment';
 import {
   BasicKubeAPIResource,
   KubernetesDeployment,
@@ -17,13 +17,13 @@ const debugMissingKubeId = (entity: BasicKubeAPIResource, func: (...args: string
     console.warn(`Kube entity does not have a kubeId, this is probably a bug: `, entity);
   }
   return func(...args);
-}
+};
 
-export const getGuidFromKubeNode = (kubeGuid: string, name: string): string => deliminate(name, kubeGuid)
+export const getGuidFromKubeNode = (kubeGuid: string, name: string): string => deliminate(name, kubeGuid);
 export const getGuidFromKubeNodeObj = (entity: KubernetesNode): string =>
   debugMissingKubeId(entity, getGuidFromKubeNode, entity.metadata.kubeId, entity.metadata.name);
 
-export const getGuidFromKubeNamespace = (kubeGuid: string, name: string): string => deliminate(name, kubeGuid)
+export const getGuidFromKubeNamespace = (kubeGuid: string, name: string): string => deliminate(name, kubeGuid);
 export const getGuidFromKubeNamespaceObj = (entity: KubernetesNamespace): string =>
   debugMissingKubeId(entity, getGuidFromKubeNamespace, entity.metadata.kubeId, entity.metadata.name);
 
@@ -45,5 +45,5 @@ export const getGuidFromKubePod = (kubeGuid: string, namespace: string, name: st
 export const getGuidFromKubePodObj = (entity: KubernetesPod): string =>
   debugMissingKubeId(entity, getGuidFromKubePod, entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name);
 
-export const getGuidFromKubeDashboard = (kubeGuid: string): string => kubeGuid
+export const getGuidFromKubeDashboard = (kubeGuid: string): string => kubeGuid;
 export const getGuidFromKubeDashboardObj = (entity: KubeDashboardStatus): string => getGuidFromKubeDashboard(entity.kubeGuid);
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.types.ts b/src/frontend/packages/kubernetes/src/kubernetes/store/kube.types.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kube.types.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/store/kube.types.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kubernetes.actions.ts b/src/frontend/packages/kubernetes/src/kubernetes/store/kubernetes.actions.ts
similarity index 97%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kubernetes.actions.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/store/kubernetes.actions.ts
index b35b07a92b..ebba3d6dca 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kubernetes.actions.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/store/kubernetes.actions.ts
@@ -2,10 +2,10 @@ 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';
 
-import { MetricQueryConfig, MetricsAction, MetricsChartAction } from '../../../../../store/src/actions/metrics.actions';
-import { getPaginationKey } from '../../../../../store/src/actions/pagination.actions';
-import { PaginatedAction, PaginationParam } from '../../../../../store/src/types/pagination.types';
-import { EntityRequestAction } from '../../../../../store/src/types/request.types';
+import { MetricQueryConfig, MetricsAction, MetricsChartAction } from '../../../../store/src/actions/metrics.actions';
+import { getPaginationKey } from '../../../../store/src/actions/pagination.actions';
+import { PaginatedAction, PaginationParam } from '../../../../store/src/types/pagination.types';
+import { EntityRequestAction } from '../../../../store/src/types/request.types';
 import {
   KUBERNETES_ENDPOINT_TYPE,
   kubernetesDashboardEntityType,
@@ -230,7 +230,7 @@ export class GetKubernetesPods implements KubePaginationAction {
 
 export class GetKubernetesPodsOnNode extends GetKubernetesPods {
   constructor(kubeGuid: string, public nodeName: string) {
-    super(kubeGuid)
+    super(kubeGuid);
     this.paginationKey = getPaginationKey(kubernetesPodsEntityType, `node-${nodeName}`, kubeGuid);
     this.initialParams.fieldSelector = `spec.nodeName=${nodeName}`;
   }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kubernetes.effects.ts b/src/frontend/packages/kubernetes/src/kubernetes/store/kubernetes.effects.ts
similarity index 95%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kubernetes.effects.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/store/kubernetes.effects.ts
index e839283471..a430bc9bb1 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/store/kubernetes.effects.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/store/kubernetes.effects.ts
@@ -8,16 +8,10 @@ import { connectedEndpointsOfTypesSelector } from 'frontend/packages/store/src/s
 import { of } from 'rxjs';
 import { catchError, first, flatMap, map, mergeMap, switchMap } from 'rxjs/operators';
 
-import { environment } from '../../../../../core/src/environments/environment';
-import { AppState } from '../../../../../store/src/app-state';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
-import { isJetstreamError } from '../../../../../store/src/jetstream';
-import { NormalizedResponse } from '../../../../../store/src/types/api.types';
-import {
-  StartRequestAction,
-  WrapperRequestActionFailed,
-  WrapperRequestActionSuccess,
-} from '../../../../../store/src/types/request.types';
+import { environment } from '../../../../core/src/environments/environment';
+import { isJetstreamError } from '../../../../store/src/jetstream';
+import { AppState, entityCatalog, NormalizedResponse, WrapperRequestActionSuccess } from '../../../../store/src/public-api';
+import { StartRequestAction, WrapperRequestActionFailed } from '../../../../store/src/types/request.types';
 import {
   KUBERNETES_ENDPOINT_TYPE,
   kubernetesDashboardEntityType,
@@ -79,8 +73,8 @@ export interface KubeDashboardStatus {
   running: boolean;
   pod: {
     spec: {
-      containers: KubeDashboardContainer[]
-    }
+      containers: KubeDashboardContainer[];
+    };
   };
   version: string;
   service: {
@@ -408,7 +402,7 @@ export class KubernetesEffects {
     return 'Kubernetes API request error';
   }
 
-  private createKubeError(err: any): { status: string, message: string } {
+  private createKubeError(err: any): { status: string, message: string, } {
     const jetstreamError = isJetstreamError(err);
     if (jetstreamError) {
       // Wrapped error
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.html b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.theme.scss b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.theme.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.theme.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.theme.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.html b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.spec.ts
similarity index 81%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.spec.ts
index d959dc1a83..12fc0e9c0b 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.spec.ts
@@ -1,10 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { SidePanelService } from '../../../../../../../core/src/shared/services/side-panel.service';
+import { SharedModule } from '../../../../../../core/src/public-api';
+import { SidePanelService } from '../../../../../../core/src/shared/services/side-panel.service';
 import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
 import { KubernetesAnalysisService } from '../../../services/kubernetes.analysis.service';
-import { SharedModule } from './../../../../../../../core/src/shared/shared.module';
 import { AnalysisInfoCardComponent } from './analysis-info-card/analysis-info-card.component';
 import { KubernetesAnalysisInfoComponent } from './kubernetes-analysis-info.component';
 
@@ -15,7 +15,7 @@ describe('KubernetesAnalysisInfoComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ KubernetesAnalysisInfoComponent, AnalysisInfoCardComponent ],
+      declarations: [KubernetesAnalysisInfoComponent, AnalysisInfoCardComponent],
       imports: [
         SharedModule,
         KubernetesBaseTestModules,
@@ -27,7 +27,7 @@ describe('KubernetesAnalysisInfoComponent', () => {
         KubeBaseGuidMock,
       ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.ts
similarity index 93%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.ts
index 76cce96ccc..13213f6394 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/kubernetes-analysis-info.component.ts
@@ -17,7 +17,7 @@ export class KubernetesAnalysisInfoComponent implements PreviewableComponent {
 
   analyzers$: Observable<any>;
 
-  setProps(props: { [key: string]: any; }) {
+  setProps(props: { [key: string]: any, }) {
     this.analyzers$ = props.analyzers$;
   }
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.html b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.spec.ts
similarity index 89%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.spec.ts
index ee1e090856..5e94f069a2 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.spec.ts
@@ -1,10 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../../../core/src/tab-nav.service';
+import { TabNavService } from '../../../../../../core/src/tab-nav.service';
 import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
 import { KubernetesAnalysisService } from '../../../services/kubernetes.analysis.service';
-import { CoreModule } from './../../../../../../../core/src/core/core.module';
+import { CoreModule } from './../../../../../../core/src/core/core.module';
 import { AnalysisReportViewerComponent } from './../../../analysis-report-viewer/analysis-report-viewer.component';
 import { KubernetesAnalysisReportComponent } from './kubernetes-analysis-report.component';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.theme.scss b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.theme.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.theme.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.theme.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.html b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.spec.ts
similarity index 90%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.spec.ts
index 1706cd886f..ea14935d32 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { TabNavService } from 'frontend/packages/core/src/tab-nav.service';
 
-import { MDAppModule } from '../../../../../../core/src/public-api';
+import { MDAppModule } from '../../../../../core/src/public-api';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
 import { KubernetesAnalysisService } from '../../services/kubernetes.analysis.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-tab.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.html b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.ts
similarity index 86%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.ts
index 2611cb9caa..3bbe73f96a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
-import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
+import { ListConfig } from '../../../../../core/src/shared/components/list/list.component.types';
 import {
   KubernetesNamespacesListConfigService,
 } from '../../list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.html b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.ts
similarity index 83%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.ts
index 07b711cc83..a33344f0d1 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 
-import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
+import { ListConfig } from '../../../../../core/src/shared/components/list/list.component.types';
 import { KubernetesNodesListConfigService } from '../../list-types/kubernetes-nodes/kubernetes-nodes-list-config.service';
 
 @Component({
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.html b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.ts
similarity index 82%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.ts
index e4f52d8eb5..3315248a53 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 
-import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
+import { ListConfig } from '../../../../../core/src/shared/components/list/list.component.types';
 import { KubernetesPodsListConfigService } from '../../list-types/kubernetes-pods/kubernetes-pods-list-config.service';
 
 @Component({
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts
similarity index 93%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts
index c5ec93f420..05b38cdc1a 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts
@@ -1,7 +1,7 @@
 import { HttpClient, HttpHandler } from '@angular/common/http';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../../core/src/tab-nav.service';
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
 import { KubernetesSummaryTabComponent } from './kubernetes-summary.component';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.theme.scss b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.theme.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.theme.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.theme.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts
similarity index 91%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts
index b5a69213bb..efe1eeab7c 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts
@@ -6,16 +6,15 @@ import { Store } from '@ngrx/store';
 import { combineLatest, interval, Observable, Subscription } from 'rxjs';
 import { first, map, startWith } from 'rxjs/operators';
 
-import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
+import { safeUnsubscribe } from '../../../../../core/src/core/utils.service';
 import {
   IChartThresholds,
   ISimpleUsageChartData,
-} from '../../../../../../core/src/shared/components/simple-usage-chart/simple-usage-chart.types';
-import { AppState } from '../../../../../../store/src/app-state';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
-import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
-import { getCurrentPageRequestInfo } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
-import { PaginatedAction, PaginationEntityState } from '../../../../../../store/src/types/pagination.types';
+} from '../../../../../core/src/shared/components/simple-usage-chart/simple-usage-chart.types';
+import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
+import { AppState, entityCatalog } from '../../../../../store/src/public-api';
+import { getCurrentPageRequestInfo } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
+import { PaginatedAction, PaginationEntityState } from '../../../../../store/src/types/pagination.types';
 import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { CaaspNodesData, KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
 
@@ -119,13 +118,13 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
 
     const podsObs = kubeEntityCatalog.pod.store.getPaginationService(guid);
     const pods$ = podsObs.entities$;
-    this.poll(kubeEntityCatalog.pod.actions.getMultiple(guid), podsObs.pagination$)
+    this.poll(kubeEntityCatalog.pod.actions.getMultiple(guid), podsObs.pagination$);
     const nodesObs = kubeEntityCatalog.node.store.getPaginationService(guid);
     const nodes$ = nodesObs.entities$;
-    this.poll(kubeEntityCatalog.node.actions.getMultiple(guid), nodesObs.pagination$)
+    this.poll(kubeEntityCatalog.node.actions.getMultiple(guid), nodesObs.pagination$);
     const namespacesObs = kubeEntityCatalog.namespace.store.getPaginationService(guid);
     const namespaces$ = namespacesObs.entities$;
-    this.poll(kubeEntityCatalog.namespace.actions.getMultiple(guid), namespacesObs.pagination$)
+    this.poll(kubeEntityCatalog.namespace.actions.getMultiple(guid), namespacesObs.pagination$);
 
     this.podCount$ = this.kubeEndpointService.getCountObservable(pods$);
     this.nodeCount$ = this.kubeEndpointService.getCountObservable(nodes$);
@@ -200,7 +199,7 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy {
       if (!getCurrentPageRequestInfo(pag, { busy: true, error: false, message: '' }).busy) {
         this.store.dispatch(action);
       }
-    })
+    });
   }
 
   ngOnDestroy() {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.html b/src/frontend/packages/kubernetes/src/kubernetes/workloads/chart-values-editor/chart-values-editor.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/chart-values-editor/chart-values-editor.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/workloads/chart-values-editor/chart-values-editor.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/chart-values-editor/chart-values-editor.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/chart-values-editor/chart-values-editor.component.spec.ts
similarity index 80%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/chart-values-editor/chart-values-editor.component.spec.ts
index 8dc9906951..0c222d2b2d 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/chart-values-editor/chart-values-editor.component.spec.ts
@@ -3,8 +3,8 @@ import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { createBasicStoreModule } from '@stratosui/store/testing';
 
-import { ConfirmationDialogService } from '../../../../../../core/src/shared/components/confirmation-dialog.service';
-import { MDAppModule } from './../../../../../../core/src/core/md.module';
+import { MDAppModule } from '../../../../../core/src/public-api';
+import { ConfirmationDialogService } from '../../../../../core/src/shared/components/confirmation-dialog.service';
 import { ChartValuesEditorComponent } from './chart-values-editor.component';
 
 describe('ChartValuesEditorComponent', () => {
@@ -13,7 +13,7 @@ describe('ChartValuesEditorComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ ChartValuesEditorComponent ],
+      declarations: [ChartValuesEditorComponent],
       providers: [
         HttpClient,
         HttpHandler,
@@ -26,7 +26,7 @@ describe('ChartValuesEditorComponent', () => {
         createBasicStoreModule(),
       ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.theme.scss b/src/frontend/packages/kubernetes/src/kubernetes/workloads/chart-values-editor/chart-values-editor.component.theme.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.theme.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/chart-values-editor/chart-values-editor.component.theme.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts
similarity index 97%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts
index 60b56a6bf5..928a764be7 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/chart-values-editor/chart-values-editor.component.ts
@@ -5,9 +5,9 @@ import * as yaml from 'js-yaml';
 import { BehaviorSubject, combineLatest, fromEvent, Observable, of, Subscription } from 'rxjs';
 import { catchError, debounceTime, filter, map, startWith, tap } from 'rxjs/operators';
 
-import { ConfirmationDialogConfig } from '../../../../../../core/src/shared/components/confirmation-dialog.config';
-import { ConfirmationDialogService } from '../../../../../../core/src/shared/components/confirmation-dialog.service';
-import { ThemeService } from './../../../../../../store/src/theme.service';
+import { ConfirmationDialogConfig } from '../../../../../core/src/shared/components/confirmation-dialog.config';
+import { ConfirmationDialogService } from '../../../../../core/src/shared/components/confirmation-dialog.service';
+import { ThemeService } from '../../../../../store/src/theme.service';
 import { diffObjects } from './diffvalues';
 import { generateJsonSchemaFromObject } from './json-schema-generator';
 import { mergeObjects } from './merge';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/diffvalues.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/chart-values-editor/diffvalues.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/diffvalues.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/chart-values-editor/diffvalues.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/json-schema-generator.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/chart-values-editor/json-schema-generator.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/json-schema-generator.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/chart-values-editor/json-schema-generator.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/merge.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/chart-values-editor/merge.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/chart-values-editor/merge.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/chart-values-editor/merge.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.html b/src/frontend/packages/kubernetes/src/kubernetes/workloads/create-release/create-release.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/create-release/create-release.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/workloads/create-release/create-release.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/create-release/create-release.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/create-release/create-release.component.spec.ts
similarity index 74%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/create-release/create-release.component.spec.ts
index 9de5331552..f4194499a6 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/create-release/create-release.component.spec.ts
@@ -1,13 +1,12 @@
-// import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { HttpClient } from '@angular/common/http';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { ConfirmationDialogService } from '../../../../../../core/src/shared/components/confirmation-dialog.service';
-import { TabNavService } from '../../../../../../core/src/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 { ConfirmationDialogService } from '../../../../../core/src/shared/components/confirmation-dialog.service';
+import { TabNavService } from '../../../../../core/src/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 { MockChartService } from '../../../helm/monocular/shared/services/chart.service.mock';
 import { ChartsService } from '../../../helm/monocular/shared/services/charts.service';
 import { ConfigService } from '../../../helm/monocular/shared/services/config.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/create-release/create-release.component.ts
similarity index 96%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/create-release/create-release.component.ts
index 438c58c404..a126fe31f5 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/create-release/create-release.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/create-release/create-release.component.ts
@@ -4,13 +4,10 @@ import { ActivatedRoute } from '@angular/router';
 import { BehaviorSubject, combineLatest, Observable, of, Subscription } from 'rxjs';
 import { distinctUntilChanged, filter, first, map, pairwise, startWith, switchMap } from 'rxjs/operators';
 
-import { EndpointsService } from '../../../../../../core/src/core/endpoints.service';
-import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
-import {
-  StepOnNextFunction,
-  StepOnNextResult,
-} from '../../../../../../core/src/shared/components/stepper/step/step.component';
-import { RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
+import { EndpointsService } from '../../../../../core/src/core/endpoints.service';
+import { safeUnsubscribe } from '../../../../../core/src/core/utils.service';
+import { StepOnNextFunction, StepOnNextResult } from '../../../../../core/src/shared/components/stepper/step/step.component';
+import { RequestInfoState } from '../../../../../store/src/reducers/api-request-reducer/types';
 import { helmEntityCatalog } from '../../../helm/helm-entity-catalog';
 import { ChartsService } from '../../../helm/monocular/shared/services/charts.service';
 import { createMonocularProviders } from '../../../helm/monocular/stratos-monocular-providers.helpers';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html b/src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts
similarity index 93%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts
index fff1bab700..7090e26af4 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/helm-release-card/helm-release-card.component.ts
@@ -1,7 +1,7 @@
 import { DatePipe } from '@angular/common';
 import { Component, Input } from '@angular/core';
 
-import { CardCell } from '../../../../../../../core/src/shared/components/list/list.types';
+import { CardCell } from '../../../../../../core/src/shared/components/list/list.types';
 import { HelmRelease } from '../../workload.types';
 
 @Component({
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-pods-list-config.service.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/helm-release-pods-list-config.service.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-pods-list-config.service.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/helm-release-pods-list-config.service.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/helm-release-pods-list-source.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/helm-release-pods-list-source.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-services-list-config.service.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/helm-release-services-list-config.service.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-services-list-config.service.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/helm-release-services-list-config.service.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/helm-release-services-list-source.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/helm-release-services-list-source.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/helm-releases-list-config.service.ts
similarity index 98%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/helm-releases-list-config.service.ts
index 3ab9f96d4d..205c587b60 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-releases-list-config.service.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/helm-releases-list-config.service.ts
@@ -14,7 +14,7 @@ import {
 import { AppState } from 'frontend/packages/store/src/app-state';
 import { filter, map } from 'rxjs/operators';
 
-import { ListView } from '../../../../../../store/src/actions/list.actions';
+import { ListView } from '../../../../../store/src/actions/list.actions';
 import { defaultHelmKubeListPageSize } from '../../list-types/kube-helm-list-types';
 import { HelmRelease } from '../workload.types';
 import { HelmReleaseCardComponent } from './helm-release-card/helm-release-card.component';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/helm-releases-list-source.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/helm-releases-list-source.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts
similarity index 97%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts
index 846848fc7a..ca476270ce 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts
@@ -17,7 +17,7 @@ import {
   withLatestFrom,
 } from 'rxjs/operators';
 
-import { getCurrentPageRequestInfo } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
+import { getCurrentPageRequestInfo } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
 import { kubeEntityCatalog } from '../../kubernetes-entity-catalog';
 import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes-entity-factory';
 import { KubernetesNamespace } from '../../store/kube.types';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-socket-service.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/helm-release-tab-base/helm-release-socket-service.ts
similarity index 94%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-socket-service.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/helm-release-tab-base/helm-release-socket-service.ts
index 920e07a48d..95f891c894 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-socket-service.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/helm-release-tab-base/helm-release-socket-service.ts
@@ -4,10 +4,9 @@ import { Subject, Subscription } from 'rxjs';
 import makeWebSocketObservable, { GetWebSocketResponses } from 'rxjs-websockets';
 import { catchError, map, share, switchMap } from 'rxjs/operators';
 
-import { SnackBarService } from '../../../../../../../core/src/shared/services/snackbar.service';
-import { AppState } from '../../../../../../../store/src/app-state';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
-import { EntityRequestAction, WrapperRequestActionSuccess } from '../../../../../../../store/src/types/request.types';
+import { SnackBarService } from '../../../../../../core/src/shared/services/snackbar.service';
+import { AppState, entityCatalog, WrapperRequestActionSuccess } from '../../../../../../store/src/public-api';
+import { EntityRequestAction } from '../../../../../../store/src/types/request.types';
 import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog';
 import { KubernetesPodExpandedStatusHelper } from '../../../services/kubernetes-expanded-state';
 import { KubernetesPod, KubeService } from '../../../store/kube.types';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.html b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts
similarity index 95%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts
index 521eb3a53e..7dd6fde844 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { TabNavService } from 'frontend/packages/core/src/tab-nav.service';
 
+import { TabNavService } from '../../../../../../core/src/tab-nav.service';
 import { HelmReleaseProviders, KubeBaseGuidMock, KubernetesBaseTestModules } from '../../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service';
 import { KubernetesAnalysisService } from '../../../services/kubernetes.analysis.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
similarity index 86%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
index d121deed5d..36b41f47cd 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
@@ -3,9 +3,9 @@ import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { IPageSideNavTab } from '../../../../../../../core/src/features/dashboard/page-side-nav/page-side-nav.component';
-import { SessionService } from '../../../../../../../core/src/shared/services/session.service';
-import { SnackBarService } from '../../../../../../../core/src/shared/services/snackbar.service';
+import { IPageSideNavTab } from '../../../../../../core/src/features/dashboard/page-side-nav/page-side-nav.component';
+import { SessionService } from '../../../../../../core/src/shared/services/session.service';
+import { SnackBarService } from '../../../../../../core/src/shared/services/snackbar.service';
 import { KubernetesAnalysisService } from '../../../services/kubernetes.analysis.service';
 import { HelmReleaseGuid } from '../../workload.types';
 import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service';
@@ -66,11 +66,11 @@ export class HelmReleaseTabBaseComponent implements OnDestroy {
       { link: 'services', label: 'Services', icon: 'service', iconFont: 'stratos-icons' }
     ];
 
-    this.socketService.start()
+    this.socketService.start();
   }
 
   ngOnDestroy() {
-    this.socketService.stop()
+    this.socketService.stop();
     this.snackbarService.hide();
   }
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/icon-helper.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/icon-helper.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/icon-helper.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/icon-helper.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.html b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.spec.ts
similarity index 95%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.spec.ts
index 9d531b7a8e..3ae0b29782 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { TabNavService } from 'frontend/packages/core/src/tab-nav.service';
 
+import { TabNavService } from '../../../../../../../core/src/tab-nav.service';
 import { AnalysisReportViewerComponent } from '../../../../analysis-report-viewer/analysis-report-viewer.component';
 import { HelmReleaseProviders, KubeBaseGuidMock, KubernetesBaseTestModules } from '../../../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-analysis-tab/helm-release-analysis-tab.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helpers.scss b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-helpers.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-helpers.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-helpers.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.html b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.ts
similarity index 91%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.ts
index 08907252bc..797e0bfcf7 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-history-tab/helm-release-history-tab.component.ts
@@ -5,8 +5,8 @@ import { map, startWith } from 'rxjs/operators';
 
 import {
   ITableListDataSource,
-} from '../../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
-import { ITableColumn } from '../../../../../../../../core/src/shared/components/list/list-table/table.types';
+} from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
+import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
 import { HelmReleaseHelperService } from './../helm-release-helper.service';
 
 @Component({
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.html b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.html b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
similarity index 95%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
index dca8ca40f6..6395c37110 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.spec.ts
@@ -1,8 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NgxGraphModule } from '@swimlane/ngx-graph';
 import { SidePanelService } from 'frontend/packages/core/src/shared/services/side-panel.service';
-import { TabNavService } from 'frontend/packages/core/src/tab-nav.service';
 
+import { TabNavService } from '../../../../../../../core/src/tab-nav.service';
 import { HelmReleaseProviders, KubernetesBaseTestModules } from '../../../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service';
 import { KubernetesAnalysisService } from '../../../../services/kubernetes.analysis.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-resource-graph/helm-release-resource-graph.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.html b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-services/helm-release-services-tab.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
similarity index 96%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
index b2f30b0f4a..9e24c2a39e 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss
@@ -1,5 +1,5 @@
 
-@import '../../../../../../../../core/sass/mixins';
+@import '../../../../../../../core/sass/mixins';
 @import '../helm-release-helpers';
 
 .resources {
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
similarity index 89%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
index 85a9bcbb98..d1779d79e7 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { TabNavService } from 'frontend/packages/core/src/tab-nav.service';
 
-import { SidePanelService } from '../../../../../../../../core/src/shared/services/side-panel.service';
+import { SidePanelService } from '../../../../../../../core/src/shared/services/side-panel.service';
+import { TabNavService } from '../../../../../../../core/src/tab-nav.service';
 import { HelmReleaseProviders, KubeBaseGuidMock } from '../../../../kubernetes.testing.module';
 import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service';
 import { KubernetesAnalysisService } from '../../../../services/kubernetes.analysis.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.theme.scss b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.theme.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.theme.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.theme.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
similarity index 98%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
index f1c0413fc7..d896843d89 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts
@@ -10,8 +10,8 @@ import { AppState } from 'frontend/packages/store/src/app-state';
 import { combineLatest, Observable, ReplaySubject, Subject } from 'rxjs';
 import { distinctUntilChanged, filter, first, map, publishReplay, refCount, startWith } from 'rxjs/operators';
 
-import { SnackBarService } from '../../../../../../../../core/src/shared/services/snackbar.service';
-import { endpointsEntityRequestDataSelector } from '../../../../../../../../store/src/selectors/endpoint.selectors';
+import { SnackBarService } from '../../../../../../../core/src/shared/services/snackbar.service';
+import { endpointsEntityRequestDataSelector } from '../../../../../../../store/src/selectors/endpoint.selectors';
 import {
   ResourceAlertPreviewComponent,
 } from '../../../../analysis-report-viewer/resource-alert-preview/resource-alert-preview.component';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts
similarity index 92%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts
index dd864daa79..f7dc5b580b 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { TabNavService } from 'frontend/packages/core/src/tab-nav.service';
 
+import { TabNavService } from '../../../../../../../core/src/tab-nav.service';
 import { HelmReleaseProviders, KubernetesBaseTestModules } from '../../../../kubernetes.testing.module';
 import { HelmReleaseValuesTabComponent } from './helm-release-values-tab.component';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.html b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/release/workload-live-reload/workload-live-reload.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.html b/src/frontend/packages/kubernetes/src/kubernetes/workloads/releases-tab/releases-tab.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/releases-tab/releases-tab.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/workloads/releases-tab/releases-tab.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/releases-tab/releases-tab.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts
similarity index 92%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts
index 20f505b6b5..ad908e0608 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/releases-tab/releases-tab.component.spec.ts
@@ -1,7 +1,7 @@
 import { DatePipe } from '@angular/common';
 import { async, TestBed } from '@angular/core/testing';
-import { TabNavService } from 'frontend/packages/core/src/tab-nav.service';
 
+import { TabNavService } from '../../../../../core/src/tab-nav.service';
 import { KubernetesBaseTestModules } from '../../kubernetes.testing.module';
 import { HelmReleaseHelperService } from '../release/tabs/helm-release-helper.service';
 import { HelmReleasesTabComponent } from './releases-tab.component';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/releases-tab/releases-tab.component.ts
similarity index 92%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/releases-tab/releases-tab.component.ts
index f86ea01624..45a52b3142 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/releases-tab/releases-tab.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/releases-tab/releases-tab.component.ts
@@ -5,7 +5,7 @@ import { endpointOfTypeSelector } from 'frontend/packages/store/src/selectors/en
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
+import { ListConfig } from '../../../../../core/src/shared/components/list/list.component.types';
 import { HELM_ENDPOINT_TYPE } from '../../../helm/helm-entity-factory';
 import { HelmReleasesListConfig } from '../list-types/helm-releases-list-config.service';
 import { KubernetesNamespacesFilterService } from '../list-types/kube-namespaces-filter-config.service';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workload-action-builders.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/store/workload-action-builders.ts
similarity index 94%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workload-action-builders.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/store/workload-action-builders.ts
index f85d09243e..35ea3c8c30 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workload-action-builders.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/store/workload-action-builders.ts
@@ -1,6 +1,4 @@
-import {
-  OrchestratedActionBuilders,
-} from '../../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
+import { OrchestratedActionBuilders } from '../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import { HelmUpgradeValues } from '../../../helm/store/helm.types';
 import {
   GetHelmRelease,
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-factory.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/store/workloads-entity-factory.ts
similarity index 96%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-factory.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/store/workloads-entity-factory.ts
index 25ada89e41..afd43b3e33 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-factory.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/store/workloads-entity-factory.ts
@@ -1,4 +1,4 @@
-import { EntitySchema } from '../../../../../../store/src/helpers/entity-schema';
+import { EntitySchema } from '../../../../../store/src/helpers/entity-schema';
 import { addKubernetesEntitySchema, KubernetesEntitySchema } from '../../kubernetes-entity-factory';
 import { HelmRelease, HelmReleaseGraph, HelmReleaseResources } from '../workload.types';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-generator.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/store/workloads-entity-generator.ts
similarity index 93%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-generator.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/store/workloads-entity-generator.ts
index d1695d2322..7bc1162555 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads-entity-generator.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/store/workloads-entity-generator.ts
@@ -1,9 +1,9 @@
 import {
   StratosBaseCatalogEntity,
   StratosCatalogEntity,
-} 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';
+} 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 { kubernetesEntityFactory } from '../../kubernetes-entity-factory';
 import { HelmRelease, HelmReleaseGraph, HelmReleaseResources } from '../workload.types';
 import { workloadsEntityCatalog } from '../workloads-entity-catalog';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.actions.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/store/workloads.actions.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.actions.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/store/workloads.actions.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.effects.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/store/workloads.effects.ts
similarity index 94%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.effects.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/store/workloads.effects.ts
index 7c235a2766..58d77f01f7 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.effects.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/store/workloads.effects.ts
@@ -6,16 +6,18 @@ import { environment } from 'frontend/packages/core/src/environments/environment
 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';
-import { ApiRequestTypes } from '../../../../../../store/src/reducers/api-request-reducer/request-helpers';
-import { NormalizedResponse } from '../../../../../../store/src/types/api.types';
+import {
+  AppState,
+  entityCatalog,
+  NormalizedResponse,
+  WrapperRequestActionSuccess,
+} from '../../../../../store/src/public-api';
+import { ApiRequestTypes } from '../../../../../store/src/reducers/api-request-reducer/request-helpers';
 import {
   EntityRequestAction,
   StartRequestAction,
   WrapperRequestActionFailed,
-  WrapperRequestActionSuccess,
-} from '../../../../../../store/src/types/request.types';
+} from '../../../../../store/src/types/request.types';
 import { HelmEffects } from '../../../helm/store/helm.effects';
 import { HelmRelease, HelmReleaseHistory } from '../workload.types';
 import { workloadsEntityCatalog } from './../workloads-entity-catalog';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.reducers.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/store/workloads.reducers.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.reducers.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/store/workloads.reducers.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.store.module.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/store/workloads.store.module.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/store/workloads.store.module.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/store/workloads.store.module.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-data-source.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/upgrade-release/release-version-data-source.ts
similarity index 80%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-data-source.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/upgrade-release/release-version-data-source.ts
index 204cc8b66a..6f51797181 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-data-source.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/upgrade-release/release-version-data-source.ts
@@ -1,10 +1,10 @@
 import { Store } from '@ngrx/store';
 import { Observable, of } from 'rxjs';
 
-import { ListDataSource } from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
-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 { PaginationEntityState } from '../../../../../../store/src/types/pagination.types';
+import { ListDataSource } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
+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 { PaginationEntityState } from '../../../../../store/src/types/pagination.types';
 import { helmEntityCatalog } from '../../../helm/helm-entity-catalog';
 import { MonocularVersion } from './../../../helm/store/helm.types';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-list-config.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/upgrade-release/release-version-list-config.ts
similarity index 88%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-list-config.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/upgrade-release/release-version-list-config.ts
index 0d0f0307c5..5ea00c36ca 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/release-version-list-config.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/upgrade-release/release-version-list-config.ts
@@ -3,11 +3,11 @@ import moment from 'moment';
 import { BehaviorSubject, of } from 'rxjs';
 import { first } 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 {
   TableCellRadioComponent,
-} from '../../../../../../core/src/shared/components/list/list-table/table-cell-radio/table-cell-radio.component';
-import { ITableColumn } from '../../../../../../core/src/shared/components/list/list-table/table.types';
+} from '../../../../../core/src/shared/components/list/list-table/table-cell-radio/table-cell-radio.component';
+import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types';
 import {
   defaultPaginationPageSizeOptionsTable,
   IGlobalListAction,
@@ -16,7 +16,7 @@ import {
   IListMultiFilterConfig,
   IMultiListAction,
   ListViewTypes,
-} from '../../../../../../core/src/shared/components/list/list.component.types';
+} from '../../../../../core/src/shared/components/list/list.component.types';
 import { MonocularVersion } from '../../../helm/store/helm.types';
 import { HelmReleaseVersionsDataSource } from './release-version-data-source';
 
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.html b/src/frontend/packages/kubernetes/src/kubernetes/workloads/upgrade-release/upgrade-release.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.html
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/upgrade-release/upgrade-release.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.scss b/src/frontend/packages/kubernetes/src/kubernetes/workloads/upgrade-release/upgrade-release.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.scss
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/upgrade-release/upgrade-release.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/upgrade-release/upgrade-release.component.spec.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.spec.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/upgrade-release/upgrade-release.component.spec.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/upgrade-release/upgrade-release.component.ts
similarity index 97%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/upgrade-release/upgrade-release.component.ts
index 8d4b789437..5b05e01a51 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/upgrade-release/upgrade-release.component.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/upgrade-release/upgrade-release.component.ts
@@ -8,8 +8,8 @@ import {
   StepComponent,
   StepOnNextFunction,
   StepOnNextResult,
-} from '../../../../../../core/src/shared/components/stepper/step/step.component';
-import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types';
+} from '../../../../../core/src/shared/components/stepper/step/step.component';
+import { ActionState } from '../../../../../store/src/reducers/api-request-reducer/types';
 import { ChartsService } from '../../../helm/monocular/shared/services/charts.service';
 import { createMonocularProviders } from '../../../helm/monocular/stratos-monocular-providers.helpers';
 import { stratosMonocularEndpointGuid } from '../../../helm/monocular/stratos-monocular.helper';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workload.types.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/workload.types.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workload.types.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/workload.types.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads-entity-catalog.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/workloads-entity-catalog.ts
similarity index 84%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads-entity-catalog.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/workloads-entity-catalog.ts
index 30a8791541..d202d00092 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads-entity-catalog.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/workloads-entity-catalog.ts
@@ -1,5 +1,5 @@
-import { StratosCatalogEntity } from '../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
-import { IFavoriteMetadata } from '../../../../../store/src/types/user-favorites.types';
+import { StratosCatalogEntity } from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types';
 import {
   WorkloadGraphBuilders,
   WorkloadReleaseBuilders,
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/workloads.module.ts
similarity index 95%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/workloads.module.ts
index 341c83d740..1c96bf2606 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.module.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/workloads.module.ts
@@ -4,8 +4,8 @@ import { MaterialDesignFrameworkModule } from '@cfstratos/ajsf-material';
 import { NgxGraphModule } from '@swimlane/ngx-graph';
 import { MonacoEditorModule, NgxMonacoEditorConfig } from 'ngx-monaco-editor';
 
-import { CoreModule } from '../../../../../core/src/core/core.module';
-import { SharedModule } from '../../../../../core/src/shared/shared.module';
+import { CoreModule } from '../../../../core/src/core/core.module';
+import { SharedModule } from '../../../../core/src/shared/shared.module';
 import { KubernetesModule } from '../kubernetes.module';
 import { ChartValuesEditorComponent } from './chart-values-editor/chart-values-editor.component';
 import { CreateReleaseComponent } from './create-release/create-release.component';
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.routing.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/workloads.routing.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.routing.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/workloads.routing.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.testing.module.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/workloads.testing.module.ts
similarity index 66%
rename from src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.testing.module.ts
rename to src/frontend/packages/kubernetes/src/kubernetes/workloads/workloads.testing.module.ts
index 5f6b193777..5d1b9d4b87 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/workloads/workloads.testing.module.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/workloads.testing.module.ts
@@ -1,15 +1,18 @@
 import { HttpClientModule } from '@angular/common/http';
 import { NgModule } from '@angular/core';
-import { CoreModule } from '@angular/flex-layout';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 
-import { SharedModule } from '../../../../../core/src/public-api';
-import { AppTestModule } from '../../../../../core/test-framework/core-test.helper';
-import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../../../../store/src/entity-catalog.module';
-import { entityCatalog, TestEntityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
-import { generateStratosEntities } from '../../../../../store/src/stratos-entity-generator';
-import { createBasicStoreModule } from '../../../../../store/testing/public-api';
+import { CoreModule, SharedModule } from '../../../../core/src/public-api';
+import { AppTestModule } from '../../../../core/test-framework/core-test.helper';
+import {
+  CATALOGUE_ENTITIES,
+  entityCatalog,
+  EntityCatalogFeatureModule,
+  TestEntityCatalog,
+} from '../../../../store/src/public-api';
+import { generateStratosEntities } from '../../../../store/src/stratos-entity-generator';
+import { createBasicStoreModule } from '../../../../store/testing/public-api';
 import { generateHelmEntities } from '../../helm/helm-entity-generator';
 import { HelmTestingModule } from '../../helm/helm-testing.module';
 import { generateKubernetesEntities } from '../kubernetes-entity-generator';
@@ -44,4 +47,4 @@ export const WorkloadsBaseTestingModule = [
   SharedModule,
   HelmTestingModule,
   WorkloadsTestingModule
-]
+];
diff --git a/src/frontend/packages/kubernetes/src/public-api.ts b/src/frontend/packages/kubernetes/src/public-api.ts
new file mode 100644
index 0000000000..4da9d3ad7b
--- /dev/null
+++ b/src/frontend/packages/kubernetes/src/public-api.ts
@@ -0,0 +1,4 @@
+// Custom Extensions
+
+export * from './kube-package.module';
+export * from './kube-package-routing.module';
\ No newline at end of file
diff --git a/src/frontend/packages/kubernetes/src/test.ts b/src/frontend/packages/kubernetes/src/test.ts
new file mode 100644
index 0000000000..f205020844
--- /dev/null
+++ b/src/frontend/packages/kubernetes/src/test.ts
@@ -0,0 +1,36 @@
+// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+import 'core-js/es/reflect';
+import 'zone.js/dist/zone';
+import 'zone.js/dist/zone-testing';
+
+import { APP_BASE_HREF } from '@angular/common';
+import { getTestBed } from '@angular/core/testing';
+import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
+
+
+declare const require: any;
+
+// First, initialize the Angular testing environment.
+const testBed = getTestBed();
+testBed.initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting()
+);
+
+beforeEach(() => {
+  testBed.configureTestingModule({
+    providers: [{ provide: APP_BASE_HREF, useValue: '/' }]
+  });
+});
+
+/**
+ * Bump up the Jasmine timeout from 5 seconds
+ */
+beforeAll(() => {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
+});
+
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);
diff --git a/src/frontend/packages/kubernetes/tsconfig.spec.json b/src/frontend/packages/kubernetes/tsconfig.spec.json
new file mode 100644
index 0000000000..cb4a7be918
--- /dev/null
+++ b/src/frontend/packages/kubernetes/tsconfig.spec.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../../tsconfig.spec.json",
+  "compilerOptions": {
+    "outDir": "../../../../out-tsc/spec",
+    "types": [
+      "jasmine",
+      "node"
+    ]
+  },
+  "files": [
+    "src/test.ts"
+  ],
+  "include": [
+    "**/*.spec.ts",
+    "**/*.d.ts"
+  ]
+}
diff --git a/src/frontend/packages/kubernetes/tslint.json b/src/frontend/packages/kubernetes/tslint.json
new file mode 100644
index 0000000000..9da788b6cb
--- /dev/null
+++ b/src/frontend/packages/kubernetes/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../../../tslint.json"
+}
diff --git a/src/frontend/packages/suse-extensions/package.json b/src/frontend/packages/suse-extensions/package.json
index f41a5ce1bb..346c719420 100644
--- a/src/frontend/packages/suse-extensions/package.json
+++ b/src/frontend/packages/suse-extensions/package.json
@@ -7,7 +7,6 @@
   },
   "stratos": {
     "module": "SuseModule",
-    "routingModule": "SuseRoutingModule",
     "theming": "sass/_all-theme#apply-theme-suse-extensions",
     "assets": {
       "assets": "core/assets"
diff --git a/src/frontend/packages/suse-extensions/sass/_all-theme.scss b/src/frontend/packages/suse-extensions/sass/_all-theme.scss
index 3f1be2c34b..2c1f83a02a 100644
--- a/src/frontend/packages/suse-extensions/sass/_all-theme.scss
+++ b/src/frontend/packages/suse-extensions/sass/_all-theme.scss
@@ -1,25 +1,11 @@
-// Theming for the copmponents in the Kubernetes package
+// Theming for the copmponents in the SUSE Extensions package
 
-@import '../src/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.theme';
-@import '../src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-report/kubernetes-analysis-report.component.theme';
-@import '../src/custom/kubernetes/tabs/kubernetes-analysis-tab/kubernetes-analysis-info/analysis-info-card/analysis-info-card.component.theme';
-@import '../src/custom/helm/list-types/monocular-chart-card/monocular-chart-card.component.theme';
-@import '../src/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.theme';
-@import '../src/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.theme';
-@import '../src/custom/kubernetes/workloads/chart-values-editor/chart-values-editor.component.theme';
-@import '../src/custom/suse-login/suse-login.component.theme';
+@import '../src/suse-login/suse-login.component.theme';
 
 @mixin apply-theme-suse-extensions($stratos-theme) {
 
   $theme: map-get($stratos-theme, theme);
   $app-theme: map-get($stratos-theme, app-theme);
 
-  @include kube-summary-theme($theme, $app-theme);
-  @include kube-analysis-report-theme($theme, $app-theme);
-  @include kube-analysis-card-theme($theme, $app-theme);
-  @include monocular-chart-card($theme, $app-theme);
-  @include helm-release-summary-tab-theme($theme, $app-theme);
-  @include kube-node-link-theme($theme, $app-theme);
-  @include app-chart-values-editor-theme($theme, $app-theme);
   @include suse-login-page-theme($theme, $app-theme);
 }
diff --git a/src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.html b/src/frontend/packages/suse-extensions/src/demo/demo-helper/demo-helper.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.html
rename to src/frontend/packages/suse-extensions/src/demo/demo-helper/demo-helper.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.scss b/src/frontend/packages/suse-extensions/src/demo/demo-helper/demo-helper.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.scss
rename to src/frontend/packages/suse-extensions/src/demo/demo-helper/demo-helper.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.spec.ts b/src/frontend/packages/suse-extensions/src/demo/demo-helper/demo-helper.component.spec.ts
similarity index 84%
rename from src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/demo/demo-helper/demo-helper.component.spec.ts
index b0c270cf94..e1ff7ca609 100644
--- a/src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/demo/demo-helper/demo-helper.component.spec.ts
@@ -1,8 +1,8 @@
 import { HttpClientModule } from '@angular/common/http';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../core/src/tab-nav.service';
-import { BaseTestModules } from '../../../../../core/test-framework/core-test.helper';
+import { TabNavService } from '../../../../core/src/tab-nav.service';
+import { BaseTestModules } from '../../../../core/test-framework/core-test.helper';
 import { DemoHelperComponent } from './demo-helper.component';
 
 describe('DemoHelperComponent', () => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.ts b/src/frontend/packages/suse-extensions/src/demo/demo-helper/demo-helper.component.ts
similarity index 83%
rename from src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.ts
rename to src/frontend/packages/suse-extensions/src/demo/demo-helper/demo-helper.component.ts
index 044d47f2c4..2a18d570da 100644
--- a/src/frontend/packages/suse-extensions/src/custom/demo/demo-helper/demo-helper.component.ts
+++ b/src/frontend/packages/suse-extensions/src/demo/demo-helper/demo-helper.component.ts
@@ -3,8 +3,8 @@ import { Component } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { map } from 'rxjs/operators';
 
-import { StratosAction, StratosActionType } from '../../../../../core/src/core/extension/extension-service';
-import { AppState } from '../../../../../store/src/app-state';
+import { StratosAction, StratosActionType } from '../../../../core/src/core/extension/extension-service';
+import { AppState } from '../../../../store/src/app-state';
 
 
 @StratosAction({
diff --git a/src/frontend/packages/suse-extensions/src/public-api.ts b/src/frontend/packages/suse-extensions/src/public-api.ts
index 82ee7d4da7..715977a55c 100644
--- a/src/frontend/packages/suse-extensions/src/public-api.ts
+++ b/src/frontend/packages/suse-extensions/src/public-api.ts
@@ -1,4 +1,3 @@
 // Custom Extensions
 
-export * from './custom/suse.module'
-export * from './custom/suse-routing.module'
\ No newline at end of file
+export * from './suse.module';
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-about-info/suse-about-info.component.html b/src/frontend/packages/suse-extensions/src/suse-about-info/suse-about-info.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/suse-about-info/suse-about-info.component.html
rename to src/frontend/packages/suse-extensions/src/suse-about-info/suse-about-info.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-about-info/suse-about-info.component.scss b/src/frontend/packages/suse-extensions/src/suse-about-info/suse-about-info.component.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/suse-about-info/suse-about-info.component.scss
rename to src/frontend/packages/suse-extensions/src/suse-about-info/suse-about-info.component.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-about-info/suse-about-info.component.ts b/src/frontend/packages/suse-extensions/src/suse-about-info/suse-about-info.component.ts
similarity index 79%
rename from src/frontend/packages/suse-extensions/src/custom/suse-about-info/suse-about-info.component.ts
rename to src/frontend/packages/suse-extensions/src/suse-about-info/suse-about-info.component.ts
index b67379c282..0147da6855 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse-about-info/suse-about-info.component.ts
+++ b/src/frontend/packages/suse-extensions/src/suse-about-info/suse-about-info.component.ts
@@ -3,9 +3,9 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
-import { AppState } from '../../../../store/src/app-state';
-import { AuthState } from '../../../../store/src/reducers/auth.reducer';
-import { SessionData } from '../../../../store/src/types/auth.types';
+import { AppState } from '../../../store/src/app-state';
+import { AuthState } from '../../../store/src/reducers/auth.reducer';
+import { SessionData } from '../../../store/src/types/auth.types';
 
 @Component({
   selector: 'app-suse-about-info',
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html b/src/frontend/packages/suse-extensions/src/suse-login/suse-login.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.html
rename to src/frontend/packages/suse-extensions/src/suse-login/suse-login.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss b/src/frontend/packages/suse-extensions/src/suse-login/suse-login.component.scss
similarity index 98%
rename from src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
rename to src/frontend/packages/suse-extensions/src/suse-login/suse-login.component.scss
index 0bab1c84ab..095d223561 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.scss
+++ b/src/frontend/packages/suse-extensions/src/suse-login/suse-login.component.scss
@@ -1,4 +1,4 @@
-@import '../../../../suse-theme/sass/colors';
+@import '../../../suse-theme/sass/colors.scss';
 
 app-suse-login {
   background: url(/core/assets/custom/login/sign-in-bg.svg) #7AD4AA no-repeat center fixed;
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.spec.ts b/src/frontend/packages/suse-extensions/src/suse-login/suse-login.component.spec.ts
similarity index 78%
rename from src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.spec.ts
rename to src/frontend/packages/suse-extensions/src/suse-login/suse-login.component.spec.ts
index 2955b20df0..67dd3a6277 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/suse-login/suse-login.component.spec.ts
@@ -4,9 +4,9 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { StoreModule } from '@ngrx/store';
 
-import { CoreModule } from '../../../../core/src/core/core.module';
-import { appReducers } from '../../../../store/src/reducers.module';
-import { SharedModule } from './../../../../core/src/shared/shared.module';
+import { CoreModule } from '../../../core/src/core/core.module';
+import { appReducers } from '../../../store/src/reducers.module';
+import { SharedModule } from './../../../core/src/shared/shared.module';
 import { SuseLoginComponent } from './suse-login.component';
 
 describe('SuseLoginComponent', () => {
@@ -15,7 +15,7 @@ describe('SuseLoginComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ SuseLoginComponent ],
+      declarations: [SuseLoginComponent],
       imports: [
         CommonModule,
         CoreModule,
@@ -25,7 +25,7 @@ describe('SuseLoginComponent', () => {
         StoreModule.forRoot(appReducers)
       ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.theme.scss b/src/frontend/packages/suse-extensions/src/suse-login/suse-login.component.theme.scss
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.theme.scss
rename to src/frontend/packages/suse-extensions/src/suse-login/suse-login.component.theme.scss
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.ts b/src/frontend/packages/suse-extensions/src/suse-login/suse-login.component.ts
similarity index 66%
rename from src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.ts
rename to src/frontend/packages/suse-extensions/src/suse-login/suse-login.component.ts
index 1376343844..4503f066bd 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse-login/suse-login.component.ts
+++ b/src/frontend/packages/suse-extensions/src/suse-login/suse-login.component.ts
@@ -1,10 +1,10 @@
 import { Component, ViewEncapsulation } from '@angular/core';
 import { Store } from '@ngrx/store';
 
-import { CustomizationService, CustomizationsMetadata } from '../../../../core/src/core/customizations.types';
-import { StratosLoginComponent } from '../../../../core/src/core/extension/extension-service';
-import { LoginPageComponent } from '../../../../core/src/features/login/login-page/login-page.component';
-import { AppState } from '../../../../store/src/app-state';
+import { CustomizationService, CustomizationsMetadata } from '../../../core/src/core/customizations.types';
+import { StratosLoginComponent } from '../../../core/src/core/extension/extension-service';
+import { LoginPageComponent } from '../../../core/src/features/login/login-page/login-page.component';
+import { AppState } from '../../../store/src/app-state';
 
 @StratosLoginComponent()
 @Component({
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.html b/src/frontend/packages/suse-extensions/src/suse-welcome/suse-welcome.component.html
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.html
rename to src/frontend/packages/suse-extensions/src/suse-welcome/suse-welcome.component.html
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.scss b/src/frontend/packages/suse-extensions/src/suse-welcome/suse-welcome.component.scss
similarity index 93%
rename from src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.scss
rename to src/frontend/packages/suse-extensions/src/suse-welcome/suse-welcome.component.scss
index c0e5cadd87..e9a131dffe 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.scss
+++ b/src/frontend/packages/suse-extensions/src/suse-welcome/suse-welcome.component.scss
@@ -1,4 +1,4 @@
-@import '../../../../suse-theme/sass/colors';
+@import '../../../suse-theme/sass/colors';
 
 .no-endpoints-message {
   color: $suse-button-gray;
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.ts b/src/frontend/packages/suse-extensions/src/suse-welcome/suse-welcome.component.ts
similarity index 100%
rename from src/frontend/packages/suse-extensions/src/custom/suse-welcome/suse-welcome.component.ts
rename to src/frontend/packages/suse-extensions/src/suse-welcome/suse-welcome.component.ts
diff --git a/src/frontend/packages/suse-extensions/src/custom/suse.module.ts b/src/frontend/packages/suse-extensions/src/suse.module.ts
similarity index 68%
rename from src/frontend/packages/suse-extensions/src/custom/suse.module.ts
rename to src/frontend/packages/suse-extensions/src/suse.module.ts
index d147814f58..1f7f78c047 100644
--- a/src/frontend/packages/suse-extensions/src/custom/suse.module.ts
+++ b/src/frontend/packages/suse-extensions/src/suse.module.ts
@@ -1,13 +1,14 @@
 import { NgModule } from '@angular/core';
 
-import { CoreModule } from '../../../core/src/core/core.module';
-import { CustomizationService, CustomizationsMetadata } from '../../../core/src/core/customizations.types';
-import { MDAppModule } from '../../../core/src/core/md.module';
-import { ExtensionService } from '../../../core/src/public-api';
-import { SharedModule } from '../../../core/src/shared/shared.module';
+import {
+  CoreModule,
+  CustomizationService,
+  CustomizationsMetadata,
+  ExtensionService,
+  MDAppModule,
+  SharedModule,
+} from '../../core/src/public-api';
 import { DemoHelperComponent } from './demo/demo-helper/demo-helper.component';
-import { HelmSetupModule } from './helm/helm.setup.module';
-import { KubernetesSetupModule } from './kubernetes/kubernetes.setup.module';
 import { SuseAboutInfoComponent } from './suse-about-info/suse-about-info.component';
 import { SuseLoginComponent } from './suse-login/suse-login.component';
 import { SuseWelcomeComponent } from './suse-welcome/suse-welcome.component';
@@ -25,8 +26,6 @@ const SuseCustomizations: CustomizationsMetadata = {
     CoreModule,
     SharedModule,
     MDAppModule,
-    KubernetesSetupModule,
-    HelmSetupModule,
     ExtensionService.declare([
       SuseLoginComponent,
     ])
diff --git a/src/jetstream/go.mod b/src/jetstream/go.mod
index 4ca6a15bdc..6c3aded846 100644
--- a/src/jetstream/go.mod
+++ b/src/jetstream/go.mod
@@ -45,6 +45,7 @@ require (
 	github.com/gorilla/sessions v1.1.3
 	github.com/gorilla/websocket v1.4.2
 	github.com/govau/cf-common v0.0.7
+	github.com/helm/monocular v1.10.0 // indirect
 	github.com/jessevdk/go-flags v1.4.0 // indirect
 	github.com/jtolds/gls v4.20.0+incompatible // indirect
 	github.com/kat-co/vala v0.0.0-20170210184112-42e1d8b61f12
diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum
index 9488234375..6db73bcdb5 100644
--- a/src/jetstream/go.sum
+++ b/src/jetstream/go.sum
@@ -24,6 +24,7 @@ github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxB
 github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
 github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
 github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
+github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
@@ -34,6 +35,7 @@ github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e h1:eb0Pzkt15Bm
 github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
 github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg=
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
+github.com/Masterminds/semver v1.3.1/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc=
 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
@@ -137,6 +139,7 @@ github.com/deislabs/oras v0.7.0 h1:RnDoFd3tQYODMiUqxgQ8JxlrlWL0/VMKIKRD01MmNYk=
 github.com/deislabs/oras v0.7.0/go.mod h1:sqMKPG3tMyIX9xwXUBRLhZ24o+uT4y6jgBD2RzUTKDM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/disintegration/imaging v1.5.0/go.mod h1:9B/deIUIrliYkyMTuXJd6OUFLcrZ2tf+3Qlwnaf/CjU=
 github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
 github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
 github.com/docker/cli v0.0.0-20190506213505-d88565df0c2d h1:qdD+BtyCE1XXpDyhvn0yZVcZOLILdj9Cw4pKu0kQbPQ=
@@ -186,6 +189,7 @@ github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2H
 github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/globalsign/mgo v0.0.0-20180615134936-113d3961e731/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
@@ -297,6 +301,7 @@ github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e/go.mod h1:wJfORR
 github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
+github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U=
 github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
@@ -326,6 +331,7 @@ github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uG
 github.com/helm/monocular v1.4.0 h1:g0sOpuMe+9u+aPfd9ZO8mWV+c8W0dfGyBG9Wl23nwec=
 github.com/helm/monocular v1.4.0/go.mod h1:PpkCN0v4zVVigsIHnsQdJytKFmaUkwfhxB7z33a9/gE=
 github.com/helm/monocular v1.10.0 h1:/tkbVH0+7GR2C4W2ODJGiVGXyHmYCa3vaBb5S+pz6bE=
+github.com/helm/monocular v1.10.0/go.mod h1:2pJcZSWeUPTtw1QSje6c/qCrSuSUujoNPgUoFc8ySMQ=
 github.com/heptio/authenticator v0.3.0/go.mod h1:Q86X8hc61JXhE5XxYLKmrSRWby/Oe8IIYZIBgmGVkTA=
 github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40 h1:GT4RsKmHh1uZyhmTkWJTDALRjSHYQp6FRKrotf0zhAs=
 github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40/go.mod h1:NtmN9h8vrTveVQRLHcX2HQ5wIPBDCsZ351TGbZWgg38=
@@ -339,6 +345,7 @@ github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
 github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a h1:zPPuIq2jAWWPTrGt70eK/BSch+gFAGrNzecsoENgu2o=
 github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
@@ -358,6 +365,7 @@ github.com/kat-co/vala v0.0.0-20170210184112-42e1d8b61f12/go.mod h1:u9MdXq/QageO
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/konsorten/go-windows-terminal-sequences v0.0.0-20180402223658-b729f2633dfe/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
@@ -367,6 +375,7 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kubeapps/common v0.0.0-20190307100129-fcd6537ca4e3/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
 github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a h1:VqeX/fehAB6FtBox0TVYcjOMXGE56INQIfbXegditX4=
 github.com/kubeapps/common v0.0.0-20190508164739-10b110436c1a/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c=
 github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc h1:Ttr4Z3ZrMv4rAXn10UAqOC8ACx+F1omvcyV1a3hRArE=
@@ -467,6 +476,7 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/poy/eachers v0.0.0-20181020210610-23942921fe77/go.mod h1:x1vqpbcMW9T/KRcQ4b48diSiSVtYgvwQ5xzDByEg4WE=
 github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
+github.com/prometheus/client_golang v0.0.0-20181001174001-0a8115f42e03/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
@@ -476,11 +486,13 @@ github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.7.0 h1:L+1lyG48J1zAQXA3RBX/nG/B3gjlHq0zTt2tlbJLyCY=
 github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
+github.com/prometheus/procfs v0.0.0-20180920065004-418d78d0b9a7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190129233650-316cf8ccfec5/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
@@ -497,6 +509,7 @@ github.com/sajari/fuzzy v1.0.0/go.mod h1:OjYR6KxoWOe9+dOlXeiCJd4dIbED4Oo8wpS89o0
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/sirupsen/logrus v1.1.0/go.mod h1:zrgwTnHtNr00buQ1vSptGe8m1f/BbgsPukg8qsT7A+A=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
@@ -512,6 +525,7 @@ github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkU
 github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
@@ -531,6 +545,7 @@ github.com/tedsuo/rata v1.0.0/go.mod h1:X47ELzhOoLbfFIY0Cql9P6yo3Cdwf2CMX3FVZxRz
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ulikunitz/xz v0.5.6 h1:jGHAfXawEGZQ3blwU5wnWKQJvAraT7Ftq9EXjnXYgt8=
 github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
+github.com/unrolled/render v0.0.0-20180914162206-b9786414de4d/go.mod h1:tu82oB5W2ykJRVioYsB+IQKcft7ryBr7w12qMBUPyXg=
 github.com/unrolled/render v1.0.1 h1:VDDnQQVfBMsOsp3VaCJszSO0nkBIVEYoPWeRThk9spY=
 github.com/unrolled/render v1.0.1/go.mod h1:gN9T0NhL4Bfbwu8ann7Ry/TGHYfosul+J0obPf6NBdM=
 github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
@@ -582,6 +597,7 @@ golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
+golang.org/x/image v0.0.0-20180926015637-991ec62608f3/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
@@ -627,6 +643,7 @@ golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180928133829-e4b3c5e90611/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -716,6 +733,7 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/helm v2.13.1+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
 k8s.io/helm v2.16.1+incompatible h1:L+k810plJlaGWEw1EszeT4deK8XVaKxac1oGcuB+WDc=
 k8s.io/helm v2.16.1+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
 k8s.io/helm v2.16.10+incompatible h1:eFksERw3joHEL62TrcDX8I5fgEQJvit4qxxPXAkYTyQ=
diff --git a/src/tsconfig.json b/src/tsconfig.json
index a086487d1f..1027a40bae 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -13,7 +13,7 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,    
+    "esModuleInterop": true,
     "importHelpers": true,
     "target": "es2015",
     "module": "esnext",
@@ -39,6 +39,7 @@
       "@stratosui/cf-autoscaler": ["frontend/packages/cf-autoscaler/src/public_api.ts"],
       "@example/extensions": ["frontend/packages/example-extensions/src/public-api.ts"],
       "@susestratos/extensions": ["frontend/packages/suse-extensions/src/public-api.ts"],
+      "@stratosui/kubernetes": ["frontend/packages/kubernetes/src/public-api.ts"],
     }
   }
 }

From 10d58ec9bb5717b2c6107f56e440d5935ee9d45a Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Fri, 2 Oct 2020 14:29:23 +0100
Subject: [PATCH 643/648] Don't run doc actions on forks (#520)

* Update internal versions not to use commit IDs

* Only run doc actions on main repository
---
 .github/workflows/documentation-versioning.yml | 1 +
 .github/workflows/documentation.yml            | 2 +-
 website/internal-versions.json                 | 3 +--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/documentation-versioning.yml b/.github/workflows/documentation-versioning.yml
index 76eab9369b..e0b9b7b4cc 100644
--- a/.github/workflows/documentation-versioning.yml
+++ b/.github/workflows/documentation-versioning.yml
@@ -6,6 +6,7 @@ on:
 
 jobs:
   update-docs-internal-versions:
+    if: github.repository == ‘cloudfoundry/stratos’
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index a705479e7a..32bb02f3fb 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   build-docs:
-    if: github.event_name != 'push'
+    if: github.event_name != 'push' && github.repository == ‘cloudfoundry/stratos’
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
diff --git a/website/internal-versions.json b/website/internal-versions.json
index 2635ffaea2..3d39ca9451 100644
--- a/website/internal-versions.json
+++ b/website/internal-versions.json
@@ -1,4 +1,3 @@
 [
-  "4.0.1:372682177452d8d:true",
-  "4.0.0:372682177452d8d:true"
+  "4.1.0:4.1.0:true"
 ]

From bac6d1c2fe735649e0b484a51c575be013859c41 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Mon, 5 Oct 2020 09:45:00 +0100
Subject: [PATCH 644/648] Fix: Workload shows upgrade when chart has been
 removed (#515)

---
 .../workloads/release/tabs/helm-release-helper.service.ts     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-helper.service.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
index 93dffcc4e4..e1bcedc06b 100644
--- a/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
@@ -238,7 +238,9 @@ export class HelmReleaseHelperService {
         // No newer release, so return the release itself if that is what was requested and we can find the chart
         // NOTE: If the helm repository is removed that we installed from, we won't be able to find the chart
         if (returnLatest) {
-          const releaseChart = charts.find(c => c.relationships.latestChartVersion.data.version === release.chart.metadata.version);
+          // Need to check that the chart is probably the same
+          const releaseChart = charts.find(c => this.isProbablySameChart(c.attributes, release.chart.metadata) &&
+            c.relationships.latestChartVersion.data.version === release.chart.metadata.version);
           if (releaseChart) {
             return {
               release,

From 8004c2112eaa928714d8fcecd1b23703da9b1852 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Mon, 5 Oct 2020 11:25:30 +0100
Subject: [PATCH 645/648] Fix: YAML editor does not load when installing
 Stratos Helm Chart (#517)

---
 .../src/kubernetes/workloads/chart-values-editor/merge.ts     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/frontend/packages/kubernetes/src/kubernetes/workloads/chart-values-editor/merge.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/chart-values-editor/merge.ts
index 39ef4cf042..a1b60d139b 100644
--- a/src/frontend/packages/kubernetes/src/kubernetes/workloads/chart-values-editor/merge.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/chart-values-editor/merge.ts
@@ -13,6 +13,10 @@ export function mergeObjects(src: any, ...dest: any): any {
 // merge from dest into src
 function doMergeObjects(src: any, dest: any) {
   // Go through the keys of dest an update them in src
+  if (!dest) {
+    return
+  }
+
   Object.keys(dest).forEach(key => {
     if (typeof(dest[key]) === 'object' && !Array.isArray(dest)) {
       if (!src[key]) {

From f511c5fffecc986f8565db9287cdd5c02f362553 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Mon, 5 Oct 2020 11:26:40 +0100
Subject: [PATCH 646/648] First round of improvements to Helm Chart schema
 (#518)

* First round of improvements to Helm Chart schema

* Fix lint issue with erroneous comma
---
 deploy/kubernetes/console/values.schema.json | 60 +++++++++-----------
 1 file changed, 27 insertions(+), 33 deletions(-)

diff --git a/deploy/kubernetes/console/values.schema.json b/deploy/kubernetes/console/values.schema.json
index 34651e77ae..ba85b82386 100644
--- a/deploy/kubernetes/console/values.schema.json
+++ b/deploy/kubernetes/console/values.schema.json
@@ -2,29 +2,24 @@
     "$schema": "http://json-schema.org/schema#",
     "type": "object",
     "properties": {
-        "autoCleanup": {
-            "type": "boolean"
-        },
-        "configInit": {
-            "type": "object",
-            "properties": {
-                "nodeSelector": {
-                    "type": "object"
-                }
-            }
-        },
         "console": {
             "type": "object",
             "properties": {
+                "techPreview": {
+                    "type": "boolean",
+                    "description": "Enable/disable technology preview features"
+                },
                 "apiKeysEnabled": {
                     "type": "string",
-                    "enum": ["disabled", "admin_only", "all_users"]
+                    "enum": ["disabled", "admin_only", "all_users"],
+                    "description": "Enable API keys for admins, all users or nobody"
                 },
                 "autoRegisterCF": {
                     "type": ["string", "null"]
                 },
                 "backendLogLevel": {
-                    "type": "string"
+                    "type": "string",
+                    "enum": ["debug", "info", "warn", "error"]
                 },
                 "cookieDomain": {
                     "type": ["string", "null"]
@@ -55,7 +50,13 @@
                 },
                 "service": {
                     "type": "object",
+                    "description": "Configure the properties of the external service",
                     "properties": {
+                        "type": {
+                            "type": "string",
+                            "description": "Service type",
+                            "enum": ["ClusterIP", "NodePort", "LoadBalancer", "ExternalName"]
+                        },
                         "annotations": {
                             "type": "object"
                         },
@@ -118,9 +119,6 @@
                         },
                         "servicePort": {
                             "type": "integer"
-                        },
-                        "type": {
-                            "type": "string"
                         }
                     }
                 },
@@ -145,9 +143,6 @@
                 "statefulSetExtraLabels": {
                     "type": "object"
                 },
-                "techPreview": {
-                    "type": "boolean"
-                },
                 "templatesConfigMapName": {
                     "type": ["string", "null"]
                 },
@@ -170,8 +165,10 @@
                 }
             }
         },
-        "consoleVersion": {
-            "type": "string"
+        "imagePullPolicy": {
+            "type": "string",
+            "enum": ["Always", "IfNotPresent", "Never"],
+            "description": "Sets the Image Pull Policy"
         },
         "dockerRegistrySecret": {
             "type": "string"
@@ -211,9 +208,6 @@
                 }
             }
         },
-        "imagePullPolicy": {
-            "type": "string"
-        },
         "images": {
             "type": "object",
             "properties": {
@@ -338,14 +332,6 @@
                 }
             }
         },
-        "services": {
-            "type": "object",
-            "properties": {
-                "loadbalanced": {
-                    "type": "boolean"
-                }
-            }
-        },
         "uaa": {
             "type": "object",
             "properties": {
@@ -366,8 +352,16 @@
                 }
             }
         },
-        "useLb": {
+        "autoCleanup": {
             "type": "boolean"
+        },
+        "configInit": {
+            "type": "object",
+            "properties": {
+                "nodeSelector": {
+                    "type": "object"
+                }
+            }
         }
     }
 }

From a9d8639e21147876380a7a4d86e6143c19fe8f53 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Mon, 5 Oct 2020 11:27:20 +0100
Subject: [PATCH 647/648] Helm chat and CI changes for upstreaming (#519)

---
 deploy/ci/console-dev-releases.yml            | 43 ++++++++++++++++---
 deploy/kubernetes/build.sh                    |  8 ++++
 .../console/templates/deployment.yaml         |  8 ++++
 deploy/kubernetes/custom/__stratos.tpl        | 13 ------
 deploy/kubernetes/custom/custom-build.sh      | 23 ----------
 deploy/kubernetes/custom/customize-helm.sh    |  3 +-
 6 files changed, 54 insertions(+), 44 deletions(-)
 delete mode 100644 deploy/kubernetes/custom/__stratos.tpl
 delete mode 100644 deploy/kubernetes/custom/custom-build.sh

diff --git a/deploy/ci/console-dev-releases.yml b/deploy/ci/console-dev-releases.yml
index efcb887ad2..e4af7f2fff 100644
--- a/deploy/ci/console-dev-releases.yml
+++ b/deploy/ci/console-dev-releases.yml
@@ -1,3 +1,4 @@
+# This pipeline creates an Alpha, Beta or RC release
 ---
 resource_types:
 - name: docker-image
@@ -46,7 +47,19 @@ resources:
     username: ((docker-username))
     password: ((docker-password))
     repository: ((docker-repository))/stratos-console
-
+- name: kube-terminal-image
+  type: docker-image
+  source:
+    username: ((docker-username))
+    password: ((docker-password))
+    repository: ((docker-repository))/stratos-kube-terminal
+- name: analyzers-image
+  type: docker-image
+  source:
+    username: ((docker-username))
+    password: ((docker-password))
+    repository: ((docker-repository))/stratos-analyzers
+    
 # Artifacts
 - name: image-tag
   type: s3
@@ -129,7 +142,16 @@ jobs:
           tag: image-tag/v2-alpha-tag
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))
-    - do:
+    - do: 
+      - put: ui-image
+        params:
+          dockerfile: stratos/deploy/Dockerfile.ui
+          build: stratos/
+          target_name: prod-build
+          tag: image-tag/v2-alpha-tag
+          build_args_file: image-tag/ui-build-args
+          patch_base_reg: ((patch-base-reg))
+          patch_base_tag: ((patch-base-tag))
       - put: config-init-image
         params:
           dockerfile: stratos/deploy/Dockerfile.init
@@ -137,15 +159,22 @@ jobs:
           tag: image-tag/v2-alpha-tag
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))
-      - put: ui-image
+    - do:
+      - put: analyzers-image
         params:
-          dockerfile: stratos/deploy/Dockerfile.ui
-          build: stratos/
-          target_name: prod-build
+          dockerfile: stratos/src/jetstream/plugins/analysis/container/Dockerfile
+          build: stratos/src/jetstream/plugins/analysis/container/
           tag: image-tag/v2-alpha-tag
-          build_args_file: image-tag/ui-build-args
           patch_base_reg: ((patch-base-reg))
           patch_base_tag: ((patch-base-tag))
+      - put: kube-terminal-image
+        params:
+          dockerfile: stratos/deploy/containers/kube-terminal/Dockerfile.kubeterminal
+          build: stratos/deploy/containers/kube-terminal
+          tag: image-tag/v2-alpha-tag
+          patch_base_reg: ((patch-base-reg))
+          patch_base_tag: ((patch-base-tag))
+
 - name: create-chart
   plan:
   - get: stratos
diff --git a/deploy/kubernetes/build.sh b/deploy/kubernetes/build.sh
index 4dc645a607..41ae1ac65a 100755
--- a/deploy/kubernetes/build.sh
+++ b/deploy/kubernetes/build.sh
@@ -214,6 +214,14 @@ if [ "${CHART_ONLY}" == "false" ]; then
   log "-- Building/publishing the runtime container image for the Console web server (frontend)"
   patchAndPushImage stratos-console deploy/Dockerfile.ui "${STRATOS_PATH}" prod-build
 
+  # Build and push an image for the Kubernetes Terminal
+  log "-- Building/publishing Kubernetes Terminal"
+  patchAndPushImage stratos-kube-terminal Dockerfile.kubeterminal "${STRATOS_PATH}/deploy/containers/kube-terminal"
+  
+  # Analzyers container
+  log "-- Building/publishing Stratos Analyzers"
+  patchAndPushImage stratos-analyzers Dockerfile "${STRATOS_PATH}/src/jetstream/plugins/analysis/container"
+ 
   # Build any custom images added by a fork
   if [ "${HAS_CUSTOM_BUILD}" == "true" ]; then
     custom_image_build
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 919098add4..f5c61e853f 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -294,6 +294,14 @@ spec:
         - name: UI_LIST_ALLOW_LOAD_MAXED
           value: {{ default "false" .Values.console.ui.listAllowLoadMaxed | quote }}
         {{- end }}
+        - name: ANALYSIS_SERVICES_API
+          value: "http://{{ .Release.Name }}-analyzers:8090"
+        - name: STRATOS_KUBERNETES_NAMESPACE
+          value: "{{ .Release.Namespace }}"
+        - name: STRATOS_KUBERNETES_TERMINAL_IMAGE
+          value: "{{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/stratos-kube-terminal:{{.Values.consoleVersion}}"
+        - name: STRATOS_KUBERNETES_DASHBOARD_IMAGE
+          value: "{{.Values.console.kubeDashboardImage}}"        
         {{- include "stratosJetstreamEnv" . | indent 8 }}
         readinessProbe:
           httpGet:
diff --git a/deploy/kubernetes/custom/__stratos.tpl b/deploy/kubernetes/custom/__stratos.tpl
deleted file mode 100644
index 653bade6f6..0000000000
--- a/deploy/kubernetes/custom/__stratos.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-# Customizations for the Helm Chart
-
-# Extra env vars for the Jetstream Pod in deployment.yaml
-{{- define "stratosJetstreamEnv" }}
-- name: ANALYSIS_SERVICES_API
-  value: "http://{{ .Release.Name }}-analyzers:8090"
-- name: STRATOS_KUBERNETES_NAMESPACE
-  value: "{{ .Release.Namespace }}"
-- name: STRATOS_KUBERNETES_TERMINAL_IMAGE
-  value: "{{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/stratos-kube-terminal:{{.Values.consoleVersion}}"
-- name: STRATOS_KUBERNETES_DASHBOARD_IMAGE
-  value: "{{.Values.console.kubeDashboardImage}}"
-{{- end }}
\ No newline at end of file
diff --git a/deploy/kubernetes/custom/custom-build.sh b/deploy/kubernetes/custom/custom-build.sh
deleted file mode 100644
index 8b413607cf..0000000000
--- a/deploy/kubernetes/custom/custom-build.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file is included in the build script
-
-printf "${BOLD}${YELLOW}"
-echo
-echo "==========================================================================="
-echo "SUSE Helm Chart Customization script loaded <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
-echo "==========================================================================="
-echo
-printf "${RESET}"
-
-# Script must provide a function named 'custom_image_build'
-
-function custom_image_build() {
-
-  # Build and push an image for the Kubernetes Terminal
-  log "-- Building/publishing Kubernetes Terminal"
-  patchAndPushImage stratos-kube-terminal Dockerfile.kubeterminal "${STRATOS_PATH}/deploy/containers/kube-terminal"
-  
-  # Analzyers container
-  log "-- Building/publishing Stratos Analyzers"
-  patchAndPushImage stratos-analyzers Dockerfile "${STRATOS_PATH}/src/jetstream/plugins/analysis/container"
- 
-}
\ No newline at end of file
diff --git a/deploy/kubernetes/custom/customize-helm.sh b/deploy/kubernetes/custom/customize-helm.sh
index 674ec4f99a..b5674acf8a 100755
--- a/deploy/kubernetes/custom/customize-helm.sh
+++ b/deploy/kubernetes/custom/customize-helm.sh
@@ -15,10 +15,11 @@ echo "Customizations folder: ${DIR}"
 echo "Chart folder         : ${CHART_PATH}"
 echo ""
 
+# Kubernetes has been upstreamed, so no customizations at this time
 # ===========================================================================================
 # Copy our customization helper over the default, empty one
 # ===========================================================================================
-cp "${DIR}/__stratos.tpl" "${CHART_PATH}/templates/__stratos.tpl"
+#cp "${DIR}/__stratos.tpl" "${CHART_PATH}/templates/__stratos.tpl"
 
 # ===========================================================================================
 # Chart.yaml changes

From 41737cac0952e1c2650473214ab003bf1be7a0e6 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Mon, 5 Oct 2020 11:39:00 +0100
Subject: [PATCH 648/648] Fix upgrade not showing when an RC is deployed (#513)

* Fix upgrade not showing when an RC is deployed

* Fix lint

* Lint fix

* Move test file

* Update helm-release-helper.service.spec.ts

* Update helm-release-helper.service.ts
---
 .../tabs/helm-release-helper.service.spec.ts  | 28 +++++++++++++++++++
 .../tabs/helm-release-helper.service.ts       | 25 +++++++++++++++--
 2 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-helper.service.spec.ts

diff --git a/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-helper.service.spec.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-helper.service.spec.ts
new file mode 100644
index 0000000000..94a111d642
--- /dev/null
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-helper.service.spec.ts
@@ -0,0 +1,28 @@
+import { Version } from './helm-release-helper.service';
+
+describe('HelmReleaseHelperService', () => {
+
+  describe('Version', () => {
+
+    const v10 = new Version('1.0.0');
+    const v11 = new Version('1.1.0');
+    const v11rc1 = new Version('1.0.0-rc.1');
+    const v11rc2 = new Version('1.0.0-rc.2');
+    const v201 = new Version('2.0.1');
+    const v101 = new Version('1.0.1');
+
+    it('version comparisons', () => {
+      expect(v11.isNewer(v10)).toBe(true);
+      expect(v11rc1.isNewer(v11)).toBe(false);
+      expect(v11rc2.isNewer(v11rc1)).toBe(true);
+      expect(v201.isNewer(v11)).toBe(true);
+      expect(v201.isNewer(v11rc1)).toBe(true);
+      expect(v10.isNewer(v11)).toBe(false);
+      expect(v101.isNewer(v11)).toBe(false);
+      expect(v101.isNewer(v10)).toBe(true);
+
+      expect(v11rc1.isNewer(v10)).toBe(false);
+
+    });
+  });
+});
diff --git a/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-helper.service.ts b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
index e1bcedc06b..5b9c818e19 100644
--- a/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
+++ b/src/frontend/packages/kubernetes/src/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
@@ -19,18 +19,26 @@ import {
 import { workloadsEntityCatalog } from '../../workloads-entity-catalog';
 
 // Simple class to represent MAJOR.MINOR.REVISION version
-class Version {
+export class Version {
 
   public major: number;
   public minor: number;
   public revision: number;
 
+  public prerelease: string;
+
   public valid: boolean;
 
   constructor(v: string) {
     this.valid = false;
     if (typeof v === 'string') {
-      const parts = v.split('.');
+      let version = v;
+      const pre = v.split('-');
+      if (pre.length > 1) {
+        version = pre[0];
+        this.prerelease = pre[1];
+      }
+      const parts = version.split('.');
       if (parts.length === 3) {
         this.major = parseInt(parts[0], 10);
         this.minor = parseInt(parts[1], 10);
@@ -55,6 +63,19 @@ class Version {
         return true;
       }
       if (this.minor === other.minor) {
+        if (this.revision === other.revision) {
+          // Same version numbers
+          if (this.prerelease && !other.prerelease) {
+            return false;
+          }
+          if(!this.prerelease && other.prerelease) {
+            return true;
+          }
+          if (this.prerelease && other.prerelease) {
+            return this.prerelease > other.prerelease;
+          }
+          return false;
+        }
         return this.revision > other.revision;
       }
     }